From 6320c91c50e4c0ee5c366241f9a413c4edbfdad8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 26 Jan 2023 09:58:27 +0800
Subject: vim-patch:9.0.1231: completion of :runtime does not handle {where}
 argument

Problem:    Completion of :runtime does not handle {where} argument.
Solution:   Parse the {where} argument. (closes vim/vim#11863)

https://github.com/vim/vim/commit/3770f4c9cde7b5fcd10b6fa2e665cd0b69450fb2
---
 runtime/doc/builtin.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 4d2c85b134..c20f52967b 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2991,6 +2991,7 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		messages	|:messages| suboptions
 		option		options
 		packadd		optional package |pack-add| names
+		runtime		runtime file names |:runtime|
 		scriptnames	sourced script names |:scriptnames|
 		shellcmd	Shell command
 		sign		|:sign| suboptions
-- 
cgit 


From f03f6263bb3eb0b28b759292cb6ef4465a05cafe Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 26 Jan 2023 10:38:53 +0800
Subject: vim-patch:9.0.1238: :runtime completion can be further improved

Problem:    :runtime completion can be further improved.
Solution:   Also complete the {where} argument values and adjust the
            completion for that. (closes vim/vim#11874)

https://github.com/vim/vim/commit/5c8771bc5a2be123ab8e6325fa60ed524e8efb09
---
 runtime/doc/builtin.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index c20f52967b..c8f5570bae 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2991,7 +2991,7 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		messages	|:messages| suboptions
 		option		options
 		packadd		optional package |pack-add| names
-		runtime		runtime file names |:runtime|
+		runtime		|:runtime| completion
 		scriptnames	sourced script names |:scriptnames|
 		shellcmd	Shell command
 		sign		|:sign| suboptions
-- 
cgit 


From e02df23b4e24046d99c7bfa6a63b4db16c28a7be Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 26 Jan 2023 19:35:06 +0800
Subject: docs: clarify :runtime behavior without [where] again (#22003)

The behavior changed again after #15867, change the docs to describe
latest behavior.
---
 runtime/doc/repeat.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 1bbd20702b..bf77aacdc0 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -211,9 +211,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			When [!] is included, all found files are sourced.
 			Else only the first found file is sourced.
 
-			When [where] is omitted, first 'runtimepath' is
-			searched, then directories under "start" in 'packpath'
-			are searched.
+			When [where] is omitted only 'runtimepath' is used.
 			Other values:
 				START	search only under "start" in 'packpath'
 				OPT 	search only under "opt" in 'packpath'
-- 
cgit 


From aec4b476c5689f032103ab3e0ca068fc2af8bbba Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 27 Jan 2023 11:24:20 +0000
Subject: docs(api): tweak data arg for nvim_create_autocmd (#22008)

Fixes #21964
---
 runtime/doc/api.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 0e1cc3c28c..95a929b808 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3281,7 +3281,7 @@ nvim_create_autocmd({event}, {*opts})                  *nvim_create_autocmd()*
                    • match: (string) expanded value of |<amatch>|
                    • buf: (number) expanded value of |<abuf>|
                    • file: (string) expanded value of |<afile>|
-                   • data: (any) arbitrary data passed to
+                   • data: (any) arbitrary data passed from
                      |nvim_exec_autocmds()|
 
                  • command (string) optional: Vim command to execute on event.
-- 
cgit 


From c032e83b22994332dd8769ef34cb817906a63cac Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 26 Jan 2023 09:42:23 +0100
Subject: fix(treesitter): validate language name

Problem: Some injections (like markdown) allow specifying arbitrary
language names for code blocks, which may be lead to errors when
looking for a corresponding parser in runtime path.

Solution: Validate that the language name only contains alphanumeric
characters and `_` (e.g., for `c_sharp`) and error otherwise.
---
 runtime/doc/treesitter.txt              |  1 +
 runtime/lua/vim/treesitter/language.lua | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 917863eef8..9bfdc0b94e 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -684,6 +684,7 @@ require_language({lang}, {path}, {silent}, {symbol_name})
 
     Parameters: ~
       • {lang}         (string) Language the parser should parse
+                       (alphanumerical and `_` only)
       • {path}         (string|nil) Optional path the parser is located at
       • {silent}       (boolean|nil) Don't throw an error if language not
                        found
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index c92d63b8c4..8634e53b7b 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -6,7 +6,7 @@ local M = {}
 ---
 --- Parsers are searched in the `parser` runtime directory, or the provided {path}
 ---
----@param lang string Language the parser should parse
+---@param lang string Language the parser should parse (alphanumerical and `_` only)
 ---@param path (string|nil) Optional path the parser is located at
 ---@param silent (boolean|nil) Don't throw an error if language not found
 ---@param symbol_name (string|nil) Internal symbol name for the language to load
@@ -16,13 +16,19 @@ function M.require_language(lang, path, silent, symbol_name)
     return true
   end
   if path == nil then
-    local fname = 'parser/' .. vim.fn.fnameescape(lang) .. '.*'
+    if not (lang and lang:match('[%w_]+') == lang) then
+      if silent then
+        return false
+      end
+      error("'" .. lang .. "' is not a valid language name")
+    end
+
+    local fname = 'parser/' .. lang .. '.*'
     local paths = a.nvim_get_runtime_file(fname, false)
     if #paths == 0 then
       if silent then
         return false
       end
-
       error("no parser for '" .. lang .. "' language, see :help treesitter-parsers")
     end
     path = paths[1]
-- 
cgit 


From 8144deb0989ea5c61fe9a1a5802d230eba33dfdd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 29 Jan 2023 10:39:20 +0100
Subject: vim-patch:9.0.1256: NetworkManager connection files are not
 recognized (#22038)

Problem:    NetworkManager connection files are not recognized.
Solution:   Add a pattern for NetworkManager connection files. (closes vim/vim#11893)

https://github.com/vim/vim/commit/04e4f1d98556e67d7337224b67b71c828410ee0f

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 9293c828b8..0a26e363d5 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -226,6 +226,7 @@ local extension = {
   hook = function(path, bufnr)
     return M.getlines(bufnr, 1) == '[Trigger]' and 'conf'
   end,
+  nmconnection = 'confini',
   mklx = 'context',
   mkiv = 'context',
   mkii = 'context',
-- 
cgit 


From c9ac4e487706658852f0e6c2e71cf669dafba90b Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 29 Jan 2023 14:19:07 -0500
Subject: vim-patch:9.0.1261: Elsa files are not recognized (#22047)

Problem: Elsa files are not recognized.
Solution: Add the name of Elsa files. (Amaan Qureshi)

https://github.com/vim/vim/commit/2a99fe6c41efcd5d1eb47823e7e73cf391e230ba
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 0a26e363d5..1e7b85060e 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -332,6 +332,7 @@ local extension = {
   am = 'elf',
   exs = 'elixir',
   elm = 'elm',
+  lc = 'elsa',
   elv = 'elvish',
   ent = function(path, bufnr)
     return require('vim.filetype.detect').ent(bufnr)
-- 
cgit 


From 27b81af19c498892f4b0444ad29b7be842f8e7b8 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 30 Jan 2023 19:06:32 +0100
Subject: refactor!: remove has("debug") (#22060)

This value can not be relied on as it doesn't work for
multi-configuration generators. I don't think this undocumented option
is used much, if at all, so I think we should remove it.
---
 runtime/lua/nvim/health.lua | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
index b76106f241..f11899434e 100644
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -156,13 +156,10 @@ local function check_performance()
     health.report_ok(buildtype)
   else
     health.report_info(buildtype)
-    health.report_warn(
-      'Non-optimized ' .. (has('debug') and '(DEBUG) ' or '') .. 'build. Nvim will be slower.',
-      {
-        'Install a different Nvim package, or rebuild with `CMAKE_BUILD_TYPE=RelWithDebInfo`.',
-        suggest_faq,
-      }
-    )
+    health.report_warn('Non-optimized debug build. Nvim will be slower.', {
+      'Install a different Nvim package, or rebuild with `CMAKE_BUILD_TYPE=RelWithDebInfo`.',
+      suggest_faq,
+    })
   end
 
   -- check for slow shell invocation
-- 
cgit 


From b649a96fc09fa7f18a988b0b0be5dadb54ad49de Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 31 Jan 2023 08:12:10 +0100
Subject: vim-patch:9.0.1263: KDL files are not recognized (#22058)

Problem:    KDL files are not recognized.
Solution:   Add a pattern for KDL files. (Amaan Qureshi, closes vim/vim#11898)

https://github.com/vim/vim/commit/907349a74331fc1bc48cf43c1e7d54cb9e0e4fc9

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 1e7b85060e..b356f3d7aa 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -569,6 +569,7 @@ local extension = {
   libsonnet = 'jsonnet',
   jsp = 'jsp',
   jl = 'julia',
+  kdl = 'kdl',
   kv = 'kivy',
   kix = 'kix',
   kts = 'kotlin',
-- 
cgit 


From d6d6ab3f8e77d54c8030c0c18f17d3c72ac4445c Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Sat, 26 Feb 2022 15:19:10 +0100
Subject: feat(lua): low-level interpreter mode (nvim -ll)

---
 runtime/doc/starting.txt           | 8 ++++++++
 runtime/lua/vim/_init_packages.lua | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 179bacdb24..5e0718c3bb 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -239,6 +239,14 @@ argument.
 		Disables |shada| unless |-i| was given.
 		Disables swapfile (like |-n|).
 
+							*-ll*
+-ll {script} [args]
+		Execute a lua script, similarly to |-l|, but the editor is not
+		initialized. This gives a lua enviroment similar to a worker
+		thread. See |lua-loop-threading|.
+
+		Unlike `-l` no prior arguments are allowed.
+
 							*-b*
 -b		Binary mode.  File I/O will only recognize <NL> to separate
 		lines.  The 'expandtab' option will be reset.  The 'textwidth'
diff --git a/runtime/lua/vim/_init_packages.lua b/runtime/lua/vim/_init_packages.lua
index 0c4ee8636d..e3a442af5e 100644
--- a/runtime/lua/vim/_init_packages.lua
+++ b/runtime/lua/vim/_init_packages.lua
@@ -42,8 +42,11 @@ function vim._load_package(name)
   return nil
 end
 
--- Insert vim._load_package after the preloader at position 2
-table.insert(package.loaders, 2, vim._load_package)
+-- TODO(bfredl): dedicated state for this?
+if vim.api then
+  -- Insert vim._load_package after the preloader at position 2
+  table.insert(package.loaders, 2, vim._load_package)
+end
 
 -- builtin functions which always should be available
 require('vim.shared')
@@ -78,6 +81,6 @@ function vim.empty_dict()
 end
 
 -- only on main thread: functions for interacting with editor state
-if not vim.is_thread() then
+if vim.api and not vim.is_thread() then
   require('vim._editor')
 end
-- 
cgit 


From d63ad600e0571ccf07eed1e841e8519da7d4af9f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 1 Feb 2023 10:08:50 +0100
Subject: vim-patch:9.0.1268: .clangd and .stylelintrc files don't get a
 filetype (#22079)

Problem:    .clangd and .stylelintrc files don't get a filetype.
Solution:   Use yaml for .clangd and json for .stylelintrc files. (Mark
            Skelton, closes vim/vim#11916)

https://github.com/vim/vim/commit/9c51798a1f3b79ace5ae0551a8bb122025ac94ed

Co-authored-by: Mark Skelton <mdskelton99@gmail.com>
---
 runtime/lua/vim/filetype.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index b356f3d7aa..d1a84fcecf 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1464,6 +1464,7 @@ local filename = {
   ['Pipfile.lock'] = 'json',
   ['.firebaserc'] = 'json',
   ['.prettierrc'] = 'json',
+  ['.stylelintrc'] = 'json',
   ['.babelrc'] = 'jsonc',
   ['.eslintrc'] = 'jsonc',
   ['.hintrc'] = 'jsonc',
@@ -1699,6 +1700,7 @@ local filename = {
   fglrxrc = 'xml',
   ['/etc/blkid.tab'] = 'xml',
   ['/etc/blkid.tab.old'] = 'xml',
+  ['.clangd'] = 'yaml',
   ['.clang-format'] = 'yaml',
   ['.clang-tidy'] = 'yaml',
   ['/etc/zprofile'] = 'zsh',
-- 
cgit 


From 9ce44a750c2a65082962effe6ce4d185b7698d73 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 1 Feb 2023 17:21:42 +0000
Subject: fix(man): use italics for `<bs>_` (#22086)

fix(man): use italics for <bs>_

Even though underline is strictly what this should be. <bs>_ was used by
nroff to indicate italics which wasn't possible on old typewriters so
underline was used. Modern terminals now support italics so lets use
that now.

See:
- https://unix.stackexchange.com/questions/274658/purpose-of-ascii-text-with-overstriking-file-format/274795#274795
- https://cmd.inp.nsk.su/old/cmd2/manuals/unix/UNIX_Unleashed/ch08.htm
---
 runtime/lua/man.lua | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index 732a4ab92e..0956022ac6 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -149,15 +149,21 @@ local function highlight_line(line, linenr)
     if overstrike then
       local last_hl = hls[#hls]
       if char == prev_char then
-        if char == '_' and attr == UNDERLINE and last_hl and last_hl.final == byte then
-          -- This underscore is in the middle of an underlined word
-          attr = UNDERLINE
+        if char == '_' and attr == ITALIC and last_hl and last_hl.final == byte then
+          -- This underscore is in the middle of an italic word
+          attr = ITALIC
         else
           attr = BOLD
         end
       elseif prev_char == '_' then
-        -- char is underlined
-        attr = UNDERLINE
+        -- Even though underline is strictly what this should be. <bs>_ was used by nroff to
+        -- indicate italics which wasn't possible on old typewriters so underline was used. Modern
+        -- terminals now support italics so lets use that now.
+        -- See:
+        -- - https://unix.stackexchange.com/questions/274658/purpose-of-ascii-text-with-overstriking-file-format/274795#274795
+        -- - https://cmd.inp.nsk.su/old/cmd2/manuals/unix/UNIX_Unleashed/ch08.htm
+        -- attr = UNDERLINE
+        attr = ITALIC
       elseif prev_char == '+' and char == 'o' then
         -- bullet (overstrike text '+^Ho')
         attr = BOLD
-- 
cgit 


From cb97d5425a0b6e77267795607ff45255a4ac1c22 Mon Sep 17 00:00:00 2001
From: Thayne McCombs <astrothayne@gmail.com>
Date: Wed, 1 Feb 2023 23:26:26 -0700
Subject: docs: clarify "pipe" mode for sockconnect

Make it more clear that on unix the "pipe" mode of sockconnect uses unix
local domain sockets, not named pipes (FIFOs) which are not currently
supported.

See discussion in #22080.

Signed-off-by: Thayne McCombs
---
 runtime/doc/builtin.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index c8f5570bae..2fc7dce7fc 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1959,7 +1959,7 @@ exp({expr})						*exp()*
 			Compute()->exp()
 
 expand({string} [, {nosuf} [, {list}]])				*expand()*
-		Expand wildcards and the following special keywords in 
+		Expand wildcards and the following special keywords in
 		{string}.  'wildignorecase' applies.
 
 		If {list} is given and it is |TRUE|, a List will be returned.
@@ -7569,10 +7569,14 @@ sinh({expr})						*sinh()*
 
 sockconnect({mode}, {address} [, {opts}])		 *sockconnect()*
 		Connect a socket to an address. If {mode} is "pipe" then
-		{address} should be the path of a named pipe. If {mode} is
-		"tcp" then {address} should be of the form "host:port" where
-		the host should be an ip adderess or host name, and port the
-		port number.
+		{address} should be the path of a local domain socket (on
+		unix) or named pipe (on Windows). If {mode} is "tcp" then
+		{address} should be of the form "host:port" where the host
+		should be an ip adderess or host name, and port the port
+		number.
+
+		For "pipe" mode, see |luv-pipe-handle|. For "tcp" mode, see
+		|luv-tcp-handle|.
 
 		Returns a |channel| ID. Close the socket with |chanclose()|.
 		Use |chansend()| to send data over a bytes socket, and
-- 
cgit 


From 405f0a8c3fb6c9941418c4e205b41e3ad32d0fb0 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Thu, 2 Feb 2023 14:37:44 +0100
Subject: build: update release data

---
 runtime/nvim.appdata.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/nvim.appdata.xml b/runtime/nvim.appdata.xml
index 7411a7190a..7d2ea49df4 100644
--- a/runtime/nvim.appdata.xml
+++ b/runtime/nvim.appdata.xml
@@ -26,9 +26,12 @@
   </screenshots>
 
   <releases>
+    <release date="2023-02-02" version="0.8.3"/>
     <release date="2022-12-29" version="0.8.2"/>
     <release date="2022-11-14" version="0.8.1"/>
     <release date="2022-09-30" version="0.8.0"/>
+    <release date="2022-06-26" version="0.7.2"/>
+    <release date="2022-06-26" version="0.7.1"/>
     <release date="2022-04-15" version="0.7.0"/>
     <release date="2021-12-31" version="0.6.1"/>
     <release date="2021-11-30" version="0.6.0"/>
-- 
cgit 


From c05b3c3bbdef4018ce70f0c822c4a55654a9c186 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 2 Feb 2023 17:26:22 +0100
Subject: vim-patch:9.0.1274: FIRRTL files are not recognized (#22102)

Problem:    FIRRTL files are not recognized.
Solution:   Add a pattern for FIRRTL files. (Amaan Qureshi, closes vim/vim#11931)

https://github.com/vim/vim/commit/685bf83b73d0fe6fd36bb2949bebd6aae66a139e

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index d1a84fcecf..8144731b09 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -385,6 +385,7 @@ local extension = {
   ['m4gl'] = 'fgl',
   ['4gl'] = 'fgl',
   ['4gh'] = 'fgl',
+  fir = 'firrtl',
   fish = 'fish',
   focexec = 'focexec',
   fex = 'focexec',
-- 
cgit 


From 144279ef30a432ac8416746e3491f3120ae9b4e8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 Feb 2023 09:18:18 +0100
Subject: vim-patch:be4e01637e71 (#22103)

Update runtime files.

https://github.com/vim/vim/commit/be4e01637e71c8d5095c33b9861fd70b41476732

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/autoload/tohtml.vim       | 424 ++++++++++++++++++++------------------
 runtime/doc/diff.txt              |   2 +-
 runtime/doc/fold.txt              |   2 +-
 runtime/doc/options.txt           |   8 +-
 runtime/doc/quickfix.txt          |   2 -
 runtime/ftplugin/debchangelog.vim |  10 +-
 runtime/ftplugin/debcontrol.vim   |   4 +-
 runtime/ftplugin/logcheck.vim     |   4 +-
 runtime/plugin/tohtml.vim         |  37 ++--
 runtime/syntax/2html.vim          |   2 +-
 runtime/syntax/automake.vim       |   4 +-
 runtime/syntax/debchangelog.vim   |   4 +-
 runtime/syntax/debcontrol.vim     |   4 +-
 runtime/syntax/debcopyright.vim   |   4 +-
 runtime/syntax/debsources.vim     |   6 +-
 runtime/syntax/dep3patch.vim      |   4 +-
 runtime/syntax/forth.vim          |  30 +--
 runtime/syntax/gpg.vim            | 162 ++++++++-------
 runtime/syntax/lc.vim             |  31 +++
 runtime/syntax/nginx.vim          |  33 ++-
 runtime/syntax/sh.vim             |  16 +-
 runtime/syntax/shared/README.txt  |   2 +-
 runtime/syntax/tpp.vim            |   4 +-
 runtime/syntax/xf86conf.vim       |  10 +-
 24 files changed, 457 insertions(+), 352 deletions(-)
 create mode 100644 runtime/syntax/lc.vim

(limited to 'runtime')

diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim
index 4ae17815ba..8a1ba14364 100644
--- a/runtime/autoload/tohtml.vim
+++ b/runtime/autoload/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2019 Aug 16
+" Last Change: 2023 Jan 01
 "
 " Additional contributors:
 "
@@ -351,63 +351,65 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
   let s:old_magic = &magic
   set magic
 
-  if s:settings.use_xhtml
-    if s:settings.encoding != ""
-      let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
-    else
-      let xml_line = "<?xml version=\"1.0\"?>"
+  let html = []
+  if !s:settings.no_doc
+    if s:settings.use_xhtml
+      if s:settings.encoding != ""
+	let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
+      else
+	let xml_line = "<?xml version=\"1.0\"?>"
+      endif
+      let tag_close = ' />'
     endif
-    let tag_close = ' />'
-  endif
 
-  let style = [s:settings.use_xhtml ? "" : '-->']
-  let body_line = ''
+    let style = [s:settings.use_xhtml ? "" : '-->']
+    let body_line = ''
 
-  let html = []
-  let s:html5 = 0
-  if s:settings.use_xhtml
-    call add(html, xml_line)
-  endif
-  if s:settings.use_xhtml
-    call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
-    call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
-  elseif s:settings.use_css && !s:settings.no_pre
-    call add(html, "<!DOCTYPE html>")
-    call add(html, '<html>')
-    let s:html5 = 1
-  else
-    call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
-    call add(html, '  "http://www.w3.org/TR/html4/loose.dtd">')
-    call add(html, '<html>')
-  endif
-  call add(html, '<head>')
-
-  " include encoding as close to the top as possible, but only if not already
-  " contained in XML information
-  if s:settings.encoding != "" && !s:settings.use_xhtml
-    if s:html5
-      call add(html, '<meta charset="' . s:settings.encoding . '"' . tag_close)
+    let s:html5 = 0
+    if s:settings.use_xhtml
+      call add(html, xml_line)
+    endif
+    if s:settings.use_xhtml
+      call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
+      call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
+    elseif s:settings.use_css && !s:settings.no_pre
+      call add(html, "<!DOCTYPE html>")
+      call add(html, '<html>')
+      let s:html5 = 1
     else
-      call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
+      call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
+      call add(html, '  "http://www.w3.org/TR/html4/loose.dtd">')
+      call add(html, '<html>')
     endif
-  endif
+    call add(html, '<head>')
 
-  call add(html, '<title>diff</title>')
-  call add(html, '<meta name="Generator" content="Vim/'.v:version/100.'.'.v:version%100.'"'.tag_close)
-  call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close)
-  call add(html, '<meta name="settings" content="'.
-	\ join(filter(keys(s:settings),'s:settings[v:val]'),',').
-	\ ',prevent_copy='.s:settings.prevent_copy.
-	\ ',use_input_for_pc='.s:settings.use_input_for_pc.
-	\ '"'.tag_close)
-  call add(html, '<meta name="colorscheme" content="'.
-	\ (exists('g:colors_name')
-	\ ? g:colors_name
-	\ : 'none'). '"'.tag_close)
-
-  call add(html, '</head>')
-  let body_line_num = len(html)
-  call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
+    " include encoding as close to the top as possible, but only if not already
+    " contained in XML information
+    if s:settings.encoding != "" && !s:settings.use_xhtml
+      if s:html5
+	call add(html, '<meta charset="' . s:settings.encoding . '"' . tag_close)
+      else
+	call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
+      endif
+    endif
+
+    call add(html, '<title>diff</title>')
+    call add(html, '<meta name="Generator" content="Vim/'.v:version/100.'.'.v:version%100.'"'.tag_close)
+    call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close)
+    call add(html, '<meta name="settings" content="'.
+	  \ join(filter(keys(s:settings),'s:settings[v:val]'),',').
+	  \ ',prevent_copy='.s:settings.prevent_copy.
+	  \ ',use_input_for_pc='.s:settings.use_input_for_pc.
+	  \ '"'.tag_close)
+    call add(html, '<meta name="colorscheme" content="'.
+	  \ (exists('g:colors_name')
+	  \ ? g:colors_name
+	  \ : 'none'). '"'.tag_close)
+
+    call add(html, '</head>')
+    let body_line_num = len(html)
+    call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
+  endif
   call add(html, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>")
 
   call add(html, '<tr>')
@@ -430,47 +432,53 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     " When not using CSS or when using xhtml, the <body> line can be important.
     " Assume it will be the same for all buffers and grab it from the first
     " buffer. Similarly, need to grab the body end line as well.
-    if body_line == ''
-      1
-      call search('<body')
-      let body_line = getline('.')
-      $
-      call search('</body>', 'b')
-      let s:body_end_line = getline('.')
-    endif
+    if !s:settings.no_doc
+      if body_line == ''
+	1
+	call search('<body')
+	let body_line = getline('.')
+	$
+	call search('</body>', 'b')
+	let s:body_end_line = getline('.')
+      endif
 
-    " Grab the style information. Some of this will be duplicated so only insert
-    " it if it's not already there. {{{
-    1
-    let style_start = search('^<style\( type="text/css"\)\?>')
-    1
-    let style_end = search('^</style>')
-    if style_start > 0 && style_end > 0
-      let buf_styles = getline(style_start + 1, style_end - 1)
-      for a_style in buf_styles
-	if index(style, a_style) == -1
-	  if diff_style_start == 0
-	    if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)'
-	      let diff_style_start = len(style)-1
+      " Grab the style information. Some of this will be duplicated so only insert
+      " it if it's not already there. {{{
+      1
+      let style_start = search('^<style\( type="text/css"\)\?>')
+      1
+      let style_end = search('^</style>')
+      if style_start > 0 && style_end > 0
+	let buf_styles = getline(style_start + 1, style_end - 1)
+	for a_style in buf_styles
+	  if index(style, a_style) == -1
+	    if diff_style_start == 0
+	      if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)'
+		let diff_style_start = len(style)-1
+	      endif
 	    endif
+	    call insert(style, a_style, insert_index)
+	    let insert_index += 1
 	  endif
-	  call insert(style, a_style, insert_index)
-	  let insert_index += 1
-	endif
-      endfor
-    endif " }}}
+	endfor
+      endif " }}}
 
-    " everything new will get added before the diff styles so diff highlight
-    " properly overrides normal highlight
-    if diff_style_start != 0
-      let insert_index = diff_style_start
-    endif
+      " everything new will get added before the diff styles so diff highlight
+      " properly overrides normal highlight
+      if diff_style_start != 0
+	let insert_index = diff_style_start
+      endif
 
-    " Delete those parts that are not needed so we can include the rest into the
-    " resulting table.
-    1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
-    $
-    ?</body>?,$d_
+      " Delete those parts that are not needed so we can include the rest into the
+      " resulting table.
+      1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
+      $
+      ?</body>?,$d_
+    elseif !s:settings.no_modeline
+      " remove modeline from source files if it is included and we haven't deleted
+      " due to removing html footer already
+      $d
+    endif
     let temp = getline(1,'$')
     " clean out id on the main content container because we already set it on
     " the table
@@ -478,7 +486,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     " undo deletion of start and end part
     " so we can later save the file as valid html
     " TODO: restore using grabbed lines if undolevel is 1?
-    normal! 2u
+    if !s:settings.no_doc
+      normal! 2u
+    elseif !s:settings.no_modeline
+      normal! u
+    endif
     if s:settings.use_css
       call add(html, '<td><div>')
     elseif s:settings.use_xhtml
@@ -495,17 +507,23 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     quit!
   endfor
 
-  let html[body_line_num] = body_line
+  if !s:settings.no_doc
+    let html[body_line_num] = body_line
+  endif
 
   call add(html, '</tr>')
   call add(html, '</table>')
-  call add(html, s:body_end_line)
-  call add(html, '</html>')
+  if !s:settings.no_doc
+    call add(html, s:body_end_line)
+    call add(html, '</html>')
+  endif
 
   " The generated HTML is admittedly ugly and takes a LONG time to fold.
   " Make sure the user doesn't do syntax folding when loading a generated file,
   " using a modeline.
-  call add(html, '<!-- vim: set foldmethod=manual : -->')
+  if !s:settings.no_modeline
+    call add(html, '<!-- vim: set foldmethod=manual : -->')
+  endif
 
   let i = 1
   let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html")
@@ -542,129 +560,131 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 
   call append(0, html)
 
-  if len(style) > 0
-    1
-    let style_start = search('^</head>')-1
+  if !s:settings.no_doc
+    if len(style) > 0
+      1
+      let style_start = search('^</head>')-1
 
-    " add required javascript in reverse order so we can just call append again
-    " and again without adjusting {{{
+      " add required javascript in reverse order so we can just call append again
+      " and again without adjusting {{{
 
-    let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids
+      let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids
 
-    " insert script closing tag if needed
-    if s:uses_script
-      call append(style_start, [
-	    \ '',
-	    \ s:settings.use_xhtml ? '//]]>' : '-->',
-	    \ "</script>"
-	    \ ])
-    endif
+      " insert script closing tag if needed
+      if s:uses_script
+	call append(style_start, [
+	      \ '',
+	      \ s:settings.use_xhtml ? '//]]>' : '-->',
+	      \ "</script>"
+	      \ ])
+      endif
 
-    " insert javascript to get IDs from line numbers, and to open a fold before
-    " jumping to any lines contained therein
-    if s:settings.line_ids
-      call append(style_start, [
-	    \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
-	    \ "   * we corrected the raw number to a line ID.",
-	    \ "   */",
-	    \ "  if (lineElem) {",
-	    \ "    lineElem.scrollIntoView(true);",
-	    \ "  }",
-	    \ "  return true;",
-	    \ "}",
-	    \ "if ('onhashchange' in window) {",
-	    \ "  window.onhashchange = JumpToLine;",
-	    \ "}"
-	    \ ])
+      " insert javascript to get IDs from line numbers, and to open a fold before
+      " jumping to any lines contained therein
+      if s:settings.line_ids
+	call append(style_start, [
+	      \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
+	      \ "   * we corrected the raw number to a line ID.",
+	      \ "   */",
+	      \ "  if (lineElem) {",
+	      \ "    lineElem.scrollIntoView(true);",
+	      \ "  }",
+	      \ "  return true;",
+	      \ "}",
+	      \ "if ('onhashchange' in window) {",
+	      \ "  window.onhashchange = JumpToLine;",
+	      \ "}"
+	      \ ])
 
-      if s:settings.dynamic_folds
+	if s:settings.dynamic_folds
+	  call append(style_start, [
+		\ "",
+		\ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
+		\ "  var node = lineElem;",
+		\ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
+		\ "  {",
+		\ "    if (node.className == 'closed-fold')",
+		\ "    {",
+		\ "      /* toggle open the fold ID (remove window ID) */",
+		\ "      toggleFold(node.id.substr(4));",
+		\ "    }",
+		\ "    node = node.parentNode;",
+		\ "  }",
+		\ ])
+	endif
+      endif
+
+      if s:settings.line_ids
 	call append(style_start, [
 	      \ "",
-	      \ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
-	      \ "  var node = lineElem;",
-	      \ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
-	      \ "  {",
-	      \ "    if (node.className == 'closed-fold')",
-	      \ "    {",
-	      \ "      /* toggle open the fold ID (remove window ID) */",
-	      \ "      toggleFold(node.id.substr(4));",
-	      \ "    }",
-	      \ "    node = node.parentNode;",
+	      \ "/* function to open any folds containing a jumped-to line before jumping to it */",
+	      \ "function JumpToLine()",
+	      \ "{",
+	      \ "  var lineNum;",
+	      \ "  lineNum = window.location.hash;",
+	      \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
+	      \ "",
+	      \ "  if (lineNum.indexOf('L') == -1) {",
+	      \ "    lineNum = 'L'+lineNum;",
+	      \ "  }",
+	      \ "  if (lineNum.indexOf('W') == -1) {",
+	      \ "    lineNum = 'W1'+lineNum;",
 	      \ "  }",
+	      \ "  var lineElem = document.getElementById(lineNum);"
 	      \ ])
       endif
-    endif
 
-    if s:settings.line_ids
-      call append(style_start, [
-	    \ "",
-	    \ "/* function to open any folds containing a jumped-to line before jumping to it */",
-	    \ "function JumpToLine()",
-	    \ "{",
-	    \ "  var lineNum;",
-	    \ "  lineNum = window.location.hash;",
-	    \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
-	    \ "",
-	    \ "  if (lineNum.indexOf('L') == -1) {",
-	    \ "    lineNum = 'L'+lineNum;",
-	    \ "  }",
-	    \ "  if (lineNum.indexOf('W') == -1) {",
-	    \ "    lineNum = 'W1'+lineNum;",
-	    \ "  }",
-	    \ "  var lineElem = document.getElementById(lineNum);"
-	    \ ])
-    endif
+      " Insert javascript to toggle matching folds open and closed in all windows,
+      " if dynamic folding is active.
+      if s:settings.dynamic_folds
+	call append(style_start, [
+	      \  "  function toggleFold(objID)",
+	      \  "  {",
+	      \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
+	      \  "    {",
+	      \  "      var fold;",
+	      \  '      fold = document.getElementById("win"+win_num+objID);',
+	      \  "      if(fold.className == 'closed-fold')",
+	      \  "      {",
+	      \  "        fold.className = 'open-fold';",
+	      \  "      }",
+	      \  "      else if (fold.className == 'open-fold')",
+	      \  "      {",
+	      \  "        fold.className = 'closed-fold';",
+	      \  "      }",
+	      \  "    }",
+	      \  "  }",
+	      \ ])
+      endif
 
-    " Insert javascript to toggle matching folds open and closed in all windows,
-    " if dynamic folding is active.
-    if s:settings.dynamic_folds
-      call append(style_start, [
-	    \  "  function toggleFold(objID)",
-	    \  "  {",
-	    \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
-	    \  "    {",
-	    \  "      var fold;",
-	    \  '      fold = document.getElementById("win"+win_num+objID);',
-	    \  "      if(fold.className == 'closed-fold')",
-	    \  "      {",
-	    \  "        fold.className = 'open-fold';",
-	    \  "      }",
-	    \  "      else if (fold.className == 'open-fold')",
-	    \  "      {",
-	    \  "        fold.className = 'closed-fold';",
-	    \  "      }",
-	    \  "    }",
-	    \  "  }",
-	    \ ])
-    endif
+      if s:uses_script
+	" insert script tag if needed
+	call append(style_start, [
+	      \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
+	      \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
+      endif
 
-    if s:uses_script
-      " insert script tag if needed
-      call append(style_start, [
-	    \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
-	    \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
+      " Insert styles from all the generated html documents and additional styles
+      " for the table-based layout of the side-by-side diff. The diff should take
+      " up the full browser window (but not more), and be static in size,
+      " horizontally scrollable when the lines are too long. Otherwise, the diff
+      " is pretty useless for really long lines. {{{
+      if s:settings.use_css
+	call append(style_start,
+	      \ ['<style' . (s:html5 ? '' : 'type="text/css"') . '>']+
+	      \ style+
+	      \ [ s:settings.use_xhtml ? '' : '<!--',
+	      \   'table { table-layout: fixed; }',
+	      \   'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
+	      \   'table, td, th { border: 1px solid; }',
+	      \   'td { vertical-align: top; }',
+	      \   'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
+	      \   'td div { overflow: auto; }',
+	      \   s:settings.use_xhtml ? '' : '-->',
+	      \   '</style>'
+	      \])
+      endif "}}}
     endif
-
-    " Insert styles from all the generated html documents and additional styles
-    " for the table-based layout of the side-by-side diff. The diff should take
-    " up the full browser window (but not more), and be static in size,
-    " horizontally scrollable when the lines are too long. Otherwise, the diff
-    " is pretty useless for really long lines. {{{
-    if s:settings.use_css
-      call append(style_start,
-	    \ ['<style' . (s:html5 ? '' : 'type="text/css"') . '>']+
-	    \ style+
-	    \ [ s:settings.use_xhtml ? '' : '<!--',
-	    \   'table { table-layout: fixed; }',
-	    \   'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
-	    \   'table, td, th { border: 1px solid; }',
-	    \   'td { vertical-align: top; }',
-	    \   'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
-	    \   'td div { overflow: auto; }',
-	    \   s:settings.use_xhtml ? '' : '-->',
-	    \   '</style>'
-	    \])
-    endif "}}}
   endif
 
   let &paste = s:old_paste
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 382d025d3c..ead68c5f4f 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -125,7 +125,7 @@ file for a moment and come back to the same file and be in diff mode again.
 		buffers.
 
 The `:diffoff` command resets the relevant options to the values they had when
-using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
+using `:diffsplit`, `:diffpatch`, `:diffthis`. or starting Vim in diff mode.
 When using `:diffoff` twice the last saved values are restored.
 Otherwise they are set to their default value:
 
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 35a3be35fb..859562fae6 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -195,7 +195,7 @@ non-matching marker pairs.  Example: >
 
 	/* funcB() {{{2 */
 	void funcB() {}
-
+<							*{{{* *}}}*
 A fold starts at a "{{{" marker.  The following number specifies the fold
 level.  What happens depends on the difference between the current fold level
 and the level given by the marker:
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b1af90a604..1f91b89322 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3864,8 +3864,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			are left blank.
 							*lcs-multispace*
 	  multispace:c...
-	 		One or more characters to use cyclically to show for
-	 		multiple consecutive spaces.  Overrides the "space"
+			One or more characters to use cyclically to show for
+			multiple consecutive spaces.  Overrides the "space"
 			setting, except for single spaces.  When omitted, the
 			"space" setting is used.  For example,
 			`:set listchars=multispace:---+` shows ten consecutive
@@ -6205,8 +6205,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	      windows.
 	* -   Set highlight group to User{N}, where {N} is taken from the
 	      minwid field, e.g. %1*.  Restore normal highlight with %* or %0*.
-	      The difference between User{N} and StatusLine  will be applied
-	      to StatusLineNC for the statusline of non-current windows.
+	      The difference between User{N} and StatusLine will be applied to
+	      StatusLineNC for the statusline of non-current windows.
 	      The number N must be between 1 and 9.  See |hl-User1..9|
 
 	When displaying a flag, Vim removes the leading comma, if any, when
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index b1f7c927cc..f70dbd0913 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -353,8 +353,6 @@ processing a quickfix or location list command, it will be aborted.
 			If numbers [from] and/or [to] are given, the respective
 			range of errors is listed.  A negative number counts
 			from the last error backwards, -1 being the last error.
-			The 'switchbuf' settings are respected when jumping
-			to a buffer.
 			The |:filter| command can be used to display only the
 			quickfix entries matching a supplied pattern. The
 			pattern is matched against the filename, module name,
diff --git a/runtime/ftplugin/debchangelog.vim b/runtime/ftplugin/debchangelog.vim
index cf8dd17c44..062fc054c8 100644
--- a/runtime/ftplugin/debchangelog.vim
+++ b/runtime/ftplugin/debchangelog.vim
@@ -3,9 +3,9 @@
 " Maintainer:   Debian Vim Maintainers <team+vim@tracker.debian.org>
 " Former Maintainers:   Michael Piefel <piefel@informatik.hu-berlin.de>
 "                       Stefano Zacchiroli <zack@debian.org>
-" Last Change:  2022 Jul 25
+" Last Change:  2023 Jan 16
 " License:      Vim License
-" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debchangelog.vim
+" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/debchangelog.vim
 
 " Bug completion requires apt-listbugs installed for Debian packages or
 " python-launchpadlib installed for Ubuntu packages
@@ -35,14 +35,14 @@ if exists('g:did_changelog_ftplugin')
   finish
 endif
 
+" Don't load another plugin (this is global)
+let g:did_changelog_ftplugin = 1
+
 " Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise
 " <CR> would not be recognized.  See ":help 'cpoptions'".
 let s:cpo_save = &cpo
 set cpo&vim
 
-" Don't load another plugin (this is global)
-let g:did_changelog_ftplugin = 1
-
 " {{{1 GUI menu
 
 " Helper functions returning various data.
diff --git a/runtime/ftplugin/debcontrol.vim b/runtime/ftplugin/debcontrol.vim
index 3a6e39a682..bb710e597c 100644
--- a/runtime/ftplugin/debcontrol.vim
+++ b/runtime/ftplugin/debcontrol.vim
@@ -2,8 +2,8 @@
 " Language:     Debian control files
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer:    Pierre Habouzit <madcoder@debian.org>
-" Last Change:  2018-01-28
-" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debcontrol.vim
+" Last Change:  2023 Jan 16
+" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/debcontrol.vim
 
 " Do these settings once per buffer
 if exists('b:did_ftplugin')
diff --git a/runtime/ftplugin/logcheck.vim b/runtime/ftplugin/logcheck.vim
index 9d664b2d09..9c1be1108e 100644
--- a/runtime/ftplugin/logcheck.vim
+++ b/runtime/ftplugin/logcheck.vim
@@ -1,9 +1,9 @@
 " Vim filetype plugin file
 " Language:    Logcheck
 " Maintainer:  Debian Vim Maintainers
-" Last Change: 2018 Dec 27
+" Last Change: 2023 Jan 16
 " License:     Vim License
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/logcheck.vim
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/logcheck.vim
 
 if exists('b:did_ftplugin')
     finish
diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim
index 08df19b4f9..0369313f08 100644
--- a/runtime/plugin/tohtml.vim
+++ b/runtime/plugin/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim plugin for converting a syntax highlighted file to HTML.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2019 Nov 13
+" Last Change: 2023 Jan 01
 "
 " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
 " $VIMRUNTIME/syntax/2html.vim
@@ -8,11 +8,23 @@
 if exists('g:loaded_2html_plugin')
   finish
 endif
-let g:loaded_2html_plugin = 'vim8.1_v2'
+let g:loaded_2html_plugin = 'vim9.0_v1'
 
 "
 " Changelog: {{{
-"   8.1_v2  (this version): - Fix Bitbucket issue #19: fix calculation of tab
+"   9.0_v1  (this version): - Implement g:html_no_doc and g:html_no_modeline
+"                             for diff mode. Add tests.
+"           (Vim 9.0.1122): NOTE: no version string update for this version!
+"                           - Bugfix for variable name in g:html_no_doc
+"           (Vim 9.0.0819): NOTE: no version string update for this version!
+"                           - Add options g:html_no_doc, g:html_no_lines,
+"                             and g:html_no_modeline (partially included in Vim
+"                             runtime prior to version string update).
+"                           - Updates for new Vim9 string append style (i.e. use
+"                             ".." instead of ".")
+"
+"   8.1 updates: {{{
+"   8.1_v2  (Vim 8.1.2312): - Fix SourceForge issue #19: fix calculation of tab
 "                             stop position to use in expanding a tab, when that
 "                             tab occurs after a syntax match which in turn
 "                             comes after previously expanded tabs.
@@ -20,17 +32,17 @@ let g:loaded_2html_plugin = 'vim8.1_v2'
 "                             destination file to ignore FileType events;
 "                             speeds up processing when the destination file
 "                             already exists and HTML highlight takes too long.
-"                           - Fix Bitbucket issue #20: progress bar could not be
+"                           - Fix SourceForge issue #20: progress bar could not be
 "                             seen when DiffDelete background color matched
 "                             StatusLine background color. Added TOhtmlProgress
 "                             highlight group for manual user override, but
 "                             calculate it to be visible compared to StatusLine
 "                             by default.
-"                           - Fix Bitbucket issue #1: Remove workaround for old
+"                           - Fix SourceForge issue #1: Remove workaround for old
 "                             browsers which don't support 'ch' CSS unit, since
 "                             all modern browsers, including IE>=9, support it.
-"                           - Fix Bitbucket issue #10: support termguicolors
-"                           - Fix Bitbucket issue #21: default to using
+"                           - Fix SourceForge issue #10: support termguicolors
+"                           - Fix SourceForge issue #21: default to using
 "                             generated content instead of <input> tags for
 "                             uncopyable text, so that text is correctly
 "                             prevented from being copied in chrome. Use
@@ -41,13 +53,14 @@ let g:loaded_2html_plugin = 'vim8.1_v2'
 "                           - Fix fallback sizing of <input> tags for browsers
 "                             without "ch" support.
 "                           - Fix cursor on unselectable diff filler text.
-"   8.1_v1  (Vim 8.1.0528): - Fix Bitbucket issue #6: Don't generate empty
+"   8.1_v1  (Vim 8.1.0528): - Fix SourceForge issue #6: Don't generate empty
 "                             script tag.
-"                           - Fix Bitbucket issue #5: javascript should
+"                           - Fix SourceForge issue #5: javascript should
 "                             declare variables with "var".
-"                           - Fix Bitbucket issue #13: errors thrown sourcing
+"                           - Fix SourceForge issue #13: errors thrown sourcing
 "                             2html.vim directly when plugins not loaded.
-"                           - Fix Bitbucket issue #16: support 'vartabstop'.
+"                           - Fix SourceForge issue #16: support 'vartabstop'.
+"}}}
 "
 "   7.4 updates: {{{
 "   7.4_v2  (Vim 7.4.0899): Fix error raised when converting a diff containing
@@ -152,7 +165,7 @@ let g:loaded_2html_plugin = 'vim8.1_v2'
 
 " TODO: {{{
 "   * Check the issue tracker:
-"     https://bitbucket.org/fritzophrenic/vim-tohtml/issues?status=new&status=open
+"     https://sourceforge.net/p/vim-tohtml/issues/search/?q=%21status%3Aclosed
 "   * Options for generating the CSS in external style sheets. New :TOcss
 "     command to convert the current color scheme into a (mostly) generic CSS
 "     stylesheet which can be re-used. Alternate stylesheet support? Good start
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index ce6797deaa..9f43e91309 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2022 Dec 26
+" Last Change: 2023 Jan 01
 "
 " Additional contributors:
 "
diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim
index 8a7db7c27b..2f1ad982c6 100644
--- a/runtime/syntax/automake.vim
+++ b/runtime/syntax/automake.vim
@@ -2,8 +2,8 @@
 " Language: automake Makefile.am
 " Maintainer: Debian Vim Maintainers
 " Former Maintainer: John Williams <jrw@pobox.com>
-" Last Change: 2018 Dec 27
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/automake.vim
+" Last Change: 2023 Jan 16
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/automake.vim
 "
 " XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain
 "     it only because patches have been submitted for it by Debian users and the
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index 691c3778c1..d3c3d39304 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,8 +3,8 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2022 Oct 29
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
+" Last Change: 2023 Jan 16
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debchangelog.vim
 
 " Standard syntax initialization
 if exists('b:current_syntax')
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 4c7fb5dd63..c79b702f92 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -3,8 +3,8 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2022 May 11
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim
+" Last Change: 2023 Jan 16
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debcontrol.vim
 
 " Standard syntax initialization
 if exists('b:current_syntax')
diff --git a/runtime/syntax/debcopyright.vim b/runtime/syntax/debcopyright.vim
index c87b876eea..6f76b5c868 100644
--- a/runtime/syntax/debcopyright.vim
+++ b/runtime/syntax/debcopyright.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:    Debian copyright file
 " Maintainer:  Debian Vim Maintainers
-" Last Change: 2019 Sep 07
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcopyright.vim
+" Last Change: 2023 Jan 16
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debcopyright.vim
 
 " Standard syntax initialization
 if exists('b:current_syntax')
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index 9b75797b54..69900c7a51 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,8 +2,8 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2022 Oct 29
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
+" Last Change: 2023 Jan 16
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debsources.vim
 
 " Standard syntax initialization
 if exists('b:current_syntax')
@@ -14,7 +14,7 @@ endif
 syn case match
 
 " A bunch of useful keywords
-syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\|restricted\|universe\|multiverse\)/
+syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\|non-free-firmware\|restricted\|universe\|multiverse\)/
 
 " Match comments
 syn match debsourcesComment        /#.*/  contains=@Spell
diff --git a/runtime/syntax/dep3patch.vim b/runtime/syntax/dep3patch.vim
index cb0eda8931..c00bddfde2 100644
--- a/runtime/syntax/dep3patch.vim
+++ b/runtime/syntax/dep3patch.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:    Debian DEP3 Patch headers
 " Maintainer:  Gabriel Filion <gabster@lelutin.ca>
-" Last Change: 2022 Apr 06
-" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/dep3patch.vim
+" Last Change: 2023 Jan 16
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/dep3patch.vim
 "
 " Specification of the DEP3 patch header format is available at:
 "   https://dep-team.pages.debian.net/deps/dep3/
diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim
index 721bceb367..fe98634079 100644
--- a/runtime/syntax/forth.vim
+++ b/runtime/syntax/forth.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:    FORTH
 " Current Maintainer:  Johan Kotlinski <kotlinski@gmail.com>
-" Previous Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
-" Last Change: 2018-03-29
+" Previous Maintainer:  Christian V. J. Br�ssow <cvjb@cvjb.de>
+" Last Change: 2023-01-12
 " Filenames:   *.fs,*.ft
 " URL:	       https://github.com/jkotlinski/forth.vim
 
@@ -23,7 +23,6 @@ syn case ignore
 
 " Some special, non-FORTH keywords
 syn keyword forthTodo contained TODO FIXME XXX
-syn match forthTodo contained 'Copyright\(\s([Cc])\)\=\(\s[0-9]\{2,4}\)\='
 
 " Characters allowed in keywords
 " I don't know if 128-255 are allowed in ANS-FORTH
@@ -98,13 +97,16 @@ syn keyword forthEndOfColonDef ; ;M ;m
 syn keyword forthEndOfClassDef ;class
 syn keyword forthEndOfObjectDef ;object
 syn keyword forthDefine CONSTANT 2CONSTANT FCONSTANT VARIABLE 2VARIABLE
-syn keyword forthDefine FVARIABLE CREATE USER VALUE TO DEFER IS DOES> IMMEDIATE
+syn keyword forthDefine FVARIABLE CREATE USER VALUE TO DEFER IS <BUILDS DOES> IMMEDIATE
 syn keyword forthDefine COMPILE-ONLY COMPILE RESTRICT INTERPRET POSTPONE EXECUTE
 syn keyword forthDefine LITERAL CREATE-INTERPRET/COMPILE INTERPRETATION>
 syn keyword forthDefine <INTERPRETATION COMPILATION> <COMPILATION ] LASTXT
 syn keyword forthDefine COMP' POSTPONE, FIND-NAME NAME>INT NAME?INT NAME>COMP
 syn keyword forthDefine NAME>STRING STATE C; CVARIABLE BUFFER: MARKER
 syn keyword forthDefine , 2, F, C, COMPILE,
+syn match forthDefine "\[DEFINED]"
+syn match forthDefine "\[UNDEFINED]"
+syn match forthDefine "\[IF]"
 syn match forthDefine "\[IFDEF]"
 syn match forthDefine "\[IFUNDEF]"
 syn match forthDefine "\[THEN]"
@@ -180,6 +182,7 @@ syn keyword forthBlocks BLOCK-INCLUDED BLK
 syn keyword forthMath DECIMAL HEX BASE
 syn match forthInteger '\<-\=[0-9]\+.\=\>'
 syn match forthInteger '\<&-\=[0-9]\+.\=\>'
+syn match forthInteger '\<#-\=[0-9]\+.\=\>'
 " recognize hex and binary numbers, the '$' and '%' notation is for gforth
 syn match forthInteger '\<\$\x*\x\+\>' " *1* --- don't mess
 syn match forthInteger '\<\x*\d\x*\>'  " *2* --- this order!
@@ -192,18 +195,18 @@ syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe][-+]\d\+\>'
 syn region forthComment start='0 \[if\]' end='\[endif\]' end='\[then\]' contains=forthTodo
 
 " Strings
-syn region forthString start=+\.*\"+ end=+"+ end=+$+
+syn region forthString start=+\.*\"+ end=+"+ end=+$+ contains=@Spell
 " XXX
-syn region forthString start=+s\"+ end=+"+ end=+$+
-syn region forthString start=+s\\\"+ end=+"+ end=+$+
-syn region forthString start=+c\"+ end=+"+ end=+$+
+syn region forthString start=+s\"+ end=+"+ end=+$+ contains=@Spell
+syn region forthString start=+s\\\"+ end=+"+ end=+$+ contains=@Spell
+syn region forthString start=+c\"+ end=+"+ end=+$+ contains=@Spell
 
 " Comments
-syn match forthComment '\\\s.*$' contains=forthTodo,forthSpaceError
-syn region forthComment start='\\S\s' end='.*' contains=forthTodo,forthSpaceError
-syn match forthComment '\.(\s[^)]*)' contains=forthTodo,forthSpaceError
-syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=forthTodo,forthSpaceError
-syn region forthComment start='/\*' end='\*/' contains=forthTodo,forthSpaceError
+syn match forthComment '\\\%(\s.*\)\=$' contains=@Spell,forthTodo,forthSpaceError
+syn region forthComment start='\\S\s' end='.*' contains=@Spell,forthTodo,forthSpaceError
+syn match forthComment '\.(\s[^)]*)' contains=@Spell,forthTodo,forthSpaceError
+syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=@Spell,forthTodo,forthSpaceError
+syn region forthComment start='/\*' end='\*/' contains=@Spell,forthTodo,forthSpaceError
 
 " Include files
 syn match forthInclude '^INCLUDE\s\+\k\+'
@@ -260,3 +263,4 @@ let b:current_syntax = "forth"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim:ts=8:sw=4:nocindent:smartindent:
+
diff --git a/runtime/syntax/gpg.vim b/runtime/syntax/gpg.vim
index 46e2099994..57f712b6a3 100644
--- a/runtime/syntax/gpg.vim
+++ b/runtime/syntax/gpg.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
-" Language:             gpg(1) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2010-10-14
+" Language:		gpg(1) configuration file
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Latest Revision:	2010-10-14
+" Updated:		2023-01-23 @ObserverOfTime: added a couple of keywords
 
 if exists("b:current_syntax")
   finish
@@ -12,91 +13,92 @@ set cpo&vim
 
 setlocal iskeyword+=-
 
-syn keyword gpgTodo     contained FIXME TODO XXX NOTE
+syn keyword gpgTodo	contained FIXME TODO XXX NOTE
 
-syn region  gpgComment  contained display oneline start='#' end='$'
-                        \ contains=gpgTodo,gpgID,@Spell
+syn region  gpgComment	contained display oneline start='#' end='$'
+			\ contains=gpgTodo,gpgID,@Spell
 
-syn match   gpgID       contained display '\<\(0x\)\=\x\{8,}\>'
+syn match   gpgID	contained display '\<\(0x\)\=\x\{8,}\>'
 
-syn match   gpgBegin    display '^' skipwhite nextgroup=gpgComment,gpgOption,gpgCommand
+syn match   gpgBegin	display '^' skipwhite nextgroup=gpgComment,gpgOption,gpgCommand
 
-syn keyword gpgCommand  contained skipwhite nextgroup=gpgArg
-                        \ check-sigs decrypt decrypt-files delete-key
-                        \ delete-secret-and-public-key delete-secret-key
-                        \ edit-key encrypt-files export export-all
-                        \ export-ownertrust export-secret-keys
-                        \ export-secret-subkeys fast-import fingerprint
-                        \ gen-prime gen-random import import-ownertrust
-                        \ list-keys list-public-keys list-secret-keys
-                        \ list-sigs lsign-key nrsign-key print-md print-mds
-                        \ recv-keys search-keys send-keys sign-key verify
-                        \ verify-files
-syn keyword gpgCommand  contained skipwhite nextgroup=gpgArgError
-                        \ check-trustdb clearsign desig-revoke detach-sign
-                        \ encrypt gen-key gen-revoke help list-packets
-                        \ rebuild-keydb-caches sign store symmetric
-                        \ update-trustdb version warranty
+syn keyword gpgCommand	contained skipwhite nextgroup=gpgArg
+			\ check-sigs decrypt decrypt-files delete-key
+			\ delete-secret-and-public-key delete-secret-key
+			\ edit-key encrypt-files export export-all
+			\ export-ownertrust export-secret-keys
+			\ export-secret-subkeys fast-import fingerprint
+			\ gen-prime gen-random import import-ownertrust
+			\ list-keys list-public-keys list-secret-keys
+			\ list-sigs lsign-key nrsign-key print-md print-mds
+			\ recv-keys search-keys send-keys sign-key verify
+			\ verify-files
+syn keyword gpgCommand	contained skipwhite nextgroup=gpgArgError
+			\ check-trustdb clearsign desig-revoke detach-sign
+			\ encrypt gen-key gen-revoke help list-packets
+			\ rebuild-keydb-caches sign store symmetric
+			\ update-trustdb version warranty
 
-syn keyword gpgOption   contained skipwhite nextgroup=gpgArg
-                        \ attribute-fd cert-digest-algo charset cipher-algo
-                        \ command-fd comment completes-needed compress
-                        \ compress-algo debug default-cert-check-level
-                        \ default-key default-preference-list
-                        \ default-recipient digest-algo disable-cipher-algo
-                        \ disable-pubkey-algo encrypt-to exec-path
-                        \ export-options group homedir import-options
-                        \ keyring keyserver keyserver-options load-extension
-                        \ local-user logger-fd marginals-needed max-cert-depth
-                        \ notation-data options output override-session-key
-                        \ passphrase-fd personal-cipher-preferences
-                        \ personal-compress-preferences
-                        \ personal-digest-preferences photo-viewer
-                        \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode
-                        \ secret-keyring set-filename set-policy-url status-fd
-                        \ trusted-key verify-options keyid-format list-options
-syn keyword gpgOption   contained skipwhite nextgroup=gpgArgError
-                        \ allow-freeform-uid allow-non-selfsigned-uid
-                        \ allow-secret-key-import always-trust
-                        \ armor ask-cert-expire ask-sig-expire
-                        \ auto-check-trustdb batch debug-all default-comment
-                        \ default-recipient-self dry-run emit-version
-                        \ emulate-md-encode-bug enable-special-filenames
-                        \ escape-from-lines expert fast-list-mode
-                        \ fixed-list-mode for-your-eyes-only
-                        \ force-mdc force-v3-sigs force-v4-certs
-                        \ gpg-agent-info ignore-crc-error ignore-mdc-error
-                        \ ignore-time-conflict ignore-valid-from interactive
-                        \ list-only lock-multiple lock-never lock-once
-                        \ merge-only no no-allow-non-selfsigned-uid
-                        \ no-armor no-ask-cert-expire no-ask-sig-expire
-                        \ no-auto-check-trustdb no-batch no-comment
-                        \ no-default-keyring no-default-recipient
-                        \ no-encrypt-to no-expensive-trust-checks
-                        \ no-expert no-for-your-eyes-only no-force-v3-sigs
-                        \ no-force-v4-certs no-greeting no-literal
-                        \ no-mdc-warning no-options no-permission-warning
-                        \ no-pgp2 no-pgp6 no-pgp7 no-random-seed-file
-                        \ no-secmem-warning no-show-notation no-show-photos
-                        \ no-show-policy-url no-sig-cache no-sig-create-check
-                        \ no-sk-comments no-tty no-utf8-strings no-verbose
-                        \ no-version not-dash-escaped openpgp pgp2
-                        \ pgp6 pgp7 preserve-permissions quiet rfc1991
-                        \ set-filesize show-keyring show-notation show-photos
-                        \ show-policy-url show-session-key simple-sk-checksum
-                        \ sk-comments skip-verify textmode throw-keyid
-                        \ try-all-secrets use-agent use-embedded-filename
-                        \ utf8-strings verbose with-colons with-fingerprint
-                        \ with-key-data yes
+syn keyword gpgOption	contained skipwhite nextgroup=gpgArg
+			\ attribute-fd cert-digest-algo charset cipher-algo
+			\ command-fd comment completes-needed compress
+			\ compress-algo debug default-cert-check-level
+			\ default-key default-preference-list
+			\ default-recipient digest-algo disable-cipher-algo
+			\ disable-pubkey-algo encrypt-to exec-path
+			\ export-options group homedir import-options
+			\ keyring keyserver keyserver-options load-extension
+			\ local-user logger-fd marginals-needed max-cert-depth
+			\ notation-data options output override-session-key
+			\ passphrase-fd personal-cipher-preferences
+			\ personal-compress-preferences
+			\ personal-digest-preferences photo-viewer
+			\ recipient s2k-cipher-algo s2k-digest-algo s2k-mode
+			\ secret-keyring set-filename set-policy-url status-fd
+			\ trusted-key verify-options keyid-format list-options
+			\ default-new-key-algo weak-digest
+syn keyword gpgOption	contained skipwhite nextgroup=gpgArgError
+			\ allow-freeform-uid allow-non-selfsigned-uid
+			\ allow-secret-key-import always-trust
+			\ armor ask-cert-expire ask-sig-expire
+			\ auto-check-trustdb batch debug-all default-comment
+			\ default-recipient-self dry-run emit-version
+			\ emulate-md-encode-bug enable-special-filenames
+			\ escape-from-lines expert fast-list-mode
+			\ fixed-list-mode for-your-eyes-only
+			\ force-mdc force-v3-sigs force-v4-certs
+			\ gpg-agent-info ignore-crc-error ignore-mdc-error
+			\ ignore-time-conflict ignore-valid-from interactive
+			\ list-only lock-multiple lock-never lock-once
+			\ merge-only no no-allow-non-selfsigned-uid
+			\ no-armor no-ask-cert-expire no-ask-sig-expire
+			\ no-auto-check-trustdb no-batch no-comment
+			\ no-default-keyring no-default-recipient
+			\ no-encrypt-to no-expensive-trust-checks
+			\ no-expert no-for-your-eyes-only no-force-v3-sigs
+			\ no-force-v4-certs no-greeting no-literal
+			\ no-mdc-warning no-options no-permission-warning
+			\ no-pgp2 no-pgp6 no-pgp7 no-random-seed-file
+			\ no-secmem-warning no-show-notation no-show-photos
+			\ no-show-policy-url no-sig-cache no-sig-create-check
+			\ no-sk-comments no-tty no-utf8-strings no-verbose
+			\ no-version not-dash-escaped openpgp pgp2
+			\ pgp6 pgp7 preserve-permissions quiet rfc1991
+			\ set-filesize show-keyring show-notation show-photos
+			\ show-policy-url show-session-key simple-sk-checksum
+			\ sk-comments skip-verify textmode throw-keyid
+			\ try-all-secrets use-agent use-embedded-filename
+			\ utf8-strings verbose with-colons with-fingerprint
+			\ with-key-data yes
 
-syn match   gpgArg      contained display '\S\+\(\s\+\S\+\)*' contains=gpgID
+syn match   gpgArg	contained display '\S\+\(\s\+\S\+\)*' contains=gpgID
 syn match   gpgArgError contained display '\S\+\(\s\+\S\+\)*'
 
-hi def link gpgComment  Comment
-hi def link gpgTodo     Todo
-hi def link gpgID       Number
-hi def link gpgOption   Keyword
-hi def link gpgCommand  Error
+hi def link gpgComment	Comment
+hi def link gpgTodo	Todo
+hi def link gpgID	Number
+hi def link gpgOption	Keyword
+hi def link gpgCommand	Error
 hi def link gpgArgError Error
 
 let b:current_syntax = "gpg"
diff --git a/runtime/syntax/lc.vim b/runtime/syntax/lc.vim
new file mode 100644
index 0000000000..a334529385
--- /dev/null
+++ b/runtime/syntax/lc.vim
@@ -0,0 +1,31 @@
+" Vim syntax file
+" Language:     Elsa
+" Maintainer:   Miles Glapa-Grossklag <miles@glapa-grossklag.com>
+" Last Change:  2023-01-29
+
+if exists('b:current_syntax')
+  finish
+endif
+
+" Keywords
+syntax keyword elsaKeyword let eval
+syntax match elsaKeyword "\v:"
+highlight link elsaKeyword Keyword
+
+" Comments
+setlocal commentstring=--%s
+syntax match elsaComment "\v--.*$"
+highlight link elsaComment Comment
+
+" Operators
+syntax match elsaOperator "\v\="
+syntax match elsaOperator "\v\=[abd*~]\>"
+syntax match elsaOperator "\v-\>"
+syntax match elsaOperator "\v\\"
+highlight link elsaOperator Operator
+
+" Definitions
+syntax match elsaConstant "\v[A-Z]+[A-Z_0-9]*"
+highlight link elsaConstant Constant
+
+let b:current_syntax = 'elsa'
diff --git a/runtime/syntax/nginx.vim b/runtime/syntax/nginx.vim
index 18dd50cbb2..04760e4a20 100644
--- a/runtime/syntax/nginx.vim
+++ b/runtime/syntax/nginx.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: nginx.conf
 " Maintainer: Chris Aumann <me@chr4.org>
-" Last Change: Apr 15, 2017
+" Last Change: Jan 25, 2023
 
 if exists("b:current_syntax")
   finish
@@ -84,6 +84,8 @@ syn keyword ngxListenOptions default_server contained
 syn keyword ngxListenOptions ssl            contained
 syn keyword ngxListenOptions http2          contained
 syn keyword ngxListenOptions spdy           contained
+syn keyword ngxListenOptions http3          contained
+syn keyword ngxListenOptions quic           contained
 syn keyword ngxListenOptions proxy_protocol contained
 syn keyword ngxListenOptions setfib         contained
 syn keyword ngxListenOptions fastopen       contained
@@ -265,8 +267,16 @@ syn keyword ngxDirective http2_max_concurrent_streams
 syn keyword ngxDirective http2_max_field_size
 syn keyword ngxDirective http2_max_header_size
 syn keyword ngxDirective http2_max_requests
+syn keyword ngxDirective http2_push
+syn keyword ngxDirective http2_push_preload
 syn keyword ngxDirective http2_recv_buffer_size
 syn keyword ngxDirective http2_recv_timeout
+syn keyword ngxDirective http3_hq
+syn keyword ngxDirective http3_max_concurrent_pushes
+syn keyword ngxDirective http3_max_concurrent_streams
+syn keyword ngxDirective http3_push
+syn keyword ngxDirective http3_push_preload
+syn keyword ngxDirective http3_stream_buffer_size
 syn keyword ngxDirective if_modified_since
 syn keyword ngxDirective ignore_invalid_headers
 syn keyword ngxDirective image_filter
@@ -444,6 +454,10 @@ syn keyword ngxDirective proxy_temp_path
 syn keyword ngxDirective proxy_timeout
 syn keyword ngxDirective proxy_upload_rate
 syn keyword ngxDirective queue
+syn keyword ngxDirective quic_gso
+syn keyword ngxDirective quic_host_key
+syn keyword ngxDirective quic_mtu
+syn keyword ngxDirective quic_retry
 syn keyword ngxDirective random_index
 syn keyword ngxDirective read_ahead
 syn keyword ngxDirective real_ip_header
@@ -545,8 +559,10 @@ syn keyword ngxDirective ssl_certificate
 syn keyword ngxDirective ssl_certificate_key
 syn keyword ngxDirective ssl_ciphers
 syn keyword ngxDirective ssl_client_certificate
+syn keyword ngxDirective ssl_conf_command
 syn keyword ngxDirective ssl_crl
 syn keyword ngxDirective ssl_dhparam
+syn keyword ngxDirective ssl_early_data
 syn keyword ngxDirective ssl_ecdh_curve
 syn keyword ngxDirective ssl_engine
 syn keyword ngxDirective ssl_handshake_timeout
@@ -556,6 +572,7 @@ syn keyword ngxSSLPreferServerCiphersOn on contained
 syn keyword ngxSSLPreferServerCiphersOff off contained
 syn keyword ngxDirective ssl_preread
 syn keyword ngxDirective ssl_protocols nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite
+syn keyword ngxDirective ssl_reject_handshake
 syn match ngxSSLProtocol 'TLSv1' contained nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite
 syn match ngxSSLProtocol 'TLSv1\.1' contained nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite
 syn match ngxSSLProtocol 'TLSv1\.2' contained nextgroup=ngxSSLProtocol,ngxSSLProtocolDeprecated skipwhite
@@ -622,6 +639,7 @@ syn keyword ngxDirective uwsgi_buffering
 syn keyword ngxDirective uwsgi_buffers
 syn keyword ngxDirective uwsgi_busy_buffers_size
 syn keyword ngxDirective uwsgi_cache
+syn keyword ngxDirective uwsgi_cache_background_update
 syn keyword ngxDirective uwsgi_cache_bypass
 syn keyword ngxDirective uwsgi_cache_key
 syn keyword ngxDirective uwsgi_cache_lock
@@ -2225,6 +2243,19 @@ syn keyword ngxDirectiveThirdParty xss_override_status
 syn keyword ngxDirectiveThirdParty xss_check_status
 syn keyword ngxDirectiveThirdParty xss_input_types
 
+" CT Module <https://github.com/grahamedgecombe/nginx-ct>
+" Certificate Transparency module for nginx
+syn keyword ngxDirectiveThirdParty ssl_ct
+syn keyword ngxDirectiveThirdParty ssl_ct_static_scts
+
+" Dynamic TLS records patch <https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__dynamic_tls_records.patch>
+" TLS Dynamic Record Resizing
+syn keyword ngxDirectiveThirdParty ssl_dyn_rec_enable
+syn keyword ngxDirectiveThirdParty ssl_dyn_rec_size_hi
+syn keyword ngxDirectiveThirdParty ssl_dyn_rec_size_lo
+syn keyword ngxDirectiveThirdParty ssl_dyn_rec_threshold
+syn keyword ngxDirectiveThirdParty ssl_dyn_rec_timeout
+
 " ZIP Module <https://www.nginx.com/resources/wiki/modules/zip/>
 " ZIP archiver for nginx
 
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 6722d62c89..13d74dbc17 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Nov 25, 2022
-" Version:		204
+" Last Change:		Dec 20, 2022
+" Version:		205
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras
@@ -190,8 +190,10 @@ syn region shEmbeddedEcho contained matchgroup=shStatement start="\<print\>" ski
 " =====
 if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
  syn match shStatement "\<alias\>"
- syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]\+\)\@="  skip="\\$" end="\>\|`"
- syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]\+=\)\@=" skip="\\$" end="="
+ syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]*\)\@="  skip="\\$" end="\>\|`"
+ syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]*=\)\@=" skip="\\$" end="="
+" syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]\+\)\@="  skip="\\$" end="\>\|`"
+" syn region shAlias matchgroup=shStatement start="\<alias\>\s\+\(\h[-._[:alnum:]]\+=\)\@=" skip="\\$" end="="
 
  " Touch: {{{1
  " =====
@@ -333,7 +335,7 @@ syn match   shEscape	contained	'\%(^\)\@!\%(\\\\\)*\\.'	nextgroup=shComment
 " systems too, however, so the following syntax will flag $(..) as
 " an Error under /bin/sh.  By consensus of vimdev'ers!
 if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
- syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]"  skip='\\\\\|\\.' end=")"  contains=@shCommandSubList
+ syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$"  skip='\\\\\|\\.' end=")"  contains=@shCommandSubList
  syn region shArithmetic matchgroup=shArithRegion  start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList
  syn region shArithmetic matchgroup=shArithRegion  start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList
  syn match  shSkipInitWS contained	"^\s\+"
@@ -483,7 +485,9 @@ endif
 
 " Parameter Dereferencing: {{{1
 " ========================
-if !exists("g:sh_no_error") && !(exists("b:is_bash") || exists("b:is_kornshell") || exists("b:is_posix"))
+" Note: sh04 failure with following line
+"if !exists("g:sh_no_error") && !(exists("b:is_bash") || exists("b:is_kornshell") || exists("b:is_posix"))
+if !exists("g:sh_no_error")
  syn match  shDerefWordError	"[^}$[~]"	contained
 endif
 syn match  shDerefSimple	"\$\%(\h\w*\|\d\)"	nextgroup=@shNoZSList
diff --git a/runtime/syntax/shared/README.txt b/runtime/syntax/shared/README.txt
index f519d44faf..fade4b38a1 100644
--- a/runtime/syntax/shared/README.txt
+++ b/runtime/syntax/shared/README.txt
@@ -1,2 +1,2 @@
 This directory "runtime/syntax/shared" contains Vim script files that are
-generated or used by more then one syntax file.
+generated or used by more than one syntax file.
diff --git a/runtime/syntax/tpp.vim b/runtime/syntax/tpp.vim
index ca64b5dce1..e2b307b2a2 100644
--- a/runtime/syntax/tpp.vim
+++ b/runtime/syntax/tpp.vim
@@ -2,8 +2,8 @@
 " Language: tpp - Text Presentation Program
 " Maintainer: Debian Vim Maintainers
 " Former Maintainer: Gerfried Fuchs <alfie@ist.org>
-" Last Change: 2018 Dec 27
-" URL: https://salsa.debian.org/vim-team/vim-debian/master/syntax/tpp.vim
+" Last Change: 2023 Jan 16
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/tpp.vim
 " Filenames: *.tpp
 " License: BSD
 "
diff --git a/runtime/syntax/xf86conf.vim b/runtime/syntax/xf86conf.vim
index 545eda7db0..e8162f3a35 100644
--- a/runtime/syntax/xf86conf.vim
+++ b/runtime/syntax/xf86conf.vim
@@ -1,13 +1,12 @@
 " Vim syntax file
-" This is a GENERATED FILE. Please always refer to source file at the URI below.
 " Language: XF86Config (XFree86 configuration file)
 " Former Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
-" Last Change: 2010 Nov 01
-" URL: http://trific.ath.cx/Ftp/vim/syntax/xf86conf.vim
+" Last Change By David: 2010 Nov 01
+" Last Change: 2023 Jan 23
 " Required Vim Version: 6.0
 "
 " Options: let xf86conf_xfree86_version = 3 or 4
-"							 to force XFree86 3.x or 4.x XF86Config syntax
+"          to force XFree86 3.x or 4.x XF86Config syntax
 
 " Setup
 " quit when a syntax file was already loaded
@@ -147,6 +146,8 @@ syn keyword xf86confKeyword Hskew HTimings InputDevice IOBase MemBase Mode nextg
 syn keyword xf86confKeyword Modes Ramdac Screen TextClockFreq UseModes VendorName nextgroup=xf86confComment,xf86confValue
 syn keyword xf86confKeyword VertRefresh VideoRam ViewPort Virtual VScan VTimings nextgroup=xf86confComment,xf86confValue
 syn keyword xf86confKeyword Weight White nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confMatch MatchDevicePath MatchDriver MatchLayout MatchOS MatchPnPID MatchProduct MatchTag MatchUSBID MatchVendor nextgroup=xf86confComment,xf86confString skipwhite
+syn keyword xf86confMatch MatchIsPointer MatchIsKeyboard MatchIsTouchpad MatchIsTouchscreen MatchIsJoystick nextgroup=xf86confComment,xf86confValue skipwhite
 syn keyword xf86confModeLine ModeLine nextgroup=xf86confComment,xf86confModeLineValue skipwhite skipnl
 
 " Constants
@@ -185,6 +186,7 @@ hi def link xf86confOctalNumberError xf86confError
 hi def link xf86confError Error
 
 hi def link xf86confOption xf86confKeyword
+hi def link xf86confMatch xf86confKeyword
 hi def link xf86confModeLine xf86confKeyword
 hi def link xf86confKeyword Type
 
-- 
cgit 


From 9a5678463c96baf3b39cb3083ddf0da87d39aa23 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 4 Feb 2023 14:58:38 +0000
Subject: fix(treesitter): fix most diagnostics

---
 runtime/doc/lua.txt                         |   3 +-
 runtime/doc/treesitter.txt                  | 188 ++++++++++++++--------------
 runtime/lua/vim/treesitter.lua              |  73 ++++++-----
 runtime/lua/vim/treesitter/_meta.lua        |  60 +++++++++
 runtime/lua/vim/treesitter/highlighter.lua  |  50 +++++++-
 runtime/lua/vim/treesitter/languagetree.lua | 128 +++++++++++++------
 runtime/lua/vim/treesitter/playground.lua   |  36 +++---
 runtime/lua/vim/treesitter/query.lua        | 109 +++++++++++-----
 8 files changed, 429 insertions(+), 218 deletions(-)
 create mode 100644 runtime/lua/vim/treesitter/_meta.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 47249a484b..0472c11a15 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1362,7 +1362,8 @@ defer_fn({fn}, {timeout})                                     *vim.defer_fn()*
 
     Parameters: ~
       • {fn}       (function) Callback to call once `timeout` expires
-      • {timeout}  integer Number of milliseconds to wait before calling `fn`
+      • {timeout}  (integer) Number of milliseconds to wait before calling
+                   `fn`
 
     Return: ~
         (table) timer luv timer object
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 9bfdc0b94e..7bc9f3f9a7 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -66,102 +66,102 @@ See |lua-treesitter-languagetree| for the list of available methods.
 
 ==============================================================================
 TREESITTER TREES                                             *treesitter-tree*
-                                                                      *tstree*
+                                                                      *TSTree*
 
 A "treesitter tree" represents the parsed contents of a buffer, which can be
 used to perform further analysis. It is a |luaref-userdata| reference to an
 object held by the tree-sitter library.
 
-An instance `tstree` of a treesitter tree supports the following methods.
+An instance `TSTree` of a treesitter tree supports the following methods.
 
-tstree:root()                                           *tstree:root()*
+TSTree:root()                                           *TSTree:root()*
     Return the root node of this tree.
 
-tstree:copy()                                           *tstree:copy()*
-    Returns a copy of the `tstree`.
+TSTree:copy()                                           *TSTree:copy()*
+    Returns a copy of the `TSTree`.
 
 ==============================================================================
 TREESITTER NODES                                             *treesitter-node*
-                                                                      *tsnode*
+                                                                      *TSNode*
 
 A "treesitter node" represents one specific element of the parsed contents of
 a buffer, which can be captured by a |Query| for, e.g., highlighting. It is a
 |luaref-userdata| reference to an object held by the tree-sitter library.
 
-An instance `tsnode` of a treesitter node supports the following methods.
+An instance `TSNode` of a treesitter node supports the following methods.
 
-tsnode:parent()                                         *tsnode:parent()*
+TSNode:parent()                                         *TSNode:parent()*
     Get the node's immediate parent.
 
-tsnode:next_sibling()                                   *tsnode:next_sibling()*
+TSNode:next_sibling()                                   *TSNode:next_sibling()*
     Get the node's next sibling.
 
-tsnode:prev_sibling()                                   *tsnode:prev_sibling()*
+TSNode:prev_sibling()                                   *TSNode:prev_sibling()*
     Get the node's previous sibling.
 
-tsnode:next_named_sibling()                       *tsnode:next_named_sibling()*
+TSNode:next_named_sibling()                       *TSNode:next_named_sibling()*
     Get the node's next named sibling.
 
-tsnode:prev_named_sibling()                       *tsnode:prev_named_sibling()*
+TSNode:prev_named_sibling()                       *TSNode:prev_named_sibling()*
     Get the node's previous named sibling.
 
-tsnode:iter_children()                                 *tsnode:iter_children()*
-    Iterates over all the direct children of {tsnode}, regardless of whether
+TSNode:iter_children()                                 *TSNode:iter_children()*
+    Iterates over all the direct children of {TSNode}, regardless of whether
     they are named or not.
     Returns the child node plus the eventual field name corresponding to this
     child node.
 
-tsnode:field({name})                                    *tsnode:field()*
+TSNode:field({name})                                    *TSNode:field()*
     Returns a table of the nodes corresponding to the {name} field.
 
-tsnode:child_count()                                    *tsnode:child_count()*
+TSNode:child_count()                                    *TSNode:child_count()*
     Get the node's number of children.
 
-tsnode:child({index})                                   *tsnode:child()*
+TSNode:child({index})                                   *TSNode:child()*
     Get the node's child at the given {index}, where zero represents the first
     child.
 
-tsnode:named_child_count()                         *tsnode:named_child_count()*
+TSNode:named_child_count()                         *TSNode:named_child_count()*
     Get the node's number of named children.
 
-tsnode:named_child({index})                              *tsnode:named_child()*
+TSNode:named_child({index})                              *TSNode:named_child()*
     Get the node's named child at the given {index}, where zero represents the
     first named child.
 
-tsnode:start()                                          *tsnode:start()*
+TSNode:start()                                          *TSNode:start()*
     Get the node's start position. Return three values: the row, column and
     total byte count (all zero-based).
 
-tsnode:end_()                                           *tsnode:end_()*
+TSNode:end_()                                           *TSNode:end_()*
     Get the node's end position. Return three values: the row, column and
     total byte count (all zero-based).
 
-tsnode:range()                                          *tsnode:range()*
+TSNode:range()                                          *TSNode:range()*
     Get the range of the node. Return four values: the row, column of the
     start position, then the row, column of the end position.
 
-tsnode:type()                                           *tsnode:type()*
+TSNode:type()                                           *TSNode:type()*
     Get the node's type as a string.
 
-tsnode:symbol()                                         *tsnode:symbol()*
+TSNode:symbol()                                         *TSNode:symbol()*
     Get the node's type as a numerical id.
 
-tsnode:named()                                          *tsnode:named()*
+TSNode:named()                                          *TSNode:named()*
     Check if the node is named. Named nodes correspond to named rules in the
     grammar, whereas anonymous nodes correspond to string literals in the
     grammar.
 
-tsnode:missing()                                        *tsnode:missing()*
+TSNode:missing()                                        *TSNode:missing()*
     Check if the node is missing. Missing nodes are inserted by the parser in
     order to recover from certain kinds of syntax errors.
 
-tsnode:has_error()                                      *tsnode:has_error()*
+TSNode:has_error()                                      *TSNode:has_error()*
     Check if the node is a syntax error or contains any syntax errors.
 
-tsnode:sexpr()                                          *tsnode:sexpr()*
+TSNode:sexpr()                                          *TSNode:sexpr()*
     Get an S-expression representing the node as a string.
 
-tsnode:id()                                             *tsnode:id()*
+TSNode:id()                                             *TSNode:id()*
     Get an unique identifier for the node inside its own tree.
 
     No guarantees are made about this identifier's internal representation,
@@ -171,20 +171,20 @@ tsnode:id()                                             *tsnode:id()*
     Note: The `id` is not guaranteed to be unique for nodes from different
     trees.
 
-                                                *tsnode:descendant_for_range()*
-tsnode:descendant_for_range({start_row}, {start_col}, {end_row}, {end_col})
+                                                *TSNode:descendant_for_range()*
+TSNode:descendant_for_range({start_row}, {start_col}, {end_row}, {end_col})
     Get the smallest node within this node that spans the given range of (row,
     column) positions
 
-                                          *tsnode:named_descendant_for_range()*
-tsnode:named_descendant_for_range({start_row}, {start_col}, {end_row}, {end_col})
+                                          *TSNode:named_descendant_for_range()*
+TSNode:named_descendant_for_range({start_row}, {start_col}, {end_row}, {end_col})
     Get the smallest named node within this node that spans the given range of
     (row, column) positions
 
 ==============================================================================
 TREESITTER QUERIES                                          *treesitter-query*
 
-Treesitter queries are a way to extract information about a parsed |tstree|,
+Treesitter queries are a way to extract information about a parsed |TSTree|,
 e.g., for the purpose of highlighting. Briefly, a `query` consists of one or
 more patterns. A `pattern` is defined over node types in the syntax tree. A
 `match` corresponds to specific elements of the syntax tree which match a
@@ -336,7 +336,7 @@ repeated, for example, the following two modeline blocks are both valid: >
 TREESITTER SYNTAX HIGHLIGHTING                          *treesitter-highlight*
 
 Syntax highlighting is specified through queries named `highlights.scm`,
-which match a |tsnode| in the parsed |tstree| to a `capture` that can be
+which match a |TSNode| in the parsed |TSTree| to a `capture` that can be
 assigned a highlight group. For example, the query >
 
     (parameters (identifier) @parameter)
@@ -486,7 +486,7 @@ get_captures_at_cursor({winnr})
     Returns a list of highlight capture names under the cursor
 
     Parameters: ~
-      • {winnr}  (number|nil) Window handle or 0 for current window (default)
+      • {winnr}  (integer|nil) Window handle or 0 for current window (default)
 
     Return: ~
         string[] List of capture names
@@ -500,9 +500,9 @@ get_captures_at_pos({bufnr}, {row}, {col})
     if none are defined).
 
     Parameters: ~
-      • {bufnr}  (number) Buffer number (0 for current buffer)
-      • {row}    (number) Position row
-      • {col}    (number) Position column
+      • {bufnr}  (integer) Buffer number (0 for current buffer)
+      • {row}    (integer) Position row
+      • {col}    (integer) Position column
 
     Return: ~
         table[] List of captures `{ capture = "capture name", metadata = { ...
@@ -512,7 +512,7 @@ get_node_at_cursor({winnr})              *vim.treesitter.get_node_at_cursor()*
     Returns the smallest named node under the cursor
 
     Parameters: ~
-      • {winnr}  (number|nil) Window handle or 0 for current window (default)
+      • {winnr}  (integer|nil) Window handle or 0 for current window (default)
 
     Return: ~
         (string) Name of node under the cursor
@@ -522,25 +522,28 @@ get_node_at_pos({bufnr}, {row}, {col}, {opts})
     Returns the smallest named node at the given position
 
     Parameters: ~
-      • {bufnr}  (number) Buffer number (0 for current buffer)
-      • {row}    (number) Position row
-      • {col}    (number) Position column
+      • {bufnr}  (integer) Buffer number (0 for current buffer)
+      • {row}    (integer) Position row
+      • {col}    (integer) Position column
       • {opts}   (table) Optional keyword arguments:
                  • lang string|nil Parser language
                  • ignore_injections boolean Ignore injected languages
                    (default true)
 
     Return: ~
-        userdata|nil |tsnode| under the cursor
+        |TSNode||nil under the cursor
 
 get_node_range({node_or_range})              *vim.treesitter.get_node_range()*
     Returns the node's range or an unpacked range table
 
     Parameters: ~
-      • {node_or_range}  (userdata|table) |tsnode| or table of positions
+      • {node_or_range}  (|TSNode||table) Node or table of positions
 
     Return: ~
-        (table) `{ start_row, start_col, end_row, end_col }`
+        (integer) start_row
+        (integer) start_col
+        (integer) end_row
+        (integer) end_col
 
 get_parser({bufnr}, {lang}, {opts})              *vim.treesitter.get_parser()*
     Returns the parser for a specific buffer and filetype and attaches it to
@@ -549,14 +552,14 @@ get_parser({bufnr}, {lang}, {opts})              *vim.treesitter.get_parser()*
     If needed, this will create the parser.
 
     Parameters: ~
-      • {bufnr}  (number|nil) Buffer the parser should be tied to (default:
+      • {bufnr}  (integer|nil) Buffer the parser should be tied to (default:
                  current buffer)
       • {lang}   (string|nil) Filetype of this parser (default: buffer
                  filetype)
       • {opts}   (table|nil) Options to pass to the created language tree
 
     Return: ~
-        LanguageTree |LanguageTree| object to use for parsing
+        |LanguageTree| object to use for parsing
 
                                           *vim.treesitter.get_string_parser()*
 get_string_parser({str}, {lang}, {opts})
@@ -568,14 +571,14 @@ get_string_parser({str}, {lang}, {opts})
       • {opts}  (table|nil) Options to pass to the created language tree
 
     Return: ~
-        LanguageTree |LanguageTree| object to use for parsing
+        |LanguageTree| object to use for parsing
 
 is_ancestor({dest}, {source})                   *vim.treesitter.is_ancestor()*
     Determines whether a node is the ancestor of another
 
     Parameters: ~
-      • {dest}    userdata Possible ancestor |tsnode|
-      • {source}  userdata Possible descendant |tsnode|
+      • {dest}    |TSNode| Possible ancestor
+      • {source}  |TSNode| Possible descendant
 
     Return: ~
         (boolean) True if {dest} is an ancestor of {source}
@@ -585,9 +588,9 @@ is_in_node_range({node}, {line}, {col})
     Determines whether (line, col) position is in node range
 
     Parameters: ~
-      • {node}  userdata |tsnode| defining the range
-      • {line}  (number) Line (0-based)
-      • {col}   (number) Column (0-based)
+      • {node}  |TSNode| defining the range
+      • {line}  (integer) Line (0-based)
+      • {col}   (integer) Column (0-based)
 
     Return: ~
         (boolean) True if the position is in node range
@@ -596,7 +599,7 @@ node_contains({node}, {range})                *vim.treesitter.node_contains()*
     Determines if a node contains a range
 
     Parameters: ~
-      • {node}   userdata |tsnode|
+      • {node}   |TSNode|
       • {range}  (table)
 
     Return: ~
@@ -615,14 +618,14 @@ show_tree({opts})                                 *vim.treesitter.show_tree()*
                 keys:
                 • lang (string|nil): The language of the source buffer. If
                   omitted, the filetype of the source buffer is used.
-                • bufnr (number|nil): Buffer to draw the tree into. If
+                • bufnr (integer|nil): Buffer to draw the tree into. If
                   omitted, a new buffer is created.
-                • winid (number|nil): Window id to display the tree buffer in.
-                  If omitted, a new window is created with {command}.
+                • winid (integer|nil): Window id to display the tree buffer
+                  in. If omitted, a new window is created with {command}.
                 • command (string|nil): Vimscript command to create the
                   window. Default value is "topleft 60vnew". Only used when
                   {winid} is nil.
-                • title (string|fun(bufnr:number):string|nil): Title of the
+                • title (string|fun(bufnr:integer):string|nil): Title of the
                   window. If a function, it accepts the buffer number of the
                   source buffer as its only argument and should return a
                   string.
@@ -647,7 +650,7 @@ start({bufnr}, {lang})                                *vim.treesitter.start()*
 <
 
     Parameters: ~
-      • {bufnr}  (number|nil) Buffer to be highlighted (default: current
+      • {bufnr}  (integer|nil) Buffer to be highlighted (default: current
                  buffer)
       • {lang}   (string|nil) Language of the parser (default: buffer
                  filetype)
@@ -656,7 +659,7 @@ stop({bufnr})                                          *vim.treesitter.stop()*
     Stops treesitter highlighting for a buffer
 
     Parameters: ~
-      • {bufnr}  (number|nil) Buffer to stop highlighting (default: current
+      • {bufnr}  (integer|nil) Buffer to stop highlighting (default: current
                  buffer)
 
 
@@ -709,8 +712,8 @@ add_directive({name}, {handler}, {force})
 
     Parameters: ~
       • {name}     (string) Name of the directive, without leading #
-      • {handler}  function(match:table, pattern:string, bufnr:number,
-                   predicate:string[], metadata:table)
+      • {handler}  function(match:table<string,|TSNode|>, pattern:string,
+                   bufnr:number, predicate:string[], metadata:table)
                    • match: see |treesitter-query|
                      • node-level data are accessible via `match[capture_id]`
 
@@ -718,6 +721,7 @@ add_directive({name}, {handler}, {force})
                    • predicate: list of strings containing the full directive
                      being called, e.g. `(node (#set! conceal "-"))` would get
                      the predicate `{ "#set!", "conceal", "-" }`
+      • {force}    (boolean)
 
                                         *vim.treesitter.query.add_predicate()*
 add_predicate({name}, {handler}, {force})
@@ -725,17 +729,18 @@ add_predicate({name}, {handler}, {force})
 
     Parameters: ~
       • {name}     (string) Name of the predicate, without leading #
-      • {handler}  function(match:table, pattern:string, bufnr:number,
-                   predicate:string[])
+      • {handler}  function(match:table<string,|TSNode|>, pattern:string,
+                   bufnr:number, predicate:string[])
                    • see |vim.treesitter.query.add_directive()| for argument
                      meanings
+      • {force}    (boolean)
 
                                         *vim.treesitter.query.get_node_text()*
 get_node_text({node}, {source}, {opts})
     Gets the text corresponding to a given node
 
     Parameters: ~
-      • {node}    userdata |tsnode|
+      • {node}    |TSNode|
       • {source}  (number|string) Buffer or string from which the {node} is
                   extracted
       • {opts}    (table|nil) Optional parameters.
@@ -743,7 +748,7 @@ get_node_text({node}, {source}, {opts})
                     true)
 
     Return: ~
-        (string[]|string)
+        (string[]|string|nil)
 
 get_query({lang}, {query_name})             *vim.treesitter.query.get_query()*
     Returns the runtime query {query_name} for {lang}.
@@ -753,7 +758,7 @@ get_query({lang}, {query_name})             *vim.treesitter.query.get_query()*
       • {query_name}  (string) Name of the query (e.g. "highlights")
 
     Return: ~
-        Query Parsed query
+        Query|nil Parsed query
 
                                       *vim.treesitter.query.get_query_files()*
 get_query_files({lang}, {query_name}, {is_included})
@@ -826,16 +831,15 @@ Query:iter_captures({self}, {node}, {source}, {start}, {stop})
 <
 
     Parameters: ~
-      • {node}    userdata |tsnode| under which the search will occur
-      • {source}  (number|string) Source buffer or string to extract text from
+      • {node}    |TSNode| under which the search will occur
+      • {source}  (integer|string) Source buffer or string to extract text
+                  from
       • {start}   (number) Starting line for the search
       • {stop}    (number) Stopping line for the search (end-exclusive)
       • {self}
 
     Return: ~
-        (number) capture Matching capture id
-        (table) capture_node Capture for {node}
-        (table) metadata for the {capture}
+        (fun(): integer, TSNode, TSMetadata ): capture id, capture node, metadata
 
                                                         *Query:iter_matches()*
 Query:iter_matches({self}, {node}, {source}, {start}, {stop})
@@ -861,16 +865,15 @@ Query:iter_matches({self}, {node}, {source}, {start}, {stop})
 <
 
     Parameters: ~
-      • {node}    userdata |tsnode| under which the search will occur
-      • {source}  (number|string) Source buffer or string to search
-      • {start}   (number) Starting line for the search
-      • {stop}    (number) Stopping line for the search (end-exclusive)
+      • {node}    |TSNode| under which the search will occur
+      • {source}  (integer|string) Source buffer or string to search
+      • {start}   (integer) Starting line for the search
+      • {stop}    (integer) Stopping line for the search (end-exclusive)
       • {self}
 
     Return: ~
-        (number) pattern id
-        (table) match
-        (table) metadata
+        (fun(): integer, table<integer,TSNode>, table): pattern id, match,
+        metadata
 
                                             *vim.treesitter.query.set_query()*
 set_query({lang}, {query_name}, {text})
@@ -892,7 +895,7 @@ new({tree}, {opts})                         *vim.treesitter.highlighter.new()*
     Creates a new highlighter using
 
     Parameters: ~
-      • {tree}  LanguageTree |LanguageTree| parser object to use for highlighting
+      • {tree}  |LanguageTree| parser object to use for highlighting
       • {opts}  (table|nil) Configuration of the highlighter:
                 • queries table overwrite queries used by the highlighter
 
@@ -940,9 +943,9 @@ LanguageTree:for_each_child({self}, {fn}, {include_self})
     Invokes the callback for each |LanguageTree| and its children recursively
 
     Parameters: ~
-      • {fn}            function(tree: LanguageTree, lang: string)
-      • {include_self}  (boolean) Whether to include the invoking tree in the
-                        results
+      • {fn}            fun(tree: LanguageTree, lang: string)
+      • {include_self}  (boolean|nil) Whether to include the invoking tree in
+                        the results
       • {self}
 
 LanguageTree:for_each_tree({self}, {fn})        *LanguageTree:for_each_tree()*
@@ -951,7 +954,7 @@ LanguageTree:for_each_tree({self}, {fn})        *LanguageTree:for_each_tree()*
     Note: This includes the invoking tree's child trees as well.
 
     Parameters: ~
-      • {fn}    function(tree: TSTree, languageTree: LanguageTree)
+      • {fn}    fun(tree: TSTree, ltree: LanguageTree)
       • {self}
 
 LanguageTree:included_regions({self})        *LanguageTree:included_regions()*
@@ -964,6 +967,7 @@ LanguageTree:invalidate({self}, {reload})          *LanguageTree:invalidate()*
     Invalidates this parser and all its children
 
     Parameters: ~
+      • {reload}  (boolean|nil)
       • {self}
 
 LanguageTree:is_valid({self})                        *LanguageTree:is_valid()*
@@ -987,7 +991,7 @@ LanguageTree:language_for_range({self}, {range})
       • {self}
 
     Return: ~
-        LanguageTree Managing {range}
+        |LanguageTree| Managing {range}
 
                                          *LanguageTree:named_node_for_range()*
 LanguageTree:named_node_for_range({self}, {range}, {opts})
@@ -1001,7 +1005,7 @@ LanguageTree:named_node_for_range({self}, {range}, {opts})
       • {self}
 
     Return: ~
-        userdata|nil Found |tsnode|
+        |TSNode||nil Found node
 
 LanguageTree:parse({self})                              *LanguageTree:parse()*
     Parses all defined regions using a treesitter parser for the language this
@@ -1012,8 +1016,8 @@ LanguageTree:parse({self})                              *LanguageTree:parse()*
       • {self}
 
     Return: ~
-        userdata[] Table of parsed |tstree|
-        (table) Change list
+        TSTree[]
+        (table|nil) Change list
 
 LanguageTree:register_cbs({self}, {cbs})         *LanguageTree:register_cbs()*
     Registers callbacks for the |LanguageTree|.
@@ -1050,7 +1054,7 @@ LanguageTree:tree_for_range({self}, {range}, {opts})
       • {self}
 
     Return: ~
-        userdata|nil Contained |tstree|
+        TSTree|nil
 
 LanguageTree:trees({self})                              *LanguageTree:trees()*
     Returns all trees this language tree contains. Does not include child
@@ -1065,7 +1069,7 @@ new({source}, {lang}, {opts})              *vim.treesitter.languagetree.new()*
     may contain child languages themselves, hence the name).
 
     Parameters: ~
-      • {source}  (number|string) Buffer or a string of text to parse
+      • {source}  (integer|string) Buffer or a string of text to parse
       • {lang}    (string) Root language this tree represents
       • {opts}    (table|nil) Optional keyword arguments:
                   • injections table Mapping language to injection query
@@ -1074,6 +1078,6 @@ new({source}, {lang}, {opts})              *vim.treesitter.languagetree.new()*
                     per language.
 
     Return: ~
-        LanguageTree |LanguageTree| parser object
+        |LanguageTree| parser object
 
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 582922ecb6..96b1e24ba9 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -3,8 +3,11 @@ local query = require('vim.treesitter.query')
 local language = require('vim.treesitter.language')
 local LanguageTree = require('vim.treesitter.languagetree')
 
+---@type table<integer,LanguageTree>
 local parsers = setmetatable({}, { __mode = 'v' })
 
+---@class TreesitterModule
+---@field highlighter TSHighlighter
 local M = vim.tbl_extend('error', query, language)
 
 M.language_version = vim._ts_get_language_version()
@@ -12,6 +15,7 @@ M.minimum_language_version = vim._ts_get_minimum_language_version()
 
 setmetatable(M, {
   __index = function(t, k)
+    ---@diagnostic disable:no-unknown
     if k == 'highlighter' then
       t[k] = require('vim.treesitter.highlighter')
       return t[k]
@@ -29,21 +33,23 @@ setmetatable(M, {
 ---
 --- It is not recommended to use this; use |get_parser()| instead.
 ---
----@param bufnr string Buffer the parser will be tied to (0 for current buffer)
+---@param bufnr integer Buffer the parser will be tied to (0 for current buffer)
 ---@param lang string Language of the parser
 ---@param opts (table|nil) Options to pass to the created language tree
 ---
----@return LanguageTree |LanguageTree| object to use for parsing
+---@return LanguageTree object to use for parsing
 function M._create_parser(bufnr, lang, opts)
   language.require_language(lang)
   if bufnr == 0 then
-    bufnr = a.nvim_get_current_buf()
+    bufnr = vim.api.nvim_get_current_buf()
   end
 
   vim.fn.bufload(bufnr)
 
   local self = LanguageTree.new(bufnr, lang, opts)
 
+  ---@diagnostic disable:invisible
+
   ---@private
   local function bytes_cb(_, ...)
     self:_on_bytes(...)
@@ -58,12 +64,14 @@ function M._create_parser(bufnr, lang, opts)
   end
 
   ---@private
-  local function reload_cb(_, ...)
-    self:_on_reload(...)
+  local function reload_cb(_)
+    self:_on_reload()
   end
 
+  local source = self:source() --[[@as integer]]
+
   a.nvim_buf_attach(
-    self:source(),
+    source,
     false,
     { on_bytes = bytes_cb, on_detach = detach_cb, on_reload = reload_cb, preview = true }
   )
@@ -77,11 +85,11 @@ end
 ---
 --- If needed, this will create the parser.
 ---
----@param bufnr (number|nil) Buffer the parser should be tied to (default: current buffer)
+---@param bufnr (integer|nil) Buffer the parser should be tied to (default: current buffer)
 ---@param lang (string|nil) Filetype of this parser (default: buffer filetype)
 ---@param opts (table|nil) Options to pass to the created language tree
 ---
----@return LanguageTree |LanguageTree| object to use for parsing
+---@return LanguageTree object to use for parsing
 function M.get_parser(bufnr, lang, opts)
   opts = opts or {}
 
@@ -107,7 +115,7 @@ end
 ---@param lang string Language of this string
 ---@param opts (table|nil) Options to pass to the created language tree
 ---
----@return LanguageTree |LanguageTree| object to use for parsing
+---@return LanguageTree object to use for parsing
 function M.get_string_parser(str, lang, opts)
   vim.validate({
     str = { str, 'string' },
@@ -120,8 +128,8 @@ end
 
 --- Determines whether a node is the ancestor of another
 ---
----@param dest userdata Possible ancestor |tsnode|
----@param source userdata Possible descendant |tsnode|
+---@param dest TSNode Possible ancestor
+---@param source TSNode Possible descendant
 ---
 ---@return boolean True if {dest} is an ancestor of {source}
 function M.is_ancestor(dest, source)
@@ -143,9 +151,12 @@ end
 
 --- Returns the node's range or an unpacked range table
 ---
----@param node_or_range (userdata|table) |tsnode| or table of positions
+---@param node_or_range (TSNode|table) Node or table of positions
 ---
----@return table `{ start_row, start_col, end_row, end_col }`
+---@return integer start_row
+---@return integer start_col
+---@return integer end_row
+---@return integer end_col
 function M.get_node_range(node_or_range)
   if type(node_or_range) == 'table' then
     return unpack(node_or_range)
@@ -156,9 +167,9 @@ end
 
 --- Determines whether (line, col) position is in node range
 ---
----@param node userdata |tsnode| defining the range
----@param line number Line (0-based)
----@param col number Column (0-based)
+---@param node TSNode defining the range
+---@param line integer Line (0-based)
+---@param col integer Column (0-based)
 ---
 ---@return boolean True if the position is in node range
 function M.is_in_node_range(node, line, col)
@@ -180,7 +191,7 @@ end
 
 --- Determines if a node contains a range
 ---
----@param node userdata |tsnode|
+---@param node TSNode
 ---@param range table
 ---
 ---@return boolean True if the {node} contains the {range}
@@ -197,9 +208,9 @@ end
 --- Each capture is represented by a table containing the capture name as a string as
 --- well as a table of metadata (`priority`, `conceal`, ...; empty if none are defined).
 ---
----@param bufnr number Buffer number (0 for current buffer)
----@param row number Position row
----@param col number Position column
+---@param bufnr integer Buffer number (0 for current buffer)
+---@param row integer Position row
+---@param col integer Position column
 ---
 ---@return table[] List of captures `{ capture = "capture name", metadata = { ... } }`
 function M.get_captures_at_pos(bufnr, row, col)
@@ -250,7 +261,7 @@ end
 
 --- Returns a list of highlight capture names under the cursor
 ---
----@param winnr (number|nil) Window handle or 0 for current window (default)
+---@param winnr (integer|nil) Window handle or 0 for current window (default)
 ---
 ---@return string[] List of capture names
 function M.get_captures_at_cursor(winnr)
@@ -271,14 +282,14 @@ end
 
 --- Returns the smallest named node at the given position
 ---
----@param bufnr number Buffer number (0 for current buffer)
----@param row number Position row
----@param col number Position column
+---@param bufnr integer Buffer number (0 for current buffer)
+---@param row integer Position row
+---@param col integer Position column
 ---@param opts table Optional keyword arguments:
 ---             - lang string|nil Parser language
 ---             - ignore_injections boolean Ignore injected languages (default true)
 ---
----@return userdata|nil |tsnode| under the cursor
+---@return TSNode|nil under the cursor
 function M.get_node_at_pos(bufnr, row, col, opts)
   if bufnr == 0 then
     bufnr = a.nvim_get_current_buf()
@@ -295,7 +306,7 @@ end
 
 --- Returns the smallest named node under the cursor
 ---
----@param winnr (number|nil) Window handle or 0 for current window (default)
+---@param winnr (integer|nil) Window handle or 0 for current window (default)
 ---
 ---@return string Name of node under the cursor
 function M.get_node_at_cursor(winnr)
@@ -323,7 +334,7 @@ end
 --- })
 --- </pre>
 ---
----@param bufnr (number|nil) Buffer to be highlighted (default: current buffer)
+---@param bufnr (integer|nil) Buffer to be highlighted (default: current buffer)
 ---@param lang (string|nil) Language of the parser (default: buffer filetype)
 function M.start(bufnr, lang)
   bufnr = bufnr or a.nvim_get_current_buf()
@@ -333,7 +344,7 @@ end
 
 --- Stops treesitter highlighting for a buffer
 ---
----@param bufnr (number|nil) Buffer to stop highlighting (default: current buffer)
+---@param bufnr (integer|nil) Buffer to stop highlighting (default: current buffer)
 function M.stop(bufnr)
   bufnr = bufnr or a.nvim_get_current_buf()
 
@@ -351,13 +362,13 @@ end
 ---@param opts table|nil Optional options table with the following possible keys:
 ---                      - lang (string|nil): The language of the source buffer. If omitted, the
 ---                        filetype of the source buffer is used.
----                      - bufnr (number|nil): Buffer to draw the tree into. If omitted, a new
+---                      - bufnr (integer|nil): Buffer to draw the tree into. If omitted, a new
 ---                        buffer is created.
----                      - winid (number|nil): Window id to display the tree buffer in. If omitted,
+---                      - winid (integer|nil): Window id to display the tree buffer in. If omitted,
 ---                        a new window is created with {command}.
 ---                      - command (string|nil): Vimscript command to create the window. Default
 ---                        value is "topleft 60vnew". Only used when {winid} is nil.
----                      - title (string|fun(bufnr:number):string|nil): Title of the window. If a
+---                      - title (string|fun(bufnr:integer):string|nil): Title of the window. If a
 ---                        function, it accepts the buffer number of the source buffer as its only
 ---                        argument and should return a string.
 function M.show_tree(opts)
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
new file mode 100644
index 0000000000..87b4560798
--- /dev/null
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -0,0 +1,60 @@
+---@meta
+
+---@class TSNode
+---@field id fun(self: TSNode): integer
+---@field range fun(self: TSNode): integer, integer, integer, integer
+---@field start fun(self: TSNode): integer, integer, integer
+---@field end_ fun(self: TSNode): integer, integer, integer
+---@field type fun(self: TSNode): string
+---@field symbol fun(self: TSNode): integer
+---@field named fun(self: TSNode): boolean
+---@field missing fun(self: TSNode): boolean
+---@field child_count fun(self: TSNode): integer
+---@field named_child_count fun(self: TSNode): integer
+---@field child fun(self: TSNode, integer): TSNode
+---@field name_child fun(self: TSNode, integer): TSNode
+---@field descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode
+---@field named_descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode
+---@field parent fun(self: TSNode): TSNode
+---@field next_sibling fun(self: TSNode): TSNode
+---@field prev_sibling fun(self: TSNode): TSNode
+---@field next_named_sibling fun(self: TSNode): TSNode
+---@field prev_named_sibling fun(self: TSNode): TSNode
+---@field named_children fun(self: TSNode): TSNode[]
+---@field has_error fun(self: TSNode): boolean
+---@field iter_children fun(self: TSNode): fun(): TSNode, string
+local TSNode = {}
+
+---@param query userdata
+---@param captures true
+---@param start integer
+---@param end_ integer
+---@return fun(): integer, TSNode, any
+function TSNode:_rawquery(query, captures, start, end_) end
+
+---@param query userdata
+---@param captures false
+---@param start integer
+---@param end_ integer
+---@return fun(): string, any
+function TSNode:_rawquery(query, captures, start, end_) end
+
+---@class TSParser
+---@field parse fun(self: TSParser, tree, source: integer|string): TSTree, integer[]
+---@field included_ranges fun(self: TSParser): integer[]
+---@field set_included_ranges fun(self: TSParser, ranges: integer[][])
+
+---@class TSTree
+---@field root fun(self: TSTree): TSNode
+---@field edit fun(self: TSTree, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _:integer)
+---@field copy fun(self: TSTree): TSTree
+
+---@return integer
+vim._ts_get_language_version = function() end
+
+---@return integer
+vim._ts_get_minimum_language_version = function() end
+
+---@param lang string
+---@return TSParser
+vim._create_ts_parser = function(lang) end
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index d77a0d0d03..8adaa4ef2f 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -1,13 +1,27 @@
 local a = vim.api
 local query = require('vim.treesitter.query')
 
--- support reload for quick experimentation
+---@alias TSHlIter fun(): integer, TSNode, TSMetadata
+
+---@class TSHighlightState
+---@field next_row integer
+---@field iter TSHlIter|nil
+
 ---@class TSHighlighter
+---@field active table<integer,TSHighlighter>
+---@field bufnr integer
+---@field orig_spelloptions string
+---@field _highlight_states table<TSTree,TSHighlightState>
+---@field _queries table<string,TSHighlighterQuery>
+---@field tree LanguageTree
 local TSHighlighter = rawget(vim.treesitter, 'TSHighlighter') or {}
 TSHighlighter.__index = TSHighlighter
 
 TSHighlighter.active = TSHighlighter.active or {}
 
+---@class TSHighlighterQuery
+---@field _query Query|nil
+---@field hl_cache table<integer,integer>
 local TSHighlighterQuery = {}
 TSHighlighterQuery.__index = TSHighlighterQuery
 
@@ -46,7 +60,7 @@ end
 
 --- Creates a new highlighter using @param tree
 ---
----@param tree LanguageTree |LanguageTree| parser object to use for highlighting
+---@param tree LanguageTree parser object to use for highlighting
 ---@param opts (table|nil) Configuration of the highlighter:
 ---           - queries table overwrite queries used by the highlighter
 ---@return TSHighlighter Created highlighter object
@@ -57,9 +71,10 @@ function TSHighlighter.new(tree, opts)
     error('TSHighlighter can not be used with a string parser source.')
   end
 
-  opts = opts or {}
+  opts = opts or {} ---@type { queries: table<string,string> }
   self.tree = tree
   tree:register_cbs({
+    ---@diagnostic disable:invisible
     on_changedtree = function(...)
       self:on_changedtree(...)
     end,
@@ -67,17 +82,20 @@ function TSHighlighter.new(tree, opts)
       self:on_bytes(...)
     end,
     on_detach = function(...)
+      ---@diagnostic disable-next-line:redundant-parameter
       self:on_detach(...)
     end,
   })
 
-  self.bufnr = tree:source()
+  self.bufnr = tree:source() --[[@as integer]]
   self.edit_count = 0
   self.redraw_count = 0
   self.line_count = {}
   -- A map of highlight states.
   -- This state is kept during rendering across each line update.
   self._highlight_states = {}
+
+  ---@type table<string,TSHighlighterQuery>
   self._queries = {}
 
   -- Queries for a specific language can be overridden by a custom
@@ -128,6 +146,8 @@ function TSHighlighter:destroy()
 end
 
 ---@private
+---@param tstree TSTree
+---@return TSHighlightState
 function TSHighlighter:get_highlight_state(tstree)
   if not self._highlight_states[tstree] then
     self._highlight_states[tstree] = {
@@ -145,6 +165,8 @@ function TSHighlighter:reset_highlight_state()
 end
 
 ---@private
+---@param start_row integer
+---@param new_end integer
 function TSHighlighter:on_bytes(_, _, start_row, _, _, _, _, _, new_end)
   a.nvim__buf_redraw_range(self.bufnr, start_row, start_row + new_end + 1)
 end
@@ -155,6 +177,7 @@ function TSHighlighter:on_detach()
 end
 
 ---@private
+---@param changes integer[][]?
 function TSHighlighter:on_changedtree(changes)
   for _, ch in ipairs(changes or {}) do
     a.nvim__buf_redraw_range(self.bufnr, ch[1], ch[3] + 1)
@@ -165,7 +188,7 @@ end
 --
 ---@private
 ---@param lang string Language used by the highlighter.
----@return Query
+---@return TSHighlighterQuery
 function TSHighlighter:get_query(lang)
   if not self._queries[lang] then
     self._queries[lang] = TSHighlighterQuery.new(lang)
@@ -175,7 +198,12 @@ function TSHighlighter:get_query(lang)
 end
 
 ---@private
+---@param self TSHighlighter
+---@param buf integer
+---@param line integer
+---@param is_spell_nav boolean
 local function on_line_impl(self, buf, line, is_spell_nav)
+  ---@diagnostic disable:invisible
   self.tree:for_each_tree(function(tstree, tree)
     if not tstree then
       return
@@ -213,7 +241,7 @@ local function on_line_impl(self, buf, line, is_spell_nav)
       local hl = highlighter_query.hl_cache[capture]
 
       local capture_name = highlighter_query:query().captures[capture]
-      local spell = nil
+      local spell = nil ---@type boolean?
       if capture_name == 'spell' then
         spell = true
       elseif capture_name == 'nospell' then
@@ -242,6 +270,9 @@ local function on_line_impl(self, buf, line, is_spell_nav)
 end
 
 ---@private
+---@param _win integer
+---@param buf integer
+---@param line integer
 function TSHighlighter._on_line(_, _win, buf, line, _)
   local self = TSHighlighter.active[buf]
   if not self then
@@ -252,6 +283,9 @@ function TSHighlighter._on_line(_, _win, buf, line, _)
 end
 
 ---@private
+---@param buf integer
+---@param srow integer
+---@param erow integer
 function TSHighlighter._on_spell_nav(_, _, buf, srow, _, erow, _)
   local self = TSHighlighter.active[buf]
   if not self then
@@ -266,6 +300,7 @@ function TSHighlighter._on_spell_nav(_, _, buf, srow, _, erow, _)
 end
 
 ---@private
+---@param buf integer
 function TSHighlighter._on_buf(_, buf)
   local self = TSHighlighter.active[buf]
   if self then
@@ -274,6 +309,9 @@ function TSHighlighter._on_buf(_, buf)
 end
 
 ---@private
+---@param _win integer
+---@param buf integer
+---@param _topline integer
 function TSHighlighter._on_win(_, _win, buf, _topline)
   local self = TSHighlighter.active[buf]
   if not self then
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index a1e96f8ef2..89aac3ae26 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -2,20 +2,39 @@ local a = vim.api
 local query = require('vim.treesitter.query')
 local language = require('vim.treesitter.language')
 
----@class LanguageTree
----@field _callbacks function[] Callback handlers
----@field _children LanguageTree[] Injected languages
----@field _injection_query table Queries defining injected languages
----@field _opts table Options
----@field _parser userdata Parser for language
----@field _regions table List of regions this tree should manage and parse
----@field _lang string Language name
----@field _regions table
----@field _source (number|string) Buffer or string to parse
----@field _trees userdata[] Reference to parsed |tstree| (one for each language)
----@field _valid boolean If the parsed tree is valid
+---@alias Range {[1]: integer, [2]: integer, [3]: integer, [4]: integer}
+--
+---@alias TSCallbackName
+---| 'changedtree'
+---| 'bytes'
+---| 'detach'
+---| 'child_added'
+---| 'child_removed'
+
+---@alias TSCallbackNameOn
+---| 'on_changedtree'
+---| 'on_bytes'
+---| 'on_detach'
+---| 'on_child_added'
+---| 'on_child_removed'
 
+---@class LanguageTree
+---@field private _callbacks table<TSCallbackName,function[]> Callback handlers
+---@field private _children table<string,LanguageTree> Injected languages
+---@field private _injection_query Query Queries defining injected languages
+---@field private _opts table Options
+---@field private _parser TSParser Parser for language
+---@field private _regions Range[][] List of regions this tree should manage and parse
+---@field private _lang string Language name
+---@field private _source (integer|string) Buffer or string to parse
+---@field private _trees TSTree[] Reference to parsed tree (one for each language)
+---@field private _valid boolean If the parsed tree is valid
 local LanguageTree = {}
+
+---@class LanguageTreeOpts
+---@field queries table<string,string>  -- Deprecated
+---@field injections table<string,string>
+
 LanguageTree.__index = LanguageTree
 
 --- A |LanguageTree| holds the treesitter parser for a given language {lang} used
@@ -23,16 +42,17 @@ LanguageTree.__index = LanguageTree
 --- needs to store parsers for these child languages as well (which in turn may contain
 --- child languages themselves, hence the name).
 ---
----@param source (number|string) Buffer or a string of text to parse
+---@param source (integer|string) Buffer or a string of text to parse
 ---@param lang string Root language this tree represents
 ---@param opts (table|nil) Optional keyword arguments:
 ---             - injections table Mapping language to injection query strings.
 ---                                This is useful for overriding the built-in
 ---                                runtime file searching for the injection language
 ---                                query per language.
----@return LanguageTree |LanguageTree| parser object
+---@return LanguageTree parser object
 function LanguageTree.new(source, lang, opts)
   language.require_language(lang)
+  ---@type LanguageTreeOpts
   opts = opts or {}
 
   if opts.queries then
@@ -65,6 +85,7 @@ function LanguageTree.new(source, lang, opts)
 end
 
 --- Invalidates this parser and all its children
+---@param reload boolean|nil
 function LanguageTree:invalidate(reload)
   self._valid = false
 
@@ -73,7 +94,7 @@ function LanguageTree:invalidate(reload)
     self._trees = {}
   end
 
-  for _, child in ipairs(self._children) do
+  for _, child in pairs(self._children) do
     child:invalidate(reload)
   end
 end
@@ -111,8 +132,8 @@ end
 --- This will run the injection query for this language to
 --- determine if any child languages should be created.
 ---
----@return userdata[] Table of parsed |tstree|
----@return table Change list
+---@return TSTree[]
+---@return table|nil Change list
 function LanguageTree:parse()
   if self._valid then
     return self._trees
@@ -146,7 +167,7 @@ function LanguageTree:parse()
   end
 
   local injections_by_lang = self:_get_injections()
-  local seen_langs = {}
+  local seen_langs = {} ---@type table<string,boolean>
 
   for lang, injection_ranges in pairs(injections_by_lang) do
     local has_lang = language.require_language(lang, nil, true)
@@ -188,8 +209,8 @@ end
 
 --- Invokes the callback for each |LanguageTree| and its children recursively
 ---
----@param fn function(tree: LanguageTree, lang: string)
----@param include_self boolean Whether to include the invoking tree in the results
+---@param fn fun(tree: LanguageTree, lang: string)
+---@param include_self boolean|nil Whether to include the invoking tree in the results
 function LanguageTree:for_each_child(fn, include_self)
   if include_self then
     fn(self, self._lang)
@@ -204,7 +225,7 @@ end
 ---
 --- Note: This includes the invoking tree's child trees as well.
 ---
----@param fn function(tree: TSTree, languageTree: LanguageTree)
+---@param fn fun(tree: TSTree, ltree: LanguageTree)
 function LanguageTree:for_each_tree(fn)
   for _, tree in ipairs(self._trees) do
     fn(tree, self)
@@ -221,7 +242,7 @@ end
 ---
 ---@private
 ---@param lang string Language to add.
----@return LanguageTree Injected |LanguageTree|
+---@return LanguageTree injected
 function LanguageTree:add_child(lang)
   if self._children[lang] then
     self:remove_child(lang)
@@ -258,7 +279,7 @@ end
 --- `remove_child` must be called on the parent to remove it.
 function LanguageTree:destroy()
   -- Cleanup here
-  for _, child in ipairs(self._children) do
+  for _, child in pairs(self._children) do
     child:destroy()
   end
 end
@@ -280,20 +301,22 @@ end
 --- Note: This call invalidates the tree and requires it to be parsed again.
 ---
 ---@private
----@param regions table List of regions this tree should manage and parse.
+---@param regions integer[][][] List of regions this tree should manage and parse.
 function LanguageTree:set_included_regions(regions)
   -- Transform the tables from 4 element long to 6 element long (with byte offset)
   for _, region in ipairs(regions) do
     for i, range in ipairs(region) do
       if type(range) == 'table' and #range == 4 then
+        ---@diagnostic disable-next-line:no-unknown
         local start_row, start_col, end_row, end_col = unpack(range)
         local start_byte = 0
         local end_byte = 0
+        local source = self._source
         -- TODO(vigoux): proper byte computation here, and account for EOL ?
-        if type(self._source) == 'number' then
+        if type(source) == 'number' then
           -- Easy case, this is a buffer parser
-          start_byte = a.nvim_buf_get_offset(self._source, start_row) + start_col
-          end_byte = a.nvim_buf_get_offset(self._source, end_row) + end_col
+          start_byte = a.nvim_buf_get_offset(source, start_row) + start_col
+          end_byte = a.nvim_buf_get_offset(source, end_row) + end_col
         elseif type(self._source) == 'string' then
           -- string parser, single `\n` delimited string
           start_byte = vim.fn.byteidx(self._source, start_col)
@@ -320,9 +343,13 @@ function LanguageTree:included_regions()
 end
 
 ---@private
+---@param node TSNode
+---@param id integer
+---@param metadata TSMetadata
+---@return Range
 local function get_range_from_metadata(node, id, metadata)
   if metadata[id] and metadata[id].range then
-    return metadata[id].range
+    return metadata[id].range --[[@as Range]]
   end
   return { node:range() }
 end
@@ -334,11 +361,13 @@ end
 --- TODO: Allow for an offset predicate to tailor the injection range
 ---       instead of using the entire nodes range.
 ---@private
+---@return table<string, integer[][]>
 function LanguageTree:_get_injections()
   if not self._injection_query then
     return {}
   end
 
+  ---@type table<integer,table<string,table<integer,table>>>
   local injections = {}
 
   for tree_index, tree in ipairs(self._trees) do
@@ -348,14 +377,14 @@ function LanguageTree:_get_injections()
     for pattern, match, metadata in
       self._injection_query:iter_matches(root_node, self._source, start_line, end_line + 1)
     do
-      local lang = nil
-      local ranges = {}
-      local combined = metadata.combined
+      local lang = nil ---@type string
+      local ranges = {} ---@type Range[]
+      local combined = metadata.combined ---@type boolean
 
       -- Directives can configure how injections are captured as well as actual node captures.
       -- This allows more advanced processing for determining ranges and language resolution.
       if metadata.content then
-        local content = metadata.content
+        local content = metadata.content ---@type any
 
         -- Allow for captured nodes to be used
         if type(content) == 'number' then
@@ -368,7 +397,7 @@ function LanguageTree:_get_injections()
       end
 
       if metadata.language then
-        lang = metadata.language
+        lang = metadata.language ---@type string
       end
 
       -- You can specify the content and language together
@@ -379,7 +408,7 @@ function LanguageTree:_get_injections()
 
         -- Lang should override any other language tag
         if name == 'language' and not lang then
-          lang = query.get_node_text(node, self._source)
+          lang = query.get_node_text(node, self._source) --[[@as string]]
         elseif name == 'combined' then
           combined = true
         elseif name == 'content' and #ranges == 0 then
@@ -417,6 +446,7 @@ function LanguageTree:_get_injections()
     end
   end
 
+  ---@type table<string,Range[][]>
   local result = {}
 
   -- Generate a map by lang of node lists.
@@ -429,11 +459,13 @@ function LanguageTree:_get_injections()
 
       for _, entry in pairs(patterns) do
         if entry.combined then
+          ---@diagnostic disable-next-line:no-unknown
           local regions = vim.tbl_map(function(e)
             return vim.tbl_flatten(e)
           end, entry.regions)
           table.insert(result[lang], regions)
         else
+          ---@diagnostic disable-next-line:no-unknown
           for _, ranges in ipairs(entry.regions) do
             table.insert(result[lang], ranges)
           end
@@ -446,6 +478,7 @@ function LanguageTree:_get_injections()
 end
 
 ---@private
+---@param cb_name TSCallbackName
 function LanguageTree:_do_callback(cb_name, ...)
   for _, cb in ipairs(self._callbacks[cb_name]) do
     cb(...)
@@ -453,6 +486,17 @@ function LanguageTree:_do_callback(cb_name, ...)
 end
 
 ---@private
+---@param bufnr integer
+---@param changed_tick integer
+---@param start_row integer
+---@param start_col integer
+---@param start_byte integer
+---@param old_row integer
+---@param old_col integer
+---@param old_byte integer
+---@param new_row integer
+---@param new_col integer
+---@param new_byte integer
 function LanguageTree:_on_bytes(
   bufnr,
   changed_tick,
@@ -523,6 +567,7 @@ end
 ---           - `on_child_added` : emitted when a child is added to the tree.
 ---           - `on_child_removed` : emitted when a child is removed from the tree.
 function LanguageTree:register_cbs(cbs)
+  ---@cast cbs table<TSCallbackNameOn,function>
   if not cbs then
     return
   end
@@ -549,6 +594,9 @@ function LanguageTree:register_cbs(cbs)
 end
 
 ---@private
+---@param tree TSTree
+---@param range Range
+---@return boolean
 local function tree_contains(tree, range)
   local start_row, start_col, end_row, end_col = tree:root():range()
   local start_fits = start_row < range[1] or (start_row == range[1] and start_col <= range[2])
@@ -559,7 +607,7 @@ end
 
 --- Determines whether {range} is contained in the |LanguageTree|.
 ---
----@param range table `{ start_line, start_col, end_line, end_col }`
+---@param range Range `{ start_line, start_col, end_line, end_col }`
 ---@return boolean
 function LanguageTree:contains(range)
   for _, tree in pairs(self._trees) do
@@ -573,10 +621,10 @@ end
 
 --- Gets the tree that contains {range}.
 ---
----@param range table `{ start_line, start_col, end_line, end_col }`
+---@param range Range `{ start_line, start_col, end_line, end_col }`
 ---@param opts table|nil Optional keyword arguments:
 ---             - ignore_injections boolean Ignore injected languages (default true)
----@return userdata|nil Contained |tstree|
+---@return TSTree|nil
 function LanguageTree:tree_for_range(range, opts)
   opts = opts or {}
   local ignore = vim.F.if_nil(opts.ignore_injections, true)
@@ -602,10 +650,10 @@ end
 
 --- Gets the smallest named node that contains {range}.
 ---
----@param range table `{ start_line, start_col, end_line, end_col }`
+---@param range Range `{ start_line, start_col, end_line, end_col }`
 ---@param opts table|nil Optional keyword arguments:
 ---             - ignore_injections boolean Ignore injected languages (default true)
----@return userdata|nil Found |tsnode|
+---@return TSNode|nil Found node
 function LanguageTree:named_node_for_range(range, opts)
   local tree = self:tree_for_range(range, opts)
   if tree then
@@ -615,7 +663,7 @@ end
 
 --- Gets the appropriate language that contains {range}.
 ---
----@param range table `{ start_line, start_col, end_line, end_col }`
+---@param range Range `{ start_line, start_col, end_line, end_col }`
 ---@return LanguageTree Managing {range}
 function LanguageTree:language_for_range(range)
   for _, child in pairs(self._children) do
diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index bb073290c6..be7764e6f0 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -1,12 +1,13 @@
 local api = vim.api
 
-local M = {}
-
----@class Playground
+---@class TSPlayground
 ---@field ns number API namespace
 ---@field opts table Options table with the following keys:
 ---                  - anon (boolean): If true, display anonymous nodes
 ---                  - lang (boolean): If true, display the language alongside each node
+---@field nodes Node[]
+---@field named Node[]
+local TSPlayground = {}
 ---
 ---@class Node
 ---@field id number Node id
@@ -18,6 +19,7 @@ local M = {}
 ---@field end_lnum number Final line number of this node in the source buffer
 ---@field end_col number Final column number of this node in the source buffer
 ---@field lang string Source language of this node
+---@field root TSNode
 
 --- Traverse all child nodes starting at {node}.
 ---
@@ -31,10 +33,10 @@ local M = {}
 --- node of each of these trees is contained within a node in the primary tree. The {injections}
 --- table maps nodes in the primary tree to root nodes of injected trees.
 ---
----@param node userdata Starting node to begin traversal |tsnode|
+---@param node TSNode Starting node to begin traversal |tsnode|
 ---@param depth number Current recursion depth
 ---@param lang string Language of the tree currently being traversed
----@param injections table Mapping of node ids to root nodes of injected language trees (see
+---@param injections table<integer,Node> Mapping of node ids to root nodes of injected language trees (see
 ---                        explanation above)
 ---@param tree Node[] Output table containing a list of tables each representing a node in the tree
 ---@private
@@ -48,7 +50,7 @@ local function traverse(node, depth, lang, injections, tree)
     local type = child:type()
     local lnum, col, end_lnum, end_col = child:range()
     local named = child:named()
-    local text
+    local text ---@type string
     if named then
       if field then
         text = string.format('%s: (%s)', field, type)
@@ -79,14 +81,14 @@ end
 
 --- Create a new Playground object.
 ---
----@param bufnr number Source buffer number
+---@param bufnr integer Source buffer number
 ---@param lang string|nil Language of source buffer
 ---
----@return Playground|nil
+---@return TSPlayground|nil
 ---@return string|nil Error message, if any
 ---
 ---@private
-function M.new(self, bufnr, lang)
+function TSPlayground:new(bufnr, lang)
   local ok, parser = pcall(vim.treesitter.get_parser, bufnr or 0, lang)
   if not ok then
     return nil, 'No parser available for the given buffer'
@@ -96,7 +98,7 @@ function M.new(self, bufnr, lang)
   -- the primary tree that contains that root. Add a mapping from the node in the primary tree to
   -- the root in the child tree to the {injections} table.
   local root = parser:parse()[1]:root()
-  local injections = {}
+  local injections = {} ---@type table<integer,table>
   parser:for_each_child(function(child, lang_)
     child:for_each_tree(function(tree)
       local r = tree:root()
@@ -112,7 +114,7 @@ function M.new(self, bufnr, lang)
 
   local nodes = traverse(root, 0, parser:lang(), injections, {})
 
-  local named = {}
+  local named = {} ---@type Node[]
   for _, v in ipairs(nodes) do
     if v.named then
       named[#named + 1] = v
@@ -138,9 +140,9 @@ end
 ---
 ---@param bufnr number Buffer number to write into.
 ---@private
-function M.draw(self, bufnr)
+function TSPlayground:draw(bufnr)
   vim.bo[bufnr].modifiable = true
-  local lines = {}
+  local lines = {} ---@type string[]
   for _, item in self:iter() do
     lines[#lines + 1] = table.concat({
       string.rep(' ', item.depth),
@@ -168,19 +170,19 @@ end
 ---@param i number Node number to get
 ---@return Node
 ---@private
-function M.get(self, i)
+function TSPlayground:get(i)
   local t = self.opts.anon and self.nodes or self.named
   return t[i]
 end
 
 --- Iterate over all of the nodes in this Playground object.
 ---
----@return function Iterator over all nodes in this Playground
+---@return (fun(): integer, Node) Iterator over all nodes in this Playground
 ---@return table
 ---@return number
 ---@private
-function M.iter(self)
+function TSPlayground:iter()
   return ipairs(self.opts.anon and self.nodes or self.named)
 end
 
-return M
+return TSPlayground
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index dbf134573d..84ed2667b9 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -1,21 +1,25 @@
 local a = vim.api
 local language = require('vim.treesitter.language')
 
--- query: pattern matching on trees
--- predicate matching is implemented in lua
---
 ---@class Query
 ---@field captures string[] List of captures used in query
----@field info table Contains used queries, predicates, directives
+---@field info TSQueryInfo Contains used queries, predicates, directives
 ---@field query userdata Parsed query
 local Query = {}
 Query.__index = Query
 
+---@class TSQueryInfo
+---@field captures table
+---@field patterns table<string,any[][]>
+
 local M = {}
 
 ---@private
+---@param files string[]
+---@return string[]
 local function dedupe_files(files)
   local result = {}
+  ---@type table<string,boolean>
   local seen = {}
 
   for _, path in ipairs(files) do
@@ -65,10 +69,10 @@ function M.get_query_files(lang, query_name, is_included)
     return {}
   end
 
-  local base_query = nil
+  local base_query = nil ---@type string?
   local extensions = {}
 
-  local base_langs = {}
+  local base_langs = {} ---@type string[]
 
   -- Now get the base languages by looking at the first line of every file
   -- The syntax is the following :
@@ -87,6 +91,7 @@ function M.get_query_files(lang, query_name, is_included)
     local extension = false
 
     for modeline in
+      ---@return string
       function()
         return file:read('*l')
       end
@@ -97,6 +102,7 @@ function M.get_query_files(lang, query_name, is_included)
 
       local langlist = modeline:match(MODELINE_FORMAT)
       if langlist then
+        ---@diagnostic disable-next-line:param-type-mismatch
         for _, incllang in ipairs(vim.split(langlist, ',', true)) do
           local is_optional = incllang:match('%(.*%)')
 
@@ -137,6 +143,8 @@ function M.get_query_files(lang, query_name, is_included)
 end
 
 ---@private
+---@param filenames string[]
+---@return string
 local function read_query_files(filenames)
   local contents = {}
 
@@ -147,7 +155,8 @@ local function read_query_files(filenames)
   return table.concat(contents, '')
 end
 
---- The explicitly set queries from |vim.treesitter.query.set_query()|
+-- The explicitly set queries from |vim.treesitter.query.set_query()|
+---@type table<string,table<string,Query>>
 local explicit_queries = setmetatable({}, {
   __index = function(t, k)
     local lang_queries = {}
@@ -174,7 +183,7 @@ end
 ---@param lang string Language to use for the query
 ---@param query_name string Name of the query (e.g. "highlights")
 ---
----@return Query Parsed query
+---@return Query|nil Parsed query
 function M.get_query(lang, query_name)
   if explicit_queries[lang][query_name] then
     return explicit_queries[lang][query_name]
@@ -188,6 +197,7 @@ function M.get_query(lang, query_name)
   end
 end
 
+---@type {[string]: {[string]: Query}}
 local query_cache = vim.defaulttable(function()
   return setmetatable({}, { __mode = 'v' })
 end)
@@ -226,11 +236,11 @@ end
 
 --- Gets the text corresponding to a given node
 ---
----@param node userdata |tsnode|
+---@param node TSNode
 ---@param source (number|string) Buffer or string from which the {node} is extracted
 ---@param opts (table|nil) Optional parameters.
 ---          - concat: (boolean) Concatenate result in a string (default true)
----@return (string[]|string)
+---@return (string[]|string|nil)
 function M.get_node_text(node, source, opts)
   opts = opts or {}
   local concat = vim.F.if_nil(opts.concat, true)
@@ -239,12 +249,12 @@ function M.get_node_text(node, source, opts)
   local end_row, end_col, end_byte = node:end_()
 
   if type(source) == 'number' then
-    local lines
     local eof_row = a.nvim_buf_line_count(source)
     if start_row >= eof_row then
       return nil
     end
 
+    local lines ---@type string[]
     if end_col == 0 then
       lines = a.nvim_buf_get_lines(source, start_row, end_row, true)
       end_col = -1
@@ -267,8 +277,13 @@ function M.get_node_text(node, source, opts)
   end
 end
 
+---@alias TSMatch table<integer,TSNode>
+
+---@alias TSPredicate fun(match: TSMatch, _, _, predicate: any[]): boolean
+
 -- Predicate handler receive the following arguments
 -- (match, pattern, bufnr, predicate)
+---@type table<string,TSPredicate>
 local predicate_handlers = {
   ['eq?'] = function(match, _, source, predicate)
     local node = match[predicate[2]]
@@ -277,13 +292,13 @@ local predicate_handlers = {
     end
     local node_text = M.get_node_text(node, source)
 
-    local str
+    local str ---@type string
     if type(predicate[3]) == 'string' then
       -- (#eq? @aa "foo")
       str = predicate[3]
     else
       -- (#eq? @aa @bb)
-      str = M.get_node_text(match[predicate[3]], source)
+      str = M.get_node_text(match[predicate[3]], source) --[[@as string]]
     end
 
     if node_text ~= str or str == nil then
@@ -299,7 +314,7 @@ local predicate_handlers = {
       return true
     end
     local regex = predicate[3]
-    return string.find(M.get_node_text(node, source), regex)
+    return string.find(M.get_node_text(node, source) --[[@as string]], regex) ~= nil
   end,
 
   ['match?'] = (function()
@@ -321,10 +336,12 @@ local predicate_handlers = {
     })
 
     return function(match, _, source, pred)
+      ---@cast match TSMatch
       local node = match[pred[2]]
       if not node then
         return true
       end
+      ---@diagnostic disable-next-line no-unknown
       local regex = compiled_vim_regexes[pred[3]]
       return regex:match_str(M.get_node_text(node, source))
     end
@@ -335,7 +352,7 @@ local predicate_handlers = {
     if not node then
       return true
     end
-    local node_text = M.get_node_text(node, source)
+    local node_text = M.get_node_text(node, source) --[[@as string]]
 
     for i = 3, #predicate do
       if string.find(node_text, predicate[i], 1, true) then
@@ -359,6 +376,7 @@ local predicate_handlers = {
     if not string_set then
       string_set = {}
       for i = 3, #predicate do
+        ---@diagnostic disable-next-line:no-unknown
         string_set[predicate[i]] = true
       end
       predicate['string_set'] = string_set
@@ -371,21 +389,39 @@ local predicate_handlers = {
 -- As we provide lua-match? also expose vim-match?
 predicate_handlers['vim-match?'] = predicate_handlers['match?']
 
+---@class TSMetadata
+---@field [integer] TSMetadata
+---@field [string] integer|string
+---@field range Range
+
+---@alias TSDirective fun(match: TSMatch, _, _, predicate: any[], metadata: TSMetadata)
+
+-- Predicate handler receive the following arguments
+-- (match, pattern, bufnr, predicate)
+
 -- Directives store metadata or perform side effects against a match.
 -- Directives should always end with a `!`.
 -- Directive handler receive the following arguments
 -- (match, pattern, bufnr, predicate, metadata)
+---@type table<string,TSDirective>
 local directive_handlers = {
   ['set!'] = function(_, _, _, pred, metadata)
     if #pred == 4 then
       -- (#set! @capture "key" "value")
+      ---@diagnostic disable-next-line:no-unknown
       local _, capture_id, key, value = unpack(pred)
+      ---@cast value integer|string
+      ---@cast capture_id integer
+      ---@cast key string
       if not metadata[capture_id] then
         metadata[capture_id] = {}
       end
       metadata[capture_id][key] = value
     else
+      ---@diagnostic disable-next-line:no-unknown
       local _, key, value = unpack(pred)
+      ---@cast value integer|string
+      ---@cast key string
       -- (#set! "key" "value")
       metadata[key] = value
     end
@@ -393,9 +429,11 @@ local directive_handlers = {
   -- Shifts the range of a node.
   -- Example: (#offset! @_node 0 1 0 -1)
   ['offset!'] = function(match, _, _, pred, metadata)
+    ---@cast pred integer[]
     local capture_id = pred[2]
     local offset_node = match[capture_id]
     local range = { offset_node:range() }
+    ---@cast range integer[] bug in sumneko
     local start_row_offset = pred[3] or 0
     local start_col_offset = pred[4] or 0
     local end_row_offset = pred[5] or 0
@@ -419,8 +457,9 @@ local directive_handlers = {
 --- Adds a new predicate to be used in queries
 ---
 ---@param name string Name of the predicate, without leading #
----@param handler function(match:table, pattern:string, bufnr:number, predicate:string[])
+---@param handler function(match:table<string,TSNode>, pattern:string, bufnr:number, predicate:string[])
 ---   - see |vim.treesitter.query.add_directive()| for argument meanings
+---@param force boolean
 function M.add_predicate(name, handler, force)
   if predicate_handlers[name] and not force then
     error(string.format('Overriding %s', name))
@@ -437,12 +476,13 @@ end
 --- metadata table `metadata[capture_id].key = value`
 ---
 ---@param name string Name of the directive, without leading #
----@param handler function(match:table, pattern:string, bufnr:number, predicate:string[], metadata:table)
+---@param handler function(match:table<string,TSNode>, pattern:string, bufnr:number, predicate:string[], metadata:table)
 ---   - match: see |treesitter-query|
 ---      - node-level data are accessible via `match[capture_id]`
 ---   - pattern: see |treesitter-query|
 ---   - predicate: list of strings containing the full directive being called, e.g.
 ---     `(node (#set! conceal "-"))` would get the predicate `{ "#set!", "conceal", "-" }`
+---@param force boolean
 function M.add_directive(name, handler, force)
   if directive_handlers[name] and not force then
     error(string.format('Overriding %s', name))
@@ -474,6 +514,9 @@ local function is_directive(name)
 end
 
 ---@private
+---@param match TSMatch
+---@param pattern string
+---@param source integer|string
 function Query:match_preds(match, pattern, source)
   local preds = self.info.patterns[pattern]
 
@@ -482,8 +525,9 @@ function Query:match_preds(match, pattern, source)
     -- continue on the other case. This way unknown predicates will not be considered,
     -- which allows some testing and easier user extensibility (#12173).
     -- Also, tree-sitter strips the leading # from predicates for us.
-    local pred_name
-    local is_not
+    local pred_name ---@type string
+
+    local is_not ---@type boolean
 
     -- Skip over directives... they will get processed after all the predicates.
     if not is_directive(pred[1]) then
@@ -513,6 +557,8 @@ function Query:match_preds(match, pattern, source)
 end
 
 ---@private
+---@param match TSMatch
+---@param metadata TSMetadata
 function Query:apply_directives(match, pattern, source, metadata)
   local preds = self.info.patterns[pattern]
 
@@ -534,6 +580,10 @@ end
 -- When the node's range is used, the stop is incremented by 1
 -- to make the search inclusive.
 ---@private
+---@param start integer
+---@param stop integer
+---@param node TSNode
+---@return integer, integer
 local function value_or_node_range(start, stop, node)
   if start == nil and stop == nil then
     local node_start, _, node_stop, _ = node:range()
@@ -565,14 +615,12 @@ end
 --- end
 --- </pre>
 ---
----@param node userdata |tsnode| under which the search will occur
----@param source (number|string) Source buffer or string to extract text from
+---@param node TSNode under which the search will occur
+---@param source (integer|string) Source buffer or string to extract text from
 ---@param start number Starting line for the search
 ---@param stop number Stopping line for the search (end-exclusive)
 ---
----@return number capture Matching capture id
----@return table capture_node Capture for {node}
----@return table metadata for the {capture}
+---@return (fun(): integer, TSNode, TSMetadata): capture id, capture node, metadata
 function Query:iter_captures(node, source, start, stop)
   if type(source) == 'number' and source == 0 then
     source = vim.api.nvim_get_current_buf()
@@ -622,14 +670,12 @@ end
 --- end
 --- </pre>
 ---
----@param node userdata |tsnode| under which the search will occur
----@param source (number|string) Source buffer or string to search
----@param start number Starting line for the search
----@param stop number Stopping line for the search (end-exclusive)
+---@param node TSNode under which the search will occur
+---@param source (integer|string) Source buffer or string to search
+---@param start integer Starting line for the search
+---@param stop integer Stopping line for the search (end-exclusive)
 ---
----@return number pattern id
----@return table match
----@return table metadata
+---@return (fun(): integer, table<integer,TSNode>, table): pattern id, match, metadata
 function Query:iter_matches(node, source, start, stop)
   if type(source) == 'number' and source == 0 then
     source = vim.api.nvim_get_current_buf()
@@ -638,6 +684,7 @@ function Query:iter_matches(node, source, start, stop)
   start, stop = value_or_node_range(start, stop, node)
 
   local raw_iter = node:_rawquery(self.query, false, start, stop)
+  ---@cast raw_iter fun(): string, any
   local function iter()
     local pattern, match = raw_iter()
     local metadata = {}
-- 
cgit 


From 4b9bb3a1841489a18bbeb124fc11cbf359553ef5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Feb 2023 16:05:45 +0100
Subject: vim-patch:9.0.1278: go.work.sum files are not recognized (#22121)

Problem:    go.work.sum files are not recognized.
Solution:   Recognize go.work.sum files as the gosum filetype. (Amaan Qureshi,
            closes vim/vim#11940)

https://github.com/vim/vim/commit/4ad8ae8465e30df38dba31910f130891b16d38a0

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 8144731b09..bc30b3bd11 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1433,6 +1433,7 @@ local filename = {
   gnashrc = 'gnash',
   ['.gnuplot'] = 'gnuplot',
   ['go.sum'] = 'gosum',
+  ['go.work.sum'] = 'gosum',
   ['go.work'] = 'gowork',
   ['.gprc'] = 'gp',
   ['/.gnupg/gpg.conf'] = 'gpg',
-- 
cgit 


From bb8845340b1b9c2180fb19f049ff9deff5857d99 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 21 Jul 2022 12:08:37 +0100
Subject: feat(treesitter): allow capture text to be transformed

Co-authored-by: Lewis Russell <lewis6991@gmail.com>
---
 runtime/doc/news.txt                        |  3 +++
 runtime/lua/vim/treesitter/languagetree.lua | 10 +++++++++-
 runtime/lua/vim/treesitter/query.lua        | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 5c234677ef..7c3f295560 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -151,6 +151,9 @@ The following new APIs or features were added.
 
 • |:highlight| now supports an additional attribute "altfont".
 
+• Treesitter captures can now be transformed by directives. This will allow
+  more complicated dynamic language injections.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 89aac3ae26..3e1bc5d1cb 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -354,6 +354,14 @@ local function get_range_from_metadata(node, id, metadata)
   return { node:range() }
 end
 
+---@private
+local function get_node_text(node, id, metadata, source)
+  if metadata[id] and metadata[id].text then
+    return metadata[id].text
+  end
+  return query.get_node_text(node, source)
+end
+
 --- Gets language injection points by language.
 ---
 --- This is where most of the injection processing occurs.
@@ -408,7 +416,7 @@ function LanguageTree:_get_injections()
 
         -- Lang should override any other language tag
         if name == 'language' and not lang then
-          lang = query.get_node_text(node, self._source) --[[@as string]]
+          lang = get_node_text(node, id, metadata, self._source) --[[@as string]]
         elseif name == 'combined' then
           combined = true
         elseif name == 'content' and #ranges == 0 then
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 84ed2667b9..5ec8c67462 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -452,6 +452,21 @@ local directive_handlers = {
       metadata[capture_id].range = range
     end
   end,
+
+  -- Transform the content of the node
+  -- Example: (#gsub! @_node ".*%.(.*)" "%1")
+  ['gsub!'] = function(match, _, bufnr, pred, metadata)
+    assert(#pred == 4)
+
+    local id = pred[2]
+    local node = match[id]
+    local text = M.get_node_text(node, bufnr, { metadata = metadata[id] }) or ''
+
+    if not metadata[id] then
+      metadata[id] = {}
+    end
+    metadata[id].text = text:gsub(pred[3], pred[4])
+  end,
 }
 
 --- Adds a new predicate to be used in queries
-- 
cgit 


From e1d5ad1cb87d43c3d75619e239312d4ab2029b45 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 26 Dec 2022 16:10:59 -0500
Subject: feat(treesitter): add metadata option for get_node_text

---
 runtime/doc/news.txt                        |  3 ++
 runtime/doc/treesitter.txt                  |  3 ++
 runtime/lua/vim/treesitter/languagetree.lua | 10 +----
 runtime/lua/vim/treesitter/query.lua        | 70 +++++++++++++++++------------
 4 files changed, 49 insertions(+), 37 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 7c3f295560..b438595b5f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -154,6 +154,9 @@ The following new APIs or features were added.
 • Treesitter captures can now be transformed by directives. This will allow
   more complicated dynamic language injections.
 
+• |vim.treesitter.query.get_node_text()| now accepts a `metadata` option for
+  writing custom directives using |vim.treesitter.query.add_directive()|.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 7bc9f3f9a7..693804497d 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -746,6 +746,9 @@ get_node_text({node}, {source}, {opts})
       • {opts}    (table|nil) Optional parameters.
                   • concat: (boolean) Concatenate result in a string (default
                     true)
+                  • metadata (table) Metadata of a specific capture. This
+                    would be set to `metadata[capture_id]` when using
+                    |vim.treesitter.query.add_directive()|.
 
     Return: ~
         (string[]|string|nil)
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 3e1bc5d1cb..8255c6f4fe 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -354,14 +354,6 @@ local function get_range_from_metadata(node, id, metadata)
   return { node:range() }
 end
 
----@private
-local function get_node_text(node, id, metadata, source)
-  if metadata[id] and metadata[id].text then
-    return metadata[id].text
-  end
-  return query.get_node_text(node, source)
-end
-
 --- Gets language injection points by language.
 ---
 --- This is where most of the injection processing occurs.
@@ -416,7 +408,7 @@ function LanguageTree:_get_injections()
 
         -- Lang should override any other language tag
         if name == 'language' and not lang then
-          lang = get_node_text(node, id, metadata, self._source) --[[@as string]]
+          lang = query.get_node_text(node, self._source, { metadata = metadata[id] })
         elseif name == 'combined' then
           combined = true
         elseif name == 'content' and #ranges == 0 then
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 5ec8c67462..9136b596be 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -55,6 +55,38 @@ local function add_included_lang(base_langs, lang, ilang)
   return false
 end
 
+---@private
+---@param buf (number)
+---@param range (table)
+---@param concat (boolean)
+---@returns (string[]|string|nil)
+local function buf_range_get_text(buf, range, concat)
+  local lines
+  local start_row, start_col, end_row, end_col = unpack(range)
+  local eof_row = a.nvim_buf_line_count(buf)
+  if start_row >= eof_row then
+    return nil
+  end
+
+  if end_col == 0 then
+    lines = a.nvim_buf_get_lines(buf, start_row, end_row, true)
+    end_col = -1
+  else
+    lines = a.nvim_buf_get_lines(buf, start_row, end_row + 1, true)
+  end
+
+  if #lines > 0 then
+    if #lines == 1 then
+      lines[1] = string.sub(lines[1], start_col + 1, end_col)
+    else
+      lines[1] = string.sub(lines[1], start_col + 1)
+      lines[#lines] = string.sub(lines[#lines], 1, end_col)
+    end
+  end
+
+  return concat and table.concat(lines, '\n') or lines
+end
+
 --- Gets the list of files used to make up a query
 ---
 ---@param lang string Language to get query for
@@ -240,40 +272,22 @@ end
 ---@param source (number|string) Buffer or string from which the {node} is extracted
 ---@param opts (table|nil) Optional parameters.
 ---          - concat: (boolean) Concatenate result in a string (default true)
+---          - metadata (table) Metadata of a specific capture. This would be
+---            set to `metadata[capture_id]` when using
+---            |vim.treesitter.query.add_directive()|.
 ---@return (string[]|string|nil)
 function M.get_node_text(node, source, opts)
   opts = opts or {}
   local concat = vim.F.if_nil(opts.concat, true)
+  local metadata = opts.metadata or {}
 
-  local start_row, start_col, start_byte = node:start()
-  local end_row, end_col, end_byte = node:end_()
-
-  if type(source) == 'number' then
-    local eof_row = a.nvim_buf_line_count(source)
-    if start_row >= eof_row then
-      return nil
-    end
-
-    local lines ---@type string[]
-    if end_col == 0 then
-      lines = a.nvim_buf_get_lines(source, start_row, end_row, true)
-      end_col = -1
-    else
-      lines = a.nvim_buf_get_lines(source, start_row, end_row + 1, true)
-    end
-
-    if #lines > 0 then
-      if #lines == 1 then
-        lines[1] = string.sub(lines[1], start_col + 1, end_col)
-      else
-        lines[1] = string.sub(lines[1], start_col + 1)
-        lines[#lines] = string.sub(lines[#lines], 1, end_col)
-      end
-    end
-
-    return concat and table.concat(lines, '\n') or lines
+  if metadata.text then
+    return metadata.text
+  elseif type(source) == 'number' then
+    return metadata.range and buf_range_get_text(source, metadata.range, concat)
+      or buf_range_get_text(source, { node:range() }, concat)
   elseif type(source) == 'string' then
-    return source:sub(start_byte + 1, end_byte)
+    return source:sub(select(3, node:start()) + 1, select(3, node:end_()))
   end
 end
 
-- 
cgit 


From 4c66f5ff97a52fbc933fdbe1907c4b960d5a7403 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Mon, 26 Dec 2022 16:11:45 -0500
Subject: feat(treesitter): respect metadata[id].range for offset!

---
 runtime/lua/vim/treesitter/query.lua | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 9136b596be..a0522d7cda 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -445,9 +445,11 @@ local directive_handlers = {
   ['offset!'] = function(match, _, _, pred, metadata)
     ---@cast pred integer[]
     local capture_id = pred[2]
-    local offset_node = match[capture_id]
-    local range = { offset_node:range() }
-    ---@cast range integer[] bug in sumneko
+    if not metadata[capture_id] then
+      metadata[capture_id] = {}
+    end
+
+    local range = metadata[capture_id].range or { match[capture_id]:range() }
     local start_row_offset = pred[3] or 0
     local start_col_offset = pred[4] or 0
     local end_row_offset = pred[5] or 0
@@ -460,9 +462,6 @@ local directive_handlers = {
 
     -- If this produces an invalid range, we just skip it.
     if range[1] < range[3] or (range[1] == range[3] and range[2] <= range[4]) then
-      if not metadata[capture_id] then
-        metadata[capture_id] = {}
-      end
       metadata[capture_id].range = range
     end
   end,
-- 
cgit 


From 23e34fe534d201a1323ab040cb2201d21fe865cc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 5 Feb 2023 17:59:18 +0100
Subject: vim-patch:9.0.1281: Cadence files are not recognized (#22130)

Problem:    Cadence files are not recognized.
Solution:   Recognize Cadence files. (Janez Podhostnik, closes vim/vim#11951)

https://github.com/vim/vim/commit/cb626a4692df7154be02b47d6089ec679e95cb44

Co-authored-by: Janez Podhostnik <janez.podhostnik@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index bc30b3bd11..a18abf09ac 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -191,6 +191,7 @@ local extension = {
   qc = 'c',
   cabal = 'cabal',
   capnp = 'capnp',
+  cdc = 'cdc',
   cdl = 'cdl',
   toc = 'cdrtoc',
   cfc = 'cf',
-- 
cgit 


From 6c39edaa7e5060cedfbbf61e88f4aad20fdff73d Mon Sep 17 00:00:00 2001
From: Mateusz Majewski <metiulekm@gmail.com>
Date: Mon, 6 Feb 2023 05:24:00 +0100
Subject: fix(health): iterate using ipairs correctly (#22119)

In a few places ipairs was used to iterate over elements of the array.
However, the first return value of ipairs was erronously used, which is
not the value, but rather the index. This would result in errors, for
instance when trying to retrieve a field from the value.
---
 runtime/lua/nvim/health.lua | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
index f11899434e..b6d84404ec 100644
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -183,7 +183,7 @@ local function check_rplugin_manifest()
     existing_rplugins[item.path] = 'python'
   end
 
-  for item in ipairs(vim.fn['remote#host#PluginsForHost']('python3')) do
+  for _, item in ipairs(vim.fn['remote#host#PluginsForHost']('python3')) do
     existing_rplugins[item.path] = 'python3'
   end
 
@@ -200,7 +200,7 @@ local function check_rplugin_manifest()
     local scripts = vim.fn.glob(python_dir .. '/*.py', true, true)
     vim.list_extend(scripts, vim.fn.glob(python_dir .. '/*/__init__.py', true, true))
 
-    for script in ipairs(scripts) do
+    for _, script in ipairs(scripts) do
       local contents = vim.fn.join(vim.fn.readfile(script))
       if vim.regex([[\<\%(from\|import\)\s\+neovim\>]]):match_str(contents) then
         if vim.regex([[[\/]__init__\.py$]]):match_str(script) then
@@ -384,7 +384,13 @@ local function check_terminal()
     )
   end
 
-  for env_var in ipairs({ 'XTERM_VERSION', 'VTE_VERSION', 'TERM_PROGRAM', 'COLORTERM', 'SSH_TTY' }) do
+  for _, env_var in ipairs({
+    'XTERM_VERSION',
+    'VTE_VERSION',
+    'TERM_PROGRAM',
+    'COLORTERM',
+    'SSH_TTY',
+  }) do
     if vim.env[env_var] then
       health.report_info(vim.fn.printf('$%s="%s"', env_var, vim.env[env_var]))
     end
-- 
cgit 


From 1675f0e270579036c454c38f28e650b60a3fba1a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 6 Feb 2023 04:01:17 -0500
Subject: vim-patch:9.0.1282: Ron files are not recognized (#22132)

Problem:    Ron files are not recognized.
Solution:   Recognize Ron files. (Amaan Qureshi, closes vim/vim#11948)

https://github.com/vim/vim/commit/c8ef30bc2eaec956549510cd4b2efc96b7aee563
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index a18abf09ac..58728a8872 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -871,6 +871,7 @@ local extension = {
   Snw = 'rnoweb',
   robot = 'robot',
   resource = 'robot',
+  ron = 'ron',
   rsc = 'routeros',
   x = 'rpcgen',
   rpl = 'rpl',
-- 
cgit 


From e1f03c481a1cf87cead2c5af66b36dbdfbb9a983 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 6 Feb 2023 10:01:38 +0100
Subject: feat(spell): also source `spell/LANG.lua` when setting `spelllang`
 (#22111)

Problem: only Vimscript files are sourced when setting spelling language
Solution: also source Lua files after sourcing Vimscript files

Closes #22110
---
 runtime/doc/spell.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 98a6af1b8b..c6c4da2dea 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -440,9 +440,9 @@ find these functions useful:
 SETTING 'spellcapcheck' AUTOMATICALLY			*set-spc-auto*
 
 After the 'spelllang' option has been set successfully, Vim will source the
-files "spell/LANG.vim" in 'runtimepath'.  "LANG" is the value of 'spelllang'
-up to the first comma, dot or underscore.  This can be used to set options
-specifically for the language, especially 'spellcapcheck'.
+files "spell/LANG.vim" and "spell/LANG.lua" in 'runtimepath'.  "LANG" is the
+value of 'spelllang' up to the first comma, dot or underscore.  This can be
+used to set options specifically for the language, especially 'spellcapcheck'.
 
 The distribution includes a few of these files.  Use this command to see what
 they do: >
-- 
cgit 


From 8fbe75b3dda7ab3b9e6df0d5406539bde4c80887 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 7 Feb 2023 10:29:37 +0100
Subject: vim-patch:9.0.1288: FunC files are not recognized (#22153)

Problem:    FunC files are not recognized.
Solution:   Recognize FunC files. (Amaan Qureshi, closes vim/vim#11949)

https://github.com/vim/vim/commit/91deac45392fe93094b9c31403b1ae771dc71938

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 58728a8872..cdc6e4bb7c 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -423,6 +423,7 @@ local extension = {
   fsh = 'fsh',
   fsi = 'fsharp',
   fsx = 'fsharp',
+  fc = 'func',
   fusion = 'fusion',
   gdb = 'gdb',
   gdmo = 'gdmo',
-- 
cgit 


From 1ca4a8b1ddf5256ad53cf486d0b2125434168270 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 8 Feb 2023 09:47:55 +0100
Subject: vim-patch:9.0.1291: Move language files are not recognized (#22162)

Problem:    Move language files are not recognized.
Solution:   Recognize Move language files. (Amaan Qureshi, closes vim/vim#11947)

https://github.com/vim/vim/commit/6642982beaf4f1f5164f0315a1b3e3c275156089

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index cdc6e4bb7c..1f605b72f3 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -692,6 +692,7 @@ local extension = {
   isc = 'monk',
   moo = 'moo',
   moon = 'moonscript',
+  move = 'move',
   mp = 'mp',
   mpiv = function(path, bufnr)
     return 'mp', function(b)
-- 
cgit 


From d0008bd626bb4fc28fedbba77c2c2ecaaac26683 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 8 Feb 2023 11:28:32 +0100
Subject: docs(luvref): update to version bump

---
 runtime/doc/luvref.txt | 110 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 99 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 859e75e4af..b7ce273f5f 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -24,7 +24,7 @@ be used in other Lua environments.
 More information about the core libuv library can be found at the original
 libuv documentation page (https://docs.libuv.org/).
 
-TCP Echo Server Example~
+TCP Echo Server Example ~
 
 Here is a small example showing a TCP echo server:
 
@@ -51,15 +51,15 @@ Here is a small example showing a TCP echo server:
     uv.run() -- an explicit run call is necessary outside of luvit
 <
 
-Module Layout~
+Module Layout ~
 
 The luv library contains a single Lua module referred to hereafter as `uv` for
 simplicity. This module consists mostly of functions with names corresponding
 to their original libuv versions. For example, the libuv function
-`uv_tcp_bind` has a luv version at |uv.tcp_bind()|. Currently, only one
-non-function field exists: `uv.constants`, which is a table.
+`uv_tcp_bind` has a luv version at |uv.tcp_bind()|. Currently, only two
+non-function fields exists: `uv.constants` and `uv.errno`, which are tables.
 
-Functions vs Methods~
+Functions vs Methods ~
 
 In addition to having simple functions, luv provides an optional method-style
 API. For example, `uv.tcp_bind(server, host, port)` can alternatively be
@@ -67,7 +67,7 @@ called as `server:bind(host, port)` . Note that the first argument `server`
 becomes the object and `tcp_` is removed from the function name. Method forms
 are documented below where they exist.
 
-Synchronous vs Asynchronous Functions~
+Synchronous vs Asynchronous Functions ~
 
 Functions that accept a callback are asynchronous. These functions may
 immediately return results to the caller to indicate their initial status, but
@@ -82,7 +82,7 @@ Some (generally FS and DNS) functions can behave either synchronously or
 asynchronously. If a callback is provided to these functions, they behave
 asynchronously; if no callback is provided, they behave synchronously.
 
-Pseudo-Types~
+Pseudo-Types ~
 
 Some unique types are defined. These are not actual types in Lua, but they are
 used here to facilitate documenting consistent behavior:
@@ -133,10 +133,10 @@ module.
 ==============================================================================
 ERROR HANDLING                                              *luv-error-handling*
 
-In libuv, errors are negative numbered constants; however, these errors and
-the functions used to handle them are not exposed to luv users. Instead, if an
-internal error is encountered, the luv function will return to the caller an
-assertable `nil, err, name` tuple.
+In libuv, errors are negative numbered constants; however, while those errors
+are exposed through `uv.errno`, the functions used to handle them are not
+exposed to luv users. Instead, if an internal error is encountered, the luv
+function will return to the caller an assertable `nil, err, name` tuple.
 
 - `nil` idiomatically indicates failure
 - `err` is a string with the format `{name}: {message}`
@@ -151,6 +151,94 @@ When a function is called successfully, it will return either a value that is
 relevant to the operation of the function, or the integer `0` to indicate
 success, or sometimes nothing at all. These cases are documented below.
 
+`uv.errno`                                                              *uv.errno*
+
+A table value which exposes error constants as a map, where the key is the
+error name (without the `UV_` prefix) and its value is a negative number.
+See Libuv's "Error constants" page for further details.
+(https://docs.libuv.org/en/v1.x/errors.html#error-constants)
+
+- `E2BIG`: argument list too long.
+- `EACCES`: permission denied.
+- `EADDRINUSE`: address already in use.
+- `EADDRNOTAVAIL`: address not available.
+- `EAFNOSUPPORT`: address family not supported.
+- `EAGAIN`: resource temporarily unavailable.
+- `EAI_ADDRFAMILY`: address family not supported.
+- `EAI_AGAIN`: temporary failure.
+- `EAI_BADFLAGS`: bad ai_flags value.
+- `EAI_BADHINTS`: invalid value for hints.
+- `EAI_CANCELED`: request canceled.
+- `EAI_FAIL`: permanent failure.
+- `EAI_FAMILY`: ai_family not supported.
+- `EAI_MEMORY`: out of memory.
+- `EAI_NODATA`: no address.
+- `EAI_NONAME`: unknown node or service.
+- `EAI_OVERFLOW`: argument buffer overflow.
+- `EAI_PROTOCOL`: resolved protocol is unknown.
+- `EAI_SERVICE`: service not available for socket type.
+- `EAI_SOCKTYPE`: socket type not supported.
+- `EALREADY`: connection already in progress.
+- `EBADF`: bad file descriptor.
+- `EBUSY`: resource busy or locked.
+- `ECANCELED`: operation canceled.
+- `ECHARSET`: invalid Unicode character.
+- `ECONNABORTED`: software caused connection abort.
+- `ECONNREFUSED`: connection refused.
+- `ECONNRESET`: connection reset by peer.
+- `EDESTADDRREQ`: destination address required.
+- `EEXIST`: file already exists.
+- `EFAULT`: bad address in system call argument.
+- `EFBIG`: file too large.
+- `EHOSTUNREACH`: host is unreachable.
+- `EINTR`: interrupted system call.
+- `EINVAL`: invalid argument.
+- `EIO`: i/o error.
+- `EISCONN`: socket is already connected.
+- `EISDIR`: illegal operation on a directory.
+- `ELOOP`: too many symbolic links encountered.
+- `EMFILE`: too many open files.
+- `EMSGSIZE`: message too long.
+- `ENAMETOOLONG`: name too long.
+- `ENETDOWN`: network is down.
+- `ENETUNREACH`: network is unreachable.
+- `ENFILE`: file table overflow.
+- `ENOBUFS`: no buffer space available.
+- `ENODEV`: no such device.
+- `ENOENT`: no such file or directory.
+- `ENOMEM`: not enough memory.
+- `ENONET`: machine is not on the network.
+- `ENOPROTOOPT`: protocol not available.
+- `ENOSPC`: no space left on device.
+- `ENOSYS`: function not implemented.
+- `ENOTCONN`: socket is not connected.
+- `ENOTDIR`: not a directory.
+- `ENOTEMPTY`: directory not empty.
+- `ENOTSOCK`: socket operation on non-socket.
+- `ENOTSUP`: operation not supported on socket.
+- `EOVERFLOW`: value too large for defined data type.
+- `EPERM`: operation not permitted.
+- `EPIPE`: broken pipe.
+- `EPROTO`: protocol error.
+- `EPROTONOSUPPORT`: protocol not supported.
+- `EPROTOTYPE`: protocol wrong type for socket.
+- `ERANGE`: result too large.
+- `EROFS`: read-only file system.
+- `ESHUTDOWN`: cannot send after transport endpoint shutdown.
+- `ESPIPE`: invalid seek.
+- `ESRCH`: no such process.
+- `ETIMEDOUT`: connection timed out.
+- `ETXTBSY`: text file is busy.
+- `EXDEV`: cross-device link not permitted.
+- `UNKNOWN`: unknown error.
+- `EOF`: end of file.
+- `ENXIO`: no such device or address.
+- `EMLINK`: too many links.
+- `ENOTTY`: inappropriate ioctl for device.
+- `EFTYPE`: inappropriate file type or format.
+- `EILSEQ`: illegal byte sequence.
+- `ESOCKTNOSUPPORT`: socket type not supported.
+
 ==============================================================================
 VERSION CHECKING                                          *luv-version-checking*
 
-- 
cgit 


From 625e990976540a0e2d2bccb98deb57d0919d1e89 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Wed, 8 Feb 2023 16:16:16 +0100
Subject: refactor(ui): cleanup 'redrawdebug', introduce "flush" mode

---
 runtime/doc/options.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 1f91b89322..17f1c822ff 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4765,7 +4765,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Flags to change the way redrawing works, for debugging purposes.
 	Most useful with 'writedelay' set to some reasonable value.
 	Supports the following flags:
-	    compositor	Indicate what redraws come from the compositor
+	    compositor	Indicate each redraw event handled by the compositor
 			by briefly flashing the redrawn regions in colors
 			indicating the redraw type. These are the highlight
 			groups used (and their default colors):
@@ -4777,6 +4777,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 		RedrawDebugRecompose guibg=Red    redraw generated by the
 						  compositor itself, due to a
 						  grid being moved or deleted.
+	    line	introduce a delay after each line drawn on the screen.
+			When using the TUI or another single-grid UI, "compositor"
+			gives more information and should be preferred (every
+			line is processed as a separate event by the compositor)
+	    flush	introduce a delay after each "flush" event.
 	    nothrottle	Turn off throttling of the message grid. This is an
 			optimization that joins many small scrolls to one
 			larger scroll when drawing the message area (with
@@ -4786,7 +4791,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			useful when running nvim inside a debugger (and
 			the test suite).
 	    nodelta	Send all internally redrawn cells to the UI, even if
-	                they are unchanged from the already displayed state.
+			they are unchanged from the already displayed state.
 
 						*'redrawtime'* *'rdt'*
 'redrawtime' 'rdt'	number	(default 2000)
@@ -7372,8 +7377,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'writedelay'* *'wd'*
 'writedelay' 'wd'	number	(default 0)
 			global
-	The number of milliseconds to wait for each character sent to the
-	screen.  When positive, characters are sent to the UI one by one.
-	See 'redrawdebug' for more options.  For debugging purposes.
+	Only takes effect toghether with 'redrawdebug'.
+	The number of milliseconds to wait after each line or each flush
 
  vim:tw=78:ts=8:noet:ft=help:norl:
-- 
cgit 


From 1aa128b0ea8764b01a433b91ba62faa77cce84f8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 9 Feb 2023 11:54:37 +0100
Subject: docs(luvref): update version info

---
 runtime/doc/luvref.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 859e75e4af..86f4163f4d 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -3888,11 +3888,11 @@ uv.metrics_idle_time()                                  *uv.metrics_idle_time()*
 ==============================================================================
 CREDITS                                                            *luv-credits*
 
-This document is a reformatted version of the LUV documentation, based on
-commit c51e705 (5 May 2022) of the luv repository
-https://github.com/luvit/luv/commit/c51e7052ec4f0a25058f70c1b4ee99dd36180e59.
+This document is a reformatted version of the LUV documentation, up-to-date
+with commit e8e7b7e (3 Feb 2023) of the luv repository
+https://github.com/luvit/luv/commit/e8e7b7e13225348a8806118a3ea9e021383a9536.
 
-Included from https://github.com/nanotee/luv-vimdocs with kind permission.
+Based on https://github.com/nanotee/luv-vimdocs with kind permission.
 
 
 vim:tw=78:ts=8:ft=help:norl:
-- 
cgit 


From f5bad01869df449cb1e4ae7f264bcd5c8150f606 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 9 Feb 2023 15:20:47 +0000
Subject: feat(treesitter): playground improvements

- Render node ranges as virtual text
- Set filettype=query. The virtual text is to avoid parsing errors.
- Make sure highlights text is always in view.
---
 runtime/lua/vim/treesitter.lua            | 13 ++++++++---
 runtime/lua/vim/treesitter/playground.lua | 36 +++++++++++++++++++------------
 2 files changed, 32 insertions(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 96b1e24ba9..a15d3ec23c 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -411,6 +411,7 @@ function M.show_tree(opts)
   vim.bo[b].buflisted = false
   vim.bo[b].buftype = 'nofile'
   vim.bo[b].bufhidden = 'wipe'
+  vim.bo[b].filetype = 'query'
 
   local title = opts.title
   if not title then
@@ -425,9 +426,6 @@ function M.show_tree(opts)
 
   pg:draw(b)
 
-  vim.fn.matchadd('Comment', '\\[[0-9:-]\\+\\]')
-  vim.fn.matchadd('String', '".*"')
-
   a.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
   a.nvim_buf_set_keymap(b, 'n', '<CR>', '', {
     desc = 'Jump to the node under the cursor in the source buffer',
@@ -467,6 +465,15 @@ function M.show_tree(opts)
         end_col = math.max(0, pos.end_col),
         hl_group = 'Visual',
       })
+
+      local topline, botline = vim.fn.line('w0', win), vim.fn.line('w$', win)
+
+      -- Move the cursor if highlighted range is completely out of view
+      if pos.lnum < topline and pos.end_lnum < topline then
+        a.nvim_win_set_cursor(win, { pos.end_lnum + 1, 0 })
+      elseif pos.lnum > botline and pos.end_lnum > botline then
+        a.nvim_win_set_cursor(win, { pos.lnum + 1, 0 })
+      end
     end,
   })
 
diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index be7764e6f0..001bc2d5bf 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -136,6 +136,8 @@ function TSPlayground:new(bufnr, lang)
   return t
 end
 
+local decor_ns = api.nvim_create_namespace('ts.playground')
+
 --- Write the contents of this Playground into {bufnr}.
 ---
 ---@param bufnr number Buffer number to write into.
@@ -144,22 +146,28 @@ function TSPlayground:draw(bufnr)
   vim.bo[bufnr].modifiable = true
   local lines = {} ---@type string[]
   for _, item in self:iter() do
-    lines[#lines + 1] = table.concat({
-      string.rep(' ', item.depth),
-      item.text,
-      item.lnum == item.end_lnum
-          and string.format(' [%d:%d-%d]', item.lnum + 1, item.col + 1, item.end_col)
-        or string.format(
-          ' [%d:%d-%d:%d]',
-          item.lnum + 1,
-          item.col + 1,
-          item.end_lnum + 1,
-          item.end_col
-        ),
-      self.opts.lang and string.format(' %s', item.lang) or '',
-    })
+    lines[#lines + 1] = string.rep(' ', item.depth) .. item.text
   end
   api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
+
+  api.nvim_buf_clear_namespace(bufnr, decor_ns, 0, -1)
+
+  for i, item in self:iter() do
+    local range_str
+    if item.lnum == item.end_lnum then
+      range_str = string.format('[%d:%d-%d]', item.lnum + 1, item.col + 1, item.end_col)
+    else
+      range_str =
+        string.format('[%d:%d-%d:%d]', item.lnum + 1, item.col + 1, item.end_lnum + 1, item.end_col)
+    end
+
+    local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
+
+    api.nvim_buf_set_extmark(bufnr, decor_ns, i - 1, 0, {
+      virt_text = { { range_str, 'Comment' }, { lang_str, 'Title' } },
+    })
+  end
+
   vim.bo[bufnr].modifiable = false
 end
 
-- 
cgit 


From 8a985d12dd6b4a5a4ba825939f36b7b1a324d849 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 9 Feb 2023 16:08:22 +0000
Subject: fix(treesitter): don't trample parsers when filetype!=lang

This allows vim.treesitter.show_tree() to work on buffers where the
filetype does not match the parser language name e.g, bash/sh.
---
 runtime/lua/vim/treesitter.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index a15d3ec23c..4127198576 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -96,11 +96,13 @@ function M.get_parser(bufnr, lang, opts)
   if bufnr == nil or bufnr == 0 then
     bufnr = a.nvim_get_current_buf()
   end
-  if lang == nil then
-    lang = a.nvim_buf_get_option(bufnr, 'filetype')
-  end
 
-  if parsers[bufnr] == nil or parsers[bufnr]:lang() ~= lang then
+  if parsers[bufnr] == nil then
+    lang = lang or a.nvim_buf_get_option(bufnr, 'filetype')
+    parsers[bufnr] = M._create_parser(bufnr, lang, opts)
+  elseif lang and parsers[bufnr]:lang() ~= lang then
+    -- Only try to create a new parser if lang is provided
+    -- and it doesn't match the stored parser
     parsers[bufnr] = M._create_parser(bufnr, lang, opts)
   end
 
-- 
cgit 


From 165b07b2692ef131affecbbed432f27f16512124 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 11 Feb 2023 17:34:20 +0800
Subject: docs: reword news.txt to ensure a consistent style (#22215)

---
 runtime/doc/news.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b438595b5f..c8d40094f3 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -63,7 +63,7 @@ The following new APIs or features were added.
 <
   (or the Vimscript equivalent) to their |config| file.
 
-• Run Lua scripts from your shell using |-l|. >
+• Added support for running Lua scripts from shell using |-l|. >
       nvim -l foo.lua --arg1 --arg2
 <  Also works with stdin: >
       echo "print(42)" | nvim -l -
-- 
cgit 


From 7d58de11f49c574a8a305e28e96b9ff810493012 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 11 Feb 2023 18:25:01 +0800
Subject: fix(rpc)!: preseve files when stdio channel is closed (#22137)

BREAKING CHANGE: Unsaved changes are now preserved rather than discarded
when stdio channel is closed.
---
 runtime/doc/news.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c8d40094f3..2afb22bb43 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -47,6 +47,9 @@ The following changes may require adaptations in user config or plugins.
 
 • libiconv is now a required build dependency.
 
+• Unsaved changes are now preserved rather than discarded when |channel-stdio|
+  is closed.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
-- 
cgit 


From 374955bcc571dff05f068ec18d0f578d1f334c5f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 11 Feb 2023 20:00:31 +0800
Subject: vim-patch:9.0.1300: 'statusline' only supports one "%=" item (#22218)

Problem:    'statusline' only supports one "%=" item.
Solution:   Add support for multiple "%=" items. (TJ DeVries, Yegappan
            Lakshmanan, closes vim/vim#11970, closes vim/vim#11965)

https://github.com/vim/vim/commit/3ec78f973fdaec2cea8e036ed38037b2fe40670b

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/options.txt  | 6 ++++--
 runtime/doc/vim_diff.txt | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 17f1c822ff..e4106358f1 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6201,8 +6201,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	         this label.
 	< -   Where to truncate line if too long.  Default is at the start.
 	      No width fields allowed.
-	= -   Separation point between alignment sections. Each section will
-	      be separated by an equal number of spaces.
+	= -   Separation point between alignment sections.  Each section will
+	      be separated by an equal number of spaces.  With one %= what
+	      comes after it will be right-aligned.  With two %= there is a
+	      middle part, with white space left and right of it.
 	      No width fields allowed.
 	# -   Set highlight group.  The name must follow and then a # again.
 	      Thus use %#HLname# for highlight group HLname.  The same
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index bb3b670b24..97fc211c36 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -267,7 +267,6 @@ Options:
   'pumblend'    pseudo-transparent popupmenu
   'scrollback'
   'signcolumn'  supports up to 9 dynamic/fixed columns
-  'statusline'  supports unlimited alignment sections
   'tabline'     %@Func@foo%X can call any function on mouse-click
   'winblend'    pseudo-transparency in floating windows |api-floatwin|
   'winhighlight' window-local highlights
@@ -292,6 +291,7 @@ These Nvim features were later integrated into Vim.
 - |WinScrolled|
 - |:sign-define| "numhl" argument
 - |:source| works with anonymous (no file) scripts
+- 'statusline' supports unlimited alignment sections
 
 ==============================================================================
 5. Changed features					 *nvim-features-changed*
-- 
cgit 


From c5b34fa55483d84d1de32937ffff0b7cf1aeba78 Mon Sep 17 00:00:00 2001
From: glacambre <code@lacamb.re>
Date: Sat, 11 Feb 2023 09:45:11 +0100
Subject: refactor: move init_default_autocmds to lua

The original motivation for this change came from developping
https://github.com/neovim/neovim/pull/22159, which will require adding
more autocommand creation to Neovim's startup sequence.

This change requires lightly editing a test that expected no autocommand
to have been created from lua.
---
 runtime/lua/vim/_editor.lua | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index da8764fbd4..3f27e61810 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -894,6 +894,26 @@ function vim._init_default_mappings()
   ]])
 end
 
+function vim._init_default_autocmds()
+  local nvim_terminal_augroup = vim.api.nvim_create_augroup('nvim_terminal', {})
+  vim.api.nvim_create_autocmd({ 'bufreadcmd' }, {
+    pattern = 'term://*',
+    group = nvim_terminal_augroup,
+    nested = true,
+    command = "if !exists('b:term_title')|call termopen(matchstr(expand(\"<amatch>\"), '\\c\\mterm://\\%(.\\{-}//\\%(\\d\\+:\\)\\?\\)\\?\\zs.*'), {'cwd': expand(get(matchlist(expand(\"<amatch>\"), '\\c\\mterm://\\(.\\{-}\\)//'), 1, ''))})",
+  })
+  vim.api.nvim_create_autocmd({ 'cmdwinenter' }, {
+    pattern = '[:>]',
+    group = vim.api.nvim_create_augroup('nvim_cmdwin', {}),
+    command = 'syntax sync minlines=1 maxlines=1',
+  })
+end
+
+function vim._init_defaults()
+  vim._init_default_mappings()
+  vim._init_default_autocmds()
+end
+
 require('vim._meta')
 
 return vim
-- 
cgit 


From 9668c166e88cd71e517cacfb8d266b75047604f7 Mon Sep 17 00:00:00 2001
From: Jonas Strittmatter <40792180+smjonas@users.noreply.github.com>
Date: Sat, 11 Feb 2023 16:08:33 +0100
Subject: fix(filetype): make vim.filetype.match() work with contents only
 (#22181)

Co-authored-by: Gregory Anders <greg@gpanders.com>
---
 runtime/lua/vim/filetype.lua | 95 ++++++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 47 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 1f605b72f3..ec568b5b82 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2449,6 +2449,7 @@ local function match_pattern(name, path, tail, pat)
       return false
     end
   end
+
   -- If the pattern contains a / match against the full path, otherwise just the tail
   local fullpat = '^' .. pat .. '$'
   local matches
@@ -2526,64 +2527,64 @@ function M.match(args)
     name = api.nvim_buf_get_name(bufnr)
   end
 
-  if name then
-    name = normalize_path(name)
-  end
-
   local ft, on_detect
 
-  -- First check for the simple case where the full path exists as a key
-  local path = vim.fn.fnamemodify(name, ':p')
-  ft, on_detect = dispatch(filename[path], path, bufnr)
-  if ft then
-    return ft, on_detect
-  end
+  if name then
+    name = normalize_path(name)
 
-  -- Next check against just the file name
-  local tail = vim.fn.fnamemodify(name, ':t')
-  ft, on_detect = dispatch(filename[tail], path, bufnr)
-  if ft then
-    return ft, on_detect
-  end
+    -- First check for the simple case where the full path exists as a key
+    local path = vim.fn.fnamemodify(name, ':p')
+    ft, on_detect = dispatch(filename[path], path, bufnr)
+    if ft then
+      return ft, on_detect
+    end
 
-  -- Next, check the file path against available patterns with non-negative priority
-  local j = 1
-  for i, v in ipairs(pattern_sorted) do
-    local k = next(v)
-    local opts = v[k][2]
-    if opts.priority < 0 then
-      j = i
-      break
+    -- Next check against just the file name
+    local tail = vim.fn.fnamemodify(name, ':t')
+    ft, on_detect = dispatch(filename[tail], path, bufnr)
+    if ft then
+      return ft, on_detect
     end
 
-    local filetype = v[k][1]
-    local matches = match_pattern(name, path, tail, k)
-    if matches then
-      ft, on_detect = dispatch(filetype, path, bufnr, matches)
-      if ft then
-        return ft, on_detect
+    -- Next, check the file path against available patterns with non-negative priority
+    local j = 1
+    for i, v in ipairs(pattern_sorted) do
+      local k = next(v)
+      local opts = v[k][2]
+      if opts.priority < 0 then
+        j = i
+        break
+      end
+
+      local filetype = v[k][1]
+      local matches = match_pattern(name, path, tail, k)
+      if matches then
+        ft, on_detect = dispatch(filetype, path, bufnr, matches)
+        if ft then
+          return ft, on_detect
+        end
       end
     end
-  end
 
-  -- Next, check file extension
-  local ext = vim.fn.fnamemodify(name, ':e')
-  ft, on_detect = dispatch(extension[ext], path, bufnr)
-  if ft then
-    return ft, on_detect
-  end
+    -- Next, check file extension
+    local ext = vim.fn.fnamemodify(name, ':e')
+    ft, on_detect = dispatch(extension[ext], path, bufnr)
+    if ft then
+      return ft, on_detect
+    end
 
-  -- Next, check patterns with negative priority
-  for i = j, #pattern_sorted do
-    local v = pattern_sorted[i]
-    local k = next(v)
+    -- Next, check patterns with negative priority
+    for i = j, #pattern_sorted do
+      local v = pattern_sorted[i]
+      local k = next(v)
 
-    local filetype = v[k][1]
-    local matches = match_pattern(name, path, tail, k)
-    if matches then
-      ft, on_detect = dispatch(filetype, path, bufnr, matches)
-      if ft then
-        return ft, on_detect
+      local filetype = v[k][1]
+      local matches = match_pattern(name, path, tail, k)
+      if matches then
+        ft, on_detect = dispatch(filetype, path, bufnr, matches)
+        if ft then
+          return ft, on_detect
+        end
       end
     end
   end
-- 
cgit 


From b518aceaa8f738e581e58aacae93514699b5ff8e Mon Sep 17 00:00:00 2001
From: Jonas Strittmatter <40792180+smjonas@users.noreply.github.com>
Date: Tue, 14 Feb 2023 00:04:16 +0100
Subject: feat(filetype): fall back to file extension when matching from
 hashbang (#22140)

If nothing matched in match_from_hashbang, also check the file extension table.
For a hashbang like '#!/bin/env foo', this will set the filetype to 'fooscript'
assuming the filetype for the 'foo' extension is 'fooscript' in the extension
table.
---
 runtime/lua/vim/filetype.lua        |  4 +++-
 runtime/lua/vim/filetype/detect.lua | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index ec568b5b82..ca91f3f402 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2604,7 +2604,9 @@ function M.match(args)
     -- If the function tries to use the filename that is nil then it will fail,
     -- but this enables checks which do not need a filename to still work.
     local ok
-    ok, ft = pcall(require('vim.filetype.detect').match_contents, contents, name)
+    ok, ft = pcall(require('vim.filetype.detect').match_contents, contents, name, function(ext)
+      return dispatch(extension[ext], name, bufnr)
+    end)
     if ok and ft then
       return ft
     end
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index edffdde9c7..b3d9fedeae 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1420,7 +1420,7 @@ local patterns_hashbang = {
 
 ---@private
 -- File starts with "#!".
-local function match_from_hashbang(contents, path)
+local function match_from_hashbang(contents, path, dispatch_extension)
   local first_line = contents[1]
   -- Check for a line like "#!/usr/bin/env {options} bash".  Turn it into
   -- "#!/usr/bin/bash" to make matching easier.
@@ -1473,6 +1473,11 @@ local function match_from_hashbang(contents, path)
       return ft
     end
   end
+
+  -- If nothing matched, check the extension table. For a hashbang like
+  -- '#!/bin/env foo', this will set the filetype to 'fooscript' assuming
+  -- the filetype for the 'foo' extension is 'fooscript' in the extension table.
+  return dispatch_extension(name)
 end
 
 local patterns_text = {
@@ -1652,10 +1657,10 @@ local function match_from_text(contents, path)
   return cvs_diff(path, contents)
 end
 
-M.match_contents = function(contents, path)
+function M.match_contents(contents, path, dispatch_extension)
   local first_line = contents[1]
   if first_line:find('^#!') then
-    return match_from_hashbang(contents, path)
+    return match_from_hashbang(contents, path, dispatch_extension)
   else
     return match_from_text(contents, path)
   end
-- 
cgit 


From 2e450efb9525308708dd9e26d6ea1d029ac781b8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 15 Feb 2023 09:55:23 +0100
Subject: feat(treesitter)!: remove g:ts_highlight_lua (#22257)

This variable was only meant for easy testing during the development
cycle for treesitter highlighting while Lua was the only parser useable
for daily driving. Now that we have a good vimdoc parser, this approach
simply doesn't scale and should be removed sooner rather than later.

Instead of setting this variable, people for now should add the autocommand
directly to their config:
```lua
vim.api.nvim_create_autocmd('FileType', {
  pattern = 'lua', -- or { 'lua', 'help' }
  callback = function() vim.treesitter.start() end,
})
```
(or put `vim.treesitter.start()` in an `ftplugin`).
---
 runtime/ftplugin/lua.lua | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 runtime/ftplugin/lua.lua

(limited to 'runtime')

diff --git a/runtime/ftplugin/lua.lua b/runtime/ftplugin/lua.lua
deleted file mode 100644
index 415cf28f9a..0000000000
--- a/runtime/ftplugin/lua.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-if vim.g.ts_highlight_lua then
-  vim.treesitter.start()
-end
-- 
cgit 


From a289e82142fdc5ff657dd30198546eeb1e115fe9 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 15 Feb 2023 12:26:07 +0000
Subject: fix(treesitter): make params optional

---
 runtime/doc/treesitter.txt           | 4 ++--
 runtime/lua/vim/treesitter/query.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 693804497d..d4799053f7 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -721,7 +721,7 @@ add_directive({name}, {handler}, {force})
                    • predicate: list of strings containing the full directive
                      being called, e.g. `(node (#set! conceal "-"))` would get
                      the predicate `{ "#set!", "conceal", "-" }`
-      • {force}    (boolean)
+      • {force}    (boolean|nil)
 
                                         *vim.treesitter.query.add_predicate()*
 add_predicate({name}, {handler}, {force})
@@ -733,7 +733,7 @@ add_predicate({name}, {handler}, {force})
                    bufnr:number, predicate:string[])
                    • see |vim.treesitter.query.add_directive()| for argument
                      meanings
-      • {force}    (boolean)
+      • {force}    (boolean|nil)
 
                                         *vim.treesitter.query.get_node_text()*
 get_node_text({node}, {source}, {opts})
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index a0522d7cda..008e5a54d7 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -487,7 +487,7 @@ local directive_handlers = {
 ---@param name string Name of the predicate, without leading #
 ---@param handler function(match:table<string,TSNode>, pattern:string, bufnr:number, predicate:string[])
 ---   - see |vim.treesitter.query.add_directive()| for argument meanings
----@param force boolean
+---@param force boolean|nil
 function M.add_predicate(name, handler, force)
   if predicate_handlers[name] and not force then
     error(string.format('Overriding %s', name))
@@ -510,7 +510,7 @@ end
 ---   - pattern: see |treesitter-query|
 ---   - predicate: list of strings containing the full directive being called, e.g.
 ---     `(node (#set! conceal "-"))` would get the predicate `{ "#set!", "conceal", "-" }`
----@param force boolean
+---@param force boolean|nil
 function M.add_directive(name, handler, force)
   if directive_handlers[name] and not force then
     error(string.format('Overriding %s', name))
-- 
cgit 


From da3cb6ebe4ef40e11192db79925bb5f3dd8defef Mon Sep 17 00:00:00 2001
From: blt__ <63462729+blt-r@users.noreply.github.com>
Date: Thu, 16 Feb 2023 03:11:49 +0400
Subject: dist: use valid application id in nvim.appdata.xml #22046

According to [AppStream spec](https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-id-generic),
the <id> element should contain a reverse-DNS scheme:

    {tld}.{vendor}.{product}

Since the flathub requires that, the flatpak build replaces `<id>nvim</id>` with
`<id>io.neovim.nvim</id>`. That results in ID mismatch between flatpak version
and version from distribution's repositories. Because of that, software stores
are displaying two different neovims, instead of one neovim with options to
download it either from flatpak or from distribution's repos. We can use the
`<provides><id>nvim</id></provides>`, for everyone who was expecting the id to
be `nvim`.
---
 runtime/nvim.appdata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/nvim.appdata.xml b/runtime/nvim.appdata.xml
index 7d2ea49df4..1fe672b80b 100644
--- a/runtime/nvim.appdata.xml
+++ b/runtime/nvim.appdata.xml
@@ -7,7 +7,7 @@
     https://github.com/flathub/io.neovim.nvim
 -->
 <component type="desktop-application">
-  <id>nvim</id>
+  <id>io.neovim.nvim</id>
   <translation type="gettext">nvim</translation>
   <project_license>Apache-2.0</project_license>
   <metadata_license>CC0-1.0</metadata_license>
@@ -61,5 +61,6 @@
   <url type="translate">https://github.com/neovim/neovim/tree/master/src/nvim/po</url>
   <provides>
     <binary>nvim</binary>
+    <id>nvim</id>
   </provides>
 </component>
-- 
cgit 


From d34c64e342dfba9248d1055e702d02620a1b31a8 Mon Sep 17 00:00:00 2001
From: Ghjuvan Lacambre <code@lacamb.re>
Date: Thu, 16 Feb 2023 13:15:02 +0100
Subject: feat: $NVIM_APPNAME #22128

This commit implements the ability to control all of the XDG paths
Neovim should use. This is done by setting an environment variable named
NVIM_APPNAME. For example, setting $NVIM_APPNAME makes Neovim look for
its configuration directory in $XDG_CONFIG_HOME/$NVIM_APPNAME instead of
$XDG_CONFIG_HOME/nvim.

If NVIM_APPNAME is not set or is an empty string, "nvim" will be used as
default.

The usecase for this feature is to enable an easy way to switch from
configuration to configuration. One might argue that the various $XDG
environment variables can already be used for this usecase. However,
setting $XDG environment variables also affects tools spawned by Neovim.
For example, while setting $XDG_CONFIG_HOME will enable Neovim to use a
different configuration directory, it will also prevent Git from finding
its "default" configuration.

Closes https://github.com/neovim/neovim/issues/21691
---
 runtime/doc/news.txt     |  4 ++++
 runtime/doc/starting.txt | 12 ++++++++++++
 2 files changed, 16 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 2afb22bb43..ae21bc47ca 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -55,6 +55,10 @@ NEW FEATURES                                                    *news-features*
 
 The following new APIs or features were added.
 
+• A new environment variable named NVIM_APPNAME enables configuring the
+  directories where Neovim should find its configuration and state files. See
+  `:help $NVIM_APPNAME` .
+
 • |nvim_open_win()| now accepts a relative `mouse` option to open a floating win
   relative to the mouse. Note that the mouse doesn't update frequently without
   setting `vim.o.mousemoveevent = true`
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 5e0718c3bb..67a88913fb 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1385,6 +1385,18 @@ STATE DIRECTORY (DEFAULT) ~
 Note: Throughout the user manual these defaults are used as placeholders, e.g.
 "~/.config" is understood to mean "$XDG_CONFIG_HOME or ~/.config".
 
+NVIM_APPNAME					*$NVIM_APPNAME*
+The XDG directories used by Nvim can be further configured by setting the
+`$NVIM_APPNAME` environment variable. This variable controls the directory
+Neovim will look for (and auto-create) in the various XDG parent directories.
+For example, setting `$NVIM_APPNAME` to "neovim" before running Neovim will
+result in Neovim looking for configuration files in `$XDG_CONFIG_HOME/neovim`
+instead of `$XDG_CONFIG_HOME/nvim`.
+
+Note: Similarly to the $XDG environment variables, when
+`$XDG_CONFIG_HOME/nvim` is mentionned, it should be understood as
+`$XDG_CONFIG_HOME/$NVIM_APPNAME`.
+
 LOG FILE					*$NVIM_LOG_FILE* *E5430*
 Besides 'debug' and 'verbose', Nvim keeps a general log file for internal
 debugging, plugins and RPC clients. >
-- 
cgit 


From bcae4af3743dbc8fc51027bbe323ddc9211cd8ca Mon Sep 17 00:00:00 2001
From: Jonas Strittmatter <40792180+smjonas@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:54:25 +0100
Subject: docs: remove mentions of 'balloonexpr' #22049

'balloonexpr' option was removed in Nvim.
---
 runtime/doc/cmdline.txt |  2 +-
 runtime/doc/eval.txt    | 36 ++----------------------------------
 2 files changed, 3 insertions(+), 35 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index b4923b0d70..e0c4e14b01 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -891,7 +891,7 @@ Note: these are typed literally, they are not special keys!
 		   to form a C expression.  E.g., when the cursor is on "arg"
 		   of "ptr->arg" then the result is "ptr->arg"; when the
 		   cursor is on "]" of "list[idx]" then the result is
-		   "list[idx]".  This is used for |v:beval_text|.
+		   "list[idx]".
 							*:<cfile>* *<cfile>*
 	<cfile>    is replaced with the path name under the cursor (like what
 		   |gf| uses)
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 58759a6053..0e77fb182e 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1670,38 +1670,6 @@ v:argv		The command line arguments Vim was invoked with.  This is a
 		list of strings.  The first item is the Vim command.
 		See |v:progpath| for the command with full path.
 
-					*v:beval_col* *beval_col-variable*
-v:beval_col	The number of the column, over which the mouse pointer is.
-		This is the byte index in the |v:beval_lnum| line.
-		Only valid while evaluating the 'balloonexpr' option.
-
-					*v:beval_bufnr* *beval_bufnr-variable*
-v:beval_bufnr	The number of the buffer, over which the mouse pointer is. Only
-		valid while evaluating the 'balloonexpr' option.
-
-					*v:beval_lnum* *beval_lnum-variable*
-v:beval_lnum	The number of the line, over which the mouse pointer is. Only
-		valid while evaluating the 'balloonexpr' option.
-
-					*v:beval_text* *beval_text-variable*
-v:beval_text	The text under or after the mouse pointer.  Usually a word as
-		it is useful for debugging a C program.  'iskeyword' applies,
-		but a dot and "->" before the position is included.  When on a
-		']' the text before it is used, including the matching '[' and
-		word before it.  When on a Visual area within one line the
-		highlighted text is used.  Also see |<cexpr>|.
-		Only valid while evaluating the 'balloonexpr' option.
-
-					*v:beval_winnr* *beval_winnr-variable*
-v:beval_winnr	The number of the window, over which the mouse pointer is. Only
-		valid while evaluating the 'balloonexpr' option.  The first
-		window has number zero (unlike most other places where a
-		window gets a number).
-
-					*v:beval_winid* *beval_winid-variable*
-v:beval_winid	The |window-ID| of the window, over which the mouse pointer
-		is.  Otherwise like v:beval_winnr.
-
 					*v:char* *char-variable*
 v:char		Argument for evaluating 'formatexpr' and used for the typed
 		character when using <expr> in an abbreviation |:map-<expr>|.
@@ -4244,8 +4212,8 @@ Textlock							*textlock*
 In a few situations it is not allowed to change the text in the buffer, jump
 to another window and some other things that might confuse or break what Vim
 is currently doing.  This mostly applies to things that happen when Vim is
-actually doing something else.  For example, evaluating the 'balloonexpr' may
-happen any moment the mouse cursor is resting at some position.
+actually doing something else.  For example, a TextYankPost autocommand cannot
+edit the text it is yanking.
 
 This is not allowed when the textlock is active:
 	- changing the buffer text
-- 
cgit 


From f43fa301c1a2817239e046a242902af65b7cac71 Mon Sep 17 00:00:00 2001
From: Eduard Baturin <trardone@gmail.com>
Date: Sat, 18 Feb 2023 09:43:59 +0300
Subject: fix(lsp): check if the buffer is a directory before w! it (#22289)

---
 runtime/lua/vim/lsp/util.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 38051e6410..4beb4fc367 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -759,9 +759,11 @@ function M.rename(old_fname, new_fname, opts)
   vim.fn.bufload(oldbuf)
 
   -- The there may be pending changes in the buffer
-  api.nvim_buf_call(oldbuf, function()
-    vim.cmd('w!')
-  end)
+  if vim.fn.isdirectory(old_fname) == 0 then
+    api.nvim_buf_call(oldbuf, function()
+      vim.cmd('w!')
+    end)
+  end
 
   local ok, err = os.rename(old_fname, new_fname)
   assert(ok, err)
-- 
cgit 


From 2f6413797499a1bdac28c20a491e8ea3be33bda3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 19 Feb 2023 01:27:32 +0100
Subject: vim-patch:9.0.1319: PRQL files are not recognized (#22319)

Problem:    PRQL files are not recognized.
Solution:   Add a filetype pattern for PRQL files. (Matthias Queitsch,
            closes vim/vim#12018)

https://github.com/vim/vim/commit/9de960ace0f017fcfeaf64a2f6492f0f88b11fdb

Co-authored-by: Matthias Queitsch <matthias.queitsch@mailbox.org>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index ca91f3f402..4ee7d46b20 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -810,6 +810,7 @@ local extension = {
   pdb = 'prolog',
   pml = 'promela',
   proto = 'proto',
+  prql = 'prql',
   ['psd1'] = 'ps1',
   ['psm1'] = 'ps1',
   ['ps1'] = 'ps1',
-- 
cgit 


From b62c0c8d9c22ae7fc9ee200733f8312efa6dbced Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 20 Feb 2023 08:12:59 +0100
Subject: docs: fix typos (#21961)

Co-authored-by: Ben Morgan <cassava@iexu.de>
---
 runtime/doc/eval.txt    | 4 ++--
 runtime/doc/intro.txt   | 2 +-
 runtime/doc/tagsrch.txt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 0e77fb182e..3889b8e9a5 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1827,8 +1827,8 @@ v:event		Dictionary of event data for the current |autocommand|.  Valid
 					|CompleteChanged|.
 			scrollbar 	Is |v:true| if popup menu have scrollbar, or
 					|v:false| if not.
-			changed_window 	Is |v:true| if the the event fired
-					while changing window (or tab) on |DirChanged|.
+			changed_window 	Is |v:true| if the event fired while
+					changing window (or tab) on |DirChanged|.
 			status		Job status or exit code, -1 means "unknown". |TermClose|
 
 					*v:exception* *exception-variable*
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 6bf6850ccf..11ba1b408c 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -382,7 +382,7 @@ Note:
 - If numlock is on the |TUI| receives plain ASCII values, so mapping <k0>,
   <k1>, ..., <k9> and <kPoint> will not work.
 - Nvim supports mapping multibyte chars with modifiers such as `<M-ä>`. Which
-  combinations actually work depends on the the UI or host terminal.
+  combinations actually work depends on the UI or host terminal.
 - When a key is pressed using a meta or alt modifier and no mapping exists for
   that keypress, Nvim may behave as though <Esc> was pressed before the key.
 - It is possible to notate combined modifiers (e.g. <C-A-T> for CTRL-ALT-T),
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 0f785dd1eb..49e51d6736 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -92,7 +92,7 @@ The ignore-case matches are found when:
 - when 'tagcase' is "followscs" and 'ignorecase' is on or the 'smartcase'
   option is on and the pattern does not contain an upper case character
 - when 'tagcase' is "ignore"
-- when 'tagcase' is "smart" and the patter does not contain an upper case
+- when 'tagcase' is "smart" and the pattern does not contain an upper case
   character
 
 Note that using ignore-case tag searching disables binary searching in the
-- 
cgit 


From f1816f9ee2a8b811fd6ce4e60a843087f855f97d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 20 Feb 2023 15:13:55 +0800
Subject: refactor(main.c): remove unreachable use_builtin_ui conditions
 (#22338)

When use_builtin_ui is true, Nvim will exit before line 385 is reached.
---
 runtime/doc/eval.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 3889b8e9a5..49d4546f95 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1794,7 +1794,7 @@ v:event		Dictionary of event data for the current |autocommand|.  Valid
 			abort		Whether the event triggered during
 					an aborting condition (e.g. |c_Esc| or
 					|c_CTRL-C| for |CmdlineLeave|).
-			chan		|channel-id| or 0 for "internal".
+			chan		|channel-id|
 			cmdlevel	Level of cmdline.
 			cmdtype		Type of cmdline, |cmdline-char|.
 			cwd		Current working directory.
-- 
cgit 


From bdf6d8733e2a954031de86e9a2d09c3b03f6641d Mon Sep 17 00:00:00 2001
From: Jason Hansen <jasonrodneyhansen@gmail.com>
Date: Mon, 20 Feb 2023 23:24:47 -0700
Subject: fix(lsp): wrong format of bufnr and client order in error message
 (#22336)

---
 runtime/lua/vim/lsp.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index c5392ac154..0a620e1367 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1736,8 +1736,8 @@ function lsp.buf_detach_client(bufnr, client_id)
     vim.notify(
       string.format(
         'Buffer (id: %d) is not attached to client (id: %d). Cannot detach.',
-        client_id,
-        bufnr
+        bufnr,
+        client_id
       )
     )
     return
-- 
cgit 


From 2d99830706a8560ac6f4668b4a384afc776cc7f4 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 21 Feb 2023 12:19:09 +0000
Subject: refactor(man): add type annotations

---
 runtime/lua/man.lua | 106 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 86 insertions(+), 20 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index 0956022ac6..61a9575312 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -2,6 +2,8 @@ local api, fn = vim.api, vim.fn
 
 local FIND_ARG = '-w'
 local localfile_arg = true -- Always use -l if possible. #6683
+
+---@type table[]
 local buf_hls = {}
 
 local M = {}
@@ -12,26 +14,28 @@ local function man_error(msg)
 end
 
 -- Run a system command and timeout after 30 seconds.
+---@param cmd_ string[]
+---@param silent boolean?
+---@param env string[]
+---@return string
 local function system(cmd_, silent, env)
-  local stdout_data = {}
-  local stderr_data = {}
-  local stdout = vim.loop.new_pipe(false)
-  local stderr = vim.loop.new_pipe(false)
+  local stdout_data = {} ---@type string[]
+  local stderr_data = {} ---@type string[]
+  local stdout = assert(vim.loop.new_pipe(false))
+  local stderr = assert(vim.loop.new_pipe(false))
 
   local done = false
-  local exit_code
+  local exit_code ---@type integer?
 
   -- We use the `env` command here rather than the env option to vim.loop.spawn since spawn will
   -- completely overwrite the environment when we just want to modify the existing one.
   --
   -- Overwriting mainly causes problems NixOS which relies heavily on a non-standard environment.
-  local cmd
+  local cmd = cmd_
   if env then
     cmd = { 'env' }
     vim.list_extend(cmd, env)
     vim.list_extend(cmd, cmd_)
-  else
-    cmd = cmd_
   end
 
   local handle
@@ -84,11 +88,17 @@ local function system(cmd_, silent, env)
   return table.concat(stdout_data)
 end
 
+---@param line string
+---@param linenr integer
 local function highlight_line(line, linenr)
+  ---@type string[]
   local chars = {}
   local prev_char = ''
   local overstrike, escape = false, false
+
+  ---@type table<integer,{attr:integer,start:integer,final:integer}>
   local hls = {} -- Store highlight groups as { attr, start, final }
+
   local NONE, BOLD, UNDERLINE, ITALIC = 0, 1, 2, 3
   local hl_groups = { [BOLD] = 'manBold', [UNDERLINE] = 'manUnderline', [ITALIC] = 'manItalic' }
   local attr = NONE
@@ -194,11 +204,12 @@ local function highlight_line(line, linenr)
       -- We only want to match against SGR sequences, which consist of ESC
       -- followed by '[', then a series of parameter and intermediate bytes in
       -- the range 0x20 - 0x3f, then 'm'. (See ECMA-48, sections 5.4 & 8.3.117)
+      ---@type string?
       local sgr = prev_char:match('^%[([\032-\063]*)m$')
       -- Ignore escape sequences with : characters, as specified by ITU's T.416
       -- Open Document Architecture and interchange format.
       if sgr and not string.find(sgr, ':') then
-        local match
+        local match ---@type string?
         while sgr and #sgr > 0 do
           -- Match against SGR parameters, which may be separated by ';'
           match, sgr = sgr:match('^(%d*);?(.*)')
@@ -261,11 +272,16 @@ end
 -- intended for PostgreSQL, which has man pages like 'CREATE_TABLE(7)';
 -- while editing SQL source code, it's nice to visually select 'CREATE TABLE'
 -- and hit 'K', which requires this transformation
+---@param str string
+---@return string
 local function spaces_to_underscores(str)
   local res = str:gsub('%s', '_')
   return res
 end
 
+---@param sect string|nil
+---@param name string|nil
+---@param silent boolean
 local function get_path(sect, name, silent)
   name = name or ''
   sect = sect or ''
@@ -287,7 +303,7 @@ local function get_path(sect, name, silent)
   --
   -- Finally, we can avoid relying on -S or -s here since they are very
   -- inconsistently supported. Instead, call -w with a section and a name.
-  local cmd
+  local cmd ---@type string[]
   if sect == '' then
     cmd = { 'man', FIND_ARG, name }
   else
@@ -310,12 +326,14 @@ local function get_path(sect, name, silent)
   end
 
   -- find any that match the specified name
+  ---@param v string
   local namematches = vim.tbl_filter(function(v)
     return fn.fnamemodify(v, ':t'):match(name)
   end, results) or {}
   local sectmatches = {}
 
   if #namematches > 0 and sect ~= '' then
+    ---@param v string
     sectmatches = vim.tbl_filter(function(v)
       return fn.fnamemodify(v, ':e') == sect
     end, namematches)
@@ -324,9 +342,12 @@ local function get_path(sect, name, silent)
   return fn.substitute(sectmatches[1] or namematches[1] or results[1], [[\n\+$]], '', '')
 end
 
+---@param text string
+---@param pat_or_re string
 local function matchstr(text, pat_or_re)
   local re = type(pat_or_re) == 'string' and vim.regex(pat_or_re) or pat_or_re
 
+  ---@type integer, integer
   local s, e = re:match_str(text)
 
   if s == nil then
@@ -338,6 +359,8 @@ end
 
 -- attempt to extract the name and sect out of 'name(sect)'
 -- otherwise just return the largest string of valid characters in ref
+---@param ref string
+---@return string, string
 local function extract_sect_and_name_ref(ref)
   ref = ref or ''
   if ref:sub(1, 1) == '-' then -- try ':Man -pandoc' with this disabled.
@@ -368,6 +391,9 @@ end
 -- 2. If it still could not be found, then we try again without a section.
 -- 3. If still not found but $MANSECT is set, then we try again with $MANSECT
 --    unset.
+---@param sect string?
+---@param name string
+---@param silent boolean?
 local function verify_exists(sect, name, silent)
   if sect and sect ~= '' then
     local ret = get_path(sect, name, true)
@@ -416,6 +442,8 @@ local EXT_RE = vim.regex([[\.\%([glx]z\|bz2\|lzma\|Z\)$]])
 -- more specific than what we provided to `man` (try `:Man 3 App::CLI`).
 -- Also on linux, name seems to be case-insensitive. So for `:Man PRIntf`, we
 -- still want the name of the buffer to be 'printf'.
+---@param path string
+---@return string, string
 local function extract_sect_and_name_path(path)
   local tail = fn.fnamemodify(path, ':t')
   if EXT_RE:match_str(path) then -- valid extensions
@@ -425,6 +453,7 @@ local function extract_sect_and_name_path(path)
   return sect, name
 end
 
+---@return boolean
 local function find_man()
   if vim.bo.filetype == 'man' then
     return true
@@ -442,6 +471,7 @@ local function find_man()
   return false
 end
 
+---@param pager boolean
 local function set_options(pager)
   vim.bo.swapfile = false
   vim.bo.buftype = 'nofile'
@@ -453,11 +483,14 @@ local function set_options(pager)
   vim.bo.filetype = 'man'
 end
 
+---@param path string
+---@param silent boolean?
+---@return string
 local function get_page(path, silent)
   -- Disable hard-wrap by using a big $MANWIDTH (max 1000 on some systems #9065).
   -- Soft-wrap: ftplugin/man.lua sets wrap/breakindent/….
   -- Hard-wrap: driven by `man`.
-  local manwidth
+  local manwidth ---@type integer|string
   if (vim.g.man_hardwrap or 1) ~= 1 then
     manwidth = 999
   elseif vim.env.MANWIDTH then
@@ -478,6 +511,14 @@ local function get_page(path, silent)
   })
 end
 
+---@param lnum integer
+---@return string
+local function getline(lnum)
+  ---@diagnostic disable-next-line
+  return fn.getline(lnum)
+end
+
+---@param page string
 local function put_page(page)
   vim.bo.modifiable = true
   vim.bo.readonly = false
@@ -485,7 +526,7 @@ local function put_page(page)
 
   api.nvim_buf_set_lines(0, 0, -1, false, vim.split(page, '\n'))
 
-  while fn.getline(1):match('^%s*$') do
+  while getline(1):match('^%s*$') do
     api.nvim_buf_set_lines(0, 0, 1, false, {})
   end
   -- XXX: nroff justifies text by filling it with whitespace.  That interacts
@@ -512,13 +553,21 @@ local function format_candidate(path, psect)
   return ''
 end
 
+---@generic T
+---@param list T[]
+---@param elem T
+---@return T[]
 local function move_elem_to_head(list, elem)
+  ---@diagnostic disable-next-line:no-unknown
   local list1 = vim.tbl_filter(function(v)
     return v ~= elem
   end, list)
   return { elem, unpack(list1) }
 end
 
+---@param sect string
+---@param name string
+---@return string[]
 local function get_paths(sect, name)
   -- Try several sources for getting the list man directories:
   --   1. `man -w` (works on most systems)
@@ -533,6 +582,7 @@ local function get_paths(sect, name)
   end
 
   local mandirs = table.concat(vim.split(mandirs_raw, '[:\n]', { trimempty = true }), ',')
+  ---@type string[]
   local paths = fn.globpath(mandirs, 'man?/' .. name .. '*.' .. sect .. '*', false, true)
 
   -- Prioritize the result from verify_exists as it obeys b:man_default_sects.
@@ -544,6 +594,10 @@ local function get_paths(sect, name)
   return paths
 end
 
+---@param sect string
+---@param psect string
+---@param name string
+---@return string[]
 local function complete(sect, psect, name)
   local pages = get_paths(sect, name)
   -- We remove duplicates in case the same manpage in different languages was found.
@@ -553,6 +607,8 @@ local function complete(sect, psect, name)
 end
 
 -- see extract_sect_and_name_ref on why tolower(sect)
+---@param arg_lead string
+---@param cmd_line string
 function M.man_complete(arg_lead, cmd_line, _)
   local args = vim.split(cmd_line, '%s+', { trimempty = true })
   local cmd_offset = fn.index(args, 'Man')
@@ -589,6 +645,7 @@ function M.man_complete(arg_lead, cmd_line, _)
   end
 
   if #args == 2 then
+    ---@type string, string
     local name, sect
     if arg_lead == '' then
       -- cursor (|) is at ':Man 1 |'
@@ -618,10 +675,13 @@ function M.man_complete(arg_lead, cmd_line, _)
   return complete(sect, sect, name)
 end
 
+---@param pattern string
+---@return {name:string,filename:string,cmd:string}[]
 function M.goto_tag(pattern, _, _)
   local sect, name = extract_sect_and_name_ref(pattern)
 
   local paths = get_paths(sect, name)
+  ---@type {name:string,title:string}[]
   local structured = {}
 
   for _, path in ipairs(paths) do
@@ -634,6 +694,7 @@ function M.goto_tag(pattern, _, _)
     end
   end
 
+  ---@param entry {name:string,title:string}
   return vim.tbl_map(function(entry)
     return {
       name = entry.name,
@@ -645,7 +706,7 @@ end
 
 -- Called when Nvim is invoked as $MANPAGER.
 function M.init_pager()
-  if fn.getline(1):match('^%s*$') then
+  if getline(1):match('^%s*$') then
     api.nvim_buf_set_lines(0, 0, 1, false, {})
   else
     vim.cmd('keepjumps 1')
@@ -653,7 +714,7 @@ function M.init_pager()
   highlight_man_page()
   -- Guess the ref from the heading (which is usually uppercase, so we cannot
   -- know the correct casing, cf. `man glDrawArraysInstanced`).
-  local ref = fn.substitute(matchstr(fn.getline(1), [[^[^)]\+)]]) or '', ' ', '_', 'g')
+  local ref = fn.substitute(matchstr(getline(1), [[^[^)]\+)]]) or '', ' ', '_', 'g')
   local ok, res = pcall(extract_sect_and_name_ref, ref)
   vim.b.man_sect = ok and res or ''
 
@@ -664,12 +725,14 @@ function M.init_pager()
   set_options(true)
 end
 
+---@param count integer
+---@param args string[]
 function M.open_page(count, smods, args)
   if #args > 2 then
     man_error('too many arguments')
   end
 
-  local ref
+  local ref ---@type string
   if #args == 0 then
     ref = vim.bo.filetype == 'man' and fn.expand('<cWORD>') or fn.expand('<cword>')
     if ref == '' then
@@ -731,24 +794,27 @@ function M.read_page(ref)
 end
 
 function M.show_toc()
-  local bufname = fn.bufname('%')
+  local bufnr = api.nvim_get_current_buf()
+  local bufname = api.nvim_buf_get_name(bufnr)
   local info = fn.getloclist(0, { winid = 1 })
   if info ~= '' and vim.w[info.winid].qf_toc == bufname then
     vim.cmd.lopen()
     return
   end
 
+  ---@type {bufnr:integer, lnum:integer, text:string}[]
   local toc = {}
+
   local lnum = 2
   local last_line = fn.line('$') - 1
   local section_title_re = vim.regex([[^\%( \{3\}\)\=\S.*$]])
   local flag_title_re = vim.regex([[^\s\+\%(+\|-\)\S\+]])
   while lnum and lnum < last_line do
-    local text = fn.getline(lnum)
+    local text = getline(lnum)
     if section_title_re:match_str(text) then
       -- if text is a section title
       toc[#toc + 1] = {
-        bufnr = fn.bufnr('%'),
+        bufnr = bufnr,
         lnum = lnum,
         text = text,
       }
@@ -756,7 +822,7 @@ function M.show_toc()
       -- if text is a flag title. we strip whitespaces and prepend two
       -- spaces to have a consistent format in the loclist.
       toc[#toc + 1] = {
-        bufnr = fn.bufnr('%'),
+        bufnr = bufnr,
         lnum = lnum,
         text = '  ' .. fn.substitute(text, [[^\s*\(.\{-}\)\s*$]], [[\1]], ''),
       }
@@ -772,7 +838,7 @@ end
 
 local function init()
   local path = get_path('', 'man', true)
-  local page
+  local page ---@type string?
   if path ~= nil then
     -- Check for -l support.
     page = get_page(path, true)
-- 
cgit 


From ee26b227e15abc263195d4c746d5dba9f0e6dec4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 21 Feb 2023 23:50:29 +0800
Subject: vim-patch:partial:938ae280c79b (#22356)

Update runtime files.

https://github.com/vim/vim/commit/938ae280c79b8cdb0fca60336ec4c090ecd8bb5a

Partially skip autocmd.txt: needs patch 8.2.5011.
Partially skip builtin.txt: needs patch 9.0.0411.
Partially skip eval.txt: needs patch 8.2.3783.
Cherry-pick :map-meta-keys from patch 9.0.1276.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/autocmd.txt       |   1 +
 runtime/doc/builtin.txt       |  17 ++--
 runtime/doc/cmdline.txt       |   1 +
 runtime/doc/eval.txt          |   2 +-
 runtime/doc/filetype.txt      |   5 +-
 runtime/doc/if_pyth.txt       |   2 +-
 runtime/doc/index.txt         |   4 +-
 runtime/doc/insert.txt        |   6 +-
 runtime/doc/map.txt           |  27 ++++-
 runtime/doc/options.txt       |  16 +--
 runtime/doc/pattern.txt       |  16 +--
 runtime/doc/pi_netrw.txt      |  38 +++----
 runtime/doc/remote.txt        |   2 +-
 runtime/doc/repeat.txt        |  20 ++--
 runtime/doc/sign.txt          |   2 +-
 runtime/doc/syntax.txt        |  28 ++++--
 runtime/doc/uganda.txt        |   2 +-
 runtime/doc/userfunc.txt      |   7 +-
 runtime/doc/usr_02.txt        |   2 +-
 runtime/doc/usr_05.txt        |   2 +-
 runtime/doc/usr_22.txt        |  40 ++++----
 runtime/ftplugin/dosbatch.vim |  18 +++-
 runtime/ftplugin/fish.vim     |  15 +++
 runtime/ftplugin/vim.vim      |  23 +++--
 runtime/indent/fish.vim       |  82 +++++++++++++++
 runtime/syntax/debsources.vim |  10 +-
 runtime/syntax/dosbatch.vim   |  39 ++++----
 runtime/syntax/fish.vim       | 225 ++++++++++++++++++++++++++++++++++++++++++
 runtime/syntax/fstab.vim      |   8 +-
 runtime/syntax/go.vim         |   7 +-
 runtime/syntax/html.vim       |   4 +-
 runtime/syntax/poefilter.vim  |   4 +-
 32 files changed, 533 insertions(+), 142 deletions(-)
 create mode 100644 runtime/ftplugin/fish.vim
 create mode 100644 runtime/indent/fish.vim
 create mode 100644 runtime/syntax/fish.vim

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 8cc4754880..89252145f2 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -380,6 +380,7 @@ CmdlineChanged			After a change was made to the text inside
 CmdlineEnter			After entering the command-line (including
 				non-interactive use of ":" in a mapping: use
 				|<Cmd>| instead to avoid this).
+				The pattern is matched against |cmdline-char|.
 				<afile> expands to the |cmdline-char|.
 				Sets these |v:event| keys:
 				    cmdlevel
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 2fc7dce7fc..60a1035da3 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -225,7 +225,7 @@ gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
 gettagstack([{nr}])		Dict	get the tag stack of window {nr}
 gettext({text})			String	lookup translation of {text}
 getwininfo([{winid}])		List	list of info about each window
-getwinpos([{timeout}])		List	X and Y coord in pixels of the Vim window
+getwinpos([{timeout}])		List	X and Y coord in pixels of Vim window
 getwinposx()			Number	X coord in pixels of Vim window
 getwinposy()			Number	Y coord in pixels of Vim window
 getwinvar({nr}, {varname} [, {def}])
@@ -326,7 +326,7 @@ max({expr})			Number	maximum value of items in {expr}
 menu_get({path} [, {modes}])	List	description of |menus| matched by {path}
 menu_info({name} [, {mode}])	Dict	get menu item information
 min({expr})			Number	minimum value of items in {expr}
-mkdir({name} [, {path} [, {prot}]])
+mkdir({name} [, {flags} [, {prot}]])
 				Number	create directory {name}
 mode([expr])			String	current editing mode
 msgpackdump({list} [, {type}])	List/Blob  dump objects to msgpack
@@ -5432,11 +5432,14 @@ min({expr})	Return the minimum value of all items in {expr}. Example:  >
 			mylist->min()
 
 <							*mkdir()* *E739*
-mkdir({name} [, {path} [, {prot}]])
+mkdir({name} [, {flags} [, {prot}]])
 		Create directory {name}.
 
-		If {path} is "p" then intermediate directories are created as
-		necessary.  Otherwise it must be "".
+		When {flags} is present it must be a string.  An empty string
+		has no effect.
+
+		If {flags} is "p" then intermediate directories are created as
+		necessary.
 
 		If {prot} is given it is used to set the protection bits of
 		the new directory.  The default is 0o755 (rwxr-xr-x: r/w for
@@ -5449,7 +5452,7 @@ mkdir({name} [, {path} [, {prot}]])
 
 <		This function is not available in the |sandbox|.
 
-		If you try to create an existing directory with {path} set to
+		If you try to create an existing directory with {flags} set to
 		"p" mkdir() will silently exit.
 
 		The function result is a Number, which is TRUE if the call was
@@ -6957,7 +6960,7 @@ setcellwidths({list})					*setcellwidths()*
 		{width} must be either 1 or 2, indicating the character width
 		in screen cells.			*E1112*
 		An error is given if the argument is invalid, also when a
-		range overlaps with another. 		*E1113*
+		range overlaps with another.		*E1113*
 
 		If the new value causes 'fillchars' or 'listchars' to become
 		invalid it is rejected and an error is given.
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index e0c4e14b01..844aab6fa3 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -584,6 +584,7 @@ followed by another Vim command:
     :registers
     :read !
     :sign
+    :tabdo
     :terminal
     :vglobal
     :windo
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 49d4546f95..af67e2b67d 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1445,7 +1445,7 @@ See below |functions|.
 ------------------------------------------------------------------------------
 lambda expression				*expr-lambda* *lambda*
 
-{args -> expr1}		lambda expression
+{args -> expr1}		lambda expression			*E451*
 
 A lambda expression creates a new unnamed function which returns the result of
 evaluating |expr1|.  Lambda expressions differ from |user-function|s in
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index a53c287d48..f69ffeabfe 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -634,7 +634,10 @@ MARKDOWN                                                *ft-markdown-plugin*
 
 To enable folding use this: >
 	let g:markdown_folding = 1
-<
+
+'expandtab' will be set by default.  If you do not want that use this: >
+	let g:markdown_recommended_style = 0
+
 
 PDF							*ft-pdf-plugin*
 
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 4c184ddf94..45accc2e03 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -629,7 +629,7 @@ You can test if Python is available with: >vim
 	if has('pythonx')
 	  echo 'there is Python'
 	endif
-  	if has('python3')
+	if has('python3')
 	  echo 'there is Python 3.x'
 	endif
 
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index a6aa036b55..174683a8c3 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -220,7 +220,7 @@ tag		char	      note action in Normal mode	~
 |CTRL-\_CTRL-N|	CTRL-\ CTRL-N	   go to Normal mode (no-op)
 |CTRL-\_CTRL-G|	CTRL-\ CTRL-G	   go to Normal mode (no-op)
 		CTRL-\ a - z	   reserved for extensions
-		CTRL-\ others      not used
+		CTRL-\ others	   not used
 |CTRL-]|	CTRL-]		   :ta to ident under cursor
 |CTRL-^|	CTRL-^		   edit Nth alternate file (equivalent to
 				   ":e #N")
@@ -233,7 +233,7 @@ tag		char	      note action in Normal mode	~
 				2  filter Nmove text through the {filter}
 				   command
 |!!|		!!{filter}	2  filter N lines through the {filter} command
-|quote|		"{register}  	   use {register} for next delete, yank or put
+|quote|		"{register}	   use {register} for next delete, yank or put
 				   ({.%#:} only work with put)
 |#|		#		1  search backward for the Nth occurrence of
 				   the ident under the cursor
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index e608b431f2..84aee43af4 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1101,8 +1101,8 @@ cursor column will be replaced with the matches.  If the returned value is
 larger than the cursor column, the cursor column is used.
 
 Negative return values:
-   -2 	To cancel silently and stay in completion mode.
-   -3 	To cancel silently and leave completion mode.
+   -2	To cancel silently and stay in completion mode.
+   -3	To cancel silently and leave completion mode.
    Another negative value: completion starts at the cursor column
 
 On the second invocation the arguments are:
@@ -1154,7 +1154,7 @@ items:
 			item with the same word is already present.
 	empty		when non-zero this match will be added even when it is
 			an empty string
-	user_data 	custom data which is associated with the item and
+	user_data	custom data which is associated with the item and
 			available in |v:completed_item|; it can be any type;
 			defaults to an empty string
 
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index cb8b162eb6..ad0570e9f7 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -764,7 +764,7 @@ option).  After that it assumes that the 'q' is to be interpreted as such.  If
 you type slowly, or your system is slow, reset the 'timeout' option.  Then you
 might want to set the 'ttimeout' option.
 
-			      				*map-precedence*
+							*map-precedence*
 Buffer-local mappings (defined using |:map-<buffer>|) take precedence over
 global mappings.  When a buffer-local mapping is the same as a global mapping,
 Vim will use the buffer-local mapping.  In addition, Vim will use a complete
@@ -838,6 +838,11 @@ in the original Vi, you would get back the text before the first undo).
 
 1.10 MAPPING ALT-KEYS					*:map-alt-keys*
 
+For a readable mapping command the <A-k> form can be used.  Note that <A-k>
+and <A-K> are different, the latter will use an upper case letter.  Actually,
+<A-K> and <A-S-K> are the same.  Instead of "A" you can use "M".  If you have
+an actual Meta modifier key, please see |:map-meta-keys|.
+
 In the GUI Nvim handles the |ALT| key itself, thus mapping keys with ALT
 should always work.  But in a terminal Nvim gets a sequence of bytes and has
 to figure out whether ALT was pressed.  Terminals may use ESC to indicate that
@@ -847,7 +852,21 @@ milliseconds, the ESC is interpreted as:
 otherwise it is interpreted as two key presses:
         <ESC> {key}
 
-1.11 MAPPING AN OPERATOR				*:map-operator*
+1.11 MAPPING META-KEYS					*:map-meta-keys*
+
+Mapping keys with the Meta modifier works very similar to using the Alt key.
+What key on your keyboard produces the Meta modifier depends on your keyboard
+and configuration.
+
+Note that mapping <M-a> actually is for using the Alt key.  That can be
+confusing!  It cannot be changed, it would not be backwards compatible.
+
+For the Meta modifier the "T" character is used.  For example, to map Meta-b
+in Insert mode: >
+	:imap <T-b> terrible
+
+
+1.12 MAPPING AN OPERATOR				*:map-operator*
 
 An operator is used before a {motion} command.  To define your own operator
 you must create a mapping that first sets the 'operatorfunc' option and then
@@ -984,7 +1003,7 @@ non-id	  The "non-id" type ends in a non-keyword character, the other
 Examples of strings that cannot be abbreviations: "a.b", "#def", "a b", "_$r"
 
 An abbreviation is only recognized when you type a non-keyword character.
-This can also be the <Esc> that ends insert mode or the <CR> that ends a
+This can also be the <Esc> that ends Insert mode or the <CR> that ends a
 command.  The non-keyword character which ends the abbreviation is inserted
 after the expanded abbreviation.  An exception to this is the character <C-]>,
 which is used to expand an abbreviation without inserting any extra
@@ -1484,7 +1503,7 @@ which by default correspond to the current line, last line and the whole
 buffer, relate to arguments, (loaded) buffers, windows or tab pages.
 
 Possible values are (second column is the short name used in listing):
-    -addr=lines		  	Range of lines (this is the default for -range)
+    -addr=lines			Range of lines (this is the default for -range)
     -addr=arguments	  arg	Range for arguments
     -addr=buffers	  buf	Range for buffers (also not loaded buffers)
     -addr=loaded_buffers  load	Range for loaded buffers
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e4106358f1..d13ab8c393 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1186,7 +1186,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			case mapping, the current locale is not effective.
 			This probably only matters for Turkish.
 
-						*'cdhome'* *'cdh'*
+				*'cdhome'* *'cdh'* *'nocdhome'* *'nocdh'*
 'cdhome' 'cdh'		boolean	(default: off)
 			global
 	When on, |:cd|, |:tcd| and |:lcd| without an argument changes the
@@ -4291,7 +4291,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	The 'mousemodel' option is set by the |:behave| command.
 
-						*'mousemoveevent'* *'mousemev'*
+	      *'mousemoveevent'* *'mousemev'* *'nomousemoveevent'* *'nomousemev'*
 'mousemoveevent' 'mousemev'  boolean	(default off)
 			global
 	When on, mouse move events are delivered to the input queue and are
@@ -5550,7 +5550,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  A	don't give the "ATTENTION" message when an existing	*shm-A*
 		swap file is found
 	  I	don't give the intro message when starting Vim,		*shm-I*
-	  	see |:intro|
+		see |:intro|
 	  c	don't give |ins-completion-menu| messages; for		*shm-c*
 		example, "-- XXX completion (YYY)", "match 1 of 2", "The only
 		match", "Pattern not found", "Back at original", etc.
@@ -5559,8 +5559,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  q	use "recording" instead of "recording @a"		*shm-q*
 	  F	don't give the file info when editing a file, like	*shm-F*
 		`:silent` was used for the command
-	  S     do not show search count message when searching, e.g.	*shm-S*
-	        "[1/5]"
+	  S	do not show search count message when searching, e.g.	*shm-S*
+		"[1/5]"
 
 	This gives you the opportunity to avoid that a change between buffers
 	requires you to hit <Enter>, but still gives as useful a message as
@@ -5709,7 +5709,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'signcolumn' 'scl'	string	(default "auto")
 			local to window
 	When and how to draw the signcolumn. Valid values are:
-	   "auto"   	only when there is a sign to display
+	   "auto"	only when there is a sign to display
 	   "auto:[1-9]" resize to accommodate multiple signs up to the
 	                given number (maximum 9), e.g. "auto:4"
 	   "auto:[1-8]-[2-9]"
@@ -5718,8 +5718,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			at least the given minimum (maximum 8) fixed
 			space. The minimum number should always be less
 			than the maximum number, e.g. "auto:2-5"
-	   "no"	    	never
-	   "yes"    	always
+	   "no"		never
+	   "yes"	always
 	   "yes:[1-9]"  always, with fixed space for signs up to the given
 	                number (maximum 9), e.g. "yes:3"
 	   "number"	display signs in the 'number' column. If the number
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 5357aaa3f1..625e1f95e1 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -97,6 +97,8 @@ g#			Like "#", but don't put "\<" and "\>" around the word.
 							*gd*
 gd			Goto local Declaration.  When the cursor is on a local
 			variable, this command will jump to its declaration.
+			This was made to work for C code, in other languages
+			it may not work well.
 			First Vim searches for the start of the current
 			function, just like "[[".  If it is not found the
 			search stops in line 1.  If it is found, Vim goes back
@@ -1129,21 +1131,21 @@ x	A single character, with no special meaning, matches itself
 	  are supported:
 		  Name	      Func	Contents ~
 *[:alnum:]*	  [:alnum:]   isalnum	ASCII letters and digits
-*[:alpha:]*	  [:alpha:]   isalpha  	ASCII letters
-*[:blank:]*	  [:blank:]     	space and tab
-*[:cntrl:]*	  [:cntrl:]   iscntrl 	ASCII control characters
-*[:digit:]*	  [:digit:]     	decimal digits '0' to '9'
+*[:alpha:]*	  [:alpha:]   isalpha	ASCII letters
+*[:blank:]*	  [:blank:]		space and tab
+*[:cntrl:]*	  [:cntrl:]   iscntrl	ASCII control characters
+*[:digit:]*	  [:digit:]		decimal digits '0' to '9'
 *[:graph:]*	  [:graph:]   isgraph	ASCII printable characters excluding
 					space
 *[:lower:]*	  [:lower:]   (1)	lowercase letters (all letters when
 					'ignorecase' is used)
-*[:print:]*	  [:print:]   (2) 	printable characters including space
+*[:print:]*	  [:print:]   (2)	printable characters including space
 *[:punct:]*	  [:punct:]   ispunct	ASCII punctuation characters
-*[:space:]*	  [:space:]     	whitespace characters: space, tab, CR,
+*[:space:]*	  [:space:]		whitespace characters: space, tab, CR,
 					NL, vertical tab, form feed
 *[:upper:]*	  [:upper:]   (3)	uppercase letters (all letters when
 					'ignorecase' is used)
-*[:xdigit:]*	  [:xdigit:]    	hexadecimal digits: 0-9, a-f, A-F
+*[:xdigit:]*	  [:xdigit:]		hexadecimal digits: 0-9, a-f, A-F
 *[:return:]*	  [:return:]		the <CR> character
 *[:tab:]*	  [:tab:]		the <Tab> character
 *[:escape:]*	  [:escape:]		the <Esc> character
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 5167b4baf7..d3d5e4605a 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1085,8 +1085,8 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	 <c-tab> Shrink/expand a netrw/explore window                |netrw-c-tab|
 	   -	Makes Netrw go up one directory                      |netrw--|
 	   a	Cycles between normal display,                       |netrw-a|
-	    	hiding (suppress display of files matching g:netrw_list_hide)
-	    	and showing (display only files which match g:netrw_list_hide)
+		hiding (suppress display of files matching g:netrw_list_hide)
+		and showing (display only files which match g:netrw_list_hide)
 	   cd	Make browsing directory the current directory        |netrw-cd|
 	   C	Setting the editing window                           |netrw-C|
 	   d	Make a directory                                     |netrw-d|
@@ -1118,7 +1118,7 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   mX	Apply arbitrary shell command to marked files en bloc|netrw-mX|
 	   mz	Compress/decompress marked files                     |netrw-mz|
 	   o	Enter the file/directory under the cursor in a new   |netrw-o|
-	    	browser window.  A horizontal split is used.
+		browser window.  A horizontal split is used.
 	   O	Obtain a file specified by cursor                    |netrw-O|
 	   p	Preview the file                                     |netrw-p|
 	   P	Browse in the previously used window                 |netrw-P|
@@ -1134,7 +1134,7 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   u	Change to recently-visited directory                 |netrw-u|
 	   U	Change to subsequently-visited directory             |netrw-U|
 	   v	Enter the file/directory under the cursor in a new   |netrw-v|
-	    	browser window.  A vertical split is used.
+		browser window.  A vertical split is used.
 	   x	View file with an associated program                 |netrw-x|
 	   X	Execute filename under cursor via |system()|           |netrw-X|
 
@@ -2271,7 +2271,7 @@ Example:
 	...
 
 
-MARKED FILES, ARBITRARY SHELL COMMAND, EN BLOC 			*netrw-mX* {{{2
+MARKED FILES, ARBITRARY SHELL COMMAND, EN BLOC			*netrw-mX* {{{2
 	    (See |netrw-mf| and |netrw-mr| for how to mark files)
 		      (uses the global marked-file list)
 
@@ -2611,7 +2611,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				Used to change access permission for a file.
 
   *g:netrw_clipboard*		=1
-  				By default, netrw will attempt to insure that
+				By default, netrw will attempt to insure that
 				the clipboard's values will remain unchanged.
 				However, some users report that they have
 				speed problems with this; consequently, this
@@ -2759,7 +2759,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				escaped before applying glob()
 
   *g:netrw_gx*			="<cfile>"
- 				This option controls how gx (|netrw-gx|) picks
+				This option controls how gx (|netrw-gx|) picks
 				up the text under the cursor.  See |expand()|
 				for possibilities.
 
@@ -2824,11 +2824,11 @@ your browsing preferences.  (see also: |netrw-settings|)
 				directory (|netrw-mt|, |netrw-mc|)
 
   *g:netrw_localcopycmdopt*	=''             Linux/Unix/MacOS/Cygwin
-  				=' \c copy'                     Windows
+				=' \c copy'                     Windows
 				Options for the |g:netrw_localcopycmd|
 
   *g:netrw_localcopydircmd*	="cp"           Linux/Unix/MacOS/Cygwin
- 				=expand("$COMSPEC")             Windows
+				=expand("$COMSPEC")             Windows
 				Copies directories to target directory.
 				(|netrw-mc|, |netrw-mt|)
 
@@ -2854,7 +2854,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				Options for |g:netrw_localmovecmd|
 
   *g:netrw_localrmdir*		="rmdir"        Linux/Unix/MacOS/Cygwin
- 				=expand("$COMSPEC")             Windows
+				=expand("$COMSPEC")             Windows
 				Remove directory command (rmdir)
 				This variable is only used if your vim is
 				earlier than 7.4 or if your vim doesn't
@@ -2890,10 +2890,10 @@ your browsing preferences.  (see also: |netrw-settings|)
 				(see |'ballooneval'|)
 
  *g:netrw_sizestyle*		not defined: actual bytes (default)
- 				="b" : actual bytes       (default)
- 				="h" : human-readable (ex. 5k, 4m, 3g)
+				="b" : actual bytes       (default)
+				="h" : human-readable (ex. 5k, 4m, 3g)
 				       uses 1000 base
- 				="H" : human-readable (ex. 5K, 4M, 3G)
+				="H" : human-readable (ex. 5K, 4M, 3G)
 				       uses 1024 base
 				The long listing (|netrw-i|) and query-file
 				maps (|netrw-qf|) will display file size
@@ -2941,7 +2941,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				 default: "NETRWSERVER"
 
   *g:netrw_sort_by*		sort by "name", "time", "size", or
-  				"exten".
+				"exten".
 				 default: "name"
 
   *g:netrw_sort_direction*	sorting direction: "normal" or "reverse"
@@ -2998,7 +2998,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 					.vim/after/syntax/netrw.vim.
 <				 The netrwGray highlighting is set up by
 				netrw when >
-	       				* netrwGray has not been previously
+					* netrwGray has not been previously
 					  defined
 					* the gui is running
 <				 As an example, I myself use a dark-background
@@ -3256,7 +3256,7 @@ If there are marked files:  (see |netrw-mf|)
     name, applying that substitute, and renaming each file to the result.
     As an example : >
 
-    	mr  [query: reply with *.c]
+	mr  [query: reply with *.c]
 	R   [query: reply with s/^\(.*\)\.c$/\1.cpp/]
 <
     This example will mark all "*.c" files and then rename them to "*.cpp"
@@ -3265,7 +3265,7 @@ If there are marked files:  (see |netrw-mf|)
 
     The ctrl-X character has special meaning for renaming files: >
 
-    	<c-x>      : a single ctrl-x tells netrw to ignore the portion of the response
+	<c-x>      : a single ctrl-x tells netrw to ignore the portion of the response
 	             lying between the last '/' and the ctrl-x.
 
 	<c-x><c-x> : a pair of contiguous ctrl-x's tells netrw to ignore any
@@ -3833,7 +3833,7 @@ netrw:
 	  Decho.vim is provided as a "vimball".  You
 	  should edit the Decho.vba.gz file and source it in: >
 
-	  	vim Decho.vba.gz
+		vim Decho.vba.gz
 		:so %
 		:q
 <
@@ -3875,7 +3875,7 @@ netrw:
 	   To save the file: under linux, the output will be in a separate
 	   remote server window; in it, just save the file with >
 
-	   	:w! DBG
+		:w! DBG
 
 <	   Under a vim that doesn't support clientserver, your debugging
 	   output will appear in another tab: >
diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt
index 4610088ab0..804645f774 100644
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -46,7 +46,7 @@ The following command line arguments are available:
 				new tabpage.
 								*--remote-send*
    --remote-send {keys}		Send {keys} to server and exit.  The {keys}
-   				are not mapped.  Special key names are
+				are not mapped.  Special key names are
 				recognized, e.g., "<CR>" results in a CR
 				character.
 								*--remote-expr*
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index bf77aacdc0..23030761dd 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -214,7 +214,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			When [where] is omitted only 'runtimepath' is used.
 			Other values:
 				START	search only under "start" in 'packpath'
-				OPT 	search only under "opt" in 'packpath'
+				OPT	search only under "opt" in 'packpath'
 				PACK	search under "start" and "opt" in
 					'packpath'
 				ALL	first use 'runtimepath', then search
@@ -641,15 +641,15 @@ up-to-date easily, but it requires a program like "git" to be available.
 You can do both, github can automatically create an archive for a release.
 
 Your directory layout would be like this:
-   start/foobar/plugin/foo.vim    	" always loaded, defines commands
-   start/foobar/plugin/bar.vim    	" always loaded, defines commands
-   start/foobar/autoload/foo.vim  	" loaded when foo command used
-   start/foobar/doc/foo.txt       	" help for foo.vim
-   start/foobar/doc/tags          	" help tags
-   opt/fooextra/plugin/extra.vim  	" optional plugin, defines commands
-   opt/fooextra/autoload/extra.vim  	" loaded when extra command used
-   opt/fooextra/doc/extra.txt  	        " help for extra.vim
-   opt/fooextra/doc/tags  	        " help tags
+   start/foobar/plugin/foo.vim		" always loaded, defines commands
+   start/foobar/plugin/bar.vim		" always loaded, defines commands
+   start/foobar/autoload/foo.vim	" loaded when foo command used
+   start/foobar/doc/foo.txt		" help for foo.vim
+   start/foobar/doc/tags		" help tags
+   opt/fooextra/plugin/extra.vim	" optional plugin, defines commands
+   opt/fooextra/autoload/extra.vim	" loaded when extra command used
+   opt/fooextra/doc/extra.txt		" help for extra.vim
+   opt/fooextra/doc/tags		" help tags
 
 This allows for the user to do: >
 	mkdir ~/.local/share/nvim/site/pack
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index d09d0f226f..53ef03eb63 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -610,7 +610,7 @@ sign_placelist({list})
 				be placed. For the accepted values, see
 				|line()|.
 		    name	name of the sign to place. See |sign_define()|
-		    		for more information.
+				for more information.
 		    priority	priority of the sign. When multiple signs are
 				placed on a line, the sign with the highest
 				priority is used. If not specified, the
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index bd5a4f1926..7102e93f0a 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1271,18 +1271,32 @@ When not set 4 is used.
 
 DOSBATCH				*dosbatch.vim* *ft-dosbatch-syntax*
 
-There is one option with highlighting DOS batch files.	This covers new
-extensions to the Command Interpreter introduced with Windows 2000 and
-is controlled by the variable dosbatch_cmdextversion.  For Windows NT
-this should have the value 1, and for Windows 2000 it should be 2.
+Select the set of Windows Command interpreter extensions that should be
+supported with the variable dosbatch_cmdextversion.  For versions of Windows
+NT (before Windows 2000) this should have the value of 1.  For Windows 2000
+and later it should be 2.
 Select the version you want with the following line: >
 
    :let dosbatch_cmdextversion = 1
 
 If this variable is not defined it defaults to a value of 2 to support
-Windows 2000.
+Windows 2000 and later.
 
-A second option covers whether *.btm files should be detected as type
+The original MS-DOS supports an idiom of using a double colon (::) as an
+alternative way to enter a comment line.  This idiom can be used with the
+current Windows Command Interpreter, but it can lead to problems when used
+inside ( ... ) command blocks.  You can find a discussion about this on
+Stack Overflow -
+
+https://stackoverflow.com/questions/12407800/which-comment-style-should-i-use-in-batch-files
+
+To allow the use of the :: idiom for comments in the Windows Command
+Interpreter or working with MS-DOS bat files, set the
+dosbatch_colons_comment variable to anything: >
+
+   :let dosbatch_colons_comment = 1
+
+There is an option that covers whether *.btm files should be detected as type
 "dosbatch" (MS-DOS batch files) or type "btm" (4DOS batch files).  The latter
 is used by default.  You may select the former with the following line: >
 
@@ -3784,7 +3798,7 @@ SYNTAX ISKEYWORD SETTING				*:syn-iskeyword*
 
 	clear:		Syntax specific iskeyword setting is disabled and the
 			buffer-local 'iskeyword' setting is used.
-	{option}       	Set the syntax 'iskeyword' option to a new value.
+	{option}	Set the syntax 'iskeyword' option to a new value.
 
 	Example: >
   :syntax iskeyword @,48-57,192-255,$,_
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index d8fc26ad17..fc38f5b73c 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -246,7 +246,7 @@ Credit Card:	You can use PayPal to send money with a Credit card.  This is
 		    Bram@iccf-holland.org
 
 Others:		Transfer to this account if possible:
-		    ING bank: 	IBAN: NL95 INGB 0004 5487 74
+		    ING bank:	IBAN: NL95 INGB 0004 5487 74
 				Swift code: INGBNL2A
 		    under the name "stichting ICCF Holland", Amersfoort
 		Checks are not accepted.
diff --git a/runtime/doc/userfunc.txt b/runtime/doc/userfunc.txt
index 9c428175bb..ce6f2fc2e9 100644
--- a/runtime/doc/userfunc.txt
+++ b/runtime/doc/userfunc.txt
@@ -234,9 +234,10 @@ Example: >
   call Something('key', 20)	"key: 20"
 
 The argument default expressions are evaluated at the time of the function
-call, not definition.  Thus it is possible to use an expression which is
-invalid the moment the function is defined.  The expressions are also only
-evaluated when arguments are not specified during a call.
+call, not when the function is defined.  Thus it is possible to use an
+expression which is invalid the moment the function is defined.  The
+expressions are also only evaluated when arguments are not specified during a
+call.
 
 								*E989*
 Optional arguments with default expressions must occur after any mandatory
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index 11afe39742..259bb41200 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -495,7 +495,7 @@ You can use the error ID at the start to find help about it: >
 	:help E37
 
 
-Summary: 					*help-summary*  >
+Summary:					*help-summary*  >
 
 1) Use Ctrl-D after typing a topic and let Vim show all available topics.
    Or press Tab to complete: >
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index 24d6185eae..d8fb2acedb 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -273,7 +273,7 @@ an archive or as a repository.  For an archive you can follow these steps:
 	   package.
 	2. unpack the archive in that directory.  This assumes the top
 	   directory in the archive is "start": >
-	   	cd ~/.local/share/nvim/site/pack/fancy
+		cd ~/.local/share/nvim/site/pack/fancy
 		unzip /tmp/fancy.zip
 <	   If the archive layout is different make sure that you end up with a
 	   path like this:
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index 539bda3980..d977b20ecc 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -77,25 +77,25 @@ browser.  This is what you get: >
     9. Directory Browsing	 netrw-browse   netrw-dir   netrw-list   netrw-help
 
     MAPS								 netrw-maps
-     	 <F1>.............Help.......................................|netrw-help|
-     	 <cr>.............Browsing...................................|netrw-cr|
-     	 <del>............Deleting Files or Directories..............|netrw-delete|
-     	 -................Going Up...................................|netrw--|
-     	 a................Hiding Files or Directories................|netrw-a|
-     	 mb...............Bookmarking a Directory....................|netrw-mb|
-     	 gb...............Changing to a Bookmarked Directory.........|netrw-gb|
-     	 cd...............Make Browsing Directory The Current Dir....|netrw-c|
-     	 d................Make A New Directory.......................|netrw-d|
-     	 D................Deleting Files or Directories..............|netrw-D|
-     	 <c-h>............Edit File/Directory Hiding List............|netrw-ctrl-h|
-     	 i................Change Listing Style.......................|netrw-i|
-     	 <c-l>............Refreshing the Listing.....................|netrw-ctrl-l|
-     	 o................Browsing with a Horizontal Split...........|netrw-o|
-     	 p................Use Preview Window.........................|netrw-p|
-     	 P................Edit in Previous Window....................|netrw-p|
-     	 q................Listing Bookmarks and History..............|netrw-qb|
-     	 r................Reversing Sorting Order....................|netrw-r|
-<    	(etc)
+	 <F1>.............Help.......................................|netrw-help|
+	 <cr>.............Browsing...................................|netrw-cr|
+	 <del>............Deleting Files or Directories..............|netrw-delete|
+	 -................Going Up...................................|netrw--|
+	 a................Hiding Files or Directories................|netrw-a|
+	 mb...............Bookmarking a Directory....................|netrw-mb|
+	 gb...............Changing to a Bookmarked Directory.........|netrw-gb|
+	 cd...............Make Browsing Directory The Current Dir....|netrw-c|
+	 d................Make A New Directory.......................|netrw-d|
+	 D................Deleting Files or Directories..............|netrw-D|
+	 <c-h>............Edit File/Directory Hiding List............|netrw-ctrl-h|
+	 i................Change Listing Style.......................|netrw-i|
+	 <c-l>............Refreshing the Listing.....................|netrw-ctrl-l|
+	 o................Browsing with a Horizontal Split...........|netrw-o|
+	 p................Use Preview Window.........................|netrw-p|
+	 P................Edit in Previous Window....................|netrw-p|
+	 q................Listing Bookmarks and History..............|netrw-qb|
+	 r................Reversing Sorting Order....................|netrw-r|
+<	(etc)
 
 The <F1> key thus brings you to a netrw directory browsing contents help page.
 It's a regular help page; use the usual |CTRL-]| to jump to tagged help items
@@ -106,7 +106,7 @@ To select files for display and editing: (with the cursor is atop a filename)
 	<enter>		Open the file in the current window.	   |netrw-cr|
 	o		Horizontally split window and display file |netrw-o|
 	v		Vertically split window and display file   |netrw-v|
-	p		Use the |preview-window| 		   |netrw-p|
+	p		Use the |preview-window|		   |netrw-p|
 	P		Edit in the previous window		   |netrw-P|
 	t		Open file in a new tab			   |netrw-t|
 
diff --git a/runtime/ftplugin/dosbatch.vim b/runtime/ftplugin/dosbatch.vim
index 0c5cde2503..f02f26b1fd 100644
--- a/runtime/ftplugin/dosbatch.vim
+++ b/runtime/ftplugin/dosbatch.vim
@@ -1,7 +1,10 @@
 " Vim filetype plugin file
-" Language:    MS-DOS .bat files
-" Maintainer:  Mike Williams <mrw@eandem.co.uk>
-" Last Change: 7th May 2020
+" Language:    MS-DOS/Windows .bat files
+" Maintainer:  Mike Williams <mrmrdubya@gmail.com>
+" Last Change: 12th February 2023
+"
+" Options Flags:
+" dosbatch_colons_comment       - any value to treat :: as comment line
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -15,8 +18,13 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 " BAT comment formatting
-setlocal comments=b:rem,b:@rem,b:REM,b:@REM,:::
-setlocal commentstring=::\ %s
+setlocal comments=b:rem,b:@rem,b:REM,b:@REM
+if exists("dosbatch_colons_comment")
+  setlocal comments+=:::
+  setlocal commentstring=::\ %s
+else
+  setlocal commentstring=REM\ %s
+endif
 setlocal formatoptions-=t formatoptions+=rol
 
 " Lookup DOS keywords using Windows command help.
diff --git a/runtime/ftplugin/fish.vim b/runtime/ftplugin/fish.vim
new file mode 100644
index 0000000000..7acbf44210
--- /dev/null
+++ b/runtime/ftplugin/fish.vim
@@ -0,0 +1,15 @@
+" Vim filetype plugin file
+" Language:     fish
+" Maintainer:   Nicholas Boyle (github.com/nickeb96)
+" Repository:   https://github.com/nickeb96/fish.vim
+" Last Change:  February 1, 2023
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+setlocal iskeyword=@,48-57,_,192-255,-,.
+setlocal comments=:#
+setlocal commentstring=#%s
+setlocal formatoptions+=crjq
diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim
index b64bb55d68..a2cbc28971 100644
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Vim
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Nov 27
+" Last Change:	2023 Feb 07
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -98,18 +98,23 @@ if exists("loaded_matchit")
   "   func name
   " require a parenthesis following, then there can be an "endfunc".
   let b:match_words =
-	\ '\<\%(fu\%[nction]\|def\)!\=\s\+\S\+\s*(:\%(\%(^\||\)\s*\)\@<=\<retu\%[rn]\>:\%(\%(^\||\)\s*\)\@<=\<\%(endf\%[unction]\|enddef\)\>,' .
-	\ '\<\(wh\%[ile]\|for\)\>:\%(\%(^\||\)\s*\)\@<=\<brea\%[k]\>:\%(\%(^\||\)\s*\)\@<=\<con\%[tinue]\>:\%(\%(^\||\)\s*\)\@<=\<end\(w\%[hile]\|fo\%[r]\)\>,' .
-	\ '\<if\>:\%(\%(^\||\)\s*\)\@<=\<el\%[seif]\>:\%(\%(^\||\)\s*\)\@<=\<en\%[dif]\>,' .
-	\ '{:},' .
-	\ '\<try\>:\%(\%(^\||\)\s*\)\@<=\<cat\%[ch]\>:\%(\%(^\||\)\s*\)\@<=\<fina\%[lly]\>:\%(\%(^\||\)\s*\)\@<=\<endt\%[ry]\>,' .
-	\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,'
+	\ '\<\%(fu\%[nction]\|def\)!\=\s\+\S\+\s*(:\%(\%(^\||\)\s*\)\@<=\<retu\%[rn]\>:\%(\%(^\||\)\s*\)\@<=\<\%(endf\%[unction]\|enddef\)\>,' ..
+	\ '\<\%(wh\%[ile]\|for\)\>:\%(\%(^\||\)\s*\)\@<=\<brea\%[k]\>:\%(\%(^\||\)\s*\)\@<=\<con\%[tinue]\>:\%(\%(^\||\)\s*\)\@<=\<end\%(w\%[hile]\|fo\%[r]\)\>,' ..
+	\ '\<if\>:\%(\%(^\||\)\s*\)\@<=\<el\%[seif]\>:\%(\%(^\||\)\s*\)\@<=\<en\%[dif]\>,' ..
+	\ '{:},' ..
+	\ '\<try\>:\%(\%(^\||\)\s*\)\@<=\<cat\%[ch]\>:\%(\%(^\||\)\s*\)\@<=\<fina\%[lly]\>:\%(\%(^\||\)\s*\)\@<=\<endt\%[ry]\>,' ..
+	\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,' ..
+	\ '\<class\>:\<endclass\>,' ..
+	\ '\<inte\%[rface]\>:\<endinterface\>,' ..
+	\ '\<enu\%[m]\>:\<endenum\>,'
+
   " Ignore syntax region commands and settings, any 'en*' would clobber
   " if-endif.
   " - set spl=de,en
   " - au! FileType javascript syntax region foldBraces start=/{/ end=/}/ …
-  let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name")
-        \ =~? "comment\\|string\\|vimLetHereDoc\\|vimSynReg\\|vimSet"'
+  " Also ignore here-doc and dictionary keys (vimVar).
+  let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
+	\ =~? "comment\\|string\\|vimSynReg\\|vimSet\\|vimLetHereDoc\\|vimVar"'
 endif
 
 let &cpo = s:cpo_save
diff --git a/runtime/indent/fish.vim b/runtime/indent/fish.vim
new file mode 100644
index 0000000000..7455287ec0
--- /dev/null
+++ b/runtime/indent/fish.vim
@@ -0,0 +1,82 @@
+" Vim indent file
+" Language:     fish
+" Maintainer:   Nicholas Boyle (github.com/nickeb96)
+" Repository:   https://github.com/nickeb96/fish.vim
+" Last Change:  February 4, 2023
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetFishIndent(v:lnum)
+setlocal indentkeys+==end,=else,=case
+
+function s:PrevCmdStart(linenum)
+    let l:linenum = a:linenum
+    " look for the first line that isn't a line continuation
+    while l:linenum > 1 && getline(l:linenum - 1) =~# '\\$'
+        let l:linenum = l:linenum - 1
+    endwhile
+    return l:linenum
+endfunction
+
+function GetFishIndent(lnum)
+    let l:shiftwidth = shiftwidth()
+
+    let l:prevlnum = prevnonblank(a:lnum - 1)
+    if l:prevlnum ==# 0
+        return 0
+    endif
+
+    " if the previous line ended with a line continuation
+    if getline(a:lnum - 1) =~# '\\$'
+        if a:lnum ==# 0 || getline(a:lnum - 2) !~# '\\$'
+            " this is the first line continuation in a chain, so indent it
+            return indent(a:lnum - 1) + l:shiftwidth
+        else
+            " use the same indentation as the previous continued line
+            return indent(a:lnum - 1)
+        endif
+    endif
+
+    let l:prevlnum = s:PrevCmdStart(l:prevlnum)
+
+    let l:prevline = getline(l:prevlnum)
+    if l:prevline =~# '^\s*\(begin\|if\|else\|while\|for\|function\|case\|switch\)\>'
+        let l:indent = l:shiftwidth
+    else
+        let l:indent = 0
+    endif
+
+    let l:line = getline(a:lnum)
+    if l:line =~# '^\s*end\>'
+        " find end's matching start
+        let l:depth = 1
+        let l:currentlnum = a:lnum
+        while l:depth > 0 && l:currentlnum > 0
+            let l:currentlnum = s:PrevCmdStart(prevnonblank(l:currentlnum - 1))
+            let l:currentline = getline(l:currentlnum)
+            if l:currentline =~# '^\s*end\>'
+                let l:depth = l:depth + 1
+            elseif l:currentline =~# '^\s*\(begin\|if\|while\|for\|function\|switch\)\>'
+                let l:depth = l:depth - 1
+            endif
+        endwhile
+        if l:currentline =~# '^\s*switch\>'
+            return indent(l:currentlnum)
+        else
+            return indent(l:prevlnum) + l:indent - l:shiftwidth
+        endif
+    elseif l:line =~# '^\s*else\>'
+        return indent(l:prevlnum) + l:indent - l:shiftwidth
+    elseif l:line =~# '^\s*case\>'
+        if getline(l:prevlnum) =~# '^\s*switch\>'
+            return indent(l:prevlnum) + l:indent
+        else
+            return indent(l:prevlnum) + l:indent - l:shiftwidth
+        endif
+    else
+        return indent(l:prevlnum) + l:indent
+    endif
+endfunction
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index 69900c7a51..cbb3b36c10 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2023 Jan 16
+" Last Change: 2023 Feb 06
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -14,7 +14,9 @@ endif
 syn case match
 
 " A bunch of useful keywords
-syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\|non-free-firmware\|restricted\|universe\|multiverse\)/
+syn match debsourcesType               /\(deb-src\|deb\)/
+syn match debsourcesFreeComponent      /\(main\|universe\)/
+syn match debsourcesNonFreeComponent   /\(contrib\|non-free-firmware\|non-free\|restricted\|multiverse\)/
 
 " Match comments
 syn match debsourcesComment        /#.*/  contains=@Spell
@@ -48,7 +50,9 @@ exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\<\('. join
 
 " Associate our matches and regions with pretty colours
 hi def link debsourcesLine                    Error
-hi def link debsourcesKeyword                 Statement
+hi def link debsourcesType                    Statement
+hi def link debsourcesFreeComponent           Statement
+hi def link debsourcesNonFreeComponent        Statement
 hi def link debsourcesDistrKeyword            Type
 hi def link debsourcesUnsupportedDistrKeyword WarningMsg
 hi def link debsourcesComment                 Comment
diff --git a/runtime/syntax/dosbatch.vim b/runtime/syntax/dosbatch.vim
index f003a65909..a75771bd2d 100644
--- a/runtime/syntax/dosbatch.vim
+++ b/runtime/syntax/dosbatch.vim
@@ -1,12 +1,12 @@
 " Vim syntax file
-" Language:	MS-DOS batch file (with NT command extensions)
-" Maintainer:	Mike Williams <mrw@eandem.co.uk>
+" Language:	MS-DOS/Windows batch file (with NT command extensions)
+" Maintainer:	Mike Williams <mrmrdubya@gmail.com>
 " Filenames:    *.bat
-" Last Change:	6th September 2009
-" Web Page:     http://www.eandem.co.uk/mrw/vim
+" Last Change:	12th February 2023
 "
 " Options Flags:
 " dosbatch_cmdextversion	- 1 = Windows NT, 2 = Windows 2000 [default]
+" dosbatch_colons_comment       - any value to treat :: as comment line
 "
 
 " quit when a syntax file was already loaded
@@ -92,7 +92,11 @@ syn match dosbatchComment	"^rem\($\|\s.*$\)"lc=3 contains=dosbatchTodo,dosbatchS
 syn match dosbatchComment	"^@rem\($\|\s.*$\)"lc=4 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
 syn match dosbatchComment	"\srem\($\|\s.*$\)"lc=4 contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
 syn match dosbatchComment	"\s@rem\($\|\s.*$\)"lc=5 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
-syn match dosbatchComment	"\s*:\s*:.*$" contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
+if exists("dosbatch_colons_comment")
+  syn match dosbatchComment	"\s*:\s*:.*$" contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
+else
+  syn match dosbatchError       "\s*:\s*:.*$"
+endif
 
 " Comments in ()'s - still to handle spaces before rem
 syn match dosbatchComment	"(rem\([^)]\|\^\@<=)\)*"lc=4 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
@@ -110,34 +114,35 @@ syn keyword dosbatchImplicit    vol xcopy
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-hi def link dosbatchTodo		Todo
+hi def link dosbatchTodo	Todo
+hi def link dosbatchError	Error
 
 hi def link dosbatchStatement	Statement
 hi def link dosbatchCommands	dosbatchStatement
-hi def link dosbatchLabel		Label
+hi def link dosbatchLabel	Label
 hi def link dosbatchConditional	Conditional
-hi def link dosbatchRepeat		Repeat
+hi def link dosbatchRepeat	Repeat
 
-hi def link dosbatchOperator       Operator
-hi def link dosbatchEchoOperator   dosbatchOperator
-hi def link dosbatchIfOperator     dosbatchOperator
+hi def link dosbatchOperator	Operator
+hi def link dosbatchEchoOperator dosbatchOperator
+hi def link dosbatchIfOperator	dosbatchOperator
 
 hi def link dosbatchArgument	Identifier
-hi def link dosbatchIdentifier     Identifier
+hi def link dosbatchIdentifier	Identifier
 hi def link dosbatchVariable	dosbatchIdentifier
 
 hi def link dosbatchSpecialChar	SpecialChar
-hi def link dosbatchString		String
-hi def link dosbatchNumber		Number
+hi def link dosbatchString	String
+hi def link dosbatchNumber	Number
 hi def link dosbatchInteger	dosbatchNumber
 hi def link dosbatchHex		dosbatchNumber
-hi def link dosbatchBinary		dosbatchNumber
-hi def link dosbatchOctal		dosbatchNumber
+hi def link dosbatchBinary	dosbatchNumber
+hi def link dosbatchOctal	dosbatchNumber
 
 hi def link dosbatchComment	Comment
 hi def link dosbatchImplicit	Function
 
-hi def link dosbatchSwitch		Special
+hi def link dosbatchSwitch	Special
 
 hi def link dosbatchCmd		PreProc
 
diff --git a/runtime/syntax/fish.vim b/runtime/syntax/fish.vim
new file mode 100644
index 0000000000..266878bbdc
--- /dev/null
+++ b/runtime/syntax/fish.vim
@@ -0,0 +1,225 @@
+" Vim syntax file
+" Language:     fish
+" Maintainer:   Nicholas Boyle (github.com/nickeb96)
+" Repository:   https://github.com/nickeb96/fish.vim
+" Last Change:  February 1, 2023
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+
+" Statements
+syn cluster fishStatement contains=fishKeywordAndOr,fishNot,fishSelectStatement,fishKeyword,fishKeywordIf,fishCommand,fishVariable
+
+syn keyword fishKeywordAndOr and or nextgroup=fishNot,fishSelectStatement,fishKeyword,fishKeywordIf,fishCommand
+hi def link fishKeywordAndOr fishOperator
+
+syn keyword fishNot not skipwhite nextgroup=fishSelectStatement,fishKeyword,fishKeywordIf,fishCommand
+syn match   fishNot /!/ skipwhite nextgroup=fishSelectStatement,fishKeyword,fishKeywordIf,fishCommand
+hi def link fishNot fishOperator
+
+syn keyword fishSelectStatement command builtin skipwhite nextgroup=fishKeyword,fishKeywordIf,fishCommand,fishOption
+hi def link fishSelectStatement fishKeyword
+
+syn keyword fishKeyword end skipwhite nextgroup=@fishTerminator
+
+syn keyword fishKeywordIf if skipwhite nextgroup=@fishStatement
+syn keyword fishKeyword else skipwhite nextgroup=fishKeywordIf,fishSemicolon
+hi def link fishKeywordIf fishKeyword
+
+syn keyword fishKeyword switch skipwhite nextgroup=@fishArgument
+syn keyword fishKeyword case skipwhite nextgroup=@fishArgument
+
+syn keyword fishKeyword while skipwhite nextgroup=@fishStatement
+
+syn keyword fishKeyword for skipwhite nextgroup=fishForVariable
+syn match   fishForVariable /[[:alnum:]_]\+/ contained skipwhite nextgroup=fishKeywordIn
+syn keyword fishKeywordIn in contained skipwhite nextgroup=@fishArgument
+hi def link fishForVariable fishParameter
+hi def link fishKeywordIn fishKeyword
+
+syn keyword fishKeyword _ abbr argparse begin bg bind block break breakpoint cd commandline
+    \ complete continue count disown echo emit eval exec exit false fg function functions
+    \ history jobs math printf pwd random read realpath return set set_color source status
+    \ string test time true type ulimit wait
+    \ skipwhite nextgroup=@fishNext
+syn match   fishKeyword /\<contains\>/ skipwhite nextgroup=@fishNext
+
+syn match   fishCommand /[[:alnum:]_\/[][[:alnum:]+._-]*/ skipwhite nextgroup=@fishNext
+
+
+" Internally Nested Arguments
+
+syn cluster fishSubscriptArgs contains=fishInnerVariable,fishIndexNum,fishIndexRange,fishInnerCommandSub
+
+syn match   fishInnerVariable /\$\+[[:alnum:]_]\+/ contained
+syn match   fishInnerVariable /\$\+[[:alnum:]_]\+\[/me=e-1,he=e-1 contained nextgroup=fishInnerSubscript
+hi def link fishInnerVariable fishVariable
+
+syn region  fishInnerSubscript matchgroup=fishVariable start=/\[/ end=/]/ contained
+    \ keepend contains=@fishSubscriptArgs
+hi def link fishInnerSubscript fishSubscript
+
+syn match   fishIndexNum /[+-]?[[:digit:]]\+/ contained
+hi def link fishIndexNum fishParameter
+
+syn match   fishIndexRange /\.\./ contained
+hi def link fishIndexRange fishParameter
+
+syn region  fishInnerCommandSub matchgroup=fishOperator start=/(/ start=/\$(/ end=/)/ contained
+    \ contains=@fishStatement
+hi def link fishInnerCommandSub fishCommandSub
+
+syn region  fishQuotedCommandSub matchgroup=fishOperator start=/\$(/ end=/)/ contained
+    \ contains=@fishStatement
+hi def link fishQuotedCommandSub fishCommandSub
+
+syn match   fishBraceExpansionComma /,/ contained
+hi def link fishBraceExpansionComma fishOperator
+
+syn match   fishBracedParameter '[[:alnum:]\u5b\u5d@:=+.%/!_-]\+' contained contains=fishInnerPathGlob
+hi def link fishBracedParameter fishParameter
+
+syn region  fishBracedQuote start=/'/ skip=/\\'/ end=/'/ contained
+    \ contains=fishEscapedEscape,fishEscapedSQuote
+syn region  fishBracedQuote start=/"/ skip=/\\"/ end=/"/ contained
+    \ contains=fishEscapedEscape,fishEscapedDQuote,fishEscapedDollar,fishInnerVariable,fishInnerCommandSub
+hi def link fishBracedQuote fishQuote
+
+
+" Arguments
+
+syn cluster fishArgument contains=fishParameter,fishOption,fishVariable,fishPathGlob,fishBraceExpansion,fishQuote,fishCharacter,fishCommandSub,fishRedirection,fishSelfPid
+
+syn match   fishParameter '[[:alnum:]\u5b\u5d@:=+.,%/!_-]\+' contained skipwhite nextgroup=@fishNext
+
+syn match   fishOption /-[[:alnum:]=_-]*/ contained skipwhite nextgroup=@fishNext
+
+syn match   fishPathGlob /\(\~\|*\|?\)/ contained skipwhite nextgroup=@fishNext
+
+syn region  fishBraceExpansion matchgroup=fishOperator start=/{/ end=/}/ contained
+    \ contains=fishBraceExpansionComma,fishInnerVariable,fishInnerCommandSub,fishBracedParameter,fishBracedQuote
+    \ skipwhite nextgroup=@fishNext
+
+syn match   fishVariable /\$\+[[:alnum:]_]\+/ skipwhite nextgroup=@fishNext
+syn match   fishVariable /\$\+[[:alnum:]_]\+\[/me=e-1,he=e-1 nextgroup=fishSubscript
+
+syn region  fishSubscript matchgroup=fishVariable start=/\[/ end=/]/ contained
+    \ keepend contains=@fishSubscriptArgs
+    \ skipwhite nextgroup=@fishNext
+
+syn region  fishCommandSub matchgroup=fishOperator start=/(/ start=/\$(/ end=/)/ contained
+    \ contains=@fishStatement
+    \ skipwhite nextgroup=@fishNext
+
+syn region  fishQuote start=/'/ skip=/\\'/ end=/'/ contained
+    \ contains=fishEscapedEscape,fishEscapedSQuote
+    \ skipwhite nextgroup=@fishNext
+syn region  fishQuote start=/"/ skip=/\\"/ end=/"/ contained
+    \ contains=fishEscapedEscape,fishEscapedDQuote,fishEscapedDollar,fishInnerVariable,fishQuotedCommandSub
+    \ skipwhite nextgroup=@fishNext
+
+syn match   fishEscapedEscape /\\\\/ contained
+syn match   fishEscapedSQuote /\\'/ contained
+syn match   fishEscapedDQuote /\\"/ contained
+syn match   fishEscapedDollar /\\\$/ contained
+hi def link fishEscapedEscape fishCharacter
+hi def link fishEscapedSQuote fishCharacter
+hi def link fishEscapedDQuote fishCharacter
+hi def link fishEscapedDollar fishCharacter
+
+syn match   fishCharacter /\\[0-7]\{1,3}/                          contained skipwhite nextgroup=@fishNext
+syn match   fishCharacter /\\u[0-9a-fA-F]\{4}/                     contained skipwhite nextgroup=@fishNext
+syn match   fishCharacter /\\U[0-9a-fA-F]\{8}/                     contained skipwhite nextgroup=@fishNext
+syn match   fishCharacter /\\x[0-7][0-9a-fA-F]\|\\x[0-9a-fA-F]/    contained skipwhite nextgroup=@fishNext
+syn match   fishCharacter /\\X[0-9a-fA-F]\{1,2}/                   contained skipwhite nextgroup=@fishNext
+syn match   fishCharacter /\\[abcefnrtv[\](){}<>\\*?~%#$|&;'" ]/   contained skipwhite nextgroup=@fishNext
+
+syn match   fishRedirection /</ contained skipwhite nextgroup=fishRedirectionTarget
+syn match   fishRedirection /[0-9&]\?>[>?]\?/ contained skipwhite nextgroup=fishRedirectionTarget
+syn match   fishRedirection /[0-9&]\?>&[0-9-]/ contained skipwhite nextgroup=@fishNext
+
+syn match   fishRedirectionTarget /[[:alnum:]$~*?{,}"'\/._-]\+/ contained contains=fishInnerVariable skipwhite nextgroup=@fishNext
+hi def link fishRedirectionTarget fishRedirection
+
+syn match fishSelfPid /%self\>/ contained nextgroup=@fishNext
+hi def link fishSelfPid fishOperator
+
+
+" Terminators
+
+syn cluster fishTerminator contains=fishPipe,fishBackgroundJob,fishSemicolon,fishSymbolicAndOr
+
+syn match   fishPipe /\(1>\|2>\|&\)\?|/ contained skipwhite nextgroup=@fishStatement
+hi def link fishPipe fishEnd
+
+syn match   fishBackgroundJob /&$/ contained skipwhite nextgroup=@fishStatement
+syn match   fishBackgroundJob /&[^<>&|]/me=s+1,he=s+1 contained skipwhite nextgroup=@fishStatement
+hi def link fishBackgroundJob fishEnd
+
+syn match   fishSemicolon /;/ skipwhite nextgroup=@fishStatement
+hi def link fishSemicolon fishEnd
+
+syn match   fishSymbolicAndOr /\(&&\|||\)/ contained skipwhite skipempty nextgroup=@fishStatement
+hi def link fishSymbolicAndOr fishOperator
+
+
+" Other
+
+syn cluster fishNext contains=fishEscapedNl,@fishArgument,@fishTerminator
+
+syn match   fishEscapedNl /\\$/ skipnl skipwhite contained nextgroup=@fishNext
+
+syn match   fishComment /#.*/ contains=fishTodo,@Spell
+
+syn keyword fishTodo TODO contained
+
+
+
+syn sync minlines=200
+syn sync maxlines=300
+
+
+" Intermediate highlight groups matching $fish_color_* variables
+
+hi def link fishCommand                 fish_color_command
+hi def link fishComment                 fish_color_comment
+hi def link fishEnd                     fish_color_end
+hi def link fishCharacter               fish_color_escape
+hi def link fishKeyword                 fish_color_keyword
+hi def link fishEscapedNl               fish_color_normal
+hi def link fishOperator                fish_color_operator
+hi def link fishVariable                fish_color_operator
+hi def link fishInnerVariable           fish_color_operator
+hi def link fishPathGlob                fish_color_operator
+hi def link fishOption                  fish_color_option
+hi def link fishParameter               fish_color_param
+hi def link fishQuote                   fish_color_quote
+hi def link fishRedirection             fish_color_redirection
+
+
+" Default highlight groups 
+
+hi def link fish_color_param        Normal
+hi def link fish_color_normal       Normal
+hi def link fish_color_option       Normal
+hi def link fish_color_command      Function
+hi def link fish_color_keyword      Keyword
+hi def link fish_color_end          Delimiter
+hi def link fish_color_operator     Operator
+hi def link fish_color_redirection  Type
+hi def link fish_color_quote        String
+hi def link fish_color_escape       Character
+hi def link fish_color_comment      Comment
+
+hi def link fishTodo                Todo
+
+
+let b:current_syntax = 'fish'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim
index 7e18c267f7..91150bc37b 100644
--- a/runtime/syntax/fstab.vim
+++ b/runtime/syntax/fstab.vim
@@ -2,8 +2,8 @@
 " Language: fstab file
 " Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
 " URL: https://raw.github.com/rid9/vim-fstab/master/syntax/fstab.vim
-" Last Change: 2022 Dec 11
-" Version: 1.6.2
+" Last Change: 2023 Feb 19
+" Version: 1.6.3
 "
 " Credits:
 "   David Necas (Yeti) <yeti@physics.muni.cz>
@@ -389,7 +389,7 @@ syn match fsFreqPassNumber /\d\+\s\+[012]\s*/ contained
 syn match fsDevice /^\s*\zs.\{-1,}\s/me=e-1 nextgroup=fsMountPoint contains=@fsDeviceCluster,@fsGeneralCluster
 syn match fsMountPoint /\s\+.\{-}\s/me=e-1 nextgroup=fsType contains=@fsMountPointCluster,@fsGeneralCluster contained
 syn match fsType /\s\+.\{-}\s/me=e-1 nextgroup=fsOptions contains=@fsTypeCluster,@fsGeneralCluster contained
-syn match fsOptions /\s\+.\{-}\s/me=e-1 nextgroup=fsFreqPass contains=@fsOptionsCluster,@fsGeneralCluster contained
+syn match fsOptions /\s\+.\{-}\%(\s\|$\)/ nextgroup=fsFreqPass contains=@fsOptionsCluster,@fsGeneralCluster contained
 syn match fsFreqPass /\s\+.\{-}$/ contains=@fsFreqPassCluster,@fsGeneralCluster contained
 
 " Whole line comments
@@ -491,4 +491,4 @@ let b:current_syntax = "fstab"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 ft=vim
+" vim: ts=8 noet ft=vim
diff --git a/runtime/syntax/go.vim b/runtime/syntax/go.vim
index 904c8ad7f2..bf967fdcd9 100644
--- a/runtime/syntax/go.vim
+++ b/runtime/syntax/go.vim
@@ -5,7 +5,7 @@
 " go.vim: Vim syntax file for Go.
 " Language:             Go
 " Maintainer:           Billie Cleek <bhcleek@gmail.com>
-" Latest Revision:      2022-11-17
+" Latest Revision:      2023-02-19
 " License:              BSD-style. See LICENSE file in source repository.
 " Repository:           https://github.com/fatih/vim-go
 
@@ -136,8 +136,11 @@ syn keyword     goBoolean                  true false
 syn keyword     goPredefinedIdentifiers    nil iota
 
 hi def link     goBuiltins                 Identifier
+hi def link     goPredefinedIdentifiers    Constant
+" Boolean links to Constant by default by vim: goBoolean and goPredefinedIdentifiers
+" will be highlighted the same, but having the separate groups allows users to
+" have separate highlighting for them if they desire.
 hi def link     goBoolean                  Boolean
-hi def link     goPredefinedIdentifiers    goBoolean
 
 " Comments; their contents
 syn keyword     goTodo              contained TODO FIXME XXX BUG
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index 605db3ae1c..82c829a2e1 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -3,7 +3,7 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainers: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 "			Claudio Fleiner <claudio@fleiner.com>
-" Last Change:		2022 Nov 18
+" Last Change:		2023 Feb 20
 
 " Please check :help html.vim for some comments and a description of the options
 
@@ -221,7 +221,7 @@ if main_syntax != 'java' || exists("java_javascript")
   " JAVA SCRIPT
   syn include @htmlJavaScript syntax/javascript.vim
   unlet b:current_syntax
-  syn region  javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
+  syn region  javaScript start=+<script\>\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
   syn region  htmlScriptTag	contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
   hi def link htmlScriptTag htmlTag
 
diff --git a/runtime/syntax/poefilter.vim b/runtime/syntax/poefilter.vim
index f7e92034ee..6561f7a704 100644
--- a/runtime/syntax/poefilter.vim
+++ b/runtime/syntax/poefilter.vim
@@ -2,7 +2,7 @@
 " Language:	PoE item filter
 " Maintainer:	ObserverOfTime <chronobserver@disroot.org>
 " Filenames:	*.filter
-" Last Change:	2022 Oct 07
+" Last Change:	2023 Feb 10
 
 if exists('b:current_syntax')
     finish
@@ -17,7 +17,7 @@ syn match poefilterCommentTag /\[[0-9A-Z\[\]]\+\]/ contained
 syn match poefilterComment /#.*$/ contains=poefilterTodo,poefilterCommentTag,@Spell
 
 " Blocks
-syn keyword poefilterBlock Show Hide
+syn keyword poefilterBlock Show Hide Minimal
 
 " Conditions
 syn keyword poefilterCondition
-- 
cgit 


From 344a1ee8e6b7d78120f8393d1babfd285e866334 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 22 Feb 2023 00:07:26 +0800
Subject: docs: fix typos (#22353)

---
 runtime/doc/api.txt                    |  2 +-
 runtime/doc/autocmd.txt                |  2 +-
 runtime/doc/builtin.txt                |  4 ++--
 runtime/doc/deprecated.txt             |  4 ++--
 runtime/doc/develop.txt                |  4 ++--
 runtime/doc/eval.txt                   | 18 +++++++++---------
 runtime/doc/help.txt                   | 28 ++++++++++++++--------------
 runtime/doc/if_perl.txt                |  2 +-
 runtime/doc/intro.txt                  |  2 +-
 runtime/doc/motion.txt                 |  2 +-
 runtime/doc/nvim_terminal_emulator.txt |  6 +++---
 runtime/doc/provider.txt               |  8 ++++----
 runtime/doc/remote_plugin.txt          |  2 +-
 runtime/doc/starting.txt               |  4 ++--
 runtime/doc/ui.txt                     | 22 +++++++++++-----------
 runtime/doc/various.txt                |  2 +-
 runtime/doc/windows.txt                |  2 +-
 17 files changed, 57 insertions(+), 57 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 95a929b808..7bcae79852 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2644,7 +2644,7 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {*opts})
                     buffer.
                   • right_gravity : boolean that indicates the direction the
                     extmark will be shifted in when new text is inserted (true
-                    for right, false for left). defaults to true.
+                    for right, false for left). Defaults to true.
                   • end_right_gravity : boolean that indicates the direction
                     the extmark end position (if it exists) will be shifted in
                     when new text is inserted (true for right, false for
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 89252145f2..e9a4196252 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -426,7 +426,7 @@ ColorSchemePre			Before loading a color scheme. |:colorscheme|
 				Useful to setup removing things added by a
 				color scheme, before another one is loaded.
 
-CompleteChanged 					*CompleteChanged*
+CompleteChanged						*CompleteChanged*
 				After each time the Insert mode completion
 				menu changed.  Not fired on popup menu hide,
 				use |CompleteDonePre| or |CompleteDone| for
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 60a1035da3..af5ba9ab8f 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1055,7 +1055,7 @@ chansend({id}, {data})					*chansend()*
 		newlines in an item will be sent as NUL. To send a final
 		newline, include a final empty string. Example: >
 			:call chansend(id, ["abc", "123\n456", ""])
-< 		will send "abc<NL>123<NUL>456<NL>".
+<		will send "abc<NL>123<NUL>456<NL>".
 
 		chansend() writes raw data, not RPC messages.  If the channel
 		was created with `"rpc":v:true` then the channel expects RPC
@@ -4846,7 +4846,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 		  "lhs"	     The {lhs} of the mapping as it would be typed
 		  "lhsraw"   The {lhs} of the mapping as raw bytes
 		  "lhsrawalt" The {lhs} of the mapping as raw bytes, alternate
-		  	      form, only present when it differs from "lhsraw"
+			      form, only present when it differs from "lhsraw"
 		  "rhs"	     The {rhs} of the mapping as typed.
 		  "silent"   1 for a |:map-silent| mapping, else 0.
 		  "noremap"  1 if the {rhs} of the mapping is not remappable.
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 1bdd13ac0c..e7b0a710e8 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -113,14 +113,14 @@ LSP FUNCTIONS
 - *vim.lsp.util.set_qflist()*		Use |setqflist()| instead.
 - *vim.lsp.util.set_loclist()*		Use |setloclist()| instead.
 - *vim.lsp.buf_get_clients()*		Use |vim.lsp.get_active_clients()| with
-                                        {buffer = bufnr} instead.
+					{buffer = bufnr} instead.
 - *vim.lsp.buf.formatting()*		Use |vim.lsp.buf.format()| with
 					{async = true} instead.
 - *vim.lsp.buf.range_formatting()*	Use |vim.lsp.formatexpr()|
 					or |vim.lsp.buf.format()| instead.
 
 LUA
-- *vim.register_keystroke_callback()* 	Use |vim.on_key()| instead.
+- *vim.register_keystroke_callback()*	Use |vim.on_key()| instead.
 
 NORMAL COMMANDS
 - *]f* *[f*		Same as "gf".
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index ff48ae3e26..87190d7f33 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -81,7 +81,7 @@ include the kitchen sink... but it's good for plumbing."
 Developer guidelines				        *dev-guidelines*
 
 
-PROVIDERS 						*dev-provider*
+PROVIDERS						*dev-provider*
 
 A primary goal of Nvim is to allow extension of the editor without special
 knowledge in the core.  Some core functions are delegated to "providers"
@@ -391,7 +391,7 @@ API client implementation guidelines ~
     https://github.com/msgpack-rpc/msgpack-rpc
 
 
-EXTERNAL UI 						*dev-ui*
+EXTERNAL UI						*dev-ui*
 
 External UIs should be aware of the |api-contract|. In particular, future
 versions of Nvim may add new items to existing events. The API is strongly
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index af67e2b67d..d79b446986 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1817,17 +1817,17 @@ v:event		Dictionary of event data for the current |autocommand|.  Valid
 			completed_item    Current selected complete item on
 					|CompleteChanged|, Is `{}` when no complete
 					item selected.
-			height 		Height of popup menu on |CompleteChanged|
-			width   	width of popup menu on |CompleteChanged|
-			row  	 	Row count of popup menu on |CompleteChanged|,
+			height		Height of popup menu on |CompleteChanged|
+			width		width of popup menu on |CompleteChanged|
+			row		Row count of popup menu on |CompleteChanged|,
 					relative to screen.
-			col  	 	Col count of popup menu on |CompleteChanged|,
+			col		Col count of popup menu on |CompleteChanged|,
 					relative to screen.
-			size 		Total number of completion items on
+			size		Total number of completion items on
 					|CompleteChanged|.
-			scrollbar 	Is |v:true| if popup menu have scrollbar, or
+			scrollbar	Is |v:true| if popup menu have scrollbar, or
 					|v:false| if not.
-			changed_window 	Is |v:true| if the event fired while
+			changed_window	Is |v:true| if the event fired while
 					changing window (or tab) on |DirChanged|.
 			status		Job status or exit code, -1 means "unknown". |TermClose|
 
@@ -2668,8 +2668,8 @@ text...
 			Example with [depth] 0: >
 				let mylist = [1, 2, 3]
 				lockvar 0 mylist
-				let mylist[0] = 77   	" OK
-				call add(mylist, 4]  	" OK
+				let mylist[0] = 77	" OK
+				call add(mylist, 4]	" OK
 				let mylist = [7, 8, 9]  " Error!
 <								*E743*
 			For unlimited depth use [!] and omit [depth].
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 07f898f99c..68c886887f 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -120,15 +120,15 @@ PROGRAMMING LANGUAGE SUPPORT
 |lsp|			Language Server Protocol (LSP)
 |diagnostic-api|	Diagnostic framework
 |treesitter|		Incremental syntax parsing
-|indent.txt|      	automatic indenting for C and other languages
+|indent.txt|		automatic indenting for C and other languages
 |syntax|		syntax highlighting
 |filetype|		Settings for specific types of files
 |quickfix|		Commands for a quick edit-compile-fix cycle
-|ft_ada.txt|      	Ada filetype plugin
-|ft_ps1.txt|      	PowerShell filetype plugin
-|ft_raku.txt|     	Raku filetype plugin
-|ft_rust.txt|     	Rust filetype plugin
-|ft_sql.txt|      	SQL filetype plugin
+|ft_ada.txt|		Ada filetype plugin
+|ft_ps1.txt|		PowerShell filetype plugin
+|ft_raku.txt|		Raku filetype plugin
+|ft_rust.txt|		Rust filetype plugin
+|ft_sql.txt|		SQL filetype plugin
 
 ------------------------------------------------------------------------------
 UI
@@ -172,14 +172,14 @@ DEVELOPING NVIM
 						*standard-plugin-list*
 Standard plugins ~
 |matchit.txt|		Extended |%| matching
-|pi_gzip.txt|      	Reading and writing compressed files
-|pi_health.txt|    	Healthcheck framework
-|pi_msgpack.txt|   	msgpack utilities
-|pi_netrw.txt|     	Reading and writing files over a network
-|pi_paren.txt|     	Highlight matching parens
-|pi_spec.txt|      	Filetype plugin to work with rpm spec files
-|pi_tar.txt|       	Tar file explorer
-|pi_zip.txt|       	Zip archive explorer
+|pi_gzip.txt|		Reading and writing compressed files
+|pi_health.txt|		Healthcheck framework
+|pi_msgpack.txt|	msgpack utilities
+|pi_netrw.txt|		Reading and writing files over a network
+|pi_paren.txt|		Highlight matching parens
+|pi_spec.txt|		Filetype plugin to work with rpm spec files
+|pi_tar.txt|		Tar file explorer
+|pi_zip.txt|		Zip archive explorer
 
 LOCAL ADDITIONS:				*local-additions*
 
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index 3787ca69ba..e4ec6dcf45 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -116,7 +116,7 @@ Overview >
 	VIM::SetOption("ai")			# sets a vim option
 	$nbuf = VIM::Buffers()			# returns the number of buffers
 	@buflist = VIM::Buffers()		# returns array of all buffers
-	$mybuf = (VIM::Buffers('a.c'))[0] 	# returns buffer object for 'a.c'
+	$mybuf = (VIM::Buffers('a.c'))[0]	# returns buffer object for 'a.c'
 	@winlist = VIM::Windows()		# returns array of all windows
 	$nwin = VIM::Windows()			# returns the number of windows
 	($success, $v) = VIM::Eval('&path')	# $v: option 'path', $success: 1
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 11ba1b408c..685c953718 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -358,7 +358,7 @@ notation	meaning		    equivalent	decimal value(s)	~
 <kOrigin>	keypad origin (middle)		*keypad-origin*
 <kPageUp>	keypad page-up (upper right)	*keypad-page-up*
 <kPageDown>	keypad page-down (lower right)	*keypad-page-down*
-<kDel>		keypad delete 			*keypad-delete*
+<kDel>		keypad delete			*keypad-delete*
 <kPlus>		keypad +			*keypad-plus*
 <kMinus>	keypad -			*keypad-minus*
 <kMultiply>	keypad *			*keypad-multiply*
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 929efee19f..59ae209aa9 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -589,7 +589,7 @@ i(							*vib* *v_ib* *v_i(* *ib*
 ib			"inner block", select [count] blocks, from "[count] [("
 			to the matching ')', excluding the '(' and ')' (see
 			|[(|).  If the cursor is not inside a () block, then
- 			find the next "(".
+			find the next "(".
 			When used in Visual mode it is made charwise.
 
 a>						*v_a>* *v_a<* *a>* *a<*
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 96f99528ed..50a241f515 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -239,7 +239,7 @@ gdb window and use a "print" command, e.g.: >
 	print *eap
 If mouse pointer movements are working, Vim will also show a balloon when the
 mouse rests on text that can be evaluated by gdb.
-You can also use the "K" mapping that will either use neovim floating windows
+You can also use the "K" mapping that will either use Nvim floating windows
 if available to show the results or print below the status bar.
 
 Now go back to the source window and put the cursor on the first line after
@@ -428,14 +428,14 @@ If the command needs an argument use a List: >vim
 If there is no g:termdebug_config you can use: >vim
 	let g:termdebugger = ['rr', 'replay', '--']
 
-To not use neovim floating windows for previewing variable evaluation, set the
+To not use Nvim floating windows for previewing variable evaluation, set the
 `g:termdebug_useFloatingHover` variable like this: >vim
 	let g:termdebug_useFloatingHover = 0
 
 If you are a mouse person, you can also define a mapping using your right
 click to one of the terminal command like evaluate the variable under the
 cursor: >vim
-      	nnoremap <RightMouse> :Evaluate<CR>
+	nnoremap <RightMouse> :Evaluate<CR>
 or set/unset a breakpoint: >vim
 	nnoremap <RightMouse> :Break<CR>
 
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 5375d971f0..432e6138fa 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -4,7 +4,7 @@
 		 NVIM REFERENCE MANUAL    by Thiago de Arruda
 
 
-Providers	 				*provider*
+Providers					*provider*
 
 Nvim delegates some features to dynamic "providers". This document describes
 the providers and how to install them.
@@ -82,7 +82,7 @@ The last command reports the interpreter path, add it to your init.vim: >vim
 See also: https://github.com/zchee/deoplete-jedi/wiki/Setting-up-Python-for-Neovim
 
 ==============================================================================
-Ruby integration		    	      *provider-ruby*
+Ruby integration			      *provider-ruby*
 
 Nvim supports Ruby |remote-plugin|s and the Vim legacy |ruby-vim| interface
 (which is itself implemented as a Nvim remote-plugin).
@@ -169,7 +169,7 @@ can be slow. To avoid this, set g:node_host_prog to the host path: >vim
     let g:node_host_prog = '/usr/local/bin/neovim-node-host'
 <
 ==============================================================================
-Clipboard integration 			      *provider-clipboard* *clipboard*
+Clipboard integration			      *provider-clipboard* *clipboard*
 
 Nvim has no direct connection to the system clipboard. Instead it depends on
 a |provider| which transparently uses shell commands to communicate with the
@@ -255,7 +255,7 @@ For Windows WSL, try this g:clipboard definition:
                 \ }
 
 ==============================================================================
-Paste 							*provider-paste* *paste*
+Paste							*provider-paste* *paste*
 
 "Paste" is a separate concept from |clipboard|: paste means "dump a bunch of
 text to the editor", whereas clipboard provides features like |quote+| to get
diff --git a/runtime/doc/remote_plugin.txt b/runtime/doc/remote_plugin.txt
index 4cdcbed250..348f6c86a5 100644
--- a/runtime/doc/remote_plugin.txt
+++ b/runtime/doc/remote_plugin.txt
@@ -4,7 +4,7 @@
 		 NVIM REFERENCE MANUAL    by Thiago de Arruda
 
 
-Nvim support for remote plugins 		  *remote-plugin*
+Nvim support for remote plugins			  *remote-plugin*
 
 				      Type |gO| to see the table of contents.
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 67a88913fb..a8a149def8 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -368,7 +368,7 @@ argument.
 -W {scriptout}	Like -w, but do not append, overwrite an existing file.
 
 							*--api-info*
---api-info 	Print msgpack-encoded |api-metadata| and exit.
+--api-info	Print msgpack-encoded |api-metadata| and exit.
 
 							*--embed*
 --embed		Use stdin/stdout as a msgpack-RPC channel, so applications can
@@ -392,7 +392,7 @@ argument.
 <		See also: |ui-startup| |channel-stdio|
 
 							*--headless*
---headless 	Start without UI, and do not wait for `nvim_ui_attach`. The
+--headless	Start without UI, and do not wait for `nvim_ui_attach`. The
 		builtin TUI is not used, so stdio works as an arbitrary
 		communication channel. |channel-stdio|
 
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index 3110d0817c..4e4f88f275 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -53,11 +53,11 @@ with these (optional) keys:
 - `term_name`		Sets the name of the terminal 'term'.
 - `term_colors`		Sets the number of supported colors 't_Co'.
 - `term_background`	Sets the default value of 'background'.
-- `stdin_fd`		Read buffer from `fd` as if it was a stdin pipe
-			This option can only used by |--embed| ui,
-			see |ui-startup-stdin|.
-	`stdin_tty`		Tells if `stdin` is a `tty` or not.
-	`stdout_tty`		Tells if `stdout` is a `tty` or not.
+- `stdin_fd`		Read buffer from `fd` as if it was a stdin pipe.
+			This option can only used by |--embed| ui on startup.
+			See |ui-startup-stdin|.
+- `stdin_tty`		Tells if `stdin` is a `tty` or not.
+- `stdout_tty`		Tells if `stdout` is a `tty` or not.
 
 Specifying an unknown option is an error; UIs can check the |api-metadata|
 `ui_options` key for supported options.
@@ -154,11 +154,11 @@ procedure:
 An UI can support the native read from stdin feature as invoked with
 `command | nvim -` for the builtin TUI. |--|
 The embedding process can detect that its stdin is open to a file which
-not is a terminal, just like nvim does. It then needs to forward this fd
+not is a terminal, just like Nvim does. It then needs to forward this fd
 to Nvim. As fd=0 is already is used to send rpc data from the embedder to
 Nvim, it needs to use some other file descriptor, like fd=3 or higher.
 
-Then, `stdin_fd` option should be passed to `nvim_ui_attach` and nvim will
+Then, `stdin_fd` option should be passed to `nvim_ui_attach` and Nvim will
 implicitly read it as a buffer. This option can only be used when Nvim is
 launched with `--embed` option, as described above.
 
@@ -356,8 +356,8 @@ numerical highlight ids to the actual attributes.
 	The bulitin highlight group `name` was set to use the attributes `hl_id`
 	defined by a previous `hl_attr_define` call. This event is not needed
 	to render the grids which use attribute ids directly, but is useful
-	for an UI who want to render its own elements with consistent
-	highlighting. For instance an UI using |ui-popupmenu| events, might
+	for a UI who want to render its own elements with consistent
+	highlighting. For instance a UI using |ui-popupmenu| events, might
 	use the |hl-Pmenu| family of builtin highlights.
 
 							    *ui-event-grid_line*
@@ -532,7 +532,7 @@ is not active. New UIs should implement |ui-linegrid| instead.
 		+-------------------------+
 <
 ==============================================================================
-Detailed highlight state Extension 				  *ui-hlstate*
+Detailed highlight state Extension				  *ui-hlstate*
 
 Activated by the `ext_hlstate` |ui-option|.
 Activates |ui-linegrid| implicitly.
@@ -566,7 +566,7 @@ highlight group is cleared, so `ui_name` can always be used to reliably identify
 screen elements, even if no attributes have been applied.
 
 ==============================================================================
-Multigrid Events 	  					 *ui-multigrid*
+Multigrid Events						 *ui-multigrid*
 
 Activated by the `ext_multigrid` |ui-option|.
 Activates |ui-linegrid| implicitly.
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index e13d892fd6..ccde53cc06 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -473,7 +473,7 @@ will be no "Last set" message.  When it was defined while executing a function,
 user command or autocommand, the script in which it was defined is reported.
 
 							*K*
-[count]K       		Runs the program given by 'keywordprg' to lookup the
+[count]K		Runs the program given by 'keywordprg' to lookup the
 			|word| (defined by 'iskeyword') under or right of the
 			cursor. Default is "man". Works like this: >
 				:tabnew | terminal {program} {keyword}
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 61f5013f47..4b7901e614 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -223,7 +223,7 @@ CTRL-W ^	Split the current window in two and edit the alternate file.
 
 CTRL-W ge						*CTRL-W_ge*
 		Detach the current window as an external window.
-		Only available when using an UI with |ui-multigrid| support.
+		Only available when using a UI with |ui-multigrid| support.
 
 Note that the 'splitbelow' and 'splitright' options influence where a new
 window will appear.
-- 
cgit 


From 8714a4009c0f0be0bb27a6b3eb486eeb3d9f3049 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 21 Feb 2023 17:09:18 +0000
Subject: feat(treesitter): add filetype -> lang API

Problem:

  vim.treesitter does not know how to map a specific filetype to a parser.

  This creates problems since in a few places (including in vim.treesitter itself), the filetype is incorrectly used in place of lang.

Solution:

  Add an API to enable this:

  - Add vim.treesitter.language.add() as a replacement for vim.treesitter.language.require_language().
    - Optional arguments are now passed via an opts table.
    - Also takes a filetype (or list of filetypes) so we can keep track of what filetypes are associated with which langs.
    - Deprecated vim.treesitter.language.require_language().
  - Add vim.treesitter.language.get_lang() which returns the associated lang for a given filetype.
  - Add vim.treesitter.language.register() to associate filetypes to a lang without loading the parser.
---
 runtime/doc/news.txt                        |  5 ++
 runtime/doc/treesitter.txt                  | 50 +++++++++++------
 runtime/lua/vim/treesitter.lua              | 24 +++++----
 runtime/lua/vim/treesitter/health.lua       |  2 +-
 runtime/lua/vim/treesitter/language.lua     | 84 ++++++++++++++++++++++++++---
 runtime/lua/vim/treesitter/languagetree.lua |  4 +-
 runtime/lua/vim/treesitter/query.lua        |  2 +-
 7 files changed, 133 insertions(+), 38 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ae21bc47ca..8b41f2d104 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -164,6 +164,9 @@ The following new APIs or features were added.
 • |vim.treesitter.query.get_node_text()| now accepts a `metadata` option for
   writing custom directives using |vim.treesitter.query.add_directive()|.
 
+• |vim.treesitter.language.add()| as a new replacement for
+  `vim.treesitter.language.require_language`.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
@@ -202,6 +205,8 @@ DEPRECATIONS                                                *news-deprecations*
 The following functions are now deprecated and will be removed in the next
 release.
 
+• `vim.treesitter.language.require_language()` has been deprecated in favour
+  of |vim.treesitter.language.add()|.
 
 
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index d4799053f7..e35e145301 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -666,6 +666,36 @@ stop({bufnr})                                          *vim.treesitter.stop()*
 ==============================================================================
 Lua module: vim.treesitter.language                  *lua-treesitter-language*
 
+add({lang}, {opts})                            *vim.treesitter.language.add()*
+    Asserts that a parser for the language {lang} is installed.
+
+    Parsers are searched in the `parser` runtime directory, or the provided
+    {path}
+
+    Parameters: ~
+      • {lang}  (string) Language the parser should parse (alphanumerical and
+                `_` only)
+      • {opts}  (table|nil) Options:
+                • filetype (string|string[]) Filetype(s) that lang can be
+                  parsed with. Note this is not strictly the same as lang
+                  since a single lang can parse multiple filetypes. Defaults
+                  to lang.
+                • path (string|nil) Optional path the parser is located at
+                • symbol_name (string|nil) Internal symbol name for the
+                  language to load
+                • silent (boolean|nil) Don't throw an error if language not
+                  found
+
+    Return: ~
+        (boolean) If the specified language is installed
+
+get_lang({filetype})                      *vim.treesitter.language.get_lang()*
+    Parameters: ~
+      • {filetype}  (string)
+
+    Return: ~
+        (string|nil)
+
 inspect_language({lang})          *vim.treesitter.language.inspect_language()*
     Inspects the provided language.
 
@@ -678,24 +708,12 @@ inspect_language({lang})          *vim.treesitter.language.inspect_language()*
     Return: ~
         (table)
 
-                                  *vim.treesitter.language.require_language()*
-require_language({lang}, {path}, {silent}, {symbol_name})
-    Asserts that a parser for the language {lang} is installed.
-
-    Parsers are searched in the `parser` runtime directory, or the provided
-    {path}
+register({lang}, {filetype})              *vim.treesitter.language.register()*
+    Register a lang to be used for a filetype (or list of filetypes).
 
     Parameters: ~
-      • {lang}         (string) Language the parser should parse
-                       (alphanumerical and `_` only)
-      • {path}         (string|nil) Optional path the parser is located at
-      • {silent}       (boolean|nil) Don't throw an error if language not
-                       found
-      • {symbol_name}  (string|nil) Internal symbol name for the language to
-                       load
-
-    Return: ~
-        (boolean) If the specified language is installed
+      • {lang}      (string) Language to register
+      • {filetype}  string|string[] Filetype(s) to associate with lang
 
 
 ==============================================================================
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 4127198576..c524b20bc2 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -29,6 +29,8 @@ setmetatable(M, {
   end,
 })
 
+---@diagnostic disable:invisible
+
 --- Creates a new parser
 ---
 --- It is not recommended to use this; use |get_parser()| instead.
@@ -39,16 +41,15 @@ setmetatable(M, {
 ---
 ---@return LanguageTree object to use for parsing
 function M._create_parser(bufnr, lang, opts)
-  language.require_language(lang)
   if bufnr == 0 then
     bufnr = vim.api.nvim_get_current_buf()
   end
 
   vim.fn.bufload(bufnr)
 
-  local self = LanguageTree.new(bufnr, lang, opts)
+  language.add(lang, { filetype = vim.bo[bufnr].filetype })
 
-  ---@diagnostic disable:invisible
+  local self = LanguageTree.new(bufnr, lang, opts)
 
   ---@private
   local function bytes_cb(_, ...)
@@ -96,13 +97,16 @@ function M.get_parser(bufnr, lang, opts)
   if bufnr == nil or bufnr == 0 then
     bufnr = a.nvim_get_current_buf()
   end
+  if lang == nil then
+    local ft = vim.bo[bufnr].filetype
+    lang = language.get_lang(ft) or ft
+    -- TODO(lewis6991): we should error here and not default to ft
+    -- if not lang then
+    --   error(string.format('filetype %s of buffer %d is not associated with any lang', ft, bufnr))
+    -- end
+  end
 
-  if parsers[bufnr] == nil then
-    lang = lang or a.nvim_buf_get_option(bufnr, 'filetype')
-    parsers[bufnr] = M._create_parser(bufnr, lang, opts)
-  elseif lang and parsers[bufnr]:lang() ~= lang then
-    -- Only try to create a new parser if lang is provided
-    -- and it doesn't match the stored parser
+  if parsers[bufnr] == nil or parsers[bufnr]:lang() ~= lang then
     parsers[bufnr] = M._create_parser(bufnr, lang, opts)
   end
 
@@ -123,7 +127,7 @@ function M.get_string_parser(str, lang, opts)
     str = { str, 'string' },
     lang = { lang, 'string' },
   })
-  language.require_language(lang)
+  language.add(lang)
 
   return LanguageTree.new(str, lang, opts)
 end
diff --git a/runtime/lua/vim/treesitter/health.lua b/runtime/lua/vim/treesitter/health.lua
index c0a1eca0ce..1abcdd0b31 100644
--- a/runtime/lua/vim/treesitter/health.lua
+++ b/runtime/lua/vim/treesitter/health.lua
@@ -17,7 +17,7 @@ function M.check()
 
   for _, parser in pairs(parsers) do
     local parsername = vim.fn.fnamemodify(parser, ':t:r')
-    local is_loadable, ret = pcall(ts.language.require_language, parsername)
+    local is_loadable, ret = pcall(ts.language.add, parsername)
 
     if not is_loadable or not ret then
       health.report_error(
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 8634e53b7b..8637d7d544 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -2,19 +2,66 @@ local a = vim.api
 
 local M = {}
 
+---@type table<string,string>
+local ft_to_lang = {}
+
+---@param filetype string
+---@return string|nil
+function M.get_lang(filetype)
+  return ft_to_lang[filetype]
+end
+
+---@deprecated
+function M.require_language(lang, path, silent, symbol_name)
+  return M.add(lang, {
+    silent = silent,
+    path = path,
+    symbol_name = symbol_name,
+  })
+end
+
+---@class treesitter.RequireLangOpts
+---@field path? string
+---@field silent? boolean
+---@field filetype? string|string[]
+---@field symbol_name? string
+
 --- Asserts that a parser for the language {lang} is installed.
 ---
 --- Parsers are searched in the `parser` runtime directory, or the provided {path}
 ---
 ---@param lang string Language the parser should parse (alphanumerical and `_` only)
----@param path (string|nil) Optional path the parser is located at
----@param silent (boolean|nil) Don't throw an error if language not found
----@param symbol_name (string|nil) Internal symbol name for the language to load
+---@param opts (table|nil) Options:
+---                        - filetype (string|string[]) Filetype(s) that lang can be parsed with.
+---                          Note this is not strictly the same as lang since a single lang can
+---                          parse multiple filetypes.
+---                          Defaults to lang.
+---                        - path (string|nil) Optional path the parser is located at
+---                        - symbol_name (string|nil) Internal symbol name for the language to load
+---                        - silent (boolean|nil) Don't throw an error if language not found
 ---@return boolean If the specified language is installed
-function M.require_language(lang, path, silent, symbol_name)
+function M.add(lang, opts)
+  ---@cast opts treesitter.RequireLangOpts
+  opts = opts or {}
+  local path = opts.path
+  local silent = opts.silent
+  local filetype = opts.filetype or lang
+  local symbol_name = opts.symbol_name
+
+  vim.validate({
+    lang = { lang, 'string' },
+    path = { path, 'string', true },
+    silent = { silent, 'boolean', true },
+    symbol_name = { symbol_name, 'string', true },
+    filetype = { filetype, { 'string', 'table' }, true },
+  })
+
+  M.register(lang, filetype or lang)
+
   if vim._ts_has_language(lang) then
     return true
   end
+
   if path == nil then
     if not (lang and lang:match('[%w_]+') == lang) then
       if silent then
@@ -35,9 +82,9 @@ function M.require_language(lang, path, silent, symbol_name)
   end
 
   if silent then
-    return pcall(function()
-      vim._ts_add_language(path, lang, symbol_name)
-    end)
+    if not pcall(vim._ts_add_language, path, lang, symbol_name) then
+      return false
+    end
   else
     vim._ts_add_language(path, lang, symbol_name)
   end
@@ -45,6 +92,27 @@ function M.require_language(lang, path, silent, symbol_name)
   return true
 end
 
+--- Register a lang to be used for a filetype (or list of filetypes).
+---@param lang string Language to register
+---@param filetype string|string[] Filetype(s) to associate with lang
+function M.register(lang, filetype)
+  vim.validate({
+    lang = { lang, 'string' },
+    filetype = { filetype, { 'string', 'table' } },
+  })
+
+  local filetypes ---@type string[]
+  if type(filetype) == 'string' then
+    filetypes = { filetype }
+  else
+    filetypes = filetype
+  end
+
+  for _, f in ipairs(filetypes) do
+    ft_to_lang[f] = lang
+  end
+end
+
 --- Inspects the provided language.
 ---
 --- Inspecting provides some useful information on the language like node names, ...
@@ -52,7 +120,7 @@ end
 ---@param lang string Language
 ---@return table
 function M.inspect_language(lang)
-  M.require_language(lang)
+  M.add(lang)
   return vim._ts_inspect_language(lang)
 end
 
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 8255c6f4fe..81ad83db2c 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -51,7 +51,7 @@ LanguageTree.__index = LanguageTree
 ---                                query per language.
 ---@return LanguageTree parser object
 function LanguageTree.new(source, lang, opts)
-  language.require_language(lang)
+  language.add(lang)
   ---@type LanguageTreeOpts
   opts = opts or {}
 
@@ -170,7 +170,7 @@ function LanguageTree:parse()
   local seen_langs = {} ---@type table<string,boolean>
 
   for lang, injection_ranges in pairs(injections_by_lang) do
-    local has_lang = language.require_language(lang, nil, true)
+    local has_lang = language.add(lang, { silent = true })
 
     -- Child language trees should just be ignored if not found, since
     -- they can depend on the text of a node. Intermediate strings
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 008e5a54d7..83910316a6 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -252,7 +252,7 @@ end)
 ---
 ---@return Query Parsed query
 function M.parse_query(lang, query)
-  language.require_language(lang)
+  language.add(lang)
   local cached = query_cache[lang][query]
   if cached then
     return cached
-- 
cgit 


From d1b34b74580fc09d86144c35e24a1a8a0d531b36 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 22 Feb 2023 10:58:15 +0100
Subject: vim-patch:9.0.1337: yuck files are not recognized (#22358)

Problem:    Yuck files are not recognized.
Solution:   Add a filetype pattern for yuck files. (Amaan Qureshi,
            closes vim/vim#12033)

https://github.com/vim/vim/commit/cfce5cf542db20c7beba5b4211c0ae3305a64a43

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 4ee7d46b20..0dd2dcfcbe 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1131,6 +1131,7 @@ local extension = {
   yml = 'yaml',
   yaml = 'yaml',
   yang = 'yang',
+  yuck = 'yuck',
   ['z8a'] = 'z8a',
   zig = 'zig',
   zir = 'zir',
-- 
cgit 


From 675826da63e879efa97c0998fea192ed5c79d56e Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 22 Feb 2023 08:01:08 -0700
Subject: refactor(treesitter): Add vim.treesitter.get_node() (#22360)

This function replaces both vim.treesitter.get_node_at_pos() and
vim.treesitter.get_node_at_cursor(). These two functions are similar
enough that they don't need separate interfaces. Even worse,
get_node_at_pos() returns a TSNode while get_node_at_cursor() returns a
string, so the two functions behave slightly differently.

vim.treesitter.get_node() combines these two into a more streamlined
interface. With no arguments, it returns the node under the cursor in
the current buffer. Optionally, it can accept a buffer number or a
position to get the node at a given position in a given buffer.
---
 runtime/doc/deprecated.txt     |  8 ++++++
 runtime/doc/news.txt           |  2 ++
 runtime/doc/treesitter.txt     | 29 ++++++++-------------
 runtime/lua/vim/treesitter.lua | 57 +++++++++++++++++++++++++++++++++++++++---
 4 files changed, 73 insertions(+), 23 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index e7b0a710e8..42dfb53e77 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -119,6 +119,14 @@ LSP FUNCTIONS
 - *vim.lsp.buf.range_formatting()*	Use |vim.lsp.formatexpr()|
 					or |vim.lsp.buf.format()| instead.
 
+TREESITTER FUNCTIONS
+- *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
+						instead.
+- *vim.treesitter.get_node_at_pos()*		Use |vim.treesitter.get_node()|
+						instead.
+- *vim.treesitter.get_node_at_cursor()*		Use |vim.treesitter.get_node()|
+						and |TSNode:type()| instead.
+
 LUA
 - *vim.register_keystroke_callback()*	Use |vim.on_key()| instead.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 8b41f2d104..2a12a144e6 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -208,5 +208,7 @@ release.
 • `vim.treesitter.language.require_language()` has been deprecated in favour
   of |vim.treesitter.language.add()|.
 
+• |vim.treesitter.get_node_at_pos()| and |vim.treesitter.get_node_at_cursor()|
+  are both deprecated in favor of |vim.treesitter.get_node()|.
 
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index e35e145301..16de49029e 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -508,30 +508,21 @@ get_captures_at_pos({bufnr}, {row}, {col})
         table[] List of captures `{ capture = "capture name", metadata = { ...
         } }`
 
-get_node_at_cursor({winnr})              *vim.treesitter.get_node_at_cursor()*
-    Returns the smallest named node under the cursor
-
-    Parameters: ~
-      • {winnr}  (integer|nil) Window handle or 0 for current window (default)
-
-    Return: ~
-        (string) Name of node under the cursor
-
-                                            *vim.treesitter.get_node_at_pos()*
-get_node_at_pos({bufnr}, {row}, {col}, {opts})
+get_node({opts})                                   *vim.treesitter.get_node()*
     Returns the smallest named node at the given position
 
     Parameters: ~
-      • {bufnr}  (integer) Buffer number (0 for current buffer)
-      • {row}    (integer) Position row
-      • {col}    (integer) Position column
-      • {opts}   (table) Optional keyword arguments:
-                 • lang string|nil Parser language
-                 • ignore_injections boolean Ignore injected languages
-                   (default true)
+      • {opts}  (table|nil) Optional keyword arguments:
+                • bufnr integer|nil Buffer number (nil or 0 for current
+                  buffer)
+                • pos table|nil 0-indexed (row, col) tuple. Defaults to cursor
+                  position in the current window. Required if {bufnr} is not
+                  the current buffer
+                • ignore_injections boolean Ignore injected languages (default
+                  true)
 
     Return: ~
-        |TSNode||nil under the cursor
+        |TSNode| | nil Node at the given position
 
 get_node_range({node_or_range})              *vim.treesitter.get_node_range()*
     Returns the node's range or an unpacked range table
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index c524b20bc2..c1e5325519 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -286,6 +286,50 @@ function M.get_captures_at_cursor(winnr)
   return captures
 end
 
+--- Returns the smallest named node at the given position
+---
+---@param opts table|nil Optional keyword arguments:
+---             - bufnr integer|nil Buffer number (nil or 0 for current buffer)
+---             - pos table|nil 0-indexed (row, col) tuple. Defaults to cursor position in the
+---                             current window. Required if {bufnr} is not the current buffer
+---             - ignore_injections boolean Ignore injected languages (default true)
+---
+---@return TSNode | nil Node at the given position
+function M.get_node(opts)
+  opts = opts or {}
+
+  local bufnr = opts.bufnr
+
+  if not bufnr or bufnr == 0 then
+    bufnr = a.nvim_get_current_buf()
+  end
+
+  local row, col
+  if opts.pos then
+    assert(#opts.pos == 2, 'Position must be a (row, col) tuple')
+    row, col = opts.pos[1], opts.pos[2]
+  else
+    assert(
+      bufnr == a.nvim_get_current_buf(),
+      'Position must be explicitly provided when not using the current buffer'
+    )
+    local pos = a.nvim_win_get_cursor(0)
+    -- Subtract one to account for 1-based row indexing in nvim_win_get_cursor
+    row, col = pos[1] - 1, pos[2]
+  end
+
+  assert(row >= 0 and col >= 0, 'Invalid position: row and col must be non-negative')
+
+  local ts_range = { row, col, row, col }
+
+  local root_lang_tree = M.get_parser(bufnr)
+  if not root_lang_tree then
+    return
+  end
+
+  return root_lang_tree:named_node_for_range(ts_range, opts)
+end
+
 --- Returns the smallest named node at the given position
 ---
 ---@param bufnr integer Buffer number (0 for current buffer)
@@ -296,12 +340,16 @@ end
 ---             - ignore_injections boolean Ignore injected languages (default true)
 ---
 ---@return TSNode|nil under the cursor
+---@deprecated
 function M.get_node_at_pos(bufnr, row, col, opts)
+  vim.deprecate('vim.treesitter.get_node_at_pos()', 'vim.treesitter.get_node()', '0.10')
   if bufnr == 0 then
     bufnr = a.nvim_get_current_buf()
   end
   local ts_range = { row, col, row, col }
 
+  opts = opts or {}
+
   local root_lang_tree = M.get_parser(bufnr, opts.lang)
   if not root_lang_tree then
     return
@@ -315,12 +363,13 @@ end
 ---@param winnr (integer|nil) Window handle or 0 for current window (default)
 ---
 ---@return string Name of node under the cursor
+---@deprecated
 function M.get_node_at_cursor(winnr)
+  vim.deprecate('vim.treesitter.get_node_at_cursor()', 'vim.treesitter.get_node():type()', '0.10')
   winnr = winnr or 0
   local bufnr = a.nvim_win_get_buf(winnr)
-  local cursor = a.nvim_win_get_cursor(winnr)
 
-  return M.get_node_at_pos(bufnr, cursor[1] - 1, cursor[2], { ignore_injections = false }):type()
+  return M.get_node({ bufnr = bufnr, ignore_injections = false }):type()
 end
 
 --- Starts treesitter highlighting for a buffer
@@ -493,8 +542,8 @@ function M.show_tree(opts)
 
       a.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
 
-      local cursor = a.nvim_win_get_cursor(win)
-      local cursor_node = M.get_node_at_pos(buf, cursor[1] - 1, cursor[2], {
+      local cursor_node = M.get_node({
+        bufnr = buf,
         lang = opts.lang,
         ignore_injections = false,
       })
-- 
cgit 


From b496605fea0117b517a47f0f300e2161ac75dcc0 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 10 Jan 2023 15:49:39 +0100
Subject: docs: vim_diff.txt

---
 runtime/doc/news.txt     |   4 +-
 runtime/doc/vim_diff.txt | 239 ++++++++++++++++++++++++-----------------------
 2 files changed, 124 insertions(+), 119 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 8b41f2d104..c6588fdeab 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -13,7 +13,7 @@ BREAKING CHANGES                                                *news-breaking*
 
 The following changes may require adaptations in user config or plugins.
 
-• Cscope support is now removed (see |cscope| and |nvim-features-removed|):
+• Cscope support is now removed (see |cscope| and |nvim-removed|):
   - Commands removed:
     - `:cscope`
     - `:lcscope`
@@ -34,7 +34,7 @@ The following changes may require adaptations in user config or plugins.
 
   See https://github.com/neovim/neovim/pull/20545 for more information.
 
-• `:hardcopy` is now removed (see |hardcopy| and |nvim-features-removed|):
+• `:hardcopy` is now removed (see |hardcopy| and |nvim-removed|):
   - Commands removed:
     - `:hardcopy`
   - Options removed:
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 97fc211c36..b274c02945 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -13,7 +13,7 @@ centralized reference of the differences.
 				      Type |gO| to see the table of contents.
 
 ==============================================================================
-1. Configuration					    *nvim-config*
+Configuration						    *nvim-config*
 
 - Use `$XDG_CONFIG_HOME/nvim/init.vim` instead of `.vimrc` for your |config|.
 - Use `$XDG_CONFIG_HOME/nvim` instead of `.vim` to store configuration files.
@@ -21,7 +21,7 @@ centralized reference of the differences.
   session information.  |shada|
 
 ==============================================================================
-2. Defaults					            *nvim-defaults*
+Defaults					            *nvim-defaults*
 
 - Filetype detection is enabled by default. This can be disabled by adding
   ":filetype off" to |init.vim|.
@@ -78,7 +78,7 @@ centralized reference of the differences.
 
 - |g:vimsyn_embed| defaults to "l" to enable Lua highlighting
 
-Default Mouse ~
+DEFAULT MOUSE
 						*default-mouse* *disable-mouse*
 By default the mouse is enabled, and <RightMouse> opens a |popup-menu| with
 standard actions ("Cut", "Copy", "Paste", …). Mouse is NOT enabled in
@@ -102,7 +102,7 @@ To remove the "How-to disable mouse" menu item and the separator above it: >vim
   aunmenu PopUp.How-to\ disable\ mouse
   aunmenu PopUp.-1-
 <
-Default Mappings ~
+DEFAULT MAPPINGS
 							*default-mappings*
 Nvim creates the following default mappings at |startup|. You can disable any
 of these in your config by simply removing the mapping, e.g. ":unmap Y".
@@ -115,7 +115,7 @@ of these in your config by simply removing the mapping, e.g. ":unmap Y".
 	xnoremap # y?\V<C-R>"<CR>
 	nnoremap & :&&<CR>
 <
-Default Autocommands ~
+DEFAULT AUTOCOMMANDS
 							*default-autocmds*
 Default autocommands exist in the following groups. Use ":autocmd! {group}" to
 remove them and ":autocmd {group}" to see how they're defined.
@@ -127,35 +127,36 @@ nvim_cmdwin:
 - CmdwinEnter: Limits syntax sync to maxlines=1 in the |cmdwin|.
 
 ==============================================================================
-3. New Features						       *nvim-features*
+New Features						       *nvim-features*
 
 MAJOR COMPONENTS
 
-API				|API|
-Job control			|job-control|
-LSP framework			|lsp|
-Lua scripting			|lua|
-Parsing engine			|treesitter|
-Providers
-  Clipboard			|provider-clipboard|
-  Node.js plugins		|provider-nodejs|
-  Python plugins		|provider-python|
-  Ruby plugins			|provider-ruby|
-Remote plugins			|remote-plugin|
-Shared data			|shada|
-Terminal emulator		|terminal|
-Vimscript parser		|nvim_parse_expression()|
-XDG base directories		|xdg|
+- API                             |API|
+- Job control                     |job-control|
+- LSP framework                   |lsp|
+- Lua scripting                   |lua|
+- Parsing engine                  |treesitter|
+- Providers
+  - Clipboard                     |provider-clipboard|
+  - Node.js plugins               |provider-nodejs|
+  - Python plugins                |provider-python|
+  - Ruby plugins                  |provider-ruby|
+- Remote plugins                  |remote-plugin|
+- Shared data                     |shada|
+- Terminal emulator               |terminal|
+- UI                              |ui| |--listen| |--server|
+- Vimscript parser                |nvim_parse_expression()|
+- XDG base directories            |xdg|
 
 USER EXPERIENCE
 
 Working intuitively and consistently is a major goal of Nvim.
 
 							*feature-compile*
-- Nvim always includes ALL features, in contrast to Vim (which ships with
-  various combinations of 100+ optional features). Think of it as a leaner
-  version of Vim's "HUGE" build. This reduces surface area for bugs, and
-  removes a common source of confusion and friction for users.
+- Nvim always includes ALL features, in contrast to Vim (which ships various
+  combinations of 100+ optional features).  |feature-compile| Think of it as
+  a leaner version of Vim's "HUGE" build. This reduces surface area for bugs,
+  and removes a common source of confusion and friction for users.
 
 - Nvim avoids features that cannot be provided on all platforms; instead that
   is delegated to external plugins/extensions. E.g. the `-X` platform-specific
@@ -173,6 +174,7 @@ backwards-compatibility cost. Some examples:
 
 - Directories for 'directory' and 'undodir' are auto-created.
 - Terminal features such as 'guicursor' are enabled where possible.
+- Various "nvim" |cli-arguments| were redesigned.
 
 Some features are built in that otherwise required external plugins:
 
@@ -180,6 +182,11 @@ Some features are built in that otherwise required external plugins:
 
 ARCHITECTURE
 
+The Nvim UI is "decoupled" from the core editor: all UIs, including the
+builtin |TUI| are just plugins that connect to a Nvim server (via |--server|
+or |--embed|). Multiple Nvim UI clients can connect to the same Nvim editor
+server.
+
 External plugins run in separate processes. |remote-plugin| This improves
 stability and allows those plugins to work without blocking the editor. Even
 "legacy" Python and Ruby plugins which use the old Vim interfaces (|if_pyth|,
@@ -191,7 +198,7 @@ by Nvim developers.
 
 FEATURES
 
-Command-line highlighting:
+Command-line:
   The expression prompt (|@=|, |c_CTRL-R_=|, |i_CTRL-R_=|) is highlighted
   using a built-in Vimscript expression parser. |expr-highlight|
 					*E5408* *E5409*
@@ -253,34 +260,105 @@ Input/Mappings:
 
 Normal commands:
   |gO| shows a filetype-defined "outline" of the current buffer.
+  |Q| replays the last recorded macro instead of switching to Ex mode (|gQ|).
 
 Options:
   'cpoptions'   flags: |cpo-_|
-  'guicursor'   works in the terminal
+  'diffopt'     "linematch" feature
+  'exrc'        searches for ".nvim.lua", ".nvimrc", or ".exrc" files. The
+                user is prompted whether to trust the file.
   'fillchars'   flags: "msgsep", "horiz", "horizup",
                 "horizdown", "vertleft", "vertright", "verthoriz"
   'foldcolumn'  supports up to 9 dynamic/fixed columns
+  'guicursor'   works in the terminal (TUI)
   'inccommand'  shows interactive results for |:substitute|-like commands
                 and |:command-preview| commands
+  'jumpoptions' "stack" behavior
+  'jumpoptions' "view" tries to restore the |mark-view| when moving through
+  the |jumplist|, |changelist|, |alternate-file| or using |mark-motions|.
   'laststatus'  global statusline support
   'mousescroll' amount to scroll by when scrolling with a mouse
   'pumblend'    pseudo-transparent popupmenu
   'scrollback'
+  'shortmess'   "F" flag does not affect output from autocommands
   'signcolumn'  supports up to 9 dynamic/fixed columns
+  'statuscolumn' full control of columns using 'statusline' format
+  'statusline'  supports unlimited alignment sections
   'tabline'     %@Func@foo%X can call any function on mouse-click
+  'ttimeout', 'ttimeoutlen' behavior was simplified
   'winblend'    pseudo-transparency in floating windows |api-floatwin|
   'winhighlight' window-local highlights
-  'diffopt'     has the option `linematch`.
+
+Providers:
+  If a Python interpreter is available on your `$PATH`, |:python| and
+  |:python3| are always available. See |provider-python|.
+
+Shell:
+  Shell output (|:!|, |:make|, …) is always routed through the UI, so it
+  cannot "mess up" the screen. (You can still use "chansend(v:stderr,…)" if
+  you want to mess up the screen :)
+
+  Nvim throttles (skips) messages from shell commands (|:!|, |:grep|, |:make|)
+  if there is too much output. No data is lost, this only affects display and
+  improves performance. |:terminal| output is never throttled.
+
+  |:!| does not support "interactive" commands. Use |:terminal| instead.
+  (GUI Vim has a similar limitation, see ":help gui-pty" in Vim.)
+
+  :!start is not special-cased on Windows.
+
+  |system()| does not support writing/reading "backgrounded" commands. |E5677|
 
 Signs:
   Signs are removed if the associated line is deleted.
 
+Startup:
+  |-e| and |-es| invoke the same "improved Ex mode" as -E and -Es.
+  |-E| and |-Es| read stdin as text (into buffer 1).
+  |-es| and |-Es| have improved behavior:
+    - Quits automatically, don't need "-c qa!".
+    - Skips swap-file dialog.
+  |-s| reads Normal commands from stdin if the script name is "-".
+  Reading text (instead of commands) from stdin |--|:
+    - works by default: "-" file is optional
+    - works in more cases: |-Es|, file args
+
+TUI:
+			*:set-termcap*
+  Start Nvim with 'verbose' level 3 to show terminal capabilities: >
+	nvim -V3
+<
+			*'term'* *E529* *E530* *E531*
+  'term' reflects the terminal type derived from |$TERM| and other environment
+  checks.  For debugging only; not reliable during startup. >vim
+	  :echo &term
+<  "builtin_x" means one of the |builtin-terms| was chosen, because the expected
+  terminfo file was not found on the system.
+
+  Nvim will use 256-colour capability on Linux virtual terminals.  Vim uses
+  only 8 colours plus bright foreground on Linux VTs.
+
+  Vim combines what is in its |builtin-terms| with what it reads from terminfo,
+  and has a 'ttybuiltin' setting to control how that combination works.  Nvim
+  uses one or the other, it does not attempt to merge the two.
+
+UI/Display:
+  |Visual| selection highlights the character at cursor. |visual-use|
+
+  messages: When showing messages longer than 'cmdheight', only
+  scroll the message lines, not the entire screen. The
+  separator line is decorated by |hl-MsgSeparator| and
+  the "msgsep" flag of 'fillchars'. *msgsep*
+
 Variables:
   |v:progpath| is always absolute ("full")
   |v:windowid| is always available (for use by external UIs)
 
+Vimscript:
+  |:redir| nested in |execute()| works.
+
 ==============================================================================
-4. Upstreamed features					 *nvim-upstreamed*
+Upstreamed features					 *nvim-upstreamed*
 
 These Nvim features were later integrated into Vim.
 
@@ -294,17 +372,9 @@ These Nvim features were later integrated into Vim.
 - 'statusline' supports unlimited alignment sections
 
 ==============================================================================
-5. Changed features					 *nvim-features-changed*
-
-Nvim always builds with all features, in contrast to Vim which may have
-certain features removed/added at compile-time. |feature-compile|
-
-Some Vim features were changed in Nvim, and vice versa.
+Changed features					 *nvim-changed*
 
-If a Python interpreter is available on your `$PATH`, |:python| and |:python3|
-are always available and may be used simultaneously. See |provider-python|.
-
-|:redir| nested in |execute()| works.
+This section lists various low-level details about other behavior changes.
 
 |mkdir()| behaviour changed:
 1. Assuming /tmp/foo does not exist and /tmp can be written to
@@ -345,7 +415,7 @@ are always available and may be used simultaneously. See |provider-python|.
 |json_encode()| behaviour slightly changed: now |msgpack-special-dict| values 
 are accepted, but |v:none| is not.
 
-Viminfo text files were replaced with binary (messagepack) ShaDa files.
+Viminfo text files were replaced with binary (messagepack) |shada| files.
 Additional differences:
 
 - |shada-c| has no effect.
@@ -387,7 +457,7 @@ Commands:
   |:wincmd| accepts a count.
   `:write!` does not show a prompt if the file was updated externally.
 
-Command line completion:
+Command-line:
   The meanings of arrow keys do not change depending on 'wildoptions'.
 
 Functions:
@@ -424,46 +494,6 @@ Mappings:
 Motion:
   The |jumplist| avoids useless/phantom jumps.
 
-Normal commands:
-  |Q| replays the last recorded macro instead of switching to Ex mode.
-  Instead |gQ| can be used to enter Ex mode.
-
-Options:
-  'ttimeout', 'ttimeoutlen' behavior was simplified
-  'jumpoptions' "stack" behavior
-  'jumpoptions' "view" tries to restore the |mark-view| when moving through
-  the |jumplist|, |changelist|, |alternate-file| or using |mark-motions|.
-  'shortmess' the "F" flag does not affect output from autocommands
-  'exrc' searches for ".nvim.lua", ".nvimrc", or ".exrc" files. The user is
-  prompted whether to trust the file.
-
-Shell:
-  Shell output (|:!|, |:make|, …) is always routed through the UI, so it
-  cannot "mess up" the screen. (You can still use "chansend(v:stderr,…)" if
-  you want to mess up the screen :)
-
-  Nvim throttles (skips) messages from shell commands (|:!|, |:grep|, |:make|)
-  if there is too much output. No data is lost, this only affects display and
-  improves performance. |:terminal| output is never throttled.
-
-  |:!| does not support "interactive" commands. Use |:terminal| instead.
-  (GUI Vim has a similar limitation, see ":help gui-pty" in Vim.)
-
-  :!start is not special-cased on Windows.
-
-  |system()| does not support writing/reading "backgrounded" commands. |E5677|
-
-Startup:
-  |-e| and |-es| invoke the same "improved Ex mode" as -E and -Es.
-  |-E| and |-Es| read stdin as text (into buffer 1).
-  |-es| and |-Es| have improved behavior:
-    - Quits automatically, don't need "-c qa!".
-    - Skips swap-file dialog.
-  |-s| reads Normal commands from stdin if the script name is "-".
-  Reading text (instead of commands) from stdin |--|:
-    - works by default: "-" file is optional
-    - works in more cases: |-Es|, file args
-
 Syntax highlighting:
   syncolor.vim has been removed. Nvim now sets up default highlighting groups
   automatically for both light and dark backgrounds, regardless of whether or
@@ -472,40 +502,13 @@ Syntax highlighting:
   after/syntax/syncolor.vim file should transition that file into a
   colorscheme. |:colorscheme|
 
-TUI:
-			*:set-termcap*
-  Start Nvim with 'verbose' level 3 to show terminal capabilities: >
-	nvim -V3
-<
-			*'term'* *E529* *E530* *E531*
-  'term' reflects the terminal type derived from |$TERM| and other environment
-  checks.  For debugging only; not reliable during startup. >vim
-	  :echo &term
-<  "builtin_x" means one of the |builtin-terms| was chosen, because the expected
-  terminfo file was not found on the system.
-
-  Nvim will use 256-colour capability on Linux virtual terminals.  Vim uses
-  only 8 colours plus bright foreground on Linux VTs.
-
-  Vim combines what is in its |builtin-terms| with what it reads from terminfo,
-  and has a 'ttybuiltin' setting to control how that combination works.  Nvim
-  uses one or the other, it does not attempt to merge the two.
-
-UI/Display:
-  |Visual| selection highlights the character at cursor. |visual-use|
-
-  messages: When showing messages longer than 'cmdheight', only
-  scroll the message lines, not the entire screen. The
-  separator line is decorated by |hl-MsgSeparator| and
-  the "msgsep" flag of 'fillchars'. *msgsep*
-
 Vimscript compatibility:
   `count` does not alias to |v:count|
   `errmsg` does not alias to |v:errmsg|
   `shell_error` does not alias to |v:shell_error|
   `this_session` does not alias to |v:this_session|
 
-Working directory (Vim implemented some of these later than Nvim):
+Working directory (Vim implemented some of these after Nvim):
 - |DirChanged| and |DirChangedPre| can be triggered when switching to another
   window or tab.
 - |getcwd()| and |haslocaldir()| may throw errors if the tab page or window
@@ -516,20 +519,15 @@ Working directory (Vim implemented some of these later than Nvim):
   working directory. Use `getcwd(-1, -1)` to get the global working directory.
 
 ==============================================================================
-6. Missing legacy features				 *nvim-features-missing*
-
-Some legacy Vim features are not yet implemented:
+Missing legacy features					 *nvim-missing*
 
-- *if_lua* : Nvim |Lua| API is not compatible with Vim's "if_lua"
-- *if_mzscheme*
-- |if_pyth|: *python-bindeval* *python-Function* are not supported
-- *if_tcl*
+These legacy Vim features are not yet implemented:
 
 *:gui*
 *:gvim*
 
 ==============================================================================
-7. Removed features					 *nvim-features-removed*
+Removed legacy features					 *nvim-removed*
 
 These Vim features were intentionally removed from Nvim.
 
@@ -687,6 +685,13 @@ Options:
 Performance:
   Folds are not updated during insert-mode.
 
+Providers:
+
+- *if_lua* : Nvim |Lua| API is not compatible with Vim's "if_lua".
+- *if_mzscheme*
+- |if_pyth|: *python-bindeval* *python-Function* are not supported.
+- *if_tcl*
+
 Startup:
   --literal (file args are always literal; to expand wildcards on Windows, use
     |:n| e.g. `nvim +"n *"`)
-- 
cgit 


From 0b36145c696fb58e002169edd4f9a1d9a8176fc3 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Wed, 22 Feb 2023 16:23:24 +0100
Subject: docs: mention getmousepos() for click execute function label

close #18741
close #11312
---
 runtime/doc/options.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d13ab8c393..2260cd8377 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6199,6 +6199,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	         is a bug that denotes that new mouse button recognition was 
 	         added without modifying code that reacts on mouse clicks on 
 	         this label.
+	      Use |getmousepos()|.winid in the specified function to get the
+	      corresponding window id of the clicked item.
 	< -   Where to truncate line if too long.  Default is at the start.
 	      No width fields allowed.
 	= -   Separation point between alignment sections.  Each section will
-- 
cgit 


From 6752f1005d26c93a033d856a60b7b296f3e51634 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 14 Dec 2022 19:58:18 +0100
Subject: docs: naming conventions, guidelines

close #21063
---
 runtime/doc/api.txt          |  57 ++++++-------
 runtime/doc/develop.txt      | 191 ++++++++++++++++++++++++++-----------------
 runtime/doc/editing.txt      |  41 +++++-----
 runtime/doc/editorconfig.txt |  24 +++---
 runtime/doc/lua-guide.txt    |   6 +-
 runtime/doc/lua.txt          |  63 ++++++--------
 runtime/doc/options.txt      |  37 ++++-----
 runtime/doc/support.txt      |   6 +-
 runtime/doc/ui.txt           |   3 +
 runtime/doc/vim_diff.txt     |   1 +
 runtime/lua/vim/keymap.lua   |  50 ++++-------
 runtime/lua/vim/ui.lua       |   7 +-
 12 files changed, 241 insertions(+), 245 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 7bcae79852..3ca50dda15 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1461,16 +1461,15 @@ nvim_set_keymap({mode}, {lhs}, {rhs}, {*opts})             *nvim_set_keymap()*
                 "!" for |:map!|, or empty string for |:map|.
       • {lhs}   Left-hand-side |{lhs}| of the mapping.
       • {rhs}   Right-hand-side |{rhs}| of the mapping.
-      • {opts}  Optional parameters map: keys are |:map-arguments|, values are
-                booleans (default false). Accepts all |:map-arguments| as keys
-                excluding |<buffer>| but including |:noremap| and "desc".
-                Unknown key is an error. "desc" can be used to give a
-                description to the mapping. When called from Lua, also accepts
-                a "callback" key that takes a Lua function to call when the
-                mapping is executed. When "expr" is true, "replace_keycodes"
-                (boolean) can be used to replace keycodes in the resulting
-                string (see |nvim_replace_termcodes()|), and a Lua callback
-                returning `nil` is equivalent to returning an empty string.
+      • {opts}  Optional parameters map: Accepts all |:map-arguments| as keys
+                except |<buffer>|, values are booleans (default false). Also:
+                • "noremap" non-recursive mapping |:noremap|
+                • "desc" human-readable description.
+                • "callback" Lua function called when the mapping is executed.
+                • "replace_keycodes" (boolean) When "expr" is true, replace
+                  keycodes in the resulting string (see
+                  |nvim_replace_termcodes()|). Returning nil from the Lua
+                  "callback" is equivalent to returning an empty string.
 
 nvim_set_var({name}, {value})                                 *nvim_set_var()*
     Sets a global (g:) variable.
@@ -1678,7 +1677,7 @@ Command Functions                                                *api-command*
 
                                               *nvim_buf_create_user_command()*
 nvim_buf_create_user_command({buffer}, {name}, {command}, {*opts})
-    Create a new user command |user-commands| in the given buffer.
+    Creates a buffer-local command |user-commands|.
 
     Parameters: ~
       • {buffer}  Buffer handle, or 0 for current buffer.
@@ -1743,15 +1742,12 @@ nvim_cmd({*cmd}, {*opts})                                         *nvim_cmd()*
 
                                                   *nvim_create_user_command()*
 nvim_create_user_command({name}, {command}, {*opts})
-    Create a new user command |user-commands|
+    Creates a global |user-commands| command.
 
-    {name} is the name of the new command. The name must begin with an
-    uppercase letter.
-
-    {command} is the replacement text or Lua function to execute.
+    For Lua usage see |lua-guide-commands-create|.
 
     Example: >vim
-       :call nvim_create_user_command('SayHello', 'echo "Hello world!"', {})
+       :call nvim_create_user_command('SayHello', 'echo "Hello world!"', {'bang': v:true})
        :SayHello
        Hello world!
 <
@@ -1783,19 +1779,20 @@ nvim_create_user_command({name}, {command}, {*opts})
                    • smods: (table) Command modifiers in a structured format.
                      Has the same structure as the "mods" key of
                      |nvim_parse_cmd()|.
-      • {opts}     Optional command attributes. See |command-attributes| for
-                   more details. To use boolean attributes (such as
-                   |:command-bang| or |:command-bar|) set the value to "true".
-                   In addition to the string options listed in
-                   |:command-complete|, the "complete" key also accepts a Lua
-                   function which works like the "customlist" completion mode
-                   |:command-completion-customlist|. Additional parameters:
-                   • desc: (string) Used for listing the command when a Lua
-                     function is used for {command}.
-                   • force: (boolean, default true) Override any previous
-                     definition.
-                   • preview: (function) Preview callback for 'inccommand'
-                     |:command-preview|
+      • {opts}     Optional |command-attributes|.
+                   • Set boolean attributes such as |:command-bang| or
+                     |:command-bar| to true (but not |:command-buffer|, use
+                     |nvim_buf_create_user_command()| instead).
+                   • "complete" |:command-complete| also accepts a Lua
+                     function which works like
+                     |:command-completion-customlist|.
+                   • Other parameters:
+                     • desc: (string) Used for listing the command when a Lua
+                       function is used for {command}.
+                     • force: (boolean, default true) Override any previous
+                       definition.
+                     • preview: (function) Preview callback for 'inccommand'
+                       |:command-preview|
 
 nvim_del_user_command({name})                        *nvim_del_user_command()*
     Delete a user-defined command.
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 87190d7f33..b090fd4f09 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -132,6 +132,18 @@ DOCUMENTATION						*dev-doc*
   optimize for the reader's time and energy: be "precise yet concise".
     - See https://developers.google.com/style/tone
     - Prefer the active voice: "Foo does X", not "X is done by Foo".
+- Start function docstrings with present tense ("Gets"), not imperative
+  ("Get"). This tends to reduce ambiguity and improve clarity. >
+    GOOD:
+    /// Gets a highlight definition.
+    BAD:
+    /// Get a highlight definition.
+- Avoid starting docstrings with "The" or "A" unless needed to avoid
+  ambiguity. This is a visual aid and reduces noise. >
+    GOOD:
+    /// @param dirname Path fragment before `pend`
+    BAD:
+    /// @param dirname The path fragment before `pend`
 - Vim differences:
     - Do not prefix help tags with "nvim-". Use |vim_diff.txt| to catalog
       differences from Vim; no other distinction is necessary.
@@ -143,13 +155,6 @@ DOCUMENTATION						*dev-doc*
       not "the user host terminal".
     - Use "tui-" to prefix help tags related to the host terminal, and "TUI"
       in prose if possible.
-- Docstrings: do not start parameter descriptions with "The" or "A" unless it
-  is critical to avoid ambiguity. >
-    GOOD:
-    /// @param dirname Path fragment before `pend`
-    BAD:
-    /// @param dirname The path fragment before `pend`
-<
 
 Documentation format ~
 
@@ -159,14 +164,14 @@ https://neovim.io/doc/user ).
 
 Strict "vimdoc" subset:
 
-- Use lists (like this!) prefixed with "-", "*", or "•", for adjacent lines
-  that you don't want auto-wrapped. Lists are always rendered with "flow"
-  (soft-wrapped) layout instead of preformatted (hard-wrapped) layout common
-  in legacy :help docs.
+- Use lists (like this!) prefixed with "-" or "•", for adjacent lines that you
+  don't want to auto-wrap. Lists are always rendered with "flow" layout
+  (soft-wrapped) instead of preformatted (hard-wrapped) layout common in
+  legacy :help docs.
   - Limitation: currently the parser https://github.com/neovim/tree-sitter-vimdoc
     does not understand numbered listitems, so use a bullet symbol (- or •)
-    before numbered items, e.g. "- 1." instead of "1.".
-- Separate blocks (paragraphs) of content by a blank line(s).
+    before numbered items, e.g. "• 1." instead of "1.".
+- Separate blocks (paragraphs) of content by a blank line.
 - Do not use indentation in random places—that prevents the page from using
   "flow" layout. If you need a preformatted section, put it in
   a |help-codeblock| starting with ">".
@@ -246,7 +251,9 @@ vim.paste in runtime/lua/vim/_editor.lua like this: >
     ---@returns false if client should cancel the paste.
 
 
-LUA							*dev-lua*
+LUA STDLIB DESIGN GUIDELINES				*dev-lua*
+
+See also |dev-naming|.
 
 - Keep the core Lua modules |lua-stdlib| simple. Avoid elaborate OOP or
   pseudo-OOP designs. Plugin authors just want functions to call, not a big,
@@ -255,10 +262,26 @@ LUA							*dev-lua*
   tables or values are easier to serialize, easier to construct from literals,
   easier to inspect and print, and inherently compatible with all Lua plugins.
   (This guideline doesn't apply to opaque, non-data objects like `vim.cmd`.)
-
-
-API							*dev-api*
-
+- stdlib functions should follow these common patterns:
+  - accept iterable instead of table
+    - exception: in some cases iterable doesn't make sense, e.g. spair() sorts
+      the input by definition, so there is no reason for it to accept an
+      iterable, because the input needs to be "hydrated", it can't operate on
+      a "stream".
+  - return iterable instead of table
+  - mimic the pairs() or ipairs() interface if the function is intended to be
+    used in a "for" loop.
+
+
+API DESIGN GUIDELINES					*dev-api*
+
+See also |dev-naming|.
+
+- When adding an API, check the following:
+  - What precedents did you draw from? How does your solution compare to them?
+  - Does your new API allow future expansion? How? Or why not?
+  - Is the new API similar to existing APIs? Do we need to deprecate the old ones?
+  - Did you cross-reference related concepts in the docs?
 - Avoid "mutually exclusive" parameters--via constraints or limitations, if
   necessary. For example nvim_create_autocmd() has mutually exclusive
   "callback" and "command" args; but the "command" arg could be eliminated by
@@ -266,66 +289,95 @@ API							*dev-api*
   "callback" arg as an Ex command (which can call Vimscript functions). The
   "buffer" arg could also be eliminated by treating a number "pattern" as
   a buffer number.
+- Avoid functions that depend on cursor position, current buffer, etc. Instead
+  the function should take a position parameter, buffer parameter, etc.
 
-                                                              *dev-api-naming*
-Use this format to name new RPC |API| functions:
+NAMING GUIDELINES                                       *dev-naming*
 
-    nvim_{thing}_{action}_{arbitrary-qualifiers}
+Naming is exceedingly important: the name of a thing is the primary interface
+for uses it, discusses it, searches for it, shares it... Consistent
+naming in the stdlib, API, and UI helps both users and developers discover and
+intuitively understand related concepts ("families"), and reduces cognitive
+burden. Discoverability encourages code re-use and likewise avoids redundant,
+overlapping mechanisms, which reduces code surface-area, and thereby minimizes
+bugs...
 
-If the function acts on an object then {thing} is the name of that object
-(e.g. "buf" or "win"). If the function operates in a "global" context then
-{thing} is usually omitted (but consider "namespacing" your global operations
-with a {thing} that groups functions under a common concept).
-
-Use existing common {action} names if possible:
-    - add       Append to, or insert into, a collection
-    - call      Call a function
-    - create    Create a new (non-trivial) thing
-    - del       Delete a thing (or group of things)
-    - eval      Evaluate an expression
-    - exec      Execute code
-    - fmt       Format
-    - get       Get things (often by a query)
-    - open      Open
-    - parse     Parse something into a structured form
-    - set       Set a thing (or group of things)
+Naming conventions ~
+
+In general, look for precedent when choosing a name, that is, look at existing
+(non-deprecated) functions. In particular, see below...
+
+							*dev-name-common*
+Use existing common {verb} names (actions) if possible:
+    - add:          Appends or inserts into a collection
+    - attach:       Listens to something to get events from it (TODO: rename to "on"?)
+    - call:         Calls a function
+    - clear:        Clears state but does not destroy the container
+    - create:       Creates a new (non-trivial) thing (TODO: rename to "def"?)
+    - del:          Deletes a thing (or group of things)
+    - detach:       Dispose attached listener (TODO: rename to "un"?)
+    - eval:         Evaluates an expression
+    - exec:         Executes code
+    - fmt:          Formats
+    - get:          Gets things (often by a query)
+    - inspect:      Presents a high-level, often interactive, view
+    - open:         Opens something (a buffer, window, …)
+    - parse:        Parses something into a structured form
+    - set:          Sets a thing (or group of things)
+    - try_{verb}:   Best-effort operation, failure returns null or error obj
 
 Do NOT use these deprecated verbs:
-    - list      Redundant with "get"
+    - list:         Redundant with "get"
+    - show:         Redundant with "print", "echo"
+    - notify:       Redundant with "print", "echo"
 
-Use consistent names for {thing} (nouns) in API functions: buffer is called
+Use consistent names for {noun} (nouns) in API functions: buffer is called
 "buf" everywhere, not "buffer" in some places and "buf" in others.
-    - buf       Buffer
-    - chan      |channel|
-    - cmd       Command
-    - cmdline   Command-line UI or input
-    - fn        Function
-    - hl        Highlight
-    - pos       Position
-    - proc      System process
-    - tabpage   Tabpage
-    - win       Window
+    - buf:          Buffer
+    - chan:         |channel|
+    - cmd:          Command
+    - cmdline:      Command-line UI or input
+    - fn:           Function
+    - hl:           Highlight
+    - pos:          Position
+    - proc:         System process
+    - tabpage:      Tabpage
+    - win:          Window
 
 Do NOT use these deprecated nouns:
     - buffer
     - command
     - window
 
-Example:
-    `nvim_get_keymap('v')` operates in a global context (first parameter is not
-    a Buffer). The "get" {action} indicates that it gets anything matching the
-    given filter parameter. There is no need for a "list" action because
-    `nvim_get_keymap('')` (i.e., empty filter) returns all items.
+							*dev-name-events*
+Use the "on_" prefix to name event-handling callbacks and also the interface for
+"registering" such handlers (on_key). The dual nature is acceptable to avoid
+a confused collection of naming conventions for these related concepts.
+
+Editor |events| (autocommands) are historically named like: >
+    {Noun}{Event}
+
+Use this format to name API (RPC) events: >
+    nvim_{noun}_{event-name}_event
 
-Example:
-    `nvim_buf_del_mark` acts on a `Buffer` object (the first parameter)
-    and uses the "del" {action}.
+Example: >
+    nvim_buf_changedtick_event
+<
+							*dev-name-api*
+Use this format to name new RPC |API| functions: >
+    nvim_{noun}_{verb}_{arbitrary-qualifiers}
 
-Use this format to name new API events:
-    nvim_{thing}_{event}_event
+If the function acts on an object then {noun} is the name of that object
+(e.g. "buf" or "win"). If the function operates in a "global" context then
+{noun} is usually omitted (but consider "namespacing" your global operations
+with a {noun} that groups functions under a common concept).
 
-Example:
-    `nvim_buf_changedtick_event`
+- Example: `nvim_get_keymap('v')` operates in a global context (first
+  parameter is not a Buffer). The "get" verb indicates that it gets anything
+  matching the given filter parameter. A "list" verb is unnecessary because
+  `nvim_get_keymap('')` (empty filter) returns all items.
+- Example: `nvim_buf_del_mark` acts on a `Buffer` object (the first parameter)
+  and uses the "del" {verb}.
 
 
 API-CLIENT						*dev-api-client*
@@ -417,19 +469,4 @@ External UIs are expected to implement these common features:
   published in this event. See also "mouse_on", "mouse_off".
 
 
-NAMING							*dev-naming*
-
-Naming is important. Consistent naming in the API and UI helps both users and
-developers discover and intuitively understand related concepts ("families"),
-and reduces cognitive burden. Discoverability encourages code re-use and
-likewise avoids redundant, overlapping mechanisms, which reduces code
-surface-area, and thereby minimizes bugs...
-
-Naming conventions ~
-
-Use the "on_" prefix to name event handlers and also the interface for
-"registering" such handlers (on_key). The dual nature is acceptable to avoid
-a confused collection of naming conventions for these related concepts.
-
-
  vim:tw=78:ts=8:sw=4:et:ft=help:norl:
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index f77db5fab3..bd1b62635e 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1668,29 +1668,26 @@ There are three different types of searching:
 ==============================================================================
 12. Trusted Files						*trust*
 
-Nvim has the ability to execute arbitrary code through the 'exrc' option. In
-order to prevent executing code from untrusted sources, Nvim has the concept of
-"trusted files". An untrusted file will not be executed without the user's
-consent, and a user can permanently mark a file as trusted or untrusted using
-the |:trust| command or the |vim.secure.read()| function.
+Nvim executes arbitrary code found on the filesystem if 'exrc' is enabled. To
+prevent executing malicious code, only "trusted files" are executed. You can
+mark a file as trusted or untrusted using the |:trust| command or the
+|vim.secure.read()| function.
 
 							*:trust* *E5570*
-:trust [++deny] [++remove] [{file}]
-
-			Manage files in the trust database. Without any options
-			or arguments, :trust adds the file associated with the
-			current buffer to the trust database, along with the
-			SHA256 hash of its contents.
-
-			[++deny] marks the file associated with the current
-			buffer (or {file}, if given) as denied; no prompts will
-			be displayed to the user and the file will never be
-			executed.
-
-			[++remove] removes the file associated with the current
-			buffer (or {file}, if given) from the trust database.
-			Future attempts to read the file in a secure setting
-			(i.e. with 'exrc' or |vim.secure.read()|) will prompt
-			the user if the file is trusted.
+:trust [++deny] [++remove] [file]
+
+			Manage trusted files. Without ++ options, :trust marks
+			[file] (or current buffer if no [file]) as trusted,
+			keyed on a hash of its contents. The trust list is
+			stored on disk, Nvim will re-use it after restarting.
+
+			[++deny] marks [file] (or current buffer if no [file]) as
+			untrusted: it will never be executed, 'exrc' will
+			ignore it.
+
+			[++remove] removes [file] (or current buffer if no
+			[file]) from the trust list. When the file is
+			discovered by 'exrc' or |vim.secure.read()|, the user
+			will be asked whether to trust or deny the file.
 
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/editorconfig.txt b/runtime/doc/editorconfig.txt
index 04a057e5ff..52fd860d2d 100644
--- a/runtime/doc/editorconfig.txt
+++ b/runtime/doc/editorconfig.txt
@@ -6,25 +6,21 @@
 
 EditorConfig integration                                        *editorconfig*
 
-Nvim natively supports EditorConfig. When a file is opened, Nvim searches
-upward through all of the parent directories of that file looking for
-".editorconfig" files. Each of these is parsed and any properties that match
-the opened file are applied.
-
-For more information on EditorConfig, see https://editorconfig.org/.
+Nvim supports EditorConfig. When a file is opened, Nvim searches all parent
+directories of that file for ".editorconfig" files, parses them, and applies
+any properties that match the opened file. Think of it like 'modeline' for an
+entire (recursive) directory. For more information see
+https://editorconfig.org/.
 
                                                *g:editorconfig* *b:editorconfig*
-EditorConfig integration can be disabled globally by adding >lua
+EditorConfig is enabled by default. To disable it, add to your config: >lua
 
     vim.g.editorconfig = false
 <
-to the user's |init.lua| file (or the Vimscript equivalent to |init.vim|). It
-can also be disabled per-buffer by setting the |b:editorconfig| buffer-local
-variable to `false`.
+(Vimscript: `let g:editorconfig = v:false`). It can also be disabled
+per-buffer by setting the |b:editorconfig| buffer-local variable to `false`.
 
-When Nvim finds a valid .editorconfig file it will store the applied
-properties in the buffer variable |b:editorconfig| if it was not already set to
-`false` by the user.
+Nvim stores the applied properties in |b:editorconfig| if it is not `false`.
 
                                                      *editorconfig-properties*
 The following properties are supported by default:
@@ -88,4 +84,4 @@ Example: >lua
       vim.b[bufnr].foo = val
     end
 <
- vim:tw=78:ts=8:noet:ft=help:norl:
+ vim:tw=78:ts=8:et:sw=4:ft=help:norl:
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index b971a7d2ad..236905a077 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -657,7 +657,7 @@ See also
 • |nvim_exec_autocmds()|: execute all matching autocommands
 
 ==============================================================================
-User commands                                           *lua-guide-usercommands*
+User commands                                           *lua-guide-commands*
 
 |user-commands| are custom Vim commands that call a Vimscript or Lua function.
 Just like built-in commands, they can have arguments, act on ranges, or have
@@ -665,7 +665,7 @@ custom completion of arguments. As these are most useful for plugins, we will
 cover only the basics of this advanced topic.
 
 ------------------------------------------------------------------------------
-Creating user commands                           *lua-guide-usercommands-create*
+Creating user commands                           *lua-guide-commands-create*
 
 User commands can be created through the Neovim API with
 `vim.api.`|nvim_create_user_command()|. This function takes three mandatory
@@ -734,7 +734,7 @@ the remaining arguments are the same as for |nvim_create_user_command()|:
       { nargs = 1 })
 <
 ------------------------------------------------------------------------------
-Deleting user commands                           *lua-guide-usercommands-delete*
+Deleting user commands                           *lua-guide-commands-delete*
 
 User commands can be deleted with `vim.api.`|nvim_del_user_command()|. The only
 argument is the name of the command:
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 0472c11a15..32e89bd237 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2029,7 +2029,8 @@ uri_to_fname({uri})                                       *vim.uri_to_fname()*
 Lua module: ui                                                        *lua-ui*
 
 input({opts}, {on_confirm})                                   *vim.ui.input()*
-    Prompts the user for input
+    Prompts the user for input, allowing arbitrary (potentially asynchronous)
+    work until `on_confirm`.
 
     Example: >lua
 
@@ -2054,7 +2055,8 @@ input({opts}, {on_confirm})                                   *vim.ui.input()*
                       entered), or `nil` if the user aborted the dialog.
 
 select({items}, {opts}, {on_choice})                         *vim.ui.select()*
-    Prompts the user to pick a single item from a collection of entries
+    Prompts the user to pick from a list of items, allowing arbitrary
+    (potentially asynchronous) work until `on_choice`.
 
     Example: >lua
 
@@ -2253,57 +2255,38 @@ del({modes}, {lhs}, {opts})                                 *vim.keymap.del()*
         |vim.keymap.set()|
 
 set({mode}, {lhs}, {rhs}, {opts})                           *vim.keymap.set()*
-    Add a new |mapping|. Examples: >lua
+    Adds a new |mapping|. Examples: >lua
 
-       -- Can add mapping to Lua functions
+       -- Map to a Lua function:
        vim.keymap.set('n', 'lhs', function() print("real lua function") end)
-
-       -- Can use it to map multiple modes
+       -- Map to multiple modes:
        vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer=true })
-
-       -- Can add mapping for specific buffer
+       -- Buffer-local mapping:
        vim.keymap.set('n', '<leader>w', "<cmd>w<cr>", { silent = true, buffer = 5 })
-
-       -- Expr mappings
+       -- Expr mapping:
        vim.keymap.set('i', '<Tab>', function()
          return vim.fn.pumvisible() == 1 and "<C-n>" or "<Tab>"
        end, { expr = true })
-       -- <Plug> mappings
+       -- <Plug> mapping:
        vim.keymap.set('n', '[%', '<Plug>(MatchitNormalMultiBackward)')
 <
 
-    Note that in a mapping like: >lua
-
-        vim.keymap.set('n', 'asdf', require('jkl').my_fun)
-<
-
-    the `require('jkl')` gets evaluated during this call in order to access the function. If you
-    want to avoid this cost at startup you can wrap it in a function, for
-    example: >lua
-
-        vim.keymap.set('n', 'asdf', function() return require('jkl').my_fun() end)
-<
-
     Parameters: ~
-      • {mode}  string|table Same mode short names as |nvim_set_keymap()|. Can
+      • {mode}  string|table Mode short-name, see |nvim_set_keymap()|. Can
                 also be list of modes to create mapping on multiple modes.
       • {lhs}   (string) Left-hand side |{lhs}| of the mapping.
-      • {rhs}   string|function Right-hand side |{rhs}| of the mapping. Can
-                also be a Lua function.
-      • {opts}  (table|nil) A table of |:map-arguments|.
-                • Accepts options accepted by the {opts} parameter in
-                  |nvim_set_keymap()|, with the following notable differences:
-                  • replace_keycodes: Defaults to `true` if "expr" is `true`.
-                  • noremap: Always overridden with the inverse of "remap"
-                    (see below).
-
-                • In addition to those options, the table accepts the
-                  following keys:
-                  • buffer: (number or boolean) Add a mapping to the given
-                    buffer. When `0` or `true`, use the current buffer.
-                  • remap: (boolean) Make the mapping recursive. This is the
-                    inverse of the "noremap" option from |nvim_set_keymap()|.
-                    Defaults to `false`.
+      • {rhs}   string|function Right-hand side |{rhs}| of the mapping, can be
+                a Lua function.
+      • {opts}  (table|nil) Table of |:map-arguments|.
+                • Same as |nvim_set_keymap()| {opts}, except:
+                  • "replace_keycodes" defaults to `true` if "expr" is `true`.
+                  • "noremap": inverse of "remap" (see below).
+
+                • Also accepts:
+                  • "buffer" number|boolean Creates buffer-local mapping, `0`
+                    or `true` for current buffer.
+                  • remap: (boolean) Make the mapping recursive. Inverses
+                    "noremap". Defaults to `false`.
 
     See also: ~
         |nvim_set_keymap()|
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 2260cd8377..f44b6f28e3 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -401,20 +401,15 @@ the system, mostly it is something like 256 or 1024 characters.
 ==============================================================================
 2. Automatically setting options			*auto-setting*
 
-Besides changing options with the ":set" command, there are three alternatives
-to set options automatically for one or more files:
-
-1. When starting Vim initializations are read from various places.  See
-   |initialization|.  Most of them are performed for all editing sessions,
-   and some of them depend on the directory where Vim is started.
-   You can create an initialization file with |:mkvimrc|, |:mkview| and
-   |:mksession|.
-2. If you start editing a new file, the automatic commands are executed.
-   This can be used to set options for files matching a particular pattern and
-   many other things.  See |autocommand|.
-3. If you start editing a new file, and the 'modeline' option is on, a
-   number of lines at the beginning and end of the file are checked for
-   modelines.  This is explained here.
+Besides changing options with the ":set" command, you can set options
+automatically in various ways:
+
+1. With a |config| file or a |startup| argument. You can create an
+   initialization file with |:mkvimrc|, |:mkview| and |:mksession|.
+2. |autocommand|s executed when you edit a file.
+3. ".nvim.lua" files in the current directory, if 'exrc' is enabled.
+4. |editorconfig| in the current buffer's directory or ancestors.
+5. 'modeline' settings found at the beginning or end of the file. See below.
 
 					*modeline* *vim:* *vi:* *ex:* *E520*
 There are two forms of modelines.  The first form:
@@ -2267,15 +2262,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 					*'exrc'* *'ex'* *'noexrc'* *'noex'*
 'exrc' 'ex'		boolean (default off)
 			global
-	Enables the reading of .nvim.lua, .nvimrc, and .exrc files in the current
-	directory.
-
-	The file is only sourced if the user indicates the file is trusted. If
-	it is, the SHA256 hash of the file contents and the full path of the
-	file are persisted to a trust database. The user is only prompted
-	again if the file contents change. See |vim.secure.read()|.
+	Automatically execute .nvim.lua, .nvimrc, and .exrc files in the
+	current directory, if the file is in the |trust| list. Use |:trust| to
+	manage trusted files. See also |vim.secure.read()|.
 
-	Use |:trust| to manage the trusted file database.
+	Compare 'exrc' to |editorconfig|:
+	- 'exrc' can execute any code; editorconfig only specifies settings.
+	- 'exrc' is Nvim-specific; editorconfig works in other editors.
 
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
diff --git a/runtime/doc/support.txt b/runtime/doc/support.txt
index 481959d8f1..e4641751f2 100644
--- a/runtime/doc/support.txt
+++ b/runtime/doc/support.txt
@@ -14,12 +14,16 @@ Supported platforms					 *supported-platforms*
 `System`          `Tier`      `Versions`                  `Tested versions`
 Linux            1      >= 2.6.32, glibc >= 2.12     Ubuntu 22.04
 macOS (Intel)    1      >= 10.15                     macOS 12
-Windows 64-bit   1      >= 8                         Windows Server 2019
+Windows 64-bit   1      >= 8 (see note below)        Windows Server 2019
 FreeBSD          1      >= 10                        FreeBSD 13
 macOS (M1)       2      >= 10.15
 OpenBSD          2      >= 7
 MinGW            2      MinGW-w64
 
+Note: Windows 10 "Version 1809" or later is required for |:terminal|. To check
+your Windows version, run the "winver" command and look for "Version xxxx"
+(NOT "OS Build").
+
 Support types ~
 
 * Tier 1: Officially supported and tested with CI. Any contributed patch
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index 4e4f88f275..bb567e021e 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -809,5 +809,8 @@ events, which the UI must handle.
 	Sent when |:messages| command is invoked. History is sent as a list of
 	entries, where each entry is a `[kind, content]` tuple.
 
+["msg_history_clear"] ~
+	Clear the |:messages| history.
+
 ==============================================================================
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index b274c02945..79808eccc9 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -72,6 +72,7 @@ Defaults					            *nvim-defaults*
 - 'wildmenu' is enabled
 - 'wildoptions' defaults to "pum,tagfile"
 
+- |editorconfig| plugin is enabled, .editorconfig settings are applied.
 - |man.lua| plugin is enabled, so |:Man| is available by default.
 - |matchit| plugin is enabled. To disable it in your config: >vim
     :let loaded_matchit = 1
diff --git a/runtime/lua/vim/keymap.lua b/runtime/lua/vim/keymap.lua
index ef1c66ea20..911b584c14 100644
--- a/runtime/lua/vim/keymap.lua
+++ b/runtime/lua/vim/keymap.lua
@@ -1,51 +1,35 @@
 local keymap = {}
 
---- Add a new |mapping|.
+--- Adds a new |mapping|.
 --- Examples:
 --- <pre>lua
----   -- Can add mapping to Lua functions
+---   -- Map to a Lua function:
 ---   vim.keymap.set('n', 'lhs', function() print("real lua function") end)
----
----   -- Can use it to map multiple modes
+---   -- Map to multiple modes:
 ---   vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer=true })
----
----   -- Can add mapping for specific buffer
+---   -- Buffer-local mapping:
 ---   vim.keymap.set('n', '<leader>w', "<cmd>w<cr>", { silent = true, buffer = 5 })
----
----   -- Expr mappings
+---   -- Expr mapping:
 ---   vim.keymap.set('i', '<Tab>', function()
 ---     return vim.fn.pumvisible() == 1 and "<C-n>" or "<Tab>"
 ---   end, { expr = true })
----   -- <Plug> mappings
+---   -- <Plug> mapping:
 ---   vim.keymap.set('n', '[%%', '<Plug>(MatchitNormalMultiBackward)')
 --- </pre>
 ---
---- Note that in a mapping like:
---- <pre>lua
----    vim.keymap.set('n', 'asdf', require('jkl').my_fun)
---- </pre>
----
---- the ``require('jkl')`` gets evaluated during this call in order to access the function.
---- If you want to avoid this cost at startup you can wrap it in a function, for example:
---- <pre>lua
----    vim.keymap.set('n', 'asdf', function() return require('jkl').my_fun() end)
---- </pre>
----
----@param mode string|table    Same mode short names as |nvim_set_keymap()|.
+---@param mode string|table    Mode short-name, see |nvim_set_keymap()|.
 ---                            Can also be list of modes to create mapping on multiple modes.
 ---@param lhs string           Left-hand side |{lhs}| of the mapping.
----@param rhs string|function  Right-hand side |{rhs}| of the mapping. Can also be a Lua function.
---
----@param opts table|nil A table of |:map-arguments|.
----                      + Accepts options accepted by the {opts} parameter in |nvim_set_keymap()|,
----                        with the following notable differences:
----                        - replace_keycodes: Defaults to `true` if "expr" is `true`.
----                        - noremap: Always overridden with the inverse of "remap" (see below).
----                      + In addition to those options, the table accepts the following keys:
----                        - buffer: (number or boolean) Add a mapping to the given buffer.
----                        When `0` or `true`, use the current buffer.
----                        - remap: (boolean) Make the mapping recursive.
----                        This is the inverse of the "noremap" option from |nvim_set_keymap()|.
+---@param rhs string|function  Right-hand side |{rhs}| of the mapping, can be a Lua function.
+---
+---@param opts table|nil Table of |:map-arguments|.
+---                      - Same as |nvim_set_keymap()| {opts}, except:
+---                        - "replace_keycodes" defaults to `true` if "expr" is `true`.
+---                        - "noremap": inverse of "remap" (see below).
+---                      - Also accepts:
+---                        - "buffer" number|boolean Creates buffer-local mapping, `0` or `true`
+---                        for current buffer.
+---                        - remap: (boolean) Make the mapping recursive. Inverses "noremap".
 ---                        Defaults to `false`.
 ---@see |nvim_set_keymap()|
 function keymap.set(mode, lhs, rhs, opts)
diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua
index 8f5be15221..aaee175f3a 100644
--- a/runtime/lua/vim/ui.lua
+++ b/runtime/lua/vim/ui.lua
@@ -1,6 +1,7 @@
 local M = {}
 
---- Prompts the user to pick a single item from a collection of entries
+--- Prompts the user to pick from a list of items, allowing arbitrary (potentially asynchronous)
+--- work until `on_choice`.
 ---
 ---@param items table Arbitrary items
 ---@param opts table Additional options
@@ -35,7 +36,6 @@ local M = {}
 ---     end
 --- end)
 --- </pre>
-
 function M.select(items, opts, on_choice)
   vim.validate({
     items = { items, 'table', false },
@@ -55,7 +55,8 @@ function M.select(items, opts, on_choice)
   end
 end
 
---- Prompts the user for input
+--- Prompts the user for input, allowing arbitrary (potentially asynchronous) work until
+--- `on_confirm`.
 ---
 ---@param opts table Additional options. See |input()|
 ---     - prompt (string|nil)
-- 
cgit 


From 799edca18a4ddcf8edcb63dd391219e01e187f0d Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 28 Nov 2022 22:43:10 +0100
Subject: feat(lua): make sure require'bit' always works, even with PUC lua 5.1

---
 runtime/doc/lua.txt  | 16 ++++++++++++++++
 runtime/doc/news.txt |  1 +
 2 files changed, 17 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 32e89bd237..8ae1c6dc40 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -33,6 +33,22 @@ Lua 5.1, not worry about forward-compatibility with future Lua versions.  If
 Nvim ever ships with Lua 5.4+, a Lua 5.1 compatibility shim will be provided
 so that old plugins continue to work transparently.
 
+                                                                  *lua-luajit*
+Neovim is built with luajit on platforms which support it, which provides
+extra functionality. Lua code in |init.lua| and plugins can assume its presence
+on installations on common platforms. For maximum compatibility with less
+common platforms, availability can be checked using the `jit` global variable: >lua
+  if jit then
+    -- code for luajit
+  else
+    -- code for plain lua 5.1
+  end
+<
+                                                                  *lua-bit*
+In particular, the luajit "bit" extension module is _always_ available.
+A fallback implementation is included when nvim is built with PUC lua 5.1,
+and will be transparently used when `require("bit")` is invoked.
+
 ==============================================================================
 LUA CONCEPTS AND IDIOMS                                         *lua-concepts*
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 6f505a958a..4dee958108 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -167,6 +167,7 @@ The following new APIs or features were added.
 • |vim.treesitter.language.add()| as a new replacement for
   `vim.treesitter.language.require_language`.
 
+• `require'bit'` is now always available |lua-bit|
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
-- 
cgit 


From 05de0f4fea237132ff3a9a5a35e9c711c4ece579 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 21 Feb 2023 17:03:04 +0100
Subject: docs(treesitter): fix parse errors

---
 runtime/lua/vim/treesitter.lua              | 4 ++--
 runtime/lua/vim/treesitter/languagetree.lua | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index c1e5325519..c4df5b2d24 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -157,7 +157,7 @@ end
 
 --- Returns the node's range or an unpacked range table
 ---
----@param node_or_range (TSNode|table) Node or table of positions
+---@param node_or_range (TSNode | table) Node or table of positions
 ---
 ---@return integer start_row
 ---@return integer start_col
@@ -339,7 +339,7 @@ end
 ---             - lang string|nil Parser language
 ---             - ignore_injections boolean Ignore injected languages (default true)
 ---
----@return TSNode|nil under the cursor
+---@return TSNode | nil Node at the given position
 ---@deprecated
 function M.get_node_at_pos(bufnr, row, col, opts)
   vim.deprecate('vim.treesitter.get_node_at_pos()', 'vim.treesitter.get_node()', '0.10')
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 81ad83db2c..c9fd4bb2ea 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -653,7 +653,7 @@ end
 ---@param range Range `{ start_line, start_col, end_line, end_col }`
 ---@param opts table|nil Optional keyword arguments:
 ---             - ignore_injections boolean Ignore injected languages (default true)
----@return TSNode|nil Found node
+---@return TSNode | nil Found node
 function LanguageTree:named_node_for_range(range, opts)
   local tree = self:tree_for_range(range, opts)
   if tree then
-- 
cgit 


From 1c37553476f268d08d290dfee1fa3da4135b54b4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 21 Feb 2023 17:00:48 +0100
Subject: test(help): drop treesitter parse error to 0

All parser errors have been fixed; make sure we don't introduce new
ones.
---
 runtime/doc/treesitter.    | 0
 runtime/doc/treesitter.txt | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 runtime/doc/treesitter.

(limited to 'runtime')

diff --git a/runtime/doc/treesitter. b/runtime/doc/treesitter.
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 16de49029e..99fe55b6cb 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -528,7 +528,7 @@ get_node_range({node_or_range})              *vim.treesitter.get_node_range()*
     Returns the node's range or an unpacked range table
 
     Parameters: ~
-      • {node_or_range}  (|TSNode||table) Node or table of positions
+      • {node_or_range}  (|TSNode| | table) Node or table of positions
 
     Return: ~
         (integer) start_row
@@ -1017,7 +1017,7 @@ LanguageTree:named_node_for_range({self}, {range}, {opts})
       • {self}
 
     Return: ~
-        |TSNode||nil Found node
+        |TSNode| | nil Found node
 
 LanguageTree:parse({self})                              *LanguageTree:parse()*
     Parses all defined regions using a treesitter parser for the language this
-- 
cgit 


From 6dfbeb0d990d24657754463c6ab155c19e7f5f56 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 21 Feb 2023 17:39:29 +0100
Subject: docs: fix more treesitter parsing errors

---
 runtime/doc/diagnostic.txt           | 8 ++++----
 runtime/doc/lua-guide.txt            | 2 +-
 runtime/doc/treesitter.              | 0
 runtime/doc/treesitter.txt           | 7 +++----
 runtime/lua/vim/treesitter.lua       | 2 +-
 runtime/lua/vim/treesitter/query.lua | 4 ++--
 6 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 runtime/doc/treesitter.

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index 7066a3739a..c661bf02bf 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -40,15 +40,15 @@ requires a namespace.
 
                                                         *diagnostic-structure*
 A diagnostic is a Lua table with the following keys. Required keys are
-indicated with (*):
+indicated with (+):
 
     bufnr: Buffer number
-    lnum(*): The starting line of the diagnostic
+    lnum(+): The starting line of the diagnostic
     end_lnum: The final line of the diagnostic
-    col(*): The starting column of the diagnostic
+    col(+): The starting column of the diagnostic
     end_col: The final column of the diagnostic
     severity: The severity of the diagnostic |vim.diagnostic.severity|
-    message(*): The diagnostic text
+    message(+): The diagnostic text
     source: The source of the diagnostic
     code: The diagnostic code
     user_data: Arbitrary data plugins or users can add
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 236905a077..8ea84f8c60 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -71,7 +71,7 @@ local keyword are not accessible outside of the command. This won't work:
 <
 You can also use `:lua=`, which is the same as `:lua vim.pretty_print(...)`,
 to conveniently check the value of a variable or a table:
->lua
+>vim
     :lua=package
 <
 To run a Lua script in an external file, you can use the |:source| command
diff --git a/runtime/doc/treesitter. b/runtime/doc/treesitter.
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 99fe55b6cb..3f505e5d19 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -505,8 +505,7 @@ get_captures_at_pos({bufnr}, {row}, {col})
       • {col}    (integer) Position column
 
     Return: ~
-        table[] List of captures `{ capture = "capture name", metadata = { ...
-        } }`
+        table[] List of captures `{ capture = "name", metadata = { ... } }`
 
 get_node({opts})                                   *vim.treesitter.get_node()*
     Returns the smallest named node at the given position
@@ -838,7 +837,7 @@ Query:iter_captures({self}, {node}, {source}, {start}, {stop})
        -- typically useful info about the node:
        local type = node:type() -- type of the captured node
        local row1, col1, row2, col2 = node:range() -- range of the capture
-       ... use the info here ...
+       -- ... use the info here ...
      end
 <
 
@@ -871,7 +870,7 @@ Query:iter_matches({self}, {node}, {source}, {start}, {stop})
 
          local node_data = metadata[id] -- Node level metadata
 
-         ... use the info here ...
+         -- ... use the info here ...
        end
      end
 <
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index c4df5b2d24..44922bbc4d 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -218,7 +218,7 @@ end
 ---@param row integer Position row
 ---@param col integer Position column
 ---
----@return table[] List of captures `{ capture = "capture name", metadata = { ... } }`
+---@return table[] List of captures `{ capture = "name", metadata = { ... } }`
 function M.get_captures_at_pos(bufnr, row, col)
   if bufnr == 0 then
     bufnr = a.nvim_get_current_buf()
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 83910316a6..58a29f2fe0 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -639,7 +639,7 @@ end
 ---   -- typically useful info about the node:
 ---   local type = node:type() -- type of the captured node
 ---   local row1, col1, row2, col2 = node:range() -- range of the capture
----   ... use the info here ...
+---   -- ... use the info here ...
 --- end
 --- </pre>
 ---
@@ -693,7 +693,7 @@ end
 ---
 ---     local node_data = metadata[id] -- Node level metadata
 ---
----     ... use the info here ...
+---     -- ... use the info here ...
 ---   end
 --- end
 --- </pre>
-- 
cgit 


From f140175564001cc1ad84128a0147a5d2f7798a63 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Thu, 23 Feb 2023 13:35:46 +0100
Subject: refactor(lsp): remove workaround for missing bit module (#22373)

---
 runtime/lua/vim/lsp/semantic_tokens.lua | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index b1bc48dac6..00b4757ea9 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -1,6 +1,7 @@
 local api = vim.api
 local handlers = require('vim.lsp.handlers')
 local util = require('vim.lsp.util')
+local bit = require('bit')
 
 --- @class STTokenRange
 --- @field line number line number 0-based
@@ -58,18 +59,10 @@ local function modifiers_from_number(x, modifiers_table)
   local modifiers = {}
   local idx = 1
   while x > 0 do
-    if _G.bit then
-      if _G.bit.band(x, 1) == 1 then
-        modifiers[#modifiers + 1] = modifiers_table[idx]
-      end
-      x = _G.bit.rshift(x, 1)
-    else
-      --TODO(jdrouhard): remove this branch once `bit` module is available for non-LuaJIT (#21222)
-      if x % 2 == 1 then
-        modifiers[#modifiers + 1] = modifiers_table[idx]
-      end
-      x = math.floor(x / 2)
+    if bit.band(x, 1) == 1 then
+      modifiers[#modifiers + 1] = modifiers_table[idx]
     end
+    x = bit.rshift(x, 1)
     idx = idx + 1
   end
 
-- 
cgit 


From 75e53341f37eeeda7d9be7f934249f7e5e4397e9 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 23 Feb 2023 15:19:52 +0000
Subject: perf(treesitter): smarter languagetree invalidation

Problem:
  Treesitter injections are slow because all injected trees are invalidated on every change.

Solution:
    Implement smarter invalidation to avoid reparsing injected regions.

    - In on_bytes, try and update self._regions as best we can. This PR just offsets any regions after the change.
    - Add valid flags for each region in self._regions.
    - Call on_bytes recursively for all children.
       - We still need to run the query every time for the top level tree. I don't know how to avoid this. However, if the new injection ranges don't change, then we re-use the old trees and avoid reparsing children.

This should result in roughly a 2-3x reduction in tree parsing when the comment injections are enabled.
---
 runtime/lua/vim/treesitter/_range.lua       | 126 ++++++++++++++
 runtime/lua/vim/treesitter/languagetree.lua | 249 ++++++++++++++++++----------
 runtime/lua/vim/treesitter/query.lua        |   2 +-
 3 files changed, 290 insertions(+), 87 deletions(-)
 create mode 100644 runtime/lua/vim/treesitter/_range.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
new file mode 100644
index 0000000000..b87542c20f
--- /dev/null
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -0,0 +1,126 @@
+local api = vim.api
+
+local M = {}
+
+---@alias Range4 {[1]: integer, [2]: integer, [3]: integer, [4]: integer}
+---@alias Range6 {[1]: integer, [2]: integer, [3]: integer, [4]: integer, [5]: integer, [6]: integer}
+
+---@private
+---@param a_row integer
+---@param a_col integer
+---@param b_row integer
+---@param b_col integer
+---@return integer
+--- 1: a > b
+--- 0: a == b
+--- -1: a < b
+local function cmp_pos(a_row, a_col, b_row, b_col)
+  if a_row == b_row then
+    if a_col > b_col then
+      return 1
+    elseif a_col < b_col then
+      return -1
+    else
+      return 0
+    end
+  elseif a_row > b_row then
+    return 1
+  end
+
+  return -1
+end
+
+M.cmp_pos = {
+  lt = function(...)
+    return cmp_pos(...) == -1
+  end,
+  le = function(...)
+    return cmp_pos(...) ~= 1
+  end,
+  gt = function(...)
+    return cmp_pos(...) == 1
+  end,
+  ge = function(...)
+    return cmp_pos(...) ~= -1
+  end,
+  eq = function(...)
+    return cmp_pos(...) == 0
+  end,
+  ne = function(...)
+    return cmp_pos(...) ~= 0
+  end,
+}
+
+setmetatable(M.cmp_pos, { __call = cmp_pos })
+
+---@private
+---@param r1 Range4|Range6
+---@param r2 Range4|Range6
+---@return boolean
+function M.intercepts(r1, r2)
+  local off_1 = #r1 == 6 and 1 or 0
+  local off_2 = #r1 == 6 and 1 or 0
+
+  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r2[2], r1[3 + off_1], r1[4 + off_1]
+  local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
+
+  -- r1 is above r2
+  if M.cmp_pos.le(erow_1, ecol_1, srow_2, scol_2) then
+    return false
+  end
+
+  -- r1 is below r2
+  if M.cmp_pos.ge(srow_1, scol_1, erow_2, ecol_2) then
+    return false
+  end
+
+  return true
+end
+
+---@private
+---@param r1 Range4|Range6
+---@param r2 Range4|Range6
+---@return boolean whether r1 contains r2
+function M.contains(r1, r2)
+  local off_1 = #r1 == 6 and 1 or 0
+  local off_2 = #r1 == 6 and 1 or 0
+
+  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r2[2], r1[3 + off_1], r1[4 + off_1]
+  local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
+
+  -- start doesn't fit
+  if M.cmp_pos.gt(srow_1, scol_1, srow_2, scol_2) then
+    return false
+  end
+
+  -- end doesn't fit
+  if M.cmp_pos.lt(erow_1, ecol_1, erow_2, ecol_2) then
+    return false
+  end
+
+  return true
+end
+
+---@private
+---@param source integer|string
+---@param range Range4
+---@return Range6
+function M.add_bytes(source, range)
+  local start_row, start_col, end_row, end_col = range[1], range[2], range[3], range[4]
+  local start_byte = 0
+  local end_byte = 0
+  -- TODO(vigoux): proper byte computation here, and account for EOL ?
+  if type(source) == 'number' then
+    -- Easy case, this is a buffer parser
+    start_byte = api.nvim_buf_get_offset(source, start_row) + start_col
+    end_byte = api.nvim_buf_get_offset(source, end_row) + end_col
+  elseif type(source) == 'string' then
+    -- string parser, single `\n` delimited string
+    start_byte = vim.fn.byteidx(source, start_col)
+    end_byte = vim.fn.byteidx(source, end_col)
+  end
+
+  return { start_row, start_col, start_byte, end_row, end_col, end_byte }
+end
+
+return M
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index c9fd4bb2ea..2d4e2e595b 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -1,9 +1,8 @@
 local a = vim.api
 local query = require('vim.treesitter.query')
 local language = require('vim.treesitter.language')
+local Range = require('vim.treesitter._range')
 
----@alias Range {[1]: integer, [2]: integer, [3]: integer, [4]: integer}
---
 ---@alias TSCallbackName
 ---| 'changedtree'
 ---| 'bytes'
@@ -24,11 +23,13 @@ local language = require('vim.treesitter.language')
 ---@field private _injection_query Query Queries defining injected languages
 ---@field private _opts table Options
 ---@field private _parser TSParser Parser for language
----@field private _regions Range[][] List of regions this tree should manage and parse
+---@field private _regions Range6[][] List of regions this tree should manage and parse
 ---@field private _lang string Language name
 ---@field private _source (integer|string) Buffer or string to parse
 ---@field private _trees TSTree[] Reference to parsed tree (one for each language)
----@field private _valid boolean If the parsed tree is valid
+---@field private _valid boolean|table<integer,true> If the parsed tree is valid
+--- TODO(lewis6991): combine _regions, _valid and _trees
+---@field private _is_child boolean
 local LanguageTree = {}
 
 ---@class LanguageTreeOpts
@@ -114,6 +115,9 @@ end
 --- If the tree is invalid, call `parse()`.
 --- This will return the updated tree.
 function LanguageTree:is_valid()
+  if type(self._valid) == 'table' then
+    return #self._valid == #self._regions
+  end
   return self._valid
 end
 
@@ -127,6 +131,16 @@ function LanguageTree:source()
   return self._source
 end
 
+---@private
+---This is only exposed so it can be wrapped for profiling
+---@param old_tree TSTree
+---@return TSTree, integer[]
+function LanguageTree:_parse_tree(old_tree)
+  local tree, tree_changes = self._parser:parse(old_tree, self._source)
+  self:_do_callback('changedtree', tree_changes, tree)
+  return tree, tree_changes
+end
+
 --- Parses all defined regions using a treesitter parser
 --- for the language this tree represents.
 --- This will run the injection query for this language to
@@ -135,35 +149,27 @@ end
 ---@return TSTree[]
 ---@return table|nil Change list
 function LanguageTree:parse()
-  if self._valid then
+  if self:is_valid() then
     return self._trees
   end
 
-  local parser = self._parser
   local changes = {}
 
-  local old_trees = self._trees
-  self._trees = {}
-
   -- If there are no ranges, set to an empty list
   -- so the included ranges in the parser are cleared.
-  if self._regions and #self._regions > 0 then
+  if #self._regions > 0 then
     for i, ranges in ipairs(self._regions) do
-      local old_tree = old_trees[i]
-      parser:set_included_ranges(ranges)
-
-      local tree, tree_changes = parser:parse(old_tree, self._source)
-      self:_do_callback('changedtree', tree_changes, tree)
-
-      table.insert(self._trees, tree)
-      vim.list_extend(changes, tree_changes)
+      if not self._valid or not self._valid[i] then
+        self._parser:set_included_ranges(ranges)
+        local tree, tree_changes = self:_parse_tree(self._trees[i])
+        self._trees[i] = tree
+        vim.list_extend(changes, tree_changes)
+      end
     end
   else
-    local tree, tree_changes = parser:parse(old_trees[1], self._source)
-    self:_do_callback('changedtree', tree_changes, tree)
-
-    table.insert(self._trees, tree)
-    vim.list_extend(changes, tree_changes)
+    local tree, tree_changes = self:_parse_tree(self._trees[1])
+    self._trees = { tree }
+    changes = tree_changes
   end
 
   local injections_by_lang = self:_get_injections()
@@ -249,6 +255,7 @@ function LanguageTree:add_child(lang)
   end
 
   self._children[lang] = LanguageTree.new(self._source, lang, self._opts)
+  self._children[lang]._is_child = true
 
   self:invalidate()
   self:_do_callback('child_added', self._children[lang])
@@ -298,43 +305,35 @@ end
 --- This allows for embedded languages to be parsed together across different
 --- nodes, which is useful for templating languages like ERB and EJS.
 ---
---- Note: This call invalidates the tree and requires it to be parsed again.
----
 ---@private
----@param regions integer[][][] List of regions this tree should manage and parse.
+---@param regions Range4[][] List of regions this tree should manage and parse.
 function LanguageTree:set_included_regions(regions)
   -- Transform the tables from 4 element long to 6 element long (with byte offset)
   for _, region in ipairs(regions) do
     for i, range in ipairs(region) do
       if type(range) == 'table' and #range == 4 then
-        ---@diagnostic disable-next-line:no-unknown
-        local start_row, start_col, end_row, end_col = unpack(range)
-        local start_byte = 0
-        local end_byte = 0
-        local source = self._source
-        -- TODO(vigoux): proper byte computation here, and account for EOL ?
-        if type(source) == 'number' then
-          -- Easy case, this is a buffer parser
-          start_byte = a.nvim_buf_get_offset(source, start_row) + start_col
-          end_byte = a.nvim_buf_get_offset(source, end_row) + end_col
-        elseif type(self._source) == 'string' then
-          -- string parser, single `\n` delimited string
-          start_byte = vim.fn.byteidx(self._source, start_col)
-          end_byte = vim.fn.byteidx(self._source, end_col)
-        end
+        region[i] = Range.add_bytes(self._source, range)
+      end
+    end
+  end
 
-        region[i] = { start_row, start_col, start_byte, end_row, end_col, end_byte }
+  if #self._regions ~= #regions then
+    self._trees = {}
+    self:invalidate()
+  elseif self._valid ~= false then
+    if self._valid == true then
+      self._valid = {}
+    end
+    for i = 1, #regions do
+      self._valid[i] = true
+      if not vim.deep_equal(self._regions[i], regions[i]) then
+        self._valid[i] = nil
+        self._trees[i] = nil
       end
     end
   end
 
   self._regions = regions
-  -- Trees are no longer valid now that we have changed regions.
-  -- TODO(vigoux,steelsojka): Look into doing this smarter so we can use some of the
-  --                          old trees for incremental parsing. Currently, this only
-  --                          affects injected languages.
-  self._trees = {}
-  self:invalidate()
 end
 
 --- Gets the set of included regions
@@ -346,10 +345,10 @@ end
 ---@param node TSNode
 ---@param id integer
 ---@param metadata TSMetadata
----@return Range
+---@return Range4
 local function get_range_from_metadata(node, id, metadata)
   if metadata[id] and metadata[id].range then
-    return metadata[id].range --[[@as Range]]
+    return metadata[id].range --[[@as Range4]]
   end
   return { node:range() }
 end
@@ -378,7 +377,7 @@ function LanguageTree:_get_injections()
       self._injection_query:iter_matches(root_node, self._source, start_line, end_line + 1)
     do
       local lang = nil ---@type string
-      local ranges = {} ---@type Range[]
+      local ranges = {} ---@type Range4[]
       local combined = metadata.combined ---@type boolean
 
       -- Directives can configure how injections are captured as well as actual node captures.
@@ -408,6 +407,7 @@ function LanguageTree:_get_injections()
 
         -- Lang should override any other language tag
         if name == 'language' and not lang then
+          ---@diagnostic disable-next-line
           lang = query.get_node_text(node, self._source, { metadata = metadata[id] })
         elseif name == 'combined' then
           combined = true
@@ -426,6 +426,8 @@ function LanguageTree:_get_injections()
         end
       end
 
+      assert(type(lang) == 'string')
+
       -- Each tree index should be isolated from the other nodes.
       if not injections[tree_index] then
         injections[tree_index] = {}
@@ -446,7 +448,7 @@ function LanguageTree:_get_injections()
     end
   end
 
-  ---@type table<string,Range[][]>
+  ---@type table<string,Range4[][]>
   local result = {}
 
   -- Generate a map by lang of node lists.
@@ -485,6 +487,45 @@ function LanguageTree:_do_callback(cb_name, ...)
   end
 end
 
+---@private
+---@param regions Range6[][]
+---@param old_range Range6
+---@param new_range Range6
+---@return table<integer, true> region indices to invalidate
+local function update_regions(regions, old_range, new_range)
+  ---@type table<integer,true>
+  local valid = {}
+
+  for i, ranges in ipairs(regions or {}) do
+    valid[i] = true
+    for j, r in ipairs(ranges) do
+      if Range.intercepts(r, old_range) then
+        valid[i] = nil
+        break
+      end
+
+      -- Range after change. Adjust
+      if Range.cmp_pos.gt(r[1], r[2], old_range[4], old_range[5]) then
+        local byte_offset = new_range[6] - old_range[6]
+        local row_offset = new_range[4] - old_range[4]
+
+        -- Update the range to avoid invalidation in set_included_regions()
+        -- which will compare the regions against the parsed injection regions
+        ranges[j] = {
+          r[1] + row_offset,
+          r[2],
+          r[3] + byte_offset,
+          r[4] + row_offset,
+          r[5],
+          r[6] + byte_offset,
+        }
+      end
+    end
+  end
+
+  return valid
+end
+
 ---@private
 ---@param bufnr integer
 ---@param changed_tick integer
@@ -510,14 +551,53 @@ function LanguageTree:_on_bytes(
   new_col,
   new_byte
 )
-  self:invalidate()
-
   local old_end_col = old_col + ((old_row == 0) and start_col or 0)
   local new_end_col = new_col + ((new_row == 0) and start_col or 0)
 
-  -- Edit all trees recursively, together BEFORE emitting a bytes callback.
-  -- In most cases this callback should only be called from the root tree.
-  self:for_each_tree(function(tree)
+  local old_range = {
+    start_row,
+    start_col,
+    start_byte,
+    start_row + old_row,
+    old_end_col,
+    start_byte + old_byte,
+  }
+
+  local new_range = {
+    start_row,
+    start_col,
+    start_byte,
+    start_row + new_row,
+    new_end_col,
+    start_byte + new_byte,
+  }
+
+  local valid_regions = update_regions(self._regions, old_range, new_range)
+
+  if #self._regions == 0 or #valid_regions == 0 then
+    self._valid = false
+  else
+    self._valid = valid_regions
+  end
+
+  for _, child in pairs(self._children) do
+    child:_on_bytes(
+      bufnr,
+      changed_tick,
+      start_row,
+      start_col,
+      start_byte,
+      old_row,
+      old_col,
+      old_byte,
+      new_row,
+      new_col,
+      new_byte
+    )
+  end
+
+  -- Edit trees together BEFORE emitting a bytes callback.
+  for _, tree in ipairs(self._trees) do
     tree:edit(
       start_byte,
       start_byte + old_byte,
@@ -529,22 +609,24 @@ function LanguageTree:_on_bytes(
       start_row + new_row,
       new_end_col
     )
-  end)
+  end
 
-  self:_do_callback(
-    'bytes',
-    bufnr,
-    changed_tick,
-    start_row,
-    start_col,
-    start_byte,
-    old_row,
-    old_col,
-    old_byte,
-    new_row,
-    new_col,
-    new_byte
-  )
+  if not self._is_child then
+    self:_do_callback(
+      'bytes',
+      bufnr,
+      changed_tick,
+      start_row,
+      start_col,
+      start_byte,
+      old_row,
+      old_col,
+      old_byte,
+      new_row,
+      new_col,
+      new_byte
+    )
+  end
 end
 
 ---@private
@@ -595,19 +677,15 @@ end
 
 ---@private
 ---@param tree TSTree
----@param range Range
+---@param range Range4
 ---@return boolean
 local function tree_contains(tree, range)
-  local start_row, start_col, end_row, end_col = tree:root():range()
-  local start_fits = start_row < range[1] or (start_row == range[1] and start_col <= range[2])
-  local end_fits = end_row > range[3] or (end_row == range[3] and end_col >= range[4])
-
-  return start_fits and end_fits
+  return Range.contains({ tree:root():range() }, range)
 end
 
 --- Determines whether {range} is contained in the |LanguageTree|.
 ---
----@param range Range `{ start_line, start_col, end_line, end_col }`
+---@param range Range4 `{ start_line, start_col, end_line, end_col }`
 ---@return boolean
 function LanguageTree:contains(range)
   for _, tree in pairs(self._trees) do
@@ -621,7 +699,7 @@ end
 
 --- Gets the tree that contains {range}.
 ---
----@param range Range `{ start_line, start_col, end_line, end_col }`
+---@param range Range4 `{ start_line, start_col, end_line, end_col }`
 ---@param opts table|nil Optional keyword arguments:
 ---             - ignore_injections boolean Ignore injected languages (default true)
 ---@return TSTree|nil
@@ -631,10 +709,9 @@ function LanguageTree:tree_for_range(range, opts)
 
   if not ignore then
     for _, child in pairs(self._children) do
-      for _, tree in pairs(child:trees()) do
-        if tree_contains(tree, range) then
-          return tree
-        end
+      local tree = child:tree_for_range(range, opts)
+      if tree then
+        return tree
       end
     end
   end
@@ -650,7 +727,7 @@ end
 
 --- Gets the smallest named node that contains {range}.
 ---
----@param range Range `{ start_line, start_col, end_line, end_col }`
+---@param range Range4 `{ start_line, start_col, end_line, end_col }`
 ---@param opts table|nil Optional keyword arguments:
 ---             - ignore_injections boolean Ignore injected languages (default true)
 ---@return TSNode | nil Found node
@@ -663,7 +740,7 @@ end
 
 --- Gets the appropriate language that contains {range}.
 ---
----@param range Range `{ start_line, start_col, end_line, end_col }`
+---@param range Range4 `{ start_line, start_col, end_line, end_col }`
 ---@return LanguageTree Managing {range}
 function LanguageTree:language_for_range(range)
   for _, child in pairs(self._children) do
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 58a29f2fe0..13d98a0625 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -406,7 +406,7 @@ predicate_handlers['vim-match?'] = predicate_handlers['match?']
 ---@class TSMetadata
 ---@field [integer] TSMetadata
 ---@field [string] integer|string
----@field range Range
+---@field range Range4
 
 ---@alias TSDirective fun(match: TSMatch, _, _, predicate: any[], metadata: TSMetadata)
 
-- 
cgit 


From 8c339aa04b2a1ca99a297b2eada8ebc6218f5f1c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 23 Feb 2023 17:52:33 +0100
Subject: vim-patch:9.0.1346: Starlark files are not recognized (#22380)

Problem:    Starlark files are not recognized.
Solution:   Add patterns for Starlark files. (Amaan Qureshi, closes vim/vim#12049)

https://github.com/vim/vim/commit/ca06b30073de22dc120b532e90fbee2a10ef9772

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 0dd2dcfcbe..ae3ad6f628 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -995,6 +995,9 @@ local extension = {
   ssa = 'ssa',
   ass = 'ssa',
   st = 'st',
+  ipd = 'starlark',
+  star = 'starlark',
+  starlark = 'starlark',
   imata = 'stata',
   ['do'] = 'stata',
   mata = 'stata',
-- 
cgit 


From 1df3f5ec6aca24cbe7b78ead5c37ad06a65c84e8 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 23 Feb 2023 17:05:20 +0000
Subject: feat(treesitter): upstream foldexpr from nvim-treesitter

---
 runtime/doc/news.txt                 |   3 +
 runtime/doc/treesitter.txt           |  13 +++
 runtime/lua/vim/treesitter.lua       |  20 ++++
 runtime/lua/vim/treesitter/_fold.lua | 173 +++++++++++++++++++++++++++++++++++
 runtime/queries/c/folds.scm          |  19 ++++
 runtime/queries/lua/folds.scm        |  10 ++
 runtime/queries/vim/folds.scm        |   4 +
 7 files changed, 242 insertions(+)
 create mode 100644 runtime/lua/vim/treesitter/_fold.lua
 create mode 100644 runtime/queries/c/folds.scm
 create mode 100644 runtime/queries/lua/folds.scm
 create mode 100644 runtime/queries/vim/folds.scm

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 4dee958108..23bb6d4343 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -168,6 +168,9 @@ The following new APIs or features were added.
   `vim.treesitter.language.require_language`.
 
 • `require'bit'` is now always available |lua-bit|
+
+• |vim.treesitter.foldexpr()| can be used for 'foldexpr' to use treesitter for folding.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 3f505e5d19..ccb3c445df 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -481,6 +481,19 @@ library.
 ==============================================================================
 Lua module: vim.treesitter                               *lua-treesitter-core*
 
+foldexpr({lnum})                                   *vim.treesitter.foldexpr()*
+    Returns the fold level for {lnum} in the current buffer. Can be set
+    directly to 'foldexpr': >lua
+
+     vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+<
+
+    Parameters: ~
+      • {lnum}  (integer|nil) Line number to calculate fold level for
+
+    Return: ~
+        (string)
+
                                      *vim.treesitter.get_captures_at_cursor()*
 get_captures_at_cursor({winnr})
     Returns a list of highlight capture names under the cursor
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 44922bbc4d..fead7b7b1b 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -115,6 +115,16 @@ function M.get_parser(bufnr, lang, opts)
   return parsers[bufnr]
 end
 
+---@private
+---@param bufnr (integer|nil) Buffer number
+---@return boolean
+function M._has_parser(bufnr)
+  if bufnr == nil or bufnr == 0 then
+    bufnr = a.nvim_get_current_buf()
+  end
+  return parsers[bufnr] ~= nil
+end
+
 --- Returns a string parser
 ---
 ---@param str string Text to parse
@@ -612,4 +622,14 @@ function M.show_tree(opts)
   })
 end
 
+--- Returns the fold level for {lnum} in the current buffer. Can be set directly to 'foldexpr':
+--- <pre>lua
+--- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+--- </pre>
+---@param lnum integer|nil Line number to calculate fold level for
+---@return string
+function M.foldexpr(lnum)
+  return require('vim.treesitter._fold').foldexpr(lnum)
+end
+
 return M
diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
new file mode 100644
index 0000000000..a66cc6d543
--- /dev/null
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -0,0 +1,173 @@
+local api = vim.api
+
+local M = {}
+
+--- Memoizes a function based on the buffer tick of the provided bufnr.
+--- The cache entry is cleared when the buffer is detached to avoid memory leaks.
+---@generic F: function
+---@param fn F fn to memoize, taking the bufnr as first argument
+---@return F
+local function memoize_by_changedtick(fn)
+  ---@type table<integer,{result:any,last_tick:integer}>
+  local cache = {}
+
+  ---@param bufnr integer
+  return function(bufnr, ...)
+    local tick = api.nvim_buf_get_changedtick(bufnr)
+
+    if cache[bufnr] then
+      if cache[bufnr].last_tick == tick then
+        return cache[bufnr].result
+      end
+    else
+      local function detach_handler()
+        cache[bufnr] = nil
+      end
+
+      -- Clean up logic only!
+      api.nvim_buf_attach(bufnr, false, {
+        on_detach = detach_handler,
+        on_reload = detach_handler,
+      })
+    end
+
+    cache[bufnr] = {
+      result = fn(bufnr, ...),
+      last_tick = tick,
+    }
+
+    return cache[bufnr].result
+  end
+end
+
+---@param bufnr integer
+---@param capture string
+---@param query_name string
+---@param callback fun(id: integer, node:TSNode, metadata: TSMetadata)
+local function iter_matches_with_capture(bufnr, capture, query_name, callback)
+  local parser = vim.treesitter.get_parser(bufnr)
+
+  if not parser then
+    return
+  end
+
+  parser:for_each_tree(function(tree, lang_tree)
+    local lang = lang_tree:lang()
+    local query = vim.treesitter.query.get_query(lang, query_name)
+    if query then
+      local root = tree:root()
+      local start, _, stop = root:range()
+      for _, match, metadata in query:iter_matches(root, bufnr, start, stop) do
+        for id, node in pairs(match) do
+          if query.captures[id] == capture then
+            callback(id, node, metadata)
+          end
+        end
+      end
+    end
+  end)
+end
+
+---@private
+--- TODO(lewis6991): copied from languagetree.lua. Consolidate
+---@param node TSNode
+---@param id integer
+---@param metadata TSMetadata
+---@return Range
+local function get_range_from_metadata(node, id, metadata)
+  if metadata[id] and metadata[id].range then
+    return metadata[id].range --[[@as Range]]
+  end
+  return { node:range() }
+end
+
+-- This is cached on buf tick to avoid computing that multiple times
+-- Especially not for every line in the file when `zx` is hit
+---@param bufnr integer
+---@return table<integer,string>
+local folds_levels = memoize_by_changedtick(function(bufnr)
+  local max_fold_level = vim.wo.foldnestmax
+  local function trim_level(level)
+    if level > max_fold_level then
+      return max_fold_level
+    end
+    return level
+  end
+
+  -- start..stop is an inclusive range
+  local start_counts = {} ---@type table<integer,integer>
+  local stop_counts = {} ---@type table<integer,integer>
+
+  local prev_start = -1
+  local prev_stop = -1
+
+  local min_fold_lines = vim.wo.foldminlines
+
+  iter_matches_with_capture(bufnr, 'fold', 'folds', function(id, node, metadata)
+    local range = get_range_from_metadata(node, id, metadata)
+    local start, stop, stop_col = range[1], range[3], range[4]
+
+    if stop_col == 0 then
+      stop = stop - 1
+    end
+
+    local fold_length = stop - start + 1
+
+    -- Fold only multiline nodes that are not exactly the same as previously met folds
+    -- Checking against just the previously found fold is sufficient if nodes
+    -- are returned in preorder or postorder when traversing tree
+    if fold_length > min_fold_lines and not (start == prev_start and stop == prev_stop) then
+      start_counts[start] = (start_counts[start] or 0) + 1
+      stop_counts[stop] = (stop_counts[stop] or 0) + 1
+      prev_start = start
+      prev_stop = stop
+    end
+  end)
+
+  ---@type table<integer,string>
+  local levels = {}
+  local current_level = 0
+
+  -- We now have the list of fold opening and closing, fill the gaps and mark where fold start
+  for lnum = 0, api.nvim_buf_line_count(bufnr) do
+    local last_trimmed_level = trim_level(current_level)
+    current_level = current_level + (start_counts[lnum] or 0)
+    local trimmed_level = trim_level(current_level)
+    current_level = current_level - (stop_counts[lnum] or 0)
+
+    -- Determine if it's the start/end of a fold
+    -- NB: vim's fold-expr interface does not have a mechanism to indicate that
+    -- two (or more) folds start at this line, so it cannot distinguish between
+    --  ( \n ( \n )) \n (( \n ) \n )
+    -- versus
+    --  ( \n ( \n ) \n ( \n ) \n )
+    -- If it did have such a mechanism, (trimmed_level - last_trimmed_level)
+    -- would be the correct number of starts to pass on.
+    local prefix = ''
+    if trimmed_level - last_trimmed_level > 0 then
+      prefix = '>'
+    end
+
+    levels[lnum + 1] = prefix .. tostring(trimmed_level)
+  end
+
+  return levels
+end)
+
+---@param lnum integer|nil
+---@return string
+function M.foldexpr(lnum)
+  lnum = lnum or vim.v.lnum
+  local bufnr = api.nvim_get_current_buf()
+
+  ---@diagnostic disable-next-line:invisible
+  if not vim.treesitter._has_parser(bufnr) or not lnum then
+    return '0'
+  end
+
+  local levels = folds_levels(bufnr) or {}
+
+  return levels[lnum] or '0'
+end
+
+return M
diff --git a/runtime/queries/c/folds.scm b/runtime/queries/c/folds.scm
new file mode 100644
index 0000000000..80c3039b6b
--- /dev/null
+++ b/runtime/queries/c/folds.scm
@@ -0,0 +1,19 @@
+[
+ (for_statement)
+ (if_statement)
+ (while_statement)
+ (switch_statement)
+ (case_statement)
+ (function_definition)
+ (struct_specifier)
+ (enum_specifier)
+ (comment)
+ (preproc_if)
+ (preproc_elif)
+ (preproc_else)
+ (preproc_ifdef)
+ (initializer_list)
+] @fold
+
+ (compound_statement
+  (compound_statement) @fold)
diff --git a/runtime/queries/lua/folds.scm b/runtime/queries/lua/folds.scm
new file mode 100644
index 0000000000..d8f0b42df3
--- /dev/null
+++ b/runtime/queries/lua/folds.scm
@@ -0,0 +1,10 @@
+[
+ (do_statement)
+ (while_statement)
+ (repeat_statement)
+ (if_statement)
+ (for_statement)
+ (function_declaration)
+ (function_definition)
+ (table_constructor)
+] @fold
diff --git a/runtime/queries/vim/folds.scm b/runtime/queries/vim/folds.scm
new file mode 100644
index 0000000000..4c99735836
--- /dev/null
+++ b/runtime/queries/vim/folds.scm
@@ -0,0 +1,4 @@
+[
+ (if_statement)
+ (function_definition)
+] @fold
-- 
cgit 


From 3f35ebb14dd8b1ceeef45c4f42949f14e3b54b88 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 23 Feb 2023 18:09:44 +0000
Subject: fix(treesitter): fixup language invalidation (#22381)

---
 runtime/lua/vim/treesitter/languagetree.lua | 38 +++++++++++++++++++----------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 2d4e2e595b..122496cff3 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -27,7 +27,7 @@ local Range = require('vim.treesitter._range')
 ---@field private _lang string Language name
 ---@field private _source (integer|string) Buffer or string to parse
 ---@field private _trees TSTree[] Reference to parsed tree (one for each language)
----@field private _valid boolean|table<integer,true> If the parsed tree is valid
+---@field private _valid boolean|table<integer,boolean> If the parsed tree is valid
 --- TODO(lewis6991): combine _regions, _valid and _trees
 ---@field private _is_child boolean
 local LanguageTree = {}
@@ -115,10 +115,18 @@ end
 --- If the tree is invalid, call `parse()`.
 --- This will return the updated tree.
 function LanguageTree:is_valid()
-  if type(self._valid) == 'table' then
-    return #self._valid == #self._regions
+  local valid = self._valid
+
+  if type(valid) == 'table' then
+    for _, v in ipairs(valid) do
+      if not v then
+        return false
+      end
+    end
+    return true
   end
-  return self._valid
+
+  return valid
 end
 
 --- Returns a map of language to child tree.
@@ -323,11 +331,17 @@ function LanguageTree:set_included_regions(regions)
   elseif self._valid ~= false then
     if self._valid == true then
       self._valid = {}
+      for i = 1, #regions do
+        self._valid[i] = true
+      end
     end
+
     for i = 1, #regions do
-      self._valid[i] = true
       if not vim.deep_equal(self._regions[i], regions[i]) then
-        self._valid[i] = nil
+        self._valid[i] = false
+      end
+
+      if not self._valid[i] then
         self._trees[i] = nil
       end
     end
@@ -491,16 +505,16 @@ end
 ---@param regions Range6[][]
 ---@param old_range Range6
 ---@param new_range Range6
----@return table<integer, true> region indices to invalidate
+---@return table<integer,boolean> region indices to invalidate
 local function update_regions(regions, old_range, new_range)
-  ---@type table<integer,true>
+  ---@type table<integer,boolean>
   local valid = {}
 
   for i, ranges in ipairs(regions or {}) do
     valid[i] = true
     for j, r in ipairs(ranges) do
       if Range.intercepts(r, old_range) then
-        valid[i] = nil
+        valid[i] = false
         break
       end
 
@@ -572,12 +586,10 @@ function LanguageTree:_on_bytes(
     start_byte + new_byte,
   }
 
-  local valid_regions = update_regions(self._regions, old_range, new_range)
-
-  if #self._regions == 0 or #valid_regions == 0 then
+  if #self._regions == 0 then
     self._valid = false
   else
-    self._valid = valid_regions
+    self._valid = update_regions(self._regions, old_range, new_range)
   end
 
   for _, child in pairs(self._children) do
-- 
cgit 


From 5e1308b7caa89b458cc97d2db956379aa54ed68a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 23 Feb 2023 16:12:01 -0500
Subject: vim-patch:9.0.1348: Un-grammar files are not recognized (#22383)

Problem:    Un-grammar files are not recognized.
Solution:   Add patterns for Un-grammar files. (Amaan Qureshi, closes vim/vim#12034)

https://github.com/vim/vim/commit/44e08c1cf83f5a50f8b21613551304a6651c1161
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index ae3ad6f628..3a68b61914 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1056,6 +1056,7 @@ local extension = {
   uc = 'uc',
   uit = 'uil',
   uil = 'uil',
+  ungram = 'ungrammar',
   sba = 'vb',
   vb = 'vb',
   dsm = 'vb',
-- 
cgit 


From 904d0995837a2569ae640f5253da3dd4569fec6f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 24 Feb 2023 15:03:28 +0800
Subject: vim-patch:8.2.2449: Vim9: flatten() always changes the list type

Problem:    Vim9: flatten() always changes the list type.
Solution:   Disallow using flatten() and add flattennew().

https://github.com/vim/vim/commit/3b690069730805a147d45d92eaca4dc838272d1d

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 8 +++++++-
 runtime/doc/usr_41.txt  | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index af5ba9ab8f..5f279ed09c 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -148,6 +148,8 @@ finddir({name} [, {path} [, {count}]])
 findfile({name} [, {path} [, {count}]])
 				String	find file {name} in {path}
 flatten({list} [, {maxdepth}])	List	flatten {list} up to {maxdepth} levels
+flattennew({list} [, {maxdepth}])
+				List	flatten a copy of {list}
 float2nr({expr})		Number	convert Float {expr} to a Number
 floor({expr})			Float	round {expr} down
 fmod({expr1}, {expr2})		Float	remainder of {expr1} / {expr2}
@@ -2277,7 +2279,7 @@ flatten({list} [, {maxdepth}])					*flatten()*
 		Flatten {list} up to {maxdepth} levels.  Without {maxdepth}
 		the result is a |List| without nesting, as if {maxdepth} is
 		a very large number.
-		The {list} is changed in place, make a copy first if you do
+		The {list} is changed in place, use |flattennew()| if you do
 		not want that.
 								*E900*
 		{maxdepth} means how deep in nested lists changes are made.
@@ -2295,6 +2297,10 @@ flatten({list} [, {maxdepth}])					*flatten()*
 		Can also be used as a |method|: >
 			mylist->flatten()
 <
+flattennew({list} [, {maxdepth}])			*flattennew()*
+		Like |flatten()| but first make a copy of {list}.
+
+
 float2nr({expr})					*float2nr()*
 		Convert {expr} to a Number by omitting the part after the
 		decimal point.
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 910aebae70..27c5927cf9 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -670,6 +670,7 @@ List manipulation:					*list-functions*
 	count()			count number of times a value appears in a List
 	repeat()		repeat a List multiple times
 	flatten()		flatten a List
+	flattennew()		flatten a copy of a List
 
 Dictionary manipulation:				*dict-functions*
 	get()			get an entry without an error for a wrong key
-- 
cgit 


From c57af5d41cd039194dbd9c6fb5b68b377d2a5b59 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 24 Feb 2023 09:50:59 +0000
Subject: feat(treesitter)!: remove silent option from language.add()

Simply use `pcall` if you want to silence an error.
---
 runtime/doc/treesitter.txt                  |  5 -----
 runtime/lua/vim/treesitter/language.lua     | 32 ++++++++++-------------------
 runtime/lua/vim/treesitter/languagetree.lua |  2 +-
 3 files changed, 12 insertions(+), 27 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index ccb3c445df..76cde91920 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -686,11 +686,6 @@ add({lang}, {opts})                            *vim.treesitter.language.add()*
                 • path (string|nil) Optional path the parser is located at
                 • symbol_name (string|nil) Internal symbol name for the
                   language to load
-                • silent (boolean|nil) Don't throw an error if language not
-                  found
-
-    Return: ~
-        (boolean) If the specified language is installed
 
 get_lang({filetype})                      *vim.treesitter.language.get_lang()*
     Parameters: ~
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 8637d7d544..0796383bf5 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -13,11 +13,19 @@ end
 
 ---@deprecated
 function M.require_language(lang, path, silent, symbol_name)
-  return M.add(lang, {
+  local opts = {
     silent = silent,
     path = path,
     symbol_name = symbol_name,
-  })
+  }
+
+  if silent then
+    local installed = pcall(M.add, lang, opts)
+    return installed
+  end
+
+  M.add(lang, opts)
+  return true
 end
 
 ---@class treesitter.RequireLangOpts
@@ -38,20 +46,16 @@ end
 ---                          Defaults to lang.
 ---                        - path (string|nil) Optional path the parser is located at
 ---                        - symbol_name (string|nil) Internal symbol name for the language to load
----                        - silent (boolean|nil) Don't throw an error if language not found
----@return boolean If the specified language is installed
 function M.add(lang, opts)
   ---@cast opts treesitter.RequireLangOpts
   opts = opts or {}
   local path = opts.path
-  local silent = opts.silent
   local filetype = opts.filetype or lang
   local symbol_name = opts.symbol_name
 
   vim.validate({
     lang = { lang, 'string' },
     path = { path, 'string', true },
-    silent = { silent, 'boolean', true },
     symbol_name = { symbol_name, 'string', true },
     filetype = { filetype, { 'string', 'table' }, true },
   })
@@ -64,32 +68,18 @@ function M.add(lang, opts)
 
   if path == nil then
     if not (lang and lang:match('[%w_]+') == lang) then
-      if silent then
-        return false
-      end
       error("'" .. lang .. "' is not a valid language name")
     end
 
     local fname = 'parser/' .. lang .. '.*'
     local paths = a.nvim_get_runtime_file(fname, false)
     if #paths == 0 then
-      if silent then
-        return false
-      end
       error("no parser for '" .. lang .. "' language, see :help treesitter-parsers")
     end
     path = paths[1]
   end
 
-  if silent then
-    if not pcall(vim._ts_add_language, path, lang, symbol_name) then
-      return false
-    end
-  else
-    vim._ts_add_language(path, lang, symbol_name)
-  end
-
-  return true
+  vim._ts_add_language(path, lang, symbol_name)
 end
 
 --- Register a lang to be used for a filetype (or list of filetypes).
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 122496cff3..7ec7bbfa12 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -184,7 +184,7 @@ function LanguageTree:parse()
   local seen_langs = {} ---@type table<string,boolean>
 
   for lang, injection_ranges in pairs(injections_by_lang) do
-    local has_lang = language.add(lang, { silent = true })
+    local has_lang = pcall(language.add, lang)
 
     -- Child language trees should just be ignored if not found, since
     -- they can depend on the text of a node. Intermediate strings
-- 
cgit 


From 1803dadb209b9193ad8673b243091a4602b3a855 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Fri, 24 Feb 2023 19:55:50 +0800
Subject: refactor(lsp): remove deprecated code (#22389)

---
 runtime/lua/vim/lsp.lua | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 0a620e1367..206c7c9b7e 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1294,26 +1294,6 @@ function lsp.start_client(config)
       client.server_capabilities =
         assert(result.capabilities, "initialize result doesn't contain capabilities")
       client.server_capabilities = protocol.resolve_capabilities(client.server_capabilities)
-
-      -- Deprecation wrapper: this will be removed in 0.8
-      local mt = {}
-      mt.__index = function(table, key)
-        if key == 'resolved_capabilities' then
-          vim.notify_once(
-            '[LSP] Accessing client.resolved_capabilities is deprecated, '
-              .. 'update your plugins or configuration to access client.server_capabilities instead.'
-              .. 'The new key/value pairs in server_capabilities directly match those '
-              .. 'defined in the language server protocol',
-            vim.log.levels.WARN
-          )
-          rawset(table, key, protocol._resolve_capabilities_compat(client.server_capabilities))
-          return rawget(table, key)
-        else
-          return rawget(table, key)
-        end
-      end
-      setmetatable(client, mt)
-
       client.supports_method = function(method)
         local required_capability = lsp._request_name_to_capability[method]
         -- if we don't know about the method, assume that the client supports it.
-- 
cgit 


From 4297127f14fa1b9062db7de0d63981887ebed063 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 24 Feb 2023 15:34:52 +0100
Subject: vim-patch:9.0.1350: CPON files are not recognized (#22392)

Problem:    CPON files are not recognized.
Solution:   Add patterns for CPON files. (Amaan Qureshi, closes vim/vim#12053)

https://github.com/vim/vim/commit/c2254764bcada43eea894eb5852a26d5ac5ca8b0

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 3a68b61914..5475f09444 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -242,6 +242,7 @@ local extension = {
   csh = function(path, bufnr)
     return require('vim.filetype.detect').csh(path, bufnr)
   end,
+  cpon = 'cpon',
   moc = 'cpp',
   hh = 'cpp',
   tlh = 'cpp',
-- 
cgit 


From 15cce77b383d0b0bfdaa1415cdde005cc43267d0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 24 Feb 2023 17:50:37 +0100
Subject: vim-patch:9.0.1351: Dhall files are not recognized (#22393)

Problem:    Dhall files are not recognized.
Solution:   Add patterns for Dhall files. (Amaan Qureshi, closes vim/vim#12052)

https://github.com/vim/vim/commit/def5521752abefe12db8cc3111a3b205ad1ac929

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 5475f09444..a4e078fd04 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -296,6 +296,7 @@ local extension = {
   desc = 'desc',
   directory = 'desktop',
   desktop = 'desktop',
+  dhall = 'dhall',
   diff = 'diff',
   rej = 'diff',
   Dockerfile = 'dockerfile',
-- 
cgit 


From 5732aa706c639b3d775573d91d1139f24624629c Mon Sep 17 00:00:00 2001
From: Jon Huhn <nojnhuh@users.noreply.github.com>
Date: Sat, 25 Feb 2023 03:07:18 -0600
Subject: feat(lsp): implement workspace/didChangeWatchedFiles (#21293)

---
 runtime/doc/news.txt                |   3 +
 runtime/lua/vim/_editor.lua         |   1 +
 runtime/lua/vim/_watch.lua          | 174 +++++++++++++++++++++++
 runtime/lua/vim/lsp/_watchfiles.lua | 274 ++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/handlers.lua    |  38 +++--
 runtime/lua/vim/lsp/protocol.lua    |   9 ++
 6 files changed, 490 insertions(+), 9 deletions(-)
 create mode 100644 runtime/lua/vim/_watch.lua
 create mode 100644 runtime/lua/vim/lsp/_watchfiles.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 23bb6d4343..53c2b44c5f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -171,6 +171,9 @@ The following new APIs or features were added.
 
 • |vim.treesitter.foldexpr()| can be used for 'foldexpr' to use treesitter for folding.
 
+• Added support for the `workspace/didChangeWatchedFiles` capability to the
+  LSP client to notify servers of file changes on disk.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 3f27e61810..92444ff550 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -37,6 +37,7 @@ for k, v in pairs({
   health = true,
   fs = true,
   secure = true,
+  _watch = true,
 }) do
   vim._submodules[k] = v
 end
diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
new file mode 100644
index 0000000000..dba1522ec8
--- /dev/null
+++ b/runtime/lua/vim/_watch.lua
@@ -0,0 +1,174 @@
+local M = {}
+
+--- Enumeration describing the types of events watchers will emit.
+M.FileChangeType = vim.tbl_add_reverse_lookup({
+  Created = 1,
+  Changed = 2,
+  Deleted = 3,
+})
+
+---@private
+--- Joins filepath elements by static '/' separator
+---
+---@param ... (string) The path elements.
+local function filepath_join(...)
+  return table.concat({ ... }, '/')
+end
+
+---@private
+--- Stops and closes a libuv |uv_fs_event_t| or |uv_fs_poll_t| handle
+---
+---@param handle (uv_fs_event_t|uv_fs_poll_t) The handle to stop
+local function stop(handle)
+  local _, stop_err = handle:stop()
+  assert(not stop_err, stop_err)
+  local is_closing, close_err = handle:is_closing()
+  assert(not close_err, close_err)
+  if not is_closing then
+    handle:close()
+  end
+end
+
+--- Initializes and starts a |uv_fs_event_t|
+---
+---@param path (string) The path to watch
+---@param opts (table|nil) Additional options
+---     - uvflags (table|nil)
+---                Same flags as accepted by |uv.fs_event_start()|
+---@param callback (function) The function called when new events
+---@returns (function) A function to stop the watch
+function M.watch(path, opts, callback)
+  vim.validate({
+    path = { path, 'string', false },
+    opts = { opts, 'table', true },
+    callback = { callback, 'function', false },
+  })
+
+  path = vim.fs.normalize(path)
+  local uvflags = opts and opts.uvflags or {}
+  local handle, new_err = vim.loop.new_fs_event()
+  assert(not new_err, new_err)
+  local _, start_err = handle:start(path, uvflags, function(err, filename, events)
+    assert(not err, err)
+    local fullpath = path
+    if filename then
+      filename = filename:gsub('\\', '/')
+      fullpath = filepath_join(fullpath, filename)
+    end
+    local change_type = events.change and M.FileChangeType.Changed or 0
+    if events.rename then
+      local _, staterr, staterrname = vim.loop.fs_stat(fullpath)
+      if staterrname == 'ENOENT' then
+        change_type = M.FileChangeType.Deleted
+      else
+        assert(not staterr, staterr)
+        change_type = M.FileChangeType.Created
+      end
+    end
+    callback(fullpath, change_type)
+  end)
+  assert(not start_err, start_err)
+  return function()
+    stop(handle)
+  end
+end
+
+local default_poll_interval_ms = 2000
+
+---@private
+--- Implementation for poll, hiding internally-used parameters.
+---
+---@param watches (table|nil) A tree structure to maintain state for recursive watches.
+---     - handle (uv_fs_poll_t)
+---               The libuv handle
+---     - cancel (function)
+---               A function that cancels the handle and all children's handles
+---     - is_dir (boolean)
+---               Indicates whether the path is a directory (and the poll should
+---               be invoked recursively)
+---     - children (table|nil)
+---               A mapping of directory entry name to its recursive watches
+local function poll_internal(path, opts, callback, watches)
+  path = vim.fs.normalize(path)
+  local interval = opts and opts.interval or default_poll_interval_ms
+  watches = watches or {
+    is_dir = true,
+  }
+
+  if not watches.handle then
+    local poll, new_err = vim.loop.new_fs_poll()
+    assert(not new_err, new_err)
+    watches.handle = poll
+    local _, start_err = poll:start(
+      path,
+      interval,
+      vim.schedule_wrap(function(err)
+        if err == 'ENOENT' then
+          return
+        end
+        assert(not err, err)
+        poll_internal(path, opts, callback, watches)
+        callback(path, M.FileChangeType.Changed)
+      end)
+    )
+    assert(not start_err, start_err)
+    callback(path, M.FileChangeType.Created)
+  end
+
+  watches.cancel = function()
+    if watches.children then
+      for _, w in pairs(watches.children) do
+        w.cancel()
+      end
+    end
+    stop(watches.handle)
+  end
+
+  if watches.is_dir then
+    watches.children = watches.children or {}
+    local exists = {}
+    for name, ftype in vim.fs.dir(path) do
+      exists[name] = true
+      if not watches.children[name] then
+        watches.children[name] = {
+          is_dir = ftype == 'directory',
+        }
+        poll_internal(filepath_join(path, name), opts, callback, watches.children[name])
+      end
+    end
+
+    local newchildren = {}
+    for name, watch in pairs(watches.children) do
+      if exists[name] then
+        newchildren[name] = watch
+      else
+        watch.cancel()
+        watches.children[name] = nil
+        callback(path .. '/' .. name, M.FileChangeType.Deleted)
+      end
+    end
+    watches.children = newchildren
+  end
+
+  return watches.cancel
+end
+
+--- Initializes and starts a |uv_fs_poll_t| recursively watching every file underneath the
+--- directory at path.
+---
+---@param path (string) The path to watch. Must refer to a directory.
+---@param opts (table|nil) Additional options
+---     - interval (number|nil)
+---                Polling interval in ms as passed to |uv.fs_poll_start()|. Defaults to 2000.
+---@param callback (function) The function called when new events
+---@returns (function) A function to stop the watch.
+function M.poll(path, opts, callback)
+  vim.validate({
+    path = { path, 'string', false },
+    opts = { opts, 'table', true },
+    callback = { callback, 'function', false },
+  })
+  return poll_internal(path, opts, callback, nil)
+end
+
+return M
diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
new file mode 100644
index 0000000000..b9268b963c
--- /dev/null
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -0,0 +1,274 @@
+local bit = require('bit')
+local watch = require('vim._watch')
+local protocol = require('vim.lsp.protocol')
+
+local M = {}
+
+---@private
+---Parses the raw pattern into a number of Lua-native patterns.
+---
+---@param pattern string The raw glob pattern
+---@return table A list of Lua patterns. A match with any of them matches the input glob pattern.
+local function parse(pattern)
+  local patterns = { '' }
+
+  local path_sep = '[/\\]'
+  local non_path_sep = '[^/\\]'
+
+  local function append(chunks)
+    local new_patterns = {}
+    for _, p in ipairs(patterns) do
+      for _, chunk in ipairs(chunks) do
+        table.insert(new_patterns, p .. chunk)
+      end
+    end
+    patterns = new_patterns
+  end
+
+  local function split(s, sep)
+    local segments = {}
+    local segment = ''
+    local in_braces = false
+    local in_brackets = false
+    for i = 1, #s do
+      local c = string.sub(s, i, i)
+      if c == sep and not in_braces and not in_brackets then
+        table.insert(segments, segment)
+        segment = ''
+      else
+        if c == '{' then
+          in_braces = true
+        elseif c == '}' then
+          in_braces = false
+        elseif c == '[' then
+          in_brackets = true
+        elseif c == ']' then
+          in_brackets = false
+        end
+        segment = segment .. c
+      end
+    end
+    if segment ~= '' then
+      table.insert(segments, segment)
+    end
+    return segments
+  end
+
+  local function escape(c)
+    if
+      c == '?'
+      or c == '.'
+      or c == '('
+      or c == ')'
+      or c == '%'
+      or c == '['
+      or c == ']'
+      or c == '*'
+      or c == '+'
+      or c == '-'
+    then
+      return '%' .. c
+    end
+    return c
+  end
+
+  local segments = split(pattern, '/')
+  for i, segment in ipairs(segments) do
+    local last_seg = i == #segments
+    if segment == '**' then
+      local chunks = {
+        path_sep .. '-',
+        '.-' .. path_sep,
+      }
+      if last_seg then
+        chunks = { '.-' }
+      end
+      append(chunks)
+    else
+      local in_braces = false
+      local brace_val = ''
+      local in_brackets = false
+      local bracket_val = ''
+      for j = 1, #segment do
+        local char = string.sub(segment, j, j)
+        if char ~= '}' and in_braces then
+          brace_val = brace_val .. char
+        else
+          if in_brackets and (char ~= ']' or bracket_val == '') then
+            local res
+            if char == '-' then
+              res = char
+            elseif bracket_val == '' and char == '!' then
+              res = '^'
+            elseif char == '/' then
+              res = ''
+            else
+              res = escape(char)
+            end
+            bracket_val = bracket_val .. res
+          else
+            if char == '{' then
+              in_braces = true
+            elseif char == '[' then
+              in_brackets = true
+            elseif char == '}' then
+              local choices = split(brace_val, ',')
+              local parsed_choices = {}
+              for _, choice in ipairs(choices) do
+                table.insert(parsed_choices, parse(choice))
+              end
+              append(vim.tbl_flatten(parsed_choices))
+              in_braces = false
+              brace_val = ''
+            elseif char == ']' then
+              append({ '[' .. bracket_val .. ']' })
+              in_brackets = false
+              bracket_val = ''
+            elseif char == '?' then
+              append({ non_path_sep })
+            elseif char == '*' then
+              append({ non_path_sep .. '-' })
+            else
+              append({ escape(char) })
+            end
+          end
+        end
+      end
+
+      if not last_seg and (segments[i + 1] ~= '**' or i + 1 < #segments) then
+        append({ path_sep })
+      end
+    end
+  end
+
+  return patterns
+end
+
+---@private
+--- Implementation of LSP 3.17.0's pattern matching: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#pattern
+--- Modeled after VSCode's implementation: https://github.com/microsoft/vscode/blob/0319eed971719ad48e9093daba9d65a5013ec5ab/src/vs/base/common/glob.ts#L509
+---
+---@param pattern string|table The glob pattern (raw or parsed) to match.
+---@param s string The string to match against pattern.
+---@return boolean Whether or not pattern matches s.
+function M._match(pattern, s)
+  if type(pattern) == 'string' then
+    pattern = parse(pattern)
+  end
+  -- Since Lua's built-in string pattern matching does not have an alternate
+  -- operator like '|', `parse` will construct one pattern for each possible
+  -- alternative. Any pattern that matches thus matches the glob.
+  for _, p in ipairs(pattern) do
+    if s:match('^' .. p .. '$') then
+      return true
+    end
+  end
+  return false
+end
+
+M._watchfunc = (vim.fn.has('win32') == 1 or vim.fn.has('mac') == 1) and watch.watch or watch.poll
+
+---@type table<number, table<number, function()>> client id -> registration id -> cancel function
+local cancels = vim.defaulttable()
+
+local queue_timeout_ms = 100
+---@type table<number, uv_timer_t> client id -> libuv timer which will send queued changes at its timeout
+local queue_timers = {}
+---@type table<number, lsp.FileEvent[]> client id -> set of queued changes to send in a single LSP notification
+local change_queues = {}
+---@type table<number, table<string, lsp.FileChangeType>> client id -> URI -> last type of change processed
+--- Used to prune consecutive events of the same type for the same file
+local change_cache = vim.defaulttable()
+
+local to_lsp_change_type = {
+  [watch.FileChangeType.Created] = protocol.FileChangeType.Created,
+  [watch.FileChangeType.Changed] = protocol.FileChangeType.Changed,
+  [watch.FileChangeType.Deleted] = protocol.FileChangeType.Deleted,
+}
+
+--- Registers the workspace/didChangeWatchedFiles capability dynamically.
+---
+---@param reg table LSP Registration object.
+---@param ctx table Context from the |lsp-handler|.
+function M.register(reg, ctx)
+  local client_id = ctx.client_id
+  local client = vim.lsp.get_client_by_id(client_id)
+  for _, w in ipairs(reg.registerOptions.watchers) do
+    local glob_patterns = {}
+    if type(w.globPattern) == 'string' then
+      for _, folder in ipairs(client.workspace_folders) do
+        table.insert(glob_patterns, { baseUri = folder.uri, pattern = w.globPattern })
+      end
+    else
+      table.insert(glob_patterns, w.globPattern)
+    end
+    for _, glob_pattern in ipairs(glob_patterns) do
+      local pattern = parse(glob_pattern.pattern)
+      local base_dir = nil
+      if type(glob_pattern.baseUri) == 'string' then
+        base_dir = glob_pattern.baseUri
+      elseif type(glob_pattern.baseUri) == 'table' then
+        base_dir = glob_pattern.baseUri.uri
+      end
+      assert(base_dir, "couldn't identify root of watch")
+      base_dir = vim.uri_to_fname(base_dir)
+      local kind = w.kind
+        or protocol.WatchKind.Create + protocol.WatchKind.Change + protocol.WatchKind.Delete
+
+      table.insert(
+        cancels[client_id][reg.id],
+        M._watchfunc(base_dir, { uvflags = { recursive = true } }, function(fullpath, change_type)
+          change_type = to_lsp_change_type[change_type]
+          -- e.g. match kind with Delete bit (0b0100) to Delete change_type (3)
+          local kind_mask = bit.lshift(1, change_type - 1)
+          local change_type_match = bit.band(kind, kind_mask) == kind_mask
+          if not M._match(pattern, fullpath) or not change_type_match then
+            return
+          end
+
+          local change = {
+            uri = vim.uri_from_fname(fullpath),
+            type = change_type,
+          }
+
+          local last_type = change_cache[client_id][change.uri]
+          if last_type ~= change.type then
+            change_queues[client_id] = change_queues[client_id] or {}
+            table.insert(change_queues[client_id], change)
+            change_cache[client_id][change.uri] = change.type
+          end
+
+          if not queue_timers[client_id] then
+            queue_timers[client_id] = vim.defer_fn(function()
+              client.notify('workspace/didChangeWatchedFiles', {
+                changes = change_queues[client_id],
+              })
+              queue_timers[client_id] = nil
+              change_queues[client_id] = nil
+              change_cache[client_id] = nil
+            end, queue_timeout_ms)
+          end
+        end)
+      )
+    end
+  end
+end
+
+--- Unregisters the workspace/didChangeWatchedFiles capability dynamically.
+---
+---@param unreg table LSP Unregistration object.
+---@param ctx table Context from the |lsp-handler|.
+function M.unregister(unreg, ctx)
+  local client_id = ctx.client_id
+  local client_cancels = cancels[client_id]
+  local reg_cancels = client_cancels[unreg.id]
+  while #reg_cancels > 0 do
+    table.remove(reg_cancels)()
+  end
+  client_cancels[unreg.id] = nil
+  if not next(cancels[client_id]) then
+    cancels[client_id] = nil
+  end
+end
+
+return M
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 5096100a60..ee5b63d260 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -117,15 +117,35 @@ M['window/showMessageRequest'] = function(_, result)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_registerCapability
-M['client/registerCapability'] = function(_, _, ctx)
-  local client_id = ctx.client_id
-  local warning_tpl = 'The language server %s triggers a registerCapability '
-    .. 'handler despite dynamicRegistration set to false. '
-    .. 'Report upstream, this warning is harmless'
-  local client = vim.lsp.get_client_by_id(client_id)
-  local client_name = client and client.name or string.format('id=%d', client_id)
-  local warning = string.format(warning_tpl, client_name)
-  log.warn(warning)
+M['client/registerCapability'] = function(_, result, ctx)
+  local log_unsupported = false
+  for _, reg in ipairs(result.registrations) do
+    if reg.method == 'workspace/didChangeWatchedFiles' then
+      require('vim.lsp._watchfiles').register(reg, ctx)
+    else
+      log_unsupported = true
+    end
+  end
+  if log_unsupported then
+    local client_id = ctx.client_id
+    local warning_tpl = 'The language server %s triggers a registerCapability '
+      .. 'handler despite dynamicRegistration set to false. '
+      .. 'Report upstream, this warning is harmless'
+    local client = vim.lsp.get_client_by_id(client_id)
+    local client_name = client and client.name or string.format('id=%d', client_id)
+    local warning = string.format(warning_tpl, client_name)
+    log.warn(warning)
+  end
+  return vim.NIL
+end
+
+--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_unregisterCapability
+M['client/unregisterCapability'] = function(_, result, ctx)
+  for _, unreg in ipairs(result.unregisterations) do
+    if unreg.method == 'workspace/didChangeWatchedFiles' then
+      require('vim.lsp._watchfiles').unregister(unreg, ctx)
+    end
+  end
   return vim.NIL
 end
 
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 12345b6c8c..df1ab26667 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -28,6 +28,10 @@ end
 ---@class lsp.MessageActionItem
 ---@field title string
 
+---@class lsp.FileEvent
+---@field uri string
+---@field type lsp.FileChangeType
+
 local constants = {
   DiagnosticSeverity = {
     -- Reports an error.
@@ -60,6 +64,7 @@ local constants = {
   },
 
   -- The file event type.
+  ---@enum lsp.FileChangeType
   FileChangeType = {
     -- The file got created.
     Created = 1,
@@ -841,6 +846,10 @@ function protocol.make_client_capabilities()
       semanticTokens = {
         refreshSupport = true,
       },
+      didChangeWatchedFiles = {
+        dynamicRegistration = true,
+        relativePatternSupport = true,
+      },
     },
     experimental = nil,
     window = {
-- 
cgit 


From f0f27e9aef7c237dd55fbb5c2cd47c2f42d01742 Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Sat, 25 Feb 2023 11:17:28 +0100
Subject: Revert "feat(lsp): implement workspace/didChangeWatchedFiles
 (#21293)"

This reverts commit 5732aa706c639b3d775573d91d1139f24624629c.

Causes editor to freeze in projects with many watcher registrations
---
 runtime/doc/news.txt                |   3 -
 runtime/lua/vim/_editor.lua         |   1 -
 runtime/lua/vim/_watch.lua          | 174 -----------------------
 runtime/lua/vim/lsp/_watchfiles.lua | 274 ------------------------------------
 runtime/lua/vim/lsp/handlers.lua    |  38 ++---
 runtime/lua/vim/lsp/protocol.lua    |   9 --
 6 files changed, 9 insertions(+), 490 deletions(-)
 delete mode 100644 runtime/lua/vim/_watch.lua
 delete mode 100644 runtime/lua/vim/lsp/_watchfiles.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 53c2b44c5f..23bb6d4343 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -171,9 +171,6 @@ The following new APIs or features were added.
 
 • |vim.treesitter.foldexpr()| can be used for 'foldexpr' to use treesitter for folding.
 
-• Added support for the `workspace/didChangeWatchedFiles` capability to the
-  LSP client to notify servers of file changes on disk.
-
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 92444ff550..3f27e61810 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -37,7 +37,6 @@ for k, v in pairs({
   health = true,
   fs = true,
   secure = true,
-  _watch = true,
 }) do
   vim._submodules[k] = v
 end
diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
deleted file mode 100644
index dba1522ec8..0000000000
--- a/runtime/lua/vim/_watch.lua
+++ /dev/null
@@ -1,174 +0,0 @@
-local M = {}
-
---- Enumeration describing the types of events watchers will emit.
-M.FileChangeType = vim.tbl_add_reverse_lookup({
-  Created = 1,
-  Changed = 2,
-  Deleted = 3,
-})
-
----@private
---- Joins filepath elements by static '/' separator
----
----@param ... (string) The path elements.
-local function filepath_join(...)
-  return table.concat({ ... }, '/')
-end
-
----@private
---- Stops and closes a libuv |uv_fs_event_t| or |uv_fs_poll_t| handle
----
----@param handle (uv_fs_event_t|uv_fs_poll_t) The handle to stop
-local function stop(handle)
-  local _, stop_err = handle:stop()
-  assert(not stop_err, stop_err)
-  local is_closing, close_err = handle:is_closing()
-  assert(not close_err, close_err)
-  if not is_closing then
-    handle:close()
-  end
-end
-
---- Initializes and starts a |uv_fs_event_t|
----
----@param path (string) The path to watch
----@param opts (table|nil) Additional options
----     - uvflags (table|nil)
----                Same flags as accepted by |uv.fs_event_start()|
----@param callback (function) The function called when new events
----@returns (function) A function to stop the watch
-function M.watch(path, opts, callback)
-  vim.validate({
-    path = { path, 'string', false },
-    opts = { opts, 'table', true },
-    callback = { callback, 'function', false },
-  })
-
-  path = vim.fs.normalize(path)
-  local uvflags = opts and opts.uvflags or {}
-  local handle, new_err = vim.loop.new_fs_event()
-  assert(not new_err, new_err)
-  local _, start_err = handle:start(path, uvflags, function(err, filename, events)
-    assert(not err, err)
-    local fullpath = path
-    if filename then
-      filename = filename:gsub('\\', '/')
-      fullpath = filepath_join(fullpath, filename)
-    end
-    local change_type = events.change and M.FileChangeType.Changed or 0
-    if events.rename then
-      local _, staterr, staterrname = vim.loop.fs_stat(fullpath)
-      if staterrname == 'ENOENT' then
-        change_type = M.FileChangeType.Deleted
-      else
-        assert(not staterr, staterr)
-        change_type = M.FileChangeType.Created
-      end
-    end
-    callback(fullpath, change_type)
-  end)
-  assert(not start_err, start_err)
-  return function()
-    stop(handle)
-  end
-end
-
-local default_poll_interval_ms = 2000
-
----@private
---- Implementation for poll, hiding internally-used parameters.
----
----@param watches (table|nil) A tree structure to maintain state for recursive watches.
----     - handle (uv_fs_poll_t)
----               The libuv handle
----     - cancel (function)
----               A function that cancels the handle and all children's handles
----     - is_dir (boolean)
----               Indicates whether the path is a directory (and the poll should
----               be invoked recursively)
----     - children (table|nil)
----               A mapping of directory entry name to its recursive watches
-local function poll_internal(path, opts, callback, watches)
-  path = vim.fs.normalize(path)
-  local interval = opts and opts.interval or default_poll_interval_ms
-  watches = watches or {
-    is_dir = true,
-  }
-
-  if not watches.handle then
-    local poll, new_err = vim.loop.new_fs_poll()
-    assert(not new_err, new_err)
-    watches.handle = poll
-    local _, start_err = poll:start(
-      path,
-      interval,
-      vim.schedule_wrap(function(err)
-        if err == 'ENOENT' then
-          return
-        end
-        assert(not err, err)
-        poll_internal(path, opts, callback, watches)
-        callback(path, M.FileChangeType.Changed)
-      end)
-    )
-    assert(not start_err, start_err)
-    callback(path, M.FileChangeType.Created)
-  end
-
-  watches.cancel = function()
-    if watches.children then
-      for _, w in pairs(watches.children) do
-        w.cancel()
-      end
-    end
-    stop(watches.handle)
-  end
-
-  if watches.is_dir then
-    watches.children = watches.children or {}
-    local exists = {}
-    for name, ftype in vim.fs.dir(path) do
-      exists[name] = true
-      if not watches.children[name] then
-        watches.children[name] = {
-          is_dir = ftype == 'directory',
-        }
-        poll_internal(filepath_join(path, name), opts, callback, watches.children[name])
-      end
-    end
-
-    local newchildren = {}
-    for name, watch in pairs(watches.children) do
-      if exists[name] then
-        newchildren[name] = watch
-      else
-        watch.cancel()
-        watches.children[name] = nil
-        callback(path .. '/' .. name, M.FileChangeType.Deleted)
-      end
-    end
-    watches.children = newchildren
-  end
-
-  return watches.cancel
-end
-
---- Initializes and starts a |uv_fs_poll_t| recursively watching every file underneath the
---- directory at path.
----
----@param path (string) The path to watch. Must refer to a directory.
----@param opts (table|nil) Additional options
----     - interval (number|nil)
----                Polling interval in ms as passed to |uv.fs_poll_start()|. Defaults to 2000.
----@param callback (function) The function called when new events
----@returns (function) A function to stop the watch.
-function M.poll(path, opts, callback)
-  vim.validate({
-    path = { path, 'string', false },
-    opts = { opts, 'table', true },
-    callback = { callback, 'function', false },
-  })
-  return poll_internal(path, opts, callback, nil)
-end
-
-return M
diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
deleted file mode 100644
index b9268b963c..0000000000
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ /dev/null
@@ -1,274 +0,0 @@
-local bit = require('bit')
-local watch = require('vim._watch')
-local protocol = require('vim.lsp.protocol')
-
-local M = {}
-
----@private
----Parses the raw pattern into a number of Lua-native patterns.
----
----@param pattern string The raw glob pattern
----@return table A list of Lua patterns. A match with any of them matches the input glob pattern.
-local function parse(pattern)
-  local patterns = { '' }
-
-  local path_sep = '[/\\]'
-  local non_path_sep = '[^/\\]'
-
-  local function append(chunks)
-    local new_patterns = {}
-    for _, p in ipairs(patterns) do
-      for _, chunk in ipairs(chunks) do
-        table.insert(new_patterns, p .. chunk)
-      end
-    end
-    patterns = new_patterns
-  end
-
-  local function split(s, sep)
-    local segments = {}
-    local segment = ''
-    local in_braces = false
-    local in_brackets = false
-    for i = 1, #s do
-      local c = string.sub(s, i, i)
-      if c == sep and not in_braces and not in_brackets then
-        table.insert(segments, segment)
-        segment = ''
-      else
-        if c == '{' then
-          in_braces = true
-        elseif c == '}' then
-          in_braces = false
-        elseif c == '[' then
-          in_brackets = true
-        elseif c == ']' then
-          in_brackets = false
-        end
-        segment = segment .. c
-      end
-    end
-    if segment ~= '' then
-      table.insert(segments, segment)
-    end
-    return segments
-  end
-
-  local function escape(c)
-    if
-      c == '?'
-      or c == '.'
-      or c == '('
-      or c == ')'
-      or c == '%'
-      or c == '['
-      or c == ']'
-      or c == '*'
-      or c == '+'
-      or c == '-'
-    then
-      return '%' .. c
-    end
-    return c
-  end
-
-  local segments = split(pattern, '/')
-  for i, segment in ipairs(segments) do
-    local last_seg = i == #segments
-    if segment == '**' then
-      local chunks = {
-        path_sep .. '-',
-        '.-' .. path_sep,
-      }
-      if last_seg then
-        chunks = { '.-' }
-      end
-      append(chunks)
-    else
-      local in_braces = false
-      local brace_val = ''
-      local in_brackets = false
-      local bracket_val = ''
-      for j = 1, #segment do
-        local char = string.sub(segment, j, j)
-        if char ~= '}' and in_braces then
-          brace_val = brace_val .. char
-        else
-          if in_brackets and (char ~= ']' or bracket_val == '') then
-            local res
-            if char == '-' then
-              res = char
-            elseif bracket_val == '' and char == '!' then
-              res = '^'
-            elseif char == '/' then
-              res = ''
-            else
-              res = escape(char)
-            end
-            bracket_val = bracket_val .. res
-          else
-            if char == '{' then
-              in_braces = true
-            elseif char == '[' then
-              in_brackets = true
-            elseif char == '}' then
-              local choices = split(brace_val, ',')
-              local parsed_choices = {}
-              for _, choice in ipairs(choices) do
-                table.insert(parsed_choices, parse(choice))
-              end
-              append(vim.tbl_flatten(parsed_choices))
-              in_braces = false
-              brace_val = ''
-            elseif char == ']' then
-              append({ '[' .. bracket_val .. ']' })
-              in_brackets = false
-              bracket_val = ''
-            elseif char == '?' then
-              append({ non_path_sep })
-            elseif char == '*' then
-              append({ non_path_sep .. '-' })
-            else
-              append({ escape(char) })
-            end
-          end
-        end
-      end
-
-      if not last_seg and (segments[i + 1] ~= '**' or i + 1 < #segments) then
-        append({ path_sep })
-      end
-    end
-  end
-
-  return patterns
-end
-
----@private
---- Implementation of LSP 3.17.0's pattern matching: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#pattern
---- Modeled after VSCode's implementation: https://github.com/microsoft/vscode/blob/0319eed971719ad48e9093daba9d65a5013ec5ab/src/vs/base/common/glob.ts#L509
----
----@param pattern string|table The glob pattern (raw or parsed) to match.
----@param s string The string to match against pattern.
----@return boolean Whether or not pattern matches s.
-function M._match(pattern, s)
-  if type(pattern) == 'string' then
-    pattern = parse(pattern)
-  end
-  -- Since Lua's built-in string pattern matching does not have an alternate
-  -- operator like '|', `parse` will construct one pattern for each possible
-  -- alternative. Any pattern that matches thus matches the glob.
-  for _, p in ipairs(pattern) do
-    if s:match('^' .. p .. '$') then
-      return true
-    end
-  end
-  return false
-end
-
-M._watchfunc = (vim.fn.has('win32') == 1 or vim.fn.has('mac') == 1) and watch.watch or watch.poll
-
----@type table<number, table<number, function()>> client id -> registration id -> cancel function
-local cancels = vim.defaulttable()
-
-local queue_timeout_ms = 100
----@type table<number, uv_timer_t> client id -> libuv timer which will send queued changes at its timeout
-local queue_timers = {}
----@type table<number, lsp.FileEvent[]> client id -> set of queued changes to send in a single LSP notification
-local change_queues = {}
----@type table<number, table<string, lsp.FileChangeType>> client id -> URI -> last type of change processed
---- Used to prune consecutive events of the same type for the same file
-local change_cache = vim.defaulttable()
-
-local to_lsp_change_type = {
-  [watch.FileChangeType.Created] = protocol.FileChangeType.Created,
-  [watch.FileChangeType.Changed] = protocol.FileChangeType.Changed,
-  [watch.FileChangeType.Deleted] = protocol.FileChangeType.Deleted,
-}
-
---- Registers the workspace/didChangeWatchedFiles capability dynamically.
----
----@param reg table LSP Registration object.
----@param ctx table Context from the |lsp-handler|.
-function M.register(reg, ctx)
-  local client_id = ctx.client_id
-  local client = vim.lsp.get_client_by_id(client_id)
-  for _, w in ipairs(reg.registerOptions.watchers) do
-    local glob_patterns = {}
-    if type(w.globPattern) == 'string' then
-      for _, folder in ipairs(client.workspace_folders) do
-        table.insert(glob_patterns, { baseUri = folder.uri, pattern = w.globPattern })
-      end
-    else
-      table.insert(glob_patterns, w.globPattern)
-    end
-    for _, glob_pattern in ipairs(glob_patterns) do
-      local pattern = parse(glob_pattern.pattern)
-      local base_dir = nil
-      if type(glob_pattern.baseUri) == 'string' then
-        base_dir = glob_pattern.baseUri
-      elseif type(glob_pattern.baseUri) == 'table' then
-        base_dir = glob_pattern.baseUri.uri
-      end
-      assert(base_dir, "couldn't identify root of watch")
-      base_dir = vim.uri_to_fname(base_dir)
-      local kind = w.kind
-        or protocol.WatchKind.Create + protocol.WatchKind.Change + protocol.WatchKind.Delete
-
-      table.insert(
-        cancels[client_id][reg.id],
-        M._watchfunc(base_dir, { uvflags = { recursive = true } }, function(fullpath, change_type)
-          change_type = to_lsp_change_type[change_type]
-          -- e.g. match kind with Delete bit (0b0100) to Delete change_type (3)
-          local kind_mask = bit.lshift(1, change_type - 1)
-          local change_type_match = bit.band(kind, kind_mask) == kind_mask
-          if not M._match(pattern, fullpath) or not change_type_match then
-            return
-          end
-
-          local change = {
-            uri = vim.uri_from_fname(fullpath),
-            type = change_type,
-          }
-
-          local last_type = change_cache[client_id][change.uri]
-          if last_type ~= change.type then
-            change_queues[client_id] = change_queues[client_id] or {}
-            table.insert(change_queues[client_id], change)
-            change_cache[client_id][change.uri] = change.type
-          end
-
-          if not queue_timers[client_id] then
-            queue_timers[client_id] = vim.defer_fn(function()
-              client.notify('workspace/didChangeWatchedFiles', {
-                changes = change_queues[client_id],
-              })
-              queue_timers[client_id] = nil
-              change_queues[client_id] = nil
-              change_cache[client_id] = nil
-            end, queue_timeout_ms)
-          end
-        end)
-      )
-    end
-  end
-end
-
---- Unregisters the workspace/didChangeWatchedFiles capability dynamically.
----
----@param unreg table LSP Unregistration object.
----@param ctx table Context from the |lsp-handler|.
-function M.unregister(unreg, ctx)
-  local client_id = ctx.client_id
-  local client_cancels = cancels[client_id]
-  local reg_cancels = client_cancels[unreg.id]
-  while #reg_cancels > 0 do
-    table.remove(reg_cancels)()
-  end
-  client_cancels[unreg.id] = nil
-  if not next(cancels[client_id]) then
-    cancels[client_id] = nil
-  end
-end
-
-return M
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index ee5b63d260..5096100a60 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -117,35 +117,15 @@ M['window/showMessageRequest'] = function(_, result)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_registerCapability
-M['client/registerCapability'] = function(_, result, ctx)
-  local log_unsupported = false
-  for _, reg in ipairs(result.registrations) do
-    if reg.method == 'workspace/didChangeWatchedFiles' then
-      require('vim.lsp._watchfiles').register(reg, ctx)
-    else
-      log_unsupported = true
-    end
-  end
-  if log_unsupported then
-    local client_id = ctx.client_id
-    local warning_tpl = 'The language server %s triggers a registerCapability '
-      .. 'handler despite dynamicRegistration set to false. '
-      .. 'Report upstream, this warning is harmless'
-    local client = vim.lsp.get_client_by_id(client_id)
-    local client_name = client and client.name or string.format('id=%d', client_id)
-    local warning = string.format(warning_tpl, client_name)
-    log.warn(warning)
-  end
-  return vim.NIL
-end
-
---see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_unregisterCapability
-M['client/unregisterCapability'] = function(_, result, ctx)
-  for _, unreg in ipairs(result.unregisterations) do
-    if unreg.method == 'workspace/didChangeWatchedFiles' then
-      require('vim.lsp._watchfiles').unregister(unreg, ctx)
-    end
-  end
+M['client/registerCapability'] = function(_, _, ctx)
+  local client_id = ctx.client_id
+  local warning_tpl = 'The language server %s triggers a registerCapability '
+    .. 'handler despite dynamicRegistration set to false. '
+    .. 'Report upstream, this warning is harmless'
+  local client = vim.lsp.get_client_by_id(client_id)
+  local client_name = client and client.name or string.format('id=%d', client_id)
+  local warning = string.format(warning_tpl, client_name)
+  log.warn(warning)
   return vim.NIL
 end
 
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index df1ab26667..12345b6c8c 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -28,10 +28,6 @@ end
 ---@class lsp.MessageActionItem
 ---@field title string
 
----@class lsp.FileEvent
----@field uri string
----@field type lsp.FileChangeType
-
 local constants = {
   DiagnosticSeverity = {
     -- Reports an error.
@@ -64,7 +60,6 @@ local constants = {
   },
 
   -- The file event type.
-  ---@enum lsp.FileChangeType
   FileChangeType = {
     -- The file got created.
     Created = 1,
@@ -846,10 +841,6 @@ function protocol.make_client_capabilities()
       semanticTokens = {
         refreshSupport = true,
       },
-      didChangeWatchedFiles = {
-        dynamicRegistration = true,
-        relativePatternSupport = true,
-      },
     },
     experimental = nil,
     window = {
-- 
cgit 


From c1514d7e6762ed62dee027ecc29bafd4aae2206e Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sat, 25 Feb 2023 18:47:05 +0100
Subject: fix(lsp): fix some type annotations (#22397)

---
 runtime/doc/lsp.txt              | 37 ++++++++-------
 runtime/lua/vim/lsp.lua          | 97 +++++++++++++++++++---------------------
 runtime/lua/vim/lsp/protocol.lua |  9 +---
 runtime/lua/vim/lsp/rpc.lua      |  8 ++--
 runtime/lua/vim/lsp/types.lua    | 20 +++++++++
 5 files changed, 92 insertions(+), 79 deletions(-)
 create mode 100644 runtime/lua/vim/lsp/types.lua

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 215515a2d9..3b5a434eff 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -569,7 +569,7 @@ buf_notify({bufnr}, {method}, {params})                 *vim.lsp.buf_notify()*
       • {params}  (any) Arguments to send to the server
 
     Return: ~
-        true if any client returns true; false otherwise
+        (boolean) success true if any client returns true; false otherwise
 
                                                    *vim.lsp.buf_request_all()*
 buf_request_all({bufnr}, {method}, {params}, {callback})
@@ -582,11 +582,13 @@ buf_request_all({bufnr}, {method}, {params}, {callback})
       • {method}    (string) LSP method name
       • {params}    (table|nil) Parameters to send to the server
       • {callback}  (function) The callback to call when all requests are
-                    finished.
+                    finished. Unlike `buf_request`, this will collect all the
+                    responses from each server instead of handling them. A map
+                    of client_id:request_result will be provided to the
+                    callback
 
     Return: ~
-        (function) A function that will cancel all requests which is the same
-        as the one returned from `buf_request`.
+        fun() cancel A function that will cancel all requests
 
                                                   *vim.lsp.buf_request_sync()*
 buf_request_sync({bufnr}, {method}, {params}, {timeout_ms})
@@ -604,8 +606,9 @@ buf_request_sync({bufnr}, {method}, {params}, {timeout_ms})
                       result. Defaults to 1000
 
     Return: ~
-        Map of client_id:request_result. On timeout, cancel or error, returns
-        `(nil, err)` where `err` is a string describing the failure reason.
+        table<integer, any>|nil result, string|nil err Map of
+        client_id:request_result. On timeout, cancel or error, returns `(nil,
+        err)` where `err` is a string describing the failure reason.
 
 client()                                                      *vim.lsp.client*
     LSP client object. You can get an active client object via
@@ -671,7 +674,7 @@ client_is_stopped({client_id})                   *vim.lsp.client_is_stopped()*
       • {client_id}  (number)
 
     Return: ~
-        true if client is stopped, false otherwise.
+        (boolean) stopped true if client is stopped, false otherwise.
 
                                             *vim.lsp.for_each_buffer_client()*
 for_each_buffer_client({bufnr}, {fn})
@@ -722,10 +725,10 @@ get_buffers_by_client_id({client_id})
     Returns list of buffers attached to client_id.
 
     Parameters: ~
-      • {client_id}  (number) client id
+      • {client_id}  (integer) client id
 
     Return: ~
-        (list) of buffer ids
+        integer[] buffers list of buffer ids
 
 get_client_by_id({client_id})                     *vim.lsp.get_client_by_id()*
     Gets a client by id, or nil if the id is invalid. The returned client may
@@ -741,7 +744,7 @@ get_log_path()                                        *vim.lsp.get_log_path()*
     Gets the path of the logfile used by the LSP client.
 
     Return: ~
-        (String) Path to logfile.
+        (string) path to log file
 
 omnifunc({findstart}, {base})                             *vim.lsp.omnifunc()*
     Implements 'omnifunc' compatible LSP completion.
@@ -946,9 +949,9 @@ start_client({config})                                *vim.lsp.start_client()*
                     initialization.
 
     Return: ~
-        Client id. |vim.lsp.get_client_by_id()| Note: client may not be fully
-        initialized. Use `on_init` to do any actions once the client has been
-        initialized.
+        (integer|nil) client_id. |vim.lsp.get_client_by_id()| Note: client may
+        not be fully initialized. Use `on_init` to do any actions once the
+        client has been initialized.
 
 stop_client({client_id}, {force})                      *vim.lsp.stop_client()*
     Stops a client(s).
@@ -979,7 +982,7 @@ tagfunc({...})                                             *vim.lsp.tagfunc()*
       • {flags}    (string) See |tag-function|
 
     Return: ~
-        A list of matching tags
+        table[] tags A list of matching tags
 
 with({handler}, {override_config})                            *vim.lsp.with()*
     Function to manage overriding defaults for LSP handlers.
@@ -1943,13 +1946,13 @@ request({method}, {params}, {callback}, {notify_reply_callback})
       • {method}                 (string) The invoked LSP method
       • {params}                 (table|nil) Parameters for the invoked LSP
                                  method
-      • {callback}               (function) Callback to invoke
+      • {callback}               fun(err: lsp.ResponseError | nil, result: any) Callback to invoke
       • {notify_reply_callback}  (function|nil) Callback to invoke as soon as
                                  a request is no longer pending
 
     Return: ~
-        (bool, number) `(true, message_id)` if request could be sent, `false`
-        if not
+        (boolean) success, integer|nil request_id true, message_id if request
+        could be sent, `false` if not
 
                                             *vim.lsp.rpc.rpc_response_error()*
 rpc_response_error({code}, {message}, {data})
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 206c7c9b7e..d215b4c47e 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -67,7 +67,7 @@ lsp._request_name_to_capability = {
 ---@private
 --- Concatenates and writes a list of strings to the Vim error buffer.
 ---
----@param {...} table[] List to write to the buffer
+---@param ... string List to write to the buffer
 local function err_message(...)
   nvim_err_writeln(table.concat(vim.tbl_flatten({ ... })))
   nvim_command('redraw')
@@ -76,9 +76,8 @@ end
 ---@private
 --- Returns the buffer number for the given {bufnr}.
 ---
----@param bufnr (number|nil) Buffer number to resolve. Defaults to the current
----buffer if not given.
----@returns bufnr (number) Number of requested buffer
+---@param bufnr (integer|nil) Buffer number to resolve. Defaults to current buffer
+---@return integer bufnr
 local function resolve_bufnr(bufnr)
   validate({ bufnr = { bufnr, 'n', true } })
   if bufnr == nil or bufnr == 0 then
@@ -104,7 +103,7 @@ end
 --- Checks whether a given path is a directory.
 ---
 ---@param filename (string) path to check
----@returns true if {filename} exists and is a directory, false otherwise
+---@return boolean # true if {filename} exists and is a directory, false otherwise
 local function is_dir(filename)
   validate({ filename = { filename, 's' } })
   local stat = uv.fs_stat(filename)
@@ -133,7 +132,7 @@ local format_line_ending = {
 
 ---@private
 ---@param bufnr (number)
----@returns (string)
+---@return string
 local function buf_get_line_ending(bufnr)
   return format_line_ending[nvim_buf_get_option(bufnr, 'fileformat')] or '\n'
 end
@@ -142,7 +141,7 @@ local client_index = 0
 ---@private
 --- Returns a new, unused client id.
 ---
----@returns (number) client id
+---@return integer client_id
 local function next_client_id()
   client_index = client_index + 1
   return client_index
@@ -197,7 +196,7 @@ lsp.client_errors = tbl_extend(
 --- Normalizes {encoding} to valid LSP encoding names.
 ---
 ---@param encoding (string) Encoding to normalize
----@returns (string) normalized encoding name
+---@return string # normalized encoding name
 local function validate_encoding(encoding)
   validate({
     encoding = { encoding, 's' },
@@ -215,9 +214,8 @@ end
 --- Parses a command invocation into the command itself and its args. If there
 --- are no arguments, an empty table is returned as the second argument.
 ---
----@param input (List)
----@returns (string) the command
----@returns (list of strings) its arguments
+---@param input string[]
+---@return string command, string[] args #the command and arguments
 function lsp._cmd_parts(input)
   validate({
     cmd = {
@@ -244,9 +242,9 @@ end
 ---@private
 --- Augments a validator function with support for optional (nil) values.
 ---
----@param fn (fun(v)) The original validator function; should return a
+---@param fn (fun(v): boolean) The original validator function; should return a
 ---bool.
----@returns (fun(v)) The augmented function. Also returns true if {v} is
+---@return fun(v): boolean # The augmented function. Also returns true if {v} is
 ---`nil`.
 local function optional_validator(fn)
   return function(v)
@@ -258,10 +256,8 @@ end
 --- Validates a client configuration as given to |vim.lsp.start_client()|.
 ---
 ---@param config (table)
----@returns (table) "Cleaned" config, containing only the command, its
+---@return table config Cleaned config, containing the command, its
 ---arguments, and a valid encoding.
----
----@see |vim.lsp.start_client()|
 local function validate_client_config(config)
   validate({
     config = { config, 't' },
@@ -314,7 +310,7 @@ end
 --- Returns full text of buffer {bufnr} as a string.
 ---
 ---@param bufnr (number) Buffer handle, or 0 for current.
----@returns Buffer text as string.
+---@return string # Buffer text as string.
 local function buf_get_full_text(bufnr)
   local line_ending = buf_get_line_ending(bufnr)
   local text = table.concat(nvim_buf_get_lines(bufnr, 0, -1, true), line_ending)
@@ -331,7 +327,7 @@ end
 --- even if it has side effects.
 ---
 ---@param fn (function) Function to run
----@returns (function) Memoized function
+---@return function fn Memoized function
 local function once(fn)
   local value
   local ran = false
@@ -373,7 +369,7 @@ do
   --- @field lines string[] snapshot of buffer lines from last didChange
   --- @field lines_tmp string[]
   --- @field pending_changes table[] List of debounced changes in incremental sync mode
-  --- @field timer nil|userdata uv_timer
+  --- @field timer nil|uv.uv_timer_t uv_timer
   --- @field last_flush nil|number uv.hrtime of the last flush/didChange-notification
   --- @field needs_flush boolean true if buffer updates haven't been sent to clients/servers yet
   --- @field refs number how many clients are using this group
@@ -648,7 +644,7 @@ do
       if debounce == 0 then
         send_changes(bufnr, group.sync_kind, state, buf_state)
       else
-        local timer = uv.new_timer()
+        local timer = assert(uv.new_timer(), 'Must be able to create timer')
         buf_state.timer = timer
         timer:start(
           debounce,
@@ -1006,7 +1002,7 @@ end
 ---       server will base its workspaceFolders, rootUri, and rootPath
 ---       on initialization.
 ---
----@returns Client id. |vim.lsp.get_client_by_id()| Note: client may not be
+---@return integer|nil client_id. |vim.lsp.get_client_by_id()| Note: client may not be
 --- fully initialized. Use `on_init` to do any actions once
 --- the client has been initialized.
 function lsp.start_client(config)
@@ -1037,7 +1033,7 @@ function lsp.start_client(config)
   --- Returns the default handler if the user hasn't set a custom one.
   ---
   ---@param method (string) LSP method name
-  ---@returns (fn) The handler for the given method, if defined, or the default from |vim.lsp.handlers|
+  ---@return function|nil The handler for the given method, if defined, or the default from |vim.lsp.handlers|
   local function resolve_handler(method)
     return handlers[method] or default_handlers[method]
   end
@@ -1343,11 +1339,11 @@ function lsp.start_client(config)
   --- This is a thin wrapper around {client.rpc.request} with some additional
   --- checks for capabilities and handler availability.
   ---
-  ---@param method (string) LSP method name.
-  ---@param params (table) LSP request params.
-  ---@param handler (function|nil) Response |lsp-handler| for this method.
-  ---@param bufnr (number) Buffer handle (0 for current).
-  ---@returns ({status}, [request_id]): {status} is a bool indicating
+  ---@param method string LSP method name.
+  ---@param params table LSP request params.
+  ---@param handler lsp-handler|nil Response |lsp-handler| for this method.
+  ---@param bufnr integer Buffer handle (0 for current).
+  ---@return boolean status, integer|nil request_id {status} is a bool indicating
   ---whether the request was successful. If it is `false`, then it will
   ---always be `false` (the client has shutdown). If it was
   ---successful, then it will return {request_id} as the
@@ -1395,10 +1391,11 @@ function lsp.start_client(config)
   ---@param timeout_ms (number|nil) Maximum time in milliseconds to wait for
   ---                               a result. Defaults to 1000
   ---@param bufnr (number) Buffer handle (0 for current).
-  ---@returns { err=err, result=result }, a dictionary, where `err` and `result` come from the |lsp-handler|.
-  ---On timeout, cancel or error, returns `(nil, err)` where `err` is a
-  ---string describing the failure reason. If the request was unsuccessful
-  ---returns `nil`.
+  ---@return {err: lsp.ResponseError|nil, result:any}|nil, string|nil err # a dictionary, where
+  --- `err` and `result` come from the |lsp-handler|.
+  --- On timeout, cancel or error, returns `(nil, err)` where `err` is a
+  --- string describing the failure reason. If the request was unsuccessful
+  --- returns `nil`.
   ---@see |vim.lsp.buf_request_sync()|
   function client.request_sync(method, params, timeout_ms, bufnr)
     local request_result = nil
@@ -1429,7 +1426,7 @@ function lsp.start_client(config)
   ---
   ---@param method string LSP method name.
   ---@param params table|nil LSP request params.
-  ---@returns {status} (bool) true if the notification was successful.
+  ---@return boolean status true if the notification was successful.
   ---If it is false, then it will always be false
   ---(the client has shutdown).
   function client.notify(method, params)
@@ -1443,7 +1440,7 @@ function lsp.start_client(config)
   --- Cancels a request with a given request id.
   ---
   ---@param id (number) id of request to cancel
-  ---@returns true if any client returns true; false otherwise
+  ---@return boolean status true if notification was successful. false otherwise
   ---@see |vim.lsp.client.notify()|
   function client.cancel_request(id)
     validate({ id = { id, 'n' } })
@@ -1489,7 +1486,7 @@ function lsp.start_client(config)
   ---@private
   --- Checks whether a client is stopped.
   ---
-  ---@returns (bool) true if client is stopped or in the process of being
+  ---@return boolean # true if client is stopped or in the process of being
   ---stopped; false otherwise
   function client.is_stopped()
     return rpc.is_closing()
@@ -1497,7 +1494,7 @@ function lsp.start_client(config)
 
   ---@private
   --- Runs the on_attach function from the client's config if it was defined.
-  ---@param bufnr (number) Buffer number
+  ---@param bufnr integer Buffer number
   function client._on_attach(bufnr)
     text_document_did_open_handler(bufnr, client)
 
@@ -1771,8 +1768,8 @@ end
 
 --- Returns list of buffers attached to client_id.
 ---
----@param client_id number client id
----@returns list of buffer ids
+---@param client_id integer client id
+---@return integer[] buffers list of buffer ids
 function lsp.get_buffers_by_client_id(client_id)
   local client = lsp.get_client_by_id(client_id)
   return client and vim.tbl_keys(client.attached_buffers) or {}
@@ -1906,7 +1903,7 @@ api.nvim_create_autocmd('VimLeavePre', {
 ---@param handler function|nil See |lsp-handler|
 ---       If nil, follows resolution strategy defined in |lsp-handler-configuration|
 ---
----@returns 2-tuple:
+---@return table<integer, integer>, fun() 2-tuple:
 ---  - Map of client-id:request-id pairs for all successful requests.
 ---  - Function which can be used to cancel all the requests. You could instead
 ---    iterate all clients and call their `cancel_request()` methods.
@@ -1964,10 +1961,10 @@ end
 ---@param method (string) LSP method name
 ---@param params (table|nil) Parameters to send to the server
 ---@param callback (function) The callback to call when all requests are finished.
---  Unlike `buf_request`, this will collect all the responses from each server instead of handling them.
---  A map of client_id:request_result will be provided to the callback
---
----@returns (function) A function that will cancel all requests which is the same as the one returned from `buf_request`.
+--- Unlike `buf_request`, this will collect all the responses from each server instead of handling them.
+--- A map of client_id:request_result will be provided to the callback
+---
+---@return fun() cancel A function that will cancel all requests
 function lsp.buf_request_all(bufnr, method, params, callback)
   local request_results = {}
   local result_count = 0
@@ -2008,9 +2005,9 @@ end
 ---@param timeout_ms (number|nil) Maximum time in milliseconds to wait for a
 ---                               result. Defaults to 1000
 ---
----@returns Map of client_id:request_result. On timeout, cancel or error,
----        returns `(nil, err)` where `err` is a string describing the failure
----        reason.
+---@return table<integer, any>|nil result, string|nil err Map of client_id:request_result.
+--- On timeout, cancel or error, returns `(nil, err)` where `err` is a string describing
+--- the failure reason.
 function lsp.buf_request_sync(bufnr, method, params, timeout_ms)
   local request_results
 
@@ -2035,7 +2032,7 @@ end
 ---@param method (string) Name of the request method
 ---@param params (any) Arguments to send to the server
 ---
----@returns true if any client returns true; false otherwise
+---@return boolean success true if any client returns true; false otherwise
 function lsp.buf_notify(bufnr, method, params)
   validate({
     bufnr = { bufnr, 'n', true },
@@ -2172,7 +2169,7 @@ function lsp.formatexpr(opts)
   for _, client in pairs(lsp.get_active_clients({ bufnr = bufnr })) do
     if client.supports_method('textDocument/rangeFormatting') then
       local params = util.make_formatting_params()
-      local end_line = vim.fn.getline(end_lnum)
+      local end_line = vim.fn.getline(end_lnum) --[[@as string]]
       local end_col = util._str_utfindex_enc(end_line, nil, client.offset_encoding)
       params.range = {
         start = {
@@ -2207,7 +2204,7 @@ end
 ---@param pattern string Pattern used to find a workspace symbol
 ---@param flags string See |tag-function|
 ---
----@returns A list of matching tags
+---@return table[] tags A list of matching tags
 function lsp.tagfunc(...)
   return require('vim.lsp.tagfunc')(...)
 end
@@ -2215,7 +2212,7 @@ end
 ---Checks whether a client is stopped.
 ---
 ---@param client_id (number)
----@returns true if client is stopped, false otherwise.
+---@return boolean stopped true if client is stopped, false otherwise.
 function lsp.client_is_stopped(client_id)
   return active_clients[client_id] == nil
 end
@@ -2262,7 +2259,7 @@ function lsp.set_log_level(level)
 end
 
 --- Gets the path of the logfile used by the LSP client.
----@returns (String) Path to logfile.
+---@return string path to log file
 function lsp.get_log_path()
   return log.get_filename()
 end
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 12345b6c8c..41dfc9e00e 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -20,14 +20,6 @@ function transform_schema_to_table()
 end
 --]=]
 
----@class lsp.ShowMessageRequestParams
----@field type lsp.MessageType
----@field message string
----@field actions nil|lsp.MessageActionItem[]
-
----@class lsp.MessageActionItem
----@field title string
-
 local constants = {
   DiagnosticSeverity = {
     -- Reports an error.
@@ -60,6 +52,7 @@ local constants = {
   },
 
   -- The file event type.
+  ---@enum lsp.FileChangeType
   FileChangeType = {
     -- The file got created.
     Created = 1,
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index f1492601ff..aa833deb99 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -319,9 +319,9 @@ end
 ---
 ---@param method (string) The invoked LSP method
 ---@param params (table|nil) Parameters for the invoked LSP method
----@param callback (function) Callback to invoke
+---@param callback fun(err: lsp.ResponseError|nil, result: any) Callback to invoke
 ---@param notify_reply_callback (function|nil) Callback to invoke as soon as a request is no longer pending
----@returns (bool, number) `(true, message_id)` if request could be sent, `false` if not
+---@return boolean success, integer|nil request_id true, request_id if request could be sent, `false` if not
 function Client:request(method, params, callback, notify_reply_callback)
   validate({
     callback = { callback, 'f' },
@@ -538,9 +538,9 @@ local function public_client(client)
   ---
   ---@param method (string) The invoked LSP method
   ---@param params (table|nil) Parameters for the invoked LSP method
-  ---@param callback (function) Callback to invoke
+  ---@param callback fun(err: lsp.ResponseError | nil, result: any) Callback to invoke
   ---@param notify_reply_callback (function|nil) Callback to invoke as soon as a request is no longer pending
-  ---@returns (bool, number) `(true, message_id)` if request could be sent, `false` if not
+  ---@return boolean success, integer|nil request_id true, message_id if request could be sent, `false` if not
   function result.request(method, params, callback, notify_reply_callback)
     return client:request(method, params, callback, notify_reply_callback)
   end
diff --git a/runtime/lua/vim/lsp/types.lua b/runtime/lua/vim/lsp/types.lua
new file mode 100644
index 0000000000..1aea6841ee
--- /dev/null
+++ b/runtime/lua/vim/lsp/types.lua
@@ -0,0 +1,20 @@
+---@meta
+
+---@alias lsp-handler fun(err: lsp.ResponseError|nil, result: any, context: table, config: table|nil)
+
+---@class lsp.ResponseError
+---@field code integer
+---@field message string
+---@field data string|number|boolean|table[]|table|nil
+
+---@class lsp.ShowMessageRequestParams
+---@field type lsp.MessageType
+---@field message string
+---@field actions nil|lsp.MessageActionItem[]
+
+---@class lsp.MessageActionItem
+---@field title string
+
+---@class lsp.FileEvent
+---@field uri string
+---@field type lsp.FileChangeType
-- 
cgit 


From 774e59f3f9bf50c8350857c6722bb58df2dd940a Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 26 Feb 2023 16:53:33 +0000
Subject: feat(treesitter): expand the API

---
 runtime/doc/news.txt                 |  8 ++++++++
 runtime/doc/treesitter.txt           | 25 ++++++++++++++++++++++---
 runtime/lua/vim/treesitter/_meta.lua |  8 +++++++-
 3 files changed, 37 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 23bb6d4343..c5261b739d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -171,6 +171,14 @@ The following new APIs or features were added.
 
 • |vim.treesitter.foldexpr()| can be used for 'foldexpr' to use treesitter for folding.
 
+• Expanded the TSNode API with:
+  - |TSNode:tree()|
+  - |TSNode:has_changes()|
+  - |TSNode:extra()|
+  - |TSNode:equal()|
+
+  Additionally |TSNode:range()| now takes an optional {include_bytes} argument.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 76cde91920..fdea84282f 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -136,9 +136,16 @@ TSNode:end_()                                           *TSNode:end_()*
     Get the node's end position. Return three values: the row, column and
     total byte count (all zero-based).
 
-TSNode:range()                                          *TSNode:range()*
-    Get the range of the node. Return four values: the row, column of the
-    start position, then the row, column of the end position.
+TSNode:range({include_bytes})                           *TSNode:range()*
+    Get the range of the node.
+
+    Return four or six values:
+        - start row
+        - start column
+        - start byte (if {include_bytes} is `true`)
+        - end row
+        - end column
+        - end byte (if {include_bytes} is `true`)
 
 TSNode:type()                                           *TSNode:type()*
     Get the node's type as a string.
@@ -155,6 +162,13 @@ TSNode:missing()                                        *TSNode:missing()*
     Check if the node is missing. Missing nodes are inserted by the parser in
     order to recover from certain kinds of syntax errors.
 
+TSNode:extra()                                          *TSNode:extra()*
+    Check if the node is extra. Extra nodes represent things like comments,
+    which are not required by the grammar but can appear anywhere.
+
+TSNode:has_changes()                                    *TSNode:has_changes()*
+    Check if a syntax node has been edited.
+
 TSNode:has_error()                                      *TSNode:has_error()*
     Check if the node is a syntax error or contains any syntax errors.
 
@@ -171,6 +185,8 @@ TSNode:id()                                             *TSNode:id()*
     Note: The `id` is not guaranteed to be unique for nodes from different
     trees.
 
+TSNode:tree()                                           *TSNode:tree()*
+    Get the |TSTree| of the node.
                                                 *TSNode:descendant_for_range()*
 TSNode:descendant_for_range({start_row}, {start_col}, {end_row}, {end_col})
     Get the smallest node within this node that spans the given range of (row,
@@ -180,6 +196,9 @@ TSNode:descendant_for_range({start_row}, {start_col}, {end_row}, {end_col})
 TSNode:named_descendant_for_range({start_row}, {start_col}, {end_row}, {end_col})
     Get the smallest named node within this node that spans the given range of
     (row, column) positions
+                                                        *TSNode:equal()*
+TSNode:equal({node})
+    Check if {node} refers to the same node within the same tree.
 
 ==============================================================================
 TREESITTER QUERIES                                          *treesitter-query*
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index 87b4560798..731a5ebf9f 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -2,6 +2,7 @@
 
 ---@class TSNode
 ---@field id fun(self: TSNode): integer
+---@field tree fun(self: TSNode): TSTree
 ---@field range fun(self: TSNode): integer, integer, integer, integer
 ---@field start fun(self: TSNode): integer, integer, integer
 ---@field end_ fun(self: TSNode): integer, integer, integer
@@ -9,6 +10,7 @@
 ---@field symbol fun(self: TSNode): integer
 ---@field named fun(self: TSNode): boolean
 ---@field missing fun(self: TSNode): boolean
+---@field extra fun(self: TSNode): boolean
 ---@field child_count fun(self: TSNode): integer
 ---@field named_child_count fun(self: TSNode): integer
 ---@field child fun(self: TSNode, integer): TSNode
@@ -21,7 +23,8 @@
 ---@field next_named_sibling fun(self: TSNode): TSNode
 ---@field prev_named_sibling fun(self: TSNode): TSNode
 ---@field named_children fun(self: TSNode): TSNode[]
----@field has_error fun(self: TSNode): boolean
+---@field has_changes fun(self: TSNode): boolean
+---@field equal fun(self: TSNode, other: TSNode): boolean
 ---@field iter_children fun(self: TSNode): fun(): TSNode, string
 local TSNode = {}
 
@@ -41,8 +44,11 @@ function TSNode:_rawquery(query, captures, start, end_) end
 
 ---@class TSParser
 ---@field parse fun(self: TSParser, tree, source: integer|string): TSTree, integer[]
+---@field reset fun(self: TSParser)
 ---@field included_ranges fun(self: TSParser): integer[]
 ---@field set_included_ranges fun(self: TSParser, ranges: integer[][])
+---@field set_timeout fun(self: TSParser, timeout: integer)
+---@field timeout fun(self: TSParser): integer
 
 ---@class TSTree
 ---@field root fun(self: TSTree): TSNode
-- 
cgit 


From 0972d7a12468d6914a70e453af85c307b167c55b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 26 Feb 2023 23:13:12 +0800
Subject: vim-patch:9.0.0196: finding value in list may require a for loop

Problem:    Finding value in list may require a for loop.
Solution:   Add indexof(). (Yegappan Lakshmanan, closes vim/vim#10903)

https://github.com/vim/vim/commit/b218655d5a485f5b193fb18d7240837d42b89812

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 runtime/doc/usr_41.txt  |  6 ++++--
 2 files changed, 51 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5f279ed09c..1168d7ff1d 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -255,6 +255,8 @@ iconv({expr}, {from}, {to})	String	convert encoding of {expr}
 indent({lnum})			Number	indent of line {lnum}
 index({object}, {expr} [, {start} [, {ic}]])
 				Number	index in {object} where {expr} appears
+indexof({object}, {expr} [, {opts}]])
+				Number	index in {object} where {expr} is true
 input({prompt} [, {text} [, {completion}]])
 				String	get input from the user
 inputlist({textlist})		Number	let the user pick from a choice list
@@ -4084,19 +4086,25 @@ indent({lnum})	The result is a Number, which is indent of line {lnum} in the
 			GetLnum()->indent()
 
 index({object}, {expr} [, {start} [, {ic}]])			*index()*
+		Find {expr} in {object} and return its index.  See
+		|filterof()| for using a lambda to select the item.
+
 		If {object} is a |List| return the lowest index where the item
 		has a value equal to {expr}.  There is no automatic
 		conversion, so the String "4" is different from the Number 4.
 		And the Number 4 is different from the Float 4.0.  The value
-		of 'ignorecase' is not used here, case always matters.
+		of 'ignorecase' is not used here, case matters as indicated by
+		the {ic} argument.
 
 		If {object} is a |Blob| return the lowest index where the byte
 		value is equal to {expr}.
 
 		If {start} is given then start looking at the item with index
 		{start} (may be negative for an item relative to the end).
+
 		When {ic} is given and it is |TRUE|, ignore case.  Otherwise
 		case must match.
+
 		-1 is returned when {expr} is not found in {object}.
 		Example: >
 			:let idx = index(words, "the")
@@ -4105,6 +4113,44 @@ index({object}, {expr} [, {start} [, {ic}]])			*index()*
 <		Can also be used as a |method|: >
 			GetObject()->index(what)
 
+indexof({object}, {expr} [, {opt}])			*indexof()*
+		{object} must be a |List| or a |Blob|.
+		If {object} is a |List|, evaluate {expr} for each item in the
+		List until the expression returns v:true and return the index
+		of this item.
+
+		If {object} is a |Blob| evaluate {expr} for each byte in the
+		Blob until the expression returns v:true and return the index
+		of this byte.
+
+		{expr} must be a |string| or |Funcref|.
+
+		If {expr} is a |string|: If {object} is a |List|, inside
+		{expr} |v:key| has the index of the current List item and
+		|v:val| has the value of the item.  If {object} is a |Blob|,
+		inside {expr} |v:key| has the index of the current byte and
+		|v:val| has the byte value.
+
+		If {expr} is a |Funcref| it must take two arguments:
+			1. the key or the index of the current item.
+			2. the value of the current item.
+		The function must return |TRUE| if the item is found and the
+		search should stop.
+
+		The optional argument {opt} is a Dict and supports the
+		following items:
+		    start	start evaluating {expr} at the item with index
+				{start} (may be negative for an item relative
+				to the end).
+		Returns -1 when {expr} evaluates to v:false for all the items.
+		Example: >
+			:let l = [#{n: 10}, #{n: 20}, #{n: 30]]
+			:let idx = indexof(l, "v:val.n == 20")
+			:let idx = indexof(l, {i, v -> v.n == 30})
+
+<		Can also be used as a |method|: >
+			mylist->indexof(expr)
+
 input({prompt} [, {text} [, {completion}]])		*input()*
 input({opts})
 		The result is a String, which is whatever the user typed on
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 27c5927cf9..77b1795a57 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -657,14 +657,16 @@ List manipulation:					*list-functions*
 	map()			change each List item
 	reduce()		reduce a List to a value
 	sort()			sort a List
-	reverse()		reverse the order of a List
+	reverse()		reverse the order of a List or Blob
 	uniq()			remove copies of repeated adjacent items
 	split()			split a String into a List
 	join()			join List items into a String
 	range()			return a List with a sequence of numbers
 	string()		String representation of a List
 	call()			call a function with List as arguments
-	index()			index of a value in a List
+	index()			index of a value in a List or Blob
+	indexof()		index in a List or Blob where an expression
+				evaluates to true
 	max()			maximum value in a List
 	min()			minimum value in a List
 	count()			count number of times a value appears in a List
-- 
cgit 


From 13da3d469ae10201de00ae89277c53c40342f4df Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 26 Feb 2023 23:50:35 +0800
Subject: vim-patch:partial:9.0.0202: code and help for indexof() is not ideal

Problem:    Code and help for indexof() is not ideal.
Solution:   Refactor the code, improve the help. (Yegappan Lakshmanan,
            closes vim/vim#10908)

https://github.com/vim/vim/commit/3fbf6cd355de2212e9227f57d545592aae3f688f

Skip CHECK_LIST_MATERIALIZE and set_vim_var_type().
Use tv_list_uidx() instead of lv_idx.

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 1168d7ff1d..35f1b7cd6f 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4087,7 +4087,7 @@ indent({lnum})	The result is a Number, which is indent of line {lnum} in the
 
 index({object}, {expr} [, {start} [, {ic}]])			*index()*
 		Find {expr} in {object} and return its index.  See
-		|filterof()| for using a lambda to select the item.
+		|indexof()| for using a lambda to select the item.
 
 		If {object} is a |List| return the lowest index where the item
 		has a value equal to {expr}.  There is no automatic
@@ -4113,15 +4113,17 @@ index({object}, {expr} [, {start} [, {ic}]])			*index()*
 <		Can also be used as a |method|: >
 			GetObject()->index(what)
 
-indexof({object}, {expr} [, {opt}])			*indexof()*
-		{object} must be a |List| or a |Blob|.
+indexof({object}, {expr} [, {opts}])			*indexof()*
+		Returns the index of an item in {object} where {expr} is
+		v:true.  {object} must be a |List| or a |Blob|.
+
 		If {object} is a |List|, evaluate {expr} for each item in the
-		List until the expression returns v:true and return the index
-		of this item.
+		List until the expression is v:true and return the index of
+		this item.
 
 		If {object} is a |Blob| evaluate {expr} for each byte in the
-		Blob until the expression returns v:true and return the index
-		of this byte.
+		Blob until the expression is v:true and return the index of
+		this byte.
 
 		{expr} must be a |string| or |Funcref|.
 
@@ -4137,16 +4139,17 @@ indexof({object}, {expr} [, {opt}])			*indexof()*
 		The function must return |TRUE| if the item is found and the
 		search should stop.
 
-		The optional argument {opt} is a Dict and supports the
+		The optional argument {opts} is a Dict and supports the
 		following items:
-		    start	start evaluating {expr} at the item with index
-				{start} (may be negative for an item relative
-				to the end).
+		    startidx	start evaluating {expr} at the item with this
+				index; may be negative for an item relative to
+				the end
 		Returns -1 when {expr} evaluates to v:false for all the items.
 		Example: >
-			:let l = [#{n: 10}, #{n: 20}, #{n: 30]]
-			:let idx = indexof(l, "v:val.n == 20")
-			:let idx = indexof(l, {i, v -> v.n == 30})
+			:let l = [#{n: 10}, #{n: 20}, #{n: 30}]
+			:echo indexof(l, "v:val.n == 20")
+			:echo indexof(l, {i, v -> v.n == 30})
+			:echo indexof(l, "v:val.n == 20", #{startidx: 1})
 
 <		Can also be used as a |method|: >
 			mylist->indexof(expr)
-- 
cgit 


From 2c9fbe34b20266ef5ab54f6ed14fb38eef60430d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 27 Feb 2023 10:10:42 +0800
Subject: vim-patch:8.2.2336: Vim9: not possible to extend dictionary with
 different type (#22425)

Problem:    Vim9: it is not possible to extend a dictionary with different
            item types.
Solution:   Add extendnew(). (closes vim/vim#7666)

https://github.com/vim/vim/commit/b0e6b513648db7035046613431a4aa9d71ef4653

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 11 +++++++++++
 runtime/doc/usr_41.txt  |  2 ++
 2 files changed, 13 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 35f1b7cd6f..3ff4e47a45 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -138,6 +138,9 @@ expandcmd({string} [, {options}])
 				String	expand {string} like with `:edit`
 extend({expr1}, {expr2} [, {expr3}])
 				List/Dict insert items of {expr2} into {expr1}
+extendnew({expr1}, {expr2} [, {expr3}])
+				List/Dict like |extend()| but creates a new
+					List or Dictionary
 feedkeys({string} [, {mode}])	Number	add key sequence to typeahead buffer
 filereadable({file})		Number	|TRUE| if {file} is a readable file
 filewritable({file})		Number	|TRUE| if {file} is a writable file
@@ -2119,6 +2122,14 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		Can also be used as a |method|: >
 			mylist->extend(otherlist)
 
+
+extendnew({expr1}, {expr2} [, {expr3}])			*extendnew()*
+		Like |extend()| but instead of adding items to {expr1} a new
+		List or Dictionary is created and returned.  {expr1} remains
+		unchanged.  Items can still be changed by {expr2}, if you
+		don't want that use |deepcopy()| first.
+
+
 feedkeys({string} [, {mode}])				*feedkeys()*
 		Characters in {string} are queued for processing as if they
 		come from a mapping or were typed by the user.
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 77b1795a57..0f2cfdd2ac 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -650,6 +650,7 @@ List manipulation:					*list-functions*
 	insert()		insert an item somewhere in a List
 	add()			append an item to a List
 	extend()		append a List to a List
+	extendnew()		make a new List and append items
 	remove()		remove one or more items from a List
 	copy()			make a shallow copy of a List
 	deepcopy()		make a full copy of a List
@@ -681,6 +682,7 @@ Dictionary manipulation:				*dict-functions*
 	empty()			check if Dictionary is empty
 	remove()		remove an entry from a Dictionary
 	extend()		add entries from one Dictionary to another
+	extendnew()		make a new Dictionary and append items
 	filter()		remove selected entries from a Dictionary
 	map()			change each Dictionary entry
 	keys()			get List of Dictionary keys
-- 
cgit 


From da56f06037c26180021c1e3b73a77fc990f0c1e3 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 27 Feb 2023 10:49:19 +0000
Subject: fix(treesitter): remove virtual text from playground

Implement the range and lang annotations as comments instead
---
 runtime/lua/vim/treesitter/playground.lua | 46 +++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index 001bc2d5bf..fd5b687195 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -138,6 +138,19 @@ end
 
 local decor_ns = api.nvim_create_namespace('ts.playground')
 
+---@private
+---@param lnum integer
+---@param col integer
+---@param end_lnum integer
+---@param end_col integer
+---@return string
+local function get_range_str(lnum, col, end_col, end_lnum)
+  if lnum == end_lnum then
+    return string.format('[%d:%d-%d]', lnum + 1, col + 1, end_col)
+  end
+  return string.format('[%d:%d-%d:%d]', lnum + 1, col + 1, end_lnum + 1, end_col)
+end
+
 --- Write the contents of this Playground into {bufnr}.
 ---
 ---@param bufnr number Buffer number to write into.
@@ -145,26 +158,31 @@ local decor_ns = api.nvim_create_namespace('ts.playground')
 function TSPlayground:draw(bufnr)
   vim.bo[bufnr].modifiable = true
   local lines = {} ---@type string[]
+  local lang_hl_marks = {} ---@type table[]
+
   for _, item in self:iter() do
-    lines[#lines + 1] = string.rep(' ', item.depth) .. item.text
+    local range_str = get_range_str(item.lnum, item.col, item.end_lnum, item.end_col)
+    local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
+    local line = string.rep(' ', item.depth) .. item.text .. '; ' .. range_str .. lang_str
+
+    if self.opts.lang then
+      lang_hl_marks[#lang_hl_marks + 1] = {
+        col = #line - #lang_str,
+        end_col = #line,
+      }
+    end
+
+    lines[#lines + 1] = line
   end
+
   api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
 
   api.nvim_buf_clear_namespace(bufnr, decor_ns, 0, -1)
 
-  for i, item in self:iter() do
-    local range_str
-    if item.lnum == item.end_lnum then
-      range_str = string.format('[%d:%d-%d]', item.lnum + 1, item.col + 1, item.end_col)
-    else
-      range_str =
-        string.format('[%d:%d-%d:%d]', item.lnum + 1, item.col + 1, item.end_lnum + 1, item.end_col)
-    end
-
-    local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
-
-    api.nvim_buf_set_extmark(bufnr, decor_ns, i - 1, 0, {
-      virt_text = { { range_str, 'Comment' }, { lang_str, 'Title' } },
+  for i, m in ipairs(lang_hl_marks) do
+    api.nvim_buf_set_extmark(bufnr, decor_ns, i - 1, m.col, {
+      hl_group = 'Title',
+      end_col = m.end_col,
     })
   end
 
-- 
cgit 


From 5aa37e20e0e6cbabf82c5cf1d35c6f5e6e48f099 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 27 Feb 2023 15:01:09 +0000
Subject: fix(treesitter): ipairs -> pairs

Fixes: https://github.com/nvim-treesitter/nvim-treesitter/issues/4349
---
 runtime/lua/vim/treesitter/languagetree.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 7ec7bbfa12..43fb866896 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -467,7 +467,7 @@ function LanguageTree:_get_injections()
 
   -- Generate a map by lang of node lists.
   -- Each list is a set of ranges that should be parsed together.
-  for _, lang_map in ipairs(injections) do
+  for _, lang_map in pairs(injections) do
     for lang, patterns in pairs(lang_map) do
       if not result[lang] then
         result[lang] = {}
-- 
cgit 


From f64098a2df774c79dd454f63ac491570cdcaf2b2 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 27 Feb 2023 15:33:18 +0000
Subject: fix(treesitter): fixup for health

---
 runtime/lua/vim/treesitter/health.lua   | 22 ++++++++++------------
 runtime/lua/vim/treesitter/language.lua |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/health.lua b/runtime/lua/vim/treesitter/health.lua
index 1abcdd0b31..fd1188fde4 100644
--- a/runtime/lua/vim/treesitter/health.lua
+++ b/runtime/lua/vim/treesitter/health.lua
@@ -2,28 +2,26 @@ local M = {}
 local ts = vim.treesitter
 local health = require('vim.health')
 
---- Lists the parsers currently installed
----
----@return string[] list of parser files
-function M.list_parsers()
-  return vim.api.nvim_get_runtime_file('parser/*', true)
-end
-
 --- Performs a healthcheck for treesitter integration
 function M.check()
-  local parsers = M.list_parsers()
+  local parsers = vim.api.nvim_get_runtime_file('parser/*', true)
 
   health.report_info(string.format('Nvim runtime ABI version: %d', ts.language_version))
 
   for _, parser in pairs(parsers) do
     local parsername = vim.fn.fnamemodify(parser, ':t:r')
-    local is_loadable, ret = pcall(ts.language.add, parsername)
+    local is_loadable, err_or_nil = pcall(ts.language.add, parsername)
 
-    if not is_loadable or not ret then
+    if not is_loadable then
       health.report_error(
-        string.format('Parser "%s" failed to load (path: %s): %s', parsername, parser, ret or '?')
+        string.format(
+          'Parser "%s" failed to load (path: %s): %s',
+          parsername,
+          parser,
+          err_or_nil or '?'
+        )
       )
-    elseif ret then
+    else
       local lang = ts.language.inspect_language(parsername)
       health.report_ok(
         string.format('Parser: %-10s ABI: %d, path: %s', parsername, lang._abi_version, parser)
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 0796383bf5..5bcc786e88 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -63,7 +63,7 @@ function M.add(lang, opts)
   M.register(lang, filetype or lang)
 
   if vim._ts_has_language(lang) then
-    return true
+    return
   end
 
   if path == nil then
-- 
cgit 


From 7f424e2b65779c59fc0cac3cc7508ba2ec07f200 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 23 Feb 2023 18:29:36 +0100
Subject: feat(api): more fields in nvim_list_uis

Problem:
nvim_list_uis does not report all ":help ui-option" fields.

Solution:
Store ":help ui-option" fields on the `UI` object and update ui_array.
---
 runtime/doc/builtin.txt | 1 +
 runtime/doc/news.txt    | 2 ++
 runtime/doc/ui.txt      | 5 ++---
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 3ff4e47a45..8cde2f8fb0 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -3868,6 +3868,7 @@ has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
 			clipboard	|clipboard| provider is available.
 			fname_case	Case in file names matters (for Darwin and MS-Windows
 					this is not present).
+                        gui_running	Nvim has a GUI.
 			iconv		Can use |iconv()| for conversion.
 			linux		Linux system.
 			mac		MacOS system.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c5261b739d..4c9cbf9189 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -179,6 +179,8 @@ The following new APIs or features were added.
 
   Additionally |TSNode:range()| now takes an optional {include_bytes} argument.
 
+• |nvim_list_uis()| reports all |ui-option| fields.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index bb567e021e..e706e36374 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -53,9 +53,8 @@ with these (optional) keys:
 - `term_name`		Sets the name of the terminal 'term'.
 - `term_colors`		Sets the number of supported colors 't_Co'.
 - `term_background`	Sets the default value of 'background'.
-- `stdin_fd`		Read buffer from `fd` as if it was a stdin pipe.
-			This option can only used by |--embed| ui on startup.
-			See |ui-startup-stdin|.
+- `stdin_fd`		Read buffer 1 from this fd as if it were stdin |--|.
+			Only from |--embed| UI on startup. |ui-startup-stdin|
 - `stdin_tty`		Tells if `stdin` is a `tty` or not.
 - `stdout_tty`		Tells if `stdout` is a `tty` or not.
 
-- 
cgit 


From ce597235a26839826de88ecd8b949ec54c310fbd Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 27 Feb 2023 16:31:05 +0100
Subject: feat(ui): restore has('gui_running')

Problem:
has('gui_running') is still common in the wild and our answer has
changed over time, causing frustration.
https://github.com/vimpostor/vim-tpipeline/commit/95a6ccbe9f33bc42dd4cee45731d8bc3fbcd92d1

Solution:
Use stdin_tty/stdout_tty to decide if a UI is (not) a GUI.
---
 runtime/doc/news.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 4c9cbf9189..90e17d3678 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -181,6 +181,9 @@ The following new APIs or features were added.
 
 • |nvim_list_uis()| reports all |ui-option| fields.
 
+• Vim's `has('gui_running')` is now supported as a way for plugins to check if
+  a GUI (not the |TUI|) is attached to Nvim. |has()|
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
-- 
cgit 


From 2a8e6a2f1a8e047a8efd84764d9a332bbd6ae96d Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Mon, 27 Feb 2023 15:08:31 -0500
Subject: vim-patch:9.0.1360: Cue files are not recognized (#22439)

Problem:    Cue files are not recognized.
Solution:   Add patterns for Cue files. (Amaan Qureshi, closes vim/vim#12067)

https://github.com/vim/vim/commit/80c5b2c0f78b24e52c73bb162dda3ad85acd7e82
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index a4e078fd04..256c053801 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -276,6 +276,7 @@ local extension = {
   feature = 'cucumber',
   cuh = 'cuda',
   cu = 'cuda',
+  cue = 'cue',
   pld = 'cupl',
   si = 'cuplsim',
   cyn = 'cynpp',
-- 
cgit 


From f89e3497c88f59916e3bce2e902be9b0f8bf15ba Mon Sep 17 00:00:00 2001
From: Mike <Mike325@users.noreply.github.com>
Date: Mon, 27 Feb 2023 14:19:41 -0600
Subject: docs(lsp): update cmd_env description (#22438)

---
 runtime/doc/lsp.txt     | 7 +++----
 runtime/lua/vim/lsp.lua | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 3b5a434eff..7e46698614 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -851,11 +851,10 @@ start_client({config})                                *vim.lsp.start_client()*
                   • cmd_cwd: (string, default=|getcwd()|) Directory to launch
                     the `cmd` process. Not related to `root_dir`.
                   • cmd_env: (table) Environment flags to pass to the LSP on
-                    spawn. Can be specified using keys like a map or as a list
-                    with `k=v` pairs or both. Non-string values are coerced to string.
-                    Example: >
+                    spawn. Must be specified using a map-like table.
+                    Non-string values are coerced to string. Example: >
 
-                       { "PRODUCTION=true"; "TEST=123"; PORT = 8080; HOST = "0.0.0.0"; }
+                       { PORT = 8080; HOST = "0.0.0.0"; }
 <
                   • detached: (boolean, default true) Daemonize the server
                     process so that it runs in a separate process group from
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index d215b4c47e..61a06ff7a7 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -908,11 +908,11 @@ end
 ---       the `cmd` process. Not related to `root_dir`.
 ---
 --- - cmd_env: (table) Environment flags to pass to the LSP on
----       spawn.  Can be specified using keys like a map or as a list with `k=v`
----       pairs or both. Non-string values are coerced to string.
+---       spawn.  Must be specified using a map-like table.
+---       Non-string values are coerced to string.
 ---       Example:
 ---       <pre>
----                   { "PRODUCTION=true"; "TEST=123"; PORT = 8080; HOST = "0.0.0.0"; }
+---                   { PORT = 8080; HOST = "0.0.0.0"; }
 ---       </pre>
 ---
 --- - detached: (boolean, default true) Daemonize the server process so that it runs in a
-- 
cgit 


From fb2ead6cf3ef2d5a60af5dbe9cd1443a07296beb Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 27 Feb 2023 22:17:12 +0000
Subject: docs(usr): make usr_05.txt more coherent with Nvim changes (#22428)

- Make section 05.2 more coherent.
- Remove explanation of options that are already default.
---
 runtime/doc/usr_05.txt | 80 ++++++++------------------------------------------
 1 file changed, 13 insertions(+), 67 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index d8fb2acedb..00b4f9eed4 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -10,7 +10,7 @@ make Vim start with options set to different values.  Add plugins to extend
 Vim's capabilities.  Or define your own macros.
 
 |05.1|	The vimrc file
-|05.2|	The example vimrc file explained
+|05.2|	Example vimrc contents
 |05.3|	Simple mappings
 |05.4|	Adding a package
 |05.5|	Adding a plugin
@@ -27,10 +27,10 @@ Table of contents: |usr_toc.txt|
 
 You probably got tired of typing commands that you use very often.  To start
 Vim with all your favorite option settings and mappings, you write them in
-what is called the init.vim file.  Vim executes the commands in this file when 
+what is called the init.vim file.  Vim executes the commands in this file when
 it starts up.
 
-If you already have a init.vim file (e.g., when your sysadmin has one setup 
+If you already have a init.vim file (e.g., when your sysadmin has one setup
 for you), you can edit it this way: >
 
 	:edit $MYVIMRC
@@ -56,80 +56,32 @@ This chapter only explains the most basic items.  For more information on how
 to write a Vim script file: |usr_41.txt|.
 
 ==============================================================================
-*05.2*	The example vimrc file explained		*vimrc_example.vim*
+*05.2*	Example vimrc contents                          *vimrc_example.vim*
 
 In the first chapter was explained how to create a vimrc file. >
 
 	:exe 'edit' stdpath('config').'/init.vim'
 
-In this section we will explain the various commands used in this file.  This
-will give you hints about how to set up your own preferences.  Not everything
-will be explained though.  Use the ":help" command to find out more.
-
->
-	set backspace=indent,eol,start
-
-This specifies where in Insert mode the <BS> is allowed to delete the
-character in front of the cursor.  The three items, separated by commas, tell
-Vim to delete the white space at the start of the line, a line break and the
-character before where Insert mode started.
->
-
-	set autoindent
-
-This makes Vim use the indent of the previous line for a newly created line.
-Thus there is the same amount of white space before the new line.  For example
-when pressing <Enter> in Insert mode, and when using the "o" command to open a
-new line.
+In this section we will explain the various commands that can be specified in
+this file.  This will give you hints about how to set up your own preferences.
+Not everything will be explained though.  Use the ":help" command to find out
+more.
 >
-
 	set backup
 
 This tells Vim to keep a backup copy of a file when overwriting it. The backup
 file will have the same name as the original file with "~" added.  See |07.4|
 >
-
 	set history=50
-
+<
 Keep 50 commands and 50 search patterns in the history.  Use another number if
 you want to remember fewer or more lines.
->
-
-	set ruler
-
-Always display the current cursor position in the lower right corner of the
-Vim window.
-
->
-	set showcmd
-
-Display an incomplete command in the lower right corner of the Vim window,
-left of the ruler.  For example, when you type "2f", Vim is waiting for you to
-type the character to find and "2f" is displayed.  When you press "w" next,
-the "2fw" command is executed and the displayed "2f" is removed.
->
-	+-------------------------------------------------+
-	|text in the Vim window				  |
-	|~						  |
-	|~						  |
-	|-- VISUAL --			2f     43,8   17% |
-	+-------------------------------------------------+
-	 ^^^^^^^^^^^		      ^^^^^^^^ ^^^^^^^^^^
-	  'showmode'		     'showcmd'	'ruler'
-
->
-	set incsearch
-<
-Display matches for a search pattern while you type.
-
 >
 	map Q gq
 
 This defines a key mapping.  More about that in the next section.  This
-defines the "Q" command to do formatting with the "gq" operator.  This is how
-it worked before Vim 5.0.  Otherwise the "Q" command repeats the last recorded
-register.
-
+defines the "Q" command to do formatting with the "gq" operator. Otherwise the
+"Q" command repeats the last recorded register.
 >
 	vnoremap _g y:exe "grep /" .. escape(@", '\\/') .. "/ *.c *.h"<CR>
 
@@ -138,14 +90,8 @@ This is a complicated mapping.  You can see that mappings can be used to do
 quite complicated things.  Still, it is just a sequence of commands that are
 executed like you typed them.
 
+							*vimrc-filetype*
 >
-	set hlsearch
-
-This option tells Vim to highlight matches with the last used search pattern.
-The "if" command is very useful to set options only when some condition is
-met.  More about that in |usr_41.txt|.
-
-							*vimrc-filetype*  >
 	filetype plugin indent on
 
 This switches on three very clever mechanisms:
@@ -342,7 +288,7 @@ That's all!  Now you can use the commands defined in this plugin.
 
 Instead of putting plugins directly into the plugin/ directory, you may
 better organize them by putting them into subdirectories under plugin/.
-As an example, consider using "~/.local/share/nvim/site/plugin/perl/*.vim" for 
+As an example, consider using "~/.local/share/nvim/site/plugin/perl/*.vim" for
 all your Perl plugins.
 
 
-- 
cgit 


From 66c384d4e806a5e8de53bc57a05f0ddd8c8a9d1c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 28 Feb 2023 09:34:27 +0100
Subject: vim-patch:partial:dd60c365cd26 (#22437)

vim-patch:partial:dd60c365cd26

Update runtime files

https://github.com/vim/vim/commit/dd60c365cd2630794be84d63c4fe287124a30b97

Co-authored-by: Bram Moolenaar <Bram@vim.org>

Skip: eval.txt, repeat.txt (needs `getscriptinfo()`)
---
 runtime/autoload/python.vim   |   9 +-
 runtime/doc/builtin.txt       |   5 +-
 runtime/doc/change.txt        |   6 +-
 runtime/doc/map.txt           |   6 +-
 runtime/doc/sign.txt          |  12 +-
 runtime/doc/syntax.txt        |  20 ++-
 runtime/ftplugin/quarto.vim   |   1 +
 runtime/ftplugin/r.vim        |   4 +-
 runtime/ftplugin/rhelp.vim    |   4 +-
 runtime/ftplugin/rmd.vim      |  21 ++-
 runtime/ftplugin/rnoweb.vim   |  21 ++-
 runtime/ftplugin/rrst.vim     |   4 +-
 runtime/indent/quarto.vim     |   1 +
 runtime/indent/r.vim          |  14 +-
 runtime/indent/rhelp.vim      |   4 +-
 runtime/indent/rmd.vim        |   6 +-
 runtime/indent/rnoweb.vim     |   4 +-
 runtime/indent/rrst.vim       |   4 +-
 runtime/plugin/matchparen.vim |   5 +-
 runtime/syntax/python.vim     |  20 ++-
 runtime/syntax/python2.vim    | 345 ++++++++++++++++++++++++++++++++++++++++++
 runtime/syntax/quarto.vim     |  17 +++
 runtime/syntax/r.vim          |  48 +++---
 runtime/syntax/rmd.vim        | 209 ++++++++++++++-----------
 runtime/syntax/sh.vim         |  11 +-
 25 files changed, 635 insertions(+), 166 deletions(-)
 create mode 100644 runtime/ftplugin/quarto.vim
 create mode 100644 runtime/indent/quarto.vim
 create mode 100644 runtime/syntax/python2.vim
 create mode 100644 runtime/syntax/quarto.vim

(limited to 'runtime')

diff --git a/runtime/autoload/python.vim b/runtime/autoload/python.vim
index 1eaad09ef5..d5f4862363 100644
--- a/runtime/autoload/python.vim
+++ b/runtime/autoload/python.vim
@@ -22,8 +22,7 @@ let s:maxoff = 50       " maximum number of lines to look backwards for ()
 function s:SearchBracket(fromlnum, flags)
   return searchpairpos('[[({]', '', '[])}]', a:flags,
           \ {-> synstack('.', col('.'))
-          \   ->map({_, id -> id->synIDattr('name')})
-          \   ->match('\%(Comment\|Todo\|String\)$') >= 0},
+          \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\|String\)$'}) >= 0},
           \ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
 endfunction
 
@@ -157,15 +156,13 @@ function python#GetIndent(lnum, ...)
     " the start of the comment.  synID() is slow, a linear search would take
     " too long on a long line.
     if synstack(plnum, pline_len)
-    \ ->map({_, id -> id->synIDattr('name')})
-    \ ->match('\%(Comment\|Todo\)$') >= 0
+    \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\)$'}) >= 0
       let min = 1
       let max = pline_len
       while min < max
 	let col = (min + max) / 2
         if synstack(plnum, col)
-        \ ->map({_, id -> id->synIDattr('name')})
-        \ ->match('\%(Comment\|Todo\)$') >= 0
+        \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\)$'}) >= 0
 	  let max = col
 	else
 	  let min = col + 1
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 3ff4e47a45..b74e30db09 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2126,8 +2126,7 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 extendnew({expr1}, {expr2} [, {expr3}])			*extendnew()*
 		Like |extend()| but instead of adding items to {expr1} a new
 		List or Dictionary is created and returned.  {expr1} remains
-		unchanged.  Items can still be changed by {expr2}, if you
-		don't want that use |deepcopy()| first.
+		unchanged.
 
 
 feedkeys({string} [, {mode}])				*feedkeys()*
@@ -8725,6 +8724,8 @@ timer_start({time}, {callback} [, {options}])
 		{time} is the waiting time in milliseconds. This is the
 		minimum time before invoking the callback.  When the system is
 		busy or Vim is not waiting for input the time will be longer.
+		Zero can be used to execute the callback when Vim is back in
+		the main loop.
 
 		{callback} is the function to call.  It can be the name of a
 		function or a |Funcref|.  It is called with one argument, which
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 990ba3d8fd..2cebd8abdd 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -276,7 +276,9 @@ gr{char}		Replace the virtual characters under the cursor with
 			{char}.  This replaces in screen space, not file
 			space.  See |gR| and |Virtual-Replace-mode| for more
 			details.  As with |r| a count may be given.
-			{char} can be entered like with |r|.
+			{char} can be entered like with |r|, but characters
+			that have a special meaning in Insert mode, such as
+			most CTRL-keys, cannot be used.
 
 						*digraph-arg*
 The argument for Normal mode commands like |r| and |t| is a single character.
@@ -976,7 +978,7 @@ inside of strings can change!  Also see 'softtabstop' option. >
 <			to display registers '1' and 'a'.  Spaces are allowed
 			in {arg}.
 
-							*:di* *:display*
+							*:di* *:dis* *:display*
 :di[splay] [arg]	Same as :registers.
 
 							*y* *yank*
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index ad0570e9f7..3a5223fa3a 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1205,12 +1205,14 @@ functions used in one script use the same name as in other scripts.  To avoid
 this, they can be made local to the script.
 
 						*<SID>* *<SNR>* *E81*
-The string "<SID>" can be used in a mapping or menu.
+The string "<SID>" can be used in a mapping or menu.  This is useful if you
+have a script-local function that you want to call from a mapping in the same
+script.
    When executing the map command, Vim will replace "<SID>" with the special
 key code <SNR>, followed by a number that's unique for the script, and an
 underscore.  Example: >
 	:map <SID>Add
-could define a mapping "<SNR>23_Add".
+would define a mapping "<SNR>23_Add".
 
 When defining a function in a script, "s:" can be prepended to the name to
 make it local to the script.  But when a mapping is executed from outside of
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 53ef03eb63..162bdaed7b 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -595,23 +595,23 @@ sign_placelist({list})
 		|sign_place()| function.  The {list} argument specifies the
 		List of signs to place. Each list item is a dict with the
 		following sign attributes:
-		    buffer	buffer name or number. For the accepted
+		    buffer	Buffer name or number. For the accepted
 				values, see |bufname()|.
-		    group	sign group. {group} functions as a namespace
+		    group	Sign group. {group} functions as a namespace
 				for {id}, thus two groups can use the same
 				IDs. If not specified or set to an empty
 				string, then the global group is used.   See
 				|sign-group| for more information.
-		    id		sign identifier. If not specified or zero,
+		    id		Sign identifier. If not specified or zero,
 				then a new unique identifier is allocated.
 				Otherwise the specified number is used. See
 				|sign-identifier| for more information.
-		    lnum	line number in the buffer where the sign is to
+		    lnum	Line number in the buffer where the sign is to
 				be placed. For the accepted values, see
 				|line()|.
-		    name	name of the sign to place. See |sign_define()|
+		    name	Name of the sign to place. See |sign_define()|
 				for more information.
-		    priority	priority of the sign. When multiple signs are
+		    priority	Priority of the sign. When multiple signs are
 				placed on a line, the sign with the highest
 				priority is used. If not specified, the
 				default value of 10 is used. See
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 7102e93f0a..68d059be82 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2756,17 +2756,25 @@ For highlighted doctests and code inside: >
 	:let python_no_doctest_highlight = 1
 or >
 	:let python_no_doctest_code_highlight = 1
-(first option implies second one).
+The first option implies the second one.
 
 For highlighted trailing whitespace and mix of spaces and tabs: >
 	:let python_space_error_highlight = 1
 
-If you want all possible Python highlighting (the same as setting the
-preceding last option and unsetting all other ones): >
+If you want all possible Python highlighting: >
 	:let python_highlight_all = 1
+This has the same effect as setting python_space_error_highlight and
+unsetting all the other ones.
+
+If you use Python 2 or straddling code (Python 2 and 3 compatible),
+you can enforce the use of an older syntax file with support for
+Python 2 and up to Python 3.5.  >
+	: let python_use_python2_syntax = 1
+This option will exclude all modern Python 3.6 or higher features.
+
+Note: Only existence of these options matters, not their value.
+      You can replace 1 above with anything.
 
-Note: Only existence of these options matter, not their value. You can replace
-      1 above with anything.
 
 QUAKE						*quake.vim* *ft-quake-syntax*
 
@@ -5179,7 +5187,7 @@ Conceal		Placeholder characters substituted for concealed
 							*hl-CurSearch*
 CurSearch	Used for highlighting a search pattern under the cursor
 		(see 'hlsearch').
-							*hl-Cursor*
+						*hl-Cursor* *hl-lCursor*
 Cursor		Character under the cursor.
 lCursor		Character under the cursor when |language-mapping|
 		is used (see 'guicursor').
diff --git a/runtime/ftplugin/quarto.vim b/runtime/ftplugin/quarto.vim
new file mode 100644
index 0000000000..a76bcc2c7e
--- /dev/null
+++ b/runtime/ftplugin/quarto.vim
@@ -0,0 +1 @@
+runtime ftplugin/rmd.vim
diff --git a/runtime/ftplugin/r.vim b/runtime/ftplugin/r.vim
index a78afa2e7e..28966368cb 100644
--- a/runtime/ftplugin/r.vim
+++ b/runtime/ftplugin/r.vim
@@ -2,7 +2,7 @@
 " Language: R
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sat Aug 15, 2020  11:37AM
+" Last Change:	Sun Apr 24, 2022  09:14AM
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
@@ -22,7 +22,7 @@ setlocal comments=:#',:###,:##,:#
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "R Source Files (*.R)\t*.R\n" .
-        \ "Files that include R (*.Rnw *.Rd *.Rmd *.Rrst)\t*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
+        \ "Files that include R (*.Rnw *.Rd *.Rmd *.Rrst *.qmd)\t*.Rnw;*.Rd;*.Rmd;*.Rrst;*.qmd\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
 
diff --git a/runtime/ftplugin/rhelp.vim b/runtime/ftplugin/rhelp.vim
index d0b546d62d..2fde4875c6 100644
--- a/runtime/ftplugin/rhelp.vim
+++ b/runtime/ftplugin/rhelp.vim
@@ -2,7 +2,7 @@
 " Language: R help file
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sat Aug 15, 2020  12:01PM
+" Last Change:	Sun Apr 24, 2022  09:12AM
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
@@ -18,7 +18,7 @@ set cpo&vim
 setlocal iskeyword=@,48-57,_,.
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
+  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst *.qmd)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst;*.qmd\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
 
diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim
index 2ee72ffc6c..355b88f04a 100644
--- a/runtime/ftplugin/rmd.vim
+++ b/runtime/ftplugin/rmd.vim
@@ -2,7 +2,7 @@
 " Language: R Markdown file
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sat Aug 15, 2020  12:03PM
+" Last Change:	Sun Apr 24, 2022  09:12AM
 " Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann)
 
 " Only do this when not yet done for this buffer
@@ -32,13 +32,24 @@ function! FormatRmd()
   return 1
 endfunction
 
-" If you do not want 'comments' dynamically defined, put in your vimrc:
-" let g:rmd_dynamic_comments = 0
+function! SetRmdCommentStr()
+    if (search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")) || ((search('^---$', 'Wn') || search('^\.\.\.$', 'Wn')) && search('^---$', 'bnW'))
+        set commentstring=#\ %s
+    else
+        set commentstring=<!--\ %s\ -->
+    endif
+endfunction
+
+" If you do not want both 'comments' and 'commentstring' dynamically defined,
+" put in your vimrc: let g:rmd_dynamic_comments = 0
 if !exists("g:rmd_dynamic_comments") || (exists("g:rmd_dynamic_comments") && g:rmd_dynamic_comments == 1)
   setlocal formatexpr=FormatRmd()
+  augroup RmdCStr
+    autocmd!
+    autocmd CursorMoved <buffer> call SetRmdCommentStr()
+  augroup END
 endif
 
-
 " Enables pandoc if it is installed
 unlet! b:did_ftplugin
 runtime ftplugin/pandoc.vim
@@ -47,7 +58,7 @@ runtime ftplugin/pandoc.vim
 let b:did_ftplugin = 1
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
+  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst *.qmd)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst;*.qmd\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
 
diff --git a/runtime/ftplugin/rnoweb.vim b/runtime/ftplugin/rnoweb.vim
index dc5f1b5e06..cf1c0922c0 100644
--- a/runtime/ftplugin/rnoweb.vim
+++ b/runtime/ftplugin/rnoweb.vim
@@ -2,7 +2,7 @@
 " Language: Rnoweb
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sat Aug 15, 2020  12:02PM
+" Last Change:	Sun Apr 24, 2022  09:13AM
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
@@ -25,10 +25,27 @@ setlocal suffixesadd=.bib,.tex
 setlocal comments=b:%,b:#,b:##,b:###,b:#'
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
+  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst *.qmd)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst;*.qmd\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
 
+function! SetRnwCommentStr()
+    if (search("^\s*<<.*>>=", "bncW") > search("^@", "bncW"))
+        set commentstring=#\ %s
+    else
+        set commentstring=%\ %s
+    endif
+endfunction
+
+" If you do not want both 'comments' and 'commentstring' dynamically defined,
+" put in your vimrc: let g:rnw_dynamic_comments = 0
+if !exists("g:rnw_dynamic_comments") || (exists("g:rnw_dynamic_comments") && g:rnw_dynamic_comments == 1)
+  augroup RnwCStr
+    autocmd!
+    autocmd CursorMoved <buffer> call SetRnwCommentStr()
+  augroup END
+endif
+
 if exists('b:undo_ftplugin')
   let b:undo_ftplugin .= " | setl isk< sua< com< | unlet! b:browsefilter"
 else
diff --git a/runtime/ftplugin/rrst.vim b/runtime/ftplugin/rrst.vim
index a56fd6478e..19c67c4cc2 100644
--- a/runtime/ftplugin/rrst.vim
+++ b/runtime/ftplugin/rrst.vim
@@ -2,7 +2,7 @@
 " Language: reStructuredText documentation format with R code
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sat Aug 15, 2020  12:02PM
+" Last Change:	Sun Apr 24, 2022  09:13AM
 " Original work by Alex Zvoleff
 
 " Only do this when not yet done for this buffer
@@ -38,7 +38,7 @@ if !exists("g:rrst_dynamic_comments") || (exists("g:rrst_dynamic_comments") && g
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
+  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst *.qmd)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst;*.qmd\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
 
diff --git a/runtime/indent/quarto.vim b/runtime/indent/quarto.vim
new file mode 100644
index 0000000000..586d232d2b
--- /dev/null
+++ b/runtime/indent/quarto.vim
@@ -0,0 +1 @@
+runtime indent/rmd.vim
diff --git a/runtime/indent/r.vim b/runtime/indent/r.vim
index ca85a2e62d..293dd98175 100644
--- a/runtime/indent/r.vim
+++ b/runtime/indent/r.vim
@@ -2,7 +2,7 @@
 " Language:	R
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sun Aug 19, 2018  09:13PM
+" Last Change:	Wed Oct 26, 2022  12:04PM
 
 
 " Only load this indent file when no other was loaded.
@@ -14,6 +14,8 @@ let b:did_indent = 1
 setlocal indentkeys=0{,0},:,!^F,o,O,e
 setlocal indentexpr=GetRIndent()
 
+let b:undo_indent = "setl inde< indk<"
+
 " Only define the function once.
 if exists("*GetRIndent")
   finish
@@ -28,7 +30,7 @@ let g:r_indent_ess_comments   = get(g:, 'r_indent_ess_comments',    0)
 let g:r_indent_comment_column = get(g:, 'r_indent_comment_column', 40)
 let g:r_indent_ess_compatible = get(g:, 'r_indent_ess_compatible',  0)
 let g:r_indent_op_pattern     = get(g:, 'r_indent_op_pattern',
-      \ '\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$')
+      \ '\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\||>\)\s*$')
 
 function s:RDelete_quotes(line)
   let i = 0
@@ -359,17 +361,19 @@ function GetRIndent()
   let olnum = s:Get_prev_line(lnum)
   let oline = getline(olnum)
   if olnum > 0
-    if line =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
-      if oline =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
+    if substitute(line, '#.*', '', '') =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
+      if substitute(oline, '#.*', '', '') =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
         return indent(lnum)
       else
         return indent(lnum) + shiftwidth()
       endif
     else
-      if oline =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
+      if substitute(oline, '#.*', '', '') =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
         return indent(lnum) - shiftwidth()
       endif
     endif
+  elseif substitute(line, '#.*', '', '') =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
+    return indent(lnum) + shiftwidth()
   endif
 
   let post_fun = 0
diff --git a/runtime/indent/rhelp.vim b/runtime/indent/rhelp.vim
index cf69ae3392..2b9d49b915 100644
--- a/runtime/indent/rhelp.vim
+++ b/runtime/indent/rhelp.vim
@@ -2,7 +2,7 @@
 " Language:	R Documentation (Help), *.Rd
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Tue Apr 07, 2015  04:38PM
+" Last Change:	Feb 25, 2023
 
 
 " Only load this indent file when no other was loaded.
@@ -20,6 +20,8 @@ setlocal nolisp
 setlocal indentkeys=0{,0},:,!^F,o,O,e
 setlocal indentexpr=GetCorrectRHelpIndent()
 
+let b:undo_indent = "setl ai< cin< inde< indk< lisp< si<"
+
 " Only define the functions once.
 if exists("*GetRHelpIndent")
   finish
diff --git a/runtime/indent/rmd.vim b/runtime/indent/rmd.vim
index 8fd57257fa..a043b0c994 100644
--- a/runtime/indent/rmd.vim
+++ b/runtime/indent/rmd.vim
@@ -2,7 +2,7 @@
 " Language:	Rmd
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sun Mar 28, 2021  08:05PM
+" Last Change:	Wed Nov 09, 2022  09:44PM
 
 
 " Only load this indent file when no other was loaded.
@@ -16,6 +16,8 @@ let b:did_indent = 1
 setlocal indentkeys=0{,0},<:>,!^F,o,O,e
 setlocal indentexpr=GetRmdIndent()
 
+let b:undo_indent = "setl inde< indk<"
+
 if exists("*GetRmdIndent")
   finish
 endif
@@ -47,6 +49,8 @@ function s:GetMdIndent()
     return indent(v:lnum - 1) + 2
   elseif pline =~ '^\s*\d\+\.\s\+'
     return indent(v:lnum - 1) + 3
+  elseif pline =~ '^\[\^\S\+\]: '
+    return indent(v:lnum - 1) + shiftwidth()
   endif
   return indent(prevnonblank(v:lnum - 1))
 endfunction
diff --git a/runtime/indent/rnoweb.vim b/runtime/indent/rnoweb.vim
index 73966868b8..33bc103d18 100644
--- a/runtime/indent/rnoweb.vim
+++ b/runtime/indent/rnoweb.vim
@@ -2,7 +2,7 @@
 " Language:	Rnoweb
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Fri Apr 15, 2016  10:58PM
+" Last Change:	Feb 25, 2023
 
 
 " Only load this indent file when no other was loaded.
@@ -29,6 +29,8 @@ let b:did_indent = 1
 setlocal indentkeys=0{,0},!^F,o,O,e,},=\bibitem,=\item
 setlocal indentexpr=GetRnowebIndent()
 
+let b:undo_indent = "setl inde< indk<"
+
 if exists("*GetRnowebIndent")
   finish
 endif
diff --git a/runtime/indent/rrst.vim b/runtime/indent/rrst.vim
index f3ee53e7fb..585c5e6654 100644
--- a/runtime/indent/rrst.vim
+++ b/runtime/indent/rrst.vim
@@ -2,7 +2,7 @@
 " Language:	Rrst
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Tue Apr 07, 2015  04:38PM
+" Last Change:	Feb 25, 2023
 
 
 " Only load this indent file when no other was loaded.
@@ -16,6 +16,8 @@ let b:did_indent = 1
 setlocal indentkeys=0{,0},:,!^F,o,O,e
 setlocal indentexpr=GetRrstIndent()
 
+let b:undo_indent = "setl inde< indk<"
+
 if exists("*GetRrstIndent")
   finish
 endif
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index 3982489b92..e19b283228 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -108,8 +108,9 @@ func s:Highlight_Matching_Pair()
     " searchpairpos()'s skip argument.
     " We match "escape" for special items, such as lispEscapeSpecial, and
     " match "symbol" for lispBarSymbol.
-    let s_skip = '!empty(filter(map(synstack(line("."), col(".")), ''synIDattr(v:val, "name")''), ' .
-	\ '''v:val =~? "string\\|character\\|singlequote\\|escape\\|symbol\\|comment"''))'
+    let s_skip = 'synstack(".", col("."))'
+        \ . '->indexof({_, id -> synIDattr(id, "name") =~? '
+        \ . '"string\\|character\\|singlequote\\|escape\\|symbol\\|comment"}) >= 0'
     " If executing the expression determines that the cursor is currently in
     " one of the syntax types, then we want searchpairpos() to find the pair
     " within those syntax types (i.e., not skip).  Otherwise, the cursor is
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index ef4da1b448..831fb92f4c 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Python
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
-" Last Change:	2022 Jun 28
+" Last Change:	2023 Feb 26
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "
@@ -35,12 +35,26 @@
 "
 "   let python_highlight_all = 1
 "
+" The use of Python 2 compatible syntax highlighting can be enforced.
+" The straddling code (Python 2 and 3 compatible), up to Python 3.5,
+" will be also supported.
+"
+"   let python_use_python2_syntax = 1
+"
+" This option will exclude all modern Python 3.6 or higher features.
+"
 
 " quit when a syntax file was already loaded.
 if exists("b:current_syntax")
   finish
 endif
 
+" Use of Python 2 and 3.5 or lower requested.
+if exists("python_use_python2_syntax")
+  runtime! syntax/python2.vim
+  finish
+endif
+
 " We need nocompatible mode in order to continue lines with backslashes.
 " Original setting will be restored.
 let s:cpo_save = &cpo
@@ -91,8 +105,8 @@ syn keyword pythonInclude	from import
 syn keyword pythonAsync		async await
 
 " Soft keywords
-" These keywords do not mean anything unless used in the right context
-" See https://docs.python.org/3/reference/lexical_analysis.html#soft-keywords 
+" These keywords do not mean anything unless used in the right context.
+" See https://docs.python.org/3/reference/lexical_analysis.html#soft-keywords
 " for more on this.
 syn match   pythonConditional   "^\s*\zscase\%(\s\+.*:.*$\)\@="
 syn match   pythonConditional   "^\s*\zsmatch\%(\s\+.*:\s*\%(#.*\)\=$\)\@="
diff --git a/runtime/syntax/python2.vim b/runtime/syntax/python2.vim
new file mode 100644
index 0000000000..3b30eabbae
--- /dev/null
+++ b/runtime/syntax/python2.vim
@@ -0,0 +1,345 @@
+" Vim syntax file
+" Language:	Python 2
+" Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
+" Last Change:	2016 Oct 29
+" Credits:	Neil Schemenauer <nas@python.ca>
+"		Dmitry Vasiliev
+"
+"		This version is a major rewrite by Zvezdan Petkovic.
+"
+"		- introduced highlighting of doctests
+"		- updated keywords, built-ins, and exceptions
+"		- corrected regular expressions for
+"
+"		  * functions
+"		  * decorators
+"		  * strings
+"		  * escapes
+"		  * numbers
+"		  * space error
+"
+"		- corrected synchronization
+"		- more highlighting is ON by default, except
+"		- space error highlighting is OFF by default
+"
+" Optional highlighting can be controlled using these variables.
+"
+"   let python_no_builtin_highlight = 1
+"   let python_no_doctest_code_highlight = 1
+"   let python_no_doctest_highlight = 1
+"   let python_no_exception_highlight = 1
+"   let python_no_number_highlight = 1
+"   let python_space_error_highlight = 1
+"
+" All the options above can be switched on together.
+"
+"   let python_highlight_all = 1
+"
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" NOTE: This file is a copy of the last commit of runtime/syntax/python.vim
+" that still supported Python 2. There is support for Python 3, up to 3.5,
+" and it was kept in the file as is, because it supports the straddling code
+" (Python 2 and 3 compatible) better.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+
+" We need nocompatible mode in order to continue lines with backslashes.
+" Original setting will be restored.
+let s:cpo_save = &cpo
+set cpo&vim
+
+if exists("python_no_doctest_highlight")
+  let python_no_doctest_code_highlight = 1
+endif
+
+if exists("python_highlight_all")
+  if exists("python_no_builtin_highlight")
+    unlet python_no_builtin_highlight
+  endif
+  if exists("python_no_doctest_code_highlight")
+    unlet python_no_doctest_code_highlight
+  endif
+  if exists("python_no_doctest_highlight")
+    unlet python_no_doctest_highlight
+  endif
+  if exists("python_no_exception_highlight")
+    unlet python_no_exception_highlight
+  endif
+  if exists("python_no_number_highlight")
+    unlet python_no_number_highlight
+  endif
+  let python_space_error_highlight = 1
+endif
+
+" Keep Python keywords in alphabetical order inside groups for easy
+" comparison with the table in the 'Python Language Reference'
+" https://docs.python.org/2/reference/lexical_analysis.html#keywords,
+" https://docs.python.org/3/reference/lexical_analysis.html#keywords.
+" Groups are in the order presented in NAMING CONVENTIONS in syntax.txt.
+" Exceptions come last at the end of each group (class and def below).
+"
+" Keywords 'with' and 'as' are new in Python 2.6
+" (use 'from __future__ import with_statement' in Python 2.5).
+"
+" Some compromises had to be made to support both Python 3 and 2.
+" We include Python 3 features, but when a definition is duplicated,
+" the last definition takes precedence.
+"
+" - 'False', 'None', and 'True' are keywords in Python 3 but they are
+"   built-ins in 2 and will be highlighted as built-ins below.
+" - 'exec' is a built-in in Python 3 and will be highlighted as
+"   built-in below.
+" - 'nonlocal' is a keyword in Python 3 and will be highlighted.
+" - 'print' is a built-in in Python 3 and will be highlighted as
+"   built-in below (use 'from __future__ import print_function' in 2)
+" - async and await were added in Python 3.5 and are soft keywords.
+"
+syn keyword pythonStatement	False None True
+syn keyword pythonStatement	as assert break continue del exec global
+syn keyword pythonStatement	lambda nonlocal pass print return with yield
+syn keyword pythonStatement	class def nextgroup=pythonFunction skipwhite
+syn keyword pythonConditional	elif else if
+syn keyword pythonRepeat	for while
+syn keyword pythonOperator	and in is not or
+syn keyword pythonException	except finally raise try
+syn keyword pythonInclude	from import
+syn keyword pythonAsync		async await
+
+" Decorators (new in Python 2.4)
+" A dot must be allowed because of @MyClass.myfunc decorators.
+syn match   pythonDecorator	"@" display contained
+syn match   pythonDecoratorName	"@\s*\h\%(\w\|\.\)*" display contains=pythonDecorator
+
+" Python 3.5 introduced the use of the same symbol for matrix multiplication:
+" https://www.python.org/dev/peps/pep-0465/.  We now have to exclude the
+" symbol from highlighting when used in that context.
+" Single line multiplication.
+syn match   pythonMatrixMultiply
+      \ "\%(\w\|[])]\)\s*@"
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonFunction,pythonDoctestValue
+      \ transparent
+" Multiplication continued on the next line after backslash.
+syn match   pythonMatrixMultiply
+      \ "[^\\]\\\s*\n\%(\s*\.\.\.\s\)\=\s\+@"
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonFunction,pythonDoctestValue
+      \ transparent
+" Multiplication in a parenthesized expression over multiple lines with @ at
+" the start of each continued line; very similar to decorators and complex.
+syn match   pythonMatrixMultiply
+      \ "^\s*\%(\%(>>>\|\.\.\.\)\s\+\)\=\zs\%(\h\|\%(\h\|[[(]\).\{-}\%(\w\|[])]\)\)\s*\n\%(\s*\.\.\.\s\)\=\s\+@\%(.\{-}\n\%(\s*\.\.\.\s\)\=\s\+@\)*"
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonFunction,pythonDoctestValue
+      \ transparent
+
+syn match   pythonFunction	"\h\w*" display contained
+
+syn match   pythonComment	"#.*$" contains=pythonTodo,@Spell
+syn keyword pythonTodo		FIXME NOTE NOTES TODO XXX contained
+
+" Triple-quoted strings can contain doctests.
+syn region  pythonString matchgroup=pythonQuotes
+      \ start=+[uU]\=\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
+      \ contains=pythonEscape,@Spell
+syn region  pythonString matchgroup=pythonTripleQuotes
+      \ start=+[uU]\=\z('''\|"""\)+ end="\z1" keepend
+      \ contains=pythonEscape,pythonSpaceError,pythonDoctest,@Spell
+syn region  pythonRawString matchgroup=pythonQuotes
+      \ start=+[uU]\=[rR]\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
+      \ contains=@Spell
+syn region  pythonRawString matchgroup=pythonTripleQuotes
+      \ start=+[uU]\=[rR]\z('''\|"""\)+ end="\z1" keepend
+      \ contains=pythonSpaceError,pythonDoctest,@Spell
+
+syn match   pythonEscape	+\\[abfnrtv'"\\]+ contained
+syn match   pythonEscape	"\\\o\{1,3}" contained
+syn match   pythonEscape	"\\x\x\{2}" contained
+syn match   pythonEscape	"\%(\\u\x\{4}\|\\U\x\{8}\)" contained
+" Python allows case-insensitive Unicode IDs: http://www.unicode.org/charts/
+syn match   pythonEscape	"\\N{\a\+\%(\s\a\+\)*}" contained
+syn match   pythonEscape	"\\$"
+
+" It is very important to understand all details before changing the
+" regular expressions below or their order.
+" The word boundaries are *not* the floating-point number boundaries
+" because of a possible leading or trailing decimal point.
+" The expressions below ensure that all valid number literals are
+" highlighted, and invalid number literals are not.  For example,
+"
+" - a decimal point in '4.' at the end of a line is highlighted,
+" - a second dot in 1.0.0 is not highlighted,
+" - 08 is not highlighted,
+" - 08e0 or 08j are highlighted,
+"
+" and so on, as specified in the 'Python Language Reference'.
+" https://docs.python.org/2/reference/lexical_analysis.html#numeric-literals
+" https://docs.python.org/3/reference/lexical_analysis.html#numeric-literals
+if !exists("python_no_number_highlight")
+  " numbers (including longs and complex)
+  syn match   pythonNumber	"\<0[oO]\=\o\+[Ll]\=\>"
+  syn match   pythonNumber	"\<0[xX]\x\+[Ll]\=\>"
+  syn match   pythonNumber	"\<0[bB][01]\+[Ll]\=\>"
+  syn match   pythonNumber	"\<\%([1-9]\d*\|0\)[Ll]\=\>"
+  syn match   pythonNumber	"\<\d\+[jJ]\>"
+  syn match   pythonNumber	"\<\d\+[eE][+-]\=\d\+[jJ]\=\>"
+  syn match   pythonNumber
+	\ "\<\d\+\.\%([eE][+-]\=\d\+\)\=[jJ]\=\%(\W\|$\)\@="
+  syn match   pythonNumber
+	\ "\%(^\|\W\)\zs\d*\.\d\+\%([eE][+-]\=\d\+\)\=[jJ]\=\>"
+endif
+
+" Group the built-ins in the order in the 'Python Library Reference' for
+" easier comparison.
+" https://docs.python.org/2/library/constants.html
+" https://docs.python.org/3/library/constants.html
+" http://docs.python.org/2/library/functions.html
+" http://docs.python.org/3/library/functions.html
+" http://docs.python.org/2/library/functions.html#non-essential-built-in-functions
+" http://docs.python.org/3/library/functions.html#non-essential-built-in-functions
+" Python built-in functions are in alphabetical order.
+if !exists("python_no_builtin_highlight")
+  " built-in constants
+  " 'False', 'True', and 'None' are also reserved words in Python 3
+  syn keyword pythonBuiltin	False True None
+  syn keyword pythonBuiltin	NotImplemented Ellipsis __debug__
+  " built-in functions
+  syn keyword pythonBuiltin	abs all any bin bool bytearray callable chr
+  syn keyword pythonBuiltin	classmethod compile complex delattr dict dir
+  syn keyword pythonBuiltin	divmod enumerate eval filter float format
+  syn keyword pythonBuiltin	frozenset getattr globals hasattr hash
+  syn keyword pythonBuiltin	help hex id input int isinstance
+  syn keyword pythonBuiltin	issubclass iter len list locals map max
+  syn keyword pythonBuiltin	memoryview min next object oct open ord pow
+  syn keyword pythonBuiltin	print property range repr reversed round set
+  syn keyword pythonBuiltin	setattr slice sorted staticmethod str
+  syn keyword pythonBuiltin	sum super tuple type vars zip __import__
+  " Python 2 only
+  syn keyword pythonBuiltin	basestring cmp execfile file
+  syn keyword pythonBuiltin	long raw_input reduce reload unichr
+  syn keyword pythonBuiltin	unicode xrange
+  " Python 3 only
+  syn keyword pythonBuiltin	ascii bytes exec
+  " non-essential built-in functions; Python 2 only
+  syn keyword pythonBuiltin	apply buffer coerce intern
+  " avoid highlighting attributes as builtins
+  syn match   pythonAttribute	/\.\h\w*/hs=s+1
+	\ contains=ALLBUT,pythonBuiltin,pythonFunction,pythonAsync
+	\ transparent
+endif
+
+" From the 'Python Library Reference' class hierarchy at the bottom.
+" http://docs.python.org/2/library/exceptions.html
+" http://docs.python.org/3/library/exceptions.html
+if !exists("python_no_exception_highlight")
+  " builtin base exceptions (used mostly as base classes for other exceptions)
+  syn keyword pythonExceptions	BaseException Exception
+  syn keyword pythonExceptions	ArithmeticError BufferError
+  syn keyword pythonExceptions	LookupError
+  " builtin base exceptions removed in Python 3
+  syn keyword pythonExceptions	EnvironmentError StandardError
+  " builtin exceptions (actually raised)
+  syn keyword pythonExceptions	AssertionError AttributeError
+  syn keyword pythonExceptions	EOFError FloatingPointError GeneratorExit
+  syn keyword pythonExceptions	ImportError IndentationError
+  syn keyword pythonExceptions	IndexError KeyError KeyboardInterrupt
+  syn keyword pythonExceptions	MemoryError NameError NotImplementedError
+  syn keyword pythonExceptions	OSError OverflowError ReferenceError
+  syn keyword pythonExceptions	RuntimeError StopIteration SyntaxError
+  syn keyword pythonExceptions	SystemError SystemExit TabError TypeError
+  syn keyword pythonExceptions	UnboundLocalError UnicodeError
+  syn keyword pythonExceptions	UnicodeDecodeError UnicodeEncodeError
+  syn keyword pythonExceptions	UnicodeTranslateError ValueError
+  syn keyword pythonExceptions	ZeroDivisionError
+  " builtin OS exceptions in Python 3
+  syn keyword pythonExceptions	BlockingIOError BrokenPipeError
+  syn keyword pythonExceptions	ChildProcessError ConnectionAbortedError
+  syn keyword pythonExceptions	ConnectionError ConnectionRefusedError
+  syn keyword pythonExceptions	ConnectionResetError FileExistsError
+  syn keyword pythonExceptions	FileNotFoundError InterruptedError
+  syn keyword pythonExceptions	IsADirectoryError NotADirectoryError
+  syn keyword pythonExceptions	PermissionError ProcessLookupError
+  syn keyword pythonExceptions	RecursionError StopAsyncIteration
+  syn keyword pythonExceptions	TimeoutError
+  " builtin exceptions deprecated/removed in Python 3
+  syn keyword pythonExceptions	IOError VMSError WindowsError
+  " builtin warnings
+  syn keyword pythonExceptions	BytesWarning DeprecationWarning FutureWarning
+  syn keyword pythonExceptions	ImportWarning PendingDeprecationWarning
+  syn keyword pythonExceptions	RuntimeWarning SyntaxWarning UnicodeWarning
+  syn keyword pythonExceptions	UserWarning Warning
+  " builtin warnings in Python 3
+  syn keyword pythonExceptions	ResourceWarning
+endif
+
+if exists("python_space_error_highlight")
+  " trailing whitespace
+  syn match   pythonSpaceError	display excludenl "\s\+$"
+  " mixed tabs and spaces
+  syn match   pythonSpaceError	display " \+\t"
+  syn match   pythonSpaceError	display "\t\+ "
+endif
+
+" Do not spell doctests inside strings.
+" Notice that the end of a string, either ''', or """, will end the contained
+" doctest too.  Thus, we do *not* need to have it as an end pattern.
+if !exists("python_no_doctest_highlight")
+  if !exists("python_no_doctest_code_highlight")
+    syn region pythonDoctest
+	  \ start="^\s*>>>\s" end="^\s*$"
+	  \ contained contains=ALLBUT,pythonDoctest,pythonFunction,@Spell
+    syn region pythonDoctestValue
+	  \ start=+^\s*\%(>>>\s\|\.\.\.\s\|"""\|'''\)\@!\S\++ end="$"
+	  \ contained
+  else
+    syn region pythonDoctest
+	  \ start="^\s*>>>" end="^\s*$"
+	  \ contained contains=@NoSpell
+  endif
+endif
+
+" Sync at the beginning of class, function, or method definition.
+syn sync match pythonSync grouphere NONE "^\%(def\|class\)\s\+\h\w*\s*[(:]"
+
+" The default highlight links.  Can be overridden later.
+hi def link pythonStatement		Statement
+hi def link pythonConditional		Conditional
+hi def link pythonRepeat		Repeat
+hi def link pythonOperator		Operator
+hi def link pythonException		Exception
+hi def link pythonInclude		Include
+hi def link pythonAsync			Statement
+hi def link pythonDecorator		Define
+hi def link pythonDecoratorName		Function
+hi def link pythonFunction		Function
+hi def link pythonComment		Comment
+hi def link pythonTodo			Todo
+hi def link pythonString		String
+hi def link pythonRawString		String
+hi def link pythonQuotes		String
+hi def link pythonTripleQuotes		pythonQuotes
+hi def link pythonEscape		Special
+if !exists("python_no_number_highlight")
+  hi def link pythonNumber		Number
+endif
+if !exists("python_no_builtin_highlight")
+  hi def link pythonBuiltin		Function
+endif
+if !exists("python_no_exception_highlight")
+  hi def link pythonExceptions		Structure
+endif
+if exists("python_space_error_highlight")
+  hi def link pythonSpaceError		Error
+endif
+if !exists("python_no_doctest_highlight")
+  hi def link pythonDoctest		Special
+  hi def link pythonDoctestValue	Define
+endif
+
+let b:current_syntax = "python"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2 ts=8 noet:
diff --git a/runtime/syntax/quarto.vim b/runtime/syntax/quarto.vim
new file mode 100644
index 0000000000..d5d4ee257d
--- /dev/null
+++ b/runtime/syntax/quarto.vim
@@ -0,0 +1,17 @@
+" Language: Quarto (Markdown with chunks of R, Python and other languages)
+" Provisory Maintainer: Jakson Aquino <jalvesaq@gmail.com>
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change: Fri Feb 24, 2023  08:26AM
+"
+" The developers of tools for Quarto maintain Vim runtime files in their
+" Github repository and, if required, I will hand over the maintenance of
+" this script for them.
+
+runtime syntax/rmd.vim
+
+syn match quartoShortarg /\S\+/ contained
+syn keyword quartoShortkey var meta env pagebreak video include contained
+syn region quartoShortcode matchgroup=PreProc start='{{< ' end=' >}}' contains=quartoShortkey,quartoShortarg transparent keepend
+
+hi def link quartoShortkey Include
+hi def link quartoShortarg String
diff --git a/runtime/syntax/r.vim b/runtime/syntax/r.vim
index a8100cfded..9b3754ae23 100644
--- a/runtime/syntax/r.vim
+++ b/runtime/syntax/r.vim
@@ -5,7 +5,7 @@
 " 		      Tom Payne <tom@tompayne.org>
 " Contributor:        Johannes Ranke <jranke@uni-bremen.de>
 " Homepage:           https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	      Sun Mar 28, 2021  01:47PM
+" Last Change:	      Thu Nov 17, 2022  10:13PM
 " Filenames:	      *.R *.r *.Rhistory *.Rt
 "
 " NOTE: The highlighting of R functions might be defined in
@@ -65,41 +65,35 @@ if g:r_syntax_hl_roxygen
   " roxygen line containing only a roxygen comment marker, optionally followed
   " by whitespace is called an empty roxygen line.
 
+  syn match rOCommentKey "^\s*#\{1,2}'" contained
+  syn region rOExamples start="^\s*#\{1,2}' @examples.*"rs=e+1,hs=e+1 end="^\(#\{1,2}' @.*\)\@=" end="^\(#\{1,2}'\)\@!" contained contains=rOTag fold
+  
+  " R6 classes may contain roxygen lines independent of roxygen blocks
+  syn region rOR6Class start=/R6Class(/ end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError fold
+  syn match rOR6Block "#\{1,2}'.*" contains=rOTag,rOExamples,@Spell containedin=rOR6Class contained
+  syn match rOR6Block "^\s*#\{1,2}'.*" contains=rOTag,rOExamples,@Spell containedin=rOR6Class contained
+
   " First we match all roxygen blocks as containing only a title. In case an
   " empty roxygen line ending the title or a tag is found, this will be
   " overridden later by the definitions of rOBlock.
-  syn match rOTitleBlock "\%^\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag
-  syn match rOTitleBlock "^\s*\n\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag
+  syn match rOTitleBlock "\(\%^\|^\s*\n\)\@<=\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag
 
   " A title as part of a block is always at the beginning of the block, i.e.
   " either at the start of a file or after a completely empty line.
-  syn match rOTitle "\%^\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" contained contains=rOCommentKey,rOTitleTag
-  syn match rOTitle "^\s*\n\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" contained contains=rOCommentKey,rOTitleTag
+  syn match rOTitle "\(\%^\|^\s*\n\)\@<=\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" contained contains=rOCommentKey,rOTitleTag
   syn match rOTitleTag contained "@title"
 
   " When a roxygen block has a title and additional content, the title
   " consists of one or more roxygen lines (as little as possible are matched),
   " followed either by an empty roxygen line
-  syn region rOBlock start="\%^\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" end="^\s*\(#\{1,2}'\)\@!" contains=rOTitle,rOTag,rOExamples,@Spell keepend fold
-  syn region rOBlock start="^\s*\n\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" end="^\s*\(#\{1,2}'\)\@!" contains=rOTitle,rOTag,rOExamples,@Spell keepend fold
+  syn region rOBlock start="\(\%^\|^\s*\n\)\@<=\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" end="^\s*\(#\{1,2}'\)\@!" contains=rOTitle,rOTag,rOExamples,@Spell keepend fold
 
   " or by a roxygen tag (we match everything starting with @ but not @@ which is used as escape sequence for a literal @).
-  syn region rOBlock start="\%^\(\s*#\{1,2}' .*\n\)\{-}\s*#\{1,2}' @\(@\)\@!" end="^\s*\(#\{1,2}'\)\@!" contains=rOTitle,rOTag,rOExamples,@Spell keepend fold
-  syn region rOBlock start="^\s*\n\(\s*#\{1,2}' .*\n\)\{-}\s*#\{1,2}' @\(@\)\@!" end="^\s*\(#\{1,2}'\)\@!" contains=rOTitle,rOTag,rOExamples,@Spell keepend fold
+  syn region rOBlock start="\(\%^\|^\s*\n\)\@<=\(\s*#\{1,2}' .*\n\)\{-}\s*#\{1,2}' @\(@\)\@!" end="^\s*\(#\{1,2}'\)\@!" contains=rOTitle,rOTag,rOExamples,@Spell keepend fold
 
   " If a block contains an @rdname, @describeIn tag, it may have paragraph breaks, but does not have a title
-  syn region rOBlockNoTitle start="\%^\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*\n\(\s*#\{1,2}'.*\n\)\{-}\s*#\{1,2}' @rdname" end="^\s*\(#\{1,2}'\)\@!" contains=rOTag,rOExamples,@Spell keepend fold
-  syn region rOBlockNoTitle start="^\s*\n\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*\n\(\s*#\{1,2}'.*\n\)\{-}\s*#\{1,2}' @rdname" end="^\s*\(#\{1,2}'\)\@!" contains=rOTag,rOExamples,@Spell keepend fold
-  syn region rOBlockNoTitle start="\%^\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*\n\(\s*#\{1,2}'.*\n\)\{-}\s*#\{1,2}' @describeIn" end="^\s*\(#\{1,2}'\)\@!" contains=rOTag,rOExamples,@Spell keepend fold
-  syn region rOBlockNoTitle start="^\s*\n\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*\n\(\s*#\{1,2}'.*\n\)\{-}\s*#\{1,2}' @describeIn" end="^\s*\(#\{1,2}'\)\@!" contains=rOTag,rOExamples,@Spell keepend fold
-
-  syn match rOCommentKey "^\s*#\{1,2}'" contained
-  syn region rOExamples start="^\s*#\{1,2}' @examples.*"rs=e+1,hs=e+1 end="^\(#\{1,2}' @.*\)\@=" end="^\(#\{1,2}'\)\@!" contained contains=rOTag fold
-
-  " R6 classes may contain roxygen lines independent of roxygen blocks
-  syn region rOR6Class start=/R6Class(/ end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError fold
-  syn match rOR6Block "#\{1,2}'.*" contains=rOTag,rOExamples,@Spell containedin=rOR6Class contained
-  syn match rOR6Block "^\s*#\{1,2}'.*" contains=rOTag,rOExamples,@Spell containedin=rOR6Class contained
+  syn region rOBlockNoTitle start="\(\%^\|^\s*\n\)\@<=\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*\n\(\s*#\{1,2}'.*\n\)\{-}\s*#\{1,2}' @rdname" end="^\s*\(#\{1,2}'\)\@!" contains=rOTag,rOExamples,@Spell keepend fold
+  syn region rOBlockNoTitle start="\(\%^\|^\s*\n\)\@<=\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*\n\(\s*#\{1,2}'.*\n\)\{-}\s*#\{1,2}' @describeIn" end="^\s*\(#\{1,2}'\)\@!" contains=rOTag,rOExamples,@Spell keepend fold
 
   " rOTag list originally generated from the lists that were available in
   " https://github.com/klutometis/roxygen/R/rd.R and
@@ -245,14 +239,15 @@ syn match rOperator    "&"
 syn match rOperator    '-'
 syn match rOperator    '\*'
 syn match rOperator    '+'
-if &filetype != "rmd" && &filetype != "rrst"
-  syn match rOperator    "[|!<>^~/:]"
-else
+if &filetype == "quarto" || &filetype == "rmd" || &filetype == "rrst"
   syn match rOperator    "[|!<>^~`/:]"
+else
+  syn match rOperator    "[|!<>^~/:]"
 endif
 syn match rOperator    "%\{2}\|%\S\{-}%"
 syn match rOperator '\([!><]\)\@<=='
 syn match rOperator '=='
+syn match rOperator '|>'
 syn match rOpError  '\*\{3}'
 syn match rOpError  '//'
 syn match rOpError  '&&&'
@@ -318,10 +313,13 @@ if &filetype == "rhelp"
 endif
 
 " Type
+syn match rType "\\"
 syn keyword rType array category character complex double function integer list logical matrix numeric vector data.frame
 
 " Name of object with spaces
-if &filetype != "rmd" && &filetype != "rrst"
+if &filetype == "rmd" || &filetype == "rrst" || &filetype == "quarto"
+  syn region rNameWSpace start="`" end="`" contains=rSpaceFun containedin=rmdrChunk
+else
   syn region rNameWSpace start="`" end="`" contains=rSpaceFun
 endif
 
diff --git a/runtime/syntax/rmd.vim b/runtime/syntax/rmd.vim
index cccd4110f5..f849af97d2 100644
--- a/runtime/syntax/rmd.vim
+++ b/runtime/syntax/rmd.vim
@@ -1,7 +1,7 @@
-" markdown Text with R statements
-" Language: markdown with R code chunks
+" Language: Markdown with chunks of R, Python and other languages
+" Maintainer: Jakson Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change: Wed Apr 21, 2021  09:55AM
+" Last Change: Fri Feb 24, 2023  08:28AM
 "
 "   For highlighting pandoc extensions to markdown like citations and TeX and
 "   many other advanced features like folding of markdown sections, it is
@@ -13,63 +13,120 @@ if exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " Highlight the header of the chunks as R code
 let g:rmd_syn_hl_chunk = get(g:, 'rmd_syn_hl_chunk', 0)
 
 " Pandoc-syntax has more features, but it is slower.
 " https://github.com/vim-pandoc/vim-pandoc-syntax
-let g:pandoc#syntax#codeblocks#embeds#langs = get(g:, 'pandoc#syntax#codeblocks#embeds#langs', ['r'])
+
+" Don't waste time loading syntax that will be discarded:
+let s:save_pandoc_lngs = get(g:, 'pandoc#syntax#codeblocks#embeds#langs', [])
+let g:pandoc#syntax#codeblocks#embeds#langs = []
+
+" Step_1: Source pandoc.vim if it is installed:
 runtime syntax/pandoc.vim
 if exists("b:current_syntax")
+  if hlexists('pandocDelimitedCodeBlock')
+    syn clear pandocDelimitedCodeBlock
+  endif
+
+  if len(s:save_pandoc_lngs) > 0 && !exists('g:rmd_fenced_languages')
+    let g:rmd_fenced_languages = deepcopy(s:save_pandoc_lngs)
+  endif
+
   " Recognize inline R code
-  syn region rmdrInline matchgroup=rmdInlineDelim start="`r "  end="`" contains=@R containedin=pandocLaTeXRegion,yamlFlowString keepend
-  hi def link rmdInlineDelim Delimiter
-
-  " Fix recognition of language chunks (code adapted from pandoc, 2021-03-28)
-  " Knitr requires braces in the block's header
-  for s:lng in g:pandoc#syntax#codeblocks#embeds#langs
-    let s:nm = matchstr(s:lng, '^[^=]*')
-    exe 'syn clear pandocDelimitedCodeBlock_'.s:nm
-    exe 'syn clear pandocDelimitedCodeBlockinBlockQuote_'.s:nm
-    if g:rmd_syn_hl_chunk
-      exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@R'
-      exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=rmd'.s:nm.'ChunkDelim,@'.toupper(s:nm)
+  syn region rmdrInline matchgroup=rmdInlineDelim start="`r "  end="`" contains=@Rmdr containedin=pandocLaTeXRegion,yamlFlowString keepend
+else
+  " Step_2: Source markdown.vim if pandoc.vim is not installed
+
+  " Configuration if not using pandoc syntax:
+  " Add syntax highlighting of YAML header
+  let g:rmd_syn_hl_yaml = get(g:, 'rmd_syn_hl_yaml', 1)
+  " Add syntax highlighting of citation keys
+  let g:rmd_syn_hl_citations = get(g:, 'rmd_syn_hl_citations', 1)
+
+  " R chunks will not be highlighted by syntax/markdown because their headers
+  " follow a non standard pattern: "```{lang" instead of "^```lang".
+  " Make a copy of g:markdown_fenced_languages to highlight the chunks later:
+  if exists('g:markdown_fenced_languages') && !exists('g:rmd_fenced_languages')
+    let g:rmd_fenced_languages = deepcopy(g:markdown_fenced_languages)
+  endif
+
+  if exists('g:markdown_fenced_languages') && len(g:markdown_fenced_languages) > 0
+    let s:save_mfl = deepcopy(g:markdown_fenced_languages)
+  endif
+  " Don't waste time loading syntax that will be discarded:
+  let g:markdown_fenced_languages = []
+  runtime syntax/markdown.vim
+  if exists('s:save_mfl') > 0
+    let g:markdown_fenced_languages = deepcopy(s:save_mfl)
+    unlet s:save_mfl
+  endif
+  syn region rmdrInline matchgroup=rmdInlineDelim start="`r "  end="`" contains=@Rmdr keepend
+
+  " Step_2a: Add highlighting for both YAML and citations which are pandoc
+  " specific, but also used in Rmd files
+
+  " You don't need this if either your markdown/syntax.vim already highlights
+  " the YAML header or you are writing standard markdown
+  if g:rmd_syn_hl_yaml
+    " Basic highlighting of YAML header
+    syn match rmdYamlFieldTtl /^\s*\zs\w\%(-\|\w\)*\ze:/ contained
+    syn match rmdYamlFieldTtl /^\s*-\s*\zs\w\%(-\|\w\)*\ze:/ contained
+    syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"' contains=yamlEscape,rmdrInline contained
+    syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''"  end="'" contains=yamlSingleEscape,rmdrInline contained
+    syn match  yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
+    syn match  yamlSingleEscape contained "''"
+    syn match yamlComment /#.*/ contained
+    " A second colon is a syntax error, unles within a string or following !expr
+    syn match yamlColonError /:\s*[^'^"^!]*:/ contained
+    if &filetype == 'quarto'
+      syn region pandocYAMLHeader matchgroup=rmdYamlBlockDelim start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/^---$/ keepend contains=rmdYamlFieldTtl,yamlFlowString,yamlComment,yamlColonError
     else
-      exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@'.toupper(s:nm)
+      syn region pandocYAMLHeader matchgroup=rmdYamlBlockDelim start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/^\([-.]\)\1\{2}$/ keepend contains=rmdYamlFieldTtl,yamlFlowString,yamlComment,yamlColonError
     endif
-  endfor
-  unlet s:lng
-  unlet s:nm
-  hi def link rmdInlineDelim Delimiter
-  hi def link rmdCodeDelim Delimiter
-  let b:current_syntax = "rmd"
-  finish
-endif
-
-" Configuration if not using pandoc syntax:
-" Add syntax highlighting of YAML header
-let g:rmd_syn_hl_yaml = get(g:, 'rmd_syn_hl_yaml', 1)
-" Add syntax highlighting of citation keys
-let g:rmd_syn_hl_citations = get(g:, 'rmd_syn_hl_citations', 1)
-
-let s:cpo_save = &cpo
-set cpo&vim
+    hi def link rmdYamlBlockDelim Delimiter
+    hi def link rmdYamlFieldTtl Identifier
+    hi def link yamlFlowString String
+    hi def link yamlComment Comment
+    hi def link yamlColonError Error
+  endif
 
-" R chunks will not be highlighted by syntax/markdown because their headers
-" follow a non standard pattern: "```{lang" instead of "^```lang".
-" Make a copy of g:markdown_fenced_languages to highlight the chunks later:
-if exists('g:markdown_fenced_languages')
-  if !exists('g:rmd_fenced_languages')
-    let g:rmd_fenced_languages = deepcopy(g:markdown_fenced_languages)
-    let g:markdown_fenced_languages = []
+  " You don't need this if either your markdown/syntax.vim already highlights
+  " citations or you are writing standard markdown
+  if g:rmd_syn_hl_citations
+    " From vim-pandoc-syntax
+    " parenthetical citations
+    syn match pandocPCite /\^\@<!\[[^\[\]]\{-}-\{0,1}@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*.\{-}\]/ contains=pandocEmphasis,pandocStrong,pandocLatex,pandocCiteKey,@Spell,pandocAmpersandEscape display
+    " in-text citations with location
+    syn match pandocICite /@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\s\[.\{-1,}\]/ contains=pandocCiteKey,@Spell display
+    " cite keys
+    syn match pandocCiteKey /\(-\=@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\)/ containedin=pandocPCite,pandocICite contains=@NoSpell display
+    syn match pandocCiteAnchor /[-@]/ contained containedin=pandocCiteKey display
+    syn match pandocCiteLocator /[\[\]]/ contained containedin=pandocPCite,pandocICite
+    hi def link pandocPCite Operator
+    hi def link pandocICite Operator
+    hi def link pandocCiteKey Label
+    hi def link pandocCiteAnchor Operator
+    hi def link pandocCiteLocator Operator
   endif
-else
-  let g:rmd_fenced_languages = ['r']
 endif
 
-runtime syntax/markdown.vim
+" Step_3: Highlight code blocks.
+
+syn region rmdCodeBlock matchgroup=rmdCodeDelim start="^\s*```\s*{.*}$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend
+syn region rmdCodeBlock matchgroup=rmdCodeDelim start="^\s*```.+$" matchgroup=rmdCodeDelim end="^```$" keepend
+hi link rmdCodeBlock Special
 
 " Now highlight chunks:
+syn region knitrBodyOptions start='^#| ' end='$' contained  containedin=rComment,pythonComment contains=knitrBodyVar,knitrBodyValue transparent
+syn match knitrBodyValue ': \zs.*\ze$' keepend contained containedin=knitrBodyOptions
+syn match knitrBodyVar '| \zs\S\{-}\ze:' contained containedin=knitrBodyOptions
+
+let g:rmd_fenced_languages = get(g:, 'rmd_fenced_languages', ['r'])
 for s:type in g:rmd_fenced_languages
   if s:type =~ '='
     let s:ft = substitute(s:type, '.*=', '', '')
@@ -81,58 +138,40 @@ for s:type in g:rmd_fenced_languages
   unlet! b:current_syntax
   exe 'syn include @Rmd'.s:nm.' syntax/'.s:ft.'.vim'
   if g:rmd_syn_hl_chunk
-    exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@Rmdr'
-    exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=rmd'.s:nm.'ChunkDelim,@Rmd'.s:nm
+    exe 'syn match knitrChunkDelim /```\s*{\s*'.s:nm.'/ contained containedin=knitrChunkBrace contains=knitrChunkLabel'
+    exe 'syn match knitrChunkLabelDelim /```\s*{\s*'.s:nm.',\=\s*[-[:alnum:]]\{-1,}[,}]/ contained containedin=knitrChunkBrace'
+    syn match knitrChunkDelim /}\s*$/ contained containedin=knitrChunkBrace
+    exe 'syn match knitrChunkBrace /```\s*{\s*'.s:nm.'.*$/ contained containedin=rmd'.s:nm.'Chunk contains=knitrChunkDelim,knitrChunkLabelDelim,@Rmd'.s:nm
+    exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*=\?'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=knitrChunkBrace,@Rmd'.s:nm
+
+    hi link knitrChunkLabel Identifier
+    hi link knitrChunkDelim rmdCodeDelim
+    hi link knitrChunkLabelDelim rmdCodeDelim
   else
-    exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@Rmd'.s:nm
+    exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*=\?'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@Rmd'.s:nm
   endif
 endfor
 unlet! s:type
 
-" Recognize inline R code
-syn region rmdrInline matchgroup=rmdInlineDelim start="`r "  end="`" contains=@Rmdr keepend
+" Step_4: Highlight code recognized by pandoc but not defined in pandoc.vim yet:
+syn match pandocDivBegin '^:::\+ {.\{-}}' contains=pandocHeaderAttr
+syn match pandocDivEnd '^:::\+$'
 
+hi def link knitrBodyVar PreProc
+hi def link knitrBodyValue Constant
+hi def link knitrBodyOptions rComment
+hi def link pandocDivBegin Delimiter
+hi def link pandocDivEnd Delimiter
 hi def link rmdInlineDelim Delimiter
 hi def link rmdCodeDelim Delimiter
 
-" You don't need this if either your markdown/syntax.vim already highlights
-" the YAML header or you are writing standard markdown
-if g:rmd_syn_hl_yaml
-  " Minimum highlighting of yaml header
-  syn match rmdYamlFieldTtl /^\s*\zs\w*\ze:/ contained
-  syn match rmdYamlFieldTtl /^\s*-\s*\zs\w*\ze:/ contained
-  syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"' contains=yamlEscape,rmdrInline contained
-  syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''"  end="'" contains=yamlSingleEscape,rmdrInline contained
-  syn match  yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
-  syn match  yamlSingleEscape contained "''"
-  syn region pandocYAMLHeader matchgroup=rmdYamlBlockDelim start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/^\([-.]\)\1\{2}$/ keepend contains=rmdYamlFieldTtl,yamlFlowString
-  hi def link rmdYamlBlockDelim Delimiter
-  hi def link rmdYamlFieldTtl Identifier
-  hi def link yamlFlowString String
-endif
-
-" You don't need this if either your markdown/syntax.vim already highlights
-" citations or you are writing standard markdown
-if g:rmd_syn_hl_citations
-  " From vim-pandoc-syntax
-  " parenthetical citations
-  syn match pandocPCite /\^\@<!\[[^\[\]]\{-}-\{0,1}@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*.\{-}\]/ contains=pandocEmphasis,pandocStrong,pandocLatex,pandocCiteKey,@Spell,pandocAmpersandEscape display
-  " in-text citations with location
-  syn match pandocICite /@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\s\[.\{-1,}\]/ contains=pandocCiteKey,@Spell display
-  " cite keys
-  syn match pandocCiteKey /\(-\=@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\)/ containedin=pandocPCite,pandocICite contains=@NoSpell display
-  syn match pandocCiteAnchor /[-@]/ contained containedin=pandocCiteKey display
-  syn match pandocCiteLocator /[\[\]]/ contained containedin=pandocPCite,pandocICite
-  hi def link pandocPCite Operator
-  hi def link pandocICite Operator
-  hi def link pandocCiteKey Label
-  hi def link pandocCiteAnchor Operator
-  hi def link pandocCiteLocator Operator
+if len(s:save_pandoc_lngs)
+  let g:pandoc#syntax#codeblocks#embeds#langs = s:save_pandoc_lngs
 endif
-
-let b:current_syntax = "rmd"
-
+unlet s:save_pandoc_lngs
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
+let b:current_syntax = "rmd"
+
 " vim: ts=8 sw=2
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 13d74dbc17..f455f19c93 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Dec 20, 2022
-" Version:		205
+" Last Change:		Feb 11, 2023
+" Version:		207
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras
@@ -166,7 +166,7 @@ if exists("b:is_kornshell") || exists("b:is_bash")
  syn cluster shLoopoList	add=shForPP
 endif
 syn cluster shPPSLeftList	contains=shAlias,shArithmetic,shCmdParenRegion,shCommandSub,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
-syn cluster shPPSRightList	contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
+syn cluster shPPSRightList	contains=shDeref,shDerefSimple,shEscape,shPosnParm
 syn cluster shSubShList	contains=@shCommandSubList,shCommandSubBQ,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
 syn cluster shTestList	contains=shArithmetic,shCharClass,shCommandSub,shCommandSubBQ,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shSpecialDQ,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shSingleQuote,shTest,shTestOpr
 syn cluster shNoZSList	contains=shSpecialNoZS
@@ -335,7 +335,7 @@ syn match   shEscape	contained	'\%(^\)\@!\%(\\\\\)*\\.'	nextgroup=shComment
 " systems too, however, so the following syntax will flag $(..) as
 " an Error under /bin/sh.  By consensus of vimdev'ers!
 if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
- syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$"  skip='\\\\\|\\.' end=")"  contains=@shCommandSubList
+ syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]"  skip='\\\\\|\\.' end=")"  contains=@shCommandSubList
  syn region shArithmetic matchgroup=shArithRegion  start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList
  syn region shArithmetic matchgroup=shArithRegion  start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList
  syn match  shSkipInitWS contained	"^\s\+"
@@ -503,7 +503,6 @@ endif
 " ksh: ${.sh.*} variables: {{{1
 " ========================================
 if exists("b:is_kornshell")
-" syn match  shDerefVar	contained	"[.]*"	nextgroup=@shDerefVarList
  syn match  shDerefVar	contained	"\.\+"	nextgroup=@shDerefVarList
 endif
 
@@ -548,6 +547,7 @@ syn region  shDerefVarArray   contained	matchgroup=shDeref start="\[" end="]"	co
 "        bash : ${parameter,pattern}  Case modification
 "        bash : ${parameter,,pattern} Case modification
 "        bash : ${@:start:qty}        display command line arguments from start to start+qty-1 (inferred)
+"        bash : ${parameter@operator} transforms parameter (operator∈[uULqEPARa])
 syn cluster shDerefPatternList	contains=shDerefPattern,shDerefString
 if !exists("g:sh_no_error")
  syn match shDerefOpError	contained	":[[:punct:]]"
@@ -563,6 +563,7 @@ if exists("b:is_bash") || exists("b:is_kornshell") || exists("b:is_posix")
 endif
 if exists("b:is_bash")
  syn match  shDerefOp	contained	"[,^]\{1,2}"	nextgroup=@shDerefPatternList
+ syn match  shDerefOp	contained	"@[uULQEPAKa]"
 endif
 syn region shDerefString	contained	matchgroup=shDerefDelim start=+\%(\\\)\@<!'+ end=+'+	contains=shStringSpecial
 syn region shDerefString	contained	matchgroup=shDerefDelim start=+\%(\\\)\@<!"+ skip=+\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial
-- 
cgit 


From 7574d58304aa3b030aca8f5feafc0f92ec1d81e2 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 28 Feb 2023 12:12:08 +0100
Subject: fix(inspect): alwasy resolve full treesitter lang hl groups

---
 runtime/lua/vim/_inspector.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua
index f46a525910..bb6608421b 100644
--- a/runtime/lua/vim/_inspector.lua
+++ b/runtime/lua/vim/_inspector.lua
@@ -69,7 +69,7 @@ function vim.inspect_pos(bufnr, row, col, filter)
   -- treesitter
   if filter.treesitter then
     for _, capture in pairs(vim.treesitter.get_captures_at_pos(bufnr, row, col)) do
-      capture.hl_group = '@' .. capture.capture
+      capture.hl_group = '@' .. capture.capture .. '.' .. capture.lang
       table.insert(results.treesitter, resolve_hl(capture))
     end
   end
-- 
cgit 


From bfa0bc7df0ca527fcec49dbd2055f1bac438663e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 28 Feb 2023 19:04:32 +0800
Subject: vim-patch:9.0.0795: readblob() always reads the whole file

Problem:    readblob() always reads the whole file.
Solution:   Add arguments to read part of the file. (Ken Takata,
            closes vim/vim#11402)

https://github.com/vim/vim/commit/11df3aeee548b959ccd4b9a4d3c44651eab6b3ce

Remove trailing whitespace in test as done in patch 9.0.1257.
Move the help for rand() before range().

Co-authored-by: K.Takata <kentkt@csc.jp>
---
 runtime/doc/builtin.txt | 53 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 20 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index ed8c78ef2f..113703680f 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -359,7 +359,8 @@ pyxeval({expr})			any	evaluate |python_x| expression
 rand([{expr}])			Number	get pseudo-random number
 range({expr} [, {max} [, {stride}]])
 				List	items from {expr} to {max}
-readblob({fname})		Blob	read a |Blob| from {fname}
+readblob({fname} [, {offset} [, {size}]])
+				Blob	read a |Blob| from {fname}
 readdir({dir} [, {expr}])	List	file names in {dir} selected by {expr}
 readfile({fname} [, {type} [, {max}]])
 				List	get list of lines from file {fname}
@@ -6110,6 +6111,25 @@ pyxeval({expr})						*pyxeval()*
 		Can also be used as a |method|: >
 			GetExpr()->pyxeval()
 <
+rand([{expr}])						*rand()*
+		Return a pseudo-random Number generated with an xoshiro128**
+		algorithm using seed {expr}.  The returned number is 32 bits,
+		also on 64 bits systems, for consistency.
+		{expr} can be initialized by |srand()| and will be updated by
+		rand().  If {expr} is omitted, an internal seed value is used
+		and updated.
+		Returns -1 if {expr} is invalid.
+
+		Examples: >
+			:echo rand()
+			:let seed = srand()
+			:echo rand(seed)
+			:echo rand(seed) % 16  " random number 0 - 15
+<
+		Can also be used as a |method|: >
+			seed->rand()
+<
+
 							*E726* *E727*
 range({expr} [, {max} [, {stride}]])				*range()*
 		Returns a |List| with Numbers:
@@ -6132,29 +6152,22 @@ range({expr} [, {max} [, {stride}]])				*range()*
 		Can also be used as a |method|: >
 			GetExpr()->range()
 <
-rand([{expr}])						*rand()*
-		Return a pseudo-random Number generated with an xoshiro128**
-		algorithm using seed {expr}.  The returned number is 32 bits,
-		also on 64 bits systems, for consistency.
-		{expr} can be initialized by |srand()| and will be updated by
-		rand().  If {expr} is omitted, an internal seed value is used
-		and updated.
-		Returns -1 if {expr} is invalid.
-
-		Examples: >
-			:echo rand()
-			:let seed = srand()
-			:echo rand(seed)
-			:echo rand(seed) % 16  " random number 0 - 15
-<
-		Can also be used as a |method|: >
-			seed->rand()
-<
 
-readblob({fname})					*readblob()*
+readblob({fname} [, {offset} [, {size}]])			*readblob()*
 		Read file {fname} in binary mode and return a |Blob|.
+		If {offset} is specified, read the file from the specified
+		offset.  If it is a negative value, it is used as an offset
+		from the end of the file.  E.g., to read the last 12 bytes: >
+			readblob('file.bin', -12)
+<		If {size} is specified, only the specified size will be read.
+		E.g. to read the first 100 bytes of a file: >
+			readblob('file.bin', 0, 100)
+<		If {size} is -1 or omitted, the whole data starting from
+		{offset} will be read.
 		When the file can't be opened an error message is given and
 		the result is an empty |Blob|.
+		When trying to read bytes beyond the end of the file the
+		result is an empty blob.
 		Also see |readfile()| and |writefile()|.
 
 
-- 
cgit 


From 4bd0611d7b07b56fc5a9e121669a313166ba540f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 28 Feb 2023 19:23:28 +0800
Subject: vim-patch:9.0.0803: readblob() cannot read from character device

Problem:    readblob() cannot read from character device.
Solution:   Use S_ISCHR() to not check the size. (Ken Takata, closes vim/vim#11407)

https://github.com/vim/vim/commit/43625762a9751cc6e6e4d8f54fbc8b82d98fb20d

S_ISCHR is always defined in Nvim.

Co-authored-by: K.Takata <kentkt@csc.jp>
---
 runtime/doc/builtin.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 113703680f..eab415f495 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6164,7 +6164,12 @@ readblob({fname} [, {offset} [, {size}]])			*readblob()*
 			readblob('file.bin', 0, 100)
 <		If {size} is -1 or omitted, the whole data starting from
 		{offset} will be read.
-		When the file can't be opened an error message is given and
+		This can be also used to read the data from a character device
+		on Unix when {size} is explicitly set.  Only if the device
+		supports seeking {offset} can be used.  Otherwise it should be
+		zero.  E.g. to read 10 bytes from a serial console: >
+			readblob('/dev/ttyS0', 0, 10)
+<		When the file can't be opened an error message is given and
 		the result is an empty |Blob|.
 		When trying to read bytes beyond the end of the file the
 		result is an empty blob.
-- 
cgit 


From 7aad75e293e3a01e292308ca2058e35083b83280 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 28 Feb 2023 19:29:59 +0800
Subject: vim-patch:9.0.0810: readblob() returns empty when trying to read too
 much

Problem:    readblob() returns empty when trying to read too much.
Solution:   Return what is available.

https://github.com/vim/vim/commit/5b2a3d77d320d76f12b1666938a9d58c2a848205

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index eab415f495..568b73ddfa 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6171,8 +6171,10 @@ readblob({fname} [, {offset} [, {size}]])			*readblob()*
 			readblob('/dev/ttyS0', 0, 10)
 <		When the file can't be opened an error message is given and
 		the result is an empty |Blob|.
-		When trying to read bytes beyond the end of the file the
-		result is an empty blob.
+		When the offset is beyond the end of the file the result is an
+		empty blob.
+		When trying to read more bytes than are available the result
+		is truncated.
 		Also see |readfile()| and |writefile()|.
 
 
-- 
cgit 


From 7e19cabeb192d2e7f20d7bb965a3f62e1543d2ac Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Tue, 28 Feb 2023 12:38:33 +0100
Subject: perf(lsp): only redraw the windows containing LSP tokens

redraw! redraws the entire screen instead of just the windows with
the buffer which were actually changed.

I considered trying to calculating the range for the delta
but it looks tricky. Could a follow-up.
---
 runtime/lua/vim/lsp/semantic_tokens.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 00b4757ea9..24b5c6c24e 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -334,7 +334,8 @@ function STHighlighter:process_response(response, client, version)
   current_result.highlights = tokens_to_ranges(tokens, self.bufnr, client)
   current_result.namespace_cleared = false
 
-  api.nvim_command('redraw!')
+  -- redraw all windows displaying buffer
+  api.nvim__buf_redraw_range(self.bufnr, 0, -1)
 end
 
 --- on_win handler for the decoration provider (see |nvim_set_decoration_provider|)
-- 
cgit 


From f6b9791212e86bac3e8128035dec2bfc5016927f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 28 Feb 2023 20:18:52 +0800
Subject: vim-patch:8.2.3438: cannot manipulate blobs

Problem:    Cannot manipulate blobs.
Solution:   Add blob2list() and list2blob(). (Yegappan Lakshmanan,
            closes vim/vim#8868)

https://github.com/vim/vim/commit/5dfe467432638fac2e0156a2f9cd0d9eb569fb39

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 28 +++++++++++++++++++++++++++-
 runtime/doc/usr_41.txt  |  6 ++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 568b73ddfa..b194a104f7 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -55,6 +55,7 @@ assert_report({msg})		Number	report a test failure
 assert_true({actual} [, {msg}])	Number	assert {actual} is true
 atan({expr})			Float	arc tangent of {expr}
 atan2({expr1}, {expr2})		Float	arc tangent of {expr1} / {expr2}
+blob2list({blob})		List	convert {blob} into a list of numbers
 browse({save}, {title}, {initdir}, {default})
 				String	put up a file requester
 browsedir({title}, {initdir})	String	put up a directory requester
@@ -296,7 +297,8 @@ libcallnr({lib}, {func}, {arg})	Number	idem, but return a Number
 line({expr} [, {winid}])	Number	line nr of cursor, last line or mark
 line2byte({lnum})		Number	byte count of line {lnum}
 lispindent({lnum})		Number	Lisp indent for line {lnum}
-list2str({list} [, {utf8}])	String	turn numbers in {list} into a String
+list2blob({list})		Blob	turn {list} of numbers into a Blob
+list2str({list} [, {utf8}])	String	turn {list} of numbers into a String
 localtime()			Number	current time
 log({expr})			Float	natural logarithm (base e) of {expr}
 log10({expr})			Float	logarithm of Float {expr} to base 10
@@ -777,6 +779,17 @@ atan2({expr1}, {expr2})					*atan2()*
 		Can also be used as a |method|: >
 			Compute()->atan2(1)
 
+blob2list({blob})					*blob2list()*
+		Return a List containing the number value of each byte in Blob
+		{blob}.  Examples: >
+			blob2list(0z0102.0304)	returns [1, 2, 3, 4]
+			blob2list(0z)		returns []
+<		Returns an empty List on error.  |list2blob()| does the
+		opposite.
+
+		Can also be used as a |method|: >
+			GetBlob()->blob2list()
+<
 							*browse()*
 browse({save}, {title}, {initdir}, {default})
 		Put up a file requester.  This only works when "has("browse")"
@@ -4768,6 +4781,19 @@ lispindent({lnum})					*lispindent()*
 		Can also be used as a |method|: >
 			GetLnum()->lispindent()
 
+list2blob({list})					*list2blob()*
+		Return a Blob concatenating all the number values in {list}.
+		Examples: >
+			list2blob([1, 2, 3, 4])	returns 0z01020304
+			list2blob([])		returns 0z
+<		Returns an empty Blob on error.  If one of the numbers is
+		negative or more than 255 error *E1239* is given.
+
+		|blob2list()| does the opposite.
+
+		Can also be used as a |method|: >
+			GetList()->list2blob()
+
 list2str({list} [, {utf8}])				*list2str()*
 		Convert each number in {list} to a character string can
 		concatenate them all.  Examples: >
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 0f2cfdd2ac..ed16f837cf 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -721,6 +721,10 @@ Floating point computation:				*float-functions*
 	isinf()			check for infinity
 	isnan()			check for not a number
 
+Blob manipulation:					*blob-functions*
+	blob2list()		get a list of numbers from a blob
+	list2blob()		get a blob from a list of numbers
+
 Other computation:					*bitwise-function*
 	and()			bitwise AND
 	invert()		bitwise invert
@@ -1321,6 +1325,8 @@ is a List with arguments.
 Function references are most useful in combination with a Dictionary, as is
 explained in the next section.
 
+More information about defining your own functions here: |user-functions|.
+
 ==============================================================================
 *41.8*	Lists and Dictionaries
 
-- 
cgit 


From ccac34af766bee70d4f2a3cd69b54977849f567d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 28 Feb 2023 20:38:16 +0800
Subject: vim-patch:8.2.3446: not enough tests for empty string arguments

Problem:    Not enough tests for empty string arguments.
Solution:   Add tests, fix type check. (Yegappan Lakshmanan, closes vim/vim#8881)

https://github.com/vim/vim/commit/820d5525cae707f39571c6abc2aa6a9e66ed171e

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/sign.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 162bdaed7b..9f469767a2 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -525,6 +525,7 @@ sign_jump({id}, {group}, {buf})
 		{buf} and position the cursor at sign {id} in group {group}.
 		This is similar to the |:sign-jump| command.
 
+		If {group} is an empty string, then the global group is used.
 		For the use of {buf}, see |bufname()|.
 
 		Returns the line number of the sign. Returns -1 if the
-- 
cgit 


From 278aeee3aed753d1084597378e653395bd472c42 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 28 Feb 2023 21:07:56 +0800
Subject: vim-patch:9.0.0430: cannot use repeat() with a blob

Problem:    Cannot use repeat() with a blob.
Solution:   Implement blob repeat. (closes vim/vim#11090)

https://github.com/vim/vim/commit/375141e1f80dced9be738568a3418f65813f4a2f

Co-authored-by: Bakudankun <bakudankun@gmail.com>
---
 runtime/doc/builtin.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index b194a104f7..7fab2ac6ff 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -380,7 +380,8 @@ remove({blob}, {idx} [, {end}])	Number/Blob
 					remove bytes {idx}-{end} from {blob}
 remove({dict}, {key})		any	remove entry {key} from {dict}
 rename({from}, {to})		Number	rename (move) file from {from} to {to}
-repeat({expr}, {count})		String	repeat {expr} {count} times
+repeat({expr}, {count})		List/Blob/String
+					repeat {expr} {count} times
 resolve({filename})		String	get filename a shortcut points to
 reverse({list})			List	reverse {list} in-place
 round({expr})			Float	round off {expr}
@@ -6420,8 +6421,8 @@ repeat({expr}, {count})					*repeat()*
 		result.  Example: >
 			:let separator = repeat('-', 80)
 <		When {count} is zero or negative the result is empty.
-		When {expr} is a |List| the result is {expr} concatenated
-		{count} times.  Example: >
+		When {expr} is a |List| or a |Blob| the result is {expr}
+		concatenated {count} times.  Example: >
 			:let longlist = repeat(['a', 'b'], 3)
 <		Results in ['a', 'b', 'a', 'b', 'a', 'b'].
 
-- 
cgit 


From cf07f2baabd3a1a072102e0cacb6d70509ada044 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 27 Feb 2023 12:29:20 +0100
Subject: feat(edit)!: remove old c implementation of hebrew keymap

This feature has long been obsolete. The 'keymap' option can be used
to support language keymaps, including hebrew and hebrewp (phonetic
mapping). There is no need to keep the old c code with hardcoded
keymaps for some languages.
---
 runtime/doc/hebrew.txt   | 19 ++++++-------------
 runtime/doc/insert.txt   |  8 ++++----
 runtime/doc/news.txt     |  2 ++
 runtime/doc/options.txt  | 24 ------------------------
 runtime/doc/starting.txt |  2 +-
 runtime/doc/vim_diff.txt |  4 ++++
 6 files changed, 17 insertions(+), 42 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt
index 76266d777f..e38385e13a 100644
--- a/runtime/doc/hebrew.txt
+++ b/runtime/doc/hebrew.txt
@@ -30,17 +30,10 @@ Details
    +  'rightleft' ('rl') sets window orientation to right-to-left.  This means
       that the logical text 'ABC' will be displayed as 'CBA', and will start
       drawing at the right edge of the window, not the left edge.
-   +  'hkmap' ('hk') sets keyboard mapping to Hebrew, in insert/replace modes.
-   +  'aleph' ('al'), numeric, holds the decimal code of Aleph, for keyboard
-      mapping.
-   +  'hkmapp' ('hkp') sets keyboard mapping to "phonetic hebrew"
-
-   NOTE: these three ('hkmap', 'hkmapp' and 'aleph') are obsolete.  You should
-	 use ":set keymap=hebrewp" instead.
-
-   +  'delcombine' ('deco'), boolean, if editing UTF-8 encoded Hebrew, allows
-      one to remove the niqud or te`amim by pressing 'x' on a character (with
-      associated niqud).
+   +  'keymap' ('kmp') sets keyboard mapping. use values "hebrew" or "heprewp"
+      (the latter option enables phonetic mapping)
+   +  'delcombine' ('deco'), boolean, allows one to remove the niqud or
+      te`amim by pressing 'x' on a character (with associated niqud).
 
    +  'rightleftcmd' ('rlc') makes the command-prompt for searches show up on
       the right side.  It only takes effect if the window is 'rightleft'.
@@ -62,10 +55,10 @@ Details
 
    +  CTRL-_ in insert/replace modes toggles 'revins' and 'hkmap' as follows:
 
-      When in rightleft window, 'revins' and 'nohkmap' are toggled, since
+      When in rightleft window, 'revins' is toggled, since
       English will likely be inserted in this case.
 
-      When in norightleft window, 'revins' 'hkmap' are toggled, since Hebrew
+      When in norightleft window, 'revins' is toggled, since Hebrew
       will likely be inserted in this case.
 
       CTRL-_ moves the cursor to the end of the typed text.
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 84aee43af4..49aa2a79a4 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -221,11 +221,11 @@ CTRL-Y		Insert the character which is above the cursor.
 		able to copy characters from a long line.
 
 						*i_CTRL-_*
-CTRL-_		Switch between languages, as follows:
-		-  When in a rightleft window, revins and nohkmap are toggled,
+CTRL-_		Switch between insert direction, by toggling 'revins', as follows:
+		-  When in a rightleft window, 'revins' is toggled,
 		   since English will likely be inserted in this case.
-		-  When in a norightleft window, revins and hkmap are toggled,
-		   since Hebrew will likely be inserted in this case.
+		-  When in a norightleft window, 'revins' is toggled,
+		   since a rightleft language will likely be inserted in this case.
 
 		CTRL-_ moves the cursor to the end of the typed text.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c5261b739d..86a81e0c95 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -211,6 +211,8 @@ The following deprecated functions or APIs were removed.
   changes need to be contributed there first.)
   See https://github.com/neovim/neovim/pull/20674.
 
+- 'hkmap', 'hkmapp' and 'aleph' options were removed. Use 'keymap' option instead.
+
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f44b6f28e3..6c5b168402 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -575,16 +575,6 @@ supported use something like this: >
 							*E355*
 A jump table for the options with a short description can be found at |Q_op|.
 
-					*'aleph'* *'al'* *aleph* *Aleph*
-'aleph' 'al'		number	(default 224)
-			global
-	The ASCII code for the first letter of the Hebrew alphabet.  The
-	routine that maps the keyboard in Hebrew mode, both in Insert mode
-	(when hkmap is set) and on the command-line (when hitting CTRL-_)
-	outputs the Hebrew characters in the range [aleph..aleph+26].
-	aleph=128 applies to PC code, and aleph=224 applies to ISO 8859-8.
-	See |rileft.txt|.
-
 			*'allowrevins'* *'ari'* *'noallowrevins'* *'noari'*
 'allowrevins' 'ari'	boolean	(default off)
 			global
@@ -3195,20 +3185,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	each of these histories (see |cmdline-editing|).
 	The maximum value is 10000.
 
-					 *'hkmap'* *'hk'* *'nohkmap'* *'nohk'*
-'hkmap' 'hk'		boolean (default off)
-			global
-	When on, the keyboard is mapped for the Hebrew character set.
-	Normally you would set 'allowrevins' and use CTRL-_ in insert mode to
-	toggle this option.  See |rileft.txt|.
-
-				 *'hkmapp'* *'hkp'* *'nohkmapp'* *'nohkp'*
-'hkmapp' 'hkp'		boolean (default off)
-			global
-	When on, phonetic keyboard mapping is used.  'hkmap' must also be on.
-	This is useful if you have a non-Hebrew keyboard.
-	See |rileft.txt|.
-
 				 *'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'*
 'hlsearch' 'hls'	boolean	(default on)
 			global
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index a8a149def8..8c9ec7df9c 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -258,7 +258,7 @@ argument.
 -A		Arabic mode.  Sets the 'arabic' option on.
 
 							*-H*
--H		Hebrew mode.  Sets the 'hkmap' and 'rightleft' options on.
+-H		Hebrew mode.  Sets the 'rightleft' option on and 'keymap' to "hebrew"
 
 							*-V* *verbose*
 -V[N]		Verbose.  Sets the 'verbose' option to [N] (default: 10).
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 79808eccc9..5efe094226 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -594,6 +594,7 @@ Highlight groups:
 <
 
 Options:
+  *'aleph'* *'al'*
   antialias
   *'balloondelay'* *'bdlay'*
   *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'*
@@ -617,6 +618,9 @@ Options:
   *'guifontset'* *'gfs'* (Use 'guifont' instead.)
   *'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.)
   'highlight' (Names of builtin |highlight-groups| cannot be changed.)
+  *'hkmap'* *'hk'* use `set keymap=hebrew` instead.
+  *'hkmapp'* *'hkp'* use `set keymap=hebrewp` instead.
+
   *'imactivatefunc'* *'imaf'*
   *'imactivatekey'* *'imak'*
   *'imstatusfunc'* *'imsf'*
-- 
cgit 


From 96d3616a531b2626e3ab9b4fa2c5dea03a927717 Mon Sep 17 00:00:00 2001
From: Jens Claes <jensclaes33@gmail.com>
Date: Wed, 1 Mar 2023 11:35:16 +0100
Subject: fix(lsp): callHierarchy methods also require the
 callHierarchyProvider (#22427)

---
 runtime/lua/vim/lsp.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 61a06ff7a7..fed56ff846 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -46,6 +46,8 @@ lsp._request_name_to_capability = {
   ['textDocument/typeDefinition'] = { 'typeDefinitionProvider' },
   ['textDocument/documentSymbol'] = { 'documentSymbolProvider' },
   ['textDocument/prepareCallHierarchy'] = { 'callHierarchyProvider' },
+  ['callHierarchy/incomingCalls'] = { 'callHierarchyProvider' },
+  ['callHierarchy/outgoingCalls'] = { 'callHierarchyProvider' },
   ['textDocument/rename'] = { 'renameProvider' },
   ['textDocument/prepareRename'] = { 'renameProvider', 'prepareProvider' },
   ['textDocument/codeAction'] = { 'codeActionProvider' },
-- 
cgit 


From 896d672736b32a8f4a4fa51844b44f266dcdcc6c Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Wed, 1 Mar 2023 15:33:13 +0100
Subject: fix(lsp): use buffer scheme for files not stored on disk (#22407)

Sending `didOpen` with a `file` scheme causes problems with some
language servers because they expect the file to exist on disk.

See https://github.com/microsoft/language-server-protocol/pull/1679
---
 runtime/lua/vim/lsp.lua      | 54 ++++++++++++++++++++++++++++++++++----------
 runtime/lua/vim/lsp/util.lua |  9 ++++++--
 2 files changed, 49 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index fed56ff846..a6d550f48f 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -367,7 +367,7 @@ do
   --- @field offset_encoding "utf-8"|"utf-16"|"utf-32"
   ---
   --- @class CTBufferState
-  --- @field name string name of the buffer
+  --- @field uri string uri of the buffer
   --- @field lines string[] snapshot of buffer lines from last didChange
   --- @field lines_tmp string[]
   --- @field pending_changes table[] List of debounced changes in incremental sync mode
@@ -486,8 +486,12 @@ do
     if buf_state then
       buf_state.refs = buf_state.refs + 1
     else
+      local uri = vim.uri_from_bufnr(bufnr)
+      if not uv.fs_stat(api.nvim_buf_get_name(bufnr)) then
+        uri = uri:gsub('^file://', 'buffer://')
+      end
       buf_state = {
-        name = api.nvim_buf_get_name(bufnr),
+        uri = uri,
         lines = {},
         lines_tmp = {},
         pending_changes = {},
@@ -502,12 +506,26 @@ do
   end
 
   ---@private
-  function changetracking._get_and_set_name(client, bufnr, name)
+  ---@param client table
+  ---@param bufnr integer
+  ---@return string uri
+  function changetracking._get_uri(client, bufnr)
     local state = state_by_group[get_group(client)] or {}
     local buf_state = (state.buffers or {})[bufnr]
-    local old_name = buf_state.name
-    buf_state.name = name
-    return old_name
+    return assert(buf_state.uri, 'Must have an URI set')
+  end
+
+  ---@private
+  ---@param client table
+  ---@param bufnr integer
+  ---@param uri string
+  ---@return string uri
+  function changetracking._get_and_set_uri(client, bufnr, uri)
+    local state = state_by_group[get_group(client)] or {}
+    local buf_state = (state.buffers or {})[bufnr]
+    local old_uri = buf_state.uri
+    buf_state.uri = uri
+    return old_uri
   end
 
   ---@private
@@ -594,7 +612,7 @@ do
         { text = buf_get_full_text(bufnr) },
       }
     end
-    local uri = vim.uri_from_bufnr(bufnr)
+    local uri = buf_state.uri
     for _, client in pairs(state.clients) do
       if not client.is_stopped() and lsp.buf_is_attached(bufnr, client.id) then
         client.notify('textDocument/didChange', {
@@ -707,11 +725,14 @@ local function text_document_did_open_handler(bufnr, client)
     return
   end
   local filetype = nvim_buf_get_option(bufnr, 'filetype')
-
+  local uri = vim.uri_from_bufnr(bufnr)
+  if not uv.fs_stat(api.nvim_buf_get_name(bufnr)) then
+    uri = uri:gsub('^file://', 'buffer://')
+  end
   local params = {
     textDocument = {
       version = 0,
-      uri = vim.uri_from_bufnr(bufnr),
+      uri = uri,
       languageId = client.config.get_language_id(bufnr, filetype),
       text = buf_get_full_text(bufnr),
     },
@@ -1560,8 +1581,13 @@ local function text_document_did_save_handler(bufnr)
   local text = once(buf_get_full_text)
   for_each_buffer_client(bufnr, function(client)
     local name = api.nvim_buf_get_name(bufnr)
-    local old_name = changetracking._get_and_set_name(client, bufnr, name)
-    if old_name and name ~= old_name then
+    local old_uri = changetracking._get_and_set_uri(client, bufnr, uri)
+    if old_uri and name ~= old_uri then
+      client.notify('textDocument/didClose', {
+        textDocument = {
+          uri = old_uri,
+        },
+      })
       client.notify('textDocument/didOpen', {
         textDocument = {
           version = 0,
@@ -1664,8 +1690,12 @@ function lsp.buf_attach_client(bufnr, client_id)
         end)
       end,
       on_detach = function()
-        local params = { textDocument = { uri = uri } }
         for_each_buffer_client(bufnr, function(client, _)
+          local params = {
+            textDocument = {
+              uri = changetracking._get_uri(client, bufnr),
+            },
+          }
           changetracking.reset_buf(client, bufnr)
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
             client.notify('textDocument/didClose', params)
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 4beb4fc367..554e26022c 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -2032,7 +2032,12 @@ end
 ---@returns `TextDocumentIdentifier`
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentIdentifier
 function M.make_text_document_params(bufnr)
-  return { uri = vim.uri_from_bufnr(bufnr or 0) }
+  bufnr = bufnr or 0
+  local uri = vim.uri_from_bufnr(bufnr)
+  if not uv.fs_stat(api.nvim_buf_get_name(bufnr)) then
+    uri = uri:gsub('^file://', 'buffer://')
+  end
+  return { uri = uri }
 end
 
 --- Create the workspace params
@@ -2065,7 +2070,7 @@ function M.make_formatting_params(options)
     insertSpaces = vim.bo.expandtab,
   })
   return {
-    textDocument = { uri = vim.uri_from_bufnr(0) },
+    textDocument = M.make_text_document_params(0),
     options = options,
   }
 end
-- 
cgit 


From 014981c9006f9b96b8045e609dc27f4a84da5263 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 1 Mar 2023 09:47:56 -0700
Subject: fix(lsp): only fire LspDetach for attached buffers (#22468)

If the LSP server fails to start then the client never initializes and
thus never calls its on_attach function and an LspAttach event is
never fired. However, the on_exit function still fires a LspDetach
event, so user autocommands that attempt to "clean up" in LspDetach may
run into problems if they assume that the buffer was already attached.

The solution is to only fire an LspDetach event if the buffer was
already attached in the first place.
---
 runtime/lua/vim/lsp.lua | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index a6d550f48f..a56e141c29 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1155,14 +1155,19 @@ function lsp.start_client(config)
       pcall(config.on_exit, code, signal, client_id)
     end
 
+    local client = active_clients[client_id] and active_clients[client_id]
+      or uninitialized_clients[client_id]
+
     for bufnr, client_ids in pairs(all_buffer_active_clients) do
       if client_ids[client_id] then
         vim.schedule(function()
-          nvim_exec_autocmds('LspDetach', {
-            buffer = bufnr,
-            modeline = false,
-            data = { client_id = client_id },
-          })
+          if client and client.attached_buffers[bufnr] then
+            nvim_exec_autocmds('LspDetach', {
+              buffer = bufnr,
+              modeline = false,
+              data = { client_id = client_id },
+            })
+          end
 
           local namespace = vim.lsp.diagnostic.get_namespace(client_id)
           vim.diagnostic.reset(namespace, bufnr)
@@ -1178,8 +1183,6 @@ function lsp.start_client(config)
     -- Schedule the deletion of the client object so that it exists in the execution of LspDetach
     -- autocommands
     vim.schedule(function()
-      local client = active_clients[client_id] and active_clients[client_id]
-        or uninitialized_clients[client_id]
       active_clients[client_id] = nil
       uninitialized_clients[client_id] = nil
 
-- 
cgit 


From bc15b075d14c85098d674a2466d2386e08b0005f Mon Sep 17 00:00:00 2001
From: Mike <Mike325@users.noreply.github.com>
Date: Wed, 1 Mar 2023 10:51:22 -0600
Subject: feat(vim.fs): pass path to find() predicate, lazy evaluate #22378

Problem:
No easy way to find files under certain directories (ex: grab all files under
`test/`) or exclude the content of certain paths (ex. `build/`, `.git/`)

Solution:
Pass the full `path` as an arg to the predicate.
---
 runtime/doc/lua.txt    | 35 ++++++++++++++++++++++++++++++-----
 runtime/lua/vim/fs.lua | 35 +++++++++++++++++++++++++++++------
 2 files changed, 59 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 8ae1c6dc40..e3e0665025 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2359,12 +2359,37 @@ find({names}, {opts})                                          *vim.fs.find()*
     The search can be narrowed to find only files or only directories by
     specifying {type} to be "file" or "directory", respectively.
 
+    Examples: >lua
+
+     -- location of Cargo.toml from the current buffer's path
+     local cargo = vim.fs.find('Cargo.toml', {
+       upward = true,
+       stop = vim.loop.os_homedir(),
+       path = vim.fs.dirname(vim.api.nvim_buf_get_name(0)),
+     })
+
+     -- list all test directories under the runtime directory
+     local test_dirs = vim.fs.find(
+       {'test', 'tst', 'testdir'},
+       {limit = math.huge, type = 'directory', path = './runtime/'}
+     )
+
+     -- get all files ending with .cpp or .hpp inside lib/
+     local cpp_hpp = vim.fs.find(function(name, path)
+       return name:match('.*%.[ch]pp$') and path:match('[/\\]lib$')
+     end, {limit = math.huge, type = 'file'})
+<
+
     Parameters: ~
-      • {names}  (string|table|fun(name: string): boolean) Names of the files
-                 and directories to find. Must be base names, paths and globs
-                 are not supported. The function is called per file and
-                 directory within the traversed directories to test if they
-                 match {names}.
+      • {names}  (string|table|fun(name: string, path: string): boolean) Names
+                 of the files and directories to find. Must be base names,
+                 paths and globs are not supported when {names} is a string or
+                 a table. If {names} is a function, it is called for each
+                 traversed file and directory with args:
+                 • name: base name of the current item
+                 • path: full path of the current item The function should
+                   return `true` if the given file or directory is considered
+                   a match.
       • {opts}   (table) Optional keyword arguments:
                  • path (string): Path to begin searching from. If omitted,
                    the |current-directory| is used.
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index a0d2c4c339..2c3fc64d57 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -144,11 +144,34 @@ end
 --- The search can be narrowed to find only files or only directories by
 --- specifying {type} to be "file" or "directory", respectively.
 ---
----@param names (string|table|fun(name: string): boolean) Names of the files
+--- Examples:
+--- <pre>lua
+--- -- location of Cargo.toml from the current buffer's path
+--- local cargo = vim.fs.find('Cargo.toml', {
+---   upward = true,
+---   stop = vim.loop.os_homedir(),
+---   path = vim.fs.dirname(vim.api.nvim_buf_get_name(0)),
+--- })
+---
+--- -- list all test directories under the runtime directory
+--- local test_dirs = vim.fs.find(
+---   {'test', 'tst', 'testdir'},
+---   {limit = math.huge, type = 'directory', path = './runtime/'}
+--- )
+---
+--- -- get all files ending with .cpp or .hpp inside lib/
+--- local cpp_hpp = vim.fs.find(function(name, path)
+---   return name:match('.*%.[ch]pp$') and path:match('[/\\\\]lib$')
+--- end, {limit = math.huge, type = 'file'})
+--- </pre>
+---
+---@param names (string|table|fun(name: string, path: string): boolean) Names of the files
 ---             and directories to find.
----             Must be base names, paths and globs are not supported.
----             The function is called per file and directory within the
----             traversed directories to test if they match {names}.
+---             Must be base names, paths and globs are not supported when {names} is a string or a table.
+---             If {names} is a function, it is called for each traversed file and directory with args:
+---             - name: base name of the current item
+---             - path: full path of the current item
+---             The function should return `true` if the given file or directory is considered a match.
 ---
 ---@param opts (table) Optional keyword arguments:
 ---                       - path (string): Path to begin searching from. If
@@ -201,7 +224,7 @@ function M.find(names, opts)
       test = function(p)
         local t = {}
         for name, type in M.dir(p) do
-          if names(name) and (not opts.type or opts.type == type) then
+          if (not opts.type or opts.type == type) and names(name, p) then
             table.insert(t, join_paths(p, name))
           end
         end
@@ -250,7 +273,7 @@ function M.find(names, opts)
       for other, type_ in M.dir(dir) do
         local f = join_paths(dir, other)
         if type(names) == 'function' then
-          if names(other) and (not opts.type or opts.type == type_) then
+          if (not opts.type or opts.type == type_) and names(other, dir) then
             if add(f) then
               return matches
             end
-- 
cgit 


From b0b4c310973c2b419350e3c05c772596b1c334e9 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 2 Mar 2023 10:01:42 -0500
Subject: refactor: rename show_tree => inspect_tree #22474

Problem:
"show" is potentially a new verb that we can avoid (there is already
"open" and "echo"). Even if we can't avoid it, the behavior of
`show_tree` fits well in the "inspect" family of functions: a way for
users to introspect/reflect on the state of Nvim.

Existing "inspect" functions:
    vim.inspect()
    vim.inspect_pos()
    vim.treesitter.inspect_language()
    nvim__inspect_cell

Solution:
Rename `show_tree` to `inspect_tree`.
---
 runtime/doc/news.txt           |  2 +-
 runtime/doc/treesitter.txt     | 50 +++++++++++++++++++++---------------------
 runtime/lua/vim/treesitter.lua |  8 ++++++-
 3 files changed, 33 insertions(+), 27 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 919f8ceaee..226444ccb5 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -89,7 +89,7 @@ The following new APIs or features were added.
 
   See |lsp-semantic_tokens| for more information.
 
-• |vim.treesitter.show_tree()| opens a split window showing a text
+• |vim.treesitter.inspect_tree()| opens a split window showing a text
   representation of the nodes in a language tree for the current buffer.
 
 • Added support for the `willSave` and `willSaveWaitUntil` capabilities to the
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index fdea84282f..b75e879424 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -595,6 +595,31 @@ get_string_parser({str}, {lang}, {opts})
     Return: ~
         |LanguageTree| object to use for parsing
 
+inspect_tree({opts})                           *vim.treesitter.inspect_tree()*
+    Open a window that displays a textual representation of the nodes in the
+    language tree.
+
+    While in the window, press "a" to toggle display of anonymous nodes, "I"
+    to toggle the display of the source language of each node, and press
+    <Enter> to jump to the node under the cursor in the source buffer.
+
+    Parameters: ~
+      • {opts}  (table|nil) Optional options table with the following possible
+                keys:
+                • lang (string|nil): The language of the source buffer. If
+                  omitted, the filetype of the source buffer is used.
+                • bufnr (integer|nil): Buffer to draw the tree into. If
+                  omitted, a new buffer is created.
+                • winid (integer|nil): Window id to display the tree buffer
+                  in. If omitted, a new window is created with {command}.
+                • command (string|nil): Vimscript command to create the
+                  window. Default value is "topleft 60vnew". Only used when
+                  {winid} is nil.
+                • title (string|fun(bufnr:integer):string|nil): Title of the
+                  window. If a function, it accepts the buffer number of the
+                  source buffer as its only argument and should return a
+                  string.
+
 is_ancestor({dest}, {source})                   *vim.treesitter.is_ancestor()*
     Determines whether a node is the ancestor of another
 
@@ -627,31 +652,6 @@ node_contains({node}, {range})                *vim.treesitter.node_contains()*
     Return: ~
         (boolean) True if the {node} contains the {range}
 
-show_tree({opts})                                 *vim.treesitter.show_tree()*
-    Open a window that displays a textual representation of the nodes in the
-    language tree.
-
-    While in the window, press "a" to toggle display of anonymous nodes, "I"
-    to toggle the display of the source language of each node, and press
-    <Enter> to jump to the node under the cursor in the source buffer.
-
-    Parameters: ~
-      • {opts}  (table|nil) Optional options table with the following possible
-                keys:
-                • lang (string|nil): The language of the source buffer. If
-                  omitted, the filetype of the source buffer is used.
-                • bufnr (integer|nil): Buffer to draw the tree into. If
-                  omitted, a new buffer is created.
-                • winid (integer|nil): Window id to display the tree buffer
-                  in. If omitted, a new window is created with {command}.
-                • command (string|nil): Vimscript command to create the
-                  window. Default value is "topleft 60vnew". Only used when
-                  {winid} is nil.
-                • title (string|fun(bufnr:integer):string|nil): Title of the
-                  window. If a function, it accepts the buffer number of the
-                  source buffer as its only argument and should return a
-                  string.
-
 start({bufnr}, {lang})                                *vim.treesitter.start()*
     Starts treesitter highlighting for a buffer
 
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index fead7b7b1b..412140b757 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -436,7 +436,7 @@ end
 ---                      - title (string|fun(bufnr:integer):string|nil): Title of the window. If a
 ---                        function, it accepts the buffer number of the source buffer as its only
 ---                        argument and should return a string.
-function M.show_tree(opts)
+function M.inspect_tree(opts)
   vim.validate({
     opts = { opts, 't', true },
   })
@@ -622,6 +622,12 @@ function M.show_tree(opts)
   })
 end
 
+---@deprecated
+---@private
+function M.show_tree()
+  vim.deprecate('show_tree', 'inspect_tree', '0.9', nil, false)
+end
+
 --- Returns the fold level for {lnum} in the current buffer. Can be set directly to 'foldexpr':
 --- <pre>lua
 --- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
-- 
cgit 


From f449121764c19cebda7b8b2c970b76bc8121bae7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 2 Mar 2023 18:03:11 +0100
Subject: feat(treesitter): add :InspectTree command (#22477)

---
 runtime/doc/news.txt           | 5 +++--
 runtime/doc/treesitter.txt     | 2 ++
 runtime/lua/vim/treesitter.lua | 2 ++
 runtime/plugin/nvim.lua        | 4 ++++
 4 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 226444ccb5..0ffd335520 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -89,8 +89,9 @@ The following new APIs or features were added.
 
   See |lsp-semantic_tokens| for more information.
 
-• |vim.treesitter.inspect_tree()| opens a split window showing a text
-  representation of the nodes in a language tree for the current buffer.
+• |vim.treesitter.inspect_tree()| and |:InspectTree| opens a split window
+  showing a text representation of the nodes in a language tree for the current
+  buffer.
 
 • Added support for the `willSave` and `willSaveWaitUntil` capabilities to the
   LSP client. `willSaveWaitUntil` allows a server to modify a document before it
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index b75e879424..5ac24de70a 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -603,6 +603,8 @@ inspect_tree({opts})                           *vim.treesitter.inspect_tree()*
     to toggle the display of the source language of each node, and press
     <Enter> to jump to the node under the cursor in the source buffer.
 
+    Can also be shown with `:InspectTree`.                      *:InspectTree*
+
     Parameters: ~
       • {opts}  (table|nil) Optional options table with the following possible
                 keys:
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 412140b757..09e3814a17 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -424,6 +424,8 @@ end
 --- display of the source language of each node, and press <Enter> to jump to the node under the
 --- cursor in the source buffer.
 ---
+--- Can also be shown with `:InspectTree`. *:InspectTree*
+---
 ---@param opts table|nil Optional options table with the following possible keys:
 ---                      - lang (string|nil): The language of the source buffer. If omitted, the
 ---                        filetype of the source buffer is used.
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index 815886f896..762e9519db 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -5,3 +5,7 @@ vim.api.nvim_create_user_command('Inspect', function(cmd)
     vim.show_pos()
   end
 end, { desc = 'Inspect highlights and extmarks at the cursor', bang = true })
+
+vim.api.nvim_create_user_command('InspectTree', function()
+  vim.treesitter.inspect_tree()
+end, { desc = 'Inspect treesitter language tree for buffer' })
-- 
cgit 


From 2eeafc43c43697d18d5634f8f81bf9e60a880e17 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 2 Mar 2023 14:06:11 -0700
Subject: fix(treesitter): maintain cursor position when toggling anonymous
 nodes

When toggling anonymous nodes in the :InspectTree window, keep the
cursor fixed relative to the node within the tree. This prevents the
cursor from jumping.
---
 runtime/lua/vim/treesitter.lua | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 09e3814a17..b2909f2154 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -506,8 +506,26 @@ function M.inspect_tree(opts)
   a.nvim_buf_set_keymap(b, 'n', 'a', '', {
     desc = 'Toggle anonymous nodes',
     callback = function()
+      local row, col = unpack(a.nvim_win_get_cursor(w))
+      local curnode = pg:get(row)
+      while curnode and not curnode.named do
+        row = row - 1
+        curnode = pg:get(row)
+      end
+
       pg.opts.anon = not pg.opts.anon
       pg:draw(b)
+
+      if not curnode then
+        return
+      end
+
+      local id = curnode.id
+      for i, node in pg:iter() do
+        if node.id == id then
+          a.nvim_win_set_cursor(w, { i, col })
+        end
+      end
     end,
   })
   a.nvim_buf_set_keymap(b, 'n', 'I', '', {
-- 
cgit 


From 86ff239240e955ef6da95bc9c8814cfd4492f5aa Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 2 Mar 2023 14:15:18 -0700
Subject: refactor(treesitter): use string.format to create lines

---
 runtime/lua/vim/treesitter/playground.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index fd5b687195..992433961f 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -146,9 +146,9 @@ local decor_ns = api.nvim_create_namespace('ts.playground')
 ---@return string
 local function get_range_str(lnum, col, end_col, end_lnum)
   if lnum == end_lnum then
-    return string.format('[%d:%d-%d]', lnum + 1, col + 1, end_col)
+    return string.format('[%d:%d - %d]', lnum + 1, col + 1, end_col)
   end
-  return string.format('[%d:%d-%d:%d]', lnum + 1, col + 1, end_lnum + 1, end_col)
+  return string.format('[%d:%d - %d:%d]', lnum + 1, col + 1, end_lnum + 1, end_col)
 end
 
 --- Write the contents of this Playground into {bufnr}.
@@ -163,7 +163,8 @@ function TSPlayground:draw(bufnr)
   for _, item in self:iter() do
     local range_str = get_range_str(item.lnum, item.col, item.end_lnum, item.end_col)
     local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
-    local line = string.rep(' ', item.depth) .. item.text .. '; ' .. range_str .. lang_str
+    local line =
+      string.format('%s%s ; %s%s', string.rep(' ', item.depth), item.text, range_str, lang_str)
 
     if self.opts.lang then
       lang_hl_marks[#lang_hl_marks + 1] = {
-- 
cgit 


From fdb6b4d2e729211f0526ce75c6a3fcc636859bfd Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 2 Mar 2023 17:29:03 -0500
Subject: vim-patch:9.0.1368: Bass files are not recognized (#22485)

Problem:    Bass files are not recognized.
Solution:   Add patterns for Bass files. (Amaan Qureshi, closes vim/vim#12088)

https://github.com/vim/vim/commit/4ed914b18a47192f79f342bea5e8f59e120d5260
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 256c053801..8911eafc71 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -156,6 +156,7 @@ local extension = {
   bas = function(path, bufnr)
     return require('vim.filetype.detect').bas(bufnr)
   end,
+  bass = 'bass',
   bi = function(path, bufnr)
     return require('vim.filetype.detect').bas(bufnr)
   end,
-- 
cgit 


From 6d4f48182131c36d57589eefd4cefe3c70256d04 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 3 Mar 2023 09:44:02 +0000
Subject: fix(treesitter): disallow empty filetypes

Fixes #22473
---
 runtime/lua/vim/treesitter.lua          |  3 ++-
 runtime/lua/vim/treesitter/language.lua | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 09e3814a17..f80da433b1 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -47,7 +47,8 @@ function M._create_parser(bufnr, lang, opts)
 
   vim.fn.bufload(bufnr)
 
-  language.add(lang, { filetype = vim.bo[bufnr].filetype })
+  local ft = vim.bo[bufnr].filetype
+  language.add(lang, { filetype = ft ~= '' and ft or nil })
 
   local self = LanguageTree.new(bufnr, lang, opts)
 
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 5bcc786e88..5f34d9cd56 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -60,6 +60,16 @@ function M.add(lang, opts)
     filetype = { filetype, { 'string', 'table' }, true },
   })
 
+  if filetype == '' then
+    error(string.format("'%s' is not a valid filetype", filetype))
+  elseif type(filetype) == 'table' then
+    for _, f in ipairs(filetype) do
+      if f == '' then
+        error(string.format("'%s' is not a valid filetype", filetype))
+      end
+    end
+  end
+
   M.register(lang, filetype or lang)
 
   if vim._ts_has_language(lang) then
-- 
cgit 


From f0a2ffab2923202f4454860ba1a7c7bd0e035ed2 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Fri, 3 Mar 2023 20:05:59 +0900
Subject: fix(treesitter): typos in _range.lua

fix(treesitter): typos _range.lua
---
 runtime/lua/vim/treesitter/_range.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index b87542c20f..8decd3a1fd 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -61,7 +61,7 @@ function M.intercepts(r1, r2)
   local off_1 = #r1 == 6 and 1 or 0
   local off_2 = #r1 == 6 and 1 or 0
 
-  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r2[2], r1[3 + off_1], r1[4 + off_1]
+  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r1[2], r1[3 + off_1], r1[4 + off_1]
   local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
 
   -- r1 is above r2
@@ -85,7 +85,7 @@ function M.contains(r1, r2)
   local off_1 = #r1 == 6 and 1 or 0
   local off_2 = #r1 == 6 and 1 or 0
 
-  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r2[2], r1[3 + off_1], r1[4 + off_1]
+  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r1[2], r1[3 + off_1], r1[4 + off_1]
   local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
 
   -- start doesn't fit
-- 
cgit 


From 98e051783c26239a47c5cd643e9aea7146b097bd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 Mar 2023 14:27:30 +0100
Subject: feat(treesitter): bundle query parser and queries (#22483)

skip injections for now
---
 runtime/queries/lua/injections.scm   |  8 ++++----
 runtime/queries/query/folds.scm      |  6 ++++++
 runtime/queries/query/highlights.scm | 34 ++++++++++++++++++++++++++++++++++
 runtime/queries/vim/injections.scm   |  4 ++--
 4 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 runtime/queries/query/folds.scm
 create mode 100644 runtime/queries/query/highlights.scm

(limited to 'runtime')

diff --git a/runtime/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
index 0e67329139..69acbbbe9f 100644
--- a/runtime/queries/lua/injections.scm
+++ b/runtime/queries/lua/injections.scm
@@ -11,10 +11,10 @@
   arguments: (arguments (string content: _ @vim)))
   (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec" "vim.api.nvim_cmd"))
 
-; ((function_call
-;   name: (_) @_vimcmd_identifier
-;   arguments: (arguments (string content: _ @query) .))
-;   (#eq? @_vimcmd_identifier "vim.treesitter.query.set_query"))
+((function_call
+  name: (_) @_vimcmd_identifier
+  arguments: (arguments (string content: _ @query) .))
+  (#eq? @_vimcmd_identifier "vim.treesitter.query.set_query"))
 
 ; ;; highlight string as query if starts with `;; query`
 ; ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))
diff --git a/runtime/queries/query/folds.scm b/runtime/queries/query/folds.scm
new file mode 100644
index 0000000000..47dd965126
--- /dev/null
+++ b/runtime/queries/query/folds.scm
@@ -0,0 +1,6 @@
+[
+  (named_node)
+  (predicate)
+  (grouping)
+  (list)
+] @fold
diff --git a/runtime/queries/query/highlights.scm b/runtime/queries/query/highlights.scm
new file mode 100644
index 0000000000..ee31a7e7ef
--- /dev/null
+++ b/runtime/queries/query/highlights.scm
@@ -0,0 +1,34 @@
+(string) @string
+(escape_sequence) @string.escape
+(capture (identifier) @type)
+(anonymous_node (identifier) @string)
+(predicate name: (identifier) @function)
+(named_node name: (identifier) @variable)
+(field_definition name: (identifier) @property)
+(negated_field "!" @operator (identifier) @property)
+(comment) @comment @spell
+
+(quantifier) @operator
+(predicate_type) @punctuation.special
+
+"." @operator
+
+[
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
+
+":" @punctuation.delimiter
+["@" "#"] @punctuation.special
+"_" @constant
+
+((parameters (identifier) @number)
+ (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
+
+((program . (comment) @include)
+ (#match? @include "^;\ +inherits\ *:"))
+
+((program . (comment) @preproc)
+ (#match? @preproc "^; +extends"))
diff --git a/runtime/queries/vim/injections.scm b/runtime/queries/vim/injections.scm
index fdd025bfd9..b53643dc1a 100644
--- a/runtime/queries/vim/injections.scm
+++ b/runtime/queries/vim/injections.scm
@@ -24,5 +24,5 @@
     "patchexpr" "pex"
     "charconvert" "ccv"))
 
-(comment) @comment
-(line_continuation_comment) @comment
+; (comment) @comment
+; (line_continuation_comment) @comment
-- 
cgit 


From 8414cfe7f4d8888698343cb54a3f373a28b365db Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 2 Mar 2023 20:46:59 +0100
Subject: docs: fix vim.treesitter tags

Problem:
Help tags like vim.treesitter.language.add() are confusing because
`vim.treesitter.language` is (thankfully) not a user-facing module.

Solution:
Ignore the "fstem" when generating "treesitter" tags.
---
 runtime/doc/deprecated.txt                  |  2 +-
 runtime/doc/news.txt                        | 10 ++---
 runtime/doc/treesitter.txt                  | 69 ++++++++---------------------
 runtime/lua/vim/treesitter/highlighter.lua  |  4 +-
 runtime/lua/vim/treesitter/languagetree.lua | 20 ++++-----
 runtime/lua/vim/treesitter/query.lua        |  5 +--
 6 files changed, 38 insertions(+), 72 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 42dfb53e77..3d861b07b3 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -120,7 +120,7 @@ LSP FUNCTIONS
 					or |vim.lsp.buf.format()| instead.
 
 TREESITTER FUNCTIONS
-- *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
+- *vim.treesitter.language.require_language()*	Use |vim.treesitter.add()|
 						instead.
 - *vim.treesitter.get_node_at_pos()*		Use |vim.treesitter.get_node()|
 						instead.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 0ffd335520..cda4792c9e 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -162,11 +162,10 @@ The following new APIs or features were added.
 • Treesitter captures can now be transformed by directives. This will allow
   more complicated dynamic language injections.
 
-• |vim.treesitter.query.get_node_text()| now accepts a `metadata` option for
-  writing custom directives using |vim.treesitter.query.add_directive()|.
+• |vim.treesitter.get_node_text()| now accepts a `metadata` option for
+  writing custom directives using |vim.treesitter.add_directive()|.
 
-• |vim.treesitter.language.add()| as a new replacement for
-  `vim.treesitter.language.require_language`.
+• |vim.treesitter.add()| replaces `vim.treesitter.language.require_language`.
 
 • `require'bit'` is now always available |lua-bit|
 
@@ -225,8 +224,7 @@ DEPRECATIONS                                                *news-deprecations*
 The following functions are now deprecated and will be removed in the next
 release.
 
-• `vim.treesitter.language.require_language()` has been deprecated in favour
-  of |vim.treesitter.language.add()|.
+• |vim.treesitter.add()| replaces `vim.treesitter.language.require_language()`
 
 • |vim.treesitter.get_node_at_pos()| and |vim.treesitter.get_node_at_cursor()|
   are both deprecated in favor of |vim.treesitter.get_node()|.
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 5ac24de70a..94a93bdbbb 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -272,9 +272,8 @@ The following predicates are built in:
 Each predicate has a `not-` prefixed predicate that is just the negation of
 the predicate.
 
-Further predicates can be added via |vim.treesitter.query.add_predicate()|.
-Use |vim.treesitter.query.list_predicates()| to list all available
-predicates.
+Further predicates can be added via |vim.treesitter.add_predicate()|.
+Use |vim.treesitter.list_predicates()| to list all available predicates.
 
 
 TREESITTER QUERY DIRECTIVES                            *treesitter-directives*
@@ -316,9 +315,8 @@ The following directives are built in:
             ((identifier) @constant (#offset! @constant 0 1 0 -1))
 <
 
-Further directives can be added via |vim.treesitter.query.add_directive()|.
-Use |vim.treesitter.query.list_directives()| to list all available
-directives.
+Further directives can be added via |vim.treesitter.add_directive()|.
+Use |vim.treesitter.list_directives()| to list all available directives.
 
 
 TREESITTER QUERY MODELINES                          *treesitter-query-modeline*
@@ -690,7 +688,7 @@ stop({bufnr})                                          *vim.treesitter.stop()*
 ==============================================================================
 Lua module: vim.treesitter.language                  *lua-treesitter-language*
 
-add({lang}, {opts})                            *vim.treesitter.language.add()*
+add({lang}, {opts})                                     *vim.treesitter.add()*
     Asserts that a parser for the language {lang} is installed.
 
     Parsers are searched in the `parser` runtime directory, or the provided
@@ -708,14 +706,14 @@ add({lang}, {opts})                            *vim.treesitter.language.add()*
                 • symbol_name (string|nil) Internal symbol name for the
                   language to load
 
-get_lang({filetype})                      *vim.treesitter.language.get_lang()*
+get_lang({filetype})                               *vim.treesitter.get_lang()*
     Parameters: ~
       • {filetype}  (string)
 
     Return: ~
         (string|nil)
 
-inspect_language({lang})          *vim.treesitter.language.inspect_language()*
+inspect_language({lang})                   *vim.treesitter.inspect_language()*
     Inspects the provided language.
 
     Inspecting provides some useful information on the language like node
@@ -727,7 +725,7 @@ inspect_language({lang})          *vim.treesitter.language.inspect_language()*
     Return: ~
         (table)
 
-register({lang}, {filetype})              *vim.treesitter.language.register()*
+register({lang}, {filetype})                       *vim.treesitter.register()*
     Register a lang to be used for a filetype (or list of filetypes).
 
     Parameters: ~
@@ -738,7 +736,7 @@ register({lang}, {filetype})              *vim.treesitter.language.register()*
 ==============================================================================
 Lua module: vim.treesitter.query                        *lua-treesitter-query*
 
-                                        *vim.treesitter.query.add_directive()*
+                                              *vim.treesitter.add_directive()*
 add_directive({name}, {handler}, {force})
     Adds a new directive to be used in queries
 
@@ -760,7 +758,7 @@ add_directive({name}, {handler}, {force})
                      the predicate `{ "#set!", "conceal", "-" }`
       • {force}    (boolean|nil)
 
-                                        *vim.treesitter.query.add_predicate()*
+                                              *vim.treesitter.add_predicate()*
 add_predicate({name}, {handler}, {force})
     Adds a new predicate to be used in queries
 
@@ -768,11 +766,11 @@ add_predicate({name}, {handler}, {force})
       • {name}     (string) Name of the predicate, without leading #
       • {handler}  function(match:table<string,|TSNode|>, pattern:string,
                    bufnr:number, predicate:string[])
-                   • see |vim.treesitter.query.add_directive()| for argument
+                   • see |vim.treesitter.add_directive()| for argument
                      meanings
       • {force}    (boolean|nil)
 
-                                        *vim.treesitter.query.get_node_text()*
+                                              *vim.treesitter.get_node_text()*
 get_node_text({node}, {source}, {opts})
     Gets the text corresponding to a given node
 
@@ -785,12 +783,12 @@ get_node_text({node}, {source}, {opts})
                     true)
                   • metadata (table) Metadata of a specific capture. This
                     would be set to `metadata[capture_id]` when using
-                    |vim.treesitter.query.add_directive()|.
+                    |vim.treesitter.add_directive()|.
 
     Return: ~
         (string[]|string|nil)
 
-get_query({lang}, {query_name})             *vim.treesitter.query.get_query()*
+get_query({lang}, {query_name})                   *vim.treesitter.get_query()*
     Returns the runtime query {query_name} for {lang}.
 
     Parameters: ~
@@ -800,7 +798,7 @@ get_query({lang}, {query_name})             *vim.treesitter.query.get_query()*
     Return: ~
         Query|nil Parsed query
 
-                                      *vim.treesitter.query.get_query_files()*
+                                            *vim.treesitter.get_query_files()*
 get_query_files({lang}, {query_name}, {is_included})
     Gets the list of files used to make up a query
 
@@ -814,19 +812,19 @@ get_query_files({lang}, {query_name}, {is_included})
         string[] query_files List of files to load for given query and
         language
 
-list_directives()                     *vim.treesitter.query.list_directives()*
+list_directives()                           *vim.treesitter.list_directives()*
     Lists the currently available directives to use in queries.
 
     Return: ~
         string[] List of supported directives.
 
-list_predicates()                     *vim.treesitter.query.list_predicates()*
+list_predicates()                           *vim.treesitter.list_predicates()*
     Lists the currently available predicates to use in queries.
 
     Return: ~
         string[] List of supported predicates.
 
-parse_query({lang}, {query})              *vim.treesitter.query.parse_query()*
+parse_query({lang}, {query})                    *vim.treesitter.parse_query()*
     Parse {query} as a string. (If the query is in a file, the caller should
     read the contents into a string before calling).
 
@@ -915,8 +913,7 @@ Query:iter_matches({self}, {node}, {source}, {start}, {stop})
         (fun(): integer, table<integer,TSNode>, table): pattern id, match,
         metadata
 
-                                            *vim.treesitter.query.set_query()*
-set_query({lang}, {query_name}, {text})
+set_query({lang}, {query_name}, {text})           *vim.treesitter.set_query()*
     Sets the runtime query named {query_name} for {lang}
 
     This allows users to override any runtime files and/or configuration set
@@ -931,17 +928,6 @@ set_query({lang}, {query_name}, {text})
 ==============================================================================
 Lua module: vim.treesitter.highlighter            *lua-treesitter-highlighter*
 
-new({tree}, {opts})                         *vim.treesitter.highlighter.new()*
-    Creates a new highlighter using
-
-    Parameters: ~
-      • {tree}  |LanguageTree| parser object to use for highlighting
-      • {opts}  (table|nil) Configuration of the highlighter:
-                • queries table overwrite queries used by the highlighter
-
-    Return: ~
-        TSHighlighter Created highlighter object
-
 TSHighlighter:destroy({self})                        *TSHighlighter:destroy()*
     Removes all internal references to the highlighter
 
@@ -1103,21 +1089,4 @@ LanguageTree:trees({self})                              *LanguageTree:trees()*
     Parameters: ~
       • {self}
 
-new({source}, {lang}, {opts})              *vim.treesitter.languagetree.new()*
-    A |LanguageTree| holds the treesitter parser for a given language {lang}
-    used to parse a buffer. As the buffer may contain injected languages, the LanguageTree needs to store parsers for these child languages as well (which in turn
-    may contain child languages themselves, hence the name).
-
-    Parameters: ~
-      • {source}  (integer|string) Buffer or a string of text to parse
-      • {lang}    (string) Root language this tree represents
-      • {opts}    (table|nil) Optional keyword arguments:
-                  • injections table Mapping language to injection query
-                    strings. This is useful for overriding the built-in
-                    runtime file searching for the injection language query
-                    per language.
-
-    Return: ~
-        |LanguageTree| parser object
-
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index 8adaa4ef2f..e3deaf6ba6 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -58,7 +58,9 @@ function TSHighlighterQuery:query()
   return self._query
 end
 
---- Creates a new highlighter using @param tree
+---@private
+---
+--- Creates a highlighter for `tree`.
 ---
 ---@param tree LanguageTree parser object to use for highlighting
 ---@param opts (table|nil) Configuration of the highlighter:
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 43fb866896..1bc7971eba 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -38,18 +38,16 @@ local LanguageTree = {}
 
 LanguageTree.__index = LanguageTree
 
---- A |LanguageTree| holds the treesitter parser for a given language {lang} used
---- to parse a buffer. As the buffer may contain injected languages, the LanguageTree
---- needs to store parsers for these child languages as well (which in turn may contain
---- child languages themselves, hence the name).
+--- @private
 ---
----@param source (integer|string) Buffer or a string of text to parse
----@param lang string Root language this tree represents
----@param opts (table|nil) Optional keyword arguments:
----             - injections table Mapping language to injection query strings.
----                                This is useful for overriding the built-in
----                                runtime file searching for the injection language
----                                query per language.
+--- |LanguageTree| contains a tree of parsers: the root treesitter parser for {lang} and any
+--- "injected" language parsers, which themselves may inject other languages, recursively.
+---
+---@param source (integer|string) Buffer or text string to parse
+---@param lang string Root language of this tree
+---@param opts (table|nil) Optional arguments:
+---             - injections table Map of language to injection query strings. Overrides the
+---                                built-in runtime file searching for language injections.
 ---@return LanguageTree parser object
 function LanguageTree.new(source, lang, opts)
   language.add(lang)
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 13d98a0625..4e9871b59d 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -273,8 +273,7 @@ end
 ---@param opts (table|nil) Optional parameters.
 ---          - concat: (boolean) Concatenate result in a string (default true)
 ---          - metadata (table) Metadata of a specific capture. This would be
----            set to `metadata[capture_id]` when using
----            |vim.treesitter.query.add_directive()|.
+---            set to `metadata[capture_id]` when using |vim.treesitter.add_directive()|.
 ---@return (string[]|string|nil)
 function M.get_node_text(node, source, opts)
   opts = opts or {}
@@ -486,7 +485,7 @@ local directive_handlers = {
 ---
 ---@param name string Name of the predicate, without leading #
 ---@param handler function(match:table<string,TSNode>, pattern:string, bufnr:number, predicate:string[])
----   - see |vim.treesitter.query.add_directive()| for argument meanings
+---   - see |vim.treesitter.add_directive()| for argument meanings
 ---@param force boolean|nil
 function M.add_predicate(name, handler, force)
   if predicate_handlers[name] and not force then
-- 
cgit 


From bf90ceb5488ea2b41eb53335984f017785aefea9 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Fri, 3 Mar 2023 07:52:57 -0700
Subject: fix(treesitter): break early from loop when match is found (#22499)

Fixup to #22484.
---
 runtime/lua/vim/treesitter.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index b63247aa2c..ee66ba9f9b 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -525,6 +525,7 @@ function M.inspect_tree(opts)
       for i, node in pg:iter() do
         if node.id == id then
           a.nvim_win_set_cursor(w, { i, col })
+          break
         end
       end
     end,
-- 
cgit 


From a4f443994bb91321b00f29af9e6357df9102ce75 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Mar 2023 10:45:20 +0100
Subject: docs(luvref): update to version bump (#22508)

---
 runtime/doc/luvref.txt | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 66cee0649c..0fdd010880 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -3360,14 +3360,17 @@ file system operations, as well as `getaddrinfo` and `getnameinfo` requests.
 uv.new_work({work_callback}, {after_work_callback})              *uv.new_work()*
 
                 Parameters:
-                - `work_callback`: `function`
+                - `work_callback`: `function` or `string`
                   - `...`: `threadargs` passed to/from
                     `uv.queue_work(work_ctx, ...)`
                 - `after_work_callback`: `function`
                   - `...`: `threadargs` returned from `work_callback`
 
                 Creates and initializes a new `luv_work_ctx_t` (not
-                `uv_work_t`). Returns the Lua userdata wrapping it.
+                `uv_work_t`).
+                `work_callback` is a Lua function or a string containing Lua
+                code or bytecode dumped from a function. Returns the Lua
+                userdata wrapping it.
 
                 Returns: `luv_work_ctx_t userdata`
 
@@ -3468,16 +3471,16 @@ uv.new_thread([{options}, ] {entry}, {...})                    *uv.new_thread()*
                 Parameters:
                 - `options`: `table` or `nil`
                   - `stack_size`: `integer` or `nil`
-                - `entry`: `function`
+                - `entry`: `function` or `string`
                 - `...`: `threadargs` passed to `entry`
 
                 Creates and initializes a `luv_thread_t` (not `uv_thread_t`).
                 Returns the Lua userdata wrapping it and asynchronously
-                executes `entry`, which can be either a Lua function or a Lua
-                function dumped to a string. Additional arguments `...` are
-                passed to the `entry` function and an optional `options` table
-                may be provided. Currently accepted `option` fields are
-                `stack_size`.
+                executes `entry`, which can be either a Lua function or a
+                string containing Lua code or bytecode dumped from a function.
+                Additional arguments `...` are passed to the `entry` function
+                and an optional `options` table may be provided. Currently
+                accepted `option` fields are `stack_size`.
 
                 Returns: `luv_thread_t userdata` or `fail`
 
-- 
cgit 


From 128b82103ba477482bdfaf10ec71e0986876cca1 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 4 Mar 2023 22:04:05 +0900
Subject: docs(treesitter): number → integer (#22513)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/doc/treesitter.txt                | 10 +++++-----
 runtime/lua/vim/treesitter/playground.lua | 22 +++++++++++-----------
 runtime/lua/vim/treesitter/query.lua      | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 94a93bdbbb..855fc6bdc6 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -748,7 +748,7 @@ add_directive({name}, {handler}, {force})
     Parameters: ~
       • {name}     (string) Name of the directive, without leading #
       • {handler}  function(match:table<string,|TSNode|>, pattern:string,
-                   bufnr:number, predicate:string[], metadata:table)
+                   bufnr:integer, predicate:string[], metadata:table)
                    • match: see |treesitter-query|
                      • node-level data are accessible via `match[capture_id]`
 
@@ -765,7 +765,7 @@ add_predicate({name}, {handler}, {force})
     Parameters: ~
       • {name}     (string) Name of the predicate, without leading #
       • {handler}  function(match:table<string,|TSNode|>, pattern:string,
-                   bufnr:number, predicate:string[])
+                   bufnr:integer, predicate:string[])
                    • see |vim.treesitter.add_directive()| for argument
                      meanings
       • {force}    (boolean|nil)
@@ -776,7 +776,7 @@ get_node_text({node}, {source}, {opts})
 
     Parameters: ~
       • {node}    |TSNode|
-      • {source}  (number|string) Buffer or string from which the {node} is
+      • {source}  (integer|string) Buffer or string from which the {node} is
                   extracted
       • {opts}    (table|nil) Optional parameters.
                   • concat: (boolean) Concatenate result in a string (default
@@ -872,8 +872,8 @@ Query:iter_captures({self}, {node}, {source}, {start}, {stop})
       • {node}    |TSNode| under which the search will occur
       • {source}  (integer|string) Source buffer or string to extract text
                   from
-      • {start}   (number) Starting line for the search
-      • {stop}    (number) Stopping line for the search (end-exclusive)
+      • {start}   (integer) Starting line for the search
+      • {stop}    (integer) Stopping line for the search (end-exclusive)
       • {self}
 
     Return: ~
diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index 992433961f..7f181c23fd 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -1,7 +1,7 @@
 local api = vim.api
 
 ---@class TSPlayground
----@field ns number API namespace
+---@field ns integer API namespace
 ---@field opts table Options table with the following keys:
 ---                  - anon (boolean): If true, display anonymous nodes
 ---                  - lang (boolean): If true, display the language alongside each node
@@ -10,14 +10,14 @@ local api = vim.api
 local TSPlayground = {}
 ---
 ---@class Node
----@field id number Node id
+---@field id integer Node id
 ---@field text string Node text
 ---@field named boolean True if this is a named (non-anonymous) node
----@field depth number Depth of the node within the tree
----@field lnum number Beginning line number of this node in the source buffer
----@field col number Beginning column number of this node in the source buffer
----@field end_lnum number Final line number of this node in the source buffer
----@field end_col number Final column number of this node in the source buffer
+---@field depth integer Depth of the node within the tree
+---@field lnum integer Beginning line number of this node in the source buffer
+---@field col integer Beginning column number of this node in the source buffer
+---@field end_lnum integer Final line number of this node in the source buffer
+---@field end_col integer Final column number of this node in the source buffer
 ---@field lang string Source language of this node
 ---@field root TSNode
 
@@ -34,7 +34,7 @@ local TSPlayground = {}
 --- table maps nodes in the primary tree to root nodes of injected trees.
 ---
 ---@param node TSNode Starting node to begin traversal |tsnode|
----@param depth number Current recursion depth
+---@param depth integer Current recursion depth
 ---@param lang string Language of the tree currently being traversed
 ---@param injections table<integer,Node> Mapping of node ids to root nodes of injected language trees (see
 ---                        explanation above)
@@ -153,7 +153,7 @@ end
 
 --- Write the contents of this Playground into {bufnr}.
 ---
----@param bufnr number Buffer number to write into.
+---@param bufnr integer Buffer number to write into.
 ---@private
 function TSPlayground:draw(bufnr)
   vim.bo[bufnr].modifiable = true
@@ -194,7 +194,7 @@ end
 ---
 --- The node number is dependent on whether or not anonymous nodes are displayed.
 ---
----@param i number Node number to get
+---@param i integer Node number to get
 ---@return Node
 ---@private
 function TSPlayground:get(i)
@@ -206,7 +206,7 @@ end
 ---
 ---@return (fun(): integer, Node) Iterator over all nodes in this Playground
 ---@return table
----@return number
+---@return integer
 ---@private
 function TSPlayground:iter()
   return ipairs(self.opts.anon and self.nodes or self.named)
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 4e9871b59d..22f706585e 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -56,7 +56,7 @@ local function add_included_lang(base_langs, lang, ilang)
 end
 
 ---@private
----@param buf (number)
+---@param buf (integer)
 ---@param range (table)
 ---@param concat (boolean)
 ---@returns (string[]|string|nil)
@@ -269,7 +269,7 @@ end
 --- Gets the text corresponding to a given node
 ---
 ---@param node TSNode
----@param source (number|string) Buffer or string from which the {node} is extracted
+---@param source (integer|string) Buffer or string from which the {node} is extracted
 ---@param opts (table|nil) Optional parameters.
 ---          - concat: (boolean) Concatenate result in a string (default true)
 ---          - metadata (table) Metadata of a specific capture. This would be
@@ -484,7 +484,7 @@ local directive_handlers = {
 --- Adds a new predicate to be used in queries
 ---
 ---@param name string Name of the predicate, without leading #
----@param handler function(match:table<string,TSNode>, pattern:string, bufnr:number, predicate:string[])
+---@param handler function(match:table<string,TSNode>, pattern:string, bufnr:integer, predicate:string[])
 ---   - see |vim.treesitter.add_directive()| for argument meanings
 ---@param force boolean|nil
 function M.add_predicate(name, handler, force)
@@ -503,7 +503,7 @@ end
 --- metadata table `metadata[capture_id].key = value`
 ---
 ---@param name string Name of the directive, without leading #
----@param handler function(match:table<string,TSNode>, pattern:string, bufnr:number, predicate:string[], metadata:table)
+---@param handler function(match:table<string,TSNode>, pattern:string, bufnr:integer, predicate:string[], metadata:table)
 ---   - match: see |treesitter-query|
 ---      - node-level data are accessible via `match[capture_id]`
 ---   - pattern: see |treesitter-query|
@@ -644,8 +644,8 @@ end
 ---
 ---@param node TSNode under which the search will occur
 ---@param source (integer|string) Source buffer or string to extract text from
----@param start number Starting line for the search
----@param stop number Stopping line for the search (end-exclusive)
+---@param start integer Starting line for the search
+---@param stop integer Stopping line for the search (end-exclusive)
 ---
 ---@return (fun(): integer, TSNode, TSMetadata): capture id, capture node, metadata
 function Query:iter_captures(node, source, start, stop)
-- 
cgit 


From 6a20c29dcd050fee011ec1c451b5e70940152885 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 4 Mar 2023 22:05:01 +0900
Subject: docs(filetype): number → integer (#22516)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/lua/vim/filetype.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 8911eafc71..65579d3543 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -28,9 +28,9 @@ end
 --- If only start_lnum is specified, return a single line as a string.
 --- If both start_lnum and end_lnum are omitted, return all lines from the buffer.
 ---
----@param bufnr number|nil The buffer to get the lines from
----@param start_lnum number|nil The line number of the first line (inclusive, 1-based)
----@param end_lnum number|nil The line number of the last line (inclusive, 1-based)
+---@param bufnr integer|nil The buffer to get the lines from
+---@param start_lnum integer|nil The line number of the first line (inclusive, 1-based)
+---@param end_lnum integer|nil The line number of the last line (inclusive, 1-based)
 ---@return table<string>|string Array of lines, or string when end_lnum is omitted
 function M.getlines(bufnr, start_lnum, end_lnum)
   if end_lnum then
@@ -67,8 +67,8 @@ end
 ---@private
 --- Get the next non-whitespace line in the buffer.
 ---
----@param bufnr number The buffer to get the line from
----@param start_lnum number The line number of the first line to start from (inclusive, 1-based)
+---@param bufnr integer The buffer to get the line from
+---@param start_lnum integer The line number of the first line to start from (inclusive, 1-based)
 ---@return string|nil The first non-blank line if found or `nil` otherwise
 function M.nextnonblank(bufnr, start_lnum)
   for _, line in ipairs(M.getlines(bufnr, start_lnum, -1)) do
-- 
cgit 


From ccd2cc1abd69f677edabd0b66dfd9689eeee54b9 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 4 Mar 2023 22:05:16 +0900
Subject: docs(uri): number → integer (#22515)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/doc/lua.txt     | 4 ++--
 runtime/lua/vim/uri.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index e3e0665025..38ddff13bd 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2007,7 +2007,7 @@ uri_from_bufnr({bufnr})                                 *vim.uri_from_bufnr()*
     Get a URI from a bufnr
 
     Parameters: ~
-      • {bufnr}  (number)
+      • {bufnr}  (integer)
 
     Return: ~
         (string) URI
@@ -2029,7 +2029,7 @@ uri_to_bufnr({uri})                                       *vim.uri_to_bufnr()*
       • {uri}  (string)
 
     Return: ~
-        (number) bufnr
+        (integer) bufnr
 
 uri_to_fname({uri})                                       *vim.uri_to_fname()*
     Get a filename from a URI
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua
index d6b0b7410e..38759fcdc0 100644
--- a/runtime/lua/vim/uri.lua
+++ b/runtime/lua/vim/uri.lua
@@ -80,7 +80,7 @@ local URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9.+-]*):.*'
 local WINDOWS_URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9.+-]*):[a-zA-Z]:.*'
 
 --- Get a URI from a bufnr
----@param bufnr number
+---@param bufnr integer
 ---@return string URI
 local function uri_from_bufnr(bufnr)
   local fname = vim.api.nvim_buf_get_name(bufnr)
@@ -123,7 +123,7 @@ end
 --- Creates a new unloaded buffer if no buffer for the uri already exists.
 --
 ---@param uri string
----@return number bufnr
+---@return integer bufnr
 local function uri_to_bufnr(uri)
   return vim.fn.bufadd(uri_to_fname(uri))
 end
-- 
cgit 


From 1f07307aeb6564fb794921cc1b2879f84a822921 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 4 Mar 2023 22:05:46 +0900
Subject: docs(inspect): number → integer (#22511)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/doc/lua.txt            | 20 ++++++++++----------
 runtime/lua/vim/_inspector.lua | 14 +++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 38ddff13bd..87498c7599 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1542,11 +1542,11 @@ inspect_pos({bufnr}, {row}, {col}, {filter})               *vim.inspect_pos()*
     Can also be pretty-printed with `:Inspect!`.                   *:Inspect!*
 
     Parameters: ~
-      • {bufnr}   (number|nil) defaults to the current buffer
-      • {row}     (number|nil) row to inspect, 0-based. Defaults to the row of
-                  the current cursor
-      • {col}     (number|nil) col to inspect, 0-based. Defaults to the col of
-                  the current cursor
+      • {bufnr}   (integer|nil) defaults to the current buffer
+      • {row}     (integer|nil) row to inspect, 0-based. Defaults to the row
+                  of the current cursor
+      • {col}     (integer|nil) col to inspect, 0-based. Defaults to the col
+                  of the current cursor
       • {filter}  (table|nil) a table with key-value pairs to filter the items
                   • syntax (boolean): include syntax based highlight groups
                     (defaults to true)
@@ -1575,11 +1575,11 @@ show_pos({bufnr}, {row}, {col}, {filter})                     *vim.show_pos()*
     Can also be shown with `:Inspect`.                              *:Inspect*
 
     Parameters: ~
-      • {bufnr}   (number|nil) defaults to the current buffer
-      • {row}     (number|nil) row to inspect, 0-based. Defaults to the row of
-                  the current cursor
-      • {col}     (number|nil) col to inspect, 0-based. Defaults to the col of
-                  the current cursor
+      • {bufnr}   (integer|nil) defaults to the current buffer
+      • {row}     (integer|nil) row to inspect, 0-based. Defaults to the row
+                  of the current cursor
+      • {col}     (integer|nil) col to inspect, 0-based. Defaults to the col
+                  of the current cursor
       • {filter}  (table|nil) see |vim.inspect_pos()|
 
 
diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua
index bb6608421b..9e91597192 100644
--- a/runtime/lua/vim/_inspector.lua
+++ b/runtime/lua/vim/_inspector.lua
@@ -14,15 +14,15 @@ local defaults = {
 ---
 ---Can also be pretty-printed with `:Inspect!`. *:Inspect!*
 ---
----@param bufnr? number defaults to the current buffer
----@param row? number row to inspect, 0-based. Defaults to the row of the current cursor
----@param col? number col to inspect, 0-based. Defaults to the col of the current cursor
+---@param bufnr? integer defaults to the current buffer
+---@param row? integer row to inspect, 0-based. Defaults to the row of the current cursor
+---@param col? integer col to inspect, 0-based. Defaults to the col of the current cursor
 ---@param filter? InspectorFilter (table|nil) a table with key-value pairs to filter the items
 ---               - syntax (boolean): include syntax based highlight groups (defaults to true)
 ---               - treesitter (boolean): include treesitter based highlight groups (defaults to true)
 ---               - extmarks (boolean|"all"): include extmarks. When `all`, then extmarks without a `hl_group` will also be included (defaults to true)
 ---               - semantic_tokens (boolean): include semantic tokens (defaults to true)
----@return {treesitter:table,syntax:table,extmarks:table,semantic_tokens:table,buffer:number,col:number,row:number} (table) a table with the following key-value pairs. Items are in "traversal order":
+---@return {treesitter:table,syntax:table,extmarks:table,semantic_tokens:table,buffer:integer,col:integer,row:integer} (table) a table with the following key-value pairs. Items are in "traversal order":
 ---               - treesitter: a list of treesitter captures
 ---               - syntax: a list of syntax groups
 ---               - semantic_tokens: a list of semantic tokens
@@ -129,9 +129,9 @@ end
 ---
 ---Can also be shown with `:Inspect`. *:Inspect*
 ---
----@param bufnr? number defaults to the current buffer
----@param row? number row to inspect, 0-based. Defaults to the row of the current cursor
----@param col? number col to inspect, 0-based. Defaults to the col of the current cursor
+---@param bufnr? integer defaults to the current buffer
+---@param row? integer row to inspect, 0-based. Defaults to the row of the current cursor
+---@param col? integer col to inspect, 0-based. Defaults to the col of the current cursor
 ---@param filter? InspectorFilter (table|nil) see |vim.inspect_pos()|
 function vim.show_pos(bufnr, row, col, filter)
   local items = vim.inspect_pos(bufnr, row, col, filter)
-- 
cgit 


From 65e2feabeb9bd17a076206d98dadb93515e9b612 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 4 Mar 2023 22:05:57 +0900
Subject: docs(editorconfig): number → integer (#22514)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/lua/editorconfig.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/editorconfig.lua b/runtime/lua/editorconfig.lua
index 2079006234..5b09126788 100644
--- a/runtime/lua/editorconfig.lua
+++ b/runtime/lua/editorconfig.lua
@@ -202,7 +202,7 @@ end
 
 --- Configure the given buffer with options from an .editorconfig file
 ---
----@param bufnr number Buffer number to configure
+---@param bufnr integer Buffer number to configure
 ---
 ---@private
 function M.config(bufnr)
-- 
cgit 


From 82b77900d7f85088c676be886937628230d0d5c2 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 4 Mar 2023 22:06:20 +0900
Subject: docs(diagnostic): number → integer (#22512)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/doc/diagnostic.txt     | 44 ++++++++++++++++++++--------------------
 runtime/lua/vim/diagnostic.lua | 46 +++++++++++++++++++++---------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index c661bf02bf..cff73ad097 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -423,25 +423,25 @@ config({opts}, {namespace})                          *vim.diagnostic.config()*
                        severities are displayed before lower severities (e.g.
                        ERROR is displayed before WARN). Options:
                        • reverse: (boolean) Reverse sort order
-      • {namespace}  (number|nil) Update the options for the given namespace.
+      • {namespace}  (integer|nil) Update the options for the given namespace.
                      When omitted, update the global diagnostic options.
 
 disable({bufnr}, {namespace})                       *vim.diagnostic.disable()*
     Disable diagnostics in the given buffer.
 
     Parameters: ~
-      • {bufnr}      (number|nil) Buffer number, or 0 for current buffer. When
-                     omitted, disable diagnostics in all buffers.
-      • {namespace}  (number|nil) Only disable diagnostics for the given
+      • {bufnr}      (integer|nil) Buffer number, or 0 for current buffer.
+                     When omitted, disable diagnostics in all buffers.
+      • {namespace}  (integer|nil) Only disable diagnostics for the given
                      namespace.
 
 enable({bufnr}, {namespace})                         *vim.diagnostic.enable()*
     Enable diagnostics in the given buffer.
 
     Parameters: ~
-      • {bufnr}      (number|nil) Buffer number, or 0 for current buffer. When
-                     omitted, enable diagnostics in all buffers.
-      • {namespace}  (number|nil) Only enable diagnostics for the given
+      • {bufnr}      (integer|nil) Buffer number, or 0 for current buffer.
+                     When omitted, enable diagnostics in all buffers.
+      • {namespace}  (integer|nil) Only enable diagnostics for the given
                      namespace.
 
 fromqflist({list})                               *vim.diagnostic.fromqflist()*
@@ -458,8 +458,8 @@ get({bufnr}, {opts})                                    *vim.diagnostic.get()*
     Get current diagnostics.
 
     Parameters: ~
-      • {bufnr}  (number|nil) Buffer number to get diagnostics from. Use 0 for
-                 current buffer or nil for all buffers.
+      • {bufnr}  (integer|nil) Buffer number to get diagnostics from. Use 0
+                 for current buffer or nil for all buffers.
       • {opts}   (table|nil) A table with the following keys:
                  • namespace: (number) Limit diagnostics to the given
                    namespace.
@@ -473,7 +473,7 @@ get_namespace({namespace})                    *vim.diagnostic.get_namespace()*
     Get namespace metadata.
 
     Parameters: ~
-      • {namespace}  (number) Diagnostic namespace
+      • {namespace}  (integer) Diagnostic namespace
 
     Return: ~
         (table) Namespace metadata
@@ -560,17 +560,17 @@ hide({namespace}, {bufnr})                             *vim.diagnostic.hide()*
     |vim.diagnostic.disable()|.
 
     Parameters: ~
-      • {namespace}  (number|nil) Diagnostic namespace. When omitted, hide diagnostics from all
+      • {namespace}  (integer|nil) Diagnostic namespace. When omitted, hide diagnostics from all
                      namespaces.
-      • {bufnr}      (number|nil) Buffer number, or 0 for current buffer. When
-                     omitted, hide diagnostics in all buffers.
+      • {bufnr}      (integer|nil) Buffer number, or 0 for current buffer.
+                     When omitted, hide diagnostics in all buffers.
 
 is_disabled({bufnr}, {namespace})               *vim.diagnostic.is_disabled()*
     Check whether diagnostics are disabled in a given buffer.
 
     Parameters: ~
-      • {bufnr}      (number|nil) Buffer number, or 0 for current buffer.
-      • {namespace}  (number|nil) Diagnostic namespace. When omitted, checks if all diagnostics are
+      • {bufnr}      (integer|nil) Buffer number, or 0 for current buffer.
+      • {namespace}  (integer|nil) Diagnostic namespace. When omitted, checks if all diagnostics are
                      disabled in {bufnr}. Otherwise, only checks if
                      diagnostics from {namespace} are disabled.
 
@@ -663,7 +663,7 @@ open_float({opts}, {...})                        *vim.diagnostic.open_float()*
                   from |vim.diagnostic.config()|.
 
     Return: ~
-        number|nil, number|nil: ({float_bufnr}, {win_id})
+        integer|nil, integer|nil: ({float_bufnr}, {win_id})
 
 reset({namespace}, {bufnr})                           *vim.diagnostic.reset()*
     Remove all diagnostics from the given namespace.
@@ -674,17 +674,17 @@ reset({namespace}, {bufnr})                           *vim.diagnostic.reset()*
     re-displayed, use |vim.diagnostic.hide()|.
 
     Parameters: ~
-      • {namespace}  (number|nil) Diagnostic namespace. When omitted, remove diagnostics from all
+      • {namespace}  (integer|nil) Diagnostic namespace. When omitted, remove diagnostics from all
                      namespaces.
-      • {bufnr}      (number|nil) Remove diagnostics for the given buffer.
+      • {bufnr}      (integer|nil) Remove diagnostics for the given buffer.
                      When omitted, diagnostics are removed for all buffers.
 
 set({namespace}, {bufnr}, {diagnostics}, {opts})        *vim.diagnostic.set()*
     Set diagnostics for the given namespace and buffer.
 
     Parameters: ~
-      • {namespace}    (number) The diagnostic namespace
-      • {bufnr}        (number) Buffer number
+      • {namespace}    (integer) The diagnostic namespace
+      • {bufnr}        (integer) Buffer number
       • {diagnostics}  (table) A list of diagnostic items
                        |diagnostic-structure|
       • {opts}         (table|nil) Display options to pass to
@@ -723,9 +723,9 @@ show({namespace}, {bufnr}, {diagnostics}, {opts})
     Display diagnostics for the given namespace and buffer.
 
     Parameters: ~
-      • {namespace}    (number|nil) Diagnostic namespace. When omitted, show diagnostics from all
+      • {namespace}    (integer|nil) Diagnostic namespace. When omitted, show diagnostics from all
                        namespaces.
-      • {bufnr}        (number|nil) Buffer number, or 0 for current buffer.
+      • {bufnr}        (integer|nil) Buffer number, or 0 for current buffer.
                        When omitted, show diagnostics in all buffers.
       • {diagnostics}  (table|nil) The diagnostics to display. When omitted,
                        use the saved diagnostics for the given namespace and
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 6fd000a029..56532d0184 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -630,7 +630,7 @@ end
 ---                         Options:
 ---                         * reverse: (boolean) Reverse sort order
 ---
----@param namespace number|nil Update the options for the given namespace. When omitted, update the
+---@param namespace integer|nil Update the options for the given namespace. When omitted, update the
 ---                            global diagnostic options.
 function M.config(opts, namespace)
   vim.validate({
@@ -674,8 +674,8 @@ end
 
 --- Set diagnostics for the given namespace and buffer.
 ---
----@param namespace number The diagnostic namespace
----@param bufnr number Buffer number
+---@param namespace integer The diagnostic namespace
+---@param bufnr integer Buffer number
 ---@param diagnostics table A list of diagnostic items |diagnostic-structure|
 ---@param opts table|nil Display options to pass to |vim.diagnostic.show()|
 function M.set(namespace, bufnr, diagnostics, opts)
@@ -711,7 +711,7 @@ end
 
 --- Get namespace metadata.
 ---
----@param namespace number Diagnostic namespace
+---@param namespace integer Diagnostic namespace
 ---@return table Namespace metadata
 function M.get_namespace(namespace)
   vim.validate({ namespace = { namespace, 'n' } })
@@ -743,11 +743,11 @@ function M.get_namespaces()
 end
 
 ---@class Diagnostic
----@field buffer number
----@field lnum number 0-indexed
----@field end_lnum nil|number 0-indexed
----@field col number 0-indexed
----@field end_col nil|number 0-indexed
+---@field buffer integer
+---@field lnum integer 0-indexed
+---@field end_lnum nil|integer 0-indexed
+---@field col integer 0-indexed
+---@field end_col nil|integer 0-indexed
 ---@field severity DiagnosticSeverity
 ---@field message string
 ---@field source nil|string
@@ -756,7 +756,7 @@ end
 
 --- Get current diagnostics.
 ---
----@param bufnr number|nil Buffer number to get diagnostics from. Use 0 for
+---@param bufnr integer|nil Buffer number to get diagnostics from. Use 0 for
 ---                        current buffer or nil for all buffers.
 ---@param opts table|nil A table with the following keys:
 ---                        - namespace: (number) Limit diagnostics to the given namespace.
@@ -1083,9 +1083,9 @@ end
 --- To hide diagnostics and prevent them from re-displaying, use
 --- |vim.diagnostic.disable()|.
 ---
----@param namespace number|nil Diagnostic namespace. When omitted, hide
+---@param namespace integer|nil Diagnostic namespace. When omitted, hide
 ---                            diagnostics from all namespaces.
----@param bufnr number|nil Buffer number, or 0 for current buffer. When
+---@param bufnr integer|nil Buffer number, or 0 for current buffer. When
 ---                        omitted, hide diagnostics in all buffers.
 function M.hide(namespace, bufnr)
   vim.validate({
@@ -1108,8 +1108,8 @@ end
 
 --- Check whether diagnostics are disabled in a given buffer.
 ---
----@param bufnr number|nil Buffer number, or 0 for current buffer.
----@param namespace number|nil Diagnostic namespace. When omitted, checks if
+---@param bufnr integer|nil Buffer number, or 0 for current buffer.
+---@param namespace integer|nil Diagnostic namespace. When omitted, checks if
 ---                            all diagnostics are disabled in {bufnr}.
 ---                            Otherwise, only checks if diagnostics from
 ---                            {namespace} are disabled.
@@ -1129,9 +1129,9 @@ end
 
 --- Display diagnostics for the given namespace and buffer.
 ---
----@param namespace number|nil Diagnostic namespace. When omitted, show
+---@param namespace integer|nil Diagnostic namespace. When omitted, show
 ---                            diagnostics from all namespaces.
----@param bufnr number|nil Buffer number, or 0 for current buffer. When omitted, show
+---@param bufnr integer|nil Buffer number, or 0 for current buffer. When omitted, show
 ---                        diagnostics in all buffers.
 ---@param diagnostics table|nil The diagnostics to display. When omitted, use the
 ---                             saved diagnostics for the given namespace and
@@ -1256,7 +1256,7 @@ end
 ---                      Overrides the setting from |vim.diagnostic.config()|.
 ---            - suffix: Same as {prefix}, but appends the text to the diagnostic instead of
 ---                      prepending it. Overrides the setting from |vim.diagnostic.config()|.
----@return number|nil, number|nil: ({float_bufnr}, {win_id})
+---@return integer|nil, integer|nil: ({float_bufnr}, {win_id})
 function M.open_float(opts, ...)
   -- Support old (bufnr, opts) signature
   local bufnr
@@ -1463,9 +1463,9 @@ end
 --- simply remove diagnostic decorations in a way that they can be
 --- re-displayed, use |vim.diagnostic.hide()|.
 ---
----@param namespace number|nil Diagnostic namespace. When omitted, remove
+---@param namespace integer|nil Diagnostic namespace. When omitted, remove
 ---                            diagnostics from all namespaces.
----@param bufnr number|nil Remove diagnostics for the given buffer. When omitted,
+---@param bufnr integer|nil Remove diagnostics for the given buffer. When omitted,
 ---             diagnostics are removed for all buffers.
 function M.reset(namespace, bufnr)
   vim.validate({
@@ -1518,9 +1518,9 @@ end
 
 --- Disable diagnostics in the given buffer.
 ---
----@param bufnr number|nil Buffer number, or 0 for current buffer. When
+---@param bufnr integer|nil Buffer number, or 0 for current buffer. When
 ---                        omitted, disable diagnostics in all buffers.
----@param namespace number|nil Only disable diagnostics for the given namespace.
+---@param namespace integer|nil Only disable diagnostics for the given namespace.
 function M.disable(bufnr, namespace)
   vim.validate({ bufnr = { bufnr, 'n', true }, namespace = { namespace, 'n', true } })
   if bufnr == nil then
@@ -1555,9 +1555,9 @@ end
 
 --- Enable diagnostics in the given buffer.
 ---
----@param bufnr number|nil Buffer number, or 0 for current buffer. When
+---@param bufnr integer|nil Buffer number, or 0 for current buffer. When
 ---                        omitted, enable diagnostics in all buffers.
----@param namespace number|nil Only enable diagnostics for the given namespace.
+---@param namespace integer|nil Only enable diagnostics for the given namespace.
 function M.enable(bufnr, namespace)
   vim.validate({ bufnr = { bufnr, 'n', true }, namespace = { namespace, 'n', true } })
   if bufnr == nil then
-- 
cgit 


From aa16590999a66798eca7d2ba09e971aacdeb54b4 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 4 Mar 2023 22:07:39 +0900
Subject: docs(lua): number → integer (#22517)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/doc/lua.txt         | 20 ++++++++++----------
 runtime/lua/vim/_editor.lua | 10 +++++-----
 runtime/lua/vim/shared.lua  | 10 +++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 87498c7599..1eb5ab41e6 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1413,7 +1413,7 @@ notify({msg}, {level}, {opts})                                  *vim.notify()*
 
     Parameters: ~
       • {msg}    (string) Content of the notification to show to the user.
-      • {level}  (number|nil) One of the values from |vim.log.levels|.
+      • {level}  (integer|nil) One of the values from |vim.log.levels|.
       • {opts}   (table|nil) Optional parameters. Unused by default.
 
 notify_once({msg}, {level}, {opts})                        *vim.notify_once()*
@@ -1424,7 +1424,7 @@ notify_once({msg}, {level}, {opts})                        *vim.notify_once()*
 
     Parameters: ~
       • {msg}    (string) Content of the notification to show to the user.
-      • {level}  (number|nil) One of the values from |vim.log.levels|.
+      • {level}  (integer|nil) One of the values from |vim.log.levels|.
       • {opts}   (table|nil) Optional parameters. Unused by default.
 
     Return: ~
@@ -1448,11 +1448,11 @@ on_key({fn}, {ns_id})                                           *vim.on_key()*
                  argument. On each key press, Nvim passes the key char to
                  fn(). |i_CTRL-V| If {fn} is nil, it removes the callback for
                  the associated {ns_id}
-      • {ns_id}  number? Namespace ID. If nil or 0, generates and returns a
+      • {ns_id}  integer? Namespace ID. If nil or 0, generates and returns a
                  new |nvim_create_namespace()| id.
 
     Return: ~
-        (number) Namespace id associated with {fn}. Or count of all callbacks
+        (integer) Namespace id associated with {fn}. Or count of all callbacks
         if on_key() is called without arguments.
 
     Note:
@@ -1507,7 +1507,7 @@ region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
     points
 
     Parameters: ~
-      • {bufnr}      (number) of buffer
+      • {bufnr}      (integer) number of buffer
       • {pos1}       integer[] (line, column) tuple marking beginning of
                      region
       • {pos2}       integer[] (line, column) tuple marking end of region
@@ -1678,8 +1678,8 @@ list_extend({dst}, {src}, {start}, {finish})               *vim.list_extend()*
     Parameters: ~
       • {dst}     (table) List which will be modified and appended to
       • {src}     (table) List from which values will be inserted
-      • {start}   (number|nil) Start index on src. Defaults to 1
-      • {finish}  (number|nil) Final index on src. Defaults to `#src`
+      • {start}   (integer|nil) Start index on src. Defaults to 1
+      • {finish}  (integer|nil) Final index on src. Defaults to `#src`
 
     Return: ~
         (table) dst
@@ -1693,8 +1693,8 @@ list_slice({list}, {start}, {finish})                       *vim.list_slice()*
 
     Parameters: ~
       • {list}    (list) Table
-      • {start}   (number|nil) Start range of slice
-      • {finish}  (number|nil) End range of slice
+      • {start}   (integer|nil) Start range of slice
+      • {finish}  (integer|nil) End range of slice
 
     Return: ~
         (list) Copy of table sliced from start to finish (inclusive)
@@ -1794,7 +1794,7 @@ tbl_count({t})                                               *vim.tbl_count()*
       • {t}  (table) Table
 
     Return: ~
-        (number) Number of non-nil values in table
+        (integer) Number of non-nil values in table
 
     See also: ~
         https://github.com/Tieske/Penlight/blob/master/lua/pl/tablex.lua
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 3f27e61810..ab49e26dde 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -386,7 +386,7 @@ end
 
 --- Get a table of lines with start, end columns for a region marked by two points
 ---
----@param bufnr number of buffer
+---@param bufnr integer number of buffer
 ---@param pos1 integer[] (line, column) tuple marking beginning of region
 ---@param pos2 integer[] (line, column) tuple marking end of region
 ---@param regtype string type of selection, see |setreg()|
@@ -471,7 +471,7 @@ end
 --- writes to |:messages|.
 ---
 ---@param msg string Content of the notification to show to the user.
----@param level number|nil One of the values from |vim.log.levels|.
+---@param level integer|nil One of the values from |vim.log.levels|.
 ---@param opts table|nil Optional parameters. Unused by default.
 function vim.notify(msg, level, opts) -- luacheck: no unused args
   if level == vim.log.levels.ERROR then
@@ -492,7 +492,7 @@ do
   --- display a notification.
   ---
   ---@param msg string Content of the notification to show to the user.
-  ---@param level number|nil One of the values from |vim.log.levels|.
+  ---@param level integer|nil One of the values from |vim.log.levels|.
   ---@param opts table|nil Optional parameters. Unused by default.
   ---@return boolean true if message was displayed, else false
   function vim.notify_once(msg, level, opts)
@@ -521,10 +521,10 @@ local on_key_cbs = {}
 ---@param fn function: Callback function. It should take one string argument.
 ---                   On each key press, Nvim passes the key char to fn(). |i_CTRL-V|
 ---                   If {fn} is nil, it removes the callback for the associated {ns_id}
----@param ns_id number? Namespace ID. If nil or 0, generates and returns a new
+---@param ns_id integer? Namespace ID. If nil or 0, generates and returns a new
 ---                    |nvim_create_namespace()| id.
 ---
----@return number Namespace id associated with {fn}. Or count of all callbacks
+---@return integer Namespace id associated with {fn}. Or count of all callbacks
 ---if on_key() is called without arguments.
 ---
 ---@note {fn} will be removed if an error occurs while calling.
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index cc48e3f193..1c8defc93a 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -418,8 +418,8 @@ end
 ---@generic T: table
 ---@param dst T List which will be modified and appended to
 ---@param src table List from which values will be inserted
----@param start (number|nil) Start index on src. Defaults to 1
----@param finish (number|nil) Final index on src. Defaults to `#src`
+---@param start (integer|nil) Start index on src. Defaults to 1
+---@param finish (integer|nil) Final index on src. Defaults to `#src`
 ---@return T dst
 function vim.list_extend(dst, src, start, finish)
   vim.validate({
@@ -529,7 +529,7 @@ end
 ---
 ---@see https://github.com/Tieske/Penlight/blob/master/lua/pl/tablex.lua
 ---@param t table Table
----@return number Number of non-nil values in table
+---@return integer Number of non-nil values in table
 function vim.tbl_count(t)
   vim.validate({ t = { t, 't' } })
 
@@ -544,8 +544,8 @@ end
 ---
 ---@generic T
 ---@param list T[] (list) Table
----@param start number|nil Start range of slice
----@param finish number|nil End range of slice
+---@param start integer|nil Start range of slice
+---@param finish integer|nil End range of slice
 ---@return T[] (list) Copy of table sliced from start to finish (inclusive)
 function vim.list_slice(list, start, finish)
   local new_list = {}
-- 
cgit 


From 59542504b41dfddb6f26524fb4ce811e0f22a785 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sun, 5 Mar 2023 01:47:30 +0900
Subject: docs(highlight): fix type annotations (#22272)

---
 runtime/lua/vim/highlight.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index 20ad48dd27..89eae0def5 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -36,12 +36,12 @@ end
 
 --- Highlight range between two positions
 ---
----@param bufnr number of buffer to apply highlighting to
----@param ns namespace to add highlight to
----@param higroup highlight group to use for highlighting
----@param start first position (tuple {line,col})
----@param finish second position (tuple {line,col})
----@param opts table with options:
+---@param bufnr integer Buffer number to apply highlighting to
+---@param ns integer Namespace to add highlight to
+---@param higroup string Highlight group to use for highlighting
+---@param start { [1]: integer, [2]: integer } Start position {line, col}
+---@param finish { [1]: integer, [2]: integer } Finish position {line, col}
+---@param opts table|nil Optional parameters
 --             - regtype type of range (see |setreg()|, default charwise)
 --             - inclusive boolean indicating whether the range is end-inclusive (default false)
 --             - priority number indicating priority of highlight (default priorities.user)
@@ -84,7 +84,7 @@ local yank_timer
 --- customize conditions (here: do not highlight a visual selection) via
 ---   au TextYankPost * lua vim.highlight.on_yank {on_visual=false}
 ---
--- @param opts table with options controlling the highlight:
+-- @param opts table|nil Optional parameters
 --              - higroup   highlight group for yanked region (default "IncSearch")
 --              - timeout   time in ms before highlight is cleared (default 150)
 --              - on_macro  highlight when executing macro (default false)
-- 
cgit 


From ac69ba5fa0081026f2c5e6e29d5788802479b7b9 Mon Sep 17 00:00:00 2001
From: Jon Huhn <nojnhuh@users.noreply.github.com>
Date: Sun, 5 Mar 2023 00:52:27 -0600
Subject: feat(lsp): implement workspace/didChangeWatchedFiles (#22405)

---
 runtime/doc/news.txt                |   5 +
 runtime/lua/vim/_editor.lua         |   1 +
 runtime/lua/vim/_watch.lua          | 174 +++++++++++++++++++++
 runtime/lua/vim/lsp/_watchfiles.lua | 293 ++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/handlers.lua    |  38 +++--
 runtime/lua/vim/lsp/protocol.lua    |   4 +
 6 files changed, 506 insertions(+), 9 deletions(-)
 create mode 100644 runtime/lua/vim/_watch.lua
 create mode 100644 runtime/lua/vim/lsp/_watchfiles.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index cda4792c9e..415195e27e 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -184,6 +184,11 @@ The following new APIs or features were added.
 • Vim's `has('gui_running')` is now supported as a way for plugins to check if
   a GUI (not the |TUI|) is attached to Nvim. |has()|
 
+• Added preliminary support for the `workspace/didChangeWatchedFiles` capability
+  to the LSP client to notify servers of file changes on disk. The feature is
+  disabled by default and can be enabled by setting the
+  `workspace.didChangeWatchedFiles.dynamicRegistration=true` capability.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index ab49e26dde..c205451ff9 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -37,6 +37,7 @@ for k, v in pairs({
   health = true,
   fs = true,
   secure = true,
+  _watch = true,
 }) do
   vim._submodules[k] = v
 end
diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
new file mode 100644
index 0000000000..dba1522ec8
--- /dev/null
+++ b/runtime/lua/vim/_watch.lua
@@ -0,0 +1,174 @@
+local M = {}
+
+--- Enumeration describing the types of events watchers will emit.
+M.FileChangeType = vim.tbl_add_reverse_lookup({
+  Created = 1,
+  Changed = 2,
+  Deleted = 3,
+})
+
+---@private
+--- Joins filepath elements by static '/' separator
+---
+---@param ... (string) The path elements.
+local function filepath_join(...)
+  return table.concat({ ... }, '/')
+end
+
+---@private
+--- Stops and closes a libuv |uv_fs_event_t| or |uv_fs_poll_t| handle
+---
+---@param handle (uv_fs_event_t|uv_fs_poll_t) The handle to stop
+local function stop(handle)
+  local _, stop_err = handle:stop()
+  assert(not stop_err, stop_err)
+  local is_closing, close_err = handle:is_closing()
+  assert(not close_err, close_err)
+  if not is_closing then
+    handle:close()
+  end
+end
+
+--- Initializes and starts a |uv_fs_event_t|
+---
+---@param path (string) The path to watch
+---@param opts (table|nil) Additional options
+---     - uvflags (table|nil)
+---                Same flags as accepted by |uv.fs_event_start()|
+---@param callback (function) The function called when new events
+---@returns (function) A function to stop the watch
+function M.watch(path, opts, callback)
+  vim.validate({
+    path = { path, 'string', false },
+    opts = { opts, 'table', true },
+    callback = { callback, 'function', false },
+  })
+
+  path = vim.fs.normalize(path)
+  local uvflags = opts and opts.uvflags or {}
+  local handle, new_err = vim.loop.new_fs_event()
+  assert(not new_err, new_err)
+  local _, start_err = handle:start(path, uvflags, function(err, filename, events)
+    assert(not err, err)
+    local fullpath = path
+    if filename then
+      filename = filename:gsub('\\', '/')
+      fullpath = filepath_join(fullpath, filename)
+    end
+    local change_type = events.change and M.FileChangeType.Changed or 0
+    if events.rename then
+      local _, staterr, staterrname = vim.loop.fs_stat(fullpath)
+      if staterrname == 'ENOENT' then
+        change_type = M.FileChangeType.Deleted
+      else
+        assert(not staterr, staterr)
+        change_type = M.FileChangeType.Created
+      end
+    end
+    callback(fullpath, change_type)
+  end)
+  assert(not start_err, start_err)
+  return function()
+    stop(handle)
+  end
+end
+
+local default_poll_interval_ms = 2000
+
+---@private
+--- Implementation for poll, hiding internally-used parameters.
+---
+---@param watches (table|nil) A tree structure to maintain state for recursive watches.
+---     - handle (uv_fs_poll_t)
+---               The libuv handle
+---     - cancel (function)
+---               A function that cancels the handle and all children's handles
+---     - is_dir (boolean)
+---               Indicates whether the path is a directory (and the poll should
+---               be invoked recursively)
+---     - children (table|nil)
+---               A mapping of directory entry name to its recursive watches
+local function poll_internal(path, opts, callback, watches)
+  path = vim.fs.normalize(path)
+  local interval = opts and opts.interval or default_poll_interval_ms
+  watches = watches or {
+    is_dir = true,
+  }
+
+  if not watches.handle then
+    local poll, new_err = vim.loop.new_fs_poll()
+    assert(not new_err, new_err)
+    watches.handle = poll
+    local _, start_err = poll:start(
+      path,
+      interval,
+      vim.schedule_wrap(function(err)
+        if err == 'ENOENT' then
+          return
+        end
+        assert(not err, err)
+        poll_internal(path, opts, callback, watches)
+        callback(path, M.FileChangeType.Changed)
+      end)
+    )
+    assert(not start_err, start_err)
+    callback(path, M.FileChangeType.Created)
+  end
+
+  watches.cancel = function()
+    if watches.children then
+      for _, w in pairs(watches.children) do
+        w.cancel()
+      end
+    end
+    stop(watches.handle)
+  end
+
+  if watches.is_dir then
+    watches.children = watches.children or {}
+    local exists = {}
+    for name, ftype in vim.fs.dir(path) do
+      exists[name] = true
+      if not watches.children[name] then
+        watches.children[name] = {
+          is_dir = ftype == 'directory',
+        }
+        poll_internal(filepath_join(path, name), opts, callback, watches.children[name])
+      end
+    end
+
+    local newchildren = {}
+    for name, watch in pairs(watches.children) do
+      if exists[name] then
+        newchildren[name] = watch
+      else
+        watch.cancel()
+        watches.children[name] = nil
+        callback(path .. '/' .. name, M.FileChangeType.Deleted)
+      end
+    end
+    watches.children = newchildren
+  end
+
+  return watches.cancel
+end
+
+--- Initializes and starts a |uv_fs_poll_t| recursively watching every file underneath the
+--- directory at path.
+---
+---@param path (string) The path to watch. Must refer to a directory.
+---@param opts (table|nil) Additional options
+---     - interval (number|nil)
+---                Polling interval in ms as passed to |uv.fs_poll_start()|. Defaults to 2000.
+---@param callback (function) The function called when new events
+---@returns (function) A function to stop the watch.
+function M.poll(path, opts, callback)
+  vim.validate({
+    path = { path, 'string', false },
+    opts = { opts, 'table', true },
+    callback = { callback, 'function', false },
+  })
+  return poll_internal(path, opts, callback, nil)
+end
+
+return M
diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
new file mode 100644
index 0000000000..96d7fa1d35
--- /dev/null
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -0,0 +1,293 @@
+local bit = require('bit')
+local watch = require('vim._watch')
+local protocol = require('vim.lsp.protocol')
+
+local M = {}
+
+---@private
+---Parses the raw pattern into a number of Lua-native patterns.
+---
+---@param pattern string The raw glob pattern
+---@return table A list of Lua patterns. A match with any of them matches the input glob pattern.
+local function parse(pattern)
+  local patterns = { '' }
+
+  local path_sep = '[/\\]'
+  local non_path_sep = '[^/\\]'
+
+  local function append(chunks)
+    local new_patterns = {}
+    for _, p in ipairs(patterns) do
+      for _, chunk in ipairs(chunks) do
+        table.insert(new_patterns, p .. chunk)
+      end
+    end
+    patterns = new_patterns
+  end
+
+  local function split(s, sep)
+    local segments = {}
+    local segment = ''
+    local in_braces = false
+    local in_brackets = false
+    for i = 1, #s do
+      local c = string.sub(s, i, i)
+      if c == sep and not in_braces and not in_brackets then
+        table.insert(segments, segment)
+        segment = ''
+      else
+        if c == '{' then
+          in_braces = true
+        elseif c == '}' then
+          in_braces = false
+        elseif c == '[' then
+          in_brackets = true
+        elseif c == ']' then
+          in_brackets = false
+        end
+        segment = segment .. c
+      end
+    end
+    if segment ~= '' then
+      table.insert(segments, segment)
+    end
+    return segments
+  end
+
+  local function escape(c)
+    if
+      c == '?'
+      or c == '.'
+      or c == '('
+      or c == ')'
+      or c == '%'
+      or c == '['
+      or c == ']'
+      or c == '*'
+      or c == '+'
+      or c == '-'
+    then
+      return '%' .. c
+    end
+    return c
+  end
+
+  local segments = split(pattern, '/')
+  for i, segment in ipairs(segments) do
+    local last_seg = i == #segments
+    if segment == '**' then
+      local chunks = {
+        path_sep .. '-',
+        '.-' .. path_sep,
+      }
+      if last_seg then
+        chunks = { '.-' }
+      end
+      append(chunks)
+    else
+      local in_braces = false
+      local brace_val = ''
+      local in_brackets = false
+      local bracket_val = ''
+      for j = 1, #segment do
+        local char = string.sub(segment, j, j)
+        if char ~= '}' and in_braces then
+          brace_val = brace_val .. char
+        else
+          if in_brackets and (char ~= ']' or bracket_val == '') then
+            local res
+            if char == '-' then
+              res = char
+            elseif bracket_val == '' and char == '!' then
+              res = '^'
+            elseif char == '/' then
+              res = ''
+            else
+              res = escape(char)
+            end
+            bracket_val = bracket_val .. res
+          else
+            if char == '{' then
+              in_braces = true
+            elseif char == '[' then
+              in_brackets = true
+            elseif char == '}' then
+              local choices = split(brace_val, ',')
+              local parsed_choices = {}
+              for _, choice in ipairs(choices) do
+                table.insert(parsed_choices, parse(choice))
+              end
+              append(vim.tbl_flatten(parsed_choices))
+              in_braces = false
+              brace_val = ''
+            elseif char == ']' then
+              append({ '[' .. bracket_val .. ']' })
+              in_brackets = false
+              bracket_val = ''
+            elseif char == '?' then
+              append({ non_path_sep })
+            elseif char == '*' then
+              append({ non_path_sep .. '-' })
+            else
+              append({ escape(char) })
+            end
+          end
+        end
+      end
+
+      if not last_seg and (segments[i + 1] ~= '**' or i + 1 < #segments) then
+        append({ path_sep })
+      end
+    end
+  end
+
+  return patterns
+end
+
+---@private
+--- Implementation of LSP 3.17.0's pattern matching: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#pattern
+--- Modeled after VSCode's implementation: https://github.com/microsoft/vscode/blob/0319eed971719ad48e9093daba9d65a5013ec5ab/src/vs/base/common/glob.ts#L509
+---
+---@param pattern string|table The glob pattern (raw or parsed) to match.
+---@param s string The string to match against pattern.
+---@return boolean Whether or not pattern matches s.
+function M._match(pattern, s)
+  if type(pattern) == 'string' then
+    pattern = parse(pattern)
+  end
+  -- Since Lua's built-in string pattern matching does not have an alternate
+  -- operator like '|', `parse` will construct one pattern for each possible
+  -- alternative. Any pattern that matches thus matches the glob.
+  for _, p in ipairs(pattern) do
+    if s:match('^' .. p .. '$') then
+      return true
+    end
+  end
+  return false
+end
+
+M._watchfunc = (vim.fn.has('win32') == 1 or vim.fn.has('mac') == 1) and watch.watch or watch.poll
+
+---@type table<number, table<number, function()>> client id -> registration id -> cancel function
+local cancels = vim.defaulttable()
+
+local queue_timeout_ms = 100
+---@type table<number, uv_timer_t> client id -> libuv timer which will send queued changes at its timeout
+local queue_timers = {}
+---@type table<number, lsp.FileEvent[]> client id -> set of queued changes to send in a single LSP notification
+local change_queues = {}
+---@type table<number, table<string, lsp.FileChangeType>> client id -> URI -> last type of change processed
+--- Used to prune consecutive events of the same type for the same file
+local change_cache = vim.defaulttable()
+
+local to_lsp_change_type = {
+  [watch.FileChangeType.Created] = protocol.FileChangeType.Created,
+  [watch.FileChangeType.Changed] = protocol.FileChangeType.Changed,
+  [watch.FileChangeType.Deleted] = protocol.FileChangeType.Deleted,
+}
+
+--- Registers the workspace/didChangeWatchedFiles capability dynamically.
+---
+---@param reg table LSP Registration object.
+---@param ctx table Context from the |lsp-handler|.
+function M.register(reg, ctx)
+  local client_id = ctx.client_id
+  local client = vim.lsp.get_client_by_id(client_id)
+  local watch_regs = {}
+  for _, w in ipairs(reg.registerOptions.watchers) do
+    local glob_patterns = {}
+    if type(w.globPattern) == 'string' then
+      for _, folder in ipairs(client.workspace_folders) do
+        table.insert(glob_patterns, { baseUri = folder.uri, pattern = w.globPattern })
+      end
+    else
+      table.insert(glob_patterns, w.globPattern)
+    end
+    for _, glob_pattern in ipairs(glob_patterns) do
+      local pattern = parse(glob_pattern.pattern)
+      local base_dir = nil
+      if type(glob_pattern.baseUri) == 'string' then
+        base_dir = glob_pattern.baseUri
+      elseif type(glob_pattern.baseUri) == 'table' then
+        base_dir = glob_pattern.baseUri.uri
+      end
+      assert(base_dir, "couldn't identify root of watch")
+      base_dir = vim.uri_to_fname(base_dir)
+      local kind = w.kind
+        or protocol.WatchKind.Create + protocol.WatchKind.Change + protocol.WatchKind.Delete
+
+      table.insert(watch_regs, {
+        base_dir = base_dir,
+        pattern = pattern,
+        kind = kind,
+      })
+    end
+  end
+
+  local callback = function(base_dir)
+    return function(fullpath, change_type)
+      for _, w in ipairs(watch_regs) do
+        change_type = to_lsp_change_type[change_type]
+        -- e.g. match kind with Delete bit (0b0100) to Delete change_type (3)
+        local kind_mask = bit.lshift(1, change_type - 1)
+        local change_type_match = bit.band(w.kind, kind_mask) == kind_mask
+        if base_dir == w.base_dir and M._match(w.pattern, fullpath) and change_type_match then
+          local change = {
+            uri = vim.uri_from_fname(fullpath),
+            type = change_type,
+          }
+
+          local last_type = change_cache[client_id][change.uri]
+          if last_type ~= change.type then
+            change_queues[client_id] = change_queues[client_id] or {}
+            table.insert(change_queues[client_id], change)
+            change_cache[client_id][change.uri] = change.type
+          end
+
+          if not queue_timers[client_id] then
+            queue_timers[client_id] = vim.defer_fn(function()
+              client.notify('workspace/didChangeWatchedFiles', {
+                changes = change_queues[client_id],
+              })
+              queue_timers[client_id] = nil
+              change_queues[client_id] = nil
+              change_cache[client_id] = nil
+            end, queue_timeout_ms)
+          end
+
+          break -- if an event matches multiple watchers, only send one notification
+        end
+      end
+    end
+  end
+
+  local watching = {}
+  for _, w in ipairs(watch_regs) do
+    if not watching[w.base_dir] then
+      watching[w.base_dir] = true
+      table.insert(
+        cancels[client_id][reg.id],
+        M._watchfunc(w.base_dir, { uvflags = { recursive = true } }, callback(w.base_dir))
+      )
+    end
+  end
+end
+
+--- Unregisters the workspace/didChangeWatchedFiles capability dynamically.
+---
+---@param unreg table LSP Unregistration object.
+---@param ctx table Context from the |lsp-handler|.
+function M.unregister(unreg, ctx)
+  local client_id = ctx.client_id
+  local client_cancels = cancels[client_id]
+  local reg_cancels = client_cancels[unreg.id]
+  while #reg_cancels > 0 do
+    table.remove(reg_cancels)()
+  end
+  client_cancels[unreg.id] = nil
+  if not next(cancels[client_id]) then
+    cancels[client_id] = nil
+  end
+end
+
+return M
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 5096100a60..ee5b63d260 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -117,15 +117,35 @@ M['window/showMessageRequest'] = function(_, result)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_registerCapability
-M['client/registerCapability'] = function(_, _, ctx)
-  local client_id = ctx.client_id
-  local warning_tpl = 'The language server %s triggers a registerCapability '
-    .. 'handler despite dynamicRegistration set to false. '
-    .. 'Report upstream, this warning is harmless'
-  local client = vim.lsp.get_client_by_id(client_id)
-  local client_name = client and client.name or string.format('id=%d', client_id)
-  local warning = string.format(warning_tpl, client_name)
-  log.warn(warning)
+M['client/registerCapability'] = function(_, result, ctx)
+  local log_unsupported = false
+  for _, reg in ipairs(result.registrations) do
+    if reg.method == 'workspace/didChangeWatchedFiles' then
+      require('vim.lsp._watchfiles').register(reg, ctx)
+    else
+      log_unsupported = true
+    end
+  end
+  if log_unsupported then
+    local client_id = ctx.client_id
+    local warning_tpl = 'The language server %s triggers a registerCapability '
+      .. 'handler despite dynamicRegistration set to false. '
+      .. 'Report upstream, this warning is harmless'
+    local client = vim.lsp.get_client_by_id(client_id)
+    local client_name = client and client.name or string.format('id=%d', client_id)
+    local warning = string.format(warning_tpl, client_name)
+    log.warn(warning)
+  end
+  return vim.NIL
+end
+
+--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_unregisterCapability
+M['client/unregisterCapability'] = function(_, result, ctx)
+  for _, unreg in ipairs(result.unregisterations) do
+    if unreg.method == 'workspace/didChangeWatchedFiles' then
+      require('vim.lsp._watchfiles').unregister(unreg, ctx)
+    end
+  end
   return vim.NIL
 end
 
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 41dfc9e00e..27dd68645a 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -834,6 +834,10 @@ function protocol.make_client_capabilities()
       semanticTokens = {
         refreshSupport = true,
       },
+      didChangeWatchedFiles = {
+        dynamicRegistration = false,
+        relativePatternSupport = true,
+      },
     },
     experimental = nil,
     window = {
-- 
cgit 


From ed05d38d9fa643c7e562b754c6cfed8b9da5c4d8 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sun, 5 Mar 2023 08:42:15 +0100
Subject: fix(lsp): don't monitor files if workspace_folders is nil (#22531)

Fixes:

    Error SERVER_REQUEST_HANDLER_ERROR: "...di/dev/neovim/neovim/runtime/lua/vim/lsp/_watchfiles.lua
    :200: bad argument #1 to 'ipairs' (table expected, got nil)"

Language servers can be started without root_dir or workspace_folders.
---
 runtime/lua/vim/lsp/_watchfiles.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index 96d7fa1d35..533a955925 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -168,11 +168,11 @@ end
 
 M._watchfunc = (vim.fn.has('win32') == 1 or vim.fn.has('mac') == 1) and watch.watch or watch.poll
 
----@type table<number, table<number, function()>> client id -> registration id -> cancel function
+---@type table<number, table<number, function[]>> client id -> registration id -> cancel function
 local cancels = vim.defaulttable()
 
 local queue_timeout_ms = 100
----@type table<number, uv_timer_t> client id -> libuv timer which will send queued changes at its timeout
+---@type table<number, uv.uv_timer_t> client id -> libuv timer which will send queued changes at its timeout
 local queue_timers = {}
 ---@type table<number, lsp.FileEvent[]> client id -> set of queued changes to send in a single LSP notification
 local change_queues = {}
@@ -193,6 +193,9 @@ local to_lsp_change_type = {
 function M.register(reg, ctx)
   local client_id = ctx.client_id
   local client = vim.lsp.get_client_by_id(client_id)
+  if not client.workspace_folders then
+    return
+  end
   local watch_regs = {}
   for _, w in ipairs(reg.registerOptions.watchers) do
     local glob_patterns = {}
-- 
cgit 


From 533d671271eb76373d9940161e7bfd201b7e7c2b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 5 Mar 2023 18:15:29 -0500
Subject: docs: module-level docstrings (@defgroup) #22498

Problem:
gen_vimdoc.py / lua2dox.lua does not support @defgroup or \defgroup
except for "api-foo" modules.

Solution:
Modify `gen_vimdoc.py` to look for section names based on `helptag_fmt`.

TODO:
- Support @module ?
  https://github.com/LuaLS/lua-language-server/wiki/Annotations#module
---
 runtime/doc/treesitter.txt                  | 78 +++++++++++++++--------------
 runtime/lua/vim/treesitter/languagetree.lua | 34 +++++++++++++
 2 files changed, 74 insertions(+), 38 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 855fc6bdc6..1f78e4d5d9 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -28,42 +28,6 @@ A parser can also be loaded manually using a full path: >lua
 
     vim.treesitter.require_language("python", "/path/to/python.so")
 <
-==============================================================================
-LANGUAGE TREES                                       *treesitter-languagetree*
-                                                                *LanguageTree*
-
-As buffers can contain multiple languages (e.g., Vimscript commands in a Lua
-file), multiple parsers may be needed to parse the full buffer. These are
-combined in a |LanguageTree| object.
-
-To create a LanguageTree (parser object) for a buffer and a given language,
-use >lua
-
-    tsparser = vim.treesitter.get_parser(bufnr, lang)
-<
-`bufnr=0` can be used for current buffer. `lang` will default to 'filetype'.
-Currently, the parser will be retained for the lifetime of a buffer but this
-is subject to change. A plugin should keep a reference to the parser object as
-long as it wants incremental updates.
-
-Whenever you need to access the current syntax tree, parse the buffer: >lua
-
-    tstree = tsparser:parse()
-<
-This will return a table of immutable |treesitter-tree|s that represent the
-current state of the buffer. When the plugin wants to access the state after a
-(possible) edit it should call `parse()` again. If the buffer wasn't edited,
-the same tree will be returned again without extra work. If the buffer was
-parsed before, incremental parsing will be done of the changed parts.
-
-Note: To use the parser directly inside a |nvim_buf_attach()| Lua callback,
-you must call |vim.treesitter.get_parser()| before you register your callback.
-But preferably parsing shouldn't be done directly in the change callback
-anyway as they will be very frequent. Rather a plugin that does any kind of
-analysis on a tree should use a timer to throttle too frequent updates.
-
-See |lua-treesitter-languagetree| for the list of available methods.
-
 ==============================================================================
 TREESITTER TREES                                             *treesitter-tree*
                                                                       *TSTree*
@@ -221,7 +185,7 @@ Nvim looks for queries as `*.scm` files in a `queries` directory under
 purpose, e.g., `queries/lua/highlights.scm` for highlighting Lua files.
 By default, the first query on `runtimepath` is used (which usually implies
 that user config takes precedence over plugins, which take precedence over
-queries bundled with Neovim). If a query should extend other queries instead
+queries bundled with Nvim). If a query should extend other queries instead
 of replacing them, use |treesitter-query-modeline-extends|.
 
 See |lua-treesitter-query| for the list of available methods for working with
@@ -321,7 +285,7 @@ Use |vim.treesitter.list_directives()| to list all available directives.
 
 TREESITTER QUERY MODELINES                          *treesitter-query-modeline*
 
-Neovim supports to customize the behavior of the queries using a set of
+Nvim supports to customize the behavior of the queries using a set of
 "modelines", that is comments in the queries starting with `;`. Here are the
 currently supported modeline alternatives:
 
@@ -938,6 +902,44 @@ TSHighlighter:destroy({self})                        *TSHighlighter:destroy()*
 ==============================================================================
 Lua module: vim.treesitter.languagetree          *lua-treesitter-languagetree*
 
+
+A *LanguageTree* contains a tree of parsers: the root treesitter parser
+for {lang} and any "injected" language parsers, which themselves may
+inject other languages, recursively. For example a Lua buffer containing
+some Vimscript commands needs multiple parsers to fully understand its
+contents.
+
+To create a LanguageTree (parser object) for a given buffer and language, use:
+
+>lua
+    local parser = vim.treesitter.get_parser(bufnr, lang)
+<
+
+(where `bufnr=0` means current buffer). `lang` defaults to 'filetype'.
+Note: currently the parser is retained for the lifetime of a buffer but
+this may change; a plugin should keep a reference to the parser object if
+it wants incremental updates.
+
+Whenever you need to access the current syntax tree, parse the buffer:
+
+>lua
+    local tree = parser:parse()
+<
+
+This returns a table of immutable |treesitter-tree| objects representing
+the current state of the buffer. When the plugin wants to access the state
+after a (possible) edit it must call `parse()` again. If the buffer wasn't
+edited, the same tree will be returned again without extra work. If the
+buffer was parsed before, incremental parsing will be done of the changed
+parts.
+
+Note: To use the parser directly inside a |nvim_buf_attach()| Lua
+callback, you must call |vim.treesitter.get_parser()| before you register
+your callback. But preferably parsing shouldn't be done directly in the
+change callback anyway as they will be very frequent. Rather a plugin that
+does any kind of analysis on a tree should use a timer to throttle too
+frequent updates.
+
 LanguageTree:children({self})                        *LanguageTree:children()*
     Returns a map of language to child tree.
 
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 1bc7971eba..b8b0dd867e 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -1,3 +1,37 @@
+--- @defgroup lua-treesitter-languagetree
+---
+--- @brief A \*LanguageTree\* contains a tree of parsers: the root treesitter parser for {lang} and
+--- any "injected" language parsers, which themselves may inject other languages, recursively.
+--- For example a Lua buffer containing some Vimscript commands needs multiple parsers to fully
+--- understand its contents.
+---
+--- To create a LanguageTree (parser object) for a given buffer and language, use:
+---
+--- <pre>lua
+---     local parser = vim.treesitter.get_parser(bufnr, lang)
+--- </pre>
+---
+--- (where `bufnr=0` means current buffer). `lang` defaults to 'filetype'.
+--- Note: currently the parser is retained for the lifetime of a buffer but this may change;
+--- a plugin should keep a reference to the parser object if it wants incremental updates.
+---
+--- Whenever you need to access the current syntax tree, parse the buffer:
+---
+--- <pre>lua
+---     local tree = parser:parse()
+--- </pre>
+---
+--- This returns a table of immutable |treesitter-tree| objects representing the current state of
+--- the buffer. When the plugin wants to access the state after a (possible) edit it must call
+--- `parse()` again. If the buffer wasn't edited, the same tree will be returned again without extra
+--- work. If the buffer was parsed before, incremental parsing will be done of the changed parts.
+---
+--- Note: To use the parser directly inside a |nvim_buf_attach()| Lua callback, you must call
+--- |vim.treesitter.get_parser()| before you register your callback. But preferably parsing
+--- shouldn't be done directly in the change callback anyway as they will be very frequent. Rather
+--- a plugin that does any kind of analysis on a tree should use a timer to throttle too frequent
+--- updates.
+
 local a = vim.api
 local query = require('vim.treesitter.query')
 local language = require('vim.treesitter.language')
-- 
cgit 


From f9a46391ab5961fe6c6b7d1efdc96befdd495c11 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 6 Mar 2023 10:57:14 +0000
Subject: refactor(treesitter): simplify some range functions

---
 runtime/lua/vim/treesitter.lua        | 26 +++++++-------------------
 runtime/lua/vim/treesitter/_range.lua | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index ee66ba9f9b..d13824076e 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -2,6 +2,7 @@ local a = vim.api
 local query = require('vim.treesitter.query')
 local language = require('vim.treesitter.language')
 local LanguageTree = require('vim.treesitter.languagetree')
+local Range = require('vim.treesitter._range')
 
 ---@type table<integer,LanguageTree>
 local parsers = setmetatable({}, { __mode = 'v' })
@@ -190,20 +191,7 @@ end
 ---
 ---@return boolean True if the position is in node range
 function M.is_in_node_range(node, line, col)
-  local start_line, start_col, end_line, end_col = M.get_node_range(node)
-  if line >= start_line and line <= end_line then
-    if line == start_line and line == end_line then
-      return col >= start_col and col < end_col
-    elseif line == start_line then
-      return col >= start_col
-    elseif line == end_line then
-      return col < end_col
-    else
-      return true
-    end
-  else
-    return false
-  end
+  return M.node_contains(node, { line, col, line, col })
 end
 
 --- Determines if a node contains a range
@@ -213,11 +201,11 @@ end
 ---
 ---@return boolean True if the {node} contains the {range}
 function M.node_contains(node, range)
-  local start_row, start_col, end_row, end_col = node:range()
-  local start_fits = start_row < range[1] or (start_row == range[1] and start_col <= range[2])
-  local end_fits = end_row > range[3] or (end_row == range[3] and end_col >= range[4])
-
-  return start_fits and end_fits
+  vim.validate({
+    node = { node, 'userdata' },
+    range = { range, Range.validate, 'integer list with 4 or 6 elements' },
+  })
+  return Range.contains({ node:range() }, range)
 end
 
 --- Returns a list of highlight captures at the given position
diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index 8decd3a1fd..bec24a23a5 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -53,6 +53,26 @@ M.cmp_pos = {
 
 setmetatable(M.cmp_pos, { __call = cmp_pos })
 
+---@private
+---Check if a variable is a valid range object
+---@param r any
+---@return boolean
+function M.validate(r)
+  if type(r) ~= 'table' or #r ~= 6 and #r ~= 4 then
+    return false
+  end
+
+  for _, e in
+    ipairs(r --[[@as any[] ]])
+  do
+    if type(e) ~= 'number' then
+      return false
+    end
+  end
+
+  return true
+end
+
 ---@private
 ---@param r1 Range4|Range6
 ---@param r2 Range4|Range6
-- 
cgit 


From 0e7196438d8f856eecd7c90e160b79cbc8fb08dc Mon Sep 17 00:00:00 2001
From: Kelly Lin <findkellylin@gmail.com>
Date: Sun, 19 Feb 2023 22:33:57 +1100
Subject: feat(lua): add semver api

---
 runtime/doc/lua.txt                |  72 +++++++++
 runtime/doc/news.txt               |   4 +
 runtime/lua/vim/_init_packages.lua |   3 +
 runtime/lua/vim/version.lua        | 297 +++++++++++++++++++++++++++++++++++++
 4 files changed, 376 insertions(+)
 create mode 100644 runtime/lua/vim/version.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 1eb5ab41e6..3c48cd37a6 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2497,4 +2497,76 @@ trust({opts})                                             *vim.secure.trust()*
         • true and full path of target file if operation was successful
         • false and error message on failure
 
+
+==============================================================================
+Lua module: version                                              *lua-version*
+
+cmp({v1}, {v2}, {opts})                                        *version.cmp()*
+    Compares two strings ( `v1` and `v2` ) in semver format.
+
+    Parameters: ~
+      • {v1}    (string) Version.
+      • {v2}    (string) Version to be compared with v1.
+      • {opts}  (table|nil) Optional keyword arguments:
+                • strict (boolean): see `semver.parse` for details. Defaults
+                  to false.
+
+    Return: ~
+        (integer) `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
+
+eq({version_1}, {version_2})                                    *version.eq()*
+    Returns `true` if `v1` are `v2` are equal versions.
+
+    Parameters: ~
+      • {version_1}  (string)
+      • {version_2}  (string)
+
+    Return: ~
+        (boolean)
+
+gt({version_1}, {version_2})                                    *version.gt()*
+    Returns `true` if `v1` is greater than `v2` .
+
+    Parameters: ~
+      • {version_1}  (string)
+      • {version_2}  (string)
+
+    Return: ~
+        (boolean)
+
+lt({version_1}, {version_2})                                    *version.lt()*
+    Returns `true` if `v1` is less than `v2` .
+
+    Parameters: ~
+      • {version_1}  (string)
+      • {version_2}  (string)
+
+    Return: ~
+        (boolean)
+
+parse({version}, {opts})                                     *version.parse()*
+    Parses a semantically formatted version string into a table.
+
+    Supports leading "v" and leading and trailing whitespace in the version
+    string. e.g. `" v1.0.1-rc1+build.2"` , `"1.0.1-rc1+build.2"`,
+    `"v1.0.1-rc1+build.2"` and `"v1.0.1-rc1+build.2 "` will be parsed as:
+
+    { major = 1, minor = 0, patch = 1, prerelease = 'rc1 , build = 'build.2' }`
+
+    Parameters: ~
+      • {version}  (string) Version string to be parsed.
+      • {opts}     (table|nil) Optional keyword arguments:
+                   • strict (boolean): when set to `true` an error will be
+                     thrown for version strings that do not conform to the
+                     semver specification (v2.0.0) (see
+                     semver.org/spec/v2.0.0.html for details). This means that
+                     `semver.parse('v1.2)` will throw an error. When set to
+                     `false`, `semver.parse('v1.2)` will coerce 'v1.2' to
+                     'v1.2.0' and return the table: `{ major = 1, minor = 2,
+                     patch = 0 }`. Defaults to false.
+
+    Return: ~
+        (table|nil) parsed_version Parsed version table or `nil` if `version`
+        is not valid.
+
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 415195e27e..b5cb975066 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -55,6 +55,10 @@ NEW FEATURES                                                    *news-features*
 
 The following new APIs or features were added.
 
+• Added |version.parse()|, |version.cmp()|, |version.lt()|, |version.eq()|
+  and |version.gt()| to |vim.version| for parsing and comparing version numbers
+  according to the semver specification, see |lua-version|.
+
 • A new environment variable named NVIM_APPNAME enables configuring the
   directories where Neovim should find its configuration and state files. See
   `:help $NVIM_APPNAME` .
diff --git a/runtime/lua/vim/_init_packages.lua b/runtime/lua/vim/_init_packages.lua
index e3a442af5e..d032026796 100644
--- a/runtime/lua/vim/_init_packages.lua
+++ b/runtime/lua/vim/_init_packages.lua
@@ -69,6 +69,9 @@ setmetatable(vim, {
         t[key] = val
         return t[key]
       end
+    elseif key == 'version' then
+      t[key] = require('vim.version')
+      return t[key]
     end
   end,
 })
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
new file mode 100644
index 0000000000..49ef019295
--- /dev/null
+++ b/runtime/lua/vim/version.lua
@@ -0,0 +1,297 @@
+local M = {}
+
+---@private
+--- Compares the prerelease component of the two versions.
+---@param v1_parsed table Parsed version.
+---@param v2_parsed table Parsed version.
+---@return integer `-1` if `v1_parsed < v2_parsed`, `0` if `v1_parsed == v2_parsed`, `1` if `v1_parsed > v2_parsed`.
+local function cmp_prerelease(v1_parsed, v2_parsed)
+  if v1_parsed.prerelease and not v2_parsed.prerelease then
+    return -1
+  end
+  if not v1_parsed.prerelease and v2_parsed.prerelease then
+    return 1
+  end
+  if not v1_parsed.prerelease and not v2_parsed.prerelease then
+    return 0
+  end
+
+  local v1_identifiers = vim.split(v1_parsed.prerelease, '.', { plain = true })
+  local v2_identifiers = vim.split(v2_parsed.prerelease, '.', { plain = true })
+  local i = 1
+  local max = math.max(vim.tbl_count(v1_identifiers), vim.tbl_count(v2_identifiers))
+  while i <= max do
+    local v1_identifier = v1_identifiers[i]
+    local v2_identifier = v2_identifiers[i]
+    if v1_identifier ~= v2_identifier then
+      local v1_num = tonumber(v1_identifier)
+      local v2_num = tonumber(v2_identifier)
+      local is_number = v1_num and v2_num
+      if is_number then
+        -- Number comparisons
+        if not v1_num and v2_num then
+          return -1
+        end
+        if v1_num and not v2_num then
+          return 1
+        end
+        if v1_num == v2_num then
+          return 0
+        end
+        if v1_num > v2_num then
+          return 1
+        end
+        if v1_num < v2_num then
+          return -1
+        end
+      else
+        -- String comparisons
+        if v1_identifier and not v2_identifier then
+          return 1
+        end
+        if not v1_identifier and v2_identifier then
+          return -1
+        end
+        if v1_identifier < v2_identifier then
+          return -1
+        end
+        if v1_identifier > v2_identifier then
+          return 1
+        end
+        if v1_identifier == v2_identifier then
+          return 0
+        end
+      end
+    end
+    i = i + 1
+  end
+
+  return 0
+end
+
+---@private
+--- Compares the version core component of the two versions.
+---@param v1_parsed table Parsed version.
+---@param v2_parsed table Parsed version.
+---@return integer `-1` if `v1_parsed < v2_parsed`, `0` if `v1_parsed == v2_parsed`, `1` if `v1_parsed > v2_parsed`.
+local function cmp_version_core(v1_parsed, v2_parsed)
+  if
+    v1_parsed.major == v2_parsed.major
+    and v1_parsed.minor == v2_parsed.minor
+    and v1_parsed.patch == v2_parsed.patch
+  then
+    return 0
+  end
+
+  if
+    v1_parsed.major > v2_parsed.major
+    or v1_parsed.minor > v2_parsed.minor
+    or v1_parsed.patch > v2_parsed.patch
+  then
+    return 1
+  end
+
+  return -1
+end
+
+--- Compares two strings (`v1` and `v2`) in semver format.
+---@param v1 string Version.
+---@param v2 string Version to be compared with v1.
+---@param opts table|nil Optional keyword arguments:
+---                      - strict (boolean):  see `semver.parse` for details. Defaults to false.
+---@return integer `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
+function M.cmp(v1, v2, opts)
+  opts = opts or { strict = false }
+  local v1_parsed = M.parse(v1, opts)
+  local v2_parsed = M.parse(v2, opts)
+
+  local result = cmp_version_core(v1_parsed, v2_parsed)
+  if result == 0 then
+    result = cmp_prerelease(v1_parsed, v2_parsed)
+  end
+  return result
+end
+
+---@private
+---@param labels string Prerelease and build component of semantic version string e.g. "-rc1+build.0".
+---@return string|nil
+local function parse_prerelease(labels)
+  -- This pattern matches "-(alpha)+build.15".
+  -- '^%-[%w%.]+$'
+  local result = labels:match('^%-([%w%.]+)+.+$')
+  if result then
+    return result
+  end
+  -- This pattern matches "-(alpha)".
+  result = labels:match('^%-([%w%.]+)')
+  if result then
+    return result
+  end
+
+  return nil
+end
+
+---@private
+---@param labels string Prerelease and build component of semantic version string e.g. "-rc1+build.0".
+---@return string|nil
+local function parse_build(labels)
+  -- Pattern matches "-alpha+(build.15)".
+  local result = labels:match('^%-[%w%.]+%+([%w%.]+)$')
+  if result then
+    return result
+  end
+
+  -- Pattern matches "+(build.15)".
+  result = labels:match('^%+([%w%.]+)$')
+  if result then
+    return result
+  end
+
+  return nil
+end
+
+---@private
+--- Extracts the major, minor, patch and preprelease and build components from
+--- `version`.
+---@param version string Version string
+local function extract_components_strict(version)
+  local major, minor, patch, prerelease_and_build = version:match('^v?(%d+)%.(%d+)%.(%d+)(.*)$')
+  return tonumber(major), tonumber(minor), tonumber(patch), prerelease_and_build
+end
+
+---@private
+--- Extracts the major, minor, patch and preprelease and build components from
+--- `version`. When `minor` and `patch` components are not found (nil), coerce
+--- them to 0.
+---@param version string Version string
+local function extract_components_loose(version)
+  local major, minor, patch, prerelease_and_build = version:match('^v?(%d+)%.?(%d*)%.?(%d*)(.*)$')
+  major = tonumber(major)
+  minor = tonumber(minor) or 0
+  patch = tonumber(patch) or 0
+  return major, minor, patch, prerelease_and_build
+end
+
+---@private
+--- Validates the prerelease and build string e.g. "-rc1+build.0". If the
+--- prerelease, build or both are valid forms then it will return true, if it
+--- is not of any valid form, it will return false.
+---@param prerelease_and_build string
+---@return boolean
+local function is_prerelease_and_build_valid(prerelease_and_build)
+  if prerelease_and_build == '' then
+    return true
+  end
+  local has_build = parse_build(prerelease_and_build) ~= nil
+  local has_prerelease = parse_prerelease(prerelease_and_build) ~= nil
+  local has_prerelease_and_build = has_prerelease and has_build
+  return has_build or has_prerelease or has_prerelease_and_build
+end
+
+---@private
+---@param version string
+---@return string
+local function create_err_msg(version)
+  return string.format('invalid version: "%s"', version)
+end
+
+--- Parses a semantically formatted version string into a table.
+---
+--- Supports leading "v" and leading and trailing whitespace in the version
+--- string. e.g. `" v1.0.1-rc1+build.2"` , `"1.0.1-rc1+build.2"`, `"v1.0.1-rc1+build.2"`
+--- and `"v1.0.1-rc1+build.2 "` will be parsed as:
+---
+--- `{ major = 1, minor = 0, patch = 1, prerelease = 'rc1', build = 'build.2' }`
+---
+---@param version string Version string to be parsed.
+---@param opts table|nil Optional keyword arguments:
+---                      - strict (boolean):  when set to `true` an error will be thrown for version
+---                      strings that do not conform to the semver specification (v2.0.0) (see
+---                      semver.org/spec/v2.0.0.html for details). This means that
+---                      `semver.parse('v1.2)` will throw an error. When set to `false`,
+---                      `semver.parse('v1.2)` will coerce 'v1.2' to 'v1.2.0' and return the table:
+---                      `{ major = 1, minor = 2, patch = 0 }`. Defaults to false.
+---@return table|nil parsed_version Parsed version table or `nil` if `version` is not valid.
+function M.parse(version, opts)
+  if type(version) ~= 'string' then
+    error(create_err_msg(version))
+  end
+
+  opts = opts or { strict = false }
+
+  version = vim.trim(version)
+
+  local extract_components = opts.strict and extract_components_strict or extract_components_loose
+  local major, minor, patch, prerelease_and_build = extract_components(version)
+
+  -- If major is nil then that means that the version does not begin with a
+  -- digit with or without a "v" prefix.
+  if major == nil or not is_prerelease_and_build_valid(prerelease_and_build) then
+    return nil
+  end
+
+  local prerelease = nil
+  local build = nil
+  if prerelease_and_build ~= nil then
+    prerelease = parse_prerelease(prerelease_and_build)
+    build = parse_build(prerelease_and_build)
+  end
+
+  return {
+    major = major,
+    minor = minor,
+    patch = patch,
+    prerelease = prerelease,
+    build = build,
+  }
+end
+
+---@private
+--- Throws an error if `version` cannot be parsed.
+---@param version string
+local function assert_version(version)
+  if M.parse(version) == nil then
+    error(create_err_msg(version))
+  end
+end
+
+---Returns `true` if `v1` are `v2` are equal versions.
+---@param version_1 string
+---@param version_2 string
+---@return boolean
+function M.eq(version_1, version_2)
+  assert_version(version_1)
+  assert_version(version_2)
+
+  return M.cmp(version_1, version_2) == 0
+end
+
+---Returns `true` if `v1` is less than `v2`.
+---@param version_1 string
+---@param version_2 string
+---@return boolean
+function M.lt(version_1, version_2)
+  assert_version(version_1)
+  assert_version(version_2)
+
+  return M.cmp(version_1, version_2) == -1
+end
+
+---Returns `true` if `v1` is greater than `v2`.
+---@param version_1 string
+---@param version_2 string
+---@return boolean
+function M.gt(version_1, version_2)
+  assert_version(version_1)
+  assert_version(version_2)
+
+  return M.cmp(version_1, version_2) == 1
+end
+
+setmetatable(M, {
+  __call = function()
+    return vim.fn.api_info().version
+  end,
+})
+
+return M
-- 
cgit 


From e31e49a8e3aac25e923dce15cc76dca4a447947f Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 6 Mar 2023 13:23:03 +0100
Subject: refactor(vim.version): cleanup

- version.cmp(): assert valid version
- add test for loading vim.version (the other tests use shared.lua in
  the test runner)
- reduce test scopes, reword test descriptions
---
 runtime/doc/lua.txt                |  47 ++++++-------
 runtime/doc/news.txt               |   5 +-
 runtime/lua/vim/_init_packages.lua |   8 +--
 runtime/lua/vim/version.lua        | 134 ++++++++++++++++---------------------
 4 files changed, 85 insertions(+), 109 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 3c48cd37a6..697cd86e8a 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2501,12 +2501,12 @@ trust({opts})                                             *vim.secure.trust()*
 ==============================================================================
 Lua module: version                                              *lua-version*
 
-cmp({v1}, {v2}, {opts})                                        *version.cmp()*
+cmp({v1}, {v2}, {opts})                                    *vim.version.cmp()*
     Compares two strings ( `v1` and `v2` ) in semver format.
 
     Parameters: ~
       • {v1}    (string) Version.
-      • {v2}    (string) Version to be compared with v1.
+      • {v2}    (string) Version to compare with v1.
       • {opts}  (table|nil) Optional keyword arguments:
                 • strict (boolean): see `semver.parse` for details. Defaults
                   to false.
@@ -2514,59 +2514,54 @@ cmp({v1}, {v2}, {opts})                                        *version.cmp()*
     Return: ~
         (integer) `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
 
-eq({version_1}, {version_2})                                    *version.eq()*
+eq({v1}, {v2})                                              *vim.version.eq()*
     Returns `true` if `v1` are `v2` are equal versions.
 
     Parameters: ~
-      • {version_1}  (string)
-      • {version_2}  (string)
+      • {v1}  (string)
+      • {v2}  (string)
 
     Return: ~
         (boolean)
 
-gt({version_1}, {version_2})                                    *version.gt()*
+gt({v1}, {v2})                                              *vim.version.gt()*
     Returns `true` if `v1` is greater than `v2` .
 
     Parameters: ~
-      • {version_1}  (string)
-      • {version_2}  (string)
+      • {v1}  (string)
+      • {v2}  (string)
 
     Return: ~
         (boolean)
 
-lt({version_1}, {version_2})                                    *version.lt()*
+lt({v1}, {v2})                                              *vim.version.lt()*
     Returns `true` if `v1` is less than `v2` .
 
     Parameters: ~
-      • {version_1}  (string)
-      • {version_2}  (string)
+      • {v1}  (string)
+      • {v2}  (string)
 
     Return: ~
         (boolean)
 
-parse({version}, {opts})                                     *version.parse()*
-    Parses a semantically formatted version string into a table.
+parse({version}, {opts})                                 *vim.version.parse()*
+    Parses a semantic version string.
 
-    Supports leading "v" and leading and trailing whitespace in the version
-    string. e.g. `" v1.0.1-rc1+build.2"` , `"1.0.1-rc1+build.2"`,
-    `"v1.0.1-rc1+build.2"` and `"v1.0.1-rc1+build.2 "` will be parsed as:
+    Ignores leading "v" and surrounding whitespace, e.g. "
+    v1.0.1-rc1+build.2", "1.0.1-rc1+build.2", "v1.0.1-rc1+build.2" and
+    "v1.0.1-rc1+build.2 " are all parsed as: >
 
-    { major = 1, minor = 0, patch = 1, prerelease = 'rc1 , build = 'build.2' }`
+       { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
+<
 
     Parameters: ~
       • {version}  (string) Version string to be parsed.
       • {opts}     (table|nil) Optional keyword arguments:
-                   • strict (boolean): when set to `true` an error will be
-                     thrown for version strings that do not conform to the
-                     semver specification (v2.0.0) (see
-                     semver.org/spec/v2.0.0.html for details). This means that
-                     `semver.parse('v1.2)` will throw an error. When set to
-                     `false`, `semver.parse('v1.2)` will coerce 'v1.2' to
-                     'v1.2.0' and return the table: `{ major = 1, minor = 2,
-                     patch = 0 }`. Defaults to false.
+                   • strict (boolean): Default false. If `true` , no coercion is attempted on input not strictly
+                     conforming to semver v2.0.0 ( https://semver.org/spec/v2.0.0.html ). E.g. `parse("v1.2")` returns nil.
 
     Return: ~
         (table|nil) parsed_version Parsed version table or `nil` if `version`
-        is not valid.
+        is invalid.
 
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b5cb975066..28fdaa770d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -55,9 +55,8 @@ NEW FEATURES                                                    *news-features*
 
 The following new APIs or features were added.
 
-• Added |version.parse()|, |version.cmp()|, |version.lt()|, |version.eq()|
-  and |version.gt()| to |vim.version| for parsing and comparing version numbers
-  according to the semver specification, see |lua-version|.
+• Added |vim.version| for parsing and comparing version strings conforming to
+  the semver specification, see |lua-version|.
 
 • A new environment variable named NVIM_APPNAME enables configuring the
   directories where Neovim should find its configuration and state files. See
diff --git a/runtime/lua/vim/_init_packages.lua b/runtime/lua/vim/_init_packages.lua
index d032026796..57c0fc9122 100644
--- a/runtime/lua/vim/_init_packages.lua
+++ b/runtime/lua/vim/_init_packages.lua
@@ -51,7 +51,10 @@ end
 -- builtin functions which always should be available
 require('vim.shared')
 
-vim._submodules = { inspect = true }
+vim._submodules = {
+  inspect = true,
+  version = true,
+}
 
 -- These are for loading runtime modules in the vim namespace lazily.
 setmetatable(vim, {
@@ -69,9 +72,6 @@ setmetatable(vim, {
         t[key] = val
         return t[key]
       end
-    elseif key == 'version' then
-      t[key] = require('vim.version')
-      return t[key]
     end
   end,
 })
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 49ef019295..ddbe228244 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -1,23 +1,41 @@
 local M = {}
 
+---@private
+---@param version string
+---@return string
+local function create_err_msg(version)
+  return string.format('invalid version: "%s"', version)
+end
+
+---@private
+--- Throws an error if `version` cannot be parsed.
+---@param version string
+local function assert_version(version, opt)
+  local rv = M.parse(version, opt)
+  if rv == nil then
+    error(create_err_msg(version))
+  end
+  return rv
+end
+
 ---@private
 --- Compares the prerelease component of the two versions.
----@param v1_parsed table Parsed version.
----@param v2_parsed table Parsed version.
----@return integer `-1` if `v1_parsed < v2_parsed`, `0` if `v1_parsed == v2_parsed`, `1` if `v1_parsed > v2_parsed`.
-local function cmp_prerelease(v1_parsed, v2_parsed)
-  if v1_parsed.prerelease and not v2_parsed.prerelease then
+---@param v1 table Parsed version.
+---@param v2 table Parsed version.
+---@return integer `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
+local function cmp_prerelease(v1, v2)
+  if v1.prerelease and not v2.prerelease then
     return -1
   end
-  if not v1_parsed.prerelease and v2_parsed.prerelease then
+  if not v1.prerelease and v2.prerelease then
     return 1
   end
-  if not v1_parsed.prerelease and not v2_parsed.prerelease then
+  if not v1.prerelease and not v2.prerelease then
     return 0
   end
 
-  local v1_identifiers = vim.split(v1_parsed.prerelease, '.', { plain = true })
-  local v2_identifiers = vim.split(v2_parsed.prerelease, '.', { plain = true })
+  local v1_identifiers = vim.split(v1.prerelease, '.', { plain = true })
+  local v2_identifiers = vim.split(v2.prerelease, '.', { plain = true })
   local i = 1
   local max = math.max(vim.tbl_count(v1_identifiers), vim.tbl_count(v2_identifiers))
   while i <= max do
@@ -71,23 +89,15 @@ end
 
 ---@private
 --- Compares the version core component of the two versions.
----@param v1_parsed table Parsed version.
----@param v2_parsed table Parsed version.
----@return integer `-1` if `v1_parsed < v2_parsed`, `0` if `v1_parsed == v2_parsed`, `1` if `v1_parsed > v2_parsed`.
-local function cmp_version_core(v1_parsed, v2_parsed)
-  if
-    v1_parsed.major == v2_parsed.major
-    and v1_parsed.minor == v2_parsed.minor
-    and v1_parsed.patch == v2_parsed.patch
-  then
+---@param v1 table Parsed version.
+---@param v2 table Parsed version.
+---@return integer `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
+local function cmp_version_core(v1, v2)
+  if v1.major == v2.major and v1.minor == v2.minor and v1.patch == v2.patch then
     return 0
   end
 
-  if
-    v1_parsed.major > v2_parsed.major
-    or v1_parsed.minor > v2_parsed.minor
-    or v1_parsed.patch > v2_parsed.patch
-  then
+  if v1.major > v2.major or v1.minor > v2.minor or v1.patch > v2.patch then
     return 1
   end
 
@@ -96,14 +106,14 @@ end
 
 --- Compares two strings (`v1` and `v2`) in semver format.
 ---@param v1 string Version.
----@param v2 string Version to be compared with v1.
+---@param v2 string Version to compare with v1.
 ---@param opts table|nil Optional keyword arguments:
 ---                      - strict (boolean):  see `semver.parse` for details. Defaults to false.
 ---@return integer `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
 function M.cmp(v1, v2, opts)
   opts = opts or { strict = false }
-  local v1_parsed = M.parse(v1, opts)
-  local v2_parsed = M.parse(v2, opts)
+  local v1_parsed = assert_version(v1, opts)
+  local v2_parsed = assert_version(v2, opts)
 
   local result = cmp_version_core(v1_parsed, v2_parsed)
   if result == 0 then
@@ -188,30 +198,20 @@ local function is_prerelease_and_build_valid(prerelease_and_build)
   return has_build or has_prerelease or has_prerelease_and_build
 end
 
----@private
----@param version string
----@return string
-local function create_err_msg(version)
-  return string.format('invalid version: "%s"', version)
-end
-
---- Parses a semantically formatted version string into a table.
----
---- Supports leading "v" and leading and trailing whitespace in the version
---- string. e.g. `" v1.0.1-rc1+build.2"` , `"1.0.1-rc1+build.2"`, `"v1.0.1-rc1+build.2"`
---- and `"v1.0.1-rc1+build.2 "` will be parsed as:
+--- Parses a semantic version string.
 ---
---- `{ major = 1, minor = 0, patch = 1, prerelease = 'rc1', build = 'build.2' }`
+--- Ignores leading "v" and surrounding whitespace, e.g. " v1.0.1-rc1+build.2",
+--- "1.0.1-rc1+build.2", "v1.0.1-rc1+build.2" and "v1.0.1-rc1+build.2 " are all parsed as:
+--- <pre>
+---   { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
+--- </pre>
 ---
 ---@param version string Version string to be parsed.
 ---@param opts table|nil Optional keyword arguments:
----                      - strict (boolean):  when set to `true` an error will be thrown for version
----                      strings that do not conform to the semver specification (v2.0.0) (see
----                      semver.org/spec/v2.0.0.html for details). This means that
----                      `semver.parse('v1.2)` will throw an error. When set to `false`,
----                      `semver.parse('v1.2)` will coerce 'v1.2' to 'v1.2.0' and return the table:
----                      `{ major = 1, minor = 2, patch = 0 }`. Defaults to false.
----@return table|nil parsed_version Parsed version table or `nil` if `version` is not valid.
+---                      - strict (boolean):  Default false. If `true`, no coercion is attempted on
+---                      input not strictly conforming to semver v2.0.0
+---                      (https://semver.org/spec/v2.0.0.html). E.g. `parse("v1.2")` returns nil.
+---@return table|nil parsed_version Parsed version table or `nil` if `version` is invalid.
 function M.parse(version, opts)
   if type(version) ~= 'string' then
     error(create_err_msg(version))
@@ -246,46 +246,28 @@ function M.parse(version, opts)
   }
 end
 
----@private
---- Throws an error if `version` cannot be parsed.
----@param version string
-local function assert_version(version)
-  if M.parse(version) == nil then
-    error(create_err_msg(version))
-  end
-end
-
 ---Returns `true` if `v1` are `v2` are equal versions.
----@param version_1 string
----@param version_2 string
+---@param v1 string
+---@param v2 string
 ---@return boolean
-function M.eq(version_1, version_2)
-  assert_version(version_1)
-  assert_version(version_2)
-
-  return M.cmp(version_1, version_2) == 0
+function M.eq(v1, v2)
+  return M.cmp(v1, v2) == 0
 end
 
 ---Returns `true` if `v1` is less than `v2`.
----@param version_1 string
----@param version_2 string
+---@param v1 string
+---@param v2 string
 ---@return boolean
-function M.lt(version_1, version_2)
-  assert_version(version_1)
-  assert_version(version_2)
-
-  return M.cmp(version_1, version_2) == -1
+function M.lt(v1, v2)
+  return M.cmp(v1, v2) == -1
 end
 
 ---Returns `true` if `v1` is greater than `v2`.
----@param version_1 string
----@param version_2 string
+---@param v1 string
+---@param v2 string
 ---@return boolean
-function M.gt(version_1, version_2)
-  assert_version(version_1)
-  assert_version(version_2)
-
-  return M.cmp(version_1, version_2) == 1
+function M.gt(v1, v2)
+  return M.cmp(v1, v2) == 1
 end
 
 setmetatable(M, {
-- 
cgit 


From 74ffebf8ec725a25c2ae1dde81cf26b83fc7ae61 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 6 Mar 2023 15:08:22 +0100
Subject: fix(vim.version): incorrect version.cmp()

Problem:
If major<major but minor>minor, cmp_version_core returns 1

Solution:
- Fix logic in cmp_version_core
- Delete most eq()/gt()/lt() tests, they are redundant.
---
 runtime/lua/vim/version.lua | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index ddbe228244..35629c461f 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -3,8 +3,11 @@ local M = {}
 ---@private
 ---@param version string
 ---@return string
-local function create_err_msg(version)
-  return string.format('invalid version: "%s"', version)
+local function create_err_msg(v)
+  if type(v) == 'string' then
+    return string.format('invalid version: "%s"', tostring(v))
+  end
+  return string.format('invalid version: %s (%s)', tostring(v), type(v))
 end
 
 ---@private
@@ -20,9 +23,6 @@ end
 
 ---@private
 --- Compares the prerelease component of the two versions.
----@param v1 table Parsed version.
----@param v2 table Parsed version.
----@return integer `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
 local function cmp_prerelease(v1, v2)
   if v1.prerelease and not v2.prerelease then
     return -1
@@ -88,19 +88,17 @@ local function cmp_prerelease(v1, v2)
 end
 
 ---@private
---- Compares the version core component of the two versions.
----@param v1 table Parsed version.
----@param v2 table Parsed version.
----@return integer `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
 local function cmp_version_core(v1, v2)
   if v1.major == v2.major and v1.minor == v2.minor and v1.patch == v2.patch then
     return 0
   end
-
-  if v1.major > v2.major or v1.minor > v2.minor or v1.patch > v2.patch then
+  if
+    v1.major > v2.major
+    or (v1.major == v2.major and v1.minor > v2.minor)
+    or (v1.major == v2.major and v1.minor == v2.minor and v1.patch > v2.patch)
+  then
     return 1
   end
-
   return -1
 end
 
-- 
cgit 


From 1cc23e1109ed88275df5c986c352f73b99a0301c Mon Sep 17 00:00:00 2001
From: swarn <swarn@users.noreply.github.com>
Date: Mon, 6 Mar 2023 12:03:13 -0600
Subject: feat(lsp)!: add rule-based sem token highlighting (#22022)

feat(lsp)!: change semantic token highlighting

Change the default highlights used, and add more highlights per token.

Add an LspTokenUpdate event and a highlight_token function.

:Inspect now shows any highlights applied by token highlighting rules,
default or user-defined.

BREAKING CHANGE: change the default highlight groups used by semantic
token highlighting.
---
 runtime/doc/lsp.txt                     | 120 ++++++++++++++++++++-
 runtime/doc/news.txt                    |   2 +-
 runtime/lua/vim/_inspector.lua          |  97 +++++++++--------
 runtime/lua/vim/lsp/semantic_tokens.lua | 183 ++++++++++++++++++++++----------
 4 files changed, 297 insertions(+), 105 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 7e46698614..0d7e8e7ab4 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -482,6 +482,71 @@ LspSignatureActiveParameter
     Used to highlight the active parameter in the signature help. See
     |vim.lsp.handlers.signature_help()|.
 
+------------------------------------------------------------------------------
+LSP SEMANTIC HIGHLIGHTS                               *lsp-semantic-highlight*
+
+When available, the LSP client highlights code using |lsp-semantic_tokens|,
+which are another way that LSP servers can provide information about source
+code.  Note that this is in addition to treesitter syntax highlighting;
+semantic highlighting does not replace syntax highlighting.
+
+The server will typically provide one token per identifier in the source code.
+The token will have a `type` such as "function" or "variable", and 0 or more
+`modifier`s such as "readonly" or "deprecated." The standard types and
+modifiers are described here:
+https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_semanticTokens
+LSP servers may also use off-spec types and modifiers.
+
+The LSP client adds one or more highlights for each token. The highlight
+groups are derived from the token's type and modifiers:
+  • `@lsp.type.<type>.<ft>` for the type
+  • `@lsp.mod.<mod>.<ft>` for each modifier
+  • `@lsp.typemod.<type>.<mod>.<ft>` for each modifier
+Use |:Inspect| to view the higlights for a specific token. Use |:hi| or
+|nvim_set_hl()| to change the appearance of semantic highlights: >vim
+
+    hi @lsp.type.function guifg=Yellow        " function names are yellow
+    hi @lsp.type.variable.lua guifg=Green     " variables in lua are green
+    hi @lsp.mod.deprecated gui=strikethrough  " deprecated is crossed out
+    hi @lsp.typemod.function.async guifg=Blue " async functions are blue
+<
+The value |vim.highlight.priorities|`.semantic_tokens` is the priority of the
+`@lsp.type.*` highlights. The `@lsp.mod.*` and `@lsp.typemod.*` highlights
+have priorities one and two higher, respectively.
+
+You can disable semantic highlights by clearing the highlight groups: >lua
+
+    -- Hide semantic highlights for functions
+    vim.api.nvim_set_hl(0, '@lsp.type.function', {})
+
+    -- Hide all semantic highlights
+    for _, group in ipairs(vim.fn.getcompletion("@lsp", "highlight")) do
+      vim.api.nvim_set_hl(0, group, {})
+    end
+<
+You probably want these inside a |ColorScheme| autocommand.
+
+Use |LspTokenUpdate| and |vim.lsp.semantic_tokens.highlight_token()| for more
+complex highlighting.
+
+The following groups are linked by default to standard |group-name|s:
+>
+    @lsp.type.class         Structure
+    @lsp.type.decorator     Function
+    @lsp.type.enum          Structure
+    @lsp.type.enumMember    Constant
+    @lsp.type.function      Function
+    @lsp.type.interface     Structure
+    @lsp.type.macro         Macro
+    @lsp.type.method        Function
+    @lsp.type.namespace     Structure
+    @lsp.type.parameter     Identifier
+    @lsp.type.property      Identifier
+    @lsp.type.struct        Structure
+    @lsp.type.type          Type
+    @lsp.type.typeParameter TypeDef
+    @lsp.type.variable      Identifier
+<
 ==============================================================================
 EVENTS                                                            *lsp-events*
 
@@ -516,6 +581,29 @@ callback in the "data" table. Example: >lua
       end,
     })
 <
+
+LspTokenUpdate                                                *LspTokenUpdate*
+
+When a visible semantic token is sent or updated by the LSP server, or when an
+existing token becomes visible for the first time. The |autocmd-pattern| is
+the name of the buffer. When used from Lua, the token and client ID are passed
+to the callback in the "data" table. The token fields are documented in
+|vim.lsp.semantic_tokens.get_at_pos()|. Example: >lua
+
+    vim.api.nvim_create_autocmd('LspTokenUpdate', {
+      callback = function(args)
+        local token = args.data.token
+        if token.type == 'variable' and not token.modifiers.readonly then
+          vim.lsp.semantic_tokens.highlight_token(
+            token, args.buf, args.data.client_id, 'MyMutableVariableHighlight'
+          )
+        end
+      end,
+    })
+<
+Note: doing anything other than calling
+|vim.lsp.semantic_tokens.highlight_token()| is considered experimental.
+
 Also the following |User| |autocommand|s are provided:
 
 LspProgressUpdate                                          *LspProgressUpdate*
@@ -1332,7 +1420,8 @@ force_refresh({bufnr})               *vim.lsp.semantic_tokens.force_refresh()*
     highlighting (|vim.lsp.semantic_tokens.start()| has been called for it)
 
     Parameters: ~
-      • {bufnr}  (nil|number) default: current buffer
+      • {bufnr}  (number|nil) filter by buffer. All buffers if nil, current
+                 buffer if 0
 
                                         *vim.lsp.semantic_tokens.get_at_pos()*
 get_at_pos({bufnr}, {row}, {col})
@@ -1345,7 +1434,34 @@ get_at_pos({bufnr}, {row}, {col})
       • {col}    (number|nil) Position column (default cursor position)
 
     Return: ~
-        (table|nil) List of tokens at position
+        (table|nil) List of tokens at position. Each token has the following
+        fields:
+        • line (number) line number, 0-based
+        • start_col (number) start column, 0-based
+        • end_col (number) end column, 0-based
+        • type (string) token type as string, e.g. "variable"
+        • modifiers (table) token modifiers as a set. E.g., { static = true,
+          readonly = true }
+
+                                   *vim.lsp.semantic_tokens.highlight_token()*
+highlight_token({token}, {bufnr}, {client_id}, {hl_group}, {opts})
+    Highlight a semantic token.
+
+    Apply an extmark with a given highlight group for a semantic token. The
+    mark will be deleted by the semantic token engine when appropriate; for
+    example, when the LSP sends updated tokens. This function is intended for
+    use inside |LspTokenUpdate| callbacks.
+
+    Parameters: ~
+      • {token}      (table) a semantic token, found as `args.data.token` in
+                     |LspTokenUpdate|.
+      • {bufnr}      (number) the buffer to highlight
+      • {client_id}  (number) The ID of the |vim.lsp.client|
+      • {hl_group}   (string) Highlight group name
+      • {opts}       (table|nil) Optional parameters.
+                     • priority: (number|nil) Priority for the applied
+                       extmark. Defaults to
+                       `vim.highlight.priorities.semantic_tokens + 3`
 
 start({bufnr}, {client_id}, {opts})          *vim.lsp.semantic_tokens.start()*
     Start the semantic token highlighting engine for the given buffer with the
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 28fdaa770d..825496cff5 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -90,7 +90,7 @@ The following new APIs or features were added.
   `semanticTokensProvider` from the LSP client's {server_capabilities} in the
   `LspAttach` callback.
 
-  See |lsp-semantic_tokens| for more information.
+  See |lsp-semantic-highlight| for more information.
 
 • |vim.treesitter.inspect_tree()| and |:InspectTree| opens a split window
   showing a text representation of the nodes in a language tree for the current
diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua
index 9e91597192..92d380b08c 100644
--- a/runtime/lua/vim/_inspector.lua
+++ b/runtime/lua/vim/_inspector.lua
@@ -2,7 +2,7 @@
 ---@field syntax boolean include syntax based highlight groups (defaults to true)
 ---@field treesitter boolean include treesitter based highlight groups (defaults to true)
 ---@field extmarks boolean|"all" include extmarks. When `all`, then extmarks without a `hl_group` will also be included (defaults to true)
----@field semantic_tokens boolean include semantic tokens (defaults to true)
+---@field semantic_tokens boolean include semantic token highlights (defaults to true)
 local defaults = {
   syntax = true,
   treesitter = true,
@@ -81,47 +81,54 @@ function vim.inspect_pos(bufnr, row, col, filter)
     end
   end
 
-  -- semantic tokens
-  if filter.semantic_tokens then
-    for _, token in ipairs(vim.lsp.semantic_tokens.get_at_pos(bufnr, row, col) or {}) do
-      token.hl_groups = {
-        type = resolve_hl({ hl_group = '@' .. token.type }),
-        modifiers = vim.tbl_map(function(modifier)
-          return resolve_hl({ hl_group = '@' .. modifier })
-        end, token.modifiers or {}),
-      }
-      table.insert(results.semantic_tokens, token)
+  --- Convert an extmark tuple into a map-like table
+  --- @private
+  local function to_map(extmark)
+    extmark = {
+      id = extmark[1],
+      row = extmark[2],
+      col = extmark[3],
+      opts = resolve_hl(extmark[4]),
+    }
+    extmark.end_row = extmark.opts.end_row or extmark.row -- inclusive
+    extmark.end_col = extmark.opts.end_col or (extmark.col + 1) -- exclusive
+    return extmark
+  end
+
+  --- Check if an extmark overlaps this position
+  --- @private
+  local function is_here(extmark)
+    return (row >= extmark.row and row <= extmark.end_row) -- within the rows of the extmark
+      and (row > extmark.row or col >= extmark.col) -- either not the first row, or in range of the col
+      and (row < extmark.end_row or col < extmark.end_col) -- either not in the last row or in range of the col
+  end
+
+  -- all extmarks at this position
+  local extmarks = {}
+  for ns, nsid in pairs(vim.api.nvim_get_namespaces()) do
+    local ns_marks = vim.api.nvim_buf_get_extmarks(bufnr, nsid, 0, -1, { details = true })
+    ns_marks = vim.tbl_map(to_map, ns_marks)
+    ns_marks = vim.tbl_filter(is_here, ns_marks)
+    for _, mark in ipairs(ns_marks) do
+      mark.ns_id = nsid
+      mark.ns = ns
     end
+    vim.list_extend(extmarks, ns_marks)
+  end
+
+  if filter.semantic_tokens then
+    results.semantic_tokens = vim.tbl_filter(function(extmark)
+      return extmark.ns:find('vim_lsp_semantic_tokens') == 1
+    end, extmarks)
   end
 
-  -- extmarks
   if filter.extmarks then
-    for ns, nsid in pairs(vim.api.nvim_get_namespaces()) do
-      if ns:find('vim_lsp_semantic_tokens') ~= 1 then
-        local extmarks = vim.api.nvim_buf_get_extmarks(bufnr, nsid, 0, -1, { details = true })
-        for _, extmark in ipairs(extmarks) do
-          extmark = {
-            ns_id = nsid,
-            ns = ns,
-            id = extmark[1],
-            row = extmark[2],
-            col = extmark[3],
-            opts = resolve_hl(extmark[4]),
-          }
-          local end_row = extmark.opts.end_row or extmark.row -- inclusive
-          local end_col = extmark.opts.end_col or (extmark.col + 1) -- exclusive
-          if
-            (filter.extmarks == 'all' or extmark.opts.hl_group) -- filter hl_group
-            and (row >= extmark.row and row <= end_row) -- within the rows of the extmark
-            and (row > extmark.row or col >= extmark.col) -- either not the first row, or in range of the col
-            and (row < end_row or col < end_col) -- either not in the last row or in range of the col
-          then
-            table.insert(results.extmarks, extmark)
-          end
-        end
-      end
-    end
+    results.extmarks = vim.tbl_filter(function(extmark)
+      return extmark.ns:find('vim_lsp_semantic_tokens') ~= 1
+        and (filter.extmarks == 'all' or extmark.opts.hl_group)
+    end, extmarks)
   end
+
   return results
 end
 
@@ -174,16 +181,17 @@ function vim.show_pos(bufnr, row, col, filter)
     nl()
   end
 
+  -- semantic tokens
   if #items.semantic_tokens > 0 then
     append('Semantic Tokens', 'Title')
     nl()
-    for _, token in ipairs(items.semantic_tokens) do
-      local client = vim.lsp.get_client_by_id(token.client_id)
-      client = client and (' (' .. client.name .. ')') or ''
-      item(token.hl_groups.type, 'type' .. client)
-      for _, modifier in ipairs(token.hl_groups.modifiers) do
-        item(modifier, 'modifier' .. client)
-      end
+    local sorted_marks = vim.fn.sort(items.semantic_tokens, function(left, right)
+      local left_first = left.opts.priority < right.opts.priority
+        or left.opts.priority == right.opts.priority and left.opts.hl_group < right.opts.hl_group
+      return left_first and -1 or 1
+    end)
+    for _, extmark in ipairs(sorted_marks) do
+      item(extmark.opts, 'priority: ' .. extmark.opts.priority)
     end
     nl()
   end
@@ -197,6 +205,7 @@ function vim.show_pos(bufnr, row, col, filter)
     end
     nl()
   end
+
   -- extmarks
   if #items.extmarks > 0 then
     append('Extmarks', 'Title')
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 24b5c6c24e..7983d066b8 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -8,8 +8,8 @@ local bit = require('bit')
 --- @field start_col number start column 0-based
 --- @field end_col number end column 0-based
 --- @field type string token type as string
---- @field modifiers string[] token modifiers as strings
---- @field extmark_added boolean whether this extmark has been added to the buffer yet
+--- @field modifiers table token modifiers as a set. E.g., { static = true, readonly = true }
+--- @field marked boolean whether this token has had extmarks applied
 ---
 --- @class STCurrentResult
 --- @field version number document version associated with this result
@@ -36,10 +36,13 @@ local bit = require('bit')
 ---@field client_state table<number, STClientState>
 local STHighlighter = { active = {} }
 
+--- Do a binary search of the tokens in the half-open range [lo, hi).
+---
+--- Return the index i in range such that tokens[j].line < line for all j < i, and
+--- tokens[j].line >= line for all j >= i, or return hi if no such index is found.
+---
 ---@private
-local function binary_search(tokens, line)
-  local lo = 1
-  local hi = #tokens
+local function lower_bound(tokens, line, lo, hi)
   while lo < hi do
     local mid = math.floor((lo + hi) / 2)
     if tokens[mid].line < line then
@@ -51,16 +54,34 @@ local function binary_search(tokens, line)
   return lo
 end
 
+--- Do a binary search of the tokens in the half-open range [lo, hi).
+---
+--- Return the index i in range such that tokens[j].line <= line for all j < i, and
+--- tokens[j].line > line for all j >= i, or return hi if no such index is found.
+---
+---@private
+local function upper_bound(tokens, line, lo, hi)
+  while lo < hi do
+    local mid = math.floor((lo + hi) / 2)
+    if line < tokens[mid].line then
+      hi = mid
+    else
+      lo = mid + 1
+    end
+  end
+  return lo
+end
+
 --- Extracts modifier strings from the encoded number in the token array
 ---
 ---@private
----@return string[]
+---@return table<string, boolean>
 local function modifiers_from_number(x, modifiers_table)
   local modifiers = {}
   local idx = 1
   while x > 0 do
     if bit.band(x, 1) == 1 then
-      modifiers[#modifiers + 1] = modifiers_table[idx]
+      modifiers[modifiers_table[idx]] = true
     end
     x = bit.rshift(x, 1)
     idx = idx + 1
@@ -109,7 +130,7 @@ local function tokens_to_ranges(data, bufnr, client)
         end_col = end_col,
         type = token_type,
         modifiers = modifiers,
-        extmark_added = false,
+        marked = false,
       }
     end
   end
@@ -355,7 +376,7 @@ end
 ---
 ---@private
 function STHighlighter:on_win(topline, botline)
-  for _, state in pairs(self.client_state) do
+  for client_id, state in pairs(self.client_state) do
     local current_result = state.current_result
     if current_result.version and current_result.version == util.buf_versions[self.bufnr] then
       if not current_result.namespace_cleared then
@@ -372,52 +393,55 @@ function STHighlighter:on_win(topline, botline)
       --
       -- Instead, we have to use normal extmarks that can attach to locations
       -- in the buffer and are persisted between redraws.
+      --
+      -- `strict = false` is necessary here for the 1% of cases where the
+      -- current result doesn't actually match the buffer contents. Some
+      -- LSP servers can respond with stale tokens on requests if they are
+      -- still processing changes from a didChange notification.
+      --
+      -- LSP servers that do this _should_ follow up known stale responses
+      -- with a refresh notification once they've finished processing the
+      -- didChange notification, which would re-synchronize the tokens from
+      -- our end.
+      --
+      -- The server I know of that does this is clangd when the preamble of
+      -- a file changes and the token request is processed with a stale
+      -- preamble while the new one is still being built. Once the preamble
+      -- finishes, clangd sends a refresh request which lets the client
+      -- re-synchronize the tokens.
+
+      local set_mark = function(token, hl_group, delta)
+        vim.api.nvim_buf_set_extmark(self.bufnr, state.namespace, token.line, token.start_col, {
+          hl_group = hl_group,
+          end_col = token.end_col,
+          priority = vim.highlight.priorities.semantic_tokens + delta,
+          strict = false,
+        })
+      end
+
+      local ft = vim.bo[self.bufnr].filetype
       local highlights = current_result.highlights
-      local idx = binary_search(highlights, topline)
+      local first = lower_bound(highlights, topline, 1, #highlights + 1)
+      local last = upper_bound(highlights, botline, first, #highlights + 1) - 1
 
-      for i = idx, #highlights do
+      for i = first, last do
         local token = highlights[i]
-
-        if token.line > botline then
-          break
-        end
-
-        if not token.extmark_added then
-          -- `strict = false` is necessary here for the 1% of cases where the
-          -- current result doesn't actually match the buffer contents. Some
-          -- LSP servers can respond with stale tokens on requests if they are
-          -- still processing changes from a didChange notification.
-          --
-          -- LSP servers that do this _should_ follow up known stale responses
-          -- with a refresh notification once they've finished processing the
-          -- didChange notification, which would re-synchronize the tokens from
-          -- our end.
-          --
-          -- The server I know of that does this is clangd when the preamble of
-          -- a file changes and the token request is processed with a stale
-          -- preamble while the new one is still being built. Once the preamble
-          -- finishes, clangd sends a refresh request which lets the client
-          -- re-synchronize the tokens.
-          api.nvim_buf_set_extmark(self.bufnr, state.namespace, token.line, token.start_col, {
-            hl_group = '@' .. token.type,
-            end_col = token.end_col,
-            priority = vim.highlight.priorities.semantic_tokens,
-            strict = false,
-          })
-
-          -- TODO(bfredl) use single extmark when hl_group supports table
-          if #token.modifiers > 0 then
-            for _, modifier in pairs(token.modifiers) do
-              api.nvim_buf_set_extmark(self.bufnr, state.namespace, token.line, token.start_col, {
-                hl_group = '@' .. modifier,
-                end_col = token.end_col,
-                priority = vim.highlight.priorities.semantic_tokens + 1,
-                strict = false,
-              })
-            end
+        if not token.marked then
+          set_mark(token, string.format('@lsp.type.%s.%s', token.type, ft), 0)
+          for modifier, _ in pairs(token.modifiers) do
+            set_mark(token, string.format('@lsp.mod.%s.%s', modifier, ft), 1)
+            set_mark(token, string.format('@lsp.typemod.%s.%s.%s', token.type, modifier, ft), 2)
           end
-
-          token.extmark_added = true
+          token.marked = true
+
+          api.nvim_exec_autocmds('LspTokenUpdate', {
+            pattern = vim.api.nvim_buf_get_name(self.bufnr),
+            modeline = false,
+            data = {
+              token = token,
+              client_id = client_id,
+            },
+          })
         end
       end
     end
@@ -588,7 +612,13 @@ end
 ---@param row number|nil Position row (default cursor position)
 ---@param col number|nil Position column (default cursor position)
 ---
----@return table|nil (table|nil) List of tokens at position
+---@return table|nil (table|nil) List of tokens at position. Each token has
+---        the following fields:
+---        - line (number) line number, 0-based
+---        - start_col (number) start column, 0-based
+---        - end_col (number) end column, 0-based
+---        - type (string) token type as string, e.g. "variable"
+---        - modifiers (table) token modifiers as a set. E.g., { static = true, readonly = true }
 function M.get_at_pos(bufnr, row, col)
   if bufnr == nil or bufnr == 0 then
     bufnr = api.nvim_get_current_buf()
@@ -608,7 +638,7 @@ function M.get_at_pos(bufnr, row, col)
   for client_id, client in pairs(highlighter.client_state) do
     local highlights = client.current_result.highlights
     if highlights then
-      local idx = binary_search(highlights, row)
+      local idx = lower_bound(highlights, row, 1, #highlights + 1)
       for i = idx, #highlights do
         local token = highlights[i]
 
@@ -631,23 +661,60 @@ end
 --- Only has an effect if the buffer is currently active for semantic token
 --- highlighting (|vim.lsp.semantic_tokens.start()| has been called for it)
 ---
----@param bufnr (nil|number) default: current buffer
+---@param bufnr (number|nil) filter by buffer. All buffers if nil, current
+---       buffer if 0
 function M.force_refresh(bufnr)
   vim.validate({
     bufnr = { bufnr, 'n', true },
   })
 
-  if bufnr == nil or bufnr == 0 then
-    bufnr = api.nvim_get_current_buf()
+  local buffers = bufnr == nil and vim.tbl_keys(STHighlighter.active)
+    or bufnr == 0 and { api.nvim_get_current_buf() }
+    or { bufnr }
+
+  for _, buffer in ipairs(buffers) do
+    local highlighter = STHighlighter.active[buffer]
+    if highlighter then
+      highlighter:reset()
+      highlighter:send_request()
+    end
   end
+end
 
+--- Highlight a semantic token.
+---
+--- Apply an extmark with a given highlight group for a semantic token. The
+--- mark will be deleted by the semantic token engine when appropriate; for
+--- example, when the LSP sends updated tokens. This function is intended for
+--- use inside |LspTokenUpdate| callbacks.
+---@param token (table) a semantic token, found as `args.data.token` in
+---       |LspTokenUpdate|.
+---@param bufnr (number) the buffer to highlight
+---@param client_id (number) The ID of the |vim.lsp.client|
+---@param hl_group (string) Highlight group name
+---@param opts (table|nil) Optional parameters.
+---       - priority: (number|nil) Priority for the applied extmark. Defaults
+---         to `vim.highlight.priorities.semantic_tokens + 3`
+function M.highlight_token(token, bufnr, client_id, hl_group, opts)
   local highlighter = STHighlighter.active[bufnr]
   if not highlighter then
     return
   end
 
-  highlighter:reset()
-  highlighter:send_request()
+  local state = highlighter.client_state[client_id]
+  if not state then
+    return
+  end
+
+  opts = opts or {}
+  local priority = opts.priority or vim.highlight.priorities.semantic_tokens + 3
+
+  vim.api.nvim_buf_set_extmark(bufnr, state.namespace, token.line, token.start_col, {
+    hl_group = hl_group,
+    end_col = token.end_col,
+    priority = priority,
+    strict = false,
+  })
 end
 
 --- |lsp-handler| for the method `workspace/semanticTokens/refresh`
-- 
cgit 


From 79571b92ced968ad27bee2a7515a4a04e84dbad2 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Wed, 27 Jan 2021 09:00:28 +0100
Subject: feat(lua): omnifunc for builting lua interpreter

also make implicit submodules "uri" and "_inspector" work with completion

this is needed for `:lua=vim.uri_<tab>` wildmenu completion
to work even before uri or _inspector functions are used.
---
 runtime/doc/lua.txt         |  6 ++++++
 runtime/doc/news.txt        |  2 ++
 runtime/lua/vim/_editor.lua | 41 +++++++++++++++++++++++++++++++++++++----
 3 files changed, 45 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 1eb5ab41e6..cb309eaf1a 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1404,6 +1404,12 @@ inspect({object}, {options})                                   *vim.inspect()*
         https://github.com/kikito/inspect.lua
         https://github.com/mpeterv/vinspect
 
+lua_omnifunc({find_start}, {_})                           *vim.lua_omnifunc()*
+    Omnifunc for completing lua values from from the runtime lua interpreter,
+    similar to the builtin completion for the `:lua` command.
+
+    Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a lua buffer.
+
 notify({msg}, {level}, {opts})                                  *vim.notify()*
     Display a notification to the user.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 415195e27e..41b59681ae 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -189,6 +189,8 @@ The following new APIs or features were added.
   disabled by default and can be enabled by setting the
   `workspace.didChangeWatchedFiles.dynamicRegistration=true` capability.
 
+• Added an omnifunc implementation for lua, |vim.lua_omnifunc()|
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index c205451ff9..9516233b45 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -42,6 +42,18 @@ for k, v in pairs({
   vim._submodules[k] = v
 end
 
+-- There are things which have special rules in vim._init_packages
+-- for legacy reasons (uri) or for performance (_inspector).
+-- most new things should go into a submodule namespace ( vim.foobar.do_thing() )
+vim._extra = {
+  uri_from_fname = true,
+  uri_from_bufnr = true,
+  uri_to_fname = true,
+  uri_to_bufnr = true,
+  show_pos = true,
+  inspect_pos = true,
+}
+
 vim.log = {
   levels = {
     TRACE = 0,
@@ -575,15 +587,13 @@ function vim._on_key(char)
 end
 
 --- Generate a list of possible completions for the string.
---- String starts with ^ and then has the pattern.
+--- String has the pattern.
 ---
 ---     1. Can we get it to just return things in the global namespace with that name prefix
 ---     2. Can we get it to return things from global namespace even with `print(` in front.
 function vim._expand_pat(pat, env)
   env = env or _G
 
-  pat = string.sub(pat, 2, #pat)
-
   if pat == '' then
     local result = vim.tbl_keys(env)
     table.sort(result)
@@ -644,7 +654,7 @@ function vim._expand_pat(pat, env)
       local mt = getmetatable(final_env)
       if mt and type(mt.__index) == 'table' then
         field = rawget(mt.__index, key)
-      elseif final_env == vim and vim._submodules[key] then
+      elseif final_env == vim and (vim._submodules[key] or vim._extra[key]) then
         field = vim[key]
       end
     end
@@ -674,6 +684,7 @@ function vim._expand_pat(pat, env)
   end
   if final_env == vim then
     insert_keys(vim._submodules)
+    insert_keys(vim._extra)
   end
 
   keys = vim.tbl_keys(keys)
@@ -745,6 +756,28 @@ vim._expand_pat_get_parts = function(lua_string)
   return parts, search_index
 end
 
+do
+  -- Ideally we should just call complete() inside omnifunc, though there are
+  -- some bugs, so fake the two-step dance for now.
+  local matches
+
+  --- Omnifunc for completing lua values from from the runtime lua interpreter,
+  --- similar to the builtin completion for the `:lua` command.
+  ---
+  --- Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a lua buffer.
+  function vim.lua_omnifunc(find_start, _)
+    if find_start == 1 then
+      local line = vim.api.nvim_get_current_line()
+      local prefix = string.sub(line, 1, vim.api.nvim_win_get_cursor(0)[2])
+      local pos
+      matches, pos = vim._expand_pat(prefix)
+      return (#matches > 0 and pos) or -1
+    else
+      return matches
+    end
+  end
+end
+
 ---Prints given arguments in human-readable format.
 ---Example:
 ---<pre>lua
-- 
cgit 


From 2882b1543a4f30ee3d7b039a5d51bb994fd6aa1d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 7 Mar 2023 11:04:36 +0800
Subject: vim-patch:8.2.3969: value of MAXCOL not available in Vim script

Problem:    Value of MAXCOL not available in Vim script.
Solution:   Add v:maxcol. (Naohiro Ono, closes vim/vim#9451)

https://github.com/vim/vim/commit/56200eed62e59ad831f6564dcafe346e6f97ac20

The variable is always 2147483647, but introducing it makes functions
easier to document.

Co-authored-by: naohiro ono <obcat@icloud.com>
---
 runtime/doc/builtin.txt | 22 +++++++++++++++-------
 runtime/doc/eval.txt    |  3 +++
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 7fab2ac6ff..dd5b77e8ac 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2890,6 +2890,9 @@ getcharpos({expr})
 		Get the position for String {expr}. Same as |getpos()| but the
 		column number in the returned List is a character index
 		instead of a byte index.
+		If |getpos()| returns a very large column number, equal to
+		|v:maxcol|, then getcharpos() will return the character index
+		of the last character.
 
 		Example:
 		With the cursor on '세' in line 5 with text "여보세요": >
@@ -3064,10 +3067,11 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 							*getcurpos()*
 getcurpos([{winid}])
 		Get the position of the cursor.  This is like getpos('.'), but
-		includes an extra "curswant" in the list:
+		includes an extra "curswant" item in the list:
 		    [0, lnum, col, off, curswant] ~
 		The "curswant" number is the preferred column when moving the
-		cursor vertically.  Also see |getcursorcharpos()| and
+		cursor vertically.  After |$| command it will be a very large
+		number equal to |v:maxcol|.  Also see |getcursorcharpos()| and
 		|getpos()|.
 		The first "bufnum" item is always zero. The byte position of
 		the cursor is returned in "col". To get the character
@@ -3389,12 +3393,12 @@ getpos({expr})	Get the position for String {expr}.  For possible values of
 		character.
 		Note that for '< and '> Visual mode matters: when it is "V"
 		(visual line mode) the column of '< is zero and the column of
-		'> is a large number.
+		'> is a large number equal to |v:maxcol|.
 		The column number in the returned List is the byte position
 		within the line. To get the character position in the line,
 		use |getcharpos()|.
-		The column number can be very large, e.g. 2147483647, in which
-		case it means "after the end of the line".
+		A very large column number equal to |v:maxcol| can be returned,
+		in which case it means "after the end of the line".
 		If {expr} is invalid, returns a list with all zeros.
 		This can be used to save and restore the position of a mark: >
 			let save_a_mark = getpos("'a")
@@ -9407,10 +9411,14 @@ winsaveview()	Returns a |Dictionary| that contains information to restore
 		The return value includes:
 			lnum		cursor line number
 			col		cursor column (Note: the first column
-					zero, as opposed to what getpos()
+					zero, as opposed to what |getcurpos()|
 					returns)
 			coladd		cursor column offset for 'virtualedit'
-			curswant	column for vertical movement
+			curswant	column for vertical movement (Note:
+					the first column is zero, as opposed
+					to what |getcurpos()| returns).  After
+					|$| command it will be a very large
+					number equal to |v:maxcol|.
 			topline		first line in the window
 			topfill		filler lines, only in diff mode
 			leftcol		first column displayed; only used when
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index d79b446986..51e26cc28b 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1979,6 +1979,9 @@ v:lnum		Line number for the 'foldexpr' |fold-expr|, 'formatexpr',
 v:lua		Prefix for calling Lua functions from expressions.
 		See |v:lua-call| for more information.
 
+						*v:maxcol* *maxcol-variable*
+v:maxcol	Maximum line length.
+
 					*v:mouse_win* *mouse_win-variable*
 v:mouse_win	Window number for a mouse click obtained with |getchar()|.
 		First window has number 1, like with |winnr()|.  The value is
-- 
cgit 


From 08d0f99ae122b21e9470d58224edd69d1615ee3d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 7 Mar 2023 11:41:25 +0800
Subject: vim-patch:partial:944697ae196

Update runtime files

https://github.com/vim/vim/commit/944697ae19683441981539cd4d2469df89d6ec82

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 2 ++
 runtime/doc/eval.txt    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index dd5b77e8ac..b0b7809e8c 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6574,6 +6574,8 @@ screenpos({winid}, {lnum}, {col})				*screenpos()*
 		as if 'conceallevel' is zero.  You can set the cursor to the
 		right position and use |screencol()| to get the value with
 		|conceal| taken into account.
+		If the position is in a closed fold the screen position of the
+		first character is returned, {col} is not used.
 		Returns an empty Dict if {winid} is invalid.
 
 		Can also be used as a |method|: >
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 51e26cc28b..fe15ba6115 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1980,7 +1980,9 @@ v:lua		Prefix for calling Lua functions from expressions.
 		See |v:lua-call| for more information.
 
 						*v:maxcol* *maxcol-variable*
-v:maxcol	Maximum line length.
+v:maxcol	Maximum line length.  Depending on where it is used it can be
+		screen columns, characters or bytes.  The value currently is
+		2147483647 on all systems.
 
 					*v:mouse_win* *mouse_win-variable*
 v:mouse_win	Window number for a mouse click obtained with |getchar()|.
-- 
cgit 


From 706bcab75eaad2c370d61bf828531054439d3a3e Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Tue, 7 Mar 2023 15:17:52 +0900
Subject: docs(lsp): change type annotations from number → integer (#22510)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 runtime/doc/lsp.txt                     | 150 ++++++++++++++++----------------
 runtime/lua/vim/lsp.lua                 |  72 +++++++--------
 runtime/lua/vim/lsp/_snippet.lua        |   2 +-
 runtime/lua/vim/lsp/codelens.lua        |  14 +--
 runtime/lua/vim/lsp/diagnostic.lua      |  12 +--
 runtime/lua/vim/lsp/log.lua             |   4 +-
 runtime/lua/vim/lsp/rpc.lua             |  16 ++--
 runtime/lua/vim/lsp/semantic_tokens.lua |  60 ++++++-------
 runtime/lua/vim/lsp/sync.lua            |   6 +-
 runtime/lua/vim/lsp/util.lua            |  76 ++++++++--------
 10 files changed, 207 insertions(+), 205 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 0d7e8e7ab4..b73e2958ef 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -629,8 +629,8 @@ buf_attach_client({bufnr}, {client_id})          *vim.lsp.buf_attach_client()*
     Without calling this, the server won't be notified of changes to a buffer.
 
     Parameters: ~
-      • {bufnr}      (number) Buffer handle, or 0 for current
-      • {client_id}  (number) Client id
+      • {bufnr}      (integer) Buffer handle, or 0 for current
+      • {client_id}  (integer) Client id
 
 buf_detach_client({bufnr}, {client_id})          *vim.lsp.buf_detach_client()*
     Detaches client from the specified buffer. Note: While the server is
@@ -638,15 +638,15 @@ buf_detach_client({bufnr}, {client_id})          *vim.lsp.buf_detach_client()*
     send notifications should it ignore this notification.
 
     Parameters: ~
-      • {bufnr}      (number) Buffer handle, or 0 for current
-      • {client_id}  (number) Client id
+      • {bufnr}      (integer) Buffer handle, or 0 for current
+      • {client_id}  (integer) Client id
 
 buf_is_attached({bufnr}, {client_id})              *vim.lsp.buf_is_attached()*
     Checks if a buffer is attached for a particular client.
 
     Parameters: ~
-      • {bufnr}      (number) Buffer handle, or 0 for current
-      • {client_id}  (number) the client id
+      • {bufnr}      (integer) Buffer handle, or 0 for current
+      • {client_id}  (integer) the client id
 
 buf_notify({bufnr}, {method}, {params})                 *vim.lsp.buf_notify()*
     Send a notification to a server
@@ -666,7 +666,7 @@ buf_request_all({bufnr}, {method}, {params}, {callback})
     |vim.lsp.buf_request()| but the return result and callback are different.
 
     Parameters: ~
-      • {bufnr}     (number) Buffer handle, or 0 for current.
+      • {bufnr}     (integer) Buffer handle, or 0 for current.
       • {method}    (string) LSP method name
       • {params}    (table|nil) Parameters to send to the server
       • {callback}  (function) The callback to call when all requests are
@@ -687,10 +687,10 @@ buf_request_sync({bufnr}, {method}, {params}, {timeout_ms})
     result is different. Wait maximum of {timeout_ms} (default 1000) ms.
 
     Parameters: ~
-      • {bufnr}       (number) Buffer handle, or 0 for current.
+      • {bufnr}       (integer) Buffer handle, or 0 for current.
       • {method}      (string) LSP method name
       • {params}      (table|nil) Parameters to send to the server
-      • {timeout_ms}  (number|nil) Maximum time in milliseconds to wait for a
+      • {timeout_ms}  (integer|nil) Maximum time in milliseconds to wait for a
                       result. Defaults to 1000
 
     Return: ~
@@ -759,7 +759,7 @@ client_is_stopped({client_id})                   *vim.lsp.client_is_stopped()*
     Checks whether a client is stopped.
 
     Parameters: ~
-      • {client_id}  (number)
+      • {client_id}  (integer)
 
     Return: ~
         (boolean) stopped true if client is stopped, false otherwise.
@@ -769,7 +769,7 @@ for_each_buffer_client({bufnr}, {fn})
     Invokes a function for each LSP client attached to a buffer.
 
     Parameters: ~
-      • {bufnr}  (number) Buffer number
+      • {bufnr}  (integer) Buffer number
       • {fn}     (function) Function to run on each client attached to buffer
                  {bufnr}. The function takes the client, client ID, and buffer
                  number as arguments. Example: >lua
@@ -823,7 +823,7 @@ get_client_by_id({client_id})                     *vim.lsp.get_client_by_id()*
     not yet be fully initialized.
 
     Parameters: ~
-      • {client_id}  (number) client id
+      • {client_id}  (integer) client id
 
     Return: ~
         |vim.lsp.client| object, or nil
@@ -838,11 +838,11 @@ omnifunc({findstart}, {base})                             *vim.lsp.omnifunc()*
     Implements 'omnifunc' compatible LSP completion.
 
     Parameters: ~
-      • {findstart}  (number) 0 or 1, decides behavior
-      • {base}       (number) findstart=0, text to match against
+      • {findstart}  (integer) 0 or 1, decides behavior
+      • {base}       (integer) findstart=0, text to match against
 
     Return: ~
-        (number) Decided by {findstart}:
+        (integer) Decided by {findstart}:
         • findstart=0: column where the completion starts, or -2 or -3
         • findstart=1: list of matches (actually just calls |complete()|)
 
@@ -861,7 +861,7 @@ set_log_level({level})                               *vim.lsp.set_log_level()*
     Use `lsp.log_levels` for reverse lookup.
 
     Parameters: ~
-      • {level}  (number|string) the case insensitive level name or number
+      • {level}  (integer|string) the case insensitive level name or number
 
     See also: ~
         |vim.lsp.log_levels|
@@ -1052,7 +1052,7 @@ stop_client({client_id}, {force})                      *vim.lsp.stop_client()*
     for this client, then force-shutdown is attempted.
 
     Parameters: ~
-      • {client_id}  number|table id or |vim.lsp.client| object, or list
+      • {client_id}  integer|table id or |vim.lsp.client| object, or list
                      thereof
       • {force}      (boolean|nil) shutdown forcefully
 
@@ -1326,7 +1326,7 @@ get_namespace({client_id})                *vim.lsp.diagnostic.get_namespace()*
     |vim.diagnostic|.
 
     Parameters: ~
-      • {client_id}  (number) The id of the LSP client
+      • {client_id}  (integer) The id of the LSP client
 
                                  *vim.lsp.diagnostic.on_publish_diagnostics()*
 on_publish_diagnostics({_}, {result}, {ctx}, {config})
@@ -1365,22 +1365,23 @@ clear({client_id}, {bufnr})                         *vim.lsp.codelens.clear()*
     Clear the lenses
 
     Parameters: ~
-      • {client_id}  (number|nil) filter by client_id. All clients if nil
-      • {bufnr}      (number|nil) filter by buffer. All buffers if nil
+      • {client_id}  (integer|nil) filter by client_id. All clients if nil
+      • {bufnr}      (integer|nil) filter by buffer. All buffers if nil
 
 display({lenses}, {bufnr}, {client_id})           *vim.lsp.codelens.display()*
     Display the lenses using virtual text
 
     Parameters: ~
       • {lenses}     (table) of lenses to display (`CodeLens[] | null`)
-      • {bufnr}      (number)
-      • {client_id}  (number)
+      • {bufnr}      (integer)
+      • {client_id}  (integer)
 
 get({bufnr})                                          *vim.lsp.codelens.get()*
     Return all lenses for the given buffer
 
     Parameters: ~
-      • {bufnr}  (number) Buffer number. 0 can be used for the current buffer.
+      • {bufnr}  (integer) Buffer number. 0 can be used for the current
+                 buffer.
 
     Return: ~
         (table) (`CodeLens[]`)
@@ -1406,8 +1407,8 @@ save({lenses}, {bufnr}, {client_id})                 *vim.lsp.codelens.save()*
 
     Parameters: ~
       • {lenses}     (table) of lenses to store (`CodeLens[] | null`)
-      • {bufnr}      (number)
-      • {client_id}  (number)
+      • {bufnr}      (integer)
+      • {client_id}  (integer)
 
 
 ==============================================================================
@@ -1420,7 +1421,7 @@ force_refresh({bufnr})               *vim.lsp.semantic_tokens.force_refresh()*
     highlighting (|vim.lsp.semantic_tokens.start()| has been called for it)
 
     Parameters: ~
-      • {bufnr}  (number|nil) filter by buffer. All buffers if nil, current
+      • {bufnr}  (integer|nil) filter by buffer. All buffers if nil, current
                  buffer if 0
 
                                         *vim.lsp.semantic_tokens.get_at_pos()*
@@ -1429,16 +1430,16 @@ get_at_pos({bufnr}, {row}, {col})
     arguments, returns the token under the cursor.
 
     Parameters: ~
-      • {bufnr}  (number|nil) Buffer number (0 for current buffer, default)
-      • {row}    (number|nil) Position row (default cursor position)
-      • {col}    (number|nil) Position column (default cursor position)
+      • {bufnr}  (integer|nil) Buffer number (0 for current buffer, default)
+      • {row}    (integer|nil) Position row (default cursor position)
+      • {col}    (integer|nil) Position column (default cursor position)
 
     Return: ~
         (table|nil) List of tokens at position. Each token has the following
         fields:
-        • line (number) line number, 0-based
-        • start_col (number) start column, 0-based
-        • end_col (number) end column, 0-based
+        • line (integer) line number, 0-based
+        • start_col (integer) start column, 0-based
+        • end_col (integer) end column, 0-based
         • type (string) token type as string, e.g. "variable"
         • modifiers (table) token modifiers as a set. E.g., { static = true,
           readonly = true }
@@ -1455,11 +1456,11 @@ highlight_token({token}, {bufnr}, {client_id}, {hl_group}, {opts})
     Parameters: ~
       • {token}      (table) a semantic token, found as `args.data.token` in
                      |LspTokenUpdate|.
-      • {bufnr}      (number) the buffer to highlight
-      • {client_id}  (number) The ID of the |vim.lsp.client|
+      • {bufnr}      (integer) the buffer to highlight
+      • {client_id}  (integer) The ID of the |vim.lsp.client|
       • {hl_group}   (string) Highlight group name
       • {opts}       (table|nil) Optional parameters.
-                     • priority: (number|nil) Priority for the applied
+                     • priority: (integer|nil) Priority for the applied
                        extmark. Defaults to
                        `vim.highlight.priorities.semantic_tokens + 3`
 
@@ -1477,10 +1478,10 @@ start({bufnr}, {client_id}, {opts})          *vim.lsp.semantic_tokens.start()*
 <
 
     Parameters: ~
-      • {bufnr}      (number)
-      • {client_id}  (number)
+      • {bufnr}      (integer)
+      • {client_id}  (integer)
       • {opts}       (nil|table) Optional keyword arguments
-                     • debounce (number, default: 200): Debounce token
+                     • debounce (integer, default: 200): Debounce token
                        requests to the server by the given number in
                        milliseconds
 
@@ -1494,8 +1495,8 @@ stop({bufnr}, {client_id})                    *vim.lsp.semantic_tokens.stop()*
     from the buffer.
 
     Parameters: ~
-      • {bufnr}      (number)
-      • {client_id}  (number)
+      • {bufnr}      (integer)
+      • {client_id}  (integer)
 
 
 ==============================================================================
@@ -1550,7 +1551,7 @@ apply_text_document_edit({text_document_edit}, {index}, {offset_encoding})
 
     Parameters: ~
       • {text_document_edit}  (table) a `TextDocumentEdit` object
-      • {index}               (number) Optional index of the edit, if from a
+      • {index}               (integer) Optional index of the edit, if from a
                               list of edits (or nil, if not from a list)
 
     See also: ~
@@ -1562,7 +1563,7 @@ apply_text_edits({text_edits}, {bufnr}, {offset_encoding})
 
     Parameters: ~
       • {text_edits}       (table) list of `TextEdit` objects
-      • {bufnr}            (number) Buffer id
+      • {bufnr}            (integer) Buffer id
       • {offset_encoding}  (string) utf-8|utf-16|utf-32
 
     See also: ~
@@ -1580,14 +1581,14 @@ buf_clear_references({bufnr})            *vim.lsp.util.buf_clear_references()*
     Removes document highlights from a buffer.
 
     Parameters: ~
-      • {bufnr}  (number) Buffer id
+      • {bufnr}  (integer) Buffer id
 
                                      *vim.lsp.util.buf_highlight_references()*
 buf_highlight_references({bufnr}, {references}, {offset_encoding})
     Shows a list of document highlights for a certain buffer.
 
     Parameters: ~
-      • {bufnr}            (number) Buffer id
+      • {bufnr}            (integer) Buffer id
       • {references}       (table) List of `DocumentHighlight` objects to
                            highlight
       • {offset_encoding}  (string) One of "utf-8", "utf-16", "utf-32".
@@ -1600,14 +1601,14 @@ character_offset({buf}, {row}, {col}, {offset_encoding})
     Returns the UTF-32 and UTF-16 offsets for a position in a certain buffer.
 
     Parameters: ~
-      • {buf}              (number) buffer number (0 for current)
+      • {buf}              (integer) buffer number (0 for current)
       • {row}              0-indexed line
       • {col}              0-indexed byte offset in line
       • {offset_encoding}  (string) utf-8|utf-16|utf-32|nil defaults to
                            `offset_encoding` of first client of `buf`
 
     Return: ~
-        (number, number) `offset_encoding` index of the character in line
+        (integer, integer) `offset_encoding` index of the character in line
         {row} column {col} in buffer {buf}
 
                               *vim.lsp.util.convert_input_to_markdown_lines()*
@@ -1662,10 +1663,10 @@ get_effective_tabstop({bufnr})          *vim.lsp.util.get_effective_tabstop()*
     Returns indentation size.
 
     Parameters: ~
-      • {bufnr}  (number|nil) Buffer handle, defaults to current
+      • {bufnr}  (integer|nil) Buffer handle, defaults to current
 
     Return: ~
-        (number) indentation size
+        (integer) indentation size
 
     See also: ~
         'shiftwidth'
@@ -1715,11 +1716,11 @@ make_floating_popup_options({width}, {height}, {opts})
     table can be passed to |nvim_open_win()|.
 
     Parameters: ~
-      • {width}   (number) window width (in character cells)
-      • {height}  (number) window height (in character cells)
+      • {width}   (integer) window width (in character cells)
+      • {height}  (integer) window height (in character cells)
       • {opts}    (table, optional)
-                  • offset_x (number) offset to add to `col`
-                  • offset_y (number) offset to add to `row`
+                  • offset_x (integer) offset to add to `col`
+                  • offset_y (integer) offset to add to `row`
                   • border (string or table) override `border`
                   • focusable (string or table) override `focusable`
                   • zindex (string or table) override `zindex`, defaults to 50
@@ -1748,11 +1749,11 @@ make_given_range_params({start_pos}, {end_pos}, {bufnr}, {offset_encoding})
     similar to |vim.lsp.util.make_range_params()|.
 
     Parameters: ~
-      • {start_pos}        number[]|nil {row, col} mark-indexed position.
+      • {start_pos}        integer[]|nil {row, col} mark-indexed position.
                            Defaults to the start of the last visual selection.
-      • {end_pos}          number[]|nil {row, col} mark-indexed position.
+      • {end_pos}          integer[]|nil {row, col} mark-indexed position.
                            Defaults to the end of the last visual selection.
-      • {bufnr}            (number|nil) buffer handle or 0 for current,
+      • {bufnr}            (integer|nil) buffer handle or 0 for current,
                            defaults to current
       • {offset_encoding}  "utf-8"|"utf-16"|"utf-32"|nil defaults to
                            `offset_encoding` of first client of `bufnr`
@@ -1767,7 +1768,7 @@ make_position_params({window}, {offset_encoding})
     cursor position.
 
     Parameters: ~
-      • {window}           (number|nil) window handle or 0 for current,
+      • {window}           (integer|nil) window handle or 0 for current,
                            defaults to current
       • {offset_encoding}  (string|nil) utf-8|utf-16|utf-32|nil defaults to
                            `offset_encoding` of first client of buffer of
@@ -1787,7 +1788,7 @@ make_range_params({window}, {offset_encoding})
     `textDocument/rangeFormatting`.
 
     Parameters: ~
-      • {window}           (number|nil) window handle or 0 for current,
+      • {window}           (integer|nil) window handle or 0 for current,
                            defaults to current
       • {offset_encoding}  "utf-8"|"utf-16"|"utf-32"|nil defaults to
                            `offset_encoding` of first client of buffer of
@@ -1802,7 +1803,7 @@ make_text_document_params({bufnr})
     Creates a `TextDocumentIdentifier` object for the current buffer.
 
     Parameters: ~
-      • {bufnr}  (number|nil) Buffer handle, defaults to current
+      • {bufnr}  (integer|nil) Buffer handle, defaults to current
 
     Return: ~
         `TextDocumentIdentifier`
@@ -1827,15 +1828,16 @@ open_floating_preview({contents}, {syntax}, {opts})
       • {syntax}    (string) of syntax to set for opened buffer
       • {opts}      (table) with optional fields (additional keys are passed
                     on to |nvim_open_win()|)
-                    • height: (number) height of floating window
-                    • width: (number) width of floating window
+                    • height: (integer) height of floating window
+                    • width: (integer) width of floating window
                     • wrap: (boolean, default true) wrap long lines
-                    • wrap_at: (number) character to wrap at for computing
+                    • wrap_at: (integer) character to wrap at for computing
                       height when wrap is enabled
-                    • max_width: (number) maximal width of floating window
-                    • max_height: (number) maximal height of floating window
-                    • pad_top: (number) number of lines to pad contents at top
-                    • pad_bottom: (number) number of lines to pad contents at
+                    • max_width: (integer) maximal width of floating window
+                    • max_height: (integer) maximal height of floating window
+                    • pad_top: (integer) number of lines to pad contents at
+                      top
+                    • pad_bottom: (integer) number of lines to pad contents at
                       bottom
                     • focus_id: (string) if a popup with this id is opened,
                       then focus it
@@ -2008,13 +2010,13 @@ set_level({level})                                   *vim.lsp.log.set_level()*
     Sets the current log level.
 
     Parameters: ~
-      • {level}  (string|number) One of `vim.lsp.log.levels`
+      • {level}  (string|integer) One of `vim.lsp.log.levels`
 
 should_log({level})                                 *vim.lsp.log.should_log()*
     Checks whether the level is sufficient for logging.
 
     Parameters: ~
-      • {level}  (number) log level
+      • {level}  (integer) log level
 
     Return: ~
         (bool) true if would log, false if not
@@ -2029,7 +2031,7 @@ connect({host}, {port})                                *vim.lsp.rpc.connect()*
 
     Parameters: ~
       • {host}  (string)
-      • {port}  (number)
+      • {port}  (integer)
 
     Return: ~
         (function)
@@ -2074,7 +2076,7 @@ rpc_response_error({code}, {message}, {data})
     Creates an RPC response object/table.
 
     Parameters: ~
-      • {code}     (number) RPC error code defined in
+      • {code}     (integer) RPC error code defined in
                    `vim.lsp.protocol.ErrorCodes`
       • {message}  (string|nil) arbitrary message to send to server
       • {data}     any|nil arbitrary data to send to server
@@ -2122,11 +2124,11 @@ compute_diff({___MissingCloseParenHere___})
     Parameters: ~
       • {prev_lines}       (table) list of lines
       • {curr_lines}       (table) list of lines
-      • {firstline}        (number) line to begin search for first difference
-      • {lastline}         (number) line to begin search in old_lines for last
-                           difference
-      • {new_lastline}     (number) line to begin search in new_lines for last
-                           difference
+      • {firstline}        (integer) line to begin search for first difference
+      • {lastline}         (integer) line to begin search in old_lines for
+                           last difference
+      • {new_lastline}     (integer) line to begin search in new_lines for
+                           last difference
       • {offset_encoding}  (string) encoding requested by language server
 
     Return: ~
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index a56e141c29..9a0b3f3100 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -363,7 +363,7 @@ do
   --- smallest debounce interval is used and we don't group clients by different intervals.
   ---
   --- @class CTGroup
-  --- @field sync_kind number TextDocumentSyncKind, considers config.flags.allow_incremental_sync
+  --- @field sync_kind integer TextDocumentSyncKind, considers config.flags.allow_incremental_sync
   --- @field offset_encoding "utf-8"|"utf-16"|"utf-32"
   ---
   --- @class CTBufferState
@@ -374,12 +374,12 @@ do
   --- @field timer nil|uv.uv_timer_t uv_timer
   --- @field last_flush nil|number uv.hrtime of the last flush/didChange-notification
   --- @field needs_flush boolean true if buffer updates haven't been sent to clients/servers yet
-  --- @field refs number how many clients are using this group
+  --- @field refs integer how many clients are using this group
   ---
   --- @class CTGroupState
-  --- @field buffers table<number, CTBufferState>
-  --- @field debounce number debounce duration in ms
-  --- @field clients table<number, table> clients using this state. {client_id, client}
+  --- @field buffers table<integer, CTBufferState>
+  --- @field debounce integer debounce duration in ms
+  --- @field clients table<integer, table> clients using this state. {client_id, client}
 
   ---@private
   ---@param group CTGroup
@@ -568,7 +568,7 @@ do
   --
   -- This turns the debounce into a kind of client rate limiting
   --
-  ---@param debounce number
+  ---@param debounce integer
   ---@param buf_state CTBufferState
   ---@return number
   local function next_debounce(debounce, buf_state)
@@ -585,8 +585,8 @@ do
   end
 
   ---@private
-  ---@param bufnr number
-  ---@param sync_kind number protocol.TextDocumentSyncKind
+  ---@param bufnr integer
+  ---@param sync_kind integer protocol.TextDocumentSyncKind
   ---@param state CTGroupState
   ---@param buf_state CTBufferState
   local function send_changes(bufnr, sync_kind, state, buf_state)
@@ -714,7 +714,7 @@ end
 ---@private
 --- Default handler for the 'textDocument/didOpen' LSP notification.
 ---
----@param bufnr number Number of the buffer, or 0 for current
+---@param bufnr integer Number of the buffer, or 0 for current
 ---@param client table Client object
 local function text_document_did_open_handler(bufnr, client)
   changetracking.init(client, bufnr)
@@ -1095,7 +1095,7 @@ function lsp.start_client(config)
   ---@private
   --- Invoked when the client operation throws an error.
   ---
-  ---@param code (number) Error code
+  ---@param code (integer) Error code
   ---@param err (...) Other arguments may be passed depending on the error kind
   ---@see `vim.lsp.rpc.client_errors` for possible errors. Use
   ---`vim.lsp.rpc.client_errors[code]` to get a human-friendly name.
@@ -1148,8 +1148,8 @@ function lsp.start_client(config)
   ---@private
   --- Invoked on client exit.
   ---
-  ---@param code (number) exit code of the process
-  ---@param signal (number) the signal used to terminate (if any)
+  ---@param code (integer) exit code of the process
+  ---@param signal (integer) the signal used to terminate (if any)
   function dispatch.on_exit(code, signal)
     if config.on_exit then
       pcall(config.on_exit, code, signal, client_id)
@@ -1414,9 +1414,9 @@ function lsp.start_client(config)
   ---
   ---@param method (string) LSP method name.
   ---@param params (table) LSP request params.
-  ---@param timeout_ms (number|nil) Maximum time in milliseconds to wait for
+  ---@param timeout_ms (integer|nil) Maximum time in milliseconds to wait for
   ---                               a result. Defaults to 1000
-  ---@param bufnr (number) Buffer handle (0 for current).
+  ---@param bufnr (integer) Buffer handle (0 for current).
   ---@return {err: lsp.ResponseError|nil, result:any}|nil, string|nil err # a dictionary, where
   --- `err` and `result` come from the |lsp-handler|.
   --- On timeout, cancel or error, returns `(nil, err)` where `err` is a
@@ -1465,7 +1465,7 @@ function lsp.start_client(config)
   ---@private
   --- Cancels a request with a given request id.
   ---
-  ---@param id (number) id of request to cancel
+  ---@param id (integer) id of request to cancel
   ---@return boolean status true if notification was successful. false otherwise
   ---@see |vim.lsp.client.notify()|
   function client.cancel_request(id)
@@ -1622,8 +1622,8 @@ end
 ---
 --- Without calling this, the server won't be notified of changes to a buffer.
 ---
----@param bufnr (number) Buffer handle, or 0 for current
----@param client_id (number) Client id
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@param client_id (integer) Client id
 function lsp.buf_attach_client(bufnr, client_id)
   validate({
     bufnr = { bufnr, 'n', true },
@@ -1734,8 +1734,8 @@ end
 --- Note: While the server is notified that the text document (buffer)
 --- was closed, it is still able to send notifications should it ignore this notification.
 ---
----@param bufnr number Buffer handle, or 0 for current
----@param client_id number Client id
+---@param bufnr integer Buffer handle, or 0 for current
+---@param client_id integer Client id
 function lsp.buf_detach_client(bufnr, client_id)
   validate({
     bufnr = { bufnr, 'n', true },
@@ -1785,8 +1785,8 @@ end
 
 --- Checks if a buffer is attached for a particular client.
 ---
----@param bufnr (number) Buffer handle, or 0 for current
----@param client_id (number) the client id
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@param client_id (integer) the client id
 function lsp.buf_is_attached(bufnr, client_id)
   return (all_buffer_active_clients[resolve_bufnr(bufnr)] or {})[client_id] == true
 end
@@ -1794,7 +1794,7 @@ end
 --- Gets a client by id, or nil if the id is invalid.
 --- The returned client may not yet be fully initialized.
 ---
----@param client_id number client id
+---@param client_id integer client id
 ---
 ---@returns |vim.lsp.client| object, or nil
 function lsp.get_client_by_id(client_id)
@@ -1821,7 +1821,7 @@ end
 --- By default asks the server to shutdown, unless stop was requested
 --- already for this client, then force-shutdown is attempted.
 ---
----@param client_id number|table id or |vim.lsp.client| object, or list thereof
+---@param client_id integer|table id or |vim.lsp.client| object, or list thereof
 ---@param force boolean|nil shutdown forcefully
 function lsp.stop_client(client_id, force)
   local ids = type(client_id) == 'table' and client_id or { client_id }
@@ -1837,8 +1837,8 @@ function lsp.stop_client(client_id, force)
 end
 
 ---@class vim.lsp.get_active_clients.filter
----@field id number|nil Match clients by id
----@field bufnr number|nil match clients attached to the given buffer
+---@field id integer|nil Match clients by id
+---@field bufnr integer|nil match clients attached to the given buffer
 ---@field name string|nil match clients by name
 
 --- Get active clients.
@@ -1932,7 +1932,7 @@ api.nvim_create_autocmd('VimLeavePre', {
 --- Sends an async request for all active clients attached to the
 --- buffer.
 ---
----@param bufnr (number) Buffer handle, or 0 for current.
+---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
 ---@param params table|nil Parameters to send to the server
 ---@param handler function|nil See |lsp-handler|
@@ -1992,7 +1992,7 @@ end
 ---Parameters are the same as |vim.lsp.buf_request()| but the return result and callback are
 ---different.
 ---
----@param bufnr (number) Buffer handle, or 0 for current.
+---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
 ---@param params (table|nil) Parameters to send to the server
 ---@param callback (function) The callback to call when all requests are finished.
@@ -2034,10 +2034,10 @@ end
 --- Parameters are the same as |vim.lsp.buf_request()| but the return result is
 --- different. Wait maximum of {timeout_ms} (default 1000) ms.
 ---
----@param bufnr (number) Buffer handle, or 0 for current.
+---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
 ---@param params (table|nil) Parameters to send to the server
----@param timeout_ms (number|nil) Maximum time in milliseconds to wait for a
+---@param timeout_ms (integer|nil) Maximum time in milliseconds to wait for a
 ---                               result. Defaults to 1000
 ---
 ---@return table<integer, any>|nil result, string|nil err Map of client_id:request_result.
@@ -2106,10 +2106,10 @@ end
 ---@see |complete-items|
 ---@see |CompleteDone|
 ---
----@param findstart number 0 or 1, decides behavior
----@param base number findstart=0, text to match against
+---@param findstart integer 0 or 1, decides behavior
+---@param base integer findstart=0, text to match against
 ---
----@returns (number) Decided by {findstart}:
+---@returns (integer) Decided by {findstart}:
 --- - findstart=0: column where the completion starts, or -2 or -3
 --- - findstart=1: list of matches (actually just calls |complete()|)
 function lsp.omnifunc(findstart, base)
@@ -2246,7 +2246,7 @@ end
 
 ---Checks whether a client is stopped.
 ---
----@param client_id (number)
+---@param client_id (integer)
 ---@return boolean stopped true if client is stopped, false otherwise.
 function lsp.client_is_stopped(client_id)
   return active_clients[client_id] == nil
@@ -2255,7 +2255,7 @@ end
 --- Gets a map of client_id:client pairs for the given buffer, where each value
 --- is a |vim.lsp.client| object.
 ---
----@param bufnr (number|nil): Buffer handle, or 0 for current
+---@param bufnr (integer|nil): Buffer handle, or 0 for current
 ---@returns (table) Table of (client_id, client) pairs
 ---@deprecated Use |vim.lsp.get_active_clients()| instead.
 function lsp.buf_get_clients(bufnr)
@@ -2284,7 +2284,7 @@ lsp.log_levels = log.levels
 ---
 ---@see |vim.lsp.log_levels|
 ---
----@param level (number|string) the case insensitive level name or number
+---@param level (integer|string) the case insensitive level name or number
 function lsp.set_log_level(level)
   if type(level) == 'string' or type(level) == 'number' then
     log.set_level(level)
@@ -2301,7 +2301,7 @@ end
 
 --- Invokes a function for each LSP client attached to a buffer.
 ---
----@param bufnr number Buffer number
+---@param bufnr integer Buffer number
 ---@param fn function Function to run on each client attached to buffer
 ---                   {bufnr}. The function takes the client, client ID, and
 ---                   buffer number as arguments. Example:
diff --git a/runtime/lua/vim/lsp/_snippet.lua b/runtime/lua/vim/lsp/_snippet.lua
index 3488639fb4..797d8960d5 100644
--- a/runtime/lua/vim/lsp/_snippet.lua
+++ b/runtime/lua/vim/lsp/_snippet.lua
@@ -483,7 +483,7 @@ end)
 local M = {}
 
 ---The snippet node type enum
----@types table<string, number>
+---@types table<string, integer>
 M.NodeType = Node.Type
 
 ---Parse snippet string and returns the AST
diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index 17489ed84d..81cac6a511 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -61,7 +61,7 @@ end
 
 --- Return all lenses for the given buffer
 ---
----@param bufnr number  Buffer number. 0 can be used for the current buffer.
+---@param bufnr integer  Buffer number. 0 can be used for the current buffer.
 ---@return table (`CodeLens[]`)
 function M.get(bufnr)
   local lenses_by_client = lens_cache_by_buf[bufnr or 0]
@@ -115,8 +115,8 @@ end
 
 --- Clear the lenses
 ---
----@param client_id number|nil filter by client_id. All clients if nil
----@param bufnr number|nil filter by buffer. All buffers if nil
+---@param client_id integer|nil filter by client_id. All clients if nil
+---@param bufnr integer|nil filter by buffer. All buffers if nil
 function M.clear(client_id, bufnr)
   local buffers = bufnr and { resolve_bufnr(bufnr) } or vim.tbl_keys(lens_cache_by_buf)
   for _, iter_bufnr in pairs(buffers) do
@@ -132,8 +132,8 @@ end
 --- Display the lenses using virtual text
 ---
 ---@param lenses table of lenses to display (`CodeLens[] | null`)
----@param bufnr number
----@param client_id number
+---@param bufnr integer
+---@param client_id integer
 function M.display(lenses, bufnr, client_id)
   local ns = namespaces[client_id]
   if not lenses or not next(lenses) then
@@ -177,8 +177,8 @@ end
 --- Store lenses for a specific buffer and client
 ---
 ---@param lenses table of lenses to store (`CodeLens[] | null`)
----@param bufnr number
----@param client_id number
+---@param bufnr integer
+---@param client_id integer
 function M.save(lenses, bufnr, client_id)
   local lenses_by_client = lens_cache_by_buf[bufnr]
   if not lenses_by_client then
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index 5e2bf75f1b..b27bf6e425 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -4,7 +4,7 @@
 ---@field range Range
 ---@field message string
 ---@field severity DiagnosticSeverity|nil
----@field code number | string
+---@field code integer | string
 ---@field source string
 ---@field tags DiagnosticTag[]
 ---@field relatedInformation DiagnosticRelatedInformation[]
@@ -135,7 +135,7 @@ local _client_namespaces = {}
 
 --- Get the diagnostic namespace associated with an LSP client |vim.diagnostic|.
 ---
----@param client_id number The id of the LSP client
+---@param client_id integer The id of the LSP client
 function M.get_namespace(client_id)
   vim.validate({ client_id = { client_id, 'n' } })
   if not _client_namespaces[client_id] then
@@ -212,7 +212,7 @@ end
 --- this method signature is still used internally in some parts of the LSP
 --- implementation so it's simply marked @private rather than @deprecated.
 ---
----@param client_id number
+---@param client_id integer
 ---@param buffer_client_map table map of buffers to active clients
 ---@private
 function M.reset(client_id, buffer_client_map)
@@ -232,14 +232,14 @@ end
 --- Marked private as this is used internally by the LSP subsystem, but
 --- most users should instead prefer |vim.diagnostic.get()|.
 ---
----@param bufnr number|nil The buffer number
----@param line_nr number|nil The line number
+---@param bufnr integer|nil The buffer number
+---@param line_nr integer|nil The line number
 ---@param opts table|nil Configuration keys
 ---         - severity: (DiagnosticSeverity, default nil)
 ---             - Only return diagnostics with this severity. Overrides severity_limit
 ---         - severity_limit: (DiagnosticSeverity, default nil)
 ---             - Limit severity of diagnostics found. E.g. "Warning" means { "Error", "Warning" } will be valid.
----@param client_id|nil number the client id
+---@param client_id integer|nil the client id
 ---@return table Table with map of line number to list of diagnostics.
 ---              Structured: { [1] = {...}, [5] = {.... } }
 ---@private
diff --git a/runtime/lua/vim/lsp/log.lua b/runtime/lua/vim/lsp/log.lua
index d1a78572aa..51dcb7d21d 100644
--- a/runtime/lua/vim/lsp/log.lua
+++ b/runtime/lua/vim/lsp/log.lua
@@ -141,7 +141,7 @@ end
 vim.tbl_add_reverse_lookup(log.levels)
 
 --- Sets the current log level.
----@param level (string|number) One of `vim.lsp.log.levels`
+---@param level (string|integer) One of `vim.lsp.log.levels`
 function log.set_level(level)
   if type(level) == 'string' then
     current_log_level =
@@ -167,7 +167,7 @@ function log.set_format_func(handle)
 end
 
 --- Checks whether the level is sufficient for logging.
----@param level number log level
+---@param level integer log level
 ---@returns (bool) true if would log, false if not
 function log.should_log(level)
   return level >= current_log_level
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index aa833deb99..30b61d01d6 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -186,7 +186,7 @@ end
 
 --- Creates an RPC response object/table.
 ---
----@param code number RPC error code defined in `vim.lsp.protocol.ErrorCodes`
+---@param code integer RPC error code defined in `vim.lsp.protocol.ErrorCodes`
 ---@param message string|nil arbitrary message to send to server
 ---@param data any|nil arbitrary data to send to server
 local function rpc_response_error(code, message, data)
@@ -224,8 +224,8 @@ end
 ---@private
 --- Default dispatcher for when a client exits.
 ---
----@param code (number): Exit code
----@param signal (number): Number describing the signal used to terminate (if
+---@param code (integer): Exit code
+---@param signal (integer): Number describing the signal used to terminate (if
 ---any)
 function default_dispatchers.on_exit(code, signal)
   local _ = log.info() and log.info('client_exit', { code = code, signal = signal })
@@ -233,7 +233,7 @@ end
 ---@private
 --- Default dispatcher for client errors.
 ---
----@param code (number): Error code
+---@param code (integer): Error code
 ---@param err (any): Details about the error
 ---any)
 function default_dispatchers.on_error(code, err)
@@ -270,7 +270,7 @@ local function create_read_loop(handle_body, on_no_chunk, on_error)
 end
 
 ---@class RpcClient
----@field message_index number
+---@field message_index integer
 ---@field message_callbacks table
 ---@field notify_reply_callbacks table
 ---@field transport table
@@ -588,7 +588,7 @@ end
 --- and port
 ---
 ---@param host string
----@param port number
+---@param port integer
 ---@return function
 local function connect(host, port)
   return function(dispatchers)
@@ -692,8 +692,8 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
 
   ---@private
   --- Callback for |vim.loop.spawn()| Closes all streams and runs the `on_exit` dispatcher.
-  ---@param code (number) Exit code
-  ---@param signal (number) Signal that was used to terminate (if any)
+  ---@param code (integer) Exit code
+  ---@param signal (integer) Signal that was used to terminate (if any)
   local function onexit(code, signal)
     stdin:close()
     stdout:close()
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 7983d066b8..9eaccd539f 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -4,36 +4,36 @@ local util = require('vim.lsp.util')
 local bit = require('bit')
 
 --- @class STTokenRange
---- @field line number line number 0-based
---- @field start_col number start column 0-based
---- @field end_col number end column 0-based
+--- @field line integer line number 0-based
+--- @field start_col integer start column 0-based
+--- @field end_col integer end column 0-based
 --- @field type string token type as string
 --- @field modifiers table token modifiers as a set. E.g., { static = true, readonly = true }
 --- @field marked boolean whether this token has had extmarks applied
 ---
 --- @class STCurrentResult
---- @field version number document version associated with this result
+--- @field version integer document version associated with this result
 --- @field result_id string resultId from the server; used with delta requests
 --- @field highlights STTokenRange[] cache of highlight ranges for this document version
---- @field tokens number[] raw token array as received by the server. used for calculating delta responses
+--- @field tokens integer[] raw token array as received by the server. used for calculating delta responses
 --- @field namespace_cleared boolean whether the namespace was cleared for this result yet
 ---
 --- @class STActiveRequest
---- @field request_id number the LSP request ID of the most recent request sent to the server
---- @field version number the document version associated with the most recent request
+--- @field request_id integer the LSP request ID of the most recent request sent to the server
+--- @field version integer the document version associated with the most recent request
 ---
 --- @class STClientState
---- @field namespace number
+--- @field namespace integer
 --- @field active_request STActiveRequest
 --- @field current_result STCurrentResult
 
 ---@class STHighlighter
----@field active table<number, STHighlighter>
----@field bufnr number
----@field augroup number augroup for buffer events
----@field debounce number milliseconds to debounce requests for new tokens
+---@field active table<integer, STHighlighter>
+---@field bufnr integer
+---@field augroup integer augroup for buffer events
+---@field debounce integer milliseconds to debounce requests for new tokens
 ---@field timer table uv_timer for debouncing requests for new tokens
----@field client_state table<number, STClientState>
+---@field client_state table<integer, STClientState>
 local STHighlighter = { active = {} }
 
 --- Do a binary search of the tokens in the half-open range [lo, hi).
@@ -141,7 +141,7 @@ end
 --- Construct a new STHighlighter for the buffer
 ---
 ---@private
----@param bufnr number
+---@param bufnr integer
 function STHighlighter.new(bufnr)
   local self = setmetatable({}, { __index = STHighlighter })
 
@@ -470,7 +470,7 @@ end
 --- in case the server supports delta requests.
 ---
 ---@private
----@param client_id number
+---@param client_id integer
 function STHighlighter:mark_dirty(client_id)
   local state = self.client_state[client_id]
   assert(state)
@@ -529,10 +529,10 @@ local M = {}
 ---   client.server_capabilities.semanticTokensProvider = nil
 --- </pre>
 ---
----@param bufnr number
----@param client_id number
+---@param bufnr integer
+---@param client_id integer
 ---@param opts (nil|table) Optional keyword arguments
----  - debounce (number, default: 200): Debounce token requests
+---  - debounce (integer, default: 200): Debounce token requests
 ---        to the server by the given number in milliseconds
 function M.start(bufnr, client_id, opts)
   vim.validate({
@@ -585,8 +585,8 @@ end
 --- of `start()`, so you should only need this function to manually disengage the semantic
 --- token engine without fully detaching the LSP client from the buffer.
 ---
----@param bufnr number
----@param client_id number
+---@param bufnr integer
+---@param client_id integer
 function M.stop(bufnr, client_id)
   vim.validate({
     bufnr = { bufnr, 'n', false },
@@ -608,15 +608,15 @@ end
 --- Return the semantic token(s) at the given position.
 --- If called without arguments, returns the token under the cursor.
 ---
----@param bufnr number|nil Buffer number (0 for current buffer, default)
----@param row number|nil Position row (default cursor position)
----@param col number|nil Position column (default cursor position)
+---@param bufnr integer|nil Buffer number (0 for current buffer, default)
+---@param row integer|nil Position row (default cursor position)
+---@param col integer|nil Position column (default cursor position)
 ---
 ---@return table|nil (table|nil) List of tokens at position. Each token has
 ---        the following fields:
----        - line (number) line number, 0-based
----        - start_col (number) start column, 0-based
----        - end_col (number) end column, 0-based
+---        - line (integer) line number, 0-based
+---        - start_col (integer) start column, 0-based
+---        - end_col (integer) end column, 0-based
 ---        - type (string) token type as string, e.g. "variable"
 ---        - modifiers (table) token modifiers as a set. E.g., { static = true, readonly = true }
 function M.get_at_pos(bufnr, row, col)
@@ -661,7 +661,7 @@ end
 --- Only has an effect if the buffer is currently active for semantic token
 --- highlighting (|vim.lsp.semantic_tokens.start()| has been called for it)
 ---
----@param bufnr (number|nil) filter by buffer. All buffers if nil, current
+---@param bufnr (integer|nil) filter by buffer. All buffers if nil, current
 ---       buffer if 0
 function M.force_refresh(bufnr)
   vim.validate({
@@ -689,11 +689,11 @@ end
 --- use inside |LspTokenUpdate| callbacks.
 ---@param token (table) a semantic token, found as `args.data.token` in
 ---       |LspTokenUpdate|.
----@param bufnr (number) the buffer to highlight
----@param client_id (number) The ID of the |vim.lsp.client|
+---@param bufnr (integer) the buffer to highlight
+---@param client_id (integer) The ID of the |vim.lsp.client|
 ---@param hl_group (string) Highlight group name
 ---@param opts (table|nil) Optional parameters.
----       - priority: (number|nil) Priority for the applied extmark. Defaults
+---       - priority: (integer|nil) Priority for the applied extmark. Defaults
 ---         to `vim.highlight.priorities.semantic_tokens + 3`
 function M.highlight_token(token, bufnr, client_id, hl_group, opts)
   local highlighter = STHighlighter.active[bufnr]
diff --git a/runtime/lua/vim/lsp/sync.lua b/runtime/lua/vim/lsp/sync.lua
index 826352f036..fb5b0b3194 100644
--- a/runtime/lua/vim/lsp/sync.lua
+++ b/runtime/lua/vim/lsp/sync.lua
@@ -388,9 +388,9 @@ end
 --- Returns the range table for the difference between prev and curr lines
 ---@param prev_lines table list of lines
 ---@param curr_lines table list of lines
----@param firstline number line to begin search for first difference
----@param lastline number line to begin search in old_lines for last difference
----@param new_lastline number line to begin search in new_lines for last difference
+---@param firstline integer line to begin search for first difference
+---@param lastline integer line to begin search in old_lines for last difference
+---@param new_lastline integer line to begin search in new_lines for last difference
 ---@param offset_encoding string encoding requested by language server
 ---@returns table TextDocumentContentChangeEvent see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
 function M.compute_diff(
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 554e26022c..c9613dc7a7 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -121,9 +121,9 @@ end
 --- Convert byte index to `encoding` index.
 --- Convenience wrapper around vim.str_utfindex
 ---@param line string line to be indexed
----@param index number|nil byte index (utf-8), or `nil` for length
+---@param index integer|nil byte index (utf-8), or `nil` for length
 ---@param encoding string utf-8|utf-16|utf-32|nil defaults to utf-16
----@return number `encoding` index of `index` in `line`
+---@return integer `encoding` index of `index` in `line`
 function M._str_utfindex_enc(line, index, encoding)
   if not encoding then
     encoding = 'utf-16'
@@ -149,9 +149,9 @@ end
 --- Convenience wrapper around vim.str_byteindex
 ---Alternative to vim.str_byteindex that takes an encoding.
 ---@param line string line to be indexed
----@param index number UTF index
+---@param index integer UTF index
 ---@param encoding string utf-8|utf-16|utf-32|nil defaults to utf-16
----@return number byte (utf-8) index of `encoding` index `index` in `line`
+---@return integer byte (utf-8) index of `encoding` index `index` in `line`
 function M._str_byteindex_enc(line, index, encoding)
   if not encoding then
     encoding = 'utf-16'
@@ -239,9 +239,9 @@ end
 --- Works on unloaded buffers by reading the file using libuv to bypass buf reading events.
 --- Falls back to loading the buffer and nvim_buf_get_lines for buffers with non-file URI.
 ---
----@param bufnr number bufnr to get the lines from
----@param rows number[] zero-indexed line numbers
----@return table<number string> a table mapping rows to lines
+---@param bufnr integer bufnr to get the lines from
+---@param rows integer[] zero-indexed line numbers
+---@return table<integer, string> a table mapping rows to lines
 local function get_lines(bufnr, rows)
   rows = type(rows) == 'table' and rows or { rows }
 
@@ -321,8 +321,8 @@ end
 --- Works on unloaded buffers by reading the file using libuv to bypass buf reading events.
 --- Falls back to loading the buffer and nvim_buf_get_lines for buffers with non-file URI.
 ---
----@param bufnr number
----@param row number zero-indexed line number
+---@param bufnr integer
+---@param row integer zero-indexed line number
 ---@return string the line at row in filename
 local function get_line(bufnr, row)
   return get_lines(bufnr, { row })[row]
@@ -386,7 +386,7 @@ end
 
 --- Applies a list of text edits to a buffer.
 ---@param text_edits table list of `TextEdit` objects
----@param bufnr number Buffer id
+---@param bufnr integer Buffer id
 ---@param offset_encoding string utf-8|utf-16|utf-32
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textEdit
 function M.apply_text_edits(text_edits, bufnr, offset_encoding)
@@ -571,7 +571,7 @@ end
 --- document.
 ---
 ---@param text_document_edit table: a `TextDocumentEdit` object
----@param index number: Optional index of the edit, if from a list of edits (or nil, if not from a list)
+---@param index integer: Optional index of the edit, if from a list of edits (or nil, if not from a list)
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentEdit
 function M.apply_text_document_edit(text_document_edit, index, offset_encoding)
   local text_document = text_document_edit.textDocument
@@ -1009,11 +1009,11 @@ end
 --- Creates a table with sensible default options for a floating window. The
 --- table can be passed to |nvim_open_win()|.
 ---
----@param width (number) window width (in character cells)
----@param height (number) window height (in character cells)
+---@param width (integer) window width (in character cells)
+---@param height (integer) window height (in character cells)
 ---@param opts (table, optional)
----        - offset_x (number) offset to add to `col`
----        - offset_y (number) offset to add to `row`
+---        - offset_x (integer) offset to add to `col`
+---        - offset_y (integer) offset to add to `row`
 ---        - border (string or table) override `border`
 ---        - focusable (string or table) override `focusable`
 ---        - zindex (string or table) override `zindex`, defaults to 50
@@ -1429,7 +1429,7 @@ end
 ---@private
 --- Closes the preview window
 ---
----@param winnr number window id of preview window
+---@param winnr integer window id of preview window
 ---@param bufnrs table|nil optional list of ignored buffers
 local function close_preview_window(winnr, bufnrs)
   vim.schedule(function()
@@ -1448,7 +1448,7 @@ end
 --- Creates autocommands to close a preview window when events happen.
 ---
 ---@param events table list of events
----@param winnr number window id of preview window
+---@param winnr integer window id of preview window
 ---@param bufnrs table list of buffers where the preview window will remain visible
 ---@see |autocmd-events|
 local function close_preview_autocmd(events, winnr, bufnrs)
@@ -1556,14 +1556,14 @@ end
 ---@param contents table of lines to show in window
 ---@param syntax string of syntax to set for opened buffer
 ---@param opts table with optional fields (additional keys are passed on to |nvim_open_win()|)
----             - height: (number) height of floating window
----             - width: (number) width of floating window
+---             - height: (integer) height of floating window
+---             - width: (integer) width of floating window
 ---             - wrap: (boolean, default true) wrap long lines
----             - wrap_at: (number) character to wrap at for computing height when wrap is enabled
----             - max_width: (number) maximal width of floating window
----             - max_height: (number) maximal height of floating window
----             - pad_top: (number) number of lines to pad contents at top
----             - pad_bottom: (number) number of lines to pad contents at bottom
+---             - wrap_at: (integer) character to wrap at for computing height when wrap is enabled
+---             - max_width: (integer) maximal width of floating window
+---             - max_height: (integer) maximal height of floating window
+---             - pad_top: (integer) number of lines to pad contents at top
+---             - pad_bottom: (integer) number of lines to pad contents at bottom
 ---             - focus_id: (string) if a popup with this id is opened, then focus it
 ---             - close_events: (table) list of events that closes the floating window
 ---             - focusable: (boolean, default true) Make float focusable
@@ -1672,7 +1672,7 @@ do --[[ References ]]
 
   --- Removes document highlights from a buffer.
   ---
-  ---@param bufnr number Buffer id
+  ---@param bufnr integer Buffer id
   function M.buf_clear_references(bufnr)
     validate({ bufnr = { bufnr, 'n', true } })
     api.nvim_buf_clear_namespace(bufnr or 0, reference_ns, 0, -1)
@@ -1680,7 +1680,7 @@ do --[[ References ]]
 
   --- Shows a list of document highlights for a certain buffer.
   ---
-  ---@param bufnr number Buffer id
+  ---@param bufnr integer Buffer id
   ---@param references table List of `DocumentHighlight` objects to highlight
   ---@param offset_encoding string One of "utf-8", "utf-16", "utf-32".
   ---@see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
@@ -1893,7 +1893,7 @@ function M.try_trim_markdown_code_blocks(lines)
 end
 
 ---@private
----@param window number|nil: window handle or 0 for current, defaults to current
+---@param window integer|nil: window handle or 0 for current, defaults to current
 ---@param offset_encoding string utf-8|utf-16|utf-32|nil defaults to `offset_encoding` of first client of buffer of `window`
 local function make_position_param(window, offset_encoding)
   window = window or 0
@@ -1913,7 +1913,7 @@ end
 
 --- Creates a `TextDocumentPositionParams` object for the current buffer and cursor position.
 ---
----@param window number|nil: window handle or 0 for current, defaults to current
+---@param window integer|nil: window handle or 0 for current, defaults to current
 ---@param offset_encoding string|nil utf-8|utf-16|utf-32|nil defaults to `offset_encoding` of first client of buffer of `window`
 ---@returns `TextDocumentPositionParams` object
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentPositionParams
@@ -1928,7 +1928,7 @@ function M.make_position_params(window, offset_encoding)
 end
 
 --- Utility function for getting the encoding of the first LSP client on the given buffer.
----@param bufnr (number) buffer handle or 0 for current, defaults to current
+---@param bufnr (integer) buffer handle or 0 for current, defaults to current
 ---@returns (string) encoding first client if there is one, nil otherwise
 function M._get_offset_encoding(bufnr)
   validate({
@@ -1966,7 +1966,7 @@ end
 --- `textDocument/codeAction`, `textDocument/colorPresentation`,
 --- `textDocument/rangeFormatting`.
 ---
----@param window number|nil: window handle or 0 for current, defaults to current
+---@param window integer|nil: window handle or 0 for current, defaults to current
 ---@param offset_encoding "utf-8"|"utf-16"|"utf-32"|nil defaults to `offset_encoding` of first client of buffer of `window`
 ---@returns { textDocument = { uri = `current_file_uri` }, range = { start =
 ---`current_position`, end = `current_position` } }
@@ -1983,11 +1983,11 @@ end
 --- Using the given range in the current buffer, creates an object that
 --- is similar to |vim.lsp.util.make_range_params()|.
 ---
----@param start_pos number[]|nil {row, col} mark-indexed position.
+---@param start_pos integer[]|nil {row, col} mark-indexed position.
 --- Defaults to the start of the last visual selection.
----@param end_pos number[]|nil {row, col} mark-indexed position.
+---@param end_pos integer[]|nil {row, col} mark-indexed position.
 --- Defaults to the end of the last visual selection.
----@param bufnr number|nil buffer handle or 0 for current, defaults to current
+---@param bufnr integer|nil buffer handle or 0 for current, defaults to current
 ---@param offset_encoding "utf-8"|"utf-16"|"utf-32"|nil defaults to `offset_encoding` of first client of `bufnr`
 ---@returns { textDocument = { uri = `current_file_uri` }, range = { start =
 ---`start_position`, end = `end_position` } }
@@ -2028,7 +2028,7 @@ end
 
 --- Creates a `TextDocumentIdentifier` object for the current buffer.
 ---
----@param bufnr number|nil: Buffer handle, defaults to current
+---@param bufnr integer|nil: Buffer handle, defaults to current
 ---@returns `TextDocumentIdentifier`
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentIdentifier
 function M.make_text_document_params(bufnr)
@@ -2049,8 +2049,8 @@ end
 --- Returns indentation size.
 ---
 ---@see 'shiftwidth'
----@param bufnr (number|nil): Buffer handle, defaults to current
----@returns (number) indentation size
+---@param bufnr (integer|nil): Buffer handle, defaults to current
+---@returns (integer) indentation size
 function M.get_effective_tabstop(bufnr)
   validate({ bufnr = { bufnr, 'n', true } })
   local bo = bufnr and vim.bo[bufnr] or vim.bo
@@ -2077,11 +2077,11 @@ end
 
 --- Returns the UTF-32 and UTF-16 offsets for a position in a certain buffer.
 ---
----@param buf number buffer number (0 for current)
+---@param buf integer buffer number (0 for current)
 ---@param row 0-indexed line
 ---@param col 0-indexed byte offset in line
 ---@param offset_encoding string utf-8|utf-16|utf-32|nil defaults to `offset_encoding` of first client of `buf`
----@returns (number, number) `offset_encoding` index of the character in line {row} column {col} in buffer {buf}
+---@returns (integer, integer) `offset_encoding` index of the character in line {row} column {col} in buffer {buf}
 function M.character_offset(buf, row, col, offset_encoding)
   local line = get_line(buf, row)
   if offset_encoding == nil then
-- 
cgit 


From 1637bcce7ba52c4c5c451308f8a3adfedde18a2a Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Tue, 7 Mar 2023 09:39:08 +0100
Subject: build!: make libintl a required dependency

Libintl being an optional dependency is not by design, but a workaround
as it didn't use work on all platforms. That should be fixed by now.
---
 runtime/doc/news.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 2db1e75bf7..254ffc51b8 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -45,7 +45,7 @@ The following changes may require adaptations in user config or plugins.
     - `printheader`
     - `printmbcharset`
 
-• libiconv is now a required build dependency.
+• libiconv and intl are now required build dependencies.
 
 • Unsaved changes are now preserved rather than discarded when |channel-stdio|
   is closed.
-- 
cgit 


From 160a019ffa104eebd65f4037729954d98aca6ad0 Mon Sep 17 00:00:00 2001
From: Eriks Muhins <chad@eriksmuhins.com>
Date: Fri, 3 Mar 2023 21:44:13 +0200
Subject: feat(man.lua): support spaces in manpage names

Problem:
:Man command errors if given more than two arguments. Thus, it is
impossible to open man pages that contain spaces in their names.

Solution:
Adjust :Man so that it tries variants with spaces and underscores, and
uses the first found.
---
 runtime/lua/man.lua | 54 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index 61a9575312..f420cc0d67 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -328,7 +328,8 @@ local function get_path(sect, name, silent)
   -- find any that match the specified name
   ---@param v string
   local namematches = vim.tbl_filter(function(v)
-    return fn.fnamemodify(v, ':t'):match(name)
+    local tail = fn.fnamemodify(v, ':t')
+    return string.find(tail, name, 1, true)
   end, results) or {}
   local sectmatches = {}
 
@@ -372,18 +373,18 @@ local function extract_sect_and_name_ref(ref)
     if not name then
       man_error('manpage reference cannot contain only parentheses: ' .. ref)
     end
-    return '', spaces_to_underscores(name)
+    return '', name
   end
   local parts = vim.split(ref1, '(', { plain = true })
   -- see ':Man 3X curses' on why tolower.
   -- TODO(nhooyr) Not sure if this is portable across OSs
   -- but I have not seen a single uppercase section.
   local sect = vim.split(parts[2] or '', ')', { plain = true })[1]:lower()
-  local name = spaces_to_underscores(parts[1])
+  local name = parts[1]
   return sect, name
 end
 
--- verify_exists attempts to find the path to a manpage
+-- search_for_path attempts to find the path to a manpage
 -- based on the passed section and name.
 --
 -- 1. If manpage could not be found with the given sect and name,
@@ -391,10 +392,10 @@ end
 -- 2. If it still could not be found, then we try again without a section.
 -- 3. If still not found but $MANSECT is set, then we try again with $MANSECT
 --    unset.
+-- 4. If a path still wasn't found, return nil.
 ---@param sect string?
 ---@param name string
----@param silent boolean?
-local function verify_exists(sect, name, silent)
+function M.search_for_path(sect, name)
   if sect and sect ~= '' then
     local ret = get_path(sect, name, true)
     if ret then
@@ -430,10 +431,8 @@ local function verify_exists(sect, name, silent)
     end
   end
 
-  if not silent then
-    -- finally, if that didn't work, there is no hope
-    man_error('no manual entry for ' .. name)
-  end
+  -- finally, if that didn't work, there is no hope
+  return nil
 end
 
 local EXT_RE = vim.regex([[\.\%([glx]z\|bz2\|lzma\|Z\)$]])
@@ -585,8 +584,8 @@ local function get_paths(sect, name)
   ---@type string[]
   local paths = fn.globpath(mandirs, 'man?/' .. name .. '*.' .. sect .. '*', false, true)
 
-  -- Prioritize the result from verify_exists as it obeys b:man_default_sects.
-  local first = verify_exists(sect, name, true)
+  -- Prioritize the result from search_for_path as it obeys b:man_default_sects.
+  local first = M.search_for_path(sect, name)
   if first then
     paths = move_elem_to_head(paths, first)
   end
@@ -728,10 +727,6 @@ end
 ---@param count integer
 ---@param args string[]
 function M.open_page(count, smods, args)
-  if #args > 2 then
-    man_error('too many arguments')
-  end
-
   local ref ---@type string
   if #args == 0 then
     ref = vim.bo.filetype == 'man' and fn.expand('<cWORD>') or fn.expand('<cword>')
@@ -743,9 +738,14 @@ function M.open_page(count, smods, args)
   else
     -- Combine the name and sect into a manpage reference so that all
     -- verification/extraction can be kept in a single function.
-    -- If args[2] is a reference as well, that is fine because it is the only
-    -- reference that will match.
-    ref = ('%s(%s)'):format(args[2], args[1])
+    if tonumber(args[1]) then
+      local sect = args[1]
+      table.remove(args, 1)
+      local name = table.concat(args, ' ')
+      ref = ('%s(%s)'):format(name, sect)
+    else
+      ref = table.concat(args, ' ')
+    end
   end
 
   local sect, name = extract_sect_and_name_ref(ref)
@@ -753,9 +753,16 @@ function M.open_page(count, smods, args)
     sect = tostring(count)
   end
 
-  local path = verify_exists(sect, name)
-  sect, name = extract_sect_and_name_path(path)
+  -- Try both spaces and underscores, use the first that exists.
+  local path = M.search_for_path(sect, name)
+  if path == nil then
+    path = M.search_for_path(sect, spaces_to_underscores(name))
+    if path == nil then
+      man_error('no manual entry for ' .. name)
+    end
+  end
 
+  sect, name = extract_sect_and_name_path(path)
   local buf = fn.bufnr()
   local save_tfu = vim.bo[buf].tagfunc
   vim.bo[buf].tagfunc = "v:lua.require'man'.goto_tag"
@@ -786,7 +793,10 @@ end
 -- Called when a man:// buffer is opened.
 function M.read_page(ref)
   local sect, name = extract_sect_and_name_ref(ref)
-  local path = verify_exists(sect, name)
+  local path = M.search_for_path(sect, name)
+  if path == nil then
+    man_error('no manual entry for ' .. name)
+  end
   sect = extract_sect_and_name_path(path)
   local page = get_page(path)
   vim.b.man_sect = sect
-- 
cgit 


From 304477ff3504373a336c83127654e65eddfa2ef9 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 7 Mar 2023 15:13:09 +0100
Subject: fix(man.lua): tests, naming

---
 runtime/doc/news.txt |  2 ++
 runtime/lua/man.lua  | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 254ffc51b8..f5b9f39d93 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -162,6 +162,8 @@ The following new APIs or features were added.
 
 • |:highlight| now supports an additional attribute "altfont".
 
+• |:Man| manpage viewer supports manpage names containing spaces.
+
 • Treesitter captures can now be transformed by directives. This will allow
   more complicated dynamic language injections.
 
diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index f420cc0d67..cca9434e9c 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -384,7 +384,7 @@ local function extract_sect_and_name_ref(ref)
   return sect, name
 end
 
--- search_for_path attempts to find the path to a manpage
+-- find_path attempts to find the path to a manpage
 -- based on the passed section and name.
 --
 -- 1. If manpage could not be found with the given sect and name,
@@ -395,7 +395,7 @@ end
 -- 4. If a path still wasn't found, return nil.
 ---@param sect string?
 ---@param name string
-function M.search_for_path(sect, name)
+function M.find_path(sect, name)
   if sect and sect ~= '' then
     local ret = get_path(sect, name, true)
     if ret then
@@ -584,8 +584,8 @@ local function get_paths(sect, name)
   ---@type string[]
   local paths = fn.globpath(mandirs, 'man?/' .. name .. '*.' .. sect .. '*', false, true)
 
-  -- Prioritize the result from search_for_path as it obeys b:man_default_sects.
-  local first = M.search_for_path(sect, name)
+  -- Prioritize the result from find_path as it obeys b:man_default_sects.
+  local first = M.find_path(sect, name)
   if first then
     paths = move_elem_to_head(paths, first)
   end
@@ -754,9 +754,9 @@ function M.open_page(count, smods, args)
   end
 
   -- Try both spaces and underscores, use the first that exists.
-  local path = M.search_for_path(sect, name)
+  local path = M.find_path(sect, name)
   if path == nil then
-    path = M.search_for_path(sect, spaces_to_underscores(name))
+    path = M.find_path(sect, spaces_to_underscores(name))
     if path == nil then
       man_error('no manual entry for ' .. name)
     end
@@ -793,7 +793,7 @@ end
 -- Called when a man:// buffer is opened.
 function M.read_page(ref)
   local sect, name = extract_sect_and_name_ref(ref)
-  local path = M.search_for_path(sect, name)
+  local path = M.find_path(sect, name)
   if path == nil then
     man_error('no manual entry for ' .. name)
   end
-- 
cgit 


From 04e8e1f9eaa9ca64fa6418639d595f142585a934 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 7 Mar 2023 09:28:53 -0500
Subject: refactor(runtime): use vim.version to compare versions #22550
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TODO:
Unfortunately, cannot (yet) use vim.version for tmux version comparison,
because `vim.version.parse(…,{strict=false})` does not coerce tmux's
funny "tmux 3.3a" version string.
https://github.com/neovim/neovim/blob/6969d3d7491fc2f10d80309b26dd0c26d211b1b3/runtime/autoload/provider/clipboard.vim#L148
---
 runtime/autoload/health/provider.vim | 28 ++++++----------------------
 runtime/autoload/provider/node.vim   | 18 +++++++-----------
 2 files changed, 13 insertions(+), 33 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
index d104bcfd67..59361eb735 100644
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -19,22 +19,6 @@ function! s:cmd_ok(cmd) abort
   return v:shell_error == 0
 endfunction
 
-" Simple version comparison.
-function! s:version_cmp(a, b) abort
-  let a = split(a:a, '\.', 0)
-  let b = split(a:b, '\.', 0)
-
-  for i in range(len(a))
-    if str2nr(a[i]) > str2nr(b[i])
-      return 1
-    elseif str2nr(a[i]) < str2nr(b[i])
-      return -1
-    endif
-  endfor
-
-  return 0
-endfunction
-
 " Handler for s:system() function.
 function! s:system_handler(jobid, data, event) dict abort
   if a:event ==# 'stderr'
@@ -244,7 +228,7 @@ function! s:version_info(python) abort
   let nvim_path_base = fnamemodify(nvim_path, ':~:h')
   let version_status = 'unknown; '.nvim_path_base
   if !s:is_bad_response(nvim_version) && !s:is_bad_response(pypi_version)
-    if s:version_cmp(nvim_version, pypi_version) == -1
+    if v:lua.vim.version.lt(nvim_version, pypi_version)
       let version_status = 'outdated; from '.nvim_path_base
     else
       let version_status = 'up to date'
@@ -598,7 +582,7 @@ function! s:check_ruby() abort
     return
   endif
 
-  if s:version_cmp(current_gem, latest_gem) == -1
+  if v:lua.vim.version.lt(current_gem, latest_gem)
     call health#report_warn(
           \ printf('Gem "neovim" is out-of-date. Installed: %s, latest: %s',
           \ current_gem, latest_gem),
@@ -623,8 +607,8 @@ function! s:check_node() abort
   endif
   let node_v = get(split(s:system(['node', '-v']), "\n"), 0, '')
   call health#report_info('Node.js: '. node_v)
-  if s:shell_error || s:version_cmp(node_v[1:], '6.0.0') < 0
-    call health#report_warn('Nvim node.js host does not support '.node_v)
+  if s:shell_error || v:lua.vim.version.lt(node_v[1:], '6.0.0')
+    call health#report_warn('Nvim node.js host does not support Node '.node_v)
     " Skip further checks, they are nonsense if nodejs is too old.
     return
   endif
@@ -675,7 +659,7 @@ function! s:check_node() abort
     return
   endif
 
-  if s:version_cmp(current_npm, latest_npm) == -1
+  if latest_npm !=# 'unable to parse' && v:lua.vim.version.lt(current_npm, latest_npm)
     call health#report_warn(
           \ printf('Package "neovim" is out-of-date. Installed: %s, latest: %s',
           \ current_npm, latest_npm),
@@ -751,7 +735,7 @@ function! s:check_perl() abort
     return
   endif
 
-  if s:version_cmp(current_cpan, latest_cpan) == -1
+  if v:lua.vim.version.lt(current_cpan, latest_cpan)
     call health#report_warn(
           \ printf('Module "Neovim::Ext" is out-of-date. Installed: %s, latest: %s',
           \ current_cpan, latest_cpan),
diff --git a/runtime/autoload/provider/node.vim b/runtime/autoload/provider/node.vim
index 87af0094fe..3e7b8b4ef9 100644
--- a/runtime/autoload/provider/node.vim
+++ b/runtime/autoload/provider/node.vim
@@ -3,7 +3,7 @@ if exists('g:loaded_node_provider')
 endif
 let g:loaded_node_provider = 1
 
-function! s:is_minimum_version(version, min_major, min_minor) abort
+function! s:is_minimum_version(version, min_version) abort
   if empty(a:version)
     let nodejs_version = get(split(system(['node', '-v']), "\n"), 0, '')
     if v:shell_error || nodejs_version[0] !=# 'v'
@@ -15,11 +15,7 @@ function! s:is_minimum_version(version, min_major, min_minor) abort
   " Remove surrounding junk.  Example: 'v4.12.0' => '4.12.0'
   let nodejs_version = matchstr(nodejs_version, '\(\d\.\?\)\+')
   " [major, minor, patch]
-  let v_list = split(nodejs_version, '\.')
-  return len(v_list) == 3
-    \ && ((str2nr(v_list[0]) > str2nr(a:min_major))
-    \     || (str2nr(v_list[0]) == str2nr(a:min_major)
-    \         && str2nr(v_list[1]) >= str2nr(a:min_minor)))
+  return !v:lua.vim.version.lt(nodejs_version, a:min_version)
 endfunction
 
 let s:NodeHandler = {
@@ -43,20 +39,20 @@ function! provider#node#can_inspect() abort
   if v:shell_error || ver[0] !=# 'v'
     return 0
   endif
-  return (ver[1] ==# '6' && s:is_minimum_version(ver, 6, 12))
-    \ || s:is_minimum_version(ver, 7, 6)
+  return (ver[1] ==# '6' && s:is_minimum_version(ver, '6.12.0'))
+    \ || s:is_minimum_version(ver, '7.6.0')
 endfunction
 
 function! provider#node#Detect() abort
-  let minver = [6, 0]
+  let minver = '6.0.0'
   if exists('g:node_host_prog')
     return [expand(g:node_host_prog, v:true), '']
   endif
   if !executable('node')
     return ['', 'node not found (or not executable)']
   endif
-  if !s:is_minimum_version(v:null, minver[0], minver[1])
-    return ['', printf('node version %s.%s not found', minver[0], minver[1])]
+  if !s:is_minimum_version(v:null, minver)
+    return ['', printf('node version %s not found', minver)]
   endif
 
   let npm_opts = {}
-- 
cgit 


From 4385f8a7430f8181189f385a6cfb4e295d30b21e Mon Sep 17 00:00:00 2001
From: jdrouhard <john@drouhard.dev>
Date: Tue, 7 Mar 2023 10:35:12 -0600
Subject: fix(lsp): change LspTokenUpdate to use buffer instead of pattern
 (#22559)

---
 runtime/lua/vim/lsp/semantic_tokens.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 9eaccd539f..a5e007a011 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -435,7 +435,7 @@ function STHighlighter:on_win(topline, botline)
           token.marked = true
 
           api.nvim_exec_autocmds('LspTokenUpdate', {
-            pattern = vim.api.nvim_buf_get_name(self.bufnr),
+            buffer = self.bufnr,
             modeline = false,
             data = {
               token = token,
-- 
cgit 


From 30632dd21ab243bb2c4eb115819a32fdfd9155dc Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Tue, 7 Mar 2023 15:00:51 +0100
Subject: refactor(build): make installation of runtime/ more effective

Currently files to install in runtime/ is detected by recursive glob
pattern which has two problems:

- cmake needs to do a of work at config time and
  build/runtime/cmake_install.cmake becomes HUGE (2.5MB, biggest config file)
- we need to explicitly specify each file suffix used in the entire
  runtime, which is duplication of information.

These globs specify every single file in a subdirectory.
Thus, we can just install every runtime/ subdirectory as a single
install command. Furthermore, at the top-level, only .vim and .lua files
need to be installed.

Further possible refactor: we could move files which does not belong
in $PREFIX/runtime out of $REPO/runtime. Then runtime could be installed
with a single install_helper(DIRECTORY ...) command.
---
 runtime/CMakeLists.txt | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 581a4545db..c6447721a0 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -116,23 +116,17 @@ install_helper(
   FILES ${CMAKE_CURRENT_SOURCE_DIR}/nvim.png
   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps)
 
-install_helper(
-  FILES ${CMAKE_CURRENT_SOURCE_DIR}/neovim.ico
-  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime)
-
-globrecurse_wrapper(RUNTIME_PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR} *.awk *.sh *.bat)
-
-foreach(PROG ${RUNTIME_PROGRAMS})
-  get_filename_component(BASEDIR ${PROG} DIRECTORY)
-  install_helper(PROGRAMS ${PROG}
-                 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/${BASEDIR})
+glob_wrapper(RUNTIME_ROOT_FILES *.vim *.lua *.ico)
+install_helper(FILES ${RUNTIME_ROOT_FILES}
+               DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/)
+
+glob_wrapper(RUNTIME_DIRS */)
+foreach(D ${RUNTIME_DIRS})
+  if(IS_DIRECTORY ${D})
+    install_helper(DIRECTORY ${D}
+                   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/)
+  endif()
 endforeach()
 
-globrecurse_wrapper(RUNTIME_FILES ${CMAKE_CURRENT_SOURCE_DIR}
-  *.vim *.lua *.scm *.dict *.py *.rb *.ps *.spl *.tutor *.tutor.json)
-
-foreach(F ${RUNTIME_FILES})
-  get_filename_component(BASEDIR ${F} DIRECTORY)
-  install_helper(FILES ${F}
-                 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/${BASEDIR})
-endforeach()
+# only foo.sh script in runtime/
+install_helper(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/macros/less.sh DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/macros/)
-- 
cgit 


From ddd257f75301a50c177fc24a693d39a45b47a689 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 8 Mar 2023 11:03:11 +0000
Subject: feat(treesitter): use upstream format for injection queries

---
 runtime/doc/news.txt                        |   4 +
 runtime/doc/treesitter.txt                  |  46 ++++++
 runtime/lua/vim/treesitter/_meta.lua        |   8 +-
 runtime/lua/vim/treesitter/languagetree.lua | 240 ++++++++++++++++++++--------
 runtime/lua/vim/treesitter/query.lua        |  21 +--
 runtime/queries/c/injections.scm            |   6 +-
 runtime/queries/help/injections.scm         |   7 +-
 runtime/queries/lua/injections.scm          |  16 +-
 runtime/queries/vim/injections.scm          |  46 ++++--
 9 files changed, 283 insertions(+), 111 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f5b9f39d93..04ae9360a0 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -196,6 +196,10 @@ The following new APIs or features were added.
 
 • Added an omnifunc implementation for lua, |vim.lua_omnifunc()|
 
+• Treesitter injection queries now use the format described at
+  https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection .
+  Support for the previous format will be removed in a future release.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 1f78e4d5d9..3b0936941f 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -441,7 +441,53 @@ individual query pattern manually by setting its `"priority"` metadata
 attribute: >
 
     (super_important_node) @ImportantHighlight (#set! "priority" 105)
+
+==============================================================================
+TREESITTER LANGUAGE INJECTIONS                *treesitter-language-injections*
 <
+
+Note the following information is adapted from:
+  https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection
+
+Some source files contain code written in multiple different languages.
+Examples include:
+
+    • HTML files, which can contain JavaScript inside of `<script>` tags and
+      CSS inside of `<style>` tags
+    • ERB files, which contain Ruby inside of `<%` `%>` tags, and HTML outside of
+      those tags
+    • PHP files, which can contain HTML between the `<php` tags
+    • JavaScript files, which contain regular expression syntax within regex
+      literals
+    • Ruby, which can contain snippets of code inside of heredoc literals,
+      where the heredoc delimiter often indicates the language
+    • Lua, which can contain snippets of Vimscript inside |vim.cmd()| calls.
+    • Vimscript, which can contain snippets of Lua inside |:lua-heredoc|
+      blocks.
+
+All of these examples can be modeled in terms of a parent syntax tree and one
+or more injected syntax trees, which reside inside of certain nodes in the
+parent tree. The language injection query allows you to specify these
+“injections” using the following captures:
+
+    • `@injection.content` - indicates that the captured node should have its
+      contents re-parsed using another language.
+    • `@injection.language` - indicates that the captured node’s text may
+      contain the name of a language that should be used to re-parse the
+      `@injection.content`.
+
+The language injection behavior can also be configured by some properties
+associated with patterns:
+
+    • `injection.language` - can be used to hard-code the name of a specific
+    language.
+    • `injection.combined` - indicates that all of the matching nodes in the
+    tree should have their content parsed as one nested document.
+    • `injection.include-children` - indicates that the `@injection.content`
+    node's entire text should be re-parsed, including the text of its child
+    nodes. By default, child nodes' text will be excluded from the injected
+    document.
+
 ==============================================================================
 VIM.TREESITTER                                                *lua-treesitter*
 
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index 731a5ebf9f..ad0854706b 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -14,7 +14,7 @@
 ---@field child_count fun(self: TSNode): integer
 ---@field named_child_count fun(self: TSNode): integer
 ---@field child fun(self: TSNode, integer): TSNode
----@field name_child fun(self: TSNode, integer): TSNode
+---@field named_child fun(self: TSNode, integer): TSNode
 ---@field descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode
 ---@field named_descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode
 ---@field parent fun(self: TSNode): TSNode
@@ -43,10 +43,10 @@ function TSNode:_rawquery(query, captures, start, end_) end
 function TSNode:_rawquery(query, captures, start, end_) end
 
 ---@class TSParser
----@field parse fun(self: TSParser, tree, source: integer|string): TSTree, integer[]
+---@field parse fun(self: TSParser, tree, source: integer|string): TSTree, Range4[]
 ---@field reset fun(self: TSParser)
----@field included_ranges fun(self: TSParser): integer[]
----@field set_included_ranges fun(self: TSParser, ranges: integer[][])
+---@field included_ranges fun(self: TSParser): Range4[]
+---@field set_included_ranges fun(self: TSParser, ranges: Range6[])
 ---@field set_timeout fun(self: TSParser, timeout: integer)
 ---@field timeout fun(self: TSParser): integer
 
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index b8b0dd867e..fbc602486b 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -399,6 +399,169 @@ local function get_range_from_metadata(node, id, metadata)
   return { node:range() }
 end
 
+---@private
+--- TODO(lewis6991): cleanup of the node_range interface
+---@param node TSNode
+---@param id integer
+---@param metadata TSMetadata
+---@return Range4[]
+local function get_node_ranges(node, id, metadata, include_children)
+  local range = get_range_from_metadata(node, id, metadata)
+
+  if include_children then
+    return { range }
+  end
+
+  local ranges = {} ---@type Range4[]
+
+  local srow, scol, erow, ecol = range[1], range[2], range[3], range[4]
+
+  for i = 0, node:named_child_count() - 1 do
+    local child = node:named_child(i)
+    local child_srow, child_scol, child_erow, child_ecol = child:range()
+    if child_srow > srow or child_scol > scol then
+      table.insert(ranges, { srow, scol, child_srow, child_scol })
+    end
+    srow = child_erow
+    scol = child_ecol
+  end
+
+  if erow > srow or ecol > scol then
+    table.insert(ranges, { srow, scol, erow, ecol })
+  end
+
+  return ranges
+end
+
+---@alias TSInjection table<string,table<integer,table>>
+
+---@private
+---@param t table<integer,TSInjection>
+---@param tree_index integer
+---@param pattern integer
+---@param lang string
+---@param combined boolean
+---@param ranges Range4[]
+local function add_injection(t, tree_index, pattern, lang, combined, ranges)
+  assert(type(lang) == 'string')
+
+  -- Each tree index should be isolated from the other nodes.
+  if not t[tree_index] then
+    t[tree_index] = {}
+  end
+
+  if not t[tree_index][lang] then
+    t[tree_index][lang] = {}
+  end
+
+  -- Key this by pattern. If combined is set to true all captures of this pattern
+  -- will be parsed by treesitter as the same "source".
+  -- If combined is false, each "region" will be parsed as a single source.
+  if not t[tree_index][lang][pattern] then
+    t[tree_index][lang][pattern] = { combined = combined, regions = {} }
+  end
+
+  table.insert(t[tree_index][lang][pattern].regions, ranges)
+end
+
+---@private
+---Get node text
+---
+---Note: `query.get_node_text` returns string|string[]|nil so use this simple alias function
+---to annotate it returns string.
+---
+---TODO(lewis6991): use [at]overload annotations on `query.get_node_text`
+---@param node TSNode
+---@param source integer|string
+---@param metadata table
+---@return string
+local function get_node_text(node, source, metadata)
+  return query.get_node_text(node, source, { metadata = metadata }) --[[@as string]]
+end
+
+---@private
+--- Extract injections according to:
+--- https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection
+---@param match table<integer,TSNode>
+---@param metadata table
+---@return string, boolean, Range4[]
+function LanguageTree:_get_injection(match, metadata)
+  local ranges = {} ---@type Range4[]
+  local combined = metadata['injection.combined'] ~= nil
+  local lang = metadata['injection.language'] ---@type string
+  local include_children = metadata['injection.include-children'] ~= nil
+
+  for id, node in pairs(match) do
+    local name = self._injection_query.captures[id]
+
+    -- Lang should override any other language tag
+    if name == 'injection.language' then
+      lang = get_node_text(node, self._source, metadata[id])
+    elseif name == 'injection.content' then
+      ranges = get_node_ranges(node, id, metadata, include_children)
+    end
+  end
+
+  return lang, combined, ranges
+end
+
+---@private
+---@param match table<integer,TSNode>
+---@param metadata table
+---@return string, boolean, Range4[]
+function LanguageTree:_get_injection_deprecated(match, metadata)
+  local lang = nil ---@type string
+  local ranges = {} ---@type Range4[]
+  local combined = metadata.combined ~= nil
+
+  -- Directives can configure how injections are captured as well as actual node captures.
+  -- This allows more advanced processing for determining ranges and language resolution.
+  if metadata.content then
+    local content = metadata.content ---@type any
+
+    -- Allow for captured nodes to be used
+    if type(content) == 'number' then
+      content = { match[content]:range() }
+    end
+
+    if type(content) == 'table' and #content >= 4 then
+      vim.list_extend(ranges, content)
+    end
+  end
+
+  if metadata.language then
+    lang = metadata.language ---@type string
+  end
+
+  -- You can specify the content and language together
+  -- using a tag with the language, for example
+  -- @javascript
+  for id, node in pairs(match) do
+    local name = self._injection_query.captures[id]
+
+    -- Lang should override any other language tag
+    if name == 'language' and not lang then
+      lang = get_node_text(node, self._source, metadata[id])
+    elseif name == 'combined' then
+      combined = true
+    elseif name == 'content' and #ranges == 0 then
+      table.insert(ranges, get_range_from_metadata(node, id, metadata))
+      -- Ignore any tags that start with "_"
+      -- Allows for other tags to be used in matches
+    elseif string.sub(name, 1, 1) ~= '_' then
+      if not lang then
+        lang = name
+      end
+
+      if #ranges == 0 then
+        table.insert(ranges, get_range_from_metadata(node, id, metadata))
+      end
+    end
+  end
+
+  return lang, combined, ranges
+end
+
 --- Gets language injection points by language.
 ---
 --- This is where most of the injection processing occurs.
@@ -406,13 +569,13 @@ end
 --- TODO: Allow for an offset predicate to tailor the injection range
 ---       instead of using the entire nodes range.
 ---@private
----@return table<string, integer[][]>
+---@return table<string, Range4[][]>
 function LanguageTree:_get_injections()
   if not self._injection_query then
     return {}
   end
 
-  ---@type table<integer,table<string,table<integer,table>>>
+  ---@type table<integer,TSInjection>
   local injections = {}
 
   for tree_index, tree in ipairs(self._trees) do
@@ -422,75 +585,12 @@ function LanguageTree:_get_injections()
     for pattern, match, metadata in
       self._injection_query:iter_matches(root_node, self._source, start_line, end_line + 1)
     do
-      local lang = nil ---@type string
-      local ranges = {} ---@type Range4[]
-      local combined = metadata.combined ---@type boolean
-
-      -- Directives can configure how injections are captured as well as actual node captures.
-      -- This allows more advanced processing for determining ranges and language resolution.
-      if metadata.content then
-        local content = metadata.content ---@type any
-
-        -- Allow for captured nodes to be used
-        if type(content) == 'number' then
-          content = { match[content]:range() }
-        end
-
-        if type(content) == 'table' and #content >= 4 then
-          vim.list_extend(ranges, content)
-        end
-      end
-
-      if metadata.language then
-        lang = metadata.language ---@type string
-      end
-
-      -- You can specify the content and language together
-      -- using a tag with the language, for example
-      -- @javascript
-      for id, node in pairs(match) do
-        local name = self._injection_query.captures[id]
-
-        -- Lang should override any other language tag
-        if name == 'language' and not lang then
-          ---@diagnostic disable-next-line
-          lang = query.get_node_text(node, self._source, { metadata = metadata[id] })
-        elseif name == 'combined' then
-          combined = true
-        elseif name == 'content' and #ranges == 0 then
-          table.insert(ranges, get_range_from_metadata(node, id, metadata))
-          -- Ignore any tags that start with "_"
-          -- Allows for other tags to be used in matches
-        elseif string.sub(name, 1, 1) ~= '_' then
-          if not lang then
-            lang = name
-          end
-
-          if #ranges == 0 then
-            table.insert(ranges, get_range_from_metadata(node, id, metadata))
-          end
-        end
+      local lang, combined, ranges = self:_get_injection(match, metadata)
+      if not lang then
+        -- TODO(lewis6991): remove after 0.9 (#20434)
+        lang, combined, ranges = self:_get_injection_deprecated(match, metadata)
       end
-
-      assert(type(lang) == 'string')
-
-      -- Each tree index should be isolated from the other nodes.
-      if not injections[tree_index] then
-        injections[tree_index] = {}
-      end
-
-      if not injections[tree_index][lang] then
-        injections[tree_index][lang] = {}
-      end
-
-      -- Key this by pattern. If combined is set to true all captures of this pattern
-      -- will be parsed by treesitter as the same "source".
-      -- If combined is false, each "region" will be parsed as a single source.
-      if not injections[tree_index][lang][pattern] then
-        injections[tree_index][lang][pattern] = { combined = combined, regions = {} }
-      end
-
-      table.insert(injections[tree_index][lang][pattern].regions, ranges)
+      add_injection(injections, tree_index, pattern, lang, combined, ranges)
     end
   end
 
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 22f706585e..59894cc7f5 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -407,7 +407,7 @@ predicate_handlers['vim-match?'] = predicate_handlers['match?']
 ---@field [string] integer|string
 ---@field range Range4
 
----@alias TSDirective fun(match: TSMatch, _, _, predicate: any[], metadata: TSMetadata)
+---@alias TSDirective fun(match: TSMatch, _, _, predicate: (string|integer)[], metadata: TSMetadata)
 
 -- Predicate handler receive the following arguments
 -- (match, pattern, bufnr, predicate)
@@ -419,24 +419,17 @@ predicate_handlers['vim-match?'] = predicate_handlers['match?']
 ---@type table<string,TSDirective>
 local directive_handlers = {
   ['set!'] = function(_, _, _, pred, metadata)
-    if #pred == 4 then
-      -- (#set! @capture "key" "value")
-      ---@diagnostic disable-next-line:no-unknown
-      local _, capture_id, key, value = unpack(pred)
-      ---@cast value integer|string
-      ---@cast capture_id integer
-      ---@cast key string
+    if #pred >= 3 and type(pred[2]) == 'number' then
+      -- (#set! @capture key value)
+      local capture_id, key, value = pred[2], pred[3], pred[4]
       if not metadata[capture_id] then
         metadata[capture_id] = {}
       end
       metadata[capture_id][key] = value
     else
-      ---@diagnostic disable-next-line:no-unknown
-      local _, key, value = unpack(pred)
-      ---@cast value integer|string
-      ---@cast key string
-      -- (#set! "key" "value")
-      metadata[key] = value
+      -- (#set! key value)
+      local key, value = pred[2], pred[3]
+      metadata[key] = value or true
     end
   end,
   -- Shifts the range of a node.
diff --git a/runtime/queries/c/injections.scm b/runtime/queries/c/injections.scm
index 7e9e73449d..84ae33683e 100644
--- a/runtime/queries/c/injections.scm
+++ b/runtime/queries/c/injections.scm
@@ -1,3 +1,5 @@
-(preproc_arg) @c
+((preproc_arg) @injection.content
+ (#set! injection.language "c"))
 
-; (comment) @comment
+; ((comment) @injection.content
+;  (#set! injection.language "comment"))
diff --git a/runtime/queries/help/injections.scm b/runtime/queries/help/injections.scm
index 09bbe44e84..260a05d863 100644
--- a/runtime/queries/help/injections.scm
+++ b/runtime/queries/help/injections.scm
@@ -1,3 +1,4 @@
-(codeblock
-  (language) @language
-  (code) @content)
+((codeblock
+  (language) @injection.language
+  (code) @injection.content)
+ (#set! injection.include-children))
diff --git a/runtime/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
index 69acbbbe9f..10eb4c4054 100644
--- a/runtime/queries/lua/injections.scm
+++ b/runtime/queries/lua/injections.scm
@@ -3,20 +3,26 @@
     (identifier) @_cdef_identifier
     (_ _ (identifier) @_cdef_identifier)
   ]
-  arguments: (arguments (string content: _ @c)))
+  arguments: (arguments (string content: _ @injection.content)))
+  (#set! injection.language "c")
   (#eq? @_cdef_identifier "cdef"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments (string content: _ @vim)))
+  arguments: (arguments (string content: _ @injection.content)))
+  (#set! injection.language "vim")
   (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec" "vim.api.nvim_cmd"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
-  arguments: (arguments (string content: _ @query) .))
+  arguments: (arguments (string content: _ @injection.content) .))
+  (#set! injection.language "query")
   (#eq? @_vimcmd_identifier "vim.treesitter.query.set_query"))
 
 ; ;; highlight string as query if starts with `;; query`
-; ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))
+; ((string ("string_content") @injection.content)
+;  (#set! injection.language "query")
+;  (#lua-match? @injection.content "^%s*;+%s?query"))
 
-; (comment) @comment
+; ((comment) @injection.content
+;  (#set! injection.language "comment"))
diff --git a/runtime/queries/vim/injections.scm b/runtime/queries/vim/injections.scm
index b53643dc1a..50f0190112 100644
--- a/runtime/queries/vim/injections.scm
+++ b/runtime/queries/vim/injections.scm
@@ -1,18 +1,33 @@
-(lua_statement (script (body) @lua))
-(lua_statement (chunk) @lua)
-(ruby_statement (script (body) @ruby))
-(ruby_statement (chunk) @ruby)
-(python_statement (script (body) @python))
-(python_statement (chunk) @python)
+((lua_statement (script (body) @injection.content))
+ (#set! injection.language "lua"))
+
+((lua_statement (chunk) @injection.content)
+ (#set! injection.language "lua"))
+
+((ruby_statement (script (body) @injection.content))
+ (#set! injection.language "ruby"))
+
+((ruby_statement (chunk) @injection.content)
+ (#set! injection.language "ruby"))
+
+((python_statement (script (body) @injection.content))
+ (#set! injection.language "python"))
+
+((python_statement (chunk) @injection.content)
+ (#set! injection.language "python"))
+
 ;; If we support perl at some point...
-;; (perl_statement (script (body) @perl))
-;; (perl_statement (chunk) @perl)
+;; ((perl_statement (script (body) @injection.content))
+;;  (#set! injection.language "perl"))
+;; ((perl_statement (chunk) @injection.content)
+;;  (#set! injection.language "perl"))
 
-(autocmd_statement (pattern) @regex)
+((autocmd_statement (pattern) @injection.content)
+ (#set! injection.language "regex"))
 
 ((set_item
    option: (option_name) @_option
-   value: (set_value) @vim)
+   value: (set_value) @injection.content)
   (#any-of? @_option
     "includeexpr" "inex"
     "printexpr" "pexpr"
@@ -22,7 +37,12 @@
     "foldexpr" "fde"
     "diffexpr" "dex"
     "patchexpr" "pex"
-    "charconvert" "ccv"))
+    "charconvert" "ccv")
+  (#set! injection.language "vim"))
+
+
+; ((comment) @injection.content
+;  (#set! injection.language "comment"))
 
-; (comment) @comment
-; (line_continuation_comment) @comment
+; ((line_continuation_comment) @injection.content
+;  (#set! injection.language "comment"))
-- 
cgit 


From 276b647fdba07bf1762d8dd371c4b655b8a418df Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 8 Mar 2023 17:22:28 +0000
Subject: refactor(treesitter): delegate region calculation to treesitter
 (#22553)

---
 runtime/doc/treesitter.txt                  |  10 +-
 runtime/lua/vim/treesitter/_meta.lua        |   7 +-
 runtime/lua/vim/treesitter/_range.lua       |  28 +-
 runtime/lua/vim/treesitter/languagetree.lua | 410 +++++++++++++++++-----------
 runtime/lua/vim/treesitter/query.lua        |   1 +
 5 files changed, 280 insertions(+), 176 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 3b0936941f..c7a0e1927b 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1037,6 +1037,9 @@ LanguageTree:included_regions({self})        *LanguageTree:included_regions()*
     Parameters: ~
       • {self}
 
+    Return: ~
+        integer[][]
+
 LanguageTree:invalidate({self}, {reload})          *LanguageTree:invalidate()*
     Invalidates this parser and all its children
 
@@ -1044,12 +1047,17 @@ LanguageTree:invalidate({self}, {reload})          *LanguageTree:invalidate()*
       • {reload}  (boolean|nil)
       • {self}
 
-LanguageTree:is_valid({self})                        *LanguageTree:is_valid()*
+                                                     *LanguageTree:is_valid()*
+LanguageTree:is_valid({self}, {exclude_children})
     Determines whether this tree is valid. If the tree is invalid, call `parse()` . This will return the updated tree.
 
     Parameters: ~
+      • {exclude_children}  (boolean|nil)
       • {self}
 
+    Return: ~
+        (boolean)
+
 LanguageTree:lang({self})                                *LanguageTree:lang()*
     Gets the language of this tree node.
 
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index ad0854706b..72823ccf26 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -3,7 +3,7 @@
 ---@class TSNode
 ---@field id fun(self: TSNode): integer
 ---@field tree fun(self: TSNode): TSTree
----@field range fun(self: TSNode): integer, integer, integer, integer
+---@field range fun(self: TSNode, include_bytes: boolean?): integer, integer, integer, integer, integer, integer
 ---@field start fun(self: TSNode): integer, integer, integer
 ---@field end_ fun(self: TSNode): integer, integer, integer
 ---@field type fun(self: TSNode): string
@@ -43,9 +43,9 @@ function TSNode:_rawquery(query, captures, start, end_) end
 function TSNode:_rawquery(query, captures, start, end_) end
 
 ---@class TSParser
----@field parse fun(self: TSParser, tree, source: integer|string): TSTree, Range4[]
+---@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: boolean?): TSTree, integer[]
 ---@field reset fun(self: TSParser)
----@field included_ranges fun(self: TSParser): Range4[]
+---@field included_ranges fun(self: TSParser, include_bytes: boolean?): integer[]
 ---@field set_included_ranges fun(self: TSParser, ranges: Range6[])
 ---@field set_timeout fun(self: TSParser, timeout: integer)
 ---@field timeout fun(self: TSParser): integer
@@ -54,6 +54,7 @@ function TSNode:_rawquery(query, captures, start, end_) end
 ---@field root fun(self: TSTree): TSNode
 ---@field edit fun(self: TSTree, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _:integer)
 ---@field copy fun(self: TSTree): TSTree
+---@field included_ranges fun(self: TSTree, include_bytes: boolean?): integer[]
 
 ---@return integer
 vim._ts_get_language_version = function() end
diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index bec24a23a5..21e46a560a 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -78,11 +78,8 @@ end
 ---@param r2 Range4|Range6
 ---@return boolean
 function M.intercepts(r1, r2)
-  local off_1 = #r1 == 6 and 1 or 0
-  local off_2 = #r1 == 6 and 1 or 0
-
-  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r1[2], r1[3 + off_1], r1[4 + off_1]
-  local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
+  local srow_1, scol_1, erow_1, ecol_1 = M.unpack4(r1)
+  local srow_2, scol_2, erow_2, ecol_2 = M.unpack4(r2)
 
   -- r1 is above r2
   if M.cmp_pos.le(erow_1, ecol_1, srow_2, scol_2) then
@@ -97,16 +94,21 @@ function M.intercepts(r1, r2)
   return true
 end
 
+---@private
+---@param r Range4|Range6
+---@return integer, integer, integer, integer
+function M.unpack4(r)
+  local off_1 = #r == 6 and 1 or 0
+  return r[1], r[2], r[3 + off_1], r[4 + off_1]
+end
+
 ---@private
 ---@param r1 Range4|Range6
 ---@param r2 Range4|Range6
 ---@return boolean whether r1 contains r2
 function M.contains(r1, r2)
-  local off_1 = #r1 == 6 and 1 or 0
-  local off_2 = #r1 == 6 and 1 or 0
-
-  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r1[2], r1[3 + off_1], r1[4 + off_1]
-  local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
+  local srow_1, scol_1, erow_1, ecol_1 = M.unpack4(r1)
+  local srow_2, scol_2, erow_2, ecol_2 = M.unpack4(r2)
 
   -- start doesn't fit
   if M.cmp_pos.gt(srow_1, scol_1, srow_2, scol_2) then
@@ -123,9 +125,13 @@ end
 
 ---@private
 ---@param source integer|string
----@param range Range4
+---@param range Range4|Range6
 ---@return Range6
 function M.add_bytes(source, range)
+  if type(range) == 'table' and #range == 6 then
+    return range --[[@as Range6]]
+  end
+
   local start_row, start_col, end_row, end_col = range[1], range[2], range[3], range[4]
   local start_byte = 0
   local end_byte = 0
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index fbc602486b..57a60bf774 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -57,13 +57,13 @@ local Range = require('vim.treesitter._range')
 ---@field private _injection_query Query Queries defining injected languages
 ---@field private _opts table Options
 ---@field private _parser TSParser Parser for language
----@field private _regions Range6[][] List of regions this tree should manage and parse
+---@field private _regions Range6[][]?
+---List of regions this tree should manage and parse. If nil then regions are
+---taken from _trees. This is mostly a short-lived cache for included_regions()
 ---@field private _lang string Language name
 ---@field private _source (integer|string) Buffer or string to parse
 ---@field private _trees TSTree[] Reference to parsed tree (one for each language)
 ---@field private _valid boolean|table<integer,boolean> If the parsed tree is valid
---- TODO(lewis6991): combine _regions, _valid and _trees
----@field private _is_child boolean
 local LanguageTree = {}
 
 ---@class LanguageTreeOpts
@@ -98,7 +98,6 @@ function LanguageTree.new(source, lang, opts)
     _source = source,
     _lang = lang,
     _children = {},
-    _regions = {},
     _trees = {},
     _opts = opts,
     _injection_query = injections[lang] and query.parse_query(lang, injections[lang])
@@ -117,6 +116,48 @@ function LanguageTree.new(source, lang, opts)
   return self
 end
 
+---@private
+---Measure execution time of a function
+---@generic R1, R2, R3
+---@param f fun(): R1, R2, R2
+---@return integer, R1, R2, R3
+local function tcall(f, ...)
+  local start = vim.loop.hrtime()
+  ---@diagnostic disable-next-line
+  local r = { f(...) }
+  local duration = (vim.loop.hrtime() - start) / 1000000
+  return duration, unpack(r)
+end
+
+---@private
+---@vararg any
+function LanguageTree:_log(...)
+  if vim.g.__ts_debug == nil then
+    return
+  end
+
+  local args = { ... }
+  if type(args[1]) == 'function' then
+    args = { args[1]() }
+  end
+
+  local info = debug.getinfo(2, 'nl')
+  local nregions = #self:included_regions()
+  local prefix =
+    string.format('%s:%d: [%s:%d] ', info.name, info.currentline, self:lang(), nregions)
+
+  a.nvim_out_write(prefix)
+  for _, x in ipairs(args) do
+    if type(x) == 'string' then
+      a.nvim_out_write(x)
+    else
+      a.nvim_out_write(vim.inspect(x, { newline = ' ', indent = '' }))
+    end
+    a.nvim_out_write(' ')
+  end
+  a.nvim_out_write('\n')
+end
+
 --- Invalidates this parser and all its children
 ---@param reload boolean|nil
 function LanguageTree:invalidate(reload)
@@ -146,7 +187,9 @@ end
 --- Determines whether this tree is valid.
 --- If the tree is invalid, call `parse()`.
 --- This will return the updated tree.
-function LanguageTree:is_valid()
+---@param exclude_children boolean|nil
+---@return boolean
+function LanguageTree:is_valid(exclude_children)
   local valid = self._valid
 
   if type(valid) == 'table' then
@@ -155,9 +198,18 @@ function LanguageTree:is_valid()
         return false
       end
     end
-    return true
   end
 
+  if not exclude_children then
+    for _, child in pairs(self._children) do
+      if not child:is_valid(exclude_children) then
+        return false
+      end
+    end
+  end
+
+  assert(type(valid) == 'boolean')
+
   return valid
 end
 
@@ -171,16 +223,6 @@ function LanguageTree:source()
   return self._source
 end
 
----@private
----This is only exposed so it can be wrapped for profiling
----@param old_tree TSTree
----@return TSTree, integer[]
-function LanguageTree:_parse_tree(old_tree)
-  local tree, tree_changes = self._parser:parse(old_tree, self._source)
-  self:_do_callback('changedtree', tree_changes, tree)
-  return tree, tree_changes
-end
-
 --- Parses all defined regions using a treesitter parser
 --- for the language this tree represents.
 --- This will run the injection query for this language to
@@ -190,31 +232,39 @@ end
 ---@return table|nil Change list
 function LanguageTree:parse()
   if self:is_valid() then
+    self:_log('valid')
     return self._trees
   end
 
   local changes = {}
 
-  -- If there are no ranges, set to an empty list
-  -- so the included ranges in the parser are cleared.
-  if #self._regions > 0 then
-    for i, ranges in ipairs(self._regions) do
+  -- Collect some stats
+  local regions_parsed = 0
+  local total_parse_time = 0
+
+  --- At least 1 region is invalid
+  if not self:is_valid(true) then
+    -- If there are no ranges, set to an empty list
+    -- so the included ranges in the parser are cleared.
+    for i, ranges in ipairs(self:included_regions()) do
       if not self._valid or not self._valid[i] then
         self._parser:set_included_ranges(ranges)
-        local tree, tree_changes = self:_parse_tree(self._trees[i])
+        local parse_time, tree, tree_changes =
+          tcall(self._parser.parse, self._parser, self._trees[i], self._source)
+
+        self:_do_callback('changedtree', tree_changes, tree)
         self._trees[i] = tree
         vim.list_extend(changes, tree_changes)
+
+        total_parse_time = total_parse_time + parse_time
+        regions_parsed = regions_parsed + 1
       end
     end
-  else
-    local tree, tree_changes = self:_parse_tree(self._trees[1])
-    self._trees = { tree }
-    changes = tree_changes
   end
 
-  local injections_by_lang = self:_get_injections()
   local seen_langs = {} ---@type table<string,boolean>
 
+  local query_time, injections_by_lang = tcall(self._get_injections, self)
   for lang, injection_ranges in pairs(injections_by_lang) do
     local has_lang = pcall(language.add, lang)
 
@@ -229,15 +279,6 @@ function LanguageTree:parse()
       end
 
       child:set_included_regions(injection_ranges)
-
-      local _, child_changes = child:parse()
-
-      -- Propagate any child changes so they are included in the
-      -- the change list for the callback.
-      if child_changes then
-        vim.list_extend(changes, child_changes)
-      end
-
       seen_langs[lang] = true
     end
   end
@@ -248,6 +289,23 @@ function LanguageTree:parse()
     end
   end
 
+  self:_log({
+    changes = changes,
+    regions_parsed = regions_parsed,
+    parse_time = total_parse_time,
+    query_time = query_time,
+  })
+
+  self:for_each_child(function(child)
+    local _, child_changes = child:parse()
+
+    -- Propagate any child changes so they are included in the
+    -- the change list for the callback.
+    if child_changes then
+      vim.list_extend(changes, child_changes)
+    end
+  end)
+
   self._valid = true
 
   return self._trees, changes
@@ -295,8 +353,6 @@ function LanguageTree:add_child(lang)
   end
 
   self._children[lang] = LanguageTree.new(self._source, lang, self._opts)
-  self._children[lang]._is_child = true
-
   self:invalidate()
   self:_do_callback('child_added', self._children[lang])
 
@@ -331,6 +387,53 @@ function LanguageTree:destroy()
   end
 end
 
+---@private
+---@param region Range6[]
+local function region_tostr(region)
+  local srow, scol = region[1][1], region[1][2]
+  local erow, ecol = region[#region][4], region[#region][5]
+  return string.format('[%d:%d-%d:%d]', srow, scol, erow, ecol)
+end
+
+---@private
+---Sets self._valid properly and efficiently
+---@param fn fun(index: integer, region: Range6[]): boolean
+function LanguageTree:_validate_regions(fn)
+  if not self._valid then
+    return
+  end
+
+  if type(self._valid) ~= 'table' then
+    self._valid = {}
+  end
+
+  local all_valid = true
+
+  for i, region in ipairs(self:included_regions()) do
+    if self._valid[i] == nil then
+      self._valid[i] = true
+    end
+
+    if self._valid[i] then
+      self._valid[i] = fn(i, region)
+      if not self._valid[i] then
+        self:_log(function()
+          return 'invalidating region', i, region_tostr(region)
+        end)
+      end
+    end
+
+    if not self._valid[i] then
+      all_valid = false
+    end
+  end
+
+  -- Compress the valid value to 'true' if there are no invalid regions
+  if all_valid then
+    self._valid = all_valid
+  end
+end
+
 --- Sets the included regions that should be parsed by this |LanguageTree|.
 --- A region is a set of nodes and/or ranges that will be parsed in the same context.
 ---
@@ -357,56 +460,57 @@ function LanguageTree:set_included_regions(regions)
     end
   end
 
-  if #self._regions ~= #regions then
+  if #self:included_regions() ~= #regions then
     self._trees = {}
     self:invalidate()
-  elseif self._valid ~= false then
-    if self._valid == true then
-      self._valid = {}
-      for i = 1, #regions do
-        self._valid[i] = true
-      end
-    end
-
-    for i = 1, #regions do
-      if not vim.deep_equal(self._regions[i], regions[i]) then
-        self._valid[i] = false
-      end
-
-      if not self._valid[i] then
-        self._trees[i] = nil
-      end
-    end
+  else
+    self:_validate_regions(function(i, region)
+      return vim.deep_equal(regions[i], region)
+    end)
   end
-
   self._regions = regions
 end
 
---- Gets the set of included regions
+---Gets the set of included regions
+---@return integer[][]
 function LanguageTree:included_regions()
-  return self._regions
+  if self._regions then
+    return self._regions
+  end
+
+  if #self._trees == 0 then
+    return { {} }
+  end
+
+  local regions = {} ---@type Range6[][]
+  for i, _ in ipairs(self._trees) do
+    regions[i] = self._trees[i]:included_ranges(true)
+  end
+
+  self._regions = regions
+  return regions
 end
 
 ---@private
 ---@param node TSNode
----@param id integer
+---@param source integer|string
 ---@param metadata TSMetadata
----@return Range4
-local function get_range_from_metadata(node, id, metadata)
-  if metadata[id] and metadata[id].range then
-    return metadata[id].range --[[@as Range4]]
+---@return Range6
+local function get_range_from_metadata(node, source, metadata)
+  if metadata and metadata.range then
+    return Range.add_bytes(source, metadata.range --[[@as Range4|Range6]])
   end
-  return { node:range() }
+  return { node:range(true) }
 end
 
 ---@private
 --- TODO(lewis6991): cleanup of the node_range interface
 ---@param node TSNode
----@param id integer
+---@param source string|integer
 ---@param metadata TSMetadata
 ---@return Range4[]
-local function get_node_ranges(node, id, metadata, include_children)
-  local range = get_range_from_metadata(node, id, metadata)
+local function get_node_ranges(node, source, metadata, include_children)
+  local range = get_range_from_metadata(node, source, metadata)
 
   if include_children then
     return { range }
@@ -414,7 +518,7 @@ local function get_node_ranges(node, id, metadata, include_children)
 
   local ranges = {} ---@type Range4[]
 
-  local srow, scol, erow, ecol = range[1], range[2], range[3], range[4]
+  local srow, scol, erow, ecol = Range.unpack4(range)
 
   for i = 0, node:named_child_count() - 1 do
     local child = node:named_child(i)
@@ -498,7 +602,7 @@ function LanguageTree:_get_injection(match, metadata)
     if name == 'injection.language' then
       lang = get_node_text(node, self._source, metadata[id])
     elseif name == 'injection.content' then
-      ranges = get_node_ranges(node, id, metadata, include_children)
+      ranges = get_node_ranges(node, self._source, metadata[id], include_children)
     end
   end
 
@@ -545,7 +649,7 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
     elseif name == 'combined' then
       combined = true
     elseif name == 'content' and #ranges == 0 then
-      table.insert(ranges, get_range_from_metadata(node, id, metadata))
+      table.insert(ranges, get_range_from_metadata(node, self._source, metadata[id]))
       -- Ignore any tags that start with "_"
       -- Allows for other tags to be used in matches
     elseif string.sub(name, 1, 1) ~= '_' then
@@ -554,7 +658,7 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
       end
 
       if #ranges == 0 then
-        table.insert(ranges, get_range_from_metadata(node, id, metadata))
+        table.insert(ranges, get_range_from_metadata(node, self._source, metadata[id]))
       end
     end
   end
@@ -569,7 +673,7 @@ end
 --- TODO: Allow for an offset predicate to tailor the injection range
 ---       instead of using the entire nodes range.
 ---@private
----@return table<string, Range4[][]>
+---@return table<string, Range6[][]>
 function LanguageTree:_get_injections()
   if not self._injection_query then
     return {}
@@ -594,7 +698,7 @@ function LanguageTree:_get_injections()
     end
   end
 
-  ---@type table<string,Range4[][]>
+  ---@type table<string,Range6[][]>
   local result = {}
 
   -- Generate a map by lang of node lists.
@@ -634,42 +738,51 @@ function LanguageTree:_do_callback(cb_name, ...)
 end
 
 ---@private
----@param regions Range6[][]
----@param old_range Range6
----@param new_range Range6
----@return table<integer,boolean> region indices to invalidate
-local function update_regions(regions, old_range, new_range)
-  ---@type table<integer,boolean>
-  local valid = {}
-
-  for i, ranges in ipairs(regions or {}) do
-    valid[i] = true
-    for j, r in ipairs(ranges) do
-      if Range.intercepts(r, old_range) then
-        valid[i] = false
-        break
-      end
+function LanguageTree:_edit(
+  start_byte,
+  end_byte_old,
+  end_byte_new,
+  start_row,
+  start_col,
+  end_row_old,
+  end_col_old,
+  end_row_new,
+  end_col_new
+)
+  for _, tree in ipairs(self._trees) do
+    tree:edit(
+      start_byte,
+      end_byte_old,
+      end_byte_new,
+      start_row,
+      start_col,
+      end_row_old,
+      end_col_old,
+      end_row_new,
+      end_col_new
+    )
+  end
+
+  self._regions = nil
+
+  local changed_range = {
+    start_row,
+    start_col,
+    start_byte,
+    end_row_old,
+    end_col_old,
+    end_byte_old,
+  }
 
-      -- Range after change. Adjust
-      if Range.cmp_pos.gt(r[1], r[2], old_range[4], old_range[5]) then
-        local byte_offset = new_range[6] - old_range[6]
-        local row_offset = new_range[4] - old_range[4]
-
-        -- Update the range to avoid invalidation in set_included_regions()
-        -- which will compare the regions against the parsed injection regions
-        ranges[j] = {
-          r[1] + row_offset,
-          r[2],
-          r[3] + byte_offset,
-          r[4] + row_offset,
-          r[5],
-          r[6] + byte_offset,
-        }
+  -- Validate regions after editing the tree
+  self:_validate_regions(function(_, region)
+    for _, r in ipairs(region) do
+      if Range.intercepts(r, changed_range) then
+        return false
       end
     end
-  end
-
-  return valid
+    return true
+  end)
 end
 
 ---@private
@@ -700,49 +813,26 @@ function LanguageTree:_on_bytes(
   local old_end_col = old_col + ((old_row == 0) and start_col or 0)
   local new_end_col = new_col + ((new_row == 0) and start_col or 0)
 
-  local old_range = {
-    start_row,
-    start_col,
-    start_byte,
-    start_row + old_row,
-    old_end_col,
-    start_byte + old_byte,
-  }
-
-  local new_range = {
+  self:_log(
+    'on_bytes',
+    bufnr,
+    changed_tick,
     start_row,
     start_col,
     start_byte,
-    start_row + new_row,
-    new_end_col,
-    start_byte + new_byte,
-  }
-
-  if #self._regions == 0 then
-    self._valid = false
-  else
-    self._valid = update_regions(self._regions, old_range, new_range)
-  end
-
-  for _, child in pairs(self._children) do
-    child:_on_bytes(
-      bufnr,
-      changed_tick,
-      start_row,
-      start_col,
-      start_byte,
-      old_row,
-      old_col,
-      old_byte,
-      new_row,
-      new_col,
-      new_byte
-    )
-  end
+    old_row,
+    old_col,
+    old_byte,
+    new_row,
+    new_col,
+    new_byte
+  )
 
   -- Edit trees together BEFORE emitting a bytes callback.
-  for _, tree in ipairs(self._trees) do
-    tree:edit(
+  ---@private
+  self:for_each_child(function(child)
+    ---@diagnostic disable-next-line:invisible
+    child:_edit(
       start_byte,
       start_byte + old_byte,
       start_byte + new_byte,
@@ -753,24 +843,22 @@ function LanguageTree:_on_bytes(
       start_row + new_row,
       new_end_col
     )
-  end
+  end, true)
 
-  if not self._is_child then
-    self:_do_callback(
-      'bytes',
-      bufnr,
-      changed_tick,
-      start_row,
-      start_col,
-      start_byte,
-      old_row,
-      old_col,
-      old_byte,
-      new_row,
-      new_col,
-      new_byte
-    )
-  end
+  self:_do_callback(
+    'bytes',
+    bufnr,
+    changed_tick,
+    start_row,
+    start_col,
+    start_byte,
+    old_row,
+    old_col,
+    old_byte,
+    new_row,
+    new_col,
+    new_byte
+  )
 end
 
 ---@private
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 59894cc7f5..e7cf42283d 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -277,6 +277,7 @@ end
 ---@return (string[]|string|nil)
 function M.get_node_text(node, source, opts)
   opts = opts or {}
+  -- TODO(lewis6991): concat only works when source is number.
   local concat = vim.F.if_nil(opts.concat, true)
   local metadata = opts.metadata or {}
 
-- 
cgit 


From b9f19d3e286d95d9209afbc479fa2eb908067fb1 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 8 Mar 2023 17:59:45 +0000
Subject: Revert "refactor(treesitter): delegate region calculation to
 treesitter" (#22575)

Revert "refactor(treesitter): delegate region calculation to treesitter (#22553)"

This reverts commit 276b647fdba07bf1762d8dd371c4b655b8a418df.
---
 runtime/doc/treesitter.txt                  |  10 +-
 runtime/lua/vim/treesitter/_meta.lua        |   7 +-
 runtime/lua/vim/treesitter/_range.lua       |  28 +-
 runtime/lua/vim/treesitter/languagetree.lua | 410 +++++++++++-----------------
 runtime/lua/vim/treesitter/query.lua        |   1 -
 5 files changed, 176 insertions(+), 280 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index c7a0e1927b..3b0936941f 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1037,9 +1037,6 @@ LanguageTree:included_regions({self})        *LanguageTree:included_regions()*
     Parameters: ~
       • {self}
 
-    Return: ~
-        integer[][]
-
 LanguageTree:invalidate({self}, {reload})          *LanguageTree:invalidate()*
     Invalidates this parser and all its children
 
@@ -1047,17 +1044,12 @@ LanguageTree:invalidate({self}, {reload})          *LanguageTree:invalidate()*
       • {reload}  (boolean|nil)
       • {self}
 
-                                                     *LanguageTree:is_valid()*
-LanguageTree:is_valid({self}, {exclude_children})
+LanguageTree:is_valid({self})                        *LanguageTree:is_valid()*
     Determines whether this tree is valid. If the tree is invalid, call `parse()` . This will return the updated tree.
 
     Parameters: ~
-      • {exclude_children}  (boolean|nil)
       • {self}
 
-    Return: ~
-        (boolean)
-
 LanguageTree:lang({self})                                *LanguageTree:lang()*
     Gets the language of this tree node.
 
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index 72823ccf26..ad0854706b 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -3,7 +3,7 @@
 ---@class TSNode
 ---@field id fun(self: TSNode): integer
 ---@field tree fun(self: TSNode): TSTree
----@field range fun(self: TSNode, include_bytes: boolean?): integer, integer, integer, integer, integer, integer
+---@field range fun(self: TSNode): integer, integer, integer, integer
 ---@field start fun(self: TSNode): integer, integer, integer
 ---@field end_ fun(self: TSNode): integer, integer, integer
 ---@field type fun(self: TSNode): string
@@ -43,9 +43,9 @@ function TSNode:_rawquery(query, captures, start, end_) end
 function TSNode:_rawquery(query, captures, start, end_) end
 
 ---@class TSParser
----@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: boolean?): TSTree, integer[]
+---@field parse fun(self: TSParser, tree, source: integer|string): TSTree, Range4[]
 ---@field reset fun(self: TSParser)
----@field included_ranges fun(self: TSParser, include_bytes: boolean?): integer[]
+---@field included_ranges fun(self: TSParser): Range4[]
 ---@field set_included_ranges fun(self: TSParser, ranges: Range6[])
 ---@field set_timeout fun(self: TSParser, timeout: integer)
 ---@field timeout fun(self: TSParser): integer
@@ -54,7 +54,6 @@ function TSNode:_rawquery(query, captures, start, end_) end
 ---@field root fun(self: TSTree): TSNode
 ---@field edit fun(self: TSTree, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _:integer)
 ---@field copy fun(self: TSTree): TSTree
----@field included_ranges fun(self: TSTree, include_bytes: boolean?): integer[]
 
 ---@return integer
 vim._ts_get_language_version = function() end
diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index 21e46a560a..bec24a23a5 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -78,8 +78,11 @@ end
 ---@param r2 Range4|Range6
 ---@return boolean
 function M.intercepts(r1, r2)
-  local srow_1, scol_1, erow_1, ecol_1 = M.unpack4(r1)
-  local srow_2, scol_2, erow_2, ecol_2 = M.unpack4(r2)
+  local off_1 = #r1 == 6 and 1 or 0
+  local off_2 = #r1 == 6 and 1 or 0
+
+  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r1[2], r1[3 + off_1], r1[4 + off_1]
+  local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
 
   -- r1 is above r2
   if M.cmp_pos.le(erow_1, ecol_1, srow_2, scol_2) then
@@ -94,21 +97,16 @@ function M.intercepts(r1, r2)
   return true
 end
 
----@private
----@param r Range4|Range6
----@return integer, integer, integer, integer
-function M.unpack4(r)
-  local off_1 = #r == 6 and 1 or 0
-  return r[1], r[2], r[3 + off_1], r[4 + off_1]
-end
-
 ---@private
 ---@param r1 Range4|Range6
 ---@param r2 Range4|Range6
 ---@return boolean whether r1 contains r2
 function M.contains(r1, r2)
-  local srow_1, scol_1, erow_1, ecol_1 = M.unpack4(r1)
-  local srow_2, scol_2, erow_2, ecol_2 = M.unpack4(r2)
+  local off_1 = #r1 == 6 and 1 or 0
+  local off_2 = #r1 == 6 and 1 or 0
+
+  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r1[2], r1[3 + off_1], r1[4 + off_1]
+  local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
 
   -- start doesn't fit
   if M.cmp_pos.gt(srow_1, scol_1, srow_2, scol_2) then
@@ -125,13 +123,9 @@ end
 
 ---@private
 ---@param source integer|string
----@param range Range4|Range6
+---@param range Range4
 ---@return Range6
 function M.add_bytes(source, range)
-  if type(range) == 'table' and #range == 6 then
-    return range --[[@as Range6]]
-  end
-
   local start_row, start_col, end_row, end_col = range[1], range[2], range[3], range[4]
   local start_byte = 0
   local end_byte = 0
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 57a60bf774..fbc602486b 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -57,13 +57,13 @@ local Range = require('vim.treesitter._range')
 ---@field private _injection_query Query Queries defining injected languages
 ---@field private _opts table Options
 ---@field private _parser TSParser Parser for language
----@field private _regions Range6[][]?
----List of regions this tree should manage and parse. If nil then regions are
----taken from _trees. This is mostly a short-lived cache for included_regions()
+---@field private _regions Range6[][] List of regions this tree should manage and parse
 ---@field private _lang string Language name
 ---@field private _source (integer|string) Buffer or string to parse
 ---@field private _trees TSTree[] Reference to parsed tree (one for each language)
 ---@field private _valid boolean|table<integer,boolean> If the parsed tree is valid
+--- TODO(lewis6991): combine _regions, _valid and _trees
+---@field private _is_child boolean
 local LanguageTree = {}
 
 ---@class LanguageTreeOpts
@@ -98,6 +98,7 @@ function LanguageTree.new(source, lang, opts)
     _source = source,
     _lang = lang,
     _children = {},
+    _regions = {},
     _trees = {},
     _opts = opts,
     _injection_query = injections[lang] and query.parse_query(lang, injections[lang])
@@ -116,48 +117,6 @@ function LanguageTree.new(source, lang, opts)
   return self
 end
 
----@private
----Measure execution time of a function
----@generic R1, R2, R3
----@param f fun(): R1, R2, R2
----@return integer, R1, R2, R3
-local function tcall(f, ...)
-  local start = vim.loop.hrtime()
-  ---@diagnostic disable-next-line
-  local r = { f(...) }
-  local duration = (vim.loop.hrtime() - start) / 1000000
-  return duration, unpack(r)
-end
-
----@private
----@vararg any
-function LanguageTree:_log(...)
-  if vim.g.__ts_debug == nil then
-    return
-  end
-
-  local args = { ... }
-  if type(args[1]) == 'function' then
-    args = { args[1]() }
-  end
-
-  local info = debug.getinfo(2, 'nl')
-  local nregions = #self:included_regions()
-  local prefix =
-    string.format('%s:%d: [%s:%d] ', info.name, info.currentline, self:lang(), nregions)
-
-  a.nvim_out_write(prefix)
-  for _, x in ipairs(args) do
-    if type(x) == 'string' then
-      a.nvim_out_write(x)
-    else
-      a.nvim_out_write(vim.inspect(x, { newline = ' ', indent = '' }))
-    end
-    a.nvim_out_write(' ')
-  end
-  a.nvim_out_write('\n')
-end
-
 --- Invalidates this parser and all its children
 ---@param reload boolean|nil
 function LanguageTree:invalidate(reload)
@@ -187,9 +146,7 @@ end
 --- Determines whether this tree is valid.
 --- If the tree is invalid, call `parse()`.
 --- This will return the updated tree.
----@param exclude_children boolean|nil
----@return boolean
-function LanguageTree:is_valid(exclude_children)
+function LanguageTree:is_valid()
   local valid = self._valid
 
   if type(valid) == 'table' then
@@ -198,18 +155,9 @@ function LanguageTree:is_valid(exclude_children)
         return false
       end
     end
+    return true
   end
 
-  if not exclude_children then
-    for _, child in pairs(self._children) do
-      if not child:is_valid(exclude_children) then
-        return false
-      end
-    end
-  end
-
-  assert(type(valid) == 'boolean')
-
   return valid
 end
 
@@ -223,6 +171,16 @@ function LanguageTree:source()
   return self._source
 end
 
+---@private
+---This is only exposed so it can be wrapped for profiling
+---@param old_tree TSTree
+---@return TSTree, integer[]
+function LanguageTree:_parse_tree(old_tree)
+  local tree, tree_changes = self._parser:parse(old_tree, self._source)
+  self:_do_callback('changedtree', tree_changes, tree)
+  return tree, tree_changes
+end
+
 --- Parses all defined regions using a treesitter parser
 --- for the language this tree represents.
 --- This will run the injection query for this language to
@@ -232,39 +190,31 @@ end
 ---@return table|nil Change list
 function LanguageTree:parse()
   if self:is_valid() then
-    self:_log('valid')
     return self._trees
   end
 
   local changes = {}
 
-  -- Collect some stats
-  local regions_parsed = 0
-  local total_parse_time = 0
-
-  --- At least 1 region is invalid
-  if not self:is_valid(true) then
-    -- If there are no ranges, set to an empty list
-    -- so the included ranges in the parser are cleared.
-    for i, ranges in ipairs(self:included_regions()) do
+  -- If there are no ranges, set to an empty list
+  -- so the included ranges in the parser are cleared.
+  if #self._regions > 0 then
+    for i, ranges in ipairs(self._regions) do
       if not self._valid or not self._valid[i] then
         self._parser:set_included_ranges(ranges)
-        local parse_time, tree, tree_changes =
-          tcall(self._parser.parse, self._parser, self._trees[i], self._source)
-
-        self:_do_callback('changedtree', tree_changes, tree)
+        local tree, tree_changes = self:_parse_tree(self._trees[i])
         self._trees[i] = tree
         vim.list_extend(changes, tree_changes)
-
-        total_parse_time = total_parse_time + parse_time
-        regions_parsed = regions_parsed + 1
       end
     end
+  else
+    local tree, tree_changes = self:_parse_tree(self._trees[1])
+    self._trees = { tree }
+    changes = tree_changes
   end
 
+  local injections_by_lang = self:_get_injections()
   local seen_langs = {} ---@type table<string,boolean>
 
-  local query_time, injections_by_lang = tcall(self._get_injections, self)
   for lang, injection_ranges in pairs(injections_by_lang) do
     local has_lang = pcall(language.add, lang)
 
@@ -279,6 +229,15 @@ function LanguageTree:parse()
       end
 
       child:set_included_regions(injection_ranges)
+
+      local _, child_changes = child:parse()
+
+      -- Propagate any child changes so they are included in the
+      -- the change list for the callback.
+      if child_changes then
+        vim.list_extend(changes, child_changes)
+      end
+
       seen_langs[lang] = true
     end
   end
@@ -289,23 +248,6 @@ function LanguageTree:parse()
     end
   end
 
-  self:_log({
-    changes = changes,
-    regions_parsed = regions_parsed,
-    parse_time = total_parse_time,
-    query_time = query_time,
-  })
-
-  self:for_each_child(function(child)
-    local _, child_changes = child:parse()
-
-    -- Propagate any child changes so they are included in the
-    -- the change list for the callback.
-    if child_changes then
-      vim.list_extend(changes, child_changes)
-    end
-  end)
-
   self._valid = true
 
   return self._trees, changes
@@ -353,6 +295,8 @@ function LanguageTree:add_child(lang)
   end
 
   self._children[lang] = LanguageTree.new(self._source, lang, self._opts)
+  self._children[lang]._is_child = true
+
   self:invalidate()
   self:_do_callback('child_added', self._children[lang])
 
@@ -387,53 +331,6 @@ function LanguageTree:destroy()
   end
 end
 
----@private
----@param region Range6[]
-local function region_tostr(region)
-  local srow, scol = region[1][1], region[1][2]
-  local erow, ecol = region[#region][4], region[#region][5]
-  return string.format('[%d:%d-%d:%d]', srow, scol, erow, ecol)
-end
-
----@private
----Sets self._valid properly and efficiently
----@param fn fun(index: integer, region: Range6[]): boolean
-function LanguageTree:_validate_regions(fn)
-  if not self._valid then
-    return
-  end
-
-  if type(self._valid) ~= 'table' then
-    self._valid = {}
-  end
-
-  local all_valid = true
-
-  for i, region in ipairs(self:included_regions()) do
-    if self._valid[i] == nil then
-      self._valid[i] = true
-    end
-
-    if self._valid[i] then
-      self._valid[i] = fn(i, region)
-      if not self._valid[i] then
-        self:_log(function()
-          return 'invalidating region', i, region_tostr(region)
-        end)
-      end
-    end
-
-    if not self._valid[i] then
-      all_valid = false
-    end
-  end
-
-  -- Compress the valid value to 'true' if there are no invalid regions
-  if all_valid then
-    self._valid = all_valid
-  end
-end
-
 --- Sets the included regions that should be parsed by this |LanguageTree|.
 --- A region is a set of nodes and/or ranges that will be parsed in the same context.
 ---
@@ -460,57 +357,56 @@ function LanguageTree:set_included_regions(regions)
     end
   end
 
-  if #self:included_regions() ~= #regions then
+  if #self._regions ~= #regions then
     self._trees = {}
     self:invalidate()
-  else
-    self:_validate_regions(function(i, region)
-      return vim.deep_equal(regions[i], region)
-    end)
-  end
-  self._regions = regions
-end
-
----Gets the set of included regions
----@return integer[][]
-function LanguageTree:included_regions()
-  if self._regions then
-    return self._regions
-  end
+  elseif self._valid ~= false then
+    if self._valid == true then
+      self._valid = {}
+      for i = 1, #regions do
+        self._valid[i] = true
+      end
+    end
 
-  if #self._trees == 0 then
-    return { {} }
-  end
+    for i = 1, #regions do
+      if not vim.deep_equal(self._regions[i], regions[i]) then
+        self._valid[i] = false
+      end
 
-  local regions = {} ---@type Range6[][]
-  for i, _ in ipairs(self._trees) do
-    regions[i] = self._trees[i]:included_ranges(true)
+      if not self._valid[i] then
+        self._trees[i] = nil
+      end
+    end
   end
 
   self._regions = regions
-  return regions
+end
+
+--- Gets the set of included regions
+function LanguageTree:included_regions()
+  return self._regions
 end
 
 ---@private
 ---@param node TSNode
----@param source integer|string
+---@param id integer
 ---@param metadata TSMetadata
----@return Range6
-local function get_range_from_metadata(node, source, metadata)
-  if metadata and metadata.range then
-    return Range.add_bytes(source, metadata.range --[[@as Range4|Range6]])
+---@return Range4
+local function get_range_from_metadata(node, id, metadata)
+  if metadata[id] and metadata[id].range then
+    return metadata[id].range --[[@as Range4]]
   end
-  return { node:range(true) }
+  return { node:range() }
 end
 
 ---@private
 --- TODO(lewis6991): cleanup of the node_range interface
 ---@param node TSNode
----@param source string|integer
+---@param id integer
 ---@param metadata TSMetadata
 ---@return Range4[]
-local function get_node_ranges(node, source, metadata, include_children)
-  local range = get_range_from_metadata(node, source, metadata)
+local function get_node_ranges(node, id, metadata, include_children)
+  local range = get_range_from_metadata(node, id, metadata)
 
   if include_children then
     return { range }
@@ -518,7 +414,7 @@ local function get_node_ranges(node, source, metadata, include_children)
 
   local ranges = {} ---@type Range4[]
 
-  local srow, scol, erow, ecol = Range.unpack4(range)
+  local srow, scol, erow, ecol = range[1], range[2], range[3], range[4]
 
   for i = 0, node:named_child_count() - 1 do
     local child = node:named_child(i)
@@ -602,7 +498,7 @@ function LanguageTree:_get_injection(match, metadata)
     if name == 'injection.language' then
       lang = get_node_text(node, self._source, metadata[id])
     elseif name == 'injection.content' then
-      ranges = get_node_ranges(node, self._source, metadata[id], include_children)
+      ranges = get_node_ranges(node, id, metadata, include_children)
     end
   end
 
@@ -649,7 +545,7 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
     elseif name == 'combined' then
       combined = true
     elseif name == 'content' and #ranges == 0 then
-      table.insert(ranges, get_range_from_metadata(node, self._source, metadata[id]))
+      table.insert(ranges, get_range_from_metadata(node, id, metadata))
       -- Ignore any tags that start with "_"
       -- Allows for other tags to be used in matches
     elseif string.sub(name, 1, 1) ~= '_' then
@@ -658,7 +554,7 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
       end
 
       if #ranges == 0 then
-        table.insert(ranges, get_range_from_metadata(node, self._source, metadata[id]))
+        table.insert(ranges, get_range_from_metadata(node, id, metadata))
       end
     end
   end
@@ -673,7 +569,7 @@ end
 --- TODO: Allow for an offset predicate to tailor the injection range
 ---       instead of using the entire nodes range.
 ---@private
----@return table<string, Range6[][]>
+---@return table<string, Range4[][]>
 function LanguageTree:_get_injections()
   if not self._injection_query then
     return {}
@@ -698,7 +594,7 @@ function LanguageTree:_get_injections()
     end
   end
 
-  ---@type table<string,Range6[][]>
+  ---@type table<string,Range4[][]>
   local result = {}
 
   -- Generate a map by lang of node lists.
@@ -738,51 +634,42 @@ function LanguageTree:_do_callback(cb_name, ...)
 end
 
 ---@private
-function LanguageTree:_edit(
-  start_byte,
-  end_byte_old,
-  end_byte_new,
-  start_row,
-  start_col,
-  end_row_old,
-  end_col_old,
-  end_row_new,
-  end_col_new
-)
-  for _, tree in ipairs(self._trees) do
-    tree:edit(
-      start_byte,
-      end_byte_old,
-      end_byte_new,
-      start_row,
-      start_col,
-      end_row_old,
-      end_col_old,
-      end_row_new,
-      end_col_new
-    )
-  end
-
-  self._regions = nil
-
-  local changed_range = {
-    start_row,
-    start_col,
-    start_byte,
-    end_row_old,
-    end_col_old,
-    end_byte_old,
-  }
+---@param regions Range6[][]
+---@param old_range Range6
+---@param new_range Range6
+---@return table<integer,boolean> region indices to invalidate
+local function update_regions(regions, old_range, new_range)
+  ---@type table<integer,boolean>
+  local valid = {}
+
+  for i, ranges in ipairs(regions or {}) do
+    valid[i] = true
+    for j, r in ipairs(ranges) do
+      if Range.intercepts(r, old_range) then
+        valid[i] = false
+        break
+      end
 
-  -- Validate regions after editing the tree
-  self:_validate_regions(function(_, region)
-    for _, r in ipairs(region) do
-      if Range.intercepts(r, changed_range) then
-        return false
+      -- Range after change. Adjust
+      if Range.cmp_pos.gt(r[1], r[2], old_range[4], old_range[5]) then
+        local byte_offset = new_range[6] - old_range[6]
+        local row_offset = new_range[4] - old_range[4]
+
+        -- Update the range to avoid invalidation in set_included_regions()
+        -- which will compare the regions against the parsed injection regions
+        ranges[j] = {
+          r[1] + row_offset,
+          r[2],
+          r[3] + byte_offset,
+          r[4] + row_offset,
+          r[5],
+          r[6] + byte_offset,
+        }
       end
     end
-    return true
-  end)
+  end
+
+  return valid
 end
 
 ---@private
@@ -813,26 +700,49 @@ function LanguageTree:_on_bytes(
   local old_end_col = old_col + ((old_row == 0) and start_col or 0)
   local new_end_col = new_col + ((new_row == 0) and start_col or 0)
 
-  self:_log(
-    'on_bytes',
-    bufnr,
-    changed_tick,
+  local old_range = {
+    start_row,
+    start_col,
+    start_byte,
+    start_row + old_row,
+    old_end_col,
+    start_byte + old_byte,
+  }
+
+  local new_range = {
     start_row,
     start_col,
     start_byte,
-    old_row,
-    old_col,
-    old_byte,
-    new_row,
-    new_col,
-    new_byte
-  )
+    start_row + new_row,
+    new_end_col,
+    start_byte + new_byte,
+  }
+
+  if #self._regions == 0 then
+    self._valid = false
+  else
+    self._valid = update_regions(self._regions, old_range, new_range)
+  end
+
+  for _, child in pairs(self._children) do
+    child:_on_bytes(
+      bufnr,
+      changed_tick,
+      start_row,
+      start_col,
+      start_byte,
+      old_row,
+      old_col,
+      old_byte,
+      new_row,
+      new_col,
+      new_byte
+    )
+  end
 
   -- Edit trees together BEFORE emitting a bytes callback.
-  ---@private
-  self:for_each_child(function(child)
-    ---@diagnostic disable-next-line:invisible
-    child:_edit(
+  for _, tree in ipairs(self._trees) do
+    tree:edit(
       start_byte,
       start_byte + old_byte,
       start_byte + new_byte,
@@ -843,22 +753,24 @@ function LanguageTree:_on_bytes(
       start_row + new_row,
       new_end_col
     )
-  end, true)
+  end
 
-  self:_do_callback(
-    'bytes',
-    bufnr,
-    changed_tick,
-    start_row,
-    start_col,
-    start_byte,
-    old_row,
-    old_col,
-    old_byte,
-    new_row,
-    new_col,
-    new_byte
-  )
+  if not self._is_child then
+    self:_do_callback(
+      'bytes',
+      bufnr,
+      changed_tick,
+      start_row,
+      start_col,
+      start_byte,
+      old_row,
+      old_col,
+      old_byte,
+      new_row,
+      new_col,
+      new_byte
+    )
+  end
 end
 
 ---@private
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index e7cf42283d..59894cc7f5 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -277,7 +277,6 @@ end
 ---@return (string[]|string|nil)
 function M.get_node_text(node, source, opts)
   opts = opts or {}
-  -- TODO(lewis6991): concat only works when source is number.
   local concat = vim.F.if_nil(opts.concat, true)
   local metadata = opts.metadata or {}
 
-- 
cgit 


From 6dd9770baf16abfedba667e93d92899602864645 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 8 Mar 2023 18:19:10 -0500
Subject: vim-patch:9.0.1394: Unx Tal files are not recognized (#22579)

Problem:    Unx Tal files are not recognized.
Solution:   Add a pattern for Unx Tal files. (Amaan Qureshi, closes vim/vim#12117)

https://github.com/vim/vim/commit/cde1f8714ed2c046aa770c46229e781380122bd7
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 65579d3543..33324f580a 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1015,6 +1015,7 @@ local extension = {
   svh = 'systemverilog',
   sv = 'systemverilog',
   tak = 'tak',
+  tal = 'tal',
   task = 'taskedit',
   tm = 'tcl',
   tcl = 'tcl',
-- 
cgit 


From ae70e946eeaec792c9a87a89fea7141b5ee6a33c Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 8 Mar 2023 18:19:18 -0500
Subject: vim-patch:9.0.1395: Odin files are not recognized (#22580)

Problem:    Odin files are not recognized.
Solution:   Add a pattern for Odin files. (Amaan Qureshi, closes vim/vim#12122)

https://github.com/vim/vim/commit/638388b8ef37684e36a7f5d9286bab2d31c28f36
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 33324f580a..8238fec2cc 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -751,6 +751,7 @@ local extension = {
   mli = 'ocaml',
   ml = 'ocaml',
   occ = 'occam',
+  odin = 'odin',
   xom = 'omnimark',
   xin = 'omnimark',
   opam = 'opam',
-- 
cgit 


From be0461e3c216c2e4e2c3397c739b7727a5bf6df8 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 8 Mar 2023 23:45:43 +0000
Subject: fix(treesitter): is_in_node_range (#22582)

TS ranges are end column exclusive, so fix is_in_node_range
to account for that.
---
 runtime/lua/vim/treesitter.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index d13824076e..ab9f8968c8 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -191,7 +191,7 @@ end
 ---
 ---@return boolean True if the position is in node range
 function M.is_in_node_range(node, line, col)
-  return M.node_contains(node, { line, col, line, col })
+  return M.node_contains(node, { line, col, line, col + 1 })
 end
 
 --- Determines if a node contains a range
@@ -202,7 +202,8 @@ end
 ---@return boolean True if the {node} contains the {range}
 function M.node_contains(node, range)
   vim.validate({
-    node = { node, 'userdata' },
+    -- allow a table so nodes can be mocked
+    node = { node, { 'userdata', 'table' } },
     range = { range, Range.validate, 'integer list with 4 or 6 elements' },
   })
   return Range.contains({ node:range() }, range)
-- 
cgit 


From 89a525de9f2551e460cc91d40fd7afbb7e07622f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Mar 2023 10:19:00 +0800
Subject: fix(buffer_updates): save and restore current window cursor (#16732)

When a buffer update callback is called, textlock is active so buffer
text cannot be changed, but cursor can still be moved. This can cause
problems when the buffer update is in the middle of an operator, like
the one mentioned in #16729. The solution is to save cursor position and
restore it afterwards, like how cursor is saved and restored when
evaluating an <expr> mapping.
---
 runtime/doc/api.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 3ca50dda15..2930f2314b 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -356,6 +356,7 @@ In-process Lua plugins can receive buffer updates in the form of Lua
 callbacks. These callbacks are called frequently in various contexts;
 |textlock| prevents changing buffer contents and window layout (use
 |vim.schedule()| to defer such operations to the main loop instead).
+Moving the cursor is allowed, but it is restored afterwards.
 
 |nvim_buf_attach()| will take keyword args for the callbacks. "on_lines" will
 receive parameters ("lines", {buf}, {changedtick}, {firstline}, {lastline},
-- 
cgit 


From e17581fa5342c7396385456faa37e78105994ed2 Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Thu, 9 Mar 2023 11:54:39 +0200
Subject: docs: add missing highlight groups for floats

---
 runtime/doc/api.txt      | 4 ++++
 runtime/doc/syntax.txt   | 4 ++++
 runtime/doc/vim_diff.txt | 2 ++
 3 files changed, 10 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 2930f2314b..0e1cf9ec3e 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -452,6 +452,10 @@ Buffer text can be highlighted by typical mechanisms (syntax highlighting,
 options from the current window; specify `style=minimal` in |nvim_open_win()|
 to disable various visual features such as the 'number' column.
 
+Other highlight groups specific to floating windows:
+- |hl-FloatBorder| for window's border
+- |hl-FloatTitle| for window's title
+
 Currently, floating windows don't support some widgets like scrollbar.
 
 The output of |:mksession| does not include commands for restoring floating
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 68d059be82..b22d673eb9 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -5268,6 +5268,10 @@ NonText		'@' at the end of the window, characters from 'showbreak'
 Normal		Normal text.
 							*hl-NormalFloat*
 NormalFloat	Normal text in floating windows.
+							*hl-FloatBorder*
+FloatBorder	Border of floating windows.
+							*hl-FloatTitle*
+FloatTitle	Title of floating windows.
 							*hl-NormalNC*
 NormalNC	Normal text in non-current windows.
 							*hl-Pmenu*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 5efe094226..2305f101e2 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -243,6 +243,8 @@ Highlight groups:
   |highlight-blend| controls blend level for a highlight group
   |expr-highlight| highlight groups (prefixed with "Nvim")
   |hl-NormalFloat| highlights floating window
+  |hl-FloatBorder| highlights border of a floating window
+  |hl-FloatTitle| highlights title of a floating window
   |hl-NormalNC| highlights non-current windows
   |hl-MsgArea| highlights messages/cmdline area
   |hl-MsgSeparator| highlights separator for scrolled messages
-- 
cgit 


From ce0fddf5ae334f0c79dcd95b379999e11df1486b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 9 Mar 2023 08:07:36 -0500
Subject: feat: try to recover from missing tempdir #22573

Problem:
If vim_tempdir mysteriously goes missing (typically by "antivirus" on
Windows), any plugins using tempname() will be broken for the rest of
the session. #1432 #9833 https://groups.google.com/g/vim_use/c/ef55jNm5czI
Steps:
    mkdir foo
    TMPDIR=./foo nvim
    :echo tempname()
    !rm -r foo
    :echo tempname()
    tempname() still uses the foo path even though it was deleted.

Solution:
- Don't assume that vim_tempdir exists.
- If it goes missing once, retry vim_mktempdir and log (silently) an error.
- If it goes missing again, retry vim_mktempdir and show an error.

Rejected in Vim for performance reasons:
  https://groups.google.com/g/vim_use/c/qgRob9SWDv8/m/FAOFVVcDTv0J
  https://groups.google.com/g/vim_dev/c/cogp-Vye4oo/m/d_SVFXBbnnoJ
But, logging shows that `vim_gettempdir` is not called frequently.

Fixes #1432
Fixes #9833
Fixes #11250
Related: stdpath("run") f50135a32e11c535e1dc3a8e9460c5b4e640ee86
---
 runtime/doc/builtin.txt  |  8 +++-----
 runtime/doc/change.txt   | 29 ++++++++++++++++++++---------
 runtime/doc/starting.txt |  2 +-
 runtime/doc/vim_diff.txt |  1 +
 4 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index b0b7809e8c..5e918a19f4 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -8688,13 +8688,11 @@ taglist({expr} [, {filename}])				*taglist()*
 			GetTagpattern()->taglist()
 
 tempname()					*tempname()* *temp-file-name*
-		The result is a String, which is the name of a file that
-		doesn't exist.  It can be used for a temporary file.  Example: >
+		Generates a (non-existent) filename located in the Nvim root
+		|tempdir|. Scripts can use the filename as a temporary file.
+		Example: >
 			:let tmpfile = tempname()
 			:exe "redir > " .. tmpfile
-<		For Unix, the file will be in a private directory |tempfile|.
-		For MS-Windows forward slashes are used when the 'shellslash'
-		option is set or when 'shellcmdflag' starts with '-'.
 
 termopen({cmd} [, {opts}])			*termopen()*
 		Spawns {cmd} in a new pseudo-terminal session connected
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 2cebd8abdd..3706612d52 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -576,18 +576,29 @@ with ".".  Vim does not recognize a comment (starting with '"') after the
 {Visual}=		Filter the highlighted lines like with ={motion}.
 
 
-						*tempfile* *setuid*
-Vim uses temporary files for filtering, generating diffs and also for
-tempname().  For Unix, the file will be in a private directory (only
-accessible by the current user) to avoid security problems (e.g., a symlink
-attack or other people reading your file).  When Vim exits the directory and
-all files in it are deleted.  When Vim has the setuid bit set this may cause
-problems, the temp file is owned by the setuid user but the filter command
-probably runs as the original user.
-Directory for temporary files is created in the first possible directory of:
+						*tempdir* *tempfile* *setuid*
+Nvim uses temporary files for filtering and generating diffs. Plugins also
+commonly use |tempname()| for their own purposes. On the first request for
+a temporary file, Nvim creates a common directory (the "Nvim tempdir"), to
+serve as storage for all temporary files (including `stdpath("run")` files
+|$XDG_RUNTIME_DIR|) in the current session.
+
+The Nvim tempdir is created in the first available system tempdir:
 	Unix:    $TMPDIR, /tmp, current-dir, $HOME.
 	Windows: $TMPDIR, $TMP, $TEMP, $USERPROFILE, current-dir.
 
+On unix the tempdir is created with permissions 0700 (only accessible by the
+current user) to avoid security problems (e.g. symlink attacks).  On exit,
+Nvim deletes the tempdir and its contents.
+							*E5431*
+If you see an error or |log| message like: >
+	E5431: tempdir disappeared (2 times)
+this means an external process on your system deleted the Nvim tempdir.
+Typically this is caused by "antivirus" or a misconfigured cleanup service.
+
+If Nvim has the setuid bit set this may cause problems: the temp file
+is owned by the setuid user but the filter command probably runs as the
+original user.
 
 
 4.2 Substitute						*:substitute*
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 8c9ec7df9c..801ea77b7f 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1397,7 +1397,7 @@ Note: Similarly to the $XDG environment variables, when
 `$XDG_CONFIG_HOME/nvim` is mentionned, it should be understood as
 `$XDG_CONFIG_HOME/$NVIM_APPNAME`.
 
-LOG FILE					*$NVIM_LOG_FILE* *E5430*
+LOG FILE					*log* *$NVIM_LOG_FILE* *E5430*
 Besides 'debug' and 'verbose', Nvim keeps a general log file for internal
 debugging, plugins and RPC clients. >
 	:echo $NVIM_LOG_FILE
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 2305f101e2..21736059c4 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -237,6 +237,7 @@ Functions:
   |stdpath()|
   |system()|, |systemlist()| can run {cmd} directly (without 'shell')
   |matchadd()| can be called before highlight group is defined
+  |tempname()| tries to recover if the Nvim |tempdir| disappears.
   |writefile()| with "p" flag creates parent directories.
 
 Highlight groups:
-- 
cgit 


From 9ef7297ef142354ace8b1f3f277d0eee3cfdc6d4 Mon Sep 17 00:00:00 2001
From: Michal Liszcz <liszcz.michal@gmail.com>
Date: Thu, 9 Mar 2023 15:12:56 +0100
Subject: feat(lsp): overwrite omnifunc/tagfunc set by ftplugin #22267

Problem:
Some built-in ftplugins set omnifunc/tagfunc/formatexpr which causes
lsp.lua:set_defaults() to skip setup of defaults for those filetypes.
For example the C++ ftplugin has:
    omnifunc=ccomplete#Complete
          Last set from /usr/share/nvim/runtime/ftplugin/c.vim line 30
so the changes done in #95c65a6b221fe6e1cf91e8322e7d7571dc511a71
will always be skipped for C++ files.

Solution:
Overwrite omnifunc/tagfunc/formatexpr options that were set by stock
ftplugin.

Fixes #21001
---
 runtime/doc/lsp.txt     |  7 +++++--
 runtime/lua/vim/lsp.lua | 32 ++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index b73e2958ef..b21ef9d7d3 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -51,8 +51,11 @@ Starting a LSP client will automatically report diagnostics via
 |vim.diagnostic|. Read |vim.diagnostic.config()| to learn how to customize the
 display.
 
-It also sets some buffer options if the options are otherwise empty and if the
-language server supports the functionality.
+It also sets some buffer options if the language server supports the
+functionality and if the options are otherwise empty or have the default
+values set by Nvim runtime files (e.g. a ftplugin). In the latter case,
+the default values are not restored when the LSP client is detached from
+the buffer.
 
 - 'omnifunc' is set to |vim.lsp.omnifunc()|. This allows to trigger completion
   using |i_CTRL-X_CTRL-O|
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 9a0b3f3100..cb77e9636f 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1112,19 +1112,43 @@ function lsp.start_client(config)
     end
   end
 
+  ---@private
+  -- Determines whether the given option can be set by `set_defaults`.
+  local function is_empty_or_default(bufnr, option)
+    if vim.bo[bufnr][option] == '' then
+      return true
+    end
+
+    local old_bufnr = vim.fn.bufnr('')
+    local last_set_from = vim.fn.gettext('\n\tLast set from ')
+    local line = vim.fn.gettext(' line ')
+
+    vim.cmd.buffer(bufnr)
+    local scriptname = vim.fn
+      .execute('verbose set ' .. option .. '?')
+      :match(last_set_from .. '(.*)' .. line .. '%d+')
+    vim.cmd.buffer(old_bufnr)
+
+    if not scriptname then
+      return false
+    end
+    local vimruntime = vim.fn.getenv('VIMRUNTIME')
+    return vim.startswith(vim.fn.expand(scriptname), vim.fn.expand(vimruntime))
+  end
+
   ---@private
   local function set_defaults(client, bufnr)
     local capabilities = client.server_capabilities
-    if capabilities.definitionProvider and vim.bo[bufnr].tagfunc == '' then
+    if capabilities.definitionProvider and is_empty_or_default(bufnr, 'tagfunc') then
       vim.bo[bufnr].tagfunc = 'v:lua.vim.lsp.tagfunc'
     end
-    if capabilities.completionProvider and vim.bo[bufnr].omnifunc == '' then
+    if capabilities.completionProvider and is_empty_or_default(bufnr, 'omnifunc') then
       vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc'
     end
     if
       capabilities.documentRangeFormattingProvider
-      and vim.bo[bufnr].formatprg == ''
-      and vim.bo[bufnr].formatexpr == ''
+      and is_empty_or_default(bufnr, 'formatprg')
+      and is_empty_or_default(bufnr, 'formatexpr')
     then
       vim.bo[bufnr].formatexpr = 'v:lua.vim.lsp.formatexpr()'
     end
-- 
cgit 


From ae263aff9547b8b513c4fedaceb4cbf93c57b866 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 9 Mar 2023 16:09:39 +0000
Subject: refactor(treesitter): use byte ranges from treesitter (#22589)

---
 runtime/doc/treesitter.txt                  |  10 +-
 runtime/lua/vim/treesitter/_meta.lua        |   7 +-
 runtime/lua/vim/treesitter/_range.lua       |  35 ++-
 runtime/lua/vim/treesitter/languagetree.lua | 440 +++++++++++++++++-----------
 runtime/lua/vim/treesitter/query.lua        |   1 +
 5 files changed, 314 insertions(+), 179 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 3b0936941f..c7a0e1927b 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1037,6 +1037,9 @@ LanguageTree:included_regions({self})        *LanguageTree:included_regions()*
     Parameters: ~
       • {self}
 
+    Return: ~
+        integer[][]
+
 LanguageTree:invalidate({self}, {reload})          *LanguageTree:invalidate()*
     Invalidates this parser and all its children
 
@@ -1044,12 +1047,17 @@ LanguageTree:invalidate({self}, {reload})          *LanguageTree:invalidate()*
       • {reload}  (boolean|nil)
       • {self}
 
-LanguageTree:is_valid({self})                        *LanguageTree:is_valid()*
+                                                     *LanguageTree:is_valid()*
+LanguageTree:is_valid({self}, {exclude_children})
     Determines whether this tree is valid. If the tree is invalid, call `parse()` . This will return the updated tree.
 
     Parameters: ~
+      • {exclude_children}  (boolean|nil)
       • {self}
 
+    Return: ~
+        (boolean)
+
 LanguageTree:lang({self})                                *LanguageTree:lang()*
     Gets the language of this tree node.
 
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index ad0854706b..72823ccf26 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -3,7 +3,7 @@
 ---@class TSNode
 ---@field id fun(self: TSNode): integer
 ---@field tree fun(self: TSNode): TSTree
----@field range fun(self: TSNode): integer, integer, integer, integer
+---@field range fun(self: TSNode, include_bytes: boolean?): integer, integer, integer, integer, integer, integer
 ---@field start fun(self: TSNode): integer, integer, integer
 ---@field end_ fun(self: TSNode): integer, integer, integer
 ---@field type fun(self: TSNode): string
@@ -43,9 +43,9 @@ function TSNode:_rawquery(query, captures, start, end_) end
 function TSNode:_rawquery(query, captures, start, end_) end
 
 ---@class TSParser
----@field parse fun(self: TSParser, tree, source: integer|string): TSTree, Range4[]
+---@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: boolean?): TSTree, integer[]
 ---@field reset fun(self: TSParser)
----@field included_ranges fun(self: TSParser): Range4[]
+---@field included_ranges fun(self: TSParser, include_bytes: boolean?): integer[]
 ---@field set_included_ranges fun(self: TSParser, ranges: Range6[])
 ---@field set_timeout fun(self: TSParser, timeout: integer)
 ---@field timeout fun(self: TSParser): integer
@@ -54,6 +54,7 @@ function TSNode:_rawquery(query, captures, start, end_) end
 ---@field root fun(self: TSTree): TSNode
 ---@field edit fun(self: TSTree, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _:integer)
 ---@field copy fun(self: TSTree): TSTree
+---@field included_ranges fun(self: TSTree, include_bytes: boolean?): integer[]
 
 ---@return integer
 vim._ts_get_language_version = function() end
diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index bec24a23a5..02918da23f 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -78,11 +78,8 @@ end
 ---@param r2 Range4|Range6
 ---@return boolean
 function M.intercepts(r1, r2)
-  local off_1 = #r1 == 6 and 1 or 0
-  local off_2 = #r1 == 6 and 1 or 0
-
-  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r1[2], r1[3 + off_1], r1[4 + off_1]
-  local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
+  local srow_1, scol_1, erow_1, ecol_1 = M.unpack4(r1)
+  local srow_2, scol_2, erow_2, ecol_2 = M.unpack4(r2)
 
   -- r1 is above r2
   if M.cmp_pos.le(erow_1, ecol_1, srow_2, scol_2) then
@@ -97,16 +94,28 @@ function M.intercepts(r1, r2)
   return true
 end
 
+---@private
+---@param r Range4|Range6
+---@return integer, integer, integer, integer
+function M.unpack4(r)
+  local off_1 = #r == 6 and 1 or 0
+  return r[1], r[2], r[3 + off_1], r[4 + off_1]
+end
+
+---@private
+---@param r Range6
+---@return integer, integer, integer, integer, integer, integer
+function M.unpack6(r)
+  return r[1], r[2], r[3], r[4], r[5], r[6]
+end
+
 ---@private
 ---@param r1 Range4|Range6
 ---@param r2 Range4|Range6
 ---@return boolean whether r1 contains r2
 function M.contains(r1, r2)
-  local off_1 = #r1 == 6 and 1 or 0
-  local off_2 = #r1 == 6 and 1 or 0
-
-  local srow_1, scol_1, erow_1, ecol_1 = r1[1], r1[2], r1[3 + off_1], r1[4 + off_1]
-  local srow_2, scol_2, erow_2, ecol_2 = r2[1], r2[2], r2[3 + off_2], r2[4 + off_2]
+  local srow_1, scol_1, erow_1, ecol_1 = M.unpack4(r1)
+  local srow_2, scol_2, erow_2, ecol_2 = M.unpack4(r2)
 
   -- start doesn't fit
   if M.cmp_pos.gt(srow_1, scol_1, srow_2, scol_2) then
@@ -123,9 +132,13 @@ end
 
 ---@private
 ---@param source integer|string
----@param range Range4
+---@param range Range4|Range6
 ---@return Range6
 function M.add_bytes(source, range)
+  if type(range) == 'table' and #range == 6 then
+    return range --[[@as Range6]]
+  end
+
   local start_row, start_col, end_row, end_col = range[1], range[2], range[3], range[4]
   local start_byte = 0
   local end_byte = 0
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index fbc602486b..c89419085f 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -62,8 +62,6 @@ local Range = require('vim.treesitter._range')
 ---@field private _source (integer|string) Buffer or string to parse
 ---@field private _trees TSTree[] Reference to parsed tree (one for each language)
 ---@field private _valid boolean|table<integer,boolean> If the parsed tree is valid
---- TODO(lewis6991): combine _regions, _valid and _trees
----@field private _is_child boolean
 local LanguageTree = {}
 
 ---@class LanguageTreeOpts
@@ -117,6 +115,48 @@ function LanguageTree.new(source, lang, opts)
   return self
 end
 
+---@private
+---Measure execution time of a function
+---@generic R1, R2, R3
+---@param f fun(): R1, R2, R2
+---@return integer, R1, R2, R3
+local function tcall(f, ...)
+  local start = vim.loop.hrtime()
+  ---@diagnostic disable-next-line
+  local r = { f(...) }
+  local duration = (vim.loop.hrtime() - start) / 1000000
+  return duration, unpack(r)
+end
+
+---@private
+---@vararg any
+function LanguageTree:_log(...)
+  if vim.g.__ts_debug == nil then
+    return
+  end
+
+  local args = { ... }
+  if type(args[1]) == 'function' then
+    args = { args[1]() }
+  end
+
+  local info = debug.getinfo(2, 'nl')
+  local nregions = #self:included_regions()
+  local prefix =
+    string.format('%s:%d: [%s:%d] ', info.name, info.currentline, self:lang(), nregions)
+
+  a.nvim_out_write(prefix)
+  for _, x in ipairs(args) do
+    if type(x) == 'string' then
+      a.nvim_out_write(x)
+    else
+      a.nvim_out_write(vim.inspect(x, { newline = ' ', indent = '' }))
+    end
+    a.nvim_out_write(' ')
+  end
+  a.nvim_out_write('\n')
+end
+
 --- Invalidates this parser and all its children
 ---@param reload boolean|nil
 function LanguageTree:invalidate(reload)
@@ -146,7 +186,9 @@ end
 --- Determines whether this tree is valid.
 --- If the tree is invalid, call `parse()`.
 --- This will return the updated tree.
-function LanguageTree:is_valid()
+---@param exclude_children boolean|nil
+---@return boolean
+function LanguageTree:is_valid(exclude_children)
   local valid = self._valid
 
   if type(valid) == 'table' then
@@ -155,9 +197,18 @@ function LanguageTree:is_valid()
         return false
       end
     end
-    return true
   end
 
+  if not exclude_children then
+    for _, child in pairs(self._children) do
+      if not child:is_valid(exclude_children) then
+        return false
+      end
+    end
+  end
+
+  assert(type(valid) == 'boolean')
+
   return valid
 end
 
@@ -171,16 +222,6 @@ function LanguageTree:source()
   return self._source
 end
 
----@private
----This is only exposed so it can be wrapped for profiling
----@param old_tree TSTree
----@return TSTree, integer[]
-function LanguageTree:_parse_tree(old_tree)
-  local tree, tree_changes = self._parser:parse(old_tree, self._source)
-  self:_do_callback('changedtree', tree_changes, tree)
-  return tree, tree_changes
-end
-
 --- Parses all defined regions using a treesitter parser
 --- for the language this tree represents.
 --- This will run the injection query for this language to
@@ -190,31 +231,45 @@ end
 ---@return table|nil Change list
 function LanguageTree:parse()
   if self:is_valid() then
+    self:_log('valid')
     return self._trees
   end
 
   local changes = {}
 
-  -- If there are no ranges, set to an empty list
-  -- so the included ranges in the parser are cleared.
-  if #self._regions > 0 then
-    for i, ranges in ipairs(self._regions) do
-      if not self._valid or not self._valid[i] then
-        self._parser:set_included_ranges(ranges)
-        local tree, tree_changes = self:_parse_tree(self._trees[i])
-        self._trees[i] = tree
-        vim.list_extend(changes, tree_changes)
+  -- Collect some stats
+  local regions_parsed = 0
+  local total_parse_time = 0
+
+  --- At least 1 region is invalid
+  if not self:is_valid(true) then
+    local function _parsetree(index)
+      local parse_time, tree, tree_changes =
+        tcall(self._parser.parse, self._parser, self._trees[index], self._source)
+
+      self:_do_callback('changedtree', tree_changes, tree)
+      self._trees[index] = tree
+      vim.list_extend(changes, tree_changes)
+
+      total_parse_time = total_parse_time + parse_time
+      regions_parsed = regions_parsed + 1
+    end
+
+    if #self._regions > 0 then
+      for i, ranges in ipairs(self._regions) do
+        if not self._valid or not self._valid[i] then
+          self._parser:set_included_ranges(ranges)
+          _parsetree(i)
+        end
       end
+    else
+      _parsetree(1)
     end
-  else
-    local tree, tree_changes = self:_parse_tree(self._trees[1])
-    self._trees = { tree }
-    changes = tree_changes
   end
 
-  local injections_by_lang = self:_get_injections()
   local seen_langs = {} ---@type table<string,boolean>
 
+  local query_time, injections_by_lang = tcall(self._get_injections, self)
   for lang, injection_ranges in pairs(injections_by_lang) do
     local has_lang = pcall(language.add, lang)
 
@@ -229,15 +284,6 @@ function LanguageTree:parse()
       end
 
       child:set_included_regions(injection_ranges)
-
-      local _, child_changes = child:parse()
-
-      -- Propagate any child changes so they are included in the
-      -- the change list for the callback.
-      if child_changes then
-        vim.list_extend(changes, child_changes)
-      end
-
       seen_langs[lang] = true
     end
   end
@@ -248,6 +294,23 @@ function LanguageTree:parse()
     end
   end
 
+  self:_log({
+    changes = changes,
+    regions_parsed = regions_parsed,
+    parse_time = total_parse_time,
+    query_time = query_time,
+  })
+
+  self:for_each_child(function(child)
+    local _, child_changes = child:parse()
+
+    -- Propagate any child changes so they are included in the
+    -- the change list for the callback.
+    if child_changes then
+      vim.list_extend(changes, child_changes)
+    end
+  end)
+
   self._valid = true
 
   return self._trees, changes
@@ -295,8 +358,6 @@ function LanguageTree:add_child(lang)
   end
 
   self._children[lang] = LanguageTree.new(self._source, lang, self._opts)
-  self._children[lang]._is_child = true
-
   self:invalidate()
   self:_do_callback('child_added', self._children[lang])
 
@@ -331,6 +392,54 @@ function LanguageTree:destroy()
   end
 end
 
+---@private
+---@param region Range6[]
+local function region_tostr(region)
+  local srow, scol = region[1][1], region[1][2]
+  local erow, ecol = region[#region][4], region[#region][5]
+  return string.format('[%d:%d-%d:%d]', srow, scol, erow, ecol)
+end
+
+---@private
+---Iterate through all the regions. fn returns a boolean to indicate if the
+---region is valid or not.
+---@param fn fun(index: integer, region: Range6[]): boolean
+function LanguageTree:_iter_regions(fn)
+  if not self._valid then
+    return
+  end
+
+  if type(self._valid) ~= 'table' then
+    self._valid = {}
+  end
+
+  local all_valid = true
+
+  for i, region in ipairs(self._regions) do
+    if self._valid[i] == nil then
+      self._valid[i] = true
+    end
+
+    if self._valid[i] then
+      self._valid[i] = fn(i, region)
+      if not self._valid[i] then
+        self:_log(function()
+          return 'invalidating region', i, region_tostr(region)
+        end)
+      end
+    end
+
+    if not self._valid[i] then
+      all_valid = false
+    end
+  end
+
+  -- Compress the valid value to 'true' if there are no invalid regions
+  if all_valid then
+    self._valid = all_valid
+  end
+end
+
 --- Sets the included regions that should be parsed by this |LanguageTree|.
 --- A region is a set of nodes and/or ranges that will be parsed in the same context.
 ---
@@ -346,10 +455,10 @@ end
 --- nodes, which is useful for templating languages like ERB and EJS.
 ---
 ---@private
----@param regions Range4[][] List of regions this tree should manage and parse.
-function LanguageTree:set_included_regions(regions)
+---@param new_regions Range4[][] List of regions this tree should manage and parse.
+function LanguageTree:set_included_regions(new_regions)
   -- Transform the tables from 4 element long to 6 element long (with byte offset)
-  for _, region in ipairs(regions) do
+  for _, region in ipairs(new_regions) do
     for i, range in ipairs(region) do
       if type(range) == 'table' and #range == 4 then
         region[i] = Range.add_bytes(self._source, range)
@@ -357,83 +466,75 @@ function LanguageTree:set_included_regions(regions)
     end
   end
 
-  if #self._regions ~= #regions then
+  if #self._regions ~= #new_regions then
     self._trees = {}
     self:invalidate()
-  elseif self._valid ~= false then
-    if self._valid == true then
-      self._valid = {}
-      for i = 1, #regions do
-        self._valid[i] = true
-      end
-    end
-
-    for i = 1, #regions do
-      if not vim.deep_equal(self._regions[i], regions[i]) then
-        self._valid[i] = false
-      end
-
-      if not self._valid[i] then
-        self._trees[i] = nil
-      end
-    end
+  else
+    self:_iter_regions(function(i, region)
+      return vim.deep_equal(new_regions[i], region)
+    end)
   end
-
-  self._regions = regions
+  self._regions = new_regions
 end
 
---- Gets the set of included regions
+---Gets the set of included regions
+---@return integer[][]
 function LanguageTree:included_regions()
   return self._regions
 end
 
 ---@private
 ---@param node TSNode
----@param id integer
+---@param source integer|string
 ---@param metadata TSMetadata
----@return Range4
-local function get_range_from_metadata(node, id, metadata)
-  if metadata[id] and metadata[id].range then
-    return metadata[id].range --[[@as Range4]]
+---@return Range6
+local function get_range_from_metadata(node, source, metadata)
+  if metadata and metadata.range then
+    return Range.add_bytes(source, metadata.range --[[@as Range4|Range6]])
   end
-  return { node:range() }
+  return { node:range(true) }
 end
 
 ---@private
 --- TODO(lewis6991): cleanup of the node_range interface
 ---@param node TSNode
----@param id integer
+---@param source string|integer
 ---@param metadata TSMetadata
----@return Range4[]
-local function get_node_ranges(node, id, metadata, include_children)
-  local range = get_range_from_metadata(node, id, metadata)
+---@return Range6[]
+local function get_node_ranges(node, source, metadata, include_children)
+  local range = get_range_from_metadata(node, source, metadata)
 
   if include_children then
     return { range }
   end
 
-  local ranges = {} ---@type Range4[]
+  local ranges = {} ---@type Range6[]
 
-  local srow, scol, erow, ecol = range[1], range[2], range[3], range[4]
+  local srow, scol, sbyte, erow, ecol, ebyte = Range.unpack6(range)
 
   for i = 0, node:named_child_count() - 1 do
     local child = node:named_child(i)
-    local child_srow, child_scol, child_erow, child_ecol = child:range()
-    if child_srow > srow or child_scol > scol then
-      table.insert(ranges, { srow, scol, child_srow, child_scol })
+    local c_srow, c_scol, c_sbyte, c_erow, c_ecol, c_ebyte = child:range(true)
+    if c_srow > srow or c_scol > scol then
+      ranges[#ranges + 1] = { srow, scol, sbyte, c_srow, c_scol, c_sbyte }
     end
-    srow = child_erow
-    scol = child_ecol
+    srow = c_erow
+    scol = c_ecol
+    sbyte = c_ebyte
   end
 
   if erow > srow or ecol > scol then
-    table.insert(ranges, { srow, scol, erow, ecol })
+    ranges[#ranges + 1] = Range.add_bytes(source, { srow, scol, sbyte, erow, ecol, ebyte })
   end
 
   return ranges
 end
 
----@alias TSInjection table<string,table<integer,table>>
+---@class TSInjectionElem
+---@field combined boolean
+---@field regions Range6[][]
+
+---@alias TSInjection table<string,table<integer,TSInjectionElem>>
 
 ---@private
 ---@param t table<integer,TSInjection>
@@ -498,7 +599,7 @@ function LanguageTree:_get_injection(match, metadata)
     if name == 'injection.language' then
       lang = get_node_text(node, self._source, metadata[id])
     elseif name == 'injection.content' then
-      ranges = get_node_ranges(node, id, metadata, include_children)
+      ranges = get_node_ranges(node, self._source, metadata[id], include_children)
     end
   end
 
@@ -545,7 +646,7 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
     elseif name == 'combined' then
       combined = true
     elseif name == 'content' and #ranges == 0 then
-      table.insert(ranges, get_range_from_metadata(node, id, metadata))
+      ranges[#ranges + 1] = get_range_from_metadata(node, self._source, metadata[id])
       -- Ignore any tags that start with "_"
       -- Allows for other tags to be used in matches
     elseif string.sub(name, 1, 1) ~= '_' then
@@ -554,7 +655,7 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
       end
 
       if #ranges == 0 then
-        table.insert(ranges, get_range_from_metadata(node, id, metadata))
+        ranges[#ranges + 1] = get_range_from_metadata(node, self._source, metadata[id])
       end
     end
   end
@@ -569,7 +670,7 @@ end
 --- TODO: Allow for an offset predicate to tailor the injection range
 ---       instead of using the entire nodes range.
 ---@private
----@return table<string, Range4[][]>
+---@return table<string, Range6[][]>
 function LanguageTree:_get_injections()
   if not self._injection_query then
     return {}
@@ -594,7 +695,7 @@ function LanguageTree:_get_injections()
     end
   end
 
-  ---@type table<string,Range4[][]>
+  ---@type table<string,Range6[][]>
   local result = {}
 
   -- Generate a map by lang of node lists.
@@ -613,7 +714,6 @@ function LanguageTree:_get_injections()
           end, entry.regions)
           table.insert(result[lang], regions)
         else
-          ---@diagnostic disable-next-line:no-unknown
           for _, ranges in ipairs(entry.regions) do
             table.insert(result[lang], ranges)
           end
@@ -634,30 +734,68 @@ function LanguageTree:_do_callback(cb_name, ...)
 end
 
 ---@private
----@param regions Range6[][]
----@param old_range Range6
----@param new_range Range6
----@return table<integer,boolean> region indices to invalidate
-local function update_regions(regions, old_range, new_range)
-  ---@type table<integer,boolean>
-  local valid = {}
-
-  for i, ranges in ipairs(regions or {}) do
-    valid[i] = true
-    for j, r in ipairs(ranges) do
-      if Range.intercepts(r, old_range) then
-        valid[i] = false
-        break
+function LanguageTree:_edit(
+  start_byte,
+  end_byte_old,
+  end_byte_new,
+  start_row,
+  start_col,
+  end_row_old,
+  end_col_old,
+  end_row_new,
+  end_col_new
+)
+  for _, tree in ipairs(self._trees) do
+    tree:edit(
+      start_byte,
+      end_byte_old,
+      end_byte_new,
+      start_row,
+      start_col,
+      end_row_old,
+      end_col_old,
+      end_row_new,
+      end_col_new
+    )
+  end
+
+  local changed_range = {
+    start_row,
+    start_col,
+    start_byte,
+    end_row_old,
+    end_col_old,
+    end_byte_old,
+  }
+
+  local new_range = {
+    start_row,
+    start_col,
+    start_byte,
+    end_row_new,
+    end_col_new,
+    end_byte_new,
+  }
+
+  if #self._regions == 0 then
+    self._valid = false
+  end
+
+  -- Validate regions after editing the tree
+  self:_iter_regions(function(_, region)
+    for i, r in ipairs(region) do
+      if Range.intercepts(r, changed_range) then
+        return false
       end
 
       -- Range after change. Adjust
-      if Range.cmp_pos.gt(r[1], r[2], old_range[4], old_range[5]) then
-        local byte_offset = new_range[6] - old_range[6]
-        local row_offset = new_range[4] - old_range[4]
+      if Range.cmp_pos.gt(r[1], r[2], changed_range[4], changed_range[5]) then
+        local byte_offset = new_range[6] - changed_range[6]
+        local row_offset = new_range[4] - changed_range[4]
 
         -- Update the range to avoid invalidation in set_included_regions()
         -- which will compare the regions against the parsed injection regions
-        ranges[j] = {
+        region[i] = {
           r[1] + row_offset,
           r[2],
           r[3] + byte_offset,
@@ -667,9 +805,8 @@ local function update_regions(regions, old_range, new_range)
         }
       end
     end
-  end
-
-  return valid
+    return true
+  end)
 end
 
 ---@private
@@ -700,49 +837,26 @@ function LanguageTree:_on_bytes(
   local old_end_col = old_col + ((old_row == 0) and start_col or 0)
   local new_end_col = new_col + ((new_row == 0) and start_col or 0)
 
-  local old_range = {
-    start_row,
-    start_col,
-    start_byte,
-    start_row + old_row,
-    old_end_col,
-    start_byte + old_byte,
-  }
-
-  local new_range = {
+  self:_log(
+    'on_bytes',
+    bufnr,
+    changed_tick,
     start_row,
     start_col,
     start_byte,
-    start_row + new_row,
-    new_end_col,
-    start_byte + new_byte,
-  }
-
-  if #self._regions == 0 then
-    self._valid = false
-  else
-    self._valid = update_regions(self._regions, old_range, new_range)
-  end
-
-  for _, child in pairs(self._children) do
-    child:_on_bytes(
-      bufnr,
-      changed_tick,
-      start_row,
-      start_col,
-      start_byte,
-      old_row,
-      old_col,
-      old_byte,
-      new_row,
-      new_col,
-      new_byte
-    )
-  end
+    old_row,
+    old_col,
+    old_byte,
+    new_row,
+    new_col,
+    new_byte
+  )
 
   -- Edit trees together BEFORE emitting a bytes callback.
-  for _, tree in ipairs(self._trees) do
-    tree:edit(
+  ---@private
+  self:for_each_child(function(child)
+    ---@diagnostic disable-next-line:invisible
+    child:_edit(
       start_byte,
       start_byte + old_byte,
       start_byte + new_byte,
@@ -753,24 +867,22 @@ function LanguageTree:_on_bytes(
       start_row + new_row,
       new_end_col
     )
-  end
+  end, true)
 
-  if not self._is_child then
-    self:_do_callback(
-      'bytes',
-      bufnr,
-      changed_tick,
-      start_row,
-      start_col,
-      start_byte,
-      old_row,
-      old_col,
-      old_byte,
-      new_row,
-      new_col,
-      new_byte
-    )
-  end
+  self:_do_callback(
+    'bytes',
+    bufnr,
+    changed_tick,
+    start_row,
+    start_col,
+    start_byte,
+    old_row,
+    old_col,
+    old_byte,
+    new_row,
+    new_col,
+    new_byte
+  )
 end
 
 ---@private
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 59894cc7f5..e7cf42283d 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -277,6 +277,7 @@ end
 ---@return (string[]|string|nil)
 function M.get_node_text(node, source, opts)
   opts = opts or {}
+  -- TODO(lewis6991): concat only works when source is number.
   local concat = vim.F.if_nil(opts.concat, true)
   local metadata = opts.metadata or {}
 
-- 
cgit 


From 68aa2857dd6bc1b33add02121cd36ef1ab32728c Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Thu, 9 Mar 2023 12:13:44 -0500
Subject: vim-patch:9.0.1393: Cairo files are not recognized (#22578)

Problem:    Cairo files are not recognized.
Solution:   Add a pattern for Cairo files. (Amaan Qureshi, closes vim/vim#12118)

https://github.com/vim/vim/commit/ff226d49fed2d8fc668084324c7b0f00117c5e74
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 8238fec2cc..1732623223 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -191,6 +191,7 @@ local extension = {
   BUILD = 'bzl',
   qc = 'c',
   cabal = 'cabal',
+  cairo = 'cairo',
   capnp = 'capnp',
   cdc = 'cdc',
   cdl = 'cdl',
-- 
cgit 


From 0ecb4d725e9e2086b045670e4c2fa8962b63d99c Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Fri, 10 Mar 2023 06:17:08 +0900
Subject: docs(lsp): type annotation for lsp.client (#22509)

* Also fix newly found type mismatch.
* Note that it generates new warnings about using @private client
  methods. A proper fix would be to revamp the lsp client documentation
  altogether.
---
 runtime/doc/lsp.txt     | 2 +-
 runtime/lua/vim/lsp.lua | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index b21ef9d7d3..d13dc4a782 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -655,7 +655,7 @@ buf_notify({bufnr}, {method}, {params})                 *vim.lsp.buf_notify()*
     Send a notification to a server
 
     Parameters: ~
-      • {bufnr}   (number|nil) The number of the buffer
+      • {bufnr}   (integer|nil) The number of the buffer
       • {method}  (string) Name of the request method
       • {params}  (any) Arguments to send to the server
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index cb77e9636f..c85d38a50e 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -154,6 +154,8 @@ local all_buffer_active_clients = {}
 local uninitialized_clients = {}
 
 ---@private
+---@param bufnr? integer
+---@param fn fun(client: lsp.Client, client_id: integer, bufnr: integer)
 local function for_each_buffer_client(bufnr, fn, restrict_client_ids)
   validate({
     fn = { fn, 'f' },
@@ -1240,6 +1242,7 @@ function lsp.start_client(config)
     return
   end
 
+  ---@class lsp.Client
   local client = {
     id = client_id,
     name = name,
@@ -1390,7 +1393,7 @@ function lsp.start_client(config)
   --- checks for capabilities and handler availability.
   ---
   ---@param method string LSP method name.
-  ---@param params table LSP request params.
+  ---@param params table|nil LSP request params.
   ---@param handler lsp-handler|nil Response |lsp-handler| for this method.
   ---@param bufnr integer Buffer handle (0 for current).
   ---@return boolean status, integer|nil request_id {status} is a bool indicating
@@ -2087,7 +2090,7 @@ function lsp.buf_request_sync(bufnr, method, params, timeout_ms)
 end
 
 --- Send a notification to a server
----@param bufnr (number|nil) The number of the buffer
+---@param bufnr (integer|nil) The number of the buffer
 ---@param method (string) Name of the request method
 ---@param params (any) Arguments to send to the server
 ---
-- 
cgit 


From adfa9de8ebc4bce96d212280eccddc0306d1b013 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 10 Mar 2023 10:12:57 +0000
Subject: fix(treesitter): do not error on empty filetype

Ignore instead
---
 runtime/lua/vim/treesitter/language.lua | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 5f34d9cd56..47375fd5e6 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -60,16 +60,6 @@ function M.add(lang, opts)
     filetype = { filetype, { 'string', 'table' }, true },
   })
 
-  if filetype == '' then
-    error(string.format("'%s' is not a valid filetype", filetype))
-  elseif type(filetype) == 'table' then
-    for _, f in ipairs(filetype) do
-      if f == '' then
-        error(string.format("'%s' is not a valid filetype", filetype))
-      end
-    end
-  end
-
   M.register(lang, filetype or lang)
 
   if vim._ts_has_language(lang) then
@@ -109,7 +99,9 @@ function M.register(lang, filetype)
   end
 
   for _, f in ipairs(filetypes) do
-    ft_to_lang[f] = lang
+    if f ~= '' then
+      ft_to_lang[f] = lang
+    end
   end
 end
 
-- 
cgit 


From c5b9643bf1b0f6d5166b4abf6a7c3f29532aefeb Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 10 Mar 2023 10:25:10 +0000
Subject: fix(treesitter): better lang handling of get_parser()

---
 runtime/lua/vim/treesitter.lua | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index ab9f8968c8..5723cce563 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -99,13 +99,28 @@ function M.get_parser(bufnr, lang, opts)
   if bufnr == nil or bufnr == 0 then
     bufnr = a.nvim_get_current_buf()
   end
+
   if lang == nil then
     local ft = vim.bo[bufnr].filetype
-    lang = language.get_lang(ft) or ft
-    -- TODO(lewis6991): we should error here and not default to ft
-    -- if not lang then
-    --   error(string.format('filetype %s of buffer %d is not associated with any lang', ft, bufnr))
-    -- end
+    if ft ~= '' then
+      lang = language.get_lang(ft) or ft
+      -- TODO(lewis6991): we should error here and not default to ft
+      -- if not lang then
+      --   error(string.format('filetype %s of buffer %d is not associated with any lang', ft, bufnr))
+      -- end
+    else
+      if parsers[bufnr] then
+        return parsers[bufnr]
+      end
+      error(
+        string.format(
+          'There is no parser available for buffer %d and one could not be'
+            .. ' created because lang could not be determined. Either pass lang'
+            .. ' or set the buffer filetype',
+          bufnr
+        )
+      )
+    end
   end
 
   if parsers[bufnr] == nil or parsers[bufnr]:lang() ~= lang then
-- 
cgit 


From 46b73bf22cb951151de9bf0712d42e194000b677 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 9 Mar 2023 15:28:55 +0000
Subject: perf(treesitter): more efficient foldexpr

---
 runtime/lua/vim/treesitter/_fold.lua | 290 +++++++++++++++++++++++------------
 1 file changed, 188 insertions(+), 102 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index a66cc6d543..435cb9fdb6 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -1,139 +1,157 @@
+local Range = require('vim.treesitter._range')
+
 local api = vim.api
 
-local M = {}
+---@class FoldInfo
+---@field levels table<integer,string>
+---@field levels0 table<integer,integer>
+---@field private start_counts table<integer,integer>
+---@field private stop_counts table<integer,integer>
+local FoldInfo = {}
+FoldInfo.__index = FoldInfo
 
---- Memoizes a function based on the buffer tick of the provided bufnr.
---- The cache entry is cleared when the buffer is detached to avoid memory leaks.
----@generic F: function
----@param fn F fn to memoize, taking the bufnr as first argument
----@return F
-local function memoize_by_changedtick(fn)
-  ---@type table<integer,{result:any,last_tick:integer}>
-  local cache = {}
-
-  ---@param bufnr integer
-  return function(bufnr, ...)
-    local tick = api.nvim_buf_get_changedtick(bufnr)
-
-    if cache[bufnr] then
-      if cache[bufnr].last_tick == tick then
-        return cache[bufnr].result
-      end
-    else
-      local function detach_handler()
-        cache[bufnr] = nil
-      end
+function FoldInfo.new()
+  return setmetatable({
+    start_counts = {},
+    stop_counts = {},
+    levels0 = {},
+    levels = {},
+  }, FoldInfo)
+end
 
-      -- Clean up logic only!
-      api.nvim_buf_attach(bufnr, false, {
-        on_detach = detach_handler,
-        on_reload = detach_handler,
-      })
-    end
+---@param srow integer
+---@param erow integer
+function FoldInfo:invalidate_range(srow, erow)
+  for i = srow, erow do
+    self.start_counts[i + 1] = nil
+    self.stop_counts[i + 1] = nil
+    self.levels0[i + 1] = nil
+    self.levels[i + 1] = nil
+  end
+end
 
-    cache[bufnr] = {
-      result = fn(bufnr, ...),
-      last_tick = tick,
-    }
+---@param srow integer
+---@param erow integer
+function FoldInfo:remove_range(srow, erow)
+  for i = erow - 1, srow, -1 do
+    table.remove(self.levels, i + 1)
+    table.remove(self.levels0, i + 1)
+    table.remove(self.start_counts, i + 1)
+    table.remove(self.stop_counts, i + 1)
+  end
+end
 
-    return cache[bufnr].result
+---@param srow integer
+---@param erow integer
+function FoldInfo:add_range(srow, erow)
+  for i = srow, erow - 1 do
+    table.insert(self.levels, i + 1, '-1')
+    table.insert(self.levels0, i + 1, -1)
+    table.insert(self.start_counts, i + 1, nil)
+    table.insert(self.stop_counts, i + 1, nil)
   end
 end
 
----@param bufnr integer
----@param capture string
----@param query_name string
----@param callback fun(id: integer, node:TSNode, metadata: TSMetadata)
-local function iter_matches_with_capture(bufnr, capture, query_name, callback)
-  local parser = vim.treesitter.get_parser(bufnr)
+---@param lnum integer
+function FoldInfo:add_start(lnum)
+  self.start_counts[lnum] = (self.start_counts[lnum] or 0) + 1
+end
 
-  if not parser then
-    return
-  end
+---@param lnum integer
+function FoldInfo:add_stop(lnum)
+  self.stop_counts[lnum] = (self.stop_counts[lnum] or 0) + 1
+end
 
-  parser:for_each_tree(function(tree, lang_tree)
-    local lang = lang_tree:lang()
-    local query = vim.treesitter.query.get_query(lang, query_name)
-    if query then
-      local root = tree:root()
-      local start, _, stop = root:range()
-      for _, match, metadata in query:iter_matches(root, bufnr, start, stop) do
-        for id, node in pairs(match) do
-          if query.captures[id] == capture then
-            callback(id, node, metadata)
-          end
-        end
-      end
-    end
-  end)
+---@param lnum integer
+---@return integer
+function FoldInfo:get_start(lnum)
+  return self.start_counts[lnum] or 0
+end
+
+---@param lnum integer
+---@return integer
+function FoldInfo:get_stop(lnum)
+  return self.stop_counts[lnum] or 0
 end
 
 ---@private
 --- TODO(lewis6991): copied from languagetree.lua. Consolidate
 ---@param node TSNode
----@param id integer
 ---@param metadata TSMetadata
----@return Range
-local function get_range_from_metadata(node, id, metadata)
-  if metadata[id] and metadata[id].range then
-    return metadata[id].range --[[@as Range]]
+---@return Range4
+local function get_range_from_metadata(node, metadata)
+  if metadata and metadata.range then
+    return metadata.range --[[@as Range4]]
   end
   return { node:range() }
 end
 
--- This is cached on buf tick to avoid computing that multiple times
--- Especially not for every line in the file when `zx` is hit
----@param bufnr integer
----@return table<integer,string>
-local folds_levels = memoize_by_changedtick(function(bufnr)
+local function trim_level(level)
   local max_fold_level = vim.wo.foldnestmax
-  local function trim_level(level)
-    if level > max_fold_level then
-      return max_fold_level
-    end
-    return level
+  if level > max_fold_level then
+    return max_fold_level
   end
+  return level
+end
 
-  -- start..stop is an inclusive range
-  local start_counts = {} ---@type table<integer,integer>
-  local stop_counts = {} ---@type table<integer,integer>
+---@param bufnr integer
+---@param info FoldInfo
+---@param srow integer?
+---@param erow integer?
+local function get_folds_levels(bufnr, info, srow, erow)
+  srow = srow or 0
+  erow = erow or api.nvim_buf_line_count(bufnr)
+
+  info:invalidate_range(srow, erow)
 
   local prev_start = -1
   local prev_stop = -1
 
-  local min_fold_lines = vim.wo.foldminlines
+  vim.treesitter.get_parser(bufnr):for_each_tree(function(tree, ltree)
+    local query = vim.treesitter.query.get_query(ltree:lang(), 'folds')
+    if not query then
+      return
+    end
+
+    -- erow in query is end-exclusive
+    local q_erow = erow and erow + 1 or -1
 
-  iter_matches_with_capture(bufnr, 'fold', 'folds', function(id, node, metadata)
-    local range = get_range_from_metadata(node, id, metadata)
-    local start, stop, stop_col = range[1], range[3], range[4]
+    for id, node, metadata in query:iter_captures(tree:root(), bufnr, srow or 0, q_erow) do
+      if query.captures[id] == 'fold' then
+        local range = get_range_from_metadata(node, metadata[id])
+        local start, _, stop, stop_col = Range.unpack4(range)
 
-    if stop_col == 0 then
-      stop = stop - 1
-    end
+        if stop_col == 0 then
+          stop = stop - 1
+        end
 
-    local fold_length = stop - start + 1
+        local fold_length = stop - start + 1
 
-    -- Fold only multiline nodes that are not exactly the same as previously met folds
-    -- Checking against just the previously found fold is sufficient if nodes
-    -- are returned in preorder or postorder when traversing tree
-    if fold_length > min_fold_lines and not (start == prev_start and stop == prev_stop) then
-      start_counts[start] = (start_counts[start] or 0) + 1
-      stop_counts[stop] = (stop_counts[stop] or 0) + 1
-      prev_start = start
-      prev_stop = stop
+        -- Fold only multiline nodes that are not exactly the same as previously met folds
+        -- Checking against just the previously found fold is sufficient if nodes
+        -- are returned in preorder or postorder when traversing tree
+        if
+          fold_length > vim.wo.foldminlines and not (start == prev_start and stop == prev_stop)
+        then
+          info:add_start(start + 1)
+          info:add_stop(stop + 1)
+          prev_start = start
+          prev_stop = stop
+        end
+      end
     end
   end)
 
-  ---@type table<integer,string>
-  local levels = {}
-  local current_level = 0
+  local current_level = info.levels0[srow] or 0
 
   -- We now have the list of fold opening and closing, fill the gaps and mark where fold start
-  for lnum = 0, api.nvim_buf_line_count(bufnr) do
+  for lnum = srow + 1, erow + 1 do
     local last_trimmed_level = trim_level(current_level)
-    current_level = current_level + (start_counts[lnum] or 0)
+    current_level = current_level + info:get_start(lnum)
+    info.levels0[lnum] = current_level
+
     local trimmed_level = trim_level(current_level)
-    current_level = current_level - (stop_counts[lnum] or 0)
+    current_level = current_level - info:get_stop(lnum)
 
     -- Determine if it's the start/end of a fold
     -- NB: vim's fold-expr interface does not have a mechanism to indicate that
@@ -148,11 +166,61 @@ local folds_levels = memoize_by_changedtick(function(bufnr)
       prefix = '>'
     end
 
-    levels[lnum + 1] = prefix .. tostring(trimmed_level)
+    info.levels[lnum] = prefix .. tostring(trimmed_level)
+  end
+end
+
+local M = {}
+
+---@type table<integer,FoldInfo>
+local foldinfos = {}
+
+local function recompute_folds()
+  if api.nvim_get_mode().mode == 'i' then
+    -- foldUpdate() is guarded in insert mode. So update folds on InsertLeave
+    api.nvim_create_autocmd('InsertLeave', {
+      once = true,
+      callback = vim._foldupdate,
+    })
+    return
   end
 
-  return levels
-end)
+  vim._foldupdate()
+end
+
+---@param bufnr integer
+---@param foldinfo FoldInfo
+---@param tree_changes Range4[]
+local function on_changedtree(bufnr, foldinfo, tree_changes)
+  -- For some reason, queries seem to use the old buffer state in on_bytes.
+  -- Get around this by scheduling and manually updating folds.
+  vim.schedule(function()
+    for _, change in ipairs(tree_changes) do
+      local srow, _, erow = Range.unpack4(change)
+      get_folds_levels(bufnr, foldinfo, srow, erow)
+    end
+    recompute_folds()
+  end)
+end
+
+---@param bufnr integer
+---@param foldinfo FoldInfo
+---@param start_row integer
+---@param old_row integer
+---@param new_row integer
+local function on_bytes(bufnr, foldinfo, start_row, old_row, new_row)
+  local end_row_old = start_row + old_row
+  local end_row_new = start_row + new_row
+  if new_row < old_row then
+    foldinfo:remove_range(end_row_old, end_row_new)
+  elseif new_row > old_row then
+    foldinfo:add_range(start_row, end_row_new)
+    vim.schedule(function()
+      get_folds_levels(bufnr, foldinfo, start_row, end_row_new)
+      recompute_folds()
+    end)
+  end
+end
 
 ---@param lnum integer|nil
 ---@return string
@@ -165,9 +233,27 @@ function M.foldexpr(lnum)
     return '0'
   end
 
-  local levels = folds_levels(bufnr) or {}
+  if not foldinfos[bufnr] then
+    foldinfos[bufnr] = FoldInfo.new()
+    get_folds_levels(bufnr, foldinfos[bufnr])
+
+    local parser = vim.treesitter.get_parser(bufnr)
+    parser:register_cbs({
+      on_changedtree = function(tree_changes)
+        on_changedtree(bufnr, foldinfos[bufnr], tree_changes)
+      end,
+
+      on_bytes = function(_, _, start_row, _, _, old_row, _, _, new_row, _, _)
+        on_bytes(bufnr, foldinfos[bufnr], start_row, old_row, new_row)
+      end,
+
+      on_detach = function()
+        foldinfos[bufnr] = nil
+      end,
+    })
+  end
 
-  return levels[lnum] or '0'
+  return foldinfos[bufnr].levels[lnum] or '0'
 end
 
 return M
-- 
cgit 


From 75537768ef0b8cc35ef9c6aa906237e449640b46 Mon Sep 17 00:00:00 2001
From: Null Chilly <56817415+nullchilly@users.noreply.github.com>
Date: Fri, 10 Mar 2023 20:10:38 +0700
Subject: perf(lsp): better binary search mid calculation in semantic token
 (#22607)

This commit replaces the usage of math.floor((lo + hi) / 2) with the faster and equivalent bit.rshift(lo + hi, 1) for calculating the midpoint in binary search.
---
 runtime/lua/vim/lsp/semantic_tokens.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index a5e007a011..03532c33b7 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -44,7 +44,7 @@ local STHighlighter = { active = {} }
 ---@private
 local function lower_bound(tokens, line, lo, hi)
   while lo < hi do
-    local mid = math.floor((lo + hi) / 2)
+    local mid = bit.rshift(lo + hi, 1) -- Equivalent to floor((lo + hi) / 2).
     if tokens[mid].line < line then
       lo = mid + 1
     else
@@ -62,7 +62,7 @@ end
 ---@private
 local function upper_bound(tokens, line, lo, hi)
   while lo < hi do
-    local mid = math.floor((lo + hi) / 2)
+    local mid = bit.rshift(lo + hi, 1) -- Equivalent to floor((lo + hi) / 2).
     if line < tokens[mid].line then
       hi = mid
     else
-- 
cgit 


From 762a06c6bcfbcc1e40ba670bae10bacdbb973524 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 10 Mar 2023 16:16:49 +0000
Subject: feat!(treesitter): do not return changes from LanguageTree:parse()

Never return the changes an only notify them using the `on_changedtree`
callback.

It is not guaranteed for a plugin that it'll be the first one to call
`tree:parse()` and thus get the changes.

Closes #19915
---
 runtime/doc/news.txt                        |  5 ++++-
 runtime/doc/treesitter.txt                  |  1 -
 runtime/lua/vim/treesitter/languagetree.lua | 11 ++---------
 3 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 04ae9360a0..801b74df45 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -232,7 +232,10 @@ The following deprecated functions or APIs were removed.
   changes need to be contributed there first.)
   See https://github.com/neovim/neovim/pull/20674.
 
-- 'hkmap', 'hkmapp' and 'aleph' options were removed. Use 'keymap' option instead.
+• 'hkmap', 'hkmapp' and 'aleph' options were removed. Use 'keymap' option instead.
+
+• |LanguageTree:parse()| no longer returns changed regions. Please use the
+  `on_changedtree` callbacks instead.
 
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index c7a0e1927b..a8f25d2ff9 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1099,7 +1099,6 @@ LanguageTree:parse({self})                              *LanguageTree:parse()*
 
     Return: ~
         TSTree[]
-        (table|nil) Change list
 
 LanguageTree:register_cbs({self}, {cbs})         *LanguageTree:register_cbs()*
     Registers callbacks for the |LanguageTree|.
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index c89419085f..26321cd1f4 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -228,7 +228,6 @@ end
 --- determine if any child languages should be created.
 ---
 ---@return TSTree[]
----@return table|nil Change list
 function LanguageTree:parse()
   if self:is_valid() then
     self:_log('valid')
@@ -302,18 +301,12 @@ function LanguageTree:parse()
   })
 
   self:for_each_child(function(child)
-    local _, child_changes = child:parse()
-
-    -- Propagate any child changes so they are included in the
-    -- the change list for the callback.
-    if child_changes then
-      vim.list_extend(changes, child_changes)
-    end
+    child:parse()
   end)
 
   self._valid = true
 
-  return self._trees, changes
+  return self._trees
 end
 
 --- Invokes the callback for each |LanguageTree| and its children recursively
-- 
cgit 


From 9d70fe062ca01ac0673faa6ccbb88345916aeea7 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 10 Mar 2023 16:10:05 +0000
Subject: feat(treesitter)!: consolidate query util functions

- And address more type errors.
- Removed the `concat` option from `get_node_text` since it was applied
  inconsistently and made typing awkward.
---
 runtime/doc/treesitter.txt                  | 17 ++++-
 runtime/lua/vim/treesitter/_fold.lua        | 15 +----
 runtime/lua/vim/treesitter/_range.lua       | 15 ++++-
 runtime/lua/vim/treesitter/languagetree.lua | 55 +++++-----------
 runtime/lua/vim/treesitter/query.lua        | 97 ++++++++++++++---------------
 5 files changed, 93 insertions(+), 106 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index c7a0e1927b..dc577a015e 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -789,14 +789,12 @@ get_node_text({node}, {source}, {opts})
       • {source}  (integer|string) Buffer or string from which the {node} is
                   extracted
       • {opts}    (table|nil) Optional parameters.
-                  • concat: (boolean) Concatenate result in a string (default
-                    true)
                   • metadata (table) Metadata of a specific capture. This
                     would be set to `metadata[capture_id]` when using
                     |vim.treesitter.add_directive()|.
 
     Return: ~
-        (string[]|string|nil)
+        (string)
 
 get_query({lang}, {query_name})                   *vim.treesitter.get_query()*
     Returns the runtime query {query_name} for {lang}.
@@ -822,6 +820,19 @@ get_query_files({lang}, {query_name}, {is_included})
         string[] query_files List of files to load for given query and
         language
 
+get_range({node}, {source}, {metadata})           *vim.treesitter.get_range()*
+    Get the range of a |TSNode|. Can also supply {source} and {metadata} to
+    get the range with directives applied.
+
+    Parameters: ~
+      • {node}      |TSNode|
+      • {source}    integer|string|nil Buffer or string from which the {node}
+                    is extracted
+      • {metadata}  TSMetadata|nil
+
+    Return: ~
+        (table)
+
 list_directives()                           *vim.treesitter.list_directives()*
     Lists the currently available directives to use in queries.
 
diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index 435cb9fdb6..fd2c707d17 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -1,4 +1,5 @@
 local Range = require('vim.treesitter._range')
+local Query = require('vim.treesitter.query')
 
 local api = vim.api
 
@@ -74,18 +75,6 @@ function FoldInfo:get_stop(lnum)
   return self.stop_counts[lnum] or 0
 end
 
----@private
---- TODO(lewis6991): copied from languagetree.lua. Consolidate
----@param node TSNode
----@param metadata TSMetadata
----@return Range4
-local function get_range_from_metadata(node, metadata)
-  if metadata and metadata.range then
-    return metadata.range --[[@as Range4]]
-  end
-  return { node:range() }
-end
-
 local function trim_level(level)
   local max_fold_level = vim.wo.foldnestmax
   if level > max_fold_level then
@@ -118,7 +107,7 @@ local function get_folds_levels(bufnr, info, srow, erow)
 
     for id, node, metadata in query:iter_captures(tree:root(), bufnr, srow or 0, q_erow) do
       if query.captures[id] == 'fold' then
-        local range = get_range_from_metadata(node, metadata[id])
+        local range = Query.get_range(node, bufnr, metadata[id])
         local start, _, stop, stop_col = Range.unpack4(range)
 
         if stop_col == 0 then
diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index 02918da23f..0017a567ec 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -2,8 +2,19 @@ local api = vim.api
 
 local M = {}
 
----@alias Range4 {[1]: integer, [2]: integer, [3]: integer, [4]: integer}
----@alias Range6 {[1]: integer, [2]: integer, [3]: integer, [4]: integer, [5]: integer, [6]: integer}
+---@class Range4
+---@field [1] integer start row
+---@field [2] integer start column
+---@field [3] integer end row
+---@field [4] integer end column
+
+---@class Range6
+---@field [1] integer start row
+---@field [2] integer start column
+---@field [3] integer start bytes
+---@field [4] integer end row
+---@field [5] integer end column
+---@field [6] integer end bytes
 
 ---@private
 ---@param a_row integer
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index c89419085f..0bb0601241 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -455,7 +455,7 @@ end
 --- nodes, which is useful for templating languages like ERB and EJS.
 ---
 ---@private
----@param new_regions Range4[][] List of regions this tree should manage and parse.
+---@param new_regions Range6[][] List of regions this tree should manage and parse.
 function LanguageTree:set_included_regions(new_regions)
   -- Transform the tables from 4 element long to 6 element long (with byte offset)
   for _, region in ipairs(new_regions) do
@@ -483,18 +483,6 @@ function LanguageTree:included_regions()
   return self._regions
 end
 
----@private
----@param node TSNode
----@param source integer|string
----@param metadata TSMetadata
----@return Range6
-local function get_range_from_metadata(node, source, metadata)
-  if metadata and metadata.range then
-    return Range.add_bytes(source, metadata.range --[[@as Range4|Range6]])
-  end
-  return { node:range(true) }
-end
-
 ---@private
 --- TODO(lewis6991): cleanup of the node_range interface
 ---@param node TSNode
@@ -502,7 +490,7 @@ end
 ---@param metadata TSMetadata
 ---@return Range6[]
 local function get_node_ranges(node, source, metadata, include_children)
-  local range = get_range_from_metadata(node, source, metadata)
+  local range = query.get_range(node, source, metadata)
 
   if include_children then
     return { range }
@@ -565,31 +553,18 @@ local function add_injection(t, tree_index, pattern, lang, combined, ranges)
   table.insert(t[tree_index][lang][pattern].regions, ranges)
 end
 
----@private
----Get node text
----
----Note: `query.get_node_text` returns string|string[]|nil so use this simple alias function
----to annotate it returns string.
----
----TODO(lewis6991): use [at]overload annotations on `query.get_node_text`
----@param node TSNode
----@param source integer|string
----@param metadata table
----@return string
-local function get_node_text(node, source, metadata)
-  return query.get_node_text(node, source, { metadata = metadata }) --[[@as string]]
-end
-
 ---@private
 --- Extract injections according to:
 --- https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection
 ---@param match table<integer,TSNode>
----@param metadata table
+---@param metadata TSMetadata
 ---@return string, boolean, Range4[]
 function LanguageTree:_get_injection(match, metadata)
   local ranges = {} ---@type Range4[]
   local combined = metadata['injection.combined'] ~= nil
-  local lang = metadata['injection.language'] ---@type string
+  local lang = metadata['injection.language']
+  assert(type(lang) == 'string')
+
   local include_children = metadata['injection.include-children'] ~= nil
 
   for id, node in pairs(match) do
@@ -597,7 +572,7 @@ function LanguageTree:_get_injection(match, metadata)
 
     -- Lang should override any other language tag
     if name == 'injection.language' then
-      lang = get_node_text(node, self._source, metadata[id])
+      lang = query.get_node_text(node, self._source, { metadata = metadata[id] })
     elseif name == 'injection.content' then
       ranges = get_node_ranges(node, self._source, metadata[id], include_children)
     end
@@ -608,11 +583,11 @@ end
 
 ---@private
 ---@param match table<integer,TSNode>
----@param metadata table
+---@param metadata TSMetadata
 ---@return string, boolean, Range4[]
 function LanguageTree:_get_injection_deprecated(match, metadata)
   local lang = nil ---@type string
-  local ranges = {} ---@type Range4[]
+  local ranges = {} ---@type Range6[]
   local combined = metadata.combined ~= nil
 
   -- Directives can configure how injections are captured as well as actual node captures.
@@ -630,8 +605,10 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
     end
   end
 
-  if metadata.language then
-    lang = metadata.language ---@type string
+  local mlang = metadata.language
+  if mlang ~= nil then
+    assert(type(mlang) == 'string')
+    lang = mlang
   end
 
   -- You can specify the content and language together
@@ -642,11 +619,11 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
 
     -- Lang should override any other language tag
     if name == 'language' and not lang then
-      lang = get_node_text(node, self._source, metadata[id])
+      lang = query.get_node_text(node, self._source, { metadata = metadata[id] })
     elseif name == 'combined' then
       combined = true
     elseif name == 'content' and #ranges == 0 then
-      ranges[#ranges + 1] = get_range_from_metadata(node, self._source, metadata[id])
+      ranges[#ranges + 1] = query.get_range(node, self._source, metadata[id])
       -- Ignore any tags that start with "_"
       -- Allows for other tags to be used in matches
     elseif string.sub(name, 1, 1) ~= '_' then
@@ -655,7 +632,7 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
       end
 
       if #ranges == 0 then
-        ranges[#ranges + 1] = get_range_from_metadata(node, self._source, metadata[id])
+        ranges[#ranges + 1] = query.get_range(node, self._source, metadata[id])
       end
     end
   end
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index e7cf42283d..70af4f7bce 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -1,6 +1,8 @@
 local a = vim.api
 local language = require('vim.treesitter.language')
 
+local Range = require('vim.treesitter._range')
+
 ---@class Query
 ---@field captures string[] List of captures used in query
 ---@field info TSQueryInfo Contains used queries, predicates, directives
@@ -56,35 +58,13 @@ local function add_included_lang(base_langs, lang, ilang)
 end
 
 ---@private
----@param buf (integer)
----@param range (table)
----@param concat (boolean)
----@returns (string[]|string|nil)
-local function buf_range_get_text(buf, range, concat)
-  local lines
-  local start_row, start_col, end_row, end_col = unpack(range)
-  local eof_row = a.nvim_buf_line_count(buf)
-  if start_row >= eof_row then
-    return nil
-  end
-
-  if end_col == 0 then
-    lines = a.nvim_buf_get_lines(buf, start_row, end_row, true)
-    end_col = -1
-  else
-    lines = a.nvim_buf_get_lines(buf, start_row, end_row + 1, true)
-  end
-
-  if #lines > 0 then
-    if #lines == 1 then
-      lines[1] = string.sub(lines[1], start_col + 1, end_col)
-    else
-      lines[1] = string.sub(lines[1], start_col + 1)
-      lines[#lines] = string.sub(lines[#lines], 1, end_col)
-    end
-  end
-
-  return concat and table.concat(lines, '\n') or lines
+---@param buf integer
+---@param range Range6
+---@returns string
+local function buf_range_get_text(buf, range)
+  local start_row, start_col, end_row, end_col = Range.unpack4(range)
+  local lines = a.nvim_buf_get_text(buf, start_row, start_col, end_row, end_col, {})
+  return table.concat(lines, '\n')
 end
 
 --- Gets the list of files used to make up a query
@@ -256,14 +236,28 @@ function M.parse_query(lang, query)
   local cached = query_cache[lang][query]
   if cached then
     return cached
-  else
-    local self = setmetatable({}, Query)
-    self.query = vim._ts_parse_query(lang, query)
-    self.info = self.query:inspect()
-    self.captures = self.info.captures
-    query_cache[lang][query] = self
-    return self
   end
+
+  local self = setmetatable({}, Query)
+  self.query = vim._ts_parse_query(lang, query)
+  self.info = self.query:inspect()
+  self.captures = self.info.captures
+  query_cache[lang][query] = self
+  return self
+end
+
+---Get the range of a |TSNode|. Can also supply {source} and {metadata}
+---to get the range with directives applied.
+---@param node TSNode
+---@param source integer|string|nil Buffer or string from which the {node} is extracted
+---@param metadata TSMetadata|nil
+---@return Range6
+function M.get_range(node, source, metadata)
+  if metadata and metadata.range then
+    assert(source)
+    return Range.add_bytes(source, metadata.range)
+  end
+  return { node:range(true) }
 end
 
 --- Gets the text corresponding to a given node
@@ -271,24 +265,22 @@ end
 ---@param node TSNode
 ---@param source (integer|string) Buffer or string from which the {node} is extracted
 ---@param opts (table|nil) Optional parameters.
----          - concat: (boolean) Concatenate result in a string (default true)
 ---          - metadata (table) Metadata of a specific capture. This would be
 ---            set to `metadata[capture_id]` when using |vim.treesitter.add_directive()|.
----@return (string[]|string|nil)
+---@return string
 function M.get_node_text(node, source, opts)
   opts = opts or {}
-  -- TODO(lewis6991): concat only works when source is number.
-  local concat = vim.F.if_nil(opts.concat, true)
   local metadata = opts.metadata or {}
 
   if metadata.text then
     return metadata.text
   elseif type(source) == 'number' then
-    return metadata.range and buf_range_get_text(source, metadata.range, concat)
-      or buf_range_get_text(source, { node:range() }, concat)
-  elseif type(source) == 'string' then
-    return source:sub(select(3, node:start()) + 1, select(3, node:end_()))
+    local range = M.get_range(node, source, metadata)
+    return buf_range_get_text(source, range)
   end
+
+  ---@cast source string
+  return source:sub(select(3, node:start()) + 1, select(3, node:end_()))
 end
 
 ---@alias TSMatch table<integer,TSNode>
@@ -312,7 +304,7 @@ local predicate_handlers = {
       str = predicate[3]
     else
       -- (#eq? @aa @bb)
-      str = M.get_node_text(match[predicate[3]], source) --[[@as string]]
+      str = M.get_node_text(match[predicate[3]], source)
     end
 
     if node_text ~= str or str == nil then
@@ -328,7 +320,7 @@ local predicate_handlers = {
       return true
     end
     local regex = predicate[3]
-    return string.find(M.get_node_text(node, source) --[[@as string]], regex) ~= nil
+    return string.find(M.get_node_text(node, source), regex) ~= nil
   end,
 
   ['match?'] = (function()
@@ -366,7 +358,7 @@ local predicate_handlers = {
     if not node then
       return true
     end
-    local node_text = M.get_node_text(node, source) --[[@as string]]
+    local node_text = M.get_node_text(node, source)
 
     for i = 3, #predicate do
       if string.find(node_text, predicate[i], 1, true) then
@@ -404,9 +396,9 @@ local predicate_handlers = {
 predicate_handlers['vim-match?'] = predicate_handlers['match?']
 
 ---@class TSMetadata
+---@field range Range4|Range6
 ---@field [integer] TSMetadata
 ---@field [string] integer|string
----@field range Range4
 
 ---@alias TSDirective fun(match: TSMatch, _, _, predicate: (string|integer)[], metadata: TSMetadata)
 
@@ -465,13 +457,20 @@ local directive_handlers = {
     assert(#pred == 4)
 
     local id = pred[2]
+    assert(type(id) == 'number')
+
     local node = match[id]
     local text = M.get_node_text(node, bufnr, { metadata = metadata[id] }) or ''
 
     if not metadata[id] then
       metadata[id] = {}
     end
-    metadata[id].text = text:gsub(pred[3], pred[4])
+
+    local pattern, replacement = pred[3], pred[3]
+    assert(type(pattern) == 'string')
+    assert(type(replacement) == 'string')
+
+    metadata[id].text = text:gsub(pattern, replacement)
   end,
 }
 
-- 
cgit 


From 8cb5b995b6e4d86035e6950d92c0c68ab4e46787 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 11 Mar 2023 10:05:47 +0800
Subject: vim-patch:9.0.1397: highlight for popupmenu kind and extra cannot be
 set (#22619)

Problem:    Highlight for popupmenu kind and extra cannot be set.
Solution:   Add PmenuKind, PmenuKindSel, PmenuExtra and PmenuExtraSel
            highlight groups and use them. (Gianmaria Bajo, closes vim/vim#12114)

https://github.com/vim/vim/commit/6a7c7749204b256e779c245b1e999bf852ad7b64

Co-authored-by: Gianmaria Bajo <mg1979.git@gmail.com>
---
 runtime/doc/syntax.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index b22d673eb9..9051375da2 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -5278,6 +5278,14 @@ NormalNC	Normal text in non-current windows.
 Pmenu		Popup menu: Normal item.
 							*hl-PmenuSel*
 PmenuSel	Popup menu: Selected item.
+							*hl-PmenuKind*
+PmenuKind	Popup menu: Normal item "kind".
+							*hl-PmenuKindSel*
+PmenuKindSel	Popup menu: Selected item "kind".
+							*hl-PmenuExtra*
+PmenuExtra	Popup menu: Normal item "extra text".
+							*hl-PmenuExtraSel*
+PmenuExtraSel	Popup menu: Selected item "extra text".
 							*hl-PmenuSbar*
 PmenuSbar	Popup menu: Scrollbar.
 							*hl-PmenuThumb*
-- 
cgit 


From 674e23f19c509381e2476a3990e21272e362e3a4 Mon Sep 17 00:00:00 2001
From: Michal Liszcz <liszcz.michal@gmail.com>
Date: Sat, 11 Mar 2023 04:22:22 +0100
Subject: vim-patch:9.0.0244: cannot easily get the list of sourced scripts
 (#22596)

Problem:    Cannot easily get the list of sourced scripts.
Solution:   Add the getscriptinfo() function. (Yegappan Lakshmanan,
            closes vim/vim#10957)

https://github.com/vim/vim/commit/f768c3d19c518822d89dec4cc3947ddeea249316

Cherry-pick usr_41.txt change from a later runtime update.

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 11 +++++++++++
 runtime/doc/usr_41.txt  | 16 +++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5e918a19f4..0e04e9035b 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -223,6 +223,7 @@ getreg([{regname} [, 1 [, {list}]]])
 				String or List   contents of a register
 getreginfo([{regname}])		Dict	information about a register
 getregtype([{regname}])		String	type of a register
+getscriptinfo()		List	list of sourced scripts
 gettabinfo([{expr}])		List	list of tab pages
 gettabvar({nr}, {varname} [, {def}])
 				any	variable {varname} in tab {nr} or {def}
@@ -3576,6 +3577,16 @@ getregtype([{regname}])					*getregtype()*
 		Can also be used as a |method|: >
 			GetRegname()->getregtype()
 
+getscriptinfo()					*getscriptinfo()*
+		Returns a |List| with information about all the sourced Vim
+		scripts in the order they were sourced.
+
+		Each item in the returned List is a |Dict| with the following
+		items:
+		    autoload	always set to FALSE.
+		    name	vim script file name.
+		    sid		script ID |<SID>|.
+
 gettabinfo([{tabnr}])					*gettabinfo()*
 		If {tabnr} is not specified, then information about all the
 		tab pages is returned as a |List|. Each List item is a
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index ed16f837cf..17a34b1236 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1056,6 +1056,14 @@ Prompt Buffer:					*promptbuffer-functions*
 	prompt_setinterrupt()	set interrupt callback for a buffer
 	prompt_setprompt()	set the prompt text for a buffer
 
+Registers:					*register-functions*
+	getreg()		get contents of a register
+	getreginfo()		get information about a register
+	getregtype()		get type of a register
+	setreg()		set contents and type of a register
+	reg_executing()		return the name of the register being executed
+	reg_recording()		return the name of the register being recorded
+
 Context Stack:					*ctx-functions*
 	ctxget()		return context at given index from top
 	ctxpop()		pop and restore top context
@@ -1072,6 +1080,7 @@ Various:					*various-functions*
 	did_filetype()		check if a FileType autocommand was used
 	eventhandler()		check if invoked by an event handler
 	getpid()		get process ID of Vim
+	getscriptinfo()		get list of sourced vim scripts
 
 	libcall()		call a function in an external library
 	libcallnr()		idem, returning a number
@@ -1079,13 +1088,6 @@ Various:					*various-functions*
 	undofile()		get the name of the undo file
 	undotree()		return the state of the undo tree
 
-	getreg()		get contents of a register
-	getreginfo()		get information about a register
-	getregtype()		get type of a register
-	setreg()		set contents and type of a register
-	reg_executing()		return the name of the register being executed
-	reg_recording()		return the name of the register being recorded
-
 	shiftwidth()		effective value of 'shiftwidth'
 
 	wordcount()		get byte/word/char count of buffer
-- 
cgit 


From 236c20795eb9f11e21e0719b735ea741711acc08 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sat, 11 Mar 2023 07:35:23 +0100
Subject: revert: "fix(lsp): use buffer scheme for files not stored on disk"
 (#22604)

Although using `buffer://` for unsaved file buffers fixes issues with
language servers like eclipse.jdt.ls or ansible-language-server, it
breaks completion and signature help for clangd.

A regression is worse than a fix for something else, so this reverts
commit 896d672736b32a8f4a4fa51844b44f266dcdcc6c.

The spec change is also still in dicussion, see
https://github.com/microsoft/language-server-protocol/pull/1679#discussion_r1130704886
---
 runtime/lua/vim/lsp.lua      | 54 ++++++++++----------------------------------
 runtime/lua/vim/lsp/util.lua |  9 ++------
 2 files changed, 14 insertions(+), 49 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index c85d38a50e..117b32dc57 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -369,7 +369,7 @@ do
   --- @field offset_encoding "utf-8"|"utf-16"|"utf-32"
   ---
   --- @class CTBufferState
-  --- @field uri string uri of the buffer
+  --- @field name string name of the buffer
   --- @field lines string[] snapshot of buffer lines from last didChange
   --- @field lines_tmp string[]
   --- @field pending_changes table[] List of debounced changes in incremental sync mode
@@ -488,12 +488,8 @@ do
     if buf_state then
       buf_state.refs = buf_state.refs + 1
     else
-      local uri = vim.uri_from_bufnr(bufnr)
-      if not uv.fs_stat(api.nvim_buf_get_name(bufnr)) then
-        uri = uri:gsub('^file://', 'buffer://')
-      end
       buf_state = {
-        uri = uri,
+        name = api.nvim_buf_get_name(bufnr),
         lines = {},
         lines_tmp = {},
         pending_changes = {},
@@ -508,26 +504,12 @@ do
   end
 
   ---@private
-  ---@param client table
-  ---@param bufnr integer
-  ---@return string uri
-  function changetracking._get_uri(client, bufnr)
-    local state = state_by_group[get_group(client)] or {}
-    local buf_state = (state.buffers or {})[bufnr]
-    return assert(buf_state.uri, 'Must have an URI set')
-  end
-
-  ---@private
-  ---@param client table
-  ---@param bufnr integer
-  ---@param uri string
-  ---@return string uri
-  function changetracking._get_and_set_uri(client, bufnr, uri)
+  function changetracking._get_and_set_name(client, bufnr, name)
     local state = state_by_group[get_group(client)] or {}
     local buf_state = (state.buffers or {})[bufnr]
-    local old_uri = buf_state.uri
-    buf_state.uri = uri
-    return old_uri
+    local old_name = buf_state.name
+    buf_state.name = name
+    return old_name
   end
 
   ---@private
@@ -614,7 +596,7 @@ do
         { text = buf_get_full_text(bufnr) },
       }
     end
-    local uri = buf_state.uri
+    local uri = vim.uri_from_bufnr(bufnr)
     for _, client in pairs(state.clients) do
       if not client.is_stopped() and lsp.buf_is_attached(bufnr, client.id) then
         client.notify('textDocument/didChange', {
@@ -727,14 +709,11 @@ local function text_document_did_open_handler(bufnr, client)
     return
   end
   local filetype = nvim_buf_get_option(bufnr, 'filetype')
-  local uri = vim.uri_from_bufnr(bufnr)
-  if not uv.fs_stat(api.nvim_buf_get_name(bufnr)) then
-    uri = uri:gsub('^file://', 'buffer://')
-  end
+
   local params = {
     textDocument = {
       version = 0,
-      uri = uri,
+      uri = vim.uri_from_bufnr(bufnr),
       languageId = client.config.get_language_id(bufnr, filetype),
       text = buf_get_full_text(bufnr),
     },
@@ -1611,13 +1590,8 @@ local function text_document_did_save_handler(bufnr)
   local text = once(buf_get_full_text)
   for_each_buffer_client(bufnr, function(client)
     local name = api.nvim_buf_get_name(bufnr)
-    local old_uri = changetracking._get_and_set_uri(client, bufnr, uri)
-    if old_uri and name ~= old_uri then
-      client.notify('textDocument/didClose', {
-        textDocument = {
-          uri = old_uri,
-        },
-      })
+    local old_name = changetracking._get_and_set_name(client, bufnr, name)
+    if old_name and name ~= old_name then
       client.notify('textDocument/didOpen', {
         textDocument = {
           version = 0,
@@ -1720,12 +1694,8 @@ function lsp.buf_attach_client(bufnr, client_id)
         end)
       end,
       on_detach = function()
+        local params = { textDocument = { uri = uri } }
         for_each_buffer_client(bufnr, function(client, _)
-          local params = {
-            textDocument = {
-              uri = changetracking._get_uri(client, bufnr),
-            },
-          }
           changetracking.reset_buf(client, bufnr)
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
             client.notify('textDocument/didClose', params)
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index c9613dc7a7..342fad33c2 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -2032,12 +2032,7 @@ end
 ---@returns `TextDocumentIdentifier`
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentIdentifier
 function M.make_text_document_params(bufnr)
-  bufnr = bufnr or 0
-  local uri = vim.uri_from_bufnr(bufnr)
-  if not uv.fs_stat(api.nvim_buf_get_name(bufnr)) then
-    uri = uri:gsub('^file://', 'buffer://')
-  end
-  return { uri = uri }
+  return { uri = vim.uri_from_bufnr(bufnr or 0) }
 end
 
 --- Create the workspace params
@@ -2070,7 +2065,7 @@ function M.make_formatting_params(options)
     insertSpaces = vim.bo.expandtab,
   })
   return {
-    textDocument = M.make_text_document_params(0),
+    textDocument = { uri = vim.uri_from_bufnr(0) },
     options = options,
   }
 end
-- 
cgit 


From c2f7f8d61c6436e1de13d921f13760fbdfe1d624 Mon Sep 17 00:00:00 2001
From: nullchilly <nullchilly@gmail.com>
Date: Sat, 11 Mar 2023 17:23:50 +0700
Subject: refactor(highlight)!: remove deprecated functions
 vim.highlight.create/link

---
 runtime/lua/vim/highlight.lua | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index 89eae0def5..d71a806ea8 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -10,30 +10,6 @@ M.priorities = {
   user = 200,
 }
 
----@private
-function M.create(higroup, hi_info, default)
-  vim.deprecate('vim.highlight.create', 'vim.api.nvim_set_hl', '0.9')
-  local options = {}
-  -- TODO: Add validation
-  for k, v in pairs(hi_info) do
-    table.insert(options, string.format('%s=%s', k, v))
-  end
-  vim.cmd(
-    string.format(
-      [[highlight %s %s %s]],
-      default and 'default' or '',
-      higroup,
-      table.concat(options, ' ')
-    )
-  )
-end
-
----@private
-function M.link(higroup, link_to, force)
-  vim.deprecate('vim.highlight.link', 'vim.api.nvim_set_hl', '0.9')
-  vim.cmd(string.format([[highlight%s link %s %s]], force and '!' or ' default', higroup, link_to))
-end
-
 --- Highlight range between two positions
 ---
 ---@param bufnr integer Buffer number to apply highlighting to
-- 
cgit 


From 71eebd28d1da487fbbb3c162c6b909940f76883d Mon Sep 17 00:00:00 2001
From: nullchilly <nullchilly@gmail.com>
Date: Sat, 11 Mar 2023 17:24:48 +0700
Subject: refactor(treesitter)!: remove deprecated show_tree func

---
 runtime/lua/vim/treesitter.lua | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 5723cce563..56000f99a8 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -648,12 +648,6 @@ function M.inspect_tree(opts)
   })
 end
 
----@deprecated
----@private
-function M.show_tree()
-  vim.deprecate('show_tree', 'inspect_tree', '0.9', nil, false)
-end
-
 --- Returns the fold level for {lnum} in the current buffer. Can be set directly to 'foldexpr':
 --- <pre>lua
 --- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
-- 
cgit 


From 36ca082a11e70e84c985a62db293732ea527ea01 Mon Sep 17 00:00:00 2001
From: nullchilly <nullchilly@gmail.com>
Date: Sat, 11 Mar 2023 17:27:16 +0700
Subject: refactor(health)!: remove deprecated health.lua

---
 runtime/lua/health.lua | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 runtime/lua/health.lua

(limited to 'runtime')

diff --git a/runtime/lua/health.lua b/runtime/lua/health.lua
deleted file mode 100644
index 40e2b3c3e7..0000000000
--- a/runtime/lua/health.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return setmetatable({}, {
-  __index = function(_, k)
-    vim.deprecate("require('health')", 'vim.health', '0.9', false)
-    return vim.health[k]
-  end,
-})
-- 
cgit 


From 865d8d4720ca72de1c385773ca4c597f3642874c Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Sat, 11 Mar 2023 21:49:53 +0800
Subject: refactor(lsp): remove _resolve_capabilities_compat (#22628)

---
 runtime/lua/vim/lsp/protocol.lua | 174 ---------------------------------------
 1 file changed, 174 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 27dd68645a..1686e22c48 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -854,7 +854,6 @@ function protocol.make_client_capabilities()
   }
 end
 
-local if_nil = vim.F.if_nil
 --- Creates a normalized object describing LSP server capabilities.
 ---@param server_capabilities table Table of capabilities supported by the server
 ---@return table Normalized table of capabilities
@@ -892,178 +891,5 @@ function protocol.resolve_capabilities(server_capabilities)
   return server_capabilities
 end
 
----@private
---- Creates a normalized object describing LSP server capabilities.
--- @deprecated access resolved_capabilities instead
----@param server_capabilities table Table of capabilities supported by the server
----@return table Normalized table of capabilities
-function protocol._resolve_capabilities_compat(server_capabilities)
-  local general_properties = {}
-  local text_document_sync_properties
-  do
-    local TextDocumentSyncKind = protocol.TextDocumentSyncKind
-    local textDocumentSync = server_capabilities.textDocumentSync
-    if textDocumentSync == nil then
-      -- Defaults if omitted.
-      text_document_sync_properties = {
-        text_document_open_close = false,
-        text_document_did_change = TextDocumentSyncKind.None,
-        --        text_document_did_change = false;
-        text_document_will_save = false,
-        text_document_will_save_wait_until = false,
-        text_document_save = false,
-        text_document_save_include_text = false,
-      }
-    elseif type(textDocumentSync) == 'number' then
-      -- Backwards compatibility
-      if not TextDocumentSyncKind[textDocumentSync] then
-        return nil, 'Invalid server TextDocumentSyncKind for textDocumentSync'
-      end
-      text_document_sync_properties = {
-        text_document_open_close = true,
-        text_document_did_change = textDocumentSync,
-        text_document_will_save = false,
-        text_document_will_save_wait_until = false,
-        text_document_save = true,
-        text_document_save_include_text = false,
-      }
-    elseif type(textDocumentSync) == 'table' then
-      text_document_sync_properties = {
-        text_document_open_close = if_nil(textDocumentSync.openClose, false),
-        text_document_did_change = if_nil(textDocumentSync.change, TextDocumentSyncKind.None),
-        text_document_will_save = if_nil(textDocumentSync.willSave, true),
-        text_document_will_save_wait_until = if_nil(textDocumentSync.willSaveWaitUntil, true),
-        text_document_save = if_nil(textDocumentSync.save, false),
-        text_document_save_include_text = if_nil(
-          type(textDocumentSync.save) == 'table' and textDocumentSync.save.includeText,
-          false
-        ),
-      }
-    else
-      return nil, string.format('Invalid type for textDocumentSync: %q', type(textDocumentSync))
-    end
-  end
-  general_properties.completion = server_capabilities.completionProvider ~= nil
-  general_properties.hover = server_capabilities.hoverProvider or false
-  general_properties.goto_definition = server_capabilities.definitionProvider or false
-  general_properties.find_references = server_capabilities.referencesProvider or false
-  general_properties.document_highlight = server_capabilities.documentHighlightProvider or false
-  general_properties.document_symbol = server_capabilities.documentSymbolProvider or false
-  general_properties.workspace_symbol = server_capabilities.workspaceSymbolProvider or false
-  general_properties.document_formatting = server_capabilities.documentFormattingProvider or false
-  general_properties.document_range_formatting = server_capabilities.documentRangeFormattingProvider
-    or false
-  general_properties.call_hierarchy = server_capabilities.callHierarchyProvider or false
-  general_properties.execute_command = server_capabilities.executeCommandProvider ~= nil
-
-  if server_capabilities.renameProvider == nil then
-    general_properties.rename = false
-  elseif type(server_capabilities.renameProvider) == 'boolean' then
-    general_properties.rename = server_capabilities.renameProvider
-  else
-    general_properties.rename = true
-  end
-
-  if server_capabilities.codeLensProvider == nil then
-    general_properties.code_lens = false
-    general_properties.code_lens_resolve = false
-  elseif type(server_capabilities.codeLensProvider) == 'table' then
-    general_properties.code_lens = true
-    general_properties.code_lens_resolve = server_capabilities.codeLensProvider.resolveProvider
-      or false
-  else
-    error('The server sent invalid codeLensProvider')
-  end
-
-  if server_capabilities.codeActionProvider == nil then
-    general_properties.code_action = false
-  elseif
-    type(server_capabilities.codeActionProvider) == 'boolean'
-    or type(server_capabilities.codeActionProvider) == 'table'
-  then
-    general_properties.code_action = server_capabilities.codeActionProvider
-  else
-    error('The server sent invalid codeActionProvider')
-  end
-
-  if server_capabilities.declarationProvider == nil then
-    general_properties.declaration = false
-  elseif type(server_capabilities.declarationProvider) == 'boolean' then
-    general_properties.declaration = server_capabilities.declarationProvider
-  elseif type(server_capabilities.declarationProvider) == 'table' then
-    general_properties.declaration = server_capabilities.declarationProvider
-  else
-    error('The server sent invalid declarationProvider')
-  end
-
-  if server_capabilities.typeDefinitionProvider == nil then
-    general_properties.type_definition = false
-  elseif type(server_capabilities.typeDefinitionProvider) == 'boolean' then
-    general_properties.type_definition = server_capabilities.typeDefinitionProvider
-  elseif type(server_capabilities.typeDefinitionProvider) == 'table' then
-    general_properties.type_definition = server_capabilities.typeDefinitionProvider
-  else
-    error('The server sent invalid typeDefinitionProvider')
-  end
-
-  if server_capabilities.implementationProvider == nil then
-    general_properties.implementation = false
-  elseif type(server_capabilities.implementationProvider) == 'boolean' then
-    general_properties.implementation = server_capabilities.implementationProvider
-  elseif type(server_capabilities.implementationProvider) == 'table' then
-    general_properties.implementation = server_capabilities.implementationProvider
-  else
-    error('The server sent invalid implementationProvider')
-  end
-
-  local workspace = server_capabilities.workspace
-  local workspace_properties = {}
-  if workspace == nil or workspace.workspaceFolders == nil then
-    -- Defaults if omitted.
-    workspace_properties = {
-      workspace_folder_properties = {
-        supported = false,
-        changeNotifications = false,
-      },
-    }
-  elseif type(workspace.workspaceFolders) == 'table' then
-    workspace_properties = {
-      workspace_folder_properties = {
-        supported = if_nil(workspace.workspaceFolders.supported, false),
-        changeNotifications = if_nil(workspace.workspaceFolders.changeNotifications, false),
-      },
-    }
-  else
-    error('The server sent invalid workspace')
-  end
-
-  local signature_help_properties
-  if server_capabilities.signatureHelpProvider == nil then
-    signature_help_properties = {
-      signature_help = false,
-      signature_help_trigger_characters = {},
-    }
-  elseif type(server_capabilities.signatureHelpProvider) == 'table' then
-    signature_help_properties = {
-      signature_help = true,
-      -- The characters that trigger signature help automatically.
-      signature_help_trigger_characters = server_capabilities.signatureHelpProvider.triggerCharacters
-        or {},
-    }
-  else
-    error('The server sent invalid signatureHelpProvider')
-  end
-
-  local capabilities = vim.tbl_extend(
-    'error',
-    text_document_sync_properties,
-    signature_help_properties,
-    workspace_properties,
-    general_properties
-  )
-
-  return capabilities
-end
-
 return protocol
 -- vim:sw=2 ts=2 et
-- 
cgit 


From 23dc2a59b6e13b0dbab47c6c64ac5a55095b258b Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sat, 11 Mar 2023 14:50:14 +0100
Subject: fix(lsp): send didClose on buffer rename (#22623)

Subset of https://github.com/neovim/neovim/pull/22407 that was reverted
in https://github.com/neovim/neovim/pull/22604

If a buffer is renamed sending `didClose` for the old buffer helps
ensure the language server doesn't keep a stale document in memory.
---
 runtime/lua/vim/lsp.lua | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 117b32dc57..1896543da3 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1,3 +1,4 @@
+---@diagnostic disable: invisible
 local default_handlers = require('vim.lsp.handlers')
 local log = require('vim.lsp.log')
 local lsp_rpc = require('vim.lsp.rpc')
@@ -1592,6 +1593,11 @@ local function text_document_did_save_handler(bufnr)
     local name = api.nvim_buf_get_name(bufnr)
     local old_name = changetracking._get_and_set_name(client, bufnr, name)
     if old_name and name ~= old_name then
+      client.notify('textDocument/didClose', {
+        textDocument = {
+          uri = vim.uri_from_fname(old_name),
+        },
+      })
       client.notify('textDocument/didOpen', {
         textDocument = {
           version = 0,
-- 
cgit 


From 0ce626b783dcca8eed08a2bb5a18e2c3ef931fbe Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 11 Mar 2023 22:50:53 +0900
Subject: docs(lsp): more precise type annotations (#22621)

---
 runtime/doc/lsp.txt     |  8 ++++----
 runtime/lua/vim/lsp.lua | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index d13dc4a782..ca65251a9f 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -676,7 +676,7 @@ buf_request_all({bufnr}, {method}, {params}, {callback})
                     finished. Unlike `buf_request`, this will collect all the
                     responses from each server instead of handling them. A map
                     of client_id:request_result will be provided to the
-                    callback
+                    callback.
 
     Return: ~
         fun() cancel A function that will cancel all requests
@@ -697,9 +697,9 @@ buf_request_sync({bufnr}, {method}, {params}, {timeout_ms})
                       result. Defaults to 1000
 
     Return: ~
-        table<integer, any>|nil result, string|nil err Map of
-        client_id:request_result. On timeout, cancel or error, returns `(nil,
-        err)` where `err` is a string describing the failure reason.
+        (table) result Map of client_id:request_result.
+        (string|nil) err On timeout, cancel, or error, `err` is a string
+        describing the failure reason, and `result` is nil.
 
 client()                                                      *vim.lsp.client*
     LSP client object. You can get an active client object via
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 1896543da3..39665a3d4f 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1038,7 +1038,7 @@ function lsp.start_client(config)
   --- Returns the default handler if the user hasn't set a custom one.
   ---
   ---@param method (string) LSP method name
-  ---@return function|nil The handler for the given method, if defined, or the default from |vim.lsp.handlers|
+  ---@return lsp-handler|nil The handler for the given method, if defined, or the default from |vim.lsp.handlers|
   local function resolve_handler(method)
     return handlers[method] or default_handlers[method]
   end
@@ -1938,7 +1938,7 @@ api.nvim_create_autocmd('VimLeavePre', {
 ---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
 ---@param params table|nil Parameters to send to the server
----@param handler function|nil See |lsp-handler|
+---@param handler lsp-handler|nil See |lsp-handler|
 ---       If nil, follows resolution strategy defined in |lsp-handler-configuration|
 ---
 ---@return table<integer, integer>, fun() 2-tuple:
@@ -1998,9 +1998,10 @@ end
 ---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
 ---@param params (table|nil) Parameters to send to the server
----@param callback (function) The callback to call when all requests are finished.
+---@param callback fun(request_results: table<integer, {error: lsp.ResponseError, result: any}>) (function)
+--- The callback to call when all requests are finished.
 --- Unlike `buf_request`, this will collect all the responses from each server instead of handling them.
---- A map of client_id:request_result will be provided to the callback
+--- A map of client_id:request_result will be provided to the callback.
 ---
 ---@return fun() cancel A function that will cancel all requests
 function lsp.buf_request_all(bufnr, method, params, callback)
@@ -2043,9 +2044,8 @@ end
 ---@param timeout_ms (integer|nil) Maximum time in milliseconds to wait for a
 ---                               result. Defaults to 1000
 ---
----@return table<integer, any>|nil result, string|nil err Map of client_id:request_result.
---- On timeout, cancel or error, returns `(nil, err)` where `err` is a string describing
---- the failure reason.
+---@return table<integer, {err: lsp.ResponseError, result: any}>|nil (table) result Map of client_id:request_result.
+---@return string|nil err On timeout, cancel, or error, `err` is a string describing the failure reason, and `result` is nil.
 function lsp.buf_request_sync(bufnr, method, params, timeout_ms)
   local request_results
 
-- 
cgit 


From 58bbc2ea0b3dfed13471e8cc0447d7598be24276 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 10 Mar 2023 16:40:27 +0000
Subject: refactor(treesitter): add Range type aliase for Range4|Range6

---
 runtime/doc/news.txt                        |  5 +++++
 runtime/doc/treesitter.txt                  |  3 ++-
 runtime/lua/vim/treesitter/_range.lua       | 14 ++++++++------
 runtime/lua/vim/treesitter/languagetree.lua | 15 ++++++---------
 runtime/lua/vim/treesitter/query.lua        | 12 ++++++++++--
 5 files changed, 31 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 04ae9360a0..7df96874ea 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -50,6 +50,11 @@ The following changes may require adaptations in user config or plugins.
 • Unsaved changes are now preserved rather than discarded when |channel-stdio|
   is closed.
 
+• Changes to |vim.treesitter.get_node_text()|:
+  - It now returns `string`, as opposed to `string|string[]|nil`.
+  - The `concat` option has been removed as it was not consistently applied.
+  - Invalid ranges now cause an error instead of returning `nil`.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index dc577a015e..8a0145127c 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -898,7 +898,8 @@ Query:iter_captures({self}, {node}, {source}, {start}, {stop})
       • {self}
 
     Return: ~
-        (fun(): integer, TSNode, TSMetadata ): capture id, capture node, metadata
+        (fun(): integer, TSNode, TSMetadata): capture id, capture node,
+        metadata
 
                                                         *Query:iter_matches()*
 Query:iter_matches({self}, {node}, {source}, {start}, {stop})
diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index 0017a567ec..f4db5016ac 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -16,6 +16,8 @@ local M = {}
 ---@field [5] integer end column
 ---@field [6] integer end bytes
 
+---@alias Range Range4|Range6
+
 ---@private
 ---@param a_row integer
 ---@param a_col integer
@@ -85,8 +87,8 @@ function M.validate(r)
 end
 
 ---@private
----@param r1 Range4|Range6
----@param r2 Range4|Range6
+---@param r1 Range
+---@param r2 Range
 ---@return boolean
 function M.intercepts(r1, r2)
   local srow_1, scol_1, erow_1, ecol_1 = M.unpack4(r1)
@@ -106,7 +108,7 @@ function M.intercepts(r1, r2)
 end
 
 ---@private
----@param r Range4|Range6
+---@param r Range
 ---@return integer, integer, integer, integer
 function M.unpack4(r)
   local off_1 = #r == 6 and 1 or 0
@@ -121,8 +123,8 @@ function M.unpack6(r)
 end
 
 ---@private
----@param r1 Range4|Range6
----@param r2 Range4|Range6
+---@param r1 Range
+---@param r2 Range
 ---@return boolean whether r1 contains r2
 function M.contains(r1, r2)
   local srow_1, scol_1, erow_1, ecol_1 = M.unpack4(r1)
@@ -143,7 +145,7 @@ end
 
 ---@private
 ---@param source integer|string
----@param range Range4|Range6
+---@param range Range
 ---@return Range6
 function M.add_bytes(source, range)
   if type(range) == 'table' and #range == 6 then
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 0bb0601241..6869fae92c 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -484,7 +484,6 @@ function LanguageTree:included_regions()
 end
 
 ---@private
---- TODO(lewis6991): cleanup of the node_range interface
 ---@param node TSNode
 ---@param source string|integer
 ---@param metadata TSMetadata
@@ -530,7 +529,7 @@ end
 ---@param pattern integer
 ---@param lang string
 ---@param combined boolean
----@param ranges Range4[]
+---@param ranges Range6[]
 local function add_injection(t, tree_index, pattern, lang, combined, ranges)
   assert(type(lang) == 'string')
 
@@ -558,13 +557,11 @@ end
 --- https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection
 ---@param match table<integer,TSNode>
 ---@param metadata TSMetadata
----@return string, boolean, Range4[]
+---@return string?, boolean, Range6[]
 function LanguageTree:_get_injection(match, metadata)
-  local ranges = {} ---@type Range4[]
+  local ranges = {} ---@type Range6[]
   local combined = metadata['injection.combined'] ~= nil
-  local lang = metadata['injection.language']
-  assert(type(lang) == 'string')
-
+  local lang = metadata['injection.language'] --[[@as string?]]
   local include_children = metadata['injection.include-children'] ~= nil
 
   for id, node in pairs(match) do
@@ -584,7 +581,7 @@ end
 ---@private
 ---@param match table<integer,TSNode>
 ---@param metadata TSMetadata
----@return string, boolean, Range4[]
+---@return string, boolean, Range6[]
 function LanguageTree:_get_injection_deprecated(match, metadata)
   local lang = nil ---@type string
   local ranges = {} ---@type Range6[]
@@ -910,7 +907,7 @@ end
 
 ---@private
 ---@param tree TSTree
----@param range Range4
+---@param range Range
 ---@return boolean
 local function tree_contains(tree, range)
   return Range.contains({ tree:root():range() }, range)
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 70af4f7bce..f4e038b2d8 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -59,10 +59,18 @@ end
 
 ---@private
 ---@param buf integer
----@param range Range6
+---@param range Range
 ---@returns string
 local function buf_range_get_text(buf, range)
   local start_row, start_col, end_row, end_col = Range.unpack4(range)
+  if end_col == 0 then
+    if start_row == end_row then
+      start_col = -1
+      start_row = start_row - 1
+    end
+    end_col = -1
+    end_row = end_row - 1
+  end
   local lines = a.nvim_buf_get_text(buf, start_row, start_col, end_row, end_col, {})
   return table.concat(lines, '\n')
 end
@@ -396,7 +404,7 @@ local predicate_handlers = {
 predicate_handlers['vim-match?'] = predicate_handlers['match?']
 
 ---@class TSMetadata
----@field range Range4|Range6
+---@field range Range
 ---@field [integer] TSMetadata
 ---@field [string] integer|string
 
-- 
cgit 


From 2ae54cef6e54ea97e2a18943389a9dba9ad365d2 Mon Sep 17 00:00:00 2001
From: nullchilly <nullchilly@gmail.com>
Date: Sat, 11 Mar 2023 17:57:07 +0700
Subject: docs: add removed features in news.txt

---
 runtime/doc/news.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 801b74df45..da9ebd589f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -237,6 +237,10 @@ The following deprecated functions or APIs were removed.
 • |LanguageTree:parse()| no longer returns changed regions. Please use the
   `on_changedtree` callbacks instead.
 
+• `vim.highlight.create()`, `vim.highlight.link()` were removed, use |nvim_set_hl()| instead.
+
+• `require'health'` was removed. Use |vim.health| instead.
+
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
 
-- 
cgit 


From d15abd1be4ae85b10174e3ee139d3b7605e87577 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sun, 12 Mar 2023 09:45:28 +0100
Subject: fix(lsp): use line start/end for visual line selection (#22632)

Fixes https://github.com/neovim/neovim/issues/22629
---
 runtime/lua/vim/lsp/buf.lua | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 6ac885c78f..0e16e8f820 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -118,8 +118,10 @@ function M.completion(context)
 end
 
 ---@private
+---@param bufnr integer
+---@param mode "v"|"V"
 ---@return table {start={row, col}, end={row, col}} using (1, 0) indexing
-local function range_from_selection()
+local function range_from_selection(bufnr, mode)
   -- TODO: Use `vim.region()` instead https://github.com/neovim/neovim/pull/13896
 
   -- [bufnum, lnum, col, off]; both row and column 1-indexed
@@ -138,6 +140,11 @@ local function range_from_selection()
     start_row, end_row = end_row, start_row
     start_col, end_col = end_col, start_col
   end
+  if mode == 'V' then
+    start_col = 1
+    local lines = api.nvim_buf_get_lines(bufnr, end_row - 1, end_row, true)
+    end_col = #lines[1]
+  end
   return {
     ['start'] = { start_row, start_col - 1 },
     ['end'] = { end_row, end_col - 1 },
@@ -200,7 +207,7 @@ function M.format(options)
   local mode = api.nvim_get_mode().mode
   local range = options.range
   if not range and mode == 'v' or mode == 'V' then
-    range = range_from_selection()
+    range = range_from_selection(bufnr, mode)
   end
   local method = range and 'textDocument/rangeFormatting' or 'textDocument/formatting'
 
@@ -772,7 +779,7 @@ function M.code_action(options)
     local end_ = assert(options.range['end'], 'range must have a `end` property')
     params = util.make_given_range_params(start, end_)
   elseif mode == 'v' or mode == 'V' then
-    local range = range_from_selection()
+    local range = range_from_selection(0, mode)
     params = util.make_given_range_params(range.start, range['end'])
   else
     params = util.make_range_params()
-- 
cgit 


From fd2ece278b0941ec6673489e88868120e86b834a Mon Sep 17 00:00:00 2001
From: Matthias Deiml <matthias@deiml.net>
Date: Sun, 12 Mar 2023 23:58:46 +0100
Subject: feat(ui): add scroll_delta to win_viewport event #19270

scroll_delta contains how much the top line of a window moved since the
last time win_viewport was emitted. It is expected to be used to
implement smooth scrolling. For this purpose it only counts "virtual" or
"displayed" so folds should count as one line. Because of this it
adds extra information that cannot be computed from the topline
parameter.

Fixes #19227
---
 runtime/doc/news.txt | 3 +++
 runtime/doc/ui.txt   | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 78cd05b7d5..48d954fe2d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -223,6 +223,9 @@ The following changes to existing APIs or features add new behavior.
 
 • API calls now show more information about where an exception happened.
 
+• The `win_viewport` UI event now contains information about virtual lines,
+  meaning that smooth scrolling can now be implemented more consistenlty.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index e706e36374..4ff74714f3 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -626,11 +626,15 @@ tabs.
 	When |ui-messages| is active, no message grid is used, and this event
 	will not be sent.
 
-["win_viewport", grid, win, topline, botline, curline, curcol] ~
+["win_viewport", grid, win, topline, botline, curline, curcol, line_count, scroll_delta] ~
 	Indicates the range of buffer text displayed in the window, as well
 	as the cursor position in the buffer. All positions are zero-based.
 	`botline` is set to one more than the line count of the buffer, if
-	there are filler lines past the end.
+	there are filler lines past the end. `scroll_delta` contains how much
+	the top line of a window moved since `win_viewport` was last emitted.
+	It is intended to be used to implement smooth scrolling. For this
+	purpose it only counts "virtual" or "displayed" lines, so folds
+	only count as one line.
 
 ["win_extmark", grid, win, ns_id, mark_id, row, col] ~
 	Updates the position of an extmark which is currently visible in a
-- 
cgit 


From 673d2b52fa4335aa083c52e6686f0728e25b8ebd Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 7 Mar 2023 16:04:57 +0100
Subject: refactor!: rename vim.pretty_print => vim.print

Problem:
The function name `vim.pretty_print`:
1. is verbose, which partially defeats its purpose as sugar
2. does not draw from existing precedent or any sort of convention
   (except external projects like penlight or python?), which reduces
   discoverability, and degrades signaling about best practices.

Solution:
- Rename to `vim.print`.
- Change the behavior so that
  1. strings are printed without quotes
  2. each arg is printed on its own line
  3. tables are indented with 2 instead of 4 spaces
- Example:
  :lua ='a', 'b', 42, {a=3}
  a
  b
  42
  {
    a = 3
  }

Comparison of alternatives:
- `vim.print`:
  - pro: consistent with Lua's `print()`
  - pro: aligns with potential `nvim_print` API function which will
    replace nvim_echo, nvim_notify, etc.
  - con: behaves differently than Lua's `print()`, slightly misleading?
- `vim.echo`:
  - pro: `:echo` has similar "pretty print" behavior.
  - con: inconsistent with Lua idioms.
- `vim.p`:
  - pro: very short, fits with `vim.o`, etc.
  - con: not as discoverable as "echo"
  - con: less opportunity for `local p = vim.p` because of potential shadowing.
---
 runtime/doc/deprecated.txt  |  1 +
 runtime/doc/diagnostic.txt  |  2 +-
 runtime/doc/lua-guide.txt   | 39 +++++++++++++++++++--------------------
 runtime/doc/lua.txt         | 17 +++++++++--------
 runtime/doc/news.txt        |  2 ++
 runtime/lua/vim/_editor.lua | 39 +++++++++++++++++++++++++++------------
 runtime/plugin/nvim.lua     |  2 +-
 7 files changed, 60 insertions(+), 42 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 3d861b07b3..5c8d7f044f 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -129,6 +129,7 @@ TREESITTER FUNCTIONS
 
 LUA
 - *vim.register_keystroke_callback()*	Use |vim.on_key()| instead.
+- *vim.pretty_print()*			Use |vim.print()| instead.
 
 NORMAL COMMANDS
 - *]f* *[f*		Same as "gf".
diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index cff73ad097..f888bb0991 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -325,7 +325,7 @@ Example: >lua
     vim.api.nvim_create_autocmd('DiagnosticChanged', {
       callback = function(args)
         local diagnostics = args.data.diagnostics
-        vim.pretty_print(diagnostics)
+        vim.print(diagnostics)
       end,
     })
 <
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 8ea84f8c60..5e2b753645 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -10,16 +10,16 @@
 ==============================================================================
 Introduction                                                         *lua-guide*
 
-This guide will go through the basics of using Lua in Neovim. It is not meant
+This guide will go through the basics of using Lua in Nvim. It is not meant
 to be a comprehensive encyclopedia of all available features, nor will it
 detail all intricacies. Think of it as a survival kit -- the bare minimum
-needed to know to comfortably get started on using Lua in Neovim.
+needed to know to comfortably get started on using Lua in Nvim.
 
 An important thing to note is that this isn't a guide to the Lua language
-itself. Rather, this is a guide on how to configure and modify Neovim through
+itself. Rather, this is a guide on how to configure and modify Nvim through
 the Lua language and the functions we provide to help with this. Take a look
 at |luaref| and |lua-concepts| if you'd like to learn more about Lua itself.
-Similarly, this guide assumes some familiarity with the basics of Neovim
+Similarly, this guide assumes some familiarity with the basics of Nvim
 (commands, options, mappings, autocommands), which are covered in the
 |user-manual|.
 
@@ -27,7 +27,7 @@ Similarly, this guide assumes some familiarity with the basics of Neovim
 Some words on the API                                            *lua-guide-api*
 
 The purpose of this guide is to introduce the different ways of interacting
-with Neovim through Lua (the "API"). This API consists of three different
+with Nvim through Lua (the "API"). This API consists of three different
 layers:
 
 1. The "Vim API" inherited from Vim: |ex-commands| and |builtin-functions| as
@@ -35,14 +35,14 @@ well as |user-function|s in Vimscript. These are accessed through |vim.cmd()|
 and |vim.fn| respectively, which are discussed under |lua-guide-vimscript|
 below.
 
-2. The "Neovim API" written in C for use in remote plugins and GUIs; see |api|.
+2. The "Nvim API" written in C for use in remote plugins and GUIs; see |api|.
 These functions are accessed through |vim.api|.
 
 3. The "Lua API" written in and specifically for Lua. These are any other
 functions accessible through `vim.*` not mentioned already; see |lua-stdlib|.
 
 This distinction is important, as API functions inherit behavior from their
-original layer: For example, Neovim API functions always need all arguments to
+original layer: For example, Nvim API functions always need all arguments to
 be specified even if Lua itself allows omitting arguments (which are then
 passed as `nil`); and Vim API functions can use 0-based indexing even if Lua
 arrays are 1-indexed by default.
@@ -58,7 +58,7 @@ convenient to use from Lua.
 ==============================================================================
 Using Lua                                                  *lua-guide-using-Lua*
 
-To run Lua code from the Neovim command line, use the |:lua| command:
+To run Lua code from the Nvim command line, use the |:lua| command:
 >vim
     :lua print("Hello!")
 <
@@ -69,10 +69,10 @@ local keyword are not accessible outside of the command. This won't work:
     :lua print(foo)
     " prints "nil" instead of "1"
 <
-You can also use `:lua=`, which is the same as `:lua vim.pretty_print(...)`,
-to conveniently check the value of a variable or a table:
+You can also use `:lua=`, which is equivalent to `:lua vim.print(...)`, to
+conveniently check the value of a variable or a table:
 >vim
-    :lua=package
+    :lua =package
 <
 To run a Lua script in an external file, you can use the |:source| command
 exactly like for a Vimscript file:
@@ -92,7 +92,7 @@ Finally, you can include Lua code in a Vimscript file by putting it inside a
 ------------------------------------------------------------------------------
 Using Lua files on startup                                    *lua-guide-config*
 
-Neovim supports using `init.vim` or `init.lua` as the configuration file, but
+Nvim supports using `init.vim` or `init.lua` as the configuration file, but
 not both at the same time. This should be placed in your |config| directory,
 which is typically `~/.config/nvim` for Linux, BSD, or macOS, and
 `~/AppData/Local/nvim/` for Windows. Note that you can use Lua in `init.vim`
@@ -279,7 +279,7 @@ Note that you cannot directly change fields of array variables. This won't
 work:
 >lua
     vim.g.some_global_variable.key2 = 400
-    vim.pretty_print(vim.g.some_global_variable)
+    vim.print(vim.g.some_global_variable)
     --> { key1 = "value", key2 = 300 }
 <
 Instead, you need to create an intermediate Lua table and change this:
@@ -287,7 +287,7 @@ Instead, you need to create an intermediate Lua table and change this:
     local temp_table = vim.g.some_global_variable
     temp_table.key2 = 400
     vim.g.some_global_variable = temp_table
-    vim.pretty_print(vim.g.some_global_variable)
+    vim.print(vim.g.some_global_variable)
     --> { key1 = "value", key2 = 400 }
 <
 To delete a variable, simply set it to `nil`:
@@ -350,7 +350,7 @@ use |vim.opt:get()|:
     --> {...} (big table)
     print(vim.opt.smarttab:get())
     --> false
-    vim.pretty_print(vim.opt.listchars:get())
+    vim.print(vim.opt.listchars:get())
     --> { space = '_', tab = '>~' }
 <
 ------------------------------------------------------------------------------
@@ -488,7 +488,7 @@ Autocommands                                            *lua-guide-autocommands*
 An |autocommand| is a Vim command or a Lua function that is automatically
 executed whenever one or more |events| are triggered, e.g., when a file is
 read or written, or when a window is created. These are accessible from Lua
-through the Neovim API.
+through the Nvim API.
 
 ------------------------------------------------------------------------------
 Creating autocommands                             *lua-guide-autocommand-create*
@@ -530,7 +530,7 @@ Examples:
     })
 <
 
-Neovim will always call a Lua function with a single table containing information
+Nvim will always call a Lua function with a single table containing information
 about the triggered autocommand. The most useful keys are
 • `match`: a string that matched the `pattern` (see |<amatch>|)
 • `buf`:   the number of the buffer the event was triggered in (see |<abuf>|)
@@ -667,9 +667,8 @@ cover only the basics of this advanced topic.
 ------------------------------------------------------------------------------
 Creating user commands                           *lua-guide-commands-create*
 
-User commands can be created through the Neovim API with
-`vim.api.`|nvim_create_user_command()|. This function takes three mandatory
-arguments:
+User commands can be created through with |nvim_create_user_command()|. This
+function takes three mandatory arguments:
 • a string that is the name of the command (which must start with an uppercase
   letter to distinguish it from builtin commands);
 • a string containing Vim commands or a Lua function that is executed when the
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index bcd68b7608..81e45ae9bb 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1239,7 +1239,7 @@ which is accessed through |vim.opt:get()|:
             print(vim.o.wildignore)
 <
         In Lua using `vim.opt`: >lua
-            vim.pretty_print(vim.opt.wildignore:get())
+            vim.print(vim.opt.wildignore:get())
 <
 
 In any of the above examples, to replicate the behavior |:setlocal|, use
@@ -1258,7 +1258,7 @@ Option:get()
     the values as entries in the array: >lua
         vim.cmd [[set wildignore=*.pyc,*.o]]
 
-        vim.pretty_print(vim.opt.wildignore:get())
+        vim.print(vim.opt.wildignore:get())
         -- { "*.pyc", "*.o", }
 
         for _, ignore_pattern in ipairs(vim.opt.wildignore:get()) do
@@ -1271,7 +1271,7 @@ Option:get()
     the names as keys and the values as entries: >lua
         vim.cmd [[set listchars=space:_,tab:>~]]
 
-        vim.pretty_print(vim.opt.listchars:get())
+        vim.print(vim.opt.listchars:get())
         --  { space = "_", tab = ">~", }
 
         for char, representation in pairs(vim.opt.listchars:get()) do
@@ -1282,7 +1282,7 @@ Option:get()
     as keys and `true` as entries. >lua
         vim.cmd [[set formatoptions=njtcroql]]
 
-        vim.pretty_print(vim.opt.formatoptions:get())
+        vim.print(vim.opt.formatoptions:get())
         -- { n = true, j = true, c = true, ... }
 
         local format_opts = vim.opt.formatoptions:get()
@@ -1496,10 +1496,11 @@ paste({lines}, {phase})                                          *vim.paste()*
     See also: ~
         |paste| @alias paste_phase -1 | 1 | 2 | 3
 
-pretty_print({...})                                       *vim.pretty_print()*
-    Prints given arguments in human-readable format. Example: >lua
-      -- Print highlight group Normal and store it's contents in a variable.
-      local hl_normal = vim.pretty_print(vim.api.nvim_get_hl_by_name("Normal", true))
+print({...})                                                     *vim.print()*
+    "Pretty prints" the given arguments and returns them unmodified.
+
+    Example: >lua
+      local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
 <
 
     Return: ~
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 48d954fe2d..66e8e5ef9f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -55,6 +55,8 @@ The following changes may require adaptations in user config or plugins.
   - The `concat` option has been removed as it was not consistently applied.
   - Invalid ranges now cause an error instead of returning `nil`.
 
+• Renamed vim.pretty_print to vim.print. |deprecated|
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 9516233b45..5445c4e492 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -778,22 +778,37 @@ do
   end
 end
 
----Prints given arguments in human-readable format.
----Example:
----<pre>lua
----  -- Print highlight group Normal and store it's contents in a variable.
----  local hl_normal = vim.pretty_print(vim.api.nvim_get_hl_by_name("Normal", true))
----</pre>
----@see |vim.inspect()|
----@return any # given arguments.
+---@private
 function vim.pretty_print(...)
-  local objects = {}
+  vim.deprecate('vim.pretty_print', 'vim.print', '0.10')
+  return vim.print(...)
+end
+
+--- "Pretty prints" the given arguments and returns them unmodified.
+---
+--- Example:
+--- <pre>lua
+---   local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
+--- </pre>
+---
+--- @see |vim.inspect()|
+--- @return any # given arguments.
+function vim.print(...)
+  if vim.in_fast_event() then
+    print(...)
+    return ...
+  end
+
   for i = 1, select('#', ...) do
-    local v = select(i, ...)
-    table.insert(objects, vim.inspect(v))
+    local o = select(i, ...)
+    if type(o) == 'string' then
+      vim.api.nvim_out_write(o)
+    else
+      vim.api.nvim_out_write(vim.inspect(o, { newline = '\n', indent = '  ' }))
+    end
+    vim.api.nvim_out_write('\n')
   end
 
-  print(table.concat(objects, '    '))
   return ...
 end
 
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index 762e9519db..e4b099f7ad 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -1,6 +1,6 @@
 vim.api.nvim_create_user_command('Inspect', function(cmd)
   if cmd.bang then
-    vim.pretty_print(vim.inspect_pos())
+    vim.print(vim.inspect_pos())
   else
     vim.show_pos()
   end
-- 
cgit 


From 2daf0b37dbfe54a4510c1033531dbaefd168c387 Mon Sep 17 00:00:00 2001
From: ii14 <59243201+ii14@users.noreply.github.com>
Date: Mon, 13 Mar 2023 03:29:11 +0100
Subject: feat(options)!: deprecate paste, remove pastetoggle (#22647)

we cannot remove 'paste'. It is very common in plugins and configs.

'pastetoggle' can and should be removed though, it's a total waste of everyone's time because it generates bug reports and doesn't work well, and is useless because bracketed-paste works better.
---
 runtime/doc/autocmd.txt    |  1 -
 runtime/doc/change.txt     |  2 -
 runtime/doc/deprecated.txt | 21 ++++++++++
 runtime/doc/map.txt        |  5 +--
 runtime/doc/news.txt       |  3 ++
 runtime/doc/options.txt    | 97 +---------------------------------------------
 runtime/doc/quickref.txt   |  2 -
 runtime/doc/vim_diff.txt   |  1 +
 runtime/optwin.vim         | 20 +---------
 9 files changed, 29 insertions(+), 123 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index e9a4196252..d0713ee18c 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -704,7 +704,6 @@ InsertCharPre			When a character is typed in Insert mode,
 				inserted literally.
 
 				Cannot change the text. |textlock|
-				Not triggered when 'paste' is set.
 							*InsertEnter*
 InsertEnter			Just before starting Insert mode.  Also for
 				Replace mode and Virtual Replace mode.  The
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 3706612d52..91358a8cdd 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1725,8 +1725,6 @@ Note that when 'textwidth' is 0, Vim does no automatic formatting anyway (but
 does insert comment leaders according to the 'comments' option).  An exception
 is when the 'a' flag is present. |auto-format|
 
-Note that when 'paste' is on, Vim does no formatting at all.
-
 Note that 'textwidth' can be non-zero even if Vim never performs auto-wrapping;
 'textwidth' is still useful for formatting with "gq".
 
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 5c8d7f044f..fe1d6f1645 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -146,6 +146,27 @@ OPTIONS
 - 'viewoptions'		Flags "unix", "slash" are ignored and always enabled.
 - *'viminfo'*		Deprecated alias to 'shada' option.
 - *'viminfofile'*	Deprecated alias to 'shadafile' option.
+- *'paste'* *'nopaste'*	This option is obsolete; |paste| is handled automatically.
+			Enables "paste mode":
+			  - mappings in Insert mode and Command-line mode are
+			    disabled
+			  - abbreviations are disabled
+			  - 'autoindent' is reset
+			  - 'expandtab' is reset
+			  - 'formatoptions' is used like it is empty
+			  - 'revins' is reset
+			  - 'ruler' is reset
+			  - 'showmatch' is reset
+			  - 'smartindent' is reset
+			  - 'smarttab' is reset
+			  - 'softtabstop' is set to 0
+			  - 'textwidth' is set to 0
+			  - 'wrapmargin' is set to 0
+			These options keep their value, but their effect is
+			disabled:
+			  - 'cindent'
+			  - 'indentexpr'
+			  - 'lisp'
 
 UI EXTENSIONS
 - *ui-wildmenu*		Use |ui-cmdline| with |ui-popupmenu| instead. Enabled
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 3a5223fa3a..c65007d1a4 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -695,8 +695,7 @@ this (see |<>|).  Example: >
    :map  _ls  :!ls -l %:S<CR>:echo "the end"<CR>
 
 To avoid mapping of the characters you type in insert or Command-line mode,
-type a CTRL-V first.  The mapping in Insert mode is disabled if the 'paste'
-option is on.
+type a CTRL-V first.
 							*map-error*
 Note that when an error is encountered (that causes an error message or might
 cause a beep) the rest of the mapping is not executed.  This is Vi-compatible.
@@ -1070,8 +1069,6 @@ Abbreviations are never recursive.  You can use ":ab f f-o-o" without any
 problem.  But abbreviations can be mapped.  {some versions of Vi support
 recursive abbreviations, for no apparent reason}
 
-Abbreviations are disabled if the 'paste' option is on.
-
 				*:abbreviate-local* *:abbreviate-<buffer>*
 Just like mappings, abbreviations can be local to a buffer.  This is mostly
 used in a |filetype-plugin| file.  Example for a C plugin file: >
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 66e8e5ef9f..ee409d542a 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -45,6 +45,9 @@ The following changes may require adaptations in user config or plugins.
     - `printheader`
     - `printmbcharset`
 
+• 'paste' option is now deprecated and 'pastetoggle' is removed. |paste| works
+  automatically in GUI and terminal (TUI) Nvim.  Just Paste It.™
+
 • libiconv and intl are now required build dependencies.
 
 • Unsaved changes are now preserved rather than discarded when |channel-stdio|
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6c5b168402..9fff5228f2 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -676,8 +676,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	line.
 	When 'smartindent' or 'cindent' is on the indent is changed in
 	a different way.
-	The 'autoindent' option is reset when the 'paste' option is set and
-	restored when 'paste' is reset.
 	{small difference from Vi: After the indent is deleted when typing
 	<Esc> or <CR>, the cursor position when moving up or down is after the
 	deleted indent; Vi puts the cursor somewhere in the deleted indent}.
@@ -1266,7 +1264,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See |C-indenting|.
 	When you don't like the way 'cindent' works, try the 'smartindent'
 	option or 'indentexpr'.
-	This option is not used when 'paste' is set.
 
 							*'cinkeys'* *'cink'*
 'cinkeys' 'cink'	string	(default "0{,0},0),0],:,0#,!^F,o,O,e")
@@ -2246,8 +2243,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	<Tab>.  Spaces are used in indents with the '>' and '<' commands and
 	when 'autoindent' is on.  To insert a real tab when 'expandtab' is
 	on, use CTRL-V<Tab>.  See also |:retab| and |ins-expandtab|.
-	This option is reset when the 'paste' option is set and restored when
-	the 'paste' option is reset.
 
 					*'exrc'* *'ex'* *'noexrc'* *'noex'*
 'exrc' 'ex'		boolean (default off)
@@ -2749,9 +2744,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'formatoptions' 'fo'	string (default: "tcqj")
 			local to buffer
 	This is a sequence of letters which describes how automatic
-	formatting is to be done.  See |fo-table|.  When the 'paste' option is
-	on, no formatting is done (like 'formatoptions' is empty).  Commas can
-	be inserted for readability.
+	formatting is to be done.  See |fo-table|.  Commas can be inserted for
+	readability.
 	To avoid problems with flags that are added in the future, use the
 	"+=" and "-=" feature of ":set" |add-option-flags|.
 
@@ -3392,7 +3386,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When this option is not empty, it overrules the 'cindent' and
 	'smartindent' indenting.  When 'lisp' is set, this option is
 	is only used when 'lispoptions' contains "expr:1".
-	When 'paste' is set this option is not used for indenting.
 	The expression is evaluated with |v:lnum| set to the line number for
 	which the indent is to be computed.  The cursor is also in this line
 	when the expression is evaluated (but it may be moved around).
@@ -3761,7 +3754,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The '-' character is included in keyword characters.  Redefines the
 	"=" operator to use this same indentation algorithm rather than
 	calling an external program if 'equalprg' is empty.
-	This option is not used when 'paste' is set.
 
 						*'lispoptions'* *'lop'*
 'lispoptions' 'lop'	string	(default "")
@@ -4474,77 +4466,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Specifies the nroff macros that separate paragraphs.  These are pairs
 	of two letters (see |object-motions|).
 
-						*'paste'* *'nopaste'*
-'paste'			boolean	(default off)
-			global
-	This option is obsolete; |bracketed-paste-mode| is built-in.
-
-	Put Vim in Paste mode.  This is useful if you want to cut or copy
-	some text from one window and paste it in Vim.  This will avoid
-	unexpected effects.
-	Setting this option is useful when using Vim in a terminal, where Vim
-	cannot distinguish between typed text and pasted text.  In the GUI, Vim
-	knows about pasting and will mostly do the right thing without 'paste'
-	being set.  The same is true for a terminal where Vim handles the
-	mouse clicks itself.
-	This option is reset when starting the GUI.  Thus if you set it in
-	your vimrc it will work in a terminal, but not in the GUI.  Setting
-	'paste' in the GUI has side effects: e.g., the Paste toolbar button
-	will no longer work in Insert mode, because it uses a mapping.
-	When the 'paste' option is switched on (also when it was already on):
-		- mapping in Insert mode and Command-line mode is disabled
-		- abbreviations are disabled
-		- 'autoindent' is reset
-		- 'expandtab' is reset
-		- 'hkmap' is reset
-		- 'revins' is reset
-		- 'ruler' is reset
-		- 'showmatch' is reset
-		- 'smarttab' is reset
-		- 'softtabstop' is set to 0
-		- 'textwidth' is set to 0
-		- 'wrapmargin' is set to 0
-		- 'varsofttabstop' is made empty
-	These options keep their value, but their effect is disabled:
-		- 'cindent'
-		- 'formatoptions' is used like it is empty
-		- 'indentexpr'
-		- 'lisp'
-		- 'smartindent'
-	NOTE: When you start editing another file while the 'paste' option is
-	on, settings from the modelines or autocommands may change the
-	settings again, causing trouble when pasting text.  You might want to
-	set the 'paste' option again.
-	When the 'paste' option is reset the mentioned options are restored to
-	the value before the moment 'paste' was switched from off to on.
-	Resetting 'paste' before ever setting it does not have any effect.
-	Since mapping doesn't work while 'paste' is active, you need to use
-	the 'pastetoggle' option to toggle the 'paste' option with some key.
-
-						*'pastetoggle'* *'pt'*
-'pastetoggle' 'pt'	string	(default "")
-			global
-	When non-empty, specifies the key sequence that toggles the 'paste'
-	option.  This is like specifying a mapping: >
-	    :map {keys} :set invpaste<CR>
-<	Where {keys} is the value of 'pastetoggle'.
-	The difference is that it will work even when 'paste' is set.
-	'pastetoggle' works in Insert mode and Normal mode, but not in
-	Command-line mode.
-	Mappings are checked first, thus overrule 'pastetoggle'.  However,
-	when 'paste' is on mappings are ignored in Insert mode, thus you can do
-	this: >
-	    :map <F10> :set paste<CR>
-	    :map <F11> :set nopaste<CR>
-	    :imap <F10> <C-O>:set paste<CR>
-	    :imap <F11> <nop>
-	    :set pastetoggle=<F11>
-<	This will make <F10> start paste mode and <F11> stop paste mode.
-	Note that typing <F10> in paste mode inserts "<F10>", since in paste
-	mode everything is inserted literally, except the 'pastetoggle' key
-	sequence.
-	When the value has several bytes 'ttimeoutlen' applies.
-
 						*'pex'* *'patchexpr'*
 'patchexpr' 'pex'	string	(default "")
 			global
@@ -4827,8 +4748,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Inserting characters in Insert mode will work backwards.  See "typing
 	backwards" |ins-reverse|.  This option can be toggled with the CTRL-_
 	command in Insert mode, when 'allowrevins' is set.
-	This option is reset when 'paste' is set and restored when 'paste' is
-	reset.
 
 				 *'rightleft'* *'rl'* *'norightleft'* *'norl'*
 'rightleft' 'rl'	boolean	(default off)
@@ -4877,8 +4796,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	separated with a dash.
 	For an empty line "0-1" is shown.
 	For an empty buffer the line number will also be zero: "0,0-1".
-	This option is reset when 'paste' is set and restored when 'paste' is
-	reset.
 	If you don't want to see the ruler all the time but want to know where
 	you are, use "g CTRL-G" |g_CTRL-G|.
 
@@ -5610,8 +5527,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	show the match can be set with 'matchtime'.
 	A Beep is given if there is no match (no matter if the match can be
 	seen or not).
-	This option is reset when 'paste' is set and restored when 'paste' is
-	reset.
 	When the 'm' flag is not included in 'cpoptions', typing a character
 	will immediately move the cursor back to where it belongs.
 	See the "sm" field in 'guicursor' for setting the cursor shape and
@@ -5733,8 +5648,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	mapping: ":inoremap # X^H#", where ^H is entered with CTRL-V CTRL-H.
 	When using the ">>" command, lines starting with '#' are not shifted
 	right.
-	This option is reset when 'paste' is set and restored when 'paste' is
-	reset.
 
 				 *'smarttab'* *'sta'* *'nosmarttab'* *'nosta'*
 'smarttab' 'sta'	boolean	(default on)
@@ -5749,8 +5662,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	What gets inserted (a <Tab> or spaces) depends on the 'expandtab'
 	option.  Also see |ins-expandtab|.  When 'expandtab' is not set, the
 	number of spaces is minimized by using <Tab>s.
-	This option is reset when 'paste' is set and restored when 'paste' is
-	reset.
 
 					*'softtabstop'* *'sts'*
 'softtabstop' 'sts'	number	(default 0)
@@ -5763,8 +5674,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	commands like "x" still work on the actual characters.
 	When 'sts' is zero, this feature is off.
 	When 'sts' is negative, the value of 'shiftwidth' is used.
-	'softtabstop' is set to 0 when the 'paste' option is set and restored
-	when 'paste' is reset.
 	See also |ins-expandtab|.  When 'expandtab' is not set, the number of
 	spaces is minimized by using <Tab>s.
 	The 'L' flag in 'cpoptions' changes how tabs are used when 'list' is
@@ -6579,8 +6488,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Maximum width of text that is being inserted.  A longer line will be
 	broken after white space to get this width.  A zero value disables
 	this.
-	'textwidth' is set to 0 when the 'paste' option is set and restored
-	when 'paste' is reset.
 	When 'textwidth' is zero, 'wrapmargin' may be used.  See also
 	'formatoptions' and |ins-textwidth|.
 	When 'formatexpr' is set it will be used to break the line.
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index d17df3cd61..952f0064e6 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -812,8 +812,6 @@ Short explanation of each option:		*option-list*
 'operatorfunc'	  'opfunc'  function to be called for |g@| operator
 'packpath'	  'pp'      list of directories used for packages
 'paragraphs'	  'para'    nroff macros that separate paragraphs
-'paste'			    allow pasting text
-'pastetoggle'	  'pt'	    key code that causes 'paste' to toggle
 'patchexpr'	  'pex'     expression used to patch a file
 'patchmode'	  'pm'	    keep the oldest version of a file
 'path'		  'pa'	    list of directories searched with "gf" et.al.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 21736059c4..9c01e3dbc7 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -623,6 +623,7 @@ Options:
   'highlight' (Names of builtin |highlight-groups| cannot be changed.)
   *'hkmap'* *'hk'* use `set keymap=hebrew` instead.
   *'hkmapp'* *'hkp'* use `set keymap=hebrewp` instead.
+  *'pastetoggle'* *'pt'*
 
   *'imactivatefunc'* *'imaf'*
   *'imactivatekey'* *'imak'*
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 200254321e..0d10ac4758 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -106,11 +106,7 @@ func <SID>Update(lnum, line, local, thiswin)
   else
     let name = substitute(a:line, '^ \tset \(no\)\=\([a-z]*\).*', '\2', "")
   endif
-  if name == "pt" && &pt =~ "\x80"
-    let val = <SID>PTvalue()
-  else
-    let val = escape(eval('&' . name), " \t\\\"|")
-  endif
+  let val = escape(eval('&' . name), " \t\\\"|")
   if a:local
     exe a:thiswin . "wincmd w"
   endif
@@ -211,14 +207,6 @@ func <SID>Header(text)
   let s:lnum = s:lnum + 1
 endfunc
 
-" Get the value of 'pastetoggle'.  It could be a special key.
-func <SID>PTvalue()
-  redir @a
-  silent set pt
-  redir END
-  return substitute(@a, '[^=]*=\(.*\)', '\1', "")
-endfunc
-
 " Restore the previous value of 'cpoptions' here, it's used below.
 let &cpo = s:cpo_save
 
@@ -232,12 +220,6 @@ call <SID>AddOption("cpoptions", gettext("list of flags to specify Vi compatibil
 call <SID>OptionG("cpo", &cpo)
 call <SID>AddOption("paste", gettext("paste mode, insert typed text literally"))
 call <SID>BinOptionG("paste", &paste)
-call <SID>AddOption("pastetoggle", gettext("key sequence to toggle paste mode"))
-if &pt =~ "\x80"
-  call append("$", " \tset pt=" . <SID>PTvalue())
-else
-  call <SID>OptionG("pt", &pt)
-endif
 call <SID>AddOption("runtimepath", gettext("list of directories used for runtime files and plugins"))
 call <SID>OptionG("rtp", &rtp)
 call <SID>AddOption("packpath", gettext("list of directories used for plugin packages"))
-- 
cgit 


From 35799a6629f10cc49e79381e61038b3a4ca3bb23 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 13 Mar 2023 10:44:43 +0000
Subject: fix(treesitter): foldexpr (#22652)

The ranges passed to foldinfo.remove_range were in the wrong order.
---
 runtime/lua/vim/treesitter/_fold.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index fd2c707d17..90f4394fcc 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -200,8 +200,9 @@ end
 local function on_bytes(bufnr, foldinfo, start_row, old_row, new_row)
   local end_row_old = start_row + old_row
   local end_row_new = start_row + new_row
+
   if new_row < old_row then
-    foldinfo:remove_range(end_row_old, end_row_new)
+    foldinfo:remove_range(end_row_new, end_row_old)
   elseif new_row > old_row then
     foldinfo:add_range(start_row, end_row_new)
     vim.schedule(function()
-- 
cgit 


From f01f18cdf4ffc3ce035db5fde2f45493eebb7fd9 Mon Sep 17 00:00:00 2001
From: Dan Strokirk <dan.strokirk@gmail.com>
Date: Mon, 13 Mar 2023 14:01:34 +0100
Subject: fix(lsp): remove_workspace_folders fails if client has no
 workspace_folders #22633

When a client has no workspace_folders, (e.g., copilot), `pairs`
code would crash.
---
 runtime/lua/vim/lsp/buf.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 0e16e8f820..8bf3764f5e 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -530,7 +530,7 @@ function M.remove_workspace_folder(workspace_folder)
     { { uri = vim.uri_from_fname(workspace_folder), name = workspace_folder } }
   )
   for _, client in pairs(vim.lsp.get_active_clients({ bufnr = 0 })) do
-    for idx, folder in pairs(client.workspace_folders) do
+    for idx, folder in pairs(client.workspace_folders or {}) do
       if folder.name == workspace_folder then
         vim.lsp.buf_notify(0, 'workspace/didChangeWorkspaceFolders', params)
         client.workspace_folders[idx] = nil
-- 
cgit 


From 9ab814eafad4e7d3f34ef9e1f518339dddedfac2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 13 Mar 2023 20:01:49 +0100
Subject: docs(help): consistent headers for local additions

---
 runtime/doc/help.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 68c886887f..a1550d5c8b 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -169,8 +169,8 @@ DEVELOPING NVIM
 |dev-style|		Development style guidelines
 |debug.txt|		Debugging Vim itself
 
-						*standard-plugin-list*
 Standard plugins ~
+						*standard-plugin-list*
 |matchit.txt|		Extended |%| matching
 |pi_gzip.txt|		Reading and writing compressed files
 |pi_health.txt|		Healthcheck framework
@@ -181,7 +181,8 @@ Standard plugins ~
 |pi_tar.txt|		Tar file explorer
 |pi_zip.txt|		Zip archive explorer
 
-LOCAL ADDITIONS:				*local-additions*
+Local additions ~
+							*local-additions*
 
 ------------------------------------------------------------------------------
 *bars*		Bars example
-- 
cgit 


From 06e3ff6671b45ffde8cbfa98ce2743fb9d46319d Mon Sep 17 00:00:00 2001
From: Zoltán Reegn <zoltan.reegn@gmail.com>
Date: Tue, 14 Mar 2023 11:42:27 +0100
Subject: docs(lsp): opt-out of default LSP "gq" #22615

close #22611
---
 runtime/doc/lsp.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index ca65251a9f..25293eb9b2 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -137,7 +137,19 @@ FAQ                                                     *lsp-faq*
      " Auto-format *.rs (rust) files prior to saving them
      " (async = false is the default for format)
      autocmd BufWritePre *.rs lua vim.lsp.buf.format({ async = false })
+<
+- Q: How can I disable LSP formatting when using the |gq| command?
+  A: To use the default internal formatting method and bypass the LSP client's
+  'formatexpr', use |gw| instead.
+  Alternatively you can completely disable LSP formatting with gq by
+  unsetting 'formatexpr':
 
+>lua
+    vim.api.nvim_create_autocmd('LspAttach', {
+        callback = function(args)
+            vim.bo[args.buf].formatexpr = nil
+        end,
+    })
 <
                                                            *lsp-vs-treesitter*
 - Q: How do LSP and Treesitter compare?
-- 
cgit 


From 8dde7c907ca9ad365895bded2c2f59e08f65d3ed Mon Sep 17 00:00:00 2001
From: hrsh7th <629908+hrsh7th@users.noreply.github.com>
Date: Tue, 14 Mar 2023 20:59:43 +0900
Subject: fix(lsp): vim.lsp.util.apply_text_edits cursor validation #22636

Problem
Using wrong variable when checking the cursor position is valid or not in
vim.lsp.util.apply_text_edits.

Solution
Use the correct variable.
---
 runtime/lua/vim/lsp/util.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 342fad33c2..82c9e3bc87 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -436,7 +436,7 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
 
   -- Some LSP servers are depending on the VSCode behavior.
   -- The VSCode will re-locate the cursor position after applying TextEdit so we also do it.
-  local is_current_buf = api.nvim_get_current_buf() == bufnr
+  local is_current_buf = api.nvim_get_current_buf() == bufnr or bufnr == 0
   local cursor = (function()
     if not is_current_buf then
       return {
@@ -464,7 +464,7 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
       start_col = get_line_byte_from_position(bufnr, text_edit.range.start, offset_encoding),
       end_row = text_edit.range['end'].line,
       end_col = get_line_byte_from_position(bufnr, text_edit.range['end'], offset_encoding),
-      text = split(text_edit.newText, '\n', true),
+      text = split(text_edit.newText, '\n', { plain = true }),
     }
 
     local max = api.nvim_buf_line_count(bufnr)
@@ -522,7 +522,7 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
   if is_cursor_fixed then
     local is_valid_cursor = true
     is_valid_cursor = is_valid_cursor and cursor.row < max
-    is_valid_cursor = is_valid_cursor and cursor.col <= #(get_line(bufnr, max - 1) or '')
+    is_valid_cursor = is_valid_cursor and cursor.col <= #(get_line(bufnr, cursor.row) or '')
     if is_valid_cursor then
       api.nvim_win_set_cursor(0, { cursor.row + 1, cursor.col })
     end
-- 
cgit 


From 4f7879dff0f0dc22ddf4cb2a2095b88605a3bab0 Mon Sep 17 00:00:00 2001
From: Ivan <hello@iillexial.me>
Date: Tue, 14 Mar 2023 13:08:37 +0100
Subject: fix(lsp): kill buffers after renaming a directory #22618

Problem:

When LSP client renames a directory, opened buffers in the edfitor are not
renamed or closed. Then `:wall` shows errors.

https://github.com/neovim/neovim/blob/master/runtime/lua/vim/lsp/util.lua#L776
works correctly if you try to rename a single file, but doesn't delete old
buffers with `old_fname` is a dir.

Solution:
Update the logic in runtime/lua/vim/lsp/util.lua:rename()

Fixes #22617
---
 runtime/lua/vim/lsp/util.lua | 48 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 82c9e3bc87..48faddfce1 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -743,6 +743,20 @@ local function bufwinid(bufnr)
   end
 end
 
+--- Get list of buffers for a directory
+---@private
+local function get_dir_bufs(path)
+  path = path:gsub('([^%w])', '%%%1')
+  local buffers = {}
+  for _, v in ipairs(vim.api.nvim_list_bufs()) do
+    local bufname = vim.api.nvim_buf_get_name(v):gsub('buffer://', '')
+    if bufname:find(path) then
+      table.insert(buffers, v)
+    end
+  end
+  return buffers
+end
+
 --- Rename old_fname to new_fname
 ---
 ---@param opts (table)
@@ -755,12 +769,22 @@ function M.rename(old_fname, new_fname, opts)
     vim.notify('Rename target already exists. Skipping rename.')
     return
   end
-  local oldbuf = vim.fn.bufadd(old_fname)
-  vim.fn.bufload(oldbuf)
 
-  -- The there may be pending changes in the buffer
-  if vim.fn.isdirectory(old_fname) == 0 then
-    api.nvim_buf_call(oldbuf, function()
+  local oldbufs = {}
+  local win = nil
+
+  if vim.fn.isdirectory(old_fname) == 1 then
+    oldbufs = get_dir_bufs(old_fname)
+  else
+    local oldbuf = vim.fn.bufadd(old_fname)
+    table.insert(oldbufs, oldbuf)
+    win = bufwinid(oldbuf)
+  end
+
+  for _, b in ipairs(oldbufs) do
+    vim.fn.bufload(b)
+    -- The there may be pending changes in the buffer
+    api.nvim_buf_call(b, function()
       vim.cmd('w!')
     end)
   end
@@ -768,12 +792,16 @@ function M.rename(old_fname, new_fname, opts)
   local ok, err = os.rename(old_fname, new_fname)
   assert(ok, err)
 
-  local newbuf = vim.fn.bufadd(new_fname)
-  local win = bufwinid(oldbuf)
-  if win then
-    api.nvim_win_set_buf(win, newbuf)
+  if vim.fn.isdirectory(new_fname) == 0 then
+    local newbuf = vim.fn.bufadd(new_fname)
+    if win then
+      api.nvim_win_set_buf(win, newbuf)
+    end
+  end
+
+  for _, b in ipairs(oldbufs) do
+    api.nvim_buf_delete(b, {})
   end
-  api.nvim_buf_delete(oldbuf, { force = true })
 end
 
 ---@private
-- 
cgit 


From 21eacbfef399f124e9d50f1757c89453c4e02944 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 15 Mar 2023 07:51:44 -0400
Subject: docs(html): render @see items as a list #22675

Needed for "flow" HTML layout.

Flow layout before:
    See also:
    https://github.com/kikito/inspect.lua https://github.com/mpeterv/vinspect
Flow layout after:
    See also:
    - https://github.com/kikito/inspect.lua
    - https://github.com/mpeterv/vinspect
---
 runtime/doc/api.txt | 88 ++++++++++++++++++++++++++---------------------------
 runtime/doc/lsp.txt | 40 ++++++++++++------------
 runtime/doc/lua.txt | 54 ++++++++++++++++----------------
 3 files changed, 91 insertions(+), 91 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 0e1cf9ec3e..d16b9274dc 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -684,7 +684,7 @@ nvim_create_buf({listed}, {scratch})                       *nvim_create_buf()*
         Buffer handle, or 0 on error
 
     See also: ~
-        buf_open_scratch
+      • buf_open_scratch
 
 nvim_del_current_line()                              *nvim_del_current_line()*
     Deletes the current line.
@@ -698,7 +698,7 @@ nvim_del_keymap({mode}, {lhs})                             *nvim_del_keymap()*
     To unmap a buffer-local mapping, use |nvim_buf_del_keymap()|.
 
     See also: ~
-        |nvim_set_keymap()|
+      • |nvim_set_keymap()|
 
 nvim_del_mark({name})                                        *nvim_del_mark()*
     Deletes an uppercase/file named mark. See |mark-motions|.
@@ -713,8 +713,8 @@ nvim_del_mark({name})                                        *nvim_del_mark()*
         true if the mark was deleted, else false.
 
     See also: ~
-        |nvim_buf_del_mark()|
-        |nvim_get_mark()|
+      • |nvim_buf_del_mark()|
+      • |nvim_get_mark()|
 
 nvim_del_var({name})                                          *nvim_del_var()*
     Removes a global (g:) variable.
@@ -751,7 +751,7 @@ nvim_err_writeln({str})                                   *nvim_err_writeln()*
       • {str}  Message
 
     See also: ~
-        nvim_err_write()
+      • nvim_err_write()
 
 nvim_eval_statusline({str}, {*opts})                  *nvim_eval_statusline()*
     Evaluates statusline string.
@@ -825,8 +825,8 @@ nvim_feedkeys({keys}, {mode}, {escape_ks})                   *nvim_feedkeys()*
                      true otherwise.
 
     See also: ~
-        feedkeys()
-        vim_strsave_escape_ks
+      • feedkeys()
+      • vim_strsave_escape_ks
 
 nvim_get_api_info()                                      *nvim_get_api_info()*
     Returns a 2-tuple (Array), where item 0 is the current channel id and item
@@ -934,7 +934,7 @@ nvim_get_hl_by_id({hl_id}, {rgb})                        *nvim_get_hl_by_id()*
         Highlight definition map
 
     See also: ~
-        nvim_get_hl_by_name
+      • nvim_get_hl_by_name
 
 nvim_get_hl_by_name({name}, {rgb})                     *nvim_get_hl_by_name()*
     Gets a highlight definition by name.
@@ -947,7 +947,7 @@ nvim_get_hl_by_name({name}, {rgb})                     *nvim_get_hl_by_name()*
         Highlight definition map
 
     See also: ~
-        nvim_get_hl_by_id
+      • nvim_get_hl_by_id
 
 nvim_get_hl_id_by_name({name})                      *nvim_get_hl_id_by_name()*
     Gets a highlight group by name
@@ -982,8 +982,8 @@ nvim_get_mark({name}, {opts})                                *nvim_get_mark()*
         not set.
 
     See also: ~
-        |nvim_buf_set_mark()|
-        |nvim_del_mark()|
+      • |nvim_buf_set_mark()|
+      • |nvim_del_mark()|
 
 nvim_get_mode()                                              *nvim_get_mode()*
     Gets the current mode. |mode()| "blocking" is true if Nvim is waiting for
@@ -1257,8 +1257,8 @@ nvim_replace_termcodes({str}, {from_part}, {do_lt}, {special})
       • {special}    Replace |keycodes|, e.g. <CR> becomes a "\r" char.
 
     See also: ~
-        replace_termcodes
-        cpoptions
+      • replace_termcodes
+      • cpoptions
 
                                                 *nvim_select_popupmenu_item()*
 nvim_select_popupmenu_item({item}, {insert}, {finish}, {opts})
@@ -1592,9 +1592,9 @@ nvim_exec({src}, {output})                                       *nvim_exec()*
         string.
 
     See also: ~
-        |execute()|
-        |nvim_command()|
-        |nvim_cmd()|
+      • |execute()|
+      • |nvim_command()|
+      • |nvim_cmd()|
 
                                                      *nvim_parse_expression()*
 nvim_parse_expression({expr}, {flags}, {highlight})
@@ -1688,7 +1688,7 @@ nvim_buf_create_user_command({buffer}, {name}, {command}, {*opts})
       • {buffer}  Buffer handle, or 0 for current buffer.
 
     See also: ~
-        nvim_create_user_command
+      • nvim_create_user_command
 
                                                  *nvim_buf_del_user_command()*
 nvim_buf_del_user_command({buffer}, {name})
@@ -1742,8 +1742,8 @@ nvim_cmd({*cmd}, {*opts})                                         *nvim_cmd()*
         empty string.
 
     See also: ~
-        |nvim_exec()|
-        |nvim_command()|
+      • |nvim_exec()|
+      • |nvim_command()|
 
                                                   *nvim_create_user_command()*
 nvim_create_user_command({name}, {command}, {*opts})
@@ -2101,8 +2101,8 @@ nvim_buf_attach({buffer}, {send_buffer}, {opts})           *nvim_buf_attach()*
         otherwise True. TODO: LUA_API_NO_EVAL
 
     See also: ~
-        |nvim_buf_detach()|
-        |api-buffer-updates-lua|
+      • |nvim_buf_detach()|
+      • |api-buffer-updates-lua|
 
 nvim_buf_call({buffer}, {fun})                               *nvim_buf_call()*
     call a function with buffer as temporary current buffer
@@ -2136,7 +2136,7 @@ nvim_buf_del_keymap({buffer}, {mode}, {lhs})           *nvim_buf_del_keymap()*
       • {buffer}  Buffer handle, or 0 for current buffer
 
     See also: ~
-        |nvim_del_keymap()|
+      • |nvim_del_keymap()|
 
 nvim_buf_del_mark({buffer}, {name})                      *nvim_buf_del_mark()*
     Deletes a named mark in the buffer. See |mark-motions|.
@@ -2153,8 +2153,8 @@ nvim_buf_del_mark({buffer}, {name})                      *nvim_buf_del_mark()*
         true if the mark was deleted, else false.
 
     See also: ~
-        |nvim_buf_set_mark()|
-        |nvim_del_mark()|
+      • |nvim_buf_set_mark()|
+      • |nvim_del_mark()|
 
 nvim_buf_del_var({buffer}, {name})                        *nvim_buf_del_var()*
     Removes a buffer-scoped (b:) variable
@@ -2189,8 +2189,8 @@ nvim_buf_detach({buffer})                                  *nvim_buf_detach()*
         True.
 
     See also: ~
-        |nvim_buf_attach()|
-        |api-lua-detach| for detaching Lua callbacks
+      • |nvim_buf_attach()|
+      • |api-lua-detach| for detaching Lua callbacks
 
 nvim_buf_get_changedtick({buffer})                *nvim_buf_get_changedtick()*
     Gets a changed tick of a buffer
@@ -2247,8 +2247,8 @@ nvim_buf_get_mark({buffer}, {name})                      *nvim_buf_get_mark()*
         uppercase/file mark set in another buffer.
 
     See also: ~
-        |nvim_buf_set_mark()|
-        |nvim_buf_del_mark()|
+      • |nvim_buf_set_mark()|
+      • |nvim_buf_del_mark()|
 
 nvim_buf_get_name({buffer})                              *nvim_buf_get_name()*
     Gets the full file name for the buffer
@@ -2351,7 +2351,7 @@ nvim_buf_set_keymap({buffer}, {mode}, {lhs}, {rhs}, {*opts})
       • {buffer}  Buffer handle, or 0 for current buffer
 
     See also: ~
-        |nvim_set_keymap()|
+      • |nvim_set_keymap()|
 
                                                         *nvim_buf_set_lines()*
 nvim_buf_set_lines({buffer}, {start}, {end}, {strict_indexing}, {replacement})
@@ -2378,7 +2378,7 @@ nvim_buf_set_lines({buffer}, {start}, {end}, {strict_indexing}, {replacement})
       • {replacement}      Array of lines to use as replacement
 
     See also: ~
-        |nvim_buf_set_text()|
+      • |nvim_buf_set_text()|
 
                                                          *nvim_buf_set_mark()*
 nvim_buf_set_mark({buffer}, {name}, {line}, {col}, {opts})
@@ -2401,8 +2401,8 @@ nvim_buf_set_mark({buffer}, {name}, {line}, {col}, {opts})
         true if the mark was set, else false.
 
     See also: ~
-        |nvim_buf_del_mark()|
-        |nvim_buf_get_mark()|
+      • |nvim_buf_del_mark()|
+      • |nvim_buf_get_mark()|
 
 nvim_buf_set_name({buffer}, {name})                      *nvim_buf_set_name()*
     Sets the full file name for a buffer
@@ -2439,7 +2439,7 @@ nvim_buf_set_text({buffer}, {start_row}, {start_col}, {end_row}, {end_col},
       • {replacement}  Array of lines to use as replacement
 
     See also: ~
-        |nvim_buf_set_lines()|
+      • |nvim_buf_set_lines()|
 
 nvim_buf_set_var({buffer}, {name}, {value})               *nvim_buf_set_var()*
     Sets a buffer-scoped (b:) variable
@@ -2775,8 +2775,8 @@ nvim_win_call({window}, {fun})                               *nvim_win_call()*
         upvalues to send lua references in and out.
 
     See also: ~
-        |win_execute()|
-        |nvim_buf_call()|
+      • |win_execute()|
+      • |nvim_buf_call()|
 
 nvim_win_close({window}, {force})                           *nvim_win_close()*
     Closes the window (like |:close| with a |window-ID|).
@@ -3114,7 +3114,7 @@ nvim_win_set_config({window}, {*config})               *nvim_win_set_config()*
       • {config}  Map defining the window configuration, see |nvim_open_win()|
 
     See also: ~
-        |nvim_open_win()|
+      • |nvim_open_win()|
 
 
 ==============================================================================
@@ -3232,7 +3232,7 @@ nvim_create_augroup({name}, {*opts})                   *nvim_create_augroup()*
         Integer id of the created group.
 
     See also: ~
-        |autocmd-groups|
+      • |autocmd-groups|
 
 nvim_create_autocmd({event}, {*opts})                  *nvim_create_autocmd()*
     Creates an |autocommand| event handler, defined by `callback` (Lua function or Vimscript function name string) or `command` (Ex command string).
@@ -3297,8 +3297,8 @@ nvim_create_autocmd({event}, {*opts})                  *nvim_create_autocmd()*
         Autocommand id (number)
 
     See also: ~
-        |autocommand|
-        |nvim_del_autocmd()|
+      • |autocommand|
+      • |nvim_del_autocmd()|
 
 nvim_del_augroup_by_id({id})                        *nvim_del_augroup_by_id()*
     Delete an autocommand group by id.
@@ -3313,8 +3313,8 @@ nvim_del_augroup_by_id({id})                        *nvim_del_augroup_by_id()*
       • {id}  Integer The id of the group.
 
     See also: ~
-        |nvim_del_augroup_by_name()|
-        |nvim_create_augroup()|
+      • |nvim_del_augroup_by_name()|
+      • |nvim_create_augroup()|
 
 nvim_del_augroup_by_name({name})                  *nvim_del_augroup_by_name()*
     Delete an autocommand group by name.
@@ -3327,7 +3327,7 @@ nvim_del_augroup_by_name({name})                  *nvim_del_augroup_by_name()*
       • {name}  String The name of the group.
 
     See also: ~
-        |autocmd-groups|
+      • |autocmd-groups|
 
 nvim_del_autocmd({id})                                    *nvim_del_autocmd()*
     Delete an autocommand by id.
@@ -3338,7 +3338,7 @@ nvim_del_autocmd({id})                                    *nvim_del_autocmd()*
       • {id}  Integer The id returned by nvim_create_autocmd
 
     See also: ~
-        |nvim_create_autocmd()|
+      • |nvim_create_autocmd()|
 
 nvim_exec_autocmds({event}, {*opts})                    *nvim_exec_autocmds()*
     Execute all autocommands for {event} that match the corresponding {opts}
@@ -3359,7 +3359,7 @@ nvim_exec_autocmds({event}, {*opts})                    *nvim_exec_autocmds()*
                    callback. See |nvim_create_autocmd()| for details.
 
     See also: ~
-        |:doautocmd|
+      • |:doautocmd|
 
 nvim_get_autocmds({*opts})                               *nvim_get_autocmds()*
     Get all autocommands that match the corresponding {opts}.
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 25293eb9b2..0164b34efb 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -862,9 +862,9 @@ omnifunc({findstart}, {base})                             *vim.lsp.omnifunc()*
         • findstart=1: list of matches (actually just calls |complete()|)
 
     See also: ~
-        |complete-functions|
-        |complete-items|
-        |CompleteDone|
+      • |complete-functions|
+      • |complete-items|
+      • |CompleteDone|
 
 set_log_level({level})                               *vim.lsp.set_log_level()*
     Sets the global log level for LSP logging.
@@ -879,7 +879,7 @@ set_log_level({level})                               *vim.lsp.set_log_level()*
       • {level}  (integer|string) the case insensitive level name or number
 
     See also: ~
-        |vim.lsp.log_levels|
+      • |vim.lsp.log_levels|
 
 start({config}, {opts})                                      *vim.lsp.start()*
     Create a new LSP client and start a language server or reuses an already
@@ -1132,8 +1132,8 @@ code_action({options})                             *vim.lsp.buf.code_action()*
                      |api-indexing|
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeAction
-        vim.lsp.protocol.constants.CodeActionTriggerKind
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeAction
+      • vim.lsp.protocol.constants.CodeActionTriggerKind
 
 completion({context})                               *vim.lsp.buf.completion()*
     Retrieves the completion items at the current cursor position. Can only be
@@ -1146,7 +1146,7 @@ completion({context})                               *vim.lsp.buf.completion()*
                    character, if applicable)
 
     See also: ~
-        vim.lsp.protocol.constants.CompletionTriggerKind
+      • vim.lsp.protocol.constants.CompletionTriggerKind
 
 declaration({options})                             *vim.lsp.buf.declaration()*
     Jumps to the declaration of the symbol under the cursor.
@@ -1200,7 +1200,7 @@ execute_command({command_params})              *vim.lsp.buf.execute_command()*
       • {command_params}  (table) A valid `ExecuteCommandParams` object
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_executeCommand
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_executeCommand
 
 format({options})                                       *vim.lsp.buf.format()*
     Formats a buffer using the attached (and optionally filtered) language
@@ -1278,7 +1278,7 @@ references({context}, {options})                    *vim.lsp.buf.references()*
                      |lsp-on-list-handler|
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_references
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_references
 
                                        *vim.lsp.buf.remove_workspace_folder()*
 remove_workspace_folder({workspace_folder})
@@ -1570,7 +1570,7 @@ apply_text_document_edit({text_document_edit}, {index}, {offset_encoding})
                               list of edits (or nil, if not from a list)
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentEdit
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentEdit
 
                                              *vim.lsp.util.apply_text_edits()*
 apply_text_edits({text_edits}, {bufnr}, {offset_encoding})
@@ -1582,7 +1582,7 @@ apply_text_edits({text_edits}, {bufnr}, {offset_encoding})
       • {offset_encoding}  (string) utf-8|utf-16|utf-32
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textEdit
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textEdit
 
                                          *vim.lsp.util.apply_workspace_edit()*
 apply_workspace_edit({workspace_edit}, {offset_encoding})
@@ -1609,7 +1609,7 @@ buf_highlight_references({bufnr}, {references}, {offset_encoding})
       • {offset_encoding}  (string) One of "utf-8", "utf-16", "utf-32".
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
+      • https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
 
                                              *vim.lsp.util.character_offset()*
 character_offset({buf}, {row}, {col}, {offset_encoding})
@@ -1642,7 +1642,7 @@ convert_input_to_markdown_lines({input}, {contents})
         {contents}, extended with lines of converted markdown.
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
 
                      *vim.lsp.util.convert_signature_help_to_markdown_lines()*
 convert_signature_help_to_markdown_lines({signature_help}, {ft}, {triggers})
@@ -1659,7 +1659,7 @@ convert_signature_help_to_markdown_lines({signature_help}, {ft}, {triggers})
         (list) of lines of converted markdown.
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp
 
                                      *vim.lsp.util.extract_completion_items()*
 extract_completion_items({result})
@@ -1672,7 +1672,7 @@ extract_completion_items({result})
         (table) List of completion items
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
+      • https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
 
 get_effective_tabstop({bufnr})          *vim.lsp.util.get_effective_tabstop()*
     Returns indentation size.
@@ -1684,7 +1684,7 @@ get_effective_tabstop({bufnr})          *vim.lsp.util.get_effective_tabstop()*
         (integer) indentation size
 
     See also: ~
-        'shiftwidth'
+      • 'shiftwidth'
 
                                              *vim.lsp.util.jump_to_location()*
 jump_to_location({location}, {offset_encoding}, {reuse_win})
@@ -1756,7 +1756,7 @@ make_formatting_params({options})
         `DocumentFormattingParams` object
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_formatting
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_formatting
 
                                       *vim.lsp.util.make_given_range_params()*
 make_given_range_params({start_pos}, {end_pos}, {bufnr}, {offset_encoding})
@@ -1793,7 +1793,7 @@ make_position_params({window}, {offset_encoding})
         `TextDocumentPositionParams` object
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentPositionParams
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentPositionParams
 
                                             *vim.lsp.util.make_range_params()*
 make_range_params({window}, {offset_encoding})
@@ -1824,7 +1824,7 @@ make_text_document_params({bufnr})
         `TextDocumentIdentifier`
 
     See also: ~
-        https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentIdentifier
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentIdentifier
 
                                         *vim.lsp.util.make_workspace_params()*
 make_workspace_params({added}, {removed})
@@ -1974,7 +1974,7 @@ text_document_completion_list_to_complete_items({result}, {prefix})
         { matches = complete-items table, incomplete = bool }
 
     See also: ~
-        |complete-items|
+      • |complete-items|
 
 trim_empty_lines({lines})                    *vim.lsp.util.trim_empty_lines()*
     Removes empty lines from the beginning and end.
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 81e45ae9bb..68f63f4fb8 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1364,7 +1364,7 @@ cmd({command})                                                     *vim.cmd()*
                    |nvim_cmd()| where `opts` is empty.
 
     See also: ~
-        |ex-cmd-index|
+      • |ex-cmd-index|
 
                                              *vim.connection_failure_errmsg()*
 connection_failure_errmsg({consequence})
@@ -1401,8 +1401,8 @@ inspect({object}, {options})                                   *vim.inspect()*
     Gets a human-readable representation of the given object.
 
     See also: ~
-        https://github.com/kikito/inspect.lua
-        https://github.com/mpeterv/vinspect
+      • https://github.com/kikito/inspect.lua
+      • https://github.com/mpeterv/vinspect
 
 lua_omnifunc({find_start}, {_})                           *vim.lua_omnifunc()*
     Omnifunc for completing lua values from from the runtime lua interpreter,
@@ -1494,7 +1494,7 @@ paste({lines}, {phase})                                          *vim.paste()*
         (boolean) # false if client should cancel the paste.
 
     See also: ~
-        |paste| @alias paste_phase -1 | 1 | 2 | 3
+      • |paste| @alias paste_phase -1 | 1 | 2 | 3
 
 print({...})                                                     *vim.print()*
     "Pretty prints" the given arguments and returns them unmodified.
@@ -1507,7 +1507,7 @@ print({...})                                                     *vim.print()*
         any # given arguments.
 
     See also: ~
-        |vim.inspect()|
+      • |vim.inspect()|
 
 region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
     Get a table of lines with start, end columns for a region marked by two
@@ -1535,9 +1535,9 @@ schedule_wrap({cb})                                      *vim.schedule_wrap()*
         (function)
 
     See also: ~
-        |lua-loop-callbacks|
-        |vim.schedule()|
-        |vim.in_fast_event()|
+      • |lua-loop-callbacks|
+      • |vim.schedule()|
+      • |vim.in_fast_event()|
 
 
 ==============================================================================
@@ -1663,10 +1663,10 @@ gsplit({s}, {sep}, {plain})                                     *vim.gsplit()*
         (function) Iterator over the split components
 
     See also: ~
-        |vim.split()|
-        |luaref-patterns|
-        https://www.lua.org/pil/20.2.html
-        http://lua-users.org/wiki/StringLibraryTutorial
+      • |vim.split()|
+      • |luaref-patterns|
+      • https://www.lua.org/pil/20.2.html
+      • http://lua-users.org/wiki/StringLibraryTutorial
 
 is_callable({f})                                           *vim.is_callable()*
     Returns true if object `f` can be called as a function.
@@ -1692,7 +1692,7 @@ list_extend({dst}, {src}, {start}, {finish})               *vim.list_extend()*
         (table) dst
 
     See also: ~
-        |vim.tbl_extend()|
+      • |vim.tbl_extend()|
 
 list_slice({list}, {start}, {finish})                       *vim.list_slice()*
     Creates a copy of a table containing only elements from start to end
@@ -1716,7 +1716,7 @@ pesc({s})                                                         *vim.pesc()*
         (string) %-escaped pattern string
 
     See also: ~
-        https://github.com/rxi/lume
+      • https://github.com/rxi/lume
 
 spairs({t})                                                     *vim.spairs()*
     Enumerate a table sorted by its keys.
@@ -1728,7 +1728,7 @@ spairs({t})                                                     *vim.spairs()*
         iterator over sorted keys and their values
 
     See also: ~
-        Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
+      • Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
 split({s}, {sep}, {kwargs})                                      *vim.split()*
     Splits a string at each instance of a separator.
@@ -1754,7 +1754,7 @@ split({s}, {sep}, {kwargs})                                      *vim.split()*
         string[] List of split components
 
     See also: ~
-        |vim.gsplit()|
+      • |vim.gsplit()|
 
 startswith({s}, {prefix})                                   *vim.startswith()*
     Tests if `s` starts with `prefix`.
@@ -1804,7 +1804,7 @@ tbl_count({t})                                               *vim.tbl_count()*
         (integer) Number of non-nil values in table
 
     See also: ~
-        https://github.com/Tieske/Penlight/blob/master/lua/pl/tablex.lua
+      • https://github.com/Tieske/Penlight/blob/master/lua/pl/tablex.lua
 
 tbl_deep_extend({behavior}, {...})                     *vim.tbl_deep_extend()*
     Merges recursively two or more map-like tables.
@@ -1821,7 +1821,7 @@ tbl_deep_extend({behavior}, {...})                     *vim.tbl_deep_extend()*
         (table) Merged table
 
     See also: ~
-        |vim.tbl_extend()|
+      • |vim.tbl_extend()|
 
 tbl_extend({behavior}, {...})                               *vim.tbl_extend()*
     Merges two or more map-like tables.
@@ -1838,7 +1838,7 @@ tbl_extend({behavior}, {...})                               *vim.tbl_extend()*
         (table) Merged table
 
     See also: ~
-        |extend()|
+      • |extend()|
 
 tbl_filter({func}, {t})                                     *vim.tbl_filter()*
     Filter a table using a predicate function
@@ -1861,7 +1861,7 @@ tbl_flatten({t})                                           *vim.tbl_flatten()*
         (table) Flattened copy of the given list-like table
 
     See also: ~
-        From https://github.com/premake/premake-core/blob/master/src/base/table.lua
+      • From https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
 tbl_get({o}, {...})                                            *vim.tbl_get()*
     Index into a table (first argument) via string keys passed as subsequent
@@ -1891,7 +1891,7 @@ tbl_isempty({t})                                           *vim.tbl_isempty()*
         (boolean) `true` if `t` is empty
 
     See also: ~
-        https://github.com/premake/premake-core/blob/master/src/base/table.lua
+      • https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
 tbl_islist({t})                                             *vim.tbl_islist()*
     Tests if a Lua table can be treated as an array.
@@ -1917,7 +1917,7 @@ tbl_keys({t})                                                 *vim.tbl_keys()*
         (list) List of keys
 
     See also: ~
-        From https://github.com/premake/premake-core/blob/master/src/base/table.lua
+      • From https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
 tbl_map({func}, {t})                                           *vim.tbl_map()*
     Apply a function to all values of a table.
@@ -1949,8 +1949,8 @@ trim({s})                                                         *vim.trim()*
         (string) String with whitespace removed from its beginning and end
 
     See also: ~
-        |luaref-patterns|
-        https://www.lua.org/pil/20.2.html
+      • |luaref-patterns|
+      • https://www.lua.org/pil/20.2.html
 
 validate({opt})                                               *vim.validate()*
     Validates a parameter specification (types and values).
@@ -2275,7 +2275,7 @@ del({modes}, {lhs}, {opts})                                 *vim.keymap.del()*
                   buffer. When "true" or 0, use the current buffer.
 
     See also: ~
-        |vim.keymap.set()|
+      • |vim.keymap.set()|
 
 set({mode}, {lhs}, {rhs}, {opts})                           *vim.keymap.set()*
     Adds a new |mapping|. Examples: >lua
@@ -2312,7 +2312,7 @@ set({mode}, {lhs}, {rhs}, {opts})                           *vim.keymap.set()*
                     "noremap". Defaults to `false`.
 
     See also: ~
-        |nvim_set_keymap()|
+      • |nvim_set_keymap()|
 
 
 ==============================================================================
@@ -2481,7 +2481,7 @@ read({path})                                               *vim.secure.read()*
         trusted, or nil otherwise.
 
     See also: ~
-        |:trust|
+      • |:trust|
 
 trust({opts})                                             *vim.secure.trust()*
     Manage the trust database.
-- 
cgit 


From 210120dde81ec289ae01e1d247df08f0b147c08a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 15 Mar 2023 08:56:13 -0400
Subject: fix(lua): vim.deprecate() shows ":help deprecated" #22677

Problem:
vim.deprecate() shows ":help deprecated" for third-party plugins. ":help
deprecated" only describes deprecations in Nvim, and is unrelated to any
3rd party deprecations.

Solution:
If `plugin` is specified, don't show  ":help deprecated".

fix #22235
---
 runtime/doc/deprecated.txt  |  2 +-
 runtime/doc/lua.txt         | 15 +++++++++------
 runtime/lua/vim/_editor.lua | 41 +++++++++++++++++++++--------------------
 3 files changed, 31 insertions(+), 27 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index fe1d6f1645..74c50f00a2 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -128,7 +128,7 @@ TREESITTER FUNCTIONS
 						and |TSNode:type()| instead.
 
 LUA
-- *vim.register_keystroke_callback()*	Use |vim.on_key()| instead.
+- vim.register_keystroke_callback()	Use |vim.on_key()| instead.
 - *vim.pretty_print()*			Use |vim.print()| instead.
 
 NORMAL COMMANDS
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 68f63f4fb8..611f2e0d32 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1386,17 +1386,20 @@ defer_fn({fn}, {timeout})                                     *vim.defer_fn()*
 
                                                              *vim.deprecate()*
 deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
-    Display a deprecation notification to the user.
+    Shows a deprecation message to the user.
 
     Parameters: ~
-      • {name}         string Deprecated function.
-      • {alternative}  (string|nil) Preferred alternative function.
-      • {version}      string Version in which the deprecated function will be
+      • {name}         string Deprecated feature (function, API, etc.).
+      • {alternative}  (string|nil) Suggested alternative feature.
+      • {version}      string Version when the deprecated function will be
                        removed.
-      • {plugin}       string|nil Plugin name that the function will be
-                       removed from. Defaults to "Nvim".
+      • {plugin}       string|nil Name of the plugin that owns the deprecated
+                       feature. Defaults to "Nvim".
       • {backtrace}    boolean|nil Prints backtrace. Defaults to true.
 
+    Return: ~
+        Deprecated message, or nil if no message was shown.
+
 inspect({object}, {options})                                   *vim.inspect()*
     Gets a human-readable representation of the given object.
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 5445c4e492..f2875e5646 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -518,11 +518,6 @@ do
   end
 end
 
----@private
-function vim.register_keystroke_callback()
-  error('vim.register_keystroke_callback is deprecated, instead use: vim.on_key')
-end
-
 local on_key_cbs = {}
 
 --- Adds Lua function {fn} with namespace id {ns_id} as a listener to every,
@@ -882,27 +877,33 @@ function vim._cs_remote(rcid, server_addr, connect_error, args)
   }
 end
 
---- Display a deprecation notification to the user.
+--- Shows a deprecation message to the user.
 ---
----@param name        string     Deprecated function.
----@param alternative string|nil Preferred alternative function.
----@param version     string     Version in which the deprecated function will
----                              be removed.
----@param plugin      string|nil Plugin name that the function will be removed
----                              from. Defaults to "Nvim".
+---@param name        string     Deprecated feature (function, API, etc.).
+---@param alternative string|nil Suggested alternative feature.
+---@param version     string     Version when the deprecated function will be removed.
+---@param plugin      string|nil Name of the plugin that owns the deprecated feature.
+---                              Defaults to "Nvim".
 ---@param backtrace   boolean|nil Prints backtrace. Defaults to true.
+---
+---@returns Deprecated message, or nil if no message was shown.
 function vim.deprecate(name, alternative, version, plugin, backtrace)
-  local message = name .. ' is deprecated'
+  local msg = ('%s is deprecated'):format(name)
   plugin = plugin or 'Nvim'
-  message = alternative and (message .. ', use ' .. alternative .. ' instead.') or message
-  message = message
-    .. ' See :h deprecated\nThis function will be removed in '
-    .. plugin
-    .. ' version '
-    .. version
-  if vim.notify_once(message, vim.log.levels.WARN) and backtrace ~= false then
+  msg = alternative and ('%s, use %s instead.'):format(msg, alternative) or msg
+  msg = ('%s%s\nThis feature will be removed in %s version %s'):format(
+    msg,
+    (plugin == 'Nvim' and ' :help deprecated' or ''),
+    plugin,
+    version
+  )
+  local displayed = vim.notify_once(msg, vim.log.levels.WARN)
+  if displayed and backtrace ~= false then
     vim.notify(debug.traceback('', 2):sub(2), vim.log.levels.WARN)
   end
+  if displayed then
+    return msg
+  end
 end
 
 --- Create builtin mappings (incl. menus).
-- 
cgit 


From 320cb344c14b30f8c1aa8c2d86803e4c2f971ae9 Mon Sep 17 00:00:00 2001
From: ii14 <59243201+ii14@users.noreply.github.com>
Date: Thu, 16 Mar 2023 09:31:37 +0100
Subject: docs(api): link to nvim_set_hl_ns from nvim_set_hl (#22678)

---
 runtime/doc/api.txt | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index d16b9274dc..b8590026c8 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1399,6 +1399,9 @@ nvim_set_hl({ns_id}, {name}, {*val})                           *nvim_set_hl()*
     Parameters: ~
       • {ns_id}  Namespace id for this highlight |nvim_create_namespace()|.
                  Use 0 to set a highlight group globally |:highlight|.
+                 Highlights from non-global namespaces are not active by
+                 default, use |nvim_set_hl_ns()| or |nvim_win_set_hl_ns()| to
+                 activate them.
       • {name}   Highlight group name, e.g. "ErrorMsg"
       • {val}    Highlight definition map, accepts the following keys:
                  • fg (or foreground): color name or "#RRGGBB", see note.
@@ -1426,14 +1429,15 @@ nvim_set_hl({ns_id}, {name}, {*val})                           *nvim_set_hl()*
                    map documented above.
 
 nvim_set_hl_ns({ns_id})                                     *nvim_set_hl_ns()*
-    Set active namespace for highlights. This can be set for a single window,
-    see |nvim_win_set_hl_ns()|.
+    Set active namespace for highlights defined with |nvim_set_hl()|. This can
+    be set for a single window, see |nvim_win_set_hl_ns()|.
 
     Parameters: ~
       • {ns_id}  the namespace to use
 
 nvim_set_hl_ns_fast({ns_id})                           *nvim_set_hl_ns_fast()*
-    Set active namespace for highlights while redrawing.
+    Set active namespace for highlights defined with |nvim_set_hl()| while
+    redrawing.
 
     This function meant to be called while redrawing, primarily from
     |nvim_set_decoration_provider()| on_win and on_line callbacks, which are
@@ -2921,8 +2925,9 @@ nvim_win_set_height({window}, {height})                *nvim_win_set_height()*
       • {height}  Height as a count of rows
 
 nvim_win_set_hl_ns({window}, {ns_id})                   *nvim_win_set_hl_ns()*
-    Set highlight namespace for a window. This will use highlights defined in
-    this namespace, but fall back to global highlights (ns=0) when missing.
+    Set highlight namespace for a window. This will use highlights defined
+    with |nvim_set_hl()| for this namespace, but fall back to global
+    highlights (ns=0) when missing.
 
     This takes precedence over the 'winhighlight' option.
 
-- 
cgit 


From 43d33c5d1abb7ed58237cb5e59d6e1e7dd046b55 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 Mar 2023 09:40:25 +0100
Subject: vim-patch:9.0.1406: ILE RPG files are not recognized

Problem:    ILE RPG files are not recognized.
Solution:   Add patterns for ILE RPG files. (Andreas Louv, issue vim/vim#12152)

https://github.com/vim/vim/commit/e202ec8a0c89e8ef47a3d38e668b7326fa68510a

Co-authored-by: Andreas Louv <andreas@louv.dk>
---
 runtime/lua/vim/filetype.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 1732623223..7be4b75138 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -883,6 +883,8 @@ local extension = {
   ron = 'ron',
   rsc = 'routeros',
   x = 'rpcgen',
+  rpgle = 'rpgle',
+  rpgleinc = 'rpgle',
   rpl = 'rpl',
   Srst = 'rrst',
   srst = 'rrst',
-- 
cgit 


From d7746b6ef1dcb64b3fc4ba744eafc69780772e26 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 Mar 2023 09:41:19 +0100
Subject: vim-patch:9.0.1407: TableGen files are not recognized

Problem:    TableGen files are not recognized.
Solution:   Add a pattern for TableGen files. (Amaan Qureshi, closes vim/vim#12156)

https://github.com/vim/vim/commit/b8ef029ee416fc2b402c3f321a55c9049b0ad2a9

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 7be4b75138..9eb03c776a 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1018,6 +1018,7 @@ local extension = {
   swift = 'swift',
   svh = 'systemverilog',
   sv = 'systemverilog',
+  td = 'tablegen',
   tak = 'tak',
   tal = 'tal',
   task = 'taskedit',
-- 
cgit 


From f83d8ea2798c87e441801ce5f08291808bf6ddbc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 Mar 2023 09:42:01 +0100
Subject: vim-patch:9.0.1408: QMLdir files are not recognized

Problem:    QMLdir files are not recognized.
Solution:   Add a pattern for QMLdir files. (Amaan Qureshi, closes vim/vim#12161)

https://github.com/vim/vim/commit/1505bef5c482a48e704644e6172be91c07ef1d12

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 9eb03c776a..f5353b853d 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1593,6 +1593,7 @@ local filename = {
   ['.pythonstartup'] = 'python',
   ['.pythonrc'] = 'python',
   SConstruct = 'python',
+  qmldir = 'qmldir',
   ['.Rprofile'] = 'r',
   ['Rprofile'] = 'r',
   ['Rprofile.site'] = 'r',
-- 
cgit 


From 571b50be16a0bb859082196ac1a80872526314cb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 17 Mar 2023 09:42:33 +0100
Subject: vim-patch:9.0.1409: racket files are recognized as scheme

Problem:    Racket files are recognized as scheme.
Solution:   Recognize rackets files separately. (Gabriel Kakizaki,
            closes vim/vim#12164, closes vim/vim#12162)

https://github.com/vim/vim/commit/d11ac403db07b6eac43882485e98caeb5e83e2e5

Co-authored-by: Gabriel Kakizaki <gkakizaki@gmail.com>
---
 runtime/lua/vim/filetype.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index f5353b853d..b777eaa179 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -838,6 +838,9 @@ local extension = {
   R = function(path, bufnr)
     return require('vim.filetype.detect').r(bufnr)
   end,
+  rkt = 'racket',
+  rktd = 'racket',
+  rktl = 'racket',
   rad = 'radiance',
   mat = 'radiance',
   ['pod6'] = 'raku',
@@ -910,9 +913,6 @@ local extension = {
   ss = 'scheme',
   scm = 'scheme',
   sld = 'scheme',
-  rkt = 'scheme',
-  rktd = 'scheme',
-  rktl = 'scheme',
   sce = 'scilab',
   sci = 'scilab',
   scss = 'scss',
-- 
cgit 


From 6162269fa3107b23fd18c6c6d0e3e8fb73cfb45e Mon Sep 17 00:00:00 2001
From: August Masquelier <31262046+levouh@users.noreply.github.com>
Date: Fri, 17 Mar 2023 05:26:13 -0600
Subject: fix(lsp): avoid switching buffers on lsp attach (#22689)

---
 runtime/lua/vim/lsp.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 39665a3d4f..7e8c73ddb6 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1101,21 +1101,21 @@ function lsp.start_client(config)
       return true
     end
 
-    local old_bufnr = vim.fn.bufnr('')
     local last_set_from = vim.fn.gettext('\n\tLast set from ')
     local line = vim.fn.gettext(' line ')
+    local scriptname
 
-    vim.cmd.buffer(bufnr)
-    local scriptname = vim.fn
-      .execute('verbose set ' .. option .. '?')
-      :match(last_set_from .. '(.*)' .. line .. '%d+')
-    vim.cmd.buffer(old_bufnr)
+    vim.api.nvim_buf_call(bufnr, function()
+      scriptname = vim.fn
+        .execute('verbose set ' .. option .. '?')
+        :match(last_set_from .. '(.*)' .. line .. '%d+')
+    end)
 
     if not scriptname then
       return false
     end
-    local vimruntime = vim.fn.getenv('VIMRUNTIME')
-    return vim.startswith(vim.fn.expand(scriptname), vim.fn.expand(vimruntime))
+
+    return vim.startswith(vim.fn.expand(scriptname), vim.fn.expand('$VIMRUNTIME'))
   end
 
   ---@private
-- 
cgit 


From 2720d2c793b22e6c0c8719e5592922619fffdf7a Mon Sep 17 00:00:00 2001
From: Yochem van Rosmalen <yochem+git@icloud.com>
Date: Fri, 17 Mar 2023 12:41:57 +0100
Subject: fix(treesitter): InspectTree does not respect 'splitright' #22692

Problem:
vim.treesitter.inspect_tree() and :InspectTree does not respect 'splitright'.

Solution:
- Change the default `command` from `topleft 60vnew` to `60vnew`.
- Change :InspectTree to respect command mods (`:vertical`, count, etc.).

Closes #22656
---
 runtime/doc/treesitter.txt     |  4 ++--
 runtime/lua/vim/treesitter.lua |  4 ++--
 runtime/plugin/nvim.lua        | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index ddca307e74..46f414d905 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -623,8 +623,8 @@ inspect_tree({opts})                           *vim.treesitter.inspect_tree()*
                 • winid (integer|nil): Window id to display the tree buffer
                   in. If omitted, a new window is created with {command}.
                 • command (string|nil): Vimscript command to create the
-                  window. Default value is "topleft 60vnew". Only used when
-                  {winid} is nil.
+                  window. Default value is "60vnew". Only used when {winid} is
+                  nil.
                 • title (string|fun(bufnr:integer):string|nil): Title of the
                   window. If a function, it accepts the buffer number of the
                   source buffer as its only argument and should return a
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 56000f99a8..43b8c11b80 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -439,7 +439,7 @@ end
 ---                      - winid (integer|nil): Window id to display the tree buffer in. If omitted,
 ---                        a new window is created with {command}.
 ---                      - command (string|nil): Vimscript command to create the window. Default
----                        value is "topleft 60vnew". Only used when {winid} is nil.
+---                        value is "60vnew". Only used when {winid} is nil.
 ---                      - title (string|fun(bufnr:integer):string|nil): Title of the window. If a
 ---                        function, it accepts the buffer number of the source buffer as its only
 ---                        argument and should return a string.
@@ -465,7 +465,7 @@ function M.inspect_tree(opts)
 
   local w = opts.winid
   if not w then
-    vim.cmd(opts.command or 'topleft 60vnew')
+    vim.cmd(opts.command or '60vnew')
     w = a.nvim_get_current_win()
   end
 
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index e4b099f7ad..0a33826b82 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -6,6 +6,15 @@ vim.api.nvim_create_user_command('Inspect', function(cmd)
   end
 end, { desc = 'Inspect highlights and extmarks at the cursor', bang = true })
 
-vim.api.nvim_create_user_command('InspectTree', function()
-  vim.treesitter.inspect_tree()
-end, { desc = 'Inspect treesitter language tree for buffer' })
+vim.api.nvim_create_user_command('InspectTree', function(cmd)
+  if cmd.mods ~= '' or cmd.count ~= 0 then
+    local count = cmd.count ~= 0 and cmd.count or ''
+    local new = cmd.mods ~= '' and 'new' or 'vnew'
+
+    vim.treesitter.inspect_tree({
+      command = ('%s %s%s'):format(cmd.mods, count, new),
+    })
+  else
+    vim.treesitter.inspect_tree()
+  end
+end, { desc = 'Inspect treesitter language tree for buffer', count = true })
-- 
cgit 


From 66ba81a6f7b52c0a765fc52362ca8f730af487ab Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sat, 18 Mar 2023 05:34:31 -0400
Subject: vim-patch:9.0.1412: Pony files are not recognized (#22721)

Problem:    Pony files are not recognized.
Solution:   Add a pattern for Pony files. (Amaan Qureshi, closes vim/vim#12155)

https://github.com/vim/vim/commit/6e377eca8de4c0c0d25808beb7de7676194ebf1d
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index b777eaa179..cf813b19b1 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -800,6 +800,7 @@ local extension = {
   pod = 'pod',
   filter = 'poefilter',
   pk = 'poke',
+  pony = 'pony',
   ps = 'postscr',
   epsi = 'postscr',
   afm = 'postscr',
-- 
cgit 


From ecc4d0e435d618828b938d78fbded7fbe1314760 Mon Sep 17 00:00:00 2001
From: Enan Ajmain <3nan.ajmain@gmail.com>
Date: Mon, 20 Mar 2023 03:25:12 +0600
Subject: fix(shell): on Windows :make does not echo #22728

Problem:
On Windows, :make does not display the output of the program it runs.
The cause is the default 'shellpipe'.  On Linux, nvim uses `tee` to redirect the
output to both stdout and the error file.  In Windows, for both cmd.exe and
powershell, the output is only redirected to the error file.

Solution:
- On Windows, change the 'shellpipe' default to "2>&1| tee".
    - Nvim includes `tee` in its Windows package.
- Document recommended defaults for powershell.

Fixes #12910
---
 runtime/doc/options.txt  | 13 ++++++-------
 runtime/doc/quickfix.txt |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9fff5228f2..36c02fa3cb 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5235,9 +5235,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 							*shell-powershell*
 	To use PowerShell: >
 		let &shell = executable('pwsh') ? 'pwsh' : 'powershell'
-		let &shellcmdflag = '-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;'
-		let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
-		let &shellpipe = '2>&1 | Out-File -Encoding UTF8 %s; exit $LastExitCode'
+		let &shellcmdflag = '-NoLogo -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new();$PSDefaultParameterValues[''Out-File:Encoding'']=''utf8'';'
+		let &shellredir = '2>&1 | %%{ "$_" } | Out-File %s; exit $LastExitCode'
+		let &shellpipe  = '2>&1 | %%{ "$_" } | Tee-Object %s; exit $LastExitCode'
 		set shellquote= shellxquote=
 
 <	This option cannot be set from a |modeline| or in the |sandbox|, for
@@ -5259,8 +5259,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 						*'shellpipe'* *'sp'*
-'shellpipe' 'sp'	string	(default ">", ">%s 2>&1", "| tee", "|& tee" or
-				 "2>&1| tee")
+'shellpipe' 'sp'	string	(default ">", "| tee", "|& tee" or "2>&1| tee")
 			global
 	String to be used to put the output of the ":make" command in the
 	error file.  See also |:make_makeprg|.  See |option-backslash| about
@@ -5268,8 +5267,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The name of the temporary file can be represented by "%s" if necessary
 	(the file name is appended automatically if no %s appears in the value
 	of this option).
-	For MS-Windows the default is ">%s 2>&1".  The output is directly
-	saved in a file and not echoed to the screen.
+	For MS-Windows the default is "2>&1| tee".  The stdout and stderr are
+	saved in a file and echoed to the screen.
 	For Unix the default is "| tee".  The stdout of the compiler is saved
 	in a file and echoed to the screen.  If the 'shell' option is "csh" or
 	"tcsh" after initializations, the default becomes "|& tee".  If the
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index f70dbd0913..0b5757d720 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -956,7 +956,7 @@ or simpler >
 "$*" can be given multiple times, for example: >
    :set makeprg=gcc\ -o\ $*\ $*
 
-The 'shellpipe' option defaults to ">%s 2>&1" for Win32.
+The 'shellpipe' option defaults to "2>&1| tee" for Win32.
 This means that the output of the compiler is saved in a file and not shown on
 the screen directly.  For Unix "| tee" is used.  The compiler output is shown
 on the screen and saved in a file the same time.  Depending on the shell used
-- 
cgit 


From e1db0e35e4d5859b96e6aff882df62d6c714b569 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 15 Mar 2023 23:30:14 +0000
Subject: feat(api): add filetype option nvim_get_option_value

- Also adjust the expr-mapping behaviour so normal commands and text
  changes are allowed in internal dummy buffers.
---
 runtime/doc/api.txt  | 4 ++++
 runtime/doc/news.txt | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index b8590026c8..04825381ff 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1969,6 +1969,10 @@ nvim_get_option_value({name}, {*opts})               *nvim_get_option_value()*
                 • win: |window-ID|. Used for getting window local options.
                 • buf: Buffer number. Used for getting buffer local options.
                   Implies {scope} is "local".
+                • filetype: |filetype|. Used to get the default option for a
+                  specific filetype. Cannot be used with any other option.
+                  Note: this is expensive, it is recommended to cache this
+                  value.
 
     Return: ~
         Option value
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 64cf5d78ba..b7d5694802 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -210,6 +210,9 @@ The following new APIs or features were added.
   https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection .
   Support for the previous format will be removed in a future release.
 
+• |nvim_get_option_value()| now has a `filetype` option so it can return the
+  default option for a specific filetype.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
-- 
cgit 


From e5641df6d3fc3bb6c3c55593b6152082bfc561b6 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 11 Mar 2023 17:11:02 +0000
Subject: feat: add `vim.filetype.get_option()`

---
 runtime/doc/api.txt                  |  4 +-
 runtime/doc/lua.txt                  | 22 ++++++++++
 runtime/doc/news.txt                 |  3 ++
 runtime/lua/vim/filetype.lua         | 20 +++++++++
 runtime/lua/vim/filetype/options.lua | 82 ++++++++++++++++++++++++++++++++++++
 5 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 runtime/lua/vim/filetype/options.lua

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 04825381ff..289788f036 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1971,8 +1971,8 @@ nvim_get_option_value({name}, {*opts})               *nvim_get_option_value()*
                   Implies {scope} is "local".
                 • filetype: |filetype|. Used to get the default option for a
                   specific filetype. Cannot be used with any other option.
-                  Note: this is expensive, it is recommended to cache this
-                  value.
+                  Note: this will trigger |ftplugin| and all |FileType|
+                  autocommands for the corresponding filetype.
 
     Return: ~
         Option value
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 611f2e0d32..e7dcc79f4a 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2206,6 +2206,28 @@ add({filetypes})                                          *vim.filetype.add()*
       • {filetypes}  (table) A table containing new filetype maps (see
                      example).
 
+get_option({filetype}, {option})                   *vim.filetype.get_option()*
+    Get the default option value for a {filetype}.
+
+    The returned value is what would be set in a new buffer after 'filetype'
+    is set, meaning it should respect all FileType autocmds and ftplugin
+    files.
+
+    Example: >lua
+      vim.filetype.get_option('vim', 'commentstring')
+<
+
+    Note: this uses |nvim_get_option_value()| but caches the result. This
+    means |ftplugin| and |FileType| autocommands are only triggered once and
+    may not reflect later changes.
+
+    Parameters: ~
+      • {filetype}  string Filetype
+      • {option}    string Option name
+
+    Return: ~
+        string|boolean|integer: Option value
+
 match({args})                                           *vim.filetype.match()*
     Perform filetype detection.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b7d5694802..5ac6db6f84 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -213,6 +213,9 @@ The following new APIs or features were added.
 • |nvim_get_option_value()| now has a `filetype` option so it can return the
   default option for a specific filetype.
 
+• |vim.filetype.get_option()| to get the default option value for a specific
+  filetype. This is a wrapper around |nvim_get_option_value()| with caching.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index cf813b19b1..69fcb01e8c 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2631,4 +2631,24 @@ function M.match(args)
   end
 end
 
+--- Get the default option value for a {filetype}.
+---
+--- The returned value is what would be set in a new buffer after 'filetype'
+--- is set, meaning it should respect all FileType autocmds and ftplugin files.
+---
+--- Example:
+--- <pre>lua
+---   vim.filetype.get_option('vim', 'commentstring')
+--- </pre>
+---
+--- Note: this uses |nvim_get_option_value()| but caches the result.
+--- This means |ftplugin| and |FileType| autocommands are only
+--- triggered once and may not reflect later changes.
+--- @param filetype string Filetype
+--- @param option string Option name
+--- @return string|boolean|integer: Option value
+function M.get_option(filetype, option)
+  return require('vim.filetype.options').get_option(filetype, option)
+end
+
 return M
diff --git a/runtime/lua/vim/filetype/options.lua b/runtime/lua/vim/filetype/options.lua
new file mode 100644
index 0000000000..77a66991d5
--- /dev/null
+++ b/runtime/lua/vim/filetype/options.lua
@@ -0,0 +1,82 @@
+local api = vim.api
+
+local M = {}
+
+local function get_ftplugin_runtime(filetype)
+  return api.nvim__get_runtime({
+    string.format('ftplugin/%s.vim', filetype),
+    string.format('ftplugin/%s_*.vim', filetype),
+    string.format('ftplugin/%s/*.vim', filetype),
+    string.format('ftplugin/%s.lua', filetype),
+    string.format('ftplugin/%s_*.lua', filetype),
+    string.format('ftplugin/%s/*.lua', filetype),
+  }, true, {}) --[[@as string[] ]]
+end
+
+-- Keep track of ftplugin files
+local ftplugin_cache = {} ---@type table<string,table<string,integer>>
+
+-- Keep track of total number of FileType autocmds
+local ft_autocmd_num ---@type integer?
+
+-- Keep track of filetype options
+local ft_option_cache = {} ---@type table<string,table<string,any>>
+
+--- @param path string
+--- @return integer
+local function hash(path)
+  local mtime0 = vim.loop.fs_stat(path).mtime
+  return mtime0.sec * 1000000000 + mtime0.nsec
+end
+
+--- Only update the cache on changes to the number of FileType autocmds
+--- and changes to any ftplugin/ file. This isn't guaranteed to catch everything
+--- but should be good enough.
+--- @param filetype string
+local function update_ft_option_cache(filetype)
+  local new_ftautos = #api.nvim_get_autocmds({ event = 'FileType' })
+  if new_ftautos ~= ft_autocmd_num then
+    -- invalidate
+    ft_option_cache[filetype] = nil
+    ft_autocmd_num = new_ftautos
+  end
+
+  local files = get_ftplugin_runtime(filetype)
+
+  ftplugin_cache[filetype] = ftplugin_cache[filetype] or {}
+
+  if #files ~= #vim.tbl_keys(ftplugin_cache[filetype]) then
+    -- invalidate
+    ft_option_cache[filetype] = nil
+    ftplugin_cache[filetype] = {}
+  end
+
+  for _, f in ipairs(files) do
+    -- VIMRUNTIME should be static so shouldn't need to worry about it changing
+    if not vim.startswith(f, vim.env.VIMRUNTIME) then
+      local mtime = hash(f)
+      if ftplugin_cache[filetype][f] ~= mtime then
+        -- invalidate
+        ft_option_cache[filetype] = nil
+        ftplugin_cache[filetype][f] = mtime
+      end
+    end
+  end
+end
+
+--- @private
+--- @param filetype string Filetype
+--- @param option string Option name
+--- @return string|integer|boolean
+function M.get_option(filetype, option)
+  update_ft_option_cache(filetype)
+
+  if not ft_option_cache[filetype] or not ft_option_cache[filetype][option] then
+    ft_option_cache[filetype] = ft_option_cache[filetype] or {}
+    ft_option_cache[filetype][option] = api.nvim_get_option_value(option, { filetype = filetype })
+  end
+
+  return ft_option_cache[filetype][option]
+end
+
+return M
-- 
cgit 


From 990c481551af2b346f315d75aa0815e9b65051f3 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 16 Mar 2023 14:50:20 +0100
Subject: refactor(vim.version): use lazy.nvim semver module

Use semver code from https://github.com/folke/lazy.nvim
License: Apache License 2.0

Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>
---
 runtime/lua/vim/version.lua | 191 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 35629c461f..b409483755 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -1,5 +1,196 @@
 local M = {}
 
+local LazyM = {}
+M.LazyM = LazyM
+
+---@class Semver
+---@field [1] number
+---@field [2] number
+---@field [3] number
+---@field major number
+---@field minor number
+---@field patch number
+---@field prerelease? string
+---@field build? string
+local Semver = {}
+Semver.__index = Semver
+
+function Semver:__index(key)
+  return type(key) == "number" and ({ self.major, self.minor, self.patch })[key] or Semver[key]
+end
+
+function Semver:__newindex(key, value)
+  if key == 1 then
+    self.major = value
+  elseif key == 2 then
+    self.minor = value
+  elseif key == 3 then
+    self.patch = value
+  else
+    rawset(self, key, value)
+  end
+end
+
+---@param other Semver
+function Semver:__eq(other)
+  for i = 1, 3 do
+    if self[i] ~= other[i] then
+      return false
+    end
+  end
+  return self.prerelease == other.prerelease
+end
+
+function Semver:__tostring()
+  local ret = table.concat({ self.major, self.minor, self.patch }, ".")
+  if self.prerelease then
+    ret = ret .. "-" .. self.prerelease
+  end
+  if self.build then
+    ret = ret .. "+" .. self.build
+  end
+  return ret
+end
+
+---@param other Semver
+function Semver:__lt(other)
+  for i = 1, 3 do
+    if self[i] > other[i] then
+      return false
+    elseif self[i] < other[i] then
+      return true
+    end
+  end
+  if self.prerelease and not other.prerelease then
+    return true
+  end
+  if other.prerelease and not self.prerelease then
+    return false
+  end
+  return (self.prerelease or "") < (other.prerelease or "")
+end
+
+---@param other Semver
+function Semver:__le(other)
+  return self < other or self == other
+end
+
+---@param version string|number[]
+---@return Semver?
+function LazyM.parse(version)
+  if type(version) == "table" then
+    return setmetatable({
+      major = version[1] or 0,
+      minor = version[2] or 0,
+      patch = version[3] or 0,
+    }, Semver)
+  end
+  local major, minor, patch, prerelease, build = version:match("^v?(%d+)%.?(%d*)%.?(%d*)%-?([^+]*)+?(.*)$")
+  if major then
+    return setmetatable({
+      major = tonumber(major),
+      minor = minor == "" and 0 or tonumber(minor),
+      patch = patch == "" and 0 or tonumber(patch),
+      prerelease = prerelease ~= "" and prerelease or nil,
+      build = build ~= "" and build or nil,
+    }, Semver)
+  end
+end
+
+---@generic T: Semver
+---@param versions T[]
+---@return T?
+function LazyM.last(versions)
+  local last = versions[1]
+  for i = 2, #versions do
+    if versions[i] > last then
+      last = versions[i]
+    end
+  end
+  return last
+end
+
+---@class SemverRange
+---@field from Semver
+---@field to? Semver
+local Range = {}
+
+---@param version string|Semver
+function Range:matches(version)
+  if type(version) == "string" then
+    ---@diagnostic disable-next-line: cast-local-type
+    version = LazyM.parse(version)
+  end
+  if version then
+    if version.prerelease ~= self.from.prerelease then
+      return false
+    end
+    return version >= self.from and (self.to == nil or version < self.to)
+  end
+end
+
+---@param spec string
+function LazyM.range(spec)
+  if spec == "*" or spec == "" then
+    return setmetatable({ from = LazyM.parse("0.0.0") }, { __index = Range })
+  end
+
+  ---@type number?
+  local hyphen = spec:find(" - ", 1, true)
+  if hyphen then
+    local a = spec:sub(1, hyphen - 1)
+    local b = spec:sub(hyphen + 3)
+    local parts = vim.split(b, ".", { plain = true })
+    local ra = LazyM.range(a)
+    local rb = LazyM.range(b)
+    return setmetatable({
+      from = ra and ra.from,
+      to = rb and (#parts == 3 and rb.from or rb.to),
+    }, { __index = Range })
+  end
+  ---@type string, string
+  local mods, version = spec:lower():match("^([%^=>~]*)(.*)$")
+  version = version:gsub("%.[%*x]", "")
+  local parts = vim.split(version:gsub("%-.*", ""), ".", { plain = true })
+  if #parts < 3 and mods == "" then
+    mods = "~"
+  end
+
+  local semver = LazyM.parse(version)
+  if semver then
+    local from = semver
+    local to = vim.deepcopy(semver)
+    if mods == "" or mods == "=" then
+      to.patch = to.patch + 1
+    elseif mods == ">" then
+      from.patch = from.patch + 1
+      to = nil
+    elseif mods == ">=" then
+      to = nil
+    elseif mods == "~" then
+      if #parts >= 2 then
+        to[2] = to[2] + 1
+        to[3] = 0
+      else
+        to[1] = to[1] + 1
+        to[2] = 0
+        to[3] = 0
+      end
+    elseif mods == "^" then
+      for i = 1, 3 do
+        if to[i] ~= 0 then
+          to[i] = to[i] + 1
+          for j = i + 1, 3 do
+            to[j] = 0
+          end
+          break
+        end
+      end
+    end
+    return setmetatable({ from = from, to = to }, { __index = Range })
+  end
+end
+
 ---@private
 ---@param version string
 ---@return string
-- 
cgit 


From a715e6f87eede36775d0921b3537c7c57a82890a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 16 Mar 2023 22:49:12 +0100
Subject: refactor(vim.version): use lazy.nvim semver module

Now the Nvim version string "v0.9.0-dev-1233+g210120dde81e" parses
correctly.
---
 runtime/lua/vim/version.lua | 295 +++++++++++---------------------------------
 1 file changed, 70 insertions(+), 225 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index b409483755..e79acf079b 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -16,7 +16,7 @@ local Semver = {}
 Semver.__index = Semver
 
 function Semver:__index(key)
-  return type(key) == "number" and ({ self.major, self.minor, self.patch })[key] or Semver[key]
+  return type(key) == 'number' and ({ self.major, self.minor, self.patch })[key] or Semver[key]
 end
 
 function Semver:__newindex(key, value)
@@ -42,12 +42,12 @@ function Semver:__eq(other)
 end
 
 function Semver:__tostring()
-  local ret = table.concat({ self.major, self.minor, self.patch }, ".")
+  local ret = table.concat({ self.major, self.minor, self.patch }, '.')
   if self.prerelease then
-    ret = ret .. "-" .. self.prerelease
+    ret = ret .. '-' .. self.prerelease
   end
   if self.build then
-    ret = ret .. "+" .. self.build
+    ret = ret .. '+' .. self.build
   end
   return ret
 end
@@ -67,7 +67,7 @@ function Semver:__lt(other)
   if other.prerelease and not self.prerelease then
     return false
   end
-  return (self.prerelease or "") < (other.prerelease or "")
+  return (self.prerelease or '') < (other.prerelease or '')
 end
 
 ---@param other Semver
@@ -76,23 +76,40 @@ function Semver:__le(other)
 end
 
 ---@param version string|number[]
+---@param strict? boolean Reject "1.0", "0-x" or other non-conforming version strings
 ---@return Semver?
-function LazyM.parse(version)
-  if type(version) == "table" then
+function LazyM.version(version, strict)
+  if type(version) == 'table' then
     return setmetatable({
       major = version[1] or 0,
       minor = version[2] or 0,
       patch = version[3] or 0,
     }, Semver)
   end
-  local major, minor, patch, prerelease, build = version:match("^v?(%d+)%.?(%d*)%.?(%d*)%-?([^+]*)+?(.*)$")
-  if major then
+
+  local prerel = version:match('%-([^+]*)')
+  local prerel_strict = version:match('%-([0-9A-Za-z-]*)')
+  if
+    strict
+    and prerel
+    and (prerel_strict == nil or prerel_strict == '' or not vim.startswith(prerel, prerel_strict))
+  then
+    return nil -- Invalid prerelease.
+  end
+  local build = prerel and version:match('%-[^+]*%+(.*)$') or version:match('%+(.*)$')
+  local major, minor, patch =
+    version:match('^v?(%d+)%.?(%d*)%.?(%d*)' .. (strict and (prerel and '%-' or '$') or ''))
+
+  if
+    (not strict and major)
+    or (major and minor and patch and major ~= '' and minor ~= '' and patch ~= '')
+  then
     return setmetatable({
       major = tonumber(major),
-      minor = minor == "" and 0 or tonumber(minor),
-      patch = patch == "" and 0 or tonumber(patch),
-      prerelease = prerelease ~= "" and prerelease or nil,
-      build = build ~= "" and build or nil,
+      minor = minor == '' and 0 or tonumber(minor),
+      patch = patch == '' and 0 or tonumber(patch),
+      prerelease = prerel ~= '' and prerel or nil,
+      build = build ~= '' and build or nil,
     }, Semver)
   end
 end
@@ -100,7 +117,7 @@ end
 ---@generic T: Semver
 ---@param versions T[]
 ---@return T?
-function LazyM.last(versions)
+function M.last(versions)
   local last = versions[1]
   for i = 2, #versions do
     if versions[i] > last then
@@ -117,9 +134,9 @@ local Range = {}
 
 ---@param version string|Semver
 function Range:matches(version)
-  if type(version) == "string" then
+  if type(version) == 'string' then
     ---@diagnostic disable-next-line: cast-local-type
-    version = LazyM.parse(version)
+    version = M.parse(version)
   end
   if version then
     if version.prerelease ~= self.from.prerelease then
@@ -131,16 +148,16 @@ end
 
 ---@param spec string
 function LazyM.range(spec)
-  if spec == "*" or spec == "" then
-    return setmetatable({ from = LazyM.parse("0.0.0") }, { __index = Range })
+  if spec == '*' or spec == '' then
+    return setmetatable({ from = M.parse('0.0.0') }, { __index = Range })
   end
 
   ---@type number?
-  local hyphen = spec:find(" - ", 1, true)
+  local hyphen = spec:find(' - ', 1, true)
   if hyphen then
     local a = spec:sub(1, hyphen - 1)
     local b = spec:sub(hyphen + 3)
-    local parts = vim.split(b, ".", { plain = true })
+    local parts = vim.split(b, '.', { plain = true })
     local ra = LazyM.range(a)
     local rb = LazyM.range(b)
     return setmetatable({
@@ -149,25 +166,25 @@ function LazyM.range(spec)
     }, { __index = Range })
   end
   ---@type string, string
-  local mods, version = spec:lower():match("^([%^=>~]*)(.*)$")
-  version = version:gsub("%.[%*x]", "")
-  local parts = vim.split(version:gsub("%-.*", ""), ".", { plain = true })
-  if #parts < 3 and mods == "" then
-    mods = "~"
+  local mods, version = spec:lower():match('^([%^=>~]*)(.*)$')
+  version = version:gsub('%.[%*x]', '')
+  local parts = vim.split(version:gsub('%-.*', ''), '.', { plain = true })
+  if #parts < 3 and mods == '' then
+    mods = '~'
   end
 
-  local semver = LazyM.parse(version)
+  local semver = M.parse(version)
   if semver then
     local from = semver
     local to = vim.deepcopy(semver)
-    if mods == "" or mods == "=" then
+    if mods == '' or mods == '=' then
       to.patch = to.patch + 1
-    elseif mods == ">" then
+    elseif mods == '>' then
       from.patch = from.patch + 1
-      to = nil
-    elseif mods == ">=" then
-      to = nil
-    elseif mods == "~" then
+      to = nil ---@diagnostic disable-line: cast-local-type
+    elseif mods == '>=' then
+      to = nil ---@diagnostic disable-line: cast-local-type
+    elseif mods == '~' then
       if #parts >= 2 then
         to[2] = to[2] + 1
         to[3] = 0
@@ -176,7 +193,7 @@ function LazyM.range(spec)
         to[2] = 0
         to[3] = 0
       end
-    elseif mods == "^" then
+    elseif mods == '^' then
       for i = 1, 3 do
         if to[i] ~= 0 then
           to[i] = to[i] + 1
@@ -192,7 +209,7 @@ function LazyM.range(spec)
 end
 
 ---@private
----@param version string
+---@param v string
 ---@return string
 local function create_err_msg(v)
   if type(v) == 'string' then
@@ -203,188 +220,36 @@ end
 
 ---@private
 --- Throws an error if `version` cannot be parsed.
----@param version string
-local function assert_version(version, opt)
-  local rv = M.parse(version, opt)
+---@param v string
+local function assert_version(v, opt)
+  local rv = M.parse(v, opt)
   if rv == nil then
-    error(create_err_msg(version))
+    error(create_err_msg(v))
   end
   return rv
 end
 
----@private
---- Compares the prerelease component of the two versions.
-local function cmp_prerelease(v1, v2)
-  if v1.prerelease and not v2.prerelease then
-    return -1
-  end
-  if not v1.prerelease and v2.prerelease then
-    return 1
-  end
-  if not v1.prerelease and not v2.prerelease then
-    return 0
-  end
-
-  local v1_identifiers = vim.split(v1.prerelease, '.', { plain = true })
-  local v2_identifiers = vim.split(v2.prerelease, '.', { plain = true })
-  local i = 1
-  local max = math.max(vim.tbl_count(v1_identifiers), vim.tbl_count(v2_identifiers))
-  while i <= max do
-    local v1_identifier = v1_identifiers[i]
-    local v2_identifier = v2_identifiers[i]
-    if v1_identifier ~= v2_identifier then
-      local v1_num = tonumber(v1_identifier)
-      local v2_num = tonumber(v2_identifier)
-      local is_number = v1_num and v2_num
-      if is_number then
-        -- Number comparisons
-        if not v1_num and v2_num then
-          return -1
-        end
-        if v1_num and not v2_num then
-          return 1
-        end
-        if v1_num == v2_num then
-          return 0
-        end
-        if v1_num > v2_num then
-          return 1
-        end
-        if v1_num < v2_num then
-          return -1
-        end
-      else
-        -- String comparisons
-        if v1_identifier and not v2_identifier then
-          return 1
-        end
-        if not v1_identifier and v2_identifier then
-          return -1
-        end
-        if v1_identifier < v2_identifier then
-          return -1
-        end
-        if v1_identifier > v2_identifier then
-          return 1
-        end
-        if v1_identifier == v2_identifier then
-          return 0
-        end
-      end
-    end
-    i = i + 1
-  end
-
-  return 0
-end
-
----@private
-local function cmp_version_core(v1, v2)
-  if v1.major == v2.major and v1.minor == v2.minor and v1.patch == v2.patch then
-    return 0
-  end
-  if
-    v1.major > v2.major
-    or (v1.major == v2.major and v1.minor > v2.minor)
-    or (v1.major == v2.major and v1.minor == v2.minor and v1.patch > v2.patch)
-  then
-    return 1
-  end
-  return -1
-end
-
---- Compares two strings (`v1` and `v2`) in semver format.
+--- Parses and compares two version strings.
+---
+--- semver notes:
+--- - Build metadata MUST be ignored when comparing versions.
+---
 ---@param v1 string Version.
 ---@param v2 string Version to compare with v1.
 ---@param opts table|nil Optional keyword arguments:
----                      - strict (boolean):  see `semver.parse` for details. Defaults to false.
+---                      - strict (boolean):  see `version.parse` for details. Defaults to false.
 ---@return integer `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
 function M.cmp(v1, v2, opts)
   opts = opts or { strict = false }
   local v1_parsed = assert_version(v1, opts)
   local v2_parsed = assert_version(v2, opts)
-
-  local result = cmp_version_core(v1_parsed, v2_parsed)
-  if result == 0 then
-    result = cmp_prerelease(v1_parsed, v2_parsed)
-  end
-  return result
-end
-
----@private
----@param labels string Prerelease and build component of semantic version string e.g. "-rc1+build.0".
----@return string|nil
-local function parse_prerelease(labels)
-  -- This pattern matches "-(alpha)+build.15".
-  -- '^%-[%w%.]+$'
-  local result = labels:match('^%-([%w%.]+)+.+$')
-  if result then
-    return result
-  end
-  -- This pattern matches "-(alpha)".
-  result = labels:match('^%-([%w%.]+)')
-  if result then
-    return result
-  end
-
-  return nil
-end
-
----@private
----@param labels string Prerelease and build component of semantic version string e.g. "-rc1+build.0".
----@return string|nil
-local function parse_build(labels)
-  -- Pattern matches "-alpha+(build.15)".
-  local result = labels:match('^%-[%w%.]+%+([%w%.]+)$')
-  if result then
-    return result
-  end
-
-  -- Pattern matches "+(build.15)".
-  result = labels:match('^%+([%w%.]+)$')
-  if result then
-    return result
+  if v1_parsed == v2_parsed then
+    return 0
   end
-
-  return nil
-end
-
----@private
---- Extracts the major, minor, patch and preprelease and build components from
---- `version`.
----@param version string Version string
-local function extract_components_strict(version)
-  local major, minor, patch, prerelease_and_build = version:match('^v?(%d+)%.(%d+)%.(%d+)(.*)$')
-  return tonumber(major), tonumber(minor), tonumber(patch), prerelease_and_build
-end
-
----@private
---- Extracts the major, minor, patch and preprelease and build components from
---- `version`. When `minor` and `patch` components are not found (nil), coerce
---- them to 0.
----@param version string Version string
-local function extract_components_loose(version)
-  local major, minor, patch, prerelease_and_build = version:match('^v?(%d+)%.?(%d*)%.?(%d*)(.*)$')
-  major = tonumber(major)
-  minor = tonumber(minor) or 0
-  patch = tonumber(patch) or 0
-  return major, minor, patch, prerelease_and_build
-end
-
----@private
---- Validates the prerelease and build string e.g. "-rc1+build.0". If the
---- prerelease, build or both are valid forms then it will return true, if it
---- is not of any valid form, it will return false.
----@param prerelease_and_build string
----@return boolean
-local function is_prerelease_and_build_valid(prerelease_and_build)
-  if prerelease_and_build == '' then
-    return true
+  if v1_parsed > v2_parsed then
+    return 1
   end
-  local has_build = parse_build(prerelease_and_build) ~= nil
-  local has_prerelease = parse_prerelease(prerelease_and_build) ~= nil
-  local has_prerelease_and_build = has_prerelease and has_build
-  return has_build or has_prerelease or has_prerelease_and_build
+  return -1
 end
 
 --- Parses a semantic version string.
@@ -405,34 +270,14 @@ function M.parse(version, opts)
   if type(version) ~= 'string' then
     error(create_err_msg(version))
   end
-
   opts = opts or { strict = false }
 
-  version = vim.trim(version)
-
-  local extract_components = opts.strict and extract_components_strict or extract_components_loose
-  local major, minor, patch, prerelease_and_build = extract_components(version)
-
-  -- If major is nil then that means that the version does not begin with a
-  -- digit with or without a "v" prefix.
-  if major == nil or not is_prerelease_and_build_valid(prerelease_and_build) then
-    return nil
-  end
-
-  local prerelease = nil
-  local build = nil
-  if prerelease_and_build ~= nil then
-    prerelease = parse_prerelease(prerelease_and_build)
-    build = parse_build(prerelease_and_build)
+  if opts.strict then
+    return LazyM.version(version, true)
   end
 
-  return {
-    major = major,
-    minor = minor,
-    patch = patch,
-    prerelease = prerelease,
-    build = build,
-  }
+  version = vim.trim(version) -- TODO: add more "scrubbing".
+  return LazyM.version(version, false)
 end
 
 ---Returns `true` if `v1` are `v2` are equal versions.
-- 
cgit 


From a40eb7cc991eb4f8b89f467e8e42563868efa76b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 17 Mar 2023 01:12:33 +0100
Subject: feat(vim.version): more coercion with strict=false

Problem:
"tmux 3.2a" (output from "tmux -V") is not parsed easily.

Solution:
With `strict=false`, discard everything before the first digit.

- rename Semver => Version
- rename vim.version.version() => vim.version._version()
- rename matches() => has()
- remove `opts` from cmp()
---
 runtime/autoload/provider/clipboard.vim |   4 +-
 runtime/doc/lua.txt                     | 172 ++++++++++++++++----
 runtime/doc/news.txt                    |   4 +-
 runtime/lua/vim/version.lua             | 267 +++++++++++++++++++++-----------
 4 files changed, 318 insertions(+), 129 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 98c80f1843..6d238ddb55 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -145,8 +145,8 @@ function! provider#clipboard#Executable() abort
     let s:paste['*'] = s:paste['+']
     return 'termux-clipboard'
   elseif !empty($TMUX) && executable('tmux')
-    let ver = matchlist(systemlist(['tmux', '-V'])[0], '\vtmux %(next-)?(\d+)\.(\d+)')
-    if len(ver) >= 3 && (ver[1] > 3 || (ver[1] == 3 && ver[2] >= 2))
+    let tmux_v = v:lua.vim.version.parse(system(['tmux', '-V']))
+    if !empty(tmux_v) && !v:lua.vim.version.lt(tmux_v, [3,2,0])
       let s:copy['+'] = ['tmux', 'load-buffer', '-w', '-']
     else
       let s:copy['+'] = ['tmux', 'load-buffer', '-']
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index e7dcc79f4a..cec3c1303f 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -782,9 +782,6 @@ vim.api.{func}({...})                                                *vim.api*
     Example: call the "nvim_get_current_line()" API function: >lua
         print(tostring(vim.api.nvim_get_current_line()))
 
-vim.version()                                                    *vim.version*
-    Gets the version of the current Nvim build.
-
 vim.in_fast_event()                                      *vim.in_fast_event()*
     Returns true if the code is executing as part of a "fast" event handler,
     where most of the API is disabled. These are low-level events (e.g.
@@ -1391,8 +1388,7 @@ deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
     Parameters: ~
       • {name}         string Deprecated feature (function, API, etc.).
       • {alternative}  (string|nil) Suggested alternative feature.
-      • {version}      string Version when the deprecated function will be
-                       removed.
+      • {version}      string Version when the deprecated function will be removed.
       • {plugin}       string|nil Name of the plugin that owns the deprecated
                        feature. Defaults to "Nvim".
       • {backtrace}    boolean|nil Prints backtrace. Defaults to true.
@@ -2533,67 +2529,179 @@ trust({opts})                                             *vim.secure.trust()*
 ==============================================================================
 Lua module: version                                              *lua-version*
 
-cmp({v1}, {v2}, {opts})                                    *vim.version.cmp()*
-    Compares two strings ( `v1` and `v2` ) in semver format.
+
+The `vim.version` module provides functions for comparing versions and
+ranges conforming to the
+
+https://semver.org
+
+spec. Plugins, and plugin managers, can use this to check available tools
+and dependencies on the current system.
+
+Example: >lua
+
+  local v = vim.version.parse(vim.fn.system({'tmux', '-V'}), {strict=false})
+  if vim.version.gt(v, {3, 2, 0}) then
+    -- ...
+  end
+
+<
+
+*vim.version()* returns the version of the current Nvim process.
+
+VERSION RANGE SPEC *version-range*
+
+A version "range spec" defines a semantic version range which can be
+tested against a version, using |vim.version.range()|.
+
+Supported range specs are shown in the following table. Note: suffixed
+versions (1.2.3-rc1) are not matched. >
+
+  1.2.3             is 1.2.3
+  =1.2.3            is 1.2.3
+  >1.2.3            greater than 1.2.3
+  <1.2.3            before 1.2.3
+  >=1.2.3           at least 1.2.3
+  ~1.2.3            is >=1.2.3 <1.3.0       "reasonably close to 1.2.3"
+  ^1.2.3            is >=1.2.3 <2.0.0       "compatible with 1.2.3"
+  ^0.2.3            is >=0.2.3 <0.3.0       (0.x.x is special)
+  ^0.0.1            is =0.0.1               (0.0.x is special)
+  ^1.2              is >=1.2.0 <2.0.0       (like ^1.2.0)
+  ~1.2              is >=1.2.0 <1.3.0       (like ~1.2.0)
+  ^1                is >=1.0.0 <2.0.0       "compatible with 1"
+  ~1                same                    "reasonably close to 1"
+  1.x               same
+  1.*               same
+  1                 same
+  *                 any version
+  x                 same
+
+  1.2.3 - 2.3.4     is >=1.2.3 <=2.3.4
+
+  Partial right: missing pieces treated as x (2.3 => 2.3.x).
+  1.2.3 - 2.3       is >=1.2.3 <2.4.0
+  1.2.3 - 2         is >=1.2.3 <3.0.0
+
+  Partial left: missing pieces treated as 0 (1.2 => 1.2.0).
+  1.2 - 2.3.0       is 1.2.0 - 2.3.0
+
+<
+
+cmp({v1}, {v2})                                            *vim.version.cmp()*
+    Parses and compares two version version objects (the result of
+    |vim.version.parse()|, or specified literally as a `{major, minor, patch}`
+    tuple, e.g. `{1, 0, 3}`).
+
+    Example: >lua
+
+       if vim.version.cmp({1,0,3}, {0,2,1}) == 0 then
+         -- ...
+       end
+       local v1 = vim.version.parse('1.0.3-pre')
+       local v2 = vim.version.parse('0.2.1')
+       if vim.version.cmp(v1, v2) == 0 then
+         -- ...
+       end
+<
+
+    Note:
+        Per semver, build metadata is ignored when comparing two
+        otherwise-equivalent versions.
 
     Parameters: ~
-      • {v1}    (string) Version.
-      • {v2}    (string) Version to compare with v1.
-      • {opts}  (table|nil) Optional keyword arguments:
-                • strict (boolean): see `semver.parse` for details. Defaults
-                  to false.
+      • {v1}  Version|number[] Version object.
+      • {v2}  Version|number[] Version to compare with `v1` .
 
     Return: ~
-        (integer) `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
+        (integer) -1 if `v1 < v2`, 0 if `v1 == v2`, 1 if `v1 > v2`.
 
 eq({v1}, {v2})                                              *vim.version.eq()*
-    Returns `true` if `v1` are `v2` are equal versions.
+    Returns `true` if the given versions are equal.
 
     Parameters: ~
-      • {v1}  (string)
-      • {v2}  (string)
+      • {v1}  Version|number[]
+      • {v2}  Version|number[]
 
     Return: ~
         (boolean)
 
 gt({v1}, {v2})                                              *vim.version.gt()*
-    Returns `true` if `v1` is greater than `v2` .
+    Returns `true` if `v1 > v2` .
 
     Parameters: ~
-      • {v1}  (string)
-      • {v2}  (string)
+      • {v1}  Version|number[]
+      • {v2}  Version|number[]
 
     Return: ~
         (boolean)
 
+last({versions})                                          *vim.version.last()*
+    TODO: generalize this, move to func.lua
+
+    Parameters: ~
+      • {versions}  Version []
+
+    Return: ~
+        Version ?|ni
+
 lt({v1}, {v2})                                              *vim.version.lt()*
-    Returns `true` if `v1` is less than `v2` .
+    Returns `true` if `v1 < v2` .
 
     Parameters: ~
-      • {v1}  (string)
-      • {v2}  (string)
+      • {v1}  Version|number[]
+      • {v2}  Version|number[]
 
     Return: ~
         (boolean)
 
 parse({version}, {opts})                                 *vim.version.parse()*
-    Parses a semantic version string.
-
-    Ignores leading "v" and surrounding whitespace, e.g. "
-    v1.0.1-rc1+build.2", "1.0.1-rc1+build.2", "v1.0.1-rc1+build.2" and
-    "v1.0.1-rc1+build.2 " are all parsed as: >
+    Parses a semantic version string and returns a version object which can be
+    used with other `vim.version` functions. For example "1.0.1-rc1+build.2" returns: >
 
        { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
 <
 
     Parameters: ~
-      • {version}  (string) Version string to be parsed.
+      • {version}  (string) Version string to parse.
       • {opts}     (table|nil) Optional keyword arguments:
-                   • strict (boolean): Default false. If `true` , no coercion is attempted on input not strictly
-                     conforming to semver v2.0.0 ( https://semver.org/spec/v2.0.0.html ). E.g. `parse("v1.2")` returns nil.
+                   • strict (boolean): Default false. If `true`, no coercion
+                     is attempted on input not conforming to semver v2.0.0. If
+                     `false`, `parse()` attempts to coerce input such as
+                     "1.0", "0-x", "tmux 3.2a" into valid versions.
 
     Return: ~
-        (table|nil) parsed_version Parsed version table or `nil` if `version`
-        is invalid.
+        (table|nil) parsed_version Version object or `nil` if input is invalid.
+
+    See also: ~
+      • # https://semver.org/spec/v2.0.0.html
+
+range({spec})                                            *vim.version.range()*
+    Parses a semver |version-range| "spec" and returns a range object: >
+
+      {
+        from: Version
+        to: Version
+        has(v: string|Version)
+      }
+<
+
+    `:has()` checks if a version is in the range (inclusive `from` , exclusive `to` ). Example: >lua
+
+      local r = vim.version.range('1.0.0 - 2.0.0')
+      print(r:has('1.9.9'))  -- true
+      print(r:has('2.0.0'))  -- false
+<
+
+    Or use cmp(), eq(), lt(), and gt() to compare `.to` and `.from` directly: >lua
+
+      local r = vim.version.range('1.0.0 - 2.0.0')
+      print(vim.version.gt({1,0,3}, r.from) and vim.version.lt({1,0,3}, r.to))
+<
+
+    Parameters: ~
+      • {spec}  string Version range "spec"
+
+    See also: ~
+      • # https://github.com/npm/node-semver#ranges
 
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 5ac6db6f84..c326ae15c7 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -65,8 +65,8 @@ NEW FEATURES                                                    *news-features*
 
 The following new APIs or features were added.
 
-• Added |vim.version| for parsing and comparing version strings conforming to
-  the semver specification, see |lua-version|.
+• Added |lua-version| for parsing and comparing version strings conforming to
+  the semver specification.
 
 • A new environment variable named NVIM_APPNAME enables configuring the
   directories where Neovim should find its configuration and state files. See
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index e79acf079b..8d8b0d6da7 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -1,9 +1,59 @@
-local M = {}
+--- @defgroup lua-version
+---
+--- @brief The \`vim.version\` module provides functions for comparing versions and ranges
+--- conforming to the https://semver.org spec. Plugins, and plugin managers, can use this to check
+--- available tools and dependencies on the current system.
+---
+--- Example:
+---   <pre>lua
+---   local v = vim.version.parse(vim.fn.system({'tmux', '-V'}), {strict=false})
+---   if vim.version.gt(v, {3, 2, 0}) then
+---     -- ...
+---   end
+---   </pre>
+---
+--- \*vim.version()\* returns the version of the current Nvim process.
+---
+--- VERSION RANGE SPEC \*version-range\*
+---
+--- A version "range spec" defines a semantic version range which can be tested against a version,
+--- using |vim.version.range()|.
+---
+--- Supported range specs are shown in the following table.
+--- Note: suffixed versions (1.2.3-rc1) are not matched.
+---   <pre>
+---   1.2.3             is 1.2.3
+---   =1.2.3            is 1.2.3
+---   >1.2.3            greater than 1.2.3
+---   <1.2.3            before 1.2.3
+---   >=1.2.3           at least 1.2.3
+---   ~1.2.3            is >=1.2.3 <1.3.0       "reasonably close to 1.2.3"
+---   ^1.2.3            is >=1.2.3 <2.0.0       "compatible with 1.2.3"
+---   ^0.2.3            is >=0.2.3 <0.3.0       (0.x.x is special)
+---   ^0.0.1            is =0.0.1               (0.0.x is special)
+---   ^1.2              is >=1.2.0 <2.0.0       (like ^1.2.0)
+---   ~1.2              is >=1.2.0 <1.3.0       (like ~1.2.0)
+---   ^1                is >=1.0.0 <2.0.0       "compatible with 1"
+---   ~1                same                    "reasonably close to 1"
+---   1.x               same
+---   1.*               same
+---   1                 same
+---   *                 any version
+---   x                 same
+---
+---   1.2.3 - 2.3.4     is >=1.2.3 <=2.3.4
+---
+---   Partial right: missing pieces treated as x (2.3 => 2.3.x).
+---   1.2.3 - 2.3       is >=1.2.3 <2.4.0
+---   1.2.3 - 2         is >=1.2.3 <3.0.0
+---
+---   Partial left: missing pieces treated as 0 (1.2 => 1.2.0).
+---   1.2 - 2.3.0       is 1.2.0 - 2.3.0
+---   </pre>
 
-local LazyM = {}
-M.LazyM = LazyM
+local M = {}
 
----@class Semver
+---@class Version
 ---@field [1] number
 ---@field [2] number
 ---@field [3] number
@@ -12,14 +62,14 @@ M.LazyM = LazyM
 ---@field patch number
 ---@field prerelease? string
 ---@field build? string
-local Semver = {}
-Semver.__index = Semver
+local Version = {}
+Version.__index = Version
 
-function Semver:__index(key)
-  return type(key) == 'number' and ({ self.major, self.minor, self.patch })[key] or Semver[key]
+function Version:__index(key)
+  return type(key) == 'number' and ({ self.major, self.minor, self.patch })[key] or Version[key]
 end
 
-function Semver:__newindex(key, value)
+function Version:__newindex(key, value)
   if key == 1 then
     self.major = value
   elseif key == 2 then
@@ -31,8 +81,8 @@ function Semver:__newindex(key, value)
   end
 end
 
----@param other Semver
-function Semver:__eq(other)
+---@param other Version
+function Version:__eq(other)
   for i = 1, 3 do
     if self[i] ~= other[i] then
       return false
@@ -41,7 +91,7 @@ function Semver:__eq(other)
   return self.prerelease == other.prerelease
 end
 
-function Semver:__tostring()
+function Version:__tostring()
   local ret = table.concat({ self.major, self.minor, self.patch }, '.')
   if self.prerelease then
     ret = ret .. '-' .. self.prerelease
@@ -52,8 +102,8 @@ function Semver:__tostring()
   return ret
 end
 
----@param other Semver
-function Semver:__lt(other)
+---@param other Version
+function Version:__lt(other)
   for i = 1, 3 do
     if self[i] > other[i] then
       return false
@@ -70,21 +120,32 @@ function Semver:__lt(other)
   return (self.prerelease or '') < (other.prerelease or '')
 end
 
----@param other Semver
-function Semver:__le(other)
+---@param other Version
+function Version:__le(other)
   return self < other or self == other
 end
 
----@param version string|number[]
----@param strict? boolean Reject "1.0", "0-x" or other non-conforming version strings
----@return Semver?
-function LazyM.version(version, strict)
+--- @private
+---
+--- Creates a new Version object. Not public currently.
+---
+--- @param version string|number[]|Version
+--- @param strict? boolean Reject "1.0", "0-x", "3.2a" or other non-conforming version strings
+--- @return Version?
+function M._version(version, strict) -- Adapted from https://github.com/folke/lazy.nvim
   if type(version) == 'table' then
+    if version.major then
+      return setmetatable(vim.deepcopy(version), Version)
+    end
     return setmetatable({
       major = version[1] or 0,
       minor = version[2] or 0,
       patch = version[3] or 0,
-    }, Semver)
+    }, Version)
+  end
+
+  if not strict then -- TODO: add more "scrubbing".
+    version = version:match('%d[^ ]*')
   end
 
   local prerel = version:match('%-([^+]*)')
@@ -110,11 +171,13 @@ function LazyM.version(version, strict)
       patch = patch == '' and 0 or tonumber(patch),
       prerelease = prerel ~= '' and prerel or nil,
       build = build ~= '' and build or nil,
-    }, Semver)
+    }, Version)
   end
 end
 
----@generic T: Semver
+---TODO: generalize this, move to func.lua
+---
+---@generic T: Version
 ---@param versions T[]
 ---@return T?
 function M.last(versions)
@@ -127,13 +190,15 @@ function M.last(versions)
   return last
 end
 
----@class SemverRange
----@field from Semver
----@field to? Semver
+---@class Range
+---@field from Version
+---@field to? Version
 local Range = {}
 
----@param version string|Semver
-function Range:matches(version)
+--- @private
+---
+---@param version string|Version
+function Range:has(version)
   if type(version) == 'string' then
     ---@diagnostic disable-next-line: cast-local-type
     version = M.parse(version)
@@ -146,8 +211,32 @@ function Range:matches(version)
   end
 end
 
----@param spec string
-function LazyM.range(spec)
+--- Parses a semver |version-range| "spec" and returns a range object:
+---   <pre>
+---   {
+---     from: Version
+---     to: Version
+---     has(v: string|Version)
+---   }
+---   </pre>
+---
+--- `:has()` checks if a version is in the range (inclusive `from`, exclusive `to`). Example:
+---   <pre>lua
+---   local r = vim.version.range('1.0.0 - 2.0.0')
+---   print(r:has('1.9.9'))  -- true
+---   print(r:has('2.0.0'))  -- false
+---   </pre>
+---
+--- Or use cmp(), eq(), lt(), and gt() to compare `.to` and `.from` directly:
+---   <pre>lua
+---   local r = vim.version.range('1.0.0 - 2.0.0')
+---   print(vim.version.gt({1,0,3}, r.from) and vim.version.lt({1,0,3}, r.to))
+---   </pre>
+---
+--- @see # https://github.com/npm/node-semver#ranges
+---
+--- @param spec string Version range "spec"
+function M.range(spec) -- Adapted from https://github.com/folke/lazy.nvim
   if spec == '*' or spec == '' then
     return setmetatable({ from = M.parse('0.0.0') }, { __index = Range })
   end
@@ -158,8 +247,8 @@ function LazyM.range(spec)
     local a = spec:sub(1, hyphen - 1)
     local b = spec:sub(hyphen + 3)
     local parts = vim.split(b, '.', { plain = true })
-    local ra = LazyM.range(a)
-    local rb = LazyM.range(b)
+    local ra = M.range(a)
+    local rb = M.range(b)
     return setmetatable({
       from = ra and ra.from,
       to = rb and (#parts == 3 and rb.from or rb.to),
@@ -209,40 +298,40 @@ function LazyM.range(spec)
 end
 
 ---@private
----@param v string
+---@param v string|Version
 ---@return string
 local function create_err_msg(v)
   if type(v) == 'string' then
     return string.format('invalid version: "%s"', tostring(v))
+  elseif type(v) == 'table' and v.major then
+    return string.format('invalid version: %s', vim.inspect(v))
   end
   return string.format('invalid version: %s (%s)', tostring(v), type(v))
 end
 
----@private
---- Throws an error if `version` cannot be parsed.
----@param v string
-local function assert_version(v, opt)
-  local rv = M.parse(v, opt)
-  if rv == nil then
-    error(create_err_msg(v))
-  end
-  return rv
-end
-
---- Parses and compares two version strings.
+--- Parses and compares two version version objects (the result of |vim.version.parse()|, or
+--- specified literally as a `{major, minor, patch}` tuple, e.g. `{1, 0, 3}`).
 ---
---- semver notes:
---- - Build metadata MUST be ignored when comparing versions.
+--- Example:
+--- <pre>lua
+---   if vim.version.cmp({1,0,3}, {0,2,1}) == 0 then
+---     -- ...
+---   end
+---   local v1 = vim.version.parse('1.0.3-pre')
+---   local v2 = vim.version.parse('0.2.1')
+---   if vim.version.cmp(v1, v2) == 0 then
+---     -- ...
+---   end
+--- </pre>
 ---
----@param v1 string Version.
----@param v2 string Version to compare with v1.
----@param opts table|nil Optional keyword arguments:
----                      - strict (boolean):  see `version.parse` for details. Defaults to false.
----@return integer `-1` if `v1 < v2`, `0` if `v1 == v2`, `1` if `v1 > v2`.
-function M.cmp(v1, v2, opts)
-  opts = opts or { strict = false }
-  local v1_parsed = assert_version(v1, opts)
-  local v2_parsed = assert_version(v2, opts)
+--- @note Per semver, build metadata is ignored when comparing two otherwise-equivalent versions.
+---
+---@param v1 Version|number[] Version object.
+---@param v2 Version|number[] Version to compare with `v1`.
+---@return integer -1 if `v1 < v2`, 0 if `v1 == v2`, 1 if `v1 > v2`.
+function M.cmp(v1, v2)
+  local v1_parsed = assert(M._version(v1), create_err_msg(v1))
+  local v2_parsed = assert(M._version(v2), create_err_msg(v1))
   if v1_parsed == v2_parsed then
     return 0
   end
@@ -252,58 +341,50 @@ function M.cmp(v1, v2, opts)
   return -1
 end
 
---- Parses a semantic version string.
----
---- Ignores leading "v" and surrounding whitespace, e.g. " v1.0.1-rc1+build.2",
---- "1.0.1-rc1+build.2", "v1.0.1-rc1+build.2" and "v1.0.1-rc1+build.2 " are all parsed as:
---- <pre>
----   { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
---- </pre>
----
----@param version string Version string to be parsed.
----@param opts table|nil Optional keyword arguments:
----                      - strict (boolean):  Default false. If `true`, no coercion is attempted on
----                      input not strictly conforming to semver v2.0.0
----                      (https://semver.org/spec/v2.0.0.html). E.g. `parse("v1.2")` returns nil.
----@return table|nil parsed_version Parsed version table or `nil` if `version` is invalid.
-function M.parse(version, opts)
-  if type(version) ~= 'string' then
-    error(create_err_msg(version))
-  end
-  opts = opts or { strict = false }
-
-  if opts.strict then
-    return LazyM.version(version, true)
-  end
-
-  version = vim.trim(version) -- TODO: add more "scrubbing".
-  return LazyM.version(version, false)
-end
-
----Returns `true` if `v1` are `v2` are equal versions.
----@param v1 string
----@param v2 string
+---Returns `true` if the given versions are equal.
+---@param v1 Version|number[]
+---@param v2 Version|number[]
 ---@return boolean
 function M.eq(v1, v2)
   return M.cmp(v1, v2) == 0
 end
 
----Returns `true` if `v1` is less than `v2`.
----@param v1 string
----@param v2 string
+---Returns `true` if `v1 < v2`.
+---@param v1 Version|number[]
+---@param v2 Version|number[]
 ---@return boolean
 function M.lt(v1, v2)
   return M.cmp(v1, v2) == -1
 end
 
----Returns `true` if `v1` is greater than `v2`.
----@param v1 string
----@param v2 string
+---Returns `true` if `v1 > v2`.
+---@param v1 Version|number[]
+---@param v2 Version|number[]
 ---@return boolean
 function M.gt(v1, v2)
   return M.cmp(v1, v2) == 1
 end
 
+--- Parses a semantic version string and returns a version object which can be used with other
+--- `vim.version` functions. For example "1.0.1-rc1+build.2" returns:
+--- <pre>
+---   { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
+--- </pre>
+---
+--- @see # https://semver.org/spec/v2.0.0.html
+---
+---@param version string Version string to parse.
+---@param opts table|nil Optional keyword arguments:
+---                      - strict (boolean):  Default false. If `true`, no coercion is attempted on
+---                      input not conforming to semver v2.0.0. If `false`, `parse()` attempts to
+---                      coerce input such as "1.0", "0-x", "tmux 3.2a" into valid versions.
+---@return table|nil parsed_version Version object or `nil` if input is invalid.
+function M.parse(version, opts)
+  assert(type(version) == 'string', create_err_msg(version))
+  opts = opts or { strict = false }
+  return M._version(version, opts.strict)
+end
+
 setmetatable(M, {
   __call = function()
     return vim.fn.api_info().version
-- 
cgit 


From d11986171b4a5ddd950053e2b9a26d2ad8e89a5c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 20 Mar 2023 21:07:09 +0100
Subject: vim-patch:9.0.1415: Crystal files are not recognized

Problem:    Crystal files are not recognized.
Solution:   Add a pattern for Crystal files. (Amaan Qureshi, closes vim/vim#12175)

https://github.com/vim/vim/commit/7c4516fe93d865f4ef1877181f8156b8b9331856

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 69fcb01e8c..399760b254 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -265,6 +265,7 @@ local extension = {
   end,
   cql = 'cqlang',
   crm = 'crm',
+  cr = 'crystal',
   csx = 'cs',
   cs = 'cs',
   csc = 'csc',
-- 
cgit 


From 0c9ed19af3be45d679d77460dd5f6833752f9f56 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 20 Mar 2023 21:07:55 +0100
Subject: vim-patch:9.0.1417: ESDL files are not recognized

Problem:    ESDL files are not recognized.
Solution:   Add a pattern for ESDL files. (Amaan Qureshi, closes vim/vim#12174)

https://github.com/vim/vim/commit/a1fa8b3ac2f7b54c7901ad3eb0ba8b8290912509

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 399760b254..5127474765 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -350,6 +350,7 @@ local extension = {
   yaws = 'erlang',
   erb = 'eruby',
   rhtml = 'eruby',
+  esdl = 'esdl',
   ec = 'esqlc',
   EC = 'esqlc',
   strl = 'esterel',
-- 
cgit 


From 434f3d6a039401c856337926a788cd11d9dad027 Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Tue, 21 Mar 2023 14:43:40 +0200
Subject: docs: fix g:terminal_color_x terminal colors #22746

Based on this source code:
https://github.com/neovim/neovim/blob/e789d652974226ce3a763e3052a7c3d9898d875e/src/nvim/terminal.c#L271
it only respects `vim.g.terminal_color_{i}` for i from 0 to 15 inclusive.
---
 runtime/doc/nvim_terminal_emulator.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 50a241f515..b98c96ec87 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -115,7 +115,7 @@ You can change the defaults with a TermOpen autocommand: >vim
 TERMINAL COLORS ~
 
 The `{g,b}:terminal_color_x` variables control the terminal color palette,
-where `x` is the color index between 0 and 255 inclusive.  The variables are
+where `x` is the color index between 0 and 15 inclusive.  The variables are
 read during |TermOpen|. The value must be a color name or hexadecimal string.
 Example: >vim
     let g:terminal_color_4 = '#ff0000'
-- 
cgit 


From a92b38934a2d00c13ee4d1969d994da15e0857ab Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 20 Mar 2023 21:11:10 +0100
Subject: feat(lua): allow `:=expr` as a shorter version of `:lua =expr`

existing behavior of
  :=
and
  :[range]=

are unchanged. `|` is still allowed with this usage.

However,
   :=p
and similar are changed in a way which could be construed as a breaking
change. Allowing |ex-flags| for := in the first place was a mistake as
any form of := DOES NOT MOVE THE CURSOR. So it would print one line number
and then print a completely different line contents after that.
---
 runtime/doc/lua.txt      | 6 +++---
 runtime/doc/news.txt     | 5 +++++
 runtime/doc/various.txt  | 7 +++----
 runtime/doc/vim_diff.txt | 1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index cec3c1303f..4f56593491 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -233,11 +233,11 @@ command calls. The |lua-stdlib| modules, user modules, and anything else on
 The Lua print() function redirects its output to the Nvim message area, with
 arguments separated by " " (space) instead of "\t" (tab).
 
-                                                                        *:lua*
+                                                                  *:lua=* *:lua*
 :lua {chunk}
     Executes Lua chunk {chunk}. If {chunk} starts with "=" the rest of the
-    chunk is evaluated as an expression and printed. `:lua =expr` is
-    equivalent to `:lua print(vim.inspect(expr))`
+    chunk is evaluated as an expression and printed. `:lua =expr` or `:=expr` is
+    equivalent to `:lua print(vim.inspect(expr))`.
 
     Examples: >vim
         :lua vim.api.nvim_command('echo "Hello, Nvim!"')
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c326ae15c7..57b3e00709 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -237,6 +237,11 @@ The following changes to existing APIs or features add new behavior.
 • The `win_viewport` UI event now contains information about virtual lines,
   meaning that smooth scrolling can now be implemented more consistenlty.
 
+• The `:= {expr}` syntax can be used to evaluate a lua expression, as
+  a shorter form of `:lua ={expr}`. `:=` and `:[range]=` without argument
+  are unchanged. However `:=#` and similar variants using |ex-flags|
+  are no longer supported.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index ccde53cc06..8244ae4230 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -173,13 +173,12 @@ g8			Print the hex values of the bytes used in the
 			Like ":z" or ":z!", but number the lines.
 
 							*:=*
-:= [flags]		Print the last line number.
-			See |ex-flags| for [flags].
+:=			Without arg: Print the last line number.
+			with args: equivalent to `:lua ={expr}`. see |:lua|
 
-:{range}= [flags]	Prints the last line number in {range}.  For example,
+:{range}=		Prints the last line number in {range}.  For example,
 			this prints the current line number: >
 				:.=
-<			See |ex-flags| for [flags].
 
 :norm[al][!] {commands}					*:norm* *:normal*
 			Execute Normal mode commands {commands}.  This makes
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 9c01e3dbc7..cd93e4d17a 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -460,6 +460,7 @@ Commands:
   |:doautocmd| does not warn about "No matching autocommands".
   |:wincmd| accepts a count.
   `:write!` does not show a prompt if the file was updated externally.
+  |:=| does not accept |ex-flags|. With an arg it is equivalent to |:lua=|
 
 Command-line:
   The meanings of arrow keys do not change depending on 'wildoptions'.
-- 
cgit 


From 48ce2ef912cbbe43b85b45a8a97f8d240318718a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 22 Mar 2023 04:19:56 -0400
Subject: vim-patch:9.0.{1419,1421,1422,1423}: some files are not recognized
 (#22749)

vim-patch:9.0.1419: Lean files are not recognized

Problem:    Lean files are not recognized.
Solution:   Add a pattern for Lean files. (Amaan Qureshi, closes vim/vim#12177)

https://github.com/vim/vim/commit/4a5c39fc52a73d46ac77cf574f765a465befc3c0

vim-patch:9.0.1421: Nu files are not recognized

Problem:    Nu files are not recognized.
Solution:   Add a pattern for Nu files. (Amaan Qureshi, closes vim/vim#12172)

https://github.com/vim/vim/commit/8aa2a37f8983a7863afa32d9ffbe64b2f2bc70be

vim-patch:9.0.1422: Sage files are not recognized

Problem:    Sage files are not recognized.
Solution:   Add a pattern for Sage files. (Amaan Qureshi, closes vim/vim#12176)

https://github.com/vim/vim/commit/d0639d717ba7cf8b04b588aadd0b379ed43a5f1f

vim-patch:9.0.1423: WebAssembly Interface Type files are not recognized

Problem:    WebAssembly Interface Type files are not recognized.
Solution:   Add a pattern for WIT files. (Amaan Qureshi, closes vim/vim#12173)

https://github.com/vim/vim/commit/890c77203637626b1005db818667084d11e653e7
---
 runtime/lua/vim/filetype.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 5127474765..fa4208e2a4 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -593,6 +593,7 @@ local extension = {
   lte = 'latte',
   ld = 'ld',
   ldif = 'ldif',
+  lean = 'lean',
   journal = 'ledger',
   ldg = 'ledger',
   ledger = 'ledger',
@@ -908,6 +909,7 @@ local extension = {
   builder = 'ruby',
   rake = 'ruby',
   rs = 'rust',
+  sage = 'sage',
   sas = 'sas',
   sass = 'sass',
   sa = 'sather',
@@ -1106,6 +1108,7 @@ local extension = {
   wdl = 'wdl',
   wm = 'webmacro',
   wbt = 'winbatch',
+  wit = 'wit',
   wml = 'wml',
   wsml = 'wsml',
   ad = 'xdefaults',
@@ -1543,6 +1546,8 @@ local filename = {
   NEWS = function(path, bufnr)
     return require('vim.filetype.detect').news(bufnr)
   end,
+  ['env.nu'] = 'nu',
+  ['config.nu'] = 'nu',
   ['.ocamlinit'] = 'ocaml',
   ['.octaverc'] = 'octave',
   octaverc = 'octave',
-- 
cgit 


From 9c49c1047079427ff0a2356cb37302934845108e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 20 Mar 2023 08:12:33 +0100
Subject: feat(vim.gsplit): gain features of vim.split

Problem:
- vim.split has more features than vim.gsplit.
- Cannot inspect the "separator" segments of vim.split or vim.gsplit.

Solution:
- Move common implementation from vim.split into vim.gsplit.
  - TODO: deprecate vim.split in favor of vim.totable(vim.gsplit())?
- Introduce `keepsep` parameter.

Related: 84f66909e4008a57da947f1640bfc24da5e41a72
---
 runtime/doc/lua.txt        |  35 ++++++++-----
 runtime/doc/news.txt       |   2 +
 runtime/lua/vim/shared.lua | 122 ++++++++++++++++++++++++++++-----------------
 3 files changed, 101 insertions(+), 58 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 4f56593491..a1fb7aa344 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1649,14 +1649,25 @@ endswith({s}, {suffix})                                       *vim.endswith()*
     Return: ~
         (boolean) `true` if `suffix` is a suffix of `s`
 
-gsplit({s}, {sep}, {plain})                                     *vim.gsplit()*
+gsplit({s}, {sep}, {opts})                                      *vim.gsplit()*
     Splits a string at each instance of a separator.
 
+    Example: >lua
+
+       for s in vim.gsplit(':aa::b:', ':', {plain=true}) do
+         print(s)
+       end
+<
+
     Parameters: ~
-      • {s}      (string) String to split
-      • {sep}    (string) Separator or pattern
-      • {plain}  (boolean|nil) If `true` use `sep` literally (passed to
-                 string.find)
+      • {s}     (string) String to split
+      • {sep}   (string) Separator or pattern
+      • {opts}  (table|nil) Keyword arguments |kwargs|:
+                • keepsep: (boolean) Return segments matching `sep` instead of
+                  discarding them.
+                • plain: (boolean) Use `sep` literally (as in string.find).
+                • trimempty: (boolean) Discard empty segments at start and end
+                  of the sequence.
 
     Return: ~
         (function) Iterator over the split components
@@ -1729,7 +1740,7 @@ spairs({t})                                                     *vim.spairs()*
     See also: ~
       • Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
-split({s}, {sep}, {kwargs})                                      *vim.split()*
+split({s}, {sep}, {opts})                                        *vim.split()*
     Splits a string at each instance of a separator.
 
     Examples: >lua
@@ -1738,16 +1749,14 @@ split({s}, {sep}, {kwargs})                                      *vim.split()*
       split("axaby", "ab?")                   --> {'','x','y'}
       split("x*yz*o", "*", {plain=true})      --> {'x','yz','o'}
       split("|x|y|z|", "|", {trimempty=true}) --> {'x', 'y', 'z'}
+      split("|x|y|z|", "|", {keepsep=true})   --> {'|', 'x', '|', 'y', '|', 'z', '|'}
 <
 
     Parameters: ~
-      • {s}       (string) String to split
-      • {sep}     (string) Separator or pattern
-      • {kwargs}  (table|nil) Keyword arguments:
-                  • plain: (boolean) If `true` use `sep` literally (passed to
-                    string.find)
-                  • trimempty: (boolean) If `true` remove empty items from the
-                    front and back of the list
+      • {s}     (string) String to split
+      • {sep}   (string) Separator or pattern
+      • {opts}  (table|nil) Keyword arguments |kwargs| accepted by
+                |vim.gsplit()|
 
     Return: ~
         string[] List of split components
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 57b3e00709..1499b9d742 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -132,6 +132,8 @@ The following new APIs or features were added.
 • |vim.fs.dir()| now has a `opts` argument with a depth field to allow
   recursively searching a directory tree.
 
+• |vim.gsplit()| supports all features of |vim.split()|.
+
 • |vim.secure.read()| reads a file and prompts the user if it should be
   trusted and, if so, returns the file's contents.
 
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 1c8defc93a..95ddb3c70d 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -59,6 +59,13 @@ end)()
 
 --- Splits a string at each instance of a separator.
 ---
+--- Example:
+---   <pre>lua
+---   for s in vim.gsplit(':aa::b:', ':', {plain=true}) do
+---     print(s)
+---   end
+---   </pre>
+---
 ---@see |vim.split()|
 ---@see |luaref-patterns|
 ---@see https://www.lua.org/pil/20.2.html
@@ -66,17 +73,40 @@ end)()
 ---
 ---@param s string String to split
 ---@param sep string Separator or pattern
----@param plain (boolean|nil) If `true` use `sep` literally (passed to string.find)
----@return fun():string (function) Iterator over the split components
-function vim.gsplit(s, sep, plain)
-  vim.validate({ s = { s, 's' }, sep = { sep, 's' }, plain = { plain, 'b', true } })
+---@param opts (table|nil) Keyword arguments |kwargs|:
+---       - keepsep: (boolean) Include segments matching `sep` instead of discarding them.
+---       - plain: (boolean) Use `sep` literally (as in string.find).
+---       - trimempty: (boolean) Discard empty segments at start and end of the sequence.
+---@return fun():string|nil (function) Iterator over the split components
+function vim.gsplit(s, sep, opts)
+  local plain
+  local trimempty = false
+  local keepsep = false
+  if type(opts) == 'boolean' then
+    plain = opts -- For backwards compatibility.
+  else
+    vim.validate({ s = { s, 's' }, sep = { sep, 's' }, opts = { opts, 't', true } })
+    opts = opts or {}
+    plain, trimempty, keepsep = opts.plain, opts.trimempty, opts.keepsep
+    assert(not trimempty or not keepsep, 'keepsep+trimempty not supported')
+  end
 
   local start = 1
   local done = false
+  local sepseg = nil -- Last matched `sep` segment.
+  local sepesc = plain and vim.pesc(sep) or sep
+
+  -- For `trimempty`:
+  local empty_start = true -- Only empty segments seen so far.
+  local empty_segs = 0 -- Empty segments found between non-empty segments.
+  local nonemptyseg = nil
 
   local function _pass(i, j, ...)
     if i then
       assert(j + 1 > start, 'Infinite loop detected')
+      if keepsep then
+        sepseg = s:match(sepesc, start)
+      end
       local seg = s:sub(start, i - 1)
       start = j + 1
       return seg, ...
@@ -87,16 +117,48 @@ function vim.gsplit(s, sep, plain)
   end
 
   return function()
-    if done or (s == '' and sep == '') then
-      return
-    end
-    if sep == '' then
+    if trimempty and empty_segs > 0 then
+      -- trimempty: Pop the collected empty segments.
+      empty_segs = empty_segs - 1
+      return ''
+    elseif trimempty and nonemptyseg then
+      local seg = nonemptyseg
+      nonemptyseg = nil
+      return seg
+    elseif keepsep and sepseg then
+      local seg = sepseg
+      sepseg = nil
+      return seg
+    elseif done or (s == '' and sep == '') then
+      return nil
+    elseif sep == '' then
       if start == #s then
         done = true
       end
       return _pass(start + 1, start)
     end
-    return _pass(s:find(sep, start, plain))
+
+    local seg = _pass(s:find(sep, start, plain))
+
+    -- Trim empty segments from start/end.
+    if trimempty and seg == '' then
+      while not done and seg == '' do
+        empty_segs = empty_segs + 1
+        seg = _pass(s:find(sep, start, plain))
+      end
+      if done and seg == '' then
+        return nil
+      elseif empty_start then
+        empty_start = false
+        empty_segs = 0
+        return seg
+      end
+      nonemptyseg = seg ~= '' and seg or nil
+      seg = ''
+      empty_segs = empty_segs - 1
+    end
+
+    return seg
   end
 end
 
@@ -108,51 +170,21 @@ end
 ---  split("axaby", "ab?")                   --> {'','x','y'}
 ---  split("x*yz*o", "*", {plain=true})      --> {'x','yz','o'}
 ---  split("|x|y|z|", "|", {trimempty=true}) --> {'x', 'y', 'z'}
+---  split("|x|y|z|", "|", {keepsep=true})   --> {'|', 'x', '|', 'y', '|', 'z', '|'}
 --- </pre>
 ---
 ---@see |vim.gsplit()|
 ---
 ---@param s string String to split
 ---@param sep string Separator or pattern
----@param kwargs (table|nil) Keyword arguments:
----       - plain: (boolean) If `true` use `sep` literally (passed to string.find)
----       - trimempty: (boolean) If `true` remove empty items from the front
----         and back of the list
+---@param opts (table|nil) Keyword arguments |kwargs| accepted by |vim.gsplit()|
 ---@return string[] List of split components
-function vim.split(s, sep, kwargs)
-  local plain
-  local trimempty = false
-  if type(kwargs) == 'boolean' then
-    -- Support old signature for backward compatibility
-    plain = kwargs
-  else
-    vim.validate({ kwargs = { kwargs, 't', true } })
-    kwargs = kwargs or {}
-    plain = kwargs.plain
-    trimempty = kwargs.trimempty
-  end
-
+function vim.split(s, sep, opts)
+  -- TODO(justinmk): deprecate vim.split in favor of vim.totable(vim.gsplit())
   local t = {}
-  local skip = trimempty
-  for c in vim.gsplit(s, sep, plain) do
-    if c ~= '' then
-      skip = false
-    end
-
-    if not skip then
-      table.insert(t, c)
-    end
+  for c in vim.gsplit(s, sep, opts) do
+    table.insert(t, c)
   end
-
-  if trimempty then
-    for i = #t, 1, -1 do
-      if t[i] ~= '' then
-        break
-      end
-      table.remove(t, i)
-    end
-  end
-
   return t
 end
 
-- 
cgit 


From 8a70adbde03ee9931dc4e1b6f31bd8635eb3633b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 20 Mar 2023 13:36:06 +0100
Subject: fix(vim.version): prerelease compare

Problem:
semver specifies that digit sequences in a prerelease string should be
compared as numbers, not lexically: https://semver.org/#spec-item-11
> Precedence for two pre-release versions with the same major, minor,
> and patch version MUST be determined by comparing each dot separated
> identifier from left to right until a difference is found as follows:
> 1. Identifiers consisting of only digits are compared numerically.
> 2. Identifiers with letters or hyphens are compared lexically in ASCII sort order.
> 3. Numeric identifiers always have lower precedence than non-numeric identifiers.
> 4. A larger set of pre-release fields has a higher precedence than a smaller set, if all of the preceding identifiers are equal.
Example:
1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0.

Solution:
cmp_prerel() treats all digit sequences in a prerelease string as
numbers. This doesn't _exactly_ match the spec, which specifies that
only dot-delimited digit sequences should be treated as numbers...
---
 runtime/lua/vim/shared.lua  | 17 +++++++++--------
 runtime/lua/vim/version.lua | 46 +++++++++++++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 20 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 95ddb3c70d..9eb49cdfac 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -66,14 +66,15 @@ end)()
 ---   end
 ---   </pre>
 ---
----@see |vim.split()|
----@see |luaref-patterns|
----@see https://www.lua.org/pil/20.2.html
----@see http://lua-users.org/wiki/StringLibraryTutorial
----
----@param s string String to split
----@param sep string Separator or pattern
----@param opts (table|nil) Keyword arguments |kwargs|:
+--- @see |string.gmatch()|
+--- @see |vim.split()|
+--- @see |luaref-patterns|
+--- @see https://www.lua.org/pil/20.2.html
+--- @see http://lua-users.org/wiki/StringLibraryTutorial
+---
+--- @param s string String to split
+--- @param sep string Separator or pattern
+--- @param opts (table|nil) Keyword arguments |kwargs|:
 ---       - keepsep: (boolean) Include segments matching `sep` instead of discarding them.
 ---       - plain: (boolean) Use `sep` literally (as in string.find).
 ---       - trimempty: (boolean) Discard empty segments at start and end of the sequence.
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 8d8b0d6da7..43001c195c 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -65,6 +65,33 @@ local M = {}
 local Version = {}
 Version.__index = Version
 
+--- Compares prerelease strings: per semver, number parts must be must be treated as numbers:
+--- "pre1.10" is greater than "pre1.2". https://semver.org/#spec-item-11
+local function cmp_prerel(prerel1, prerel2)
+  if not prerel1 or not prerel2 then
+    return prerel1 and -1 or (prerel2 and 1 or 0)
+  end
+  -- TODO(justinmk): not fully spec-compliant; this treats non-dot-delimited digit sequences as
+  -- numbers. Maybe better: "(.-)(%.%d*)".
+  local iter1 = prerel1:gmatch('([^0-9]*)(%d*)')
+  local iter2 = prerel2:gmatch('([^0-9]*)(%d*)')
+  while true do
+    local word1, n1 = iter1()
+    local word2, n2 = iter2()
+    if word1 == nil and word2 == nil then -- Done iterating.
+      return 0
+    end
+    word1, n1, word2, n2 =
+      word1 or '', n1 and tonumber(n1) or 0, word2 or '', n2 and tonumber(n2) or 0
+    if word1 ~= word2 then
+      return word1 < word2 and -1 or 1
+    end
+    if n1 ~= n2 then
+      return n1 < n2 and -1 or 1
+    end
+  end
+end
+
 function Version:__index(key)
   return type(key) == 'number' and ({ self.major, self.minor, self.patch })[key] or Version[key]
 end
@@ -88,7 +115,7 @@ function Version:__eq(other)
       return false
     end
   end
-  return self.prerelease == other.prerelease
+  return 0 == cmp_prerel(self.prerelease, other.prerelease)
 end
 
 function Version:__tostring()
@@ -111,13 +138,7 @@ function Version:__lt(other)
       return true
     end
   end
-  if self.prerelease and not other.prerelease then
-    return true
-  end
-  if other.prerelease and not self.prerelease then
-    return false
-  end
-  return (self.prerelease or '') < (other.prerelease or '')
+  return -1 == cmp_prerel(self.prerelease, other.prerelease)
 end
 
 ---@param other Version
@@ -127,7 +148,7 @@ end
 
 --- @private
 ---
---- Creates a new Version object. Not public currently.
+--- Creates a new Version object, or returns `nil` if `version` is invalid.
 ---
 --- @param version string|number[]|Version
 --- @param strict? boolean Reject "1.0", "0-x", "3.2a" or other non-conforming version strings
@@ -173,6 +194,7 @@ function M._version(version, strict) -- Adapted from https://github.com/folke/la
       build = build ~= '' and build or nil,
     }, Version)
   end
+  return nil -- Invalid version string.
 end
 
 ---TODO: generalize this, move to func.lua
@@ -341,7 +363,7 @@ function M.cmp(v1, v2)
   return -1
 end
 
----Returns `true` if the given versions are equal.
+---Returns `true` if the given versions are equal. See |vim.version.cmp()| for usage.
 ---@param v1 Version|number[]
 ---@param v2 Version|number[]
 ---@return boolean
@@ -349,7 +371,7 @@ function M.eq(v1, v2)
   return M.cmp(v1, v2) == 0
 end
 
----Returns `true` if `v1 < v2`.
+---Returns `true` if `v1 < v2`. See |vim.version.cmp()| for usage.
 ---@param v1 Version|number[]
 ---@param v2 Version|number[]
 ---@return boolean
@@ -357,7 +379,7 @@ function M.lt(v1, v2)
   return M.cmp(v1, v2) == -1
 end
 
----Returns `true` if `v1 > v2`.
+---Returns `true` if `v1 > v2`. See |vim.version.cmp()| for usage.
 ---@param v1 Version|number[]
 ---@param v2 Version|number[]
 ---@return boolean
-- 
cgit 


From e51139f5c1d70bef1424f29e63eb527514e42865 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 22 Mar 2023 15:14:51 +0100
Subject: refactor(vim.gsplit): remove "keepsep"

string.gmatch() is superior, use that instead.
---
 runtime/doc/lua.txt         | 23 +++++++++++++++--------
 runtime/lua/vim/shared.lua  | 25 ++++++++++---------------
 runtime/lua/vim/version.lua |  2 ++
 3 files changed, 27 insertions(+), 23 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index a1fb7aa344..2baae3a123 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1659,12 +1659,18 @@ gsplit({s}, {sep}, {opts})                                      *vim.gsplit()*
        end
 <
 
+    If you want to also inspect the separator itself (instead of discarding
+    it), use |string.gmatch()|. Example: >lua
+
+       for word, num in ('foo111bar222'):gmatch('([^0-9]*)(d*)') do
+         print(('word: s num: s'):format(word, num))
+       end
+<
+
     Parameters: ~
-      • {s}     (string) String to split
-      • {sep}   (string) Separator or pattern
+      • {s}     string String to split
+      • {sep}   string Separator or pattern
       • {opts}  (table|nil) Keyword arguments |kwargs|:
-                • keepsep: (boolean) Return segments matching `sep` instead of
-                  discarding them.
                 • plain: (boolean) Use `sep` literally (as in string.find).
                 • trimempty: (boolean) Discard empty segments at start and end
                   of the sequence.
@@ -1673,6 +1679,7 @@ gsplit({s}, {sep}, {opts})                                      *vim.gsplit()*
         (function) Iterator over the split components
 
     See also: ~
+      • |string.gmatch()|
       • |vim.split()|
       • |luaref-patterns|
       • https://www.lua.org/pil/20.2.html
@@ -1749,7 +1756,6 @@ split({s}, {sep}, {opts})                                        *vim.split()*
       split("axaby", "ab?")                   --> {'','x','y'}
       split("x*yz*o", "*", {plain=true})      --> {'x','yz','o'}
       split("|x|y|z|", "|", {trimempty=true}) --> {'x', 'y', 'z'}
-      split("|x|y|z|", "|", {keepsep=true})   --> {'|', 'x', '|', 'y', '|', 'z', '|'}
 <
 
     Parameters: ~
@@ -1763,6 +1769,7 @@ split({s}, {sep}, {opts})                                        *vim.split()*
 
     See also: ~
       • |vim.gsplit()|
+      • |string.gmatch()|
 
 startswith({s}, {prefix})                                   *vim.startswith()*
     Tests if `s` starts with `prefix`.
@@ -2625,7 +2632,7 @@ cmp({v1}, {v2})                                            *vim.version.cmp()*
         (integer) -1 if `v1 < v2`, 0 if `v1 == v2`, 1 if `v1 > v2`.
 
 eq({v1}, {v2})                                              *vim.version.eq()*
-    Returns `true` if the given versions are equal.
+    Returns `true` if the given versions are equal. See |vim.version.cmp()| for usage.
 
     Parameters: ~
       • {v1}  Version|number[]
@@ -2635,7 +2642,7 @@ eq({v1}, {v2})                                              *vim.version.eq()*
         (boolean)
 
 gt({v1}, {v2})                                              *vim.version.gt()*
-    Returns `true` if `v1 > v2` .
+    Returns `true` if `v1 > v2` . See |vim.version.cmp()| for usage.
 
     Parameters: ~
       • {v1}  Version|number[]
@@ -2654,7 +2661,7 @@ last({versions})                                          *vim.version.last()*
         Version ?|ni
 
 lt({v1}, {v2})                                              *vim.version.lt()*
-    Returns `true` if `v1 < v2` .
+    Returns `true` if `v1 < v2` . See |vim.version.cmp()| for usage.
 
     Parameters: ~
       • {v1}  Version|number[]
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 9eb49cdfac..884929e33a 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -66,6 +66,14 @@ end)()
 ---   end
 ---   </pre>
 ---
+--- If you want to also inspect the separator itself (instead of discarding it), use
+--- |string.gmatch()|. Example:
+---   <pre>lua
+---   for word, num in ('foo111bar222'):gmatch('([^0-9]*)(%d*)') do
+---     print(('word: %s num: %s'):format(word, num))
+---   end
+---   </pre>
+---
 --- @see |string.gmatch()|
 --- @see |vim.split()|
 --- @see |luaref-patterns|
@@ -75,27 +83,22 @@ end)()
 --- @param s string String to split
 --- @param sep string Separator or pattern
 --- @param opts (table|nil) Keyword arguments |kwargs|:
----       - keepsep: (boolean) Include segments matching `sep` instead of discarding them.
 ---       - plain: (boolean) Use `sep` literally (as in string.find).
 ---       - trimempty: (boolean) Discard empty segments at start and end of the sequence.
 ---@return fun():string|nil (function) Iterator over the split components
 function vim.gsplit(s, sep, opts)
   local plain
   local trimempty = false
-  local keepsep = false
   if type(opts) == 'boolean' then
     plain = opts -- For backwards compatibility.
   else
     vim.validate({ s = { s, 's' }, sep = { sep, 's' }, opts = { opts, 't', true } })
     opts = opts or {}
-    plain, trimempty, keepsep = opts.plain, opts.trimempty, opts.keepsep
-    assert(not trimempty or not keepsep, 'keepsep+trimempty not supported')
+    plain, trimempty = opts.plain, opts.trimempty
   end
 
   local start = 1
   local done = false
-  local sepseg = nil -- Last matched `sep` segment.
-  local sepesc = plain and vim.pesc(sep) or sep
 
   -- For `trimempty`:
   local empty_start = true -- Only empty segments seen so far.
@@ -105,9 +108,6 @@ function vim.gsplit(s, sep, opts)
   local function _pass(i, j, ...)
     if i then
       assert(j + 1 > start, 'Infinite loop detected')
-      if keepsep then
-        sepseg = s:match(sepesc, start)
-      end
       local seg = s:sub(start, i - 1)
       start = j + 1
       return seg, ...
@@ -126,10 +126,6 @@ function vim.gsplit(s, sep, opts)
       local seg = nonemptyseg
       nonemptyseg = nil
       return seg
-    elseif keepsep and sepseg then
-      local seg = sepseg
-      sepseg = nil
-      return seg
     elseif done or (s == '' and sep == '') then
       return nil
     elseif sep == '' then
@@ -171,17 +167,16 @@ end
 ---  split("axaby", "ab?")                   --> {'','x','y'}
 ---  split("x*yz*o", "*", {plain=true})      --> {'x','yz','o'}
 ---  split("|x|y|z|", "|", {trimempty=true}) --> {'x', 'y', 'z'}
----  split("|x|y|z|", "|", {keepsep=true})   --> {'|', 'x', '|', 'y', '|', 'z', '|'}
 --- </pre>
 ---
 ---@see |vim.gsplit()|
+---@see |string.gmatch()|
 ---
 ---@param s string String to split
 ---@param sep string Separator or pattern
 ---@param opts (table|nil) Keyword arguments |kwargs| accepted by |vim.gsplit()|
 ---@return string[] List of split components
 function vim.split(s, sep, opts)
-  -- TODO(justinmk): deprecate vim.split in favor of vim.totable(vim.gsplit())
   local t = {}
   for c in vim.gsplit(s, sep, opts) do
     table.insert(t, c)
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 43001c195c..3aacf3d4e0 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -65,6 +65,8 @@ local M = {}
 local Version = {}
 Version.__index = Version
 
+--- @private
+---
 --- Compares prerelease strings: per semver, number parts must be must be treated as numbers:
 --- "pre1.10" is greater than "pre1.2". https://semver.org/#spec-item-11
 local function cmp_prerel(prerel1, prerel2)
-- 
cgit 


From 28cfcf51269b7390b447c8a5b61d5083c830e834 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 22 Mar 2023 16:49:04 +0000
Subject: fix(api): vim.filetype.get_option() (#22753)

- Fix a bug in the cache
- Set some buffer options on the dummy buffer
---
 runtime/lua/vim/filetype/options.lua | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/options.lua b/runtime/lua/vim/filetype/options.lua
index 77a66991d5..a093c249f7 100644
--- a/runtime/lua/vim/filetype/options.lua
+++ b/runtime/lua/vim/filetype/options.lua
@@ -3,7 +3,7 @@ local api = vim.api
 local M = {}
 
 local function get_ftplugin_runtime(filetype)
-  return api.nvim__get_runtime({
+  local files = api.nvim__get_runtime({
     string.format('ftplugin/%s.vim', filetype),
     string.format('ftplugin/%s_*.vim', filetype),
     string.format('ftplugin/%s/*.vim', filetype),
@@ -11,6 +11,15 @@ local function get_ftplugin_runtime(filetype)
     string.format('ftplugin/%s_*.lua', filetype),
     string.format('ftplugin/%s/*.lua', filetype),
   }, true, {}) --[[@as string[] ]]
+
+  local r = {} ---@type string[]
+  for _, f in ipairs(files) do
+    -- VIMRUNTIME should be static so shouldn't need to worry about it changing
+    if not vim.startswith(f, vim.env.VIMRUNTIME) then
+      r[#r + 1] = f
+    end
+  end
+  return r
 end
 
 -- Keep track of ftplugin files
@@ -52,14 +61,11 @@ local function update_ft_option_cache(filetype)
   end
 
   for _, f in ipairs(files) do
-    -- VIMRUNTIME should be static so shouldn't need to worry about it changing
-    if not vim.startswith(f, vim.env.VIMRUNTIME) then
-      local mtime = hash(f)
-      if ftplugin_cache[filetype][f] ~= mtime then
-        -- invalidate
-        ft_option_cache[filetype] = nil
-        ftplugin_cache[filetype][f] = mtime
-      end
+    local mtime = hash(f)
+    if ftplugin_cache[filetype][f] ~= mtime then
+      -- invalidate
+      ft_option_cache[filetype] = nil
+      ftplugin_cache[filetype][f] = mtime
     end
   end
 end
-- 
cgit 


From ea0b66d208dbcd5d5c0a17810596d769c7a0b6dd Mon Sep 17 00:00:00 2001
From: meredith <merrilymeredith@users.noreply.github.com>
Date: Thu, 23 Mar 2023 02:27:53 -0500
Subject: fix(lsp): Jump to tag locations reliably when :ltag is used (#22750)

---
 runtime/lua/vim/lsp/tagfunc.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/tagfunc.lua b/runtime/lua/vim/lsp/tagfunc.lua
index 49029f8599..eb25b67db9 100644
--- a/runtime/lua/vim/lsp/tagfunc.lua
+++ b/runtime/lua/vim/lsp/tagfunc.lua
@@ -9,7 +9,7 @@ local function mk_tag_item(name, range, uri, offset_encoding)
   return {
     name = name,
     filename = vim.uri_to_fname(uri),
-    cmd = string.format('call cursor(%d, %d)|', range.start.line + 1, byte),
+    cmd = string.format([[/\%%%dl\%%%dc/]], range.start.line + 1, byte),
   }
 end
 
-- 
cgit 


From c0fe6c040e19ef9102a8507ffcbd88b83186326a Mon Sep 17 00:00:00 2001
From: Null Chilly <56817415+nullchilly@users.noreply.github.com>
Date: Thu, 23 Mar 2023 16:31:39 +0700
Subject: feat(api): add nvim_get_hl (#22693)

Problem: no way of getting all highlight group definitions in a namespace.

Solution: add `nvim_get_hl()`, deprecate `nvim_get_hl_by_name()` and `nvim_get_hl_by_id()`.
---
 runtime/doc/api.txt        | 34 +++++++++++++---------------------
 runtime/doc/deprecated.txt |  2 ++
 runtime/doc/news.txt       |  4 ++++
 3 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 289788f036..197edf2e81 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -923,31 +923,23 @@ nvim_get_current_win()                                *nvim_get_current_win()*
     Return: ~
         Window handle
 
-nvim_get_hl_by_id({hl_id}, {rgb})                        *nvim_get_hl_by_id()*
-    Gets a highlight definition by id. |hlID()|
+nvim_get_hl({ns_id}, {*opts})                                  *nvim_get_hl()*
+    Gets all or specific highlight groups in a namespace.
 
     Parameters: ~
-      • {hl_id}  Highlight id as returned by |hlID()|
-      • {rgb}    Export RGB colors
-
-    Return: ~
-        Highlight definition map
-
-    See also: ~
-      • nvim_get_hl_by_name
-
-nvim_get_hl_by_name({name}, {rgb})                     *nvim_get_hl_by_name()*
-    Gets a highlight definition by name.
-
-    Parameters: ~
-      • {name}  Highlight group name
-      • {rgb}   Export RGB colors
+      • {ns_id}  Get highlight groups for namespace ns_id
+                 |nvim_get_namespaces()|. Use 0 to get global highlight groups
+                 |:highlight|.
+      • {opts}   Options dict:
+                 • name: (string) Get a highlight definition by name.
+                 • id: (integer) Get a highlight definition by id.
+                 • link: (boolean, default true) Show linked group name
+                   instead of effective definition |:hi-link|.
 
     Return: ~
-        Highlight definition map
-
-    See also: ~
-      • nvim_get_hl_by_id
+        Highlight groups as a map from group name to a highlight definition
+        map as in |nvim_set_hl()|, or only a single highlight definition map
+        if requested by name or id.
 
 nvim_get_hl_id_by_name({name})                      *nvim_get_hl_id_by_name()*
     Gets a highlight group by name
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 74c50f00a2..50f5b95ab5 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -17,6 +17,8 @@ API
 - *nvim_buf_set_virtual_text()*	Use |nvim_buf_set_extmark()| instead.
 - *nvim_command_output()*	Use |nvim_exec()| instead.
 - *nvim_execute_lua()*		Use |nvim_exec_lua()| instead.
+- *nvim_get_hl_by_name()*	Use |nvim_get_hl()| instead.
+- *nvim_get_hl_by_id()*		Use |nvim_get_hl()| instead.
 
 COMMANDS
 - *:rv* *:rviminfo*		Deprecated alias to |:rshada| command.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 1499b9d742..a03bd705a9 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -217,6 +217,8 @@ The following new APIs or features were added.
 
 • |vim.filetype.get_option()| to get the default option value for a specific
   filetype. This is a wrapper around |nvim_get_option_value()| with caching.
+  
+• Added |nvim_get_hl()| for getting highlight group definitions in a format compatible with |nvim_set_hl()|.
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
@@ -278,4 +280,6 @@ release.
 • |vim.treesitter.get_node_at_pos()| and |vim.treesitter.get_node_at_cursor()|
   are both deprecated in favor of |vim.treesitter.get_node()|.
 
+• `vim.api.nvim_get_hl_by_name()`, `vim.api.nvim_get_hl_by_id()` were deprecated, use |nvim_get_hl()| instead.
+
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
-- 
cgit 


From 4e4203f71b0b9bb2ca4ad9abd2fbf4ea1deaf9a6 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 23 Mar 2023 11:23:51 +0000
Subject: fix(treesitter): annotations

- Begin using `@package` in place of `@private` for functions
that are accessed internally but outside their defined class.

- Rename Node -> TSP.Node
---
 runtime/lua/vim/treesitter.lua              |  6 ++----
 runtime/lua/vim/treesitter/_fold.lua        | 20 ++++++++++++++------
 runtime/lua/vim/treesitter/_meta.lua        |  3 ++-
 runtime/lua/vim/treesitter/highlighter.lua  | 23 ++++++++++-------------
 runtime/lua/vim/treesitter/languagetree.lua | 11 +++++------
 runtime/lua/vim/treesitter/playground.lua   | 26 +++++++++++++-------------
 6 files changed, 46 insertions(+), 43 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 43b8c11b80..685b1d8830 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -30,8 +30,6 @@ setmetatable(M, {
   end,
 })
 
----@diagnostic disable:invisible
-
 --- Creates a new parser
 ---
 --- It is not recommended to use this; use |get_parser()| instead.
@@ -132,7 +130,7 @@ function M.get_parser(bufnr, lang, opts)
   return parsers[bufnr]
 end
 
----@private
+---@package
 ---@param bufnr (integer|nil) Buffer number
 ---@return boolean
 function M._has_parser(bufnr)
@@ -276,7 +274,7 @@ function M.get_captures_at_pos(bufnr, row, col)
         end
       end
     end
-  end, true)
+  end)
   return matches
 end
 
diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index 90f4394fcc..3e67e400c2 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -3,7 +3,7 @@ local Query = require('vim.treesitter.query')
 
 local api = vim.api
 
----@class FoldInfo
+---@class TS.FoldInfo
 ---@field levels table<integer,string>
 ---@field levels0 table<integer,integer>
 ---@field private start_counts table<integer,integer>
@@ -11,6 +11,7 @@ local api = vim.api
 local FoldInfo = {}
 FoldInfo.__index = FoldInfo
 
+---@private
 function FoldInfo.new()
   return setmetatable({
     start_counts = {},
@@ -20,6 +21,7 @@ function FoldInfo.new()
   }, FoldInfo)
 end
 
+---@package
 ---@param srow integer
 ---@param erow integer
 function FoldInfo:invalidate_range(srow, erow)
@@ -31,6 +33,7 @@ function FoldInfo:invalidate_range(srow, erow)
   end
 end
 
+---@package
 ---@param srow integer
 ---@param erow integer
 function FoldInfo:remove_range(srow, erow)
@@ -42,6 +45,7 @@ function FoldInfo:remove_range(srow, erow)
   end
 end
 
+---@package
 ---@param srow integer
 ---@param erow integer
 function FoldInfo:add_range(srow, erow)
@@ -53,22 +57,26 @@ function FoldInfo:add_range(srow, erow)
   end
 end
 
+---@package
 ---@param lnum integer
 function FoldInfo:add_start(lnum)
   self.start_counts[lnum] = (self.start_counts[lnum] or 0) + 1
 end
 
+---@package
 ---@param lnum integer
 function FoldInfo:add_stop(lnum)
   self.stop_counts[lnum] = (self.stop_counts[lnum] or 0) + 1
 end
 
+---@packag
 ---@param lnum integer
 ---@return integer
 function FoldInfo:get_start(lnum)
   return self.start_counts[lnum] or 0
 end
 
+---@package
 ---@param lnum integer
 ---@return integer
 function FoldInfo:get_stop(lnum)
@@ -84,7 +92,7 @@ local function trim_level(level)
 end
 
 ---@param bufnr integer
----@param info FoldInfo
+---@param info TS.FoldInfo
 ---@param srow integer?
 ---@param erow integer?
 local function get_folds_levels(bufnr, info, srow, erow)
@@ -161,7 +169,7 @@ end
 
 local M = {}
 
----@type table<integer,FoldInfo>
+---@type table<integer,TS.FoldInfo>
 local foldinfos = {}
 
 local function recompute_folds()
@@ -178,7 +186,7 @@ local function recompute_folds()
 end
 
 ---@param bufnr integer
----@param foldinfo FoldInfo
+---@param foldinfo TS.FoldInfo
 ---@param tree_changes Range4[]
 local function on_changedtree(bufnr, foldinfo, tree_changes)
   -- For some reason, queries seem to use the old buffer state in on_bytes.
@@ -193,7 +201,7 @@ local function on_changedtree(bufnr, foldinfo, tree_changes)
 end
 
 ---@param bufnr integer
----@param foldinfo FoldInfo
+---@param foldinfo TS.FoldInfo
 ---@param start_row integer
 ---@param old_row integer
 ---@param new_row integer
@@ -212,13 +220,13 @@ local function on_bytes(bufnr, foldinfo, start_row, old_row, new_row)
   end
 end
 
+---@package
 ---@param lnum integer|nil
 ---@return string
 function M.foldexpr(lnum)
   lnum = lnum or vim.v.lnum
   local bufnr = api.nvim_get_current_buf()
 
-  ---@diagnostic disable-next-line:invisible
   if not vim.treesitter._has_parser(bufnr) or not lnum then
     return '0'
   end
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index 72823ccf26..4d0f43d030 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -3,7 +3,8 @@
 ---@class TSNode
 ---@field id fun(self: TSNode): integer
 ---@field tree fun(self: TSNode): TSTree
----@field range fun(self: TSNode, include_bytes: boolean?): integer, integer, integer, integer, integer, integer
+---@field range fun(self: TSNode, include_bytes: false?): integer, integer, integer, integer
+---@field range fun(self: TSNode, include_bytes: true): integer, integer, integer, integer, integer, integer
 ---@field start fun(self: TSNode): integer, integer, integer
 ---@field end_ fun(self: TSNode): integer, integer, integer
 ---@field type fun(self: TSNode): string
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index e3deaf6ba6..e24b3ba5df 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -53,12 +53,12 @@ function TSHighlighterQuery.new(lang, query_string)
   return self
 end
 
----@private
+---@package
 function TSHighlighterQuery:query()
   return self._query
 end
 
----@private
+---@package
 ---
 --- Creates a highlighter for `tree`.
 ---
@@ -76,16 +76,14 @@ function TSHighlighter.new(tree, opts)
   opts = opts or {} ---@type { queries: table<string,string> }
   self.tree = tree
   tree:register_cbs({
-    ---@diagnostic disable:invisible
     on_changedtree = function(...)
       self:on_changedtree(...)
     end,
     on_bytes = function(...)
       self:on_bytes(...)
     end,
-    on_detach = function(...)
-      ---@diagnostic disable-next-line:redundant-parameter
-      self:on_detach(...)
+    on_detach = function()
+      self:on_detach()
     end,
   })
 
@@ -147,7 +145,7 @@ function TSHighlighter:destroy()
   end
 end
 
----@private
+---@package
 ---@param tstree TSTree
 ---@return TSHighlightState
 function TSHighlighter:get_highlight_state(tstree)
@@ -166,19 +164,19 @@ function TSHighlighter:reset_highlight_state()
   self._highlight_states = {}
 end
 
----@private
+---@package
 ---@param start_row integer
 ---@param new_end integer
 function TSHighlighter:on_bytes(_, _, start_row, _, _, _, _, _, new_end)
   a.nvim__buf_redraw_range(self.bufnr, start_row, start_row + new_end + 1)
 end
 
----@private
+---@package
 function TSHighlighter:on_detach()
   self:destroy()
 end
 
----@private
+---@package
 ---@param changes integer[][]?
 function TSHighlighter:on_changedtree(changes)
   for _, ch in ipairs(changes or {}) do
@@ -188,7 +186,7 @@ end
 
 --- Gets the query used for @param lang
 --
----@private
+---@package
 ---@param lang string Language used by the highlighter.
 ---@return TSHighlighterQuery
 function TSHighlighter:get_query(lang)
@@ -205,7 +203,6 @@ end
 ---@param line integer
 ---@param is_spell_nav boolean
 local function on_line_impl(self, buf, line, is_spell_nav)
-  ---@diagnostic disable:invisible
   self.tree:for_each_tree(function(tstree, tree)
     if not tstree then
       return
@@ -268,7 +265,7 @@ local function on_line_impl(self, buf, line, is_spell_nav)
         state.next_row = start_row
       end
     end
-  end, true)
+  end)
 end
 
 ---@private
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index bdfe281a5b..ae41062ab2 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -70,7 +70,7 @@ local LanguageTree = {}
 
 LanguageTree.__index = LanguageTree
 
---- @private
+--- @package
 ---
 --- |LanguageTree| contains a tree of parsers: the root treesitter parser for {lang} and any
 --- "injected" language parsers, which themselves may inject other languages, recursively.
@@ -700,7 +700,7 @@ function LanguageTree:_do_callback(cb_name, ...)
   end
 end
 
----@private
+---@package
 function LanguageTree:_edit(
   start_byte,
   end_byte_old,
@@ -776,7 +776,7 @@ function LanguageTree:_edit(
   end)
 end
 
----@private
+---@package
 ---@param bufnr integer
 ---@param changed_tick integer
 ---@param start_row integer
@@ -822,7 +822,6 @@ function LanguageTree:_on_bytes(
   -- Edit trees together BEFORE emitting a bytes callback.
   ---@private
   self:for_each_child(function(child)
-    ---@diagnostic disable-next-line:invisible
     child:_edit(
       start_byte,
       start_byte + old_byte,
@@ -852,12 +851,12 @@ function LanguageTree:_on_bytes(
   )
 end
 
----@private
+---@package
 function LanguageTree:_on_reload()
   self:invalidate(true)
 end
 
----@private
+---@package
 function LanguageTree:_on_detach(...)
   self:invalidate(true)
   self:_do_callback('detach', ...)
diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index 7f181c23fd..35f06f5caf 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -5,11 +5,11 @@ local api = vim.api
 ---@field opts table Options table with the following keys:
 ---                  - anon (boolean): If true, display anonymous nodes
 ---                  - lang (boolean): If true, display the language alongside each node
----@field nodes Node[]
----@field named Node[]
+---@field nodes TSP.Node[]
+---@field named TSP.Node[]
 local TSPlayground = {}
----
----@class Node
+
+---@class TSP.Node
 ---@field id integer Node id
 ---@field text string Node text
 ---@field named boolean True if this is a named (non-anonymous) node
@@ -36,9 +36,9 @@ local TSPlayground = {}
 ---@param node TSNode Starting node to begin traversal |tsnode|
 ---@param depth integer Current recursion depth
 ---@param lang string Language of the tree currently being traversed
----@param injections table<integer,Node> Mapping of node ids to root nodes of injected language trees (see
+---@param injections table<integer,TSP.Node> Mapping of node ids to root nodes of injected language trees (see
 ---                        explanation above)
----@param tree Node[] Output table containing a list of tables each representing a node in the tree
+---@param tree TSP.Node[] Output table containing a list of tables each representing a node in the tree
 ---@private
 local function traverse(node, depth, lang, injections, tree)
   local injection = injections[node:id()]
@@ -87,7 +87,7 @@ end
 ---@return TSPlayground|nil
 ---@return string|nil Error message, if any
 ---
----@private
+---@package
 function TSPlayground:new(bufnr, lang)
   local ok, parser = pcall(vim.treesitter.get_parser, bufnr or 0, lang)
   if not ok then
@@ -114,7 +114,7 @@ function TSPlayground:new(bufnr, lang)
 
   local nodes = traverse(root, 0, parser:lang(), injections, {})
 
-  local named = {} ---@type Node[]
+  local named = {} ---@type TSP.Node[]
   for _, v in ipairs(nodes) do
     if v.named then
       named[#named + 1] = v
@@ -154,7 +154,7 @@ end
 --- Write the contents of this Playground into {bufnr}.
 ---
 ---@param bufnr integer Buffer number to write into.
----@private
+---@package
 function TSPlayground:draw(bufnr)
   vim.bo[bufnr].modifiable = true
   local lines = {} ---@type string[]
@@ -195,8 +195,8 @@ end
 --- The node number is dependent on whether or not anonymous nodes are displayed.
 ---
 ---@param i integer Node number to get
----@return Node
----@private
+---@return TSP.Node
+---@package
 function TSPlayground:get(i)
   local t = self.opts.anon and self.nodes or self.named
   return t[i]
@@ -204,10 +204,10 @@ end
 
 --- Iterate over all of the nodes in this Playground object.
 ---
----@return (fun(): integer, Node) Iterator over all nodes in this Playground
+---@return (fun(): integer, TSP.Node) Iterator over all nodes in this Playground
 ---@return table
 ---@return integer
----@private
+---@package
 function TSPlayground:iter()
   return ipairs(self.opts.anon and self.nodes or self.named)
 end
-- 
cgit 


From ee5008f8789f61a3b153220abb870dd49427e52c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 24 Mar 2023 14:06:04 +0100
Subject: vim-patch:9.0.1425: "wat" and "wast" files are one filetype (#22774)

Problem:    "wat" and "wast" files are one filetype.
Solution:   Add a separate filetype for "wat" files. (Amaan Qureshi,
            closes vim/vim#12165)

https://github.com/vim/vim/commit/3ea62381c527395ae701715335776f427d22eb7b

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index fa4208e2a4..740304df15 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1103,8 +1103,8 @@ local extension = {
   wrl = 'vrml',
   vroom = 'vroom',
   vue = 'vue',
-  wat = 'wast',
   wast = 'wast',
+  wat = 'wat',
   wdl = 'wdl',
   wm = 'webmacro',
   wbt = 'winbatch',
-- 
cgit 


From cbbf8bd666c8419fdab80a0887948c8a36279c19 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 24 Mar 2023 14:43:14 +0000
Subject: feat(treesitter)!: deprecate top level indexes to modules (#22761)

The following top level Treesitter functions have been moved:
  - vim.treesitter.inspect_language() -> vim.treesitter.language.inspect()
  - vim.treesitter.get_query_files() -> vim.treesitter.query.get_files()
  - vim.treesitter.set_query() -> vim.treesitter.query.set()
  - vim.treesitter.query.set_query() -> vim.treesitter.query.set()
  - vim.treesitter.get_query() -> vim.treesitter.query.get()
  - vim.treesitter.query.get_query() -> vim.treesitter.query.get()
  - vim.treesitter.parse_query() -> vim.treesitter.query.parse()
  - vim.treesitter.query.parse_query() -> vim.treesitter.query.parse()
  - vim.treesitter.add_predicate() -> vim.treesitter.query.add_predicate()
  - vim.treesitter.add_directive() -> vim.treesitter.query.add_directive()
  - vim.treesitter.list_predicates() -> vim.treesitter.query.list_predicates()
  - vim.treesitter.list_directives() -> vim.treesitter.query.list_directives()
  - vim.treesitter.query.get_range() -> vim.treesitter.get_range()
  - vim.treesitter.query.get_node_text() -> vim.treesitter.get_node_text()
---
 runtime/doc/deprecated.txt                  |   2 +-
 runtime/doc/news.txt                        |  24 +++++-
 runtime/doc/treesitter.txt                  |  96 +++++++++++-----------
 runtime/lua/vim/treesitter.lua              |  89 +++++++++++++++++---
 runtime/lua/vim/treesitter/highlighter.lua  |   6 +-
 runtime/lua/vim/treesitter/language.lua     |  13 ++-
 runtime/lua/vim/treesitter/languagetree.lua |  14 ++--
 runtime/lua/vim/treesitter/query.lua        | 123 +++++++++++++---------------
 8 files changed, 224 insertions(+), 143 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 50f5b95ab5..84cc415a37 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -122,7 +122,7 @@ LSP FUNCTIONS
 					or |vim.lsp.buf.format()| instead.
 
 TREESITTER FUNCTIONS
-- *vim.treesitter.language.require_language()*	Use |vim.treesitter.add()|
+- *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
 						instead.
 - *vim.treesitter.get_node_at_pos()*		Use |vim.treesitter.get_node()|
 						instead.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index a03bd705a9..f3950de683 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -180,9 +180,9 @@ The following new APIs or features were added.
   more complicated dynamic language injections.
 
 • |vim.treesitter.get_node_text()| now accepts a `metadata` option for
-  writing custom directives using |vim.treesitter.add_directive()|.
+  writing custom directives using |vim.treesitter.query.add_directive()|.
 
-• |vim.treesitter.add()| replaces `vim.treesitter.language.require_language`.
+• |vim.treesitter.language.add()| replaces `vim.treesitter.language.require_language`.
 
 • `require'bit'` is now always available |lua-bit|
 
@@ -217,7 +217,7 @@ The following new APIs or features were added.
 
 • |vim.filetype.get_option()| to get the default option value for a specific
   filetype. This is a wrapper around |nvim_get_option_value()| with caching.
-  
+
 • Added |nvim_get_hl()| for getting highlight group definitions in a format compatible with |nvim_set_hl()|.
 
 ==============================================================================
@@ -275,11 +275,27 @@ DEPRECATIONS                                                *news-deprecations*
 The following functions are now deprecated and will be removed in the next
 release.
 
-• |vim.treesitter.add()| replaces `vim.treesitter.language.require_language()`
+• |vim.treesitter.language.add()| replaces `vim.treesitter.language.require_language()`
 
 • |vim.treesitter.get_node_at_pos()| and |vim.treesitter.get_node_at_cursor()|
   are both deprecated in favor of |vim.treesitter.get_node()|.
 
 • `vim.api.nvim_get_hl_by_name()`, `vim.api.nvim_get_hl_by_id()` were deprecated, use |nvim_get_hl()| instead.
 
+• The following top level Treesitter functions have been moved:
+  `vim.treesitter.inspect_language()`    -> `vim.treesitter.language.inspect()`
+  `vim.treesitter.get_query_files()`     -> `vim.treesitter.query.get_files()`
+  `vim.treesitter.set_query()`           -> `vim.treesitter.query.set()`
+  `vim.treesitter.query.set_query()`     -> `vim.treesitter.query.set()`
+  `vim.treesitter.get_query()`           -> `vim.treesitter.query.get()`
+  `vim.treesitter.query.get_query()`     -> `vim.treesitter.query.get()`
+  `vim.treesitter.parse_query()`         -> `vim.treesitter.query.parse()`
+  `vim.treesitter.query.parse_query()`   -> `vim.treesitter.query.parse()`
+  `vim.treesitter.add_predicate()`       -> `vim.treesitter.query.add_predicate()`
+  `vim.treesitter.add_directive()`       -> `vim.treesitter.query.add_directive()`
+  `vim.treesitter.list_predicates()`     -> `vim.treesitter.query.list_predicates()`
+  `vim.treesitter.list_directives()`     -> `vim.treesitter.query.list_directives()`
+  `vim.treesitter.query.get_range()`     -> `vim.treesitter.get_range()`
+  `vim.treesitter.query.get_node_text()` -> `vim.treesitter.get_node_text()`
+
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 46f414d905..d7e005ae51 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -26,7 +26,7 @@ If multiple parsers for the same language are found, the first one is used.
 (This typically implies the priority "user config > plugins > bundled".
 A parser can also be loaded manually using a full path: >lua
 
-    vim.treesitter.require_language("python", "/path/to/python.so")
+    vim.treesitter.language.add('python', { path = "/path/to/python.so" })
 <
 ==============================================================================
 TREESITTER TREES                                             *treesitter-tree*
@@ -236,8 +236,8 @@ The following predicates are built in:
 Each predicate has a `not-` prefixed predicate that is just the negation of
 the predicate.
 
-Further predicates can be added via |vim.treesitter.add_predicate()|.
-Use |vim.treesitter.list_predicates()| to list all available predicates.
+Further predicates can be added via |vim.treesitter.query.add_predicate()|.
+Use |vim.treesitter.query.list_predicates()| to list all available predicates.
 
 
 TREESITTER QUERY DIRECTIVES                            *treesitter-directives*
@@ -279,8 +279,8 @@ The following directives are built in:
             ((identifier) @constant (#offset! @constant 0 1 0 -1))
 <
 
-Further directives can be added via |vim.treesitter.add_directive()|.
-Use |vim.treesitter.list_directives()| to list all available directives.
+Further directives can be added via |vim.treesitter.query.add_directive()|.
+Use |vim.treesitter.query.list_directives()| to list all available directives.
 
 
 TREESITTER QUERY MODELINES                          *treesitter-query-modeline*
@@ -575,6 +575,22 @@ get_node_range({node_or_range})              *vim.treesitter.get_node_range()*
         (integer) end_row
         (integer) end_col
 
+                                              *vim.treesitter.get_node_text()*
+get_node_text({node}, {source}, {opts})
+    Gets the text corresponding to a given node
+
+    Parameters: ~
+      • {node}    |TSNode|
+      • {source}  (integer|string) Buffer or string from which the {node} is
+                  extracted
+      • {opts}    (table|nil) Optional parameters.
+                  • metadata (table) Metadata of a specific capture. This
+                    would be set to `metadata[capture_id]` when using
+                    |vim.treesitter.query.add_directive()|.
+
+    Return: ~
+        (string)
+
 get_parser({bufnr}, {lang}, {opts})              *vim.treesitter.get_parser()*
     Returns the parser for a specific buffer and filetype and attaches it to
     the buffer
@@ -591,6 +607,19 @@ get_parser({bufnr}, {lang}, {opts})              *vim.treesitter.get_parser()*
     Return: ~
         |LanguageTree| object to use for parsing
 
+get_range({node}, {source}, {metadata})           *vim.treesitter.get_range()*
+    Get the range of a |TSNode|. Can also supply {source} and {metadata} to
+    get the range with directives applied.
+
+    Parameters: ~
+      • {node}      |TSNode|
+      • {source}    integer|string|nil Buffer or string from which the {node}
+                    is extracted
+      • {metadata}  TSMetadata|nil
+
+    Return: ~
+        (table)
+
                                           *vim.treesitter.get_string_parser()*
 get_string_parser({str}, {lang}, {opts})
     Returns a string parser
@@ -698,7 +727,7 @@ stop({bufnr})                                          *vim.treesitter.stop()*
 ==============================================================================
 Lua module: vim.treesitter.language                  *lua-treesitter-language*
 
-add({lang}, {opts})                                     *vim.treesitter.add()*
+add({lang}, {opts})                            *vim.treesitter.language.add()*
     Asserts that a parser for the language {lang} is installed.
 
     Parsers are searched in the `parser` runtime directory, or the provided
@@ -716,14 +745,14 @@ add({lang}, {opts})                                     *vim.treesitter.add()*
                 • symbol_name (string|nil) Internal symbol name for the
                   language to load
 
-get_lang({filetype})                               *vim.treesitter.get_lang()*
+get_lang({filetype})                      *vim.treesitter.language.get_lang()*
     Parameters: ~
       • {filetype}  (string)
 
     Return: ~
         (string|nil)
 
-inspect_language({lang})                   *vim.treesitter.inspect_language()*
+inspect({lang})                            *vim.treesitter.language.inspect()*
     Inspects the provided language.
 
     Inspecting provides some useful information on the language like node
@@ -735,7 +764,7 @@ inspect_language({lang})                   *vim.treesitter.inspect_language()*
     Return: ~
         (table)
 
-register({lang}, {filetype})                       *vim.treesitter.register()*
+register({lang}, {filetype})              *vim.treesitter.language.register()*
     Register a lang to be used for a filetype (or list of filetypes).
 
     Parameters: ~
@@ -746,7 +775,7 @@ register({lang}, {filetype})                       *vim.treesitter.register()*
 ==============================================================================
 Lua module: vim.treesitter.query                        *lua-treesitter-query*
 
-                                              *vim.treesitter.add_directive()*
+                                        *vim.treesitter.query.add_directive()*
 add_directive({name}, {handler}, {force})
     Adds a new directive to be used in queries
 
@@ -768,7 +797,7 @@ add_directive({name}, {handler}, {force})
                      the predicate `{ "#set!", "conceal", "-" }`
       • {force}    (boolean|nil)
 
-                                              *vim.treesitter.add_predicate()*
+                                        *vim.treesitter.query.add_predicate()*
 add_predicate({name}, {handler}, {force})
     Adds a new predicate to be used in queries
 
@@ -776,27 +805,11 @@ add_predicate({name}, {handler}, {force})
       • {name}     (string) Name of the predicate, without leading #
       • {handler}  function(match:table<string,|TSNode|>, pattern:string,
                    bufnr:integer, predicate:string[])
-                   • see |vim.treesitter.add_directive()| for argument
+                   • see |vim.treesitter.query.add_directive()| for argument
                      meanings
       • {force}    (boolean|nil)
 
-                                              *vim.treesitter.get_node_text()*
-get_node_text({node}, {source}, {opts})
-    Gets the text corresponding to a given node
-
-    Parameters: ~
-      • {node}    |TSNode|
-      • {source}  (integer|string) Buffer or string from which the {node} is
-                  extracted
-      • {opts}    (table|nil) Optional parameters.
-                  • metadata (table) Metadata of a specific capture. This
-                    would be set to `metadata[capture_id]` when using
-                    |vim.treesitter.add_directive()|.
-
-    Return: ~
-        (string)
-
-get_query({lang}, {query_name})                   *vim.treesitter.get_query()*
+get({lang}, {query_name})                         *vim.treesitter.query.get()*
     Returns the runtime query {query_name} for {lang}.
 
     Parameters: ~
@@ -806,8 +819,8 @@ get_query({lang}, {query_name})                   *vim.treesitter.get_query()*
     Return: ~
         Query|nil Parsed query
 
-                                            *vim.treesitter.get_query_files()*
-get_query_files({lang}, {query_name}, {is_included})
+                                            *vim.treesitter.query.get_files()*
+get_files({lang}, {query_name}, {is_included})
     Gets the list of files used to make up a query
 
     Parameters: ~
@@ -820,32 +833,19 @@ get_query_files({lang}, {query_name}, {is_included})
         string[] query_files List of files to load for given query and
         language
 
-get_range({node}, {source}, {metadata})           *vim.treesitter.get_range()*
-    Get the range of a |TSNode|. Can also supply {source} and {metadata} to
-    get the range with directives applied.
-
-    Parameters: ~
-      • {node}      |TSNode|
-      • {source}    integer|string|nil Buffer or string from which the {node}
-                    is extracted
-      • {metadata}  TSMetadata|nil
-
-    Return: ~
-        (table)
-
-list_directives()                           *vim.treesitter.list_directives()*
+list_directives()                     *vim.treesitter.query.list_directives()*
     Lists the currently available directives to use in queries.
 
     Return: ~
         string[] List of supported directives.
 
-list_predicates()                           *vim.treesitter.list_predicates()*
+list_predicates()                     *vim.treesitter.query.list_predicates()*
     Lists the currently available predicates to use in queries.
 
     Return: ~
         string[] List of supported predicates.
 
-parse_query({lang}, {query})                    *vim.treesitter.parse_query()*
+parse({lang}, {query})                          *vim.treesitter.query.parse()*
     Parse {query} as a string. (If the query is in a file, the caller should
     read the contents into a string before calling).
 
@@ -935,7 +935,7 @@ Query:iter_matches({self}, {node}, {source}, {start}, {stop})
         (fun(): integer, table<integer,TSNode>, table): pattern id, match,
         metadata
 
-set_query({lang}, {query_name}, {text})           *vim.treesitter.set_query()*
+set({lang}, {query_name}, {text})                 *vim.treesitter.query.set()*
     Sets the runtime query named {query_name} for {lang}
 
     This allows users to override any runtime files and/or configuration set
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 685b1d8830..4c3b17daa4 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -1,6 +1,4 @@
 local a = vim.api
-local query = require('vim.treesitter.query')
-local language = require('vim.treesitter.language')
 local LanguageTree = require('vim.treesitter.languagetree')
 local Range = require('vim.treesitter._range')
 
@@ -9,12 +7,9 @@ local parsers = setmetatable({}, { __mode = 'v' })
 
 ---@class TreesitterModule
 ---@field highlighter TSHighlighter
-local M = vim.tbl_extend('error', query, language)
-
-M.language_version = vim._ts_get_language_version()
-M.minimum_language_version = vim._ts_get_minimum_language_version()
-
-setmetatable(M, {
+---@field query TSQueryModule
+---@field language TSLanguageModule
+local M = setmetatable({}, {
   __index = function(t, k)
     ---@diagnostic disable:no-unknown
     if k == 'highlighter' then
@@ -27,9 +22,26 @@ setmetatable(M, {
       t[k] = require('vim.treesitter.query')
       return t[k]
     end
+
+    local query = require('vim.treesitter.query')
+    if query[k] then
+      vim.deprecate('vim.treesitter.' .. k .. '()', 'vim.treesitter.query.' .. k .. '()', '0.10')
+      t[k] = query[k]
+      return t[k]
+    end
+
+    local language = require('vim.treesitter.language')
+    if language[k] then
+      vim.deprecate('vim.treesitter.' .. k .. '()', 'vim.treesitter.language.' .. k .. '()', '0.10')
+      t[k] = language[k]
+      return t[k]
+    end
   end,
 })
 
+M.language_version = vim._ts_get_language_version()
+M.minimum_language_version = vim._ts_get_minimum_language_version()
+
 --- Creates a new parser
 ---
 --- It is not recommended to use this; use |get_parser()| instead.
@@ -47,7 +59,7 @@ function M._create_parser(bufnr, lang, opts)
   vim.fn.bufload(bufnr)
 
   local ft = vim.bo[bufnr].filetype
-  language.add(lang, { filetype = ft ~= '' and ft or nil })
+  M.language.add(lang, { filetype = ft ~= '' and ft or nil })
 
   local self = LanguageTree.new(bufnr, lang, opts)
 
@@ -101,7 +113,7 @@ function M.get_parser(bufnr, lang, opts)
   if lang == nil then
     local ft = vim.bo[bufnr].filetype
     if ft ~= '' then
-      lang = language.get_lang(ft) or ft
+      lang = M.language.get_lang(ft) or ft
       -- TODO(lewis6991): we should error here and not default to ft
       -- if not lang then
       --   error(string.format('filetype %s of buffer %d is not associated with any lang', ft, bufnr))
@@ -152,7 +164,7 @@ function M.get_string_parser(str, lang, opts)
     str = { str, 'string' },
     lang = { lang, 'string' },
   })
-  language.add(lang)
+  M.language.add(lang)
 
   return LanguageTree.new(str, lang, opts)
 end
@@ -196,6 +208,61 @@ function M.get_node_range(node_or_range)
   end
 end
 
+---Get the range of a |TSNode|. Can also supply {source} and {metadata}
+---to get the range with directives applied.
+---@param node TSNode
+---@param source integer|string|nil Buffer or string from which the {node} is extracted
+---@param metadata TSMetadata|nil
+---@return Range6
+function M.get_range(node, source, metadata)
+  if metadata and metadata.range then
+    assert(source)
+    return Range.add_bytes(source, metadata.range)
+  end
+  return { node:range(true) }
+end
+
+---@private
+---@param buf integer
+---@param range Range
+---@returns string
+local function buf_range_get_text(buf, range)
+  local start_row, start_col, end_row, end_col = Range.unpack4(range)
+  if end_col == 0 then
+    if start_row == end_row then
+      start_col = -1
+      start_row = start_row - 1
+    end
+    end_col = -1
+    end_row = end_row - 1
+  end
+  local lines = a.nvim_buf_get_text(buf, start_row, start_col, end_row, end_col, {})
+  return table.concat(lines, '\n')
+end
+
+--- Gets the text corresponding to a given node
+---
+---@param node TSNode
+---@param source (integer|string) Buffer or string from which the {node} is extracted
+---@param opts (table|nil) Optional parameters.
+---          - metadata (table) Metadata of a specific capture. This would be
+---            set to `metadata[capture_id]` when using |vim.treesitter.query.add_directive()|.
+---@return string
+function M.get_node_text(node, source, opts)
+  opts = opts or {}
+  local metadata = opts.metadata or {}
+
+  if metadata.text then
+    return metadata.text
+  elseif type(source) == 'number' then
+    local range = vim.treesitter.get_range(node, source, metadata)
+    return buf_range_get_text(source, range)
+  end
+
+  ---@cast source string
+  return source:sub(select(3, node:start()) + 1, select(3, node:end_()))
+end
+
 --- Determines whether (line, col) position is in node range
 ---
 ---@param node TSNode defining the range
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index e24b3ba5df..729cd34090 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -1,5 +1,5 @@
 local a = vim.api
-local query = require('vim.treesitter.query')
+local query = vim.treesitter.query
 
 ---@alias TSHlIter fun(): integer, TSNode, TSMetadata
 
@@ -45,9 +45,9 @@ function TSHighlighterQuery.new(lang, query_string)
   })
 
   if query_string then
-    self._query = query.parse_query(lang, query_string)
+    self._query = query.parse(lang, query_string)
   else
-    self._query = query.get_query(lang, 'highlights')
+    self._query = query.get(lang, 'highlights')
   end
 
   return self
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 47375fd5e6..974d66ec05 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -1,5 +1,6 @@
 local a = vim.api
 
+---@class TSLanguageModule
 local M = {}
 
 ---@type table<string,string>
@@ -111,9 +112,19 @@ end
 ---
 ---@param lang string Language
 ---@return table
-function M.inspect_language(lang)
+function M.inspect(lang)
   M.add(lang)
   return vim._ts_inspect_language(lang)
 end
 
+---@deprecated
+function M.inspect_language(...)
+  vim.deprecate(
+    'vim.treesitter.language.inspect_language()',
+    'vim.treesitter.language.inspect()',
+    '0.10'
+  )
+  return M.inspect(...)
+end
+
 return M
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index ae41062ab2..82e507551d 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -99,8 +99,8 @@ function LanguageTree.new(source, lang, opts)
     _regions = {},
     _trees = {},
     _opts = opts,
-    _injection_query = injections[lang] and query.parse_query(lang, injections[lang])
-      or query.get_query(lang, 'injections'),
+    _injection_query = injections[lang] and query.parse(lang, injections[lang])
+      or query.get(lang, 'injections'),
     _valid = false,
     _parser = vim._create_ts_parser(lang),
     _callbacks = {
@@ -482,7 +482,7 @@ end
 ---@param metadata TSMetadata
 ---@return Range6[]
 local function get_node_ranges(node, source, metadata, include_children)
-  local range = query.get_range(node, source, metadata)
+  local range = vim.treesitter.get_range(node, source, metadata)
 
   if include_children then
     return { range }
@@ -562,7 +562,7 @@ function LanguageTree:_get_injection(match, metadata)
 
     -- Lang should override any other language tag
     if name == 'injection.language' then
-      lang = query.get_node_text(node, self._source, { metadata = metadata[id] })
+      lang = vim.treesitter.get_node_text(node, self._source, { metadata = metadata[id] })
     elseif name == 'injection.content' then
       ranges = get_node_ranges(node, self._source, metadata[id], include_children)
     end
@@ -609,11 +609,11 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
 
     -- Lang should override any other language tag
     if name == 'language' and not lang then
-      lang = query.get_node_text(node, self._source, { metadata = metadata[id] })
+      lang = vim.treesitter.get_node_text(node, self._source, { metadata = metadata[id] })
     elseif name == 'combined' then
       combined = true
     elseif name == 'content' and #ranges == 0 then
-      ranges[#ranges + 1] = query.get_range(node, self._source, metadata[id])
+      ranges[#ranges + 1] = vim.treesitter.get_range(node, self._source, metadata[id])
       -- Ignore any tags that start with "_"
       -- Allows for other tags to be used in matches
     elseif string.sub(name, 1, 1) ~= '_' then
@@ -622,7 +622,7 @@ function LanguageTree:_get_injection_deprecated(match, metadata)
       end
 
       if #ranges == 0 then
-        ranges[#ranges + 1] = query.get_range(node, self._source, metadata[id])
+        ranges[#ranges + 1] = vim.treesitter.get_range(node, self._source, metadata[id])
       end
     end
   end
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index f4e038b2d8..8ccd6da8a7 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -1,8 +1,6 @@
 local a = vim.api
 local language = require('vim.treesitter.language')
 
-local Range = require('vim.treesitter._range')
-
 ---@class Query
 ---@field captures string[] List of captures used in query
 ---@field info TSQueryInfo Contains used queries, predicates, directives
@@ -14,6 +12,7 @@ Query.__index = Query
 ---@field captures table
 ---@field patterns table<string,any[][]>
 
+---@class TSQueryModule
 local M = {}
 
 ---@private
@@ -57,22 +56,14 @@ local function add_included_lang(base_langs, lang, ilang)
   return false
 end
 
----@private
----@param buf integer
----@param range Range
----@returns string
-local function buf_range_get_text(buf, range)
-  local start_row, start_col, end_row, end_col = Range.unpack4(range)
-  if end_col == 0 then
-    if start_row == end_row then
-      start_col = -1
-      start_row = start_row - 1
-    end
-    end_col = -1
-    end_row = end_row - 1
-  end
-  local lines = a.nvim_buf_get_text(buf, start_row, start_col, end_row, end_col, {})
-  return table.concat(lines, '\n')
+---@deprecated
+function M.get_query_files(...)
+  vim.deprecate(
+    'vim.treesitter.query.get_query_files()',
+    'vim.treesitter.query.get_files()',
+    '0.10'
+  )
+  return M.get_files(...)
 end
 
 --- Gets the list of files used to make up a query
@@ -81,7 +72,7 @@ end
 ---@param query_name string Name of the query to load (e.g., "highlights")
 ---@param is_included (boolean|nil) Internal parameter, most of the time left as `nil`
 ---@return string[] query_files List of files to load for given query and language
-function M.get_query_files(lang, query_name, is_included)
+function M.get_files(lang, query_name, is_included)
   local query_path = string.format('queries/%s/%s.scm', lang, query_name)
   local lang_files = dedupe_files(a.nvim_get_runtime_file(query_path, true))
 
@@ -153,7 +144,7 @@ function M.get_query_files(lang, query_name, is_included)
 
   local query_files = {}
   for _, base_lang in ipairs(base_langs) do
-    local base_files = M.get_query_files(base_lang, query_name, true)
+    local base_files = M.get_files(base_lang, query_name, true)
     vim.list_extend(query_files, base_files)
   end
   vim.list_extend(query_files, { base_query })
@@ -175,7 +166,7 @@ local function read_query_files(filenames)
   return table.concat(contents, '')
 end
 
--- The explicitly set queries from |vim.treesitter.query.set_query()|
+-- The explicitly set queries from |vim.treesitter.query.set()|
 ---@type table<string,table<string,Query>>
 local explicit_queries = setmetatable({}, {
   __index = function(t, k)
@@ -186,6 +177,12 @@ local explicit_queries = setmetatable({}, {
   end,
 })
 
+---@deprecated
+function M.set_query(...)
+  vim.deprecate('vim.treesitter.query.set_query()', 'vim.treesitter.query.set()', '0.10')
+  M.set(...)
+end
+
 --- Sets the runtime query named {query_name} for {lang}
 ---
 --- This allows users to override any runtime files and/or configuration
@@ -194,8 +191,17 @@ local explicit_queries = setmetatable({}, {
 ---@param lang string Language to use for the query
 ---@param query_name string Name of the query (e.g., "highlights")
 ---@param text string Query text (unparsed).
-function M.set_query(lang, query_name, text)
-  explicit_queries[lang][query_name] = M.parse_query(lang, text)
+function M.set(lang, query_name, text)
+  explicit_queries[lang][query_name] = M.parse(lang, text)
+end
+
+---@deprecated
+---@param lang string Language to use for the query
+---@param query_name string Name of the query (e.g. "highlights")
+---
+---@return Query|nil Parsed query
+function M.get_query(lang, query_name)
+  return M.get(lang, query_name)
 end
 
 --- Returns the runtime query {query_name} for {lang}.
@@ -204,16 +210,16 @@ end
 ---@param query_name string Name of the query (e.g. "highlights")
 ---
 ---@return Query|nil Parsed query
-function M.get_query(lang, query_name)
+function M.get(lang, query_name)
   if explicit_queries[lang][query_name] then
     return explicit_queries[lang][query_name]
   end
 
-  local query_files = M.get_query_files(lang, query_name)
+  local query_files = M.get_files(lang, query_name)
   local query_string = read_query_files(query_files)
 
   if #query_string > 0 then
-    return M.parse_query(lang, query_string)
+    return M.parse(lang, query_string)
   end
 end
 
@@ -222,6 +228,12 @@ local query_cache = vim.defaulttable(function()
   return setmetatable({}, { __mode = 'v' })
 end)
 
+---@deprecated
+function M.parse_query(...)
+  vim.deprecate('vim.treesitter.query.parse_query()', 'vim.treesitter.query.parse()', '0.10')
+  return M.parse(...)
+end
+
 --- Parse {query} as a string. (If the query is in a file, the caller
 --- should read the contents into a string before calling).
 ---
@@ -239,7 +251,7 @@ end)
 ---@param query string Query in s-expr syntax
 ---
 ---@return Query Parsed query
-function M.parse_query(lang, query)
+function M.parse(lang, query)
   language.add(lang)
   local cached = query_cache[lang][query]
   if cached then
@@ -254,41 +266,16 @@ function M.parse_query(lang, query)
   return self
 end
 
----Get the range of a |TSNode|. Can also supply {source} and {metadata}
----to get the range with directives applied.
----@param node TSNode
----@param source integer|string|nil Buffer or string from which the {node} is extracted
----@param metadata TSMetadata|nil
----@return Range6
-function M.get_range(node, source, metadata)
-  if metadata and metadata.range then
-    assert(source)
-    return Range.add_bytes(source, metadata.range)
-  end
-  return { node:range(true) }
+---@deprecated
+function M.get_range(...)
+  vim.deprecate('vim.treesitter.query.get_range()', 'vim.treesitter.get_range()', '0.10')
+  return vim.treesitter.get_range(...)
 end
 
---- Gets the text corresponding to a given node
----
----@param node TSNode
----@param source (integer|string) Buffer or string from which the {node} is extracted
----@param opts (table|nil) Optional parameters.
----          - metadata (table) Metadata of a specific capture. This would be
----            set to `metadata[capture_id]` when using |vim.treesitter.add_directive()|.
----@return string
-function M.get_node_text(node, source, opts)
-  opts = opts or {}
-  local metadata = opts.metadata or {}
-
-  if metadata.text then
-    return metadata.text
-  elseif type(source) == 'number' then
-    local range = M.get_range(node, source, metadata)
-    return buf_range_get_text(source, range)
-  end
-
-  ---@cast source string
-  return source:sub(select(3, node:start()) + 1, select(3, node:end_()))
+---@deprecated
+function M.get_node_text(...)
+  vim.deprecate('vim.treesitter.query.get_node_text()', 'vim.treesitter.get_node_text()', '0.10')
+  return vim.treesitter.get_node_text(...)
 end
 
 ---@alias TSMatch table<integer,TSNode>
@@ -304,7 +291,7 @@ local predicate_handlers = {
     if not node then
       return true
     end
-    local node_text = M.get_node_text(node, source)
+    local node_text = vim.treesitter.get_node_text(node, source)
 
     local str ---@type string
     if type(predicate[3]) == 'string' then
@@ -312,7 +299,7 @@ local predicate_handlers = {
       str = predicate[3]
     else
       -- (#eq? @aa @bb)
-      str = M.get_node_text(match[predicate[3]], source)
+      str = vim.treesitter.get_node_text(match[predicate[3]], source)
     end
 
     if node_text ~= str or str == nil then
@@ -328,7 +315,7 @@ local predicate_handlers = {
       return true
     end
     local regex = predicate[3]
-    return string.find(M.get_node_text(node, source), regex) ~= nil
+    return string.find(vim.treesitter.get_node_text(node, source), regex) ~= nil
   end,
 
   ['match?'] = (function()
@@ -357,7 +344,7 @@ local predicate_handlers = {
       end
       ---@diagnostic disable-next-line no-unknown
       local regex = compiled_vim_regexes[pred[3]]
-      return regex:match_str(M.get_node_text(node, source))
+      return regex:match_str(vim.treesitter.get_node_text(node, source))
     end
   end)(),
 
@@ -366,7 +353,7 @@ local predicate_handlers = {
     if not node then
       return true
     end
-    local node_text = M.get_node_text(node, source)
+    local node_text = vim.treesitter.get_node_text(node, source)
 
     for i = 3, #predicate do
       if string.find(node_text, predicate[i], 1, true) then
@@ -382,7 +369,7 @@ local predicate_handlers = {
     if not node then
       return true
     end
-    local node_text = M.get_node_text(node, source)
+    local node_text = vim.treesitter.get_node_text(node, source)
 
     -- Since 'predicate' will not be used by callers of this function, use it
     -- to store a string set built from the list of words to check against.
@@ -468,7 +455,7 @@ local directive_handlers = {
     assert(type(id) == 'number')
 
     local node = match[id]
-    local text = M.get_node_text(node, bufnr, { metadata = metadata[id] }) or ''
+    local text = vim.treesitter.get_node_text(node, bufnr, { metadata = metadata[id] }) or ''
 
     if not metadata[id] then
       metadata[id] = {}
@@ -486,7 +473,7 @@ local directive_handlers = {
 ---
 ---@param name string Name of the predicate, without leading #
 ---@param handler function(match:table<string,TSNode>, pattern:string, bufnr:integer, predicate:string[])
----   - see |vim.treesitter.add_directive()| for argument meanings
+---   - see |vim.treesitter.query.add_directive()| for argument meanings
 ---@param force boolean|nil
 function M.add_predicate(name, handler, force)
   if predicate_handlers[name] and not force then
-- 
cgit 


From ac7397f4a06e451fedde86fb4eba0038d0d75e68 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 24 Mar 2023 16:31:30 +0000
Subject: fix(treesitter): add missing deprecate

---
 runtime/lua/vim/treesitter/_fold.lua | 5 ++---
 runtime/lua/vim/treesitter/query.lua | 9 +++------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index 3e67e400c2..6547ab936e 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -1,5 +1,4 @@
 local Range = require('vim.treesitter._range')
-local Query = require('vim.treesitter.query')
 
 local api = vim.api
 
@@ -105,7 +104,7 @@ local function get_folds_levels(bufnr, info, srow, erow)
   local prev_stop = -1
 
   vim.treesitter.get_parser(bufnr):for_each_tree(function(tree, ltree)
-    local query = vim.treesitter.query.get_query(ltree:lang(), 'folds')
+    local query = vim.treesitter.query.get(ltree:lang(), 'folds')
     if not query then
       return
     end
@@ -115,7 +114,7 @@ local function get_folds_levels(bufnr, info, srow, erow)
 
     for id, node, metadata in query:iter_captures(tree:root(), bufnr, srow or 0, q_erow) do
       if query.captures[id] == 'fold' then
-        local range = Query.get_range(node, bufnr, metadata[id])
+        local range = vim.treesitter.get_range(node, bufnr, metadata[id])
         local start, _, stop, stop_col = Range.unpack4(range)
 
         if stop_col == 0 then
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 8ccd6da8a7..25623c1498 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -196,12 +196,9 @@ function M.set(lang, query_name, text)
 end
 
 ---@deprecated
----@param lang string Language to use for the query
----@param query_name string Name of the query (e.g. "highlights")
----
----@return Query|nil Parsed query
-function M.get_query(lang, query_name)
-  return M.get(lang, query_name)
+function M.get_query(...)
+  vim.deprecate('vim.treesitter.query.get_query()', 'vim.treesitter.query.get()', '0.10')
+  return M.get(...)
 end
 
 --- Returns the runtime query {query_name} for {lang}.
-- 
cgit 


From 42876ddc7ad7d3dac3e1caf2494f402e7eb25a88 Mon Sep 17 00:00:00 2001
From: Jakub Łuczyński <doubleloop@users.noreply.github.com>
Date: Sat, 25 Mar 2023 09:28:59 +0100
Subject: docs: more details about vim.region (#21116)

---
 runtime/doc/lua.txt         | 10 ++++++----
 runtime/lua/vim/_editor.lua |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 2baae3a123..018c6ce5a4 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1510,7 +1510,8 @@ print({...})                                                     *vim.print()*
 
 region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
     Get a table of lines with start, end columns for a region marked by two
-    points
+    points. Input and output positions are (0,0)-indexed and indicate byte
+    positions.
 
     Parameters: ~
       • {bufnr}      (integer) number of buffer
@@ -1518,11 +1519,12 @@ region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
                      region
       • {pos2}       integer[] (line, column) tuple marking end of region
       • {regtype}    (string) type of selection, see |setreg()|
-      • {inclusive}  (boolean) indicating whether the selection is
-                     end-inclusive
+      • {inclusive}  (boolean) indicating whether column of pos2 is inclusive
 
     Return: ~
-        (table) region Table of the form `{linenr = {startcol,endcol}}`
+        (table) region Table of the form `{linenr = {startcol,endcol}}`.
+        `endcol` is exclusive, and whole lines are marked with
+        `{startcol,endcol} = {0,-1}`.
 
 schedule_wrap({cb})                                      *vim.schedule_wrap()*
     Defers callback `cb` until the Nvim API is safe to call.
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index f2875e5646..fd6a5865ce 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -397,14 +397,17 @@ do
   vim.t = make_dict_accessor('t')
 end
 
---- Get a table of lines with start, end columns for a region marked by two points
+--- Get a table of lines with start, end columns for a region marked by two points.
+--- Input and output positions are (0,0)-indexed and indicate byte positions.
 ---
 ---@param bufnr integer number of buffer
 ---@param pos1 integer[] (line, column) tuple marking beginning of region
 ---@param pos2 integer[] (line, column) tuple marking end of region
 ---@param regtype string type of selection, see |setreg()|
----@param inclusive boolean indicating whether the selection is end-inclusive
----@return table region Table of the form `{linenr = {startcol,endcol}}`
+---@param inclusive boolean indicating whether column of pos2 is inclusive
+---@return table region Table of the form `{linenr = {startcol,endcol}}`.
+---        `endcol` is exclusive, and whole lines are marked with
+---        `{startcol,endcol} = {0,-1}`.
 function vim.region(bufnr, pos1, pos2, regtype, inclusive)
   if not vim.api.nvim_buf_is_loaded(bufnr) then
     vim.fn.bufload(bufnr)
-- 
cgit 


From 36ee10057ab9a93144975449cc5e27f9b96e0af3 Mon Sep 17 00:00:00 2001
From: Micah Halter <micah@mehalter.com>
Date: Sat, 25 Mar 2023 09:01:39 -0400
Subject: fix(lsp): add missing silent check in lsp hover handler (#22763)

Fixup to #21531.
---
 runtime/lua/vim/lsp/handlers.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index ee5b63d260..d01f8e6159 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -364,7 +364,9 @@ function M.hover(_, result, ctx, config)
   local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
   markdown_lines = util.trim_empty_lines(markdown_lines)
   if vim.tbl_isempty(markdown_lines) then
-    vim.notify('No information available')
+    if config.silent ~= true then
+      vim.notify('No information available')
+    end
     return
   end
   return util.open_floating_preview(markdown_lines, 'markdown', config)
-- 
cgit 


From 257d894d75bc583bb16f4dbe441907eb273d20ad Mon Sep 17 00:00:00 2001
From: Roberto Pommella Alegro <robertoaall@gmail.com>
Date: Sat, 25 Mar 2023 13:46:07 -0300
Subject: feat(lsp): render markdown in docs hover #22766

Problem:
LSP docs hover (textDocument/hover) doesn't handle HTML escape seqs in markdown.

Solution:
Convert common HTML escape seqs to a nicer form, to display in the float.
closees #22757

Signed-off-by: Kasama <robertoaall@gmail.com>
---
 runtime/lua/vim/lsp/util.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 48faddfce1..ebde7af16c 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1378,6 +1378,20 @@ function M.stylize_markdown(bufnr, contents, opts)
     end
   end
 
+  -- Handle some common html escape sequences
+  stripped = vim.tbl_map(function(line)
+    local escapes = {
+      ['&gt;'] = '>',
+      ['&lt;'] = '<',
+      ['&quot;'] = '"',
+      ['&apos;'] = "'",
+      ['&ensp;'] = ' ',
+      ['&emsp;'] = ' ',
+      ['&amp;'] = '&',
+    }
+    return (string.gsub(line, '&[^ ;]+;', escapes))
+  end, stripped)
+
   -- Compute size of float needed to show (wrapped) lines
   opts.wrap_at = opts.wrap_at or (vim.wo['wrap'] and api.nvim_win_get_width(0))
   local width = M._make_floating_popup_size(stripped, opts)
-- 
cgit 


From fe9cbcb3a5c82932ecfb8f49d07e98a1fc2b31e5 Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Sat, 25 Mar 2023 18:58:48 +0200
Subject: feat(api): nvim_exec2(), deprecate nvim_exec() #19032

Problem:
The signature of nvim_exec() is not extensible per ":help api-contract".

Solution:
Introduce nvim_exec2() and deprecate nvim_exec().
---
 runtime/doc/api.txt         | 24 +++++++++++++-----------
 runtime/doc/deprecated.txt  |  3 ++-
 runtime/doc/lua.txt         |  6 +++---
 runtime/doc/news.txt        |  2 ++
 runtime/lua/_vim9script.lua |  2 +-
 runtime/lua/vim/_editor.lua |  6 +++---
 6 files changed, 24 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 197edf2e81..ea57db22e0 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1549,11 +1549,11 @@ nvim_command({command})                                       *nvim_command()*
 
     On execution error: fails with VimL error, updates v:errmsg.
 
-    Prefer using |nvim_cmd()| or |nvim_exec()| over this. To evaluate multiple
-    lines of Vim script or an Ex command directly, use |nvim_exec()|. To
-    construct an Ex command using a structured format and then execute it, use
-    |nvim_cmd()|. To modify an Ex command before evaluating it, use
-    |nvim_parse_cmd()| in conjunction with |nvim_cmd()|.
+    Prefer using |nvim_cmd()| or |nvim_exec2()| over this. To evaluate
+    multiple lines of Vim script or an Ex command directly, use
+    |nvim_exec2()|. To construct an Ex command using a structured format and
+    then execute it, use |nvim_cmd()|. To modify an Ex command before
+    evaluating it, use |nvim_parse_cmd()| in conjunction with |nvim_cmd()|.
 
     Parameters: ~
       • {command}  Ex command string
@@ -1570,7 +1570,7 @@ nvim_eval({expr})                                                *nvim_eval()*
     Return: ~
         Evaluation result or expanded object
 
-nvim_exec({src}, {output})                                       *nvim_exec()*
+nvim_exec2({src}, {*opts})                                      *nvim_exec2()*
     Executes Vimscript (multiline block of Ex commands), like anonymous
     |:source|.
 
@@ -1580,12 +1580,14 @@ nvim_exec({src}, {output})                                       *nvim_exec()*
     On execution error: fails with VimL error, updates v:errmsg.
 
     Parameters: ~
-      • {src}     Vimscript code
-      • {output}  Capture and return all (non-error, non-shell |:!|) output
+      • {src}   Vimscript code
+      • {opts}  Optional parameters.
+                • output: (boolean, default false) Whether to capture and
+                  return all (non-error, non-shell |:!|) output.
 
     Return: ~
-        Output (non-error, non-shell |:!|) if `output` is true, else empty
-        string.
+        Dictionary containing information about execution, with these keys:
+        • output: (string|nil) Output if `opts.output` is true.
 
     See also: ~
       • |execute()|
@@ -1738,7 +1740,7 @@ nvim_cmd({*cmd}, {*opts})                                         *nvim_cmd()*
         empty string.
 
     See also: ~
-      • |nvim_exec()|
+      • |nvim_exec2()|
       • |nvim_command()|
 
                                                   *nvim_create_user_command()*
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 84cc415a37..69cec8da53 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -15,10 +15,11 @@ Deprecated features
 API
 - *nvim_buf_clear_highlight()*	Use |nvim_buf_clear_namespace()| instead.
 - *nvim_buf_set_virtual_text()*	Use |nvim_buf_set_extmark()| instead.
-- *nvim_command_output()*	Use |nvim_exec()| instead.
+- *nvim_command_output()*	Use |nvim_exec2()| instead.
 - *nvim_execute_lua()*		Use |nvim_exec_lua()| instead.
 - *nvim_get_hl_by_name()*	Use |nvim_get_hl()| instead.
 - *nvim_get_hl_by_id()*		Use |nvim_get_hl()| instead.
+- *nvim_exec()*			Use |nvim_exec2()| instead.
 
 COMMANDS
 - *:rv* *:rviminfo*		Deprecated alias to |:rshada| command.
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 018c6ce5a4..0bea2819c9 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1355,9 +1355,9 @@ cmd({command})                                                     *vim.cmd()*
     Parameters: ~
       • {command}  string|table Command(s) to execute. If a string, executes
                    multiple lines of Vim script at once. In this case, it is
-                   an alias to |nvim_exec()|, where `output` is set to false.
-                   Thus it works identical to |:source|. If a table, executes
-                   a single command. In this case, it is an alias to
+                   an alias to |nvim_exec2()|, where `opts.output` is set to
+                   false. Thus it works identical to |:source|. If a table,
+                   executes a single command. In this case, it is an alias to
                    |nvim_cmd()| where `opts` is empty.
 
     See also: ~
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f3950de683..20af29430a 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -60,6 +60,8 @@ The following changes may require adaptations in user config or plugins.
 
 • Renamed vim.pretty_print to vim.print. |deprecated|
 
+• |nvim_exec()| is now deprecated in favor of |nvim_exec2()|.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/lua/_vim9script.lua b/runtime/lua/_vim9script.lua
index 363d061451..76e427b748 100644
--- a/runtime/lua/_vim9script.lua
+++ b/runtime/lua/_vim9script.lua
@@ -162,7 +162,7 @@ local vim9 = (function()
           end
         end
 
-        vim.api.nvim_exec(table.concat(file, '\n'), false)
+        vim.api.nvim_exec2(table.concat(file, '\n'), { output = false })
       end,
     })
   end
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index fd6a5865ce..db7a6c1d17 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -322,8 +322,8 @@ end
 ---
 ---@param command string|table Command(s) to execute.
 ---                            If a string, executes multiple lines of Vim script at once. In this
----                            case, it is an alias to |nvim_exec()|, where `output` is set to
----                            false. Thus it works identical to |:source|.
+---                            case, it is an alias to |nvim_exec2()|, where `opts.output` is set
+---                            to false. Thus it works identical to |:source|.
 ---                            If a table, executes a single command. In this case, it is an alias
 ---                            to |nvim_cmd()| where `opts` is empty.
 ---@see |ex-cmd-index|
@@ -338,7 +338,7 @@ vim.cmd = setmetatable({}, {
     if type(command) == 'table' then
       return vim.api.nvim_cmd(command, {})
     else
-      return vim.api.nvim_exec(command, false)
+      return vim.api.nvim_exec2(command, { output = false }).output
     end
   end,
   __index = function(t, command)
-- 
cgit 


From 4863ca6b8902c5b0aab95f2af640118cd417d379 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 26 Mar 2023 10:49:32 +0800
Subject: test: use exec_capture() in more places (#22787)

Problem:
Using `meths.exec2("code", { output = true })` is too verbose.

Solution:
Use exec_capture() in more places.
---
 runtime/lua/vim/_editor.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index db7a6c1d17..2ff4d440f0 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -338,7 +338,8 @@ vim.cmd = setmetatable({}, {
     if type(command) == 'table' then
       return vim.api.nvim_cmd(command, {})
     else
-      return vim.api.nvim_exec2(command, { output = false }).output
+      vim.api.nvim_exec2(command, {})
+      return ''
     end
   end,
   __index = function(t, command)
-- 
cgit 


From 2257ade3dc2daab5ee12d27807c0b3bcf103cd29 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 26 Mar 2023 12:42:15 +0200
Subject: feat(lua): add `vim.loader`

feat: new faster lua loader using byte-compilation
---
 runtime/doc/lua.txt         |  47 ++++
 runtime/doc/news.txt        |   4 +
 runtime/lua/vim/_editor.lua |   1 +
 runtime/lua/vim/loader.lua  | 536 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 588 insertions(+)
 create mode 100644 runtime/lua/vim/loader.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 0bea2819c9..58522ac1f3 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2024,6 +2024,53 @@ validate({opt})                                               *vim.validate()*
                   • msg: (optional) error string if validation fails
 
 
+==============================================================================
+Lua module: loader                                                *lua-loader*
+
+disable()                                               *vim.loader.disable()*
+    Disables the experimental Lua module loader:
+    • removes the loaders
+    • adds the default Neovim loader
+
+enable()                                                 *vim.loader.enable()*
+    Enables the experimental Lua module loader:
+    • overrides loadfile
+    • adds the lua loader using the byte-compilation cache
+    • adds the libs loader
+    • removes the default Neovim loader
+
+find({modname}, {opts})                                    *vim.loader.find()*
+    Finds lua modules for the given module name.
+
+    Parameters: ~
+      • {modname}  (string) Module name, or `"*"` to find the top-level
+                   modules instead
+      • {opts}     (table|nil) Options for finding a module:
+                   • rtp: (boolean) Search for modname in the runtime path
+                     (defaults to `true`)
+                   • paths: (string[]) Extra paths to search for modname
+                     (defaults to `{}`)
+                   • patterns: (string[]) List of patterns to use when
+                     searching for modules. A pattern is a string added to the
+                     basename of the Lua module being searched. (defaults to
+                     `{"/init.lua", ".lua"}`)
+                   • all: (boolean) Return all matches instead of just the
+                     first one (defaults to `false`)
+
+    Return: ~
+        (list) A list of results with the following properties:
+        • modpath: (string) the path to the module
+        • modname: (string) the name of the module
+        • stat: (table|nil) the fs_stat of the module path. Won't be returned
+          for `modname="*"`
+
+reset({path})                                             *vim.loader.reset()*
+    Resets the topmods cache for the path, or all the paths if path is nil.
+
+    Parameters: ~
+      • {path}  string? path to reset
+
+
 ==============================================================================
 Lua module: uri                                                      *lua-uri*
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 20af29430a..890a033268 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -67,6 +67,10 @@ NEW FEATURES                                                    *news-features*
 
 The following new APIs or features were added.
 
+• Added a new experimental |lua-loader| that byte-compiles and caches lua files.
+  To enable the new loader, add the following at the top of your |init.lua|: >lua
+    vim.loader.enable()
+
 • Added |lua-version| for parsing and comparing version strings conforming to
   the semver specification.
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 2ff4d440f0..0c4b634f6f 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -28,6 +28,7 @@
 for k, v in pairs({
   treesitter = true,
   filetype = true,
+  loader = true,
   F = true,
   lsp = true,
   highlight = true,
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
new file mode 100644
index 0000000000..41d5579664
--- /dev/null
+++ b/runtime/lua/vim/loader.lua
@@ -0,0 +1,536 @@
+local uv = vim.loop
+
+local M = {}
+
+---@alias CacheHash {mtime: {sec:number, nsec:number}, size:number}
+---@alias CacheEntry {hash:CacheHash, chunk:string}
+
+---@class ModuleFindOpts
+---@field all? boolean Search for all matches (defaults to `false`)
+---@field rtp? boolean Search for modname in the runtime path (defaults to `true`)
+---@field patterns? string[] Paterns to use (defaults to `{"/init.lua", ".lua"}`)
+---@field paths? string[] Extra paths to search for modname
+
+---@class ModuleInfo
+---@field modpath string Path of the module
+---@field modname string Name of the module
+---@field stat? uv_fs_t File stat of the module path
+
+---@alias LoaderStats table<string, {total:number, time:number, [string]:number?}?>
+
+M.path = vim.fn.stdpath('cache') .. '/luac'
+M.enabled = false
+
+---@class Loader
+---@field _rtp string[]
+---@field _rtp_pure string[]
+---@field _rtp_key string
+local Loader = {
+  VERSION = 3,
+  ---@type table<string, table<string,ModuleInfo>>
+  _indexed = {},
+  ---@type table<string, string[]>
+  _topmods = {},
+  _loadfile = loadfile,
+  ---@type LoaderStats
+  _stats = {
+    find = { total = 0, time = 0, not_found = 0 },
+  },
+}
+
+--- Tracks the time spent in a function
+---@private
+function Loader.track(stat, start)
+  Loader._stats[stat] = Loader._stats[stat] or { total = 0, time = 0 }
+  Loader._stats[stat].total = Loader._stats[stat].total + 1
+  Loader._stats[stat].time = Loader._stats[stat].time + uv.hrtime() - start
+end
+
+--- slightly faster/different version than vim.fs.normalize
+--- we also need to have it here, since the loader will load vim.fs
+---@private
+function Loader.normalize(path)
+  if path:sub(1, 1) == '~' then
+    local home = vim.loop.os_homedir() or '~'
+    if home:sub(-1) == '\\' or home:sub(-1) == '/' then
+      home = home:sub(1, -2)
+    end
+    path = home .. path:sub(2)
+  end
+  path = path:gsub('\\', '/'):gsub('/+', '/')
+  return path:sub(-1) == '/' and path:sub(1, -2) or path
+end
+
+--- Gets the rtp excluding after directories.
+--- The result is cached, and will be updated if the runtime path changes.
+--- When called from a fast event, the cached value will be returned.
+--- @return string[] rtp, boolean updated
+---@private
+function Loader.get_rtp()
+  local start = uv.hrtime()
+  if vim.in_fast_event() then
+    Loader.track('get_rtp', start)
+    return (Loader._rtp or {}), false
+  end
+  local updated = false
+  local key = vim.go.rtp
+  if key ~= Loader._rtp_key then
+    Loader._rtp = {}
+    for _, path in ipairs(vim.api.nvim_get_runtime_file('', true)) do
+      path = Loader.normalize(path)
+      -- skip after directories
+      if
+        path:sub(-6, -1) ~= '/after'
+        and not (Loader._indexed[path] and vim.tbl_isempty(Loader._indexed[path]))
+      then
+        Loader._rtp[#Loader._rtp + 1] = path
+      end
+    end
+    updated = true
+    Loader._rtp_key = key
+  end
+  Loader.track('get_rtp', start)
+  return Loader._rtp, updated
+end
+
+--- Returns the cache file name
+---@param name string can be a module name, or a file name
+---@return string file_name
+---@private
+function Loader.cache_file(name)
+  local ret = M.path .. '/' .. name:gsub('[/\\:]', '%%')
+  return ret:sub(-4) == '.lua' and (ret .. 'c') or (ret .. '.luac')
+end
+
+--- Saves the cache entry for a given module or file
+---@param name string module name or filename
+---@param entry CacheEntry
+---@private
+function Loader.write(name, entry)
+  local cname = Loader.cache_file(name)
+  local f = assert(uv.fs_open(cname, 'w', 438))
+  local header = {
+    Loader.VERSION,
+    entry.hash.size,
+    entry.hash.mtime.sec,
+    entry.hash.mtime.nsec,
+  }
+  uv.fs_write(f, table.concat(header, ',') .. '\0')
+  uv.fs_write(f, entry.chunk)
+  uv.fs_close(f)
+end
+
+--- Loads the cache entry for a given module or file
+---@param name string module name or filename
+---@return CacheEntry?
+---@private
+function Loader.read(name)
+  local start = uv.hrtime()
+  local cname = Loader.cache_file(name)
+  local f = uv.fs_open(cname, 'r', 438)
+  if f then
+    local hash = uv.fs_fstat(f) --[[@as CacheHash]]
+    local data = uv.fs_read(f, hash.size, 0) --[[@as string]]
+    uv.fs_close(f)
+
+    local zero = data:find('\0', 1, true)
+    if not zero then
+      return
+    end
+
+    ---@type integer[]|{[0]:integer}
+    local header = vim.split(data:sub(1, zero - 1), ',')
+    if tonumber(header[1]) ~= Loader.VERSION then
+      return
+    end
+    Loader.track('read', start)
+    return {
+      hash = {
+        size = tonumber(header[2]),
+        mtime = { sec = tonumber(header[3]), nsec = tonumber(header[4]) },
+      },
+      chunk = data:sub(zero + 1),
+    }
+  end
+  Loader.track('read', start)
+end
+
+--- The `package.loaders` loader for lua files using the cache.
+---@param modname string module name
+---@return string|function
+---@private
+function Loader.loader(modname)
+  local start = uv.hrtime()
+  local ret = M.find(modname)[1]
+  if ret then
+    local chunk, err = Loader.load(ret.modpath, { hash = ret.stat })
+    Loader.track('loader', start)
+    return chunk or error(err)
+  end
+  Loader.track('loader', start)
+  return '\ncache_loader: module ' .. modname .. ' not found'
+end
+
+--- The `package.loaders` loader for libs
+---@param modname string module name
+---@return string|function
+---@private
+function Loader.loader_lib(modname)
+  local start = uv.hrtime()
+  local sysname = uv.os_uname().sysname:lower() or ''
+  local is_win = sysname:find('win', 1, true) and not sysname:find('darwin', 1, true)
+  local ret = M.find(modname, { patterns = is_win and { '.dll' } or { '.so' } })[1]
+  ---@type function?, string?
+  if ret then
+    -- Making function name in Lua 5.1 (see src/loadlib.c:mkfuncname) is
+    -- a) strip prefix up to and including the first dash, if any
+    -- b) replace all dots by underscores
+    -- c) prepend "luaopen_"
+    -- So "foo-bar.baz" should result in "luaopen_bar_baz"
+    local dash = modname:find('-', 1, true)
+    local funcname = dash and modname:sub(dash + 1) or modname
+    local chunk, err = package.loadlib(ret.modpath, 'luaopen_' .. funcname:gsub('%.', '_'))
+    Loader.track('loader_lib', start)
+    return chunk or error(err)
+  end
+  Loader.track('loader_lib', start)
+  return '\ncache_loader_lib: module ' .. modname .. ' not found'
+end
+
+--- `loadfile` using the cache
+---@param filename? string
+---@param mode? "b"|"t"|"bt"
+---@param env? table
+---@param hash? CacheHash
+---@return function?, string?  error_message
+---@private
+-- luacheck: ignore 312
+function Loader.loadfile(filename, mode, env, hash)
+  local start = uv.hrtime()
+  filename = Loader.normalize(filename)
+  mode = nil -- ignore mode, since we byte-compile the lua source files
+  local chunk, err = Loader.load(filename, { mode = mode, env = env, hash = hash })
+  Loader.track('loadfile', start)
+  return chunk, err
+end
+
+--- Checks whether two cache hashes are the same based on:
+--- * file size
+--- * mtime in seconds
+--- * mtime in nanoseconds
+---@param h1 CacheHash
+---@param h2 CacheHash
+---@private
+function Loader.eq(h1, h2)
+  return h1
+    and h2
+    and h1.size == h2.size
+    and h1.mtime.sec == h2.mtime.sec
+    and h1.mtime.nsec == h2.mtime.nsec
+end
+
+--- Loads the given module path using the cache
+---@param modpath string
+---@param opts? {hash?: CacheHash, mode?: "b"|"t"|"bt", env?:table} (table|nil) Options for loading the module:
+---    - hash: (table) the hash of the file to load if it is already known. (defaults to `vim.loop.fs_stat({modpath})`)
+---    - mode: (string) the mode to load the module with. "b"|"t"|"bt" (defaults to `nil`)
+---    - env: (table) the environment to load the module in. (defaults to `nil`)
+---@see |luaL_loadfile()|
+---@return function?, string? error_message
+---@private
+function Loader.load(modpath, opts)
+  local start = uv.hrtime()
+
+  opts = opts or {}
+  local hash = opts.hash or uv.fs_stat(modpath)
+  ---@type function?, string?
+  local chunk, err
+
+  if not hash then
+    -- trigger correct error
+    chunk, err = Loader._loadfile(modpath, opts.mode, opts.env)
+    Loader.track('load', start)
+    return chunk, err
+  end
+
+  local entry = Loader.read(modpath)
+  if entry and Loader.eq(entry.hash, hash) then
+    -- found in cache and up to date
+    chunk, err = load(entry.chunk --[[@as string]], '@' .. modpath, opts.mode, opts.env)
+    if not (err and err:find('cannot load incompatible bytecode', 1, true)) then
+      Loader.track('load', start)
+      return chunk, err
+    end
+  end
+  entry = { hash = hash, modpath = modpath }
+
+  chunk, err = Loader._loadfile(modpath, opts.mode, opts.env)
+  if chunk then
+    entry.chunk = string.dump(chunk)
+    Loader.write(modpath, entry)
+  end
+  Loader.track('load', start)
+  return chunk, err
+end
+
+--- Finds lua modules for the given module name.
+---@param modname string Module name, or `"*"` to find the top-level modules instead
+---@param opts? ModuleFindOpts (table|nil) Options for finding a module:
+---    - rtp: (boolean) Search for modname in the runtime path (defaults to `true`)
+---    - paths: (string[]) Extra paths to search for modname (defaults to `{}`)
+---    - patterns: (string[]) List of patterns to use when searching for modules.
+---                A pattern is a string added to the basename of the Lua module being searched.
+---                (defaults to `{"/init.lua", ".lua"}`)
+---    - all: (boolean) Return all matches instead of just the first one (defaults to `false`)
+---@return ModuleInfo[] (list) A list of results with the following properties:
+---    - modpath: (string) the path to the module
+---    - modname: (string) the name of the module
+---    - stat: (table|nil) the fs_stat of the module path. Won't be returned for `modname="*"`
+function M.find(modname, opts)
+  local start = uv.hrtime()
+  opts = opts or {}
+
+  modname = modname:gsub('/', '.')
+  local basename = modname:gsub('%.', '/')
+  local idx = modname:find('.', 1, true)
+
+  -- HACK: fix incorrect require statements. Really not a fan of keeping this,
+  -- but apparently the regular lua loader also allows this
+  if idx == 1 then
+    modname = modname:gsub('^%.+', '')
+    basename = modname:gsub('%.', '/')
+    idx = modname:find('.', 1, true)
+  end
+
+  -- get the top-level module name
+  local topmod = idx and modname:sub(1, idx - 1) or modname
+
+  -- OPTIM: search for a directory first when topmod == modname
+  local patterns = opts.patterns
+    or (topmod == modname and { '/init.lua', '.lua' } or { '.lua', '/init.lua' })
+  for p, pattern in ipairs(patterns) do
+    patterns[p] = '/lua/' .. basename .. pattern
+  end
+
+  ---@type ModuleInfo[]
+  local results = {}
+
+  -- Only continue if we haven't found anything yet or we want to find all
+  ---@private
+  local function continue()
+    return #results == 0 or opts.all
+  end
+
+  -- Checks if the given paths contain the top-level module.
+  -- If so, it tries to find the module path for the given module name.
+  ---@param paths string[]
+  ---@private
+  local function _find(paths)
+    for _, path in ipairs(paths) do
+      if topmod == '*' then
+        for _, r in pairs(Loader.lsmod(path)) do
+          results[#results + 1] = r
+          if not continue() then
+            return
+          end
+        end
+      elseif Loader.lsmod(path)[topmod] then
+        for _, pattern in ipairs(patterns) do
+          local modpath = path .. pattern
+          Loader._stats.find.stat = (Loader._stats.find.stat or 0) + 1
+          local hash = uv.fs_stat(modpath)
+          if hash then
+            results[#results + 1] = { modpath = modpath, stat = hash, modname = modname }
+            if not continue() then
+              return
+            end
+          end
+        end
+      end
+    end
+  end
+
+  -- always check the rtp first
+  if opts.rtp ~= false then
+    _find(Loader._rtp or {})
+    if continue() then
+      local rtp, updated = Loader.get_rtp()
+      if updated then
+        _find(rtp)
+      end
+    end
+  end
+
+  -- check any additional paths
+  if continue() and opts.paths then
+    _find(opts.paths)
+  end
+
+  Loader.track('find', start)
+  if #results == 0 then
+    -- module not found
+    Loader._stats.find.not_found = Loader._stats.find.not_found + 1
+  end
+
+  return results
+end
+
+--- Resets the topmods cache for the path, or all the paths
+--- if path is nil.
+---@param path string? path to reset
+function M.reset(path)
+  if path then
+    Loader._indexed[Loader.normalize(path)] = nil
+  else
+    Loader._indexed = {}
+  end
+end
+
+--- Enables the experimental Lua module loader:
+--- * overrides loadfile
+--- * adds the lua loader using the byte-compilation cache
+--- * adds the libs loader
+--- * removes the default Neovim loader
+function M.enable()
+  if M.enabled then
+    return
+  end
+  M.enabled = true
+  vim.fn.mkdir(vim.fn.fnamemodify(M.path, ':p'), 'p')
+  _G.loadfile = Loader.loadfile
+  -- add lua loader
+  table.insert(package.loaders, 2, Loader.loader)
+  -- add libs loader
+  table.insert(package.loaders, 3, Loader.loader_lib)
+  -- remove Neovim loader
+  for l, loader in ipairs(package.loaders) do
+    if loader == vim._load_package then
+      table.remove(package.loaders, l)
+      break
+    end
+  end
+
+  -- this will reset the top-mods in case someone adds a new
+  -- top-level lua module to a path already on the rtp
+  vim.api.nvim_create_autocmd('BufWritePost', {
+    group = vim.api.nvim_create_augroup('cache_topmods_reset', { clear = true }),
+    callback = function(event)
+      local bufname = event.match ---@type string
+      local idx = bufname:find('/lua/', 1, true)
+      if idx then
+        M.reset(bufname:sub(1, idx - 1))
+      end
+    end,
+  })
+end
+
+--- Disables the experimental Lua module loader:
+--- * removes the loaders
+--- * adds the default Neovim loader
+function M.disable()
+  if not M.enabled then
+    return
+  end
+  M.enabled = false
+  _G.loadfile = Loader._loadfile
+  ---@diagnostic disable-next-line: no-unknown
+  for l, loader in ipairs(package.loaders) do
+    if loader == Loader.loader or loader == Loader.loader_lib then
+      table.remove(package.loaders, l)
+    end
+  end
+  table.insert(package.loaders, 2, vim._load_package)
+  vim.api.nvim_del_augroup_by_name('cache_topmods_reset')
+end
+
+--- Return the top-level `/lua/*` modules for this path
+---@param path string path to check for top-level lua modules
+---@private
+function Loader.lsmod(path)
+  if not Loader._indexed[path] then
+    local start = uv.hrtime()
+    Loader._indexed[path] = {}
+    local handle = vim.loop.fs_scandir(path .. '/lua')
+    while handle do
+      local name, t = vim.loop.fs_scandir_next(handle)
+      if not name then
+        break
+      end
+      local modpath = path .. '/lua/' .. name
+      -- HACK: type is not always returned due to a bug in luv
+      t = t or uv.fs_stat(modpath).type
+      ---@type string
+      local topname
+      local ext = name:sub(-4)
+      if ext == '.lua' or ext == '.dll' then
+        topname = name:sub(1, -5)
+      elseif name:sub(-3) == '.so' then
+        topname = name:sub(1, -4)
+      elseif t == 'link' or t == 'directory' then
+        topname = name
+      end
+      if topname then
+        Loader._indexed[path][topname] = { modpath = modpath, modname = topname }
+        Loader._topmods[topname] = Loader._topmods[topname] or {}
+        if not vim.tbl_contains(Loader._topmods[topname], path) then
+          table.insert(Loader._topmods[topname], path)
+        end
+      end
+    end
+    Loader.track('lsmod', start)
+  end
+  return Loader._indexed[path]
+end
+
+--- Debug function that wrapps all loaders and tracks stats
+---@private
+function M._profile_loaders()
+  for l, loader in pairs(package.loaders) do
+    local loc = debug.getinfo(loader, 'Sn').source:sub(2)
+    package.loaders[l] = function(modname)
+      local start = vim.loop.hrtime()
+      local ret = loader(modname)
+      Loader.track('loader ' .. l .. ': ' .. loc, start)
+      Loader.track('loader_all', start)
+      return ret
+    end
+  end
+end
+
+--- Prints all cache stats
+---@param opts? {print?:boolean}
+---@return LoaderStats
+---@private
+function M._inspect(opts)
+  if opts and opts.print then
+    ---@private
+    local function ms(nsec)
+      return math.floor(nsec / 1e6 * 1000 + 0.5) / 1000 .. 'ms'
+    end
+    local chunks = {} ---@type string[][]
+    ---@type string[]
+    local stats = vim.tbl_keys(Loader._stats)
+    table.sort(stats)
+    for _, stat in ipairs(stats) do
+      vim.list_extend(chunks, {
+        { '\n' .. stat .. '\n', 'Title' },
+        { '* total:    ' },
+        { tostring(Loader._stats[stat].total) .. '\n', 'Number' },
+        { '* time:     ' },
+        { ms(Loader._stats[stat].time) .. '\n', 'Bold' },
+        { '* avg time: ' },
+        { ms(Loader._stats[stat].time / Loader._stats[stat].total) .. '\n', 'Bold' },
+      })
+      for k, v in pairs(Loader._stats[stat]) do
+        if not vim.tbl_contains({ 'time', 'total' }, k) then
+          chunks[#chunks + 1] = { '* ' .. k .. ':' .. string.rep(' ', 9 - #k) }
+          chunks[#chunks + 1] = { tostring(v) .. '\n', 'Number' }
+        end
+      end
+    end
+    vim.api.nvim_echo(chunks, true, {})
+  end
+  return Loader._stats
+end
+
+return M
-- 
cgit 


From 3c82ce0d625184a90e6b2dda96e38fcb44f901d2 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 26 Mar 2023 12:46:24 +0100
Subject: refactor(loader): use vim.fs

---
 runtime/lua/vim/fs.lua     | 11 ++++++++---
 runtime/lua/vim/loader.lua |  7 +------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 2c3fc64d57..c6371e9163 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -77,6 +77,8 @@ local function join_paths(...)
   return (table.concat({ ... }, '/'):gsub('//+', '/'))
 end
 
+---@alias Iterator fun(): string?, string?
+
 --- Return an iterator over the files and directories located in {path}
 ---
 ---@param path (string) An absolute or relative path to the directory to iterate
@@ -100,10 +102,13 @@ function M.dir(path, opts)
   })
 
   if not opts.depth or opts.depth == 1 then
-    return function(fs)
+    local fs = vim.loop.fs_scandir(M.normalize(path))
+    return function()
+      if not fs then
+        return
+      end
       return vim.loop.fs_scandir_next(fs)
-    end,
-      vim.loop.fs_scandir(M.normalize(path))
+    end
   end
 
   --- @async
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 41d5579664..bafe766a5d 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -450,12 +450,7 @@ function Loader.lsmod(path)
   if not Loader._indexed[path] then
     local start = uv.hrtime()
     Loader._indexed[path] = {}
-    local handle = vim.loop.fs_scandir(path .. '/lua')
-    while handle do
-      local name, t = vim.loop.fs_scandir_next(handle)
-      if not name then
-        break
-      end
+    for name, t in vim.fs.dir(path .. '/lua') do
       local modpath = path .. '/lua/' .. name
       -- HACK: type is not always returned due to a bug in luv
       t = t or uv.fs_stat(modpath).type
-- 
cgit 


From fab8dab6b6273767e2b31e4282cee5a11349ac8f Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 26 Mar 2023 12:47:06 +0100
Subject: refactor(loader): remove BufWritePost autocmd

---
 runtime/lua/vim/loader.lua | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index bafe766a5d..3dc1bd9574 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -409,19 +409,6 @@ function M.enable()
       break
     end
   end
-
-  -- this will reset the top-mods in case someone adds a new
-  -- top-level lua module to a path already on the rtp
-  vim.api.nvim_create_autocmd('BufWritePost', {
-    group = vim.api.nvim_create_augroup('cache_topmods_reset', { clear = true }),
-    callback = function(event)
-      local bufname = event.match ---@type string
-      local idx = bufname:find('/lua/', 1, true)
-      if idx then
-        M.reset(bufname:sub(1, idx - 1))
-      end
-    end,
-  })
 end
 
 --- Disables the experimental Lua module loader:
@@ -440,7 +427,6 @@ function M.disable()
     end
   end
   table.insert(package.loaders, 2, vim._load_package)
-  vim.api.nvim_del_augroup_by_name('cache_topmods_reset')
 end
 
 --- Return the top-level `/lua/*` modules for this path
-- 
cgit 


From ffd8cd1a96a96b09351a5ffde1068c3595443128 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 26 Mar 2023 12:49:38 +0100
Subject: refactor(loader): add typing for package.loaders

---
 runtime/lua/vim/loader.lua | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 3dc1bd9574..19df7e4383 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -1,5 +1,8 @@
 local uv = vim.loop
 
+--- @type (fun(modename: string): fun()|string)[]
+local loaders = package.loaders
+
 local M = {}
 
 ---@alias CacheHash {mtime: {sec:number, nsec:number}, size:number}
@@ -399,13 +402,13 @@ function M.enable()
   vim.fn.mkdir(vim.fn.fnamemodify(M.path, ':p'), 'p')
   _G.loadfile = Loader.loadfile
   -- add lua loader
-  table.insert(package.loaders, 2, Loader.loader)
+  table.insert(loaders, 2, Loader.loader)
   -- add libs loader
-  table.insert(package.loaders, 3, Loader.loader_lib)
+  table.insert(loaders, 3, Loader.loader_lib)
   -- remove Neovim loader
-  for l, loader in ipairs(package.loaders) do
+  for l, loader in ipairs(loaders) do
     if loader == vim._load_package then
-      table.remove(package.loaders, l)
+      table.remove(loaders, l)
       break
     end
   end
@@ -420,13 +423,12 @@ function M.disable()
   end
   M.enabled = false
   _G.loadfile = Loader._loadfile
-  ---@diagnostic disable-next-line: no-unknown
-  for l, loader in ipairs(package.loaders) do
+  for l, loader in ipairs(loaders) do
     if loader == Loader.loader or loader == Loader.loader_lib then
-      table.remove(package.loaders, l)
+      table.remove(loaders, l)
     end
   end
-  table.insert(package.loaders, 2, vim._load_package)
+  table.insert(loaders, 2, vim._load_package)
 end
 
 --- Return the top-level `/lua/*` modules for this path
@@ -466,9 +468,9 @@ end
 --- Debug function that wrapps all loaders and tracks stats
 ---@private
 function M._profile_loaders()
-  for l, loader in pairs(package.loaders) do
+  for l, loader in pairs(loaders) do
     local loc = debug.getinfo(loader, 'Sn').source:sub(2)
-    package.loaders[l] = function(modname)
+    loaders[l] = function(modname)
       local start = vim.loop.hrtime()
       local ret = loader(modname)
       Loader.track('loader ' .. l .. ': ' .. loc, start)
-- 
cgit 


From 25fa051fa157ca4bce712e61602447a4222581ca Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 26 Mar 2023 13:01:48 +0100
Subject: feat(vim.fs): improve normalize

- Add options argument with an option to expand env vars
- Resolve '//' -> '/'
- Use in vim.loader
---
 runtime/doc/lua.txt        |  5 ++++-
 runtime/lua/vim/fs.lua     | 34 +++++++++++++++++++++++++---------
 runtime/lua/vim/loader.lua | 20 +++++---------------
 3 files changed, 34 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 58522ac1f3..33833fa83e 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2502,7 +2502,7 @@ find({names}, {opts})                                          *vim.fs.find()*
         (table) Normalized paths |vim.fs.normalize()| of all matching files or
         directories
 
-normalize({path})                                         *vim.fs.normalize()*
+normalize({path}, {opts})                                 *vim.fs.normalize()*
     Normalize a path to a standard format. A tilde (~) character at the
     beginning of the path is expanded to the user's home directory and any
     backslash (\) characters are converted to forward slashes (/). Environment
@@ -2522,6 +2522,9 @@ normalize({path})                                         *vim.fs.normalize()*
 
     Parameters: ~
       • {path}  (string) Path to normalize
+      • {opts}  (table|nil) Options:
+                • expand_env: boolean Expand environment variables (default:
+                  true)
 
     Return: ~
         (string) Normalized path
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index c6371e9163..407b334f20 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -321,16 +321,32 @@ end
 --- </pre>
 ---
 ---@param path (string) Path to normalize
+---@param opts table|nil Options:
+---             - expand_env: boolean Expand environment variables (default: true)
 ---@return (string) Normalized path
-function M.normalize(path)
-  vim.validate({ path = { path, 's' } })
-  return (
-    path
-      :gsub('^~$', vim.loop.os_homedir())
-      :gsub('^~/', vim.loop.os_homedir() .. '/')
-      :gsub('%$([%w_]+)', vim.loop.os_getenv)
-      :gsub('\\', '/')
-  )
+function M.normalize(path, opts)
+  opts = opts or {}
+
+  vim.validate({
+    path = { path, { 'string' } },
+    expand_env = { opts.expand_env, { 'boolean' }, true },
+  })
+
+  if path:sub(1, 1) == '~' then
+    local home = vim.loop.os_homedir() or '~'
+    if home:sub(-1) == '\\' or home:sub(-1) == '/' then
+      home = home:sub(1, -2)
+    end
+    path = home .. path:sub(2)
+  end
+
+  if opts.expand_env == nil or opts.expand_env then
+    path = path:gsub('%$([%w_]+)', vim.loop.os_getenv)
+  end
+
+  path = path:gsub('\\', '/'):gsub('/+', '/')
+
+  return path:sub(-1) == '/' and path:sub(1, -2) or path
 end
 
 return M
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 19df7e4383..eccf95e2f2 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -49,19 +49,9 @@ function Loader.track(stat, start)
   Loader._stats[stat].time = Loader._stats[stat].time + uv.hrtime() - start
 end
 
---- slightly faster/different version than vim.fs.normalize
---- we also need to have it here, since the loader will load vim.fs
 ---@private
-function Loader.normalize(path)
-  if path:sub(1, 1) == '~' then
-    local home = vim.loop.os_homedir() or '~'
-    if home:sub(-1) == '\\' or home:sub(-1) == '/' then
-      home = home:sub(1, -2)
-    end
-    path = home .. path:sub(2)
-  end
-  path = path:gsub('\\', '/'):gsub('/+', '/')
-  return path:sub(-1) == '/' and path:sub(1, -2) or path
+local function normalize(path)
+  return vim.fs.normalize(path, { expand_env = false })
 end
 
 --- Gets the rtp excluding after directories.
@@ -80,7 +70,7 @@ function Loader.get_rtp()
   if key ~= Loader._rtp_key then
     Loader._rtp = {}
     for _, path in ipairs(vim.api.nvim_get_runtime_file('', true)) do
-      path = Loader.normalize(path)
+      path = normalize(path)
       -- skip after directories
       if
         path:sub(-6, -1) ~= '/after'
@@ -210,7 +200,7 @@ end
 -- luacheck: ignore 312
 function Loader.loadfile(filename, mode, env, hash)
   local start = uv.hrtime()
-  filename = Loader.normalize(filename)
+  filename = normalize(filename)
   mode = nil -- ignore mode, since we byte-compile the lua source files
   local chunk, err = Loader.load(filename, { mode = mode, env = env, hash = hash })
   Loader.track('loadfile', start)
@@ -383,7 +373,7 @@ end
 ---@param path string? path to reset
 function M.reset(path)
   if path then
-    Loader._indexed[Loader.normalize(path)] = nil
+    Loader._indexed[normalize(path)] = nil
   else
     Loader._indexed = {}
   end
-- 
cgit 


From fd70a9dca199aae1eb7714608d63e8b2e63fb293 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 26 Mar 2023 13:23:34 +0100
Subject: refactor(loader): simplify tracking logic

---
 runtime/lua/vim/loader.lua | 74 +++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 44 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index eccf95e2f2..7b6b9cb563 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -41,14 +41,6 @@ local Loader = {
   },
 }
 
---- Tracks the time spent in a function
----@private
-function Loader.track(stat, start)
-  Loader._stats[stat] = Loader._stats[stat] or { total = 0, time = 0 }
-  Loader._stats[stat].total = Loader._stats[stat].total + 1
-  Loader._stats[stat].time = Loader._stats[stat].time + uv.hrtime() - start
-end
-
 ---@private
 local function normalize(path)
   return vim.fs.normalize(path, { expand_env = false })
@@ -60,9 +52,7 @@ end
 --- @return string[] rtp, boolean updated
 ---@private
 function Loader.get_rtp()
-  local start = uv.hrtime()
   if vim.in_fast_event() then
-    Loader.track('get_rtp', start)
     return (Loader._rtp or {}), false
   end
   local updated = false
@@ -82,7 +72,6 @@ function Loader.get_rtp()
     updated = true
     Loader._rtp_key = key
   end
-  Loader.track('get_rtp', start)
   return Loader._rtp, updated
 end
 
@@ -118,7 +107,6 @@ end
 ---@return CacheEntry?
 ---@private
 function Loader.read(name)
-  local start = uv.hrtime()
   local cname = Loader.cache_file(name)
   local f = uv.fs_open(cname, 'r', 438)
   if f then
@@ -136,7 +124,6 @@ function Loader.read(name)
     if tonumber(header[1]) ~= Loader.VERSION then
       return
     end
-    Loader.track('read', start)
     return {
       hash = {
         size = tonumber(header[2]),
@@ -145,7 +132,6 @@ function Loader.read(name)
       chunk = data:sub(zero + 1),
     }
   end
-  Loader.track('read', start)
 end
 
 --- The `package.loaders` loader for lua files using the cache.
@@ -153,14 +139,11 @@ end
 ---@return string|function
 ---@private
 function Loader.loader(modname)
-  local start = uv.hrtime()
   local ret = M.find(modname)[1]
   if ret then
     local chunk, err = Loader.load(ret.modpath, { hash = ret.stat })
-    Loader.track('loader', start)
     return chunk or error(err)
   end
-  Loader.track('loader', start)
   return '\ncache_loader: module ' .. modname .. ' not found'
 end
 
@@ -169,7 +152,6 @@ end
 ---@return string|function
 ---@private
 function Loader.loader_lib(modname)
-  local start = uv.hrtime()
   local sysname = uv.os_uname().sysname:lower() or ''
   local is_win = sysname:find('win', 1, true) and not sysname:find('darwin', 1, true)
   local ret = M.find(modname, { patterns = is_win and { '.dll' } or { '.so' } })[1]
@@ -183,10 +165,8 @@ function Loader.loader_lib(modname)
     local dash = modname:find('-', 1, true)
     local funcname = dash and modname:sub(dash + 1) or modname
     local chunk, err = package.loadlib(ret.modpath, 'luaopen_' .. funcname:gsub('%.', '_'))
-    Loader.track('loader_lib', start)
     return chunk or error(err)
   end
-  Loader.track('loader_lib', start)
   return '\ncache_loader_lib: module ' .. modname .. ' not found'
 end
 
@@ -199,12 +179,9 @@ end
 ---@private
 -- luacheck: ignore 312
 function Loader.loadfile(filename, mode, env, hash)
-  local start = uv.hrtime()
-  filename = normalize(filename)
-  mode = nil -- ignore mode, since we byte-compile the lua source files
-  local chunk, err = Loader.load(filename, { mode = mode, env = env, hash = hash })
-  Loader.track('loadfile', start)
-  return chunk, err
+  -- ignore mode, since we byte-compile the lua source files
+  mode = nil
+  return Loader.load(normalize(filename), { mode = mode, env = env, hash = hash })
 end
 
 --- Checks whether two cache hashes are the same based on:
@@ -232,8 +209,6 @@ end
 ---@return function?, string? error_message
 ---@private
 function Loader.load(modpath, opts)
-  local start = uv.hrtime()
-
   opts = opts or {}
   local hash = opts.hash or uv.fs_stat(modpath)
   ---@type function?, string?
@@ -241,9 +216,7 @@ function Loader.load(modpath, opts)
 
   if not hash then
     -- trigger correct error
-    chunk, err = Loader._loadfile(modpath, opts.mode, opts.env)
-    Loader.track('load', start)
-    return chunk, err
+    return Loader._loadfile(modpath, opts.mode, opts.env)
   end
 
   local entry = Loader.read(modpath)
@@ -251,7 +224,6 @@ function Loader.load(modpath, opts)
     -- found in cache and up to date
     chunk, err = load(entry.chunk --[[@as string]], '@' .. modpath, opts.mode, opts.env)
     if not (err and err:find('cannot load incompatible bytecode', 1, true)) then
-      Loader.track('load', start)
       return chunk, err
     end
   end
@@ -262,7 +234,6 @@ function Loader.load(modpath, opts)
     entry.chunk = string.dump(chunk)
     Loader.write(modpath, entry)
   end
-  Loader.track('load', start)
   return chunk, err
 end
 
@@ -280,7 +251,6 @@ end
 ---    - modname: (string) the name of the module
 ---    - stat: (table|nil) the fs_stat of the module path. Won't be returned for `modname="*"`
 function M.find(modname, opts)
-  local start = uv.hrtime()
   opts = opts or {}
 
   modname = modname:gsub('/', '.')
@@ -359,7 +329,6 @@ function M.find(modname, opts)
     _find(opts.paths)
   end
 
-  Loader.track('find', start)
   if #results == 0 then
     -- module not found
     Loader._stats.find.not_found = Loader._stats.find.not_found + 1
@@ -426,7 +395,6 @@ end
 ---@private
 function Loader.lsmod(path)
   if not Loader._indexed[path] then
-    local start = uv.hrtime()
     Loader._indexed[path] = {}
     for name, t in vim.fs.dir(path .. '/lua') do
       local modpath = path .. '/lua/' .. name
@@ -450,23 +418,41 @@ function Loader.lsmod(path)
         end
       end
     end
-    Loader.track('lsmod', start)
   end
   return Loader._indexed[path]
 end
 
+--- Tracks the time spent in a function
+--- @generic F: function
+--- @param f F
+--- @return F
+--- @private
+function Loader.track(stat, f)
+  return function(...)
+    local start = vim.loop.hrtime()
+    local r = { f(...) }
+    Loader._stats[stat] = Loader._stats[stat] or { total = 0, time = 0 }
+    Loader._stats[stat].total = Loader._stats[stat].total + 1
+    Loader._stats[stat].time = Loader._stats[stat].time + uv.hrtime() - start
+    return unpack(r, 1, table.maxn(r))
+  end
+end
+
+Loader.get_rtp = Loader.track('get_rtp', Loader.get_rtp)
+Loader.read = Loader.track('read', Loader.read)
+Loader.loader = Loader.track('loader', Loader.loader)
+Loader.loader_lib = Loader.track('loader_lib', Loader.loader_lib)
+Loader.loadfile = Loader.track('loadfile', Loader.loadfile)
+Loader.load = Loader.track('load', Loader.load)
+M.find = Loader.track('find', M.find)
+Loader.lsmod = Loader.track('lsmod', Loader.lsmod)
+
 --- Debug function that wrapps all loaders and tracks stats
 ---@private
 function M._profile_loaders()
   for l, loader in pairs(loaders) do
     local loc = debug.getinfo(loader, 'Sn').source:sub(2)
-    loaders[l] = function(modname)
-      local start = vim.loop.hrtime()
-      local ret = loader(modname)
-      Loader.track('loader ' .. l .. ': ' .. loc, start)
-      Loader.track('loader_all', start)
-      return ret
-    end
+    loaders[l] = Loader.track('loader ' .. l .. ': ' .. loc, loader)
   end
 end
 
-- 
cgit 


From b7748662ed5b06c12a74560690b728fdf770666f Mon Sep 17 00:00:00 2001
From: Michal Liszcz <liszcz.michal@gmail.com>
Date: Wed, 29 Mar 2023 09:59:01 +0200
Subject: fix(api): Use local LastSet structure in nvim_get_option_info
 (#22741)

fix(api): use local LastSet structure in nvim_get_option_info

* nvim_get_option_info is deprecated.
  It is always using the global LastSet information as reported in #15232.
* nvim_get_option_info2 is added.
  The new function additionally accepts an 'opts' table {scope, buf, win}
  allowing to specify the option scope and query local options from another
  buffer or window.
---
 runtime/doc/api.txt        | 17 ++++++++++++++---
 runtime/doc/deprecated.txt |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index ea57db22e0..b51da8d56f 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1912,7 +1912,7 @@ nvim_get_all_options_info()                      *nvim_get_all_options_info()*
     Gets the option information for all options.
 
     The dictionary has the full option names as keys and option metadata
-    dictionaries as detailed at |nvim_get_option_info()|.
+    dictionaries as detailed at |nvim_get_option_info2()|.
 
     Return: ~
         dictionary of all options
@@ -1926,8 +1926,8 @@ nvim_get_option({name})                                    *nvim_get_option()*
     Return: ~
         Option value (global)
 
-nvim_get_option_info({name})                          *nvim_get_option_info()*
-    Gets the option information for one option
+nvim_get_option_info2({name}, {*opts})               *nvim_get_option_info2()*
+    Gets the option information for one option from arbitrary buffer or window
 
     Resulting dictionary has keys:
     • name: Name of the option (like 'filetype')
@@ -1943,8 +1943,19 @@ nvim_get_option_info({name})                          *nvim_get_option_info()*
     • commalist: List of comma separated values
     • flaglist: List of single char flags
 
+    When {scope} is not provided, the last set information applies to the
+    local value in the current buffer or window if it is available, otherwise
+    the global value information is returned. This behavior can be disabled by
+    explicitly specifying {scope} in the {opts} table.
+
     Parameters: ~
       • {name}  Option name
+      • {opts}  Optional parameters
+                • scope: One of "global" or "local". Analogous to |:setglobal|
+                  and |:setlocal|, respectively.
+                • win: |window-ID|. Used for getting window local options.
+                • buf: Buffer number. Used for getting buffer local options.
+                  Implies {scope} is "local".
 
     Return: ~
         Option Information
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 69cec8da53..3eb2017bed 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -20,6 +20,7 @@ API
 - *nvim_get_hl_by_name()*	Use |nvim_get_hl()| instead.
 - *nvim_get_hl_by_id()*		Use |nvim_get_hl()| instead.
 - *nvim_exec()*			Use |nvim_exec2()| instead.
+- *nvim_get_option_info()*	Use |nvim_get_option_info2()| instead.
 
 COMMANDS
 - *:rv* *:rviminfo*		Deprecated alias to |:rshada| command.
-- 
cgit 


From 196f69909db9e44477731cd805dac119a54725c2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 29 Mar 2023 10:23:52 +0200
Subject: vim-patch:9.0.1430: Livebook files are not recognized (#22808)

Problem:    Livebook files are not recognized.
Solution:   Add a pattern for Livebook files. (Mathias Jean Johansen,
            closes vim/vim#12203)

https://github.com/vim/vim/commit/64002035178ac3e0d9ab7269d1bf06c6ede5a854

Co-authored-by: Mathias Jean Johansen <mathias@mjj.io>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 740304df15..87439f9f0c 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -615,6 +615,7 @@ local extension = {
   asd = 'lisp',
   lt = 'lite',
   lite = 'lite',
+  livemd = 'livebook',
   lgt = 'logtalk',
   lotos = 'lotos',
   lot = 'lotos',
-- 
cgit 


From 61e54f26361b2e7d08eabde9a4cbf42aaa41683b Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 30 Mar 2023 10:26:28 +0100
Subject: feat: add `vim.treesitter.language.get_filetypes()` (#22643)

---
 runtime/doc/treesitter.txt                  | 31 +++++++++-------
 runtime/lua/vim/treesitter.lua              | 33 +++++++----------
 runtime/lua/vim/treesitter/language.lua     | 57 +++++++++++++++++++----------
 runtime/lua/vim/treesitter/languagetree.lua |  7 +---
 4 files changed, 69 insertions(+), 59 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index d7e005ae51..96021d6272 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -592,8 +592,7 @@ get_node_text({node}, {source}, {opts})
         (string)
 
 get_parser({bufnr}, {lang}, {opts})              *vim.treesitter.get_parser()*
-    Returns the parser for a specific buffer and filetype and attaches it to
-    the buffer
+    Returns the parser for a specific buffer and attaches it to the buffer
 
     If needed, this will create the parser.
 
@@ -728,29 +727,35 @@ stop({bufnr})                                          *vim.treesitter.stop()*
 Lua module: vim.treesitter.language                  *lua-treesitter-language*
 
 add({lang}, {opts})                            *vim.treesitter.language.add()*
-    Asserts that a parser for the language {lang} is installed.
+    Load parser with name {lang}
 
     Parsers are searched in the `parser` runtime directory, or the provided
     {path}
 
     Parameters: ~
-      • {lang}  (string) Language the parser should parse (alphanumerical and
-                `_` only)
+      • {lang}  (string) Name of the parser (alphanumerical and `_` only)
       • {opts}  (table|nil) Options:
-                • filetype (string|string[]) Filetype(s) that lang can be
-                  parsed with. Note this is not strictly the same as lang
-                  since a single lang can parse multiple filetypes. Defaults
-                  to lang.
+                • filetype (string|string[]) Default filetype the parser
+                  should be associated with. Defaults to {lang}.
                 • path (string|nil) Optional path the parser is located at
                 • symbol_name (string|nil) Internal symbol name for the
                   language to load
 
+get_filetypes({lang})                *vim.treesitter.language.get_filetypes()*
+    Get the filetypes associated with the parser named {lang}.
+
+    Parameters: ~
+      • {lang}  string Name of parser
+
+    Return: ~
+        string[] filetypes
+
 get_lang({filetype})                      *vim.treesitter.language.get_lang()*
     Parameters: ~
-      • {filetype}  (string)
+      • {filetype}  string
 
     Return: ~
-        (string|nil)
+        string|nil
 
 inspect({lang})                            *vim.treesitter.language.inspect()*
     Inspects the provided language.
@@ -765,10 +770,10 @@ inspect({lang})                            *vim.treesitter.language.inspect()*
         (table)
 
 register({lang}, {filetype})              *vim.treesitter.language.register()*
-    Register a lang to be used for a filetype (or list of filetypes).
+    Register a parser named {lang} to be used for {filetype}(s).
 
     Parameters: ~
-      • {lang}      (string) Language to register
+      • {lang}      string Name of parser
       • {filetype}  string|string[] Filetype(s) to associate with lang
 
 
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 4c3b17daa4..2594c1672d 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -58,9 +58,6 @@ function M._create_parser(bufnr, lang, opts)
 
   vim.fn.bufload(bufnr)
 
-  local ft = vim.bo[bufnr].filetype
-  M.language.add(lang, { filetype = ft ~= '' and ft or nil })
-
   local self = LanguageTree.new(bufnr, lang, opts)
 
   ---@private
@@ -94,7 +91,12 @@ function M._create_parser(bufnr, lang, opts)
   return self
 end
 
---- Returns the parser for a specific buffer and filetype and attaches it to the buffer
+--- @private
+local function valid_lang(lang)
+  return lang and lang ~= ''
+end
+
+--- Returns the parser for a specific buffer and attaches it to the buffer
 ---
 --- If needed, this will create the parser.
 ---
@@ -110,18 +112,12 @@ function M.get_parser(bufnr, lang, opts)
     bufnr = a.nvim_get_current_buf()
   end
 
-  if lang == nil then
-    local ft = vim.bo[bufnr].filetype
-    if ft ~= '' then
-      lang = M.language.get_lang(ft) or ft
-      -- TODO(lewis6991): we should error here and not default to ft
-      -- if not lang then
-      --   error(string.format('filetype %s of buffer %d is not associated with any lang', ft, bufnr))
-      -- end
-    else
-      if parsers[bufnr] then
-        return parsers[bufnr]
-      end
+  if not valid_lang(lang) then
+    lang = M.language.get_lang(vim.bo[bufnr].filetype) or vim.bo[bufnr].filetype
+  end
+
+  if not valid_lang(lang) then
+    if not parsers[bufnr] then
       error(
         string.format(
           'There is no parser available for buffer %d and one could not be'
@@ -131,9 +127,7 @@ function M.get_parser(bufnr, lang, opts)
         )
       )
     end
-  end
-
-  if parsers[bufnr] == nil or parsers[bufnr]:lang() ~= lang then
+  elseif parsers[bufnr] == nil or parsers[bufnr]:lang() ~= lang then
     parsers[bufnr] = M._create_parser(bufnr, lang, opts)
   end
 
@@ -164,7 +158,6 @@ function M.get_string_parser(str, lang, opts)
     str = { str, 'string' },
     lang = { lang, 'string' },
   })
-  M.language.add(lang)
 
   return LanguageTree.new(str, lang, opts)
 end
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 974d66ec05..b1c788e6ba 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -6,9 +6,25 @@ local M = {}
 ---@type table<string,string>
 local ft_to_lang = {}
 
----@param filetype string
----@return string|nil
+--- Get the filetypes associated with the parser named {lang}.
+--- @param lang string Name of parser
+--- @return string[] filetypes
+function M.get_filetypes(lang)
+  local r = {} ---@type string[]
+  for ft, p in pairs(ft_to_lang) do
+    if p == lang then
+      r[#r + 1] = ft
+    end
+  end
+  return r
+end
+
+--- @param filetype string
+--- @return string|nil
 function M.get_lang(filetype)
+  if filetype == '' then
+    return
+  end
   return ft_to_lang[filetype]
 end
 
@@ -35,16 +51,14 @@ end
 ---@field filetype? string|string[]
 ---@field symbol_name? string
 
---- Asserts that a parser for the language {lang} is installed.
+--- Load parser with name {lang}
 ---
 --- Parsers are searched in the `parser` runtime directory, or the provided {path}
 ---
----@param lang string Language the parser should parse (alphanumerical and `_` only)
+---@param lang string Name of the parser (alphanumerical and `_` only)
 ---@param opts (table|nil) Options:
----                        - filetype (string|string[]) Filetype(s) that lang can be parsed with.
----                          Note this is not strictly the same as lang since a single lang can
----                          parse multiple filetypes.
----                          Defaults to lang.
+---                        - filetype (string|string[]) Default filetype the parser should be associated with.
+---                          Defaults to {lang}.
 ---                        - path (string|nil) Optional path the parser is located at
 ---                        - symbol_name (string|nil) Internal symbol name for the language to load
 function M.add(lang, opts)
@@ -61,7 +75,7 @@ function M.add(lang, opts)
     filetype = { filetype, { 'string', 'table' }, true },
   })
 
-  M.register(lang, filetype or lang)
+  M.register(lang, filetype)
 
   if vim._ts_has_language(lang) then
     return
@@ -83,23 +97,26 @@ function M.add(lang, opts)
   vim._ts_add_language(path, lang, symbol_name)
 end
 
---- Register a lang to be used for a filetype (or list of filetypes).
----@param lang string Language to register
----@param filetype string|string[] Filetype(s) to associate with lang
+--- @private
+--- @param x string|string[]
+--- @return string[]
+local function ensure_list(x)
+  if type(x) == 'table' then
+    return x
+  end
+  return { x }
+end
+
+--- Register a parser named {lang} to be used for {filetype}(s).
+--- @param lang string Name of parser
+--- @param filetype string|string[] Filetype(s) to associate with lang
 function M.register(lang, filetype)
   vim.validate({
     lang = { lang, 'string' },
     filetype = { filetype, { 'string', 'table' } },
   })
 
-  local filetypes ---@type string[]
-  if type(filetype) == 'string' then
-    filetypes = { filetype }
-  else
-    filetypes = filetype
-  end
-
-  for _, f in ipairs(filetypes) do
+  for _, f in ipairs(ensure_list(filetype)) do
     if f ~= '' then
       ft_to_lang[f] = lang
     end
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 82e507551d..922e4881ca 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -76,7 +76,7 @@ LanguageTree.__index = LanguageTree
 --- "injected" language parsers, which themselves may inject other languages, recursively.
 ---
 ---@param source (integer|string) Buffer or text string to parse
----@param lang string Root language of this tree
+---@param lang string|nil Root language of this tree
 ---@param opts (table|nil) Optional arguments:
 ---             - injections table Map of language to injection query strings. Overrides the
 ---                                built-in runtime file searching for language injections.
@@ -86,11 +86,6 @@ function LanguageTree.new(source, lang, opts)
   ---@type LanguageTreeOpts
   opts = opts or {}
 
-  if opts.queries then
-    a.nvim_err_writeln("'queries' is no longer supported. Use 'injections' now")
-    opts.injections = opts.queries
-  end
-
   local injections = opts.injections or {}
   local self = setmetatable({
     _source = source,
-- 
cgit 


From 226a6c3eaef2a7220841d3d5e69e1baf543b3d6f Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 30 Mar 2023 14:49:58 +0100
Subject: feat(diagnostic): add support for tags

The LSP spec supports two tags that can be added to diagnostics:
unnecessary and deprecated. Extend vim.diagnostic to be able to handle
these.
---
 runtime/doc/lsp.txt                |  3 ++-
 runtime/doc/news.txt               |  3 +++
 runtime/lua/vim/diagnostic.lua     | 12 +++++++++
 runtime/lua/vim/lsp/diagnostic.lua | 54 +++++++++++++++++++++++++++++---------
 runtime/lua/vim/lsp/protocol.lua   |  2 ++
 runtime/lua/vim/lsp/types.lua      | 17 ++++++++++++
 6 files changed, 78 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 0164b34efb..f5695669ae 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1113,7 +1113,8 @@ code_action({options})                             *vim.lsp.buf.code_action()*
       • {options}  (table|nil) Optional table which holds the following
                    optional fields:
                    • context: (table|nil) Corresponds to `CodeActionContext` of the LSP specification:
-                     • diagnostics (table|nil): LSP`Diagnostic[]` . Inferred from the current position if not provided.
+                     • diagnostics (table|nil): LSP `Diagnostic[]`. Inferred
+                       from the current position if not provided.
                      • only (table|nil): List of LSP `CodeActionKind`s used to
                        filter the code actions. Most language servers support
                        values like `refactor` or `quickfix`.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 890a033268..401719b432 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -226,6 +226,9 @@ The following new APIs or features were added.
 
 • Added |nvim_get_hl()| for getting highlight group definitions in a format compatible with |nvim_set_hl()|.
 
+• |vim.diagnostic| now supports LSP DiagnosticsTag.
+  See: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnosticTag
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
 
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 56532d0184..714038f8e4 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -483,6 +483,7 @@ local function next_diagnostic(position, search_forward, bufnr, opts, namespace)
   local diagnostics =
     get_diagnostics(bufnr, vim.tbl_extend('keep', opts, { namespace = namespace }), true)
   local line_diagnostics = diagnostic_lines(diagnostics)
+
   for i = 0, line_count do
     local offset = i * (search_forward and 1 or -1)
     local lnum = position[1] + offset
@@ -752,6 +753,7 @@ end
 ---@field message string
 ---@field source nil|string
 ---@field code nil|string
+---@field _tags { deprecated: boolean, unnecessary: boolean}
 ---@field user_data nil|any arbitrary data plugins can add
 
 --- Get current diagnostics.
@@ -948,6 +950,16 @@ M.handlers.underline = {
         higroup = underline_highlight_map.Error
       end
 
+      if diagnostic._tags then
+        -- TODO(lewis6991): we should be able to stack these.
+        if diagnostic._tags.unnecessary then
+          higroup = 'DiagnosticUnnecessary'
+        end
+        if diagnostic._tags.deprecated then
+          higroup = 'DiagnosticDeprecated'
+        end
+      end
+
       vim.highlight.range(
         bufnr,
         underline_ns,
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index b27bf6e425..dcc8f6549c 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -1,13 +1,6 @@
 ---@brief lsp-diagnostic
----
----@class Diagnostic
----@field range Range
----@field message string
----@field severity DiagnosticSeverity|nil
----@field code integer | string
----@field source string
----@field tags DiagnosticTag[]
----@field relatedInformation DiagnosticRelatedInformation[]
+
+local protocol = require('vim.lsp.protocol')
 
 local M = {}
 
@@ -22,14 +15,16 @@ local function get_client_id(client_id)
 end
 
 ---@private
+---@param severity lsp.DiagnosticSeverity
 local function severity_lsp_to_vim(severity)
   if type(severity) == 'string' then
-    severity = vim.lsp.protocol.DiagnosticSeverity[severity]
+    severity = protocol.DiagnosticSeverity[severity]
   end
   return severity
 end
 
 ---@private
+---@return lsp.DiagnosticSeverity
 local function severity_vim_to_lsp(severity)
   if type(severity) == 'string' then
     severity = vim.diagnostic.severity[severity]
@@ -38,6 +33,7 @@ local function severity_vim_to_lsp(severity)
 end
 
 ---@private
+---@return integer
 local function line_byte_from_position(lines, lnum, col, offset_encoding)
   if not lines or offset_encoding == 'utf-8' then
     return col
@@ -77,12 +73,41 @@ local function get_buf_lines(bufnr)
   return lines
 end
 
+--- @private
+--- @param diagnostic lsp.Diagnostic
+--- @param client_id integer
+--- @return table?
+local function tags_lsp_to_vim(diagnostic, client_id)
+  local tags ---@type table?
+  for _, tag in ipairs(diagnostic.tags or {}) do
+    if tag == protocol.DiagnosticTag.Unnecessary then
+      tags = tags or {}
+      tags.unnecessary = true
+    elseif tag == protocol.DiagnosticTag.Deprecated then
+      tags = tags or {}
+      tags.deprecated = true
+    else
+      vim.notify_once(
+        string.format('Unknown DiagnosticTag %d from LSP client %d', tag, client_id),
+        vim.log.levels.WARN
+      )
+    end
+  end
+  return tags
+end
+
 ---@private
+---@param diagnostics lsp.Diagnostic[]
+---@param bufnr integer
+---@param client_id integer
+---@return Diagnostic[]
 local function diagnostic_lsp_to_vim(diagnostics, bufnr, client_id)
   local buf_lines = get_buf_lines(bufnr)
   local client = vim.lsp.get_client_by_id(client_id)
   local offset_encoding = client and client.offset_encoding or 'utf-16'
+  ---@diagnostic disable-next-line:no-unknown
   return vim.tbl_map(function(diagnostic)
+    ---@cast diagnostic lsp.Diagnostic
     local start = diagnostic.range.start
     local _end = diagnostic.range['end']
     return {
@@ -94,12 +119,12 @@ local function diagnostic_lsp_to_vim(diagnostics, bufnr, client_id)
       message = diagnostic.message,
       source = diagnostic.source,
       code = diagnostic.code,
+      tags = tags_lsp_to_vim(diagnostic, client_id),
       user_data = {
         lsp = {
           -- usage of user_data.lsp.code is deprecated in favor of the top-level code field
           code = diagnostic.code,
           codeDescription = diagnostic.codeDescription,
-          tags = diagnostic.tags,
           relatedInformation = diagnostic.relatedInformation,
           data = diagnostic.data,
         },
@@ -108,9 +133,13 @@ local function diagnostic_lsp_to_vim(diagnostics, bufnr, client_id)
   end, diagnostics)
 end
 
----@private
+--- @private
+--- @param diagnostics Diagnostic[]
+--- @return lsp.Diagnostic[]
 local function diagnostic_vim_to_lsp(diagnostics)
+  ---@diagnostic disable-next-line:no-unknown
   return vim.tbl_map(function(diagnostic)
+    ---@cast diagnostic Diagnostic
     return vim.tbl_extend('keep', {
       -- "keep" the below fields over any duplicate fields in diagnostic.user_data.lsp
       range = {
@@ -131,6 +160,7 @@ local function diagnostic_vim_to_lsp(diagnostics)
   end, diagnostics)
 end
 
+---@type table<integer,integer>
 local _client_namespaces = {}
 
 --- Get the diagnostic namespace associated with an LSP client |vim.diagnostic|.
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 1686e22c48..f4489ad17d 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -21,6 +21,7 @@ end
 --]=]
 
 local constants = {
+  --- @enum lsp.DiagnosticSeverity
   DiagnosticSeverity = {
     -- Reports an error.
     Error = 1,
@@ -32,6 +33,7 @@ local constants = {
     Hint = 4,
   },
 
+  --- @enum lsp.DiagnosticTag
   DiagnosticTag = {
     -- Unused or unnecessary code
     Unnecessary = 1,
diff --git a/runtime/lua/vim/lsp/types.lua b/runtime/lua/vim/lsp/types.lua
index 1aea6841ee..779f313aa7 100644
--- a/runtime/lua/vim/lsp/types.lua
+++ b/runtime/lua/vim/lsp/types.lua
@@ -18,3 +18,20 @@
 ---@class lsp.FileEvent
 ---@field uri string
 ---@field type lsp.FileChangeType
+
+---@class lsp.Position
+---@field line integer
+---@field character integer
+
+---@class lsp.Range
+---@field start lsp.Position
+---@field end lsp.Position
+
+---@class lsp.Diagnostic
+---@field range lsp.Range
+---@field message string
+---@field severity? lsp.DiagnosticSeverity
+---@field code integer | string
+---@field source string
+---@field tags? lsp.DiagnosticTag[]
+---@field relatedInformation DiagnosticRelatedInformation[]
-- 
cgit 


From 4cff3aceeac2027d82080649ff1c8be9ffa87b90 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 31 Mar 2023 09:43:13 +0100
Subject: fix(loader): disable profiling by default

---
 runtime/lua/vim/loader.lua | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 7b6b9cb563..7ac7f44338 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -438,21 +438,27 @@ function Loader.track(stat, f)
   end
 end
 
-Loader.get_rtp = Loader.track('get_rtp', Loader.get_rtp)
-Loader.read = Loader.track('read', Loader.read)
-Loader.loader = Loader.track('loader', Loader.loader)
-Loader.loader_lib = Loader.track('loader_lib', Loader.loader_lib)
-Loader.loadfile = Loader.track('loadfile', Loader.loadfile)
-Loader.load = Loader.track('load', Loader.load)
-M.find = Loader.track('find', M.find)
-Loader.lsmod = Loader.track('lsmod', Loader.lsmod)
+---@class ProfileOpts
+---@field loaders? boolean Add profiling to the loaders
 
 --- Debug function that wrapps all loaders and tracks stats
 ---@private
-function M._profile_loaders()
-  for l, loader in pairs(loaders) do
-    local loc = debug.getinfo(loader, 'Sn').source:sub(2)
-    loaders[l] = Loader.track('loader ' .. l .. ': ' .. loc, loader)
+---@param opts ProfileOpts?
+function M._profile(opts)
+  Loader.get_rtp = Loader.track('get_rtp', Loader.get_rtp)
+  Loader.read = Loader.track('read', Loader.read)
+  Loader.loader = Loader.track('loader', Loader.loader)
+  Loader.loader_lib = Loader.track('loader_lib', Loader.loader_lib)
+  Loader.loadfile = Loader.track('loadfile', Loader.loadfile)
+  Loader.load = Loader.track('load', Loader.load)
+  M.find = Loader.track('find', M.find)
+  Loader.lsmod = Loader.track('lsmod', Loader.lsmod)
+
+  if opts and opts.loaders then
+    for l, loader in pairs(loaders) do
+      local loc = debug.getinfo(loader, 'Sn').source:sub(2)
+      loaders[l] = Loader.track('loader ' .. l .. ': ' .. loc, loader)
+    end
   end
 end
 
-- 
cgit 


From ed10e4ef60c63d924b9969abdf77adaad506b676 Mon Sep 17 00:00:00 2001
From: Akin <22454918+akinsho@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:23:19 +0100
Subject: fix(diagnostic): use correct field name for tags (#22835)

LSP tags are added to the diagnostic as "tags" but referred to as "_tags"
in the diagnostic underline handler
---
 runtime/lua/vim/lsp/diagnostic.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index dcc8f6549c..3efa5c51ff 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -119,7 +119,7 @@ local function diagnostic_lsp_to_vim(diagnostics, bufnr, client_id)
       message = diagnostic.message,
       source = diagnostic.source,
       code = diagnostic.code,
-      tags = tags_lsp_to_vim(diagnostic, client_id),
+      _tags = tags_lsp_to_vim(diagnostic, client_id),
       user_data = {
         lsp = {
           -- usage of user_data.lsp.code is deprecated in favor of the top-level code field
-- 
cgit 


From b34097fe6d2ea5c84bcec65a834a430d9f58eb64 Mon Sep 17 00:00:00 2001
From: "Sindre T. Strøm" <sindrets@gmail.com>
Date: Fri, 31 Mar 2023 12:52:53 +0200
Subject: fix(api): return both link and attributes with nvim_get_hl (#22824)

Problem: No way to get the actual highlight attributes for a linked
group through |nvim_get_hl()| (not the attributes from the link target).
Solution: Return the actual attributes as well as the link target name.
---
 runtime/doc/api.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index b51da8d56f..844bf772f1 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -941,6 +941,10 @@ nvim_get_hl({ns_id}, {*opts})                                  *nvim_get_hl()*
         map as in |nvim_set_hl()|, or only a single highlight definition map
         if requested by name or id.
 
+    Note:
+        When the `link` attribute is defined in the highlight definition map,
+        other attributes will not be taking effect (see |:hi-link|).
+
 nvim_get_hl_id_by_name({name})                      *nvim_get_hl_id_by_name()*
     Gets a highlight group by name
 
@@ -1388,6 +1392,10 @@ nvim_set_hl({ns_id}, {name}, {*val})                           *nvim_set_hl()*
         values of the Normal group. If the Normal group has not been defined,
         using these values results in an error.
 
+    Note:
+        If `link` is used in combination with other attributes; only the
+        `link` will take effect (see |:hi-link|).
+
     Parameters: ~
       • {ns_id}  Namespace id for this highlight |nvim_create_namespace()|.
                  Use 0 to set a highlight group globally |:highlight|.
-- 
cgit 


From 83bfd94d1df5eecb8e4069a227c7d24598636d63 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 31 Mar 2023 13:05:22 +0100
Subject: refactor(loader): cache hash information

Whenever we run fs_stat() on a path, save this information in the loader
so it can be re-used.

- Loader.loadfile: Remove arguments `hash` as it is no longer needed.

- Loader.loader: Use _G.loadstring instead of Loader.load
  This allows plugins to wrap loadstring to inspection and profiling

- factor out read file logic
---
 runtime/doc/lua.txt        |  2 +-
 runtime/lua/vim/loader.lua | 62 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 33833fa83e..14f2ba2b04 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2065,7 +2065,7 @@ find({modname}, {opts})                                    *vim.loader.find()*
           for `modname="*"`
 
 reset({path})                                             *vim.loader.reset()*
-    Resets the topmods cache for the path, or all the paths if path is nil.
+    Resets the cache for the path, or all the paths if path is nil.
 
     Parameters: ~
       • {path}  string? path to reset
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 7ac7f44338..201de18497 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -5,7 +5,7 @@ local loaders = package.loaders
 
 local M = {}
 
----@alias CacheHash {mtime: {sec:number, nsec:number}, size:number}
+---@alias CacheHash {mtime: {sec:number, nsec:number}, size:number, type: string}
 ---@alias CacheEntry {hash:CacheHash, chunk:string}
 
 ---@class ModuleFindOpts
@@ -32,6 +32,8 @@ local Loader = {
   VERSION = 3,
   ---@type table<string, table<string,ModuleInfo>>
   _indexed = {},
+  ---@type table<string, CacheHash>
+  _hashes = {},
   ---@type table<string, string[]>
   _topmods = {},
   _loadfile = loadfile,
@@ -41,6 +43,18 @@ local Loader = {
   },
 }
 
+--- @param path string
+--- @return uv.fs_stat.result
+--- @private
+function Loader.get_hash(path)
+  if not Loader._hashes[path] then
+    -- Note we must never save a stat for a non-existent path.
+    -- For non-existent paths fs_stat() will return nil.
+    Loader._hashes[path] = uv.fs_stat(path)
+  end
+  return Loader._hashes[path]
+end
+
 ---@private
 local function normalize(path)
   return vim.fs.normalize(path, { expand_env = false })
@@ -102,18 +116,28 @@ function Loader.write(name, entry)
   uv.fs_close(f)
 end
 
+--- @param path string
+--- @param mode integer
+--- @return string? data
+--- @private
+local function readfile(path, mode)
+  local f = uv.fs_open(path, 'r', mode)
+  if f then
+    local hash = assert(uv.fs_fstat(f))
+    local data = uv.fs_read(f, hash.size, 0) --[[@as string?]]
+    uv.fs_close(f)
+    return data
+  end
+end
+
 --- Loads the cache entry for a given module or file
 ---@param name string module name or filename
 ---@return CacheEntry?
 ---@private
 function Loader.read(name)
   local cname = Loader.cache_file(name)
-  local f = uv.fs_open(cname, 'r', 438)
-  if f then
-    local hash = uv.fs_fstat(f) --[[@as CacheHash]]
-    local data = uv.fs_read(f, hash.size, 0) --[[@as string]]
-    uv.fs_close(f)
-
+  local data = readfile(cname, 438)
+  if data then
     local zero = data:find('\0', 1, true)
     if not zero then
       return
@@ -141,7 +165,9 @@ end
 function Loader.loader(modname)
   local ret = M.find(modname)[1]
   if ret then
-    local chunk, err = Loader.load(ret.modpath, { hash = ret.stat })
+    -- Make sure to call the global loadfile so we respect any augmentations done elsewhere.
+    -- E.g. profiling
+    local chunk, err = loadfile(ret.modpath)
     return chunk or error(err)
   end
   return '\ncache_loader: module ' .. modname .. ' not found'
@@ -171,17 +197,17 @@ function Loader.loader_lib(modname)
 end
 
 --- `loadfile` using the cache
+--- Note this has the mode and env arguments which is supported by LuaJIT and is 5.1 compatible.
 ---@param filename? string
 ---@param mode? "b"|"t"|"bt"
 ---@param env? table
----@param hash? CacheHash
 ---@return function?, string?  error_message
 ---@private
 -- luacheck: ignore 312
-function Loader.loadfile(filename, mode, env, hash)
+function Loader.loadfile(filename, mode, env)
   -- ignore mode, since we byte-compile the lua source files
   mode = nil
-  return Loader.load(normalize(filename), { mode = mode, env = env, hash = hash })
+  return Loader.load(normalize(filename), { mode = mode, env = env })
 end
 
 --- Checks whether two cache hashes are the same based on:
@@ -201,8 +227,7 @@ end
 
 --- Loads the given module path using the cache
 ---@param modpath string
----@param opts? {hash?: CacheHash, mode?: "b"|"t"|"bt", env?:table} (table|nil) Options for loading the module:
----    - hash: (table) the hash of the file to load if it is already known. (defaults to `vim.loop.fs_stat({modpath})`)
+---@param opts? {mode?: "b"|"t"|"bt", env?:table} (table|nil) Options for loading the module:
 ---    - mode: (string) the mode to load the module with. "b"|"t"|"bt" (defaults to `nil`)
 ---    - env: (table) the environment to load the module in. (defaults to `nil`)
 ---@see |luaL_loadfile()|
@@ -210,7 +235,7 @@ end
 ---@private
 function Loader.load(modpath, opts)
   opts = opts or {}
-  local hash = opts.hash or uv.fs_stat(modpath)
+  local hash = Loader.get_hash(modpath)
   ---@type function?, string?
   local chunk, err
 
@@ -301,7 +326,7 @@ function M.find(modname, opts)
         for _, pattern in ipairs(patterns) do
           local modpath = path .. pattern
           Loader._stats.find.stat = (Loader._stats.find.stat or 0) + 1
-          local hash = uv.fs_stat(modpath)
+          local hash = Loader.get_hash(modpath)
           if hash then
             results[#results + 1] = { modpath = modpath, stat = hash, modname = modname }
             if not continue() then
@@ -337,7 +362,7 @@ function M.find(modname, opts)
   return results
 end
 
---- Resets the topmods cache for the path, or all the paths
+--- Resets the cache for the path, or all the paths
 --- if path is nil.
 ---@param path string? path to reset
 function M.reset(path)
@@ -346,6 +371,9 @@ function M.reset(path)
   else
     Loader._indexed = {}
   end
+
+  -- Path could be a directory so just clear all the hashes.
+  Loader._hashes = {}
 end
 
 --- Enables the experimental Lua module loader:
@@ -399,7 +427,7 @@ function Loader.lsmod(path)
     for name, t in vim.fs.dir(path .. '/lua') do
       local modpath = path .. '/lua/' .. name
       -- HACK: type is not always returned due to a bug in luv
-      t = t or uv.fs_stat(modpath).type
+      t = t or Loader.get_hash(modpath).type
       ---@type string
       local topname
       local ext = name:sub(-4)
-- 
cgit 


From 90fdaf55c913d07bc80eec6442b02d8c001659b4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Apr 2023 12:11:24 +0200
Subject: fix(tests): adapt treesitter/highlight_spec priority test

Still relied on the old `@Foo`->`Foo` capture to highlight mechanism;
use capture with default highlight instead.
---
 runtime/doc/treesitter.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 96021d6272..51098b9220 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -440,7 +440,7 @@ higher than tree-sitter. It is also possible to change the priority of an
 individual query pattern manually by setting its `"priority"` metadata
 attribute: >
 
-    (super_important_node) @ImportantHighlight (#set! "priority" 105)
+    ((super_important_node) @superimportant (#set! "priority" 105))
 
 ==============================================================================
 TREESITTER LANGUAGE INJECTIONS                *treesitter-language-injections*
-- 
cgit 


From 2a298f2e48eb081f2e3b58068af589b82fe76a18 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 31 Mar 2023 16:11:17 +0200
Subject: fix(treesitter): update queries from nvim-treesitter

remove self-injection for C preprocessor macros (can be very slow)
---
 runtime/queries/c/highlights.scm   | 115 ++++++++++++++++++++++++-------------
 runtime/queries/c/injections.scm   |   4 +-
 runtime/queries/lua/highlights.scm |  43 +++++++++-----
 runtime/queries/lua/injections.scm |  12 ++--
 runtime/queries/vim/highlights.scm |   2 +-
 5 files changed, 112 insertions(+), 64 deletions(-)

(limited to 'runtime')

diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index 33e6df74ab..dee70f9cc7 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -1,22 +1,19 @@
-(identifier) @variable
+; Lower priority to prefer @parameter when identifier appears in parameter_declaration.
+((identifier) @variable (#set! "priority" 95))
 
 [
-  "const"
   "default"
   "enum"
-  "extern"
-  "inline"
-  "return"
-  "sizeof"
-  "static"
   "struct"
   "typedef"
   "union"
-  "volatile"
   "goto"
-  "register"
 ] @keyword
 
+"sizeof" @keyword.operator
+
+"return" @keyword.return
+
 [
   "while"
   "for"
@@ -32,7 +29,6 @@
  "switch"
 ] @conditional
 
-"#define" @constant.macro
 [
   "#if"
   "#ifdef"
@@ -41,10 +37,18 @@
   "#elif"
   "#endif"
   (preproc_directive)
-] @keyword
+] @preproc
+
+"#define" @define
 
 "#include" @include
 
+[ ";" ":" "," ] @punctuation.delimiter
+
+"..." @punctuation.special
+
+[ "(" ")" "[" "]" "{" "}"] @punctuation.bracket
+
 [
   "="
 
@@ -62,6 +66,7 @@
   ">>"
 
   "->"
+  "."
 
   "<"
   "<="
@@ -88,35 +93,25 @@
   "++"
 ] @operator
 
+;; Make sure the comma operator is given a highlight group after the comma
+;; punctuator so the operator is highlighted properly.
+(comma_expression [ "," ] @operator)
+
 [
  (true)
  (false)
 ] @boolean
 
-[ "." ";" ":" "," ] @punctuation.delimiter
-
-(conditional_expression [ "?" ":" ] @conditional)
-
-
-[ "(" ")" "[" "]" "{" "}"] @punctuation.bracket
+(conditional_expression [ "?" ":" ] @conditional.ternary)
 
 (string_literal) @string
-(string_literal) @spell
 (system_lib_string) @string
+(escape_sequence) @string.escape
 
 (null) @constant.builtin
 (number_literal) @number
-(char_literal) @number
+(char_literal) @character
 
-(call_expression
-  function: (identifier) @function)
-(call_expression
-  function: (field_expression
-    field: (field_identifier) @function))
-(function_declarator
-  declarator: (identifier) @function)
-(preproc_function_def
-  name: (identifier) @function.macro)
 [
  (preproc_arg)
  (preproc_defined)
@@ -126,18 +121,32 @@
 (statement_identifier) @label
 
 [
-(type_identifier)
-(primitive_type)
-(sized_type_specifier)
-(type_descriptor)
- ] @type
+ (type_identifier)
+ (sized_type_specifier)
+ (type_descriptor)
+] @type
+
+(storage_class_specifier) @storageclass
+
+(type_qualifier) @type.qualifier
+
+(linkage_specification
+  "extern" @storageclass)
 
-(declaration (type_qualifier) @type)
-(cast_expression type: (type_descriptor) @type)
-(sizeof_expression value: (parenthesized_expression (identifier) @type))
+(type_definition
+  declarator: (type_identifier) @type.definition)
+
+(primitive_type) @type.builtin
 
 ((identifier) @constant
- (#match? @constant "^[A-Z][A-Z0-9_]+$"))
+ (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
+(enumerator
+  name: (identifier) @constant)
+(case_statement
+  value: (identifier) @constant)
+
+((identifier) @constant.builtin
+    (#any-of? @constant.builtin "stderr" "stdin" "stdout"))
 
 ;; Preproc def / undef
 (preproc_def
@@ -147,9 +156,20 @@
   argument: (_) @constant
   (#eq? @_u "#undef"))
 
+(call_expression
+  function: (identifier) @function.call)
+(call_expression
+  function: (field_expression
+    field: (field_identifier) @function.call))
+(function_declarator
+  declarator: (identifier) @function)
+(preproc_function_def
+  name: (identifier) @function.macro)
+
+(comment) @comment @spell
 
-(comment) @comment
-(comment) @spell
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
 
 ;; Parameters
 (parameter_declaration
@@ -158,7 +178,20 @@
 (parameter_declaration
   declarator: (pointer_declarator) @parameter)
 
-(preproc_params
-  (identifier)) @parameter
+(preproc_params (identifier) @parameter)
+
+[
+  "__attribute__"
+  "__cdecl"
+  "__clrcall"
+  "__stdcall"
+  "__fastcall"
+  "__thiscall"
+  "__vectorcall"
+  "_unaligned"
+  "__unaligned"
+  "__declspec"
+  (attribute_declaration)
+] @attribute
 
 (ERROR) @error
diff --git a/runtime/queries/c/injections.scm b/runtime/queries/c/injections.scm
index 84ae33683e..3b99c7a444 100644
--- a/runtime/queries/c/injections.scm
+++ b/runtime/queries/c/injections.scm
@@ -1,5 +1,5 @@
-((preproc_arg) @injection.content
- (#set! injection.language "c"))
+; ((preproc_arg) @injection.content
+;  (#set! injection.language "c"))
 
 ; ((comment) @injection.content
 ;  (#set! injection.language "comment"))
diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 2c0dc5447a..5fbf8a1833 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -8,8 +8,6 @@
  "local"
 ] @keyword
 
-(label_statement) @label
-
 (break_statement) @keyword
 
 (do_statement
@@ -109,6 +107,7 @@
 [
   ";"
   ":"
+  "::"
   ","
   "."
 ] @punctuation.delimiter
@@ -129,12 +128,21 @@
 (identifier) @variable
 
 ((identifier) @variable.builtin
- (#eq? @variable.builtin "self"))
+ (#any-of? @variable.builtin "_G" "_VERSION" "debug" "io" "jit" "math" "os" "package" "self" "string" "table" "utf8"))
+
+((identifier) @keyword.coroutine
+  (#eq? @keyword.coroutine "coroutine"))
 
 (variable_list
-  attribute: (attribute
-    (["<" ">"] @punctuation.bracket
-     (identifier) @attribute)))
+   attribute: (attribute
+     (["<" ">"] @punctuation.bracket
+      (identifier) @attribute)))
+
+;; Labels
+
+(label_statement (identifier) @label)
+
+(goto_statement (identifier) @label)
 
 ;; Constants
 
@@ -172,7 +180,7 @@
 (function_call name: (dot_index_expression field: (identifier) @function.call))
 (function_declaration name: (dot_index_expression field: (identifier) @function))
 
-(method_index_expression method: (identifier) @method)
+(method_index_expression method: (identifier) @method.call)
 
 (function_call
   (identifier) @function.builtin
@@ -180,20 +188,27 @@
     ;; built-in functions in Lua 5.1
     "assert" "collectgarbage" "dofile" "error" "getfenv" "getmetatable" "ipairs"
     "load" "loadfile" "loadstring" "module" "next" "pairs" "pcall" "print"
-    "rawequal" "rawget" "rawset" "require" "select" "setfenv" "setmetatable"
-    "tonumber" "tostring" "type" "unpack" "xpcall"))
+    "rawequal" "rawget" "rawlen" "rawset" "require" "select" "setfenv" "setmetatable"
+    "tonumber" "tostring" "type" "unpack" "xpcall"
+    "__add" "__band" "__bnot" "__bor" "__bxor" "__call" "__concat" "__div" "__eq" "__gc"
+    "__idiv" "__index" "__le" "__len" "__lt" "__metatable" "__mod" "__mul" "__name" "__newindex"
+    "__pairs" "__pow" "__shl" "__shr" "__sub" "__tostring" "__unm"))
 
 ;; Others
 
-(comment) @comment
-(comment) @spell
+(comment) @comment @spell
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[-][-][-]"))
+
+((comment) @comment.documentation
+  (#lua-match? @comment.documentation "^[-][-](%s?)@"))
 
-(hash_bang_line) @comment
+(hash_bang_line) @preproc
 
 (number) @number
 
-(string) @string
-(string) @spell
+(string) @string @spell
 
 ;; Error
 (ERROR) @error
diff --git a/runtime/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
index 10eb4c4054..1c7bdaf951 100644
--- a/runtime/queries/lua/injections.scm
+++ b/runtime/queries/lua/injections.scm
@@ -11,18 +11,18 @@
   name: (_) @_vimcmd_identifier
   arguments: (arguments (string content: _ @injection.content)))
   (#set! injection.language "vim")
-  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec" "vim.api.nvim_cmd"))
+  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec2" "vim.api.nvim_cmd"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
   arguments: (arguments (string content: _ @injection.content) .))
   (#set! injection.language "query")
-  (#eq? @_vimcmd_identifier "vim.treesitter.query.set_query"))
+  (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse"))
 
-; ;; highlight string as query if starts with `;; query`
-; ((string ("string_content") @injection.content)
-;  (#set! injection.language "query")
-;  (#lua-match? @injection.content "^%s*;+%s?query"))
+;; highlight string as query if starts with `;; query`
+((string ("string_content") @injection.content)
+ (#set! injection.language "query")
+ (#lua-match? @injection.content "^%s*;+%s?query"))
 
 ; ((comment) @injection.content
 ;  (#set! injection.language "comment"))
diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm
index 239b0a0b37..ce25b13b9f 100644
--- a/runtime/queries/vim/highlights.scm
+++ b/runtime/queries/vim/highlights.scm
@@ -271,7 +271,7 @@
   ":"
 ] @punctuation.delimiter
 
-(ternary_expression ["?" ":"] @conditional)
+(ternary_expression ["?" ":"] @conditional.ternary)
 
 ; Options
 ((set_value) @number
-- 
cgit 


From 2a10f64e254375e77e1c5a6aeae3cd65cd122afb Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 25 Mar 2023 02:24:24 +0100
Subject: feat(extmarks): extend nvim_buf_get_extmarks()

Problem:    Can not get all extmarks in a buffer. Properties are missing
            from the details array.
Solution:   Allow getting all extmarks in a buffer by supplying a -1
            "ns_id". Add missing properties to the details array.
---
 runtime/doc/api.txt  | 11 +++++++++--
 runtime/doc/news.txt |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index ea57db22e0..cc887ad024 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2527,6 +2527,8 @@ nvim_buf_get_extmark_by_id({buffer}, {ns_id}, {id}, {opts})
       • {id}      Extmark id
       • {opts}    Optional parameters. Keys:
                   • details: Whether to include the details dict
+                  • hl_name: Whether to include highlight group name instead
+                    of id, true if omitted
 
     Return: ~
         0-indexed (row, col) tuple or empty list () if extmark id was absent
@@ -2563,7 +2565,8 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {opts})
 
     Parameters: ~
       • {buffer}  Buffer handle, or 0 for current buffer
-      • {ns_id}   Namespace id from |nvim_create_namespace()|
+      • {ns_id}   Namespace id from |nvim_create_namespace()| or -1 for all
+                  namespaces
       • {start}   Start of range: a 0-indexed (row, col) or valid extmark id
                   (whose position defines the bound). |api-indexing|
       • {end}     End of range (inclusive): a 0-indexed (row, col) or valid
@@ -2571,7 +2574,11 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {opts})
                   |api-indexing|
       • {opts}    Optional parameters. Keys:
                   • limit: Maximum number of marks to return
-                  • details Whether to include the details dict
+                  • details: Whether to include the details dict
+                  • hl_name: Whether to include highlight group name instead
+                    of id, true if omitted
+                  • type: Filter marks by type: "highlight", "sign",
+                    "virt_text" and "virt_lines"
 
     Return: ~
         List of [extmark_id, row, col] tuples in "traversal order".
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 890a033268..7efb0ab36f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -67,6 +67,11 @@ NEW FEATURES                                                    *news-features*
 
 The following new APIs or features were added.
 
+• |nvim_buf_get_extmarks()| now accepts a -1 `ns_id` to request extmarks from
+  all namespaces and adds the namespace id to the details array.
+  Other missing properties have been added to the details array and marks can
+  be filtered by type.
+
 • Added a new experimental |lua-loader| that byte-compiles and caches lua files.
   To enable the new loader, add the following at the top of your |init.lua|: >lua
     vim.loader.enable()
-- 
cgit 


From d7f7450017b9b05303698a6cda54303ef22c63b3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 31 Mar 2023 17:09:00 +0200
Subject: refactor(treesitter)!: rename help parser to vimdoc

---
 runtime/doc/news.txt                    |  4 ++++
 runtime/lua/vim/treesitter/language.lua |  4 +++-
 runtime/queries/help/highlights.scm     | 25 -------------------------
 runtime/queries/help/injections.scm     |  4 ----
 runtime/queries/vimdoc/highlights.scm   | 25 +++++++++++++++++++++++++
 runtime/queries/vimdoc/injections.scm   |  4 ++++
 6 files changed, 36 insertions(+), 30 deletions(-)
 delete mode 100644 runtime/queries/help/highlights.scm
 delete mode 100644 runtime/queries/help/injections.scm
 create mode 100644 runtime/queries/vimdoc/highlights.scm
 create mode 100644 runtime/queries/vimdoc/injections.scm

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 401719b432..671bdee31b 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -62,6 +62,10 @@ The following changes may require adaptations in user config or plugins.
 
 • |nvim_exec()| is now deprecated in favor of |nvim_exec2()|.
 
+• `help` treesitter parser was renamed to `vimdoc`. The only user-visible
+  change is that language-specific highlight groups need to be renamed from
+  `@foo.help` to `@foo.vimdoc`.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index b1c788e6ba..5b74bb6200 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -4,7 +4,9 @@ local a = vim.api
 local M = {}
 
 ---@type table<string,string>
-local ft_to_lang = {}
+local ft_to_lang = {
+  help = 'vimdoc',
+}
 
 --- Get the filetypes associated with the parser named {lang}.
 --- @param lang string Name of parser
diff --git a/runtime/queries/help/highlights.scm b/runtime/queries/help/highlights.scm
deleted file mode 100644
index c0d88301bc..0000000000
--- a/runtime/queries/help/highlights.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-(h1) @text.title
-(h2) @text.title
-(h3) @text.title
-(column_heading) @text.title
-(column_heading
-   "~" @conceal (#set! conceal ""))
-(tag
-   "*" @conceal (#set! conceal "")
-   text: (_) @label)
-(taglink
-   "|" @conceal (#set! conceal "")
-   text: (_) @text.reference)
-(optionlink
-   text: (_) @text.reference)
-(codespan
-   "`" @conceal (#set! conceal "")
-   text: (_) @text.literal)
-(codeblock) @text.literal
-(codeblock
-   [">" (language)] @conceal (#set! conceal ""))
-(block
-   "<" @conceal (#set! conceal ""))
-(argument) @parameter
-(keycode) @string.special
-(url) @text.uri
diff --git a/runtime/queries/help/injections.scm b/runtime/queries/help/injections.scm
deleted file mode 100644
index 260a05d863..0000000000
--- a/runtime/queries/help/injections.scm
+++ /dev/null
@@ -1,4 +0,0 @@
-((codeblock
-  (language) @injection.language
-  (code) @injection.content)
- (#set! injection.include-children))
diff --git a/runtime/queries/vimdoc/highlights.scm b/runtime/queries/vimdoc/highlights.scm
new file mode 100644
index 0000000000..c0d88301bc
--- /dev/null
+++ b/runtime/queries/vimdoc/highlights.scm
@@ -0,0 +1,25 @@
+(h1) @text.title
+(h2) @text.title
+(h3) @text.title
+(column_heading) @text.title
+(column_heading
+   "~" @conceal (#set! conceal ""))
+(tag
+   "*" @conceal (#set! conceal "")
+   text: (_) @label)
+(taglink
+   "|" @conceal (#set! conceal "")
+   text: (_) @text.reference)
+(optionlink
+   text: (_) @text.reference)
+(codespan
+   "`" @conceal (#set! conceal "")
+   text: (_) @text.literal)
+(codeblock) @text.literal
+(codeblock
+   [">" (language)] @conceal (#set! conceal ""))
+(block
+   "<" @conceal (#set! conceal ""))
+(argument) @parameter
+(keycode) @string.special
+(url) @text.uri
diff --git a/runtime/queries/vimdoc/injections.scm b/runtime/queries/vimdoc/injections.scm
new file mode 100644
index 0000000000..260a05d863
--- /dev/null
+++ b/runtime/queries/vimdoc/injections.scm
@@ -0,0 +1,4 @@
+((codeblock
+  (language) @injection.language
+  (code) @injection.content)
+ (#set! injection.include-children))
-- 
cgit 


From 438c3419df00d6f943a1c932bb1d60ab15bd08e9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Apr 2023 12:29:38 +0200
Subject: docs(treesitter): add query injections

---
 runtime/doc/treesitter.txt | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 51098b9220..0298f5a9b1 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -195,7 +195,7 @@ treesitter queries from Lua.
 TREESITTER QUERY PREDICATES                            *treesitter-predicates*
 
 Predicates are special scheme nodes that are evaluated to conditionally capture
-nodes. For example, the `eq?` predicate can be used as follows: >
+nodes. For example, the `eq?` predicate can be used as follows: >query
 
     ((identifier) @foo (#eq? @foo "foo"))
 <
@@ -204,13 +204,13 @@ to only match identifier corresponding to the `"foo"` text.
 The following predicates are built in:
 
     `eq?`                                            *treesitter-predicate-eq?*
-        Match a string against the text corresponding to a node: >
+        Match a string against the text corresponding to a node: >query
             ((identifier) @foo (#eq? @foo "foo"))
             ((node1) @left (node2) @right (#eq? @left @right))
 <
     `match?`                                      *treesitter-predicate-match?*
     `vim-match?`                              *treesitter-predicate-vim-match?*
-         Match a |regexp| against the text corresponding to a node: >
+         Match a |regexp| against the text corresponding to a node: >query
             ((identifier) @constant (#match? @constant "^[A-Z_]+$"))
 <         Note: The `^` and `$` anchors will match the start and end of the
                node's text.
@@ -220,13 +220,14 @@ The following predicates are built in:
          similar to `match?`
 
     `contains?`                                *treesitter-predicate-contains?*
-        Match a string against parts of the text corresponding to a node: >
+        Match a string against parts of the text corresponding to a node:
+        >query
             ((identifier) @foo (#contains? @foo "foo"))
             ((identifier) @foo-bar (#contains? @foo-bar "foo" "bar"))
 <
     `any-of?`                                    *treesitter-predicate-any-of?*
         Match any of the given strings against the text corresponding to
-        a node: >
+        a node: >query
             ((identifier) @foo (#any-of? @foo "foo" "bar"))
 <
         This is the recommended way to check if the node matches one of many
@@ -243,7 +244,7 @@ Use |vim.treesitter.query.list_predicates()| to list all available predicates.
 TREESITTER QUERY DIRECTIVES                            *treesitter-directives*
 
 Treesitter directives store metadata for a node or match and perform side
-effects. For example, the `set!` directive sets metadata on the match or node: >
+effects. For example, the `set!` directive sets metadata on the match or node: >query
 
         ((identifier) @foo (#set! "type" "parameter"))
 <
@@ -259,7 +260,7 @@ The following directives are built in:
             {key}
             {value}
 
-        Examples: >
+        Examples: >query
             ((identifier) @foo (#set! @foo "kind" "parameter"))
             ((node1) @left (node2) @right (#set! "type" "pair"))
 <
@@ -275,7 +276,7 @@ The following directives are built in:
             {end_row}
             {end_col}
 
-        Example: >
+        Example: >query
             ((identifier) @constant (#offset! @constant 0 1 0 -1))
 <
 
@@ -304,7 +305,8 @@ currently supported modeline alternatives:
         a base depends on your 'runtimepath' value.
 
 Note: These modeline comments must be at the top of the query, but can be
-repeated, for example, the following two modeline blocks are both valid: >
+repeated, for example, the following two modeline blocks are both valid:
+>query
 
     ;; inherits: foo,bar
     ;; extends
@@ -318,13 +320,13 @@ TREESITTER SYNTAX HIGHLIGHTING                          *treesitter-highlight*
 
 Syntax highlighting is specified through queries named `highlights.scm`,
 which match a |TSNode| in the parsed |TSTree| to a `capture` that can be
-assigned a highlight group. For example, the query >
+assigned a highlight group. For example, the query >query
 
     (parameters (identifier) @parameter)
 <
 matches any `identifier` node inside a function `parameter` node (e.g., the
 `bar` in `foo(bar)`) to the capture named `@parameter`. It is also possible to
-match literal expressions (provided the parser returns them): >
+match literal expressions (provided the parser returns them): >query
 
     "return" @keyword.return
 <
@@ -409,7 +411,7 @@ The following captures are linked by default to standard |group-name|s:
                                                   *treesitter-highlight-spell*
 The special `@spell` capture can be used to indicate that a node should be
 spell checked by Nvim's builtin |spell| checker. For example, the following
-capture marks comments as to be checked: >
+capture marks comments as to be checked: >query
 
     (comment) @spell
 <
@@ -420,14 +422,14 @@ There is also `@nospell` which disables spellchecking regions with `@spell`.
 Treesitter highlighting supports |conceal| via the `conceal` metadata. By
 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: >
+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
 (ill-advised) query replaces the `!=` operator by a Unicode glyph, which is
-still highlighted the same as other operators: >
+still highlighted the same as other operators: >query
 
     "!=" @operator (#set! conceal "≠")
 <
@@ -438,9 +440,10 @@ 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
 higher than tree-sitter. It is also possible to change the priority of an
 individual query pattern manually by setting its `"priority"` metadata
-attribute: >
+attribute: >query
 
     ((super_important_node) @superimportant (#set! "priority" 105))
+<
 
 ==============================================================================
 TREESITTER LANGUAGE INJECTIONS                *treesitter-language-injections*
-- 
cgit 


From 6a4ebf894fa39bfb09695a129a3300cb99408542 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 1 Apr 2023 21:47:20 +0800
Subject: fix(health): stop using deprecated ts.language.inspect_language()
 (#22850)

---
 runtime/lua/vim/treesitter/health.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/health.lua b/runtime/lua/vim/treesitter/health.lua
index fd1188fde4..dabf2cdf6c 100644
--- a/runtime/lua/vim/treesitter/health.lua
+++ b/runtime/lua/vim/treesitter/health.lua
@@ -22,7 +22,7 @@ function M.check()
         )
       )
     else
-      local lang = ts.language.inspect_language(parsername)
+      local lang = ts.language.inspect(parsername)
       health.report_ok(
         string.format('Parser: %-10s ABI: %d, path: %s', parsername, lang._abi_version, parser)
       )
-- 
cgit 


From 643c0ed571f1ac6e83f73ab2593132901278b4da Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Sat, 1 Apr 2023 08:02:58 -0600
Subject: feat: allow function passed to defaulttable to take an argument
 (#22839)

Pass the value of the key being accessed to the create function, to
allow users to dynamically generate default values.
---
 runtime/doc/lua.txt        | 4 ++--
 runtime/lua/vim/shared.lua | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 14f2ba2b04..ebbf8bb463 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1635,8 +1635,8 @@ defaulttable({create})                                    *vim.defaulttable()*
 <
 
     Parameters: ~
-      • {create}  (function|nil) The function called to create a missing
-                  value.
+      • {create}  function?(key:any):any The function called to create a
+                  missing value.
 
     Return: ~
         (table) Empty table with metamethod
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 884929e33a..9e337e93e8 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -796,13 +796,15 @@ end
 --- a.b.c = 1
 --- </pre>
 ---
----@param create function|nil The function called to create a missing value.
+---@param create function?(key:any):any The function called to create a missing value.
 ---@return table Empty table with metamethod
 function vim.defaulttable(create)
-  create = create or vim.defaulttable
+  create = create or function(_)
+    return vim.defaulttable()
+  end
   return setmetatable({}, {
     __index = function(tbl, key)
-      rawset(tbl, key, create())
+      rawset(tbl, key, create(key))
       return rawget(tbl, key)
     end,
   })
-- 
cgit 


From 4720f0a66236551dd995a76d8b4e1157e4fbfa9c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 31 Mar 2023 09:45:25 +0200
Subject: docs(luvref): update to version bump

---
 runtime/doc/luvref.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 0fdd010880..799d0f6f74 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -91,7 +91,7 @@ used here to facilitate documenting consistent behavior:
   metamethod
 - `buffer`: a `string` or a sequential `table` of `string`s
 - `threadargs`: variable arguments (`...`) of type `nil`, `boolean`, `number`,
-  `string`, or `userdata`
+  `string`, or `userdata`; number of arguments limited to 9.
 
 ==============================================================================
 CONTENTS                                                          *luv-contents*
@@ -2576,7 +2576,7 @@ uv.fs_poll_start({fs_poll}, {path}, {interval}, {callback}) *uv.fs_poll_start()*
                 > method form `fs_poll:start(path, interval, callback)`
 
                 Parameters:
-                - `fs_event`: `uv_fs_event_t userdata`
+                - `fs_poll`: `uv_fs_poll_t userdata`
                 - `path`: `string`
                 - `interval`: `integer`
                 - `callback`: `callable`
@@ -3484,6 +3484,9 @@ uv.new_thread([{options}, ] {entry}, {...})                    *uv.new_thread()*
 
                 Returns: `luv_thread_t userdata` or `fail`
 
+                Note: unsafe, please make sure that the thread's end of life
+                is before Lua state is closed.
+
 uv.thread_equal({thread}, {other_thread})                    *uv.thread_equal()*
 
                 > method form `thread:equal(other_thread)`
-- 
cgit 


From c8a28b847e2b814b44fe77b46f7f4564ab59f0ac Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 1 Apr 2023 03:11:56 +0200
Subject: fix(ui): ruler is not redrawn in cmdline with redrawstatus

---
 runtime/doc/various.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 8244ae4230..7b0e724e31 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -32,7 +32,8 @@ CTRL-L			Clears and redraws the screen.  The redraw may happen
 						*:redraws* *:redrawstatus*
 :redraws[tatus][!]	Redraws the status line and window bar of the current
 			window, or all status lines and window bars if "!" is
-			included. Useful if 'statusline' or 'winbar' includes
+			included. Redraws the commandline instead if it contains
+			the 'ruler'. Useful if 'statusline' or 'winbar' includes
 			an item that doesn't cause automatic updating.
 
 						*:redrawt* *:redrawtabline*
-- 
cgit 


From 269dd747b6e61842856031ca14ac26ee884ede4c Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 2 Apr 2023 23:01:48 +0800
Subject: refactor(defaults)!: change default 'commentstring' value to empty
 (#22862)

---
 runtime/doc/news.txt           | 2 ++
 runtime/doc/options.txt        | 2 +-
 runtime/doc/vim_diff.txt       | 1 +
 runtime/ftplugin/c.lua         | 1 +
 runtime/ftplugin/calender.lua  | 1 +
 runtime/ftplugin/css.lua       | 1 +
 runtime/ftplugin/indent.lua    | 1 +
 runtime/ftplugin/xdefaults.lua | 1 +
 8 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 runtime/ftplugin/c.lua
 create mode 100644 runtime/ftplugin/calender.lua
 create mode 100644 runtime/ftplugin/css.lua
 create mode 100644 runtime/ftplugin/indent.lua
 create mode 100644 runtime/ftplugin/xdefaults.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 7b71b53b29..3ef6451ef9 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -66,6 +66,8 @@ The following changes may require adaptations in user config or plugins.
   change is that language-specific highlight groups need to be renamed from
   `@foo.help` to `@foo.vimdoc`.
 
+• The default value of 'commentstring' is now empty instead of "/*%s*/".
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 36c02fa3cb..096b334cda 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1390,7 +1390,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	insert a space.
 
 					*'commentstring'* *'cms'* *E537*
-'commentstring' 'cms'	string	(default "/*%s*/")
+'commentstring' 'cms'	string	(default "")
 			local to buffer
 	A template for a comment.  The "%s" in the value is replaced with the
 	comment text.  Currently only used to add markers for folding, see
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index cd93e4d17a..d6ad9107b3 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -34,6 +34,7 @@ Defaults					            *nvim-defaults*
 - 'backspace' defaults to "indent,eol,start"
 - 'backupdir' defaults to .,~/.local/state/nvim/backup// (|xdg|), auto-created
 - 'belloff' defaults to "all"
+- 'commentstring' defaults to ""
 - 'compatible' is always disabled
 - 'complete' excludes "i"
 - 'directory' defaults to ~/.local/state/nvim/swap// (|xdg|), auto-created
diff --git a/runtime/ftplugin/c.lua b/runtime/ftplugin/c.lua
new file mode 100644
index 0000000000..b4e68148f5
--- /dev/null
+++ b/runtime/ftplugin/c.lua
@@ -0,0 +1 @@
+vim.bo.commentstring = '/*%s*/'
diff --git a/runtime/ftplugin/calender.lua b/runtime/ftplugin/calender.lua
new file mode 100644
index 0000000000..b4e68148f5
--- /dev/null
+++ b/runtime/ftplugin/calender.lua
@@ -0,0 +1 @@
+vim.bo.commentstring = '/*%s*/'
diff --git a/runtime/ftplugin/css.lua b/runtime/ftplugin/css.lua
new file mode 100644
index 0000000000..b4e68148f5
--- /dev/null
+++ b/runtime/ftplugin/css.lua
@@ -0,0 +1 @@
+vim.bo.commentstring = '/*%s*/'
diff --git a/runtime/ftplugin/indent.lua b/runtime/ftplugin/indent.lua
new file mode 100644
index 0000000000..b4e68148f5
--- /dev/null
+++ b/runtime/ftplugin/indent.lua
@@ -0,0 +1 @@
+vim.bo.commentstring = '/*%s*/'
diff --git a/runtime/ftplugin/xdefaults.lua b/runtime/ftplugin/xdefaults.lua
new file mode 100644
index 0000000000..b4e68148f5
--- /dev/null
+++ b/runtime/ftplugin/xdefaults.lua
@@ -0,0 +1 @@
+vim.bo.commentstring = '/*%s*/'
-- 
cgit 


From a93024555720325ecede9d2d15e4bd0f1fd82739 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 25 Mar 2023 15:19:22 +0100
Subject: refactor(lua): get all marks instead of iterating over namespaces

Inspector now also includes highlights set in anonymous namespaces.

Close #22732
---
 runtime/lua/vim/_inspector.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua
index 92d380b08c..05983d3f0d 100644
--- a/runtime/lua/vim/_inspector.lua
+++ b/runtime/lua/vim/_inspector.lua
@@ -81,6 +81,12 @@ function vim.inspect_pos(bufnr, row, col, filter)
     end
   end
 
+  -- namespace id -> name map
+  local nsmap = {}
+  for name, id in pairs(vim.api.nvim_get_namespaces()) do
+    nsmap[id] = name
+  end
+
   --- Convert an extmark tuple into a map-like table
   --- @private
   local function to_map(extmark)
@@ -90,6 +96,8 @@ function vim.inspect_pos(bufnr, row, col, filter)
       col = extmark[3],
       opts = resolve_hl(extmark[4]),
     }
+    extmark.ns_id = extmark.opts.ns_id
+    extmark.ns = nsmap[extmark.ns_id] or ''
     extmark.end_row = extmark.opts.end_row or extmark.row -- inclusive
     extmark.end_col = extmark.opts.end_col or (extmark.col + 1) -- exclusive
     return extmark
@@ -104,17 +112,9 @@ function vim.inspect_pos(bufnr, row, col, filter)
   end
 
   -- all extmarks at this position
-  local extmarks = {}
-  for ns, nsid in pairs(vim.api.nvim_get_namespaces()) do
-    local ns_marks = vim.api.nvim_buf_get_extmarks(bufnr, nsid, 0, -1, { details = true })
-    ns_marks = vim.tbl_map(to_map, ns_marks)
-    ns_marks = vim.tbl_filter(is_here, ns_marks)
-    for _, mark in ipairs(ns_marks) do
-      mark.ns_id = nsid
-      mark.ns = ns
-    end
-    vim.list_extend(extmarks, ns_marks)
-  end
+  local extmarks = vim.api.nvim_buf_get_extmarks(bufnr, -1, 0, -1, { details = true })
+  extmarks = vim.tbl_map(to_map, extmarks)
+  extmarks = vim.tbl_filter(is_here, extmarks)
 
   if filter.semantic_tokens then
     results.semantic_tokens = vim.tbl_filter(function(extmark)
-- 
cgit 


From e30cc8be1950a6d1dec7395807966e1b5d0d9194 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 3 Apr 2023 16:27:49 +0200
Subject: vim-patch:9.0.1438: .fs files are falsely recognized as forth files
 (#22871)

Problem:    .fs files are falsely recognized as forth files.
Solution:   Check 100 lines for something that looks like forth. (Johan
            Kotlinski, closes vim/vim#12219, closes vim/vim#11988)

https://github.com/vim/vim/commit/065088d5549e7711668321cc5a77c9a9b684b142

Co-authored-by: Johan Kotlinski <kotlinski@gmail.com>
---
 runtime/lua/vim/filetype/detect.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index b3d9fedeae..d1eabadc4a 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -473,12 +473,12 @@ function M.fs(bufnr)
   if vim.g.filetype_fs then
     return vim.g.filetype_fs
   end
-  local line = nextnonblank(bufnr, 1)
-  if findany(line, { '^%s*%.?%( ', '^%s*\\G? ', '^\\$', '^%s*: %S' }) then
-    return 'forth'
-  else
-    return 'fsharp'
+  for _, line in ipairs(getlines(bufnr, 1, 100)) do
+    if line:find('^[:(\\] ') then
+      return 'forth'
+    end
   end
+  return 'fsharp'
 end
 
 function M.git(bufnr)
-- 
cgit 


From 469e6bfc56aa18350bfab13bef8a51b02a5b3c65 Mon Sep 17 00:00:00 2001
From: danilax999 <75566563+danilax999@users.noreply.github.com>
Date: Tue, 4 Apr 2023 14:26:21 +0300
Subject: fix(treesitter): use capture metadata range if exists

use `treesitter.get_range` instead of inline expression
---
 runtime/lua/vim/treesitter/highlighter.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index 729cd34090..d3cc1b698c 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -236,7 +236,8 @@ local function on_line_impl(self, buf, line, is_spell_nav)
         break
       end
 
-      local start_row, start_col, end_row, end_col = node:range()
+      local range = vim.treesitter.get_range(node, buf, metadata[capture])
+      local start_row, start_col, _, end_row, end_col, _ = unpack(range)
       local hl = highlighter_query.hl_cache[capture]
 
       local capture_name = highlighter_query:query().captures[capture]
-- 
cgit 


From 090ade4af6344a7bc4ee56a8052c0739c0428c04 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 4 Apr 2023 12:58:16 +0100
Subject: refactor(treesitter): delegate region calculation to treesitter
 (#22576)

---
 runtime/lua/vim/treesitter/languagetree.lua | 94 ++++++++++++-----------------
 1 file changed, 38 insertions(+), 56 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 922e4881ca..cf0ecbd839 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -57,7 +57,9 @@ local Range = require('vim.treesitter._range')
 ---@field private _injection_query Query Queries defining injected languages
 ---@field private _opts table Options
 ---@field private _parser TSParser Parser for language
----@field private _regions Range6[][] List of regions this tree should manage and parse
+---@field private _regions Range6[][]?
+---List of regions this tree should manage and parse. If nil then regions are
+---taken from _trees. This is mostly a short-lived cache for included_regions()
 ---@field private _lang string Language name
 ---@field private _source (integer|string) Buffer or string to parse
 ---@field private _trees TSTree[] Reference to parsed tree (one for each language)
@@ -91,7 +93,6 @@ function LanguageTree.new(source, lang, opts)
     _source = source,
     _lang = lang,
     _children = {},
-    _regions = {},
     _trees = {},
     _opts = opts,
     _injection_query = injections[lang] and query.parse(lang, injections[lang])
@@ -237,27 +238,21 @@ function LanguageTree:parse()
 
   --- At least 1 region is invalid
   if not self:is_valid(true) then
-    local function _parsetree(index)
-      local parse_time, tree, tree_changes =
-        tcall(self._parser.parse, self._parser, self._trees[index], self._source)
-
-      self:_do_callback('changedtree', tree_changes, tree)
-      self._trees[index] = tree
-      vim.list_extend(changes, tree_changes)
-
-      total_parse_time = total_parse_time + parse_time
-      regions_parsed = regions_parsed + 1
-    end
-
-    if #self._regions > 0 then
-      for i, ranges in ipairs(self._regions) do
-        if not self._valid or not self._valid[i] then
-          self._parser:set_included_ranges(ranges)
-          _parsetree(i)
-        end
+    -- If there are no ranges, set to an empty list
+    -- so the included ranges in the parser are cleared.
+    for i, ranges in ipairs(self:included_regions()) do
+      if not self._valid or not self._valid[i] then
+        self._parser:set_included_ranges(ranges)
+        local parse_time, tree, tree_changes =
+          tcall(self._parser.parse, self._parser, self._trees[i], self._source)
+
+        self:_do_callback('changedtree', tree_changes, tree)
+        self._trees[i] = tree
+        vim.list_extend(changes, tree_changes)
+
+        total_parse_time = total_parse_time + parse_time
+        regions_parsed = regions_parsed + 1
       end
-    else
-      _parsetree(1)
     end
   end
 
@@ -403,7 +398,7 @@ function LanguageTree:_iter_regions(fn)
 
   local all_valid = true
 
-  for i, region in ipairs(self._regions) do
+  for i, region in ipairs(self:included_regions()) do
     if self._valid[i] == nil then
       self._valid[i] = true
     end
@@ -454,7 +449,7 @@ function LanguageTree:set_included_regions(new_regions)
     end
   end
 
-  if #self._regions ~= #new_regions then
+  if #self:included_regions() ~= #new_regions then
     self._trees = {}
     self:invalidate()
   else
@@ -462,13 +457,28 @@ function LanguageTree:set_included_regions(new_regions)
       return vim.deep_equal(new_regions[i], region)
     end)
   end
+
   self._regions = new_regions
 end
 
 ---Gets the set of included regions
 ---@return integer[][]
 function LanguageTree:included_regions()
-  return self._regions
+  if self._regions then
+    return self._regions
+  end
+
+  if #self._trees == 0 then
+    return { {} }
+  end
+
+  local regions = {} ---@type Range6[][]
+  for i, _ in ipairs(self._trees) do
+    regions[i] = self._trees[i]:included_ranges(true)
+  end
+
+  self._regions = regions
+  return regions
 end
 
 ---@private
@@ -721,6 +731,8 @@ function LanguageTree:_edit(
     )
   end
 
+  self._regions = nil
+
   local changed_range = {
     start_row,
     start_col,
@@ -730,42 +742,12 @@ function LanguageTree:_edit(
     end_byte_old,
   }
 
-  local new_range = {
-    start_row,
-    start_col,
-    start_byte,
-    end_row_new,
-    end_col_new,
-    end_byte_new,
-  }
-
-  if #self._regions == 0 then
-    self._valid = false
-  end
-
   -- Validate regions after editing the tree
   self:_iter_regions(function(_, region)
-    for i, r in ipairs(region) do
+    for _, r in ipairs(region) do
       if Range.intercepts(r, changed_range) then
         return false
       end
-
-      -- Range after change. Adjust
-      if Range.cmp_pos.gt(r[1], r[2], changed_range[4], changed_range[5]) then
-        local byte_offset = new_range[6] - changed_range[6]
-        local row_offset = new_range[4] - changed_range[4]
-
-        -- Update the range to avoid invalidation in set_included_regions()
-        -- which will compare the regions against the parsed injection regions
-        region[i] = {
-          r[1] + row_offset,
-          r[2],
-          r[3] + byte_offset,
-          r[4] + row_offset,
-          r[5],
-          r[6] + byte_offset,
-        }
-      end
     end
     return true
   end)
-- 
cgit 


From b75acd2f94feac5b55eaa219e7beb2af93f15cf0 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 4 Apr 2023 13:07:27 +0100
Subject: fix(treesitter): disable folding in inspect_tree() (#22885)

---
 runtime/lua/vim/treesitter.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 2594c1672d..44bf4c9e20 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -538,6 +538,7 @@ function M.inspect_tree(opts)
 
   vim.wo[w].scrolloff = 5
   vim.wo[w].wrap = false
+  vim.wo[w].foldmethod = 'manual' -- disable folding
   vim.bo[b].buflisted = false
   vim.bo[b].buftype = 'nofile'
   vim.bo[b].bufhidden = 'wipe'
-- 
cgit 


From a5c572bd446a89be2dccb2f7479ff1b017074640 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Tue, 4 Apr 2023 19:07:33 +0200
Subject: docs: fix typos

Co-authored-by: Gregory Anders <greg@gpanders.com>
Co-authored-by: Raphael <glephunter@gmail.com>
Co-authored-by: C.D. MacEachern <craig.daniel.maceachern@gmail.com>
Co-authored-by: himanoa <matsunoappy@gmail.com>
---
 runtime/autoload/health/provider.vim | 2 +-
 runtime/doc/editorconfig.txt         | 2 +-
 runtime/doc/lsp.txt                  | 2 +-
 runtime/doc/lua-guide.txt            | 2 +-
 runtime/doc/lua.txt                  | 2 +-
 runtime/doc/news.txt                 | 2 +-
 runtime/doc/options.txt              | 4 ++--
 runtime/doc/pi_health.txt            | 2 +-
 runtime/doc/starting.txt             | 4 ++--
 runtime/doc/support.txt              | 2 +-
 runtime/doc/vim_diff.txt             | 2 ++
 runtime/lua/vim/loader.lua           | 4 ++--
 runtime/lua/vim/shared.lua           | 2 +-
 runtime/lua/vim/treesitter/_fold.lua | 2 +-
 14 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
index 59361eb735..70f525156c 100644
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -435,7 +435,7 @@ endfunction
 
 " Check if pyenv is available and a valid pyenv root can be found, then return
 " their respective paths. If either of those is invalid, return two empty
-" strings, effectivly ignoring pyenv.
+" strings, effectively ignoring pyenv.
 function! s:check_for_pyenv() abort
   let pyenv_path = resolve(exepath('pyenv'))
 
diff --git a/runtime/doc/editorconfig.txt b/runtime/doc/editorconfig.txt
index 52fd860d2d..7c6e8fb95f 100644
--- a/runtime/doc/editorconfig.txt
+++ b/runtime/doc/editorconfig.txt
@@ -48,7 +48,7 @@ indent_style            One of "tab" or "space". Sets the 'expandtab' option.
 indent_size             A number indicating the size of a single indent.
                         Alternatively, use the value "tab" to use the value of
                         the tab_width property. Sets the 'shiftwidth' and
-                        'softtabstop'.
+                        'softtabstop' options.
 
                                            *editorconfig_insert_final_newline*
 insert_final_newline    "true" or "false" to ensure the file always has a
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index f5695669ae..01edbe7cbd 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -517,7 +517,7 @@ groups are derived from the token's type and modifiers:
   • `@lsp.type.<type>.<ft>` for the type
   • `@lsp.mod.<mod>.<ft>` for each modifier
   • `@lsp.typemod.<type>.<mod>.<ft>` for each modifier
-Use |:Inspect| to view the higlights for a specific token. Use |:hi| or
+Use |:Inspect| to view the highlights for a specific token. Use |:hi| or
 |nvim_set_hl()| to change the appearance of semantic highlights: >vim
 
     hi @lsp.type.function guifg=Yellow        " function names are yellow
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 5e2b753645..3c2e1ac3d1 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -539,7 +539,7 @@ about the triggered autocommand. The most useful keys are
 
 For example, this allows you to set buffer-local mappings for some filetypes:
 >lua
-    vim.api.nvim.create_autocmd("FileType", {
+    vim.api.nvim_create_autocmd("FileType", {
       pattern = "lua",
       callback = function(args)
         vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = args.buf })
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ebbf8bb463..ba83b18d07 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2001,7 +2001,7 @@ validate({opt})                                               *vim.validate()*
       vim.validate{arg1={{'foo'}, {'table', 'string'}}, arg2={'foo', {'table', 'string'}}}
          --> NOP (success)
 
-      vim.validate{arg1={1, {'string', table'}}}
+      vim.validate{arg1={1, {'string', 'table'}}}
          --> error('arg1: expected string|table, got number')
 <
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 3ef6451ef9..f68edde33b 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -259,7 +259,7 @@ The following changes to existing APIs or features add new behavior.
 • API calls now show more information about where an exception happened.
 
 • The `win_viewport` UI event now contains information about virtual lines,
-  meaning that smooth scrolling can now be implemented more consistenlty.
+  meaning that smooth scrolling can now be implemented more consistently.
 
 • The `:= {expr}` syntax can be used to evaluate a lua expression, as
   a shorter form of `:lua ={expr}`. `:=` and `:[range]=` without argument
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 096b334cda..d22a78700f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4846,7 +4846,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  pack/		packages |:packadd|
 	  parser/	|treesitter| syntax parsers
 	  plugin/	plugin scripts |write-plugin|
-	  query/	|treesitter| queries
+	  queries/	|treesitter| queries
 	  rplugin/	|remote-plugin| scripts
 	  spell/	spell checking files |spell|
 	  syntax/	syntax files |mysyntaxfile|
@@ -7256,7 +7256,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'writedelay'* *'wd'*
 'writedelay' 'wd'	number	(default 0)
 			global
-	Only takes effect toghether with 'redrawdebug'.
+	Only takes effect together with 'redrawdebug'.
 	The number of milliseconds to wait after each line or each flush
 
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/pi_health.txt b/runtime/doc/pi_health.txt
index 5ba5d1beef..2ae93b098a 100644
--- a/runtime/doc/pi_health.txt
+++ b/runtime/doc/pi_health.txt
@@ -105,7 +105,7 @@ with your plugin name: >
         local M = {}
 
         M.check = function()
-          vim.health.report_start("my_plugin report")
+          vim.health.report_start("foo report")
           -- make sure setup function parameters are ok
           if check_setup() then
             vim.health.report_ok("Setup is correct")
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 801ea77b7f..b3a30b20e8 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -242,7 +242,7 @@ argument.
 							*-ll*
 -ll {script} [args]
 		Execute a lua script, similarly to |-l|, but the editor is not
-		initialized. This gives a lua enviroment similar to a worker
+		initialized. This gives a lua environment similar to a worker
 		thread. See |lua-loop-threading|.
 
 		Unlike `-l` no prior arguments are allowed.
@@ -1394,7 +1394,7 @@ result in Neovim looking for configuration files in `$XDG_CONFIG_HOME/neovim`
 instead of `$XDG_CONFIG_HOME/nvim`.
 
 Note: Similarly to the $XDG environment variables, when
-`$XDG_CONFIG_HOME/nvim` is mentionned, it should be understood as
+`$XDG_CONFIG_HOME/nvim` is mentioned, it should be understood as
 `$XDG_CONFIG_HOME/$NVIM_APPNAME`.
 
 LOG FILE					*log* *$NVIM_LOG_FILE* *E5430*
diff --git a/runtime/doc/support.txt b/runtime/doc/support.txt
index e4641751f2..80a035068a 100644
--- a/runtime/doc/support.txt
+++ b/runtime/doc/support.txt
@@ -14,7 +14,7 @@ Supported platforms					 *supported-platforms*
 `System`          `Tier`      `Versions`                  `Tested versions`
 Linux            1      >= 2.6.32, glibc >= 2.12     Ubuntu 22.04
 macOS (Intel)    1      >= 10.15                     macOS 12
-Windows 64-bit   1      >= 8 (see note below)        Windows Server 2019
+Windows 64-bit   1      >= 8 (see note below)        Windows Server 2022
 FreeBSD          1      >= 10                        FreeBSD 13
 macOS (M1)       2      >= 10.15
 OpenBSD          2      >= 7
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index d6ad9107b3..609184c82c 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -255,6 +255,8 @@ Highlight groups:
   |hl-TermCursorNC|
   |hl-WinSeparator| highlights window separators
   |hl-Whitespace| highlights 'listchars' whitespace
+  |hl-WinBar| highlights 'winbar'
+  |hl-WinBarNC| highlights non-current window 'winbar'
 
 Input/Mappings:
   ALT (|META|) chords always work (even in the |TUI|). Map |<M-| with any key:
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 201de18497..38b1e9fc0f 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -11,7 +11,7 @@ local M = {}
 ---@class ModuleFindOpts
 ---@field all? boolean Search for all matches (defaults to `false`)
 ---@field rtp? boolean Search for modname in the runtime path (defaults to `true`)
----@field patterns? string[] Paterns to use (defaults to `{"/init.lua", ".lua"}`)
+---@field patterns? string[] Patterns to use (defaults to `{"/init.lua", ".lua"}`)
 ---@field paths? string[] Extra paths to search for modname
 
 ---@class ModuleInfo
@@ -469,7 +469,7 @@ end
 ---@class ProfileOpts
 ---@field loaders? boolean Add profiling to the loaders
 
---- Debug function that wrapps all loaders and tracks stats
+--- Debug function that wraps all loaders and tracks stats
 ---@private
 ---@param opts ProfileOpts?
 function M._profile(opts)
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 9e337e93e8..eb734fb512 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -655,7 +655,7 @@ end
 ---  vim.validate{arg1={{'foo'}, {'table', 'string'}}, arg2={'foo', {'table', 'string'}}}
 ---     --> NOP (success)
 ---
----  vim.validate{arg1={1, {'string', table'}}}
+---  vim.validate{arg1={1, {'string', 'table'}}}
 ---     --> error('arg1: expected string|table, got number')
 ---
 --- </pre>
diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index 6547ab936e..7df93d1b2e 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -68,7 +68,7 @@ function FoldInfo:add_stop(lnum)
   self.stop_counts[lnum] = (self.stop_counts[lnum] or 0) + 1
 end
 
----@packag
+---@package
 ---@param lnum integer
 ---@return integer
 function FoldInfo:get_start(lnum)
-- 
cgit 


From b1de4820b7b1a527f4d0cf9a20192d92bea1d9c4 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 1 Apr 2023 12:55:04 +0100
Subject: refactor(treesitter): move inspect_tree impl

---
 runtime/lua/vim/treesitter.lua            | 205 +--------------------------
 runtime/lua/vim/treesitter/playground.lua | 225 +++++++++++++++++++++++++++++-
 2 files changed, 226 insertions(+), 204 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 44bf4c9e20..092fdf0ae2 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -502,209 +502,8 @@ end
 ---                        function, it accepts the buffer number of the source buffer as its only
 ---                        argument and should return a string.
 function M.inspect_tree(opts)
-  vim.validate({
-    opts = { opts, 't', true },
-  })
-
-  opts = opts or {}
-
-  local Playground = require('vim.treesitter.playground')
-  local buf = a.nvim_get_current_buf()
-  local win = a.nvim_get_current_win()
-  local pg = assert(Playground:new(buf, opts.lang))
-
-  -- Close any existing playground window
-  if vim.b[buf].playground then
-    local w = vim.b[buf].playground
-    if a.nvim_win_is_valid(w) then
-      a.nvim_win_close(w, true)
-    end
-  end
-
-  local w = opts.winid
-  if not w then
-    vim.cmd(opts.command or '60vnew')
-    w = a.nvim_get_current_win()
-  end
-
-  local b = opts.bufnr
-  if b then
-    a.nvim_win_set_buf(w, b)
-  else
-    b = a.nvim_win_get_buf(w)
-  end
-
-  vim.b[buf].playground = w
-
-  vim.wo[w].scrolloff = 5
-  vim.wo[w].wrap = false
-  vim.wo[w].foldmethod = 'manual' -- disable folding
-  vim.bo[b].buflisted = false
-  vim.bo[b].buftype = 'nofile'
-  vim.bo[b].bufhidden = 'wipe'
-  vim.bo[b].filetype = 'query'
-
-  local title = opts.title
-  if not title then
-    local bufname = a.nvim_buf_get_name(buf)
-    title = string.format('Syntax tree for %s', vim.fn.fnamemodify(bufname, ':.'))
-  elseif type(title) == 'function' then
-    title = title(buf)
-  end
-
-  assert(type(title) == 'string', 'Window title must be a string')
-  a.nvim_buf_set_name(b, title)
-
-  pg:draw(b)
-
-  a.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
-  a.nvim_buf_set_keymap(b, 'n', '<CR>', '', {
-    desc = 'Jump to the node under the cursor in the source buffer',
-    callback = function()
-      local row = a.nvim_win_get_cursor(w)[1]
-      local pos = pg:get(row)
-      a.nvim_set_current_win(win)
-      a.nvim_win_set_cursor(win, { pos.lnum + 1, pos.col })
-    end,
-  })
-  a.nvim_buf_set_keymap(b, 'n', 'a', '', {
-    desc = 'Toggle anonymous nodes',
-    callback = function()
-      local row, col = unpack(a.nvim_win_get_cursor(w))
-      local curnode = pg:get(row)
-      while curnode and not curnode.named do
-        row = row - 1
-        curnode = pg:get(row)
-      end
-
-      pg.opts.anon = not pg.opts.anon
-      pg:draw(b)
-
-      if not curnode then
-        return
-      end
-
-      local id = curnode.id
-      for i, node in pg:iter() do
-        if node.id == id then
-          a.nvim_win_set_cursor(w, { i, col })
-          break
-        end
-      end
-    end,
-  })
-  a.nvim_buf_set_keymap(b, 'n', 'I', '', {
-    desc = 'Toggle language display',
-    callback = function()
-      pg.opts.lang = not pg.opts.lang
-      pg:draw(b)
-    end,
-  })
-
-  local group = a.nvim_create_augroup('treesitter/playground', {})
-
-  a.nvim_create_autocmd('CursorMoved', {
-    group = group,
-    buffer = b,
-    callback = function()
-      a.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
-      local row = a.nvim_win_get_cursor(w)[1]
-      local pos = pg:get(row)
-      a.nvim_buf_set_extmark(buf, pg.ns, pos.lnum, pos.col, {
-        end_row = pos.end_lnum,
-        end_col = math.max(0, pos.end_col),
-        hl_group = 'Visual',
-      })
-
-      local topline, botline = vim.fn.line('w0', win), vim.fn.line('w$', win)
-
-      -- Move the cursor if highlighted range is completely out of view
-      if pos.lnum < topline and pos.end_lnum < topline then
-        a.nvim_win_set_cursor(win, { pos.end_lnum + 1, 0 })
-      elseif pos.lnum > botline and pos.end_lnum > botline then
-        a.nvim_win_set_cursor(win, { pos.lnum + 1, 0 })
-      end
-    end,
-  })
-
-  a.nvim_create_autocmd('CursorMoved', {
-    group = group,
-    buffer = buf,
-    callback = function()
-      if not a.nvim_buf_is_loaded(b) then
-        return true
-      end
-
-      a.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
-
-      local cursor_node = M.get_node({
-        bufnr = buf,
-        lang = opts.lang,
-        ignore_injections = false,
-      })
-      if not cursor_node then
-        return
-      end
-
-      local cursor_node_id = cursor_node:id()
-      for i, v in pg:iter() do
-        if v.id == cursor_node_id then
-          local start = v.depth
-          local end_col = start + #v.text
-          a.nvim_buf_set_extmark(b, pg.ns, i - 1, start, {
-            end_col = end_col,
-            hl_group = 'Visual',
-          })
-          a.nvim_win_set_cursor(w, { i, 0 })
-          break
-        end
-      end
-    end,
-  })
-
-  a.nvim_create_autocmd({ 'TextChanged', 'InsertLeave' }, {
-    group = group,
-    buffer = buf,
-    callback = function()
-      if not a.nvim_buf_is_loaded(b) then
-        return true
-      end
-
-      pg = assert(Playground:new(buf, opts.lang))
-      pg:draw(b)
-    end,
-  })
-
-  a.nvim_create_autocmd('BufLeave', {
-    group = group,
-    buffer = b,
-    callback = function()
-      a.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
-    end,
-  })
-
-  a.nvim_create_autocmd('BufLeave', {
-    group = group,
-    buffer = buf,
-    callback = function()
-      if not a.nvim_buf_is_loaded(b) then
-        return true
-      end
-
-      a.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
-    end,
-  })
-
-  a.nvim_create_autocmd('BufHidden', {
-    group = group,
-    buffer = buf,
-    once = true,
-    callback = function()
-      if a.nvim_win_is_valid(w) then
-        a.nvim_win_close(w, true)
-      end
-    end,
-  })
+  ---@cast opts InspectTreeOpts
+  require('vim.treesitter.playground').inspect_tree(opts)
 end
 
 --- Returns the fold level for {lnum} in the current buffer. Can be set directly to 'foldexpr':
diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index 35f06f5caf..7eead14579 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -1,5 +1,8 @@
 local api = vim.api
 
+---@class TSPlaygroundModule
+local M = {}
+
 ---@class TSPlayground
 ---@field ns integer API namespace
 ---@field opts table Options table with the following keys:
@@ -212,4 +215,224 @@ function TSPlayground:iter()
   return ipairs(self.opts.anon and self.nodes or self.named)
 end
 
-return TSPlayground
+--- @class InspectTreeOpts
+--- @field lang string? The language of the source buffer. If omitted, the
+---                     filetype of the source buffer is used.
+--- @field bufnr integer? Buffer to draw the tree into. If omitted, a new
+---                       buffer is created.
+--- @field winid integer? Window id to display the tree buffer in. If omitted,
+---                       a new window is created with {command}.
+--- @field command string? Vimscript command to create the window. Default
+---                       value is "60vnew". Only used when {winid} is nil.
+--- @field title (string|fun(bufnr:integer):string|nil) Title of the window. If a
+---                       function, it accepts the buffer number of the source
+---                       buffer as its only argument and should return a string.
+
+--- @param opts InspectTreeOpts
+function M.inspect_tree(opts)
+  vim.validate({
+    opts = { opts, 't', true },
+  })
+
+  opts = opts or {}
+
+  local buf = api.nvim_get_current_buf()
+  local win = api.nvim_get_current_win()
+  local pg = assert(TSPlayground:new(buf, opts.lang))
+
+  -- Close any existing playground window
+  if vim.b[buf].playground then
+    local w = vim.b[buf].playground
+    if api.nvim_win_is_valid(w) then
+      api.nvim_win_close(w, true)
+    end
+  end
+
+  local w = opts.winid
+  if not w then
+    vim.cmd(opts.command or '60vnew')
+    w = api.nvim_get_current_win()
+  end
+
+  local b = opts.bufnr
+  if b then
+    api.nvim_win_set_buf(w, b)
+  else
+    b = api.nvim_win_get_buf(w)
+  end
+
+  vim.b[buf].playground = w
+
+  vim.wo[w].scrolloff = 5
+  vim.wo[w].wrap = false
+  vim.wo[w].foldmethod = 'manual'  -- disable folding
+  vim.bo[b].buflisted = false
+  vim.bo[b].buftype = 'nofile'
+  vim.bo[b].bufhidden = 'wipe'
+  vim.bo[b].filetype = 'query'
+
+  local title --- @type string?
+  local opts_title = opts.title
+  if not opts_title then
+    local bufname = api.nvim_buf_get_name(buf)
+    title = string.format('Syntax tree for %s', vim.fn.fnamemodify(bufname, ':.'))
+  elseif type(opts_title) == 'function' then
+    title = opts_title(buf)
+  end
+
+  assert(type(title) == 'string', 'Window title must be a string')
+  api.nvim_buf_set_name(b, title)
+
+  pg:draw(b)
+
+  api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+  api.nvim_buf_set_keymap(b, 'n', '<CR>', '', {
+    desc = 'Jump to the node under the cursor in the source buffer',
+    callback = function()
+      local row = api.nvim_win_get_cursor(w)[1]
+      local pos = pg:get(row)
+      api.nvim_set_current_win(win)
+      api.nvim_win_set_cursor(win, { pos.lnum + 1, pos.col })
+    end,
+  })
+  api.nvim_buf_set_keymap(b, 'n', 'a', '', {
+    desc = 'Toggle anonymous nodes',
+    callback = function()
+      local row, col = unpack(api.nvim_win_get_cursor(w))
+      local curnode = pg:get(row)
+      while curnode and not curnode.named do
+        row = row - 1
+        curnode = pg:get(row)
+      end
+
+      pg.opts.anon = not pg.opts.anon
+      pg:draw(b)
+
+      if not curnode then
+        return
+      end
+
+      local id = curnode.id
+      for i, node in pg:iter() do
+        if node.id == id then
+          api.nvim_win_set_cursor(w, { i, col })
+          break
+        end
+      end
+    end,
+  })
+  api.nvim_buf_set_keymap(b, 'n', 'I', '', {
+    desc = 'Toggle language display',
+    callback = function()
+      pg.opts.lang = not pg.opts.lang
+      pg:draw(b)
+    end,
+  })
+
+  local group = api.nvim_create_augroup('treesitter/playground', {})
+
+  api.nvim_create_autocmd('CursorMoved', {
+    group = group,
+    buffer = b,
+    callback = function()
+      api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+      local row = api.nvim_win_get_cursor(w)[1]
+      local pos = pg:get(row)
+      api.nvim_buf_set_extmark(buf, pg.ns, pos.lnum, pos.col, {
+        end_row = pos.end_lnum,
+        end_col = math.max(0, pos.end_col),
+        hl_group = 'Visual',
+      })
+
+      local topline, botline = vim.fn.line('w0', win), vim.fn.line('w$', win)
+
+      -- Move the cursor if highlighted range is completely out of view
+      if pos.lnum < topline and pos.end_lnum < topline then
+        api.nvim_win_set_cursor(win, { pos.end_lnum + 1, 0 })
+      elseif pos.lnum > botline and pos.end_lnum > botline then
+        api.nvim_win_set_cursor(win, { pos.lnum + 1, 0 })
+      end
+    end,
+  })
+
+  api.nvim_create_autocmd('CursorMoved', {
+    group = group,
+    buffer = buf,
+    callback = function()
+      if not api.nvim_buf_is_loaded(b) then
+        return true
+      end
+
+      api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
+
+      local cursor_node = vim.treesitter.get_node({
+        bufnr = buf,
+        lang = opts.lang,
+        ignore_injections = false,
+      })
+      if not cursor_node then
+        return
+      end
+
+      local cursor_node_id = cursor_node:id()
+      for i, v in pg:iter() do
+        if v.id == cursor_node_id then
+          local start = v.depth
+          local end_col = start + #v.text
+          api.nvim_buf_set_extmark(b, pg.ns, i - 1, start, {
+            end_col = end_col,
+            hl_group = 'Visual',
+          })
+          api.nvim_win_set_cursor(w, { i, 0 })
+          break
+        end
+      end
+    end,
+  })
+
+  api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave' }, {
+    group = group,
+    buffer = buf,
+    callback = function()
+      if not api.nvim_buf_is_loaded(b) then
+        return true
+      end
+
+      pg = assert(TSPlayground:new(buf, opts.lang))
+      pg:draw(b)
+    end,
+  })
+
+  api.nvim_create_autocmd('BufLeave', {
+    group = group,
+    buffer = b,
+    callback = function()
+      api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+    end,
+  })
+
+  api.nvim_create_autocmd('BufLeave', {
+    group = group,
+    buffer = buf,
+    callback = function()
+      if not api.nvim_buf_is_loaded(b) then
+        return true
+      end
+
+      api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
+    end,
+  })
+
+  api.nvim_create_autocmd('BufHidden', {
+    group = group,
+    buffer = buf,
+    once = true,
+    callback = function()
+      if api.nvim_win_is_valid(w) then
+        api.nvim_win_close(w, true)
+      end
+    end,
+  })
+end
+
+return M
-- 
cgit 


From 743860de40502227b3f0ed64317eb937d24d4a36 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Tue, 4 Apr 2023 21:59:06 +0200
Subject: test: replace lfs with luv and vim.fs

test: replace lfs with luv

luv already pretty much does everything lfs does, so this duplication
of dependencies isn't needed.
---
 runtime/lua/vim/_editor.lua        | 1 -
 runtime/lua/vim/_init_packages.lua | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 0c4b634f6f..fa0980563a 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -36,7 +36,6 @@ for k, v in pairs({
   keymap = true,
   ui = true,
   health = true,
-  fs = true,
   secure = true,
   _watch = true,
 }) do
diff --git a/runtime/lua/vim/_init_packages.lua b/runtime/lua/vim/_init_packages.lua
index 57c0fc9122..2cf2e91a8c 100644
--- a/runtime/lua/vim/_init_packages.lua
+++ b/runtime/lua/vim/_init_packages.lua
@@ -54,6 +54,7 @@ require('vim.shared')
 vim._submodules = {
   inspect = true,
   version = true,
+  fs = true,
 }
 
 -- These are for loading runtime modules in the vim namespace lazily.
-- 
cgit 


From 872a534f6ef1b2948d834a1feaa158304071f46d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 23:10:17 +0200
Subject: docs: regenerate

---
 runtime/doc/treesitter.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 0298f5a9b1..dc1afe89f8 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1164,4 +1164,12 @@ LanguageTree:trees({self})                              *LanguageTree:trees()*
     Parameters: ~
       • {self}
 
+
+==============================================================================
+Lua module: vim.treesitter.playground              *lua-treesitter-playground*
+
+inspect_tree({opts})                *vim.treesitter.playground.inspect_tree()*
+    Parameters: ~
+      • {opts}  InspectTreeOpts
+
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
-- 
cgit 


From e826d09c18ab8840592b6cdbbcfe3e311a047174 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Tue, 4 Apr 2023 23:37:46 +0200
Subject: fix(windows): consistent normalization in fs.find

vim.fs.find(".luacheckrc")

```
c:\\projects\\neovim/.luacheckrc # before

c:/projects/neovim/.luacheckrc   # after
```

Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com>
---
 runtime/lua/vim/fs.lua                    | 2 +-
 runtime/lua/vim/treesitter/playground.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 407b334f20..2a51bde263 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -216,7 +216,7 @@ function M.find(names, opts)
 
   ---@private
   local function add(match)
-    matches[#matches + 1] = match
+    matches[#matches + 1] = M.normalize(match)
     if #matches == limit then
       return true
     end
diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index 7eead14579..2c0a0d1aa6 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -265,7 +265,7 @@ function M.inspect_tree(opts)
 
   vim.wo[w].scrolloff = 5
   vim.wo[w].wrap = false
-  vim.wo[w].foldmethod = 'manual'  -- disable folding
+  vim.wo[w].foldmethod = 'manual' -- disable folding
   vim.bo[b].buflisted = false
   vim.bo[b].buftype = 'nofile'
   vim.bo[b].bufhidden = 'wipe'
-- 
cgit 


From 9e7426718b678e299f3fd03ef94f81b1e2d01ab0 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 4 Apr 2023 23:59:39 +0100
Subject: feat(vim.diff): allow passing an integer for linematch

---
 runtime/doc/lua.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ba83b18d07..6084a625ba 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -685,9 +685,10 @@ vim.diff({a}, {b}, {opts})                                        *vim.diff()*
                    • "unified": (default) String in unified format.
                    • "indices": Array of hunk locations.
                    Note: This option is ignored if `on_hunk` is used.
-                 • `linematch` (boolean): Run linematch on the resulting hunks
-                   from xdiff. Requires `result_type = indices`, ignored
-                   otherwise.
+                 • `linematch` (boolean|integer): Run linematch on the resulting hunks
+                   from xdiff. When integer, only hunks upto this size in
+                   lines are run through linematch. Requires `result_type = indices`,
+                   ignored otherwise.
                  • `algorithm` (string):
                    Diff algorithm to use. Values:
                    • "myers"      the default algorithm
-- 
cgit 


From f0ac91c58b42ed4f38dea7352d89fd39a88142f4 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 1 Apr 2023 14:58:52 +0200
Subject: feat(api): evaluate 'statuscolumn' with nvim_eval_statusline()

---
 runtime/doc/api.txt  | 2 ++
 runtime/doc/news.txt | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 3c3e66dd57..46816856b9 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -773,6 +773,8 @@ nvim_eval_statusline({str}, {*opts})                  *nvim_eval_statusline()*
                 • use_tabline: (boolean) Evaluate tabline instead of
                   statusline. When true, {winid} is ignored. Mutually
                   exclusive with {use_winbar}.
+                • use_statuscol: (boolean) Evaluate statuscolumn instead of
+                  statusline.
 
     Return: ~
         Dictionary containing statusline information, with these keys:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f68edde33b..98f3f3f398 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -73,6 +73,9 @@ NEW FEATURES                                                    *news-features*
 
 The following new APIs or features were added.
 
+• |nvim_eval_statusline()| supports evaluating the |'statuscolumn'| through a
+  new `opts` field: `use_statuscol`.
+
 • |nvim_buf_get_extmarks()| now accepts a -1 `ns_id` to request extmarks from
   all namespaces and adds the namespace id to the details array.
   Other missing properties have been added to the details array and marks can
-- 
cgit 


From 999cb36c2bb64d1f93bb6f8e607e0eb26eadcd63 Mon Sep 17 00:00:00 2001
From: Michal Liszcz <liszcz.michal@gmail.com>
Date: Wed, 5 Apr 2023 14:02:08 +0200
Subject: refactor(lsp): do not parse verbose output when overwriting options
 (#22810)

---
 runtime/lua/vim/lsp.lua | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'runtime')

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
-- 
cgit 


From 34ac75b32927328a0c691c5bda987c0fdb5ce9eb Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 5 Apr 2023 17:19:53 +0100
Subject: refactor: rename local API alias from a to api

Problem:
  Codebase inconsistently binds vim.api onto a or api.

Solution:
  Use api everywhere. a as an identifier is too short to have at the
  module level.
---
 runtime/doc/api.txt                         | 14 +++++++-------
 runtime/lua/vim/_meta.lua                   | 20 +++++++++----------
 runtime/lua/vim/treesitter.lua              | 30 ++++++++++++++---------------
 runtime/lua/vim/treesitter/highlighter.lua  | 18 ++++++++---------
 runtime/lua/vim/treesitter/language.lua     |  4 ++--
 runtime/lua/vim/treesitter/languagetree.lua | 12 ++++++------
 runtime/lua/vim/treesitter/query.lua        |  8 ++++----
 7 files changed, 53 insertions(+), 53 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 46816856b9..52c3f7fa97 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2570,17 +2570,17 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {opts})
     `limit`, to get the first marks prior to a given position.)
 
     Example: >lua
-      local a   = vim.api
-      local pos = a.nvim_win_get_cursor(0)
-      local ns  = a.nvim_create_namespace('my-plugin')
+      local api = vim.api
+      local pos = api.nvim_win_get_cursor(0)
+      local ns  = api.nvim_create_namespace('my-plugin')
       -- Create new extmark at line 1, column 1.
-      local m1  = a.nvim_buf_set_extmark(0, ns, 0, 0, {})
+      local m1  = api.nvim_buf_set_extmark(0, ns, 0, 0, {})
       -- Create new extmark at line 3, column 1.
-      local m2  = a.nvim_buf_set_extmark(0, ns, 2, 0, {})
+      local m2  = api.nvim_buf_set_extmark(0, ns, 2, 0, {})
       -- Get extmarks only from line 3.
-      local ms  = a.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
+      local ms  = api.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
       -- Get all marks in this buffer + namespace.
-      local all = a.nvim_buf_get_extmarks(0, ns, 0, -1, {})
+      local all = api.nvim_buf_get_extmarks(0, ns, 0, -1, {})
       print(vim.inspect(ms))
 <
 
diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
index 104f29c4c0..e3ad4d76c9 100644
--- a/runtime/lua/vim/_meta.lua
+++ b/runtime/lua/vim/_meta.lua
@@ -1,4 +1,4 @@
-local a = vim.api
+local api = vim.api
 
 -- TODO(tjdevries): Improve option metadata so that this doesn't have to be hardcoded.
 --                  Can be done in a separate PR.
@@ -30,7 +30,7 @@ end
 
 local options_info = setmetatable({}, {
   __index = function(t, k)
-    local info = a.nvim_get_option_info(k)
+    local info = api.nvim_get_option_info(k)
     info.metatype = get_option_metatype(k, info)
     rawset(t, k, info)
     return rawget(t, k)
@@ -74,12 +74,12 @@ local function new_opt_accessor(handle, scope)
         return new_opt_accessor(k, scope)
       end
       opt_validate(k, scope)
-      return a.nvim_get_option_value(k, { [scope] = handle or 0 })
+      return api.nvim_get_option_value(k, { [scope] = handle or 0 })
     end,
 
     __newindex = function(_, k, v)
       opt_validate(k, scope)
-      return a.nvim_set_option_value(k, v, { [scope] = handle or 0 })
+      return api.nvim_set_option_value(k, v, { [scope] = handle or 0 })
     end,
   })
 end
@@ -91,10 +91,10 @@ vim.wo = new_opt_accessor(nil, 'win')
 --  this ONLY sets the global option. like `setglobal`
 vim.go = setmetatable({}, {
   __index = function(_, k)
-    return a.nvim_get_option_value(k, { scope = 'global' })
+    return api.nvim_get_option_value(k, { scope = 'global' })
   end,
   __newindex = function(_, k, v)
-    return a.nvim_set_option_value(k, v, { scope = 'global' })
+    return api.nvim_set_option_value(k, v, { scope = 'global' })
   end,
 })
 
@@ -102,10 +102,10 @@ vim.go = setmetatable({}, {
 --  it has no additional metamethod magic.
 vim.o = setmetatable({}, {
   __index = function(_, k)
-    return a.nvim_get_option_value(k, {})
+    return api.nvim_get_option_value(k, {})
   end,
   __newindex = function(_, k, v)
-    return a.nvim_set_option_value(k, v, {})
+    return api.nvim_set_option_value(k, v, {})
   end,
 })
 
@@ -488,7 +488,7 @@ local function create_option_accessor(scope)
     --  opt[my_option] = value
     _set = function(self)
       local value = convert_value_to_vim(self._name, self._info, self._value)
-      a.nvim_set_option_value(self._name, value, { scope = scope })
+      api.nvim_set_option_value(self._name, value, { scope = scope })
     end,
 
     get = function(self)
@@ -526,7 +526,7 @@ local function create_option_accessor(scope)
 
   return setmetatable({}, {
     __index = function(_, k)
-      return make_option(k, a.nvim_get_option_value(k, {}))
+      return make_option(k, api.nvim_get_option_value(k, {}))
     end,
 
     __newindex = function(_, k, v)
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 092fdf0ae2..d1f5996768 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -1,4 +1,4 @@
-local a = vim.api
+local api = vim.api
 local LanguageTree = require('vim.treesitter.languagetree')
 local Range = require('vim.treesitter._range')
 
@@ -80,7 +80,7 @@ function M._create_parser(bufnr, lang, opts)
 
   local source = self:source() --[[@as integer]]
 
-  a.nvim_buf_attach(
+  api.nvim_buf_attach(
     source,
     false,
     { on_bytes = bytes_cb, on_detach = detach_cb, on_reload = reload_cb, preview = true }
@@ -109,7 +109,7 @@ function M.get_parser(bufnr, lang, opts)
   opts = opts or {}
 
   if bufnr == nil or bufnr == 0 then
-    bufnr = a.nvim_get_current_buf()
+    bufnr = api.nvim_get_current_buf()
   end
 
   if not valid_lang(lang) then
@@ -141,7 +141,7 @@ end
 ---@return boolean
 function M._has_parser(bufnr)
   if bufnr == nil or bufnr == 0 then
-    bufnr = a.nvim_get_current_buf()
+    bufnr = api.nvim_get_current_buf()
   end
   return parsers[bufnr] ~= nil
 end
@@ -229,7 +229,7 @@ local function buf_range_get_text(buf, range)
     end_col = -1
     end_row = end_row - 1
   end
-  local lines = a.nvim_buf_get_text(buf, start_row, start_col, end_row, end_col, {})
+  local lines = api.nvim_buf_get_text(buf, start_row, start_col, end_row, end_col, {})
   return table.concat(lines, '\n')
 end
 
@@ -294,7 +294,7 @@ end
 ---@return table[] List of captures `{ capture = "name", metadata = { ... } }`
 function M.get_captures_at_pos(bufnr, row, col)
   if bufnr == 0 then
-    bufnr = a.nvim_get_current_buf()
+    bufnr = api.nvim_get_current_buf()
   end
   local buf_highlighter = M.highlighter.active[bufnr]
 
@@ -345,8 +345,8 @@ end
 ---@return string[] List of capture names
 function M.get_captures_at_cursor(winnr)
   winnr = winnr or 0
-  local bufnr = a.nvim_win_get_buf(winnr)
-  local cursor = a.nvim_win_get_cursor(winnr)
+  local bufnr = api.nvim_win_get_buf(winnr)
+  local cursor = api.nvim_win_get_cursor(winnr)
 
   local data = M.get_captures_at_pos(bufnr, cursor[1] - 1, cursor[2])
 
@@ -374,7 +374,7 @@ function M.get_node(opts)
   local bufnr = opts.bufnr
 
   if not bufnr or bufnr == 0 then
-    bufnr = a.nvim_get_current_buf()
+    bufnr = api.nvim_get_current_buf()
   end
 
   local row, col
@@ -383,10 +383,10 @@ function M.get_node(opts)
     row, col = opts.pos[1], opts.pos[2]
   else
     assert(
-      bufnr == a.nvim_get_current_buf(),
+      bufnr == api.nvim_get_current_buf(),
       'Position must be explicitly provided when not using the current buffer'
     )
-    local pos = a.nvim_win_get_cursor(0)
+    local pos = api.nvim_win_get_cursor(0)
     -- Subtract one to account for 1-based row indexing in nvim_win_get_cursor
     row, col = pos[1] - 1, pos[2]
   end
@@ -417,7 +417,7 @@ end
 function M.get_node_at_pos(bufnr, row, col, opts)
   vim.deprecate('vim.treesitter.get_node_at_pos()', 'vim.treesitter.get_node()', '0.10')
   if bufnr == 0 then
-    bufnr = a.nvim_get_current_buf()
+    bufnr = api.nvim_get_current_buf()
   end
   local ts_range = { row, col, row, col }
 
@@ -440,7 +440,7 @@ end
 function M.get_node_at_cursor(winnr)
   vim.deprecate('vim.treesitter.get_node_at_cursor()', 'vim.treesitter.get_node():type()', '0.10')
   winnr = winnr or 0
-  local bufnr = a.nvim_win_get_buf(winnr)
+  local bufnr = api.nvim_win_get_buf(winnr)
 
   return M.get_node({ bufnr = bufnr, ignore_injections = false }):type()
 end
@@ -465,7 +465,7 @@ end
 ---@param bufnr (integer|nil) Buffer to be highlighted (default: current buffer)
 ---@param lang (string|nil) Language of the parser (default: buffer filetype)
 function M.start(bufnr, lang)
-  bufnr = bufnr or a.nvim_get_current_buf()
+  bufnr = bufnr or api.nvim_get_current_buf()
   local parser = M.get_parser(bufnr, lang)
   M.highlighter.new(parser)
 end
@@ -474,7 +474,7 @@ end
 ---
 ---@param bufnr (integer|nil) Buffer to stop highlighting (default: current buffer)
 function M.stop(bufnr)
-  bufnr = bufnr or a.nvim_get_current_buf()
+  bufnr = bufnr or api.nvim_get_current_buf()
 
   if M.highlighter.active[bufnr] then
     M.highlighter.active[bufnr]:destroy()
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index d3cc1b698c..ac2a929487 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -1,4 +1,4 @@
-local a = vim.api
+local api = vim.api
 local query = vim.treesitter.query
 
 ---@alias TSHlIter fun(): integer, TSNode, TSMetadata
@@ -25,7 +25,7 @@ TSHighlighter.active = TSHighlighter.active or {}
 local TSHighlighterQuery = {}
 TSHighlighterQuery.__index = TSHighlighterQuery
 
-local ns = a.nvim_create_namespace('treesitter/highlighter')
+local ns = api.nvim_create_namespace('treesitter/highlighter')
 
 ---@private
 function TSHighlighterQuery.new(lang, query_string)
@@ -36,7 +36,7 @@ function TSHighlighterQuery.new(lang, query_string)
       local name = self._query.captures[capture]
       local id = 0
       if not vim.startswith(name, '_') then
-        id = a.nvim_get_hl_id_by_name('@' .. name .. '.' .. lang)
+        id = api.nvim_get_hl_id_by_name('@' .. name .. '.' .. lang)
       end
 
       rawset(table, capture, id)
@@ -121,7 +121,7 @@ function TSHighlighter.new(tree, opts)
     vim.cmd.runtime({ 'syntax/synload.vim', bang = true })
   end
 
-  a.nvim_buf_call(self.bufnr, function()
+  api.nvim_buf_call(self.bufnr, function()
     vim.opt_local.spelloptions:append('noplainbuffer')
   end)
 
@@ -140,7 +140,7 @@ function TSHighlighter:destroy()
     vim.bo[self.bufnr].spelloptions = self.orig_spelloptions
     vim.b[self.bufnr].ts_highlight = nil
     if vim.g.syntax_on == 1 then
-      a.nvim_exec_autocmds('FileType', { group = 'syntaxset', buffer = self.bufnr })
+      api.nvim_exec_autocmds('FileType', { group = 'syntaxset', buffer = self.bufnr })
     end
   end
 end
@@ -168,7 +168,7 @@ end
 ---@param start_row integer
 ---@param new_end integer
 function TSHighlighter:on_bytes(_, _, start_row, _, _, _, _, _, new_end)
-  a.nvim__buf_redraw_range(self.bufnr, start_row, start_row + new_end + 1)
+  api.nvim__buf_redraw_range(self.bufnr, start_row, start_row + new_end + 1)
 end
 
 ---@package
@@ -180,7 +180,7 @@ end
 ---@param changes integer[][]?
 function TSHighlighter:on_changedtree(changes)
   for _, ch in ipairs(changes or {}) do
-    a.nvim__buf_redraw_range(self.bufnr, ch[1], ch[3] + 1)
+    api.nvim__buf_redraw_range(self.bufnr, ch[1], ch[3] + 1)
   end
 end
 
@@ -252,7 +252,7 @@ local function on_line_impl(self, buf, line, is_spell_nav)
       local spell_pri_offset = capture_name == 'nospell' and 1 or 0
 
       if hl and end_row >= line and (not is_spell_nav or spell ~= nil) then
-        a.nvim_buf_set_extmark(buf, ns, start_row, start_col, {
+        api.nvim_buf_set_extmark(buf, ns, start_row, start_col, {
           end_line = end_row,
           end_col = end_col,
           hl_group = hl,
@@ -323,7 +323,7 @@ function TSHighlighter._on_win(_, _win, buf, _topline)
   return true
 end
 
-a.nvim_set_decoration_provider(ns, {
+api.nvim_set_decoration_provider(ns, {
   on_buf = TSHighlighter._on_buf,
   on_win = TSHighlighter._on_win,
   on_line = TSHighlighter._on_line,
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 5b74bb6200..b616d4d70b 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -1,4 +1,4 @@
-local a = vim.api
+local api = vim.api
 
 ---@class TSLanguageModule
 local M = {}
@@ -89,7 +89,7 @@ function M.add(lang, opts)
     end
 
     local fname = 'parser/' .. lang .. '.*'
-    local paths = a.nvim_get_runtime_file(fname, false)
+    local paths = api.nvim_get_runtime_file(fname, false)
     if #paths == 0 then
       error("no parser for '" .. lang .. "' language, see :help treesitter-parsers")
     end
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index cf0ecbd839..703d2a1f6d 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -32,7 +32,7 @@
 --- a plugin that does any kind of analysis on a tree should use a timer to throttle too frequent
 --- updates.
 
-local a = vim.api
+local api = vim.api
 local query = require('vim.treesitter.query')
 local language = require('vim.treesitter.language')
 local Range = require('vim.treesitter._range')
@@ -141,16 +141,16 @@ function LanguageTree:_log(...)
   local prefix =
     string.format('%s:%d: [%s:%d] ', info.name, info.currentline, self:lang(), nregions)
 
-  a.nvim_out_write(prefix)
+  api.nvim_out_write(prefix)
   for _, x in ipairs(args) do
     if type(x) == 'string' then
-      a.nvim_out_write(x)
+      api.nvim_out_write(x)
     else
-      a.nvim_out_write(vim.inspect(x, { newline = ' ', indent = '' }))
+      api.nvim_out_write(vim.inspect(x, { newline = ' ', indent = '' }))
     end
-    a.nvim_out_write(' ')
+    api.nvim_out_write(' ')
   end
-  a.nvim_out_write('\n')
+  api.nvim_out_write('\n')
 end
 
 --- Invalidates this parser and all its children
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 25623c1498..5b87e6ac31 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -1,4 +1,4 @@
-local a = vim.api
+local api = vim.api
 local language = require('vim.treesitter.language')
 
 ---@class Query
@@ -74,7 +74,7 @@ end
 ---@return string[] query_files List of files to load for given query and language
 function M.get_files(lang, query_name, is_included)
   local query_path = string.format('queries/%s/%s.scm', lang, query_name)
-  local lang_files = dedupe_files(a.nvim_get_runtime_file(query_path, true))
+  local lang_files = dedupe_files(api.nvim_get_runtime_file(query_path, true))
 
   if #lang_files == 0 then
     return {}
@@ -635,7 +635,7 @@ end
 ---@return (fun(): integer, TSNode, TSMetadata): capture id, capture node, metadata
 function Query:iter_captures(node, source, start, stop)
   if type(source) == 'number' and source == 0 then
-    source = vim.api.nvim_get_current_buf()
+    source = api.nvim_get_current_buf()
   end
 
   start, stop = value_or_node_range(start, stop, node)
@@ -690,7 +690,7 @@ end
 ---@return (fun(): integer, table<integer,TSNode>, table): pattern id, match, metadata
 function Query:iter_matches(node, source, start, stop)
   if type(source) == 'number' and source == 0 then
-    source = vim.api.nvim_get_current_buf()
+    source = api.nvim_get_current_buf()
   end
 
   start, stop = value_or_node_range(start, stop, node)
-- 
cgit 


From 2dfb51a2bea2d3306fcf46fe28835c9c04afc064 Mon Sep 17 00:00:00 2001
From: "C.D. MacEachern" <craig.daniel.maceachern@gmail.com>
Date: Wed, 5 Apr 2023 16:19:30 -0400
Subject: docs: add vim.treesitter.query.get_query() to deprecated.txt

---
 runtime/doc/deprecated.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 3eb2017bed..3735073867 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -130,6 +130,8 @@ TREESITTER FUNCTIONS
 						instead.
 - *vim.treesitter.get_node_at_cursor()*		Use |vim.treesitter.get_node()|
 						and |TSNode:type()| instead.
+- *vim.treesitter.query.get_query()*		Use |vim.treesitter.query.get()|
+						instead.
 
 LUA
 - vim.register_keystroke_callback()	Use |vim.on_key()| instead.
-- 
cgit 


From e29bc03c046b3a137c2e36b4d34c119b277d62b2 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 6 Apr 2023 15:16:44 +0100
Subject: fix(treesitter): do not track ranges of the root tree (#22912)

Fixes #22911
---
 runtime/lua/vim/treesitter/languagetree.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 703d2a1f6d..4aa07d1b96 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -57,6 +57,7 @@ local Range = require('vim.treesitter._range')
 ---@field private _injection_query Query Queries defining injected languages
 ---@field private _opts table Options
 ---@field private _parser TSParser Parser for language
+---@field private _has_regions boolean
 ---@field private _regions Range6[][]?
 ---List of regions this tree should manage and parse. If nil then regions are
 ---taken from _trees. This is mostly a short-lived cache for included_regions()
@@ -440,6 +441,8 @@ end
 ---@private
 ---@param new_regions Range6[][] List of regions this tree should manage and parse.
 function LanguageTree:set_included_regions(new_regions)
+  self._has_regions = true
+
   -- Transform the tables from 4 element long to 6 element long (with byte offset)
   for _, region in ipairs(new_regions) do
     for i, range in ipairs(region) do
@@ -468,7 +471,8 @@ function LanguageTree:included_regions()
     return self._regions
   end
 
-  if #self._trees == 0 then
+  if not self._has_regions or #self._trees == 0 then
+    -- treesitter.c will default empty ranges to { -1, -1, -1, -1, -1, -1}
     return { {} }
   end
 
@@ -744,6 +748,10 @@ function LanguageTree:_edit(
 
   -- Validate regions after editing the tree
   self:_iter_regions(function(_, region)
+    if #region == 0 then
+      -- empty region, use the full source
+      return false
+    end
     for _, r in ipairs(region) do
       if Range.intercepts(r, changed_range) then
         return false
-- 
cgit 


From 25dfed6e0148771cdb659df8c616df3860583c47 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Thu, 6 Apr 2023 03:33:57 +0200
Subject: feat(api): set statuscolumn line number in nvim_eval_statusline()

Having the user set `v:lnum` before calling `nvim_eval_statusline()` is
unnecesarily fragile. Redraws inbetween setting `v:lnum` and the
`nvim_eval_statusline()` call will overwrite `v:lnum`.
---
 runtime/doc/api.txt  | 4 ++--
 runtime/doc/news.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 52c3f7fa97..09d260e0cd 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -773,8 +773,8 @@ nvim_eval_statusline({str}, {*opts})                  *nvim_eval_statusline()*
                 • use_tabline: (boolean) Evaluate tabline instead of
                   statusline. When true, {winid} is ignored. Mutually
                   exclusive with {use_winbar}.
-                • use_statuscol: (boolean) Evaluate statuscolumn instead of
-                  statusline.
+                • use_statuscol_lnum: (number) Evaluate statuscolumn for this
+                  line number instead of statusline.
 
     Return: ~
         Dictionary containing statusline information, with these keys:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 98f3f3f398..12dc4674af 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -74,7 +74,7 @@ NEW FEATURES                                                    *news-features*
 The following new APIs or features were added.
 
 • |nvim_eval_statusline()| supports evaluating the |'statuscolumn'| through a
-  new `opts` field: `use_statuscol`.
+  new `opts` field: `use_statuscol_lnum`.
 
 • |nvim_buf_get_extmarks()| now accepts a -1 `ns_id` to request extmarks from
   all namespaces and adds the namespace id to the details array.
-- 
cgit 


From 040f1459849ab05b04f6bb1e77b3def16b4c2f2b Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Fri, 7 Apr 2023 13:26:29 +0200
Subject: NVIM v0.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For a summary of notable changes, see runtime/doc/news.txt or run `:help news` within nvim.

BREAKING CHANGES
- Remove hardcopy
- Make iconv a non-optional dep
- Remove has("debug") (#22060)
- Make libintl a required dependency
- Rename vim.pretty_print => vim.print
- Rename sanitizer options from CLANG_* to ENABLE_*
- Remove the .deb release (#22773)
- **column**: Ensure 'statuscolumn' works with virtual and wrapped lines
- **cscope**: Remove
- **defaults**: Change default 'commentstring' value to empty (#22862)
- **edit**: Remove old c implementation of hebrew keymap
- **editorconfig**: Change editorconfig_enable to editorconfig
- **exepath**: Prefers extensionless for powershell
- **health**: Remove deprecated health.lua
- **lsp**: Add rule-based sem token highlighting (#22022)
- **lua**: Execute Lua with "nvim -l"
- **messages**: Graduate the 'msgsep' feature
- **options**: Deprecate paste, remove pastetoggle (#22647)
- **rpc**: Preseve files when stdio channel is closed (#22137)
- **runtime**: Remove filetype.vim (#20428)
- **treesitter**: Remove g:ts_highlight_lua (#22257)
- **treesitter**: Remove silent option from language.add()
- **treesitter**: Consolidate query util functions
- **treesitter**: Remove deprecated show_tree func
- **treesitter**: Deprecate top level indexes to modules (#22761)
- **treesitter**: Rename help parser to vimdoc

FEATURES
- Added support for @generic to lua2dox.lua
- Added support for optional params to lua2dox
- Added support for specifying types for lua2dox
- Mention ":help news" in intro #20674
- ":write ++p" creates parent dirs #20835
- Add vim.secure.read()
- `vim.inspect_pos`, `vim.show_pos`, `:Inspect`
- $NVIM_APPNAME #22128
- Try to recover from missing tempdir #22573
- Add `vim.filetype.get_option()`
- Add `vim.treesitter.language.get_filetypes()` (#22643)
- Allow function passed to defaulttable to take an argument (#22839)
- **api**: Nvim_select_popupmenu_item support cmdline pum (#20652)
- **api**: Add command name to Lua command callback opts
- **api**: Show more exception info
- **api**: More fields in nvim_list_uis
- **api**: Add filetype option nvim_get_option_value
- **api**: Add nvim_get_hl (#22693)
- **api**: Nvim_exec2(), deprecate nvim_exec() #19032
- **api**: Evaluate 'statuscolumn' with nvim_eval_statusline()
- **api**: Set statuscolumn line number in nvim_eval_statusline()
- **aucmd_win**: Allow crazy things with hidden buffers (#21250)
- **checkhealth**: Improve treesitter report
- **checkhealth**: Check runtime ($VIMRUNTIME)
- **checkhealth**: Use "help" syntax, avoid tabpage #20879
- **clipboard**: Copy to system clipboard in tmux when supported (#20936)
- **clipboard**: Added wayclip support (#21091)
- **diagnostic**: Add `suffix` option to `open_float()` (#21130)
- **diagnostic**: Add `suffix` option to `virt_text` config (#21140)
- **diagnostic**: Don't open quickfix/loclist if no diagnostics #21397
- **diagnostic**: Vim.diagnostic.is_disabled() #21527
- **diagnostic**: Add support for tags
- **docs**: Nested lists in HTML, update :help parser
- **docs**: Format parameters as a list #20485
- **docs**: Update parser, HTML gen #20720
- **docs-html**: Try to use tags for ToC headings
- **editorconfig**: Add builtin EditorConfig support
- **editorconfig**: Add editorconfig syntax file
- **editorconfig**: Allow editorconfig to be toggled dynamically
- **exrc**: Use vim.secure.read() for 'exrc' option
- **exrc**: Support .nvim.lua (#21436)
- **extmarks**: Allow preventing spellchecking with spell = false
- **extmarks**: Extend nvim_buf_get_extmarks()
- **filetype**: Fall back to file extension when matching from hashbang (#22140)
- **float**: Open float relative to mouse #21531
- **fs**: Add opts argument to vim.fs.dir()
- **gen_help_html.lua**: Remove old AWK scripts
- **health**: Detect tmux RGB support via `client_termfeatures`
- **help**: Highlighted codeblocks
- **highlight**: Add DiagnosticOk (and associated) highlight groups (#21286)
- **highlight**: Define the concept of altfont as a (c)term rendering attribute
- **l10n**: Update Turkish translations (#20444)
- **l10n**: Update zh_CN translations (#21085)
- **lsp**: Add bufnr option to lsp.start (#20473)
- **lsp**: Support window/showDocument (#19977)
- **lsp**: Run handler in coroutine to support async response (#21026)
- **lsp**: Support set title in lsp relate floatwindow (#21110)
- **lsp**: Support willSave & willSaveWaitUntil capability (#21315)
- **lsp**: Initial support for semantic token highlighting
- **lsp**: Highlight semantic token modifiers (#21390)
- **lsp**: Add function to get semantic tokens at cursor
- **lsp**: Add function to clear codelens (#21504)
- **lsp**: Show active clients in :checkhealth vim.lsp (#21670)
- **lsp**: Add triggerKind option for vim.lsp.buf.code_action (#21905)
- **lsp**: Implement workspace/didChangeWatchedFiles (#21293)
- **lsp**: Implement workspace/didChangeWatchedFiles (#22405)
- **lsp**: Overwrite omnifunc/tagfunc set by ftplugin #22267
- **lsp**: Render markdown in docs hover #22766
- **lsp**: Create default link from @lsp.type.comment to Comment (#22888)
- **lua**: Send "--" literally to Lua "-l" script
- **lua**: Exit 1 on Lua "-l" script error
- **lua**: Execute stdin ("-") as Lua
- **lua**: Store "nvim -l" scriptname in _G.arg[0]
- **lua**: Low-level interpreter mode (nvim -ll)
- **lua**: Make sure require'bit' always works, even with PUC lua 5.1
- **lua**: Add semver api
- **lua**: Omnifunc for builting lua interpreter
- **lua**: Use vim.empty_dict() for empty return value in new api functions  (#22737)
- **lua**: Allow `:=expr` as a shorter version of `:lua =expr`
- **lua**: Add `vim.loader`
- **lua-api**: Avoid unnecessary allocations (#19877)
- **man**: Add health check
- **man.lua**: Support spaces in manpage names
- **message**: Avoid spam on failed os_msg
- **packaging**: Add start menu and desktop shortcuts on Windows
- **provider**: Add support for Yarn node modules on Windows (#21246)
- **secure**: Add `:trust` command  and vim.secure.trust() (#21107)
- **spell**: Support nospell in treesitter queries
- **spell**: Also source `spell/LANG.lua` when setting `spelllang` (#22111)
- **test**: Add Lua forms for API methods (#20152)
- **treesitter**: Add vim.treesitter.show_tree() (#21322)
- **treesitter**: Add 'lang' option to show_tree() (#21341)
- **treesitter**: Show filetype associated with parser (#17633)
- **treesitter**: Allow capture text to be transformed
- **treesitter**: Add metadata option for get_node_text
- **treesitter**: Respect metadata[id].range for offset!
- **treesitter**: Playground improvements
- **treesitter**: Add filetype -> lang API
- **treesitter**: Upstream foldexpr from nvim-treesitter
- **treesitter**: Expand the API
- **treesitter**: Add :InspectTree command (#22477)
- **treesitter**: Bundle query parser and queries (#22483)
- **treesitter**: Use upstream format for injection queries
- **tui**: Run TUI as external process
- **tui**: Graduate the +tui feature
- **tui**: Support altfont mode in tui.c
- **ui**: Add support to display a title in the border of a float (#20184)
- **ui**: Add 'statuscolumn' option
- **ui**: Restore has('gui_running')
- **ui**: Add scroll_delta to win_viewport event #19270
- **vim-patch**: Mention original author #20772
- **vim.diff**: Allow passing an integer for linematch
- **vim.fs**: Pass path to find() predicate, lazy evaluate #22378
- **vim.fs**: Improve normalize
- **vim.gsplit**: Gain features of vim.split
- **vim.version**: More coercion with strict=false
- **web**: Syntax highlighting via highlight.js
- **window/ui**: Add splitkeep option (#19243)
- **windows**: Show icon in terminal titlebar, taskbar #20607

PERFORMANCE
- **column**: Only build fold/sign column when present in 'statuscolumn'
- **completion**: Use one call to globpath() for .vim and .lua #21942
- **diagnostic**: Use api variable and improve validate (#21111)
- **lsp**: Update semantic tokens algorithm for parsing modifiers (#21383)
- **lsp**: Only redraw the windows containing LSP tokens
- **lsp**: Better binary search mid calculation in semantic token (#22607)
- **statuscolumn**: Only fill click defs array once per redraw (#21884)
- **statusline**: UI elements are always redrawn on K_EVENT
- **treesitter**: Smarter languagetree invalidation
- **treesitter**: More efficient foldexpr
- **ui**: Mitigate redraw latency regression from TUI refactor

BUG FIXES
- Make_filter_cmd for :! powershell
- :! pwsh redirection for `command not found`
- Find multibyte file name in line (#20519)
- Change did_emsg back to int
- 'scroll' is not set correctly for floats with 'splitkeep'
- Setting tabline option not redrawing tabline
- Avoid unsigned overflow in home_replace() (#20854)
- Add lfs to luarc.json (#20979)
- Vim.ui.input always calls callback #21006
- Don't disable compositor widgets when a GUI with multigrid attaches
- Pvs warnings (#21145)
- Clang warnings (#21247)
- Vim.opt_local:append ignoring global option value (#21382)
- Issues with command line if ui elements are externalized
- Properly close builtin popup in ext_popupmenu
- Failing XDG test on Windows CI
- Pass value instead of pointer to isalpha (#21898)
- Use correct number for INT_MAX (#21951)
- Add manifest file to correctly determine Windows version (#21953)
- Uv_tty_set_mode failed in Windows #22264
- Lsp github issue template example (#22285)
- Remove "Features" section from --version/:version (#22315)
- Remove "Compiled by:" from :version/--version (#22316)
- Add missing void as function argument (#22317)
- Windows assertion failure due to incorrect path length (#22324)
- Resolve error from -Werror=maybe-uninitialized
- Address -Wmaybe-uninitialized warnings (#22436)
- Pasting in terminal buffer on windows #22566
- Invalid buffer size argument to snprintf #22729
- Snprintf buffer overflow detected by -D_FORTIFY_SOURCE=3 (#22780)
- **MSVC**: Set the active code page to utf-8 (#22384)
- **Windows**: Restore console title at exit #21922
- **api**: Dynamically allocate line buffer for nvim_out_write (#20537)
- **api**: Nvim_buf_get_text regression (#21071)
- **api**: Nvim_win_set_cursor redraw cursorcolumn for non-current window (#21072)
- **api**: Set correct curbuf when temporarily changing curwin (#21371)
- **api**: "emsg_silent" should imply "silent" in nvim_cmd (#21438)
- **api**: Nvim_create_autocmd crash on invalid types inside pattern array
- **api**: Avoid memory leak with click functions in nvim_eval_statusline() (#21845)
- **api**: Don't allow hiding aucmd_win from another tabpage (#21975)
- **api**: Allow empty Lua table for nested dicts #22268
- **api**: Set script context when setting usercmd or option (#22624)
- **api**: Vim.filetype.get_option() (#22753)
- **api**: Make nvim_get_hl return 'cterm' attrs properly
- **api**: Use local LastSet structure in nvim_get_option_info (#22741)
- **api**: Return both link and attributes with nvim_get_hl (#22824)
- **api**: Avoid double hit-enter prompt with nvim_err_writeln (#22879)
- **autocmd**: Handle recursion for force set (#22820)
- **buffer_updates**: Save and restore current window cursor (#16732)
- **build**: "make clean" fails
- **build**: Duplicate version string "v0.8.0-v0.8.0" #20578
- **build**: Fix invalid use of EXITFREE
- **chansend**: Sending lines to terminal in reverse order on Windows #19315
- **ci**: Skip test on windows (#21502)
- **ci/release/winget**: Bump action version
- **client**: Wait for session to exit
- **clint**: Disable whitespace/newline #20619
- **clipboard**: Prefer xsel #20918
- **clipboard**: Update version regex pattern (#21012)
- **clipboard**: Show provider warning when not during batch changes #21451
- **column**: Avoid drawing columns for virt_lines_leftcol
- **column**: Estimate 'statuscolumn' width appropriately
- **column**: No longer reset nrwidth_line_count for 'statuscolumn'
- **column**: Cmdwin cursor is offset with 'statuscolumn' (#22445)
- **column**: Issues with 'statuscolumn' width (#22542)
- **column**: Rebuild status column when sign column is invalidated (#22690)
- **column**: Invalidate statuscolumn width when UPD_NOT_VALID (#22723)
- **completion**: Set pum_size even if ext_popupmenu is used (#20648)
- **completion**: Correct what modes support fuzzy completion
- **completion**: Include lua syntaxes in :ownsyntax completion (#21941)
- **coverity/433537**: Don't call kv_concat_len() when read_size is 0 (#21664)
- **decoration**: Redraw correctly when re-using ids
- **decoration**: Call providers in win_update() earlier
- **decoration**: Do not reset must_redraw after calling providers (#21459)
- **decoration**: Don't show signcolumn for non-sign_text extmark (#22135)
- **diagnostic**: Correct type annotations; add Diagnostic type (#21120)
- **diagnostic**: Clear stale cache on reset (#21454)
- **diagnostic**: Sort diagnostics by column (#21457)
- **diagnostic**: Revert notification on missing diagnostics (#21632)
- **diagnostic**: Use correct field name for tags (#22835)
- **diff**: Remove size_t underflow (#20929)
- **diff**: Fix a crash in diff mode with linematch enabled (#21070)
- **diff**: Handle long lines without crashing (#21389)
- **diff**: Avoid restoring invalid 'foldcolumn' value (#21650)
- **diff**: "nvim -d" should only diff arglist files #21829
- **diff**: Adjust extmarks after diffput/diffget (#22440)
- **diff**: Add NULL check
- **diff**: Trigger on_bytes only once after diffget/diffput
- **diff.c**: Regression in diffgetput (#20843)
- **docs**: Missing "(" in :help HTML
- **docs**: Nil as viable argument for goto_prev (#20852)
- **docs-html**: Keycodes, taglinks, column_heading #20498
- **docs-html**: Update parser
- **docs-html**: Misaligned tabs after conceal #20690
- **edit**: Don't subtract msg_scrolled when removing double quote (#22630)
- **editorconfig**: Do not highlight unknown properties as errors (#21673)
- **embed**: Handle stdio in server properly
- **eval**: Make error number of charidx() same as Vim
- **eval**: Change some tv_dict_add() usages back to hash_add()
- **events**: Save v:event for cmdline autocommands separately (#21316)
- **events**: Skip WinScrolled for newly-created float windows (#21333)
- **ex_cmds**: Fix a mistake in the porting of Vim patch 8.1.0306 (#21096)
- **exit**: The TUI should not ui_flush() itself (#21625)
- **exit**: Skip unnecessary steps in TUI preserve_exit() (#21897)
- **extmarks**: Adjust extmarks when inserting prompt prefix
- **extmarks**: Problems with folded virtual lines (#21930)
- **extmarks**: Don't leak memory on error (#22507)
- **fileio**: Use first available directory in backupdir for backupcopy (#20655)
- **fileio.c**: Don't use uninitialized memory (#22031)
- **filetype**: Don't pass empty string to detect (#20766)
- **filetype**: Correctly detect tex files
- **filetype**: Make vim.filetype.match() work with contents only (#22181)
- **filetype**: Avoid recursive FileType autocmds (#22813)
- **filetype**: Make recursive work...again (#22826)
- **float**: Make closing float in another tab return to correct window
- **float**: Fix ml_get error with bufpos
- **float**: Fix crash with bufpos and non-existent window (#21319)
- **float**: Remove -1 in height clamp
- **folds**: Fix fold marker multibyte comparison (#20439)
- **folds**: Use long for number of folded lines (#21447)
- **folds**: Cursorline highlight is not always applied on closed folds (#22242)
- **folds**: Handle visual blockwise indent insertion correctly (#22898)
- **fs**: Duplicate path separator #21509
- **health**: Correct tmux rgb verification (#20868)
- **health**: Fix `tmux_esc_time` comparison
- **health**: Iterate using ipairs correctly (#22119)
- **health**: Stop using deprecated ts.language.inspect_language() (#22850)
- **help**: Force tree reparse after local addition insertion
- **helpers**: Restore channel id after a call to WITH_SCRIPT_CONTEXT
- **highlight**: Link more treesitter groups by default (#20711)
- **highlight**: Properly deal with underline mask when listing (#22057)
- **highlight**: Avoid ORing underline flags (#22372)
- **highlight**: Use winhl=Foo:Bar even when Bar is empty
- **inspect**: Alwasy resolve full treesitter lang hl groups
- **intro**: Omit patch version in ":help news" item #20713
- **intro**: Make :help news line easier to translate (#21974)
- **lintcommit**: Capitalized description #22282
- **loader**: Disable profiling by default
- **lsp**: Reporting bogus capabilities in CodeActionKind #20678
- **lsp**: Ignore hover and signatureHelp responses on buffer change (#21121)
- **lsp**: Render <pre>{lang} code blocks and set separator default to false (#21271)
- **lsp**: Remove workspaceFolders field (#21284)
- **lsp**: Call show_document with correct args
- **lsp**: Ensure open_logfile is safe for fast events (#21288)
- **lsp**: Followup fixes for semantic tokens support (#21357)
- **lsp**: Correct some type annotations (#21365)
- **lsp**: Fix get_active_clients bufnr parameter (#21366)
- **lsp**: Ignore null responses for semanticTokens request (#21364)
- **lsp**: Token_edit.data might be null on deletion (#21462)
- **lsp**: Adjust gravity of semantic tokens extmarks (#21574)
- **lsp**: Fix nil client access in get_active_clients (#21524)
- **lsp**: Change vim.lsp.get_active_clients.filter name annotation to string (#21624)
- **lsp**: Correct callHierarchy capability to fix lsp.buf.incoming_calls() (#21665)
- **lsp**: Fix `removed` param value in add_workspace_folder (#21915)
- **lsp**: Assert workspace/applyEdit receives params (#21945)
- **lsp**: Check method is supported when range formatting (#21970)
- **lsp**: Check if the buffer is a directory before w! it (#22289)
- **lsp**: Wrong format of bufnr and client order in error message (#22336)
- **lsp**: Fix some type annotations (#22397)
- **lsp**: CallHierarchy methods also require the callHierarchyProvider (#22427)
- **lsp**: Use buffer scheme for files not stored on disk (#22407)
- **lsp**: Only fire LspDetach for attached buffers (#22468)
- **lsp**: Don't monitor files if workspace_folders is nil (#22531)
- **lsp**: Change LspTokenUpdate to use buffer instead of pattern (#22559)
- **lsp**: Prevent lsp tests from picking up local user config (#22606)
- **lsp**: Send didClose on buffer rename (#22623)
- **lsp**: Use line start/end for visual line selection (#22632)
- **lsp**: Remove_workspace_folders fails if client has no workspace_folders #22633
- **lsp**: Vim.lsp.util.apply_text_edits cursor validation #22636
- **lsp**: Kill buffers after renaming a directory #22618
- **lsp**: Avoid switching buffers on lsp attach (#22689)
- **lsp**: Jump to tag locations reliably when :ltag is used (#22750)
- **lsp**: Add missing silent check in lsp hover handler (#22763)
- **lsp/window_showDocument**: Correctly handle external resources #20867
- **lua**: Properly configure luacheck and remove `local vim = ...` lines (#20551)
- **lua**: Assert failure with vim.regex() error inside :silent! (#20555)
- **lua**: On_yank error with blockwise multibyte region #20162
- **lua**: Pesc, tbl_islist result types #20751
- **lua**: Make `vim.deepcopy` work with `vim.NIL`
- **lua**: Always return nil values in vim.tbl_get when no results
- **lua**: Mark some eval functions that can run in API-fast
- **lua**: Vim.deprecate() shows ":help deprecated" #22677
- **luado**: Get old_line length before executing Lua code
- **man**: Support MacOS 13
- **man**: Handle absolute paths as `:Man` targets (#20624)
- **man**: Use italics for `<bs>_` (#22086)
- **man.lua**: Set modifiable before writing page (#20914)
- **man.lua**: Use `env` command (#21007)
- **man.lua**: Open in current window if it's already a man page (#21987)
- **man.lua**: Tests, naming
- **mappings**: Use all buckets in second round of unmap (#21534)
- **mappings**: Fix check for cpo-B inverted in completion
- **mappings**: Make "<" escaping in completion match Vim
- **mark**: Do not restore view in op-pending mode (#20889)
- **memline**: Use long instead of linenr_T for db_line_count
- **memory**: Fix memory alignment for dynamic allocation
- **messages**: Reset msg_grid_scroll_discount when redrawing (#21000)
- **messages**: Don't set cmdline_row when messages have scrolled (#21015)
- **mouse**: Ensure no scrolling with "ver:0" in 'mousescroll' (#20861)
- **mouse**: Statusline click registered as statuscolumn (#21748)
- **options**: No matter what is said, 'cmdheight' is tab-local (susy baka)
- **options**: Fix local 'sidescrolloff' doesn't work for mouse (#21162)
- **options**: Restore exists() behavior for options (#21510)
- **paste**: Feed keys as typed in cmdline mode (#20959)
- **path**: Don't remove trailing slash when getting absolute path (#20853)
- **powershell**: Wrong length allocation for ":%w !" #20530
- **qflist**: Avoid read of uninitialized memory (#20709)
- **rbuffer**: Handle edge case where write_ptr has wrapped around
- **redraw**: Get the line again after evaluating something
- **remote**: Don't leak memory on failure to connect to server (#21931)
- **rpc**: Don't free args on error in rpc_send_event
- **rpc**: Don't parse msgpack if buflen is 0 (#21899)
- **rpc**: Ignore redraw events when not in UI client (#21892)
- **rpc**: Ignore redraw events when exiting (#22184)
- **runtime**: Properly rely on t_Co for colorschemes (#20602)
- **runtime**: Use `g:terminal_color_{0-15}` in colorschemes (#20637)
- **screen**: Correctly draw background and eob with 'rightleft' (#22640)
- **screen**: Redraw the ruler for a current floating window
- **secure**: Crash when hitting escape in prompt (#21283)
- **shell**: On Windows :make does not echo #22728
- **showcmd**: Assert failure with cmdheight=0 (#21536)
- **sleep**: Correct cursor placement (#22639)
- **spell**: Fix wrong cast (#20810)
- **spell**: Properly source spell/LANG.{vim,lua} (#22716)
- **startup**: Support .exrc or .nvimrc with init.lua (#21181)
- **status**: Handle unprintable chars in the statusline
- **statuscolumn**: Fix crashes and clang/PVS warnings (#21725)
- **statuscolumn**: Fix sign column highlights (#21727)
- **statuscolumn**: Foldcolumn buffer is too small (#21761)
- **statuscolumn**: Make %l/%r respect 'number'/'relativenumber' (#21747)
- **statuscolumn**: Always fill click defs array (#21878)
- **statusline**: Don't show showcmd when not enough space (#21550)
- **statusline**: Make nvim_eval_statusline() work with %S (#21553)
- **statusline**: Don't leak memory with zero-width click labels
- **statusline**: Don't leak memory with truncated click labels
- **stdpath**: Default to /tmp if stdpath('run') cannot be created #20952
- **syntax**: Correct conceal for annotated code blocks (#21272)
- **tabline**: Avoid memory leak in tabline click definitions (#21847)
- **terminal**: Fix 'mousescroll' not respected in terminal mode (#21415)
- **test**: Unset XDG_CONFIG_HOME when running oldtest
- **test**: Fix issues detected by running unittests in ASAN/UBSAN
- **test**: Fix C imports on macOS arm64
- **tests**: Only get the color map once, even for multiple test files
- **tests**: Initialize Screen.colors in API highlight tests
- **tests**: Use -l mode for lsp tests
- **tests**: Fixes for using vim.mpack and more ASAN
- **tests**: Adapt treesitter/highlight_spec priority test
- **treesitter**: Properly restore `'syntax'` (#21358)
- **treesitter**: Really restore syntax
- **treesitter**: Validate language name
- **treesitter**: Fix most diagnostics
- **treesitter**: Don't trample parsers when filetype!=lang
- **treesitter**: Make params optional
- **treesitter**: Fixup language invalidation (#22381)
- **treesitter**: Remove virtual text from playground
- **treesitter**: Ipairs -> pairs
- **treesitter**: Fixup for health
- **treesitter**: Maintain cursor position when toggling anonymous nodes
- **treesitter**: Disallow empty filetypes
- **treesitter**: Typos in _range.lua
- **treesitter**: Break early from loop when match is found (#22499)
- **treesitter**: Raise ts_match_limit to 256 (#22497)
- **treesitter**: Is_in_node_range (#22582)
- **treesitter**: Correct include_bytes arg for parse()
- **treesitter**: Do not error on empty filetype
- **treesitter**: Better lang handling of get_parser()
- **treesitter**: Foldexpr (#22652)
- **treesitter**: InspectTree does not respect 'splitright' #22692
- **treesitter**: Annotations
- **treesitter**: Add missing deprecate
- **treesitter**: Update queries from nvim-treesitter
- **treesitter**: Use capture metadata range if exists
- **treesitter**: Disable folding in inspect_tree() (#22885)
- **treesitter**: Do not track ranges of the root tree (#22912)
- **ts**: Check buffer is loaded when restoring options (#21419)
- **tui**: Resume main thread if suspending isn't implemented (#20523)
- **tui**: Set cursor color param as string when required #21407
- **tui**: More work in the TUI
- **tui**: Do not set ui_client_termname if it is already set (#21607)
- **tui**: Make a copy of data->params before unibi_format() (#21643)
- **tui**: Do not invoke loop recursively for pad()
- **tui**: Set stdin as "blocking" on exit (#21973)
- **tui**: Detach/attach on suspend/resume (#22040)
- **tui**: Exit on input eof
- **tui**: Set taskbar, icon in Windows #22270
- **tui**: Only forward stdin_fd on first attach (#22293)
- **tui**: Properly check if stdin is a tty (#22321)
- **tui**: Avoid stack-use-after-scope with cursor color (#22435)
- **tutor**: Failing to get buf name #20933
- **ui**: Msg_ext_set_kind for nvim_echo (#20476)
- **ui**: Setting 'cmdheight' with global statusline (#20515)
- **ui**: Send grid_resize events before triggering VimResized (#20760)
- **ui**: Fix some cases of stale highlight definitions
- **ui**: Allow resize commands to set 'cmdheight' to 0
- **ui**: Fix fragile UI_CALL macro invocation (#21656)
- **ui**: Convert title_pos string in nvim_win_get_config
- **ui**: Set stc to empty in floatwin with minimal style (#21720)
- **ui**: Command line issues with external messages (#21709)
- **ui**: Re-organize tty fd handling and fix issues
- **ui**: Make sure screen is valid after resizing
- **ui**: Recording change doesn't trigger statusline redraw
- **ui**: Ruler is not redrawn in cmdline with redrawstatus
- **ui-ext**: Correct message kind in history before vim.ui_attach()
- **ui-ext**: Log and clear error in ui_comp_event (#21147)
- **ui-ext**: Force cursor update after resize in char-based UI
- **unittest**: Delete unused duplicated code
- **unittests**: Do not consider process crash to be a success
- **unittests**: Fix TUI broken test previously ignored
- **vim-patches**: Ensure libfuse is installed
- **vim.diff**: Correctly apply hunk offsets with linematch (#20931)
- **vim.diff**: Fix fastforward off-by-1 (#20937)
- **vim.ui.input**: Return empty string when inputs nothing (#20883)
- **vim.version**: Incorrect version.cmp()
- **vim.version**: Prerelease compare
- **win_close**: Remove float grid after closing buffer (#21551)
- **win_update**: Don't use unintialized memory in edge case (#22266)
- **windows**: Set console icon later in startup
- **windows**: Consistent normalization in fs.find

BUILD SYSTEM!
- Remove unused variable CMAKE_C_COMPILER_ARG1
- Remove code for cross-compilation
- Remove url for 32-bit winyank
- Remove unnecessary translation-related code
- Rely on builtin cmake downloading rather than custom script
- Define EP_PREFIX property
- Only generate compilation database for the nvim target (#20449)
- Remove EXITFREE for debug builds
- Generate compilation database for older cmake versions
- Add clang-tidy configuration file (#15601)
- Fix incorrect clang-tidy identifier rules (#20650)
- Rely on default cmake installation if possible
- Give example on complex regexes
- Preprocess vim patches with uncrustify #20786
- Copy each treesitter parser library individually #20797
- Fix plural messages missing from .po files (#20830)
- Make update-po support optwin.vim (#20840)
- Remove python linting #20851
- Add EXCLUDE option to add_glob_target
- Always ignore user's cmake preset (#20935)
- Allow IWYU to fix includes for all .c files
- Restrict `git describe` to top level source directory (#20993)
- Fix help tags generation when SHELL=fish (#21562)
- Add git sha to version when built with nix flake (#21210)
- Remove workaround for old luajit versions
- Remove workaround for ancient clang versions
- Use modern cmake (#21589)
- Include our libraries before system libraries (#21746)
- Enable iwyu with target properties instead of variables (#21797)
- Exclude tui/terminfo_defs.h from lintc-clint (#21822)
- Enable cmake workflow presets (#21860)
- Remove nvim as a dependency of unittests (#21903)
- Various cmake fixes (#21902)
- Bump MSVC warning to level two (#21890)
- Use CMAKE_POSITION_INDEPENDENT_CODE instead of -fPIC (#21947)
- Make generated source files reproducible #21586
- Remove unnecessary unit test code (#21940)
- Use cmake for all platforms for unibilium and libtermkey (#21926)
- Simplify treesitter installation (#21969)
- Use upstream CMakeLists.txt for unibilium (#21976)
- Delete pthreads import (#21732)
- Remove GNU make check (#21977)
- Remove tests for libtermkey (#21983)
- Use cmake to build treesitter on all platforms (#21984)
- Introduce default build variables (#21991)
- Use cmake to build libvterm on all platform (#21986)
- Check if libvterm version meets requirement (#22010)
- Find unibilium without relying on libfindmacros (#22015)
- Fix dependencies in find modules (#22017)
- Enable ccache by default if available (#22020)
- Enable ccache project-wide (#22045)
- Add uninstall make target (#22059)
- Remove unnecessary file generation (#22099)
- Update release data
- Stop relying on CMAKE_BUILD_TYPE to determine the build type (#22051)
- Unbreak building neovim with multi-config generators (#22104)
- Don't build libnvim when running the CI (#22149)
- Remove duplicate INTERFACE keyword (#22106)
- Prefer -D <variable>=<value> over -D<variable>=<value> (#22164)
- Replace check-single-includes with clang-tidy (#22061)
- Remove unused function get_test_target (#22176)
- Reuse source files with interface library (#22177)
- Create test/CMakeLists.txt and move test-related code (#22179)
- Remove codecov related files (#20859)
- Mark uninteresting variables as advanced (#22208)
- Enable MSVC level 3 warnings (#21934)
- Don't check environment variable to detect CI (#22234)
- Treat clang-tidy warnings as errors (#22238)
- Remove ENABLE_COMPILER_SUGGESTIONS option (#22249)
- Only use HOSTNAME_PRG if HOSTNAME is undefined (#22288)
- Use custom command to create single versiondef (#22290)
- Use libuv config file (#22209)
- Test multi-config generator (#22310)
- Build all dependencies in parallel (#22329)
- Remove unused dependency penlight (#22334)
- Build luajit in parallel (#22327)
- Set libtermkey project language to C (#22410)
- Remove pkgconfig-related code (#22422)
- Remove libfindmacros library (#22423)
- Cmake cleanup (#22251)
- Unset variables ending with "URL" if USE_EXISTING_SRC_DIR is ON
- Show build type specific compiler flags when using --version
- Fix unknown pragma warning with mingw (#22533)
- Consistently use the provided option paths
- Fix USE_EXISTING_SRC_DIR option
- Silence git describe error output
- Remove workaround for incorrectly packaged libluv
- Enable unit testing on release builds (#22554)
- Fix build warning when using gcc 4.9.2
- Explicitly add dependency include dir for header generation
- Sanitizers for gcc
- Set CMAKE_C_STANDARD to 99 for all dependencies
- Drop curl.exe on Windows
- Download wintools executables separately
- Cmake cleanup
- **MSVC**: Enable assertions on RelWithDebInfo build type (#22326)
- **Windows**: Fix redoing version generation (#21880)
- **Windows**: Make bundling nvim-qt optional (#21866)
- **Windows**: Allow building without custom md5sum
- **bump_deps.lua**: Run command -v in shell (#22030)
- **ci**: Let ASAN print tracebacks for more errors (SIGABORT, SIGILL)
- **cmake**: Add modelines to enable syntax highlighting
- **deps**: Restore support for USE_EXISTING_SRC_DIR (#20491)
- **deps**: Add build type for libuv (#20575)
- **deps**: Disable shared library for libvterm. (#20566)
- **deps**: Bump tree-sitter to v0.20.8 (#22663)
- **deps**: Bump luarocks to v3.9.2
- **deps**: Bump coxpcall to 1.17.0-1
- **deps**: Bump luacheck to 1.1.0-1
- **deps**: Bump mpack to 1.0.10
- **deps**: Bump lua parser to v0.0.14 (#20897)
- **deps**: Switch vim parser to maintained fork (#22896)
- **deps**: Bump vimdoc parser to v2.0.0 (#22870)
- **deps**: Set query parser to release (#22603)
- **deps**: Bump libvterm to v0.3.1
- **deps**: Bump msgpack-c to v6.0.0 (#22522)
- **deps**: Bump win32yank to v0.1.1 (#22700)
- **deps**: Bump actions/stale from 7 to 8
- **deps**: Switch to Launchpad for libvterm and libtermkey (#22811)
- **editorconfig**: Set indent_size to 4 for python files (#21135)
- **lint**: Remove clint.py rules for braces #20880
- **lint**: Add more shell scripts to lintsh
- **lintsh**: Double quote to prevent word splitting (#21571)
- **luarocks**: Update busted version to v2.1.1 (#22029)
- **nix**: Change the pkgs to final, add new version of libvterm (#20410)
- **nix**: Update nixpkgs
- **nix**: Clean up nix flake (#21565)
- **nix**: Remove pylint as it has been removed (#21572)
- **nix**: Fixed build (#22918)
- **vim-patch.sh**: Handle added/removed files properly
- **vim-patch.sh**: Checkout files with path for uncrustify (#20863)
- **windows**: Export extern symbols for use in FFI #22756
- **windows**: Specify Windows 8 as the minimum version (#22173)
- **windows**: Work around luarocks not finding its own md5sum

DOCUMENTATION
- Refer to vim.lsp.start() in LSP issue template #20422
- Fix incorrect :help tag (#20511)
- Added proper annotations to functions in shared.lua
- Fix typos
- Fix/remove invalid URLs #20647
- "supported platforms" matrix #19615
- Update vimdoc parser #20747
- ":che" is ":checkhealth" #20147
- .git-blame-ignore-revs (#20820)
- Swap CursorLineFold and CursorLineSign (#20875)
- Add language annotation to Nvim manual
- Add missing docs from some Vim patches (#21296)
- Dark/light color/accessibilty pass for generated html docs #21345
- Add links to extmarks and namespaces (#21378)
- Remove "How-to disable mouse" menu item #21394
- Add security policy (#17338)
- Fix order of numbers in syntax.txt (#21581)
- Clarify line about converse of lua-heredoc (#21592)
- Fix treesitter parsing errors
- Add 'statuscolumn' docstrings (#21717)
- Builtin TUI is no longer channel 0 (#21794)
- Treesitter.add_directive, add_predicate #21206
- Docs: use codeblocks in runtime/doc/options.txt (#21919)
- Clarify :runtime behavior without [where] again (#22003)
- Clarify "pipe" mode for sockconnect
- Reword news.txt to ensure a consistent style (#22215)
- Remove mentions of 'balloonexpr' #22049
- Remove the test badge from the README (#22350)
- Mention getmousepos() for click execute function label
- Naming conventions, guidelines
- Fix more treesitter parsing errors
- Use build/bin/nvim instead of nvim in gen_vimdoc (#22398)
- Fix vim.treesitter tags
- Lua2dox.lua debugging
- Module-level docstrings (@defgroup) #22498
- Add missing highlight groups for floats
- Add removed features in news.txt
- Fix g:terminal_color_x terminal colors #22746
- More details about vim.region (#21116)
- How to debug TUI using gdb/lldb #22771
- Add vim.treesitter.query.get_query() to deprecated.txt
- **README**: Add Kotlin as a language which can use the API (#21567)
- **README**: Fix CI status badge (#22308)
- **api**: Pattern is not expanded for autocommands (#20812)
- **api**: Fix treesitter parsing errors
- **api**: Tweak data arg for nvim_create_autocmd (#22008)
- **api**: Link to nvim_set_hl_ns from nvim_set_hl (#22678)
- **dev-style**: Remove rule about variable declarations (#20446)
- **dev-style**: Remove rules covered by uncrustify
- **diagnostic**: Number → integer (#22512)
- **docstrings**: Fix runtime type annotations
- **editorconfig**: Update news.txt
- **editorconfig**: Add editorconfig.txt
- **editorconfig**: Number → integer (#22514)
- **filetype**: Number → integer (#22516)
- **gen**: Support language annotation in docstrings
- **gitignore**: Correct oldtest path
- **help**: Consistent headers for local additions
- **highlight**: Fix type annotations (#22272)
- **html**: Render @see items as a list #22675
- **inspect**: Number → integer (#22511)
- **lsp**: Add formatting APIs to deprecated.txt (#20487)
- **lsp**: Update buf_notify and rpc.notify params types (#21753)
- **lsp**: Fix type annotation on convert_input_to_markdown_lines (#21772)
- **lsp**: Format arguments to start_client() (#21980)
- **lsp**: Update cmd_env description (#22438)
- **lsp**: Change type annotations from number → integer (#22510)
- **lsp**: Type annotation for lsp.client (#22509)
- **lsp**: More precise type annotations (#22621)
- **lsp**: Opt-out of default LSP "gq" #22615
- **lua**: Add clarifications for fs.find() and fs.normalize() (#21132)
- **lua**: Correct the tags for vim.opt_local and vim.opt_global (#21138)
- **lua**: Correct vim.spell.check example (#21311)
- **lua**: Add guide to using Lua in Neovim (#21137)
- **lua**: Add `vim.json` (#21538)
- **lua**: Fix treesitter parsing errors
- **lua**: Adjust some type annotations
- **lua**: Lua-guide: <Nop> is for rhs of vim.keymap.set(), not lhs (#21814)
- **lua**: Use luaref tag instead of www.lua.org #21813
- **lua**: Number → integer (#22517)
- **luvref**: Fix treesitter parsing errors
- **luvref**: Update to version bump
- **maintain**: CI strategy #20778
- **maintain**: Add note on updating luvref.txt
- **manual**: Fix treesitter parsing errors
- **news**: Add news.txt and link from README (#20426)
- **options**: Remove mentions of 'imactivatefunc' and 'imstatusfunc'
- **shell**: Mention "&" for piping with powershell #20459
- **support**: Update tested versions (#21126)
- **test**: Using cmake directly (without make) #22781
- **treesitter**: Fix predicate syntax (#21016)
- **treesitter**: Change links for `eq?` and `set!` to codeblocks  (#21047)
- **treesitter**: Use full function names in tags (#21321)
- **treesitter**: Fix parse errors
- **treesitter**: Number → integer (#22513)
- **treesitter**: Add query injections
- **tutor**: Fix TODO line demo (#21965)
- **uri**: Number → integer (#22515)
- **usr**: Make usr_05.txt more coherent with Nvim changes (#22428)
- **usr_05**: Update sentence about Nvim default behavior of Q (#20817)
- **vim.fs**: Normalize Windows example was incorrect (#21966)
- **website**: Soft wrap code blocks #21644

REFACTOR
- Remove char_u type and replace with char, uint8_t, etc
- remove STRNCMP (#21208) and STRLCPY (#21235)
- Remove clint error suppression as all errors has been fixed #21782
- Explicitly convert HANDLE to intptr_t for _open_osfhandle()
- Clang-tidy fixes to silence clangd warning (#20683)
- Fix uncrustify lint errors
- Move do_mouse() and its helpers to mouse.c (#20895)
- Fix clang-tidy warnings
- Click definition functions #20923
- Remove stray emsg check after #20992 (#20996)
- Move tabline code to statusline.c (#21008)
- Convert drawline.c draw states to enum (#21067)
- Remove __STDC_ISO_10646__ check
- Deprecate 'secure' option
- Remove old TODO comments that aren't relevant anymore (#21144)
- Maybe suppress a PVS warning
- Rework parameter validation in vim.secure.trust() (#21223)
- Buffer_ensure_loaded()
- Move ex_retab() to indent.c
- Remove COMMA (#21260)
- Make sure getting a callback doesn't modify argument
- Rename mch_msg => os_msg
- Rename mch_get_acl => os_get_acl
- Eliminate os_unix.c #21621
- Extract code to open stdin for reading
- Eliminate bump-deps.sh using "nvim -l"
- Fix IWYU mapping file and use IWYU (#21802)
- Format with stylua (#21821)
- Remove E5500, adjust tests
- Fix sign conversion warning from gcc (#21833)
- Use uint8_t for blobs and ga_append() (#21916)
- Use flexible arrays instead of the length-of-one trick (#22072)
- Reduce scope of locals as per the style guide (#22206)
- Move init_default_autocmds to lua
- Rename show_tree => inspect_tree #22474
- Move ga_loaded to runtime.c (#22626)
- Do more in TRY_WRAP
- Add const and remove unnecessary casts (#22841)
- Use bool type for global variables (#22842)
- Rename local API alias from a to api
- Make error message definitions const
- Remove use of reserved c++ keywords
- **PVS**: Suppress false positive V547 in drawline.c (#21875)
- **PVS/V1048**: Remove unnecessary assignment (#21870)
- **PVS/V1048**: Remove redundant assignment (#21871)
- **PVS/V1048**: Remove duplicated assignments (#21873)
- **PVS/V581**: Merge identical if statements (#22390)
- **api**: Do not allocate temporaries for internal events
- **api**: VALIDATE macros #22187 #22256 #22262
- **build**: Remove unused stdlib function and include checks
- **build**: Graduate HAVE_LOCALE_H feature
- **build**: Graduate libtreesitter features which are 1+ years old
- **build**: Graduate msgpack-c FLOAT32 "feature" since forever
- **build**: Graduate unibilium VAR_FROM feature from 2017
- **build**: Graduate -Wvla, -fno-common and -Og "features"
- **build**: Make installation of runtime/ more effective
- **checkhealth**: Convert "nvim" check to Lua
- **clint**: Convert short to int16_t (#20815)
- **column**: Remove unused build_statuscol_str() arguments
- **completion**: Don't add and remove '^' for Lua (#22702)
- **diagnostic**: Remove deprecated function (#20423)
- **diagnostic**: DRY for loop #21521
- **diff.c**: Reduce scope of variables (#20781)
- **diff.c**: Break up ex_diffgetput()
- **diff.c**: Allocate hunks directly in ga_array
- **diff.c**: Factor out hunk extraction
- **diff.c**: Factor out hunk processing
- **diff.c**: Simplify diff_buf_idx()
- **diff.c**: Internal does not need diffstyle
- **diff.c**: Factor out diffblock deletion
- **diff.c**: Copy lines via memmove
- **drawline.c**: Leadcol/trailcol
- **drawline.c**: Move number column helpers function together
- **drawscreen.c**: Reduce scopes of locals (#20668)
- **eval**: Make get_lval() explicitly check for v:lua
- **eval.c**: Factor out get_number_tv() (#21893)
- **exit**: Pass error message to preserve_exit() (#22097)
- **extmarks**: Some minor internal API changes
- **f_has**: Remove wrong comment (#21561)
- **fileio.c**: Reduce scope of locals
- **fileio.c**: Refactor match_file_path()
- **fileio.c**: Refactor vim_rename()
- **fileio.c**: Refactor buf_write_bytes
- **fileio.c**: Refactor buf_write_bytes (2)
- **fileio.c**: Remove HAS_BW_FLAGS
- **fileio.c**: Factor out autocmd handling from buf_write()
- **fileio.c**: More bools
- **fileio.c**: Reduce scope of locals
- **fileio.c**: Do not use macros for error handling
- **fileio.c**: Factor out buf_write post autocmds
- **fileio.c**: Factor out file info calc
- **fileio.c**: Make unreadable expression readable
- **fileio.c**: Factor out backup creation
- **fileio.c**: Remove HAVE_ACL ifdefs
- **fileio.c**: Normalize ifdefs
- **fs**: Replace vim.fn/vim.env in vim.fs (#20379)
- **highlight**: Rename FloatBorderTitle #20988
- **highlight**: Reshape the HL_UNDER* bits into a 3-bit integer mask
- **highlight_group.c**: Reduce scope of locals
- **intro**: Avoid Coverity warning (#22000)
- **loader**: Use vim.fs
- **loader**: Remove BufWritePost autocmd
- **loader**: Add typing for package.loaders
- **loader**: Simplify tracking logic
- **loader**: Cache hash information
- **log**: Reduce compile time LOG_LEVEL granularity
- **lsp**: Remove deprecated lsp functions (#20421)
- **lsp**: Extract a _create_server method in lsp_spec
- **lsp**: Remove deprecated vim.lsp.buf_get_clients calls (#21337)
- **lsp**: Remove workaround for missing bit module (#22373)
- **lsp**: Remove deprecated code (#22389)
- **lsp**: Remove _resolve_capabilities_compat (#22628)
- **lsp**: Do not parse verbose output when overwriting options (#22810)
- **lua**: Move _G.arg init to nlua_init()
- **lua**: Get all marks instead of iterating over namespaces
- **lua2dox**: Format with stylua
- **main.c**: Remove unreachable use_builtin_ui conditions (#22338)
- **man**: Pass env directly to spawn() (#20591)
- **man**: Add type annotations
- **memory**: Simplify new alignment logic
- **option.c**: Reduce scope of locals
- **option.c**: Add get_varp_from and get_varp_scope_from
- **option.c**: De-nest set_option_value
- **option.c**: Use intermediate for options ref
- **option.c**: Add do_set_num
- **option.c**: Add do_set_bool
- **option.c**: Simplify do_set_string
- **option.c**: Factor out common skip check
- **option.c**: Factor out loop code from do_set()
- **option.c**: Remove goto
- **option.c**: Change nextchar to uint8_t
- **option.c**: Use skiptowhite_esc
- **option.c**: Factor out set op parsing
- **option.c**: Factor out option prefix parsing
- **option.c**: Factor out option name parsing
- **option.c**: Factor out opt_idx validation
- **option.c**: De-nest code in do_set_option
- **option.c**: Move bool prefix check
- **option.c**: Add do_set_option_value
- **option.c**: Factor out some nextchar checks
- **option.c**: Factor out string option special case handling
- **options**: Don't pass negative number to illegal_char() (#21999)
- **optionstr.c**: Reduce scope of locals
- **optionstr.c**: Break up did_set_string_option 1-52
- **optionstr.c**: Remove some simple did_set_* functions
- **optionstr.c**: Add did_set_string_option_for
- **optionstr.c**: Break up did_option_listflags
- **optionstr.c**: Remove some redundant parens
- **optionstr.c**: Break up did_set_expropt
- **optionstr.c**: Move handling of formatlistpat
- **optionstr.c**: Align comments (#22070)
- **params**: Open -s and -w script files after parsing commands
- **pty**: Remove old logic for inheriting termios from host terminal
- **redraw**: No type argument in update_screen()
- **redraw**: Various simplifications
- **redraw**: Make cursor position redraw use the "redraw later" pattern
- **runtime**: Use vim.version to compare versions #22550
- **runtime.c**: Factor out find_script_by_name() (#22620)
- **screen**: Screen.c delenda est
- **sleep**: Simplify rube goldberg implementation of :sleep
- **spell**: Use uint8_t for "byts" variables (#22519)
- **statusline**: Move statusline defs to statusline_defs.h
- **tag**: Remove return type from do_tag()
- **test**: Create an lsp-specific helpers.lua file
- **tests**: Lift retry() into assert_log()
- **tests**: Run unittests using main nvim binary in interpreter mode
- **tests**: Move lua-client into core and use it for functionaltests
- **treesitter**: Add vim.treesitter.get_node() (#22360)
- **treesitter**: Use string.format to create lines
- **treesitter**: Simplify some range functions
- **treesitter**: Delegate region calculation to treesitter (#22553)
- **treesitter**: Use byte ranges from treesitter (#22589)
- **treesitter**: Add Range type aliase for Range4|Range6
- **treesitter**: Delegate region calculation to treesitter (#22576)
- **treesitter**: Move inspect_tree impl
- **tui**: Use nvim_echo() for verbose terminfo
- **tui/input.c**: Remove unused multithreading code (#22342)
- **ui**: Statusbar invalidation to win_set_inner_size()
- **ui**: Devirtualize the ui layer
- **ui**: Cleanup 'redrawdebug', introduce "flush" mode
- **ui**: Don't reimplement redrawing in focus gained handling
- **ui**: Remove some superfluous ui_flush() calls
- **ui**: Ui_log() can now just be a function
- **uncrustify**: Move macros definitions to enable formatting
- **uncrustify**: Improved formatting rules
- **vim.gsplit**: Remove "keepsep"
- **vim.version**: Cleanup
- **vim.version**: Use lazy.nvim semver module
- **vim.version**: Use lazy.nvim semver module
- **win_close**: Remove "force", don't pass on "free_buf" (#21921)
- **win_line**: Rename attr to vi_attr (#21487)
- **win_line**: Move some variables into a struct (#22490)
- **window**: Remove aucmd_win check from one_window() (#21972)
- **window.c**: Reduce scope of locals (#20301)
- **windows**: Move os_icon_xx functions

TESTING
- Introduce skip() #21010
- Remove skip for 32-bit MSVC (#21030)
- Don't skip parser_spec on windows (#20294)
- Add a Lua test for swap file created before boot
- Fix failing tui_spec.lua tests (#21117)
- Use isCI to simplify CI detection (#21134)
- Simplify platform detection (#21020)
- Adding/removing winbar should not cause win_pos events (#21226)
- Use luv.os_uname for fast platform detection (#21157)
- Add more tests for float window bufpos (#21318)
- Convert another test in test_matchadd_conceal.vim to Lua (#21353)
- Remove unused variable (#21552)
- Add test cases for command line issues
- Add more tests for Unicode
- Avoid consecutive mouse input at different positions (#21781)
- Align Test_shell_options, Test_shellslash with Nvim default
- Avoid noise in NVIM_LOG_FILE
- Exepath() returns correct path with cmd.exe, powershell #21928
- Remove unused field ext_float (#22243)
- Make expect_unchanged() less confusing (#22255)
- Make {MATCH:} behave less unexpectedly in screen:expect()
- Don't search entire repo for files
- Move oldtests to test directory (#22536)
- Use a wider screen in the rightleft winhl test (#22641)
- Unskip working Windows tests (#22537)
- Re-bundle cat on windows (#21255)
- Windows not detected in msys shells #22671
- Use exec_capture() in more places (#22787)
- Fix flaky watchfiles tests (#22637)
- Replace lfs with luv and vim.fs
- Improve editor/fold_spec.lua and editor/put_spec.lua (#22916)
- **Windows**: Normalize paths for test summary
- **api**: Migrate screenchar() test in in window API to screen test
- **editorconfig**: Add editorconfig tests
- **exit_spec**: Make sure that autocommands are triggered (#22188)
- **fileio_spec**: Avoid expect_exit() without calling clear() (#21810)
- **float_spec**: Add missing sum_scroll_delta #22648
- **help**: Drop treesitter parse error to 0
- **highlight_spec**: Fix warning in Visual highlight test (#22719)
- **legacy/prompt_buffer_spec**: Align script with oldtest more (#22354)
- **lsp**: Call clear() before willSave tests (#21336)
- **lsp**: Add a screen:expect() between insert() and feed_command() (#21577)
- **lua/diagnostic_spec**: Remove unnecessary after_each()
- **lua/fs_spec**: Fix vim.fs.dir() test (#21503)
- **lua/ui_spec**: Fix Ctrl-C test flakiness (#21039)
- **old**: Test_lambda.vim garbagecollect() -> test_garbagecollect_now()
- **old**: Remove stray test42 files (#20966)
- **old**: Make Test_help_tagjump() test order match upstream
- **old**: Add missing lines from Vim patch 8.2.0522 (#21048)
- **old**: Make ":h local-additions" work properly in test_help.vim
- **old**: Skip Vim9 script with less divergence
- **old**: Change $TMPDIR from Xtest-tmpdir to X-test-tmpdir (#21346)
- **old**: Make test_signs.vim closer to upstream (#21479)
- **old**: Run some part of 'cpoptions' tests
- **old**: Make getting an unused PID work (#22529)
- **old**: Move memfile_test.c to test/old/ (#22567)
- **old**: Unskip working tests on Windows (#22650)
- **shada**: Fix shada syntax definitions test
- **statuscolumn**: Add more tests for wrapped lines (#21718)
- **statuscolumn**: %l should follow default wrap behavior (#21766)
- **statuscolumn_spec**: Remove unnecessary feed('lh')
- **statusline**: UI elements are not redrawn on K_EVENT unnecessarily
- **syn_attr_spec**: Add more information (#21912)
- **termxx_spec**: Fix TermClose bdelete test flakiness (#22463)
- **treesitter/parser_spec**: Correct time unit (#22471)
- **tui_spec**: Don't use nested terminal for resize at startup (#21583)
- **tui_spec**: Avoid race between nvim_paste and nvim_input (#21639)
- **tui_spec**: Improve cursor_address test (#21700)
- **tui_spec**: Doesn't use Unicode in cursor_address test (#21703)
- **tui_spec**: Make rapid resize test test what it wants to test (#21933)
- **tui_spec**: Don't expect exact screen in rapid resize test (#21935)
- **tui_spec**: Remove unnecessary arguments for remote UI
- **tui_spec**: Use RPC request to setup autocommands
- **ui**: Wait for another success with failure after success
- **undo_spec**: Add more tests for writing in Insert mode
- **unit**: Use file:close() properly (#21505)
- **vim.fs.normalize**: Enable test on Windows
---
 runtime/doc/news.txt     | 221 +++++++++++++++++++++++------------------------
 runtime/nvim.appdata.xml |   1 +
 2 files changed, 111 insertions(+), 111 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 12dc4674af..fea8961dd5 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -1,7 +1,7 @@
 *news.txt*    Nvim
 
 
-			    NVIM REFERENCE MANUAL
+                            NVIM REFERENCE MANUAL
 
 
 Notable changes in Nvim 0.9 from 0.8                                     *news*
@@ -48,71 +48,33 @@ The following changes may require adaptations in user config or plugins.
 • 'paste' option is now deprecated and 'pastetoggle' is removed. |paste| works
   automatically in GUI and terminal (TUI) Nvim.  Just Paste It.™
 
-• libiconv and intl are now required build dependencies.
-
-• Unsaved changes are now preserved rather than discarded when |channel-stdio|
-  is closed.
-
 • Changes to |vim.treesitter.get_node_text()|:
   - It now returns `string`, as opposed to `string|string[]|nil`.
   - The `concat` option has been removed as it was not consistently applied.
   - Invalid ranges now cause an error instead of returning `nil`.
 
-• Renamed vim.pretty_print to vim.print. |deprecated|
-
-• |nvim_exec()| is now deprecated in favor of |nvim_exec2()|.
-
 • `help` treesitter parser was renamed to `vimdoc`. The only user-visible
   change is that language-specific highlight groups need to be renamed from
   `@foo.help` to `@foo.vimdoc`.
 
 • The default value of 'commentstring' is now empty instead of "/*%s*/".
 
+• libiconv and intl are now required build dependencies.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
 The following new APIs or features were added.
 
-• |nvim_eval_statusline()| supports evaluating the |'statuscolumn'| through a
-  new `opts` field: `use_statuscol_lnum`.
-
-• |nvim_buf_get_extmarks()| now accepts a -1 `ns_id` to request extmarks from
-  all namespaces and adds the namespace id to the details array.
-  Other missing properties have been added to the details array and marks can
-  be filtered by type.
-
-• Added a new experimental |lua-loader| that byte-compiles and caches lua files.
-  To enable the new loader, add the following at the top of your |init.lua|: >lua
-    vim.loader.enable()
-
-• Added |lua-version| for parsing and comparing version strings conforming to
-  the semver specification.
-
-• A new environment variable named NVIM_APPNAME enables configuring the
-  directories where Neovim should find its configuration and state files. See
-  `:help $NVIM_APPNAME` .
-
-• |nvim_open_win()| now accepts a relative `mouse` option to open a floating win
-  relative to the mouse. Note that the mouse doesn't update frequently without
-  setting `vim.o.mousemoveevent = true`
-
-• EditorConfig support is now builtin. This is enabled by default and happens
-  automatically. To disable it, users should add >lua
-
-    vim.g.editorconfig = false
+• Treesitter syntax highlighting for `help` files now supports highlighted
+  code examples. To enable, create a `.config/nvim/ftplugin/help.lua` with
+  the contents >lua
+    vim.treesitter.start()
 <
-  (or the Vimscript equivalent) to their |config| file.
-
-• Added support for running Lua scripts from shell using |-l|. >
-      nvim -l foo.lua --arg1 --arg2
-<  Also works with stdin: >
-      echo "print(42)" | nvim -l -
-
-• Added a |vim.lsp.codelens.clear()| function to clear codelenses.
-
-• |vim.inspect_pos()|, |vim.show_pos()| and |:Inspect| allow a user to get or show items
-  at a given buffer position. Currently this includes treesitter captures,
-  semantic tokens, syntax groups and extmarks.
+  Note: Highlighted code examples are only available in the Nvim manual, not
+  in help files taken from Vim. The treesitter `vimdoc` parser is also work in
+  progress and not guaranteed to correctly highlight every help file in the
+  wild.
 
 • Added support for semantic token highlighting to the LSP client. This
   functionality is enabled by default when a client that supports this feature
@@ -122,40 +84,47 @@ The following new APIs or features were added.
 
   See |lsp-semantic-highlight| for more information.
 
+• |vim.inspect_pos()|, |vim.show_pos()| and |:Inspect| allow a user to get or show items
+  at a given buffer position. Currently this includes treesitter captures,
+  LSP semantic tokens, syntax groups and extmarks.
+
 • |vim.treesitter.inspect_tree()| and |:InspectTree| opens a split window
   showing a text representation of the nodes in a language tree for the current
   buffer.
 
-• Added support for the `willSave` and `willSaveWaitUntil` capabilities to the
-  LSP client. `willSaveWaitUntil` allows a server to modify a document before it
-  gets saved. Example use-cases by language servers include removing unused
-  imports, or formatting the file.
+• |'statuscolumn'| option to customize the area to the side of a window,
+  normally containing the fold, sign and number columns. This new option follows
+  the 'statusline' syntax and can be used to transform the line numbers, create
+  mouse click callbacks for |signs|, introduce a custom margin or separator etc.
 
-• Treesitter syntax highlighting for `help` files now supports highlighted
-  code examples. To enable, create a `.config/nvim/ftplugin/help.lua` with
-  the contents >lua
-    vim.treesitter.start()
+• |vim.secure.trust()|, |:trust| allows the user to manage files in trust database.
+  |vim.secure.read()| reads a file and prompts the user if it should be
+  trusted and, if so, returns the file's contents.  Used by 'exrc'
+
+• EditorConfig support is now builtin. This is enabled by default and happens
+  automatically. To disable it, users should add >lua
+
+    vim.g.editorconfig = false
 <
-  Note: Highlighted code examples are only available in the Nvim manual, not
-  in help files taken from Vim. The treesitter `help` parser is also work in
-  progress and not guaranteed to correctly highlight every help file in the
-  wild.
+  (or the Vimscript equivalent) to their |config| file.
 
-• |vim.secure.trust()|, |:trust| allows the user to manage files in trust
-  database.
+• A new environment variable named NVIM_APPNAME enables configuring the
+  directories where Neovim should find its configuration and state files. See
+  `:help $NVIM_APPNAME` .
 
-• |vim.diagnostic.open_float()| (and therefore |vim.diagnostic.config()|) now
-  accepts a `suffix` option which, by default, renders LSP error codes.
-  Similarly, the `virtual_text` configuration in |vim.diagnostic.config()| now
-  has a `suffix` option which does nothing by default.
+• Added support for running Lua scripts from shell using |-l|. >
+      nvim -l foo.lua --arg1 --arg2
+<  Also works with stdin: >
+      echo "print(42)" | nvim -l -
 
-• |vim.fs.dir()| now has a `opts` argument with a depth field to allow
-  recursively searching a directory tree.
+• Added an omnifunc implementation for lua, |vim.lua_omnifunc()|
 
-• |vim.gsplit()| supports all features of |vim.split()|.
+• Added a new experimental |lua-loader| that byte-compiles and caches lua files.
+  To enable the new loader, add the following at the top of your |init.lua|: >lua
+    vim.loader.enable()
 
-• |vim.secure.read()| reads a file and prompts the user if it should be
-  trusted and, if so, returns the file's contents.
+• Added |lua-version| for parsing and comparing version strings conforming to
+  the semver specification.
 
 • When using Nvim inside tmux 3.2 or later, the default clipboard provider
   will now copy to the system clipboard. |provider-clipboard|
@@ -167,34 +136,34 @@ The following new APIs or features were added.
 
 • |'splitkeep'| option to control the scroll behavior of horizontal splits.
 
-• |'statuscolumn'| option to customize the area to the side of a window,
-  normally containing the fold, sign and number columns. This new option follows
-  the 'statusline' syntax and can be used to transform the line numbers, create
-  mouse click callbacks for |signs|, introduce a custom margin or separator etc.
-
-• |nvim_select_popupmenu_item()| now supports |cmdline-completion| popup menu.
-
 • |'diffopt'| now includes a `linematch` option to enable a second-stage diff
   on individual hunks to provide much more accurate diffs. This option is also
   available to |vim.diff()|
 
   See https://github.com/neovim/neovim/pull/14537.
 
-• |vim.diagnostic.is_disabled()| checks if diagnostics are disabled in a given
-  buffer or namespace.
-
 • |--remote-ui| option was added to connect to a remote instance and display
   in it in a |TUI| in the local terminal. This can be used run a headless nvim
   instance in the background and display its UI on demand, which previously
   only was possible using an external UI implementation.
 
-• Several improvements were made to make the code generation scripts more
-  deterministic, and a `LUA_GEN_PRG` build parameter has been introduced to
-  allow for a workaround for some remaining reproducibility problems.
+• Added a |vim.lsp.codelens.clear()| function to clear codelenses.
 
-• |:highlight| now supports an additional attribute "altfont".
+• Added support for the `willSave` and `willSaveWaitUntil` capabilities to the
+  LSP client. `willSaveWaitUntil` allows a server to modify a document before it
+  gets saved. Example use-cases by language servers include removing unused
+  imports, or formatting the file.
 
-• |:Man| manpage viewer supports manpage names containing spaces.
+• Added preliminary support for the `workspace/didChangeWatchedFiles` capability
+  to the LSP client to notify servers of file changes on disk. The feature is
+  disabled by default and can be enabled by setting the
+  `workspace.didChangeWatchedFiles.dynamicRegistration=true` capability.
+
+• |vim.diagnostic| now supports LSP DiagnosticsTag.
+  See: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnosticTag
+
+• |vim.diagnostic.is_disabled()| checks if diagnostics are disabled in a given
+  buffer or namespace.
 
 • Treesitter captures can now be transformed by directives. This will allow
   more complicated dynamic language injections.
@@ -204,8 +173,6 @@ The following new APIs or features were added.
 
 • |vim.treesitter.language.add()| replaces `vim.treesitter.language.require_language`.
 
-• `require'bit'` is now always available |lua-bit|
-
 • |vim.treesitter.foldexpr()| can be used for 'foldexpr' to use treesitter for folding.
 
 • Expanded the TSNode API with:
@@ -216,32 +183,17 @@ The following new APIs or features were added.
 
   Additionally |TSNode:range()| now takes an optional {include_bytes} argument.
 
-• |nvim_list_uis()| reports all |ui-option| fields.
-
-• Vim's `has('gui_running')` is now supported as a way for plugins to check if
-  a GUI (not the |TUI|) is attached to Nvim. |has()|
-
-• Added preliminary support for the `workspace/didChangeWatchedFiles` capability
-  to the LSP client to notify servers of file changes on disk. The feature is
-  disabled by default and can be enabled by setting the
-  `workspace.didChangeWatchedFiles.dynamicRegistration=true` capability.
-
-• Added an omnifunc implementation for lua, |vim.lua_omnifunc()|
-
 • Treesitter injection queries now use the format described at
   https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection .
   Support for the previous format will be removed in a future release.
 
-• |nvim_get_option_value()| now has a `filetype` option so it can return the
-  default option for a specific filetype.
+• Added |nvim_get_hl()| for getting highlight group definitions in a format
+  compatible with |nvim_set_hl()|.
 
 • |vim.filetype.get_option()| to get the default option value for a specific
   filetype. This is a wrapper around |nvim_get_option_value()| with caching.
 
-• Added |nvim_get_hl()| for getting highlight group definitions in a format compatible with |nvim_set_hl()|.
-
-• |vim.diagnostic| now supports LSP DiagnosticsTag.
-  See: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnosticTag
+• `require'bit'` is now always available |lua-bit|
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changes*
@@ -259,6 +211,13 @@ The following changes to existing APIs or features add new behavior.
   resulting in a nvim binary which only could be run headless or embedded
   in an external process. As of this version, TUI is always available.
 
+• Vim's `has('gui_running')` is now supported as a way for plugins to check if
+  a GUI (not the |TUI|) is attached to Nvim. |has()|
+
+• |msgsep| is now always enabled even if 'display' doesn't contain the "msgsep"
+  flag. It is no longer possible to scroll the whole screen when showing
+  messages longer than 'cmdheight'.
+
 • API calls now show more information about where an exception happened.
 
 • The `win_viewport` UI event now contains information about virtual lines,
@@ -269,15 +228,51 @@ The following changes to existing APIs or features add new behavior.
   are unchanged. However `:=#` and similar variants using |ex-flags|
   are no longer supported.
 
+• Unsaved changes are now preserved rather than discarded when |channel-stdio|
+  is closed.
+
+• |nvim_open_win()| now accepts a relative `mouse` option to open a floating win
+  relative to the mouse. Note that the mouse doesn't update frequently without
+  setting `vim.o.mousemoveevent = true`
+
+• |nvim_eval_statusline()| supports evaluating the |'statuscolumn'| through a
+  new `opts` field: `use_statuscol_lnum`.
+
+• |nvim_buf_get_extmarks()| now accepts a -1 `ns_id` to request extmarks from
+  all namespaces and adds the namespace id to the details array.
+  Other missing properties have been added to the details array and marks can
+  be filtered by type.
+
+• |vim.diagnostic.open_float()| (and therefore |vim.diagnostic.config()|) now
+  accepts a `suffix` option which, by default, renders LSP error codes.
+  Similarly, the `virtual_text` configuration in |vim.diagnostic.config()| now
+  has a `suffix` option which does nothing by default.
+
+• |vim.fs.dir()| now has a `opts` argument with a depth field to allow
+  recursively searching a directory tree.
+
+• |vim.gsplit()| supports all features of |vim.split()|.
+
+• |:highlight| now supports an additional attribute "altfont".
+
+• |:Man| manpage viewer supports manpage names containing spaces.
+
+• |nvim_select_popupmenu_item()| now supports |cmdline-completion| popup menu.
+
+• |nvim_list_uis()| reports all |ui-option| fields.
+
+• |nvim_get_option_value()| now has a `filetype` option so it can return the
+  default option for a specific filetype.
+
+• build: Several improvements were made to make the code generation scripts more
+  deterministic, and a `LUA_GEN_PRG` build parameter has been introduced to
+  allow for a workaround for some remaining reproducibility problems.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
 The following deprecated functions or APIs were removed.
 
-• It is no longer possible to scroll the whole screen when showing messages
-  longer than 'cmdheight'. |msgsep| is now always enabled even if 'display'
-  doesn't contain the "msgsep" flag.
-
 • `filetype.vim` is removed in favor of |lua-filetype|
   (Note that filetype logic and tests still align with Vim, so additions or
   changes need to be contributed there first.)
@@ -321,4 +316,8 @@ release.
   `vim.treesitter.query.get_range()`     -> `vim.treesitter.get_range()`
   `vim.treesitter.query.get_node_text()` -> `vim.treesitter.get_node_text()`
 
+• |nvim_exec()| is now deprecated in favor of |nvim_exec2()|.
+
+• Renamed |vim.pretty_print| to |vim.print|.
+
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/nvim.appdata.xml b/runtime/nvim.appdata.xml
index 1fe672b80b..29db9d5ee4 100644
--- a/runtime/nvim.appdata.xml
+++ b/runtime/nvim.appdata.xml
@@ -26,6 +26,7 @@
   </screenshots>
 
   <releases>
+    <release date="2023-04-07" version="0.9.0"/>
     <release date="2023-02-02" version="0.8.3"/>
     <release date="2022-12-29" version="0.8.2"/>
     <release date="2022-11-14" version="0.8.1"/>
-- 
cgit 


From 82cfedab5009c0f5003451ef0b105a019887edb3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 7 Apr 2023 16:11:02 +0200
Subject: docs(news): create new news, rename old news (#22922)

---
 runtime/doc/news-0.9.txt | 323 +++++++++++++++++++++++++++++++++++++++++++++++
 runtime/doc/news.txt     | 293 ++----------------------------------------
 2 files changed, 333 insertions(+), 283 deletions(-)
 create mode 100644 runtime/doc/news-0.9.txt

(limited to 'runtime')

diff --git a/runtime/doc/news-0.9.txt b/runtime/doc/news-0.9.txt
new file mode 100644
index 0000000000..c7624119e2
--- /dev/null
+++ b/runtime/doc/news-0.9.txt
@@ -0,0 +1,323 @@
+*news-0.9.txt*    Nvim
+
+
+                            NVIM REFERENCE MANUAL
+
+
+Notable changes in Nvim 0.9 from 0.8                                 *news-0.9*
+
+                                       Type |gO| to see the table of contents.
+
+==============================================================================
+BREAKING CHANGES
+
+The following changes may require adaptations in user config or plugins.
+
+• Cscope support is now removed (see |cscope| and |nvim-removed|):
+  - Commands removed:
+    - `:cscope`
+    - `:lcscope`
+    - `:scscope`
+    - `:cstag`
+  - Options removed:
+    - `cscopepathcomp`
+    - `cscopeprg`
+    - `cscopequickfix`
+    - `cscoperelative`
+    - `cscopetag`
+    - `cscopetagorder`
+    - `cscopeverbose`
+  - Eval functions removed:
+    - `cscope_connection()`
+
+  Note: support for |ctags| remains with no plans to remove.
+
+  See https://github.com/neovim/neovim/pull/20545 for more information.
+
+• `:hardcopy` is now removed (see |hardcopy| and |nvim-removed|):
+  - Commands removed:
+    - `:hardcopy`
+  - Options removed:
+    - `printdevice`
+    - `printencoding`
+    - `printexpr`
+    - `printfont`
+    - `printheader`
+    - `printmbcharset`
+
+• 'paste' option is now deprecated and 'pastetoggle' is removed. |paste| works
+  automatically in GUI and terminal (TUI) Nvim.  Just Paste It.™
+
+• Changes to |vim.treesitter.get_node_text()|:
+  - It now returns `string`, as opposed to `string|string[]|nil`.
+  - The `concat` option has been removed as it was not consistently applied.
+  - Invalid ranges now cause an error instead of returning `nil`.
+
+• `help` treesitter parser was renamed to `vimdoc`. The only user-visible
+  change is that language-specific highlight groups need to be renamed from
+  `@foo.help` to `@foo.vimdoc`.
+
+• The default value of 'commentstring' is now empty instead of "/*%s*/".
+
+• libiconv and intl are now required build dependencies.
+
+==============================================================================
+NEW FEATURES
+
+The following new APIs or features were added.
+
+• Treesitter syntax highlighting for `help` files now supports highlighted
+  code examples. To enable, create a `.config/nvim/ftplugin/help.lua` with
+  the contents >lua
+    vim.treesitter.start()
+<
+  Note: Highlighted code examples are only available in the Nvim manual, not
+  in help files taken from Vim. The treesitter `vimdoc` parser is also work in
+  progress and not guaranteed to correctly highlight every help file in the
+  wild.
+
+• Added support for semantic token highlighting to the LSP client. This
+  functionality is enabled by default when a client that supports this feature
+  is attached to a buffer. Opt-out can be performed by deleting the
+  `semanticTokensProvider` from the LSP client's {server_capabilities} in the
+  `LspAttach` callback.
+
+  See |lsp-semantic-highlight| for more information.
+
+• |vim.inspect_pos()|, |vim.show_pos()| and |:Inspect| allow a user to get or show items
+  at a given buffer position. Currently this includes treesitter captures,
+  LSP semantic tokens, syntax groups and extmarks.
+
+• |vim.treesitter.inspect_tree()| and |:InspectTree| opens a split window
+  showing a text representation of the nodes in a language tree for the current
+  buffer.
+
+• |'statuscolumn'| option to customize the area to the side of a window,
+  normally containing the fold, sign and number columns. This new option follows
+  the 'statusline' syntax and can be used to transform the line numbers, create
+  mouse click callbacks for |signs|, introduce a custom margin or separator etc.
+
+• |vim.secure.trust()|, |:trust| allows the user to manage files in trust database.
+  |vim.secure.read()| reads a file and prompts the user if it should be
+  trusted and, if so, returns the file's contents.  Used by 'exrc'
+
+• EditorConfig support is now builtin. This is enabled by default and happens
+  automatically. To disable it, users should add >lua
+
+    vim.g.editorconfig = false
+<
+  (or the Vimscript equivalent) to their |config| file.
+
+• A new environment variable named NVIM_APPNAME enables configuring the
+  directories where Neovim should find its configuration and state files. See
+  `:help $NVIM_APPNAME` .
+
+• Added support for running Lua scripts from shell using |-l|. >
+      nvim -l foo.lua --arg1 --arg2
+<  Also works with stdin: >
+      echo "print(42)" | nvim -l -
+
+• Added an omnifunc implementation for lua, |vim.lua_omnifunc()|
+
+• Added a new experimental |lua-loader| that byte-compiles and caches lua files.
+  To enable the new loader, add the following at the top of your |init.lua|: >lua
+    vim.loader.enable()
+
+• Added |lua-version| for parsing and comparing version strings conforming to
+  the semver specification.
+
+• When using Nvim inside tmux 3.2 or later, the default clipboard provider
+  will now copy to the system clipboard. |provider-clipboard|
+
+• |'showcmdloc'| option to display the 'showcmd' information in the
+  status line or tab line. A new %S statusline item is available to place
+  the 'showcmd' text in a custom 'statusline'. Useful for when |'cmdheight'|
+  is set to 0.
+
+• |'splitkeep'| option to control the scroll behavior of horizontal splits.
+
+• |'diffopt'| now includes a `linematch` option to enable a second-stage diff
+  on individual hunks to provide much more accurate diffs. This option is also
+  available to |vim.diff()|
+
+  See https://github.com/neovim/neovim/pull/14537.
+
+• |--remote-ui| option was added to connect to a remote instance and display
+  in it in a |TUI| in the local terminal. This can be used run a headless nvim
+  instance in the background and display its UI on demand, which previously
+  only was possible using an external UI implementation.
+
+• Added a |vim.lsp.codelens.clear()| function to clear codelenses.
+
+• Added support for the `willSave` and `willSaveWaitUntil` capabilities to the
+  LSP client. `willSaveWaitUntil` allows a server to modify a document before it
+  gets saved. Example use-cases by language servers include removing unused
+  imports, or formatting the file.
+
+• Added preliminary support for the `workspace/didChangeWatchedFiles` capability
+  to the LSP client to notify servers of file changes on disk. The feature is
+  disabled by default and can be enabled by setting the
+  `workspace.didChangeWatchedFiles.dynamicRegistration=true` capability.
+
+• |vim.diagnostic| now supports LSP DiagnosticsTag.
+  See: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnosticTag
+
+• |vim.diagnostic.is_disabled()| checks if diagnostics are disabled in a given
+  buffer or namespace.
+
+• Treesitter captures can now be transformed by directives. This will allow
+  more complicated dynamic language injections.
+
+• |vim.treesitter.get_node_text()| now accepts a `metadata` option for
+  writing custom directives using |vim.treesitter.query.add_directive()|.
+
+• |vim.treesitter.language.add()| replaces `vim.treesitter.language.require_language`.
+
+• |vim.treesitter.foldexpr()| can be used for 'foldexpr' to use treesitter for folding.
+
+• Expanded the TSNode API with:
+  - |TSNode:tree()|
+  - |TSNode:has_changes()|
+  - |TSNode:extra()|
+  - |TSNode:equal()|
+
+  Additionally |TSNode:range()| now takes an optional {include_bytes} argument.
+
+• Treesitter injection queries now use the format described at
+  https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection .
+  Support for the previous format will be removed in a future release.
+
+• Added |nvim_get_hl()| for getting highlight group definitions in a format
+  compatible with |nvim_set_hl()|.
+
+• |vim.filetype.get_option()| to get the default option value for a specific
+  filetype. This is a wrapper around |nvim_get_option_value()| with caching.
+
+• `require'bit'` is now always available |lua-bit|
+
+==============================================================================
+CHANGED FEATURES
+
+The following changes to existing APIs or features add new behavior.
+
+• 'exrc' now supports `.nvim.lua` file.
+• 'exrc' is no longer marked deprecated.
+
+• The |TUI| is changed to run in a separate process (previously, a separate
+  thread was used). This is not supposed to be a visible change to the user,
+  but might be the cause of subtle changes of behavior and bugs.
+
+  Previously, the TUI could be disabled as a build time feature (+tui/-tui),
+  resulting in a nvim binary which only could be run headless or embedded
+  in an external process. As of this version, TUI is always available.
+
+• Vim's `has('gui_running')` is now supported as a way for plugins to check if
+  a GUI (not the |TUI|) is attached to Nvim. |has()|
+
+• |msgsep| is now always enabled even if 'display' doesn't contain the "msgsep"
+  flag. It is no longer possible to scroll the whole screen when showing
+  messages longer than 'cmdheight'.
+
+• API calls now show more information about where an exception happened.
+
+• The `win_viewport` UI event now contains information about virtual lines,
+  meaning that smooth scrolling can now be implemented more consistently.
+
+• The `:= {expr}` syntax can be used to evaluate a lua expression, as
+  a shorter form of `:lua ={expr}`. `:=` and `:[range]=` without argument
+  are unchanged. However `:=#` and similar variants using |ex-flags|
+  are no longer supported.
+
+• Unsaved changes are now preserved rather than discarded when |channel-stdio|
+  is closed.
+
+• |nvim_open_win()| now accepts a relative `mouse` option to open a floating win
+  relative to the mouse. Note that the mouse doesn't update frequently without
+  setting `vim.o.mousemoveevent = true`
+
+• |nvim_eval_statusline()| supports evaluating the |'statuscolumn'| through a
+  new `opts` field: `use_statuscol_lnum`.
+
+• |nvim_buf_get_extmarks()| now accepts a -1 `ns_id` to request extmarks from
+  all namespaces and adds the namespace id to the details array.
+  Other missing properties have been added to the details array and marks can
+  be filtered by type.
+
+• |vim.diagnostic.open_float()| (and therefore |vim.diagnostic.config()|) now
+  accepts a `suffix` option which, by default, renders LSP error codes.
+  Similarly, the `virtual_text` configuration in |vim.diagnostic.config()| now
+  has a `suffix` option which does nothing by default.
+
+• |vim.fs.dir()| now has a `opts` argument with a depth field to allow
+  recursively searching a directory tree.
+
+• |vim.gsplit()| supports all features of |vim.split()|.
+
+• |:highlight| now supports an additional attribute "altfont".
+
+• |:Man| manpage viewer supports manpage names containing spaces.
+
+• |nvim_select_popupmenu_item()| now supports |cmdline-completion| popup menu.
+
+• |nvim_list_uis()| reports all |ui-option| fields.
+
+• |nvim_get_option_value()| now has a `filetype` option so it can return the
+  default option for a specific filetype.
+
+• build: Several improvements were made to make the code generation scripts more
+  deterministic, and a `LUA_GEN_PRG` build parameter has been introduced to
+  allow for a workaround for some remaining reproducibility problems.
+
+==============================================================================
+REMOVED FEATURES
+
+The following deprecated functions or APIs were removed.
+
+• `filetype.vim` is removed in favor of |lua-filetype|
+  (Note that filetype logic and tests still align with Vim, so additions or
+  changes need to be contributed there first.)
+  See https://github.com/neovim/neovim/pull/20674.
+
+• 'hkmap', 'hkmapp' and 'aleph' options were removed. Use 'keymap' option instead.
+
+• |LanguageTree:parse()| no longer returns changed regions. Please use the
+  `on_changedtree` callbacks instead.
+
+• `vim.highlight.create()`, `vim.highlight.link()` were removed, use |nvim_set_hl()| instead.
+
+• `require'health'` was removed. Use |vim.health| instead.
+
+==============================================================================
+DEPRECATIONS
+
+The following functions are now deprecated and will be removed in the next
+release.
+
+• |vim.treesitter.language.add()| replaces `vim.treesitter.language.require_language()`
+
+• |vim.treesitter.get_node_at_pos()| and |vim.treesitter.get_node_at_cursor()|
+  are both deprecated in favor of |vim.treesitter.get_node()|.
+
+• `vim.api.nvim_get_hl_by_name()`, `vim.api.nvim_get_hl_by_id()` were deprecated, use |nvim_get_hl()| instead.
+
+• The following top level Treesitter functions have been moved:
+  `vim.treesitter.inspect_language()`    -> `vim.treesitter.language.inspect()`
+  `vim.treesitter.get_query_files()`     -> `vim.treesitter.query.get_files()`
+  `vim.treesitter.set_query()`           -> `vim.treesitter.query.set()`
+  `vim.treesitter.query.set_query()`     -> `vim.treesitter.query.set()`
+  `vim.treesitter.get_query()`           -> `vim.treesitter.query.get()`
+  `vim.treesitter.query.get_query()`     -> `vim.treesitter.query.get()`
+  `vim.treesitter.parse_query()`         -> `vim.treesitter.query.parse()`
+  `vim.treesitter.query.parse_query()`   -> `vim.treesitter.query.parse()`
+  `vim.treesitter.add_predicate()`       -> `vim.treesitter.query.add_predicate()`
+  `vim.treesitter.add_directive()`       -> `vim.treesitter.query.add_directive()`
+  `vim.treesitter.list_predicates()`     -> `vim.treesitter.query.list_predicates()`
+  `vim.treesitter.list_directives()`     -> `vim.treesitter.query.list_directives()`
+  `vim.treesitter.query.get_range()`     -> `vim.treesitter.get_range()`
+  `vim.treesitter.query.get_node_text()` -> `vim.treesitter.get_node_text()`
+
+• |nvim_exec()| is now deprecated in favor of |nvim_exec2()|.
+
+• Renamed |vim.pretty_print()| to |vim.print()|.
+
+ vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index fea8961dd5..e73dd111f1 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -4,7 +4,9 @@
                             NVIM REFERENCE MANUAL
 
 
-Notable changes in Nvim 0.9 from 0.8                                     *news*
+Notable changes in Nvim 0.10 from 0.9                                    *news*
+
+For changes in Nvim 0.9, see |news-0.9|.
 
                                        Type |gO| to see the table of contents.
 
@@ -13,279 +15,28 @@ BREAKING CHANGES                                                *news-breaking*
 
 The following changes may require adaptations in user config or plugins.
 
-• Cscope support is now removed (see |cscope| and |nvim-removed|):
-  - Commands removed:
-    - `:cscope`
-    - `:lcscope`
-    - `:scscope`
-    - `:cstag`
-  - Options removed:
-    - `cscopepathcomp`
-    - `cscopeprg`
-    - `cscopequickfix`
-    - `cscoperelative`
-    - `cscopetag`
-    - `cscopetagorder`
-    - `cscopeverbose`
-  - Eval functions removed:
-    - `cscope_connection()`
-
-  Note: support for |ctags| remains with no plans to remove.
-
-  See https://github.com/neovim/neovim/pull/20545 for more information.
-
-• `:hardcopy` is now removed (see |hardcopy| and |nvim-removed|):
-  - Commands removed:
-    - `:hardcopy`
-  - Options removed:
-    - `printdevice`
-    - `printencoding`
-    - `printexpr`
-    - `printfont`
-    - `printheader`
-    - `printmbcharset`
-
-• 'paste' option is now deprecated and 'pastetoggle' is removed. |paste| works
-  automatically in GUI and terminal (TUI) Nvim.  Just Paste It.™
-
-• Changes to |vim.treesitter.get_node_text()|:
-  - It now returns `string`, as opposed to `string|string[]|nil`.
-  - The `concat` option has been removed as it was not consistently applied.
-  - Invalid ranges now cause an error instead of returning `nil`.
-
-• `help` treesitter parser was renamed to `vimdoc`. The only user-visible
-  change is that language-specific highlight groups need to be renamed from
-  `@foo.help` to `@foo.vimdoc`.
-
-• The default value of 'commentstring' is now empty instead of "/*%s*/".
-
-• libiconv and intl are now required build dependencies.
+• ...
 
 ==============================================================================
-NEW FEATURES                                                    *news-features*
+ADDED FEATURES                                                     *news-added*
 
 The following new APIs or features were added.
 
-• Treesitter syntax highlighting for `help` files now supports highlighted
-  code examples. To enable, create a `.config/nvim/ftplugin/help.lua` with
-  the contents >lua
-    vim.treesitter.start()
-<
-  Note: Highlighted code examples are only available in the Nvim manual, not
-  in help files taken from Vim. The treesitter `vimdoc` parser is also work in
-  progress and not guaranteed to correctly highlight every help file in the
-  wild.
-
-• Added support for semantic token highlighting to the LSP client. This
-  functionality is enabled by default when a client that supports this feature
-  is attached to a buffer. Opt-out can be performed by deleting the
-  `semanticTokensProvider` from the LSP client's {server_capabilities} in the
-  `LspAttach` callback.
-
-  See |lsp-semantic-highlight| for more information.
-
-• |vim.inspect_pos()|, |vim.show_pos()| and |:Inspect| allow a user to get or show items
-  at a given buffer position. Currently this includes treesitter captures,
-  LSP semantic tokens, syntax groups and extmarks.
-
-• |vim.treesitter.inspect_tree()| and |:InspectTree| opens a split window
-  showing a text representation of the nodes in a language tree for the current
-  buffer.
-
-• |'statuscolumn'| option to customize the area to the side of a window,
-  normally containing the fold, sign and number columns. This new option follows
-  the 'statusline' syntax and can be used to transform the line numbers, create
-  mouse click callbacks for |signs|, introduce a custom margin or separator etc.
-
-• |vim.secure.trust()|, |:trust| allows the user to manage files in trust database.
-  |vim.secure.read()| reads a file and prompts the user if it should be
-  trusted and, if so, returns the file's contents.  Used by 'exrc'
-
-• EditorConfig support is now builtin. This is enabled by default and happens
-  automatically. To disable it, users should add >lua
-
-    vim.g.editorconfig = false
-<
-  (or the Vimscript equivalent) to their |config| file.
-
-• A new environment variable named NVIM_APPNAME enables configuring the
-  directories where Neovim should find its configuration and state files. See
-  `:help $NVIM_APPNAME` .
-
-• Added support for running Lua scripts from shell using |-l|. >
-      nvim -l foo.lua --arg1 --arg2
-<  Also works with stdin: >
-      echo "print(42)" | nvim -l -
-
-• Added an omnifunc implementation for lua, |vim.lua_omnifunc()|
-
-• Added a new experimental |lua-loader| that byte-compiles and caches lua files.
-  To enable the new loader, add the following at the top of your |init.lua|: >lua
-    vim.loader.enable()
-
-• Added |lua-version| for parsing and comparing version strings conforming to
-  the semver specification.
-
-• When using Nvim inside tmux 3.2 or later, the default clipboard provider
-  will now copy to the system clipboard. |provider-clipboard|
-
-• |'showcmdloc'| option to display the 'showcmd' information in the
-  status line or tab line. A new %S statusline item is available to place
-  the 'showcmd' text in a custom 'statusline'. Useful for when |'cmdheight'|
-  is set to 0.
-
-• |'splitkeep'| option to control the scroll behavior of horizontal splits.
-
-• |'diffopt'| now includes a `linematch` option to enable a second-stage diff
-  on individual hunks to provide much more accurate diffs. This option is also
-  available to |vim.diff()|
-
-  See https://github.com/neovim/neovim/pull/14537.
-
-• |--remote-ui| option was added to connect to a remote instance and display
-  in it in a |TUI| in the local terminal. This can be used run a headless nvim
-  instance in the background and display its UI on demand, which previously
-  only was possible using an external UI implementation.
-
-• Added a |vim.lsp.codelens.clear()| function to clear codelenses.
-
-• Added support for the `willSave` and `willSaveWaitUntil` capabilities to the
-  LSP client. `willSaveWaitUntil` allows a server to modify a document before it
-  gets saved. Example use-cases by language servers include removing unused
-  imports, or formatting the file.
-
-• Added preliminary support for the `workspace/didChangeWatchedFiles` capability
-  to the LSP client to notify servers of file changes on disk. The feature is
-  disabled by default and can be enabled by setting the
-  `workspace.didChangeWatchedFiles.dynamicRegistration=true` capability.
-
-• |vim.diagnostic| now supports LSP DiagnosticsTag.
-  See: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnosticTag
-
-• |vim.diagnostic.is_disabled()| checks if diagnostics are disabled in a given
-  buffer or namespace.
-
-• Treesitter captures can now be transformed by directives. This will allow
-  more complicated dynamic language injections.
-
-• |vim.treesitter.get_node_text()| now accepts a `metadata` option for
-  writing custom directives using |vim.treesitter.query.add_directive()|.
-
-• |vim.treesitter.language.add()| replaces `vim.treesitter.language.require_language`.
-
-• |vim.treesitter.foldexpr()| can be used for 'foldexpr' to use treesitter for folding.
-
-• Expanded the TSNode API with:
-  - |TSNode:tree()|
-  - |TSNode:has_changes()|
-  - |TSNode:extra()|
-  - |TSNode:equal()|
-
-  Additionally |TSNode:range()| now takes an optional {include_bytes} argument.
-
-• Treesitter injection queries now use the format described at
-  https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection .
-  Support for the previous format will be removed in a future release.
-
-• Added |nvim_get_hl()| for getting highlight group definitions in a format
-  compatible with |nvim_set_hl()|.
-
-• |vim.filetype.get_option()| to get the default option value for a specific
-  filetype. This is a wrapper around |nvim_get_option_value()| with caching.
-
-• `require'bit'` is now always available |lua-bit|
+• ...
 
 ==============================================================================
-CHANGED FEATURES                                                 *news-changes*
+CHANGED FEATURES                                                 *news-changed*
 
 The following changes to existing APIs or features add new behavior.
 
-• 'exrc' now supports `.nvim.lua` file.
-• 'exrc' is no longer marked deprecated.
-
-• The |TUI| is changed to run in a separate process (previously, a separate
-  thread was used). This is not supposed to be a visible change to the user,
-  but might be the cause of subtle changes of behavior and bugs.
-
-  Previously, the TUI could be disabled as a build time feature (+tui/-tui),
-  resulting in a nvim binary which only could be run headless or embedded
-  in an external process. As of this version, TUI is always available.
-
-• Vim's `has('gui_running')` is now supported as a way for plugins to check if
-  a GUI (not the |TUI|) is attached to Nvim. |has()|
-
-• |msgsep| is now always enabled even if 'display' doesn't contain the "msgsep"
-  flag. It is no longer possible to scroll the whole screen when showing
-  messages longer than 'cmdheight'.
-
-• API calls now show more information about where an exception happened.
-
-• The `win_viewport` UI event now contains information about virtual lines,
-  meaning that smooth scrolling can now be implemented more consistently.
-
-• The `:= {expr}` syntax can be used to evaluate a lua expression, as
-  a shorter form of `:lua ={expr}`. `:=` and `:[range]=` without argument
-  are unchanged. However `:=#` and similar variants using |ex-flags|
-  are no longer supported.
-
-• Unsaved changes are now preserved rather than discarded when |channel-stdio|
-  is closed.
-
-• |nvim_open_win()| now accepts a relative `mouse` option to open a floating win
-  relative to the mouse. Note that the mouse doesn't update frequently without
-  setting `vim.o.mousemoveevent = true`
-
-• |nvim_eval_statusline()| supports evaluating the |'statuscolumn'| through a
-  new `opts` field: `use_statuscol_lnum`.
-
-• |nvim_buf_get_extmarks()| now accepts a -1 `ns_id` to request extmarks from
-  all namespaces and adds the namespace id to the details array.
-  Other missing properties have been added to the details array and marks can
-  be filtered by type.
-
-• |vim.diagnostic.open_float()| (and therefore |vim.diagnostic.config()|) now
-  accepts a `suffix` option which, by default, renders LSP error codes.
-  Similarly, the `virtual_text` configuration in |vim.diagnostic.config()| now
-  has a `suffix` option which does nothing by default.
-
-• |vim.fs.dir()| now has a `opts` argument with a depth field to allow
-  recursively searching a directory tree.
-
-• |vim.gsplit()| supports all features of |vim.split()|.
-
-• |:highlight| now supports an additional attribute "altfont".
-
-• |:Man| manpage viewer supports manpage names containing spaces.
-
-• |nvim_select_popupmenu_item()| now supports |cmdline-completion| popup menu.
-
-• |nvim_list_uis()| reports all |ui-option| fields.
-
-• |nvim_get_option_value()| now has a `filetype` option so it can return the
-  default option for a specific filetype.
-
-• build: Several improvements were made to make the code generation scripts more
-  deterministic, and a `LUA_GEN_PRG` build parameter has been introduced to
-  allow for a workaround for some remaining reproducibility problems.
+• ...
 
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
 The following deprecated functions or APIs were removed.
 
-• `filetype.vim` is removed in favor of |lua-filetype|
-  (Note that filetype logic and tests still align with Vim, so additions or
-  changes need to be contributed there first.)
-  See https://github.com/neovim/neovim/pull/20674.
-
-• 'hkmap', 'hkmapp' and 'aleph' options were removed. Use 'keymap' option instead.
-
-• |LanguageTree:parse()| no longer returns changed regions. Please use the
-  `on_changedtree` callbacks instead.
-
-• `vim.highlight.create()`, `vim.highlight.link()` were removed, use |nvim_set_hl()| instead.
-
-• `require'health'` was removed. Use |vim.health| instead.
+• ...
 
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
@@ -293,31 +44,7 @@ DEPRECATIONS                                                *news-deprecations*
 The following functions are now deprecated and will be removed in the next
 release.
 
-• |vim.treesitter.language.add()| replaces `vim.treesitter.language.require_language()`
-
-• |vim.treesitter.get_node_at_pos()| and |vim.treesitter.get_node_at_cursor()|
-  are both deprecated in favor of |vim.treesitter.get_node()|.
-
-• `vim.api.nvim_get_hl_by_name()`, `vim.api.nvim_get_hl_by_id()` were deprecated, use |nvim_get_hl()| instead.
-
-• The following top level Treesitter functions have been moved:
-  `vim.treesitter.inspect_language()`    -> `vim.treesitter.language.inspect()`
-  `vim.treesitter.get_query_files()`     -> `vim.treesitter.query.get_files()`
-  `vim.treesitter.set_query()`           -> `vim.treesitter.query.set()`
-  `vim.treesitter.query.set_query()`     -> `vim.treesitter.query.set()`
-  `vim.treesitter.get_query()`           -> `vim.treesitter.query.get()`
-  `vim.treesitter.query.get_query()`     -> `vim.treesitter.query.get()`
-  `vim.treesitter.parse_query()`         -> `vim.treesitter.query.parse()`
-  `vim.treesitter.query.parse_query()`   -> `vim.treesitter.query.parse()`
-  `vim.treesitter.add_predicate()`       -> `vim.treesitter.query.add_predicate()`
-  `vim.treesitter.add_directive()`       -> `vim.treesitter.query.add_directive()`
-  `vim.treesitter.list_predicates()`     -> `vim.treesitter.query.list_predicates()`
-  `vim.treesitter.list_directives()`     -> `vim.treesitter.query.list_directives()`
-  `vim.treesitter.query.get_range()`     -> `vim.treesitter.get_range()`
-  `vim.treesitter.query.get_node_text()` -> `vim.treesitter.get_node_text()`
-
-• |nvim_exec()| is now deprecated in favor of |nvim_exec2()|.
+• ...
 
-• Renamed |vim.pretty_print| to |vim.print|.
 
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
-- 
cgit 


From d675bd01b1e78b93e559320b262bdae40b3b54b2 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Fri, 7 Apr 2023 08:22:47 -0600
Subject: feat(lua): allow vim.F.if_nil to take multiple arguments (#22903)

The first argument which is non-nil is returned. This is useful when
using nested default values (e.g. in the EditorConfig plugin).

Before:

  local enable = vim.F.if_nil(vim.b.editorconfig, vim.F.if_nil(vim.g.editorconfig, true))

After:

  local enable = vim.F.if_nil(vim.b.editorconfig, vim.g.editorconfig, true)
---
 runtime/lua/vim/F.lua           | 31 +++++++++++++++++++++----------
 runtime/plugin/editorconfig.lua |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/F.lua b/runtime/lua/vim/F.lua
index 3e370c0a84..16c834b371 100644
--- a/runtime/lua/vim/F.lua
+++ b/runtime/lua/vim/F.lua
@@ -1,18 +1,29 @@
 local F = {}
 
---- Returns {a} if it is not nil, otherwise returns {b}.
+--- Returns the first argument which is not nil.
 ---
----@generic A
----@generic B
+--- If all arguments are nil, returns nil.
 ---
----@param a A
----@param b B
----@return A | B
-function F.if_nil(a, b)
-  if a == nil then
-    return b
+--- Examples:
+--- <pre>
+--- local a = nil
+--- local b = nil
+--- local c = 42
+--- local d = true
+--- assert(vim.F.if_nil(a, b, c, d) == 42)
+--- </pre>
+---
+---@param ... any
+---@return any
+function F.if_nil(...)
+  local nargs = select('#', ...)
+  for i = 1, nargs do
+    local v = select(i, ...)
+    if v ~= nil then
+      return v
+    end
   end
-  return a
+  return nil
 end
 
 -- Use in combination with pcall
diff --git a/runtime/plugin/editorconfig.lua b/runtime/plugin/editorconfig.lua
index 54cd0e828e..a96919e1fe 100644
--- a/runtime/plugin/editorconfig.lua
+++ b/runtime/plugin/editorconfig.lua
@@ -3,7 +3,7 @@ vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead', 'BufFilePost' }, {
   group = group,
   callback = function(args)
     -- Buffer-local enable has higher priority
-    local enable = vim.F.if_nil(vim.b.editorconfig, vim.F.if_nil(vim.g.editorconfig, true))
+    local enable = vim.F.if_nil(vim.b.editorconfig, vim.g.editorconfig, true)
     if not enable then
       return
     end
-- 
cgit 


From e6d3f87dfd71dde94aebce600fd11cb954af1ba9 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 8 Apr 2023 19:27:58 +0800
Subject: fix(termdebug): handle partial lines passed to callback (#22950)

Problem:
Job callbacks in termdebug cannot handle partial lines.

Solution:
Add a wrapper function that handles partial lines and only passes full
lines to the real callback.

Fix #22929.
---
 .../pack/dist/opt/termdebug/plugin/termdebug.vim    | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 99fd7dba42..d653f71281 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -245,7 +245,7 @@ func s:StartDebug_term(dict)
 
   " Create a hidden terminal window to communicate with gdb
   let s:comm_job_id = jobstart('tail -f /dev/null;#gdb communication', {
-        \ 'on_stdout': function('s:CommOutput'),
+        \ 'on_stdout': function('s:JobOutCallback', {'last_line': '', 'real_cb': function('s:CommOutput')}),
         \ 'pty': v:true,
         \ })
   " hide terminal buffer
@@ -430,7 +430,7 @@ func s:StartDebug_prompt(dict)
   " call ch_log('executing "' . join(gdb_cmd) . '"')
   let s:gdbjob = jobstart(gdb_cmd, {
     \ 'on_exit': function('s:EndPromptDebug'),
-    \ 'on_stdout': function('s:GdbOutCallback'),
+    \ 'on_stdout': function('s:JobOutCallback', {'last_line': '', 'real_cb': function('s:GdbOutCallback')}),
     \ })
   if s:gdbjob == 0
     echoerr 'invalid argument (or job table is full) while starting gdb job'
@@ -594,6 +594,23 @@ func s:PromptInterrupt()
   endif
 endfunc
 
+" Wrapper around job callback that handles partial lines (:h channel-lines).
+" It should be called from a Dictionary with the following keys:
+" - last_line: the last (partial) line received
+" - real_cb: a callback that assumes full lines
+func s:JobOutCallback(jobid, data, event) dict
+  let eof = (a:data == [''])
+  let msgs = a:data
+  let msgs[0] = self.last_line .. msgs[0]
+  if eof
+    let self.last_line = ''
+  else
+    let self.last_line = msgs[-1]
+    unlet msgs[-1]
+  endif
+  call self.real_cb(a:jobid, msgs, a:event)
+endfunc
+
 " Function called when gdb outputs text.
 func s:GdbOutCallback(job_id, msgs, event)
   "call ch_log('received from gdb: ' . a:text)
-- 
cgit 


From 747264320c6d8c022fdcb3c9b22f81c9e472e571 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 8 Apr 2023 20:29:23 +0800
Subject: refactor(mappings)!: remove #n as a notation for a function key
 (#17318)

This notation is hardly used and makes the behavior of the from_part
argument of nvim_replace_termcodes confusing.
---
 runtime/doc/map.txt      | 26 ++++----------------------
 runtime/doc/news.txt     |  3 ++-
 runtime/doc/vim_diff.txt |  4 +++-
 3 files changed, 9 insertions(+), 24 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index c65007d1a4..cd374c6f34 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -540,28 +540,10 @@ See |:verbose-cmd| for more information.
 
 1.5 MAPPING SPECIAL KEYS				*:map-special-keys*
 
-There are two ways to map a special key:
-1. The Vi-compatible method: Map the key code.  Often this is a sequence that
-   starts with <Esc>.  To enter a mapping like this you type ":map " and then
-   you have to type CTRL-V before hitting the function key.  Note that when
-   the key code for the key is in the |terminfo| entry, it will automatically
-   be translated into the internal code and become the second way of mapping.
-2. The second method is to use the internal code for the function key.  To
-   enter such a mapping type CTRL-K and then hit the function key, or use
-   the form "#1", "#2", .. "#9", "#0", "<Up>", "<S-Down>", "<S-F7>", etc.
-   (see table of keys |key-notation|, all keys from <Up> can be used).  The
-   first ten function keys can be defined in two ways: Just the number, like
-   "#2", and with "<F>", like "<F2>".  Both stand for function key 2.  "#0"
-   refers to function key 10.
-
-DETAIL: Vim first checks if a sequence from the keyboard is mapped.  If it
-isn't the terminal key codes are tried.  If a terminal code is found it is
-replaced with the internal code.  Then the check for a mapping is done again
-(so you can map an internal code to something else).  What is written into the
-script file depends on what is recognized. If the terminal key code was
-recognized as a mapping the key code itself is written to the script file.  If
-it was recognized as a terminal code the internal code is written to the
-script file.
+To map a function key, use the internal code for it.  To enter such a mapping
+type CTRL-K and then hit the function key, or use the form "<F2>", "<F10>",
+"<Up>", "<S-Down>", "<S-F7>", etc. (see table of keys |key-notation|, all keys
+from <Up> can be used).
 
 
 1.6 SPECIAL CHARACTERS					*:map-special-chars*
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index e73dd111f1..6e2a1b1d3f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -15,7 +15,8 @@ BREAKING CHANGES                                                *news-breaking*
 
 The following changes may require adaptations in user config or plugins.
 
-• ...
+• "#" followed by a digit no longer stands for a function key at the start of
+  the lhs of a mapping.
 
 ==============================================================================
 ADDED FEATURES                                                     *news-added*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 609184c82c..7228473676 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -496,8 +496,10 @@ Macro/|recording| behavior
   the results of keys from 'keymap'.
 
 Mappings:
-  Creating a mapping for a simplifiable key (e.g. <C-I>) doesn't replace an
+- Creating a mapping for a simplifiable key (e.g. <C-I>) doesn't replace an
   existing mapping for its simplified form (e.g. <Tab>).
+- "#" followed by a digit doesn't stand for a function key at the start of the
+  lhs of a mapping.
 
 Motion:
   The |jumplist| avoids useless/phantom jumps.
-- 
cgit 


From 99c86bae15d22981e48c2d18f5903d7b4286f543 Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Sat, 8 Apr 2023 20:19:39 +0300
Subject: docs: add `hl-DiagnosticDeprecated` and `hl-DiagnosticUnnecessary`

---
 runtime/doc/diagnostic.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index f888bb0991..025a7dccfc 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -295,6 +295,14 @@ DiagnosticSignHint
 DiagnosticSignOk
     Used for "Ok" signs in sign column.
 
+                                                *hl-DiagnosticDeprecated*
+DiagnosticDeprecated
+    Used for deprecated or obsolete code.
+
+                                                *hl-DiagnosticUnnecessary*
+DiagnosticUnnecessary
+    Used for unnecessary or unused code.
+
 ==============================================================================
 SIGNS                                                   *diagnostic-signs*
 
-- 
cgit 


From 41b7586cbb947b3215489fd7445b9bfb6e7008d2 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 9 Apr 2023 20:46:53 +0200
Subject: refactor: rewrite clipboard provider healthchecks in Lua

This is required to remove the vimscript checkhealth functions.
---
 runtime/autoload/health/provider.vim  | 755 ----------------------------------
 runtime/autoload/health/provider2.vim | 729 ++++++++++++++++++++++++++++++++
 runtime/lua/provider/health.lua       |  55 +++
 3 files changed, 784 insertions(+), 755 deletions(-)
 delete mode 100644 runtime/autoload/health/provider.vim
 create mode 100644 runtime/autoload/health/provider2.vim
 create mode 100644 runtime/lua/provider/health.lua

(limited to 'runtime')

diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
deleted file mode 100644
index 70f525156c..0000000000
--- a/runtime/autoload/health/provider.vim
+++ /dev/null
@@ -1,755 +0,0 @@
-let s:shell_error = 0
-
-function! s:is_bad_response(s) abort
-  return a:s =~? '\v(^unable)|(^error)|(^outdated)'
-endfunction
-
-function! s:trim(s) abort
-  return substitute(a:s, '^\_s*\|\_s*$', '', 'g')
-endfunction
-
-" Convert '\' to '/'. Collapse '//' and '/./'.
-function! s:normalize_path(s) abort
-  return substitute(substitute(a:s, '\', '/', 'g'), '/\./\|/\+', '/', 'g')
-endfunction
-
-" Returns TRUE if `cmd` exits with success, else FALSE.
-function! s:cmd_ok(cmd) abort
-  call system(a:cmd)
-  return v:shell_error == 0
-endfunction
-
-" Handler for s:system() function.
-function! s:system_handler(jobid, data, event) dict abort
-  if a:event ==# 'stderr'
-    if self.add_stderr_to_output
-      let self.output .= join(a:data, '')
-    else
-      let self.stderr .= join(a:data, '')
-    endif
-  elseif a:event ==# 'stdout'
-    let self.output .= join(a:data, '')
-  elseif a:event ==# 'exit'
-    let s:shell_error = a:data
-  endif
-endfunction
-
-" Attempts to construct a shell command from an args list.
-" Only for display, to help users debug a failed command.
-function! s:shellify(cmd) abort
-  if type(a:cmd) != type([])
-    return a:cmd
-  endif
-  return join(map(copy(a:cmd),
-    \'v:val =~# ''\m[^\-.a-zA-Z_/]'' ? shellescape(v:val) : v:val'), ' ')
-endfunction
-
-" Run a system command and timeout after 30 seconds.
-function! s:system(cmd, ...) abort
-  let stdin = a:0 ? a:1 : ''
-  let ignore_error = a:0 > 2 ? a:3 : 0
-  let opts = {
-        \ 'add_stderr_to_output': a:0 > 1 ? a:2 : 0,
-        \ 'output': '',
-        \ 'stderr': '',
-        \ 'on_stdout': function('s:system_handler'),
-        \ 'on_stderr': function('s:system_handler'),
-        \ 'on_exit': function('s:system_handler'),
-        \ }
-  let jobid = jobstart(a:cmd, opts)
-
-  if jobid < 1
-    call health#report_error(printf('Command error (job=%d): `%s` (in %s)',
-          \ jobid, s:shellify(a:cmd), string(getcwd())))
-    let s:shell_error = 1
-    return opts.output
-  endif
-
-  if !empty(stdin)
-    call jobsend(jobid, stdin)
-  endif
-
-  let res = jobwait([jobid], 30000)
-  if res[0] == -1
-    call health#report_error(printf('Command timed out: %s', s:shellify(a:cmd)))
-    call jobstop(jobid)
-  elseif s:shell_error != 0 && !ignore_error
-    let emsg = printf("Command error (job=%d, exit code %d): `%s` (in %s)",
-          \ jobid, s:shell_error, s:shellify(a:cmd), string(getcwd()))
-    if !empty(opts.output)
-      let emsg .= "\noutput: " . opts.output
-    end
-    if !empty(opts.stderr)
-      let emsg .= "\nstderr: " . opts.stderr
-    end
-    call health#report_error(emsg)
-  endif
-
-  return opts.output
-endfunction
-
-function! s:systemlist(cmd, ...) abort
-  let stdout = split(s:system(a:cmd, a:0 ? a:1 : ''), "\n")
-  if a:0 > 1 && !empty(a:2)
-    return filter(stdout, '!empty(v:val)')
-  endif
-  return stdout
-endfunction
-
-" Fetch the contents of a URL.
-function! s:download(url) abort
-  let has_curl = executable('curl')
-  if has_curl && system(['curl', '-V']) =~# 'Protocols:.*https'
-    let rv = s:system(['curl', '-sL', a:url], '', 1, 1)
-    return s:shell_error ? 'curl error with '.a:url.': '.s:shell_error : rv
-  elseif executable('python')
-    let script = "
-          \try:\n
-          \    from urllib.request import urlopen\n
-          \except ImportError:\n
-          \    from urllib2 import urlopen\n
-          \\n
-          \response = urlopen('".a:url."')\n
-          \print(response.read().decode('utf8'))\n
-          \"
-    let rv = s:system(['python', '-c', script])
-    return empty(rv) && s:shell_error
-          \ ? 'python urllib.request error: '.s:shell_error
-          \ : rv
-  endif
-  return 'missing `curl` '
-          \ .(has_curl ? '(with HTTPS support) ' : '')
-          \ .'and `python`, cannot make web request'
-endfunction
-
-" Check for clipboard tools.
-function! s:check_clipboard() abort
-  call health#report_start('Clipboard (optional)')
-
-  if !empty($TMUX) && executable('tmux') && executable('pbpaste') && !s:cmd_ok('pbpaste')
-    let tmux_version = matchstr(system('tmux -V'), '\d\+\.\d\+')
-    call health#report_error('pbcopy does not work with tmux version: '.tmux_version,
-          \ ['Install tmux 2.6+.  https://superuser.com/q/231130',
-          \  'or use tmux with reattach-to-user-namespace.  https://superuser.com/a/413233'])
-  endif
-
-  let clipboard_tool = provider#clipboard#Executable()
-  if exists('g:clipboard') && empty(clipboard_tool)
-    call health#report_error(
-          \ provider#clipboard#Error(),
-          \ ["Use the example in :help g:clipboard as a template, or don't set g:clipboard at all."])
-  elseif empty(clipboard_tool)
-    call health#report_warn(
-          \ 'No clipboard tool found. Clipboard registers (`"+` and `"*`) will not work.',
-          \ [':help clipboard'])
-  else
-    call health#report_ok('Clipboard tool found: '. clipboard_tool)
-  endif
-endfunction
-
-" Get the latest Nvim Python client (pynvim) version from PyPI.
-function! s:latest_pypi_version() abort
-  let pypi_version = 'unable to get pypi response'
-  let pypi_response = s:download('https://pypi.python.org/pypi/pynvim/json')
-  if !empty(pypi_response)
-    try
-      let pypi_data = json_decode(pypi_response)
-    catch /E474/
-      return 'error: '.pypi_response
-    endtry
-    let pypi_version = get(get(pypi_data, 'info', {}), 'version', 'unable to parse')
-  endif
-  return pypi_version
-endfunction
-
-" Get version information using the specified interpreter.  The interpreter is
-" used directly in case breaking changes were introduced since the last time
-" Nvim's Python client was updated.
-"
-" Returns: [
-"     {python executable version},
-"     {current nvim version},
-"     {current pypi nvim status},
-"     {installed version status}
-" ]
-function! s:version_info(python) abort
-  let pypi_version = s:latest_pypi_version()
-  let python_version = s:trim(s:system([
-        \ a:python,
-        \ '-c',
-        \ 'import sys; print(".".join(str(x) for x in sys.version_info[:3]))',
-        \ ]))
-
-  if empty(python_version)
-    let python_version = 'unable to parse '.a:python.' response'
-  endif
-
-  let nvim_path = s:trim(s:system([
-        \ a:python, '-c',
-        \ 'import sys; ' .
-        \ 'sys.path = [p for p in sys.path if p != ""]; ' .
-        \ 'import neovim; print(neovim.__file__)']))
-  if s:shell_error || empty(nvim_path)
-    return [python_version, 'unable to load neovim Python module', pypi_version,
-          \ nvim_path]
-  endif
-
-  " Assuming that multiple versions of a package are installed, sort them
-  " numerically in descending order.
-  function! s:compare(metapath1, metapath2) abort
-    let a = matchstr(fnamemodify(a:metapath1, ':p:h:t'), '[0-9.]\+')
-    let b = matchstr(fnamemodify(a:metapath2, ':p:h:t'), '[0-9.]\+')
-    return a == b ? 0 : a > b ? 1 : -1
-  endfunction
-
-  " Try to get neovim.VERSION (added in 0.1.11dev).
-  let nvim_version = s:system([a:python, '-c',
-        \ 'from neovim import VERSION as v; '.
-        \ 'print("{}.{}.{}{}".format(v.major, v.minor, v.patch, v.prerelease))'],
-        \ '', 1, 1)
-  if empty(nvim_version)
-    let nvim_version = 'unable to find pynvim module version'
-    let base = fnamemodify(nvim_path, ':h')
-    let metas = glob(base.'-*/METADATA', 1, 1)
-          \ + glob(base.'-*/PKG-INFO', 1, 1)
-          \ + glob(base.'.egg-info/PKG-INFO', 1, 1)
-    let metas = sort(metas, 's:compare')
-
-    if !empty(metas)
-      for meta_line in readfile(metas[0])
-        if meta_line =~# '^Version:'
-          let nvim_version = matchstr(meta_line, '^Version: \zs\S\+')
-          break
-        endif
-      endfor
-    endif
-  endif
-
-  let nvim_path_base = fnamemodify(nvim_path, ':~:h')
-  let version_status = 'unknown; '.nvim_path_base
-  if !s:is_bad_response(nvim_version) && !s:is_bad_response(pypi_version)
-    if v:lua.vim.version.lt(nvim_version, pypi_version)
-      let version_status = 'outdated; from '.nvim_path_base
-    else
-      let version_status = 'up to date'
-    endif
-  endif
-
-  return [python_version, nvim_version, pypi_version, version_status]
-endfunction
-
-" Check the Python interpreter's usability.
-function! s:check_bin(bin) abort
-  if !filereadable(a:bin) && (!has('win32') || !filereadable(a:bin.'.exe'))
-    call health#report_error(printf('"%s" was not found.', a:bin))
-    return 0
-  elseif executable(a:bin) != 1
-    call health#report_error(printf('"%s" is not executable.', a:bin))
-    return 0
-  endif
-  return 1
-endfunction
-
-" Check "loaded" var for given a:provider.
-" Returns 1 if the caller should return (skip checks).
-function! s:disabled_via_loaded_var(provider) abort
-  let loaded_var = 'g:loaded_'.a:provider.'_provider'
-  if exists(loaded_var) && !exists('*provider#'.a:provider.'#Call')
-    let v = eval(loaded_var)
-    if 0 is v
-      call health#report_info('Disabled ('.loaded_var.'='.v.').')
-      return 1
-    else
-      call health#report_info('Disabled ('.loaded_var.'='.v.').  This might be due to some previous error.')
-    endif
-  endif
-  return 0
-endfunction
-
-function! s:check_python() abort
-  call health#report_start('Python 3 provider (optional)')
-
-  let pyname = 'python3'
-  let python_exe = ''
-  let venv = exists('$VIRTUAL_ENV') ? resolve($VIRTUAL_ENV) : ''
-  let host_prog_var = pyname.'_host_prog'
-  let python_multiple = []
-
-  if s:disabled_via_loaded_var(pyname)
-    return
-  endif
-
-  let [pyenv, pyenv_root] = s:check_for_pyenv()
-
-  if exists('g:'.host_prog_var)
-    call health#report_info(printf('Using: g:%s = "%s"', host_prog_var, get(g:, host_prog_var)))
-  endif
-
-  let [pyname, pythonx_warnings] = provider#pythonx#Detect(3)
-
-  if empty(pyname)
-    call health#report_warn('No Python executable found that can `import neovim`. '
-            \ . 'Using the first available executable for diagnostics.')
-  elseif exists('g:'.host_prog_var)
-    let python_exe = pyname
-  endif
-
-  " No Python executable could `import neovim`, or host_prog_var was used.
-  if !empty(pythonx_warnings)
-    call health#report_warn(pythonx_warnings, ['See :help provider-python for more information.',
-          \ 'You may disable this provider (and warning) by adding `let g:loaded_python3_provider = 0` to your init.vim'])
-
-  elseif !empty(pyname) && empty(python_exe)
-    if !exists('g:'.host_prog_var)
-      call health#report_info(printf('`g:%s` is not set.  Searching for '
-            \ . '%s in the environment.', host_prog_var, pyname))
-    endif
-
-    if !empty(pyenv)
-      let python_exe = s:trim(s:system([pyenv, 'which', pyname], '', 1))
-
-      if empty(python_exe)
-        call health#report_warn(printf('pyenv could not find %s.', pyname))
-      endif
-    endif
-
-    if empty(python_exe)
-      let python_exe = exepath(pyname)
-
-      if exists('$PATH')
-        for path in split($PATH, has('win32') ? ';' : ':')
-          let path_bin = s:normalize_path(path.'/'.pyname)
-          if path_bin != s:normalize_path(python_exe)
-                \ && index(python_multiple, path_bin) == -1
-                \ && executable(path_bin)
-            call add(python_multiple, path_bin)
-          endif
-        endfor
-
-        if len(python_multiple)
-          " This is worth noting since the user may install something
-          " that changes $PATH, like homebrew.
-          call health#report_info(printf('Multiple %s executables found.  '
-                \ . 'Set `g:%s` to avoid surprises.', pyname, host_prog_var))
-        endif
-
-        if python_exe =~# '\<shims\>'
-          call health#report_warn(printf('`%s` appears to be a pyenv shim.', python_exe), [
-                      \ '`pyenv` is not in $PATH, your pyenv installation is broken. '
-                      \ .'Set `g:'.host_prog_var.'` to avoid surprises.',
-                      \ ])
-        endif
-      endif
-    endif
-  endif
-
-  if !empty(python_exe) && !exists('g:'.host_prog_var)
-    if empty(venv) && !empty(pyenv)
-          \ && !empty(pyenv_root) && resolve(python_exe) !~# '^'.pyenv_root.'/'
-      call health#report_warn('pyenv is not set up optimally.', [
-            \ printf('Create a virtualenv specifically '
-            \ . 'for Nvim using pyenv, and set `g:%s`.  This will avoid '
-            \ . 'the need to install the pynvim module in each '
-            \ . 'version/virtualenv.', host_prog_var)
-            \ ])
-    elseif !empty(venv)
-      if !empty(pyenv_root)
-        let venv_root = pyenv_root
-      else
-        let venv_root = fnamemodify(venv, ':h')
-      endif
-
-      if resolve(python_exe) !~# '^'.venv_root.'/'
-        call health#report_warn('Your virtualenv is not set up optimally.', [
-              \ printf('Create a virtualenv specifically '
-              \ . 'for Nvim and use `g:%s`.  This will avoid '
-              \ . 'the need to install the pynvim module in each '
-              \ . 'virtualenv.', host_prog_var)
-              \ ])
-      endif
-    endif
-  endif
-
-  if empty(python_exe) && !empty(pyname)
-    " An error message should have already printed.
-    call health#report_error(printf('`%s` was not found.', pyname))
-  elseif !empty(python_exe) && !s:check_bin(python_exe)
-    let python_exe = ''
-  endif
-
-  " Diagnostic output
-  call health#report_info('Executable: ' . (empty(python_exe) ? 'Not found' : python_exe))
-  if len(python_multiple)
-    for path_bin in python_multiple
-      call health#report_info('Other python executable: ' . path_bin)
-    endfor
-  endif
-
-  if empty(python_exe)
-    " No Python executable can import 'neovim'. Check if any Python executable
-    " can import 'pynvim'. If so, that Python failed to import 'neovim' as
-    " well, which is most probably due to a failed pip upgrade:
-    " https://github.com/neovim/neovim/wiki/Following-HEAD#20181118
-    let [pynvim_exe, errors] = provider#pythonx#DetectByModule('pynvim', 3)
-    if !empty(pynvim_exe)
-      call health#report_error(
-            \ 'Detected pip upgrade failure: Python executable can import "pynvim" but '
-            \ . 'not "neovim": '. pynvim_exe,
-            \ "Use that Python version to reinstall \"pynvim\" and optionally \"neovim\".\n"
-            \ . pynvim_exe ." -m pip uninstall pynvim neovim\n"
-            \ . pynvim_exe ." -m pip install pynvim\n"
-            \ . pynvim_exe ." -m pip install neovim  # only if needed by third-party software")
-    endif
-  else
-    let [majorpyversion, current, latest, status] = s:version_info(python_exe)
-
-    if 3 != str2nr(majorpyversion)
-      call health#report_warn('Unexpected Python version.' .
-                  \ ' This could lead to confusing error messages.')
-    endif
-
-    call health#report_info('Python version: ' . majorpyversion)
-
-    if s:is_bad_response(status)
-      call health#report_info(printf('pynvim version: %s (%s)', current, status))
-    else
-      call health#report_info(printf('pynvim version: %s', current))
-    endif
-
-    if s:is_bad_response(current)
-      call health#report_error(
-        \ "pynvim is not installed.\nError: ".current,
-        \ ['Run in shell: '. python_exe .' -m pip install pynvim'])
-    endif
-
-    if s:is_bad_response(latest)
-      call health#report_warn('Could not contact PyPI to get latest version.')
-      call health#report_error('HTTP request failed: '.latest)
-    elseif s:is_bad_response(status)
-      call health#report_warn(printf('Latest pynvim is NOT installed: %s', latest))
-    elseif !s:is_bad_response(current)
-      call health#report_ok(printf('Latest pynvim is installed.'))
-    endif
-  endif
-endfunction
-
-" Check if pyenv is available and a valid pyenv root can be found, then return
-" their respective paths. If either of those is invalid, return two empty
-" strings, effectively ignoring pyenv.
-function! s:check_for_pyenv() abort
-  let pyenv_path = resolve(exepath('pyenv'))
-
-  if empty(pyenv_path)
-    return ['', '']
-  endif
-
-  call health#report_info('pyenv: Path: '. pyenv_path)
-
-  let pyenv_root = exists('$PYENV_ROOT') ? resolve($PYENV_ROOT) : ''
-
-  if empty(pyenv_root)
-    let pyenv_root = s:trim(s:system([pyenv_path, 'root']))
-    call health#report_info('pyenv: $PYENV_ROOT is not set. Infer from `pyenv root`.')
-  endif
-
-  if !isdirectory(pyenv_root)
-    call health#report_warn(
-          \ printf('pyenv: Root does not exist: %s. '
-          \ . 'Ignoring pyenv for all following checks.', pyenv_root))
-    return ['', '']
-  endif
-
-  call health#report_info('pyenv: Root: '.pyenv_root)
-
-  return [pyenv_path, pyenv_root]
-endfunction
-
-" Resolves Python executable path by invoking and checking `sys.executable`.
-function! s:python_exepath(invocation) abort
-  return s:normalize_path(system(fnameescape(a:invocation)
-    \ . ' -c "import sys; sys.stdout.write(sys.executable)"'))
-endfunction
-
-" Checks that $VIRTUAL_ENV Python executables are found at front of $PATH in
-" Nvim and subshells.
-function! s:check_virtualenv() abort
-  call health#report_start('Python virtualenv')
-  if !exists('$VIRTUAL_ENV')
-    call health#report_ok('no $VIRTUAL_ENV')
-    return
-  endif
-  let errors = []
-  " Keep hints as dict keys in order to discard duplicates.
-  let hints = {}
-  " The virtualenv should contain some Python executables, and those
-  " executables should be first both on Nvim's $PATH and the $PATH of
-  " subshells launched from Nvim.
-  let bin_dir = has('win32') ? '/Scripts' : '/bin'
-  let venv_bins = glob($VIRTUAL_ENV . bin_dir . '/python*', v:true, v:true)
-  " XXX: Remove irrelevant executables found in bin/.
-  let venv_bins = filter(venv_bins, 'v:val !~# "python-config"')
-  if len(venv_bins)
-    for venv_bin in venv_bins
-      let venv_bin = s:normalize_path(venv_bin)
-      let py_bin_basename = fnamemodify(venv_bin, ':t')
-      let nvim_py_bin = s:python_exepath(exepath(py_bin_basename))
-      let subshell_py_bin = s:python_exepath(py_bin_basename)
-      if venv_bin !=# nvim_py_bin
-        call add(errors, '$PATH yields this '.py_bin_basename.' executable: '.nvim_py_bin)
-        let hint = '$PATH ambiguities arise if the virtualenv is not '
-          \.'properly activated prior to launching Nvim. Close Nvim, activate the virtualenv, '
-          \.'check that invoking Python from the command line launches the correct one, '
-          \.'then relaunch Nvim.'
-        let hints[hint] = v:true
-      endif
-      if venv_bin !=# subshell_py_bin
-        call add(errors, '$PATH in subshells yields this '
-          \.py_bin_basename . ' executable: '.subshell_py_bin)
-        let hint = '$PATH ambiguities in subshells typically are '
-          \.'caused by your shell config overriding the $PATH previously set by the '
-          \.'virtualenv. Either prevent them from doing so, or use this workaround: '
-          \.'https://vi.stackexchange.com/a/34996'
-        let hints[hint] = v:true
-      endif
-    endfor
-  else
-    call add(errors, 'no Python executables found in the virtualenv '.bin_dir.' directory.')
-  endif
-
-  let msg = '$VIRTUAL_ENV is set to: '.$VIRTUAL_ENV
-  if len(errors)
-    if len(venv_bins)
-      let msg .= "\nAnd its ".bin_dir.' directory contains: '
-        \.join(map(venv_bins, "fnamemodify(v:val, ':t')"), ', ')
-    endif
-    let conj = "\nBut "
-    for error in errors
-      let msg .= conj.error
-      let conj = "\nAnd "
-    endfor
-    let msg .= "\nSo invoking Python may lead to unexpected results."
-    call health#report_warn(msg, keys(hints))
-  else
-    call health#report_info(msg)
-    call health#report_info('Python version: '
-      \.system('python -c "import platform, sys; sys.stdout.write(platform.python_version())"'))
-    call health#report_ok('$VIRTUAL_ENV provides :!python.')
-  endif
-endfunction
-
-function! s:check_ruby() abort
-  call health#report_start('Ruby provider (optional)')
-
-  if s:disabled_via_loaded_var('ruby')
-    return
-  endif
-
-  if !executable('ruby') || !executable('gem')
-    call health#report_warn(
-          \ '`ruby` and `gem` must be in $PATH.',
-          \ ['Install Ruby and verify that `ruby` and `gem` commands work.'])
-    return
-  endif
-  call health#report_info('Ruby: '. s:system(['ruby', '-v']))
-
-  let [host, err] = provider#ruby#Detect()
-  if empty(host)
-    call health#report_warn('`neovim-ruby-host` not found.',
-          \ ['Run `gem install neovim` to ensure the neovim RubyGem is installed.',
-          \  'Run `gem environment` to ensure the gem bin directory is in $PATH.',
-          \  'If you are using rvm/rbenv/chruby, try "rehashing".',
-          \  'See :help g:ruby_host_prog for non-standard gem installations.',
-          \  'You may disable this provider (and warning) by adding `let g:loaded_ruby_provider = 0` to your init.vim'])
-    return
-  endif
-  call health#report_info('Host: '. host)
-
-  let latest_gem_cmd = has('win32') ? 'cmd /c gem list -ra "^^neovim$"' : 'gem list -ra ^neovim$'
-  let latest_gem = s:system(split(latest_gem_cmd))
-  if s:shell_error || empty(latest_gem)
-    call health#report_error('Failed to run: '. latest_gem_cmd,
-          \ ["Make sure you're connected to the internet.",
-          \  'Are you behind a firewall or proxy?'])
-    return
-  endif
-  let latest_gem = get(split(latest_gem, 'neovim (\|, \|)$' ), 0, 'not found')
-
-  let current_gem_cmd = [host, '--version']
-  let current_gem = s:system(current_gem_cmd)
-  if s:shell_error
-    call health#report_error('Failed to run: '. join(current_gem_cmd),
-          \ ['Report this issue with the output of: ', join(current_gem_cmd)])
-    return
-  endif
-
-  if v:lua.vim.version.lt(current_gem, latest_gem)
-    call health#report_warn(
-          \ printf('Gem "neovim" is out-of-date. Installed: %s, latest: %s',
-          \ current_gem, latest_gem),
-          \ ['Run in shell: gem update neovim'])
-  else
-    call health#report_ok('Latest "neovim" gem is installed: '. current_gem)
-  endif
-endfunction
-
-function! s:check_node() abort
-  call health#report_start('Node.js provider (optional)')
-
-  if s:disabled_via_loaded_var('node')
-    return
-  endif
-
-  if !executable('node') || (!executable('npm') && !executable('yarn') && !executable('pnpm'))
-    call health#report_warn(
-          \ '`node` and `npm` (or `yarn`, `pnpm`) must be in $PATH.',
-          \ ['Install Node.js and verify that `node` and `npm` (or `yarn`, `pnpm`) commands work.'])
-    return
-  endif
-  let node_v = get(split(s:system(['node', '-v']), "\n"), 0, '')
-  call health#report_info('Node.js: '. node_v)
-  if s:shell_error || v:lua.vim.version.lt(node_v[1:], '6.0.0')
-    call health#report_warn('Nvim node.js host does not support Node '.node_v)
-    " Skip further checks, they are nonsense if nodejs is too old.
-    return
-  endif
-  if !provider#node#can_inspect()
-    call health#report_warn('node.js on this system does not support --inspect-brk so $NVIM_NODE_HOST_DEBUG is ignored.')
-  endif
-
-  let [host, err] = provider#node#Detect()
-  if empty(host)
-    call health#report_warn('Missing "neovim" npm (or yarn, pnpm) package.',
-          \ ['Run in shell: npm install -g neovim',
-          \  'Run in shell (if you use yarn): yarn global add neovim',
-          \  'Run in shell (if you use pnpm): pnpm install -g neovim',
-          \  'You may disable this provider (and warning) by adding `let g:loaded_node_provider = 0` to your init.vim'])
-    return
-  endif
-  call health#report_info('Nvim node.js host: '. host)
-
-  let manager = 'npm'
-  if executable('yarn')
-    let manager = 'yarn'
-  elseif executable('pnpm')
-    let manager = 'pnpm'
-  endif
-
-  let latest_npm_cmd = has('win32') ?
-        \ 'cmd /c '. manager .' info neovim --json' :
-        \ manager .' info neovim --json'
-  let latest_npm = s:system(split(latest_npm_cmd))
-  if s:shell_error || empty(latest_npm)
-    call health#report_error('Failed to run: '. latest_npm_cmd,
-          \ ["Make sure you're connected to the internet.",
-          \  'Are you behind a firewall or proxy?'])
-    return
-  endif
-  try
-    let pkg_data = json_decode(latest_npm)
-  catch /E474/
-    return 'error: '.latest_npm
-  endtry
-  let latest_npm = get(get(pkg_data, 'dist-tags', {}), 'latest', 'unable to parse')
-
-  let current_npm_cmd = ['node', host, '--version']
-  let current_npm = s:system(current_npm_cmd)
-  if s:shell_error
-    call health#report_error('Failed to run: '. join(current_npm_cmd),
-          \ ['Report this issue with the output of: ', join(current_npm_cmd)])
-    return
-  endif
-
-  if latest_npm !=# 'unable to parse' && v:lua.vim.version.lt(current_npm, latest_npm)
-    call health#report_warn(
-          \ printf('Package "neovim" is out-of-date. Installed: %s, latest: %s',
-          \ current_npm, latest_npm),
-          \ ['Run in shell: npm install -g neovim',
-          \  'Run in shell (if you use yarn): yarn global add neovim',
-          \  'Run in shell (if you use pnpm): pnpm install -g neovim'])
-  else
-    call health#report_ok('Latest "neovim" npm/yarn/pnpm package is installed: '. current_npm)
-  endif
-endfunction
-
-function! s:check_perl() abort
-  call health#report_start('Perl provider (optional)')
-
-  if s:disabled_via_loaded_var('perl')
-    return
-  endif
-
-  let [perl_exec, perl_warnings] = provider#perl#Detect()
-  if empty(perl_exec)
-    if !empty(perl_warnings)
-      call health#report_warn(perl_warnings, ['See :help provider-perl for more information.',
-            \ 'You may disable this provider (and warning) by adding `let g:loaded_perl_provider = 0` to your init.vim'])
-    else
-      call health#report_warn('No usable perl executable found')
-    endif
-    return
-  endif
-
-  call health#report_info('perl executable: '. perl_exec)
-
-  " we cannot use cpanm that is on the path, as it may not be for the perl
-  " set with g:perl_host_prog
-  call s:system([perl_exec, '-W', '-MApp::cpanminus', '-e', ''])
-  if s:shell_error
-    return [perl_exec, '"App::cpanminus" module is not installed']
-  endif
-
-  let latest_cpan_cmd = [perl_exec,
-			  \ '-MApp::cpanminus::fatscript', '-e',
-			  \ 'my $app = App::cpanminus::script->new;
-			  \ $app->parse_options ("--info", "-q", "Neovim::Ext");
-			  \ exit $app->doit']
-
-  let latest_cpan = s:system(latest_cpan_cmd)
-  if s:shell_error || empty(latest_cpan)
-    call health#report_error('Failed to run: '. join(latest_cpan_cmd, " "),
-          \ ["Make sure you're connected to the internet.",
-          \  'Are you behind a firewall or proxy?'])
-    return
-  elseif latest_cpan[0] ==# '!'
-    let cpanm_errs = split(latest_cpan, '!')
-    if cpanm_errs[0] =~# "Can't write to "
-      call health#report_warn(cpanm_errs[0], cpanm_errs[1:-2])
-      " Last line is the package info
-      let latest_cpan = cpanm_errs[-1]
-    else
-      call health#report_error('Unknown warning from command: ' . latest_cpan_cmd, cpanm_errs)
-      return
-    endif
-  endif
-  let latest_cpan = matchstr(latest_cpan, '\(\.\?\d\)\+')
-  if empty(latest_cpan)
-    call health#report_error('Cannot parse version number from cpanm output: ' . latest_cpan)
-    return
-  endif
-
-  let current_cpan_cmd = [perl_exec, '-W', '-MNeovim::Ext', '-e', 'print $Neovim::Ext::VERSION']
-  let current_cpan = s:system(current_cpan_cmd)
-  if s:shell_error
-    call health#report_error('Failed to run: '. join(current_cpan_cmd),
-          \ ['Report this issue with the output of: ', join(current_cpan_cmd)])
-    return
-  endif
-
-  if v:lua.vim.version.lt(current_cpan, latest_cpan)
-    call health#report_warn(
-          \ printf('Module "Neovim::Ext" is out-of-date. Installed: %s, latest: %s',
-          \ current_cpan, latest_cpan),
-          \ ['Run in shell: cpanm -n Neovim::Ext'])
-  else
-    call health#report_ok('Latest "Neovim::Ext" cpan module is installed: '. current_cpan)
-  endif
-endfunction
-
-function! health#provider#check() abort
-  call s:check_clipboard()
-  call s:check_python()
-  call s:check_virtualenv()
-  call s:check_ruby()
-  call s:check_node()
-  call s:check_perl()
-endfunction
diff --git a/runtime/autoload/health/provider2.vim b/runtime/autoload/health/provider2.vim
new file mode 100644
index 0000000000..196a3ce9de
--- /dev/null
+++ b/runtime/autoload/health/provider2.vim
@@ -0,0 +1,729 @@
+let s:shell_error = 0
+
+function! s:is_bad_response(s) abort
+  return a:s =~? '\v(^unable)|(^error)|(^outdated)'
+endfunction
+
+function! s:trim(s) abort
+  return substitute(a:s, '^\_s*\|\_s*$', '', 'g')
+endfunction
+
+" Convert '\' to '/'. Collapse '//' and '/./'.
+function! s:normalize_path(s) abort
+  return substitute(substitute(a:s, '\', '/', 'g'), '/\./\|/\+', '/', 'g')
+endfunction
+
+" Returns TRUE if `cmd` exits with success, else FALSE.
+function! s:cmd_ok(cmd) abort
+  call system(a:cmd)
+  return v:shell_error == 0
+endfunction
+
+" Handler for s:system() function.
+function! s:system_handler(jobid, data, event) dict abort
+  if a:event ==# 'stderr'
+    if self.add_stderr_to_output
+      let self.output .= join(a:data, '')
+    else
+      let self.stderr .= join(a:data, '')
+    endif
+  elseif a:event ==# 'stdout'
+    let self.output .= join(a:data, '')
+  elseif a:event ==# 'exit'
+    let s:shell_error = a:data
+  endif
+endfunction
+
+" Attempts to construct a shell command from an args list.
+" Only for display, to help users debug a failed command.
+function! s:shellify(cmd) abort
+  if type(a:cmd) != type([])
+    return a:cmd
+  endif
+  return join(map(copy(a:cmd),
+    \'v:val =~# ''\m[^\-.a-zA-Z_/]'' ? shellescape(v:val) : v:val'), ' ')
+endfunction
+
+" Run a system command and timeout after 30 seconds.
+function! s:system(cmd, ...) abort
+  let stdin = a:0 ? a:1 : ''
+  let ignore_error = a:0 > 2 ? a:3 : 0
+  let opts = {
+        \ 'add_stderr_to_output': a:0 > 1 ? a:2 : 0,
+        \ 'output': '',
+        \ 'stderr': '',
+        \ 'on_stdout': function('s:system_handler'),
+        \ 'on_stderr': function('s:system_handler'),
+        \ 'on_exit': function('s:system_handler'),
+        \ }
+  let jobid = jobstart(a:cmd, opts)
+
+  if jobid < 1
+    call health#report_error(printf('Command error (job=%d): `%s` (in %s)',
+          \ jobid, s:shellify(a:cmd), string(getcwd())))
+    let s:shell_error = 1
+    return opts.output
+  endif
+
+  if !empty(stdin)
+    call jobsend(jobid, stdin)
+  endif
+
+  let res = jobwait([jobid], 30000)
+  if res[0] == -1
+    call health#report_error(printf('Command timed out: %s', s:shellify(a:cmd)))
+    call jobstop(jobid)
+  elseif s:shell_error != 0 && !ignore_error
+    let emsg = printf("Command error (job=%d, exit code %d): `%s` (in %s)",
+          \ jobid, s:shell_error, s:shellify(a:cmd), string(getcwd()))
+    if !empty(opts.output)
+      let emsg .= "\noutput: " . opts.output
+    end
+    if !empty(opts.stderr)
+      let emsg .= "\nstderr: " . opts.stderr
+    end
+    call health#report_error(emsg)
+  endif
+
+  return opts.output
+endfunction
+
+function! s:systemlist(cmd, ...) abort
+  let stdout = split(s:system(a:cmd, a:0 ? a:1 : ''), "\n")
+  if a:0 > 1 && !empty(a:2)
+    return filter(stdout, '!empty(v:val)')
+  endif
+  return stdout
+endfunction
+
+" Fetch the contents of a URL.
+function! s:download(url) abort
+  let has_curl = executable('curl')
+  if has_curl && system(['curl', '-V']) =~# 'Protocols:.*https'
+    let rv = s:system(['curl', '-sL', a:url], '', 1, 1)
+    return s:shell_error ? 'curl error with '.a:url.': '.s:shell_error : rv
+  elseif executable('python')
+    let script = "
+          \try:\n
+          \    from urllib.request import urlopen\n
+          \except ImportError:\n
+          \    from urllib2 import urlopen\n
+          \\n
+          \response = urlopen('".a:url."')\n
+          \print(response.read().decode('utf8'))\n
+          \"
+    let rv = s:system(['python', '-c', script])
+    return empty(rv) && s:shell_error
+          \ ? 'python urllib.request error: '.s:shell_error
+          \ : rv
+  endif
+  return 'missing `curl` '
+          \ .(has_curl ? '(with HTTPS support) ' : '')
+          \ .'and `python`, cannot make web request'
+endfunction
+
+" Get the latest Nvim Python client (pynvim) version from PyPI.
+function! s:latest_pypi_version() abort
+  let pypi_version = 'unable to get pypi response'
+  let pypi_response = s:download('https://pypi.python.org/pypi/pynvim/json')
+  if !empty(pypi_response)
+    try
+      let pypi_data = json_decode(pypi_response)
+    catch /E474/
+      return 'error: '.pypi_response
+    endtry
+    let pypi_version = get(get(pypi_data, 'info', {}), 'version', 'unable to parse')
+  endif
+  return pypi_version
+endfunction
+
+" Get version information using the specified interpreter.  The interpreter is
+" used directly in case breaking changes were introduced since the last time
+" Nvim's Python client was updated.
+"
+" Returns: [
+"     {python executable version},
+"     {current nvim version},
+"     {current pypi nvim status},
+"     {installed version status}
+" ]
+function! s:version_info(python) abort
+  let pypi_version = s:latest_pypi_version()
+  let python_version = s:trim(s:system([
+        \ a:python,
+        \ '-c',
+        \ 'import sys; print(".".join(str(x) for x in sys.version_info[:3]))',
+        \ ]))
+
+  if empty(python_version)
+    let python_version = 'unable to parse '.a:python.' response'
+  endif
+
+  let nvim_path = s:trim(s:system([
+        \ a:python, '-c',
+        \ 'import sys; ' .
+        \ 'sys.path = [p for p in sys.path if p != ""]; ' .
+        \ 'import neovim; print(neovim.__file__)']))
+  if s:shell_error || empty(nvim_path)
+    return [python_version, 'unable to load neovim Python module', pypi_version,
+          \ nvim_path]
+  endif
+
+  " Assuming that multiple versions of a package are installed, sort them
+  " numerically in descending order.
+  function! s:compare(metapath1, metapath2) abort
+    let a = matchstr(fnamemodify(a:metapath1, ':p:h:t'), '[0-9.]\+')
+    let b = matchstr(fnamemodify(a:metapath2, ':p:h:t'), '[0-9.]\+')
+    return a == b ? 0 : a > b ? 1 : -1
+  endfunction
+
+  " Try to get neovim.VERSION (added in 0.1.11dev).
+  let nvim_version = s:system([a:python, '-c',
+        \ 'from neovim import VERSION as v; '.
+        \ 'print("{}.{}.{}{}".format(v.major, v.minor, v.patch, v.prerelease))'],
+        \ '', 1, 1)
+  if empty(nvim_version)
+    let nvim_version = 'unable to find pynvim module version'
+    let base = fnamemodify(nvim_path, ':h')
+    let metas = glob(base.'-*/METADATA', 1, 1)
+          \ + glob(base.'-*/PKG-INFO', 1, 1)
+          \ + glob(base.'.egg-info/PKG-INFO', 1, 1)
+    let metas = sort(metas, 's:compare')
+
+    if !empty(metas)
+      for meta_line in readfile(metas[0])
+        if meta_line =~# '^Version:'
+          let nvim_version = matchstr(meta_line, '^Version: \zs\S\+')
+          break
+        endif
+      endfor
+    endif
+  endif
+
+  let nvim_path_base = fnamemodify(nvim_path, ':~:h')
+  let version_status = 'unknown; '.nvim_path_base
+  if !s:is_bad_response(nvim_version) && !s:is_bad_response(pypi_version)
+    if v:lua.vim.version.lt(nvim_version, pypi_version)
+      let version_status = 'outdated; from '.nvim_path_base
+    else
+      let version_status = 'up to date'
+    endif
+  endif
+
+  return [python_version, nvim_version, pypi_version, version_status]
+endfunction
+
+" Check the Python interpreter's usability.
+function! s:check_bin(bin) abort
+  if !filereadable(a:bin) && (!has('win32') || !filereadable(a:bin.'.exe'))
+    call health#report_error(printf('"%s" was not found.', a:bin))
+    return 0
+  elseif executable(a:bin) != 1
+    call health#report_error(printf('"%s" is not executable.', a:bin))
+    return 0
+  endif
+  return 1
+endfunction
+
+" Check "loaded" var for given a:provider.
+" Returns 1 if the caller should return (skip checks).
+function! s:disabled_via_loaded_var(provider) abort
+  let loaded_var = 'g:loaded_'.a:provider.'_provider'
+  if exists(loaded_var) && !exists('*provider#'.a:provider.'#Call')
+    let v = eval(loaded_var)
+    if 0 is v
+      call health#report_info('Disabled ('.loaded_var.'='.v.').')
+      return 1
+    else
+      call health#report_info('Disabled ('.loaded_var.'='.v.').  This might be due to some previous error.')
+    endif
+  endif
+  return 0
+endfunction
+
+function! s:check_python() abort
+  call health#report_start('Python 3 provider (optional)')
+
+  let pyname = 'python3'
+  let python_exe = ''
+  let venv = exists('$VIRTUAL_ENV') ? resolve($VIRTUAL_ENV) : ''
+  let host_prog_var = pyname.'_host_prog'
+  let python_multiple = []
+
+  if s:disabled_via_loaded_var(pyname)
+    return
+  endif
+
+  let [pyenv, pyenv_root] = s:check_for_pyenv()
+
+  if exists('g:'.host_prog_var)
+    call health#report_info(printf('Using: g:%s = "%s"', host_prog_var, get(g:, host_prog_var)))
+  endif
+
+  let [pyname, pythonx_warnings] = provider#pythonx#Detect(3)
+
+  if empty(pyname)
+    call health#report_warn('No Python executable found that can `import neovim`. '
+            \ . 'Using the first available executable for diagnostics.')
+  elseif exists('g:'.host_prog_var)
+    let python_exe = pyname
+  endif
+
+  " No Python executable could `import neovim`, or host_prog_var was used.
+  if !empty(pythonx_warnings)
+    call health#report_warn(pythonx_warnings, ['See :help provider-python for more information.',
+          \ 'You may disable this provider (and warning) by adding `let g:loaded_python3_provider = 0` to your init.vim'])
+
+  elseif !empty(pyname) && empty(python_exe)
+    if !exists('g:'.host_prog_var)
+      call health#report_info(printf('`g:%s` is not set.  Searching for '
+            \ . '%s in the environment.', host_prog_var, pyname))
+    endif
+
+    if !empty(pyenv)
+      let python_exe = s:trim(s:system([pyenv, 'which', pyname], '', 1))
+
+      if empty(python_exe)
+        call health#report_warn(printf('pyenv could not find %s.', pyname))
+      endif
+    endif
+
+    if empty(python_exe)
+      let python_exe = exepath(pyname)
+
+      if exists('$PATH')
+        for path in split($PATH, has('win32') ? ';' : ':')
+          let path_bin = s:normalize_path(path.'/'.pyname)
+          if path_bin != s:normalize_path(python_exe)
+                \ && index(python_multiple, path_bin) == -1
+                \ && executable(path_bin)
+            call add(python_multiple, path_bin)
+          endif
+        endfor
+
+        if len(python_multiple)
+          " This is worth noting since the user may install something
+          " that changes $PATH, like homebrew.
+          call health#report_info(printf('Multiple %s executables found.  '
+                \ . 'Set `g:%s` to avoid surprises.', pyname, host_prog_var))
+        endif
+
+        if python_exe =~# '\<shims\>'
+          call health#report_warn(printf('`%s` appears to be a pyenv shim.', python_exe), [
+                      \ '`pyenv` is not in $PATH, your pyenv installation is broken. '
+                      \ .'Set `g:'.host_prog_var.'` to avoid surprises.',
+                      \ ])
+        endif
+      endif
+    endif
+  endif
+
+  if !empty(python_exe) && !exists('g:'.host_prog_var)
+    if empty(venv) && !empty(pyenv)
+          \ && !empty(pyenv_root) && resolve(python_exe) !~# '^'.pyenv_root.'/'
+      call health#report_warn('pyenv is not set up optimally.', [
+            \ printf('Create a virtualenv specifically '
+            \ . 'for Nvim using pyenv, and set `g:%s`.  This will avoid '
+            \ . 'the need to install the pynvim module in each '
+            \ . 'version/virtualenv.', host_prog_var)
+            \ ])
+    elseif !empty(venv)
+      if !empty(pyenv_root)
+        let venv_root = pyenv_root
+      else
+        let venv_root = fnamemodify(venv, ':h')
+      endif
+
+      if resolve(python_exe) !~# '^'.venv_root.'/'
+        call health#report_warn('Your virtualenv is not set up optimally.', [
+              \ printf('Create a virtualenv specifically '
+              \ . 'for Nvim and use `g:%s`.  This will avoid '
+              \ . 'the need to install the pynvim module in each '
+              \ . 'virtualenv.', host_prog_var)
+              \ ])
+      endif
+    endif
+  endif
+
+  if empty(python_exe) && !empty(pyname)
+    " An error message should have already printed.
+    call health#report_error(printf('`%s` was not found.', pyname))
+  elseif !empty(python_exe) && !s:check_bin(python_exe)
+    let python_exe = ''
+  endif
+
+  " Diagnostic output
+  call health#report_info('Executable: ' . (empty(python_exe) ? 'Not found' : python_exe))
+  if len(python_multiple)
+    for path_bin in python_multiple
+      call health#report_info('Other python executable: ' . path_bin)
+    endfor
+  endif
+
+  if empty(python_exe)
+    " No Python executable can import 'neovim'. Check if any Python executable
+    " can import 'pynvim'. If so, that Python failed to import 'neovim' as
+    " well, which is most probably due to a failed pip upgrade:
+    " https://github.com/neovim/neovim/wiki/Following-HEAD#20181118
+    let [pynvim_exe, errors] = provider#pythonx#DetectByModule('pynvim', 3)
+    if !empty(pynvim_exe)
+      call health#report_error(
+            \ 'Detected pip upgrade failure: Python executable can import "pynvim" but '
+            \ . 'not "neovim": '. pynvim_exe,
+            \ "Use that Python version to reinstall \"pynvim\" and optionally \"neovim\".\n"
+            \ . pynvim_exe ." -m pip uninstall pynvim neovim\n"
+            \ . pynvim_exe ." -m pip install pynvim\n"
+            \ . pynvim_exe ." -m pip install neovim  # only if needed by third-party software")
+    endif
+  else
+    let [majorpyversion, current, latest, status] = s:version_info(python_exe)
+
+    if 3 != str2nr(majorpyversion)
+      call health#report_warn('Unexpected Python version.' .
+                  \ ' This could lead to confusing error messages.')
+    endif
+
+    call health#report_info('Python version: ' . majorpyversion)
+
+    if s:is_bad_response(status)
+      call health#report_info(printf('pynvim version: %s (%s)', current, status))
+    else
+      call health#report_info(printf('pynvim version: %s', current))
+    endif
+
+    if s:is_bad_response(current)
+      call health#report_error(
+        \ "pynvim is not installed.\nError: ".current,
+        \ ['Run in shell: '. python_exe .' -m pip install pynvim'])
+    endif
+
+    if s:is_bad_response(latest)
+      call health#report_warn('Could not contact PyPI to get latest version.')
+      call health#report_error('HTTP request failed: '.latest)
+    elseif s:is_bad_response(status)
+      call health#report_warn(printf('Latest pynvim is NOT installed: %s', latest))
+    elseif !s:is_bad_response(current)
+      call health#report_ok(printf('Latest pynvim is installed.'))
+    endif
+  endif
+endfunction
+
+" Check if pyenv is available and a valid pyenv root can be found, then return
+" their respective paths. If either of those is invalid, return two empty
+" strings, effectively ignoring pyenv.
+function! s:check_for_pyenv() abort
+  let pyenv_path = resolve(exepath('pyenv'))
+
+  if empty(pyenv_path)
+    return ['', '']
+  endif
+
+  call health#report_info('pyenv: Path: '. pyenv_path)
+
+  let pyenv_root = exists('$PYENV_ROOT') ? resolve($PYENV_ROOT) : ''
+
+  if empty(pyenv_root)
+    let pyenv_root = s:trim(s:system([pyenv_path, 'root']))
+    call health#report_info('pyenv: $PYENV_ROOT is not set. Infer from `pyenv root`.')
+  endif
+
+  if !isdirectory(pyenv_root)
+    call health#report_warn(
+          \ printf('pyenv: Root does not exist: %s. '
+          \ . 'Ignoring pyenv for all following checks.', pyenv_root))
+    return ['', '']
+  endif
+
+  call health#report_info('pyenv: Root: '.pyenv_root)
+
+  return [pyenv_path, pyenv_root]
+endfunction
+
+" Resolves Python executable path by invoking and checking `sys.executable`.
+function! s:python_exepath(invocation) abort
+  return s:normalize_path(system(fnameescape(a:invocation)
+    \ . ' -c "import sys; sys.stdout.write(sys.executable)"'))
+endfunction
+
+" Checks that $VIRTUAL_ENV Python executables are found at front of $PATH in
+" Nvim and subshells.
+function! s:check_virtualenv() abort
+  call health#report_start('Python virtualenv')
+  if !exists('$VIRTUAL_ENV')
+    call health#report_ok('no $VIRTUAL_ENV')
+    return
+  endif
+  let errors = []
+  " Keep hints as dict keys in order to discard duplicates.
+  let hints = {}
+  " The virtualenv should contain some Python executables, and those
+  " executables should be first both on Nvim's $PATH and the $PATH of
+  " subshells launched from Nvim.
+  let bin_dir = has('win32') ? '/Scripts' : '/bin'
+  let venv_bins = glob($VIRTUAL_ENV . bin_dir . '/python*', v:true, v:true)
+  " XXX: Remove irrelevant executables found in bin/.
+  let venv_bins = filter(venv_bins, 'v:val !~# "python-config"')
+  if len(venv_bins)
+    for venv_bin in venv_bins
+      let venv_bin = s:normalize_path(venv_bin)
+      let py_bin_basename = fnamemodify(venv_bin, ':t')
+      let nvim_py_bin = s:python_exepath(exepath(py_bin_basename))
+      let subshell_py_bin = s:python_exepath(py_bin_basename)
+      if venv_bin !=# nvim_py_bin
+        call add(errors, '$PATH yields this '.py_bin_basename.' executable: '.nvim_py_bin)
+        let hint = '$PATH ambiguities arise if the virtualenv is not '
+          \.'properly activated prior to launching Nvim. Close Nvim, activate the virtualenv, '
+          \.'check that invoking Python from the command line launches the correct one, '
+          \.'then relaunch Nvim.'
+        let hints[hint] = v:true
+      endif
+      if venv_bin !=# subshell_py_bin
+        call add(errors, '$PATH in subshells yields this '
+          \.py_bin_basename . ' executable: '.subshell_py_bin)
+        let hint = '$PATH ambiguities in subshells typically are '
+          \.'caused by your shell config overriding the $PATH previously set by the '
+          \.'virtualenv. Either prevent them from doing so, or use this workaround: '
+          \.'https://vi.stackexchange.com/a/34996'
+        let hints[hint] = v:true
+      endif
+    endfor
+  else
+    call add(errors, 'no Python executables found in the virtualenv '.bin_dir.' directory.')
+  endif
+
+  let msg = '$VIRTUAL_ENV is set to: '.$VIRTUAL_ENV
+  if len(errors)
+    if len(venv_bins)
+      let msg .= "\nAnd its ".bin_dir.' directory contains: '
+        \.join(map(venv_bins, "fnamemodify(v:val, ':t')"), ', ')
+    endif
+    let conj = "\nBut "
+    for error in errors
+      let msg .= conj.error
+      let conj = "\nAnd "
+    endfor
+    let msg .= "\nSo invoking Python may lead to unexpected results."
+    call health#report_warn(msg, keys(hints))
+  else
+    call health#report_info(msg)
+    call health#report_info('Python version: '
+      \.system('python -c "import platform, sys; sys.stdout.write(platform.python_version())"'))
+    call health#report_ok('$VIRTUAL_ENV provides :!python.')
+  endif
+endfunction
+
+function! s:check_ruby() abort
+  call health#report_start('Ruby provider (optional)')
+
+  if s:disabled_via_loaded_var('ruby')
+    return
+  endif
+
+  if !executable('ruby') || !executable('gem')
+    call health#report_warn(
+          \ '`ruby` and `gem` must be in $PATH.',
+          \ ['Install Ruby and verify that `ruby` and `gem` commands work.'])
+    return
+  endif
+  call health#report_info('Ruby: '. s:system(['ruby', '-v']))
+
+  let [host, err] = provider#ruby#Detect()
+  if empty(host)
+    call health#report_warn('`neovim-ruby-host` not found.',
+          \ ['Run `gem install neovim` to ensure the neovim RubyGem is installed.',
+          \  'Run `gem environment` to ensure the gem bin directory is in $PATH.',
+          \  'If you are using rvm/rbenv/chruby, try "rehashing".',
+          \  'See :help g:ruby_host_prog for non-standard gem installations.',
+          \  'You may disable this provider (and warning) by adding `let g:loaded_ruby_provider = 0` to your init.vim'])
+    return
+  endif
+  call health#report_info('Host: '. host)
+
+  let latest_gem_cmd = has('win32') ? 'cmd /c gem list -ra "^^neovim$"' : 'gem list -ra ^neovim$'
+  let latest_gem = s:system(split(latest_gem_cmd))
+  if s:shell_error || empty(latest_gem)
+    call health#report_error('Failed to run: '. latest_gem_cmd,
+          \ ["Make sure you're connected to the internet.",
+          \  'Are you behind a firewall or proxy?'])
+    return
+  endif
+  let latest_gem = get(split(latest_gem, 'neovim (\|, \|)$' ), 0, 'not found')
+
+  let current_gem_cmd = [host, '--version']
+  let current_gem = s:system(current_gem_cmd)
+  if s:shell_error
+    call health#report_error('Failed to run: '. join(current_gem_cmd),
+          \ ['Report this issue with the output of: ', join(current_gem_cmd)])
+    return
+  endif
+
+  if v:lua.vim.version.lt(current_gem, latest_gem)
+    call health#report_warn(
+          \ printf('Gem "neovim" is out-of-date. Installed: %s, latest: %s',
+          \ current_gem, latest_gem),
+          \ ['Run in shell: gem update neovim'])
+  else
+    call health#report_ok('Latest "neovim" gem is installed: '. current_gem)
+  endif
+endfunction
+
+function! s:check_node() abort
+  call health#report_start('Node.js provider (optional)')
+
+  if s:disabled_via_loaded_var('node')
+    return
+  endif
+
+  if !executable('node') || (!executable('npm') && !executable('yarn') && !executable('pnpm'))
+    call health#report_warn(
+          \ '`node` and `npm` (or `yarn`, `pnpm`) must be in $PATH.',
+          \ ['Install Node.js and verify that `node` and `npm` (or `yarn`, `pnpm`) commands work.'])
+    return
+  endif
+  let node_v = get(split(s:system(['node', '-v']), "\n"), 0, '')
+  call health#report_info('Node.js: '. node_v)
+  if s:shell_error || v:lua.vim.version.lt(node_v[1:], '6.0.0')
+    call health#report_warn('Nvim node.js host does not support Node '.node_v)
+    " Skip further checks, they are nonsense if nodejs is too old.
+    return
+  endif
+  if !provider#node#can_inspect()
+    call health#report_warn('node.js on this system does not support --inspect-brk so $NVIM_NODE_HOST_DEBUG is ignored.')
+  endif
+
+  let [host, err] = provider#node#Detect()
+  if empty(host)
+    call health#report_warn('Missing "neovim" npm (or yarn, pnpm) package.',
+          \ ['Run in shell: npm install -g neovim',
+          \  'Run in shell (if you use yarn): yarn global add neovim',
+          \  'Run in shell (if you use pnpm): pnpm install -g neovim',
+          \  'You may disable this provider (and warning) by adding `let g:loaded_node_provider = 0` to your init.vim'])
+    return
+  endif
+  call health#report_info('Nvim node.js host: '. host)
+
+  let manager = 'npm'
+  if executable('yarn')
+    let manager = 'yarn'
+  elseif executable('pnpm')
+    let manager = 'pnpm'
+  endif
+
+  let latest_npm_cmd = has('win32') ?
+        \ 'cmd /c '. manager .' info neovim --json' :
+        \ manager .' info neovim --json'
+  let latest_npm = s:system(split(latest_npm_cmd))
+  if s:shell_error || empty(latest_npm)
+    call health#report_error('Failed to run: '. latest_npm_cmd,
+          \ ["Make sure you're connected to the internet.",
+          \  'Are you behind a firewall or proxy?'])
+    return
+  endif
+  try
+    let pkg_data = json_decode(latest_npm)
+  catch /E474/
+    return 'error: '.latest_npm
+  endtry
+  let latest_npm = get(get(pkg_data, 'dist-tags', {}), 'latest', 'unable to parse')
+
+  let current_npm_cmd = ['node', host, '--version']
+  let current_npm = s:system(current_npm_cmd)
+  if s:shell_error
+    call health#report_error('Failed to run: '. join(current_npm_cmd),
+          \ ['Report this issue with the output of: ', join(current_npm_cmd)])
+    return
+  endif
+
+  if latest_npm !=# 'unable to parse' && v:lua.vim.version.lt(current_npm, latest_npm)
+    call health#report_warn(
+          \ printf('Package "neovim" is out-of-date. Installed: %s, latest: %s',
+          \ current_npm, latest_npm),
+          \ ['Run in shell: npm install -g neovim',
+          \  'Run in shell (if you use yarn): yarn global add neovim',
+          \  'Run in shell (if you use pnpm): pnpm install -g neovim'])
+  else
+    call health#report_ok('Latest "neovim" npm/yarn/pnpm package is installed: '. current_npm)
+  endif
+endfunction
+
+function! s:check_perl() abort
+  call health#report_start('Perl provider (optional)')
+
+  if s:disabled_via_loaded_var('perl')
+    return
+  endif
+
+  let [perl_exec, perl_warnings] = provider#perl#Detect()
+  if empty(perl_exec)
+    if !empty(perl_warnings)
+      call health#report_warn(perl_warnings, ['See :help provider-perl for more information.',
+            \ 'You may disable this provider (and warning) by adding `let g:loaded_perl_provider = 0` to your init.vim'])
+    else
+      call health#report_warn('No usable perl executable found')
+    endif
+    return
+  endif
+
+  call health#report_info('perl executable: '. perl_exec)
+
+  " we cannot use cpanm that is on the path, as it may not be for the perl
+  " set with g:perl_host_prog
+  call s:system([perl_exec, '-W', '-MApp::cpanminus', '-e', ''])
+  if s:shell_error
+    return [perl_exec, '"App::cpanminus" module is not installed']
+  endif
+
+  let latest_cpan_cmd = [perl_exec,
+			  \ '-MApp::cpanminus::fatscript', '-e',
+			  \ 'my $app = App::cpanminus::script->new;
+			  \ $app->parse_options ("--info", "-q", "Neovim::Ext");
+			  \ exit $app->doit']
+
+  let latest_cpan = s:system(latest_cpan_cmd)
+  if s:shell_error || empty(latest_cpan)
+    call health#report_error('Failed to run: '. join(latest_cpan_cmd, " "),
+          \ ["Make sure you're connected to the internet.",
+          \  'Are you behind a firewall or proxy?'])
+    return
+  elseif latest_cpan[0] ==# '!'
+    let cpanm_errs = split(latest_cpan, '!')
+    if cpanm_errs[0] =~# "Can't write to "
+      call health#report_warn(cpanm_errs[0], cpanm_errs[1:-2])
+      " Last line is the package info
+      let latest_cpan = cpanm_errs[-1]
+    else
+      call health#report_error('Unknown warning from command: ' . latest_cpan_cmd, cpanm_errs)
+      return
+    endif
+  endif
+  let latest_cpan = matchstr(latest_cpan, '\(\.\?\d\)\+')
+  if empty(latest_cpan)
+    call health#report_error('Cannot parse version number from cpanm output: ' . latest_cpan)
+    return
+  endif
+
+  let current_cpan_cmd = [perl_exec, '-W', '-MNeovim::Ext', '-e', 'print $Neovim::Ext::VERSION']
+  let current_cpan = s:system(current_cpan_cmd)
+  if s:shell_error
+    call health#report_error('Failed to run: '. join(current_cpan_cmd),
+          \ ['Report this issue with the output of: ', join(current_cpan_cmd)])
+    return
+  endif
+
+  if v:lua.vim.version.lt(current_cpan, latest_cpan)
+    call health#report_warn(
+          \ printf('Module "Neovim::Ext" is out-of-date. Installed: %s, latest: %s',
+          \ current_cpan, latest_cpan),
+          \ ['Run in shell: cpanm -n Neovim::Ext'])
+  else
+    call health#report_ok('Latest "Neovim::Ext" cpan module is installed: '. current_cpan)
+  endif
+endfunction
+
+function! health#provider2#check() abort
+  call s:check_python()
+  call s:check_virtualenv()
+  call s:check_ruby()
+  call s:check_node()
+  call s:check_perl()
+endfunction
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
new file mode 100644
index 0000000000..7a17edc848
--- /dev/null
+++ b/runtime/lua/provider/health.lua
@@ -0,0 +1,55 @@
+local M = {}
+
+-- Returns true if `cmd` exits with success, else false.
+local function cmd_ok(cmd)
+  vim.fn.system(cmd)
+  return vim.v.shell_error == 0
+end
+
+local function executable(exe)
+  return vim.fn.executable(exe) == 1
+end
+
+local function is_blank(s)
+  return s:find('^%s*$') ~= nil
+end
+
+local function clipboard()
+  vim.health.report_start('Clipboard (optional)')
+
+  if
+    os.getenv('TMUX')
+    and executable('tmux')
+    and executable('pbpaste')
+    and not cmd_ok('pbpaste')
+  then
+    local tmux_version = string.match(vim.fn.system('tmux -V'), '%d+%.%d+')
+    local advice = {
+      'Install tmux 2.6+.  https://superuser.com/q/231130',
+      'or use tmux with reattach-to-user-namespace.  https://superuser.com/a/413233',
+    }
+    vim.health.report_error('pbcopy does not work with tmux version: ' .. tmux_version, advice)
+  end
+
+  local clipboard_tool = vim.fn['provider#clipboard#Executable']()
+  if vim.g.clipboard and is_blank(clipboard_tool) then
+    local error_message = vim.fn['provider#clipboard#Error']()
+    vim.health.report_error(
+      error_message,
+      "Use the example in :help g:clipboard as a template, or don't set g:clipboard at all."
+    )
+  elseif is_blank(clipboard_tool) then
+    vim.health.report_warn(
+      'No clipboard tool found. Clipboard registers (`"+` and `"*`) will not work.',
+      ':help clipboard'
+    )
+  else
+    vim.health.report_ok('Clipboard tool found: ' .. clipboard_tool)
+  end
+end
+
+function M.check()
+  clipboard()
+end
+
+return M
-- 
cgit 


From 71225228fc2700a18c56c57f9dc14494cef83149 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 9 Apr 2023 22:28:00 +0200
Subject: refactor: rewrite python provider healthcheck in Lua

This is required to remove the vimscript checkhealth functions.
---
 runtime/autoload/health/provider2.vim | 350 ----------------------
 runtime/lua/provider/health.lua       | 534 +++++++++++++++++++++++++++++++++-
 2 files changed, 529 insertions(+), 355 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/health/provider2.vim b/runtime/autoload/health/provider2.vim
index 196a3ce9de..0ebf203788 100644
--- a/runtime/autoload/health/provider2.vim
+++ b/runtime/autoload/health/provider2.vim
@@ -1,24 +1,10 @@
 let s:shell_error = 0
 
-function! s:is_bad_response(s) abort
-  return a:s =~? '\v(^unable)|(^error)|(^outdated)'
-endfunction
-
-function! s:trim(s) abort
-  return substitute(a:s, '^\_s*\|\_s*$', '', 'g')
-endfunction
-
 " Convert '\' to '/'. Collapse '//' and '/./'.
 function! s:normalize_path(s) abort
   return substitute(substitute(a:s, '\', '/', 'g'), '/\./\|/\+', '/', 'g')
 endfunction
 
-" Returns TRUE if `cmd` exits with success, else FALSE.
-function! s:cmd_ok(cmd) abort
-  call system(a:cmd)
-  return v:shell_error == 0
-endfunction
-
 " Handler for s:system() function.
 function! s:system_handler(jobid, data, event) dict abort
   if a:event ==# 'stderr'
@@ -88,143 +74,6 @@ function! s:system(cmd, ...) abort
   return opts.output
 endfunction
 
-function! s:systemlist(cmd, ...) abort
-  let stdout = split(s:system(a:cmd, a:0 ? a:1 : ''), "\n")
-  if a:0 > 1 && !empty(a:2)
-    return filter(stdout, '!empty(v:val)')
-  endif
-  return stdout
-endfunction
-
-" Fetch the contents of a URL.
-function! s:download(url) abort
-  let has_curl = executable('curl')
-  if has_curl && system(['curl', '-V']) =~# 'Protocols:.*https'
-    let rv = s:system(['curl', '-sL', a:url], '', 1, 1)
-    return s:shell_error ? 'curl error with '.a:url.': '.s:shell_error : rv
-  elseif executable('python')
-    let script = "
-          \try:\n
-          \    from urllib.request import urlopen\n
-          \except ImportError:\n
-          \    from urllib2 import urlopen\n
-          \\n
-          \response = urlopen('".a:url."')\n
-          \print(response.read().decode('utf8'))\n
-          \"
-    let rv = s:system(['python', '-c', script])
-    return empty(rv) && s:shell_error
-          \ ? 'python urllib.request error: '.s:shell_error
-          \ : rv
-  endif
-  return 'missing `curl` '
-          \ .(has_curl ? '(with HTTPS support) ' : '')
-          \ .'and `python`, cannot make web request'
-endfunction
-
-" Get the latest Nvim Python client (pynvim) version from PyPI.
-function! s:latest_pypi_version() abort
-  let pypi_version = 'unable to get pypi response'
-  let pypi_response = s:download('https://pypi.python.org/pypi/pynvim/json')
-  if !empty(pypi_response)
-    try
-      let pypi_data = json_decode(pypi_response)
-    catch /E474/
-      return 'error: '.pypi_response
-    endtry
-    let pypi_version = get(get(pypi_data, 'info', {}), 'version', 'unable to parse')
-  endif
-  return pypi_version
-endfunction
-
-" Get version information using the specified interpreter.  The interpreter is
-" used directly in case breaking changes were introduced since the last time
-" Nvim's Python client was updated.
-"
-" Returns: [
-"     {python executable version},
-"     {current nvim version},
-"     {current pypi nvim status},
-"     {installed version status}
-" ]
-function! s:version_info(python) abort
-  let pypi_version = s:latest_pypi_version()
-  let python_version = s:trim(s:system([
-        \ a:python,
-        \ '-c',
-        \ 'import sys; print(".".join(str(x) for x in sys.version_info[:3]))',
-        \ ]))
-
-  if empty(python_version)
-    let python_version = 'unable to parse '.a:python.' response'
-  endif
-
-  let nvim_path = s:trim(s:system([
-        \ a:python, '-c',
-        \ 'import sys; ' .
-        \ 'sys.path = [p for p in sys.path if p != ""]; ' .
-        \ 'import neovim; print(neovim.__file__)']))
-  if s:shell_error || empty(nvim_path)
-    return [python_version, 'unable to load neovim Python module', pypi_version,
-          \ nvim_path]
-  endif
-
-  " Assuming that multiple versions of a package are installed, sort them
-  " numerically in descending order.
-  function! s:compare(metapath1, metapath2) abort
-    let a = matchstr(fnamemodify(a:metapath1, ':p:h:t'), '[0-9.]\+')
-    let b = matchstr(fnamemodify(a:metapath2, ':p:h:t'), '[0-9.]\+')
-    return a == b ? 0 : a > b ? 1 : -1
-  endfunction
-
-  " Try to get neovim.VERSION (added in 0.1.11dev).
-  let nvim_version = s:system([a:python, '-c',
-        \ 'from neovim import VERSION as v; '.
-        \ 'print("{}.{}.{}{}".format(v.major, v.minor, v.patch, v.prerelease))'],
-        \ '', 1, 1)
-  if empty(nvim_version)
-    let nvim_version = 'unable to find pynvim module version'
-    let base = fnamemodify(nvim_path, ':h')
-    let metas = glob(base.'-*/METADATA', 1, 1)
-          \ + glob(base.'-*/PKG-INFO', 1, 1)
-          \ + glob(base.'.egg-info/PKG-INFO', 1, 1)
-    let metas = sort(metas, 's:compare')
-
-    if !empty(metas)
-      for meta_line in readfile(metas[0])
-        if meta_line =~# '^Version:'
-          let nvim_version = matchstr(meta_line, '^Version: \zs\S\+')
-          break
-        endif
-      endfor
-    endif
-  endif
-
-  let nvim_path_base = fnamemodify(nvim_path, ':~:h')
-  let version_status = 'unknown; '.nvim_path_base
-  if !s:is_bad_response(nvim_version) && !s:is_bad_response(pypi_version)
-    if v:lua.vim.version.lt(nvim_version, pypi_version)
-      let version_status = 'outdated; from '.nvim_path_base
-    else
-      let version_status = 'up to date'
-    endif
-  endif
-
-  return [python_version, nvim_version, pypi_version, version_status]
-endfunction
-
-" Check the Python interpreter's usability.
-function! s:check_bin(bin) abort
-  if !filereadable(a:bin) && (!has('win32') || !filereadable(a:bin.'.exe'))
-    call health#report_error(printf('"%s" was not found.', a:bin))
-    return 0
-  elseif executable(a:bin) != 1
-    call health#report_error(printf('"%s" is not executable.', a:bin))
-    return 0
-  endif
-  return 1
-endfunction
-
 " Check "loaded" var for given a:provider.
 " Returns 1 if the caller should return (skip checks).
 function! s:disabled_via_loaded_var(provider) abort
@@ -241,204 +90,6 @@ function! s:disabled_via_loaded_var(provider) abort
   return 0
 endfunction
 
-function! s:check_python() abort
-  call health#report_start('Python 3 provider (optional)')
-
-  let pyname = 'python3'
-  let python_exe = ''
-  let venv = exists('$VIRTUAL_ENV') ? resolve($VIRTUAL_ENV) : ''
-  let host_prog_var = pyname.'_host_prog'
-  let python_multiple = []
-
-  if s:disabled_via_loaded_var(pyname)
-    return
-  endif
-
-  let [pyenv, pyenv_root] = s:check_for_pyenv()
-
-  if exists('g:'.host_prog_var)
-    call health#report_info(printf('Using: g:%s = "%s"', host_prog_var, get(g:, host_prog_var)))
-  endif
-
-  let [pyname, pythonx_warnings] = provider#pythonx#Detect(3)
-
-  if empty(pyname)
-    call health#report_warn('No Python executable found that can `import neovim`. '
-            \ . 'Using the first available executable for diagnostics.')
-  elseif exists('g:'.host_prog_var)
-    let python_exe = pyname
-  endif
-
-  " No Python executable could `import neovim`, or host_prog_var was used.
-  if !empty(pythonx_warnings)
-    call health#report_warn(pythonx_warnings, ['See :help provider-python for more information.',
-          \ 'You may disable this provider (and warning) by adding `let g:loaded_python3_provider = 0` to your init.vim'])
-
-  elseif !empty(pyname) && empty(python_exe)
-    if !exists('g:'.host_prog_var)
-      call health#report_info(printf('`g:%s` is not set.  Searching for '
-            \ . '%s in the environment.', host_prog_var, pyname))
-    endif
-
-    if !empty(pyenv)
-      let python_exe = s:trim(s:system([pyenv, 'which', pyname], '', 1))
-
-      if empty(python_exe)
-        call health#report_warn(printf('pyenv could not find %s.', pyname))
-      endif
-    endif
-
-    if empty(python_exe)
-      let python_exe = exepath(pyname)
-
-      if exists('$PATH')
-        for path in split($PATH, has('win32') ? ';' : ':')
-          let path_bin = s:normalize_path(path.'/'.pyname)
-          if path_bin != s:normalize_path(python_exe)
-                \ && index(python_multiple, path_bin) == -1
-                \ && executable(path_bin)
-            call add(python_multiple, path_bin)
-          endif
-        endfor
-
-        if len(python_multiple)
-          " This is worth noting since the user may install something
-          " that changes $PATH, like homebrew.
-          call health#report_info(printf('Multiple %s executables found.  '
-                \ . 'Set `g:%s` to avoid surprises.', pyname, host_prog_var))
-        endif
-
-        if python_exe =~# '\<shims\>'
-          call health#report_warn(printf('`%s` appears to be a pyenv shim.', python_exe), [
-                      \ '`pyenv` is not in $PATH, your pyenv installation is broken. '
-                      \ .'Set `g:'.host_prog_var.'` to avoid surprises.',
-                      \ ])
-        endif
-      endif
-    endif
-  endif
-
-  if !empty(python_exe) && !exists('g:'.host_prog_var)
-    if empty(venv) && !empty(pyenv)
-          \ && !empty(pyenv_root) && resolve(python_exe) !~# '^'.pyenv_root.'/'
-      call health#report_warn('pyenv is not set up optimally.', [
-            \ printf('Create a virtualenv specifically '
-            \ . 'for Nvim using pyenv, and set `g:%s`.  This will avoid '
-            \ . 'the need to install the pynvim module in each '
-            \ . 'version/virtualenv.', host_prog_var)
-            \ ])
-    elseif !empty(venv)
-      if !empty(pyenv_root)
-        let venv_root = pyenv_root
-      else
-        let venv_root = fnamemodify(venv, ':h')
-      endif
-
-      if resolve(python_exe) !~# '^'.venv_root.'/'
-        call health#report_warn('Your virtualenv is not set up optimally.', [
-              \ printf('Create a virtualenv specifically '
-              \ . 'for Nvim and use `g:%s`.  This will avoid '
-              \ . 'the need to install the pynvim module in each '
-              \ . 'virtualenv.', host_prog_var)
-              \ ])
-      endif
-    endif
-  endif
-
-  if empty(python_exe) && !empty(pyname)
-    " An error message should have already printed.
-    call health#report_error(printf('`%s` was not found.', pyname))
-  elseif !empty(python_exe) && !s:check_bin(python_exe)
-    let python_exe = ''
-  endif
-
-  " Diagnostic output
-  call health#report_info('Executable: ' . (empty(python_exe) ? 'Not found' : python_exe))
-  if len(python_multiple)
-    for path_bin in python_multiple
-      call health#report_info('Other python executable: ' . path_bin)
-    endfor
-  endif
-
-  if empty(python_exe)
-    " No Python executable can import 'neovim'. Check if any Python executable
-    " can import 'pynvim'. If so, that Python failed to import 'neovim' as
-    " well, which is most probably due to a failed pip upgrade:
-    " https://github.com/neovim/neovim/wiki/Following-HEAD#20181118
-    let [pynvim_exe, errors] = provider#pythonx#DetectByModule('pynvim', 3)
-    if !empty(pynvim_exe)
-      call health#report_error(
-            \ 'Detected pip upgrade failure: Python executable can import "pynvim" but '
-            \ . 'not "neovim": '. pynvim_exe,
-            \ "Use that Python version to reinstall \"pynvim\" and optionally \"neovim\".\n"
-            \ . pynvim_exe ." -m pip uninstall pynvim neovim\n"
-            \ . pynvim_exe ." -m pip install pynvim\n"
-            \ . pynvim_exe ." -m pip install neovim  # only if needed by third-party software")
-    endif
-  else
-    let [majorpyversion, current, latest, status] = s:version_info(python_exe)
-
-    if 3 != str2nr(majorpyversion)
-      call health#report_warn('Unexpected Python version.' .
-                  \ ' This could lead to confusing error messages.')
-    endif
-
-    call health#report_info('Python version: ' . majorpyversion)
-
-    if s:is_bad_response(status)
-      call health#report_info(printf('pynvim version: %s (%s)', current, status))
-    else
-      call health#report_info(printf('pynvim version: %s', current))
-    endif
-
-    if s:is_bad_response(current)
-      call health#report_error(
-        \ "pynvim is not installed.\nError: ".current,
-        \ ['Run in shell: '. python_exe .' -m pip install pynvim'])
-    endif
-
-    if s:is_bad_response(latest)
-      call health#report_warn('Could not contact PyPI to get latest version.')
-      call health#report_error('HTTP request failed: '.latest)
-    elseif s:is_bad_response(status)
-      call health#report_warn(printf('Latest pynvim is NOT installed: %s', latest))
-    elseif !s:is_bad_response(current)
-      call health#report_ok(printf('Latest pynvim is installed.'))
-    endif
-  endif
-endfunction
-
-" Check if pyenv is available and a valid pyenv root can be found, then return
-" their respective paths. If either of those is invalid, return two empty
-" strings, effectively ignoring pyenv.
-function! s:check_for_pyenv() abort
-  let pyenv_path = resolve(exepath('pyenv'))
-
-  if empty(pyenv_path)
-    return ['', '']
-  endif
-
-  call health#report_info('pyenv: Path: '. pyenv_path)
-
-  let pyenv_root = exists('$PYENV_ROOT') ? resolve($PYENV_ROOT) : ''
-
-  if empty(pyenv_root)
-    let pyenv_root = s:trim(s:system([pyenv_path, 'root']))
-    call health#report_info('pyenv: $PYENV_ROOT is not set. Infer from `pyenv root`.')
-  endif
-
-  if !isdirectory(pyenv_root)
-    call health#report_warn(
-          \ printf('pyenv: Root does not exist: %s. '
-          \ . 'Ignoring pyenv for all following checks.', pyenv_root))
-    return ['', '']
-  endif
-
-  call health#report_info('pyenv: Root: '.pyenv_root)
-
-  return [pyenv_path, pyenv_root]
-endfunction
-
 " Resolves Python executable path by invoking and checking `sys.executable`.
 function! s:python_exepath(invocation) abort
   return s:normalize_path(system(fnameescape(a:invocation)
@@ -721,7 +372,6 @@ function! s:check_perl() abort
 endfunction
 
 function! health#provider2#check() abort
-  call s:check_python()
   call s:check_virtualenv()
   call s:check_ruby()
   call s:check_node()
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index 7a17edc848..b611137dcb 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -1,5 +1,17 @@
 local M = {}
 
+local start = vim.health.report_start
+local ok = vim.health.report_ok
+local info = vim.health.report_info
+local warn = vim.health.report_warn
+local error = vim.health.report_error
+local iswin = vim.loop.os_uname().sysname == 'Windows_NT'
+
+local shell_error_code = 0
+local function shell_error()
+  return shell_error_code ~= 0
+end
+
 -- Returns true if `cmd` exits with success, else false.
 local function cmd_ok(cmd)
   vim.fn.system(cmd)
@@ -14,8 +26,122 @@ local function is_blank(s)
   return s:find('^%s*$') ~= nil
 end
 
+local function isdir(path)
+  if not path then
+    return false
+  end
+  local stat = vim.loop.fs_stat(path)
+  if not stat then
+    return false
+  end
+  return stat.type == 'directory'
+end
+
+local function isfile(path)
+  if not path then
+    return false
+  end
+  local stat = vim.loop.fs_stat(path)
+  if not stat then
+    return false
+  end
+  return stat.type == 'file'
+end
+
+-- Handler for s:system() function.
+local function system_handler(self, _, data, event)
+  if event == 'stderr' then
+    if self.add_stderr_to_output then
+      self.output = self.output .. vim.fn.join(data, '')
+    else
+      self.stderr = self.stderr .. vim.fn.join(data, '')
+    end
+  elseif event == 'stdout' then
+    self.output = self.output .. vim.fn.join(data, '')
+  elseif event == 'exit' then
+    shell_error_code = data
+  end
+end
+
+-- Attempts to construct a shell command from an args list.
+-- Only for display, to help users debug a failed command.
+local function shellify(cmd)
+  if type(cmd) ~= 'table' then
+    return cmd
+  end
+  return vim.fn.join(
+    vim.fn.map(vim.fn.copy(cmd), [[v:val =~# ''\m[^\-.a-zA-Z_/]'' ? shellescape(v:val) : v:val]]),
+    ' '
+  )
+end
+
+-- Run a system command and timeout after 30 seconds.
+local function system(cmd, ...)
+  local args = { ... }
+  local args_count = vim.tbl_count(args)
+
+  local stdin = (args_count > 0 and args[1] or '')
+  local stderr = (args_count > 1 and args[2] or false)
+  local ignore_error = (args_count > 2 and args[3] or false)
+
+  local opts = {
+    add_stderr_to_output = stderr,
+    output = '',
+    stderr = '',
+    on_stdout = system_handler,
+    on_stderr = system_handler,
+    on_exit = system_handler,
+  }
+  local jobid = vim.fn.jobstart(cmd, opts)
+
+  if jobid < 1 then
+    local message = 'Command error (job='
+      .. jobid
+      .. '): `'
+      .. shellify(cmd)
+      .. '` (in '
+      .. vim.fn.string(vim.fn.getcwd())
+      .. ')'
+
+    error(message)
+    shell_error_code = 1
+    return opts.output
+  end
+
+  if not is_blank(stdin) then
+    vim.cmd([[call jobsend(jobid, stdin)]])
+  end
+
+  local res = vim.fn.jobwait({ jobid }, 30000)
+  if res[1] == -1 then
+    error('Command timed out: ' .. shellify(cmd))
+    vim.cmd([[call jobstop(jobid)]])
+  elseif shell_error() and not ignore_error then
+    local emsg = 'Command error (job='
+      .. jobid
+      .. ', exit code '
+      .. shell_error_code
+      .. '): `'
+      .. shellify(cmd)
+      .. '` (in '
+      .. vim.fn.string(vim.fn.getcwd())
+      .. ')'
+    if not is_blank(opts.output) then
+      emsg = emsg .. '\noutput: ' .. opts.output
+    end
+    if not is_blank(opts.stderr) then
+      emsg = emsg .. '\nstderr: ' .. opts.stderr
+    end
+    error(emsg)
+  end
+
+  -- return opts.output
+  local _ = ...
+  return vim.fn.system(cmd)
+end
+
 local function clipboard()
-  vim.health.report_start('Clipboard (optional)')
+  start('Clipboard (optional)')
 
   if
     os.getenv('TMUX')
@@ -28,28 +154,426 @@ local function clipboard()
       'Install tmux 2.6+.  https://superuser.com/q/231130',
       'or use tmux with reattach-to-user-namespace.  https://superuser.com/a/413233',
     }
-    vim.health.report_error('pbcopy does not work with tmux version: ' .. tmux_version, advice)
+    error('pbcopy does not work with tmux version: ' .. tmux_version, advice)
   end
 
   local clipboard_tool = vim.fn['provider#clipboard#Executable']()
   if vim.g.clipboard and is_blank(clipboard_tool) then
     local error_message = vim.fn['provider#clipboard#Error']()
-    vim.health.report_error(
+    error(
       error_message,
       "Use the example in :help g:clipboard as a template, or don't set g:clipboard at all."
     )
   elseif is_blank(clipboard_tool) then
-    vim.health.report_warn(
+    warn(
       'No clipboard tool found. Clipboard registers (`"+` and `"*`) will not work.',
       ':help clipboard'
     )
   else
-    vim.health.report_ok('Clipboard tool found: ' .. clipboard_tool)
+    ok('Clipboard tool found: ' .. clipboard_tool)
+  end
+end
+
+local function disabled_via_loaded_var(provider)
+  local loaded_var = 'loaded_' .. provider .. '_provider'
+  local v = vim.g[loaded_var]
+  if v == 0 then
+    info('Disabled (' .. loaded_var .. '=' .. v .. ').')
+    return true
+  end
+  return false
+end
+
+-- Check if pyenv is available and a valid pyenv root can be found, then return
+-- their respective paths. If either of those is invalid, return two empty
+-- strings, effectively ignoring pyenv.
+local function check_for_pyenv()
+  local pyenv_path = vim.fn.resolve(vim.fn.exepath('pyenv'))
+
+  if is_blank(pyenv_path) then
+    return { '', '' }
+  end
+
+  info('pyenv: Path: ' .. pyenv_path)
+
+  local pyenv_root = os.getenv('PYENV_ROOT') and vim.fn.resolve('$PYENV_ROOT') or ''
+
+  if is_blank(pyenv_root) then
+    pyenv_root = vim.trim(system({ pyenv_path, 'root' }))
+    info('pyenv: $PYENV_ROOT is not set. Infer from `pyenv root`.')
+  end
+
+  if not isdir(pyenv_root) then
+    local message = 'pyenv: Root does not exist: '
+      .. pyenv_root
+      .. '. Ignoring pyenv for all following checks.'
+    warn(message)
+    return { '', '' }
+  end
+
+  info('pyenv: Root: ' .. pyenv_root)
+
+  return { pyenv_path, pyenv_root }
+end
+
+-- Check the Python interpreter's usability.
+local function check_bin(bin)
+  if not isfile(bin) and (not iswin or not isfile(bin .. '.exe')) then
+    error('"' .. bin .. '" was not found.')
+    return false
+  elseif not executable(bin) then
+    error('"' .. bin .. '" is not executable.')
+    return false
+  end
+  return true
+end
+
+-- Fetch the contents of a URL.
+local function download(url)
+  local has_curl = executable('curl')
+  if has_curl and vim.fn.system({ 'curl', '-V' }):find('Protocols:.*https') then
+    local rv = system({ 'curl', '-sL', url }, '', 1, 1)
+    if shell_error() then
+      return 'curl error with ' .. url .. ': ' .. shell_error_code
+    else
+      return rv
+    end
+  elseif executable('python') then
+    local script = "try:\n\
+          from urllib.request import urlopen\n\
+          except ImportError:\n\
+          from urllib2 import urlopen\n\
+          response = urlopen('" .. url .. "')\n\
+          print(response.read().decode('utf8'))\n"
+    local rv = system({ 'python', '-c', script })
+    if is_blank(rv) and shell_error() then
+      return 'python urllib.request error: ' .. shell_error_code
+    else
+      return rv
+    end
+  end
+
+  local message = 'missing `curl` '
+
+  if has_curl then
+    message = message .. '(with HTTPS support) '
+  end
+  message = message .. 'and `python`, cannot make web request'
+
+  return message
+end
+
+-- Get the latest Nvim Python client (pynvim) version from PyPI.
+local function latest_pypi_version()
+  local pypi_version = 'unable to get pypi response'
+  local pypi_response = download('https://pypi.python.org/pypi/pynvim/json')
+  if not is_blank(pypi_response) then
+    local pcall_ok, output = pcall(vim.fn.json_decode, pypi_response)
+    local pypi_data
+    if pcall_ok then
+      pypi_data = output
+    else
+      return 'error: ' .. pypi_response
+    end
+
+    local pypi_element = pypi_data['info'] or {}
+    pypi_version = pypi_element['version'] or 'unable to parse'
+  end
+  return pypi_version
+end
+
+local function is_bad_response(s)
+  local lower = s:lower()
+  return vim.startswith(lower, 'unable')
+    or vim.startswith(lower, 'error')
+    or vim.startswith(lower, 'outdated')
+end
+
+-- Get version information using the specified interpreter.  The interpreter is
+-- used directly in case breaking changes were introduced since the last time
+-- Nvim's Python client was updated.
+--
+-- Returns: {
+--     {python executable version},
+--     {current nvim version},
+--     {current pypi nvim status},
+--     {installed version status}
+-- }
+local function version_info(python)
+  local pypi_version = latest_pypi_version()
+
+  local python_version = vim.trim(system({
+    python,
+    '-c',
+    'import sys; print(".".join(str(x) for x in sys.version_info[:3]))',
+  }))
+
+  if is_blank(python_version) then
+    python_version = 'unable to parse ' .. python .. ' response'
+  end
+
+  local nvim_path = vim.trim(system({
+    python,
+    '-c',
+    'import sys; sys.path = [p for p in sys.path if p != ""]; import neovim; print(neovim.__file__)',
+  }))
+  if shell_error() or is_blank(nvim_path) then
+    return { python_version, 'unable to load neovim Python module', pypi_version, nvim_path }
+  end
+
+  -- Assuming that multiple versions of a package are installed, sort them
+  -- numerically in descending order.
+  local function compare(metapath1, metapath2)
+    local a = vim.fn.matchstr(vim.fn.fnamemodify(metapath1, ':p:h:t'), [[[0-9.]\+]])
+    local b = vim.fn.matchstr(vim.fn.fnamemodify(metapath2, ':p:h:t'), [[[0-9.]\+]])
+    if a == b then
+      return 0
+    elseif a > b then
+      return 1
+    else
+      return -1
+    end
+  end
+
+  -- Try to get neovim.VERSION (added in 0.1.11dev).
+  local nvim_version = system({
+    python,
+    '-c',
+    'from neovim import VERSION as v; print("{}.{}.{}{}".format(v.major, v.minor, v.patch, v.prerelease))',
+  }, '', 1, 1)
+  if is_blank(nvim_version) then
+    nvim_version = 'unable to find pynvim module version'
+    local base = vim.fs.basename(nvim_path, ':h')
+    local metas = vim.fn.glob(base .. '-*/METADATA', 1, 1)
+    vim.list_extend(metas, vim.fn.glob(base .. '-*/PKG-INFO', 1, 1))
+    vim.list_extend(metas, vim.fn.glob(base .. '.egg-info/PKG-INFO', 1, 1))
+    metas = table.sort(metas, compare)
+
+    if metas and next(metas) ~= nil then
+      for _, meta_line in ipairs(vim.fn.readfile(metas[1])) do
+        if vim.startswith(meta_line, 'Version:') then
+          nvim_version = vim.fn.matchstr(meta_line, [[^Version: \zs\S\+]])
+          break
+        end
+      end
+    end
+  end
+
+  local nvim_path_base = vim.fn.fnamemodify(nvim_path, [[:~:h]])
+  local version_status = 'unknown; ' .. nvim_path_base
+  if is_bad_response(nvim_version) and is_bad_response(pypi_version) then
+    if vim.version.lt(nvim_version, pypi_version) then
+      version_status = 'outdated; from ' .. nvim_path_base
+    else
+      version_status = 'up to date'
+    end
+  end
+
+  return { python_version, nvim_version, pypi_version, version_status }
+end
+
+local function python()
+  start('Python 3 provider (optional)')
+
+  local pyname = 'python3'
+  local python_exe = ''
+  local virtual_env = os.getenv('VIRTUAL_ENV')
+  local venv = virtual_env and vim.fn.resolve(virtual_env) or ''
+  local host_prog_var = pyname .. '_host_prog'
+  local python_multiple = {}
+
+  if disabled_via_loaded_var(pyname) then
+    return
+  end
+
+  local pyenv_table = check_for_pyenv()
+  local pyenv = pyenv_table[1]
+  local pyenv_root = pyenv_table[2]
+
+  if vim.g['host_prog_var'] then
+    local message = 'Using: g:' .. host_prog_var .. ' = "' .. vim.g['host_prog_var'] .. '"'
+    info(message)
+  end
+
+  local python_table = vim.fn['provider#pythonx#Detect'](3)
+  pyname = python_table[1]
+  local pythonx_warnings = python_table[2]
+
+  if is_blank(pyname) then
+    warn(
+      'No Python executable found that can `import neovim`. '
+        .. 'Using the first available executable for diagnostics.'
+    )
+  elseif vim.g['host_prog_var'] then
+    python_exe = pyname
+  end
+
+  -- No Python executable could `import neovim`, or host_prog_var was used.
+  if not is_blank(pythonx_warnings) then
+    warn(pythonx_warnings, {
+      'See :help provider-python for more information.',
+      'You may disable this provider (and warning) by adding `let g:loaded_python3_provider = 0` to your init.vim',
+    })
+  elseif not is_blank(pyname) and is_blank(python_exe) then
+    if not vim.g['host_prog_var'] then
+      local message = '`g:'
+        .. host_prog_var
+        .. '` is not set.  Searching for '
+        .. pyname
+        .. ' in the environment.'
+      info(message)
+    end
+
+    if not is_blank(pyenv) then
+      python_exe = vim.trim(system({ pyenv, 'which', pyname }, '', 1))
+      if is_blank(python_exe) then
+        warn('pyenv could not find ' .. pyname .. '.')
+      end
+    end
+
+    if is_blank(python_exe) then
+      python_exe = vim.fn.exepath(pyname)
+
+      if os.getenv('PATH') then
+        local path_sep = iswin and ';' or ':'
+        local paths = vim.split(os.getenv('PATH') or '', path_sep)
+
+        for _, path in ipairs(paths) do
+          local path_bin = vim.fs.normalize(path .. '/' .. pyname)
+          if
+            path_bin ~= vim.fs.normalize(python_exe)
+            and vim.tbl_contains(python_multiple, path_bin)
+            and executable(path_bin)
+          then
+            python_multiple[#python_multiple + 1] = path_bin
+          end
+        end
+
+        if vim.tbl_count(python_multiple) > 0 then
+          -- This is worth noting since the user may install something
+          -- that changes $PATH, like homebrew.
+          local message = 'Multiple '
+            .. pyname
+            .. ' executables found.  '
+            .. 'Set `g:'
+            .. host_prog_var
+            .. '` to avoid surprises.'
+          info(message)
+        end
+
+        if python_exe:find('shims') then
+          local message = '`' .. python_exe .. '` appears to be a pyenv shim.'
+          local advice = '`pyenv` is not in $PATH, your pyenv installation is broken. Set `g:'
+            .. host_prog_var
+            .. '` to avoid surprises.'
+
+          warn(message, advice)
+        end
+      end
+    end
+  end
+
+  if not is_blank(python_exe) and not vim.g[host_prog_var] then
+    if
+      is_blank(venv)
+      and not is_blank(pyenv)
+      and not is_blank(pyenv_root)
+      and vim.startswith(vim.fn.resolve(python_exe), pyenv_root .. '/')
+    then
+      local advice = 'Create a virtualenv specifically for Nvim using pyenv, and set `g:'
+        .. host_prog_var
+        .. '`.  This will avoid the need to install the pynvim module in each version/virtualenv.'
+      warn('pyenv is not set up optimally.', advice)
+    elseif not is_blank(venv) then
+      local venv_root
+      if not is_blank(pyenv_root) then
+        venv_root = pyenv_root
+      else
+        venv_root = vim.fs.basename(venv)
+      end
+
+      if vim.startswith(vim.fn.resolve(python_exe), venv_root .. '/') then
+        local advice = 'Create a virtualenv specifically for Nvim and use `g:'
+          .. host_prog_var
+          .. '`.  This will avoid the need to install the pynvim module in each virtualenv.'
+        warn('Your virtualenv is not set up optimally.', advice)
+      end
+    end
+  end
+
+  if is_blank(python_exe) and not is_blank(pyname) then
+    -- An error message should have already printed.
+    error('`' .. pyname .. '` was not found.')
+  elseif not is_blank(python_exe) and not check_bin(python_exe) then
+    python_exe = ''
+  end
+
+  -- Diagnostic output
+  info('Executable: ' .. (is_blank(python_exe) and 'Not found' or python_exe))
+  if vim.tbl_count(python_multiple) > 0 then
+    for _, path_bin in ipairs(python_multiple) do
+      info('Other python executable: ' .. path_bin)
+    end
+  end
+
+  if is_blank(python_exe) then
+    -- No Python executable can import 'neovim'. Check if any Python executable
+    -- can import 'pynvim'. If so, that Python failed to import 'neovim' as
+    -- well, which is most probably due to a failed pip upgrade:
+    -- https://github.com/neovim/neovim/wiki/Following-HEAD#20181118
+    local pynvim_table = vim.fn['provider#pythonx#DetectByModule']('pynvim', 3)
+    local pynvim_exe = pynvim_table[1]
+    if not is_blank(pynvim_exe) then
+      local message = 'Detected pip upgrade failure: Python executable can import "pynvim" but not "neovim": '
+        .. pynvim_exe
+      local advice = {
+        'Use that Python version to reinstall "pynvim" and optionally "neovim".',
+        pynvim_exe .. ' -m pip uninstall pynvim neovim',
+        pynvim_exe .. ' -m pip install pynvim',
+        pynvim_exe .. ' -m pip install neovim  # only if needed by third-party software',
+      }
+      error(message, advice)
+    end
+  else
+    local version_info_table = version_info(python_exe)
+    local majorpyversion = version_info_table[1]
+    local current = version_info_table[2]
+    local latest = version_info_table[3]
+    local status = version_info_table[4]
+
+    if vim.fn.str2nr(majorpyversion) ~= 3 then
+      warn('Unexpected Python version. This could lead to confusing error messages.')
+    end
+
+    info('Python version: ' .. majorpyversion)
+
+    if is_bad_response(status) then
+      info('pynvim version: ' .. current .. ' (' .. status .. ')')
+    else
+      info('pynvim version: ' .. current)
+    end
+
+    if is_bad_response(current) then
+      error(
+        'pynvim is not installed.\nError: ' .. current,
+        'Run in shell: ' .. python_exe .. ' -m pip install pynvim'
+      )
+    end
+
+    if is_bad_response(latest) then
+      warn('Could not contact PyPI to get latest version.')
+      error('HTTP request failed: ' .. latest)
+    elseif is_bad_response(status) then
+      warn('Latest pynvim is NOT installed: ' .. latest)
+    elseif not is_bad_response(current) then
+      ok('Latest pynvim is installed.')
+    end
   end
 end
 
 function M.check()
   clipboard()
+  python()
 end
 
 return M
-- 
cgit 


From 5ed7ede1f58200e79bc1ac8a15356ef2fa7319b0 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 10 Apr 2023 11:28:42 +0200
Subject: refactor: rewrite virtualenv healthcheck in lua

This is required to remove the vimscript checkhealth functions.
---
 runtime/autoload/health/provider2.vim | 74 -----------------------------
 runtime/lua/provider/health.lua       | 89 ++++++++++++++++++++++++++++++++++-
 2 files changed, 88 insertions(+), 75 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/health/provider2.vim b/runtime/autoload/health/provider2.vim
index 0ebf203788..3387b7eb14 100644
--- a/runtime/autoload/health/provider2.vim
+++ b/runtime/autoload/health/provider2.vim
@@ -90,79 +90,6 @@ function! s:disabled_via_loaded_var(provider) abort
   return 0
 endfunction
 
-" Resolves Python executable path by invoking and checking `sys.executable`.
-function! s:python_exepath(invocation) abort
-  return s:normalize_path(system(fnameescape(a:invocation)
-    \ . ' -c "import sys; sys.stdout.write(sys.executable)"'))
-endfunction
-
-" Checks that $VIRTUAL_ENV Python executables are found at front of $PATH in
-" Nvim and subshells.
-function! s:check_virtualenv() abort
-  call health#report_start('Python virtualenv')
-  if !exists('$VIRTUAL_ENV')
-    call health#report_ok('no $VIRTUAL_ENV')
-    return
-  endif
-  let errors = []
-  " Keep hints as dict keys in order to discard duplicates.
-  let hints = {}
-  " The virtualenv should contain some Python executables, and those
-  " executables should be first both on Nvim's $PATH and the $PATH of
-  " subshells launched from Nvim.
-  let bin_dir = has('win32') ? '/Scripts' : '/bin'
-  let venv_bins = glob($VIRTUAL_ENV . bin_dir . '/python*', v:true, v:true)
-  " XXX: Remove irrelevant executables found in bin/.
-  let venv_bins = filter(venv_bins, 'v:val !~# "python-config"')
-  if len(venv_bins)
-    for venv_bin in venv_bins
-      let venv_bin = s:normalize_path(venv_bin)
-      let py_bin_basename = fnamemodify(venv_bin, ':t')
-      let nvim_py_bin = s:python_exepath(exepath(py_bin_basename))
-      let subshell_py_bin = s:python_exepath(py_bin_basename)
-      if venv_bin !=# nvim_py_bin
-        call add(errors, '$PATH yields this '.py_bin_basename.' executable: '.nvim_py_bin)
-        let hint = '$PATH ambiguities arise if the virtualenv is not '
-          \.'properly activated prior to launching Nvim. Close Nvim, activate the virtualenv, '
-          \.'check that invoking Python from the command line launches the correct one, '
-          \.'then relaunch Nvim.'
-        let hints[hint] = v:true
-      endif
-      if venv_bin !=# subshell_py_bin
-        call add(errors, '$PATH in subshells yields this '
-          \.py_bin_basename . ' executable: '.subshell_py_bin)
-        let hint = '$PATH ambiguities in subshells typically are '
-          \.'caused by your shell config overriding the $PATH previously set by the '
-          \.'virtualenv. Either prevent them from doing so, or use this workaround: '
-          \.'https://vi.stackexchange.com/a/34996'
-        let hints[hint] = v:true
-      endif
-    endfor
-  else
-    call add(errors, 'no Python executables found in the virtualenv '.bin_dir.' directory.')
-  endif
-
-  let msg = '$VIRTUAL_ENV is set to: '.$VIRTUAL_ENV
-  if len(errors)
-    if len(venv_bins)
-      let msg .= "\nAnd its ".bin_dir.' directory contains: '
-        \.join(map(venv_bins, "fnamemodify(v:val, ':t')"), ', ')
-    endif
-    let conj = "\nBut "
-    for error in errors
-      let msg .= conj.error
-      let conj = "\nAnd "
-    endfor
-    let msg .= "\nSo invoking Python may lead to unexpected results."
-    call health#report_warn(msg, keys(hints))
-  else
-    call health#report_info(msg)
-    call health#report_info('Python version: '
-      \.system('python -c "import platform, sys; sys.stdout.write(platform.python_version())"'))
-    call health#report_ok('$VIRTUAL_ENV provides :!python.')
-  endif
-endfunction
-
 function! s:check_ruby() abort
   call health#report_start('Ruby provider (optional)')
 
@@ -372,7 +299,6 @@ function! s:check_perl() abort
 endfunction
 
 function! health#provider2#check() abort
-  call s:check_virtualenv()
   call s:check_ruby()
   call s:check_node()
   call s:check_perl()
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index b611137dcb..fb5206c325 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -489,7 +489,7 @@ local function python()
       if not is_blank(pyenv_root) then
         venv_root = pyenv_root
       else
-        venv_root = vim.fs.basename(venv)
+        venv_root = vim.fs.dirname(venv)
       end
 
       if vim.startswith(vim.fn.resolve(python_exe), venv_root .. '/') then
@@ -571,9 +571,96 @@ local function python()
   end
 end
 
+-- Resolves Python executable path by invoking and checking `sys.executable`.
+local function python_exepath(invocation)
+  return vim.fs.normalize(
+    system(vim.fn.fnameescape(invocation) .. ' -c "import sys; sys.stdout.write(sys.executable)"')
+  )
+end
+
+-- Checks that $VIRTUAL_ENV Python executables are found at front of $PATH in
+-- Nvim and subshells.
+local function virtualenv()
+  start('Python virtualenv')
+  if not os.getenv('VIRTUAL_ENV') then
+    ok('no $VIRTUAL_ENV')
+    return
+  end
+  local errors = {}
+  -- Keep hints as dict keys in order to discard duplicates.
+  local hints = {}
+  -- The virtualenv should contain some Python executables, and those
+  -- executables should be first both on Nvim's $PATH and the $PATH of
+  -- subshells launched from Nvim.
+  local bin_dir = (iswin and '/Scripts' or '/bin')
+  local venv_bins = vim.fn.glob(os.getenv('VIRTUAL_ENV') .. bin_dir .. '/python*', true, true)
+  -- XXX: Remove irrelevant executables found in bin/.
+  venv_bins = vim.fn.filter(venv_bins, 'v:val !~# "python-config"')
+  if vim.tbl_coun(venv_bins) > 0 then
+    for _, venv_bin in pairs(venv_bins) do
+      venv_bin = vim.fs.normalize(venv_bin)
+      local py_bin_basename = vim.fs.basename(venv_bin)
+      local nvim_py_bin = python_exepath(vim.fn.exepath(py_bin_basename))
+      local subshell_py_bin = python_exepath(py_bin_basename)
+      if venv_bin ~= nvim_py_bin then
+        errors[#errors + 1] = '$PATH yields this '
+          .. py_bin_basename
+          .. ' executable: '
+          .. nvim_py_bin
+        local hint = '$PATH ambiguities arise if the virtualenv is not '
+          .. 'properly activated prior to launching Nvim. Close Nvim, activate the virtualenv, '
+          .. 'check that invoking Python from the command line launches the correct one, '
+          .. 'then relaunch Nvim.'
+        hints[hint] = true
+      end
+      if venv_bin ~= subshell_py_bin then
+        errors[#errors + 1] = '$PATH in subshells yields this '
+          .. py_bin_basename
+          .. ' executable: '
+          .. subshell_py_bin
+        local hint = '$PATH ambiguities in subshells typically are '
+          .. 'caused by your shell config overriding the $PATH previously set by the '
+          .. 'virtualenv. Either prevent them from doing so, or use this workaround: '
+          .. 'https://vi.stackexchange.com/a/34996'
+        hints[hint] = true
+      end
+    end
+  else
+    errors[#errors + 1] = 'no Python executables found in the virtualenv '
+      .. bin_dir
+      .. ' directory.'
+  end
+
+  local msg = '$VIRTUAL_ENV is set to: ' .. os.getenv('VIRTUAL_ENV')
+  if vim.tbl_count(errors) > 0 then
+    if vim.tbl_count(venv_bins) > 0 then
+      msg = msg
+        .. '\nAnd its '
+        .. bin_dir
+        .. ' directory contains: '
+        .. vim.fn.join(vim.fn.map(venv_bins, [[fnamemodify(v:val, ':t')]]), ', ')
+    end
+    local conj = '\nBut '
+    for _, err in ipairs(errors) do
+      msg = msg .. conj .. err
+      conj = '\nAnd '
+    end
+    msg = msg .. '\nSo invoking Python may lead to unexpected results.'
+    warn(msg, vim.fn.keys(hints))
+  else
+    info(msg)
+    info(
+      'Python version: '
+        .. system('python -c "import platform, sys; sys.stdout.write(platform.python_version())"')
+    )
+    ok('$VIRTUAL_ENV provides :!python.')
+  end
+end
+
 function M.check()
   clipboard()
   python()
+  virtualenv()
 end
 
 return M
-- 
cgit 


From da979ae04b7a8c56586ed0233957600ad6af99f0 Mon Sep 17 00:00:00 2001
From: Munif Tanjim <hello@muniftanjim.dev>
Date: Sun, 2 Apr 2023 23:01:10 +0600
Subject: fix(api): do not re-apply win_config.style when missing

---
 runtime/doc/api.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 3c3e66dd57..1adf0a305f 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3066,8 +3066,8 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
                       In general, values below 100 are recommended, unless
                       there is a good reason to overshadow builtin elements.
 
-                  • style: Configure the appearance of the window. Currently
-                    only takes one non-empty value:
+                  • style: (optional) Configure the appearance of the window.
+                    Currently only supports one value:
                     • "minimal" Nvim will display the window with many UI
                       options disabled. This is useful when displaying a
                       temporary float where the text should not be edited.
-- 
cgit 


From 7801ffc38aedbbd527e614b6ba5ad60ecf380470 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 10 Apr 2023 14:06:10 +0200
Subject: refactor: rewrite ruby healthcheck in lua

This is required to remove the vimscript checkhealth functions.
---
 runtime/autoload/health/provider2.vim | 61 --------------------------------
 runtime/lua/provider/health.lua       | 66 ++++++++++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 62 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/health/provider2.vim b/runtime/autoload/health/provider2.vim
index 3387b7eb14..edd3baae12 100644
--- a/runtime/autoload/health/provider2.vim
+++ b/runtime/autoload/health/provider2.vim
@@ -1,10 +1,5 @@
 let s:shell_error = 0
 
-" Convert '\' to '/'. Collapse '//' and '/./'.
-function! s:normalize_path(s) abort
-  return substitute(substitute(a:s, '\', '/', 'g'), '/\./\|/\+', '/', 'g')
-endfunction
-
 " Handler for s:system() function.
 function! s:system_handler(jobid, data, event) dict abort
   if a:event ==# 'stderr'
@@ -90,61 +85,6 @@ function! s:disabled_via_loaded_var(provider) abort
   return 0
 endfunction
 
-function! s:check_ruby() abort
-  call health#report_start('Ruby provider (optional)')
-
-  if s:disabled_via_loaded_var('ruby')
-    return
-  endif
-
-  if !executable('ruby') || !executable('gem')
-    call health#report_warn(
-          \ '`ruby` and `gem` must be in $PATH.',
-          \ ['Install Ruby and verify that `ruby` and `gem` commands work.'])
-    return
-  endif
-  call health#report_info('Ruby: '. s:system(['ruby', '-v']))
-
-  let [host, err] = provider#ruby#Detect()
-  if empty(host)
-    call health#report_warn('`neovim-ruby-host` not found.',
-          \ ['Run `gem install neovim` to ensure the neovim RubyGem is installed.',
-          \  'Run `gem environment` to ensure the gem bin directory is in $PATH.',
-          \  'If you are using rvm/rbenv/chruby, try "rehashing".',
-          \  'See :help g:ruby_host_prog for non-standard gem installations.',
-          \  'You may disable this provider (and warning) by adding `let g:loaded_ruby_provider = 0` to your init.vim'])
-    return
-  endif
-  call health#report_info('Host: '. host)
-
-  let latest_gem_cmd = has('win32') ? 'cmd /c gem list -ra "^^neovim$"' : 'gem list -ra ^neovim$'
-  let latest_gem = s:system(split(latest_gem_cmd))
-  if s:shell_error || empty(latest_gem)
-    call health#report_error('Failed to run: '. latest_gem_cmd,
-          \ ["Make sure you're connected to the internet.",
-          \  'Are you behind a firewall or proxy?'])
-    return
-  endif
-  let latest_gem = get(split(latest_gem, 'neovim (\|, \|)$' ), 0, 'not found')
-
-  let current_gem_cmd = [host, '--version']
-  let current_gem = s:system(current_gem_cmd)
-  if s:shell_error
-    call health#report_error('Failed to run: '. join(current_gem_cmd),
-          \ ['Report this issue with the output of: ', join(current_gem_cmd)])
-    return
-  endif
-
-  if v:lua.vim.version.lt(current_gem, latest_gem)
-    call health#report_warn(
-          \ printf('Gem "neovim" is out-of-date. Installed: %s, latest: %s',
-          \ current_gem, latest_gem),
-          \ ['Run in shell: gem update neovim'])
-  else
-    call health#report_ok('Latest "neovim" gem is installed: '. current_gem)
-  endif
-endfunction
-
 function! s:check_node() abort
   call health#report_start('Node.js provider (optional)')
 
@@ -299,7 +239,6 @@ function! s:check_perl() abort
 endfunction
 
 function! health#provider2#check() abort
-  call s:check_ruby()
   call s:check_node()
   call s:check_perl()
 endfunction
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index fb5206c325..c1e4b8c23a 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -137,7 +137,7 @@ local function system(cmd, ...)
 
   -- return opts.output
   local _ = ...
-  return vim.fn.system(cmd)
+  return vim.trim(vim.fn.system(cmd))
 end
 
 local function clipboard()
@@ -657,10 +657,74 @@ local function virtualenv()
   end
 end
 
+local function ruby()
+  start('Ruby provider (optional)')
+
+  if disabled_via_loaded_var('ruby') then
+    return
+  end
+
+  if not executable('ruby') or not executable('gem') then
+    warn(
+      '`ruby` and `gem` must be in $PATH.',
+      'Install Ruby and verify that `ruby` and `gem` commands work.'
+    )
+    return
+  end
+  info('Ruby: ' .. system({ 'ruby', '-v' }))
+
+  local ruby_detect_table = vim.fn['provider#ruby#Detect']()
+  local host = ruby_detect_table[1]
+  if is_blank(host) then
+    warn('`neovim-ruby-host` not found.', {
+      'Run `gem install neovim` to ensure the neovim RubyGem is installed.',
+      'Run `gem environment` to ensure the gem bin directory is in $PATH.',
+      'If you are using rvm/rbenv/chruby, try "rehashing".',
+      'See :help g:ruby_host_prog for non-standard gem installations.',
+      'You may disable this provider (and warning) by adding `let g:loaded_ruby_provider = 0` to your init.vim',
+    })
+    return
+  end
+  info('Host: ' .. host)
+
+  local latest_gem_cmd = (iswin and 'cmd /c gem list -ra "^^neovim$"' or 'gem list -ra ^neovim$')
+  local latest_gem = system(vim.fn.split(latest_gem_cmd))
+  if shell_error() or is_blank(latest_gem) then
+    error(
+      'Failed to run: ' .. latest_gem_cmd,
+      { "Make sure you're connected to the internet.", 'Are you behind a firewall or proxy?' }
+    )
+    return
+  end
+  local gem_split = vim.split(latest_gem, [[neovim (\|, \|)$]])
+  latest_gem = gem_split[1] or 'not found'
+
+  local current_gem_cmd = { host, '--version' }
+  local current_gem = system(current_gem_cmd)
+  if shell_error() then
+    error(
+      'Failed to run: ' .. table.concat(current_gem_cmd, ' '),
+      { 'Report this issue with the output of: ', table.concat(current_gem_cmd, ' ') }
+    )
+    return
+  end
+
+  if vim.version.lt(current_gem, latest_gem) then
+    local message = 'Gem "neovim" is out-of-date. Installed: '
+      .. current_gem
+      .. ', latest: '
+      .. latest_gem
+    warn(message, 'Run in shell: gem update neovim')
+  else
+    ok('Latest "neovim" gem is installed: ' .. current_gem)
+  end
+end
+
 function M.check()
   clipboard()
   python()
   virtualenv()
+  ruby()
 end
 
 return M
-- 
cgit 


From b5c0e7137cee76a16ee114711616e8a6d340c96f Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:26:22 +0200
Subject: refactor: rewrite node healthcheck in lua

This is required to remove the vimscript checkhealth functions.
---
 runtime/autoload/health/provider2.vim |  80 ---------------------------
 runtime/lua/provider/health.lua       | 100 ++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 80 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/health/provider2.vim b/runtime/autoload/health/provider2.vim
index edd3baae12..ce3a360375 100644
--- a/runtime/autoload/health/provider2.vim
+++ b/runtime/autoload/health/provider2.vim
@@ -85,85 +85,6 @@ function! s:disabled_via_loaded_var(provider) abort
   return 0
 endfunction
 
-function! s:check_node() abort
-  call health#report_start('Node.js provider (optional)')
-
-  if s:disabled_via_loaded_var('node')
-    return
-  endif
-
-  if !executable('node') || (!executable('npm') && !executable('yarn') && !executable('pnpm'))
-    call health#report_warn(
-          \ '`node` and `npm` (or `yarn`, `pnpm`) must be in $PATH.',
-          \ ['Install Node.js and verify that `node` and `npm` (or `yarn`, `pnpm`) commands work.'])
-    return
-  endif
-  let node_v = get(split(s:system(['node', '-v']), "\n"), 0, '')
-  call health#report_info('Node.js: '. node_v)
-  if s:shell_error || v:lua.vim.version.lt(node_v[1:], '6.0.0')
-    call health#report_warn('Nvim node.js host does not support Node '.node_v)
-    " Skip further checks, they are nonsense if nodejs is too old.
-    return
-  endif
-  if !provider#node#can_inspect()
-    call health#report_warn('node.js on this system does not support --inspect-brk so $NVIM_NODE_HOST_DEBUG is ignored.')
-  endif
-
-  let [host, err] = provider#node#Detect()
-  if empty(host)
-    call health#report_warn('Missing "neovim" npm (or yarn, pnpm) package.',
-          \ ['Run in shell: npm install -g neovim',
-          \  'Run in shell (if you use yarn): yarn global add neovim',
-          \  'Run in shell (if you use pnpm): pnpm install -g neovim',
-          \  'You may disable this provider (and warning) by adding `let g:loaded_node_provider = 0` to your init.vim'])
-    return
-  endif
-  call health#report_info('Nvim node.js host: '. host)
-
-  let manager = 'npm'
-  if executable('yarn')
-    let manager = 'yarn'
-  elseif executable('pnpm')
-    let manager = 'pnpm'
-  endif
-
-  let latest_npm_cmd = has('win32') ?
-        \ 'cmd /c '. manager .' info neovim --json' :
-        \ manager .' info neovim --json'
-  let latest_npm = s:system(split(latest_npm_cmd))
-  if s:shell_error || empty(latest_npm)
-    call health#report_error('Failed to run: '. latest_npm_cmd,
-          \ ["Make sure you're connected to the internet.",
-          \  'Are you behind a firewall or proxy?'])
-    return
-  endif
-  try
-    let pkg_data = json_decode(latest_npm)
-  catch /E474/
-    return 'error: '.latest_npm
-  endtry
-  let latest_npm = get(get(pkg_data, 'dist-tags', {}), 'latest', 'unable to parse')
-
-  let current_npm_cmd = ['node', host, '--version']
-  let current_npm = s:system(current_npm_cmd)
-  if s:shell_error
-    call health#report_error('Failed to run: '. join(current_npm_cmd),
-          \ ['Report this issue with the output of: ', join(current_npm_cmd)])
-    return
-  endif
-
-  if latest_npm !=# 'unable to parse' && v:lua.vim.version.lt(current_npm, latest_npm)
-    call health#report_warn(
-          \ printf('Package "neovim" is out-of-date. Installed: %s, latest: %s',
-          \ current_npm, latest_npm),
-          \ ['Run in shell: npm install -g neovim',
-          \  'Run in shell (if you use yarn): yarn global add neovim',
-          \  'Run in shell (if you use pnpm): pnpm install -g neovim'])
-  else
-    call health#report_ok('Latest "neovim" npm/yarn/pnpm package is installed: '. current_npm)
-  endif
-endfunction
-
 function! s:check_perl() abort
   call health#report_start('Perl provider (optional)')
 
@@ -239,6 +160,5 @@ function! s:check_perl() abort
 endfunction
 
 function! health#provider2#check() abort
-  call s:check_node()
   call s:check_perl()
 endfunction
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index c1e4b8c23a..cab2eeaaff 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -720,11 +720,111 @@ local function ruby()
   end
 end
 
+local function node()
+  start('Node.js provider (optional)')
+
+  if disabled_via_loaded_var('node') then
+    return
+  end
+
+  if
+    not executable('node')
+    or (not executable('npm') and not executable('yarn') and not executable('pnpm'))
+  then
+    warn(
+      '`node` and `npm` (or `yarn`, `pnpm`) must be in $PATH.',
+      'Install Node.js and verify that `node` and `npm` (or `yarn`, `pnpm`) commands work.'
+    )
+    return
+  end
+
+  -- local node_v = vim.fn.split(system({'node', '-v'}), "\n")[1] or ''
+  local node_v = system({ 'node', '-v' })
+  info('Node.js: ' .. node_v)
+  if shell_error() or vim.version.lt(node_v, '6.0.0') then
+    warn('Nvim node.js host does not support Node ' .. node_v)
+    -- Skip further checks, they are nonsense if nodejs is too old.
+    return
+  end
+  if vim.fn['provider#node#can_inspect']() == 0 then
+    warn(
+      'node.js on this system does not support --inspect-brk so $NVIM_NODE_HOST_DEBUG is ignored.'
+    )
+  end
+
+  local node_detect_table = vim.fn['provider#node#Detect']()
+  local host = node_detect_table[1]
+  if is_blank(host) then
+    warn('Missing "neovim" npm (or yarn, pnpm) package.', {
+      'Run in shell: npm install -g neovim',
+      'Run in shell (if you use yarn): yarn global add neovim',
+      'Run in shell (if you use pnpm): pnpm install -g neovim',
+      'You may disable this provider (and warning) by adding `let g:loaded_node_provider = 0` to your init.vim',
+    })
+    return
+  end
+  info('Nvim node.js host: ' .. host)
+
+  local manager = 'npm'
+  if executable('yarn') then
+    manager = 'yarn'
+  elseif executable('pnpm') then
+    manager = 'pnpm'
+  end
+
+  local latest_npm_cmd = (
+    iswin and 'cmd /c ' .. manager .. ' info neovim --json' or manager .. ' info neovim --json'
+  )
+  local latest_npm = system(vim.fn.split(latest_npm_cmd))
+  if shell_error() or is_blank(latest_npm) then
+    error(
+      'Failed to run: ' .. latest_npm_cmd,
+      { "Make sure you're connected to the internet.", 'Are you behind a firewall or proxy?' }
+    )
+    return
+  end
+
+  local pcall_ok, output = pcall(vim.fn.json_decode, latest_npm)
+  local pkg_data
+  if pcall_ok then
+    pkg_data = output
+  else
+    return 'error: ' .. latest_npm
+  end
+  local latest_npm_subtable = pkg_data['dist-tags'] or {}
+  latest_npm = latest_npm_subtable['latest'] or 'unable to parse'
+
+  local current_npm_cmd = { 'node', host, '--version' }
+  local current_npm = system(current_npm_cmd)
+  if shell_error() then
+    error(
+      'Failed to run: ' .. table.concat(current_npm_cmd, ' '),
+      { 'Report this issue with the output of: ', table.concat(current_npm_cmd, ' ') }
+    )
+    return
+  end
+
+  if latest_npm ~= 'unable to parse' and vim.version.lt(current_npm, latest_npm) then
+    local message = 'Package "neovim" is out-of-date. Installed: '
+      .. current_npm
+      .. ' latest: '
+      .. latest_npm
+    warn(message({
+      'Run in shell: npm install -g neovim',
+      'Run in shell (if you use yarn): yarn global add neovim',
+      'Run in shell (if you use pnpm): pnpm install -g neovim',
+    }))
+  else
+    ok('Latest "neovim" npm/yarn/pnpm package is installed: ' .. current_npm)
+  end
+end
+
 function M.check()
   clipboard()
   python()
   virtualenv()
   ruby()
+  node()
 end
 
 return M
-- 
cgit 


From bd98ef6ac6e9f059b943ddfaa6676dc48d9ea832 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:59:50 +0200
Subject: refactor: rewrite perl healthcheck in lua

This is required to remove the vimscript checkhealth functions.
---
 runtime/autoload/health/provider2.vim | 164 ----------------------------------
 runtime/lua/provider/health.lua       |  90 +++++++++++++++++++
 2 files changed, 90 insertions(+), 164 deletions(-)
 delete mode 100644 runtime/autoload/health/provider2.vim

(limited to 'runtime')

diff --git a/runtime/autoload/health/provider2.vim b/runtime/autoload/health/provider2.vim
deleted file mode 100644
index ce3a360375..0000000000
--- a/runtime/autoload/health/provider2.vim
+++ /dev/null
@@ -1,164 +0,0 @@
-let s:shell_error = 0
-
-" Handler for s:system() function.
-function! s:system_handler(jobid, data, event) dict abort
-  if a:event ==# 'stderr'
-    if self.add_stderr_to_output
-      let self.output .= join(a:data, '')
-    else
-      let self.stderr .= join(a:data, '')
-    endif
-  elseif a:event ==# 'stdout'
-    let self.output .= join(a:data, '')
-  elseif a:event ==# 'exit'
-    let s:shell_error = a:data
-  endif
-endfunction
-
-" Attempts to construct a shell command from an args list.
-" Only for display, to help users debug a failed command.
-function! s:shellify(cmd) abort
-  if type(a:cmd) != type([])
-    return a:cmd
-  endif
-  return join(map(copy(a:cmd),
-    \'v:val =~# ''\m[^\-.a-zA-Z_/]'' ? shellescape(v:val) : v:val'), ' ')
-endfunction
-
-" Run a system command and timeout after 30 seconds.
-function! s:system(cmd, ...) abort
-  let stdin = a:0 ? a:1 : ''
-  let ignore_error = a:0 > 2 ? a:3 : 0
-  let opts = {
-        \ 'add_stderr_to_output': a:0 > 1 ? a:2 : 0,
-        \ 'output': '',
-        \ 'stderr': '',
-        \ 'on_stdout': function('s:system_handler'),
-        \ 'on_stderr': function('s:system_handler'),
-        \ 'on_exit': function('s:system_handler'),
-        \ }
-  let jobid = jobstart(a:cmd, opts)
-
-  if jobid < 1
-    call health#report_error(printf('Command error (job=%d): `%s` (in %s)',
-          \ jobid, s:shellify(a:cmd), string(getcwd())))
-    let s:shell_error = 1
-    return opts.output
-  endif
-
-  if !empty(stdin)
-    call jobsend(jobid, stdin)
-  endif
-
-  let res = jobwait([jobid], 30000)
-  if res[0] == -1
-    call health#report_error(printf('Command timed out: %s', s:shellify(a:cmd)))
-    call jobstop(jobid)
-  elseif s:shell_error != 0 && !ignore_error
-    let emsg = printf("Command error (job=%d, exit code %d): `%s` (in %s)",
-          \ jobid, s:shell_error, s:shellify(a:cmd), string(getcwd()))
-    if !empty(opts.output)
-      let emsg .= "\noutput: " . opts.output
-    end
-    if !empty(opts.stderr)
-      let emsg .= "\nstderr: " . opts.stderr
-    end
-    call health#report_error(emsg)
-  endif
-
-  return opts.output
-endfunction
-
-" Check "loaded" var for given a:provider.
-" Returns 1 if the caller should return (skip checks).
-function! s:disabled_via_loaded_var(provider) abort
-  let loaded_var = 'g:loaded_'.a:provider.'_provider'
-  if exists(loaded_var) && !exists('*provider#'.a:provider.'#Call')
-    let v = eval(loaded_var)
-    if 0 is v
-      call health#report_info('Disabled ('.loaded_var.'='.v.').')
-      return 1
-    else
-      call health#report_info('Disabled ('.loaded_var.'='.v.').  This might be due to some previous error.')
-    endif
-  endif
-  return 0
-endfunction
-
-function! s:check_perl() abort
-  call health#report_start('Perl provider (optional)')
-
-  if s:disabled_via_loaded_var('perl')
-    return
-  endif
-
-  let [perl_exec, perl_warnings] = provider#perl#Detect()
-  if empty(perl_exec)
-    if !empty(perl_warnings)
-      call health#report_warn(perl_warnings, ['See :help provider-perl for more information.',
-            \ 'You may disable this provider (and warning) by adding `let g:loaded_perl_provider = 0` to your init.vim'])
-    else
-      call health#report_warn('No usable perl executable found')
-    endif
-    return
-  endif
-
-  call health#report_info('perl executable: '. perl_exec)
-
-  " we cannot use cpanm that is on the path, as it may not be for the perl
-  " set with g:perl_host_prog
-  call s:system([perl_exec, '-W', '-MApp::cpanminus', '-e', ''])
-  if s:shell_error
-    return [perl_exec, '"App::cpanminus" module is not installed']
-  endif
-
-  let latest_cpan_cmd = [perl_exec,
-			  \ '-MApp::cpanminus::fatscript', '-e',
-			  \ 'my $app = App::cpanminus::script->new;
-			  \ $app->parse_options ("--info", "-q", "Neovim::Ext");
-			  \ exit $app->doit']
-
-  let latest_cpan = s:system(latest_cpan_cmd)
-  if s:shell_error || empty(latest_cpan)
-    call health#report_error('Failed to run: '. join(latest_cpan_cmd, " "),
-          \ ["Make sure you're connected to the internet.",
-          \  'Are you behind a firewall or proxy?'])
-    return
-  elseif latest_cpan[0] ==# '!'
-    let cpanm_errs = split(latest_cpan, '!')
-    if cpanm_errs[0] =~# "Can't write to "
-      call health#report_warn(cpanm_errs[0], cpanm_errs[1:-2])
-      " Last line is the package info
-      let latest_cpan = cpanm_errs[-1]
-    else
-      call health#report_error('Unknown warning from command: ' . latest_cpan_cmd, cpanm_errs)
-      return
-    endif
-  endif
-  let latest_cpan = matchstr(latest_cpan, '\(\.\?\d\)\+')
-  if empty(latest_cpan)
-    call health#report_error('Cannot parse version number from cpanm output: ' . latest_cpan)
-    return
-  endif
-
-  let current_cpan_cmd = [perl_exec, '-W', '-MNeovim::Ext', '-e', 'print $Neovim::Ext::VERSION']
-  let current_cpan = s:system(current_cpan_cmd)
-  if s:shell_error
-    call health#report_error('Failed to run: '. join(current_cpan_cmd),
-          \ ['Report this issue with the output of: ', join(current_cpan_cmd)])
-    return
-  endif
-
-  if v:lua.vim.version.lt(current_cpan, latest_cpan)
-    call health#report_warn(
-          \ printf('Module "Neovim::Ext" is out-of-date. Installed: %s, latest: %s',
-          \ current_cpan, latest_cpan),
-          \ ['Run in shell: cpanm -n Neovim::Ext'])
-  else
-    call health#report_ok('Latest "Neovim::Ext" cpan module is installed: '. current_cpan)
-  endif
-endfunction
-
-function! health#provider2#check() abort
-  call s:check_perl()
-endfunction
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index cab2eeaaff..3f9a84a57c 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -819,12 +819,102 @@ local function node()
   end
 end
 
+local function perl()
+  start('Perl provider (optional)')
+
+  if disabled_via_loaded_var('perl') then
+    return
+  end
+
+  local perl_detect_table = vim.fn['provider#perl#Detect']()
+  local perl_exec = perl_detect_table[1]
+  local perl_warnings = perl_detect_table[2]
+
+  if is_blank(perl_exec) then
+    if not is_blank(perl_warnings) then
+      warn(perl_warnings, {
+        'See :help provider-perl for more information.',
+        'You may disable this provider (and warning) by adding `let g:loaded_perl_provider = 0` to your init.vim',
+      })
+    else
+      warn('No usable perl executable found')
+    end
+    return
+  end
+
+  info('perl executable: ' .. perl_exec)
+
+  -- we cannot use cpanm that is on the path, as it may not be for the perl
+  -- set with g:perl_host_prog
+  system({ perl_exec, '-W', '-MApp::cpanminus', '-e', '' })
+  if shell_error() then
+    return { perl_exec, '"App::cpanminus" module is not installed' }
+  end
+
+  local latest_cpan_cmd = {
+    perl_exec,
+    '-MApp::cpanminus::fatscript',
+    '-e',
+    'my $app = App::cpanminus::script->new; $app->parse_options ("--info", "-q", "Neovim::Ext"); exit $app->doit',
+  }
+
+  local latest_cpan = system(latest_cpan_cmd)
+  if shell_error() or is_blank(latest_cpan) then
+    error(
+      'Failed to run: ' .. table.concat(latest_cpan_cmd, ' '),
+      { "Make sure you're connected to the internet.", 'Are you behind a firewall or proxy?' }
+    )
+    return
+  elseif latest_cpan[1] == '!' then
+    local cpanm_errs = vim.split(latest_cpan, '!')
+    if cpanm_errs[1]:find("Can't write to ") then
+      local advice = {}
+      for i = 2, #cpanm_errs do
+        advice[#advice + 1] = cpanm_errs[i]
+      end
+
+      warn(cpanm_errs[1], advice)
+      -- Last line is the package info
+      latest_cpan = cpanm_errs[#cpanm_errs]
+    else
+      error('Unknown warning from command: ' .. latest_cpan_cmd, cpanm_errs)
+      return
+    end
+  end
+  latest_cpan = vim.fn.matchstr(latest_cpan, [[\(\.\?\d\)\+]])
+  if is_blank(latest_cpan) then
+    error('Cannot parse version number from cpanm output: ' .. latest_cpan)
+    return
+  end
+
+  local current_cpan_cmd = { perl_exec, '-W', '-MNeovim::Ext', '-e', 'print $Neovim::Ext::VERSION' }
+  local current_cpan = system(current_cpan_cmd)
+  if shell_error then
+    error(
+      'Failed to run: ' .. table.concat(current_cpan_cmd, ' '),
+      { 'Report this issue with the output of: ', table.concat(current_cpan_cmd, ' ') }
+    )
+    return
+  end
+
+  if vim.version.lt(current_cpan, latest_cpan) then
+    local message = 'Module "Neovim::Ext" is out-of-date. Installed: '
+      .. current_cpan
+      .. ', latest: '
+      .. latest_cpan
+    warn(message, 'Run in shell: cpanm -n Neovim::Ext')
+  else
+    ok('Latest "Neovim::Ext" cpan module is installed: ' .. current_cpan)
+  end
+end
+
 function M.check()
   clipboard()
   python()
   virtualenv()
   ruby()
   node()
+  perl()
 end
 
 return M
-- 
cgit 


From cde4892b49556d21a16839d9553bcd829c525154 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Mon, 10 Apr 2023 14:37:25 -0600
Subject: fix(health): fix typo in function name

---
 runtime/lua/provider/health.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index 3f9a84a57c..1806fb92ac 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -596,7 +596,7 @@ local function virtualenv()
   local venv_bins = vim.fn.glob(os.getenv('VIRTUAL_ENV') .. bin_dir .. '/python*', true, true)
   -- XXX: Remove irrelevant executables found in bin/.
   venv_bins = vim.fn.filter(venv_bins, 'v:val !~# "python-config"')
-  if vim.tbl_coun(venv_bins) > 0 then
+  if vim.tbl_count(venv_bins) > 0 then
     for _, venv_bin in pairs(venv_bins) do
       venv_bin = vim.fs.normalize(venv_bin)
       local py_bin_basename = vim.fs.basename(venv_bin)
-- 
cgit 


From 03a021f378e8ca019e36dc6a3248a63edf19f8ad Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:46:22 -0600
Subject: fix(health): combine python and virtualenv healthchecks (#23004)

fix(health): combine python and virtualenv health checks
---
 runtime/lua/provider/health.lua | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index 1806fb92ac..2e57b6da18 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -372,6 +372,13 @@ local function version_info(python)
   return { python_version, nvim_version, pypi_version, version_status }
 end
 
+-- Resolves Python executable path by invoking and checking `sys.executable`.
+local function python_exepath(invocation)
+  return vim.fs.normalize(
+    system(vim.fn.fnameescape(invocation) .. ' -c "import sys; sys.stdout.write(sys.executable)"')
+  )
+end
+
 local function python()
   start('Python 3 provider (optional)')
 
@@ -569,20 +576,9 @@ local function python()
       ok('Latest pynvim is installed.')
     end
   end
-end
-
--- Resolves Python executable path by invoking and checking `sys.executable`.
-local function python_exepath(invocation)
-  return vim.fs.normalize(
-    system(vim.fn.fnameescape(invocation) .. ' -c "import sys; sys.stdout.write(sys.executable)"')
-  )
-end
 
--- Checks that $VIRTUAL_ENV Python executables are found at front of $PATH in
--- Nvim and subshells.
-local function virtualenv()
   start('Python virtualenv')
-  if not os.getenv('VIRTUAL_ENV') then
+  if not virtual_env then
     ok('no $VIRTUAL_ENV')
     return
   end
@@ -592,10 +588,11 @@ local function virtualenv()
   -- The virtualenv should contain some Python executables, and those
   -- executables should be first both on Nvim's $PATH and the $PATH of
   -- subshells launched from Nvim.
-  local bin_dir = (iswin and '/Scripts' or '/bin')
-  local venv_bins = vim.fn.glob(os.getenv('VIRTUAL_ENV') .. bin_dir .. '/python*', true, true)
-  -- XXX: Remove irrelevant executables found in bin/.
-  venv_bins = vim.fn.filter(venv_bins, 'v:val !~# "python-config"')
+  local bin_dir = iswin and 'Scripts' or 'bin'
+  local venv_bins = vim.tbl_filter(function(v)
+    -- XXX: Remove irrelevant executables found in bin/.
+    return not v:match('python%-config')
+  end, vim.fn.glob(string.format('%s/%s/python*', virtual_env, bin_dir), true, true))
   if vim.tbl_count(venv_bins) > 0 then
     for _, venv_bin in pairs(venv_bins) do
       venv_bin = vim.fs.normalize(venv_bin)
@@ -631,7 +628,7 @@ local function virtualenv()
       .. ' directory.'
   end
 
-  local msg = '$VIRTUAL_ENV is set to: ' .. os.getenv('VIRTUAL_ENV')
+  local msg = '$VIRTUAL_ENV is set to: ' .. virtual_env
   if vim.tbl_count(errors) > 0 then
     if vim.tbl_count(venv_bins) > 0 then
       msg = msg
@@ -911,7 +908,6 @@ end
 function M.check()
   clipboard()
   python()
-  virtualenv()
   ruby()
   node()
   perl()
-- 
cgit 


From c8d1d8b2546c5974f4ce75fc87f918bc8cfe8e56 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 11 Apr 2023 09:35:01 +0800
Subject: fix(man.lua): don't continue on command error (#23009)

Fix #21169
---
 runtime/lua/man.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index cca9434e9c..1158d80941 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -64,6 +64,7 @@ local function system(cmd_, silent, env)
       local cmd_str = table.concat(cmd, ' ')
       man_error(string.format('command error: %s', cmd_str))
     end
+    return ''
   end
 
   vim.wait(30000, function()
-- 
cgit 


From 7ffe450173d2521c2d53b147e930c50767a7795a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 11 Apr 2023 10:20:25 +0800
Subject: fix(health): check for _host_prog variables properly (#23014)

---
 runtime/lua/provider/health.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index 2e57b6da18..8ebc8ccb17 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -397,8 +397,8 @@ local function python()
   local pyenv = pyenv_table[1]
   local pyenv_root = pyenv_table[2]
 
-  if vim.g['host_prog_var'] then
-    local message = 'Using: g:' .. host_prog_var .. ' = "' .. vim.g['host_prog_var'] .. '"'
+  if vim.g[host_prog_var] then
+    local message = 'Using: g:' .. host_prog_var .. ' = "' .. vim.g[host_prog_var] .. '"'
     info(message)
   end
 
@@ -411,7 +411,7 @@ local function python()
       'No Python executable found that can `import neovim`. '
         .. 'Using the first available executable for diagnostics.'
     )
-  elseif vim.g['host_prog_var'] then
+  elseif vim.g[host_prog_var] then
     python_exe = pyname
   end
 
@@ -422,7 +422,7 @@ local function python()
       'You may disable this provider (and warning) by adding `let g:loaded_python3_provider = 0` to your init.vim',
     })
   elseif not is_blank(pyname) and is_blank(python_exe) then
-    if not vim.g['host_prog_var'] then
+    if not vim.g[host_prog_var] then
       local message = '`g:'
         .. host_prog_var
         .. '` is not set.  Searching for '
-- 
cgit 


From ccc0980f86c6ef9a86b0e5a3a691f37cea8eb776 Mon Sep 17 00:00:00 2001
From: Scott Ming <TheRealScottMing@gmail.com>
Date: Tue, 11 Apr 2023 16:26:03 +0800
Subject: fix(treesitter): Use the correct replacement args for #gsub!
 directive (#23015)

fix(treesitter): use the correct replacement args for #gsub! directive
---
 runtime/lua/vim/treesitter/query.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 5b87e6ac31..8a747ba14c 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -458,7 +458,7 @@ local directive_handlers = {
       metadata[id] = {}
     end
 
-    local pattern, replacement = pred[3], pred[3]
+    local pattern, replacement = pred[3], pred[4]
     assert(type(pattern) == 'string')
     assert(type(replacement) == 'string')
 
-- 
cgit 


From 9e86f473e0f4e21c5f40bf990c53194d593a0f9f Mon Sep 17 00:00:00 2001
From: NAKAI Tsuyoshi <82267684+uga-rosa@users.noreply.github.com>
Date: Tue, 11 Apr 2023 23:28:46 +0900
Subject: feat(lua): vim.region accepts getpos() arg (#22635)

---
 runtime/doc/lua.txt           |  7 ++++---
 runtime/doc/news.txt          |  2 +-
 runtime/lua/vim/_editor.lua   | 22 ++++++++++++++++++++--
 runtime/lua/vim/highlight.lua | 19 ++++---------------
 4 files changed, 29 insertions(+), 21 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 6084a625ba..2424c73f8f 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1516,9 +1516,10 @@ region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
 
     Parameters: ~
       • {bufnr}      (integer) number of buffer
-      • {pos1}       integer[] (line, column) tuple marking beginning of
-                     region
-      • {pos2}       integer[] (line, column) tuple marking end of region
+      • {pos1}       integer[]|string start of region as a (line, column)
+                     tuple or string accepted by |getpos()|
+      • {pos2}       integer[]|string end of region as a (line, column) tuple
+                     or string accepted by |getpos()|
       • {regtype}    (string) type of selection, see |setreg()|
       • {inclusive}  (boolean) indicating whether column of pos2 is inclusive
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 6e2a1b1d3f..a9a80ed002 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -30,7 +30,7 @@ CHANGED FEATURES                                                 *news-changed*
 
 The following changes to existing APIs or features add new behavior.
 
-• ...
+• |vim.region()| can use a string accepted by |getpos()| as position.
 
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index fa0980563a..c922ec93db 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -402,8 +402,8 @@ end
 --- Input and output positions are (0,0)-indexed and indicate byte positions.
 ---
 ---@param bufnr integer number of buffer
----@param pos1 integer[] (line, column) tuple marking beginning of region
----@param pos2 integer[] (line, column) tuple marking end of region
+---@param pos1 integer[]|string start of region as a (line, column) tuple or string accepted by |getpos()|
+---@param pos2 integer[]|string end of region as a (line, column) tuple or string accepted by |getpos()|
 ---@param regtype string type of selection, see |setreg()|
 ---@param inclusive boolean indicating whether column of pos2 is inclusive
 ---@return table region Table of the form `{linenr = {startcol,endcol}}`.
@@ -414,6 +414,24 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
     vim.fn.bufload(bufnr)
   end
 
+  if type(pos1) == 'string' then
+    local pos = vim.fn.getpos(pos1)
+    pos1 = { pos[2] - 1, pos[3] - 1 + pos[4] }
+  end
+  if type(pos2) == 'string' then
+    local pos = vim.fn.getpos(pos2)
+    pos2 = { pos[2] - 1, pos[3] - 1 + pos[4] }
+  end
+
+  if pos1[1] > pos2[1] or (pos1[1] == pos2[1] and pos1[2] > pos2[2]) then
+    pos1, pos2 = pos2, pos1
+  end
+
+  -- getpos() may return {0,0,0,0}
+  if pos1[1] < 0 or pos1[2] < 0 then
+    return {}
+  end
+
   -- check that region falls within current buffer
   local buf_line_count = vim.api.nvim_buf_line_count(bufnr)
   pos1[1] = math.min(pos1[1], buf_line_count - 1)
diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index d71a806ea8..a6cfcb730f 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -15,8 +15,8 @@ M.priorities = {
 ---@param bufnr integer Buffer number to apply highlighting to
 ---@param ns integer Namespace to add highlight to
 ---@param higroup string Highlight group to use for highlighting
----@param start { [1]: integer, [2]: integer } Start position {line, col}
----@param finish { [1]: integer, [2]: integer } Finish position {line, col}
+---@param start integer[]|string Start of region as a (line, column) tuple or string accepted by |getpos()|
+---@param finish integer[]|string End of region as a (line, column) tuple or string accepted by |getpos()|
 ---@param opts table|nil Optional parameters
 --             - regtype type of range (see |setreg()|, default charwise)
 --             - inclusive boolean indicating whether the range is end-inclusive (default false)
@@ -27,11 +27,6 @@ function M.range(bufnr, ns, higroup, start, finish, opts)
   local inclusive = opts.inclusive or false
   local priority = opts.priority or M.priorities.user
 
-  -- sanity check
-  if start[2] < 0 or finish[1] < start[1] then
-    return
-  end
-
   local region = vim.region(bufnr, start, finish, regtype, inclusive)
   for linenr, cols in pairs(region) do
     local end_row
@@ -104,18 +99,12 @@ function M.on_yank(opts)
     yank_timer:close()
   end
 
-  local pos1 = vim.fn.getpos("'[")
-  local pos2 = vim.fn.getpos("']")
-
-  pos1 = { pos1[2] - 1, pos1[3] - 1 + pos1[4] }
-  pos2 = { pos2[2] - 1, pos2[3] - 1 + pos2[4] }
-
   M.range(
     bufnr,
     yank_ns,
     higroup,
-    pos1,
-    pos2,
+    "'[",
+    "']",
     { regtype = event.regtype, inclusive = event.inclusive, priority = M.priorities.user }
   )
 
-- 
cgit 


From 880f7d12fea31ea85d14b419ef8dcbb16dee2cf4 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Tue, 11 Apr 2023 19:10:36 +0200
Subject: feat!: remove vimballs (#22402)

Vimball is an outdated feature that is rarely used these days. It is not
a maintenance burden on its own, but it is nonetheless dead weight and
something we'd need to tell users to ignore when they inevitably ask
what it is.

See: https://github.com/neovim/neovim/pull/21369#issuecomment-1347615173
---
 runtime/autoload/tar.vim                           |  76 --
 runtime/doc/news.txt                               |   3 +
 runtime/doc/pi_tar.txt                             |  17 -
 runtime/doc/usr_05.txt                             |  27 +-
 runtime/doc/vim_diff.txt                           |   4 +
 runtime/pack/dist/opt/vimball/autoload/vimball.vim | 775 ---------------------
 runtime/pack/dist/opt/vimball/doc/vimball.txt      | 273 --------
 .../pack/dist/opt/vimball/plugin/vimballPlugin.vim |  43 --
 runtime/plugin/tarPlugin.vim                       |   1 -
 9 files changed, 18 insertions(+), 1201 deletions(-)
 delete mode 100644 runtime/pack/dist/opt/vimball/autoload/vimball.vim
 delete mode 100644 runtime/pack/dist/opt/vimball/doc/vimball.txt
 delete mode 100644 runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim

(limited to 'runtime')

diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index e495e8262a..d7d1d8399e 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -735,82 +735,6 @@ fun! s:Rmdir(fname)
 "  call Dret("Rmdir")
 endfun
 
-" ---------------------------------------------------------------------
-" tar#Vimuntar: installs a tarball in the user's .vim / vimfiles directory {{{2
-fun! tar#Vimuntar(...)
-"  call Dfunc("tar#Vimuntar() a:0=".a:0." a:1<".(exists("a:1")? a:1 : "-n/a-").">")
-  let tarball = expand("%")
-"  call Decho("tarball<".tarball.">")
-  let tarbase = substitute(tarball,'\..*$','','')
-"  call Decho("tarbase<".tarbase.">")
-  let tarhome = expand("%:p")
-  if has("win32") || has("win95") || has("win64") || has("win16")
-   let tarhome= substitute(tarhome,'\\','/','g')
-  endif
-  let tarhome= substitute(tarhome,'/[^/]*$','','')
-"  call Decho("tarhome<".tarhome.">")
-  let tartail = expand("%:t")
-"  call Decho("tartail<".tartail.">")
-  let curdir  = getcwd()
-"  call Decho("curdir <".curdir.">")
-  " set up vimhome
-  if a:0 > 0 && a:1 != ""
-   let vimhome= a:1
-  else
-   let vimhome= vimball#VimballHome()
-  endif
-"  call Decho("vimhome<".vimhome.">")
-
-"  call Decho("curdir<".curdir."> vimhome<".vimhome.">")
-  if simplify(curdir) != simplify(vimhome)
-   " copy (possibly compressed) tarball to .vim/vimfiles
-"   call Decho(netrw#WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome))
-   call system(netrw#WinPath(g:tar_copycmd)." ".shellescape(tartail)." ".shellescape(vimhome))
-"   call Decho("exe cd ".fnameescape(vimhome))
-   exe "cd ".fnameescape(vimhome)
-  endif
-"  call Decho("getcwd<".getcwd().">")
-
-  " if necessary, decompress the tarball; then, extract it
-  if tartail =~ '\.tgz'
-   if executable("gunzip")
-    silent exe "!gunzip ".shellescape(tartail)
-   elseif executable("gzip")
-    silent exe "!gzip -d ".shellescape(tartail)
-   else
-    echoerr "unable to decompress<".tartail."> on this system"
-    if simplify(curdir) != simplify(tarhome)
-     " remove decompressed tarball, restore directory
-"     call Decho("delete(".tartail.".tar)")
-     call delete(tartail.".tar")
-"     call Decho("exe cd ".fnameescape(curdir))
-     exe "cd ".fnameescape(curdir)
-    endif
-"    call Dret("tar#Vimuntar")
-    return
-   endif
-  else
-   call vimball#Decompress(tartail,0)
-  endif
-  let extractcmd= netrw#WinPath(g:tar_extractcmd)
-"  call Decho("system(".extractcmd." ".shellescape(tarbase.".tar").")")
-  call system(extractcmd." ".shellescape(tarbase.".tar"))
-
-  " set up help
-  if filereadable("doc/".tarbase.".txt")
-"   call Decho("exe helptags ".getcwd()."/doc")
-   exe "helptags ".getcwd()."/doc"
-  endif
-
-  if simplify(tarhome) != simplify(vimhome)
-   " remove decompressed tarball, restore directory
-   call delete(vimhome."/".tarbase.".tar")
-   exe "cd ".fnameescape(curdir)
-  endif
-
-"  call Dret("tar#Vimuntar")
-endfun
-
 " =====================================================================
 " Modelines And Restoration: {{{1
 let &cpo= s:keepcpo
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index a9a80ed002..9309b45557 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -39,6 +39,9 @@ The following deprecated functions or APIs were removed.
 
 • ...
 
+• Vimball support is removed.
+  - :Vimuntar command removed.
+
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
 
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index 2230b82dec..e664b98086 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -33,23 +33,6 @@ Copyright 2005-2017:					*tar-copyright*
    also write to the file.  Currently, one may not make a new file in
    tar archives via the plugin.
 
-						*:Vimuntar*
-   VIMUNTAR~
-
-   :Vimuntar [vimhome]
-
-	This command copies, if necessary, the tarball to the .vim or vimfiles
-	directory using the first writable directory in the |'runtimepath'|
-	when no [vimhome] is specified.  Otherwise, the [vimhome] argument
-	allows the user to specify that directory, instead.
-
-	The copy is done using the command in *g:tar_copycmd* , which is >
-		cp   for cygwin, unix, macunix
-		copy for windows (32, 95, 64, 16)
-<	The extraction is done with the command specified with
-	*g:tar_extractcmd* , which by default is >
-		"tar -xf"
-<
 						*:TarDiff*
    DIFFERENCING SUPPORT~
 
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index 00b4f9eed4..8f7e393c02 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -190,26 +190,21 @@ The ":map" command (with no arguments) lists your current mappings.  At
 least the ones for Normal mode.  More about mappings in section |40.1|.
 
 ==============================================================================
-*05.4*	Adding a package			*add-package* *vimball-install*
+*05.4*	Adding a package					*add-package*
 
-A package is a set of files that you can add to Vim.  There are two kinds of
-packages: optional and automatically loaded on startup.
-
-The Vim distribution comes with a few packages that you can optionally use.
-For example, the vimball plugin.  This plugin supports creating and using
-vimballs (self-installing Vim plugin archives).
-
-To start using the vimball plugin, add one line to your vimrc file: >
-	packadd vimball
+You may use |:packadd| to enable packages on demand. This is useful for plugins
+you want to enable only sometimes. To enable `example_package`, use the
+following command: >
+       packadd example_package
 
-That's all!  You can also type the command to try it out.  Now you can find
-help about this plugin: >
-	:help vimball
+That's all!  Now you can find help about this plugin: >
+       :help example_package
 
 This works, because when `:packadd` loaded the plugin it also added the
-package directory in 'runtimepath', so that the help file can be found.  The
-tags for vimball's help are already created.  If you need to generate the help
-tags for a package, see the `:helptags` command.
+package directory in 'runtimepath', so that the help file can be found.
+
+A package is a set of files that you can add to Vim.  There are two kinds of
+packages: optional and automatically loaded on startup.
 
 You can find packages on the Internet in various places.  It usually comes as
 an archive or as a repository.  For an archive you can follow these steps:
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 7228473676..783aa2f113 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -573,6 +573,7 @@ Commands:
   :cscope
   :lcscope
   :scscope
+  :Vimuntar
 
 Compile-time features:
   Emacs tags support
@@ -764,5 +765,8 @@ Hardcopy:
   `:hardcopy` was removed. Instead, use `:TOhtml` and print the resulting HTML
   using a web browser or some other HTML viewer.
 
+Bundled plugins:
+  vimball                                                             *vimball*
+
 ==============================================================================
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/pack/dist/opt/vimball/autoload/vimball.vim b/runtime/pack/dist/opt/vimball/autoload/vimball.vim
deleted file mode 100644
index 9c7dcbda0f..0000000000
--- a/runtime/pack/dist/opt/vimball/autoload/vimball.vim
+++ /dev/null
@@ -1,775 +0,0 @@
-" vimball.vim : construct a file containing both paths and files
-" Author:	Charles E. Campbell
-" Date:		Apr 11, 2016
-" Version:	37
-" GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
-" Copyright: (c) 2004-2011 by Charles E. Campbell
-"            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
-"            (see |copyright|) except use "Vimball" instead of "Vim".
-"            No warranty, express or implied.
-"  *** ***   Use At-Your-Own-Risk!   *** ***
-
-" ---------------------------------------------------------------------
-"  Load Once: {{{1
-if &cp || exists("g:loaded_vimball")
- finish
-endif
-let g:loaded_vimball = "v37"
-if v:version < 702
- echohl WarningMsg
- echo "***warning*** this version of vimball needs vim 7.2"
- echohl Normal
- finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-"DechoTabOn
-
-" =====================================================================
-" Constants: {{{1
-if !exists("s:USAGE")
- let s:USAGE   = 0
- let s:WARNING = 1
- let s:ERROR   = 2
-
- " determine if cygwin is in use or not
- if !exists("g:netrw_cygwin")
-  if has("win32") || has("win95") || has("win64") || has("win16")
-   if &shell =~ '\%(\<bash\>\|\<zsh\>\)\%(\.exe\)\=$'
-    let g:netrw_cygwin= 1
-   else
-    let g:netrw_cygwin= 0
-   endif
-  else
-   let g:netrw_cygwin= 0
-  endif
- endif
-
- " set up g:vimball_mkdir if the mkdir() call isn't defined
- if !exists("*mkdir")
-  if exists("g:netrw_local_mkdir")
-   let g:vimball_mkdir= g:netrw_local_mkdir
-  elseif executable("mkdir")
-   let g:vimball_mkdir= "mkdir"
-  elseif executable("makedir")
-   let g:vimball_mkdir= "makedir"
-  endif
-  if !exists(g:vimball_mkdir)
-   call vimball#ShowMesg(s:WARNING,"(vimball) g:vimball_mkdir undefined")
-  endif
- endif
-endif
-
-" =====================================================================
-"  Functions: {{{1
-
-" ---------------------------------------------------------------------
-" vimball#MkVimball: creates a vimball given a list of paths to files {{{2
-" Input:
-"     line1,line2: a range of lines containing paths to files to be included in the vimball
-"     writelevel : if true, force a write to filename.vmb, even if it exists
-"                  (usually accomplished with :MkVimball! ...
-"     filename   : base name of file to be created (ie. filename.vmb)
-" Output: a filename.vmb using vimball format:
-"     path
-"     filesize
-"     [file]
-"     path
-"     filesize
-"     [file]
-fun! vimball#MkVimball(line1,line2,writelevel,...) range
-"  call Dfunc("MkVimball(line1=".a:line1." line2=".a:line2." writelevel=".a:writelevel." vimballname<".a:1.">) a:0=".a:0)
-  if a:1 =~ '\.vim$' || a:1 =~ '\.txt$'
-   let vbname= substitute(a:1,'\.\a\{3}$','.vmb','')
-  else
-   let vbname= a:1
-  endif
-  if vbname !~ '\.vmb$'
-   let vbname= vbname.'.vmb'
-  endif
-"  call Decho("vbname<".vbname.">")
-  if !a:writelevel && a:1 =~ '[\/]'
-   call vimball#ShowMesg(s:ERROR,"(MkVimball) vimball name<".a:1."> should not include slashes; use ! to insist")
-"   call Dret("MkVimball : vimball name<".a:1."> should not include slashes")
-   return
-  endif
-  if !a:writelevel && filereadable(vbname)
-   call vimball#ShowMesg(s:ERROR,"(MkVimball) file<".vbname."> exists; use ! to insist")
-"   call Dret("MkVimball : file<".vbname."> already exists; use ! to insist")
-   return
-  endif
-
-  " user option bypass
-  call vimball#SaveSettings()
-
-  if a:0 >= 2
-   " allow user to specify where to get the files
-   let home= expand(a:2)
-  else
-   " use first existing directory from rtp
-   let home= vimball#VimballHome()
-  endif
-
-  " save current directory
-  let curdir = getcwd()
-  call s:ChgDir(home)
-
-  " record current tab, initialize while loop index
-  let curtabnr = tabpagenr()
-  let linenr   = a:line1
-"  call Decho("curtabnr=".curtabnr)
-
-  while linenr <= a:line2
-   let svfile  = getline(linenr)
-"   call Decho("svfile<".svfile.">")
- 
-   if !filereadable(svfile)
-    call vimball#ShowMesg(s:ERROR,"unable to read file<".svfile.">")
-	call s:ChgDir(curdir)
-	call vimball#RestoreSettings()
-"    call Dret("MkVimball")
-    return
-   endif
- 
-   " create/switch to mkvimball tab
-   if !exists("vbtabnr")
-    tabnew
-    sil! file Vimball
-    let vbtabnr= tabpagenr()
-   else
-    exe "tabn ".vbtabnr
-   endif
- 
-   let lastline= line("$") + 1
-   if lastline == 2 && getline("$") == ""
-	call setline(1,'" Vimball Archiver by Charles E. Campbell')
-	call setline(2,'UseVimball')
-	call setline(3,'finish')
-	let lastline= line("$") + 1
-   endif
-   call setline(lastline  ,substitute(svfile,'$','	[[[1',''))
-   call setline(lastline+1,0)
-
-   " write the file from the tab
-"   call Decho("exe $r ".fnameescape(svfile))
-   exe "$r ".fnameescape(svfile)
-
-   call setline(lastline+1,line("$") - lastline - 1)
-"   call Decho("lastline=".lastline." line$=".line("$"))
-
-  " restore to normal tab
-   exe "tabn ".curtabnr
-   let linenr= linenr + 1
-  endwhile
-
-  " write the vimball
-  exe "tabn ".vbtabnr
-  call s:ChgDir(curdir)
-  setlocal ff=unix
-  if a:writelevel
-"   call Decho("exe w! ".fnameescape(vbname))
-   exe "w! ".fnameescape(vbname)
-  else
-"   call Decho("exe w ".fnameescape(vbname))
-   exe "w ".fnameescape(vbname)
-  endif
-"  call Decho("Vimball<".vbname."> created")
-  echo "Vimball<".vbname."> created"
-
-  " remove the evidence
-  setlocal nomod bh=wipe
-  exe "tabn ".curtabnr
-  exe "tabc! ".vbtabnr
-
-  " restore options
-  call vimball#RestoreSettings()
-
-"  call Dret("MkVimball")
-endfun
-
-" ---------------------------------------------------------------------
-" vimball#Vimball: extract and distribute contents from a vimball {{{2
-"                  (invoked the the UseVimball command embedded in 
-"                  vimballs' prologue)
-fun! vimball#Vimball(really,...)
-"  call Dfunc("vimball#Vimball(really=".a:really.") a:0=".a:0)
-
-  if v:version < 701 || (v:version == 701 && !exists('*fnameescape'))
-   echoerr "your vim is missing the fnameescape() function (pls upgrade to vim 7.2 or later)"
-"   call Dret("vimball#Vimball : needs 7.1 with patch 299 or later")
-   return
-  endif
-
-  if getline(1) !~ '^" Vimball Archiver'
-   echoerr "(Vimball) The current file does not appear to be a Vimball!"
-"   call Dret("vimball#Vimball")
-   return
-  endif
-
-  " set up standard settings
-  call vimball#SaveSettings()
-  let curtabnr    = tabpagenr()
-  let vimballfile = expand("%:tr")
-
-  " set up vimball tab
-"  call Decho("setting up vimball tab")
-  tabnew
-  sil! file Vimball
-  let vbtabnr= tabpagenr()
-  let didhelp= ""
-
-  " go to vim plugin home
-  if a:0 > 0
-   " let user specify the directory where the vimball is to be unpacked.
-   " If, however, the user did not specify a full path, set the home to be below the current directory
-   let home= expand(a:1)
-   if has("win32") || has("win95") || has("win64") || has("win16")
-	if home !~ '^\a:[/\\]'
-	 let home= getcwd().'/'.a:1
-	endif
-   elseif home !~ '^/'
-	let home= getcwd().'/'.a:1
-   endif
-  else
-   let home= vimball#VimballHome()
-  endif
-"  call Decho("home<".home.">")
-
-  " save current directory and remove older same-named vimball, if any
-  let curdir = getcwd()
-"  call Decho("home<".home.">")
-"  call Decho("curdir<".curdir.">")
-
-  call s:ChgDir(home)
-  let s:ok_unablefind= 1
-  call vimball#RmVimball(vimballfile)
-  unlet s:ok_unablefind
-
-  let linenr  = 4
-  let filecnt = 0
-
-  " give title to listing of (extracted) files from Vimball Archive
-  if a:really
-   echohl Title     | echomsg "Vimball Archive"         | echohl None
-  else             
-   echohl Title     | echomsg "Vimball Archive Listing" | echohl None
-   echohl Statement | echomsg "files would be placed under: ".home | echohl None
-  endif
-
-  " apportion vimball contents to various files
-"  call Decho("exe tabn ".curtabnr)
-  exe "tabn ".curtabnr
-"  call Decho("linenr=".linenr." line$=".line("$"))
-  while 1 < linenr && linenr < line("$")
-   let fname   = substitute(getline(linenr),'\t\[\[\[1$','','')
-   let fname   = substitute(fname,'\\','/','g')
-   let fsize   = substitute(getline(linenr+1),'^\(\d\+\).\{-}$','\1','')+0
-   let fenc    = substitute(getline(linenr+1),'^\d\+\s*\(\S\{-}\)$','\1','')
-   let filecnt = filecnt + 1
-"   call Decho("fname<".fname."> fsize=".fsize." filecnt=".filecnt. " fenc=".fenc)
-
-   if a:really
-    echomsg "extracted <".fname.">: ".fsize." lines"
-   else
-    echomsg "would extract <".fname.">: ".fsize." lines"
-   endif
-"   call Decho("using L#".linenr.": will extract file<".fname.">")
-"   call Decho("using L#".(linenr+1).": fsize=".fsize)
-
-   " Allow AsNeeded/ directory to take place of plugin/ directory
-   " when AsNeeded/filename is filereadable or was present in VimballRecord
-   if fname =~ '\<plugin/'
-   	let anfname= substitute(fname,'\<plugin/','AsNeeded/','')
-	if filereadable(anfname) || (exists("s:VBRstring") && s:VBRstring =~# anfname)
-"	 call Decho("using anfname<".anfname."> instead of <".fname.">")
-	 let fname= anfname
-	endif
-   endif
-
-   " make directories if they don't exist yet
-   if a:really
-"    call Decho("making directories if they don't exist yet (fname<".fname.">)")
-    let fnamebuf= substitute(fname,'\\','/','g')
-	let dirpath = substitute(home,'\\','/','g')
-"	call Decho("init: fnamebuf<".fnamebuf.">")
-"	call Decho("init: dirpath <".dirpath.">")
-    while fnamebuf =~ '/'
-     let dirname  = dirpath."/".substitute(fnamebuf,'/.*$','','')
-	 let dirpath  = dirname
-     let fnamebuf = substitute(fnamebuf,'^.\{-}/\(.*\)$','\1','')
-"	 call Decho("dirname<".dirname.">")
-"	 call Decho("dirpath<".dirpath.">")
-     if !isdirectory(dirname)
-"      call Decho("making <".dirname.">")
-      if exists("g:vimball_mkdir")
-	   call system(g:vimball_mkdir." ".shellescape(dirname))
-      else
-       call mkdir(dirname)
-      endif
-	  call s:RecordInVar(home,"rmdir('".dirname."')")
-     endif
-    endwhile
-   endif
-   call s:ChgDir(home)
-
-   " grab specified qty of lines and place into "a" buffer
-   " (skip over path/filename and qty-lines)
-   let linenr   = linenr + 2
-   let lastline = linenr + fsize - 1
-"   call Decho("exe ".linenr.",".lastline."yank a")
-   " no point in handling a zero-length file
-   if lastline >= linenr
-    exe "silent ".linenr.",".lastline."yank a"
-
-    " copy "a" buffer into tab
-"   call Decho('copy "a buffer into tab#'.vbtabnr)
-    exe "tabn ".vbtabnr
-    setlocal ma
-    sil! %d
-    silent put a
-    1
-    sil! d
-
-    " write tab to file
-    if a:really
-     let fnamepath= home."/".fname
-"    call Decho("exe w! ".fnameescape(fnamepath))
-	if fenc != ""
-	 exe "silent w! ++enc=".fnameescape(fenc)." ".fnameescape(fnamepath)
-	else
-	 exe "silent w! ".fnameescape(fnamepath)
-	endif
-	echo "wrote ".fnameescape(fnamepath)
-	call s:RecordInVar(home,"call delete('".fnamepath."')")
-    endif
-
-    " return to tab with vimball
-"   call Decho("exe tabn ".curtabnr)
-    exe "tabn ".curtabnr
-
-    " set up help if it's a doc/*.txt file
-"   call Decho("didhelp<".didhelp."> fname<".fname.">")
-    if a:really && didhelp == "" && fname =~ 'doc/[^/]\+\.\(txt\|..x\)$'
-    	let didhelp= substitute(fname,'^\(.*\<doc\)[/\\][^.]*\.\(txt\|..x\)$','\1','')
-"	call Decho("didhelp<".didhelp.">")
-    endif
-   endif
-
-   " update for next file
-"   call Decho("update linenr= [linenr=".linenr."] + [fsize=".fsize."] = ".(linenr+fsize))
-   let linenr= linenr + fsize
-  endwhile
-
-  " set up help
-"  call Decho("about to set up help: didhelp<".didhelp.">")
-  if didhelp != ""
-   let htpath= home."/".didhelp
-"   call Decho("exe helptags ".htpath)
-   exe "helptags ".fnameescape(htpath)
-   echo "did helptags"
-  endif
-
-  " make sure a "Press ENTER..." prompt appears to keep the messages showing!
-  while filecnt <= &ch
-   echomsg " "
-   let filecnt= filecnt + 1
-  endwhile
-
-  " record actions in <.VimballRecord>
-  call s:RecordInFile(home)
-
-  " restore events, delete tab and buffer
-  exe "sil! tabn ".vbtabnr
-  setlocal nomod bh=wipe
-  exe "sil! tabn ".curtabnr
-  exe "sil! tabc! ".vbtabnr
-  call vimball#RestoreSettings()
-  call s:ChgDir(curdir)
-
-"  call Dret("vimball#Vimball")
-endfun
-
-" ---------------------------------------------------------------------
-" vimball#RmVimball: remove any files, remove any directories made by any {{{2
-"               previous vimball extraction based on a file of the current
-"               name.
-"  Usage:  RmVimball  (assume current file is a vimball; remove)
-"          RmVimball vimballname
-fun! vimball#RmVimball(...)
-"  call Dfunc("vimball#RmVimball() a:0=".a:0)
-  if exists("g:vimball_norecord")
-"   call Dret("vimball#RmVimball : (g:vimball_norecord)")
-   return
-  endif
-
-  if a:0 == 0
-   let curfile= expand("%:tr")
-"   call Decho("case a:0=0: curfile<".curfile."> (used expand(%:tr))")
-  else
-   if a:1 =~ '[\/]'
-    call vimball#ShowMesg(s:USAGE,"RmVimball vimballname [path]")
-"    call Dret("vimball#RmVimball : suspect a:1<".a:1.">")
-    return
-   endif
-   let curfile= a:1
-"   call Decho("case a:0=".a:0.": curfile<".curfile.">")
-  endif
-  if curfile =~ '\.vmb$'
-   let curfile= substitute(curfile,'\.vmb','','')
-  elseif curfile =~ '\.vba$'
-   let curfile= substitute(curfile,'\.vba','','')
-  endif
-  if a:0 >= 2
-   let home= expand(a:2)
-  else
-   let home= vimball#VimballHome()
-  endif
-  let curdir = getcwd()
-"  call Decho("home   <".home.">")
-"  call Decho("curfile<".curfile.">")
-"  call Decho("curdir <".curdir.">")
-
-  call s:ChgDir(home)
-  if filereadable(".VimballRecord")
-"   call Decho(".VimballRecord is readable")
-"   call Decho("curfile<".curfile.">")
-   keepalt keepjumps 1split 
-   sil! keepalt keepjumps e .VimballRecord
-   let keepsrch= @/
-"   call Decho('search for ^\M'.curfile.'.\m: ')
-"   call Decho('search for ^\M'.curfile.'.\m{vba|vmb}: ')
-"   call Decho('search for ^\M'.curfile.'\m[-0-9.]*\.{vba|vmb}: ')
-   if search('^\M'.curfile."\m: ".'cw')
-	let foundit= 1
-   elseif search('^\M'.curfile.".\mvmb: ",'cw')
-	let foundit= 2
-   elseif search('^\M'.curfile.'\m[-0-9.]*\.vmb: ','cw')
-	let foundit= 2
-   elseif search('^\M'.curfile.".\mvba: ",'cw')
-	let foundit= 1
-   elseif search('^\M'.curfile.'\m[-0-9.]*\.vba: ','cw')
-	let foundit= 1
-   else
-    let foundit = 0
-   endif
-   if foundit
-	if foundit == 1
-	 let exestring  = substitute(getline("."),'^\M'.curfile.'\m\S\{-}\.vba: ','','')
-	else
-	 let exestring  = substitute(getline("."),'^\M'.curfile.'\m\S\{-}\.vmb: ','','')
-	endif
-    let s:VBRstring= substitute(exestring,'call delete(','','g')
-    let s:VBRstring= substitute(s:VBRstring,"[')]",'','g')
-"	call Decho("exe ".exestring)
-	sil! keepalt keepjumps exe exestring
-	sil! keepalt keepjumps d
-	let exestring= strlen(substitute(exestring,'call delete(.\{-})|\=',"D","g"))
-"	call Decho("exestring<".exestring.">")
-	echomsg "removed ".exestring." files"
-   else
-    let s:VBRstring= ''
-	let curfile    = substitute(curfile,'\.vmb','','')
-"    call Decho("unable to find <".curfile."> in .VimballRecord")
-	if !exists("s:ok_unablefind")
-     call vimball#ShowMesg(s:WARNING,"(RmVimball) unable to find <".curfile."> in .VimballRecord")
-	endif
-   endif
-   sil! keepalt keepjumps g/^\s*$/d
-   sil! keepalt keepjumps wq!
-   let @/= keepsrch
-  endif
-  call s:ChgDir(curdir)
-
-"  call Dret("vimball#RmVimball")
-endfun
-
-" ---------------------------------------------------------------------
-" vimball#Decompress: attempts to automatically decompress vimballs {{{2
-fun! vimball#Decompress(fname,...)
-"  call Dfunc("Decompress(fname<".a:fname.">) a:0=".a:0)
-
-  " decompression:
-  if     expand("%") =~ '.*\.gz'  && executable("gunzip")
-   " handle *.gz with gunzip
-   silent exe "!gunzip ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) gunzip may have failed with <".a:fname.">")
-   endif
-   let fname= substitute(a:fname,'\.gz$','','')
-   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-
-  elseif expand("%") =~ '.*\.gz' && executable("gzip")
-   " handle *.gz with gzip -d
-   silent exe "!gzip -d ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "gzip -d" may have failed with <'.a:fname.">")
-   endif
-   let fname= substitute(a:fname,'\.gz$','','')
-   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-
-  elseif expand("%") =~ '.*\.bz2' && executable("bunzip2")
-   " handle *.bz2 with bunzip2
-   silent exe "!bunzip2 ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) bunzip2 may have failed with <".a:fname.">")
-   endif
-   let fname= substitute(a:fname,'\.bz2$','','')
-   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-
-  elseif expand("%") =~ '.*\.bz2' && executable("bzip2")
-   " handle *.bz2 with bzip2 -d
-   silent exe "!bzip2 -d ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,'(vimball#Decompress) "bzip2 -d" may have failed with <'.a:fname.">")
-   endif
-   let fname= substitute(a:fname,'\.bz2$','','')
-   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-
-  elseif expand("%") =~ '.*\.zip' && executable("unzip")
-   " handle *.zip with unzip
-   silent exe "!unzip ".shellescape(a:fname)
-   if v:shell_error != 0
-	call vimball#ShowMesg(s:WARNING,"(vimball#Decompress) unzip may have failed with <".a:fname.">")
-   endif
-   let fname= substitute(a:fname,'\.zip$','','')
-   exe "e ".escape(fname,' \')
-   if a:0 == 0| call vimball#ShowMesg(s:USAGE,"Source this file to extract it! (:so %)") | endif
-  endif
-
-  if a:0 == 0| setlocal noma bt=nofile fmr=[[[,]]] fdm=marker | endif
-
-"  call Dret("Decompress")
-endfun
-
-" ---------------------------------------------------------------------
-" vimball#ShowMesg: {{{2
-fun! vimball#ShowMesg(level,msg)
-"  call Dfunc("vimball#ShowMesg(level=".a:level." msg<".a:msg.">)")
-
-  let rulerkeep   = &ruler
-  let showcmdkeep = &showcmd
-  set noruler noshowcmd
-  redraw!
-
-  if &fo =~# '[ta]'
-   echomsg "***vimball*** ".a:msg
-  else
-   if a:level == s:WARNING || a:level == s:USAGE
-    echohl WarningMsg
-   elseif a:level == s:ERROR
-    echohl Error
-   endif
-   echomsg "***vimball*** ".a:msg
-   echohl None
-  endif
-
-  if a:level != s:USAGE
-   call inputsave()|let ok= input("Press <cr> to continue")|call inputrestore()
-  endif
-
-  let &ruler   = rulerkeep
-  let &showcmd = showcmdkeep
-
-"  call Dret("vimball#ShowMesg")
-endfun
-" =====================================================================
-" s:ChgDir: change directory (in spite of Windoze) {{{2
-fun! s:ChgDir(newdir)
-"  call Dfunc("ChgDir(newdir<".a:newdir.">)")
-  if (has("win32") || has("win95") || has("win64") || has("win16"))
-   try
-    exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
-   catch  /^Vim\%((\a\+)\)\=:E/
-    call mkdir(fnameescape(substitute(a:newdir,'/','\\','g')))
-    exe 'silent cd '.fnameescape(substitute(a:newdir,'/','\\','g'))
-   endtry
-  else
-   try
-    exe 'silent cd '.fnameescape(a:newdir)
-   catch  /^Vim\%((\a\+)\)\=:E/
-    call mkdir(fnameescape(a:newdir))
-    exe 'silent cd '.fnameescape(a:newdir)
-   endtry
-  endif
-"  call Dret("ChgDir : curdir<".getcwd().">")
-endfun
-
-" ---------------------------------------------------------------------
-" s:RecordInVar: record a un-vimball command in the .VimballRecord file {{{2
-fun! s:RecordInVar(home,cmd)
-"  call Dfunc("RecordInVar(home<".a:home."> cmd<".a:cmd.">)")
-  if a:cmd =~ '^rmdir'
-"   if !exists("s:recorddir")
-"    let s:recorddir= substitute(a:cmd,'^rmdir',"call s:Rmdir",'')
-"   else
-"    let s:recorddir= s:recorddir."|".substitute(a:cmd,'^rmdir',"call s:Rmdir",'')
-"   endif
-  elseif !exists("s:recordfile")
-   let s:recordfile= a:cmd
-  else
-   let s:recordfile= s:recordfile."|".a:cmd
-  endif
-"  call Dret("RecordInVar : s:recordfile<".(exists("s:recordfile")? s:recordfile : "")."> s:recorddir<".(exists("s:recorddir")? s:recorddir : "").">")
-endfun
-
-" ---------------------------------------------------------------------
-" s:RecordInFile: {{{2
-fun! s:RecordInFile(home)
-"  call Dfunc("s:RecordInFile()")
-  if exists("g:vimball_norecord")
-"   call Dret("s:RecordInFile : g:vimball_norecord")
-   return
-  endif
-
-  if exists("s:recordfile") || exists("s:recorddir")
-   let curdir= getcwd()
-   call s:ChgDir(a:home)
-   keepalt keepjumps 1split 
-
-   let cmd= expand("%:tr").": "
-"   call Decho("cmd<".cmd.">")
-
-   sil! keepalt keepjumps e .VimballRecord
-   setlocal ma
-   $
-   if exists("s:recordfile") && exists("s:recorddir")
-   	let cmd= cmd.s:recordfile."|".s:recorddir
-   elseif exists("s:recorddir")
-   	let cmd= cmd.s:recorddir
-   elseif exists("s:recordfile")
-   	let cmd= cmd.s:recordfile
-   else
-"    call Dret("s:RecordInFile : neither recordfile nor recorddir exist")
-	return
-   endif
-"   call Decho("cmd<".cmd.">")
-
-   " put command into buffer, write .VimballRecord `file
-   keepalt keepjumps put=cmd
-   sil! keepalt keepjumps g/^\s*$/d
-   sil! keepalt keepjumps wq!
-   call s:ChgDir(curdir)
-
-   if exists("s:recorddir")
-"	call Decho("unlet s:recorddir<".s:recorddir.">")
-   	unlet s:recorddir
-   endif
-   if exists("s:recordfile")
-"	call Decho("unlet s:recordfile<".s:recordfile.">")
-   	unlet s:recordfile
-   endif
-  else
-"   call Decho("s:record[file|dir] doesn't exist")
-  endif
-
-"  call Dret("s:RecordInFile")
-endfun
-
-" ---------------------------------------------------------------------
-" vimball#VimballHome: determine/get home directory path (usually from rtp) {{{2
-fun! vimball#VimballHome()
-"  call Dfunc("vimball#VimballHome()")
-  if exists("g:vimball_home")
-   let home= g:vimball_home
-  else
-   " go to vim plugin home
-   for home in split(&rtp,',') + ['']
-    if isdirectory(home) && filewritable(home) | break | endif
-	let basehome= substitute(home,'[/\\]\.vim$','','')
-    if isdirectory(basehome) && filewritable(basehome)
-	 let home= basehome."/.vim"
-	 break
-	endif
-   endfor
-   if home == ""
-    " just pick the first directory
-    let home= substitute(&rtp,',.*$','','')
-   endif
-   if (has("win32") || has("win95") || has("win64") || has("win16"))
-    let home= substitute(home,'/','\\','g')
-   endif
-  endif
-  " insure that the home directory exists
-"  call Decho("picked home<".home.">")
-  if !isdirectory(home)
-   if exists("g:vimball_mkdir")
-"	call Decho("home<".home."> isn't a directory -- making it now with g:vimball_mkdir<".g:vimball_mkdir.">")
-"    call Decho("system(".g:vimball_mkdir." ".shellescape(home).")")
-    call system(g:vimball_mkdir." ".shellescape(home))
-   else
-"	call Decho("home<".home."> isn't a directory -- making it now with mkdir()")
-    call mkdir(home)
-   endif
-  endif
-"  call Dret("vimball#VimballHome <".home.">")
-  return home
-endfun
-
-" ---------------------------------------------------------------------
-" vimball#SaveSettings: {{{2
-fun! vimball#SaveSettings()
-"  call Dfunc("SaveSettings()")
-  let s:makeep  = getpos("'a")
-  let s:regakeep= @a
-  if exists("+acd")
-   let s:acdkeep = &acd
-  endif
-  let s:eikeep  = &ei
-  let s:fenkeep = &l:fen
-  let s:hidkeep = &hidden
-  let s:ickeep  = &ic
-  let s:lzkeep  = &lz
-  let s:pmkeep  = &pm
-  let s:repkeep = &report
-  let s:vekeep  = &ve
-  let s:ffkeep  = &l:ff
-  let s:swfkeep = &l:swf
-  if exists("+acd")
-   setlocal ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz pm= ff=unix noswf
-  else
-   setlocal ei=all ve=all       nofen noic report=999 nohid bt= ma lz pm= ff=unix noswf
-  endif
-  " vimballs should be in unix format
-  setlocal ff=unix
-"  call Dret("SaveSettings")
-endfun
-
-" ---------------------------------------------------------------------
-" vimball#RestoreSettings: {{{2
-fun! vimball#RestoreSettings()
-"  call Dfunc("RestoreSettings()")
-  let @a      = s:regakeep
-  if exists("+acd")
-   let &acd   = s:acdkeep
-  endif
-  let &l:fen  = s:fenkeep
-  let &hidden = s:hidkeep
-  let &ic     = s:ickeep
-  let &lz     = s:lzkeep
-  let &pm     = s:pmkeep
-  let &report = s:repkeep
-  let &ve     = s:vekeep
-  let &ei     = s:eikeep
-  let &l:ff   = s:ffkeep
-  if s:makeep[0] != 0
-   " restore mark a
-"   call Decho("restore mark-a: makeep=".string(makeep))
-   call setpos("'a",s:makeep)
-  endif
-  if exists("+acd")
-   unlet s:acdkeep
-  endif
-  unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep s:ffkeep
-"  call Dret("RestoreSettings")
-endfun
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" ---------------------------------------------------------------------
-" Modelines: {{{1
-" vim: fdm=marker
diff --git a/runtime/pack/dist/opt/vimball/doc/vimball.txt b/runtime/pack/dist/opt/vimball/doc/vimball.txt
deleted file mode 100644
index 602fe85954..0000000000
--- a/runtime/pack/dist/opt/vimball/doc/vimball.txt
+++ /dev/null
@@ -1,273 +0,0 @@
-*vimball.txt*	For Vim version 7.4.  Last change: 2012 Jan 17
-
-			       ----------------
-			       Vimball Archiver
-			       ----------------
-
-Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
-	  (remove NOSPAM from Campbell's email first)
-Copyright: (c) 2004-2012 by Charles E. Campbell, Jr.	*Vimball-copyright*
-	The VIM LICENSE (see |copyright|) applies to the files in this
-	package, including vimballPlugin.vim, vimball.vim, and pi_vimball.txt.
-	except use "vimball" instead of "VIM".  Like anything else that's free,
-	vimball.vim and its associated files are provided *as is* and comes with
-	no warranty of any kind, either expressed or implied.  No guarantees
-	of merchantability.  No guarantees of suitability for any purpose.  By
-	using this plugin, you agree that in no event will the copyright
-	holder be liable for any damages resulting from the use of this
-	software. Use at your own risk!
-
-==============================================================================
-1. Contents				*vba* *vimball* *vimball-contents*
-
-	1. Contents......................................: |vimball-contents|
-	2. Vimball Introduction..........................: |vimball-intro|
-	3. Vimball Manual................................: |vimball-manual|
-	   MkVimball.....................................: |:MkVimball|
-	   UseVimball....................................: |:UseVimball|
-	   RmVimball.....................................: |:RmVimball|
-	4. Vimball History...............................: |vimball-history|
-
-
-==============================================================================
-2. Vimball Introduction						*vimball-intro*
-
-	Vimball is intended to make life simpler for users of plugins.  All
-	a user needs to do with a vimball is: >
-		vim someplugin.vba
-		:so %
-		:q
-<	and the plugin and all its components will be installed into their
-	appropriate directories.  Note that one doesn't need to be in any
-	particular directory when one does this.  Plus, any help for the
-	plugin will also be automatically installed.
-
-	If a user has decided to use the AsNeeded plugin, vimball is smart
-	enough to put scripts nominally intended for .vim/plugin/ into
-	.vim/AsNeeded/ instead.
-
-	Removing a plugin that was installed with vimball is really easy: >
-		vim
-		:RmVimball someplugin
-<	This operation is not at all easy for zips and tarballs, for example.
-
-	Vimball examines the user's |'runtimepath'| to determine where to put
-	the scripts.  The first directory mentioned on the runtimepath is
-	usually used if possible.  Use >
-		:echo &rtp
-<	to see that directory.
-
-
-==============================================================================
-3. Vimball Manual					*vimball-manual*
-
-MAKING A VIMBALL						*:MkVimball*
-		:[range]MkVimball[!] filename [path]
-
-	The range is composed of lines holding paths to files to be included
-	in your new vimball, omitting the portion of the paths that is
-	normally specified by the runtimepath (|'rtp'|).  As an example: >
-		plugin/something.vim
-		doc/something.txt
-<	using >
-		:[range]MkVimball filename
-<
-	on this range of lines will create a file called "filename.vba" which
-	can be used by Vimball.vim to re-create these files.  If the
-	"filename.vba" file already exists, then MkVimball will issue a
-	warning and not create the file.  Note that these paths are relative
-	to your .vim (vimfiles) directory, and the files should be in that
-	directory.  The vimball plugin normally uses the first |'runtimepath'|
-	directory that exists as a prefix; don't use absolute paths, unless
-	the user has specified such a path.
-
-	If you use the exclamation point (!), then MkVimball will create the
-	"filename.vba" file, overwriting it if it already exists.  This
-	behavior resembles that for |:w|.
-
-	If you wish to force slashes into the filename, that can also be done
-	by using the exclamation mark (ie. :MkVimball! path/filename).
-
-	The tip at https://vim.wikia.com/wiki/Using_VimBall_with_%27Make%27
-	has a good idea on how to automate the production of vimballs using
-	make.
-
-
-MAKING DIRECTORIES VIA VIMBALLS				*g:vimball_mkdir*
-
-	First, the |mkdir()| command is tried (not all systems support it).
-
-	If it doesn't exist, then if g:vimball_mkdir doesn't exist, it is set
-	as follows: >
-	  |g:netrw_local_mkdir|, if it exists
-	  "mkdir"              , if it is executable
-	  "makedir"            , if it is executable
-	  Otherwise            , it is undefined.
-<	One may explicitly specify the directory making command using
-	g:vimball_mkdir.  This command is used to make directories that
-	are needed as indicated by the vimball.
-
-
-CONTROLLING THE VIMBALL EXTRACTION DIRECTORY		*g:vimball_home*
-
-	You may override the use of the |'runtimepath'| by specifying a
-	variable, g:vimball_home.
-
-							*vimball-extract*
-		vim filename.vba
-
-	Simply editing a Vimball will cause Vimball.vim to tell the user to
-	source the file to extract its contents.
-
-	Extraction will only proceed if the first line of a putative vimball
-	file holds the "Vimball Archiver by Charles E. Campbell, Jr., Ph.D."
-	line.
-
-LISTING FILES IN A VIMBALL					*:VimballList*
-
-		:VimballList
-
-	This command will tell Vimball to list the files in the archive, along
-	with their lengths in lines.
-
-MANUALLY INVOKING VIMBALL EXTRACTION				*:UseVimball*
-
-		:UseVimball [path]
-
-	This command is contained within the vimball itself; it invokes the
-	vimball#Vimball() routine which is responsible for unpacking the
-	vimball.  One may choose to execute it by hand instead of sourcing
-	the vimball; one may also choose to specify a path for the
-	installation, thereby overriding the automatic choice of the first
-	existing directory on the |'runtimepath'|.
-
-REMOVING A VIMBALL						*:RmVimball*
-
-		:RmVimball vimballfile [path]
-
-	This command removes all files generated by the specified vimball
-	(but not any directories it may have made).  One may choose a path
-	for de-installation, too (see |'runtimepath'|); otherwise, the
-	default is the first existing directory on the |'runtimepath'|.
-	To implement this, a file (.VimballRecord) is made in that directory
-	containing a record of what files need to be removed for all vimballs
-	used thus far.
-
-PREVENTING LOADING
-
-	If for some reason you don't want to be able to extract plugins
-	using vimballs: you may prevent the loading of vimball.vim by
-	putting the following two variables in your <.vimrc>: >
-
-		let g:loaded_vimballPlugin= 1
-		let g:loaded_vimball      = 1
-<
-WINDOWS							*vimball-windows*
-
-	Many vimball files are compressed with gzip.  Windows, unfortunately,
-	does not come provided with a tool to decompress gzip'ped files.
-	Fortunately, there are a number of tools available for Windows users
-	to un-gzip files:
->
-	    Item     Tool/Suite   Free   Website
-	    ----     ----------   ----   -------
-	    7zip        tool       y     https://www.7-zip.org/
-	    Winzip      tool       n     https://www.winzip.com/downwz.htm
-	    unxutils    suite      y     https://unxutils.sourceforge.net/
-	    cygwin      suite      y     https://www.cygwin.com/
-	    GnuWin32    suite      y     https://gnuwin32.sourceforge.net/
-	    MinGW       suite      y     https://www.mingw.org/
-<
-
-==============================================================================
-4. Vimball History					*vimball-history* {{{1
-
-	34 : Sep 22, 2011 * "UseVimball path" now supports a non-full path by
-			    prepending the current directory to it.
-	33 : Apr 02, 2011 * Gave priority to *.vmb over *.vba
-			  * Changed silent! to sil! (shorter)
-			  * Safed |'swf'| setting (during vimball extraction,
-			    its now turned off)
-	32 : May 19, 2010 * (Christian Brabandt) :so someplugin.vba and
-			    :so someplugin.vba.gz (and the other supported
-			    compression types) now works
-			  * (Jan Steffens) added support for xz compression
-			  * fenc extraction was erroneously picking up the
-			    end of the line number when no file encoding
-			    was present.  Fixed.
-			  * By request, beginning the switchover from the vba
-			    extension to vmb.  Currently both are supported;
-			    MkVimball, however, now will create *.vmb files.
-	     Feb 11, 2011 * motoyakurotsu reported an error with vimball's
-			    handling of zero-length files
-	30 : Dec 08, 2008 * fnameescape() inserted to protect error
-			    messaging using corrupted filenames from
-			    causing problems
-			  * RmVimball supports filenames that would
-			    otherwise be considered to have "magic"
-			    characters (ie. Abc[1].vba)
-	     Feb 18, 2009 * s:Escape(), g:vimball_shq, and g:netrw_shq
-			    removed (shellescape() used directly)
-	     Oct 05, 2009 * (Nikolai Weibull) suggested that MkVimball
-			    be allowed to use slashes in the filename.
-	26 : May 27, 2008 * g:vimball_mkdir usage installed.  Makes the
-	                    $HOME/.vim (or $HOME\vimfiles) directory if
-			    necessary.
-	     May 30, 2008 * (tnx to Bill McCarthy) found and fixed a bug:
-			    vimball wasn't updating plugins to AsNeeded/
-			    when it should
-	25 : Mar 24, 2008 * changed vimball#Vimball() to recognize doc/*.??x
-			    files as help files, too.
-	     Apr 18, 2008 * RmVimball command is now protected by saving and
-	                    restoring settings -- in particular, acd was
-			    causing problems as reported by Zhang Shuhan
-	24 : Nov 15, 2007 * g:vimball_path_escape used by s:Path() to
-	                    prevent certain characters from causing trouble
-			    (defunct: |fnameescape()| and |shellescape()|
-			    now used instead)
-	22 : Mar 21, 2007 * uses setlocal instead of set during BufEnter
-	21 : Nov 27, 2006 * (tnx to Bill McCarthy) vimball had a header
-	                    handling problem and it now changes \s to /s
-	20 : Nov 20, 2006 * substitute() calls have all had the 'e' flag
-	                    removed.
-	18 : Aug 01, 2006 * vimballs now use folding to easily display their
-	                    contents.
-			  * if a user has AsNeeded/somefile, then vimball
-			    will extract plugin/somefile to the AsNeeded/
-			    directory
-	17 : Jun 28, 2006 * changes all \s to /s internally for Windows
-	16 : Jun 15, 2006 * A. Mechelynck's idea to allow users to specify
-			    installation root paths implemented for
-			    UseVimball, MkVimball, and RmVimball.
-			  * RmVimball implemented
-	15 : Jun 13, 2006 * bugfix
-	14 : May 26, 2006 * bugfixes
-	13 : May 01, 2006 * exists("&acd") used to determine if the acd
-			    option exists
-	12 : May 01, 2006 * bugfix - the |'acd'| option is not always defined
-	11 : Apr 27, 2006 * VimballList would create missing subdirectories that
-			    the vimball specified were needed.  Fixed.
-	10 : Apr 27, 2006 * moved all setting saving/restoration to a pair of
-			    functions.  Included some more settings in them
-			    which frequently cause trouble.
-	9  : Apr 26, 2006 * various changes to support Windows' predilection
-			    for backslashes and spaces in file and directory
-			    names.
-	7  : Apr 25, 2006 * bypasses foldenable
-			  * uses more exe and less norm! (:yank :put etc)
-			  * does better at insuring a "Press ENTER" prompt
-			    appears to keep its messages visible
-	4  : Mar 31, 2006 * BufReadPost seems to fire twice; BufReadEnter
-			    only fires once, so the "Source this file..."
-			    message is now issued only once.
-	3  : Mar 20, 2006 * removed query, now requires sourcing to be
-			    extracted (:so %).  Message to that effect
-			    included.
-			  * :VimballList  now shows files that would be
-			    extracted.
-	2  : Mar 20, 2006 * query, :UseVimball included
-	1  : Mar 20, 2006 * initial release
-
-
-==============================================================================
-vim:tw=78:ts=8:ft=help:fdm=marker
diff --git a/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim b/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
deleted file mode 100644
index d7473a0296..0000000000
--- a/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-" vimballPlugin : construct a file containing both paths and files
-" Author: Charles E. Campbell
-" Copyright: (c) 2004-2014 by Charles E. Campbell
-"            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
-"            (see |copyright|) except use "Vimball" instead of "Vim".
-"            No warranty, express or implied.
-"  *** ***   Use At-Your-Own-Risk!   *** ***
-"
-" (Rom 2:1 WEB) Therefore you are without excuse, O man, whoever you are who
-"      judge. For in that which you judge another, you condemn yourself. For
-"      you who judge practice the same things.
-" GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
-
-" ---------------------------------------------------------------------
-"  Load Once: {{{1
-if &cp || exists("g:loaded_vimballPlugin")
- finish
-endif
-let g:loaded_vimballPlugin = "v37"
-let s:keepcpo              = &cpo
-set cpo&vim
-
-" ------------------------------------------------------------------------------
-" Public Interface: {{{1
-com! -range   -complete=file -nargs=+ -bang MkVimball		call vimball#MkVimball(<line1>,<line2>,<bang>0,<f-args>)
-com! -nargs=? -complete=dir  UseVimball						call vimball#Vimball(1,<f-args>)
-com! -nargs=0                VimballList					call vimball#Vimball(0)
-com! -nargs=* -complete=dir  RmVimball						call vimball#SaveSettings()|call vimball#RmVimball(<f-args>)|call vimball#RestoreSettings()
-augroup Vimball
- au!
- au BufEnter  *.vba,*.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|if line('$') > 1|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")|endif
- au SourceCmd *.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz			let s:origfile=expand("%")|if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|endif|call vimball#Decompress(expand("<amatch>"))|so %|if s:origfile!=expand("<afile>")|close|endif
- au SourceCmd *.vba											if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif
- au BufEnter  *.vmb,*.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|if line('$') > 1|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")|endif
- au SourceCmd *.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz			let s:origfile=expand("%")|if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|endif|call vimball#Decompress(expand("<amatch>"))|so %|if s:origfile!=expand("<afile>")|close|endif
- au SourceCmd *.vmb											if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif
-augroup END
-
-" =====================================================================
-" Restoration And Modelines: {{{1
-" vim: fdm=marker
-let &cpo= s:keepcpo
-unlet s:keepcpo
diff --git a/runtime/plugin/tarPlugin.vim b/runtime/plugin/tarPlugin.vim
index d55492a93e..384a3ed823 100644
--- a/runtime/plugin/tarPlugin.vim
+++ b/runtime/plugin/tarPlugin.vim
@@ -47,7 +47,6 @@ augroup tar
   au BufReadCmd   *.tar.zst		call tar#Browse(expand("<amatch>"))
   au BufReadCmd   *.tzs			call tar#Browse(expand("<amatch>"))
 augroup END
-com! -nargs=? -complete=file Vimuntar call tar#Vimuntar(<q-args>)
 
 " ---------------------------------------------------------------------
 " Restoration And Modelines: {{{1
-- 
cgit 


From 2b35de386ee8854e1012feb4a6cc53b099220677 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Wed, 12 Apr 2023 00:01:34 +0200
Subject: refactor: remove :CheckHealth

Using :CheckHealth invokes an error, and many of the features from :checkhealth
doesn't even work such as calling only a specific check. Users should use
:checkhealth instead.
---
 runtime/doc/pi_health.txt | 2 +-
 runtime/plugin/health.vim | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 runtime/plugin/health.vim

(limited to 'runtime')

diff --git a/runtime/doc/pi_health.txt b/runtime/doc/pi_health.txt
index 2ae93b098a..a0e06a7d37 100644
--- a/runtime/doc/pi_health.txt
+++ b/runtime/doc/pi_health.txt
@@ -21,7 +21,7 @@ Plugin authors are encouraged to write new healthchecks. |health-dev|
 ==============================================================================
 Commands                                *health-commands*
 
-                                        *:che* *:checkhealth* *:CheckHealth*
+                                                             *:che* *:checkhealth*
 :che[ckhealth]  Run all healthchecks.
                                         *E5009*
                 Nvim depends on |$VIMRUNTIME|, 'runtimepath' and 'packpath' to
diff --git a/runtime/plugin/health.vim b/runtime/plugin/health.vim
deleted file mode 100644
index 66ae8fb239..0000000000
--- a/runtime/plugin/health.vim
+++ /dev/null
@@ -1 +0,0 @@
-autocmd CmdUndefined CheckHealth checkhealth
-- 
cgit 


From f5231d61a5413e3ea45a060dd31e4537634f3d87 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 12 Apr 2023 13:59:11 +0200
Subject: fix(runtime): add commentstring for C# ftplugin (#23039)

Problem: No commentstring is set for C# buffers after removing the
default C-style commentstring

Solution: Add `ftplugin/cs.lua` with C-style commentstring
---
 runtime/ftplugin/cs.lua | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 runtime/ftplugin/cs.lua

(limited to 'runtime')

diff --git a/runtime/ftplugin/cs.lua b/runtime/ftplugin/cs.lua
new file mode 100644
index 0000000000..b4e68148f5
--- /dev/null
+++ b/runtime/ftplugin/cs.lua
@@ -0,0 +1 @@
+vim.bo.commentstring = '/*%s*/'
-- 
cgit 


From 37011bc45ef333776bccea84a1a7ced6c68e3b51 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Wed, 12 Apr 2023 15:16:15 +0200
Subject: fix(diagnostic): rename buffer → bufnr in type annotation (#23042)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See `:h diagnostic-structure`, the property name is `bufnr`, not
`buffer`.
---
 runtime/lua/vim/diagnostic.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 714038f8e4..d1b50304c7 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -744,7 +744,7 @@ function M.get_namespaces()
 end
 
 ---@class Diagnostic
----@field buffer integer
+---@field bufnr integer
 ---@field lnum integer 0-indexed
 ---@field end_lnum nil|integer 0-indexed
 ---@field col integer 0-indexed
-- 
cgit 


From 1013aba462d0721bafc934eddd1dba672d084958 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 12 Apr 2023 22:52:06 +0800
Subject: docs: add vim.lsp.buf.formatting_sync() to deprecated.txt (#23045)

---
 runtime/doc/deprecated.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 3735073867..171d285950 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -120,6 +120,8 @@ LSP FUNCTIONS
 					{buffer = bufnr} instead.
 - *vim.lsp.buf.formatting()*		Use |vim.lsp.buf.format()| with
 					{async = true} instead.
+- *vim.lsp.buf.formatting_sync()*	Use |vim.lsp.buf.format()| with
+					{async = false} instead.
 - *vim.lsp.buf.range_formatting()*	Use |vim.lsp.formatexpr()|
 					or |vim.lsp.buf.format()| instead.
 
-- 
cgit 


From 5ccec143d808239bff1b6ea9da79d61cedbb094a Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Wed, 12 Apr 2023 23:38:56 +0200
Subject: refactor: remove bugreport.vim

We already have :checkhealth that essentially supersedes it with more
useful error checking.
---
 runtime/bugreport.vim | 87 ---------------------------------------------------
 1 file changed, 87 deletions(-)
 delete mode 100644 runtime/bugreport.vim

(limited to 'runtime')

diff --git a/runtime/bugreport.vim b/runtime/bugreport.vim
deleted file mode 100644
index 27761ca011..0000000000
--- a/runtime/bugreport.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-:" Use this script to create the file "bugreport.txt", which contains
-:" information about the environment of a possible bug in Vim.
-:"
-:" Maintainer:	Bram Moolenaar <Bram@vim.org>
-:" Last change:	2019 Jan 27
-:"
-:" To use inside Vim:
-:"	:so $VIMRUNTIME/bugreport.vim
-:" Or, from the command line:
-:"	vim -s $VIMRUNTIME/bugreport.vim
-:"
-:" The "if 1" lines are to avoid error messages when expression evaluation is
-:" not compiled in.
-:"
-:if 1
-:  let more_save = &more
-:endif
-:set nomore
-:if has("unix")
-:  !echo "uname -a" >bugreport.txt
-:  !uname -a >>bugreport.txt
-:endif
-:redir >>bugreport.txt
-:version
-:if 1
-:  func <SID>CheckDir(n)
-:    if isdirectory(a:n)
-:      echo 'directory "' . a:n . '" exists'
-:    else
-:      echo 'directory "' . a:n . '" does NOT exist'
-:    endif
-:  endfun
-:  func <SID>CheckFile(n)
-:    if filereadable(a:n)
-:      echo '"' . a:n . '" is readable'
-:    else
-:      echo '"' . a:n . '" is NOT readable'
-:    endif
-:  endfun
-:  echo "--- Directories and Files ---"
-:  echo '$VIM = "' . $VIM . '"'
-:  call <SID>CheckDir($VIM)
-:  echo '$VIMRUNTIME = "' . $VIMRUNTIME . '"'
-:  call <SID>CheckDir($VIMRUNTIME)
-:  call <SID>CheckFile(&helpfile)
-:  call <SID>CheckFile(fnamemodify(&helpfile, ":h") . "/tags")
-:  call <SID>CheckFile($VIMRUNTIME . "/menu.vim")
-:  call <SID>CheckFile($VIMRUNTIME . "/filetype.vim")
-:  call <SID>CheckFile($VIMRUNTIME . "/syntax/synload.vim")
-:  delfun <SID>CheckDir
-:  delfun <SID>CheckFile
-:  echo "--- Scripts sourced ---"
-:  scriptnames
-:endif
-:set all
-:if has("autocmd")
-:  au
-:endif
-:if 1
-:  echo "--- Normal/Visual mode mappings ---"
-:endif
-:map
-:if 1
-:  echo "--- Insert/Command-line mode mappings ---"
-:endif
-:map!
-:if 1
-:  echo "--- Abbreviations ---"
-:endif
-:ab
-:if 1
-:  echo "--- Highlighting ---"
-:endif
-:highlight
-:if 1
-:  echo "--- Variables ---"
-:endif
-:if 1
-:  let
-:endif
-:redir END
-:set more&
-:if 1
-:  let &more = more_save
-:  unlet more_save
-:endif
-:e bugreport.txt
-- 
cgit 


From e4a136f713753e6ace97f419be562567f1ce535f Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Wed, 12 Apr 2023 22:22:37 +0200
Subject: feat(ex_cmds)!: remove :behave

just use the individual options instead.

   set selection=exclusive
   set selectmode=mouse,key
   set mousemodel=popup
   set keymodel=startsel,stopsel
---
 runtime/doc/builtin.txt  |  1 -
 runtime/doc/index.txt    |  1 -
 runtime/doc/news.txt     |  7 +++++++
 runtime/doc/options.txt  | 21 ---------------------
 runtime/doc/usr_09.txt   | 38 +++++---------------------------------
 runtime/doc/vim_diff.txt |  1 +
 runtime/mswin.vim        |  5 ++++-
 7 files changed, 17 insertions(+), 57 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 0e04e9035b..3c940ccfa2 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -3003,7 +3003,6 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		arglist		file names in argument list
 		augroup		autocmd groups
 		buffer		buffer names
-		behave		|:behave| suboptions
 		breakpoint	|:breakadd| and |:breakdel| suboptions
 		cmdline		|cmdline-completion| result
 		color		color schemes
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 174683a8c3..fbd3fccec0 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1159,7 +1159,6 @@ tag		command		action ~
 |:badd|		:bad[d]		add buffer to the buffer list
 |:balt|		:balt		like ":badd" but also set the alternate file
 |:bdelete|	:bd[elete]	remove a buffer from the buffer list
-|:behave|	:be[have]	set mouse and selection behavior
 |:belowright|	:bel[owright]	make split window appear right or below
 |:bfirst|	:bf[irst]	go to first buffer in the buffer list
 |:blast|	:bl[ast]	go to last buffer in the buffer list
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 9309b45557..ba428679f0 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -18,6 +18,13 @@ The following changes may require adaptations in user config or plugins.
 • "#" followed by a digit no longer stands for a function key at the start of
   the lhs of a mapping.
 
+• `:behave` was removed. if you used `:behave mswin`, the following is equivalent: >vim
+
+    set selection=exclusive
+    set selectmode=mouse,key
+    set mousemodel=popup
+    set keymodel=startsel,stopsel
+
 ==============================================================================
 ADDED FEATURES                                                     *news-added*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d22a78700f..b4cad51990 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3589,7 +3589,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   stopsel	Using a not-shifted special key stops selection.
 	Special keys in this context are the cursor keys, <End>, <Home>,
 	<PageUp> and <PageDown>.
-	The 'keymodel' option is set by the |:behave| command.
 
 					*'keywordprg'* *'kp'*
 'keywordprg' 'kp'	string	(default ":Man", Windows: ":help")
@@ -4168,21 +4167,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'mousehide'	hide mouse pointer while typing text
 	'selectmode'	whether to start Select mode or Visual mode
 
-	The :behave command provides some "profiles" for mouse behavior.
-								*:behave* *:be*
-	:be[have] {model}	Set behavior for mouse and selection.  Valid
-				arguments are:
-				   mswin	MS-Windows behavior
-				   xterm	Xterm behavior
-
-				Using ":behave" changes these options:
-				option		mswin			xterm	~
-				'selectmode'	"mouse,key"		""
-				'mousemodel'	"popup"			"extend"
-				'keymodel'	"startsel,stopsel"	""
-				'selection'	"exclusive"		"inclusive"
-
-
 			*'mousefocus'* *'mousef'* *'nomousefocus'* *'nomousef'*
 'mousefocus' 'mousef'	boolean	(default off)
 			global
@@ -4250,8 +4234,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    "g<LeftMouse>"  is "<C-LeftMouse>	(jump to tag under mouse click)
 	    "g<RightMouse>" is "<C-RightMouse>	("CTRL-T")
 
-	The 'mousemodel' option is set by the |:behave| command.
-
 	      *'mousemoveevent'* *'mousemev'* *'nomousemoveevent'* *'nomousemev'*
 'mousemoveevent' 'mousemev'  boolean	(default off)
 			global
@@ -5013,8 +4995,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	backwards, you cannot include the last character of a line, when
 	starting in Normal mode and 'virtualedit' empty.
 
-	The 'selection' option is set by the |:behave| command.
-
 						*'selectmode'* *'slm'*
 'selectmode' 'slm'	string	(default "")
 			global
@@ -5025,7 +5005,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   key		when using shifted special keys
 	   cmd		when using "v", "V" or CTRL-V
 	See |Select-mode|.
-	The 'selectmode' option is set by the |:behave| command.
 
 						*'sessionoptions'* *'ssop'*
 'sessionoptions' 'ssop'	string	(default: "blank,buffers,curdir,folds,
diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
index 8084d13b5d..ea16010dc2 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -124,41 +124,13 @@ This adds the 'l' flag to 'guioptions'.
 Standards are wonderful.  In Microsoft Windows, you can use the mouse to
 select text in a standard manner.  The X Window system also has a standard
 system for using the mouse.  Unfortunately, these two standards are not the
-same.
-   Fortunately, you can customize Vim.  You can make the behavior of the mouse
-work like an X Window system mouse or a Microsoft Windows mouse.  The following
-command makes the mouse behave like an X Window mouse: >
+same. Fortunately, you can customize Vim.
 
-	:behave xterm
-
-The following command makes the mouse work like a Microsoft Windows mouse: >
-
-	:behave mswin
-
-The default behavior of the mouse on Unix systems is xterm.  The default
-behavior on Windows systems is selected during the installation process.  For
-details about what the two behaviors are, see |:behave|.  Here follows a
-summary.
-
-
-XTERM MOUSE BEHAVIOR
-
-Left mouse click		position the cursor
-Left mouse drag			select text in Visual mode
-Middle mouse click		paste text from the clipboard
-Right mouse click		extend the selected text until the mouse
-				pointer
-
-
-MSWIN MOUSE BEHAVIOR
-
-Left mouse click		position the cursor
-Left mouse drag			select text in Select mode (see |09.4|)
-Left mouse click, with Shift	extend the selected text until the mouse
-				pointer
-Middle mouse click		paste text from the clipboard
-Right mouse click		display a pop-up menu
+The following commands makes the mouse work more like a Microsoft Windows mouse: >
 
+	set selection=exclusive
+	set selectmode=mouse,key
+	set keymodel=startsel,stopsel
 
 The mouse can be further tuned.  Check out these options if you want to change
 the way how the mouse works:
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 783aa2f113..58f6d6f6f9 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -556,6 +556,7 @@ Aliases:
   vimdiff   (alias for "nvim -d" |diff-mode|)
 
 Commands:
+  :behave
   :fixdel
   :hardcopy
   :helpfind
diff --git a/runtime/mswin.vim b/runtime/mswin.vim
index 2b04c1aea3..482b720c53 100644
--- a/runtime/mswin.vim
+++ b/runtime/mswin.vim
@@ -15,7 +15,10 @@ endif
 set cpo&vim
 
 " set 'selection', 'selectmode', 'mousemodel' and 'keymodel' for MS-Windows
-behave mswin
+set selection=exclusive
+set selectmode=mouse,key
+set mousemodel=popup
+set keymodel=startsel,stopsel
 
 " backspace and cursor keys wrap to previous/next line
 set backspace=indent,eol,start whichwrap+=<,>,[,]
-- 
cgit 


From 66c66d8db8ab5cb6d0c6d85d64556d7cf20b04fa Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 13 Apr 2023 17:34:47 +0100
Subject: fix(loader): reset hashes when running the loader

---
 runtime/lua/vim/loader.lua | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 38b1e9fc0f..7f953adc21 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -5,7 +5,7 @@ local loaders = package.loaders
 
 local M = {}
 
----@alias CacheHash {mtime: {sec:number, nsec:number}, size:number, type: string}
+---@alias CacheHash {mtime: {nsec: integer, sec: integer}, size: integer, type?: uv.aliases.fs_stat_types}
 ---@alias CacheEntry {hash:CacheHash, chunk:string}
 
 ---@class ModuleFindOpts
@@ -28,12 +28,11 @@ M.enabled = false
 ---@field _rtp string[]
 ---@field _rtp_pure string[]
 ---@field _rtp_key string
+---@field _hashes? table<string, CacheHash>
 local Loader = {
   VERSION = 3,
   ---@type table<string, table<string,ModuleInfo>>
   _indexed = {},
-  ---@type table<string, CacheHash>
-  _hashes = {},
   ---@type table<string, string[]>
   _topmods = {},
   _loadfile = loadfile,
@@ -44,9 +43,13 @@ local Loader = {
 }
 
 --- @param path string
---- @return uv.fs_stat.result
+--- @return CacheHash
 --- @private
 function Loader.get_hash(path)
+  if not Loader._hashes then
+    return uv.fs_stat(path) --[[@as CacheHash]]
+  end
+
   if not Loader._hashes[path] then
     -- Note we must never save a stat for a non-existent path.
     -- For non-existent paths fs_stat() will return nil.
@@ -163,13 +166,16 @@ end
 ---@return string|function
 ---@private
 function Loader.loader(modname)
+  Loader._hashes = {}
   local ret = M.find(modname)[1]
   if ret then
     -- Make sure to call the global loadfile so we respect any augmentations done elsewhere.
     -- E.g. profiling
     local chunk, err = loadfile(ret.modpath)
+    Loader._hashes = nil
     return chunk or error(err)
   end
+  Loader._hashes = nil
   return '\ncache_loader: module ' .. modname .. ' not found'
 end
 
@@ -373,7 +379,9 @@ function M.reset(path)
   end
 
   -- Path could be a directory so just clear all the hashes.
-  Loader._hashes = {}
+  if Loader._hashes then
+    Loader._hashes = {}
+  end
 end
 
 --- Enables the experimental Lua module loader:
-- 
cgit 


From bfb28b62dab756ec76a73506c2070ddf491a0cdd Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 13 Apr 2023 15:29:13 -0600
Subject: refactor: remove modelines from Lua files

Now that we have builtin EditorConfig support and a formatting check in
CI, these are not necessary.
---
 runtime/lua/vim/lsp.lua          | 1 -
 runtime/lua/vim/lsp/buf.lua      | 1 -
 runtime/lua/vim/lsp/handlers.lua | 1 -
 runtime/lua/vim/lsp/log.lua      | 1 -
 runtime/lua/vim/lsp/protocol.lua | 1 -
 runtime/lua/vim/lsp/rpc.lua      | 1 -
 runtime/lua/vim/lsp/util.lua     | 1 -
 runtime/lua/vim/shared.lua       | 1 -
 runtime/lua/vim/uri.lua          | 1 -
 9 files changed, 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 2d39f2d45d..3db3545786 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -2384,4 +2384,3 @@ lsp.commands = setmetatable({}, {
 })
 
 return lsp
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 8bf3764f5e..3d9011656f 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -806,4 +806,3 @@ function M.execute_command(command_params)
 end
 
 return M
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index d01f8e6159..71bef43bc1 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -644,4 +644,3 @@ for k, fn in pairs(M) do
 end
 
 return M
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/lsp/log.lua b/runtime/lua/vim/lsp/log.lua
index 51dcb7d21d..3d5bc06c3f 100644
--- a/runtime/lua/vim/lsp/log.lua
+++ b/runtime/lua/vim/lsp/log.lua
@@ -174,4 +174,3 @@ function log.should_log(level)
 end
 
 return log
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index f4489ad17d..2cb8fc7955 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -894,4 +894,3 @@ function protocol.resolve_capabilities(server_capabilities)
 end
 
 return protocol
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index 30b61d01d6..af3190c9bd 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -753,4 +753,3 @@ return {
   client_errors = client_errors,
   create_read_loop = create_read_loop,
 }
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index ebde7af16c..dca258e4b9 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -2154,4 +2154,3 @@ M._get_line_byte_from_position = get_line_byte_from_position
 M.buf_versions = {}
 
 return M
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index eb734fb512..9245adae3a 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -811,4 +811,3 @@ function vim.defaulttable(create)
 end
 
 return vim
--- vim:sw=2 ts=2 et
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua
index 38759fcdc0..08ed829114 100644
--- a/runtime/lua/vim/uri.lua
+++ b/runtime/lua/vim/uri.lua
@@ -134,4 +134,3 @@ return {
   uri_to_fname = uri_to_fname,
   uri_to_bufnr = uri_to_bufnr,
 }
--- vim:sw=2 ts=2 et
-- 
cgit 


From 4d04feb6629cb049cb2a13ba35f0c8d3c6b67ff4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 14 Apr 2023 10:39:57 +0200
Subject: feat(lua): vim.tbl_contains supports general tables and predicates
 (#23040)

* feat(lua): vim.tbl_contains supports general tables and predicates

Problem: `vim.tbl_contains` only works for list-like tables (integer
keys without gaps) and primitive values (in particular, not for nested
tables).

Solution: Rename `vim.tbl_contains` to `vim.list_contains` and add new
`vim.tbl_contains` that works for general tables and optionally allows
`value` to be a predicate function that is checked for every key.
---
 runtime/doc/lua.txt              | 34 +++++++++++++++++++++++++++---
 runtime/doc/news.txt             |  6 ++++--
 runtime/lua/editorconfig.lua     |  2 +-
 runtime/lua/nvim/health.lua      |  2 +-
 runtime/lua/provider/health.lua  |  2 +-
 runtime/lua/vim/loader.lua       |  4 ++--
 runtime/lua/vim/lsp.lua          |  4 ++--
 runtime/lua/vim/lsp/_snippet.lua |  4 ++--
 runtime/lua/vim/lsp/codelens.lua |  2 +-
 runtime/lua/vim/lsp/util.lua     |  2 +-
 runtime/lua/vim/shared.lua       | 45 ++++++++++++++++++++++++++++++++++++++--
 11 files changed, 89 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 2424c73f8f..f39adf4f8d 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1698,6 +1698,19 @@ is_callable({f})                                           *vim.is_callable()*
     Return: ~
         (boolean) `true` if `f` is callable, else `false`
 
+list_contains({t}, {value})                              *vim.list_contains()*
+    Checks if a list-like table (integer keys without gaps) contains `value`.
+
+    Parameters: ~
+      • {t}      (table) Table to check (must be list-like, not validated)
+      • {value}  any Value to compare
+
+    Return: ~
+        (boolean) `true` if `t` contains `value`
+
+    See also: ~
+      • |vim.tbl_contains()| for checking values in general tables
+
 list_extend({dst}, {src}, {start}, {finish})               *vim.list_extend()*
     Extends a list-like table with the values of another list-like table.
 
@@ -1797,16 +1810,31 @@ tbl_add_reverse_lookup({o})                     *vim.tbl_add_reverse_lookup()*
     Return: ~
         (table) o
 
-tbl_contains({t}, {value})                                *vim.tbl_contains()*
-    Checks if a list-like (vector) table contains `value`.
+tbl_contains({t}, {value}, {opts})                        *vim.tbl_contains()*
+    Checks if a table contains a given value, specified either directly or via
+    a predicate that is checked for each value.
+
+    Example: >lua
+
+      vim.tbl_contains({ 'a', { 'b', 'c' } }, function(v)
+        return vim.deep_equal(v, { 'b', 'c' })
+      end, { predicate = true })
+      -- true
+<
 
     Parameters: ~
       • {t}      (table) Table to check
-      • {value}  any Value to compare
+      • {value}  any Value to compare or predicate function reference
+      • {opts}   (table|nil) Keyword arguments |kwargs|:
+                 • predicate: (boolean) `value` is a function reference to be
+                   checked (default false)
 
     Return: ~
         (boolean) `true` if `t` contains `value`
 
+    See also: ~
+      • |vim.list_contains()| for checking values in list-like tables
+
 tbl_count({t})                                               *vim.tbl_count()*
     Counts the number of non-nil values in table `t`.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ba428679f0..aff1a4a24e 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -37,6 +37,10 @@ CHANGED FEATURES                                                 *news-changed*
 
 The following changes to existing APIs or features add new behavior.
 
+• |vim.tbl_contains()| now works for general tables and allows specifying a
+  predicate function that is checked for each value. (Use |vim.list_contains()|
+  for checking list-like tables (integer keys without gaps) for literal values.)
+
 • |vim.region()| can use a string accepted by |getpos()| as position.
 
 ==============================================================================
@@ -44,8 +48,6 @@ REMOVED FEATURES                                                 *news-removed*
 
 The following deprecated functions or APIs were removed.
 
-• ...
-
 • Vimball support is removed.
   - :Vimuntar command removed.
 
diff --git a/runtime/lua/editorconfig.lua b/runtime/lua/editorconfig.lua
index 5b09126788..5188c13284 100644
--- a/runtime/lua/editorconfig.lua
+++ b/runtime/lua/editorconfig.lua
@@ -26,7 +26,7 @@ end
 
 function M.properties.charset(bufnr, val)
   assert(
-    vim.tbl_contains({ 'utf-8', 'utf-8-bom', 'latin1', 'utf-16be', 'utf-16le' }, val),
+    vim.list_contains({ 'utf-8', 'utf-8-bom', 'latin1', 'utf-16be', 'utf-16le' }, val),
     'charset must be one of "utf-8", "utf-8-bom", "latin1", "utf-16be", or "utf-16le"'
   )
   if val == 'utf-8' or val == 'utf-8-bom' then
diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
index b6d84404ec..6f544e9407 100644
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -325,7 +325,7 @@ local function check_tmux()
   -- check for RGB capabilities
   local info = vim.fn.system({ 'tmux', 'display-message', '-p', '#{client_termfeatures}' })
   info = vim.split(vim.trim(info), ',', { trimempty = true })
-  if not vim.tbl_contains(info, 'RGB') then
+  if not vim.list_contains(info, 'RGB') then
     local has_rgb = false
     if #info == 0 then
       -- client_termfeatures may not be supported; fallback to checking show-messages
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index 8ebc8ccb17..a5fe14732c 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -449,7 +449,7 @@ local function python()
           local path_bin = vim.fs.normalize(path .. '/' .. pyname)
           if
             path_bin ~= vim.fs.normalize(python_exe)
-            and vim.tbl_contains(python_multiple, path_bin)
+            and vim.list_contains(python_multiple, path_bin)
             and executable(path_bin)
           then
             python_multiple[#python_multiple + 1] = path_bin
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 7f953adc21..66627fe4e7 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -449,7 +449,7 @@ function Loader.lsmod(path)
       if topname then
         Loader._indexed[path][topname] = { modpath = modpath, modname = topname }
         Loader._topmods[topname] = Loader._topmods[topname] or {}
-        if not vim.tbl_contains(Loader._topmods[topname], path) then
+        if not vim.list_contains(Loader._topmods[topname], path) then
           table.insert(Loader._topmods[topname], path)
         end
       end
@@ -523,7 +523,7 @@ function M._inspect(opts)
         { ms(Loader._stats[stat].time / Loader._stats[stat].total) .. '\n', 'Bold' },
       })
       for k, v in pairs(Loader._stats[stat]) do
-        if not vim.tbl_contains({ 'time', 'total' }, k) then
+        if not vim.list_contains({ 'time', 'total' }, k) then
           chunks[#chunks + 1] = { '* ' .. k .. ':' .. string.rep(' ', 9 - #k) }
           chunks[#chunks + 1] = { tostring(v) .. '\n', 'Number' }
         end
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 3db3545786..5c78bd7580 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -171,7 +171,7 @@ local function for_each_buffer_client(bufnr, fn, restrict_client_ids)
   if restrict_client_ids and #restrict_client_ids > 0 then
     local filtered_client_ids = {}
     for client_id in pairs(client_ids) do
-      if vim.tbl_contains(restrict_client_ids, client_id) then
+      if vim.list_contains(restrict_client_ids, client_id) then
         filtered_client_ids[client_id] = true
       end
     end
@@ -2186,7 +2186,7 @@ function lsp.formatexpr(opts)
   opts = opts or {}
   local timeout_ms = opts.timeout_ms or 500
 
-  if vim.tbl_contains({ 'i', 'R', 'ic', 'ix' }, vim.fn.mode()) then
+  if vim.list_contains({ 'i', 'R', 'ic', 'ix' }, vim.fn.mode()) then
     -- `formatexpr` is also called when exceeding `textwidth` in insert mode
     -- fall back to internal formatting
     return 1
diff --git a/runtime/lua/vim/lsp/_snippet.lua b/runtime/lua/vim/lsp/_snippet.lua
index 797d8960d5..e7ada5415f 100644
--- a/runtime/lua/vim/lsp/_snippet.lua
+++ b/runtime/lua/vim/lsp/_snippet.lua
@@ -17,14 +17,14 @@ P.take_until = function(targets, specials)
         table.insert(raw, '\\')
         new_pos = new_pos + 1
         c = string.sub(input, new_pos, new_pos)
-        if not vim.tbl_contains(targets, c) and not vim.tbl_contains(specials, c) then
+        if not vim.list_contains(targets, c) and not vim.list_contains(specials, c) then
           table.insert(esc, '\\')
         end
         table.insert(raw, c)
         table.insert(esc, c)
         new_pos = new_pos + 1
       else
-        if vim.tbl_contains(targets, c) then
+        if vim.list_contains(targets, c) then
           break
         end
         table.insert(raw, c)
diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index 81cac6a511..005a0047fa 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -42,7 +42,7 @@ local function execute_lens(lens, bufnr, client_id)
   -- Need to use the client that returned the lens → must not use buf_request
   local command_provider = client.server_capabilities.executeCommandProvider
   local commands = type(command_provider) == 'table' and command_provider.commands or {}
-  if not vim.tbl_contains(commands, command.command) then
+  if not vim.list_contains(commands, command.command) then
     vim.notify(
       string.format(
         'Language server does not support command `%s`. This command may require a client extension.',
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index dca258e4b9..31af2afb0b 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1476,7 +1476,7 @@ end
 local function close_preview_window(winnr, bufnrs)
   vim.schedule(function()
     -- exit if we are in one of ignored buffers
-    if bufnrs and vim.tbl_contains(bufnrs, api.nvim_get_current_buf()) then
+    if bufnrs and vim.list_contains(bufnrs, api.nvim_get_current_buf()) then
       return
     end
 
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 9245adae3a..7ecb56eb92 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -252,12 +252,53 @@ function vim.tbl_filter(func, t)
   return rettab
 end
 
---- Checks if a list-like (vector) table contains `value`.
+--- Checks if a table contains a given value, specified either directly or via
+--- a predicate that is checked for each value.
+---
+--- Example:
+--- <pre>lua
+---  vim.tbl_contains({ 'a', { 'b', 'c' } }, function(v)
+---    return vim.deep_equal(v, { 'b', 'c' })
+---  end, { predicate = true })
+---  -- true
+--- </pre>
+---
+---@see |vim.list_contains()| for checking values in list-like tables
 ---
 ---@param t table Table to check
+---@param value any Value to compare or predicate function reference
+---@param opts (table|nil) Keyword arguments |kwargs|:
+---       - predicate: (boolean) `value` is a function reference to be checked (default false)
+---@return boolean `true` if `t` contains `value`
+function vim.tbl_contains(t, value, opts)
+  vim.validate({ t = { t, 't' }, opts = { opts, 't', true } })
+
+  local pred
+  if opts and opts.predicate then
+    vim.validate({ value = { value, 'c' } })
+    pred = value
+  else
+    pred = function(v)
+      return v == value
+    end
+  end
+
+  for _, v in pairs(t) do
+    if pred(v) then
+      return true
+    end
+  end
+  return false
+end
+
+--- Checks if a list-like table (integer keys without gaps) contains `value`.
+---
+---@see |vim.tbl_contains()| for checking values in general tables
+---
+---@param t table Table to check (must be list-like, not validated)
 ---@param value any Value to compare
 ---@return boolean `true` if `t` contains `value`
-function vim.tbl_contains(t, value)
+function vim.list_contains(t, value)
   vim.validate({ t = { t, 't' } })
 
   for _, v in ipairs(t) do
-- 
cgit 


From 7caf0eafd83b5a92f2ff219b3a64ffae4174b9af Mon Sep 17 00:00:00 2001
From: NAKAI Tsuyoshi <82267684+uga-rosa@users.noreply.github.com>
Date: Fri, 14 Apr 2023 19:01:08 +0900
Subject: feat(lua)!: add stricter vim.tbl_islist() and rename old one to
 vim.tbl_isarray() (#16440)

feat(lua)!: add stricter vim.tbl_islist(), rename vim.tbl_isarray()

Problem: `vim.tbl_islist` allows gaps in tables with integer keys
("arrays").

Solution: Rename `vim.tbl_islist` to `vim.tbl_isarray`, add new
`vim.tbl.islist` that checks for consecutive integer keys that start
from 1.
---
 runtime/doc/lua.txt        | 23 +++++++++++++++++++----
 runtime/doc/news.txt       |  5 +++++
 runtime/lua/vim/shared.lua | 47 +++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 64 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index f39adf4f8d..6fdf3775f6 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1928,6 +1928,20 @@ tbl_get({o}, {...})                                            *vim.tbl_get()*
     Return: ~
         any Nested value indexed by key (if it exists), else nil
 
+tbl_isarray({t})                                           *vim.tbl_isarray()*
+    Tests if a Lua table can be treated as an array (a table indexed by
+    integers).
+
+    Empty table `{}` is assumed to be an array, unless it was created by
+    |vim.empty_dict()| or returned as a dict-like |API| or Vimscript result,
+    for example from |rpcrequest()| or |vim.fn|.
+
+    Parameters: ~
+      • {t}  (table)
+
+    Return: ~
+        (boolean) `true` if array-like table, else `false`.
+
 tbl_isempty({t})                                           *vim.tbl_isempty()*
     Checks if a table is empty.
 
@@ -1941,17 +1955,18 @@ tbl_isempty({t})                                           *vim.tbl_isempty()*
       • https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
 tbl_islist({t})                                             *vim.tbl_islist()*
-    Tests if a Lua table can be treated as an array.
+    Tests if a Lua table can be treated as a list (a table indexed by
+    consecutive integers starting from 1).
 
-    Empty table `{}` is assumed to be an array, unless it was created by
+    Empty table `{}` is assumed to be an list, unless it was created by
     |vim.empty_dict()| or returned as a dict-like |API| or Vimscript result,
     for example from |rpcrequest()| or |vim.fn|.
 
     Parameters: ~
-      • {t}  (table) Table
+      • {t}  (table)
 
     Return: ~
-        (boolean) `true` if array-like table, else `false`
+        (boolean) `true` if list-like table, else `false`.
 
 tbl_keys({t})                                                 *vim.tbl_keys()*
     Return a list of all keys used in a table. However, the order of the
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index aff1a4a24e..6697b3018a 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -15,6 +15,11 @@ BREAKING CHANGES                                                *news-breaking*
 
 The following changes may require adaptations in user config or plugins.
 
+• |vim.tbl_islist()| now checks whether a table is actually list-like (i.e.,
+  has integer keys without gaps and starting from 1). For the previous
+  behavior (only check for integer keys, allow gaps or not starting with 1),
+  use |vim.tbl_isarray()|.
+
 • "#" followed by a digit no longer stands for a function key at the start of
   the lhs of a mapping.
 
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 7ecb56eb92..f700f4a6b3 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -320,10 +320,10 @@ function vim.tbl_isempty(t)
   return next(t) == nil
 end
 
---- We only merge empty tables or tables that are not a list
+--- We only merge empty tables or tables that are not an array (indexed by integers)
 ---@private
 local function can_merge(v)
-  return type(v) == 'table' and (vim.tbl_isempty(v) or not vim.tbl_islist(v))
+  return type(v) == 'table' and (vim.tbl_isempty(v) or not vim.tbl_isarray(v))
 end
 
 local function tbl_extend(behavior, deep_extend, ...)
@@ -554,15 +554,15 @@ function vim.spairs(t)
   end
 end
 
---- Tests if a Lua table can be treated as an array.
+--- Tests if a Lua table can be treated as an array (a table indexed by integers).
 ---
 --- Empty table `{}` is assumed to be an array, unless it was created by
 --- |vim.empty_dict()| or returned as a dict-like |API| or Vimscript result,
 --- for example from |rpcrequest()| or |vim.fn|.
 ---
----@param t table Table
----@return boolean `true` if array-like table, else `false`
-function vim.tbl_islist(t)
+---@param t table
+---@return boolean `true` if array-like table, else `false`.
+function vim.tbl_isarray(t)
   if type(t) ~= 'table' then
     return false
   end
@@ -570,7 +570,8 @@ function vim.tbl_islist(t)
   local count = 0
 
   for k, _ in pairs(t) do
-    if type(k) == 'number' then
+    --- Check if the number k is an integer
+    if type(k) == 'number' and k == math.floor(k) then
       count = count + 1
     else
       return false
@@ -589,6 +590,38 @@ function vim.tbl_islist(t)
   end
 end
 
+--- Tests if a Lua table can be treated as a list (a table indexed by consecutive integers starting from 1).
+---
+--- Empty table `{}` is assumed to be an list, unless it was created by
+--- |vim.empty_dict()| or returned as a dict-like |API| or Vimscript result,
+--- for example from |rpcrequest()| or |vim.fn|.
+---
+---@param t table
+---@return boolean `true` if list-like table, else `false`.
+function vim.tbl_islist(t)
+  if type(t) ~= 'table' then
+    return false
+  end
+
+  local num_elem = vim.tbl_count(t)
+
+  if num_elem == 0 then
+    -- TODO(bfredl): in the future, we will always be inside nvim
+    -- then this check can be deleted.
+    if vim._empty_dict_mt == nil then
+      return nil
+    end
+    return getmetatable(t) ~= vim._empty_dict_mt
+  else
+    for i = 1, num_elem do
+      if t[i] == nil then
+        return false
+      end
+    end
+    return true
+  end
+end
+
 --- Counts the number of non-nil values in table `t`.
 ---
 --- <pre>lua
-- 
cgit 


From d6e2804ab4f8810293dbcd748bfb938d9e0c3d52 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 14 Apr 2023 11:00:17 +0800
Subject: vim-patch:8.2.1794: no falsy Coalescing operator

Problem:    No falsy Coalescing operator.
Solution:   Add the "??" operator.  Fix mistake with function argument count.

https://github.com/vim/vim/commit/92f26c256e06277ff2ec4ce7adea1eb58c85abe0

Cherry-pick tv2bool() into eval/typval.c.
Cherry-pick *??* tag from Vim runtime.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/eval.txt | 46 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index fe15ba6115..9f0a6ceb25 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -93,7 +93,27 @@ non-zero number it means TRUE: >
 	:" executed
 To test for a non-empty string, use empty(): >
 	:if !empty("foo")
-<
+
+<						*falsy* *truthy*
+An expression can be used as a condition, ignoring the type and only using
+whether the value is "sort of true" or "sort of false".  Falsy is:
+	the number zero
+	empty string, blob, list or dictionary
+Other values are truthy.  Examples:
+	0	falsy
+	1	truthy
+	-1	truthy
+	0.0	falsy
+	0.1	truthy
+	''	falsy
+	'x'	truthy
+	[]	falsy
+	[0]	truthy
+	{}	falsy
+	#{x: 1} truthy
+	0z	falsy
+	0z00	truthy
+
 							*non-zero-arg*
 Function arguments often behave slightly different from |TRUE|: If the
 argument is present and it evaluates to a non-zero Number, |v:true| or a
@@ -841,9 +861,12 @@ All expressions within one level are parsed from left to right.
 
 
 ------------------------------------------------------------------------------
-expr1							*expr1* *ternary* *E109*
+expr1				*expr1* *ternary* *falsy-operator* *??* *E109*
+
+The ternary operator: expr2 ? expr1 : expr1
+The falsy operator:   expr2 ?? expr1
 
-expr2 ? expr1 : expr1
+Ternary operator ~
 
 The expression before the '?' is evaluated to a number.  If it evaluates to
 |TRUE|, the result is the value of the expression between the '?' and ':',
@@ -866,6 +889,23 @@ To keep this readable, using |line-continuation| is suggested: >
 You should always put a space before the ':', otherwise it can be mistaken for
 use in a variable such as "a:1".
 
+Falsy operator ~
+
+This is also known as the "null coalescing operator", but that's too
+complicated, thus we just call it the falsy operator.
+
+The expression before the '??' is evaluated.  If it evaluates to
+|truthy|, this is used as the result.  Otherwise the expression after the '??'
+is evaluated and used as the result.  This is most useful to have a default
+value for an expression that may result in zero or empty: >
+	echo theList ?? 'list is empty'
+	echo GetName() ?? 'unknown'
+
+These are similar, but not equal: >
+	expr2 ?? expr1
+	expr2 ? expr2 : expr1
+In the second line "expr2" is evaluated twice.
+
 
 ------------------------------------------------------------------------------
 expr2 and expr3						*expr2* *expr3*
-- 
cgit 


From e36806666fe3c5792c39f0f9127e6637a6ceb7f2 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 14 Apr 2023 20:35:46 +0800
Subject: vim-patch:8.2.2138: Vim9: "exit_cb" causes Vim to exit (#23087)

Problem:    Vim9: "exit_cb" causes Vim to exit.
Solution:   Require white space after a command in Vim9 script. (closes vim/vim#7467)
            Also fix that Vim9 style heredoc was not always recognized.

https://github.com/vim/vim/commit/b5b9480ee936ef4cd0e350c468ef8c5f42fa398b

Omit EX_NONWHITE_OK, E1143, E1144: Vim9 script only.
Cherry-pick test_vimscript.vim changes from patch 8.2.2141.
Cherry-pick E1145 tag from Vim runtime.

N/A patches for version.c:

vim-patch:8.2.2140: build failure with tiny features

Problem:    Build failure with tiny features.
Solution:   Add #ifdef.

https://github.com/vim/vim/commit/2a3cd3af455973d678f70303ebdd486f3478bc0d

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/eval.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 9f0a6ceb25..351690f4df 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2539,7 +2539,7 @@ This does NOT work: >
 			|List| item.
 
 						*:let=<<* *:let-heredoc*
-						*E990* *E991* *E172* *E221*
+					*E990* *E991* *E172* *E221* *E1145*
 :let {var-name} =<< [trim] {endmarker}
 text...
 text...
-- 
cgit 


From 3ad8c08acc506555667a070cf83c410ac9334f1e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 14 Apr 2023 19:45:54 +0800
Subject: vim-patch:8.2.4770: cannot easily mix expression and heredoc

Problem:    Cannot easily mix expression and heredoc.
Solution:   Support  in heredoc. (Yegappan Lakshmanan, closes vim/vim#10138)

https://github.com/vim/vim/commit/efbfa867a146fcd93fdec2435597aa4ae7f1325c

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/eval.txt | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 351690f4df..c8eea03f5f 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2540,14 +2540,30 @@ This does NOT work: >
 
 						*:let=<<* *:let-heredoc*
 					*E990* *E991* *E172* *E221* *E1145*
-:let {var-name} =<< [trim] {endmarker}
+:let {var-name} =<< [trim] [eval] {endmarker}
 text...
 text...
 {endmarker}
 			Set internal variable {var-name} to a |List|
 			containing the lines of text bounded by the string
-			{endmarker}. The lines of text is used as a
-			|literal-string|.
+			{endmarker}.
+
+			If "eval" is not specified, then each line of text is
+			used as a |literal-string|.  If "eval" is specified,
+			then any Vim expression in the form ``={expr}`` is
+			evaluated and the result replaces the expression.
+			Example where $HOME is expanded: >
+				let lines =<< trim eval END
+				  some text
+				  See the file `=$HOME`/.vimrc
+				  more text
+				END
+<			There can be multiple Vim expressions in a single line
+			but an expression cannot span multiple lines.  If any
+			expression evaluation fails, then the assignment fails.
+			once the "`=" has been found {expr} and a backtick
+			must follow.  {expr} cannot be empty.
+
 			{endmarker} must not contain white space.
 			{endmarker} cannot start with a lower case character.
 			The last line should end only with the {endmarker}
@@ -2597,6 +2613,13 @@ text...
 					1 2 3 4
 					5 6 7 8
 				DATA
+
+				let code =<< trim eval CODE
+				   let v = `=10 + 20`
+				   let h = "`=$HOME`"
+				   let s = "`=Str1()` abc `=Str2()`"
+				   let n = `=MyFunc(3, 4)`
+				CODE
 <
 								*E121*
 :let {var-name}	..	List the value of variable {var-name}.  Multiple
-- 
cgit 


From bacb5021d4eff33c67eb659fb01125b2abcacd79 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 14 Apr 2023 21:08:00 +0800
Subject: vim-patch:8.2.4883: string interpolation only works in heredoc

Problem:    String interpolation only works in heredoc.
Solution:   Support interpolated strings.  Use syntax for heredoc consistent
            with strings, similar to C#. (closes vim/vim#10327)

https://github.com/vim/vim/commit/2eaef106e4a7fc9dc74a7e672b5f550ec1f9786e

Cherry-pick Test_Debugger_breakadd_expr() from Vim.

Co-authored-by: LemonBoy <thatlemon@gmail.com>
---
 runtime/doc/eval.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index c8eea03f5f..518a190d3c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1406,6 +1406,26 @@ to be doubled.  These two commands are equivalent: >
 	if a =~ '\s*'
 
 
+------------------------------------------------------------------------------
+interpolated-string					*interp-string*
+
+$"string"		interpolated string constant		*expr-$quote*
+$'string'		interpolated literal string constant	*expr-$'*
+
+Interpolated strings are an extension of the |string| and |literal-string|,
+allowing the inclusion of Vim script expressions (see |expr1|).  Any
+expression returning a value can be enclosed between curly braces.  The value
+is converted to a string.  All the text and results of the expressions
+are concatenated to make a new string.
+
+To include an opening brace '{' or closing brace '}' in the string content
+double it.
+
+Examples: >
+	let your_name = input("What's your name? ")
+	echo $"Hello, {your_name}!"
+	echo $"The square root of 9 is {sqrt(9)}"
+
 ------------------------------------------------------------------------------
 option						*expr-option* *E112* *E113*
 
-- 
cgit 


From 29efd54e0284727a7dde5608e5eedaef9c00c65f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 15 Apr 2023 18:19:47 +0800
Subject: vim-patch:8.2.4934: string interpolation fails when not evaluating

Problem:    String interpolation fails when not evaluating.
Solution:   Skip the expression when not evaluating. (closes vim/vim#10398)

https://github.com/vim/vim/commit/70c41241c2701f26a99085e433925a206ca265a3

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/syntax/modula3.vim | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/modula3.vim b/runtime/syntax/modula3.vim
index 390a1a90ff..67243db600 100644
--- a/runtime/syntax/modula3.vim
+++ b/runtime/syntax/modula3.vim
@@ -84,9 +84,7 @@ syn case ignore
 
   let s:digits = "0123456789ABCDEF"
   for s:radix in range(2, 16)
-    " Nvim does not support interpolated strings yet.
-    " exe $'syn match modula3Integer "\<{s:radix}_[{s:digits[:s:radix - 1]}]\+L\=\>"'
-    exe 'syn match modula3Integer "\<' .. s:radix .. '_[' .. s:digits[:s:radix - 1] .. ']\+L\=\>"'
+    exe $'syn match modula3Integer "\<{s:radix}_[{s:digits[:s:radix - 1]}]\+L\=\>"'
   endfor
   unlet s:digits s:radix
 
-- 
cgit 


From f2a9097d764cf61b9479d7633a9738077f75f43c Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 15 Apr 2023 19:02:02 +0800
Subject: vim-patch:partial:d899e5112079

Update runtime files

https://github.com/vim/vim/commit/d899e51120798d3fb5420abb1f19dddf3f014d05

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/eval.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 518a190d3c..072d894aff 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2569,20 +2569,20 @@ text...
 			{endmarker}.
 
 			If "eval" is not specified, then each line of text is
-			used as a |literal-string|.  If "eval" is specified,
-			then any Vim expression in the form ``={expr}`` is
-			evaluated and the result replaces the expression.
+			used as a |literal-string|, except that single quotes
+			doe not need to be doubled.
+			If "eval" is specified, then any Vim expression in the
+			form {expr} is evaluated and the result replaces the
+			expression, like with |interp-string|.
 			Example where $HOME is expanded: >
 				let lines =<< trim eval END
 				  some text
-				  See the file `=$HOME`/.vimrc
+				  See the file {$HOME}/.vimrc
 				  more text
 				END
 <			There can be multiple Vim expressions in a single line
 			but an expression cannot span multiple lines.  If any
 			expression evaluation fails, then the assignment fails.
-			once the "`=" has been found {expr} and a backtick
-			must follow.  {expr} cannot be empty.
 
 			{endmarker} must not contain white space.
 			{endmarker} cannot start with a lower case character.
@@ -2635,10 +2635,10 @@ text...
 				DATA
 
 				let code =<< trim eval CODE
-				   let v = `=10 + 20`
-				   let h = "`=$HOME`"
-				   let s = "`=Str1()` abc `=Str2()`"
-				   let n = `=MyFunc(3, 4)`
+				   let v = {10 + 20}
+				   let h = "{$HOME}"
+				   let s = "{Str1()} abc {Str2()}"
+				   let n = {MyFunc(3, 4)}
 				CODE
 <
 								*E121*
-- 
cgit 


From 9f1d33307270e7d013896aea6042b73d091078f5 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 15 Apr 2023 19:04:55 +0800
Subject: vim-patch:3f32a5f1601a

Update runtime files and translations

https://github.com/vim/vim/commit/3f32a5f1601ab2b0eba0caad00d4c26fb86a02a2

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/eval.txt | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 072d894aff..dd9137649d 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1417,14 +1417,22 @@ allowing the inclusion of Vim script expressions (see |expr1|).  Any
 expression returning a value can be enclosed between curly braces.  The value
 is converted to a string.  All the text and results of the expressions
 are concatenated to make a new string.
-
+								*E1278*
 To include an opening brace '{' or closing brace '}' in the string content
-double it.
+double it.  For double quoted strings using a backslash also works.  A single
+closing brace '}' will result in an error.
 
 Examples: >
 	let your_name = input("What's your name? ")
+<	What's your name?  Peter ~
+>
+	echo
 	echo $"Hello, {your_name}!"
-	echo $"The square root of 9 is {sqrt(9)}"
+<	Hello, Peter! ~
+>
+	echo $"The square root of {{9}} is {sqrt(9)}"
+<	The square root of {9} is 3.0 ~
+
 
 ------------------------------------------------------------------------------
 option						*expr-option* *E112* *E113*
-- 
cgit 


From 57221e0d11d1c24bc2abada7559a1d20c5090b62 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 15 Apr 2023 19:11:29 +0800
Subject: vim-patch:b59ae59a5870

Update runtime files

https://github.com/vim/vim/commit/b59ae59a58706e454ef8c78276f021b1f58466e7

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/eval.txt    | 6 +++---
 runtime/doc/options.txt | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index dd9137649d..1ff6e3c360 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1407,7 +1407,7 @@ to be doubled.  These two commands are equivalent: >
 
 
 ------------------------------------------------------------------------------
-interpolated-string					*interp-string*
+interpolated-string				*$quote* *interpolated-string*
 
 $"string"		interpolated string constant		*expr-$quote*
 $'string'		interpolated literal string constant	*expr-$'*
@@ -2578,10 +2578,10 @@ text...
 
 			If "eval" is not specified, then each line of text is
 			used as a |literal-string|, except that single quotes
-			doe not need to be doubled.
+			does not need to be doubled.
 			If "eval" is specified, then any Vim expression in the
 			form {expr} is evaluated and the result replaces the
-			expression, like with |interp-string|.
+			expression, like with |interpolated-string|.
 			Example where $HOME is expanded: >
 				let lines =<< trim eval END
 				  some text
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b4cad51990..dcaf37af20 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3332,8 +3332,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	If the expression starts with s: or |<SID>|, then it is replaced with
 	the script ID (|local-function|). Example: >
-		set includeexpr=s:MyIncludeExpr(v:fname)
-		set includeexpr=<SID>SomeIncludeExpr(v:fname)
+		setlocal includeexpr=s:MyIncludeExpr(v:fname)
+		setlocal includeexpr=<SID>SomeIncludeExpr(v:fname)
 <
 	The expression will be evaluated in the |sandbox| when set from a
 	modeline, see |sandbox-option|.
-- 
cgit 


From bcc971de15ed540356405f937d640eaffa4a03bb Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 15 Apr 2023 19:50:23 +0800
Subject: vim-patch:9.0.0269: getscriptinfo() does not include the version

Problem:    getscriptinfo() does not include the version.  Cannot select
            entries by script name.
Solution:   Add the "version" item and the "name" argument. (Yegappan
            Lakshmanan, closes vim/vim#10962)

https://github.com/vim/vim/commit/520f6ef60a59f7b5f3da9199999d13dbe817d3ce

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 3c940ccfa2..e32cac7839 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -223,7 +223,7 @@ getreg([{regname} [, 1 [, {list}]]])
 				String or List   contents of a register
 getreginfo([{regname}])		Dict	information about a register
 getregtype([{regname}])		String	type of a register
-getscriptinfo()		List	list of sourced scripts
+getscriptinfo([{opts}])		List	list of sourced scripts
 gettabinfo([{expr}])		List	list of tab pages
 gettabvar({nr}, {varname} [, {def}])
 				any	variable {varname} in tab {nr} or {def}
@@ -3576,7 +3576,7 @@ getregtype([{regname}])					*getregtype()*
 		Can also be used as a |method|: >
 			GetRegname()->getregtype()
 
-getscriptinfo()					*getscriptinfo()*
+getscriptinfo([{opts}])					*getscriptinfo()*
 		Returns a |List| with information about all the sourced Vim
 		scripts in the order they were sourced.
 
@@ -3585,6 +3585,13 @@ getscriptinfo()					*getscriptinfo()*
 		    autoload	always set to FALSE.
 		    name	vim script file name.
 		    sid		script ID |<SID>|.
+		    version	vimscript version, always 1
+
+		The optional Dict argument {opts} supports the following
+		items:
+		    name	script name match pattern. If specified,
+				information about scripts with name
+				that match the pattern "name" are returned.
 
 gettabinfo([{tabnr}])					*gettabinfo()*
 		If {tabnr} is not specified, then information about all the
-- 
cgit 


From e9b4f5105100ce2279915bbe1d67d299c294db24 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 15 Apr 2023 19:57:55 +0800
Subject: vim-patch:9.0.0303: it is not easy to get information about a script

Problem:    It is not easy to get information about a script.
Solution:   Make getscriptinf() return the version.  When selecting a specific
            script return functions and variables. (Yegappan Lakshmanan,
            closes vim/vim#10991)

https://github.com/vim/vim/commit/2f892d8663498c21296ad6661dac1bb8372cfd10

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index e32cac7839..cb05718ab9 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -3578,21 +3578,40 @@ getregtype([{regname}])					*getregtype()*
 
 getscriptinfo([{opts}])					*getscriptinfo()*
 		Returns a |List| with information about all the sourced Vim
-		scripts in the order they were sourced.
-
-		Each item in the returned List is a |Dict| with the following
-		items:
-		    autoload	always set to FALSE.
-		    name	vim script file name.
-		    sid		script ID |<SID>|.
-		    version	vimscript version, always 1
+		scripts in the order they were sourced, like what
+		`:scriptnames` shows.
 
 		The optional Dict argument {opts} supports the following
+		optional items:
+		    name	Script name match pattern. If specified,
+				and "sid" is not specified, information about
+				scripts with name that match the pattern
+				"name" are returned.
+		    sid		Script ID |<SID>|.  If specified, only
+				information about the script with ID "sid" is
+				returned and "name" is ignored.
+
+		Each item in the returned List is a |Dict| with the following
 		items:
-		    name	script name match pattern. If specified,
-				information about scripts with name
-				that match the pattern "name" are returned.
+		    autoload	Always set to FALSE.
+		    functions   List of script-local function names defined in
+				the script.  Present only when a particular
+				script is specified using the "sid" item in
+				{opts}.
+		    name	Vim script file name.
+		    sid		Script ID |<SID>|.
+		    variables   A dictionary with the script-local variables.
+				Present only when the a particular script is
+				specified using the "sid" item in {opts}.
+				Note that this is a copy, the value of
+				script-local variables cannot be changed using
+				this dictionary.
+		    version	Vimscript version, always 1
 
+		Examples: >
+			:echo getscriptinfo({'name': 'myscript'})
+			:echo getscriptinfo({'sid': 15}).variables
+<
 gettabinfo([{tabnr}])					*gettabinfo()*
 		If {tabnr} is not specified, then information about all the
 		tab pages is returned as a |List|. Each List item is a
-- 
cgit 


From 8c6f97bef89da6ad8bde8f935d9983f25b5c59bd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Apr 2023 00:16:50 +0800
Subject: fix(health): properly use the value of $PYENV_VERSION (#23109)

---
 runtime/lua/provider/health.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index a5fe14732c..de0729ab6b 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -196,7 +196,7 @@ local function check_for_pyenv()
 
   info('pyenv: Path: ' .. pyenv_path)
 
-  local pyenv_root = os.getenv('PYENV_ROOT') and vim.fn.resolve('$PYENV_ROOT') or ''
+  local pyenv_root = os.getenv('PYENV_ROOT') and vim.fn.resolve(os.getenv('PYENV_ROOT')) or ''
 
   if is_blank(pyenv_root) then
     pyenv_root = vim.trim(system({ pyenv_path, 'root' }))
-- 
cgit 


From c08b03076167837cff9eb66c19440d727e6dad31 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sat, 15 Apr 2023 23:40:48 +0200
Subject: refactor: deprecate checkhealth functions

The following functions are deprecated and will be removed in
Nvim v0.11:

- health#report_start()
- health#report_info()
- health#report_ok()
- health#report_warn()
- health#report_error()
- vim.health.report_start()
- vim.health.report_info()
- vim.health.report_ok()
- vim.health.report_warn()
- vim.health.report_error()

Users should instead use these:

- vim.health.start()
- vim.health.info()
- vim.health.ok()
- vim.health.warn()
- vim.health.error()
---
 runtime/autoload/health.vim           | 211 +++------------------------
 runtime/doc/deprecated.txt            |  10 +-
 runtime/doc/news.txt                  |   8 +-
 runtime/doc/pi_health.txt             |  16 +--
 runtime/lua/nvim/health.lua           |  83 ++++++-----
 runtime/lua/provider/health.lua       |  10 +-
 runtime/lua/vim/health.lua            | 264 ++++++++++++++++++++++++++++++++--
 runtime/lua/vim/lsp/health.lua        |   6 +-
 runtime/lua/vim/treesitter/health.lua |   6 +-
 9 files changed, 346 insertions(+), 268 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/health.vim b/runtime/autoload/health.vim
index 5fd4627b11..1c414377f6 100644
--- a/runtime/autoload/health.vim
+++ b/runtime/autoload/health.vim
@@ -1,207 +1,38 @@
-" Runs the specified healthchecks.
-" Runs all discovered healthchecks if a:plugin_names is empty.
-function! health#check(plugin_names) abort
-  let healthchecks = empty(a:plugin_names)
-        \ ? s:discover_healthchecks()
-        \ : s:get_healthcheck(a:plugin_names)
-
-  " Create buffer and open in a tab, unless this is the default buffer when Nvim starts.
-  let emptybuf = (bufnr('$') == 1 && empty(getline(1)) && 1 == line('$'))
-  execute (emptybuf ? 'buffer' : 'tab sbuffer') nvim_create_buf(v:true, v:true)
-  if bufexists('health://')
-    bwipe health://
-  endif
-  file health://
-  setfiletype checkhealth
-
-  if empty(healthchecks)
-    call setline(1, 'ERROR: No healthchecks found.')
-  else
-    redraw|echo 'Running healthchecks...'
-    for name in sort(keys(healthchecks))
-      let [func, type] = healthchecks[name]
-      let s:output = []
-      try
-        if func == ''
-          throw 'healthcheck_not_found'
-        endif
-        eval type == 'v' ? call(func, []) : luaeval(func)
-        " in the event the healthcheck doesn't return anything
-        " (the plugin author should avoid this possibility)
-        if len(s:output) == 0
-          throw 'healthcheck_no_return_value'
-        endif
-      catch
-        let s:output = []  " Clear the output
-        if v:exception =~# 'healthcheck_not_found'
-          call health#report_error('No healthcheck found for "'.name.'" plugin.')
-        elseif v:exception =~# 'healthcheck_no_return_value'
-          call health#report_error('The healthcheck report for "'.name.'" plugin is empty.')
-        else
-          call health#report_error(printf(
-                \ "Failed to run healthcheck for \"%s\" plugin. Exception:\n%s\n%s",
-                \ name, v:throwpoint, v:exception))
-        endif
-      endtry
-      let header = [repeat('=', 78), name .. ': ' .. func, '']
-      " remove empty line after header from report_start
-      let s:output = s:output[0] == '' ? s:output[1:] : s:output
-      let s:output = header + s:output + ['']
-      call append('$', s:output)
-      redraw
-    endfor
-  endif
-
-  " Clear the 'Running healthchecks...' message.
-  redraw|echo ''
+function! s:deprecate(type) abort
+  let deprecate = v:lua.vim.deprecate('health#report_' . a:type, 'vim.health.' . a:type, '0.11')
+  redraw | echo 'Running healthchecks...'
+  call v:lua.vim.health.warn(deprecate)
 endfunction
 
-function! s:collect_output(output)
-  let s:output += split(a:output, "\n", 1)
-endfunction
-
-" Starts a new report.
 function! health#report_start(name) abort
-  call s:collect_output(printf("\n%s ~", a:name))
+  call v:lua.vim.health.start(a:name)
+  call s:deprecate('start')
 endfunction
 
-" Indents lines *except* line 1 of a string if it contains newlines.
-function! s:indent_after_line1(s, columns) abort
-  let lines = split(a:s, "\n", 0)
-  if len(lines) < 2  " We do not indent line 1, so nothing to do.
-    return a:s
-  endif
-  for i in range(1, len(lines)-1)  " Indent lines after the first.
-    let lines[i] = substitute(lines[i], '^\s*', repeat(' ', a:columns), 'g')
-  endfor
-  return join(lines, "\n")
+function! health#report_info(msg) abort
+  call v:lua.vim.health.info(a:msg)
+  call s:deprecate('info')
 endfunction
 
-" Changes ':h clipboard' to ':help |clipboard|'.
-function! s:help_to_link(s) abort
-  return substitute(a:s, '\v:h%[elp] ([^|][^"\r\n ]+)', ':help |\1|', 'g')
+function! health#report_ok(msg) abort
+  call v:lua.vim.health.ok(a:msg)
+  call s:deprecate('ok')
 endfunction
 
-" Format a message for a specific report item.
-" a:1: Optional advice (string or list)
-function! s:format_report_message(status, msg, ...) abort " {{{
-  let output = '- ' .. a:status .. (empty(a:status) ? '' : ' ') .. s:indent_after_line1(a:msg, 2)
-
-  " Optional parameters
-  if a:0 > 0
-    let advice = type(a:1) == type('') ? [a:1] : a:1
-    if type(advice) != type([])
-      throw 'a:1: expected String or List'
-    endif
-
-    " Report each suggestion
-    if !empty(advice)
-      let output .= "\n  - ADVICE:"
-      for suggestion in advice
-        let output .= "\n    - " . s:indent_after_line1(suggestion, 6)
-      endfor
-    endif
-  endif
-
-  return s:help_to_link(output)
-endfunction " }}}
-
-" Reports a message as a listitem in the current section.
-function! health#report_info(msg) abort " {{{
-  call s:collect_output(s:format_report_message('', a:msg))
-endfunction " }}}
-
-" Reports a successful healthcheck.
-function! health#report_ok(msg) abort " {{{
-  call s:collect_output(s:format_report_message('OK', a:msg))
-endfunction " }}}
-
-" Reports a health warning.
-" a:1: Optional advice (string or list)
-function! health#report_warn(msg, ...) abort " {{{
+function! health#report_warn(msg, ...) abort
   if a:0 > 0
-    call s:collect_output(s:format_report_message('WARNING', a:msg, a:1))
+    call v:lua.vim.health.warn(a:msg, a:1)
   else
-    call s:collect_output(s:format_report_message('WARNING', a:msg))
+    call v:lua.vim.health.warn(a:msg)
   endif
-endfunction " }}}
+  call s:deprecate('warn')
+endfunction
 
-" Reports a failed healthcheck.
-" a:1: Optional advice (string or list)
-function! health#report_error(msg, ...) abort " {{{
+function! health#report_error(msg, ...) abort
   if a:0 > 0
-    call s:collect_output(s:format_report_message('ERROR', a:msg, a:1))
+    call v:lua.vim.health.error(a:msg, a:1)
   else
-    call s:collect_output(s:format_report_message('ERROR', a:msg))
+    call v:lua.vim.health.error(a:msg)
   endif
-endfunction " }}}
-
-" From a path return a list [{name}, {func}, {type}] representing a healthcheck
-function! s:filepath_to_healthcheck(path) abort
-  if a:path =~# 'vim$'
-    let name =  matchstr(a:path, '\zs[^\/]*\ze\.vim$')
-    let func = 'health#'.name.'#check'
-    let type = 'v'
-  else
-   let base_path = substitute(a:path,
-         \ '.*lua[\/]\(.\{-}\)[\/]health\([\/]init\)\?\.lua$',
-         \ '\1', '')
-   let name = substitute(base_path, '[\/]', '.', 'g')
-   let func = 'require("'.name.'.health").check()'
-   let type = 'l'
- endif
-  return [name, func, type]
-endfunction
-
-function! s:discover_healthchecks() abort
-  return s:get_healthcheck('*')
-endfunction
-
-" Returns Dictionary {name: [func, type], ..} representing healthchecks
-function! s:get_healthcheck(plugin_names) abort
-  let health_list = s:get_healthcheck_list(a:plugin_names)
-  let healthchecks = {}
-  for c in health_list
-    let normalized_name = substitute(c[0], '-', '_', 'g')
-    let existent = get(healthchecks, normalized_name, [])
-    " Prefer Lua over vim entries
-    if existent != [] && existent[2] == 'l'
-      continue
-    else
-      let healthchecks[normalized_name] = c
-    endif
-  endfor
-  let output = {}
-  for v in values(healthchecks)
-    let output[v[0]] = v[1:]
-  endfor
-  try
-    " vim.health is not a healthcheck, skip it
-    call remove(output, 'vim')
-  catch
-  endtry
-  return output
-endfunction
-
-" Returns list of lists [ [{name}, {func}, {type}] ] representing healthchecks
-function! s:get_healthcheck_list(plugin_names) abort
-  let healthchecks = []
-  let plugin_names = type('') == type(a:plugin_names)
-        \ ? split(a:plugin_names, ' ', v:false)
-        \ : a:plugin_names
-  for p in plugin_names
-    " support vim/lsp/health{/init/}.lua as :checkhealth vim.lsp
-    let p = substitute(p, '\.', '/', 'g')
-    let p = substitute(p, '*$', '**', 'g')  " find all submodule e.g vim*
-    let paths = nvim_get_runtime_file('autoload/health/'.p.'.vim', v:true)
-          \ + nvim_get_runtime_file('lua/**/'.p.'/health/init.lua', v:true)
-          \ + nvim_get_runtime_file('lua/**/'.p.'/health.lua', v:true)
-    if len(paths) == 0
-      let healthchecks += [[p, '', '']]  " healthcheck not found
-    else
-      let healthchecks += map(uniq(sort(paths)),
-            \'<SID>filepath_to_healthcheck(v:val)')
-    end
-  endfor
-  return healthchecks
+  call s:deprecate('error')
 endfunction
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 171d285950..3150190a8b 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -54,11 +54,11 @@ FUNCTIONS
 - *buffer_name()*	Obsolete name for |bufname()|.
 - *buffer_number()*	Obsolete name for |bufnr()|.
 - *file_readable()*	Obsolete name for |filereadable()|.
-- *health#report_error*	Use Lua |vim.health.report_error()| instead.
-- *health#report_info*	Use Lua |vim.health.report_info()| instead.
-- *health#report_ok*	Use Lua |vim.health.report_ok()| instead.
-- *health#report_start*	Use Lua |vim.health.report_start()| instead.
-- *health#report_warn*	Use Lua |vim.health.report_warn()| instead.
+- *health#report_error* *vim.health.report_error()*	Use |vim.health.error()| instead.
+- *health#report_info* *vim.health.report_info()*	Use |vim.health.info()| instead.
+- *health#report_ok* *vim.health.report_ok()*		Use |vim.health.ok()| instead.
+- *health#report_start* *vim.health.report_start()*	Use |vim.health.start()| instead.
+- *health#report_warn* *vim.health.report_warn()*	Use |vim.health.warn()| instead.
 - *highlight_exists()*	Obsolete name for |hlexists()|.
 - *highlightID()*	Obsolete name for |hlID()|.
 - *inputdialog()*	Use |input()| instead.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 6697b3018a..f196c3d445 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -62,7 +62,11 @@ DEPRECATIONS                                                *news-deprecations*
 The following functions are now deprecated and will be removed in the next
 release.
 
-• ...
-
+• Checkhealth functions:
+  - |health#report_error|, |vim.health.report_error()|	Use Lua |vim.health.error()| instead.
+  - |health#report_info|, |vim.health.report_info()|	Use Lua |vim.health.info()| instead.
+  - |health#report_ok|, |vim.health.report_ok()|	Use Lua |vim.health.ok()| instead.
+  - |health#report_start|, |vim.health.report_start()|	Use Lua |vim.health.start()| instead.
+  - |health#report_warn|, |vim.health.report_warn()|	Use Lua |vim.health.warn()| instead.
 
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/doc/pi_health.txt b/runtime/doc/pi_health.txt
index a0e06a7d37..266c021ecc 100644
--- a/runtime/doc/pi_health.txt
+++ b/runtime/doc/pi_health.txt
@@ -52,22 +52,22 @@ Functions                               *health-functions* *vim.health*
 The Lua "health" module can be used to create new healthchecks. To get started
 see |health-dev|.
 
-vim.health.report_start({name})                         *vim.health.report_start()*
+vim.health.start({name})                                     *vim.health.start()*
         Starts a new report. Most plugins should call this only once, but if
         you want different sections to appear in your report, call this once
         per section.
 
-vim.health.report_info({msg})                           *vim.health.report_info()*
+vim.health.info({msg})                                        *vim.health.info()*
         Reports an informational message.
 
-vim.health.report_ok({msg})                             *vim.health.report_ok()*
+vim.health.ok({msg})                                            *vim.health.ok()*
         Reports a "success" message.
 
-vim.health.report_warn({msg} [, {advice}])              *vim.health.report_warn()*
+vim.health.warn({msg} [, {advice}])                           *vim.health.warn()*
         Reports a warning. {advice} is an optional list of suggestions to
         present to the user.
 
-vim.health.report_error({msg} [, {advice}])             *vim.health.report_error()*
+vim.health.error({msg} [, {advice}])                         *vim.health.error()*
         Reports an error. {advice} is an optional list of suggestions to
         present to the user.
 
@@ -105,12 +105,12 @@ with your plugin name: >
         local M = {}
 
         M.check = function()
-          vim.health.report_start("foo report")
+          vim.health.start("foo report")
           -- make sure setup function parameters are ok
           if check_setup() then
-            vim.health.report_ok("Setup is correct")
+            vim.health.ok("Setup is correct")
           else
-            vim.health.report_error("Setup is incorrect")
+            vim.health.error("Setup is incorrect")
           end
           -- do some more checking
           -- ...
diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
index 6f544e9407..19303d34f9 100644
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -20,7 +20,7 @@ end
 local suggest_faq = 'https://github.com/neovim/neovim/wiki/Building-Neovim#optimized-builds'
 
 local function check_runtime()
-  health.report_start('Runtime')
+  health.start('Runtime')
   -- Files from an old installation.
   local bad_files = {
     ['plugin/man.vim'] = false,
@@ -37,10 +37,10 @@ local function check_runtime()
   end
 
   local ok = (bad_files_msg == '')
-  local info = ok and health.report_ok or health.report_info
+  local info = ok and health.ok or health.info
   info(string.format('$VIMRUNTIME: %s', vim.env.VIMRUNTIME))
   if not ok then
-    health.report_error(
+    health.error(
       string.format(
         '$VIMRUNTIME has files from an old installation (this can cause weird behavior):\n%s',
         bad_files_msg
@@ -51,7 +51,7 @@ local function check_runtime()
 end
 
 local function check_config()
-  health.report_start('Configuration')
+  health.start('Configuration')
   local ok = true
 
   local vimrc = (
@@ -60,7 +60,7 @@ local function check_config()
   if not filereadable(vimrc) then
     ok = false
     local has_vim = filereadable(vim.fn.expand('~/.vimrc'))
-    health.report_warn(
+    health.warn(
       (-1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable') .. ' user config file: ' .. vimrc,
       { has_vim and ':help nvim-from-vim' or ':help init.vim' }
     )
@@ -69,12 +69,12 @@ local function check_config()
   -- If $VIM is empty we don't care. Else make sure it is valid.
   if not empty(vim.env.VIM) and not filereadable(vim.env.VIM .. '/runtime/doc/nvim.txt') then
     ok = false
-    health.report_error('$VIM is invalid: ' .. vim.env.VIM)
+    health.error('$VIM is invalid: ' .. vim.env.VIM)
   end
 
   if vim.env.NVIM_TUI_ENABLE_CURSOR_SHAPE then
     ok = false
-    health.report_warn('$NVIM_TUI_ENABLE_CURSOR_SHAPE is ignored in Nvim 0.2+', {
+    health.warn('$NVIM_TUI_ENABLE_CURSOR_SHAPE is ignored in Nvim 0.2+', {
       "Use the 'guicursor' option to configure cursor shape. :help 'guicursor'",
       'https://github.com/neovim/neovim/wiki/Following-HEAD#20170402',
     })
@@ -82,7 +82,7 @@ local function check_config()
 
   if vim.v.ctype == 'C' then
     ok = false
-    health.report_error(
+    health.error(
       'Locale does not support UTF-8. Unicode characters may not display correctly.'
         .. ('\n$LANG=%s $LC_ALL=%s $LC_CTYPE=%s'):format(
           vim.env.LANG,
@@ -99,7 +99,7 @@ local function check_config()
 
   if vim.o.paste == 1 then
     ok = false
-    health.report_error(
+    health.error(
       "'paste' is enabled. This option is only for pasting text.\nIt should not be set in your config.",
       {
         'Remove `set paste` from your init.vim, if applicable.',
@@ -132,7 +132,7 @@ local function check_config()
     or (not empty(shadafile) and (not filereadable(shadafile) or not filewritable(shadafile)))
   then
     ok = false
-    health.report_error(
+    health.error(
       'shada file is not '
         .. ((not writeable or filereadable(shadafile)) and 'writeable' or 'readable')
         .. ':\n'
@@ -141,22 +141,22 @@ local function check_config()
   end
 
   if ok then
-    health.report_ok('no issues found')
+    health.ok('no issues found')
   end
 end
 
 local function check_performance()
-  health.report_start('Performance')
+  health.start('Performance')
 
   -- Check buildtype
   local buildtype = vim.fn.matchstr(vim.fn.execute('version'), [[\v\cbuild type:?\s*[^\n\r\t ]+]])
   if empty(buildtype) then
-    health.report_error('failed to get build type from :version')
+    health.error('failed to get build type from :version')
   elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo)]]):match_str(buildtype) then
-    health.report_ok(buildtype)
+    health.ok(buildtype)
   else
-    health.report_info(buildtype)
-    health.report_warn('Non-optimized debug build. Nvim will be slower.', {
+    health.info(buildtype)
+    health.warn('Non-optimized debug build. Nvim will be slower.', {
       'Install a different Nvim package, or rebuild with `CMAKE_BUILD_TYPE=RelWithDebInfo`.',
       suggest_faq,
     })
@@ -168,7 +168,7 @@ local function check_performance()
   vim.fn.system('echo')
   local elapsed_time = vim.fn.reltimefloat(vim.fn.reltime(start_time))
   if elapsed_time > slow_cmd_time then
-    health.report_warn(
+    health.warn(
       'Slow shell invocation (took ' .. vim.fn.printf('%.2f', elapsed_time) .. ' seconds).'
     )
   end
@@ -176,7 +176,7 @@ end
 
 -- Load the remote plugin manifest file and check for unregistered plugins
 local function check_rplugin_manifest()
-  health.report_start('Remote Plugins')
+  health.start('Remote Plugins')
 
   local existing_rplugins = {}
   for _, item in ipairs(vim.fn['remote#host#PluginsForHost']('python')) do
@@ -218,7 +218,7 @@ local function check_rplugin_manifest()
             require_update = true
           end
 
-          health.report_warn(msg)
+          health.warn(msg)
         end
 
         break
@@ -231,9 +231,9 @@ local function check_rplugin_manifest()
   end
 
   if require_update then
-    health.report_warn('Out of date', { 'Run `:UpdateRemotePlugins`' })
+    health.warn('Out of date', { 'Run `:UpdateRemotePlugins`' })
   else
-    health.report_ok('Up to date')
+    health.ok('Up to date')
   end
 end
 
@@ -247,21 +247,21 @@ local function check_tmux()
     local out = vim.fn.system(vim.fn.split(cmd))
     local val = vim.fn.substitute(out, [[\v(\s|\r|\n)]], '', 'g')
     if shell_error() then
-      health.report_error('command failed: ' .. cmd .. '\n' .. out)
+      health.error('command failed: ' .. cmd .. '\n' .. out)
       return 'error'
     elseif empty(val) then
       cmd = 'tmux show-option -qvgs ' .. option -- try session scope
       out = vim.fn.system(vim.fn.split(cmd))
       val = vim.fn.substitute(out, [[\v(\s|\r|\n)]], '', 'g')
       if shell_error() then
-        health.report_error('command failed: ' .. cmd .. '\n' .. out)
+        health.error('command failed: ' .. cmd .. '\n' .. out)
         return 'error'
       end
     end
     return val
   end
 
-  health.report_start('tmux')
+  health.start('tmux')
 
   -- check escape-time
   local suggestions =
@@ -269,14 +269,11 @@ local function check_tmux()
   local tmux_esc_time = get_tmux_option('escape-time')
   if tmux_esc_time ~= 'error' then
     if empty(tmux_esc_time) then
-      health.report_error('`escape-time` is not set', suggestions)
+      health.error('`escape-time` is not set', suggestions)
     elseif tonumber(tmux_esc_time) > 300 then
-      health.report_error(
-        '`escape-time` (' .. tmux_esc_time .. ') is higher than 300ms',
-        suggestions
-      )
+      health.error('`escape-time` (' .. tmux_esc_time .. ') is higher than 300ms', suggestions)
     else
-      health.report_ok('escape-time: ' .. tmux_esc_time)
+      health.ok('escape-time: ' .. tmux_esc_time)
     end
   end
 
@@ -284,17 +281,17 @@ local function check_tmux()
   local tmux_focus_events = get_tmux_option('focus-events')
   if tmux_focus_events ~= 'error' then
     if empty(tmux_focus_events) or tmux_focus_events ~= 'on' then
-      health.report_warn(
+      health.warn(
         "`focus-events` is not enabled. |'autoread'| may not work.",
         { '(tmux 1.9+ only) Set `focus-events` in ~/.tmux.conf:\nset-option -g focus-events on' }
       )
     else
-      health.report_ok('focus-events: ' .. tmux_focus_events)
+      health.ok('focus-events: ' .. tmux_focus_events)
     end
   end
 
   -- check default-terminal and $TERM
-  health.report_info('$TERM: ' .. vim.env.TERM)
+  health.info('$TERM: ' .. vim.env.TERM)
   local cmd = 'tmux show-option -qvg default-terminal'
   local out = vim.fn.system(vim.fn.split(cmd))
   local tmux_default_term = vim.fn.substitute(out, [[\v(\s|\r|\n)]], '', 'g')
@@ -305,15 +302,15 @@ local function check_tmux()
   end
 
   if shell_error() then
-    health.report_error('command failed: ' .. cmd .. '\n' .. out)
+    health.error('command failed: ' .. cmd .. '\n' .. out)
   elseif tmux_default_term ~= vim.env.TERM then
-    health.report_info('default-terminal: ' .. tmux_default_term)
-    health.report_error(
+    health.info('default-terminal: ' .. tmux_default_term)
+    health.error(
       '$TERM differs from the tmux `default-terminal` setting. Colors might look wrong.',
       { '$TERM may have been set by some rc (.bashrc, .zshrc, ...).' }
     )
   elseif not vim.regex([[\v(tmux-256color|screen-256color)]]):match_str(vim.env.TERM) then
-    health.report_error(
+    health.error(
       '$TERM should be "screen-256color" or "tmux-256color" in tmux. Colors might look wrong.',
       {
         'Set default-terminal in ~/.tmux.conf:\nset-option -g default-terminal "screen-256color"',
@@ -333,7 +330,7 @@ local function check_tmux()
       has_rgb = info:find(' Tc: (flag) true', 1, true) or info:find(' RGB: (flag) true', 1, true)
     end
     if not has_rgb then
-      health.report_warn(
+      health.warn(
         "Neither Tc nor RGB capability set. True colors are disabled. |'termguicolors'| won't work properly.",
         {
           "Put this in your ~/.tmux.conf and replace XXX by your $TERM outside of tmux:\nset-option -sa terminal-features ',XXX:RGB'",
@@ -349,7 +346,7 @@ local function check_terminal()
     return
   end
 
-  health.report_start('terminal')
+  health.start('terminal')
   local cmd = 'infocmp -L'
   local out = vim.fn.system(vim.fn.split(cmd))
   local kbs_entry = vim.fn.matchstr(out, 'key_backspace=[^,[:space:]]*')
@@ -367,16 +364,16 @@ local function check_terminal()
       )
     )
   then
-    health.report_error('command failed: ' .. cmd .. '\n' .. out)
+    health.error('command failed: ' .. cmd .. '\n' .. out)
   else
-    health.report_info(
+    health.info(
       vim.fn.printf(
         'key_backspace (kbs) terminfo entry: `%s`',
         (empty(kbs_entry) and '? (not found)' or kbs_entry)
       )
     )
 
-    health.report_info(
+    health.info(
       vim.fn.printf(
         'key_dc (kdch1) terminfo entry: `%s`',
         (empty(kbs_entry) and '? (not found)' or kdch1_entry)
@@ -392,7 +389,7 @@ local function check_terminal()
     'SSH_TTY',
   }) do
     if vim.env[env_var] then
-      health.report_info(vim.fn.printf('$%s="%s"', env_var, vim.env[env_var]))
+      health.info(vim.fn.printf('$%s="%s"', env_var, vim.env[env_var]))
     end
   end
 end
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index de0729ab6b..1c882de222 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -1,10 +1,10 @@
 local M = {}
 
-local start = vim.health.report_start
-local ok = vim.health.report_ok
-local info = vim.health.report_info
-local warn = vim.health.report_warn
-local error = vim.health.report_error
+local start = vim.health.start
+local ok = vim.health.ok
+local info = vim.health.info
+local warn = vim.health.warn
+local error = vim.health.error
 local iswin = vim.loop.os_uname().sysname == 'Windows_NT'
 
 local shell_error_code = 0
diff --git a/runtime/lua/vim/health.lua b/runtime/lua/vim/health.lua
index 044880e076..04f8f9695b 100644
--- a/runtime/lua/vim/health.lua
+++ b/runtime/lua/vim/health.lua
@@ -1,23 +1,196 @@
 local M = {}
 
-function M.report_start(msg)
-  vim.fn['health#report_start'](msg)
+local s_output = {}
+
+-- From a path return a list [{name}, {func}, {type}] representing a healthcheck
+local function filepath_to_healthcheck(path)
+  path = vim.fs.normalize(path)
+  local name
+  local func
+  local filetype
+  if path:find('vim$') then
+    name = vim.fs.basename(path):gsub('%.vim$', '')
+    func = 'health#' .. name .. '#check'
+    filetype = 'v'
+  else
+    local subpath = path:gsub('.*lua/', '')
+    if vim.fs.basename(subpath) == 'health.lua' then
+      -- */health.lua
+      name = vim.fs.dirname(subpath)
+    else
+      -- */health/init.lua
+      name = vim.fs.dirname(vim.fs.dirname(subpath))
+    end
+    name = name:gsub('/', '.')
+
+    func = 'require("' .. name .. '.health").check()'
+    filetype = 'l'
+  end
+  return { name, func, filetype }
 end
 
-function M.report_info(msg)
-  vim.fn['health#report_info'](msg)
+-- Returns { {name, func, type}, ... } representing healthchecks
+local function get_healthcheck_list(plugin_names)
+  local healthchecks = {}
+  plugin_names = vim.split(plugin_names, ' ')
+  for _, p in pairs(plugin_names) do
+    -- support vim/lsp/health{/init/}.lua as :checkhealth vim.lsp
+
+    p = p:gsub('%.', '/')
+    p = p:gsub('*', '**')
+
+    local paths = vim.api.nvim_get_runtime_file('autoload/health/' .. p .. '.vim', true)
+    vim.list_extend(
+      paths,
+      vim.api.nvim_get_runtime_file('lua/**/' .. p .. '/health/init.lua', true)
+    )
+    vim.list_extend(paths, vim.api.nvim_get_runtime_file('lua/**/' .. p .. '/health.lua', true))
+
+    if vim.tbl_count(paths) == 0 then
+      healthchecks[#healthchecks + 1] = { p, '', '' } -- healthcheck not found
+    else
+      local unique_paths = {}
+      for _, v in pairs(paths) do
+        unique_paths[v] = true
+      end
+      paths = {}
+      for k, _ in pairs(unique_paths) do
+        paths[#paths + 1] = k
+      end
+
+      for _, v in ipairs(paths) do
+        healthchecks[#healthchecks + 1] = filepath_to_healthcheck(v)
+      end
+    end
+  end
+  return healthchecks
 end
 
-function M.report_ok(msg)
-  vim.fn['health#report_ok'](msg)
+-- Returns {name: [func, type], ..} representing healthchecks
+local function get_healthcheck(plugin_names)
+  local health_list = get_healthcheck_list(plugin_names)
+  local healthchecks = {}
+  for _, c in pairs(health_list) do
+    if c[1] ~= 'vim' then
+      healthchecks[c[1]] = { c[2], c[3] }
+    end
+  end
+
+  return healthchecks
 end
 
-function M.report_warn(msg, ...)
-  vim.fn['health#report_warn'](msg, ...)
+-- Indents lines *except* line 1 of a string if it contains newlines.
+local function indent_after_line1(s, columns)
+  local lines = vim.split(s, '\n')
+  local indent = string.rep(' ', columns)
+  for i = 2, #lines do
+    lines[i] = indent .. lines[i]
+  end
+  return table.concat(lines, '\n')
+end
+
+-- Changes ':h clipboard' to ':help |clipboard|'.
+local function help_to_link(s)
+  return vim.fn.substitute(s, [[\v:h%[elp] ([^|][^"\r\n ]+)]], [[:help |\1|]], [[g]])
+end
+
+-- Format a message for a specific report item.
+-- Variable args: Optional advice (string or list)
+local function format_report_message(status, msg, ...)
+  local output = '- ' .. status
+  if status ~= '' then
+    output = output .. ' '
+  end
+
+  output = output .. indent_after_line1(msg, 2)
+
+  local varargs = ...
+
+  -- Optional parameters
+  if varargs then
+    if type(varargs) == 'string' then
+      varargs = { varargs }
+    end
+
+    output = output .. '\n  - ADVICE:'
+
+    -- Report each suggestion
+    for _, v in ipairs(varargs) do
+      if v then
+        output = output .. '\n    - ' .. indent_after_line1(v, 6)
+      end
+    end
+  end
+
+  return help_to_link(output)
+end
+
+local function collect_output(output)
+  vim.list_extend(s_output, vim.split(output, '\n'))
+end
+
+-- Starts a new report.
+function M.start(name)
+  local input = string.format('\n%s ~', name)
+  collect_output(input)
+end
+
+-- Reports a message in the current section.
+function M.info(msg)
+  local input = format_report_message('', msg)
+  collect_output(input)
+end
+
+-- Reports a successful healthcheck.
+function M.ok(msg)
+  local input = format_report_message('OK', msg)
+  collect_output(input)
+end
+
+-- Reports a health warning.
+-- ...: Optional advice (string or table)
+function M.warn(msg, ...)
+  local input = format_report_message('WARNING', msg, ...)
+  collect_output(input)
 end
 
+-- Reports a failed healthcheck.
+-- ...: Optional advice (string or table)
+function M.error(msg, ...)
+  local input = format_report_message('ERROR', msg, ...)
+  collect_output(input)
+end
+
+local function deprecate(type)
+  local before = string.format('vim.health.report_%s()', type)
+  local after = string.format('vim.health.%s()', type)
+  local message = vim.deprecate(before, after, '0.11')
+  if message then
+    M.warn(message)
+  end
+  vim.cmd.redraw()
+  vim.print('Running healthchecks...')
+end
+
+function M.report_start(name)
+  deprecate('start')
+  M.start(name)
+end
+function M.report_info(msg)
+  deprecate('info')
+  M.info(msg)
+end
+function M.report_ok(msg)
+  deprecate('ok')
+  M.ok(msg)
+end
+function M.report_warn(msg, ...)
+  deprecate('warn')
+  M.warn(msg, ...)
+end
 function M.report_error(msg, ...)
-  vim.fn['health#report_error'](msg, ...)
+  deprecate('error')
+  M.error(msg, ...)
 end
 
 local path2name = function(path)
@@ -59,4 +232,77 @@ M._complete = function()
   return vim.tbl_keys(unique)
 end
 
+-- Runs the specified healthchecks.
+-- Runs all discovered healthchecks if plugin_names is empty.
+function M._check(plugin_names)
+  local healthchecks = plugin_names == '' and get_healthcheck('*') or get_healthcheck(plugin_names)
+
+  -- Create buffer and open in a tab, unless this is the default buffer when Nvim starts.
+  local emptybuf = vim.fn.bufnr('$') == 1 and vim.fn.getline(1) == '' and 1 == vim.fn.line('$')
+  local mod = emptybuf and 'buffer' or 'tab sbuffer'
+  local bufnr = vim.api.nvim_create_buf(true, true)
+  vim.cmd(mod .. ' ' .. bufnr)
+
+  if vim.fn.bufexists('health://') == 1 then
+    vim.cmd.bwipe('health://')
+  end
+  vim.cmd.file('health://')
+  vim.cmd.setfiletype('checkhealth')
+
+  if healthchecks == nil or next(healthchecks) == nil then
+    vim.fn.setline(1, 'ERROR: No healthchecks found.')
+    return
+  end
+  vim.cmd.redraw()
+  vim.print('Running healthchecks...')
+
+  for name, value in vim.spairs(healthchecks) do
+    local func = value[1]
+    local type = value[2]
+    s_output = {}
+
+    if func == '' then
+      s_output = {}
+      M.error('No healthcheck found for "' .. name .. '" plugin.')
+    end
+    if type == 'v' then
+      vim.cmd.call(func, {})
+    else
+      local f = assert(loadstring(func))
+      local ok, output = pcall(f)
+      if not ok then
+        M.error(
+          string.format('Failed to run healthcheck for "%s" plugin. Exception:\n%s\n', name, output)
+        )
+      end
+    end
+    -- in the event the healthcheck doesn't return anything
+    -- (the plugin author should avoid this possibility)
+    if next(s_output) == nil then
+      s_output = {}
+      M.error('The healthcheck report for "' .. name .. '" plugin is empty.')
+    end
+    local header = { string.rep('=', 78), name .. ': ' .. func, '' }
+    -- remove empty line after header from report_start
+    if s_output[1] == '' then
+      local tmp = {}
+      for i = 2, #s_output do
+        tmp[#tmp + 1] = s_output[i]
+      end
+      s_output = {}
+      for _, v in ipairs(tmp) do
+        s_output[#s_output + 1] = v
+      end
+    end
+    s_output[#s_output + 1] = ''
+    s_output = vim.list_extend(header, s_output)
+    vim.fn.append('$', s_output)
+    vim.cmd.redraw()
+  end
+
+  -- Clear the 'Running healthchecks...' message.
+  vim.cmd.redraw()
+  vim.print('')
+end
+
 return M
diff --git a/runtime/lua/vim/lsp/health.lua b/runtime/lua/vim/lsp/health.lua
index 987707e661..6ca468393e 100644
--- a/runtime/lua/vim/lsp/health.lua
+++ b/runtime/lua/vim/lsp/health.lua
@@ -2,8 +2,8 @@ local M = {}
 
 --- Performs a healthcheck for LSP
 function M.check()
-  local report_info = vim.health.report_info
-  local report_warn = vim.health.report_warn
+  local report_info = vim.health.info
+  local report_warn = vim.health.warn
 
   local log = require('vim.lsp.log')
   local current_log_level = log.get_level()
@@ -29,7 +29,7 @@ function M.check()
   report_fn(string.format('Log size: %d KB', log_size / 1000))
 
   local clients = vim.lsp.get_active_clients()
-  vim.health.report_start('vim.lsp: Active Clients')
+  vim.health.start('vim.lsp: Active Clients')
   if next(clients) then
     for _, client in pairs(clients) do
       report_info(
diff --git a/runtime/lua/vim/treesitter/health.lua b/runtime/lua/vim/treesitter/health.lua
index dabf2cdf6c..ed1161e97f 100644
--- a/runtime/lua/vim/treesitter/health.lua
+++ b/runtime/lua/vim/treesitter/health.lua
@@ -6,14 +6,14 @@ local health = require('vim.health')
 function M.check()
   local parsers = vim.api.nvim_get_runtime_file('parser/*', true)
 
-  health.report_info(string.format('Nvim runtime ABI version: %d', ts.language_version))
+  health.info(string.format('Nvim runtime ABI version: %d', ts.language_version))
 
   for _, parser in pairs(parsers) do
     local parsername = vim.fn.fnamemodify(parser, ':t:r')
     local is_loadable, err_or_nil = pcall(ts.language.add, parsername)
 
     if not is_loadable then
-      health.report_error(
+      health.error(
         string.format(
           'Parser "%s" failed to load (path: %s): %s',
           parsername,
@@ -23,7 +23,7 @@ function M.check()
       )
     else
       local lang = ts.language.inspect(parsername)
-      health.report_ok(
+      health.ok(
         string.format('Parser: %-10s ABI: %d, path: %s', parsername, lang._abi_version, parser)
       )
     end
-- 
cgit 


From f4d3e279e861dc37dd047c81a0807767a74d251b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Apr 2023 09:01:33 +0800
Subject: vim-patch:8.2.2977: crash when using a null function reference

Problem:    Crash when using a null function reference. (Naohiro Ono)
Solution:   Check for an invalid function name. (closes vim/vim#8367)

https://github.com/vim/vim/commit/22db0d549f64aa3d8a6e366b70eb8d7e66933b82

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/eval.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 1ff6e3c360..ccb615602f 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -139,7 +139,7 @@ You will not get an error if you try to change the type of a variable.
 
 
 1.2 Function references ~
-							*Funcref* *E695* *E718*
+					*Funcref* *E695* *E718* *E1192*
 A Funcref variable is obtained with the |function()| function, the |funcref()|
 function or created with the lambda expression |expr-lambda|.  It can be used
 in an expression in the place of a function name, before the parenthesis
-- 
cgit 


From 68ca16c376bd8786ffc0c7ce7619b9a0ce5657e8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Apr 2023 08:54:07 +0800
Subject: vim-patch:8.2.3783: confusing error for using a variable as a
 function

Problem:    Confusing error for using a variable as a function.
Solution:   If a function is not found but there is a variable, give a more
            useful error. (issue vim/vim#9310)

https://github.com/vim/vim/commit/2ef9156b4284e4a52613c36e3d4667245273a28d

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/eval.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index ccb615602f..f80ca5346c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1236,7 +1236,7 @@ Note that the dot is also used for String concatenation.  To avoid confusion
 always put spaces around the dot for String concatenation.
 
 
-expr8(expr1, ...)	|Funcref| function call
+expr8(expr1, ...)	|Funcref| function call		*E1085*
 
 When expr8 is a |Funcref| type variable, invoke the function it refers to.
 
-- 
cgit 


From b75634e55ee4cdfee7917b29f39e3ca1307cb059 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Apr 2023 07:50:18 +0800
Subject: vim-patch:9.0.0370: cleaning up afterwards can make a function messy

Problem:    Cleaning up afterwards can make a function messy.
Solution:   Add the :defer command.

https://github.com/vim/vim/commit/1d84f7608f1e41dad03b8cc7925895437775f7c0

Omit EX_EXPR_ARG: Vim9 script only.
Make :def throw E319 to avoid confusing behavior.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/userfunc.txt | 59 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/userfunc.txt b/runtime/doc/userfunc.txt
index ce6f2fc2e9..2c72f3d584 100644
--- a/runtime/doc/userfunc.txt
+++ b/runtime/doc/userfunc.txt
@@ -350,10 +350,67 @@ A function can also be called as part of evaluating an expression or when it
 is used as a method: >
 	let x = GetList()
 	let y = GetList()->Filter()
+<
+==============================================================================
 
+3. Cleaning up in a function ~
+							*:defer*
+:defer {func}({args})	Call {func} when the current function is done.
+			{args} are evaluated here.
+
+Quite often a command in a function has a global effect, which must be undone
+when the function finishes.  Handling this in all kinds of situations can be a
+hassle.  Especially when an unexpected error is encountered.  This can be done
+with `try` / `finally` blocks, but this gets complicated when there is more
+than one.
+
+A much simpler solution is using `defer`.  It schedules a function call when
+the function is returning, no matter if there is an error.  Example: >
+	func Filter(text) abort
+	  call writefile(a:text, 'Tempfile')
+	  call system('filter < Tempfile > Outfile')
+	  call Handle('Outfile')
+	  call delete('Tempfile')
+	  call delete('Outfile')
+	endfunc
+
+Here 'Tempfile' and 'Outfile' will not be deleted if something causes the
+function to abort.  `:defer` can be used to avoid that: >
+	func Filter(text) abort
+	  call writefile(a:text, 'Tempfile')
+	  defer delete('Tempfile')
+	  defer delete('Outfile')
+	  call system('filter < Tempfile > Outfile')
+	  call Handle('Outfile')
+	endfunc
+
+Note that deleting "Outfile" is scheduled before calling `system()`, since it
+can be created even when `system()` fails.
+
+The deferred functions are called in reverse order, the last one added is
+executed first.  A useless example: >
+	func Useless() abort
+	  for s in range(3)
+	    defer execute('echomsg "number ' .. s .. '"')
+	  endfor
+	endfunc
+
+Now `:messages` shows:
+	number 2
+	number 1
+	number 0
+
+Any return value of the deferred function is discarded.  The function cannot
+be followed by anything, such as "->func" or ".member".  Currently `:defer
+GetArg()->TheFunc()` does not work, it may work in a later version.
+
+Errors are reported but do not cause aborting execution of deferred functions.
+
+No range is accepted.
 
 ==============================================================================
-3. Automatically loading functions ~
+
+4. Automatically loading functions ~
 							*autoload-functions*
 When using many or large functions, it's possible to automatically define them
 only when they are used.  There are two methods: with an autocommand and with
-- 
cgit 


From 0167649ce4071e60d985b65f3f9408ffb21cb58c Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Apr 2023 11:07:48 +0800
Subject: vim-patch:9.0.0379: cleaning up after writefile() is a hassle

Problem:    Cleaning up after writefile() is a hassle.
Solution:   Add the 'D' flag to defer deleting the written file.  Very useful
            in tests.

https://github.com/vim/vim/commit/806a273f3c84ecd475913d901890bb1929be9a0a

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index cb05718ab9..adb3164429 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -9507,31 +9507,43 @@ writefile({object}, {fname} [, {flags}])
 		When {object} is a |List| write it to file {fname}.  Each list
 		item is separated with a NL.  Each list item must be a String
 		or Number.
-		When {flags} contains "b" then binary mode is used: There will
-		not be a NL after the last list item.  An empty item at the
-		end does cause the last line in the file to end in a NL.
+		All NL characters are replaced with a NUL character.
+		Inserting CR characters needs to be done before passing {list}
+		to writefile().
 
 		When {object} is a |Blob| write the bytes to file {fname}
-		unmodified.
+		unmodified, also when binary mode is not specified.
 
-		When {flags} contains "a" then append mode is used, lines are
-		appended to the file: >
+		{flags} must be a String.  These characters are recognized:
+
+		'b'  Binary mode is used: There will not be a NL after the
+		     last list item.  An empty item at the end does cause the
+		     last line in the file to end in a NL.
+
+		'a'  Append mode is used, lines are appended to the file: >
 			:call writefile(["foo"], "event.log", "a")
 			:call writefile(["bar"], "event.log", "a")
 <
-		When {flags} contains "S" fsync() call is not used, with "s"
-		it is used, 'fsync' option applies by default. No fsync()
-		means that writefile() will finish faster, but writes may be
-		left in OS buffers and not yet written to disk. Such changes
-		will disappear if system crashes before OS does writing.
+		'D'  Delete the file when the current function ends.  This
+		     works like: >
+			:defer delete({fname})
+<		     Fails when not in a function.  Also see |:defer|.
+
+		's'  fsync() is called after writing the file.  This flushes
+		     the file to disk, if possible.  This takes more time but
+		     avoids losing the file if the system crashes.
+
+		'S'  fsync() is not called, even when 'fsync' is set.
+
+		     When {flags} does not contain "S" or "s" then fsync() is
+		     called if the 'fsync' option is set.
 
-		All NL characters are replaced with a NUL character.
-		Inserting CR characters needs to be done before passing {list}
-		to writefile().
 		An existing file is overwritten, if possible.
+
 		When the write fails -1 is returned, otherwise 0.  There is an
 		error message if the file can't be created or when writing
 		fails.
+
 		Also see |readfile()|.
 		To copy a file byte for byte: >
 			:let fl = readfile("foo", "b")
-- 
cgit 


From 335bef0c211dc962499814d248670ff17758a642 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Apr 2023 10:51:27 +0800
Subject: vim-patch:9.0.0390: cannot use a partial with :defer

Problem:    Cannot use a partial with :defer.
Solution:   Add the partial arguments before the other arguments.  Disallow
            using a dictionary.

https://github.com/vim/vim/commit/86d87256c4005c6215da5af2597fbf6f6304421f

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/userfunc.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/userfunc.txt b/runtime/doc/userfunc.txt
index 2c72f3d584..db0127df95 100644
--- a/runtime/doc/userfunc.txt
+++ b/runtime/doc/userfunc.txt
@@ -406,7 +406,8 @@ GetArg()->TheFunc()` does not work, it may work in a later version.
 
 Errors are reported but do not cause aborting execution of deferred functions.
 
-No range is accepted.
+No range is accepted.  The function can be a partial with extra arguments, but
+not with a dictionary. *E1300*
 
 ==============================================================================
 
-- 
cgit 


From f39b33ee491a4a8d4b08425e582dd0dd53617edf Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Apr 2023 11:46:17 +0800
Subject: vim-patch:9.0.0411: only created files can be cleaned up with one
 call
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    Only created files can be cleaned up with one call.
Solution:   Add flags to mkdir() to delete with a deferred function.
            Expand the writefile() name to a full path to handle changing
            directory.

https://github.com/vim/vim/commit/6f14da15ac900589f2f413d77898b9bff3b31ece

vim-patch:8.2.3742: dec mouse test fails without gnome terminfo entry

Problem:    Dec mouse test fails without gnome terminfo entry.
Solution:   Check if there is a gnome entry. Also fix 'acd' test on
            MS-Windows. (Dominique Pellé, closes vim/vim#9282)

https://github.com/vim/vim/commit/f589fd3e1047cdf90566b68aaf9a13389e54d26a

Cherry-pick test_autochdir.vim changes from patch 9.0.0313.
Cherry-pick test_autocmd.vim changes from patch 9.0.0323.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index adb3164429..15ccfd9b92 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5572,8 +5572,24 @@ mkdir({name} [, {flags} [, {prot}]])
 		When {flags} is present it must be a string.  An empty string
 		has no effect.
 
-		If {flags} is "p" then intermediate directories are created as
-		necessary.
+		If {flags} contains "p" then intermediate directories are
+		created as necessary.
+
+		If {flags} contains "D" then {name} is deleted at the end of
+		the current function, as with: >
+			defer delete({name}, 'd')
+<
+		If {flags} contains "R" then {name} is deleted recursively at
+		the end of the current function, as with: >
+			defer delete({name}, 'rf')
+<		Note that when {name} has more than one part and "p" is used
+		some directories may already exist.  Only the first one that
+		is created and what it contains is scheduled to be deleted.
+		E.g. when using: >
+			call mkdir('subdir/tmp/autoload', 'pR')
+<		and "subdir" already exists then "subdir/tmp" will be
+		scheduled for deletion, like with: >
+			defer delete('subdir/tmp', 'rf')
 
 		If {prot} is given it is used to set the protection bits of
 		the new directory.  The default is 0o755 (rwxr-xr-x: r/w for
-- 
cgit 


From d9e9dc3a06b78d3d1548757348788454f62ea3dc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 16 Apr 2023 10:59:04 +0200
Subject: vim-patch:9.0.1455: C++ 20 modules are not recognized (#23124)

Problem:    C++ 20 modules are not recognized.
Solution:   Add patterns to recognize C++ 20 modules as "cpp". (Ben Jackson,
            closes vim/vim#12261)

https://github.com/vim/vim/commit/732d69e1918b28ad0fe16eb9bc5a776c7958122b

Co-authored-by: Ben Jackson <puremourning@gmail.com>
---
 runtime/lua/vim/filetype.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 87439f9f0c..74ab7d8260 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -257,6 +257,10 @@ local extension = {
   tcc = 'cpp',
   hxx = 'cpp',
   hpp = 'cpp',
+  ccm = 'cpp',
+  cppm = 'cpp',
+  cxxm = 'cpp',
+  ['c++m'] = 'cpp',
   cpp = function(path, bufnr)
     return vim.g.cynlib_syntax_for_cpp and 'cynlib' or 'cpp'
   end,
-- 
cgit 


From 2f779b94e7fe0fb2fba00dd8e644c60605e83179 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Sun, 16 Apr 2023 17:50:32 +0800
Subject: fix(lua): inspect_pos respect bufnr when get syntax info (#23098)

---
 runtime/lua/vim/_inspector.lua | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua
index 05983d3f0d..2ebb7a7efd 100644
--- a/runtime/lua/vim/_inspector.lua
+++ b/runtime/lua/vim/_inspector.lua
@@ -70,15 +70,18 @@ function vim.inspect_pos(bufnr, row, col, filter)
   if filter.treesitter then
     for _, capture in pairs(vim.treesitter.get_captures_at_pos(bufnr, row, col)) do
       capture.hl_group = '@' .. capture.capture .. '.' .. capture.lang
-      table.insert(results.treesitter, resolve_hl(capture))
+      results.treesitter[#results.treesitter + 1] = resolve_hl(capture)
     end
   end
 
   -- syntax
-  if filter.syntax then
-    for _, i1 in ipairs(vim.fn.synstack(row + 1, col + 1)) do
-      table.insert(results.syntax, resolve_hl({ hl_group = vim.fn.synIDattr(i1, 'name') }))
-    end
+  if filter.syntax and vim.api.nvim_buf_is_valid(bufnr) then
+    vim.api.nvim_buf_call(bufnr, function()
+      for _, i1 in ipairs(vim.fn.synstack(row + 1, col + 1)) do
+        results.syntax[#results.syntax + 1] =
+          resolve_hl({ hl_group = vim.fn.synIDattr(i1, 'name') })
+      end
+    end)
   end
 
   -- namespace id -> name map
-- 
cgit 


From b0978fca6b82a061b345df43745c3ab860e02b58 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 16 Apr 2023 12:26:13 +0200
Subject: fix(checkhealth): fix crash due to incorrect argument type

---
 runtime/autoload/health.vim | 4 +++-
 runtime/lua/vim/health.lua  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/health.vim b/runtime/autoload/health.vim
index 1c414377f6..a7dbedab08 100644
--- a/runtime/autoload/health.vim
+++ b/runtime/autoload/health.vim
@@ -1,7 +1,9 @@
 function! s:deprecate(type) abort
   let deprecate = v:lua.vim.deprecate('health#report_' . a:type, 'vim.health.' . a:type, '0.11')
   redraw | echo 'Running healthchecks...'
-  call v:lua.vim.health.warn(deprecate)
+  if deprecate isnot v:null
+    call v:lua.vim.health.warn(deprecate)
+  endif
 endfunction
 
 function! health#report_start(name) abort
diff --git a/runtime/lua/vim/health.lua b/runtime/lua/vim/health.lua
index 04f8f9695b..ff338b95ea 100644
--- a/runtime/lua/vim/health.lua
+++ b/runtime/lua/vim/health.lua
@@ -266,7 +266,7 @@ function M._check(plugin_names)
       M.error('No healthcheck found for "' .. name .. '" plugin.')
     end
     if type == 'v' then
-      vim.cmd.call(func, {})
+      vim.fn.call(func, {})
     else
       local f = assert(loadstring(func))
       local ok, output = pcall(f)
-- 
cgit 


From 7f94a032e1cfb662f0c5df15e60b1ebdc3e15c4b Mon Sep 17 00:00:00 2001
From: JingMatrix <jingmatrix@gmail.com>
Date: Sun, 16 Apr 2023 12:39:48 +0200
Subject: fix(checkhealth): shell_error and cpanm module

shell_error is a function, the code missed parentheses

The actual module for perl module version is App::cpanminus::script, not
App::cpanminus::fatscript.
---
 runtime/lua/provider/health.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index 1c882de222..3a60e38fe5 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -850,7 +850,7 @@ local function perl()
 
   local latest_cpan_cmd = {
     perl_exec,
-    '-MApp::cpanminus::fatscript',
+    '-MApp::cpanminus::script',
     '-e',
     'my $app = App::cpanminus::script->new; $app->parse_options ("--info", "-q", "Neovim::Ext"); exit $app->doit',
   }
@@ -886,7 +886,7 @@ local function perl()
 
   local current_cpan_cmd = { perl_exec, '-W', '-MNeovim::Ext', '-e', 'print $Neovim::Ext::VERSION' }
   local current_cpan = system(current_cpan_cmd)
-  if shell_error then
+  if shell_error() then
     error(
       'Failed to run: ' .. table.concat(current_cpan_cmd, ' '),
       { 'Report this issue with the output of: ', table.concat(current_cpan_cmd, ' ') }
-- 
cgit 


From 79a69337682ca0e3fc4d0bb9f70d851f8114bc9a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 17 Apr 2023 15:32:49 +0800
Subject: vim-patch:partial:6f4754b9f725

Update runtime files

https://github.com/vim/vim/commit/6f4754b9f7253d7e4ba527064a24aff1acdb1e8f

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/diff.txt    |  9 +++++++--
 runtime/doc/options.txt | 21 ++++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index ead68c5f4f..2f174a404e 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -396,7 +396,9 @@ If the 'diffexpr' expression starts with s: or |<SID>|, then it is replaced
 with the script ID (|local-function|). Example: >
 		set diffexpr=s:MyDiffExpr()
 		set diffexpr=<SID>SomeDiffExpr()
-<
+Otherwise, the expression is evaluated in the context of the script where the
+option was set, thus script-local items are available.
+
 						*E810* *E97*
 Vim will do a test if the diff output looks alright.  If it doesn't, you will
 get an error message.  Possible causes:
@@ -452,5 +454,8 @@ If the 'patchexpr' expression starts with s: or |<SID>|, then it is replaced
 with the script ID (|local-function|). Example: >
 		set patchexpr=s:MyPatchExpr()
 		set patchexpr=<SID>SomePatchExpr()
-<
+Otherwise, the expression is evaluated in the context of the script where the
+option was set, thus script-local items are available.
+
+
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index dcaf37af20..7842394245 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2563,7 +2563,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 'foldexpr' 'fde'	string (default: "0")
 			local to window
 	The expression used for when 'foldmethod' is "expr".  It is evaluated
-	for each line to obtain its fold level.  See |fold-expr|.
+	for each line to obtain its fold level.  The context is set to the
+	script where 'foldexpr' was set, script-local items can be accessed.
+	See |fold-expr| for the usage.
 
 	The expression will be evaluated in the |sandbox| if set from a
 	modeline, see |sandbox-option|.
@@ -2679,7 +2681,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 'foldtext' 'fdt'	string (default: "foldtext()")
 			local to window
 	An expression which is used to specify the text displayed for a closed
-	fold.  See |fold-foldtext|.
+	fold.  The context is set to the script where 'foldexpr' was set,
+	script-local items can be accessed.  See |fold-foldtext| for the
+	usage.
 
 	The expression will be evaluated in the |sandbox| if set from a
 	modeline, see |sandbox-option|.
@@ -2720,7 +2724,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	the script ID (|local-function|). Example: >
 		set formatexpr=s:MyFormatExpr()
 		set formatexpr=<SID>SomeFormatExpr()
-<
+<	Otherwise, the expression is evaluated in the context of the script
+	where the option was set, thus script-local items are available.
+
 	The expression will be evaluated in the |sandbox| when set from a
 	modeline, see |sandbox-option|.  That stops the option from working,
 	since changing the buffer text is not allowed.
@@ -3334,7 +3340,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	the script ID (|local-function|). Example: >
 		setlocal includeexpr=s:MyIncludeExpr(v:fname)
 		setlocal includeexpr=<SID>SomeIncludeExpr(v:fname)
-<
+<	Otherwise, the expression is evaluated in the context of the script
+	where the option was set, thus script-local items are available.
+
 	The expression will be evaluated in the |sandbox| when set from a
 	modeline, see |sandbox-option|.
 	This option cannot be set in a modeline when 'modelineexpr' is off.
@@ -3389,11 +3397,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The expression is evaluated with |v:lnum| set to the line number for
 	which the indent is to be computed.  The cursor is also in this line
 	when the expression is evaluated (but it may be moved around).
+
 	If the expression starts with s: or |<SID>|, then it is replaced with
 	the script ID (|local-function|). Example: >
 		set indentexpr=s:MyIndentExpr()
 		set indentexpr=<SID>SomeIndentExpr()
-<
+<	Otherwise, the expression is evaluated in the context of the script
+	where the option was set, thus script-local items are available.
+
 	The expression must return the number of spaces worth of indent.  It
 	can return "-1" to keep the current indent (this means 'autoindent' is
 	used for the indent).
-- 
cgit 


From 07b60efd8058bb515998f50048b511d50f9671f8 Mon Sep 17 00:00:00 2001
From: Isak Samsten <isak@samsten.se>
Date: Mon, 17 Apr 2023 13:53:34 +0200
Subject: feat(diagnostic): specify diagnostic virtual text prefix as a
 function

- vim.diagnostic.config() now accepts a function for the virtual_text.prefix
  option, which allows for rendering e.g., diagnostic severities differently.
---
 runtime/doc/diagnostic.txt     |  7 +++++--
 runtime/doc/news.txt           |  3 +++
 runtime/lua/vim/diagnostic.lua | 18 ++++++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index 025a7dccfc..bfcc1c9092 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -392,8 +392,11 @@ config({opts}, {namespace})                          *vim.diagnostic.config()*
                          always show the diagnostic source.
                        • spacing: (number) Amount of empty spaces inserted at
                          the beginning of the virtual text.
-                       • prefix: (string) Prepend diagnostic message with
-                         prefix.
+                       • prefix: (string or function) prepend diagnostic
+                         message with prefix. If a function, it must have the
+                         signature (diagnostic) -> string, where {diagnostic}
+                         is of type |diagnostic-structure|. This can be used
+                         to render diagnostic symbols or error codes.
                        • suffix: (string or function) Append diagnostic
                          message with suffix. If a function, it must have the
                          signature (diagnostic) -> string, where {diagnostic}
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f196c3d445..dc541fcf37 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -48,6 +48,9 @@ The following changes to existing APIs or features add new behavior.
 
 • |vim.region()| can use a string accepted by |getpos()| as position.
 
+• vim.diagnostic.config() now accepts a function for the virtual_text.prefix
+  option, which allows for rendering e.g., diagnostic severities differently.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index d1b50304c7..0d1d01b391 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -600,7 +600,10 @@ end
 ---                                 means to always show the diagnostic source.
 ---                       * spacing: (number) Amount of empty spaces inserted at the beginning
 ---                                  of the virtual text.
----                       * prefix: (string) Prepend diagnostic message with prefix.
+---                       * prefix: (string or function) prepend diagnostic message with prefix.
+---                                 If a function, it must have the signature (diagnostic) -> string,
+---                                 where {diagnostic} is of type |diagnostic-structure|. This can be
+---                                 used to render diagnostic symbols or error codes.
 ---                       * suffix: (string or function) Append diagnostic message with suffix.
 ---                                 If a function, it must have the signature (diagnostic) ->
 ---                                 string, where {diagnostic} is of type |diagnostic-structure|.
@@ -1066,8 +1069,15 @@ function M._get_virt_text_chunks(line_diags, opts)
   -- Create a little more space between virtual text and contents
   local virt_texts = { { string.rep(' ', spacing) } }
 
-  for i = 1, #line_diags - 1 do
-    table.insert(virt_texts, { prefix, virtual_text_highlight_map[line_diags[i].severity] })
+  for i = 1, #line_diags do
+    local resolved_prefix = prefix
+    if type(prefix) == 'function' then
+      resolved_prefix = prefix(line_diags[i]) or ''
+    end
+    table.insert(
+      virt_texts,
+      { resolved_prefix, virtual_text_highlight_map[line_diags[i].severity] }
+    )
   end
   local last = line_diags[#line_diags]
 
@@ -1078,7 +1088,7 @@ function M._get_virt_text_chunks(line_diags, opts)
       suffix = suffix(last) or ''
     end
     table.insert(virt_texts, {
-      string.format('%s %s%s', prefix, last.message:gsub('\r', ''):gsub('\n', '  '), suffix),
+      string.format(' %s%s', last.message:gsub('\r', ''):gsub('\n', '  '), suffix),
       virtual_text_highlight_map[last.severity],
     })
 
-- 
cgit 


From 6cc76011ca28ff61f1c2f8de6d895d4c6d0a1ad8 Mon Sep 17 00:00:00 2001
From: Jon Huhn <nojnhuh@users.noreply.github.com>
Date: Mon, 17 Apr 2023 11:50:05 -0500
Subject: fix(watchfiles): skip Created events when poll starts (#23139)

---
 runtime/lua/vim/_watch.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
index dba1522ec8..dbffd726a2 100644
--- a/runtime/lua/vim/_watch.lua
+++ b/runtime/lua/vim/_watch.lua
@@ -88,6 +88,9 @@ local default_poll_interval_ms = 2000
 ---               be invoked recursively)
 ---     - children (table|nil)
 ---               A mapping of directory entry name to its recursive watches
+--      - started (boolean|nil)
+--                Whether or not the watcher has first been initialized. Used
+--                to prevent a flood of Created events on startup.
 local function poll_internal(path, opts, callback, watches)
   path = vim.fs.normalize(path)
   local interval = opts and opts.interval or default_poll_interval_ms
@@ -112,7 +115,9 @@ local function poll_internal(path, opts, callback, watches)
       end)
     )
     assert(not start_err, start_err)
-    callback(path, M.FileChangeType.Created)
+    if watches.started then
+      callback(path, M.FileChangeType.Created)
+    end
   end
 
   watches.cancel = function()
@@ -132,6 +137,7 @@ local function poll_internal(path, opts, callback, watches)
       if not watches.children[name] then
         watches.children[name] = {
           is_dir = ftype == 'directory',
+          started = watches.started,
         }
         poll_internal(filepath_join(path, name), opts, callback, watches.children[name])
       end
@@ -150,6 +156,8 @@ local function poll_internal(path, opts, callback, watches)
     watches.children = newchildren
   end
 
+  watches.started = true
+
   return watches.cancel
 end
 
-- 
cgit 


From ab1edecfb7c73c82c2d5886cb8e270b44aca7d01 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Mon, 17 Apr 2023 12:54:19 -0600
Subject: feat(lua): add vim.iter (#23029)

vim.iter wraps a table or iterator function into an `Iter` object with
methods such as `filter`, `map`, and `fold` which can be chained to
produce iterator pipelines that do not create new tables at each step.
---
 runtime/doc/lua.txt        | 511 +++++++++++++++++++++++++++
 runtime/doc/news.txt       |   3 +-
 runtime/lua/vim/iter.lua   | 836 +++++++++++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/shared.lua | 105 ++++++
 4 files changed, 1454 insertions(+), 1 deletion(-)
 create mode 100644 runtime/lua/vim/iter.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 6fdf3775f6..60067f1bc3 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1653,6 +1653,26 @@ endswith({s}, {suffix})                                       *vim.endswith()*
     Return: ~
         (boolean) `true` if `suffix` is a suffix of `s`
 
+filter({f}, {src}, {...})                                       *vim.filter()*
+    Filter a table or iterator.
+
+    This is a convenience function that performs: >lua
+
+     vim.iter(src):filter(f):totable()
+<
+
+    Parameters: ~
+      • {f}    function(...):bool Filter function. Accepts the current
+               iterator or table values as arguments and returns true if those
+               values should be kept in the final table
+      • {src}  table|function Table or iterator function to filter
+
+    Return: ~
+        (table)
+
+    See also: ~
+      • |Iter:filter()|
+
 gsplit({s}, {sep}, {opts})                                      *vim.gsplit()*
     Splits a string at each instance of a separator.
 
@@ -1698,6 +1718,64 @@ is_callable({f})                                           *vim.is_callable()*
     Return: ~
         (boolean) `true` if `f` is callable, else `false`
 
+iter({src}, {...})                                                *vim.iter()*
+    Create an Iter |lua-iter| object from a table or iterator.
+
+    The input value can be a table or a function iterator (see |luaref-in|).
+
+    This function wraps the input value into an interface which allows
+    chaining multiple pipeline stages in an efficient manner. Each pipeline
+    stage receives as input the output values from the prior stage. The values
+    used in the first stage of the pipeline depend on the type passed to this
+    function:
+
+    • List tables pass only the value of each element
+    • Non-list tables pass both the key and value of each element
+    • Function iterators pass all of the values returned by their respective
+      function
+
+    Examples: >lua
+
+     local it = vim.iter({ 1, 2, 3, 4, 5 })
+     it:map(function(v)
+       return v * 3
+     end)
+     it:rev()
+     it:skip(2)
+     it:totable()
+     -- { 9, 6, 3 }
+
+     vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
+       if i > 2 then return v end
+     end):totable()
+     -- { 3, 4, 5 }
+
+     local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
+     it:map(function(s) return tonumber(s) end)
+     for i, d in it:enumerate() do
+       print(string.format("Column %d is %d", i, d))
+     end
+     -- Column 1 is 1
+     -- Column 2 is 2
+     -- Column 3 is 3
+     -- Column 4 is 4
+     -- Column 5 is 5
+
+     vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
+       return k == 'z'
+     end)
+     -- true
+<
+
+    Parameters: ~
+      • {src}  table|function Table or iterator.
+
+    Return: ~
+        Iter |lua-iter|
+
+    See also: ~
+      • |lua-iter|
+
 list_contains({t}, {value})                              *vim.list_contains()*
     Checks if a list-like table (integer keys without gaps) contains `value`.
 
@@ -1740,6 +1818,26 @@ list_slice({list}, {start}, {finish})                       *vim.list_slice()*
     Return: ~
         (list) Copy of table sliced from start to finish (inclusive)
 
+map({f}, {src}, {...})                                             *vim.map()*
+    Map and filter a table or iterator.
+
+    This is a convenience function that performs: >lua
+
+     vim.iter(src):map(f):totable()
+<
+
+    Parameters: ~
+      • {f}    function(...):?any Map function. Accepts the current iterator
+               or table values as arguments and returns one or more new
+               values. Nil values are removed from the final table.
+      • {src}  table|function Table or iterator function to filter
+
+    Return: ~
+        (table)
+
+    See also: ~
+      • |Iter:map()|
+
 pesc({s})                                                         *vim.pesc()*
     Escapes magic chars in |lua-patterns|.
 
@@ -2001,6 +2099,20 @@ tbl_values({t})                                             *vim.tbl_values()*
     Return: ~
         (list) List of values
 
+totable({f}, {...})                                            *vim.totable()*
+    Collect an iterator into a table.
+
+    This is a convenience function that performs: >lua
+
+     vim.iter(f):totable()
+<
+
+    Parameters: ~
+      • {f}  (function) Iterator function
+
+    Return: ~
+        (table)
+
 trim({s})                                                         *vim.trim()*
     Trim whitespace (Lua pattern "%s") from both sides of a string.
 
@@ -2817,4 +2929,403 @@ range({spec})                                            *vim.version.range()*
     See also: ~
       • # https://github.com/npm/node-semver#ranges
 
+
+==============================================================================
+Lua module: iter                                                    *lua-iter*
+
+Iter:all({self}, {pred})                                          *Iter:all()*
+    Return true if all of the items in the iterator match the given predicate.
+
+    Parameters: ~
+      • {pred}  function(...):bool Predicate function. Takes all values
+                returned from the previous stage in the pipeline as arguments
+                and returns true if the predicate matches.
+
+Iter:any({self}, {pred})                                          *Iter:any()*
+    Return true if any of the items in the iterator match the given predicate.
+
+    Parameters: ~
+      • {pred}  function(...):bool Predicate function. Takes all values
+                returned from the previous stage in the pipeline as arguments
+                and returns true if the predicate matches.
+
+Iter:each({self}, {f})                                           *Iter:each()*
+    Call a function once for each item in the pipeline.
+
+    This is used for functions which have side effects. To modify the values
+    in the iterator, use |Iter:map()|.
+
+    This function drains the iterator.
+
+    Parameters: ~
+      • {f}  function(...) Function to execute for each item in the pipeline.
+             Takes all of the values returned by the previous stage in the
+             pipeline as arguments.
+
+Iter:enumerate({self})                                      *Iter:enumerate()*
+    Add an iterator stage that returns the current iterator count as well as
+    the iterator value.
+
+    For list tables, prefer >lua
+
+     vim.iter(ipairs(t))
+<
+
+    over
+
+    >lua
+
+     vim.iter(t):enumerate()
+<
+
+    as the former is faster.
+
+    Example: >lua
+
+     local it = vim.iter(vim.gsplit('abc', '')):enumerate()
+     it:next()
+     -- 1   'a'
+     it:next()
+     -- 2   'b'
+     it:next()
+     -- 3   'c'
+<
+
+    Return: ~
+        Iter
+
+Iter:filter({self}, {f})                                       *Iter:filter()*
+    Add a filter step to the iterator pipeline.
+
+    Example: >lua
+
+     local bufs = vim.iter(vim.api.nvim_list_bufs()):filter(vim.api.nvim_buf_is_loaded)
+<
+
+    Parameters: ~
+      • {f}  function(...):bool Takes all values returned from the previous
+             stage in the pipeline and returns false or nil if the current
+             iterator element should be removed.
+
+    Return: ~
+        Iter
+
+Iter:find({self}, {f})                                           *Iter:find()*
+    Find the first value in the iterator that satisfies the given predicate.
+
+    Advances the iterator. Returns nil and drains the iterator if no value is
+    found.
+
+    Examples: >lua
+
+     local it = vim.iter({ 3, 6, 9, 12 })
+     it:find(12)
+     -- 12
+
+     local it = vim.iter({ 3, 6, 9, 12 })
+     it:find(20)
+     -- nil
+
+     local it = vim.iter({ 3, 6, 9, 12 })
+     it:find(function(v) return v % 4 == 0 end)
+     -- 12
+<
+
+    Return: ~
+        any
+
+Iter:fold({self}, {init}, {f})                                   *Iter:fold()*
+    Fold an iterator or table into a single value.
+
+    Parameters: ~
+      • {init}  any Initial value of the accumulator.
+      • {f}     function(acc:any, ...):A Accumulation function.
+
+    Return: ~
+        any
+
+Iter:last({self})                                                *Iter:last()*
+    Return the last item in the iterator.
+
+    Drains the iterator.
+
+    Example: >lua
+
+     local it = vim.iter(vim.gsplit('abcdefg', ''))
+     it:last()
+     -- 'g'
+
+     local it = vim.iter({ 3, 6, 9, 12, 15 })
+     it:last()
+     -- 15
+<
+
+    Return: ~
+        any
+
+Iter:map({self}, {f})                                             *Iter:map()*
+    Add a map step to the iterator pipeline.
+
+    If the map function returns nil, the value is filtered from the iterator.
+
+    Example: >lua
+
+     local it = vim.iter({ 1, 2, 3, 4 }):map(function(v)
+       if v % 2 == 0 then
+         return v * 3
+       end
+     end)
+     it:totable()
+     -- { 6, 12 }
+<
+
+    Parameters: ~
+      • {f}  function(...):any Mapping function. Takes all values returned
+             from the previous stage in the pipeline as arguments and returns
+             one or more new values, which are used in the next pipeline
+             stage. Nil return values returned are filtered from the output.
+
+    Return: ~
+        Iter
+
+Iter:next({self})                                                *Iter:next()*
+    Return the next value from the iterator.
+
+    Example: >lua
+
+     local it = vim.iter(string.gmatch('1 2 3', 'd+')):map(tonumber)
+     it:next()
+     -- 1
+     it:next()
+     -- 2
+     it:next()
+     -- 3
+<
+
+    Return: ~
+        any
+
+Iter:nextback({self})                                        *Iter:nextback()*
+    Return the next value from the end of the iterator.
+
+    Only supported for iterators on list-like tables.
+
+    Example: >lua
+
+     local it = vim.iter({1, 2, 3, 4})
+     it:nextback()
+     -- 4
+     it:nextback()
+     -- 3
+<
+
+    Return: ~
+        any
+
+Iter:nth({self}, {n})                                             *Iter:nth()*
+    Return the nth value in the iterator.
+
+    This function advances the iterator.
+
+    Example: >lua
+
+     local it = vim.iter({ 3, 6, 9, 12 })
+     it:nth(2)
+     -- 6
+     it:nth(2)
+     -- 12
+<
+
+    Parameters: ~
+      • {n}  (number) The index of the value to return.
+
+    Return: ~
+        any
+
+Iter:nthback({self}, {n})                                     *Iter:nthback()*
+    Return the nth value from the end of the iterator.
+
+    This function advances the iterator.
+
+    Only supported for iterators on list-like tables.
+
+    Example: >lua
+
+     local it = vim.iter({ 3, 6, 9, 12 })
+     it:nthback(2)
+     -- 9
+     it:nthback(2)
+     -- 3
+<
+
+    Parameters: ~
+      • {n}  (number) The index of the value to return.
+
+    Return: ~
+        any
+
+Iter:peek({self})                                                *Iter:peek()*
+    Peek at the next value in the iterator without consuming it.
+
+    Only supported for iterators on list-like tables.
+
+    Example: >lua
+
+     local it = vim.iter({ 3, 6, 9, 12 })
+     it:peek()
+     -- 3
+     it:peek()
+     -- 3
+     it:next()
+     -- 3
+<
+
+    Return: ~
+        any
+
+Iter:peekback({self})                                        *Iter:peekback()*
+    Return the next value from the end of the iterator without consuming it.
+
+    Only supported for iterators on list-like tables.
+
+    Example: >lua
+
+     local it = vim.iter({1, 2, 3, 4})
+     it:peekback()
+     -- 4
+     it:peekback()
+     -- 4
+     it:nextback()
+     -- 4
+<
+
+    Return: ~
+        any
+
+Iter:rev({self})                                                  *Iter:rev()*
+    Reverse an iterator.
+
+    Only supported for iterators on list-like tables.
+
+    Example: >lua
+
+     local it = vim.iter({ 3, 6, 9, 12 }):rev()
+     it:totable()
+     -- { 12, 9, 6, 3 }
+<
+
+    Return: ~
+        Iter
+
+Iter:rfind({self}, {f})                                         *Iter:rfind()*
+    Find the first value in the iterator that satisfies the given predicate,
+    starting from the end.
+
+    Advances the iterator. Returns nil and drains the iterator if no value is
+    found.
+
+    Only supported for iterators on list-like tables.
+
+    Examples: >lua
+
+     local it = vim.iter({ 1, 2, 3, 2, 1 }):enumerate()
+     it:rfind(1)
+     -- 5   1
+     it:rfind(1)
+     -- 1   1
+<
+
+    Return: ~
+        any
+
+    See also: ~
+      • Iter.find
+
+Iter:skip({self}, {n})                                           *Iter:skip()*
+    Skip values in the iterator.
+
+    Example: >lua
+
+     local it = vim.iter({ 3, 6, 9, 12 }):skip(2)
+     it:next()
+     -- 9
+<
+
+    Parameters: ~
+      • {n}  (number) Number of values to skip.
+
+    Return: ~
+        Iter
+
+Iter:skipback({self}, {n})                                   *Iter:skipback()*
+    Skip values in the iterator starting from the end.
+
+    Only supported for iterators on list-like tables.
+
+    Example: >lua
+
+     local it = vim.iter({ 1, 2, 3, 4, 5 }):skipback(2)
+     it:next()
+     -- 1
+     it:nextback()
+     -- 3
+<
+
+    Parameters: ~
+      • {n}  (number) Number of values to skip.
+
+    Return: ~
+        Iter
+
+Iter:slice({self}, {first}, {last})                             *Iter:slice()*
+    Slice an iterator, changing its start and end positions.
+
+    This is equivalent to :skip(first - 1):skipback(len - last + 1)
+
+    Only supported for iterators on list-like tables.
+
+    Parameters: ~
+      • {first}  (number)
+      • {last}   (number)
+
+    Return: ~
+        Iter
+
+Iter:totable({self})                                          *Iter:totable()*
+    Collect the iterator into a table.
+
+    The resulting table depends on the initial source in the iterator
+    pipeline. List-like tables and function iterators will be collected into a
+    list-like table. If multiple values are returned from the final stage in
+    the iterator pipeline, each value will be included in a table. If a
+    map-like table was used as the initial source, then a map-like table is
+    returned.
+
+    Examples: >lua
+
+     vim.iter(string.gmatch('100 20 50', 'd+')):map(tonumber):totable()
+     -- { 100, 20, 50 }
+
+     vim.iter({ 1, 2, 3 }):map(function(v) return v, 2 * v end):totable()
+     -- { { 1, 2 }, { 2, 4 }, { 3, 6 } }
+
+     vim.iter({ a = 1, b = 2, c = 3 }):filter(function(k, v) return v % 2 ~= 0 end):totable()
+     -- { a = 1, c = 3 }
+<
+
+    Return: ~
+        (table)
+
+new({src}, {...})                                                      *new()*
+    Create a new Iter object from a table or iterator.
+
+    Parameters: ~
+      • {src}  table|function Table or iterator to drain values from
+
+    Return: ~
+        Iter
+
+next()                                                                *next()*
+    TODO: Documentation
+
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index dc541fcf37..bbf63a5ee0 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -35,7 +35,8 @@ ADDED FEATURES                                                     *news-added*
 
 The following new APIs or features were added.
 
-• ...
+• |vim.iter()| provides a generic iterator interface for tables and Lua
+iterators |luaref-in|.
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
new file mode 100644
index 0000000000..b73c03ba9a
--- /dev/null
+++ b/runtime/lua/vim/iter.lua
@@ -0,0 +1,836 @@
+--- Iterator implementation.
+
+---@class Iter
+local Iter = {}
+Iter.__index = Iter
+Iter.__call = function(self)
+  return self:next()
+end
+
+--- Special case implementations for iterators on list tables.
+---@class ListIter : Iter
+---@field _table table Underlying table data (table iterators only)
+---@field _head number Index to the front of a table iterator (table iterators only)
+---@field _tail number Index to the end of a table iterator (table iterators only)
+local ListIter = {}
+ListIter.__index = setmetatable(ListIter, Iter)
+ListIter.__call = function(self)
+  return self:next()
+end
+
+--- Special case implementations for iterators on non-list tables.
+---@class TableIter : Iter
+local TableIter = {}
+TableIter.__index = setmetatable(TableIter, Iter)
+TableIter.__call = function(self)
+  return self:next()
+end
+
+---@private
+local function unpack(t)
+  if type(t) == 'table' then
+    return _G.unpack(t)
+  end
+  return t
+end
+
+---@private
+local function pack(...)
+  if select('#', ...) > 1 then
+    return { ... }
+  end
+  return ...
+end
+
+--- Add a filter step to the iterator pipeline.
+---
+--- Example:
+--- <pre>lua
+--- local bufs = vim.iter(vim.api.nvim_list_bufs()):filter(vim.api.nvim_buf_is_loaded)
+--- </pre>
+---
+---@param f function(...):bool Takes all values returned from the previous stage in the pipeline and
+---                            returns false or nil if the current iterator element should be
+---                            removed.
+---@return Iter
+function Iter.filter(self, f)
+  ---@private
+  local function fn(...)
+    local result = nil
+    if select(1, ...) ~= nil then
+      if not f(...) then
+        return true, nil
+      else
+        result = pack(...)
+      end
+    end
+    return false, result
+  end
+
+  local next = self.next
+  self.next = function(this)
+    local cont, result
+    repeat
+      cont, result = fn(next(this))
+    until not cont
+    return unpack(result)
+  end
+  return self
+end
+
+---@private
+function ListIter.filter(self, f)
+  local inc = self._head < self._tail and 1 or -1
+  local n = self._head
+  for i = self._head, self._tail - inc, inc do
+    local v = self._table[i]
+    if f(unpack(v)) then
+      self._table[n] = v
+      n = n + inc
+    end
+  end
+  self._tail = n
+  return self
+end
+
+--- Add a map step to the iterator pipeline.
+---
+--- If the map function returns nil, the value is filtered from the iterator.
+---
+--- Example:
+--- <pre>lua
+--- local it = vim.iter({ 1, 2, 3, 4 }):map(function(v)
+---   if v % 2 == 0 then
+---     return v * 3
+---   end
+--- end)
+--- it:totable()
+--- -- { 6, 12 }
+--- </pre>
+---
+---@param f function(...):any Mapping function. Takes all values returned from the previous stage
+---                            in the pipeline as arguments and returns one or more new values,
+---                            which are used in the next pipeline stage. Nil return values returned
+---                            are filtered from the output.
+---@return Iter
+function Iter.map(self, f)
+  ---@private
+  local function fn(...)
+    local result = nil
+    if select(1, ...) ~= nil then
+      result = pack(f(...))
+      if result == nil then
+        return true, nil
+      end
+    end
+    return false, result
+  end
+
+  local next = self.next
+  self.next = function(this)
+    local cont, result
+    repeat
+      cont, result = fn(next(this))
+    until not cont
+    return unpack(result)
+  end
+  return self
+end
+
+---@private
+function ListIter.map(self, f)
+  local inc = self._head < self._tail and 1 or -1
+  local n = self._head
+  for i = self._head, self._tail - inc, inc do
+    local v = pack(f(unpack(self._table[i])))
+    if v ~= nil then
+      self._table[n] = v
+      n = n + inc
+    end
+  end
+  self._tail = n
+  return self
+end
+
+--- Call a function once for each item in the pipeline.
+---
+--- This is used for functions which have side effects. To modify the values in the iterator, use
+--- |Iter:map()|.
+---
+--- This function drains the iterator.
+---
+---@param f function(...) Function to execute for each item in the pipeline. Takes all of the
+---                        values returned by the previous stage in the pipeline as arguments.
+function Iter.each(self, f)
+  ---@private
+  local function fn(...)
+    if select(1, ...) ~= nil then
+      f(...)
+      return true
+    end
+  end
+  while fn(self:next()) do
+  end
+end
+
+---@private
+function ListIter.each(self, f)
+  local inc = self._head < self._tail and 1 or -1
+  for i = self._head, self._tail - inc, inc do
+    f(unpack(self._table[i]))
+  end
+  self._head = self._tail
+end
+
+--- Collect the iterator into a table.
+---
+--- The resulting table depends on the initial source in the iterator pipeline. List-like tables
+--- and function iterators will be collected into a list-like table. If multiple values are returned
+--- from the final stage in the iterator pipeline, each value will be included in a table. If a
+--- map-like table was used as the initial source, then a map-like table is returned.
+---
+--- Examples:
+--- <pre>lua
+--- vim.iter(string.gmatch('100 20 50', '%d+')):map(tonumber):totable()
+--- -- { 100, 20, 50 }
+---
+--- vim.iter({ 1, 2, 3 }):map(function(v) return v, 2 * v end):totable()
+--- -- { { 1, 2 }, { 2, 4 }, { 3, 6 } }
+---
+--- vim.iter({ a = 1, b = 2, c = 3 }):filter(function(k, v) return v % 2 ~= 0 end):totable()
+--- -- { a = 1, c = 3 }
+--- </pre>
+---
+---@return table
+function Iter.totable(self)
+  local t = {}
+
+  while true do
+    local args = pack(self:next())
+    if args == nil then
+      break
+    end
+    t[#t + 1] = args
+  end
+  return t
+end
+
+---@private
+function ListIter.totable(self)
+  if self._head == 1 and self._tail == #self._table + 1 and self.next == ListIter.next then
+    return self._table
+  end
+
+  return Iter.totable(self)
+end
+
+---@private
+function TableIter.totable(self)
+  local t = {}
+  for k, v in self do
+    t[k] = v
+  end
+  return t
+end
+
+--- Fold an iterator or table into a single value.
+---
+---@generic A
+---
+---@param init A Initial value of the accumulator.
+---@param f function(acc:A, ...):A Accumulation function.
+---@return A
+function Iter.fold(self, init, f)
+  local acc = init
+
+  --- Use a closure to handle var args returned from iterator
+  ---@private
+  local function fn(...)
+    if select(1, ...) ~= nil then
+      acc = f(acc, ...)
+      return true
+    end
+  end
+
+  while fn(self:next()) do
+  end
+  return acc
+end
+
+---@private
+function ListIter.fold(self, init, f)
+  local acc = init
+  local inc = self._head < self._tail and 1 or -1
+  for i = self._head, self._tail - inc, inc do
+    acc = f(acc, unpack(self._table[i]))
+  end
+  return acc
+end
+
+--- Return the next value from the iterator.
+---
+--- Example:
+--- <pre>lua
+---
+--- local it = vim.iter(string.gmatch('1 2 3', '%d+')):map(tonumber)
+--- it:next()
+--- -- 1
+--- it:next()
+--- -- 2
+--- it:next()
+--- -- 3
+---
+--- </pre>
+---
+---@return any
+function Iter.next(self) -- luacheck: no unused args
+  -- This function is provided by the source iterator in Iter.new. This definition exists only for
+  -- the docstring
+end
+
+---@private
+function ListIter.next(self)
+  if self._head ~= self._tail then
+    local v = self._table[self._head]
+    local inc = self._head < self._tail and 1 or -1
+    self._head = self._head + inc
+    return unpack(v)
+  end
+end
+
+--- Reverse an iterator.
+---
+--- Only supported for iterators on list-like tables.
+---
+--- Example:
+--- <pre>lua
+---
+--- local it = vim.iter({ 3, 6, 9, 12 }):rev()
+--- it:totable()
+--- -- { 12, 9, 6, 3 }
+---
+--- </pre>
+---
+---@return Iter
+function Iter.rev(self)
+  error('rev() requires a list-like table')
+  return self
+end
+
+---@private
+function ListIter.rev(self)
+  local inc = self._head < self._tail and 1 or -1
+  self._head, self._tail = self._tail - inc, self._head - inc
+  return self
+end
+
+--- Peek at the next value in the iterator without consuming it.
+---
+--- Only supported for iterators on list-like tables.
+---
+--- Example:
+--- <pre>lua
+---
+--- local it = vim.iter({ 3, 6, 9, 12 })
+--- it:peek()
+--- -- 3
+--- it:peek()
+--- -- 3
+--- it:next()
+--- -- 3
+---
+--- </pre>
+---
+---@return any
+function Iter.peek(self) -- luacheck: no unused args
+  error('peek() requires a list-like table')
+end
+
+---@private
+function ListIter.peek(self)
+  if self._head ~= self._tail then
+    return self._table[self._head]
+  end
+end
+
+--- Find the first value in the iterator that satisfies the given predicate.
+---
+--- Advances the iterator. Returns nil and drains the iterator if no value is found.
+---
+--- Examples:
+--- <pre>lua
+---
+--- local it = vim.iter({ 3, 6, 9, 12 })
+--- it:find(12)
+--- -- 12
+---
+--- local it = vim.iter({ 3, 6, 9, 12 })
+--- it:find(20)
+--- -- nil
+---
+--- local it = vim.iter({ 3, 6, 9, 12 })
+--- it:find(function(v) return v % 4 == 0 end)
+--- -- 12
+---
+--- </pre>
+---
+---@return any
+function Iter.find(self, f)
+  if type(f) ~= 'function' then
+    local val = f
+    f = function(v)
+      return v == val
+    end
+  end
+
+  local result = nil
+
+  --- Use a closure to handle var args returned from iterator
+  ---@private
+  local function fn(...)
+    if select(1, ...) ~= nil then
+      if f(...) then
+        result = pack(...)
+      else
+        return true
+      end
+    end
+  end
+
+  while fn(self:next()) do
+  end
+  return unpack(result)
+end
+
+--- Find the first value in the iterator that satisfies the given predicate, starting from the end.
+---
+--- Advances the iterator. Returns nil and drains the iterator if no value is found.
+---
+--- Only supported for iterators on list-like tables.
+---
+--- Examples:
+--- <pre>lua
+---
+--- local it = vim.iter({ 1, 2, 3, 2, 1 }):enumerate()
+--- it:rfind(1)
+--- -- 5	1
+--- it:rfind(1)
+--- -- 1	1
+---
+--- </pre>
+---
+---@see Iter.find
+---
+---@return any
+function Iter.rfind(self, f) -- luacheck: no unused args
+  error('rfind() requires a list-like table')
+end
+
+---@private
+function ListIter.rfind(self, f) -- luacheck: no unused args
+  if type(f) ~= 'function' then
+    local val = f
+    f = function(v)
+      return v == val
+    end
+  end
+
+  local inc = self._head < self._tail and 1 or -1
+  for i = self._tail - inc, self._head, -inc do
+    local v = self._table[i]
+    if f(unpack(v)) then
+      self._tail = i
+      return unpack(v)
+    end
+  end
+  self._head = self._tail
+end
+
+--- Return the next value from the end of the iterator.
+---
+--- Only supported for iterators on list-like tables.
+---
+--- Example:
+--- <pre>lua
+--- local it = vim.iter({1, 2, 3, 4})
+--- it:nextback()
+--- -- 4
+--- it:nextback()
+--- -- 3
+--- </pre>
+---
+---@return any
+function Iter.nextback(self) -- luacheck: no unused args
+  error('nextback() requires a list-like table')
+end
+
+function ListIter.nextback(self)
+  if self._head ~= self._tail then
+    local inc = self._head < self._tail and 1 or -1
+    self._tail = self._tail - inc
+    return self._table[self._tail]
+  end
+end
+
+--- Return the next value from the end of the iterator without consuming it.
+---
+--- Only supported for iterators on list-like tables.
+---
+--- Example:
+--- <pre>lua
+--- local it = vim.iter({1, 2, 3, 4})
+--- it:peekback()
+--- -- 4
+--- it:peekback()
+--- -- 4
+--- it:nextback()
+--- -- 4
+--- </pre>
+---
+---@return any
+function Iter.peekback(self) -- luacheck: no unused args
+  error('peekback() requires a list-like table')
+end
+
+function ListIter.peekback(self)
+  if self._head ~= self._tail then
+    local inc = self._head < self._tail and 1 or -1
+    return self._table[self._tail - inc]
+  end
+end
+
+--- Skip values in the iterator.
+---
+--- Example:
+--- <pre>lua
+---
+--- local it = vim.iter({ 3, 6, 9, 12 }):skip(2)
+--- it:next()
+--- -- 9
+---
+--- </pre>
+---
+---@param n number Number of values to skip.
+---@return Iter
+function Iter.skip(self, n)
+  for _ = 1, n do
+    local _ = self:next()
+  end
+  return self
+end
+
+---@private
+function ListIter.skip(self, n)
+  local inc = self._head < self._tail and n or -n
+  self._head = self._head + inc
+  if (inc > 0 and self._head > self._tail) or (inc < 0 and self._head < self._tail) then
+    self._head = self._tail
+  end
+  return self
+end
+
+--- Skip values in the iterator starting from the end.
+---
+--- Only supported for iterators on list-like tables.
+---
+--- Example:
+--- <pre>lua
+--- local it = vim.iter({ 1, 2, 3, 4, 5 }):skipback(2)
+--- it:next()
+--- -- 1
+--- it:nextback()
+--- -- 3
+--- </pre>
+---
+---@param n number Number of values to skip.
+---@return Iter
+function Iter.skipback(self, n) -- luacheck: no unused args
+  error('skipback() requires a list-like table')
+  return self
+end
+
+---@private
+function ListIter.skipback(self, n)
+  local inc = self._head < self._tail and n or -n
+  self._tail = self._tail - inc
+  if (inc > 0 and self._head > self._tail) or (inc < 0 and self._head < self._tail) then
+    self._head = self._tail
+  end
+  return self
+end
+
+--- Return the nth value in the iterator.
+---
+--- This function advances the iterator.
+---
+--- Example:
+--- <pre>lua
+---
+--- local it = vim.iter({ 3, 6, 9, 12 })
+--- it:nth(2)
+--- -- 6
+--- it:nth(2)
+--- -- 12
+---
+--- </pre>
+---
+---@param n number The index of the value to return.
+---@return any
+function Iter.nth(self, n)
+  if n > 0 then
+    return self:skip(n - 1):next()
+  end
+end
+
+--- Return the nth value from the end of the iterator.
+---
+--- This function advances the iterator.
+---
+--- Only supported for iterators on list-like tables.
+---
+--- Example:
+--- <pre>lua
+---
+--- local it = vim.iter({ 3, 6, 9, 12 })
+--- it:nthback(2)
+--- -- 9
+--- it:nthback(2)
+--- -- 3
+---
+--- </pre>
+---
+---@param n number The index of the value to return.
+---@return any
+function Iter.nthback(self, n)
+  if n > 0 then
+    return self:skipback(n - 1):nextback()
+  end
+end
+
+--- Slice an iterator, changing its start and end positions.
+---
+--- This is equivalent to :skip(first - 1):skipback(len - last + 1)
+---
+--- Only supported for iterators on list-like tables.
+---
+---@param first number
+---@param last number
+---@return Iter
+function Iter.slice(self, first, last) -- luacheck: no unused args
+  return self:skip(math.max(0, first - 1)):skipback(math.max(0, self._tail - last - 1))
+end
+
+--- Return true if any of the items in the iterator match the given predicate.
+---
+---@param pred function(...):bool Predicate function. Takes all values returned from the previous
+---                                stage in the pipeline as arguments and returns true if the
+---                                predicate matches.
+function Iter.any(self, pred)
+  local any = false
+
+  --- Use a closure to handle var args returned from iterator
+  ---@private
+  local function fn(...)
+    if select(1, ...) ~= nil then
+      if pred(...) then
+        any = true
+      else
+        return true
+      end
+    end
+  end
+
+  while fn(self:next()) do
+  end
+  return any
+end
+
+--- Return true if all of the items in the iterator match the given predicate.
+---
+---@param pred function(...):bool Predicate function. Takes all values returned from the previous
+---                                stage in the pipeline as arguments and returns true if the
+---                                predicate matches.
+function Iter.all(self, pred)
+  local all = true
+
+  ---@private
+  local function fn(...)
+    if select(1, ...) ~= nil then
+      if not pred(...) then
+        all = false
+      else
+        return true
+      end
+    end
+  end
+
+  while fn(self:next()) do
+  end
+  return all
+end
+
+--- Return the last item in the iterator.
+---
+--- Drains the iterator.
+---
+--- Example:
+--- <pre>lua
+---
+--- local it = vim.iter(vim.gsplit('abcdefg', ''))
+--- it:last()
+--- -- 'g'
+---
+--- local it = vim.iter({ 3, 6, 9, 12, 15 })
+--- it:last()
+--- -- 15
+---
+--- </pre>
+---
+---@return any
+function Iter.last(self)
+  local last = self:next()
+  local cur = self:next()
+  while cur do
+    last = cur
+    cur = self:next()
+  end
+  return last
+end
+
+---@private
+function ListIter.last(self)
+  local inc = self._head < self._tail and 1 or -1
+  local v = self._table[self._tail - inc]
+  self._head = self._tail
+  return v
+end
+
+--- Add an iterator stage that returns the current iterator count as well as the iterator value.
+---
+--- For list tables, prefer
+--- <pre>lua
+--- vim.iter(ipairs(t))
+--- </pre>
+---
+--- over
+---
+--- <pre>lua
+--- vim.iter(t):enumerate()
+--- </pre>
+---
+--- as the former is faster.
+---
+--- Example:
+--- <pre>lua
+---
+--- local it = vim.iter(vim.gsplit('abc', '')):enumerate()
+--- it:next()
+--- -- 1	'a'
+--- it:next()
+--- -- 2	'b'
+--- it:next()
+--- -- 3	'c'
+---
+--- </pre>
+---
+---@return Iter
+function Iter.enumerate(self)
+  local i = 0
+  return self:map(function(...)
+    i = i + 1
+    return i, ...
+  end)
+end
+
+---@private
+function ListIter.enumerate(self)
+  local inc = self._head < self._tail and 1 or -1
+  for i = self._head, self._tail - inc, inc do
+    local v = self._table[i]
+    self._table[i] = { i, v }
+  end
+  return self
+end
+
+--- Create a new Iter object from a table or iterator.
+---
+---@param src table|function Table or iterator to drain values from
+---@return Iter
+function Iter.new(src, ...)
+  local it = {}
+  if type(src) == 'table' then
+    local t = {}
+
+    -- Check if source table can be treated like a list (indices are consecutive integers
+    -- starting from 1)
+    local count = 0
+    for _ in pairs(src) do
+      count = count + 1
+      local v = src[count]
+      if v == nil then
+        return TableIter.new(src)
+      end
+      t[count] = v
+    end
+    return ListIter.new(t)
+  end
+
+  if type(src) == 'function' then
+    local s, var = ...
+
+    --- Use a closure to handle var args returned from iterator
+    ---@private
+    local function fn(...)
+      if select(1, ...) ~= nil then
+        var = select(1, ...)
+        return ...
+      end
+    end
+
+    function it.next()
+      return fn(src(s, var))
+    end
+
+    setmetatable(it, Iter)
+  else
+    error('src must be a table or function')
+  end
+  return it
+end
+
+--- Create a new ListIter
+---
+---@param t table List-like table. Caller guarantees that this table is a valid list.
+---@return Iter
+---@private
+function ListIter.new(t)
+  local it = {}
+  it._table = t
+  it._head = 1
+  it._tail = #t + 1
+  setmetatable(it, ListIter)
+  return it
+end
+
+--- Create a new TableIter
+---
+---@param t table Table to iterate over. For list-like tables, use ListIter.new instead.
+---@return Iter
+---@private
+function TableIter.new(t)
+  local it = {}
+
+  local index = nil
+  function it.next()
+    local k, v = next(t, index)
+    if k ~= nil then
+      index = k
+      return k, v
+    end
+  end
+
+  setmetatable(it, TableIter)
+  return it
+end
+
+return Iter
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index f700f4a6b3..1a96ef9bc4 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -884,4 +884,109 @@ function vim.defaulttable(create)
   })
 end
 
+--- Create an Iter |lua-iter| object from a table or iterator.
+---
+--- The input value can be a table  or a function iterator (see |luaref-in|).
+---
+--- This function wraps the input value into an interface which allows chaining
+--- multiple pipeline stages in an efficient manner. Each pipeline stage
+--- receives as input the output values from the prior stage. The values used in
+--- the first stage of the pipeline depend on the type passed to this function:
+---
+--- - List tables pass only the value of each element
+--- - Non-list tables pass both the key and value of each element
+--- - Function iterators pass all of the values returned by their respective
+---   function
+---
+--- Examples:
+--- <pre>lua
+--- local it = vim.iter({ 1, 2, 3, 4, 5 })
+--- it:map(function(v)
+---   return v * 3
+--- end)
+--- it:rev()
+--- it:skip(2)
+--- it:totable()
+--- -- { 9, 6, 3 }
+---
+--- vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
+---   if i > 2 then return v end
+--- end):totable()
+--- -- { 3, 4, 5 }
+---
+--- local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
+--- it:map(function(s) return tonumber(s) end)
+--- for i, d in it:enumerate() do
+---   print(string.format("Column %d is %d", i, d))
+--- end
+--- -- Column 1 is 1
+--- -- Column 2 is 2
+--- -- Column 3 is 3
+--- -- Column 4 is 4
+--- -- Column 5 is 5
+---
+--- vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
+---   return k == 'z'
+--- end)
+--- -- true
+--- </pre>
+---
+---@see |lua-iter|
+---
+---@param src table|function Table or iterator.
+---@return Iter @|lua-iter|
+function vim.iter(src, ...)
+  local Iter = require('vim.iter')
+  return Iter.new(src, ...)
+end
+
+--- Collect an iterator into a table.
+---
+--- This is a convenience function that performs:
+--- <pre>lua
+--- vim.iter(f):totable()
+--- </pre>
+---
+---@param f function Iterator function
+---@return table
+function vim.totable(f, ...)
+  return vim.iter(f, ...):totable()
+end
+
+--- Filter a table or iterator.
+---
+--- This is a convenience function that performs:
+--- <pre>lua
+--- vim.iter(src):filter(f):totable()
+--- </pre>
+---
+---@see |Iter:filter()|
+---
+---@param f function(...):bool Filter function. Accepts the current iterator or table values as
+---                            arguments and returns true if those values should be kept in the
+---                            final table
+---@param src table|function Table or iterator function to filter
+---@return table
+function vim.filter(f, src, ...)
+  return vim.iter(src, ...):filter(f):totable()
+end
+
+--- Map and filter a table or iterator.
+---
+--- This is a convenience function that performs:
+--- <pre>lua
+--- vim.iter(src):map(f):totable()
+--- </pre>
+---
+---@see |Iter:map()|
+---
+---@param f function(...):?any Map function. Accepts the current iterator or table values as
+---                            arguments and returns one or more new values. Nil values are removed
+---                            from the final table.
+---@param src table|function Table or iterator function to filter
+---@return table
+function vim.map(f, src, ...)
+  return vim.iter(src, ...):map(f):totable()
+end
+
 return vim
-- 
cgit 


From 85c61d67160133ba53762bc1e5e7bbd7a0c582c0 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 19 Apr 2023 10:06:34 +0800
Subject: vim-patch:9.0.1007: there is no way to get a list of swap file names

Problem:    There is no way to get a list of swap file names.
Solution:   Add the swapfilelist() function.  Use it in the test script to
            clean up.  Remove deleting individual swap files.

https://github.com/vim/vim/commit/c216a7a21a25a701b84b79abc1ba6ab0baa3a311

vim-patch:9.0.1005: a failed test may leave a swap file behind

Problem:    A failed test may leave a swap file behind.
Solution:   Delete the swap file to avoid another test to fail.  Use another
            file name.

https://github.com/vim/vim/commit/d0f8d39d20f8d42f7451f781f7be0bcd20e06741

Cherry-pick test_window_cmd.vim changes from patch 8.2.1593.
Remove FUNC_ATTR_UNUSED from eval functions as fptr is always unused.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 12 ++++++++++++
 runtime/doc/usr_41.txt  |  1 +
 2 files changed, 13 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 15ccfd9b92..9a8ce4d2ad 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -506,6 +506,7 @@ submatch({nr} [, {list}])	String or List
 					specific match in ":s" or substitute()
 substitute({expr}, {pat}, {sub}, {flags})
 				String	all {pat} in {expr} replaced with {sub}
+swapfilelist()			List	swap files found in 'directory'
 swapinfo({fname})		Dict	information about swap file {fname}
 swapname({buf})			String	swap file of buffer {buf}
 synID({lnum}, {col}, {trans})	Number	syntax ID at {lnum} and {col}
@@ -8417,6 +8418,17 @@ substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 		Can also be used as a |method|: >
 			GetString()->substitute(pat, sub, flags)
 
+swapfilelist()						*swapfilelist()*
+		Returns a list of swap file names, like what "vim -r" shows.
+		See the |-r| command argument.  The 'directory' option is used
+		for the directories to inspect.  If you only want to get a
+		list of swap files in the current directory then temporarily
+		set 'directory' to a dot: >
+			let save_dir = &directory
+			let &directory = '.'
+			let swapfiles = swapfilelist()
+			let &directory = save_dir
+
 swapinfo({fname})					*swapinfo()*
 		The result is a dictionary, which holds information about the
 		swapfile {fname}. The available fields are:
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 17a34b1236..89111535ca 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -883,6 +883,7 @@ Buffers, windows and the argument list:
 	getwininfo()		get a list with window information
 	getchangelist()		get a list of change list entries
 	getjumplist()		get a list of jump list entries
+	swapfilelist()		list of existing swap files in 'directory'
 	swapinfo()		information about a swap file
 	swapname()		get the swap file path of a buffer
 
-- 
cgit 


From 6d9f5b6bf0fc324b33ce01f74a6030c9271b1a01 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 19 Apr 2023 09:41:26 +0200
Subject: vim-patch:9.0.1464: strace filetype detection is expensive (#23175)

Problem:    Strace filetype detection is expensive.
Solution:   Match with a cheap pattern first. (Federico Mengozzi,
            closes vim/vim#12220)

https://github.com/vim/vim/commit/6e5a9f948221b52caaaf106079cb3430c4dd7c77

Co-authored-by: Federico Mengozzi <19249682+fedemengo@users.noreply.github.com>
---
 runtime/lua/vim/filetype/detect.lua | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index d1eabadc4a..94114ae7c3 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1550,8 +1550,15 @@ local patterns_text = {
   ['^SNNS pattern definition file'] = 'snnspat',
   ['^SNNS result file'] = 'snnsres',
   ['^%%.-[Vv]irata'] = { 'virata', { start_lnum = 1, end_lnum = 5 } },
-  ['[0-9:%.]* *execve%('] = 'strace',
-  ['^__libc_start_main'] = 'strace',
+  function(lines)
+    if
+      -- inaccurate fast match first, then use accurate slow match
+      (lines[1]:find('execve%(') and lines[1]:find('^[0-9:%.]* *execve%('))
+      or lines[1]:find('^__libc_start_main')
+    then
+      return 'strace'
+    end
+  end,
   -- VSE JCL
   ['^\\* $$ JOB\\>'] = { 'vsejcl', { vim_regex = true } },
   ['^// *JOB\\>'] = { 'vsejcl', { vim_regex = true } },
-- 
cgit 


From cff02e993d920fa4bf0b5dc8b8f12d979850f049 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 19 Apr 2023 10:19:33 +0200
Subject: vim-patch:9.0.1467: Jenkinsfiles are not recognized as groovy
 (#23195)

Problem:    Jenkinsfiles are not recognized as groovy.
Solution:   Add a pattern for Jenkinsfiles. (closes vim/vim#12236)

https://github.com/vim/vim/commit/142ffb024dd5123090c2fd02f55702e76520f1df

Co-authored-by: dundargoc <gocdundar@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 74ab7d8260..6cfe6e6c35 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1469,6 +1469,7 @@ local filename = {
   ['.gprc'] = 'gp',
   ['/.gnupg/gpg.conf'] = 'gpg',
   ['/.gnupg/options'] = 'gpg',
+  ['Jenkinsfile'] = 'groovy',
   ['/var/backups/gshadow.bak'] = 'group',
   ['/etc/gshadow'] = 'group',
   ['/etc/group-'] = 'group',
-- 
cgit 


From 1e60e8c0406f6b4b51c51abb5f53e25bd52fee5e Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Sat, 15 Apr 2023 12:23:45 +0200
Subject: refactor(build): use vendored versions of mpack and luabitop

---
 runtime/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index c6447721a0..5d69962aba 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -9,10 +9,14 @@ file(MAKE_DIRECTORY ${GENERATED_RUNTIME_DIR})
 file(MAKE_DIRECTORY ${GENERATED_RUNTIME_DIR}/syntax)
 file(MAKE_DIRECTORY ${GENERATED_RUNTIME_DIR}/syntax/vim)
 
+get_directory_property(LUA_GEN DIRECTORY ${PROJECT_SOURCE_DIR}/src/nvim DEFINITION LUA_GEN)
+get_directory_property(LUA_GEN_DEPS DIRECTORY ${PROJECT_SOURCE_DIR}/src/nvim DEFINITION LUA_GEN_DEPS)
+
 add_custom_command(OUTPUT ${GENERATED_SYN_VIM}
-  COMMAND ${LUA_PRG} ${SYN_VIM_GENERATOR}
+  COMMAND ${LUA_GEN} ${SYN_VIM_GENERATOR}
           ${PROJECT_SOURCE_DIR}/src/nvim ${GENERATED_SYN_VIM} ${FUNCS_DATA}
   DEPENDS
+    ${LUA_GEN_DEPS}
     ${SYN_VIM_GENERATOR}
     ${PROJECT_SOURCE_DIR}/src/nvim/ex_cmds.lua
     ${PROJECT_SOURCE_DIR}/src/nvim/auevents.lua
-- 
cgit 


From 6b96122453fda22dc44a581af1d536988c1adf41 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Wed, 19 Apr 2023 06:45:56 -0600
Subject: fix(iter): add tag to packed table

If pack() is called with a single value, it does not create a table; it
simply returns the value it is passed. When unpack is called with a
table argument, it interprets that table as a list of values that were
packed together into a table.

This causes a problem when the single value being packed is _itself_ a
table. pack() will not place it into another table, but unpack() sees
the table argument and tries to unpack it.

To fix this, we add a simple "tag" to packed table values so that
unpack() only attempts to unpack tables that have this tag. Other tables
are left alone. The tag is simply the length of the table.
---
 runtime/lua/vim/iter.lua | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index b73c03ba9a..fff7644b6a 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -28,16 +28,17 @@ end
 
 ---@private
 local function unpack(t)
-  if type(t) == 'table' then
-    return _G.unpack(t)
+  if type(t) == 'table' and t.__n ~= nil then
+    return _G.unpack(t, 1, t.__n)
   end
   return t
 end
 
 ---@private
 local function pack(...)
-  if select('#', ...) > 1 then
-    return { ... }
+  local n = select('#', ...)
+  if n > 1 then
+    return { __n = n, ... }
   end
   return ...
 end
@@ -210,6 +211,12 @@ function Iter.totable(self)
     if args == nil then
       break
     end
+
+    if type(args) == 'table' then
+      -- Removed packed table tag if it exists
+      args.__n = nil
+    end
+
     t[#t + 1] = args
   end
   return t
@@ -218,6 +225,14 @@ end
 ---@private
 function ListIter.totable(self)
   if self._head == 1 and self._tail == #self._table + 1 and self.next == ListIter.next then
+    -- Remove any packed table tags
+    for i = 1, #self._table do
+      local v = self._table[i]
+      if type(v) == 'table' then
+        v.__n = nil
+        self._table[i] = v
+      end
+    end
     return self._table
   end
 
@@ -747,7 +762,7 @@ function ListIter.enumerate(self)
   local inc = self._head < self._tail and 1 or -1
   for i = self._head, self._tail - inc, inc do
     local v = self._table[i]
-    self._table[i] = { i, v }
+    self._table[i] = pack(i, v)
   end
   return self
 end
-- 
cgit 


From 94894068794dbb99804cda689b6c37e70376c8ca Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Wed, 19 Apr 2023 07:05:04 -0600
Subject: fix(iter): remove special case totable for map-like tables

This was originally meant as a convenience but prevents possible
functionality. For example:

  -- Get the keys of the table with even values
  local t = { a = 1, b = 2, c = 3, d = 4 }
  vim.iter(t):map(function(k, v)
    if v % 2 == 0 then return k end
  end):totable()

The example above would not work, because the map() function returns
only a single value, and cannot be converted back into a table (there
are many such examples like this).

Instead, to convert an iterator into a map-like table, users can use
fold():

  vim.iter(t):fold({}, function(t, k, v)
    t[k] = v
    return t
  end)
---
 runtime/doc/lua.txt      | 23 ++++++++++++++---
 runtime/lua/vim/iter.lua | 67 +++++++++++++++++-------------------------------
 2 files changed, 42 insertions(+), 48 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 60067f1bc3..8e68e9a792 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3037,6 +3037,19 @@ Iter:find({self}, {f})                                           *Iter:find()*
 Iter:fold({self}, {init}, {f})                                   *Iter:fold()*
     Fold an iterator or table into a single value.
 
+    Examples: >
+
+     -- Create a new table with only even values
+     local t = { a = 1, b = 2, c = 3, d = 4 }
+     local it = vim.iter(t)
+     it:filter(function(k, v) return v % 2 == 0 end)
+     it:fold({}, function(t, k, v)
+       t[k] = v
+       return t
+     end)
+     -- { b = 2, d = 4 }
+<
+
     Parameters: ~
       • {init}  any Initial value of the accumulator.
       • {f}     function(acc:any, ...):A Accumulation function.
@@ -3297,9 +3310,7 @@ Iter:totable({self})                                          *Iter:totable()*
     The resulting table depends on the initial source in the iterator
     pipeline. List-like tables and function iterators will be collected into a
     list-like table. If multiple values are returned from the final stage in
-    the iterator pipeline, each value will be included in a table. If a
-    map-like table was used as the initial source, then a map-like table is
-    returned.
+    the iterator pipeline, each value will be included in a table.
 
     Examples: >lua
 
@@ -3310,9 +3321,13 @@ Iter:totable({self})                                          *Iter:totable()*
      -- { { 1, 2 }, { 2, 4 }, { 3, 6 } }
 
      vim.iter({ a = 1, b = 2, c = 3 }):filter(function(k, v) return v % 2 ~= 0 end):totable()
-     -- { a = 1, c = 3 }
+     -- { { 'a', 1 }, { 'c', 3 } }
 <
 
+    The generated table is a list-like table with consecutive, numeric
+    indices. To create a map-like table with arbitrary keys, use
+    |Iter:fold()|.
+
     Return: ~
         (table)
 
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index fff7644b6a..c5d5ef835b 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -18,14 +18,6 @@ ListIter.__call = function(self)
   return self:next()
 end
 
---- Special case implementations for iterators on non-list tables.
----@class TableIter : Iter
-local TableIter = {}
-TableIter.__index = setmetatable(TableIter, Iter)
-TableIter.__call = function(self)
-  return self:next()
-end
-
 ---@private
 local function unpack(t)
   if type(t) == 'table' and t.__n ~= nil then
@@ -185,10 +177,10 @@ end
 
 --- Collect the iterator into a table.
 ---
---- The resulting table depends on the initial source in the iterator pipeline. List-like tables
---- and function iterators will be collected into a list-like table. If multiple values are returned
---- from the final stage in the iterator pipeline, each value will be included in a table. If a
---- map-like table was used as the initial source, then a map-like table is returned.
+--- The resulting table depends on the initial source in the iterator pipeline.
+--- List-like tables and function iterators will be collected into a list-like
+--- table. If multiple values are returned from the final stage in the iterator
+--- pipeline, each value will be included in a table.
 ---
 --- Examples:
 --- <pre>lua
@@ -199,9 +191,13 @@ end
 --- -- { { 1, 2 }, { 2, 4 }, { 3, 6 } }
 ---
 --- vim.iter({ a = 1, b = 2, c = 3 }):filter(function(k, v) return v % 2 ~= 0 end):totable()
---- -- { a = 1, c = 3 }
+--- -- { { 'a', 1 }, { 'c', 3 } }
 --- </pre>
 ---
+--- The generated table is a list-like table with consecutive, numeric indices.
+--- To create a map-like table with arbitrary keys, use |Iter:fold()|.
+---
+---
 ---@return table
 function Iter.totable(self)
   local t = {}
@@ -239,17 +235,21 @@ function ListIter.totable(self)
   return Iter.totable(self)
 end
 
----@private
-function TableIter.totable(self)
-  local t = {}
-  for k, v in self do
-    t[k] = v
-  end
-  return t
-end
-
 --- Fold an iterator or table into a single value.
 ---
+--- Examples:
+--- <pre>
+--- -- Create a new table with only even values
+--- local t = { a = 1, b = 2, c = 3, d = 4 }
+--- local it = vim.iter(t)
+--- it:filter(function(k, v) return v % 2 == 0 end)
+--- it:fold({}, function(t, k, v)
+---   t[k] = v
+---   return t
+--- end)
+--- -- { b = 2, d = 4 }
+--- </pre>
+---
 ---@generic A
 ---
 ---@param init A Initial value of the accumulator.
@@ -783,7 +783,7 @@ function Iter.new(src, ...)
       count = count + 1
       local v = src[count]
       if v == nil then
-        return TableIter.new(src)
+        return Iter.new(pairs(src))
       end
       t[count] = v
     end
@@ -827,25 +827,4 @@ function ListIter.new(t)
   return it
 end
 
---- Create a new TableIter
----
----@param t table Table to iterate over. For list-like tables, use ListIter.new instead.
----@return Iter
----@private
-function TableIter.new(t)
-  local it = {}
-
-  local index = nil
-  function it.next()
-    local k, v = next(t, index)
-    if k ~= nil then
-      index = k
-      return k, v
-    end
-  end
-
-  setmetatable(it, TableIter)
-  return it
-end
-
 return Iter
-- 
cgit 


From ab2811746eb72e06309a9877dbe6cb70d9cd3b12 Mon Sep 17 00:00:00 2001
From: William <50717946+BIKA-C@users.noreply.github.com>
Date: Thu, 20 Apr 2023 06:42:49 -0700
Subject: fix(treesitter playground): fix the wrong range of a node displayed
 i… (#23209)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(treesitter playground): wrong range of a node displayed in playground

The call parameters order of the function `get_range_str` is flipped for the last two arguments compared to the declaration.
---
 runtime/lua/vim/treesitter/playground.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index 2c0a0d1aa6..c512710810 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -147,7 +147,7 @@ local decor_ns = api.nvim_create_namespace('ts.playground')
 ---@param end_lnum integer
 ---@param end_col integer
 ---@return string
-local function get_range_str(lnum, col, end_col, end_lnum)
+local function get_range_str(lnum, col, end_lnum, end_col)
   if lnum == end_lnum then
     return string.format('[%d:%d - %d]', lnum + 1, col + 1, end_col)
   end
-- 
cgit 


From 622b1ae38a36c3d26fad19faa788d622f7835921 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 21 Apr 2023 06:46:18 +0200
Subject: fix(lua): vim.split may trim inner empty items

Problem:
`vim.split('a:::', ':', {trimempty=true})` trims inner empty items.
Regression from 9c49c1047079427ff0a2356cb37302934845108e

Solution:
Set `empty_start=false` when first non-empty item is found.
close #23212
---
 runtime/lua/vim/shared.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 1a96ef9bc4..08f8afd087 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -138,7 +138,9 @@ function vim.gsplit(s, sep, opts)
     local seg = _pass(s:find(sep, start, plain))
 
     -- Trim empty segments from start/end.
-    if trimempty and seg == '' then
+    if seg ~= '' then
+      empty_start = false
+    elseif trimempty then
       while not done and seg == '' do
         empty_segs = empty_segs + 1
         seg = _pass(s:find(sep, start, plain))
-- 
cgit 


From 824766612d4e7d53b717bd1e2b0d1d895054accd Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 21 Apr 2023 07:26:44 +0200
Subject: refactor(lua): simplify vim.gsplit impl

---
 runtime/lua/vim/shared.lua | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 08f8afd087..5f4ea8822b 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -100,10 +100,9 @@ function vim.gsplit(s, sep, opts)
   local start = 1
   local done = false
 
-  -- For `trimempty`:
+  -- For `trimempty`: queue of collected segments, to be emitted at next pass.
+  local segs = {}
   local empty_start = true -- Only empty segments seen so far.
-  local empty_segs = 0 -- Empty segments found between non-empty segments.
-  local nonemptyseg = nil
 
   local function _pass(i, j, ...)
     if i then
@@ -118,14 +117,9 @@ function vim.gsplit(s, sep, opts)
   end
 
   return function()
-    if trimempty and empty_segs > 0 then
-      -- trimempty: Pop the collected empty segments.
-      empty_segs = empty_segs - 1
-      return ''
-    elseif trimempty and nonemptyseg then
-      local seg = nonemptyseg
-      nonemptyseg = nil
-      return seg
+    if trimempty and #segs > 0 then
+      -- trimempty: Pop the collected segments.
+      return table.remove(segs)
     elseif done or (s == '' and sep == '') then
       return nil
     elseif sep == '' then
@@ -138,23 +132,24 @@ function vim.gsplit(s, sep, opts)
     local seg = _pass(s:find(sep, start, plain))
 
     -- Trim empty segments from start/end.
-    if seg ~= '' then
+    if trimempty and seg ~= '' then
       empty_start = false
-    elseif trimempty then
+    elseif trimempty and seg == '' then
       while not done and seg == '' do
-        empty_segs = empty_segs + 1
+        table.insert(segs, 1, '')
         seg = _pass(s:find(sep, start, plain))
       end
       if done and seg == '' then
         return nil
       elseif empty_start then
         empty_start = false
-        empty_segs = 0
+        segs = {}
         return seg
       end
-      nonemptyseg = seg ~= '' and seg or nil
-      seg = ''
-      empty_segs = empty_segs - 1
+      if seg ~= '' then
+        table.insert(segs, 1, seg)
+      end
+      return table.remove(segs)
     end
 
     return seg
-- 
cgit 


From 702892270dec627acb3dd585495ee0950f690bde Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Fri, 21 Apr 2023 16:46:35 +0200
Subject: refactor(build): move the last generator from scripts/ to
 src/nvim/generators

This one generates a runtime/ file instead of a source file.
But otherwise it works the same like all other generators.
It has the same prerequisites (shared and mpack modules, etc), and,
importantly, it uses results from the source generators.

The odd location makes it easy to overlook when refactoring generators
(like I did last time, lol)
---
 runtime/CMakeLists.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 5d69962aba..0077604141 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(SYN_VIM_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/genvimvim.lua)
+set(SYN_VIM_GENERATOR ${PROJECT_SOURCE_DIR}/src/nvim/generators/gen_vimvim.lua)
 set(GENERATED_RUNTIME_DIR ${PROJECT_BINARY_DIR}/runtime)
 set(GENERATED_SYN_VIM ${GENERATED_RUNTIME_DIR}/syntax/vim/generated.vim)
 set(GENERATED_HELP_TAGS ${GENERATED_RUNTIME_DIR}/doc/tags)
@@ -13,8 +13,7 @@ get_directory_property(LUA_GEN DIRECTORY ${PROJECT_SOURCE_DIR}/src/nvim DEFINITI
 get_directory_property(LUA_GEN_DEPS DIRECTORY ${PROJECT_SOURCE_DIR}/src/nvim DEFINITION LUA_GEN_DEPS)
 
 add_custom_command(OUTPUT ${GENERATED_SYN_VIM}
-  COMMAND ${LUA_GEN} ${SYN_VIM_GENERATOR}
-          ${PROJECT_SOURCE_DIR}/src/nvim ${GENERATED_SYN_VIM} ${FUNCS_DATA}
+  COMMAND ${LUA_GEN} ${SYN_VIM_GENERATOR} ${GENERATED_SYN_VIM} ${FUNCS_DATA}
   DEPENDS
     ${LUA_GEN_DEPS}
     ${SYN_VIM_GENERATOR}
-- 
cgit 


From f68af3c3bc92c12f7dbbd32f44df8ab57a58ac98 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Fri, 21 Apr 2023 16:13:39 -0600
Subject: refactor(iter): use metatable as packed table tag (#23254)

This is a more robust method for tagging a packed table as it completely
eliminates the possibility of mistaking an actual table key as the
packed table tag.
---
 runtime/lua/vim/iter.lua | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index c5d5ef835b..2545853b41 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -18,10 +18,13 @@ ListIter.__call = function(self)
   return self:next()
 end
 
+--- Packed tables use this as their metatable
+local packedmt = {}
+
 ---@private
 local function unpack(t)
-  if type(t) == 'table' and t.__n ~= nil then
-    return _G.unpack(t, 1, t.__n)
+  if getmetatable(t) == packedmt then
+    return _G.unpack(t, 1, t.n)
   end
   return t
 end
@@ -30,11 +33,20 @@ end
 local function pack(...)
   local n = select('#', ...)
   if n > 1 then
-    return { __n = n, ... }
+    return setmetatable({ n = n, ... }, packedmt)
   end
   return ...
 end
 
+---@private
+local function sanitize(t)
+  if getmetatable(t) == packedmt then
+    -- Remove length tag
+    t.n = nil
+  end
+  return t
+end
+
 --- Add a filter step to the iterator pipeline.
 ---
 --- Example:
@@ -208,12 +220,7 @@ function Iter.totable(self)
       break
     end
 
-    if type(args) == 'table' then
-      -- Removed packed table tag if it exists
-      args.__n = nil
-    end
-
-    t[#t + 1] = args
+    t[#t + 1] = sanitize(args)
   end
   return t
 end
@@ -221,12 +228,10 @@ end
 ---@private
 function ListIter.totable(self)
   if self._head == 1 and self._tail == #self._table + 1 and self.next == ListIter.next then
-    -- Remove any packed table tags
-    for i = 1, #self._table do
-      local v = self._table[i]
-      if type(v) == 'table' then
-        v.__n = nil
-        self._table[i] = v
+    -- Sanitize packed table values
+    if getmetatable(self._table[1]) == packedmt then
+      for i = 1, #self._table do
+        self._table[i] = sanitize(self._table[i])
       end
     end
     return self._table
-- 
cgit 


From e9b85acfbb8d3b1dd6f92deb187800be757c6c68 Mon Sep 17 00:00:00 2001
From: Jon Huhn <nojnhuh@users.noreply.github.com>
Date: Sat, 22 Apr 2023 02:37:38 -0500
Subject: feat(lsp): enable workspace/didChangeWatchedFiles by default (#23190)

---
 runtime/doc/news.txt             | 3 +++
 runtime/lua/vim/lsp/protocol.lua | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index bbf63a5ee0..3f07dd2e66 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -52,6 +52,9 @@ The following changes to existing APIs or features add new behavior.
 • vim.diagnostic.config() now accepts a function for the virtual_text.prefix
   option, which allows for rendering e.g., diagnostic severities differently.
 
+• The `workspace/didChangeWatchedFiles` LSP client capability is now enabled
+  by default.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 2cb8fc7955..a7919f12f5 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -837,7 +837,7 @@ function protocol.make_client_capabilities()
         refreshSupport = true,
       },
       didChangeWatchedFiles = {
-        dynamicRegistration = false,
+        dynamicRegistration = true,
         relativePatternSupport = true,
       },
     },
-- 
cgit 


From d9f78b63361e00a7f623ebb5b869606ac653b180 Mon Sep 17 00:00:00 2001
From: T727 <74924917+T-727@users.noreply.github.com>
Date: Sat, 22 Apr 2023 13:04:05 +0300
Subject: docs(powershell): use tee.exe instead of Tee-Object

Problem: Tee-Object does not create a file if it does not receive input
for example when :grep does not find matches.
and so nvim tries to open a nonexistent errorfile causing an error.

Solution: use tee.exe instead of Tee-Object
---
 runtime/doc/options.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7842394245..46d3f153c2 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5225,9 +5225,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 							*shell-powershell*
 	To use PowerShell: >
 		let &shell = executable('pwsh') ? 'pwsh' : 'powershell'
-		let &shellcmdflag = '-NoLogo -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new();$PSDefaultParameterValues[''Out-File:Encoding'']=''utf8'';'
+		let &shellcmdflag = '-NoLogo -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new();$PSDefaultParameterValues[''Out-File:Encoding'']=''utf8'';Remove-Alias -Force -ErrorAction SilentlyContinue tee;'
 		let &shellredir = '2>&1 | %%{ "$_" } | Out-File %s; exit $LastExitCode'
-		let &shellpipe  = '2>&1 | %%{ "$_" } | Tee-Object %s; exit $LastExitCode'
+		let &shellpipe  = '2>&1 | %%{ "$_" } | tee %s; exit $LastExitCode'
 		set shellquote= shellxquote=
 
 <	This option cannot be set from a |modeline| or in the |sandbox|, for
-- 
cgit 


From 1cb46abff1e903e999105b244329f22678ba8a30 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 22 Apr 2023 23:51:53 +0800
Subject: vim-patch:9.0.1475: busted configuration files are not recognized
 (#23266)

Problem:    Busted configuration files are not recognized.
Solution:   Recognize busted configuration files as Lua. (Craig MacEachern,
            closes vim/vim#12209)

Co-authored-by: C.D. MacEachern <craig.daniel.maceachern@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 6cfe6e6c35..cbd9aa640b 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1522,6 +1522,7 @@ local filename = {
   ['.lsl'] = function(path, bufnr)
     return require('vim.filetype.detect').lsl(bufnr)
   end,
+  ['.busted'] = 'lua',
   ['.luacheckrc'] = 'lua',
   ['lynx.cfg'] = 'lynx',
   ['m3overrides'] = 'm3build',
-- 
cgit 


From f17bb4f41102ecec7989bc4c14c626dc595e2f0b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 23 Apr 2023 14:15:52 +0200
Subject: vim-patch:9.0.1478: filetypes for *.v files not detected properly
 (#23282)

* vim-patch:9.0.1478: filetypes for *.v files not detected properly

Problem:    Filetypes for *.v files not detected properly.
Solution:   Use the file contents to detect the filetype. (Turiiya,
            closes vim/vim#12281)

https://github.com/vim/vim/commit/80406c26188219f3773b2e9c49160caeeb386ee2

Co-authored-by: Turiiya <34311583+tobealive@users.noreply.github.com>
Co-authored-by: Jonas Strittmatter <40792180+smjonas@users.noreply.github.com>
---
 runtime/lua/vim/filetype.lua        |  4 +++-
 runtime/lua/vim/filetype/detect.lua | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index cbd9aa640b..4fafc4e2e2 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1091,7 +1091,9 @@ local extension = {
   vr = 'vera',
   vri = 'vera',
   vrh = 'vera',
-  v = 'verilog',
+  v = function(path, bufnr)
+    return require('vim.filetype.detect').v(bufnr)
+  end,
   va = 'verilogams',
   vams = 'verilogams',
   vhdl = 'vhdl',
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 94114ae7c3..74b01d569c 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1322,6 +1322,24 @@ function M.txt(bufnr)
   end
 end
 
+-- Determine if a .v file is Verilog, V, or Coq
+function M.v(bufnr)
+  if vim.fn.did_filetype() ~= 0 then
+    -- Filetype was already detected
+    return
+  end
+  for _, line in ipairs(getlines(bufnr, 1, 200)) do
+    if not line:find('^%s*/') then
+      if findany(line, { ';%s*$', ';%s*/' }) then
+        return 'verilog'
+      elseif findany(line, { '%.%s*$', '%.%s*%(%*' }) then
+        return 'coq'
+      end
+    end
+  end
+  return 'v'
+end
+
 -- WEB (*.web is also used for Winbatch: Guess, based on expecting "%" comment
 -- lines in a WEB file).
 function M.web(bufnr)
-- 
cgit 


From e3f36377c156749bbdafc46d8a8cd017f378b4b5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 23 Apr 2023 15:22:55 +0200
Subject: vim-patch:71badf9547e8 (#23285)

Update runtime files

https://github.com/vim/vim/commit/71badf9547e8f89571b9a095183671cbb333d528

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/autoload/netrw.vim                         | 271 +++++--
 runtime/autoload/netrwSettings.vim                 |   8 +-
 runtime/autoload/zip.vim                           |  12 +-
 runtime/colors/habamax.vim                         | 149 ++--
 runtime/colors/lunaperche.vim                      | 215 ++---
 runtime/colors/quiet.vim                           | 441 ++++++-----
 runtime/colors/retrobox.vim                        | 882 +++++++++++++++++++++
 runtime/colors/sorbet.vim                          | 448 +++++++++++
 runtime/colors/wildcharm.vim                       | 761 ++++++++++++++++++
 runtime/colors/zaibatsu.vim                        | 567 +++++++++++++
 runtime/doc/builtin.txt                            |   5 +-
 runtime/doc/change.txt                             |   5 +
 runtime/doc/digraph.txt                            |   4 +-
 runtime/doc/fold.txt                               |   3 +-
 runtime/doc/gui.txt                                |   2 +-
 runtime/doc/map.txt                                |   9 +-
 runtime/doc/options.txt                            |  11 +-
 runtime/doc/pi_netrw.txt                           |  44 +-
 runtime/doc/pi_zip.txt                             |   1 +
 runtime/doc/recover.txt                            |   2 +-
 runtime/doc/spell.txt                              |   3 +-
 runtime/doc/syntax.txt                             |  13 +-
 runtime/doc/usr_03.txt                             |   2 +
 runtime/ftplugin/livebook.vim                      |   9 +
 runtime/ftplugin/lua.vim                           |   5 +-
 runtime/ftplugin/netrc.vim                         |   3 +-
 runtime/ftplugin/rmd.vim                           |   6 +-
 runtime/ftplugin/rnoweb.vim                        |   8 +-
 runtime/ftplugin/rrst.vim                          |   4 +-
 runtime/indent/livebook.vim                        |   9 +
 runtime/indent/r.vim                               |  10 +-
 runtime/indent/rhelp.vim                           |   2 +-
 runtime/indent/rnoweb.vim                          |   4 +-
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   |  17 +-
 runtime/plugin/netrwPlugin.vim                     |   2 +-
 runtime/plugin/zipPlugin.vim                       |   6 +-
 runtime/syntax/c.vim                               |   7 +-
 runtime/syntax/gpg.vim                             | 197 +++--
 runtime/syntax/hollywood.vim                       |   8 +-
 runtime/syntax/ld.vim                              |   3 +-
 runtime/syntax/livebook.vim                        |   8 +
 runtime/syntax/netrc.vim                           |   4 +
 runtime/syntax/python.vim                          |  20 +-
 runtime/syntax/sh.vim                              |  20 +-
 runtime/syntax/vim.vim                             |   4 +-
 45 files changed, 3523 insertions(+), 691 deletions(-)
 create mode 100644 runtime/colors/retrobox.vim
 create mode 100644 runtime/colors/sorbet.vim
 create mode 100644 runtime/colors/wildcharm.vim
 create mode 100644 runtime/colors/zaibatsu.vim
 create mode 100644 runtime/ftplugin/livebook.vim
 create mode 100644 runtime/indent/livebook.vim
 create mode 100644 runtime/syntax/livebook.vim

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 2fcf0b32c7..6c9938d8bb 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Aug 16, 2021
-" Version:	171
+" Date:		Mar 15, 2023
+" Version:	172
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -43,7 +43,7 @@ if exists("s:needspatches")
  endfor
 endif
 
-let g:loaded_netrw = "v171"
+let g:loaded_netrw = "v172"
 if !exists("s:NOTE")
  let s:NOTE    = 0
  let s:WARNING = 1
@@ -208,7 +208,6 @@ let g:netrw_localcopycmdopt    = ""
 let g:netrw_localcopydircmdopt = ""
 let g:netrw_localmkdiropt      = ""
 let g:netrw_localmovecmdopt    = ""
-let g:netrw_localrmdiropt      = ""
 
 " ---------------------------------------------------------------------
 " Default values for netrw's global protocol variables {{{2
@@ -1151,6 +1150,11 @@ endfun
 
 " ---------------------------------------------------------------------
 " netrw#Lexplore: toggle Explorer window, keeping it on the left of the current tab {{{2
+"   Uses  g:netrw_chgwin  : specifies the window where Lexplore files are to be opened
+"         t:netrw_lexposn : winsaveview() output (used on Lexplore window)
+"         t:netrw_lexbufnr: the buffer number of the Lexplore buffer  (internal to this function)
+"         s:lexplore_win  : window number of Lexplore window (serves to indicate which window is a Lexplore window)
+"         w:lexplore_buf  : buffer number of Lexplore window (serves to indicate which window is a Lexplore window)
 fun! netrw#Lexplore(count,rightside,...)
 "  call Dfunc("netrw#Lexplore(count=".a:count." rightside=".a:rightside.",...) a:0=".a:0." ft=".&ft)
   let curwin= winnr()
@@ -1167,6 +1171,8 @@ fun! netrw#Lexplore(count,rightside,...)
 "    call Decho("exe Explore ".fnameescape(a:1),'~'.expand("<slnum>"))
     exe "Explore ".fnameescape(a1)
     exe curwin."wincmd w"
+    let s:lexplore_win= curwin
+    let w:lexplore_buf= bufnr("%")
     if exists("t:netrw_lexposn")
 "     call Decho("forgetting t:netrw_lexposn",'~'.expand("<slnum>"))
      unlet t:netrw_lexposn
@@ -1241,7 +1247,7 @@ fun! netrw#Lexplore(count,rightside,...)
    let t:netrw_lexbufnr = bufnr("%")
    " done to prevent build-up of hidden buffers due to quitting and re-invocation of :Lexplore.
    " Since the intended use of :Lexplore is to have an always-present explorer window, the extra
-   " effort to mis-use :Lex is warranted.
+   " effort to prevent mis-use of :Lex is warranted.
    set bh=wipe
 "   call Decho("let t:netrw_lexbufnr=".t:netrw_lexbufnr) 
 "   call Decho("t:netrw_lexposn".(exists("t:netrw_lexposn")? string(t:netrw_lexposn) : " n/a"))
@@ -1645,7 +1651,7 @@ fun! s:NetrwOptionsSave(vt)
   endif
   let {a:vt}netrw_fokeep    = &l:fo           " formatoptions
   let {a:vt}netrw_gdkeep    = &l:gd           " gdefault
-  let {a:vt}netrw_gokeep    = &l:go           " guioptions
+  let {a:vt}netrw_gokeep    = &go             " guioptions
   let {a:vt}netrw_hidkeep   = &l:hidden
   let {a:vt}netrw_imkeep    = &l:im
   let {a:vt}netrw_iskkeep   = &l:isk
@@ -1711,8 +1717,9 @@ fun! s:NetrwOptionsSafe(islocal)
   if &cpo =~ 'a' | call s:NetrwSetSafeSetting("&cpo",substitute(&cpo,'a','','g')) | endif
   if &cpo =~ 'A' | call s:NetrwSetSafeSetting("&cpo",substitute(&cpo,'A','','g')) | endif
   setl fo=nroql2
-  " call s:NetrwSetSafeSetting("&go","begmr")
-  if &go =~ '\ca' | call s:NetrwSetSafeSetting("&go",substitute(&go,'\ca','','g')) | endif
+  if &go =~ 'a' | set go-=a | endif
+  if &go =~ 'A' | set go-=A | endif
+  if &go =~ 'P' | set go-=P | endif
   call s:NetrwSetSafeSetting("&l:hid",0)
   call s:NetrwSetSafeSetting("&l:im",0)
   setl isk+=@ isk+=* isk+=/
@@ -1751,11 +1758,13 @@ fun! s:NetrwOptionsRestore(vt)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
   if !exists("{a:vt}netrw_optionsave")
 "   call Decho("case ".a:vt."netrw_optionsave : doesn't exist",'~'.expand("<slnum>"))
-   if !isdirectory(expand('%'))
+   if filereadable(expand("%"))
 "    call Decho("..doing filetype detect anyway")
-     filetype detect
+    filetype detect
+"    call Decho("..settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
+   else
+    setl ft=netrw
    endif
-"   call Decho("..settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
 "   call Decho("..ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
 "   call Dret("s:NetrwOptionsRestore : ".a:vt."netrw_optionsave doesn't exist")
    return
@@ -1795,7 +1804,7 @@ fun! s:NetrwOptionsRestore(vt)
 "  call Decho("(s:NetrwOptionsRestore) #4 lines=".&lines)
   call s:NetrwRestoreSetting(a:vt."netrw_fokeep"   ,"&l:fo")
   call s:NetrwRestoreSetting(a:vt."netrw_gdkeep"   ,"&l:gd")
-  call s:NetrwRestoreSetting(a:vt."netrw_gokeep"   ,"&l:go")
+  call s:NetrwRestoreSetting(a:vt."netrw_gokeep"   ,"&go")
   call s:NetrwRestoreSetting(a:vt."netrw_hidkeep"  ,"&l:hidden")
 "  call Decho("(s:NetrwOptionsRestore) #5 lines=".&lines)
   call s:NetrwRestoreSetting(a:vt."netrw_imkeep"   ,"&l:im")
@@ -1861,11 +1870,9 @@ fun! s:NetrwOptionsRestore(vt)
   " were having their filetype detect-generated settings overwritten by
   " NetrwOptionRestore.
   if &ft != "netrw"
-    if !isdirectory(expand('%'))
-"     call Decho("before: filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
-      filetype detect
-"     call Decho("after : filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
-    endif
+"   call Decho("before: filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
+   filetype detect
+"   call Decho("after : filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
   endif
 "  call Decho("(s:NetrwOptionsRestore) lines=".&lines)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
@@ -2940,13 +2947,19 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
    " rename buffer back to remote filename
    call s:NetrwBufRename(rfile)
 
+   " Jan 19, 2022: COMBAK -- bram problem with https://github.com/vim/vim/pull/9554.diff filetype
    " Detect filetype of local version of remote file.
    " Note that isk must not include a "/" for scripts.vim
    " to process this detection correctly.
-"   call Decho("detect filetype of local version of remote file",'~'.expand("<slnum>"))
-   let iskkeep= &l:isk
+"   call Decho("detect filetype of local version of remote file<".rfile.">",'~'.expand("<slnum>"))
+"   call Decho("..did_filetype()=".did_filetype())
+   setl ft=
+"   call Decho("..initial filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
+   let iskkeep= &isk
    setl isk-=/
-   let &l:isk= iskkeep
+   filetype detect
+"   call Decho("..local filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
+   let &isk= iskkeep
 "   call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
    let line1 = 1
    let line2 = line("$")
@@ -4227,7 +4240,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
   endif
 "  call Decho("  bufnum#".bufnum,'~'.expand("<slnum>"))
 
-  " hijack the current buffer
+  " highjack the current buffer
   "   IF the buffer already has the desired name
   "   AND it is empty
   let curbuf = bufname("%")
@@ -4235,7 +4248,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
    let curbuf = getcwd()
   endif
 "  call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
-"  call Decho("deciding if netrw may hijack the current buffer#".bufnr("%")."<".curbuf.">",'~'.expand("<slnum>"))
+"  call Decho("deciding if netrw may highjack the current buffer#".bufnr("%")."<".curbuf.">",'~'.expand("<slnum>"))
 "  call Decho("..dirname<".dirname.">  IF dirname == bufname",'~'.expand("<slnum>"))
 "  call Decho("..curbuf<".curbuf.">",'~'.expand("<slnum>"))
 "  call Decho("..line($)=".line("$")." AND this is 1",'~'.expand("<slnum>"))
@@ -4244,7 +4257,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
 "   call Dret("s:NetrwGetBuffer 0<cleared buffer> : highjacking buffer#".bufnr("%"))
    return 0
   else  " DEBUG
-"   call Decho("..did NOT hijack buffer",'~'.expand("<slnum>"))
+"   call Decho("..did NOT highjack buffer",'~'.expand("<slnum>"))
   endif
   " Aug 14, 2021: was thinking about looking for a [No Name] buffer here and using it, but that might cause problems
 
@@ -4280,19 +4293,25 @@ fun! s:NetrwGetBuffer(islocal,dirname)
 
   else " Re-use the buffer
 "   call Decho("--re-use buffer#".bufnum." (bufnum#".bufnum.">=0 AND bufexists(".bufnum.")=".bufexists(bufnum)."!=0)",'~'.expand("<slnum>"))
+   " ignore all events
    let eikeep= &ei
    setl ei=all
-   if getline(2) =~# '^" Netrw Directory Listing'
-"    call Decho("  getline(2)<".getline(2).'> matches "Netrw Directory Listing" : using keepalt b '.bufnum,'~'.expand("<slnum>"))
-    exe "sil! NetrwKeepj noswapfile keepalt b ".bufnum
+
+   if &ft == "netrw"
+"    call Decho("buffer type is netrw; not using keepalt with b ".bufnum)
+    exe "sil! NetrwKeepj noswapfile b ".bufnum
+"    call Dredir("ls!","one")
    else
-"    call Decho("  getline(2)<".getline(2).'> does not match "Netrw Directory Listing" : using b '.bufnum,'~'.expand("<slnum>"))
-    exe "sil! NetrwKeepj noswapfile keepalt b ".bufnum
+"    call Decho("buffer type is not netrw; using keepalt with b ".bufnum)
+    call s:NetrwEditBuf(bufnum)
+"    call Dredir("ls!","two")
    endif
 "   call Decho("  line($)=".line("$"),'~'.expand("<slnum>"))
    if bufname("%") == '.'
     call s:NetrwBufRename(getcwd())
    endif
+
+   " restore ei
    let &ei= eikeep
 
    if line("$") <= 1 && getline(1) == ""
@@ -4943,7 +4962,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
 
     " the point where netrw actually edits the (local) file
     " if its local only: LocalBrowseCheck() doesn't edit a file, but NetrwBrowse() will
-    " no keepalt to support  :e #  to return to a directory listing
+    " use keepalt to support  :e #  to return to a directory listing
     if !&mod
      " if e the new file would fail due to &mod, then don't change any of the flags
      let dolockout= 1
@@ -4954,12 +4973,8 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
      " others like c-^ to return to the netrw buffer
      " Apr 30, 2020: used to have e! here.  That can cause loss of a modified file,
      " so emit error E37 instead.
-     if exists("g:netrw_altfile") && g:netrw_altfile
-      exe "NetrwKeepj keepalt e ".fnameescape(dirname)
-     else
-      exe "NetrwKeepj e ".fnameescape(dirname)
-     endif
-"     call Decho("edit-a-file: after e! ".dirname.": hidden=".&hidden." bufhidden<".&bufhidden."> mod=".&mod,'~'.expand("<slnum>"))
+     call s:NetrwEditFile("e","",dirname)
+"     call Decho("edit-a-file: after e ".dirname.": hidden=".&hidden." bufhidden<".&bufhidden."> mod=".&mod,'~'.expand("<slnum>"))
      " COMBAK -- cuc cul related
      call s:NetrwCursor(1)
      if &hidden || &bufhidden == "hide"
@@ -5300,8 +5315,8 @@ fun! netrw#BrowseX(fname,remote)
      " g:Netrw_corehandler is a List of function references (see :help Funcref)
 "     call Decho("g:Netrw_corehandler is a List",'~'.expand("<slnum>"))
      for Fncref in g:Netrw_corehandler
-      if type(FncRef) == 2
-       call FncRef(a:fname)
+      if type(Fncref) == 2
+       call Fncref(a:fname)
       endif
      endfor
     endif
@@ -5374,6 +5389,8 @@ fun! netrw#BrowseX(fname,remote)
    else
     let redir= &srr . "/dev/null"
    endif
+  else
+   let redir= ""
   endif
 "  call Decho("set up redirection: redir{".redir."} srr{".&srr."}",'~'.expand("<slnum>"))
 
@@ -5668,6 +5685,35 @@ fun! s:NetrwClearExplore()
 "  call Dret("s:NetrwClearExplore")
 endfun
 
+" ---------------------------------------------------------------------
+" s:NetrwEditBuf: decides whether or not to use keepalt to edit a buffer {{{2
+fun! s:NetrwEditBuf(bufnum)
+"  call Dfunc("s:NetrwEditBuf(fname<".a:bufnum.">)")
+  if exists("g:netrw_altfile") && g:netrw_altfile && &ft == "netrw"
+"   call Decho("exe sil! NetrwKeepj keepalt noswapfile b ".fnameescape(a:bufnum))
+   exe "sil! NetrwKeepj keepalt noswapfile b ".fnameescape(a:bufnum)
+  else
+"   call Decho("exe sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum))
+   exe "sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnume)
+  endif
+"  call Dret("s:NetrwEditBuf")
+endfun
+
+" ---------------------------------------------------------------------
+" s:NetrwEditFile: decides whether or not to use keepalt to edit a file {{{2
+"    NetrwKeepj [keepalt] <OPT> <CMD> <FILENAME>
+fun! s:NetrwEditFile(cmd,opt,fname)
+"  call Dfunc("s:NetrwEditFile(cmd<".a:cmd.">,opt<".a:opt.">,fname<".a:fname.">)  ft<".&ft.">")
+  if exists("g:netrw_altfile") && g:netrw_altfile && &ft == "netrw"
+"   call Decho("exe NetrwKeepj keepalt ".a:opt." ".a:cmd." ".fnameescape(a:fname))
+   exe "NetrwKeepj keepalt ".a:opt." ".a:cmd." ".fnameescape(a:fname)
+  else
+"   call Decho("exe NetrwKeepj ".a:opt." ".a:cmd." ".fnameescape(a:fname))
+   exe "NetrwKeepj ".a:opt." ".a:cmd." ".fnameescape(a:fname)
+  endif
+"  call Dret("s:NetrwEditFile")
+endfun
+
 " ---------------------------------------------------------------------
 " s:NetrwExploreListUniq: {{{2
 fun! s:NetrwExploreListUniq(explist)
@@ -7756,8 +7802,16 @@ fun! s:NetrwMarkFileMove(islocal)
 "    call Decho("movecmd<".movecmd."> (#3 linux or cygwin)",'~'.expand("<slnum>"))
    endif
    for fname in s:netrwmarkfilelist_{bufnr("%")}
+    if g:netrw_keepdir
+    " Jul 19, 2022: fixing file move when g:netrw_keepdir is 1
+     let fname= b:netrw_curdir."/".fname
+    endif
     if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
      let fname= substitute(fname,'/','\\','g')
+     if g:netrw_keepdir
+      " Jul 19, 2022: fixing file move when g:netrw_keepdir is 1
+      let fname= b:netrw_curdir."\\".fname
+     endif
     endif
 "    call Decho("system(".movecmd." ".s:ShellEscape(fname)." ".tgt.")",'~'.expand("<slnum>"))
     let ret= system(movecmd.g:netrw_localmovecmdopt." ".s:ShellEscape(fname)." ".tgt)
@@ -8475,21 +8529,28 @@ endfun
 "     choice = 2 : didn't save modified file, opened window
 "     choice = 3 : cancel open
 fun! s:NetrwPrevWinOpen(islocal)
-"  call Dfunc("s:NetrwPrevWinOpen(islocal=".a:islocal.")")
+"  call Dfunc("s:NetrwPrevWinOpen(islocal=".a:islocal.") win#".winnr())
 
   let ykeep= @@
   " grab a copy of the b:netrw_curdir to pass it along to newly split windows
   let curdir = b:netrw_curdir
+"  call Decho("COMBAK#1: mod=".&mod." win#".winnr())
 
   " get last window number and the word currently under the cursor
   let origwin   = winnr()
   let lastwinnr = winnr("$")
-  let curword   = s:NetrwGetWord()
-  let choice    = 0
-  let s:prevwinopen= 1	" lets s:NetrwTreeDir() know that NetrwPrevWinOpen called it
+"  call Decho("origwin#".origwin." lastwinnr#".lastwinnr)
+"  call Decho("COMBAK#2: mod=".&mod." win#".winnr())
+  let curword      = s:NetrwGetWord()
+  let choice       = 0
+  let s:prevwinopen= 1	" lets s:NetrwTreeDir() know that NetrwPrevWinOpen called it (s:NetrwTreeDir() will unlet s:prevwinopen)
+"  call Decho("COMBAK#3: mod=".&mod." win#".winnr())
   let s:treedir = s:NetrwTreeDir(a:islocal)
+"  call Decho("COMBAK#4: mod=".&mod." win#".winnr())
   let curdir    = s:treedir
+"  call Decho("COMBAK#5: mod=".&mod." win#".winnr())
 "  call Decho("winnr($)#".lastwinnr." curword<".curword.">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#6: mod=".&mod." win#".winnr())
 
   let didsplit = 0
   if lastwinnr == 1
@@ -8512,11 +8573,26 @@ fun! s:NetrwPrevWinOpen(islocal)
 "   call Decho("did split",'~'.expand("<slnum>"))
 
   else
+"   call Decho("COMBAK#7: mod=".&mod." win#".winnr())
    NetrwKeepj call s:SaveBufVars()
+"   call Decho("COMBAK#8: mod=".&mod." win#".winnr())
    let eikeep= &ei
+"   call Decho("COMBAK#9: mod=".&mod." win#".winnr())
    setl ei=all
+"   call Decho("COMBAK#10: mod=".&mod." win#".winnr())
    wincmd p
+"  call Decho("COMBAK#11: mod=".&mod)
 "   call Decho("wincmd p  (now in win#".winnr().") curdir<".curdir.">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#12: mod=".&mod)
+   
+   if exists("s:lexplore_win") && s:lexplore_win == winnr()
+    " whoops -- user trying to open file in the Lexplore window.
+    " Use Lexplore's opening-file window instead.
+"    call Decho("whoops -- user trying to open file in Lexplore Window. Use win#".g:netrw_chgwin." instead")
+"    exe g:netrw_chgwin."wincmd w"
+     wincmd p
+     call s:NetrwBrowse(0,s:NetrwBrowseChgDir(0,s:NetrwGetWord()))
+   endif
 
    " prevwinnr: the window number of the "prev" window
    " prevbufnr: the buffer number of the buffer in the "prev" window
@@ -8526,8 +8602,10 @@ fun! s:NetrwPrevWinOpen(islocal)
    let prevbufname = bufname("%")
    let prevmod     = &mod
    let bnrcnt      = 0
+"   call Decho("COMBAK#13: mod=".&mod." win#".winnr())
    NetrwKeepj call s:RestoreBufVars()
 "   call Decho("after wincmd p: win#".winnr()." win($)#".winnr("$")." origwin#".origwin." &mod=".&mod." bufname(%)<".bufname("%")."> prevbufnr=".prevbufnr,'~'.expand("<slnum>"))
+"   call Decho("COMBAK#14: mod=".&mod." win#".winnr())
 
    " if the previous window's buffer has been changed (ie. its modified flag is set),
    " and it doesn't appear in any other extant window, then ask the
@@ -8537,6 +8615,7 @@ fun! s:NetrwPrevWinOpen(islocal)
     windo if winbufnr(0) == prevbufnr | let bnrcnt=bnrcnt+1 | endif
 "    call Decho("prevbufnr=".prevbufnr." bnrcnt=".bnrcnt." buftype=".&bt." winnr()=".winnr()." prevwinnr#".prevwinnr,'~'.expand("<slnum>"))
     exe prevwinnr."wincmd w"
+"    call Decho("COMBAK#15: mod=".&mod." win#".winnr())
 
     if bnrcnt == 1 && &hidden == 0
      " only one copy of the modified buffer in a window, and
@@ -8544,6 +8623,7 @@ fun! s:NetrwPrevWinOpen(islocal)
      let choice = confirm("Save modified buffer<".prevbufname."> first?","&Yes\n&No\n&Cancel")
 "     call Decho("prevbufname<".prevbufname."> choice=".choice." current-winnr#".winnr(),'~'.expand("<slnum>"))
      let &ei= eikeep
+"     call Decho("COMBAK#16: mod=".&mod." win#".winnr())
 
      if choice == 1
       " Yes -- write file & then browse
@@ -8576,6 +8656,7 @@ fun! s:NetrwPrevWinOpen(islocal)
    endif
    let &ei= eikeep
   endif
+"  call Decho("COMBAK#17: mod=".&mod." win#".winnr())
 
   " restore b:netrw_curdir (window split/enew may have lost it)
   let b:netrw_curdir= curdir
@@ -9263,19 +9344,23 @@ fun! s:NetrwTreeDir(islocal)
   if exists("s:prevwinopen")
    unlet s:prevwinopen
   endif
+"  call Decho("COMBAK#18 : mod=".&mod." win#".winnr())
 
   if !exists("b:netrw_curdir") || b:netrw_curdir == ""
    let b:netrw_curdir= getcwd()
   endif
   let treedir = b:netrw_curdir
 "  call Decho("set initial treedir<".treedir.">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#19 : mod=".&mod." win#".winnr())
 
   let s:treecurpos= winsaveview()
 "  call Decho("saving posn to s:treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#20 : mod=".&mod." win#".winnr())
 
   if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 "   call Decho("w:netrw_liststyle is TREELIST:",'~'.expand("<slnum>"))
 "   call Decho("line#".line(".")." getline(.)<".getline('.')."> treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#21 : mod=".&mod." win#".winnr())
 
    " extract tree directory if on a line specifying a subdirectory (ie. ends with "/")
    let curline= substitute(getline('.'),"\t -->.*$",'','')
@@ -9291,6 +9376,7 @@ fun! s:NetrwTreeDir(islocal)
 "    call Decho("do not extract tree subdirectory from current line and set treedir to empty",'~'.expand("<slnum>"))
     let treedir= ""
    endif
+"  call Decho("COMBAK#22 : mod=".&mod." win#".winnr())
 
    " detect user attempting to close treeroot
 "   call Decho("check if user is attempting to close treeroot",'~'.expand("<slnum>"))
@@ -9306,10 +9392,12 @@ fun! s:NetrwTreeDir(islocal)
 "   else " Decho
 "    call Decho(".user not attempting to close treeroot",'~'.expand("<slnum>"))
    endif
+"  call Decho("COMBAK#23 : mod=".&mod." win#".winnr())
 
 "   call Decho("islocal=".a:islocal." curline<".curline.">",'~'.expand("<slnum>"))
    let potentialdir= s:NetrwFile(substitute(curline,'^'.s:treedepthstring.'\+ \(.*\)@$','\1',''))
 "   call Decho("potentialdir<".potentialdir."> isdir=".isdirectory(potentialdir),'~'.expand("<slnum>"))
+"  call Decho("COMBAK#24 : mod=".&mod." win#".winnr())
 
    " COMBAK: a symbolic link may point anywhere -- so it will be used to start a new treetop
 "   if a:islocal && curline =~ '@$' && isdirectory(s:NetrwFile(potentialdir))
@@ -9323,10 +9411,12 @@ fun! s:NetrwTreeDir(islocal)
     let treedir = s:NetrwTreePath(w:netrw_treetop)
 "   endif
   endif
+"  call Decho("COMBAK#25 : mod=".&mod." win#".winnr())
 
   " sanity maintenance: keep those //s away...
   let treedir= substitute(treedir,'//$','/','')
 "  call Decho("treedir<".treedir.">",'~'.expand("<slnum>"))
+"  call Decho("COMBAK#26 : mod=".&mod." win#".winnr())
 
 "  call Dret("s:NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".(exists("s:treecurpos")? string(s:treecurpos) : 'n/a').">")
   return treedir
@@ -10687,7 +10777,8 @@ fun! netrw#LocalBrowseCheck(dirname)
 "  call Dfunc("netrw#LocalBrowseCheck(dirname<".a:dirname.">)")
 "  call Decho("isdir<".a:dirname."> =".isdirectory(s:NetrwFile(a:dirname)).((exists("s:treeforceredraw")? " treeforceredraw" : "")).'~'.expand("<slnum>"))
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo,'~'.expand("<slnum>"))
-"  call Dredir("ls!","netrw#LocalBrowseCheck")
+  " getting E930: Cannot use :redir inside execute
+""  call Dredir("ls!","netrw#LocalBrowseCheck")
 "  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
 "  call Decho("current buffer#".bufnr("%")."<".bufname("%")."> ft=".&ft,'~'.expand("<slnum>"))
 
@@ -10981,12 +11072,15 @@ fun! s:LocalListing()
 
    if w:netrw_liststyle == s:LONGLIST
     let sz   = getfsize(filename)
-    let fsz  = strpart("               ",1,15-strlen(sz)).sz
+	let szlen = 15 - (strdisplaywidth(longfile) - g:netrw_maxfilenamelen)
+    let szlen = (szlen > 0) ? szlen : 0
+    let fsz  = printf("%".szlen."S",sz)
+
     if g:netrw_sizestyle =~# "[hH]"
      let sz= s:NetrwHumanReadable(sz)
     endif
-    let longfile= printf("%-".(g:netrw_maxfilenamelen+1)."s",pfile)
-    let pfile   = longfile.sz." ".strftime(g:netrw_timefmt,getftime(filename))
+	let longfile= printf("%-".g:netrw_maxfilenamelen."S",pfile)
+    let pfile   = longfile."  ".sz." ".strftime(g:netrw_timefmt,getftime(filename))
 "    call Decho("longlist support: sz=".sz." fsz=".fsz,'~'.expand("<slnum>"))
    endif
 
@@ -11285,34 +11379,8 @@ fun! s:NetrwLocalRmFile(path,fname,all)
    let rmfile= substitute(rmfile,'[\/]$','','e')
 
    if all || ok =~# 'y\%[es]' || ok == ""
-    if v:version < 704 || (v:version == 704 && !has("patch1107"))
-" "    call Decho("1st attempt: system(netrw#WinPath(".g:netrw_localrmdir.') '.s:ShellEscape(rmfile).')','~'.expand("<slnum>"))
-     call system(netrw#WinPath(g:netrw_localrmdir).' '.s:ShellEscape(rmfile))
-" "    call Decho("v:shell_error=".v:shell_error,'~'.expand("<slnum>"))
-
-     if v:shell_error != 0
-" "     call Decho("2nd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
-      let errcode= s:NetrwDelete(rmfile)
-" "     call Decho("errcode=".errcode,'~'.expand("<slnum>"))
-
-      if errcode != 0
-       if has("unix")
-" "       call Decho("3rd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
-	call system("rm ".s:ShellEscape(rmfile))
-	if v:shell_error != 0 && !exists("g:netrw_quiet")
-	 call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",34)
-	 let ok="no"
-	endif
-       elseif !exists("g:netrw_quiet")
-	call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",35)
-	let ok="no"
-       endif
-      endif
-     endif
-    else
-     if delete(rmfile,"d")
-      call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
-     endif
+    if delete(rmfile,"d")
+     call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
     endif
    endif
   endif
@@ -11907,13 +11975,13 @@ fun! s:NetrwEnew(...)
   if exists("b:netrw_prvdir")         |let netrw_prvdir          = b:netrw_prvdir         |endif
 
   NetrwKeepj call s:NetrwOptionsRestore("w:")
-"  call Decho("generate a buffer with NetrwKeepj keepalt enew!",'~'.expand("<slnum>"))
+"  call Decho("generate a buffer with NetrwKeepj enew!",'~'.expand("<slnum>"))
   " when tree listing uses file TreeListing... a new buffer is made.
   " Want the old buffer to be unlisted.
   " COMBAK: this causes a problem, see P43
 "  setl nobl
   let netrw_keepdiff= &l:diff
-  noswapfile NetrwKeepj keepalt enew!
+  call s:NetrwEditFile("enew!","","")
   let &l:diff= netrw_keepdiff
 "  call Decho("bufnr($)=".bufnr("$")."<".bufname(bufnr("$"))."> winnr($)=".winnr("$"),'~'.expand("<slnum>"))
   NetrwKeepj call s:NetrwOptionsSave("w:")
@@ -11962,7 +12030,7 @@ endfun
 " s:NetrwExe: executes a string using "!" {{{2
 fun! s:NetrwExe(cmd)
 "  call Dfunc("s:NetrwExe(a:cmd<".a:cmd.">)")
-  if has("win32") && &shell !~? 'cmd' && !g:netrw_cygwin
+  if has("win32") && &shell !~? 'cmd\|pwsh\|powershell' && !g:netrw_cygwin
 "    call Decho("using win32:",expand("<slnum>"))
     let savedShell=[&shell,&shellcmdflag,&shellxquote,&shellxescape,&shellquote,&shellpipe,&shellredir,&shellslash]
     set shell& shellcmdflag& shellxquote& shellxescape&
@@ -12631,3 +12699,54 @@ unlet s:keepcpo
 " Modelines: {{{1
 " ===============
 " vim:ts=8 fdm=marker
+" doing autoload/netrw.vim version v172g ~57
+" varname<g:netrw_dirhistcnt> value=0 ~1
+" varname<s:THINLIST> value=0 ~1
+" varname<s:LONGLIST> value=1 ~1
+" varname<s:WIDELIST> value=2 ~1
+" varname<s:TREELIST> value=3 ~1
+" varname<s:MAXLIST> value=4 ~1
+" varname<g:netrw_use_errorwindow> value=2 ~1
+" varname<g:netrw_http_xcmd> value=-q -O ~1
+" varname<g:netrw_http_put_cmd> value=curl -T ~1
+" varname<g:netrw_keepj> value=keepj ~1
+" varname<g:netrw_rcp_cmd> value=rcp ~1
+" varname<g:netrw_rsync_cmd> value=rsync ~1
+" varname<g:netrw_rsync_sep> value=/ ~1
+" varname<g:netrw_scp_cmd> value=scp -q ~1
+" varname<g:netrw_sftp_cmd> value=sftp ~1
+" varname<g:netrw_ssh_cmd> value=ssh ~1
+" varname<g:netrw_alto> value=0 ~1
+" varname<g:netrw_altv> value=1 ~1
+" varname<g:netrw_banner> value=1 ~1
+" varname<g:netrw_browse_split> value=0 ~1
+" varname<g:netrw_bufsettings> value=noma nomod nonu nobl nowrap ro nornu ~1
+" varname<g:netrw_chgwin> value=-1 ~1
+" varname<g:netrw_clipboard> value=1 ~1
+" varname<g:netrw_compress> value=gzip ~1
+" varname<g:netrw_ctags> value=ctags ~1
+" varname<g:netrw_cursor> value=2 ~1
+" (netrw) COMBAK: cuc=0 cul=0 initialization of s:netrw_cu[cl]
+" varname<g:netrw_cygdrive> value=/cygdrive ~1
+" varname<s:didstarstar> value=0 ~1
+" varname<g:netrw_dirhistcnt> value=0 ~1
+" varname<g:netrw_decompress> value={ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" } ~1
+" varname<g:netrw_dirhistmax> value=10 ~1
+" varname<g:netrw_errorlvl> value=0 ~1
+" varname<g:netrw_fastbrowse> value=1 ~1
+" varname<g:netrw_ftp_browse_reject> value=^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$ ~1
+" varname<g:netrw_ftpmode> value=binary ~1
+" varname<g:netrw_hide> value=1 ~1
+" varname<g:netrw_keepdir> value=1 ~1
+" varname<g:netrw_list_hide> value= ~1
+" varname<g:netrw_localmkdir> value=mkdir ~1
+" varname<g:netrw_remote_mkdir> value=mkdir ~1
+" varname<g:netrw_liststyle> value=0 ~1
+" varname<g:netrw_markfileesc> value=*./[\~ ~1
+" varname<g:netrw_maxfilenamelen> value=32 ~1
+" varname<g:netrw_menu> value=1 ~1
+" varname<g:netrw_mkdir_cmd> value=ssh USEPORT HOSTNAME mkdir ~1
+" varname<g:netrw_mousemaps> value=1 ~1
+" varname<g:netrw_retmap> value=0 ~1
+" varname<g:netrw_chgperm> value=chmod PERM FILENAME ~1
+" varname<g:netrw_preview> value=0 ~1
diff --git a/runtime/autoload/netrwSettings.vim b/runtime/autoload/netrwSettings.vim
index 61c0ef739e..a910d18be8 100644
--- a/runtime/autoload/netrwSettings.vim
+++ b/runtime/autoload/netrwSettings.vim
@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		Aug 12, 2021
+" Date:		Nov 15, 2021
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Version:	17	ASTRO-ONLY
+" Version:	18
 " Copyright:    Copyright (C) 1999-2007 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
   finish
 endif
-let g:loaded_netrwSettings = "v17"
+let g:loaded_netrwSettings = "v18a"
 if v:version < 700
  echohl WarningMsg
  echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -159,8 +159,6 @@ fun! netrwSettings#NetrwSettings()
   put = 'let g:netrw_localmkdiropt     = '.g:netrw_localmkdiropt
   put = 'let g:netrw_localmovecmd      = '.g:netrw_localmovecmd
   put = 'let g:netrw_localmovecmdopt   = '.g:netrw_localmovecmdopt
-  put = 'let g:netrw_localrmdir        = '.g:netrw_localrmdir
-  put = 'let g:netrw_localrmdiropt     = '.g:netrw_localrmdiropt
   put = 'let g:netrw_maxfilenamelen    = '.g:netrw_maxfilenamelen
   put = 'let g:netrw_menu              = '.g:netrw_menu
   put = 'let g:netrw_mousemaps         = '.g:netrw_mousemaps
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index bc9b62ddb0..8dda30c418 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:		Nov 08, 2021
-" Version:	32
+" Date:		Mar 12, 2023
+" Version:	33
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
 " Copyright:    Copyright (C) 2005-2019 Charles E. Campbell {{{1
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_zip")
  finish
 endif
-let g:loaded_zip= "v32"
+let g:loaded_zip= "v33"
 if v:version < 702
  echohl WarningMsg
  echo "***warning*** this version of zip needs vim 7.2 or later"
@@ -160,10 +160,14 @@ endfun
 " ---------------------------------------------------------------------
 " ZipBrowseSelect: {{{2
 fun! s:ZipBrowseSelect()
-"  call Dfunc("ZipBrowseSelect() zipfile<".b:zipfile."> curfile<".expand("%").">")
+  "  call Dfunc("ZipBrowseSelect() zipfile<".((exists("b:zipfile"))? b:zipfile : "n/a")."> curfile<".expand("%").">")
   let repkeep= &report
   set report=10
   let fname= getline(".")
+  if !exists("b:zipfile")
+"   call Dret("ZipBrowseSelect : b:zipfile doesn't exist!")
+   return
+  endif
 
   " sanity check
   if fname =~ '^"'
diff --git a/runtime/colors/habamax.vim b/runtime/colors/habamax.vim
index f6aa5609b1..c84354ca03 100644
--- a/runtime/colors/habamax.vim
+++ b/runtime/colors/habamax.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 02 Sep 2022 09:45:11 MSK
+" Last Updated: Fri 24 Mar 2023 20:28:06 AEDT
 
 " Generated by Colortemplate v2.2.0
 
@@ -40,38 +40,6 @@ hi! link vimParenSep Normal
 hi! link vimCommentString Comment
 hi! link gitCommitSummary Title
 hi! link markdownUrl String
-hi! link elixirOperator Statement
-hi! link elixirKeyword Statement
-hi! link elixirBlockDefinition Statement
-hi! link elixirDefine Statement
-hi! link elixirPrivateDefine Statement
-hi! link elixirGuard Statement
-hi! link elixirPrivateGuard Statement
-hi! link elixirModuleDefine Statement
-hi! link elixirProtocolDefine Statement
-hi! link elixirImplDefine Statement
-hi! link elixirRecordDefine Statement
-hi! link elixirPrivateRecordDefine Statement
-hi! link elixirMacroDefine Statement
-hi! link elixirPrivateMacroDefine Statement
-hi! link elixirDelegateDefine Statement
-hi! link elixirOverridableDefine Statement
-hi! link elixirExceptionDefine Statement
-hi! link elixirCallbackDefine Statement
-hi! link elixirStructDefine Statement
-hi! link elixirExUnitMacro Statement
-hi! link elixirInclude Statement
-hi! link elixirAtom PreProc
-hi! link elixirDocTest String
-hi ALEErrorSign guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi ALEInfoSign guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE
-hi ALEWarningSign guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi ALEError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE
-hi ALEVirtualTextError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE
-hi ALEWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE
-hi ALEVirtualTextWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE
-hi ALEInfo guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE
-hi ALEVirtualTextInfo guifg=#d7d787 guibg=NONE gui=NONE cterm=NONE
 hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE
 hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE
 hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
@@ -92,10 +60,14 @@ hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=#1c1c1c guibg=#87afaf gui=NONE cterm=NONE
 hi VisualNOS guifg=#1c1c1c guibg=#5f8787 gui=NONE cterm=NONE
-hi Pmenu guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+hi Pmenu guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuSel guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
+hi PmenuKind guifg=#d7875f guibg=#3a3a3a gui=NONE cterm=NONE
+hi PmenuKindSel guifg=#d75f5f guibg=#afaf87 gui=NONE cterm=NONE
+hi PmenuExtra guifg=#767676 guibg=#3a3a3a gui=NONE cterm=NONE
+hi PmenuExtraSel guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Error guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
 hi ErrorMsg guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
@@ -104,7 +76,7 @@ hi MoreMsg guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
 hi Question guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
 hi WarningMsg guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
 hi Todo guifg=#d7d787 guibg=#1c1c1c gui=reverse cterm=reverse
-hi MatchParen guifg=#5f8787 guibg=#1c1c1c gui=reverse cterm=reverse
+hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
 hi Search guifg=#1c1c1c guibg=#87af87 gui=NONE cterm=NONE
 hi IncSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
 hi CurSearch guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
@@ -116,7 +88,7 @@ hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
 hi Folded guifg=#9e9e9e guibg=#262626 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+hi ColorColumn guifg=NONE guibg=#3a3a3a gui=NONE cterm=NONE
 hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
 hi SpellCap guifg=NONE guibg=NONE guisp=#5f87af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
 hi SpellLocal guifg=NONE guibg=NONE guisp=#87af87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
@@ -136,13 +108,13 @@ hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold
 hi Conceal guifg=#767676 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
-hi DiffAdd guifg=#000000 guibg=#87af87 gui=NONE cterm=NONE
+hi DiffAdd guifg=#dadada guibg=#5f875f gui=NONE cterm=NONE
 hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE
 hi diffAdded guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
 hi diffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
 hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
-hi DiffChange guifg=#000000 guibg=#afafaf gui=NONE cterm=NONE
+hi DiffText guifg=#dadada guibg=#878787 gui=NONE cterm=NONE
+hi DiffChange guifg=#bcbcbc guibg=#5f5f5f gui=NONE cterm=NONE
 
 if s:t_Co >= 256
   hi! link Terminal Normal
@@ -163,38 +135,6 @@ if s:t_Co >= 256
   hi! link vimCommentString Comment
   hi! link gitCommitSummary Title
   hi! link markdownUrl String
-  hi! link elixirOperator Statement
-  hi! link elixirKeyword Statement
-  hi! link elixirBlockDefinition Statement
-  hi! link elixirDefine Statement
-  hi! link elixirPrivateDefine Statement
-  hi! link elixirGuard Statement
-  hi! link elixirPrivateGuard Statement
-  hi! link elixirModuleDefine Statement
-  hi! link elixirProtocolDefine Statement
-  hi! link elixirImplDefine Statement
-  hi! link elixirRecordDefine Statement
-  hi! link elixirPrivateRecordDefine Statement
-  hi! link elixirMacroDefine Statement
-  hi! link elixirPrivateMacroDefine Statement
-  hi! link elixirDelegateDefine Statement
-  hi! link elixirOverridableDefine Statement
-  hi! link elixirExceptionDefine Statement
-  hi! link elixirCallbackDefine Statement
-  hi! link elixirStructDefine Statement
-  hi! link elixirExUnitMacro Statement
-  hi! link elixirInclude Statement
-  hi! link elixirAtom PreProc
-  hi! link elixirDocTest String
-  hi ALEErrorSign ctermfg=167 ctermbg=NONE cterm=NONE
-  hi ALEInfoSign ctermfg=186 ctermbg=NONE cterm=NONE
-  hi ALEWarningSign ctermfg=139 ctermbg=NONE cterm=NONE
-  hi ALEError ctermfg=234 ctermbg=167 cterm=NONE
-  hi ALEVirtualTextError ctermfg=234 ctermbg=167 cterm=NONE
-  hi ALEWarning ctermfg=234 ctermbg=139 cterm=NONE
-  hi ALEVirtualTextWarning ctermfg=234 ctermbg=139 cterm=NONE
-  hi ALEInfo ctermfg=186 ctermbg=NONE cterm=NONE
-  hi ALEVirtualTextInfo ctermfg=186 ctermbg=NONE cterm=NONE
   hi Normal ctermfg=250 ctermbg=234 cterm=NONE
   hi Statusline ctermfg=234 ctermbg=247 cterm=NONE
   hi StatuslineNC ctermfg=234 ctermbg=243 cterm=NONE
@@ -215,10 +155,14 @@ if s:t_Co >= 256
   hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
   hi Visual ctermfg=234 ctermbg=109 cterm=NONE
   hi VisualNOS ctermfg=234 ctermbg=66 cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=235 cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=237 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=234 ctermbg=144 cterm=NONE
+  hi PmenuKind ctermfg=173 ctermbg=237 cterm=NONE
+  hi PmenuKindSel ctermfg=167 ctermbg=144 cterm=NONE
+  hi PmenuExtra ctermfg=243 ctermbg=237 cterm=NONE
+  hi PmenuExtraSel ctermfg=234 ctermbg=144 cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error ctermfg=167 ctermbg=234 cterm=reverse
   hi ErrorMsg ctermfg=167 ctermbg=234 cterm=reverse
@@ -227,7 +171,7 @@ if s:t_Co >= 256
   hi Question ctermfg=144 ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=173 ctermbg=NONE cterm=NONE
   hi Todo ctermfg=186 ctermbg=234 cterm=reverse
-  hi MatchParen ctermfg=66 ctermbg=234 cterm=reverse
+  hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
   hi Search ctermfg=234 ctermbg=108 cterm=NONE
   hi IncSearch ctermfg=234 ctermbg=215 cterm=NONE
   hi CurSearch ctermfg=234 ctermbg=144 cterm=NONE
@@ -237,7 +181,7 @@ if s:t_Co >= 256
   hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
   hi Folded ctermfg=247 ctermbg=235 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE
   hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
   hi SpellCap ctermfg=67 ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=108 ctermbg=NONE cterm=underline
@@ -257,27 +201,18 @@ if s:t_Co >= 256
   hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=66 ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=16 ctermbg=108 cterm=NONE
+  hi DiffAdd ctermfg=253 ctermbg=65 cterm=NONE
   hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE
   hi diffAdded ctermfg=108 ctermbg=NONE cterm=NONE
   hi diffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
   hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=188 cterm=NONE
-  hi DiffChange ctermfg=16 ctermbg=145 cterm=NONE
+  hi DiffText ctermfg=253 ctermbg=102 cterm=NONE
+  hi DiffChange ctermfg=250 ctermbg=59 cterm=NONE
   unlet s:t_Co
   finish
 endif
 
 if s:t_Co >= 16
-  hi ALEErrorSign ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi ALEInfoSign ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi ALEWarningSign ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi ALEError ctermfg=black ctermbg=darkred cterm=NONE
-  hi ALEVirtualTextError ctermfg=black ctermbg=darkred cterm=NONE
-  hi ALEWarning ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi ALEVirtualTextWarning ctermfg=black ctermbg=darkmagenta cterm=NONE
-  hi ALEInfo ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi ALEVirtualTextInfo ctermfg=yellow ctermbg=NONE cterm=NONE
   hi Normal ctermfg=white ctermbg=black cterm=NONE
   hi Statusline ctermfg=black ctermbg=gray cterm=NONE
   hi StatuslineNC ctermfg=black ctermbg=darkgray cterm=NONE
@@ -298,10 +233,14 @@ if s:t_Co >= 16
   hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Visual ctermfg=black ctermbg=cyan cterm=NONE
   hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkgray cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
+  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+  hi PmenuExtra ctermfg=darkgray ctermbg=gray cterm=NONE
+  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error ctermfg=darkred ctermbg=black cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
@@ -310,7 +249,7 @@ if s:t_Co >= 16
   hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
   hi Todo ctermfg=yellow ctermbg=black cterm=reverse
-  hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
   hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
   hi IncSearch ctermfg=black ctermbg=red cterm=NONE
   hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
@@ -340,13 +279,13 @@ if s:t_Co >= 16
   hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
   hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=black ctermbg=lightgrey cterm=NONE
-  hi DiffChange ctermfg=black ctermbg=darkgray cterm=NONE
+  hi DiffText ctermfg=white ctermbg=lightgrey cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkgray cterm=NONE
   unlet s:t_Co
   finish
 endif
@@ -370,12 +309,16 @@ if s:t_Co >= 8
   hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold
   hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
   hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold
-  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
   hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
+  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+  hi PmenuExtra ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
   hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
@@ -384,7 +327,7 @@ if s:t_Co >= 8
   hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse
-  hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
   hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
   hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
@@ -414,7 +357,7 @@ if s:t_Co >= 8
   hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
@@ -511,17 +454,19 @@ endif
 " Color: color07          #9E9E9E        247            gray
 " Color: color15          #BCBCBC        250            white
 " Color: colorLine        #303030        236            darkgrey
-" Color: colorB           #262626        235            darkgrey
+" Color: colorB           #3a3a3a        237            darkgrey
+" Color: colorF           #262626        235            darkgrey
 " Color: colorNonT        #585858        240            darkgrey
 " Color: colorC           #FFAF5F        215            red
 " Color: colorlC          #5FFF00        82             green
 " Color: colorV           #1F3F5F        109            cyan
-" Color: diffAdd          #87AF87        108            darkgreen
+" Color: colorMP          #ff00af        199            magenta
+" Color: diffAdd          #5f875f        65             darkgreen
 " Color: diffDelete       #af875f        137            darkyellow
-" Color: diffChange       #AFAFAF        145            darkgray
-" Color: diffText         #D7D7D7        188            lightgrey
+" Color: diffChange       #5f5f5f        59             darkgray
+" Color: diffText         #878787        102            lightgrey
 " Color: black            #000000        16             black
-" Color: white            #FFFFFF        231            white
+" Color: white            #dadada        253            white
 " Term colors: color00 color01 color02 color03 color04 color05 color06 color07
 " Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " vim: et ts=2 sw=2
diff --git a/runtime/colors/lunaperche.vim b/runtime/colors/lunaperche.vim
index 2954f622aa..44c75c40cb 100644
--- a/runtime/colors/lunaperche.vim
+++ b/runtime/colors/lunaperche.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)
-" Last Updated: Fri 16 Sep 2022 13:15:33 MSK
+" Last Updated: Sun 26 Mar 2023 23:04:18 AEDT
 
 " Generated by Colortemplate v2.2.0
 
@@ -16,24 +16,8 @@ let s:t_Co = &t_Co
 hi! link helpVim Title
 hi! link helpHeader Title
 hi! link helpHyperTextJump Underlined
-hi! link fugitiveSymbolicRef PreProc
-hi! link fugitiveHeading Statement
-hi! link fugitiveStagedHeading Statement
-hi! link fugitiveUnstagedHeading Statement
-hi! link fugitiveUntrackedHeading Statement
-hi! link fugitiveStagedModifier PreProc
-hi! link fugitiveUnstagedModifier PreProc
-hi! link fugitiveHash Constant
 hi! link diffFile PreProc
 hi! link markdownHeadingDelimiter Special
-hi! link rstSectionDelimiter Statement
-hi! link rstDirective PreProc
-hi! link rstHyperlinkReference Special
-hi! link rstFieldName Constant
-hi! link rstDelimiter Special
-hi! link rstInterpretedText Special
-hi! link rstCodeBlock Normal
-hi! link rstLiteralBlock rstCodeBlock
 hi! link markdownUrl String
 hi! link colortemplateKey Statement
 hi! link xmlTagName Statement
@@ -51,30 +35,6 @@ hi! link vimParenSep Normal
 hi! link vimOption Normal
 hi! link vimCommentString Comment
 hi! link pythonInclude Statement
-hi! link elixirOperator Statement
-hi! link elixirKeyword Statement
-hi! link elixirBlockDefinition Statement
-hi! link elixirDefine Statement
-hi! link elixirPrivateDefine Statement
-hi! link elixirGuard Statement
-hi! link elixirPrivateGuard Statement
-hi! link elixirModuleDefine Statement
-hi! link elixirProtocolDefine Statement
-hi! link elixirImplDefine Statement
-hi! link elixirRecordDefine Statement
-hi! link elixirPrivateRecordDefine Statement
-hi! link elixirMacroDefine Statement
-hi! link elixirPrivateMacroDefine Statement
-hi! link elixirDelegateDefine Statement
-hi! link elixirOverridableDefine Statement
-hi! link elixirExceptionDefine Statement
-hi! link elixirCallbackDefine Statement
-hi! link elixirStructDefine Statement
-hi! link elixirExUnitMacro Statement
-hi! link elixirInclude Statement
-hi! link elixirVariable Special
-hi! link elixirAtom Constant
-hi! link elixirDocTest String
 hi! link shQuote Constant
 hi! link shNoQuote Normal
 hi! link shTestOpr Normal
@@ -138,12 +98,16 @@ if &background ==# 'dark'
   hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
-  hi PmenuSel guifg=NONE guibg=#444444 gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuSel guifg=NONE guibg=#4e4e4e gui=NONE cterm=NONE
   hi PmenuThumb guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE
   hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#ff5f5f guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#ff5f5f guibg=#4e4e4e gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#767676 guibg=#4e4e4e gui=NONE cterm=NONE
   hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
   hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
@@ -165,8 +129,8 @@ if &background ==# 'dark'
   hi VisualNOS guifg=#000000 guibg=#5fafaf gui=NONE cterm=NONE
   hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE
   hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
-  hi Folded guifg=#767676 guibg=#1c1c1c gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellLocal guifg=NONE guibg=NONE guisp=#5faf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -184,9 +148,9 @@ if &background ==# 'dark'
   hi Directory guifg=#5fafff guibg=NONE gui=bold cterm=bold
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi DiffAdd guifg=#000000 guibg=#af87af gui=NONE cterm=NONE
-  hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
-  hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE
+  hi DiffAdd guifg=#c6c6c6 guibg=#875f87 gui=NONE cterm=NONE
+  hi DiffChange guifg=#c6c6c6 guibg=#5f5f5f gui=NONE cterm=NONE
+  hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
   hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
   hi diffAdded guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
   hi diffRemoved guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
@@ -230,10 +194,14 @@ else
   hi FoldColumn guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
   hi EndOfBuffer guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
   hi SpecialKey guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi PmenuSel guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE
   hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
   hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#af0000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#af0000 guibg=#c6c6c6 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#767676 guibg=#c6c6c6 gui=NONE cterm=NONE
   hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
   hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
@@ -253,10 +221,10 @@ else
   hi Visual guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
   hi MatchParen guifg=NONE guibg=#c5e7c5 gui=NONE cterm=NONE
   hi VisualNOS guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
-  hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi Folded guifg=#767676 guibg=#eeeeee gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -302,24 +270,8 @@ if s:t_Co >= 256
   hi! link helpVim Title
   hi! link helpHeader Title
   hi! link helpHyperTextJump Underlined
-  hi! link fugitiveSymbolicRef PreProc
-  hi! link fugitiveHeading Statement
-  hi! link fugitiveStagedHeading Statement
-  hi! link fugitiveUnstagedHeading Statement
-  hi! link fugitiveUntrackedHeading Statement
-  hi! link fugitiveStagedModifier PreProc
-  hi! link fugitiveUnstagedModifier PreProc
-  hi! link fugitiveHash Constant
   hi! link diffFile PreProc
   hi! link markdownHeadingDelimiter Special
-  hi! link rstSectionDelimiter Statement
-  hi! link rstDirective PreProc
-  hi! link rstHyperlinkReference Special
-  hi! link rstFieldName Constant
-  hi! link rstDelimiter Special
-  hi! link rstInterpretedText Special
-  hi! link rstCodeBlock Normal
-  hi! link rstLiteralBlock rstCodeBlock
   hi! link markdownUrl String
   hi! link colortemplateKey Statement
   hi! link xmlTagName Statement
@@ -337,30 +289,6 @@ if s:t_Co >= 256
   hi! link vimOption Normal
   hi! link vimCommentString Comment
   hi! link pythonInclude Statement
-  hi! link elixirOperator Statement
-  hi! link elixirKeyword Statement
-  hi! link elixirBlockDefinition Statement
-  hi! link elixirDefine Statement
-  hi! link elixirPrivateDefine Statement
-  hi! link elixirGuard Statement
-  hi! link elixirPrivateGuard Statement
-  hi! link elixirModuleDefine Statement
-  hi! link elixirProtocolDefine Statement
-  hi! link elixirImplDefine Statement
-  hi! link elixirRecordDefine Statement
-  hi! link elixirPrivateRecordDefine Statement
-  hi! link elixirMacroDefine Statement
-  hi! link elixirPrivateMacroDefine Statement
-  hi! link elixirDelegateDefine Statement
-  hi! link elixirOverridableDefine Statement
-  hi! link elixirExceptionDefine Statement
-  hi! link elixirCallbackDefine Statement
-  hi! link elixirStructDefine Statement
-  hi! link elixirExUnitMacro Statement
-  hi! link elixirInclude Statement
-  hi! link elixirVariable Special
-  hi! link elixirAtom Constant
-  hi! link elixirDocTest String
   hi! link shQuote Constant
   hi! link shNoQuote Normal
   hi! link shTestOpr Normal
@@ -417,12 +345,16 @@ if s:t_Co >= 256
     hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=234 cterm=NONE
-    hi PmenuSel ctermfg=NONE ctermbg=238 cterm=NONE
+    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=239 cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=251 cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=203 ctermbg=236 cterm=NONE
+    hi PmenuKindSel ctermfg=203 ctermbg=239 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE
+    hi PmenuExtraSel ctermfg=243 ctermbg=239 cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=231 ctermbg=203 cterm=NONE
     hi ErrorMsg ctermfg=231 ctermbg=203 cterm=NONE
@@ -442,8 +374,8 @@ if s:t_Co >= 256
     hi VisualNOS ctermfg=16 ctermbg=73 cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE
     hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE
-    hi Folded ctermfg=243 ctermbg=234 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=236 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE
     hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=73 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
@@ -461,9 +393,9 @@ if s:t_Co >= 256
     hi Directory ctermfg=75 ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=16 ctermbg=139 cterm=NONE
-    hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
-    hi DiffText ctermfg=16 ctermbg=80 cterm=NONE
+    hi DiffAdd ctermfg=251 ctermbg=96 cterm=NONE
+    hi DiffChange ctermfg=251 ctermbg=59 cterm=NONE
+    hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
     hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE
     hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE
     hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE
@@ -500,10 +432,14 @@ if s:t_Co >= 256
     hi FoldColumn ctermfg=247 ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=247 ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=255 cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=254 cterm=NONE
     hi PmenuSel ctermfg=NONE ctermbg=251 cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=124 ctermbg=254 cterm=NONE
+    hi PmenuKindSel ctermfg=124 ctermbg=251 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=254 cterm=NONE
+    hi PmenuExtraSel ctermfg=243 ctermbg=251 cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=231 ctermbg=160 cterm=NONE
     hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
@@ -521,10 +457,10 @@ if s:t_Co >= 256
     hi Visual ctermfg=231 ctermbg=67 cterm=NONE
     hi MatchParen ctermfg=30 ctermbg=231 cterm=reverse
     hi VisualNOS ctermfg=231 ctermbg=30 cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
-    hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-    hi Folded ctermfg=243 ctermbg=255 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=254 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
     hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline
@@ -585,12 +521,16 @@ if s:t_Co >= 16
     hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
     hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
     hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=white ctermbg=red cterm=NONE
     hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -629,8 +569,8 @@ if s:t_Co >= 16
     hi Directory ctermfg=blue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
     hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
     hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
     hi diffAdded ctermfg=green ctermbg=NONE cterm=NONE
@@ -669,9 +609,13 @@ if s:t_Co >= 16
     hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=white ctermbg=red cterm=NONE
     hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -751,14 +695,18 @@ if s:t_Co >= 8
     hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold
     hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
     hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=grey cterm=NONE
+    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=grey ctermbg=darkred cterm=NONE
     hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
@@ -796,8 +744,8 @@ if s:t_Co >= 8
     hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
     hi DiffText ctermfg=black ctermbg=grey cterm=NONE
     hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
   else
@@ -818,10 +766,14 @@ if s:t_Co >= 8
     hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=black cterm=NONE
+    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PmenuSel ctermfg=NONE ctermbg=darkcyan cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
+    hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=grey ctermbg=darkred cterm=NONE
     hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
@@ -956,20 +908,21 @@ endif
 " Color: color15                 #FFFFFF        231            white
 " Color: colorDimWhite           #E4E4E4        254            grey
 " Color: colorLine               #262626        235            darkgrey
-" Color: colorB                  #1C1C1C        234            darkgrey
+" Color: colorB                  #303030        236            darkgrey
 " Color: colorNonT               #585858        240            grey
 " Color: colorTab                #585858        240            grey
 " Color: colorC                  #FFFFFF        231            white
 " Color: colorlC                 #FF5FFF        207            magenta
 " Color: colorV                  #005F87        24             darkblue
 " Color: colorMP                 #C5E7C5        30             darkcyan
-" Color: colorPMenuSel           #444444        238            darkcyan
+" Color: colorPMenuSel           #4e4e4e        239            darkcyan
 " Color: colorDim                #878787        102            grey
-" Color: diffAdd                 #AF87AF        139            darkmagenta
+" Color: diffAdd                 #875f87        96             darkmagenta
 " Color: diffDelete              #D78787        174            darkred
-" Color: diffChange              #D0D0D0        252            lightgray
-" Color: diffText                #5FD7D7        80             cyan
-" Color: fgDiff                  #000000        16             black
+" Color: diffChange              #5f5f5f        59             darkgreen
+" Color: diffText                #5f8787        66             cyan
+" Color: fgDiffText              #afffff        159            black
+" Color: fgDiff                  #C6C6C6        251            white
 " Term colors: color00 color01 color02 color03 color04 color05 color06 color07
 " Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " Background: light
@@ -989,8 +942,8 @@ endif
 " Color: color14                 #008787        30             cyan
 " Color: color07                 #808080        244            grey
 " Color: color15                 #FFFFFF        231            white
-" Color: colorLine               #E4E4E4        254            grey
-" Color: colorB                  #EEEEEE        255            grey
+" Color: colorLine               #EEEEEE        255            grey
+" Color: colorB                  #E4E4E4        254            grey
 " Color: colorNonT               #9E9E9E        247            darkgrey
 " Color: colorTab                #BCBCBC        250            lightgrey
 " Color: colorC                  #000000        16             black
diff --git a/runtime/colors/quiet.vim b/runtime/colors/quiet.vim
index d286839250..9ab313b837 100644
--- a/runtime/colors/quiet.vim
+++ b/runtime/colors/quiet.vim
@@ -1,10 +1,10 @@
 " Name:         quiet
-" Description:  `monochrome`, but less ugly, with diffs, searches, a few other niceties, and both light and dark versions.
-" Author:       neutaaaaan <neutaaaaan-gh@protonmail.com>
-" Maintainer:   neutaaaaan <neutaaaaan-gh@protonmail.com>
+" Description:  A mostly monochrome colorscheme, with a few niceties.
+" Author:       Maxence Weynans <neutaaaaan@gmail.com>
+" Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)`
-" Last Updated: Fri 16 Sep 2022 09:52:50 MSK
+" Last Updated: Wed 15 Mar 2023 06:45:06 PM CET
 
 " Generated by Colortemplate v2.2.0
 
@@ -48,61 +48,66 @@ hi! link debugPC CursorLine
 
 if &background ==# 'dark'
   if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#080808', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
+    let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
     " Nvim uses g:terminal_color_{0-15} instead
     for i in range(g:terminal_ansi_colors->len())
       let g:terminal_color_{i} = g:terminal_ansi_colors[i]
     endfor
   endif
-  hi Normal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi Normal guifg=#dadada guibg=#000000 gui=NONE cterm=NONE
   hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
   hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
   hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi CursorLineNr guifg=#dadada guibg=#303030 gui=NONE cterm=NONE
-  hi DiffAdd guifg=#00af00 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffChange guifg=#87afd7 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffDelete guifg=#d75f5f guibg=#080808 gui=reverse cterm=reverse
-  hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
+  hi DiffAdd guifg=#00af00 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffChange guifg=#87afd7 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#d75f5f guibg=#000000 gui=reverse cterm=reverse
+  hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse
   hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#dadada guibg=#080808 gui=reverse cterm=reverse
+  hi EndOfBuffer guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#dadada guibg=#000000 gui=reverse cterm=reverse
   hi FoldColumn guifg=#707070 guibg=NONE gui=NONE cterm=NONE
-  hi Folded guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
-  hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
-  hi LineNr guifg=#444444 guibg=NONE gui=NONE cterm=NONE
+  hi Folded guifg=#707070 guibg=#000000 gui=NONE cterm=NONE
+  hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
   hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
   hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#080808 guibg=#87afd7 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=#dadada guibg=#707070 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi PmenuThumb guifg=#dadada guibg=#d787d7 gui=NONE cterm=NONE
+  hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold
+  hi PmenuSbar guifg=#707070 guibg=#585858 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#000000 guibg=#dadada gui=bold cterm=bold
+  hi PmenuThumb guifg=#dadada guibg=#dadada gui=NONE cterm=NONE
   hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
+  hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
   hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#707070 guibg=NONE gui=bold cterm=bold
   hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl cterm=underline
   hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline
   hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
   hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline
-  hi StatusLine guifg=#080808 guibg=#dadada gui=bold cterm=bold
-  hi StatusLineNC guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
-  hi TabLine guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
+  hi StatusLine guifg=#000000 guibg=#dadada gui=bold cterm=bold
+  hi StatusLineNC guifg=#707070 guibg=#000000 gui=reverse cterm=reverse
+  hi TabLine guifg=#707070 guibg=#000000 gui=reverse cterm=reverse
   hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi TabLineSel guifg=#080808 guibg=#dadada gui=bold cterm=bold
+  hi TabLineSel guifg=#000000 guibg=#dadada gui=bold cterm=bold
   hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
-  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi VertSplit guifg=#707070 guibg=#000000 gui=NONE cterm=NONE
+  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold
+  hi WildMenu guifg=#00afff guibg=#000000 gui=bold cterm=bold
   hi Comment guifg=#707070 guibg=NONE gui=bold cterm=bold
   hi Constant guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
+  hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse
   hi Identifier guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi PreProc guifg=#dadada guibg=NONE gui=NONE cterm=NONE
@@ -111,131 +116,141 @@ if &background ==# 'dark'
   hi Todo guifg=#00ffaf guibg=NONE gui=bold,reverse cterm=bold,reverse
   hi Type guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline
-  hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE
-  hi ToolbarLine guifg=NONE guibg=#080808 gui=NONE cterm=NONE
-  hi ToolbarButton guifg=#dadada guibg=#080808 gui=bold cterm=bold
+  hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
+  hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+  hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold
 else
   " Light background
   if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#080808', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+    let g:terminal_ansi_colors = ['#000000', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
     " Nvim uses g:terminal_color_{0-15} instead
     for i in range(g:terminal_ansi_colors->len())
       let g:terminal_color_{i} = g:terminal_ansi_colors[i]
     endfor
   endif
-  hi Normal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Normal guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
   hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
   hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
   hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
   hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi CursorLineNr guifg=#080808 guibg=#eeeeee gui=NONE cterm=NONE
-  hi DiffAdd guifg=#87d787 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffChange guifg=#afafd7 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffDelete guifg=#d78787 guibg=#080808 gui=reverse cterm=reverse
-  hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Directory guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#080808 guibg=#d7d7d7 gui=reverse cterm=reverse
+  hi CursorLineNr guifg=#000000 guibg=#eeeeee gui=NONE cterm=NONE
+  hi DiffAdd guifg=#87d787 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffChange guifg=#afafd7 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#d78787 guibg=#000000 gui=reverse cterm=reverse
+  hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse
+  hi Directory guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#000000 guibg=#d7d7d7 gui=reverse cterm=reverse
   hi FoldColumn guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi Folded guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi LineNr guifg=#a8a8a8 guibg=NONE gui=NONE cterm=NONE
   hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold
-  hi ModeMsg guifg=#080808 guibg=NONE gui=bold cterm=bold
-  hi MoreMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#080808 guibg=#afafd7 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=#080808 guibg=#626262 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi PmenuThumb guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi Question guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
-  hi SignColumn guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold
+  hi PmenuSbar guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#d7d7d7 guibg=#000000 gui=bold cterm=bold
+  hi PmenuThumb guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
+  hi Question guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
+  hi SignColumn guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#626262 guibg=NONE gui=bold cterm=bold
   hi SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl cterm=underline
   hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl cterm=underline
   hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl cterm=underline
   hi SpellRare guifg=#008787 guibg=#d7d7d7 guisp=#008787 gui=undercurl cterm=underline
-  hi StatusLine guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
-  hi StatusLineNC guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi TabLine guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi TabLineFill guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi TabLineSel guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
+  hi StatusLine guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
+  hi StatusLineNC guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi TabLineFill guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
   hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi WarningMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold
-  hi Comment guifg=#080808 guibg=NONE gui=bold cterm=bold
-  hi Constant guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
-  hi Identifier guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Ignore guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Todo guifg=#00ffaf guibg=#080808 gui=bold,reverse cterm=bold,reverse
-  hi Type guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Underlined guifg=#080808 guibg=NONE gui=underline cterm=underline
-  hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE
+  hi WarningMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#eeeeee gui=bold cterm=bold
+  hi Comment guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi Constant guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi Identifier guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#00ffaf guibg=#000000 gui=bold,reverse cterm=bold,reverse
+  hi Type guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#000000 guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
   hi ToolbarLine guifg=NONE guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi ToolbarButton guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
+  hi ToolbarButton guifg=#000000 guibg=#d7d7d7 gui=bold cterm=bold
 endif
 
 if s:t_Co >= 256
   if &background ==# 'dark'
-    hi Normal ctermfg=253 ctermbg=232 cterm=NONE
+    hi Normal ctermfg=253 ctermbg=16 cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
     hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
     hi CursorLineNr ctermfg=253 ctermbg=236 cterm=NONE
-    hi DiffAdd ctermfg=34 ctermbg=232 cterm=reverse
-    hi DiffChange ctermfg=110 ctermbg=232 cterm=reverse
-    hi DiffDelete ctermfg=167 ctermbg=232 cterm=reverse
-    hi DiffText ctermfg=176 ctermbg=232 cterm=reverse
+    hi DiffAdd ctermfg=34 ctermbg=16 cterm=reverse
+    hi DiffChange ctermfg=110 ctermbg=16 cterm=reverse
+    hi DiffDelete ctermfg=167 ctermbg=16 cterm=reverse
+    hi DiffText ctermfg=176 ctermbg=16 cterm=reverse
     hi Directory ctermfg=253 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=253 ctermbg=NONE cterm=NONE
-    hi ErrorMsg ctermfg=253 ctermbg=232 cterm=reverse
+    hi EndOfBuffer ctermfg=242 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=253 ctermbg=16 cterm=reverse
     hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=242 ctermbg=232 cterm=NONE
-    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
-    hi LineNr ctermfg=238 ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=242 ctermbg=16 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
     hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=232 ctermbg=110 cterm=NONE
-    hi PmenuSbar ctermfg=253 ctermbg=242 cterm=NONE
-    hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
-    hi PmenuThumb ctermfg=253 ctermbg=176 cterm=NONE
+    hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
+    hi PmenuSbar ctermfg=242 ctermbg=240 cterm=NONE
+    hi PmenuSel ctermfg=16 ctermbg=253 cterm=NONE
+    hi PmenuExtraSel ctermfg=16 ctermbg=253 cterm=NONE
+    hi PmenuKindSel ctermfg=16 ctermbg=253 cterm=bold
+    hi PmenuThumb ctermfg=253 ctermbg=253 cterm=NONE
     hi Question ctermfg=253 ctermbg=NONE cterm=NONE
-    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
-    hi Search ctermfg=39 ctermbg=232 cterm=reverse
+    hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
+    hi Search ctermfg=39 ctermbg=16 cterm=reverse
     hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=253 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=242 ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=32 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline
-    hi StatusLine ctermfg=232 ctermbg=253 cterm=bold
-    hi StatusLineNC ctermfg=242 ctermbg=232 cterm=reverse
-    hi TabLine ctermfg=242 ctermbg=232 cterm=reverse
+    hi StatusLine ctermfg=16 ctermbg=253 cterm=bold
+    hi StatusLineNC ctermfg=242 ctermbg=16 cterm=reverse
+    hi TabLine ctermfg=242 ctermbg=16 cterm=reverse
     hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
-    hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold
+    hi TabLineSel ctermfg=16 ctermbg=253 cterm=bold
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=242 ctermbg=232 cterm=NONE
-    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
+    hi VertSplit ctermfg=242 ctermbg=16 cterm=NONE
+    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE
     hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=39 ctermbg=232 cterm=bold
+    hi WildMenu ctermfg=39 ctermbg=16 cterm=bold
     hi Comment ctermfg=242 ctermbg=NONE cterm=bold
     hi Constant ctermfg=253 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
+    hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse
     hi Identifier ctermfg=253 ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=253 ctermbg=NONE cterm=NONE
@@ -244,71 +259,76 @@ if s:t_Co >= 256
     hi Todo ctermfg=49 ctermbg=NONE cterm=bold,reverse
     hi Type ctermfg=253 ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=253 ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE
-    hi ToolbarLine ctermfg=NONE ctermbg=232 cterm=NONE
-    hi ToolbarButton ctermfg=253 ctermbg=232 cterm=bold
+    hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
+    hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
   else
     " Light background
-    hi Normal ctermfg=232 ctermbg=188 cterm=NONE
+    hi Normal ctermfg=16 ctermbg=188 cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
     hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
     hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
-    hi CursorLineNr ctermfg=232 ctermbg=255 cterm=NONE
-    hi DiffAdd ctermfg=114 ctermbg=232 cterm=reverse
-    hi DiffChange ctermfg=146 ctermbg=232 cterm=reverse
-    hi DiffDelete ctermfg=174 ctermbg=232 cterm=reverse
-    hi DiffText ctermfg=176 ctermbg=232 cterm=reverse
-    hi Directory ctermfg=232 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=232 ctermbg=NONE cterm=NONE
-    hi ErrorMsg ctermfg=232 ctermbg=188 cterm=reverse
+    hi CursorLineNr ctermfg=16 ctermbg=255 cterm=NONE
+    hi DiffAdd ctermfg=114 ctermbg=16 cterm=reverse
+    hi DiffChange ctermfg=146 ctermbg=16 cterm=reverse
+    hi DiffDelete ctermfg=174 ctermbg=16 cterm=reverse
+    hi DiffText ctermfg=176 ctermbg=16 cterm=reverse
+    hi Directory ctermfg=16 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=241 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=16 ctermbg=188 cterm=reverse
     hi FoldColumn ctermfg=241 ctermbg=NONE cterm=NONE
     hi Folded ctermfg=241 ctermbg=188 cterm=NONE
-    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
+    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
     hi LineNr ctermfg=248 ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=199 ctermbg=188 cterm=bold
-    hi ModeMsg ctermfg=232 ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=232 ctermbg=NONE cterm=NONE
+    hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=16 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=241 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=232 ctermbg=146 cterm=NONE
-    hi PmenuSbar ctermfg=232 ctermbg=241 cterm=NONE
-    hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
-    hi PmenuThumb ctermfg=232 ctermbg=176 cterm=NONE
-    hi Question ctermfg=232 ctermbg=NONE cterm=NONE
-    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
-    hi Search ctermfg=39 ctermbg=232 cterm=reverse
-    hi SignColumn ctermfg=232 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
+    hi PmenuSbar ctermfg=16 ctermbg=254 cterm=NONE
+    hi PmenuSel ctermfg=188 ctermbg=16 cterm=NONE
+    hi PmenuExtraSel ctermfg=188 ctermbg=16 cterm=NONE
+    hi PmenuKindSel ctermfg=188 ctermbg=16 cterm=bold
+    hi PmenuThumb ctermfg=16 ctermbg=16 cterm=NONE
+    hi Question ctermfg=16 ctermbg=NONE cterm=NONE
+    hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
+    hi Search ctermfg=39 ctermbg=16 cterm=reverse
+    hi SignColumn ctermfg=16 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=241 ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=124 ctermbg=188 cterm=underline
     hi SpellCap ctermfg=25 ctermbg=188 cterm=underline
     hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline
     hi SpellRare ctermfg=30 ctermbg=188 cterm=underline
-    hi StatusLine ctermfg=255 ctermbg=232 cterm=bold
-    hi StatusLineNC ctermfg=232 ctermbg=248 cterm=NONE
-    hi TabLine ctermfg=232 ctermbg=248 cterm=NONE
-    hi TabLineFill ctermfg=232 ctermbg=188 cterm=NONE
-    hi TabLineSel ctermfg=255 ctermbg=232 cterm=bold
+    hi StatusLine ctermfg=255 ctermbg=16 cterm=bold
+    hi StatusLineNC ctermfg=16 ctermbg=248 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=248 cterm=NONE
+    hi TabLineFill ctermfg=16 ctermbg=188 cterm=NONE
+    hi TabLineSel ctermfg=255 ctermbg=16 cterm=bold
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE
-    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
+    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
-    hi WarningMsg ctermfg=232 ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=232 ctermbg=255 cterm=bold
-    hi Comment ctermfg=232 ctermbg=NONE cterm=bold
-    hi Constant ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
-    hi Identifier ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=232 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=49 ctermbg=232 cterm=bold,reverse
-    hi Type ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=232 ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE
+    hi WarningMsg ctermfg=16 ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=255 cterm=bold
+    hi Comment ctermfg=16 ctermbg=NONE cterm=bold
+    hi Constant ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse
+    hi Identifier ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=16 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=49 ctermbg=16 cterm=bold,reverse
+    hi Type ctermfg=16 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=16 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
     hi ToolbarLine ctermfg=NONE ctermbg=188 cterm=NONE
-    hi ToolbarButton ctermfg=232 ctermbg=188 cterm=bold
+    hi ToolbarButton ctermfg=16 ctermbg=188 cterm=bold
   endif
   unlet s:t_Co
   finish
@@ -316,6 +336,19 @@ endif
 
 if s:t_Co >= 16
   if &background ==# 'dark'
+    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi Search ctermfg=cyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -328,43 +361,35 @@ if s:t_Co >= 16
     hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
     hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
     hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -378,6 +403,18 @@ if s:t_Co >= 16
     hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   else
     " Light background
+    hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi Search ctermfg=cyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -390,43 +427,36 @@ if s:t_Co >= 16
     hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
     hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
     hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -445,6 +475,19 @@ endif
 
 if s:t_Co >= 8
   if &background ==# 'dark'
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -457,43 +500,35 @@ if s:t_Co >= 8
     hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
     hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
     hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -507,6 +542,18 @@ if s:t_Co >= 8
     hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
   else
     " Light background
+    hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -519,43 +566,36 @@ if s:t_Co >= 8
     hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
     hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
     hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=bold,reverse,underline
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
     hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Question ctermfg=NONE ctermbg=NONE cterm=standout
     hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -641,7 +681,7 @@ if s:t_Co >= 0
 endif
 
 " Background: dark
-" Color: dark0         #080808           232               black
+" Color: dark0         #000000           16                black
 " Color: dark1         #d7005f           161               darkred
 " Color: dark2         #00af5f           35                darkgreen
 " Color: dark3         #d78700           172               darkyellow
@@ -669,13 +709,15 @@ endif
 " Color: uiamber       #ffaf00           214               darkyellow
 " Color: uiblack       #303030           236               darkgrey
 " Color: yasogrey      #1c1c1c           234               black
-" Color: linenrblack   #444444           238               darkgrey
+" Color: linenrblack   #585858           240               darkgrey
+" Color: uicursearch   #ff5fff           207               magenta
+" Color: invisigrey    #a8a8a8           248               darkgrey
 " Color: errorred      #ff005f           197               red
 " Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
 " Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
 " Background: light
 " Color: brightwhite   #eeeeee           255               grey
-" Color: light0        #080808           232               black
+" Color: light0        #000000           16                black
 " Color: light1        #af0000           124               darkred
 " Color: light2        #005f00           22                darkgreen
 " Color: light3        #af5f00           130               darkyellow
@@ -703,6 +745,7 @@ endif
 " Color: uiamber       #ffaf00           214               yellow
 " Color: invisigrey    #a8a8a8           248               darkgrey
 " Color: yasogrey      #e4e4e4           254               grey
+" Color: uicursearch   #ff5fff           207               magenta
 " Color: errorred      #ff005f           197               red
 " Term colors: light0 light1 light2 light3 light4 light5 light6 light7
 " Term colors: light8 light9 light10 light11 light12 light13 light14 light15
diff --git a/runtime/colors/retrobox.vim b/runtime/colors/retrobox.vim
new file mode 100644
index 0000000000..c0c4f9f6c2
--- /dev/null
+++ b/runtime/colors/retrobox.vim
@@ -0,0 +1,882 @@
+" Name:         Retro Box
+" Description:  Retro groove color scheme similar to gruvbox originally designed by morhetz <morhetz@gmail.com>
+" Author:       Maxim Kim <habamax@gmail.com>, ported from gruvbox8 of Lifepillar <lifepillar@lifepillar.me>
+" Maintainer:   Maxim Kim <habamax@gmail.com>, ported from gruvbox8 of Lifepillar <lifepillar@lifepillar.me>
+" Website:      https://www.github.com/vim/colorschemes
+" License:      Vim License (see `:help license`)
+" Last Updated: Sun 12 Mar 2023 15:14:04 AEDT
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'retrobox'
+
+let s:t_Co = &t_Co
+
+hi! link CursorColumn CursorLine
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link VisualNOS Visual
+hi! link Tag Special
+hi! link lCursor Cursor
+hi! link MessageWindow PMenu
+hi! link PopupNotification Todo
+hi! link CurSearch Search
+
+if &background ==# 'dark'
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#1c1c1c', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2']
+    " Nvim uses g:terminal_color_{0-15} instead
+    for i in range(g:terminal_ansi_colors->len())
+      let g:terminal_color_{i} = g:terminal_ansi_colors[i]
+    endfor
+  endif
+  hi Normal guifg=#ebdbb2 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#fabd2f guibg=#303030 gui=NONE cterm=NONE
+  hi FoldColumn guifg=#928374 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi SignColumn guifg=#928374 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi VertSplit guifg=#303030 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+  hi Comment guifg=#928374 guibg=NONE gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi Error guifg=#fb4934 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
+  hi ErrorMsg guifg=#1c1c1c guibg=#fb4934 gui=bold cterm=bold
+  hi Folded guifg=#928374 guibg=#121212 gui=NONE cterm=NONE
+  hi LineNr guifg=#7c6f64 guibg=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=NONE guibg=#504945 gui=bold,underline cterm=bold,underline
+  hi NonText guifg=#504945 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#ebdbb2 guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#3c3836 guibg=#83a598 gui=bold cterm=bold
+  hi PmenuThumb guifg=NONE guibg=#7c6f64 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#fb4934 guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#fb4934 guibg=#83a598 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#a89984 guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#303030 guibg=#83a598 gui=NONE cterm=NONE
+  hi SpecialKey guifg=#928374 guibg=NONE gui=NONE cterm=NONE
+  hi StatusLine guifg=#504945 guibg=#ebdbb2 gui=bold,reverse cterm=bold,reverse
+  hi StatusLineNC guifg=#3c3836 guibg=#a89984 gui=reverse cterm=reverse
+  hi TabLine guifg=#a89984 guibg=#3c3836 gui=NONE cterm=NONE
+  hi TabLineFill guifg=#ebdbb2 guibg=#3c3836 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#fbf1c7 guibg=#1c1c1c gui=bold cterm=bold
+  hi ToolbarButton guifg=#fbf1c7 guibg=#303030 gui=bold cterm=bold
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual guifg=#1c1c1c guibg=#83a598 gui=NONE cterm=NONE
+  hi WildMenu guifg=#83a598 guibg=#504945 gui=bold cterm=bold
+  hi EndOfBuffer guifg=#504945 guibg=NONE gui=NONE cterm=NONE
+  hi Conceal guifg=#83a598 guibg=NONE gui=NONE cterm=NONE
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi DiffAdd guifg=#b8bb26 guibg=#1c1c1c gui=reverse cterm=reverse
+  hi DiffChange guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse
+  hi DiffDelete guifg=#fb4934 guibg=#1c1c1c gui=reverse cterm=reverse
+  hi DiffText guifg=#fabd2f guibg=#1c1c1c gui=reverse cterm=reverse
+  hi Directory guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
+  hi IncSearch guifg=#fe8019 guibg=#1c1c1c gui=reverse cterm=reverse
+  hi ModeMsg guifg=#fabd2f guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#fabd2f guibg=NONE gui=bold cterm=bold
+  hi Question guifg=#fe8019 guibg=NONE gui=bold cterm=bold
+  hi Search guifg=#98971a guibg=#1c1c1c gui=reverse cterm=reverse
+  hi QuickFixLine guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse
+  hi SpellBad guifg=#fb4934 guibg=NONE guisp=#fb4934 gui=undercurl cterm=underline
+  hi SpellCap guifg=#83a598 guibg=NONE guisp=#83a598 gui=undercurl cterm=underline
+  hi SpellLocal guifg=#8ec07c guibg=NONE guisp=#8ec07c gui=undercurl cterm=underline
+  hi SpellRare guifg=#d3869b guibg=NONE guisp=#d3869b gui=undercurl cterm=underline
+  hi Title guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
+  hi WarningMsg guifg=#fb4934 guibg=NONE gui=bold cterm=bold
+  hi Boolean guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Character guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Conditional guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Define guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Debug guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Delimiter guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#fb4934 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
+  hi Exception guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Float guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Function guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
+  hi Identifier guifg=#83a598 guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE
+  hi Include guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Keyword guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Label guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Macro guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Number guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
+  hi Operator guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi PreCondit guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Repeat guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialChar guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialComment guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
+  hi StorageClass guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#b8bb26 guibg=NONE gui=NONE cterm=NONE
+  hi Structure guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=fg guibg=#1c1c1c gui=bold cterm=bold
+  hi Type guifg=#fabd2f guibg=NONE gui=NONE cterm=NONE
+  hi Typedef guifg=#fabd2f guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#83a598 guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+else
+  " Light background
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#3c3836', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#7c6f64', '#928374', '#9d0006', '#79740e', '#b57614', '#076678', '#8f3f71', '#427b58', '#fbf1c7']
+    " Nvim uses g:terminal_color_{0-15} instead
+    for i in range(g:terminal_ansi_colors->len())
+      let g:terminal_color_{i} = g:terminal_ansi_colors[i]
+    endfor
+  endif
+  hi Normal guifg=#3c3836 guibg=#fbf1c7 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#b57614 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi FoldColumn guifg=#928374 guibg=#fbf1c7 gui=NONE cterm=NONE
+  hi SignColumn guifg=#3c3836 guibg=#fbf1c7 gui=NONE cterm=NONE
+  hi VertSplit guifg=#bdae93 guibg=#fbf1c7 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#ebe1b7 gui=NONE cterm=NONE
+  hi Comment guifg=#928374 guibg=NONE gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi Error guifg=#9d0006 guibg=#fbf1c7 gui=bold,reverse cterm=bold,reverse
+  hi ErrorMsg guifg=#fbf1c7 guibg=#9d0006 gui=bold cterm=bold
+  hi Folded guifg=#928374 guibg=#ffffd7 gui=NONE cterm=NONE
+  hi LineNr guifg=#a89984 guibg=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=NONE guibg=#e5d4b1 gui=bold,underline cterm=bold,underline
+  hi NonText guifg=#e5d4b1 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#3c3836 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#e5d4b1 guibg=#076678 gui=bold cterm=bold
+  hi PmenuThumb guifg=NONE guibg=#a89984 gui=NONE cterm=NONE
+  hi PmenuKind guifg=#9d0006 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#9d0006 guibg=#076678 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#7c6f64 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#bdae93 guibg=#076678 gui=NONE cterm=NONE
+  hi SpecialKey guifg=#928374 guibg=NONE gui=NONE cterm=NONE
+  hi StatusLine guifg=#bdae93 guibg=#3c3836 gui=bold,reverse cterm=bold,reverse
+  hi StatusLineNC guifg=#ebdbb2 guibg=#3c3836 gui=reverse cterm=reverse
+  hi TabLine guifg=#665c54 guibg=#ebdbb2 gui=NONE cterm=NONE
+  hi TabLineFill guifg=#ebdbb2 guibg=#ebdbb2 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#282828 guibg=#fbf1c7 gui=bold cterm=bold
+  hi ToolbarButton guifg=#282828 guibg=#bdae93 gui=bold cterm=bold
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual guifg=#fbf1c7 guibg=#076678 gui=NONE cterm=NONE
+  hi WildMenu guifg=#076678 guibg=#e5d4b1 gui=bold cterm=bold
+  hi EndOfBuffer guifg=#e5d4b1 guibg=NONE gui=NONE cterm=NONE
+  hi Conceal guifg=#076678 guibg=NONE gui=NONE cterm=NONE
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi DiffAdd guifg=#79740e guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi DiffChange guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#9d0006 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi DiffText guifg=#b57614 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi Directory guifg=#79740e guibg=NONE gui=bold cterm=bold
+  hi IncSearch guifg=#ff5f00 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi ModeMsg guifg=#3c3836 guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#3c3836 guibg=NONE gui=bold cterm=bold
+  hi Question guifg=#ff5f00 guibg=NONE gui=bold cterm=bold
+  hi Search guifg=#98971a guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi QuickFixLine guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse
+  hi SpellBad guifg=#9d0006 guibg=NONE guisp=#9d0006 gui=undercurl cterm=underline
+  hi SpellCap guifg=#076678 guibg=NONE guisp=#076678 gui=undercurl cterm=underline
+  hi SpellLocal guifg=#427b58 guibg=NONE guisp=#427b58 gui=undercurl cterm=underline
+  hi SpellRare guifg=#8f3f71 guibg=NONE guisp=#8f3f71 gui=undercurl cterm=underline
+  hi Title guifg=#79740e guibg=NONE gui=bold cterm=bold
+  hi WarningMsg guifg=#9d0006 guibg=NONE gui=bold cterm=bold
+  hi Boolean guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Character guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Conditional guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Define guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Debug guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Delimiter guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#9d0006 guibg=#fbf1c7 gui=bold,reverse cterm=bold,reverse
+  hi Exception guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Float guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Function guifg=#79740e guibg=NONE gui=bold cterm=bold
+  hi Identifier guifg=#076678 guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE
+  hi Include guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Keyword guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Label guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Macro guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Number guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
+  hi Operator guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi PreCondit guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Repeat guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialChar guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialComment guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
+  hi StorageClass guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#79740e guibg=NONE gui=NONE cterm=NONE
+  hi Structure guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=fg guibg=#fbf1c7 gui=bold cterm=bold
+  hi Type guifg=#b57614 guibg=NONE gui=NONE cterm=NONE
+  hi Typedef guifg=#b57614 guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#076678 guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+endif
+
+if s:t_Co >= 256
+  if &background ==# 'dark'
+    hi Normal ctermfg=187 ctermbg=234 cterm=NONE
+    hi CursorLineNr ctermfg=214 ctermbg=236 cterm=NONE
+    hi FoldColumn ctermfg=102 ctermbg=234 cterm=NONE
+    hi SignColumn ctermfg=102 ctermbg=234 cterm=NONE
+    hi VertSplit ctermfg=236 ctermbg=234 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=16 cterm=NONE
+    hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
+    hi Error ctermfg=203 ctermbg=234 cterm=bold,reverse
+    hi ErrorMsg ctermfg=234 ctermbg=203 cterm=bold
+    hi Folded ctermfg=102 ctermbg=233 cterm=NONE
+    hi LineNr ctermfg=243 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=239 cterm=bold,underline
+    hi NonText ctermfg=239 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=187 ctermbg=237 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=237 cterm=NONE
+    hi PmenuSel ctermfg=237 ctermbg=109 cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
+    hi PmenuKind ctermfg=203 ctermbg=237 cterm=NONE
+    hi PmenuKindSel ctermfg=203 ctermbg=109 cterm=NONE
+    hi PmenuExtra ctermfg=102 ctermbg=237 cterm=NONE
+    hi PmenuExtraSel ctermfg=236 ctermbg=109 cterm=NONE
+    hi SpecialKey ctermfg=102 ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=239 ctermbg=187 cterm=bold,reverse
+    hi StatusLineNC ctermfg=237 ctermbg=102 cterm=reverse
+    hi TabLine ctermfg=102 ctermbg=237 cterm=NONE
+    hi TabLineFill ctermfg=187 ctermbg=237 cterm=NONE
+    hi TabLineSel ctermfg=230 ctermbg=234 cterm=bold
+    hi ToolbarButton ctermfg=230 ctermbg=236 cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=234 ctermbg=109 cterm=NONE
+    hi WildMenu ctermfg=109 ctermbg=239 cterm=bold
+    hi EndOfBuffer ctermfg=239 ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=109 ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=142 ctermbg=234 cterm=reverse
+    hi DiffChange ctermfg=107 ctermbg=234 cterm=reverse
+    hi DiffDelete ctermfg=203 ctermbg=234 cterm=reverse
+    hi DiffText ctermfg=214 ctermbg=234 cterm=reverse
+    hi Directory ctermfg=142 ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=208 ctermbg=234 cterm=reverse
+    hi ModeMsg ctermfg=214 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=214 ctermbg=NONE cterm=bold
+    hi Question ctermfg=208 ctermbg=NONE cterm=bold
+    hi Search ctermfg=100 ctermbg=234 cterm=reverse
+    hi QuickFixLine ctermfg=107 ctermbg=234 cterm=reverse
+    hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=109 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=107 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=175 ctermbg=NONE cterm=underline
+    hi Title ctermfg=142 ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=203 ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Character ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Define ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=208 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=203 ctermbg=234 cterm=bold,reverse
+    hi Exception ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Float ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Function ctermfg=142 ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Label ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Number ctermfg=175 ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=107 ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=107 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=203 ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=203 ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=203 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=203 ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=208 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=208 ctermbg=NONE cterm=NONE
+    hi String ctermfg=142 ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=107 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=234 cterm=bold
+    hi Type ctermfg=214 ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=214 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=109 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  else
+    " Light background
+    hi Normal ctermfg=237 ctermbg=230 cterm=NONE
+    hi CursorLineNr ctermfg=172 ctermbg=188 cterm=NONE
+    hi FoldColumn ctermfg=102 ctermbg=230 cterm=NONE
+    hi SignColumn ctermfg=237 ctermbg=230 cterm=NONE
+    hi VertSplit ctermfg=144 ctermbg=230 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=229 cterm=NONE
+    hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=188 cterm=NONE
+    hi Error ctermfg=124 ctermbg=230 cterm=bold,reverse
+    hi ErrorMsg ctermfg=230 ctermbg=124 cterm=bold
+    hi Folded ctermfg=102 ctermbg=231 cterm=NONE
+    hi LineNr ctermfg=137 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=188 cterm=bold,underline
+    hi NonText ctermfg=188 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=237 ctermbg=188 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=188 cterm=NONE
+    hi PmenuSel ctermfg=188 ctermbg=23 cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=137 cterm=NONE
+    hi PmenuKind ctermfg=124 ctermbg=188 cterm=NONE
+    hi PmenuKindSel ctermfg=124 ctermbg=23 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=188 cterm=NONE
+    hi PmenuExtraSel ctermfg=144 ctermbg=23 cterm=NONE
+    hi SpecialKey ctermfg=102 ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=144 ctermbg=237 cterm=bold,reverse
+    hi StatusLineNC ctermfg=187 ctermbg=237 cterm=reverse
+    hi TabLine ctermfg=59 ctermbg=187 cterm=NONE
+    hi TabLineFill ctermfg=187 ctermbg=187 cterm=NONE
+    hi TabLineSel ctermfg=235 ctermbg=230 cterm=bold
+    hi ToolbarButton ctermfg=235 ctermbg=144 cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=230 ctermbg=23 cterm=NONE
+    hi WildMenu ctermfg=23 ctermbg=188 cterm=bold
+    hi EndOfBuffer ctermfg=188 ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=23 ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=64 ctermbg=230 cterm=reverse
+    hi DiffChange ctermfg=29 ctermbg=230 cterm=reverse
+    hi DiffDelete ctermfg=124 ctermbg=230 cterm=reverse
+    hi DiffText ctermfg=172 ctermbg=230 cterm=reverse
+    hi Directory ctermfg=64 ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=202 ctermbg=230 cterm=reverse
+    hi ModeMsg ctermfg=237 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=237 ctermbg=NONE cterm=bold
+    hi Question ctermfg=202 ctermbg=NONE cterm=bold
+    hi Search ctermfg=100 ctermbg=230 cterm=reverse
+    hi QuickFixLine ctermfg=29 ctermbg=230 cterm=reverse
+    hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=29 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=126 ctermbg=NONE cterm=underline
+    hi Title ctermfg=64 ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=124 ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Character ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Define ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=202 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=124 ctermbg=230 cterm=bold,reverse
+    hi Exception ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Float ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Function ctermfg=64 ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=23 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Label ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Number ctermfg=126 ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=29 ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=29 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=124 ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=124 ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=124 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=124 ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=202 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=202 ctermbg=NONE cterm=NONE
+    hi String ctermfg=64 ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=29 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=230 cterm=bold
+    hi Type ctermfg=172 ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=172 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=23 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  if &background ==# 'dark'
+    hi Normal ctermfg=White ctermbg=Black cterm=NONE
+    hi ColorColumn ctermfg=Black ctermbg=DarkYellow cterm=NONE
+    hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=Black cterm=reverse
+    hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE
+    hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi LineNr ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=Black cterm=bold,underline
+    hi NonText ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=White ctermbg=DarkGray cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=DarkGray cterm=NONE
+    hi PmenuSel ctermfg=Black ctermbg=Blue cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi PmenuKind ctermfg=DarkRed ctermbg=DarkGray cterm=NONE
+    hi PmenuKindSel ctermfg=DarkRed ctermbg=Blue cterm=NONE
+    hi PmenuExtra ctermfg=gray ctermbg=DarkGray cterm=NONE
+    hi PmenuExtraSel ctermfg=Black ctermbg=Blue cterm=NONE
+    hi SignColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse
+    hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse
+    hi TabLine ctermfg=Black ctermbg=DarkGray cterm=NONE
+    hi TabLineFill ctermfg=Black ctermbg=DarkGray cterm=NONE
+    hi TabLineSel ctermfg=White ctermbg=Black cterm=bold
+    hi ToolbarButton ctermfg=White ctermbg=DarkGray cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE
+    hi Visual ctermfg=Black ctermbg=Blue cterm=NONE
+    hi WildMenu ctermfg=White ctermbg=Black cterm=bold
+    hi EndOfBuffer ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse
+    hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse
+    hi DiffDelete ctermfg=Red ctermbg=Black cterm=reverse
+    hi DiffText ctermfg=Yellow ctermbg=Black cterm=reverse
+    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse
+    hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold
+    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
+    hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse
+    hi QuickFixLine ctermfg=Cyan ctermbg=Black cterm=reverse
+    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
+    hi Title ctermfg=Green ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=Black cterm=bold,reverse
+    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Function ctermfg=Green ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=Black cterm=bold
+    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  else
+    " Light background
+    hi Normal ctermfg=Black ctermbg=White cterm=NONE
+    hi ColorColumn ctermfg=White ctermbg=Grey cterm=NONE
+    hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=White cterm=reverse
+    hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE
+    hi FoldColumn ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi LineNr ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=White cterm=bold,underline
+    hi NonText ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=Black ctermbg=Grey cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE
+    hi PmenuSel ctermfg=White ctermbg=Blue cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi PmenuKind ctermfg=DarkRed ctermbg=Grey cterm=NONE
+    hi PmenuKindSel ctermfg=DarkRed ctermbg=Blue cterm=NONE
+    hi PmenuExtra ctermfg=DarkGray ctermbg=Grey cterm=NONE
+    hi PmenuExtraSel ctermfg=White ctermbg=Blue cterm=NONE
+    hi SignColumn ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=DarkGray ctermbg=White cterm=bold,reverse
+    hi StatusLineNC ctermfg=Grey ctermbg=DarkGray cterm=reverse
+    hi TabLine ctermfg=DarkGray ctermbg=Grey cterm=NONE
+    hi TabLineFill ctermfg=White ctermbg=Grey cterm=NONE
+    hi TabLineSel ctermfg=DarkGray ctermbg=White cterm=bold
+    hi ToolbarButton ctermfg=Black ctermbg=Grey cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=DarkGray ctermbg=Grey cterm=NONE
+    hi Visual ctermfg=White ctermbg=Blue cterm=NONE
+    hi WildMenu ctermfg=Black ctermbg=White cterm=bold
+    hi EndOfBuffer ctermfg=Grey ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse
+    hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse
+    hi DiffDelete ctermfg=Red ctermbg=White cterm=reverse
+    hi DiffText ctermfg=Yellow ctermbg=White cterm=reverse
+    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse
+    hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold
+    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
+    hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse
+    hi QuickFixLine ctermfg=Cyan ctermbg=White cterm=reverse
+    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
+    hi Title ctermfg=Green ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=White cterm=bold,reverse
+    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Function ctermfg=Green ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=White cterm=bold
+    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  if &background ==# 'dark'
+    hi Normal ctermfg=gray ctermbg=Black cterm=NONE
+    hi ColorColumn ctermfg=Black ctermbg=gray cterm=NONE
+    hi Comment ctermfg=gray ctermbg=NONE cterm=bold
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=Black cterm=reverse
+    hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE
+    hi FoldColumn ctermfg=gray ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=gray ctermbg=NONE cterm=NONE
+    hi LineNr ctermfg=gray ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=gray ctermbg=NONE cterm=bold,underline
+    hi NonText ctermfg=gray ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=DarkGray ctermbg=White cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=DarkGray cterm=NONE
+    hi PmenuSel ctermfg=Black ctermbg=Blue cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi PmenuKind ctermfg=Red ctermbg=White cterm=NONE
+    hi PmenuKindSel ctermfg=Red ctermbg=Blue cterm=NONE
+    hi PmenuExtra ctermfg=DarkGray ctermbg=White cterm=NONE
+    hi PmenuExtraSel ctermfg=DarkGray ctermbg=Blue cterm=NONE
+    hi SignColumn ctermfg=gray ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=gray ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse
+    hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse
+    hi TabLine ctermfg=Black ctermbg=gray cterm=NONE
+    hi TabLineFill ctermfg=Black ctermbg=gray cterm=NONE
+    hi TabLineSel ctermfg=gray ctermbg=Black cterm=NONE
+    hi ToolbarButton ctermfg=Black ctermbg=gray cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE
+    hi Visual ctermfg=Black ctermbg=Blue cterm=NONE
+    hi WildMenu ctermfg=Blue ctermbg=DarkGray cterm=bold
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse
+    hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse
+    hi DiffDelete ctermfg=Red ctermbg=Black cterm=reverse
+    hi DiffText ctermfg=Yellow ctermbg=Black cterm=reverse
+    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse
+    hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold
+    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
+    hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse
+    hi QuickFixLine ctermfg=Cyan ctermbg=Black cterm=reverse
+    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
+    hi Title ctermfg=Green ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=Black cterm=bold,reverse
+    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Function ctermfg=Green ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=Black cterm=bold
+    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  else
+    " Light background
+    hi Normal ctermfg=Black ctermbg=Grey cterm=NONE
+    hi ColorColumn ctermfg=White ctermbg=Black cterm=NONE
+    hi Comment ctermfg=Black ctermbg=NONE cterm=bold
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=White cterm=reverse
+    hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE
+    hi FoldColumn ctermfg=Black ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=Black ctermbg=NONE cterm=NONE
+    hi LineNr ctermfg=Black ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=Black ctermbg=NONE cterm=bold,underline
+    hi NonText ctermfg=Black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=Grey ctermbg=Black cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE
+    hi PmenuSel ctermfg=White ctermbg=Blue cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
+    hi PmenuKind ctermfg=Red ctermbg=Black cterm=NONE
+    hi PmenuKindSel ctermfg=Red ctermbg=Blue cterm=NONE
+    hi PmenuExtra ctermfg=Grey ctermbg=Black cterm=NONE
+    hi PmenuExtraSel ctermfg=Grey ctermbg=Blue cterm=NONE
+    hi SignColumn ctermfg=Black ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=Black ctermbg=NONE cterm=NONE
+    hi StatusLine ctermfg=Black ctermbg=White cterm=bold,reverse
+    hi StatusLineNC ctermfg=Black ctermbg=White cterm=reverse
+    hi TabLine ctermfg=White ctermbg=Black cterm=NONE
+    hi TabLineFill ctermfg=White ctermbg=Black cterm=NONE
+    hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE
+    hi ToolbarButton ctermfg=White ctermbg=Black cterm=bold
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=White ctermbg=Black cterm=NONE
+    hi Visual ctermfg=White ctermbg=Blue cterm=NONE
+    hi WildMenu ctermfg=Blue ctermbg=Grey cterm=bold
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse
+    hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse
+    hi DiffDelete ctermfg=Red ctermbg=White cterm=reverse
+    hi DiffText ctermfg=Yellow ctermbg=White cterm=reverse
+    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
+    hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse
+    hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold
+    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
+    hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse
+    hi QuickFixLine ctermfg=Cyan ctermbg=White cterm=reverse
+    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
+    hi Title ctermfg=Green ctermbg=NONE cterm=bold
+    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
+    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Error ctermfg=Red ctermbg=White cterm=bold,reverse
+    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Function ctermfg=Green ctermbg=NONE cterm=bold
+    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
+    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
+    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
+    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=Green ctermbg=NONE cterm=NONE
+    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=fg ctermbg=White cterm=bold
+    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Color: neutralred              #cc241d        160            DarkRed
+" Color: neutralgreen            #98971a        100            DarkGreen
+" Color: neutralyellow           #d79921        172            DarkYellow
+" Color: neutralblue             #458588        66             DarkBlue
+" Color: neutralpurple           #b16286        132            DarkMagenta
+" Color: neutralaqua             #689d6a        71             DarkCyan
+" Color: neutralorange           #d65d0e        166            LightRed
+" Background: dark
+" Color: bg0                     #1c1c1c        234            Black
+" Color: bg1                     #3c3836        237            DarkGray
+" Color: bg2                     #504945        239            DarkGray
+" Color: bg3                     #303030        236
+" Color: bg4                     #7c6f64        243
+" Color: bg5                     #000000        16             DarkGray
+" Color: bg6                     #121212        233            DarkGray
+" Color: fg0                     #fbf1c7        230            White
+" Color: fg1                     #ebdbb2        187            White
+" Color: fg2                     #d5c4a1        187
+" Color: fg3                     #bdae93        144
+" Color: fg4                     #a89984        102            gray
+" Color: grey                    #928374        102            DarkGray
+" Color: red                     #fb4934        203            Red
+" Color: green                   #b8bb26        142            Green
+" Color: yellow                  #fabd2f        214            Yellow
+" Color: blue                    #83a598        109            Blue
+" Color: purple                  #d3869b        175            Magenta
+" Color: aqua                    #8ec07c        107            Cyan
+" Color: orange                  #fe8019        208            Magenta
+" Term colors: bg0  neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4
+" Term colors: grey red        green        yellow        blue        purple        aqua        fg1
+" Background: light
+" Color: bg0                     #fbf1c7        230            White
+" Color: bg1                     #ebdbb2        187            Grey
+" Color: bg2                     #e5d4b1        188            Grey
+" Color: bg3                     #bdae93        144
+" Color: bg4                     #a89984        137
+" Color: bg5                     #ebe1b7        229            Grey
+" Color: bg6                     #ffffd7        231            Grey
+" Color: fg0                     #282828        235            DarkGray
+" Color: fg1                     #3c3836        237            Black
+" Color: fg2                     #503836        237
+" Color: fg3                     #665c54        59
+" Color: fg4                     #7c6f64        243            Black
+" Color: grey                    #928374        102            DarkGray
+" Color: red                     #9d0006        124            Red
+" Color: green                   #79740e        64             Green
+" Color: yellow                  #b57614        172            Yellow
+" Color: blue                    #076678        23             Blue
+" Color: purple                  #8f3f71        126            Magenta
+" Color: aqua                    #427b58        29             Cyan
+" Color: orange                  #ff5f00        202            Magenta
+" Term colors: fg1  neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4
+" Term colors: grey red        green        yellow        blue        purple        aqua        bg0
+" Background: any
+" vim: et ts=2 sw=2
diff --git a/runtime/colors/sorbet.vim b/runtime/colors/sorbet.vim
new file mode 100644
index 0000000000..38cb141243
--- /dev/null
+++ b/runtime/colors/sorbet.vim
@@ -0,0 +1,448 @@
+" Name:         sorbet
+" Description:  A shallow grave, a monument to the ruined age.
+" Author:       Maxence Weynans <neutaaaaan@gmail.com>
+" Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Vim License (see `:help license`)`
+" Last Updated: Wed 15 Mar 2023 05:40:19 PM CET
+
+" Generated by Colortemplate v2.2.0
+
+set background=dark
+
+hi clear
+let g:colors_name = 'sorbet'
+
+let s:t_Co = &t_Co
+
+hi! link Terminal Normal
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+hi! link Boolean Constant
+hi! link Character Constant
+hi! link Conditional Statement
+hi! link Define PreProc
+hi! link Debug Special
+hi! link Delimiter Special
+hi! link ErrorMsg Error
+hi! link Exception Statement
+hi! link Float Constant
+hi! link Function Identifier
+hi! link Include PreProc
+hi! link Keyword Statement
+hi! link Label Statement
+hi! link Macro PreProc
+hi! link Number Constant
+hi! link Operator Statement
+hi! link PreCondit PreProc
+hi! link Repeat Statement
+hi! link SpecialChar Special
+hi! link SpecialComment Special
+hi! link StorageClass Type
+hi! link Structure Type
+hi! link Tag Special
+hi! link Typedef Type
+hi! link lCursor Cursor
+hi! link debugPC CursorLine
+
+if (has('termguicolors') && &termguicolors) || has('gui_running')
+  let g:terminal_ansi_colors = ['#000000', '#d75f5f', '#87d75f', '#d7af5f', '#87afd7', '#af87d7', '#5fafaf', '#dadada', '#707070', '#ff5f5f', '#87ff5f', '#ffd75f', '#87d7ff', '#d787ff', '#5fd7d7', '#ffffff']
+  " Nvim uses g:terminal_color_{0-15} instead
+  for i in range(g:terminal_ansi_colors->len())
+    let g:terminal_color_{i} = g:terminal_ansi_colors[i]
+  endfor
+endif
+hi Normal guifg=#dadada guibg=#161821 gui=NONE cterm=NONE
+hi ColorColumn guifg=NONE guibg=#262831 gui=NONE cterm=NONE
+hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi CursorColumn guifg=NONE guibg=#363841 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE guibg=#363841 gui=NONE cterm=NONE
+hi CursorLineNr guifg=#d7d7ff guibg=#363841 gui=NONE cterm=NONE
+hi DiffAdd guifg=#00af5f guibg=#000000 gui=reverse cterm=reverse
+hi DiffChange guifg=#87afff guibg=#000000 gui=reverse cterm=reverse
+hi DiffDelete guifg=#d7005f guibg=#000000 gui=reverse cterm=reverse
+hi DiffText guifg=#ff87ff guibg=#000000 gui=reverse cterm=reverse
+hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi EndOfBuffer guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
+hi FoldColumn guifg=#8787af guibg=NONE gui=NONE cterm=NONE
+hi Folded guifg=#5f5f87 guibg=#161821 gui=NONE cterm=NONE
+hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+hi LineNr guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
+hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
+hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+hi Pmenu guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE
+hi PmenuExtra guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE
+hi PmenuKind guifg=#000000 guibg=#a6a8b1 gui=bold cterm=bold
+hi PmenuSbar guifg=#707070 guibg=#5f5f87 gui=NONE cterm=NONE
+hi PmenuSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE
+hi PmenuExtraSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE
+hi PmenuKindSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
+hi PmenuThumb guifg=#dadada guibg=#d7d7ff gui=NONE cterm=NONE
+hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
+hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi SpecialKey guifg=#5f5f87 guibg=NONE gui=bold cterm=bold
+hi SpellBad guifg=#d75f5f guibg=NONE guisp=#d75f5f gui=undercurl cterm=underline
+hi SpellCap guifg=#87afd7 guibg=NONE guisp=#87afd7 gui=undercurl cterm=underline
+hi SpellLocal guifg=#af87d7 guibg=NONE guisp=#af87d7 gui=undercurl cterm=underline
+hi SpellRare guifg=#5fafaf guibg=NONE guisp=#5fafaf gui=undercurl cterm=underline
+hi StatusLine guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
+hi StatusLineNC guifg=#8787af guibg=#000000 gui=reverse cterm=reverse
+hi TabLine guifg=#8787af guibg=#000000 gui=reverse cterm=reverse
+hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi TabLineSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
+hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi VertSplit guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
+hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+hi VisualNOS guifg=NONE guibg=#363841 gui=NONE cterm=NONE
+hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi WildMenu guifg=#d7d7ff guibg=#161821 gui=bold cterm=bold
+hi Comment guifg=#af87d7 guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi Error guifg=#ff5f5f guibg=#000000 gui=bold,reverse cterm=bold,reverse
+hi Identifier guifg=#87d75f guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi String guifg=#d7af5f guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=#5fd7af guibg=NONE gui=bold,reverse cterm=bold,reverse
+hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline
+hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
+hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold
+hi DiffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#8787af guibg=#000000 gui=bold,reverse cterm=bold,reverse
+
+if s:t_Co >= 256
+  hi Normal ctermfg=253 ctermbg=233 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
+  hi CursorLineNr ctermfg=189 ctermbg=237 cterm=NONE
+  hi DiffAdd ctermfg=35 ctermbg=16 cterm=reverse
+  hi DiffChange ctermfg=111 ctermbg=16 cterm=reverse
+  hi DiffDelete ctermfg=161 ctermbg=16 cterm=reverse
+  hi DiffText ctermfg=213 ctermbg=16 cterm=reverse
+  hi Directory ctermfg=253 ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=60 ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=103 ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=60 ctermbg=233 cterm=NONE
+  hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+  hi LineNr ctermfg=60 ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+  hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+  hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
+  hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
+  hi PmenuSbar ctermfg=242 ctermbg=60 cterm=NONE
+  hi PmenuSel ctermfg=16 ctermbg=189 cterm=NONE
+  hi PmenuExtraSel ctermfg=16 ctermbg=189 cterm=NONE
+  hi PmenuKindSel ctermfg=16 ctermbg=189 cterm=bold
+  hi PmenuThumb ctermfg=253 ctermbg=189 cterm=NONE
+  hi Question ctermfg=253 ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
+  hi Search ctermfg=39 ctermbg=16 cterm=reverse
+  hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=60 ctermbg=NONE cterm=bold
+  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=110 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=140 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=73 ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=16 ctermbg=189 cterm=bold
+  hi StatusLineNC ctermfg=103 ctermbg=16 cterm=reverse
+  hi TabLine ctermfg=103 ctermbg=16 cterm=reverse
+  hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
+  hi TabLineSel ctermfg=16 ctermbg=189 cterm=bold
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=60 ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=214 ctermbg=16 cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=237 cterm=NONE
+  hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
+  hi WildMenu ctermfg=189 ctermbg=233 cterm=bold
+  hi Comment ctermfg=140 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=167 ctermbg=NONE cterm=NONE
+  hi Error ctermfg=203 ctermbg=16 cterm=bold,reverse
+  hi Identifier ctermfg=113 ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=110 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=73 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=110 ctermbg=NONE cterm=NONE
+  hi String ctermfg=179 ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=79 ctermbg=NONE cterm=bold,reverse
+  hi Type ctermfg=110 ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=253 ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
+  hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
+  hi DiffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=103 ctermbg=16 cterm=bold,reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
+  hi Search ctermfg=cyan ctermbg=black cterm=reverse
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
+  hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
+  hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
+  hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+  hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+  hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi DiffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+  hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+  hi DiffAdd ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuKindSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+  hi QuickFixLine ctermfg=darkmagenta ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+  hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
+  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  hi DiffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: dark
+" Color: guibg         #161821           233               black
+" Color: statusline    #d7d7ff           189               white
+" Color: statuslineNC  #8787af           103               grey
+" Color: darkuipurple  #5f5f87           60                grey
+" Color: dark0         #000000           16                black
+" Color: dark1         #d75f5f           167               darkred
+" Color: dark2         #87d75f           113               darkgreen
+" Color: dark3         #d7af5f           179               darkyellow
+" Color: dark4         #87afd7           110               darkblue
+" Color: dark5         #af87d7           140               darkmagenta
+" Color: dark6         #5fafaf           73                darkcyan
+" Color: dark7         #dadada           253               grey
+" Color: dark8         #707070           242               darkgrey
+" Color: dark9         #ff5f5f           203               red
+" Color: dark10        #87ff5f           119               green
+" Color: dark11        #ffd75f           221               yellow
+" Color: dark12        #87d7ff           117               blue
+" Color: dark13        #d787ff           177               magenta
+" Color: dark14        #5fd7d7           80                cyan
+" Color: dark15        #ffffff           231               white
+" Color: diffred       #d7005f           161               darkred
+" Color: diffgreen     #00af5f           35                darkgreen
+" Color: diffblue      #87afff           111               darkblue
+" Color: diffpink      #ff87ff           213               darkmagenta
+" Color: uipink        #ff00af           199               magenta
+" Color: uilime        #afff00           154               green
+" Color: uiteal        #5fd7af           79                green
+" Color: uiblue        #00afff           39                blue
+" Color: uipurple      #af00ff           129               darkmagenta
+" Color: uiamber       #ffaf00           214               darkyellow
+" Color: uiblack       #363841           237               darkgrey
+" Color: yasogrey      #262831           235               black
+" Color: linenrblack   #585858           240               darkgrey
+" Color: uicursearch   #ff5fff           207               magenta
+" Color: invisigrey    #a6a8b1           248               darkgrey
+" Color: errorred      #ff5f5f           203               red
+" Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
+" Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
+" vim: et ts=2 sw=2
diff --git a/runtime/colors/wildcharm.vim b/runtime/colors/wildcharm.vim
new file mode 100644
index 0000000000..0f95ec88bb
--- /dev/null
+++ b/runtime/colors/wildcharm.vim
@@ -0,0 +1,761 @@
+" Name:         Wild Charm
+" Description:  Vibrant and playful, at least one popular AI thinks it is.
+" Author:       Maxim Kim <habamax@gmail.com>
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Same as Vim
+" Last Updated: Sun 12 Mar 2023 18:46:06 AEDT
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'wildcharm'
+
+let s:t_Co = &t_Co
+
+hi! link Terminal Normal
+hi! link StatuslineTerm Statusline
+hi! link StatuslineTermNC StatuslineNC
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link MessageWindow PMenu
+hi! link PopupNotification Todo
+hi! link CurSearch IncSearch
+if &background ==# 'dark'
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#d0d0d0', '#767676', '#ff5f87', '#00d75f', '#ffaf00', '#00afff', '#ff87ff', '#00d7d7', '#ffffff']
+    " Nvim uses g:terminal_color_{0-15} instead
+    for i in range(g:terminal_ansi_colors->len())
+      let g:terminal_color_{i} = g:terminal_ansi_colors[i]
+    endfor
+  endif
+  hi Normal guifg=#d0d0d0 guibg=#000000 gui=NONE cterm=NONE
+  hi Statusline guifg=#d0d0d0 guibg=#000000 gui=reverse cterm=reverse
+  hi StatuslineNC guifg=#767676 guibg=#000000 gui=reverse cterm=reverse
+  hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#000000 guibg=#ff87ff gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold
+  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#d0d0d0 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
+  hi PmenuThumb guifg=NONE guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#ff5f87 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#d7005f guibg=#ffaf00 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error guifg=#ffffff guibg=#d7005f gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#ffffff guibg=#d7005f gui=NONE cterm=NONE
+  hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg guifg=#00d75f guibg=NONE gui=NONE cterm=NONE
+  hi Question guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi WarningMsg guifg=#ffaf00 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#875fff guibg=#000000 gui=reverse cterm=reverse
+  hi Search guifg=#000000 guibg=#00d75f gui=NONE cterm=NONE
+  hi IncSearch guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
+  hi WildMenu guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
+  hi debugPC guifg=#0087d7 guibg=NONE gui=reverse cterm=reverse
+  hi debugBreakpoint guifg=#00afaf guibg=NONE gui=reverse cterm=reverse
+  hi Cursor guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse
+  hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#000000 guibg=#0087d7 gui=NONE cterm=NONE
+  hi VisualNOS guifg=#000000 guibg=#00afff gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+  hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellCap guifg=NONE guibg=NONE guisp=#00afaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellLocal guifg=NONE guibg=NONE guisp=#00af5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#ff87ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#ff5f87 guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#00d75f guibg=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#00afff guibg=NONE gui=NONE cterm=NONE
+  hi Type guifg=#ffaf00 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#00d7d7 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#875fff guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Directory guifg=#00afff guibg=NONE gui=bold cterm=bold
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi DiffAdd guifg=#afffaf guibg=#5f875f gui=NONE cterm=NONE
+  hi DiffChange guifg=#d0d0d0 guibg=#5f5f5f gui=NONE cterm=NONE
+  hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
+  hi DiffDelete guifg=#ffafaf guibg=#875f5f gui=NONE cterm=NONE
+  hi diffAdded guifg=#00af5f guibg=NONE gui=NONE cterm=NONE
+  hi diffRemoved guifg=#d7005f guibg=NONE gui=NONE cterm=NONE
+else
+  " Light background
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005faf', '#870087', '#008787', '#8a8a8a', '#808080', '#d70000', '#5faf5f', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+    " Nvim uses g:terminal_color_{0-15} instead
+    for i in range(g:terminal_ansi_colors->len())
+      let g:terminal_color_{i} = g:terminal_ansi_colors[i]
+    endfor
+  endif
+  hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
+  hi Statusline guifg=#ffffff guibg=#5f5f5f gui=NONE cterm=NONE
+  hi StatuslineNC guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi VertSplit guifg=#d0d0d0 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#808080 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse
+  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#ffffff guibg=#870087 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi LineNr guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi NonText guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi FoldColumn guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
+  hi PmenuThumb guifg=NONE guibg=#808080 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuKind guifg=#d70000 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuKindSel guifg=#af0000 guibg=#d78700 gui=NONE cterm=NONE
+  hi PmenuExtra guifg=#808080 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuExtraSel guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
+  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+  hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi Question guifg=#870087 guibg=NONE gui=NONE cterm=NONE
+  hi WarningMsg guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#8700ff guibg=#ffffff gui=reverse cterm=reverse
+  hi Search guifg=#ffffff guibg=#008700 gui=NONE cterm=NONE
+  hi IncSearch guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
+  hi WildMenu guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
+  hi debugPC guifg=#005faf guibg=NONE gui=reverse cterm=reverse
+  hi debugBreakpoint guifg=#008787 guibg=NONE gui=reverse cterm=reverse
+  hi Cursor guifg=#000000 guibg=#ffffff gui=reverse cterm=reverse
+  hi lCursor guifg=#ff00ff guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#ffffff guibg=#0087d7 gui=NONE cterm=NONE
+  hi VisualNOS guifg=#ffffff guibg=#005faf gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi Folded guifg=#808080 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+  hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellCap guifg=NONE guibg=NONE guisp=#008787 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#af00af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#af0000 guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi Identifier guifg=#870087 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#005faf guibg=NONE gui=NONE cterm=NONE
+  hi Type guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#008787 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#8700ff guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+  hi Directory guifg=#005faf guibg=NONE gui=bold cterm=bold
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi DiffAdd guifg=#005f00 guibg=#afd7af gui=NONE cterm=NONE
+  hi DiffChange guifg=#262626 guibg=#dadada gui=NONE cterm=NONE
+  hi DiffText guifg=#005f5f guibg=#afd7d7 gui=NONE cterm=NONE
+  hi DiffDelete guifg=#875f5f guibg=#ffd7d7 gui=NONE cterm=NONE
+  hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
+endif
+
+if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link StatuslineTerm Statusline
+  hi! link StatuslineTermNC StatuslineNC
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link MessageWindow PMenu
+  hi! link PopupNotification Todo
+  hi! link CurSearch IncSearch
+  if &background ==# 'dark'
+    hi Normal ctermfg=252 ctermbg=16 cterm=NONE
+    hi Statusline ctermfg=252 ctermbg=16 cterm=reverse
+    hi StatuslineNC ctermfg=243 ctermbg=16 cterm=reverse
+    hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=252 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE
+    hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE
+    hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE
+    hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=243 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=252 ctermbg=236 cterm=NONE
+    hi PmenuSel ctermfg=16 ctermbg=214 cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=252 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=204 ctermbg=236 cterm=NONE
+    hi PmenuKindSel ctermfg=161 ctermbg=214 cterm=NONE
+    hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE
+    hi PmenuExtraSel ctermfg=16 ctermbg=214 cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=231 ctermbg=161 cterm=NONE
+    hi ErrorMsg ctermfg=231 ctermbg=161 cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=41 ctermbg=NONE cterm=NONE
+    hi Question ctermfg=213 ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=214 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=99 ctermbg=16 cterm=reverse
+    hi Search ctermfg=16 ctermbg=41 cterm=NONE
+    hi IncSearch ctermfg=16 ctermbg=214 cterm=NONE
+    hi WildMenu ctermfg=16 ctermbg=214 cterm=NONE
+    hi debugPC ctermfg=32 ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=37 ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=16 ctermbg=32 cterm=NONE
+    hi VisualNOS ctermfg=16 ctermbg=39 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=236 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=161 ctermbg=231 cterm=reverse
+    hi SpellCap ctermfg=37 ctermbg=16 cterm=reverse
+    hi SpellLocal ctermfg=41 ctermbg=16 cterm=reverse
+    hi SpellRare ctermfg=213 ctermbg=16 cterm=reverse
+    hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=204 ctermbg=NONE cterm=NONE
+    hi String ctermfg=41 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=213 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=39 ctermbg=NONE cterm=NONE
+    hi Type ctermfg=214 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=44 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=99 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=39 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=157 ctermbg=65 cterm=NONE
+    hi DiffChange ctermfg=252 ctermbg=59 cterm=NONE
+    hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
+    hi DiffDelete ctermfg=217 ctermbg=95 cterm=NONE
+    hi diffAdded ctermfg=35 ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=161 ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=16 ctermbg=231 cterm=NONE
+    hi Statusline ctermfg=231 ctermbg=59 cterm=NONE
+    hi StatuslineNC ctermfg=16 ctermbg=252 cterm=NONE
+    hi VertSplit ctermfg=252 ctermbg=252 cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=252 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=240 cterm=NONE
+    hi TabLineSel ctermfg=231 ctermbg=16 cterm=reverse
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=231 ctermbg=16 cterm=NONE
+    hi QuickFixLine ctermfg=231 ctermbg=90 cterm=NONE
+    hi CursorLineNr ctermfg=16 ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=249 ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=249 ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=249 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=249 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=249 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=16 ctermbg=254 cterm=NONE
+    hi PmenuSel ctermfg=231 ctermbg=172 cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=240 cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuKind ctermfg=160 ctermbg=254 cterm=NONE
+    hi PmenuKindSel ctermfg=124 ctermbg=172 cterm=NONE
+    hi PmenuExtra ctermfg=240 ctermbg=254 cterm=NONE
+    hi PmenuExtraSel ctermfg=231 ctermbg=172 cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=231 ctermbg=160 cterm=NONE
+    hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=28 ctermbg=NONE cterm=NONE
+    hi Question ctermfg=90 ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=130 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=93 ctermbg=231 cterm=reverse
+    hi Search ctermfg=231 ctermbg=28 cterm=NONE
+    hi IncSearch ctermfg=231 ctermbg=172 cterm=NONE
+    hi WildMenu ctermfg=231 ctermbg=172 cterm=NONE
+    hi debugPC ctermfg=25 ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=30 ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=231 ctermbg=32 cterm=NONE
+    hi VisualNOS ctermfg=231 ctermbg=25 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi Folded ctermfg=240 ctermbg=254 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=160 ctermbg=231 cterm=reverse
+    hi SpellCap ctermfg=30 ctermbg=231 cterm=reverse
+    hi SpellLocal ctermfg=28 ctermbg=231 cterm=reverse
+    hi SpellRare ctermfg=127 ctermbg=231 cterm=reverse
+    hi Comment ctermfg=245 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=124 ctermbg=NONE cterm=NONE
+    hi String ctermfg=28 ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=90 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=25 ctermbg=NONE cterm=NONE
+    hi Type ctermfg=130 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=30 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=93 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=25 ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=22 ctermbg=151 cterm=NONE
+    hi DiffChange ctermfg=235 ctermbg=253 cterm=NONE
+    hi DiffText ctermfg=23 ctermbg=152 cterm=NONE
+    hi DiffDelete ctermfg=95 ctermbg=224 cterm=NONE
+    hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  if &background ==# 'dark'
+    hi Normal ctermfg=grey ctermbg=black cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=reverse
+    hi StatuslineNC ctermfg=darkgrey ctermbg=black cterm=reverse
+    hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE
+    hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
+    hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+    hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
+    hi Question ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=yellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
+    hi Search ctermfg=black ctermbg=green cterm=NONE
+    hi IncSearch ctermfg=black ctermbg=yellow cterm=NONE
+    hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=black ctermbg=darkblue cterm=NONE
+    hi VisualNOS ctermfg=black ctermbg=blue cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi SpellBad ctermfg=darkred ctermbg=white cterm=reverse
+    hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpellLocal ctermfg=green ctermbg=black cterm=reverse
+    hi SpellRare ctermfg=magenta ctermbg=black cterm=reverse
+    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=red ctermbg=NONE cterm=NONE
+    hi String ctermfg=green ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=blue ctermbg=NONE cterm=NONE
+    hi Type ctermfg=yellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=cyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=blue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
+    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
+    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=black ctermbg=white cterm=NONE
+    hi Statusline ctermfg=white ctermbg=darkgrey cterm=NONE
+    hi StatuslineNC ctermfg=black ctermbg=lightgrey cterm=NONE
+    hi VertSplit ctermfg=lightgrey ctermbg=lightgrey cterm=NONE
+    hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=white ctermbg=black cterm=reverse
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE
+    hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+    hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=red cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkred ctermbg=white cterm=reverse
+    hi Search ctermfg=white ctermbg=darkgreen cterm=NONE
+    hi IncSearch ctermfg=white ctermbg=yellow cterm=NONE
+    hi WildMenu ctermfg=white ctermbg=yellow cterm=NONE
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=white ctermbg=blue cterm=NONE
+    hi VisualNOS ctermfg=white ctermbg=darkblue cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi SpellBad ctermfg=red ctermbg=white cterm=reverse
+    hi SpellCap ctermfg=darkcyan ctermbg=white cterm=reverse
+    hi SpellLocal ctermfg=darkgreen ctermbg=white cterm=reverse
+    hi SpellRare ctermfg=magenta ctermbg=white cterm=reverse
+    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
+    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
+    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
+    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  if &background ==# 'dark'
+    hi Normal ctermfg=grey ctermbg=black cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi StatuslineNC ctermfg=black ctermbg=grey cterm=NONE
+    hi VertSplit ctermfg=grey ctermbg=grey cterm=NONE
+    hi TabLine ctermfg=grey ctermbg=black cterm=reverse
+    hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
+    hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
+    hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
+    hi Search ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=black ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffText ctermfg=black ctermbg=grey cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+  else
+    " Light background
+    hi Normal ctermfg=black ctermbg=grey cterm=NONE
+    hi Statusline ctermfg=grey ctermbg=black cterm=bold
+    hi StatuslineNC ctermfg=grey ctermbg=darkgrey cterm=NONE
+    hi VertSplit ctermfg=black ctermbg=black cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=reverse
+    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold
+    hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
+    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=darkyellow cterm=NONE
+    hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE
+    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
+    hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE
+    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=white ctermbg=darkred cterm=NONE
+    hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
+    hi Search ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
+    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=grey ctermbg=darkblue cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi Folded ctermfg=black ctermbg=NONE cterm=bold
+    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+    hi SpellBad ctermfg=darkred ctermbg=black cterm=reverse
+    hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
+    hi SpellRare ctermfg=darkmagenta ctermbg=black cterm=reverse
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffText ctermfg=grey ctermbg=black cterm=NONE
+    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: any
+" Background: dark
+" Color: color00                 #000000        16             black
+" Color: color08                 #767676        243            darkgrey
+" Color: color01                 #d7005f        161            darkred
+" Color: color09                 #ff5f87        204            red
+" Color: color02                 #00af5f        35             darkgreen
+" Color: color10                 #00d75f        41             green
+" Color: color03                 #d78700        172            darkyellow
+" Color: color11                 #ffaf00        214            yellow
+" Color: color04                 #0087d7        32             darkblue
+" Color: color12                 #00afff        39             blue
+" Color: color05                 #d787d7        176            darkmagenta
+" Color: color13                 #ff87ff        213            magenta
+" Color: color06                 #00afaf        37             darkcyan
+" Color: color14                 #00d7d7        44             cyan
+" Color: color07                 #d0d0d0        252            grey
+" Color: color15                 #ffffff        231            white
+" Color: color16                 #875fff        99             darkred
+" Color: colorLine               #262626        235            darkgrey
+" Color: colorB                  #303030        236            darkgrey
+" Color: colorNonT               #585858        240            grey
+" Color: colorTab                #585858        240            grey
+" Color: colorC                  #ffffff        231            white
+" Color: colorlC                 #ff5fff        207            magenta
+" Color: colorDim                #878787        102            grey
+" Color: colorMP                 #ff00af        199            magenta
+" Color: diffAdd                 #5f875f        65             darkmagenta
+" Color: diffAddFg               #afffaf        157            black
+" Color: diffDelete              #875f5f        95             darkred
+" Color: diffDeleteFg            #ffafaf        217            black
+" Color: diffChange              #5f5f5f        59             lightgray
+" Color: diffChangeFg            #d0d0d0        252            black
+" Color: diffText                #5f8787        66             cyan
+" Color: diffTextFg              #afffff        159            black
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Background: light
+" Color: color00                 #000000        16             black
+" Color: color08                 #808080        240            darkgrey
+" Color: color01                 #af0000        124            darkred
+" Color: color09                 #d70000        160            red
+" Color: color02                 #008700        28             darkgreen
+" Color: color10                 #5faf5f        71             green
+" Color: color03                 #af5f00        130            darkyellow
+" Color: color11                 #d78700        172            yellow
+" Color: color04                 #005faf        25             darkblue
+" Color: color12                 #0087d7        32             blue
+" Color: color05                 #870087        90             darkmagenta
+" Color: color13                 #af00af        127            magenta
+" Color: color06                 #008787        30             darkcyan
+" Color: color14                 #00afaf        37             cyan
+" Color: color07                 #8a8a8a        245            grey
+" Color: color15                 #ffffff        231            white
+" Color: color16                 #8700ff        93             darkred
+" Color: colorCm                 #8a8a8a        245            darkgrey
+" Color: colorLine               #EEEEEE        255            grey
+" Color: colorB                  #E4E4E4        254            grey
+" Color: colorNonT               #b2b2b2        249            darkgrey
+" Color: colorTab                #d0d0d0        252            lightgrey
+" Color: colorC                  #000000        16             black
+" Color: colorlC                 #FF00FF        201            magenta
+" Color: colorV                  #5F87AF        67             darkblue
+" Color: colorDim                #626262        241            darkgrey
+" Color: colorSt                 #5f5f5f        59             darkgrey
+" Color: colorMP                 #ff00af        199            magenta
+" Color: diffAdd                 #afd7af        151            darkmagenta
+" Color: diffAddFg               #005f00        22             black
+" Color: diffDelete              #ffd7d7        224            darkred
+" Color: diffDeleteFg            #875f5f        95             black
+" Color: diffChange              #dadada        253            lightgray
+" Color: diffChangeFg            #262626        235            black
+" Color: diffText                #afd7d7        152            cyan
+" Color: diffTextFg              #005f5f        23             black
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Background: any
+" vim: et ts=2 sw=2
diff --git a/runtime/colors/zaibatsu.vim b/runtime/colors/zaibatsu.vim
new file mode 100644
index 0000000000..e029f1451b
--- /dev/null
+++ b/runtime/colors/zaibatsu.vim
@@ -0,0 +1,567 @@
+" Name:         zaibatsu
+" Description:  "If you believe the journalists, he's the single wealthiest individual, period. As rich as some zaibatsu. But there's the catch, really: is he an individual? In the sense that you are, or I am? No." -- William Gibson, Count Zero
+" Author:       Romain Lafourcade <romainlafourcade@gmail.com>
+" Maintainer:   Romain Lafourcade <romainlafourcade@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Same as Vim
+" Last Updated: Sun Mar 12 17:21:15 2023
+
+" Generated by Colortemplate v2.2.0
+
+set background=dark
+
+hi clear
+let g:colors_name = 'zaibatsu'
+
+let s:t_Co = &t_Co
+
+if (has('termguicolors') && &termguicolors) || has('gui_running')
+  let g:terminal_ansi_colors = ['#0e0024', '#d7005f', '#00af5f', '#ffaf00', '#5f5fff', '#d700ff', '#00afff', '#d7d5db', '#878092', '#ff5faf', '#00d700', '#ffd700', '#8787ff', '#ff87ff', '#00ffff', '#ffffff']
+  " Nvim uses g:terminal_color_{0-15} instead
+  for i in range(g:terminal_ansi_colors->len())
+    let g:terminal_color_{i} = g:terminal_ansi_colors[i]
+  endfor
+endif
+hi Normal guifg=#ffffff guibg=#0e0024 gui=NONE cterm=NONE
+hi EndOfBuffer guifg=#afafff guibg=#0e0024 gui=NONE cterm=NONE
+hi NonText guifg=#878092 guibg=#0e0024 gui=NONE cterm=NONE
+hi SpellBad guifg=NONE guibg=NONE guisp=#ff5faf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
+hi SpellCap guifg=NONE guibg=NONE guisp=#87ff00 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
+hi SpellLocal guifg=NONE guibg=NONE guisp=#ffffff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
+hi SpellRare guifg=NONE guibg=NONE guisp=#ffafff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
+hi StatusLine guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
+hi StatusLineNC guifg=#0e0024 guibg=#afaab6 gui=NONE cterm=NONE
+hi Pmenu guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
+hi PmenuSbar guifg=#d7d5db guibg=#d7d5db gui=NONE cterm=NONE
+hi PmenuSel guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE
+hi PmenuThumb guifg=#878092 guibg=#878092 gui=NONE cterm=NONE
+hi PmenuExtra guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE
+hi! link PmenuExtraSel PmenuSel
+hi PmenuKind guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE
+hi! link PmenuKindSel PmenuSel
+hi ColorColumn guifg=NONE guibg=#510039 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE guibg=#362b49 gui=NONE cterm=NONE
+hi CursorColumn guifg=NONE guibg=#362b49 gui=NONE cterm=NONE
+hi WildMenu guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE
+hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Cursor guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE
+hi CursorIM guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE
+hi Error guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse
+hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
+hi FoldColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE
+hi Folded guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse
+hi IncSearch guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse
+hi LineNr guifg=#afafff guibg=NONE gui=NONE cterm=NONE
+hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi ModeMsg guifg=#0e0024 guibg=#87ff00 gui=NONE cterm=NONE
+hi MoreMsg guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
+hi Question guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE
+hi QuickFixLine guifg=#ffafff guibg=#0e0024 gui=reverse cterm=reverse
+hi Search guifg=#87ffff guibg=#0e0024 gui=reverse cterm=reverse
+hi SignColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE
+hi SpecialKey guifg=#878092 guibg=NONE gui=NONE cterm=NONE
+hi ToolbarButton guifg=#ffffff guibg=#5e556d gui=NONE cterm=NONE
+hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi VertSplit guifg=#afafff guibg=NONE gui=NONE cterm=NONE
+hi Visual guifg=#0e0024 guibg=#5fd7ff gui=NONE cterm=NONE
+hi VisualNOS guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
+hi WarningMsg guifg=#ffafff guibg=NONE gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#87ff00 guibg=#5f00d7 gui=reverse cterm=reverse
+hi debugPC guifg=#87ffff guibg=#5f00d7 gui=reverse cterm=reverse
+hi Directory guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
+hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Comment guifg=#afafff guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#ffff5f guibg=NONE gui=NONE cterm=NONE
+hi Identifier guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=#878092 guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#00afff guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#ffafff guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+hi Type guifg=#ff5faf guibg=NONE gui=NONE cterm=NONE
+hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+hi! link CurSearch IncSearch
+hi! link CursorLineFold CursorLine
+hi! link CursorLineNr CursorLine
+hi! link CursorLineSign CursorLine
+hi! link LineNrAbove LineNr
+hi! link LineNrBelow LineNr
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link TabLine StatusLineNC
+hi! link TabLineFill StatusLineNC
+hi! link TabLineSel StatusLine
+hi! link Terminal Normal
+hi! link lCursor Cursor
+hi! link Boolean Constant
+hi! link Character Constant
+hi! link Conditional Statement
+hi! link Define PreProc
+hi! link Delimiter Special
+hi! link Exception Statement
+hi! link Float Constant
+hi! link Function Identifier
+hi! link Include PreProc
+hi! link Keyword Statement
+hi! link Label Statement
+hi! link Macro PreProc
+hi! link Number Constant
+hi! link Operator Statement
+hi! link PreCondit PreProc
+hi! link Repeat Statement
+hi! link SpecialChar Special
+hi! link SpecialComment Special
+hi! link StorageClass Type
+hi! link String Constant
+hi! link Structure Type
+hi! link Tag Special
+hi! link Typedef Type
+hi! link Terminal Normal
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+hi DiffAdd guifg=#87ff00 guibg=#362b49 gui=reverse cterm=reverse
+hi DiffChange guifg=#afafff guibg=#362b49 gui=reverse cterm=reverse
+hi DiffText guifg=#d7d5db guibg=#362b49 gui=reverse cterm=reverse
+hi DiffDelete guifg=#ff5faf guibg=#362b49 gui=reverse cterm=reverse
+
+if s:t_Co >= 256
+  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
+  hi EndOfBuffer ctermfg=147 ctermbg=16 cterm=NONE
+  hi NonText ctermfg=103 ctermbg=16 cterm=NONE
+  hi SpellBad ctermfg=205 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=231 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=219 ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=16 ctermbg=231 cterm=NONE
+  hi StatusLineNC ctermfg=16 ctermbg=146 cterm=NONE
+  hi Pmenu ctermfg=16 ctermbg=231 cterm=NONE
+  hi PmenuSbar ctermfg=189 ctermbg=189 cterm=NONE
+  hi PmenuSel ctermfg=16 ctermbg=147 cterm=NONE
+  hi PmenuThumb ctermfg=103 ctermbg=103 cterm=NONE
+  hi PmenuExtra ctermfg=103 ctermbg=231 cterm=NONE
+  hi! link PmenuExtraSel PmenuSel
+  hi PmenuKind ctermfg=103 ctermbg=231 cterm=NONE
+  hi! link PmenuKindSel PmenuSel
+  hi ColorColumn ctermfg=NONE ctermbg=52 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
+  hi WildMenu ctermfg=16 ctermbg=147 cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
+  hi CursorIM ctermfg=16 ctermbg=227 cterm=NONE
+  hi Error ctermfg=160 ctermbg=231 cterm=reverse
+  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
+  hi FoldColumn ctermfg=39 ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=214 ctermbg=16 cterm=reverse
+  hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+  hi LineNr ctermfg=147 ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=16 ctermbg=118 cterm=NONE
+  hi MoreMsg ctermfg=123 ctermbg=NONE cterm=NONE
+  hi Question ctermfg=118 ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=219 ctermbg=16 cterm=reverse
+  hi Search ctermfg=123 ctermbg=16 cterm=reverse
+  hi SignColumn ctermfg=39 ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=103 ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=231 ctermbg=60 cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=147 ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=16 ctermbg=81 cterm=NONE
+  hi VisualNOS ctermfg=16 ctermbg=231 cterm=NONE
+  hi WarningMsg ctermfg=219 ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=118 ctermbg=56 cterm=reverse
+  hi debugPC ctermfg=123 ctermbg=56 cterm=reverse
+  hi Directory ctermfg=123 ctermbg=NONE cterm=NONE
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=147 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=227 ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=123 ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=103 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=39 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=118 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=219 ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=205 ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi! link CurSearch IncSearch
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineNr CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
+  hi! link Terminal Normal
+  hi! link lCursor Cursor
+  hi! link Boolean Constant
+  hi! link Character Constant
+  hi! link Conditional Statement
+  hi! link Define PreProc
+  hi! link Delimiter Special
+  hi! link Exception Statement
+  hi! link Float Constant
+  hi! link Function Identifier
+  hi! link Include PreProc
+  hi! link Keyword Statement
+  hi! link Label Statement
+  hi! link Macro PreProc
+  hi! link Number Constant
+  hi! link Operator Statement
+  hi! link PreCondit PreProc
+  hi! link Repeat Statement
+  hi! link SpecialChar Special
+  hi! link SpecialComment Special
+  hi! link StorageClass Type
+  hi! link String Constant
+  hi! link Structure Type
+  hi! link Tag Special
+  hi! link Typedef Type
+  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi DiffAdd ctermfg=118 ctermbg=237 cterm=reverse
+  hi DiffChange ctermfg=147 ctermbg=237 cterm=reverse
+  hi DiffText ctermfg=189 ctermbg=237 cterm=reverse
+  hi DiffDelete ctermfg=205 ctermbg=237 cterm=reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  hi Normal ctermfg=white ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
+  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
+  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuSbar ctermfg=gray ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
+  hi PmenuThumb ctermfg=darkgray ctermbg=darkgray cterm=NONE
+  hi PmenuExtra ctermfg=darkgray ctermbg=white cterm=NONE
+  hi! link PmenuExtraSel PmenuSel
+  hi PmenuKind ctermfg=darkgray ctermbg=white cterm=NONE
+  hi! link PmenuKindSel PmenuSel
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
+  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi Error ctermfg=red ctermbg=white cterm=reverse
+  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=black ctermbg=green cterm=NONE
+  hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse
+  hi Search ctermfg=cyan ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=white cterm=NONE
+  hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
+  hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=green ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi! link CurSearch IncSearch
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineNr CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
+  hi! link Terminal Normal
+  hi! link lCursor Cursor
+  hi! link Boolean Constant
+  hi! link Character Constant
+  hi! link Conditional Statement
+  hi! link Define PreProc
+  hi! link Delimiter Special
+  hi! link Exception Statement
+  hi! link Float Constant
+  hi! link Function Identifier
+  hi! link Include PreProc
+  hi! link Keyword Statement
+  hi! link Label Statement
+  hi! link Macro PreProc
+  hi! link Number Constant
+  hi! link Operator Statement
+  hi! link PreCondit PreProc
+  hi! link Repeat Statement
+  hi! link SpecialChar Special
+  hi! link SpecialComment Special
+  hi! link StorageClass Type
+  hi! link String Constant
+  hi! link Structure Type
+  hi! link Tag Special
+  hi! link Typedef Type
+  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
+  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  hi Normal ctermfg=gray ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
+  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
+  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
+  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=bold,reverse
+  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE
+  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
+  hi PmenuThumb ctermfg=blue ctermbg=blue cterm=NONE
+  hi! link PmenuExtra Pmenu
+  hi! link PmenuExtraSel PmenuSel
+  hi! link PmenuKind Pmenu
+  hi! link PmenuKindSel PmenuSel
+  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
+  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
+  hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
+  hi Error ctermfg=red ctermbg=white cterm=reverse
+  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
+  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE
+  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi ModeMsg ctermfg=black ctermbg=green cterm=NONE
+  hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Question ctermfg=green ctermbg=NONE cterm=NONE
+  hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse
+  hi Search ctermfg=cyan ctermbg=black cterm=reverse
+  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=white cterm=NONE
+  hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
+  hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=green ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Type ctermfg=red ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi! link CurSearch IncSearch
+  hi! link CursorLineFold CursorLine
+  hi! link CursorLineNr CursorLine
+  hi! link CursorLineSign CursorLine
+  hi! link LineNrAbove LineNr
+  hi! link LineNrBelow LineNr
+  hi! link StatusLineTerm StatusLine
+  hi! link StatusLineTermNC StatusLineNC
+  hi! link TabLine StatusLineNC
+  hi! link TabLineFill StatusLineNC
+  hi! link TabLineSel StatusLine
+  hi! link Terminal Normal
+  hi! link lCursor Cursor
+  hi! link Boolean Constant
+  hi! link Character Constant
+  hi! link Conditional Statement
+  hi! link Define PreProc
+  hi! link Delimiter Special
+  hi! link Exception Statement
+  hi! link Float Constant
+  hi! link Function Identifier
+  hi! link Include PreProc
+  hi! link Keyword Statement
+  hi! link Label Statement
+  hi! link Macro PreProc
+  hi! link Number Constant
+  hi! link Operator Statement
+  hi! link PreCondit PreProc
+  hi! link Repeat Statement
+  hi! link SpecialChar Special
+  hi! link SpecialComment Special
+  hi! link StorageClass Type
+  hi! link String Constant
+  hi! link Structure Type
+  hi! link Tag Special
+  hi! link Typedef Type
+  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
+  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
+  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: dark
+" Color: background    #0e0024           16                black
+" Color: darkred       #510039           52                darkred
+" Color: darkgreen     #5faf00           70                darkgreen
+" Color: darkyellow    #ffaf00           214               darkyellow
+" Color: darkblue      #5f00d7           56                darkblue
+" Color: darkmagenta   #d700ff           165               darkmagenta
+" Color: darkcyan      #00afff           39                darkcyan
+" Color: red           #ff5faf           205               red
+" Color: green         #87ff00           118               green
+" Color: yellow        #ffff5f           227               yellow
+" Color: blue          #afafff           147               blue
+" Color: magenta       #ffafff           219               magenta
+" Color: cyan          #87ffff           123               cyan
+" Color: white         #ffffff           231               white
+" Color: neutral1      #D7D5DB           189               gray
+" Color: neutral2      #AFAAB6           146               gray
+" Color: neutral3      #878092           103               darkgray
+" Color: neutral4      #5E556D           60                darkgray
+" Color: neutral5      #362B49           237               darkgray
+" Color: error         #d70000           160               red
+" Color: visual        #5FD7FF           81                darkcyan
+" Color: Xdarkred      #d7005f           ~
+" Color: Xdarkgreen    #00af5f           ~
+" Color: Xdarkblue     #5f5fff           ~
+" Color: Xdarkwhite    #d7d7d7           ~
+" Color: Xgrey         #878787           ~
+" Color: Xbrightgreen  #00d700           ~
+" Color: Xbrightyellow #ffd700           ~
+" Color: Xbrightblue   #8787ff           ~
+" Color: Xbrightmagenta #ff87ff          ~
+" Color: Xbrightcyan   #00ffff           ~
+" Term colors: background
+" Term colors: Xdarkred
+" Term colors: Xdarkgreen
+" Term colors: darkyellow
+" Term colors: Xdarkblue
+" Term colors: darkmagenta
+" Term colors: darkcyan
+" Term colors: neutral1
+" Term colors: neutral3
+" Term colors: red
+" Term colors: Xbrightgreen
+" Term colors: Xbrightyellow
+" Term colors: Xbrightblue
+" Term colors: Xbrightmagenta
+" Term colors: Xbrightcyan
+" Term colors: white
+" Color: bgDiffA       #5F875F           65                darkgreen
+" Color: bgDiffT       #C6C6C6           251               grey
+" Color: fgDiffW       #FFFFFF           231               white
+" Color: fgDiffB       #000000           16                black
+" Color: bgDiffC8      #5F87AF           67                darkblue
+" Color: bgDiffD8      #AF5FAF           133               darkmagenta
+" vim: et ts=2 sw=2
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 9a8ce4d2ad..91531db656 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1842,6 +1842,7 @@ execute({command} [, {silent}])				*execute()*
 		Execute {command} and capture its output.
 		If {command} is a |String|, returns {command} output.
 		If {command} is a |List|, returns concatenated outputs.
+		Line continuations in {command} are not recognized.
 		Examples: >
 			echo execute('echon "foo"')
 <			foo >
@@ -3586,7 +3587,7 @@ getscriptinfo([{opts}])					*getscriptinfo()*
 		optional items:
 		    name	Script name match pattern. If specified,
 				and "sid" is not specified, information about
-				scripts with name that match the pattern
+				scripts with a name that match the pattern
 				"name" are returned.
 		    sid		Script ID |<SID>|.  If specified, only
 				information about the script with ID "sid" is
@@ -4995,7 +4996,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 			     "!"     Insert and Commandline mode
 				     (|mapmode-ic|)
 		  "sid"	     The script local ID, used for <sid> mappings
-			     (|<SID>|).
+			     (|<SID>|).  Negative for special contexts.
 		  "lnum"     The line number in "sid", zero if unknown.
 		  "nowait"   Do not wait for other, longer mappings.
 			     (|:map-<nowait>|).
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 91358a8cdd..96af05bc63 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -427,6 +427,11 @@ Note similarly, when 'nrformats' includes "bin", binary numbers with a leading
 '0x' or '0X' can be interpreted as hexadecimal rather than binary since '0b'
 are valid hexadecimal digits.
 
+When the number under the cursor is too big to fit into 64 bits, it will be
+rounded off to the nearest number that can be represented, and the
+addition/subtraction is skipped.  E.g. CTRL-X on 18446744073709551616 results
+in 18446744073709551615.  Same for larger numbers, such as 18446744073709551618.
+
 The CTRL-A command is very useful in a macro.  Example: Use the following
 steps to make a numbered list.
 
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index ce0a929bc1..d2cc000789 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -535,7 +535,7 @@ $	DO	0x24	 36	DOLLAR SIGN
 Θ	H*	0398	0920	GREEK CAPITAL LETTER THETA
 Ι	I*	0399	0921	GREEK CAPITAL LETTER IOTA
 Κ	K*	039A	0922	GREEK CAPITAL LETTER KAPPA
-Λ	L*	039B	0923	GREEK CAPITAL LETTER LAMDA
+Λ	L*	039B	0923	GREEK CAPITAL LETTER LAMDA (aka LAMBDA)
 Μ	M*	039C	0924	GREEK CAPITAL LETTER MU
 Ν	N*	039D	0925	GREEK CAPITAL LETTER NU
 Ξ	C*	039E	0926	GREEK CAPITAL LETTER XI
@@ -566,7 +566,7 @@ $	DO	0x24	 36	DOLLAR SIGN
 θ	h*	03B8	0952	GREEK SMALL LETTER THETA
 ι	i*	03B9	0953	GREEK SMALL LETTER IOTA
 κ	k*	03BA	0954	GREEK SMALL LETTER KAPPA
-λ	l*	03BB	0955	GREEK SMALL LETTER LAMDA
+λ	l*	03BB	0955	GREEK SMALL LETTER LAMDA (aka LAMBDA)
 μ	m*	03BC	0956	GREEK SMALL LETTER MU
 ν	n*	03BD	0957	GREEK SMALL LETTER NU
 ξ	c*	03BE	0958	GREEK SMALL LETTER XI
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 859562fae6..78cc14651e 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -346,7 +346,8 @@ zC		Close all folds under the cursor recursively.  Folds that
 		'foldenable' will be set.
 
 							*za*
-za		When on a closed fold: open it.  When folds are nested, you
+za		Summary: Toggle the fold under the cursor.
+		When on a closed fold: open it.  When folds are nested, you
 		may have to use "za" several times.  When a count is given,
 		that many closed folds are opened.
 		When on an open fold: close it and set 'foldenable'.  This
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 1fce9fa491..5d44a7d239 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -33,7 +33,7 @@ Example: this sets "g:gui" to the value of the UI's "rgb" field:    >
 		remembered until the window is opened.  The position is
 		adjusted to make the window fit on the screen (if possible).
 
-						    *:win* *:winsize* *E465*
+					    *:wi* *:win* *:winsize* *E465*
 :win[size] {width} {height}
 		Set the window height to {width} by {height} characters.
 		Obsolete, use ":set lines=11 columns=22".
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index cd374c6f34..164e2d4ec5 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1322,6 +1322,11 @@ can have arguments, or have a range specified.  Arguments are subject to
 completion as filenames, buffers, etc.  Exactly how this works depends upon the
 command's attributes, which are specified when the command is defined.
 
+When defining a user command in a script, it will be able to call functions
+local to the script and use mappings local to the script.  When the user
+invokes the user command, it will run in the context of the script it was
+defined in.  This matters if |<SID>| is used in a command.
+
 There are a number of attributes, split into four categories: argument
 handling, completion behavior, range handling, and special cases.  The
 attributes are described below, by category.
@@ -1770,9 +1775,5 @@ errors and the "update" command to write modified buffers): >
 This will invoke: >
 	:call Allargs("%s/foo/bar/ge|update")
 <
-When defining a user command in a script, it will be able to call functions
-local to the script and use mappings local to the script.  When the user
-invokes the user command, it will run in the context of the script it was
-defined in.  This matters if |<SID>| is used in a command.
 
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 46d3f153c2..0aa6769f4e 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5868,11 +5868,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	When "on" the commands listed below move the cursor to the first
 	non-blank of the line.  When off the cursor is kept in the same column
-	(if possible).  This applies to the commands: CTRL-D, CTRL-U, CTRL-B,
-	CTRL-F, "G", "H", "M", "L", gg, and to the commands "d", "<<" and ">>"
-	with a linewise operator, with "%" with a count and to buffer changing
-	commands (CTRL-^, :bnext, :bNext, etc.).  Also for an Ex command that
-	only has a line number, e.g., ":25" or ":+".
+	(if possible).  This applies to the commands:
+	- CTRL-D, CTRL-U, CTRL-B, CTRL-F, "G", "H", "M", "L", "gg"
+	- "d", "<<" and ">>" with a linewise operator
+	- "%" with a count
+	- buffer changing commands (CTRL-^, :bnext, :bNext, etc.)
+	- Ex commands that only have a line number, e.g., ":25" or ":+".
 	In case of buffer changing commands the cursor is placed at the column
 	where it was the last time the buffer was edited.
 
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index d3d5e4605a..0742071d12 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -968,7 +968,7 @@ itself:
      fun! NetReadFixup(method, line1, line2)
        if method == 3   " ftp (no <.netrc>)
         let fourblanklines= line2 - 3
-        silent fourblanklines .. "," .. line2 .. "g/^\s*/d"
+        silent fourblanklines.",".line2."g/^\s*/d"
        endif
      endfunction
     endif
@@ -1625,10 +1625,8 @@ A further approach is to delete files which match a pattern.
       This will cause the matching files to be marked.  Then,
       press "D".
 
-If your vim has 7.4 with patch#1107, then |g:netrw_localrmdir| no longer
-is used to remove directories; instead, vim's |delete()| is used with
-the "d" option.  Please note that only empty directories may be deleted
-with the "D" mapping.  Regular files are deleted with |delete()|, too.
+Please note that only empty directories may be deleted with the "D" mapping.
+Regular files are deleted with |delete()|, too.
 
 The |g:netrw_rm_cmd|, |g:netrw_rmf_cmd|, and |g:netrw_rmdir_cmd| variables are
 used to control the attempts to remove remote files and directories.  The
@@ -1647,8 +1645,7 @@ to remove it again using the g:netrw_rmf_cmd variable.  Its default value is:
 	|g:netrw_rmf_cmd|: ssh HOSTNAME rm -f
 
 Related topics: |netrw-d|
-Associated setting variable: |g:netrw_localrmdir| |g:netrw_rm_cmd|
-                             |g:netrw_rmdir_cmd|   |g:netrw_ssh_cmd|
+Associated setting variable: |g:netrw_rm_cmd| |g:netrw_ssh_cmd|
 
 
 *netrw-explore*  *netrw-hexplore* *netrw-nexplore* *netrw-pexplore*
@@ -1691,7 +1688,11 @@ DIRECTORY EXPLORATION COMMANDS  {{{2
 	  to 2; edits will thus preferentially be made in window#2.
 
 	  The [N] specifies a |g:netrw_winsize| just for the new :Lexplore
-	  window.
+	  window. That means that
+	    if [N] < 0 : use |N| columns for the Lexplore window
+	    if [N] = 0 : a normal split is made
+	    if [N] > 0 : use N% of the current window will be used for the
+	                 new window
 
 	  Those who like this method often also like tree style displays;
 	  see |g:netrw_liststyle|.
@@ -1975,7 +1976,7 @@ To use this function, simply assign its output to |g:netrw_list_hide| option.  >
 	Example: let g:netrw_list_hide= netrw_gitignore#Hide('my_gitignore_file')
 		Function can take additional files with git-ignore patterns.
 
-	Example: let g:netrw_list_hide= netrw_gitignore#Hide() .. '.*\.swp$'
+	Example: g:netrw_list_hide= netrw_gitignore#Hide() . '.*\.swp$'
 		Combining 'netrw_gitignore#Hide' with custom patterns.
 <
 
@@ -2853,18 +2854,6 @@ your browsing preferences.  (see also: |netrw-settings|)
 				=" /c move"                     Windows
 				Options for |g:netrw_localmovecmd|
 
-  *g:netrw_localrmdir*		="rmdir"        Linux/Unix/MacOS/Cygwin
-				=expand("$COMSPEC")             Windows
-				Remove directory command (rmdir)
-				This variable is only used if your vim is
-				earlier than 7.4 or if your vim doesn't
-				have patch#1107.  Otherwise, |delete()|
-				is used with the "d" option.
-
-  *g:netrw_localrmdiropt*	=""             Linux/Unix/MacOS/Cygwin
-				=" /c rmdir"                    Windows
-				Options for |g:netrw_localrmdir|
-
   *g:netrw_maxfilenamelen*	=32 by default, selected so as to make long
 				    listings fit on 80 column displays.
 				If your screen is wider, and you have file
@@ -3775,7 +3764,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
 	     Netrw uses several system level commands to do things (see
 
 		 |g:netrw_localcopycmd|, |g:netrw_localmovecmd|,
-		 |g:netrw_localrmdir|, |g:netrw_mkdir_cmd|).
+		 |g:netrw_mkdir_cmd|).
 
 	    You may need to adjust the default commands for one or more of
 	    these commands by setting them properly in your .vimrc.  Another
@@ -3901,6 +3890,13 @@ netrw:
 ==============================================================================
 12. History						*netrw-history* {{{1
 
+	v172:	Sep 02, 2021	* (Bram Moolenaar) Changed "l:go" to "go"
+				* (Bram Moolenaar) no need for "b" in
+				  netrw-safe guioptions
+		Nov 15, 2021	* removed netrw_localrm and netrw_localrmdir
+				  references
+		Aug 18, 2022	* (Miguel Barro) improving compatability with
+				  powershell
 	v171:	Oct 09, 2020	* included code in s:NetrwOptionsSafe()
 				  to allow |'bh'| to be set to delete when
 				  rather than hide when g:netrw_fastbrowse
@@ -3986,7 +3982,7 @@ netrw:
 				  mostly for Windows.  Introduced new netrw
 				  settings: |g:netrw_localcopycmdopt|
 				  |g:netrw_localcopydircmdopt| |g:netrw_localmkdiropt|
-				  |g:netrw_localmovecmdopt| |g:netrw_localrmdiropt|
+				  |g:netrw_localmovecmdopt| g:netrw_localrmdiropt
 		Nov 21, 2016	* (mattn) provided a patch for preview; swapped
 				  winwidth() with winheight()
 		Nov 22, 2016	* (glacambre) reported that files containing
@@ -4046,7 +4042,7 @@ netrw:
 				  refreshes.  However, inside a |:map-<expr>|,
 				  tab and window changes are disallowed.  Fixed.
 				  (affects netrw's s:LocalBrowseRefresh())
-				* |g:netrw_localrmdir| not used any more, but
+				* g:netrw_localrmdir not used any more, but
 				  the relevant patch that causes |delete()| to
 				  take over was #1107 (not #1109).
 				* |expand()| is now used on |g:netrw_home|;
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 9b531d78b4..dd14b6c295 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -102,6 +102,7 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
 
 ==============================================================================
 4. History							*zip-history* {{{1
+   v33 Dec 07, 2021 * *.xlam mentioned twice in zipPlugin
    v32 Oct 22, 2021 * to avoid an issue with a vim 8.2 patch, zipfile: has
 		      been changed to zipfile:// . This often shows up
 		      as zipfile:/// with zipped files that are root-based.
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
index d9aaa757ad..b05bcd6bc8 100644
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -154,7 +154,7 @@ the recover command:
 :rec[over]! [file]	Like ":recover", but any changes in the current
 			buffer are lost.
 
-							*E312* *E309* *E310*
+						*E312* *E309* *E310* *E1364*
 Vim has some intelligence about what to do if the swap file is corrupt in
 some way.  If Vim has doubt about what it found, it will give an error
 message and insert lines with "???" in the text.  If you see an error message
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index c6c4da2dea..d985093d9f 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -205,7 +205,8 @@ line may be postponed.  Use |CTRL-L| when needed.  Also see |set-spc-auto| for
 how it can be set automatically when 'spelllang' is set.
 
 The 'spelloptions' option has a few more flags that influence the way spell
-checking works.
+checking works.  For example, "camel" splits CamelCased words so that each
+part of the word is spell-checked separately.
 
 Vim counts the number of times a good word is encountered.  This is used to
 sort the suggestions: words that have been seen before get a small bonus,
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 9051375da2..00a5e1c8ad 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2769,7 +2769,7 @@ unsetting all the other ones.
 If you use Python 2 or straddling code (Python 2 and 3 compatible),
 you can enforce the use of an older syntax file with support for
 Python 2 and up to Python 3.5.  >
-	: let python_use_python2_syntax = 1
+	:let python_use_python2_syntax = 1
 This option will exclude all modern Python 3.6 or higher features.
 
 Note: Only existence of these options matters, not their value.
@@ -3698,11 +3698,12 @@ The syntax script for zsh allows for syntax-based folding: >
 Vim understands three types of syntax items:
 
 1. Keyword
-   It can only contain keyword characters, according to the 'iskeyword'
-   option.  It cannot contain other syntax items.  It will only match with a
-   complete word (there are no keyword characters before or after the match).
-   The keyword "if" would match in "if(a=b)", but not in "ifdef x", because
-   "(" is not a keyword character and "d" is.
+   It can only contain keyword characters, according to the characters
+   specified with |:syn-iskeyword| or the 'iskeyword' option.  It cannot
+   contain other syntax items.  It will only match with a complete word (there
+   are no keyword characters before or after the match).  The keyword "if"
+   would match in "if(a=b)", but not in "ifdef x", because "(" is not a
+   keyword character and "d" is.
 
 2. Match
    This is a match with a single regexp pattern.
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
index 2b0d40ba32..b76ca18d20 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -173,6 +173,8 @@ one.  Thus if the cursor is at the start of the line of the previous example,
 		---+---------------->
 			   %
 
+Other ways to move around code can be found in |usr_29.txt|.
+
 ==============================================================================
 *03.5*	Moving to a specific line
 
diff --git a/runtime/ftplugin/livebook.vim b/runtime/ftplugin/livebook.vim
new file mode 100644
index 0000000000..c97d210412
--- /dev/null
+++ b/runtime/ftplugin/livebook.vim
@@ -0,0 +1,9 @@
+" Placeholder livebook filetype plugin file.
+" This simply uses the markdown filetype plugin.
+
+" Only load this plugin when no other was loaded.
+if exists("b:did_ftplugin")
+    finish
+endif
+
+runtime! ftplugin/markdown.vim ftplugin/markdown_*.vim ftplugin/markdown/*.vim
diff --git a/runtime/ftplugin/lua.vim b/runtime/ftplugin/lua.vim
index 88b1fc9d44..3529e1e3fd 100644
--- a/runtime/ftplugin/lua.vim
+++ b/runtime/ftplugin/lua.vim
@@ -4,7 +4,8 @@
 " Previous Maintainer:	Max Ischenko <mfi@ukr.net>
 " Contributor:		Dorai Sitaram <ds26@gte.com>
 "			C.D. MacEachern <craig.daniel.maceachern@gmail.com>
-" Last Change:		2022 Nov 19
+"			Tyler Miller <tmillr@proton.me>
+" Last Change:		2023 Mar 24
 
 if exists("b:did_ftplugin")
   finish
@@ -14,7 +15,7 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal comments=:--
+setlocal comments=:---,:--
 setlocal commentstring=--\ %s
 setlocal formatoptions-=t formatoptions+=croql
 
diff --git a/runtime/ftplugin/netrc.vim b/runtime/ftplugin/netrc.vim
index 02ee327295..5f40bec96e 100644
--- a/runtime/ftplugin/netrc.vim
+++ b/runtime/ftplugin/netrc.vim
@@ -2,6 +2,7 @@
 " Language:             netrc(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2008-07-09
+" Last Change:		2023 Feb 27 by Keith Smiley
 
 if exists("b:did_ftplugin")
   finish
@@ -13,7 +14,7 @@ set cpo&vim
 
 let b:undo_ftplugin = "setl com< cms< fo<"
 
-setlocal comments= commentstring= formatoptions-=tcroq formatoptions+=l
+setlocal comments=b:# commentstring=#\ %s formatoptions-=tcroq formatoptions+=l
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim
index 355b88f04a..be6ab7335b 100644
--- a/runtime/ftplugin/rmd.vim
+++ b/runtime/ftplugin/rmd.vim
@@ -2,7 +2,7 @@
 " Language: R Markdown file
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sun Apr 24, 2022  09:12AM
+" Last Change:	Mon Feb 27, 2023  07:15PM
 " Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann)
 
 " Only do this when not yet done for this buffer
@@ -23,7 +23,7 @@ setlocal iskeyword=@,48-57,_,.
 let s:cpo_save = &cpo
 set cpo&vim
 
-function! FormatRmd()
+function FormatRmd()
   if search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")
     setlocal comments=:#',:###,:##,:#
   else
@@ -32,7 +32,7 @@ function! FormatRmd()
   return 1
 endfunction
 
-function! SetRmdCommentStr()
+function SetRmdCommentStr()
     if (search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")) || ((search('^---$', 'Wn') || search('^\.\.\.$', 'Wn')) && search('^---$', 'bnW'))
         set commentstring=#\ %s
     else
diff --git a/runtime/ftplugin/rnoweb.vim b/runtime/ftplugin/rnoweb.vim
index cf1c0922c0..26c1ab4e3f 100644
--- a/runtime/ftplugin/rnoweb.vim
+++ b/runtime/ftplugin/rnoweb.vim
@@ -2,7 +2,7 @@
 " Language: Rnoweb
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sun Apr 24, 2022  09:13AM
+" Last Change:	Mon Feb 27, 2023  07:16PM
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
@@ -29,7 +29,7 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
         \ "All Files (*.*)\t*.*\n"
 endif
 
-function! SetRnwCommentStr()
+function SetRnwCommentStr()
     if (search("^\s*<<.*>>=", "bncW") > search("^@", "bncW"))
         set commentstring=#\ %s
     else
@@ -47,9 +47,9 @@ if !exists("g:rnw_dynamic_comments") || (exists("g:rnw_dynamic_comments") && g:r
 endif
 
 if exists('b:undo_ftplugin')
-  let b:undo_ftplugin .= " | setl isk< sua< com< | unlet! b:browsefilter"
+  let b:undo_ftplugin .= " | setl isk< sua< com< cms< | unlet! b:browsefilter"
 else
-  let b:undo_ftplugin = "setl isk< sua< com< | unlet! b:browsefilter"
+  let b:undo_ftplugin = "setl isk< sua< com< cms< | unlet! b:browsefilter"
 endif
 
 let &cpo = s:cpo_save
diff --git a/runtime/ftplugin/rrst.vim b/runtime/ftplugin/rrst.vim
index 19c67c4cc2..d9df5e587f 100644
--- a/runtime/ftplugin/rrst.vim
+++ b/runtime/ftplugin/rrst.vim
@@ -2,7 +2,7 @@
 " Language: reStructuredText documentation format with R code
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sun Apr 24, 2022  09:13AM
+" Last Change:	Mon Feb 27, 2023  07:16PM
 " Original work by Alex Zvoleff
 
 " Only do this when not yet done for this buffer
@@ -22,7 +22,7 @@ setlocal formatoptions+=tcqln
 setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
 setlocal iskeyword=@,48-57,_,.
 
-function! FormatRrst()
+function FormatRrst()
   if search('^\.\. {r', "bncW") > search('^\.\. \.\.$', "bncW")
     setlocal comments=:#',:###,:##,:#
   else
diff --git a/runtime/indent/livebook.vim b/runtime/indent/livebook.vim
new file mode 100644
index 0000000000..6311050e0e
--- /dev/null
+++ b/runtime/indent/livebook.vim
@@ -0,0 +1,9 @@
+" Placeholder livebook indent file.
+" This simply uses the markdown indenting.
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+runtime! indent/markdown.vim
diff --git a/runtime/indent/r.vim b/runtime/indent/r.vim
index 293dd98175..07dfd13881 100644
--- a/runtime/indent/r.vim
+++ b/runtime/indent/r.vim
@@ -2,7 +2,7 @@
 " Language:	R
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Wed Oct 26, 2022  12:04PM
+" Last Change:	Mon Feb 27, 2023  07:16PM
 
 
 " Only load this indent file when no other was loaded.
@@ -110,7 +110,7 @@ function s:RDelete_parens(line)
   return line1
 endfunction
 
-function! s:Get_paren_balance(line, o, c)
+function s:Get_paren_balance(line, o, c)
   let line2 = substitute(a:line, a:o, "", "g")
   let openp = strlen(a:line) - strlen(line2)
   let line3 = substitute(line2, a:c, "", "g")
@@ -118,7 +118,7 @@ function! s:Get_paren_balance(line, o, c)
   return openp - closep
 endfunction
 
-function! s:Get_matching_brace(linenr, o, c, delbrace)
+function s:Get_matching_brace(linenr, o, c, delbrace)
   let line = SanitizeRLine(getline(a:linenr))
   if a:delbrace == 1
     let line = substitute(line, '{$', "", "")
@@ -134,7 +134,7 @@ endfunction
 
 " This function is buggy because there 'if's without 'else'
 " It must be rewritten relying more on indentation
-function! s:Get_matching_if(linenr, delif)
+function s:Get_matching_if(linenr, delif)
   let line = SanitizeRLine(getline(a:linenr))
   if a:delif
     let line = substitute(line, "if", "", "g")
@@ -162,7 +162,7 @@ function! s:Get_matching_if(linenr, delif)
   endif
 endfunction
 
-function! s:Get_last_paren_idx(line, o, c, pb)
+function s:Get_last_paren_idx(line, o, c, pb)
   let blc = a:pb
   let line = substitute(a:line, '\t', s:curtabstop, "g")
   let theidx = -1
diff --git a/runtime/indent/rhelp.vim b/runtime/indent/rhelp.vim
index 2b9d49b915..334802ab78 100644
--- a/runtime/indent/rhelp.vim
+++ b/runtime/indent/rhelp.vim
@@ -2,7 +2,7 @@
 " Language:	R Documentation (Help), *.Rd
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Feb 25, 2023
+" Last Change:	Mon Feb 27, 2023  07:01PM
 
 
 " Only load this indent file when no other was loaded.
diff --git a/runtime/indent/rnoweb.vim b/runtime/indent/rnoweb.vim
index 33bc103d18..668cdb7ddd 100644
--- a/runtime/indent/rnoweb.vim
+++ b/runtime/indent/rnoweb.vim
@@ -2,7 +2,7 @@
 " Language:	Rnoweb
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Feb 25, 2023
+" Last Change:	Mon Feb 27, 2023  07:17PM
 
 
 " Only load this indent file when no other was loaded.
@@ -11,7 +11,7 @@ if exists("b:did_indent")
 endif
 runtime indent/tex.vim
 
-function! s:NoTeXIndent()
+function s:NoTeXIndent()
   return indent(line("."))
 endfunction
 
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index d653f71281..2c3f61c9d4 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -910,7 +910,7 @@ func s:InstallCommands()
   command Program call s:GotoProgram()
   command Source call s:GotoSourcewinOrCreateIt()
   command Asm call s:GotoAsmwinOrCreateIt()
-  command Winbar call s:InstallWinbar()
+  command Winbar call s:InstallWinbar(1)
 
   let map = 1
   if exists('g:termdebug_config')
@@ -931,14 +931,7 @@ func s:InstallCommands()
   endif
 
   if has('menu') && &mouse != ''
-    " install the window toolbar by default, can be disabled in the config
-    let winbar = 1
-    if exists('g:termdebug_config')
-      let winbar = get(g:termdebug_config, 'winbar', 1)
-    endif
-    if winbar
-      call s:InstallWinbar()
-    endif
+    call s:InstallWinbar(0)
 
     let popup = 1
     if exists('g:termdebug_config')
@@ -963,7 +956,7 @@ endfunc
 " let s:winbar_winids = []
 
 " Install the window toolbar in the current window.
-func s:InstallWinbar()
+func s:InstallWinbar(force)
   " if has('menu') && &mouse != ''
   "   nnoremenu WinBar.Step   :Step<CR>
   "   nnoremenu WinBar.Next   :Over<CR>
@@ -1370,7 +1363,7 @@ func s:GotoSourcewinOrCreateIt()
   if !win_gotoid(s:sourcewin)
     new
     let s:sourcewin = win_getid(winnr())
-    call s:InstallWinbar()
+    call s:InstallWinbar(0)
   endif
 endfunc
 
@@ -1493,7 +1486,7 @@ func s:HandleCursor(msg)
           " TODO: find existing window
           exe 'split ' . fnameescape(fname)
           let s:sourcewin = win_getid(winnr())
-          call s:InstallWinbar()
+          call s:InstallWinbar(0)
         else
           exe 'edit ' . fnameescape(fname)
         endif
diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim
index d309f81484..431d9ad9c4 100644
--- a/runtime/plugin/netrwPlugin.vim
+++ b/runtime/plugin/netrwPlugin.vim
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_netrwPlugin")
  finish
 endif
-let g:loaded_netrwPlugin = "v171"
+let g:loaded_netrwPlugin = "v172"
 let s:keepcpo = &cpo
 set cpo&vim
 "DechoRemOn
diff --git a/runtime/plugin/zipPlugin.vim b/runtime/plugin/zipPlugin.vim
index edc52713a8..c3118a361d 100644
--- a/runtime/plugin/zipPlugin.vim
+++ b/runtime/plugin/zipPlugin.vim
@@ -1,6 +1,6 @@
 " zipPlugin.vim: Handles browsing zipfiles
 "            PLUGIN PORTION
-" Date:			Jan 07, 2020
+" Date:			Dec 07, 2021
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " License:		Vim License  (see vim's :help license)
 " Copyright:    Copyright (C) 2005-2016 Charles E. Campbell {{{1
@@ -20,14 +20,14 @@
 if &cp || exists("g:loaded_zipPlugin")
  finish
 endif
-let g:loaded_zipPlugin = "v32"
+let g:loaded_zipPlugin = "v33"
 let s:keepcpo          = &cpo
 set cpo&vim
 
 " ---------------------------------------------------------------------
 " Options: {{{1
 if !exists("g:zipPlugin_ext")
- let g:zipPlugin_ext='*.aar,*.apk,*.celzip,*.crtx,*.docm,*.docx,*.dotm,*.dotx,*.ear,*.epub,*.gcsx,*.glox,*.gqsx,*.ja,*.jar,*.kmz,*.odb,*.odc,*.odf,*.odg,*.odi,*.odm,*.odp,*.ods,*.odt,*.otc,*.otf,*.otg,*.oth,*.oti,*.otp,*.ots,*.ott,*.oxt,*.potm,*.potx,*.ppam,*.ppsm,*.ppsx,*.pptm,*.pptx,*.sldx,*.thmx,*.vdw,*.war,*.wsz,*.xap,*.xlam,*.xlam,*.xlsb,*.xlsm,*.xlsx,*.xltm,*.xltx,*.xpi,*.zip'
+ let g:zipPlugin_ext='*.aar,*.apk,*.celzip,*.crtx,*.docm,*.docx,*.dotm,*.dotx,*.ear,*.epub,*.gcsx,*.glox,*.gqsx,*.ja,*.jar,*.kmz,*.odb,*.odc,*.odf,*.odg,*.odi,*.odm,*.odp,*.ods,*.odt,*.otc,*.otf,*.otg,*.oth,*.oti,*.otp,*.ots,*.ott,*.oxt,*.potm,*.potx,*.ppam,*.ppsm,*.ppsx,*.pptm,*.pptx,*.sldx,*.thmx,*.vdw,*.war,*.wsz,*.xap,*.xlam,*.xlsb,*.xlsm,*.xlsx,*.xltm,*.xltx,*.xpi,*.zip'
 endif
 
 " ---------------------------------------------------------------------
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 50878a78ea..04b132d3ff 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Oct 05
+" Last Change:	2023 Mar 08
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -348,7 +348,10 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu")
   syn keyword cConstant SIGABRT SIGALRM SIGCHLD SIGCONT SIGFPE SIGHUP SIGILL SIGINT SIGKILL SIGPIPE SIGQUIT SIGSEGV
   syn keyword cConstant SIGSTOP SIGTERM SIGTRAP SIGTSTP SIGTTIN SIGTTOU SIGUSR1 SIGUSR2
   syn keyword cConstant _IOFBF _IOLBF _IONBF BUFSIZ EOF WEOF FOPEN_MAX FILENAME_MAX L_tmpnam
-  syn keyword cConstant SEEK_CUR SEEK_END SEEK_SET TMP_MAX stderr stdin stdout EXIT_FAILURE EXIT_SUCCESS RAND_MAX
+  syn keyword cConstant SEEK_CUR SEEK_END SEEK_SET TMP_MAX EXIT_FAILURE EXIT_SUCCESS RAND_MAX
+  syn keyword cConstant stdin stdout stderr
+  " POSIX 2001, in unistd.h
+  syn keyword cConstant STDIN_FILENO STDOUT_FILENO STDERR_FILENO
   " used in assert.h
   syn keyword cConstant NDEBUG
   " POSIX 2001
diff --git a/runtime/syntax/gpg.vim b/runtime/syntax/gpg.vim
index 57f712b6a3..c7f3584ff0 100644
--- a/runtime/syntax/gpg.vim
+++ b/runtime/syntax/gpg.vim
@@ -3,6 +3,7 @@
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
 " Latest Revision:	2010-10-14
 " Updated:		2023-01-23 @ObserverOfTime: added a couple of keywords
+"			2023-03-21 Todd Zullinger <tmz@pobox.com>: sync with gnupg-2.4.0
 
 if exists("b:current_syntax")
   finish
@@ -23,73 +24,145 @@ syn match   gpgID	contained display '\<\(0x\)\=\x\{8,}\>'
 syn match   gpgBegin	display '^' skipwhite nextgroup=gpgComment,gpgOption,gpgCommand
 
 syn keyword gpgCommand	contained skipwhite nextgroup=gpgArg
-			\ check-sigs decrypt decrypt-files delete-key
-			\ delete-secret-and-public-key delete-secret-key
-			\ edit-key encrypt-files export export-all
-			\ export-ownertrust export-secret-keys
-			\ export-secret-subkeys fast-import fingerprint
-			\ gen-prime gen-random import import-ownertrust
-			\ list-keys list-public-keys list-secret-keys
-			\ list-sigs lsign-key nrsign-key print-md print-mds
-			\ recv-keys search-keys send-keys sign-key verify
-			\ verify-files
+			\ change-passphrase check-sig check-signatures
+			\ check-sigs delete-keys delete-secret-and-public-keys
+			\ delete-secret-keys desig-revoke export
+			\ export-secret-keys export-secret-ssh-key
+			\ export-secret-subkeys export-ssh-key list-key
+			\ list-keys list-packets list-public-keys
+			\ list-secret-keys list-sig list-signatures list-sigs
+			\ passwd send-keys fetch-keys
+			\ generate-designated-revocation generate-revocation
+			\ gen-prime gen-random gen-revoke locate-external-keys
+			\ locate-keys lsign-key options print-md quick-add-key
+			\ quick-addkey quick-add-uid quick-adduid
+			\ quick-generate-key quick-gen-key quick-lsign-key
+			\ quick-revoke-sig quick-revoke-uid quick-revuid
+			\ quick-set-expire quick-set-primary-uid quick-sign-key
+			\ quick-update-pref receive-keys recv-keys refresh-keys
+			\ search-keys show-key show-keys sign-key tofu-policy
 syn keyword gpgCommand	contained skipwhite nextgroup=gpgArgError
-			\ check-trustdb clearsign desig-revoke detach-sign
-			\ encrypt gen-key gen-revoke help list-packets
-			\ rebuild-keydb-caches sign store symmetric
-			\ update-trustdb version warranty
+			\ card-edit card-status change-pin check-trustdb
+			\ clear-sign clearsign dearmor dearmour decrypt
+			\ decrypt-files detach-sign encrypt encrypt-files
+			\ edit-card edit-key enarmor enarmour export-ownertrust
+			\ fast-import import import-ownertrust key-edit
+			\ fingerprint fix-trustdb full-generate-key
+			\ full-gen-key generate-key gen-key gpgconf-list
+			\ gpgconf-test list-config list-gcrypt-config
+			\ list-trustdb no-options print-mds
+			\ rebuild-keydb-caches server sign store symmetric
+			\ update-trustdb verify verify-files
 
 syn keyword gpgOption	contained skipwhite nextgroup=gpgArg
-			\ attribute-fd cert-digest-algo charset cipher-algo
-			\ command-fd comment completes-needed compress
-			\ compress-algo debug default-cert-check-level
-			\ default-key default-preference-list
-			\ default-recipient digest-algo disable-cipher-algo
-			\ disable-pubkey-algo encrypt-to exec-path
-			\ export-options group homedir import-options
-			\ keyring keyserver keyserver-options load-extension
-			\ local-user logger-fd marginals-needed max-cert-depth
-			\ notation-data options output override-session-key
-			\ passphrase-fd personal-cipher-preferences
-			\ personal-compress-preferences
-			\ personal-digest-preferences photo-viewer
-			\ recipient s2k-cipher-algo s2k-digest-algo s2k-mode
-			\ secret-keyring set-filename set-policy-url status-fd
-			\ trusted-key verify-options keyid-format list-options
-			\ default-new-key-algo weak-digest
+			\ aead-algo agent-program attribute-fd attribute-file
+			\ auto-key-locate bzip2-compress-level cert-digest-algo
+			\ cert-notation cert-policy-url charset chuid
+			\ chunk-size cipher-algo command-fd command-file
+			\ comment compatibility-flags completes-needed
+			\ compliance compress-algo compression-algo
+			\ compress-level ctapi-driver debug
+			\ debug-allow-large-chunks debug-level
+			\ debug-set-iobuf-size default-cert-check-level
+			\ default-cert-expire default-cert-level default-key
+			\ default-keyserver-url default-new-key-algo
+			\ default-preference-list default-recipient
+			\ default-sig-expire digest-algo dirmngr-program
+			\ disable-cipher-algo disable-pubkey-algo display
+			\ display-charset encrypt-to exec-path export-filter
+			\ export-options faked-system-time force-ownertrust
+			\ gpg-agent-info group hidden-encrypt-to
+			\ hidden-recipient hidden-recipient-file homedir
+			\ import-filter import-options input-size-hint
+			\ keyboxd-program keyid-format key-origin keyring
+			\ keyserver keyserver-options known-notation lc-ctype
+			\ lc-messages limit-card-insert-tries list-filter
+			\ list-options local-user log-file logger-fd
+			\ logger-file marginals-needed max-cert-depth
+			\ max-output min-cert-level min-rsa-length output
+			\ override-session-key override-session-key-fd
+			\ passphrase passphrase-fd passphrase-file
+			\ passphrase-repeat pcsc-driver
+			\ personal-aead-preferences personal-cipher-preferences
+			\ personal-cipher-prefs personal-compress-preferences
+			\ personal-compress-prefs personal-digest-preferences
+			\ photo-viewer pinentry-mode primary-keyring
+			\ reader-port recipient recipient-file remote-user
+			\ request-origin s2k-cipher-algo s2k-count
+			\ s2k-digest-algo s2k-mode secret-keyring sender
+			\ set-filename set-filesize set-notation set-policy-url
+			\ sig-keyserver-url sig-notation sign-with
+			\ sig-policy-url status-fd status-file temp-directory
+			\ tofu-db-format tofu-default-policy trustdb-name
+			\ trusted-key trust-model try-secret-key ttyname
+			\ ttytype ungroup user verify-options weak-digest
+			\ xauthority
 syn keyword gpgOption	contained skipwhite nextgroup=gpgArgError
-			\ allow-freeform-uid allow-non-selfsigned-uid
-			\ allow-secret-key-import always-trust
-			\ armor ask-cert-expire ask-sig-expire
-			\ auto-check-trustdb batch debug-all default-comment
-			\ default-recipient-self dry-run emit-version
-			\ emulate-md-encode-bug enable-special-filenames
-			\ escape-from-lines expert fast-list-mode
-			\ fixed-list-mode for-your-eyes-only
-			\ force-mdc force-v3-sigs force-v4-certs
-			\ gpg-agent-info ignore-crc-error ignore-mdc-error
-			\ ignore-time-conflict ignore-valid-from interactive
+			\ allow-freeform-uid allow-multiple-messages
+			\ allow-multisig-verification allow-non-selfsigned-uid
+			\ allow-old-cipher-algos allow-secret-key-import
+			\ allow-weak-digest-algos allow-weak-key-signatures
+			\ always-trust armor armour ask-cert-expire
+			\ ask-cert-level ask-sig-expire auto-check-trustdb
+			\ auto-key-import auto-key-retrieve batch
+			\ bzip2-decompress-lowmem compress-keys compress-sigs
+			\ debug-all debug-iolbf debug-quick-random
+			\ default-comment default-recipient-self disable-ccid
+			\ disable-dirmngr disable-dsa2 disable-large-rsa
+			\ disable-mdc disable-signer-uid dry-run dump-options
+			\ dump-option-table emit-version enable-dsa2
+			\ enable-large-rsa enable-progress-filter
+			\ enable-special-filenames encrypt-to-default-key
+			\ escape-from-lines exit-on-status-write-error expert
+			\ fast-list-mode file-is-digest fixed-list-mode
+			\ forbid-gen-key force-aead force-mdc force-ocb
+			\ force-sign-key force-v3-sigs force-v4-certs
+			\ for-your-eyes-only full-timestrings gnupg help
+			\ honor-http-proxy ignore-crc-error ignore-mdc-error
+			\ ignore-time-conflict ignore-valid-from
+			\ include-key-block interactive legacy-list-mode
 			\ list-only lock-multiple lock-never lock-once
-			\ merge-only no no-allow-non-selfsigned-uid
-			\ no-armor no-ask-cert-expire no-ask-sig-expire
-			\ no-auto-check-trustdb no-batch no-comment
+			\ mangle-dos-filenames merge-only mimemode multifile no
+			\ no-allow-freeform-uid no-allow-multiple-messages
+			\ no-allow-non-selfsigned-uid no-armor no-armour
+			\ no-ask-cert-expire no-ask-cert-level
+			\ no-ask-sig-expire no-auto-check-trustdb
+			\ no-auto-key-import no-auto-key-locate
+			\ no-auto-key-retrieve no-autostart
+			\ no-auto-trust-new-key no-batch no-comments
 			\ no-default-keyring no-default-recipient
-			\ no-encrypt-to no-expensive-trust-checks
-			\ no-expert no-for-your-eyes-only no-force-v3-sigs
-			\ no-force-v4-certs no-greeting no-literal
-			\ no-mdc-warning no-options no-permission-warning
-			\ no-pgp2 no-pgp6 no-pgp7 no-random-seed-file
-			\ no-secmem-warning no-show-notation no-show-photos
-			\ no-show-policy-url no-sig-cache no-sig-create-check
-			\ no-sk-comments no-tty no-utf8-strings no-verbose
-			\ no-version not-dash-escaped openpgp pgp2
-			\ pgp6 pgp7 preserve-permissions quiet rfc1991
-			\ set-filesize show-keyring show-notation show-photos
-			\ show-policy-url show-session-key simple-sk-checksum
-			\ sk-comments skip-verify textmode throw-keyid
-			\ try-all-secrets use-agent use-embedded-filename
-			\ utf8-strings verbose with-colons with-fingerprint
-			\ with-key-data yes
+			\ no-disable-mdc no-emit-version no-encrypt-to
+			\ no-escape-from-lines no-expensive-trust-checks
+			\ no-expert no-force-mdc no-force-v3-sigs
+			\ no-force-v4-certs no-for-your-eyes-only no-greeting
+			\ no-groups no-include-key-block no-keyring no-literal
+			\ no-mangle-dos-filenames no-mdc-warning
+			\ no-permission-warning no-pgp2 no-pgp6 no-pgp7 no-pgp8
+			\ no-random-seed-file no-require-backsigs
+			\ no-require-cross-certification no-require-secmem
+			\ no-rfc2440-text no-secmem-warning no-show-notation
+			\ no-show-photos no-show-policy-url no-sig-cache
+			\ no-sk-comments no-skip-hidden-recipients
+			\ no-symkey-cache not-dash-escaped no-textmode
+			\ no-throw-keyids no-tty no-use-agent
+			\ no-use-embedded-filename no-utf8-strings no-verbose
+			\ no-version only-sign-text-ids openpgp
+			\ override-compliance-check pgp6 pgp7 pgp8
+			\ preserve-permissions print-dane-records quiet
+			\ require-backsigs require-compliance
+			\ require-cross-certification require-secmem rfc2440
+			\ rfc2440-text rfc4880 rfc4880bis show-keyring
+			\ show-notation show-photos show-policy-url
+			\ show-session-key sk-comments skip-hidden-recipients
+			\ skip-verify textmode throw-keyids try-all-secrets
+			\ unwrap use-agent use-embedded-filename use-keyboxd
+			\ use-only-openpgp-card utf8-strings verbose version
+			\ warranty with-colons with-fingerprint
+			\ with-icao-spelling with-key-data with-keygrip
+			\ with-key-origin with-key-screening with-secret
+			\ with-sig-check with-sig-list with-subkey-fingerprint
+			\ with-subkey-fingerprints with-tofu-info with-wkd-hash
+			\ yes
 
 syn match   gpgArg	contained display '\S\+\(\s\+\S\+\)*' contains=gpgID
 syn match   gpgArgError contained display '\S\+\(\s\+\S\+\)*'
@@ -99,7 +172,7 @@ hi def link gpgTodo	Todo
 hi def link gpgID	Number
 hi def link gpgOption	Keyword
 hi def link gpgCommand	Error
-hi def link gpgArgError Error
+hi def link gpgArgError	Error
 
 let b:current_syntax = "gpg"
 
diff --git a/runtime/syntax/hollywood.vim b/runtime/syntax/hollywood.vim
index fcd03a68f0..7846d5230f 100644
--- a/runtime/syntax/hollywood.vim
+++ b/runtime/syntax/hollywood.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
-" Language:     Hollywood 9.1
+" Language:     Hollywood 10.0
 " Maintainer:   Ola S�der <rolfkopman@gmail.com>
 " First Author: Tom Crecelius <holly@net-eclipse.net>
-" Last Change:  2022 Nov 09
+" Last Change:  2023 Mar 22
 " Highlighting Issues:
 " Depending on your colour schema, Strings or Comments might be highlighted in
 " a way, you don't like. If so, try one of the following settings after
@@ -105,7 +105,7 @@ syn keyword hwIn contained In
 syn keyword hwStatement Return Break Continue
 syn keyword hwStatement Goto Gosub Dim DimStr Const Local Global
 syn match hwLabel "::\I\i*::"
-syn match hwOperator "\%(&\|\*\|+\|-\|\.\||\|//\|/\|:\|<\|=\|>\|<>\|<=\|=>\|\^\|\~\|\\\|\<And\>\|\<Not\>\|\<Or\>\)"
+syn match hwOperator "\%(&\|\*\|+\|-\|\.\||\|//\|/\|:\|<\|=\|>\|<>\|<=\|=>\|\^\|\~\|\\\|\<And\>\|\<Not\>\|\<Or\>\|\<Xor\>\)"
 syn keyword hwConstant Nil
 syn keyword hwConstant True False
 " predefined preprocessing commands
@@ -113,7 +113,7 @@ syn match hwPreProcessor "@\<\%(ANIM\|APPAUTHOR\|APPCOPYRIGHT\|APPDESCRIPTION\|A
 " predefined constants
 syn match hwConstant "#\<\%(ACTIVEWINDOW\|ADF_ANIM\|ADF_FX\|ADF_MOVEOBJECT\|ALL\|ALPHABETICAL\|ALPHACHANNEL\|ALPHANUMERICAL\|AMIGAICON_DEVICE\|AMIGAICON_DISK\|AMIGAICON_DRAWER\|AMIGAICON_GARBAGE\|AMIGAICON_HIDE\|AMIGAICON_KICKSTART\|AMIGAICON_NONE\|AMIGAICON_PROJECT\|AMIGAICON_SETPOSITION\|AMIGAICON_SETTITLE\|AMIGAICON_SHOW\|AMIGAICON_TOOL\|ANIM\|ANIMSTREAM\|ANIMTYPE_RASTER\|ANIMTYPE_VECTOR\|ANMFMT_GIF\|ANMFMT_IFF\|ANMFMT_MJPEG\|ANTIALIAS\|AQUA\|ARC\|ASYNCDRAW\|ASYNCOBJ\|ATTRACTIVE\|ATTRADAPTER\|ATTRALPHAINTENSITY\|ATTRBGPIC\|ATTRBITRATE\|ATTRBORDERBOTTOM\|ATTRBORDERLEFT\|ATTRBORDERLESS\|ATTRBORDERPEN\|ATTRBORDERRIGHT\|ATTRBORDERTOP\|ATTRBULLETPEN\|ATTRCANSEEK\|ATTRCLIPREGION\|ATTRCOUNT\|ATTRCURFRAME\|ATTRCURSORX\|ATTRCURSORY\|ATTRCURSUBSONG\|ATTRCYCLE\|ATTRDENSITY\|ATTRDEPTH\|ATTRDISPLAY\|ATTRDITHERMODE\|ATTRDOUBLEBUFFER\|ATTRDRIVER\|ATTRDURATION\|ATTRELAPSE\|ATTRENCODING\|ATTRFIXED\|ATTRFONTAA\|ATTRFONTASCENDER\|ATTRFONTCHARMAP\|ATTRFONTDEPTH\|ATTRFONTDESCENDER\|ATTRFONTENGINE\|ATTRFONTNAME\|ATTRFONTPALETTE\|ATTRFONTSCALABLE\|ATTRFONTSIZE\|ATTRFONTTRANSPARENTPEN\|ATTRFONTTYPE\|ATTRFORMAT\|ATTRFRAMEDELAY\|ATTRFUNCTION\|ATTRGROUP\|ATTRHARDWARE\|ATTRHASALPHA\|ATTRHASMASK\|ATTRHEIGHT\|ATTRHOSTDEPTH\|ATTRHOSTHEIGHT\|ATTRHOSTMONITORS\|ATTRHOSTSCALE\|ATTRHOSTSCALEX\|ATTRHOSTSCALEY\|ATTRHOSTTASKBAR\|ATTRHOSTTITLEBARHEIGHT\|ATTRHOSTWIDTH\|ATTRID\|ATTRIMMERSIVEMODE\|ATTRINTERPOLATE\|ATTRKEYBOARD\|ATTRLAYERID\|ATTRLAYERS\|ATTRLAYERSON\|ATTRLOADER\|ATTRMARGINLEFT\|ATTRMARGINRIGHT\|ATTRMASKMODE\|ATTRMAXHEIGHT\|ATTRMAXIMIZED\|ATTRMAXWIDTH\|ATTRMENU\|ATTRMODE\|ATTRMONITOR\|ATTRNOCLOSE\|ATTRNOHIDE\|ATTRNOMODESWITCH\|ATTRNUMENTRIES\|ATTRNUMFRAMES\|ATTRNUMSUBSONGS\|ATTRONSCREEN\|ATTRORIENTATION\|ATTROUTPUTDEVICE\|ATTRPALETTE\|ATTRPALETTEMODE\|ATTRPAUSED\|ATTRPEN\|ATTRPITCH\|ATTRPLAYING\|ATTRPOINTER\|ATTRPOSITION\|ATTRPUBSCREEN\|ATTRRAWHEIGHT\|ATTRRAWWIDTH\|ATTRRAWXPOS\|ATTRRAWYPOS\|ATTRSCALEHEIGHT\|ATTRSCALEMODE\|ATTRSCALESWITCH\|ATTRSCALEWIDTH\|ATTRSHADOWPEN\|ATTRSIZE\|ATTRSIZEABLE\|ATTRSPRITES\|ATTRSTANDARD\|ATTRSTATE\|ATTRSYSTEMBARS\|ATTRTEXT\|ATTRTITLE\|ATTRTRANSPARENTCOLOR\|ATTRTRANSPARENTPEN\|ATTRTYPE\|ATTRUSERDATA\|ATTRVISIBLE\|ATTRWIDTH\|ATTRXDPI\|ATTRXPOS\|ATTRXSERVER\|ATTRYDPI\|ATTRYPOS\|ATTRZPOS\|BARS\|BAUD_115200\|BAUD_1200\|BAUD_19200\|BAUD_2400\|BAUD_300\|BAUD_38400\|BAUD_460800\|BAUD_4800\|BAUD_57600\|BAUD_600\|BAUD_9600\|BEEPERROR\|BEEPINFORMATION\|BEEPQUESTION\|BEEPSYSTEM\|BEEPWARNING\|BGPIC\|BGPICPART\|BIGENDIAN\|BIGSINE\|BITMAP_DEFAULT\|BLACK\|BLEND\|BLUE\|BOLD\|BOOLEAN\|BORDER\|BOTTOM\|BOTTOMOUT\|BOUNCE\|BOX\|BRUSH\|BRUSH_VS_BOX\|BRUSHPART\|BULLET_ARROW\|BULLET_BOX\|BULLET_CHECKMARK\|BULLET_CIRCLE\|BULLET_CROSS\|BULLET_DASH\|BULLET_DIAMOND\|BULLET_LALPHA\|BULLET_LALPHADOUBLE\|BULLET_LALPHASINGLE\|BULLET_LROMAN\|BULLET_LROMANDOUBLE\|BULLET_LROMANSINGLE\|BULLET_NONE\|BULLET_NUMERIC\|BULLET_NUMERICDOUBLE\|BULLET_NUMERICSINGLE\|BULLET_UALPHA\|BULLET_UALPHADOUBLE\|BULLET_UALPHASINGLE\|BULLET_UROMAN\|BULLET_UROMANDOUBLE\|BULLET_UROMANSINGLE\|BYTE\|CAPBUTT\|CAPROUND\|CAPSQUARE\|CARDBOTTOM\|CARDTOP\|CENTER\|CHARMAP_ADOBECUSTOM\|CHARMAP_ADOBEEXPERT\|CHARMAP_ADOBELATIN1\|CHARMAP_ADOBESTANDARD\|CHARMAP_APPLEROMAN\|CHARMAP_BIG5\|CHARMAP_DEFAULT\|CHARMAP_JOHAB\|CHARMAP_MSSYMBOL\|CHARMAP_OLDLATIN2\|CHARMAP_SJIS\|CHARMAP_UNICODE\|CHARMAP_WANSUNG\|CHIPMEMORY\|CIRCLE\|CLIENT\|CLIPBOARD_EMPTY\|CLIPBOARD_IMAGE\|CLIPBOARD_SOUND\|CLIPBOARD_TEXT\|CLIPBOARD_UNKNOWN\|CLIPREGION\|CLOCKWIPE\|CLOSEWINDOW\|CONICAL\|COPYFILE_FAILED\|COPYFILE_OVERWRITE\|COPYFILE_STATUS\|COPYFILE_UNPROTECT\|COUNTBOTH\|COUNTDIRECTORIES\|COUNTFILES\|COUNTRY_AFGHANISTAN\|COUNTRY_ALANDISLANDS\|COUNTRY_ALBANIA\|COUNTRY_ALGERIA\|COUNTRY_AMERICANSAMOA\|COUNTRY_ANDORRA\|COUNTRY_ANGOLA\|COUNTRY_ANGUILLA\|COUNTRY_ANTARCTICA\|COUNTRY_ANTIGUAANDBARBUDA\|COUNTRY_ARGENTINA\|COUNTRY_ARMENIA\|COUNTRY_ARUBA\|COUNTRY_AUSTRALIA\|COUNTRY_AUSTRIA\|COUNTRY_AZERBAIJAN\|COUNTRY_BAHAMAS\|COUNTRY_BAHRAIN\|COUNTRY_BANGLADESH\|COUNTRY_BARBADOS\|COUNTRY_BELARUS\|COUNTRY_BELGIUM\|COUNTRY_BELIZE\|COUNTRY_BENIN\|COUNTRY_BERMUDA\|COUNTRY_BESISLANDS\|COUNTRY_BHUTAN\|COUNTRY_BOLIVIA\|COUNTRY_BOSNIAANDHERZEGOVINA\|COUNTRY_BOTSWANA\|COUNTRY_BOUVETISLAND\|COUNTRY_BRAZIL\|COUNTRY_BRUNEI\|COUNTRY_BULGARIA\|COUNTRY_BURKINAFASO\|COUNTRY_BURUNDI\|COUNTRY_CAMBODIA\|COUNTRY_CAMEROON\|COUNTRY_CANADA\|COUNTRY_CAPEVERDE\|COUNTRY_CAYMANISLANDS\|COUNTRY_CENTRALAFRICANREPUBLIC\|COUNTRY_CHAD\|COUNTRY_CHILE\|COUNTRY_CHINA\|COUNTRY_CHRISTMASISLAND\|COUNTRY_COCOSISLANDS\|COUNTRY_COLOMBIA\|COUNTRY_COMOROS\|COUNTRY_CONGO\|COUNTRY_COOKISLANDS\|COUNTRY_COSTARICA\|COUNTRY_CROATIA\|COUNTRY_CUBA\|COUNTRY_CURACAO\|COUNTRY_CYPRUS\|COUNTRY_CZECHREPUBLIC\|COUNTRY_DENMARK\|COUNTRY_DJIBOUTI\|COUNTRY_DOMINICA\|COUNTRY_DOMINICANREPUBLIC\|COUNTRY_DRCONGO\|COUNTRY_ECUADOR\|COUNTRY_EGYPT\|COUNTRY_ELSALVADOR\|COUNTRY_EQUATORIALGUINEA\|COUNTRY_ERITREA\|COUNTRY_ESTONIA\|COUNTRY_ETHIOPIA\|COUNTRY_FALKLANDISLANDS\|COUNTRY_FAROEISLANDS\|COUNTRY_FIJI\|COUNTRY_FINLAND\|COUNTRY_FRANCE\|COUNTRY_FRENCHGUIANA\|COUNTRY_FRENCHPOLYNESIA\|COUNTRY_GABON\|COUNTRY_GAMBIA\|COUNTRY_GEORGIA\|COUNTRY_GERMANY\|COUNTRY_GHANA\|COUNTRY_GIBRALTAR\|COUNTRY_GREECE\|COUNTRY_GREENLAND\|COUNTRY_GRENADA\|COUNTRY_GUADELOUPE\|COUNTRY_GUAM\|COUNTRY_GUATEMALA\|COUNTRY_GUERNSEY\|COUNTRY_GUINEA\|COUNTRY_GUINEABISSAU\|COUNTRY_GUYANA\|COUNTRY_HAITI\|COUNTRY_HOLYSEE\|COUNTRY_HONDURAS\|COUNTRY_HONGKONG\|COUNTRY_HUNGARY\|COUNTRY_ICELAND\|COUNTRY_INDIA\|COUNTRY_INDONESIA\|COUNTRY_IRAN\|COUNTRY_IRAQ\|COUNTRY_IRELAND\|COUNTRY_ISLEOFMAN\|COUNTRY_ISRAEL\|COUNTRY_ITALY\|COUNTRY_IVORYCOAST\|COUNTRY_JAMAICA\|COUNTRY_JAPAN\|COUNTRY_JERSEY\|COUNTRY_JORDAN\|COUNTRY_KAZAKHSTAN\|COUNTRY_KENYA\|COUNTRY_KIRIBATI\|COUNTRY_KUWAIT\|COUNTRY_KYRGYZSTAN\|COUNTRY_LAOS\|COUNTRY_LATVIA\|COUNTRY_LEBANON\|COUNTRY_LESOTHO\|COUNTRY_LIBERIA\|COUNTRY_LIBYA\|COUNTRY_LIECHTENSTEIN\|COUNTRY_LITHUANIA\|COUNTRY_LUXEMBOURG\|COUNTRY_MACAO\|COUNTRY_MACEDONIA\|COUNTRY_MADAGASCAR\|COUNTRY_MALAWI\|COUNTRY_MALAYSIA\|COUNTRY_MALDIVES\|COUNTRY_MALI\|COUNTRY_MALTA\|COUNTRY_MARSHALLISLANDS\|COUNTRY_MARTINIQUE\|COUNTRY_MAURITANIA\|COUNTRY_MAURITIUS\|COUNTRY_MAYOTTE\|COUNTRY_MEXICO\|COUNTRY_MICRONESIA\|COUNTRY_MOLDOVA\|COUNTRY_MONACO\|COUNTRY_MONGOLIA\|COUNTRY_MONTENEGRO\|COUNTRY_MONTSERRAT\|COUNTRY_MOROCCO\|COUNTRY_MOZAMBIQUE\|COUNTRY_MYANMAR\|COUNTRY_NAMIBIA\|COUNTRY_NAURU\|COUNTRY_NEPAL\|COUNTRY_NETHERLANDS\|COUNTRY_NEWCALEDONIA\|COUNTRY_NEWZEALAND\|COUNTRY_NICARAGUA\|COUNTRY_NIGER\|COUNTRY_NIGERIA\|COUNTRY_NIUE\|COUNTRY_NORFOLKISLAND\|COUNTRY_NORTHKOREA\|COUNTRY_NORWAY\|COUNTRY_OMAN\|COUNTRY_PAKISTAN\|COUNTRY_PALAU\|COUNTRY_PALESTINE\|COUNTRY_PANAMA\|COUNTRY_PAPUANEWGUINEA\|COUNTRY_PARAGUAY\|COUNTRY_PERU\|COUNTRY_PHILIPPINES\|COUNTRY_PITCAIRN\|COUNTRY_POLAND\|COUNTRY_PORTUGAL\|COUNTRY_PUERTORICO\|COUNTRY_QATAR\|COUNTRY_REUNION\|COUNTRY_ROMANIA\|COUNTRY_RUSSIA\|COUNTRY_RWANDA\|COUNTRY_SAINTBARTHELEMY\|COUNTRY_SAINTHELENA\|COUNTRY_SAINTKITTSANDNEVIS\|COUNTRY_SAINTLUCIA\|COUNTRY_SAINTVINCENT\|COUNTRY_SAMOA\|COUNTRY_SANMARINO\|COUNTRY_SAOTOMEANDPRINCIPE\|COUNTRY_SAUDIARABIA\|COUNTRY_SENEGAL\|COUNTRY_SERBIA\|COUNTRY_SEYCHELLES\|COUNTRY_SIERRALEONE\|COUNTRY_SINGAPORE\|COUNTRY_SLOVAKIA\|COUNTRY_SLOVENIA\|COUNTRY_SOLOMONISLANDS\|COUNTRY_SOMALIA\|COUNTRY_SOUTHAFRICA\|COUNTRY_SOUTHKOREA\|COUNTRY_SOUTHSUDAN\|COUNTRY_SPAIN\|COUNTRY_SRILANKA\|COUNTRY_SUDAN\|COUNTRY_SURINAME\|COUNTRY_SWAZILAND\|COUNTRY_SWEDEN\|COUNTRY_SWITZERLAND\|COUNTRY_SYRIA\|COUNTRY_TAIWAN\|COUNTRY_TAJIKISTAN\|COUNTRY_TANZANIA\|COUNTRY_THAILAND\|COUNTRY_TIMOR\|COUNTRY_TOGO\|COUNTRY_TONGA\|COUNTRY_TRINIDADANDTOBAGO\|COUNTRY_TUNISIA\|COUNTRY_TURKEY\|COUNTRY_TURKMENISTAN\|COUNTRY_TUVALU\|COUNTRY_UAE\|COUNTRY_UGANDA\|COUNTRY_UK\|COUNTRY_UKRAINE\|COUNTRY_UNKNOWN\|COUNTRY_URUGUAY\|COUNTRY_USA\|COUNTRY_UZBEKISTAN\|COUNTRY_VANUATU\|COUNTRY_VENEZUELA\|COUNTRY_VIETNAM\|COUNTRY_YEMEN\|COUNTRY_ZAMBIA\|COUNTSEPARATE\|CR_DEAD\|CR_RUNNING\|CR_SUSPENDED\|CROSSFADE\|CRUSHBOTTOM\|CRUSHLEFT\|CRUSHRIGHT\|CRUSHTOP\|DAMPED\|DATA_5\|DATA_6\|DATA_7\|DATA_8\|DATEDAY\|DATELOCAL\|DATELOCALNATIVE\|DATEMONTH\|DATETIME\|DATEUTC\|DATEYEAR\|DEFAULTICON\|DEFAULTSPEED\|DEINTERLACE_DEFAULT\|DEINTERLACE_DOUBLE\|DELETEFILE_FAILED\|DELETEFILE_STATUS\|DELETEFILE_UNPROTECT\|DENSITY_HIGH\|DENSITY_LOW\|DENSITY_MEDIUM\|DENSITY_NONE\|DIAGONAL\|DIRECTORY\|DIRMONITOR_ADD\|DIRMONITOR_CHANGE\|DIRMONITOR_REMOVE\|DISPLAY\|DISPMODE_ASK\|DISPMODE_FAKEFULLSCREEN\|DISPMODE_FULLSCREEN\|DISPMODE_FULLSCREENSCALE\|DISPMODE_MODEREQUESTER\|DISPMODE_MODESWITCH\|DISPMODE_SYSTEMSCALE\|DISPMODE_WINDOWED\|DISPSTATE_CLOSED\|DISPSTATE_MINIMIZED\|DISPSTATE_OPEN\|DISSOLVE\|DITHERMODE_FLOYDSTEINBERG\|DITHERMODE_NONE\|DOSTYPE_DIRECTORY\|DOSTYPE_FILE\|DOUBLE\|DOUBLEBUFFER\|DOWNLOADFILE_STATUS\|DTR_OFF\|DTR_ON\|DURATION_LONG\|DURATION_SHORT\|EDGE\|ELLIPSE\|ENCODING_AMIGA\|ENCODING_ISO8859_1\|ENCODING_RAW\|ENCODING_UTF8\|EOF\|ERR_8OR16BITONLY\|ERR_ACCELERATOR\|ERR_ADDAPPICON\|ERR_ADDAPPWIN\|ERR_ADDSYSEVENT\|ERR_ADDTASK\|ERR_ADFFREEDISP\|ERR_ADFWRONGDISP\|ERR_AFILEPROP\|ERR_AHI\|ERR_ALLOCALPHA\|ERR_ALLOCCHANNEL\|ERR_ALLOCCHUNKY\|ERR_ALLOCMASK\|ERR_ALRDYDECLRD\|ERR_ALREADYASYNC\|ERR_ALSAPCM\|ERR_AMIGAGUIDE\|ERR_ANIMDISK\|ERR_ANIMFRAME\|ERR_ANTIALIAS\|ERR_APPLET\|ERR_APPLETVERSION\|ERR_APPLICATION\|ERR_ARGS\|ERR_ARRAYDECLA\|ERR_ASSERTFAILED\|ERR_ATSUI\|ERR_AUDIOCONVERTER\|ERR_BACKFILL\|ERR_BAD8SVX\|ERR_BADBASE64\|ERR_BADBYTECODE\|ERR_BADCALLBACKRET\|ERR_BADCONSTANT\|ERR_BADDIMENSIONS\|ERR_BADENCODING\|ERR_BADINTEGER\|ERR_BADIP\|ERR_BADLAYERTYPE\|ERR_BADPLATFORM\|ERR_BADSIGNATURE\|ERR_BADUPVALUES\|ERR_BADURL\|ERR_BADWAVE\|ERR_BADYIELD\|ERR_BEGINREFRESH\|ERR_BGPICBUTTON\|ERR_BGPICPALETTE\|ERR_BGPICTYPE\|ERR_BITMAP\|ERR_BLKWOENDBLK\|ERR_BRACECLOSE\|ERR_BRACEOPEN\|ERR_BRACKETCLOSE\|ERR_BRACKETOPEN\|ERR_BRUSHLINK\|ERR_BRUSHSIZE\|ERR_BRUSHTYPE\|ERR_CACHEERROR\|ERR_CASECST\|ERR_CHANGEDIR\|ERR_CHANNELRANGE\|ERR_CHRCSTEMPTY\|ERR_CHRCSTLEN\|ERR_CLIPFORMAT\|ERR_CLIPOPEN\|ERR_CLIPREAD\|ERR_CLIPWRITE\|ERR_CLOSEDDISPLAY\|ERR_CLOSEFILE\|ERR_CMDASVAR\|ERR_CMPUNSUPPORTED\|ERR_COLORSPACE\|ERR_COMMENTSTRUCT\|ERR_COMMODITY\|ERR_COMPLEXEXPR\|ERR_COMPLEXPATTERN\|ERR_COMPLEXWHILE\|ERR_CONCAT\|ERR_CONFIG\|ERR_CONFIG2\|ERR_CONITEMS\|ERR_CONSOLEARG\|ERR_CONTEXTMENU\|ERR_COORDSRANGE\|ERR_COREFOUNDATION\|ERR_CORETEXT\|ERR_CREATEDIR\|ERR_CREATEDOCKY\|ERR_CREATEEVENT\|ERR_CREATEGC\|ERR_CREATEICON\|ERR_CREATEMENU\|ERR_CREATEPORT\|ERR_CREATESHORTCUT\|ERR_CSTDOUBLEDEF\|ERR_CTRLSTRUCT\|ERR_CYIELD\|ERR_DATATYPEALPHA\|ERR_DATATYPESAVE\|ERR_DATATYPESAVE2\|ERR_DBLENCODING\|ERR_DBPALETTE\|ERR_DBTRANSWIN\|ERR_DBVIDEOLAYER\|ERR_DDAUTOSCALE\|ERR_DDMOBILE\|ERR_DDRECVIDEO\|ERR_DEADRESUME\|ERR_DEFFONT\|ERR_DELETEFILE\|ERR_DEMO\|ERR_DEMO2\|ERR_DEMO3\|ERR_DEPTHMISMATCH\|ERR_DEPTHRANGE\|ERR_DESERIALIZE\|ERR_DIFFDEPTH\|ERR_DIFFENCODING\|ERR_DINPUT\|ERR_DIRECTSHOW\|ERR_DIRLOCK\|ERR_DISPLAYADAPTERSUPPORT\|ERR_DISPLAYDESKTOP\|ERR_DISPLAYDESKTOPPAL\|ERR_DISPLAYSIZE\|ERR_DISPMINIMIZED\|ERR_DLOPEN\|ERR_DOUBLEDECLA\|ERR_DOUBLEMENU\|ERR_DRAWPATH\|ERR_DSOUNDNOTIFY\|ERR_DSOUNDNOTIPOS\|ERR_DSOUNDPLAY\|ERR_ELSEIFAFTERELSE\|ERR_ELSETWICE\|ERR_ELSEWOIF\|ERR_EMPTYMENUTREE\|ERR_EMPTYOBJ\|ERR_EMPTYPATH\|ERR_EMPTYSCRIPT\|ERR_EMPTYTABLE\|ERR_ENDBLKWOBLK\|ERR_ENDDOUBLEBUFFER\|ERR_ENDFUNCWOFUNC\|ERR_ENDIFWOIF\|ERR_ENDSWCHWOSWCH\|ERR_ENDWITHWOWITH\|ERR_EQUALEXPECTED\|ERR_ERRORCALLED\|ERR_ESCREPLACE\|ERR_EVNTEXPCTED\|ERR_EXAMINE\|ERR_EXECUTE\|ERR_EXETYPE\|ERR_FGRABVIDSTATE\|ERR_FIELDINIT\|ERR_FILEEXIST\|ERR_FILEFORMAT\|ERR_FILENOTFOUND\|ERR_FILESIZE\|ERR_FINDACTIVITY\|ERR_FINDANIM\|ERR_FINDANIMSTREAM\|ERR_FINDAPPLICATION\|ERR_FINDARRAY\|ERR_FINDASYNCDRAW\|ERR_FINDASYNCOBJ\|ERR_FINDBGPIC\|ERR_FINDBRUSH\|ERR_FINDBUTTON\|ERR_FINDCLIENT\|ERR_FINDCLIPREGION\|ERR_FINDCST\|ERR_FINDDIR\|ERR_FINDDISPLAY\|ERR_FINDFILE\|ERR_FINDFONT\|ERR_FINDFONT2\|ERR_FINDICON\|ERR_FINDINTERVAL\|ERR_FINDLAYER\|ERR_FINDLAYERDATA\|ERR_FINDMEMBLK\|ERR_FINDMENU\|ERR_FINDMENUITEM\|ERR_FINDMONITOR\|ERR_FINDMOVE\|ERR_FINDMUSIC\|ERR_FINDOBJECTDATA\|ERR_FINDPALETTE\|ERR_FINDPATH\|ERR_FINDPLUGIN\|ERR_FINDPOINTER\|ERR_FINDPORT\|ERR_FINDSAMPLE\|ERR_FINDSELECTOR\|ERR_FINDSERIAL\|ERR_FINDSERVER\|ERR_FINDSPRITE\|ERR_FINDTEXTOBJECT\|ERR_FINDTIMEOUT\|ERR_FINDTIMER\|ERR_FINDUDPOBJECT\|ERR_FINDVIDEO\|ERR_FIRSTPREPROC\|ERR_FONTFORMAT\|ERR_FONTPATH\|ERR_FONTPATH2\|ERR_FORBIDMODAL\|ERR_FOREVERWOREPEAT\|ERR_FORWONEXT\|ERR_FRAMEGRABBER\|ERR_FREEABGPIC\|ERR_FREEADISPLAY\|ERR_FREECURPOINTER\|ERR_FT2\|ERR_FTPAUTH\|ERR_FTPERROR\|ERR_FULLSCREEN\|ERR_FUNCARGS\|ERR_FUNCDECLA\|ERR_FUNCEXPECTED\|ERR_FUNCJMP\|ERR_FUNCREMOVED\|ERR_FUNCTABLEARG\|ERR_FUNCWOENDFUNC\|ERR_GETDISKOBJ\|ERR_GETIFADDRS\|ERR_GETMONITORINFO\|ERR_GETSHORTCUT\|ERR_GRABSCREEN\|ERR_GROUPNAMEUSED\|ERR_GTK\|ERR_GUIGFX\|ERR_HEXPOINT\|ERR_HOSTNAME\|ERR_HTTPERROR\|ERR_HTTPTE\|ERR_HWBMCLOSEDISP\|ERR_HWBRUSH\|ERR_HWBRUSHFUNC\|ERR_HWDBFREEDISP\|ERR_ICONDIMS\|ERR_ICONENTRY\|ERR_ICONPARMS\|ERR_ICONSIZE\|ERR_ICONSTANDARD\|ERR_ICONVECTOR\|ERR_IFWOENDIF\|ERR_IMAGEERROR\|ERR_INCOMPATBRUSH\|ERR_INISYNTAX\|ERR_INITSERIAL\|ERR_INTERNAL\|ERR_INTERNAL1\|ERR_INTEXPECTED\|ERR_INVALIDDATE\|ERR_INVALIDUTF8\|ERR_INVALIDUTF8ARG\|ERR_INVCAPIDX\|ERR_INVINSERT\|ERR_INVNEXTKEY\|ERR_INVPATCAP\|ERR_INVREPLACE\|ERR_JAVA\|ERR_JAVAMETHOD\|ERR_JOYSTICK\|ERR_KEYFILE\|ERR_KEYNOTFOUND\|ERR_KEYWORD\|ERR_KICKSTART\|ERR_LABELDECLA\|ERR_LABELDOUBLE\|ERR_LABINFOR\|ERR_LABINFUNC\|ERR_LABINIF\|ERR_LABINWHILE\|ERR_LABMAINBLK\|ERR_LAYERRANGE\|ERR_LAYERSOFF\|ERR_LAYERSON\|ERR_LAYERSUPPORT\|ERR_LAYERSUPPORT2\|ERR_LAYERSWITCH\|ERR_LEGACYPTMOD\|ERR_LFSYNTAX\|ERR_LINKFONT\|ERR_LINKPLUGIN\|ERR_LOADFRAME\|ERR_LOADICON\|ERR_LOADPICTURE\|ERR_LOADPICTURE2\|ERR_LOADPLUGIN\|ERR_LOADSOUND\|ERR_LOADVIDEO\|ERR_LOCK\|ERR_LOCK2\|ERR_LOCKBMAP\|ERR_LOCKEDOBJ\|ERR_LOOPRANGE\|ERR_LOWFREQ\|ERR_MAGICKEY\|ERR_MALFORMPAT1\|ERR_MALFORMPAT2\|ERR_MASKNALPHA\|ERR_MAXLINES\|ERR_MAXLOCALS\|ERR_MAXPARAMS\|ERR_MAXUPVALS\|ERR_MEDIAFOUNDATION\|ERR_MEM\|ERR_MEMCODE\|ERR_MEMCST\|ERR_MEMRANGE\|ERR_MENUATTACHED\|ERR_MENUCOMPLEXITY\|ERR_MISSINGBRACKET\|ERR_MISSINGFIELD\|ERR_MISSINGOPBRACK\|ERR_MISSINGPARAMTR\|ERR_MISSINGSEPARTR\|ERR_MIXMUSMOD\|ERR_MOBILE\|ERR_MODIFYAANIM\|ERR_MODIFYABG\|ERR_MODIFYABGPIC\|ERR_MODIFYABR\|ERR_MODIFYPSMP\|ERR_MODIFYSPRITE\|ERR_MODIFYSPRITE2\|ERR_MONITORDIR\|ERR_MONITORFULLSCREEN\|ERR_MONITORRANGE\|ERR_MOVEFILE\|ERR_MSGPORT\|ERR_MULDISMOBILE\|ERR_MULTIBGPIC\|ERR_MULTIDISPLAYS\|ERR_MUSFMTSUPPORT\|ERR_MUSNOTPAUSED\|ERR_MUSNOTPLYNG\|ERR_MUSNOTPLYNG2\|ERR_MUSPAUSED\|ERR_MUSPLAYING\|ERR_NAMETOOLONG\|ERR_NAMEUSED\|ERR_NEEDAPPLICATION\|ERR_NEEDCOMPOSITE\|ERR_NEEDMORPHOS2\|ERR_NEEDOS41\|ERR_NEEDPALETTEIMAGE\|ERR_NEGCOORDS\|ERR_NEWHWPLUGIN\|ERR_NEXTWOFOR\|ERR_NOABSPATH\|ERR_NOACCESS\|ERR_NOALPHA\|ERR_NOANMLAYER\|ERR_NOAPPLET\|ERR_NOARGBVISUAL\|ERR_NOBLOCKBREAK\|ERR_NOCALLBACK\|ERR_NOCHANNEL\|ERR_NOCHAR\|ERR_NOCLIPREG\|ERR_NOCOLON\|ERR_NOCOMMA\|ERR_NOCOMPRESS\|ERR_NOCONSTANTS\|ERR_NOCONTEXTMENU\|ERR_NOCOORDCST\|ERR_NODIRPATTERN\|ERR_NODISLAYERS\|ERR_NODISPMODES\|ERR_NODOUBLEBUFFER\|ERR_NOFALLTHROUGH\|ERR_NOFILTERNAME\|ERR_NOFMBHANDLER\|ERR_NOFUNCTION\|ERR_NOHWFUNC\|ERR_NOJOYATPORT\|ERR_NOKEYWORDS\|ERR_NOLAYERS\|ERR_NOLOOP\|ERR_NOLOOPCONT\|ERR_NOMASKBRUSH\|ERR_NOMENU\|ERR_NOMIMEVIEWER\|ERR_NOMUSICCB\|ERR_NONE\|ERR_NONSUSPENDEDRESUME\|ERR_NOPALETTE\|ERR_NOPALETTEIMAGE\|ERR_NOPALETTEMODE\|ERR_NORETVAL\|ERR_NOREXX\|ERR_NOSPRITES\|ERR_NOTADIR\|ERR_NOTENOUGHPIXELS\|ERR_NOTIGER\|ERR_NOTPROTRACKER\|ERR_NOTRANSPARENCY\|ERR_NOTXTLAYER\|ERR_NUMBEREXPECTED\|ERR_NUMCALLBACK\|ERR_NUMCONCAT\|ERR_NUMEXPECTED\|ERR_NUMSTRCMP\|ERR_NUMTABLEARG\|ERR_OLDAPPLET\|ERR_OPENANIM\|ERR_OPENANIM2\|ERR_OPENAUDIO\|ERR_OPENFONT\|ERR_OPENLIB\|ERR_OPENSERIAL\|ERR_OPENSOCKET\|ERR_OPENSOUND\|ERR_OPENSOUND2\|ERR_OUTOFRANGE\|ERR_PAKFORMAT\|ERR_PALETTEFILL\|ERR_PALETTEMODE\|ERR_PALSCREEN\|ERR_PEERNAME\|ERR_PENRANGE\|ERR_PERCENTFORMAT\|ERR_PERCENTFORMATSTR\|ERR_PIPE\|ERR_PIXELFORMAT\|ERR_PIXELRANGE\|ERR_PLAYERCOMP\|ERR_PLAYVIDEO\|ERR_PLUGINARCH\|ERR_PLUGINDOUBLET\|ERR_PLUGINSUPPORT\|ERR_PLUGINSYMBOL\|ERR_PLUGINTYPE\|ERR_PLUGINVER\|ERR_POINTERFORMAT\|ERR_POINTERIMG\|ERR_PORTNOTAVAIL\|ERR_PREPROCSYM\|ERR_PROTMETATABLE\|ERR_PUBSCREEN\|ERR_QUICKTIME\|ERR_RADIOTOGGLEMENU\|ERR_RANDOMIZE\|ERR_READ\|ERR_READFILE\|ERR_READFUNC\|ERR_READONLY\|ERR_READRANGE\|ERR_READTABLE\|ERR_READVIDEOPIXELS\|ERR_RECVCLOSED\|ERR_RECVTIMEOUT\|ERR_RECVUNKNOWN\|ERR_REGCLASS\|ERR_REGISTRYREAD\|ERR_REGISTRYWRITE\|ERR_REMADLAYER\|ERR_RENAME\|ERR_RENDER\|ERR_RENDERADLAYER\|ERR_RENDERCALLBACK\|ERR_RENDERER\|ERR_REPEATWOUNTIL\|ERR_REQAUTH\|ERR_REQUIREFIELD\|ERR_REQUIREPLUGIN\|ERR_REQUIRETAGFMT\|ERR_RETWOGOSUB\|ERR_REVDWORD\|ERR_REWINDDIR\|ERR_REXXERR\|ERR_SATELLITE\|ERR_SATFREEDISP\|ERR_SAVEANIM\|ERR_SAVEICON\|ERR_SAVEIMAGE\|ERR_SAVEPNG\|ERR_SAVERALPHA\|ERR_SAVESAMPLE\|ERR_SCALEBGPIC\|ERR_SCREEN\|ERR_SCREENMODE\|ERR_SCREENSIZE\|ERR_SCRPIXFMT\|ERR_SEEK\|ERR_SEEKFILE\|ERR_SEEKFORMAT\|ERR_SEEKRANGE\|ERR_SELECTALPHACHANNEL\|ERR_SELECTANIM\|ERR_SELECTBG\|ERR_SELECTBGPIC\|ERR_SELECTBGPIC2\|ERR_SELECTBRUSH\|ERR_SELECTMASK\|ERR_SEMAPHORE\|ERR_SENDDATA\|ERR_SENDMESSAGE\|ERR_SENDTIMEOUT\|ERR_SENDUNKNOWN\|ERR_SERIALIO\|ERR_SERIALIZE\|ERR_SERIALIZETYPE\|ERR_SETADAPTER\|ERR_SETENV\|ERR_SETFILEATTR\|ERR_SETFILECOMMENT\|ERR_SETFILEDATE\|ERR_SETMENU\|ERR_SHORTIF\|ERR_SIGNAL\|ERR_SMODEALPHA\|ERR_SMPRANGE\|ERR_SOCKET\|ERR_SOCKNAME\|ERR_SOCKOPT\|ERR_SORTFUNC\|ERR_SPRITELINK\|ERR_SPRITEONSCREEN\|ERR_SPRITEONSCREEN2\|ERR_SQBRACKETCLOSE\|ERR_SQBRACKETOPEN\|ERR_STACK\|ERR_STAT\|ERR_STRCALLBACK\|ERR_STREAMASSAMPLE\|ERR_STREXPECTED\|ERR_STRINGCST\|ERR_STRINGEXPECTED\|ERR_STRORNUM\|ERR_STRTABLEARG\|ERR_STRTOOSHORT\|ERR_SURFACE\|ERR_SWCHWOENDSWCH\|ERR_SYNTAXERROR\|ERR_SYNTAXLEVELS\|ERR_SYSBUTTON\|ERR_SYSIMAGE\|ERR_SYSTOOOLD\|ERR_TABCALLBACK\|ERR_TABEXPECTED\|ERR_TABEXPECTED2\|ERR_TABEXPECTED3\|ERR_TABLEDECLA\|ERR_TABLEINDEX\|ERR_TABLEORNIL\|ERR_TABLEOVERFLOW\|ERR_TAGEXPECTED\|ERR_TASKSETUP\|ERR_TEXTARG\|ERR_TEXTCONVERT\|ERR_TEXTCONVERT2\|ERR_TEXTSYNTAX\|ERR_TEXTURE\|ERR_TFIMAGE\|ERR_TFVANIM\|ERR_TFVBGPICBRUSH\|ERR_TFVBRUSH\|ERR_TFVBRUSHBGPIC\|ERR_THREAD\|ERR_THREADEXPECTED\|ERR_TIMER\|ERR_TOKENEXPECTED\|ERR_TOOMANYARGS\|ERR_TOOMANYCAPTURES\|ERR_TOOSMALL2\|ERR_TRANSBGMOBILE\|ERR_TRANSBRUSH\|ERR_TRAYICON\|ERR_TRIALCOMPILE\|ERR_TRIALINCLUDE\|ERR_TRIALLIMIT\|ERR_TRIALSAVEVID\|ERR_UDEXPECTED\|ERR_UNBALANCEDPAT\|ERR_UNEXPECTEDEOF\|ERR_UNEXPECTEDSYM\|ERR_UNFINISHEDCAPTURE\|ERR_UNIMPLCMD\|ERR_UNKNOWN\|ERR_UNKNOWNANMOUT\|ERR_UNKNOWNATTR\|ERR_UNKNOWNCMD\|ERR_UNKNOWNCOND\|ERR_UNKNOWNFILTER\|ERR_UNKNOWNICNOUT\|ERR_UNKNOWNIMGOUT\|ERR_UNKNOWNMIMETYPE\|ERR_UNKNOWNMUSFMT\|ERR_UNKNOWNPALETTE\|ERR_UNKNOWNSEC\|ERR_UNKNOWNSEQ\|ERR_UNKNOWNSMPOUT\|ERR_UNKNOWNTAG\|ERR_UNKNUMFMT\|ERR_UNKPROTOCOL\|ERR_UNKTEXTFMT\|ERR_UNMPARENTHESES\|ERR_UNSETENV\|ERR_UNSUPPORTEDFEAT\|ERR_UNTERMINTDSTR\|ERR_UNTILWOREPEAT\|ERR_UPDATEICON\|ERR_UPLOADFORBIDDEN\|ERR_USERABORT\|ERR_VALUEEXPECTED\|ERR_VAREXPECTED\|ERR_VARLENGTH\|ERR_VARSYNTAX\|ERR_VECGFXPLUGIN\|ERR_VECTORANIM\|ERR_VECTORBRUSH\|ERR_VERSION\|ERR_VFONT\|ERR_VFONTTYPE\|ERR_VIDATTACHED\|ERR_VIDEOFRAME\|ERR_VIDEOINIT\|ERR_VIDEOLAYER\|ERR_VIDEOLAYERDRV\|ERR_VIDEOSTRATEGY\|ERR_VIDEOTRANS\|ERR_VIDLAYERFUNC\|ERR_VIDNOTPAUSED\|ERR_VIDNOTPLAYING\|ERR_VIDPAUSED\|ERR_VIDPLAYING\|ERR_VIDRECMULTI\|ERR_VIDRECTRANS\|ERR_VIDSTOPPED\|ERR_VISUALINFO\|ERR_VMMISMATCH\|ERR_WARPOS\|ERR_WENDWOWHILE\|ERR_WHILEWOWEND\|ERR_WINDOW\|ERR_WITHWOENDWITH\|ERR_WRITE\|ERR_WRITEFILE\|ERR_WRITEJPEG\|ERR_WRITEONLY\|ERR_WRONGCLIPREG\|ERR_WRONGCMDRECVIDEO\|ERR_WRONGDTYPE\|ERR_WRONGFLOAT\|ERR_WRONGHEX\|ERR_WRONGID\|ERR_WRONGOP\|ERR_WRONGOPCST\|ERR_WRONGSPRITESIZE\|ERR_WRONGUSAGE\|ERR_WRONGVSTRATEGY\|ERR_XCURSOR\|ERR_XDISPLAY\|ERR_XF86VIDMODEEXT\|ERR_XFIXES\|ERR_YIELD\|ERR_ZERODIVISION\|ERR_ZLIBDATA\|ERR_ZLIBIO\|ERR_ZLIBSTREAM\|ERR_ZLIBVERSION\|EVENTHANDLER\|FADE\|FASTMEMORY\|FASTSPEED\|FILE\|FILEATTR_ARCHIVE\|FILEATTR_DELETE_USR\|FILEATTR_EXECUTE_GRP\|FILEATTR_EXECUTE_OTH\|FILEATTR_EXECUTE_USR\|FILEATTR_HIDDEN\|FILEATTR_NORMAL\|FILEATTR_PURE\|FILEATTR_READ_GRP\|FILEATTR_READ_OTH\|FILEATTR_READ_USR\|FILEATTR_READONLY\|FILEATTR_SCRIPT\|FILEATTR_SYSTEM\|FILEATTR_WRITE_GRP\|FILEATTR_WRITE_OTH\|FILEATTR_WRITE_USR\|FILETYPE_ANIM\|FILETYPE_ICON\|FILETYPE_IMAGE\|FILETYPE_SOUND\|FILETYPE_VIDEO\|FILETYPEFLAGS_ALPHA\|FILETYPEFLAGS_FPS\|FILETYPEFLAGS_QUALITY\|FILETYPEFLAGS_SAVE\|FILLCOLOR\|FILLGRADIENT\|FILLNONE\|FILLRULEEVENODD\|FILLRULEWINDING\|FILLTEXTURE\|FLOAT\|FLOW_HARDWARE\|FLOW_OFF\|FLOW_XON_XOFF\|FONT\|FONTENGINE_INBUILT\|FONTENGINE_NATIVE\|FONTSLANT_ITALIC\|FONTSLANT_OBLIQUE\|FONTSLANT_ROMAN\|FONTTYPE_BITMAP\|FONTTYPE_COLOR\|FONTTYPE_VECTOR\|FONTWEIGHT_BLACK\|FONTWEIGHT_BOLD\|FONTWEIGHT_BOOK\|FONTWEIGHT_DEMIBOLD\|FONTWEIGHT_EXTRABLACK\|FONTWEIGHT_EXTRABOLD\|FONTWEIGHT_EXTRALIGHT\|FONTWEIGHT_HEAVY\|FONTWEIGHT_LIGHT\|FONTWEIGHT_MEDIUM\|FONTWEIGHT_NORMAL\|FONTWEIGHT_REGULAR\|FONTWEIGHT_SEMIBOLD\|FONTWEIGHT_THIN\|FONTWEIGHT_ULTRABLACK\|FONTWEIGHT_ULTRABOLD\|FONTWEIGHT_ULTRALIGHT\|FRAMEMODE_FULL\|FRAMEMODE_SINGLE\|FREESPACE\|FTPASCII\|FTPBINARY\|FUCHSIA\|FUNCTION\|GRAY\|GREEN\|HBLINDS128\|HBLINDS16\|HBLINDS32\|HBLINDS64\|HBLINDS8\|HCLOSECURTAIN\|HCLOSEGATE\|HEXNUMERICAL\|HFLIPCOIN\|HFLOWBOTTOM\|HFLOWTOP\|HIDEBRUSH\|HIDELAYER\|HKEY_CLASSES_ROOT\|HKEY_CURRENT_CONFIG\|HKEY_CURRENT_USER\|HKEY_LOCAL_MACHINE\|HKEY_USERS\|HLINES\|HLINES2\|HLOWFLIPCOIN\|HOLLYWOOD\|HOPENCURTAIN\|HOPENGATE\|HSPLIT\|HSTRANGEPUSH\|HSTRETCHCENTER\|HSTRIPES\|HSTRIPES16\|HSTRIPES2\|HSTRIPES32\|HSTRIPES4\|HSTRIPES64\|HSTRIPES8\|HW_64BIT\|HW_AMIGA\|HW_AMIGAOS3\|HW_AMIGAOS4\|HW_ANDROID\|HW_AROS\|HW_IOS\|HW_LINUX\|HW_LITTLE_ENDIAN\|HW_MACOS\|HW_MORPHOS\|HW_REVISION\|HW_VERSION\|HW_WARPOS\|HW_WINDOWS\|ICNFMT_HOLLYWOOD\|ICON\|IMAGETYPE_RASTER\|IMAGETYPE_VECTOR\|IMGFMT_BMP\|IMGFMT_GIF\|IMGFMT_ILBM\|IMGFMT_JPEG\|IMGFMT_NATIVE\|IMGFMT_PLUGIN\|IMGFMT_PNG\|IMGFMT_TIFF\|IMGFMT_UNKNOWN\|IMMERSIVE_LEANBACK\|IMMERSIVE_NONE\|IMMERSIVE_NORMAL\|IMMERSIVE_STICKY\|INACTIVEWINDOW\|INF\|INSERTBRUSH\|INTEGER\|INTERVAL\|IO_BUFFERED\|IO_FAKE64\|IO_LITTLEENDIAN\|IO_SIGNED\|IO_UNBUFFERED\|IO_UNSIGNED\|IPAUTO\|IPUNKNOWN\|IPV4\|IPV6\|ITALIC\|JOINBEVEL\|JOINMITER\|JOINROUND\|JOYDOWN\|JOYDOWNLEFT\|JOYDOWNRIGHT\|JOYLEFT\|JOYNODIR\|JOYRIGHT\|JOYUP\|JOYUPLEFT\|JOYUPRIGHT\|JUSTIFIED\|KEEPASPRAT\|KEEPPOSITION\|LANGUAGE_ABKHAZIAN\|LANGUAGE_AFAR\|LANGUAGE_AFRIKAANS\|LANGUAGE_AKAN\|LANGUAGE_ALBANIAN\|LANGUAGE_AMHARIC\|LANGUAGE_ARABIC\|LANGUAGE_ARAGONESE\|LANGUAGE_ARMENIAN\|LANGUAGE_ASSAMESE\|LANGUAGE_AVARIC\|LANGUAGE_AVESTAN\|LANGUAGE_AYMARA\|LANGUAGE_AZERBAIJANI\|LANGUAGE_BAMBARA\|LANGUAGE_BASHKIR\|LANGUAGE_BASQUE\|LANGUAGE_BELARUSIAN\|LANGUAGE_BENGALI\|LANGUAGE_BIHARI\|LANGUAGE_BISLAMA\|LANGUAGE_BOSNIAN\|LANGUAGE_BRETON\|LANGUAGE_BULGARIAN\|LANGUAGE_BURMESE\|LANGUAGE_CATALAN\|LANGUAGE_CENTRALKHMER\|LANGUAGE_CHAMORRO\|LANGUAGE_CHECHEN\|LANGUAGE_CHICHEWA\|LANGUAGE_CHINESE\|LANGUAGE_CHURCHSLAVIC\|LANGUAGE_CHUVASH\|LANGUAGE_CORNISH\|LANGUAGE_CORSICAN\|LANGUAGE_CREE\|LANGUAGE_CROATIAN\|LANGUAGE_CZECH\|LANGUAGE_DANISH\|LANGUAGE_DIVEHI\|LANGUAGE_DUTCH\|LANGUAGE_DZONGKHA\|LANGUAGE_ENGLISH\|LANGUAGE_ESPERANTO\|LANGUAGE_ESTONIAN\|LANGUAGE_EWE\|LANGUAGE_FAROESE\|LANGUAGE_FIJIAN\|LANGUAGE_FINNISH\|LANGUAGE_FRENCH\|LANGUAGE_FULAH\|LANGUAGE_GAELIC\|LANGUAGE_GALICIAN\|LANGUAGE_GANDA\|LANGUAGE_GEORGIAN\|LANGUAGE_GERMAN\|LANGUAGE_GREEK\|LANGUAGE_GREENLANDIC\|LANGUAGE_GUARANI\|LANGUAGE_GUJARATI\|LANGUAGE_HAITIAN\|LANGUAGE_HAUSA\|LANGUAGE_HEBREW\|LANGUAGE_HERERO\|LANGUAGE_HINDI\|LANGUAGE_HIRIMOTU\|LANGUAGE_HUNGARIAN\|LANGUAGE_ICELANDIC\|LANGUAGE_IDO\|LANGUAGE_IGBO\|LANGUAGE_INDONESIAN\|LANGUAGE_INTERLINGUA\|LANGUAGE_INTERLINGUE\|LANGUAGE_INUKTITUT\|LANGUAGE_INUPIAQ\|LANGUAGE_IRISH\|LANGUAGE_ITALIAN\|LANGUAGE_JAPANESE\|LANGUAGE_JAVANESE\|LANGUAGE_KANNADA\|LANGUAGE_KANURI\|LANGUAGE_KASHMIRI\|LANGUAGE_KAZAKH\|LANGUAGE_KIKUYU\|LANGUAGE_KINYARWANDA\|LANGUAGE_KIRGHIZ\|LANGUAGE_KOMI\|LANGUAGE_KONGO\|LANGUAGE_KOREAN\|LANGUAGE_KUANYAMA\|LANGUAGE_KURDISH\|LANGUAGE_LAO\|LANGUAGE_LATIN\|LANGUAGE_LATVIAN\|LANGUAGE_LIMBURGAN\|LANGUAGE_LINGALA\|LANGUAGE_LITHUANIAN\|LANGUAGE_LUBAKATANGA\|LANGUAGE_LUXEMBOURGISH\|LANGUAGE_MACEDONIAN\|LANGUAGE_MALAGASY\|LANGUAGE_MALAY\|LANGUAGE_MALAYALAM\|LANGUAGE_MALTESE\|LANGUAGE_MANX\|LANGUAGE_MAORI\|LANGUAGE_MARATHI\|LANGUAGE_MARSHALLESE\|LANGUAGE_MONGOLIAN\|LANGUAGE_NAURU\|LANGUAGE_NAVAJO\|LANGUAGE_NDONGA\|LANGUAGE_NEPALI\|LANGUAGE_NORTHERNSAMI\|LANGUAGE_NORTHNDEBELE\|LANGUAGE_NORWEGIAN\|LANGUAGE_NORWEGIANBOKMAL\|LANGUAGE_NORWEGIANNYNORSK\|LANGUAGE_OCCITAN\|LANGUAGE_OJIBWA\|LANGUAGE_ORIYA\|LANGUAGE_OROMO\|LANGUAGE_OSSETIAN\|LANGUAGE_PALI\|LANGUAGE_PANJABI\|LANGUAGE_PASHTO\|LANGUAGE_PERSIAN\|LANGUAGE_POLISH\|LANGUAGE_PORTUGUESE\|LANGUAGE_QUECHUA\|LANGUAGE_ROMANIAN\|LANGUAGE_ROMANSH\|LANGUAGE_RUNDI\|LANGUAGE_RUSSIAN\|LANGUAGE_SAMOAN\|LANGUAGE_SANGO\|LANGUAGE_SANSKRIT\|LANGUAGE_SARDINIAN\|LANGUAGE_SERBIAN\|LANGUAGE_SHONA\|LANGUAGE_SICHUANYI\|LANGUAGE_SINDHI\|LANGUAGE_SINHALA\|LANGUAGE_SLOVAK\|LANGUAGE_SLOVENIAN\|LANGUAGE_SOMALI\|LANGUAGE_SOUTHERNSOTHO\|LANGUAGE_SOUTHNDEBELE\|LANGUAGE_SPANISH\|LANGUAGE_SUNDANESE\|LANGUAGE_SWAHILI\|LANGUAGE_SWATI\|LANGUAGE_SWEDISH\|LANGUAGE_TAGALOG\|LANGUAGE_TAHITIAN\|LANGUAGE_TAJIK\|LANGUAGE_TAMIL\|LANGUAGE_TATAR\|LANGUAGE_TELUGU\|LANGUAGE_THAI\|LANGUAGE_TIBETAN\|LANGUAGE_TIGRINYA\|LANGUAGE_TONGA\|LANGUAGE_TSONGA\|LANGUAGE_TSWANA\|LANGUAGE_TURKISH\|LANGUAGE_TURKMEN\|LANGUAGE_TWI\|LANGUAGE_UIGHUR\|LANGUAGE_UKRAINIAN\|LANGUAGE_UNKNOWN\|LANGUAGE_URDU\|LANGUAGE_UZBEK\|LANGUAGE_VENDA\|LANGUAGE_VIETNAMESE\|LANGUAGE_WALLOON\|LANGUAGE_WELSH\|LANGUAGE_WESTERNFRISIAN\|LANGUAGE_WOLOF\|LANGUAGE_XHOSA\|LANGUAGE_YIDDISH\|LANGUAGE_YORUBA\|LANGUAGE_ZHUANG\|LANGUAGE_ZULU\|LAYER\|LAYER_VS_BOX\|LAYERBUTTON\|LEFT\|LEFTOUT\|LIGHTUSERDATA\|LIME\|LINE\|LINEAR\|LITTLEENDIAN\|LONG\|LOWERCURVE\|MAROON\|MASK\|MASKAND\|MASKINVISIBLE\|MASKOR\|MASKVANILLACOPY\|MASKVISIBLE\|MASKXOR\|MEMORY\|MENU\|MENUITEM_DISABLED\|MENUITEM_RADIO\|MENUITEM_SELECTED\|MENUITEM_TOGGLE\|MILLISECONDS\|MODE_READ\|MODE_READWRITE\|MODE_WRITE\|MODLALT\|MODLCOMMAND\|MODLCONTROL\|MODLSHIFT\|MODRALT\|MODRCOMMAND\|MODRCONTROL\|MODRSHIFT\|MONO16\|MONO8\|MONOSPACE\|MOVEFILE_COPY\|MOVEFILE_COPYFAILED\|MOVEFILE_DELETE\|MOVEFILE_DELETEFAILED\|MOVEFILE_UNPROTECT\|MOVELIST\|MOVEWINDOW\|MUSIC\|NAN\|NATIVE\|NATIVEENDIAN\|NAVY\|NETWORKCONNECTION\|NETWORKSERVER\|NETWORKUDP\|NEXTFRAME\|NEXTFRAME2\|NIL\|NOCOLOR\|NONE\|NOPEN\|NORMAL\|NORMALSPEED\|NOTRANSPARENCY\|NUMBER\|NUMERICAL\|OLIVE\|ONBUTTONCLICK\|ONBUTTONCLICKALL\|ONBUTTONOVER\|ONBUTTONOVERALL\|ONBUTTONRIGHTCLICK\|ONBUTTONRIGHTCLICKALL\|ONKEYDOWN\|ONKEYDOWNALL\|ORIENTATION_LANDSCAPE\|ORIENTATION_LANDSCAPEREV\|ORIENTATION_NONE\|ORIENTATION_PORTRAIT\|ORIENTATION_PORTRAITREV\|PALETTE\|PALETTE_AGA\|PALETTE_CGA\|PALETTE_DEFAULT\|PALETTE_EGA\|PALETTE_GRAY128\|PALETTE_GRAY16\|PALETTE_GRAY256\|PALETTE_GRAY32\|PALETTE_GRAY4\|PALETTE_GRAY64\|PALETTE_GRAY8\|PALETTE_MACINTOSH\|PALETTE_MONOCHROME\|PALETTE_OCS\|PALETTE_WINDOWS\|PALETTE_WORKBENCH\|PALETTEMODE_PEN\|PALETTEMODE_REMAP\|PARITY_EVEN\|PARITY_NONE\|PARITY_ODD\|PERMREQ_READEXTERNAL\|PERMREQ_WRITEEXTERNAL\|PI\|PIXELZOOM1\|PIXELZOOM2\|PLOT\|PLUGINCAPS_ANIM\|PLUGINCAPS_AUDIOADAPTER\|PLUGINCAPS_CONVERT\|PLUGINCAPS_DIRADAPTER\|PLUGINCAPS_DISPLAYADAPTER\|PLUGINCAPS_EXTENSION\|PLUGINCAPS_FILEADAPTER\|PLUGINCAPS_ICON\|PLUGINCAPS_IMAGE\|PLUGINCAPS_IPCADAPTER\|PLUGINCAPS_LIBRARY\|PLUGINCAPS_NETWORKADAPTER\|PLUGINCAPS_REQUESTERADAPTER\|PLUGINCAPS_REQUIRE\|PLUGINCAPS_SAVEANIM\|PLUGINCAPS_SAVEICON\|PLUGINCAPS_SAVEIMAGE\|PLUGINCAPS_SAVESAMPLE\|PLUGINCAPS_SERIALIZE\|PLUGINCAPS_SOUND\|PLUGINCAPS_TIMERADAPTER\|PLUGINCAPS_VECTOR\|PLUGINCAPS_VIDEO\|POINTER\|POLYGON\|PRGTYPE_APPLET\|PRGTYPE_PROGRAM\|PRGTYPE_SCRIPT\|PRINT\|PURPLE\|PUSHBOTTOM\|PUSHLEFT\|PUSHRIGHT\|PUSHTOP\|PUZZLE\|QUADRECT\|QUARTERS\|RADIAL\|RANDOMEFFECT\|RANDOMPARAMETER\|RECEIVEALL\|RECEIVEBYTES\|RECEIVEDATA_PACKET\|RECEIVELINE\|RECTBACKCENTER\|RECTBACKEAST\|RECTBACKNORTH\|RECTBACKNORTHEAST\|RECTBACKNORTHWEST\|RECTBACKSOUTH\|RECTBACKSOUTHEAST\|RECTBACKSOUTHWEST\|RECTBACKWEST\|RECTCENTER\|RECTEAST\|RECTNORTH\|RECTNORTHEAST\|RECTNORTHWEST\|RECTSOUTH\|RECTSOUTHEAST\|RECTSOUTHWEST\|RECTWEST\|RED\|REMOVELAYER\|REQ_CAMERA\|REQ_GALLERY\|REQ_HIDEICONS\|REQ_MULTISELECT\|REQ_NORMAL\|REQ_SAVEMODE\|REQICON_ERROR\|REQICON_INFORMATION\|REQICON_NONE\|REQICON_QUESTION\|REQICON_WARNING\|REVEALBOTTOM\|REVEALLEFT\|REVEALRIGHT\|REVEALTOP\|RIGHT\|RIGHTOUT\|ROLLLEFT\|ROLLTOP\|RTS_OFF\|RTS_ON\|SAMPLE\|SANS\|SCALEMODE_AUTO\|SCALEMODE_LAYER\|SCALEMODE_NONE\|SCROLLBOTTOM\|SCROLLEAST\|SCROLLLEFT\|SCROLLNORTH\|SCROLLNORTHEAST\|SCROLLNORTHWEST\|SCROLLRIGHT\|SCROLLSOUTH\|SCROLLSOUTHEAST\|SCROLLSOUTHWEST\|SCROLLTOP\|SCROLLWEST\|SECONDS\|SEEK_BEGINNING\|SEEK_CURRENT\|SEEK_END\|SELMODE_COMBO\|SELMODE_LAYERS\|SELMODE_NORMAL\|SERIAL\|SERIF\|SERVER\|SHADOW\|SHAPE\|SHDWEAST\|SHDWNORTH\|SHDWNORTHEAST\|SHDWNORTHWEST\|SHDWSOUTH\|SHDWSOUTHEAST\|SHDWSOUTHWEST\|SHDWWEST\|SHORT\|SILVER\|SIMPLEBUTTON\|SINE\|SIZEWINDOW\|SLIDEBOTTOM\|SLIDELEFT\|SLIDERIGHT\|SLIDETOP\|SLOWSPEED\|SMOOTHOUT\|SMPFMT_WAVE\|SNAPDESKTOP\|SNAPDISPLAY\|SNAPWINDOW\|SPIRAL\|SPRITE\|SPRITE_VS_BOX\|SPRITE_VS_BRUSH\|STAR\|STDERR\|STDIN\|STDOUT\|STDPTR_BUSY\|STDPTR_CUSTOM\|STDPTR_SYSTEM\|STEREO16\|STEREO8\|STOP_1\|STOP_2\|STRETCHBOTTOM\|STRETCHLEFT\|STRETCHRIGHT\|STRETCHTOP\|STRING\|STRUDEL\|SUN\|SWISS\|TABLE\|TEAL\|TEXTOBJECT\|TEXTOUT\|THREAD\|TICKS\|TIMEOUT\|TIMER\|TOP\|TOPOUT\|TRUETYPE_DEFAULT\|TURNDOWNBOTTOM\|TURNDOWNLEFT\|TURNDOWNRIGHT\|TURNDOWNTOP\|UDPCLIENT\|UDPNONE\|UDPOBJECT\|UDPSERVER\|UNDERLINED\|UNDO\|UPLOADFILE_RESPONSE\|UPLOADFILE_STATUS\|UPNDOWN\|UPPERCURVE\|USEDSPACE\|USELAYERPOSITION\|USERDATA\|VANILLACOPY\|VBLINDS128\|VBLINDS16\|VBLINDS32\|VBLINDS64\|VBLINDS8\|VCLOSECURTAIN\|VCLOSEGATE\|VECTORPATH\|VFLIPCOIN\|VFLOWLEFT\|VFLOWRIGHT\|VIDDRV_HOLLYWOOD\|VIDDRV_OS\|VIDEO\|VIEWMODE_DATE\|VIEWMODE_ICONS\|VIEWMODE_NAME\|VIEWMODE_NONE\|VIEWMODE_SIZE\|VIEWMODE_TYPE\|VLINES\|VLINES2\|VLOWFLIPCOIN\|VOID\|VOPENCURTAIN\|VOPENGATE\|VSPLIT\|VSTRANGEPUSH\|VSTRETCHCENTER\|VSTRIPES\|VSTRIPES16\|VSTRIPES2\|VSTRIPES32\|VSTRIPES4\|VSTRIPES64\|VSTRIPES8\|WALLPAPERLEFT\|WALLPAPERTOP\|WATER1\|WATER2\|WATER3\|WATER4\|WHITE\|WORD\|YELLOW\|ZOOMCENTER\|ZOOMEAST\|ZOOMIN\|ZOOMNORTH\|ZOOMNORTHEAST\|ZOOMNORTHWEST\|ZOOMOUT\|ZOOMSOUTH\|ZOOMSOUTHEAST\|ZOOMSOUTHWEST\|ZOOMWEST\)\>"
 " Hollywood Functions
-syn keyword hwFunction Abs ACos ARGB ActivateDisplay Add AddArcToPath AddBoxToPath AddCircleToPath AddEllipseToPath AddFontPath AddIconImage AddMove AddStr AddTab AddTextToPath AllocMem AllocMemFromPointer AllocMemFromVirtualFile AppendPath ApplyPatch Arc ArcDistortBrush ArrayToStr Asc ASin Assert AsyncDrawFrame ATan ATan2 BarrelDistortBrush Base64Str Beep BeginAnimStream BeginDoubleBuffer BeginRefresh BGPicToBrush BinStr BitClear BitComplement BitSet BitTest BitXor Blue BlurBrush Box BreakEventHandler BreakWhileMouseOn BrushToBGPic BrushToGray BrushToMonochrome BrushToPenArray BrushToRGBArray ByteAsc ByteChr ByteLen ByteOffset ByteStrStr ByteVal CRC32 CRC32Str CallJavaMethod CancelAsyncDraw CancelAsyncOperation CanonizePath Cast Ceil ChangeApplicationIcon ChangeBrushTransparency ChangeDirectory ChangeDisplayMode ChangeDisplaySize ChangeInterval CharcoalBrush CharOffset CharWidth CheckEvent CheckEvents Chr Circle ClearClipboard ClearEvents ClearInterval ClearMove ClearObjectData ClearPath ClearScreen ClearSerialQueue ClearTimeout CloseAmigaGuide CloseAnim CloseAudio CloseCatalog CloseConnection CloseDirectory CloseDisplay CloseFile CloseFont CloseMusic ClosePath CloseResourceMonitor CloseSerialPort CloseServer CloseUDPObject CloseVideo Cls CollectGarbage Collision ColorRequest CompareDates CompareStr CompressFile Concat ConsolePrint ConsolePrintNR ConsolePrompt ContinueAsyncOperation ContrastBrush ContrastPalette ConvertStr ConvertToBrush CopyAnim CopyBGPic CopyBrush CopyFile CopyLayer CopyMem CopyObjectData CopyPalette CopyPath CopyPens CopySample CopySprite CopyTable CopyTextObject Cos CountDirectoryEntries CountJoysticks CountStr CreateAnim CreateBGPic CreateBorderBrush CreateBrush CreateButton CreateClipRegion CreateCoroutine CreateDisplay CreateGradientBGPic CreateGradientBrush CreateIcon CreateKeyDown CreateLayer CreateList CreateMenu CreateMusic CreatePalette CreatePointer CreatePort CreateRainbowBGPic CreateRexxPort CreateSample CreateServer CreateShadowBrush CreateShortcut CreateSprite CreateTextObject CreateTexturedBGPic CreateTexturedBrush CreateUDPObject CropBrush CtrlCQuit CurveTo CyclePalette DateToTimestamp DateToUTC DebugOutput DebugPrint DebugPrintNR DebugPrompt DebugStr DebugVal DecompressFile DecreasePointer DefineVirtualFile DefineVirtualFileFromString Deg DeleteAlphaChannel DeleteButton DeleteFile DeleteMask DeletePrefs DeselectMenuItem DeserializeTable DirectoryItems DisableButton DisableEvent DisableEventHandler DisableLayers DisableLineHook DisableMenuItem DisablePlugin DisablePrecalculation DisableVWait DisplayAnimFrame DisplayBGPic DisplayBGPicPart DisplayBGPicPartFX DisplayBrush DisplayBrushFX DisplayBrushPart DisplaySprite DisplayTextObject DisplayTextObjectFX DisplayTransitionFX DisplayVideoFrame Div DoMove DownloadFile DrawPath DumpButtons DumpLayers DumpMem DumpVideo DumpVideoTime EdgeBrush Ellipse EmbossBrush EmptyStr EnableButton EnableEventHandler EnableEvent EnableLayers EnableLineHook EnableMenuItem EnablePlugin EnablePrecalculation EnableVWait End EndDoubleBuffer EndianSwap EndRefresh EndSelect EndsWith Eof Error EscapeQuit Eval Execute Exists ExitOnError Exp ExtractPalette FileAttributes FileLength FileLines FilePart FilePos FileRequest FileSize FileToString FillMem FillMusicBuffer FindStr FinishAnimStream FinishAsyncDraw Flip FlipBrush FlipSprite FloodFill Floor FlushFile FlushMusicBuffer FlushSerialPort FontRequest ForcePathUse ForceSound ForceVideoDriver ForceVideoMode ForEach ForEachI FormatStr Frac FreeAnim FreeBGPic FreeBrush FreeClipRegion FreeDisplay FreeEventCache FreeGlyphCache FreeIcon FreeLayers FreeMem FreeMenu FreeModule FreePalette FreePath FreePointer FreeSample FreeSprite FreeTextObject FrExp FullPath GammaBrush GammaPalette GCInfo GetAnimFrame GetApplicationInfo GetApplicationList GetAsset GetAttribute GetAvailableFonts GetBaudRate GetBestPen GetBrushLink GetBrushPen GetBulletColor GetCatalogString GetChannels GetCharMaps GetClipboard GetCommandLine GetConnectionIP GetConnectionPort GetConnectionProtocol GetConstant GetCoroutineStatus GetCountryInfo GetCurrentDirectory GetCurrentPoint GetDash GetDataBits GetDate GetDateNum GetDefaultEncoding GetDirectoryEntry GetDisplayModes GetDTR GetEnv GetErrorName GetEventCode GetFileArgument GetFileAttributes GetFillRule GetFillStyle GetFlowControl GetFontColor GetFontStyle GetFormStyle GetFPSLimit GetFrontScreen GetHostName GetIconProperties GetItem GetKerningPair GetLanguageInfo GetLastError GetLayerAtPos GetLayerPen GetLayerStyle GetLineCap GetLineJoin GetLineWidth GetLocalInterfaces GetLocalIP GetLocalPort GetLocalProtocol GetMACAddress GetMemoryInfo GetMemPointer GetMemString GetMetaTable GetMiterLimit GetMonitors GetObjectData GetObjects GetObjectType GetPalettePen GetParity GetPathExtents GetPatternPosition GetPen GetPlugins GetProgramDirectory GetProgramInfo GetPubScreens GetRandomColor GetRandomFX GetRealColor GetRTS GetSampleData GetShortcutPath GetSongPosition GetStartDirectory GetStopBits GetSystemCountry GetSystemInfo GetSystemLanguage GetTempFileName GetTime GetTimer GetTimestamp GetTimeZone GetType GetVersion GetVideoFrame GetVolumeInfo GetVolumeName GetWeekday Gosub Goto GrabDesktop Green HaveFreeChannel HaveItem HaveObject HaveObjectData HavePlugin HaveVolume HexStr HideDisplay HideKeyboard HideLayer HideLayerFX HidePointer HideScreen Hypot IgnoreCase IIf ImageRequest IncreasePointer InKeyStr InsertItem InsertLayer InsertSample InsertStr InstallEventHandler Intersection Int InvertAlphaChannel InvertBrush InvertMask InvertPalette IPairs IsAbsolutePath IsAlNum IsAlpha IsAnim IsAnimPlaying IsBrushEmpty IsChannelPlaying IsCntrl IsDigit IsDirectory IsFinite IsGraph IsInf IsKeyDown IsLeftMouse IsLower IsMenuItemDisabled IsMenuItemSelected IsMidMouse IsModule IsMusicPlaying IsMusic IsNan IsNil IsOnline IsPathEmpty IsPicture IsPrint IsPunct IsRightMouse IsSamplePlaying IsSample IsSound IsSpace IsTableEmpty IsUnicode IsUpper IsVideo IsVideoPlaying IsXDigit JoyDir JoyFire Label LayerExists LayerToBack LayerToFront Ld LdExp LeftMouseQuit LeftStr LegacyControl Limit Line LineTo ListItems ListRequest Ln LoadAnim LoadAnimFrame LoadBGPic LoadBrush LoadIcon LoadModule LoadPalette LoadPlugin LoadPrefs LoadSample LoadSprite Locate Log LowerStr MakeButton MakeDate MakeDirectory MakeHostPath MatchPattern Max MD5 MD5Str MemToTable MidStr Min MixBrush MixRGB MixSample ModifyAnimFrames ModifyButton ModifyKeyDown ModifyLayerFrames ModulateBrush Mod ModulatePalette MonitorDirectory MouseX MouseY MoveAnim MoveBrush MoveDisplay MoveFile MoveLayer MovePointer MoveSprite MoveTextObject MoveTo Mul NextDirectoryEntry NextFrame NextItem NormalizePath NPrint OilPaintBrush OpenAmigaGuide OpenAnim OpenAudio OpenCatalog OpenConnection OpenDirectory OpenDisplay OpenFile OpenFont OpenMusic OpenResourceMonitor OpenSerialPort OpenURL OpenVideo Pack PadNum Pairs PaletteToGray ParseDate PathItems PathPart PathRequest PathToBrush PatternFindStr PatternFindStrDirect PatternFindStrShort PatternReplaceStr PauseLayer PauseModule PauseMusic PauseTimer PauseVideo PeekClipboard Peek PenArrayToBrush PerformSelector PermissionRequest PerspectiveDistortBrush Pi PixelateBrush PlayAnim PlayAnimDisk PlayLayer PlayModule PlayMusic PlaySample PlaySubsong PlayVideo Plot Poke PolarDistortBrush PollSerialQueue Polygon Pow Print QuantizeBrush Rad RaiseOnError RasterizeBrush RawDiv RawEqual RawGet RawSet ReadBrushPixel ReadByte ReadBytes ReadChr ReadDirectory ReadFloat ReadFunction ReadInt ReadLine ReadMem ReadPen ReadPixel ReadRegistryKey ReadSerialData ReadShort ReadString ReadTable ReceiveData ReceiveUDPData Red ReduceAlphaChannel RefreshDisplay RelCurveTo RelLineTo RelMoveTo RemapBrush RemoveBrushPalette RemoveButton RemoveIconImage RemoveItem RemoveKeyDown RemoveLayer RemoveLayerFX RemoveLayers RemoveSprite RemoveSprites Rename RepeatStr ReplaceColors ReplaceStr ResetKeyStates ResetTabs ResetTimer ResolveHostName ResumeCoroutine ResumeLayer ResumeModule ResumeMusic ResumeTimer ResumeVideo ReverseFindStr ReverseStr RewindDirectory RGB RGBArrayToBrush RightStr Rnd RndF RndStrong Rol Ror RotateBrush RotateLayer RotateTextObject Round Rt Run RunCallback RunRexxScript Sar SaveAnim SaveBrush SaveIcon SavePalette SavePrefs SaveSample SaveSnapshot ScaleAnim ScaleBGPic ScaleBrush ScaleLayer ScaleSprite ScaleTextObject Seek SeekLayer SeekMusic SeekVideo SelectAlphaChannel SelectAnim SelectBGPic SelectBrush SelectDisplay SelectLayer SelectMask SelectMenuItem SelectPalette SendApplicationMessage SendData SendMessage SendRexxCommand SendUDPData SepiaToneBrush SerializeTable SetAlphaIntensity SetAnimFrameDelay SetBaudRate SetBorderPen SetBrushDepth SetBrushPalette SetBrushPen SetBrushTransparency SetBrushTransparentPen SetBulletColor SetBulletPen SetChannelVolume SetClipboard SetClipRegion SetCycleTable SetDash SetDataBits SetDefaultEncoding SetDepth SetDisplayAttributes SetDitherMode SetDrawPen SetDrawTagsDefault SetDTR SetEnv SetEventTimeout SetFileAttributes SetFileEncoding SetFillRule SetFillStyle SetFlowControl SetFont SetFontColor SetFontStyle SetFormStyle SetFPSLimit SetGradientPalette SetIconProperties SetInterval SetIOMode SetLayerAnchor SetLayerBorder SetLayerDepth SetLayerFilter SetLayerLight SetLayerName SetLayerPalette SetLayerPen SetLayerShadow SetLayerStyle SetLayerTint SetLayerTransparency SetLayerTransparentPen SetLayerVolume SetLayerZPos SetLineCap SetLineJoin SetLineWidth SetListItems SetMargins SetMaskMode SetMasterVolume SetMetaTable SetMiterLimit SetMusicVolume SetNetworkProtocol SetNetworkTimeout SetObjectData SetPalette SetPaletteDepth SetPaletteMode SetPalettePen SetPaletteTransparentPen SetPanning SetParity SetPen SetPitch SetPointer SetRTS SetScreenTitle SetShadowPen SetSpriteZPos SetStandardIconImage SetStandardPalette SetStopBits SetSubtitle SetTimeout SetTimerElapse SetTitle SetTransparentPen SetTransparentThreshold SetTrayIcon SetVarType SetVectorEngine SetVideoPosition SetVideoSize SetVideoVolume SetVolume SetWBIcon Sgn SharpenBrush Shl ShowDisplay ShowKeyboard ShowLayer ShowLayerFX ShowNotification ShowPointer ShowRinghioMessage ShowScreen ShowToast Shr Sin SolarizeBrush SolarizePalette Sort SplitStr Sqrt StartPath StartSubPath StartTimer StartsWith StopAnim StopChannel StopLayer StopModule StopMusic StopSample StopTimer StopVideo StringRequest StringToFile StripStr StrLen StrStr StrToArray Sub SwapLayers SwirlBrush SystemRequest TableItems TableToMem Tan TextExtent TextHeight TextOut TextWidth TimerElapsed TimestampToDate TintBrush TintPalette ToHostName ToIP ToNumber ToString ToUserData TransformBrush TransformLayer TranslateLayer TranslatePath TrimBrush TrimStr UndefineVirtualStringFile Undo UndoFX UnleftStr UnmidStr Unpack UnrightStr UnsetEnv UploadFile UpperStr Usage UseCarriageReturn UseFont UTCToDate Val ValidateDate ValidateStr Vibrate VWait Wait WaitAnimEnd WaitEvent WaitKeyDown WaitLeftMouse WaitMidMouse WaitPatternPosition WaitRightMouse WaitSampleEnd WaitSongPosition WaitTimer WaterRippleBrush WhileKeyDown WhileMouseDown WhileMouseOn WhileRightMouseDown Wrap WriteAnimFrame WriteBrushPixel WriteByte WriteBytes WriteChr WriteFloat WriteFunction WriteInt WriteLine WriteMem WritePen WriteRegistryKey WriteSerialData WriteShort WriteString WriteTable YieldCoroutine
+syn keyword hwFunction Abs ACos ActivateDisplay Add AddArcToPath AddBoxToPath AddCircleToPath AddEllipseToPath AddFontPath AddIconImage AddMove AddStr AddTab AddTextToPath AllocConsoleColor AllocMem AllocMemFromPointer AllocMemFromVirtualFile AppendPath ApplyPatch Arc ArcDistortBrush ARGB ArrayToStr Asc ASin Assert AsyncDrawFrame ATan ATan2 BarrelDistortBrush Base64Str Beep BeepConsole BeginAnimStream BeginDoubleBuffer BeginRefresh BGPicToBrush BinStr BitClear BitComplement BitSet BitTest BitXor Blue BlurBrush Box BreakEventHandler BreakWhileMouseOn BrushToBGPic BrushToGray BrushToMonochrome BrushToPenArray BrushToRGBArray ByteAsc ByteChr ByteLen ByteOffset ByteStrStr ByteVal CallJavaMethod CancelAsyncDraw CancelAsyncOperation CanonizePath Cast Ceil ChangeApplicationIcon ChangeBrushTransparency ChangeDirectory ChangeDisplayMode ChangeDisplaySize ChangeInterval CharcoalBrush CharOffset CharWidth CheckEvent CheckEvents Chr Circle ClearClipboard ClearConsole ClearConsoleStyle ClearEvents ClearInterval ClearMove ClearObjectData ClearPath ClearScreen ClearSerialQueue ClearTimeout CloseAmigaGuide CloseAnim CloseAudio CloseCatalog CloseConnection CloseConsole CloseDirectory CloseDisplay CloseFile CloseFont CloseMusic ClosePath CloseResourceMonitor CloseSerialPort CloseServer CloseUDPObject CloseVideo Cls CollectGarbage Collision ColorRequest CompareDates CompareStr CompressFile Concat ConfigureJoystick ConsolePrint ConsolePrintChr ConsolePrintNR ConsolePrompt ContinueAsyncOperation ContrastBrush ContrastPalette ConvertStr ConvertToBrush CopyAnim CopyBGPic CopyBrush CopyConsoleWindow CopyFile CopyLayer CopyMem CopyObjectData CopyPalette CopyPath CopyPens CopySample CopySprite CopyTable CopyTextObject Cos CountDirectoryEntries CountJoysticks CountStr CRC32 CRC32Str CreateAnim CreateBGPic CreateBorderBrush CreateBrush CreateButton CreateClipRegion CreateConsoleWindow CreateCoroutine CreateDisplay CreateFont CreateGradientBGPic CreateGradientBrush CreateIcon CreateKeyDown CreateLayer CreateList CreateMenu CreateMusic CreatePalette CreatePointer CreatePort CreateRainbowBGPic CreateRexxPort CreateSample CreateServer CreateShadowBrush CreateShortcut CreateSprite CreateTextObject CreateTexturedBGPic CreateTexturedBrush CreateUDPObject CropBrush CtrlCQuit CurveTo CyclePalette DateToTimestamp DateToUTC DebugOutput DebugPrint DebugPrintNR DebugPrompt DebugStr DebugVal DecomposeConsoleChr DecompressFile DecreasePointer DefineVirtualFile DefineVirtualFileFromString Deg DeleteAlphaChannel DeleteButton DeleteConsoleChr DeleteConsoleLine DeleteFile DeleteMask DeletePrefs DeselectMenuItem DeserializeTable DirectoryItems DisableAdvancedConsole DisableButton DisableEvent DisableEventHandler DisableLayers DisableLineHook DisableMenuItem DisablePlugin DisablePrecalculation DisableVWait DisplayAnimFrame DisplayBGPic DisplayBGPicPart DisplayBGPicPartFX DisplayBrush DisplayBrushFX DisplayBrushPart DisplaySprite DisplayTextObject DisplayTextObjectFX DisplayTransitionFX DisplayVideoFrame Div DoMove DownloadFile DrawConsoleBorder DrawConsoleBox DrawConsoleHLine DrawConsoleVLine DrawPath DumpButtons DumpLayers DumpMem DumpVideo DumpVideoTime EdgeBrush Ellipse EmbossBrush EmptyStr EnableAdvancedConsole EnableButton EnableEvent EnableEventHandler EnableLayers EnableLineHook EnableMenuItem EnablePlugin EnablePrecalculation EnableVWait End EndDoubleBuffer EndianSwap EndRefresh EndSelect EndsWith Eof EraseConsole Error EscapeQuit Eval Execute Exists ExitOnError Exp ExtendBrush ExtractPalette FileAttributes FileLength FileLines FilePart FilePos FileRequest FileSize FileToString FillMem FillMusicBuffer FindStr FinishAnimStream FinishAsyncDraw FlashConsole Flip FlipBrush FlipSprite FloodFill Floor FlushFile FlushMusicBuffer FlushSerialPort FontRequest ForcePathUse ForceSound ForceVideoDriver ForceVideoMode ForEach ForEachI FormatConsoleLine FormatDate FormatNumber FormatStr Frac FreeAnim FreeBGPic FreeBrush FreeClipRegion FreeConsoleColor FreeConsoleWindow FreeDisplay FreeEventCache FreeGlyphCache FreeIcon FreeLayers FreeMem FreeMenu FreeModule FreePalette FreePath FreePointer FreeSample FreeSprite FreeTextObject FrExp FullPath GammaBrush GammaPalette GCInfo GetAllocConsoleColor GetAnimFrame GetApplicationInfo GetApplicationList GetAsset GetAttribute GetAvailableFonts GetBaudRate GetBestPen GetBrushLink GetBrushPen GetBulletColor GetCatalogString GetChannels GetCharMaps GetClipboard GetCommandLine GetConnectionIP GetConnectionPort GetConnectionProtocol GetConsoleBackground GetConsoleChr GetConsoleColor GetConsoleControlChr GetConsoleCursor GetConsoleOrigin GetConsoleSize GetConsoleStr GetConsoleStyle GetConsoleWindow GetConstant GetCoroutineStatus GetCountryInfo GetCurrentDirectory GetCurrentPoint GetDash GetDataBits GetDate GetDateNum GetDefaultAdapter GetDefaultEncoding GetDefaultLoader GetDirectoryEntry GetDisplayModes GetDTR GetEnv GetErrorName GetEventCode GetFileArgument GetFileAttributes GetFillRule GetFillStyle GetFlowControl GetFontColor GetFontStyle GetFormStyle GetFPSLimit GetFreePen GetFrontScreen GetHostName GetIconProperties GetItem GetKerningPair GetLanguageInfo GetLastError GetLayerAtPos GetLayerGroupMembers GetLayerGroups GetLayerPen GetLayerStyle GetLineCap GetLineJoin GetLineWidth GetLocaleInfo GetLocalInterfaces GetLocalIP GetLocalPort GetLocalProtocol GetMACAddress GetMemoryInfo GetMemPointer GetMemString GetMetaTable GetMiterLimit GetMonitors GetObjectData GetObjects GetObjectType GetPalettePen GetParity GetPathExtents GetPatternPosition GetPen GetPlugins GetProgramDirectory GetProgramInfo GetPubScreens GetRandomColor GetRandomFX GetRawArguments GetRealColor GetRTS GetSampleData GetSerializeMode GetShortcutPath GetSongPosition GetStartDirectory GetStopBits GetSystemCountry GetSystemInfo GetSystemLanguage GetTempFileName GetTime GetTimer GetTimestamp GetTimeZone GetType GetVersion GetVideoFrame GetVolumeInfo GetVolumeName GetWeekday Gosub Goto GrabDesktop Green GroupLayer HasItem HaveConsole HaveFreeChannel HaveItem HaveObject HaveObjectData HavePlugin HaveVolume HexStr HideConsoleCursor HideDisplay HideKeyboard HideLayer HideLayerFX HidePointer HideScreen Hypot IgnoreCase IIf ImageRequest IncreasePointer InitConsoleColor InKeyStr InsertConsoleChr InsertConsoleLine InsertConsoleStr InsertItem InsertLayer InsertSample InsertStr InstallEventHandler Int Intersection InvertAlphaChannel InvertBrush InvertMask InvertPalette IPairs IsAbsolutePath IsAlNum IsAlpha IsAnim IsAnimPlaying IsBrushEmpty IsChannelPlaying IsCntrl IsDigit IsDirectory IsFinite IsGraph IsInf IsKeyDown IsLeftMouse IsLower IsMenuItemDisabled IsMenuItemSelected IsMidMouse IsModule IsMusic IsMusicPlaying IsNan IsNil IsOnline IsPathEmpty IsPicture IsPrint IsPunct IsRightMouse IsSample IsSamplePlaying IsSound IsSpace IsTableEmpty IsUnicode IsUpper IsVideo IsVideoPlaying IsXDigit JoyAxisX JoyAxisY JoyAxisZ JoyButton JoyDir JoyFire Label JoyHat LayerExists LayerGroupExists LayerToBack LayerToFront Ld LdExp LeftMouseQuit LeftStr LegacyControl Limit Line LineTo ListItems ListRequest Ln LoadAnim LoadAnimFrame LoadBGPic LoadBrush LoadIcon LoadModule LoadPalette LoadPlugin LoadPrefs LoadSample LoadSprite Locate Log LowerStr MakeButton MakeConsoleChr MakeDate MakeDirectory MakeHostPath MatchPattern Matrix2D Max MD5 MD5Str MemToTable MergeLayers MidStr Min MixBrush MixRGB MixSample Mod ModifyAnimFrames ModifyButton ModifyKeyDown ModifyLayerFrames ModulateBrush ModulatePalette MonitorDirectory MouseX MouseY MoveAnim MoveBrush MoveConsoleWindow MoveDisplay MoveFile MoveLayer MovePointer MoveSprite MoveTextObject MoveTo Mul NearlyEqual NextDirectoryEntry NextFrame NextItem NormalizePath NPrint OilPaintBrush OpenAmigaGuide OpenAnim OpenAudio OpenCatalog OpenConnection OpenConsole OpenDirectory OpenDisplay OpenFile OpenFont OpenMusic OpenResourceMonitor OpenSerialPort OpenURL OpenVideo Pack PadNum Pairs PaletteToGray ParseDate PathItems PathPart PathRequest PathToBrush PatternFindStr PatternFindStrDirect PatternFindStrShort PatternReplaceStr PauseLayer PauseModule PauseMusic PauseTimer PauseVideo Peek PeekClipboard PenArrayToBrush PerformSelector PermissionRequest PerspectiveDistortBrush Pi PixelateBrush PlayAnim PlayAnimDisk PlayLayer PlayModule PlayMusic PlaySample PlaySubsong PlayVideo Plot Poke PolarDistortBrush PollSerialQueue Polygon PopupMenu Pow Print QuantizeBrush Rad RaiseOnError RasterizeBrush RawDiv RawEqual RawGet RawSet ReadBrushPixel ReadByte ReadBytes ReadChr ReadConsoleKey ReadConsoleStr ReadDirectory ReadFloat ReadFunction ReadInt ReadLine ReadMem ReadPen ReadPixel ReadRegistryKey ReadSerialData ReadShort ReadString ReadTable ReceiveData ReceiveUDPData Red ReduceAlphaChannel RefreshConsole RefreshDisplay RefreshLayer RelCurveTo RelLineTo RelMoveTo RemapBrush RemoveBrushPalette RemoveButton RemoveIconImage RemoveItem RemoveKeyDown RemoveLayer RemoveLayerFX RemoveLayers RemoveSprite RemoveSprites Rename RenderLayer RepeatStr ReplaceColors ReplaceStr ResetKeyStates ResetTabs ResetTimer ResolveHostName ResumeCoroutine ResumeLayer ResumeModule ResumeMusic ResumeTimer ResumeVideo ReverseFindStr ReverseStr RewindDirectory RGB RGBArrayToBrush RightStr Rnd RndF RndStrong Rol Ror RotateBrush RotateLayer RotateTextObject Round Rt Run RunCallback RunRexxScript Sar SaveAnim SaveBrush SaveIcon SavePalette SavePrefs SaveSample SaveSnapshot ScaleAnim ScaleBGPic ScaleBrush ScaleLayer ScaleSprite ScaleTextObject ScrollConsole Seek SeekLayer SeekMusic SeekVideo SelectAlphaChannel SelectAnim SelectBGPic SelectBrush SelectConsoleWindow SelectDisplay SelectLayer SelectMask SelectMenuItem SelectPalette SendApplicationMessage SendData SendMessage SendRexxCommand SendUDPData SepiaToneBrush SerializeTable SetAllocConsoleColor SetAlphaIntensity SetAnimFrameDelay SetAttribute SetBaudRate SetBorderPen SetBrushDepth SetBrushPalette SetBrushPen SetBrushTransparency SetBrushTransparentPen SetBulletColor SetBulletPen SetChannelVolume SetClipboard SetClipRegion SetConsoleBackground SetConsoleColor SetConsoleCursor SetConsoleOptions SetConsoleStyle SetConsoleTitle SetCycleTable SetDash SetDataBits SetDefaultAdapter SetDefaultEncoding SetDefaultLoader SetDepth SetDisplayAttributes SetDitherMode SetDrawPen SetDrawTagsDefault SetDTR SetEnv SetEventTimeout SetFileAttributes SetFileEncoding SetFillRule SetFillStyle SetFlowControl SetFont SetFontColor SetFontStyle SetFormStyle SetFPSLimit SetGradientPalette SetIconProperties SetInterval SetIOMode SetLayerAnchor SetLayerBorder SetLayerDepth SetLayerFilter SetLayerLight SetLayerName SetLayerPalette SetLayerPen SetLayerShadow SetLayerStyle SetLayerTint SetLayerTransparency SetLayerTransparentPen SetLayerVolume SetLayerZPos SetLineCap SetLineJoin SetLineWidth SetListItems SetMargins SetMaskMode SetMasterVolume SetMetaTable SetMiterLimit SetMusicVolume SetNetworkProtocol SetNetworkTimeout SetObjectData SetPalette SetPaletteDepth SetPaletteMode SetPalettePen SetPaletteTransparentPen SetPanning SetParity SetPen SetPitch SetPointer SetRTS SetScreenTitle SetSerializeMode SetSerializeOptions SetShadowPen SetSpriteZPos SetStandardIconImage SetStandardPalette SetStopBits SetSubtitle SetTimeout SetTimerElapse SetTitle SetTransparentPen SetTransparentThreshold SetTrayIcon SetVarType SetVectorEngine SetVideoPosition SetVideoSize SetVideoVolume SetVolume SetWBIcon Sgn SharpenBrush Shl ShowConsoleCursor ShowDisplay ShowKeyboard ShowLayer ShowLayerFX ShowNotification ShowPointer ShowRinghioMessage ShowScreen ShowToast Shr Sin Sleep SolarizeBrush SolarizePalette Sort SplitStr Sqrt StartConsoleColorMode StartPath StartSubPath StartsWith StartTimer StopAnim StopChannel StopLayer StopModule StopMusic StopSample StopTimer StopVideo StringRequest StringToFile StripStr StrLen StrStr StrToArray Sub SwapLayers SwirlBrush SystemRequest TableItems TableToMem Tan TextExtent TextHeight TextOut TextWidth TimerElapsed TimestampToDate TintBrush TintPalette ToHostName ToIP ToNumber ToString TouchConsoleWindow ToUserData TransformBox TransformBrush TransformLayer TransformPoint TransformTextObject TranslateLayer TranslatePath TrimBrush TrimStr UndefineVirtualStringFile Undo UndoFX UngroupLayer UnleftStr UnmidStr Unpack UnrightStr UnsetEnv UploadFile UpperStr Usage UseCarriageReturn UseFont UTCToDate Val ValidateDate ValidateStr Vibrate VWait Wait WaitAnimEnd WaitEvent WaitKeyDown WaitLeftMouse WaitMidMouse WaitMusicEnd WaitPatternPosition WaitRightMouse WaitSampleEnd WaitSongPosition WaitTimer WaterRippleBrush WhileKeyDown WhileMouseDown WhileMouseOn WhileRightMouseDown Wrap WriteAnimFrame WriteBrushPixel WriteByte WriteBytes WriteChr WriteFloat WriteFunction WriteInt WriteLine WriteMem WritePen WriteRegistryKey WriteSerialData WriteShort WriteString WriteTable YieldCoroutine
 
 " user-defined constants
 syn match hwUserConstant "#\<\u\+\>"
diff --git a/runtime/syntax/ld.vim b/runtime/syntax/ld.vim
index 6a117ee87b..7ac050131b 100644
--- a/runtime/syntax/ld.vim
+++ b/runtime/syntax/ld.vim
@@ -2,6 +2,7 @@
 " Language:             ld(1) script
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2006-04-19
+" Last Change:		2023 Apr 19
 
 if exists("b:current_syntax")
   finish
@@ -43,7 +44,7 @@ syn match   ldSpecial       '/DISCARD/'
 syn keyword ldIdentifier    ORIGIN LENGTH
 
 syn match   ldSpecSections  '\.'
-syn match   ldSections      '\.\S\+'
+syn match   ldSections      '\.[^ \t)]\+'
 syn match   ldSpecSections  '\.\%(text\|data\|bss\|symver\)\>'
 
 syn match   ldNumber        display '\<0[xX]\x\+\>'
diff --git a/runtime/syntax/livebook.vim b/runtime/syntax/livebook.vim
new file mode 100644
index 0000000000..133cab01e3
--- /dev/null
+++ b/runtime/syntax/livebook.vim
@@ -0,0 +1,8 @@
+" Placeholder Livebook syntax file.
+" This simply uses the markdown syntax.
+
+if exists("b:current_syntax")
+    finish
+endif
+
+runtime! syntax/markdown.vim
diff --git a/runtime/syntax/netrc.vim b/runtime/syntax/netrc.vim
index 4d068a1b76..567aaa96de 100644
--- a/runtime/syntax/netrc.vim
+++ b/runtime/syntax/netrc.vim
@@ -2,6 +2,7 @@
 " Language:             netrc(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2010-01-03
+" Last Change:		2023 Feb 27 by Keith Smiley
 
 if exists("b:current_syntax")
   finish
@@ -35,6 +36,8 @@ syn keyword netrcSpecial    contained anonymous
 syn match   netrcInit       contained '\<init$'
                           \ nextgroup=netrcMacro skipwhite skipnl
 
+syn match   netrcComment    '#.*$'
+
 syn sync fromstart
 
 hi def link netrcKeyword    Keyword
@@ -45,6 +48,7 @@ hi def link netrcPassword   String
 hi def link netrcMacroName  String
 hi def link netrcSpecial    Special
 hi def link netrcInit       Special
+hi def link netrcComment    Comment
 
 let b:current_syntax = "netrc"
 
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index 831fb92f4c..043ea6d19b 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Python
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
-" Last Change:	2023 Feb 26
+" Last Change:	2023 Feb 28
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "
@@ -178,17 +178,17 @@ syn match   pythonEscape	"\\$"
 " and so on, as specified in the 'Python Language Reference'.
 " https://docs.python.org/reference/lexical_analysis.html#numeric-literals
 if !exists("python_no_number_highlight")
-  " numbers (including longs and complex)
-  syn match   pythonNumber	"\<0[oO]\=\o\+[Ll]\=\>"
-  syn match   pythonNumber	"\<0[xX]\x\+[Ll]\=\>"
-  syn match   pythonNumber	"\<0[bB][01]\+[Ll]\=\>"
-  syn match   pythonNumber	"\<\%([1-9]\d*\|0\)[Ll]\=\>"
-  syn match   pythonNumber	"\<\d\+[jJ]\>"
-  syn match   pythonNumber	"\<\d\+[eE][+-]\=\d\+[jJ]\=\>"
+  " numbers (including complex)
+  syn match   pythonNumber	"\<0[oO]\%(_\=\o\)\+\>"
+  syn match   pythonNumber	"\<0[xX]\%(_\=\x\)\+\>"
+  syn match   pythonNumber	"\<0[bB]\%(_\=[01]\)\+\>"
+  syn match   pythonNumber	"\<\%([1-9]\%(_\=\d\)*\|0\+\%(_\=0\)*\)\>"
+  syn match   pythonNumber	"\<\d\%(_\=\d\)*[jJ]\>"
+  syn match   pythonNumber	"\<\d\%(_\=\d\)*[eE][+-]\=\d\%(_\=\d\)*[jJ]\=\>"
   syn match   pythonNumber
-	\ "\<\d\+\.\%([eE][+-]\=\d\+\)\=[jJ]\=\%(\W\|$\)\@="
+        \ "\<\d\%(_\=\d\)*\.\%([eE][+-]\=\d\%(_\=\d\)*\)\=[jJ]\=\%(\W\|$\)\@="
   syn match   pythonNumber
-	\ "\%(^\|\W\)\zs\d*\.\d\+\%([eE][+-]\=\d\+\)\=[jJ]\=\>"
+        \ "\%(^\|\W\)\zs\%(\d\%(_\=\d\)*\)\=\.\d\%(_\=\d\)*\%([eE][+-]\=\d\%(_\=\d\)*\)\=[jJ]\=\>"
 endif
 
 " Group the built-ins in the order in the 'Python Library Reference' for
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index f455f19c93..8674ded9e4 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Feb 11, 2023
-" Version:		207
+" Last Change:		Feb 28, 2023
+" Version:		208
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) and heredoc fixes from Felipe Contreras
@@ -415,21 +415,21 @@ syn match	shBQComment	contained	"#.\{-}\ze`"	contains=@shCommentGroup
 "  (modified by Felipe Contreras)
 " =========================================
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc01 start="<<\s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc01 end="^\z1$"	contains=@shDblQuoteList
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc02 start="<<-\s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc02 end="^\s*\z1$"	contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc02 start="<<-\s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc02 end="^\t*\z1$"	contains=@shDblQuoteList
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc03 start="<<\s*\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc03 end="^\z1$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc04 end="^\s*\z1$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc04 end="^\t*\z1$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc05 start="<<\s*'\z([^']\+\)'"		matchgroup=shHereDoc05 end="^\z1$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*'\z([^']\+\)'"		matchgroup=shHereDoc06 end="^\s*\z1$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*'\z([^']\+\)'"		matchgroup=shHereDoc06 end="^\t*\z1$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\"\z([^"]\+\)\""		matchgroup=shHereDoc07 end="^\z1$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<-\s*\"\z([^"]\+\)\""		matchgroup=shHereDoc08 end="^\s*\z1$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<-\s*\"\z([^"]\+\)\""		matchgroup=shHereDoc08 end="^\t*\z1$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<\s*\\\_$\_s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc09 end="^\z1$"	contains=@shDblQuoteList
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|>]\+\)"	matchgroup=shHereDoc10 end="^\s*\z1$"	contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|>]\+\)"	matchgroup=shHereDoc10 end="^\t*\z1$"	contains=@shDblQuoteList
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<\s*\\\_$\_s*\\\z([^ \t|>]\+\)"	matchgroup=shHereDoc11 end="^\z1$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\\\_$\_s*\\\z([^ \t|>]\+\)"	matchgroup=shHereDoc12 end="^\s*\z1$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\\\_$\_s*\\\z([^ \t|>]\+\)"	matchgroup=shHereDoc12 end="^\t*\z1$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<\s*\\\_$\_s*'\z([^']\+\)'"		matchgroup=shHereDoc13 end="^\z1$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<-\s*\\\_$\_s*'\z([^']\+\)'"		matchgroup=shHereDoc14 end="^\s*\z1$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<-\s*\\\_$\_s*'\z([^']\+\)'"		matchgroup=shHereDoc14 end="^\t*\z1$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<\s*\\\_$\_s*\"\z([^"]\+\)\""		matchgroup=shHereDoc15 end="^\z1$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc16 start="<<-\s*\\\_$\_s*\"\z([^"]\+\)\""	matchgroup=shHereDoc16 end="^\s*\z1$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc16 start="<<-\s*\\\_$\_s*\"\z([^"]\+\)\""	matchgroup=shHereDoc16 end="^\t*\z1$"
 
 
 " Here Strings: {{{1
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index a1c39e4dcf..c44a32119b 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -53,7 +53,7 @@ syn case ignore
 syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo
 
 " Default highlighting groups {{{2
-syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineFold CursorLineNr CursorLineSign DiffAdd DiffChange DiffDelete DiffText Directory EndOfBuffer ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu MessageWindow ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question QuickFixLine Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual WarningMsg WildMenu
+syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineFold CursorLineNr CursorLineSign DiffAdd DiffChange DiffDelete DiffText Directory EndOfBuffer ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu MessageWindow ModeMsg MoreMsg NonText Normal Pmenu PmenuExtra PmenuExtraSel PmenuKind PmenuKindSel PmenuSbar PmenuSel PmenuThumb Question QuickFixLine Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual WarningMsg WildMenu
 syn match vimHLGroup contained	"Conceal"
 syn keyword vimOnlyHLGroup contained	LineNrAbove LineNrBelow StatusLineTerm Terminal VisualNOS
 syn keyword nvimHLGroup contained	Substitute TermCursor TermCursorNC
@@ -61,7 +61,7 @@ syn keyword nvimHLGroup contained	Substitute TermCursor TermCursorNC
 syn case match
 " Special Vim Highlighting (not automatic) {{{1
 
-" Set up folding commands {{{2
+" Set up folding commands for this syntax highlighting file {{{2
 if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[afhlmpPrt]'
  if g:vimsyn_folding =~# 'a'
   com! -nargs=* VimFolda <args> fold
-- 
cgit 


From 43c49746d9cf82dba0d56b07d39722f9ebeecf90 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 25 Apr 2023 21:32:12 +0800
Subject: vim-patch:9.0.0335: checks for Dictionary argument often give a vague
 error (#23309)

Problem:    Checks for Dictionary argument often give a vague error message.
Solution:   Give a useful error message. (Yegappan Lakshmanan, closes vim/vim#11009)

https://github.com/vim/vim/commit/04c4c5746e15884768d2cb41370c3276a196cd4c

Cherry-pick removal of E922 from docs from patch 9.0.1403.

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 91531db656..bf8d64ec02 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2525,7 +2525,7 @@ funcref({name} [, {arglist}] [, {dict}])
 		Can also be used as a |method|: >
 			GetFuncname()->funcref([arg])
 <
-				*function()* *partial* *E700* *E922* *E923*
+				*function()* *partial* *E700* *E923*
 function({name} [, {arglist}] [, {dict}])
 		Return a |Funcref| variable that refers to function {name}.
 		{name} can be the name of a user defined function or an
-- 
cgit 


From bfa92d3861e425b59f9b1793c08247965a8e53f5 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 25 Apr 2023 22:22:26 +0800
Subject: vim-patch:8.2.5019: cannot get the first screen column of a character
 (#23312)

Problem:    Cannot get the first screen column of a character.
Solution:   Let virtcol() optionally return a list. (closes vim/vim#10482,
            closes vim/vim#7964)

https://github.com/vim/vim/commit/0f7a3e1de6f71e8e1423fe594890d6aa7f94e132

Co-authored-by: LemonBoy <thatlemon@gmail.com>
---
 runtime/doc/builtin.txt | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index bf8d64ec02..d5607afdf5 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -546,7 +546,8 @@ undotree()			List	undo file tree
 uniq({list} [, {func} [, {dict}]])
 				List	remove adjacent duplicates from a list
 values({dict})			List	values in {dict}
-virtcol({expr})			Number	screen column of cursor or mark
+virtcol({expr} [, {list}])	Number or List
+					screen column of cursor or mark
 virtcol2col({winid}, {lnum}, {col})
 				Number  byte index of a character on screen
 visualmode([expr])		String	last visual mode used
@@ -637,6 +638,7 @@ add({object}, {expr})					*add()*
 and({expr}, {expr})					*and()*
 		Bitwise AND on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
+		Also see `or()` and `xor()`.
 		Example: >
 			:let flag = and(bits, 0x80)
 <		Can also be used as a |method|: >
@@ -9070,7 +9072,7 @@ values({dict})						*values()*
 		Can also be used as a |method|: >
 			mydict->values()
 
-virtcol({expr})						*virtcol()*
+virtcol({expr} [, {list}])				*virtcol()*
 		The result is a Number, which is the screen column of the file
 		position given with {expr}.  That is, the last screen position
 		occupied by the character at that position, when the screen
@@ -9079,13 +9081,17 @@ virtcol({expr})						*virtcol()*
 		the <Tab>.  For example, for a <Tab> in column 1, with 'ts'
 		set to 8, it returns 8. |conceal| is ignored.
 		For the byte position use |col()|.
+
 		For the use of {expr} see |col()|.
-		When 'virtualedit' is used {expr} can be [lnum, col, off], where
-		"off" is the offset in screen columns from the start of the
-		character.  E.g., a position within a <Tab> or after the last
-		character.  When "off" is omitted zero is used.
-		When Virtual editing is active in the current mode, a position
-		beyond the end of the line can be returned. |'virtualedit'|
+
+		When 'virtualedit' is used {expr} can be [lnum, col, off],
+		where "off" is the offset in screen columns from the start of
+		the character.  E.g., a position within a <Tab> or after the
+		last character.  When "off" is omitted zero is used.  When
+		Virtual editing is active in the current mode, a position
+		beyond the end of the line can be returned.  Also see
+		|'virtualedit'|
+
 		The accepted positions are:
 		    .	    the cursor position
 		    $	    the end of the cursor line (the result is the
@@ -9097,11 +9103,22 @@ virtcol({expr})						*virtcol()*
 			    cursor is the end).  When not in Visual mode
 			    returns the cursor position.  Differs from |'<| in
 			    that it's updated right away.
+
+		If {list} is present and non-zero then virtcol() returns a List
+		with the first and last screen position occupied by the
+		character.
+
 		Note that only marks in the current file can be used.
 		Examples: >
-  virtcol(".")	   with text "foo^Lbar", with cursor on the "^L", returns 5
-  virtcol("$")	   with text "foo^Lbar", returns 9
-  virtcol("'t")    with text "	  there", with 't at 'h', returns 6
+			" With text "foo^Lbar" and cursor on the "^L":
+
+			virtcol(".")	" returns 5
+			virtcol(".", 1)	" returns [4, 5]
+			virtcol("$")	" returns 9
+
+			" With text "	  there", with 't at 'h':
+
+			virtcol("'t")	" returns 6
 <		The first column is 1.  0 is returned for an error.
 		A more advanced example that echoes the maximum length of
 		all lines: >
-- 
cgit 


From 1e73891d696a00b046ab19d245001424b174c931 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Mon, 24 Apr 2023 19:57:40 -0600
Subject: refactor(iter): move helper functions under vim.iter

vim.iter is now both a function and a module (similar to vim.version).
---
 runtime/doc/lua.txt                | 223 +++++++++++++++++--------------------
 runtime/lua/vim/_init_packages.lua |   1 +
 runtime/lua/vim/iter.lua           | 112 ++++++++++++++++++-
 runtime/lua/vim/shared.lua         | 105 -----------------
 4 files changed, 212 insertions(+), 229 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 8e68e9a792..2d3ea75588 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1653,26 +1653,6 @@ endswith({s}, {suffix})                                       *vim.endswith()*
     Return: ~
         (boolean) `true` if `suffix` is a suffix of `s`
 
-filter({f}, {src}, {...})                                       *vim.filter()*
-    Filter a table or iterator.
-
-    This is a convenience function that performs: >lua
-
-     vim.iter(src):filter(f):totable()
-<
-
-    Parameters: ~
-      • {f}    function(...):bool Filter function. Accepts the current
-               iterator or table values as arguments and returns true if those
-               values should be kept in the final table
-      • {src}  table|function Table or iterator function to filter
-
-    Return: ~
-        (table)
-
-    See also: ~
-      • |Iter:filter()|
-
 gsplit({s}, {sep}, {opts})                                      *vim.gsplit()*
     Splits a string at each instance of a separator.
 
@@ -1718,64 +1698,6 @@ is_callable({f})                                           *vim.is_callable()*
     Return: ~
         (boolean) `true` if `f` is callable, else `false`
 
-iter({src}, {...})                                                *vim.iter()*
-    Create an Iter |lua-iter| object from a table or iterator.
-
-    The input value can be a table or a function iterator (see |luaref-in|).
-
-    This function wraps the input value into an interface which allows
-    chaining multiple pipeline stages in an efficient manner. Each pipeline
-    stage receives as input the output values from the prior stage. The values
-    used in the first stage of the pipeline depend on the type passed to this
-    function:
-
-    • List tables pass only the value of each element
-    • Non-list tables pass both the key and value of each element
-    • Function iterators pass all of the values returned by their respective
-      function
-
-    Examples: >lua
-
-     local it = vim.iter({ 1, 2, 3, 4, 5 })
-     it:map(function(v)
-       return v * 3
-     end)
-     it:rev()
-     it:skip(2)
-     it:totable()
-     -- { 9, 6, 3 }
-
-     vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
-       if i > 2 then return v end
-     end):totable()
-     -- { 3, 4, 5 }
-
-     local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
-     it:map(function(s) return tonumber(s) end)
-     for i, d in it:enumerate() do
-       print(string.format("Column %d is %d", i, d))
-     end
-     -- Column 1 is 1
-     -- Column 2 is 2
-     -- Column 3 is 3
-     -- Column 4 is 4
-     -- Column 5 is 5
-
-     vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
-       return k == 'z'
-     end)
-     -- true
-<
-
-    Parameters: ~
-      • {src}  table|function Table or iterator.
-
-    Return: ~
-        Iter |lua-iter|
-
-    See also: ~
-      • |lua-iter|
-
 list_contains({t}, {value})                              *vim.list_contains()*
     Checks if a list-like table (integer keys without gaps) contains `value`.
 
@@ -1818,26 +1740,6 @@ list_slice({list}, {start}, {finish})                       *vim.list_slice()*
     Return: ~
         (list) Copy of table sliced from start to finish (inclusive)
 
-map({f}, {src}, {...})                                             *vim.map()*
-    Map and filter a table or iterator.
-
-    This is a convenience function that performs: >lua
-
-     vim.iter(src):map(f):totable()
-<
-
-    Parameters: ~
-      • {f}    function(...):?any Map function. Accepts the current iterator
-               or table values as arguments and returns one or more new
-               values. Nil values are removed from the final table.
-      • {src}  table|function Table or iterator function to filter
-
-    Return: ~
-        (table)
-
-    See also: ~
-      • |Iter:map()|
-
 pesc({s})                                                         *vim.pesc()*
     Escapes magic chars in |lua-patterns|.
 
@@ -2099,20 +2001,6 @@ tbl_values({t})                                             *vim.tbl_values()*
     Return: ~
         (list) List of values
 
-totable({f}, {...})                                            *vim.totable()*
-    Collect an iterator into a table.
-
-    This is a convenience function that performs: >lua
-
-     vim.iter(f):totable()
-<
-
-    Parameters: ~
-      • {f}  (function) Iterator function
-
-    Return: ~
-        (table)
-
 trim({s})                                                         *vim.trim()*
     Trim whitespace (Lua pattern "%s") from both sides of a string.
 
@@ -2933,6 +2821,79 @@ range({spec})                                            *vim.version.range()*
 ==============================================================================
 Lua module: iter                                                    *lua-iter*
 
+
+The *vim.iter* module provides a generic "iterator" interface over tables
+and iterator functions.
+
+*vim.iter()* wraps its table or function argument into an *Iter* object
+with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
+underlying source data. These methods can be chained together to create
+iterator "pipelines". Each pipeline stage receives as input the output
+values from the prior stage. The values used in the first stage of the
+pipeline depend on the type passed to this function:
+
+• List tables pass only the value of each element
+• Non-list tables pass both the key and value of each element
+• Function iterators pass all of the values returned by their respective
+  function
+
+Examples: >lua
+
+   local it = vim.iter({ 1, 2, 3, 4, 5 })
+   it:map(function(v)
+     return v * 3
+   end)
+   it:rev()
+   it:skip(2)
+   it:totable()
+   -- { 9, 6, 3 }
+
+   vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
+     if i > 2 then return v end
+   end):totable()
+   -- { 3, 4, 5 }
+
+   local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
+   it:map(function(s) return tonumber(s) end)
+   for i, d in it:enumerate() do
+     print(string.format("Column %d is %d", i, d))
+   end
+   -- Column 1 is 1
+   -- Column 2 is 2
+   -- Column 3 is 3
+   -- Column 4 is 4
+   -- Column 5 is 5
+
+   vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
+     return k == 'z'
+   end)
+   -- true
+
+<
+
+In addition to the |vim.iter()| function, the |vim.iter| module provides
+convenience functions like |vim.iter.filter()| and |vim.iter.totable()|.
+
+filter({f}, {src}, {...})                                  *vim.iter.filter()*
+    Filter a table or iterator.
+
+    This is a convenience function that performs: >lua
+
+     vim.iter(src):filter(f):totable()
+<
+
+    Parameters: ~
+      • {f}    function(...):bool Filter function. Accepts the current
+               iterator or table values as arguments and returns true if those
+               values should be kept in the final table
+      • {src}  table|function Table or iterator function to filter
+
+    Return: ~
+        (table)
+
+    See also: ~
+      • |Iter:filter()|
+
 Iter:all({self}, {pred})                                          *Iter:all()*
     Return true if all of the items in the iterator match the given predicate.
 
@@ -2971,9 +2932,7 @@ Iter:enumerate({self})                                      *Iter:enumerate()*
      vim.iter(ipairs(t))
 <
 
-    over
-
-    >lua
+    over >lua
 
      vim.iter(t):enumerate()
 <
@@ -3331,16 +3290,38 @@ Iter:totable({self})                                          *Iter:totable()*
     Return: ~
         (table)
 
-new({src}, {...})                                                      *new()*
-    Create a new Iter object from a table or iterator.
+map({f}, {src}, {...})                                        *vim.iter.map()*
+    Map and filter a table or iterator.
+
+    This is a convenience function that performs: >lua
+
+     vim.iter(src):map(f):totable()
+<
 
     Parameters: ~
-      • {src}  table|function Table or iterator to drain values from
+      • {f}    function(...):?any Map function. Accepts the current iterator
+               or table values as arguments and returns one or more new
+               values. Nil values are removed from the final table.
+      • {src}  table|function Table or iterator function to filter
 
     Return: ~
-        Iter
+        (table)
 
-next()                                                                *next()*
-    TODO: Documentation
+    See also: ~
+      • |Iter:map()|
+
+totable({f}, {...})                                       *vim.iter.totable()*
+    Collect an iterator into a table.
+
+    This is a convenience function that performs: >lua
+
+     vim.iter(f):totable()
+<
+
+    Parameters: ~
+      • {f}  (function) Iterator function
+
+    Return: ~
+        (table)
 
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/lua/vim/_init_packages.lua b/runtime/lua/vim/_init_packages.lua
index 2cf2e91a8c..5db258c011 100644
--- a/runtime/lua/vim/_init_packages.lua
+++ b/runtime/lua/vim/_init_packages.lua
@@ -55,6 +55,7 @@ vim._submodules = {
   inspect = true,
   version = true,
   fs = true,
+  iter = true,
 }
 
 -- These are for loading runtime modules in the vim namespace lazily.
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 2545853b41..c2e2c5bd9f 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -1,4 +1,56 @@
---- Iterator implementation.
+---@defgroup lua-iter
+---
+--- The \*vim.iter\* module provides a generic "iterator" interface over tables and iterator
+--- functions.
+---
+--- \*vim.iter()\* wraps its table or function argument into an \*Iter\* object with methods (such
+--- as |Iter:filter()| and |Iter:map()|) that transform the underlying source data. These methods
+--- can be chained together to create iterator "pipelines". Each pipeline stage receives as input
+--- the output values from the prior stage. The values used in the first stage of the pipeline
+--- depend on the type passed to this function:
+---
+--- - List tables pass only the value of each element
+--- - Non-list tables pass both the key and value of each element
+--- - Function iterators pass all of the values returned by their respective
+---   function
+---
+--- Examples:
+--- <pre>lua
+---   local it = vim.iter({ 1, 2, 3, 4, 5 })
+---   it:map(function(v)
+---     return v * 3
+---   end)
+---   it:rev()
+---   it:skip(2)
+---   it:totable()
+---   -- { 9, 6, 3 }
+---
+---   vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
+---     if i > 2 then return v end
+---   end):totable()
+---   -- { 3, 4, 5 }
+---
+---   local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
+---   it:map(function(s) return tonumber(s) end)
+---   for i, d in it:enumerate() do
+---     print(string.format("Column %d is %d", i, d))
+---   end
+---   -- Column 1 is 1
+---   -- Column 2 is 2
+---   -- Column 3 is 3
+---   -- Column 4 is 4
+---   -- Column 5 is 5
+---
+---   vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
+---     return k == 'z'
+---   end)
+---   -- true
+--- </pre>
+---
+--- In addition to the |vim.iter()| function, the |vim.iter| module provides convenience functions
+--- like |vim.iter.filter()| and |vim.iter.totable()|.
+
+local M = {}
 
 ---@class Iter
 local Iter = {}
@@ -733,7 +785,6 @@ end
 --- </pre>
 ---
 --- over
----
 --- <pre>lua
 --- vim.iter(t):enumerate()
 --- </pre>
@@ -776,6 +827,7 @@ end
 ---
 ---@param src table|function Table or iterator to drain values from
 ---@return Iter
+---@private
 function Iter.new(src, ...)
   local it = {}
   if type(src) == 'table' then
@@ -807,6 +859,7 @@ function Iter.new(src, ...)
       end
     end
 
+    ---@private
     function it.next()
       return fn(src(s, var))
     end
@@ -832,4 +885,57 @@ function ListIter.new(t)
   return it
 end
 
-return Iter
+--- Collect an iterator into a table.
+---
+--- This is a convenience function that performs:
+--- <pre>lua
+--- vim.iter(f):totable()
+--- </pre>
+---
+---@param f function Iterator function
+---@return table
+function M.totable(f, ...)
+  return Iter.new(f, ...):totable()
+end
+
+--- Filter a table or iterator.
+---
+--- This is a convenience function that performs:
+--- <pre>lua
+--- vim.iter(src):filter(f):totable()
+--- </pre>
+---
+---@see |Iter:filter()|
+---
+---@param f function(...):bool Filter function. Accepts the current iterator or table values as
+---                            arguments and returns true if those values should be kept in the
+---                            final table
+---@param src table|function Table or iterator function to filter
+---@return table
+function M.filter(f, src, ...)
+  return Iter.new(src, ...):filter(f):totable()
+end
+
+--- Map and filter a table or iterator.
+---
+--- This is a convenience function that performs:
+--- <pre>lua
+--- vim.iter(src):map(f):totable()
+--- </pre>
+---
+---@see |Iter:map()|
+---
+---@param f function(...):?any Map function. Accepts the current iterator or table values as
+---                            arguments and returns one or more new values. Nil values are removed
+---                            from the final table.
+---@param src table|function Table or iterator function to filter
+---@return table
+function M.map(f, src, ...)
+  return Iter.new(src, ...):map(f):totable()
+end
+
+return setmetatable(M, {
+  __call = function(_, ...)
+    return Iter.new(...)
+  end,
+})
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 5f4ea8822b..a55deb1415 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -881,109 +881,4 @@ function vim.defaulttable(create)
   })
 end
 
---- Create an Iter |lua-iter| object from a table or iterator.
----
---- The input value can be a table  or a function iterator (see |luaref-in|).
----
---- This function wraps the input value into an interface which allows chaining
---- multiple pipeline stages in an efficient manner. Each pipeline stage
---- receives as input the output values from the prior stage. The values used in
---- the first stage of the pipeline depend on the type passed to this function:
----
---- - List tables pass only the value of each element
---- - Non-list tables pass both the key and value of each element
---- - Function iterators pass all of the values returned by their respective
----   function
----
---- Examples:
---- <pre>lua
---- local it = vim.iter({ 1, 2, 3, 4, 5 })
---- it:map(function(v)
----   return v * 3
---- end)
---- it:rev()
---- it:skip(2)
---- it:totable()
---- -- { 9, 6, 3 }
----
---- vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
----   if i > 2 then return v end
---- end):totable()
---- -- { 3, 4, 5 }
----
---- local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
---- it:map(function(s) return tonumber(s) end)
---- for i, d in it:enumerate() do
----   print(string.format("Column %d is %d", i, d))
---- end
---- -- Column 1 is 1
---- -- Column 2 is 2
---- -- Column 3 is 3
---- -- Column 4 is 4
---- -- Column 5 is 5
----
---- vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
----   return k == 'z'
---- end)
---- -- true
---- </pre>
----
----@see |lua-iter|
----
----@param src table|function Table or iterator.
----@return Iter @|lua-iter|
-function vim.iter(src, ...)
-  local Iter = require('vim.iter')
-  return Iter.new(src, ...)
-end
-
---- Collect an iterator into a table.
----
---- This is a convenience function that performs:
---- <pre>lua
---- vim.iter(f):totable()
---- </pre>
----
----@param f function Iterator function
----@return table
-function vim.totable(f, ...)
-  return vim.iter(f, ...):totable()
-end
-
---- Filter a table or iterator.
----
---- This is a convenience function that performs:
---- <pre>lua
---- vim.iter(src):filter(f):totable()
---- </pre>
----
----@see |Iter:filter()|
----
----@param f function(...):bool Filter function. Accepts the current iterator or table values as
----                            arguments and returns true if those values should be kept in the
----                            final table
----@param src table|function Table or iterator function to filter
----@return table
-function vim.filter(f, src, ...)
-  return vim.iter(src, ...):filter(f):totable()
-end
-
---- Map and filter a table or iterator.
----
---- This is a convenience function that performs:
---- <pre>lua
---- vim.iter(src):map(f):totable()
---- </pre>
----
----@see |Iter:map()|
----
----@param f function(...):?any Map function. Accepts the current iterator or table values as
----                            arguments and returns one or more new values. Nil values are removed
----                            from the final table.
----@param src table|function Table or iterator function to filter
----@return table
-function vim.map(f, src, ...)
-  return vim.iter(src, ...):map(f):totable()
-end
-
 return vim
-- 
cgit 


From 7e70ca0b4808bb9d8f19c28c8f93e8f2b9e0d0f0 Mon Sep 17 00:00:00 2001
From: ii14 <59243201+ii14@users.noreply.github.com>
Date: Tue, 25 Apr 2023 16:52:44 +0200
Subject: feat(lua): vim.keycode (#22960)

Using nvim_replace_termcodes is too verbose, add vim.keycode for
translating keycodes.

Co-authored-by: ii14 <ii14@users.noreply.github.com>
---
 runtime/doc/lua.txt         | 17 +++++++++++++++++
 runtime/doc/news.txt        |  1 +
 runtime/lua/vim/_editor.lua | 14 ++++++++++++++
 3 files changed, 32 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 8e68e9a792..c1c00df28e 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1404,6 +1404,23 @@ inspect({object}, {options})                                   *vim.inspect()*
       • https://github.com/kikito/inspect.lua
       • https://github.com/mpeterv/vinspect
 
+keycode({str})                                                 *vim.keycode()*
+    Translate keycodes.
+
+    Example: >lua
+      local k = vim.keycode
+      vim.g.mapleader = k'<bs>'
+<
+
+    Parameters: ~
+      • {str}  string String to be converted.
+
+    Return: ~
+        string
+
+    See also: ~
+      • |nvim_replace_termcodes()|
+
 lua_omnifunc({find_start}, {_})                           *vim.lua_omnifunc()*
     Omnifunc for completing lua values from from the runtime lua interpreter,
     similar to the builtin completion for the `:lua` command.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 3f07dd2e66..2a776ea30a 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -37,6 +37,7 @@ The following new APIs or features were added.
 
 • |vim.iter()| provides a generic iterator interface for tables and Lua
 iterators |luaref-in|.
+• Added |vim.keycode()| for translating keycodes in a string.
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index c922ec93db..20e813d77c 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -829,6 +829,20 @@ function vim.print(...)
   return ...
 end
 
+--- Translate keycodes.
+---
+--- Example:
+--- <pre>lua
+---   local k = vim.keycode
+---   vim.g.mapleader = k'<bs>'
+--- </pre>
+--- @param str string String to be converted.
+--- @return string
+--- @see |nvim_replace_termcodes()|
+function vim.keycode(str)
+  return vim.api.nvim_replace_termcodes(str, true, true, true)
+end
+
 function vim._cs_remote(rcid, server_addr, connect_error, args)
   local function connection_failure_errmsg(consequence)
     local explanation
-- 
cgit 


From 8af97ecefa71c6391a52ab799d354e058cb470be Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 26 Apr 2023 08:37:22 +0800
Subject: vim-patch:8.2.3314: behavior of exists() in a :def function is
 unpredictable (#23317)

Problem:    Behavior of exists() in a :def function is unpredictable.
Solution:   Add exists_compiled().

https://github.com/vim/vim/commit/267359902c8792fed13543ddeb56c6df0ae74957

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index d5607afdf5..1d0cb6ebc4 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -60,14 +60,14 @@ browse({save}, {title}, {initdir}, {default})
 				String	put up a file requester
 browsedir({title}, {initdir})	String	put up a directory requester
 bufadd({name})			Number	add a buffer to the buffer list
-bufexists({expr})		Number	|TRUE| if buffer {expr} exists
-buflisted({expr})		Number	|TRUE| if buffer {expr} is listed
-bufload({expr})			Number	load buffer {expr} if not loaded yet
-bufloaded({expr})		Number	|TRUE| if buffer {expr} is loaded
-bufname([{expr}])		String	Name of the buffer {expr}
-bufnr([{expr} [, {create}]])	Number	Number of the buffer {expr}
-bufwinid({expr})		Number	|window-ID| of buffer {expr}
-bufwinnr({expr})		Number	window number of buffer {expr}
+bufexists({buf})		Number	|TRUE| if buffer {buf} exists
+buflisted({buf})		Number	|TRUE| if buffer {buf} is listed
+bufload({buf})			Number	load buffer {buf} if not loaded yet
+bufloaded({buf})		Number	|TRUE| if buffer {buf} is loaded
+bufname([{buf}])		String	Name of the buffer {buf}
+bufnr([{buf} [, {create}]])	Number	Number of the buffer {buf}
+bufwinid({buf})			Number	window ID of buffer {buf}
+bufwinnr({buf})			Number	window number of buffer {buf}
 byte2line({byte})		Number	line number at byte count {byte}
 byteidx({expr}, {nr})		Number	byte index of {nr}th char in {expr}
 byteidxcomp({expr}, {nr})	Number	byte index of {nr}th char in {expr}
@@ -1971,7 +1971,7 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is
 		Can also be used as a |method|: >
 			Varname()->exists()
 
-exp({expr})						*exp()*
+exp({expr})							*exp()*
 		Return the exponential of {expr} as a |Float| in the range
 		[0, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
-- 
cgit 


From 191e8b40625731a652bade7000911554834afe5f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 26 Apr 2023 09:50:37 +0800
Subject: vim-patch:9.0.1485: no functions for converting from/to UTF-16 index
 (#23318)

Problem:    no functions for converting from/to UTF-16 index.
Solution:   Add UTF-16 flag to existing funtions and add strutf16len() and
            utf16idx(). (Yegappan Lakshmanan, closes vim/vim#12216)

https://github.com/vim/vim/commit/67672ef097dd708244ff042a8364994da2b91e75

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 98 ++++++++++++++++++++++++++++++++++++++++++++-----
 runtime/doc/eval.txt    | 26 +++++++++++++
 runtime/doc/usr_41.txt  |  2 +
 3 files changed, 116 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 1d0cb6ebc4..b37ac117f3 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -69,8 +69,10 @@ bufnr([{buf} [, {create}]])	Number	Number of the buffer {buf}
 bufwinid({buf})			Number	window ID of buffer {buf}
 bufwinnr({buf})			Number	window number of buffer {buf}
 byte2line({byte})		Number	line number at byte count {byte}
-byteidx({expr}, {nr})		Number	byte index of {nr}th char in {expr}
-byteidxcomp({expr}, {nr})	Number	byte index of {nr}th char in {expr}
+byteidx({expr}, {nr} [, {utf16}])
+				Number	byte index of {nr}th char in {expr}
+byteidxcomp({expr}, {nr} [, {utf16}])
+				Number	byte index of {nr}th char in {expr}
 call({func}, {arglist} [, {dict}])
 				any	call {func} with arguments {arglist}
 ceil({expr})			Float	round {expr} up
@@ -80,7 +82,7 @@ chansend({id}, {data})		Number	Writes {data} to channel
 char2nr({expr} [, {utf8}])	Number	ASCII/UTF-8 value of first char in {expr}
 charclass({string})		Number	character class of {string}
 charcol({expr} [, {winid}])	Number	column number of cursor or mark
-charidx({string}, {idx} [, {countcc}])
+charidx({string}, {idx} [, {countcc} [, {utf16}]])
 				Number	char index of byte {idx} in {string}
 chdir({dir})			String	change current working directory
 cindent({lnum})			Number	C indent for line {lnum}
@@ -501,6 +503,8 @@ strptime({format}, {timestring})
 strridx({haystack}, {needle} [, {start}])
 				Number	last index of {needle} in {haystack}
 strtrans({expr})		String	translate string to make it printable
+strutf16len({string} [, {countcc}])
+				Number	number of UTF-16 code units in {string}
 strwidth({expr})		Number	display cell length of the String {expr}
 submatch({nr} [, {list}])	String or List
 					specific match in ":s" or substitute()
@@ -545,6 +549,8 @@ undofile({name})		String	undo file name for {name}
 undotree()			List	undo file tree
 uniq({list} [, {func} [, {dict}]])
 				List	remove adjacent duplicates from a list
+utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
+				Number	UTF-16 index of byte {idx} in {string}
 values({dict})			List	values in {dict}
 virtcol({expr} [, {list}])	Number or List
 					screen column of cursor or mark
@@ -982,7 +988,7 @@ byte2line({byte})					*byte2line()*
 		Can also be used as a |method|: >
 			GetOffset()->byte2line()
 
-byteidx({expr}, {nr})					*byteidx()*
+byteidx({expr}, {nr} [, {utf16}])			*byteidx()*
 		Return byte index of the {nr}th character in the String
 		{expr}.  Use zero for the first character, it then returns
 		zero.
@@ -992,6 +998,13 @@ byteidx({expr}, {nr})					*byteidx()*
 		length is added to the preceding base character.  See
 		|byteidxcomp()| below for counting composing characters
 		separately.
+		When {utf16} is present and TRUE, {nr} is used as the UTF-16
+		index in the String {expr} instead of as the character index.
+		The UTF-16 index is the index in the string when it is encoded
+		with 16-bit words.  If the specified UTF-16 index is in the
+		middle of a character (e.g. in a 4-byte character), then the
+		byte index of the first byte in the character is returned.
+		Refer to |string-offset-encoding| for more information.
 		Example : >
 			echo matchstr(str, ".", byteidx(str, 3))
 <		will display the fourth character.  Another way to do the
@@ -1003,11 +1016,17 @@ byteidx({expr}, {nr})					*byteidx()*
 		If there are less than {nr} characters -1 is returned.
 		If there are exactly {nr} characters the length of the string
 		in bytes is returned.
-
+		See |charidx()| and |utf16idx()| for getting the character and
+		UTF-16 index respectively from the byte index.
+		Examples: >
+			echo byteidx('a😊😊', 2)	returns 5
+			echo byteidx('a😊😊', 2, 1)	returns 1
+			echo byteidx('a😊😊', 3, 1)	returns 5
+<
 		Can also be used as a |method|: >
 			GetName()->byteidx(idx)
 
-byteidxcomp({expr}, {nr})					*byteidxcomp()*
+byteidxcomp({expr}, {nr} [, {utf16}])			*byteidxcomp()*
 		Like byteidx(), except that a composing character is counted
 		as a separate character.  Example: >
 			let s = 'e' .. nr2char(0x301)
@@ -1131,27 +1150,36 @@ charcol({expr} [, {winid}])				*charcol()*
 			GetPos()->col()
 <
 							*charidx()*
-charidx({string}, {idx} [, {countcc}])
+charidx({string}, {idx} [, {countcc} [, {utf16}]])
 		Return the character index of the byte at {idx} in {string}.
 		The index of the first character is zero.
 		If there are no multibyte characters the returned value is
 		equal to {idx}.
+
 		When {countcc} is omitted or |FALSE|, then composing characters
-		are not counted separately, their byte length is
-		added to the preceding base character.
+		are not counted separately, their byte length is added to the
+		preceding base character.
 		When {countcc} is |TRUE|, then composing characters are
 		counted as separate characters.
+
+		When {utf16} is present and TRUE, {idx} is used as the UTF-16
+		index in the String {expr} instead of as the byte index.
+
 		Returns -1 if the arguments are invalid or if {idx} is greater
 		than the index of the last byte in {string}.  An error is
 		given if the first argument is not a string, the second
 		argument is not a number or when the third argument is present
 		and is not zero or one.
+
 		See |byteidx()| and |byteidxcomp()| for getting the byte index
-		from the character index.
+		from the character index and |utf16idx()| for getting the
+		UTF-16 index from the character index.
+		Refer to |string-offset-encoding| for more information.
 		Examples: >
 			echo charidx('áb́ć', 3)		returns 1
 			echo charidx('áb́ć', 6, 1)	returns 4
 			echo charidx('áb́ć', 16)		returns -1
+			echo charidx('a😊😊', 4, 0, 1)	returns 2
 <
 		Can also be used as a |method|: >
 			GetName()->charidx(idx)
@@ -8332,6 +8360,28 @@ strtrans({string})					*strtrans()*
 		Can also be used as a |method|: >
 			GetString()->strtrans()
 
+strutf16len({string} [, {countcc}])			*strutf16len()*
+		The result is a Number, which is the number of UTF-16 code
+		units in String {string} (after converting it to UTF-16).
+
+		When {countcc} is TRUE, composing characters are counted
+		separately.
+		When {countcc} is omitted or FALSE, composing characters are
+		ignored.
+
+		Returns zero on error.
+
+		Also see |strlen()| and |strcharlen()|.
+		Examples: >
+		    echo strutf16len('a')		returns 1
+		    echo strutf16len('©')		returns 1
+		    echo strutf16len('😊')		returns 2
+		    echo strutf16len('ą́')		returns 1
+		    echo strutf16len('ą́', v:true)	returns 3
+
+		Can also be used as a |method|: >
+			GetText()->strutf16len()
+<
 strwidth({string})					*strwidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies.  A Tab character is counted as one
@@ -9063,6 +9113,34 @@ uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
 
 		Can also be used as a |method|: >
 			mylist->uniq()
+<
+							*utf16idx()*
+utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
+		Same as |charidx()| but returns the UTF-16 index of the byte
+		at {idx} in {string} (after converting it to UTF-16).
+
+		When {charidx} is present and TRUE, {idx} is used as the
+		character index in the String {string} instead of as the byte
+		index.
+		An {idx} in the middle of a UTF-8 sequence is rounded upwards
+		to the end of that sequence.
+
+		See |byteidx()| and |byteidxcomp()| for getting the byte index
+		from the UTF-16 index and |charidx()| for getting the
+		character index from the UTF-16 index.
+		Refer to |string-offset-encoding| for more information.
+		Examples: >
+			echo utf16idx('a😊😊', 3)	returns 2
+			echo utf16idx('a😊😊', 7)	returns 4
+			echo utf16idx('a😊😊', 1, 0, 1)	returns 2
+			echo utf16idx('a😊😊', 2, 0, 1)	returns 4
+			echo utf16idx('aą́c', 6)		returns 2
+			echo utf16idx('aą́c', 6, 1)	returns 4
+			echo utf16idx('a😊😊', 9)	returns -1
+<
+		Can also be used as a |method|: >
+			GetName()->utf16idx(idx)
+
 
 values({dict})						*values()*
 		Return a |List| with all the values of {dict}.  The |List| is
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f80ca5346c..0c18fd5b4e 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1433,6 +1433,32 @@ Examples: >
 	echo $"The square root of {{9}} is {sqrt(9)}"
 <	The square root of {9} is 3.0 ~
 
+						*string-offset-encoding*
+A string consists of multiple characters.  UTF-8 uses one byte for ASCII
+characters, two bytes for other latin characters and more bytes for other
+characters.
+
+A string offset can count characters or bytes.  Other programs may use
+UTF-16 encoding (16-bit words) and an offset of UTF-16 words.  Some functions
+use byte offsets, usually for UTF-8 encoding.  Other functions use character
+offsets, in which case the encoding doesn't matter.
+
+The different offsets for the string "a©😊" are below:
+
+  UTF-8 offsets:
+      [0]: 61, [1]: C2, [2]: A9, [3]: F0, [4]: 9F, [5]: 98, [6]: 8A
+  UTF-16 offsets:
+      [0]: 0061, [1]: 00A9, [2]: D83D, [3]: DE0A
+  UTF-32 (character) offsets:
+      [0]: 00000061, [1]: 000000A9, [2]: 0001F60A
+
+You can use the "g8" and "ga" commands on a character to see the
+decimal/hex/octal values.
+
+The functions |byteidx()|, |utf16idx()| and |charidx()| can be used to convert
+between these indices.  The functions |strlen()|, |strutf16len()| and
+|strcharlen()| return the number of bytes, UTF-16 code units and characters in
+a string respectively.
 
 ------------------------------------------------------------------------------
 option						*expr-option* *E112* *E113*
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 89111535ca..8e1b72eadc 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -621,6 +621,7 @@ String manipulation:					*string-functions*
 	strlen()		length of a string in bytes
 	strcharlen()		length of a string in characters
 	strchars()		number of characters in a string
+	strutf16len()		number of UTF-16 code units in a string
 	strwidth()		size of string when displayed
 	strdisplaywidth()	size of string when displayed, deals with tabs
 	setcellwidths()		set character cell width overrides
@@ -636,6 +637,7 @@ String manipulation:					*string-functions*
 	byteidx()		byte index of a character in a string
 	byteidxcomp()		like byteidx() but count composing characters
 	charidx()		character index of a byte in a string
+	utf16idx()		UTF-16 index of a byte in a string
 	repeat()		repeat a string multiple times
 	eval()			evaluate a string expression
 	execute()		execute an Ex command and get the output
-- 
cgit 


From 45bcf8386918bbb475fbe20c48b508aa89ed0624 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Thu, 20 Apr 2023 13:19:38 +0200
Subject: refactor(build): include lpeg as a library

---
 runtime/doc/lua.txt                |   8 ++
 runtime/lua/vim/_init_packages.lua |   1 +
 runtime/lua/vim/re.lua             | 269 +++++++++++++++++++++++++++++++++++++
 3 files changed, 278 insertions(+)
 create mode 100644 runtime/lua/vim/re.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 9d4272c906..b3be11efdb 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -648,6 +648,14 @@ regex:match_line({bufnr}, {line_idx} [, {start}, {end}])  *regex:match_line()*
     |regex:match_str()|. If {start} is used, then the returned byte indices
     will be relative {start}.
 
+------------------------------------------------------------------------------
+VIM.LPEG                                                            *lua-lpeg*
+
+                                                             *vim.lpeg* *vim.re*
+The Lpeg library for parsing expression grammars is being included as
+`vim.lpeg` (https://www.inf.puc-rio.br/~roberto/lpeg/). In addition, its regex-like
+interface is available as `vim.re` (https://www.inf.puc-rio.br/~roberto/lpeg/re.html).
+
 ------------------------------------------------------------------------------
 VIM.DIFF                                                            *lua-diff*
 
diff --git a/runtime/lua/vim/_init_packages.lua b/runtime/lua/vim/_init_packages.lua
index 5db258c011..8750afba34 100644
--- a/runtime/lua/vim/_init_packages.lua
+++ b/runtime/lua/vim/_init_packages.lua
@@ -56,6 +56,7 @@ vim._submodules = {
   version = true,
   fs = true,
   iter = true,
+  re = true,
 }
 
 -- These are for loading runtime modules in the vim namespace lazily.
diff --git a/runtime/lua/vim/re.lua b/runtime/lua/vim/re.lua
new file mode 100644
index 0000000000..dffe37186a
--- /dev/null
+++ b/runtime/lua/vim/re.lua
@@ -0,0 +1,269 @@
+-- $Id: re.lua $
+-- vendored from lpeg-1.0.2
+-- Copyright © 2007-2019 Lua.org, PUC-Rio.
+
+-- imported functions and modules
+local tonumber, type, print, error = tonumber, type, print, error
+local setmetatable = setmetatable
+local m = require"lpeg"
+
+-- 'm' will be used to parse expressions, and 'mm' will be used to
+-- create expressions; that is, 're' runs on 'm', creating patterns
+-- on 'mm'
+local mm = m
+
+-- pattern's metatable
+local mt = getmetatable(mm.P(0))
+
+
+
+-- No more global accesses after this point
+local version = _VERSION
+if version == "Lua 5.2" then _ENV = nil end
+
+
+local any = m.P(1)
+
+
+-- Pre-defined names
+local Predef = { nl = m.P"\n" }
+
+
+local mem
+local fmem
+local gmem
+
+
+local function updatelocale ()
+  mm.locale(Predef)
+  Predef.a = Predef.alpha
+  Predef.c = Predef.cntrl
+  Predef.d = Predef.digit
+  Predef.g = Predef.graph
+  Predef.l = Predef.lower
+  Predef.p = Predef.punct
+  Predef.s = Predef.space
+  Predef.u = Predef.upper
+  Predef.w = Predef.alnum
+  Predef.x = Predef.xdigit
+  Predef.A = any - Predef.a
+  Predef.C = any - Predef.c
+  Predef.D = any - Predef.d
+  Predef.G = any - Predef.g
+  Predef.L = any - Predef.l
+  Predef.P = any - Predef.p
+  Predef.S = any - Predef.s
+  Predef.U = any - Predef.u
+  Predef.W = any - Predef.w
+  Predef.X = any - Predef.x
+  mem = {}    -- restart memoization
+  fmem = {}
+  gmem = {}
+  local mt = {__mode = "v"}
+  setmetatable(mem, mt)
+  setmetatable(fmem, mt)
+  setmetatable(gmem, mt)
+end
+
+
+updatelocale()
+
+
+
+local I = m.P(function (s,i) print(i, s:sub(1, i-1)); return i end)
+
+
+local function patt_error (s, i)
+  local msg = (#s < i + 20) and s:sub(i)
+                             or s:sub(i,i+20) .. "..."
+  msg = ("pattern error near '%s'"):format(msg)
+  error(msg, 2)
+end
+
+local function mult (p, n)
+  local np = mm.P(true)
+  while n >= 1 do
+    if n%2 >= 1 then np = np * p end
+    p = p * p
+    n = n/2
+  end
+  return np
+end
+
+local function equalcap (s, i, c)
+  if type(c) ~= "string" then return nil end
+  local e = #c + i
+  if s:sub(i, e - 1) == c then return e else return nil end
+end
+
+
+local S = (Predef.space + "--" * (any - Predef.nl)^0)^0
+
+local name = m.R("AZ", "az", "__") * m.R("AZ", "az", "__", "09")^0
+
+local arrow = S * "<-"
+
+local seq_follow = m.P"/" + ")" + "}" + ":}" + "~}" + "|}" + (name * arrow) + -1
+
+name = m.C(name)
+
+
+-- a defined name only have meaning in a given environment
+local Def = name * m.Carg(1)
+
+
+local function getdef (id, defs)
+  local c = defs and defs[id]
+  if not c then error("undefined name: " .. id) end
+  return c
+end
+
+-- match a name and return a group of its corresponding definition
+-- and 'f' (to be folded in 'Suffix')
+local function defwithfunc (f)
+  return m.Cg(Def / getdef * m.Cc(f))
+end
+
+
+local num = m.C(m.R"09"^1) * S / tonumber
+
+local String = "'" * m.C((any - "'")^0) * "'" +
+               '"' * m.C((any - '"')^0) * '"'
+
+
+local defined = "%" * Def / function (c,Defs)
+  local cat =  Defs and Defs[c] or Predef[c]
+  if not cat then error ("name '" .. c .. "' undefined") end
+  return cat
+end
+
+local Range = m.Cs(any * (m.P"-"/"") * (any - "]")) / mm.R
+
+local item = (defined + Range + m.C(any)) / m.P
+
+local Class =
+    "["
+  * (m.C(m.P"^"^-1))    -- optional complement symbol
+  * m.Cf(item * (item - "]")^0, mt.__add) /
+                          function (c, p) return c == "^" and any - p or p end
+  * "]"
+
+local function adddef (t, k, exp)
+  if t[k] then
+    error("'"..k.."' already defined as a rule")
+  else
+    t[k] = exp
+  end
+  return t
+end
+
+local function firstdef (n, r) return adddef({n}, n, r) end
+
+
+local function NT (n, b)
+  if not b then
+    error("rule '"..n.."' used outside a grammar")
+  else return mm.V(n)
+  end
+end
+
+
+local exp = m.P{ "Exp",
+  Exp = S * ( m.V"Grammar"
+            + m.Cf(m.V"Seq" * ("/" * S * m.V"Seq")^0, mt.__add) );
+  Seq = m.Cf(m.Cc(m.P"") * m.V"Prefix"^0 , mt.__mul)
+        * (#seq_follow + patt_error);
+  Prefix = "&" * S * m.V"Prefix" / mt.__len
+         + "!" * S * m.V"Prefix" / mt.__unm
+         + m.V"Suffix";
+  Suffix = m.Cf(m.V"Primary" * S *
+          ( ( m.P"+" * m.Cc(1, mt.__pow)
+            + m.P"*" * m.Cc(0, mt.__pow)
+            + m.P"?" * m.Cc(-1, mt.__pow)
+            + "^" * ( m.Cg(num * m.Cc(mult))
+                    + m.Cg(m.C(m.S"+-" * m.R"09"^1) * m.Cc(mt.__pow))
+                    )
+            + "->" * S * ( m.Cg((String + num) * m.Cc(mt.__div))
+                         + m.P"{}" * m.Cc(nil, m.Ct)
+                         + defwithfunc(mt.__div)
+                         )
+            + "=>" * S * defwithfunc(m.Cmt)
+            + "~>" * S * defwithfunc(m.Cf)
+            ) * S
+          )^0, function (a,b,f) return f(a,b) end );
+  Primary = "(" * m.V"Exp" * ")"
+            + String / mm.P
+            + Class
+            + defined
+            + "{:" * (name * ":" + m.Cc(nil)) * m.V"Exp" * ":}" /
+                     function (n, p) return mm.Cg(p, n) end
+            + "=" * name / function (n) return mm.Cmt(mm.Cb(n), equalcap) end
+            + m.P"{}" / mm.Cp
+            + "{~" * m.V"Exp" * "~}" / mm.Cs
+            + "{|" * m.V"Exp" * "|}" / mm.Ct
+            + "{" * m.V"Exp" * "}" / mm.C
+            + m.P"." * m.Cc(any)
+            + (name * -arrow + "<" * name * ">") * m.Cb("G") / NT;
+  Definition = name * arrow * m.V"Exp";
+  Grammar = m.Cg(m.Cc(true), "G") *
+            m.Cf(m.V"Definition" / firstdef * m.Cg(m.V"Definition")^0,
+              adddef) / mm.P
+}
+
+local pattern = S * m.Cg(m.Cc(false), "G") * exp / mm.P * (-any + patt_error)
+
+
+local function compile (p, defs)
+  if mm.type(p) == "pattern" then return p end   -- already compiled
+  local cp = pattern:match(p, 1, defs)
+  if not cp then error("incorrect pattern", 3) end
+  return cp
+end
+
+local function match (s, p, i)
+  local cp = mem[p]
+  if not cp then
+    cp = compile(p)
+    mem[p] = cp
+  end
+  return cp:match(s, i or 1)
+end
+
+local function find (s, p, i)
+  local cp = fmem[p]
+  if not cp then
+    cp = compile(p) / 0
+    cp = mm.P{ mm.Cp() * cp * mm.Cp() + 1 * mm.V(1) }
+    fmem[p] = cp
+  end
+  local i, e = cp:match(s, i or 1)
+  if i then return i, e - 1
+  else return i
+  end
+end
+
+local function gsub (s, p, rep)
+  local g = gmem[p] or {}   -- ensure gmem[p] is not collected while here
+  gmem[p] = g
+  local cp = g[rep]
+  if not cp then
+    cp = compile(p)
+    cp = mm.Cs((cp / rep + 1)^0)
+    g[rep] = cp
+  end
+  return cp:match(s)
+end
+
+
+-- exported names
+local re = {
+  compile = compile,
+  match = match,
+  find = find,
+  gsub = gsub,
+  updatelocale = updatelocale,
+}
+
+if version == "Lua 5.1" then _G.re = re end
+
+return re
-- 
cgit 


From 4b3fdf321c25557423e2b87231999577f939af68 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 27 Apr 2023 13:05:26 +0200
Subject: docs(lsp): remove obsolete lsp-extension example (#23346)

This example is made obsolete by the addition of `vim.lsp.start()` and
`vim.fs` (whose use is already documented in `:h lsp-quickstart`).
---
 runtime/doc/lsp-extension.txt | 129 ------------------------------------------
 1 file changed, 129 deletions(-)
 delete mode 100644 runtime/doc/lsp-extension.txt

(limited to 'runtime')

diff --git a/runtime/doc/lsp-extension.txt b/runtime/doc/lsp-extension.txt
deleted file mode 100644
index fe72e9eb18..0000000000
--- a/runtime/doc/lsp-extension.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-*lsp-extension.txt*   LSP Extension
-
-                            NVIM REFERENCE MANUAL
-
-
-The `vim.lsp` Lua module is a framework for building LSP plugins.
-
-  1. Start with |vim.lsp.start_client()| and |vim.lsp.buf_attach_client()|.
-  2. Peek at the API: >vim
-       :lua print(vim.inspect(vim.lsp))
-<  3. See |lsp-extension-example| for a full example.
-
-================================================================================
-LSP EXAMPLE                                            *lsp-extension-example*
-
-This example is for plugin authors or users who want a lot of control. If you
-are just getting started see |lsp-quickstart|.
-
-For more advanced configurations where just filtering by filetype isn't
-sufficient, you can use the `vim.lsp.start_client()` and
-`vim.lsp.buf_attach_client()` commands to easily customize the configuration
-however you please. For example, if you want to do your own filtering, or
-start a new LSP client based on the root directory for working with multiple
-projects in a single session. To illustrate, the following is a fully working
-Lua example.
-
-The example will:
-1. Check for each new buffer whether or not we want to start an LSP client.
-2. Try to find a root directory by ascending from the buffer's path.
-3. Create a new LSP for that root directory if one doesn't exist.
-4. Attach the buffer to the client for that root directory.
-
->lua
-  -- Some path manipulation utilities
-  local function is_dir(filename)
-    local stat = vim.loop.fs_stat(filename)
-    return stat and stat.type == 'directory' or false
-  end
-
-  local path_sep = vim.loop.os_uname().sysname == "Windows" and "\\" or "/"
-  -- Assumes filepath is a file.
-  local function dirname(filepath)
-    local is_changed = false
-    local result = filepath:gsub(path_sep.."([^"..path_sep.."]+)$", function()
-      is_changed = true
-      return ""
-    end)
-    return result, is_changed
-  end
-
-  local function path_join(...)
-    return table.concat(vim.tbl_flatten {...}, path_sep)
-  end
-
-  -- Ascend the buffer's path until we find the rootdir.
-  -- is_root_path is a function which returns bool
-  local function buffer_find_root_dir(bufnr, is_root_path)
-    local bufname = vim.api.nvim_buf_get_name(bufnr)
-    if vim.fn.filereadable(bufname) == 0 then
-      return nil
-    end
-    local dir = bufname
-    -- Just in case our algorithm is buggy, don't infinite loop.
-    for _ = 1, 100 do
-      local did_change
-      dir, did_change = dirname(dir)
-      if is_root_path(dir, bufname) then
-        return dir, bufname
-      end
-      -- If we can't ascend further, then stop looking.
-      if not did_change then
-        return nil
-      end
-    end
-  end
-
-  -- A table to store our root_dir to client_id lookup. We want one LSP per
-  -- root directory, and this is how we assert that.
-  local javascript_lsps = {}
-  -- Which filetypes we want to consider.
-  local javascript_filetypes = {
-    ["javascript.jsx"] = true;
-    ["javascript"]     = true;
-    ["typescript"]     = true;
-    ["typescript.jsx"] = true;
-  }
-
-  -- Create a template configuration for a server to start, minus the root_dir
-  -- which we will specify later.
-  local javascript_lsp_config = {
-    name = "javascript";
-    cmd = { path_join(os.getenv("JAVASCRIPT_LANGUAGE_SERVER_DIRECTORY"), "lib", "language-server-stdio.js") };
-  }
-
-  -- This needs to be global so that we can call it from the autocmd.
-  function check_start_javascript_lsp()
-    local bufnr = vim.api.nvim_get_current_buf()
-    -- Filter which files we are considering.
-    if not javascript_filetypes[vim.api.nvim_buf_get_option(bufnr, 'filetype')] then
-      return
-    end
-    -- Try to find our root directory. We will define this as a directory which contains
-    -- node_modules. Another choice would be to check for `package.json`, or for `.git`.
-    local root_dir = buffer_find_root_dir(bufnr, function(dir)
-      return is_dir(path_join(dir, 'node_modules'))
-      -- return vim.fn.filereadable(path_join(dir, 'package.json')) == 1
-      -- return is_dir(path_join(dir, '.git'))
-    end)
-    -- We couldn't find a root directory, so ignore this file.
-    if not root_dir then return end
-
-    -- Check if we have a client already or start and store it.
-    local client_id = javascript_lsps[root_dir]
-    if not client_id then
-      local new_config = vim.tbl_extend("error", javascript_lsp_config, {
-        root_dir = root_dir;
-      })
-      client_id = vim.lsp.start_client(new_config)
-      javascript_lsps[root_dir] = client_id
-    end
-    -- Finally, attach to the buffer to track changes. This will do nothing if we
-    -- are already attached.
-    vim.lsp.buf_attach_client(bufnr, client_id)
-  end
-
-  vim.api.nvim_command [[autocmd BufReadPost * lua check_start_javascript_lsp()]]
-<
-
- vim:tw=78:ts=8:ft=help:norl:
-- 
cgit 


From eb4676c67f5dd54bcda473783315901a3444b40b Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 27 Apr 2023 17:30:22 +0100
Subject: fix: disallow removing extmarks in on_lines callbacks (#23219)

fix(extmarks): disallow removing extmarks in on_lines callbacks

decor_redraw_start (which runs before decor_providers_invoke_lines) gets
references for the extmarks on a specific line. If these extmarks are
deleted in on_lines callbacks then this results in a heap-use-after-free
error.

Fixes #22801
---
 runtime/doc/api.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index d63563cc05..8d7253a754 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2763,11 +2763,14 @@ nvim_set_decoration_provider({ns_id}, {*opts})
     for the extmarks set/modified inside the callback anyway.
 
     Note: doing anything other than setting extmarks is considered
-    experimental. Doing things like changing options are not expliticly
+    experimental. Doing things like changing options are not explicitly
     forbidden, but is likely to have unexpected consequences (such as 100% CPU
     consumption). doing `vim.rpcnotify` should be OK, but `vim.rpcrequest` is
     quite dubious for the moment.
 
+    Note: It is not allowed to remove or update extmarks in 'on_line'
+    callbacks.
+
     Attributes: ~
         Lua |vim.api| only
 
-- 
cgit 


From 715587f8e44e941ece6f17eb77620fd1b4719496 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 28 Apr 2023 21:07:00 +0800
Subject: vim-patch:8.2.3509: undo file is not synced (#23371)

Problem:    Undo file is not synced. (Sami Farin)
Solution:   Sync the undo file if 'fsync' is set. (Christian Brabandt,
            closes vim/vim#8879, closes vim/vim#8920)

https://github.com/vim/vim/commit/340dd0fbe462a15a9678cfba02085b4adcc45f02

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/options.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0aa6769f4e..ba73d79cd3 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2774,8 +2774,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'fsync' 'fs'		boolean	(default off)
 			global
 	When on, the OS function fsync() will be called after saving a file
-	(|:write|, |writefile()|, …), |swap-file| and |shada-file|. This
-	flushes the file to disk, ensuring that it is safely written.
+	(|:write|, |writefile()|, …), |swap-file|, |undo-persistence| and |shada-file|.
+	This flushes the file to disk, ensuring that it is safely written.
 	Slow on some systems: writing buffers, quitting Nvim, and other
 	operations may sometimes take a few seconds.
 
-- 
cgit 


From ef1801cc7c3d8fe9fd8524a3b677095d4437fc66 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Fri, 28 Apr 2023 11:37:53 -0600
Subject: perf(iter): reduce number of table allocations

Packing and unpacking return values impairs performance considerably.
In an attempt to avoid creating tables as much as possible we can
instead pass return values between functions (which does not require
knowing the number of values a function might return). This makes the
code more complex, but improves benchmark numbers non-trivially.
---
 runtime/doc/lua.txt      |   2 +-
 runtime/lua/vim/iter.lua | 164 +++++++++++++++++++++++++++++------------------
 2 files changed, 103 insertions(+), 63 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index b3be11efdb..e36ff9d8d8 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3080,7 +3080,7 @@ Iter:map({self}, {f})                                             *Iter:map()*
       • {f}  function(...):any Mapping function. Takes all values returned
              from the previous stage in the pipeline as arguments and returns
              one or more new values, which are used in the next pipeline
-             stage. Nil return values returned are filtered from the output.
+             stage. Nil return values are filtered from the output.
 
     Return: ~
         Iter
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index c2e2c5bd9f..bda3508262 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -1,13 +1,14 @@
 ---@defgroup lua-iter
 ---
---- The \*vim.iter\* module provides a generic "iterator" interface over tables and iterator
---- functions.
+--- The \*vim.iter\* module provides a generic "iterator" interface over tables
+--- and iterator functions.
 ---
---- \*vim.iter()\* wraps its table or function argument into an \*Iter\* object with methods (such
---- as |Iter:filter()| and |Iter:map()|) that transform the underlying source data. These methods
---- can be chained together to create iterator "pipelines". Each pipeline stage receives as input
---- the output values from the prior stage. The values used in the first stage of the pipeline
---- depend on the type passed to this function:
+--- \*vim.iter()\* wraps its table or function argument into an \*Iter\* object
+--- with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
+--- underlying source data. These methods can be chained together to create
+--- iterator "pipelines". Each pipeline stage receives as input the output
+--- values from the prior stage. The values used in the first stage of the
+--- pipeline depend on the type passed to this function:
 ---
 --- - List tables pass only the value of each element
 --- - Non-list tables pass both the key and value of each element
@@ -47,8 +48,8 @@
 ---   -- true
 --- </pre>
 ---
---- In addition to the |vim.iter()| function, the |vim.iter| module provides convenience functions
---- like |vim.iter.filter()| and |vim.iter.totable()|.
+--- In addition to the |vim.iter()| function, the |vim.iter| module provides
+--- convenience functions like |vim.iter.filter()| and |vim.iter.totable()|.
 
 local M = {}
 
@@ -61,9 +62,9 @@ end
 
 --- Special case implementations for iterators on list tables.
 ---@class ListIter : Iter
----@field _table table Underlying table data (table iterators only)
----@field _head number Index to the front of a table iterator (table iterators only)
----@field _tail number Index to the end of a table iterator (table iterators only)
+---@field _table table Underlying table data
+---@field _head number Index to the front of a table iterator
+---@field _tail number Index to the end of a table iterator
 local ListIter = {}
 ListIter.__index = setmetatable(ListIter, Iter)
 ListIter.__call = function(self)
@@ -75,7 +76,7 @@ local packedmt = {}
 
 ---@private
 local function unpack(t)
-  if getmetatable(t) == packedmt then
+  if type(t) == 'table' and getmetatable(t) == packedmt then
     return _G.unpack(t, 1, t.n)
   end
   return t
@@ -92,13 +93,47 @@ end
 
 ---@private
 local function sanitize(t)
-  if getmetatable(t) == packedmt then
+  if type(t) == 'table' and getmetatable(t) == packedmt then
     -- Remove length tag
     t.n = nil
   end
   return t
 end
 
+--- Determine if the current iterator stage should continue.
+---
+--- If any arguments are passed to this function, then return those arguments
+--- and stop the current iterator stage. Otherwise, return true to signal that
+--- the current stage should continue.
+---
+---@param ... any Function arguments.
+---@return boolean True if the iterator stage should continue, false otherwise
+---@return any Function arguments.
+---@private
+local function continue(...)
+  if select('#', ...) > 0 then
+    return false, ...
+  end
+  return true
+end
+
+--- If no input arguments are given return false, indicating the current
+--- iterator stage should stop. Otherwise, apply the arguments to the function
+--- f. If that function returns no values, the current iterator stage continues.
+--- Otherwise, those values are returned.
+---
+---@param f function Function to call with the given arguments
+---@param ... any Arguments to apply to f
+---@return boolean True if the iterator pipeline should continue, false otherwise
+---@return any Return values of f
+---@private
+local function apply(f, ...)
+  if select('#', ...) > 0 then
+    return continue(f(...))
+  end
+  return false
+end
+
 --- Add a filter step to the iterator pipeline.
 ---
 --- Example:
@@ -106,33 +141,16 @@ end
 --- local bufs = vim.iter(vim.api.nvim_list_bufs()):filter(vim.api.nvim_buf_is_loaded)
 --- </pre>
 ---
----@param f function(...):bool Takes all values returned from the previous stage in the pipeline and
----                            returns false or nil if the current iterator element should be
----                            removed.
+---@param f function(...):bool Takes all values returned from the previous stage
+---                            in the pipeline and returns false or nil if the
+---                            current iterator element should be removed.
 ---@return Iter
 function Iter.filter(self, f)
-  ---@private
-  local function fn(...)
-    local result = nil
-    if select(1, ...) ~= nil then
-      if not f(...) then
-        return true, nil
-      else
-        result = pack(...)
-      end
+  return self:map(function(...)
+    if f(...) then
+      return ...
     end
-    return false, result
-  end
-
-  local next = self.next
-  self.next = function(this)
-    local cont, result
-    repeat
-      cont, result = fn(next(this))
-    until not cont
-    return unpack(result)
-  end
-  return self
+  end)
 end
 
 ---@private
@@ -165,31 +183,52 @@ end
 --- -- { 6, 12 }
 --- </pre>
 ---
----@param f function(...):any Mapping function. Takes all values returned from the previous stage
----                            in the pipeline as arguments and returns one or more new values,
----                            which are used in the next pipeline stage. Nil return values returned
----                            are filtered from the output.
+---@param f function(...):any Mapping function. Takes all values returned from
+---                           the previous stage in the pipeline as arguments
+---                           and returns one or more new values, which are used
+---                           in the next pipeline stage. Nil return values
+---                           are filtered from the output.
 ---@return Iter
 function Iter.map(self, f)
+  -- Implementation note: the reader may be forgiven for observing that this
+  -- function appears excessively convoluted. The problem to solve is that each
+  -- stage of the iterator pipeline can return any number of values, and the
+  -- number of values could even change per iteration. And the return values
+  -- must be checked to determine if the pipeline has ended, so we cannot
+  -- naively forward them along to the next stage.
+  --
+  -- A simple approach is to pack all of the return values into a table, check
+  -- for nil, then unpack the table for the next stage. However, packing and
+  -- unpacking tables is quite slow. There is no other way in Lua to handle an
+  -- unknown number of function return values than to simply forward those
+  -- values along to another function. Hence the intricate function passing you
+  -- see here.
+
+  local next = self.next
+
+  --- Drain values from the upstream iterator source until a value can be
+  --- returned.
+  ---
+  --- This is a recursive function. The base case is when the first argument is
+  --- false, which indicates that the rest of the arguments should be returned
+  --- as the values for the current iteration stage.
+  ---
+  ---@param cont boolean If true, the current iterator stage should continue to
+  ---                    pull values from its upstream pipeline stage.
+  ---                    Otherwise, this stage is complete and returns the
+  ---                    values passed.
+  ---@param ... any Values to return if cont is false.
+  ---@return any
   ---@private
-  local function fn(...)
-    local result = nil
-    if select(1, ...) ~= nil then
-      result = pack(f(...))
-      if result == nil then
-        return true, nil
-      end
+  local function fn(cont, ...)
+    if cont then
+      return fn(apply(f, next(self)))
     end
-    return false, result
+    return ...
   end
 
-  local next = self.next
-  self.next = function(this)
-    local cont, result
-    repeat
-      cont, result = fn(next(this))
-    until not cont
-    return unpack(result)
+  self.next = function()
+    return fn(apply(f, next(self)))
   end
   return self
 end
@@ -211,17 +250,18 @@ end
 
 --- Call a function once for each item in the pipeline.
 ---
---- This is used for functions which have side effects. To modify the values in the iterator, use
---- |Iter:map()|.
+--- This is used for functions which have side effects. To modify the values in
+--- the iterator, use |Iter:map()|.
 ---
 --- This function drains the iterator.
 ---
----@param f function(...) Function to execute for each item in the pipeline. Takes all of the
----                        values returned by the previous stage in the pipeline as arguments.
+---@param f function(...) Function to execute for each item in the pipeline.
+---                       Takes all of the values returned by the previous stage
+---                       in the pipeline as arguments.
 function Iter.each(self, f)
   ---@private
   local function fn(...)
-    if select(1, ...) ~= nil then
+    if select('#', ...) > 0 then
       f(...)
       return true
     end
-- 
cgit 


From 4bcf8c15b3079ca72d6557890b50b35565fcd577 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 29 Apr 2023 08:12:32 +0800
Subject: vim-patch:8.2.0578: heredoc for interfaces does not support "trim"

Problem:    Heredoc for interfaces does not support "trim".
Solution:   Update the script heredoc support to be same as the :let command.
            (Yegappan Lakshmanan, closes vim/vim#5916)

https://github.com/vim/vim/commit/6c2b7b8055b96463f78abb70f58c4c6d6d4b9d55
---
 runtime/doc/if_perl.txt |  2 +-
 runtime/doc/if_pyth.txt | 11 +++++------
 runtime/doc/if_ruby.txt |  8 ++++----
 runtime/doc/lua.txt     |  8 ++++----
 4 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index e4ec6dcf45..c3b49dc5bb 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -19,7 +19,7 @@ See |provider-perl| for more information.
 			working: >
 				:perl print "Hello"
 
-:[range]perl << [endmarker]
+:[range]perl << [trim] [{endmarker}]
 {script}
 {endmarker}
 			Execute perl script {script}.
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 45accc2e03..415a58ec71 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -19,17 +19,16 @@ Commands						*python-commands*
 			the `:python` command is working: >vim
 				:python print "Hello"
 
-:[range]py[thon] << [endmarker]
+:[range]py[thon] << [trim] [{endmarker}]
 {script}
 {endmarker}
 			Execute Python script {script}.  Useful for including
 			python code in Vim scripts.  Requires Python, see
 			|script-here|.
 
-The {endmarker} below the {script} must NOT be preceded by any white space.
-
 If [endmarker] is omitted from after the "<<", a dot '.' must be used after
-{script}, like for the |:append| and |:insert| commands.
+{script}, like for the |:append| and |:insert| commands.  Refer to
+|:let-heredoc| for more information.
 
 Example: >vim
 	function! IcecreamInitialize()
@@ -597,12 +596,12 @@ variants explicitly if Python 3 is required.
 
 							*:py3* *:python3*
 :[range]py3 {stmt}
-:[range]py3 << [endmarker]
+:[range]py3 << [trim] [{endmarker}]
 {script}
 {endmarker}
 
 :[range]python3 {stmt}
-:[range]python3 << [endmarker]
+:[range]python3 << [trim] [{endmarker}]
 {script}
 {endmarker}
 	The `:py3` and `:python3` commands work similar to `:python`.  A
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index d88f59eb73..a5aaac1a5f 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -19,15 +19,15 @@ downloading Ruby there.
 :rub[y] {cmd}		Execute Ruby command {cmd}.  A command to try it out: >
 				:ruby print "Hello"
 
-:rub[y] << [endmarker]
+:rub[y] << [trim] [{endmarker}]
 {script}
 {endmarker}
 			Execute Ruby script {script}.
-			The {endmarker} after {script} must NOT be preceded by
-			any white space.
 
 			If [endmarker] is omitted, it defaults to a dot '.'
-			like for the |:append| and |:insert| commands.
+			like for the |:append| and |:insert| commands.  Refer
+			to |:let-heredoc| for more information.
+
 
 			This form of the |:ruby| command is mainly useful for
 			including ruby code in vim scripts.
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index b3be11efdb..465c83e6ab 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -247,12 +247,12 @@ arguments separated by " " (space) instead of "\t" (tab).
         :lua =jit.version
 <
                                                                 *:lua-heredoc*
-:lua << [endmarker]
+:lua << [trim] [{endmarker}]
 {script}
 {endmarker}
-    Executes Lua script {script} from within Vimscript. {endmarker} must NOT
-    be preceded by whitespace. You can omit [endmarker] after the "<<" and use
-    a dot "." after {script} (similar to |:append|, |:insert|).
+    Executes Lua script {script} from within Vimscript. You can omit
+    [endmarker] after the "<<" and use a dot "." after {script} (similar to
+    |:append|, |:insert|). Refer to |let-heredoc| for more information.
 
     Example: >vim
         function! CurrentLineInfo()
-- 
cgit 


From c194acbfc479d8e5839fa629363f93f6550d035c Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Sat, 29 Apr 2023 18:22:26 +0200
Subject: feat(treesitter): add query_linter from nvim-treesitter/playground
 (#22784)

Co-authored-by: clason <clason@users.noreply.github.com>
Co-authored-by: lewis6991 <lewis6991@users.noreply.github.com>
---
 runtime/doc/filetype.txt                     |  14 ++
 runtime/doc/news.txt                         |   6 +
 runtime/doc/treesitter.txt                   |  22 ++
 runtime/ftplugin/query.lua                   |  26 ++-
 runtime/lua/vim/treesitter/_query_linter.lua | 302 +++++++++++++++++++++++++++
 runtime/lua/vim/treesitter/playground.lua    |   1 +
 runtime/lua/vim/treesitter/query.lua         |  29 +++
 7 files changed, 399 insertions(+), 1 deletion(-)
 create mode 100644 runtime/lua/vim/treesitter/_query_linter.lua

(limited to 'runtime')

diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index f69ffeabfe..175c531950 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -663,6 +663,20 @@ To disable this behavior, set the following variable in your vimrc: >
 
 	let g:python_recommended_style = 0
 
+QUERY					                *ft-query-plugin*
+
+
+Linting of tree-sitter queries for installed parsers using
+|lua-treesitter-query_linter| is enabled by default on
+`BufEnter` and `BufWrite`. To change the events that
+trigger linting, use >lua
+
+	vim.g.query_lint_on = { 'InsertLeave', 'TextChanged' }
+<
+To disable linting completely, set >lua
+
+	vim.g.query_lint_on = {}
+<
 
 QF QUICKFIX					    *qf.vim* *ft-qf-plugin*
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 2a776ea30a..c343525a09 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -39,6 +39,12 @@ The following new APIs or features were added.
 iterators |luaref-in|.
 • Added |vim.keycode()| for translating keycodes in a string.
 
+• Added automatic linting of treesitter query files (see |ft-query-plugin|).
+  Automatic linting can be turned off via >lua
+	vim.g.query_lint_on = {}
+<
+• Enabled treesitter highlighting for treesitter query files by default.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index dc1afe89f8..32c97ce3ad 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -841,6 +841,28 @@ get_files({lang}, {query_name}, {is_included})
         string[] query_files List of files to load for given query and
         language
 
+lint({buf}, {opts})                              *vim.treesitter.query.lint()*
+    Lint treesitter queries using installed parser, or clear lint errors.
+
+    Use |treesitter-parsers| in runtimepath to check the query file in {buf}
+    for errors:
+
+    • verify that used nodes are valid identifiers in the grammar.
+    • verify that predicates and directives are valid.
+    • verify that top-level s-expressions are valid.
+
+    The found diagnostics are reported using |diagnostic-api|. By default, the
+    parser used for verification is determined by the containing folder of the
+    query file, e.g., if the path is `**/lua/highlights.scm` , the parser for the `lua` language will be used.
+
+    Parameters: ~
+      • {buf}   (integer) Buffer handle
+      • {opts}  (QueryLinterOpts|nil) Optional keyword arguments:
+                • langs (string|string[]|nil) Language(s) to use for checking
+                  the query. If multiple languages are specified, queries are
+                  validated for all of them
+                • clear (boolean) if `true`, just clear current lint errors
+
 list_directives()                     *vim.treesitter.query.list_directives()*
     Lists the currently available directives to use in queries.
 
diff --git a/runtime/ftplugin/query.lua b/runtime/ftplugin/query.lua
index 3b99d67247..842d338fd9 100644
--- a/runtime/ftplugin/query.lua
+++ b/runtime/ftplugin/query.lua
@@ -1,6 +1,30 @@
 -- Neovim filetype plugin file
 -- Language:	Tree-sitter query
--- Last Change:	2022 Mar 29
+-- Last Change:	2022 Apr 25
+
+if vim.b.did_ftplugin == 1 then
+  return
+end
+
+-- Do not set vim.b.did_ftplugin = 1 to allow loading of ftplugin/lisp.vim
+
+-- use treesitter over syntax
+vim.treesitter.start()
+
+-- query linter
+local buf = vim.api.nvim_get_current_buf()
+local query_lint_on = vim.g.query_lint_on or { 'BufEnter', 'BufWrite' }
+
+if not vim.b.disable_query_linter and #query_lint_on > 0 then
+  vim.api.nvim_create_autocmd(query_lint_on, {
+    group = vim.api.nvim_create_augroup('querylint', { clear = false }),
+    buffer = buf,
+    callback = function()
+      vim.treesitter.query.lint(buf)
+    end,
+    desc = 'Query linter',
+  })
+end
 
 -- it's a lisp!
 vim.cmd([[ runtime! ftplugin/lisp.vim ]])
diff --git a/runtime/lua/vim/treesitter/_query_linter.lua b/runtime/lua/vim/treesitter/_query_linter.lua
new file mode 100644
index 0000000000..62f28d3097
--- /dev/null
+++ b/runtime/lua/vim/treesitter/_query_linter.lua
@@ -0,0 +1,302 @@
+local namespace = vim.api.nvim_create_namespace('vim.treesitter.query_linter')
+-- those node names exist for every language
+local BUILT_IN_NODE_NAMES = { '_', 'ERROR' }
+
+local M = {}
+
+--- @class QueryLinterNormalizedOpts
+--- @field langs string[]
+--- @field clear boolean
+
+--- @private
+--- Caches parse results for queries for each language.
+--- Entries of parse_cache[lang][query_text] will either be true for successful parse or contain the
+--- error message of the parse
+--- @type table<string,table<string,string|true>>
+local parse_cache = {}
+
+--- Contains language dependent context for the query linter
+--- @class QueryLinterLanguageContext
+--- @field lang string? Current `lang` of the targeted parser
+--- @field parser_info table? Parser info returned by vim.treesitter.language.inspect
+--- @field is_first_lang boolean Whether this is the first language of a linter run checking queries for multiple `langs`
+
+--- @private
+--- Adds a diagnostic for node in the query buffer
+--- @param diagnostics Diagnostic[]
+--- @param node TSNode
+--- @param buf integer
+--- @param lint string
+--- @param lang string?
+local function add_lint_for_node(diagnostics, node, buf, lint, lang)
+  local node_text = vim.treesitter.get_node_text(node, buf):gsub('\n', ' ')
+  --- @type string
+  local message = lint .. ': ' .. node_text
+  local error_range = { node:range() }
+  diagnostics[#diagnostics + 1] = {
+    lnum = error_range[1],
+    end_lnum = error_range[3],
+    col = error_range[2],
+    end_col = error_range[4],
+    severity = vim.diagnostic.ERROR,
+    message = message,
+    source = lang,
+  }
+end
+
+--- @private
+--- Determines the target language of a query file by its path: <lang>/<query_type>.scm
+--- @param buf integer
+--- @return string?
+local function guess_query_lang(buf)
+  local filename = vim.api.nvim_buf_get_name(buf)
+  if filename ~= '' then
+    local ok, query_lang = pcall(vim.fn.fnamemodify, filename, ':p:h:t')
+    if ok then
+      return query_lang
+    end
+  end
+end
+
+--- @private
+--- @param buf integer
+--- @param opts QueryLinterOpts|QueryLinterNormalizedOpts|nil
+--- @return QueryLinterNormalizedOpts
+local function normalize_opts(buf, opts)
+  opts = opts or {}
+  if not opts.langs then
+    opts.langs = guess_query_lang(buf)
+  end
+
+  if type(opts.langs) ~= 'table' then
+    --- @diagnostic disable-next-line:assign-type-mismatch
+    opts.langs = { opts.langs }
+  end
+
+  --- @cast opts QueryLinterNormalizedOpts
+  opts.langs = opts.langs or {}
+  return opts
+end
+
+local lint_query = [[;; query
+  (program [(named_node) (list) (grouping)] @toplevel)
+  (named_node
+    name: _ @node.named)
+  (anonymous_node
+    name: _ @node.anonymous)
+  (field_definition
+    name: (identifier) @field)
+  (predicate
+    name: (identifier) @predicate.name
+    type: (predicate_type) @predicate.type)
+  (ERROR) @error
+]]
+
+--- @private
+--- @param node TSNode
+--- @param buf integer
+--- @param lang string
+--- @param diagnostics Diagnostic[]
+local function check_toplevel(node, buf, lang, diagnostics)
+  local query_text = vim.treesitter.get_node_text(node, buf)
+
+  if not parse_cache[lang] then
+    parse_cache[lang] = {}
+  end
+
+  local lang_cache = parse_cache[lang]
+
+  if lang_cache[query_text] == nil then
+    local ok, err = pcall(vim.treesitter.query.parse, lang, query_text)
+
+    if not ok and type(err) == 'string' then
+      err = err:match('.-:%d+: (.+)')
+    end
+
+    lang_cache[query_text] = ok or err
+  end
+
+  local cache_entry = lang_cache[query_text]
+
+  if type(cache_entry) == 'string' then
+    add_lint_for_node(diagnostics, node, buf, cache_entry, lang)
+  end
+end
+
+--- @private
+--- @param node TSNode
+--- @param buf integer
+--- @param lang string
+--- @param parser_info table
+--- @param diagnostics Diagnostic[]
+local function check_field(node, buf, lang, parser_info, diagnostics)
+  local field_name = vim.treesitter.get_node_text(node, buf)
+  if not vim.tbl_contains(parser_info.fields, field_name) then
+    add_lint_for_node(diagnostics, node, buf, 'Invalid field', lang)
+  end
+end
+
+--- @private
+--- @param node TSNode
+--- @param buf integer
+--- @param lang string
+--- @param parser_info (table)
+--- @param diagnostics Diagnostic[]
+local function check_node(node, buf, lang, parser_info, diagnostics)
+  local node_type = vim.treesitter.get_node_text(node, buf)
+  local is_named = node_type:sub(1, 1) ~= '"'
+
+  if not is_named then
+    node_type = node_type:gsub('"(.*)".*$', '%1'):gsub('\\(.)', '%1')
+  end
+
+  local found = vim.tbl_contains(BUILT_IN_NODE_NAMES, node_type)
+    or vim.tbl_contains(parser_info.symbols, function(s)
+      return vim.deep_equal(s, { node_type, is_named })
+    end, { predicate = true })
+
+  if not found then
+    add_lint_for_node(diagnostics, node, buf, 'Invalid node type', lang)
+  end
+end
+
+--- @private
+--- @param node TSNode
+--- @param buf integer
+--- @param is_predicate boolean
+--- @return string
+local function get_predicate_name(node, buf, is_predicate)
+  local name = vim.treesitter.get_node_text(node, buf)
+  if is_predicate then
+    if vim.startswith(name, 'not-') then
+      --- @type string
+      name = name:sub(string.len('not-') + 1)
+    end
+    return name .. '?'
+  end
+  return name .. '!'
+end
+
+--- @private
+--- @param predicate_node TSNode
+--- @param predicate_type_node TSNode
+--- @param buf integer
+--- @param lang string?
+--- @param diagnostics Diagnostic[]
+local function check_predicate(predicate_node, predicate_type_node, buf, lang, diagnostics)
+  local type_string = vim.treesitter.get_node_text(predicate_type_node, buf)
+
+  -- Quirk of the query grammar that directives are also predicates!
+  if type_string == '?' then
+    if
+      not vim.tbl_contains(
+        vim.treesitter.query.list_predicates(),
+        get_predicate_name(predicate_node, buf, true)
+      )
+    then
+      add_lint_for_node(diagnostics, predicate_node, buf, 'Unknown predicate', lang)
+    end
+  elseif type_string == '!' then
+    if
+      not vim.tbl_contains(
+        vim.treesitter.query.list_directives(),
+        get_predicate_name(predicate_node, buf, false)
+      )
+    then
+      add_lint_for_node(diagnostics, predicate_node, buf, 'Unknown directive', lang)
+    end
+  end
+end
+
+--- @private
+--- @param buf integer
+--- @param match table<integer,TSNode>
+--- @param query Query
+--- @param lang_context QueryLinterLanguageContext
+--- @param diagnostics Diagnostic[]
+local function lint_match(buf, match, query, lang_context, diagnostics)
+  local predicate --- @type TSNode
+  local predicate_type --- @type TSNode
+  local lang = lang_context.lang
+  local parser_info = lang_context.parser_info
+
+  for id, node in pairs(match) do
+    local cap_id = query.captures[id]
+
+    -- perform language-independent checks only for first lang
+    if lang_context.is_first_lang then
+      if cap_id == 'error' then
+        add_lint_for_node(diagnostics, node, buf, 'Syntax error')
+      elseif cap_id == 'predicate.name' then
+        predicate = node
+      elseif cap_id == 'predicate.type' then
+        predicate_type = node
+      end
+    end
+
+    -- other checks rely on Neovim parser introspection
+    if lang and parser_info then
+      if cap_id == 'toplevel' then
+        check_toplevel(node, buf, lang, diagnostics)
+      elseif cap_id == 'field' then
+        check_field(node, buf, lang, parser_info, diagnostics)
+      elseif cap_id == 'node.named' or cap_id == 'node.anonymous' then
+        check_node(node, buf, lang, parser_info, diagnostics)
+      end
+    end
+  end
+
+  if predicate and predicate_type then
+    check_predicate(predicate, predicate_type, buf, lang, diagnostics)
+  end
+end
+
+--- @private
+--- @param buf integer Buffer to lint
+--- @param opts QueryLinterOpts|QueryLinterNormalizedOpts|nil Options for linting
+function M.lint(buf, opts)
+  if buf == 0 then
+    buf = vim.api.nvim_get_current_buf()
+  end
+
+  local diagnostics = {}
+  local query = vim.treesitter.query.parse('query', lint_query)
+
+  opts = normalize_opts(buf, opts)
+
+  -- perform at least one iteration even with no langs to perform language independent checks
+  for i = 1, math.max(1, #opts.langs) do
+    local lang = opts.langs[i]
+
+    --- @type boolean, (table|nil)
+    local ok, parser_info = pcall(vim.treesitter.language.inspect, lang)
+    if not ok then
+      parser_info = nil
+    end
+
+    local parser = vim.treesitter.get_parser(buf)
+    parser:parse()
+    parser:for_each_tree(function(tree, ltree)
+      if ltree:lang() == 'query' then
+        for _, match, _ in query:iter_matches(tree:root(), buf, 0, -1) do
+          local lang_context = {
+            lang = lang,
+            parser_info = parser_info,
+            is_first_lang = i == 1,
+          }
+          lint_match(buf, match, query, lang_context, diagnostics)
+        end
+      end
+    end)
+  end
+
+  vim.diagnostic.set(namespace, buf, diagnostics)
+end
+
+--- @private
+--- @param buf integer
+function M.clear(buf)
+  vim.diagnostic.reset(namespace, buf)
+end
+
+return M
diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
index c512710810..8293c1bd0a 100644
--- a/runtime/lua/vim/treesitter/playground.lua
+++ b/runtime/lua/vim/treesitter/playground.lua
@@ -269,6 +269,7 @@ function M.inspect_tree(opts)
   vim.bo[b].buflisted = false
   vim.bo[b].buftype = 'nofile'
   vim.bo[b].bufhidden = 'wipe'
+  vim.b[b].disable_query_linter = true
   vim.bo[b].filetype = 'query'
 
   local title --- @type string?
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 8a747ba14c..492bfd1ffb 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -714,4 +714,33 @@ function Query:iter_matches(node, source, start, stop)
   return iter
 end
 
+---@class QueryLinterOpts
+---@field langs (string|string[]|nil)
+---@field clear (boolean)
+
+--- Lint treesitter queries using installed parser, or clear lint errors.
+---
+--- Use |treesitter-parsers| in runtimepath to check the query file in {buf} for errors:
+---
+---   - verify that used nodes are valid identifiers in the grammar.
+---   - verify that predicates and directives are valid.
+---   - verify that top-level s-expressions are valid.
+---
+--- The found diagnostics are reported using |diagnostic-api|.
+--- By default, the parser used for verification is determined by the containing folder
+--- of the query file, e.g., if the path is `**/lua/highlights.scm`, the parser for the
+--- `lua` language will be used.
+---@param buf (integer) Buffer handle
+---@param opts (QueryLinterOpts|nil) Optional keyword arguments:
+---   - langs (string|string[]|nil) Language(s) to use for checking the query.
+---            If multiple languages are specified, queries are validated for all of them
+---   - clear (boolean) if `true`, just clear current lint errors
+function M.lint(buf, opts)
+  if opts and opts.clear then
+    require('vim.treesitter._query_linter').clear(buf)
+  else
+    require('vim.treesitter._query_linter').lint(buf, opts)
+  end
+end
+
 return M
-- 
cgit 


From 668f16bac779ac52d7bd9452e6001a7a6d1e9965 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 30 Apr 2023 11:01:54 +0200
Subject: feat(treesitter): upstream query omnifunc from playground (#23394)

and set by default in `ftplugin/query.lua`
---
 runtime/doc/news.txt                         |  6 ++-
 runtime/doc/treesitter.txt                   |  9 ++++-
 runtime/ftplugin/query.lua                   |  3 ++
 runtime/lua/vim/treesitter/_query_linter.lua | 60 ++++++++++++++++++++++++++--
 runtime/lua/vim/treesitter/query.lua         | 12 +++++-
 5 files changed, 84 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c343525a09..f33cffa22e 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -37,14 +37,18 @@ The following new APIs or features were added.
 
 • |vim.iter()| provides a generic iterator interface for tables and Lua
 iterators |luaref-in|.
+
 • Added |vim.keycode()| for translating keycodes in a string.
 
 • Added automatic linting of treesitter query files (see |ft-query-plugin|).
   Automatic linting can be turned off via >lua
-	vim.g.query_lint_on = {}
+      vim.g.query_lint_on = {}
 <
 • Enabled treesitter highlighting for treesitter query files by default.
 
+• Added |vim.treesitter.query.omnifunc()| for treesitter query files (set by
+  default).
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 32c97ce3ad..94690f0b7f 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -853,7 +853,7 @@ lint({buf}, {opts})                              *vim.treesitter.query.lint()*
 
     The found diagnostics are reported using |diagnostic-api|. By default, the
     parser used for verification is determined by the containing folder of the
-    query file, e.g., if the path is `**/lua/highlights.scm` , the parser for the `lua` language will be used.
+    query file, e.g., if the path ends in `/lua/highlights.scm` , the parser for the `lua` language will be used.
 
     Parameters: ~
       • {buf}   (integer) Buffer handle
@@ -875,6 +875,13 @@ list_predicates()                     *vim.treesitter.query.list_predicates()*
     Return: ~
         string[] List of supported predicates.
 
+omnifunc({findstart}, {base})                *vim.treesitter.query.omnifunc()*
+    Omnifunc for completing node names and predicates in treesitter queries.
+
+    Use via >lua
+      vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
+<
+
 parse({lang}, {query})                          *vim.treesitter.query.parse()*
     Parse {query} as a string. (If the query is in a file, the caller should
     read the contents into a string before calling).
diff --git a/runtime/ftplugin/query.lua b/runtime/ftplugin/query.lua
index 842d338fd9..accf38c199 100644
--- a/runtime/ftplugin/query.lua
+++ b/runtime/ftplugin/query.lua
@@ -11,6 +11,9 @@ end
 -- use treesitter over syntax
 vim.treesitter.start()
 
+-- set omnifunc
+vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
+
 -- query linter
 local buf = vim.api.nvim_get_current_buf()
 local query_lint_on = vim.g.query_lint_on or { 'BufEnter', 'BufWrite' }
diff --git a/runtime/lua/vim/treesitter/_query_linter.lua b/runtime/lua/vim/treesitter/_query_linter.lua
index 62f28d3097..ecdee5fc95 100644
--- a/runtime/lua/vim/treesitter/_query_linter.lua
+++ b/runtime/lua/vim/treesitter/_query_linter.lua
@@ -1,4 +1,6 @@
-local namespace = vim.api.nvim_create_namespace('vim.treesitter.query_linter')
+local api = vim.api
+
+local namespace = api.nvim_create_namespace('vim.treesitter.query_linter')
 -- those node names exist for every language
 local BUILT_IN_NODE_NAMES = { '_', 'ERROR' }
 
@@ -49,7 +51,7 @@ end
 --- @param buf integer
 --- @return string?
 local function guess_query_lang(buf)
-  local filename = vim.api.nvim_buf_get_name(buf)
+  local filename = api.nvim_buf_get_name(buf)
   if filename ~= '' then
     local ok, query_lang = pcall(vim.fn.fnamemodify, filename, ':p:h:t')
     if ok then
@@ -256,7 +258,7 @@ end
 --- @param opts QueryLinterOpts|QueryLinterNormalizedOpts|nil Options for linting
 function M.lint(buf, opts)
   if buf == 0 then
-    buf = vim.api.nvim_get_current_buf()
+    buf = api.nvim_get_current_buf()
   end
 
   local diagnostics = {}
@@ -299,4 +301,56 @@ function M.clear(buf)
   vim.diagnostic.reset(namespace, buf)
 end
 
+--- @private
+--- @param findstart integer
+--- @param base string
+function M.omnifunc(findstart, base)
+  if findstart == 1 then
+    local result =
+      api.nvim_get_current_line():sub(1, api.nvim_win_get_cursor(0)[2]):find('["#%-%w]*$')
+    return result - 1
+  end
+
+  local buf = api.nvim_get_current_buf()
+  local query_lang = guess_query_lang(buf)
+
+  local ok, parser_info = pcall(vim.treesitter.language.inspect, query_lang)
+  if not ok then
+    return -2
+  end
+
+  local items = {}
+  for _, f in pairs(parser_info.fields) do
+    if f:find(base, 1, true) then
+      table.insert(items, f .. ':')
+    end
+  end
+  for _, p in pairs(vim.treesitter.query.list_predicates()) do
+    local text = '#' .. p
+    local found = text:find(base, 1, true)
+    if found and found <= 2 then -- with or without '#'
+      table.insert(items, text)
+    end
+    text = '#not-' .. p
+    found = text:find(base, 1, true)
+    if found and found <= 2 then -- with or without '#'
+      table.insert(items, text)
+    end
+  end
+  for _, p in pairs(vim.treesitter.query.list_directives()) do
+    local text = '#' .. p
+    local found = text:find(base, 1, true)
+    if found and found <= 2 then -- with or without '#'
+      table.insert(items, text)
+    end
+  end
+  for _, s in pairs(parser_info.symbols) do
+    local text = s[2] and s[1] or '"' .. s[1]:gsub([[\]], [[\\]]) .. '"'
+    if text:find(base, 1, true) then
+      table.insert(items, text)
+    end
+  end
+  return { words = items, refresh = 'always' }
+end
+
 return M
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 492bfd1ffb..93841bb31e 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -728,7 +728,7 @@ end
 ---
 --- The found diagnostics are reported using |diagnostic-api|.
 --- By default, the parser used for verification is determined by the containing folder
---- of the query file, e.g., if the path is `**/lua/highlights.scm`, the parser for the
+--- of the query file, e.g., if the path ends in `/lua/highlights.scm`, the parser for the
 --- `lua` language will be used.
 ---@param buf (integer) Buffer handle
 ---@param opts (QueryLinterOpts|nil) Optional keyword arguments:
@@ -743,4 +743,14 @@ function M.lint(buf, opts)
   end
 end
 
+--- Omnifunc for completing node names and predicates in treesitter queries.
+---
+--- Use via
+--- <pre>lua
+---   vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
+--- </pre>
+function M.omnifunc(findstart, base)
+  return require('vim.treesitter._query_linter').omnifunc(findstart, base)
+end
+
 return M
-- 
cgit 


From 4f3f81ed86542109824bd199198fb43e6fccdc17 Mon Sep 17 00:00:00 2001
From: JP <17429390+resolritter@users.noreply.github.com>
Date: Sun, 30 Apr 2023 06:02:38 -0300
Subject: docs(api): document nvim_buf_add_highlight vs nvim_buf_set_extmark
 (#23310)

---
 runtime/doc/api.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 8d7253a754..2e1f58d0e3 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -400,6 +400,23 @@ external highlighter plugin wants to add many highlights in a batch,
 performance can be improved by calling |nvim_buf_add_highlight()| as an
 asynchronous notification, after first (synchronously) requesting a source id.
 
+|nvim_buf_add_highlight()| adds highlights as |extmarks|. If highlights need to
+be tracked or manipulated after adding them, it is better to use
+|nvim_buf_set_extmark()| directly, as this function returns the placed |extmark|
+id. Thus, instead of >lua
+  vim.api.nvim_buf_add_highlight(buf, ns_id, hl_group, line, col_start, col_end)
+<
+use >lua
+  -- create the highlight through an extmark
+  extid = vim.api.nvim_buf_set_extmark(buf, ns_id, hl_group, line, col_start, {end_col = col_end, hl_group = hl_group})
+
+  -- example: modify the extmark's highlight group
+  vim.api.nvim_buf_set_extmark(buf, ns_id, NEW_HL_GROUP, line, col_start, {end_col = col_end, hl_group = hl_group, id = extid})
+
+  -- example: change the highlight's position
+  vim.api.nvim_buf_set_extmark(buf, ns_id, hl_group, NEW_LINE, col_start, {end_col = col_end, hl_group = hl_group, id = extid})
+<
+
 Example using the Python API client (|pynvim|):
 >python
     src = vim.new_highlight_source()
-- 
cgit 


From 064bf39c467afa797206684d0a6dd2a9ecbe65f9 Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Sun, 30 Apr 2023 14:36:54 +0200
Subject: docs: fix erroneous nvim_buf_set_extmark example (#23404)

---
 runtime/doc/api.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 2e1f58d0e3..62afdc5830 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -408,13 +408,13 @@ id. Thus, instead of >lua
 <
 use >lua
   -- create the highlight through an extmark
-  extid = vim.api.nvim_buf_set_extmark(buf, ns_id, hl_group, line, col_start, {end_col = col_end, hl_group = hl_group})
+  extid = vim.api.nvim_buf_set_extmark(buf, ns_id, line, col_start, {end_col = col_end, hl_group = hl_group})
 
   -- example: modify the extmark's highlight group
   vim.api.nvim_buf_set_extmark(buf, ns_id, NEW_HL_GROUP, line, col_start, {end_col = col_end, hl_group = hl_group, id = extid})
 
   -- example: change the highlight's position
-  vim.api.nvim_buf_set_extmark(buf, ns_id, hl_group, NEW_LINE, col_start, {end_col = col_end, hl_group = hl_group, id = extid})
+  vim.api.nvim_buf_set_extmark(buf, ns_id, NEW_LINE, col_start, {end_col = col_end, hl_group = NEW_HL_GROUP, id = extid})
 <
 
 Example using the Python API client (|pynvim|):
-- 
cgit 


From 19a793545f15bb7e0bac2fc8f705c600e8f9c9bb Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 30 Apr 2023 16:11:38 +0100
Subject: fix(treesitter): redraw added/removed injections properly (#23287)

When injections are added or removed make sure to:
- invoke 'changedtree' callbacks for when new trees are added.
- invoke 'changedtree' callbacks for when trees are invalidated
- redraw regions when languagetree children are removed
---
 runtime/doc/treesitter.txt                  | 27 +++++-----
 runtime/lua/vim/treesitter/highlighter.lua  | 20 ++++---
 runtime/lua/vim/treesitter/languagetree.lua | 81 +++++++++++++++++++----------
 3 files changed, 83 insertions(+), 45 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 94690f0b7f..0168b11499 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1149,21 +1149,24 @@ LanguageTree:parse({self})                              *LanguageTree:parse()*
     Return: ~
         TSTree[]
 
-LanguageTree:register_cbs({self}, {cbs})         *LanguageTree:register_cbs()*
+                                                 *LanguageTree:register_cbs()*
+LanguageTree:register_cbs({self}, {cbs}, {recursive})
     Registers callbacks for the |LanguageTree|.
 
     Parameters: ~
-      • {cbs}   (table) An |nvim_buf_attach()|-like table argument with the
-                following handlers:
-                • `on_bytes` : see |nvim_buf_attach()|, but this will be called after the parsers callback.
-                • `on_changedtree` : a callback that will be called every time
-                  the tree has syntactical changes. It will only be passed one
-                  argument, which is a table of the ranges (as node ranges)
-                  that changed.
-                • `on_child_added` : emitted when a child is added to the
-                  tree.
-                • `on_child_removed` : emitted when a child is removed from
-                  the tree.
+      • {cbs}         (table) An |nvim_buf_attach()|-like table argument with
+                      the following handlers:
+                      • `on_bytes` : see |nvim_buf_attach()|, but this will be called after the parsers callback.
+                      • `on_changedtree` : a callback that will be called
+                        every time the tree has syntactical changes. It will
+                        only be passed one argument, which is a table of the
+                        ranges (as node ranges) that changed.
+                      • `on_child_added` : emitted when a child is added to
+                        the tree.
+                      • `on_child_removed` : emitted when a child is removed
+                        from the tree.
+      • {recursive?}  boolean Apply callbacks recursively for all children.
+                      Any new children will also inherit the callbacks.
       • {self}
 
 LanguageTree:source({self})                            *LanguageTree:source()*
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index ac2a929487..4bb764c5c6 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -76,9 +76,6 @@ function TSHighlighter.new(tree, opts)
   opts = opts or {} ---@type { queries: table<string,string> }
   self.tree = tree
   tree:register_cbs({
-    on_changedtree = function(...)
-      self:on_changedtree(...)
-    end,
     on_bytes = function(...)
       self:on_bytes(...)
     end,
@@ -87,6 +84,17 @@ function TSHighlighter.new(tree, opts)
     end,
   })
 
+  tree:register_cbs({
+    on_changedtree = function(...)
+      self:on_changedtree(...)
+    end,
+    on_child_removed = function(child)
+      child:for_each_tree(function(t)
+        self:on_changedtree(t:included_ranges(true))
+      end)
+    end,
+  }, true)
+
   self.bufnr = tree:source() --[[@as integer]]
   self.edit_count = 0
   self.redraw_count = 0
@@ -177,10 +185,10 @@ function TSHighlighter:on_detach()
 end
 
 ---@package
----@param changes integer[][]?
+---@param changes Range6[][]
 function TSHighlighter:on_changedtree(changes)
-  for _, ch in ipairs(changes or {}) do
-    api.nvim__buf_redraw_range(self.bufnr, ch[1], ch[3] + 1)
+  for _, ch in ipairs(changes) do
+    api.nvim__buf_redraw_range(self.bufnr, ch[1], ch[4] + 1)
   end
 end
 
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 4aa07d1b96..19cea32367 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -51,8 +51,18 @@ local Range = require('vim.treesitter._range')
 ---| 'on_child_added'
 ---| 'on_child_removed'
 
+--- @type table<TSCallbackNameOn,TSCallbackName>
+local TSCallbackNames = {
+  on_changedtree = 'changedtree',
+  on_bytes = 'bytes',
+  on_detach = 'detach',
+  on_child_added = 'child_added',
+  on_child_removed = 'child_removed',
+}
+
 ---@class LanguageTree
 ---@field private _callbacks table<TSCallbackName,function[]> Callback handlers
+---@field package _callbacks_rec table<TSCallbackName,function[]> Callback handlers (recursive)
 ---@field private _children table<string,LanguageTree> Injected languages
 ---@field private _injection_query Query Queries defining injected languages
 ---@field private _opts table Options
@@ -79,7 +89,7 @@ LanguageTree.__index = LanguageTree
 --- "injected" language parsers, which themselves may inject other languages, recursively.
 ---
 ---@param source (integer|string) Buffer or text string to parse
----@param lang string|nil Root language of this tree
+---@param lang string Root language of this tree
 ---@param opts (table|nil) Optional arguments:
 ---             - injections table Map of language to injection query strings. Overrides the
 ---                                built-in runtime file searching for language injections.
@@ -100,15 +110,15 @@ function LanguageTree.new(source, lang, opts)
       or query.get(lang, 'injections'),
     _valid = false,
     _parser = vim._create_ts_parser(lang),
-    _callbacks = {
-      changedtree = {},
-      bytes = {},
-      detach = {},
-      child_added = {},
-      child_removed = {},
-    },
+    _callbacks = {},
+    _callbacks_rec = {},
   }, LanguageTree)
 
+  for _, name in pairs(TSCallbackNames) do
+    self._callbacks[name] = {}
+    self._callbacks_rec[name] = {}
+  end
+
   return self
 end
 
@@ -121,6 +131,7 @@ local function tcall(f, ...)
   local start = vim.loop.hrtime()
   ---@diagnostic disable-next-line
   local r = { f(...) }
+  --- @type number
   local duration = (vim.loop.hrtime() - start) / 1000000
   return duration, unpack(r)
 end
@@ -161,6 +172,9 @@ function LanguageTree:invalidate(reload)
 
   -- buffer was reloaded, reparse all trees
   if reload then
+    for _, t in ipairs(self._trees) do
+      self:_do_callback('changedtree', t:included_ranges(true), t)
+    end
     self._trees = {}
   end
 
@@ -245,9 +259,12 @@ function LanguageTree:parse()
       if not self._valid or not self._valid[i] then
         self._parser:set_included_ranges(ranges)
         local parse_time, tree, tree_changes =
-          tcall(self._parser.parse, self._parser, self._trees[i], self._source)
+          tcall(self._parser.parse, self._parser, self._trees[i], self._source, true)
+
+        -- Pass ranges if this is an initial parse
+        local cb_changes = self._trees[i] and tree_changes or ranges
 
-        self:_do_callback('changedtree', tree_changes, tree)
+        self:_do_callback('changedtree', cb_changes, tree)
         self._trees[i] = tree
         vim.list_extend(changes, tree_changes)
 
@@ -341,7 +358,14 @@ function LanguageTree:add_child(lang)
     self:remove_child(lang)
   end
 
-  self._children[lang] = LanguageTree.new(self._source, lang, self._opts)
+  local child = LanguageTree.new(self._source, lang, self._opts)
+
+  -- Inherit recursive callbacks
+  for nm, cb in pairs(self._callbacks_rec) do
+    vim.list_extend(child._callbacks_rec[nm], cb)
+  end
+
+  self._children[lang] = child
   self:invalidate()
   self:_do_callback('child_added', self._children[lang])
 
@@ -453,6 +477,10 @@ function LanguageTree:set_included_regions(new_regions)
   end
 
   if #self:included_regions() ~= #new_regions then
+    -- TODO(lewis6991): inefficient; invalidate trees incrementally
+    for _, t in ipairs(self._trees) do
+      self:_do_callback('changedtree', t:included_ranges(true), t)
+    end
     self._trees = {}
     self:invalidate()
   else
@@ -707,6 +735,9 @@ function LanguageTree:_do_callback(cb_name, ...)
   for _, cb in ipairs(self._callbacks[cb_name]) do
     cb(...)
   end
+  for _, cb in ipairs(self._callbacks_rec[cb_name]) do
+    cb(...)
+  end
 end
 
 ---@package
@@ -855,30 +886,26 @@ end
 ---              changed.
 ---           - `on_child_added` : emitted when a child is added to the tree.
 ---           - `on_child_removed` : emitted when a child is removed from the tree.
-function LanguageTree:register_cbs(cbs)
+--- @param recursive? boolean Apply callbacks recursively for all children. Any new children will
+---                           also inherit the callbacks.
+function LanguageTree:register_cbs(cbs, recursive)
   ---@cast cbs table<TSCallbackNameOn,function>
   if not cbs then
     return
   end
 
-  if cbs.on_changedtree then
-    table.insert(self._callbacks.changedtree, cbs.on_changedtree)
-  end
-
-  if cbs.on_bytes then
-    table.insert(self._callbacks.bytes, cbs.on_bytes)
-  end
+  local callbacks = recursive and self._callbacks_rec or self._callbacks
 
-  if cbs.on_detach then
-    table.insert(self._callbacks.detach, cbs.on_detach)
-  end
-
-  if cbs.on_child_added then
-    table.insert(self._callbacks.child_added, cbs.on_child_added)
+  for name, cbname in pairs(TSCallbackNames) do
+    if cbs[name] then
+      table.insert(callbacks[cbname], cbs[name])
+    end
   end
 
-  if cbs.on_child_removed then
-    table.insert(self._callbacks.child_removed, cbs.on_child_removed)
+  if recursive then
+    self:for_each_child(function(child)
+      child:register_cbs(cbs, true)
+    end)
   end
 end
 
-- 
cgit 


From edf05b005f34f59dd40468c36cc139e217345a71 Mon Sep 17 00:00:00 2001
From: jdrouhard <john@drouhard.dev>
Date: Mon, 1 May 2023 00:15:32 -0500
Subject: perf(lsp): process semantic tokens response in a coroutine that
 yields every 5ms (#23375)

---
 runtime/lua/vim/lsp/semantic_tokens.lua | 45 +++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 03532c33b7..b6b09c58b1 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -1,7 +1,8 @@
 local api = vim.api
+local bit = require('bit')
 local handlers = require('vim.lsp.handlers')
 local util = require('vim.lsp.util')
-local bit = require('bit')
+local uv = vim.loop
 
 --- @class STTokenRange
 --- @field line integer line number 0-based
@@ -94,15 +95,38 @@ end
 ---
 ---@private
 ---@return STTokenRange[]
-local function tokens_to_ranges(data, bufnr, client)
+local function tokens_to_ranges(data, bufnr, client, request)
   local legend = client.server_capabilities.semanticTokensProvider.legend
   local token_types = legend.tokenTypes
   local token_modifiers = legend.tokenModifiers
   local ranges = {}
 
+  local start = uv.hrtime()
+  local ms_to_ns = 1000 * 1000
+  local yield_interval_ns = 5 * ms_to_ns
+  local co, is_main = coroutine.running()
+
   local line
   local start_char = 0
   for i = 1, #data, 5 do
+    -- if this function is called from the main coroutine, let it run to completion with no yield
+    if not is_main then
+      local elapsed_ns = uv.hrtime() - start
+
+      if elapsed_ns > yield_interval_ns then
+        vim.schedule(function()
+          coroutine.resume(co, util.buf_versions[bufnr])
+        end)
+        if request.version ~= coroutine.yield() then
+          -- request became stale since the last time the coroutine ran.
+          -- abandon it by yielding without a way to resume
+          coroutine.yield()
+        end
+
+        start = uv.hrtime()
+      end
+    end
+
     local delta_line = data[i]
     line = line and line + delta_line or delta_line
     local delta_start = data[i + 1]
@@ -280,7 +304,7 @@ function STHighlighter:send_request()
         local c = vim.lsp.get_client_by_id(ctx.client_id)
         local highlighter = STHighlighter.active[ctx.bufnr]
         if not err and c and highlighter then
-          highlighter:process_response(response, c, version)
+          coroutine.wrap(STHighlighter.process_response)(highlighter, response, c, version)
         end
       end, self.bufnr)
 
@@ -315,11 +339,9 @@ function STHighlighter:process_response(response, client, version)
     return
   end
 
-  -- reset active request
-  state.active_request = {}
-
   -- skip nil responses
   if response == nil then
+    state.active_request = {}
     return
   end
 
@@ -347,12 +369,19 @@ function STHighlighter:process_response(response, client, version)
     tokens = response.data
   end
 
-  -- Update the state with the new results
+  -- convert token list to highlight ranges
+  -- this could yield and run over multiple event loop iterations
+  local highlights = tokens_to_ranges(tokens, self.bufnr, client, state.active_request)
+
+  -- reset active request
+  state.active_request = {}
+
+  -- update the state with the new results
   local current_result = state.current_result
   current_result.version = version
   current_result.result_id = response.resultId
   current_result.tokens = tokens
-  current_result.highlights = tokens_to_ranges(tokens, self.bufnr, client)
+  current_result.highlights = highlights
   current_result.namespace_cleared = false
 
   -- redraw all windows displaying buffer
-- 
cgit 


From 5e31f53457c1feceb57a55734508c37d07e255b4 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Mon, 1 May 2023 10:54:37 +0200
Subject: docs(lsp): remove vim.lsp.sync (#23416)

The module is used internally and not intended to be used by plugins or
users.
---
 runtime/doc/lsp.txt | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 01edbe7cbd..e07bfc2209 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -2130,27 +2130,6 @@ start({cmd}, {cmd_args}, {dispatchers}, {extra_spawn_params})
         • `terminate()` terminates the RPC client.
 
 
-==============================================================================
-Lua module: vim.lsp.sync                                            *lsp-sync*
-
-                                                 *vim.lsp.sync.compute_diff()*
-compute_diff({___MissingCloseParenHere___})
-    Returns the range table for the difference between prev and curr lines
-
-    Parameters: ~
-      • {prev_lines}       (table) list of lines
-      • {curr_lines}       (table) list of lines
-      • {firstline}        (integer) line to begin search for first difference
-      • {lastline}         (integer) line to begin search in old_lines for
-                           last difference
-      • {new_lastline}     (integer) line to begin search in new_lines for
-                           last difference
-      • {offset_encoding}  (string) encoding requested by language server
-
-    Return: ~
-        (table) TextDocumentContentChangeEvent see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
-
-
 ==============================================================================
 Lua module: vim.lsp.protocol                                    *lsp-protocol*
 
-- 
cgit 


From 37dd818722c50a5dbe0771a88a1cdaf98d9596b5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 1 May 2023 10:55:51 +0200
Subject: vim-patch:9.0.1503: Luau files are not recognized (#23412)

Problem:    Luau files are not recognized.
Solution:   Add a patter for Luau files. (Amaan Qureshi, closes vim/vim#12317)

https://github.com/vim/vim/commit/2dcfe9ae1df61e1249520ed435dd8cf60e157103

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 4fafc4e2e2..5c799b23f2 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -637,6 +637,7 @@ local extension = {
   nse = 'lua',
   rockspec = 'lua',
   lua = 'lua',
+  luau = 'luau',
   lrc = 'lyrics',
   m = function(path, bufnr)
     return require('vim.filetype.detect').m(bufnr)
-- 
cgit 


From 26cc946226d96bf6b474d850b961e1060346c96f Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 1 May 2023 10:32:29 +0100
Subject: fix(treesitter): foldexpr tweaks

Some small general fixes found working on developing async parsing.
---
 runtime/lua/vim/treesitter/_fold.lua        | 40 ++++++++++++++++++++++++-----
 runtime/lua/vim/treesitter/languagetree.lua |  2 +-
 2 files changed, 34 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index 7df93d1b2e..51e60bf495 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -1,3 +1,5 @@
+local ts = vim.treesitter
+
 local Range = require('vim.treesitter._range')
 
 local api = vim.api
@@ -90,21 +92,45 @@ local function trim_level(level)
   return level
 end
 
+--- If a parser doesn't have any ranges explicitly set, treesitter will
+--- return a range with end_row and end_bytes with a value of UINT32_MAX,
+--- so clip end_row to the max buffer line.
+---
+--- TODO(lewis6991): Handle this generally
+---
+--- @param bufnr integer
+--- @param erow integer?
+--- @return integer
+local function normalise_erow(bufnr, erow)
+  local max_erow = api.nvim_buf_line_count(bufnr) - 1
+  return math.min(erow or max_erow, max_erow)
+end
+
 ---@param bufnr integer
 ---@param info TS.FoldInfo
 ---@param srow integer?
 ---@param erow integer?
 local function get_folds_levels(bufnr, info, srow, erow)
+  if not api.nvim_buf_is_valid(bufnr) then
+    return false
+  end
+
   srow = srow or 0
-  erow = erow or api.nvim_buf_line_count(bufnr)
+  erow = normalise_erow(bufnr, erow)
 
   info:invalidate_range(srow, erow)
 
   local prev_start = -1
   local prev_stop = -1
 
-  vim.treesitter.get_parser(bufnr):for_each_tree(function(tree, ltree)
-    local query = vim.treesitter.query.get(ltree:lang(), 'folds')
+  local parser = ts.get_parser(bufnr)
+
+  if not parser:is_valid() then
+    return
+  end
+
+  parser:for_each_tree(function(tree, ltree)
+    local query = ts.query.get(ltree:lang(), 'folds')
     if not query then
       return
     end
@@ -112,9 +138,9 @@ local function get_folds_levels(bufnr, info, srow, erow)
     -- erow in query is end-exclusive
     local q_erow = erow and erow + 1 or -1
 
-    for id, node, metadata in query:iter_captures(tree:root(), bufnr, srow or 0, q_erow) do
+    for id, node, metadata in query:iter_captures(tree:root(), bufnr, srow, q_erow) do
       if query.captures[id] == 'fold' then
-        local range = vim.treesitter.get_range(node, bufnr, metadata[id])
+        local range = ts.get_range(node, bufnr, metadata[id])
         local start, _, stop, stop_col = Range.unpack4(range)
 
         if stop_col == 0 then
@@ -226,7 +252,7 @@ function M.foldexpr(lnum)
   lnum = lnum or vim.v.lnum
   local bufnr = api.nvim_get_current_buf()
 
-  if not vim.treesitter._has_parser(bufnr) or not lnum then
+  if not ts._has_parser(bufnr) or not lnum then
     return '0'
   end
 
@@ -234,7 +260,7 @@ function M.foldexpr(lnum)
     foldinfos[bufnr] = FoldInfo.new()
     get_folds_levels(bufnr, foldinfos[bufnr])
 
-    local parser = vim.treesitter.get_parser(bufnr)
+    local parser = ts.get_parser(bufnr)
     parser:register_cbs({
       on_changedtree = function(tree_changes)
         on_changedtree(bufnr, foldinfos[bufnr], tree_changes)
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 19cea32367..1adf6759fa 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -262,7 +262,7 @@ function LanguageTree:parse()
           tcall(self._parser.parse, self._parser, self._trees[i], self._source, true)
 
         -- Pass ranges if this is an initial parse
-        local cb_changes = self._trees[i] and tree_changes or ranges
+        local cb_changes = self._trees[i] and tree_changes or tree:included_ranges(true)
 
         self:_do_callback('changedtree', cb_changes, tree)
         self._trees[i] = tree
-- 
cgit 


From fba18a3b62310f4535d979a05288101b9af2ef50 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 2 May 2023 10:07:18 +0100
Subject: fix(treesitter): do not calc folds on unloaded buffers

Fixes #23423
---
 runtime/lua/vim/treesitter/_fold.lua | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index 51e60bf495..edceb8217a 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -111,10 +111,6 @@ end
 ---@param srow integer?
 ---@param erow integer?
 local function get_folds_levels(bufnr, info, srow, erow)
-  if not api.nvim_buf_is_valid(bufnr) then
-    return false
-  end
-
   srow = srow or 0
   erow = normalise_erow(bufnr, erow)
 
@@ -210,13 +206,25 @@ local function recompute_folds()
   vim._foldupdate()
 end
 
+--- Schedule a function only if bufnr is loaded
+---@param bufnr integer
+---@param fn function
+local function schedule_if_loaded(bufnr, fn)
+  vim.schedule(function()
+    if not api.nvim_buf_is_loaded(bufnr) then
+      return
+    end
+    fn()
+  end)
+end
+
 ---@param bufnr integer
 ---@param foldinfo TS.FoldInfo
 ---@param tree_changes Range4[]
 local function on_changedtree(bufnr, foldinfo, tree_changes)
   -- For some reason, queries seem to use the old buffer state in on_bytes.
   -- Get around this by scheduling and manually updating folds.
-  vim.schedule(function()
+  schedule_if_loaded(bufnr, function()
     for _, change in ipairs(tree_changes) do
       local srow, _, erow = Range.unpack4(change)
       get_folds_levels(bufnr, foldinfo, srow, erow)
@@ -238,7 +246,7 @@ local function on_bytes(bufnr, foldinfo, start_row, old_row, new_row)
     foldinfo:remove_range(end_row_new, end_row_old)
   elseif new_row > old_row then
     foldinfo:add_range(start_row, end_row_new)
-    vim.schedule(function()
+    schedule_if_loaded(bufnr, function()
       get_folds_levels(bufnr, foldinfo, start_row, end_row_new)
       recompute_folds()
     end)
-- 
cgit 


From be11f80d018797b514ed7d01cde2e4c8f88cc8d2 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Wed, 26 Apr 2023 01:55:00 +0200
Subject: vim-patch:9.0.0640: cannot scroll by screen line if a line wraps

Problem:    Cannot scroll by screen line if a line wraps.
Solution:   Add the 'smoothscroll' option.  Only works for CTRL-E and CTRL-Y
            so far.

https://github.com/vim/vim/commit/f6196f424474e2a9c160f2a995fc2691f82b58f9

vim-patch:9.0.0641: missing part of the new option code

Problem:    Missing part of the new option code.
Solution:   Add missing WV_SMS.

https://github.com/vim/vim/commit/bbbda8fd81f6d720962b67ae885825bad9be4456

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/options.txt  | 8 ++++++++
 runtime/doc/quickref.txt | 1 +
 runtime/optwin.vim       | 3 +++
 3 files changed, 12 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ba73d79cd3..7cb88441f1 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5652,6 +5652,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	option.  Also see |ins-expandtab|.  When 'expandtab' is not set, the
 	number of spaces is minimized by using <Tab>s.
 
+			*'smoothscroll'* *'sms'* *'nosmoothscroll'* *'nosms'*
+'smoothscroll' 'sms'	boolean  (default off)
+			local to window
+	Scrolling works with screen lines.  When 'wrap' is set and the first
+	line in the window wraps part of it may not be visible, as if it is
+	above the window.
+	NOTE: only partly implemented, works with CTRL-E and CTRL-Y.
+
 					*'softtabstop'* *'sts'*
 'softtabstop' 'sts'	number	(default 0)
 			local to buffer
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 952f0064e6..c166ecd79d 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -870,6 +870,7 @@ Short explanation of each option:		*option-list*
 'smartcase'	  'scs'     no ignore case when pattern has uppercase
 'smartindent'	  'si'	    smart autoindenting for C programs
 'smarttab'	  'sta'     use 'shiftwidth' when inserting <Tab>
+'smoothscroll'	  'sms'     scroll by screen lines when 'wrap' is set
 'softtabstop'	  'sts'     number of spaces that <Tab> uses while editing
 'spell'			    enable spell checking
 'spellcapcheck'   'spc'     pattern to locate end of a sentence
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 0d10ac4758..b7b9c61123 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -305,6 +305,9 @@ call <SID>Header(gettext("displaying text"))
 call <SID>AddOption("scroll", gettext("number of lines to scroll for CTRL-U and CTRL-D"))
 call append("$", "\t" .. s:local_to_window)
 call <SID>OptionL("scr")
+call <SID>AddOption("smoothscroll", gettext("scroll by screen line"))
+call append("$", "\t" .. s:local_to_window)
+call <SID>BinOptionL("sms")
 call <SID>AddOption("scrolloff", gettext("number of screen lines to show around the cursor"))
 call append("$", " \tset so=" . &so)
 call <SID>AddOption("wrap", gettext("long lines wrap"))
-- 
cgit 


From 4e4383ffa2b9ec94e703ecbd6178737fc24f6866 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Fri, 28 Apr 2023 16:22:42 +0200
Subject: vim-patch:9.0.1247: divide by zero with 'smoothscroll' set and a
 narrow window

Problem:    Divide by zero with 'smoothscroll' set and a narrow window.
Solution:   Bail out when the window is too narrow.

https://github.com/vim/vim/commit/870219c58c0804bdc55419b2e455c06ac715a835

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/options.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7cb88441f1..ab86e56a62 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5657,8 +5657,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 			local to window
 	Scrolling works with screen lines.  When 'wrap' is set and the first
 	line in the window wraps part of it may not be visible, as if it is
-	above the window.
-	NOTE: only partly implemented, works with CTRL-E and CTRL-Y.
+	above the window. "<<<" is displayed at the start of the first line,
+	highlighted with |hl-NonText|.
+	NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y
+	and scrolling with the mouse.
 
 					*'softtabstop'* *'sts'*
 'softtabstop' 'sts'	number	(default 0)
-- 
cgit 


From f78130b2d84a950ed7a13a5cbd946cba6c5c68f7 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 29 Apr 2023 23:02:29 +0200
Subject: test: 'smoothscroll' works with virt_lines above and below

---
 runtime/doc/news.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f33cffa22e..bc357ac534 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -49,6 +49,9 @@ iterators |luaref-in|.
 • Added |vim.treesitter.query.omnifunc()| for treesitter query files (set by
   default).
 
+• |'smoothscroll'| option to scroll by screen line rather than by text line
+when |'wrap'| is set.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
-- 
cgit 


From 3ba930844c302dc43d32a30ed453667409596c4a Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 2 May 2023 22:27:14 +0100
Subject: perf(treesitter): insert/remove items efficiently (#23443)

---
 runtime/lua/vim/treesitter/_fold.lua | 63 +++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index edceb8217a..f6425d7cb9 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -34,15 +34,58 @@ function FoldInfo:invalidate_range(srow, erow)
   end
 end
 
+--- Efficiently remove items from middle of a list a list.
+---
+--- Calling table.remove() in a loop will re-index the tail of the table on
+--- every iteration, instead this function will re-index  the table exactly
+--- once.
+---
+--- Based on https://stackoverflow.com/questions/12394841/safely-remove-items-from-an-array-table-while-iterating/53038524#53038524
+---
+---@param t any[]
+---@param first integer
+---@param last integer
+local function list_remove(t, first, last)
+  local n = #t
+  for i = 0, n - first do
+    t[first + i] = t[last + 1 + i]
+    t[last + 1 + i] = nil
+  end
+end
+
 ---@package
 ---@param srow integer
 ---@param erow integer
 function FoldInfo:remove_range(srow, erow)
-  for i = erow - 1, srow, -1 do
-    table.remove(self.levels, i + 1)
-    table.remove(self.levels0, i + 1)
-    table.remove(self.start_counts, i + 1)
-    table.remove(self.stop_counts, i + 1)
+  list_remove(self.levels, srow + 1, erow)
+  list_remove(self.levels0, srow + 1, erow)
+  list_remove(self.start_counts, srow + 1, erow)
+  list_remove(self.stop_counts, srow + 1, erow)
+end
+
+--- Efficiently insert items into the middle of a list.
+---
+--- Calling table.insert() in a loop will re-index the tail of the table on
+--- every iteration, instead this function will re-index  the table exactly
+--- once.
+---
+--- Based on https://stackoverflow.com/questions/12394841/safely-remove-items-from-an-array-table-while-iterating/53038524#53038524
+---
+---@param t any[]
+---@param first integer
+---@param last integer
+---@param v any
+local function list_insert(t, first, last, v)
+  local n = #t
+
+  -- Shift table forward
+  for i = n - first, 0, -1 do
+    t[last + 1 + i] = t[first + i]
+  end
+
+  -- Fill in new values
+  for i = first, last do
+    t[i] = v
   end
 end
 
@@ -50,12 +93,10 @@ end
 ---@param srow integer
 ---@param erow integer
 function FoldInfo:add_range(srow, erow)
-  for i = srow, erow - 1 do
-    table.insert(self.levels, i + 1, '-1')
-    table.insert(self.levels0, i + 1, -1)
-    table.insert(self.start_counts, i + 1, nil)
-    table.insert(self.stop_counts, i + 1, nil)
-  end
+  list_insert(self.levels, srow + 1, erow, '-1')
+  list_insert(self.levels0, srow + 1, erow, -1)
+  list_insert(self.start_counts, srow + 1, erow, nil)
+  list_insert(self.stop_counts, srow + 1, erow, nil)
 end
 
 ---@package
-- 
cgit 


From 143a1783328074a5167d9619aff2a8ee9c2ca481 Mon Sep 17 00:00:00 2001
From: Bogdan Grigoruță <43993819+krady21@users.noreply.github.com>
Date: Wed, 3 May 2023 21:26:40 +0300
Subject: fix(editorconfig): add missing root validation (#23462)

---
 runtime/lua/editorconfig.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/editorconfig.lua b/runtime/lua/editorconfig.lua
index 5188c13284..a4024e5e7a 100644
--- a/runtime/lua/editorconfig.lua
+++ b/runtime/lua/editorconfig.lua
@@ -189,6 +189,7 @@ local function parse(filepath, dir)
         end
       elseif key ~= nil and val ~= nil then
         if key == 'root' then
+          assert(val == 'true' or val == 'false', 'root must be either "true" or "false"')
           opts.root = val == 'true'
         elseif pat and pat:match_str(filepath) then
           opts[key] = val
-- 
cgit 


From 7e70a1e44b223a51f4d8f06b9fe4c4ef77601f83 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 4 May 2023 13:43:23 +0800
Subject: vim-patch:9.0.0138: not enough characters accepted for 'spellfile'

Problem:    Not enough characters accepted for 'spellfile'.
Solution:   Add vim_is_fname_char() and use it for 'spellfile'.

https://github.com/vim/vim/commit/bc49c5f48f89c2d6f4d88ee77f44a11d68293be3

Cherry-pick related doc update from Vim runtime.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/options.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ab86e56a62..324151ee58 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5706,6 +5706,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Name of the word list file where words are added for the |zg| and |zw|
 	commands.  It must end in ".{encoding}.add".  You need to include the
 	path, otherwise the file is placed in the current directory.
+	The path may include characters from 'isfname', space, comma and '@'.
 								*E765*
 	It may also be a comma-separated list of names.  A count before the
 	|zg| and |zw| commands can be used to access each.  This allows using
-- 
cgit 


From dd3d857c390bee1f467eda9ec82c29948672bbff Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 4 May 2023 17:10:58 +0800
Subject: vim-patch:8.2.1461: Vim9: string indexes are counted in bytes

Problem:    Vim9: string indexes are counted in bytes.
Solution:   Use character indexes. (closes vim/vim#6574)

https://github.com/vim/vim/commit/e3c37d8ebf9dbbf210fde4a5fb28eb1f2a492a34

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/eval.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 0c18fd5b4e..9ee38e06d6 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1152,6 +1152,8 @@ text column numbers start with one!  Example, to get the byte under the
 cursor: >
 	:let c = getline(".")[col(".") - 1]
 
+Index zero gives the first byte.  Careful: text column numbers start with one!
+
 If the length of the String is less than the index, the result is an empty
 String.  A negative index always results in an empty string (reason: backward
 compatibility).  Use [-1:] to get the last byte.
-- 
cgit 


From b441dafdf53e367c7d43177274bd781c5c73e6e0 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 4 May 2023 16:46:38 +0800
Subject: vim-patch:8.2.2344: using inclusive index for slice is not always
 desired

Problem:    Using inclusive index for slice is not always desired.
Solution:   Add the slice() method, which has an exclusive index. (closes
            vim/vim#7408)

https://github.com/vim/vim/commit/6601b62943a19d4f8818c3638440663d67a17b6a

Cherry-pick a line in docs added later.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 14 ++++++++++++++
 runtime/doc/eval.txt    |  6 ++++++
 runtime/doc/usr_41.txt  |  3 +++
 3 files changed, 23 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index b37ac117f3..5be9ba910b 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -464,6 +464,8 @@ sign_unplacelist({list})	List	unplace a list of signs
 simplify({filename})		String	simplify filename as much as possible
 sin({expr})			Float	sine of {expr}
 sinh({expr})			Float	hyperbolic sine of {expr}
+slice({expr}, {start} [, {end}])  String, List or Blob
+					slice of a String, List or Blob
 sockconnect({mode}, {address} [, {opts}])
 				Number	Connects to socket
 sort({list} [, {func} [, {dict}]])
@@ -7773,6 +7775,18 @@ sinh({expr})						*sinh()*
 		Can also be used as a |method|: >
 			Compute()->sinh()
 
+slice({expr}, {start} [, {end}])			*slice()*
+		Similar to using a |slice| "expr[start : end]", but "end" is
+		used exclusive.  And for a string the indexes are used as
+		character indexes instead of byte indexes.
+		When {end} is omitted the slice continues to the last item.
+		When {end} is -1 the last item is omitted.
+		Returns an empty value if {start} or {end} are invalid.
+
+		Can also be used as a |method|: >
+			GetList()->slice(offset)
+
+
 sockconnect({mode}, {address} [, {opts}])		 *sockconnect()*
 		Connect a socket to an address. If {mode} is "pipe" then
 		{address} should be the path of a local domain socket (on
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 9ee38e06d6..05fdf2f5bb 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -270,6 +270,9 @@ similar to -1. >
 	:let shortlist = mylist[2:2]	" List with one item: [3]
 	:let otherlist = mylist[:]	" make a copy of the List
 
+Notice that the last index is inclusive.  If you prefer using an exclusive
+index use the |slice()| method.
+
 If the first index is beyond the last item of the List or the second item is
 before the first item, the result is an empty list.  There is no error
 message.
@@ -1178,6 +1181,9 @@ In legacy Vim script the indexes are byte indexes.  This doesn't recognize
 multibyte encodings, see |byteidx()| for computing the indexes.  If expr8 is
 a Number it is first converted to a String.
 
+The item at index expr1b is included, it is inclusive.  For an exclusive index
+use the |slice()| function.
+
 If expr1a is omitted zero is used.  If expr1b is omitted the length of the
 string minus one is used.
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 8e1b72eadc..9075d60b1b 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -630,6 +630,8 @@ String manipulation:					*string-functions*
 	submatch()		get a specific match in ":s" and substitute()
 	strpart()		get part of a string using byte index
 	strcharpart()		get part of a string using char index
+	slice()			take a slice of a string, using char index in
+				Vim9 script
 	strgetchar()		get character from a string using char index
 	expand()		expand special keywords
 	expandcmd()		expand a command like done for `:edit`
@@ -659,6 +661,7 @@ List manipulation:					*list-functions*
 	filter()		remove selected items from a List
 	map()			change each List item
 	reduce()		reduce a List to a value
+	slice()			take a slice of a List
 	sort()			sort a List
 	reverse()		reverse the order of a List or Blob
 	uniq()			remove copies of repeated adjacent items
-- 
cgit 


From 3724e65c30f7d1ef803ac4e34eab7d4a9531b1a8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 4 May 2023 17:42:34 +0800
Subject: vim-patch:8.2.2607: strcharpart() cannot include composing characters

Problem:    strcharpart() cannot include composing characters.
Solution:   Add the {skipcc} argument.

https://github.com/vim/vim/commit/02b4d9b18a03549b68e364e428392b7a62766c74

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5be9ba910b..c2dc5ddd5b 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -486,7 +486,7 @@ str2list({expr} [, {utf8}])	List	convert each character of {expr} to
 str2nr({expr} [, {base} [, {quoted}]])
 				Number	convert String to Number
 strcharlen({expr})		Number	character length of the String {expr}
-strcharpart({str}, {start} [, {len}])
+strcharpart({str}, {start} [, {len} [, {skipcc}]])
 				String	{len} characters of {str} at
 					character {start}
 strchars({expr} [, {skipcc}])	Number	character count of the String {expr}
@@ -7779,6 +7779,7 @@ slice({expr}, {start} [, {end}])			*slice()*
 		Similar to using a |slice| "expr[start : end]", but "end" is
 		used exclusive.  And for a string the indexes are used as
 		character indexes instead of byte indexes.
+		Also, composing characters are not counted.
 		When {end} is omitted the slice continues to the last item.
 		When {end} is -1 the last item is omitted.
 		Returns an empty value if {start} or {end} are invalid.
@@ -8129,12 +8130,16 @@ strcharlen({string})					*strcharlen()*
 			GetText()->strcharlen()
 
 
-strcharpart({src}, {start} [, {len}])			*strcharpart()*
+strcharpart({src}, {start} [, {len} [, {skipcc}]])		*strcharpart()*
 		Like |strpart()| but using character index and length instead
-		of byte index and length.  Composing characters are counted
-		separately.
+		of byte index and length.
+		When {skipcc} is omitted or zero, composing characters are
+		counted separately.
+		When {skipcc} set to 1, Composing characters are ignored,
+		similar to  |slice()|.
 		When a character index is used where a character does not
-		exist it is assumed to be one character.  For example: >
+		exist it is omitted and counted as one character.  For
+		example: >
 			strcharpart('abc', -1, 2)
 <		results in 'a'.
 
-- 
cgit 


From b8d5586d5b0d1e2d25533ee398d16bb2e8412820 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 5 May 2023 08:18:36 +0800
Subject: refactor: using a different error number for 'mousescroll'

Because E548 is linked to 'guicursor' in help.
---
 runtime/doc/options.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 324151ee58..c87b6f1835 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4254,7 +4254,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Warning: Setting this option can make pending mappings to be aborted
 	when the mouse is moved.
 
-						*'mousescroll'*
+						*'mousescroll'* *E5080*
 'mousescroll'		string	(default "ver:3,hor:6")
 			global
 	This option controls the number of lines / columns to scroll by when
-- 
cgit 


From 648f777931d49b8013146f69d7e2776f69c52900 Mon Sep 17 00:00:00 2001
From: jdrouhard <john@drouhard.dev>
Date: Fri, 5 May 2023 00:41:36 -0500
Subject: perf(lsp): load buffer contents once when processing semantic tokens
 responses (#23484)

perf(lsp): load buffer contents once when processing semantic token responses

Using _get_line_byte_from_position() for each token's boundaries was a
pretty huge bottleneck, since that function would load individual buffer
lines via nvim_buf_get_lines() (plus a lot of extra overhead). So each
token caused two calls to nvim_buf_get_lines() (once for the start
position, and once for the end position).

For semantic tokens, we only attach to buffers that have already been
loaded, so we can safely just get all the lines for the entire buffer at
once, and lift the rest of the _get_line_byte_from_position()
implementation directly while bypassing the part that loads the buffer
line.

While I was looking at get_lines (used by _get_line_byte_from_position),
I noticed that we were checking for non-file URIs before we even looked
to see if we already had the buffer loaded. Moving the buffer-loaded
check to be the first thing done in get_lines() more than halved the
average time spent transforming the token list into highlight ranges vs
when it was still using _get_line_byte_from_position. I ended up
improving that loop more by not using get_lines, but figured the
performance improvement it provided was worth leaving in.
---
 runtime/lua/vim/lsp/semantic_tokens.lua | 17 ++++++++++++-----
 runtime/lua/vim/lsp/util.lua            | 12 ++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index b6b09c58b1..376cac19a7 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -99,6 +99,7 @@ local function tokens_to_ranges(data, bufnr, client, request)
   local legend = client.server_capabilities.semanticTokensProvider.legend
   local token_types = legend.tokenTypes
   local token_modifiers = legend.tokenModifiers
+  local lines = api.nvim_buf_get_lines(bufnr, 0, -1, false)
   local ranges = {}
 
   local start = uv.hrtime()
@@ -137,11 +138,17 @@ local function tokens_to_ranges(data, bufnr, client, request)
     local modifiers = modifiers_from_number(data[i + 4], token_modifiers)
 
     ---@private
-    local function _get_byte_pos(char_pos)
-      return util._get_line_byte_from_position(bufnr, {
-        line = line,
-        character = char_pos,
-      }, client.offset_encoding)
+    local function _get_byte_pos(col)
+      if col > 0 then
+        local buf_line = lines[line + 1] or ''
+        local ok, result
+        ok, result = pcall(util._str_byteindex_enc, buf_line, col, client.offset_encoding)
+        if ok then
+          return result
+        end
+        return math.min(#buf_line, col)
+      end
+      return col
     end
 
     local start_col = _get_byte_pos(start_char)
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 31af2afb0b..8274361f6d 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -253,12 +253,17 @@ local function get_lines(bufnr, rows)
   ---@private
   local function buf_lines()
     local lines = {}
-    for _, row in pairs(rows) do
+    for _, row in ipairs(rows) do
       lines[row] = (api.nvim_buf_get_lines(bufnr, row, row + 1, false) or { '' })[1]
     end
     return lines
   end
 
+  -- use loaded buffers if available
+  if vim.fn.bufloaded(bufnr) == 1 then
+    return buf_lines()
+  end
+
   local uri = vim.uri_from_bufnr(bufnr)
 
   -- load the buffer if this is not a file uri
@@ -268,11 +273,6 @@ local function get_lines(bufnr, rows)
     return buf_lines()
   end
 
-  -- use loaded buffers if available
-  if vim.fn.bufloaded(bufnr) == 1 then
-    return buf_lines()
-  end
-
   local filename = api.nvim_buf_get_name(bufnr)
 
   -- get the data from the file
-- 
cgit 


From c8ebb04e92c9646d83110f4b45f1d1dfd5316561 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 5 May 2023 18:15:44 +0200
Subject: fix(health): replace healthFoo with DiagnosticFoo (#23475)

This replaces the custom `health{Error,Warning,Success}` highlight
groups with `Diagnostic{Error,Warning,Ok}`, which are defined by
default. Removes the link for `healthHelp`, which was no longer
actually used after #20879.
---
 runtime/doc/pi_health.txt      | 10 +++++-----
 runtime/syntax/checkhealth.vim | 11 +++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/pi_health.txt b/runtime/doc/pi_health.txt
index 266c021ecc..bcc933d8b2 100644
--- a/runtime/doc/pi_health.txt
+++ b/runtime/doc/pi_health.txt
@@ -12,7 +12,7 @@ any other environment conditions that a plugin might care about. Nvim ships
 with healthchecks for configuration, performance, python support, ruby
 support, clipboard support, and more.
 
-To run all healthchecks, use: >
+To run all healthchecks, use: >vim
 
         :checkhealth
 <
@@ -32,17 +32,17 @@ Commands                                *health-commands*
 
 :che[ckhealth] {plugins}
                 Run healthcheck(s) for one or more plugins. E.g. to run only
-                the standard Nvim healthcheck: >
+                the standard Nvim healthcheck: >vim
                         :checkhealth nvim
 <
                 To run the healthchecks for the "foo" and "bar" plugins
                 (assuming they are on 'runtimepath' and they have implemented
-                the Lua `require("foo.health").check()` interface): >
+                the Lua `require("foo.health").check()` interface): >vim
                         :checkhealth foo bar
 <
                 To run healthchecks for Lua submodules, use dot notation or
                 "*" to refer to all submodules. For example Nvim provides
-                `vim.lsp` and `vim.treesitter`:  >
+                `vim.lsp` and `vim.treesitter`:  >vim
                         :checkhealth vim.lsp vim.treesitter
                         :checkhealth vim*
 <
@@ -100,7 +100,7 @@ All such health modules must return a Lua table containing a `check()`
 function.
 
 Copy this sample code into `lua/foo/health.lua`, replacing "foo" in the path
-with your plugin name: >
+with your plugin name: >lua
 
         local M = {}
 
diff --git a/runtime/syntax/checkhealth.vim b/runtime/syntax/checkhealth.vim
index 4b0ce75a54..ea6555f005 100644
--- a/runtime/syntax/checkhealth.vim
+++ b/runtime/syntax/checkhealth.vim
@@ -11,15 +11,10 @@ unlet! b:current_syntax
 
 syn case match
 
-syn keyword healthError ERROR[:]
-syn keyword healthWarning WARNING[:]
-syn keyword healthSuccess OK[:]
+syn keyword DiagnosticError ERROR[:]
+syn keyword DiagnosticWarning WARNING[:]
+syn keyword DiagnosticOk OK[:]
 syn match helpSectionDelim "^======*\n.*$"
 syn match healthHeadingChar "=" conceal cchar=─ contained containedin=helpSectionDelim
 
-hi def link healthError Error
-hi def link healthWarning WarningMsg
-hi def healthSuccess guibg=#5fff00 guifg=#080808 ctermbg=82 ctermfg=232
-hi def link healthHelp Identifier
-
 let b:current_syntax = "checkhealth"
-- 
cgit 


From 9248dd77ac58bd23721dc4e156e43ed5e9ada338 Mon Sep 17 00:00:00 2001
From: marcoSven <me@marcosven.com>
Date: Sat, 6 May 2023 21:53:36 +0200
Subject: feat(lua): add hl priority opts on yank (#23509)

feat(lua): add hl priority opts on_yank

Signed-off-by: marcoSven <me@marcosven.com>
---
 runtime/doc/lua.txt           |  2 ++
 runtime/lua/vim/highlight.lua | 14 ++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 820bd0eb35..d9952205da 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -592,6 +592,8 @@ vim.highlight.on_yank({opts})                        *vim.highlight.on_yank()*
       - {on_macro} highlight when executing macro (default `false`)
       - {on_visual} highlight when yanking visual selection (default `true`)
       - {event} event structure (default |v:event|)
+      - {priority} priority of highlight (default |vim.highlight.priorities|`.user`)
+
 
 vim.highlight.range({bufnr}, {ns}, {hlgroup}, {start}, {finish}, {opts})
                                                        *vim.highlight.range()*
diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index a6cfcb730f..86e1adb49e 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -61,6 +61,7 @@ local yank_timer
 --              - on_macro  highlight when executing macro (default false)
 --              - on_visual highlight when yanking visual selection (default true)
 --              - event     event structure (default vim.v.event)
+--              - priority  integer priority (default |vim.highlight.priorities|`.user`)
 function M.on_yank(opts)
   vim.validate({
     opts = {
@@ -99,14 +100,11 @@ function M.on_yank(opts)
     yank_timer:close()
   end
 
-  M.range(
-    bufnr,
-    yank_ns,
-    higroup,
-    "'[",
-    "']",
-    { regtype = event.regtype, inclusive = event.inclusive, priority = M.priorities.user }
-  )
+  M.range(bufnr, yank_ns, higroup, "'[", "']", {
+    regtype = event.regtype,
+    inclusive = event.inclusive,
+    priority = opts.priority or M.priorities.user,
+  })
 
   yank_timer = vim.defer_fn(function()
     yank_timer = nil
-- 
cgit 


From 209ed16f57a73518296c3dce0a1ef3975181318d Mon Sep 17 00:00:00 2001
From: "Vadim A. Misbakh-Soloviov" <msva@users.noreply.github.com>
Date: Fri, 5 May 2023 11:15:39 +0700
Subject: fix(man.lua): return support of all sections

Current behaviour of `:Man` is to only work with "number" sections.
This is caused by wrong assumptions about man sections naming.

Also, there was similar assumption about length of section dirs
in `paths` variable.

fixes #23485

Signed-off-by: Vadim Misbakh-Soloviov <git@mva.name>
---
 runtime/lua/man.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index 1158d80941..ac493bdc7f 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -583,7 +583,7 @@ local function get_paths(sect, name)
 
   local mandirs = table.concat(vim.split(mandirs_raw, '[:\n]', { trimempty = true }), ',')
   ---@type string[]
-  local paths = fn.globpath(mandirs, 'man?/' .. name .. '*.' .. sect .. '*', false, true)
+  local paths = fn.globpath(mandirs, 'man[^\\/]*/' .. name .. '*.' .. sect .. '*', false, true)
 
   -- Prioritize the result from find_path as it obeys b:man_default_sects.
   local first = M.find_path(sect, name)
@@ -739,7 +739,12 @@ function M.open_page(count, smods, args)
   else
     -- Combine the name and sect into a manpage reference so that all
     -- verification/extraction can be kept in a single function.
-    if tonumber(args[1]) then
+    if args[1]:match('^%d$') or args[1]:match('^%d%a') or args[1]:match('^%a$') then
+      -- NB: Valid sections are not only digits, but also:
+      --  - <digit><word> (see POSIX mans),
+      --  - and even <letter> and <word> (see, for example, by tcl/tk)
+      -- NB2: don't optimize to :match("^%d"), as it will match manpages like
+      --    441toppm and others whose name starts with digit
       local sect = args[1]
       table.remove(args, 1)
       local name = table.concat(args, ' ')
-- 
cgit 


From a2b9117ca8f8abe8d4c9e2d1bacb73b1902a4e1f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 7 May 2023 08:12:42 +0800
Subject: vim-patch:8.2.1978: making a mapping work in all modes is complicated

Problem:    Making a mapping work in all modes is complicated.
Solution:   Add the <Cmd> special key. (Yegappan Lakshmanan, closes vim/vim#7282,
            closes 4784, based on patch by Bjorn Linse)

https://github.com/vim/vim/commit/957cf67d50516ba98716f59c9e1cb6412ec1535d

Change docs to match Vim if it's wording is better.
Change error numbers to match Vim.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/map.txt | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 164e2d4ec5..fccb6eeb75 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -290,7 +290,7 @@ Therefore the following is blocked for <expr> mappings:
 - Moving the cursor is allowed, but it is restored afterwards.
 - If the cmdline is changed, the old text and cursor position are restored.
 If you want the mapping to do any of these let the returned characters do
-that. (Or use a |<Cmd>| mapping instead.)
+that, or use a |<Cmd>| mapping instead.
 
 You can use getchar(), it consumes typeahead if there is any. E.g., if you
 have these mappings: >
@@ -324,19 +324,21 @@ be seen as a special key.
 
 						*<Cmd>* *:map-cmd*
 The <Cmd> pseudokey begins a "command mapping", which executes the command
-directly (without changing modes).  Where you might use ":...<CR>" in the
+directly without changing modes.  Where you might use ":...<CR>" in the
 {rhs} of a mapping, you can instead use "<Cmd>...<CR>".
 Example: >
-	noremap x <Cmd>echo mode(1)<cr>
+	noremap x <Cmd>echo mode(1)<CR>
 <
-This is more flexible than `:<C-U>` in visual and operator-pending mode, or
-`<C-O>:` in insert-mode, because the commands are executed directly in the
-current mode (instead of always going to normal-mode).  Visual-mode is
+This is more flexible than `:<C-U>` in Visual and Operator-pending mode, or
+`<C-O>:` in Insert mode, because the commands are executed directly in the
+current mode, instead of always going to Normal mode.  Visual mode is
 preserved, so tricks with |gv| are not needed.  Commands can be invoked
-directly in cmdline-mode (which would otherwise require timer hacks).
+directly in Command-line mode (which would otherwise require timer hacks).
+Example of using <Cmd> halfway Insert mode: >
+	nnoremap <F3> aText <Cmd>echo mode(1)<CR> Added<Esc>
 
 Unlike <expr> mappings, there are no special restrictions on the <Cmd>
-command: it is executed as if an (unrestricted) |autocommand| was invoked
+command: it is executed as if an (unrestricted) |autocmd| was invoked
 or an async event event was processed.
 
 Note:
@@ -350,7 +352,7 @@ Note:
 - In Visual mode  you can use `line('v')` and `col('v')` to get one end of the
   Visual area, the cursor is at the other end.
 
-							*E5520*
+							*E1135* *E1136*
 <Cmd> commands must terminate, that is, they must be followed by <CR> in the
 {rhs} of the mapping definition.  |Command-line| mode is never entered.
 
-- 
cgit 


From 29c228dc1087676af5b72f4145ab146cff75156e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 7 May 2023 08:33:06 +0800
Subject: vim-patch:8.2.3887: E1135 is used for two different errors

Problem:    E1135 is used for two different errors.
Solution:   Renumber one error.

https://github.com/vim/vim/commit/806da5176e9e9ab011d927c4ca33a8dde1769539

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/map.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index fccb6eeb75..9ec592215e 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -352,7 +352,7 @@ Note:
 - In Visual mode  you can use `line('v')` and `col('v')` to get one end of the
   Visual area, the cursor is at the other end.
 
-							*E1135* *E1136*
+							*E1255* *E1136*
 <Cmd> commands must terminate, that is, they must be followed by <CR> in the
 {rhs} of the mapping definition.  |Command-line| mode is never entered.
 
-- 
cgit 


From 057a5bc78d90db50caa85cdb34986fb186f0fd98 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 8 May 2023 13:57:24 +0800
Subject: docs: add some missing changes from Vim runtime updates (#23533)

---
 runtime/doc/eval.txt   | 8 ++++----
 runtime/doc/map.txt    | 5 +++--
 runtime/doc/repeat.txt | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 05fdf2f5bb..09c44a88af 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4270,10 +4270,10 @@ The input is in the variable "line", the results in the variables "file",
 
 getting the scriptnames in a Dictionary ~
 						*scriptnames-dictionary*
-The |:scriptnames| command can be used to get a list of all script files that
-have been sourced.  There is no equivalent function or variable for this
-(because it's rarely needed).  In case you need to manipulate the list this
-code can be used: >
+The `:scriptnames` command can be used to get a list of all script files that
+have been sourced.  There is also the `getscriptinfo()` function, but the
+information returned is not exactly the same.  In case you need to manipulate
+the output of `scriptnames` this code can be used: >
     " Get the output of ":scriptnames" in the scriptnames_output variable.
     let scriptnames_output = ''
     redir => scriptnames_output
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 9ec592215e..37158e2e76 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -338,8 +338,8 @@ Example of using <Cmd> halfway Insert mode: >
 	nnoremap <F3> aText <Cmd>echo mode(1)<CR> Added<Esc>
 
 Unlike <expr> mappings, there are no special restrictions on the <Cmd>
-command: it is executed as if an (unrestricted) |autocmd| was invoked
-or an async event event was processed.
+command: it is executed as if an (unrestricted) |autocommand| was invoked
+or an async event was processed.
 
 Note:
 - Because <Cmd> avoids mode-changes (unlike ":") it does not trigger
@@ -638,6 +638,7 @@ not to be matched with any key sequence.  This is useful in plugins
 							*<MouseMove>*
 The special key name "<MouseMove>" can be used to handle mouse movement.  It
 needs to be enabled with 'mousemoveevent'.
+The |getmousepos()| function can be used to obtain the mouse position.
 
 							*<Char>* *<Char->*
 To map a character by its decimal, octal or hexadecimal number the <Char>
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 23030761dd..8644ce4b38 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -336,6 +336,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 :scr[iptnames]		List all sourced script names, in the order they were
 			first sourced.  The number is used for the script ID
 			|<SID>|.
+			Also see `getscriptinfo()`.
 
 :scr[iptnames][!] {scriptId}			*:script*
 			Edit script {scriptId}.  Although ":scriptnames name"
-- 
cgit 


From 9753cda591e2fceaaeea26bdf2d5b5d874d7e9f5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 8 May 2023 17:02:53 +0200
Subject: fix(syntax): use correct diagnostic group for checkhealth (#23538)

---
 runtime/syntax/checkhealth.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/checkhealth.vim b/runtime/syntax/checkhealth.vim
index ea6555f005..2fd0aed601 100644
--- a/runtime/syntax/checkhealth.vim
+++ b/runtime/syntax/checkhealth.vim
@@ -12,7 +12,7 @@ unlet! b:current_syntax
 syn case match
 
 syn keyword DiagnosticError ERROR[:]
-syn keyword DiagnosticWarning WARNING[:]
+syn keyword DiagnosticWarn WARNING[:]
 syn keyword DiagnosticOk OK[:]
 syn match helpSectionDelim "^======*\n.*$"
 syn match healthHeadingChar "=" conceal cchar=─ contained containedin=helpSectionDelim
-- 
cgit 


From 02f92978fe4f4d465260a9936dca1526bbe76931 Mon Sep 17 00:00:00 2001
From: hituzi no sippo <43565959+hituzi-no-sippo@users.noreply.github.com>
Date: Wed, 10 May 2023 00:24:49 +0900
Subject: docs(lsp): fix type of `config.cmd` argument for
 `vim.lsp.start_client` (#23550)

---
 runtime/doc/lsp.txt     | 2 +-
 runtime/lua/vim/lsp.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index e07bfc2209..96ce5b7bc0 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -942,7 +942,7 @@ start_client({config})                                *vim.lsp.start_client()*
 
     Parameters: ~
       • {config}  (table) Configuration for the server:
-                  • cmd: (table|string|fun(dispatchers: table):table) command
+                  • cmd: (string[]|fun(dispatchers: table):table) command
                     string or list treated like |jobstart()|. The command must
                     launch the language server process. `cmd` can also be a
                     function that creates an RPC client. The function receives
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 5c78bd7580..b86d41b234 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -901,7 +901,7 @@ end
 --- Field `cmd` in {config} is required.
 ---
 ---@param config (table) Configuration for the server:
---- - cmd: (table|string|fun(dispatchers: table):table) command string or
+--- - cmd: (string[]|fun(dispatchers: table):table) command string or
 ---       list treated like |jobstart()|. The command must launch the language server
 ---       process. `cmd` can also be a function that creates an RPC client.
 ---       The function receives a dispatchers table and must return a table with the
-- 
cgit 


From 075a72d5ff9d49b1e93c0253b54931ecdcf673f3 Mon Sep 17 00:00:00 2001
From: Jon Huhn <nojnhuh@users.noreply.github.com>
Date: Tue, 9 May 2023 11:12:54 -0500
Subject: fix(lsp): fix relative patterns for `workspace/didChangeWatchedFiles`
 (#23548)

---
 runtime/lua/vim/lsp/_watchfiles.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index 533a955925..3a78724d79 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -198,16 +198,17 @@ function M.register(reg, ctx)
   end
   local watch_regs = {}
   for _, w in ipairs(reg.registerOptions.watchers) do
+    local relative_pattern = false
     local glob_patterns = {}
     if type(w.globPattern) == 'string' then
       for _, folder in ipairs(client.workspace_folders) do
         table.insert(glob_patterns, { baseUri = folder.uri, pattern = w.globPattern })
       end
     else
+      relative_pattern = true
       table.insert(glob_patterns, w.globPattern)
     end
     for _, glob_pattern in ipairs(glob_patterns) do
-      local pattern = parse(glob_pattern.pattern)
       local base_dir = nil
       if type(glob_pattern.baseUri) == 'string' then
         base_dir = glob_pattern.baseUri
@@ -216,9 +217,16 @@ function M.register(reg, ctx)
       end
       assert(base_dir, "couldn't identify root of watch")
       base_dir = vim.uri_to_fname(base_dir)
+
       local kind = w.kind
         or protocol.WatchKind.Create + protocol.WatchKind.Change + protocol.WatchKind.Delete
 
+      local pattern = glob_pattern.pattern
+      if relative_pattern then
+        pattern = base_dir .. '/' .. pattern
+      end
+      pattern = parse(pattern)
+
       table.insert(watch_regs, {
         base_dir = base_dir,
         pattern = pattern,
-- 
cgit 


From 4e5061dba765df2a74ac4a8182f6e7fe21da125d Mon Sep 17 00:00:00 2001
From: hituzi no sippo <43565959+hituzi-no-sippo@users.noreply.github.com>
Date: Wed, 10 May 2023 04:00:29 +0900
Subject: docs(lsp): fix `config.cmd` argument for `vim.lsp.start_client`
 (#23560)

---
 runtime/doc/lsp.txt     | 12 ++++++------
 runtime/lua/vim/lsp.lua |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 96ce5b7bc0..fc365c927b 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -942,12 +942,12 @@ start_client({config})                                *vim.lsp.start_client()*
 
     Parameters: ~
       • {config}  (table) Configuration for the server:
-                  • cmd: (string[]|fun(dispatchers: table):table) command
-                    string or list treated like |jobstart()|. The command must
-                    launch the language server process. `cmd` can also be a
-                    function that creates an RPC client. The function receives
-                    a dispatchers table and must return a table with the
-                    functions `request`, `notify`, `is_closing` and
+                  • cmd: (string[]|fun(dispatchers: table):table) command a
+                    list of strings treated like |jobstart()|. The command
+                    must launch the language server process. `cmd` can also be
+                    a function that creates an RPC client. The function
+                    receives a dispatchers table and must return a table with
+                    the functions `request`, `notify`, `is_closing` and
                     `terminate` See |vim.lsp.rpc.request()| and
                     |vim.lsp.rpc.notify()| For TCP there is a built-in rpc
                     client factory: |vim.lsp.rpc.connect()|
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index b86d41b234..a724593188 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -901,8 +901,8 @@ end
 --- Field `cmd` in {config} is required.
 ---
 ---@param config (table) Configuration for the server:
---- - cmd: (string[]|fun(dispatchers: table):table) command string or
----       list treated like |jobstart()|. The command must launch the language server
+--- - cmd: (string[]|fun(dispatchers: table):table) command a list of
+---       strings treated like |jobstart()|. The command must launch the language server
 ---       process. `cmd` can also be a function that creates an RPC client.
 ---       The function receives a dispatchers table and must return a table with the
 ---       functions `request`, `notify`, `is_closing` and `terminate`
-- 
cgit 


From e90b506903babc84f8c5b796c3b25c7f20e183d2 Mon Sep 17 00:00:00 2001
From: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
Date: Thu, 11 May 2023 09:43:02 +0200
Subject: vim-patch:9.0.1539: typst filetype is not recognized (#23578)

Problem:    Typst filetype is not recognized.
Solution:   Distinguish between sql and typst. (Gaetan Lepage, closes vim/vim#12363)

https://github.com/vim/vim/commit/4ce1bda869e4ec0152d7dcbe1e491ceac5341d5e
---
 runtime/doc/filetype.txt            |  1 +
 runtime/lua/vim/filetype.lua        |  4 +++-
 runtime/lua/vim/filetype/detect.lua | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 175c531950..48d6aed0f2 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -162,6 +162,7 @@ variables can be used to overrule the filetype used for certain extensions:
 	*.sys		g:filetype_sys
 	*.sh		g:bash_is_sh	|ft-sh-syntax|
 	*.tex		g:tex_flavor	|ft-tex-plugin|
+	*.typ		g:filetype_typ
 	*.w		g:filetype_w	|ft-cweb-syntax|
 
 For a few filetypes the global variable is used only when the filetype could
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 5c799b23f2..c746eef1bb 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -997,7 +997,9 @@ local extension = {
   spi = 'spyce',
   spy = 'spyce',
   tyc = 'sql',
-  typ = 'sql',
+  typ = function(path, bufnr)
+    return require('vim.filetype.detect').typ(bufnr)
+  end,
   pkb = 'sql',
   tyb = 'sql',
   pks = 'sql',
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 74b01d569c..94106a3547 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1322,6 +1322,28 @@ function M.txt(bufnr)
   end
 end
 
+function M.typ(bufnr)
+  if vim.g.filetype_typ then
+    return vim.g.filetype_typ
+  end
+
+  for _, line in ipairs(getlines(bufnr, 1, 200)) do
+    if
+      findany(line, {
+        '^CASE[%s]?=[%s]?SAME$',
+        '^CASE[%s]?=[%s]?LOWER$',
+        '^CASE[%s]?=[%s]?UPPER$',
+        '^CASE[%s]?=[%s]?OPPOSITE$',
+        '^TYPE%s',
+      })
+    then
+      return 'sql'
+    end
+  end
+
+  return 'typst'
+end
+
 -- Determine if a .v file is Verilog, V, or Coq
 function M.v(bufnr)
   if vim.fn.did_filetype() ~= 0 then
-- 
cgit 


From af040c3a079f6e25db0ad6b908aa1327f67deb82 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 11 May 2023 11:13:32 +0100
Subject: feat(treesitter): add support for setting query depths

---
 runtime/doc/news.txt                 |  4 ++++
 runtime/doc/treesitter.txt           |  7 ++++++-
 runtime/lua/vim/treesitter/_meta.lua | 14 ++++++++------
 runtime/lua/vim/treesitter/query.lua |  8 ++++++--
 4 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index bc357ac534..6b1e9112c1 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -29,6 +29,7 @@ The following changes may require adaptations in user config or plugins.
     set selectmode=mouse,key
     set mousemodel=popup
     set keymodel=startsel,stopsel
+<
 
 ==============================================================================
 ADDED FEATURES                                                     *news-added*
@@ -52,6 +53,9 @@ iterators |luaref-in|.
 • |'smoothscroll'| option to scroll by screen line rather than by text line
 when |'wrap'| is set.
 
+• |Query:iter_matches()| now has the ability to set the maximum start depth
+  for matches.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 0168b11499..d425c8dace 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -939,7 +939,7 @@ Query:iter_captures({self}, {node}, {source}, {start}, {stop})
         metadata
 
                                                         *Query:iter_matches()*
-Query:iter_matches({self}, {node}, {source}, {start}, {stop})
+Query:iter_matches({self}, {node}, {source}, {start}, {stop}, {opts})
     Iterates the matches of self on a given range.
 
     Iterate over all matches within a {node}. The arguments are the same as
@@ -966,6 +966,11 @@ Query:iter_matches({self}, {node}, {source}, {start}, {stop})
       • {source}  (integer|string) Source buffer or string to search
       • {start}   (integer) Starting line for the search
       • {stop}    (integer) Stopping line for the search (end-exclusive)
+      • {opts}    (table|nil) Options:
+                  • max_start_depth (integer) if non-zero, sets the maximum
+                    start depth for each match. This is used to prevent
+                    traversing too deep into a tree. Requires treesitter >=
+                    0.20.9.
       • {self}
 
     Return: ~
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index 4d0f43d030..c1009f5f5d 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -31,17 +31,19 @@ local TSNode = {}
 
 ---@param query userdata
 ---@param captures true
----@param start integer
----@param end_ integer
+---@param start? integer
+---@param end_? integer
+---@param opts? table
 ---@return fun(): integer, TSNode, any
-function TSNode:_rawquery(query, captures, start, end_) end
+function TSNode:_rawquery(query, captures, start, end_, opts) end
 
 ---@param query userdata
 ---@param captures false
----@param start integer
----@param end_ integer
+---@param start? integer
+---@param end_? integer
+---@param opts? table
 ---@return fun(): string, any
-function TSNode:_rawquery(query, captures, start, end_) end
+function TSNode:_rawquery(query, captures, start, end_, opts) end
 
 ---@class TSParser
 ---@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: boolean?): TSTree, integer[]
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 93841bb31e..e6a117557a 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -686,16 +686,20 @@ end
 ---@param source (integer|string) Source buffer or string to search
 ---@param start integer Starting line for the search
 ---@param stop integer Stopping line for the search (end-exclusive)
+---@param opts table|nil Options:
+---   - max_start_depth (integer) if non-zero, sets the maximum start depth
+---     for each match. This is used to prevent traversing too deep into a tree.
+---     Requires treesitter >= 0.20.9.
 ---
 ---@return (fun(): integer, table<integer,TSNode>, table): pattern id, match, metadata
-function Query:iter_matches(node, source, start, stop)
+function Query:iter_matches(node, source, start, stop, opts)
   if type(source) == 'number' and source == 0 then
     source = api.nvim_get_current_buf()
   end
 
   start, stop = value_or_node_range(start, stop, node)
 
-  local raw_iter = node:_rawquery(self.query, false, start, stop)
+  local raw_iter = node:_rawquery(self.query, false, start, stop, opts)
   ---@cast raw_iter fun(): string, any
   local function iter()
     local pattern, match = raw_iter()
-- 
cgit 


From 5825d2f6cabc852dcbf5367d631b7c6cf4516d68 Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Fri, 12 May 2023 02:17:38 +0200
Subject: test(scroll_opt): fix typo in porting oldtest (#23593)

---
 runtime/doc/api.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 62afdc5830..f65ca8594c 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -411,7 +411,7 @@ use >lua
   extid = vim.api.nvim_buf_set_extmark(buf, ns_id, line, col_start, {end_col = col_end, hl_group = hl_group})
 
   -- example: modify the extmark's highlight group
-  vim.api.nvim_buf_set_extmark(buf, ns_id, NEW_HL_GROUP, line, col_start, {end_col = col_end, hl_group = hl_group, id = extid})
+  vim.api.nvim_buf_set_extmark(buf, ns_id, line, col_start, {end_col = col_end, hl_group = NEW_HL_GROUP, id = extid})
 
   -- example: change the highlight's position
   vim.api.nvim_buf_set_extmark(buf, ns_id, NEW_LINE, col_start, {end_col = col_end, hl_group = NEW_HL_GROUP, id = extid})
-- 
cgit 


From f76e1ac92eda9cb364a9de49422b45a035256ca6 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 13 May 2023 08:40:06 +0800
Subject: vim-patch:9.0.1546: some commands for opening a file don't use
 'switchbuf' (#23600)

Problem:    Some commands for opening a file don't use 'switchbuf'.
Solution:   Use 'switchbuf' for more commands. (Yegappan Lakshmanan,
            closes vim/vim#12383, closes vim/vim#12381)

https://github.com/vim/vim/commit/54be5fb382d2bf25fd1b17ddab8b21f599019b81

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/options.txt | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c87b6f1835..934e3353fa 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6201,16 +6201,18 @@ A jump table for the options with a short description can be found at |Q_op|.
 'switchbuf' 'swb'	string	(default "uselast")
 			global
 	This option controls the behavior when switching between buffers.
-	Mostly for |quickfix| commands some values are also used for other
-	commands, as mentioned below.
+	This option is checked, when
+	- jumping to errors with the |quickfix| commands (|:cc|, |:cn|, |:cp|,
+	  etc.)
+	- jumping to a tag using the |:stag| command.
+	- opening a file using the |CTRL-W_f| or |CTRL-W_F| command.
+	- jumping to a buffer using a buffer split command (e.g.  |:sbuffer|,
+	  |:sbnext|, or |:sbrewind|).
 	Possible values (comma-separated list):
-	   useopen	If included, jump to the first open window that
-			contains the specified buffer (if there is one).
-			Otherwise: Do not examine other windows.
-			This setting is checked with |quickfix| commands, when
-			jumping to errors (":cc", ":cn", "cp", etc.).  It is
-			also used in all buffer related split commands, for
-			example ":sbuffer", ":sbnext", or ":sbrewind".
+	   useopen	If included, jump to the first open window in the
+			current tab page that contains the specified buffer
+			(if there is one).  Otherwise: Do not examine other
+			windows.
 	   usetab	Like "useopen", but also consider windows in other tab
 			pages.
 	   split	If included, split the current window before loading
-- 
cgit 


From 512a90520e3287b9962ed7853d1f1021b564a133 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Sat, 13 May 2023 17:27:05 +0800
Subject: refactor(lsp): mark server_ready function as deprecated (#23520)

---
 runtime/doc/lsp.txt         | 7 -------
 runtime/lua/vim/lsp/buf.lua | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index fc365c927b..a71b3459e9 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1299,13 +1299,6 @@ rename({new_name}, {options})                           *vim.lsp.buf.rename()*
                     • name (string|nil): Restrict clients used for rename to
                       ones where client.name matches this field.
 
-server_ready()                                    *vim.lsp.buf.server_ready()*
-    Checks whether the language servers attached to the current buffer are
-    ready.
-
-    Return: ~
-        `true` if server responds.
-
 signature_help()                                *vim.lsp.buf.signature_help()*
     Displays signature information about the symbol under the cursor in a
     floating window.
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 3d9011656f..a307dea673 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -31,7 +31,9 @@ end
 --- ready.
 ---
 ---@returns `true` if server responds.
+---@deprecated
 function M.server_ready()
+  vim.deprecate('vim.lsp.buf.server_ready', nil, '0.10.0')
   return not not vim.lsp.buf_notify(0, 'window/progress', {})
 end
 
-- 
cgit 


From 32dc484ec9ec2d86a5fc7127e37f1ef115b9be76 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 May 2023 13:29:11 +0200
Subject: fix(treesitter): support subfiletypes in get_lang (#23605)

---
 runtime/lua/vim/treesitter/language.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index b616d4d70b..08c297c9ad 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -27,6 +27,11 @@ function M.get_lang(filetype)
   if filetype == '' then
     return
   end
+  if ft_to_lang[filetype] then
+    return ft_to_lang[filetype]
+  end
+  -- support subfiletypes like html.glimmer
+  filetype = vim.split(filetype, '.', { plain = true })[1]
   return ft_to_lang[filetype]
 end
 
-- 
cgit 


From 6f29c68928c3f20d9a1b1a7a311cfac65aa1b4e6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 May 2023 15:00:08 +0200
Subject: vim-patch:9.0.1549: USD filetype is not recognized (#23608)

Problem:    USD filetype is not recognized.
Solution:   Add patterns for USD filetype. (Colin Kennedy, closes vim/vim#12370)

https://github.com/vim/vim/commit/b848ce6b7e27f24aff47a4d63933e0f96663acfe

Co-authored-by: Colin Kennedy <colinvfx@gmail.com>
---
 runtime/lua/vim/filetype.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index c746eef1bb..5075c18976 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1080,6 +1080,8 @@ local extension = {
   uit = 'uil',
   uil = 'uil',
   ungram = 'ungrammar',
+  usd = 'usd',
+  usda = 'usd',
   sba = 'vb',
   vb = 'vb',
   dsm = 'vb',
-- 
cgit 


From 08991b078267e5de0a19a136d00d4f71ad651a32 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sat, 13 May 2023 21:33:22 +0200
Subject: docs: small fixes

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
Co-authored-by: Gregory Anders <greg@gpanders.com>
Co-authored-by: HiPhish <hiphish@posteo.de>
Co-authored-by: Julio B <julio.bacel@gmail.com>
Co-authored-by: T727 <74924917+T-727@users.noreply.github.com>
Co-authored-by: camoz <camoz@users.noreply.github.com>
Co-authored-by: champignoom <66909116+champignoom@users.noreply.github.com>
---
 runtime/doc/api.txt                         |  1 +
 runtime/doc/autocmd.txt                     |  2 +-
 runtime/doc/builtin.txt                     |  2 +-
 runtime/doc/cmdline.txt                     |  6 +++---
 runtime/doc/editing.txt                     |  2 +-
 runtime/doc/eval.txt                        |  4 ++--
 runtime/doc/ft_raku.txt                     |  2 +-
 runtime/doc/helphelp.txt                    |  2 +-
 runtime/doc/indent.txt                      |  2 +-
 runtime/doc/insert.txt                      |  4 ++--
 runtime/doc/intro.txt                       |  2 +-
 runtime/doc/job_control.txt                 |  3 ---
 runtime/doc/lsp.txt                         |  4 ++--
 runtime/doc/lua-guide.txt                   |  4 ++--
 runtime/doc/lua.txt                         | 18 +++++++++-------
 runtime/doc/luvref.txt                      |  2 +-
 runtime/doc/news.txt                        | 14 ++++++------
 runtime/doc/options.txt                     |  4 ++--
 runtime/doc/pi_netrw.txt                    |  6 +++---
 runtime/doc/pi_tar.txt                      |  4 ++--
 runtime/doc/provider.txt                    |  2 +-
 runtime/doc/quickfix.txt                    |  2 +-
 runtime/doc/sign.txt                        |  6 +++---
 runtime/doc/spell.txt                       |  2 +-
 runtime/doc/syntax.txt                      |  6 +++---
 runtime/doc/treesitter.txt                  | 33 ++++++++++++++++-------------
 runtime/doc/ui.txt                          |  6 +++---
 runtime/doc/visual.txt                      |  2 +-
 runtime/lua/_vim9script.lua                 |  2 +-
 runtime/lua/vim/_editor.lua                 |  2 +-
 runtime/lua/vim/_inspector.lua              |  2 +-
 runtime/lua/vim/lsp.lua                     |  2 +-
 runtime/lua/vim/shared.lua                  |  8 +++----
 runtime/lua/vim/treesitter/languagetree.lua |  6 ++++--
 runtime/lua/vim/treesitter/query.lua        |  4 ++--
 runtime/lua/vim/version.lua                 |  2 +-
 36 files changed, 90 insertions(+), 85 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index f65ca8594c..1f65c3ac01 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1795,6 +1795,7 @@ nvim_create_user_command({name}, {command}, {*opts})
                    • fargs: (table) The args split by unescaped whitespace
                      (when more than one argument is allowed), if any
                      |<f-args>|
+                   • nargs: (string) Number of arguments |:command-nargs|
                    • bang: (boolean) "true" if the command was executed with a
                      ! modifier |<bang>|
                    • line1: (number) The starting line of the command range
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index d0713ee18c..01e8cc964d 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1162,7 +1162,7 @@ Set the 'cindent' option for C files in the /vim/src directory. >
 If you have a link from "/tmp/test.c" to "/home/nobody/vim/src/test.c", and
 you start editing "/tmp/test.c", this autocommand will match.
 
-Note:  To match part of a path, but not from the root directory, use a '*' as
+Note:  To match part of a path, but not from the root directory, use a "*" as
 the first character.  Example: >
 	:autocmd BufRead */doc/*.txt	set tw=78
 This autocommand will for example be executed for "/tmp/doc/xx.txt" and
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index c2dc5ddd5b..39448e23a6 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6014,7 +6014,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 			be applied, see below.
 
 		A field width or precision, or both, may be indicated by an
-		asterisk '*' instead of a digit string.  In this case, a
+		asterisk "*" instead of a digit string.  In this case, a
 		Number argument supplies the field width or precision.  A
 		negative field width is treated as a left adjustment flag
 		followed by a positive field width; a negative precision is
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 844aab6fa3..c43d1caa0e 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -143,7 +143,7 @@ CTRL-R {register}					*c_CTRL-R* *c_<C-R>*
 				the last delete or yank
 			'%'	the current file name
 			'#'	the alternate file name
-			'*'	the clipboard contents (X11: primary selection)
+			"*"	the clipboard contents (X11: primary selection)
 			'+'	the clipboard contents
 			'/'	the last search pattern
 			':'	the last command-line
@@ -431,8 +431,8 @@ CTRL-T		When 'incsearch' is set, entering a search pattern for "/" or
 		keyboard T is above G.
 
 The 'wildchar' option defaults to <Tab> (CTRL-E when in Vi compatible mode; in
-a previous version <Esc> was used).  In the pattern standard wildcards '*' and
-'?' are accepted when matching file names.  '*' matches any string, '?'
+a previous version <Esc> was used).  In the pattern standard wildcards "*" and
+'?' are accepted when matching file names.  "*" matches any string, '?'
 matches exactly one character.
 
 When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index bd1b62635e..c774d1ad38 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1581,7 +1581,7 @@ There are three different types of searching:
    so they work on all operating systems.  Note that "**" only acts as a
    special wildcard when it is at the start of a name.
 
-   The usage of '*' is quite simple: It matches 0 or more characters.  In a
+   The usage of "*" is quite simple: It matches 0 or more characters.  In a
    search pattern this would be ".*".  Note that the "." is not used for file
    searching.
 
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 09c44a88af..aa53244dc8 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1087,7 +1087,7 @@ That works, since the String "190" is automatically converted to the Number
 	1 . 90 * 90.0
 Should be read as: >
 	1 . (90 * 90.0)
-Since '.' has lower precedence than '*'.  This does NOT work, since this
+Since '.' has lower precedence than "*".  This does NOT work, since this
 attempts to concatenate a Float and a String.
 
 When dividing a Number by zero the result depends on the value:
@@ -2210,7 +2210,7 @@ v:register	The name of the register in effect for the current normal mode
 		(use this in custom commands that take a register).
 		If none is supplied it is the default register '"', unless
 		'clipboard' contains "unnamed" or "unnamedplus", then it is
-		'*' or '+'.
+		"*" or '+'.
 		Also see |getreg()| and |setreg()|
 
 					*v:relnum* *relnum-variable*
diff --git a/runtime/doc/ft_raku.txt b/runtime/doc/ft_raku.txt
index 3d1179ed4e..3fafa6e224 100644
--- a/runtime/doc/ft_raku.txt
+++ b/runtime/doc/ft_raku.txt
@@ -35,7 +35,7 @@ Some of them are available with standard Vim digraphs:
 	(- ∈    ?= ≅    != ≠  ~
 	-) ∋    ?- ≃  ~
 
-The Greek alphabet is available with '*' followed by a similar Latin symbol:
+The Greek alphabet is available with "*" followed by a similar Latin symbol:
 	*p π  ~
 	*t τ  ~
 	*X ×  ~
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index da307dd241..ca26332017 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -167,7 +167,7 @@ The initial height of the help window can be set with the 'helpheight' option
 						*help-buffer-options*
 When the help buffer is created, several local options are set to make sure
 the help text is displayed as it was intended:
-    'iskeyword'		nearly all ASCII chars except ' ', '*', '"' and '|'
+    'iskeyword'		nearly all ASCII chars except ' ', "*", '"' and '|'
     'foldmethod'	"manual"
     'tabstop'		8
     'arabic'		off
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index f3e196b426..ccff09d7fc 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -112,7 +112,7 @@ e	Reindent a line that starts with "else" when you type the second 'e'.
 =~word	Like =word, but ignore case.
 
 If you really want to reindent when you type 'o', 'O', 'e', '0', '<', '>',
-'*', ':' or '!', use "<o>", "<O>", "<e>", "<0>", "<<>", "<>>", "<*>", "<:>" or
+"*", ':' or '!', use "<o>", "<O>", "<e>", "<0>", "<<>", "<>>", "<*>", "<:>" or
 "<!>", respectively, for those keys.
 
 For an emacs-style indent mode where lines aren't indented every time you
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 49aa2a79a4..de1b850a3f 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -114,7 +114,7 @@ CTRL-R {register}				*i_CTRL-R*
 				the last delete or yank
 			'%'	the current file name
 			'#'	the alternate file name
-			'*'	the clipboard contents (X11: primary selection)
+			"*"	the clipboard contents (X11: primary selection)
 			'+'	the clipboard contents
 			'/'	the last search pattern
 			':'	the last command-line
@@ -1392,7 +1392,7 @@ other versions of HTML. Features:
 - after "<" complete tag name depending on context (no div suggestion inside
   of an a tag); '/>' indicates empty tags
 - inside of tag complete proper attributes (no width attribute for an a tag);
-  show also type of attribute; '*' indicates required attributes
+  show also type of attribute; "*" indicates required attributes
 - when attribute has limited number of possible values help to complete them
 - complete names of entities
 - complete values of "class" and "id" attributes with data obtained from
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 685c953718..15fe3838b7 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -385,7 +385,7 @@ Note:
   combinations actually work depends on the UI or host terminal.
 - When a key is pressed using a meta or alt modifier and no mapping exists for
   that keypress, Nvim may behave as though <Esc> was pressed before the key.
-- It is possible to notate combined modifiers (e.g. <C-A-T> for CTRL-ALT-T),
+- It is possible to notate combined modifiers (e.g. <M-C-T> for CTRL-ALT-T),
   but your terminal must encode the input for that to work. |tui-input|
 
 								*<>*
diff --git a/runtime/doc/job_control.txt b/runtime/doc/job_control.txt
index 37a4e2ebb1..d99c76ab22 100644
--- a/runtime/doc/job_control.txt
+++ b/runtime/doc/job_control.txt
@@ -134,9 +134,6 @@ To send data to the job's stdin, use |chansend()|: >vim
     :call chansend(job1, "invalid-command\n")
     :call chansend(job1, "exit\n")
 <
-A job may be killed with |jobstop()|: >vim
-    :call jobstop(job1)
-<
 A job may be killed at any time with the |jobstop()| function:
 >vim
     :call jobstop(job1)
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index a71b3459e9..ca1a9a414d 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -954,8 +954,8 @@ start_client({config})                                *vim.lsp.start_client()*
                   • cmd_cwd: (string, default=|getcwd()|) Directory to launch
                     the `cmd` process. Not related to `root_dir`.
                   • cmd_env: (table) Environment flags to pass to the LSP on
-                    spawn. Must be specified using a map-like table.
-                    Non-string values are coerced to string. Example: >
+                    spawn. Must be specified using a table. Non-string values
+                    are coerced to string. Example: >
 
                        { PORT = 8080; HOST = "0.0.0.0"; }
 <
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 3c2e1ac3d1..94db6aac0a 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -624,9 +624,9 @@ in a different file:
 >lua
     local mygroup = vim.api.nvim_create_augroup('vimrc', { clear = false })
     vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, {
-      pattern = '*.html',
+      pattern = '*.c',
       group = mygroup,
-      command = 'set shiftwidth=4',
+      command = 'set noexpandtab',
     })
 <
 ------------------------------------------------------------------------------
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index d9952205da..4eec4ee583 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -321,20 +321,22 @@ Example: >vim
     :echo luaeval('string.match(_A, "[a-z]+")', 'XYXfoo123')
     " foo
 <
+                                                                    *lua-table*
 Lua tables are used as both dictionaries and lists, so it is impossible to
 determine whether empty table is meant to be empty list or empty dictionary.
 Additionally Lua does not have integer numbers. To distinguish between these
 cases there is the following agreement:
-
+                                                                     *lua-list*
 0. Empty table is empty list.
 1. Table with N incrementally growing integral numbers, starting from 1 and
    ending with N is considered to be a list.
+                                                                     *lua-dict*
 2. Table with string keys, none of which contains NUL byte, is considered to
    be a dictionary.
 3. Table with string keys, at least one of which contains NUL byte, is also
    considered to be a dictionary, but this time it is converted to
    a |msgpack-special-map|.
-                                                             *lua-special-tbl*
+                                                              *lua-special-tbl*
 4. Table with `vim.type_idx` key may be a dictionary, a list or floating-point
    value:
    - `{[vim.type_idx]=vim.types.float, [vim.val_idx]=1}` is converted to
@@ -1432,7 +1434,7 @@ keycode({str})                                                 *vim.keycode()*
       • |nvim_replace_termcodes()|
 
 lua_omnifunc({find_start}, {_})                           *vim.lua_omnifunc()*
-    Omnifunc for completing lua values from from the runtime lua interpreter,
+    Omnifunc for completing lua values from the runtime lua interpreter,
     similar to the builtin completion for the `:lua` command.
 
     Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a lua buffer.
@@ -1881,7 +1883,7 @@ tbl_count({t})                                               *vim.tbl_count()*
       • https://github.com/Tieske/Penlight/blob/master/lua/pl/tablex.lua
 
 tbl_deep_extend({behavior}, {...})                     *vim.tbl_deep_extend()*
-    Merges recursively two or more map-like tables.
+    Merges recursively two or more tables.
 
     Parameters: ~
       • {behavior}  (string) Decides what to do if a key is found in more than
@@ -1889,7 +1891,7 @@ tbl_deep_extend({behavior}, {...})                     *vim.tbl_deep_extend()*
                     • "error": raise an error
                     • "keep": use value from the leftmost map
                     • "force": use value from the rightmost map
-      • {...}       (table) Two or more map-like tables
+      • {...}       (table) Two or more tables
 
     Return: ~
         (table) Merged table
@@ -1898,7 +1900,7 @@ tbl_deep_extend({behavior}, {...})                     *vim.tbl_deep_extend()*
       • |vim.tbl_extend()|
 
 tbl_extend({behavior}, {...})                               *vim.tbl_extend()*
-    Merges two or more map-like tables.
+    Merges two or more tables.
 
     Parameters: ~
       • {behavior}  (string) Decides what to do if a key is found in more than
@@ -1906,7 +1908,7 @@ tbl_extend({behavior}, {...})                               *vim.tbl_extend()*
                     • "error": raise an error
                     • "keep": use value from the leftmost map
                     • "force": use value from the rightmost map
-      • {...}       (table) Two or more map-like tables
+      • {...}       (table) Two or more tables
 
     Return: ~
         (table) Merged table
@@ -2728,7 +2730,7 @@ versions (1.2.3-rc1) are not matched. >
 <
 
 cmp({v1}, {v2})                                            *vim.version.cmp()*
-    Parses and compares two version version objects (the result of
+    Parses and compares two version objects (the result of
     |vim.version.parse()|, or specified literally as a `{major, minor, patch}`
     tuple, e.g. `{1, 0, 3}`).
 
diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 799d0f6f74..2be75d5b0c 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -2917,7 +2917,7 @@ uv.fs_fstat({fd} [, {callback}])                                 *uv.fs_fstat()*
 uv.fs_lstat({path} [, {callback}])                               *uv.fs_lstat()*
 
                 Parameters:
-                - `fd`: `integer`
+                - `path`: `string`
                 - `callback`: `callable` (async version) or `nil` (sync
                   version)
                   - `err`: `nil` or `string`
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 6b1e9112c1..11ef26165f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -37,7 +37,7 @@ ADDED FEATURES                                                     *news-added*
 The following new APIs or features were added.
 
 • |vim.iter()| provides a generic iterator interface for tables and Lua
-iterators |luaref-in|.
+  iterators |luaref-in|.
 
 • Added |vim.keycode()| for translating keycodes in a string.
 
@@ -51,7 +51,7 @@ iterators |luaref-in|.
   default).
 
 • |'smoothscroll'| option to scroll by screen line rather than by text line
-when |'wrap'| is set.
+  when |'wrap'| is set.
 
 • |Query:iter_matches()| now has the ability to set the maximum start depth
   for matches.
@@ -88,10 +88,10 @@ The following functions are now deprecated and will be removed in the next
 release.
 
 • Checkhealth functions:
-  - |health#report_error|, |vim.health.report_error()|	Use Lua |vim.health.error()| instead.
-  - |health#report_info|, |vim.health.report_info()|	Use Lua |vim.health.info()| instead.
-  - |health#report_ok|, |vim.health.report_ok()|	Use Lua |vim.health.ok()| instead.
-  - |health#report_start|, |vim.health.report_start()|	Use Lua |vim.health.start()| instead.
-  - |health#report_warn|, |vim.health.report_warn()|	Use Lua |vim.health.warn()| instead.
+  - |health#report_error|, |vim.health.report_error()|	Use |vim.health.error()| instead.
+  - |health#report_info|, |vim.health.report_info()|	Use |vim.health.info()| instead.
+  - |health#report_ok|, |vim.health.report_ok()|	Use |vim.health.ok()| instead.
+  - |health#report_start|, |vim.health.report_start()|	Use |vim.health.start()| instead.
+  - |health#report_warn|, |vim.health.report_warn()|	Use |vim.health.warn()| instead.
 
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 934e3353fa..9f5a089434 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1324,7 +1324,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			register.  When "unnamed" is also included to the
 			option, yank and delete operations (but not put)
 			will additionally copy the text into register
-			'*'. See |clipboard|.
+			"*". See |clipboard|.
 
 						*'cmdheight'* *'ch'*
 'cmdheight' 'ch'	number	(default 1)
@@ -3523,7 +3523,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	that is not white space or punctuation).
 	For C programs you could use "a-z,A-Z,48-57,_,.,-,>".
 	For a help file it is set to all non-blank printable characters except
-	'*', '"' and '|' (so that CTRL-] on a command finds the help for that
+	"*", '"' and '|' (so that CTRL-] on a command finds the help for that
 	command).
 	When the 'lisp' option is on the '-' character is always included.
 	This option also influences syntax highlighting, unless the syntax
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 0742071d12..78e2035ad1 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -4125,7 +4125,7 @@ netrw:
 				  The "<nowait>" modifier has been included
 				  with most of netrw's mappings to avoid that
 				  delay.
-		Jun 26, 2015	* |netrw-gn| mapping implemted
+		Jun 26, 2015	* |netrw-gn| mapping implemented
 				* :Ntree NotADir resulted in having
 				  the tree listing expand in the error messages
 				  window.  Fixed.
@@ -4332,8 +4332,8 @@ netrw:
 		Dec 24, 2013	* (esquifit) asked that netrw allow the
 				  /cygdrive prefix be a user-alterable
 				  parameter.
-		Jan 02, 2014	* Fixed a problem with netrw-based ballon
-				  evaluation (ie. netrw#NetrwBaloonHelp()
+		Jan 02, 2014	* Fixed a problem with netrw-based balloon
+				  evaluation (ie. netrw#NetrwBalloonHelp()
 				  not having been loaded error messages)
 		Jan 03, 2014	* Fixed a problem with tree listings
 				* New command installed: |:Ntree|
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index e664b98086..b104aef194 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -44,8 +44,8 @@ Copyright 2005-2017:					*tar-copyright*
 	the file mentioned in the tarball.  If the current directory is not
 	correct for that path, :TarDiff will fail to find the associated file.
 
-	If the [filename] is given, that that filename (and path) will be used
-	to specify the associated file.
+	If the [filename] is given, that filename (and path) will be used to
+	specify the associated file.
 
 
    PREVENTING LOADING~
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 432e6138fa..117997cec2 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -182,7 +182,7 @@ the "+" and/or "*" registers explicitly): >vim
 See 'clipboard' for details and options.
 
 							      *clipboard-tool*
-The presence of a working clipboard tool implicitly enables the '+' and '*'
+The presence of a working clipboard tool implicitly enables the '+' and "*"
 registers. Nvim looks for these clipboard tools, in order of priority:
 
   - |g:clipboard|
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 0b5757d720..7c06358be2 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1615,7 +1615,7 @@ be escaped), meta symbols have to be written with leading '%':
 	%\		The single '\' character.  Note that this has to be
 			escaped ("%\\") in ":set errorformat=" definitions.
 	%.		The single '.' character.
-	%#		The single '*'(!) character.
+	%#		The single "*"(!) character.
 	%^		The single '^' character.  Note that this is not
 			useful, the pattern already matches start of line.
 	%$		The single '$' character.  Note that this is not
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 9f469767a2..b4c4debac7 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -468,7 +468,7 @@ sign_getplaced([{buf} [, {dict}]])			*sign_getplaced()*
 		   id		select sign with this identifier
 		   lnum		select signs placed in this line. For the use
 				of {lnum}, see |line()|.
-		If {group} is '*', then signs in all the groups including the
+		If {group} is "*", then signs in all the groups including the
 		global group are returned. If {group} is not supplied or is an
 		empty string, then only signs in the global group are
 		returned.  If no arguments are supplied, then signs in the
@@ -683,7 +683,7 @@ sign_unplace({group} [, {dict}])			*sign_unplace()*
 		is similar to the |:sign-unplace| command.
 
 		{group} is the sign group name. To use the global sign group,
-		use an empty string.  If {group} is set to '*', then all the
+		use an empty string.  If {group} is set to "*", then all the
 		groups including the global group are used.
 		The signs in {group} are selected based on the entries in
 		{dict}.  The following optional entries in {dict} are
@@ -735,7 +735,7 @@ sign_unplacelist({list})				*sign_unplacelist()*
 				the buffers.
 		    group	sign group name. If not specified or set to an
 				empty string, then the global sign group is
-				used. If set to '*', then all the groups
+				used. If set to "*", then all the groups
 				including the global group are used.
 		    id		sign identifier. If not specified, then all
 				the signs in the specified group are removed.
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index d985093d9f..75e4767743 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -409,7 +409,7 @@ of the previous line "al." will be flagged as an error.  And when you type
 Use |CTRL-L| to redraw right away.  "[s" will also stop at a word combination
 with a line break.
 
-When encountering a line break Vim skips characters such as '*', '>' and '"',
+When encountering a line break Vim skips characters such as "*", '>' and '"',
 so that comments in C, shell and Vim code can be spell checked.
 
 
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 00a5e1c8ad..14f613d3fc 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -5020,7 +5020,7 @@ stop={term-list}				*term-list* *highlight-stop*
 	highlighted area.  This should undo the "start" argument.
 	Otherwise the screen will look messed up.
 
-        {term-list} is a a string with escape sequences. This is any string of
+        {term-list} is a string with escape sequences. This is any string of
         characters, except that it can't start with "t_" and blanks are not
         allowed.  The <> notation is recognized here, so you can use things
         like "<Esc>" and "<Space>".  Example:
@@ -5058,10 +5058,10 @@ ctermbg={color-nr}				*ctermbg*
 
 	The number under "NR-16" is used for 16-color terminals ('t_Co'
 	greater than or equal to 16).  The number under "NR-8" is used for
-	8-color terminals ('t_Co' less than 16).  The '*' indicates that the
+	8-color terminals ('t_Co' less than 16).  The "*" indicates that the
 	bold attribute is set for ctermfg.  In many 8-color terminals (e.g.,
 	"linux"), this causes the bright colors to appear.  This doesn't work
-	for background colors!	Without the '*' the bold attribute is removed.
+	for background colors!	Without the "*" the bold attribute is removed.
 	If you want to set the bold attribute in a different way, put a
 	"cterm=" argument AFTER the "ctermfg=" or "ctermbg=" argument.	Or use
 	a number instead of a color name.
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index d425c8dace..483812b7c9 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -18,12 +18,13 @@ changes. This documentation may also not fully reflect the latest changes.
 PARSER FILES                                              *treesitter-parsers*
 
 Parsers are the heart of tree-sitter. They are libraries that tree-sitter will
-search for in the `parser` runtime directory. By default, Nvim bundles only
-parsers for C, Lua, and Vimscript, but parsers can be installed manually or
-via a plugin like https://github.com/nvim-treesitter/nvim-treesitter.
-Parsers are searched for as `parser/{lang}.*` in any 'runtimepath' directory.
-If multiple parsers for the same language are found, the first one is used.
-(This typically implies the priority "user config > plugins > bundled".
+search for in the `parser` runtime directory. By default, Nvim bundles parsers
+for C, Lua, Vimscript, Vimdoc and Treesitter query files, but parsers can be
+installed manually or via a plugin like
+https://github.com/nvim-treesitter/nvim-treesitter. Parsers are searched for
+as `parser/{lang}.*` in any 'runtimepath' directory. If multiple parsers for
+the same language are found, the first one is used. (This typically implies
+the priority "user config > plugins > bundled".
 A parser can also be loaded manually using a full path: >lua
 
     vim.treesitter.language.add('python', { path = "/path/to/python.so" })
@@ -307,10 +308,10 @@ currently supported modeline alternatives:
 Note: These modeline comments must be at the top of the query, but can be
 repeated, for example, the following two modeline blocks are both valid:
 >query
-
     ;; inherits: foo,bar
     ;; extends
-
+<
+>query
     ;; extends
     ;;
     ;; inherits: baz
@@ -907,11 +908,10 @@ Query:iter_captures({self}, {node}, {source}, {start}, {stop})
 
     {source} is needed if the query contains predicates; then the caller must
     ensure to use a freshly parsed tree consistent with the current text of
-    the buffer (if relevant). {start_row} and {end_row} can be used to limit
-    matches inside a row range (this is typically used with root node as the
-    {node}, i.e., to get syntax highlight matches in the current viewport).
-    When omitted, the {start} and {end} row values are used from the given
-    node.
+    the buffer (if relevant). {start} and {stop} can be used to limit matches
+    inside a row range (this is typically used with root node as the {node},
+    i.e., to get syntax highlight matches in the current viewport). When
+    omitted, the {start} and {stop} row values are used from the given node.
 
     The iterator returns three values: a numeric id identifying the capture,
     the captured node, and metadata from any directives processing the match.
@@ -1164,12 +1164,15 @@ LanguageTree:register_cbs({self}, {cbs}, {recursive})
                       • `on_bytes` : see |nvim_buf_attach()|, but this will be called after the parsers callback.
                       • `on_changedtree` : a callback that will be called
                         every time the tree has syntactical changes. It will
-                        only be passed one argument, which is a table of the
-                        ranges (as node ranges) that changed.
+                        be passed two arguments: a table of the ranges (as
+                        node ranges) that changed and the changed tree.
                       • `on_child_added` : emitted when a child is added to
                         the tree.
                       • `on_child_removed` : emitted when a child is removed
                         from the tree.
+                      • `on_detach` : emitted when the buffer is detached, see
+                        |nvim_buf_detach_event|. Takes one argument, the
+                        number of the buffer.
       • {recursive?}  boolean Apply callbacks recursively for all children.
                       Any new children will also inherit the callbacks.
       • {self}
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index 4ff74714f3..c64c450aa1 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -336,7 +336,7 @@ numerical highlight ids to the actual attributes.
 
 	Highlights are always transmitted both for both the RGB format and as
 	terminal 256-color codes, as the `rgb_attr` and `cterm_attr` parameters
-	respectively. The |ui-rgb| option has no effect effect anymore.
+	respectively. The |ui-rgb| option has no effect anymore.
 	Most external UIs will only need to store and use the `rgb_attr`
 	attributes.
 
@@ -352,7 +352,7 @@ numerical highlight ids to the actual attributes.
 	|ui-hlstate| extension explained below.
 
 ["hl_group_set", name, hl_id] ~
-	The bulitin highlight group `name` was set to use the attributes `hl_id`
+	The built-in highlight group `name` was set to use the attributes `hl_id`
 	defined by a previous `hl_attr_define` call. This event is not needed
 	to render the grids which use attribute ids directly, but is useful
 	for a UI who want to render its own elements with consistent
@@ -710,7 +710,7 @@ For command-line 'wildmenu' UI events, activate |ui-popupmenu|.
 	to distinguish different command lines active at the same time. The
 	first invoked command line has level 1, the next recursively-invoked
 	prompt has level 2. A command line invoked from the |cmdline-window|
-	has a higher level than than the edited command line.
+	has a higher level than the edited command line.
 
 ["cmdline_pos", pos, level] ~
 	Change the cursor position in the cmdline.
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 0c6bd4f3a1..6ca486e8cf 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -398,7 +398,7 @@ selected text: >
 (In the <> notation |<>|, when typing it you should type it literally; you
 need to remove the 'B' flag from 'cpoptions')
 
-Note that special characters (like '.' and '*') will cause problems.
+Note that special characters (like '.' and "*") will cause problems.
 
 Visual-block Examples					*blockwise-examples*
 With the following text, I will indicate the commands to produce the block and
diff --git a/runtime/lua/_vim9script.lua b/runtime/lua/_vim9script.lua
index 76e427b748..b983878637 100644
--- a/runtime/lua/_vim9script.lua
+++ b/runtime/lua/_vim9script.lua
@@ -312,7 +312,7 @@ vim9['fn'] = (function()
       -- We do have vim9script ;) that's this plugin
       ['vim9script'] = true,
 
-      -- Include some vim patches that are sometimes required by variuos vim9script plugins
+      -- Include some vim patches that are sometimes required by various vim9script plugins
       -- that we implement via vim9jit
       [ [[patch-8.2.2261]] ] = true,
       [ [[patch-8.2.4257]] ] = true,
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 20e813d77c..b26def5958 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -778,7 +778,7 @@ do
   -- some bugs, so fake the two-step dance for now.
   local matches
 
-  --- Omnifunc for completing lua values from from the runtime lua interpreter,
+  --- Omnifunc for completing lua values from the runtime lua interpreter,
   --- similar to the builtin completion for the `:lua` command.
   ---
   --- Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a lua buffer.
diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua
index 2ebb7a7efd..ecd39c35bc 100644
--- a/runtime/lua/vim/_inspector.lua
+++ b/runtime/lua/vim/_inspector.lua
@@ -90,7 +90,7 @@ function vim.inspect_pos(bufnr, row, col, filter)
     nsmap[id] = name
   end
 
-  --- Convert an extmark tuple into a map-like table
+  --- Convert an extmark tuple into a table
   --- @private
   local function to_map(extmark)
     extmark = {
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index a724593188..92f5653158 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -913,7 +913,7 @@ end
 ---       the `cmd` process. Not related to `root_dir`.
 ---
 --- - cmd_env: (table) Environment flags to pass to the LSP on
----       spawn.  Must be specified using a map-like table.
+---       spawn.  Must be specified using a table.
 ---       Non-string values are coerced to string.
 ---       Example:
 ---       <pre>
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index a55deb1415..4f230c4412 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -361,7 +361,7 @@ local function tbl_extend(behavior, deep_extend, ...)
   return ret
 end
 
---- Merges two or more map-like tables.
+--- Merges two or more tables.
 ---
 ---@see |extend()|
 ---
@@ -369,13 +369,13 @@ end
 ---      - "error": raise an error
 ---      - "keep":  use value from the leftmost map
 ---      - "force": use value from the rightmost map
----@param ... table Two or more map-like tables
+---@param ... table Two or more tables
 ---@return table Merged table
 function vim.tbl_extend(behavior, ...)
   return tbl_extend(behavior, false, ...)
 end
 
---- Merges recursively two or more map-like tables.
+--- Merges recursively two or more tables.
 ---
 ---@see |vim.tbl_extend()|
 ---
@@ -385,7 +385,7 @@ end
 ---      - "error": raise an error
 ---      - "keep":  use value from the leftmost map
 ---      - "force": use value from the rightmost map
----@param ... T2 Two or more map-like tables
+---@param ... T2 Two or more tables
 ---@return T1|T2 (table) Merged table
 function vim.tbl_deep_extend(behavior, ...)
   return tbl_extend(behavior, true, ...)
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 1adf6759fa..0efe3af85c 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -882,10 +882,12 @@ end
 ---@param cbs table An |nvim_buf_attach()|-like table argument with the following handlers:
 ---           - `on_bytes` : see |nvim_buf_attach()|, but this will be called _after_ the parsers callback.
 ---           - `on_changedtree` : a callback that will be called every time the tree has syntactical changes.
----              It will only be passed one argument, which is a table of the ranges (as node ranges) that
----              changed.
+---              It will be passed two arguments: a table of the ranges (as node ranges) that
+---              changed and the changed tree.
 ---           - `on_child_added` : emitted when a child is added to the tree.
 ---           - `on_child_removed` : emitted when a child is removed from the tree.
+---           - `on_detach` : emitted when the buffer is detached, see |nvim_buf_detach_event|.
+---              Takes one argument, the number of the buffer.
 --- @param recursive? boolean Apply callbacks recursively for all children. Any new children will
 ---                           also inherit the callbacks.
 function LanguageTree:register_cbs(cbs, recursive)
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index e6a117557a..75e5bf8870 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -609,10 +609,10 @@ end
 ---
 --- {source} is needed if the query contains predicates; then the caller
 --- must ensure to use a freshly parsed tree consistent with the current
---- text of the buffer (if relevant). {start_row} and {end_row} can be used to limit
+--- text of the buffer (if relevant). {start} and {stop} can be used to limit
 --- matches inside a row range (this is typically used with root node
 --- as the {node}, i.e., to get syntax highlight matches in the current
---- viewport). When omitted, the {start} and {end} row values are used from the given node.
+--- viewport). When omitted, the {start} and {stop} row values are used from the given node.
 ---
 --- The iterator returns three values: a numeric id identifying the capture,
 --- the captured node, and metadata from any directives processing the match.
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 3aacf3d4e0..ebe8f4e053 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -333,7 +333,7 @@ local function create_err_msg(v)
   return string.format('invalid version: %s (%s)', tostring(v), type(v))
 end
 
---- Parses and compares two version version objects (the result of |vim.version.parse()|, or
+--- Parses and compares two version objects (the result of |vim.version.parse()|, or
 --- specified literally as a `{major, minor, patch}` tuple, e.g. `{1, 0, 3}`).
 ---
 --- Example:
-- 
cgit 


From 0124b0249050fdfb9f6d2eb668fd411b63d0664c Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 14 May 2023 19:18:49 +0800
Subject: docs(if_pyth): make it work with Python 3 instead of Python 2
 (#23620)

---
 runtime/doc/if_pyth.txt | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 415a58ec71..7b20bab0d4 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -17,7 +17,7 @@ Commands						*python-commands*
 :[range]py[thon] {stmt}
 			Execute Python statement {stmt}.  A simple check if
 			the `:python` command is working: >vim
-				:python print "Hello"
+				:python print("Hello")
 
 :[range]py[thon] << [trim] [{endmarker}]
 {script}
@@ -35,7 +35,7 @@ Example: >vim
 	python << EOF
 	class StrawberryIcecream:
 		def __call__(self):
-			print 'EAT ME'
+			print('EAT ME')
 	EOF
 	endfunction
 
@@ -100,11 +100,9 @@ To pass arguments you need to set sys.argv[] explicitly.  Example: >vim
 
 Here are some examples					*python-examples*
 >vim
-
 	:python from vim import *
-	:python from string import upper
-	:python current.line = upper(current.line)
-	:python print "Hello"
+	:python current.line = str.upper(current.line)
+	:python print("Hello")
 	:python str = current.buffer[42]
 
 Note that changes (such as the "import" statements) persist from one command
@@ -143,7 +141,7 @@ module before using it: >vim
 	:python import vim
 
 Overview >vim
-	:py print "Hello"		# displays a message
+	:py print("Hello")		# displays a message
 	:py vim.command(cmd)		# execute an Ex command
 	:py w = vim.windows[n]		# gets window "n"
 	:py cw = vim.current.window	# gets the current window
@@ -175,10 +173,6 @@ vim.command(str)					*python-command*
 		# Note the use of single quotes to delimit a string containing
 		# double quotes
 		normal('"a2dd"aP')
-<								*E659*
-	The ":python" command cannot be used recursively with Python 2.2 and
-	older.  This only works with Python 2.3 and later: >vim
-	    :py vim.command("python print 'Hello again Python'")
 
 vim.eval(str)						*python-eval*
 	Evaluates the expression str using the vim internal expression
@@ -190,8 +184,8 @@ vim.eval(str)						*python-eval*
 	Examples: >vim
 	    :py text_width = vim.eval("&tw")
 	    :py str = vim.eval("12+12")		# NB result is a string! Use
-						# string.atoi() to convert to
-						# a number.
+						# int() to convert to a
+						# number.
 
 vim.strwidth(str)					*python-strwidth*
 	Like |strwidth()|: returns number of display cells str occupies, tab
@@ -467,7 +461,7 @@ A trailing '\n' is allowed and ignored, so that you can do: >vim
 Buffer object type is available using "Buffer" attribute of vim module.
 
 Examples (assume b is the current buffer) >vim
-	:py print b.name		# write the buffer file name
+	:py print(b.name)		# write the buffer file name
 	:py b[0] = "hello!!!"		# replace the top line
 	:py b[:] = None			# delete the whole buffer
 	:py del b[:]			# delete the whole buffer
-- 
cgit 


From c11986ed1a816d7ebcb5a5f707e3ef884f278293 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 15 May 2023 09:38:32 +0200
Subject: vim-patch:b7398fe41c9e (#23627)

Update runtime files

https://github.com/vim/vim/commit/b7398fe41c9e1e731d058105a34158871ee83e3f

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/autoload/netrw.vim         |   8 +-
 runtime/autoload/netrwSettings.vim |   2 +-
 runtime/doc/builtin.txt            |  13 ++-
 runtime/doc/if_pyth.txt            |  20 +---
 runtime/doc/map.txt                |   4 +
 runtime/doc/options.txt            |   3 +
 runtime/doc/pi_netrw.txt           |  48 +++++-----
 runtime/doc/repeat.txt             |   2 +-
 runtime/doc/testing.txt            |  25 ++---
 runtime/doc/usr_01.txt             |   2 +-
 runtime/ftplugin/luau.vim          |  14 +++
 runtime/ftplugin/usd.vim           |  18 ++++
 runtime/indent/dts.vim             |  63 +++++++++++++
 runtime/indent/luau.vim            |  14 +++
 runtime/indent/testdir/dts.in      |  46 ++++++++++
 runtime/indent/testdir/dts.ok      |  46 ++++++++++
 runtime/menu.vim                   |   6 +-
 runtime/plugin/netrwPlugin.vim     |   2 +-
 runtime/syntax/dts.vim             |   5 +-
 runtime/syntax/luau.vim            |  15 +++
 runtime/syntax/nasm.vim            |  72 ++++++++++++++-
 runtime/syntax/xpm.vim             | 181 ++++++++++++++++++++-----------------
 22 files changed, 454 insertions(+), 155 deletions(-)
 create mode 100644 runtime/ftplugin/luau.vim
 create mode 100644 runtime/ftplugin/usd.vim
 create mode 100644 runtime/indent/dts.vim
 create mode 100644 runtime/indent/luau.vim
 create mode 100644 runtime/indent/testdir/dts.in
 create mode 100644 runtime/indent/testdir/dts.ok
 create mode 100644 runtime/syntax/luau.vim

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 6c9938d8bb..c9f66f7927 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Mar 15, 2023
-" Version:	172
+" Date:		May 03, 2023
+" Version:	173
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -43,7 +43,7 @@ if exists("s:needspatches")
  endfor
 endif
 
-let g:loaded_netrw = "v172"
+let g:loaded_netrw = "v173"
 if !exists("s:NOTE")
  let s:NOTE    = 0
  let s:WARNING = 1
@@ -5694,7 +5694,7 @@ fun! s:NetrwEditBuf(bufnum)
    exe "sil! NetrwKeepj keepalt noswapfile b ".fnameescape(a:bufnum)
   else
 "   call Decho("exe sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum))
-   exe "sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnume)
+   exe "sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum)
   endif
 "  call Dret("s:NetrwEditBuf")
 endfun
diff --git a/runtime/autoload/netrwSettings.vim b/runtime/autoload/netrwSettings.vim
index a910d18be8..d65f83144e 100644
--- a/runtime/autoload/netrwSettings.vim
+++ b/runtime/autoload/netrwSettings.vim
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
   finish
 endif
-let g:loaded_netrwSettings = "v18a"
+let g:loaded_netrwSettings = "v18"
 if v:version < 700
  echohl WarningMsg
  echo "***warning*** this version of netrwSettings needs vim 7.0"
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 39448e23a6..7acc764644 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1888,7 +1888,7 @@ execute({command} [, {silent}])				*execute()*
 		The default is "silent".  Note that with "silent!", unlike
 		`:redir`, error messages are dropped.
 
-		To get a list of lines use |split()| on the result: >
+		To get a list of lines use `split()` on the result: >
 			execute('args')->split("\n")
 
 <		This function is not available in the |sandbox|.
@@ -6137,17 +6137,20 @@ prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
 		that was entered at the prompt.  This can be an empty string
 		if the user only typed Enter.
 		Example: >
-		   call prompt_setcallback(bufnr(''), function('s:TextEntered'))
 		   func s:TextEntered(text)
 		     if a:text == 'exit' || a:text == 'quit'
 		       stopinsert
+		       " Reset 'modified' to allow the buffer to be closed.
+		       " We assume there is nothing useful to be saved.
+		       set nomodified
 		       close
 		     else
+		       " Do something useful with "a:text".  In this example
+		       " we just repeat it.
 		       call append(line('$') - 1, 'Entered: "' .. a:text .. '"')
-		       " Reset 'modified' to allow the buffer to be closed.
-		       set nomodified
 		     endif
 		   endfunc
+		   call prompt_setcallback(bufnr(), function('s:TextEntered'))
 
 <		Can also be used as a |method|: >
 			GetBuffer()->prompt_setcallback(callback)
@@ -9294,7 +9297,7 @@ win_execute({id}, {command} [, {silent}])		*win_execute()*
 		The window will temporarily be made the current window,
 		without triggering autocommands or changing directory.  When
 		executing {command} autocommands will be triggered, this may
-		have unexpected side effects.  Use |:noautocmd| if needed.
+		have unexpected side effects.  Use `:noautocmd` if needed.
 		Example: >
 			call win_execute(winid, 'syntax enable')
 <		Doing the same with `setwinvar()` would not trigger
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 7b20bab0d4..a96c9fcc0a 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -110,26 +110,16 @@ to the next, just like the Python REPL.
 
 							*script-here*
 When using a script language in-line, you might want to skip this when the
-language isn't supported.  Note that this mechanism doesn't work:
+language isn't supported.
 >vim
    if has('python')
      python << EOF
-       this will NOT work!
+       print("python works")
    EOF
    endif
-
-Instead, put the Python command in a function and call that function:
->vim
-    if has('python')
-      function DefPython()
-        python << EOF
-          this works
-    EOF
-      endfunction
-      call DefPython()
-    endif
-
-Note that "EOF" must be at the start of the line.
+<
+Note that "EOF" must be at the start of the line without preceding white
+space.
 
 ==============================================================================
 The vim module							*python-vim*
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 37158e2e76..ad7901b962 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1730,8 +1730,12 @@ remains unmodified.  Also see |f-args-example| below.  Overview:
 	XX a\\\ b	   'a\ b'
 	XX a\\\\b	   'a\\b'
 	XX a\\\\ b	   'a\\', 'b'
+	XX		   [nothing]
 
 
+Note that if the "no arguments" situation is to be handled, you have to make
+sure that the function can be called without arguments.
+
 Examples for user commands: >
 
    " Delete everything after here to the end
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9f5a089434..c1e0bccfd3 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -706,6 +706,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'autowriteall' for that.
 	Some buffers will not be written, specifically when 'buftype' is
 	"nowrite", "nofile", "terminal" or "prompt".
+	USE WITH CARE: If you make temporary changes to a buffer that you
+	don't want to be saved this option may cause it to be saved anyway.
+	Renaming the buffer with ":file {name}" may help avoid this.
 
 			 *'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'*
 'autowriteall' 'awa'	boolean	(default off)
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 78e2035ad1..276041caac 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -208,7 +208,7 @@ EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2
 	  http:   g:netrw_http_cmd     = "links"      elseif links is available
 	  http:   g:netrw_http_cmd     = "curl"       elseif curl  is available
 	  http:   g:netrw_http_cmd     = "wget"       elseif wget  is available
-          http:   g:netrw_http_cmd     = "fetch"      elseif fetch is available
+	  http:   g:netrw_http_cmd     = "fetch"      elseif fetch is available
 	  http:   *g:netrw_http_put_cmd* = "curl -T"
 	   rcp:   *g:netrw_rcp_cmd*      = "rcp"
 	 rsync:   *g:netrw_rsync_cmd*    = "rsync"     (see |g:netrw_rsync_sep|)
@@ -968,7 +968,7 @@ itself:
      fun! NetReadFixup(method, line1, line2)
        if method == 3   " ftp (no <.netrc>)
         let fourblanklines= line2 - 3
-        silent fourblanklines.",".line2."g/^\s*/d"
+        silent fourblanklines .. "," .. line2 .. "g/^\s*/d"
        endif
      endfunction
     endif
@@ -1625,8 +1625,10 @@ A further approach is to delete files which match a pattern.
       This will cause the matching files to be marked.  Then,
       press "D".
 
-Please note that only empty directories may be deleted with the "D" mapping.
-Regular files are deleted with |delete()|, too.
+If your vim has 7.4 with patch#1107, then |g:netrw_localrmdir| no longer
+is used to remove directories; instead, vim's |delete()| is used with
+the "d" option.  Please note that only empty directories may be deleted
+with the "D" mapping.  Regular files are deleted with |delete()|, too.
 
 The |g:netrw_rm_cmd|, |g:netrw_rmf_cmd|, and |g:netrw_rmdir_cmd| variables are
 used to control the attempts to remove remote files and directories.  The
@@ -1645,7 +1647,8 @@ to remove it again using the g:netrw_rmf_cmd variable.  Its default value is:
 	|g:netrw_rmf_cmd|: ssh HOSTNAME rm -f
 
 Related topics: |netrw-d|
-Associated setting variable: |g:netrw_rm_cmd| |g:netrw_ssh_cmd|
+Associated setting variable: |g:netrw_localrmdir| |g:netrw_rm_cmd|
+                             |g:netrw_rmdir_cmd|   |g:netrw_ssh_cmd|
 
 
 *netrw-explore*  *netrw-hexplore* *netrw-nexplore* *netrw-pexplore*
@@ -1688,11 +1691,7 @@ DIRECTORY EXPLORATION COMMANDS  {{{2
 	  to 2; edits will thus preferentially be made in window#2.
 
 	  The [N] specifies a |g:netrw_winsize| just for the new :Lexplore
-	  window. That means that
-	    if [N] < 0 : use |N| columns for the Lexplore window
-	    if [N] = 0 : a normal split is made
-	    if [N] > 0 : use N% of the current window will be used for the
-	                 new window
+	  window.
 
 	  Those who like this method often also like tree style displays;
 	  see |g:netrw_liststyle|.
@@ -1976,7 +1975,7 @@ To use this function, simply assign its output to |g:netrw_list_hide| option.  >
 	Example: let g:netrw_list_hide= netrw_gitignore#Hide('my_gitignore_file')
 		Function can take additional files with git-ignore patterns.
 
-	Example: g:netrw_list_hide= netrw_gitignore#Hide() . '.*\.swp$'
+	Example: let g:netrw_list_hide= netrw_gitignore#Hide() .. '.*\.swp$'
 		Combining 'netrw_gitignore#Hide' with custom patterns.
 <
 
@@ -2854,6 +2853,14 @@ your browsing preferences.  (see also: |netrw-settings|)
 				=" /c move"                     Windows
 				Options for |g:netrw_localmovecmd|
 
+  *g:netrw_localrmdir*		="rmdir"        Linux/Unix/MacOS/Cygwin
+				=expand("$COMSPEC")             Windows
+				Remove directory command (rmdir)
+				This variable is only used if your vim is
+				earlier than 7.4 or if your vim doesn't
+				have patch#1107.  Otherwise, |delete()|
+				is used with the "d" option.
+
   *g:netrw_maxfilenamelen*	=32 by default, selected so as to make long
 				    listings fit on 80 column displays.
 				If your screen is wider, and you have file
@@ -3764,7 +3771,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
 	     Netrw uses several system level commands to do things (see
 
 		 |g:netrw_localcopycmd|, |g:netrw_localmovecmd|,
-		 |g:netrw_mkdir_cmd|).
+		 |g:netrw_localrmdir|, |g:netrw_mkdir_cmd|).
 
 	    You may need to adjust the default commands for one or more of
 	    these commands by setting them properly in your .vimrc.  Another
@@ -3890,13 +3897,8 @@ netrw:
 ==============================================================================
 12. History						*netrw-history* {{{1
 
-	v172:	Sep 02, 2021	* (Bram Moolenaar) Changed "l:go" to "go"
-				* (Bram Moolenaar) no need for "b" in
-				  netrw-safe guioptions
-		Nov 15, 2021	* removed netrw_localrm and netrw_localrmdir
-				  references
-		Aug 18, 2022	* (Miguel Barro) improving compatability with
-				  powershell
+	v172:	Apr 22, 2023	* removed g:netrw_localrmdiropt
+				  removed g:netrw_localrmdir
 	v171:	Oct 09, 2020	* included code in s:NetrwOptionsSafe()
 				  to allow |'bh'| to be set to delete when
 				  rather than hide when g:netrw_fastbrowse
@@ -3981,8 +3983,10 @@ netrw:
 		Nov 09, 2016	* Broke apart the command from the options,
 				  mostly for Windows.  Introduced new netrw
 				  settings: |g:netrw_localcopycmdopt|
-				  |g:netrw_localcopydircmdopt| |g:netrw_localmkdiropt|
-				  |g:netrw_localmovecmdopt| g:netrw_localrmdiropt
+				  |g:netrw_localcopydircmdopt|
+				  |g:netrw_localmkdiropt|
+				  |g:netrw_localmovecmdopt|
+				  g:netrw_localrmdiropt
 		Nov 21, 2016	* (mattn) provided a patch for preview; swapped
 				  winwidth() with winheight()
 		Nov 22, 2016	* (glacambre) reported that files containing
@@ -4042,7 +4046,7 @@ netrw:
 				  refreshes.  However, inside a |:map-<expr>|,
 				  tab and window changes are disallowed.  Fixed.
 				  (affects netrw's s:LocalBrowseRefresh())
-				* g:netrw_localrmdir not used any more, but
+				* |g:netrw_localrmdir| not used any more, but
 				  the relevant patch that causes |delete()| to
 				  take over was #1107 (not #1109).
 				* |expand()| is now used on |g:netrw_home|;
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 8644ce4b38..b6cb126c3b 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -56,7 +56,7 @@ Using the underscore after `:d` avoids clobbering registers or the clipboard.
 This also makes it faster.
 
 Instead of the '/' which surrounds the {pattern}, you can use any other
-single byte character, but not an alphabetic character, '\', '"' or '|'.
+single byte character, but not an alphabetic character, '\', '"', '|' or '!'.
 This is useful if you want to include a '/' in the search pattern or
 replacement string.
 
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index ef5e179c86..2c1c77a51d 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -54,13 +54,14 @@ assert_beeps({cmd})					*assert_beeps()*
 assert_equal({expected}, {actual} [, {msg}])
 		When {expected} and {actual} are not equal an error message is
 		added to |v:errors| and 1 is returned.  Otherwise zero is
-		returned |assert-return|.
+		returned. |assert-return|
+		The error is in the form "Expected {expected} but got
+		{actual}".  When {msg} is present it is prefixed to that.
+
 		There is no automatic conversion, the String "4" is different
 		from the Number 4.  And the number 4 is different from the
 		Float 4.0.  The value of 'ignorecase' is not used here, case
 		always matters.
-		When {msg} is omitted an error in the form "Expected
-		{expected} but got {actual}" is produced.
 		Example: >
 	assert_equal('foo', 'bar')
 <		Will result in a string to be added to |v:errors|:
@@ -134,11 +135,12 @@ assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 assert_false({actual} [, {msg}])			*assert_false()*
 		When {actual} is not false an error message is added to
 		|v:errors|, like with |assert_equal()|.
+		The error is in the form "Expected False but got {actual}".
+		When {msg} is present it is prepended to that.
 		Also see |assert-return|.
+
 		A value is false when it is zero. When {actual} is not a
 		number the assert fails.
-		When {msg} is omitted an error in the form
-		"Expected False but got {actual}" is produced.
 
 		Can also be used as a |method|: >
 			GetResult()->assert_false()
@@ -147,14 +149,16 @@ assert_inrange({lower}, {upper}, {actual} [, {msg}])	 *assert_inrange()*
 		This asserts number and |Float| values.  When {actual}  is lower
 		than {lower} or higher than {upper} an error message is added
 		to |v:errors|.  Also see |assert-return|.
-		When {msg} is omitted an error in the form
-		"Expected range {lower} - {upper}, but got {actual}" is
-		produced.
+		The error is in the form "Expected range {lower} - {upper},
+		but got {actual}".  When {msg} is present it is prefixed to
+		that.
 
 								*assert_match()*
 assert_match({pattern}, {actual} [, {msg}])
 		When {pattern} does not match {actual} an error message is
 		added to |v:errors|.  Also see |assert-return|.
+		The error is in the form "Pattern {pattern} does not match
+		{actual}".  When {msg} is present it is prefixed to that.
 
 		{pattern} is used as with |expr-=~|: The matching is always done
 		like 'magic' was set and 'cpoptions' is empty, no matter what
@@ -164,8 +168,6 @@ assert_match({pattern}, {actual} [, {msg}])
 		Use "^" and "$" to match with the start and end of the text.
 		Use both to match the whole text.
 
-		When {msg} is omitted an error in the form
-		"Pattern {pattern} does not match {actual}" is produced.
 		Example: >
 	assert_match('^f.*o$', 'foobar')
 <		Will result in a string to be added to |v:errors|:
@@ -215,8 +217,7 @@ assert_true({actual} [, {msg}])				*assert_true()*
 		Also see |assert-return|.
 		A value is |TRUE| when it is a non-zero number or |v:true|.
 		When {actual} is not a number or |v:true| the assert fails.
-		When {msg} is omitted an error in the form "Expected True but
-		got {actual}" is produced.
+		When {msg} is given it precedes the default message.
 
 		Can also be used as a |method|: >
 			GetResult()->assert_true()
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index f0e2462fae..6b94806941 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -81,7 +81,7 @@ from within nvim. The tutorial will lead you from that point. Have fun!
 ==============================================================================
 *01.4*	Copyright					*manual-copyright*
 
-The Vim user manual and reference manual are Copyright (c) 1988-2003 by Bram
+The Vim user manual and reference manual are Copyright (c) 1988 by Bram
 Moolenaar.  This material may be distributed only subject to the terms and
 conditions set forth in the Open Publication License, v1.0 or later.  The
 latest version is presently available at:
diff --git a/runtime/ftplugin/luau.vim b/runtime/ftplugin/luau.vim
new file mode 100644
index 0000000000..458d0b05a9
--- /dev/null
+++ b/runtime/ftplugin/luau.vim
@@ -0,0 +1,14 @@
+" Vim filetype plugin file
+" Language:	Luau
+" Maintainer:	None yet
+" Last Change:	2023 Apr 30
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Luau is a superset of Lua
+runtime! ftplugin/lua.vim
+
+
+" vim: nowrap sw=2 sts=2 ts=8
diff --git a/runtime/ftplugin/usd.vim b/runtime/ftplugin/usd.vim
new file mode 100644
index 0000000000..c795ba591b
--- /dev/null
+++ b/runtime/ftplugin/usd.vim
@@ -0,0 +1,18 @@
+" Vim filetype plugin file
+" Language:     Pixar Animation's Universal Scene Description format
+" Maintainer:   Colin Kennedy <colinvfx@gmail.com>
+" Last Change:  2023 May 9
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:did_ftplugin = 1
+
+setlocal commentstring=#\ %s
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/indent/dts.vim b/runtime/indent/dts.vim
new file mode 100644
index 0000000000..e87f8153c7
--- /dev/null
+++ b/runtime/indent/dts.vim
@@ -0,0 +1,63 @@
+" Vim indent file
+" Language:		Device Tree
+" Maintainer:		Roland Hieber, Pengutronix <rhi@pengutronix.de>
+"
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal nosmartindent
+setlocal indentkeys=o,O,0},0<>>,!<Ctrl-F>
+setlocal indentexpr=GetDTSIndent()
+setlocal nolisp
+
+let b:undo_indent = 'setl autoindent< smartindent< indentkeys< indentexpr< lisp<'
+
+function GetDTSIndent()
+    let sw        = shiftwidth()
+    let lnum      = v:lnum
+    let line      = getline(lnum)
+    let prevline  = getline(prevnonblank(lnum-1))
+    let prevind   = indent(prevnonblank(lnum-1))
+
+    if prevnonblank(lnum-1) < 1
+        return 0
+    endif
+
+    " Don't indent header and preprocessor directives
+    if line =~ '^\s*\(/dts-\|#\(include\|define\|undef\|warn\(ing\)\?\|error\|if\(n\?def\)\?\|else\|elif\|endif\)\)'
+        return 0
+
+    " Don't indent /node and &label blocks
+    elseif line =~ '^\s*[/&].\+{\s*$'
+        return 0
+
+    " Indent to matching bracket or remove one shiftwidth if line begins with } or >
+    elseif line =~ '^\s*[}>]'
+        " set cursor to closing bracket on current line
+        let col = matchend(line, '^\s*[>}]')
+        call cursor(lnum, col)
+        
+        " determine bracket type, {} or <>
+        let pair = strpart('{}<>', stridx('}>', line[col-1]) * 2, 2)
+
+        " find matching bracket pair
+        let pairline = searchpair(pair[0], '', pair[1], 'bW')
+
+        if pairline > 0 
+            return indent(pairline)
+        else
+            return prevind - sw
+        endif
+
+    " else, add one level of indent if line ends in { or < or = or ,
+    elseif prevline =~ '[{<=,]$'
+        return prevind + sw
+
+    else
+        return prevind
+    endif
+
+endfunction
diff --git a/runtime/indent/luau.vim b/runtime/indent/luau.vim
new file mode 100644
index 0000000000..69893f7399
--- /dev/null
+++ b/runtime/indent/luau.vim
@@ -0,0 +1,14 @@
+" Vim filetype indent file
+" Language:    Luau
+" Maintainer:  None yet
+" Last Change: 2023 Apr 30
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+
+" Luau is a superset of Lua
+runtime! indent/lua.vim
+
+
diff --git a/runtime/indent/testdir/dts.in b/runtime/indent/testdir/dts.in
new file mode 100644
index 0000000000..64e56e9017
--- /dev/null
+++ b/runtime/indent/testdir/dts.in
@@ -0,0 +1,46 @@
+/* vim: set ft=dts noet sw=8 : */
+
+/* START_INDENT */
+/dts-v1/;
+#include <dt-bindings/pinctrl/pinctrl-imx6q.h>
+	#include "imx6qdl.dtsi"
+#include "imx6qdl-someboard.dtsi"
+
+	/delete-node/ &{/memory@10000000};
+
+	/ {
+compatible = "some,board";
+/delete-node/ memory;
+
+	chosen {
+environment = &{usdhc4/partitions/partition@0};
+};
+}
+
+	&iomuxc {
+pinctrl-names = "default";
+pinctrl-0 = <&pinctrl_hog>;
+
+pinctrl_gpiohog: gpiohoggrp {
+fsl,pins = <
+MX6QDL_PAD_GPIO_9__GPIO1_IO09           0x130b0
+MX6QDL_PAD_GPIO_17__GPIO7_IO12          0x130b0
+>;
+};
+}
+
+&usdhc4 {
+partitions {
+compatible = "fixed-partitions";
+
+partition@0 {
+label = "environment";
+reg = <0x0 0xe0000>;
+};
+};
+};
+
+&{/aliases} {
+usb0 = &usb;
+};
+/* END_INDENT */
diff --git a/runtime/indent/testdir/dts.ok b/runtime/indent/testdir/dts.ok
new file mode 100644
index 0000000000..d249766fd4
--- /dev/null
+++ b/runtime/indent/testdir/dts.ok
@@ -0,0 +1,46 @@
+/* vim: set ft=dts noet sw=8 : */
+
+/* START_INDENT */
+/dts-v1/;
+#include <dt-bindings/pinctrl/pinctrl-imx6q.h>
+#include "imx6qdl.dtsi"
+#include "imx6qdl-someboard.dtsi"
+
+/delete-node/ &{/memory@10000000};
+
+/ {
+	compatible = "some,board";
+	/delete-node/ memory;
+
+	chosen {
+		environment = &{usdhc4/partitions/partition@0};
+	};
+}
+
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	pinctrl_gpiohog: gpiohoggrp {
+		fsl,pins = <
+			MX6QDL_PAD_GPIO_9__GPIO1_IO09           0x130b0
+			MX6QDL_PAD_GPIO_17__GPIO7_IO12          0x130b0
+		>;
+	};
+}
+
+&usdhc4 {
+	partitions {
+		compatible = "fixed-partitions";
+
+		partition@0 {
+			label = "environment";
+			reg = <0x0 0xe0000>;
+		};
+	};
+};
+
+&{/aliases} {
+	usb0 = &usb;
+};
+/* END_INDENT */
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 2671bb51cb..d6f22b314c 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Nov 27
+" Last Change:	2023 May 03
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -599,7 +599,9 @@ func s:XxdBack()
     exe ':%!' . g:xxdprogram . ' -r'
   endif
   set ft=
-  doautocmd filetypedetect BufReadPost
+  if exists('#filetypedetect') && exists('#BufReadPost')
+    doautocmd filetypedetect BufReadPost
+  endif
   let &mod = mod
 endfun
 
diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim
index 431d9ad9c4..a347781e6f 100644
--- a/runtime/plugin/netrwPlugin.vim
+++ b/runtime/plugin/netrwPlugin.vim
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_netrwPlugin")
  finish
 endif
-let g:loaded_netrwPlugin = "v172"
+let g:loaded_netrwPlugin = "v173"
 let s:keepcpo = &cpo
 set cpo&vim
 "DechoRemOn
diff --git a/runtime/syntax/dts.vim b/runtime/syntax/dts.vim
index be51ab5b10..bb7eff7be1 100644
--- a/runtime/syntax/dts.vim
+++ b/runtime/syntax/dts.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	dts/dtsi (device tree files)
 " Maintainer:	Daniel Mack <vim@zonque.org>
-" Last Change:	2022 Jun 14
+" Last Change:	2023 Apr 28
 
 if exists("b:current_syntax")
   finish
@@ -10,9 +10,10 @@ let b:current_syntax = 'dts'
 
 syntax region dtsComment        start="/\*"  end="\*/"
 syntax match  dtsReference      "&[[:alpha:][:digit:]_]\+"
+syntax match  dtsReference      "&{[[:alpha:][:digit:]@_/-]\+}"
 syntax region dtsBinaryProperty start="\[" end="\]"
 syntax match  dtsStringProperty "\".*\""
-syntax match  dtsKeyword        "/.\{-1,\}/"
+syntax match  dtsKeyword        "/[[:alpha:][:digit:]-]\+/\([[:space:]]\|;\)"he=e-1
 syntax match  dtsLabel          "^[[:space:]]*[[:alpha:][:digit:]_]\+:"
 syntax match  dtsNode           /[[:alpha:][:digit:]-_]\+\(@[0-9a-fA-F]\+\|\)[[:space:]]*{/he=e-1
 syntax region dtsCellProperty   start="<" end=">" contains=dtsReference,dtsBinaryProperty,dtsStringProperty,dtsComment
diff --git a/runtime/syntax/luau.vim b/runtime/syntax/luau.vim
new file mode 100644
index 0000000000..59eccac100
--- /dev/null
+++ b/runtime/syntax/luau.vim
@@ -0,0 +1,15 @@
+" Vim syntax file
+" Language:	Luau
+" Maintainer:	None yet
+" Last Change:	2023 Apr 30
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" Luau is a superset of lua
+runtime! syntax/lua.vim
+
+let b:current_syntax = "luau"
+
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim
index d763033225..0eb82fad10 100644
--- a/runtime/syntax/nasm.vim
+++ b/runtime/syntax/nasm.vim
@@ -3,8 +3,12 @@
 " Maintainer:	Andrii Sokolov	<andriy145@gmail.com>
 " Original Author:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
 " Former Maintainer:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
-" Contributors: Leonard König <leonard.r.koenig@gmail.com> (C string highlighting), Peter Stanhope <dev.rptr@gmail.com> (Add missing 64-bit mode registers)
-" Last Change:	2017 Jan 23
+" Contributors: 
+" 	Leonard König <leonard.r.koenig@gmail.com> (C string highlighting),
+" 	Peter Stanhope <dev.rptr@gmail.com> (Add missing 64-bit mode registers)
+" 	Frédéric Hamel <rederic.hamel123@gmail.com> (F16c support, partial AVX
+" 						     support, other)
+" Last Change:	2022 May 3
 " NASM Home:	http://www.nasm.us/
 
 
@@ -277,7 +281,7 @@ syn match   nasmInstrModifier	"\<F\(ADD\|MUL\|\(DIV\|SUB\)R\=\)\s\+TO\>"lc=5,ms=
 "  NAsm directives
 syn keyword nasmRepeat		TIMES
 syn keyword nasmDirective	ALIGN[B] INCBIN EQU NOSPLIT SPLIT
-syn keyword nasmDirective	ABSOLUTE BITS SECTION SEGMENT
+syn keyword nasmDirective	ABSOLUTE BITS SECTION SEGMENT DEFAULT
 syn keyword nasmDirective	ENDSECTION ENDSEGMENT
 syn keyword nasmDirective	__SECT__
 "  Macro created standard directives: (requires %include)
@@ -309,7 +313,7 @@ syn match   nasmStdInstruction	"\<\(CMOV\|J\|SET\)\(N\=\([ABGL]E\=\|[CEOSZ]\)\|P
 syn match   nasmStdInstruction	"\<POP\>"
 syn keyword nasmStdInstruction	AAA AAD AAM AAS ADC ADD AND
 syn keyword nasmStdInstruction	BOUND BSF BSR BSWAP BT[C] BTR BTS
-syn keyword nasmStdInstruction	CALL CBW CDQ CLC CLD CMC CMP CMPSB CMPSD CMPSW CMPSQ
+syn keyword nasmStdInstruction	CALL CBW CDQ CDQE CLC CLD CMC CMP CMPSB CMPSD CMPSW CMPSQ
 syn keyword nasmStdInstruction	CMPXCHG CMPXCHG8B CPUID CWD[E] CQO
 syn keyword nasmStdInstruction	DAA DAS DEC DIV ENTER
 syn keyword nasmStdInstruction	IDIV IMUL INC INT[O] IRET[D] IRETW IRETQ
@@ -319,6 +323,7 @@ syn keyword nasmStdInstruction	LODSW LOOP[E] LOOPNE LOOPNZ LOOPZ LSS
 syn keyword nasmStdInstruction	MOVSB MOVSD MOVSW MOVSX MOVSQ MOVZX MUL NEG NOP NOT
 syn keyword nasmStdInstruction	OR POPA[D] POPAW POPF[D] POPFW POPFQ
 syn keyword nasmStdInstruction	PUSH[AD] PUSHAW PUSHF[D] PUSHFW PUSHFQ
+syn keyword nasmStdInstruction	PAUSE
 syn keyword nasmStdInstruction	RCL RCR RETF RET[N] ROL ROR
 syn keyword nasmStdInstruction	SAHF SAL SAR SBB SCASB SCASD SCASW
 syn keyword nasmStdInstruction	SHL[D] SHR[D] STC STD STOSB STOSD STOSW STOSQ SUB
@@ -405,6 +410,62 @@ syn keyword nasmSseInstruction	ORPS RCPPS RCPSS RSQRTPS RSQRTSS
 syn keyword nasmSseInstruction	SHUFPS SQRTPS SQRTSS STMXCSR SUBPS SUBSS
 syn keyword nasmSseInstruction	UCOMISS UNPCKHPS UNPCKLPS XORPS
 
+" F16c Instructions
+syn keyword nasmF16CInstruction VCVTPH2PS VCVTPS2PH
+
+" AVX Instructions
+syn keyword nasmAVXInstruction	VCVTDQ2PD VCVTDQ2PS VCVTPD2DQ VCVTPD2P VCVTPD2PS
+syn keyword nasmAVXInstruction	VCVTPS2DQ VCVTPS2PD
+syn keyword nasmAVXInstruction	VCVTSD2SI VCVTSD2SS VCVTSI2SD VCVTSI2SS VCVTSS2SD VCVTSS2SI
+syn keyword nasmAVXInstruction	VMAXPS VMAXSS VMINPS VMINSS VMOVAPS VMOVHLPS VMOVHPS
+syn keyword nasmAVXInstruction	VMAXPD VMAXSD VMINPD VMINSD VMOVAPD VMOVHLPD VMOVHPD
+syn keyword nasmAVXInstruction	VMOVLHPS VMOVLPS VMOVMSKPS VMOVNTPS VMOVSS VMOVUPS
+syn keyword nasmAVXInstruction	VMULPS VMULSS VPXOR
+
+syn match   nasmInstructnError  "\<VP\a\{3}R\a\>"
+syn match   nasmAVXInstruction  "\<VP\(INS\|EXT\)R[BDQW]\>"
+
+syn keyword nasmAVXInstruction VORPS VPABSB VPABSD VPABSW
+syn keyword nasmAVXInstruction PACKSSDW VPACKSSWB VPACKUSDW VPACKUSWB VPADDD
+syn keyword nasmAVXInstruction PADDQ VPADDSB VPADDSW VPADDUSB VPADDUSW
+syn keyword nasmAVXInstruction PADDW VPALIGNR VPAND VPANDN VPAVGB
+syn keyword nasmAVXInstruction PAVGW VPBLENDD VPBLENDVB VPBLENDW VPBROADCASTB
+syn keyword nasmAVXInstruction PBROADCASTD VPBROADCASTQ VPBROADCASTW VPCLMULQDQ VPCMOV
+syn keyword nasmAVXInstruction PCMPEQB VPCMPEQD VPCMPEQQ VPCMPEQW VPCMPESTRI
+syn keyword nasmAVXInstruction PCMPESTRM VPCMPGTB VPCMPGTD VPCMPGTQ VPCMPGTW
+syn keyword nasmAVXInstruction PCMPISTRI VPCMPISTRM VPCOMB VPCOMD VPCOMQ
+syn keyword nasmAVXInstruction PCOMUB VPCOMUD VPCOMUQ VPCOMUW VPCOMW
+syn keyword nasmAVXInstruction PERM2FVPERM2IVPERMD VPERMIL2PD VPERMIL2PS VPERMILPD VPERMILPS
+syn keyword nasmAVXInstruction PERMPD VPERMPS VPERMQ VPEXTRB VPEXTRD
+syn keyword nasmAVXInstruction PEXTRQ VPEXTRW VPGATHERDD VPGATHERDQ VPGATHERQD
+syn keyword nasmAVXInstruction PGATHERQQ VPHADDBD VPHADDBQ VPHADDBW VPHADDD
+syn keyword nasmAVXInstruction PHADDDQ VPHADDSW VPHADDUBQ VPHADDUBW VPHADDUDQ
+syn keyword nasmAVXInstruction PHADDUWD VPHADDUWQ VPHADDW VPHADDWD VPHADDWQ
+syn keyword nasmAVXInstruction PHMINPOSUW VPHSUBBW VPHSUBD VPHSUBDQ VPHSUBSW
+syn keyword nasmAVXInstruction PHSUBW VPHSUBWD VPINSRB VPINSRD VPINSRQ
+syn keyword nasmAVXInstruction PINSRW VPMACSDD VPMACSDQH
+syn keyword nasmAVXInstruction VPMACSDQL VPMACSSDD VPMACSSDQL VPMACSSQH VPMACSSWD
+syn keyword nasmAVXInstruction VPMACSSWW VPMACSWD VPMACSWW VPMADCSSWD VPMADCSWD
+syn keyword nasmAVXInstruction VPMADDUBSW VPMADDWD VPMASKMOVD VPMASKMOVQ VPMAXSB
+syn keyword nasmAVXInstruction VPMAXSD VPMAXSW VPMAXUB VPMAXUD VPMAXUW
+syn keyword nasmAVXInstruction VPMINSB VPMINSD VPMINSW VPMINUB VPMINUD
+syn keyword nasmAVXInstruction VPMINUW VPMOVMSKB VPMOVSXBD VPMOVSXBQ VPMOVSXBW
+syn keyword nasmAVXInstruction VPMOVSXDQ VPMOVSXWD VPMOVSXWQ VPMOVZXBD VPMOVZXBQ
+syn keyword nasmAVXInstruction VPMOVZXBW VPMOVZXDQ VPMOVZXWD VPMOVZXWQ VPMULDQ
+syn keyword nasmAVXInstruction VPMULHRSW VPMULHUW VPMULHW VPMULLD VPMULLW
+syn keyword nasmAVXInstruction VPMULUDQ VPOR VPPERM VPROTB VPROTD
+syn keyword nasmAVXInstruction VPROTQ VPROTW VPSADBW VPSHAB VPSHAD
+syn keyword nasmAVXInstruction VPSHAQ VPSHAW VPSHLB VPSHLD VPSHLQ
+syn keyword nasmAVXInstruction VPSHLW VPSHUFB VPSHUFD VPSHUFHW VPSHUFLW
+syn keyword nasmAVXInstruction VPSIGNB VPSIGND VPSIGNW VPSLLD VPSLLDQ
+syn keyword nasmAVXInstruction VPSLLQ VPSLLVD VPSLLVQ VPSLLW VPSRAD
+syn keyword nasmAVXInstruction VPSRAVD VPSRAW VPSRLD VPSRLDQ VPSRLQ
+syn keyword nasmAVXInstruction VPSRLVD VPSRLVQ VPSRLW VPSUBB VPSUBD
+syn keyword nasmAVXInstruction VPSUBQ VPSUBSB VPSUBSW VPSUBUSB VPSUBUSW
+syn keyword nasmAVXInstruction VPSUBW VPTEST VPUNPCKHBW VPUNPCKHDQ VPUNPCKHQDQ
+syn keyword nasmAVXInstruction VPUNPCKHWD VPUNPCKLBW VPUNPCKLDQ VPUNPCKLQDQ VPUNPCKLWD
+syn keyword nasmAVXInstruction VPXOR VRCPPS
+
 
 " Three Dimensional Now Packed Instructions: (requires 3DNow! unit)
 syn keyword nasmNowInstruction	FEMMS PAVGUSB PF2ID PFACC PFADD PFCMPEQ PFCMPGE
@@ -515,13 +576,14 @@ hi def link nasmDbgInstruction	Debug
 hi def link nasmFpuInstruction	Statement
 hi def link nasmMmxInstruction	Statement
 hi def link nasmSseInstruction	Statement
+hi def link nasmF16cInstruction	Statement
+hi def link nasmAVXInstruction	Statement
 hi def link nasmNowInstruction	Statement
 hi def link nasmAmdInstruction	Special
 hi def link nasmCrxInstruction	Special
 hi def link nasmUndInstruction	Todo
 hi def link nasmInstructnError	Error
 
-
 let b:current_syntax = "nasm"
 
 " vim:ts=8 sw=4
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
index be9f38723e..77d82403e9 100644
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -1,10 +1,12 @@
 " Vim syntax file
 " Language:	X Pixmap
 " Maintainer:	Ronald Schild <rs@scutum.de>
-" Last Change:	2021 Oct 04
-" Version:	5.4n.1
+" Last Change:	2023 May 11
+" Version:	5.4n.2
 "               Jemma Nelson added termguicolors support
 "               Dominique Pellé fixed spelling support
+"               Christian J. Robinson fixed use of global variables, moved
+"               loop into a function
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -21,108 +23,119 @@ syn region  xpmPixelString	start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=@xpmCo
 
 if has("gui_running") || has("termguicolors") && &termguicolors
 
-let color  = ""
-let chars  = ""
-let colors = 0
-let cpp    = 0
-let n      = 0
-let i      = 1
+function s:CreateSyntax() abort
+   let color  = ""
+   let chars  = ""
+   let colors = 0
+   let cpp    = 0
+   let n      = 0
+   let lines  = getline(1, '$')
 
-while i <= line("$")		" scanning all lines
+   for line in lines			" scanning all lines
 
-   let s = matchstr(getline(i), '".\{-1,}"')
-   if s != ""			" does line contain a string?
+      let s = matchstr(line, '".\{-1,}"')
 
-      if n == 0			" first string is the Values string
+      if s != ""			" does line contain a string?
 
-	 " get the 3rd value: colors = number of colors
-	 let colors = substitute(s, '"\s*\d\+\s\+\d\+\s\+\(\d\+\).*"', '\1', '')
-	 " get the 4th value: cpp = number of character per pixel
-	 let cpp = substitute(s, '"\s*\d\+\s\+\d\+\s\+\d\+\s\+\(\d\+\).*"', '\1', '')
-	 if cpp =~ '[^0-9]'
-	    break  " if cpp is not made of digits there must be something wrong
-	 endif
+	 if n == 0			" first string is the Values string
 
-	 " Highlight the Values string as normal string (no pixel string).
-	 " Only when there is no slash, it would terminate the pattern.
-	 if s !~ '/'
-	    exe 'syn match xpmValues /' . s . '/'
-	 endif
-	 hi link xpmValues String
+	    let values = split(s[1 : -2])
+
+	    " Values string invalid, bail out
+	    if len(values) != 4
+	       return
+	    endif
 
-	 let n = 1		" n = color index
+	    " get the 3rd value: colors = number of colors
+	    let colors = str2nr(values[2])
+	    " get the 4th value: cpp = number of character per pixel
+	    let cpp = str2nr(values[3])
 
-      elseif n <= colors	" string is a color specification
+	    " these values must be positive, nonzero
+	    if colors < 1 || cpp < 1
+	       return
+	    endif
+
+	    " Highlight the Values string as normal string (no pixel string).
+	    " Only when there is no slash, it would terminate the pattern.
+	    if s !~ '/'
+	       exe 'syn match xpmValues /' .. s .. '/'
+	    endif
+	    hi link xpmValues String
 
-	 " get chars = <cpp> length string representing the pixels
-	 " (first incl. the following whitespace)
-	 let chars = substitute(s, '"\(.\{'.cpp.'}\s\).*"', '\1', '')
+	    let n = 1		" n = color index
 
-	 " now get color, first try 'c' key if any (color visual)
-	 let color = substitute(s, '".*\sc\s\+\(.\{-}\)\s*\(\(g4\=\|[ms]\)\s.*\)*\s*"', '\1', '')
-	 if color == s
-	    " no 'c' key, try 'g' key (grayscale with more than 4 levels)
-	    let color = substitute(s, '".*\sg\s\+\(.\{-}\)\s*\(\(g4\|[ms]\)\s.*\)*\s*"', '\1', '')
+	 elseif n <= colors	" string is a color specification
+
+	    " get chars = <cpp> length string representing the pixels
+	    " (first incl. the following whitespace)
+	    let chars = substitute(s, '"\(.\{' .. cpp .. '}\s\).*"', '\1', '')
+
+	    " now get color, first try 'c' key if any (color visual)
+	    let color = substitute(s, '".*\sc\s\+\(.\{-}\)\s*\(\(g4\=\|[ms]\)\s.*\)*\s*"', '\1', '')
 	    if color == s
-	       " next try: 'g4' key (4-level grayscale)
-	       let color = substitute(s, '".*\sg4\s\+\(.\{-}\)\s*\([ms]\s.*\)*\s*"', '\1', '')
+	       " no 'c' key, try 'g' key (grayscale with more than 4 levels)
+	       let color = substitute(s, '".*\sg\s\+\(.\{-}\)\s*\(\(g4\|[ms]\)\s.*\)*\s*"', '\1', '')
 	       if color == s
-		  " finally try 'm' key (mono visual)
-		  let color = substitute(s, '".*\sm\s\+\(.\{-}\)\s*\(s\s.*\)*\s*"', '\1', '')
+		  " next try: 'g4' key (4-level grayscale)
+		  let color = substitute(s, '".*\sg4\s\+\(.\{-}\)\s*\([ms]\s.*\)*\s*"', '\1', '')
 		  if color == s
-		     let color = ""
+		     " finally try 'm' key (mono visual)
+		     let color = substitute(s, '".*\sm\s\+\(.\{-}\)\s*\(s\s.*\)*\s*"', '\1', '')
+		     if color == s
+			let color = ""
+		     endif
 		  endif
 	       endif
 	    endif
-	 endif
 
-	 " Vim cannot handle RGB codes with more than 6 hex digits
-	 if color =~ '#\x\{10,}$'
-	    let color = substitute(color, '\(\x\x\)\x\x', '\1', 'g')
-	 elseif color =~ '#\x\{7,}$'
-	    let color = substitute(color, '\(\x\x\)\x', '\1', 'g')
-	 " nor with 3 digits
-	 elseif color =~ '#\x\{3}$'
-	    let color = substitute(color, '\(\x\)\(\x\)\(\x\)', '0\10\20\3', '')
-	 endif
+	    " Vim cannot handle RGB codes with more than 6 hex digits
+	    if color =~ '#\x\{10,}$'
+	       let color = substitute(color, '\(\x\x\)\x\x', '\1', 'g')
+	    elseif color =~ '#\x\{7,}$'
+	       let color = substitute(color, '\(\x\x\)\x', '\1', 'g')
+	    " nor with 3 digits
+	    elseif color =~ '#\x\{3}$'
+	       let color = substitute(color, '\(\x\)\(\x\)\(\x\)', '0\10\20\3', '')
+	    endif
 
-	 " escape meta characters in patterns
-	 let s = escape(s, '/\*^$.~[]')
-	 let chars = escape(chars, '/\*^$.~[]')
-
-	 " now create syntax items
-	 " highlight the color string as normal string (no pixel string)
-	 exe 'syn match xpmCol'.n.'Def /'.s.'/ contains=xpmCol'.n.'inDef'
-	 exe 'hi link xpmCol'.n.'Def String'
-
-	 " but highlight the first whitespace after chars in its color
-	 exe 'syn match xpmCol'.n.'inDef /"'.chars.'/hs=s+'.(cpp+1).' contained'
-	 exe 'hi link xpmCol'.n.'inDef xpmColor'.n
-
-	 " remove the following whitespace from chars
-	 let chars = substitute(chars, '.$', '', '')
-
-	 " and create the syntax item contained in the pixel strings
-	 exe 'syn match xpmColor'.n.' /'.chars.'/ contained'
-	 exe 'syn cluster xpmColors add=xpmColor'.n
-
-	 " if no color or color = "None" show background
-	 if color == ""  ||  substitute(color, '.*', '\L&', '') == 'none'
-	    exe 'hi xpmColor'.n.' guifg=bg'
-	    exe 'hi xpmColor'.n.' guibg=NONE'
-	 elseif color !~ "'"
-	    exe 'hi xpmColor'.n." guifg='".color."'"
-	    exe 'hi xpmColor'.n." guibg='".color."'"
+	    " escape meta characters in patterns
+	    let s = escape(s, '/\*^$.~[] ')
+	    let chars = escape(chars, '/\*^$.~[] ')
+
+	    " now create syntax items
+	    " highlight the color string as normal string (no pixel string)
+	    exe 'syn match xpmCol' .. n .. 'Def /' .. s .. '/ contains=xpmCol' .. n .. 'inDef'
+	    exe 'hi link xpmCol' .. n .. 'Def String'
+
+	    " but highlight the first whitespace after chars in its color
+	    exe 'syn match xpmCol' .. n .. 'inDef /"' .. chars .. '/hs=s+' .. (cpp + 1) .. ' contained'
+	    exe 'hi link xpmCol' .. n .. 'inDef xpmColor' .. n
+
+	    " remove the following whitespace from chars
+	    let chars = substitute(chars, '.$', '', '')
+
+	    " and create the syntax item contained in the pixel strings
+	    exe 'syn match xpmColor' .. n .. ' /' .. chars .. '/ contained'
+	    exe 'syn cluster xpmColors add=xpmColor' .. n
+
+	    " if no color or color = "None" show background
+	    if color == ""  ||  substitute(color, '.*', '\L&', '') == 'none'
+	       exe 'hi xpmColor' .. n .. ' guifg=bg'
+	       exe 'hi xpmColor' .. n .. ' guibg=NONE'
+	    elseif color !~ "'"
+	       exe 'hi xpmColor' .. n .. " guifg='" .. color .. "'"
+	       exe 'hi xpmColor' .. n .. " guibg='" .. color .. "'"
+	    endif
+	    let n += 1
+	 else
+	    break		" no more color string
 	 endif
-	 let n = n + 1
-      else
-	 break		" no more color string
       endif
-   endif
-   let i = i + 1
-endwhile
+   endfor
+endfunction
 
-unlet color chars colors cpp n i s
+call s:CreateSyntax()
 
 endif          " has("gui_running") || has("termguicolors") && &termguicolors
 
-- 
cgit 


From 0dbed7132b559b3e8419c0e59ca553e5921d6a90 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 May 2023 12:37:22 +0200
Subject: build(deps): update lua parser and queries

---
 runtime/queries/lua/highlights.scm | 10 +++++++++-
 runtime/queries/lua/injections.scm | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 5fbf8a1833..537a171441 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -127,8 +127,14 @@
 
 (identifier) @variable
 
+((identifier) @constant.builtin
+  (#eq? @constant.builtin "_VERSION"))
+
 ((identifier) @variable.builtin
- (#any-of? @variable.builtin "_G" "_VERSION" "debug" "io" "jit" "math" "os" "package" "self" "string" "table" "utf8"))
+  (#eq? @variable.builtin "self"))
+
+((identifier) @namespace.builtin
+  (#any-of? @namespace.builtin "_G" "debug" "io" "jit" "math" "os" "package" "string" "table" "utf8"))
 
 ((identifier) @keyword.coroutine
   (#eq? @keyword.coroutine "coroutine"))
@@ -210,5 +216,7 @@
 
 (string) @string @spell
 
+(escape_sequence) @string.escape
+
 ;; Error
 (ERROR) @error
diff --git a/runtime/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
index 1c7bdaf951..3fcebe83f3 100644
--- a/runtime/queries/lua/injections.scm
+++ b/runtime/queries/lua/injections.scm
@@ -13,6 +13,14 @@
   (#set! injection.language "vim")
   (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec2" "vim.api.nvim_cmd"))
 
+; vim.rcprequest(123, "nvim_exec_lua", "return vim.api.nvim_buf_get_lines(0, 0, -1, false)", false)
+((function_call
+  name: (_) @_vimcmd_identifier
+  arguments: (arguments . (_) . (string content: _ @_method) . (string content: _ @injection.content)))
+  (#set! injection.language "lua")
+  (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
+  (#eq? @_method "nvim_exec_lua"))
+
 ((function_call
   name: (_) @_vimcmd_identifier
   arguments: (arguments (string content: _ @injection.content) .))
@@ -20,7 +28,7 @@
   (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse"))
 
 ;; highlight string as query if starts with `;; query`
-((string ("string_content") @injection.content)
+(string content: _ @injection.content
  (#set! injection.language "query")
  (#lua-match? @injection.content "^%s*;+%s?query"))
 
-- 
cgit 


From c97de026e357dec0bed034af3b54abf10966200b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 May 2023 12:50:40 +0200
Subject: fix(treesitter): update vimdoc and vimscript queries

---
 runtime/queries/vim/highlights.scm    | 2 +-
 runtime/queries/vimdoc/highlights.scm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm
index ce25b13b9f..09188ddb68 100644
--- a/runtime/queries/vim/highlights.scm
+++ b/runtime/queries/vim/highlights.scm
@@ -275,7 +275,7 @@
 
 ; Options
 ((set_value) @number
- (#match? @number "^[0-9]+(\.[0-9]+)?$"))
+ (#lua-match? @number "^[%d]+(%.[%d]+)?$"))
 
 (inv_option "!" @operator)
 (set_item "?" @operator)
diff --git a/runtime/queries/vimdoc/highlights.scm b/runtime/queries/vimdoc/highlights.scm
index c0d88301bc..e0dce49b2a 100644
--- a/runtime/queries/vimdoc/highlights.scm
+++ b/runtime/queries/vimdoc/highlights.scm
@@ -1,7 +1,7 @@
-(h1) @text.title
-(h2) @text.title
-(h3) @text.title
-(column_heading) @text.title
+(h1) @text.title.1
+(h2) @text.title.2
+(h3) @text.title.3
+(column_heading) @text.title.4
 (column_heading
    "~" @conceal (#set! conceal ""))
 (tag
-- 
cgit 


From 9ff59517cbf309d31f979a49b7dc82b237ecfcc4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 13 May 2023 12:56:21 +0200
Subject: fix(treesitter): update c queries

---
 runtime/doc/treesitter.txt           | 16 ++++++++++++++--
 runtime/lua/vim/treesitter/query.lua | 33 +++++++++++++++++++++++++++++++++
 runtime/queries/c/highlights.scm     | 17 +++++++++++++++--
 3 files changed, 62 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 483812b7c9..64b4730eee 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -221,8 +221,7 @@ The following predicates are built in:
          similar to `match?`
 
     `contains?`                                *treesitter-predicate-contains?*
-        Match a string against parts of the text corresponding to a node:
-        >query
+        Match a string against parts of the text corresponding to a node: >query
             ((identifier) @foo (#contains? @foo "foo"))
             ((identifier) @foo-bar (#contains? @foo-bar "foo" "bar"))
 <
@@ -234,6 +233,19 @@ The following predicates are built in:
         This is the recommended way to check if the node matches one of many
         keywords, as it has been optimized for this.
 
+    `has-ancestor?`                        *treesitter-predicate-has-ancestor?*
+        Match any of the given node types against all ancestors of a node: >query
+            ((identifier) @variable.builtin
+              (#any-of? @variable.builtin "begin" "end")
+              (#has-ancestor? @variable.builtin range_expression))
+<
+    `has-parent?`                            *treesitter-predicate-has-parent?*
+        Match any of the given node types against the direct ancestor of a
+        node: >query
+            (((field_expression
+                 (field_identifier) @method)) @_parent
+             (#has-parent? @_parent template_method function_declarator))
+<
                                                  *lua-treesitter-not-predicate*
 Each predicate has a `not-` prefixed predicate that is just the negation of
 the predicate.
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 75e5bf8870..73b561c777 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -382,6 +382,39 @@ local predicate_handlers = {
 
     return string_set[node_text]
   end,
+
+  ['has-ancestor?'] = function(match, _, _, predicate)
+    local node = match[predicate[2]]
+    if not node then
+      return true
+    end
+
+    local ancestor_types = {}
+    for _, type in ipairs({ unpack(predicate, 3) }) do
+      ancestor_types[type] = true
+    end
+
+    node = node:parent()
+    while node do
+      if ancestor_types[node:type()] then
+        return true
+      end
+      node = node:parent()
+    end
+    return false
+  end,
+
+  ['has-parent?'] = function(match, _, _, predicate)
+    local node = match[predicate[2]]
+    if not node then
+      return true
+    end
+
+    if vim.list_contains({ unpack(predicate, 3) }, node:parent():type()) then
+      return true
+    end
+    return false
+  end,
 }
 
 -- As we provide lua-match? also expose vim-match?
diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index dee70f9cc7..523a792403 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -117,12 +117,19 @@
  (preproc_defined)
 ]  @function.macro
 
-(field_identifier) @property
+(((field_expression
+     (field_identifier) @property)) @_parent
+ (#not-has-parent? @_parent template_method function_declarator call_expression))
+
+(field_designator) @property
+(((field_identifier) @property)
+ (#has-ancestor? @property field_declaration)
+ (#not-has-ancestor? @property function_declarator))
+
 (statement_identifier) @label
 
 [
  (type_identifier)
- (sized_type_specifier)
  (type_descriptor)
 ] @type
 
@@ -138,6 +145,8 @@
 
 (primitive_type) @type.builtin
 
+(sized_type_specifier _ @type.builtin type: _?)
+
 ((identifier) @constant
  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
 (enumerator
@@ -163,6 +172,10 @@
     field: (field_identifier) @function.call))
 (function_declarator
   declarator: (identifier) @function)
+(function_declarator
+  declarator: (parenthesized_declarator
+                (pointer_declarator
+                  declarator: (field_identifier) @function)))
 (preproc_function_def
   name: (identifier) @function.macro)
 
-- 
cgit 


From 6b19170d44ca56cf65542ee184d2bc89c6d622a9 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 16 May 2023 16:41:47 +0100
Subject: fix(treesitter): correctly calculate bytes for text sources (#23655)

Fixes #20419
---
 runtime/lua/vim/treesitter/_range.lua | 38 ++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index f4db5016ac..35081c6400 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -143,6 +143,29 @@ function M.contains(r1, r2)
   return true
 end
 
+--- @param source integer|string
+--- @param index integer
+--- @return integer
+local function get_offset(source, index)
+  if index == 0 then
+    return 0
+  end
+
+  if type(source) == 'number' then
+    return api.nvim_buf_get_offset(source, index)
+  end
+
+  local byte = 0
+  local next_offset = source:gmatch('()\n')
+  local line = 1
+  while line <= index do
+    byte = next_offset() --[[@as integer]]
+    line = line + 1
+  end
+
+  return byte
+end
+
 ---@private
 ---@param source integer|string
 ---@param range Range
@@ -152,19 +175,10 @@ function M.add_bytes(source, range)
     return range --[[@as Range6]]
   end
 
-  local start_row, start_col, end_row, end_col = range[1], range[2], range[3], range[4]
-  local start_byte = 0
-  local end_byte = 0
+  local start_row, start_col, end_row, end_col = M.unpack4(range)
   -- TODO(vigoux): proper byte computation here, and account for EOL ?
-  if type(source) == 'number' then
-    -- Easy case, this is a buffer parser
-    start_byte = api.nvim_buf_get_offset(source, start_row) + start_col
-    end_byte = api.nvim_buf_get_offset(source, end_row) + end_col
-  elseif type(source) == 'string' then
-    -- string parser, single `\n` delimited string
-    start_byte = vim.fn.byteidx(source, start_col)
-    end_byte = vim.fn.byteidx(source, end_col)
-  end
+  local start_byte = get_offset(source, start_row) + start_col
+  local end_byte = get_offset(source, end_row) + end_col
 
   return { start_row, start_col, start_byte, end_row, end_col, end_byte }
 end
-- 
cgit 


From 189fb6203262340e7a59e782be970bcd8ae28e61 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 17 May 2023 11:42:18 +0100
Subject: feat(treesitter): improved logging (#23638)

- Add bindings to Treesitter ts_parser_set_logger and ts_parser_logger
- Add logfile with path STDPATH('log')/treesitter.c
- Rework existing LanguageTree loggin to use logfile
- Begin implementing log levels for vim.g.__ts_debug
---
 runtime/lua/vim/fs.lua                      |  6 ++-
 runtime/lua/vim/treesitter/_meta.lua        |  4 ++
 runtime/lua/vim/treesitter/languagetree.lua | 67 +++++++++++++++++++++++++----
 3 files changed, 67 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 2a51bde263..7f9f3a2bce 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -73,10 +73,14 @@ function M.basename(file)
 end
 
 ---@private
-local function join_paths(...)
+---@param ... string
+---@return string
+function M._join_paths(...)
   return (table.concat({ ... }, '/'):gsub('//+', '/'))
 end
 
+local join_paths = M._join_paths
+
 ---@alias Iterator fun(): string?, string?
 
 --- Return an iterator over the files and directories located in {path}
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index c1009f5f5d..9ca4b560c6 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -45,6 +45,8 @@ function TSNode:_rawquery(query, captures, start, end_, opts) end
 ---@return fun(): string, any
 function TSNode:_rawquery(query, captures, start, end_, opts) end
 
+---@alias TSLoggerCallback fun(logtype: 'parse'|'lex', msg: string)
+
 ---@class TSParser
 ---@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: boolean?): TSTree, integer[]
 ---@field reset fun(self: TSParser)
@@ -52,6 +54,8 @@ function TSNode:_rawquery(query, captures, start, end_, opts) end
 ---@field set_included_ranges fun(self: TSParser, ranges: Range6[])
 ---@field set_timeout fun(self: TSParser, timeout: integer)
 ---@field timeout fun(self: TSParser): integer
+---@field _set_logger fun(self: TSParser, lex: boolean, parse: boolean, cb: TSLoggerCallback)
+---@field _logger fun(self: TSParser): TSLoggerCallback
 
 ---@class TSTree
 ---@field root fun(self: TSTree): TSNode
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 0efe3af85c..6c780f33c4 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -31,8 +31,17 @@
 --- shouldn't be done directly in the change callback anyway as they will be very frequent. Rather
 --- a plugin that does any kind of analysis on a tree should use a timer to throttle too frequent
 --- updates.
+---
+
+-- Debugging:
+--
+-- vim.g.__ts_debug levels:
+--    - 1. Messages from languagetree.lua
+--    - 2. Parse messages from treesitter
+--    - 2. Lex messages from treesitter
+--
+-- Log file can be found in stdpath('log')/treesitter.log
 
-local api = vim.api
 local query = require('vim.treesitter.query')
 local language = require('vim.treesitter.language')
 local Range = require('vim.treesitter._range')
@@ -75,6 +84,8 @@ local TSCallbackNames = {
 ---@field private _source (integer|string) Buffer or string to parse
 ---@field private _trees TSTree[] Reference to parsed tree (one for each language)
 ---@field private _valid boolean|table<integer,boolean> If the parsed tree is valid
+---@field private _logger? fun(logtype: string, msg: string)
+---@field private _logfile? file*
 local LanguageTree = {}
 
 ---@class LanguageTreeOpts
@@ -114,6 +125,10 @@ function LanguageTree.new(source, lang, opts)
     _callbacks_rec = {},
   }, LanguageTree)
 
+  if vim.g.__ts_debug and type(vim.g.__ts_debug) == 'number' then
+    self:_set_logger()
+  end
+
   for _, name in pairs(TSCallbackNames) do
     self._callbacks[name] = {}
     self._callbacks_rec[name] = {}
@@ -122,6 +137,33 @@ function LanguageTree.new(source, lang, opts)
   return self
 end
 
+function LanguageTree:_set_logger()
+  local source = self:source()
+  source = type(source) == 'string' and 'text' or tostring(source)
+
+  local lang = self:lang()
+
+  local logfilename = vim.fs._join_paths(vim.fn.stdpath('log'), 'treesitter.log')
+
+  local logfile, openerr = io.open(logfilename, 'a+')
+
+  if not logfile or openerr then
+    error(string.format('Could not open file (%s) for logging: %s', logfilename, openerr))
+    return
+  end
+
+  self._logfile = logfile
+
+  self._logger = function(logtype, msg)
+    self._logfile:write(string.format('%s:%s:(%s) %s\n', source, lang, logtype, msg))
+    self._logfile:flush()
+  end
+
+  local log_lex = vim.g.__ts_debug >= 3
+  local log_parse = vim.g.__ts_debug >= 2
+  self._parser:_set_logger(log_lex, log_parse, self._logger)
+end
+
 ---@private
 ---Measure execution time of a function
 ---@generic R1, R2, R3
@@ -139,7 +181,11 @@ end
 ---@private
 ---@vararg any
 function LanguageTree:_log(...)
-  if vim.g.__ts_debug == nil then
+  if not self._logger then
+    return
+  end
+
+  if not vim.g.__ts_debug or vim.g.__ts_debug < 1 then
     return
   end
 
@@ -150,19 +196,17 @@ function LanguageTree:_log(...)
 
   local info = debug.getinfo(2, 'nl')
   local nregions = #self:included_regions()
-  local prefix =
-    string.format('%s:%d: [%s:%d] ', info.name, info.currentline, self:lang(), nregions)
+  local prefix = string.format('%s:%d: (#regions=%d) ', info.name, info.currentline, nregions)
 
-  api.nvim_out_write(prefix)
+  local msg = { prefix }
   for _, x in ipairs(args) do
     if type(x) == 'string' then
-      api.nvim_out_write(x)
+      msg[#msg + 1] = x
     else
-      api.nvim_out_write(vim.inspect(x, { newline = ' ', indent = '' }))
+      msg[#msg + 1] = vim.inspect(x, { newline = ' ', indent = '' })
     end
-    api.nvim_out_write(' ')
   end
-  api.nvim_out_write('\n')
+  self._logger('nvim', table.concat(msg, ' '))
 end
 
 --- Invalidates this parser and all its children
@@ -876,6 +920,11 @@ end
 function LanguageTree:_on_detach(...)
   self:invalidate(true)
   self:_do_callback('detach', ...)
+  if self._logfile then
+    self._logger('nvim', 'detaching')
+    self._logger = nil
+    self._logfile:close()
+  end
 end
 
 --- Registers callbacks for the |LanguageTree|.
-- 
cgit 


From ef64e225f6f6c01280aa8472bebe812016f357bf Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 18 May 2023 10:52:01 +0100
Subject: fix(treesitter): allow foldexpr without highlights (#23672)

Ref nvim-treesitter/nvim-treesitter#4748
---
 runtime/lua/vim/treesitter.lua       | 10 ----------
 runtime/lua/vim/treesitter/_fold.lua |  4 ++--
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index d1f5996768..12fbe1654f 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -136,16 +136,6 @@ function M.get_parser(bufnr, lang, opts)
   return parsers[bufnr]
 end
 
----@package
----@param bufnr (integer|nil) Buffer number
----@return boolean
-function M._has_parser(bufnr)
-  if bufnr == nil or bufnr == 0 then
-    bufnr = api.nvim_get_current_buf()
-  end
-  return parsers[bufnr] ~= nil
-end
-
 --- Returns a string parser
 ---
 ---@param str string Text to parse
diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index f6425d7cb9..a8f8c7967e 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -301,7 +301,8 @@ function M.foldexpr(lnum)
   lnum = lnum or vim.v.lnum
   local bufnr = api.nvim_get_current_buf()
 
-  if not ts._has_parser(bufnr) or not lnum then
+  local parser = vim.F.npcall(ts.get_parser, bufnr)
+  if not parser then
     return '0'
   end
 
@@ -309,7 +310,6 @@ function M.foldexpr(lnum)
     foldinfos[bufnr] = FoldInfo.new()
     get_folds_levels(bufnr, foldinfos[bufnr])
 
-    local parser = ts.get_parser(bufnr)
     parser:register_cbs({
       on_changedtree = function(tree_changes)
         on_changedtree(bufnr, foldinfos[bufnr], tree_changes)
-- 
cgit 


From 201f366b370a9df724258b3c9bf01ffaadb8dd01 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 19 May 2023 09:11:22 +0200
Subject: vim-patch:9.0.1565: json lines files are not recognized (#23677)

Problem:    Json lines files are not recognized.
Solution:   Add a pattern to detect "jsonl" files. (issue vim/vim#7520)

https://github.com/vim/vim/commit/6fadbc1e8c1f4c5b03eb6a78aeb023ca2c2a9a7d

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 5075c18976..1b04666161 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -579,6 +579,7 @@ local extension = {
   ['json-patch'] = 'json',
   json5 = 'json5',
   jsonc = 'jsonc',
+  jsonl = 'jsonl',
   jsonnet = 'jsonnet',
   libsonnet = 'jsonnet',
   jsp = 'jsp',
-- 
cgit 


From 073035a030f5ef8ae9b9ca51552f887944c52eaa Mon Sep 17 00:00:00 2001
From: Jon Huhn <nojnhuh@users.noreply.github.com>
Date: Sat, 20 May 2023 00:45:39 -0500
Subject: fix(lsp): don't register didChangeWatchedFiles when capability not
 set (#23689)

Some LSP servers (tailwindcss, rome) are known to request registration
for `workspace/didChangeWatchedFiles` even when the corresponding client
capability does not advertise support. This change adds an extra check
in the `client/registerCapability` handler not to start a watch unless
the client capability is set appropriately.
---
 runtime/lua/vim/lsp/_watchfiles.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index 3a78724d79..cf2c57db1f 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -193,7 +193,12 @@ local to_lsp_change_type = {
 function M.register(reg, ctx)
   local client_id = ctx.client_id
   local client = vim.lsp.get_client_by_id(client_id)
-  if not client.workspace_folders then
+  if
+    -- Ill-behaved servers may not honor the client capability and try to register
+    -- anyway, so ignore requests when the user has opted out of the feature.
+    not client.config.capabilities.workspace.didChangeWatchedFiles.dynamicRegistration
+    or not client.workspace_folders
+  then
     return
   end
   local watch_regs = {}
-- 
cgit 


From e3e6fadfd82861471c32fdcabe00bbef3de84563 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 20 May 2023 17:30:48 +0200
Subject: feat(fs): expose join_paths as `vim.fs.joinpath` (#23685)

This is a small function but used a lot in some plugins.
---
 runtime/doc/lua.txt    | 10 ++++++++++
 runtime/lua/vim/fs.lua | 18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 4eec4ee583..c6568b073d 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2576,6 +2576,16 @@ find({names}, {opts})                                          *vim.fs.find()*
         (table) Normalized paths |vim.fs.normalize()| of all matching files or
         directories
 
+joinpath({...})                                            *vim.fs.joinpath()*
+    Concatenate directories and/or file into a single path with normalization
+    (e.g., `"foo/"` and `"bar"` get joined to `"foo/bar"`)
+
+    Parameters: ~
+      • {...}  (string)
+
+    Return: ~
+        (string)
+
 normalize({path}, {opts})                                 *vim.fs.normalize()*
     Normalize a path to a standard format. A tilde (~) character at the
     beginning of the path is expanded to the user's home directory and any
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 7f9f3a2bce..864ba495f1 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -72,15 +72,15 @@ function M.basename(file)
   return file:match('[/\\]$') and '' or (file:match('[^\\/]*$'):gsub('\\', '/'))
 end
 
----@private
+--- Concatenate directories and/or file into a single path with normalization
+--- (e.g., `"foo/"` and `"bar"` get joined to `"foo/bar"`)
+---
 ---@param ... string
 ---@return string
-function M._join_paths(...)
+function M.joinpath(...)
   return (table.concat({ ... }, '/'):gsub('//+', '/'))
 end
 
-local join_paths = M._join_paths
-
 ---@alias Iterator fun(): string?, string?
 
 --- Return an iterator over the files and directories located in {path}
@@ -120,14 +120,14 @@ function M.dir(path, opts)
     local dirs = { { path, 1 } }
     while #dirs > 0 do
       local dir0, level = unpack(table.remove(dirs, 1))
-      local dir = level == 1 and dir0 or join_paths(path, dir0)
+      local dir = level == 1 and dir0 or M.joinpath(path, dir0)
       local fs = vim.loop.fs_scandir(M.normalize(dir))
       while fs do
         local name, t = vim.loop.fs_scandir_next(fs)
         if not name then
           break
         end
-        local f = level == 1 and name or join_paths(dir0, name)
+        local f = level == 1 and name or M.joinpath(dir0, name)
         coroutine.yield(f, t)
         if
           opts.depth
@@ -234,7 +234,7 @@ function M.find(names, opts)
         local t = {}
         for name, type in M.dir(p) do
           if (not opts.type or opts.type == type) and names(name, p) then
-            table.insert(t, join_paths(p, name))
+            table.insert(t, M.joinpath(p, name))
           end
         end
         return t
@@ -243,7 +243,7 @@ function M.find(names, opts)
       test = function(p)
         local t = {}
         for _, name in ipairs(names) do
-          local f = join_paths(p, name)
+          local f = M.joinpath(p, name)
           local stat = vim.loop.fs_stat(f)
           if stat and (not opts.type or opts.type == stat.type) then
             t[#t + 1] = f
@@ -280,7 +280,7 @@ function M.find(names, opts)
       end
 
       for other, type_ in M.dir(dir) do
-        local f = join_paths(dir, other)
+        local f = M.joinpath(dir, other)
         if type(names) == 'function' then
           if (not opts.type or opts.type == type_) and names(other, dir) then
             if add(f) then
-- 
cgit 


From 1fe1bb084d0099fc4f9bfdc11189485d0f74b75a Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 19 Dec 2022 16:37:45 +0000
Subject: refactor(options): deprecate nvim[_buf|_win]_[gs]et_option

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
Co-authored-by: famiu <famiuhaque@protonmail.com>
---
 runtime/doc/api.txt                                | 56 +---------------------
 runtime/doc/deprecated.txt                         |  6 +++
 runtime/doc/lsp.txt                                |  4 +-
 runtime/doc/lua.txt                                |  2 +-
 runtime/doc/news.txt                               | 10 +++-
 runtime/lua/vim/lsp.lua                            | 16 +++----
 runtime/lua/vim/lsp/handlers.lua                   |  2 +-
 runtime/lua/vim/lsp/util.lua                       | 30 +++++-------
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   |  6 +--
 9 files changed, 42 insertions(+), 90 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 1f65c3ac01..e7cda59906 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -486,7 +486,7 @@ Example: create a float with scratch buffer: >vim
         \ 'row': 1, 'anchor': 'NW', 'style': 'minimal'}
     let win = nvim_open_win(buf, 0, opts)
     " optional: change highlight, otherwise Pmenu is used
-    call nvim_win_set_option(win, 'winhl', 'Normal:MyHighlight')
+    call nvim_set_option_value('winhl', 'Normal:MyHighlight', {'win': win})
 <
 
 ==============================================================================
@@ -1917,25 +1917,6 @@ nvim_parse_cmd({str}, {opts})                               *nvim_parse_cmd()*
 ==============================================================================
 Options Functions                                                *api-options*
 
-nvim_buf_get_option({buffer}, {name})                  *nvim_buf_get_option()*
-    Gets a buffer option value
-
-    Parameters: ~
-      • {buffer}  Buffer handle, or 0 for current buffer
-      • {name}    Option name
-
-    Return: ~
-        Option value
-
-nvim_buf_set_option({buffer}, {name}, {value})         *nvim_buf_set_option()*
-    Sets a buffer option value. Passing `nil` as value deletes the option
-    (only works if there's a global fallback)
-
-    Parameters: ~
-      • {buffer}  Buffer handle, or 0 for current buffer
-      • {name}    Option name
-      • {value}   Option value
-
 nvim_get_all_options_info()                      *nvim_get_all_options_info()*
     Gets the option information for all options.
 
@@ -1945,15 +1926,6 @@ nvim_get_all_options_info()                      *nvim_get_all_options_info()*
     Return: ~
         dictionary of all options
 
-nvim_get_option({name})                                    *nvim_get_option()*
-    Gets the global value of an option.
-
-    Parameters: ~
-      • {name}  Option name
-
-    Return: ~
-        Option value (global)
-
 nvim_get_option_info2({name}, {*opts})               *nvim_get_option_info2()*
     Gets the option information for one option from arbitrary buffer or window
 
@@ -2010,13 +1982,6 @@ nvim_get_option_value({name}, {*opts})               *nvim_get_option_value()*
     Return: ~
         Option value
 
-nvim_set_option({name}, {value})                           *nvim_set_option()*
-    Sets the global value of an option.
-
-    Parameters: ~
-      • {name}   Option name
-      • {value}  New option value
-
                                                      *nvim_set_option_value()*
 nvim_set_option_value({name}, {value}, {*opts})
     Sets the value of an option. The behavior of this function matches that of
@@ -2034,25 +1999,6 @@ nvim_set_option_value({name}, {value}, {*opts})
                  • win: |window-ID|. Used for setting window local option.
                  • buf: Buffer number. Used for setting buffer local option.
 
-nvim_win_get_option({window}, {name})                  *nvim_win_get_option()*
-    Gets a window option value
-
-    Parameters: ~
-      • {window}  Window handle, or 0 for current window
-      • {name}    Option name
-
-    Return: ~
-        Option value
-
-nvim_win_set_option({window}, {name}, {value})         *nvim_win_set_option()*
-    Sets a window option value. Passing `nil` as value deletes the option
-    (only works if there's a global fallback)
-
-    Parameters: ~
-      • {window}  Window handle, or 0 for current window
-      • {name}    Option name
-      • {value}   Option value
-
 
 ==============================================================================
 Buffer Functions                                                  *api-buffer*
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 3150190a8b..9d4a7324bf 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -21,6 +21,12 @@ API
 - *nvim_get_hl_by_id()*		Use |nvim_get_hl()| instead.
 - *nvim_exec()*			Use |nvim_exec2()| instead.
 - *nvim_get_option_info()*	Use |nvim_get_option_info2()| instead.
+- *nvim_buf_get_option()*	Use |nvim_get_option_value()| instead.
+- *nvim_buf_set_option()*	Use |nvim_set_option_value()| instead.
+- *nvim_get_option()*		Use |nvim_get_option_value()| instead.
+- *nvim_set_option()*		Use |nvim_set_option_value()| instead.
+- *nvim_win_get_option()*	Use |nvim_get_option_value()| instead.
+- *nvim_win_set_option()*	Use |nvim_set_option_value()| instead.
 
 COMMANDS
 - *:rv* *:rviminfo*		Deprecated alias to |:rshada| command.
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index ca1a9a414d..98a0801013 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -800,8 +800,8 @@ formatexpr({opts})                                      *vim.lsp.formatexpr()*
 
     Currently only supports a single client. This can be set via `setlocal
     formatexpr=v:lua.vim.lsp.formatexpr()` but will typically or in
-    `on_attach` via `vim.api.nvim_buf_set_option(bufnr, 'formatexpr',
-    'v:lua.vim.lsp.formatexpr(#{timeout_ms:250})')`.
+    `on_attach` via `vim.bo[bufnr].formatexpr =
+    'v:lua.vim.lsp.formatexpr(#{timeout_ms:250})'`.
 
     Parameters: ~
       • {opts}  (table) options for customizing the formatting expression
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index c6568b073d..ad9cb69ae0 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -401,7 +401,7 @@ For example consider the following Lua omnifunc handler: >lua
         return {'stuff', 'steam', 'strange things'}
       end
     end
-    vim.api.nvim_buf_set_option(0, 'omnifunc', 'v:lua.mymod.omnifunc')
+    vim.bo[buf].omnifunc = 'v:lua.mymod.omnifunc'
 
 Note: The module ("mymod" in the above example) must either be a Lua global,
 or use require() as shown above to access it from a package.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 11ef26165f..9f6ab2ddd0 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -84,7 +84,7 @@ The following deprecated functions or APIs were removed.
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
 
-The following functions are now deprecated and will be removed in the next
+The following functions are now deprecated and will be removed in a future
 release.
 
 • Checkhealth functions:
@@ -94,4 +94,12 @@ release.
   - |health#report_start|, |vim.health.report_start()|	Use |vim.health.start()| instead.
   - |health#report_warn|, |vim.health.report_warn()|	Use |vim.health.warn()| instead.
 
+• |API| functions:
+  - |nvim_buf_get_option()|	Use |nvim_get_option_value()| instead.
+  - |nvim_buf_set_option()|	Use |nvim_set_option_value()| instead.
+  - |nvim_get_option()|		Use |nvim_get_option_value()| instead.
+  - |nvim_set_option()|		Use |nvim_set_option_value()| instead.
+  - |nvim_win_get_option()|	Use |nvim_get_option_value()| instead.
+  - |nvim_win_set_option()|	Use |nvim_set_option_value()| instead.
+
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 92f5653158..2e6ca7a0ac 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -8,12 +8,8 @@ local sync = require('vim.lsp.sync')
 local semantic_tokens = require('vim.lsp.semantic_tokens')
 
 local api = vim.api
-local nvim_err_writeln, nvim_buf_get_lines, nvim_command, nvim_buf_get_option, nvim_exec_autocmds =
-  api.nvim_err_writeln,
-  api.nvim_buf_get_lines,
-  api.nvim_command,
-  api.nvim_buf_get_option,
-  api.nvim_exec_autocmds
+local nvim_err_writeln, nvim_buf_get_lines, nvim_command, nvim_exec_autocmds =
+  api.nvim_err_writeln, api.nvim_buf_get_lines, api.nvim_command, api.nvim_exec_autocmds
 local uv = vim.loop
 local tbl_isempty, tbl_extend = vim.tbl_isempty, vim.tbl_extend
 local validate = vim.validate
@@ -137,7 +133,7 @@ local format_line_ending = {
 ---@param bufnr (number)
 ---@return string
 local function buf_get_line_ending(bufnr)
-  return format_line_ending[nvim_buf_get_option(bufnr, 'fileformat')] or '\n'
+  return format_line_ending[vim.bo[bufnr].fileformat] or '\n'
 end
 
 local client_index = 0
@@ -319,7 +315,7 @@ end
 local function buf_get_full_text(bufnr)
   local line_ending = buf_get_line_ending(bufnr)
   local text = table.concat(nvim_buf_get_lines(bufnr, 0, -1, true), line_ending)
-  if nvim_buf_get_option(bufnr, 'eol') then
+  if vim.bo[bufnr].eol then
     text = text .. line_ending
   end
   return text
@@ -709,7 +705,7 @@ local function text_document_did_open_handler(bufnr, client)
   if not api.nvim_buf_is_loaded(bufnr) then
     return
   end
-  local filetype = nvim_buf_get_option(bufnr, 'filetype')
+  local filetype = vim.bo[bufnr].filetype
 
   local params = {
     textDocument = {
@@ -2177,7 +2173,7 @@ end
 ---
 --- Currently only supports a single client. This can be set via
 --- `setlocal formatexpr=v:lua.vim.lsp.formatexpr()` but will typically or in `on_attach`
---- via ``vim.api.nvim_buf_set_option(bufnr, 'formatexpr', 'v:lua.vim.lsp.formatexpr(#{timeout_ms:250})')``.
+--- via ``vim.bo[bufnr].formatexpr = 'v:lua.vim.lsp.formatexpr(#{timeout_ms:250})'``.
 ---
 ---@param opts table options for customizing the formatting expression which takes the
 ---                   following optional keys:
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 71bef43bc1..8e926c4644 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -454,7 +454,7 @@ function M.signature_help(_, result, ctx, config)
   local client = vim.lsp.get_client_by_id(ctx.client_id)
   local triggers =
     vim.tbl_get(client.server_capabilities, 'signatureHelpProvider', 'triggerCharacters')
-  local ft = api.nvim_buf_get_option(ctx.bufnr, 'filetype')
+  local ft = vim.bo[ctx.bufnr].filetype
   local lines, hl = util.convert_signature_help_to_markdown_lines(result, ft, triggers)
   lines = util.trim_empty_lines(lines)
   if vim.tbl_isempty(lines) then
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 8274361f6d..9fffc845b1 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -401,7 +401,7 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
   if not api.nvim_buf_is_loaded(bufnr) then
     vim.fn.bufload(bufnr)
   end
-  api.nvim_buf_set_option(bufnr, 'buflisted', true)
+  vim.bo[bufnr].buflisted = true
 
   -- Fix reversed range and indexing each text_edits
   local index = 0
@@ -530,11 +530,7 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
 
   -- Remove final line if needed
   local fix_eol = has_eol_text_edit
-  fix_eol = fix_eol
-    and (
-      api.nvim_buf_get_option(bufnr, 'eol')
-      or (api.nvim_buf_get_option(bufnr, 'fixeol') and not api.nvim_buf_get_option(bufnr, 'binary'))
-    )
+  fix_eol = fix_eol and (vim.bo[bufnr].eol or (vim.bo[bufnr].fixeol and not vim.bo[bufnr].binary))
   fix_eol = fix_eol and get_line(bufnr, max - 1) == ''
   if fix_eol then
     api.nvim_buf_set_lines(bufnr, -2, -1, false, {})
@@ -1076,7 +1072,7 @@ function M.make_floating_popup_options(width, height, opts)
 
   local wincol = opts.relative == 'mouse' and vim.fn.getmousepos().column or vim.fn.wincol()
 
-  if wincol + width + (opts.offset_x or 0) <= api.nvim_get_option('columns') then
+  if wincol + width + (opts.offset_x or 0) <= vim.o.columns then
     anchor = anchor .. 'W'
     col = 0
   else
@@ -1142,7 +1138,7 @@ function M.show_document(location, offset_encoding, opts)
     or focus and api.nvim_get_current_win()
     or create_window_without_focus()
 
-  api.nvim_buf_set_option(bufnr, 'buflisted', true)
+  vim.bo[bufnr].buflisted = true
   api.nvim_win_set_buf(win, bufnr)
   if focus then
     api.nvim_set_current_win(win)
@@ -1201,12 +1197,12 @@ function M.preview_location(location, opts)
   end
   local range = location.targetRange or location.range
   local contents = api.nvim_buf_get_lines(bufnr, range.start.line, range['end'].line + 1, false)
-  local syntax = api.nvim_buf_get_option(bufnr, 'syntax')
+  local syntax = vim.bo[bufnr].syntax
   if syntax == '' then
     -- When no syntax is set, we use filetype as fallback. This might not result
     -- in a valid syntax definition. See also ft detection in stylize_markdown.
     -- An empty syntax is more common now with TreeSitter, since TS disables syntax.
-    syntax = api.nvim_buf_get_option(bufnr, 'filetype')
+    syntax = vim.bo[bufnr].filetype
   end
   opts = opts or {}
   opts.focus_id = 'location'
@@ -1665,7 +1661,7 @@ function M.open_floating_preview(contents, syntax, opts)
     contents = M.stylize_markdown(floating_bufnr, contents, opts)
   else
     if syntax then
-      api.nvim_buf_set_option(floating_bufnr, 'syntax', syntax)
+      vim.bo[floating_bufnr].syntax = syntax
     end
     api.nvim_buf_set_lines(floating_bufnr, 0, -1, true, contents)
   end
@@ -1681,16 +1677,16 @@ function M.open_floating_preview(contents, syntax, opts)
   local float_option = M.make_floating_popup_options(width, height, opts)
   local floating_winnr = api.nvim_open_win(floating_bufnr, false, float_option)
   if do_stylize then
-    api.nvim_win_set_option(floating_winnr, 'conceallevel', 2)
-    api.nvim_win_set_option(floating_winnr, 'concealcursor', 'n')
+    vim.wo[floating_winnr].conceallevel = 2
+    vim.wo[floating_winnr].concealcursor = 'n'
   end
   -- disable folding
-  api.nvim_win_set_option(floating_winnr, 'foldenable', false)
+  vim.wo[floating_winnr].foldenable = false
   -- soft wrapping
-  api.nvim_win_set_option(floating_winnr, 'wrap', opts.wrap)
+  vim.wo[floating_winnr].wrap = opts.wrap
 
-  api.nvim_buf_set_option(floating_bufnr, 'modifiable', false)
-  api.nvim_buf_set_option(floating_bufnr, 'bufhidden', 'wipe')
+  vim.bo[floating_bufnr].modifiable = false
+  vim.bo[floating_bufnr].bufhidden = 'wipe'
   api.nvim_buf_set_keymap(
     floating_bufnr,
     'n',
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 2c3f61c9d4..43c3d7541f 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -1328,11 +1328,11 @@ function! s:OpenHoverPreview(lines, filetype) abort
             \ })
 
       if a:filetype isnot v:null
-        call nvim_win_set_option(float_win_id, 'filetype', a:filetype)
+        call nvim_set_option_value('filetype', a:filetype, { 'win' : float_win_id })
       endif
 
-      call nvim_buf_set_option(buf, 'modified', v:false)
-      call nvim_buf_set_option(buf, 'modifiable', v:false)
+      call nvim_set_option_value('modified', v:false, { 'buf' : buf })
+      call nvim_set_option_value('modifiable', v:false, { 'buf' : buf })
 
       " Unlike preview window, :pclose does not close window. Instead, close
       " hover window automatically when cursor is moved.
-- 
cgit 


From 3b66f92d0e5a21a438eeb1b817eb434e21155608 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 21 May 2023 11:29:47 +0200
Subject: docs(luv): update to HEAD

---
 runtime/doc/luvref.txt | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 2be75d5b0c..79dd1248aa 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -3499,6 +3499,65 @@ uv.thread_equal({thread}, {other_thread})                    *uv.thread_equal()*
                 This function is equivalent to the `__eq` metamethod.
 
                 Returns: `boolean`
+                                                     *uv.thread_setaffinity()*
+uv.thread_setaffinity({thread}, {affinity} [, {get_old_affinity}])
+
+                > method form `thread:setaffinity(affinity, [get_old_affinity])`
+
+                Parameters:
+                - `thread`: `luv_thread_t userdata`
+                - `affinity`: `table`
+                  - `[1, 2, 3, ..., n]` : `boolean`
+                - `get_old_affinity`: `boolean`
+
+                Sets the specified thread's affinity setting. `affinity` must
+                be an array-like table where each of the keys correspond to a
+                CPU number and the values are booleans that represent whether
+                the `thread` should be eligible to run on that CPU. The length
+                of the `affinity` table must be greater than or equal to
+                `uv.cpumask_size()`. If `get_old_affinity` is `true`, the
+                previous affinity settings for the `thread` will be returned.
+                Otherwise, `true` is returned after a successful call.
+
+                Note: Thread affinity setting is not atomic on Windows.
+                Unsupported on macOS.
+
+                Returns: `table` or `boolean` or `fail`
+                - `[1, 2, 3, ..., n]` : `boolean`
+
+
+uv.thread_getaffinity({thread} [, {mask_size}])        *uv.thread_getaffinity()*
+
+                > method form `thread:getaffinity([mask_size])`
+
+                Parameters:
+                - `thread`: `luv_thread_t userdata`
+                - `mask_size`: `integer`
+
+                Gets the specified thread's affinity setting.
+
+                If `mask_size` is provided, it must be greater than or equal
+                to `uv.cpumask_size()`. If the `mask_size` parameter is
+                omitted, then the return of `uv.cpumask_size()` will be used.
+                Returns an array-like table where each of the keys correspond
+                to a CPU number and the values are booleans that represent
+                whether the `thread` is eligible to run on that CPU.
+
+                Note: Thread affinity getting is not atomic on Windows.
+                Unsupported on macOS.
+
+                Returns: `table` or `fail`
+                - `[1, 2, 3, ..., n]` : `boolean`
+
+uv.thread_getcpu()                                          *uv.thread_getcpu()*
+
+                Gets the CPU number on which the calling thread is running.
+
+                Note: The first CPU will be returned as the number 1, not 0.
+                This allows for the number to correspond with the table keys
+                used in `uv.thread_getaffinity` and `uv.thread_setaffinity`.
+
+                Returns: `integer` or `fail`
 
 uv.thread_self()                                              *uv.thread_self()*
 
@@ -3588,6 +3647,16 @@ uv.get_constrained_memory()                        *uv.get_constrained_memory()*
 
                 Returns: `number`
 
+uv.get_available_memory()                            *uv.get_available_memory()*
+
+                Gets the amount of free memory that is still available to the
+                process (in bytes). This differs from `uv.get_free_memory()`
+                in that it takes into account any limits imposed by the OS. If
+                there is no such constraint, or the constraint is unknown, the
+                amount returned will be identical to `uv.get_free_memory()`.
+
+                Returns: `number`
+
 uv.resident_set_memory()                              *uv.resident_set_memory()*
 
                 Returns the resident set size (RSS) for the current process.
@@ -3652,6 +3721,14 @@ uv.cpu_info()                                                    *uv.cpu_info()*
                     - `idle` : `number`
                     - `irq` : `number`
 
+uv.cpumask_size()                                           *uv.cpumask_size()*
+
+                Returns the maximum size of the mask used for process/thread
+                affinities, or `ENOTSUP` if affinities are not supported on
+                the current platform.
+
+                Returns: `integer` or `fail`
+
 uv.getpid()                                                        *uv.getpid()*
 
                 DEPRECATED: Please use |uv.os_getpid()| instead.
@@ -3708,6 +3785,25 @@ uv.hrtime()                                                        *uv.hrtime()*
 
                 Returns: `number`
 
+uv.clock_gettime({clock_id})                                *uv.clock_gettime()*
+
+                Parameters:
+                - `clock_id`: `string`
+
+                Obtain the current system time from a high-resolution
+                real-time or monotonic clock source. `clock_id` can be the
+                string `"monotonic"` or `"realtime"`.
+
+                The real-time clock counts from the UNIX epoch (1970-01-01)
+                and is subject to time adjustments; it can jump back in time.
+
+                The monotonic clock counts from an arbitrary point in the past
+                and never jumps back in time.
+
+                Returns: `table` or `fail`
+                - `sec`: `integer`
+                - `nsec`: `integer`
+
 uv.uptime()                                                        *uv.uptime()*
 
                 Returns the current system uptime in seconds.
@@ -3979,6 +4075,22 @@ uv.metrics_idle_time()                                  *uv.metrics_idle_time()*
 
                 Returns: `number`
 
+uv.metrics_info()                                            *uv.metrics_info()*
+
+                Get the metrics table from current set of event loop metrics.
+
+                Returns: `table`
+
+                The table contains event loop metrics. It is recommended to
+                retrieve these metrics in a uv_prepare_cb in order to make
+                sure there are no inconsistencies with the metrics counters.
+
+                - `loop_count` : `integer`
+                - `events` : `integer`
+                - `events_waiting` : `integer`
+
+                Note: New in libuv version 1.45.0.
+
 ==============================================================================
 CREDITS                                                            *luv-credits*
 
-- 
cgit 


From edf9a897f089191f2b43985f7ebc11a0b540bb44 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 21 May 2023 19:22:28 +0200
Subject: fix(treesitter): update highlights for query (#23699)

captures for `; extends` and `; inherits`
---
 runtime/queries/query/highlights.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/queries/query/highlights.scm b/runtime/queries/query/highlights.scm
index ee31a7e7ef..f2d2ef6c7f 100644
--- a/runtime/queries/query/highlights.scm
+++ b/runtime/queries/query/highlights.scm
@@ -27,8 +27,8 @@
 ((parameters (identifier) @number)
  (#match? @number "^[-+]?[0-9]+(.[0-9]+)?$"))
 
-((program . (comment) @include)
- (#match? @include "^;\ +inherits\ *:"))
+((program . (comment)* . (comment) @include)
+ (#lua-match? @include "^;+ *inherits *:"))
 
-((program . (comment) @preproc)
- (#match? @preproc "^; +extends"))
+((program . (comment)* . (comment) @preproc)
+ (#lua-match? @preproc "^;+ *extends"))
-- 
cgit 


From 29da1a9cf0b44f2edcbff9e45af283f235360947 Mon Sep 17 00:00:00 2001
From: tom-anders <13141438+tom-anders@users.noreply.github.com>
Date: Sat, 6 May 2023 15:14:00 +0200
Subject: docs: update api.txt and add inline virtual text to news.txt

---
 runtime/doc/api.txt  | 2 ++
 runtime/doc/news.txt | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index e7cda59906..f399f1ed25 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2608,6 +2608,8 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {*opts})
                     • "overlay": display over the specified column, without
                       shifting the underlying text.
                     • "right_align": display right aligned in the window.
+                    • "inline": display at the specified column, and shift the
+                      buffer text to the right as needed
 
                   • virt_text_win_col : position the virtual text at a fixed
                     window column (starting from the first text column)
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 9f6ab2ddd0..5690dbf3bc 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -56,6 +56,8 @@ The following new APIs or features were added.
 • |Query:iter_matches()| now has the ability to set the maximum start depth
   for matches.
 
+• Added inline virtual text support to |nvim_buf_set_extmark()|.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
-- 
cgit 


From c855eee919f2d4edc9b9fa91b277454290fbabfe Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 24 May 2023 10:04:49 +0200
Subject: feat(term): enable reflow by default (#21124)

libvterm v0.3 supports reflow of terminal buffer when Nvim is resized
Since v0.3 is now a required dependency, enable it by default to find
(and fix) possible issues.

Note: Neovim's scrollback buffer does not support reflow (yet), so lines
vanishing into the buffer due to a too small window will be restored
without reflow.
---
 runtime/doc/news.txt    | 4 ++++
 runtime/doc/options.txt | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 5690dbf3bc..795ccc55de 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -58,6 +58,10 @@ The following new APIs or features were added.
 
 • Added inline virtual text support to |nvim_buf_set_extmark()|.
 
+• The terminal buffer now supports reflow (wrapped lines adapt when the buffer
+  is resized horizontally). Note: Lines that are not visible and kept in
+  |'scrollback'| are not reflown.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c1e0bccfd3..72463af418 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4913,6 +4913,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Minimum is 1, maximum is 100000.
 	Only in |terminal| buffers.
 
+	Note: Lines that are not visible and kept in scrollback are not
+	reflown when the terminal buffer is resized horizontally.
+
 			*'scrollbind'* *'scb'* *'noscrollbind'* *'noscb'*
 'scrollbind' 'scb'	boolean  (default off)
 			local to window
-- 
cgit 


From a24dd0392bc4e00b1cb2a1b9efe62045924489ae Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 26 May 2023 22:13:42 +0800
Subject: vim-patch:9.0.1580: CI: indent test hangs on FreeBSD (#23768)

Problem:    CI: indent test hangs on FreeBSD.
Solution:   Set 'nomore' when running the indent tests. (Ozaki Kiichi,
            closes vim/vim#12446)

https://github.com/vim/vim/commit/9f3afe7a70d50447424b8d7404aae0d641cd827c

Co-authored-by: ichizok <gclient.gaap@gmail.com>
---
 runtime/indent/testdir/runtest.vim | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim
index fa4e16e381..882a140a8d 100644
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -12,6 +12,7 @@ set nowrapscan
 set report=9999
 set modeline
 set debug=throw
+set nomore
 
 au! SwapExists * call HandleSwapExists()
 func HandleSwapExists()
-- 
cgit 


From 44d4ae448d0ab357a3aade773ea58c66c3c969cc Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <teto@users.noreply.github.com>
Date: Fri, 26 May 2023 21:51:18 +0200
Subject: fix: function was renamed (#23772)

---
 runtime/lua/vim/treesitter/languagetree.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 6c780f33c4..244d88f3e0 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -143,7 +143,7 @@ function LanguageTree:_set_logger()
 
   local lang = self:lang()
 
-  local logfilename = vim.fs._join_paths(vim.fn.stdpath('log'), 'treesitter.log')
+  local logfilename = vim.fs.joinpath(vim.fn.stdpath('log'), 'treesitter.log')
 
   local logfile, openerr = io.open(logfilename, 'a+')
 
-- 
cgit 


From e41b2e34b46a806b0fc59914263f8f4af9ac62f1 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 28 May 2023 11:09:25 +0800
Subject: test(extmarks): add test for virt_text_hide with 'smoothscroll'
 (#23791)

---
 runtime/doc/api.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index f399f1ed25..ed8858820e 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2614,8 +2614,9 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {*opts})
                   • virt_text_win_col : position the virtual text at a fixed
                     window column (starting from the first text column)
                   • virt_text_hide : hide the virtual text when the background
-                    text is selected or hidden due to horizontal scroll
-                    'nowrap'
+                    text is selected or hidden because of scrolling with
+                    'nowrap' or 'smoothscroll'. Currently only affects
+                    "overlay" virt_text.
                   • hl_mode : control how highlights are combined with the
                     highlights of the text. Currently only affects virt_text
                     highlights, but might affect `hl_group` in later versions.
-- 
cgit 


From ddd92a70d2aab5247895e89abaaa79c62ba7dbb4 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Sun, 28 May 2023 07:51:28 +0200
Subject: feat(lsp): initial support for dynamic capabilities (#23681)

- `client.dynamic_capabilities` is an object that tracks client register/unregister
- `client.supports_method` will additionally check if a dynamic capability supports the method, taking document filters into account. But only if the client enabled `dynamicRegistration` for the capability
- updated the default client capabilities to include dynamicRegistration for:
    - formatting
    - rangeFormatting
    - hover
    - codeAction
    - hover
    - rename
---
 runtime/doc/news.txt             |   1 +
 runtime/lua/vim/lsp.lua          | 121 ++++++++++++++++++++++-----------------
 runtime/lua/vim/lsp/_dynamic.lua | 109 +++++++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/buf.lua      |   6 +-
 runtime/lua/vim/lsp/handlers.lua |  28 ++++++---
 runtime/lua/vim/lsp/protocol.lua |  13 ++++-
 runtime/lua/vim/lsp/types.lua    |  28 +++++++++
 7 files changed, 237 insertions(+), 69 deletions(-)
 create mode 100644 runtime/lua/vim/lsp/_dynamic.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 795ccc55de..b6839ec692 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -36,6 +36,7 @@ ADDED FEATURES                                                     *news-added*
 
 The following new APIs or features were added.
 
+• Dynamic registration of LSP capabilities. An implication of this change is that checking a client's `server_capabilities` is no longer a sufficient indicator to see if a server supports a feature. Instead use `client.supports_method(<method>)`. It considers both the dynamic capabilities and static `server_capabilities`.
 • |vim.iter()| provides a generic iterator interface for tables and Lua
   iterators |luaref-in|.
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 2e6ca7a0ac..5337abea25 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -50,6 +50,7 @@ lsp._request_name_to_capability = {
   ['textDocument/codeAction'] = { 'codeActionProvider' },
   ['textDocument/codeLens'] = { 'codeLensProvider' },
   ['codeLens/resolve'] = { 'codeLensProvider', 'resolveProvider' },
+  ['codeAction/resolve'] = { 'codeActionProvider', 'resolveProvider' },
   ['workspace/executeCommand'] = { 'executeCommandProvider' },
   ['workspace/symbol'] = { 'workspaceSymbolProvider' },
   ['textDocument/references'] = { 'referencesProvider' },
@@ -886,6 +887,47 @@ function lsp.start(config, opts)
   return client_id
 end
 
+---@private
+-- Determines whether the given option can be set by `set_defaults`.
+local function is_empty_or_default(bufnr, option)
+  if vim.bo[bufnr][option] == '' then
+    return true
+  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 #scriptinfo ~= 1 then
+    return false
+  end
+
+  return vim.startswith(scriptinfo[1].name, vim.fn.expand('$VIMRUNTIME'))
+end
+
+---@private
+---@param client lsp.Client
+function lsp._set_defaults(client, bufnr)
+  if
+    client.supports_method('textDocument/definition') and is_empty_or_default(bufnr, 'tagfunc')
+  then
+    vim.bo[bufnr].tagfunc = 'v:lua.vim.lsp.tagfunc'
+  end
+  if
+    client.supports_method('textDocument/completion') and is_empty_or_default(bufnr, 'omnifunc')
+  then
+    vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc'
+  end
+  if
+    client.supports_method('textDocument/rangeFormatting')
+    and is_empty_or_default(bufnr, 'formatprg')
+    and is_empty_or_default(bufnr, 'formatexpr')
+  then
+    vim.bo[bufnr].formatexpr = 'v:lua.vim.lsp.formatexpr()'
+  end
+end
+
 -- FIXME: DOC: Currently all methods on the `vim.lsp.client` object are
 -- documented twice: Here, and on the methods themselves (e.g.
 -- `client.request()`). This is a workaround for the vimdoc generator script
@@ -1090,43 +1132,6 @@ function lsp.start_client(config)
     end
   end
 
-  ---@private
-  -- Determines whether the given option can be set by `set_defaults`.
-  local function is_empty_or_default(bufnr, option)
-    if vim.bo[bufnr][option] == '' then
-      return true
-    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 #scriptinfo ~= 1 then
-      return false
-    end
-
-    return vim.startswith(scriptinfo[1].name, vim.fn.expand('$VIMRUNTIME'))
-  end
-
-  ---@private
-  local function set_defaults(client, bufnr)
-    local capabilities = client.server_capabilities
-    if capabilities.definitionProvider and is_empty_or_default(bufnr, 'tagfunc') then
-      vim.bo[bufnr].tagfunc = 'v:lua.vim.lsp.tagfunc'
-    end
-    if capabilities.completionProvider and is_empty_or_default(bufnr, 'omnifunc') then
-      vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc'
-    end
-    if
-      capabilities.documentRangeFormattingProvider
-      and is_empty_or_default(bufnr, 'formatprg')
-      and is_empty_or_default(bufnr, 'formatexpr')
-    then
-      vim.bo[bufnr].formatexpr = 'v:lua.vim.lsp.formatexpr()'
-    end
-  end
-
   ---@private
   --- Reset defaults set by `set_defaults`.
   --- Must only be called if the last client attached to a buffer exits.
@@ -1228,7 +1233,9 @@ function lsp.start_client(config)
     requests = {},
     -- for $/progress report
     messages = { name = name, messages = {}, progress = {}, status = {} },
+    dynamic_capabilities = require('vim.lsp._dynamic').new(client_id),
   }
+  client.config.capabilities = config.capabilities or protocol.make_client_capabilities()
 
   -- Store the uninitialized_clients for cleanup in case we exit before initialize finishes.
   uninitialized_clients[client_id] = client
@@ -1291,7 +1298,7 @@ function lsp.start_client(config)
       -- User provided initialization options.
       initializationOptions = config.init_options,
       -- The capabilities provided by the client (editor or tool)
-      capabilities = config.capabilities or protocol.make_client_capabilities(),
+      capabilities = config.capabilities,
       -- The initial trace setting. If omitted trace is disabled ("off").
       -- trace = "off" | "messages" | "verbose";
       trace = valid_traces[config.trace] or 'off',
@@ -1300,6 +1307,26 @@ function lsp.start_client(config)
       -- TODO(ashkan) handle errors here.
       pcall(config.before_init, initialize_params, config)
     end
+
+    --- @param method string
+    --- @param opts? {bufnr?: number}
+    client.supports_method = function(method, opts)
+      opts = opts or {}
+      local required_capability = lsp._request_name_to_capability[method]
+      -- if we don't know about the method, assume that the client supports it.
+      if not required_capability then
+        return true
+      end
+      if vim.tbl_get(client.server_capabilities or {}, unpack(required_capability)) then
+        return true
+      else
+        if client.dynamic_capabilities:supports_registration(method) then
+          return client.dynamic_capabilities:supports(method, opts)
+        end
+        return false
+      end
+    end
+
     local _ = log.trace() and log.trace(log_prefix, 'initialize_params', initialize_params)
     rpc.request('initialize', initialize_params, function(init_err, result)
       assert(not init_err, tostring(init_err))
@@ -1314,18 +1341,6 @@ function lsp.start_client(config)
       client.server_capabilities =
         assert(result.capabilities, "initialize result doesn't contain capabilities")
       client.server_capabilities = protocol.resolve_capabilities(client.server_capabilities)
-      client.supports_method = function(method)
-        local required_capability = lsp._request_name_to_capability[method]
-        -- if we don't know about the method, assume that the client supports it.
-        if not required_capability then
-          return true
-        end
-        if vim.tbl_get(client.server_capabilities, unpack(required_capability)) then
-          return true
-        else
-          return false
-        end
-      end
 
       if next(config.settings) then
         client.notify('workspace/didChangeConfiguration', { settings = config.settings })
@@ -1522,7 +1537,7 @@ function lsp.start_client(config)
   function client._on_attach(bufnr)
     text_document_did_open_handler(bufnr, client)
 
-    set_defaults(client, bufnr)
+    lsp._set_defaults(client, bufnr)
 
     nvim_exec_autocmds('LspAttach', {
       buffer = bufnr,
@@ -1946,7 +1961,7 @@ function lsp.buf_request(bufnr, method, params, handler)
   local supported_clients = {}
   local method_supported = false
   for_each_buffer_client(bufnr, function(client, client_id)
-    if client.supports_method(method) then
+    if client.supports_method(method, { bufnr = bufnr }) then
       method_supported = true
       table.insert(supported_clients, client_id)
     end
@@ -2002,7 +2017,7 @@ function lsp.buf_request_all(bufnr, method, params, callback)
 
   local set_expected_result_count = once(function()
     for_each_buffer_client(bufnr, function(client)
-      if client.supports_method(method) then
+      if client.supports_method(method, { bufnr = bufnr }) then
         expected_result_count = expected_result_count + 1
       end
     end)
diff --git a/runtime/lua/vim/lsp/_dynamic.lua b/runtime/lua/vim/lsp/_dynamic.lua
new file mode 100644
index 0000000000..04040e8e28
--- /dev/null
+++ b/runtime/lua/vim/lsp/_dynamic.lua
@@ -0,0 +1,109 @@
+local wf = require('vim.lsp._watchfiles')
+
+--- @class lsp.DynamicCapabilities
+--- @field capabilities table<string, lsp.Registration[]>
+--- @field client_id number
+local M = {}
+
+--- @param client_id number
+function M.new(client_id)
+  return setmetatable({
+    capabilities = {},
+    client_id = client_id,
+  }, { __index = M })
+end
+
+function M:supports_registration(method)
+  local client = vim.lsp.get_client_by_id(self.client_id)
+  if not client then
+    return false
+  end
+  local capability = vim.tbl_get(client.config.capabilities, unpack(vim.split(method, '/')))
+  return type(capability) == 'table' and capability.dynamicRegistration
+end
+
+--- @param registrations lsp.Registration[]
+--- @private
+function M:register(registrations)
+  -- remove duplicates
+  self:unregister(registrations)
+  for _, reg in ipairs(registrations) do
+    local method = reg.method
+    if not self.capabilities[method] then
+      self.capabilities[method] = {}
+    end
+    table.insert(self.capabilities[method], reg)
+  end
+end
+
+--- @param unregisterations lsp.Unregistration[]
+--- @private
+function M:unregister(unregisterations)
+  for _, unreg in ipairs(unregisterations) do
+    local method = unreg.method
+    if not self.capabilities[method] then
+      return
+    end
+    local id = unreg.id
+    for i, reg in ipairs(self.capabilities[method]) do
+      if reg.id == id then
+        table.remove(self.capabilities[method], i)
+        break
+      end
+    end
+  end
+end
+
+--- @param method string
+--- @param opts? {bufnr?: number}
+--- @return lsp.Registration? (table|nil) the registration if found
+--- @private
+function M:get(method, opts)
+  opts = opts or {}
+  opts.bufnr = opts.bufnr or vim.api.nvim_get_current_buf()
+  for _, reg in ipairs(self.capabilities[method] or {}) do
+    if not reg.registerOptions then
+      return reg
+    end
+    local documentSelector = reg.registerOptions.documentSelector
+    if not documentSelector then
+      return reg
+    end
+    if M.match(opts.bufnr, documentSelector) then
+      return reg
+    end
+  end
+end
+
+--- @param method string
+--- @param opts? {bufnr?: number}
+--- @private
+function M:supports(method, opts)
+  return self:get(method, opts) ~= nil
+end
+
+--- @param bufnr number
+--- @param documentSelector lsp.DocumentSelector
+--- @private
+function M.match(bufnr, documentSelector)
+  local ft = vim.bo[bufnr].filetype
+  local uri = vim.uri_from_bufnr(bufnr)
+  local fname = vim.uri_to_fname(uri)
+  for _, filter in ipairs(documentSelector) do
+    local matches = true
+    if filter.language and ft ~= filter.language then
+      matches = false
+    end
+    if matches and filter.scheme and not vim.startswith(uri, filter.scheme .. ':') then
+      matches = false
+    end
+    if matches and filter.pattern and not wf._match(filter.pattern, fname) then
+      matches = false
+    end
+    if matches then
+      return true
+    end
+  end
+end
+
+return M
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index a307dea673..b2f202c4ba 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -683,11 +683,7 @@ local function on_code_action_results(results, ctx, options)
     --
     local client = vim.lsp.get_client_by_id(action_tuple[1])
     local action = action_tuple[2]
-    if
-      not action.edit
-      and client
-      and vim.tbl_get(client.server_capabilities, 'codeActionProvider', 'resolveProvider')
-    then
+    if not action.edit and client and client.supports_method('codeAction/resolve') then
       client.request('codeAction/resolve', action, function(err, resolved_action)
         if err then
           vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 8e926c4644..5346160871 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -118,22 +118,30 @@ end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_registerCapability
 M['client/registerCapability'] = function(_, result, ctx)
-  local log_unsupported = false
+  local client_id = ctx.client_id
+  ---@type lsp.Client
+  local client = vim.lsp.get_client_by_id(client_id)
+
+  client.dynamic_capabilities:register(result.registrations)
+  for bufnr, _ in ipairs(client.attached_buffers) do
+    vim.lsp._set_defaults(client, bufnr)
+  end
+
+  ---@type string[]
+  local unsupported = {}
   for _, reg in ipairs(result.registrations) do
     if reg.method == 'workspace/didChangeWatchedFiles' then
       require('vim.lsp._watchfiles').register(reg, ctx)
-    else
-      log_unsupported = true
+    elseif not client.dynamic_capabilities:supports_registration(reg.method) then
+      unsupported[#unsupported + 1] = reg.method
     end
   end
-  if log_unsupported then
-    local client_id = ctx.client_id
+  if #unsupported > 0 then
     local warning_tpl = 'The language server %s triggers a registerCapability '
-      .. 'handler despite dynamicRegistration set to false. '
+      .. 'handler for %s despite dynamicRegistration set to false. '
       .. 'Report upstream, this warning is harmless'
-    local client = vim.lsp.get_client_by_id(client_id)
     local client_name = client and client.name or string.format('id=%d', client_id)
-    local warning = string.format(warning_tpl, client_name)
+    local warning = string.format(warning_tpl, client_name, table.concat(unsupported, ', '))
     log.warn(warning)
   end
   return vim.NIL
@@ -141,6 +149,10 @@ end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_unregisterCapability
 M['client/unregisterCapability'] = function(_, result, ctx)
+  local client_id = ctx.client_id
+  local client = vim.lsp.get_client_by_id(client_id)
+  client.dynamic_capabilities:unregister(result.unregisterations)
+
   for _, unreg in ipairs(result.unregisterations) do
     if unreg.method == 'workspace/didChangeWatchedFiles' then
       require('vim.lsp._watchfiles').unregister(unreg, ctx)
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index a7919f12f5..a28ff407b7 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -697,7 +697,7 @@ function protocol.make_client_capabilities()
         didSave = true,
       },
       codeAction = {
-        dynamicRegistration = false,
+        dynamicRegistration = true,
 
         codeActionLiteralSupport = {
           codeActionKind = {
@@ -714,6 +714,12 @@ function protocol.make_client_capabilities()
           properties = { 'edit' },
         },
       },
+      formatting = {
+        dynamicRegistration = true,
+      },
+      rangeFormatting = {
+        dynamicRegistration = true,
+      },
       completion = {
         dynamicRegistration = false,
         completionItem = {
@@ -747,6 +753,7 @@ function protocol.make_client_capabilities()
       },
       definition = {
         linkSupport = true,
+        dynamicRegistration = true,
       },
       implementation = {
         linkSupport = true,
@@ -755,7 +762,7 @@ function protocol.make_client_capabilities()
         linkSupport = true,
       },
       hover = {
-        dynamicRegistration = false,
+        dynamicRegistration = true,
         contentFormat = { protocol.MarkupKind.Markdown, protocol.MarkupKind.PlainText },
       },
       signatureHelp = {
@@ -790,7 +797,7 @@ function protocol.make_client_capabilities()
         hierarchicalDocumentSymbolSupport = true,
       },
       rename = {
-        dynamicRegistration = false,
+        dynamicRegistration = true,
         prepareSupport = true,
       },
       publishDiagnostics = {
diff --git a/runtime/lua/vim/lsp/types.lua b/runtime/lua/vim/lsp/types.lua
index 779f313aa7..e77e1fb63a 100644
--- a/runtime/lua/vim/lsp/types.lua
+++ b/runtime/lua/vim/lsp/types.lua
@@ -35,3 +35,31 @@
 ---@field source string
 ---@field tags? lsp.DiagnosticTag[]
 ---@field relatedInformation DiagnosticRelatedInformation[]
+
+--- @class lsp.DocumentFilter
+--- @field language? string
+--- @field scheme? string
+--- @field pattern? string
+
+--- @alias lsp.DocumentSelector lsp.DocumentFilter[]
+
+--- @alias lsp.RegisterOptions any | lsp.StaticRegistrationOptions | lsp.TextDocumentRegistrationOptions
+
+--- @class lsp.Registration
+--- @field id string
+--- @field method string
+--- @field registerOptions? lsp.RegisterOptions
+
+--- @alias lsp.RegistrationParams {registrations: lsp.Registration[]}
+
+--- @class lsp.StaticRegistrationOptions
+--- @field id? string
+
+--- @class lsp.TextDocumentRegistrationOptions
+--- @field documentSelector? lsp.DocumentSelector
+
+--- @class lsp.Unregistration
+--- @field id string
+--- @field method string
+
+--- @alias lsp.UnregistrationParams {unregisterations: lsp.Unregistration[]}
-- 
cgit 


From 8e17054a2333318340f23abd7a94abfe474fb52f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 28 May 2023 11:47:07 +0200
Subject: vim-patch:9.0.1584: not all meson files are recognized (#23797)

Problem:    Not all meson files are recognized.
Solution:   Add "meson.options". (Liam Beguin, closes vim/vim#12444)

https://github.com/vim/vim/commit/1ba0b9e36f36926a7675b31efeda7d3e495c9157

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 1b04666161..57df621153 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1547,6 +1547,7 @@ local filename = {
   ['man.config'] = 'manconf',
   ['maxima-init.mac'] = 'maxima',
   ['meson.build'] = 'meson',
+  ['meson.options'] = 'meson',
   ['meson_options.txt'] = 'meson',
   ['/etc/conf.modules'] = 'modconf',
   ['/etc/modules'] = 'modconf',
-- 
cgit 


From 03a2c5b77200845c30f62250f26e83ff7fbc24b3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 28 May 2023 15:13:44 +0200
Subject: fix(ftplugin): source Lua files after Vimscript files per directory
 (#23801)

Problem: Lua ftplugins in runtime take precedence over Vimscript
ftplugins in user configs (even in `after/`).
Solution: Source ftplugins separately per directory, first Vimscript
then Lua.
---
 runtime/ftplugin.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim
index feef949dba..d24c0a036e 100644
--- a/runtime/ftplugin.vim
+++ b/runtime/ftplugin.vim
@@ -28,9 +28,11 @@ augroup filetypeplugin
       " When there is a dot it is used to separate filetype names.  Thus for
       " "aaa.bbb" load "aaa" and then "bbb".
       for name in split(s, '\.')
-        exe 'runtime! ftplugin/' . name . '.vim ftplugin/' . name . '_*.vim ftplugin/' . name . '/*.vim'
-        " Load lua ftplugins
-        exe printf('runtime! ftplugin/%s.lua ftplugin/%s_*.lua ftplugin/%s/*.lua', name, name, name)
+        " Load Lua ftplugins after Vim ftplugins _per directory_
+        " TODO(clason): use nvim__get_runtime when supports globs and modeline
+        exe printf('runtime! ftplugin/%s.vim ftplugin/%s.lua', name, name)
+        exe printf('runtime! ftplugin/%s_*.vim ftplugin/%s_*.lua', name, name)
+        exe printf('runtime! ftplugin/%s/*.vim ftplugin/%s/*.lua', name, name)
       endfor
     endif
   endfunc
-- 
cgit 


From b8a2220f5eb32ead6b66f7c49b7e915883bf3539 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 29 May 2023 10:25:05 +0200
Subject: vim-patch:9.0.1587: Corn config files are not recognized (#23807)

Problem:    Corn config files are not recognized.
Solution:   Add a pattern for Corn config files. (Jake Stanger, closes vim/vim#12449)

https://github.com/vim/vim/commit/05843e89601c03389a2d7978e7e16aec641a3dc4

Co-authored-by: Jake Stanger <mail@jstanger.dev>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 57df621153..6990de3391 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -241,6 +241,7 @@ local extension = {
   copyright = function(path, bufnr)
     return require('vim.filetype.detect').copyright(bufnr)
   end,
+  corn = 'corn',
   csh = function(path, bufnr)
     return require('vim.filetype.detect').csh(path, bufnr)
   end,
-- 
cgit 


From e8776074f50593df90402a3642236990edfba6f0 Mon Sep 17 00:00:00 2001
From: Omar El Halabi <omar_halabi25@hotmail.com>
Date: Tue, 30 May 2023 00:44:23 +0200
Subject: vim-patch:9.0.1591: some "gomod" files are not recognized (#23820)

Problem:    Some "gomod" files are not recognized.
Solution:   Check for "go.mod" file name before checking out the contents.
            (Omar El Halabi, closes vim/vim#12462)

https://github.com/vim/vim/commit/c9fbd2560f24180d2efa40028ed68427341d2d99
---
 runtime/lua/vim/filetype/detect.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 94106a3547..70e590ed10 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -771,14 +771,14 @@ end
 function M.mod(path, bufnr)
   if vim.g.filetype_mod then
     return vim.g.filetype_mod
+  elseif matchregex(path, [[\c\<go\.mod$]]) then
+    return 'gomod'
   elseif is_lprolog(bufnr) then
     return 'lprolog'
   elseif matchregex(nextnonblank(bufnr, 1), [[\%(\<MODULE\s\+\w\+\s*;\|^\s*(\*\)]]) then
     return 'modula2'
   elseif is_rapid(bufnr) then
     return 'rapid'
-  elseif matchregex(path, [[\c\<go\.mod$]]) then
-    return 'gomod'
   else
     -- Nothing recognized, assume modsim3
     return 'modsim3'
-- 
cgit 


From dd3fa645735539c75b72dc1b0114278b5fa57f7f Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 30 May 2023 19:15:07 +0200
Subject: fix(lsp): fix dynamic registration of code actions (#23826)

---
 runtime/lua/vim/lsp/buf.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index b2f202c4ba..bb3ca0e6d6 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -681,9 +681,16 @@ local function on_code_action_results(results, ctx, options)
     --  command: string
     --  arguments?: any[]
     --
+    ---@type lsp.Client
     local client = vim.lsp.get_client_by_id(action_tuple[1])
     local action = action_tuple[2]
-    if not action.edit and client and client.supports_method('codeAction/resolve') then
+
+    local reg = client.dynamic_capabilities:get('textDocument/codeAction', { bufnr = ctx.bufnr })
+
+    local supports_resolve = vim.tbl_get(reg or {}, 'registerOptions', 'resolveProvider')
+      or client.supports_method('codeAction/resolve')
+
+    if not action.edit and client and supports_resolve then
       client.request('codeAction/resolve', action, function(err, resolved_action)
         if err then
           vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
-- 
cgit 


From 58618d208acd3827c4e86668529edb619bb9b8dd Mon Sep 17 00:00:00 2001
From: jdrouhard <john@drouhard.dev>
Date: Tue, 30 May 2023 13:56:29 -0500
Subject: feat(lsp)!: promote LspRequest to a full autocmd and enrich with
 additional data (#23694)

BREAKING CHANGE: LspRequest is no longer a User autocmd but is now a
first class citizen.

LspRequest as a User autocmd had limited functionality. Namely, the only
thing you could do was use the notification to do a lookup on all the
clients' requests tables to figure out what changed.

Promoting the autocmd to a full autocmd lets us set the buffer the
request was initiated on (so people can set buffer-local autocmds for
listening to these events).

Additionally, when used from Lua, we can pass additional metadata about
the request along with the notification, including the client ID, the
request ID, and the actual request object stored on the client's
requests table. Users can now listen for these events and act on them
proactively instead of polling all of the requests tables and looking
for changes.
---
 runtime/doc/lsp.txt     | 51 ++++++++++++++++++++++++++++++++++++++++++-------
 runtime/doc/news.txt    |  6 ++++++
 runtime/lua/vim/lsp.lua | 27 +++++++++++++++++++++-----
 3 files changed, 72 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 98a0801013..581cfd5348 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -619,19 +619,54 @@ to the callback in the "data" table. The token fields are documented in
 Note: doing anything other than calling
 |vim.lsp.semantic_tokens.highlight_token()| is considered experimental.
 
-Also the following |User| |autocommand|s are provided:
+
+LspRequest                                                        *LspRequest*
+
+For each request sent to an LSP server, this event is triggered for every
+change to the request's status. The status can be one of `pending`,
+`complete`, or `cancel` and is sent as the {type} on the "data" table passed
+to the callback function.
+
+It triggers when the initial request is sent ({type} == `pending`) and when
+the LSP server responds ({type} == `complete`). If a cancelation is requested
+using `client.cancel_request(request_id)`, then this event will trigger with
+{type} == `cancel`.
+
+When used from Lua, the client ID, request ID, and request are sent in the
+"data" table. See {requests} in |vim.lsp.client| for details on the {request}
+value. If the request type is `complete`, the request will be deleted from the
+client's pending requests table immediately after calling the event's
+callbacks. Example: >lua
+
+    vim.api.nvim_create_autocmd('LspRequest', {
+      callback = function(args)
+        local bufnr = args.buf
+        local client_id = args.data.client_id
+        local request_id = args.data.request_id
+        local request = args.data.request
+        if request.type == 'pending' then
+          -- do something with pending requests
+          track_pending(client_id, bufnr, request_id, request)
+        elseif request.type == 'cancel' then
+          -- do something with pending cancel requests
+          track_canceling(client_id, bufnr, request_id, request)
+        elseif request.type == 'complete' then
+          -- do something with finished requests. this pending
+          -- request entry is about to be removed since it is complete
+          track_finish(client_id, bufnr, request_id, request)
+        end
+      end,
+    })
+<
+
+Also the following |User| |autocommand| is provided:
 
 LspProgressUpdate                                          *LspProgressUpdate*
     Upon receipt of a progress notification from the server. See
     |vim.lsp.util.get_progress_messages()|.
 
-LspRequest                                                        *LspRequest*
-    After a change to the active set of pending LSP requests. See {requests}
-    in |vim.lsp.client|.
-
 Example: >vim
     autocmd User LspProgressUpdate redrawstatus
-    autocmd User LspRequest redrawstatus
 <
 
 ==============================================================================
@@ -764,7 +799,9 @@ client()                                                      *vim.lsp.client*
         server. Entries are key-value pairs with the key being the request ID
         while the value is a table with `type`, `bufnr`, and `method`
         key-value pairs. `type` is either "pending" for an active request, or
-        "cancel" for a cancel request.
+        "cancel" for a cancel request. It will be "complete" ephemerally while
+        executing |LspRequest| autocmds when replies are received from the
+        server.
       • {config} (table): copy of the table that was passed by the user to
         |vim.lsp.start_client()|.
       • {server_capabilities} (table): Response from the server sent on
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b6839ec692..72eb182fa5 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -31,6 +31,9 @@ The following changes may require adaptations in user config or plugins.
     set keymodel=startsel,stopsel
 <
 
+• |LspRequest| autocmd was promoted from a |User| autocmd to a first class
+  citizen.
+
 ==============================================================================
 ADDED FEATURES                                                     *news-added*
 
@@ -80,6 +83,9 @@ The following changes to existing APIs or features add new behavior.
 • The `workspace/didChangeWatchedFiles` LSP client capability is now enabled
   by default.
 
+• |LspRequest| autocmd callbacks now contain additional information about the LSP
+  request status update that occurred.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 5337abea25..c9ca8cd224 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -799,7 +799,9 @@ end
 ---    to the server. Entries are key-value pairs with the key
 ---    being the request ID while the value is a table with `type`,
 ---    `bufnr`, and `method` key-value pairs. `type` is either "pending"
----    for an active request, or "cancel" for a cancel request.
+---    for an active request, or "cancel" for a cancel request. It will
+---    be "complete" ephemerally while executing |LspRequest| autocmds
+---    when replies are received from the server.
 ---
 ---  - {config} (table): copy of the table that was passed by the user
 ---    to |vim.lsp.start_client()|.
@@ -1408,13 +1410,24 @@ function lsp.start_client(config)
         { method = method, client_id = client_id, bufnr = bufnr, params = params }
       )
     end, function(request_id)
+      local request = client.requests[request_id]
+      request.type = 'complete'
+      nvim_exec_autocmds('LspRequest', {
+        buffer = bufnr,
+        modeline = false,
+        data = { client_id = client_id, request_id = request_id, request = request },
+      })
       client.requests[request_id] = nil
-      nvim_exec_autocmds('User', { pattern = 'LspRequest', modeline = false })
     end)
 
     if success and request_id then
-      client.requests[request_id] = { type = 'pending', bufnr = bufnr, method = method }
-      nvim_exec_autocmds('User', { pattern = 'LspRequest', modeline = false })
+      local request = { type = 'pending', bufnr = bufnr, method = method }
+      client.requests[request_id] = request
+      nvim_exec_autocmds('LspRequest', {
+        buffer = bufnr,
+        modeline = false,
+        data = { client_id = client_id, request_id = request_id, request = request },
+      })
     end
 
     return success, request_id
@@ -1486,7 +1499,11 @@ function lsp.start_client(config)
     local request = client.requests[id]
     if request and request.type == 'pending' then
       request.type = 'cancel'
-      nvim_exec_autocmds('User', { pattern = 'LspRequest', modeline = false })
+      nvim_exec_autocmds('LspRequest', {
+        buffer = request.bufnr,
+        modeline = false,
+        data = { client_id = client_id, request_id = id, request = request },
+      })
     end
     return rpc.notify('$/cancelRequest', { id = id })
   end
-- 
cgit 


From be5e3611541051d9fa5b752a4fe1da6ab78b141e Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Thu, 1 Jun 2023 14:38:38 +0800
Subject: fix(lsp): add param assert in client_is_stopped (#23857)

---
 runtime/lua/vim/lsp.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index c9ca8cd224..d64ed0b5a3 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -2275,7 +2275,8 @@ end
 ---@param client_id (integer)
 ---@return boolean stopped true if client is stopped, false otherwise.
 function lsp.client_is_stopped(client_id)
-  return active_clients[client_id] == nil
+  assert(client_id, 'missing client_id param')
+  return active_clients[client_id] == nil and not uninitialized_clients[client_id]
 end
 
 --- Gets a map of client_id:client pairs for the given buffer, where each value
-- 
cgit 


From fb54e6980ea6fec218a11f118e97ef65f250395a Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 1 Jun 2023 11:15:33 -0500
Subject: feat(lsp): set client offset_encoding if server supports
 positionEncoding

If the server sends the positionEncoding capability in its
initialization response, automatically set the client's offset_encoding
to use the value provided.
---
 runtime/lua/vim/lsp.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index d64ed0b5a3..baf8b5c1a8 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1344,6 +1344,10 @@ function lsp.start_client(config)
         assert(result.capabilities, "initialize result doesn't contain capabilities")
       client.server_capabilities = protocol.resolve_capabilities(client.server_capabilities)
 
+      if client.server_capabilities.positionEncoding then
+        client.offset_encoding = client.server_capabilities.positionEncoding
+      end
+
       if next(config.settings) then
         client.notify('workspace/didChangeConfiguration', { settings = config.settings })
       end
-- 
cgit 


From 15641f38cf4b489a7c83e2c3aa6efc4c63009f00 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 1 Jun 2023 11:39:51 -0500
Subject: feat(lsp): include positionEncodings in default client capabilities

---
 runtime/doc/news.txt             | 6 ++++++
 runtime/lua/vim/lsp/protocol.lua | 7 +++++++
 2 files changed, 13 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 72eb182fa5..3fd2d4d40e 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -39,6 +39,12 @@ ADDED FEATURES                                                     *news-added*
 
 The following new APIs or features were added.
 
+• Nvim's LSP client now advertises the general.positionEncodings client
+  capability to indicate to servers that it supports utf-8, utf-16, and utf-32
+  encodings. If the server responds with the positionEncoding capability in
+  its initialization response, Nvim automatically sets the client's
+  `offset_encoding` field.
+
 • Dynamic registration of LSP capabilities. An implication of this change is that checking a client's `server_capabilities` is no longer a sufficient indicator to see if a server supports a feature. Instead use `client.supports_method(<method>)`. It considers both the dynamic capabilities and static `server_capabilities`.
 • |vim.iter()| provides a generic iterator interface for tables and Lua
   iterators |luaref-in|.
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index a28ff407b7..7e49a572e7 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -634,6 +634,13 @@ export interface WorkspaceClientCapabilities {
 --- capabilities.
 function protocol.make_client_capabilities()
   return {
+    general = {
+      positionEncodings = {
+        'utf-8',
+        'utf-16',
+        'utf-32',
+      },
+    },
     textDocument = {
       semanticTokens = {
         dynamicRegistration = false,
-- 
cgit 


From 843c1bed95d35f7c6081857fc8ce237f3823d6a1 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 2 Jun 2023 17:23:45 +0800
Subject: fix(health): stop job properly on timeout (#23877)

---
 runtime/lua/provider/health.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index 3a60e38fe5..e0bfe57cb6 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -109,13 +109,13 @@ local function system(cmd, ...)
   end
 
   if not is_blank(stdin) then
-    vim.cmd([[call jobsend(jobid, stdin)]])
+    vim.api.nvim_chan_send(jobid, stdin)
   end
 
   local res = vim.fn.jobwait({ jobid }, 30000)
   if res[1] == -1 then
     error('Command timed out: ' .. shellify(cmd))
-    vim.cmd([[call jobstop(jobid)]])
+    vim.fn.jobstop(jobid)
   elseif shell_error() and not ignore_error then
     local emsg = 'Command error (job='
       .. jobid
-- 
cgit 


From 4b60267f82ef1947f8a583c02eaf502cf1db69ca Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 2 Jun 2023 21:00:55 +0800
Subject: feat(:source): source current ft=lua buffer as Lua code (#23802)

---
 runtime/doc/news.txt   | 3 +++
 runtime/doc/repeat.txt | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 3fd2d4d40e..31f3ff2cd1 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -92,6 +92,9 @@ The following changes to existing APIs or features add new behavior.
 • |LspRequest| autocmd callbacks now contain additional information about the LSP
   request status update that occurred.
 
+• `:source` without arguments treats a buffer with its 'filetype' set to "lua"
+  as Lua code regardless of its extension.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index b6cb126c3b..071b062957 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -183,7 +183,10 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 
 					*:so* *:source* *load-vim-script*
 :[range]so[urce] [file]	Runs |Ex| commands or Lua code (".lua" files) from
-			[file], or current buffer if no [file].
+			[file].
+			If no [file], the current buffer is used, and it is
+			treated as Lua code if its 'filetype' is "lua" or its
+			file name ends with ".lua".
 			Triggers the |SourcePre| autocommand.
 							*:source!*
 :[range]so[urce]! {file}
-- 
cgit 


From aa130d0c7ea69a05330d0b054b414cc3a15dac45 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Fri, 2 Jun 2023 16:59:58 +0200
Subject: docs: small fixes (#23619)

Co-authored-by: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Co-authored-by: Gustavo Ferreira <gustavo.ferreira@imaginecurve.com>
Co-authored-by: Kai Moschcau <mail@kmoschcau.de>
Co-authored-by: Lampros <hauahx@gmail.com>
---
 runtime/doc/api.txt       | 2 +-
 runtime/doc/lua-guide.txt | 8 ++++----
 runtime/doc/lua.txt       | 2 +-
 runtime/doc/luaref.txt    | 6 +++---
 runtime/doc/news.txt      | 7 ++++++-
 runtime/doc/provider.txt  | 2 +-
 runtime/lua/vim/iter.lua  | 2 +-
 7 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index ed8858820e..83422c9501 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3242,7 +3242,7 @@ nvim_create_autocmd({event}, {*opts})                  *nvim_create_autocmd()*
         vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
           pattern = {"*.c", "*.h"},
           callback = function(ev)
-            print(string.format('event fired: s', vim.inspect(ev)))
+            print(string.format('event fired: %s', vim.inspect(ev)))
           end
         })
 <
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 94db6aac0a..22f51ce8c7 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -114,10 +114,10 @@ Let's assume you have the following directory structure:
     |-- after/
     |-- ftplugin/
     |-- lua/
-    |  |-- myluamodule.lua
-    |  |-- other_modules/
-    |     |-- anothermodule.lua
-    |     |-- init.lua
+    |   |-- myluamodule.lua
+    |   |-- other_modules/
+    |       |-- anothermodule.lua
+    |       |-- init.lua
     |-- plugin/
     |-- syntax/
     |-- init.vim
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ad9cb69ae0..da423ac213 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3035,7 +3035,7 @@ Iter:find({self}, {f})                                           *Iter:find()*
 Iter:fold({self}, {init}, {f})                                   *Iter:fold()*
     Fold an iterator or table into a single value.
 
-    Examples: >
+    Examples: >lua
 
      -- Create a new table with only even values
      local t = { a = 1, b = 2, c = 3, d = 4 }
diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index aafdd5c43e..a01196e538 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -4101,16 +4101,16 @@ string.gsub({s}, {pattern}, {repl} [, {n}])                    *string.gsub()*
            x = string.gsub("hello world from Lua", "(%w+)%s*(%w+)", "%2 %1")
            --> x="world hello Lua from"
 
-           x = string.gsub("home =  `HOME, user = ` USER", "%$(%w+)", os.getenv)
+           x = string.gsub("home = $HOME, user = $USER", "%$(%w+)", os.getenv)
            --> x="home = /home/roberto, user = roberto"
 
-           x = string.gsub("4+5 =  `return 4+5` ", "% `(.-)%` ", function (s)
+           x = string.gsub("4+5 = $return 4+5$", "%$(.-)%$", function (s)
                  return loadstring(s)()
                end)
            --> x="4+5 = 9"
 
            local t = {name="lua", version="5.1"}
-           x = string.gsub(" `name%-` version.tar.gz", "%$(%w+)", t)
+           x = string.gsub("$name%-$version.tar.gz", "%$(%w+)", t)
            --> x="lua-5.1.tar.gz"
 <
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 31f3ff2cd1..4c864312f5 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -45,7 +45,12 @@ The following new APIs or features were added.
   its initialization response, Nvim automatically sets the client's
   `offset_encoding` field.
 
-• Dynamic registration of LSP capabilities. An implication of this change is that checking a client's `server_capabilities` is no longer a sufficient indicator to see if a server supports a feature. Instead use `client.supports_method(<method>)`. It considers both the dynamic capabilities and static `server_capabilities`.
+• Dynamic registration of LSP capabilities. An implication of this change is
+  that checking a client's `server_capabilities` is no longer a sufficient
+  indicator to see if a server supports a feature. Instead use
+  `client.supports_method(<method>)`. It considers both the dynamic
+  capabilities and static `server_capabilities`.
+
 • |vim.iter()| provides a generic iterator interface for tables and Lua
   iterators |luaref-in|.
 
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 117997cec2..a476a56877 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -189,8 +189,8 @@ registers. Nvim looks for these clipboard tools, in order of priority:
   - pbcopy, pbpaste (macOS)
   - wl-copy, wl-paste (if $WAYLAND_DISPLAY is set)
   - waycopy, waypaste (if $WAYLAND_DISPLAY is set)
-  - xclip (if $DISPLAY is set)
   - xsel (if $DISPLAY is set)
+  - xclip (if $DISPLAY is set)
   - lemonade (for SSH) https://github.com/pocke/lemonade
   - doitclient (for SSH) https://www.chiark.greenend.org.uk/~sgtatham/doit/
   - win32yank (Windows)
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index bda3508262..9112b6c3bb 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -335,7 +335,7 @@ end
 --- Fold an iterator or table into a single value.
 ---
 --- Examples:
---- <pre>
+--- <pre>lua
 --- -- Create a new table with only even values
 --- local t = { a = 1, b = 2, c = 3, d = 4 }
 --- local it = vim.iter(t)
-- 
cgit 


From c65e2203f70cd5d66fcb8ffb26f8cef38f50e04f Mon Sep 17 00:00:00 2001
From: Sebastian Lyng Johansen <seblyng98@gmail.com>
Date: Sat, 3 Jun 2023 09:18:05 +0200
Subject: docs(iter): add emmylua type to iter module (#23845)

---
 runtime/lua/vim/iter.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 9112b6c3bb..56012e9b9f 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -51,6 +51,8 @@
 --- In addition to the |vim.iter()| function, the |vim.iter| module provides
 --- convenience functions like |vim.iter.filter()| and |vim.iter.totable()|.
 
+---@class IterMod
+---@operator call:Iter
 local M = {}
 
 ---@class Iter
@@ -974,6 +976,7 @@ function M.map(f, src, ...)
   return Iter.new(src, ...):map(f):totable()
 end
 
+---@type IterMod
 return setmetatable(M, {
   __call = function(_, ...)
     return Iter.new(...)
-- 
cgit 


From 2db719f6c2b677fcbc197b02fe52764a851523b2 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 3 Jun 2023 11:06:00 +0100
Subject: feat(lua): rename vim.loop -> vim.uv (#22846)

---
 runtime/doc/builtin.txt                     |  4 ++--
 runtime/doc/deprecated.txt                  |  1 +
 runtime/doc/help.txt                        |  2 +-
 runtime/doc/lua.txt                         | 35 +++++++++++++----------------
 runtime/doc/luvref.txt                      |  6 ++---
 runtime/doc/news.txt                        |  2 ++
 runtime/lua/_vim9script.lua                 |  2 +-
 runtime/lua/man.lua                         |  8 +++----
 runtime/lua/nvim/health.lua                 |  2 +-
 runtime/lua/provider/health.lua             |  6 ++---
 runtime/lua/vim/_editor.lua                 |  8 +++++--
 runtime/lua/vim/_watch.lua                  |  6 ++---
 runtime/lua/vim/filetype/options.lua        |  2 +-
 runtime/lua/vim/fs.lua                      | 20 ++++++++---------
 runtime/lua/vim/loader.lua                  |  4 ++--
 runtime/lua/vim/lsp.lua                     |  2 +-
 runtime/lua/vim/lsp/health.lua              |  2 +-
 runtime/lua/vim/lsp/log.lua                 |  4 ++--
 runtime/lua/vim/lsp/rpc.lua                 |  4 ++--
 runtime/lua/vim/lsp/semantic_tokens.lua     |  2 +-
 runtime/lua/vim/lsp/util.lua                |  2 +-
 runtime/lua/vim/secure.lua                  |  6 ++---
 runtime/lua/vim/treesitter/languagetree.lua |  4 ++--
 23 files changed, 68 insertions(+), 66 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 7acc764644..27d52b7ac6 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -3927,8 +3927,8 @@ has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
 		{feature} argument is a feature name like "nvim-0.2.1" or
 		"win32", see below.  See also |exists()|.
 
-		To get the system name use |vim.loop|.os_uname() in Lua: >
-			:lua print(vim.loop.os_uname().sysname)
+		To get the system name use |vim.uv|.os_uname() in Lua: >lua
+			print(vim.uv.os_uname().sysname)
 
 <		If the code has a syntax error then Vimscript may skip the
 		rest of the line.  Put |:if| and |:endif| on separate lines to
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 9d4a7324bf..6494c53059 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -144,6 +144,7 @@ TREESITTER FUNCTIONS
 LUA
 - vim.register_keystroke_callback()	Use |vim.on_key()| instead.
 - *vim.pretty_print()*			Use |vim.print()| instead.
+- *vim.loop*				Use |vim.uv| instead.
 
 NORMAL COMMANDS
 - *]f* *[f*		Same as "gf".
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index a1550d5c8b..aefaa0b7df 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -105,7 +105,7 @@ API (EXTENSIBILITY/SCRIPTING/PLUGINS)
 |lua-guide|		Nvim Lua guide
 |lua|			Lua API
 |luaref|		Lua reference manual
-|luvref|		Luv (|vim.loop|) reference manual
+|luvref|		Luv (|vim.uv|) reference manual
 |autocmd|		Event handlers
 |job-control|		Spawn and control multiple processes
 |channel|		Nvim asynchronous IO
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index da423ac213..54527c5a50 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -449,29 +449,24 @@ Note that underscore-prefixed functions (e.g. "_os_proc_children") are
 internal/private and must not be used by plugins.
 
 ------------------------------------------------------------------------------
-VIM.LOOP                                                   *lua-loop* *vim.loop*
+VIM.UV                                                   *lua-loop* *vim.uv*
 
-`vim.loop` exposes all features of the Nvim event-loop. This is a low-level
-API that provides functionality for networking, filesystem, and process
-management. Try this command to see available functions: >vim
-
-    :lua print(vim.inspect(vim.loop))
-<
-Internally, `vim.loop` wraps the "luv" Lua bindings for the LibUV library;
-see |luv-intro| for a full reference manual.
+`vim.uv` exposes the "luv" Lua bindings for the libUV library that Nvim uses
+for networking, filesystem, and process management, see |luvref.txt|.
+In particular, it allows interacting with the main Nvim |luv-event-loop|.
 
                                                     *E5560* *lua-loop-callbacks*
 It is an error to directly invoke `vim.api` functions (except |api-fast|) in
-`vim.loop` callbacks. For example, this is an error: >lua
+`vim.uv` callbacks. For example, this is an error: >lua
 
-    local timer = vim.loop.new_timer()
+    local timer = vim.uv.new_timer()
     timer:start(1000, 0, function()
       vim.api.nvim_command('echomsg "test"')
     end)
 <
 To avoid the error use |vim.schedule_wrap()| to defer the callback: >lua
 
-    local timer = vim.loop.new_timer()
+    local timer = vim.uv.new_timer()
     timer:start(1000, 0, vim.schedule_wrap(function()
       vim.api.nvim_command('echomsg "test"')
     end))
@@ -484,7 +479,7 @@ Example: repeating timer
     2. Execute it with ":luafile %". >lua
 
     -- Create a timer handle (implementation detail: uv_timer_t).
-    local timer = vim.loop.new_timer()
+    local timer = vim.uv.new_timer()
     local i = 0
     -- Waits 1000ms, then repeats every 750ms until timer:close().
     timer:start(1000, 750, function()
@@ -504,7 +499,7 @@ Example: File-change detection                                    *watch-file*
     5. Observe that the file reloads in Nvim (because on_change() calls
        |:checktime|). >lua
 
-    local w = vim.loop.new_fs_event()
+    local w = vim.uv.new_fs_event()
     local function on_change(err, fname, status)
       -- Do work...
       vim.api.nvim_command('checktime')
@@ -528,11 +523,11 @@ Example: TCP echo-server                                          *tcp-server*
     4. Connect from any TCP client (e.g. "nc 0.0.0.0 36795"): >lua
 
     local function create_server(host, port, on_connect)
-      local server = vim.loop.new_tcp()
+      local server = vim.uv.new_tcp()
       server:bind(host, port)
       server:listen(128, function(err)
         assert(not err, err)  -- Check for errors.
-        local sock = vim.loop.new_tcp()
+        local sock = vim.uv.new_tcp()
         server:accept(sock)  -- Accept client connection.
         on_connect(sock)  -- Start reading messages.
       end)
@@ -553,14 +548,14 @@ Example: TCP echo-server                                          *tcp-server*
 Multithreading                                            *lua-loop-threading*
 
 Plugins can perform work in separate (os-level) threads using the threading
-APIs in luv, for instance `vim.loop.new_thread`. Note that every thread
+APIs in luv, for instance `vim.uv.new_thread`. Note that every thread
 gets its own separate lua interpreter state, with no access to lua globals
 in the main thread. Neither can the state of the editor (buffers, windows,
 etc) be directly accessed from threads.
 
 A subset of the `vim.*` API is available in threads. This includes:
 
-- `vim.loop` with a separate event loop per thread.
+- `vim.uv` with a separate event loop per thread.
 - `vim.mpack` and `vim.json` (useful for serializing messages between threads)
 - `require` in threads can use lua packages from the global |package.path|
 - `print()` and `vim.inspect`
@@ -885,7 +880,7 @@ vim.defer_fn({fn}, {timeout})                                   *vim.defer_fn*
       • {timeout}   Time in ms to wait before calling {fn}
 
     Returns: ~
-        |vim.loop|.new_timer() object
+        |vim.uv|.new_timer() object
 
 vim.wait({time} [, {callback}, {interval}, {fast_only}])          *vim.wait()*
     Wait for {time} in milliseconds until {callback} returns `true`.
@@ -2531,7 +2526,7 @@ find({names}, {opts})                                          *vim.fs.find()*
      -- location of Cargo.toml from the current buffer's path
      local cargo = vim.fs.find('Cargo.toml', {
        upward = true,
-       stop = vim.loop.os_homedir(),
+       stop = vim.uv.os_homedir(),
        path = vim.fs.dirname(vim.api.nvim_buf_get_name(0)),
      })
 
diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 79dd1248aa..131e7889e4 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -5,8 +5,8 @@
 
 								      *luvref*
 This file documents the Lua bindings for the LibUV library which is used for
-Nvim's event-loop and is accessible from Lua via |vim.loop| (e.g., |uv.version()|
-is exposed as `vim.loop.version()`).
+Nvim's event-loop and is accessible from Lua via |vim.uv| (e.g., |uv.version()|
+is exposed as `vim.uv.version()`).
 
 For information about this manual, see |luv-credits|.
 
@@ -29,7 +29,7 @@ TCP Echo Server Example ~
 Here is a small example showing a TCP echo server:
 
     >lua
-    local uv = vim.loop
+    local uv = vim.uv
 
     local server = uv.new_tcp()
     server:bind("127.0.0.1", 1337)
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 4c864312f5..d51227f0c0 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -129,4 +129,6 @@ release.
   - |nvim_win_get_option()|	Use |nvim_get_option_value()| instead.
   - |nvim_win_set_option()|	Use |nvim_set_option_value()| instead.
 
+• `vim.loop` has been renamed to `vim.uv`.
+
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/lua/_vim9script.lua b/runtime/lua/_vim9script.lua
index b983878637..ca0e913d51 100644
--- a/runtime/lua/_vim9script.lua
+++ b/runtime/lua/_vim9script.lua
@@ -513,7 +513,7 @@ vim9['import'] = (function()
 
   imported.absolute = setmetatable({}, {
     __index = function(self, name)
-      if vim.loop.fs_stat(name) then
+      if vim.uv.fs_stat(name) then
         local result = loadfile(name)()
         rawset(self, name, result)
 
diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index ac493bdc7f..09265b1999 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -21,13 +21,13 @@ end
 local function system(cmd_, silent, env)
   local stdout_data = {} ---@type string[]
   local stderr_data = {} ---@type string[]
-  local stdout = assert(vim.loop.new_pipe(false))
-  local stderr = assert(vim.loop.new_pipe(false))
+  local stdout = assert(vim.uv.new_pipe(false))
+  local stderr = assert(vim.uv.new_pipe(false))
 
   local done = false
   local exit_code ---@type integer?
 
-  -- We use the `env` command here rather than the env option to vim.loop.spawn since spawn will
+  -- We use the `env` command here rather than the env option to vim.uv.spawn since spawn will
   -- completely overwrite the environment when we just want to modify the existing one.
   --
   -- Overwriting mainly causes problems NixOS which relies heavily on a non-standard environment.
@@ -39,7 +39,7 @@ local function system(cmd_, silent, env)
   end
 
   local handle
-  handle = vim.loop.spawn(cmd[1], {
+  handle = vim.uv.spawn(cmd[1], {
     args = vim.list_slice(cmd, 2),
     stdio = { nil, stdout, stderr },
   }, function(code)
diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
index 19303d34f9..7ccb082a40 100644
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -30,7 +30,7 @@ local function check_runtime()
   local bad_files_msg = ''
   for k, _ in pairs(bad_files) do
     local path = ('%s/%s'):format(vim.env.VIMRUNTIME, k)
-    if vim.loop.fs_stat(path) then
+    if vim.uv.fs_stat(path) then
       bad_files[k] = true
       bad_files_msg = ('%s%s\n'):format(bad_files_msg, path)
     end
diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index e0bfe57cb6..f2c19f53fb 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -5,7 +5,7 @@ local ok = vim.health.ok
 local info = vim.health.info
 local warn = vim.health.warn
 local error = vim.health.error
-local iswin = vim.loop.os_uname().sysname == 'Windows_NT'
+local iswin = vim.uv.os_uname().sysname == 'Windows_NT'
 
 local shell_error_code = 0
 local function shell_error()
@@ -30,7 +30,7 @@ local function isdir(path)
   if not path then
     return false
   end
-  local stat = vim.loop.fs_stat(path)
+  local stat = vim.uv.fs_stat(path)
   if not stat then
     return false
   end
@@ -41,7 +41,7 @@ local function isfile(path)
   if not path then
     return false
   end
-  local stat = vim.loop.fs_stat(path)
+  local stat = vim.uv.fs_stat(path)
   if not stat then
     return false
   end
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index b26def5958..7b946a55e4 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -42,6 +42,10 @@ for k, v in pairs({
   vim._submodules[k] = v
 end
 
+-- Remove at Nvim 1.0
+---@deprecated
+vim.loop = vim.uv
+
 -- There are things which have special rules in vim._init_packages
 -- for legacy reasons (uri) or for performance (_inspector).
 -- most new things should go into a submodule namespace ( vim.foobar.do_thing() )
@@ -159,7 +163,7 @@ do
   ---                - 3: ends the paste (exactly once)
   ---@returns boolean # false if client should cancel the paste.
   function vim.paste(lines, phase)
-    local now = vim.loop.now()
+    local now = vim.uv.now()
     local is_first_chunk = phase < 2
     local is_last_chunk = phase == -1 or phase == 3
     if is_first_chunk then -- Reset flags.
@@ -483,7 +487,7 @@ end
 ---@return table timer luv timer object
 function vim.defer_fn(fn, timeout)
   vim.validate({ fn = { fn, 'c', true } })
-  local timer = vim.loop.new_timer()
+  local timer = vim.uv.new_timer()
   timer:start(
     timeout,
     0,
diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
index dbffd726a2..3bd8a56f6e 100644
--- a/runtime/lua/vim/_watch.lua
+++ b/runtime/lua/vim/_watch.lua
@@ -46,7 +46,7 @@ function M.watch(path, opts, callback)
 
   path = vim.fs.normalize(path)
   local uvflags = opts and opts.uvflags or {}
-  local handle, new_err = vim.loop.new_fs_event()
+  local handle, new_err = vim.uv.new_fs_event()
   assert(not new_err, new_err)
   local _, start_err = handle:start(path, uvflags, function(err, filename, events)
     assert(not err, err)
@@ -57,7 +57,7 @@ function M.watch(path, opts, callback)
     end
     local change_type = events.change and M.FileChangeType.Changed or 0
     if events.rename then
-      local _, staterr, staterrname = vim.loop.fs_stat(fullpath)
+      local _, staterr, staterrname = vim.uv.fs_stat(fullpath)
       if staterrname == 'ENOENT' then
         change_type = M.FileChangeType.Deleted
       else
@@ -99,7 +99,7 @@ local function poll_internal(path, opts, callback, watches)
   }
 
   if not watches.handle then
-    local poll, new_err = vim.loop.new_fs_poll()
+    local poll, new_err = vim.uv.new_fs_poll()
     assert(not new_err, new_err)
     watches.handle = poll
     local _, start_err = poll:start(
diff --git a/runtime/lua/vim/filetype/options.lua b/runtime/lua/vim/filetype/options.lua
index a093c249f7..2a28b5a8e3 100644
--- a/runtime/lua/vim/filetype/options.lua
+++ b/runtime/lua/vim/filetype/options.lua
@@ -34,7 +34,7 @@ local ft_option_cache = {} ---@type table<string,table<string,any>>
 --- @param path string
 --- @return integer
 local function hash(path)
-  local mtime0 = vim.loop.fs_stat(path).mtime
+  local mtime0 = vim.uv.fs_stat(path).mtime
   return mtime0.sec * 1000000000 + mtime0.nsec
 end
 
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 864ba495f1..5e63fb6237 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -1,6 +1,6 @@
 local M = {}
 
-local iswin = vim.loop.os_uname().sysname == 'Windows_NT'
+local iswin = vim.uv.os_uname().sysname == 'Windows_NT'
 
 --- Iterate over all the parents of the given file or directory.
 ---
@@ -106,12 +106,12 @@ function M.dir(path, opts)
   })
 
   if not opts.depth or opts.depth == 1 then
-    local fs = vim.loop.fs_scandir(M.normalize(path))
+    local fs = vim.uv.fs_scandir(M.normalize(path))
     return function()
       if not fs then
         return
       end
-      return vim.loop.fs_scandir_next(fs)
+      return vim.uv.fs_scandir_next(fs)
     end
   end
 
@@ -121,9 +121,9 @@ function M.dir(path, opts)
     while #dirs > 0 do
       local dir0, level = unpack(table.remove(dirs, 1))
       local dir = level == 1 and dir0 or M.joinpath(path, dir0)
-      local fs = vim.loop.fs_scandir(M.normalize(dir))
+      local fs = vim.uv.fs_scandir(M.normalize(dir))
       while fs do
-        local name, t = vim.loop.fs_scandir_next(fs)
+        local name, t = vim.uv.fs_scandir_next(fs)
         if not name then
           break
         end
@@ -158,7 +158,7 @@ end
 --- -- location of Cargo.toml from the current buffer's path
 --- local cargo = vim.fs.find('Cargo.toml', {
 ---   upward = true,
----   stop = vim.loop.os_homedir(),
+---   stop = vim.uv.os_homedir(),
 ---   path = vim.fs.dirname(vim.api.nvim_buf_get_name(0)),
 --- })
 ---
@@ -212,7 +212,7 @@ function M.find(names, opts)
 
   names = type(names) == 'string' and { names } or names
 
-  local path = opts.path or vim.loop.cwd()
+  local path = opts.path or vim.uv.cwd()
   local stop = opts.stop
   local limit = opts.limit or 1
 
@@ -244,7 +244,7 @@ function M.find(names, opts)
         local t = {}
         for _, name in ipairs(names) do
           local f = M.joinpath(p, name)
-          local stat = vim.loop.fs_stat(f)
+          local stat = vim.uv.fs_stat(f)
           if stat and (not opts.type or opts.type == stat.type) then
             t[#t + 1] = f
           end
@@ -337,7 +337,7 @@ function M.normalize(path, opts)
   })
 
   if path:sub(1, 1) == '~' then
-    local home = vim.loop.os_homedir() or '~'
+    local home = vim.uv.os_homedir() or '~'
     if home:sub(-1) == '\\' or home:sub(-1) == '/' then
       home = home:sub(1, -2)
     end
@@ -345,7 +345,7 @@ function M.normalize(path, opts)
   end
 
   if opts.expand_env == nil or opts.expand_env then
-    path = path:gsub('%$([%w_]+)', vim.loop.os_getenv)
+    path = path:gsub('%$([%w_]+)', vim.uv.os_getenv)
   end
 
   path = path:gsub('\\', '/'):gsub('/+', '/')
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 66627fe4e7..9024bdb231 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -1,4 +1,4 @@
-local uv = vim.loop
+local uv = vim.uv
 
 --- @type (fun(modename: string): fun()|string)[]
 local loaders = package.loaders
@@ -465,7 +465,7 @@ end
 --- @private
 function Loader.track(stat, f)
   return function(...)
-    local start = vim.loop.hrtime()
+    local start = vim.uv.hrtime()
     local r = { f(...) }
     Loader._stats[stat] = Loader._stats[stat] or { total = 0, time = 0 }
     Loader._stats[stat].total = Loader._stats[stat].total + 1
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index baf8b5c1a8..5f7a95ae14 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -10,7 +10,7 @@ local semantic_tokens = require('vim.lsp.semantic_tokens')
 local api = vim.api
 local nvim_err_writeln, nvim_buf_get_lines, nvim_command, nvim_exec_autocmds =
   api.nvim_err_writeln, api.nvim_buf_get_lines, api.nvim_command, api.nvim_exec_autocmds
-local uv = vim.loop
+local uv = vim.uv
 local tbl_isempty, tbl_extend = vim.tbl_isempty, vim.tbl_extend
 local validate = vim.validate
 local if_nil = vim.F.if_nil
diff --git a/runtime/lua/vim/lsp/health.lua b/runtime/lua/vim/lsp/health.lua
index 6ca468393e..8817bb71de 100644
--- a/runtime/lua/vim/lsp/health.lua
+++ b/runtime/lua/vim/lsp/health.lua
@@ -22,7 +22,7 @@ function M.check()
   local log_path = vim.lsp.get_log_path()
   report_info(string.format('Log path: %s', log_path))
 
-  local log_file = vim.loop.fs_stat(log_path)
+  local log_file = vim.uv.fs_stat(log_path)
   local log_size = log_file and log_file.size or 0
 
   local report_fn = (log_size / 1000000 > 100 and report_warn or report_info)
diff --git a/runtime/lua/vim/lsp/log.lua b/runtime/lua/vim/lsp/log.lua
index 3d5bc06c3f..07d0500797 100644
--- a/runtime/lua/vim/lsp/log.lua
+++ b/runtime/lua/vim/lsp/log.lua
@@ -31,7 +31,7 @@ do
     end
   end
 
-  local path_sep = vim.loop.os_uname().version:match('Windows') and '\\' or '/'
+  local path_sep = vim.uv.os_uname().version:match('Windows') and '\\' or '/'
   ---@private
   local function path_join(...)
     return table.concat(vim.tbl_flatten({ ... }), path_sep)
@@ -68,7 +68,7 @@ do
       return false
     end
 
-    local log_info = vim.loop.fs_stat(logfilename)
+    local log_info = vim.uv.fs_stat(logfilename)
     if log_info and log_info.size > 1e9 then
       local warn_msg = string.format(
         'LSP client log is large (%d MB): %s',
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index af3190c9bd..5f48effebf 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -1,4 +1,4 @@
-local uv = vim.loop
+local uv = vim.uv
 local log = require('vim.lsp.log')
 local protocol = require('vim.lsp.protocol')
 local validate, schedule, schedule_wrap = vim.validate, vim.schedule, vim.schedule_wrap
@@ -691,7 +691,7 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
   })
 
   ---@private
-  --- Callback for |vim.loop.spawn()| Closes all streams and runs the `on_exit` dispatcher.
+  --- Callback for |vim.uv.spawn()| Closes all streams and runs the `on_exit` dispatcher.
   ---@param code (integer) Exit code
   ---@param signal (integer) Signal that was used to terminate (if any)
   local function onexit(code, signal)
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 376cac19a7..191cc7b400 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -2,7 +2,7 @@ local api = vim.api
 local bit = require('bit')
 local handlers = require('vim.lsp.handlers')
 local util = require('vim.lsp.util')
-local uv = vim.loop
+local uv = vim.uv
 
 --- @class STTokenRange
 --- @field line integer line number 0-based
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 9fffc845b1..53f8dba814 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -4,7 +4,7 @@ local validate = vim.validate
 local api = vim.api
 local list_extend = vim.list_extend
 local highlight = require('vim.highlight')
-local uv = vim.loop
+local uv = vim.uv
 
 local npcall = vim.F.npcall
 local split = vim.split
diff --git a/runtime/lua/vim/secure.lua b/runtime/lua/vim/secure.lua
index 443b152273..1a04e11231 100644
--- a/runtime/lua/vim/secure.lua
+++ b/runtime/lua/vim/secure.lua
@@ -51,7 +51,7 @@ end
 ---        trusted, or nil otherwise.
 function M.read(path)
   vim.validate({ path = { path, 's' } })
-  local fullpath = vim.loop.fs_realpath(vim.fs.normalize(path))
+  local fullpath = vim.uv.fs_realpath(vim.fs.normalize(path))
   if not fullpath then
     return nil
   end
@@ -149,13 +149,13 @@ function M.trust(opts)
 
   local fullpath
   if path then
-    fullpath = vim.loop.fs_realpath(vim.fs.normalize(path))
+    fullpath = vim.uv.fs_realpath(vim.fs.normalize(path))
   elseif bufnr then
     local bufname = vim.api.nvim_buf_get_name(bufnr)
     if bufname == '' then
       return false, 'buffer is not associated with a file'
     end
-    fullpath = vim.loop.fs_realpath(vim.fs.normalize(bufname))
+    fullpath = vim.uv.fs_realpath(vim.fs.normalize(bufname))
   else
     error('one of "path" or "bufnr" is required')
   end
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 244d88f3e0..cabfa8ccc0 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -170,11 +170,11 @@ end
 ---@param f fun(): R1, R2, R2
 ---@return integer, R1, R2, R3
 local function tcall(f, ...)
-  local start = vim.loop.hrtime()
+  local start = vim.uv.hrtime()
   ---@diagnostic disable-next-line
   local r = { f(...) }
   --- @type number
-  local duration = (vim.loop.hrtime() - start) / 1000000
+  local duration = (vim.uv.hrtime() - start) / 1000000
   return duration, unpack(r)
 end
 
-- 
cgit 


From 40db569014471deb5bd17860be00d6833387be79 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 3 Jun 2023 11:06:10 +0100
Subject: perf(iter): make ListIter.totable more efficient (#23714)

---
 runtime/lua/vim/iter.lua | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 56012e9b9f..0e98d0437e 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -66,7 +66,7 @@ end
 ---@class ListIter : Iter
 ---@field _table table Underlying table data
 ---@field _head number Index to the front of a table iterator
----@field _tail number Index to the end of a table iterator
+---@field _tail number Index to the end of a table iterator (exclusive)
 local ListIter = {}
 ListIter.__index = setmetatable(ListIter, Iter)
 ListIter.__call = function(self)
@@ -321,17 +321,33 @@ end
 
 ---@private
 function ListIter.totable(self)
-  if self._head == 1 and self._tail == #self._table + 1 and self.next == ListIter.next then
-    -- Sanitize packed table values
-    if getmetatable(self._table[1]) == packedmt then
-      for i = 1, #self._table do
-        self._table[i] = sanitize(self._table[i])
-      end
+  if self.next ~= ListIter.next or self._head >= self._tail then
+    return Iter.totable(self)
+  end
+
+  local needs_sanitize = getmetatable(self._table[1]) == packedmt
+
+  -- Reindex and sanitize.
+  local len = self._tail - self._head
+
+  if needs_sanitize then
+    for i = 1, len do
+      self._table[i] = sanitize(self._table[self._head - 1 + i])
+    end
+  else
+    for i = 1, len do
+      self._table[i] = self._table[self._head - 1 + i]
     end
-    return self._table
   end
 
-  return Iter.totable(self)
+  for i = len + 1, table.maxn(self._table) do
+    self._table[i] = nil
+  end
+
+  self._head = 1
+  self._tail = len + 1
+
+  return self._table
 end
 
 --- Fold an iterator or table into a single value.
-- 
cgit 


From 0a439e38634542fd961bb4f04b1cdda304cb1bb5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 4 Jun 2023 00:39:46 +0200
Subject: vim-patch:9.0.1601: filetype detection fails for *.conf file without
 comments (#23896)

Problem:    Filetype detection fails for *.conf file without comments.
            (Dmitrii Tcyganok)
Solution:   Use "conf" filetype as a fallback for an empty .conf file.
            (closes vim/vim#12487, closes vim/vim#12483)

https://github.com/vim/vim/commit/664fd12aa27a3c6bd19cfa474c4630d6c03fcc61

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 runtime/lua/vim/filetype/detect.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 70e590ed10..b347215895 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -196,6 +196,9 @@ function M.conf(path, bufnr)
   if vim.fn.did_filetype() ~= 0 or path:find(vim.g.ft_ignore_pat) then
     return
   end
+  if path:find('%.conf$') then
+    return 'conf'
+  end
   for _, line in ipairs(getlines(bufnr, 1, 5)) do
     if line:find('^#') then
       return 'conf'
-- 
cgit 


From 96e19533f60add50eea4598560bbd56de3b1fca3 Mon Sep 17 00:00:00 2001
From: Artyom Andreev <artandra@icloud.com>
Date: Sun, 4 Jun 2023 04:03:25 +0300
Subject: feat(lsp): set kind in select call for codelens #23889

---
 runtime/lua/vim/lsp/codelens.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index 005a0047fa..ea8c52c334 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -97,6 +97,7 @@ function M.run()
   else
     vim.ui.select(options, {
       prompt = 'Code lenses:',
+      kind = 'codelens',
       format_item = function(option)
         return option.lens.command.title
       end,
-- 
cgit 


From 700cab00680fa25e0dbdf6f91f638f4da5a09909 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 4 Jun 2023 09:09:22 +0800
Subject: fix(events)!: trigger CursorMoved later on switching window (#23711)

---
 runtime/doc/autocmd.txt | 3 +--
 runtime/doc/news.txt    | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 01e8cc964d..94a529930e 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -505,8 +505,7 @@ CursorMoved			After the cursor was moved in Normal or Visual
 				"x", "rx" or "p".
 				Not always triggered when there is typeahead,
 				while executing commands in a script file, or
-				when an operator is pending. Always triggered
-				when moving to another window.
+				when an operator is pending.
 				For an example see |match-parens|.
 				Note: Cannot be skipped with |:noautocmd|.
 				Careful: This is triggered very often, don't
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index d51227f0c0..f8757af2be 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -30,6 +30,8 @@ The following changes may require adaptations in user config or plugins.
     set mousemodel=popup
     set keymodel=startsel,stopsel
 <
+• When switching windows, |CursorMoved| autocommands trigger when Nvim is back
+  in the main loop rather than immediately. This is more compatible with Vim.
 
 • |LspRequest| autocmd was promoted from a |User| autocmd to a first class
   citizen.
-- 
cgit 


From 5282d3299c9b1b07f3e02a9014bc2632cf3b4fed Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Mon, 5 Jun 2023 01:45:01 +0200
Subject: fix(lsp): restore marks after apply_text_edits() #14630

PROBLEM:
Whenever any text edits are applied to the buffer, the `marks` part of those
lines will be lost. This is mostly problematic for code formatters that format
the whole buffer like `prettier`, `luafmt`, ...

When doing atomic changes inside a vim doc, vim keeps track of those changes and
can update the positions of marks accordingly, but in this case we have a whole
doc that changed. There's no simple way to update the positions of all marks
from the previous document state to the new document state.

SOLUTION:
* save marks right before `nvim_buf_set_lines` is called inside `apply_text_edits`
* check if any marks were lost after doing `nvim_buf_set_lines`
* restore those marks to the previous positions

TEST CASE:
* have a formatter enabled
* open any file
* create a couple of marks
* indent the whole file to the right
* save the file
Before this change: all marks will be removed.
After this change: they will be preserved.

Fixes #14307
---
 runtime/doc/news.txt         |  3 +++
 runtime/lua/vim/lsp/util.lua | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f8757af2be..e42be43461 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -41,6 +41,9 @@ ADDED FEATURES                                                     *news-added*
 
 The following new APIs or features were added.
 
+• Neovim's LSP client now always saves and restores named buffer marks when
+  applying text edits.
+
 • Nvim's LSP client now advertises the general.positionEncodings client
   capability to indicate to servers that it supports utf-8, utf-16, and utf-32
   encodings. If the server responds with the positionEncoding capability in
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 53f8dba814..ba8c72128e 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -451,6 +451,14 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
     }
   end)()
 
+  -- save and restore local marks since they get deleted by nvim_buf_set_lines
+  local marks = {}
+  for _, m in pairs(vim.fn.getmarklist(bufnr or vim.api.nvim_get_current_buf())) do
+    if m.mark:match("^'[a-z]$") then
+      marks[m.mark:sub(2, 2)] = { m.pos[2], m.pos[3] - 1 } -- api-indexed
+    end
+  end
+
   -- Apply text edits.
   local is_cursor_fixed = false
   local has_eol_text_edit = false
@@ -518,6 +526,20 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
 
   local max = api.nvim_buf_line_count(bufnr)
 
+  -- no need to restore marks that still exist
+  for _, m in pairs(vim.fn.getmarklist(bufnr or vim.api.nvim_get_current_buf())) do
+    marks[m.mark:sub(2, 2)] = nil
+  end
+  -- restore marks
+  for mark, pos in pairs(marks) do
+    if pos then
+      -- make sure we don't go out of bounds
+      pos[1] = math.min(pos[1], max)
+      pos[2] = math.min(pos[2], #(get_line(bufnr, pos[1] - 1) or ''))
+      vim.api.nvim_buf_set_mark(bufnr or 0, mark, pos[1], pos[2], {})
+    end
+  end
+
   -- Apply fixed cursor position.
   if is_cursor_fixed then
     local is_valid_cursor = true
-- 
cgit 


From 3c6d971e5488dc75b7db07c14d01f87827f28a67 Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Mon, 5 Jun 2023 13:17:38 +0800
Subject: fix(lsp): set extra info only when it has a value (#23868)

---
 runtime/lua/vim/lsp/util.lua | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index ba8c72128e..e36014d07d 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -716,15 +716,18 @@ function M.text_document_completion_list_to_complete_items(result, prefix)
   local matches = {}
 
   for _, completion_item in ipairs(items) do
-    local info = ' '
+    local info = ''
     local documentation = completion_item.documentation
     if documentation then
       if type(documentation) == 'string' and documentation ~= '' then
         info = documentation
       elseif type(documentation) == 'table' and type(documentation.value) == 'string' then
         info = documentation.value
-        -- else
-        -- TODO(ashkan) Validation handling here?
+      else
+        vim.notify(
+          ('invalid documentation value %s'):format(vim.inspect(documentation)),
+          vim.log.levels.WARN
+        )
       end
     end
 
@@ -734,7 +737,7 @@ function M.text_document_completion_list_to_complete_items(result, prefix)
       abbr = completion_item.label,
       kind = M._get_completion_item_kind_name(completion_item.kind),
       menu = completion_item.detail or '',
-      info = info,
+      info = #info > 0 and info or nil,
       icase = 1,
       dup = 1,
       empty = 1,
-- 
cgit 


From 416fe8d185dcc072df7942953d867d9c605e9ffd Mon Sep 17 00:00:00 2001
From: Jon Huhn <nojnhuh@users.noreply.github.com>
Date: Mon, 5 Jun 2023 00:19:31 -0500
Subject: refactor(lsp): use LPeg for watchfiles matching (#23788)

---
 runtime/lua/vim/lsp/_watchfiles.lua | 191 +++++++++++-------------------------
 1 file changed, 56 insertions(+), 135 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index cf2c57db1f..14e5dc6cf8 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -1,152 +1,81 @@
 local bit = require('bit')
+local lpeg = require('lpeg')
 local watch = require('vim._watch')
 local protocol = require('vim.lsp.protocol')
 
 local M = {}
 
 ---@private
----Parses the raw pattern into a number of Lua-native patterns.
+--- Parses the raw pattern into an |lpeg| pattern. LPeg patterns natively support the "this" or "that"
+--- alternative constructions described in the LSP spec that cannot be expressed in a standard Lua pattern.
 ---
 ---@param pattern string The raw glob pattern
----@return table A list of Lua patterns. A match with any of them matches the input glob pattern.
+---@return userdata An |lpeg| representation of the pattern, or nil if the pattern is invalid.
 local function parse(pattern)
-  local patterns = { '' }
+  local l = lpeg
 
-  local path_sep = '[/\\]'
-  local non_path_sep = '[^/\\]'
+  local P, S, V = lpeg.P, lpeg.S, lpeg.V
+  local C, Cc, Ct, Cf = lpeg.C, lpeg.Cc, lpeg.Ct, lpeg.Cf
 
-  local function append(chunks)
-    local new_patterns = {}
-    for _, p in ipairs(patterns) do
-      for _, chunk in ipairs(chunks) do
-        table.insert(new_patterns, p .. chunk)
-      end
-    end
-    patterns = new_patterns
-  end
+  local pathsep = '/'
 
-  local function split(s, sep)
-    local segments = {}
-    local segment = ''
-    local in_braces = false
-    local in_brackets = false
-    for i = 1, #s do
-      local c = string.sub(s, i, i)
-      if c == sep and not in_braces and not in_brackets then
-        table.insert(segments, segment)
-        segment = ''
-      else
-        if c == '{' then
-          in_braces = true
-        elseif c == '}' then
-          in_braces = false
-        elseif c == '[' then
-          in_brackets = true
-        elseif c == ']' then
-          in_brackets = false
-        end
-        segment = segment .. c
-      end
+  local function class(inv, ranges)
+    for i, r in ipairs(ranges) do
+      ranges[i] = r[1] .. r[2]
     end
-    if segment ~= '' then
-      table.insert(segments, segment)
+    local patt = l.R(unpack(ranges))
+    if inv == '!' then
+      patt = P(1) - patt
     end
-    return segments
+    return patt
   end
 
-  local function escape(c)
-    if
-      c == '?'
-      or c == '.'
-      or c == '('
-      or c == ')'
-      or c == '%'
-      or c == '['
-      or c == ']'
-      or c == '*'
-      or c == '+'
-      or c == '-'
-    then
-      return '%' .. c
-    end
-    return c
+  local function add(acc, a)
+    return acc + a
   end
 
-  local segments = split(pattern, '/')
-  for i, segment in ipairs(segments) do
-    local last_seg = i == #segments
-    if segment == '**' then
-      local chunks = {
-        path_sep .. '-',
-        '.-' .. path_sep,
-      }
-      if last_seg then
-        chunks = { '.-' }
-      end
-      append(chunks)
-    else
-      local in_braces = false
-      local brace_val = ''
-      local in_brackets = false
-      local bracket_val = ''
-      for j = 1, #segment do
-        local char = string.sub(segment, j, j)
-        if char ~= '}' and in_braces then
-          brace_val = brace_val .. char
-        else
-          if in_brackets and (char ~= ']' or bracket_val == '') then
-            local res
-            if char == '-' then
-              res = char
-            elseif bracket_val == '' and char == '!' then
-              res = '^'
-            elseif char == '/' then
-              res = ''
-            else
-              res = escape(char)
-            end
-            bracket_val = bracket_val .. res
-          else
-            if char == '{' then
-              in_braces = true
-            elseif char == '[' then
-              in_brackets = true
-            elseif char == '}' then
-              local choices = split(brace_val, ',')
-              local parsed_choices = {}
-              for _, choice in ipairs(choices) do
-                table.insert(parsed_choices, parse(choice))
-              end
-              append(vim.tbl_flatten(parsed_choices))
-              in_braces = false
-              brace_val = ''
-            elseif char == ']' then
-              append({ '[' .. bracket_val .. ']' })
-              in_brackets = false
-              bracket_val = ''
-            elseif char == '?' then
-              append({ non_path_sep })
-            elseif char == '*' then
-              append({ non_path_sep .. '-' })
-            else
-              append({ escape(char) })
-            end
-          end
-        end
-      end
+  local function mul(acc, m)
+    return acc * m
+  end
 
-      if not last_seg and (segments[i + 1] ~= '**' or i + 1 < #segments) then
-        append({ path_sep })
-      end
-    end
+  local function star(stars, after)
+    return (-after * (l.P(1) - pathsep)) ^ #stars * after
   end
 
-  return patterns
+  local function dstar(after)
+    return (-after * l.P(1)) ^ 0 * after
+  end
+
+  local p = P({
+    'Pattern',
+    Pattern = V('Elem') ^ -1 * V('End'),
+    Elem = Cf(
+      (V('DStar') + V('Star') + V('Ques') + V('Class') + V('CondList') + V('Literal'))
+        * (V('Elem') + V('End')),
+      mul
+    ),
+    DStar = P('**') * (P(pathsep) * (V('Elem') + V('End')) + V('End')) / dstar,
+    Star = C(P('*') ^ 1) * (V('Elem') + V('End')) / star,
+    Ques = P('?') * Cc(l.P(1) - pathsep),
+    Class = P('[') * C(P('!') ^ -1) * Ct(Ct(C(1) * '-' * C(P(1) - ']')) ^ 1 * ']') / class,
+    CondList = P('{') * Cf(V('Cond') * (P(',') * V('Cond')) ^ 0, add) * '}',
+    -- TODO: '*' inside a {} condition is interpreted literally but should probably have the same
+    -- wildcard semantics it usually has.
+    -- Fixing this is non-trivial because '*' should match non-greedily up to "the rest of the
+    -- pattern" which in all other cases is the entire succeeding part of the pattern, but at the end of a {}
+    -- condition means "everything after the {}" where several other options separated by ',' may
+    -- exist in between that should not be matched by '*'.
+    Cond = Cf((V('Ques') + V('Class') + V('CondList') + (V('Literal') - S(',}'))) ^ 1, mul)
+      + Cc(l.P(0)),
+    Literal = P(1) / l.P,
+    End = P(-1) * Cc(l.P(-1)),
+  })
+
+  return p:match(pattern)
 end
 
 ---@private
 --- Implementation of LSP 3.17.0's pattern matching: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#pattern
---- Modeled after VSCode's implementation: https://github.com/microsoft/vscode/blob/0319eed971719ad48e9093daba9d65a5013ec5ab/src/vs/base/common/glob.ts#L509
 ---
 ---@param pattern string|table The glob pattern (raw or parsed) to match.
 ---@param s string The string to match against pattern.
@@ -155,15 +84,7 @@ function M._match(pattern, s)
   if type(pattern) == 'string' then
     pattern = parse(pattern)
   end
-  -- Since Lua's built-in string pattern matching does not have an alternate
-  -- operator like '|', `parse` will construct one pattern for each possible
-  -- alternative. Any pattern that matches thus matches the glob.
-  for _, p in ipairs(pattern) do
-    if s:match('^' .. p .. '$') then
-      return true
-    end
-  end
-  return false
+  return pattern:match(s) ~= nil
 end
 
 M._watchfunc = (vim.fn.has('win32') == 1 or vim.fn.has('mac') == 1) and watch.watch or watch.poll
@@ -226,11 +147,11 @@ function M.register(reg, ctx)
       local kind = w.kind
         or protocol.WatchKind.Create + protocol.WatchKind.Change + protocol.WatchKind.Delete
 
-      local pattern = glob_pattern.pattern
+      local pattern = parse(glob_pattern.pattern)
+      assert(pattern, 'invalid pattern: ' .. glob_pattern.pattern)
       if relative_pattern then
-        pattern = base_dir .. '/' .. pattern
+        pattern = lpeg.P(base_dir .. '/') * pattern
       end
-      pattern = parse(pattern)
 
       table.insert(watch_regs, {
         base_dir = base_dir,
-- 
cgit 


From 21187e1c73e6887ce407164c98320555374387a9 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 5 Jun 2023 02:19:05 -0700
Subject: defaults: shortmess+=C #23907

Problem:
Completion messages such as "scanning tags" are noisy and generally not
useful on most systems. Most users probably aren't aware that this is
configurable.

Solution:
Set `shortmess+=C`.
---
 runtime/doc/news.txt     | 13 +++++++------
 runtime/doc/options.txt  |  2 +-
 runtime/doc/vim_diff.txt |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index e42be43461..8fe01c4dfb 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -61,12 +61,6 @@ The following new APIs or features were added.
 
 • Added |vim.keycode()| for translating keycodes in a string.
 
-• Added automatic linting of treesitter query files (see |ft-query-plugin|).
-  Automatic linting can be turned off via >lua
-      vim.g.query_lint_on = {}
-<
-• Enabled treesitter highlighting for treesitter query files by default.
-
 • Added |vim.treesitter.query.omnifunc()| for treesitter query files (set by
   default).
 
@@ -96,6 +90,13 @@ The following changes to existing APIs or features add new behavior.
 • vim.diagnostic.config() now accepts a function for the virtual_text.prefix
   option, which allows for rendering e.g., diagnostic severities differently.
 
+• Defaults:
+  • 'shortmess' includes the "C" flag.
+  • Automatic linting of treesitter query files (see |ft-query-plugin|).
+    Can be disabled via: >lua
+      vim.g.query_lint_on = {}
+<  • Enabled treesitter highlighting for treesitter query files.
+
 • The `workspace/didChangeWatchedFiles` LSP client capability is now enabled
   by default.
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 72463af418..4f5f2e8b80 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5393,7 +5393,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	function to get the effective shiftwidth value.
 
 						*'shortmess'* *'shm'*
-'shortmess' 'shm'	string	(default "filnxtToOF")
+'shortmess' 'shm'	string	(default "filnxtToOCF")
 			global
 	This option helps to avoid all the |hit-enter| prompts caused by file
 	messages, for example  with CTRL-G, and to avoid some other messages.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 58f6d6f6f9..102f867fbd 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -57,7 +57,7 @@ Defaults					            *nvim-defaults*
 - 'nrformats' defaults to "bin,hex"
 - 'ruler' is enabled
 - 'sessionoptions' includes "unix,slash", excludes "options"
-- 'shortmess' includes "F", excludes "S"
+- 'shortmess' includes "CF", excludes "S"
 - 'showcmd' is enabled
 - 'sidescroll' defaults to 1
 - 'smarttab' is enabled
-- 
cgit 


From ca26ec34386dfe98b0edf3de9aeb7b66f40d5efd Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Mon, 5 Jun 2023 08:21:23 -0500
Subject: fix(lsp): use only utf-16 in default client positionEncodings
 (#23903)

The Nvim client does not yet support multiple offset encodings for
clients in the same buffer. Until it does, stick to utf-16 by default.
---
 runtime/doc/news.txt             | 8 +++-----
 runtime/lua/vim/lsp/protocol.lua | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 8fe01c4dfb..0182605b1b 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -44,11 +44,9 @@ The following new APIs or features were added.
 • Neovim's LSP client now always saves and restores named buffer marks when
   applying text edits.
 
-• Nvim's LSP client now advertises the general.positionEncodings client
-  capability to indicate to servers that it supports utf-8, utf-16, and utf-32
-  encodings. If the server responds with the positionEncoding capability in
-  its initialization response, Nvim automatically sets the client's
-  `offset_encoding` field.
+• Nvim now supports the `positionEncoding` server capability. If a server
+  responds with the `positionEncoding` capability in its initialization
+  response, Nvim automatically sets the client's `offset_encoding` field.
 
 • Dynamic registration of LSP capabilities. An implication of this change is
   that checking a client's `server_capabilities` is no longer a sufficient
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 7e49a572e7..7558b5c6ba 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -636,9 +636,7 @@ function protocol.make_client_capabilities()
   return {
     general = {
       positionEncodings = {
-        'utf-8',
         'utf-16',
-        'utf-32',
       },
     },
     textDocument = {
-- 
cgit 


From cbbda3bcd77595eeabcc0fb70cee513e473833e6 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Mon, 5 Jun 2023 11:53:13 -0500
Subject: fix(editorconfig): check that buffer is valid (#23922)

Fixes: https://github.com/neovim/neovim/issues/23921
---
 runtime/lua/editorconfig.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/editorconfig.lua b/runtime/lua/editorconfig.lua
index a4024e5e7a..7311cccbe7 100644
--- a/runtime/lua/editorconfig.lua
+++ b/runtime/lua/editorconfig.lua
@@ -208,6 +208,10 @@ end
 ---@private
 function M.config(bufnr)
   bufnr = bufnr or vim.api.nvim_get_current_buf()
+  if not vim.api.nvim_buf_is_valid(bufnr) then
+    return
+  end
+
   local path = vim.fs.normalize(vim.api.nvim_buf_get_name(bufnr))
   if vim.bo[bufnr].buftype ~= '' or not vim.bo[bufnr].modifiable or path == '' then
     return
-- 
cgit 


From 981acc2922ce9a5f214ba14acbb1e444748855f2 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <rickyz@google.com>
Date: Thu, 1 Jun 2023 02:15:14 -0700
Subject: fix(ui): propagate line wrapping state on grid_line events

This fixes the TUI's line-wrapping behavior, which was broken with the
migration to the msgpack-based UI protocol (see
https://github.com/neovim/neovim/issues/7369#issuecomment-1571812273).
---
 runtime/doc/ui.txt | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index c64c450aa1..d3bd82ba27 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -78,14 +78,14 @@ Example of a typical "redraw" batch in a single RPC notification: >
       [
 	['grid_resize', [2, 77, 36]],
 	['grid_line',
-	  [2, 0, 0, [[' ' , 0, 77]]],
-	  [2, 1, 0, [['~', 7], [' ', 7, 76]]],
-	  [2, 9, 0, [['~', 7], [' ', 7, 76]]], 
+	  [2, 0, 0, [[' ' , 0, 77]], false],
+	  [2, 1, 0, [['~', 7], [' ', 7, 76]], false],
+	  [2, 9, 0, [['~', 7], [' ', 7, 76]], false],
 	  ...
-	  [2, 35, 0, [['~', 7], [' ', 7, 76]]],
-	  [1, 36, 0, [['[', 9], ['N'], ['o'], [' '], ['N'], ['a'], ['m'], ['e'], [']']]],
-	  [1, 36, 9, [[' ', 9, 50]]],
-	  [1, 36, 59, [['0', 9], [','], ['0'], ['-' ], ['1'], [' ', 9, 10], ['A'], ['l', 9, 2]]]
+	  [2, 35, 0, [['~', 7], [' ', 7, 76]], false],
+	  [1, 36, 0, [['[', 9], ['N'], ['o'], [' '], ['N'], ['a'], ['m'], ['e'], [']']], false],
+	  [1, 36, 9, [[' ', 9, 50]], false],
+	  [1, 36, 59, [['0', 9], [','], ['0'], ['-' ], ['1'], [' ', 9, 10], ['A'], ['l', 9, 2]], false]
 	],
 	['msg_showmode', [[]]],
 	['win_pos', [2, 1000, 0, 0, 77, 36]],
@@ -360,7 +360,7 @@ numerical highlight ids to the actual attributes.
 	use the |hl-Pmenu| family of builtin highlights.
 
 							    *ui-event-grid_line*
-["grid_line", grid, row, col_start, cells] ~
+["grid_line", grid, row, col_start, cells, wrap] ~
 	Redraw a continuous part of a `row` on a `grid`, starting at the column
 	`col_start`. `cells` is an array of arrays each with 1 to 3 items:
 	`[text(, hl_id, repeat)]` . `text` is the UTF-8 text that should be put in
@@ -379,6 +379,12 @@ numerical highlight ids to the actual attributes.
 	enough to cover the remaining line, will be sent when the rest of the
 	line should be cleared.
 
+	`wrap` is a boolean indicating that this line wraps to the next row.
+	When redrawing a line which wraps to the next row, Nvim will emit a
+	`grid_line` event covering the last column of the line with `wrap` set
+	to true, followed immediately by a `grid_line` event starting at the
+	first column of the next row.
+
 ["grid_clear", grid] ~
 	Clear a `grid`.
 
-- 
cgit 


From ca887b80a911df4db4ab5f5496075b9415b9990a Mon Sep 17 00:00:00 2001
From: Gianmaria Bajo <mg1979.git@gmail.com>
Date: Tue, 6 Jun 2023 15:38:45 +0200
Subject: fix: version-range < and <= #23539

vim.version.range() couldn't parse them correctly.
For example, vim.version.range('<0.9.0'):has('0.9.0') returned `true`.

fix: range:has() accepts vim.version()
So that it's possible to compare a range with:

    vim.version.range(spec):has(vim.version())
---
 runtime/doc/lua.txt         | 10 +++++++---
 runtime/lua/vim/version.lua | 21 +++++++++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 54527c5a50..38289dc5d0 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2832,11 +2832,15 @@ range({spec})                                            *vim.version.range()*
       }
 <
 
-    `:has()` checks if a version is in the range (inclusive `from` , exclusive `to` ). Example: >lua
+    `:has()` checks if a version is in the range (inclusive `from`, exclusive
+    `to`).
+
+    Example: >lua
 
       local r = vim.version.range('1.0.0 - 2.0.0')
-      print(r:has('1.9.9'))  -- true
-      print(r:has('2.0.0'))  -- false
+      print(r:has('1.9.9'))       -- true
+      print(r:has('2.0.0'))       -- false
+      print(r:has(vim.version())) -- check against current Nvim version
 <
 
     Or use cmp(), eq(), lt(), and gt() to compare `.to` and `.from` directly: >lua
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index ebe8f4e053..d4a3752e37 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -226,8 +226,13 @@ function Range:has(version)
   if type(version) == 'string' then
     ---@diagnostic disable-next-line: cast-local-type
     version = M.parse(version)
+  else
+    -- Need metatable to compare versions.
+    version = setmetatable(vim.deepcopy(version), Version)
   end
   if version then
+    -- Workaround: vim.version() reports "prerelease" as a boolean.
+    version.prerelease = version.prerelease or nil
     if version.prerelease ~= self.from.prerelease then
       return false
     end
@@ -244,11 +249,14 @@ end
 ---   }
 ---   </pre>
 ---
---- `:has()` checks if a version is in the range (inclusive `from`, exclusive `to`). Example:
+--- `:has()` checks if a version is in the range (inclusive `from`, exclusive `to`).
+---
+--- Example:
 ---   <pre>lua
 ---   local r = vim.version.range('1.0.0 - 2.0.0')
----   print(r:has('1.9.9'))  -- true
----   print(r:has('2.0.0'))  -- false
+---   print(r:has('1.9.9'))       -- true
+---   print(r:has('2.0.0'))       -- false
+---   print(r:has(vim.version())) -- check against current Nvim version
 ---   </pre>
 ---
 --- Or use cmp(), eq(), lt(), and gt() to compare `.to` and `.from` directly:
@@ -279,7 +287,7 @@ function M.range(spec) -- Adapted from https://github.com/folke/lazy.nvim
     }, { __index = Range })
   end
   ---@type string, string
-  local mods, version = spec:lower():match('^([%^=>~]*)(.*)$')
+  local mods, version = spec:lower():match('^([%^=<>~]*)(.*)$')
   version = version:gsub('%.[%*x]', '')
   local parts = vim.split(version:gsub('%-.*', ''), '.', { plain = true })
   if #parts < 3 and mods == '' then
@@ -292,6 +300,11 @@ function M.range(spec) -- Adapted from https://github.com/folke/lazy.nvim
     local to = vim.deepcopy(semver)
     if mods == '' or mods == '=' then
       to.patch = to.patch + 1
+    elseif mods == '<' then
+      from = M._version({})
+    elseif mods == '<=' then
+      from = M._version({})
+      to.patch = to.patch + 1
     elseif mods == '>' then
       from.patch = from.patch + 1
       to = nil ---@diagnostic disable-line: cast-local-type
-- 
cgit 


From c48b1421af28d0317c807bca00c7e2fff97d9ad0 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 6 Jun 2023 08:23:20 -0700
Subject: refactor!: rename "playground" => "dev" #23919

Problem:
"playground" is new jargon that overlaps with existing concepts:
"dev" (`:help dev`) and "view" (also "scratch" `:help scratch-buffer`) .

Solution:
We should consistently use "dev" as the namespace for where "developer
tools" live. For purposes of a "throwaway sandbox object", we can use
the name "view".
- Rename `TSPlayground` => `TSView`
- Rename `playground.lua` => `dev.lua`
---
 runtime/doc/news.txt                      |   2 +
 runtime/doc/treesitter.txt                |   8 -
 runtime/lua/vim/treesitter.lua            |   2 +-
 runtime/lua/vim/treesitter/dev.lua        | 441 ++++++++++++++++++++++++++++++
 runtime/lua/vim/treesitter/playground.lua | 439 -----------------------------
 5 files changed, 444 insertions(+), 448 deletions(-)
 create mode 100644 runtime/lua/vim/treesitter/dev.lua
 delete mode 100644 runtime/lua/vim/treesitter/playground.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 0182605b1b..537a737dc8 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -36,6 +36,8 @@ The following changes may require adaptations in user config or plugins.
 • |LspRequest| autocmd was promoted from a |User| autocmd to a first class
   citizen.
 
+• Renamed `vim.treesitter.playground` to `vim.treesitter.dev`.
+
 ==============================================================================
 ADDED FEATURES                                                     *news-added*
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 64b4730eee..28ab3ecd8e 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1216,12 +1216,4 @@ LanguageTree:trees({self})                              *LanguageTree:trees()*
     Parameters: ~
       • {self}
 
-
-==============================================================================
-Lua module: vim.treesitter.playground              *lua-treesitter-playground*
-
-inspect_tree({opts})                *vim.treesitter.playground.inspect_tree()*
-    Parameters: ~
-      • {opts}  InspectTreeOpts
-
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 12fbe1654f..5526c9858c 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -493,7 +493,7 @@ end
 ---                        argument and should return a string.
 function M.inspect_tree(opts)
   ---@cast opts InspectTreeOpts
-  require('vim.treesitter.playground').inspect_tree(opts)
+  require('vim.treesitter.dev').inspect_tree(opts)
 end
 
 --- Returns the fold level for {lnum} in the current buffer. Can be set directly to 'foldexpr':
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
new file mode 100644
index 0000000000..99cd147658
--- /dev/null
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -0,0 +1,441 @@
+local api = vim.api
+
+---@class TSDevModule
+local M = {}
+
+---@class TSTreeView
+---@field ns integer API namespace
+---@field opts table Options table with the following keys:
+---                  - anon (boolean): If true, display anonymous nodes
+---                  - lang (boolean): If true, display the language alongside each node
+---@field nodes TSP.Node[]
+---@field named TSP.Node[]
+local TSTreeView = {}
+
+---@class TSP.Node
+---@field id integer Node id
+---@field text string Node text
+---@field named boolean True if this is a named (non-anonymous) node
+---@field depth integer Depth of the node within the tree
+---@field lnum integer Beginning line number of this node in the source buffer
+---@field col integer Beginning column number of this node in the source buffer
+---@field end_lnum integer Final line number of this node in the source buffer
+---@field end_col integer Final column number of this node in the source buffer
+---@field lang string Source language of this node
+---@field root TSNode
+
+--- Traverse all child nodes starting at {node}.
+---
+--- This is a recursive function. The {depth} parameter indicates the current recursion level.
+--- {lang} is a string indicating the language of the tree currently being traversed. Each traversed
+--- node is added to {tree}. When recursion completes, {tree} is an array of all nodes in the order
+--- they were visited.
+---
+--- {injections} is a table mapping node ids from the primary tree to language tree injections. Each
+--- injected language has a series of trees nested within the primary language's tree, and the root
+--- node of each of these trees is contained within a node in the primary tree. The {injections}
+--- table maps nodes in the primary tree to root nodes of injected trees.
+---
+---@param node TSNode Starting node to begin traversal |tsnode|
+---@param depth integer Current recursion depth
+---@param lang string Language of the tree currently being traversed
+---@param injections table<integer,TSP.Node> Mapping of node ids to root nodes of injected language trees (see
+---                        explanation above)
+---@param tree TSP.Node[] Output table containing a list of tables each representing a node in the tree
+---@private
+local function traverse(node, depth, lang, injections, tree)
+  local injection = injections[node:id()]
+  if injection then
+    traverse(injection.root, depth, injection.lang, injections, tree)
+  end
+
+  for child, field in node:iter_children() do
+    local type = child:type()
+    local lnum, col, end_lnum, end_col = child:range()
+    local named = child:named()
+    local text ---@type string
+    if named then
+      if field then
+        text = string.format('%s: (%s)', field, type)
+      else
+        text = string.format('(%s)', type)
+      end
+    else
+      text = string.format('"%s"', type:gsub('\n', '\\n'))
+    end
+
+    table.insert(tree, {
+      id = child:id(),
+      text = text,
+      named = named,
+      depth = depth,
+      lnum = lnum,
+      col = col,
+      end_lnum = end_lnum,
+      end_col = end_col,
+      lang = lang,
+    })
+
+    traverse(child, depth + 1, lang, injections, tree)
+  end
+
+  return tree
+end
+
+--- Create a new treesitter view.
+---
+---@param bufnr integer Source buffer number
+---@param lang string|nil Language of source buffer
+---
+---@return TSTreeView|nil
+---@return string|nil Error message, if any
+---
+---@package
+function TSTreeView:new(bufnr, lang)
+  local ok, parser = pcall(vim.treesitter.get_parser, bufnr or 0, lang)
+  if not ok then
+    return nil, 'No parser available for the given buffer'
+  end
+
+  -- For each child tree (injected language), find the root of the tree and locate the node within
+  -- the primary tree that contains that root. Add a mapping from the node in the primary tree to
+  -- the root in the child tree to the {injections} table.
+  local root = parser:parse()[1]:root()
+  local injections = {} ---@type table<integer,table>
+  parser:for_each_child(function(child, lang_)
+    child:for_each_tree(function(tree)
+      local r = tree:root()
+      local node = root:named_descendant_for_range(r:range())
+      if node then
+        injections[node:id()] = {
+          lang = lang_,
+          root = r,
+        }
+      end
+    end)
+  end)
+
+  local nodes = traverse(root, 0, parser:lang(), injections, {})
+
+  local named = {} ---@type TSP.Node[]
+  for _, v in ipairs(nodes) do
+    if v.named then
+      named[#named + 1] = v
+    end
+  end
+
+  local t = {
+    ns = api.nvim_create_namespace(''),
+    nodes = nodes,
+    named = named,
+    opts = {
+      anon = false,
+      lang = false,
+    },
+  }
+
+  setmetatable(t, self)
+  self.__index = self
+  return t
+end
+
+local decor_ns = api.nvim_create_namespace('ts.dev')
+
+---@private
+---@param lnum integer
+---@param col integer
+---@param end_lnum integer
+---@param end_col integer
+---@return string
+local function get_range_str(lnum, col, end_lnum, end_col)
+  if lnum == end_lnum then
+    return string.format('[%d:%d - %d]', lnum + 1, col + 1, end_col)
+  end
+  return string.format('[%d:%d - %d:%d]', lnum + 1, col + 1, end_lnum + 1, end_col)
+end
+
+--- Write the contents of this View into {bufnr}.
+---
+---@param bufnr integer Buffer number to write into.
+---@package
+function TSTreeView:draw(bufnr)
+  vim.bo[bufnr].modifiable = true
+  local lines = {} ---@type string[]
+  local lang_hl_marks = {} ---@type table[]
+
+  for _, item in self:iter() do
+    local range_str = get_range_str(item.lnum, item.col, item.end_lnum, item.end_col)
+    local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
+    local line =
+      string.format('%s%s ; %s%s', string.rep(' ', item.depth), item.text, range_str, lang_str)
+
+    if self.opts.lang then
+      lang_hl_marks[#lang_hl_marks + 1] = {
+        col = #line - #lang_str,
+        end_col = #line,
+      }
+    end
+
+    lines[#lines + 1] = line
+  end
+
+  api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
+
+  api.nvim_buf_clear_namespace(bufnr, decor_ns, 0, -1)
+
+  for i, m in ipairs(lang_hl_marks) do
+    api.nvim_buf_set_extmark(bufnr, decor_ns, i - 1, m.col, {
+      hl_group = 'Title',
+      end_col = m.end_col,
+    })
+  end
+
+  vim.bo[bufnr].modifiable = false
+end
+
+--- Get node {i} from this View.
+---
+--- The node number is dependent on whether or not anonymous nodes are displayed.
+---
+---@param i integer Node number to get
+---@return TSP.Node
+---@package
+function TSTreeView:get(i)
+  local t = self.opts.anon and self.nodes or self.named
+  return t[i]
+end
+
+--- Iterate over all of the nodes in this View.
+---
+---@return (fun(): integer, TSP.Node) Iterator over all nodes in this View
+---@return table
+---@return integer
+---@package
+function TSTreeView:iter()
+  return ipairs(self.opts.anon and self.nodes or self.named)
+end
+
+--- @class InspectTreeOpts
+--- @field lang string? The language of the source buffer. If omitted, the
+---                     filetype of the source buffer is used.
+--- @field bufnr integer? Buffer to draw the tree into. If omitted, a new
+---                       buffer is created.
+--- @field winid integer? Window id to display the tree buffer in. If omitted,
+---                       a new window is created with {command}.
+--- @field command string? Vimscript command to create the window. Default
+---                       value is "60vnew". Only used when {winid} is nil.
+--- @field title (string|fun(bufnr:integer):string|nil) Title of the window. If a
+---                       function, it accepts the buffer number of the source
+---                       buffer as its only argument and should return a string.
+
+--- @private
+---
+--- @param opts InspectTreeOpts
+function M.inspect_tree(opts)
+  vim.validate({
+    opts = { opts, 't', true },
+  })
+
+  opts = opts or {}
+
+  local buf = api.nvim_get_current_buf()
+  local win = api.nvim_get_current_win()
+  local pg = assert(TSTreeView:new(buf, opts.lang))
+
+  -- Close any existing dev window
+  if vim.b[buf].dev then
+    local w = vim.b[buf].dev
+    if api.nvim_win_is_valid(w) then
+      api.nvim_win_close(w, true)
+    end
+  end
+
+  local w = opts.winid
+  if not w then
+    vim.cmd(opts.command or '60vnew')
+    w = api.nvim_get_current_win()
+  end
+
+  local b = opts.bufnr
+  if b then
+    api.nvim_win_set_buf(w, b)
+  else
+    b = api.nvim_win_get_buf(w)
+  end
+
+  vim.b[buf].dev = w
+
+  vim.wo[w].scrolloff = 5
+  vim.wo[w].wrap = false
+  vim.wo[w].foldmethod = 'manual' -- disable folding
+  vim.bo[b].buflisted = false
+  vim.bo[b].buftype = 'nofile'
+  vim.bo[b].bufhidden = 'wipe'
+  vim.b[b].disable_query_linter = true
+  vim.bo[b].filetype = 'query'
+
+  local title --- @type string?
+  local opts_title = opts.title
+  if not opts_title then
+    local bufname = api.nvim_buf_get_name(buf)
+    title = string.format('Syntax tree for %s', vim.fn.fnamemodify(bufname, ':.'))
+  elseif type(opts_title) == 'function' then
+    title = opts_title(buf)
+  end
+
+  assert(type(title) == 'string', 'Window title must be a string')
+  api.nvim_buf_set_name(b, title)
+
+  pg:draw(b)
+
+  api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+  api.nvim_buf_set_keymap(b, 'n', '<CR>', '', {
+    desc = 'Jump to the node under the cursor in the source buffer',
+    callback = function()
+      local row = api.nvim_win_get_cursor(w)[1]
+      local pos = pg:get(row)
+      api.nvim_set_current_win(win)
+      api.nvim_win_set_cursor(win, { pos.lnum + 1, pos.col })
+    end,
+  })
+  api.nvim_buf_set_keymap(b, 'n', 'a', '', {
+    desc = 'Toggle anonymous nodes',
+    callback = function()
+      local row, col = unpack(api.nvim_win_get_cursor(w))
+      local curnode = pg:get(row)
+      while curnode and not curnode.named do
+        row = row - 1
+        curnode = pg:get(row)
+      end
+
+      pg.opts.anon = not pg.opts.anon
+      pg:draw(b)
+
+      if not curnode then
+        return
+      end
+
+      local id = curnode.id
+      for i, node in pg:iter() do
+        if node.id == id then
+          api.nvim_win_set_cursor(w, { i, col })
+          break
+        end
+      end
+    end,
+  })
+  api.nvim_buf_set_keymap(b, 'n', 'I', '', {
+    desc = 'Toggle language display',
+    callback = function()
+      pg.opts.lang = not pg.opts.lang
+      pg:draw(b)
+    end,
+  })
+
+  local group = api.nvim_create_augroup('treesitter/dev', {})
+
+  api.nvim_create_autocmd('CursorMoved', {
+    group = group,
+    buffer = b,
+    callback = function()
+      api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+      local row = api.nvim_win_get_cursor(w)[1]
+      local pos = pg:get(row)
+      api.nvim_buf_set_extmark(buf, pg.ns, pos.lnum, pos.col, {
+        end_row = pos.end_lnum,
+        end_col = math.max(0, pos.end_col),
+        hl_group = 'Visual',
+      })
+
+      local topline, botline = vim.fn.line('w0', win), vim.fn.line('w$', win)
+
+      -- Move the cursor if highlighted range is completely out of view
+      if pos.lnum < topline and pos.end_lnum < topline then
+        api.nvim_win_set_cursor(win, { pos.end_lnum + 1, 0 })
+      elseif pos.lnum > botline and pos.end_lnum > botline then
+        api.nvim_win_set_cursor(win, { pos.lnum + 1, 0 })
+      end
+    end,
+  })
+
+  api.nvim_create_autocmd('CursorMoved', {
+    group = group,
+    buffer = buf,
+    callback = function()
+      if not api.nvim_buf_is_loaded(b) then
+        return true
+      end
+
+      api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
+
+      local cursor_node = vim.treesitter.get_node({
+        bufnr = buf,
+        lang = opts.lang,
+        ignore_injections = false,
+      })
+      if not cursor_node then
+        return
+      end
+
+      local cursor_node_id = cursor_node:id()
+      for i, v in pg:iter() do
+        if v.id == cursor_node_id then
+          local start = v.depth
+          local end_col = start + #v.text
+          api.nvim_buf_set_extmark(b, pg.ns, i - 1, start, {
+            end_col = end_col,
+            hl_group = 'Visual',
+          })
+          api.nvim_win_set_cursor(w, { i, 0 })
+          break
+        end
+      end
+    end,
+  })
+
+  api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave' }, {
+    group = group,
+    buffer = buf,
+    callback = function()
+      if not api.nvim_buf_is_loaded(b) then
+        return true
+      end
+
+      pg = assert(TSTreeView:new(buf, opts.lang))
+      pg:draw(b)
+    end,
+  })
+
+  api.nvim_create_autocmd('BufLeave', {
+    group = group,
+    buffer = b,
+    callback = function()
+      api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+    end,
+  })
+
+  api.nvim_create_autocmd('BufLeave', {
+    group = group,
+    buffer = buf,
+    callback = function()
+      if not api.nvim_buf_is_loaded(b) then
+        return true
+      end
+
+      api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
+    end,
+  })
+
+  api.nvim_create_autocmd('BufHidden', {
+    group = group,
+    buffer = buf,
+    once = true,
+    callback = function()
+      if api.nvim_win_is_valid(w) then
+        api.nvim_win_close(w, true)
+      end
+    end,
+  })
+end
+
+return M
diff --git a/runtime/lua/vim/treesitter/playground.lua b/runtime/lua/vim/treesitter/playground.lua
deleted file mode 100644
index 8293c1bd0a..0000000000
--- a/runtime/lua/vim/treesitter/playground.lua
+++ /dev/null
@@ -1,439 +0,0 @@
-local api = vim.api
-
----@class TSPlaygroundModule
-local M = {}
-
----@class TSPlayground
----@field ns integer API namespace
----@field opts table Options table with the following keys:
----                  - anon (boolean): If true, display anonymous nodes
----                  - lang (boolean): If true, display the language alongside each node
----@field nodes TSP.Node[]
----@field named TSP.Node[]
-local TSPlayground = {}
-
----@class TSP.Node
----@field id integer Node id
----@field text string Node text
----@field named boolean True if this is a named (non-anonymous) node
----@field depth integer Depth of the node within the tree
----@field lnum integer Beginning line number of this node in the source buffer
----@field col integer Beginning column number of this node in the source buffer
----@field end_lnum integer Final line number of this node in the source buffer
----@field end_col integer Final column number of this node in the source buffer
----@field lang string Source language of this node
----@field root TSNode
-
---- Traverse all child nodes starting at {node}.
----
---- This is a recursive function. The {depth} parameter indicates the current recursion level.
---- {lang} is a string indicating the language of the tree currently being traversed. Each traversed
---- node is added to {tree}. When recursion completes, {tree} is an array of all nodes in the order
---- they were visited.
----
---- {injections} is a table mapping node ids from the primary tree to language tree injections. Each
---- injected language has a series of trees nested within the primary language's tree, and the root
---- node of each of these trees is contained within a node in the primary tree. The {injections}
---- table maps nodes in the primary tree to root nodes of injected trees.
----
----@param node TSNode Starting node to begin traversal |tsnode|
----@param depth integer Current recursion depth
----@param lang string Language of the tree currently being traversed
----@param injections table<integer,TSP.Node> Mapping of node ids to root nodes of injected language trees (see
----                        explanation above)
----@param tree TSP.Node[] Output table containing a list of tables each representing a node in the tree
----@private
-local function traverse(node, depth, lang, injections, tree)
-  local injection = injections[node:id()]
-  if injection then
-    traverse(injection.root, depth, injection.lang, injections, tree)
-  end
-
-  for child, field in node:iter_children() do
-    local type = child:type()
-    local lnum, col, end_lnum, end_col = child:range()
-    local named = child:named()
-    local text ---@type string
-    if named then
-      if field then
-        text = string.format('%s: (%s)', field, type)
-      else
-        text = string.format('(%s)', type)
-      end
-    else
-      text = string.format('"%s"', type:gsub('\n', '\\n'))
-    end
-
-    table.insert(tree, {
-      id = child:id(),
-      text = text,
-      named = named,
-      depth = depth,
-      lnum = lnum,
-      col = col,
-      end_lnum = end_lnum,
-      end_col = end_col,
-      lang = lang,
-    })
-
-    traverse(child, depth + 1, lang, injections, tree)
-  end
-
-  return tree
-end
-
---- Create a new Playground object.
----
----@param bufnr integer Source buffer number
----@param lang string|nil Language of source buffer
----
----@return TSPlayground|nil
----@return string|nil Error message, if any
----
----@package
-function TSPlayground:new(bufnr, lang)
-  local ok, parser = pcall(vim.treesitter.get_parser, bufnr or 0, lang)
-  if not ok then
-    return nil, 'No parser available for the given buffer'
-  end
-
-  -- For each child tree (injected language), find the root of the tree and locate the node within
-  -- the primary tree that contains that root. Add a mapping from the node in the primary tree to
-  -- the root in the child tree to the {injections} table.
-  local root = parser:parse()[1]:root()
-  local injections = {} ---@type table<integer,table>
-  parser:for_each_child(function(child, lang_)
-    child:for_each_tree(function(tree)
-      local r = tree:root()
-      local node = root:named_descendant_for_range(r:range())
-      if node then
-        injections[node:id()] = {
-          lang = lang_,
-          root = r,
-        }
-      end
-    end)
-  end)
-
-  local nodes = traverse(root, 0, parser:lang(), injections, {})
-
-  local named = {} ---@type TSP.Node[]
-  for _, v in ipairs(nodes) do
-    if v.named then
-      named[#named + 1] = v
-    end
-  end
-
-  local t = {
-    ns = api.nvim_create_namespace(''),
-    nodes = nodes,
-    named = named,
-    opts = {
-      anon = false,
-      lang = false,
-    },
-  }
-
-  setmetatable(t, self)
-  self.__index = self
-  return t
-end
-
-local decor_ns = api.nvim_create_namespace('ts.playground')
-
----@private
----@param lnum integer
----@param col integer
----@param end_lnum integer
----@param end_col integer
----@return string
-local function get_range_str(lnum, col, end_lnum, end_col)
-  if lnum == end_lnum then
-    return string.format('[%d:%d - %d]', lnum + 1, col + 1, end_col)
-  end
-  return string.format('[%d:%d - %d:%d]', lnum + 1, col + 1, end_lnum + 1, end_col)
-end
-
---- Write the contents of this Playground into {bufnr}.
----
----@param bufnr integer Buffer number to write into.
----@package
-function TSPlayground:draw(bufnr)
-  vim.bo[bufnr].modifiable = true
-  local lines = {} ---@type string[]
-  local lang_hl_marks = {} ---@type table[]
-
-  for _, item in self:iter() do
-    local range_str = get_range_str(item.lnum, item.col, item.end_lnum, item.end_col)
-    local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
-    local line =
-      string.format('%s%s ; %s%s', string.rep(' ', item.depth), item.text, range_str, lang_str)
-
-    if self.opts.lang then
-      lang_hl_marks[#lang_hl_marks + 1] = {
-        col = #line - #lang_str,
-        end_col = #line,
-      }
-    end
-
-    lines[#lines + 1] = line
-  end
-
-  api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
-
-  api.nvim_buf_clear_namespace(bufnr, decor_ns, 0, -1)
-
-  for i, m in ipairs(lang_hl_marks) do
-    api.nvim_buf_set_extmark(bufnr, decor_ns, i - 1, m.col, {
-      hl_group = 'Title',
-      end_col = m.end_col,
-    })
-  end
-
-  vim.bo[bufnr].modifiable = false
-end
-
---- Get node {i} from this Playground object.
----
---- The node number is dependent on whether or not anonymous nodes are displayed.
----
----@param i integer Node number to get
----@return TSP.Node
----@package
-function TSPlayground:get(i)
-  local t = self.opts.anon and self.nodes or self.named
-  return t[i]
-end
-
---- Iterate over all of the nodes in this Playground object.
----
----@return (fun(): integer, TSP.Node) Iterator over all nodes in this Playground
----@return table
----@return integer
----@package
-function TSPlayground:iter()
-  return ipairs(self.opts.anon and self.nodes or self.named)
-end
-
---- @class InspectTreeOpts
---- @field lang string? The language of the source buffer. If omitted, the
----                     filetype of the source buffer is used.
---- @field bufnr integer? Buffer to draw the tree into. If omitted, a new
----                       buffer is created.
---- @field winid integer? Window id to display the tree buffer in. If omitted,
----                       a new window is created with {command}.
---- @field command string? Vimscript command to create the window. Default
----                       value is "60vnew". Only used when {winid} is nil.
---- @field title (string|fun(bufnr:integer):string|nil) Title of the window. If a
----                       function, it accepts the buffer number of the source
----                       buffer as its only argument and should return a string.
-
---- @param opts InspectTreeOpts
-function M.inspect_tree(opts)
-  vim.validate({
-    opts = { opts, 't', true },
-  })
-
-  opts = opts or {}
-
-  local buf = api.nvim_get_current_buf()
-  local win = api.nvim_get_current_win()
-  local pg = assert(TSPlayground:new(buf, opts.lang))
-
-  -- Close any existing playground window
-  if vim.b[buf].playground then
-    local w = vim.b[buf].playground
-    if api.nvim_win_is_valid(w) then
-      api.nvim_win_close(w, true)
-    end
-  end
-
-  local w = opts.winid
-  if not w then
-    vim.cmd(opts.command or '60vnew')
-    w = api.nvim_get_current_win()
-  end
-
-  local b = opts.bufnr
-  if b then
-    api.nvim_win_set_buf(w, b)
-  else
-    b = api.nvim_win_get_buf(w)
-  end
-
-  vim.b[buf].playground = w
-
-  vim.wo[w].scrolloff = 5
-  vim.wo[w].wrap = false
-  vim.wo[w].foldmethod = 'manual' -- disable folding
-  vim.bo[b].buflisted = false
-  vim.bo[b].buftype = 'nofile'
-  vim.bo[b].bufhidden = 'wipe'
-  vim.b[b].disable_query_linter = true
-  vim.bo[b].filetype = 'query'
-
-  local title --- @type string?
-  local opts_title = opts.title
-  if not opts_title then
-    local bufname = api.nvim_buf_get_name(buf)
-    title = string.format('Syntax tree for %s', vim.fn.fnamemodify(bufname, ':.'))
-  elseif type(opts_title) == 'function' then
-    title = opts_title(buf)
-  end
-
-  assert(type(title) == 'string', 'Window title must be a string')
-  api.nvim_buf_set_name(b, title)
-
-  pg:draw(b)
-
-  api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
-  api.nvim_buf_set_keymap(b, 'n', '<CR>', '', {
-    desc = 'Jump to the node under the cursor in the source buffer',
-    callback = function()
-      local row = api.nvim_win_get_cursor(w)[1]
-      local pos = pg:get(row)
-      api.nvim_set_current_win(win)
-      api.nvim_win_set_cursor(win, { pos.lnum + 1, pos.col })
-    end,
-  })
-  api.nvim_buf_set_keymap(b, 'n', 'a', '', {
-    desc = 'Toggle anonymous nodes',
-    callback = function()
-      local row, col = unpack(api.nvim_win_get_cursor(w))
-      local curnode = pg:get(row)
-      while curnode and not curnode.named do
-        row = row - 1
-        curnode = pg:get(row)
-      end
-
-      pg.opts.anon = not pg.opts.anon
-      pg:draw(b)
-
-      if not curnode then
-        return
-      end
-
-      local id = curnode.id
-      for i, node in pg:iter() do
-        if node.id == id then
-          api.nvim_win_set_cursor(w, { i, col })
-          break
-        end
-      end
-    end,
-  })
-  api.nvim_buf_set_keymap(b, 'n', 'I', '', {
-    desc = 'Toggle language display',
-    callback = function()
-      pg.opts.lang = not pg.opts.lang
-      pg:draw(b)
-    end,
-  })
-
-  local group = api.nvim_create_augroup('treesitter/playground', {})
-
-  api.nvim_create_autocmd('CursorMoved', {
-    group = group,
-    buffer = b,
-    callback = function()
-      api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
-      local row = api.nvim_win_get_cursor(w)[1]
-      local pos = pg:get(row)
-      api.nvim_buf_set_extmark(buf, pg.ns, pos.lnum, pos.col, {
-        end_row = pos.end_lnum,
-        end_col = math.max(0, pos.end_col),
-        hl_group = 'Visual',
-      })
-
-      local topline, botline = vim.fn.line('w0', win), vim.fn.line('w$', win)
-
-      -- Move the cursor if highlighted range is completely out of view
-      if pos.lnum < topline and pos.end_lnum < topline then
-        api.nvim_win_set_cursor(win, { pos.end_lnum + 1, 0 })
-      elseif pos.lnum > botline and pos.end_lnum > botline then
-        api.nvim_win_set_cursor(win, { pos.lnum + 1, 0 })
-      end
-    end,
-  })
-
-  api.nvim_create_autocmd('CursorMoved', {
-    group = group,
-    buffer = buf,
-    callback = function()
-      if not api.nvim_buf_is_loaded(b) then
-        return true
-      end
-
-      api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
-
-      local cursor_node = vim.treesitter.get_node({
-        bufnr = buf,
-        lang = opts.lang,
-        ignore_injections = false,
-      })
-      if not cursor_node then
-        return
-      end
-
-      local cursor_node_id = cursor_node:id()
-      for i, v in pg:iter() do
-        if v.id == cursor_node_id then
-          local start = v.depth
-          local end_col = start + #v.text
-          api.nvim_buf_set_extmark(b, pg.ns, i - 1, start, {
-            end_col = end_col,
-            hl_group = 'Visual',
-          })
-          api.nvim_win_set_cursor(w, { i, 0 })
-          break
-        end
-      end
-    end,
-  })
-
-  api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave' }, {
-    group = group,
-    buffer = buf,
-    callback = function()
-      if not api.nvim_buf_is_loaded(b) then
-        return true
-      end
-
-      pg = assert(TSPlayground:new(buf, opts.lang))
-      pg:draw(b)
-    end,
-  })
-
-  api.nvim_create_autocmd('BufLeave', {
-    group = group,
-    buffer = b,
-    callback = function()
-      api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
-    end,
-  })
-
-  api.nvim_create_autocmd('BufLeave', {
-    group = group,
-    buffer = buf,
-    callback = function()
-      if not api.nvim_buf_is_loaded(b) then
-        return true
-      end
-
-      api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
-    end,
-  })
-
-  api.nvim_create_autocmd('BufHidden', {
-    group = group,
-    buffer = buf,
-    once = true,
-    callback = function()
-      if api.nvim_win_is_valid(w) then
-        api.nvim_win_close(w, true)
-      end
-    end,
-  })
-end
-
-return M
-- 
cgit 


From 4382d2ed564b80944345785d780cf1b19fb23ba8 Mon Sep 17 00:00:00 2001
From: Alexandre Teoi <ateoi@users.noreply.github.com>
Date: Tue, 6 Jun 2023 12:42:26 -0300
Subject: feat(health): fold successful healthchecks #22866

Problem:
checkhealth can be noisy, but we don't want to omit info.

Solution:
Fold OK results by default, if 'foldenable' is enabled.
Resolves #22796
---
 runtime/doc/news.txt             |  3 +++
 runtime/ftplugin/checkhealth.vim |  3 +++
 runtime/lua/vim/health.lua       | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 537a737dc8..af5263bcf5 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -106,6 +106,9 @@ The following changes to existing APIs or features add new behavior.
 • `:source` without arguments treats a buffer with its 'filetype' set to "lua"
   as Lua code regardless of its extension.
 
+• |:checkhealth| buffer now implements |folding|. The initial folding status is
+  defined by the 'foldenable' option.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/ftplugin/checkhealth.vim b/runtime/ftplugin/checkhealth.vim
index 62a1970b4a..4b530e6f7c 100644
--- a/runtime/ftplugin/checkhealth.vim
+++ b/runtime/ftplugin/checkhealth.vim
@@ -9,6 +9,9 @@ endif
 runtime! ftplugin/help.vim
 
 setlocal wrap breakindent linebreak
+setlocal foldexpr=getline(v:lnum-1)=~'^=\\{78}$'?'>1':(getline(v:lnum)=~'^=\\{78}'?0:'=')
+setlocal foldmethod=expr
+setlocal foldtext=v:lua.require('vim.health').foldtext()
 let &l:iskeyword='!-~,^*,^|,^",192-255'
 
 if exists("b:undo_ftplugin")
diff --git a/runtime/lua/vim/health.lua b/runtime/lua/vim/health.lua
index ff338b95ea..6e47a22d03 100644
--- a/runtime/lua/vim/health.lua
+++ b/runtime/lua/vim/health.lua
@@ -2,6 +2,40 @@ local M = {}
 
 local s_output = {}
 
+-- Returns the fold text of the current healthcheck section
+function M.foldtext()
+  local foldtext = vim.fn.foldtext()
+
+  if vim.bo.filetype ~= 'checkhealth' then
+    return foldtext
+  end
+
+  if vim.b.failedchecks == nil then
+    vim.b.failedchecks = vim.empty_dict()
+  end
+
+  if vim.b.failedchecks[foldtext] == nil then
+    local warning = '- WARNING '
+    local warninglen = string.len(warning)
+    local err = '- ERROR '
+    local errlen = string.len(err)
+    local failedchecks = vim.b.failedchecks
+    failedchecks[foldtext] = false
+
+    local foldcontent = vim.api.nvim_buf_get_lines(0, vim.v.foldstart - 1, vim.v.foldend, false)
+    for _, line in ipairs(foldcontent) do
+      if string.sub(line, 1, warninglen) == warning or string.sub(line, 1, errlen) == err then
+        failedchecks[foldtext] = true
+        break
+      end
+    end
+
+    vim.b.failedchecks = failedchecks
+  end
+
+  return vim.b.failedchecks[foldtext] and '+WE' .. foldtext:sub(4) or foldtext
+end
+
 -- From a path return a list [{name}, {func}, {type}] representing a healthcheck
 local function filepath_to_healthcheck(path)
   path = vim.fs.normalize(path)
-- 
cgit 


From fcfe535e9877cfdc824dc78f2d19e590400d34cd Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Tue, 6 Jun 2023 11:26:29 -0500
Subject: refactor(defaults): do not use C specific default values for options
 (#22500)

The options 'path', 'include', and 'define' all use C-specific default
values. This may have made sense a long time ago when Vim was mostly
used just for writing C, but this is no longer the case, and we have
ample support for filetype specific configuration. Make the default
values of these options empty and move the C-specific values into a
filetype plugin where they belong.

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 runtime/doc/options.txt  | 19 ++++++++-----------
 runtime/doc/vim_diff.txt |  3 +++
 runtime/ftplugin/c.lua   | 13 +++++++++++++
 3 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4f5f2e8b80..7729ec5d38 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1396,8 +1396,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'commentstring' 'cms'	string	(default "")
 			local to buffer
 	A template for a comment.  The "%s" in the value is replaced with the
-	comment text.  Currently only used to add markers for folding, see
-	|fold-marker|.
+	comment text.  For example, C uses "/*%s*/". Currently only used to
+	add markers for folding, see |fold-marker|.
 
 						*'complete'* *'cpt'* *E535*
 'complete' 'cpt'	string	(default: ".,w,b,u,t")
@@ -1861,7 +1861,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'indentexpr'.
 
 						*'define'* *'def'*
-'define' 'def'		string	(default "^\s*#\s*define")
+'define' 'def'		string	(default "")
 			global or local to buffer |global-local|
 	Pattern to be used to find a macro definition.  It is a search
 	pattern, just like for the "/" command.  This option is used for the
@@ -1870,8 +1870,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		{match with 'define'}{non-ID chars}{defined name}{non-ID char}
 	See |option-backslash| about inserting backslashes to include a space
 	or backslash.
-	The default value is for C programs.  For C++ this value would be
-	useful, to include const type declarations: >
+	For C++ this value would be useful, to include const type declarations: >
 		^\(#\s*define\|[a-z]*\s*const\s*[a-z]*\)
 <	You can also use "\ze" just before the name and continue the pattern
 	to check what is following.  E.g. for Javascript, if a function is
@@ -3309,12 +3308,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|Command-line-mode| is done.
 
 						*'include'* *'inc'*
-'include' 'inc'		string	(default "^\s*#\s*include")
+'include' 'inc'		string	(default "")
 			global or local to buffer |global-local|
 	Pattern to be used to find an include command.  It is a search
-	pattern, just like for the "/" command (See |pattern|).  The default
-	value is for C programs.  This option is used for the commands "[i",
-	"]I", "[d", etc.
+	pattern, just like for the "/" command (See |pattern|).  This option
+	is used for the commands "[i", "]I", "[d", etc.
 	Normally the 'isfname' option is used to recognize the file name that
 	comes after the matched pattern.  But if "\zs" appears in the pattern
 	then the text matched from "\zs" to the end, or until "\ze" if it
@@ -4489,8 +4487,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Only normal file name characters can be used, "/\*?[|<>" are illegal.
 
 				*'path'* *'pa'* *E343* *E345* *E347* *E854*
-'path' 'pa'		string	(default on Unix: ".,/usr/include,,"
-				   other systems: ".,,")
+'path' 'pa'		string	(default: ".,,")
 			global or local to buffer |global-local|
 	This is a list of directories which will be searched when using the
 	|gf|, [f, ]f, ^Wf, |:find|, |:sfind|, |:tabfind| and other commands,
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 102f867fbd..2c7ca487e6 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -37,6 +37,7 @@ Defaults					            *nvim-defaults*
 - 'commentstring' defaults to ""
 - 'compatible' is always disabled
 - 'complete' excludes "i"
+- 'define' defaults to "". The C ftplugin sets it to "^\\s*#\\s*define"
 - 'directory' defaults to ~/.local/state/nvim/swap// (|xdg|), auto-created
 - 'display' defaults to "lastline"
 - 'encoding' is UTF-8 (cf. 'fileencoding' for file-content encoding)
@@ -46,6 +47,7 @@ Defaults					            *nvim-defaults*
 - 'hidden' is enabled
 - 'history' defaults to 10000 (the maximum)
 - 'hlsearch' is enabled
+- 'include' defaults to "". The C ftplugin sets it to "^\\s*#\\s*include"
 - 'incsearch' is enabled
 - 'joinspaces' is disabled
 - 'langnoremap' is enabled
@@ -55,6 +57,7 @@ Defaults					            *nvim-defaults*
 - 'mouse' defaults to "nvi"
 - 'mousemodel' defaults to "popup_setpos"
 - 'nrformats' defaults to "bin,hex"
+- 'path' defaults to ".,,". The C ftplugin adds "/usr/include" if it exists.
 - 'ruler' is enabled
 - 'sessionoptions' includes "unix,slash", excludes "options"
 - 'shortmess' includes "CF", excludes "S"
diff --git a/runtime/ftplugin/c.lua b/runtime/ftplugin/c.lua
index b4e68148f5..0ddbf09470 100644
--- a/runtime/ftplugin/c.lua
+++ b/runtime/ftplugin/c.lua
@@ -1 +1,14 @@
+-- These are the default option values in Vim, but not in Nvim, so must be set explicitly.
 vim.bo.commentstring = '/*%s*/'
+vim.bo.define = '^\\s*#\\s*define'
+vim.bo.include = '^\\s*#\\s*include'
+
+if vim.fn.isdirectory('/usr/include') == 1 then
+  vim.cmd([[
+    setlocal path^=/usr/include
+    setlocal path-=.
+    setlocal path^=.
+  ]])
+end
+
+vim.b.undo_ftplugin = vim.b.undo_ftplugin .. '|setl path<'
-- 
cgit 


From 5f4895200a49d92e636dea9c5474ab5b0882384d Mon Sep 17 00:00:00 2001
From: max397574 <81827001+max397574@users.noreply.github.com>
Date: Wed, 7 Jun 2023 13:32:39 +0200
Subject: feat(scripts): add lsp_types.lua (#23750)

---
 runtime/lua/vim/lsp/types/protocol.lua | 4398 ++++++++++++++++++++++++++++++++
 1 file changed, 4398 insertions(+)
 create mode 100644 runtime/lua/vim/lsp/types/protocol.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/types/protocol.lua b/runtime/lua/vim/lsp/types/protocol.lua
new file mode 100644
index 0000000000..4b6660eb51
--- /dev/null
+++ b/runtime/lua/vim/lsp/types/protocol.lua
@@ -0,0 +1,4398 @@
+--[[
+This file is autogenerated from scripts/lsp_types.lua
+Regenerate:
+nvim -l scripts/lsp_types.lua gen --runtime/lua/vim/lsp/types/protocol.lua
+--]]
+
+---@alias lsp.null nil
+---@alias uinteger integer
+---@alias lsp.decimal number
+---@alias lsp.DocumentUri string
+---@alias lsp.URI string
+---@alias lsp.LSPObject table<string, lsp.LSPAny>
+---@alias lsp.LSPArray lsp.LSPAny[]
+---@alias lsp.LSPAny lsp.LSPObject|lsp.LSPArray|string|number|boolean|nil
+
+---@class lsp.ImplementationParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---Represents a location inside a resource, such as a line
+---inside a text file.
+---@class lsp.Location
+---@field uri lsp.DocumentUri
+---@field range lsp.Range
+
+---@class lsp.ImplementationRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.TypeDefinitionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---@class lsp.TypeDefinitionRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---A workspace folder inside a client.
+---@class lsp.WorkspaceFolder
+---The associated URI for this workspace folder.
+---@field uri lsp.URI
+---The name of the workspace folder. Used to refer to this
+---workspace folder in the user interface.
+---@field name string
+
+---The parameters of a `workspace/didChangeWorkspaceFolders` notification.
+---@class lsp.DidChangeWorkspaceFoldersParams
+---The actual workspace folder change event.
+---@field event lsp.WorkspaceFoldersChangeEvent
+
+---The parameters of a configuration request.
+---@class lsp.ConfigurationParams
+---@field items lsp.ConfigurationItem[]
+
+---Parameters for a {@link DocumentColorRequest}.
+---@class lsp.DocumentColorParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---Represents a color range from a document.
+---@class lsp.ColorInformation
+---The range in the document where this color appears.
+---@field range lsp.Range
+---The actual color value for this color range.
+---@field color lsp.Color
+
+---@class lsp.DocumentColorRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---Parameters for a {@link ColorPresentationRequest}.
+---@class lsp.ColorPresentationParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The color to request presentations for.
+---@field color lsp.Color
+---The range where the color would be inserted. Serves as a context.
+---@field range lsp.Range
+
+---@class lsp.ColorPresentation
+---The label of this color presentation. It will be shown on the color
+---picker header. By default this is also the text that is inserted when selecting
+---this color presentation.
+---@field label string
+---An {@link TextEdit edit} which is applied to a document when selecting
+---this presentation for the color.  When `falsy` the {@link ColorPresentation.label label}
+---is used.
+---@field textEdit? lsp.TextEdit
+---An optional array of additional {@link TextEdit text edits} that are applied when
+---selecting this color presentation. Edits must not overlap with the main {@link ColorPresentation.textEdit edit} nor with themselves.
+---@field additionalTextEdits? lsp.TextEdit[]
+
+---@class lsp.WorkDoneProgressOptions
+---@field workDoneProgress? boolean
+
+---General text document registration options.
+---@class lsp.TextDocumentRegistrationOptions
+---A document selector to identify the scope of the registration. If set to null
+---the document selector provided on the client side will be used.
+---@field documentSelector lsp.DocumentSelector|lsp.null
+
+---Parameters for a {@link FoldingRangeRequest}.
+---@class lsp.FoldingRangeParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---Represents a folding range. To be valid, start and end line must be bigger than zero and smaller
+---than the number of lines in the document. Clients are free to ignore invalid ranges.
+---@class lsp.FoldingRange
+---The zero-based start line of the range to fold. The folded area starts after the line's last character.
+---To be valid, the end must be zero or larger and smaller than the number of lines in the document.
+---@field startLine uinteger
+---The zero-based character offset from where the folded range starts. If not defined, defaults to the length of the start line.
+---@field startCharacter? uinteger
+---The zero-based end line of the range to fold. The folded area ends with the line's last character.
+---To be valid, the end must be zero or larger and smaller than the number of lines in the document.
+---@field endLine uinteger
+---The zero-based character offset before the folded range ends. If not defined, defaults to the length of the end line.
+---@field endCharacter? uinteger
+---Describes the kind of the folding range such as `comment' or 'region'. The kind
+---is used to categorize folding ranges and used by commands like 'Fold all comments'.
+---See {@link FoldingRangeKind} for an enumeration of standardized kinds.
+---@field kind? lsp.FoldingRangeKind
+---The text that the client should show when the specified range is
+---collapsed. If not defined or not supported by the client, a default
+---will be chosen by the client.
+---
+---@since 3.17.0
+---@field collapsedText? string
+
+---@class lsp.FoldingRangeRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.DeclarationParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---@class lsp.DeclarationRegistrationOptions: lsp.DeclarationOptions, lsp.StaticRegistrationOptions
+
+---A parameter literal used in selection range requests.
+---@class lsp.SelectionRangeParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The positions inside the text document.
+---@field positions lsp.Position[]
+
+---A selection range represents a part of a selection hierarchy. A selection range
+---may have a parent selection range that contains it.
+---@class lsp.SelectionRange
+---The {@link Range range} of this selection range.
+---@field range lsp.Range
+---The parent selection range containing this range. Therefore `parent.range` must contain `this.range`.
+---@field parent? lsp.SelectionRange
+
+---@class lsp.SelectionRangeRegistrationOptions: lsp.SelectionRangeOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.WorkDoneProgressCreateParams
+---The token to be used to report progress.
+---@field token lsp.ProgressToken
+
+---@class lsp.WorkDoneProgressCancelParams
+---The token to be used to report progress.
+---@field token lsp.ProgressToken
+
+---The parameter of a `textDocument/prepareCallHierarchy` request.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyPrepareParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---Represents programming constructs like functions or constructors in the context
+---of call hierarchy.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyItem
+---The name of this item.
+---@field name string
+---The kind of this item.
+---@field kind lsp.SymbolKind
+---Tags for this item.
+---@field tags? lsp.SymbolTag[]
+---More detail for this item, e.g. the signature of a function.
+---@field detail? string
+---The resource identifier of this item.
+---@field uri lsp.DocumentUri
+---The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g. comments and code.
+---@field range lsp.Range
+---The range that should be selected and revealed when this symbol is being picked, e.g. the name of a function.
+---Must be contained by the {@link CallHierarchyItem.range `range`}.
+---@field selectionRange lsp.Range
+---A data entry field that is preserved between a call hierarchy prepare and
+---incoming calls or outgoing calls requests.
+---@field data? lsp.LSPAny
+
+---Call hierarchy options used during static or dynamic registration.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---The parameter of a `callHierarchy/incomingCalls` request.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyIncomingCallsParams
+---@field item lsp.CallHierarchyItem
+
+---Represents an incoming call, e.g. a caller of a method or constructor.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyIncomingCall
+---The item that makes the call.
+---@field from lsp.CallHierarchyItem
+---The ranges at which the calls appear. This is relative to the caller
+---denoted by {@link CallHierarchyIncomingCall.from `this.from`}.
+---@field fromRanges lsp.Range[]
+
+---The parameter of a `callHierarchy/outgoingCalls` request.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyOutgoingCallsParams
+---@field item lsp.CallHierarchyItem
+
+---Represents an outgoing call, e.g. calling a getter from a method or a method from a constructor etc.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyOutgoingCall
+---The item that is called.
+---@field to lsp.CallHierarchyItem
+---The range at which this item is called. This is the range relative to the caller, e.g the item
+---passed to {@link CallHierarchyItemProvider.provideCallHierarchyOutgoingCalls `provideCallHierarchyOutgoingCalls`}
+---and not {@link CallHierarchyOutgoingCall.to `this.to`}.
+---@field fromRanges lsp.Range[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---@since 3.16.0
+---@class lsp.SemanticTokens
+---An optional result id. If provided and clients support delta updating
+---the client will include the result id in the next semantic token request.
+---A server can then instead of computing all semantic tokens again simply
+---send a delta.
+---@field resultId? string
+---The actual tokens.
+---@field data uinteger[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensPartialResult
+---@field data uinteger[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---@since 3.16.0
+---@class lsp.SemanticTokensDeltaParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The result id of a previous response. The result Id can either point to a full response
+---or a delta response depending on what was received last.
+---@field previousResultId string
+
+---@since 3.16.0
+---@class lsp.SemanticTokensDelta
+---@field resultId? string
+---The semantic token edits to transform a previous result into a new result.
+---@field edits lsp.SemanticTokensEdit[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensDeltaPartialResult
+---@field edits lsp.SemanticTokensEdit[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensRangeParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The range the semantic tokens are requested for.
+---@field range lsp.Range
+
+---Params to show a resource in the UI.
+---
+---@since 3.16.0
+---@class lsp.ShowDocumentParams
+---The uri to show.
+---@field uri lsp.URI
+---Indicates to show the resource in an external program.
+---To show, for example, `https://code.visualstudio.com/`
+---in the default WEB browser set `external` to `true`.
+---@field external? boolean
+---An optional property to indicate whether the editor
+---showing the document should take focus or not.
+---Clients might ignore this property if an external
+---program is started.
+---@field takeFocus? boolean
+---An optional selection range if the document is a text
+---document. Clients might ignore the property if an
+---external program is started or the file is not a text
+---file.
+---@field selection? lsp.Range
+
+---The result of a showDocument request.
+---
+---@since 3.16.0
+---@class lsp.ShowDocumentResult
+---A boolean indicating if the show was successful.
+---@field success boolean
+
+---@class lsp.LinkedEditingRangeParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---The result of a linked editing range request.
+---
+---@since 3.16.0
+---@class lsp.LinkedEditingRanges
+---A list of ranges that can be edited together. The ranges must have
+---identical length and contain identical text content. The ranges cannot overlap.
+---@field ranges lsp.Range[]
+---An optional word pattern (regular expression) that describes valid contents for
+---the given ranges. If no pattern is provided, the client configuration's word
+---pattern will be used.
+---@field wordPattern? string
+
+---@class lsp.LinkedEditingRangeRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---The parameters sent in notifications/requests for user-initiated creation of
+---files.
+---
+---@since 3.16.0
+---@class lsp.CreateFilesParams
+---An array of all files/folders created in this operation.
+---@field files lsp.FileCreate[]
+
+---A workspace edit represents changes to many resources managed in the workspace. The edit
+---should either provide `changes` or `documentChanges`. If documentChanges are present
+---they are preferred over `changes` if the client can handle versioned document edits.
+---
+---Since version 3.13.0 a workspace edit can contain resource operations as well. If resource
+---operations are present clients need to execute the operations in the order in which they
+---are provided. So a workspace edit for example can consist of the following two changes:
+---(1) a create file a.txt and (2) a text document edit which insert text into file a.txt.
+---
+---An invalid sequence (e.g. (1) delete file a.txt and (2) insert text into file a.txt) will
+---cause failure of the operation. How the client recovers from the failure is described by
+---the client capability: `workspace.workspaceEdit.failureHandling`
+---@class lsp.WorkspaceEdit
+---Holds changes to existing resources.
+---@field changes? table<lsp.DocumentUri, lsp.TextEdit[]>
+---Depending on the client capability `workspace.workspaceEdit.resourceOperations` document changes
+---are either an array of `TextDocumentEdit`s to express changes to n different text documents
+---where each text document edit addresses a specific version of a text document. Or it can contain
+---above `TextDocumentEdit`s mixed with create, rename and delete file / folder operations.
+---
+---Whether a client supports versioned document edits is expressed via
+---`workspace.workspaceEdit.documentChanges` client capability.
+---
+---If a client neither supports `documentChanges` nor `workspace.workspaceEdit.resourceOperations` then
+---only plain `TextEdit`s using the `changes` property are supported.
+---@field documentChanges? lsp.TextDocumentEdit|lsp.CreateFile|lsp.RenameFile|lsp.DeleteFile[]
+---A map of change annotations that can be referenced in `AnnotatedTextEdit`s or create, rename and
+---delete file / folder operations.
+---
+---Whether clients honor this property depends on the client capability `workspace.changeAnnotationSupport`.
+---
+---@since 3.16.0
+---@field changeAnnotations? table<lsp.ChangeAnnotationIdentifier, lsp.ChangeAnnotation>
+
+---The options to register for file operations.
+---
+---@since 3.16.0
+---@class lsp.FileOperationRegistrationOptions
+---The actual filters.
+---@field filters lsp.FileOperationFilter[]
+
+---The parameters sent in notifications/requests for user-initiated renames of
+---files.
+---
+---@since 3.16.0
+---@class lsp.RenameFilesParams
+---An array of all files/folders renamed in this operation. When a folder is renamed, only
+---the folder will be included, and not its children.
+---@field files lsp.FileRename[]
+
+---The parameters sent in notifications/requests for user-initiated deletes of
+---files.
+---
+---@since 3.16.0
+---@class lsp.DeleteFilesParams
+---An array of all files/folders deleted in this operation.
+---@field files lsp.FileDelete[]
+
+---@class lsp.MonikerParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---Moniker definition to match LSIF 0.5 moniker definition.
+---
+---@since 3.16.0
+---@class lsp.Moniker
+---The scheme of the moniker. For example tsc or .Net
+---@field scheme string
+---The identifier of the moniker. The value is opaque in LSIF however
+---schema owners are allowed to define the structure if they want.
+---@field identifier string
+---The scope in which the moniker is unique
+---@field unique lsp.UniquenessLevel
+---The moniker kind if known.
+---@field kind? lsp.MonikerKind
+
+---@class lsp.MonikerRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameter of a `textDocument/prepareTypeHierarchy` request.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchyPrepareParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---@since 3.17.0
+---@class lsp.TypeHierarchyItem
+---The name of this item.
+---@field name string
+---The kind of this item.
+---@field kind lsp.SymbolKind
+---Tags for this item.
+---@field tags? lsp.SymbolTag[]
+---More detail for this item, e.g. the signature of a function.
+---@field detail? string
+---The resource identifier of this item.
+---@field uri lsp.DocumentUri
+---The range enclosing this symbol not including leading/trailing whitespace
+---but everything else, e.g. comments and code.
+---@field range lsp.Range
+---The range that should be selected and revealed when this symbol is being
+---picked, e.g. the name of a function. Must be contained by the
+---{@link TypeHierarchyItem.range `range`}.
+---@field selectionRange lsp.Range
+---A data entry field that is preserved between a type hierarchy prepare and
+---supertypes or subtypes requests. It could also be used to identify the
+---type hierarchy in the server, helping improve the performance on
+---resolving supertypes and subtypes.
+---@field data? lsp.LSPAny
+
+---Type hierarchy options used during static or dynamic registration.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchyRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---The parameter of a `typeHierarchy/supertypes` request.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchySupertypesParams
+---@field item lsp.TypeHierarchyItem
+
+---The parameter of a `typeHierarchy/subtypes` request.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchySubtypesParams
+---@field item lsp.TypeHierarchyItem
+
+---A parameter literal used in inline value requests.
+---
+---@since 3.17.0
+---@class lsp.InlineValueParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The document range for which inline values should be computed.
+---@field range lsp.Range
+---Additional information about the context in which inline values were
+---requested.
+---@field context lsp.InlineValueContext
+
+---Inline value options used during static or dynamic registration.
+---
+---@since 3.17.0
+---@class lsp.InlineValueRegistrationOptions: lsp.InlineValueOptions, lsp.StaticRegistrationOptions
+
+---A parameter literal used in inlay hint requests.
+---
+---@since 3.17.0
+---@class lsp.InlayHintParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The document range for which inlay hints should be computed.
+---@field range lsp.Range
+
+---Inlay hint information.
+---
+---@since 3.17.0
+---@class lsp.InlayHint
+---The position of this hint.
+---@field position lsp.Position
+---The label of this hint. A human readable string or an array of
+---InlayHintLabelPart label parts.
+---
+---*Note* that neither the string nor the label part can be empty.
+---@field label string|lsp.InlayHintLabelPart[]
+---The kind of this hint. Can be omitted in which case the client
+---should fall back to a reasonable default.
+---@field kind? lsp.InlayHintKind
+---Optional text edits that are performed when accepting this inlay hint.
+---
+---*Note* that edits are expected to change the document so that the inlay
+---hint (or its nearest variant) is now part of the document and the inlay
+---hint itself is now obsolete.
+---@field textEdits? lsp.TextEdit[]
+---The tooltip text when you hover over this item.
+---@field tooltip? string|lsp.MarkupContent
+---Render padding before the hint.
+---
+---Note: Padding should use the editor's background color, not the
+---background color of the hint itself. That means padding can be used
+---to visually align/separate an inlay hint.
+---@field paddingLeft? boolean
+---Render padding after the hint.
+---
+---Note: Padding should use the editor's background color, not the
+---background color of the hint itself. That means padding can be used
+---to visually align/separate an inlay hint.
+---@field paddingRight? boolean
+---A data entry field that is preserved on an inlay hint between
+---a `textDocument/inlayHint` and a `inlayHint/resolve` request.
+---@field data? lsp.LSPAny
+
+---Inlay hint options used during static or dynamic registration.
+---
+---@since 3.17.0
+---@class lsp.InlayHintRegistrationOptions: lsp.InlayHintOptions, lsp.StaticRegistrationOptions
+
+---Parameters of the document diagnostic request.
+---
+---@since 3.17.0
+---@class lsp.DocumentDiagnosticParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The additional identifier  provided during registration.
+---@field identifier? string
+---The result id of a previous response if provided.
+---@field previousResultId? string
+
+---A partial result for a document diagnostic report.
+---
+---@since 3.17.0
+---@class lsp.DocumentDiagnosticReportPartialResult
+---@field relatedDocuments table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
+
+---Cancellation data returned from a diagnostic request.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticServerCancellationData
+---@field retriggerRequest boolean
+
+---Diagnostic registration options.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---Parameters of the workspace diagnostic request.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceDiagnosticParams
+---The additional identifier provided during registration.
+---@field identifier? string
+---The currently known diagnostic reports with their
+---previous result ids.
+---@field previousResultIds lsp.PreviousResultId[]
+
+---A workspace diagnostic report.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceDiagnosticReport
+---@field items lsp.WorkspaceDocumentDiagnosticReport[]
+
+---A partial result for a workspace diagnostic report.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceDiagnosticReportPartialResult
+---@field items lsp.WorkspaceDocumentDiagnosticReport[]
+
+---The params sent in an open notebook document notification.
+---
+---@since 3.17.0
+---@class lsp.DidOpenNotebookDocumentParams
+---The notebook document that got opened.
+---@field notebookDocument lsp.NotebookDocument
+---The text documents that represent the content
+---of a notebook cell.
+---@field cellTextDocuments lsp.TextDocumentItem[]
+
+---The params sent in a change notebook document notification.
+---
+---@since 3.17.0
+---@class lsp.DidChangeNotebookDocumentParams
+---The notebook document that did change. The version number points
+---to the version after all provided changes have been applied. If
+---only the text document content of a cell changes the notebook version
+---doesn't necessarily have to change.
+---@field notebookDocument lsp.VersionedNotebookDocumentIdentifier
+---The actual changes to the notebook document.
+---
+---The changes describe single state changes to the notebook document.
+---So if there are two changes c1 (at array index 0) and c2 (at array
+---index 1) for a notebook in state S then c1 moves the notebook from
+---S to S' and c2 from S' to S''. So c1 is computed on the state S and
+---c2 is computed on the state S'.
+---
+---To mirror the content of a notebook using change events use the following approach:
+---- start with the same initial content
+---- apply the 'notebookDocument/didChange' notifications in the order you receive them.
+---- apply the `NotebookChangeEvent`s in a single notification in the order
+---  you receive them.
+---@field change lsp.NotebookDocumentChangeEvent
+
+---The params sent in a save notebook document notification.
+---
+---@since 3.17.0
+---@class lsp.DidSaveNotebookDocumentParams
+---The notebook document that got saved.
+---@field notebookDocument lsp.NotebookDocumentIdentifier
+
+---The params sent in a close notebook document notification.
+---
+---@since 3.17.0
+---@class lsp.DidCloseNotebookDocumentParams
+---The notebook document that got closed.
+---@field notebookDocument lsp.NotebookDocumentIdentifier
+---The text documents that represent the content
+---of a notebook cell that got closed.
+---@field cellTextDocuments lsp.TextDocumentIdentifier[]
+
+---A parameter literal used in inline completion requests.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.InlineCompletionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+---Additional information about the context in which inline completions were
+---requested.
+---@field context lsp.InlineCompletionContext
+
+---Represents a collection of {@link InlineCompletionItem inline completion items} to be presented in the editor.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.InlineCompletionList
+---The inline completion items
+---@field items lsp.InlineCompletionItem[]
+
+---An inline completion item represents a text snippet that is proposed inline to complete text that is being typed.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.InlineCompletionItem
+---The text to replace the range with. Must be set.
+---@field insertText string|lsp.StringValue
+---A text that is used to decide if this inline completion should be shown. When `falsy` the {@link InlineCompletionItem.insertText} is used.
+---@field filterText? string
+---The range to replace. Must begin and end on the same line.
+---@field range? lsp.Range
+---An optional {@link Command} that is executed *after* inserting this completion.
+---@field command? lsp.Command
+
+---Inline completion options used during static or dynamic registration.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.InlineCompletionRegistrationOptions: lsp.InlineCompletionOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.RegistrationParams
+---@field registrations lsp.Registration[]
+
+---@class lsp.UnregistrationParams
+---@field unregisterations lsp.Unregistration[]
+
+---@class lsp.InitializeParams: lsp._InitializeParams
+
+---The result returned from an initialize request.
+---@class lsp.InitializeResult
+---The capabilities the language server provides.
+---@field capabilities lsp.ServerCapabilities
+---Information about the server.
+---
+---@since 3.15.0
+---@field serverInfo? anonym1
+
+---The data type of the ResponseError if the
+---initialize request fails.
+---@class lsp.InitializeError
+---Indicates whether the client execute the following retry logic:
+---(1) show the message provided by the ResponseError to the user
+---(2) user selects retry or cancel
+---(3) if user selected retry the initialize method is sent again.
+---@field retry boolean
+
+---@class lsp.InitializedParams
+
+---The parameters of a change configuration notification.
+---@class lsp.DidChangeConfigurationParams
+---The actual changed settings
+---@field settings lsp.LSPAny
+
+---@class lsp.DidChangeConfigurationRegistrationOptions
+---@field section? string|string[]
+
+---The parameters of a notification message.
+---@class lsp.ShowMessageParams
+---The message type. See {@link MessageType}
+---@field type lsp.MessageType
+---The actual message.
+---@field message string
+
+---@class lsp.ShowMessageRequestParams
+---The message type. See {@link MessageType}
+---@field type lsp.MessageType
+---The actual message.
+---@field message string
+---The message action items to present.
+---@field actions? lsp.MessageActionItem[]
+
+---@class lsp.MessageActionItem
+---A short title like 'Retry', 'Open Log' etc.
+---@field title string
+
+---The log message parameters.
+---@class lsp.LogMessageParams
+---The message type. See {@link MessageType}
+---@field type lsp.MessageType
+---The actual message.
+---@field message string
+
+---The parameters sent in an open text document notification
+---@class lsp.DidOpenTextDocumentParams
+---The document that was opened.
+---@field textDocument lsp.TextDocumentItem
+
+---The change text document notification's parameters.
+---@class lsp.DidChangeTextDocumentParams
+---The document that did change. The version number points
+---to the version after all provided content changes have
+---been applied.
+---@field textDocument lsp.VersionedTextDocumentIdentifier
+---The actual content changes. The content changes describe single state changes
+---to the document. So if there are two content changes c1 (at array index 0) and
+---c2 (at array index 1) for a document in state S then c1 moves the document from
+---S to S' and c2 from S' to S''. So c1 is computed on the state S and c2 is computed
+---on the state S'.
+---
+---To mirror the content of a document using change events use the following approach:
+---- start with the same initial content
+---- apply the 'textDocument/didChange' notifications in the order you receive them.
+---- apply the `TextDocumentContentChangeEvent`s in a single notification in the order
+---  you receive them.
+---@field contentChanges lsp.TextDocumentContentChangeEvent[]
+
+---Describe options to be used when registered for text document change events.
+---@class lsp.TextDocumentChangeRegistrationOptions: lsp.TextDocumentRegistrationOptions
+---How documents are synced to the server.
+---@field syncKind lsp.TextDocumentSyncKind
+
+---The parameters sent in a close text document notification
+---@class lsp.DidCloseTextDocumentParams
+---The document that was closed.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---The parameters sent in a save text document notification
+---@class lsp.DidSaveTextDocumentParams
+---The document that was saved.
+---@field textDocument lsp.TextDocumentIdentifier
+---Optional the content when saved. Depends on the includeText value
+---when the save notification was requested.
+---@field text? string
+
+---Save registration options.
+---@class lsp.TextDocumentSaveRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters sent in a will save text document notification.
+---@class lsp.WillSaveTextDocumentParams
+---The document that will be saved.
+---@field textDocument lsp.TextDocumentIdentifier
+---The 'TextDocumentSaveReason'.
+---@field reason lsp.TextDocumentSaveReason
+
+---A text edit applicable to a text document.
+---@class lsp.TextEdit
+---The range of the text document to be manipulated. To insert
+---text into a document create a range where start === end.
+---@field range lsp.Range
+---The string to be inserted. For delete operations use an
+---empty string.
+---@field newText string
+
+---The watched files change notification's parameters.
+---@class lsp.DidChangeWatchedFilesParams
+---The actual file events.
+---@field changes lsp.FileEvent[]
+
+---Describe options to be used when registered for text document change events.
+---@class lsp.DidChangeWatchedFilesRegistrationOptions
+---The watchers to register.
+---@field watchers lsp.FileSystemWatcher[]
+
+---The publish diagnostic notification's parameters.
+---@class lsp.PublishDiagnosticsParams
+---The URI for which diagnostic information is reported.
+---@field uri lsp.DocumentUri
+---Optional the version number of the document the diagnostics are published for.
+---
+---@since 3.15.0
+---@field version? integer
+---An array of diagnostic information items.
+---@field diagnostics lsp.Diagnostic[]
+
+---Completion parameters
+---@class lsp.CompletionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+---The completion context. This is only available it the client specifies
+---to send this using the client capability `textDocument.completion.contextSupport === true`
+---@field context? lsp.CompletionContext
+
+---A completion item represents a text snippet that is
+---proposed to complete text that is being typed.
+---@class lsp.CompletionItem
+---The label of this completion item.
+---
+---The label property is also by default the text that
+---is inserted when selecting this completion.
+---
+---If label details are provided the label itself should
+---be an unqualified name of the completion item.
+---@field label string
+---Additional details for the label
+---
+---@since 3.17.0
+---@field labelDetails? lsp.CompletionItemLabelDetails
+---The kind of this completion item. Based of the kind
+---an icon is chosen by the editor.
+---@field kind? lsp.CompletionItemKind
+---Tags for this completion item.
+---
+---@since 3.15.0
+---@field tags? lsp.CompletionItemTag[]
+---A human-readable string with additional information
+---about this item, like type or symbol information.
+---@field detail? string
+---A human-readable string that represents a doc-comment.
+---@field documentation? string|lsp.MarkupContent
+---Indicates if this item is deprecated.
+---@deprecated Use `tags` instead.
+---@field deprecated? boolean
+---Select this item when showing.
+---
+---*Note* that only one completion item can be selected and that the
+---tool / client decides which item that is. The rule is that the *first*
+---item of those that match best is selected.
+---@field preselect? boolean
+---A string that should be used when comparing this item
+---with other items. When `falsy` the {@link CompletionItem.label label}
+---is used.
+---@field sortText? string
+---A string that should be used when filtering a set of
+---completion items. When `falsy` the {@link CompletionItem.label label}
+---is used.
+---@field filterText? string
+---A string that should be inserted into a document when selecting
+---this completion. When `falsy` the {@link CompletionItem.label label}
+---is used.
+---
+---The `insertText` is subject to interpretation by the client side.
+---Some tools might not take the string literally. For example
+---VS Code when code complete is requested in this example
+---`con<cursor position>` and a completion item with an `insertText` of
+---`console` is provided it will only insert `sole`. Therefore it is
+---recommended to use `textEdit` instead since it avoids additional client
+---side interpretation.
+---@field insertText? string
+---The format of the insert text. The format applies to both the
+---`insertText` property and the `newText` property of a provided
+---`textEdit`. If omitted defaults to `InsertTextFormat.PlainText`.
+---
+---Please note that the insertTextFormat doesn't apply to
+---`additionalTextEdits`.
+---@field insertTextFormat? lsp.InsertTextFormat
+---How whitespace and indentation is handled during completion
+---item insertion. If not provided the clients default value depends on
+---the `textDocument.completion.insertTextMode` client capability.
+---
+---@since 3.16.0
+---@field insertTextMode? lsp.InsertTextMode
+---An {@link TextEdit edit} which is applied to a document when selecting
+---this completion. When an edit is provided the value of
+---{@link CompletionItem.insertText insertText} is ignored.
+---
+---Most editors support two different operations when accepting a completion
+---item. One is to insert a completion text and the other is to replace an
+---existing text with a completion text. Since this can usually not be
+---predetermined by a server it can report both ranges. Clients need to
+---signal support for `InsertReplaceEdits` via the
+---`textDocument.completion.insertReplaceSupport` client capability
+---property.
+---
+---*Note 1:* The text edit's range as well as both ranges from an insert
+---replace edit must be a [single line] and they must contain the position
+---at which completion has been requested.
+---*Note 2:* If an `InsertReplaceEdit` is returned the edit's insert range
+---must be a prefix of the edit's replace range, that means it must be
+---contained and starting at the same position.
+---
+---@since 3.16.0 additional type `InsertReplaceEdit`
+---@field textEdit? lsp.TextEdit|lsp.InsertReplaceEdit
+---The edit text used if the completion item is part of a CompletionList and
+---CompletionList defines an item default for the text edit range.
+---
+---Clients will only honor this property if they opt into completion list
+---item defaults using the capability `completionList.itemDefaults`.
+---
+---If not provided and a list's default range is provided the label
+---property is used as a text.
+---
+---@since 3.17.0
+---@field textEditText? string
+---An optional array of additional {@link TextEdit text edits} that are applied when
+---selecting this completion. Edits must not overlap (including the same insert position)
+---with the main {@link CompletionItem.textEdit edit} nor with themselves.
+---
+---Additional text edits should be used to change text unrelated to the current cursor position
+---(for example adding an import statement at the top of the file if the completion item will
+---insert an unqualified type).
+---@field additionalTextEdits? lsp.TextEdit[]
+---An optional set of characters that when pressed while this completion is active will accept it first and
+---then type that character. *Note* that all commit characters should have `length=1` and that superfluous
+---characters will be ignored.
+---@field commitCharacters? string[]
+---An optional {@link Command command} that is executed *after* inserting this completion. *Note* that
+---additional modifications to the current document should be described with the
+---{@link CompletionItem.additionalTextEdits additionalTextEdits}-property.
+---@field command? lsp.Command
+---A data entry field that is preserved on a completion item between a
+---{@link CompletionRequest} and a {@link CompletionResolveRequest}.
+---@field data? lsp.LSPAny
+
+---Represents a collection of {@link CompletionItem completion items} to be presented
+---in the editor.
+---@class lsp.CompletionList
+---This list it not complete. Further typing results in recomputing this list.
+---
+---Recomputed lists have all their items replaced (not appended) in the
+---incomplete completion sessions.
+---@field isIncomplete boolean
+---In many cases the items of an actual completion result share the same
+---value for properties like `commitCharacters` or the range of a text
+---edit. A completion list can therefore define item defaults which will
+---be used if a completion item itself doesn't specify the value.
+---
+---If a completion list specifies a default value and a completion item
+---also specifies a corresponding value the one from the item is used.
+---
+---Servers are only allowed to return default values if the client
+---signals support for this via the `completionList.itemDefaults`
+---capability.
+---
+---@since 3.17.0
+---@field itemDefaults? anonym3
+---The completion items.
+---@field items lsp.CompletionItem[]
+
+---Registration options for a {@link CompletionRequest}.
+---@class lsp.CompletionRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link HoverRequest}.
+---@class lsp.HoverParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---The result of a hover request.
+---@class lsp.Hover
+---The hover's content
+---@field contents lsp.MarkupContent|lsp.MarkedString|lsp.MarkedString[]
+---An optional range inside the text document that is used to
+---visualize the hover, e.g. by changing the background color.
+---@field range? lsp.Range
+
+---Registration options for a {@link HoverRequest}.
+---@class lsp.HoverRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link SignatureHelpRequest}.
+---@class lsp.SignatureHelpParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+---The signature help context. This is only available if the client specifies
+---to send this using the client capability `textDocument.signatureHelp.contextSupport === true`
+---
+---@since 3.15.0
+---@field context? lsp.SignatureHelpContext
+
+---Signature help represents the signature of something
+---callable. There can be multiple signature but only one
+---active and only one active parameter.
+---@class lsp.SignatureHelp
+---One or more signatures.
+---@field signatures lsp.SignatureInformation[]
+---The active signature. If omitted or the value lies outside the
+---range of `signatures` the value defaults to zero or is ignored if
+---the `SignatureHelp` has no signatures.
+---
+---Whenever possible implementors should make an active decision about
+---the active signature and shouldn't rely on a default value.
+---
+---In future version of the protocol this property might become
+---mandatory to better express this.
+---@field activeSignature? uinteger
+---The active parameter of the active signature. If omitted or the value
+---lies outside the range of `signatures[activeSignature].parameters`
+---defaults to 0 if the active signature has parameters. If
+---the active signature has no parameters it is ignored.
+---In future version of the protocol this property might become
+---mandatory to better express the active parameter if the
+---active signature does have any.
+---@field activeParameter? uinteger
+
+---Registration options for a {@link SignatureHelpRequest}.
+---@class lsp.SignatureHelpRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link DefinitionRequest}.
+---@class lsp.DefinitionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---Registration options for a {@link DefinitionRequest}.
+---@class lsp.DefinitionRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link ReferencesRequest}.
+---@class lsp.ReferenceParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+---@field context lsp.ReferenceContext
+
+---Registration options for a {@link ReferencesRequest}.
+---@class lsp.ReferenceRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link DocumentHighlightRequest}.
+---@class lsp.DocumentHighlightParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---A document highlight is a range inside a text document which deserves
+---special attention. Usually a document highlight is visualized by changing
+---the background color of its range.
+---@class lsp.DocumentHighlight
+---The range this highlight applies to.
+---@field range lsp.Range
+---The highlight kind, default is {@link DocumentHighlightKind.Text text}.
+---@field kind? lsp.DocumentHighlightKind
+
+---Registration options for a {@link DocumentHighlightRequest}.
+---@class lsp.DocumentHighlightRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link DocumentSymbolRequest}.
+---@class lsp.DocumentSymbolParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---Represents information about programming constructs like variables, classes,
+---interfaces etc.
+---@class lsp.SymbolInformation: lsp.BaseSymbolInformation
+---Indicates if this symbol is deprecated.
+---
+---@deprecated Use tags instead
+---@field deprecated? boolean
+---The location of this symbol. The location's range is used by a tool
+---to reveal the location in the editor. If the symbol is selected in the
+---tool the range's start information is used to position the cursor. So
+---the range usually spans more than the actual symbol's name and does
+---normally include things like visibility modifiers.
+---
+---The range doesn't have to denote a node range in the sense of an abstract
+---syntax tree. It can therefore not be used to re-construct a hierarchy of
+---the symbols.
+---@field location lsp.Location
+
+---Represents programming constructs like variables, classes, interfaces etc.
+---that appear in a document. Document symbols can be hierarchical and they
+---have two ranges: one that encloses its definition and one that points to
+---its most interesting range, e.g. the range of an identifier.
+---@class lsp.DocumentSymbol
+---The name of this symbol. Will be displayed in the user interface and therefore must not be
+---an empty string or a string only consisting of white spaces.
+---@field name string
+---More detail for this symbol, e.g the signature of a function.
+---@field detail? string
+---The kind of this symbol.
+---@field kind lsp.SymbolKind
+---Tags for this document symbol.
+---
+---@since 3.16.0
+---@field tags? lsp.SymbolTag[]
+---Indicates if this symbol is deprecated.
+---
+---@deprecated Use tags instead
+---@field deprecated? boolean
+---The range enclosing this symbol not including leading/trailing whitespace but everything else
+---like comments. This information is typically used to determine if the clients cursor is
+---inside the symbol to reveal in the symbol in the UI.
+---@field range lsp.Range
+---The range that should be selected and revealed when this symbol is being picked, e.g the name of a function.
+---Must be contained by the `range`.
+---@field selectionRange lsp.Range
+---Children of this symbol, e.g. properties of a class.
+---@field children? lsp.DocumentSymbol[]
+
+---Registration options for a {@link DocumentSymbolRequest}.
+---@class lsp.DocumentSymbolRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link CodeActionRequest}.
+---@class lsp.CodeActionParams
+---The document in which the command was invoked.
+---@field textDocument lsp.TextDocumentIdentifier
+---The range for which the command was invoked.
+---@field range lsp.Range
+---Context carrying additional information.
+---@field context lsp.CodeActionContext
+
+---Represents a reference to a command. Provides a title which
+---will be used to represent a command in the UI and, optionally,
+---an array of arguments which will be passed to the command handler
+---function when invoked.
+---@class lsp.Command
+---Title of the command, like `save`.
+---@field title string
+---The identifier of the actual command handler.
+---@field command string
+---Arguments that the command handler should be
+---invoked with.
+---@field arguments? lsp.LSPAny[]
+
+---A code action represents a change that can be performed in code, e.g. to fix a problem or
+---to refactor code.
+---
+---A CodeAction must set either `edit` and/or a `command`. If both are supplied, the `edit` is applied first, then the `command` is executed.
+---@class lsp.CodeAction
+---A short, human-readable, title for this code action.
+---@field title string
+---The kind of the code action.
+---
+---Used to filter code actions.
+---@field kind? lsp.CodeActionKind
+---The diagnostics that this code action resolves.
+---@field diagnostics? lsp.Diagnostic[]
+---Marks this as a preferred action. Preferred actions are used by the `auto fix` command and can be targeted
+---by keybindings.
+---
+---A quick fix should be marked preferred if it properly addresses the underlying error.
+---A refactoring should be marked preferred if it is the most reasonable choice of actions to take.
+---
+---@since 3.15.0
+---@field isPreferred? boolean
+---Marks that the code action cannot currently be applied.
+---
+---Clients should follow the following guidelines regarding disabled code actions:
+---
+---  - Disabled code actions are not shown in automatic [lightbulbs](https://code.visualstudio.com/docs/editor/editingevolved#_code-action)
+---    code action menus.
+---
+---  - Disabled actions are shown as faded out in the code action menu when the user requests a more specific type
+---    of code action, such as refactorings.
+---
+---  - If the user has a [keybinding](https://code.visualstudio.com/docs/editor/refactoring#_keybindings-for-code-actions)
+---    that auto applies a code action and only disabled code actions are returned, the client should show the user an
+---    error message with `reason` in the editor.
+---
+---@since 3.16.0
+---@field disabled? anonym4
+---The workspace edit this code action performs.
+---@field edit? lsp.WorkspaceEdit
+---A command this code action executes. If a code action
+---provides an edit and a command, first the edit is
+---executed and then the command.
+---@field command? lsp.Command
+---A data entry field that is preserved on a code action between
+---a `textDocument/codeAction` and a `codeAction/resolve` request.
+---
+---@since 3.16.0
+---@field data? lsp.LSPAny
+
+---Registration options for a {@link CodeActionRequest}.
+---@class lsp.CodeActionRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link WorkspaceSymbolRequest}.
+---@class lsp.WorkspaceSymbolParams
+---A query string to filter symbols by. Clients may send an empty
+---string here to request all symbols.
+---@field query string
+
+---A special workspace symbol that supports locations without a range.
+---
+---See also SymbolInformation.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceSymbol: lsp.BaseSymbolInformation
+---The location of the symbol. Whether a server is allowed to
+---return a location without a range depends on the client
+---capability `workspace.symbol.resolveSupport`.
+---
+---See SymbolInformation#location for more details.
+---@field location lsp.Location|anonym5
+---A data entry field that is preserved on a workspace symbol between a
+---workspace symbol request and a workspace symbol resolve request.
+---@field data? lsp.LSPAny
+
+---Registration options for a {@link WorkspaceSymbolRequest}.
+---@class lsp.WorkspaceSymbolRegistrationOptions: lsp.WorkspaceSymbolOptions
+
+---The parameters of a {@link CodeLensRequest}.
+---@class lsp.CodeLensParams
+---The document to request code lens for.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---A code lens represents a {@link Command command} that should be shown along with
+---source text, like the number of references, a way to run tests, etc.
+---
+---A code lens is _unresolved_ when no command is associated to it. For performance
+---reasons the creation of a code lens and resolving should be done in two stages.
+---@class lsp.CodeLens
+---The range in which this code lens is valid. Should only span a single line.
+---@field range lsp.Range
+---The command this code lens represents.
+---@field command? lsp.Command
+---A data entry field that is preserved on a code lens item between
+---a {@link CodeLensRequest} and a [CodeLensResolveRequest]
+---(#CodeLensResolveRequest)
+---@field data? lsp.LSPAny
+
+---Registration options for a {@link CodeLensRequest}.
+---@class lsp.CodeLensRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link DocumentLinkRequest}.
+---@class lsp.DocumentLinkParams
+---The document to provide document links for.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---A document link is a range in a text document that links to an internal or external resource, like another
+---text document or a web site.
+---@class lsp.DocumentLink
+---The range this link applies to.
+---@field range lsp.Range
+---The uri this link points to. If missing a resolve request is sent later.
+---@field target? lsp.URI
+---The tooltip text when you hover over this link.
+---
+---If a tooltip is provided, is will be displayed in a string that includes instructions on how to
+---trigger the link, such as `{0} (ctrl + click)`. The specific instructions vary depending on OS,
+---user settings, and localization.
+---
+---@since 3.15.0
+---@field tooltip? string
+---A data entry field that is preserved on a document link between a
+---DocumentLinkRequest and a DocumentLinkResolveRequest.
+---@field data? lsp.LSPAny
+
+---Registration options for a {@link DocumentLinkRequest}.
+---@class lsp.DocumentLinkRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link DocumentFormattingRequest}.
+---@class lsp.DocumentFormattingParams
+---The document to format.
+---@field textDocument lsp.TextDocumentIdentifier
+---The format options.
+---@field options lsp.FormattingOptions
+
+---Registration options for a {@link DocumentFormattingRequest}.
+---@class lsp.DocumentFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link DocumentRangeFormattingRequest}.
+---@class lsp.DocumentRangeFormattingParams
+---The document to format.
+---@field textDocument lsp.TextDocumentIdentifier
+---The range to format
+---@field range lsp.Range
+---The format options
+---@field options lsp.FormattingOptions
+
+---Registration options for a {@link DocumentRangeFormattingRequest}.
+---@class lsp.DocumentRangeFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link DocumentOnTypeFormattingRequest}.
+---@class lsp.DocumentOnTypeFormattingParams
+---The document to format.
+---@field textDocument lsp.TextDocumentIdentifier
+---The position around which the on type formatting should happen.
+---This is not necessarily the exact position where the character denoted
+---by the property `ch` got typed.
+---@field position lsp.Position
+---The character that has been typed that triggered the formatting
+---on type request. That is not necessarily the last character that
+---got inserted into the document since the client could auto insert
+---characters as well (e.g. like automatic brace completion).
+---@field ch string
+---The formatting options.
+---@field options lsp.FormattingOptions
+
+---Registration options for a {@link DocumentOnTypeFormattingRequest}.
+---@class lsp.DocumentOnTypeFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link RenameRequest}.
+---@class lsp.RenameParams
+---The document to rename.
+---@field textDocument lsp.TextDocumentIdentifier
+---The position at which this request was sent.
+---@field position lsp.Position
+---The new name of the symbol. If the given name is not valid the
+---request must return a {@link ResponseError} with an
+---appropriate message set.
+---@field newName string
+
+---Registration options for a {@link RenameRequest}.
+---@class lsp.RenameRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---@class lsp.PrepareRenameParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---The parameters of a {@link ExecuteCommandRequest}.
+---@class lsp.ExecuteCommandParams
+---The identifier of the actual command handler.
+---@field command string
+---Arguments that the command should be invoked with.
+---@field arguments? lsp.LSPAny[]
+
+---Registration options for a {@link ExecuteCommandRequest}.
+---@class lsp.ExecuteCommandRegistrationOptions: lsp.ExecuteCommandOptions
+
+---The parameters passed via an apply workspace edit request.
+---@class lsp.ApplyWorkspaceEditParams
+---An optional label of the workspace edit. This label is
+---presented in the user interface for example on an undo
+---stack to undo the workspace edit.
+---@field label? string
+---The edits to apply.
+---@field edit lsp.WorkspaceEdit
+
+---The result returned from the apply workspace edit request.
+---
+---@since 3.17 renamed from ApplyWorkspaceEditResponse
+---@class lsp.ApplyWorkspaceEditResult
+---Indicates whether the edit was applied or not.
+---@field applied boolean
+---An optional textual description for why the edit was not applied.
+---This may be used by the server for diagnostic logging or to provide
+---a suitable error for a request that triggered the edit.
+---@field failureReason? string
+---Depending on the client's failure handling strategy `failedChange` might
+---contain the index of the change that failed. This property is only available
+---if the client signals a `failureHandlingStrategy` in its client capabilities.
+---@field failedChange? uinteger
+
+---@class lsp.WorkDoneProgressBegin
+---@field kind "begin"
+---Mandatory title of the progress operation. Used to briefly inform about
+---the kind of operation being performed.
+---
+---Examples: "Indexing" or "Linking dependencies".
+---@field title string
+---Controls if a cancel button should show to allow the user to cancel the
+---long running operation. Clients that don't support cancellation are allowed
+---to ignore the setting.
+---@field cancellable? boolean
+---Optional, more detailed associated progress message. Contains
+---complementary information to the `title`.
+---
+---Examples: "3/25 files", "project/src/module2", "node_modules/some_dep".
+---If unset, the previous progress message (if any) is still valid.
+---@field message? string
+---Optional progress percentage to display (value 100 is considered 100%).
+---If not provided infinite progress is assumed and clients are allowed
+---to ignore the `percentage` value in subsequent in report notifications.
+---
+---The value should be steadily rising. Clients are free to ignore values
+---that are not following this rule. The value range is [0, 100].
+---@field percentage? uinteger
+
+---@class lsp.WorkDoneProgressReport
+---@field kind "report"
+---Controls enablement state of a cancel button.
+---
+---Clients that don't support cancellation or don't support controlling the button's
+---enablement state are allowed to ignore the property.
+---@field cancellable? boolean
+---Optional, more detailed associated progress message. Contains
+---complementary information to the `title`.
+---
+---Examples: "3/25 files", "project/src/module2", "node_modules/some_dep".
+---If unset, the previous progress message (if any) is still valid.
+---@field message? string
+---Optional progress percentage to display (value 100 is considered 100%).
+---If not provided infinite progress is assumed and clients are allowed
+---to ignore the `percentage` value in subsequent in report notifications.
+---
+---The value should be steadily rising. Clients are free to ignore values
+---that are not following this rule. The value range is [0, 100]
+---@field percentage? uinteger
+
+---@class lsp.WorkDoneProgressEnd
+---@field kind "end"
+---Optional, a final message indicating to for example indicate the outcome
+---of the operation.
+---@field message? string
+
+---@class lsp.SetTraceParams
+---@field value lsp.TraceValues
+
+---@class lsp.LogTraceParams
+---@field message string
+---@field verbose? string
+
+---@class lsp.CancelParams
+---The request id to cancel.
+---@field id integer|string
+
+---@class lsp.ProgressParams
+---The progress token provided by the client or server.
+---@field token lsp.ProgressToken
+---The progress data.
+---@field value lsp.LSPAny
+
+---A parameter literal used in requests to pass a text document and a position inside that
+---document.
+---@class lsp.TextDocumentPositionParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The position inside the text document.
+---@field position lsp.Position
+
+---@class lsp.WorkDoneProgressParams
+---An optional token that a server can use to report work done progress.
+---@field workDoneToken? lsp.ProgressToken
+
+---@class lsp.PartialResultParams
+---An optional token that a server can use to report partial results (e.g. streaming) to
+---the client.
+---@field partialResultToken? lsp.ProgressToken
+
+---Represents the connection of two locations. Provides additional metadata over normal {@link Location locations},
+---including an origin range.
+---@class lsp.LocationLink
+---Span of the origin of this link.
+---
+---Used as the underlined span for mouse interaction. Defaults to the word range at
+---the definition position.
+---@field originSelectionRange? lsp.Range
+---The target resource identifier of this link.
+---@field targetUri lsp.DocumentUri
+---The full target range of this link. If the target for example is a symbol then target range is the
+---range enclosing this symbol not including leading/trailing whitespace but everything else
+---like comments. This information is typically used to highlight the range in the editor.
+---@field targetRange lsp.Range
+---The range that should be selected and revealed when this link is being followed, e.g the name of a function.
+---Must be contained by the `targetRange`. See also `DocumentSymbol#range`
+---@field targetSelectionRange lsp.Range
+
+---A range in a text document expressed as (zero-based) start and end positions.
+---
+---If you want to specify a range that contains a line including the line ending
+---character(s) then use an end position denoting the start of the next line.
+---For example:
+---```ts
+---{
+---    start: { line: 5, character: 23 }
+---    end : { line 6, character : 0 }
+---}
+---```
+---@class lsp.Range
+---The range's start position.
+---@field start lsp.Position
+---The range's end position.
+---@field end lsp.Position
+
+---@class lsp.ImplementationOptions
+
+---Static registration options to be returned in the initialize
+---request.
+---@class lsp.StaticRegistrationOptions
+---The id used to register the request. The id can be used to deregister
+---the request again. See also Registration#id.
+---@field id? string
+
+---@class lsp.TypeDefinitionOptions
+
+---The workspace folder change event.
+---@class lsp.WorkspaceFoldersChangeEvent
+---The array of added workspace folders
+---@field added lsp.WorkspaceFolder[]
+---The array of the removed workspace folders
+---@field removed lsp.WorkspaceFolder[]
+
+---@class lsp.ConfigurationItem
+---The scope to get the configuration section for.
+---@field scopeUri? string
+---The configuration section asked for.
+---@field section? string
+
+---A literal to identify a text document in the client.
+---@class lsp.TextDocumentIdentifier
+---The text document's uri.
+---@field uri lsp.DocumentUri
+
+---Represents a color in RGBA space.
+---@class lsp.Color
+---The red component of this color in the range [0-1].
+---@field red decimal
+---The green component of this color in the range [0-1].
+---@field green decimal
+---The blue component of this color in the range [0-1].
+---@field blue decimal
+---The alpha component of this color in the range [0-1].
+---@field alpha decimal
+
+---@class lsp.DocumentColorOptions
+
+---@class lsp.FoldingRangeOptions
+
+---@class lsp.DeclarationOptions
+
+---Position in a text document expressed as zero-based line and character
+---offset. Prior to 3.17 the offsets were always based on a UTF-16 string
+---representation. So a string of the form `a𐐀b` the character offset of the
+---character `a` is 0, the character offset of `𐐀` is 1 and the character
+---offset of b is 3 since `𐐀` is represented using two code units in UTF-16.
+---Since 3.17 clients and servers can agree on a different string encoding
+---representation (e.g. UTF-8). The client announces it's supported encoding
+---via the client capability [`general.positionEncodings`](#clientCapabilities).
+---The value is an array of position encodings the client supports, with
+---decreasing preference (e.g. the encoding at index `0` is the most preferred
+---one). To stay backwards compatible the only mandatory encoding is UTF-16
+---represented via the string `utf-16`. The server can pick one of the
+---encodings offered by the client and signals that encoding back to the
+---client via the initialize result's property
+---[`capabilities.positionEncoding`](#serverCapabilities). If the string value
+---`utf-16` is missing from the client's capability `general.positionEncodings`
+---servers can safely assume that the client supports UTF-16. If the server
+---omits the position encoding in its initialize result the encoding defaults
+---to the string value `utf-16`. Implementation considerations: since the
+---conversion from one encoding into another requires the content of the
+---file / line the conversion is best done where the file is read which is
+---usually on the server side.
+---
+---Positions are line end character agnostic. So you can not specify a position
+---that denotes `\r|\n` or `\n|` where `|` represents the character offset.
+---
+---@since 3.17.0 - support for negotiated position encoding.
+---@class lsp.Position
+---Line position in a document (zero-based).
+---
+---If a line number is greater than the number of lines in a document, it defaults back to the number of lines in the document.
+---If a line number is negative, it defaults to 0.
+---@field line uinteger
+---Character offset on a line in a document (zero-based).
+---
+---The meaning of this offset is determined by the negotiated
+---`PositionEncodingKind`.
+---
+---If the character value is greater than the line length it defaults back to the
+---line length.
+---@field character uinteger
+
+---@class lsp.SelectionRangeOptions
+
+---Call hierarchy options used during static registration.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyOptions
+
+---@since 3.16.0
+---@class lsp.SemanticTokensOptions
+---The legend used by the server
+---@field legend lsp.SemanticTokensLegend
+---Server supports providing semantic tokens for a specific range
+---of a document.
+---@field range? boolean|anonym6
+---Server supports providing semantic tokens for a full document.
+---@field full? boolean|anonym7
+
+---@since 3.16.0
+---@class lsp.SemanticTokensEdit
+---The start offset of the edit.
+---@field start uinteger
+---The count of elements to remove.
+---@field deleteCount uinteger
+---The elements to insert.
+---@field data? uinteger[]
+
+---@class lsp.LinkedEditingRangeOptions
+
+---Represents information on a file/folder create.
+---
+---@since 3.16.0
+---@class lsp.FileCreate
+---A file:// URI for the location of the file/folder being created.
+---@field uri string
+
+---Describes textual changes on a text document. A TextDocumentEdit describes all changes
+---on a document version Si and after they are applied move the document to version Si+1.
+---So the creator of a TextDocumentEdit doesn't need to sort the array of edits or do any
+---kind of ordering. However the edits must be non overlapping.
+---@class lsp.TextDocumentEdit
+---The text document to change.
+---@field textDocument lsp.OptionalVersionedTextDocumentIdentifier
+---The edits to be applied.
+---
+---@since 3.16.0 - support for AnnotatedTextEdit. This is guarded using a
+---client capability.
+---@field edits lsp.TextEdit|lsp.AnnotatedTextEdit[]
+
+---Create file operation.
+---@class lsp.CreateFile: lsp.ResourceOperation
+---A create
+---@field kind "create"
+---The resource to create.
+---@field uri lsp.DocumentUri
+---Additional options
+---@field options? lsp.CreateFileOptions
+
+---Rename file operation
+---@class lsp.RenameFile: lsp.ResourceOperation
+---A rename
+---@field kind "rename"
+---The old (existing) location.
+---@field oldUri lsp.DocumentUri
+---The new location.
+---@field newUri lsp.DocumentUri
+---Rename options.
+---@field options? lsp.RenameFileOptions
+
+---Delete file operation
+---@class lsp.DeleteFile: lsp.ResourceOperation
+---A delete
+---@field kind "delete"
+---The file to delete.
+---@field uri lsp.DocumentUri
+---Delete options.
+---@field options? lsp.DeleteFileOptions
+
+---Additional information that describes document changes.
+---
+---@since 3.16.0
+---@class lsp.ChangeAnnotation
+---A human-readable string describing the actual change. The string
+---is rendered prominent in the user interface.
+---@field label string
+---A flag which indicates that user confirmation is needed
+---before applying the change.
+---@field needsConfirmation? boolean
+---A human-readable string which is rendered less prominent in
+---the user interface.
+---@field description? string
+
+---A filter to describe in which file operation requests or notifications
+---the server is interested in receiving.
+---
+---@since 3.16.0
+---@class lsp.FileOperationFilter
+---A Uri scheme like `file` or `untitled`.
+---@field scheme? string
+---The actual file operation pattern.
+---@field pattern lsp.FileOperationPattern
+
+---Represents information on a file/folder rename.
+---
+---@since 3.16.0
+---@class lsp.FileRename
+---A file:// URI for the original location of the file/folder being renamed.
+---@field oldUri string
+---A file:// URI for the new location of the file/folder being renamed.
+---@field newUri string
+
+---Represents information on a file/folder delete.
+---
+---@since 3.16.0
+---@class lsp.FileDelete
+---A file:// URI for the location of the file/folder being deleted.
+---@field uri string
+
+---@class lsp.MonikerOptions
+
+---Type hierarchy options used during static registration.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchyOptions
+
+---@since 3.17.0
+---@class lsp.InlineValueContext
+---The stack frame (as a DAP Id) where the execution has stopped.
+---@field frameId integer
+---The document range where execution has stopped.
+---Typically the end position of the range denotes the line where the inline values are shown.
+---@field stoppedLocation lsp.Range
+
+---Provide inline value as text.
+---
+---@since 3.17.0
+---@class lsp.InlineValueText
+---The document range for which the inline value applies.
+---@field range lsp.Range
+---The text of the inline value.
+---@field text string
+
+---Provide inline value through a variable lookup.
+---If only a range is specified, the variable name will be extracted from the underlying document.
+---An optional variable name can be used to override the extracted name.
+---
+---@since 3.17.0
+---@class lsp.InlineValueVariableLookup
+---The document range for which the inline value applies.
+---The range is used to extract the variable name from the underlying document.
+---@field range lsp.Range
+---If specified the name of the variable to look up.
+---@field variableName? string
+---How to perform the lookup.
+---@field caseSensitiveLookup boolean
+
+---Provide an inline value through an expression evaluation.
+---If only a range is specified, the expression will be extracted from the underlying document.
+---An optional expression can be used to override the extracted expression.
+---
+---@since 3.17.0
+---@class lsp.InlineValueEvaluatableExpression
+---The document range for which the inline value applies.
+---The range is used to extract the evaluatable expression from the underlying document.
+---@field range lsp.Range
+---If specified the expression overrides the extracted expression.
+---@field expression? string
+
+---Inline value options used during static registration.
+---
+---@since 3.17.0
+---@class lsp.InlineValueOptions
+
+---An inlay hint label part allows for interactive and composite labels
+---of inlay hints.
+---
+---@since 3.17.0
+---@class lsp.InlayHintLabelPart
+---The value of this label part.
+---@field value string
+---The tooltip text when you hover over this label part. Depending on
+---the client capability `inlayHint.resolveSupport` clients might resolve
+---this property late using the resolve request.
+---@field tooltip? string|lsp.MarkupContent
+---An optional source code location that represents this
+---label part.
+---
+---The editor will use this location for the hover and for code navigation
+---features: This part will become a clickable link that resolves to the
+---definition of the symbol at the given location (not necessarily the
+---location itself), it shows the hover that shows at the given location,
+---and it shows a context menu with further code navigation commands.
+---
+---Depending on the client capability `inlayHint.resolveSupport` clients
+---might resolve this property late using the resolve request.
+---@field location? lsp.Location
+---An optional command for this label part.
+---
+---Depending on the client capability `inlayHint.resolveSupport` clients
+---might resolve this property late using the resolve request.
+---@field command? lsp.Command
+
+---A `MarkupContent` literal represents a string value which content is interpreted base on its
+---kind flag. Currently the protocol supports `plaintext` and `markdown` as markup kinds.
+---
+---If the kind is `markdown` then the value can contain fenced code blocks like in GitHub issues.
+---See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+---
+---Here is an example how such a string can be constructed using JavaScript / TypeScript:
+---```ts
+---let markdown: MarkdownContent = {
+--- kind: MarkupKind.Markdown,
+--- value: [
+---   '# Header',
+---   'Some text',
+---   '```typescript',
+---   'someCode();',
+---   '```'
+--- ].join('\n')
+---};
+---```
+---
+---*Please Note* that clients might sanitize the return markdown. A client could decide to
+---remove HTML from the markdown to avoid script execution.
+---@class lsp.MarkupContent
+---The type of the Markup
+---@field kind lsp.MarkupKind
+---The content itself
+---@field value string
+
+---Inlay hint options used during static registration.
+---
+---@since 3.17.0
+---@class lsp.InlayHintOptions
+---The server provides support to resolve additional
+---information for an inlay hint item.
+---@field resolveProvider? boolean
+
+---A full diagnostic report with a set of related documents.
+---
+---@since 3.17.0
+---@class lsp.RelatedFullDocumentDiagnosticReport: lsp.FullDocumentDiagnosticReport
+---Diagnostics of related documents. This information is useful
+---in programming languages where code in a file A can generate
+---diagnostics in a file B which A depends on. An example of
+---such a language is C/C++ where marco definitions in a file
+---a.cpp and result in errors in a header file b.hpp.
+---
+---@since 3.17.0
+---@field relatedDocuments? table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
+
+---An unchanged diagnostic report with a set of related documents.
+---
+---@since 3.17.0
+---@class lsp.RelatedUnchangedDocumentDiagnosticReport: lsp.UnchangedDocumentDiagnosticReport
+---Diagnostics of related documents. This information is useful
+---in programming languages where code in a file A can generate
+---diagnostics in a file B which A depends on. An example of
+---such a language is C/C++ where marco definitions in a file
+---a.cpp and result in errors in a header file b.hpp.
+---
+---@since 3.17.0
+---@field relatedDocuments? table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
+
+---A diagnostic report with a full set of problems.
+---
+---@since 3.17.0
+---@class lsp.FullDocumentDiagnosticReport
+---A full document diagnostic report.
+---@field kind "full"
+---An optional result id. If provided it will
+---be sent on the next diagnostic request for the
+---same document.
+---@field resultId? string
+---The actual items.
+---@field items lsp.Diagnostic[]
+
+---A diagnostic report indicating that the last returned
+---report is still accurate.
+---
+---@since 3.17.0
+---@class lsp.UnchangedDocumentDiagnosticReport
+---A document diagnostic report indicating
+---no changes to the last result. A server can
+---only return `unchanged` if result ids are
+---provided.
+---@field kind "unchanged"
+---A result id which will be sent on the next
+---diagnostic request for the same document.
+---@field resultId string
+
+---Diagnostic options.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticOptions
+---An optional identifier under which the diagnostics are
+---managed by the client.
+---@field identifier? string
+---Whether the language has inter file dependencies meaning that
+---editing code in one file can result in a different diagnostic
+---set in another file. Inter file dependencies are common for
+---most programming languages and typically uncommon for linters.
+---@field interFileDependencies boolean
+---The server provides support for workspace diagnostics as well.
+---@field workspaceDiagnostics boolean
+
+---A previous result id in a workspace pull request.
+---
+---@since 3.17.0
+---@class lsp.PreviousResultId
+---The URI for which the client knowns a
+---result id.
+---@field uri lsp.DocumentUri
+---The value of the previous result id.
+---@field value string
+
+---A notebook document.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocument
+---The notebook document's uri.
+---@field uri lsp.URI
+---The type of the notebook.
+---@field notebookType string
+---The version number of this document (it will increase after each
+---change, including undo/redo).
+---@field version integer
+---Additional metadata stored with the notebook
+---document.
+---
+---Note: should always be an object literal (e.g. LSPObject)
+---@field metadata? lsp.LSPObject
+---The cells of a notebook.
+---@field cells lsp.NotebookCell[]
+
+---An item to transfer a text document from the client to the
+---server.
+---@class lsp.TextDocumentItem
+---The text document's uri.
+---@field uri lsp.DocumentUri
+---The text document's language identifier.
+---@field languageId string
+---The version number of this document (it will increase after each
+---change, including undo/redo).
+---@field version integer
+---The content of the opened text document.
+---@field text string
+
+---A versioned notebook document identifier.
+---
+---@since 3.17.0
+---@class lsp.VersionedNotebookDocumentIdentifier
+---The version number of this notebook document.
+---@field version integer
+---The notebook document's uri.
+---@field uri lsp.URI
+
+---A change event for a notebook document.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentChangeEvent
+---The changed meta data if any.
+---
+---Note: should always be an object literal (e.g. LSPObject)
+---@field metadata? lsp.LSPObject
+---Changes to cells
+---@field cells? anonym10
+
+---A literal to identify a notebook document in the client.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentIdentifier
+---The notebook document's uri.
+---@field uri lsp.URI
+
+---Provides information about the context in which an inline completion was requested.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.InlineCompletionContext
+---Describes how the inline completion was triggered.
+---@field triggerKind lsp.InlineCompletionTriggerKind
+---Provides information about the currently selected item in the autocomplete widget if it is visible.
+---@field selectedCompletionInfo? lsp.SelectedCompletionInfo
+
+---A string value used as a snippet is a template which allows to insert text
+---and to control the editor cursor when insertion happens.
+---
+---A snippet can define tab stops and placeholders with `$1`, `$2`
+---and `${3:foo}`. `$0` defines the final tab stop, it defaults to
+---the end of the snippet. Variables are defined with `$name` and
+---`${name:default value}`.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.StringValue
+---The kind of string value.
+---@field kind "snippet"
+---The snippet string.
+---@field value string
+
+---Inline completion options used during static registration.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.InlineCompletionOptions
+
+---General parameters to register for a notification or to register a provider.
+---@class lsp.Registration
+---The id used to register the request. The id can be used to deregister
+---the request again.
+---@field id string
+---The method / capability to register for.
+---@field method string
+---Options necessary for the registration.
+---@field registerOptions? lsp.LSPAny
+
+---General parameters to unregister a request or notification.
+---@class lsp.Unregistration
+---The id used to unregister the request or notification. Usually an id
+---provided during the register request.
+---@field id string
+---The method to unregister for.
+---@field method string
+
+---The initialize parameters
+---@class lsp._InitializeParams
+---The process Id of the parent process that started
+---the server.
+---
+---Is `null` if the process has not been started by another process.
+---If the parent process is not alive then the server should exit.
+---@field processId integer|lsp.null
+---Information about the client
+---
+---@since 3.15.0
+---@field clientInfo? anonym11
+---The locale the client is currently showing the user interface
+---in. This must not necessarily be the locale of the operating
+---system.
+---
+---Uses IETF language tags as the value's syntax
+---(See https://en.wikipedia.org/wiki/IETF_language_tag)
+---
+---@since 3.16.0
+---@field locale? string
+---The rootPath of the workspace. Is null
+---if no folder is open.
+---
+---@deprecated in favour of rootUri.
+---@field rootPath? string|lsp.null
+---The rootUri of the workspace. Is null if no
+---folder is open. If both `rootPath` and `rootUri` are set
+---`rootUri` wins.
+---
+---@deprecated in favour of workspaceFolders.
+---@field rootUri lsp.DocumentUri|lsp.null
+---The capabilities provided by the client (editor or tool)
+---@field capabilities lsp.ClientCapabilities
+---User provided initialization options.
+---@field initializationOptions? lsp.LSPAny
+---The initial trace setting. If omitted trace is disabled ('off').
+---@field trace? lsp.TraceValues
+
+---@class lsp.WorkspaceFoldersInitializeParams
+---The workspace folders configured in the client when the server starts.
+---
+---This property is only available if the client supports workspace folders.
+---It can be `null` if the client supports workspace folders but none are
+---configured.
+---
+---@since 3.6.0
+---@field workspaceFolders? lsp.WorkspaceFolder[]|lsp.null
+
+---Defines the capabilities provided by a language
+---server.
+---@class lsp.ServerCapabilities
+---The position encoding the server picked from the encodings offered
+---by the client via the client capability `general.positionEncodings`.
+---
+---If the client didn't provide any position encodings the only valid
+---value that a server can return is 'utf-16'.
+---
+---If omitted it defaults to 'utf-16'.
+---
+---@since 3.17.0
+---@field positionEncoding? lsp.PositionEncodingKind
+---Defines how text documents are synced. Is either a detailed structure
+---defining each notification or for backwards compatibility the
+---TextDocumentSyncKind number.
+---@field textDocumentSync? lsp.TextDocumentSyncOptions|lsp.TextDocumentSyncKind
+---Defines how notebook documents are synced.
+---
+---@since 3.17.0
+---@field notebookDocumentSync? lsp.NotebookDocumentSyncOptions|lsp.NotebookDocumentSyncRegistrationOptions
+---The server provides completion support.
+---@field completionProvider? lsp.CompletionOptions
+---The server provides hover support.
+---@field hoverProvider? boolean|lsp.HoverOptions
+---The server provides signature help support.
+---@field signatureHelpProvider? lsp.SignatureHelpOptions
+---The server provides Goto Declaration support.
+---@field declarationProvider? boolean|lsp.DeclarationOptions|lsp.DeclarationRegistrationOptions
+---The server provides goto definition support.
+---@field definitionProvider? boolean|lsp.DefinitionOptions
+---The server provides Goto Type Definition support.
+---@field typeDefinitionProvider? boolean|lsp.TypeDefinitionOptions|lsp.TypeDefinitionRegistrationOptions
+---The server provides Goto Implementation support.
+---@field implementationProvider? boolean|lsp.ImplementationOptions|lsp.ImplementationRegistrationOptions
+---The server provides find references support.
+---@field referencesProvider? boolean|lsp.ReferenceOptions
+---The server provides document highlight support.
+---@field documentHighlightProvider? boolean|lsp.DocumentHighlightOptions
+---The server provides document symbol support.
+---@field documentSymbolProvider? boolean|lsp.DocumentSymbolOptions
+---The server provides code actions. CodeActionOptions may only be
+---specified if the client states that it supports
+---`codeActionLiteralSupport` in its initial `initialize` request.
+---@field codeActionProvider? boolean|lsp.CodeActionOptions
+---The server provides code lens.
+---@field codeLensProvider? lsp.CodeLensOptions
+---The server provides document link support.
+---@field documentLinkProvider? lsp.DocumentLinkOptions
+---The server provides color provider support.
+---@field colorProvider? boolean|lsp.DocumentColorOptions|lsp.DocumentColorRegistrationOptions
+---The server provides workspace symbol support.
+---@field workspaceSymbolProvider? boolean|lsp.WorkspaceSymbolOptions
+---The server provides document formatting.
+---@field documentFormattingProvider? boolean|lsp.DocumentFormattingOptions
+---The server provides document range formatting.
+---@field documentRangeFormattingProvider? boolean|lsp.DocumentRangeFormattingOptions
+---The server provides document formatting on typing.
+---@field documentOnTypeFormattingProvider? lsp.DocumentOnTypeFormattingOptions
+---The server provides rename support. RenameOptions may only be
+---specified if the client states that it supports
+---`prepareSupport` in its initial `initialize` request.
+---@field renameProvider? boolean|lsp.RenameOptions
+---The server provides folding provider support.
+---@field foldingRangeProvider? boolean|lsp.FoldingRangeOptions|lsp.FoldingRangeRegistrationOptions
+---The server provides selection range support.
+---@field selectionRangeProvider? boolean|lsp.SelectionRangeOptions|lsp.SelectionRangeRegistrationOptions
+---The server provides execute command support.
+---@field executeCommandProvider? lsp.ExecuteCommandOptions
+---The server provides call hierarchy support.
+---
+---@since 3.16.0
+---@field callHierarchyProvider? boolean|lsp.CallHierarchyOptions|lsp.CallHierarchyRegistrationOptions
+---The server provides linked editing range support.
+---
+---@since 3.16.0
+---@field linkedEditingRangeProvider? boolean|lsp.LinkedEditingRangeOptions|lsp.LinkedEditingRangeRegistrationOptions
+---The server provides semantic tokens support.
+---
+---@since 3.16.0
+---@field semanticTokensProvider? lsp.SemanticTokensOptions|lsp.SemanticTokensRegistrationOptions
+---The server provides moniker support.
+---
+---@since 3.16.0
+---@field monikerProvider? boolean|lsp.MonikerOptions|lsp.MonikerRegistrationOptions
+---The server provides type hierarchy support.
+---
+---@since 3.17.0
+---@field typeHierarchyProvider? boolean|lsp.TypeHierarchyOptions|lsp.TypeHierarchyRegistrationOptions
+---The server provides inline values.
+---
+---@since 3.17.0
+---@field inlineValueProvider? boolean|lsp.InlineValueOptions|lsp.InlineValueRegistrationOptions
+---The server provides inlay hints.
+---
+---@since 3.17.0
+---@field inlayHintProvider? boolean|lsp.InlayHintOptions|lsp.InlayHintRegistrationOptions
+---The server has support for pull model diagnostics.
+---
+---@since 3.17.0
+---@field diagnosticProvider? lsp.DiagnosticOptions|lsp.DiagnosticRegistrationOptions
+---Inline completion options used during static registration.
+---
+---@since 3.18.0
+---@proposed
+---@field inlineCompletionProvider? boolean|lsp.InlineCompletionOptions
+---Workspace specific server capabilities.
+---@field workspace? anonym12
+---Experimental server capabilities.
+---@field experimental? lsp.LSPAny
+
+---A text document identifier to denote a specific version of a text document.
+---@class lsp.VersionedTextDocumentIdentifier: lsp.TextDocumentIdentifier
+---The version number of this document.
+---@field version integer
+
+---Save options.
+---@class lsp.SaveOptions
+---The client is supposed to include the content on save.
+---@field includeText? boolean
+
+---An event describing a file change.
+---@class lsp.FileEvent
+---The file's uri.
+---@field uri lsp.DocumentUri
+---The change type.
+---@field type lsp.FileChangeType
+
+---@class lsp.FileSystemWatcher
+---The glob pattern to watch. See {@link GlobPattern glob pattern} for more detail.
+---
+---@since 3.17.0 support for relative patterns.
+---@field globPattern lsp.GlobPattern
+---The kind of events of interest. If omitted it defaults
+---to WatchKind.Create | WatchKind.Change | WatchKind.Delete
+---which is 7.
+---@field kind? lsp.WatchKind
+
+---Represents a diagnostic, such as a compiler error or warning. Diagnostic objects
+---are only valid in the scope of a resource.
+---@class lsp.Diagnostic
+---The range at which the message applies
+---@field range lsp.Range
+---The diagnostic's severity. Can be omitted. If omitted it is up to the
+---client to interpret diagnostics as error, warning, info or hint.
+---@field severity? lsp.DiagnosticSeverity
+---The diagnostic's code, which usually appear in the user interface.
+---@field code? integer|string
+---An optional property to describe the error code.
+---Requires the code field (above) to be present/not null.
+---
+---@since 3.16.0
+---@field codeDescription? lsp.CodeDescription
+---A human-readable string describing the source of this
+---diagnostic, e.g. 'typescript' or 'super lint'. It usually
+---appears in the user interface.
+---@field source? string
+---The diagnostic's message. It usually appears in the user interface
+---@field message string
+---Additional metadata about the diagnostic.
+---
+---@since 3.15.0
+---@field tags? lsp.DiagnosticTag[]
+---An array of related diagnostic information, e.g. when symbol-names within
+---a scope collide all definitions can be marked via this property.
+---@field relatedInformation? lsp.DiagnosticRelatedInformation[]
+---A data entry field that is preserved between a `textDocument/publishDiagnostics`
+---notification and `textDocument/codeAction` request.
+---
+---@since 3.16.0
+---@field data? lsp.LSPAny
+
+---Contains additional information about the context in which a completion request is triggered.
+---@class lsp.CompletionContext
+---How the completion was triggered.
+---@field triggerKind lsp.CompletionTriggerKind
+---The trigger character (a single character) that has trigger code complete.
+---Is undefined if `triggerKind !== CompletionTriggerKind.TriggerCharacter`
+---@field triggerCharacter? string
+
+---Additional details for a completion item label.
+---
+---@since 3.17.0
+---@class lsp.CompletionItemLabelDetails
+---An optional string which is rendered less prominently directly after {@link CompletionItem.label label},
+---without any spacing. Should be used for function signatures and type annotations.
+---@field detail? string
+---An optional string which is rendered less prominently after {@link CompletionItem.detail}. Should be used
+---for fully qualified names and file paths.
+---@field description? string
+
+---A special text edit to provide an insert and a replace operation.
+---
+---@since 3.16.0
+---@class lsp.InsertReplaceEdit
+---The string to be inserted.
+---@field newText string
+---The range if the insert is requested
+---@field insert lsp.Range
+---The range if the replace is requested.
+---@field replace lsp.Range
+
+---Completion options.
+---@class lsp.CompletionOptions
+---Most tools trigger completion request automatically without explicitly requesting
+---it using a keyboard shortcut (e.g. Ctrl+Space). Typically they do so when the user
+---starts to type an identifier. For example if the user types `c` in a JavaScript file
+---code complete will automatically pop up present `console` besides others as a
+---completion item. Characters that make up identifiers don't need to be listed here.
+---
+---If code complete should automatically be trigger on characters not being valid inside
+---an identifier (for example `.` in JavaScript) list them in `triggerCharacters`.
+---@field triggerCharacters? string[]
+---The list of all possible characters that commit a completion. This field can be used
+---if clients don't support individual commit characters per completion item. See
+---`ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`
+---
+---If a server provides both `allCommitCharacters` and commit characters on an individual
+---completion item the ones on the completion item win.
+---
+---@since 3.2.0
+---@field allCommitCharacters? string[]
+---The server provides support to resolve additional
+---information for a completion item.
+---@field resolveProvider? boolean
+---The server supports the following `CompletionItem` specific
+---capabilities.
+---
+---@since 3.17.0
+---@field completionItem? anonym13
+
+---Hover options.
+---@class lsp.HoverOptions
+
+---Additional information about the context in which a signature help request was triggered.
+---
+---@since 3.15.0
+---@class lsp.SignatureHelpContext
+---Action that caused signature help to be triggered.
+---@field triggerKind lsp.SignatureHelpTriggerKind
+---Character that caused signature help to be triggered.
+---
+---This is undefined when `triggerKind !== SignatureHelpTriggerKind.TriggerCharacter`
+---@field triggerCharacter? string
+---`true` if signature help was already showing when it was triggered.
+---
+---Retriggers occurs when the signature help is already active and can be caused by actions such as
+---typing a trigger character, a cursor move, or document content changes.
+---@field isRetrigger boolean
+---The currently active `SignatureHelp`.
+---
+---The `activeSignatureHelp` has its `SignatureHelp.activeSignature` field updated based on
+---the user navigating through available signatures.
+---@field activeSignatureHelp? lsp.SignatureHelp
+
+---Represents the signature of something callable. A signature
+---can have a label, like a function-name, a doc-comment, and
+---a set of parameters.
+---@class lsp.SignatureInformation
+---The label of this signature. Will be shown in
+---the UI.
+---@field label string
+---The human-readable doc-comment of this signature. Will be shown
+---in the UI but can be omitted.
+---@field documentation? string|lsp.MarkupContent
+---The parameters of this signature.
+---@field parameters? lsp.ParameterInformation[]
+---The index of the active parameter.
+---
+---If provided, this is used in place of `SignatureHelp.activeParameter`.
+---
+---@since 3.16.0
+---@field activeParameter? uinteger
+
+---Server Capabilities for a {@link SignatureHelpRequest}.
+---@class lsp.SignatureHelpOptions
+---List of characters that trigger signature help automatically.
+---@field triggerCharacters? string[]
+---List of characters that re-trigger signature help.
+---
+---These trigger characters are only active when signature help is already showing. All trigger characters
+---are also counted as re-trigger characters.
+---
+---@since 3.15.0
+---@field retriggerCharacters? string[]
+
+---Server Capabilities for a {@link DefinitionRequest}.
+---@class lsp.DefinitionOptions
+
+---Value-object that contains additional information when
+---requesting references.
+---@class lsp.ReferenceContext
+---Include the declaration of the current symbol.
+---@field includeDeclaration boolean
+
+---Reference options.
+---@class lsp.ReferenceOptions
+
+---Provider options for a {@link DocumentHighlightRequest}.
+---@class lsp.DocumentHighlightOptions
+
+---A base for all symbol information.
+---@class lsp.BaseSymbolInformation
+---The name of this symbol.
+---@field name string
+---The kind of this symbol.
+---@field kind lsp.SymbolKind
+---Tags for this symbol.
+---
+---@since 3.16.0
+---@field tags? lsp.SymbolTag[]
+---The name of the symbol containing this symbol. This information is for
+---user interface purposes (e.g. to render a qualifier in the user interface
+---if necessary). It can't be used to re-infer a hierarchy for the document
+---symbols.
+---@field containerName? string
+
+---Provider options for a {@link DocumentSymbolRequest}.
+---@class lsp.DocumentSymbolOptions
+---A human-readable string that is shown when multiple outlines trees
+---are shown for the same document.
+---
+---@since 3.16.0
+---@field label? string
+
+---Contains additional diagnostic information about the context in which
+---a {@link CodeActionProvider.provideCodeActions code action} is run.
+---@class lsp.CodeActionContext
+---An array of diagnostics known on the client side overlapping the range provided to the
+---`textDocument/codeAction` request. They are provided so that the server knows which
+---errors are currently presented to the user for the given range. There is no guarantee
+---that these accurately reflect the error state of the resource. The primary parameter
+---to compute code actions is the provided range.
+---@field diagnostics lsp.Diagnostic[]
+---Requested kind of actions to return.
+---
+---Actions not of this kind are filtered out by the client before being shown. So servers
+---can omit computing them.
+---@field only? lsp.CodeActionKind[]
+---The reason why code actions were requested.
+---
+---@since 3.17.0
+---@field triggerKind? lsp.CodeActionTriggerKind
+
+---Provider options for a {@link CodeActionRequest}.
+---@class lsp.CodeActionOptions
+---CodeActionKinds that this server may return.
+---
+---The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the server
+---may list out every specific kind they provide.
+---@field codeActionKinds? lsp.CodeActionKind[]
+---The server provides support to resolve additional
+---information for a code action.
+---
+---@since 3.16.0
+---@field resolveProvider? boolean
+
+---Server capabilities for a {@link WorkspaceSymbolRequest}.
+---@class lsp.WorkspaceSymbolOptions
+---The server provides support to resolve additional
+---information for a workspace symbol.
+---
+---@since 3.17.0
+---@field resolveProvider? boolean
+
+---Code Lens provider options of a {@link CodeLensRequest}.
+---@class lsp.CodeLensOptions
+---Code lens has a resolve provider as well.
+---@field resolveProvider? boolean
+
+---Provider options for a {@link DocumentLinkRequest}.
+---@class lsp.DocumentLinkOptions
+---Document links have a resolve provider as well.
+---@field resolveProvider? boolean
+
+---Value-object describing what options formatting should use.
+---@class lsp.FormattingOptions
+---Size of a tab in spaces.
+---@field tabSize uinteger
+---Prefer spaces over tabs.
+---@field insertSpaces boolean
+---Trim trailing whitespace on a line.
+---
+---@since 3.15.0
+---@field trimTrailingWhitespace? boolean
+---Insert a newline character at the end of the file if one does not exist.
+---
+---@since 3.15.0
+---@field insertFinalNewline? boolean
+---Trim all newlines after the final newline at the end of the file.
+---
+---@since 3.15.0
+---@field trimFinalNewlines? boolean
+
+---Provider options for a {@link DocumentFormattingRequest}.
+---@class lsp.DocumentFormattingOptions
+
+---Provider options for a {@link DocumentRangeFormattingRequest}.
+---@class lsp.DocumentRangeFormattingOptions
+
+---Provider options for a {@link DocumentOnTypeFormattingRequest}.
+---@class lsp.DocumentOnTypeFormattingOptions
+---A character on which formatting should be triggered, like `{`.
+---@field firstTriggerCharacter string
+---More trigger characters.
+---@field moreTriggerCharacter? string[]
+
+---Provider options for a {@link RenameRequest}.
+---@class lsp.RenameOptions
+---Renames should be checked and tested before being executed.
+---
+---@since version 3.12.0
+---@field prepareProvider? boolean
+
+---The server capabilities of a {@link ExecuteCommandRequest}.
+---@class lsp.ExecuteCommandOptions
+---The commands to be executed on the server
+---@field commands string[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensLegend
+---The token types a server uses.
+---@field tokenTypes string[]
+---The token modifiers a server uses.
+---@field tokenModifiers string[]
+
+---A text document identifier to optionally denote a specific version of a text document.
+---@class lsp.OptionalVersionedTextDocumentIdentifier: lsp.TextDocumentIdentifier
+---The version number of this document. If a versioned text document identifier
+---is sent from the server to the client and the file is not open in the editor
+---(the server has not received an open notification before) the server can send
+---`null` to indicate that the version is unknown and the content on disk is the
+---truth (as specified with document content ownership).
+---@field version integer|lsp.null
+
+---A special text edit with an additional change annotation.
+---
+---@since 3.16.0.
+---@class lsp.AnnotatedTextEdit: lsp.TextEdit
+---The actual identifier of the change annotation
+---@field annotationId lsp.ChangeAnnotationIdentifier
+
+---A generic resource operation.
+---@class lsp.ResourceOperation
+---The resource operation kind.
+---@field kind string
+---An optional annotation identifier describing the operation.
+---
+---@since 3.16.0
+---@field annotationId? lsp.ChangeAnnotationIdentifier
+
+---Options to create a file.
+---@class lsp.CreateFileOptions
+---Overwrite existing file. Overwrite wins over `ignoreIfExists`
+---@field overwrite? boolean
+---Ignore if exists.
+---@field ignoreIfExists? boolean
+
+---Rename file options
+---@class lsp.RenameFileOptions
+---Overwrite target if existing. Overwrite wins over `ignoreIfExists`
+---@field overwrite? boolean
+---Ignores if target exists.
+---@field ignoreIfExists? boolean
+
+---Delete file options
+---@class lsp.DeleteFileOptions
+---Delete the content recursively if a folder is denoted.
+---@field recursive? boolean
+---Ignore the operation if the file doesn't exist.
+---@field ignoreIfNotExists? boolean
+
+---A pattern to describe in which file operation requests or notifications
+---the server is interested in receiving.
+---
+---@since 3.16.0
+---@class lsp.FileOperationPattern
+---The glob pattern to match. Glob patterns can have the following syntax:
+---- `*` to match one or more characters in a path segment
+---- `?` to match on one character in a path segment
+---- `**` to match any number of path segments, including none
+---- `{}` to group sub patterns into an OR expression. (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+---- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+---- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+---@field glob string
+---Whether to match files or folders with this pattern.
+---
+---Matches both if undefined.
+---@field matches? lsp.FileOperationPatternKind
+---Additional options used during matching.
+---@field options? lsp.FileOperationPatternOptions
+
+---A full document diagnostic report for a workspace diagnostic result.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceFullDocumentDiagnosticReport: lsp.FullDocumentDiagnosticReport
+---The URI for which diagnostic information is reported.
+---@field uri lsp.DocumentUri
+---The version number for which the diagnostics are reported.
+---If the document is not marked as open `null` can be provided.
+---@field version integer|lsp.null
+
+---An unchanged document diagnostic report for a workspace diagnostic result.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceUnchangedDocumentDiagnosticReport: lsp.UnchangedDocumentDiagnosticReport
+---The URI for which diagnostic information is reported.
+---@field uri lsp.DocumentUri
+---The version number for which the diagnostics are reported.
+---If the document is not marked as open `null` can be provided.
+---@field version integer|lsp.null
+
+---A notebook cell.
+---
+---A cell's document URI must be unique across ALL notebook
+---cells and can therefore be used to uniquely identify a
+---notebook cell or the cell's text document.
+---
+---@since 3.17.0
+---@class lsp.NotebookCell
+---The cell's kind
+---@field kind lsp.NotebookCellKind
+---The URI of the cell's text document
+---content.
+---@field document lsp.DocumentUri
+---Additional metadata stored with the cell.
+---
+---Note: should always be an object literal (e.g. LSPObject)
+---@field metadata? lsp.LSPObject
+---Additional execution summary information
+---if supported by the client.
+---@field executionSummary? lsp.ExecutionSummary
+
+---A change describing how to move a `NotebookCell`
+---array from state S to S'.
+---
+---@since 3.17.0
+---@class lsp.NotebookCellArrayChange
+---The start oftest of the cell that changed.
+---@field start uinteger
+---The deleted cells
+---@field deleteCount uinteger
+---The new cells, if any
+---@field cells? lsp.NotebookCell[]
+
+---Describes the currently selected completion item.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.SelectedCompletionInfo
+---The range that will be replaced if this completion item is accepted.
+---@field range lsp.Range
+---The text the range will be replaced with if this completion is accepted.
+---@field text string
+
+---Defines the capabilities provided by the client.
+---@class lsp.ClientCapabilities
+---Workspace specific client capabilities.
+---@field workspace? lsp.WorkspaceClientCapabilities
+---Text document specific client capabilities.
+---@field textDocument? lsp.TextDocumentClientCapabilities
+---Capabilities specific to the notebook document support.
+---
+---@since 3.17.0
+---@field notebookDocument? lsp.NotebookDocumentClientCapabilities
+---Window specific client capabilities.
+---@field window? lsp.WindowClientCapabilities
+---General client capabilities.
+---
+---@since 3.16.0
+---@field general? lsp.GeneralClientCapabilities
+---Experimental client capabilities.
+---@field experimental? lsp.LSPAny
+
+---@class lsp.TextDocumentSyncOptions
+---Open and close notifications are sent to the server. If omitted open close notification should not
+---be sent.
+---@field openClose? boolean
+---Change notifications are sent to the server. See TextDocumentSyncKind.None, TextDocumentSyncKind.Full
+---and TextDocumentSyncKind.Incremental. If omitted it defaults to TextDocumentSyncKind.None.
+---@field change? lsp.TextDocumentSyncKind
+---If present will save notifications are sent to the server. If omitted the notification should not be
+---sent.
+---@field willSave? boolean
+---If present will save wait until requests are sent to the server. If omitted the request should not be
+---sent.
+---@field willSaveWaitUntil? boolean
+---If present save notifications are sent to the server. If omitted the notification should not be
+---sent.
+---@field save? boolean|lsp.SaveOptions
+
+---Options specific to a notebook plus its cells
+---to be synced to the server.
+---
+---If a selector provides a notebook document
+---filter but no cell selector all cells of a
+---matching notebook document will be synced.
+---
+---If a selector provides no notebook document
+---filter but only a cell selector all notebook
+---document that contain at least one matching
+---cell will be synced.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentSyncOptions
+---The notebooks to be synced
+---@field notebookSelector anonym15|anonym17[]
+---Whether save notification should be forwarded to
+---the server. Will only be honored if mode === `notebook`.
+---@field save? boolean
+
+---Registration options specific to a notebook.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentSyncRegistrationOptions: lsp.NotebookDocumentSyncOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.WorkspaceFoldersServerCapabilities
+---The server has support for workspace folders
+---@field supported? boolean
+---Whether the server wants to receive workspace folder
+---change notifications.
+---
+---If a string is provided the string is treated as an ID
+---under which the notification is registered on the client
+---side. The ID can be used to unregister for these events
+---using the `client/unregisterCapability` request.
+---@field changeNotifications? string|boolean
+
+---Options for notifications/requests for user operations on files.
+---
+---@since 3.16.0
+---@class lsp.FileOperationOptions
+---The server is interested in receiving didCreateFiles notifications.
+---@field didCreate? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving willCreateFiles requests.
+---@field willCreate? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving didRenameFiles notifications.
+---@field didRename? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving willRenameFiles requests.
+---@field willRename? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving didDeleteFiles file notifications.
+---@field didDelete? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving willDeleteFiles file requests.
+---@field willDelete? lsp.FileOperationRegistrationOptions
+
+---Structure to capture a description for an error code.
+---
+---@since 3.16.0
+---@class lsp.CodeDescription
+---An URI to open with more information about the diagnostic error.
+---@field href lsp.URI
+
+---Represents a related message and source code location for a diagnostic. This should be
+---used to point to code locations that cause or related to a diagnostics, e.g when duplicating
+---a symbol in a scope.
+---@class lsp.DiagnosticRelatedInformation
+---The location of this related diagnostic information.
+---@field location lsp.Location
+---The message of this related diagnostic information.
+---@field message string
+
+---Represents a parameter of a callable-signature. A parameter can
+---have a label and a doc-comment.
+---@class lsp.ParameterInformation
+---The label of this parameter information.
+---
+---Either a string or an inclusive start and exclusive end offsets within its containing
+---signature label. (see SignatureInformation.label). The offsets are based on a UTF-16
+---string representation as `Position` and `Range` does.
+---
+---*Note*: a label of type string should be a substring of its containing signature label.
+---Its intended use case is to highlight the parameter label part in the `SignatureInformation.label`.
+---@field label string|{ [1]: uinteger, [2]: uinteger }
+---The human-readable doc-comment of this parameter. Will be shown
+---in the UI but can be omitted.
+---@field documentation? string|lsp.MarkupContent
+
+---A notebook cell text document filter denotes a cell text
+---document by different properties.
+---
+---@since 3.17.0
+---@class lsp.NotebookCellTextDocumentFilter
+---A filter that matches against the notebook
+---containing the notebook cell. If a string
+---value is provided it matches against the
+---notebook type. '*' matches every notebook.
+---@field notebook string|lsp.NotebookDocumentFilter
+---A language id like `python`.
+---
+---Will be matched against the language id of the
+---notebook cell document. '*' matches every language.
+---@field language? string
+
+---Matching options for the file operation pattern.
+---
+---@since 3.16.0
+---@class lsp.FileOperationPatternOptions
+---The pattern should be matched ignoring casing.
+---@field ignoreCase? boolean
+
+---@class lsp.ExecutionSummary
+---A strict monotonically increasing value
+---indicating the execution order of a cell
+---inside a notebook.
+---@field executionOrder uinteger
+---Whether the execution was successful or
+---not if known by the client.
+---@field success? boolean
+
+---Workspace specific client capabilities.
+---@class lsp.WorkspaceClientCapabilities
+---The client supports applying batch edits
+---to the workspace by supporting the request
+---'workspace/applyEdit'
+---@field applyEdit? boolean
+---Capabilities specific to `WorkspaceEdit`s.
+---@field workspaceEdit? lsp.WorkspaceEditClientCapabilities
+---Capabilities specific to the `workspace/didChangeConfiguration` notification.
+---@field didChangeConfiguration? lsp.DidChangeConfigurationClientCapabilities
+---Capabilities specific to the `workspace/didChangeWatchedFiles` notification.
+---@field didChangeWatchedFiles? lsp.DidChangeWatchedFilesClientCapabilities
+---Capabilities specific to the `workspace/symbol` request.
+---@field symbol? lsp.WorkspaceSymbolClientCapabilities
+---Capabilities specific to the `workspace/executeCommand` request.
+---@field executeCommand? lsp.ExecuteCommandClientCapabilities
+---The client has support for workspace folders.
+---
+---@since 3.6.0
+---@field workspaceFolders? boolean
+---The client supports `workspace/configuration` requests.
+---
+---@since 3.6.0
+---@field configuration? boolean
+---Capabilities specific to the semantic token requests scoped to the
+---workspace.
+---
+---@since 3.16.0.
+---@field semanticTokens? lsp.SemanticTokensWorkspaceClientCapabilities
+---Capabilities specific to the code lens requests scoped to the
+---workspace.
+---
+---@since 3.16.0.
+---@field codeLens? lsp.CodeLensWorkspaceClientCapabilities
+---The client has support for file notifications/requests for user operations on files.
+---
+---Since 3.16.0
+---@field fileOperations? lsp.FileOperationClientCapabilities
+---Capabilities specific to the inline values requests scoped to the
+---workspace.
+---
+---@since 3.17.0.
+---@field inlineValue? lsp.InlineValueWorkspaceClientCapabilities
+---Capabilities specific to the inlay hint requests scoped to the
+---workspace.
+---
+---@since 3.17.0.
+---@field inlayHint? lsp.InlayHintWorkspaceClientCapabilities
+---Capabilities specific to the diagnostic requests scoped to the
+---workspace.
+---
+---@since 3.17.0.
+---@field diagnostics? lsp.DiagnosticWorkspaceClientCapabilities
+
+---Text document specific client capabilities.
+---@class lsp.TextDocumentClientCapabilities
+---Defines which synchronization capabilities the client supports.
+---@field synchronization? lsp.TextDocumentSyncClientCapabilities
+---Capabilities specific to the `textDocument/completion` request.
+---@field completion? lsp.CompletionClientCapabilities
+---Capabilities specific to the `textDocument/hover` request.
+---@field hover? lsp.HoverClientCapabilities
+---Capabilities specific to the `textDocument/signatureHelp` request.
+---@field signatureHelp? lsp.SignatureHelpClientCapabilities
+---Capabilities specific to the `textDocument/declaration` request.
+---
+---@since 3.14.0
+---@field declaration? lsp.DeclarationClientCapabilities
+---Capabilities specific to the `textDocument/definition` request.
+---@field definition? lsp.DefinitionClientCapabilities
+---Capabilities specific to the `textDocument/typeDefinition` request.
+---
+---@since 3.6.0
+---@field typeDefinition? lsp.TypeDefinitionClientCapabilities
+---Capabilities specific to the `textDocument/implementation` request.
+---
+---@since 3.6.0
+---@field implementation? lsp.ImplementationClientCapabilities
+---Capabilities specific to the `textDocument/references` request.
+---@field references? lsp.ReferenceClientCapabilities
+---Capabilities specific to the `textDocument/documentHighlight` request.
+---@field documentHighlight? lsp.DocumentHighlightClientCapabilities
+---Capabilities specific to the `textDocument/documentSymbol` request.
+---@field documentSymbol? lsp.DocumentSymbolClientCapabilities
+---Capabilities specific to the `textDocument/codeAction` request.
+---@field codeAction? lsp.CodeActionClientCapabilities
+---Capabilities specific to the `textDocument/codeLens` request.
+---@field codeLens? lsp.CodeLensClientCapabilities
+---Capabilities specific to the `textDocument/documentLink` request.
+---@field documentLink? lsp.DocumentLinkClientCapabilities
+---Capabilities specific to the `textDocument/documentColor` and the
+---`textDocument/colorPresentation` request.
+---
+---@since 3.6.0
+---@field colorProvider? lsp.DocumentColorClientCapabilities
+---Capabilities specific to the `textDocument/formatting` request.
+---@field formatting? lsp.DocumentFormattingClientCapabilities
+---Capabilities specific to the `textDocument/rangeFormatting` request.
+---@field rangeFormatting? lsp.DocumentRangeFormattingClientCapabilities
+---Capabilities specific to the `textDocument/onTypeFormatting` request.
+---@field onTypeFormatting? lsp.DocumentOnTypeFormattingClientCapabilities
+---Capabilities specific to the `textDocument/rename` request.
+---@field rename? lsp.RenameClientCapabilities
+---Capabilities specific to the `textDocument/foldingRange` request.
+---
+---@since 3.10.0
+---@field foldingRange? lsp.FoldingRangeClientCapabilities
+---Capabilities specific to the `textDocument/selectionRange` request.
+---
+---@since 3.15.0
+---@field selectionRange? lsp.SelectionRangeClientCapabilities
+---Capabilities specific to the `textDocument/publishDiagnostics` notification.
+---@field publishDiagnostics? lsp.PublishDiagnosticsClientCapabilities
+---Capabilities specific to the various call hierarchy requests.
+---
+---@since 3.16.0
+---@field callHierarchy? lsp.CallHierarchyClientCapabilities
+---Capabilities specific to the various semantic token request.
+---
+---@since 3.16.0
+---@field semanticTokens? lsp.SemanticTokensClientCapabilities
+---Capabilities specific to the `textDocument/linkedEditingRange` request.
+---
+---@since 3.16.0
+---@field linkedEditingRange? lsp.LinkedEditingRangeClientCapabilities
+---Client capabilities specific to the `textDocument/moniker` request.
+---
+---@since 3.16.0
+---@field moniker? lsp.MonikerClientCapabilities
+---Capabilities specific to the various type hierarchy requests.
+---
+---@since 3.17.0
+---@field typeHierarchy? lsp.TypeHierarchyClientCapabilities
+---Capabilities specific to the `textDocument/inlineValue` request.
+---
+---@since 3.17.0
+---@field inlineValue? lsp.InlineValueClientCapabilities
+---Capabilities specific to the `textDocument/inlayHint` request.
+---
+---@since 3.17.0
+---@field inlayHint? lsp.InlayHintClientCapabilities
+---Capabilities specific to the diagnostic pull model.
+---
+---@since 3.17.0
+---@field diagnostic? lsp.DiagnosticClientCapabilities
+---Client capabilities specific to inline completions.
+---
+---@since 3.18.0
+---@proposed
+---@field inlineCompletion? lsp.InlineCompletionClientCapabilities
+
+---Capabilities specific to the notebook document support.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentClientCapabilities
+---Capabilities specific to notebook document synchronization
+---
+---@since 3.17.0
+---@field synchronization lsp.NotebookDocumentSyncClientCapabilities
+
+---@class lsp.WindowClientCapabilities
+---It indicates whether the client supports server initiated
+---progress using the `window/workDoneProgress/create` request.
+---
+---The capability also controls Whether client supports handling
+---of progress notifications. If set servers are allowed to report a
+---`workDoneProgress` property in the request specific server
+---capabilities.
+---
+---@since 3.15.0
+---@field workDoneProgress? boolean
+---Capabilities specific to the showMessage request.
+---
+---@since 3.16.0
+---@field showMessage? lsp.ShowMessageRequestClientCapabilities
+---Capabilities specific to the showDocument request.
+---
+---@since 3.16.0
+---@field showDocument? lsp.ShowDocumentClientCapabilities
+
+---General client capabilities.
+---
+---@since 3.16.0
+---@class lsp.GeneralClientCapabilities
+---Client capability that signals how the client
+---handles stale requests (e.g. a request
+---for which the client will not process the response
+---anymore since the information is outdated).
+---
+---@since 3.17.0
+---@field staleRequestSupport? anonym18
+---Client capabilities specific to regular expressions.
+---
+---@since 3.16.0
+---@field regularExpressions? lsp.RegularExpressionsClientCapabilities
+---Client capabilities specific to the client's markdown parser.
+---
+---@since 3.16.0
+---@field markdown? lsp.MarkdownClientCapabilities
+---The position encodings supported by the client. Client and server
+---have to agree on the same position encoding to ensure that offsets
+---(e.g. character position in a line) are interpreted the same on both
+---sides.
+---
+---To keep the protocol backwards compatible the following applies: if
+---the value 'utf-16' is missing from the array of position encodings
+---servers can assume that the client supports UTF-16. UTF-16 is
+---therefore a mandatory encoding.
+---
+---If omitted it defaults to ['utf-16'].
+---
+---Implementation considerations: since the conversion from one encoding
+---into another requires the content of the file / line the conversion
+---is best done where the file is read which is usually on the server
+---side.
+---
+---@since 3.17.0
+---@field positionEncodings? lsp.PositionEncodingKind[]
+
+---A relative pattern is a helper to construct glob patterns that are matched
+---relatively to a base URI. The common value for a `baseUri` is a workspace
+---folder root, but it can be another absolute URI as well.
+---
+---@since 3.17.0
+---@class lsp.RelativePattern
+---A workspace folder or a base URI to which this pattern will be matched
+---against relatively.
+---@field baseUri lsp.WorkspaceFolder|lsp.URI
+---The actual glob pattern;
+---@field pattern lsp.Pattern
+
+---@class lsp.WorkspaceEditClientCapabilities
+---The client supports versioned document changes in `WorkspaceEdit`s
+---@field documentChanges? boolean
+---The resource operations the client supports. Clients should at least
+---support 'create', 'rename' and 'delete' files and folders.
+---
+---@since 3.13.0
+---@field resourceOperations? lsp.ResourceOperationKind[]
+---The failure handling strategy of a client if applying the workspace edit
+---fails.
+---
+---@since 3.13.0
+---@field failureHandling? lsp.FailureHandlingKind
+---Whether the client normalizes line endings to the client specific
+---setting.
+---If set to `true` the client will normalize line ending characters
+---in a workspace edit to the client-specified new line
+---character.
+---
+---@since 3.16.0
+---@field normalizesLineEndings? boolean
+---Whether the client in general supports change annotations on text edits,
+---create file, rename file and delete file changes.
+---
+---@since 3.16.0
+---@field changeAnnotationSupport? anonym19
+
+---@class lsp.DidChangeConfigurationClientCapabilities
+---Did change configuration notification supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---@class lsp.DidChangeWatchedFilesClientCapabilities
+---Did change watched files notification supports dynamic registration. Please note
+---that the current protocol doesn't support static configuration for file changes
+---from the server side.
+---@field dynamicRegistration? boolean
+---Whether the client has support for {@link  RelativePattern relative pattern}
+---or not.
+---
+---@since 3.17.0
+---@field relativePatternSupport? boolean
+
+---Client capabilities for a {@link WorkspaceSymbolRequest}.
+---@class lsp.WorkspaceSymbolClientCapabilities
+---Symbol request supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
+---@field symbolKind? anonym20
+---The client supports tags on `SymbolInformation`.
+---Clients supporting tags have to handle unknown tags gracefully.
+---
+---@since 3.16.0
+---@field tagSupport? anonym21
+---The client support partial workspace symbols. The client will send the
+---request `workspaceSymbol/resolve` to the server to resolve additional
+---properties.
+---
+---@since 3.17.0
+---@field resolveSupport? anonym22
+
+---The client capabilities of a {@link ExecuteCommandRequest}.
+---@class lsp.ExecuteCommandClientCapabilities
+---Execute command supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---@since 3.16.0
+---@class lsp.SemanticTokensWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from
+---the server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---semantic tokens currently shown. It should be used with absolute care
+---and is useful for situation where a server for example detects a project
+---wide change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---@since 3.16.0
+---@class lsp.CodeLensWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from the
+---server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---code lenses currently shown. It should be used with absolute care and is
+---useful for situation where a server for example detect a project wide
+---change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---Capabilities relating to events from file operations by the user in the client.
+---
+---These events do not come from the file system, they come from user operations
+---like renaming a file in the UI.
+---
+---@since 3.16.0
+---@class lsp.FileOperationClientCapabilities
+---Whether the client supports dynamic registration for file requests/notifications.
+---@field dynamicRegistration? boolean
+---The client has support for sending didCreateFiles notifications.
+---@field didCreate? boolean
+---The client has support for sending willCreateFiles requests.
+---@field willCreate? boolean
+---The client has support for sending didRenameFiles notifications.
+---@field didRename? boolean
+---The client has support for sending willRenameFiles requests.
+---@field willRename? boolean
+---The client has support for sending didDeleteFiles notifications.
+---@field didDelete? boolean
+---The client has support for sending willDeleteFiles requests.
+---@field willDelete? boolean
+
+---Client workspace capabilities specific to inline values.
+---
+---@since 3.17.0
+---@class lsp.InlineValueWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from the
+---server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---inline values currently shown. It should be used with absolute care and is
+---useful for situation where a server for example detects a project wide
+---change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---Client workspace capabilities specific to inlay hints.
+---
+---@since 3.17.0
+---@class lsp.InlayHintWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from
+---the server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---inlay hints currently shown. It should be used with absolute care and
+---is useful for situation where a server for example detects a project wide
+---change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---Workspace client capabilities specific to diagnostic pull requests.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from
+---the server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---pulled diagnostics currently shown. It should be used with absolute care and
+---is useful for situation where a server for example detects a project wide
+---change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---@class lsp.TextDocumentSyncClientCapabilities
+---Whether text document synchronization supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client supports sending will save notifications.
+---@field willSave? boolean
+---The client supports sending a will save request and
+---waits for a response providing text edits which will
+---be applied to the document before it is saved.
+---@field willSaveWaitUntil? boolean
+---The client supports did save notifications.
+---@field didSave? boolean
+
+---Completion client capabilities
+---@class lsp.CompletionClientCapabilities
+---Whether completion supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client supports the following `CompletionItem` specific
+---capabilities.
+---@field completionItem? anonym26
+---@field completionItemKind? anonym27
+---Defines how the client handles whitespace and indentation
+---when accepting a completion item that uses multi line
+---text in either `insertText` or `textEdit`.
+---
+---@since 3.17.0
+---@field insertTextMode? lsp.InsertTextMode
+---The client supports to send additional context information for a
+---`textDocument/completion` request.
+---@field contextSupport? boolean
+---The client supports the following `CompletionList` specific
+---capabilities.
+---
+---@since 3.17.0
+---@field completionList? anonym28
+
+---@class lsp.HoverClientCapabilities
+---Whether hover supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Client supports the following content formats for the content
+---property. The order describes the preferred format of the client.
+---@field contentFormat? lsp.MarkupKind[]
+
+---Client Capabilities for a {@link SignatureHelpRequest}.
+---@class lsp.SignatureHelpClientCapabilities
+---Whether signature help supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client supports the following `SignatureInformation`
+---specific properties.
+---@field signatureInformation? anonym30
+---The client supports to send additional context information for a
+---`textDocument/signatureHelp` request. A client that opts into
+---contextSupport will also support the `retriggerCharacters` on
+---`SignatureHelpOptions`.
+---
+---@since 3.15.0
+---@field contextSupport? boolean
+
+---@since 3.14.0
+---@class lsp.DeclarationClientCapabilities
+---Whether declaration supports dynamic registration. If this is set to `true`
+---the client supports the new `DeclarationRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---The client supports additional metadata in the form of declaration links.
+---@field linkSupport? boolean
+
+---Client Capabilities for a {@link DefinitionRequest}.
+---@class lsp.DefinitionClientCapabilities
+---Whether definition supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client supports additional metadata in the form of definition links.
+---
+---@since 3.14.0
+---@field linkSupport? boolean
+
+---Since 3.6.0
+---@class lsp.TypeDefinitionClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `TypeDefinitionRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---The client supports additional metadata in the form of definition links.
+---
+---Since 3.14.0
+---@field linkSupport? boolean
+
+---@since 3.6.0
+---@class lsp.ImplementationClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `ImplementationRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---The client supports additional metadata in the form of definition links.
+---
+---@since 3.14.0
+---@field linkSupport? boolean
+
+---Client Capabilities for a {@link ReferencesRequest}.
+---@class lsp.ReferenceClientCapabilities
+---Whether references supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---Client Capabilities for a {@link DocumentHighlightRequest}.
+---@class lsp.DocumentHighlightClientCapabilities
+---Whether document highlight supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---Client Capabilities for a {@link DocumentSymbolRequest}.
+---@class lsp.DocumentSymbolClientCapabilities
+---Whether document symbol supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Specific capabilities for the `SymbolKind` in the
+---`textDocument/documentSymbol` request.
+---@field symbolKind? anonym31
+---The client supports hierarchical document symbols.
+---@field hierarchicalDocumentSymbolSupport? boolean
+---The client supports tags on `SymbolInformation`. Tags are supported on
+---`DocumentSymbol` if `hierarchicalDocumentSymbolSupport` is set to true.
+---Clients supporting tags have to handle unknown tags gracefully.
+---
+---@since 3.16.0
+---@field tagSupport? anonym32
+---The client supports an additional label presented in the UI when
+---registering a document symbol provider.
+---
+---@since 3.16.0
+---@field labelSupport? boolean
+
+---The Client Capabilities of a {@link CodeActionRequest}.
+---@class lsp.CodeActionClientCapabilities
+---Whether code action supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client support code action literals of type `CodeAction` as a valid
+---response of the `textDocument/codeAction` request. If the property is not
+---set the request can only return `Command` literals.
+---
+---@since 3.8.0
+---@field codeActionLiteralSupport? anonym34
+---Whether code action supports the `isPreferred` property.
+---
+---@since 3.15.0
+---@field isPreferredSupport? boolean
+---Whether code action supports the `disabled` property.
+---
+---@since 3.16.0
+---@field disabledSupport? boolean
+---Whether code action supports the `data` property which is
+---preserved between a `textDocument/codeAction` and a
+---`codeAction/resolve` request.
+---
+---@since 3.16.0
+---@field dataSupport? boolean
+---Whether the client supports resolving additional code action
+---properties via a separate `codeAction/resolve` request.
+---
+---@since 3.16.0
+---@field resolveSupport? anonym35
+---Whether the client honors the change annotations in
+---text edits and resource operations returned via the
+---`CodeAction#edit` property by for example presenting
+---the workspace edit in the user interface and asking
+---for confirmation.
+---
+---@since 3.16.0
+---@field honorsChangeAnnotations? boolean
+
+---The client capabilities  of a {@link CodeLensRequest}.
+---@class lsp.CodeLensClientCapabilities
+---Whether code lens supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---The client capabilities of a {@link DocumentLinkRequest}.
+---@class lsp.DocumentLinkClientCapabilities
+---Whether document link supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Whether the client supports the `tooltip` property on `DocumentLink`.
+---
+---@since 3.15.0
+---@field tooltipSupport? boolean
+
+---@class lsp.DocumentColorClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `DocumentColorRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---Client capabilities of a {@link DocumentFormattingRequest}.
+---@class lsp.DocumentFormattingClientCapabilities
+---Whether formatting supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---Client capabilities of a {@link DocumentRangeFormattingRequest}.
+---@class lsp.DocumentRangeFormattingClientCapabilities
+---Whether range formatting supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---Client capabilities of a {@link DocumentOnTypeFormattingRequest}.
+---@class lsp.DocumentOnTypeFormattingClientCapabilities
+---Whether on type formatting supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---@class lsp.RenameClientCapabilities
+---Whether rename supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Client supports testing for validity of rename operations
+---before execution.
+---
+---@since 3.12.0
+---@field prepareSupport? boolean
+---Client supports the default behavior result.
+---
+---The value indicates the default behavior used by the
+---client.
+---
+---@since 3.16.0
+---@field prepareSupportDefaultBehavior? lsp.PrepareSupportDefaultBehavior
+---Whether the client honors the change annotations in
+---text edits and resource operations returned via the
+---rename request's workspace edit by for example presenting
+---the workspace edit in the user interface and asking
+---for confirmation.
+---
+---@since 3.16.0
+---@field honorsChangeAnnotations? boolean
+
+---@class lsp.FoldingRangeClientCapabilities
+---Whether implementation supports dynamic registration for folding range
+---providers. If this is set to `true` the client supports the new
+---`FoldingRangeRegistrationOptions` return value for the corresponding
+---server capability as well.
+---@field dynamicRegistration? boolean
+---The maximum number of folding ranges that the client prefers to receive
+---per document. The value serves as a hint, servers are free to follow the
+---limit.
+---@field rangeLimit? uinteger
+---If set, the client signals that it only supports folding complete lines.
+---If set, client will ignore specified `startCharacter` and `endCharacter`
+---properties in a FoldingRange.
+---@field lineFoldingOnly? boolean
+---Specific options for the folding range kind.
+---
+---@since 3.17.0
+---@field foldingRangeKind? anonym36
+---Specific options for the folding range.
+---
+---@since 3.17.0
+---@field foldingRange? anonym37
+
+---@class lsp.SelectionRangeClientCapabilities
+---Whether implementation supports dynamic registration for selection range providers. If this is set to `true`
+---the client supports the new `SelectionRangeRegistrationOptions` return value for the corresponding server
+---capability as well.
+---@field dynamicRegistration? boolean
+
+---The publish diagnostic client capabilities.
+---@class lsp.PublishDiagnosticsClientCapabilities
+---Whether the clients accepts diagnostics with related information.
+---@field relatedInformation? boolean
+---Client supports the tag property to provide meta data about a diagnostic.
+---Clients supporting tags have to handle unknown tags gracefully.
+---
+---@since 3.15.0
+---@field tagSupport? anonym38
+---Whether the client interprets the version property of the
+---`textDocument/publishDiagnostics` notification's parameter.
+---
+---@since 3.15.0
+---@field versionSupport? boolean
+---Client supports a codeDescription property
+---
+---@since 3.16.0
+---@field codeDescriptionSupport? boolean
+---Whether code action supports the `data` property which is
+---preserved between a `textDocument/publishDiagnostics` and
+---`textDocument/codeAction` request.
+---
+---@since 3.16.0
+---@field dataSupport? boolean
+
+---@since 3.16.0
+---@class lsp.CallHierarchyClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---@since 3.16.0
+---@class lsp.SemanticTokensClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---Which requests the client supports and might send to the server
+---depending on the server's capability. Please note that clients might not
+---show semantic tokens or degrade some of the user experience if a range
+---or full request is advertised by the client but not provided by the
+---server. If for example the client capability `requests.full` and
+---`request.range` are both set to true but the server only provides a
+---range provider the client might not render a minimap correctly or might
+---even decide to not show any semantic tokens at all.
+---@field requests anonym41
+---The token types that the client supports.
+---@field tokenTypes string[]
+---The token modifiers that the client supports.
+---@field tokenModifiers string[]
+---The token formats the clients supports.
+---@field formats lsp.TokenFormat[]
+---Whether the client supports tokens that can overlap each other.
+---@field overlappingTokenSupport? boolean
+---Whether the client supports tokens that can span multiple lines.
+---@field multilineTokenSupport? boolean
+---Whether the client allows the server to actively cancel a
+---semantic token request, e.g. supports returning
+---LSPErrorCodes.ServerCancelled. If a server does the client
+---needs to retrigger the request.
+---
+---@since 3.17.0
+---@field serverCancelSupport? boolean
+---Whether the client uses semantic tokens to augment existing
+---syntax tokens. If set to `true` client side created syntax
+---tokens and semantic tokens are both used for colorization. If
+---set to `false` the client only uses the returned semantic tokens
+---for colorization.
+---
+---If the value is `undefined` then the client behavior is not
+---specified.
+---
+---@since 3.17.0
+---@field augmentsSyntaxTokens? boolean
+
+---Client capabilities for the linked editing range request.
+---
+---@since 3.16.0
+---@class lsp.LinkedEditingRangeClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---Client capabilities specific to the moniker request.
+---
+---@since 3.16.0
+---@class lsp.MonikerClientCapabilities
+---Whether moniker supports dynamic registration. If this is set to `true`
+---the client supports the new `MonikerRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---@since 3.17.0
+---@class lsp.TypeHierarchyClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---Client capabilities specific to inline values.
+---
+---@since 3.17.0
+---@class lsp.InlineValueClientCapabilities
+---Whether implementation supports dynamic registration for inline value providers.
+---@field dynamicRegistration? boolean
+
+---Inlay hint client capabilities.
+---
+---@since 3.17.0
+---@class lsp.InlayHintClientCapabilities
+---Whether inlay hints support dynamic registration.
+---@field dynamicRegistration? boolean
+---Indicates which properties a client can resolve lazily on an inlay
+---hint.
+---@field resolveSupport? anonym42
+
+---Client capabilities specific to diagnostic pull requests.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---Whether the clients supports related documents for document diagnostic pulls.
+---@field relatedDocumentSupport? boolean
+
+---Client capabilities specific to inline completions.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.InlineCompletionClientCapabilities
+---Whether implementation supports dynamic registration for inline completion providers.
+---@field dynamicRegistration? boolean
+
+---Notebook specific client capabilities.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentSyncClientCapabilities
+---Whether implementation supports dynamic registration. If this is
+---set to `true` the client supports the new
+---`(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---The client supports sending execution summary data per cell.
+---@field executionSummarySupport? boolean
+
+---Show message request client capabilities
+---@class lsp.ShowMessageRequestClientCapabilities
+---Capabilities specific to the `MessageActionItem` type.
+---@field messageActionItem? anonym43
+
+---Client capabilities for the showDocument request.
+---
+---@since 3.16.0
+---@class lsp.ShowDocumentClientCapabilities
+---The client has support for the showDocument
+---request.
+---@field support boolean
+
+---Client capabilities specific to regular expressions.
+---
+---@since 3.16.0
+---@class lsp.RegularExpressionsClientCapabilities
+---The engine's name.
+---@field engine string
+---The engine's version.
+---@field version? string
+
+---Client capabilities specific to the used markdown parser.
+---
+---@since 3.16.0
+---@class lsp.MarkdownClientCapabilities
+---The name of the parser.
+---@field parser string
+---The version of the parser.
+---@field version? string
+---A list of HTML tags that the client allows / supports in
+---Markdown.
+---
+---@since 3.17.0
+---@field allowedTags? string[]
+
+---A set of predefined token types. This set is not fixed
+---an clients can specify additional token types via the
+---corresponding client capabilities.
+---
+---@since 3.16.0
+---@alias lsp.SemanticTokenTypes
+---| "namespace" # namespace
+---| "type" # type
+---| "class" # class
+---| "enum" # enum
+---| "interface" # interface
+---| "struct" # struct
+---| "typeParameter" # typeParameter
+---| "parameter" # parameter
+---| "variable" # variable
+---| "property" # property
+---| "enumMember" # enumMember
+---| "event" # event
+---| "function" # function
+---| "method" # method
+---| "macro" # macro
+---| "keyword" # keyword
+---| "modifier" # modifier
+---| "comment" # comment
+---| "string" # string
+---| "number" # number
+---| "regexp" # regexp
+---| "operator" # operator
+---| "decorator" # decorator
+
+---A set of predefined token modifiers. This set is not fixed
+---an clients can specify additional token types via the
+---corresponding client capabilities.
+---
+---@since 3.16.0
+---@alias lsp.SemanticTokenModifiers
+---| "declaration" # declaration
+---| "definition" # definition
+---| "readonly" # readonly
+---| "static" # static
+---| "deprecated" # deprecated
+---| "abstract" # abstract
+---| "async" # async
+---| "modification" # modification
+---| "documentation" # documentation
+---| "defaultLibrary" # defaultLibrary
+
+---The document diagnostic report kinds.
+---
+---@since 3.17.0
+---@alias lsp.DocumentDiagnosticReportKind
+---| "full" # Full
+---| "unchanged" # Unchanged
+
+---Predefined error codes.
+---@alias lsp.ErrorCodes
+---| -32700 # ParseError
+---| -32600 # InvalidRequest
+---| -32601 # MethodNotFound
+---| -32602 # InvalidParams
+---| -32603 # InternalError
+---| -32002 # ServerNotInitialized
+---| -32001 # UnknownErrorCode
+
+---@alias lsp.LSPErrorCodes
+---| -32803 # RequestFailed
+---| -32802 # ServerCancelled
+---| -32801 # ContentModified
+---| -32800 # RequestCancelled
+
+---A set of predefined range kinds.
+---@alias lsp.FoldingRangeKind
+---| "comment" # Comment
+---| "imports" # Imports
+---| "region" # Region
+
+---A symbol kind.
+---@alias lsp.SymbolKind
+---| 1 # File
+---| 2 # Module
+---| 3 # Namespace
+---| 4 # Package
+---| 5 # Class
+---| 6 # Method
+---| 7 # Property
+---| 8 # Field
+---| 9 # Constructor
+---| 10 # Enum
+---| 11 # Interface
+---| 12 # Function
+---| 13 # Variable
+---| 14 # Constant
+---| 15 # String
+---| 16 # Number
+---| 17 # Boolean
+---| 18 # Array
+---| 19 # Object
+---| 20 # Key
+---| 21 # Null
+---| 22 # EnumMember
+---| 23 # Struct
+---| 24 # Event
+---| 25 # Operator
+---| 26 # TypeParameter
+
+---Symbol tags are extra annotations that tweak the rendering of a symbol.
+---
+---@since 3.16
+---@alias lsp.SymbolTag
+---| 1 # Deprecated
+
+---Moniker uniqueness level to define scope of the moniker.
+---
+---@since 3.16.0
+---@alias lsp.UniquenessLevel
+---| "document" # document
+---| "project" # project
+---| "group" # group
+---| "scheme" # scheme
+---| "global" # global
+
+---The moniker kind.
+---
+---@since 3.16.0
+---@alias lsp.MonikerKind
+---| "import" # import
+---| "export" # export
+---| "local" # local
+
+---Inlay hint kinds.
+---
+---@since 3.17.0
+---@alias lsp.InlayHintKind
+---| 1 # Type
+---| 2 # Parameter
+
+---The message type
+---@alias lsp.MessageType
+---| 1 # Error
+---| 2 # Warning
+---| 3 # Info
+---| 4 # Log
+
+---Defines how the host (editor) should sync
+---document changes to the language server.
+---@alias lsp.TextDocumentSyncKind
+---| 0 # None
+---| 1 # Full
+---| 2 # Incremental
+
+---Represents reasons why a text document is saved.
+---@alias lsp.TextDocumentSaveReason
+---| 1 # Manual
+---| 2 # AfterDelay
+---| 3 # FocusOut
+
+---The kind of a completion entry.
+---@alias lsp.CompletionItemKind
+---| 1 # Text
+---| 2 # Method
+---| 3 # Function
+---| 4 # Constructor
+---| 5 # Field
+---| 6 # Variable
+---| 7 # Class
+---| 8 # Interface
+---| 9 # Module
+---| 10 # Property
+---| 11 # Unit
+---| 12 # Value
+---| 13 # Enum
+---| 14 # Keyword
+---| 15 # Snippet
+---| 16 # Color
+---| 17 # File
+---| 18 # Reference
+---| 19 # Folder
+---| 20 # EnumMember
+---| 21 # Constant
+---| 22 # Struct
+---| 23 # Event
+---| 24 # Operator
+---| 25 # TypeParameter
+
+---Completion item tags are extra annotations that tweak the rendering of a completion
+---item.
+---
+---@since 3.15.0
+---@alias lsp.CompletionItemTag
+---| 1 # Deprecated
+
+---Defines whether the insert text in a completion item should be interpreted as
+---plain text or a snippet.
+---@alias lsp.InsertTextFormat
+---| 1 # PlainText
+---| 2 # Snippet
+
+---How whitespace and indentation is handled during completion
+---item insertion.
+---
+---@since 3.16.0
+---@alias lsp.InsertTextMode
+---| 1 # asIs
+---| 2 # adjustIndentation
+
+---A document highlight kind.
+---@alias lsp.DocumentHighlightKind
+---| 1 # Text
+---| 2 # Read
+---| 3 # Write
+
+---A set of predefined code action kinds
+---@alias lsp.CodeActionKind
+---| "" # Empty
+---| "quickfix" # QuickFix
+---| "refactor" # Refactor
+---| "refactor.extract" # RefactorExtract
+---| "refactor.inline" # RefactorInline
+---| "refactor.rewrite" # RefactorRewrite
+---| "source" # Source
+---| "source.organizeImports" # SourceOrganizeImports
+---| "source.fixAll" # SourceFixAll
+
+---@alias lsp.TraceValues
+---| "off" # Off
+---| "messages" # Messages
+---| "verbose" # Verbose
+
+---Describes the content type that a client supports in various
+---result literals like `Hover`, `ParameterInfo` or `CompletionItem`.
+---
+---Please note that `MarkupKinds` must not start with a `$`. This kinds
+---are reserved for internal usage.
+---@alias lsp.MarkupKind
+---| "plaintext" # PlainText
+---| "markdown" # Markdown
+
+---Describes how an {@link InlineCompletionItemProvider inline completion provider} was triggered.
+---
+---@since 3.18.0
+---@proposed
+---@alias lsp.InlineCompletionTriggerKind
+---| 0 # Invoked
+---| 1 # Automatic
+
+---A set of predefined position encoding kinds.
+---
+---@since 3.17.0
+---@alias lsp.PositionEncodingKind
+---| "utf-8" # UTF8
+---| "utf-16" # UTF16
+---| "utf-32" # UTF32
+
+---The file event type
+---@alias lsp.FileChangeType
+---| 1 # Created
+---| 2 # Changed
+---| 3 # Deleted
+
+---@alias lsp.WatchKind
+---| 1 # Create
+---| 2 # Change
+---| 4 # Delete
+
+---The diagnostic's severity.
+---@alias lsp.DiagnosticSeverity
+---| 1 # Error
+---| 2 # Warning
+---| 3 # Information
+---| 4 # Hint
+
+---The diagnostic tags.
+---
+---@since 3.15.0
+---@alias lsp.DiagnosticTag
+---| 1 # Unnecessary
+---| 2 # Deprecated
+
+---How a completion was triggered
+---@alias lsp.CompletionTriggerKind
+---| 1 # Invoked
+---| 2 # TriggerCharacter
+---| 3 # TriggerForIncompleteCompletions
+
+---How a signature help was triggered.
+---
+---@since 3.15.0
+---@alias lsp.SignatureHelpTriggerKind
+---| 1 # Invoked
+---| 2 # TriggerCharacter
+---| 3 # ContentChange
+
+---The reason why code actions were requested.
+---
+---@since 3.17.0
+---@alias lsp.CodeActionTriggerKind
+---| 1 # Invoked
+---| 2 # Automatic
+
+---A pattern kind describing if a glob pattern matches a file a folder or
+---both.
+---
+---@since 3.16.0
+---@alias lsp.FileOperationPatternKind
+---| "file" # file
+---| "folder" # folder
+
+---A notebook cell kind.
+---
+---@since 3.17.0
+---@alias lsp.NotebookCellKind
+---| 1 # Markup
+---| 2 # Code
+
+---@alias lsp.ResourceOperationKind
+---| "create" # Create
+---| "rename" # Rename
+---| "delete" # Delete
+
+---@alias lsp.FailureHandlingKind
+---| "abort" # Abort
+---| "transactional" # Transactional
+---| "textOnlyTransactional" # TextOnlyTransactional
+---| "undo" # Undo
+
+---@alias lsp.PrepareSupportDefaultBehavior
+---| 1 # Identifier
+
+---@alias lsp.TokenFormat
+---| "relative" # Relative
+
+---The definition of a symbol represented as one or many {@link Location locations}.
+---For most programming languages there is only one location at which a symbol is
+---defined.
+---
+---Servers should prefer returning `DefinitionLink` over `Definition` if supported
+---by the client.
+---@alias lsp.Definition lsp.Location|lsp.Location[]
+
+---Information about where a symbol is defined.
+---
+---Provides additional metadata over normal {@link Location location} definitions, including the range of
+---the defining symbol
+---@alias lsp.DefinitionLink lsp.LocationLink
+
+---LSP arrays.
+---@since 3.17.0
+---@alias lsp.LSPArray lsp.LSPAny[]
+
+---The LSP any type.
+---Please note that strictly speaking a property with the value `undefined`
+---can't be converted into JSON preserving the property name. However for
+---convenience it is allowed and assumed that all these properties are
+---optional as well.
+---@since 3.17.0
+---@alias lsp.LSPAny lsp.LSPObject|lsp.LSPArray|string|integer|uinteger|decimal|boolean|lsp.null
+
+---The declaration of a symbol representation as one or many {@link Location locations}.
+---@alias lsp.Declaration lsp.Location|lsp.Location[]
+
+---Information about where a symbol is declared.
+---
+---Provides additional metadata over normal {@link Location location} declarations, including the range of
+---the declaring symbol.
+---
+---Servers should prefer returning `DeclarationLink` over `Declaration` if supported
+---by the client.
+---@alias lsp.DeclarationLink lsp.LocationLink
+
+---Inline value information can be provided by different means:
+---- directly as a text value (class InlineValueText).
+---- as a name to use for a variable lookup (class InlineValueVariableLookup)
+---- as an evaluatable expression (class InlineValueEvaluatableExpression)
+---The InlineValue types combines all inline value types into one type.
+---
+---@since 3.17.0
+---@alias lsp.InlineValue lsp.InlineValueText|lsp.InlineValueVariableLookup|lsp.InlineValueEvaluatableExpression
+
+---The result of a document diagnostic pull request. A report can
+---either be a full report containing all diagnostics for the
+---requested document or an unchanged report indicating that nothing
+---has changed in terms of diagnostics in comparison to the last
+---pull request.
+---
+---@since 3.17.0
+---@alias lsp.DocumentDiagnosticReport lsp.RelatedFullDocumentDiagnosticReport|lsp.RelatedUnchangedDocumentDiagnosticReport
+
+---@alias lsp.PrepareRenameResult lsp.Range|anonym44|anonym45
+
+---A document selector is the combination of one or many document filters.
+---
+---@sample `let sel:DocumentSelector = [{ language: 'typescript' }, { language: 'json', pattern: '**∕tsconfig.json' }]`;
+---
+---The use of a string as a document filter is deprecated @since 3.16.0.
+---@alias lsp.DocumentSelector lsp.DocumentFilter[]
+
+---@alias lsp.ProgressToken integer|string
+
+---An identifier to refer to a change annotation stored with a workspace edit.
+---@alias lsp.ChangeAnnotationIdentifier string
+
+---A workspace diagnostic document report.
+---
+---@since 3.17.0
+---@alias lsp.WorkspaceDocumentDiagnosticReport lsp.WorkspaceFullDocumentDiagnosticReport|lsp.WorkspaceUnchangedDocumentDiagnosticReport
+
+---An event describing a change to a text document. If only a text is provided
+---it is considered to be the full content of the document.
+---@alias lsp.TextDocumentContentChangeEvent anonym46|anonym47
+
+---MarkedString can be used to render human readable text. It is either a markdown string
+---or a code-block that provides a language and a code snippet. The language identifier
+---is semantically equal to the optional language identifier in fenced code blocks in GitHub
+---issues. See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+---
+---The pair of a language and a value is an equivalent to markdown:
+---```${language}
+---${value}
+---```
+---
+---Note that markdown strings will be sanitized - that means html will be escaped.
+---@deprecated use MarkupContent instead.
+---@alias lsp.MarkedString string|anonym48
+
+---A document filter describes a top level text document or
+---a notebook cell document.
+---
+---@since 3.17.0 - proposed support for NotebookCellTextDocumentFilter.
+---@alias lsp.DocumentFilter lsp.TextDocumentFilter|lsp.NotebookCellTextDocumentFilter
+
+---LSP object definition.
+---@since 3.17.0
+---@alias lsp.LSPObject table<string, lsp.LSPAny>
+
+---The glob pattern. Either a string pattern or a relative pattern.
+---
+---@since 3.17.0
+---@alias lsp.GlobPattern lsp.Pattern|lsp.RelativePattern
+
+---A document filter denotes a document by different properties like
+---the {@link TextDocument.languageId language}, the {@link Uri.scheme scheme} of
+---its resource, or a glob-pattern that is applied to the {@link TextDocument.fileName path}.
+---
+---Glob patterns can have the following syntax:
+---- `*` to match one or more characters in a path segment
+---- `?` to match on one character in a path segment
+---- `**` to match any number of path segments, including none
+---- `{}` to group sub patterns into an OR expression. (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+---- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+---- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+---
+---@sample A language filter that applies to typescript files on disk: `{ language: 'typescript', scheme: 'file' }`
+---@sample A language filter that applies to all package.json paths: `{ language: 'json', pattern: '**package.json' }`
+---
+---@since 3.17.0
+---@alias lsp.TextDocumentFilter anonym49|anonym50|anonym51
+
+---A notebook document filter denotes a notebook document by
+---different properties. The properties will be match
+---against the notebook's URI (same as with documents)
+---
+---@since 3.17.0
+---@alias lsp.NotebookDocumentFilter anonym52|anonym53|anonym54
+
+---The glob pattern to watch relative to the base path. Glob patterns can have the following syntax:
+---- `*` to match one or more characters in a path segment
+---- `?` to match on one character in a path segment
+---- `**` to match any number of path segments, including none
+---- `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+---- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+---- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+---
+---@since 3.17.0
+---@alias lsp.Pattern string
+
+---@class anonym1
+---The name of the server as defined by the server.
+---@field name string
+---The server's version as defined by the server.
+---@field version? string
+
+---@class anonym3
+---@field insert lsp.Range
+---@field replace lsp.Range
+
+---@class anonym2
+---A default commit character set.
+---
+---@since 3.17.0
+---@field commitCharacters? string[]
+---A default edit range.
+---
+---@since 3.17.0
+---@field editRange? lsp.Range|anonym3
+---A default insert text format.
+---
+---@since 3.17.0
+---@field insertTextFormat? lsp.InsertTextFormat
+---A default insert text mode.
+---
+---@since 3.17.0
+---@field insertTextMode? lsp.InsertTextMode
+---A default data value.
+---
+---@since 3.17.0
+---@field data? lsp.LSPAny
+
+---@class anonym4
+---Human readable description of why the code action is currently disabled.
+---
+---This is displayed in the code actions UI.
+---@field reason string
+
+---@class anonym5
+---@field uri lsp.DocumentUri
+
+---@class anonym6
+
+---@class anonym7
+---The server supports deltas for full documents.
+---@field delta? boolean
+
+---@class anonym9
+---The change to the cell array.
+---@field array lsp.NotebookCellArrayChange
+---Additional opened cell text documents.
+---@field didOpen? lsp.TextDocumentItem[]
+---Additional closed cell text documents.
+---@field didClose? lsp.TextDocumentIdentifier[]
+
+---@class anonym10
+---@field document lsp.VersionedTextDocumentIdentifier
+---@field changes lsp.TextDocumentContentChangeEvent[]
+
+---@class anonym8
+---Changes to the cell structure to add or
+---remove cells.
+---@field structure? anonym9
+---Changes to notebook cells properties like its
+---kind, execution summary or metadata.
+---@field data? lsp.NotebookCell[]
+---Changes to the text content of notebook cells.
+---@field textContent? anonym10[]
+
+---@class anonym11
+---The name of the client as defined by the client.
+---@field name string
+---The client's version as defined by the client.
+---@field version? string
+
+---@class anonym12
+---The server supports workspace folder.
+---
+---@since 3.6.0
+---@field workspaceFolders? lsp.WorkspaceFoldersServerCapabilities
+---The server is interested in notifications/requests for operations on files.
+---
+---@since 3.16.0
+---@field fileOperations? lsp.FileOperationOptions
+
+---@class anonym13
+---The server has support for completion item label
+---details (see also `CompletionItemLabelDetails`) when
+---receiving a completion item in a resolve call.
+---
+---@since 3.17.0
+---@field labelDetailsSupport? boolean
+
+---@class anonym15
+---@field language string
+
+---@class anonym14
+---The notebook to be synced If a string
+---value is provided it matches against the
+---notebook type. '*' matches every notebook.
+---@field notebook string|lsp.NotebookDocumentFilter
+---The cells of the matching notebook to be synced.
+---@field cells? anonym15[]
+
+---@class anonym17
+---@field language string
+
+---@class anonym16
+---The notebook to be synced If a string
+---value is provided it matches against the
+---notebook type. '*' matches every notebook.
+---@field notebook? string|lsp.NotebookDocumentFilter
+---The cells of the matching notebook to be synced.
+---@field cells anonym17[]
+
+---@class anonym18
+---The client will actively cancel the request.
+---@field cancel boolean
+---The list of requests for which the client
+---will retry the request if it receives a
+---response with error code `ContentModified`
+---@field retryOnContentModified string[]
+
+---@class anonym19
+---Whether the client groups edits with equal labels into tree nodes,
+---for instance all edits labelled with "Changes in Strings" would
+---be a tree node.
+---@field groupsOnLabel? boolean
+
+---@class anonym20
+---The symbol kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---
+---If this property is not present the client only supports
+---the symbol kinds from `File` to `Array` as defined in
+---the initial version of the protocol.
+---@field valueSet? lsp.SymbolKind[]
+
+---@class anonym21
+---The tags supported by the client.
+---@field valueSet lsp.SymbolTag[]
+
+---@class anonym22
+---The properties that a client can resolve lazily. Usually
+---`location.range`
+---@field properties string[]
+
+---@class anonym24
+---The tags supported by the client.
+---@field valueSet lsp.CompletionItemTag[]
+
+---@class anonym25
+---The properties that a client can resolve lazily.
+---@field properties string[]
+
+---@class anonym26
+---@field valueSet lsp.InsertTextMode[]
+
+---@class anonym23
+---Client supports snippets as insert text.
+---
+---A snippet can define tab stops and placeholders with `$1`, `$2`
+---and `${3:foo}`. `$0` defines the final tab stop, it defaults to
+---the end of the snippet. Placeholders with equal identifiers are linked,
+---that is typing in one will update others too.
+---@field snippetSupport? boolean
+---Client supports commit characters on a completion item.
+---@field commitCharactersSupport? boolean
+---Client supports the following content formats for the documentation
+---property. The order describes the preferred format of the client.
+---@field documentationFormat? lsp.MarkupKind[]
+---Client supports the deprecated property on a completion item.
+---@field deprecatedSupport? boolean
+---Client supports the preselect property on a completion item.
+---@field preselectSupport? boolean
+---Client supports the tag property on a completion item. Clients supporting
+---tags have to handle unknown tags gracefully. Clients especially need to
+---preserve unknown tags when sending a completion item back to the server in
+---a resolve call.
+---
+---@since 3.15.0
+---@field tagSupport? anonym24
+---Client support insert replace edit to control different behavior if a
+---completion item is inserted in the text or should replace text.
+---
+---@since 3.16.0
+---@field insertReplaceSupport? boolean
+---Indicates which properties a client can resolve lazily on a completion
+---item. Before version 3.16.0 only the predefined properties `documentation`
+---and `details` could be resolved lazily.
+---
+---@since 3.16.0
+---@field resolveSupport? anonym25
+---The client supports the `insertTextMode` property on
+---a completion item to override the whitespace handling mode
+---as defined by the client (see `insertTextMode`).
+---
+---@since 3.16.0
+---@field insertTextModeSupport? anonym26
+---The client has support for completion item label
+---details (see also `CompletionItemLabelDetails`).
+---
+---@since 3.17.0
+---@field labelDetailsSupport? boolean
+
+---@class anonym27
+---The completion item kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---
+---If this property is not present the client only supports
+---the completion items kinds from `Text` to `Reference` as defined in
+---the initial version of the protocol.
+---@field valueSet? lsp.CompletionItemKind[]
+
+---@class anonym28
+---The client supports the following itemDefaults on
+---a completion list.
+---
+---The value lists the supported property names of the
+---`CompletionList.itemDefaults` object. If omitted
+---no properties are supported.
+---
+---@since 3.17.0
+---@field itemDefaults? string[]
+
+---@class anonym30
+---The client supports processing label offsets instead of a
+---simple label string.
+---
+---@since 3.14.0
+---@field labelOffsetSupport? boolean
+
+---@class anonym29
+---Client supports the following content formats for the documentation
+---property. The order describes the preferred format of the client.
+---@field documentationFormat? lsp.MarkupKind[]
+---Client capabilities specific to parameter information.
+---@field parameterInformation? anonym30
+---The client supports the `activeParameter` property on `SignatureInformation`
+---literal.
+---
+---@since 3.16.0
+---@field activeParameterSupport? boolean
+
+---@class anonym31
+---The symbol kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---
+---If this property is not present the client only supports
+---the symbol kinds from `File` to `Array` as defined in
+---the initial version of the protocol.
+---@field valueSet? lsp.SymbolKind[]
+
+---@class anonym32
+---The tags supported by the client.
+---@field valueSet lsp.SymbolTag[]
+
+---@class anonym34
+---The code action kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---@field valueSet lsp.CodeActionKind[]
+
+---@class anonym33
+---The code action kind is support with the following value
+---set.
+---@field codeActionKind anonym34
+
+---@class anonym35
+---The properties that a client can resolve lazily.
+---@field properties string[]
+
+---@class anonym36
+---The folding range kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---@field valueSet? lsp.FoldingRangeKind[]
+
+---@class anonym37
+---If set, the client signals that it supports setting collapsedText on
+---folding ranges to display custom labels instead of the default text.
+---
+---@since 3.17.0
+---@field collapsedText? boolean
+
+---@class anonym38
+---The tags supported by the client.
+---@field valueSet lsp.DiagnosticTag[]
+
+---@class anonym40
+
+---@class anonym41
+---The client will send the `textDocument/semanticTokens/full/delta` request if
+---the server provides a corresponding handler.
+---@field delta? boolean
+
+---@class anonym39
+---The client will send the `textDocument/semanticTokens/range` request if
+---the server provides a corresponding handler.
+---@field range? boolean|anonym40
+---The client will send the `textDocument/semanticTokens/full` request if
+---the server provides a corresponding handler.
+---@field full? boolean|anonym41
+
+---@class anonym42
+---The properties that a client can resolve lazily.
+---@field properties string[]
+
+---@class anonym43
+---Whether the client supports additional attributes which
+---are preserved and send back to the server in the
+---request's response.
+---@field additionalPropertiesSupport? boolean
+
+---@class anonym44
+---@field range lsp.Range
+---@field placeholder string
+
+---@class anonym45
+---@field defaultBehavior boolean
+
+---@class anonym46
+---The range of the document that changed.
+---@field range lsp.Range
+---The optional length of the range that got replaced.
+---
+---@deprecated use range instead.
+---@field rangeLength? uinteger
+---The new text for the provided range.
+---@field text string
+
+---@class anonym47
+---The new text of the whole document.
+---@field text string
+
+---@class anonym48
+---@field language string
+---@field value string
+
+---@class anonym49
+---A language id, like `typescript`.
+---@field language string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme? string
+---A glob pattern, like `*.{ts,js}`.
+---@field pattern? string
+
+---@class anonym50
+---A language id, like `typescript`.
+---@field language? string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme string
+---A glob pattern, like `*.{ts,js}`.
+---@field pattern? string
+
+---@class anonym51
+---A language id, like `typescript`.
+---@field language? string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme? string
+---A glob pattern, like `*.{ts,js}`.
+---@field pattern string
+
+---@class anonym52
+---The type of the enclosing notebook.
+---@field notebookType string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme? string
+---A glob pattern.
+---@field pattern? string
+
+---@class anonym53
+---The type of the enclosing notebook.
+---@field notebookType? string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme string
+---A glob pattern.
+---@field pattern? string
+
+---@class anonym54
+---The type of the enclosing notebook.
+---@field notebookType? string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme? string
+---A glob pattern.
+---@field pattern string
-- 
cgit 


From 4ecc71f6fc7377403ed91ae5bc32992a5d08f678 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 7 Jun 2023 13:39:41 +0100
Subject: fix(lsp): reduce diagnostics and add more types (#23948)

---
 runtime/doc/lsp.txt              |  13 ++--
 runtime/lua/vim/lsp.lua          | 144 +++++++++++++++++++++++++--------------
 runtime/lua/vim/lsp/protocol.lua |   1 +
 3 files changed, 100 insertions(+), 58 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 581cfd5348..5b7c013c57 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -858,7 +858,7 @@ get_active_clients({filter})                    *vim.lsp.get_active_clients()*
                   • name (string): Only return clients with the given name
 
     Return: ~
-        (table) List of |vim.lsp.client| objects
+        lsp.Client []: List of |vim.lsp.client| objects
 
                                           *vim.lsp.get_buffers_by_client_id()*
 get_buffers_by_client_id({client_id})
@@ -961,7 +961,7 @@ start({config}, {opts})                                      *vim.lsp.start()*
     Parameters: ~
       • {config}  (table) Same configuration as documented in
                   |vim.lsp.start_client()|
-      • {opts}    nil|table Optional keyword arguments:
+      • {opts}    (nil|lsp.StartOpts) Optional keyword arguments:
                   • reuse_client (fun(client: client, config: table): boolean)
                     Predicate used to decide if a client should be re-used.
                     Used on all running clients. The default implementation
@@ -970,7 +970,7 @@ start({config}, {opts})                                      *vim.lsp.start()*
                     re-using a client (0 for current).
 
     Return: ~
-        (number|nil) client_id
+        (integer|nil) client_id
 
 start_client({config})                                *vim.lsp.start_client()*
     Starts and initializes a client with the given configuration.
@@ -978,7 +978,7 @@ start_client({config})                                *vim.lsp.start_client()*
     Field `cmd` in {config} is required.
 
     Parameters: ~
-      • {config}  (table) Configuration for the server:
+      • {config}  ( lsp.ClientConfig ) Configuration for the server:
                   • cmd: (string[]|fun(dispatchers: table):table) command a
                     list of strings treated like |jobstart()|. The command
                     must launch the language server process. `cmd` can also be
@@ -1108,7 +1108,7 @@ stop_client({client_id}, {force})                      *vim.lsp.stop_client()*
                      thereof
       • {force}      (boolean|nil) shutdown forcefully
 
-tagfunc({...})                                             *vim.lsp.tagfunc()*
+tagfunc({pattern}, {flags})                                *vim.lsp.tagfunc()*
     Provides an interface between the built-in client and 'tagfunc'.
 
     When used with normal mode commands (e.g. |CTRL-]|) this will invoke the
@@ -2168,6 +2168,9 @@ make_client_capabilities()
     Gets a new ClientCapabilities object describing the LSP client
     capabilities.
 
+    Return: ~
+        lsp.ClientCapabilities
+
                                      *vim.lsp.protocol.resolve_capabilities()*
 resolve_capabilities({server_capabilities})
     Creates a normalized object describing LSP server capabilities.
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 5f7a95ae14..532504a7db 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -147,9 +147,9 @@ local function next_client_id()
   return client_index
 end
 -- Tracks all clients created via lsp.start_client
-local active_clients = {}
-local all_buffer_active_clients = {}
-local uninitialized_clients = {}
+local active_clients = {} --- @type table<integer,lsp.Client>
+local all_buffer_active_clients = {} --- @type table<integer,table<integer,true>>
+local uninitialized_clients = {} --- @type table<integer,lsp.Client>
 
 ---@private
 ---@param bufnr? integer
@@ -166,7 +166,7 @@ local function for_each_buffer_client(bufnr, fn, restrict_client_ids)
   end
 
   if restrict_client_ids and #restrict_client_ids > 0 then
-    local filtered_client_ids = {}
+    local filtered_client_ids = {} --- @type table<integer,true>
     for client_id in pairs(client_ids) do
       if vim.list_contains(restrict_client_ids, client_id) then
         filtered_client_ids[client_id] = true
@@ -257,9 +257,10 @@ end
 ---@private
 --- Validates a client configuration as given to |vim.lsp.start_client()|.
 ---
----@param config (table)
----@return table config Cleaned config, containing the command, its
----arguments, and a valid encoding.
+---@param config (lsp.ClientConfig)
+---@return (string|fun(dispatchers:table):table) Command
+---@return string[] Arguments
+---@return string Encoding.
 local function validate_client_config(config)
   validate({
     config = { config, 't' },
@@ -290,22 +291,19 @@ local function validate_client_config(config)
     'flags.debounce_text_changes must be a number with the debounce time in milliseconds'
   )
 
-  local cmd, cmd_args
-  if type(config.cmd) == 'function' then
-    cmd = config.cmd
+  local cmd, cmd_args --- @type (string|fun(dispatchers:table):table), string[]
+  local config_cmd = config.cmd
+  if type(config_cmd) == 'function' then
+    cmd = config_cmd
   else
-    cmd, cmd_args = lsp._cmd_parts(config.cmd)
+    cmd, cmd_args = lsp._cmd_parts(config_cmd)
   end
   local offset_encoding = valid_encodings.UTF16
   if config.offset_encoding then
     offset_encoding = validate_encoding(config.offset_encoding)
   end
 
-  return {
-    cmd = cmd,
-    cmd_args = cmd_args,
-    offset_encoding = offset_encoding,
-  }
+  return cmd, cmd_args, offset_encoding
 end
 
 ---@private
@@ -328,10 +326,11 @@ end
 --- only the first returned value will be memoized and returned. The function will only be run once,
 --- even if it has side effects.
 ---
----@param fn (function) Function to run
----@return function fn Memoized function
+---@generic T: function
+---@param fn (T) Function to run
+---@return T
 local function once(fn)
-  local value
+  local value --- @type any
   local ran = false
   return function(...)
     if not ran then
@@ -371,7 +370,7 @@ do
   --- @field lines string[] snapshot of buffer lines from last didChange
   --- @field lines_tmp string[]
   --- @field pending_changes table[] List of debounced changes in incremental sync mode
-  --- @field timer nil|uv.uv_timer_t uv_timer
+  --- @field timer nil|uv_timer_t uv_timer
   --- @field last_flush nil|number uv.hrtime of the last flush/didChange-notification
   --- @field needs_flush boolean true if buffer updates haven't been sent to clients/servers yet
   --- @field refs integer how many clients are using this group
@@ -610,7 +609,7 @@ do
 
   ---@private
   function changetracking.send_changes(bufnr, firstline, lastline, new_lastline)
-    local groups = {}
+    local groups = {} ---@type table<string,CTGroup>
     for _, client in pairs(lsp.get_active_clients({ bufnr = bufnr })) do
       local group = get_group(client)
       groups[group_key(group)] = group
@@ -812,6 +811,10 @@ function lsp.client()
   error()
 end
 
+--- @class lsp.StartOpts
+--- @field reuse_client fun(client: lsp.Client, config: table): boolean
+--- @field bufnr integer
+
 --- Create a new LSP client and start a language server or reuses an already
 --- running client if one is found matching `name` and `root_dir`.
 --- Attaches the current buffer to the client.
@@ -849,7 +852,7 @@ end
 --- `ftplugin/<filetype_name>.lua` (See |ftplugin-name|)
 ---
 ---@param config table Same configuration as documented in |vim.lsp.start_client()|
----@param opts nil|table Optional keyword arguments:
+---@param opts (nil|lsp.StartOpts) Optional keyword arguments:
 ---             - reuse_client (fun(client: client, config: table): boolean)
 ---                            Predicate used to decide if a client should be re-used.
 ---                            Used on all running clients.
@@ -858,14 +861,13 @@ end
 ---             - bufnr (number)
 ---                     Buffer handle to attach to if starting or re-using a
 ---                     client (0 for current).
----@return number|nil client_id
+---@return integer|nil client_id
 function lsp.start(config, opts)
   opts = opts or {}
   local reuse_client = opts.reuse_client
     or function(client, conf)
       return client.config.root_dir == conf.root_dir and client.name == conf.name
     end
-  config.name = config.name
   if not config.name and type(config.cmd) == 'table' then
     config.name = config.cmd[1] and vim.fs.basename(config.cmd[1]) or nil
   end
@@ -930,6 +932,29 @@ function lsp._set_defaults(client, bufnr)
   end
 end
 
+--- @class lsp.ClientConfig
+--- @field cmd (string[]|fun(dispatchers: table):table)
+--- @field cmd_cwd string
+--- @field cmd_env (table)
+--- @field detached boolean
+--- @field workspace_folders (table)
+--- @field capabilities lsp.ClientCapabilities
+--- @field handlers table<string,function>
+--- @field settings table
+--- @field commands table
+--- @field init_options table
+--- @field name string
+--- @field get_language_id fun(bufnr: integer, filetype: string): string
+--- @field offset_encoding string
+--- @field on_error fun(code: integer)
+--- @field before_init function
+--- @field on_init function
+--- @field on_exit fun(code: integer, signal: integer, client_id: integer)
+--- @field on_attach fun(client: lsp.Client, bufnr: integer)
+--- @field trace 'off'|'messages'|'verbose'|nil
+--- @field flags table
+--- @field root_dir string
+
 -- FIXME: DOC: Currently all methods on the `vim.lsp.client` object are
 -- documented twice: Here, and on the methods themselves (e.g.
 -- `client.request()`). This is a workaround for the vimdoc generator script
@@ -940,7 +965,7 @@ end
 ---
 --- Field `cmd` in {config} is required.
 ---
----@param config (table) Configuration for the server:
+---@param config (lsp.ClientConfig) Configuration for the server:
 --- - cmd: (string[]|fun(dispatchers: table):table) command a list of
 ---       strings treated like |jobstart()|. The command must launch the language server
 ---       process. `cmd` can also be a function that creates an RPC client.
@@ -970,7 +995,7 @@ end
 ---       the LSP spec.
 ---
 --- - capabilities: Map overriding the default capabilities defined by
----       |vim.lsp.protocol.make_client_capabilities()|, passed to the language
+---       \|vim.lsp.protocol.make_client_capabilities()|, passed to the language
 ---       server on initialization. Hint: use make_client_capabilities() and modify
 ---       its result.
 ---       - Note: To send an empty dictionary use
@@ -1051,9 +1076,7 @@ end
 --- fully initialized. Use `on_init` to do any actions once
 --- the client has been initialized.
 function lsp.start_client(config)
-  local cleaned_config = validate_client_config(config)
-  local cmd, cmd_args, offset_encoding =
-    cleaned_config.cmd, cleaned_config.cmd_args, cleaned_config.offset_encoding
+  local cmd, cmd_args, offset_encoding = validate_client_config(config)
 
   config.flags = config.flags or {}
   config.settings = config.settings or {}
@@ -1090,7 +1113,9 @@ function lsp.start_client(config)
   ---@param method (string) LSP method name
   ---@param params (table) The parameters for that method.
   function dispatch.notification(method, params)
-    local _ = log.trace() and log.trace('notification', method, params)
+    if log.trace() then
+      log.trace('notification', method, params)
+    end
     local handler = resolve_handler(method)
     if handler then
       -- Method name is provided here for convenience.
@@ -1104,13 +1129,19 @@ function lsp.start_client(config)
   ---@param method (string) LSP method name
   ---@param params (table) The parameters for that method
   function dispatch.server_request(method, params)
-    local _ = log.trace() and log.trace('server_request', method, params)
+    if log.trace() then
+      log.trace('server_request', method, params)
+    end
     local handler = resolve_handler(method)
     if handler then
-      local _ = log.trace() and log.trace('server_request: found handler for', method)
+      if log.trace() then
+        log.trace('server_request: found handler for', method)
+      end
       return handler(nil, params, { method = method, client_id = client_id })
     end
-    local _ = log.warn() and log.warn('server_request: no handler found for', method)
+    if log.warn() then
+      log.warn('server_request: no handler found for', method)
+    end
     return nil, lsp.rpc_response_error(protocol.ErrorCodes.MethodNotFound)
   end
 
@@ -1122,8 +1153,9 @@ function lsp.start_client(config)
   ---@see `vim.lsp.rpc.client_errors` for possible errors. Use
   ---`vim.lsp.rpc.client_errors[code]` to get a human-friendly name.
   function dispatch.on_error(code, err)
-    local _ = log.error()
-      and log.error(log_prefix, 'on_error', { code = lsp.client_errors[code], err = err })
+    if log.error() then
+      log.error(log_prefix, 'on_error', { code = lsp.client_errors[code], err = err })
+    end
     err_message(log_prefix, ': Error ', lsp.client_errors[code], ': ', vim.inspect(err))
     if config.on_error then
       local status, usererr = pcall(config.on_error, code, err)
@@ -1232,11 +1264,13 @@ function lsp.start_client(config)
     handlers = handlers,
     commands = config.commands or {},
 
+    --- @type table<integer,{ type: string, bufnr: integer, method: string}>
     requests = {},
     -- for $/progress report
     messages = { name = name, messages = {}, progress = {}, status = {} },
     dynamic_capabilities = require('vim.lsp._dynamic').new(client_id),
   }
+  --- @type lsp.ClientCapabilities
   client.config.capabilities = config.capabilities or protocol.make_client_capabilities()
 
   -- Store the uninitialized_clients for cleanup in case we exit before initialize finishes.
@@ -1251,9 +1285,9 @@ function lsp.start_client(config)
     }
     local version = vim.version()
 
-    local workspace_folders
-    local root_uri
-    local root_path
+    local workspace_folders --- @type table[]?
+    local root_uri --- @type string?
+    local root_path --- @type string?
     if config.workspace_folders or config.root_dir then
       if config.root_dir and not config.workspace_folders then
         workspace_folders = {
@@ -1278,7 +1312,7 @@ function lsp.start_client(config)
       -- the process has not been started by another process.  If the parent
       -- process is not alive then the server should exit (see exit notification)
       -- its process.
-      processId = uv.getpid(),
+      processId = uv.os_getpid(),
       -- Information about the client
       -- since 3.15.0
       clientInfo = {
@@ -1405,8 +1439,9 @@ function lsp.start_client(config)
     -- Ensure pending didChange notifications are sent so that the server doesn't operate on a stale state
     changetracking.flush(client, bufnr)
     bufnr = resolve_bufnr(bufnr)
-    local _ = log.debug()
-      and log.debug(log_prefix, 'client.request', client_id, method, params, handler, bufnr)
+    if log.debug() then
+      log.debug(log_prefix, 'client.request', client_id, method, params, handler, bufnr)
+    end
     local success, request_id = rpc.request(method, params, function(err, result)
       handler(
         err,
@@ -1879,13 +1914,13 @@ end
 ---               - id (number): Only return clients with the given id
 ---               - bufnr (number): Only return clients attached to this buffer
 ---               - name (string): Only return clients with the given name
----@returns (table) List of |vim.lsp.client| objects
+---@return lsp.Client[]: List of |vim.lsp.client| objects
 function lsp.get_active_clients(filter)
   validate({ filter = { filter, 't', true } })
 
   filter = filter or {}
 
-  local clients = {}
+  local clients = {} --- @type lsp.Client[]
 
   local t = filter.bufnr and (all_buffer_active_clients[resolve_bufnr(filter.bufnr)] or {})
     or active_clients
@@ -2143,20 +2178,20 @@ end
 --- - findstart=0: column where the completion starts, or -2 or -3
 --- - findstart=1: list of matches (actually just calls |complete()|)
 function lsp.omnifunc(findstart, base)
-  local _ = log.debug() and log.debug('omnifunc.findstart', { findstart = findstart, base = base })
+  if log.debug() then
+    log.debug('omnifunc.findstart', { findstart = findstart, base = base })
+  end
 
   local bufnr = resolve_bufnr()
   local has_buffer_clients = not tbl_isempty(all_buffer_active_clients[bufnr] or {})
   if not has_buffer_clients then
-    if findstart == 1 then
-      return -1
-    else
-      return {}
-    end
+    return findstart == 1 and -1 or {}
   end
 
   -- Then, perform standard completion request
-  local _ = log.info() and log.info('base ', base)
+  if log.info() then
+    log.info('base ', base)
+  end
 
   local pos = api.nvim_win_get_cursor(0)
   local line = api.nvim_get_current_line()
@@ -2270,8 +2305,8 @@ end
 ---@param flags string See |tag-function|
 ---
 ---@return table[] tags A list of matching tags
-function lsp.tagfunc(...)
-  return require('vim.lsp.tagfunc')(...)
+function lsp.tagfunc(pattern, flags)
+  return require('vim.lsp.tagfunc')(pattern, flags)
 end
 
 ---Checks whether a client is stopped.
@@ -2359,10 +2394,13 @@ end
 --- are valid keys and make sense to include for this handler.
 ---
 --- Will error on invalid keys (i.e. keys that do not exist in the options)
+--- @param name string
+--- @param options table<string,any>
+--- @param user_config table<string,any>
 function lsp._with_extend(name, options, user_config)
   user_config = user_config or {}
 
-  local resulting_config = {}
+  local resulting_config = {} --- @type table<string,any>
   for k, v in pairs(user_config) do
     if options[k] == nil then
       error(
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 7558b5c6ba..172d43e483 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -632,6 +632,7 @@ export interface WorkspaceClientCapabilities {
 
 --- Gets a new ClientCapabilities object describing the LSP client
 --- capabilities.
+--- @return lsp.ClientCapabilities
 function protocol.make_client_capabilities()
   return {
     general = {
-- 
cgit 


From c0952e62fd0ee16a3275bb69e0de04c836b39015 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 7 Jun 2023 13:52:23 +0100
Subject: feat(lua): add `vim.system()`

feat(lua): add vim.system()

Problem:

  Handling system commands in Lua is tedious and error-prone:
  - vim.fn.jobstart() is vimscript and comes with all limitations attached to typval.
  - vim.loop.spawn is too low level

Solution:

  Add vim.system().
  Partly inspired by Python's subprocess module
  Does not expose any libuv objects.
---
 runtime/doc/lua.txt         |  71 +++++++++
 runtime/doc/news.txt        |   2 +
 runtime/lua/man.lua         |  82 ++---------
 runtime/lua/vim/_editor.lua |  99 ++++++++++---
 runtime/lua/vim/_system.lua | 342 ++++++++++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/rpc.lua | 124 ++++++----------
 6 files changed, 553 insertions(+), 167 deletions(-)
 create mode 100644 runtime/lua/vim/_system.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 38289dc5d0..5e0a1edc11 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1566,6 +1566,77 @@ schedule_wrap({cb})                                      *vim.schedule_wrap()*
       • |vim.schedule()|
       • |vim.in_fast_event()|
 
+system({cmd}, {opts}, {on_exit})                                *vim.system()*
+    Run a system command
+
+    Examples: >lua
+
+      local on_exit = function(obj)
+        print(obj.code)
+        print(obj.signal)
+        print(obj.stdout)
+        print(obj.stderr)
+      end
+
+      -- Run asynchronously
+      vim.system({'echo', 'hello'}, { text = true }, on_exit)
+
+      -- Run synchronously
+      local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
+      -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
+<
+
+    See |uv.spawn()| for more details.
+
+    Parameters: ~
+      • {cmd}      (string[]) Command to execute
+      • {opts}     (SystemOpts|nil) Options:
+                   • cwd: (string) Set the current working directory for the
+                     sub-process.
+                   • env: table<string,string> Set environment variables for
+                     the new process. Inherits the current environment with
+                     `NVIM` set to |v:servername|.
+                   • clear_env: (boolean) `env` defines the job environment
+                     exactly, instead of merging current environment.
+                   • stdin: (string|string[]|boolean) If `true`, then a pipe
+                     to stdin is opened and can be written to via the
+                     `write()` method to SystemObj. If string or string[] then
+                     will be written to stdin and closed. Defaults to `false`.
+                   • stdout: (boolean|function) Handle output from stdout.
+                     When passed as a function must have the signature
+                     `fun(err: string, data: string)`. Defaults to `true`
+                   • stderr: (boolean|function) Handle output from stdout.
+                     When passed as a function must have the signature
+                     `fun(err: string, data: string)`. Defaults to `true`.
+                   • text: (boolean) Handle stdout and stderr as text.
+                     Replaces `\r\n` with `\n`.
+                   • timeout: (integer)
+                   • detach: (boolean) If true, spawn the child process in a
+                     detached state - this will make it a process group
+                     leader, and will effectively enable the child to keep
+                     running after the parent exits. Note that the child
+                     process will still keep the parent's event loop alive
+                     unless the parent process calls |uv.unref()| on the
+                     child's process handle.
+      • {on_exit}  (function|nil) Called when subprocess exits. When provided,
+                   the command runs asynchronously. Receives SystemCompleted
+                   object, see return of SystemObj:wait().
+
+    Return: ~
+        SystemObj Object with the fields:
+        • pid (integer) Process ID
+        • wait (fun(timeout: integer|nil): SystemCompleted)
+          • SystemCompleted is an object with the fields:
+            • code: (integer)
+            • signal: (integer)
+            • stdout: (string), nil if stdout argument is passed
+            • stderr: (string), nil if stderr argument is passed
+
+        • kill (fun(signal: integer))
+        • write (fun(data: string|nil)) Requires `stdin=true`. Pass `nil` to
+          close the stream.
+        • is_closing (fun(): boolean)
+
 
 ==============================================================================
 Lua module: inspector                                          *lua-inspector*
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index af5263bcf5..4afb3429f4 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -76,6 +76,8 @@ The following new APIs or features were added.
   is resized horizontally). Note: Lines that are not visible and kept in
   |'scrollback'| are not reflown.
 
+• |vim.system()| for running system commands.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index 09265b1999..08aff20a03 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -14,79 +14,19 @@ local function man_error(msg)
 end
 
 -- Run a system command and timeout after 30 seconds.
----@param cmd_ string[]
+---@param cmd string[]
 ---@param silent boolean?
----@param env string[]
+---@param env? table<string,string|number>
 ---@return string
-local function system(cmd_, silent, env)
-  local stdout_data = {} ---@type string[]
-  local stderr_data = {} ---@type string[]
-  local stdout = assert(vim.uv.new_pipe(false))
-  local stderr = assert(vim.uv.new_pipe(false))
+local function system(cmd, silent, env)
+  local r = vim.system(cmd, { env = env, timeout = 10000 }):wait()
 
-  local done = false
-  local exit_code ---@type integer?
-
-  -- We use the `env` command here rather than the env option to vim.uv.spawn since spawn will
-  -- completely overwrite the environment when we just want to modify the existing one.
-  --
-  -- Overwriting mainly causes problems NixOS which relies heavily on a non-standard environment.
-  local cmd = cmd_
-  if env then
-    cmd = { 'env' }
-    vim.list_extend(cmd, env)
-    vim.list_extend(cmd, cmd_)
-  end
-
-  local handle
-  handle = vim.uv.spawn(cmd[1], {
-    args = vim.list_slice(cmd, 2),
-    stdio = { nil, stdout, stderr },
-  }, function(code)
-    exit_code = code
-    stdout:close()
-    stderr:close()
-    handle:close()
-    done = true
-  end)
-
-  if handle then
-    stdout:read_start(function(_, data)
-      stdout_data[#stdout_data + 1] = data
-    end)
-    stderr:read_start(function(_, data)
-      stderr_data[#stderr_data + 1] = data
-    end)
-  else
-    stdout:close()
-    stderr:close()
-    if not silent then
-      local cmd_str = table.concat(cmd, ' ')
-      man_error(string.format('command error: %s', cmd_str))
-    end
-    return ''
-  end
-
-  vim.wait(30000, function()
-    return done
-  end)
-
-  if not done then
-    if handle then
-      handle:close()
-      stdout:close()
-      stderr:close()
-    end
-    local cmd_str = table.concat(cmd, ' ')
-    man_error(string.format('command timed out: %s', cmd_str))
-  end
-
-  if exit_code ~= 0 and not silent then
+  if r.code ~= 0 and not silent then
     local cmd_str = table.concat(cmd, ' ')
-    man_error(string.format("command error '%s': %s", cmd_str, table.concat(stderr_data)))
+    man_error(string.format("command error '%s': %s", cmd_str, r.stderr))
   end
 
-  return table.concat(stdout_data)
+  return assert(r.stdout)
 end
 
 ---@param line string
@@ -312,7 +252,7 @@ local function get_path(sect, name, silent)
   end
 
   local lines = system(cmd, silent)
-  local results = vim.split(lines or {}, '\n', { trimempty = true })
+  local results = vim.split(lines, '\n', { trimempty = true })
 
   if #results == 0 then
     return
@@ -505,9 +445,9 @@ local function get_page(path, silent)
   -- http://comments.gmane.org/gmane.editors.vim.devel/29085
   -- Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces.
   return system(cmd, silent, {
-    'MANPAGER=cat',
-    'MANWIDTH=' .. manwidth,
-    'MAN_KEEP_FORMATTING=1',
+    MANPAGER = 'cat',
+    MANWIDTH = manwidth,
+    MAN_KEEP_FORMATTING = 1,
   })
 end
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 7b946a55e4..d46b0fbf32 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -42,10 +42,6 @@ for k, v in pairs({
   vim._submodules[k] = v
 end
 
--- Remove at Nvim 1.0
----@deprecated
-vim.loop = vim.uv
-
 -- There are things which have special rules in vim._init_packages
 -- for legacy reasons (uri) or for performance (_inspector).
 -- most new things should go into a submodule namespace ( vim.foobar.do_thing() )
@@ -69,13 +65,73 @@ vim.log = {
   },
 }
 
--- Internal-only until comments in #8107 are addressed.
--- Returns:
---    {errcode}, {output}
-function vim._system(cmd)
-  local out = vim.fn.system(cmd)
-  local err = vim.v.shell_error
-  return err, out
+-- TODO(lewis6991): document that the signature is system({cmd}, [{opts},] {on_exit})
+--- Run a system command
+---
+--- Examples:
+--- <pre>lua
+---
+---   local on_exit = function(obj)
+---     print(obj.code)
+---     print(obj.signal)
+---     print(obj.stdout)
+---     print(obj.stderr)
+---   end
+---
+---   -- Run asynchronously
+---   vim.system({'echo', 'hello'}, { text = true }, on_exit)
+---
+---   -- Run synchronously
+---   local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
+---   -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
+---
+--- </pre>
+---
+--- See |uv.spawn()| for more details.
+---
+--- @param cmd (string[]) Command to execute
+--- @param opts (SystemOpts|nil) Options:
+---   - cwd: (string) Set the current working directory for the sub-process.
+---   - env: table<string,string> Set environment variables for the new process. Inherits the
+---     current environment with `NVIM` set to |v:servername|.
+---   - clear_env: (boolean) `env` defines the job environment exactly, instead of merging current
+---     environment.
+---   - stdin: (string|string[]|boolean) If `true`, then a pipe to stdin is opened and can be written
+---     to via the `write()` method to SystemObj. If string or string[] then will be written to stdin
+---     and closed. Defaults to `false`.
+---   - stdout: (boolean|function)
+---     Handle output from stdout. When passed as a function must have the signature `fun(err: string, data: string)`.
+---     Defaults to `true`
+---   - stderr: (boolean|function)
+---     Handle output from stdout. When passed as a function must have the signature `fun(err: string, data: string)`.
+---     Defaults to `true`.
+---   - text: (boolean) Handle stdout and stderr as text. Replaces `\r\n` with `\n`.
+---   - timeout: (integer)
+---   - detach: (boolean) If true, spawn the child process in a detached state - this will make it
+---     a process group leader, and will effectively enable the child to keep running after the
+---     parent exits. Note that the child process will still keep the parent's event loop alive
+---     unless the parent process calls |uv.unref()| on the child's process handle.
+---
+--- @param on_exit (function|nil) Called when subprocess exits. When provided, the command runs
+---   asynchronously. Receives SystemCompleted object, see return of SystemObj:wait().
+---
+--- @return SystemObj Object with the fields:
+---   - pid (integer) Process ID
+---   - wait (fun(timeout: integer|nil): SystemCompleted)
+---     - SystemCompleted is an object with the fields:
+---      - code: (integer)
+---      - signal: (integer)
+---      - stdout: (string), nil if stdout argument is passed
+---      - stderr: (string), nil if stderr argument is passed
+---   - kill (fun(signal: integer))
+---   - write (fun(data: string|nil)) Requires `stdin=true`. Pass `nil` to close the stream.
+---   - is_closing (fun(): boolean)
+function vim.system(cmd, opts, on_exit)
+  if type(opts) == 'function' then
+    on_exit = opts
+    opts = nil
+  end
+  return require('vim._system').run(cmd, opts, on_exit)
 end
 
 -- Gets process info from the `ps` command.
@@ -85,13 +141,14 @@ function vim._os_proc_info(pid)
     error('invalid pid')
   end
   local cmd = { 'ps', '-p', pid, '-o', 'comm=' }
-  local err, name = vim._system(cmd)
-  if 1 == err and vim.trim(name) == '' then
+  local r = vim.system(cmd):wait()
+  local name = assert(r.stdout)
+  if r.code == 1 and vim.trim(name) == '' then
     return {} -- Process not found.
-  elseif 0 ~= err then
+  elseif r.code ~= 0 then
     error('command failed: ' .. vim.fn.string(cmd))
   end
-  local _, ppid = vim._system({ 'ps', '-p', pid, '-o', 'ppid=' })
+  local ppid = assert(vim.system({ 'ps', '-p', pid, '-o', 'ppid=' }):wait().stdout)
   -- Remove trailing whitespace.
   name = vim.trim(name):gsub('^.*/', '')
   ppid = tonumber(ppid) or -1
@@ -109,14 +166,14 @@ function vim._os_proc_children(ppid)
     error('invalid ppid')
   end
   local cmd = { 'pgrep', '-P', ppid }
-  local err, rv = vim._system(cmd)
-  if 1 == err and vim.trim(rv) == '' then
+  local r = vim.system(cmd):wait()
+  if r.code == 1 and vim.trim(r.stdout) == '' then
     return {} -- Process not found.
-  elseif 0 ~= err then
+  elseif r.code ~= 0 then
     error('command failed: ' .. vim.fn.string(cmd))
   end
   local children = {}
-  for s in rv:gmatch('%S+') do
+  for s in r.stdout:gmatch('%S+') do
     local i = tonumber(s)
     if i ~= nil then
       table.insert(children, i)
@@ -1006,4 +1063,8 @@ end
 
 require('vim._meta')
 
+-- Remove at Nvim 1.0
+---@deprecated
+vim.loop = vim.uv
+
 return vim
diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua
new file mode 100644
index 0000000000..eadf801a31
--- /dev/null
+++ b/runtime/lua/vim/_system.lua
@@ -0,0 +1,342 @@
+local uv = vim.uv
+
+--- @class SystemOpts
+--- @field cmd string[]
+--- @field stdin string|string[]|true
+--- @field stdout fun(err:string, data: string)|false
+--- @field stderr fun(err:string, data: string)|false
+--- @field cwd? string
+--- @field env? table<string,string|number>
+--- @field clear_env? boolean
+--- @field text boolean?
+--- @field timeout? integer Timeout in ms
+--- @field detach? boolean
+
+--- @class SystemCompleted
+--- @field code integer
+--- @field signal integer
+--- @field stdout? string
+--- @field stderr? string
+
+--- @class SystemState
+--- @field handle uv_process_t
+--- @field timer uv_timer_t
+--- @field pid integer
+--- @field timeout? integer
+--- @field done boolean
+--- @field stdin uv_stream_t?
+--- @field stdout uv_stream_t?
+--- @field stderr uv_stream_t?
+--- @field cmd string[]
+--- @field result? SystemCompleted
+
+---@private
+---@param state SystemState
+local function close_handles(state)
+  for _, handle in pairs({ state.handle, state.stdin, state.stdout, state.stderr }) do
+    if not handle:is_closing() then
+      handle:close()
+    end
+  end
+end
+
+--- @param cmd string[]
+--- @return SystemCompleted
+local function timeout_result(cmd)
+  local cmd_str = table.concat(cmd, ' ')
+  local err = string.format("Command timed out: '%s'", cmd_str)
+  return { code = 0, signal = 2, stdout = '', stderr = err }
+end
+
+--- @class SystemObj
+--- @field pid integer
+--- @field private _state SystemState
+--- @field wait fun(self: SystemObj, timeout?: integer): SystemCompleted
+--- @field kill fun(self: SystemObj, signal: integer)
+--- @field write fun(self: SystemObj, data?: string|string[])
+--- @field is_closing fun(self: SystemObj): boolean?
+local SystemObj = {}
+
+--- @param state SystemState
+--- @return SystemObj
+local function new_systemobj(state)
+  return setmetatable({
+    pid = state.pid,
+    _state = state,
+  }, { __index = SystemObj })
+end
+
+--- @param signal integer
+function SystemObj:kill(signal)
+  local state = self._state
+  state.handle:kill(signal)
+  close_handles(state)
+end
+
+local MAX_TIMEOUT = 2 ^ 31
+
+--- @param timeout? integer
+--- @return SystemCompleted
+function SystemObj:wait(timeout)
+  local state = self._state
+
+  vim.wait(timeout or state.timeout or MAX_TIMEOUT, function()
+    return state.done
+  end)
+
+  if not state.done then
+    self:kill(6) -- 'sigint'
+    state.result = timeout_result(state.cmd)
+  end
+
+  return state.result
+end
+
+--- @param data string[]|string|nil
+function SystemObj:write(data)
+  local stdin = self._state.stdin
+
+  if not stdin then
+    error('stdin has not been opened on this object')
+  end
+
+  if type(data) == 'table' then
+    for _, v in ipairs(data) do
+      stdin:write(v)
+      stdin:write('\n')
+    end
+  elseif type(data) == 'string' then
+    stdin:write(data)
+  elseif data == nil then
+    -- Shutdown the write side of the duplex stream and then close the pipe.
+    -- Note shutdown will wait for all the pending write requests to complete
+    -- TODO(lewis6991): apparently shutdown doesn't behave this way.
+    -- (https://github.com/neovim/neovim/pull/17620#discussion_r820775616)
+    stdin:write('', function()
+      stdin:shutdown(function()
+        if stdin then
+          stdin:close()
+        end
+      end)
+    end)
+  end
+end
+
+--- @return boolean
+function SystemObj:is_closing()
+  local handle = self._state.handle
+  return handle == nil or handle:is_closing()
+end
+
+---@private
+---@param output function|'false'
+---@return uv_stream_t?
+---@return function? Handler
+local function setup_output(output)
+  if output == nil then
+    return assert(uv.new_pipe(false)), nil
+  end
+
+  if type(output) == 'function' then
+    return assert(uv.new_pipe(false)), output
+  end
+
+  assert(output == false)
+  return nil, nil
+end
+
+---@private
+---@param input string|string[]|true|nil
+---@return uv_stream_t?
+---@return string|string[]?
+local function setup_input(input)
+  if not input then
+    return
+  end
+
+  local towrite --- @type string|string[]?
+  if type(input) == 'string' or type(input) == 'table' then
+    towrite = input
+  end
+
+  return assert(uv.new_pipe(false)), towrite
+end
+
+--- @return table<string,string>
+local function base_env()
+  local env = vim.fn.environ()
+  env['NVIM'] = vim.v.servername
+  env['NVIM_LISTEN_ADDRESS'] = nil
+  return env
+end
+
+--- uv.spawn will completely overwrite the environment
+--- when we just want to modify the existing one, so
+--- make sure to prepopulate it with the current env.
+--- @param env? table<string,string|number>
+--- @param clear_env? boolean
+--- @return string[]?
+local function setup_env(env, clear_env)
+  if clear_env then
+    return env
+  end
+
+  --- @type table<string,string|number>
+  env = vim.tbl_extend('force', base_env(), env or {})
+
+  local renv = {} --- @type string[]
+  for k, v in pairs(env) do
+    renv[#renv + 1] = string.format('%s=%s', k, tostring(v))
+  end
+
+  return renv
+end
+
+--- @param stream uv_stream_t
+--- @param text? boolean
+--- @param bucket string[]
+--- @return fun(err: string?, data: string?)
+local function default_handler(stream, text, bucket)
+  return function(err, data)
+    if err then
+      error(err)
+    end
+    if data ~= nil then
+      if text then
+        bucket[#bucket + 1] = data:gsub('\r\n', '\n')
+      else
+        bucket[#bucket + 1] = data
+      end
+    else
+      stream:read_stop()
+      stream:close()
+    end
+  end
+end
+
+local M = {}
+
+--- @param cmd string
+--- @param opts uv.aliases.spawn_options
+--- @param on_exit fun(code: integer, signal: integer)
+--- @param on_error fun()
+--- @return uv_process_t, integer
+local function spawn(cmd, opts, on_exit, on_error)
+  local handle, pid_or_err = uv.spawn(cmd, opts, on_exit)
+  if not handle then
+    on_error()
+    error(pid_or_err)
+  end
+  return handle, pid_or_err --[[@as integer]]
+end
+
+--- Run a system command
+---
+--- @param cmd string[]
+--- @param opts? SystemOpts
+--- @param on_exit? fun(out: SystemCompleted)
+--- @return SystemObj
+function M.run(cmd, opts, on_exit)
+  vim.validate({
+    cmd = { cmd, 'table' },
+    opts = { opts, 'table', true },
+    on_exit = { on_exit, 'function', true },
+  })
+
+  opts = opts or {}
+
+  local stdout, stdout_handler = setup_output(opts.stdout)
+  local stderr, stderr_handler = setup_output(opts.stderr)
+  local stdin, towrite = setup_input(opts.stdin)
+
+  --- @type SystemState
+  local state = {
+    done = false,
+    cmd = cmd,
+    timeout = opts.timeout,
+    stdin = stdin,
+    stdout = stdout,
+    stderr = stderr,
+  }
+
+  -- Define data buckets as tables and concatenate the elements at the end as
+  -- one operation.
+  --- @type string[], string[]
+  local stdout_data, stderr_data
+
+  state.handle, state.pid = spawn(cmd[1], {
+    args = vim.list_slice(cmd, 2),
+    stdio = { stdin, stdout, stderr },
+    cwd = opts.cwd,
+    env = setup_env(opts.env, opts.clear_env),
+    detached = opts.detach,
+    hide = true,
+  }, function(code, signal)
+    close_handles(state)
+    if state.timer then
+      state.timer:stop()
+      state.timer:close()
+    end
+
+    local check = assert(uv.new_check())
+
+    check:start(function()
+      for _, pipe in pairs({ state.stdin, state.stdout, state.stderr }) do
+        if not pipe:is_closing() then
+          return
+        end
+      end
+      check:stop()
+
+      state.done = true
+      state.result = {
+        code = code,
+        signal = signal,
+        stdout = stdout_data and table.concat(stdout_data) or nil,
+        stderr = stderr_data and table.concat(stderr_data) or nil,
+      }
+
+      if on_exit then
+        on_exit(state.result)
+      end
+    end)
+  end, function()
+    close_handles(state)
+  end)
+
+  if stdout then
+    stdout_data = {}
+    stdout:read_start(stdout_handler or default_handler(stdout, opts.text, stdout_data))
+  end
+
+  if stderr then
+    stderr_data = {}
+    stderr:read_start(stderr_handler or default_handler(stderr, opts.text, stderr_data))
+  end
+
+  local obj = new_systemobj(state)
+
+  if towrite then
+    obj:write(towrite)
+    obj:write(nil) -- close the stream
+  end
+
+  if opts.timeout then
+    state.timer = assert(uv.new_timer())
+    state.timer:start(opts.timeout, 0, function()
+      state.timer:stop()
+      state.timer:close()
+      if state.handle and state.handle:is_active() then
+        obj:kill(6) --- 'sigint'
+        state.result = timeout_result(state.cmd)
+        if on_exit then
+          on_exit(state.result)
+        end
+      end
+    end)
+  end
+
+  return obj
+end
+
+return M
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index 5f48effebf..64bc732bdf 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -14,32 +14,6 @@ local function is_dir(filename)
   return stat and stat.type == 'directory' or false
 end
 
----@private
---- Merges current process env with the given env and returns the result as
---- a list of "k=v" strings.
----
---- <pre>
---- Example:
----
----  in:    { PRODUCTION="false", PATH="/usr/bin/", PORT=123, HOST="0.0.0.0", }
----  out:   { "PRODUCTION=false", "PATH=/usr/bin/", "PORT=123", "HOST=0.0.0.0", }
---- </pre>
----@param env (table) table of environment variable assignments
----@returns (table) list of `"k=v"` strings
-local function env_merge(env)
-  if env == nil then
-    return env
-  end
-  -- Merge.
-  env = vim.tbl_extend('force', vim.fn.environ(), env)
-  local final_env = {}
-  for k, v in pairs(env) do
-    assert(type(k) == 'string', 'env must be a dict')
-    table.insert(final_env, k .. '=' .. tostring(v))
-  end
-  return final_env
-end
-
 ---@private
 --- Embeds the given string into a table and correctly computes `Content-Length`.
 ---
@@ -658,89 +632,85 @@ end
 --- - `is_closing()` returns a boolean indicating if the RPC is closing.
 --- - `terminate()` terminates the RPC client.
 local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
-  local _ = log.info()
-    and log.info('Starting RPC client', { cmd = cmd, args = cmd_args, extra = extra_spawn_params })
+  if log.info() then
+    log.info('Starting RPC client', { cmd = cmd, args = cmd_args, extra = extra_spawn_params })
+  end
+
   validate({
     cmd = { cmd, 's' },
     cmd_args = { cmd_args, 't' },
     dispatchers = { dispatchers, 't', true },
   })
 
-  if extra_spawn_params and extra_spawn_params.cwd then
+  extra_spawn_params = extra_spawn_params or {}
+
+  if extra_spawn_params.cwd then
     assert(is_dir(extra_spawn_params.cwd), 'cwd must be a directory')
   end
 
   dispatchers = merge_dispatchers(dispatchers)
-  local stdin = uv.new_pipe(false)
-  local stdout = uv.new_pipe(false)
-  local stderr = uv.new_pipe(false)
-  local handle, pid
+
+  local sysobj ---@type SystemObj
 
   local client = new_client(dispatchers, {
     write = function(msg)
-      stdin:write(msg)
+      sysobj:write(msg)
     end,
     is_closing = function()
-      return handle == nil or handle:is_closing()
+      return sysobj == nil or sysobj:is_closing()
     end,
     terminate = function()
-      if handle then
-        handle:kill(15)
-      end
+      sysobj:kill(15)
     end,
   })
 
-  ---@private
-  --- Callback for |vim.uv.spawn()| Closes all streams and runs the `on_exit` dispatcher.
-  ---@param code (integer) Exit code
-  ---@param signal (integer) Signal that was used to terminate (if any)
-  local function onexit(code, signal)
-    stdin:close()
-    stdout:close()
-    stderr:close()
-    handle:close()
-    dispatchers.on_exit(code, signal)
+  local handle_body = function(body)
+    client:handle_body(body)
   end
-  local spawn_params = {
-    args = cmd_args,
-    stdio = { stdin, stdout, stderr },
-    detached = not is_win,
-  }
-  if extra_spawn_params then
-    spawn_params.cwd = extra_spawn_params.cwd
-    spawn_params.env = env_merge(extra_spawn_params.env)
-    if extra_spawn_params.detached ~= nil then
-      spawn_params.detached = extra_spawn_params.detached
+
+  local stdout_handler = create_read_loop(handle_body, nil, function(err)
+    client:on_error(client_errors.READ_ERROR, err)
+  end)
+
+  local stderr_handler = function(_, chunk)
+    if chunk and log.error() then
+      log.error('rpc', cmd, 'stderr', chunk)
     end
   end
-  handle, pid = uv.spawn(cmd, spawn_params, onexit)
-  if handle == nil then
-    stdin:close()
-    stdout:close()
-    stderr:close()
+
+  local detached = not is_win
+  if extra_spawn_params.detached ~= nil then
+    detached = extra_spawn_params.detached
+  end
+
+  local cmd1 = { cmd }
+  vim.list_extend(cmd1, cmd_args)
+
+  local ok, sysobj_or_err = pcall(vim.system, cmd1, {
+    stdin = true,
+    stdout = stdout_handler,
+    stderr = stderr_handler,
+    cwd = extra_spawn_params.cwd,
+    env = extra_spawn_params.env,
+    detach = detached,
+  }, function(obj)
+    dispatchers.on_exit(obj.code, obj.signal)
+  end)
+
+  if not ok then
+    local err = sysobj_or_err --[[@as string]]
     local msg = string.format('Spawning language server with cmd: `%s` failed', cmd)
-    if string.match(pid, 'ENOENT') then
+    if string.match(err, 'ENOENT') then
       msg = msg
         .. '. The language server is either not installed, missing from PATH, or not executable.'
     else
-      msg = msg .. string.format(' with error message: %s', pid)
+      msg = msg .. string.format(' with error message: %s', err)
     end
     vim.notify(msg, vim.log.levels.WARN)
     return
   end
 
-  stderr:read_start(function(_, chunk)
-    if chunk then
-      local _ = log.error() and log.error('rpc', cmd, 'stderr', chunk)
-    end
-  end)
-
-  local handle_body = function(body)
-    client:handle_body(body)
-  end
-  stdout:read_start(create_read_loop(handle_body, nil, function(err)
-    client:on_error(client_errors.READ_ERROR, err)
-  end))
+  sysobj = sysobj_or_err --[[@as SystemObj]]
 
   return public_client(client)
 end
-- 
cgit 


From 0329f5c2f4f300b9ffe66b0b4b2db1d51c6293d1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 7 Jun 2023 20:53:02 +0200
Subject: vim-patch:9.0.1615: URL shortcut files are not recognized (#23950)

Problem:    URL shortcut files are not recognized.
Solution:   Add a pattern for URL shortcut files. (closes vim/vim#12474)

https://github.com/vim/vim/commit/cdb7b4c50826df254d2e5ba8abd211e49b7a9784

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 6990de3391..13d3d3e53a 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1082,6 +1082,7 @@ local extension = {
   uit = 'uil',
   uil = 'uil',
   ungram = 'ungrammar',
+  url = 'urlshortcut',
   usd = 'usd',
   usda = 'usd',
   sba = 'vb',
-- 
cgit 


From 7c661207cc4357553ed2b057b6c8f28400024361 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Thu, 8 Jun 2023 12:11:24 +0200
Subject: feat(lua): add ringbuffer (#22894)

https://en.wikipedia.org/wiki/Circular_buffer
---
 runtime/doc/lua.txt        | 54 ++++++++++++++++++++++++++
 runtime/doc/news.txt       |  2 +
 runtime/lua/vim/shared.lua | 94 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 150 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 5e0a1edc11..babd9b801c 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1847,6 +1847,60 @@ pesc({s})                                                         *vim.pesc()*
     See also: ~
       • https://github.com/rxi/lume
 
+ringbuf({size})                                                *vim.ringbuf()*
+    Create a ring buffer limited to a maximal number of items. Once the buffer
+    is full, adding a new entry overrides the oldest entry.
+>
+
+    local ringbuf = vim.ringbuf(4)
+    ringbuf:push("a")
+    ringbuf:push("b")
+    ringbuf:push("c")
+    ringbuf:push("d")
+    ringbuf:push("e")    -- overrides "a"
+    print(ringbuf:pop()) -- returns "b"
+    print(ringbuf:pop()) -- returns "c"
+
+    -- Can be used as iterator. Pops remaining items:
+    for val in ringbuf do
+      print(val)
+    end
+<
+
+    Returns a Ringbuf instance with the following methods:
+
+    • |Ringbuf:push()|
+    • |Ringbuf:pop()|
+    • |Ringbuf:peek()|
+    • |Ringbuf:clear()|
+
+    Parameters: ~
+      • {size}  (integer)
+
+    Return: ~
+        (table)
+
+Ringbuf:clear({self})                                        *Ringbuf:clear()*
+    Clear all items.
+
+Ringbuf:peek({self})                                          *Ringbuf:peek()*
+    Returns the first unread item without removing it
+
+    Return: ~
+        any?|ni
+
+Ringbuf:pop({self})                                            *Ringbuf:pop()*
+    Removes and returns the first unread item
+
+    Return: ~
+        any?|ni
+
+Ringbuf:push({self}, {item})                                  *Ringbuf:push()*
+    Adds an item, overriding the oldest item if the buffer is full.
+
+    Parameters: ~
+      • {item}  any
+
 spairs({t})                                                     *vim.spairs()*
     Enumerate a table sorted by its keys.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 4afb3429f4..dbf5b131eb 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -59,6 +59,8 @@ The following new APIs or features were added.
 • |vim.iter()| provides a generic iterator interface for tables and Lua
   iterators |luaref-in|.
 
+• Added |vim.ringbuf()| to create ring buffers.
+
 • Added |vim.keycode()| for translating keycodes in a string.
 
 • Added |vim.treesitter.query.omnifunc()| for treesitter query files (set by
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 4f230c4412..f899157ab7 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -881,4 +881,98 @@ function vim.defaulttable(create)
   })
 end
 
+do
+  ---@class vim.Ringbuf<T>
+  ---@field private _items table[]
+  ---@field private _idx_read integer
+  ---@field private _idx_write integer
+  ---@field private _size integer
+  local Ringbuf = {}
+
+  --- Clear all items
+  function Ringbuf.clear(self)
+    self._items = {}
+    self._idx_read = 0
+    self._idx_write = 0
+  end
+
+  --- Adds an item, overriding the oldest item if the buffer is full.
+  ---@generic T
+  ---@param item T
+  function Ringbuf.push(self, item)
+    self._items[self._idx_write] = item
+    self._idx_write = (self._idx_write + 1) % self._size
+    if self._idx_write == self._idx_read then
+      self._idx_read = (self._idx_read + 1) % self._size
+    end
+  end
+
+  --- Removes and returns the first unread item
+  ---@generic T
+  ---@return T?
+  function Ringbuf.pop(self)
+    local idx_read = self._idx_read
+    if idx_read == self._idx_write then
+      return nil
+    end
+    local item = self._items[idx_read]
+    self._items[idx_read] = nil
+    self._idx_read = (idx_read + 1) % self._size
+    return item
+  end
+
+  --- Returns the first unread item without removing it
+  ---@generic T
+  ---@return T?
+  function Ringbuf.peek(self)
+    if self._idx_read == self._idx_write then
+      return nil
+    end
+    return self._items[self._idx_read]
+  end
+
+  --- Create a ring buffer limited to a maximal number of items.
+  --- Once the buffer is full, adding a new entry overrides the oldest entry.
+  ---
+  --- <pre>
+  ---   local ringbuf = vim.ringbuf(4)
+  ---   ringbuf:push("a")
+  ---   ringbuf:push("b")
+  ---   ringbuf:push("c")
+  ---   ringbuf:push("d")
+  ---   ringbuf:push("e")    -- overrides "a"
+  ---   print(ringbuf:pop()) -- returns "b"
+  ---   print(ringbuf:pop()) -- returns "c"
+  ---
+  ---   -- Can be used as iterator. Pops remaining items:
+  ---   for val in ringbuf do
+  ---     print(val)
+  ---   end
+  --- </pre>
+  ---
+  --- Returns a Ringbuf instance with the following methods:
+  ---
+  --- - |Ringbuf:push()|
+  --- - |Ringbuf:pop()|
+  --- - |Ringbuf:peek()|
+  --- - |Ringbuf:clear()|
+  ---
+  ---@param size integer
+  ---@return vim.Ringbuf ringbuf (table)
+  function vim.ringbuf(size)
+    local ringbuf = {
+      _items = {},
+      _size = size + 1,
+      _idx_read = 0,
+      _idx_write = 0,
+    }
+    return setmetatable(ringbuf, {
+      __index = Ringbuf,
+      __call = function(self)
+        return self:pop()
+      end,
+    })
+  end
+end
+
 return vim
-- 
cgit 


From be539f5fa8e2d7ad73f7f69941bd6ff13354e89c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 8 Jun 2023 21:53:16 +0200
Subject: vim-patch:9.0.1618: Trace32 files are not recognized (#23960)

Problem:    Trace32 files are not recognized.
Solution:   Add patterns for the t32 filetype. (Christoph Sax, closes vim/vim#12505)

https://github.com/vim/vim/commit/7fbcee6f928356f1c205a4dfa67c1d542f743b92

Co-authored-by: Christoph Sax <christoph.sax@mailbox.org>
---
 runtime/lua/vim/filetype.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 13d3d3e53a..18c47ea2f4 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1033,6 +1033,8 @@ local extension = {
   swift = 'swift',
   svh = 'systemverilog',
   sv = 'systemverilog',
+  cmm = 't32',
+  t32 = 't32',
   td = 'tablegen',
   tak = 'tak',
   tal = 'tal',
-- 
cgit 


From f31dba93f921891159eb707b185517648df00d6b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 9 Jun 2023 08:59:28 +0200
Subject: vim-patch:9.0.1620: Nix files are not recognized from the hashbang
 line (#23961)

Problem:    Nix files are not recognized from the hashbang line.
Solution:   Add a hashbang check. (issue vim/vim#12507)

https://github.com/vim/vim/commit/19548c6a742d954ecd0b50b0680c37cc6ced7473

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/lua/vim/filetype/detect.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index b347215895..4e18ed190a 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1459,6 +1459,7 @@ local patterns_hashbang = {
   ['gforth\\>'] = { 'forth', { vim_regex = true } },
   ['icon\\>'] = { 'icon', { vim_regex = true } },
   guile = 'scheme',
+  ['nix%-shell'] = 'nix',
 }
 
 ---@private
@@ -1491,7 +1492,7 @@ local function match_from_hashbang(contents, path, dispatch_extension)
   elseif matchregex(first_line, [[^#!\s*[^/\\ ]*\>\([^/\\]\|$\)]]) then
     name = vim.fn.substitute(first_line, [[^#!\s*\([^/\\ ]*\>\).*]], '\\1', '')
   else
-    name = vim.fn.substitute(first_line, [[^#!\s*\S*[/\\]\(\i\+\).*]], '\\1', '')
+    name = vim.fn.substitute(first_line, [[^#!\s*\S*[/\\]\(\f\+\).*]], '\\1', '')
   end
 
   -- tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
-- 
cgit 


From e5e0bda41b640d324350c5147b956e37e9f8b32c Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Fri, 9 Jun 2023 11:32:43 +0200
Subject: feat(lsp)!: add vim.lsp.status, client.progress and promote
 LspProgressUpdate (#23958)

`client.messages` could grow unbounded because the default handler only
added new messages, never removing them.

A user either had to consume the messages by calling
`vim.lsp.util.get_progress_messages` or by manually removing them from
`client.messages.progress`. If they didn't do that, using LSP
effectively leaked memory.

To fix this, this deprecates the `messages` property and instead adds a
`progress` ring buffer that only keeps at most 50 messages. In addition
it deprecates `vim.lsp.util.get_progress_messages` in favour of a new
`vim.lsp.status()` and also promotes the `LspProgressUpdate` user
autocmd to a regular autocmd to allow users to pattern match on the
progress kind.

Also closes https://github.com/neovim/neovim/pull/20327
---
 runtime/doc/deprecated.txt       | 28 ++++++++-------
 runtime/doc/lsp.txt              | 25 +++++++++++---
 runtime/doc/news.txt             |  9 +++--
 runtime/lua/vim/lsp.lua          | 62 ++++++++++++++++++++++++++++++++-
 runtime/lua/vim/lsp/handlers.lua | 75 +++++++++++++++++-----------------------
 runtime/lua/vim/lsp/types.lua    |  8 ++++-
 runtime/lua/vim/lsp/util.lua     | 29 ++++++++++++++++
 7 files changed, 171 insertions(+), 65 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 6494c53059..73888a32cc 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -117,19 +117,21 @@ internally and are no longer exposed as part of the API. Instead, use
 - *vim.lsp.diagnostic.set_virtual_text()*
 
 LSP FUNCTIONS
-- *vim.lsp.buf.range_code_action()*	Use |vim.lsp.buf.code_action()| with
-					the `range` parameter.
-- *vim.lsp.util.diagnostics_to_items()*	Use |vim.diagnostic.toqflist()| instead.
-- *vim.lsp.util.set_qflist()*		Use |setqflist()| instead.
-- *vim.lsp.util.set_loclist()*		Use |setloclist()| instead.
-- *vim.lsp.buf_get_clients()*		Use |vim.lsp.get_active_clients()| with
-					{buffer = bufnr} instead.
-- *vim.lsp.buf.formatting()*		Use |vim.lsp.buf.format()| with
-					{async = true} instead.
-- *vim.lsp.buf.formatting_sync()*	Use |vim.lsp.buf.format()| with
-					{async = false} instead.
-- *vim.lsp.buf.range_formatting()*	Use |vim.lsp.formatexpr()|
-					or |vim.lsp.buf.format()| instead.
+- *vim.lsp.buf.range_code_action()*		Use |vim.lsp.buf.code_action()| with
+						the `range` parameter.
+- *vim.lsp.util.diagnostics_to_items()*		Use |vim.diagnostic.toqflist()| instead.
+- *vim.lsp.util.set_qflist()*			Use |setqflist()| instead.
+- *vim.lsp.util.set_loclist()*			Use |setloclist()| instead.
+- *vim.lsp.buf_get_clients()*			Use |vim.lsp.get_active_clients()| with
+						{buffer = bufnr} instead.
+- *vim.lsp.buf.formatting()*			Use |vim.lsp.buf.format()| with
+						{async = true} instead.
+- *vim.lsp.buf.formatting_sync()*		Use |vim.lsp.buf.format()| with
+						{async = false} instead.
+- *vim.lsp.buf.range_formatting()*		Use |vim.lsp.formatexpr()|
+						or |vim.lsp.buf.format()| instead.
+- *vim.lsp.util.get_progress_messages()*	Use |vim.lsp.status()| or access
+						`progress` of |vim.lsp.client|
 
 TREESITTER FUNCTIONS
 - *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 5b7c013c57..7248d03196 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -659,14 +659,20 @@ callbacks. Example: >lua
     })
 <
 
-Also the following |User| |autocommand| is provided:
+LspProgress                                                       *LspProgress*
+    Upon receipt of a progress notification from the server. Notifications can
+    be polled from a `progress` ring buffer of a |vim.lsp.client| or use
+    |vim.lsp.status()| to get an aggregate message
 
-LspProgressUpdate                                          *LspProgressUpdate*
-    Upon receipt of a progress notification from the server. See
-    |vim.lsp.util.get_progress_messages()|.
+    If the server sends a "work done progress", the `pattern` is set to `kind`
+    (one of `begin`, `report` or `end`).
+
+    When used from Lua, the event contains a `data` table with `client_id` and
+    `result` properties. `result` will contain the request params sent by the
+    server.
 
 Example: >vim
-    autocmd User LspProgressUpdate redrawstatus
+    autocmd LspProgress * redrawstatus
 <
 
 ==============================================================================
@@ -806,6 +812,8 @@ client()                                                      *vim.lsp.client*
         |vim.lsp.start_client()|.
       • {server_capabilities} (table): Response from the server sent on
         `initialize` describing the server's capabilities.
+      • {progress} A ring buffer (|vim.ringbuf()|) containing progress
+        messages sent by the server.
 
 client_is_stopped({client_id})                   *vim.lsp.client_is_stopped()*
     Checks whether a client is stopped.
@@ -1092,6 +1100,13 @@ start_client({config})                                *vim.lsp.start_client()*
         not be fully initialized. Use `on_init` to do any actions once the
         client has been initialized.
 
+status()                                                    *vim.lsp.status()*
+    Consumes the latest progress messages from all clients and formats them as
+    a string. Empty if there are no clients or if no new messages
+
+    Return: ~
+        (string)
+
 stop_client({client_id}, {force})                      *vim.lsp.stop_client()*
     Stops a client(s).
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index dbf5b131eb..87dfefcce8 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -33,8 +33,8 @@ The following changes may require adaptations in user config or plugins.
 • When switching windows, |CursorMoved| autocommands trigger when Nvim is back
   in the main loop rather than immediately. This is more compatible with Vim.
 
-• |LspRequest| autocmd was promoted from a |User| autocmd to a first class
-  citizen.
+• |LspRequest| and LspProgressUpdate (renamed to |LspProgress|) autocmds were
+  promoted from a |User| autocmd to first class citizen.
 
 • Renamed `vim.treesitter.playground` to `vim.treesitter.dev`.
 
@@ -43,6 +43,8 @@ ADDED FEATURES                                                     *news-added*
 
 The following new APIs or features were added.
 
+• Added |vim.lsp.status()| to consume the last progress messages as a string.
+
 • Neovim's LSP client now always saves and restores named buffer marks when
   applying text edits.
 
@@ -142,6 +144,9 @@ release.
   - |nvim_win_get_option()|	Use |nvim_get_option_value()| instead.
   - |nvim_win_set_option()|	Use |nvim_set_option_value()| instead.
 
+• vim.lsp functions:
+  - |vim.lsp.util.get_progress_messages()|	Use |vim.lsp.status()| instead.
+
 • `vim.loop` has been renamed to `vim.uv`.
 
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 532504a7db..6ddbfc6df7 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -807,6 +807,9 @@ end
 ---
 ---  - {server_capabilities} (table): Response from the server sent on
 ---    `initialize` describing the server's capabilities.
+---
+---  - {progress} A ring buffer (|vim.ringbuf()|) containing progress messages
+---    sent by the server.
 function lsp.client()
   error()
 end
@@ -891,6 +894,50 @@ function lsp.start(config, opts)
   return client_id
 end
 
+--- Consumes the latest progress messages from all clients and formats them as a string.
+--- Empty if there are no clients or if no new messages
+---
+---@return string
+function lsp.status()
+  local percentage = nil
+  local groups = {}
+  for _, client in ipairs(vim.lsp.get_active_clients()) do
+    for progress in client.progress do
+      local value = progress.value
+      if type(value) == 'table' and value.kind then
+        local group = groups[progress.token]
+        if not group then
+          group = {}
+          groups[progress.token] = group
+        end
+        group.title = value.title or group.title
+        group.message = value.message or group.message
+        if value.percentage then
+          percentage = math.max(percentage or 0, value.percentage)
+        end
+      end
+      -- else: Doesn't look like work done progress and can be in any format
+      -- Just ignore it as there is no sensible way to display it
+    end
+  end
+  local messages = {}
+  for _, group in pairs(groups) do
+    if group.title then
+      table.insert(
+        messages,
+        group.message and (group.title .. ': ' .. group.message) or group.title
+      )
+    elseif group.message then
+      table.insert(messages, group.message)
+    end
+  end
+  local message = table.concat(messages, ', ')
+  if percentage then
+    return string.format('%03d: %s', percentage, message)
+  end
+  return message
+end
+
 ---@private
 -- Determines whether the given option can be set by `set_defaults`.
 local function is_empty_or_default(bufnr, option)
@@ -1266,10 +1313,23 @@ function lsp.start_client(config)
 
     --- @type table<integer,{ type: string, bufnr: integer, method: string}>
     requests = {},
-    -- for $/progress report
+
+    --- Contains $/progress report messages.
+    --- They have the format {token: integer|string, value: any}
+    --- For "work done progress", value will be one of:
+    --- - lsp.WorkDoneProgressBegin,
+    --- - lsp.WorkDoneProgressReport (extended with title from Begin)
+    --- - lsp.WorkDoneProgressEnd    (extended with title from Begin)
+    progress = vim.ringbuf(50),
+
+    ---@deprecated use client.progress instead
     messages = { name = name, messages = {}, progress = {}, status = {} },
     dynamic_capabilities = require('vim.lsp._dynamic').new(client_id),
   }
+
+  ---@type table<string|integer, string> title of unfinished progress sequences by token
+  client.progress.pending = {}
+
   --- @type lsp.ClientCapabilities
   client.config.capabilities = config.capabilities or protocol.make_client_capabilities()
 
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 5346160871..19338ae8f0 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -9,7 +9,7 @@ local M = {}
 
 ---@private
 --- Writes to error buffer.
----@param ... (table of strings) Will be concatenated before being written
+---@param ... string Will be concatenated before being written
 local function err_message(...)
   vim.notify(table.concat(vim.tbl_flatten({ ... })), vim.log.levels.ERROR)
   api.nvim_command('redraw')
@@ -20,63 +20,52 @@ M['workspace/executeCommand'] = function(_, _, _, _)
   -- Error handling is done implicitly by wrapping all handlers; see end of this file
 end
 
----@private
-local function progress_handler(_, result, ctx, _)
-  local client_id = ctx.client_id
-  local client = vim.lsp.get_client_by_id(client_id)
-  local client_name = client and client.name or string.format('id=%d', client_id)
+--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#progress
+---@param result lsp.ProgressParams
+---@param ctx lsp.HandlerContext
+M['$/progress'] = function(_, result, ctx)
+  local client = vim.lsp.get_client_by_id(ctx.client_id)
   if not client then
-    err_message('LSP[', client_name, '] client has shut down during progress update')
+    err_message('LSP[id=', tostring(ctx.client_id), '] client has shut down during progress update')
     return vim.NIL
   end
-  local val = result.value -- unspecified yet
-  local token = result.token -- string or number
+  local kind = nil
+  local value = result.value
 
-  if type(val) ~= 'table' then
-    val = { content = val }
-  end
-  if val.kind then
-    if val.kind == 'begin' then
-      client.messages.progress[token] = {
-        title = val.title,
-        cancellable = val.cancellable,
-        message = val.message,
-        percentage = val.percentage,
-      }
-    elseif val.kind == 'report' then
-      client.messages.progress[token].cancellable = val.cancellable
-      client.messages.progress[token].message = val.message
-      client.messages.progress[token].percentage = val.percentage
-    elseif val.kind == 'end' then
-      if client.messages.progress[token] == nil then
-        err_message('LSP[', client_name, '] received `end` message with no corresponding `begin`')
-      else
-        client.messages.progress[token].message = val.message
-        client.messages.progress[token].done = true
+  if type(value) == 'table' then
+    kind = value.kind
+    -- Carry over title of `begin` messages to `report` and `end` messages
+    -- So that consumers always have it available, even if they consume a
+    -- subset of the full sequence
+    if kind == 'begin' then
+      client.progress.pending[result.token] = value.title
+    else
+      value.title = client.progress.pending[result.token]
+      if kind == 'end' then
+        client.progress.pending[result.token] = nil
       end
     end
-  else
-    client.messages.progress[token] = val
-    client.messages.progress[token].done = true
   end
 
-  api.nvim_exec_autocmds('User', { pattern = 'LspProgressUpdate', modeline = false })
-end
+  client.progress:push(result)
 
---see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#progress
-M['$/progress'] = progress_handler
+  api.nvim_exec_autocmds('LspProgress', {
+    pattern = kind,
+    modeline = false,
+    data = { client_id = ctx.client_id, result = result },
+  })
+end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#window_workDoneProgress_create
+---@param result lsp.WorkDoneProgressCreateParams
+---@param ctx lsp.HandlerContext
 M['window/workDoneProgress/create'] = function(_, result, ctx)
-  local client_id = ctx.client_id
-  local client = vim.lsp.get_client_by_id(client_id)
-  local token = result.token -- string or number
-  local client_name = client and client.name or string.format('id=%d', client_id)
+  local client = vim.lsp.get_client_by_id(ctx.client_id)
   if not client then
-    err_message('LSP[', client_name, '] client has shut down while creating progress report')
+    err_message('LSP[id=', tostring(ctx.client_id), '] client has shut down during progress update')
     return vim.NIL
   end
-  client.messages.progress[token] = {}
+  client.progress:push(result)
   return vim.NIL
 end
 
diff --git a/runtime/lua/vim/lsp/types.lua b/runtime/lua/vim/lsp/types.lua
index e77e1fb63a..ef85a0d10f 100644
--- a/runtime/lua/vim/lsp/types.lua
+++ b/runtime/lua/vim/lsp/types.lua
@@ -1,6 +1,12 @@
 ---@meta
 
----@alias lsp-handler fun(err: lsp.ResponseError|nil, result: any, context: table, config: table|nil)
+---@alias lsp-handler fun(err: lsp.ResponseError|nil, result: any, context: lsp.HandlerContext, config: table|nil)
+
+---@class lsp.HandlerContext
+---@field method string
+---@field client_id integer
+---@field bufnr integer
+---@field params any
 
 ---@class lsp.ResponseError
 ---@field code integer
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index e36014d07d..538e48c805 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -353,11 +353,40 @@ end
 
 --- Process and return progress reports from lsp server
 ---@private
+---@deprecated Use vim.lsp.status() or access client.progress directly
 function M.get_progress_messages()
+  vim.deprecate('vim.lsp.util.get_progress_messages', 'vim.lsp.status', '0.11.0')
   local new_messages = {}
   local progress_remove = {}
 
   for _, client in ipairs(vim.lsp.get_active_clients()) do
+    local groups = {}
+    for progress in client.progress do
+      local value = progress.value
+      if type(value) == 'table' and value.kind then
+        local group = groups[progress.token]
+        if not group then
+          group = {
+            done = false,
+            progress = true,
+            title = 'empty title',
+          }
+          groups[progress.token] = group
+        end
+        group.title = value.title or group.title
+        group.cancellable = value.cancellable or group.cancellable
+        if value.kind == 'end' then
+          group.done = true
+        end
+        group.message = value.message or group.message
+        group.percentage = value.percentage or group.percentage
+      end
+    end
+
+    for _, group in pairs(groups) do
+      table.insert(new_messages, group)
+    end
+
     local messages = client.messages
     local data = messages
     for token, ctx in pairs(data.progress) do
-- 
cgit 


From 106922898ad1510954737d38e7f8db78559ae6bd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 9 Jun 2023 17:43:46 +0800
Subject: vim-patch:9.0.1617: charidx() result is not consistent with byteidx()
 (#23963)

Problem:    charidx() and utf16idx() result is not consistent with byteidx().
Solution:   When the index is equal to the length of the text return the
            lenght of the text instead of -1. (Yegappan Lakshmanan,
            closes vim/vim#12503)

https://github.com/vim/vim/commit/577922b917e48285a7a312daf7b5bbc6e272939c

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 27d52b7ac6..bdd9f2fd3a 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1167,11 +1167,13 @@ charidx({string}, {idx} [, {countcc} [, {utf16}]])
 		When {utf16} is present and TRUE, {idx} is used as the UTF-16
 		index in the String {expr} instead of as the byte index.
 
-		Returns -1 if the arguments are invalid or if {idx} is greater
-		than the index of the last byte in {string}.  An error is
-		given if the first argument is not a string, the second
-		argument is not a number or when the third argument is present
-		and is not zero or one.
+		Returns -1 if the arguments are invalid or if there are less
+		than {idx} bytes. If there are exactly {idx} bytes the length
+		of the string in characters is returned.
+
+		An error is given and -1 is returned if the first argument is
+		not a string, the second argument is not a number or when the
+		third argument is present and is not zero or one.
 
 		See |byteidx()| and |byteidxcomp()| for getting the byte index
 		from the character index and |utf16idx()| for getting the
@@ -9138,8 +9140,8 @@ uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
 <
 							*utf16idx()*
 utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
-		Same as |charidx()| but returns the UTF-16 index of the byte
-		at {idx} in {string} (after converting it to UTF-16).
+		Same as |charidx()| but returns the UTF-16 code unit index of
+		the byte at {idx} in {string} (after converting it to UTF-16).
 
 		When {charidx} is present and TRUE, {idx} is used as the
 		character index in the String {string} instead of as the byte
@@ -9147,6 +9149,10 @@ utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
 		An {idx} in the middle of a UTF-8 sequence is rounded upwards
 		to the end of that sequence.
 
+		Returns -1 if the arguments are invalid or if there are less
+		than {idx} bytes in {string}. If there are exactly {idx} bytes
+		the length of the string in UTF-16 code units is returned.
+
 		See |byteidx()| and |byteidxcomp()| for getting the byte index
 		from the UTF-16 index and |charidx()| for getting the
 		character index from the UTF-16 index.
-- 
cgit 


From 42bbc4fabcf948ac6b8798b8992bcba1fc1d3e59 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Sun, 28 May 2023 12:09:52 +0200
Subject: feat(api): support abbreviations in nvim_set_keymap

closes #19198
---
 runtime/doc/api.txt  | 4 +++-
 runtime/doc/news.txt | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 83422c9501..8c44db1867 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1486,7 +1486,9 @@ nvim_set_keymap({mode}, {lhs}, {rhs}, {*opts})             *nvim_set_keymap()*
 
     Parameters: ~
       • {mode}  Mode short-name (map command prefix: "n", "i", "v", "x", …) or
-                "!" for |:map!|, or empty string for |:map|.
+                "!" for |:map!|, or empty string for |:map|. "ia", "ca" or
+                "!a" for abbreviation in insert mode, cmdline mode, or both,
+                respectively
       • {lhs}   Left-hand-side |{lhs}| of the mapping.
       • {rhs}   Right-hand-side |{rhs}| of the mapping.
       • {opts}  Optional parameters map: Accepts all |:map-arguments| as keys
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 87dfefcce8..a901c4f13c 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -82,6 +82,8 @@ The following new APIs or features were added.
 
 • |vim.system()| for running system commands.
 
+• |nvim_set_keymap()| now supports abbreviations.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
-- 
cgit 


From 5959b3c9222629c0e6020672ad5b13d0ed707c99 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 9 Jun 2023 23:48:31 +0200
Subject: vim-patch:9.0.1622: filetype name t32 is a bit obscure (#23967)

Problem:    Filetype name t32 is a bit obscure.
Solution:   Rename t32 to trace32. (Christoph Sax, closes vim/vim#12512)

https://github.com/vim/vim/commit/740df76c90ee2c421ab7852b7ff2835aa0af782a

Co-authored-by: Christoph Sax <christoph.sax@mailbox.org>
---
 runtime/lua/vim/filetype.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 18c47ea2f4..fc8871f593 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1033,8 +1033,8 @@ local extension = {
   swift = 'swift',
   svh = 'systemverilog',
   sv = 'systemverilog',
-  cmm = 't32',
-  t32 = 't32',
+  cmm = 'trace32',
+  t32 = 'trace32',
   td = 'tablegen',
   tak = 'tak',
   tal = 'tal',
-- 
cgit 


From 7154f0c98619d0789618f370a6c7f81ee1775469 Mon Sep 17 00:00:00 2001
From: Jonas Strittmatter <40792180+smjonas@users.noreply.github.com>
Date: Sat, 10 Jun 2023 03:37:05 +0200
Subject: docs: fix typos (#23917)

---
 runtime/doc/lua.txt        | 6 +++---
 runtime/lua/vim/fs.lua     | 2 +-
 runtime/lua/vim/keymap.lua | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index babd9b801c..91d18bbe85 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2563,7 +2563,7 @@ set({mode}, {lhs}, {rhs}, {opts})                           *vim.keymap.set()*
        -- Map to a Lua function:
        vim.keymap.set('n', 'lhs', function() print("real lua function") end)
        -- Map to multiple modes:
-       vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer=true })
+       vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer = true })
        -- Buffer-local mapping:
        vim.keymap.set('n', '<leader>w', "<cmd>w<cr>", { silent = true, buffer = 5 })
        -- Expr mapping:
@@ -2697,8 +2697,8 @@ find({names}, {opts})                                          *vim.fs.find()*
         directories
 
 joinpath({...})                                            *vim.fs.joinpath()*
-    Concatenate directories and/or file into a single path with normalization
-    (e.g., `"foo/"` and `"bar"` get joined to `"foo/bar"`)
+    Concatenate directories and/or file paths into a single path with
+    normalization (e.g., `"foo/"` and `"bar"` get joined to `"foo/bar"`)
 
     Parameters: ~
       • {...}  (string)
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 5e63fb6237..c89147dbd2 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -72,7 +72,7 @@ function M.basename(file)
   return file:match('[/\\]$') and '' or (file:match('[^\\/]*$'):gsub('\\', '/'))
 end
 
---- Concatenate directories and/or file into a single path with normalization
+--- Concatenate directories and/or file paths into a single path with normalization
 --- (e.g., `"foo/"` and `"bar"` get joined to `"foo/bar"`)
 ---
 ---@param ... string
diff --git a/runtime/lua/vim/keymap.lua b/runtime/lua/vim/keymap.lua
index 911b584c14..0d7fc3b1ec 100644
--- a/runtime/lua/vim/keymap.lua
+++ b/runtime/lua/vim/keymap.lua
@@ -6,7 +6,7 @@ local keymap = {}
 ---   -- Map to a Lua function:
 ---   vim.keymap.set('n', 'lhs', function() print("real lua function") end)
 ---   -- Map to multiple modes:
----   vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer=true })
+---   vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer = true })
 ---   -- Buffer-local mapping:
 ---   vim.keymap.set('n', '<leader>w', "<cmd>w<cr>", { silent = true, buffer = 5 })
 ---   -- Expr mapping:
-- 
cgit 


From b6d2f49b4536f89cf2428d1f214468aa5fb21788 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 10 Jun 2023 10:44:31 +0800
Subject: test: more tests for nvim_{set,del}_keymap with abbreviation (#23970)

---
 runtime/doc/api.txt  | 2 +-
 runtime/doc/news.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 8c44db1867..748a8ba3bb 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1487,7 +1487,7 @@ nvim_set_keymap({mode}, {lhs}, {rhs}, {*opts})             *nvim_set_keymap()*
     Parameters: ~
       • {mode}  Mode short-name (map command prefix: "n", "i", "v", "x", …) or
                 "!" for |:map!|, or empty string for |:map|. "ia", "ca" or
-                "!a" for abbreviation in insert mode, cmdline mode, or both,
+                "!a" for abbreviation in Insert mode, Cmdline mode, or both,
                 respectively
       • {lhs}   Left-hand-side |{lhs}| of the mapping.
       • {rhs}   Right-hand-side |{rhs}| of the mapping.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index a901c4f13c..20d20d9a90 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -82,7 +82,7 @@ The following new APIs or features were added.
 
 • |vim.system()| for running system commands.
 
-• |nvim_set_keymap()| now supports abbreviations.
+• |nvim_set_keymap()| and |nvim_del_keymap()| now support abbreviations.
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
-- 
cgit 


From b302da9ad220a7699d4b0ebf642529d142a0b9cf Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Sun, 11 Jun 2023 02:32:41 +0800
Subject: fix(lsp): use percentage format on lsp.status (#23971)

---
 runtime/lua/vim/lsp.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 6ddbfc6df7..1d9a91801a 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -933,7 +933,7 @@ function lsp.status()
   end
   local message = table.concat(messages, ', ')
   if percentage then
-    return string.format('%03d: %s', percentage, message)
+    return string.format('%3d%%: %s', percentage, message)
   end
   return message
 end
-- 
cgit 


From 302d3cfb96d7f0c856262e1a4252d058e3300c8b Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sat, 10 Jun 2023 20:33:23 +0200
Subject: feat(lua): use callable table as iterator in vim.iter (#23957)

A table passed to `vim.iter` can be a class instance with a `__call`
implementation for the iterator protocol.
---
 runtime/doc/lua.txt      |  8 ++++++++
 runtime/lua/vim/iter.lua | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 91d18bbe85..44682d40e5 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2999,6 +2999,8 @@ pipeline depend on the type passed to this function:
 • Non-list tables pass both the key and value of each element
 • Function iterators pass all of the values returned by their respective
   function
+• Tables with a metatable implementing __call are treated as function
+  iterators
 
 Examples: >lua
 
@@ -3032,6 +3034,12 @@ Examples: >lua
    end)
    -- true
 
+   local rb = vim.ringbuf(3)
+   rb:push("a")
+   rb:push("b")
+   vim.iter(rb):totable()
+   -- { "a", "b" }
+
 <
 
 In addition to the |vim.iter()| function, the |vim.iter| module provides
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 0e98d0437e..204d22b9be 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -14,6 +14,8 @@
 --- - Non-list tables pass both the key and value of each element
 --- - Function iterators pass all of the values returned by their respective
 ---   function
+--- - Tables with a metatable implementing __call are treated as function
+---   iterators
 ---
 --- Examples:
 --- <pre>lua
@@ -46,6 +48,12 @@
 ---     return k == 'z'
 ---   end)
 ---   -- true
+---
+---   local rb = vim.ringbuf(3)
+---   rb:push("a")
+---   rb:push("b")
+---   vim.iter(rb):totable()
+---   -- { "a", "b" }
 --- </pre>
 ---
 --- In addition to the |vim.iter()| function, the |vim.iter| module provides
@@ -889,6 +897,17 @@ end
 function Iter.new(src, ...)
   local it = {}
   if type(src) == 'table' then
+    local mt = getmetatable(src)
+    if mt and type(mt.__call) == 'function' then
+      ---@private
+      function it.next()
+        return src()
+      end
+
+      setmetatable(it, Iter)
+      return it
+    end
+
     local t = {}
 
     -- Check if source table can be treated like a list (indices are consecutive integers
-- 
cgit 


From cce9460524aa17bcd4daa095f4706220b81f8845 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 11 Jun 2023 15:29:51 +0800
Subject: fix(remote): make --remote-expr print to stdout (#23980)

---
 runtime/lua/vim/_editor.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index d46b0fbf32..dc396b8f65 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -932,7 +932,7 @@ function vim._cs_remote(rcid, server_addr, connect_error, args)
     or subcmd == 'tab-wait'
     or subcmd == 'tab-wait-silent'
   then
-    return { errmsg = 'E5600: Wait commands not yet implemented in nvim' }
+    return { errmsg = 'E5600: Wait commands not yet implemented in Nvim' }
   elseif subcmd == 'tab-silent' then
     f_tab = true
     f_silent = true
@@ -946,8 +946,9 @@ function vim._cs_remote(rcid, server_addr, connect_error, args)
     if rcid == 0 then
       return { errmsg = connection_failure_errmsg('Send expression failed.') }
     end
-    print(vim.fn.rpcrequest(rcid, 'nvim_eval', args[2]))
-    return { should_exit = true, tabbed = false }
+    local expr = 'string(' .. args[2] .. ')'
+    local res = vim.fn.rpcrequest(rcid, 'nvim_eval', expr)
+    return { result = res, should_exit = true, tabbed = false }
   elseif subcmd ~= '' then
     return { errmsg = 'Unknown option argument: ' .. args[1] }
   end
-- 
cgit 


From 643546b82b4bc0c29ca869f81af868a019723d83 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Sun, 11 Jun 2023 15:23:37 +0530
Subject: feat(lsp): add handlers for inlay hints (#23736)

initial support; public API left for a follow-up PR
---
 runtime/doc/lsp.txt                 |   2 +
 runtime/doc/news.txt                |   2 +
 runtime/lua/vim/lsp.lua             |  17 ++-
 runtime/lua/vim/lsp/_inlay_hint.lua | 217 ++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/handlers.lua    |  26 +++++
 runtime/lua/vim/lsp/protocol.lua    |   9 ++
 runtime/lua/vim/lsp/types.lua       |  25 +++++
 7 files changed, 293 insertions(+), 5 deletions(-)
 create mode 100644 runtime/lua/vim/lsp/_inlay_hint.lua

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 7248d03196..27ef38743b 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -197,6 +197,7 @@ specification. These LSP requests/notifications are defined by default:
     textDocument/formatting
     textDocument/hover
     textDocument/implementation*
+    textDocument/inlayHint
     textDocument/publishDiagnostics
     textDocument/rangeFormatting
     textDocument/references
@@ -208,6 +209,7 @@ specification. These LSP requests/notifications are defined by default:
     window/showDocument
     window/showMessageRequest
     workspace/applyEdit
+    workspace/inlayHint/refresh
     workspace/symbol
 
 * NOTE: These are sometimes not implemented by servers.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 20d20d9a90..ac9e60637a 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -84,6 +84,8 @@ The following new APIs or features were added.
 
 • |nvim_set_keymap()| and |nvim_del_keymap()| now support abbreviations.
 
+• Added |lsp-handler| for inlay hints: `textDocument/inlayHint` and
+  `workspace/inlayHint/refresh`
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 1d9a91801a..6f9a6c460b 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -17,6 +17,7 @@ local if_nil = vim.F.if_nil
 
 local lsp = {
   protocol = protocol,
+  _inlay_hint = require('vim.lsp._inlay_hint'),
 
   handlers = default_handlers,
 
@@ -60,6 +61,8 @@ lsp._request_name_to_capability = {
   ['textDocument/documentHighlight'] = { 'documentHighlightProvider' },
   ['textDocument/semanticTokens/full'] = { 'semanticTokensProvider' },
   ['textDocument/semanticTokens/full/delta'] = { 'semanticTokensProvider' },
+  ['textDocument/inlayHint'] = { 'inlayHintProvider' },
+  ['inlayHint/resolve'] = { 'inlayHintProvider', 'resolveProvider' },
 }
 
 -- TODO improve handling of scratch buffers with LSP attached.
@@ -1498,16 +1501,20 @@ function lsp.start_client(config)
     end
     -- Ensure pending didChange notifications are sent so that the server doesn't operate on a stale state
     changetracking.flush(client, bufnr)
+    local version = util.buf_versions[bufnr]
     bufnr = resolve_bufnr(bufnr)
     if log.debug() then
       log.debug(log_prefix, 'client.request', client_id, method, params, handler, bufnr)
     end
     local success, request_id = rpc.request(method, params, function(err, result)
-      handler(
-        err,
-        result,
-        { method = method, client_id = client_id, bufnr = bufnr, params = params }
-      )
+      local context = {
+        method = method,
+        client_id = client_id,
+        bufnr = bufnr,
+        params = params,
+        version = version,
+      }
+      handler(err, result, context)
     end, function(request_id)
       local request = client.requests[request_id]
       request.type = 'complete'
diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
new file mode 100644
index 0000000000..aa6ec9aca8
--- /dev/null
+++ b/runtime/lua/vim/lsp/_inlay_hint.lua
@@ -0,0 +1,217 @@
+local util = require('vim.lsp.util')
+local log = require('vim.lsp.log')
+local api = vim.api
+local M = {}
+
+---@class lsp._inlay_hint.bufstate
+---@field version integer
+---@field client_hint table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
+
+---@type table<integer, lsp._inlay_hint.bufstate>
+local hint_cache_by_buf = setmetatable({}, {
+  __index = function(t, b)
+    local key = b > 0 and b or api.nvim_get_current_buf()
+    return rawget(t, key)
+  end,
+})
+
+local namespace = api.nvim_create_namespace('vim_lsp_inlayhint')
+
+M.__explicit_buffers = {}
+
+--- |lsp-handler| for the method `textDocument/inlayHint`
+--- Store hints for a specific buffer and client
+--- Resolves unresolved hints
+---@private
+function M.on_inlayhint(err, result, ctx, _)
+  if err then
+    local _ = log.error() and log.error('inlayhint', err)
+    return
+  end
+  local bufnr = ctx.bufnr
+  if util.buf_versions[bufnr] ~= ctx.version then
+    return
+  end
+  local client_id = ctx.client_id
+  if not result then
+    return
+  end
+  local bufstate = hint_cache_by_buf[bufnr]
+  if not bufstate then
+    bufstate = {
+      client_hint = vim.defaulttable(),
+      version = ctx.version,
+    }
+    hint_cache_by_buf[bufnr] = bufstate
+    api.nvim_buf_attach(bufnr, false, {
+      on_detach = function(_, b)
+        api.nvim_buf_clear_namespace(b, namespace, 0, -1)
+        hint_cache_by_buf[b] = nil
+      end,
+      on_reload = function(_, b)
+        api.nvim_buf_clear_namespace(b, namespace, 0, -1)
+        hint_cache_by_buf[b] = nil
+      end,
+    })
+  end
+  local hints_by_client = bufstate.client_hint
+  local client = vim.lsp.get_client_by_id(client_id)
+
+  local new_hints_by_lnum = vim.defaulttable()
+  local num_unprocessed = #result
+  if num_unprocessed == 0 then
+    hints_by_client[client_id] = {}
+    bufstate.version = ctx.version
+    api.nvim__buf_redraw_range(bufnr, 0, -1)
+    return
+  end
+
+  local lines = api.nvim_buf_get_lines(bufnr, 0, -1, false)
+  ---@private
+  local function pos_to_byte(position)
+    local col = position.character
+    if col > 0 then
+      local line = lines[position.line + 1] or ''
+      local ok, convert_result
+      ok, convert_result = pcall(util._str_byteindex_enc, line, col, client.offset_encoding)
+      if ok then
+        return convert_result
+      end
+      return math.min(#line, col)
+    end
+    return col
+  end
+
+  for _, hint in ipairs(result) do
+    local lnum = hint.position.line
+    hint.position.character = pos_to_byte(hint.position)
+    table.insert(new_hints_by_lnum[lnum], hint)
+  end
+
+  hints_by_client[client_id] = new_hints_by_lnum
+  bufstate.version = ctx.version
+  api.nvim__buf_redraw_range(bufnr, 0, -1)
+end
+
+---@private
+local function resolve_bufnr(bufnr)
+  return bufnr == 0 and api.nvim_get_current_buf() or bufnr
+end
+
+--- Refresh inlay hints for a buffer
+---
+--- It is recommended to trigger this using an autocmd or via keymap.
+---@param opts (nil|table) Optional arguments
+---  - bufnr (integer, default: 0): Buffer whose hints to refresh
+---  - only_visible (boolean, default: false): Whether to only refresh hints for the visible regions of the buffer
+---
+--- Example:
+--- <pre>vim
+---   autocmd BufEnter,InsertLeave,BufWritePost <buffer> lua vim.lsp._inlay_hint.refresh()
+--- </pre>
+---
+---@private
+function M.refresh(opts)
+  opts = opts or {}
+  local bufnr = opts.bufnr or 0
+  local only_visible = opts.only_visible or false
+  bufnr = resolve_bufnr(bufnr)
+  M.__explicit_buffers[bufnr] = true
+  local buffer_windows = {}
+  for _, winid in ipairs(api.nvim_list_wins()) do
+    if api.nvim_win_get_buf(winid) == bufnr then
+      table.insert(buffer_windows, winid)
+    end
+  end
+  for _, window in ipairs(buffer_windows) do
+    local first = vim.fn.line('w0', window)
+    local last = vim.fn.line('w$', window)
+    local params = {
+      textDocument = util.make_text_document_params(bufnr),
+      range = {
+        start = { line = first - 1, character = 0 },
+        ['end'] = { line = last, character = 0 },
+      },
+    }
+    vim.lsp.buf_request(bufnr, 'textDocument/inlayHint', params)
+  end
+  if not only_visible then
+    local params = {
+      textDocument = util.make_text_document_params(bufnr),
+      range = {
+        start = { line = 0, character = 0 },
+        ['end'] = { line = api.nvim_buf_line_count(bufnr), character = 0 },
+      },
+    }
+    vim.lsp.buf_request(bufnr, 'textDocument/inlayHint', params)
+  end
+end
+
+--- Clear inlay hints
+---
+---@param client_id integer|nil filter by client_id. All clients if nil
+---@param bufnr integer|nil filter by buffer. All buffers if nil
+---@private
+function M.clear(client_id, bufnr)
+  local buffers = bufnr and { resolve_bufnr(bufnr) } or vim.tbl_keys(hint_cache_by_buf)
+  for _, iter_bufnr in ipairs(buffers) do
+    M.__explicit_buffers[iter_bufnr] = false
+    local bufstate = hint_cache_by_buf[iter_bufnr]
+    local client_lens = (bufstate or {}).client_hint or {}
+    local client_ids = client_id and { client_id } or vim.tbl_keys(client_lens)
+    for _, iter_client_id in ipairs(client_ids) do
+      if bufstate then
+        bufstate.client_hint[iter_client_id] = {}
+      end
+    end
+    api.nvim_buf_clear_namespace(iter_bufnr, namespace, 0, -1)
+  end
+  vim.cmd('redraw!')
+end
+
+api.nvim_set_decoration_provider(namespace, {
+  on_win = function(_, _, bufnr, topline, botline)
+    local bufstate = hint_cache_by_buf[bufnr]
+    if not bufstate then
+      return
+    end
+
+    if bufstate.version ~= util.buf_versions[bufnr] then
+      return
+    end
+    local hints_by_client = bufstate.client_hint
+    api.nvim_buf_clear_namespace(bufnr, namespace, 0, -1)
+
+    for lnum = topline, botline do
+      for _, hints_by_lnum in pairs(hints_by_client) do
+        local line_hints = hints_by_lnum[lnum] or {}
+        for _, hint in pairs(line_hints) do
+          local text = ''
+          if type(hint.label) == 'string' then
+            text = hint.label
+          else
+            for _, part in ipairs(hint.label) do
+              text = text .. part.value
+            end
+          end
+          if hint.paddingLeft then
+            text = ' ' .. text
+          end
+          if hint.paddingRight then
+            text = text .. ' '
+          end
+          api.nvim_buf_set_extmark(bufnr, namespace, lnum, hint.position.character, {
+            virt_text_pos = 'inline',
+            ephemeral = false,
+            virt_text = {
+              { text, 'LspInlayHint' },
+            },
+            hl_mode = 'combine',
+          })
+        end
+      end
+    end
+  end,
+})
+
+return M
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 19338ae8f0..44a9a58aca 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -219,6 +219,10 @@ M['textDocument/codeLens'] = function(...)
   return require('vim.lsp.codelens').on_codelens(...)
 end
 
+M['textDocument/inlayHint'] = function(...)
+  return require('vim.lsp._inlay_hint').on_inlayhint(...)
+end
+
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_references
 M['textDocument/references'] = function(_, result, ctx, config)
   if not result or vim.tbl_isempty(result) then
@@ -612,6 +616,28 @@ M['window/showDocument'] = function(_, result, ctx, _)
   return { success = success or false }
 end
 
+---@see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_inlayHint_refresh
+M['workspace/inlayHint/refresh'] = function(err, _, ctx)
+  local inlay_hint = require('vim.lsp._inlay_hint')
+  if not inlay_hint.__explicit_buffers[ctx.bufnr] then
+    return vim.NIL
+  end
+  if err then
+    return vim.NIL
+  end
+
+  for _, bufnr in ipairs(vim.lsp.get_buffers_by_client_id(ctx.client_id)) do
+    for _, winid in ipairs(api.nvim_list_wins()) do
+      if api.nvim_win_get_buf(winid) == bufnr then
+        inlay_hint.refresh({ bufnr = bufnr })
+        break
+      end
+    end
+  end
+
+  return vim.NIL
+end
+
 -- Add boilerplate error validation and logging for all of these.
 for k, fn in pairs(M) do
   M[k] = function(err, result, ctx, config)
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 172d43e483..b3a7903420 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -641,6 +641,12 @@ function protocol.make_client_capabilities()
       },
     },
     textDocument = {
+      inlayHint = {
+        dynamicRegistration = false,
+        resolveSupport = {
+          properties = {},
+        },
+      },
       semanticTokens = {
         dynamicRegistration = false,
         tokenTypes = {
@@ -853,6 +859,9 @@ function protocol.make_client_capabilities()
         dynamicRegistration = true,
         relativePatternSupport = true,
       },
+      inlayHint = {
+        refreshSupport = true,
+      },
     },
     experimental = nil,
     window = {
diff --git a/runtime/lua/vim/lsp/types.lua b/runtime/lua/vim/lsp/types.lua
index ef85a0d10f..108aeeb922 100644
--- a/runtime/lua/vim/lsp/types.lua
+++ b/runtime/lua/vim/lsp/types.lua
@@ -69,3 +69,28 @@
 --- @field method string
 
 --- @alias lsp.UnregistrationParams {unregisterations: lsp.Unregistration[]}
+
+---@class lsp.Location
+---@field uri string
+---@field range lsp.Range
+
+---@class lsp.MarkupContent
+---@field kind string
+---@field value string
+
+---@class lsp.InlayHintLabelPart
+---@field value string
+---@field tooltip? string | lsp.MarkupContent
+---@field location? lsp.Location
+
+---@class lsp.TextEdit
+---@field range lsp.Range
+---@field newText string
+
+---@class lsp.InlayHint
+---@field position lsp.Position
+---@field label string | lsp.InlayHintLabelPart[]
+---@field kind? integer
+---@field textEdits? lsp.TextEdit[]
+---@field paddingLeft? boolean
+---@field paddingRight? boolean
-- 
cgit 


From 473a216a21fdc086ef71e0ca7d40c2fdf5346245 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Sun, 11 Jun 2023 12:40:22 +0100
Subject: vim-patch:10e8ff9b2607 (#23977)

Update runtime files

https://github.com/vim/vim/commit/10e8ff9b26078994cae57c2422b145d37aaf714e

Also:
- fix a missing `<` in builtin.txt.
- edit `:function` `{name}` wording to match the change made for the docs above
  by Justin in #10619.
- link to `*vimrc*` rather than `*init.vim*` in repeat.txt change (as `init.lua`
  may also be used).

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/autocmd.txt                |  3 +++
 runtime/doc/builtin.txt                |  8 ++++----
 runtime/doc/cmdline.txt                |  7 ++++---
 runtime/doc/eval.txt                   |  2 +-
 runtime/doc/map.txt                    |  2 +-
 runtime/doc/nvim_terminal_emulator.txt |  4 ++--
 runtime/doc/options.txt                | 26 ++++++++++++++++++++------
 runtime/doc/repeat.txt                 |  4 ++--
 runtime/doc/spell.txt                  |  4 ++--
 runtime/doc/starting.txt               |  4 +++-
 runtime/doc/userfunc.txt               | 10 ++++++++--
 runtime/ftplugin/corn.vim              | 18 ++++++++++++++++++
 runtime/ftplugin/fennel.vim            |  4 ++--
 runtime/ftplugin/urlshortcut.vim       | 20 ++++++++++++++++++++
 runtime/syntax/meson.vim               |  8 ++++++--
 runtime/syntax/structurizr.vim         |  5 ++++-
 runtime/syntax/swayconfig.vim          | 18 ++++++++++++++----
 runtime/syntax/urlshortcut.vim         | 14 ++++++++++++++
 runtime/syntax/xpm.vim                 |  8 ++++----
 19 files changed, 132 insertions(+), 37 deletions(-)
 create mode 100644 runtime/ftplugin/corn.vim
 create mode 100644 runtime/ftplugin/urlshortcut.vim
 create mode 100644 runtime/syntax/urlshortcut.vim

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 94a529930e..b64938ee9e 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -774,6 +774,9 @@ OptionSet			After setting an option (except during
 				the option. Similarly |v:option_oldglobal| is
 				only set when |:set| or |:setglobal| was used.
 
+				This does not set |<abuf>|, you could use
+				|bufnr()|.
+
 				Note that when setting a |global-local| string
 				option with |:set|, then |v:option_old| is the
 				old global value. However, for all other kinds
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index bdd9f2fd3a..5f10607fc0 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1233,7 +1233,7 @@ clearmatches([{win}])					*clearmatches()*
 		Can also be used as a |method|: >
 			GetWin()->clearmatches()
 <
-col({expr} [, {winid})					*col()*
+col({expr} [, {winid}])					*col()*
 		The result is a Number, which is the byte index of the column
 		position given with {expr}.  The accepted positions are:
 		    .	    the cursor position
@@ -1296,7 +1296,7 @@ complete({startcol}, {matches})			*complete()* *E785*
 		Example: >
 	inoremap <F5> <C-R>=ListMonths()<CR>
 
-	func! ListMonths()
+	func ListMonths()
 	  call complete(col('.'), ['January', 'February', 'March',
 		\ 'April', 'May', 'June', 'July', 'August', 'September',
 		\ 'October', 'November', 'December'])
@@ -1540,7 +1540,7 @@ cursor({list})
 		This is like the return value of |getpos()| or |getcurpos()|,
 		but without the first item.
 
-		To position the cursor using the character count, use
+		To position the cursor using {col} as the character count, use
 		|setcursorcharpos()|.
 
 		Does not change the jumplist.
@@ -5626,7 +5626,7 @@ mkdir({name} [, {flags} [, {prot}]])
 <		and "subdir" already exists then "subdir/tmp" will be
 		scheduled for deletion, like with: >
 			defer delete('subdir/tmp', 'rf')
-
+<
 		If {prot} is given it is used to set the protection bits of
 		the new directory.  The default is 0o755 (rwxr-xr-x: r/w for
 		the user, readable for others).  Use 0o700 to make it
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index c43d1caa0e..a8f07dd6c5 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -902,9 +902,10 @@ Note: these are typed literally, they are not special keys!
 		   write.  *E495*
 							*:<abuf>* *<abuf>*
 	<abuf>     When executing autocommands, is replaced with the currently
-		   effective buffer number (for ":r file" and ":so file" it is
-		   the current buffer, the file being read/sourced is not in a
-		   buffer).  *E496*
+		   effective buffer number.  It is not set for all events,
+		   also see |bufnr()|.  For ":r file" and ":so file" it is the
+		   current buffer, the file being read/sourced is not in a
+		   buffer.  *E496*
 							*:<amatch>* *<amatch>*
 	<amatch>   When executing autocommands, is replaced with the match for
 		   which this autocommand was executed.  *E497*
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index aa53244dc8..5cee668b39 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2799,7 +2799,7 @@ text...
 				let mylist = [1, 2, 3]
 				lockvar 0 mylist
 				let mylist[0] = 77	" OK
-				call add(mylist, 4]	" OK
+				call add(mylist, 4)	" OK
 				let mylist = [7, 8, 9]  " Error!
 <								*E743*
 			For unlimited depth use [!] and omit [depth].
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index ad7901b962..9613092ba9 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -349,7 +349,7 @@ Note:
 - The command is not echo'ed, no need for <silent>.
 - The {rhs} is not subject to abbreviations nor to other mappings, even if the
   mapping is recursive.
-- In Visual mode  you can use `line('v')` and `col('v')` to get one end of the
+- In Visual mode you can use `line('v')` and `col('v')` to get one end of the
   Visual area, the cursor is at the other end.
 
 							*E1255* *E1136*
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index b98c96ec87..aa37161d34 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -392,8 +392,8 @@ If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_map_K = 0
 <
 						*termdebug_disasm_window*
-If you want the Asm window shown by default, set the flag to 1.
-the "disasm_window_height" entry can be used to set the window height: >vim
+If you want the Asm window shown by default, set the "disasm_window" flag to
+1.  The "disasm_window_height" entry can be used to set the window height: >vim
 	let g:termdebug_config['disasm_window'] = 1
 	let g:termdebug_config['disasm_window_height'] = 15
 If there is no g:termdebug_config you can use: >vim
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7729ec5d38..ff346e878d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1361,7 +1361,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The screen column can be an absolute number, or a number preceded with
 	'+' or '-', which is added to or subtracted from 'textwidth'. >
 
-		:set cc=+1  " highlight column after 'textwidth'
+		:set cc=+1	  " highlight column after 'textwidth'
 		:set cc=+1,+2,+3  " highlight three columns after 'textwidth'
 		:hi ColorColumn ctermbg=lightgrey guibg=lightgrey
 <
@@ -5386,7 +5386,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			local to buffer
 	Number of spaces to use for each step of (auto)indent.  Used for
 	|'cindent'|, |>>|, |<<|, etc.
-	When zero the 'ts' value will be used.  Use the |shiftwidth()|
+	When zero the 'tabstop' value will be used.  Use the |shiftwidth()|
 	function to get the effective shiftwidth value.
 
 						*'shortmess'* *'shm'*
@@ -5662,6 +5662,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	line in the window wraps part of it may not be visible, as if it is
 	above the window. "<<<" is displayed at the start of the first line,
 	highlighted with |hl-NonText|.
+	You may also want to add "lastline" to the 'display' option to show as
+	much of the last line as possible.
 	NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y
 	and scrolling with the mouse.
 
@@ -6313,13 +6315,25 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   (or 3 or whatever you prefer) and use 'noexpandtab'.  Then Vim
 	   will use a mix of tabs and spaces, but typing <Tab> and <BS> will
 	   behave like a tab appears every 4 (or 3) characters.
-	2. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use
+	   This is the recommended way, the file will look the same with other
+	   tools and when listing it in a terminal.
+	2. Set 'softtabstop' and 'shiftwidth' to whatever you prefer and use
+	   'expandtab'.  This way you will always insert spaces.  The
+	   formatting will never be messed up when 'tabstop' is changed (leave
+	   it at 8 just in case).  The file will be a bit larger.
+	   You do need to check if no Tabs exist in the file.  You can get rid
+	   of them by first setting 'expandtab' and using `%retab!`, making
+	   sure the value of 'tabstop' is set correctly.
+	3. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use
 	   'expandtab'.  This way you will always insert spaces.  The
 	   formatting will never be messed up when 'tabstop' is changed.
-	3. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use a
+	   You do need to check if no Tabs exist in the file, just like in the
+	   item just above.
+	4. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use a
 	   |modeline| to set these values when editing the file again.  Only
-	   works when using Vim to edit the file.
-	4. Always set 'tabstop' and 'shiftwidth' to the same value, and
+	   works when using Vim to edit the file, other tools assume a tabstop
+	   is worth 8 spaces.
+	5. Always set 'tabstop' and 'shiftwidth' to the same value, and
 	   'noexpandtab'.  This should then work (for initial indents only)
 	   for any tabstop setting that people use.  It might be nice to have
 	   tabs after the first non-blank inserted as spaces if you do this
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 071b062957..558cc75d65 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -260,8 +260,8 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			'runtimepath'.
 
 			If the filetype detection was already enabled (this
-			is usually done with a "syntax enable" or "filetype
-			on" command in your |init.vim|, or automatically during
+			is usually done with a `syntax enable` or `filetype on`
+			command in your |vimrc|, or automatically during
 			|initialization|), and the package was found in
 			"pack/*/opt/{name}", this command will also look
 			for "{name}/ftdetect/*.vim" files.
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 75e4767743..29e4a7b0aa 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -111,7 +111,7 @@ zuG			Undo |zW| and |zG|, remove the word from the internal
 			list, like with |zW|.
 
 							*:spellra* *:spellrare*
-:[count]spellr[are] {word}
+:[count]spellra[re] {word}
 			Add {word} as a rare word to 'spellfile', similar to
 			|zw|.  Without count the first name is used, with
 			a count of two the second entry, etc.
@@ -124,7 +124,7 @@ zuG			Undo |zW| and |zG|, remove the word from the internal
 		nnoremap z/  :exe ':spellrare! ' .. expand('<cWORD>')<CR>
 <			|:spellundo|, |zuw|, or |zuW| can be used to undo this.
 
-:spellr[rare]! {word}	Add {word} as a rare word to the internal word
+:spellra[re]! {word}	Add {word} as a rare word to the internal word
 			list, similar to |zW|.
 
 :[count]spellu[ndo] {word}				*:spellu* *:spellundo*
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index b3a30b20e8..2c7b7ed61b 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -426,9 +426,11 @@ accordingly, proceeding as follows:
 
 2. Process the arguments
 	The options and file names from the command that start Vim are
-	inspected.  Buffers are created for all files (but not loaded yet).
+	inspected.
 	The |-V| argument can be used to display or log what happens next,
 	useful for debugging the initializations.
+	The |--cmd| arguments are executed.
+	Buffers are created for all files (but not loaded yet).
 
 3. Start a server (unless |--listen| was given) and set |v:servername|.
 
diff --git a/runtime/doc/userfunc.txt b/runtime/doc/userfunc.txt
index db0127df95..8b6462911d 100644
--- a/runtime/doc/userfunc.txt
+++ b/runtime/doc/userfunc.txt
@@ -44,6 +44,13 @@ functions.
 			unless "!" is given.
 			{name} may be a |Dictionary| |Funcref| entry: >
 				:function dict.init
+<			Note that {name} is not an expression, you cannot use
+			a variable that is a function reference.  You can use
+			this dirty trick to list the function referred to with
+			variable "Funcref": >
+				let g:MyFuncref = Funcref
+				func g:MyFuncref
+				unlet g:MyFuncref
 
 :fu[nction] /{pattern}	List functions with a name matching {pattern}.
 			Example that lists all functions ending with "File": >
@@ -72,8 +79,7 @@ See |:verbose-cmd| for more information.
 			name has a colon in the name, e.g. for "foo:bar()".
 			Before that patch no error was given).
 
-			{name} can also be a |Dictionary| entry that is a
-			|Funcref|: >
+			{name} may be a |Dictionary| |Funcref| entry: >
 				:function dict.init(arg)
 <			"dict" must be an existing dictionary.  The entry
 			"init" is added if it didn't exist yet.  Otherwise [!]
diff --git a/runtime/ftplugin/corn.vim b/runtime/ftplugin/corn.vim
new file mode 100644
index 0000000000..2259442229
--- /dev/null
+++ b/runtime/ftplugin/corn.vim
@@ -0,0 +1,18 @@
+" Vim filetype plugin
+" Language:         Corn
+" Original Author:  Jake Stanger (mail@jstanger.dev) 
+" License:          MIT
+" Last Change:      2023 May 28
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal formatoptions-=t
+
+" Set comment (formatting) related options.
+setlocal commentstring=//\ %s comments=:// 
+
+" Let Vim know how to disable the plug-in.
+let b:undo_ftplugin = 'setlocal commentstring< comments< formatoptions<'
diff --git a/runtime/ftplugin/fennel.vim b/runtime/ftplugin/fennel.vim
index 2e502699c5..93cf366726 100644
--- a/runtime/ftplugin/fennel.vim
+++ b/runtime/ftplugin/fennel.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:     Fennel
 " Maintainer:   Gregory Anders <greg[NOSPAM]@gpanders.com>
-" Last Update:  2022 Apr 20
+" Last Update:  2023 Jun 9
 
 if exists('b:did_ftplugin')
   finish
@@ -13,6 +13,6 @@ setlocal comments=:;;,:;
 setlocal formatoptions-=t
 setlocal suffixesadd=.fnl
 setlocal lisp
-setlocal lispwords=accumulate,collect,do,doto,each,eval-compiler,fn,for,icollect,lambda,let,macro,macros,match,match-try,when,while,with-open
+setlocal lispwords=accumulate,case,case-try,collect,do,doto,each,eval-compiler,faccumulate,fcollect,fn,for,icollect,lambda,let,macro,macros,match,match-try,when,while,with-open
 
 let b:undo_ftplugin = 'setlocal commentstring< comments< formatoptions< suffixesadd< lisp< lispwords<'
diff --git a/runtime/ftplugin/urlshortcut.vim b/runtime/ftplugin/urlshortcut.vim
new file mode 100644
index 0000000000..ebe08ac1d8
--- /dev/null
+++ b/runtime/ftplugin/urlshortcut.vim
@@ -0,0 +1,20 @@
+" Vim filetype plugin file
+" Language:             MS Windows URL shortcut file
+" Maintainer:           ObserverOfTime <chronobserver@disroot.org>
+" Latest Revision:      2023-06-04
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:; commentstring=;\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/syntax/meson.vim b/runtime/syntax/meson.vim
index 0af0d776f8..4eaf696322 100644
--- a/runtime/syntax/meson.vim
+++ b/runtime/syntax/meson.vim
@@ -3,7 +3,7 @@
 " License:	VIM License
 " Maintainer:	Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
 "		Liam Beguin <liambeguin@gmail.com>
-" Last Change:	2021 Aug 16
+" Last Change:	2023 May 27
 " Credits:	Zvezdan Petkovic <zpetkovic@acm.org>
 "		Neil Schemenauer <nas@meson.ca>
 "		Dmitry Vasiliev
@@ -68,6 +68,7 @@ syn keyword mesonBuiltin
   \ add_global_link_arguments
   \ add_languages
   \ add_project_arguments
+  \ add_project_dependencies
   \ add_project_link_arguments
   \ add_test_setup
   \ alias_target
@@ -99,6 +100,7 @@ syn keyword mesonBuiltin
   \ install_headers
   \ install_man
   \ install_subdir
+  \ install_symlink
   \ install_emptydir
   \ is_disabler
   \ is_variable
@@ -115,6 +117,7 @@ syn keyword mesonBuiltin
   \ shared_library
   \ shared_module
   \ static_library
+  \ structured_sources
   \ subdir
   \ subdir_done
   \ subproject
@@ -125,6 +128,7 @@ syn keyword mesonBuiltin
   \ vcs_tag
   \ warning
   \ range
+  \ debug
 
 if exists("meson_space_error_highlight")
   " trailing whitespace
@@ -146,7 +150,7 @@ hi def link mesonEscape		Special
 hi def link mesonNumber		Number
 hi def link mesonBuiltin	Function
 hi def link mesonBoolean	Boolean
-if exists("meson_space_error_higlight")
+if exists("meson_space_error_highlight")
   hi def link mesonSpaceError	Error
 endif
 
diff --git a/runtime/syntax/structurizr.vim b/runtime/syntax/structurizr.vim
index ab9e4ee609..363ee70438 100644
--- a/runtime/syntax/structurizr.vim
+++ b/runtime/syntax/structurizr.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:      Structurizr DSL
 " Maintainer:    Bastian Venthur <venthur@debian.org>
-" Last Change:   2022-02-15
+" Last Change:   2022-05-22
 " Remark:        For a language reference, see
 "                https://github.com/structurizr/dsl
 
@@ -26,6 +26,7 @@ syn keyword skeyword configuration
 syn keyword skeyword container
 syn keyword skeyword containerinstance
 syn keyword skeyword custom
+syn keyword skeyword default
 syn keyword skeyword deployment
 syn keyword skeyword deploymentenvironment
 syn keyword skeyword deploymentgroup
@@ -40,6 +41,7 @@ syn keyword skeyword group
 syn keyword skeyword healthcheck
 syn keyword skeyword include
 syn keyword skeyword infrastructurenode
+syn keyword skeyword instances
 syn keyword skeyword model
 syn keyword skeyword person
 syn keyword skeyword perspectives
@@ -54,6 +56,7 @@ syn keyword skeyword tags
 syn keyword skeyword technology
 syn keyword skeyword terminology
 syn keyword skeyword theme
+syn keyword skeyword themes
 syn keyword skeyword title
 syn keyword skeyword url
 syn keyword skeyword users
diff --git a/runtime/syntax/swayconfig.vim b/runtime/syntax/swayconfig.vim
index 996b8f596c..6b36210252 100644
--- a/runtime/syntax/swayconfig.vim
+++ b/runtime/syntax/swayconfig.vim
@@ -2,9 +2,9 @@
 " Language: sway window manager config
 " Original Author: James Eapen <james.eapen@vai.org>
 " Maintainer: James Eapen <james.eapen@vai.org>
-" Version: 0.1.6
-" Reference version (jamespeapen/swayconfig.vim): 0.11.6
-" Last Change: 2022 Aug 08
+" Version: 0.2.1
+" Reference version (jamespeapen/swayconfig.vim): 0.12.1
+" Last Change: 2023 Mar 20
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -58,6 +58,10 @@ syn match swayConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=i3ConfigClient
 syn keyword swayConfigInputKeyword input contained
 syn match swayConfigInput /^\s*input\s\+.*$/ contains=swayConfigInputKeyword
 
+" Seat config
+syn keyword swayConfigSeatKeyword seat contained
+syn match swayConfigSeat /^\s*seat\s\+.*$/ contains=swayConfigSeatKeyword
+
 " set display outputs
 syn match swayConfigOutput /^\s*output\s\+.*$/ contains=i3ConfigOutput
 
@@ -66,6 +70,10 @@ syn keyword swayConfigFocusKeyword focus contained
 syn keyword swayConfigFocusType output contained
 syn match swayConfigFocus /^\s*focus\soutput\s.*$/ contains=swayConfigFocusKeyword,swayConfigFocusType
 
+" mouse warping
+syn keyword swayConfigMouseWarpingType container contained
+syn match swayConfigMouseWarping /^\s*mouse_warping\s\+\(output\|container\|none\)\s\?$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType,swayConfigMouseWarpingType
+
 " focus follows mouse
 syn clear i3ConfigFocusFollowsMouseType
 syn clear i3ConfigFocusFollowsMouse
@@ -80,7 +88,7 @@ syn match swayConfigXwaylandModifier /^\s*xwayland\s\+\(enable\|disable\|force\)
 
 " Group mode/bar
 syn clear i3ConfigBlock
-syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigInitializeKeyword,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable,swayConfigInputKeyword,i3ConfigOutput transparent keepend extend
+syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigInitializeKeyword,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable,swayConfigInputKeyword,swayConfigSeatKeyword,i3ConfigOutput transparent keepend extend
 
 "hi def link swayConfigError                         Error
 hi def link i3ConfigFloating                        Error
@@ -89,6 +97,8 @@ hi def link swayConfigFloatingMouseAction           Type
 hi def link swayConfigFocusKeyword                  Type
 hi def link swayConfigSmartBorderKeyword            Type
 hi def link swayConfigInputKeyword                  Type
+hi def link swayConfigSeatKeyword                   Type
+hi def link swayConfigMouseWarpingType              Type
 hi def link swayConfigFocusFollowsMouseType         Type
 hi def link swayConfigBindGestureCommand            Identifier
 hi def link swayConfigBindGestureDirection          Constant
diff --git a/runtime/syntax/urlshortcut.vim b/runtime/syntax/urlshortcut.vim
new file mode 100644
index 0000000000..f6cc3835a2
--- /dev/null
+++ b/runtime/syntax/urlshortcut.vim
@@ -0,0 +1,14 @@
+" Vim syntax file
+" Language:      MS Windows URL shortcut file
+" Maintainer:    ObserverOfTime <chronobserver@disroot.org>
+" LastChange:    2023-06-04
+
+" Quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+   finish
+endif
+
+" Just use the dosini syntax for now
+runtime! syntax/dosini.vim
+
+let b:current_syntax = "urlshortcut"
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
index 77d82403e9..b094092b73 100644
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	X Pixmap
 " Maintainer:	Ronald Schild <rs@scutum.de>
-" Last Change:	2023 May 11
+" Last Change:	2023 May 24
 " Version:	5.4n.2
 "               Jemma Nelson added termguicolors support
 "               Dominique Pellé fixed spelling support
@@ -42,7 +42,7 @@ function s:CreateSyntax() abort
 	    let values = split(s[1 : -2])
 
 	    " Values string invalid, bail out
-	    if len(values) != 4
+	    if len(values) != 4 && len(values) != 6 && len(values) != 7
 	       return
 	    endif
 
@@ -100,8 +100,8 @@ function s:CreateSyntax() abort
 	    endif
 
 	    " escape meta characters in patterns
-	    let s = escape(s, '/\*^$.~[] ')
-	    let chars = escape(chars, '/\*^$.~[] ')
+	    let s = escape(s, '/\*^$.~[]')
+	    let chars = escape(chars, '/\*^$.~[]')
 
 	    " now create syntax items
 	    " highlight the color string as normal string (no pixel string)
-- 
cgit 


From 72de8fdeebd1cafeb05d3e5b03e537b8cb99178b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 11 Jun 2023 20:04:59 +0800
Subject: vim-patch:f1dcd14fc5d4 (#23986)

Update runtime files

https://github.com/vim/vim/commit/f1dcd14fc5d4370476cd82895a4479ca2d252e54

:autocmd-block is N/A (Vim9 script)

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt | 2 +-
 runtime/doc/options.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5f10607fc0..1fea6ad715 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -3637,7 +3637,7 @@ getscriptinfo([{opts}])					*getscriptinfo()*
 		    name	Vim script file name.
 		    sid		Script ID |<SID>|.
 		    variables   A dictionary with the script-local variables.
-				Present only when the a particular script is
+				Present only when a particular script is
 				specified using the "sid" item in {opts}.
 				Note that this is a copy, the value of
 				script-local variables cannot be changed using
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ff346e878d..0f53288608 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5391,7 +5391,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'shortmess'* *'shm'*
 'shortmess' 'shm'	string	(default "filnxtToOCF")
-			global
+			global					*E1336*
 	This option helps to avoid all the |hit-enter| prompts caused by file
 	messages, for example  with CTRL-G, and to avoid some other messages.
 	It is a list of flags:
-- 
cgit 


From bde59e81473f29944ef80ff98f6b2c88010b2df6 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 11 Jun 2023 22:12:32 +0800
Subject: fix(remote): restore previous --remote-expr output formatting
 (#23988)

- Use tostring() as that's what print() uses internally.
- Do not append trailing new line.
---
 runtime/lua/vim/_editor.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index dc396b8f65..1c7eb30b03 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -940,14 +940,13 @@ function vim._cs_remote(rcid, server_addr, connect_error, args)
     if rcid == 0 then
       return { errmsg = connection_failure_errmsg('Send failed.') }
     end
-    vim.fn.rpcrequest(rcid, 'nvim_input', args[2])
+    vim.rpcrequest(rcid, 'nvim_input', args[2])
     return { should_exit = true, tabbed = false }
   elseif subcmd == 'expr' then
     if rcid == 0 then
       return { errmsg = connection_failure_errmsg('Send expression failed.') }
     end
-    local expr = 'string(' .. args[2] .. ')'
-    local res = vim.fn.rpcrequest(rcid, 'nvim_eval', expr)
+    local res = tostring(vim.rpcrequest(rcid, 'nvim_eval', args[2]))
     return { result = res, should_exit = true, tabbed = false }
   elseif subcmd ~= '' then
     return { errmsg = 'Unknown option argument: ' .. args[1] }
-- 
cgit 


From ceb37ff1d83c6dc341dc43d3dc8c81f657bc9484 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <sseitz@nvidia.com>
Date: Sun, 11 Jun 2023 23:46:22 +0200
Subject: refactor(treesitter): use npcall in _query_linter.lua #23985

---
 runtime/lua/vim/treesitter/_query_linter.lua | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_query_linter.lua b/runtime/lua/vim/treesitter/_query_linter.lua
index ecdee5fc95..3dd0177a81 100644
--- a/runtime/lua/vim/treesitter/_query_linter.lua
+++ b/runtime/lua/vim/treesitter/_query_linter.lua
@@ -53,10 +53,7 @@ end
 local function guess_query_lang(buf)
   local filename = api.nvim_buf_get_name(buf)
   if filename ~= '' then
-    local ok, query_lang = pcall(vim.fn.fnamemodify, filename, ':p:h:t')
-    if ok then
-      return query_lang
-    end
+    return vim.F.npcall(vim.fn.fnamemodify, filename, ':p:h:t')
   end
 end
 
@@ -270,11 +267,8 @@ function M.lint(buf, opts)
   for i = 1, math.max(1, #opts.langs) do
     local lang = opts.langs[i]
 
-    --- @type boolean, (table|nil)
-    local ok, parser_info = pcall(vim.treesitter.language.inspect, lang)
-    if not ok then
-      parser_info = nil
-    end
+    --- @type (table|nil)
+    local parser_info = vim.F.npcall(vim.treesitter.language.inspect, lang)
 
     local parser = vim.treesitter.get_parser(buf)
     parser:parse()
-- 
cgit 


From 385a1facf28b1f3ddc1c6a4dc4ca35729a852b2c Mon Sep 17 00:00:00 2001
From: jdrouhard <john@drouhard.dev>
Date: Sun, 11 Jun 2023 16:48:57 -0500
Subject: docs: semantic token methods in :h lsp-method #23991

---
 runtime/doc/lsp.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 27ef38743b..c4322e9c24 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -202,6 +202,8 @@ specification. These LSP requests/notifications are defined by default:
     textDocument/rangeFormatting
     textDocument/references
     textDocument/rename
+    textDocument/semanticTokens/full
+    textDocument/semanticTokens/full/delta
     textDocument/signatureHelp
     textDocument/typeDefinition*
     window/logMessage
-- 
cgit 


From ecdb6465e272119f80f3b68a6695e0f74b02ca49 Mon Sep 17 00:00:00 2001
From: Gianmaria Bajo <mg1979.git@gmail.com>
Date: Wed, 7 Jun 2023 14:28:44 +0200
Subject: feat: vim.version() returns a Version object

- vim.version() returns a Version object.
  Makes it printable and removes the need of workarounds when passing it
  to other vim.version methods.
---
 runtime/lua/vim/version.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index d4a3752e37..5578423453 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -226,13 +226,11 @@ function Range:has(version)
   if type(version) == 'string' then
     ---@diagnostic disable-next-line: cast-local-type
     version = M.parse(version)
-  else
+  elseif getmetatable(version) ~= Version then
     -- Need metatable to compare versions.
     version = setmetatable(vim.deepcopy(version), Version)
   end
   if version then
-    -- Workaround: vim.version() reports "prerelease" as a boolean.
-    version.prerelease = version.prerelease or nil
     if version.prerelease ~= self.from.prerelease then
       return false
     end
@@ -423,8 +421,12 @@ function M.parse(version, opts)
 end
 
 setmetatable(M, {
+  --- Returns the current Nvim version.
   __call = function()
-    return vim.fn.api_info().version
+    local version = vim.fn.api_info().version
+    -- Workaround: vim.fn.api_info().version reports "prerelease" as a boolean.
+    version.prerelease = version.prerelease or nil
+    return setmetatable(version, Version)
   end,
 })
 
-- 
cgit 


From d3b9feccb39124cefbe4b0c492fb0bc3f777d0b4 Mon Sep 17 00:00:00 2001
From: Stanislav Asunkin <1353637+stasjok@users.noreply.github.com>
Date: Mon, 12 Jun 2023 01:48:13 +0300
Subject: docs: fix vim.tbl_get type annotations #23992

---
 runtime/doc/lua.txt        | 4 ++--
 runtime/lua/vim/shared.lua | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 44682d40e5..7cd13926c7 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2071,8 +2071,8 @@ tbl_get({o}, {...})                                            *vim.tbl_get()*
 
     Parameters: ~
       • {o}    (table) Table to index
-      • {...}  (string) Optional strings (0 or more, variadic) via which to
-               index the table
+      • {...}  any Optional keys (0 or more, variadic) via which to index the
+               table
 
     Return: ~
         any Nested value indexed by key (if it exists), else nil
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index f899157ab7..dd05299295 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -456,7 +456,7 @@ end
 --- </pre>
 ---
 ---@param o table Table to index
----@param ... string Optional strings (0 or more, variadic) via which to index the table
+---@param ... any Optional keys (0 or more, variadic) via which to index the table
 ---
 ---@return any Nested value indexed by key (if it exists), else nil
 function vim.tbl_get(o, ...)
-- 
cgit 


From e6887932539315e02621edb77d5e77c7c2a0b033 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 12 Jun 2023 01:14:33 +0200
Subject: feat: tostring(vim.version())
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
tostring(vim.version()) returns "table: 0x…".

Solution:
Modify vim.version() to return a string prerelease instead of a boolean.

Fix #23863
---
 runtime/lua/vim/version.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 5578423453..92250ff1f8 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -425,7 +425,7 @@ setmetatable(M, {
   __call = function()
     local version = vim.fn.api_info().version
     -- Workaround: vim.fn.api_info().version reports "prerelease" as a boolean.
-    version.prerelease = version.prerelease or nil
+    version.prerelease = version.prerelease and 'dev' or nil
     return setmetatable(version, Version)
   end,
 })
-- 
cgit 


From 0eb02ea90a5a7c2e35bfcf99b701a28ff2901b4b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 12 Jun 2023 20:08:08 +0800
Subject: docs: various clarifications (#23999)

Close #18907
Close #20314
Close #23749
---
 runtime/doc/api.txt         |  2 +-
 runtime/doc/lua.txt         | 31 ++++++++-----------------------
 runtime/doc/map.txt         |  2 +-
 runtime/doc/vim_diff.txt    |  2 +-
 runtime/lua/vim/_editor.lua |  4 ++--
 runtime/lua/vim/keymap.lua  |  8 ++++----
 6 files changed, 17 insertions(+), 32 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 748a8ba3bb..1732c24f2f 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1495,7 +1495,7 @@ nvim_set_keymap({mode}, {lhs}, {rhs}, {*opts})             *nvim_set_keymap()*
                 except |<buffer>|, values are booleans (default false). Also:
                 • "noremap" non-recursive mapping |:noremap|
                 • "desc" human-readable description.
-                • "callback" Lua function called when the mapping is executed.
+                • "callback" Lua function called in place of {rhs}.
                 • "replace_keycodes" (boolean) When "expr" is true, replace
                   keycodes in the resulting string (see
                   |nvim_replace_termcodes()|). Returning nil from the Lua
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 7cd13926c7..737aa91e97 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -867,21 +867,6 @@ vim.schedule({callback})                                      *vim.schedule()*
     Schedules {callback} to be invoked soon by the main event-loop. Useful
     to avoid |textlock| or other temporary restrictions.
 
-
-vim.defer_fn({fn}, {timeout})                                   *vim.defer_fn*
-    Defers calling {fn} until {timeout} ms passes. Use to do a one-shot timer
-    that calls {fn}.
-
-    Note: The {fn} is |vim.schedule_wrap()|ped automatically, so API functions are
-    safe to call.
-
-    Parameters: ~
-      • {fn}        Callback to call once {timeout} expires
-      • {timeout}   Time in ms to wait before calling {fn}
-
-    Returns: ~
-        |vim.uv|.new_timer() object
-
 vim.wait({time} [, {callback}, {interval}, {fast_only}])          *vim.wait()*
     Wait for {time} in milliseconds until {callback} returns `true`.
 
@@ -1376,10 +1361,10 @@ connection_failure_errmsg({consequence})
     TODO: Documentation
 
 defer_fn({fn}, {timeout})                                     *vim.defer_fn()*
-    Defers calling `fn` until `timeout` ms passes.
+    Defers calling {fn} until {timeout} ms passes.
 
-    Use to do a one-shot timer that calls `fn` Note: The {fn} is |vim.schedule_wrap()|ped automatically, so API functions
-    are safe to call.
+    Use to do a one-shot timer that calls {fn} Note: The {fn} is
+    |vim.schedule_wrap()|ped automatically, so API functions are safe to call.
 
     Parameters: ~
       • {fn}       (function) Callback to call once `timeout` expires
@@ -2551,8 +2536,8 @@ del({modes}, {lhs}, {opts})                                 *vim.keymap.del()*
 
     Parameters: ~
       • {opts}  (table|nil) A table of optional arguments:
-                • buffer: (number or boolean) Remove a mapping from the given
-                  buffer. When "true" or 0, use the current buffer.
+                • "buffer": (number|boolean) Remove a mapping from the given
+                  buffer. When `0` or `true`, use the current buffer.
 
     See also: ~
       • |vim.keymap.set()|
@@ -2586,9 +2571,9 @@ set({mode}, {lhs}, {rhs}, {opts})                           *vim.keymap.set()*
                   • "noremap": inverse of "remap" (see below).
 
                 • Also accepts:
-                  • "buffer" number|boolean Creates buffer-local mapping, `0`
-                    or `true` for current buffer.
-                  • remap: (boolean) Make the mapping recursive. Inverses
+                  • "buffer": (number|boolean) Creates buffer-local mapping,
+                    `0` or `true` for current buffer.
+                  • "remap": (boolean) Make the mapping recursive. Inverse of
                     "noremap". Defaults to `false`.
 
     See also: ~
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 9613092ba9..25ab91b89e 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1391,7 +1391,7 @@ completion can be enabled:
 	-complete=highlight	highlight groups
 	-complete=history	:history suboptions
 	-complete=locale	locale names (as output of locale -a)
-	-complete=lua		Lua expression
+	-complete=lua		Lua expression |:lua|
 	-complete=mapclear	buffer argument
 	-complete=mapping	mapping name
 	-complete=menu		menus
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 2c7ca487e6..ab1b2056a2 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -762,7 +762,7 @@ TUI:
 
 Cscope:
                                                                       *cscope*
-  Cscope support has been removed in favour of LSP based solutions.
+  Cscope support has been removed in favour of plugin-based solutions.
 
 Hardcopy:
                                                                      *hardcopy*
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 1c7eb30b03..1de2ade1a1 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -534,9 +534,9 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
   return region
 end
 
---- Defers calling `fn` until `timeout` ms passes.
+--- Defers calling {fn} until {timeout} ms passes.
 ---
---- Use to do a one-shot timer that calls `fn`
+--- Use to do a one-shot timer that calls {fn}
 --- Note: The {fn} is |vim.schedule_wrap()|ped automatically, so API functions are
 --- safe to call.
 ---@param fn function Callback to call once `timeout` expires
diff --git a/runtime/lua/vim/keymap.lua b/runtime/lua/vim/keymap.lua
index 0d7fc3b1ec..9dbc65afe8 100644
--- a/runtime/lua/vim/keymap.lua
+++ b/runtime/lua/vim/keymap.lua
@@ -27,9 +27,9 @@ local keymap = {}
 ---                        - "replace_keycodes" defaults to `true` if "expr" is `true`.
 ---                        - "noremap": inverse of "remap" (see below).
 ---                      - Also accepts:
----                        - "buffer" number|boolean Creates buffer-local mapping, `0` or `true`
+---                        - "buffer": (number|boolean) Creates buffer-local mapping, `0` or `true`
 ---                        for current buffer.
----                        - remap: (boolean) Make the mapping recursive. Inverses "noremap".
+---                        - "remap": (boolean) Make the mapping recursive. Inverse of "noremap".
 ---                        Defaults to `false`.
 ---@see |nvim_set_keymap()|
 function keymap.set(mode, lhs, rhs, opts)
@@ -83,8 +83,8 @@ end
 ---   vim.keymap.del({'n', 'i', 'v'}, '<leader>w', { buffer = 5 })
 --- </pre>
 ---@param opts table|nil A table of optional arguments:
----                      - buffer: (number or boolean) Remove a mapping from the given buffer.
----                      When "true" or 0, use the current buffer.
+---                      - "buffer": (number|boolean) Remove a mapping from the given buffer.
+---                        When `0` or `true`, use the current buffer.
 ---@see |vim.keymap.set()|
 ---
 function keymap.del(modes, lhs, opts)
-- 
cgit 


From 91f67fabe69f5e3be19f37709261ea7abaa1a3cd Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Tue, 13 Jun 2023 16:53:13 +0200
Subject: fix(lsp): handle stale bufnr on LspRequest autocmd trigger (#24013)

Fixes a `Invalid buffer id: 123` race when the buffer gets deleted before
the callback triggered.

Alternative to https://github.com/neovim/neovim/pull/23981
---
 runtime/lua/vim/lsp.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 6f9a6c460b..9118e7e2e1 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1519,7 +1519,7 @@ function lsp.start_client(config)
       local request = client.requests[request_id]
       request.type = 'complete'
       nvim_exec_autocmds('LspRequest', {
-        buffer = bufnr,
+        buffer = api.nvim_buf_is_valid(bufnr) and bufnr or nil,
         modeline = false,
         data = { client_id = client_id, request_id = request_id, request = request },
       })
-- 
cgit 


From bc67bbe4469b777a958f5ad515dec777777e9f2d Mon Sep 17 00:00:00 2001
From: Rohit Sukumaran <rohit.sukumaran8@gmail.com>
Date: Tue, 13 Jun 2023 20:47:35 +0530
Subject: fix(codelens): add buffer and line checks before displaying codelens
 (#23887)

Co-authored-by: Rohit Sukumaran <rohit.sukumaran@kredx.com>
---
 runtime/lua/vim/lsp/codelens.lua | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index ea8c52c334..e26bdcc6d4 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -136,6 +136,10 @@ end
 ---@param bufnr integer
 ---@param client_id integer
 function M.display(lenses, bufnr, client_id)
+  if not api.nvim_buf_is_loaded(bufnr) then
+    return
+  end
+
   local ns = namespaces[client_id]
   if not lenses or not next(lenses) then
     api.nvim_buf_clear_namespace(bufnr, ns, 0, -1)
@@ -181,6 +185,10 @@ end
 ---@param bufnr integer
 ---@param client_id integer
 function M.save(lenses, bufnr, client_id)
+  if not api.nvim_buf_is_loaded(bufnr) then
+    return
+  end
+
   local lenses_by_client = lens_cache_by_buf[bufnr]
   if not lenses_by_client then
     lenses_by_client = {}
@@ -221,19 +229,24 @@ local function resolve_lenses(lenses, bufnr, client_id, callback)
       countdown()
     else
       client.request('codeLens/resolve', lens, function(_, result)
-        if result and result.command then
+        if api.nvim_buf_is_loaded(bufnr) and result and result.command then
           lens.command = result.command
           -- Eager display to have some sort of incremental feedback
           -- Once all lenses got resolved there will be a full redraw for all lenses
           -- So that multiple lens per line are properly displayed
-          api.nvim_buf_set_extmark(
-            bufnr,
-            ns,
-            lens.range.start.line,
-            0,
-            { virt_text = { { lens.command.title, 'LspCodeLens' } }, hl_mode = 'combine' }
-          )
+
+          local num_lines = api.nvim_buf_line_count(bufnr)
+          if lens.range.start.line <= num_lines then
+            api.nvim_buf_set_extmark(
+              bufnr,
+              ns,
+              lens.range.start.line,
+              0,
+              { virt_text = { { lens.command.title, 'LspCodeLens' } }, hl_mode = 'combine' }
+            )
+          end
         end
+
         countdown()
       end, bufnr)
     end
-- 
cgit 


From 79a5b89d66db74560e751561542064674e980146 Mon Sep 17 00:00:00 2001
From: Jon Huhn <nojnhuh@users.noreply.github.com>
Date: Wed, 14 Jun 2023 05:40:11 -0500
Subject: perf(lsp): reduce polling handles for workspace/didChangeWatchedFiles
 (#23500)

Co-authored-by: Lewis Russell <lewis6991@gmail.com>
---
 runtime/lua/vim/_watch.lua          | 73 ++++++++++++++++++++++++++++---------
 runtime/lua/vim/lsp/_watchfiles.lua | 52 +++++++++++++++++---------
 2 files changed, 91 insertions(+), 34 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
index 3bd8a56f6e..d489cef9fc 100644
--- a/runtime/lua/vim/_watch.lua
+++ b/runtime/lua/vim/_watch.lua
@@ -11,6 +11,7 @@ M.FileChangeType = vim.tbl_add_reverse_lookup({
 --- Joins filepath elements by static '/' separator
 ---
 ---@param ... (string) The path elements.
+---@return string
 local function filepath_join(...)
   return table.concat({ ... }, '/')
 end
@@ -36,7 +37,7 @@ end
 ---     - uvflags (table|nil)
 ---                Same flags as accepted by |uv.fs_event_start()|
 ---@param callback (function) The function called when new events
----@returns (function) A function to stop the watch
+---@return (function) A function to stop the watch
 function M.watch(path, opts, callback)
   vim.validate({
     path = { path, 'string', false },
@@ -75,10 +76,25 @@ end
 
 local default_poll_interval_ms = 2000
 
+--- @class watch.Watches
+--- @field is_dir boolean
+--- @field children? table<string,watch.Watches>
+--- @field cancel? fun()
+--- @field started? boolean
+--- @field handle? uv_fs_poll_t
+
+--- @class watch.PollOpts
+--- @field interval? integer
+--- @field include_pattern? userdata
+--- @field exclude_pattern? userdata
+
 ---@private
 --- Implementation for poll, hiding internally-used parameters.
 ---
----@param watches (table|nil) A tree structure to maintain state for recursive watches.
+---@param path string
+---@param opts watch.PollOpts
+---@param callback fun(patch: string, filechangetype: integer)
+---@param watches (watch.Watches|nil) A tree structure to maintain state for recursive watches.
 ---     - handle (uv_fs_poll_t)
 ---               The libuv handle
 ---     - cancel (function)
@@ -88,15 +104,36 @@ local default_poll_interval_ms = 2000
 ---               be invoked recursively)
 ---     - children (table|nil)
 ---               A mapping of directory entry name to its recursive watches
---      - started (boolean|nil)
---                Whether or not the watcher has first been initialized. Used
---                to prevent a flood of Created events on startup.
+---     - started (boolean|nil)
+---               Whether or not the watcher has first been initialized. Used
+---               to prevent a flood of Created events on startup.
+---@return fun() Cancel function
 local function poll_internal(path, opts, callback, watches)
   path = vim.fs.normalize(path)
   local interval = opts and opts.interval or default_poll_interval_ms
   watches = watches or {
     is_dir = true,
   }
+  watches.cancel = function()
+    if watches.children then
+      for _, w in pairs(watches.children) do
+        w.cancel()
+      end
+    end
+    if watches.handle then
+      stop(watches.handle)
+    end
+  end
+
+  local function incl_match()
+    return not opts.include_pattern or opts.include_pattern:match(path) ~= nil
+  end
+  local function excl_match()
+    return opts.exclude_pattern and opts.exclude_pattern:match(path) ~= nil
+  end
+  if not watches.is_dir and not incl_match() or excl_match() then
+    return watches.cancel
+  end
 
   if not watches.handle then
     local poll, new_err = vim.uv.new_fs_poll()
@@ -120,18 +157,9 @@ local function poll_internal(path, opts, callback, watches)
     end
   end
 
-  watches.cancel = function()
-    if watches.children then
-      for _, w in pairs(watches.children) do
-        w.cancel()
-      end
-    end
-    stop(watches.handle)
-  end
-
   if watches.is_dir then
     watches.children = watches.children or {}
-    local exists = {}
+    local exists = {} --- @type table<string,true>
     for name, ftype in vim.fs.dir(path) do
       exists[name] = true
       if not watches.children[name] then
@@ -143,14 +171,16 @@ local function poll_internal(path, opts, callback, watches)
       end
     end
 
-    local newchildren = {}
+    local newchildren = {} ---@type table<string,watch.Watches>
     for name, watch in pairs(watches.children) do
       if exists[name] then
         newchildren[name] = watch
       else
         watch.cancel()
         watches.children[name] = nil
-        callback(path .. '/' .. name, M.FileChangeType.Deleted)
+        if watch.handle then
+          callback(path .. '/' .. name, M.FileChangeType.Deleted)
+        end
       end
     end
     watches.children = newchildren
@@ -168,6 +198,15 @@ end
 ---@param opts (table|nil) Additional options
 ---     - interval (number|nil)
 ---                Polling interval in ms as passed to |uv.fs_poll_start()|. Defaults to 2000.
+---     - include_pattern (LPeg pattern|nil)
+---                An |lpeg| pattern. Only changes to files whose full paths match the pattern
+---                will be reported. Only matches against non-directoriess, all directories will
+---                be watched for new potentially-matching files. exclude_pattern can be used to
+---                filter out directories. When nil, matches any file name.
+---     - exclude_pattern (LPeg pattern|nil)
+---                An |lpeg| pattern. Only changes to files and directories whose full path does
+---                not match the pattern will be reported. Matches against both files and
+---                directories. When nil, matches nothing.
 ---@param callback (function) The function called when new events
 ---@returns (function) A function to stop the watch.
 function M.poll(path, opts, callback)
diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index 14e5dc6cf8..87938fe4d5 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -1,7 +1,7 @@
 local bit = require('bit')
-local lpeg = require('lpeg')
 local watch = require('vim._watch')
 local protocol = require('vim.lsp.protocol')
+local lpeg = vim.lpeg
 
 local M = {}
 
@@ -107,6 +107,13 @@ local to_lsp_change_type = {
   [watch.FileChangeType.Deleted] = protocol.FileChangeType.Deleted,
 }
 
+--- Default excludes the same as VSCode's `files.watcherExclude` setting.
+--- https://github.com/microsoft/vscode/blob/eef30e7165e19b33daa1e15e92fa34ff4a5df0d3/src/vs/workbench/contrib/files/browser/files.contribution.ts#L261
+---@type Lpeg pattern
+M._poll_exclude_pattern = parse('**/.git/{objects,subtree-cache}/**')
+  + parse('**/node_modules/*/**')
+  + parse('**/.hg/store/**')
+
 --- Registers the workspace/didChangeWatchedFiles capability dynamically.
 ---
 ---@param reg table LSP Registration object.
@@ -122,10 +129,10 @@ function M.register(reg, ctx)
   then
     return
   end
-  local watch_regs = {}
+  local watch_regs = {} --- @type table<string,{pattern:userdata,kind:integer}>
   for _, w in ipairs(reg.registerOptions.watchers) do
     local relative_pattern = false
-    local glob_patterns = {}
+    local glob_patterns = {} --- @type {baseUri:string, pattern: string}[]
     if type(w.globPattern) == 'string' then
       for _, folder in ipairs(client.workspace_folders) do
         table.insert(glob_patterns, { baseUri = folder.uri, pattern = w.globPattern })
@@ -135,7 +142,7 @@ function M.register(reg, ctx)
       table.insert(glob_patterns, w.globPattern)
     end
     for _, glob_pattern in ipairs(glob_patterns) do
-      local base_dir = nil
+      local base_dir = nil ---@type string?
       if type(glob_pattern.baseUri) == 'string' then
         base_dir = glob_pattern.baseUri
       elseif type(glob_pattern.baseUri) == 'table' then
@@ -144,6 +151,7 @@ function M.register(reg, ctx)
       assert(base_dir, "couldn't identify root of watch")
       base_dir = vim.uri_to_fname(base_dir)
 
+      ---@type integer
       local kind = w.kind
         or protocol.WatchKind.Create + protocol.WatchKind.Change + protocol.WatchKind.Delete
 
@@ -153,8 +161,8 @@ function M.register(reg, ctx)
         pattern = lpeg.P(base_dir .. '/') * pattern
       end
 
-      table.insert(watch_regs, {
-        base_dir = base_dir,
+      watch_regs[base_dir] = watch_regs[base_dir] or {}
+      table.insert(watch_regs[base_dir], {
         pattern = pattern,
         kind = kind,
       })
@@ -163,12 +171,12 @@ function M.register(reg, ctx)
 
   local callback = function(base_dir)
     return function(fullpath, change_type)
-      for _, w in ipairs(watch_regs) do
+      for _, w in ipairs(watch_regs[base_dir]) do
         change_type = to_lsp_change_type[change_type]
         -- e.g. match kind with Delete bit (0b0100) to Delete change_type (3)
         local kind_mask = bit.lshift(1, change_type - 1)
         local change_type_match = bit.band(w.kind, kind_mask) == kind_mask
-        if base_dir == w.base_dir and M._match(w.pattern, fullpath) and change_type_match then
+        if M._match(w.pattern, fullpath) and change_type_match then
           local change = {
             uri = vim.uri_from_fname(fullpath),
             type = change_type,
@@ -198,15 +206,25 @@ function M.register(reg, ctx)
     end
   end
 
-  local watching = {}
-  for _, w in ipairs(watch_regs) do
-    if not watching[w.base_dir] then
-      watching[w.base_dir] = true
-      table.insert(
-        cancels[client_id][reg.id],
-        M._watchfunc(w.base_dir, { uvflags = { recursive = true } }, callback(w.base_dir))
-      )
-    end
+  for base_dir, watches in pairs(watch_regs) do
+    local include_pattern = vim.iter(watches):fold(lpeg.P(false), function(acc, w)
+      return acc + w.pattern
+    end)
+
+    table.insert(
+      cancels[client_id][reg.id],
+      M._watchfunc(base_dir, {
+        uvflags = {
+          recursive = true,
+        },
+        -- include_pattern will ensure the pattern from *any* watcher definition for the
+        -- base_dir matches. This first pass prevents polling for changes to files that
+        -- will never be sent to the LSP server. A second pass in the callback is still necessary to
+        -- match a *particular* pattern+kind pair.
+        include_pattern = include_pattern,
+        exclude_pattern = M._poll_exclude_pattern,
+      }, callback(base_dir))
+    )
   end
 end
 
-- 
cgit 


From bbb934e7755a3b6f14c4d94334b8f54c63daebf1 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 14 Jun 2023 20:54:11 +0800
Subject: vim-patch:9.0.1629: having utf16idx() rounding up is inconvenient
 (#24019)

Problem:    Having utf16idx() rounding up is inconvenient.
Solution:   Make utf16idx() round down. (Yegappan Lakshmanan, closes vim/vim#12523)

https://github.com/vim/vim/commit/95707037afa1aeae4f3494dc623a721ceed7fc4e

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 1fea6ad715..938523b6ee 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -9146,8 +9146,8 @@ utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
 		When {charidx} is present and TRUE, {idx} is used as the
 		character index in the String {string} instead of as the byte
 		index.
-		An {idx} in the middle of a UTF-8 sequence is rounded upwards
-		to the end of that sequence.
+		An {idx} in the middle of a UTF-8 sequence is rounded
+		downwards to the beginning of that sequence.
 
 		Returns -1 if the arguments are invalid or if there are less
 		than {idx} bytes in {string}. If there are exactly {idx} bytes
-- 
cgit 


From cf6cffda89ad0b22de0ddd4ca7abcb714da812d0 Mon Sep 17 00:00:00 2001
From: Erich Gubler <erichdongubler@gmail.com>
Date: Wed, 14 Jun 2023 18:23:15 -0400
Subject: docs(ex_cmds): migration from "behave xterm" #24024

---
 runtime/doc/news.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ac9e60637a..f2a878078d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -23,7 +23,12 @@ The following changes may require adaptations in user config or plugins.
 • "#" followed by a digit no longer stands for a function key at the start of
   the lhs of a mapping.
 
-• `:behave` was removed. if you used `:behave mswin`, the following is equivalent: >vim
+• `:behave` was removed.
+  - If you used `:behave xterm`, the following is equivalent: >vim
+
+    set mousemodel=extend
+<
+  - If you used `:behave mswin`, the following is equivalent: >vim
 
     set selection=exclusive
     set selectmode=mouse,key
-- 
cgit 


From c07dceba335c56c9a356395ad0d1e5a14d416752 Mon Sep 17 00:00:00 2001
From: Jonas Strittmatter <40792180+smjonas@users.noreply.github.com>
Date: Sat, 17 Jun 2023 08:01:31 +0200
Subject: fix(lsp): allow Lua pattern chars in code action filter (#24041)

Previously, filtering code actions with the "only" option failed
if the code action kind contained special Lua pattern chars such as "-"
(e.g. the ocaml language server supports a "type-annotate" code action).

Solution: use string comparison instead of string.find
---
 runtime/lua/vim/lsp/buf.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index bb3ca0e6d6..e0034cf86e 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -608,9 +608,9 @@ local function on_code_action_results(results, ctx, options)
       end
       local found = false
       for _, o in ipairs(options.context.only) do
-        -- action kinds are hierarchical with . as a separator: when requesting only
-        -- 'quickfix' this filter allows both 'quickfix' and 'quickfix.foo', for example
-        if a.kind:find('^' .. o .. '$') or a.kind:find('^' .. o .. '%.') then
+        -- action kinds are hierarchical with . as a separator: when requesting only 'type-annotate'
+        -- this filter allows both 'type-annotate' and 'type-annotate.foo', for example
+        if a.kind == o or vim.startswith(a.kind, o .. '.') then
           found = true
           break
         end
-- 
cgit 


From 8a7e3353eb5bffb10015254917361266b4b20511 Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Sun, 18 Jun 2023 14:49:33 +0300
Subject: fix(fs): make `normalize()` work with '/' path (#24047)

Problem: Current implementation of "remove trailing /" doesn't
account for the case of literal '/' as path.
Solution: Remove trailing / only if it preceded by something else.

Co-authored by: notomo <notomo.motono@gmail.com>
---
 runtime/lua/vim/fs.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index c89147dbd2..cdb314fa3d 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -348,9 +348,7 @@ function M.normalize(path, opts)
     path = path:gsub('%$([%w_]+)', vim.uv.os_getenv)
   end
 
-  path = path:gsub('\\', '/'):gsub('/+', '/')
-
-  return path:sub(-1) == '/' and path:sub(1, -2) or path
+  return (path:gsub('\\', '/'):gsub('/+', '/'):gsub('(.)/$', '%1'))
 end
 
 return M
-- 
cgit 


From 8c9dab3e0d788d44c8a2fee83a6193f5955c814e Mon Sep 17 00:00:00 2001
From: Santos Gallegos <stsewd@proton.me>
Date: Sun, 18 Jun 2023 09:42:17 -0500
Subject: fix(treesitter): use vim.highlight.priorities instead of hardcoded
 100 (#24052)

Problem: Treesitter highlighting base priority cannot be customized.

Solution: Use `vim.highlight.priorities.treesitter` instead of hard-coded value.
---
 runtime/lua/vim/treesitter/highlighter.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index 4bb764c5c6..d4db6bc404 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -260,12 +260,14 @@ local function on_line_impl(self, buf, line, is_spell_nav)
       local spell_pri_offset = capture_name == 'nospell' and 1 or 0
 
       if hl and end_row >= line and (not is_spell_nav or spell ~= nil) then
+        local priority = (tonumber(metadata.priority) or vim.highlight.priorities.treesitter)
+          + spell_pri_offset
         api.nvim_buf_set_extmark(buf, ns, start_row, start_col, {
           end_line = end_row,
           end_col = end_col,
           hl_group = hl,
           ephemeral = true,
-          priority = (tonumber(metadata.priority) or 100) + spell_pri_offset, -- Low but leaves room below
+          priority = priority,
           conceal = metadata.conceal,
           spell = spell,
         })
-- 
cgit 


From cee981bf09c81ab4b2fe6facf45076ea4bac46a5 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 19 Jun 2023 02:24:44 -0700
Subject: docs #22363

Co-authored by: zeertzjq <zeertzjq@outlook.com>
Co-authored by: Steven Todd McIntyre II <114119064+stmii@users.noreply.github.com>
Co-authored by: nobe4 <nobe4@users.noreply.github.com>

- docs: mention --luadev-mod to run with lua runtime files
  When changing a lua file in the ./runtime folder, a new contributor
  might expect changes to be applied to the built Neovim binary.
---
 runtime/doc/api.txt        |  3 +++
 runtime/doc/builtin.txt    | 12 ++++++----
 runtime/doc/deprecated.txt | 34 +++++++++++---------------
 runtime/doc/develop.txt    | 17 ++++++++++---
 runtime/doc/editing.txt    |  6 ++---
 runtime/doc/insert.txt     | 20 ++++++++++++++++
 runtime/doc/lsp.txt        | 59 +++++++++++++++++++---------------------------
 runtime/doc/lua.txt        |  5 ++--
 runtime/doc/news.txt       |  8 +++++--
 runtime/doc/ui.txt         |  2 +-
 runtime/doc/vim_diff.txt   | 34 +++++++++++++++++---------
 runtime/lua/vim/iter.lua   |  5 ++--
 12 files changed, 121 insertions(+), 84 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 1732c24f2f..fe3f763648 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2819,6 +2819,9 @@ nvim_win_get_cursor({window})                          *nvim_win_get_cursor()*
     Return: ~
         (row, col) tuple
 
+    See also: ~
+      • |getcurpos()|
+
 nvim_win_get_height({window})                          *nvim_win_get_height()*
     Gets the window height
 
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 938523b6ee..d170240ef7 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4542,6 +4542,8 @@ jobresize({job}, {width}, {height})			*jobresize()*
 		Fails if the job was not started with `"pty":v:true`.
 
 jobstart({cmd} [, {opts}])				*jobstart()*
+		Note: Prefer |vim.system()| in Lua.
+
 		Spawns {cmd} as a job.
 		If {cmd} is a List it runs directly (no 'shell').
 		If {cmd} is a String it runs in the 'shell', like this: >
@@ -4597,11 +4599,9 @@ jobstart({cmd} [, {opts}])				*jobstart()*
 			      stdout data.
 		  |on_stderr|:  (function) Callback invoked when the job emits
 			      stderr data.
-		  overlapped: (boolean) Set FILE_FLAG_OVERLAPPED for the
-			      standard input/output passed to the child process.
-			      Normally you do not need to set this.
-			      (Only available on MS-Windows, On other
-			      platforms, this option is silently ignored.)
+		  overlapped: (boolean) Sets FILE_FLAG_OVERLAPPED for the
+			      stdio passed to the child process. Only on
+			      MS-Windows; ignored on other platforms.
 		  pty:	      (boolean) Connect the job to a new pseudo
 			      terminal, and its streams to the master file
 			      descriptor. `on_stdout` receives all output,
@@ -8665,6 +8665,8 @@ synstack({lnum}, {col})					*synstack()*
 		valid positions.
 
 system({cmd} [, {input}])				*system()* *E677*
+		Note: Prefer |vim.system()| in Lua.
+
 		Gets the output of {cmd} as a |string| (|systemlist()| returns
 		a |List|) and sets |v:shell_error| to the error code.
 		{cmd} is treated as in |jobstart()|:
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 73888a32cc..29a0470ded 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -163,27 +163,21 @@ OPTIONS
 - 'viewoptions'		Flags "unix", "slash" are ignored and always enabled.
 - *'viminfo'*		Deprecated alias to 'shada' option.
 - *'viminfofile'*	Deprecated alias to 'shadafile' option.
-- *'paste'* *'nopaste'*	This option is obsolete; |paste| is handled automatically.
+- *'paste'* *'nopaste'*	Just Paste It.™  The 'paste' option is obsolete:
+			|paste| is handled automatically when you paste text
+			using your terminal's or GUI's paste feature
+			(CTRL-SHIFT-v, CMD-v (macOS), middle-click, …).
 			Enables "paste mode":
-			  - mappings in Insert mode and Command-line mode are
-			    disabled
-			  - abbreviations are disabled
-			  - 'autoindent' is reset
-			  - 'expandtab' is reset
-			  - 'formatoptions' is used like it is empty
-			  - 'revins' is reset
-			  - 'ruler' is reset
-			  - 'showmatch' is reset
-			  - 'smartindent' is reset
-			  - 'smarttab' is reset
-			  - 'softtabstop' is set to 0
-			  - 'textwidth' is set to 0
-			  - 'wrapmargin' is set to 0
-			These options keep their value, but their effect is
-			disabled:
-			  - 'cindent'
-			  - 'indentexpr'
-			  - 'lisp'
+			  - Disables mappings in Insert, Cmdline mode.
+			  - Disables abbreviations.
+			  - Resets 'autoindent' 'expandtab' 'revins' 'ruler'
+			    'showmatch' 'smartindent' 'smarttab' 'softtabstop'
+			    'textwidth' 'wrapmargin'.
+			  - Treats 'formatoptions' as empty.
+			  - Disables the effect of these options:
+			    - 'cindent'
+			    - 'indentexpr'
+			    - 'lisp'
 
 UI EXTENSIONS
 - *ui-wildmenu*		Use |ui-cmdline| with |ui-popupmenu| instead. Enabled
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index b090fd4f09..891b068051 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -130,10 +130,14 @@ DOCUMENTATION						*dev-doc*
   (docstrings, user manual, website materials, newsletters, …). Don't mince
   words. Personality and flavor, used sparingly, are welcome--but in general,
   optimize for the reader's time and energy: be "precise yet concise".
-    - See https://developers.google.com/style/tone
     - Prefer the active voice: "Foo does X", not "X is done by Foo".
-- Start function docstrings with present tense ("Gets"), not imperative
-  ("Get"). This tends to reduce ambiguity and improve clarity. >
+    - "The words you choose are an essential part of the user experience."
+      https://developer.apple.com/design/human-interface-guidelines/foundations/writing/
+    - "...without being overly colloquial or frivolous."
+      https://developers.google.com/style/tone
+- Write docstrings (as opposed to inline comments) with present tense ("Gets"),
+  not imperative ("Get"). This tends to reduce ambiguity and improve clarity
+  by describing "What" instead of "How". >
     GOOD:
     /// Gets a highlight definition.
     BAD:
@@ -272,6 +276,12 @@ See also |dev-naming|.
   - mimic the pairs() or ipairs() interface if the function is intended to be
     used in a "for" loop.
 
+Interface conventions ~
+
+- When accepting a buffer id, etc., 0 means "current buffer", nil means "all
+  buffers".  Likewise for window id, tabpage id, etc.
+  - Examples: |vim.lsp.codelens.clear()| |vim.diagnostic.enable()|
+
 
 API DESIGN GUIDELINES					*dev-api*
 
@@ -346,6 +356,7 @@ Use consistent names for {noun} (nouns) in API functions: buffer is called
 
 Do NOT use these deprecated nouns:
     - buffer
+    - callback      Use on_foo instead
     - command
     - window
 
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index c774d1ad38..2e0f73a597 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1677,9 +1677,9 @@ mark a file as trusted or untrusted using the |:trust| command or the
 :trust [++deny] [++remove] [file]
 
 			Manage trusted files. Without ++ options, :trust marks
-			[file] (or current buffer if no [file]) as trusted,
-			keyed on a hash of its contents. The trust list is
-			stored on disk, Nvim will re-use it after restarting.
+			the current buffer as trusted, keyed on a hash of its
+			contents. The trust list is stored on disk, Nvim will
+			re-use it after restarting.
 
 			[++deny] marks [file] (or current buffer if no [file]) as
 			untrusted: it will never be executed, 'exrc' will
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index de1b850a3f..a1e0675b36 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1081,6 +1081,26 @@ Stop completion						*compl-stop*
 CTRL-X CTRL-Z		Stop completion without changing the text.
 
 
+AUTO-COMPLETION						*compl-autocomplete*
+
+To get basic "autocompletion" without installing a plugin, try this script: >lua
+
+  local triggers = {"."}
+  vim.api.nvim_create_autocmd("InsertCharPre", {
+    buffer = vim.api.nvim_get_current_buf(),
+    callback = function()
+      if vim.fn.pumvisible() == 1 then
+        return
+      end
+      local char = vim.v.char
+      if vim.tbl_contains(triggers, char) then
+        local key = vim.keycode("<C-x><C-n>")
+        vim.api.nvim_feedkeys(key, "m", false)
+      end
+    end
+  })
+<
+
 FUNCTIONS FOR FINDING COMPLETIONS			*complete-functions*
 
 This applies to 'completefunc', 'thesaurusfunc' and 'omnifunc'.
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index c4322e9c24..4f2c457107 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -46,38 +46,40 @@ Follow these steps to get LSP features:
      See |lsp-config|.
 
                                                         *lsp-config*
-
-Starting a LSP client will automatically report diagnostics via
-|vim.diagnostic|. Read |vim.diagnostic.config()| to learn how to customize the
-display.
-
-It also sets some buffer options if the language server supports the
-functionality and if the options are otherwise empty or have the default
-values set by Nvim runtime files (e.g. a ftplugin). In the latter case,
-the default values are not restored when the LSP client is detached from
-the buffer.
-
-- 'omnifunc' is set to |vim.lsp.omnifunc()|. This allows to trigger completion
-  using |i_CTRL-X_CTRL-O|
+                                                        *lsp-defaults*
+When the LSP client starts it enables diagnostics |vim.diagnostic| (see
+|vim.diagnostic.config()| to customize). It also sets various default options,
+listed below, if (1) the language server supports the functionality and (2)
+the options are empty or were set by the builtin runtime (ftplugin) files. The
+options are not restored when the LSP client is stopped or detached.
+
+- 'omnifunc' is set to |vim.lsp.omnifunc()|, use |i_CTRL-X_CTRL-O| to trigger
+  completion.
 - 'tagfunc' is set to |vim.lsp.tagfunc()|. This enables features like
   go-to-definition, |:tjump|, and keymaps like |CTRL-]|, |CTRL-W_]|,
   |CTRL-W_}| to utilize the language server.
-- 'formatexpr' is set to |vim.lsp.formatexpr()| if both 'formatprg' and
-  'formatexpr' are empty. This allows to format lines via |gq| if the language
-  server supports it.
+- 'formatexpr' is set to |vim.lsp.formatexpr()|, so you can format lines via
+  |gq| if the language server supports it.
+  - To opt out of this use |gw| instead of gq, or set 'formatexpr' on LspAttach.
 
-To use other LSP features like hover, rename, etc. you can setup some
-additional keymaps. It's recommended to setup them in a |LspAttach| autocmd to
-ensure they're only active if there is a LSP client running. An example:
->lua
+                                                        *lsp-defaults-disable*
+To override the above defaults, set or unset the options on |LspAttach|: >lua
+    vim.api.nvim_create_autocmd('LspAttach', {
+      callback = function(ev)
+        vim.bo[ev.buf].formatexpr = nil
+        vim.bo[ev.buf].omnifunc = nil
+      end,
+    })
+
+To use other LSP features like hover, rename, etc. you can set other keymaps
+on |LspAttach|. Example: >lua
     vim.api.nvim_create_autocmd('LspAttach', {
       callback = function(args)
         vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = args.buf })
       end,
     })
 
-<
-The most used functions are:
+The most common functions are:
 
 - |vim.lsp.buf.hover()|
 - |vim.lsp.buf.format()|
@@ -137,19 +139,6 @@ FAQ                                                     *lsp-faq*
      " Auto-format *.rs (rust) files prior to saving them
      " (async = false is the default for format)
      autocmd BufWritePre *.rs lua vim.lsp.buf.format({ async = false })
-<
-- Q: How can I disable LSP formatting when using the |gq| command?
-  A: To use the default internal formatting method and bypass the LSP client's
-  'formatexpr', use |gw| instead.
-  Alternatively you can completely disable LSP formatting with gq by
-  unsetting 'formatexpr':
-
->lua
-    vim.api.nvim_create_autocmd('LspAttach', {
-        callback = function(args)
-            vim.bo[args.buf].formatexpr = nil
-        end,
-    })
 <
                                                            *lsp-vs-treesitter*
 - Q: How do LSP and Treesitter compare?
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 737aa91e97..a4890898a3 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2970,8 +2970,9 @@ range({spec})                                            *vim.version.range()*
 Lua module: iter                                                    *lua-iter*
 
 
-The *vim.iter* module provides a generic "iterator" interface over tables
-and iterator functions.
+The *vim.iter* module provides a generic interface for working with
+iterables: tables, lists, iterator functions, pair()/ipair()-like
+iterators, and `vim.iter()` objects.
 
 *vim.iter()* wraps its table or function argument into an *Iter* object
 with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f2a878078d..cd3b1bd45e 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -44,9 +44,13 @@ The following changes may require adaptations in user config or plugins.
 • Renamed `vim.treesitter.playground` to `vim.treesitter.dev`.
 
 ==============================================================================
-ADDED FEATURES                                                     *news-added*
+NEW FEATURES                                                    *news-features*
 
-The following new APIs or features were added.
+The following new APIs and features were added.
+
+• Performance:
+  • 'diffopt' "linematch" scoring algorithm now favours larger and less groups
+    https://github.com/neovim/neovim/pull/23611
 
 • Added |vim.lsp.status()| to consume the last progress messages as a string.
 
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index c64c450aa1..1391ef2808 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -199,7 +199,7 @@ the editor.
 	The following keys are deprecated:
 
 	`hl_id`:	Use `attr_id` instead.
-	`hl_lm`:	Use `attr_id_lm` instead.
+	`id_lm`:	Use `attr_id_lm` instead.
 
 ["option_set", name, value] ~
 	UI-related option changed, where `name` is one of:
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index ab1b2056a2..ff3e19689b 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -15,6 +15,9 @@ centralized reference of the differences.
 ==============================================================================
 Configuration						    *nvim-config*
 
+User configuration and data files are found in standard |base-directories|
+(see also |$NVIM_APPNAME|).  Note in particular:
+
 - Use `$XDG_CONFIG_HOME/nvim/init.vim` instead of `.vimrc` for your |config|.
 - Use `$XDG_CONFIG_HOME/nvim` instead of `.vim` to store configuration files.
 - Use `$XDG_STATE_HOME/nvim/shada/main.shada` instead of `.viminfo` for persistent
@@ -29,7 +32,7 @@ Defaults					            *nvim-defaults*
   ":syntax off" to |init.vim|.
 
 - 'autoindent' is enabled
-- 'autoread' is enabled
+- 'autoread' is enabled (works in all UIs, including terminal)
 - 'background' defaults to "dark" (unless set automatically by the terminal/UI)
 - 'backspace' defaults to "indent,eol,start"
 - 'backupdir' defaults to .,~/.local/state/nvim/backup// (|xdg|), auto-created
@@ -195,7 +198,7 @@ server.
 External plugins run in separate processes. |remote-plugin| This improves
 stability and allows those plugins to work without blocking the editor. Even
 "legacy" Python and Ruby plugins which use the old Vim interfaces (|if_pyth|,
-|if_ruby|) run out-of-process.
+|if_ruby|) run out-of-process, so they cannot crash Nvim.
 
 Platform and I/O facilities are built upon libuv. Nvim benefits from libuv
 features and bug fixes, and other projects benefit from improvements to libuv
@@ -273,6 +276,7 @@ Normal commands:
   |Q| replays the last recorded macro instead of switching to Ex mode (|gQ|).
 
 Options:
+  'autoread'    works in the terminal (if it supports "focus" events)
   'cpoptions'   flags: |cpo-_|
   'diffopt'     "linematch" feature
   'exrc'        searches for ".nvim.lua", ".nvimrc", or ".exrc" files. The
@@ -293,7 +297,6 @@ Options:
   'shortmess'   "F" flag does not affect output from autocommands
   'signcolumn'  supports up to 9 dynamic/fixed columns
   'statuscolumn' full control of columns using 'statusline' format
-  'statusline'  supports unlimited alignment sections
   'tabline'     %@Func@foo%X can call any function on mouse-click
   'ttimeout', 'ttimeoutlen' behavior was simplified
   'winblend'    pseudo-transparency in floating windows |api-floatwin|
@@ -382,9 +385,9 @@ These Nvim features were later integrated into Vim.
 - 'statusline' supports unlimited alignment sections
 
 ==============================================================================
-Changed features					 *nvim-changed*
+Other changes						 *nvim-changed*
 
-This section lists various low-level details about other behavior changes.
+This section documents various low-level behavior changes.
 
 |mkdir()| behaviour changed:
 1. Assuming /tmp/foo does not exist and /tmp can be written to
@@ -399,21 +402,21 @@ This section lists various low-level details about other behavior changes.
    structures.
 2. |string()| fails immediately on nested containers, not when recursion limit
    was exceeded.
-2. When |:echo| encounters duplicate containers like >vim
+3. When |:echo| encounters duplicate containers like >vim
 
        let l = []
        echo [l, l]
 <
    it does not use "[...]" (was: "[[], [...]]", now: "[[], []]"). "..." is
    only used for recursive containers.
-3. |:echo| printing nested containers adds "@level" after "..." designating
+4. |:echo| printing nested containers adds "@level" after "..." designating
    the level at which recursive container was printed: |:echo-self-refer|.
    Same thing applies to |string()| (though it uses construct like
    "{E724@level}"), but this is not reliable because |string()| continues to
    error out.
-4. Stringifyed infinite and NaN values now use |str2float()| and can be evaled
+5. Stringifyed infinite and NaN values now use |str2float()| and can be evaled
    back.
-5. (internal) Trying to print or stringify VAR_UNKNOWN in Vim results in 
+6. (internal) Trying to print or stringify VAR_UNKNOWN in Vim results in 
    nothing, E908, in Nvim it is internal error.
 
 |json_decode()| behaviour changed:
@@ -634,7 +637,10 @@ Options:
   'highlight' (Names of builtin |highlight-groups| cannot be changed.)
   *'hkmap'* *'hk'* use `set keymap=hebrew` instead.
   *'hkmapp'* *'hkp'* use `set keymap=hebrewp` instead.
-  *'pastetoggle'* *'pt'*
+
+  *'pastetoggle'* *'pt'* Just Paste It.™ |paste| is handled automatically when
+  you paste text using your terminal's or GUI's paste feature (CTRL-SHIFT-v,
+  CMD-v (macOS), middle-click, …).
 
   *'imactivatefunc'* *'imaf'*
   *'imactivatekey'* *'imak'*
@@ -705,6 +711,11 @@ Options:
 Performance:
   Folds are not updated during insert-mode.
 
+Plugins:
+
+- logiPat
+- rrhelper
+
 Providers:
 
 - *if_lua* : Nvim |Lua| API is not compatible with Vim's "if_lua".
@@ -762,7 +773,8 @@ TUI:
 
 Cscope:
                                                                       *cscope*
-  Cscope support has been removed in favour of plugin-based solutions.
+  Cscope support was removed in favour of plugin-based solutions such as:
+  https://github.com/dhananjaylatkar/cscope_maps.nvim
 
 Hardcopy:
                                                                      *hardcopy*
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 204d22b9be..9c7bd13164 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -1,7 +1,8 @@
 ---@defgroup lua-iter
 ---
---- The \*vim.iter\* module provides a generic "iterator" interface over tables
---- and iterator functions.
+--- @brief The \*vim.iter\* module provides a generic interface for working with
+--- iterables: tables, lists, iterator functions, pair()/ipair()-like iterators,
+--- and \`vim.iter()\` objects.
 ---
 --- \*vim.iter()\* wraps its table or function argument into an \*Iter\* object
 --- with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
-- 
cgit 


From 0d149bb186390c3e40fb693050d0c30cddc8c7c5 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 19 Jun 2023 14:40:53 +0200
Subject: fix(docs): the runtimepath is not the runtime path

---
 runtime/doc/api.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index fe3f763648..1727b571ca 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1133,7 +1133,7 @@ nvim_list_chans()                                          *nvim_list_chans()*
         specified at |nvim_get_chan_info()|.
 
 nvim_list_runtime_paths()                          *nvim_list_runtime_paths()*
-    Gets the paths contained in 'runtimepath'.
+    Gets the paths contained in |runtime-search-path|.
 
     Return: ~
         List of paths
-- 
cgit 


From 72a6643b1380cdf6f1153d70eeaffb90bdca30d6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 19 Jun 2023 08:40:33 -0700
Subject: docs #24061

- nvim requires rpc responses in reverse order. https://github.com/neovim/neovim/issues/19932
- NVIM_APPNAME: UIs normally should NOT set this.

ref #23520
fix #24050
fix #23660
fix #23353
fix #23337
fix #22213
fix #19161
fix #18088
fix #20693
---
 runtime/doc/api.txt        | 11 ++++++--
 runtime/doc/builtin.txt    |  9 ++++---
 runtime/doc/channel.txt    |  2 +-
 runtime/doc/deprecated.txt |  7 ++++++
 runtime/doc/develop.txt    |  2 ++
 runtime/doc/lsp.txt        | 63 ++++++++++++++++++++--------------------------
 runtime/doc/lua.txt        | 14 ++++++++---
 runtime/doc/map.txt        |  1 +
 runtime/doc/options.txt    | 18 ++++++-------
 runtime/doc/pattern.txt    |  1 -
 runtime/doc/russian.txt    |  1 -
 runtime/doc/starting.txt   | 25 ++++++++++--------
 runtime/doc/usr_11.txt     |  5 ++--
 runtime/doc/usr_45.txt     |  3 +--
 runtime/doc/various.txt    | 11 +++-----
 runtime/lua/vim/lsp.lua    | 31 +++++++++++------------
 16 files changed, 106 insertions(+), 98 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 1727b571ca..9adca7620f 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -17,8 +17,15 @@ Applications can also embed libnvim to work with the C API directly.
 API Usage                                               *api-rpc* *RPC* *rpc*
 
                                                         *msgpack-rpc*
-RPC is the typical way to control Nvim programmatically.  Nvim implements the
-MessagePack-RPC protocol:
+RPC is the main way to control Nvim programmatically.  Nvim implements the
+MessagePack-RPC protocol with these extra (out-of-spec) constraints:
+
+1. Responses must be given in reverse order of requests (like "unwinding
+   a stack").
+2. Nvim processes all messages (requests and notifications) in the order they
+   are received.
+
+MessagePack-RPC specification:
   https://github.com/msgpack-rpc/msgpack-rpc/blob/master/spec.md
   https://github.com/msgpack/msgpack/blob/0b8f5ac/spec.md
 
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index d170240ef7..f1c4782d1b 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -8842,10 +8842,13 @@ termopen({cmd} [, {opts}])			*termopen()*
 		to the current (unmodified) buffer. Parameters and behavior
 		are the same as |jobstart()| except "pty", "width", "height",
 		and "TERM" are ignored: "height" and "width" are taken from
-		the current window.
-		Returns the same values as |jobstart()|.
+		the current window. Note that termopen() implies a "pty" arg
+		to jobstart(), and thus has the implications documented at
+		|jobstart()|.
 
-		Terminal environment is initialized as in ||jobstart-env|,
+		Returns the same values as jobstart().
+
+		Terminal environment is initialized as in |jobstart-env|,
 		except $TERM is set to "xterm-256color". Full behavior is
 		described in |terminal|.
 
diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt
index 1c52b2d692..afc4ef3787 100644
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -151,7 +151,7 @@ from the host TTY, or if Nvim is |--headless| it uses default values: >vim
 When channels are opened with the `rpc` option set to true, the channel can be
 used for remote method calls in both directions, see |msgpack-rpc|. Note that
 rpc channels are implicitly trusted and the process at the other end can
-invoke any |api| function!
+invoke any |API| function!
 
 ==============================================================================
 4. Standard IO channel					    *channel-stdio*
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 29a0470ded..6fb11f0987 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -117,6 +117,13 @@ internally and are no longer exposed as part of the API. Instead, use
 - *vim.lsp.diagnostic.set_virtual_text()*
 
 LSP FUNCTIONS
+- *vim.lsp.buf.server_ready()*
+  Use |LspAttach| instead, depending on your use-case. "Server ready" is not
+  part of the LSP spec, so the Nvim LSP client cannot meaningfully implement
+  it. "Ready" is ambiguous because:
+  - Language servers may finish analyzing the workspace, but edits can always
+    re-trigger analysis/builds.
+  - Language servers can serve some requests even while processing changes.
 - *vim.lsp.buf.range_code_action()*		Use |vim.lsp.buf.code_action()| with
 						the `range` parameter.
 - *vim.lsp.util.diagnostics_to_items()*		Use |vim.diagnostic.toqflist()| instead.
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 891b068051..be4068d8c8 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -478,6 +478,8 @@ External UIs are expected to implement these common features:
 - Consider the "option_set" |ui-global| event as a hint for other GUI
   behaviors. Various UI-related options ('guifont', 'ambiwidth', …) are
   published in this event. See also "mouse_on", "mouse_off".
+- UIs generally should NOT set |$NVIM_APPNAME| (unless explicitly requested by
+  the user).
 
 
  vim:tw=78:ts=8:sw=4:et:ft=help:norl:
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 4f2c457107..ca4570e392 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -207,10 +207,10 @@ specification. These LSP requests/notifications are defined by default:
 
                                                                  *lsp-handler*
 
-lsp-handlers are functions with special signatures that are designed to handle
-responses and notifications from LSP servers.
+LSP handlers are functions with signatures designed to handle LSP responses
+and notifications.
 
-For |lsp-request|, each |lsp-handler| has this signature: >
+For |lsp-response|, each |lsp-handler| has this signature: >
 
   function(err, result, ctx, config)
 <
@@ -363,42 +363,37 @@ To configure the behavior of a builtin |lsp-handler|, the convenient method
 Handlers can be set by:
 
 - Setting a field in vim.lsp.handlers.                      *vim.lsp.handlers*
-    vim.lsp.handlers is a global table that contains the default mapping of
-    |lsp-method| names to |lsp-handlers|.
-
-    To override the handler for the `"textDocument/definition"` method: >lua
+  vim.lsp.handlers is a global table that contains the default mapping of
+  |lsp-method| names to |lsp-handlers|. To override the handler for the
+  `"textDocument/definition"` method: >lua
 
     vim.lsp.handlers["textDocument/definition"] = my_custom_default_definition
 <
-- The {handlers} parameter for |vim.lsp.start_client()|.
-    This will set the |lsp-handler| as the default handler for this server.
-
-    For example: >lua
+- The {handlers} parameter of |vim.lsp.start()|. This sets the default
+  |lsp-handler| for the server being started. Example: >lua
 
-    vim.lsp.start_client {
+    vim.lsp.start {
       ..., -- Other configuration omitted.
       handlers = {
         ["textDocument/definition"] = my_custom_server_definition
       },
     }
 
-- The {handler} parameter for |vim.lsp.buf_request()|.
-    This will set the |lsp-handler| ONLY for the current request.
-
-    For example: >lua
+- The {handler} parameter of |vim.lsp.buf_request_all()|. This sets
+  the |lsp-handler| ONLY for the given request(s). Example: >lua
 
-    vim.lsp.buf_request(
+    vim.lsp.buf_request_all(
       0,
       "textDocument/definition",
-      definition_params,
-      my_request_custom_definition
+      my_request_params,
+      my_handler
     )
 <
 In summary, the |lsp-handler| will be chosen based on the current |lsp-method|
 in the following order:
 
-1. Handler passed to |vim.lsp.buf_request()|, if any.
-2. Handler defined in |vim.lsp.start_client()|, if any.
+1. Handler passed to |vim.lsp.buf_request_all()|, if any.
+2. Handler defined in |vim.lsp.start()|, if any.
 3. Handler defined in |vim.lsp.handlers|, if any.
 
                                                             *vim.lsp.log_levels*
@@ -709,31 +704,27 @@ buf_notify({bufnr}, {method}, {params})                 *vim.lsp.buf_notify()*
         (boolean) success true if any client returns true; false otherwise
 
                                                    *vim.lsp.buf_request_all()*
-buf_request_all({bufnr}, {method}, {params}, {callback})
-    Sends an async request for all active clients attached to the buffer.
-    Executes the callback on the combined result. Parameters are the same as
-    |vim.lsp.buf_request()| but the return result and callback are different.
+buf_request_all({bufnr}, {method}, {params}, {handler})
+    Sends an async request for all active clients attached to the buffer and
+    executes the `handler` callback with the combined result.
 
     Parameters: ~
-      • {bufnr}     (integer) Buffer handle, or 0 for current.
-      • {method}    (string) LSP method name
-      • {params}    (table|nil) Parameters to send to the server
-      • {callback}  (function) The callback to call when all requests are
-                    finished. Unlike `buf_request`, this will collect all the
-                    responses from each server instead of handling them. A map
-                    of client_id:request_result will be provided to the
-                    callback.
+      • {bufnr}    (integer) Buffer handle, or 0 for current.
+      • {method}   (string) LSP method name
+      • {params}   (table|nil) Parameters to send to the server
+      • {handler}  (function) Handler called after all requests are completed.
+                   Server results are passed as a `client_id:result` map.
 
     Return: ~
-        fun() cancel A function that will cancel all requests
+        fun() cancel Function that cancels all requests.
 
                                                   *vim.lsp.buf_request_sync()*
 buf_request_sync({bufnr}, {method}, {params}, {timeout_ms})
     Sends a request to all server and waits for the response of all of them.
 
     Calls |vim.lsp.buf_request_all()| but blocks Nvim while awaiting the
-    result. Parameters are the same as |vim.lsp.buf_request()| but the return
-    result is different. Wait maximum of {timeout_ms} (default 1000) ms.
+    result. Parameters are the same as |vim.lsp.buf_request_all()| but the
+    result is different. Waits a maximum of {timeout_ms} (default 1000) ms.
 
     Parameters: ~
       • {bufnr}       (integer) Buffer handle, or 0 for current.
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index a4890898a3..1110fb7fc3 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1002,10 +1002,18 @@ Log levels are one of the values defined in `vim.log.levels`:
 ------------------------------------------------------------------------------
 LUA-VIMSCRIPT BRIDGE                                           *lua-vimscript*
 
-Nvim Lua provides an interface to Vimscript variables and functions, and
-editor commands and options.
+Nvim Lua provides an interface or "bridge" to Vimscript variables and
+functions, and editor commands and options.
+
+Objects passed over this bridge are COPIED (marshalled): there are no
+"references". |lua-guide-variables| For example, using `vim.fn.remove()` on
+a Lua list copies the list object to Vimscript and does NOT modify the Lua
+list: >lua
+
+    local list = { 1, 2, 3 }
+    vim.fn.remove(list, 0)
+    vim.print(list)  --> "{ 1, 2, 3 }"
 
-See also https://github.com/nanotee/nvim-lua-guide.
 
 vim.call({func}, {...})                                           *vim.call()*
     Invokes |vim-function| or |user-function| {func} with arguments {...}.
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 25ab91b89e..ffd7b6bc1d 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1546,6 +1546,7 @@ supports incremental command preview:
 	-- If invoked as a preview callback, performs 'inccommand' preview by
 	-- highlighting trailing whitespace in the current buffer.
 	local function trim_space_preview(opts, preview_ns, preview_buf)
+	  vim.cmd('hi clear Whitespace')
 	  local line1 = opts.line1
 	  local line2 = opts.line2
 	  local buf = vim.api.nvim_get_current_buf()
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0f53288608..78d38095a8 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2088,17 +2088,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    :set dir=c:\\tmp,\ dir\\,with\\,commas,\\\ dir\ with\ spaces
 <	- For backwards compatibility with Vim version 3.0 a '>' at the start
 	  of the option is removed.
-	Using "." first in the list is recommended.  This means that editing
-	the same file twice will result in a warning.  Using "/tmp" on Unix is
-	discouraged: When the system crashes you lose the swap file.
-	"/var/tmp" is often not cleared when rebooting, thus is a better
-	choice than "/tmp".  But others on the computer may be able to see the
-	files, and it can contain a lot of files, your swap files get lost in
-	the crowd.  That is why a "tmp" directory in your home directory is
-	tried first.
-	The use of |:set+=| and |:set-=| is preferred when adding or removing
-	directories from the list.  This avoids problems when a future version
-	uses another default.
+
+	Editing the same file twice will result in a warning.  Using "/tmp" on
+	is discouraged: if the system crashes you lose the swap file. And
+	others on the computer may be able to see the files.
+	Use |:set+=| and |:set-=| when adding or removing directories from the
+	list, this avoids problems if the Nvim default is changed.
+
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 625e1f95e1..8437496011 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1298,7 +1298,6 @@ will probably never match.
 When "\Z" appears anywhere in the pattern, all composing characters are
 ignored.  Thus only the base characters need to match, the composing
 characters may be different and the number of composing characters may differ.
-Only relevant when 'encoding' is "utf-8".
 Exception: If the pattern starts with one or more composing characters, these
 must match.
 							*/\%C*
diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt
index 8d3ed360c8..89be1a3c5a 100644
--- a/runtime/doc/russian.txt
+++ b/runtime/doc/russian.txt
@@ -34,7 +34,6 @@ enter Normal mode command, you can also set 'langmap' option:
     :set langmap=ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNOPQRSTUVWXYZ,
     фисвуапршолдьтщзйкыегмцчня;abcdefghijklmnopqrstuvwxyz
 
-This is in utf-8, you cannot read this if your 'encoding' is not utf-8.
 You have to type this command in one line, it is wrapped for the sake of
 readability.
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 2c7b7ed61b..51cbf4c93d 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1384,20 +1384,23 @@ STATE DIRECTORY (DEFAULT) ~
     Unix:         ~/.local/state              ~/.local/state/nvim
     Windows:      ~/AppData/Local             ~/AppData/Local/nvim-data
 
-Note: Throughout the user manual these defaults are used as placeholders, e.g.
+Note: Throughout the help pages these defaults are used as placeholders, e.g.
 "~/.config" is understood to mean "$XDG_CONFIG_HOME or ~/.config".
 
 NVIM_APPNAME					*$NVIM_APPNAME*
-The XDG directories used by Nvim can be further configured by setting the
-`$NVIM_APPNAME` environment variable. This variable controls the directory
-Neovim will look for (and auto-create) in the various XDG parent directories.
-For example, setting `$NVIM_APPNAME` to "neovim" before running Neovim will
-result in Neovim looking for configuration files in `$XDG_CONFIG_HOME/neovim`
-instead of `$XDG_CONFIG_HOME/nvim`.
-
-Note: Similarly to the $XDG environment variables, when
-`$XDG_CONFIG_HOME/nvim` is mentioned, it should be understood as
-`$XDG_CONFIG_HOME/$NVIM_APPNAME`.
+The standard directories can be further configured by the `$NVIM_APPNAME`
+environment variable. This variable controls the sub-directory that Nvim will
+read from (and auto-create) in each of the base directories. For example,
+setting `$NVIM_APPNAME` to "foo" before starting will cause Nvim to look for
+configuration files in `$XDG_CONFIG_HOME/foo` instead of
+`$XDG_CONFIG_HOME/nvim`.
+
+One use-case for $NVIM_APPNAME is to "isolate" Nvim applications.
+Alternatively, for true isolation, on Linux you can use cgroups namespaces: >
+    systemd-run --user -qt -p PrivateUsers=yes -p BindPaths=/home/user/profile_xy:/home/user/.config/nvim nvim
+
+Note: Throughout the help pages, wherever `$XDG_CONFIG_…/nvim` is mentioned it
+is understood to mean `$XDG_CONFIG_…/$NVIM_APPNAME`.
 
 LOG FILE					*log* *$NVIM_LOG_FILE* *E5430*
 Besides 'debug' and 'verbose', Nvim keeps a general log file for internal
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
index 361fe51caa..1fa7fb6f77 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -82,9 +82,8 @@ You must be in the right directory, otherwise Vim can't find the swap file.
 ==============================================================================
 *11.2*	Where is the swap file?
 
-Vim can store the swap file in several places.  Normally it is in the same
-directory as the original file.  To find it, change to the directory of the
-file, and use: >
+Vim can store the swap file in several places.  To find it, change to the
+directory of the file, and use: >
 
 	vim -r
 
diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt
index 95a2bc8f79..85710b15d5 100644
--- a/runtime/doc/usr_45.txt
+++ b/runtime/doc/usr_45.txt
@@ -190,8 +190,7 @@ font.  Example: >
 
    xterm -u8 -fn -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
 
-Now you can run Vim inside this terminal.  Set 'encoding' to "utf-8" as
-before.  That's all.
+Now you can run Vim inside this terminal.
 
 
 USING UNICODE IN AN ORDINARY TERMINAL
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 7b0e724e31..4e2ee14537 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -88,13 +88,10 @@ g8			Print the hex values of the bytes used in the
 
 							*8g8*
 8g8			Find an illegal UTF-8 byte sequence at or after the
-			cursor.  This works in two situations:
-			1. when 'encoding' is any 8-bit encoding
-			2. when 'encoding' is "utf-8" and 'fileencoding' is
-			   any 8-bit encoding
-			Thus it can be used when editing a file that was
-			supposed to be UTF-8 but was read as if it is an 8-bit
-			encoding because it contains illegal bytes.
+			cursor.
+			Can be used when editing a file that was supposed to
+			be UTF-8 but was read as if it is an 8-bit encoding
+			because it contains illegal bytes.
 			Does not wrap around the end of the file.
 			Note that when the cursor is on an illegal byte or the
 			cursor is halfway through a multibyte character the
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 9118e7e2e1..761a8406f2 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1491,7 +1491,7 @@ function lsp.start_client(config)
   ---successful, then it will return {request_id} as the
   ---second result. You can use this with `client.cancel_request(request_id)`
   ---to cancel the-request.
-  ---@see |vim.lsp.buf_request()|
+  ---@see |vim.lsp.buf_request_all()|
   function client.request(method, params, handler, bufnr)
     if not handler then
       handler = assert(
@@ -2119,22 +2119,19 @@ function lsp.buf_request(bufnr, method, params, handler)
   return client_request_ids, _cancel_all_requests
 end
 
----Sends an async request for all active clients attached to the buffer.
----Executes the callback on the combined result.
----Parameters are the same as |vim.lsp.buf_request()| but the return result and callback are
----different.
+--- Sends an async request for all active clients attached to the buffer and executes the `handler`
+--- callback with the combined result.
 ---
 ---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
 ---@param params (table|nil) Parameters to send to the server
----@param callback fun(request_results: table<integer, {error: lsp.ResponseError, result: any}>) (function)
---- The callback to call when all requests are finished.
---- Unlike `buf_request`, this will collect all the responses from each server instead of handling them.
---- A map of client_id:request_result will be provided to the callback.
----
----@return fun() cancel A function that will cancel all requests
-function lsp.buf_request_all(bufnr, method, params, callback)
-  local request_results = {}
+---@param handler fun(results: table<integer, {error: lsp.ResponseError, result: any}>) (function)
+--- Handler called after all requests are completed. Server results are passed as
+--- a `client_id:result` map.
+---
+---@return fun() cancel Function that cancels all requests.
+function lsp.buf_request_all(bufnr, method, params, handler)
+  local results = {}
   local result_count = 0
   local expected_result_count = 0
 
@@ -2147,12 +2144,12 @@ function lsp.buf_request_all(bufnr, method, params, callback)
   end)
 
   local function _sync_handler(err, result, ctx)
-    request_results[ctx.client_id] = { error = err, result = result }
+    results[ctx.client_id] = { error = err, result = result }
     result_count = result_count + 1
     set_expected_result_count()
 
     if result_count >= expected_result_count then
-      callback(request_results)
+      handler(results)
     end
   end
 
@@ -2164,8 +2161,8 @@ end
 --- Sends a request to all server and waits for the response of all of them.
 ---
 --- Calls |vim.lsp.buf_request_all()| but blocks Nvim while awaiting the result.
---- Parameters are the same as |vim.lsp.buf_request()| but the return result is
---- different. Wait maximum of {timeout_ms} (default 1000) ms.
+--- Parameters are the same as |vim.lsp.buf_request_all()| but the result is
+--- different. Waits a maximum of {timeout_ms} (default 1000) ms.
 ---
 ---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
-- 
cgit 


From ca5de9306c00d07cce1daef1f0038c937098bc66 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Tue, 20 Jun 2023 11:36:54 +0530
Subject: feat(lsp): inlay hints #23984

Add automatic refresh and a public interface on top of #23736

 * add on_reload, on_detach handlers in `enable()` buf_attach, and
  LspDetach autocommand in case of manual detach
* unify `__buffers` and `hint_cache_by_buf`
* use callback bufnr in `on_lines` callback, bufstate: remove __index override
* move user-facing functions into vim.lsp.buf, unify enable/disable/toggle

Closes #18086
---
 runtime/doc/lsp.txt                 |   7 ++
 runtime/doc/news.txt                |   5 +-
 runtime/lua/vim/lsp.lua             |   1 -
 runtime/lua/vim/lsp/_inlay_hint.lua | 164 +++++++++++++++++++++++++-----------
 runtime/lua/vim/lsp/buf.lua         |  15 ++++
 runtime/lua/vim/lsp/handlers.lua    |   3 -
 6 files changed, 141 insertions(+), 54 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index ca4570e392..73691c0656 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1296,6 +1296,13 @@ incoming_calls()                                *vim.lsp.buf.incoming_calls()*
     window. If the symbol can resolve to multiple items, the user can pick one
     in the |inputlist()|.
 
+inlay_hint({bufnr}, {enable})                       *vim.lsp.buf.inlay_hint()*
+    Enable/disable/toggle inlay hints for a buffer
+
+    Parameters: ~
+      • {bufnr}   (integer) Buffer handle, or 0 for current
+      • {enable}  (boolean|nil) true/false to enable/disable, nil to toggle
+
 list_workspace_folders()                *vim.lsp.buf.list_workspace_folders()*
     List workspace folders.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index cd3b1bd45e..2a25edc4eb 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -93,8 +93,9 @@ The following new APIs and features were added.
 
 • |nvim_set_keymap()| and |nvim_del_keymap()| now support abbreviations.
 
-• Added |lsp-handler| for inlay hints: `textDocument/inlayHint` and
-  `workspace/inlayHint/refresh`
+• Implemented LSP inlay hints: |vim.lsp.buf.inlay_hint()|
+  https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 761a8406f2..917aeb6604 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -17,7 +17,6 @@ local if_nil = vim.F.if_nil
 
 local lsp = {
   protocol = protocol,
-  _inlay_hint = require('vim.lsp._inlay_hint'),
 
   handlers = default_handlers,
 
diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
index aa6ec9aca8..70d332a1ac 100644
--- a/runtime/lua/vim/lsp/_inlay_hint.lua
+++ b/runtime/lua/vim/lsp/_inlay_hint.lua
@@ -6,22 +6,30 @@ local M = {}
 ---@class lsp._inlay_hint.bufstate
 ---@field version integer
 ---@field client_hint table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
+---@field enabled boolean Whether inlay hints are enabled for the buffer
+---@field timer uv.uv_timer_t? Debounce timer associated with the buffer
 
 ---@type table<integer, lsp._inlay_hint.bufstate>
-local hint_cache_by_buf = setmetatable({}, {
-  __index = function(t, b)
-    local key = b > 0 and b or api.nvim_get_current_buf()
-    return rawget(t, key)
-  end,
-})
+local bufstates = {}
 
 local namespace = api.nvim_create_namespace('vim_lsp_inlayhint')
+local augroup = api.nvim_create_augroup('vim_lsp_inlayhint', {})
 
-M.__explicit_buffers = {}
+--- Reset the request debounce timer of a buffer
+---@private
+local function reset_timer(reset_bufnr)
+  local timer = bufstates[reset_bufnr].timer
+  if timer then
+    bufstates[reset_bufnr].timer = nil
+    if not timer:is_closing() then
+      timer:stop()
+      timer:close()
+    end
+  end
+end
 
 --- |lsp-handler| for the method `textDocument/inlayHint`
 --- Store hints for a specific buffer and client
---- Resolves unresolved hints
 ---@private
 function M.on_inlayhint(err, result, ctx, _)
   if err then
@@ -36,21 +44,20 @@ function M.on_inlayhint(err, result, ctx, _)
   if not result then
     return
   end
-  local bufstate = hint_cache_by_buf[bufnr]
-  if not bufstate then
-    bufstate = {
-      client_hint = vim.defaulttable(),
-      version = ctx.version,
-    }
-    hint_cache_by_buf[bufnr] = bufstate
+  local bufstate = bufstates[bufnr]
+  if not (bufstate.client_hint and bufstate.version) then
+    bufstate.client_hint = vim.defaulttable()
+    bufstate.version = ctx.version
     api.nvim_buf_attach(bufnr, false, {
-      on_detach = function(_, b)
-        api.nvim_buf_clear_namespace(b, namespace, 0, -1)
-        hint_cache_by_buf[b] = nil
+      on_detach = function(_, cb_bufnr)
+        api.nvim_buf_clear_namespace(cb_bufnr, namespace, 0, -1)
+        bufstates[cb_bufnr].version = nil
+        bufstates[cb_bufnr].client_hint = nil
       end,
-      on_reload = function(_, b)
-        api.nvim_buf_clear_namespace(b, namespace, 0, -1)
-        hint_cache_by_buf[b] = nil
+      on_reload = function(_, cb_bufnr)
+        api.nvim_buf_clear_namespace(cb_bufnr, namespace, 0, -1)
+        bufstates[cb_bufnr].version = nil
+        bufstates[cb_bufnr].client_hint = nil
       end,
     })
   end
@@ -95,28 +102,24 @@ end
 
 ---@private
 local function resolve_bufnr(bufnr)
-  return bufnr == 0 and api.nvim_get_current_buf() or bufnr
+  return bufnr > 0 and bufnr or api.nvim_get_current_buf()
 end
 
 --- Refresh inlay hints for a buffer
 ---
---- It is recommended to trigger this using an autocmd or via keymap.
 ---@param opts (nil|table) Optional arguments
 ---  - bufnr (integer, default: 0): Buffer whose hints to refresh
 ---  - only_visible (boolean, default: false): Whether to only refresh hints for the visible regions of the buffer
 ---
---- Example:
---- <pre>vim
----   autocmd BufEnter,InsertLeave,BufWritePost <buffer> lua vim.lsp._inlay_hint.refresh()
---- </pre>
----
 ---@private
 function M.refresh(opts)
   opts = opts or {}
-  local bufnr = opts.bufnr or 0
+  local bufnr = resolve_bufnr(opts.bufnr or 0)
+  local bufstate = bufstates[bufnr]
+  if not (bufstate and bufstate.enabled) then
+    return
+  end
   local only_visible = opts.only_visible or false
-  bufnr = resolve_bufnr(bufnr)
-  M.__explicit_buffers[bufnr] = true
   local buffer_windows = {}
   for _, winid in ipairs(api.nvim_list_wins()) do
     if api.nvim_win_get_buf(winid) == bufnr then
@@ -148,30 +151,95 @@ function M.refresh(opts)
 end
 
 --- Clear inlay hints
----
----@param client_id integer|nil filter by client_id. All clients if nil
----@param bufnr integer|nil filter by buffer. All buffers if nil
+---@param bufnr (integer) Buffer handle, or 0 for current
 ---@private
-function M.clear(client_id, bufnr)
-  local buffers = bufnr and { resolve_bufnr(bufnr) } or vim.tbl_keys(hint_cache_by_buf)
-  for _, iter_bufnr in ipairs(buffers) do
-    M.__explicit_buffers[iter_bufnr] = false
-    local bufstate = hint_cache_by_buf[iter_bufnr]
-    local client_lens = (bufstate or {}).client_hint or {}
-    local client_ids = client_id and { client_id } or vim.tbl_keys(client_lens)
-    for _, iter_client_id in ipairs(client_ids) do
-      if bufstate then
-        bufstate.client_hint[iter_client_id] = {}
-      end
+local function clear(bufnr)
+  bufnr = resolve_bufnr(bufnr)
+  reset_timer(bufnr)
+  local bufstate = bufstates[bufnr]
+  local client_lens = (bufstate or {}).client_hint or {}
+  local client_ids = vim.tbl_keys(client_lens)
+  for _, iter_client_id in ipairs(client_ids) do
+    if bufstate then
+      bufstate.client_hint[iter_client_id] = {}
     end
-    api.nvim_buf_clear_namespace(iter_bufnr, namespace, 0, -1)
   end
-  vim.cmd('redraw!')
+  api.nvim_buf_clear_namespace(bufnr, namespace, 0, -1)
+  api.nvim__buf_redraw_range(bufnr, 0, -1)
+end
+
+---@private
+local function make_request(request_bufnr)
+  reset_timer(request_bufnr)
+  M.refresh({ bufnr = request_bufnr })
+end
+
+--- Enable inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@private
+function M.enable(bufnr)
+  bufnr = resolve_bufnr(bufnr)
+  local bufstate = bufstates[bufnr]
+  if not (bufstate and bufstate.enabled) then
+    bufstates[bufnr] = { enabled = true, timer = nil }
+    M.refresh({ bufnr = bufnr })
+    api.nvim_buf_attach(bufnr, true, {
+      on_lines = function(_, cb_bufnr)
+        if not bufstates[cb_bufnr].enabled then
+          return true
+        end
+        reset_timer(cb_bufnr)
+        bufstates[cb_bufnr].timer = vim.defer_fn(function()
+          make_request(cb_bufnr)
+        end, 200)
+      end,
+      on_reload = function(_, cb_bufnr)
+        clear(cb_bufnr)
+        bufstates[cb_bufnr] = nil
+        M.refresh({ bufnr = cb_bufnr })
+      end,
+      on_detach = function(_, cb_bufnr)
+        clear(cb_bufnr)
+        bufstates[cb_bufnr] = nil
+      end,
+    })
+    api.nvim_create_autocmd('LspDetach', {
+      buffer = bufnr,
+      callback = function(opts)
+        clear(opts.buf)
+      end,
+      once = true,
+      group = augroup,
+    })
+  end
+end
+
+--- Disable inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@private
+function M.disable(bufnr)
+  bufnr = resolve_bufnr(bufnr)
+  clear(bufnr)
+  bufstates[bufnr].enabled = nil
+  bufstates[bufnr].timer = nil
+end
+
+--- Toggle inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@private
+function M.toggle(bufnr)
+  bufnr = resolve_bufnr(bufnr)
+  local bufstate = bufstates[bufnr]
+  if bufstate and bufstate.enabled then
+    M.disable(bufnr)
+  else
+    M.enable(bufnr)
+  end
 end
 
 api.nvim_set_decoration_provider(namespace, {
   on_win = function(_, _, bufnr, topline, botline)
-    local bufstate = hint_cache_by_buf[bufnr]
+    local bufstate = bufstates[bufnr]
     if not bufstate then
       return
     end
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index e0034cf86e..c3deffc1f9 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -810,4 +810,19 @@ function M.execute_command(command_params)
   request('workspace/executeCommand', command_params)
 end
 
+--- Enable/disable/toggle inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@param enable (boolean|nil) true/false to enable/disable, nil to toggle
+function M.inlay_hint(bufnr, enable)
+  vim.validate({ enable = { enable, { 'boolean', 'nil' } }, bufnr = { bufnr, 'number' } })
+  local inlay_hint = require('vim.lsp._inlay_hint')
+  if enable then
+    inlay_hint.enable(bufnr)
+  elseif enable == false then
+    inlay_hint.disable(bufnr)
+  else
+    inlay_hint.toggle(bufnr)
+  end
+end
+
 return M
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 44a9a58aca..284e3ef2d0 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -619,9 +619,6 @@ end
 ---@see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_inlayHint_refresh
 M['workspace/inlayHint/refresh'] = function(err, _, ctx)
   local inlay_hint = require('vim.lsp._inlay_hint')
-  if not inlay_hint.__explicit_buffers[ctx.bufnr] then
-    return vim.NIL
-  end
   if err then
     return vim.NIL
   end
-- 
cgit 


From 96b94f8d77774e3dabdec48bba2b56246a3ccba8 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Tue, 20 Jun 2023 15:06:06 +0530
Subject: fix(lsp): duplicate on_detach, on_reload callbacks #24067

M.enable already clears bufstate[bufnr] and the namespace,
the duplicate callbacks cause an error (indexing bufstate[bufnr] fails)
---
 runtime/lua/vim/lsp/_inlay_hint.lua | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
index 70d332a1ac..bdce464480 100644
--- a/runtime/lua/vim/lsp/_inlay_hint.lua
+++ b/runtime/lua/vim/lsp/_inlay_hint.lua
@@ -48,18 +48,6 @@ function M.on_inlayhint(err, result, ctx, _)
   if not (bufstate.client_hint and bufstate.version) then
     bufstate.client_hint = vim.defaulttable()
     bufstate.version = ctx.version
-    api.nvim_buf_attach(bufnr, false, {
-      on_detach = function(_, cb_bufnr)
-        api.nvim_buf_clear_namespace(cb_bufnr, namespace, 0, -1)
-        bufstates[cb_bufnr].version = nil
-        bufstates[cb_bufnr].client_hint = nil
-      end,
-      on_reload = function(_, cb_bufnr)
-        api.nvim_buf_clear_namespace(cb_bufnr, namespace, 0, -1)
-        bufstates[cb_bufnr].version = nil
-        bufstates[cb_bufnr].client_hint = nil
-      end,
-    })
   end
   local hints_by_client = bufstate.client_hint
   local client = vim.lsp.get_client_by_id(client_id)
-- 
cgit 


From 19eef8156bdd3539f10c9a39494cb64b88d777f5 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Tue, 20 Jun 2023 15:50:17 +0530
Subject: docs(lsp): LspInlayHint highlight group #24071

---
 runtime/doc/lsp.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 73691c0656..bc924df39b 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -462,6 +462,8 @@ LspReferenceText          used for highlighting "text" references
 LspReferenceRead          used for highlighting "read" references
                                                           *hl-LspReferenceWrite*
 LspReferenceWrite         used for highlighting "write" references
+                                                          *hl-LspInlayHint*
+LspInlayHint              used for highlighting inlay hints
 
 
                                                       *lsp-highlight-codelens*
-- 
cgit 


From 64f2691a984a5b1e2958d5656a910054982a6f0e Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Tue, 20 Jun 2023 18:36:18 +0200
Subject: refactor(lsp): extract common execute command functionality (#24065)

---
 runtime/lua/vim/lsp.lua          | 40 ++++++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/buf.lua      | 18 ++----------------
 runtime/lua/vim/lsp/codelens.lua | 24 +++---------------------
 runtime/lua/vim/lsp/types.lua    |  2 +-
 4 files changed, 46 insertions(+), 38 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 917aeb6604..25e69a8006 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1653,6 +1653,46 @@ function lsp.start_client(config)
     return rpc.is_closing()
   end
 
+  ---@private
+  --- Execute a lsp command, either via client command function (if available)
+  --- or via workspace/executeCommand (if supported by the server)
+  ---
+  ---@param command lsp.Command
+  ---@param context? {bufnr: integer}
+  ---@param handler? lsp-handler only called if a server command
+  function client._exec_cmd(command, context, handler)
+    context = vim.deepcopy(context or {})
+    context.bufnr = context.bufnr or api.nvim_get_current_buf()
+    context.client_id = client.id
+    local cmdname = command.command
+    local fn = client.commands[cmdname] or lsp.commands[cmdname]
+    if fn then
+      fn(command, context)
+      return
+    end
+
+    local command_provider = client.server_capabilities.executeCommandProvider
+    local commands = type(command_provider) == 'table' and command_provider.commands or {}
+    if not vim.list_contains(commands, cmdname) then
+      vim.notify_once(
+        string.format(
+          'Language server `%s` does not support command `%s`. This command may require a client extension.',
+          client.name,
+          cmdname
+        ),
+        vim.log.levels.WARN
+      )
+      return
+    end
+    -- Not using command directly to exclude extra properties,
+    -- see https://github.com/python-lsp/python-lsp-server/issues/146
+    local params = {
+      command = command.command,
+      arguments = command.arguments,
+    }
+    client.request('workspace/executeCommand', params, handler, context.bufnr)
+  end
+
   ---@private
   --- Runs the on_attach function from the client's config if it was defined.
   ---@param bufnr integer Buffer number
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index c3deffc1f9..45056cf272 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -646,21 +646,7 @@ local function on_code_action_results(results, ctx, options)
     end
     if action.command then
       local command = type(action.command) == 'table' and action.command or action
-      local fn = client.commands[command.command] or vim.lsp.commands[command.command]
-      if fn then
-        local enriched_ctx = vim.deepcopy(ctx)
-        enriched_ctx.client_id = client.id
-        fn(command, enriched_ctx)
-      else
-        -- Not using command directly to exclude extra properties,
-        -- see https://github.com/python-lsp/python-lsp-server/issues/146
-        local params = {
-          command = command.command,
-          arguments = command.arguments,
-          workDoneToken = command.workDoneToken,
-        }
-        client.request('workspace/executeCommand', params, nil, ctx.bufnr)
-      end
+      client._exec_cmd(command, ctx)
     end
   end
 
@@ -697,7 +683,7 @@ local function on_code_action_results(results, ctx, options)
           return
         end
         apply_action(resolved_action, client)
-      end)
+      end, ctx.bufnr)
     else
       apply_action(action, client)
     end
diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index e26bdcc6d4..5acfe90d5e 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -33,30 +33,12 @@ local function execute_lens(lens, bufnr, client_id)
 
   local client = vim.lsp.get_client_by_id(client_id)
   assert(client, 'Client is required to execute lens, client_id=' .. client_id)
-  local command = lens.command
-  local fn = client.commands[command.command] or vim.lsp.commands[command.command]
-  if fn then
-    fn(command, { bufnr = bufnr, client_id = client_id })
-    return
-  end
-  -- Need to use the client that returned the lens → must not use buf_request
-  local command_provider = client.server_capabilities.executeCommandProvider
-  local commands = type(command_provider) == 'table' and command_provider.commands or {}
-  if not vim.list_contains(commands, command.command) then
-    vim.notify(
-      string.format(
-        'Language server does not support command `%s`. This command may require a client extension.',
-        command.command
-      ),
-      vim.log.levels.WARN
-    )
-    return
-  end
-  client.request('workspace/executeCommand', command, function(...)
+
+  client._exec_cmd(lens.command, { bufnr = bufnr }, function(...)
     local result = vim.lsp.handlers['workspace/executeCommand'](...)
     M.refresh()
     return result
-  end, bufnr)
+  end)
 end
 
 --- Return all lenses for the given buffer
diff --git a/runtime/lua/vim/lsp/types.lua b/runtime/lua/vim/lsp/types.lua
index 108aeeb922..cdfbcfb11b 100644
--- a/runtime/lua/vim/lsp/types.lua
+++ b/runtime/lua/vim/lsp/types.lua
@@ -1,6 +1,6 @@
 ---@meta
 
----@alias lsp-handler fun(err: lsp.ResponseError|nil, result: any, context: lsp.HandlerContext, config: table|nil)
+---@alias lsp-handler fun(err: lsp.ResponseError|nil, result: any, context: lsp.HandlerContext, config: table|nil): any?
 
 ---@class lsp.HandlerContext
 ---@field method string
-- 
cgit 


From d3e0352574731ae47b2ad2e4683c326ae5b2a549 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Tue, 20 Jun 2023 22:06:31 +0530
Subject: fix(lsp): check if inlay hints are enabled for a buffer before
 disabling (#24074)

disabling before enabling throws an error otherwise, because bufstate[bufnr]
doesn't exist
---
 runtime/lua/vim/lsp/_inlay_hint.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
index bdce464480..e7cc8ba7ae 100644
--- a/runtime/lua/vim/lsp/_inlay_hint.lua
+++ b/runtime/lua/vim/lsp/_inlay_hint.lua
@@ -207,9 +207,11 @@ end
 ---@private
 function M.disable(bufnr)
   bufnr = resolve_bufnr(bufnr)
-  clear(bufnr)
-  bufstates[bufnr].enabled = nil
-  bufstates[bufnr].timer = nil
+  if bufstates[bufnr] and bufstates[bufnr].enabled then
+    clear(bufnr)
+    bufstates[bufnr].enabled = nil
+    bufstates[bufnr].timer = nil
+  end
 end
 
 --- Toggle inlay hints for a buffer
-- 
cgit 


From 3bf887f6e08fa272679187340ca483809275b20a Mon Sep 17 00:00:00 2001
From: Sooryakiran Ponnath <skp.frl@gmail.com>
Date: Tue, 20 Jun 2023 15:17:13 -0400
Subject: fix(lsp): always return boolean in lsp.buf_client_attach (#24077)

Co-authored-by: Mathias Fussenegger <f.mathias@zignar.net>
---
 runtime/doc/lsp.txt     | 4 ++++
 runtime/lua/vim/lsp.lua | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index bc924df39b..3732ddf2bd 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -678,6 +678,10 @@ buf_attach_client({bufnr}, {client_id})          *vim.lsp.buf_attach_client()*
       • {bufnr}      (integer) Buffer handle, or 0 for current
       • {client_id}  (integer) Client id
 
+    Return: ~
+        (boolean) success `true` if client was attached successfully; `false`
+        otherwise
+
 buf_detach_client({bufnr}, {client_id})          *vim.lsp.buf_detach_client()*
     Detaches client from the specified buffer. Note: While the server is
     notified that the text document (buffer) was closed, it is still able to
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 25e69a8006..cb1c101c58 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1799,6 +1799,7 @@ end
 ---
 ---@param bufnr (integer) Buffer handle, or 0 for current
 ---@param client_id (integer) Client id
+---@return boolean success `true` if client was attached successfully; `false` otherwise
 function lsp.buf_attach_client(bufnr, client_id)
   validate({
     bufnr = { bufnr, 'n', true },
@@ -1887,7 +1888,7 @@ function lsp.buf_attach_client(bufnr, client_id)
   end
 
   if buffer_client_ids[client_id] then
-    return
+    return true
   end
   -- This is our first time attaching this client to this buffer.
   buffer_client_ids[client_id] = true
-- 
cgit 


From e42fdaad21a87d0aaf882f1ad836b00d2eccd21a Mon Sep 17 00:00:00 2001
From: Akin <22454918+akinsho@users.noreply.github.com>
Date: Wed, 21 Jun 2023 09:55:19 +0200
Subject: fix(lsp): add spacing for inlay hints separately #24079

Problem:
Spacing around inlay hints has the same highlight as the hint itself.
The LSP spec for inlay hints specifically mentions the padding should not be
coloured:

    /**
    Render padding before the hint.
    Note: Padding should use the editor's background color, not the
    background color of the hint itself. That means padding can be used
    to visually align/separate an inlay hint.
    */
    paddingLeft?: boolean;
    /**
    Render padding after the hint.
    Note: Padding should use the editor's background color, not the
    background color of the hint itself. That means padding can be used
    to visually align/separate an inlay hint.
    */
    paddingRight?: boolean;

Solution:
Add the space as separate parts of the virtual text, don't add the space to the
text itself.
---
 runtime/lua/vim/lsp/_inlay_hint.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
index e7cc8ba7ae..8edf14e707 100644
--- a/runtime/lua/vim/lsp/_inlay_hint.lua
+++ b/runtime/lua/vim/lsp/_inlay_hint.lua
@@ -252,18 +252,18 @@ api.nvim_set_decoration_provider(namespace, {
               text = text .. part.value
             end
           end
+          local vt = {}
           if hint.paddingLeft then
-            text = ' ' .. text
+            vt[#vt + 1] = { ' ' }
           end
+          vt[#vt + 1] = { text, 'LspInlayHint' }
           if hint.paddingRight then
-            text = text .. ' '
+            vt[#vt + 1] = { ' ' }
           end
           api.nvim_buf_set_extmark(bufnr, namespace, lnum, hint.position.character, {
             virt_text_pos = 'inline',
             ephemeral = false,
-            virt_text = {
-              { text, 'LspInlayHint' },
-            },
+            virt_text = vt,
             hl_mode = 'combine',
           })
         end
-- 
cgit 


From 8d4a53fe6e20652946948170f2436ec520f9bdfe Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 21 Jun 2023 01:10:32 -0700
Subject: fix(vim.json)!: remove global options, "null", "array_mt" #24070

Problem:
- `vim.json` exposes various global options which:
  - affect all Nvim Lua plugins (especially the LSP client)
  - are undocumented and untested
  - can cause confusing problems such as: https://github.com/codota/tabnine-nvim/commit/cc76ae3abe2f129d44b5a8edee2529e0ee0dcf69
- `vim.json` exposes redundant mechanisms:
  - `vim.json.null` is redundant with `vim.NIL`.
  - `array_mt` is redundant because Nvim uses a metatable
    (`vim.empty_dict()`) for empty dict instead, which `vim.json` is
    configured to use by default (see `as_empty_dict`).
    Example:
    ```
    :lua vim.print(vim.json.decode('{"bar":[],"foo":{}}'))
    --> { bar = {},  foo = vim.empty_dict() }
    ```
    Thus we don't need to also decorate empty arrays with `array_mt`.

Solution:
Remove the functions from the public vim.json interface.
Comment-out the implementation code to minimize drift from upstream.

TODO:
- Expose the options as arguments to `vim.json.new()`
---
 runtime/doc/lua.txt  | 19 ++++++++++++++++---
 runtime/doc/news.txt |  5 +++++
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 1110fb7fc3..80ef2e358c 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -747,9 +747,22 @@ vim.json.encode({obj})                                       *vim.json.encode*
 vim.json.decode({str}[, {opts}])                             *vim.json.decode*
     Decodes (or "unpacks") the JSON-encoded {str} to a Lua object.
 
-    {opts} is a table with the key `luanil = { object: bool, array: bool }`
-    that controls whether `null` in JSON objects or arrays should be converted
-    to Lua `nil` instead of `vim.NIL`.
+    - Decodes JSON "null" as |vim.NIL| (controllable by {opts}, see below).
+    - Decodes empty object as |vim.empty_dict()|.
+    - Decodes empty array as `{}` (empty Lua table).
+
+    Example: >lua
+    :lua vim.print(vim.json.decode('{"bar":[],"foo":{},"zub":null}'))
+    --> { bar = {}, foo = vim.empty_dict(), zub = vim.NIL }
+<
+    Parameters: ~
+      • {str}    Stringified JSON data.
+      • {opts}   Options map keys:
+                 • luanil: { object: bool, array: bool }
+                   • `luanil.object=true` converts `null` in JSON objects to
+                     Lua `nil` instead of `vim.NIL`.
+                   • `luanil.array=true` converts `null` in JSON arrays to Lua
+                     `nil` instead of `vim.NIL`.
 
 ------------------------------------------------------------------------------
 VIM.SPELL                                                          *lua-spell*
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 2a25edc4eb..550b69010d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -43,6 +43,11 @@ The following changes may require adaptations in user config or plugins.
 
 • Renamed `vim.treesitter.playground` to `vim.treesitter.dev`.
 
+• Removed functions from the |vim.json| module:
+  • Unnecessary, undocumented functions which caused global side-effects.
+  • `vim.json.null` is redundant with `vim.NIL`.
+  • `vim.json.array_mt` (and related) is redundant with `vim.empty_dict()`.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
-- 
cgit 


From 21b074feb09b7f2e4807a816be6fd0687f23c564 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 21 Jun 2023 11:34:49 +0200
Subject: refactor(lsp): report full Nvim version string in clientInfo

---
 runtime/lua/vim/lsp.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index cb1c101c58..ea81244c68 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1345,7 +1345,6 @@ function lsp.start_client(config)
       messages = 'messages',
       verbose = 'verbose',
     }
-    local version = vim.version()
 
     local workspace_folders --- @type table[]?
     local root_uri --- @type string?
@@ -1379,7 +1378,7 @@ function lsp.start_client(config)
       -- since 3.15.0
       clientInfo = {
         name = 'Neovim',
-        version = string.format('%s.%s.%s', version.major, version.minor, version.patch),
+        version = tostring(vim.version()),
       },
       -- The rootPath of the workspace. Is null if no folder is open.
       --
-- 
cgit 


From 59048814fdad7a8769374f03c0137a8b8a2f5539 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 21 Jun 2023 11:40:03 +0200
Subject: docs(lsp): mention ctx.version

Since 643546b82b4bc0c29ca869f81af868a019723d83 the request handler
context (`ctx`) includes a `version` field.
---
 runtime/doc/lsp.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 3732ddf2bd..2a781119cf 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -238,6 +238,11 @@ For |lsp-response|, each |lsp-handler| has this signature: >
                                     The parameters used in the original
                                     request which resulted in this handler
                                     call.
+                        {version}   (number) Document version at time of
+                                    request. Handlers can compare this to the
+                                    current document version to check if the
+                                    response is "stale".
+                                    See also |b:changedtick|.
         {config}    (table)
                         Configuration for the handler.
 
-- 
cgit 


From 08db61b19b8fa07131fdcbea306893539963d4cb Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 21 Jun 2023 14:42:23 -0500
Subject: feat(man): respect 'wrapmargin' when wrapping man pages (#24091)

---
 runtime/doc/news.txt | 2 ++
 runtime/lua/man.lua  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 550b69010d..292b0da1af 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -134,6 +134,8 @@ The following changes to existing APIs or features add new behavior.
 • |:checkhealth| buffer now implements |folding|. The initial folding status is
   defined by the 'foldenable' option.
 
+• |:Man| now respects 'wrapmargin'
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index 08aff20a03..f2bd79aca8 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -436,7 +436,7 @@ local function get_page(path, silent)
   elseif vim.env.MANWIDTH then
     manwidth = vim.env.MANWIDTH
   else
-    manwidth = api.nvim_win_get_width(0)
+    manwidth = api.nvim_win_get_width(0) - vim.o.wrapmargin
   end
 
   local cmd = localfile_arg and { 'man', '-l', path } or { 'man', path }
-- 
cgit 


From 43e76cc3462bc5bcf2b6ade8af1c36e21d3da3c9 Mon Sep 17 00:00:00 2001
From: Julian Grinblat <julian@dotcore.co.il>
Date: Thu, 22 Jun 2023 16:36:38 +0900
Subject: fix: tostring(vim.version()) fails if build is NIL #24097
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
Since #23925, Version.build may be vim.NIL, which causes tostring() to fail:
    E5108: Error executing lua E5114: Error while converting print argument #1: …/version.lua:129:
    attempt to concatenate field 'build' (a userdata value)
    stack traceback:
            [C]: in function 'print'
            [string ":lua"]:1: in main chunk

Solution:
Handle vim.NIL in Version:__tostring().
---
 runtime/lua/vim/version.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 92250ff1f8..cd28a9b54b 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -125,7 +125,7 @@ function Version:__tostring()
   if self.prerelease then
     ret = ret .. '-' .. self.prerelease
   end
-  if self.build then
+  if self.build and self.build ~= vim.NIL then
     ret = ret .. '+' .. self.build
   end
   return ret
-- 
cgit 


From 5c73b1bb4c876d207e868bffc9f741c2a60d4aaf Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 20 Jun 2023 09:49:49 +0200
Subject: docs: lsp, vim_diff

- quickstart
- mark lsp.txt as `new_layout`
- remove lsp-handler documentation for notifications: they don't have
  handlers because they don't have server responses.
---
 runtime/doc/lsp.txt      | 228 +++++++++++++++++------------------------------
 runtime/doc/vim_diff.txt |  22 ++---
 2 files changed, 88 insertions(+), 162 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 2a781119cf..62b280e7f6 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -24,26 +24,23 @@ QUICKSTART                                              *lsp-quickstart*
 Nvim provides an LSP client, but the servers are provided by third parties.
 Follow these steps to get LSP features:
 
-  1. Install language servers using your package manager or by
-     following the upstream installation instruction.
+1. Install language servers using your package manager or by following the
+   upstream installation instruction. You can find language servers here:
+   https://microsoft.github.io/language-server-protocol/implementors/servers/
 
-     A list of language servers is available at:
+2. Configure the LSP client per language server. See |vim.lsp.start()| or use
+   this minimal example as a guide: >lua
 
-     https://microsoft.github.io/language-server-protocol/implementors/servers/
-
-  2. Configure the LSP client per language server.
-     A minimal example:
->lua
     vim.lsp.start({
       name = 'my-server-name',
       cmd = {'name-of-language-server-executable'},
       root_dir = vim.fs.dirname(vim.fs.find({'setup.py', 'pyproject.toml'}, { upward = true })[1]),
     })
 <
-     See |vim.lsp.start()| for details.
+3. Check that the server attached to the buffer: >
+    :lua =vim.lsp.get_active_clients()
 
-  3. Configure keymaps and autocmds to utilize LSP features.
-     See |lsp-config|.
+4. Configure keymaps and autocmds to use LSP features. See |lsp-config|.
 
                                                         *lsp-config*
                                                         *lsp-defaults*
@@ -103,11 +100,9 @@ calls behind capability checks:
 <
 
 To learn what capabilities are available you can run the following command in
-a buffer with a started LSP client:
+a buffer with a started LSP client: >vim
 
->vim
     :lua =vim.lsp.get_active_clients()[1].server_capabilities
-<
 
 Full list of features provided by default can be found in |lsp-buf|.
 
@@ -115,26 +110,20 @@ Full list of features provided by default can be found in |lsp-buf|.
 FAQ                                                     *lsp-faq*
 
 - Q: How to force-reload LSP?
-  A: Stop all clients, then reload the buffer. >vim
-
+- A: Stop all clients, then reload the buffer. >vim
      :lua vim.lsp.stop_client(vim.lsp.get_active_clients())
      :edit
 
 - Q: Why isn't completion working?
-  A: In the buffer where you want to use LSP, check that 'omnifunc' is set to
-     "v:lua.vim.lsp.omnifunc": >vim
-
-     :verbose set omnifunc?
-
-<     Some other plugin may be overriding the option. To avoid that, you could
-     set the option in an |after-directory| ftplugin, e.g.
-     "after/ftplugin/python.vim".
+- A: In the buffer where you want to use LSP, check that 'omnifunc' is set to
+     "v:lua.vim.lsp.omnifunc": `:verbose set omnifunc?`
+     - Some other plugin may be overriding the option. To avoid that you could
+       set the option in an |after-directory| ftplugin, e.g.
+       "after/ftplugin/python.vim".
 
 - Q: How do I run a request synchronously (e.g. for formatting on file save)?
-  A: Check if the function has an `async` parameter and set the value to
-  false.
-
-     E.g. code formatting: >vim
+- A: Check if the function has an `async` parameter and set the value to
+  false. E.g. code formatting: >vim
 
      " Auto-format *.rs (rust) files prior to saving them
      " (async = false is the default for format)
@@ -142,7 +131,7 @@ FAQ                                                     *lsp-faq*
 <
                                                            *lsp-vs-treesitter*
 - Q: How do LSP and Treesitter compare?
-  A: LSP requires a client and language server. The language server uses
+- A: LSP requires a client and language server. The language server uses
      semantic analysis to understand code at a project level. This provides
      language servers with the ability to rename across files, find
      definitions in external libraries and more.
@@ -173,129 +162,72 @@ when creating a new client. Keys are LSP method names: >vim
                                                                   *lsp-method*
 
 Methods are the names of requests and notifications as defined by the LSP
-specification. These LSP requests/notifications are defined by default:
-
-    callHierarchy/incomingCalls
-    callHierarchy/outgoingCalls
-    textDocument/codeAction
-    textDocument/completion
-    textDocument/declaration*
-    textDocument/definition
-    textDocument/documentHighlight
-    textDocument/documentSymbol
-    textDocument/formatting
-    textDocument/hover
-    textDocument/implementation*
-    textDocument/inlayHint
-    textDocument/publishDiagnostics
-    textDocument/rangeFormatting
-    textDocument/references
-    textDocument/rename
-    textDocument/semanticTokens/full
-    textDocument/semanticTokens/full/delta
-    textDocument/signatureHelp
-    textDocument/typeDefinition*
-    window/logMessage
-    window/showMessage
-    window/showDocument
-    window/showMessageRequest
-    workspace/applyEdit
-    workspace/inlayHint/refresh
-    workspace/symbol
-
-* NOTE: These are sometimes not implemented by servers.
+specification. These LSP requests/notifications are defined by default in the
+Nvim LSP client (but depends on server support):
+
+- callHierarchy/incomingCalls
+- callHierarchy/outgoingCalls
+- textDocument/codeAction
+- textDocument/completion
+- textDocument/declaration*
+- textDocument/definition
+- textDocument/documentHighlight
+- textDocument/documentSymbol
+- textDocument/formatting
+- textDocument/hover
+- textDocument/implementation*
+- textDocument/inlayHint
+- textDocument/publishDiagnostics
+- textDocument/rangeFormatting
+- textDocument/references
+- textDocument/rename
+- textDocument/semanticTokens/full
+- textDocument/semanticTokens/full/delta
+- textDocument/signatureHelp
+- textDocument/typeDefinition*
+- window/logMessage
+- window/showMessage
+- window/showDocument
+- window/showMessageRequest
+- workspace/applyEdit
+- workspace/inlayHint/refresh
+- workspace/symbol
 
                                                                  *lsp-handler*
+LSP handlers are functions that handle |lsp-response|s to requests made by Nvim
+to the server. (Notifications, as opposed to requests, are fire-and-forget:
+there is no response, so they can't be handled. |lsp-notification|)
 
-LSP handlers are functions with signatures designed to handle LSP responses
-and notifications.
-
-For |lsp-response|, each |lsp-handler| has this signature: >
-
-  function(err, result, ctx, config)
-<
-    Parameters: ~
-        {err}       (table|nil)
-                        When the language server is unable to complete a
-                        request, a table with information about the error is
-                        sent. Otherwise, it is `nil`. See |lsp-response|.
-        {result}    (Result | Params | nil)
-                        When the language server is able to successfully
-                        complete a request, this contains the `result` key of
-                        the response. See |lsp-response|.
-        {ctx}       (table)
-                        Context describes additional calling state associated
-                        with the handler. It consists of the following key,
-                        value pairs:
-
-                        {method}    (string)
-                                    The |lsp-method| name.
-                        {client_id} (number)
-                                    The ID of the |vim.lsp.client|.
-                        {bufnr}     (Buffer)
-                                    Buffer handle, or 0 for current.
-                        {params}    (table|nil)
-                                    The parameters used in the original
-                                    request which resulted in this handler
-                                    call.
-                        {version}   (number) Document version at time of
-                                    request. Handlers can compare this to the
-                                    current document version to check if the
-                                    response is "stale".
-                                    See also |b:changedtick|.
-        {config}    (table)
-                        Configuration for the handler.
-
-                        Each handler can define its own configuration table
-                        that allows users to customize the behavior of a
-                        particular handler.
-
-                        To configure a particular |lsp-handler|, see:
-                            |lsp-handler-configuration|
-
-
-    Returns: ~
-        The |lsp-handler| can respond by returning two values: `result, err`
-        Where `err` must be shaped like an RPC error:
-            `{ code, message, data? }`
-
-        You can use |vim.lsp.rpc.rpc_response_error()| to create this object.
-
-For |lsp-notification|, each |lsp-handler| has this signature: >
+Each response handler has this signature: >
 
-  function(err, result, ctx, config)
+    function(err, result, ctx, config)
 <
     Parameters: ~
-        {err}       (nil)
-                        This is always `nil`.
-                        See |lsp-notification|
-        {result}    (Result)
-                        This contains the `params` key of the notification.
-                        See |lsp-notification|
-        {ctx}       (table)
-                        Context describes additional calling state associated
-                        with the handler. It consists of the following key,
-                        value pairs:
-
-                        {method}    (string)
-                                        The |lsp-method| name.
-                        {client_id} (number)
-                                        The ID of the |vim.lsp.client|.
-        {config}    (table)
-                        Configuration for the handler.
-
-                        Each handler can define its own configuration table
-                        that allows users to customize the behavior of a
-                        particular handler.
-
-                        For an example, see:
-                            |vim.lsp.diagnostic.on_publish_diagnostics()|
-
-                        To configure a particular |lsp-handler|, see:
-                            |lsp-handler-configuration|
+        - {err}     (table|nil) Error info dict, or `nil` if the request
+                    completed.
+        - {result}  (Result | Params | nil) `result` key of the |lsp-response| or
+                    `nil` if the request failed.
+        - {ctx}     (table) Table of calling state associated with the
+                    handler, with these keys:
+                    - {method}  (string) |lsp-method| name.
+                    - {client_id} (number) |vim.lsp.client| identifier.
+                    - {bufnr}   (Buffer) Buffer handle.
+                    - {params}  (table|nil) Request parameters table.
+                    - {version} (number) Document version at time of
+                                request. Handlers can compare this to the
+                                current document version to check if the
+                                response is "stale". See also |b:changedtick|.
+        - {config}  (table) Handler-defined configuration table, which allows
+                    users to customize handler behavior.
+                    For an example, see:
+                        |vim.lsp.diagnostic.on_publish_diagnostics()|
+                    To configure a particular |lsp-handler|, see:
+                        |lsp-handler-configuration|
 
     Returns: ~
-        The |lsp-handler|'s return value will be ignored.
+        Two values `result, err` where `err` is shaped like an RPC error: >
+            { code, message, data? }
+<        You can use |vim.lsp.rpc.rpc_response_error()| to create this object.
 
                                                    *lsp-handler-configuration*
 
@@ -419,12 +351,12 @@ name: >lua
 <
 
                                                                 *lsp-response*
-For the format of the response message, see:
-    https://microsoft.github.io/language-server-protocol/specifications/specification-current/#responseMessage
+LSP response shape:
+https://microsoft.github.io/language-server-protocol/specifications/specification-current/#responseMessage
 
                                                                 *lsp-notification*
-For the format of the notification message, see:
-    https://microsoft.github.io/language-server-protocol/specifications/specification-current/#notificationMessage
+LSP notification shape:
+https://microsoft.github.io/language-server-protocol/specifications/specification-current/#notificationMessage
 
                                                                 *lsp-on-list-handler*
 
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index ff3e19689b..f07fb0902e 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -564,7 +564,8 @@ Aliases:
 Commands:
   :behave
   :fixdel
-  :hardcopy
+  *hardcopy* `:hardcopy` was removed. Instead, use `:TOhtml` and print the
+  resulting HTML using a web browser or other HTML viewer.
   :helpfind
   :mode (no longer accepts an argument)
   :open
@@ -586,6 +587,11 @@ Compile-time features:
   Emacs tags support
   X11 integration (see |x11-selection|)
 
+Cscope:
+                                                                      *cscope*
+  Cscope support was removed in favour of plugin-based solutions such as:
+  https://github.com/dhananjaylatkar/cscope_maps.nvim
+
 Eval:
   Vim9script
   *cscope_connection()*
@@ -715,6 +721,7 @@ Plugins:
 
 - logiPat
 - rrhelper
+- *vimball*
 
 Providers:
 
@@ -771,18 +778,5 @@ TUI:
   at how the terminal is sending CSI.  Nvim does not issue such a sequence and
   always uses 7-bit control sequences.
 
-Cscope:
-                                                                      *cscope*
-  Cscope support was removed in favour of plugin-based solutions such as:
-  https://github.com/dhananjaylatkar/cscope_maps.nvim
-
-Hardcopy:
-                                                                     *hardcopy*
-  `:hardcopy` was removed. Instead, use `:TOhtml` and print the resulting HTML
-  using a web browser or some other HTML viewer.
-
-Bundled plugins:
-  vimball                                                             *vimball*
-
 ==============================================================================
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
-- 
cgit 


From d931b829e92665fd7371b1bb49d22ce25b50a89a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 21 Jun 2023 15:40:40 +0200
Subject: fix(docs): vimdoc syntax errors

Since https://github.com/neovim/tree-sitter-vimdoc/pull/97
the many cases of *.foo cause parser errors. But even before that, these
were erroneously highlighted as (argument), so fixing them is good.
---
 runtime/doc/autocmd.txt  | 20 +++++------
 runtime/doc/eval.txt     |  2 +-
 runtime/doc/filetype.txt | 66 +++++++++++++++++-----------------
 runtime/doc/options.txt  | 12 +++----
 runtime/doc/pattern.txt  | 10 ++----
 runtime/doc/syntax.txt   | 92 ++++++++++++++++++++++++------------------------
 runtime/doc/vi_diff.txt  |  6 ++--
 7 files changed, 102 insertions(+), 106 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index b64938ee9e..a782be65e7 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -16,7 +16,7 @@ For a basic explanation, see section |40.3| in the user manual.
 You can specify commands to be executed automatically when reading or writing
 a file, when entering or leaving a buffer or window, and when exiting Vim.
 For example, you can create an autocommand to set the 'cindent' option for
-files matching *.c.  You can also use autocommands to implement advanced
+files matching `*.c`.  You can also use autocommands to implement advanced
 features, such as editing compressed files (see |gzip-example|).  The usual
 place to put autocommands is in your vimrc file.
 
@@ -197,7 +197,7 @@ For READING FILES there are four kinds of events possible:
 Vim uses only one of these four kinds when reading a file.  The "Pre" and
 "Post" events are both triggered, before and after reading the file.
 
-Note that the autocommands for the *ReadPre events and all the Filter events
+Note that the autocommands for the "*ReadPre" events and all the Filter events
 are not allowed to change the current buffer (you will get an error message if
 this happens).  This is to prevent the file to be read into the wrong buffer.
 
@@ -1001,7 +1001,7 @@ TextChangedT			After a change was made to the text in the
 							*TextYankPost*
 TextYankPost			Just after a |yank| or |deleting| command, but not
 				if the black hole register |quote_| is used nor
-				for |setreg()|. Pattern must be *.
+				for |setreg()|. Pattern must be "*".
 				Sets these |v:event| keys:
 				    inclusive
 				    operator
@@ -1417,8 +1417,8 @@ When there is a matching "*Cmd" autocommand, it is assumed it will do the
 writing.  No further writing is done and the other events are not triggered.
 |Cmd-event|
 
-Note that the *WritePost commands should undo any changes to the buffer that
-were caused by the *WritePre commands; otherwise, writing the file will have
+Note that the "*WritePost" commands should undo any changes to the buffer that
+were caused by the "*WritePre" commands; otherwise, writing the file will have
 the side effect of changing the buffer.
 
 Before executing the autocommands, the buffer from which the lines are to be
@@ -1426,15 +1426,15 @@ written temporarily becomes the current buffer.  Unless the autocommands
 change the current buffer or delete the previously current buffer, the
 previously current buffer is made the current buffer again.
 
-The *WritePre and *AppendPre autocommands must not delete the buffer from
+The "*WritePre" and "*AppendPre" autocommands must not delete the buffer from
 which the lines are to be written.
 
 The '[ and '] marks have a special position:
-- Before the *ReadPre event the '[ mark is set to the line just above where
+- Before the "*ReadPre" event the '[ mark is set to the line just above where
   the new lines will be inserted.
-- Before the *ReadPost event the '[ mark is set to the first line that was
+- Before the "*ReadPost" event the '[ mark is set to the first line that was
   just read, the '] mark to the last line.
-- Before executing the *WriteCmd, *WritePre and *AppendPre autocommands the '[
+- Before executing the "*WriteCmd", "*WritePre" and "*AppendPre" autocommands the '[
   mark is set to the first line that will be written, the '] mark to the last
   line.
 Careful: '[ and '] change when using commands that change the buffer.
@@ -1542,7 +1542,7 @@ To read a skeleton (template) file when opening a new file: >
   :autocmd BufNewFile  *.h	0r ~/vim/skeleton.h
   :autocmd BufNewFile  *.java	0r ~/vim/skeleton.java
 
-To insert the current date and time in a *.html file when writing it: >
+To insert the current date and time in a "*.html" file when writing it: >
 
   :autocmd BufWritePre,FileWritePre *.html   ks|call LastMod()|'s
   :fun LastMod()
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5cee668b39..c1ea28c839 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -39,7 +39,7 @@ List		An ordered sequence of items, see |List| for details.
 
 Dictionary	An associative, unordered array: Each entry has a key and a
 		value. |Dictionary|
-		Examples:
+		Examples: >
 			{"blue": "#0000ff", "red": "#ff0000"}
 			#{blue: "#0000ff", red: "#ff0000"}
 
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 48d6aed0f2..79894f7c73 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -54,9 +54,9 @@ you can either set the 'filetype' option manually, or add a modeline to your
 file.  Example, for an IDL file use the command: >
 	:set filetype=idl
 
-or add this |modeline| to the file:
-	/* vim: set filetype=idl : */ ~
-
+or add this |modeline| to the file: >
+	/* vim: set filetype=idl : */
+<
 						*:filetype-plugin-on*
 You can enable loading the plugin files for specific file types with: >
 	:filetype plugin on
@@ -136,38 +136,38 @@ what kind of file it is.  This doesn't always work.  A number of global
 variables can be used to overrule the filetype used for certain extensions:
 
 	file name	variable ~
-	*.asa		g:filetype_asa	|ft-aspvbs-syntax| |ft-aspperl-syntax|
-	*.asm		g:asmsyntax	|ft-asm-syntax|
-	*.asp		g:filetype_asp	|ft-aspvbs-syntax| |ft-aspperl-syntax|
-	*.bas		g:filetype_bas	|ft-basic-syntax|
-	*.cfg		g:filetype_cfg
-	*.cls		g:filetype_cls
-	*.csh		g:filetype_csh	|ft-csh-syntax|
-	*.dat		g:filetype_dat
-	*.frm		g:filetype_frm	|ft-form-syntax|
-	*.fs		g:filetype_fs	|ft-forth-syntax|
-	*.i		g:filetype_i	|ft-progress-syntax|
-	*.inc		g:filetype_inc
-	*.lsl		g:filetype_lsl
-	*.m		g:filetype_m	|ft-mathematica-syntax|
-	*.mod		g:filetype_mod
-	*.p		g:filetype_p	|ft-pascal-syntax|
-	*.pl		g:filetype_pl
-	*.pp		g:filetype_pp	|ft-pascal-syntax|
-	*.prg		g:filetype_prg
-	*.r		g:filetype_r
-	*.sig		g:filetype_sig
-	*.sql		g:filetype_sql	|ft-sql-syntax|
-	*.src		g:filetype_src
-	*.sys		g:filetype_sys
-	*.sh		g:bash_is_sh	|ft-sh-syntax|
-	*.tex		g:tex_flavor	|ft-tex-plugin|
-	*.typ		g:filetype_typ
-	*.w		g:filetype_w	|ft-cweb-syntax|
+	`*.asa`		g:filetype_asa	|ft-aspvbs-syntax| |ft-aspperl-syntax|
+	`*.asm`		g:asmsyntax	|ft-asm-syntax|
+	`*.asp`		g:filetype_asp	|ft-aspvbs-syntax| |ft-aspperl-syntax|
+	`*.bas`		g:filetype_bas	|ft-basic-syntax|
+	`*.cfg`		g:filetype_cfg
+	`*.cls`		g:filetype_cls
+	`*.csh`		g:filetype_csh	|ft-csh-syntax|
+	`*.dat`		g:filetype_dat
+	`*.frm`		g:filetype_frm	|ft-form-syntax|
+	`*.fs`		g:filetype_fs	|ft-forth-syntax|
+	`*.i`		g:filetype_i	|ft-progress-syntax|
+	`*.inc`		g:filetype_inc
+	`*.lsl`		g:filetype_lsl
+	`*.m`		g:filetype_m	|ft-mathematica-syntax|
+	`*.mod`		g:filetype_mod
+	`*.p`		g:filetype_p	|ft-pascal-syntax|
+	`*.pl`		g:filetype_pl
+	`*.pp`		g:filetype_pp	|ft-pascal-syntax|
+	`*.prg`		g:filetype_prg
+	`*.r`		g:filetype_r
+	`*.sig`		g:filetype_sig
+	`*.sql`		g:filetype_sql	|ft-sql-syntax|
+	`*.src`		g:filetype_src
+	`*.sys`		g:filetype_sys
+	`*.sh`		g:bash_is_sh	|ft-sh-syntax|
+	`*.tex`		g:tex_flavor	|ft-tex-plugin|
+	`*.typ`		g:filetype_typ
+	`*.w`		g:filetype_w	|ft-cweb-syntax|
 
 For a few filetypes the global variable is used only when the filetype could
 not be detected:
-	*.r		g:filetype_r	|ft-rexx-syntax|
+	`*.r`		g:filetype_r	|ft-rexx-syntax|
 
 							*filetype-ignore*
 To avoid that certain files are being inspected, the g:ft_ignore_pat variable
@@ -881,7 +881,7 @@ file: |ft_sql.txt|.
 
 TEX						*ft-tex-plugin* *g:tex_flavor*
 
-If the first line of a *.tex file has the form >
+If the first line of a `*.tex` file has the form >
 	%&<format>
 then this determined the file type:  plaintex (for plain TeX), context (for
 ConTeXt), or tex (for LaTeX).  Otherwise, the file is searched for keywords to
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 78d38095a8..b58ca8d094 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1449,7 +1449,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'completeslash'* *'csl'*
 'completeslash' 'csl'	string	(default: "")
 			local to buffer
-			{only for MS-Windows}
+			only for MS-Windows
 	When this option is set it overrules 'shellslash' for completion:
 	- When this option is set to "slash", a forward slash is used for path
 	  completion in insert mode. This is useful when editing HTML tag, or
@@ -3741,7 +3741,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'linespace'* *'lsp'*
 'linespace' 'lsp'	number	(default 0)
 			global
-			{only in the GUI}
+			only in the GUI
 	Number of pixel lines inserted between characters.  Useful if the font
 	uses the full character cell height, making lines touch each other.
 	When non-zero there is room for underlining.
@@ -4187,7 +4187,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			*'mousehide'* *'mh'* *'nomousehide'* *'nomh'*
 'mousehide' 'mh'	boolean	(default on)
 			global
-			{only works in the GUI}
+			only in the GUI
 	When on, the mouse pointer is hidden when characters are typed.
 	The mouse pointer is restored when the mouse is moved.
 
@@ -4426,7 +4426,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			    *'opendevice'* *'odev'* *'noopendevice'* *'noodev'*
 'opendevice' 'odev'	boolean	(default off)
 			global
-			{only for Windows}
+			only for Windows
 	Enable reading and writing from devices.  This may get Vim stuck on a
 	device that can be opened but doesn't actually do the I/O.  Therefore
 	it is off by default.
@@ -5323,7 +5323,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			*'shellslash'* *'ssl'* *'noshellslash'* *'nossl'*
 'shellslash' 'ssl'	boolean	(default off)
 			global
-			{only for MS-Windows}
+			only for MS-Windows
 	When set, a forward slash is used when expanding file names.  This is
 	useful when a Unix-like shell is used instead of cmd.exe.  Backward
 	slashes can still be typed, but they are changed to forward slashes by
@@ -7054,7 +7054,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'winaltkeys'* *'wak'*
 'winaltkeys' 'wak'	string	(default "menu")
 			global
-			{only used in Win32}
+			only used in Win32
 	Some GUI versions allow the access to menu entries by using the ALT
 	key in combination with a character that appears underlined in the
 	menu.  This conflicts with the use of the ALT key for mappings and
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 8437496011..7ea3b7df76 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -432,8 +432,6 @@ after:	  \v	   \m	    \M	     \V		matches ~
 	  \\	   \\	    \\	     \\		literal backslash
 	  \{	   {	    {	     {		literal curly brace
 
-{only Vim supports \m, \M, \v and \V}
-
 If you want to you can make a pattern immune to the 'magic' option being set
 or not by putting "\m" or "\M" at the start of the pattern.
 
@@ -455,7 +453,7 @@ More explanation and examples below, follow the links.		*E64* *E871*
 	\{n}	\{n}	n		exactly
 	\{n,}	\{n,}	at least n	as many as possible
 	\{,m}	\{,m}	0 to m		as many as possible
-	\{}	\{}	0 or more	as many as possible (same as *)
+	\{}	\{}	0 or more	as many as possible (same as "*")
 
 |/\{-|	\{-n,m}	\{-n,m}	n to m		as few as possible
 	\{-n}	\{-n}	n		exactly
@@ -633,7 +631,7 @@ overview.
 \{n}	Matches n of the preceding atom
 \{n,}	Matches at least n of the preceding atom, as many as possible
 \{,m}	Matches 0 to m of the preceding atom, as many as possible
-\{}	Matches 0 or more of the preceding atom, as many as possible (like *)
+\{}	Matches 0 or more of the preceding atom, as many as possible (like "*")
 							*/\{-*
 \{-n,m}	matches n to m of the preceding atom, as few as possible
 \{-n}	matches n of the preceding atom
@@ -1256,7 +1254,6 @@ letters only.
 When "\c" appears anywhere in the pattern, the whole pattern is handled like
 'ignorecase' is on.  The actual value of 'ignorecase' and 'smartcase' is
 ignored.  "\C" does the opposite: Force matching case for the whole pattern.
-{only Vim supports \c and \C}
 Note that 'ignorecase', "\c" and "\C" are not used for the character classes.
 
 Examples:
@@ -1338,11 +1335,10 @@ difference between them is mostly just notation;  here's a summary of where
 they differ:
 
 Capability			in Vimspeak	in Perlspeak ~
-----------------------------------------------------------------
 force case insensitivity	\c		(?i)
 force case sensitivity		\C		(?-i)
 backref-less grouping		\%(atom\)	(?:atom)
-conservative quantifiers	\{-n,m}		*?, +?, ??, {}?
+conservative quantifiers	\{-n,m}		`*?,` +?, ??, {}?
 0-width match			atom\@=		(?=atom)
 0-width non-match		atom\@!		(?!atom)
 0-width preceding match		atom\@<=	(?<=atom)
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 14f613d3fc..09c935cb9b 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -197,19 +197,19 @@ be preferred names for highlight groups that are common for many languages.
 These are the suggested group names (if syntax highlighting works properly
 you can see the actual color, except for "Ignore"):
 
-	*Comment	any comment
+	 Comment	any comment
 
-	*Constant	any constant
+	 Constant	any constant
 	 String		a string constant: "this is a string"
 	 Character	a character constant: 'c', '\n'
 	 Number		a number constant: 234, 0xff
 	 Boolean	a boolean constant: TRUE, false
 	 Float		a floating point constant: 2.3e10
 
-	*Identifier	any variable name
+	 Identifier	any variable name
 	 Function	function name (also: methods for classes)
 
-	*Statement	any statement
+	 Statement	any statement
 	 Conditional	if, then, else, endif, switch, etc.
 	 Repeat		for, do, while, etc.
 	 Label		case, default, etc.
@@ -217,31 +217,31 @@ you can see the actual color, except for "Ignore"):
 	 Keyword	any other keyword
 	 Exception	try, catch, throw
 
-	*PreProc	generic Preprocessor
+	 PreProc	generic Preprocessor
 	 Include	preprocessor #include
 	 Define		preprocessor #define
 	 Macro		same as Define
 	 PreCondit	preprocessor #if, #else, #endif, etc.
 
-	*Type		int, long, char, etc.
+	 Type		int, long, char, etc.
 	 StorageClass	static, register, volatile, etc.
 	 Structure	struct, union, enum, etc.
 	 Typedef	A typedef
 
-	*Special	any special symbol
+	 Special	any special symbol
 	 SpecialChar	special character in a constant
 	 Tag		you can use CTRL-] on this
 	 Delimiter	character that needs attention
 	 SpecialComment	special things inside a comment
 	 Debug		debugging statements
 
-	*Underlined	text that stands out, HTML links
+	 Underlined	text that stands out, HTML links
 
-	*Ignore		left blank, hidden  |hl-Ignore|
+	 Ignore		left blank, hidden  |hl-Ignore|
 
-	*Error		any erroneous construct
+	 Error		any erroneous construct
 
-	*Todo		anything that needs extra attention; mostly the
+	 Todo		anything that needs extra attention; mostly the
 			keywords TODO FIXME and XXX
 
 The names marked with * are the preferred groups; the others are minor groups.
@@ -893,7 +893,7 @@ nasm_no_warn		potentially risky syntax not as ToDo
 
 ASPPERL and ASPVBS			*ft-aspperl-syntax* *ft-aspvbs-syntax*
 
-*.asp and *.asa files could be either Perl or Visual Basic script.  Since it's
+`*.asp` and `*.asa` files could be either Perl or Visual Basic script.  Since it's
 hard to detect this you can set two global variables to tell Vim what you are
 using.	For Perl script use: >
 	:let g:filetype_asa = "aspperl"
@@ -979,7 +979,7 @@ Variable		Highlight ~
 *c_ansi_typedefs*		 ... but do standard ANSI types
 *c_ansi_constants*	 ... but do standard ANSI constants
 *c_no_utf*		don't highlight \u and \U in strings
-*c_syntax_for_h*		for *.h files use C syntax instead of C++ and use objc
+*c_syntax_for_h*		for `*.h` files use C syntax instead of C++ and use objc
 			syntax instead of objcpp
 *c_no_if0*		don't highlight "#if 0" blocks as comments
 *c_no_cformat*		don't highlight %-formats in strings
@@ -987,7 +987,7 @@ Variable		Highlight ~
 *c_no_c11*		don't highlight C11 standard items
 *c_no_bsd*		don't highlight BSD specific types
 
-When 'foldmethod' is set to "syntax" then /* */ comments and { } blocks will
+When 'foldmethod' is set to "syntax" then `/* */` comments and { } blocks will
 become a fold.  If you don't want comments to become a fold use: >
 	:let c_no_comment_fold = 1
 "#if 0" blocks are also folded, unless: >
@@ -1034,7 +1034,7 @@ CH						*ch.vim* *ft-ch-syntax*
 C/C++ interpreter.  Ch has similar syntax highlighting to C and builds upon
 the C syntax file.  See |c.vim| for all the settings that are available for C.
 
-By setting a variable you can tell Vim to use Ch syntax for *.h files, instead
+By setting a variable you can tell Vim to use Ch syntax for `*.h` files, instead
 of C or C++: >
 	:let ch_syntax_for_h = 1
 
@@ -1296,7 +1296,7 @@ dosbatch_colons_comment variable to anything: >
 
    :let dosbatch_colons_comment = 1
 
-There is an option that covers whether *.btm files should be detected as type
+There is an option that covers whether `*.btm` files should be detected as type
 "dosbatch" (MS-DOS batch files) or type "btm" (4DOS batch files).  The latter
 is used by default.  You may select the former with the following line: >
 
@@ -1427,13 +1427,13 @@ Euphoria version 3.1.1 (https://www.rapideuphoria.com/) is still necessary
 for developing applications for the DOS platform, which Euphoria version 4
 (https://www.openeuphoria.org/) does not support.
 
-The following file extensions are auto-detected as Euphoria file type:
+The following file extensions are auto-detected as Euphoria file type: >
 
 	*.e, *.eu, *.ew, *.ex, *.exu, *.exw
 	*.E, *.EU, *.EW, *.EX, *.EXU, *.EXW
 
 To select syntax highlighting file for Euphoria, as well as for
-auto-detecting the *.e and *.E file extensions as Euphoria file type,
+auto-detecting the `*.e` and `*.E` file extensions as Euphoria file type,
 add the following line to your startup file: >
 
 	:let g:filetype_euphoria = "euphoria3"
@@ -1442,7 +1442,7 @@ add the following line to your startup file: >
 
 	:let g:filetype_euphoria = "euphoria4"
 
-Elixir and Euphoria share the *.ex file extension.  If the filetype is
+Elixir and Euphoria share the `*.ex` file extension.  If the filetype is
 specifically set as Euphoria with the g:filetype_euphoria variable, or the
 file is determined to be Euphoria based on keywords in the file, then the
 filetype will be set as Euphoria. Otherwise, the filetype will default to
@@ -1469,11 +1469,11 @@ ELIXIR						*elixir.vim* *ft-elixir-syntax*
 Elixir is a dynamic, functional language for building scalable and
 maintainable applications.
 
-The following file extensions are auto-detected as Elixir file types:
+The following file extensions are auto-detected as Elixir file types: >
 
 	*.ex, *.exs, *.eex, *.leex, *.lock
 
-Elixir and Euphoria share the *.ex file extension. If the filetype is
+Elixir and Euphoria share the `*.ex` file extension. If the filetype is
 specifically set as Euphoria with the g:filetype_euphoria variable, or the
 file is determined to be Euphoria based on keywords in the file, then the
 filetype will be set as Euphoria. Otherwise, the filetype will default to
@@ -1905,7 +1905,7 @@ IA64				*ia64.vim* *intel-itanium* *ft-ia64-syntax*
 Highlighting for the Intel Itanium 64 assembly language.  See |asm.vim| for
 how to recognize this filetype.
 
-To have *.inc files be recognized as IA64, add this to your vimrc file: >
+To have `*.inc` files be recognized as IA64, add this to your vimrc file: >
 	:let g:filetype_inc = "ia64"
 
 
@@ -2118,7 +2118,7 @@ set "lite_minlines" to the value you desire.  Example: >
 LPC						*lpc.vim* *ft-lpc-syntax*
 
 LPC stands for a simple, memory-efficient language: Lars Pensjö C.  The
-file name of LPC is usually *.c.  Recognizing these files as LPC would bother
+file name of LPC is usually `*.c`.  Recognizing these files as LPC would bother
 users writing only C programs.	If you want to use LPC syntax in Vim, you
 should set a variable in your vimrc file: >
 
@@ -2153,7 +2153,7 @@ For LPC4 series of LPC: >
 
 For uLPC series of LPC:
 uLPC has been developed to Pike, so you should use Pike syntax
-instead, and the name of your source file should be *.pike
+instead, and the name of your source file should be `*.pike`
 
 
 LUA						*lua.vim* *ft-lua-syntax*
@@ -2230,7 +2230,7 @@ the start of a region, for example 500 lines: >
 
 MATHEMATICA		*mma.vim* *ft-mma-syntax* *ft-mathematica-syntax*
 
-Empty *.m files will automatically be presumed to be Matlab files unless you
+Empty `*.m` files will automatically be presumed to be Matlab files unless you
 have the following in your vimrc: >
 
 	let filetype_m = "mma"
@@ -2437,7 +2437,7 @@ keywords, etc): >
 
 
 The option pascal_symbol_operator controls whether symbol operators such as +,
-*, .., etc. are displayed using the Operator color or not.  To colorize symbol
+`*`, .., etc. are displayed using the Operator color or not.  To colorize symbol
 operators, add the following line to your startup file: >
 
    :let pascal_symbol_operator=1
@@ -2600,7 +2600,7 @@ x = 0 to sync from start.
 PLAINTEX				*plaintex.vim* *ft-plaintex-syntax*
 
 TeX is a typesetting language, and plaintex is the file type for the "plain"
-variant of TeX.  If you never want your *.tex files recognized as plain TeX,
+variant of TeX.  If you never want your `*.tex` files recognized as plain TeX,
 see |ft-tex-plugin|.
 
 This syntax file has the option >
@@ -3149,7 +3149,7 @@ The syntax/sh.vim file provides several levels of syntax-based folding: >
 	let g:sh_fold_enabled= 1     (enable function folding)
 	let g:sh_fold_enabled= 2     (enable heredoc folding)
 	let g:sh_fold_enabled= 4     (enable if/do/for folding)
->
+
 then various syntax items (ie. HereDocuments and function bodies) become
 syntax-foldable (see |:syn-fold|).  You also may add these together
 to get multiple types of folding: >
@@ -3446,8 +3446,8 @@ has a starred form (ie. eqnarray*).
 					*tex-style* *b:tex_stylish*
  Tex: Starting a New Style? ~
 
-One may use "\makeatletter" in *.tex files, thereby making the use of "@" in
-commands available.  However, since the *.tex file doesn't have one of the
+One may use "\makeatletter" in `*.tex` files, thereby making the use of "@" in
+commands available.  However, since the `*.tex` file doesn't have one of the
 following suffices: sty cls clo dtx ltx, the syntax highlighting will flag
 such use of @ as an error.  To solve this: >
 
@@ -3491,7 +3491,7 @@ substitution will not be made.
  Tex: Controlling iskeyword~
 
 Normally, LaTeX keywords support 0-9, a-z, A-z, and 192-255 only. Latex
-keywords don't support the underscore - except when in *.sty files.  The
+keywords don't support the underscore - except when in `*.sty` files.  The
 syntax highlighting script handles this with the following logic:
 
 	* If g:tex_stylish exists and is 1
@@ -3715,7 +3715,7 @@ Vim understands three types of syntax items:
 
 Several syntax ITEMs can be put into one syntax GROUP.	For a syntax group
 you can give highlighting attributes.  For example, you could have an item
-to define a "/* .. */" comment and another one that defines a "// .." comment,
+to define a `/* .. */` comment and another one that defines a "// .." comment,
 and put them both in the "Comment" group.  You can then specify that a
 "Comment" will be in bold font and have a blue color.  You are free to make
 one highlight group for one syntax item, or put all items into one group.
@@ -4473,19 +4473,19 @@ Notes:
   matched.  This doesn't work: "a\nb"ms=e.  You can make the highlighting
   start in another line, this does work: "a\nb"hs=e.
 
-Example (match a comment but don't highlight the /* and */): >
+Example (match a comment but don't highlight the `/* and */`): >vim
   :syntax region Comment start="/\*"hs=e+1 end="\*/"he=s-1
-<
+< >
 	/* this is a comment */
 	  ^^^^^^^^^^^^^^^^^^^	  highlighted
-
-A more complicated Example: >
-  :syn region Exa matchgroup=Foo start="foo"hs=s+2,rs=e+2 matchgroup=Bar end="bar"me=e-1,he=e-1,re=s-1
 <
+A more complicated Example: >vim
+  :syn region Exa matchgroup=Foo start="foo"hs=s+2,rs=e+2 matchgroup=Bar end="bar"me=e-1,he=e-1,re=s-1
+< >
 	 abcfoostringbarabc
 	    mmmmmmmmmmm	    match
 	      sssrrreee	    highlight start/region/end ("Foo", "Exa" and "Bar")
-
+<
 Leading context			*:syn-lc* *:syn-leading* *:syn-context*
 
 Note: This is an obsolete feature, only included for backwards compatibility
@@ -4785,7 +4785,7 @@ matches, nextgroup, etc.  But there are a few differences:
 - When a match with a sync pattern is found, the rest of the line (or group of
   continued lines) is searched for another match.  The last match is used.
   This is used when a line can contain both the start end the end of a region
-  (e.g., in a C-comment like /* this */, the last "*/" is used).
+  (e.g., in a C-comment like `/* this */`, the last "*/" is used).
 
 There are two ways how a match with a sync pattern can be used:
 1. Parsing for highlighting starts where redrawing starts (and where the
@@ -5481,14 +5481,14 @@ memory Vim will consume.
 Only highlighting typedefs, unions and structs can be done too.  For this you
 must use Universal Ctags (https://ctags.io) or Exuberant ctags.
 
-Put these lines in your Makefile:
+Put these lines in your Makefile: >
 
-# Make a highlight file for types.  Requires Universal/Exuberant ctags and awk
-types: types.vim
-types.vim: *.[ch]
-	ctags --c-kinds=gstu -o- *.[ch] |\
-		awk 'BEGIN{printf("syntax keyword Type\t")}\
-			{printf("%s ", $$1)}END{print ""}' > $@
+    # Make a highlight file for types.  Requires Universal/Exuberant ctags and awk
+    types: types.vim
+    types.vim: *.[ch]
+	    ctags --c-kinds=gstu -o- *.[ch] |\
+		    awk 'BEGIN{printf("syntax keyword Type\t")}\
+			    {printf("%s ", $$1)}END{print ""}' > $@
 
 And put these lines in your vimrc: >
 
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index afabddb7f9..3c1437068a 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -180,12 +180,12 @@ Command-line editing and history.			|cmdline-editing|
 	forward/backward one character.  The shifted right/left cursor keys
 	can be used to move forward/backward one word.  CTRL-B/CTRL-E can be
 	used to go to the begin/end of the command-line.
-	{Vi: can only alter the last character in the line}
-	{Vi: when hitting <Esc> the command-line is executed.  This is
+	(Vi: can only alter the last character in the line)
+	(Vi: when hitting <Esc> the command-line is executed.  This is
 	unexpected for most people; therefore it was changed in Vim.  But when
 	the <Esc> is part of a mapping, the command-line is executed.  If you
 	want the Vi behaviour also when typing <Esc>, use ":cmap ^V<Esc>
-	^V^M"}
+	^V^M")
 							|cmdline-history|
 	The command-lines are remembered.  The up/down cursor keys can be used
 	to recall previous command-lines.  The 'history' option can be set to
-- 
cgit 


From 4d3a04279d32bc97d18ab2883c678c94f80487bc Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Thu, 22 Jun 2023 10:18:49 +0200
Subject: perf(lsp): remove grouping logic from lsp.status (#24096)

With the title carry-over logic in the `$/progress` handler it's not
necessary to group again in vim.lsp.status
---
 runtime/lua/vim/lsp.lua | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index ea81244c68..38e0e34790 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -902,18 +902,13 @@ end
 ---@return string
 function lsp.status()
   local percentage = nil
-  local groups = {}
+  local messages = {}
   for _, client in ipairs(vim.lsp.get_active_clients()) do
     for progress in client.progress do
       local value = progress.value
       if type(value) == 'table' and value.kind then
-        local group = groups[progress.token]
-        if not group then
-          group = {}
-          groups[progress.token] = group
-        end
-        group.title = value.title or group.title
-        group.message = value.message or group.message
+        local message = value.message and (value.title .. ': ' .. value.message) or value.title
+        messages[#messages + 1] = message
         if value.percentage then
           percentage = math.max(percentage or 0, value.percentage)
         end
@@ -922,17 +917,6 @@ function lsp.status()
       -- Just ignore it as there is no sensible way to display it
     end
   end
-  local messages = {}
-  for _, group in pairs(groups) do
-    if group.title then
-      table.insert(
-        messages,
-        group.message and (group.title .. ': ' .. group.message) or group.title
-      )
-    elseif group.message then
-      table.insert(messages, group.message)
-    end
-  end
   local message = table.concat(messages, ', ')
   if percentage then
     return string.format('%3d%%: %s', percentage, message)
-- 
cgit 


From 4e6356559c8cd44dbcaa765d1f39e176064526ec Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 22 Jun 2023 03:44:51 -0700
Subject: test: spellcheck :help (vimdoc) files #24109

Enforce consistent terminology (defined in
`gen_help_html.lua:spell_dict`) for common misspellings.

This does not spellcheck English in general (perhaps a future TODO,
though it may be noisy).
---
 runtime/doc/api.txt         | 48 ++++++++++++++++++++++-----------------------
 runtime/doc/builtin.txt     |  4 ++--
 runtime/doc/develop.txt     |  6 +++---
 runtime/doc/filetype.txt    |  2 +-
 runtime/doc/help.txt        |  2 +-
 runtime/doc/if_perl.txt     |  2 +-
 runtime/doc/if_pyth.txt     |  4 ++--
 runtime/doc/intro.txt       |  2 +-
 runtime/doc/lsp.txt         |  7 +++----
 runtime/doc/lua.txt         | 30 ++++++++++++++--------------
 runtime/doc/message.txt     |  2 +-
 runtime/doc/news-0.9.txt    |  8 ++++----
 runtime/doc/provider.txt    |  2 +-
 runtime/doc/starting.txt    | 42 +++++++++++++++++++--------------------
 runtime/doc/vim_diff.txt    |  2 +-
 runtime/lua/vim/_editor.lua |  6 +++---
 runtime/lua/vim/_meta.lua   |  4 ++--
 runtime/lua/vim/loader.lua  | 22 ++++++++++-----------
 runtime/lua/vim/lsp.lua     |  2 +-
 runtime/lua/vim/lsp/buf.lua |  2 +-
 20 files changed, 99 insertions(+), 100 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 9adca7620f..bd8bce9737 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -7,7 +7,7 @@
 Nvim API                                                           *API* *api*
 
 Nvim exposes a powerful API that can be used by plugins and external processes
-via |RPC|, |Lua| and VimL (|eval-api|).
+via |RPC|, |Lua| and Vimscript (|eval-api|).
 
 Applications can also embed libnvim to work with the C API directly.
 
@@ -587,7 +587,7 @@ nvim__get_runtime({pat}, {all}, {*opts})                 *nvim__get_runtime()*
     Parameters: ~
       • {pat}   pattern of files to search for
       • {all}   whether to return all matches or only the first
-      • {opts}  is_lua: only search lua subdirs
+      • {opts}  is_lua: only search Lua subdirs
 
     Return: ~
         list of absolute paths to the found files
@@ -1203,7 +1203,7 @@ nvim_open_term({buffer}, {opts})                            *nvim_open_term()*
     Parameters: ~
       • {buffer}  the buffer to use (expected to be empty)
       • {opts}    Optional parameters.
-                  • on_input: lua callback for input sent, i e keypresses in
+                  • on_input: Lua callback for input sent, i e keypresses in
                     terminal mode. Note: keypresses are sent raw as they would
                     be to the pty master end. For instance, a carriage return
                     is sent as a "\r", not as a "\n". |textlock| applies. It
@@ -1556,22 +1556,22 @@ Vimscript Functions                                            *api-vimscript*
 
                                                    *nvim_call_dict_function()*
 nvim_call_dict_function({dict}, {fn}, {args})
-    Calls a VimL |Dictionary-function| with the given arguments.
+    Calls a Vimscript |Dictionary-function| with the given arguments.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
-      • {dict}  Dictionary, or String evaluating to a VimL |self| dict
-      • {fn}    Name of the function defined on the VimL dict
+      • {dict}  Dictionary, or String evaluating to a Vimscript |self| dict
+      • {fn}    Name of the function defined on the Vimscript dict
       • {args}  Function arguments packed in an Array
 
     Return: ~
         Result of the function call
 
 nvim_call_function({fn}, {args})                        *nvim_call_function()*
-    Calls a VimL function with the given arguments.
+    Calls a Vimscript function with the given arguments.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
       • {fn}    Function to call
@@ -1583,7 +1583,7 @@ nvim_call_function({fn}, {args})                        *nvim_call_function()*
 nvim_command({command})                                       *nvim_command()*
     Executes an Ex command.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Prefer using |nvim_cmd()| or |nvim_exec2()| over this. To evaluate
     multiple lines of Vim script or an Ex command directly, use
@@ -1595,13 +1595,13 @@ nvim_command({command})                                       *nvim_command()*
       • {command}  Ex command string
 
 nvim_eval({expr})                                                *nvim_eval()*
-    Evaluates a VimL |expression|. Dictionaries and Lists are recursively
+    Evaluates a Vimscript |expression|. Dictionaries and Lists are recursively
     expanded.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
-      • {expr}  VimL expression string
+      • {expr}  Vimscript expression string
 
     Return: ~
         Evaluation result or expanded object
@@ -1613,7 +1613,7 @@ nvim_exec2({src}, {*opts})                                      *nvim_exec2()*
     Unlike |nvim_command()| this function supports heredocs, script-scope
     (s:), etc.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
       • {src}   Vimscript code
@@ -1632,7 +1632,7 @@ nvim_exec2({src}, {*opts})                                      *nvim_exec2()*
 
                                                      *nvim_parse_expression()*
 nvim_parse_expression({expr}, {flags}, {highlight})
-    Parse a VimL expression.
+    Parse a Vimscript expression.
 
     Attributes: ~
         |api-fast|
@@ -1760,7 +1760,7 @@ nvim_cmd({*cmd}, {*opts})                                         *nvim_cmd()*
     example, instead of `vim.cmd.bdelete{ count = 2 }`, you may do
     `vim.cmd.bdelete(2)`.
 
-    On execution error: fails with VimL error, updates v:errmsg.
+    On execution error: fails with Vimscript error, updates v:errmsg.
 
     Parameters: ~
       • {cmd}   Command to execute. Must be a Dictionary that can contain the
@@ -2055,7 +2055,7 @@ nvim_buf_attach({buffer}, {send_buffer}, {opts})           *nvim_buf_attach()*
                          • deleted_codepoints (if `utf_sizes` is true)
                          • deleted_codeunits (if `utf_sizes` is true)
 
-                       • on_bytes: lua callback invoked on change. This
+                       • on_bytes: Lua callback invoked on change. This
                          callback receives more granular information about the
                          change compared to on_lines. Return `true` to detach. Args:
                          • the string "bytes"
@@ -2118,12 +2118,12 @@ nvim_buf_call({buffer}, {fun})                               *nvim_buf_call()*
 
     Parameters: ~
       • {buffer}  Buffer handle, or 0 for current buffer
-      • {fun}     Function to call inside the buffer (currently lua callable
+      • {fun}     Function to call inside the buffer (currently Lua callable
                   only)
 
     Return: ~
-        Return value of function. NB: will deepcopy lua values currently, use
-        upvalues to send lua references in and out.
+        Return value of function. NB: will deepcopy Lua values currently, use
+        upvalues to send Lua references in and out.
 
 nvim_buf_del_keymap({buffer}, {mode}, {lhs})           *nvim_buf_del_keymap()*
     Unmaps a buffer-local |mapping| for the given mode.
@@ -2720,7 +2720,7 @@ nvim_get_namespaces()                                  *nvim_get_namespaces()*
 nvim_set_decoration_provider({ns_id}, {*opts})
     Set or change decoration provider for a |namespace|
 
-    This is a very general purpose interface for having lua callbacks being
+    This is a very general purpose interface for having Lua callbacks being
     triggered during the redraw code.
 
     The expected usage is to set |extmarks| for the currently redrawn buffer.
@@ -2776,12 +2776,12 @@ nvim_win_call({window}, {fun})                               *nvim_win_call()*
 
     Parameters: ~
       • {window}  Window handle, or 0 for current window
-      • {fun}     Function to call inside the window (currently lua callable
+      • {fun}     Function to call inside the window (currently Lua callable
                   only)
 
     Return: ~
-        Return value of function. NB: will deepcopy lua values currently, use
-        upvalues to send lua references in and out.
+        Return value of function. NB: will deepcopy Lua values currently, use
+        upvalues to send Lua references in and out.
 
     See also: ~
       • |win_execute()|
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index f1c4782d1b..1989475164 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5703,7 +5703,7 @@ mode([expr])	Return a string that indicates the current mode.
 			DoFull()->mode()
 
 msgpackdump({list} [, {type}])				*msgpackdump()*
-		Convert a list of VimL objects to msgpack. Returned value is a
+		Convert a list of Vimscript objects to msgpack. Returned value is a
 		|readfile()|-style list. When {type} contains "B", a |Blob| is
 		returned instead. Example: >
 			call writefile(msgpackdump([{}]), 'fname.mpack', 'b')
@@ -5723,7 +5723,7 @@ msgpackdump({list} [, {type}])				*msgpackdump()*
 
 msgpackparse({data})					*msgpackparse()*
 		Convert a |readfile()|-style list or a |Blob| to a list of
-		VimL objects.
+		Vimscript objects.
 		Example: >
 			let fname = expand('~/.config/nvim/shada/main.shada')
 			let mpack = readfile(fname, 'b')
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index be4068d8c8..db878ac304 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -99,8 +99,8 @@ Examples:
    scripting is performed by an external host process implemented in ~2k lines
    of Python.
 
-The provider framework invokes VimL from C.  It is composed of two functions
-in eval.c:
+The provider framework invokes Vimscript from C.  It is composed of two
+functions in eval.c:
 
 - eval_call_provider(name, method, arguments, discard): calls
   provider#{name}#Call with the method and arguments. If discard is true, any
@@ -429,7 +429,7 @@ Examples of API-client package names:
 - GOOD: nvim-racket
 - GOOD: pynvim
 - BAD:  python-client
-- BAD:  neovim
+- BAD:  neovim_
 
 API client implementation guidelines ~
 
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 79894f7c73..d75820732f 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -619,7 +619,7 @@ To use Nvim as a manpager: >
      export MANPAGER='nvim +Man!'
 
 Note that when running `man` from the shell and with that `MANPAGER` in your
-environment, `man` will pre-format the manpage using `groff`. Thus, Neovim
+environment, `man` will pre-format the manpage using `groff`. Thus, Nvim
 will inevitably display the manual page as it was passed to it from stdin. One
 of the caveats of this is that the width will _always_ be hard-wrapped and not
 soft wrapped as with `g:man_hardwrap=0`. You can set in your environment: >
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index aefaa0b7df..651dce08bf 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -100,7 +100,7 @@ ADVANCED EDITING
 ------------------------------------------------------------------------------
 API (EXTENSIBILITY/SCRIPTING/PLUGINS)
 
-|api|			Nvim API via RPC, Lua and VimL
+|api|			Nvim API via RPC, Lua and Vimscript
 |ui|			Nvim UI protocol
 |lua-guide|		Nvim Lua guide
 |lua|			Lua API
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index c3b49dc5bb..1fa96e2657 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -108,7 +108,7 @@ to the next.
 ==============================================================================
 2. The VIM module					*perl-vim*
 
-Perl code gets all of its access to Neovim via the "VIM" module.
+Perl code gets all of its access to Nvim via the "VIM" module.
 
 Overview >
 	print "Hello"				# displays a message
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index a96c9fcc0a..5acc5c0e59 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -575,8 +575,8 @@ Python 3						*python3*
 
 As Python 3 is the only supported version in Nvim, "python" is synonymous
 with "python3" in the current version. However, code that aims to support older
-versions of Neovim, as well as Vim, should prefer to use "python3"
-variants explicitly if Python 3 is required.
+versions of Nvim, as well as Vim, should prefer to use "python3" variants
+explicitly if Python 3 is required.
 
 							*:py3* *:python3*
 :[range]py3 {stmt}
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 15fe3838b7..86f7832376 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -83,7 +83,7 @@ For the most recent information about sponsoring look on the Vim web site:
 	https://www.vim.org/sponsor/
 
 
-Neovim development is funded separately from Vim:
+Nvim development is funded separately from Vim:
 
 	https://neovim.io/#sponsor
 
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 62b280e7f6..6d28b71cdd 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -989,8 +989,8 @@ start_client({config})                                *vim.lsp.start_client()*
                     if `capabilities.offsetEncoding` was sent to it. You can
                     only modify the `client.offset_encoding` here before any
                     notifications are sent. Most language servers expect to be
-                    sent client specified settings after initialization.
-                    Neovim does not make this assumption. A
+                    sent client specified settings after initialization. Nvim
+                    does not make this assumption. A
                     `workspace/didChangeConfiguration` notification should be
                     sent to the server during on_init.
                   • on_exit Callback (code, signal, client_id) invoked on
@@ -1191,8 +1191,7 @@ format({options})                                       *vim.lsp.buf.format()*
                    fields:
                    • formatting_options (table|nil): Can be used to specify
                      FormattingOptions. Some unspecified options will be
-                     automatically derived from the current Neovim options.
-                     See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#formattingOptions
+                     automatically derived from the current Nvim options. See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#formattingOptions
                    • timeout_ms (integer|nil, default 1000): Time in
                      milliseconds to block for formatting requests. No effect
                      if async=true
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 80ef2e358c..c3eaf1ae39 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -34,7 +34,7 @@ Nvim ever ships with Lua 5.4+, a Lua 5.1 compatibility shim will be provided
 so that old plugins continue to work transparently.
 
                                                                   *lua-luajit*
-Neovim is built with luajit on platforms which support it, which provides
+Nvim is built with luajit on platforms which support it, which provides
 extra functionality. Lua code in |init.lua| and plugins can assume its presence
 on installations on common platforms. For maximum compatibility with less
 common platforms, availability can be checked using the `jit` global variable: >lua
@@ -46,7 +46,7 @@ common platforms, availability can be checked using the `jit` global variable: >
 <
                                                                   *lua-bit*
 In particular, the luajit "bit" extension module is _always_ available.
-A fallback implementation is included when nvim is built with PUC lua 5.1,
+A fallback implementation is included when nvim is built with PUC Lua 5.1,
 and will be transparently used when `require("bit")` is invoked.
 
 ==============================================================================
@@ -549,7 +549,7 @@ Multithreading                                            *lua-loop-threading*
 
 Plugins can perform work in separate (os-level) threads using the threading
 APIs in luv, for instance `vim.uv.new_thread`. Note that every thread
-gets its own separate lua interpreter state, with no access to lua globals
+gets its own separate Lua interpreter state, with no access to Lua globals
 in the main thread. Neither can the state of the editor (buffers, windows,
 etc) be directly accessed from threads.
 
@@ -557,10 +557,10 @@ A subset of the `vim.*` API is available in threads. This includes:
 
 - `vim.uv` with a separate event loop per thread.
 - `vim.mpack` and `vim.json` (useful for serializing messages between threads)
-- `require` in threads can use lua packages from the global |package.path|
+- `require` in threads can use Lua packages from the global |package.path|
 - `print()` and `vim.inspect`
 - `vim.diff`
-- most utility functions in `vim.*` for working with pure lua values
+- most utility functions in `vim.*` for working with pure Lua values
   like `vim.split`, `vim.tbl_*`, `vim.list_*`, and so on.
 - `vim.is_thread()` returns true from a non-main thread.
 
@@ -624,7 +624,7 @@ vim.highlight.priorities                            *vim.highlight.priorities*
 ------------------------------------------------------------------------------
 VIM.REGEX                                                          *lua-regex*
 
-Vim regexes can be used directly from lua. Currently they only allow
+Vim regexes can be used directly from Lua. Currently they only allow
 matching within a single line.
 
 vim.regex({re})                                                  *vim.regex()*
@@ -933,8 +933,8 @@ vim.wait({time} [, {callback}, {interval}, {fast_only}])          *vim.wait()*
 
 vim.ui_attach({ns}, {options}, {callback})                *vim.ui_attach()*
     Attach to ui events, similar to |nvim_ui_attach()| but receive events
-    as lua callback. Can be used to implement screen elements like
-    popupmenu or message handling in lua.
+    as Lua callback. Can be used to implement screen elements like
+    popupmenu or message handling in Lua.
 
     {options} should be a dictionary-like table, where `ext_...` options should
     be set to true to receive events for the respective external element.
@@ -1262,7 +1262,7 @@ In any of the above examples, to replicate the behavior |:setlocal|, use
                                                                *vim.opt:get()*
 Option:get()
 
-    Returns a lua-representation of the option. Boolean, number and string
+    Returns a Lua-representation of the option. Boolean, number and string
     values will be returned in exactly the same fashion.
 
     For values that are comma-separated lists, an array will be returned with
@@ -1435,10 +1435,10 @@ keycode({str})                                                 *vim.keycode()*
       • |nvim_replace_termcodes()|
 
 lua_omnifunc({find_start}, {_})                           *vim.lua_omnifunc()*
-    Omnifunc for completing lua values from the runtime lua interpreter,
+    Omnifunc for completing Lua values from the runtime Lua interpreter,
     similar to the builtin completion for the `:lua` command.
 
-    Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a lua buffer.
+    Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a Lua buffer.
 
 notify({msg}, {level}, {opts})                                  *vim.notify()*
     Display a notification to the user.
@@ -2230,17 +2230,17 @@ Lua module: loader                                                *lua-loader*
 disable()                                               *vim.loader.disable()*
     Disables the experimental Lua module loader:
     • removes the loaders
-    • adds the default Neovim loader
+    • adds the default Nvim loader
 
 enable()                                                 *vim.loader.enable()*
     Enables the experimental Lua module loader:
     • overrides loadfile
-    • adds the lua loader using the byte-compilation cache
+    • adds the Lua loader using the byte-compilation cache
     • adds the libs loader
-    • removes the default Neovim loader
+    • removes the default Nvim loader
 
 find({modname}, {opts})                                    *vim.loader.find()*
-    Finds lua modules for the given module name.
+    Finds Lua modules for the given module name.
 
     Parameters: ~
       • {modname}  (string) Module name, or `"*"` to find the top-level
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index dffdb5950f..03f614e841 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -327,7 +327,7 @@ You can switch the 'write' option on with ":set write".
 							*E25*  >
   Nvim does not have a built-in GUI
 
-Neovim does not have a built in GUI, so `:gvim` and `:gui` don't work.
+Nvim does not have a built in GUI, so `:gvim` and `:gui` don't work.
 
 							*E49*  >
   Invalid scroll size
diff --git a/runtime/doc/news-0.9.txt b/runtime/doc/news-0.9.txt
index c7624119e2..5546703dab 100644
--- a/runtime/doc/news-0.9.txt
+++ b/runtime/doc/news-0.9.txt
@@ -109,7 +109,7 @@ The following new APIs or features were added.
   (or the Vimscript equivalent) to their |config| file.
 
 • A new environment variable named NVIM_APPNAME enables configuring the
-  directories where Neovim should find its configuration and state files. See
+  directories where Nvim should find its configuration and state files. See
   `:help $NVIM_APPNAME` .
 
 • Added support for running Lua scripts from shell using |-l|. >
@@ -117,9 +117,9 @@ The following new APIs or features were added.
 <  Also works with stdin: >
       echo "print(42)" | nvim -l -
 
-• Added an omnifunc implementation for lua, |vim.lua_omnifunc()|
+• Added an omnifunc implementation for Lua, |vim.lua_omnifunc()|
 
-• Added a new experimental |lua-loader| that byte-compiles and caches lua files.
+• Added a new experimental |lua-loader| that byte-compiles and caches Lua files.
   To enable the new loader, add the following at the top of your |init.lua|: >lua
     vim.loader.enable()
 
@@ -223,7 +223,7 @@ The following changes to existing APIs or features add new behavior.
 • The `win_viewport` UI event now contains information about virtual lines,
   meaning that smooth scrolling can now be implemented more consistently.
 
-• The `:= {expr}` syntax can be used to evaluate a lua expression, as
+• The `:= {expr}` syntax can be used to evaluate a Lua expression, as
   a shorter form of `:lua ={expr}`. `:=` and `:[range]=` without argument
   are unchanged. However `:=#` and similar variants using |ex-flags|
   are no longer supported.
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index a476a56877..9e70ff8945 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -66,7 +66,7 @@ To disable Python 3 support: >vim
 PYTHON VIRTUALENVS ~
 						*python-virtualenv*
 If you plan to use per-project virtualenvs often, you should assign one
-virtualenv for Neovim and hard-code the interpreter path via
+virtualenv for Nvim and hard-code the interpreter path via
 |g:python3_host_prog| so that the "pynvim" package is not required
 for each virtualenv.
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 51cbf4c93d..28208f68d3 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -241,8 +241,8 @@ argument.
 
 							*-ll*
 -ll {script} [args]
-		Execute a lua script, similarly to |-l|, but the editor is not
-		initialized. This gives a lua environment similar to a worker
+		Execute a Lua script, similarly to |-l|, but the editor is not
+		initialized. This gives a Lua environment similar to a worker
 		thread. See |lua-loop-threading|.
 
 		Unlike `-l` no prior arguments are allowed.
@@ -918,7 +918,7 @@ Shada ("shared data") file			*shada* *shada-file*
 If you exit Vim and later start it again, you would normally lose a lot of
 information.  The ShaDa file can be used to remember that information, which
 enables you to continue where you left off.  Its name is the abbreviation of
-SHAred DAta because it is used for sharing data between Neovim sessions.
+SHAred DAta because it is used for sharing data between Nvim sessions.
 
 This is introduced in section |21.3| of the user manual.
 
@@ -1010,16 +1010,16 @@ MERGING							*shada-merging*
 
 When writing ShaDa files with |:wshada| without bang or at regular exit
 information in the existing ShaDa file is merged with information from current
-Neovim instance.  For this purpose ShaDa files store timestamps associated
+Nvim instance.  For this purpose ShaDa files store timestamps associated
 with ShaDa entries.  Specifically the following is being done:
 
 1. History lines are merged, ordered by timestamp.  Maximum amount of items in
    ShaDa file is defined by 'shada' option (|shada-/|, |shada-:|, |shada-@|,
    etc: one suboption for each character that represents history name
    (|:history|)).
-2. Local marks and changes for files that were not opened by Neovim are copied
-   to new ShaDa file. Marks for files that were opened by Neovim are merged,
-   changes to files opened by Neovim are ignored. |shada-'|
+2. Local marks and changes for files that were not opened by Nvim are copied
+   to new ShaDa file. Marks for files that were opened by Nvim are merged,
+   changes to files opened by Nvim are ignored. |shada-'|
 3. Jump list is merged: jumps are ordered by timestamp, identical jumps
    (identical position AND timestamp) are squashed.
 4. Search patterns and substitute strings are not merged: search pattern or
@@ -1027,14 +1027,14 @@ with ShaDa entries.  Specifically the following is being done:
    to ShaDa file.
 5. For each register entity with greatest timestamp is the only saved.
    |shada-<|
-6. All saved variables are saved from current Neovim instance. Additionally
+6. All saved variables are saved from current Nvim instance. Additionally
    existing variable values are copied, meaning that the only way to remove
    variable from a ShaDa file is either removing it by hand or disabling
    writing variables completely. |shada-!|
 7. For each global mark entity with greatest timestamp is the only saved.
 8. Buffer list and header are the only entries which are not merged in any
    fashion: the only header and buffer list present are the ones from the
-   Neovim instance which was last writing the file. |shada-%|
+   Nvim instance which was last writing the file. |shada-%|
 
 COMPATIBILITY						*shada-compatibility*
 
@@ -1059,13 +1059,13 @@ ShaDa files are forward and backward compatible.  This means that
    history types. |history|
 6. Unknown keys found in register, local mark, global mark, change, jump and
    search pattern entries are saved internally and dumped when writing.
-   Entries created during Neovim session never have such additions.
+   Entries created during Nvim session never have such additions.
 7. Additional elements found in replacement string and history entries are
-   saved internally and dumped. Entries created during Neovim session never
+   saved internally and dumped. Entries created during Nvim session never
    have such additions.
 8. Additional elements found in variable entries are simply ignored when
    reading. When writing new variables they will be preserved during merging,
-   but that's all. Variable values dumped from current Neovim session never
+   but that's all. Variable values dumped from current Nvim session never
    have additional elements, even if variables themselves were obtained by
    reading ShaDa files.
 
@@ -1102,7 +1102,7 @@ start with an existing one to get the format right.  You need to understand
 MessagePack (or, more likely, find software that is able to use it) format to
 do this.  This can be useful in order to create a second file, say
 "~/.my.shada" which could contain certain settings that you always want when
-you first start Neovim.  For example, you can preload registers with
+you first start Nvim.  For example, you can preload registers with
 particular data, or put certain commands in the command line history.  A line
 in your |config| file like >
 	:rshada! ~/.my.shada
@@ -1112,12 +1112,12 @@ file name, using the ":autocmd" command (see |:autocmd|).  More information on
 ShaDa file format is contained in |shada-format| section.
 
 					  *E136* *E929* *shada-error-handling*
-Some errors make Neovim leave temporary file named `{basename}.tmp.X` (X is
+Some errors make Nvim leave temporary file named `{basename}.tmp.X` (X is
 any free letter from `a` to `z`) while normally it will create this file,
 write to it and then rename `{basename}.tmp.X` to `{basename}`. Such errors
 include:
 
-- Errors which make Neovim think that read file is not a ShaDa file at all:
+- Errors which make Nvim think that read file is not a ShaDa file at all:
   non-ShaDa files are not overwritten for safety reasons to avoid accidentally
   destroying an unrelated file.  This could happen e.g. when typing "nvim -i
   file" in place of "nvim -R file" (yes, somebody did that at least with Vim).
@@ -1125,26 +1125,26 @@ include:
 - If writing to the temporary file failed: e.g. because of the insufficient
   space left.
 - If renaming file failed: e.g. because of insufficient permissions.
-- If target ShaDa file has different from the Neovim instance's owners (user
+- If target ShaDa file has different from the Nvim instance's owners (user
   and group) and changing them failed.  Unix-specific, applies only when
-  Neovim was launched from root.
+  Nvim was launched from root.
 
 Do not forget to remove the temporary file or replace the target file with
 temporary one after getting one of the above errors or all attempts to create
 a ShaDa file may fail with |E929|.  If you got one of them when using
-|:wshada| (and not when exiting Neovim: i.e. when you have Neovim session
+|:wshada| (and not when exiting Nvim: i.e. when you have Nvim session
 running) you have additional options:
 
 - First thing which you should consider if you got any error, except failure
   to write to the temporary file: remove existing file and replace it with the
-  temporary file.  Do it even if you have running Neovim instance.
+  temporary file.  Do it even if you have running Nvim instance.
 - Fix the permissions and/or file ownership, free some space and attempt to
   write again.  Do not remove the existing file.
 - Use |:wshada| with bang.  Does not help in case of permission error.  If
   target file was actually the ShaDa file some information may be lost in this
   case.  To make the matters slightly better use |:rshada| prior to writing,
   but this still will loose buffer-local marks and change list entries for any
-  file which is not opened in the current Neovim instance.
+  file which is not opened in the current Nvim instance.
 - Remove the target file from shell and use |:wshada|.  Consequences are not
   different from using |:wshada| with bang, but "rm -f" works in some cases
   when you don't have write permissions.
@@ -1211,7 +1211,7 @@ exactly four MessagePack objects:
                        Key        Data ~
                        generator  Binary, software used to generate ShaDa
                                   file. Is equal to "nvim" when ShaDa file was
-                                  written by Neovim.
+                                  written by Nvim.
                        version    Binary, generator version.
                        encoding   Binary, effective 'encoding' value.
                        max_kbyte  Integer, effective |shada-s| limit value.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index f07fb0902e..89bdaa310e 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -459,7 +459,7 @@ Lua interface (|lua.txt|):
 - `:lua print("a\0b")` will print `a^@b`, like with `:echomsg "a\nb"` . In Vim
   that prints `a` and `b` on separate lines, exactly like
   `:lua print("a\nb")` .
-- `:lua error('TEST')` emits the error “E5105: Error while calling lua chunk:
+- `:lua error('TEST')` emits the error “E5105: Error while calling Lua chunk:
   [string "<VimL compiled string>"]:1: TEST”, whereas Vim emits only “TEST”.
 - Lua has direct access to Nvim |API| via `vim.api`.
 - Lua package.path and package.cpath are automatically updated according to
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 1de2ade1a1..e2ed0d980e 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -3,7 +3,7 @@
 -- Lua code lives in one of three places:
 --    1. runtime/lua/vim/ (the runtime): For "nice to have" features, e.g. the
 --       `inspect` and `lpeg` modules.
---    2. runtime/lua/vim/shared.lua: pure lua functions which always
+--    2. runtime/lua/vim/shared.lua: pure Lua functions which always
 --       are available. Used in the test runner, as well as worker threads
 --       and processes launched from Nvim.
 --    3. runtime/lua/vim/_editor.lua: Code which directly interacts with
@@ -839,10 +839,10 @@ do
   -- some bugs, so fake the two-step dance for now.
   local matches
 
-  --- Omnifunc for completing lua values from the runtime lua interpreter,
+  --- Omnifunc for completing Lua values from the runtime Lua interpreter,
   --- similar to the builtin completion for the `:lua` command.
   ---
-  --- Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a lua buffer.
+  --- Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a Lua buffer.
   function vim.lua_omnifunc(find_start, _)
     if find_start == 1 then
       local line = vim.api.nvim_get_current_line()
diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
index e3ad4d76c9..913f1fe203 100644
--- a/runtime/lua/vim/_meta.lua
+++ b/runtime/lua/vim/_meta.lua
@@ -239,7 +239,7 @@ local to_vim_value = {
   end,
 }
 
---- Convert a lua value to a vimoption_T value
+--- Convert a Lua value to a vimoption_T value
 local function convert_value_to_vim(name, info, value)
   if value == nil then
     return vim.NIL
@@ -250,7 +250,7 @@ local function convert_value_to_vim(name, info, value)
   return to_vim_value[info.metatype](info, value)
 end
 
--- Map of OptionType to functions that take vimoption_T values and convert to lua values.
+-- Map of OptionType to functions that take vimoption_T values and convert to Lua values.
 -- Each function takes (info, vim_value) -> lua_value
 local to_lua_value = {
   boolean = passthrough,
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 9024bdb231..f340dc85b5 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -161,7 +161,7 @@ function Loader.read(name)
   end
 end
 
---- The `package.loaders` loader for lua files using the cache.
+--- The `package.loaders` loader for Lua files using the cache.
 ---@param modname string module name
 ---@return string|function
 ---@private
@@ -211,7 +211,7 @@ end
 ---@private
 -- luacheck: ignore 312
 function Loader.loadfile(filename, mode, env)
-  -- ignore mode, since we byte-compile the lua source files
+  -- ignore mode, since we byte-compile the Lua source files
   mode = nil
   return Loader.load(normalize(filename), { mode = mode, env = env })
 end
@@ -268,7 +268,7 @@ function Loader.load(modpath, opts)
   return chunk, err
 end
 
---- Finds lua modules for the given module name.
+--- Finds Lua modules for the given module name.
 ---@param modname string Module name, or `"*"` to find the top-level modules instead
 ---@param opts? ModuleFindOpts (table|nil) Options for finding a module:
 ---    - rtp: (boolean) Search for modname in the runtime path (defaults to `true`)
@@ -289,7 +289,7 @@ function M.find(modname, opts)
   local idx = modname:find('.', 1, true)
 
   -- HACK: fix incorrect require statements. Really not a fan of keeping this,
-  -- but apparently the regular lua loader also allows this
+  -- but apparently the regular Lua loader also allows this
   if idx == 1 then
     modname = modname:gsub('^%.+', '')
     basename = modname:gsub('%.', '/')
@@ -386,9 +386,9 @@ end
 
 --- Enables the experimental Lua module loader:
 --- * overrides loadfile
---- * adds the lua loader using the byte-compilation cache
+--- * adds the Lua loader using the byte-compilation cache
 --- * adds the libs loader
---- * removes the default Neovim loader
+--- * removes the default Nvim loader
 function M.enable()
   if M.enabled then
     return
@@ -396,11 +396,11 @@ function M.enable()
   M.enabled = true
   vim.fn.mkdir(vim.fn.fnamemodify(M.path, ':p'), 'p')
   _G.loadfile = Loader.loadfile
-  -- add lua loader
+  -- add Lua loader
   table.insert(loaders, 2, Loader.loader)
   -- add libs loader
   table.insert(loaders, 3, Loader.loader_lib)
-  -- remove Neovim loader
+  -- remove Nvim loader
   for l, loader in ipairs(loaders) do
     if loader == vim._load_package then
       table.remove(loaders, l)
@@ -411,7 +411,7 @@ end
 
 --- Disables the experimental Lua module loader:
 --- * removes the loaders
---- * adds the default Neovim loader
+--- * adds the default Nvim loader
 function M.disable()
   if not M.enabled then
     return
@@ -426,8 +426,8 @@ function M.disable()
   table.insert(loaders, 2, vim._load_package)
 end
 
---- Return the top-level `/lua/*` modules for this path
----@param path string path to check for top-level lua modules
+--- Return the top-level \`/lua/*` modules for this path
+---@param path string path to check for top-level Lua modules
 ---@private
 function Loader.lsmod(path)
   if not Loader._indexed[path] then
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 38e0e34790..5b192ca514 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1076,7 +1076,7 @@ end
 ---       `initialize_result.offsetEncoding` if `capabilities.offsetEncoding` was
 ---       sent to it. You can only modify the `client.offset_encoding` here before
 ---       any notifications are sent. Most language servers expect to be sent client specified settings after
----       initialization. Neovim does not make this assumption. A
+---       initialization. Nvim does not make this assumption. A
 ---       `workspace/didChangeConfiguration` notification should be sent
 ---        to the server during on_init.
 ---
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 45056cf272..17b444a6e8 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -159,7 +159,7 @@ end
 --- @param options table|nil Optional table which holds the following optional fields:
 ---     - formatting_options (table|nil):
 ---         Can be used to specify FormattingOptions. Some unspecified options will be
----         automatically derived from the current Neovim options.
+---         automatically derived from the current Nvim options.
 ---         See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#formattingOptions
 ---     - timeout_ms (integer|nil, default 1000):
 ---         Time in milliseconds to block for formatting requests. No effect if async=true
-- 
cgit 


From 2f17ef1fc4b96cf1106fd95ba090d34a2e4b977b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 22 Jun 2023 04:09:14 -0700
Subject: fix(messages): use "Vimscript" instead of "VimL" #24111

followup to #24109
fix #16150
---
 runtime/autoload/msgpack.vim | 8 ++++----
 runtime/autoload/shada.vim   | 2 +-
 runtime/doc/vim_diff.txt     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/msgpack.vim b/runtime/autoload/msgpack.vim
index 7f98a5b230..18dcd1e6a6 100644
--- a/runtime/autoload/msgpack.vim
+++ b/runtime/autoload/msgpack.vim
@@ -101,8 +101,8 @@ function s:msgpack_init_python() abort
   " @return Formatted timestamp.
   "
   " @warning Without +python or +python3 this function does not work correctly. 
-  "          The VimL code contains “reference” implementation which does not 
-  "          really work because of precision loss.
+  "          The Vimscript code contains “reference” implementation which does
+  "          not really work because of precision loss.
   function s:msgpack_dict_strftime(format, timestamp)
     return msgpack#strftime(a:format, +msgpack#int_dict_to_str(a:timestamp))
   endfunction
@@ -541,8 +541,8 @@ let s:MSGPACK_SPECIAL_OBJECTS = {
 \}
 
 ""
-" Convert msgpack object dumped by msgpack#string() to a VimL object suitable 
-" for msgpackdump().
+" Convert msgpack object dumped by msgpack#string() to a Vimscript object
+" suitable for msgpackdump().
 "
 " @param[in]  s             String to evaluate.
 " @param[in]  special_objs  Additional special objects, in the same format as 
diff --git a/runtime/autoload/shada.vim b/runtime/autoload/shada.vim
index 87acc515ee..ae718ad2e7 100644
--- a/runtime/autoload/shada.vim
+++ b/runtime/autoload/shada.vim
@@ -487,7 +487,7 @@ let s:SHADA_ENTRY_OBJECT_SEQUENCE = ['type', 'timestamp', 'length', 'data']
 ""
 " Convert list returned by msgpackparse() to a list of ShaDa objects
 "
-" @param[in]  mpack  List of VimL objects returned by msgpackparse().
+" @param[in]  mpack  List of Vimscript objects returned by msgpackparse().
 "
 " @return List of dictionaries with keys type, timestamp, length and data. Each 
 "         dictionary describes one ShaDa entry.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 89bdaa310e..c44595f237 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -460,7 +460,7 @@ Lua interface (|lua.txt|):
   that prints `a` and `b` on separate lines, exactly like
   `:lua print("a\nb")` .
 - `:lua error('TEST')` emits the error “E5105: Error while calling Lua chunk:
-  [string "<VimL compiled string>"]:1: TEST”, whereas Vim emits only “TEST”.
+  [string "<Vimscript compiled string>"]:1: TEST”, whereas Vim emits only “TEST”.
 - Lua has direct access to Nvim |API| via `vim.api`.
 - Lua package.path and package.cpath are automatically updated according to
   'runtimepath': |lua-require|.
-- 
cgit 


From 134b9ec483616e20d96c26fdb7ef3f3e912108a8 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Thu, 22 Jun 2023 13:54:35 +0200
Subject: feat(lsp): soft deprecate vim.lsp.for_each_buffer_client (#24104)

There is no need for two ways to access all clients of a buffer.

This doesn't add a `vim.deprecate` call yet, as the function is probably
used a lot, but removes it from the documentation and annotates it with
`@deprecated`
---
 runtime/doc/deprecated.txt |  1 +
 runtime/doc/lsp.txt        | 15 ------------
 runtime/doc/news.txt       |  1 +
 runtime/lua/vim/lsp.lua    | 60 ++++++++++++++++++++++------------------------
 4 files changed, 31 insertions(+), 46 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 6fb11f0987..9a622741b5 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -139,6 +139,7 @@ LSP FUNCTIONS
 						or |vim.lsp.buf.format()| instead.
 - *vim.lsp.util.get_progress_messages()*	Use |vim.lsp.status()| or access
 						`progress` of |vim.lsp.client|
+- *vim.lsp.for_each_buffer_client()*		Use |vim.lsp.get_active_clients()|
 
 TREESITTER FUNCTIONS
 - *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 6d28b71cdd..055aff2210 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -751,21 +751,6 @@ client_is_stopped({client_id})                   *vim.lsp.client_is_stopped()*
     Return: ~
         (boolean) stopped true if client is stopped, false otherwise.
 
-                                            *vim.lsp.for_each_buffer_client()*
-for_each_buffer_client({bufnr}, {fn})
-    Invokes a function for each LSP client attached to a buffer.
-
-    Parameters: ~
-      • {bufnr}  (integer) Buffer number
-      • {fn}     (function) Function to run on each client attached to buffer
-                 {bufnr}. The function takes the client, client ID, and buffer
-                 number as arguments. Example: >lua
-
-                   vim.lsp.for_each_buffer_client(0, function(client, client_id, bufnr)
-                     print(vim.inspect(client))
-                   end)
-<
-
 formatexpr({opts})                                      *vim.lsp.formatexpr()*
     Provides an interface between the built-in client and a `formatexpr`
     function.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 292b0da1af..153441b0a5 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -167,6 +167,7 @@ release.
 
 • vim.lsp functions:
   - |vim.lsp.util.get_progress_messages()|	Use |vim.lsp.status()| instead.
+  - |vim.lsp.for_each_buffer_client()|	  	Use |vim.lsp.get_active_clients()| instead.
 
 • `vim.loop` has been renamed to `vim.uv`.
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 5b192ca514..970bb56478 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1740,7 +1740,7 @@ local function text_document_did_save_handler(bufnr)
   bufnr = resolve_bufnr(bufnr)
   local uri = vim.uri_from_bufnr(bufnr)
   local text = once(buf_get_full_text)
-  for_each_buffer_client(bufnr, function(client)
+  for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
     local name = api.nvim_buf_get_name(bufnr)
     local old_name = changetracking._get_and_set_name(client, bufnr, name)
     if old_name and name ~= old_name then
@@ -1772,7 +1772,7 @@ local function text_document_did_save_handler(bufnr)
         text = included_text,
       })
     end
-  end)
+  end
 end
 
 --- Implements the `textDocument/did…` notifications required to track a buffer
@@ -1808,7 +1808,7 @@ function lsp.buf_attach_client(bufnr, client_id)
       buffer = bufnr,
       desc = 'vim.lsp: textDocument/willSave',
       callback = function(ctx)
-        for_each_buffer_client(ctx.buf, function(client)
+        for _, client in ipairs(lsp.get_active_clients({ bufnr = ctx.buf })) do
           local params = {
             textDocument = {
               uri = uri,
@@ -1827,7 +1827,7 @@ function lsp.buf_attach_client(bufnr, client_id)
               log.error(vim.inspect(err))
             end
           end
-        end)
+        end
       end,
     })
     api.nvim_create_autocmd('BufWritePost', {
@@ -1843,23 +1843,23 @@ function lsp.buf_attach_client(bufnr, client_id)
       on_lines = text_document_did_change_handler,
       on_reload = function()
         local params = { textDocument = { uri = uri } }
-        for_each_buffer_client(bufnr, function(client, _)
+        for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
           changetracking.reset_buf(client, bufnr)
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
             client.notify('textDocument/didClose', params)
           end
           text_document_did_open_handler(bufnr, client)
-        end)
+        end
       end,
       on_detach = function()
         local params = { textDocument = { uri = uri } }
-        for_each_buffer_client(bufnr, function(client, _)
+        for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
           changetracking.reset_buf(client, bufnr)
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
             client.notify('textDocument/didClose', params)
           end
           client.attached_buffers[bufnr] = nil
-        end)
+        end
         util.buf_versions[bufnr] = nil
         all_buffer_active_clients[bufnr] = nil
       end,
@@ -1932,7 +1932,7 @@ function lsp.buf_detach_client(bufnr, client_id)
     all_buffer_active_clients[bufnr] = nil
   end
 
-  local namespace = vim.lsp.diagnostic.get_namespace(client_id)
+  local namespace = lsp.diagnostic.get_namespace(client_id)
   vim.diagnostic.reset(namespace, bufnr)
 
   vim.notify(string.format('Detached buffer (id: %d) from client (id: %d)', bufnr, client_id))
@@ -2104,34 +2104,30 @@ function lsp.buf_request(bufnr, method, params, handler)
     handler = { handler, 'f', true },
   })
 
-  local supported_clients = {}
+  bufnr = resolve_bufnr(bufnr)
   local method_supported = false
-  for_each_buffer_client(bufnr, function(client, client_id)
+  local clients = lsp.get_active_clients({ bufnr = bufnr })
+  local client_request_ids = {}
+  for _, client in ipairs(clients) do
     if client.supports_method(method, { bufnr = bufnr }) then
       method_supported = true
-      table.insert(supported_clients, client_id)
+
+      local request_success, request_id = client.request(method, params, handler, bufnr)
+      -- This could only fail if the client shut down in the time since we looked
+      -- it up and we did the request, which should be rare.
+      if request_success then
+        client_request_ids[client.id] = request_id
+      end
     end
-  end)
+  end
 
   -- if has client but no clients support the given method, notify the user
-  if
-    not tbl_isempty(all_buffer_active_clients[resolve_bufnr(bufnr)] or {}) and not method_supported
-  then
+  if next(clients) and not method_supported then
     vim.notify(lsp._unsupported_method(method), vim.log.levels.ERROR)
     nvim_command('redraw')
     return {}, function() end
   end
 
-  local client_request_ids = {}
-  for_each_buffer_client(bufnr, function(client, client_id, resolved_bufnr)
-    local request_success, request_id = client.request(method, params, handler, resolved_bufnr)
-    -- This could only fail if the client shut down in the time since we looked
-    -- it up and we did the request, which should be rare.
-    if request_success then
-      client_request_ids[client_id] = request_id
-    end
-  end, supported_clients)
-
   local function _cancel_all_requests()
     for client_id, request_id in pairs(client_request_ids) do
       local client = active_clients[client_id]
@@ -2159,11 +2155,11 @@ function lsp.buf_request_all(bufnr, method, params, handler)
   local expected_result_count = 0
 
   local set_expected_result_count = once(function()
-    for_each_buffer_client(bufnr, function(client)
+    for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
       if client.supports_method(method, { bufnr = bufnr }) then
         expected_result_count = expected_result_count + 1
       end
-    end)
+    end
   end)
 
   local function _sync_handler(err, result, ctx)
@@ -2226,11 +2222,11 @@ function lsp.buf_notify(bufnr, method, params)
     method = { method, 's' },
   })
   local resp = false
-  for_each_buffer_client(bufnr, function(client, _client_id, _resolved_bufnr)
+  for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
     if client.rpc.notify(method, params) then
       resp = true
     end
-  end)
+  end
   return resp
 end
 
@@ -2371,7 +2367,7 @@ function lsp.formatexpr(opts)
       local response =
         client.request_sync('textDocument/rangeFormatting', params, timeout_ms, bufnr)
       if response.result then
-        vim.lsp.util.apply_text_edits(response.result, 0, client.offset_encoding)
+        lsp.util.apply_text_edits(response.result, 0, client.offset_encoding)
         return 0
       end
     end
@@ -2452,6 +2448,7 @@ function lsp.get_log_path()
   return log.get_filename()
 end
 
+---@private
 --- Invokes a function for each LSP client attached to a buffer.
 ---
 ---@param bufnr integer Buffer number
@@ -2463,6 +2460,7 @@ end
 ---                 print(vim.inspect(client))
 ---               end)
 ---             </pre>
+---@deprecated use lsp.get_active_clients({ bufnr = bufnr }) with regular loop
 function lsp.for_each_buffer_client(bufnr, fn)
   return for_each_buffer_client(bufnr, fn)
 end
-- 
cgit 


From f0884f21fa0cccc576f00bc18895cc80ba906031 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 22 Jun 2023 20:39:35 +0800
Subject: feat(extmarks): support hl_mode "combine" for inline virt_text
 (#24099)

---
 runtime/doc/api.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index bd8bce9737..8c79279361 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2630,9 +2630,10 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {*opts})
                     highlights of the text. Currently only affects virt_text
                     highlights, but might affect `hl_group` in later versions.
                     • "replace": only show the virt_text color. This is the
-                      default
-                    • "combine": combine with background text color
-                    • "blend": blend with background text color.
+                      default.
+                    • "combine": combine with background text color.
+                    • "blend": blend with background text color. Not supported
+                      for "inline" virt_text.
 
                   • virt_lines : virtual lines to add next to this mark This
                     should be an array over lines, where each line in turn is
-- 
cgit 


From 904ad5458de095fec563fb9180fed2c4c87331e1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 22 Jun 2023 19:38:49 +0200
Subject: vim-patch:9.0.1645: zserio files are not recognized (#24120)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    zserio files are not recognized.
Solution:   Add a pattern for zserio files. (Dominique Pellé,
            closes vim/vim#12544)

https://github.com/vim/vim/commit/2b994da57a0ac6ec0ec09fe3783f48ecd2bce610

Co-authored-by: =?UTF-8?q?Dominique=20Pell=C3=A9?= <dominique.pelle@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index fc8871f593..08a042d376 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1174,6 +1174,7 @@ local extension = {
   zir = 'zir',
   zu = 'zimbu',
   zut = 'zimbutempl',
+  zs = 'zserio',
   zsh = 'zsh',
   vala = 'vala',
   web = function(path, bufnr)
-- 
cgit 


From 12c2c16acf7051d364d29cfd71f2542b0943d8e8 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:39:57 +0200
Subject: feat(lsp): opt-in to dynamicRegistration for inlay hints (#24102)

Since https://github.com/neovim/neovim/pull/23681 there is dynamic
registration support. We should use that for new features unless there
is a good reason to turn it off.
---
 runtime/lua/vim/lsp/protocol.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index b3a7903420..ea38bfe237 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -642,7 +642,7 @@ function protocol.make_client_capabilities()
     },
     textDocument = {
       inlayHint = {
-        dynamicRegistration = false,
+        dynamicRegistration = true,
         resolveSupport = {
           properties = {},
         },
-- 
cgit 


From 94a904b453e5fe5b2cb098828c093e34246d4125 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Fri, 23 Jun 2023 17:19:54 +0530
Subject: fix(lsp): reapplying already-applied hints #24114

Problem:
The decoration provider clears the whole buffer then redraws all the hints every
time the window was redrawn. This may lead to an infinite loop.

Solution:
Store the last applied version for a line and only clear and redraw the line if
the buffer version has changed.
---
 runtime/lua/vim/lsp/_inlay_hint.lua | 54 ++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
index 8edf14e707..66fed4f350 100644
--- a/runtime/lua/vim/lsp/_inlay_hint.lua
+++ b/runtime/lua/vim/lsp/_inlay_hint.lua
@@ -8,6 +8,7 @@ local M = {}
 ---@field client_hint table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
 ---@field enabled boolean Whether inlay hints are enabled for the buffer
 ---@field timer uv.uv_timer_t? Debounce timer associated with the buffer
+---@field applied table<integer, integer> Last version of hints applied to this line
 
 ---@type table<integer, lsp._inlay_hint.bufstate>
 local bufstates = {}
@@ -169,7 +170,7 @@ function M.enable(bufnr)
   bufnr = resolve_bufnr(bufnr)
   local bufstate = bufstates[bufnr]
   if not (bufstate and bufstate.enabled) then
-    bufstates[bufnr] = { enabled = true, timer = nil }
+    bufstates[bufnr] = { enabled = true, timer = nil, applied = {} }
     M.refresh({ bufnr = bufnr })
     api.nvim_buf_attach(bufnr, true, {
       on_lines = function(_, cb_bufnr)
@@ -238,35 +239,38 @@ api.nvim_set_decoration_provider(namespace, {
       return
     end
     local hints_by_client = bufstate.client_hint
-    api.nvim_buf_clear_namespace(bufnr, namespace, 0, -1)
 
     for lnum = topline, botline do
-      for _, hints_by_lnum in pairs(hints_by_client) do
-        local line_hints = hints_by_lnum[lnum] or {}
-        for _, hint in pairs(line_hints) do
-          local text = ''
-          if type(hint.label) == 'string' then
-            text = hint.label
-          else
-            for _, part in ipairs(hint.label) do
-              text = text .. part.value
+      if bufstate.applied[lnum] ~= bufstate.version then
+        api.nvim_buf_clear_namespace(bufnr, namespace, lnum, lnum + 1)
+        for _, hints_by_lnum in pairs(hints_by_client) do
+          local line_hints = hints_by_lnum[lnum] or {}
+          for _, hint in pairs(line_hints) do
+            local text = ''
+            if type(hint.label) == 'string' then
+              text = hint.label
+            else
+              for _, part in ipairs(hint.label) do
+                text = text .. part.value
+              end
             end
+            local vt = {}
+            if hint.paddingLeft then
+              vt[#vt + 1] = { ' ' }
+            end
+            vt[#vt + 1] = { text, 'LspInlayHint' }
+            if hint.paddingRight then
+              vt[#vt + 1] = { ' ' }
+            end
+            api.nvim_buf_set_extmark(bufnr, namespace, lnum, hint.position.character, {
+              virt_text_pos = 'inline',
+              ephemeral = false,
+              virt_text = vt,
+              hl_mode = 'combine',
+            })
           end
-          local vt = {}
-          if hint.paddingLeft then
-            vt[#vt + 1] = { ' ' }
-          end
-          vt[#vt + 1] = { text, 'LspInlayHint' }
-          if hint.paddingRight then
-            vt[#vt + 1] = { ' ' }
-          end
-          api.nvim_buf_set_extmark(bufnr, namespace, lnum, hint.position.character, {
-            virt_text_pos = 'inline',
-            ephemeral = false,
-            virt_text = vt,
-            hl_mode = 'combine',
-          })
         end
+        bufstate.applied[lnum] = bufstate.version
       end
     end
   end,
-- 
cgit 


From 4dc86477b674d056b137a3afafd8824f7b7717ec Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Fri, 23 Jun 2023 19:54:47 +0800
Subject: build(luarc.json): disable luadoc-miss-see-name #24108

---
 runtime/lua/vim/lsp.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 970bb56478..2c115007de 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1183,7 +1183,7 @@ function lsp.start_client(config)
   ---
   ---@param code (integer) Error code
   ---@param err (...) Other arguments may be passed depending on the error kind
-  ---@see `vim.lsp.rpc.client_errors` for possible errors. Use
+  ---@see vim.lsp.rpc.client_errors for possible errors. Use
   ---`vim.lsp.rpc.client_errors[code]` to get a human-friendly name.
   function dispatch.on_error(code, err)
     if log.error() then
@@ -2366,7 +2366,7 @@ function lsp.formatexpr(opts)
       }
       local response =
         client.request_sync('textDocument/rangeFormatting', params, timeout_ms, bufnr)
-      if response.result then
+      if response and response.result then
         lsp.util.apply_text_edits(response.result, 0, client.offset_encoding)
         return 0
       end
-- 
cgit 


From fdf5013e218c55ca8f9bdb7cf5f16f8596330ea2 Mon Sep 17 00:00:00 2001
From: smjonas <jonas.strittmatter@gmx.de>
Date: Wed, 21 Jun 2023 07:12:53 +0200
Subject: fix(filetype): correctly detect bash-fc-{id} files as "sh"

---
 runtime/lua/vim/filetype.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index fc8871f593..91d5dc1c62 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2188,7 +2188,7 @@ local pattern = {
   ['.*/etc/profile'] = function(path, bufnr)
     return require('vim.filetype.detect').sh(path, M.getlines(bufnr))
   end,
-  ['bash%-fc[%-%.]'] = function(path, bufnr)
+  ['bash%-fc[%-%.].*'] = function(path, bufnr)
     return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
   end,
   ['%.tcshrc.*'] = function(path, bufnr)
-- 
cgit 


From fa0a25dcb3a4fd2d6f03e09bcc7edac2f9ea8ded Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Sat, 24 Jun 2023 05:03:15 +0530
Subject: fix(lsp): error in reset_timer on second detach #24117

Problem:
On running `zig fmt` manually, the on_lines callback and the
server both detach (for some reason), and both of them call
`clear()`. This fixes it, otherwise the second one to detach
has an error in `reset_timer` since the bufstate doesn't exist

Solution:
* exit early in clear if `bufstates[bufnr]` is nil
* set bufstatte.enabled to true on reload instead of making bufstate nil
---
 runtime/lua/vim/lsp/_inlay_hint.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
index 66fed4f350..84794841ae 100644
--- a/runtime/lua/vim/lsp/_inlay_hint.lua
+++ b/runtime/lua/vim/lsp/_inlay_hint.lua
@@ -144,6 +144,9 @@ end
 ---@private
 local function clear(bufnr)
   bufnr = resolve_bufnr(bufnr)
+  if not bufstates[bufnr] then
+    return
+  end
   reset_timer(bufnr)
   local bufstate = bufstates[bufnr]
   local client_lens = (bufstate or {}).client_hint or {}
@@ -184,7 +187,9 @@ function M.enable(bufnr)
       end,
       on_reload = function(_, cb_bufnr)
         clear(cb_bufnr)
-        bufstates[cb_bufnr] = nil
+        if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
+          bufstates[cb_bufnr] = { enabled = true }
+        end
         M.refresh({ bufnr = cb_bufnr })
       end,
       on_detach = function(_, cb_bufnr)
-- 
cgit 


From 57fda7688b815f1d99e645d371a06332948ac197 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 24 Jun 2023 22:14:57 +0800
Subject: vim-patch:9.0.1659: Termdebug: default highlight cleared if changing
 colorscheme (#24139)

Problem:    Termdebug: default highlight cleared when changing colorscheme.
Solution:   Use a ColorScheme autocommand. (Christian Brabandt, closes vim/vim#12566,
            closes vim/vim#12555)

https://github.com/vim/vim/commit/279de0cd1f58ea520826a3dd1c5562a71157b23b

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 25 ++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 43c3d7541f..7140c275e6 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -2,7 +2,7 @@
 "
 " Author: Bram Moolenaar
 " Copyright: Vim license applies, see ":help license"
-" Last Change: 2022 Nov 10
+" Last Change: 2023 Jun 24
 "
 " WORK IN PROGRESS - The basics works stable, more to come
 " Note: In general you need at least GDB 7.12 because this provides the
@@ -87,6 +87,8 @@ func s:Breakpoint2SignNumber(id, subid)
   return s:break_id + a:id * 1000 + a:subid
 endfunction
 
+" Define or adjust the default highlighting, using background "new".
+" When the 'background' option is set then "old" has the old value.
 func s:Highlight(init, old, new)
   let default = a:init ? 'default ' : ''
   if a:new ==# 'light' && a:old !=# 'light'
@@ -96,9 +98,21 @@ func s:Highlight(init, old, new)
   endif
 endfunc
 
-call s:Highlight(1, '', &background)
-hi default debugBreakpoint term=reverse ctermbg=red guibg=red
-hi default debugBreakpointDisabled term=reverse ctermbg=gray guibg=gray
+" Define the default highlighting, using the current 'background' value.
+func s:InitHighlight()
+  call s:Highlight(1, '', &background)
+  hi default debugBreakpoint term=reverse ctermbg=red guibg=red
+  hi default debugBreakpointDisabled term=reverse ctermbg=gray guibg=gray
+endfunc
+
+" Setup an autocommand to redefine the default highlight when the colorscheme
+" is changed.
+func s:InitAutocmd()
+  augroup TermDebug
+    autocmd!
+    autocmd ColorScheme * call s:InitHighlight()
+  augroup END
+endfunc
 
 " Get the command to execute the debugger as a list, defaults to ["gdb"].
 func s:GetCommand()
@@ -1664,5 +1678,8 @@ func s:BufUnloaded()
   endfor
 endfunc
 
+call s:InitHighlight()
+call s:InitAutocmd()
+
 let &cpo = s:keepcpo
 unlet s:keepcpo
-- 
cgit 


From cc624fac683ce6dbd01f10781817cd654cceed38 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 24 Jun 2023 20:04:30 +0200
Subject: vim-patch:9.0.1661: BUCK files are not recognized (#24142)

Problem:    BUCK files are not recognized.
Solution:   Recognize BUCK files as "bzl". (Son Luong Ngoc, closes vim/vim#12564)

https://github.com/vim/vim/commit/b46e0f3263acd99c61df06ee3c4d1f6e0b471bc3

Co-authored-by: Son Luong Ngoc <sluongng@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 33e80690ff..7bcc67313d 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1372,6 +1372,7 @@ local filename = {
   ['named.root'] = 'bindzone',
   WORKSPACE = 'bzl',
   ['WORKSPACE.bzlmod'] = 'bzl',
+  BUCK = 'bzl',
   BUILD = 'bzl',
   ['cabal.project'] = 'cabalproject',
   ['cabal.config'] = 'cabalconfig',
-- 
cgit 


From e59cf3b3a9ee0f9e9b4d2e01059dbdf185eb5685 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 25 Jun 2023 08:12:41 +0800
Subject: vim-patch:9.0.1663: Termdebug on MS-Windows: some file names are not
 recognized (#24145)

Problem:    Termdebug on MS-Windows: some file names are not recognized.
Solution:   Do not always change \t and \n. (Christian Brabandt,
            closes vim/vim#12565, closes vim/vim#12560, closes vim/vim#12550)

https://github.com/vim/vim/commit/c9a4a8ab28da2b11856a3f08ccba2e91f46b85c3

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 7140c275e6..d4b49e85c8 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -640,7 +640,7 @@ func s:GdbOutCallback(job_id, msgs, event)
   for msg in a:msgs
     if msg =~ '^\^error,msg='
       if exists('s:evalexpr')
-            \ && s:DecodeMessage(msg[11:])
+            \ && s:DecodeMessage(msg[11:], v:false)
             \    =~ 'A syntax error in expression, near\|No symbol .* in current context'
         " Silently drop evaluation errors.
         call remove(a:msgs, index)
@@ -648,7 +648,7 @@ func s:GdbOutCallback(job_id, msgs, event)
         continue
       endif
     elseif msg[0] == '~'
-      call add(lines, s:DecodeMessage(msg[1:]))
+      call add(lines, s:DecodeMessage(msg[1:], v:false))
       call remove(a:msgs, index)
       continue
     endif
@@ -670,21 +670,20 @@ func s:GdbOutCallback(job_id, msgs, event)
   call s:CommOutput(a:job_id, a:msgs, a:event)
 endfunc
 
-" Decode a message from gdb.  quotedText starts with a ", return the text up
+" Decode a message from gdb.  "quotedText" starts with a ", return the text up
 " to the next ", unescaping characters:
-" - remove line breaks
-" - change \\t to \t
+" - remove line breaks (unless "literal" is v:true)
+" - change \\t to \t (unless "literal" is v:true)
 " - change \0xhh to \xhh (disabled for now)
 " - change \ooo to octal
 " - change \\ to \
-func s:DecodeMessage(quotedText)
+func s:DecodeMessage(quotedText, literal)
   if a:quotedText[0] != '"'
     echoerr 'DecodeMessage(): missing quote in ' . a:quotedText
     return
   endif
-  return a:quotedText
-        \ ->substitute('^"\|".*\|\\n', '', 'g')
-        \ ->substitute('\\t', "\t", 'g')
+  let msg = a:quotedText
+        \ ->substitute('^"\|".*', '', 'g')
         " multi-byte characters arrive in octal form
         " NULL-values must be kept encoded as those break the string otherwise
         \ ->substitute('\\000', s:NullRepl, 'g')
@@ -696,6 +695,13 @@ func s:DecodeMessage(quotedText)
         " \ ->substitute('\\0x00', s:NullRepl, 'g')
         \ ->substitute('\\\\', '\', 'g')
         \ ->substitute(s:NullRepl, '\\000', 'g')
+  if !a:literal
+          return msg
+        \ ->substitute('\\t', "\t", 'g')
+        \ ->substitute('\\n', '', 'g')
+  else
+          return msg
+  endif
 endfunc
 const s:NullRepl = 'XXXNULLXXX'
 
@@ -704,7 +710,7 @@ func s:GetFullname(msg)
   if a:msg !~ 'fullname'
     return ''
   endif
-  let name = s:DecodeMessage(substitute(a:msg, '.*fullname=', '', ''))
+  let name = s:DecodeMessage(substitute(a:msg, '.*fullname=', '', ''), v:true)
   if has('win32') && name =~ ':\\\\'
     " sometimes the name arrives double-escaped
     let name = substitute(name, '\\\\', '\\', 'g')
@@ -717,11 +723,11 @@ func s:GetAsmAddr(msg)
   if a:msg !~ 'addr='
     return ''
   endif
-  let addr = s:DecodeMessage(substitute(a:msg, '.*addr=', '', ''))
+  let addr = s:DecodeMessage(substitute(a:msg, '.*addr=', '', ''), v:false)
   return addr
 endfunc
 
-function s:EndTermDebug(job_id, exit_code, event)
+func s:EndTermDebug(job_id, exit_code, event)
   let s:running = v:false
   if s:starting
     return
-- 
cgit 


From 502a7a0558b0f8f81edcc3eb081587fd180d14f0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 25 Jun 2023 12:34:30 +0200
Subject: fix(ftplugin): respect runtimepath ordering

Problem: bundled `ftplugin/foo/*.vim` are sourced before user
`ftplugin/foo.vim`.

Solution: call `runtime!` once on all patterns to be sourced.

Followup to #23801. Fixes #24003.
---
 runtime/ftplugin.vim | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim
index d24c0a036e..f5c411fbe6 100644
--- a/runtime/ftplugin.vim
+++ b/runtime/ftplugin.vim
@@ -30,9 +30,10 @@ augroup filetypeplugin
       for name in split(s, '\.')
         " Load Lua ftplugins after Vim ftplugins _per directory_
         " TODO(clason): use nvim__get_runtime when supports globs and modeline
-        exe printf('runtime! ftplugin/%s.vim ftplugin/%s.lua', name, name)
-        exe printf('runtime! ftplugin/%s_*.vim ftplugin/%s_*.lua', name, name)
-        exe printf('runtime! ftplugin/%s/*.vim ftplugin/%s/*.lua', name, name)
+        exe printf('runtime! ftplugin/%s.vim ftplugin/%s.lua
+                           \ ftplugin/%s_*.vim ftplugin/%s_*.lua
+                           \ ftplugin/%s/*.vim ftplugin/%s/*.lua',
+                           \ name, name, name, name, name, name)
       endfor
     endif
   endfunc
-- 
cgit 


From 036da0d07921e67090d1a62c9a4e382ca09d8584 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 24 Jun 2023 13:47:10 +0200
Subject: fix(docs): vimdoc syntax errors

gen_help_html: truncate parse-error sample text
---
 runtime/doc/builtin.txt       |   24 +-
 runtime/doc/change.txt        |   18 +-
 runtime/doc/cmdline.txt       |   10 +-
 runtime/doc/deprecated.txt    |    6 +-
 runtime/doc/digraph.txt       | 2614 +++++++++++++++++++++--------------------
 runtime/doc/editing.txt       |   10 +-
 runtime/doc/eval.txt          |   14 +-
 runtime/doc/fold.txt          |    2 +-
 runtime/doc/ft_ada.txt        |    4 +-
 runtime/doc/ft_raku.txt       |    8 +-
 runtime/doc/ft_sql.txt        |    4 +-
 runtime/doc/gui.txt           |   11 +-
 runtime/doc/helphelp.txt      |    8 +-
 runtime/doc/if_pyth.txt       |    4 +-
 runtime/doc/indent.txt        |    4 +-
 runtime/doc/intro.txt         |   19 +-
 runtime/doc/lsp.txt           |   12 +-
 runtime/doc/map.txt           |    3 +-
 runtime/doc/mbyte.txt         |  144 ---
 runtime/doc/message.txt       |    8 +-
 runtime/doc/motion.txt        |    2 +-
 runtime/doc/options.txt       |   11 +-
 runtime/doc/pi_gzip.txt       |    2 +-
 runtime/doc/pi_msgpack.txt    |    2 +-
 runtime/doc/pi_tar.txt        |    8 +-
 runtime/doc/pi_zip.txt        |   10 +-
 runtime/doc/quickfix.txt      |   16 +-
 runtime/doc/remote_plugin.txt |    2 +-
 runtime/doc/scroll.txt        |    3 -
 runtime/doc/starting.txt      |    4 +-
 runtime/doc/tagsrch.txt       |    4 +-
 runtime/doc/tips.txt          |    4 +-
 runtime/doc/usr_09.txt        |   10 +-
 runtime/doc/usr_12.txt        |    4 +-
 runtime/doc/usr_21.txt        |    2 +-
 runtime/doc/usr_22.txt        |    4 +-
 runtime/doc/usr_24.txt        |   18 +-
 runtime/doc/usr_28.txt        |    4 +-
 runtime/doc/usr_29.txt        |   24 +-
 runtime/doc/usr_30.txt        |   40 +-
 runtime/doc/usr_40.txt        |    4 +-
 runtime/doc/usr_43.txt        |    4 +-
 runtime/doc/vi_diff.txt       |    6 +-
 runtime/doc/windows.txt       |    6 +-
 runtime/lua/vim/iter.lua      |    2 +-
 runtime/lua/vim/lsp/buf.lua   |    6 +-
 runtime/lua/vim/lsp/util.lua  |    8 +-
 47 files changed, 1496 insertions(+), 1641 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 1989475164..1cbc9135d3 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1939,7 +1939,7 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is
 			$ENVNAME	environment variable (could also be
 					done by comparing with an empty
 					string)
-			*funcname	built-in function (see |functions|)
+			`*funcname`	built-in function (see |functions|)
 					or user defined function (see
 					|user-function|). Also works for a
 					variable that is a Funcref.
@@ -3019,7 +3019,7 @@ getcmdtype()						*getcmdtype()*
 		    /	forward search command
 		    ?	backward search command
 		    @	|input()| command
-		    -	|:insert| or |:append| command
+		    `-`	|:insert| or |:append| command
 		    =	|i_CTRL-R_=|
 		Only works when editing the command line, thus requires use of
 		|c_CTRL-\_e| or |c_CTRL-R_=| or an expression mapping.
@@ -3364,20 +3364,26 @@ getmatches([{win}])					*getmatches()*
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.  If {win} is invalid,
 		an empty list is returned.
-		Example: >
+		Example: >vim
 			:echo getmatches()
-<			[{"group": "MyGroup1", "pattern": "TODO",
+>
+ 			[{"group": "MyGroup1", "pattern": "TODO",
 			"priority": 10, "id": 1}, {"group": "MyGroup2",
-			"pattern": "FIXME", "priority": 10, "id": 2}] >
+			"pattern": "FIXME", "priority": 10, "id": 2}]
+>vim
 			:let m = getmatches()
 			:call clearmatches()
 			:echo getmatches()
-<			[] >
+>
+			[]
+>vim
 			:call setmatches(m)
 			:echo getmatches()
-<			[{"group": "MyGroup1", "pattern": "TODO",
+>
+			[{"group": "MyGroup1", "pattern": "TODO",
 			"priority": 10, "id": 1}, {"group": "MyGroup2",
-			"pattern": "FIXME", "priority": 10, "id": 2}] >
+			"pattern": "FIXME", "priority": 10, "id": 2}]
+>vim
 			:unlet m
 <
 getmousepos()						*getmousepos()*
@@ -8268,7 +8274,7 @@ string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
 			Funcref		`function('name')`
 			Blob		0z00112233.44556677.8899
 			List		[item, item]
-			Dictionary	{key: value, key: value}
+			Dictionary	`{key: value, key: value}`
 		Note that in String values the ' character is doubled.
 		Also see |strtrans()|.
 		Note 2: Output format is mostly compatible with YAML, except
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 96af05bc63..894557818b 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1490,7 +1490,7 @@ white space).  Three types of comments can be used:
   lines.  An example is this list with dashes.
 - Three-piece comments that have a start string, an end string, and optional
   lines in between.  The strings for the start, middle and end are different.
-  An example is the C style comment:
+  An example is the C style comment: >
 	/*
 	 * this is a C comment
 	 */
@@ -1565,20 +1565,20 @@ When you hit Return in a C-comment, Vim will insert the middle comment leader
 for the new line: " * ".  To close this comment you just have to type "/"
 before typing anything else on the new line.  This will replace the
 middle-comment leader with the end-comment leader and apply any specified
-alignment, leaving just " */".  There is no need to hit Backspace first.
+alignment, leaving just `" */"`.  There is no need to hit Backspace first.
 
 When there is a match with a middle part, but there also is a matching end
 part which is longer, the end part is used.  This makes a C style comment work
 without requiring the middle part to end with a space.
 
 Here is an example of alignment flags at work to make a comment stand out
-(kind of looks like a 1 too). Consider comment string: >
+(kind of looks like a 1 too). Consider comment string: >vim
 	:set comments=sr:/***,m:**,ex-2:******/
-<
+>
                                    /*** ~
                                      **<--right aligned from "r" flag ~
                                      ** ~
-offset 2 spaces for the "-2" flag--->** ~
+ offset 2 spaces for the "-2" flag-->** ~
                                    ******/ ~
 In this case, the first comment was typed, then return was pressed 4 times,
 then "/" was pressed to end the comment.
@@ -1741,10 +1741,10 @@ happens with formatting and auto-wrapping.  Opening a line after a line
 starting with "/*" or "*" and containing "*/", will cause no comment leader to
 be inserted, and the indent of the new line is taken from the line containing
 the start of the comment.
-E.g.:
-    /* ~
-     * Your typical comment. ~
-     */ ~
+E.g.: >
+    /*
+     * Your typical comment.
+     */
     The indent on this line is the same as the start of the above
     comment.
 
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index a8f07dd6c5..0213888537 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -100,7 +100,7 @@ CTRL-E or <End>					*c_CTRL-E* *c_<End>* *c_End*
 
 							*c_<MiddleMouse>*
 <MiddleMouse>	Paste the contents of the clipboard (for X11 the primary
-		selection).  This is similar to using CTRL-R *, but no CR
+		selection).  This is similar to using `CTRL-R *`, but no CR
 		characters are inserted between lines.
 
 CTRL-H						*c_<BS>* *c_CTRL-H* *c_BS*
@@ -190,8 +190,8 @@ CTRL-R CTRL-L				*c_CTRL-R_CTRL-L* *c_<C-R>_<C-L>*
 
 					*c_CTRL-R_CTRL-R* *c_<C-R>_<C-R>*
 					*c_CTRL-R_CTRL-O* *c_<C-R>_<C-O>*
-CTRL-R CTRL-R {register CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
-CTRL-R CTRL-O {register CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
+CTRL-R CTRL-R `{register CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}`
+CTRL-R CTRL-O `{register CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}`
 		Insert register or object under the cursor.  Works like
 		|c_CTRL-R| but inserts the text literally.  For example, if
 		register a contains "xy^Hz" (where ^H is a backspace),
@@ -1058,7 +1058,7 @@ But expansion is only done if there are any wildcards before expanding the
 '%', '#', etc..  This avoids expanding wildcards inside a file name.  If you
 want to expand the result of <cfile>, add a wildcard character to it.
 Examples: (alternate file name is "?readme?")
-	command		expands to  ~
+	command		expands to >
 	:e #		:e ?readme?
 	:e `ls #`	:e {files matching "?readme?"}
 	:e #.*		:e {files matching "?readme?.*"}
@@ -1230,6 +1230,6 @@ The character used for the pattern indicates the type of command-line:
 	?	backward search string
 	=	expression for "= |expr-register|
 	@	string for |input()|
-	-	text for |:insert| or |:append|
+	`-`	text for |:insert| or |:append|
 
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 9a622741b5..6317789d22 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -130,11 +130,11 @@ LSP FUNCTIONS
 - *vim.lsp.util.set_qflist()*			Use |setqflist()| instead.
 - *vim.lsp.util.set_loclist()*			Use |setloclist()| instead.
 - *vim.lsp.buf_get_clients()*			Use |vim.lsp.get_active_clients()| with
-						{buffer = bufnr} instead.
+						{buffer=bufnr} instead.
 - *vim.lsp.buf.formatting()*			Use |vim.lsp.buf.format()| with
-						{async = true} instead.
+						{async=true} instead.
 - *vim.lsp.buf.formatting_sync()*		Use |vim.lsp.buf.format()| with
-						{async = false} instead.
+						{async=false} instead.
 - *vim.lsp.buf.range_formatting()*		Use |vim.lsp.formatexpr()|
 						or |vim.lsp.buf.format()| instead.
 - *vim.lsp.util.get_progress_messages()*	Use |vim.lsp.status()| or access
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index d2cc000789..b024894c96 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -169,1311 +169,1313 @@ The rouble sign was added in 2014 as 0x20bd.  Vim supports the digraphs =R and
 =P for this.  Note that R= and P= are other characters.
 
 						*digraph-table* *digraph-table-mbyte*
-char  digraph	hex	dec	official name ~
-^@	NU	0x00	  0	NULL (NUL)
-^A	SH	0x01	  1	START OF HEADING (SOH)
-^B	SX	0x02	  2	START OF TEXT (STX)
-^C	EX	0x03	  3	END OF TEXT (ETX)
-^D	ET	0x04	  4	END OF TRANSMISSION (EOT)
-^E	EQ	0x05	  5	ENQUIRY (ENQ)
-^F	AK	0x06	  6	ACKNOWLEDGE (ACK)
-^G	BL	0x07	  7	BELL (BEL)
-^H	BS	0x08	  8	BACKSPACE (BS)
-^I	HT	0x09	  9	CHARACTER TABULATION (HT)
-^@	LF	0x0a	 10	LINE FEED (LF)
-^K	VT	0x0b	 11	LINE TABULATION (VT)
-^L	FF	0x0c	 12	FORM FEED (FF)
-^M	CR	0x0d	 13	CARRIAGE RETURN (CR)
-^N	SO	0x0e	 14	SHIFT OUT (SO)
-^O	SI	0x0f	 15	SHIFT IN (SI)
-^P	DL	0x10	 16	DATALINK ESCAPE (DLE)
-^Q	D1	0x11	 17	DEVICE CONTROL ONE (DC1)
-^R	D2	0x12	 18	DEVICE CONTROL TWO (DC2)
-^S	D3	0x13	 19	DEVICE CONTROL THREE (DC3)
-^T	D4	0x14	 20	DEVICE CONTROL FOUR (DC4)
-^U	NK	0x15	 21	NEGATIVE ACKNOWLEDGE (NAK)
-^V	SY	0x16	 22	SYNCHRONOUS IDLE (SYN)
-^W	EB	0x17	 23	END OF TRANSMISSION BLOCK (ETB)
-^X	CN	0x18	 24	CANCEL (CAN)
-^Y	EM	0x19	 25	END OF MEDIUM (EM)
-^Z	SB	0x1a	 26	SUBSTITUTE (SUB)
-^[	EC	0x1b	 27	ESCAPE (ESC)
-^\	FS	0x1c	 28	FILE SEPARATOR (IS4)
-^]	GS	0x1d	 29	GROUP SEPARATOR (IS3)
-^^	RS	0x1e	 30	RECORD SEPARATOR (IS2)
-^_	US	0x1f	 31	UNIT SEPARATOR (IS1)
-	SP	0x20	 32	SPACE
-#	Nb	0x23	 35	NUMBER SIGN
-$	DO	0x24	 36	DOLLAR SIGN
-@	At	0x40	 64	COMMERCIAL AT
-[	<(	0x5b	 91	LEFT SQUARE BRACKET
-\	//	0x5c	 92	REVERSE SOLIDUS
-]	)>	0x5d	 93	RIGHT SQUARE BRACKET
-^	'>	0x5e	 94	CIRCUMFLEX ACCENT
-`	'!	0x60	 96	GRAVE ACCENT
-{	(!	0x7b	123	LEFT CURLY BRACKET
-|	!!	0x7c	124	VERTICAL LINE
-}	!)	0x7d	125	RIGHT CURLY BRACKET
-~	'?	0x7e	126	TILDE
-^?	DT	0x7f	127	DELETE (DEL)
-~@	PA	0x80	128	PADDING CHARACTER (PAD)
-~A	HO	0x81	129	HIGH OCTET PRESET (HOP)
-~B	BH	0x82	130	BREAK PERMITTED HERE (BPH)
-~C	NH	0x83	131	NO BREAK HERE (NBH)
-~D	IN	0x84	132	INDEX (IND)
-~E	NL	0x85	133	NEXT LINE (NEL)
-~F	SA	0x86	134	START OF SELECTED AREA (SSA)
-~G	ES	0x87	135	END OF SELECTED AREA (ESA)
-~H	HS	0x88	136	CHARACTER TABULATION SET (HTS)
-~I	HJ	0x89	137	CHARACTER TABULATION WITH JUSTIFICATION (HTJ)
-~J	VS	0x8a	138	LINE TABULATION SET (VTS)
-~K	PD	0x8b	139	PARTIAL LINE FORWARD (PLD)
-~L	PU	0x8c	140	PARTIAL LINE BACKWARD (PLU)
-~M	RI	0x8d	141	REVERSE LINE FEED (RI)
-~N	S2	0x8e	142	SINGLE-SHIFT TWO (SS2)
-~O	S3	0x8f	143	SINGLE-SHIFT THREE (SS3)
-~P	DC	0x90	144	DEVICE CONTROL STRING (DCS)
-~Q	P1	0x91	145	PRIVATE USE ONE (PU1)
-~R	P2	0x92	146	PRIVATE USE TWO (PU2)
-~S	TS	0x93	147	SET TRANSMIT STATE (STS)
-~T	CC	0x94	148	CANCEL CHARACTER (CCH)
-~U	MW	0x95	149	MESSAGE WAITING (MW)
-~V	SG	0x96	150	START OF GUARDED AREA (SPA)
-~W	EG	0x97	151	END OF GUARDED AREA (EPA)
-~X	SS	0x98	152	START OF STRING (SOS)
-~Y	GC	0x99	153	SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)
-~Z	SC	0x9a	154	SINGLE CHARACTER INTRODUCER (SCI)
-~[	CI	0x9b	155	CONTROL SEQUENCE INTRODUCER (CSI)
-~\	ST	0x9c	156	STRING TERMINATOR (ST)
-~]	OC	0x9d	157	OPERATING SYSTEM COMMAND (OSC)
-~^	PM	0x9e	158	PRIVACY MESSAGE (PM)
-~_	AC	0x9f	159	APPLICATION PROGRAM COMMAND (APC)
-|	NS	0xa0	160	NO-BREAK SPACE
-¡	!I	0xa1	161	INVERTED EXCLAMATION MARK
-¢	Ct	0xa2	162	CENT SIGN
-£	Pd	0xa3	163	POUND SIGN
-¤	Cu	0xa4	164	CURRENCY SIGN
-¥	Ye	0xa5	165	YEN SIGN
-¦	BB	0xa6	166	BROKEN BAR
-§	SE	0xa7	167	SECTION SIGN
-¨	':	0xa8	168	DIAERESIS
-©	Co	0xa9	169	COPYRIGHT SIGN
-ª	-a	0xaa	170	FEMININE ORDINAL INDICATOR
-«	<<	0xab	171	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-¬	NO	0xac	172	NOT SIGN
-­	--	0xad	173	SOFT HYPHEN
-®	Rg	0xae	174	REGISTERED SIGN
-¯	'm	0xaf	175	MACRON
-°	DG	0xb0	176	DEGREE SIGN
-±	+-	0xb1	177	PLUS-MINUS SIGN
-²	2S	0xb2	178	SUPERSCRIPT TWO
-³	3S	0xb3	179	SUPERSCRIPT THREE
-´	''	0xb4	180	ACUTE ACCENT
-µ	My	0xb5	181	MICRO SIGN
-¶	PI	0xb6	182	PILCROW SIGN
-·	.M	0xb7	183	MIDDLE DOT
-¸	',	0xb8	184	CEDILLA
-¹	1S	0xb9	185	SUPERSCRIPT ONE
-º	-o	0xba	186	MASCULINE ORDINAL INDICATOR
-»	>>	0xbb	187	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-¼	14	0xbc	188	VULGAR FRACTION ONE QUARTER
-½	12	0xbd	189	VULGAR FRACTION ONE HALF
-¾	34	0xbe	190	VULGAR FRACTION THREE QUARTERS
-¿	?I	0xbf	191	INVERTED QUESTION MARK
-À	A!	0xc0	192	LATIN CAPITAL LETTER A WITH GRAVE
-Á	A'	0xc1	193	LATIN CAPITAL LETTER A WITH ACUTE
-Â	A>	0xc2	194	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-Ã	A?	0xc3	195	LATIN CAPITAL LETTER A WITH TILDE
-Ä	A:	0xc4	196	LATIN CAPITAL LETTER A WITH DIAERESIS
-Å	AA	0xc5	197	LATIN CAPITAL LETTER A WITH RING ABOVE
-Æ	AE	0xc6	198	LATIN CAPITAL LETTER AE
-Ç	C,	0xc7	199	LATIN CAPITAL LETTER C WITH CEDILLA
-È	E!	0xc8	200	LATIN CAPITAL LETTER E WITH GRAVE
-É	E'	0xc9	201	LATIN CAPITAL LETTER E WITH ACUTE
-Ê	E>	0xca	202	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-Ë	E:	0xcb	203	LATIN CAPITAL LETTER E WITH DIAERESIS
-Ì	I!	0xcc	204	LATIN CAPITAL LETTER I WITH GRAVE
-Í	I'	0xcd	205	LATIN CAPITAL LETTER I WITH ACUTE
-Î	I>	0xce	206	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-Ï	I:	0xcf	207	LATIN CAPITAL LETTER I WITH DIAERESIS
-Ð	D-	0xd0	208	LATIN CAPITAL LETTER ETH (Icelandic)
-Ñ	N?	0xd1	209	LATIN CAPITAL LETTER N WITH TILDE
-Ò	O!	0xd2	210	LATIN CAPITAL LETTER O WITH GRAVE
-Ó	O'	0xd3	211	LATIN CAPITAL LETTER O WITH ACUTE
-Ô	O>	0xd4	212	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-Õ	O?	0xd5	213	LATIN CAPITAL LETTER O WITH TILDE
-Ö	O:	0xd6	214	LATIN CAPITAL LETTER O WITH DIAERESIS
-×	*X	0xd7	215	MULTIPLICATION SIGN
-Ø	O/	0xd8	216	LATIN CAPITAL LETTER O WITH STROKE
-Ù	U!	0xd9	217	LATIN CAPITAL LETTER U WITH GRAVE
-Ú	U'	0xda	218	LATIN CAPITAL LETTER U WITH ACUTE
-Û	U>	0xdb	219	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-Ü	U:	0xdc	220	LATIN CAPITAL LETTER U WITH DIAERESIS
-Ý	Y'	0xdd	221	LATIN CAPITAL LETTER Y WITH ACUTE
-Þ	TH	0xde	222	LATIN CAPITAL LETTER THORN (Icelandic)
-ß	ss	0xdf	223	LATIN SMALL LETTER SHARP S (German)
-à	a!	0xe0	224	LATIN SMALL LETTER A WITH GRAVE
-á	a'	0xe1	225	LATIN SMALL LETTER A WITH ACUTE
-â	a>	0xe2	226	LATIN SMALL LETTER A WITH CIRCUMFLEX
-ã	a?	0xe3	227	LATIN SMALL LETTER A WITH TILDE
-ä	a:	0xe4	228	LATIN SMALL LETTER A WITH DIAERESIS
-å	aa	0xe5	229	LATIN SMALL LETTER A WITH RING ABOVE
-æ	ae	0xe6	230	LATIN SMALL LETTER AE
-ç	c,	0xe7	231	LATIN SMALL LETTER C WITH CEDILLA
-è	e!	0xe8	232	LATIN SMALL LETTER E WITH GRAVE
-é	e'	0xe9	233	LATIN SMALL LETTER E WITH ACUTE
-ê	e>	0xea	234	LATIN SMALL LETTER E WITH CIRCUMFLEX
-ë	e:	0xeb	235	LATIN SMALL LETTER E WITH DIAERESIS
-ì	i!	0xec	236	LATIN SMALL LETTER I WITH GRAVE
-í	i'	0xed	237	LATIN SMALL LETTER I WITH ACUTE
-î	i>	0xee	238	LATIN SMALL LETTER I WITH CIRCUMFLEX
-ï	i:	0xef	239	LATIN SMALL LETTER I WITH DIAERESIS
-ð	d-	0xf0	240	LATIN SMALL LETTER ETH (Icelandic)
-ñ	n?	0xf1	241	LATIN SMALL LETTER N WITH TILDE
-ò	o!	0xf2	242	LATIN SMALL LETTER O WITH GRAVE
-ó	o'	0xf3	243	LATIN SMALL LETTER O WITH ACUTE
-ô	o>	0xf4	244	LATIN SMALL LETTER O WITH CIRCUMFLEX
-õ	o?	0xf5	245	LATIN SMALL LETTER O WITH TILDE
-ö	o:	0xf6	246	LATIN SMALL LETTER O WITH DIAERESIS
-÷	-:	0xf7	247	DIVISION SIGN
-ø	o/	0xf8	248	LATIN SMALL LETTER O WITH STROKE
-ù	u!	0xf9	249	LATIN SMALL LETTER U WITH GRAVE
-ú	u'	0xfa	250	LATIN SMALL LETTER U WITH ACUTE
-û	u>	0xfb	251	LATIN SMALL LETTER U WITH CIRCUMFLEX
-ü	u:	0xfc	252	LATIN SMALL LETTER U WITH DIAERESIS
-ý	y'	0xfd	253	LATIN SMALL LETTER Y WITH ACUTE
-þ	th	0xfe	254	LATIN SMALL LETTER THORN (Icelandic)
-ÿ	y:	0xff	255	LATIN SMALL LETTER Y WITH DIAERESIS
-Ā	A-	0100	0256	LATIN CAPITAL LETTER A WITH MACRON
-ā	a-	0101	0257	LATIN SMALL LETTER A WITH MACRON
-Ă	A(	0102	0258	LATIN CAPITAL LETTER A WITH BREVE
-ă	a(	0103	0259	LATIN SMALL LETTER A WITH BREVE
-Ą	A;	0104	0260	LATIN CAPITAL LETTER A WITH OGONEK
-ą	a;	0105	0261	LATIN SMALL LETTER A WITH OGONEK
-Ć	C'	0106	0262	LATIN CAPITAL LETTER C WITH ACUTE
-ć	c'	0107	0263	LATIN SMALL LETTER C WITH ACUTE
-Ĉ	C>	0108	0264	LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-ĉ	c>	0109	0265	LATIN SMALL LETTER C WITH CIRCUMFLEX
-Ċ	C.	010A	0266	LATIN CAPITAL LETTER C WITH DOT ABOVE
-ċ	c.	010B	0267	LATIN SMALL LETTER C WITH DOT ABOVE
-Č	C<	010C	0268	LATIN CAPITAL LETTER C WITH CARON
-č	c<	010D	0269	LATIN SMALL LETTER C WITH CARON
-Ď	D<	010E	0270	LATIN CAPITAL LETTER D WITH CARON
-ď	d<	010F	0271	LATIN SMALL LETTER D WITH CARON
-Đ	D/	0110	0272	LATIN CAPITAL LETTER D WITH STROKE
-đ	d/	0111	0273	LATIN SMALL LETTER D WITH STROKE
-Ē	E-	0112	0274	LATIN CAPITAL LETTER E WITH MACRON
-ē	e-	0113	0275	LATIN SMALL LETTER E WITH MACRON
-Ĕ	E(	0114	0276	LATIN CAPITAL LETTER E WITH BREVE
-ĕ	e(	0115	0277	LATIN SMALL LETTER E WITH BREVE
-Ė	E.	0116	0278	LATIN CAPITAL LETTER E WITH DOT ABOVE
-ė	e.	0117	0279	LATIN SMALL LETTER E WITH DOT ABOVE
-Ę	E;	0118	0280	LATIN CAPITAL LETTER E WITH OGONEK
-ę	e;	0119	0281	LATIN SMALL LETTER E WITH OGONEK
-Ě	E<	011A	0282	LATIN CAPITAL LETTER E WITH CARON
-ě	e<	011B	0283	LATIN SMALL LETTER E WITH CARON
-Ĝ	G>	011C	0284	LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-ĝ	g>	011D	0285	LATIN SMALL LETTER G WITH CIRCUMFLEX
-Ğ	G(	011E	0286	LATIN CAPITAL LETTER G WITH BREVE
-ğ	g(	011F	0287	LATIN SMALL LETTER G WITH BREVE
-Ġ	G.	0120	0288	LATIN CAPITAL LETTER G WITH DOT ABOVE
-ġ	g.	0121	0289	LATIN SMALL LETTER G WITH DOT ABOVE
-Ģ	G,	0122	0290	LATIN CAPITAL LETTER G WITH CEDILLA
-ģ	g,	0123	0291	LATIN SMALL LETTER G WITH CEDILLA
-Ĥ	H>	0124	0292	LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-ĥ	h>	0125	0293	LATIN SMALL LETTER H WITH CIRCUMFLEX
-Ħ	H/	0126	0294	LATIN CAPITAL LETTER H WITH STROKE
-ħ	h/	0127	0295	LATIN SMALL LETTER H WITH STROKE
-Ĩ	I?	0128	0296	LATIN CAPITAL LETTER I WITH TILDE
-ĩ	i?	0129	0297	LATIN SMALL LETTER I WITH TILDE
-Ī	I-	012A	0298	LATIN CAPITAL LETTER I WITH MACRON
-ī	i-	012B	0299	LATIN SMALL LETTER I WITH MACRON
-Ĭ	I(	012C	0300	LATIN CAPITAL LETTER I WITH BREVE
-ĭ	i(	012D	0301	LATIN SMALL LETTER I WITH BREVE
-Į	I;	012E	0302	LATIN CAPITAL LETTER I WITH OGONEK
-į	i;	012F	0303	LATIN SMALL LETTER I WITH OGONEK
-İ	I.	0130	0304	LATIN CAPITAL LETTER I WITH DOT ABOVE
-ı	i.	0131	0305	LATIN SMALL LETTER DOTLESS I
-IJ	IJ	0132	0306	LATIN CAPITAL LIGATURE IJ
-ij	ij	0133	0307	LATIN SMALL LIGATURE IJ
-Ĵ	J>	0134	0308	LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-ĵ	j>	0135	0309	LATIN SMALL LETTER J WITH CIRCUMFLEX
-Ķ	K,	0136	0310	LATIN CAPITAL LETTER K WITH CEDILLA
-ķ	k,	0137	0311	LATIN SMALL LETTER K WITH CEDILLA
-ĸ	kk	0138	0312	LATIN SMALL LETTER KRA
-Ĺ	L'	0139	0313	LATIN CAPITAL LETTER L WITH ACUTE
-ĺ	l'	013A	0314	LATIN SMALL LETTER L WITH ACUTE
-Ļ	L,	013B	0315	LATIN CAPITAL LETTER L WITH CEDILLA
-ļ	l,	013C	0316	LATIN SMALL LETTER L WITH CEDILLA
-Ľ	L<	013D	0317	LATIN CAPITAL LETTER L WITH CARON
-ľ	l<	013E	0318	LATIN SMALL LETTER L WITH CARON
-Ŀ	L.	013F	0319	LATIN CAPITAL LETTER L WITH MIDDLE DOT
-ŀ	l.	0140	0320	LATIN SMALL LETTER L WITH MIDDLE DOT
-Ł	L/	0141	0321	LATIN CAPITAL LETTER L WITH STROKE
-ł	l/	0142	0322	LATIN SMALL LETTER L WITH STROKE
-Ń	N'	0143	0323	LATIN CAPITAL LETTER N WITH ACUTE `
-ń	n'	0144	0324	LATIN SMALL LETTER N WITH ACUTE `
-Ņ	N,	0145	0325	LATIN CAPITAL LETTER N WITH CEDILLA `
-ņ	n,	0146	0326	LATIN SMALL LETTER N WITH CEDILLA `
-Ň	N<	0147	0327	LATIN CAPITAL LETTER N WITH CARON `
-ň	n<	0148	0328	LATIN SMALL LETTER N WITH CARON `
-ʼn	'n	0149	0329	LATIN SMALL LETTER N PRECEDED BY APOSTROPHE `
-Ŋ	NG	014A	0330	LATIN CAPITAL LETTER ENG
-ŋ	ng	014B	0331	LATIN SMALL LETTER ENG
-Ō	O-	014C	0332	LATIN CAPITAL LETTER O WITH MACRON
-ō	o-	014D	0333	LATIN SMALL LETTER O WITH MACRON
-Ŏ	O(	014E	0334	LATIN CAPITAL LETTER O WITH BREVE
-ŏ	o(	014F	0335	LATIN SMALL LETTER O WITH BREVE
-Ő	O"	0150	0336	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-ő	o"	0151	0337	LATIN SMALL LETTER O WITH DOUBLE ACUTE
-Œ	OE	0152	0338	LATIN CAPITAL LIGATURE OE
-œ	oe	0153	0339	LATIN SMALL LIGATURE OE
-Ŕ	R'	0154	0340	LATIN CAPITAL LETTER R WITH ACUTE
-ŕ	r'	0155	0341	LATIN SMALL LETTER R WITH ACUTE
-Ŗ	R,	0156	0342	LATIN CAPITAL LETTER R WITH CEDILLA
-ŗ	r,	0157	0343	LATIN SMALL LETTER R WITH CEDILLA
-Ř	R<	0158	0344	LATIN CAPITAL LETTER R WITH CARON
-ř	r<	0159	0345	LATIN SMALL LETTER R WITH CARON
-Ś	S'	015A	0346	LATIN CAPITAL LETTER S WITH ACUTE
-ś	s'	015B	0347	LATIN SMALL LETTER S WITH ACUTE
-Ŝ	S>	015C	0348	LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-ŝ	s>	015D	0349	LATIN SMALL LETTER S WITH CIRCUMFLEX
-Ş	S,	015E	0350	LATIN CAPITAL LETTER S WITH CEDILLA
-ş	s,	015F	0351	LATIN SMALL LETTER S WITH CEDILLA
-Š	S<	0160	0352	LATIN CAPITAL LETTER S WITH CARON
-š	s<	0161	0353	LATIN SMALL LETTER S WITH CARON
-Ţ	T,	0162	0354	LATIN CAPITAL LETTER T WITH CEDILLA
-ţ	t,	0163	0355	LATIN SMALL LETTER T WITH CEDILLA
-Ť	T<	0164	0356	LATIN CAPITAL LETTER T WITH CARON
-ť	t<	0165	0357	LATIN SMALL LETTER T WITH CARON
-Ŧ	T/	0166	0358	LATIN CAPITAL LETTER T WITH STROKE
-ŧ	t/	0167	0359	LATIN SMALL LETTER T WITH STROKE
-Ũ	U?	0168	0360	LATIN CAPITAL LETTER U WITH TILDE
-ũ	u?	0169	0361	LATIN SMALL LETTER U WITH TILDE
-Ū	U-	016A	0362	LATIN CAPITAL LETTER U WITH MACRON
-ū	u-	016B	0363	LATIN SMALL LETTER U WITH MACRON
-Ŭ	U(	016C	0364	LATIN CAPITAL LETTER U WITH BREVE
-ŭ	u(	016D	0365	LATIN SMALL LETTER U WITH BREVE
-Ů	U0	016E	0366	LATIN CAPITAL LETTER U WITH RING ABOVE
-ů	u0	016F	0367	LATIN SMALL LETTER U WITH RING ABOVE
-Ű	U"	0170	0368	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-ű	u"	0171	0369	LATIN SMALL LETTER U WITH DOUBLE ACUTE
-Ų	U;	0172	0370	LATIN CAPITAL LETTER U WITH OGONEK
-ų	u;	0173	0371	LATIN SMALL LETTER U WITH OGONEK
-Ŵ	W>	0174	0372	LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-ŵ	w>	0175	0373	LATIN SMALL LETTER W WITH CIRCUMFLEX
-Ŷ	Y>	0176	0374	LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-ŷ	y>	0177	0375	LATIN SMALL LETTER Y WITH CIRCUMFLEX
-Ÿ	Y:	0178	0376	LATIN CAPITAL LETTER Y WITH DIAERESIS
-Ź	Z'	0179	0377	LATIN CAPITAL LETTER Z WITH ACUTE
-ź	z'	017A	0378	LATIN SMALL LETTER Z WITH ACUTE
-Ż	Z.	017B	0379	LATIN CAPITAL LETTER Z WITH DOT ABOVE
-ż	z.	017C	0380	LATIN SMALL LETTER Z WITH DOT ABOVE
-Ž	Z<	017D	0381	LATIN CAPITAL LETTER Z WITH CARON
-ž	z<	017E	0382	LATIN SMALL LETTER Z WITH CARON
-Ơ	O9	01A0	0416	LATIN CAPITAL LETTER O WITH HORN
-ơ	o9	01A1	0417	LATIN SMALL LETTER O WITH HORN
-Ƣ	OI	01A2	0418	LATIN CAPITAL LETTER OI
-ƣ	oi	01A3	0419	LATIN SMALL LETTER OI
-Ʀ	yr	01A6	0422	LATIN LETTER YR
-Ư	U9	01AF	0431	LATIN CAPITAL LETTER U WITH HORN
-ư	u9	01B0	0432	LATIN SMALL LETTER U WITH HORN
-Ƶ	Z/	01B5	0437	LATIN CAPITAL LETTER Z WITH STROKE
-ƶ	z/	01B6	0438	LATIN SMALL LETTER Z WITH STROKE
-Ʒ	ED	01B7	0439	LATIN CAPITAL LETTER EZH
-Ǎ	A<	01CD	0461	LATIN CAPITAL LETTER A WITH CARON
-ǎ	a<	01CE	0462	LATIN SMALL LETTER A WITH CARON
-Ǐ	I<	01CF	0463	LATIN CAPITAL LETTER I WITH CARON
-ǐ	i<	01D0	0464	LATIN SMALL LETTER I WITH CARON
-Ǒ	O<	01D1	0465	LATIN CAPITAL LETTER O WITH CARON
-ǒ	o<	01D2	0466	LATIN SMALL LETTER O WITH CARON
-Ǔ	U<	01D3	0467	LATIN CAPITAL LETTER U WITH CARON
-ǔ	u<	01D4	0468	LATIN SMALL LETTER U WITH CARON
-Ǟ	A1	01DE	0478	LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
-ǟ	a1	01DF	0479	LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
-Ǡ	A7	01E0	0480	LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
-ǡ	a7	01E1	0481	LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
-Ǣ	A3	01E2	0482	LATIN CAPITAL LETTER AE WITH MACRON
-ǣ	a3	01E3	0483	LATIN SMALL LETTER AE WITH MACRON
-Ǥ	G/	01E4	0484	LATIN CAPITAL LETTER G WITH STROKE
-ǥ	g/	01E5	0485	LATIN SMALL LETTER G WITH STROKE
-Ǧ	G<	01E6	0486	LATIN CAPITAL LETTER G WITH CARON
-ǧ	g<	01E7	0487	LATIN SMALL LETTER G WITH CARON
-Ǩ	K<	01E8	0488	LATIN CAPITAL LETTER K WITH CARON
-ǩ	k<	01E9	0489	LATIN SMALL LETTER K WITH CARON
-Ǫ	O;	01EA	0490	LATIN CAPITAL LETTER O WITH OGONEK
-ǫ	o;	01EB	0491	LATIN SMALL LETTER O WITH OGONEK
-Ǭ	O1	01EC	0492	LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
-ǭ	o1	01ED	0493	LATIN SMALL LETTER O WITH OGONEK AND MACRON
-Ǯ	EZ	01EE	0494	LATIN CAPITAL LETTER EZH WITH CARON
-ǯ	ez	01EF	0495	LATIN SMALL LETTER EZH WITH CARON
-ǰ	j<	01F0	0496	LATIN SMALL LETTER J WITH CARON
-Ǵ	G'	01F4	0500	LATIN CAPITAL LETTER G WITH ACUTE
-ǵ	g'	01F5	0501	LATIN SMALL LETTER G WITH ACUTE
-ʿ	;S	02BF	0703	MODIFIER LETTER LEFT HALF RING
-ˇ	'<	02C7	0711	CARON
-˘	'(	02D8	0728	BREVE
-˙	'.	02D9	0729	DOT ABOVE
-˚	'0	02DA	0730	RING ABOVE
-˛	';	02DB	0731	OGONEK
-˝	'"	02DD	0733	DOUBLE ACUTE ACCENT
-Ά	A%	0386	0902	GREEK CAPITAL LETTER ALPHA WITH TONOS
-Έ	E%	0388	0904	GREEK CAPITAL LETTER EPSILON WITH TONOS
-Ή	Y%	0389	0905	GREEK CAPITAL LETTER ETA WITH TONOS
-Ί	I%	038A	0906	GREEK CAPITAL LETTER IOTA WITH TONOS
-Ό	O%	038C	0908	GREEK CAPITAL LETTER OMICRON WITH TONOS
-Ύ	U%	038E	0910	GREEK CAPITAL LETTER UPSILON WITH TONOS
-Ώ	W%	038F	0911	GREEK CAPITAL LETTER OMEGA WITH TONOS
-ΐ	i3	0390	0912	GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-Α	A*	0391	0913	GREEK CAPITAL LETTER ALPHA
-Β	B*	0392	0914	GREEK CAPITAL LETTER BETA
-Γ	G*	0393	0915	GREEK CAPITAL LETTER GAMMA
-Δ	D*	0394	0916	GREEK CAPITAL LETTER DELTA
-Ε	E*	0395	0917	GREEK CAPITAL LETTER EPSILON
-Ζ	Z*	0396	0918	GREEK CAPITAL LETTER ZETA
-Η	Y*	0397	0919	GREEK CAPITAL LETTER ETA
-Θ	H*	0398	0920	GREEK CAPITAL LETTER THETA
-Ι	I*	0399	0921	GREEK CAPITAL LETTER IOTA
-Κ	K*	039A	0922	GREEK CAPITAL LETTER KAPPA
-Λ	L*	039B	0923	GREEK CAPITAL LETTER LAMDA (aka LAMBDA)
-Μ	M*	039C	0924	GREEK CAPITAL LETTER MU
-Ν	N*	039D	0925	GREEK CAPITAL LETTER NU
-Ξ	C*	039E	0926	GREEK CAPITAL LETTER XI
-Ο	O*	039F	0927	GREEK CAPITAL LETTER OMICRON
-Π	P*	03A0	0928	GREEK CAPITAL LETTER PI
-Ρ	R*	03A1	0929	GREEK CAPITAL LETTER RHO
-Σ	S*	03A3	0931	GREEK CAPITAL LETTER SIGMA
-Τ	T*	03A4	0932	GREEK CAPITAL LETTER TAU
-Υ	U*	03A5	0933	GREEK CAPITAL LETTER UPSILON
-Φ	F*	03A6	0934	GREEK CAPITAL LETTER PHI
-Χ	X*	03A7	0935	GREEK CAPITAL LETTER CHI
-Ψ	Q*	03A8	0936	GREEK CAPITAL LETTER PSI
-Ω	W*	03A9	0937	GREEK CAPITAL LETTER OMEGA
-Ϊ	J*	03AA	0938	GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-Ϋ	V*	03AB	0939	GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-ά	a%	03AC	0940	GREEK SMALL LETTER ALPHA WITH TONOS
-έ	e%	03AD	0941	GREEK SMALL LETTER EPSILON WITH TONOS
-ή	y%	03AE	0942	GREEK SMALL LETTER ETA WITH TONOS
-ί	i%	03AF	0943	GREEK SMALL LETTER IOTA WITH TONOS
-ΰ	u3	03B0	0944	GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
-α	a*	03B1	0945	GREEK SMALL LETTER ALPHA
-β	b*	03B2	0946	GREEK SMALL LETTER BETA
-γ	g*	03B3	0947	GREEK SMALL LETTER GAMMA
-δ	d*	03B4	0948	GREEK SMALL LETTER DELTA
-ε	e*	03B5	0949	GREEK SMALL LETTER EPSILON
-ζ	z*	03B6	0950	GREEK SMALL LETTER ZETA
-η	y*	03B7	0951	GREEK SMALL LETTER ETA
-θ	h*	03B8	0952	GREEK SMALL LETTER THETA
-ι	i*	03B9	0953	GREEK SMALL LETTER IOTA
-κ	k*	03BA	0954	GREEK SMALL LETTER KAPPA
-λ	l*	03BB	0955	GREEK SMALL LETTER LAMDA (aka LAMBDA)
-μ	m*	03BC	0956	GREEK SMALL LETTER MU
-ν	n*	03BD	0957	GREEK SMALL LETTER NU
-ξ	c*	03BE	0958	GREEK SMALL LETTER XI
-ο	o*	03BF	0959	GREEK SMALL LETTER OMICRON
-π	p*	03C0	0960	GREEK SMALL LETTER PI
-ρ	r*	03C1	0961	GREEK SMALL LETTER RHO
-ς	*s	03C2	0962	GREEK SMALL LETTER FINAL SIGMA
-σ	s*	03C3	0963	GREEK SMALL LETTER SIGMA
-τ	t*	03C4	0964	GREEK SMALL LETTER TAU
-υ	u*	03C5	0965	GREEK SMALL LETTER UPSILON
-φ	f*	03C6	0966	GREEK SMALL LETTER PHI
-χ	x*	03C7	0967	GREEK SMALL LETTER CHI
-ψ	q*	03C8	0968	GREEK SMALL LETTER PSI
-ω	w*	03C9	0969	GREEK SMALL LETTER OMEGA
-ϊ	j*	03CA	0970	GREEK SMALL LETTER IOTA WITH DIALYTIKA
-ϋ	v*	03CB	0971	GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-ό	o%	03CC	0972	GREEK SMALL LETTER OMICRON WITH TONOS
-ύ	u%	03CD	0973	GREEK SMALL LETTER UPSILON WITH TONOS
-ώ	w%	03CE	0974	GREEK SMALL LETTER OMEGA WITH TONOS
-Ϙ	'G	03D8	0984	GREEK LETTER ARCHAIC KOPPA
-ϙ	,G	03D9	0985	GREEK SMALL LETTER ARCHAIC KOPPA
-Ϛ	T3	03DA	0986	GREEK LETTER STIGMA
-ϛ	t3	03DB	0987	GREEK SMALL LETTER STIGMA
-Ϝ	M3	03DC	0988	GREEK LETTER DIGAMMA
-ϝ	m3	03DD	0989	GREEK SMALL LETTER DIGAMMA
-Ϟ	K3	03DE	0990	GREEK LETTER KOPPA
-ϟ	k3	03DF	0991	GREEK SMALL LETTER KOPPA
-Ϡ	P3	03E0	0992	GREEK LETTER SAMPI
-ϡ	p3	03E1	0993	GREEK SMALL LETTER SAMPI
-ϴ	'%	03F4	1012	GREEK CAPITAL THETA SYMBOL
-ϵ	j3	03F5	1013	GREEK LUNATE EPSILON SYMBOL
-Ё	IO	0401	1025	CYRILLIC CAPITAL LETTER IO
-Ђ	D%	0402	1026	CYRILLIC CAPITAL LETTER DJE
-Ѓ	G%	0403	1027	CYRILLIC CAPITAL LETTER GJE
-Є	IE	0404	1028	CYRILLIC CAPITAL LETTER UKRAINIAN IE
-Ѕ	DS	0405	1029	CYRILLIC CAPITAL LETTER DZE
-І	II	0406	1030	CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-Ї	YI	0407	1031	CYRILLIC CAPITAL LETTER YI
-Ј	J%	0408	1032	CYRILLIC CAPITAL LETTER JE
-Љ	LJ	0409	1033	CYRILLIC CAPITAL LETTER LJE
-Њ	NJ	040A	1034	CYRILLIC CAPITAL LETTER NJE
-Ћ	Ts	040B	1035	CYRILLIC CAPITAL LETTER TSHE
-Ќ	KJ	040C	1036	CYRILLIC CAPITAL LETTER KJE
-Ў	V%	040E	1038	CYRILLIC CAPITAL LETTER SHORT U
-Џ	DZ	040F	1039	CYRILLIC CAPITAL LETTER DZHE
-А	A=	0410	1040	CYRILLIC CAPITAL LETTER A
-Б	B=	0411	1041	CYRILLIC CAPITAL LETTER BE
-В	V=	0412	1042	CYRILLIC CAPITAL LETTER VE
-Г	G=	0413	1043	CYRILLIC CAPITAL LETTER GHE
-Д	D=	0414	1044	CYRILLIC CAPITAL LETTER DE
-Е	E=	0415	1045	CYRILLIC CAPITAL LETTER IE
-Ж	Z%	0416	1046	CYRILLIC CAPITAL LETTER ZHE
-З	Z=	0417	1047	CYRILLIC CAPITAL LETTER ZE
-И	I=	0418	1048	CYRILLIC CAPITAL LETTER I
-Й	J=	0419	1049	CYRILLIC CAPITAL LETTER SHORT I
-К	K=	041A	1050	CYRILLIC CAPITAL LETTER KA
-Л	L=	041B	1051	CYRILLIC CAPITAL LETTER EL
-М	M=	041C	1052	CYRILLIC CAPITAL LETTER EM
-Н	N=	041D	1053	CYRILLIC CAPITAL LETTER EN
-О	O=	041E	1054	CYRILLIC CAPITAL LETTER O
-П	P=	041F	1055	CYRILLIC CAPITAL LETTER PE
-Р	R=	0420	1056	CYRILLIC CAPITAL LETTER ER
-С	S=	0421	1057	CYRILLIC CAPITAL LETTER ES
-Т	T=	0422	1058	CYRILLIC CAPITAL LETTER TE
-У	U=	0423	1059	CYRILLIC CAPITAL LETTER U
-Ф	F=	0424	1060	CYRILLIC CAPITAL LETTER EF
-Х	H=	0425	1061	CYRILLIC CAPITAL LETTER HA
-Ц	C=	0426	1062	CYRILLIC CAPITAL LETTER TSE
-Ч	C%	0427	1063	CYRILLIC CAPITAL LETTER CHE
-Ш	S%	0428	1064	CYRILLIC CAPITAL LETTER SHA
-Щ	Sc	0429	1065	CYRILLIC CAPITAL LETTER SHCHA
-Ъ	="	042A	1066	CYRILLIC CAPITAL LETTER HARD SIGN
-Ы	Y=	042B	1067	CYRILLIC CAPITAL LETTER YERU
-Ь	%"	042C	1068	CYRILLIC CAPITAL LETTER SOFT SIGN
-Э	JE	042D	1069	CYRILLIC CAPITAL LETTER E
-Ю	JU	042E	1070	CYRILLIC CAPITAL LETTER YU
-Я	JA	042F	1071	CYRILLIC CAPITAL LETTER YA
-а	a=	0430	1072	CYRILLIC SMALL LETTER A
-б	b=	0431	1073	CYRILLIC SMALL LETTER BE
-в	v=	0432	1074	CYRILLIC SMALL LETTER VE
-г	g=	0433	1075	CYRILLIC SMALL LETTER GHE
-д	d=	0434	1076	CYRILLIC SMALL LETTER DE
-е	e=	0435	1077	CYRILLIC SMALL LETTER IE
-ж	z%	0436	1078	CYRILLIC SMALL LETTER ZHE
-з	z=	0437	1079	CYRILLIC SMALL LETTER ZE
-и	i=	0438	1080	CYRILLIC SMALL LETTER I
-й	j=	0439	1081	CYRILLIC SMALL LETTER SHORT I
-к	k=	043A	1082	CYRILLIC SMALL LETTER KA
-л	l=	043B	1083	CYRILLIC SMALL LETTER EL
-м	m=	043C	1084	CYRILLIC SMALL LETTER EM
-н	n=	043D	1085	CYRILLIC SMALL LETTER EN
-о	o=	043E	1086	CYRILLIC SMALL LETTER O
-п	p=	043F	1087	CYRILLIC SMALL LETTER PE
-р	r=	0440	1088	CYRILLIC SMALL LETTER ER
-с	s=	0441	1089	CYRILLIC SMALL LETTER ES
-т	t=	0442	1090	CYRILLIC SMALL LETTER TE
-у	u=	0443	1091	CYRILLIC SMALL LETTER U
-ф	f=	0444	1092	CYRILLIC SMALL LETTER EF
-х	h=	0445	1093	CYRILLIC SMALL LETTER HA
-ц	c=	0446	1094	CYRILLIC SMALL LETTER TSE
-ч	c%	0447	1095	CYRILLIC SMALL LETTER CHE
-ш	s%	0448	1096	CYRILLIC SMALL LETTER SHA
-щ	sc	0449	1097	CYRILLIC SMALL LETTER SHCHA
-ъ	='	044A	1098	CYRILLIC SMALL LETTER HARD SIGN
-ы	y=	044B	1099	CYRILLIC SMALL LETTER YERU
-ь	%'	044C	1100	CYRILLIC SMALL LETTER SOFT SIGN
-э	je	044D	1101	CYRILLIC SMALL LETTER E
-ю	ju	044E	1102	CYRILLIC SMALL LETTER YU
-я	ja	044F	1103	CYRILLIC SMALL LETTER YA
-ё	io	0451	1105	CYRILLIC SMALL LETTER IO
-ђ	d%	0452	1106	CYRILLIC SMALL LETTER DJE
-ѓ	g%	0453	1107	CYRILLIC SMALL LETTER GJE
-є	ie	0454	1108	CYRILLIC SMALL LETTER UKRAINIAN IE
-ѕ	ds	0455	1109	CYRILLIC SMALL LETTER DZE
-і	ii	0456	1110	CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-ї	yi	0457	1111	CYRILLIC SMALL LETTER YI
-ј	j%	0458	1112	CYRILLIC SMALL LETTER JE
-љ	lj	0459	1113	CYRILLIC SMALL LETTER LJE
-њ	nj	045A	1114	CYRILLIC SMALL LETTER NJE
-ћ	ts	045B	1115	CYRILLIC SMALL LETTER TSHE
-ќ	kj	045C	1116	CYRILLIC SMALL LETTER KJE
-ў	v%	045E	1118	CYRILLIC SMALL LETTER SHORT U
-џ	dz	045F	1119	CYRILLIC SMALL LETTER DZHE
-Ѣ	Y3	0462	1122	CYRILLIC CAPITAL LETTER YAT
-ѣ	y3	0463	1123	CYRILLIC SMALL LETTER YAT
-Ѫ	O3	046A	1130	CYRILLIC CAPITAL LETTER BIG YUS
-ѫ	o3	046B	1131	CYRILLIC SMALL LETTER BIG YUS
-Ѳ	F3	0472	1138	CYRILLIC CAPITAL LETTER FITA
-ѳ	f3	0473	1139	CYRILLIC SMALL LETTER FITA
-Ѵ	V3	0474	1140	CYRILLIC CAPITAL LETTER IZHITSA
-ѵ	v3	0475	1141	CYRILLIC SMALL LETTER IZHITSA
-Ҁ	C3	0480	1152	CYRILLIC CAPITAL LETTER KOPPA
-ҁ	c3	0481	1153	CYRILLIC SMALL LETTER KOPPA
-Ґ	G3	0490	1168	CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-ґ	g3	0491	1169	CYRILLIC SMALL LETTER GHE WITH UPTURN
-א	A+	05D0	1488	HEBREW LETTER ALEF
-ב	B+	05D1	1489	HEBREW LETTER BET
-ג	G+	05D2	1490	HEBREW LETTER GIMEL
-ד	D+	05D3	1491	HEBREW LETTER DALET
-ה	H+	05D4	1492	HEBREW LETTER HE
-ו	W+	05D5	1493	HEBREW LETTER VAV
-ז	Z+	05D6	1494	HEBREW LETTER ZAYIN
-ח	X+	05D7	1495	HEBREW LETTER HET
-ט	Tj	05D8	1496	HEBREW LETTER TET
-י	J+	05D9	1497	HEBREW LETTER YOD
-ך	K%	05DA	1498	HEBREW LETTER FINAL KAF
-כ	K+	05DB	1499	HEBREW LETTER KAF
-ל	L+	05DC	1500	HEBREW LETTER LAMED
-ם	M%	05DD	1501	HEBREW LETTER FINAL MEM
-מ	M+	05DE	1502	HEBREW LETTER MEM
-ן	N%	05DF	1503	HEBREW LETTER FINAL NUN `
-נ	N+	05E0	1504	HEBREW LETTER NUN `
-ס	S+	05E1	1505	HEBREW LETTER SAMEKH
-ע	E+	05E2	1506	HEBREW LETTER AYIN
-ף	P%	05E3	1507	HEBREW LETTER FINAL PE
-פ	P+	05E4	1508	HEBREW LETTER PE
-ץ	Zj	05E5	1509	HEBREW LETTER FINAL TSADI
-צ	ZJ	05E6	1510	HEBREW LETTER TSADI
-ק	Q+	05E7	1511	HEBREW LETTER QOF
-ר	R+	05E8	1512	HEBREW LETTER RESH
-ש	Sh	05E9	1513	HEBREW LETTER SHIN
-ת	T+	05EA	1514	HEBREW LETTER TAV
-،	,+	060C	1548	ARABIC COMMA
-؛	;+	061B	1563	ARABIC SEMICOLON
-؟	?+	061F	1567	ARABIC QUESTION MARK
-ء	H'	0621	1569	ARABIC LETTER HAMZA
-آ	aM	0622	1570	ARABIC LETTER ALEF WITH MADDA ABOVE
-أ	aH	0623	1571	ARABIC LETTER ALEF WITH HAMZA ABOVE
-ؤ	wH	0624	1572	ARABIC LETTER WAW WITH HAMZA ABOVE
-إ	ah	0625	1573	ARABIC LETTER ALEF WITH HAMZA BELOW
-ئ	yH	0626	1574	ARABIC LETTER YEH WITH HAMZA ABOVE
-ا	a+	0627	1575	ARABIC LETTER ALEF
-ب	b+	0628	1576	ARABIC LETTER BEH
-ة	tm	0629	1577	ARABIC LETTER TEH MARBUTA
-ت	t+	062A	1578	ARABIC LETTER TEH
-ث	tk	062B	1579	ARABIC LETTER THEH
-ج	g+	062C	1580	ARABIC LETTER JEEM
-ح	hk	062D	1581	ARABIC LETTER HAH
-خ	x+	062E	1582	ARABIC LETTER KHAH
-د	d+	062F	1583	ARABIC LETTER DAL
-ذ	dk	0630	1584	ARABIC LETTER THAL
-ر	r+	0631	1585	ARABIC LETTER REH
-ز	z+	0632	1586	ARABIC LETTER ZAIN
-س	s+	0633	1587	ARABIC LETTER SEEN
-ش	sn	0634	1588	ARABIC LETTER SHEEN
-ص	c+	0635	1589	ARABIC LETTER SAD
-ض	dd	0636	1590	ARABIC LETTER DAD
-ط	tj	0637	1591	ARABIC LETTER TAH
-ظ	zH	0638	1592	ARABIC LETTER ZAH
-ع	e+	0639	1593	ARABIC LETTER AIN
-غ	i+	063A	1594	ARABIC LETTER GHAIN
-ـ	++	0640	1600	ARABIC TATWEEL
-ف	f+	0641	1601	ARABIC LETTER FEH
-ق	q+	0642	1602	ARABIC LETTER QAF
-ك	k+	0643	1603	ARABIC LETTER KAF
-ل	l+	0644	1604	ARABIC LETTER LAM
-م	m+	0645	1605	ARABIC LETTER MEEM
-ن	n+	0646	1606	ARABIC LETTER NOON
-ه	h+	0647	1607	ARABIC LETTER HEH
-و	w+	0648	1608	ARABIC LETTER WAW
-ى	j+	0649	1609	ARABIC LETTER ALEF MAKSURA
-ي	y+	064A	1610	ARABIC LETTER YEH
-ً	:+	064B	1611	ARABIC FATHATAN
-ٌ	"+	064C	1612	ARABIC DAMMATAN
-ٍ	=+	064D	1613	ARABIC KASRATAN
-َ	/+	064E	1614	ARABIC FATHA
-ُ	'+	064F	1615	ARABIC DAMMA
-ِ	1+	0650	1616	ARABIC KASRA
-ّ	3+	0651	1617	ARABIC SHADDA
-ْ	0+	0652	1618	ARABIC SUKUN
-ٰ	aS	0670	1648	ARABIC LETTER SUPERSCRIPT ALEF
-پ	p+	067E	1662	ARABIC LETTER PEH
-ڤ	v+	06A4	1700	ARABIC LETTER VEH
-گ	gf	06AF	1711	ARABIC LETTER GAF
-۰	0a	06F0	1776	EXTENDED ARABIC-INDIC DIGIT ZERO
-۱	1a	06F1	1777	EXTENDED ARABIC-INDIC DIGIT ONE
-۲	2a	06F2	1778	EXTENDED ARABIC-INDIC DIGIT TWO
-۳	3a	06F3	1779	EXTENDED ARABIC-INDIC DIGIT THREE
-۴	4a	06F4	1780	EXTENDED ARABIC-INDIC DIGIT FOUR
-۵	5a	06F5	1781	EXTENDED ARABIC-INDIC DIGIT FIVE
-۶	6a	06F6	1782	EXTENDED ARABIC-INDIC DIGIT SIX
-۷	7a	06F7	1783	EXTENDED ARABIC-INDIC DIGIT SEVEN
-۸	8a	06F8	1784	EXTENDED ARABIC-INDIC DIGIT EIGHT
-۹	9a	06F9	1785	EXTENDED ARABIC-INDIC DIGIT NINE
-Ḃ	B.	1E02	7682	LATIN CAPITAL LETTER B WITH DOT ABOVE
-ḃ	b.	1E03	7683	LATIN SMALL LETTER B WITH DOT ABOVE
-Ḇ	B_	1E06	7686	LATIN CAPITAL LETTER B WITH LINE BELOW
-ḇ	b_	1E07	7687	LATIN SMALL LETTER B WITH LINE BELOW
-Ḋ	D.	1E0A	7690	LATIN CAPITAL LETTER D WITH DOT ABOVE
-ḋ	d.	1E0B	7691	LATIN SMALL LETTER D WITH DOT ABOVE
-Ḏ	D_	1E0E	7694	LATIN CAPITAL LETTER D WITH LINE BELOW
-ḏ	d_	1E0F	7695	LATIN SMALL LETTER D WITH LINE BELOW
-Ḑ	D,	1E10	7696	LATIN CAPITAL LETTER D WITH CEDILLA
-ḑ	d,	1E11	7697	LATIN SMALL LETTER D WITH CEDILLA
-Ḟ	F.	1E1E	7710	LATIN CAPITAL LETTER F WITH DOT ABOVE
-ḟ	f.	1E1F	7711	LATIN SMALL LETTER F WITH DOT ABOVE
-Ḡ	G-	1E20	7712	LATIN CAPITAL LETTER G WITH MACRON
-ḡ	g-	1E21	7713	LATIN SMALL LETTER G WITH MACRON
-Ḣ	H.	1E22	7714	LATIN CAPITAL LETTER H WITH DOT ABOVE
-ḣ	h.	1E23	7715	LATIN SMALL LETTER H WITH DOT ABOVE
-Ḧ	H:	1E26	7718	LATIN CAPITAL LETTER H WITH DIAERESIS
-ḧ	h:	1E27	7719	LATIN SMALL LETTER H WITH DIAERESIS
-Ḩ	H,	1E28	7720	LATIN CAPITAL LETTER H WITH CEDILLA
-ḩ	h,	1E29	7721	LATIN SMALL LETTER H WITH CEDILLA
-Ḱ	K'	1E30	7728	LATIN CAPITAL LETTER K WITH ACUTE
-ḱ	k'	1E31	7729	LATIN SMALL LETTER K WITH ACUTE
-Ḵ	K_	1E34	7732	LATIN CAPITAL LETTER K WITH LINE BELOW
-ḵ	k_	1E35	7733	LATIN SMALL LETTER K WITH LINE BELOW
-Ḻ	L_	1E3A	7738	LATIN CAPITAL LETTER L WITH LINE BELOW
-ḻ	l_	1E3B	7739	LATIN SMALL LETTER L WITH LINE BELOW
-Ḿ	M'	1E3E	7742	LATIN CAPITAL LETTER M WITH ACUTE
-ḿ	m'	1E3F	7743	LATIN SMALL LETTER M WITH ACUTE
-Ṁ	M.	1E40	7744	LATIN CAPITAL LETTER M WITH DOT ABOVE
-ṁ	m.	1E41	7745	LATIN SMALL LETTER M WITH DOT ABOVE
-Ṅ	N.	1E44	7748	LATIN CAPITAL LETTER N WITH DOT ABOVE `
-ṅ	n.	1E45	7749	LATIN SMALL LETTER N WITH DOT ABOVE `
-Ṉ	N_	1E48	7752	LATIN CAPITAL LETTER N WITH LINE BELOW `
-ṉ	n_	1E49	7753	LATIN SMALL LETTER N WITH LINE BELOW `
-Ṕ	P'	1E54	7764	LATIN CAPITAL LETTER P WITH ACUTE
-ṕ	p'	1E55	7765	LATIN SMALL LETTER P WITH ACUTE
-Ṗ	P.	1E56	7766	LATIN CAPITAL LETTER P WITH DOT ABOVE
-ṗ	p.	1E57	7767	LATIN SMALL LETTER P WITH DOT ABOVE
-Ṙ	R.	1E58	7768	LATIN CAPITAL LETTER R WITH DOT ABOVE
-ṙ	r.	1E59	7769	LATIN SMALL LETTER R WITH DOT ABOVE
-Ṟ	R_	1E5E	7774	LATIN CAPITAL LETTER R WITH LINE BELOW
-ṟ	r_	1E5F	7775	LATIN SMALL LETTER R WITH LINE BELOW
-Ṡ	S.	1E60	7776	LATIN CAPITAL LETTER S WITH DOT ABOVE
-ṡ	s.	1E61	7777	LATIN SMALL LETTER S WITH DOT ABOVE
-Ṫ	T.	1E6A	7786	LATIN CAPITAL LETTER T WITH DOT ABOVE
-ṫ	t.	1E6B	7787	LATIN SMALL LETTER T WITH DOT ABOVE
-Ṯ	T_	1E6E	7790	LATIN CAPITAL LETTER T WITH LINE BELOW
-ṯ	t_	1E6F	7791	LATIN SMALL LETTER T WITH LINE BELOW
-Ṽ	V?	1E7C	7804	LATIN CAPITAL LETTER V WITH TILDE
-ṽ	v?	1E7D	7805	LATIN SMALL LETTER V WITH TILDE
-Ẁ	W!	1E80	7808	LATIN CAPITAL LETTER W WITH GRAVE
-ẁ	w!	1E81	7809	LATIN SMALL LETTER W WITH GRAVE
-Ẃ	W'	1E82	7810	LATIN CAPITAL LETTER W WITH ACUTE
-ẃ	w'	1E83	7811	LATIN SMALL LETTER W WITH ACUTE
-Ẅ	W:	1E84	7812	LATIN CAPITAL LETTER W WITH DIAERESIS
-ẅ	w:	1E85	7813	LATIN SMALL LETTER W WITH DIAERESIS
-Ẇ	W.	1E86	7814	LATIN CAPITAL LETTER W WITH DOT ABOVE
-ẇ	w.	1E87	7815	LATIN SMALL LETTER W WITH DOT ABOVE
-Ẋ	X.	1E8A	7818	LATIN CAPITAL LETTER X WITH DOT ABOVE
-ẋ	x.	1E8B	7819	LATIN SMALL LETTER X WITH DOT ABOVE
-Ẍ	X:	1E8C	7820	LATIN CAPITAL LETTER X WITH DIAERESIS
-ẍ	x:	1E8D	7821	LATIN SMALL LETTER X WITH DIAERESIS
-Ẏ	Y.	1E8E	7822	LATIN CAPITAL LETTER Y WITH DOT ABOVE
-ẏ	y.	1E8F	7823	LATIN SMALL LETTER Y WITH DOT ABOVE
-Ẑ	Z>	1E90	7824	LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
-ẑ	z>	1E91	7825	LATIN SMALL LETTER Z WITH CIRCUMFLEX
-Ẕ	Z_	1E94	7828	LATIN CAPITAL LETTER Z WITH LINE BELOW
-ẕ	z_	1E95	7829	LATIN SMALL LETTER Z WITH LINE BELOW
-ẖ	h_	1E96	7830	LATIN SMALL LETTER H WITH LINE BELOW
-ẗ	t:	1E97	7831	LATIN SMALL LETTER T WITH DIAERESIS
-ẘ	w0	1E98	7832	LATIN SMALL LETTER W WITH RING ABOVE
-ẙ	y0	1E99	7833	LATIN SMALL LETTER Y WITH RING ABOVE
-Ả	A2	1EA2	7842	LATIN CAPITAL LETTER A WITH HOOK ABOVE
-ả	a2	1EA3	7843	LATIN SMALL LETTER A WITH HOOK ABOVE
-Ẻ	E2	1EBA	7866	LATIN CAPITAL LETTER E WITH HOOK ABOVE
-ẻ	e2	1EBB	7867	LATIN SMALL LETTER E WITH HOOK ABOVE
-Ẽ	E?	1EBC	7868	LATIN CAPITAL LETTER E WITH TILDE
-ẽ	e?	1EBD	7869	LATIN SMALL LETTER E WITH TILDE
-Ỉ	I2	1EC8	7880	LATIN CAPITAL LETTER I WITH HOOK ABOVE
-ỉ	i2	1EC9	7881	LATIN SMALL LETTER I WITH HOOK ABOVE
-Ỏ	O2	1ECE	7886	LATIN CAPITAL LETTER O WITH HOOK ABOVE
-ỏ	o2	1ECF	7887	LATIN SMALL LETTER O WITH HOOK ABOVE
-Ủ	U2	1EE6	7910	LATIN CAPITAL LETTER U WITH HOOK ABOVE
-ủ	u2	1EE7	7911	LATIN SMALL LETTER U WITH HOOK ABOVE
-Ỳ	Y!	1EF2	7922	LATIN CAPITAL LETTER Y WITH GRAVE
-ỳ	y!	1EF3	7923	LATIN SMALL LETTER Y WITH GRAVE
-Ỷ	Y2	1EF6	7926	LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-ỷ	y2	1EF7	7927	LATIN SMALL LETTER Y WITH HOOK ABOVE
-Ỹ	Y?	1EF8	7928	LATIN CAPITAL LETTER Y WITH TILDE
-ỹ	y?	1EF9	7929	LATIN SMALL LETTER Y WITH TILDE
-ἀ	;'	1F00	7936	GREEK SMALL LETTER ALPHA WITH PSILI
-ἁ	,'	1F01	7937	GREEK SMALL LETTER ALPHA WITH DASIA
-ἂ	;!	1F02	7938	GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-ἃ	,!	1F03	7939	GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-ἄ	?;	1F04	7940	GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-ἅ	?,	1F05	7941	GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-ἆ	!:	1F06	7942	GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-ἇ	?:	1F07	7943	GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
- 	1N	2002	8194	EN SPACE
- 	1M	2003	8195	EM SPACE
- 	3M	2004	8196	THREE-PER-EM SPACE
- 	4M	2005	8197	FOUR-PER-EM SPACE
- 	6M	2006	8198	SIX-PER-EM SPACE
- 	1T	2009	8201	THIN SPACE
- 	1H	200A	8202	HAIR SPACE
-‐	-1	2010	8208	HYPHEN
-–	-N	2013	8211	EN DASH `
-—	-M	2014	8212	EM DASH
-―	-3	2015	8213	HORIZONTAL BAR
-‖	!2	2016	8214	DOUBLE VERTICAL LINE
-‗	=2	2017	8215	DOUBLE LOW LINE
-‘	'6	2018	8216	LEFT SINGLE QUOTATION MARK
-’	'9	2019	8217	RIGHT SINGLE QUOTATION MARK
-‚	.9	201A	8218	SINGLE LOW-9 QUOTATION MARK
-‛	9'	201B	8219	SINGLE HIGH-REVERSED-9 QUOTATION MARK
-“	"6	201C	8220	LEFT DOUBLE QUOTATION MARK
-”	"9	201D	8221	RIGHT DOUBLE QUOTATION MARK
-„	:9	201E	8222	DOUBLE LOW-9 QUOTATION MARK
-‟	9"	201F	8223	DOUBLE HIGH-REVERSED-9 QUOTATION MARK
-†	/-	2020	8224	DAGGER
-‡	/=	2021	8225	DOUBLE DAGGER
-•	oo	2022	8226	BULLET
-‥	..	2025	8229	TWO DOT LEADER
-…	,.	2026	8230	HORIZONTAL ELLIPSIS
-‰	%0	2030	8240	PER MILLE SIGN
-′	1'	2032	8242	PRIME
-″	2'	2033	8243	DOUBLE PRIME
-‴	3'	2034	8244	TRIPLE PRIME
-‵	1"	2035	8245	REVERSED PRIME
-‶	2"	2036	8246	REVERSED DOUBLE PRIME
-‷	3"	2037	8247	REVERSED TRIPLE PRIME
-‸	Ca	2038	8248	CARET
-‹	<1	2039	8249	SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-›	>1	203A	8250	SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-※	:X	203B	8251	REFERENCE MARK
-‾	'-	203E	8254	OVERLINE
-⁄	/f	2044	8260	FRACTION SLASH
-⁰	0S	2070	8304	SUPERSCRIPT ZERO
-⁴	4S	2074	8308	SUPERSCRIPT FOUR
-⁵	5S	2075	8309	SUPERSCRIPT FIVE
-⁶	6S	2076	8310	SUPERSCRIPT SIX
-⁷	7S	2077	8311	SUPERSCRIPT SEVEN
-⁸	8S	2078	8312	SUPERSCRIPT EIGHT
-⁹	9S	2079	8313	SUPERSCRIPT NINE
-⁺	+S	207A	8314	SUPERSCRIPT PLUS SIGN
-⁻	-S	207B	8315	SUPERSCRIPT MINUS
-⁼	=S	207C	8316	SUPERSCRIPT EQUALS SIGN
-⁽	(S	207D	8317	SUPERSCRIPT LEFT PARENTHESIS
-⁾	)S	207E	8318	SUPERSCRIPT RIGHT PARENTHESIS
-ⁿ	nS	207F	8319	SUPERSCRIPT LATIN SMALL LETTER N `
-₀	0s	2080	8320	SUBSCRIPT ZERO
-₁	1s	2081	8321	SUBSCRIPT ONE
-₂	2s	2082	8322	SUBSCRIPT TWO
-₃	3s	2083	8323	SUBSCRIPT THREE
-₄	4s	2084	8324	SUBSCRIPT FOUR
-₅	5s	2085	8325	SUBSCRIPT FIVE
-₆	6s	2086	8326	SUBSCRIPT SIX
-₇	7s	2087	8327	SUBSCRIPT SEVEN
-₈	8s	2088	8328	SUBSCRIPT EIGHT
-₉	9s	2089	8329	SUBSCRIPT NINE
-₊	+s	208A	8330	SUBSCRIPT PLUS SIGN
-₋	-s	208B	8331	SUBSCRIPT MINUS
-₌	=s	208C	8332	SUBSCRIPT EQUALS SIGN
-₍	(s	208D	8333	SUBSCRIPT LEFT PARENTHESIS
-₎	)s	208E	8334	SUBSCRIPT RIGHT PARENTHESIS
-₤	Li	20A4	8356	LIRA SIGN
-₧	Pt	20A7	8359	PESETA SIGN
-₩	W=	20A9	8361	WON SIGN
-€	Eu	20AC	8364	EURO SIGN
-₽	=R	20BD	8381	ROUBLE SIGN
-₽	=P	20BD	8381	ROUBLE SIGN
-℃	oC	2103	8451	DEGREE CELSIUS
-℅	co	2105	8453	CARE OF
-℉	oF	2109	8457	DEGREE FAHRENHEIT
-№	N0	2116	8470	NUMERO SIGN
-℗	PO	2117	8471	SOUND RECORDING COPYRIGHT
-℞	Rx	211E	8478	PRESCRIPTION TAKE
-℠	SM	2120	8480	SERVICE MARK
-™	TM	2122	8482	TRADE MARK SIGN
-Ω	Om	2126	8486	OHM SIGN
-Å	AO	212B	8491	ANGSTROM SIGN
-⅓	13	2153	8531	VULGAR FRACTION ONE THIRD
-⅔	23	2154	8532	VULGAR FRACTION TWO THIRDS
-⅕	15	2155	8533	VULGAR FRACTION ONE FIFTH
-⅖	25	2156	8534	VULGAR FRACTION TWO FIFTHS
-⅗	35	2157	8535	VULGAR FRACTION THREE FIFTHS
-⅘	45	2158	8536	VULGAR FRACTION FOUR FIFTHS
-⅙	16	2159	8537	VULGAR FRACTION ONE SIXTH
-⅚	56	215A	8538	VULGAR FRACTION FIVE SIXTHS
-⅛	18	215B	8539	VULGAR FRACTION ONE EIGHTH
-⅜	38	215C	8540	VULGAR FRACTION THREE EIGHTHS
-⅝	58	215D	8541	VULGAR FRACTION FIVE EIGHTHS
-⅞	78	215E	8542	VULGAR FRACTION SEVEN EIGHTHS
-Ⅰ	1R	2160	8544	ROMAN NUMERAL ONE
-Ⅱ	2R	2161	8545	ROMAN NUMERAL TWO
-Ⅲ	3R	2162	8546	ROMAN NUMERAL THREE
-Ⅳ	4R	2163	8547	ROMAN NUMERAL FOUR
-Ⅴ	5R	2164	8548	ROMAN NUMERAL FIVE
-Ⅵ	6R	2165	8549	ROMAN NUMERAL SIX
-Ⅶ	7R	2166	8550	ROMAN NUMERAL SEVEN
-Ⅷ	8R	2167	8551	ROMAN NUMERAL EIGHT
-Ⅸ	9R	2168	8552	ROMAN NUMERAL NINE
-Ⅹ	aR	2169	8553	ROMAN NUMERAL TEN
-Ⅺ	bR	216A	8554	ROMAN NUMERAL ELEVEN
-Ⅻ	cR	216B	8555	ROMAN NUMERAL TWELVE
-ⅰ	1r	2170	8560	SMALL ROMAN NUMERAL ONE
-ⅱ	2r	2171	8561	SMALL ROMAN NUMERAL TWO
-ⅲ	3r	2172	8562	SMALL ROMAN NUMERAL THREE
-ⅳ	4r	2173	8563	SMALL ROMAN NUMERAL FOUR
-ⅴ	5r	2174	8564	SMALL ROMAN NUMERAL FIVE
-ⅵ	6r	2175	8565	SMALL ROMAN NUMERAL SIX
-ⅶ	7r	2176	8566	SMALL ROMAN NUMERAL SEVEN
-ⅷ	8r	2177	8567	SMALL ROMAN NUMERAL EIGHT
-ⅸ	9r	2178	8568	SMALL ROMAN NUMERAL NINE
-ⅹ	ar	2179	8569	SMALL ROMAN NUMERAL TEN
-ⅺ	br	217A	8570	SMALL ROMAN NUMERAL ELEVEN
-ⅻ	cr	217B	8571	SMALL ROMAN NUMERAL TWELVE
-←	<-	2190	8592	LEFTWARDS ARROW
-↑	-!	2191	8593	UPWARDS ARROW
-→	->	2192	8594	RIGHTWARDS ARROW
-↓	-v	2193	8595	DOWNWARDS ARROW
-↔	<>	2194	8596	LEFT RIGHT ARROW
-↕	UD	2195	8597	UP DOWN ARROW
-⇐	<=	21D0	8656	LEFTWARDS DOUBLE ARROW
-⇒	=>	21D2	8658	RIGHTWARDS DOUBLE ARROW
-⇔	==	21D4	8660	LEFT RIGHT DOUBLE ARROW
-∀	FA	2200	8704	FOR ALL
-∂	dP	2202	8706	PARTIAL DIFFERENTIAL
-∃	TE	2203	8707	THERE EXISTS
-∅	/0	2205	8709	EMPTY SET
-∆	DE	2206	8710	INCREMENT
-∇	NB	2207	8711	NABLA
-∈	(-	2208	8712	ELEMENT OF
-∋	-)	220B	8715	CONTAINS AS MEMBER
-∏	*P	220F	8719	N-ARY PRODUCT `
-∑	+Z	2211	8721	N-ARY SUMMATION `
-−	-2	2212	8722	MINUS SIGN
-∓	-+	2213	8723	MINUS-OR-PLUS SIGN
-∗	*-	2217	8727	ASTERISK OPERATOR
-∘	Ob	2218	8728	RING OPERATOR
-∙	Sb	2219	8729	BULLET OPERATOR
-√	RT	221A	8730	SQUARE ROOT
-∝	0(	221D	8733	PROPORTIONAL TO
-∞	00	221E	8734	INFINITY
-∟	-L	221F	8735	RIGHT ANGLE
-∠	-V	2220	8736	ANGLE
-∥	PP	2225	8741	PARALLEL TO
-∧	AN	2227	8743	LOGICAL AND
-∨	OR	2228	8744	LOGICAL OR
-∩	(U	2229	8745	INTERSECTION
-∪	)U	222A	8746	UNION
-∫	In	222B	8747	INTEGRAL
-∬	DI	222C	8748	DOUBLE INTEGRAL
-∮	Io	222E	8750	CONTOUR INTEGRAL
-∴	.:	2234	8756	THEREFORE
-∵	:.	2235	8757	BECAUSE
-∶	:R	2236	8758	RATIO
-∷	::	2237	8759	PROPORTION
-∼	?1	223C	8764	TILDE OPERATOR
-∾	CG	223E	8766	INVERTED LAZY S
-≃	?-	2243	8771	ASYMPTOTICALLY EQUAL TO
-≅	?=	2245	8773	APPROXIMATELY EQUAL TO
-≈	?2	2248	8776	ALMOST EQUAL TO
-≌	=?	224C	8780	ALL EQUAL TO
-≓	HI	2253	8787	IMAGE OF OR APPROXIMATELY EQUAL TO
-≠	!=	2260	8800	NOT EQUAL TO
-≡	=3	2261	8801	IDENTICAL TO
-≤	=<	2264	8804	LESS-THAN OR EQUAL TO
-≥	>=	2265	8805	GREATER-THAN OR EQUAL TO
-≪	<*	226A	8810	MUCH LESS-THAN
-≫	*>	226B	8811	MUCH GREATER-THAN
-≮	!<	226E	8814	NOT LESS-THAN
-≯	!>	226F	8815	NOT GREATER-THAN
-⊂	(C	2282	8834	SUBSET OF
-⊃	)C	2283	8835	SUPERSET OF
-⊆	(_	2286	8838	SUBSET OF OR EQUAL TO
-⊇	)_	2287	8839	SUPERSET OF OR EQUAL TO
-⊙	0.	2299	8857	CIRCLED DOT OPERATOR
-⊚	02	229A	8858	CIRCLED RING OPERATOR
-⊥	-T	22A5	8869	UP TACK
-⋅	.P	22C5	8901	DOT OPERATOR
-⋮	:3	22EE	8942	VERTICAL ELLIPSIS
-⋯	.3	22EF	8943	MIDLINE HORIZONTAL ELLIPSIS
-⌂	Eh	2302	8962	HOUSE
-⌈	<7	2308	8968	LEFT CEILING
-⌉	>7	2309	8969	RIGHT CEILING
-⌊	7<	230A	8970	LEFT FLOOR
-⌋	7>	230B	8971	RIGHT FLOOR
-⌐	NI	2310	8976	REVERSED NOT SIGN
-⌒	(A	2312	8978	ARC
-⌕	TR	2315	8981	TELEPHONE RECORDER
-⌠	Iu	2320	8992	TOP HALF INTEGRAL
-⌡	Il	2321	8993	BOTTOM HALF INTEGRAL
-〈	</	2329	9001	LEFT-POINTING ANGLE BRACKET
-〉	/>	232A	9002	RIGHT-POINTING ANGLE BRACKET
-␣	Vs	2423	9251	OPEN BOX
-⑀	1h	2440	9280	OCR HOOK
-⑁	3h	2441	9281	OCR CHAIR
-⑂	2h	2442	9282	OCR FORK
-⑃	4h	2443	9283	OCR INVERTED FORK
-⑆	1j	2446	9286	OCR BRANCH BANK IDENTIFICATION
-⑇	2j	2447	9287	OCR AMOUNT OF CHECK
-⑈	3j	2448	9288	OCR DASH
-⑉	4j	2449	9289	OCR CUSTOMER ACCOUNT NUMBER
-⒈	1.	2488	9352	DIGIT ONE FULL STOP
-⒉	2.	2489	9353	DIGIT TWO FULL STOP
-⒊	3.	248A	9354	DIGIT THREE FULL STOP
-⒋	4.	248B	9355	DIGIT FOUR FULL STOP
-⒌	5.	248C	9356	DIGIT FIVE FULL STOP
-⒍	6.	248D	9357	DIGIT SIX FULL STOP
-⒎	7.	248E	9358	DIGIT SEVEN FULL STOP
-⒏	8.	248F	9359	DIGIT EIGHT FULL STOP
-⒐	9.	2490	9360	DIGIT NINE FULL STOP
-─	hh	2500	9472	BOX DRAWINGS LIGHT HORIZONTAL
-━	HH	2501	9473	BOX DRAWINGS HEAVY HORIZONTAL
-│	vv	2502	9474	BOX DRAWINGS LIGHT VERTICAL
-┃	VV	2503	9475	BOX DRAWINGS HEAVY VERTICAL
-┄	3-	2504	9476	BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL
-┅	3_	2505	9477	BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL
-┆	3!	2506	9478	BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL
-┇	3/	2507	9479	BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL
-┈	4-	2508	9480	BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL
-┉	4_	2509	9481	BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL
-┊	4!	250A	9482	BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL
-┋	4/	250B	9483	BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL
-┌	dr	250C	9484	BOX DRAWINGS LIGHT DOWN AND RIGHT
-┍	dR	250D	9485	BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
-┎	Dr	250E	9486	BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
-┏	DR	250F	9487	BOX DRAWINGS HEAVY DOWN AND RIGHT
-┐	dl	2510	9488	BOX DRAWINGS LIGHT DOWN AND LEFT
-┑	dL	2511	9489	BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
-┒	Dl	2512	9490	BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
-┓	LD	2513	9491	BOX DRAWINGS HEAVY DOWN AND LEFT
-└	ur	2514	9492	BOX DRAWINGS LIGHT UP AND RIGHT
-┕	uR	2515	9493	BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
-┖	Ur	2516	9494	BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
-┗	UR	2517	9495	BOX DRAWINGS HEAVY UP AND RIGHT
-┘	ul	2518	9496	BOX DRAWINGS LIGHT UP AND LEFT
-┙	uL	2519	9497	BOX DRAWINGS UP LIGHT AND LEFT HEAVY
-┚	Ul	251A	9498	BOX DRAWINGS UP HEAVY AND LEFT LIGHT
-┛	UL	251B	9499	BOX DRAWINGS HEAVY UP AND LEFT
-├	vr	251C	9500	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-┝	vR	251D	9501	BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
-┠	Vr	2520	9504	BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
-┣	VR	2523	9507	BOX DRAWINGS HEAVY VERTICAL AND RIGHT
-┤	vl	2524	9508	BOX DRAWINGS LIGHT VERTICAL AND LEFT
-┥	vL	2525	9509	BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
-┨	Vl	2528	9512	BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
-┫	VL	252B	9515	BOX DRAWINGS HEAVY VERTICAL AND LEFT
-┬	dh	252C	9516	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-┯	dH	252F	9519	BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
-┰	Dh	2530	9520	BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
-┳	DH	2533	9523	BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
-┴	uh	2534	9524	BOX DRAWINGS LIGHT UP AND HORIZONTAL
-┷	uH	2537	9527	BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
-┸	Uh	2538	9528	BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
-┻	UH	253B	9531	BOX DRAWINGS HEAVY UP AND HORIZONTAL
-┼	vh	253C	9532	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-┿	vH	253F	9535	BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
-╂	Vh	2542	9538	BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
-╋	VH	254B	9547	BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
-╱	FD	2571	9585	BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
-╲	BD	2572	9586	BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
-▀	TB	2580	9600	UPPER HALF BLOCK
-▄	LB	2584	9604	LOWER HALF BLOCK
-█	FB	2588	9608	FULL BLOCK
-▌	lB	258C	9612	LEFT HALF BLOCK
-▐	RB	2590	9616	RIGHT HALF BLOCK
-░	.S	2591	9617	LIGHT SHADE
-▒	:S	2592	9618	MEDIUM SHADE
-▓	?S	2593	9619	DARK SHADE
-■	fS	25A0	9632	BLACK SQUARE
-□	OS	25A1	9633	WHITE SQUARE
-▢	RO	25A2	9634	WHITE SQUARE WITH ROUNDED CORNERS
-▣	Rr	25A3	9635	WHITE SQUARE CONTAINING BLACK SMALL SQUARE
-▤	RF	25A4	9636	SQUARE WITH HORIZONTAL FILL
-▥	RY	25A5	9637	SQUARE WITH VERTICAL FILL
-▦	RH	25A6	9638	SQUARE WITH ORTHOGONAL CROSSHATCH FILL
-▧	RZ	25A7	9639	SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL
-▨	RK	25A8	9640	SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL
-▩	RX	25A9	9641	SQUARE WITH DIAGONAL CROSSHATCH FILL
-▪	sB	25AA	9642	BLACK SMALL SQUARE
-▬	SR	25AC	9644	BLACK RECTANGLE
-▭	Or	25AD	9645	WHITE RECTANGLE
-▲	UT	25B2	9650	BLACK UP-POINTING TRIANGLE
-△	uT	25B3	9651	WHITE UP-POINTING TRIANGLE
-▶	PR	25B6	9654	BLACK RIGHT-POINTING TRIANGLE
-▷	Tr	25B7	9655	WHITE RIGHT-POINTING TRIANGLE
-▼	Dt	25BC	9660	BLACK DOWN-POINTING TRIANGLE
-▽	dT	25BD	9661	WHITE DOWN-POINTING TRIANGLE
-◀	PL	25C0	9664	BLACK LEFT-POINTING TRIANGLE
-◁	Tl	25C1	9665	WHITE LEFT-POINTING TRIANGLE
-◆	Db	25C6	9670	BLACK DIAMOND
-◇	Dw	25C7	9671	WHITE DIAMOND
-◊	LZ	25CA	9674	LOZENGE
-○	0m	25CB	9675	WHITE CIRCLE
-◎	0o	25CE	9678	BULLSEYE
-●	0M	25CF	9679	BLACK CIRCLE
-◐	0L	25D0	9680	CIRCLE WITH LEFT HALF BLACK
-◑	0R	25D1	9681	CIRCLE WITH RIGHT HALF BLACK
-◘	Sn	25D8	9688	INVERSE BULLET
-◙	Ic	25D9	9689	INVERSE WHITE CIRCLE
-◢	Fd	25E2	9698	BLACK LOWER RIGHT TRIANGLE
-◣	Bd	25E3	9699	BLACK LOWER LEFT TRIANGLE
-★	*2	2605	9733	BLACK STAR
-☆	*1	2606	9734	WHITE STAR
-☜	<H	261C	9756	WHITE LEFT POINTING INDEX
-☞	>H	261E	9758	WHITE RIGHT POINTING INDEX
-☺	0u	263A	9786	WHITE SMILING FACE
-☻	0U	263B	9787	BLACK SMILING FACE
-☼	SU	263C	9788	WHITE SUN WITH RAYS
-♀	Fm	2640	9792	FEMALE SIGN
-♂	Ml	2642	9794	MALE SIGN
-♠	cS	2660	9824	BLACK SPADE SUIT
-♡	cH	2661	9825	WHITE HEART SUIT
-♢	cD	2662	9826	WHITE DIAMOND SUIT
-♣	cC	2663	9827	BLACK CLUB SUIT
-♩	Md	2669	9833	QUARTER NOTE `
-♪	M8	266A	9834	EIGHTH NOTE `
-♫	M2	266B	9835	BEAMED EIGHTH NOTES
-♭	Mb	266D	9837	MUSIC FLAT SIGN
-♮	Mx	266E	9838	MUSIC NATURAL SIGN
-♯	MX	266F	9839	MUSIC SHARP SIGN
-✓	OK	2713	10003	CHECK MARK
-✗	XX	2717	10007	BALLOT X
-✠	-X	2720	10016	MALTESE CROSS
-　	IS	3000	12288	IDEOGRAPHIC SPACE
-、	,_	3001	12289	IDEOGRAPHIC COMMA
-。	._	3002	12290	IDEOGRAPHIC FULL STOP
-〃	+"	3003	12291	DITTO MARK
-〄	+_	3004	12292	JAPANESE INDUSTRIAL STANDARD SYMBOL
-々	*_	3005	12293	IDEOGRAPHIC ITERATION MARK
-〆	;_	3006	12294	IDEOGRAPHIC CLOSING MARK
-〇	0_	3007	12295	IDEOGRAPHIC NUMBER ZERO
-《	<+	300A	12298	LEFT DOUBLE ANGLE BRACKET
-》	>+	300B	12299	RIGHT DOUBLE ANGLE BRACKET
-「	<'	300C	12300	LEFT CORNER BRACKET
-」	>'	300D	12301	RIGHT CORNER BRACKET
-『	<"	300E	12302	LEFT WHITE CORNER BRACKET
-』	>"	300F	12303	RIGHT WHITE CORNER BRACKET
-【	("	3010	12304	LEFT BLACK LENTICULAR BRACKET
-】	)"	3011	12305	RIGHT BLACK LENTICULAR BRACKET
-〒	=T	3012	12306	POSTAL MARK
-〓	=_	3013	12307	GETA MARK
-〔	('	3014	12308	LEFT TORTOISE SHELL BRACKET
-〕	)'	3015	12309	RIGHT TORTOISE SHELL BRACKET
-〖	(I	3016	12310	LEFT WHITE LENTICULAR BRACKET
-〗	)I	3017	12311	RIGHT WHITE LENTICULAR BRACKET
-〜	-?	301C	12316	WAVE DASH
-ぁ	A5	3041	12353	HIRAGANA LETTER SMALL A
-あ	a5	3042	12354	HIRAGANA LETTER A
-ぃ	I5	3043	12355	HIRAGANA LETTER SMALL I
-い	i5	3044	12356	HIRAGANA LETTER I
-ぅ	U5	3045	12357	HIRAGANA LETTER SMALL U
-う	u5	3046	12358	HIRAGANA LETTER U
-ぇ	E5	3047	12359	HIRAGANA LETTER SMALL E
-え	e5	3048	12360	HIRAGANA LETTER E
-ぉ	O5	3049	12361	HIRAGANA LETTER SMALL O
-お	o5	304A	12362	HIRAGANA LETTER O
-か	ka	304B	12363	HIRAGANA LETTER KA
-が	ga	304C	12364	HIRAGANA LETTER GA
-き	ki	304D	12365	HIRAGANA LETTER KI
-ぎ	gi	304E	12366	HIRAGANA LETTER GI
-く	ku	304F	12367	HIRAGANA LETTER KU
-ぐ	gu	3050	12368	HIRAGANA LETTER GU
-け	ke	3051	12369	HIRAGANA LETTER KE
-げ	ge	3052	12370	HIRAGANA LETTER GE
-こ	ko	3053	12371	HIRAGANA LETTER KO
-ご	go	3054	12372	HIRAGANA LETTER GO
-さ	sa	3055	12373	HIRAGANA LETTER SA
-ざ	za	3056	12374	HIRAGANA LETTER ZA
-し	si	3057	12375	HIRAGANA LETTER SI
-じ	zi	3058	12376	HIRAGANA LETTER ZI
-す	su	3059	12377	HIRAGANA LETTER SU
-ず	zu	305A	12378	HIRAGANA LETTER ZU
-せ	se	305B	12379	HIRAGANA LETTER SE
-ぜ	ze	305C	12380	HIRAGANA LETTER ZE
-そ	so	305D	12381	HIRAGANA LETTER SO
-ぞ	zo	305E	12382	HIRAGANA LETTER ZO
-た	ta	305F	12383	HIRAGANA LETTER TA
-だ	da	3060	12384	HIRAGANA LETTER DA
-ち	ti	3061	12385	HIRAGANA LETTER TI
-ぢ	di	3062	12386	HIRAGANA LETTER DI
-っ	tU	3063	12387	HIRAGANA LETTER SMALL TU
-つ	tu	3064	12388	HIRAGANA LETTER TU
-づ	du	3065	12389	HIRAGANA LETTER DU
-て	te	3066	12390	HIRAGANA LETTER TE
-で	de	3067	12391	HIRAGANA LETTER DE
-と	to	3068	12392	HIRAGANA LETTER TO
-ど	do	3069	12393	HIRAGANA LETTER DO
-な	na	306A	12394	HIRAGANA LETTER NA
-に	ni	306B	12395	HIRAGANA LETTER NI
-ぬ	nu	306C	12396	HIRAGANA LETTER NU
-ね	ne	306D	12397	HIRAGANA LETTER NE
-の	no	306E	12398	HIRAGANA LETTER NO
-は	ha	306F	12399	HIRAGANA LETTER HA
-ば	ba	3070	12400	HIRAGANA LETTER BA
-ぱ	pa	3071	12401	HIRAGANA LETTER PA
-ひ	hi	3072	12402	HIRAGANA LETTER HI
-び	bi	3073	12403	HIRAGANA LETTER BI
-ぴ	pi	3074	12404	HIRAGANA LETTER PI
-ふ	hu	3075	12405	HIRAGANA LETTER HU
-ぶ	bu	3076	12406	HIRAGANA LETTER BU
-ぷ	pu	3077	12407	HIRAGANA LETTER PU
-へ	he	3078	12408	HIRAGANA LETTER HE
-べ	be	3079	12409	HIRAGANA LETTER BE
-ぺ	pe	307A	12410	HIRAGANA LETTER PE
-ほ	ho	307B	12411	HIRAGANA LETTER HO
-ぼ	bo	307C	12412	HIRAGANA LETTER BO
-ぽ	po	307D	12413	HIRAGANA LETTER PO
-ま	ma	307E	12414	HIRAGANA LETTER MA
-み	mi	307F	12415	HIRAGANA LETTER MI
-む	mu	3080	12416	HIRAGANA LETTER MU
-め	me	3081	12417	HIRAGANA LETTER ME
-も	mo	3082	12418	HIRAGANA LETTER MO
-ゃ	yA	3083	12419	HIRAGANA LETTER SMALL YA
-や	ya	3084	12420	HIRAGANA LETTER YA
-ゅ	yU	3085	12421	HIRAGANA LETTER SMALL YU
-ゆ	yu	3086	12422	HIRAGANA LETTER YU
-ょ	yO	3087	12423	HIRAGANA LETTER SMALL YO
-よ	yo	3088	12424	HIRAGANA LETTER YO
-ら	ra	3089	12425	HIRAGANA LETTER RA
-り	ri	308A	12426	HIRAGANA LETTER RI
-る	ru	308B	12427	HIRAGANA LETTER RU
-れ	re	308C	12428	HIRAGANA LETTER RE
-ろ	ro	308D	12429	HIRAGANA LETTER RO
-ゎ	wA	308E	12430	HIRAGANA LETTER SMALL WA
-わ	wa	308F	12431	HIRAGANA LETTER WA
-ゐ	wi	3090	12432	HIRAGANA LETTER WI
-ゑ	we	3091	12433	HIRAGANA LETTER WE
-を	wo	3092	12434	HIRAGANA LETTER WO
-ん	n5	3093	12435	HIRAGANA LETTER N `
-ゔ	vu	3094	12436	HIRAGANA LETTER VU
-゛	"5	309B	12443	KATAKANA-HIRAGANA VOICED SOUND MARK
-゜	05	309C	12444	KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
-ゝ	*5	309D	12445	HIRAGANA ITERATION MARK
-ゞ	+5	309E	12446	HIRAGANA VOICED ITERATION MARK
-ァ	a6	30A1	12449	KATAKANA LETTER SMALL A
-ア	A6	30A2	12450	KATAKANA LETTER A
-ィ	i6	30A3	12451	KATAKANA LETTER SMALL I
-イ	I6	30A4	12452	KATAKANA LETTER I
-ゥ	u6	30A5	12453	KATAKANA LETTER SMALL U
-ウ	U6	30A6	12454	KATAKANA LETTER U
-ェ	e6	30A7	12455	KATAKANA LETTER SMALL E
-エ	E6	30A8	12456	KATAKANA LETTER E
-ォ	o6	30A9	12457	KATAKANA LETTER SMALL O
-オ	O6	30AA	12458	KATAKANA LETTER O
-カ	Ka	30AB	12459	KATAKANA LETTER KA
-ガ	Ga	30AC	12460	KATAKANA LETTER GA
-キ	Ki	30AD	12461	KATAKANA LETTER KI
-ギ	Gi	30AE	12462	KATAKANA LETTER GI
-ク	Ku	30AF	12463	KATAKANA LETTER KU
-グ	Gu	30B0	12464	KATAKANA LETTER GU
-ケ	Ke	30B1	12465	KATAKANA LETTER KE
-ゲ	Ge	30B2	12466	KATAKANA LETTER GE
-コ	Ko	30B3	12467	KATAKANA LETTER KO
-ゴ	Go	30B4	12468	KATAKANA LETTER GO
-サ	Sa	30B5	12469	KATAKANA LETTER SA
-ザ	Za	30B6	12470	KATAKANA LETTER ZA
-シ	Si	30B7	12471	KATAKANA LETTER SI
-ジ	Zi	30B8	12472	KATAKANA LETTER ZI
-ス	Su	30B9	12473	KATAKANA LETTER SU
-ズ	Zu	30BA	12474	KATAKANA LETTER ZU
-セ	Se	30BB	12475	KATAKANA LETTER SE
-ゼ	Ze	30BC	12476	KATAKANA LETTER ZE
-ソ	So	30BD	12477	KATAKANA LETTER SO
-ゾ	Zo	30BE	12478	KATAKANA LETTER ZO
-タ	Ta	30BF	12479	KATAKANA LETTER TA
-ダ	Da	30C0	12480	KATAKANA LETTER DA
-チ	Ti	30C1	12481	KATAKANA LETTER TI
-ヂ	Di	30C2	12482	KATAKANA LETTER DI
-ッ	TU	30C3	12483	KATAKANA LETTER SMALL TU
-ツ	Tu	30C4	12484	KATAKANA LETTER TU
-ヅ	Du	30C5	12485	KATAKANA LETTER DU
-テ	Te	30C6	12486	KATAKANA LETTER TE
-デ	De	30C7	12487	KATAKANA LETTER DE
-ト	To	30C8	12488	KATAKANA LETTER TO
-ド	Do	30C9	12489	KATAKANA LETTER DO
-ナ	Na	30CA	12490	KATAKANA LETTER NA
-ニ	Ni	30CB	12491	KATAKANA LETTER NI
-ヌ	Nu	30CC	12492	KATAKANA LETTER NU
-ネ	Ne	30CD	12493	KATAKANA LETTER NE
-ノ	No	30CE	12494	KATAKANA LETTER NO
-ハ	Ha	30CF	12495	KATAKANA LETTER HA
-バ	Ba	30D0	12496	KATAKANA LETTER BA
-パ	Pa	30D1	12497	KATAKANA LETTER PA
-ヒ	Hi	30D2	12498	KATAKANA LETTER HI
-ビ	Bi	30D3	12499	KATAKANA LETTER BI
-ピ	Pi	30D4	12500	KATAKANA LETTER PI
-フ	Hu	30D5	12501	KATAKANA LETTER HU
-ブ	Bu	30D6	12502	KATAKANA LETTER BU
-プ	Pu	30D7	12503	KATAKANA LETTER PU
-ヘ	He	30D8	12504	KATAKANA LETTER HE
-ベ	Be	30D9	12505	KATAKANA LETTER BE
-ペ	Pe	30DA	12506	KATAKANA LETTER PE
-ホ	Ho	30DB	12507	KATAKANA LETTER HO
-ボ	Bo	30DC	12508	KATAKANA LETTER BO
-ポ	Po	30DD	12509	KATAKANA LETTER PO
-マ	Ma	30DE	12510	KATAKANA LETTER MA
-ミ	Mi	30DF	12511	KATAKANA LETTER MI
-ム	Mu	30E0	12512	KATAKANA LETTER MU
-メ	Me	30E1	12513	KATAKANA LETTER ME
-モ	Mo	30E2	12514	KATAKANA LETTER MO
-ャ	YA	30E3	12515	KATAKANA LETTER SMALL YA
-ヤ	Ya	30E4	12516	KATAKANA LETTER YA
-ュ	YU	30E5	12517	KATAKANA LETTER SMALL YU
-ユ	Yu	30E6	12518	KATAKANA LETTER YU
-ョ	YO	30E7	12519	KATAKANA LETTER SMALL YO
-ヨ	Yo	30E8	12520	KATAKANA LETTER YO
-ラ	Ra	30E9	12521	KATAKANA LETTER RA
-リ	Ri	30EA	12522	KATAKANA LETTER RI
-ル	Ru	30EB	12523	KATAKANA LETTER RU
-レ	Re	30EC	12524	KATAKANA LETTER RE
-ロ	Ro	30ED	12525	KATAKANA LETTER RO
-ヮ	WA	30EE	12526	KATAKANA LETTER SMALL WA
-ワ	Wa	30EF	12527	KATAKANA LETTER WA
-ヰ	Wi	30F0	12528	KATAKANA LETTER WI
-ヱ	We	30F1	12529	KATAKANA LETTER WE
-ヲ	Wo	30F2	12530	KATAKANA LETTER WO
-ン	N6	30F3	12531	KATAKANA LETTER N `
-ヴ	Vu	30F4	12532	KATAKANA LETTER VU
-ヵ	KA	30F5	12533	KATAKANA LETTER SMALL KA
-ヶ	KE	30F6	12534	KATAKANA LETTER SMALL KE
-ヷ	Va	30F7	12535	KATAKANA LETTER VA
-ヸ	Vi	30F8	12536	KATAKANA LETTER VI
-ヹ	Ve	30F9	12537	KATAKANA LETTER VE
-ヺ	Vo	30FA	12538	KATAKANA LETTER VO
-・	.6	30FB	12539	KATAKANA MIDDLE DOT
-ー	-6	30FC	12540	KATAKANA-HIRAGANA PROLONGED SOUND MARK
-ヽ	*6	30FD	12541	KATAKANA ITERATION MARK
-ヾ	+6	30FE	12542	KATAKANA VOICED ITERATION MARK
-ㄅ	b4	3105	12549	BOPOMOFO LETTER B
-ㄆ	p4	3106	12550	BOPOMOFO LETTER P
-ㄇ	m4	3107	12551	BOPOMOFO LETTER M
-ㄈ	f4	3108	12552	BOPOMOFO LETTER F
-ㄉ	d4	3109	12553	BOPOMOFO LETTER D
-ㄊ	t4	310A	12554	BOPOMOFO LETTER T
-ㄋ	n4	310B	12555	BOPOMOFO LETTER N `
-ㄌ	l4	310C	12556	BOPOMOFO LETTER L
-ㄍ	g4	310D	12557	BOPOMOFO LETTER G
-ㄎ	k4	310E	12558	BOPOMOFO LETTER K
-ㄏ	h4	310F	12559	BOPOMOFO LETTER H
-ㄐ	j4	3110	12560	BOPOMOFO LETTER J
-ㄑ	q4	3111	12561	BOPOMOFO LETTER Q
-ㄒ	x4	3112	12562	BOPOMOFO LETTER X
-ㄓ	zh	3113	12563	BOPOMOFO LETTER ZH
-ㄔ	ch	3114	12564	BOPOMOFO LETTER CH
-ㄕ	sh	3115	12565	BOPOMOFO LETTER SH
-ㄖ	r4	3116	12566	BOPOMOFO LETTER R
-ㄗ	z4	3117	12567	BOPOMOFO LETTER Z
-ㄘ	c4	3118	12568	BOPOMOFO LETTER C
-ㄙ	s4	3119	12569	BOPOMOFO LETTER S
-ㄚ	a4	311A	12570	BOPOMOFO LETTER A
-ㄛ	o4	311B	12571	BOPOMOFO LETTER O
-ㄜ	e4	311C	12572	BOPOMOFO LETTER E
-ㄞ	ai	311E	12574	BOPOMOFO LETTER AI
-ㄟ	ei	311F	12575	BOPOMOFO LETTER EI
-ㄠ	au	3120	12576	BOPOMOFO LETTER AU
-ㄡ	ou	3121	12577	BOPOMOFO LETTER OU
-ㄢ	an	3122	12578	BOPOMOFO LETTER AN
-ㄣ	en	3123	12579	BOPOMOFO LETTER EN
-ㄤ	aN	3124	12580	BOPOMOFO LETTER ANG
-ㄥ	eN	3125	12581	BOPOMOFO LETTER ENG
-ㄦ	er	3126	12582	BOPOMOFO LETTER ER
-ㄧ	i4	3127	12583	BOPOMOFO LETTER I
-ㄨ	u4	3128	12584	BOPOMOFO LETTER U
-ㄩ	iu	3129	12585	BOPOMOFO LETTER IU
-ㄪ	v4	312A	12586	BOPOMOFO LETTER V
-ㄫ	nG	312B	12587	BOPOMOFO LETTER NG
-ㄬ	gn	312C	12588	BOPOMOFO LETTER GN
-㈠	1c	3220	12832	PARENTHESIZED IDEOGRAPH ONE
-㈡	2c	3221	12833	PARENTHESIZED IDEOGRAPH TWO
-㈢	3c	3222	12834	PARENTHESIZED IDEOGRAPH THREE
-㈣	4c	3223	12835	PARENTHESIZED IDEOGRAPH FOUR
-㈤	5c	3224	12836	PARENTHESIZED IDEOGRAPH FIVE
-㈥	6c	3225	12837	PARENTHESIZED IDEOGRAPH SIX
-㈦	7c	3226	12838	PARENTHESIZED IDEOGRAPH SEVEN
-㈧	8c	3227	12839	PARENTHESIZED IDEOGRAPH EIGHT
-㈨	9c	3228	12840	PARENTHESIZED IDEOGRAPH NINE
-ff	ff	FB00	64256	LATIN SMALL LIGATURE FF
-fi	fi	FB01	64257	LATIN SMALL LIGATURE FI
-fl	fl	FB02	64258	LATIN SMALL LIGATURE FL
-ſt	ft	FB05	64261	LATIN SMALL LIGATURE LONG S T
-st	st	FB06	64262	LATIN SMALL LIGATURE ST
+>
+  char  digraph	hex	dec	official name
+  ^@	NU	0x00	  0	NULL (NUL)
+  ^A	SH	0x01	  1	START OF HEADING (SOH)
+  ^B	SX	0x02	  2	START OF TEXT (STX)
+  ^C	EX	0x03	  3	END OF TEXT (ETX)
+  ^D	ET	0x04	  4	END OF TRANSMISSION (EOT)
+  ^E	EQ	0x05	  5	ENQUIRY (ENQ)
+  ^F	AK	0x06	  6	ACKNOWLEDGE (ACK)
+  ^G	BL	0x07	  7	BELL (BEL)
+  ^H	BS	0x08	  8	BACKSPACE (BS)
+  ^I	HT	0x09	  9	CHARACTER TABULATION (HT)
+  ^@	LF	0x0a	 10	LINE FEED (LF)
+  ^K	VT	0x0b	 11	LINE TABULATION (VT)
+  ^L	FF	0x0c	 12	FORM FEED (FF)
+  ^M	CR	0x0d	 13	CARRIAGE RETURN (CR)
+  ^N	SO	0x0e	 14	SHIFT OUT (SO)
+  ^O	SI	0x0f	 15	SHIFT IN (SI)
+  ^P	DL	0x10	 16	DATALINK ESCAPE (DLE)
+  ^Q	D1	0x11	 17	DEVICE CONTROL ONE (DC1)
+  ^R	D2	0x12	 18	DEVICE CONTROL TWO (DC2)
+  ^S	D3	0x13	 19	DEVICE CONTROL THREE (DC3)
+  ^T	D4	0x14	 20	DEVICE CONTROL FOUR (DC4)
+  ^U	NK	0x15	 21	NEGATIVE ACKNOWLEDGE (NAK)
+  ^V	SY	0x16	 22	SYNCHRONOUS IDLE (SYN)
+  ^W	EB	0x17	 23	END OF TRANSMISSION BLOCK (ETB)
+  ^X	CN	0x18	 24	CANCEL (CAN)
+  ^Y	EM	0x19	 25	END OF MEDIUM (EM)
+  ^Z	SB	0x1a	 26	SUBSTITUTE (SUB)
+  ^[	EC	0x1b	 27	ESCAPE (ESC)
+  ^\	FS	0x1c	 28	FILE SEPARATOR (IS4)
+  ^]	GS	0x1d	 29	GROUP SEPARATOR (IS3)
+  ^^	RS	0x1e	 30	RECORD SEPARATOR (IS2)
+  ^_	US	0x1f	 31	UNIT SEPARATOR (IS1)
+  	SP	0x20	 32	SPACE
+  #	Nb	0x23	 35	NUMBER SIGN
+  $	DO	0x24	 36	DOLLAR SIGN
+  @	At	0x40	 64	COMMERCIAL AT
+  [	<(	0x5b	 91	LEFT SQUARE BRACKET
+  \	//	0x5c	 92	REVERSE SOLIDUS
+  ]	)>	0x5d	 93	RIGHT SQUARE BRACKET
+  ^	'>	0x5e	 94	CIRCUMFLEX ACCENT
+  `	'!	0x60	 96	GRAVE ACCENT
+  {	(!	0x7b	123	LEFT CURLY BRACKET
+  |	!!	0x7c	124	VERTICAL LINE
+  }	!)	0x7d	125	RIGHT CURLY BRACKET
+  ~	'?	0x7e	126	TILDE
+  ^?	DT	0x7f	127	DELETE (DEL)
+  ~@	PA	0x80	128	PADDING CHARACTER (PAD)
+  ~A	HO	0x81	129	HIGH OCTET PRESET (HOP)
+  ~B	BH	0x82	130	BREAK PERMITTED HERE (BPH)
+  ~C	NH	0x83	131	NO BREAK HERE (NBH)
+  ~D	IN	0x84	132	INDEX (IND)
+  ~E	NL	0x85	133	NEXT LINE (NEL)
+  ~F	SA	0x86	134	START OF SELECTED AREA (SSA)
+  ~G	ES	0x87	135	END OF SELECTED AREA (ESA)
+  ~H	HS	0x88	136	CHARACTER TABULATION SET (HTS)
+  ~I	HJ	0x89	137	CHARACTER TABULATION WITH JUSTIFICATION (HTJ)
+  ~J	VS	0x8a	138	LINE TABULATION SET (VTS)
+  ~K	PD	0x8b	139	PARTIAL LINE FORWARD (PLD)
+  ~L	PU	0x8c	140	PARTIAL LINE BACKWARD (PLU)
+  ~M	RI	0x8d	141	REVERSE LINE FEED (RI)
+  ~N	S2	0x8e	142	SINGLE-SHIFT TWO (SS2)
+  ~O	S3	0x8f	143	SINGLE-SHIFT THREE (SS3)
+  ~P	DC	0x90	144	DEVICE CONTROL STRING (DCS)
+  ~Q	P1	0x91	145	PRIVATE USE ONE (PU1)
+  ~R	P2	0x92	146	PRIVATE USE TWO (PU2)
+  ~S	TS	0x93	147	SET TRANSMIT STATE (STS)
+  ~T	CC	0x94	148	CANCEL CHARACTER (CCH)
+  ~U	MW	0x95	149	MESSAGE WAITING (MW)
+  ~V	SG	0x96	150	START OF GUARDED AREA (SPA)
+  ~W	EG	0x97	151	END OF GUARDED AREA (EPA)
+  ~X	SS	0x98	152	START OF STRING (SOS)
+  ~Y	GC	0x99	153	SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI)
+  ~Z	SC	0x9a	154	SINGLE CHARACTER INTRODUCER (SCI)
+  ~[	CI	0x9b	155	CONTROL SEQUENCE INTRODUCER (CSI)
+  ~\	ST	0x9c	156	STRING TERMINATOR (ST)
+  ~]	OC	0x9d	157	OPERATING SYSTEM COMMAND (OSC)
+  ~^	PM	0x9e	158	PRIVACY MESSAGE (PM)
+  ~_	AC	0x9f	159	APPLICATION PROGRAM COMMAND (APC)
+  |	NS	0xa0	160	NO-BREAK SPACE
+  ¡	!I	0xa1	161	INVERTED EXCLAMATION MARK
+  ¢	Ct	0xa2	162	CENT SIGN
+  £	Pd	0xa3	163	POUND SIGN
+  ¤	Cu	0xa4	164	CURRENCY SIGN
+  ¥	Ye	0xa5	165	YEN SIGN
+  ¦	BB	0xa6	166	BROKEN BAR
+  §	SE	0xa7	167	SECTION SIGN
+  ¨	':	0xa8	168	DIAERESIS
+  ©	Co	0xa9	169	COPYRIGHT SIGN
+  ª	-a	0xaa	170	FEMININE ORDINAL INDICATOR
+  «	<<	0xab	171	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+  ¬	NO	0xac	172	NOT SIGN
+  ­	--	0xad	173	SOFT HYPHEN
+  ®	Rg	0xae	174	REGISTERED SIGN
+  ¯	'm	0xaf	175	MACRON
+  °	DG	0xb0	176	DEGREE SIGN
+  ±	+-	0xb1	177	PLUS-MINUS SIGN
+  ²	2S	0xb2	178	SUPERSCRIPT TWO
+  ³	3S	0xb3	179	SUPERSCRIPT THREE
+  ´	''	0xb4	180	ACUTE ACCENT
+  µ	My	0xb5	181	MICRO SIGN
+  ¶	PI	0xb6	182	PILCROW SIGN
+  ·	.M	0xb7	183	MIDDLE DOT
+  ¸	',	0xb8	184	CEDILLA
+  ¹	1S	0xb9	185	SUPERSCRIPT ONE
+  º	-o	0xba	186	MASCULINE ORDINAL INDICATOR
+  »	>>	0xbb	187	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+  ¼	14	0xbc	188	VULGAR FRACTION ONE QUARTER
+  ½	12	0xbd	189	VULGAR FRACTION ONE HALF
+  ¾	34	0xbe	190	VULGAR FRACTION THREE QUARTERS
+  ¿	?I	0xbf	191	INVERTED QUESTION MARK
+  À	A!	0xc0	192	LATIN CAPITAL LETTER A WITH GRAVE
+  Á	A'	0xc1	193	LATIN CAPITAL LETTER A WITH ACUTE
+  Â	A>	0xc2	194	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+  Ã	A?	0xc3	195	LATIN CAPITAL LETTER A WITH TILDE
+  Ä	A:	0xc4	196	LATIN CAPITAL LETTER A WITH DIAERESIS
+  Å	AA	0xc5	197	LATIN CAPITAL LETTER A WITH RING ABOVE
+  Æ	AE	0xc6	198	LATIN CAPITAL LETTER AE
+  Ç	C,	0xc7	199	LATIN CAPITAL LETTER C WITH CEDILLA
+  È	E!	0xc8	200	LATIN CAPITAL LETTER E WITH GRAVE
+  É	E'	0xc9	201	LATIN CAPITAL LETTER E WITH ACUTE
+  Ê	E>	0xca	202	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+  Ë	E:	0xcb	203	LATIN CAPITAL LETTER E WITH DIAERESIS
+  Ì	I!	0xcc	204	LATIN CAPITAL LETTER I WITH GRAVE
+  Í	I'	0xcd	205	LATIN CAPITAL LETTER I WITH ACUTE
+  Î	I>	0xce	206	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+  Ï	I:	0xcf	207	LATIN CAPITAL LETTER I WITH DIAERESIS
+  Ð	D-	0xd0	208	LATIN CAPITAL LETTER ETH (Icelandic)
+  Ñ	N?	0xd1	209	LATIN CAPITAL LETTER N WITH TILDE
+  Ò	O!	0xd2	210	LATIN CAPITAL LETTER O WITH GRAVE
+  Ó	O'	0xd3	211	LATIN CAPITAL LETTER O WITH ACUTE
+  Ô	O>	0xd4	212	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+  Õ	O?	0xd5	213	LATIN CAPITAL LETTER O WITH TILDE
+  Ö	O:	0xd6	214	LATIN CAPITAL LETTER O WITH DIAERESIS
+  ×	*X	0xd7	215	MULTIPLICATION SIGN
+  Ø	O/	0xd8	216	LATIN CAPITAL LETTER O WITH STROKE
+  Ù	U!	0xd9	217	LATIN CAPITAL LETTER U WITH GRAVE
+  Ú	U'	0xda	218	LATIN CAPITAL LETTER U WITH ACUTE
+  Û	U>	0xdb	219	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+  Ü	U:	0xdc	220	LATIN CAPITAL LETTER U WITH DIAERESIS
+  Ý	Y'	0xdd	221	LATIN CAPITAL LETTER Y WITH ACUTE
+  Þ	TH	0xde	222	LATIN CAPITAL LETTER THORN (Icelandic)
+  ß	ss	0xdf	223	LATIN SMALL LETTER SHARP S (German)
+  à	a!	0xe0	224	LATIN SMALL LETTER A WITH GRAVE
+  á	a'	0xe1	225	LATIN SMALL LETTER A WITH ACUTE
+  â	a>	0xe2	226	LATIN SMALL LETTER A WITH CIRCUMFLEX
+  ã	a?	0xe3	227	LATIN SMALL LETTER A WITH TILDE
+  ä	a:	0xe4	228	LATIN SMALL LETTER A WITH DIAERESIS
+  å	aa	0xe5	229	LATIN SMALL LETTER A WITH RING ABOVE
+  æ	ae	0xe6	230	LATIN SMALL LETTER AE
+  ç	c,	0xe7	231	LATIN SMALL LETTER C WITH CEDILLA
+  è	e!	0xe8	232	LATIN SMALL LETTER E WITH GRAVE
+  é	e'	0xe9	233	LATIN SMALL LETTER E WITH ACUTE
+  ê	e>	0xea	234	LATIN SMALL LETTER E WITH CIRCUMFLEX
+  ë	e:	0xeb	235	LATIN SMALL LETTER E WITH DIAERESIS
+  ì	i!	0xec	236	LATIN SMALL LETTER I WITH GRAVE
+  í	i'	0xed	237	LATIN SMALL LETTER I WITH ACUTE
+  î	i>	0xee	238	LATIN SMALL LETTER I WITH CIRCUMFLEX
+  ï	i:	0xef	239	LATIN SMALL LETTER I WITH DIAERESIS
+  ð	d-	0xf0	240	LATIN SMALL LETTER ETH (Icelandic)
+  ñ	n?	0xf1	241	LATIN SMALL LETTER N WITH TILDE
+  ò	o!	0xf2	242	LATIN SMALL LETTER O WITH GRAVE
+  ó	o'	0xf3	243	LATIN SMALL LETTER O WITH ACUTE
+  ô	o>	0xf4	244	LATIN SMALL LETTER O WITH CIRCUMFLEX
+  õ	o?	0xf5	245	LATIN SMALL LETTER O WITH TILDE
+  ö	o:	0xf6	246	LATIN SMALL LETTER O WITH DIAERESIS
+  ÷	-:	0xf7	247	DIVISION SIGN
+  ø	o/	0xf8	248	LATIN SMALL LETTER O WITH STROKE
+  ù	u!	0xf9	249	LATIN SMALL LETTER U WITH GRAVE
+  ú	u'	0xfa	250	LATIN SMALL LETTER U WITH ACUTE
+  û	u>	0xfb	251	LATIN SMALL LETTER U WITH CIRCUMFLEX
+  ü	u:	0xfc	252	LATIN SMALL LETTER U WITH DIAERESIS
+  ý	y'	0xfd	253	LATIN SMALL LETTER Y WITH ACUTE
+  þ	th	0xfe	254	LATIN SMALL LETTER THORN (Icelandic)
+  ÿ	y:	0xff	255	LATIN SMALL LETTER Y WITH DIAERESIS
+  Ā	A-	0100	0256	LATIN CAPITAL LETTER A WITH MACRON
+  ā	a-	0101	0257	LATIN SMALL LETTER A WITH MACRON
+  Ă	A(	0102	0258	LATIN CAPITAL LETTER A WITH BREVE
+  ă	a(	0103	0259	LATIN SMALL LETTER A WITH BREVE
+  Ą	A;	0104	0260	LATIN CAPITAL LETTER A WITH OGONEK
+  ą	a;	0105	0261	LATIN SMALL LETTER A WITH OGONEK
+  Ć	C'	0106	0262	LATIN CAPITAL LETTER C WITH ACUTE
+  ć	c'	0107	0263	LATIN SMALL LETTER C WITH ACUTE
+  Ĉ	C>	0108	0264	LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+  ĉ	c>	0109	0265	LATIN SMALL LETTER C WITH CIRCUMFLEX
+  Ċ	C.	010A	0266	LATIN CAPITAL LETTER C WITH DOT ABOVE
+  ċ	c.	010B	0267	LATIN SMALL LETTER C WITH DOT ABOVE
+  Č	C<	010C	0268	LATIN CAPITAL LETTER C WITH CARON
+  č	c<	010D	0269	LATIN SMALL LETTER C WITH CARON
+  Ď	D<	010E	0270	LATIN CAPITAL LETTER D WITH CARON
+  ď	d<	010F	0271	LATIN SMALL LETTER D WITH CARON
+  Đ	D/	0110	0272	LATIN CAPITAL LETTER D WITH STROKE
+  đ	d/	0111	0273	LATIN SMALL LETTER D WITH STROKE
+  Ē	E-	0112	0274	LATIN CAPITAL LETTER E WITH MACRON
+  ē	e-	0113	0275	LATIN SMALL LETTER E WITH MACRON
+  Ĕ	E(	0114	0276	LATIN CAPITAL LETTER E WITH BREVE
+  ĕ	e(	0115	0277	LATIN SMALL LETTER E WITH BREVE
+  Ė	E.	0116	0278	LATIN CAPITAL LETTER E WITH DOT ABOVE
+  ė	e.	0117	0279	LATIN SMALL LETTER E WITH DOT ABOVE
+  Ę	E;	0118	0280	LATIN CAPITAL LETTER E WITH OGONEK
+  ę	e;	0119	0281	LATIN SMALL LETTER E WITH OGONEK
+  Ě	E<	011A	0282	LATIN CAPITAL LETTER E WITH CARON
+  ě	e<	011B	0283	LATIN SMALL LETTER E WITH CARON
+  Ĝ	G>	011C	0284	LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+  ĝ	g>	011D	0285	LATIN SMALL LETTER G WITH CIRCUMFLEX
+  Ğ	G(	011E	0286	LATIN CAPITAL LETTER G WITH BREVE
+  ğ	g(	011F	0287	LATIN SMALL LETTER G WITH BREVE
+  Ġ	G.	0120	0288	LATIN CAPITAL LETTER G WITH DOT ABOVE
+  ġ	g.	0121	0289	LATIN SMALL LETTER G WITH DOT ABOVE
+  Ģ	G,	0122	0290	LATIN CAPITAL LETTER G WITH CEDILLA
+  ģ	g,	0123	0291	LATIN SMALL LETTER G WITH CEDILLA
+  Ĥ	H>	0124	0292	LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+  ĥ	h>	0125	0293	LATIN SMALL LETTER H WITH CIRCUMFLEX
+  Ħ	H/	0126	0294	LATIN CAPITAL LETTER H WITH STROKE
+  ħ	h/	0127	0295	LATIN SMALL LETTER H WITH STROKE
+  Ĩ	I?	0128	0296	LATIN CAPITAL LETTER I WITH TILDE
+  ĩ	i?	0129	0297	LATIN SMALL LETTER I WITH TILDE
+  Ī	I-	012A	0298	LATIN CAPITAL LETTER I WITH MACRON
+  ī	i-	012B	0299	LATIN SMALL LETTER I WITH MACRON
+  Ĭ	I(	012C	0300	LATIN CAPITAL LETTER I WITH BREVE
+  ĭ	i(	012D	0301	LATIN SMALL LETTER I WITH BREVE
+  Į	I;	012E	0302	LATIN CAPITAL LETTER I WITH OGONEK
+  į	i;	012F	0303	LATIN SMALL LETTER I WITH OGONEK
+  İ	I.	0130	0304	LATIN CAPITAL LETTER I WITH DOT ABOVE
+  ı	i.	0131	0305	LATIN SMALL LETTER DOTLESS I
+  IJ	IJ	0132	0306	LATIN CAPITAL LIGATURE IJ
+  ij	ij	0133	0307	LATIN SMALL LIGATURE IJ
+  Ĵ	J>	0134	0308	LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+  ĵ	j>	0135	0309	LATIN SMALL LETTER J WITH CIRCUMFLEX
+  Ķ	K,	0136	0310	LATIN CAPITAL LETTER K WITH CEDILLA
+  ķ	k,	0137	0311	LATIN SMALL LETTER K WITH CEDILLA
+  ĸ	kk	0138	0312	LATIN SMALL LETTER KRA
+  Ĺ	L'	0139	0313	LATIN CAPITAL LETTER L WITH ACUTE
+  ĺ	l'	013A	0314	LATIN SMALL LETTER L WITH ACUTE
+  Ļ	L,	013B	0315	LATIN CAPITAL LETTER L WITH CEDILLA
+  ļ	l,	013C	0316	LATIN SMALL LETTER L WITH CEDILLA
+  Ľ	L<	013D	0317	LATIN CAPITAL LETTER L WITH CARON
+  ľ	l<	013E	0318	LATIN SMALL LETTER L WITH CARON
+  Ŀ	L.	013F	0319	LATIN CAPITAL LETTER L WITH MIDDLE DOT
+  ŀ	l.	0140	0320	LATIN SMALL LETTER L WITH MIDDLE DOT
+  Ł	L/	0141	0321	LATIN CAPITAL LETTER L WITH STROKE
+  ł	l/	0142	0322	LATIN SMALL LETTER L WITH STROKE
+  Ń	N'	0143	0323	LATIN CAPITAL LETTER N WITH ACUTE `
+  ń	n'	0144	0324	LATIN SMALL LETTER N WITH ACUTE `
+  Ņ	N,	0145	0325	LATIN CAPITAL LETTER N WITH CEDILLA `
+  ņ	n,	0146	0326	LATIN SMALL LETTER N WITH CEDILLA `
+  Ň	N<	0147	0327	LATIN CAPITAL LETTER N WITH CARON `
+  ň	n<	0148	0328	LATIN SMALL LETTER N WITH CARON `
+  ʼn	'n	0149	0329	LATIN SMALL LETTER N PRECEDED BY APOSTROPHE `
+  Ŋ	NG	014A	0330	LATIN CAPITAL LETTER ENG
+  ŋ	ng	014B	0331	LATIN SMALL LETTER ENG
+  Ō	O-	014C	0332	LATIN CAPITAL LETTER O WITH MACRON
+  ō	o-	014D	0333	LATIN SMALL LETTER O WITH MACRON
+  Ŏ	O(	014E	0334	LATIN CAPITAL LETTER O WITH BREVE
+  ŏ	o(	014F	0335	LATIN SMALL LETTER O WITH BREVE
+  Ő	O"	0150	0336	LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+  ő	o"	0151	0337	LATIN SMALL LETTER O WITH DOUBLE ACUTE
+  Œ	OE	0152	0338	LATIN CAPITAL LIGATURE OE
+  œ	oe	0153	0339	LATIN SMALL LIGATURE OE
+  Ŕ	R'	0154	0340	LATIN CAPITAL LETTER R WITH ACUTE
+  ŕ	r'	0155	0341	LATIN SMALL LETTER R WITH ACUTE
+  Ŗ	R,	0156	0342	LATIN CAPITAL LETTER R WITH CEDILLA
+  ŗ	r,	0157	0343	LATIN SMALL LETTER R WITH CEDILLA
+  Ř	R<	0158	0344	LATIN CAPITAL LETTER R WITH CARON
+  ř	r<	0159	0345	LATIN SMALL LETTER R WITH CARON
+  Ś	S'	015A	0346	LATIN CAPITAL LETTER S WITH ACUTE
+  ś	s'	015B	0347	LATIN SMALL LETTER S WITH ACUTE
+  Ŝ	S>	015C	0348	LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+  ŝ	s>	015D	0349	LATIN SMALL LETTER S WITH CIRCUMFLEX
+  Ş	S,	015E	0350	LATIN CAPITAL LETTER S WITH CEDILLA
+  ş	s,	015F	0351	LATIN SMALL LETTER S WITH CEDILLA
+  Š	S<	0160	0352	LATIN CAPITAL LETTER S WITH CARON
+  š	s<	0161	0353	LATIN SMALL LETTER S WITH CARON
+  Ţ	T,	0162	0354	LATIN CAPITAL LETTER T WITH CEDILLA
+  ţ	t,	0163	0355	LATIN SMALL LETTER T WITH CEDILLA
+  Ť	T<	0164	0356	LATIN CAPITAL LETTER T WITH CARON
+  ť	t<	0165	0357	LATIN SMALL LETTER T WITH CARON
+  Ŧ	T/	0166	0358	LATIN CAPITAL LETTER T WITH STROKE
+  ŧ	t/	0167	0359	LATIN SMALL LETTER T WITH STROKE
+  Ũ	U?	0168	0360	LATIN CAPITAL LETTER U WITH TILDE
+  ũ	u?	0169	0361	LATIN SMALL LETTER U WITH TILDE
+  Ū	U-	016A	0362	LATIN CAPITAL LETTER U WITH MACRON
+  ū	u-	016B	0363	LATIN SMALL LETTER U WITH MACRON
+  Ŭ	U(	016C	0364	LATIN CAPITAL LETTER U WITH BREVE
+  ŭ	u(	016D	0365	LATIN SMALL LETTER U WITH BREVE
+  Ů	U0	016E	0366	LATIN CAPITAL LETTER U WITH RING ABOVE
+  ů	u0	016F	0367	LATIN SMALL LETTER U WITH RING ABOVE
+  Ű	U"	0170	0368	LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+  ű	u"	0171	0369	LATIN SMALL LETTER U WITH DOUBLE ACUTE
+  Ų	U;	0172	0370	LATIN CAPITAL LETTER U WITH OGONEK
+  ų	u;	0173	0371	LATIN SMALL LETTER U WITH OGONEK
+  Ŵ	W>	0174	0372	LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+  ŵ	w>	0175	0373	LATIN SMALL LETTER W WITH CIRCUMFLEX
+  Ŷ	Y>	0176	0374	LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+  ŷ	y>	0177	0375	LATIN SMALL LETTER Y WITH CIRCUMFLEX
+  Ÿ	Y:	0178	0376	LATIN CAPITAL LETTER Y WITH DIAERESIS
+  Ź	Z'	0179	0377	LATIN CAPITAL LETTER Z WITH ACUTE
+  ź	z'	017A	0378	LATIN SMALL LETTER Z WITH ACUTE
+  Ż	Z.	017B	0379	LATIN CAPITAL LETTER Z WITH DOT ABOVE
+  ż	z.	017C	0380	LATIN SMALL LETTER Z WITH DOT ABOVE
+  Ž	Z<	017D	0381	LATIN CAPITAL LETTER Z WITH CARON
+  ž	z<	017E	0382	LATIN SMALL LETTER Z WITH CARON
+  Ơ	O9	01A0	0416	LATIN CAPITAL LETTER O WITH HORN
+  ơ	o9	01A1	0417	LATIN SMALL LETTER O WITH HORN
+  Ƣ	OI	01A2	0418	LATIN CAPITAL LETTER OI
+  ƣ	oi	01A3	0419	LATIN SMALL LETTER OI
+  Ʀ	yr	01A6	0422	LATIN LETTER YR
+  Ư	U9	01AF	0431	LATIN CAPITAL LETTER U WITH HORN
+  ư	u9	01B0	0432	LATIN SMALL LETTER U WITH HORN
+  Ƶ	Z/	01B5	0437	LATIN CAPITAL LETTER Z WITH STROKE
+  ƶ	z/	01B6	0438	LATIN SMALL LETTER Z WITH STROKE
+  Ʒ	ED	01B7	0439	LATIN CAPITAL LETTER EZH
+  Ǎ	A<	01CD	0461	LATIN CAPITAL LETTER A WITH CARON
+  ǎ	a<	01CE	0462	LATIN SMALL LETTER A WITH CARON
+  Ǐ	I<	01CF	0463	LATIN CAPITAL LETTER I WITH CARON
+  ǐ	i<	01D0	0464	LATIN SMALL LETTER I WITH CARON
+  Ǒ	O<	01D1	0465	LATIN CAPITAL LETTER O WITH CARON
+  ǒ	o<	01D2	0466	LATIN SMALL LETTER O WITH CARON
+  Ǔ	U<	01D3	0467	LATIN CAPITAL LETTER U WITH CARON
+  ǔ	u<	01D4	0468	LATIN SMALL LETTER U WITH CARON
+  Ǟ	A1	01DE	0478	LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+  ǟ	a1	01DF	0479	LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+  Ǡ	A7	01E0	0480	LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+  ǡ	a7	01E1	0481	LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
+  Ǣ	A3	01E2	0482	LATIN CAPITAL LETTER AE WITH MACRON
+  ǣ	a3	01E3	0483	LATIN SMALL LETTER AE WITH MACRON
+  Ǥ	G/	01E4	0484	LATIN CAPITAL LETTER G WITH STROKE
+  ǥ	g/	01E5	0485	LATIN SMALL LETTER G WITH STROKE
+  Ǧ	G<	01E6	0486	LATIN CAPITAL LETTER G WITH CARON
+  ǧ	g<	01E7	0487	LATIN SMALL LETTER G WITH CARON
+  Ǩ	K<	01E8	0488	LATIN CAPITAL LETTER K WITH CARON
+  ǩ	k<	01E9	0489	LATIN SMALL LETTER K WITH CARON
+  Ǫ	O;	01EA	0490	LATIN CAPITAL LETTER O WITH OGONEK
+  ǫ	o;	01EB	0491	LATIN SMALL LETTER O WITH OGONEK
+  Ǭ	O1	01EC	0492	LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+  ǭ	o1	01ED	0493	LATIN SMALL LETTER O WITH OGONEK AND MACRON
+  Ǯ	EZ	01EE	0494	LATIN CAPITAL LETTER EZH WITH CARON
+  ǯ	ez	01EF	0495	LATIN SMALL LETTER EZH WITH CARON
+  ǰ	j<	01F0	0496	LATIN SMALL LETTER J WITH CARON
+  Ǵ	G'	01F4	0500	LATIN CAPITAL LETTER G WITH ACUTE
+  ǵ	g'	01F5	0501	LATIN SMALL LETTER G WITH ACUTE
+  ʿ	;S	02BF	0703	MODIFIER LETTER LEFT HALF RING
+  ˇ	'<	02C7	0711	CARON
+  ˘	'(	02D8	0728	BREVE
+  ˙	'.	02D9	0729	DOT ABOVE
+  ˚	'0	02DA	0730	RING ABOVE
+  ˛	';	02DB	0731	OGONEK
+  ˝	'"	02DD	0733	DOUBLE ACUTE ACCENT
+  Ά	A%	0386	0902	GREEK CAPITAL LETTER ALPHA WITH TONOS
+  Έ	E%	0388	0904	GREEK CAPITAL LETTER EPSILON WITH TONOS
+  Ή	Y%	0389	0905	GREEK CAPITAL LETTER ETA WITH TONOS
+  Ί	I%	038A	0906	GREEK CAPITAL LETTER IOTA WITH TONOS
+  Ό	O%	038C	0908	GREEK CAPITAL LETTER OMICRON WITH TONOS
+  Ύ	U%	038E	0910	GREEK CAPITAL LETTER UPSILON WITH TONOS
+  Ώ	W%	038F	0911	GREEK CAPITAL LETTER OMEGA WITH TONOS
+  ΐ	i3	0390	0912	GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+  Α	A*	0391	0913	GREEK CAPITAL LETTER ALPHA
+  Β	B*	0392	0914	GREEK CAPITAL LETTER BETA
+  Γ	G*	0393	0915	GREEK CAPITAL LETTER GAMMA
+  Δ	D*	0394	0916	GREEK CAPITAL LETTER DELTA
+  Ε	E*	0395	0917	GREEK CAPITAL LETTER EPSILON
+  Ζ	Z*	0396	0918	GREEK CAPITAL LETTER ZETA
+  Η	Y*	0397	0919	GREEK CAPITAL LETTER ETA
+  Θ	H*	0398	0920	GREEK CAPITAL LETTER THETA
+  Ι	I*	0399	0921	GREEK CAPITAL LETTER IOTA
+  Κ	K*	039A	0922	GREEK CAPITAL LETTER KAPPA
+  Λ	L*	039B	0923	GREEK CAPITAL LETTER LAMDA (aka LAMBDA)
+  Μ	M*	039C	0924	GREEK CAPITAL LETTER MU
+  Ν	N*	039D	0925	GREEK CAPITAL LETTER NU
+  Ξ	C*	039E	0926	GREEK CAPITAL LETTER XI
+  Ο	O*	039F	0927	GREEK CAPITAL LETTER OMICRON
+  Π	P*	03A0	0928	GREEK CAPITAL LETTER PI
+  Ρ	R*	03A1	0929	GREEK CAPITAL LETTER RHO
+  Σ	S*	03A3	0931	GREEK CAPITAL LETTER SIGMA
+  Τ	T*	03A4	0932	GREEK CAPITAL LETTER TAU
+  Υ	U*	03A5	0933	GREEK CAPITAL LETTER UPSILON
+  Φ	F*	03A6	0934	GREEK CAPITAL LETTER PHI
+  Χ	X*	03A7	0935	GREEK CAPITAL LETTER CHI
+  Ψ	Q*	03A8	0936	GREEK CAPITAL LETTER PSI
+  Ω	W*	03A9	0937	GREEK CAPITAL LETTER OMEGA
+  Ϊ	J*	03AA	0938	GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+  Ϋ	V*	03AB	0939	GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+  ά	a%	03AC	0940	GREEK SMALL LETTER ALPHA WITH TONOS
+  έ	e%	03AD	0941	GREEK SMALL LETTER EPSILON WITH TONOS
+  ή	y%	03AE	0942	GREEK SMALL LETTER ETA WITH TONOS
+  ί	i%	03AF	0943	GREEK SMALL LETTER IOTA WITH TONOS
+  ΰ	u3	03B0	0944	GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+  α	a*	03B1	0945	GREEK SMALL LETTER ALPHA
+  β	b*	03B2	0946	GREEK SMALL LETTER BETA
+  γ	g*	03B3	0947	GREEK SMALL LETTER GAMMA
+  δ	d*	03B4	0948	GREEK SMALL LETTER DELTA
+  ε	e*	03B5	0949	GREEK SMALL LETTER EPSILON
+  ζ	z*	03B6	0950	GREEK SMALL LETTER ZETA
+  η	y*	03B7	0951	GREEK SMALL LETTER ETA
+  θ	h*	03B8	0952	GREEK SMALL LETTER THETA
+  ι	i*	03B9	0953	GREEK SMALL LETTER IOTA
+  κ	k*	03BA	0954	GREEK SMALL LETTER KAPPA
+  λ	l*	03BB	0955	GREEK SMALL LETTER LAMDA (aka LAMBDA)
+  μ	m*	03BC	0956	GREEK SMALL LETTER MU
+  ν	n*	03BD	0957	GREEK SMALL LETTER NU
+  ξ	c*	03BE	0958	GREEK SMALL LETTER XI
+  ο	o*	03BF	0959	GREEK SMALL LETTER OMICRON
+  π	p*	03C0	0960	GREEK SMALL LETTER PI
+  ρ	r*	03C1	0961	GREEK SMALL LETTER RHO
+  ς	*s	03C2	0962	GREEK SMALL LETTER FINAL SIGMA
+  σ	s*	03C3	0963	GREEK SMALL LETTER SIGMA
+  τ	t*	03C4	0964	GREEK SMALL LETTER TAU
+  υ	u*	03C5	0965	GREEK SMALL LETTER UPSILON
+  φ	f*	03C6	0966	GREEK SMALL LETTER PHI
+  χ	x*	03C7	0967	GREEK SMALL LETTER CHI
+  ψ	q*	03C8	0968	GREEK SMALL LETTER PSI
+  ω	w*	03C9	0969	GREEK SMALL LETTER OMEGA
+  ϊ	j*	03CA	0970	GREEK SMALL LETTER IOTA WITH DIALYTIKA
+  ϋ	v*	03CB	0971	GREEK SMALL LETTER UPSILON WITH DIALYTIKA
+  ό	o%	03CC	0972	GREEK SMALL LETTER OMICRON WITH TONOS
+  ύ	u%	03CD	0973	GREEK SMALL LETTER UPSILON WITH TONOS
+  ώ	w%	03CE	0974	GREEK SMALL LETTER OMEGA WITH TONOS
+  Ϙ	'G	03D8	0984	GREEK LETTER ARCHAIC KOPPA
+  ϙ	,G	03D9	0985	GREEK SMALL LETTER ARCHAIC KOPPA
+  Ϛ	T3	03DA	0986	GREEK LETTER STIGMA
+  ϛ	t3	03DB	0987	GREEK SMALL LETTER STIGMA
+  Ϝ	M3	03DC	0988	GREEK LETTER DIGAMMA
+  ϝ	m3	03DD	0989	GREEK SMALL LETTER DIGAMMA
+  Ϟ	K3	03DE	0990	GREEK LETTER KOPPA
+  ϟ	k3	03DF	0991	GREEK SMALL LETTER KOPPA
+  Ϡ	P3	03E0	0992	GREEK LETTER SAMPI
+  ϡ	p3	03E1	0993	GREEK SMALL LETTER SAMPI
+  ϴ	'%	03F4	1012	GREEK CAPITAL THETA SYMBOL
+  ϵ	j3	03F5	1013	GREEK LUNATE EPSILON SYMBOL
+  Ё	IO	0401	1025	CYRILLIC CAPITAL LETTER IO
+  Ђ	D%	0402	1026	CYRILLIC CAPITAL LETTER DJE
+  Ѓ	G%	0403	1027	CYRILLIC CAPITAL LETTER GJE
+  Є	IE	0404	1028	CYRILLIC CAPITAL LETTER UKRAINIAN IE
+  Ѕ	DS	0405	1029	CYRILLIC CAPITAL LETTER DZE
+  І	II	0406	1030	CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+  Ї	YI	0407	1031	CYRILLIC CAPITAL LETTER YI
+  Ј	J%	0408	1032	CYRILLIC CAPITAL LETTER JE
+  Љ	LJ	0409	1033	CYRILLIC CAPITAL LETTER LJE
+  Њ	NJ	040A	1034	CYRILLIC CAPITAL LETTER NJE
+  Ћ	Ts	040B	1035	CYRILLIC CAPITAL LETTER TSHE
+  Ќ	KJ	040C	1036	CYRILLIC CAPITAL LETTER KJE
+  Ў	V%	040E	1038	CYRILLIC CAPITAL LETTER SHORT U
+  Џ	DZ	040F	1039	CYRILLIC CAPITAL LETTER DZHE
+  А	A=	0410	1040	CYRILLIC CAPITAL LETTER A
+  Б	B=	0411	1041	CYRILLIC CAPITAL LETTER BE
+  В	V=	0412	1042	CYRILLIC CAPITAL LETTER VE
+  Г	G=	0413	1043	CYRILLIC CAPITAL LETTER GHE
+  Д	D=	0414	1044	CYRILLIC CAPITAL LETTER DE
+  Е	E=	0415	1045	CYRILLIC CAPITAL LETTER IE
+  Ж	Z%	0416	1046	CYRILLIC CAPITAL LETTER ZHE
+  З	Z=	0417	1047	CYRILLIC CAPITAL LETTER ZE
+  И	I=	0418	1048	CYRILLIC CAPITAL LETTER I
+  Й	J=	0419	1049	CYRILLIC CAPITAL LETTER SHORT I
+  К	K=	041A	1050	CYRILLIC CAPITAL LETTER KA
+  Л	L=	041B	1051	CYRILLIC CAPITAL LETTER EL
+  М	M=	041C	1052	CYRILLIC CAPITAL LETTER EM
+  Н	N=	041D	1053	CYRILLIC CAPITAL LETTER EN
+  О	O=	041E	1054	CYRILLIC CAPITAL LETTER O
+  П	P=	041F	1055	CYRILLIC CAPITAL LETTER PE
+  Р	R=	0420	1056	CYRILLIC CAPITAL LETTER ER
+  С	S=	0421	1057	CYRILLIC CAPITAL LETTER ES
+  Т	T=	0422	1058	CYRILLIC CAPITAL LETTER TE
+  У	U=	0423	1059	CYRILLIC CAPITAL LETTER U
+  Ф	F=	0424	1060	CYRILLIC CAPITAL LETTER EF
+  Х	H=	0425	1061	CYRILLIC CAPITAL LETTER HA
+  Ц	C=	0426	1062	CYRILLIC CAPITAL LETTER TSE
+  Ч	C%	0427	1063	CYRILLIC CAPITAL LETTER CHE
+  Ш	S%	0428	1064	CYRILLIC CAPITAL LETTER SHA
+  Щ	Sc	0429	1065	CYRILLIC CAPITAL LETTER SHCHA
+  Ъ	="	042A	1066	CYRILLIC CAPITAL LETTER HARD SIGN
+  Ы	Y=	042B	1067	CYRILLIC CAPITAL LETTER YERU
+  Ь	%"	042C	1068	CYRILLIC CAPITAL LETTER SOFT SIGN
+  Э	JE	042D	1069	CYRILLIC CAPITAL LETTER E
+  Ю	JU	042E	1070	CYRILLIC CAPITAL LETTER YU
+  Я	JA	042F	1071	CYRILLIC CAPITAL LETTER YA
+  а	a=	0430	1072	CYRILLIC SMALL LETTER A
+  б	b=	0431	1073	CYRILLIC SMALL LETTER BE
+  в	v=	0432	1074	CYRILLIC SMALL LETTER VE
+  г	g=	0433	1075	CYRILLIC SMALL LETTER GHE
+  д	d=	0434	1076	CYRILLIC SMALL LETTER DE
+  е	e=	0435	1077	CYRILLIC SMALL LETTER IE
+  ж	z%	0436	1078	CYRILLIC SMALL LETTER ZHE
+  з	z=	0437	1079	CYRILLIC SMALL LETTER ZE
+  и	i=	0438	1080	CYRILLIC SMALL LETTER I
+  й	j=	0439	1081	CYRILLIC SMALL LETTER SHORT I
+  к	k=	043A	1082	CYRILLIC SMALL LETTER KA
+  л	l=	043B	1083	CYRILLIC SMALL LETTER EL
+  м	m=	043C	1084	CYRILLIC SMALL LETTER EM
+  н	n=	043D	1085	CYRILLIC SMALL LETTER EN
+  о	o=	043E	1086	CYRILLIC SMALL LETTER O
+  п	p=	043F	1087	CYRILLIC SMALL LETTER PE
+  р	r=	0440	1088	CYRILLIC SMALL LETTER ER
+  с	s=	0441	1089	CYRILLIC SMALL LETTER ES
+  т	t=	0442	1090	CYRILLIC SMALL LETTER TE
+  у	u=	0443	1091	CYRILLIC SMALL LETTER U
+  ф	f=	0444	1092	CYRILLIC SMALL LETTER EF
+  х	h=	0445	1093	CYRILLIC SMALL LETTER HA
+  ц	c=	0446	1094	CYRILLIC SMALL LETTER TSE
+  ч	c%	0447	1095	CYRILLIC SMALL LETTER CHE
+  ш	s%	0448	1096	CYRILLIC SMALL LETTER SHA
+  щ	sc	0449	1097	CYRILLIC SMALL LETTER SHCHA
+  ъ	='	044A	1098	CYRILLIC SMALL LETTER HARD SIGN
+  ы	y=	044B	1099	CYRILLIC SMALL LETTER YERU
+  ь	%'	044C	1100	CYRILLIC SMALL LETTER SOFT SIGN
+  э	je	044D	1101	CYRILLIC SMALL LETTER E
+  ю	ju	044E	1102	CYRILLIC SMALL LETTER YU
+  я	ja	044F	1103	CYRILLIC SMALL LETTER YA
+  ё	io	0451	1105	CYRILLIC SMALL LETTER IO
+  ђ	d%	0452	1106	CYRILLIC SMALL LETTER DJE
+  ѓ	g%	0453	1107	CYRILLIC SMALL LETTER GJE
+  є	ie	0454	1108	CYRILLIC SMALL LETTER UKRAINIAN IE
+  ѕ	ds	0455	1109	CYRILLIC SMALL LETTER DZE
+  і	ii	0456	1110	CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+  ї	yi	0457	1111	CYRILLIC SMALL LETTER YI
+  ј	j%	0458	1112	CYRILLIC SMALL LETTER JE
+  љ	lj	0459	1113	CYRILLIC SMALL LETTER LJE
+  њ	nj	045A	1114	CYRILLIC SMALL LETTER NJE
+  ћ	ts	045B	1115	CYRILLIC SMALL LETTER TSHE
+  ќ	kj	045C	1116	CYRILLIC SMALL LETTER KJE
+  ў	v%	045E	1118	CYRILLIC SMALL LETTER SHORT U
+  џ	dz	045F	1119	CYRILLIC SMALL LETTER DZHE
+  Ѣ	Y3	0462	1122	CYRILLIC CAPITAL LETTER YAT
+  ѣ	y3	0463	1123	CYRILLIC SMALL LETTER YAT
+  Ѫ	O3	046A	1130	CYRILLIC CAPITAL LETTER BIG YUS
+  ѫ	o3	046B	1131	CYRILLIC SMALL LETTER BIG YUS
+  Ѳ	F3	0472	1138	CYRILLIC CAPITAL LETTER FITA
+  ѳ	f3	0473	1139	CYRILLIC SMALL LETTER FITA
+  Ѵ	V3	0474	1140	CYRILLIC CAPITAL LETTER IZHITSA
+  ѵ	v3	0475	1141	CYRILLIC SMALL LETTER IZHITSA
+  Ҁ	C3	0480	1152	CYRILLIC CAPITAL LETTER KOPPA
+  ҁ	c3	0481	1153	CYRILLIC SMALL LETTER KOPPA
+  Ґ	G3	0490	1168	CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+  ґ	g3	0491	1169	CYRILLIC SMALL LETTER GHE WITH UPTURN
+  א	A+	05D0	1488	HEBREW LETTER ALEF
+  ב	B+	05D1	1489	HEBREW LETTER BET
+  ג	G+	05D2	1490	HEBREW LETTER GIMEL
+  ד	D+	05D3	1491	HEBREW LETTER DALET
+  ה	H+	05D4	1492	HEBREW LETTER HE
+  ו	W+	05D5	1493	HEBREW LETTER VAV
+  ז	Z+	05D6	1494	HEBREW LETTER ZAYIN
+  ח	X+	05D7	1495	HEBREW LETTER HET
+  ט	Tj	05D8	1496	HEBREW LETTER TET
+  י	J+	05D9	1497	HEBREW LETTER YOD
+  ך	K%	05DA	1498	HEBREW LETTER FINAL KAF
+  כ	K+	05DB	1499	HEBREW LETTER KAF
+  ל	L+	05DC	1500	HEBREW LETTER LAMED
+  ם	M%	05DD	1501	HEBREW LETTER FINAL MEM
+  מ	M+	05DE	1502	HEBREW LETTER MEM
+  ן	N%	05DF	1503	HEBREW LETTER FINAL NUN `
+  נ	N+	05E0	1504	HEBREW LETTER NUN `
+  ס	S+	05E1	1505	HEBREW LETTER SAMEKH
+  ע	E+	05E2	1506	HEBREW LETTER AYIN
+  ף	P%	05E3	1507	HEBREW LETTER FINAL PE
+  פ	P+	05E4	1508	HEBREW LETTER PE
+  ץ	Zj	05E5	1509	HEBREW LETTER FINAL TSADI
+  צ	ZJ	05E6	1510	HEBREW LETTER TSADI
+  ק	Q+	05E7	1511	HEBREW LETTER QOF
+  ר	R+	05E8	1512	HEBREW LETTER RESH
+  ש	Sh	05E9	1513	HEBREW LETTER SHIN
+  ת	T+	05EA	1514	HEBREW LETTER TAV
+  ،	,+	060C	1548	ARABIC COMMA
+  ؛	;+	061B	1563	ARABIC SEMICOLON
+  ؟	?+	061F	1567	ARABIC QUESTION MARK
+  ء	H'	0621	1569	ARABIC LETTER HAMZA
+  آ	aM	0622	1570	ARABIC LETTER ALEF WITH MADDA ABOVE
+  أ	aH	0623	1571	ARABIC LETTER ALEF WITH HAMZA ABOVE
+  ؤ	wH	0624	1572	ARABIC LETTER WAW WITH HAMZA ABOVE
+  إ	ah	0625	1573	ARABIC LETTER ALEF WITH HAMZA BELOW
+  ئ	yH	0626	1574	ARABIC LETTER YEH WITH HAMZA ABOVE
+  ا	a+	0627	1575	ARABIC LETTER ALEF
+  ب	b+	0628	1576	ARABIC LETTER BEH
+  ة	tm	0629	1577	ARABIC LETTER TEH MARBUTA
+  ت	t+	062A	1578	ARABIC LETTER TEH
+  ث	tk	062B	1579	ARABIC LETTER THEH
+  ج	g+	062C	1580	ARABIC LETTER JEEM
+  ح	hk	062D	1581	ARABIC LETTER HAH
+  خ	x+	062E	1582	ARABIC LETTER KHAH
+  د	d+	062F	1583	ARABIC LETTER DAL
+  ذ	dk	0630	1584	ARABIC LETTER THAL
+  ر	r+	0631	1585	ARABIC LETTER REH
+  ز	z+	0632	1586	ARABIC LETTER ZAIN
+  س	s+	0633	1587	ARABIC LETTER SEEN
+  ش	sn	0634	1588	ARABIC LETTER SHEEN
+  ص	c+	0635	1589	ARABIC LETTER SAD
+  ض	dd	0636	1590	ARABIC LETTER DAD
+  ط	tj	0637	1591	ARABIC LETTER TAH
+  ظ	zH	0638	1592	ARABIC LETTER ZAH
+  ع	e+	0639	1593	ARABIC LETTER AIN
+  غ	i+	063A	1594	ARABIC LETTER GHAIN
+  ـ	++	0640	1600	ARABIC TATWEEL
+  ف	f+	0641	1601	ARABIC LETTER FEH
+  ق	q+	0642	1602	ARABIC LETTER QAF
+  ك	k+	0643	1603	ARABIC LETTER KAF
+  ل	l+	0644	1604	ARABIC LETTER LAM
+  م	m+	0645	1605	ARABIC LETTER MEEM
+  ن	n+	0646	1606	ARABIC LETTER NOON
+  ه	h+	0647	1607	ARABIC LETTER HEH
+  و	w+	0648	1608	ARABIC LETTER WAW
+  ى	j+	0649	1609	ARABIC LETTER ALEF MAKSURA
+  ي	y+	064A	1610	ARABIC LETTER YEH
+  ً	:+	064B	1611	ARABIC FATHATAN
+  ٌ	"+	064C	1612	ARABIC DAMMATAN
+  ٍ	=+	064D	1613	ARABIC KASRATAN
+  َ	/+	064E	1614	ARABIC FATHA
+  ُ	'+	064F	1615	ARABIC DAMMA
+  ِ	1+	0650	1616	ARABIC KASRA
+  ّ	3+	0651	1617	ARABIC SHADDA
+  ْ	0+	0652	1618	ARABIC SUKUN
+  ٰ	aS	0670	1648	ARABIC LETTER SUPERSCRIPT ALEF
+  پ	p+	067E	1662	ARABIC LETTER PEH
+  ڤ	v+	06A4	1700	ARABIC LETTER VEH
+  گ	gf	06AF	1711	ARABIC LETTER GAF
+  ۰	0a	06F0	1776	EXTENDED ARABIC-INDIC DIGIT ZERO
+  ۱	1a	06F1	1777	EXTENDED ARABIC-INDIC DIGIT ONE
+  ۲	2a	06F2	1778	EXTENDED ARABIC-INDIC DIGIT TWO
+  ۳	3a	06F3	1779	EXTENDED ARABIC-INDIC DIGIT THREE
+  ۴	4a	06F4	1780	EXTENDED ARABIC-INDIC DIGIT FOUR
+  ۵	5a	06F5	1781	EXTENDED ARABIC-INDIC DIGIT FIVE
+  ۶	6a	06F6	1782	EXTENDED ARABIC-INDIC DIGIT SIX
+  ۷	7a	06F7	1783	EXTENDED ARABIC-INDIC DIGIT SEVEN
+  ۸	8a	06F8	1784	EXTENDED ARABIC-INDIC DIGIT EIGHT
+  ۹	9a	06F9	1785	EXTENDED ARABIC-INDIC DIGIT NINE
+  Ḃ	B.	1E02	7682	LATIN CAPITAL LETTER B WITH DOT ABOVE
+  ḃ	b.	1E03	7683	LATIN SMALL LETTER B WITH DOT ABOVE
+  Ḇ	B_	1E06	7686	LATIN CAPITAL LETTER B WITH LINE BELOW
+  ḇ	b_	1E07	7687	LATIN SMALL LETTER B WITH LINE BELOW
+  Ḋ	D.	1E0A	7690	LATIN CAPITAL LETTER D WITH DOT ABOVE
+  ḋ	d.	1E0B	7691	LATIN SMALL LETTER D WITH DOT ABOVE
+  Ḏ	D_	1E0E	7694	LATIN CAPITAL LETTER D WITH LINE BELOW
+  ḏ	d_	1E0F	7695	LATIN SMALL LETTER D WITH LINE BELOW
+  Ḑ	D,	1E10	7696	LATIN CAPITAL LETTER D WITH CEDILLA
+  ḑ	d,	1E11	7697	LATIN SMALL LETTER D WITH CEDILLA
+  Ḟ	F.	1E1E	7710	LATIN CAPITAL LETTER F WITH DOT ABOVE
+  ḟ	f.	1E1F	7711	LATIN SMALL LETTER F WITH DOT ABOVE
+  Ḡ	G-	1E20	7712	LATIN CAPITAL LETTER G WITH MACRON
+  ḡ	g-	1E21	7713	LATIN SMALL LETTER G WITH MACRON
+  Ḣ	H.	1E22	7714	LATIN CAPITAL LETTER H WITH DOT ABOVE
+  ḣ	h.	1E23	7715	LATIN SMALL LETTER H WITH DOT ABOVE
+  Ḧ	H:	1E26	7718	LATIN CAPITAL LETTER H WITH DIAERESIS
+  ḧ	h:	1E27	7719	LATIN SMALL LETTER H WITH DIAERESIS
+  Ḩ	H,	1E28	7720	LATIN CAPITAL LETTER H WITH CEDILLA
+  ḩ	h,	1E29	7721	LATIN SMALL LETTER H WITH CEDILLA
+  Ḱ	K'	1E30	7728	LATIN CAPITAL LETTER K WITH ACUTE
+  ḱ	k'	1E31	7729	LATIN SMALL LETTER K WITH ACUTE
+  Ḵ	K_	1E34	7732	LATIN CAPITAL LETTER K WITH LINE BELOW
+  ḵ	k_	1E35	7733	LATIN SMALL LETTER K WITH LINE BELOW
+  Ḻ	L_	1E3A	7738	LATIN CAPITAL LETTER L WITH LINE BELOW
+  ḻ	l_	1E3B	7739	LATIN SMALL LETTER L WITH LINE BELOW
+  Ḿ	M'	1E3E	7742	LATIN CAPITAL LETTER M WITH ACUTE
+  ḿ	m'	1E3F	7743	LATIN SMALL LETTER M WITH ACUTE
+  Ṁ	M.	1E40	7744	LATIN CAPITAL LETTER M WITH DOT ABOVE
+  ṁ	m.	1E41	7745	LATIN SMALL LETTER M WITH DOT ABOVE
+  Ṅ	N.	1E44	7748	LATIN CAPITAL LETTER N WITH DOT ABOVE `
+  ṅ	n.	1E45	7749	LATIN SMALL LETTER N WITH DOT ABOVE `
+  Ṉ	N_	1E48	7752	LATIN CAPITAL LETTER N WITH LINE BELOW `
+  ṉ	n_	1E49	7753	LATIN SMALL LETTER N WITH LINE BELOW `
+  Ṕ	P'	1E54	7764	LATIN CAPITAL LETTER P WITH ACUTE
+  ṕ	p'	1E55	7765	LATIN SMALL LETTER P WITH ACUTE
+  Ṗ	P.	1E56	7766	LATIN CAPITAL LETTER P WITH DOT ABOVE
+  ṗ	p.	1E57	7767	LATIN SMALL LETTER P WITH DOT ABOVE
+  Ṙ	R.	1E58	7768	LATIN CAPITAL LETTER R WITH DOT ABOVE
+  ṙ	r.	1E59	7769	LATIN SMALL LETTER R WITH DOT ABOVE
+  Ṟ	R_	1E5E	7774	LATIN CAPITAL LETTER R WITH LINE BELOW
+  ṟ	r_	1E5F	7775	LATIN SMALL LETTER R WITH LINE BELOW
+  Ṡ	S.	1E60	7776	LATIN CAPITAL LETTER S WITH DOT ABOVE
+  ṡ	s.	1E61	7777	LATIN SMALL LETTER S WITH DOT ABOVE
+  Ṫ	T.	1E6A	7786	LATIN CAPITAL LETTER T WITH DOT ABOVE
+  ṫ	t.	1E6B	7787	LATIN SMALL LETTER T WITH DOT ABOVE
+  Ṯ	T_	1E6E	7790	LATIN CAPITAL LETTER T WITH LINE BELOW
+  ṯ	t_	1E6F	7791	LATIN SMALL LETTER T WITH LINE BELOW
+  Ṽ	V?	1E7C	7804	LATIN CAPITAL LETTER V WITH TILDE
+  ṽ	v?	1E7D	7805	LATIN SMALL LETTER V WITH TILDE
+  Ẁ	W!	1E80	7808	LATIN CAPITAL LETTER W WITH GRAVE
+  ẁ	w!	1E81	7809	LATIN SMALL LETTER W WITH GRAVE
+  Ẃ	W'	1E82	7810	LATIN CAPITAL LETTER W WITH ACUTE
+  ẃ	w'	1E83	7811	LATIN SMALL LETTER W WITH ACUTE
+  Ẅ	W:	1E84	7812	LATIN CAPITAL LETTER W WITH DIAERESIS
+  ẅ	w:	1E85	7813	LATIN SMALL LETTER W WITH DIAERESIS
+  Ẇ	W.	1E86	7814	LATIN CAPITAL LETTER W WITH DOT ABOVE
+  ẇ	w.	1E87	7815	LATIN SMALL LETTER W WITH DOT ABOVE
+  Ẋ	X.	1E8A	7818	LATIN CAPITAL LETTER X WITH DOT ABOVE
+  ẋ	x.	1E8B	7819	LATIN SMALL LETTER X WITH DOT ABOVE
+  Ẍ	X:	1E8C	7820	LATIN CAPITAL LETTER X WITH DIAERESIS
+  ẍ	x:	1E8D	7821	LATIN SMALL LETTER X WITH DIAERESIS
+  Ẏ	Y.	1E8E	7822	LATIN CAPITAL LETTER Y WITH DOT ABOVE
+  ẏ	y.	1E8F	7823	LATIN SMALL LETTER Y WITH DOT ABOVE
+  Ẑ	Z>	1E90	7824	LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+  ẑ	z>	1E91	7825	LATIN SMALL LETTER Z WITH CIRCUMFLEX
+  Ẕ	Z_	1E94	7828	LATIN CAPITAL LETTER Z WITH LINE BELOW
+  ẕ	z_	1E95	7829	LATIN SMALL LETTER Z WITH LINE BELOW
+  ẖ	h_	1E96	7830	LATIN SMALL LETTER H WITH LINE BELOW
+  ẗ	t:	1E97	7831	LATIN SMALL LETTER T WITH DIAERESIS
+  ẘ	w0	1E98	7832	LATIN SMALL LETTER W WITH RING ABOVE
+  ẙ	y0	1E99	7833	LATIN SMALL LETTER Y WITH RING ABOVE
+  Ả	A2	1EA2	7842	LATIN CAPITAL LETTER A WITH HOOK ABOVE
+  ả	a2	1EA3	7843	LATIN SMALL LETTER A WITH HOOK ABOVE
+  Ẻ	E2	1EBA	7866	LATIN CAPITAL LETTER E WITH HOOK ABOVE
+  ẻ	e2	1EBB	7867	LATIN SMALL LETTER E WITH HOOK ABOVE
+  Ẽ	E?	1EBC	7868	LATIN CAPITAL LETTER E WITH TILDE
+  ẽ	e?	1EBD	7869	LATIN SMALL LETTER E WITH TILDE
+  Ỉ	I2	1EC8	7880	LATIN CAPITAL LETTER I WITH HOOK ABOVE
+  ỉ	i2	1EC9	7881	LATIN SMALL LETTER I WITH HOOK ABOVE
+  Ỏ	O2	1ECE	7886	LATIN CAPITAL LETTER O WITH HOOK ABOVE
+  ỏ	o2	1ECF	7887	LATIN SMALL LETTER O WITH HOOK ABOVE
+  Ủ	U2	1EE6	7910	LATIN CAPITAL LETTER U WITH HOOK ABOVE
+  ủ	u2	1EE7	7911	LATIN SMALL LETTER U WITH HOOK ABOVE
+  Ỳ	Y!	1EF2	7922	LATIN CAPITAL LETTER Y WITH GRAVE
+  ỳ	y!	1EF3	7923	LATIN SMALL LETTER Y WITH GRAVE
+  Ỷ	Y2	1EF6	7926	LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+  ỷ	y2	1EF7	7927	LATIN SMALL LETTER Y WITH HOOK ABOVE
+  Ỹ	Y?	1EF8	7928	LATIN CAPITAL LETTER Y WITH TILDE
+  ỹ	y?	1EF9	7929	LATIN SMALL LETTER Y WITH TILDE
+  ἀ	;'	1F00	7936	GREEK SMALL LETTER ALPHA WITH PSILI
+  ἁ	,'	1F01	7937	GREEK SMALL LETTER ALPHA WITH DASIA
+  ἂ	;!	1F02	7938	GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
+  ἃ	,!	1F03	7939	GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
+  ἄ	?;	1F04	7940	GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
+  ἅ	?,	1F05	7941	GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
+  ἆ	!:	1F06	7942	GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
+  ἇ	?:	1F07	7943	GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+   	1N	2002	8194	EN SPACE
+   	1M	2003	8195	EM SPACE
+   	3M	2004	8196	THREE-PER-EM SPACE
+   	4M	2005	8197	FOUR-PER-EM SPACE
+   	6M	2006	8198	SIX-PER-EM SPACE
+   	1T	2009	8201	THIN SPACE
+   	1H	200A	8202	HAIR SPACE
+  ‐	-1	2010	8208	HYPHEN
+  –	-N	2013	8211	EN DASH `
+  —	-M	2014	8212	EM DASH
+  ―	-3	2015	8213	HORIZONTAL BAR
+  ‖	!2	2016	8214	DOUBLE VERTICAL LINE
+  ‗	=2	2017	8215	DOUBLE LOW LINE
+  ‘	'6	2018	8216	LEFT SINGLE QUOTATION MARK
+  ’	'9	2019	8217	RIGHT SINGLE QUOTATION MARK
+  ‚	.9	201A	8218	SINGLE LOW-9 QUOTATION MARK
+  ‛	9'	201B	8219	SINGLE HIGH-REVERSED-9 QUOTATION MARK
+  “	"6	201C	8220	LEFT DOUBLE QUOTATION MARK
+  ”	"9	201D	8221	RIGHT DOUBLE QUOTATION MARK
+  „	:9	201E	8222	DOUBLE LOW-9 QUOTATION MARK
+  ‟	9"	201F	8223	DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+  †	/-	2020	8224	DAGGER
+  ‡	/=	2021	8225	DOUBLE DAGGER
+  •	oo	2022	8226	BULLET
+  ‥	..	2025	8229	TWO DOT LEADER
+  …	,.	2026	8230	HORIZONTAL ELLIPSIS
+  ‰	%0	2030	8240	PER MILLE SIGN
+  ′	1'	2032	8242	PRIME
+  ″	2'	2033	8243	DOUBLE PRIME
+  ‴	3'	2034	8244	TRIPLE PRIME
+  ‵	1"	2035	8245	REVERSED PRIME
+  ‶	2"	2036	8246	REVERSED DOUBLE PRIME
+  ‷	3"	2037	8247	REVERSED TRIPLE PRIME
+  ‸	Ca	2038	8248	CARET
+  ‹	<1	2039	8249	SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+  ›	>1	203A	8250	SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+  ※	:X	203B	8251	REFERENCE MARK
+  ‾	'-	203E	8254	OVERLINE
+  ⁄	/f	2044	8260	FRACTION SLASH
+  ⁰	0S	2070	8304	SUPERSCRIPT ZERO
+  ⁴	4S	2074	8308	SUPERSCRIPT FOUR
+  ⁵	5S	2075	8309	SUPERSCRIPT FIVE
+  ⁶	6S	2076	8310	SUPERSCRIPT SIX
+  ⁷	7S	2077	8311	SUPERSCRIPT SEVEN
+  ⁸	8S	2078	8312	SUPERSCRIPT EIGHT
+  ⁹	9S	2079	8313	SUPERSCRIPT NINE
+  ⁺	+S	207A	8314	SUPERSCRIPT PLUS SIGN
+  ⁻	-S	207B	8315	SUPERSCRIPT MINUS
+  ⁼	=S	207C	8316	SUPERSCRIPT EQUALS SIGN
+  ⁽	(S	207D	8317	SUPERSCRIPT LEFT PARENTHESIS
+  ⁾	)S	207E	8318	SUPERSCRIPT RIGHT PARENTHESIS
+  ⁿ	nS	207F	8319	SUPERSCRIPT LATIN SMALL LETTER N `
+  ₀	0s	2080	8320	SUBSCRIPT ZERO
+  ₁	1s	2081	8321	SUBSCRIPT ONE
+  ₂	2s	2082	8322	SUBSCRIPT TWO
+  ₃	3s	2083	8323	SUBSCRIPT THREE
+  ₄	4s	2084	8324	SUBSCRIPT FOUR
+  ₅	5s	2085	8325	SUBSCRIPT FIVE
+  ₆	6s	2086	8326	SUBSCRIPT SIX
+  ₇	7s	2087	8327	SUBSCRIPT SEVEN
+  ₈	8s	2088	8328	SUBSCRIPT EIGHT
+  ₉	9s	2089	8329	SUBSCRIPT NINE
+  ₊	+s	208A	8330	SUBSCRIPT PLUS SIGN
+  ₋	-s	208B	8331	SUBSCRIPT MINUS
+  ₌	=s	208C	8332	SUBSCRIPT EQUALS SIGN
+  ₍	(s	208D	8333	SUBSCRIPT LEFT PARENTHESIS
+  ₎	)s	208E	8334	SUBSCRIPT RIGHT PARENTHESIS
+  ₤	Li	20A4	8356	LIRA SIGN
+  ₧	Pt	20A7	8359	PESETA SIGN
+  ₩	W=	20A9	8361	WON SIGN
+  €	Eu	20AC	8364	EURO SIGN
+  ₽	=R	20BD	8381	ROUBLE SIGN
+  ₽	=P	20BD	8381	ROUBLE SIGN
+  ℃	oC	2103	8451	DEGREE CELSIUS
+  ℅	co	2105	8453	CARE OF
+  ℉	oF	2109	8457	DEGREE FAHRENHEIT
+  №	N0	2116	8470	NUMERO SIGN
+  ℗	PO	2117	8471	SOUND RECORDING COPYRIGHT
+  ℞	Rx	211E	8478	PRESCRIPTION TAKE
+  ℠	SM	2120	8480	SERVICE MARK
+  ™	TM	2122	8482	TRADE MARK SIGN
+  Ω	Om	2126	8486	OHM SIGN
+  Å	AO	212B	8491	ANGSTROM SIGN
+  ⅓	13	2153	8531	VULGAR FRACTION ONE THIRD
+  ⅔	23	2154	8532	VULGAR FRACTION TWO THIRDS
+  ⅕	15	2155	8533	VULGAR FRACTION ONE FIFTH
+  ⅖	25	2156	8534	VULGAR FRACTION TWO FIFTHS
+  ⅗	35	2157	8535	VULGAR FRACTION THREE FIFTHS
+  ⅘	45	2158	8536	VULGAR FRACTION FOUR FIFTHS
+  ⅙	16	2159	8537	VULGAR FRACTION ONE SIXTH
+  ⅚	56	215A	8538	VULGAR FRACTION FIVE SIXTHS
+  ⅛	18	215B	8539	VULGAR FRACTION ONE EIGHTH
+  ⅜	38	215C	8540	VULGAR FRACTION THREE EIGHTHS
+  ⅝	58	215D	8541	VULGAR FRACTION FIVE EIGHTHS
+  ⅞	78	215E	8542	VULGAR FRACTION SEVEN EIGHTHS
+  Ⅰ	1R	2160	8544	ROMAN NUMERAL ONE
+  Ⅱ	2R	2161	8545	ROMAN NUMERAL TWO
+  Ⅲ	3R	2162	8546	ROMAN NUMERAL THREE
+  Ⅳ	4R	2163	8547	ROMAN NUMERAL FOUR
+  Ⅴ	5R	2164	8548	ROMAN NUMERAL FIVE
+  Ⅵ	6R	2165	8549	ROMAN NUMERAL SIX
+  Ⅶ	7R	2166	8550	ROMAN NUMERAL SEVEN
+  Ⅷ	8R	2167	8551	ROMAN NUMERAL EIGHT
+  Ⅸ	9R	2168	8552	ROMAN NUMERAL NINE
+  Ⅹ	aR	2169	8553	ROMAN NUMERAL TEN
+  Ⅺ	bR	216A	8554	ROMAN NUMERAL ELEVEN
+  Ⅻ	cR	216B	8555	ROMAN NUMERAL TWELVE
+  ⅰ	1r	2170	8560	SMALL ROMAN NUMERAL ONE
+  ⅱ	2r	2171	8561	SMALL ROMAN NUMERAL TWO
+  ⅲ	3r	2172	8562	SMALL ROMAN NUMERAL THREE
+  ⅳ	4r	2173	8563	SMALL ROMAN NUMERAL FOUR
+  ⅴ	5r	2174	8564	SMALL ROMAN NUMERAL FIVE
+  ⅵ	6r	2175	8565	SMALL ROMAN NUMERAL SIX
+  ⅶ	7r	2176	8566	SMALL ROMAN NUMERAL SEVEN
+  ⅷ	8r	2177	8567	SMALL ROMAN NUMERAL EIGHT
+  ⅸ	9r	2178	8568	SMALL ROMAN NUMERAL NINE
+  ⅹ	ar	2179	8569	SMALL ROMAN NUMERAL TEN
+  ⅺ	br	217A	8570	SMALL ROMAN NUMERAL ELEVEN
+  ⅻ	cr	217B	8571	SMALL ROMAN NUMERAL TWELVE
+  ←	<-	2190	8592	LEFTWARDS ARROW
+  ↑	-!	2191	8593	UPWARDS ARROW
+  →	->	2192	8594	RIGHTWARDS ARROW
+  ↓	-v	2193	8595	DOWNWARDS ARROW
+  ↔	<>	2194	8596	LEFT RIGHT ARROW
+  ↕	UD	2195	8597	UP DOWN ARROW
+  ⇐	<=	21D0	8656	LEFTWARDS DOUBLE ARROW
+  ⇒	=>	21D2	8658	RIGHTWARDS DOUBLE ARROW
+  ⇔	==	21D4	8660	LEFT RIGHT DOUBLE ARROW
+  ∀	FA	2200	8704	FOR ALL
+  ∂	dP	2202	8706	PARTIAL DIFFERENTIAL
+  ∃	TE	2203	8707	THERE EXISTS
+  ∅	/0	2205	8709	EMPTY SET
+  ∆	DE	2206	8710	INCREMENT
+  ∇	NB	2207	8711	NABLA
+  ∈	(-	2208	8712	ELEMENT OF
+  ∋	-)	220B	8715	CONTAINS AS MEMBER
+  ∏	*P	220F	8719	N-ARY PRODUCT `
+  ∑	+Z	2211	8721	N-ARY SUMMATION `
+  −	-2	2212	8722	MINUS SIGN
+  ∓	-+	2213	8723	MINUS-OR-PLUS SIGN
+  ∗	*-	2217	8727	ASTERISK OPERATOR
+  ∘	Ob	2218	8728	RING OPERATOR
+  ∙	Sb	2219	8729	BULLET OPERATOR
+  √	RT	221A	8730	SQUARE ROOT
+  ∝	0(	221D	8733	PROPORTIONAL TO
+  ∞	00	221E	8734	INFINITY
+  ∟	-L	221F	8735	RIGHT ANGLE
+  ∠	-V	2220	8736	ANGLE
+  ∥	PP	2225	8741	PARALLEL TO
+  ∧	AN	2227	8743	LOGICAL AND
+  ∨	OR	2228	8744	LOGICAL OR
+  ∩	(U	2229	8745	INTERSECTION
+  ∪	)U	222A	8746	UNION
+  ∫	In	222B	8747	INTEGRAL
+  ∬	DI	222C	8748	DOUBLE INTEGRAL
+  ∮	Io	222E	8750	CONTOUR INTEGRAL
+  ∴	.:	2234	8756	THEREFORE
+  ∵	:.	2235	8757	BECAUSE
+  ∶	:R	2236	8758	RATIO
+  ∷	::	2237	8759	PROPORTION
+  ∼	?1	223C	8764	TILDE OPERATOR
+  ∾	CG	223E	8766	INVERTED LAZY S
+  ≃	?-	2243	8771	ASYMPTOTICALLY EQUAL TO
+  ≅	?=	2245	8773	APPROXIMATELY EQUAL TO
+  ≈	?2	2248	8776	ALMOST EQUAL TO
+  ≌	=?	224C	8780	ALL EQUAL TO
+  ≓	HI	2253	8787	IMAGE OF OR APPROXIMATELY EQUAL TO
+  ≠	!=	2260	8800	NOT EQUAL TO
+  ≡	=3	2261	8801	IDENTICAL TO
+  ≤	=<	2264	8804	LESS-THAN OR EQUAL TO
+  ≥	>=	2265	8805	GREATER-THAN OR EQUAL TO
+  ≪	<*	226A	8810	MUCH LESS-THAN
+  ≫	*>	226B	8811	MUCH GREATER-THAN
+  ≮	!<	226E	8814	NOT LESS-THAN
+  ≯	!>	226F	8815	NOT GREATER-THAN
+  ⊂	(C	2282	8834	SUBSET OF
+  ⊃	)C	2283	8835	SUPERSET OF
+  ⊆	(_	2286	8838	SUBSET OF OR EQUAL TO
+  ⊇	)_	2287	8839	SUPERSET OF OR EQUAL TO
+  ⊙	0.	2299	8857	CIRCLED DOT OPERATOR
+  ⊚	02	229A	8858	CIRCLED RING OPERATOR
+  ⊥	-T	22A5	8869	UP TACK
+  ⋅	.P	22C5	8901	DOT OPERATOR
+  ⋮	:3	22EE	8942	VERTICAL ELLIPSIS
+  ⋯	.3	22EF	8943	MIDLINE HORIZONTAL ELLIPSIS
+  ⌂	Eh	2302	8962	HOUSE
+  ⌈	<7	2308	8968	LEFT CEILING
+  ⌉	>7	2309	8969	RIGHT CEILING
+  ⌊	7<	230A	8970	LEFT FLOOR
+  ⌋	7>	230B	8971	RIGHT FLOOR
+  ⌐	NI	2310	8976	REVERSED NOT SIGN
+  ⌒	(A	2312	8978	ARC
+  ⌕	TR	2315	8981	TELEPHONE RECORDER
+  ⌠	Iu	2320	8992	TOP HALF INTEGRAL
+  ⌡	Il	2321	8993	BOTTOM HALF INTEGRAL
+  〈	</	2329	9001	LEFT-POINTING ANGLE BRACKET
+  〉	/>	232A	9002	RIGHT-POINTING ANGLE BRACKET
+  ␣	Vs	2423	9251	OPEN BOX
+  ⑀	1h	2440	9280	OCR HOOK
+  ⑁	3h	2441	9281	OCR CHAIR
+  ⑂	2h	2442	9282	OCR FORK
+  ⑃	4h	2443	9283	OCR INVERTED FORK
+  ⑆	1j	2446	9286	OCR BRANCH BANK IDENTIFICATION
+  ⑇	2j	2447	9287	OCR AMOUNT OF CHECK
+  ⑈	3j	2448	9288	OCR DASH
+  ⑉	4j	2449	9289	OCR CUSTOMER ACCOUNT NUMBER
+  ⒈	1.	2488	9352	DIGIT ONE FULL STOP
+  ⒉	2.	2489	9353	DIGIT TWO FULL STOP
+  ⒊	3.	248A	9354	DIGIT THREE FULL STOP
+  ⒋	4.	248B	9355	DIGIT FOUR FULL STOP
+  ⒌	5.	248C	9356	DIGIT FIVE FULL STOP
+  ⒍	6.	248D	9357	DIGIT SIX FULL STOP
+  ⒎	7.	248E	9358	DIGIT SEVEN FULL STOP
+  ⒏	8.	248F	9359	DIGIT EIGHT FULL STOP
+  ⒐	9.	2490	9360	DIGIT NINE FULL STOP
+  ─	hh	2500	9472	BOX DRAWINGS LIGHT HORIZONTAL
+  ━	HH	2501	9473	BOX DRAWINGS HEAVY HORIZONTAL
+  │	vv	2502	9474	BOX DRAWINGS LIGHT VERTICAL
+  ┃	VV	2503	9475	BOX DRAWINGS HEAVY VERTICAL
+  ┄	3-	2504	9476	BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL
+  ┅	3_	2505	9477	BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL
+  ┆	3!	2506	9478	BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL
+  ┇	3/	2507	9479	BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL
+  ┈	4-	2508	9480	BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL
+  ┉	4_	2509	9481	BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL
+  ┊	4!	250A	9482	BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL
+  ┋	4/	250B	9483	BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL
+  ┌	dr	250C	9484	BOX DRAWINGS LIGHT DOWN AND RIGHT
+  ┍	dR	250D	9485	BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
+  ┎	Dr	250E	9486	BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
+  ┏	DR	250F	9487	BOX DRAWINGS HEAVY DOWN AND RIGHT
+  ┐	dl	2510	9488	BOX DRAWINGS LIGHT DOWN AND LEFT
+  ┑	dL	2511	9489	BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
+  ┒	Dl	2512	9490	BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
+  ┓	LD	2513	9491	BOX DRAWINGS HEAVY DOWN AND LEFT
+  └	ur	2514	9492	BOX DRAWINGS LIGHT UP AND RIGHT
+  ┕	uR	2515	9493	BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
+  ┖	Ur	2516	9494	BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
+  ┗	UR	2517	9495	BOX DRAWINGS HEAVY UP AND RIGHT
+  ┘	ul	2518	9496	BOX DRAWINGS LIGHT UP AND LEFT
+  ┙	uL	2519	9497	BOX DRAWINGS UP LIGHT AND LEFT HEAVY
+  ┚	Ul	251A	9498	BOX DRAWINGS UP HEAVY AND LEFT LIGHT
+  ┛	UL	251B	9499	BOX DRAWINGS HEAVY UP AND LEFT
+  ├	vr	251C	9500	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+  ┝	vR	251D	9501	BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
+  ┠	Vr	2520	9504	BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
+  ┣	VR	2523	9507	BOX DRAWINGS HEAVY VERTICAL AND RIGHT
+  ┤	vl	2524	9508	BOX DRAWINGS LIGHT VERTICAL AND LEFT
+  ┥	vL	2525	9509	BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
+  ┨	Vl	2528	9512	BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
+  ┫	VL	252B	9515	BOX DRAWINGS HEAVY VERTICAL AND LEFT
+  ┬	dh	252C	9516	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+  ┯	dH	252F	9519	BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
+  ┰	Dh	2530	9520	BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
+  ┳	DH	2533	9523	BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
+  ┴	uh	2534	9524	BOX DRAWINGS LIGHT UP AND HORIZONTAL
+  ┷	uH	2537	9527	BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
+  ┸	Uh	2538	9528	BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
+  ┻	UH	253B	9531	BOX DRAWINGS HEAVY UP AND HORIZONTAL
+  ┼	vh	253C	9532	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+  ┿	vH	253F	9535	BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
+  ╂	Vh	2542	9538	BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
+  ╋	VH	254B	9547	BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
+  ╱	FD	2571	9585	BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
+  ╲	BD	2572	9586	BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
+  ▀	TB	2580	9600	UPPER HALF BLOCK
+  ▄	LB	2584	9604	LOWER HALF BLOCK
+  █	FB	2588	9608	FULL BLOCK
+  ▌	lB	258C	9612	LEFT HALF BLOCK
+  ▐	RB	2590	9616	RIGHT HALF BLOCK
+  ░	.S	2591	9617	LIGHT SHADE
+  ▒	:S	2592	9618	MEDIUM SHADE
+  ▓	?S	2593	9619	DARK SHADE
+  ■	fS	25A0	9632	BLACK SQUARE
+  □	OS	25A1	9633	WHITE SQUARE
+  ▢	RO	25A2	9634	WHITE SQUARE WITH ROUNDED CORNERS
+  ▣	Rr	25A3	9635	WHITE SQUARE CONTAINING BLACK SMALL SQUARE
+  ▤	RF	25A4	9636	SQUARE WITH HORIZONTAL FILL
+  ▥	RY	25A5	9637	SQUARE WITH VERTICAL FILL
+  ▦	RH	25A6	9638	SQUARE WITH ORTHOGONAL CROSSHATCH FILL
+  ▧	RZ	25A7	9639	SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL
+  ▨	RK	25A8	9640	SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL
+  ▩	RX	25A9	9641	SQUARE WITH DIAGONAL CROSSHATCH FILL
+  ▪	sB	25AA	9642	BLACK SMALL SQUARE
+  ▬	SR	25AC	9644	BLACK RECTANGLE
+  ▭	Or	25AD	9645	WHITE RECTANGLE
+  ▲	UT	25B2	9650	BLACK UP-POINTING TRIANGLE
+  △	uT	25B3	9651	WHITE UP-POINTING TRIANGLE
+  ▶	PR	25B6	9654	BLACK RIGHT-POINTING TRIANGLE
+  ▷	Tr	25B7	9655	WHITE RIGHT-POINTING TRIANGLE
+  ▼	Dt	25BC	9660	BLACK DOWN-POINTING TRIANGLE
+  ▽	dT	25BD	9661	WHITE DOWN-POINTING TRIANGLE
+  ◀	PL	25C0	9664	BLACK LEFT-POINTING TRIANGLE
+  ◁	Tl	25C1	9665	WHITE LEFT-POINTING TRIANGLE
+  ◆	Db	25C6	9670	BLACK DIAMOND
+  ◇	Dw	25C7	9671	WHITE DIAMOND
+  ◊	LZ	25CA	9674	LOZENGE
+  ○	0m	25CB	9675	WHITE CIRCLE
+  ◎	0o	25CE	9678	BULLSEYE
+  ●	0M	25CF	9679	BLACK CIRCLE
+  ◐	0L	25D0	9680	CIRCLE WITH LEFT HALF BLACK
+  ◑	0R	25D1	9681	CIRCLE WITH RIGHT HALF BLACK
+  ◘	Sn	25D8	9688	INVERSE BULLET
+  ◙	Ic	25D9	9689	INVERSE WHITE CIRCLE
+  ◢	Fd	25E2	9698	BLACK LOWER RIGHT TRIANGLE
+  ◣	Bd	25E3	9699	BLACK LOWER LEFT TRIANGLE
+  ★	*2	2605	9733	BLACK STAR
+  ☆	*1	2606	9734	WHITE STAR
+  ☜	<H	261C	9756	WHITE LEFT POINTING INDEX
+  ☞	>H	261E	9758	WHITE RIGHT POINTING INDEX
+  ☺	0u	263A	9786	WHITE SMILING FACE
+  ☻	0U	263B	9787	BLACK SMILING FACE
+  ☼	SU	263C	9788	WHITE SUN WITH RAYS
+  ♀	Fm	2640	9792	FEMALE SIGN
+  ♂	Ml	2642	9794	MALE SIGN
+  ♠	cS	2660	9824	BLACK SPADE SUIT
+  ♡	cH	2661	9825	WHITE HEART SUIT
+  ♢	cD	2662	9826	WHITE DIAMOND SUIT
+  ♣	cC	2663	9827	BLACK CLUB SUIT
+  ♩	Md	2669	9833	QUARTER NOTE `
+  ♪	M8	266A	9834	EIGHTH NOTE `
+  ♫	M2	266B	9835	BEAMED EIGHTH NOTES
+  ♭	Mb	266D	9837	MUSIC FLAT SIGN
+  ♮	Mx	266E	9838	MUSIC NATURAL SIGN
+  ♯	MX	266F	9839	MUSIC SHARP SIGN
+  ✓	OK	2713	10003	CHECK MARK
+  ✗	XX	2717	10007	BALLOT X
+  ✠	-X	2720	10016	MALTESE CROSS
+  　	IS	3000	12288	IDEOGRAPHIC SPACE
+  、	,_	3001	12289	IDEOGRAPHIC COMMA
+  。	._	3002	12290	IDEOGRAPHIC FULL STOP
+  〃	+"	3003	12291	DITTO MARK
+  〄	+_	3004	12292	JAPANESE INDUSTRIAL STANDARD SYMBOL
+  々	*_	3005	12293	IDEOGRAPHIC ITERATION MARK
+  〆	;_	3006	12294	IDEOGRAPHIC CLOSING MARK
+  〇	0_	3007	12295	IDEOGRAPHIC NUMBER ZERO
+  《	<+	300A	12298	LEFT DOUBLE ANGLE BRACKET
+  》	>+	300B	12299	RIGHT DOUBLE ANGLE BRACKET
+  「	<'	300C	12300	LEFT CORNER BRACKET
+  」	>'	300D	12301	RIGHT CORNER BRACKET
+  『	<"	300E	12302	LEFT WHITE CORNER BRACKET
+  』	>"	300F	12303	RIGHT WHITE CORNER BRACKET
+  【	("	3010	12304	LEFT BLACK LENTICULAR BRACKET
+  】	)"	3011	12305	RIGHT BLACK LENTICULAR BRACKET
+  〒	=T	3012	12306	POSTAL MARK
+  〓	=_	3013	12307	GETA MARK
+  〔	('	3014	12308	LEFT TORTOISE SHELL BRACKET
+  〕	)'	3015	12309	RIGHT TORTOISE SHELL BRACKET
+  〖	(I	3016	12310	LEFT WHITE LENTICULAR BRACKET
+  〗	)I	3017	12311	RIGHT WHITE LENTICULAR BRACKET
+  〜	-?	301C	12316	WAVE DASH
+  ぁ	A5	3041	12353	HIRAGANA LETTER SMALL A
+  あ	a5	3042	12354	HIRAGANA LETTER A
+  ぃ	I5	3043	12355	HIRAGANA LETTER SMALL I
+  い	i5	3044	12356	HIRAGANA LETTER I
+  ぅ	U5	3045	12357	HIRAGANA LETTER SMALL U
+  う	u5	3046	12358	HIRAGANA LETTER U
+  ぇ	E5	3047	12359	HIRAGANA LETTER SMALL E
+  え	e5	3048	12360	HIRAGANA LETTER E
+  ぉ	O5	3049	12361	HIRAGANA LETTER SMALL O
+  お	o5	304A	12362	HIRAGANA LETTER O
+  か	ka	304B	12363	HIRAGANA LETTER KA
+  が	ga	304C	12364	HIRAGANA LETTER GA
+  き	ki	304D	12365	HIRAGANA LETTER KI
+  ぎ	gi	304E	12366	HIRAGANA LETTER GI
+  く	ku	304F	12367	HIRAGANA LETTER KU
+  ぐ	gu	3050	12368	HIRAGANA LETTER GU
+  け	ke	3051	12369	HIRAGANA LETTER KE
+  げ	ge	3052	12370	HIRAGANA LETTER GE
+  こ	ko	3053	12371	HIRAGANA LETTER KO
+  ご	go	3054	12372	HIRAGANA LETTER GO
+  さ	sa	3055	12373	HIRAGANA LETTER SA
+  ざ	za	3056	12374	HIRAGANA LETTER ZA
+  し	si	3057	12375	HIRAGANA LETTER SI
+  じ	zi	3058	12376	HIRAGANA LETTER ZI
+  す	su	3059	12377	HIRAGANA LETTER SU
+  ず	zu	305A	12378	HIRAGANA LETTER ZU
+  せ	se	305B	12379	HIRAGANA LETTER SE
+  ぜ	ze	305C	12380	HIRAGANA LETTER ZE
+  そ	so	305D	12381	HIRAGANA LETTER SO
+  ぞ	zo	305E	12382	HIRAGANA LETTER ZO
+  た	ta	305F	12383	HIRAGANA LETTER TA
+  だ	da	3060	12384	HIRAGANA LETTER DA
+  ち	ti	3061	12385	HIRAGANA LETTER TI
+  ぢ	di	3062	12386	HIRAGANA LETTER DI
+  っ	tU	3063	12387	HIRAGANA LETTER SMALL TU
+  つ	tu	3064	12388	HIRAGANA LETTER TU
+  づ	du	3065	12389	HIRAGANA LETTER DU
+  て	te	3066	12390	HIRAGANA LETTER TE
+  で	de	3067	12391	HIRAGANA LETTER DE
+  と	to	3068	12392	HIRAGANA LETTER TO
+  ど	do	3069	12393	HIRAGANA LETTER DO
+  な	na	306A	12394	HIRAGANA LETTER NA
+  に	ni	306B	12395	HIRAGANA LETTER NI
+  ぬ	nu	306C	12396	HIRAGANA LETTER NU
+  ね	ne	306D	12397	HIRAGANA LETTER NE
+  の	no	306E	12398	HIRAGANA LETTER NO
+  は	ha	306F	12399	HIRAGANA LETTER HA
+  ば	ba	3070	12400	HIRAGANA LETTER BA
+  ぱ	pa	3071	12401	HIRAGANA LETTER PA
+  ひ	hi	3072	12402	HIRAGANA LETTER HI
+  び	bi	3073	12403	HIRAGANA LETTER BI
+  ぴ	pi	3074	12404	HIRAGANA LETTER PI
+  ふ	hu	3075	12405	HIRAGANA LETTER HU
+  ぶ	bu	3076	12406	HIRAGANA LETTER BU
+  ぷ	pu	3077	12407	HIRAGANA LETTER PU
+  へ	he	3078	12408	HIRAGANA LETTER HE
+  べ	be	3079	12409	HIRAGANA LETTER BE
+  ぺ	pe	307A	12410	HIRAGANA LETTER PE
+  ほ	ho	307B	12411	HIRAGANA LETTER HO
+  ぼ	bo	307C	12412	HIRAGANA LETTER BO
+  ぽ	po	307D	12413	HIRAGANA LETTER PO
+  ま	ma	307E	12414	HIRAGANA LETTER MA
+  み	mi	307F	12415	HIRAGANA LETTER MI
+  む	mu	3080	12416	HIRAGANA LETTER MU
+  め	me	3081	12417	HIRAGANA LETTER ME
+  も	mo	3082	12418	HIRAGANA LETTER MO
+  ゃ	yA	3083	12419	HIRAGANA LETTER SMALL YA
+  や	ya	3084	12420	HIRAGANA LETTER YA
+  ゅ	yU	3085	12421	HIRAGANA LETTER SMALL YU
+  ゆ	yu	3086	12422	HIRAGANA LETTER YU
+  ょ	yO	3087	12423	HIRAGANA LETTER SMALL YO
+  よ	yo	3088	12424	HIRAGANA LETTER YO
+  ら	ra	3089	12425	HIRAGANA LETTER RA
+  り	ri	308A	12426	HIRAGANA LETTER RI
+  る	ru	308B	12427	HIRAGANA LETTER RU
+  れ	re	308C	12428	HIRAGANA LETTER RE
+  ろ	ro	308D	12429	HIRAGANA LETTER RO
+  ゎ	wA	308E	12430	HIRAGANA LETTER SMALL WA
+  わ	wa	308F	12431	HIRAGANA LETTER WA
+  ゐ	wi	3090	12432	HIRAGANA LETTER WI
+  ゑ	we	3091	12433	HIRAGANA LETTER WE
+  を	wo	3092	12434	HIRAGANA LETTER WO
+  ん	n5	3093	12435	HIRAGANA LETTER N `
+  ゔ	vu	3094	12436	HIRAGANA LETTER VU
+  ゛	"5	309B	12443	KATAKANA-HIRAGANA VOICED SOUND MARK
+  ゜	05	309C	12444	KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+  ゝ	*5	309D	12445	HIRAGANA ITERATION MARK
+  ゞ	+5	309E	12446	HIRAGANA VOICED ITERATION MARK
+  ァ	a6	30A1	12449	KATAKANA LETTER SMALL A
+  ア	A6	30A2	12450	KATAKANA LETTER A
+  ィ	i6	30A3	12451	KATAKANA LETTER SMALL I
+  イ	I6	30A4	12452	KATAKANA LETTER I
+  ゥ	u6	30A5	12453	KATAKANA LETTER SMALL U
+  ウ	U6	30A6	12454	KATAKANA LETTER U
+  ェ	e6	30A7	12455	KATAKANA LETTER SMALL E
+  エ	E6	30A8	12456	KATAKANA LETTER E
+  ォ	o6	30A9	12457	KATAKANA LETTER SMALL O
+  オ	O6	30AA	12458	KATAKANA LETTER O
+  カ	Ka	30AB	12459	KATAKANA LETTER KA
+  ガ	Ga	30AC	12460	KATAKANA LETTER GA
+  キ	Ki	30AD	12461	KATAKANA LETTER KI
+  ギ	Gi	30AE	12462	KATAKANA LETTER GI
+  ク	Ku	30AF	12463	KATAKANA LETTER KU
+  グ	Gu	30B0	12464	KATAKANA LETTER GU
+  ケ	Ke	30B1	12465	KATAKANA LETTER KE
+  ゲ	Ge	30B2	12466	KATAKANA LETTER GE
+  コ	Ko	30B3	12467	KATAKANA LETTER KO
+  ゴ	Go	30B4	12468	KATAKANA LETTER GO
+  サ	Sa	30B5	12469	KATAKANA LETTER SA
+  ザ	Za	30B6	12470	KATAKANA LETTER ZA
+  シ	Si	30B7	12471	KATAKANA LETTER SI
+  ジ	Zi	30B8	12472	KATAKANA LETTER ZI
+  ス	Su	30B9	12473	KATAKANA LETTER SU
+  ズ	Zu	30BA	12474	KATAKANA LETTER ZU
+  セ	Se	30BB	12475	KATAKANA LETTER SE
+  ゼ	Ze	30BC	12476	KATAKANA LETTER ZE
+  ソ	So	30BD	12477	KATAKANA LETTER SO
+  ゾ	Zo	30BE	12478	KATAKANA LETTER ZO
+  タ	Ta	30BF	12479	KATAKANA LETTER TA
+  ダ	Da	30C0	12480	KATAKANA LETTER DA
+  チ	Ti	30C1	12481	KATAKANA LETTER TI
+  ヂ	Di	30C2	12482	KATAKANA LETTER DI
+  ッ	TU	30C3	12483	KATAKANA LETTER SMALL TU
+  ツ	Tu	30C4	12484	KATAKANA LETTER TU
+  ヅ	Du	30C5	12485	KATAKANA LETTER DU
+  テ	Te	30C6	12486	KATAKANA LETTER TE
+  デ	De	30C7	12487	KATAKANA LETTER DE
+  ト	To	30C8	12488	KATAKANA LETTER TO
+  ド	Do	30C9	12489	KATAKANA LETTER DO
+  ナ	Na	30CA	12490	KATAKANA LETTER NA
+  ニ	Ni	30CB	12491	KATAKANA LETTER NI
+  ヌ	Nu	30CC	12492	KATAKANA LETTER NU
+  ネ	Ne	30CD	12493	KATAKANA LETTER NE
+  ノ	No	30CE	12494	KATAKANA LETTER NO
+  ハ	Ha	30CF	12495	KATAKANA LETTER HA
+  バ	Ba	30D0	12496	KATAKANA LETTER BA
+  パ	Pa	30D1	12497	KATAKANA LETTER PA
+  ヒ	Hi	30D2	12498	KATAKANA LETTER HI
+  ビ	Bi	30D3	12499	KATAKANA LETTER BI
+  ピ	Pi	30D4	12500	KATAKANA LETTER PI
+  フ	Hu	30D5	12501	KATAKANA LETTER HU
+  ブ	Bu	30D6	12502	KATAKANA LETTER BU
+  プ	Pu	30D7	12503	KATAKANA LETTER PU
+  ヘ	He	30D8	12504	KATAKANA LETTER HE
+  ベ	Be	30D9	12505	KATAKANA LETTER BE
+  ペ	Pe	30DA	12506	KATAKANA LETTER PE
+  ホ	Ho	30DB	12507	KATAKANA LETTER HO
+  ボ	Bo	30DC	12508	KATAKANA LETTER BO
+  ポ	Po	30DD	12509	KATAKANA LETTER PO
+  マ	Ma	30DE	12510	KATAKANA LETTER MA
+  ミ	Mi	30DF	12511	KATAKANA LETTER MI
+  ム	Mu	30E0	12512	KATAKANA LETTER MU
+  メ	Me	30E1	12513	KATAKANA LETTER ME
+  モ	Mo	30E2	12514	KATAKANA LETTER MO
+  ャ	YA	30E3	12515	KATAKANA LETTER SMALL YA
+  ヤ	Ya	30E4	12516	KATAKANA LETTER YA
+  ュ	YU	30E5	12517	KATAKANA LETTER SMALL YU
+  ユ	Yu	30E6	12518	KATAKANA LETTER YU
+  ョ	YO	30E7	12519	KATAKANA LETTER SMALL YO
+  ヨ	Yo	30E8	12520	KATAKANA LETTER YO
+  ラ	Ra	30E9	12521	KATAKANA LETTER RA
+  リ	Ri	30EA	12522	KATAKANA LETTER RI
+  ル	Ru	30EB	12523	KATAKANA LETTER RU
+  レ	Re	30EC	12524	KATAKANA LETTER RE
+  ロ	Ro	30ED	12525	KATAKANA LETTER RO
+  ヮ	WA	30EE	12526	KATAKANA LETTER SMALL WA
+  ワ	Wa	30EF	12527	KATAKANA LETTER WA
+  ヰ	Wi	30F0	12528	KATAKANA LETTER WI
+  ヱ	We	30F1	12529	KATAKANA LETTER WE
+  ヲ	Wo	30F2	12530	KATAKANA LETTER WO
+  ン	N6	30F3	12531	KATAKANA LETTER N `
+  ヴ	Vu	30F4	12532	KATAKANA LETTER VU
+  ヵ	KA	30F5	12533	KATAKANA LETTER SMALL KA
+  ヶ	KE	30F6	12534	KATAKANA LETTER SMALL KE
+  ヷ	Va	30F7	12535	KATAKANA LETTER VA
+  ヸ	Vi	30F8	12536	KATAKANA LETTER VI
+  ヹ	Ve	30F9	12537	KATAKANA LETTER VE
+  ヺ	Vo	30FA	12538	KATAKANA LETTER VO
+  ・	.6	30FB	12539	KATAKANA MIDDLE DOT
+  ー	-6	30FC	12540	KATAKANA-HIRAGANA PROLONGED SOUND MARK
+  ヽ	*6	30FD	12541	KATAKANA ITERATION MARK
+  ヾ	+6	30FE	12542	KATAKANA VOICED ITERATION MARK
+  ㄅ	b4	3105	12549	BOPOMOFO LETTER B
+  ㄆ	p4	3106	12550	BOPOMOFO LETTER P
+  ㄇ	m4	3107	12551	BOPOMOFO LETTER M
+  ㄈ	f4	3108	12552	BOPOMOFO LETTER F
+  ㄉ	d4	3109	12553	BOPOMOFO LETTER D
+  ㄊ	t4	310A	12554	BOPOMOFO LETTER T
+  ㄋ	n4	310B	12555	BOPOMOFO LETTER N `
+  ㄌ	l4	310C	12556	BOPOMOFO LETTER L
+  ㄍ	g4	310D	12557	BOPOMOFO LETTER G
+  ㄎ	k4	310E	12558	BOPOMOFO LETTER K
+  ㄏ	h4	310F	12559	BOPOMOFO LETTER H
+  ㄐ	j4	3110	12560	BOPOMOFO LETTER J
+  ㄑ	q4	3111	12561	BOPOMOFO LETTER Q
+  ㄒ	x4	3112	12562	BOPOMOFO LETTER X
+  ㄓ	zh	3113	12563	BOPOMOFO LETTER ZH
+  ㄔ	ch	3114	12564	BOPOMOFO LETTER CH
+  ㄕ	sh	3115	12565	BOPOMOFO LETTER SH
+  ㄖ	r4	3116	12566	BOPOMOFO LETTER R
+  ㄗ	z4	3117	12567	BOPOMOFO LETTER Z
+  ㄘ	c4	3118	12568	BOPOMOFO LETTER C
+  ㄙ	s4	3119	12569	BOPOMOFO LETTER S
+  ㄚ	a4	311A	12570	BOPOMOFO LETTER A
+  ㄛ	o4	311B	12571	BOPOMOFO LETTER O
+  ㄜ	e4	311C	12572	BOPOMOFO LETTER E
+  ㄞ	ai	311E	12574	BOPOMOFO LETTER AI
+  ㄟ	ei	311F	12575	BOPOMOFO LETTER EI
+  ㄠ	au	3120	12576	BOPOMOFO LETTER AU
+  ㄡ	ou	3121	12577	BOPOMOFO LETTER OU
+  ㄢ	an	3122	12578	BOPOMOFO LETTER AN
+  ㄣ	en	3123	12579	BOPOMOFO LETTER EN
+  ㄤ	aN	3124	12580	BOPOMOFO LETTER ANG
+  ㄥ	eN	3125	12581	BOPOMOFO LETTER ENG
+  ㄦ	er	3126	12582	BOPOMOFO LETTER ER
+  ㄧ	i4	3127	12583	BOPOMOFO LETTER I
+  ㄨ	u4	3128	12584	BOPOMOFO LETTER U
+  ㄩ	iu	3129	12585	BOPOMOFO LETTER IU
+  ㄪ	v4	312A	12586	BOPOMOFO LETTER V
+  ㄫ	nG	312B	12587	BOPOMOFO LETTER NG
+  ㄬ	gn	312C	12588	BOPOMOFO LETTER GN
+  ㈠	1c	3220	12832	PARENTHESIZED IDEOGRAPH ONE
+  ㈡	2c	3221	12833	PARENTHESIZED IDEOGRAPH TWO
+  ㈢	3c	3222	12834	PARENTHESIZED IDEOGRAPH THREE
+  ㈣	4c	3223	12835	PARENTHESIZED IDEOGRAPH FOUR
+  ㈤	5c	3224	12836	PARENTHESIZED IDEOGRAPH FIVE
+  ㈥	6c	3225	12837	PARENTHESIZED IDEOGRAPH SIX
+  ㈦	7c	3226	12838	PARENTHESIZED IDEOGRAPH SEVEN
+  ㈧	8c	3227	12839	PARENTHESIZED IDEOGRAPH EIGHT
+  ㈨	9c	3228	12840	PARENTHESIZED IDEOGRAPH NINE
+  ff	ff	FB00	64256	LATIN SMALL LIGATURE FF
+  fi	fi	FB01	64257	LATIN SMALL LIGATURE FI
+  fl	fl	FB02	64258	LATIN SMALL LIGATURE FL
+  ſt	ft	FB05	64261	LATIN SMALL LIGATURE LONG S T
+  st	st	FB06	64262	LATIN SMALL LIGATURE ST
+<
 
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 2e0f73a597..2225e6e753 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -804,8 +804,8 @@ first line (the last line in Ex mode).
 
 							*{arglist}*
 The wildcards in the argument list are expanded and the file names are sorted.
-Thus you can use the command "vim *.c" to edit all the C files.  From within
-Vim the command ":n *.c" does the same.
+Thus you can use the command `vim *.c` to edit all the C files.  From within
+Vim the command `:n *.c` does the same.
 
 White space is used to separate file names.  Put a backslash before a space or
 tab to include it in a file name.  E.g., to edit the single file "foo bar": >
@@ -889,7 +889,7 @@ Example: >
 	:args *.c
 	:argdo set ff=unix | update
 This sets the 'fileformat' option to "unix" and writes the file if it is now
-changed.  This is done for all *.c files.
+changed.  This is done for all `*.c` files.
 
 Example: >
 	:args *.[ch]
@@ -1245,8 +1245,8 @@ If you want to always use ":confirm", set the 'confirm' option.
 			|:diffsplit|, |:diffpatch|, |:pedit|, |:redir|,
 			|:source|, |:update|, |:visual|, |:vsplit|,
 			and |:qall| if 'confirm' is set.
-			{only in Win32 GUI, in console `browse edit` works
-			if the FileExplorer autocommand group exists}
+			Note: only in Win32 GUI; in console `:browse edit`
+			works if the FileExplorer autocommand group exists.
 			When ":browse" is not possible you get an error
 			message.  If {command} doesn't support browsing, the
 			{command} is executed without a dialog.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index c1ea28c839..3cd5ea13f6 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -841,19 +841,19 @@ Expression syntax summary, from least to most significant:
 
 |expr9|	number			number constant
 	"string"		string constant, backslash is special
-	'string'		string constant, ' is doubled
+	`'string'`		string constant, ' is doubled
 	[expr1, ...]		|List|
-	{expr1: expr1, ...}	|Dictionary|
+	`{expr1: expr1, ...}`	|Dictionary|
 	#{key: expr1, ...}	|Dictionary|
 	&option			option value
 	(expr1)			nested expression
 	variable		internal variable
 	va{ria}ble		internal variable with curly braces
 	$VAR			environment variable
-	@r			contents of register 'r'
+	@r			contents of register "r"
 	function(expr1, ...)	function call
 	func{ti}on(expr1, ...)	function call with curly braces
-	{args -> expr1}		lambda expression
+	`{args -> expr1}`	lambda expression
 
 
 "..." indicates that the operations in this level can be concatenated.
@@ -1547,7 +1547,7 @@ See below |functions|.
 ------------------------------------------------------------------------------
 lambda expression				*expr-lambda* *lambda*
 
-{args -> expr1}		lambda expression			*E451*
+`{args -> expr1}`	lambda expression			*E451*
 
 A lambda expression creates a new unnamed function which returns the result of
 evaluating |expr1|.  Lambda expressions differ from |user-function|s in
@@ -1846,7 +1846,7 @@ v:ctype		The current locale setting for characters of the runtime
 v:dying		Normally zero.  When a deadly signal is caught it's set to
 		one.  When multiple signals are caught the number increases.
 		Can be used in an autocommand to check if Vim didn't
-		terminate normally. {only works on Unix}
+		terminate normally.
 		Example: >
 	:au VimLeave * if v:dying | echo "\nAAAAaaaarrrggghhhh!!!\n" | endif
 <		Note: if another deadly signal is caught when v:dying is one,
@@ -2493,7 +2493,7 @@ This does NOT work: >
 			*:let/=* *:let%=* *:let.=* *:let..=* *E734*
 :let {var} += {expr1}	Like ":let {var} = {var} + {expr1}".
 :let {var} -= {expr1}	Like ":let {var} = {var} - {expr1}".
-:let {var} *= {expr1}	Like ":let {var} = {var} * {expr1}".
+`:let {var} *= {expr1}`	Like ":let {var} = {var} * {expr1}".
 :let {var} /= {expr1}	Like ":let {var} = {var} / {expr1}".
 :let {var} %= {expr1}	Like ":let {var} = {var} % {expr1}".
 :let {var} .= {expr1}	Like ":let {var} = {var} . {expr1}".
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 78cc14651e..24d7605e4a 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -253,7 +253,7 @@ This does not work properly when:
   know what to do.
 - Folds nearby use a level number in their marker which gets in the way.
 - The line is inside a comment, 'commentstring' isn't empty and nested
-  comments don't work.  For example with C: adding /* {{{ */ inside a comment
+  comments don't work.  For example with C: adding `/* {{{ */` inside a comment
   will truncate the existing comment.  Either put the marker before or after
   the comment, or add the marker manually.
 Generally it's not a good idea to let Vim create markers when you already have
diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt
index 3321228009..3b7d6a73dd 100644
--- a/runtime/doc/ft_ada.txt
+++ b/runtime/doc/ft_ada.txt
@@ -112,8 +112,8 @@ NOTE: "gnat xref -v" is very tricky to use as it has almost no diagnostic
     your .ali files.
 2)  "gnat xref -v ../Include/adacl.ads" won't work - use  the "gnat xref -v
     -aI../Include adacl.ads" instead.
-3)  "gnat xref -v -aI../Include *.ad?" won't work - use "cd ../Include" and
-    then "gnat xref -v *.ad?"
+3)  `gnat xref -v -aI../Include *.ad?` won't work - use "cd ../Include" and
+    then `gnat xref -v *.ad?`
 4)  Project manager support is completely broken - don't even try "gnat xref
     -Padacl.gpr".
 5)  Vim is faster when the tags file is sorted - use "sort --unique
diff --git a/runtime/doc/ft_raku.txt b/runtime/doc/ft_raku.txt
index 3fafa6e224..c9bbe4bd04 100644
--- a/runtime/doc/ft_raku.txt
+++ b/runtime/doc/ft_raku.txt
@@ -35,10 +35,10 @@ Some of them are available with standard Vim digraphs:
 	(- ∈    ?= ≅    != ≠  ~
 	-) ∋    ?- ≃  ~
 
-The Greek alphabet is available with "*" followed by a similar Latin symbol:
-	*p π  ~
-	*t τ  ~
-	*X ×  ~
+The Greek alphabet is available with "*" followed by a similar Latin symbol: >
+	*p π
+	*t τ
+	*X ×
 
 Numbers, subscripts and superscripts are available with 's' and 'S':
 	0s ₀    0S ⁰  ~
diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt
index 21a244e67a..68e26d2a5b 100644
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -728,7 +728,7 @@ You can create as many additional key maps as you like.  Generally, the maps
 will be specifying different syntax highlight groups.
 
 If you do not wish the default maps created or the key choices do not work on
-your platform (often a case on *nix) you define the following variable in
+your platform (often a case on unix) you define the following variable in
 your |init.vim|: >
     let g:omni_sql_no_default_maps = 1
 
@@ -738,7 +738,7 @@ which allows you to make customizations without changing the files that are
 included with the Vim distribution.  If you wish to customize the maps
 create an after/ftplugin/sql.vim (see |after-directory|) and place the same
 maps from the ftplugin/sql.vim in it using your own key strokes.  <C-C> was
-chosen since it will work on both Windows and *nix platforms.  On the windows
+chosen since it will work on both Windows and unix platforms.  On the windows
 platform you can also use <C-Space> or ALT keys.
 
 
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 5d44a7d239..bf62dba539 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -466,12 +466,11 @@ If no argument is given after :menu at all, then ALL menu items are shown
 for the appropriate mode (e.g., Command-line mode for :cmenu).
 
 Special characters in the list, just before the rhs:
-*	The menu was defined with "nore" to disallow remapping.
-&	The menu was defined with "<script>" to allow remapping script-local
-	mappings only.
-s	The menu was defined with "<silent>" to avoid showing what it is
-	mapped to when triggered.
--	The menu was disabled.
+• * Menu was defined with "nore" to disallow remapping.
+• & Menu was defined with "<script>" to allow remapping script-local mappings.
+• s Menu was defined with "<silent>" to avoid showing what it is mapped to
+    when triggered.
+• - Menu was disabled.
 
 Note that hitting <Tab> while entering a menu name after a menu command may
 be used to complete the name of the menu item.
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index ca26332017..80b237160f 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -317,9 +317,9 @@ standard Vim help files, except for the first line.  If you are writing a new
 help file it's best to copy one of the existing files and use it as a
 template.
 
-The first line in a help file should have the following format:
+The first line in a help file should have the following format: >
 
-*plugin_name.txt*	{short description of the plugin}
+	*plugin_name.txt*	{short description of the plugin}
 
 The first field is a help tag where ":help plugin_name" will jump to.  The
 remainder of the line, after a Tab, describes the plugin purpose in a short
@@ -383,8 +383,8 @@ The following are highlighted differently in a Vim help file:
 
 The word "Note", "Notes" and similar automagically receive distinctive
 highlighting.  So do these:
-	*Todo	something to do
-	*Error	something wrong
+	Todo	something to do
+	Error	something wrong
 
 You can find the details in $VIMRUNTIME/syntax/help.vim
 
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 5acc5c0e59..c7f431481f 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -187,8 +187,8 @@ vim.foreach_rtp(callable)				*python-foreach_rtp*
 	are no longer paths. If stopped in case callable returned non-None,
 	vim.foreach_rtp function returns the value returned by callable.
 
-vim.chdir(*args, **kwargs)				*python-chdir*
-vim.fchdir(*args, **kwargs)				*python-fchdir*
+`vim.chdir(*args, **kwargs)`				*python-chdir*
+`vim.fchdir(*args, **kwargs)`				*python-fchdir*
 	Run os.chdir or os.fchdir, then all appropriate vim stuff.
 	Note: you should not use these functions directly, use os.chdir and
 	      os.fchdir instead. Behavior of vim.fchdir is undefined in case
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index ccff09d7fc..dd42f334fb 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -553,9 +553,9 @@ The examples below assume a 'shiftwidth' of 4.
 	      20 lines).
 
 								*cino-star*
-	*N    Vim searches for unclosed comments at most N lines away.  This
+	`*N`    Vim searches for unclosed comments at most N lines away.  This
 	      limits the time needed to search for the start of a comment.
-	      If your /* */ comments stop indenting after N lines this is the
+	      If your `/* */` comments stop indenting after N lines this is the
 	      value you will want to change.
 	      (default 70 lines).
 
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 86f7832376..ab380184fc 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -517,16 +517,15 @@ CTRL-O in Insert mode you get a beep but you are still in Insert mode, type
 <Esc> again.
 
 							*i_esc*
-		TO mode						    ~
-		Normal	Visual	Select	Insert	  Replace   Cmd-line  Ex ~
-FROM mode								 ~
-Normal			v V ^V	  `*4`	 *1	   R gR     : / ? !   Q
-Visual		 `*2`		  ^G	 c C	    --	      :       --
-Select		 `*5`	^O ^G		 `*6`	    --	      --      --
-Insert		 <Esc>	  --	  --		  <Insert>    --      --
-Replace		 <Esc>	  --	  --	<Insert>	      --      --
-Command-line	 `*3`	  --	  --	 :start	    --		      --
-Ex		 :vi	  --	  --	 --	    --	      --
+ FROM mode	TO mode						    ~
+		Normal	Visual	Select	Insert	  Replace   Cmd-line  Ex >
+ Normal			v V ^V	  *4	 *1	   R gR     : / ? !   Q
+ Visual		 *2		  ^G	 c C	    --	      :       --
+ Select		 *5	^O ^G		 *6	    --	      --      --
+ Insert		 <Esc>	  --	  --		  <Insert>    --      --
+ Replace		 <Esc>	  --	  --	<Insert>	      --      --
+ Command-line	 `*3`	  --	  --	 :start	    --		      --
+ Ex		 :vi	  --	  --	 --	    --	      --
 
 -- not possible
 
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 055aff2210..9b168cb9cd 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1093,7 +1093,7 @@ code_action({options})                             *vim.lsp.buf.code_action()*
                    • range: (table|nil) Range for which code actions should be
                      requested. If in visual mode this defaults to the active
                      selection. Table must contain `start` and `end` keys with
-                     {row, col} tuples using mark-like indexing. See
+                     {row,col} tuples using mark-like indexing. See
                      |api-indexing|
 
     See also: ~
@@ -1200,7 +1200,7 @@ format({options})                                       *vim.lsp.buf.format()*
                    • name (string|nil): Restrict formatting to the client with
                      name (client.name) matching this field.
                    • range (table|nil) Range to format. Table must contain
-                     `start` and `end` keys with {row, col} tuples using (1,0)
+                     `start` and `end` keys with {row,col} tuples using (1,0)
                      indexing. Defaults to current selection in visual mode
                      Defaults to `nil` in other modes, formatting the full
                      buffer
@@ -1728,9 +1728,9 @@ make_given_range_params({start_pos}, {end_pos}, {bufnr}, {offset_encoding})
     similar to |vim.lsp.util.make_range_params()|.
 
     Parameters: ~
-      • {start_pos}        integer[]|nil {row, col} mark-indexed position.
+      • {start_pos}        integer[]|nil {row,col} mark-indexed position.
                            Defaults to the start of the last visual selection.
-      • {end_pos}          integer[]|nil {row, col} mark-indexed position.
+      • {end_pos}          integer[]|nil {row,col} mark-indexed position.
                            Defaults to the end of the last visual selection.
       • {bufnr}            (integer|nil) buffer handle or 0 for current,
                            defaults to current
@@ -1867,8 +1867,8 @@ set_lines({lines}, {A}, {B}, {new_lines})           *vim.lsp.util.set_lines()*
 
     Parameters: ~
       • {lines}      (table) Original list of strings
-      • {A}          (table) Start position; a 2-tuple of {line, col} numbers
-      • {B}          (table) End position; a 2-tuple of {line, col} numbers
+      • {A}          (table) Start position; a 2-tuple of {line,col} numbers
+      • {B}          (table) End position; a 2-tuple of {line,col} numbers
       • {new_lines}  A list of strings to replace the original
 
     Return: ~
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index ffd7b6bc1d..56e58baad8 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1051,8 +1051,7 @@ typed after an abbreviation: >
 There are no default abbreviations.
 
 Abbreviations are never recursive.  You can use ":ab f f-o-o" without any
-problem.  But abbreviations can be mapped.  {some versions of Vi support
-recursive abbreviations, for no apparent reason}
+problem.  But abbreviations can be mapped.
 
 				*:abbreviate-local* *:abbreviate-<buffer>*
 Just like mappings, abbreviations can be local to a buffer.  This is mostly
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 99dfa54218..aedef87a09 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -357,150 +357,6 @@ conversion needs to be done.  These conversions are supported:
 	request a very large buffer, more than Vim is willing to provide).
 	Try getting another iconv() implementation.
 
-==============================================================================
-Input on X11					*mbyte-XIM*
-
-X INPUT METHOD (XIM) BACKGROUND			*XIM* *xim* *x-input-method*
-
-XIM is an international input module for X.  There are two kinds of structures,
-Xlib unit type and |IM-server| (Input-Method server) type.  |IM-server| type
-is suitable for complex input, such as CJK.
-
-- IM-server
-							*IM-server*
-  In |IM-server| type input structures, the input event is handled by either
-  of the two ways: FrontEnd system and BackEnd system.  In the FrontEnd
-  system, input events are snatched by the |IM-server| first, then |IM-server|
-  give the application the result of input.  On the other hand, the BackEnd
-  system works reverse order.  MS-Windows adopt BackEnd system.  In X, most of
-  |IM-server|s adopt FrontEnd system.  The demerit of BackEnd system is the
-  large overhead in communication, but it provides safe synchronization with
-  no restrictions on applications.
-
-- Conversion Server
-							*conversion-server*
-  Some system needs additional server: conversion server.  Most of Japanese
-  |IM-server|s need it, Kana-Kanji conversion server.  For Chinese inputting,
-  it depends on the method of inputting, in some methods, PinYin or ZhuYin to
-  HanZi conversion server is needed.  For Korean inputting, if you want to
-  input Hanja, Hangul-Hanja conversion server is needed.
-
-  For example, the Japanese inputting process is divided into 2 steps.  First
-  we pre-input Hira-gana, second Kana-Kanji conversion.  There are so many
-  Kanji characters (6349 Kanji characters are defined in JIS X 0208) and the
-  number of Hira-gana characters are 76.  So, first, we pre-input text as
-  pronounced in Hira-gana, second, we convert Hira-gana to Kanji or Kata-Kana,
-  if needed.  There are some Kana-Kanji conversion server: jserver
-  (distributed with Wnn, see below) and canna.  Canna can be found at:
-  http://canna.sourceforge.jp/
-
-There is a good input system: Wnn4.2.  Wnn 4.2 contains,
-    xwnmo (|IM-server|)
-    jserver (Japanese Kana-Kanji conversion server)
-    cserver (Chinese PinYin or ZhuYin to simplified HanZi conversion server)
-    tserver (Chinese PinYin or ZhuYin to traditional HanZi conversion server)
-    kserver (Hangul-Hanja conversion server)
-Wnn 4.2 for several systems can be found at various places on the internet.
-Use the RPM or port for your system.
-
-
-- Input Style
-							*xim-input-style*
-  When inputting CJK, there are four areas:
-      1. The area to display of the input while it is being composed
-      2. The area to display the currently active input mode.
-      3. The area to display the next candidate for the selection.
-      4. The area to display other tools.
-
-  The third area is needed when converting.  For example, in Japanese
-  inputting, multiple Kanji characters could have the same pronunciation, so
-  a sequence of Hira-gana characters could map to a distinct sequence of Kanji
-  characters.
-
-  The first and second areas are defined in international input of X with the
-  names of "Preedit Area", "Status Area" respectively.  The third and fourth
-  areas are not defined and are left to be managed by the |IM-server|.  In the
-  international input, four input styles have been defined using combinations
-  of Preedit Area and Status Area: |OnTheSpot|, |OffTheSpot|, |OverTheSpot|
-  and |Root|.
-
-  Currently, GUI Vim supports three styles, |OverTheSpot|, |OffTheSpot| and
-  |Root|.
-
-*.  on-the-spot						*OnTheSpot*
-    Preedit Area and Status Area are performed by the client application in
-    the area of application.  The client application is directed by the
-    |IM-server| to display all pre-edit data at the location of text
-    insertion.  The client registers callbacks invoked by the input method
-    during pre-editing.
-*.  over-the-spot					*OverTheSpot*
-    Status Area is created in a fixed position within the area of application,
-    in case of Vim, the position is the additional status line.  Preedit Area
-    is made at present input position of application.  The input method
-    displays pre-edit data in a window which it brings up directly over the
-    text insertion position.
-*.  off-the-spot					*OffTheSpot*
-    Preedit Area and Status Area are performed in the area of application, in
-    case of Vim, the area is additional status line.  The client application
-    provides display windows for the pre-edit data to the input method which
-    displays into them directly.
-*.  root-window						*Root*
-    Preedit Area and Status Area are outside of the application.  The input
-    method displays all pre-edit data in a separate area of the screen in a
-    window specific to the input method.
-
-
-USING XIM			*multibyte-input* *E284* *E285* *E286* *E287*
-					*E288* *E289*
-
-Note that Display and Input are independent.  It is possible to see your
-language even though you have no input method for it.  But when your Display
-method doesn't match your Input method, the text will be displayed wrong.
-
-To input your language you should run the |IM-server| which supports your
-language and |conversion-server| if needed.
-
-The next 3 lines should be put in your ~/.Xdefaults file.  They are common for
-all X applications which uses |XIM|.  If you already use |XIM|, you can skip
-this. >
-
-	*international: True
-	*.inputMethod: your_input_server_name
-	*.preeditType: your_input_style
-<
-input_server_name	is your |IM-server| name (check your |IM-server|
-			manual).
-your_input_style	is one of |OverTheSpot|, |OffTheSpot|, |Root|.  See
-			also |xim-input-style|.
-
-*international may not be necessary if you use X11R6.
-*.inputMethod and *.preeditType are optional if you use X11R6.
-
-For example, when you are using kinput2 as |IM-server|, >
-
-	*international: True
-	*.inputMethod: kinput2
-	*.preeditType: OverTheSpot
-<
-When using |OverTheSpot|, GUI Vim always connects to the IM Server even in
-Normal mode, so you can input your language with commands like "f" and "r".
-But when using one of the other two methods, GUI Vim connects to the IM Server
-only if it is not in Normal mode.
-
-If your IM Server does not support |OverTheSpot|, and if you want to use your
-language with some Normal mode command like "f" or "r", then you should use a
-localized xterm  or an xterm which supports |XIM|
-
-If needed, you can set the XMODIFIERS environment variable:
-
-	sh:  export XMODIFIERS="@im=input_server_name"
-	csh: setenv XMODIFIERS "@im=input_server_name"
-
-For example, when you are using kinput2 as |IM-server| and sh, >
-
-	export XMODIFIERS="@im=kinput2"
-<
-
 ==============================================================================
 Input with a keymap					*mbyte-keymap*
 
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 03f614e841..c3154fc372 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -820,13 +820,13 @@ Type					effect ~
 					the clipboard ("* and "+ registers)
     {menu-entry}			what the menu is defined to in
 					Cmdline-mode.
-    <LeftMouse>				next page (*)
+    <LeftMouse>				next page*
 
 Any other key causes the meaning of the keys to be displayed.
 
-(*)  Clicking the left mouse button only works:
-     - For the GUI: in the last line of the screen.
-     - When 'r' is included in 'mouse' (but then selecting text won't work).
+* Clicking the left mouse button only works:
+    - For the GUI: in the last line of the screen.
+    - When 'r' is included in 'mouse' (but then selecting text won't work).
 
 
 Note: The typed key is directly obtained from the terminal, it is not mapped
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 59ae209aa9..51aea42be9 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1230,7 +1230,7 @@ remembered.
 			([{}])		parenthesis or (curly/square) brackets
 					(this can be changed with the
 					'matchpairs' option)
-			/* */		start or end of C-style comment
+			`/* */`		start or end of C-style comment
 			#if, #ifdef, #else, #elif, #endif
 					C preprocessor conditionals (when the
 					cursor is on the # or no ([{
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b58ca8d094..7ef2195198 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -676,9 +676,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	line.
 	When 'smartindent' or 'cindent' is on the indent is changed in
 	a different way.
-	{small difference from Vi: After the indent is deleted when typing
-	<Esc> or <CR>, the cursor position when moving up or down is after the
-	deleted indent; Vi puts the cursor somewhere in the deleted indent}.
 
 				 *'autoread'* *'ar'* *'noautoread'* *'noar'*
 'autoread' 'ar'		boolean	(default on)
@@ -1866,9 +1863,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Pattern to be used to find a macro definition.  It is a search
 	pattern, just like for the "/" command.  This option is used for the
 	commands like "[i" and "[d" |include-search|.  The 'isident' option is
-	used to recognize the defined name after the match:
+	used to recognize the defined name after the match: >
 		{match with 'define'}{non-ID chars}{defined name}{non-ID char}
-	See |option-backslash| about inserting backslashes to include a space
+<	See |option-backslash| about inserting backslashes to include a space
 	or backslash.
 	For C++ this value would be useful, to include const type declarations: >
 		^\(#\s*define\|[a-z]*\s*const\s*[a-z]*\)
@@ -4042,9 +4039,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	per word depends very much on how similar the words are, that's why
 	this tuning is complicated.
 
-	There are three numbers, separated by commas:
+	There are three numbers, separated by commas: >
 		{start},{inc},{added}
-
+<
 	For most languages the uncompressed word tree fits in memory.  {start}
 	gives the amount of memory in Kbyte that can be used before any
 	compression is done.  It should be a bit smaller than the amount of
diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
index 0363a8e34a..a709b34180 100644
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -19,7 +19,7 @@ You can avoid loading this plugin by setting the "loaded_gzip" variable: >
 The plugin installs autocommands to intercept reading and writing of files
 with these extensions:
 
-	extension	compression ~
+	extension	compression >
 	*.Z		compress (Lempel-Ziv)
 	*.gz		gzip
 	*.bz2		bzip2
diff --git a/runtime/doc/pi_msgpack.txt b/runtime/doc/pi_msgpack.txt
index 24a31f1de7..bcb7b9dc25 100644
--- a/runtime/doc/pi_msgpack.txt
+++ b/runtime/doc/pi_msgpack.txt
@@ -6,7 +6,7 @@ Copyright: (c) 2015 by Nikolay Pavlov
 The Apache license applies to the files in this package, including 
 runtime/autoload/msgpack.vim, runtime/doc/pi_msgpack.txt and 
 test/functional/plugin/msgpack_spec.lua.  Like anything else that's free, 
-msgpack.vim and its associated files are provided *as is* and comes with no 
+msgpack.vim and its associated files are provided as is and comes with no 
 warranty of any kind, either expressed or implied.  No guarantees of 
 merchantability.  No guarantees of suitability for any purpose.  By using this 
 plugin, you agree that in no event will the copyright holder be liable for any 
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index b104aef194..dd1edb5707 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -11,7 +11,7 @@ Copyright 2005-2017:					*tar-copyright*
 	package, including tarPlugin.vim, tar.vim, and pi_tar.txt.  Like
 	anything else that's except use "tar.vim" instead of "VIM".  Like
 	anything else that's free, tar.vim and its associated files are
-	provided *as is* and comes with no warranty of any kind, either
+	provided as is and comes with no warranty of any kind, either
 	expressed or implied.  No guarantees of merchantability.  No
 	guarantees of suitability for any purpose.  By using this plugin, you
 	agree that in no event will the copyright holder be liable for any
@@ -27,7 +27,7 @@ Copyright 2005-2017:					*tar-copyright*
 ==============================================================================
 2. Usage					*tar-usage* *tar-manual*
 
-   When one edits a *.tar file, this plugin will handle displaying a
+   When one edits a `*.tar` file, this plugin will handle displaying a
    contents page.  Select a file to edit by moving the cursor atop
    the desired file, then hit the <return> key.  After editing, one may
    also write to the file.  Currently, one may not make a new file in
@@ -121,8 +121,8 @@ Copyright 2005-2017:					*tar-copyright*
 		May 28, 2008	* various security improvements.  Now requires
 				  patch 299 which provides the fnameescape()
 				  function
-		May 30, 2008	* allows one to view *.gz and *.bz2 files that
-				  are in *.tar files.
+		May 30, 2008	* allows one to view `*.gz` and `*.bz2` files that
+				  are in `*.tar` files.
 	v12	Sep 07, 2007	* &shq now used if not the empty string for
 				  g:tar_shq
 	v10	May 02, 2006	* now using "redraw then echo" to show messages,
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index dd14b6c295..343c73839b 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -10,7 +10,7 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
 	The VIM LICENSE (see |copyright|) applies to the files in this
 	package, including zipPlugin.vim, zip.vim, and pi_zip.vim.  except use
 	"zip.vim" instead of "VIM".  Like anything else that's free, zip.vim
-	and its associated files are provided *as is* and comes with no
+	and its associated files are provided as is and comes with no
 	warranty of any kind, either expressed or implied.  No guarantees of
 	merchantability.  No guarantees of suitability for any purpose.  By
 	using this plugin, you agree that in no event will the copyright
@@ -27,7 +27,7 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
 ==============================================================================
 2. Usage						*zip-usage* *zip-manual*
 
-   When one edits a *.zip file, this plugin will handle displaying a
+   When one edits a `*.zip` file, this plugin will handle displaying a
    contents page.  Select a file to edit by moving the cursor atop
    the desired file, then hit the <return> key.  After editing, one may
    also write to the file.  Currently, one may not make a new file in
@@ -102,7 +102,7 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
 
 ==============================================================================
 4. History							*zip-history* {{{1
-   v33 Dec 07, 2021 * *.xlam mentioned twice in zipPlugin
+   v33 Dec 07, 2021 * `*.xlam` mentioned twice in zipPlugin
    v32 Oct 22, 2021 * to avoid an issue with a vim 8.2 patch, zipfile: has
 		      been changed to zipfile:// . This often shows up
 		      as zipfile:/// with zipped files that are root-based.
@@ -114,8 +114,8 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
 		      the command actually to be attempted in zip#Read()
 		      and zip#Write()
 		    * added the extraction of a file capability
-       Nov 30, 2015 * added *.epub to the |g:zipPlugin_ext| list
-       Sep 13, 2016 * added *.apk to the |g:zipPlugin_ext| list and
+       Nov 30, 2015 * added `*.epub` to the |g:zipPlugin_ext| list
+       Sep 13, 2016 * added `*.apk` to the |g:zipPlugin_ext| list and
 		      sorted the suffices.
    v27 Jul 02, 2013 * sanity check: zipfile must have "PK" as its first
 		      two bytes.
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 7c06358be2..7a1649a74b 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -867,11 +867,11 @@ lists.  They set one of the existing error lists as the current one.
 
 						*:chistory* *:chi*
 :[count]chi[story]	Show the list of error lists.  The current list is
-			marked with ">".  The output looks like:
-			  error list 1 of 3; 43 errors   :make  ~
-			> error list 2 of 3; 0 errors    :helpgrep tag  ~
-			  error list 3 of 3; 15 errors   :grep ex_help *.c ~
-
+			marked with ">".  The output looks like: >
+			  error list 1 of 3; 43 errors   :make
+			> error list 2 of 3; 0 errors    :helpgrep tag
+			  error list 3 of 3; 15 errors   :grep ex_help *.c
+<
 			When [count] is given, then the count'th quickfix
 			list is made the current list. Example: >
 				" Make the 4th quickfix list current
@@ -1317,8 +1317,8 @@ TEX COMPILER						*compiler-tex*
 Included in the distribution compiler for TeX ($VIMRUNTIME/compiler/tex.vim)
 uses make command if possible.  If the compiler finds a file named "Makefile"
 or "makefile" in the current directory, it supposes that you want to process
-your *TeX files with make, and the makefile does the right work.  In this case
-compiler sets 'errorformat' for *TeX output and leaves 'makeprg' untouched.  If
+your `*TeX` files with make, and the makefile does the right work.  In this case
+compiler sets 'errorformat' for `*TeX` output and leaves 'makeprg' untouched.  If
 neither "Makefile" nor "makefile" is found, the compiler will not use make.
 You can force the compiler to ignore makefiles by defining
 b:tex_ignore_makefile or g:tex_ignore_makefile variable (they are checked for
@@ -1933,7 +1933,7 @@ You can customize the given setting to suit your own purposes, for example,
 all the annoying "Overfull ..." warnings could be excluded from being
 recognized as an error.
 Alternatively to filtering the LaTeX compiler output, it is also possible
-to directly read the *.log file that is produced by the [La]TeX compiler.
+to directly read the `*.log` file that is produced by the [La]TeX compiler.
 This contains even more useful information about possible error causes.
 However, to properly parse such a complex file, an external filter should
 be used.  See the description further above how to make such a filter known
diff --git a/runtime/doc/remote_plugin.txt b/runtime/doc/remote_plugin.txt
index 348f6c86a5..ea35cf2b78 100644
--- a/runtime/doc/remote_plugin.txt
+++ b/runtime/doc/remote_plugin.txt
@@ -119,7 +119,7 @@ would also be spawned, which could take seconds!
 
 With the manifest, each host will only be loaded when required. Continuing with
 the example, say the Java plugin is a semantic completion engine for Java code.
-If it defines the autocommand "BufEnter *.java", then the Java host is spawned
+If it defines the autocommand `BufEnter *.java`, then the Java host is spawned
 only when Nvim loads a buffer matching "*.java".
 
 If the explicit call to |:UpdateRemotePlugins| seems inconvenient, try to see
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index 170c87a1a4..92546799b4 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -40,9 +40,6 @@ CTRL-D			Scroll window Downwards in the buffer.  The number of
 			difference).  When the cursor is on the last line of
 			the buffer nothing happens and a beep is produced.
 			See also 'startofline' option.
-			{difference from vi: Vim scrolls 'scroll' screen
-			lines, instead of file lines; makes a difference when
-			lines wrap}
 
 <S-Down>	or				*<S-Down>* *<kPageDown>*
 <PageDown>	or				*<PageDown>* *CTRL-F*
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 28208f68d3..07b6bd93bd 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -824,7 +824,7 @@ resulting file, when executed with a ":source" command:
 9. Restores the Views for all the windows, as with |:mkview|.  But
    'sessionoptions' is used instead of 'viewoptions'.
 10. If a file exists with the same name as the Session file, but ending in
-   "x.vim" (for eXtra), executes that as well.  You can use *x.vim files to
+   "x.vim" (for eXtra), executes that as well.  You can use `*x.vim` files to
    specify additional settings and actions associated with a given Session,
    such as creating menu items in the GUI version.
 
@@ -908,7 +908,7 @@ found.
 
 You might want to clean up your 'viewdir' directory now and then.
 
-To automatically save and restore views for *.c files: >
+To automatically save and restore views for `*.c` files: >
 	au BufWinLeave *.c mkview
 	au BufWinEnter *.c silent! loadview
 
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 49e51d6736..cf8f307ca4 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -695,7 +695,7 @@ do not have an absolute path.
 The 'comments' option is used for the commands that display a single line or
 jump to a line.  It defines patterns that may start a comment.  Those lines
 are ignored for the search, unless [!] is used.  One exception: When the line
-matches the pattern "^# *define" it is not considered to be a comment.
+matches the pattern `"^# *define"` it is not considered to be a comment.
 
 If you want to list matches, and then select one to jump to, you could use a
 mapping to do that for you.  Here is an example: >
@@ -838,7 +838,7 @@ Common arguments for the commands above:
 [!]	When included, find matches in lines that are recognized as comments.
 	When excluded, a match is ignored when the line is recognized as a
 	comment (according to 'comments'), or the match is in a C comment
-	(after "//" or inside /* */).  Note that a match may be missed if a
+	(after "//" or inside `/* */`).  Note that a match may be missed if a
 	line is recognized as a comment, but the comment ends halfway the line.
 	And if the line is a comment, but it is not recognized (according to
 	'comments') a match may be found in it anyway.  Example: >
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index 5d5e89da77..05f41005cc 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -47,7 +47,7 @@ is an overview with tags to jump to:
 
 |gf|			Go to file name under the cursor.
 
-|%|			Go to matching (), {}, [], /* */, #if, #else, #endif.
+|%|			Go to matching (), {}, [], `/* */`, #if, #else, #endif.
 |[/|			Go to previous start of comment.
 |]/|			Go to next end of comment.
 |[#|			Go back to unclosed #if, #ifdef, or #else.
@@ -196,7 +196,7 @@ charset.c
 digraph.c
 ...
 
-and I want to rename *.c *.bla.  I'd do it like this: >
+and I want to rename `*.c` `*.bla`.  I'd do it like this: >
 
 	$ vim
 	:r !ls *.c
diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
index ea16010dc2..da9a404420 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -63,10 +63,10 @@ Vim will set the title to show the name of the current file.  First comes the
 name of the file.  Then some special characters and the directory of the file
 in parens.  These special characters can be present:
 
-	-	The file cannot be modified (e.g., a help file)
-	+	The file contains changes
-	=	The file is read-only
-	=+	The file is read-only, contains changes anyway
+	• -	The file cannot be modified (e.g., a help file)
+	• +	The file contains changes
+	• =	The file is read-only
+	• =+	The file is read-only, contains changes anyway
 
 If nothing is shown you have an ordinary, unchanged file.
 
@@ -223,7 +223,7 @@ Remember, "y" is yank, which is Vim's copy command.
 	"+P
 
 It's the same as for the current selection, but uses the plus (+) register
-instead of the star (*) register.
+instead of the star "*" register.
 
 ==============================================================================
 *09.4*	Select mode
diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt
index 51a25b1593..dd1d62bb52 100644
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -59,7 +59,7 @@ playback.
    Let's assume you have a directory with C++ files, all ending in ".cpp".
 There is a function called "GetResp" that you want to rename to "GetAnswer".
 
-	vim *.cpp		Start Vim, defining the argument list to
+	vim `*.cpp`		Start Vim, defining the argument list to
 				contain all the C++ files.  You are now in the
 				first file.
 	qq			Start recording into the q register
@@ -331,7 +331,7 @@ program files, for example, enter the following command: >
 	:grep error_string *.c
 
 This causes Vim to search for the string "error_string" in all the specified
-files (*.c).  The editor will now open the first file where a match is found
+files (`*.c`).  The editor will now open the first file where a match is found
 and position the cursor on the first matching line.  To go to the next
 matching line (no matter in what file it is), use the ":cnext" command.  To go
 to the previous match, use the ":cprev" command.  Use ":clist" to see all the
diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt
index 191d333f3d..b084936857 100644
--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -426,7 +426,7 @@ a line of text that tells Vim the values of options, to be used in this file
 only.
    A typical example is a C program where you make indents by a multiple of 4
 spaces.  This requires setting the 'shiftwidth' option to 4.  This modeline
-will do that:
+will do that: >
 
 	/* vim:set shiftwidth=4: */ ~
 
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index d977b20ecc..ae569dc6a0 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -50,8 +50,8 @@ You can see these items:
 1.  The name of the browsing tool and its version number
 2.  The name of the browsing directory
 3.  The method of sorting (may be by name, time, or size)
-4.  How names are to be sorted (directories first, then *.h files,
-    *.c files, etc)
+4.  How names are to be sorted (directories first, then `*.h` files,
+    `*.c` files, etc)
 5.  How to get help (use the <F1> key), and an abbreviated listing
     of available commands
 6.  A listing of files, including "../", which allows one to list
diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt
index efda2bc33d..db6c8e45d0 100644
--- a/runtime/doc/usr_24.txt
+++ b/runtime/doc/usr_24.txt
@@ -241,11 +241,11 @@ some other editors it's called intellisense, but that is a trademark.
 
 The key to Omni completion is CTRL-X CTRL-O.  Obviously the O stands for Omni
 here, so that you can remember it easier.  Let's use an example for editing C
-source:
+source: >
 
-	{ ~
-	    struct foo *p; ~
-	    p-> ~
+	{
+	    struct foo *p;
+	    p->
 
 The cursor is after "p->".  Now type CTRL-X CTRL-O.  Vim will offer you a list
 of alternatives, which are the items that "struct foo" contains.  That is
@@ -270,13 +270,13 @@ work.
 
 If you press CTRL-A, the editor inserts the text you typed the last time you
 were in Insert mode.
-   Assume, for example, that you have a file that begins with the following:
+   Assume, for example, that you have a file that begins with the following: >
 
 	"file.h" ~
 	/* Main program begins */ ~
 
 You edit this file by inserting "#include " at the beginning of the first
-line:
+line: >
 
 	#include "file.h" ~
 	/* Main program begins */ ~
@@ -286,13 +286,13 @@ now start to insert a new "#include" line.  So you type: >
 
 	i CTRL-A
 
-The result is as follows:
+The result is as follows: >
 
 	#include "file.h" ~
 	#include /* Main program begins */ ~
 
 The "#include " was inserted because CTRL-A inserts the text of the previous
-insert.  Now you type  "main.h"<Enter>  to finish the line:
+insert.  Now you type  "main.h"<Enter>  to finish the line: >
 
 
 	#include "file.h" ~
@@ -429,7 +429,7 @@ mistake.
 
 LISTING ABBREVIATIONS
 
-The ":abbreviate" command lists the abbreviations:
+The ":abbreviate" command lists the abbreviations: >
 
 	:abbreviate
 	i  #e		  ****************************************/
diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt
index 86aa20597e..96f635a307 100644
--- a/runtime/doc/usr_28.txt
+++ b/runtime/doc/usr_28.txt
@@ -277,7 +277,7 @@ Try it: >
 
 	:set foldmethod=marker
 
-Example text, as it could appear in a C program:
+Example text, as it could appear in a C program: >
 
 	/* foobar () {{{ */
 	int foobar()
@@ -292,7 +292,7 @@ Notice that the folded line will display the text before the marker.  This is
 very useful to tell what the fold contains.
 
 It's quite annoying when the markers don't pair up correctly after moving some
-lines around.  This can be avoided by using numbered markers.  Example:
+lines around.  This can be avoided by using numbered markers.  Example: >
 
 	/* global variables {{{1 */
 	int varA, varB;
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt
index 751cb9a902..918449d2f0 100644
--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -307,9 +307,9 @@ tags file.  Example: >
 	:psearch popen
 
 This will show the "stdio.h" file in the preview window, with the function
-prototype for popen():
+prototype for popen(): >c
 
-	FILE	*popen __P((const char *, const char *)); ~
+	FILE	*popen __P((const char *, const char *));
 
 You can specify the height of the preview window, when it is opened, with the
 'previewheight' option.
@@ -319,13 +319,13 @@ You can specify the height of the preview window, when it is opened, with the
 
 Since a program is structured, Vim can recognize items in it.  Specific
 commands can be used to move around.
-   C programs often contain constructs like this:
+   C programs often contain constructs like this: >c
 
-	#ifdef USE_POPEN ~
-	    fd = popen("ls", "r") ~
-	#else ~
-	    fd = fopen("tmp", "w") ~
-	#endif ~
+	#ifdef USE_POPEN
+	    fd = popen("ls", "r")
+	#else
+	    fd = fopen("tmp", "w")
+	#endif
 
 But then much longer, and possibly nested.  Position the cursor on the
 "#ifdef" and press %.  Vim will jump to the "#else".  Pressing % again takes
@@ -424,7 +424,7 @@ work on () pairs instead of {} pairs.
 MOVING IN COMMENTS
 
 To move back to the start of a comment use "[/".  Move forward to the end of a
-comment with "]/".  This only works for /* - */ comments.
+comment with "]/".  This only works for `/* - */` comments.
 >
 	  +->	  +-> /*
 	  |    [/ |    * A comment about      --+
@@ -446,10 +446,10 @@ You are editing a C program and wonder if a variable is declared as "int" or
 
 Vim will list the matching lines it can find.  Not only in the current file,
 but also in all included files (and files included in them, etc.).  The result
-looks like this:
+looks like this: >
 
-	structs.h ~
-	 1:   29     unsigned     column;    /* column number */ ~
+	structs.h
+	 1:   29     unsigned     column;    /* column number */
 
 The advantage over using tags or the preview window is that included files are
 searched.  In most cases this results in the right declaration to be found.
diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt
index 7e7b3b21f4..a0d22482c3 100644
--- a/runtime/doc/usr_30.txt
+++ b/runtime/doc/usr_30.txt
@@ -517,12 +517,12 @@ The other way around works just as well: >
 
 One of the great things about Vim is that it understands comments.  You can
 ask Vim to format a comment and it will do the right thing.
-   Suppose, for example, that you have the following comment:
+   Suppose, for example, that you have the following comment: >c
 
-	/* ~
-	 * This is a test ~
-	 * of the text formatting. ~
-	 */ ~
+	/*
+	 * This is a test
+	 * of the text formatting.
+	 */
 
 You then ask Vim to format it by positioning the cursor at the start of the
 comment and type: >
@@ -530,33 +530,33 @@ comment and type: >
 	gq]/
 
 "gq" is the operator to format text.  "]/" is the motion that takes you to the
-end of a comment.  The result is:
+end of a comment.  The result is: >c
 
-	/* ~
-	 * This is a test of the text formatting. ~
-	 */ ~
+	/*
+	 * This is a test of the text formatting.
+	 */
 
 Notice that Vim properly handled the beginning of each line.
   An alternative is to select the text that is to be formatted in Visual mode
 and type "gq".
 
 To add a new line to the comment, position the cursor on the middle line and
-press "o".  The result looks like this:
+press "o".  The result looks like this: >c
 
-	/* ~
-	 * This is a test of the text formatting. ~
-	 * ~
-	 */ ~
+	/*
+	 * This is a test of the text formatting.
+	 *
+	 */
 
 Vim has automatically inserted a star and a space for you.  Now you can type
 the comment text.  When it gets longer than 'textwidth', Vim will break the
-line.  Again, the star is inserted automatically:
+line.  Again, the star is inserted automatically: >c
 
-	/* ~
-	 * This is a test of the text formatting. ~
-	 * Typing a lot of text here will make Vim ~
-	 * break ~
-	 */ ~
+	/*
+	 * This is a test of the text formatting.
+	 * Typing a lot of text here will make Vim
+	 * break
+	 */
 
 For this to work some flags must be present in 'formatoptions':
 
diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt
index 8befb15528..8002a784c0 100644
--- a/runtime/doc/usr_40.txt
+++ b/runtime/doc/usr_40.txt
@@ -159,7 +159,7 @@ RECURSIVE MAPPING
 When a mapping triggers itself, it will run forever.  This can be used to
 repeat an action an unlimited number of times.
    For example, you have a list of files that contain a version number in the
-first line.  You edit these files with "vim *.txt".  You are now editing the
+first line.  You edit these files with `vim *.txt`.  You are now editing the
 first file.  Define this mapping: >
 
 	:map ,, :s/5.1/5.2/<CR>:wnext<CR>,,
@@ -622,7 +622,7 @@ Example: >
 
 	:autocmd BufReadPost *.log normal G
 
-This will make the cursor jump to the last line of *.log files when you start
+This will make the cursor jump to the last line of `*.log` files when you start
 to edit it.
    Using the ":normal" command is a bit tricky.  First of all, make sure its
 argument is a complete command, including all the arguments.  When you use "i"
diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt
index 15c94cd15e..54eded5111 100644
--- a/runtime/doc/usr_43.txt
+++ b/runtime/doc/usr_43.txt
@@ -123,12 +123,12 @@ That file is found in 'runtimepath' first.  Then use this in
 
 What will happen now is that Vim searches for "filetype.vim" files in each
 directory in 'runtimepath'.  First ~/.config/nvim/filetype.vim is found.  The
-autocommand to catch *.txt files is defined there.  Then Vim finds the
+autocommand to catch `*.txt` files is defined there.  Then Vim finds the
 filetype.vim file in $VIMRUNTIME, which is halfway 'runtimepath'.  Finally
 ~/.config/nvim/after/filetype.vim is found and the autocommand for detecting 
 ruby files in /usr/share/scripts is added.
    When you now edit /usr/share/scripts/README.txt, the autocommands are
-checked in the order in which they were defined.  The *.txt pattern matches,
+checked in the order in which they were defined.  The `*.txt` pattern matches,
 thus "setf text" is executed to set the filetype to "text".  The pattern for
 ruby matches too, and the "setf ruby" is executed.  But since 'filetype' was
 already set to "text", nothing happens here.
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 3c1437068a..0a0cbc8ec6 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -11,9 +11,9 @@ Differences between Vim and Vi				*vi-differences*
 ==============================================================================
 1. Limits						*limits*
 
-Vim has only a few limits for the files that can be edited {Vi: can not handle
+Vim has only a few limits for the files that can be edited. Vi cannot handle
 <Nul> characters and characters above 128, has limited line length, many other
-limits}.
+limits.
 
 Maximum line length	   2147483647 characters
 Maximum number of lines	   2147483647 lines
@@ -44,7 +44,7 @@ kept in memory:  Command-line history, error messages for Quickfix mode, etc.
 
 Support for different systems.
 	Vim can be used on:
-	- Modern Unix systems (*BSD, Linux, etc.)
+	- Modern Unix systems (BSD, Linux, etc.)
 	- Windows (XP SP 2 or greater)
 	- OS X
 
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 4b7901e614..b78c1eeae5 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -631,7 +631,7 @@ times than |WinResized|, it may slow down editing a bit.
 
 The information provided by |WinScrolled| is a dictionary for each window that
 has changes, using the window ID as the key, and a total count of the changes
-with the key "all".  Example value for |v:event|:
+with the key "all".  Example value for |v:event|: >
 	{
 	   all: {width: 0, height: 2, leftcol: 0, skipcol: 0, topline: 1, topfill: 0},
 	   1003: {width: 0, height: -1, leftcol: 0, skipcol: 0, topline: 0, topfill: 0},
@@ -1090,7 +1090,7 @@ list of buffers. |unlisted-buffer|
 		  a	an active buffer: it is loaded and visible
 		  h	a hidden buffer: It is loaded, but currently not
 			   displayed in a window |hidden-buffer|
-		   -	a buffer with 'modifiable' off
+		   `-`	a buffer with 'modifiable' off
 		   =	a readonly buffer
 		   R	a terminal buffer with a running job
 		   F	a terminal buffer with a finished job
@@ -1101,7 +1101,7 @@ list of buffers. |unlisted-buffer|
 		[flags] can be a combination of the following characters,
 		which restrict the buffers to be listed:
 			+	modified buffers
-			-	buffers with 'modifiable' off
+			`-`	buffers with 'modifiable' off
 			=	readonly buffers
 			a	active buffers
 			u	unlisted buffers (overrides the "!")
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 9c7bd13164..245a33625e 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -359,7 +359,7 @@ function ListIter.totable(self)
   return self._table
 end
 
---- Fold an iterator or table into a single value.
+--- Fold ("reduce") an iterator or table into a single value.
 ---
 --- Examples:
 --- <pre>lua
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 17b444a6e8..c2e0179cc4 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -122,7 +122,7 @@ end
 ---@private
 ---@param bufnr integer
 ---@param mode "v"|"V"
----@return table {start={row, col}, end={row, col}} using (1, 0) indexing
+---@return table {start={row,col}, end={row,col}} using (1, 0) indexing
 local function range_from_selection(bufnr, mode)
   -- TODO: Use `vim.region()` instead https://github.com/neovim/neovim/pull/13896
 
@@ -189,7 +189,7 @@ end
 ---         Restrict formatting to the client with name (client.name) matching this field.
 ---
 ---     - range (table|nil) Range to format.
----         Table must contain `start` and `end` keys with {row, col} tuples using
+---         Table must contain `start` and `end` keys with {row,col} tuples using
 ---         (1,0) indexing.
 ---         Defaults to current selection in visual mode
 ---         Defaults to `nil` in other modes, formatting the full buffer
@@ -741,7 +741,7 @@ end
 ---  - range: (table|nil)
 ---           Range for which code actions should be requested.
 ---           If in visual mode this defaults to the active selection.
----           Table must contain `start` and `end` keys with {row, col} tuples
+---           Table must contain `start` and `end` keys with {row,col} tuples
 ---           using mark-like indexing. See |api-indexing|
 ---
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeAction
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 538e48c805..4c319e7c41 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -178,8 +178,8 @@ local _str_byteindex_enc = M._str_byteindex_enc
 --- CAUTION: Changes in-place!
 ---
 ---@param lines (table) Original list of strings
----@param A (table) Start position; a 2-tuple of {line, col} numbers
----@param B (table) End position; a 2-tuple of {line, col} numbers
+---@param A (table) Start position; a 2-tuple of {line,col} numbers
+---@param B (table) End position; a 2-tuple of {line,col} numbers
 ---@param new_lines A list of strings to replace the original
 ---@returns (table) The modified {lines} object
 function M.set_lines(lines, A, B, new_lines)
@@ -2075,9 +2075,9 @@ end
 --- Using the given range in the current buffer, creates an object that
 --- is similar to |vim.lsp.util.make_range_params()|.
 ---
----@param start_pos integer[]|nil {row, col} mark-indexed position.
+---@param start_pos integer[]|nil {row,col} mark-indexed position.
 --- Defaults to the start of the last visual selection.
----@param end_pos integer[]|nil {row, col} mark-indexed position.
+---@param end_pos integer[]|nil {row,col} mark-indexed position.
 --- Defaults to the end of the last visual selection.
 ---@param bufnr integer|nil buffer handle or 0 for current, defaults to current
 ---@param offset_encoding "utf-8"|"utf-16"|"utf-32"|nil defaults to `offset_encoding` of first client of `bufnr`
-- 
cgit 


From 49a7585981cdf7403e76a614558e602a98e64301 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 23 Jun 2023 12:16:55 +0200
Subject: docs: autocmds, misc

---
 runtime/doc/api.txt         |  6 ++---
 runtime/doc/autocmd.txt     | 59 +++++++++++++++++++++++----------------------
 runtime/doc/builtin.txt     |  2 +-
 runtime/doc/lsp.txt         | 20 +++++++++------
 runtime/doc/lua-guide.txt   |  4 +--
 runtime/doc/lua.txt         |  8 +++---
 runtime/doc/various.txt     |  4 +--
 runtime/doc/vim_diff.txt    |  5 ++--
 runtime/lua/vim/_editor.lua |  2 ++
 runtime/lua/vim/lsp.lua     |  2 +-
 10 files changed, 61 insertions(+), 51 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 8c79279361..3a3d939cd7 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -209,7 +209,7 @@ any of these approaches:
      nvim --api-info | python -c 'import msgpack, sys, yaml; yaml.dump(msgpack.unpackb(sys.stdin.buffer.read()), sys.stdout)'
 <
   3. Use the |api_info()| Vimscript function. >vim
-     :lua print(vim.inspect(vim.fn.api_info()))
+     :lua vim.print(vim.fn.api_info())
 <     Example using |filter()| to exclude non-deprecated API functions: >vim
      :new|put =map(filter(api_info().functions, '!has_key(v:val,''deprecated_since'')'), 'v:val.name')
 
@@ -2030,7 +2030,7 @@ whether a buffer is loaded.
 nvim_buf_attach({buffer}, {send_buffer}, {opts})           *nvim_buf_attach()*
     Activates buffer-update events on a channel, or as Lua callbacks.
 
-    Example (Lua): capture buffer updates in a global `events` variable (use "print(vim.inspect(events))" to see its contents): >lua
+    Example (Lua): capture buffer updates in a global `events` variable (use "vim.print(events)" to see its contents): >lua
       events = {}
       vim.api.nvim_buf_attach(0, false, {
         on_lines=function(...) table.insert(events, {...}) end})
@@ -2554,7 +2554,7 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {opts})
       local ms  = api.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
       -- Get all marks in this buffer + namespace.
       local all = api.nvim_buf_get_extmarks(0, ns, 0, -1, {})
-      print(vim.inspect(ms))
+      vim.print(ms)
 <
 
     Parameters: ~
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index a782be65e7..ffa7d6282a 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -212,28 +212,27 @@ events.
 Nvim recognizes the following events.  Names are case-insensitive.
 
 							*BufAdd*
-BufAdd				Just after creating a new buffer which is
-				added to the buffer list, or adding a buffer
-				to the buffer list, a buffer in the buffer
-				list was renamed.
-				Not triggered for the initial buffers created
-				during startup.
+BufAdd				After adding a new buffer or existing unlisted
+				buffer to the buffer list (except during
+				startup, see |VimEnter|), or renaming a listed
+				buffer.
 				Before |BufEnter|.
-				NOTE: Current buffer "%" may be different from
-				the buffer being created "<afile>".
+				NOTE: Current buffer "%" is not the target
+				buffer "<afile>", "<abuf>". |<buffer=abuf>|
 							*BufDelete*
 BufDelete			Before deleting a buffer from the buffer list.
 				The BufUnload may be called first (if the
 				buffer was loaded).
 				Also used just before a buffer in the buffer
 				list is renamed.
-				NOTE: Current buffer "%" may be different from
-				the buffer being deleted "<afile>" and "<abuf>".
+				NOTE: Current buffer "%" is not the target
+				buffer "<afile>", "<abuf>". |<buffer=abuf>|
 				Do not change to another buffer.
 							*BufEnter*
-BufEnter			After entering a buffer.  Useful for setting
-				options for a file type.  Also executed when
-				starting to edit a buffer.
+BufEnter			After entering (visiting, switching-to) a new
+				or existing buffer. Useful for setting
+				filetype options.  Compare |BufNew| which
+				does not trigger for existing buffers.
 				After |BufAdd|.
 				After |BufReadPost|.
 							*BufFilePost*
@@ -248,8 +247,8 @@ BufHidden			Before a buffer becomes hidden: when there are
 				the buffer is not unloaded or deleted.
 
 				Not used for ":qa" or ":q" when exiting Vim.
-				NOTE: current buffer "%" may be different from
-				the buffer being unloaded "<afile>".
+				NOTE: Current buffer "%" is not the target
+				buffer "<afile>", "<abuf>". |<buffer=abuf>|
 							*BufLeave*
 BufLeave			Before leaving to another buffer.  Also when
 				leaving or closing the current window and the
@@ -260,12 +259,14 @@ BufLeave			Before leaving to another buffer.  Also when
 BufModifiedSet			After the `'modified'` value of a buffer has
 				been changed.
 							*BufNew*
-BufNew				Just after creating a new buffer.  Also used
-				just after a buffer has been renamed.  When
-				the buffer is added to the buffer list BufAdd
-				will be triggered too.
-				NOTE: Current buffer "%" may be different from
-				the buffer being created "<afile>".
+BufNew				After creating a new buffer (except during
+				startup, see |VimEnter|) or renaming an
+				existing buffer. Unlike |BufEnter|, visiting
+				(switching to) an existing buffer will not
+				trigger this again.
+				NOTE: Current buffer "%" is not the target
+				buffer "<afile>", "<abuf>". |<buffer=abuf>|
+				See also |BufAdd|, |BufNewFile|.
 							*BufNewFile*
 BufNewFile			When starting to edit a file that doesn't
 				exist.  Can be used to read in a skeleton
@@ -298,8 +299,8 @@ BufUnload			Before unloading a buffer, when the text in
 				Before BufDelete.
 				Triggers for all loaded buffers when Vim is
 				going to exit.
-				NOTE: Current buffer "%" may be different from
-				the buffer being unloaded "<afile>".
+				NOTE: Current buffer "%" is not the target
+				buffer "<afile>", "<abuf>". |<buffer=abuf>|
 				Do not switch buffers or windows!
 				Not triggered when exiting and v:dying is 2 or
 				more.
@@ -319,8 +320,8 @@ BufWinLeave			Before a buffer is removed from a window.
 				Not when it's still visible in another window.
 				Also triggered when exiting.
 				Before BufUnload, BufHidden.
-				NOTE: Current buffer "%" may be different from
-				the buffer being unloaded "<afile>".
+				NOTE: Current buffer "%" is not the target
+				buffer "<afile>", "<abuf>". |<buffer=abuf>|
 				Not triggered when exiting and v:dying is 2 or
 				more.
 							*BufWipeout*
@@ -330,8 +331,8 @@ BufWipeout			Before completely deleting a buffer.  The
 				buffer list).  Also used just before a buffer
 				is renamed (also when it's not in the buffer
 				list).
-				NOTE: Current buffer "%" may be different from
-				the buffer being deleted "<afile>".
+				NOTE: Current buffer "%" is not the target
+				buffer "<afile>", "<abuf>". |<buffer=abuf>|
 				Do not change to another buffer.
 						*BufWrite* *BufWritePre*
 BufWrite or BufWritePre		Before writing the whole buffer to a file.
@@ -597,8 +598,8 @@ FileChangedShell		When Vim notices that the modification time of
 				prompt is not given.
 				|v:fcs_reason| indicates what happened. Set
 				|v:fcs_choice| to control what happens next.
-				NOTE: Current buffer "%" may be different from
-				the buffer that was changed "<afile>".
+				NOTE: Current buffer "%" is not the target
+				buffer "<afile>" and "<abuf>". |<buffer=abuf>|
 							*E246* *E811*
 				Cannot switch, jump to or delete buffers.
 				Non-recursive (event cannot trigger itself).
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 1cbc9135d3..c8d1d0b25b 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -656,7 +656,7 @@ api_info()						*api_info()*
 		Returns Dictionary of |api-metadata|.
 
 		View it in a nice human-readable format: >
-		       :lua print(vim.inspect(vim.fn.api_info()))
+		       :lua vim.print(vim.fn.api_info())
 
 append({lnum}, {text})					*append()*
 		When {text} is a |List|: Append each item of the |List| as a
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 9b168cb9cd..42600e405c 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -154,16 +154,17 @@ The `vim.lsp.buf_…` functions perform operations for all LSP clients attached
 to the given buffer. |lsp-buf|
 
 LSP request/response handlers are implemented as Lua functions (see
-|lsp-handler|). The |vim.lsp.handlers| table defines default handlers used
-when creating a new client. Keys are LSP method names: >vim
-
-    :lua print(vim.inspect(vim.tbl_keys(vim.lsp.handlers)))
-<
+|lsp-handler|).
                                                                   *lsp-method*
 
-Methods are the names of requests and notifications as defined by the LSP
-specification. These LSP requests/notifications are defined by default in the
-Nvim LSP client (but depends on server support):
+Requests and notifications defined by the LSP specification are referred to as
+"LSP methods". The Nvim LSP client provides default handlers in the global
+|vim.lsp.handlers| table, you can list them with this command: >vim
+
+    :lua vim.print(vim.tbl_keys(vim.lsp.handlers))
+<
+They are also listed below. Note that handlers depend on server support: they
+won't run if your server doesn't support them.
 
 - callHierarchy/incomingCalls
 - callHierarchy/outgoingCalls
@@ -190,8 +191,11 @@ Nvim LSP client (but depends on server support):
 - window/showDocument
 - window/showMessageRequest
 - workspace/applyEdit
+- workspace/configuration
+- workspace/executeCommand
 - workspace/inlayHint/refresh
 - workspace/symbol
+- workspace/workspaceFolders
 
                                                                  *lsp-handler*
 LSP handlers are functions that handle |lsp-response|s to requests made by Nvim
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 22f51ce8c7..af7f22304d 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -218,7 +218,7 @@ Vimscript are automatically converted:
     print(vim.fn.printf('Hello from %s', 'Lua'))
 
     local reversed_list = vim.fn.reverse({ 'a', 'b', 'c' })
-    print(vim.inspect(reversed_list)) -- { "c", "b", "a" }
+    vim.print(reversed_list) -- { "c", "b", "a" }
 
     local function print_stdout(chan_id, data, name)
       print(data[1])
@@ -261,7 +261,7 @@ Data types are converted automatically. For example:
       key2 = 300
     }
 
-    print(vim.inspect(vim.g.some_global_variable))
+    vim.print(vim.g.some_global_variable)
     --> { key1 = "value", key2 = 300 }
 <
 You can target specific buffers (via number), windows (via |window-ID|), or
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index c3eaf1ae39..822ce4e85a 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -14,7 +14,7 @@ INTRODUCTION                                                       *lua-intro*
 The Lua 5.1 script engine is builtin and always available. Try this command to
 get an idea of what lurks beneath: >vim
 
-    :lua print(vim.inspect(package.loaded))
+    :lua vim.print(package.loaded)
 
 Nvim includes a "standard library" |lua-stdlib| for Lua.  It complements the
 "editor stdlib" (|builtin-functions| and |Ex-commands|) and the |API|, all of
@@ -423,7 +423,7 @@ is unnecessary.
 
 You can peek at the module properties: >vim
 
-    :lua print(vim.inspect(vim))
+    :lua vim.print(vim)
 
 Result is something like this: >
 
@@ -1414,6 +1414,7 @@ inspect({object}, {options})                                   *vim.inspect()*
     Gets a human-readable representation of the given object.
 
     See also: ~
+      • |vim.print()|
       • https://github.com/kikito/inspect.lua
       • https://github.com/mpeterv/vinspect
 
@@ -1538,6 +1539,7 @@ print({...})                                                     *vim.print()*
 
     See also: ~
       • |vim.inspect()|
+      • |:=|
 
 region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
     Get a table of lines with start, end columns for a region marked by two
@@ -3172,7 +3174,7 @@ Iter:find({self}, {f})                                           *Iter:find()*
         any
 
 Iter:fold({self}, {init}, {f})                                   *Iter:fold()*
-    Fold an iterator or table into a single value.
+    Fold ("reduce") an iterator or table into a single value.
 
     Examples: >lua
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 4e2ee14537..1b1dca321b 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -171,8 +171,8 @@ g8			Print the hex values of the bytes used in the
 			Like ":z" or ":z!", but number the lines.
 
 							*:=*
-:=			Without arg: Print the last line number.
-			with args: equivalent to `:lua ={expr}`. see |:lua|
+:= [args]		Without [args]: prints the last line number.
+			With [args]: equivalent to `:lua ={expr}`. see |:lua|
 
 :{range}=		Prints the last line number in {range}.  For example,
 			this prints the current line number: >
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index c44595f237..686905537d 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -459,8 +459,9 @@ Lua interface (|lua.txt|):
 - `:lua print("a\0b")` will print `a^@b`, like with `:echomsg "a\nb"` . In Vim
   that prints `a` and `b` on separate lines, exactly like
   `:lua print("a\nb")` .
-- `:lua error('TEST')` emits the error “E5105: Error while calling Lua chunk:
-  [string "<Vimscript compiled string>"]:1: TEST”, whereas Vim emits only “TEST”.
+- `:lua error('TEST')` emits the error: >
+  E5108: Error executing lua: [string "<Vimscript compiled string>"]:1: TEST
+<  whereas Vim emits only "TEST".
 - Lua has direct access to Nvim |API| via `vim.api`.
 - Lua package.path and package.cpath are automatically updated according to
   'runtimepath': |lua-require|.
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index e2ed0d980e..ab20c36b17 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -184,6 +184,7 @@ end
 
 --- Gets a human-readable representation of the given object.
 ---
+---@see |vim.print()|
 ---@see https://github.com/kikito/inspect.lua
 ---@see https://github.com/mpeterv/vinspect
 local function inspect(object, options) -- luacheck: no unused
@@ -870,6 +871,7 @@ end
 --- </pre>
 ---
 --- @see |vim.inspect()|
+--- @see |:=|
 --- @return any # given arguments.
 function vim.print(...)
   if vim.in_fast_event() then
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 970bb56478..a8e75c4dc9 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -2457,7 +2457,7 @@ end
 ---                   buffer number as arguments. Example:
 ---             <pre>lua
 ---               vim.lsp.for_each_buffer_client(0, function(client, client_id, bufnr)
----                 print(vim.inspect(client))
+---                 vim.print(client)
 ---               end)
 ---             </pre>
 ---@deprecated use lsp.get_active_clients({ bufnr = bufnr }) with regular loop
-- 
cgit 


From 957d05d16bc80cef14c2e9fe31b6b847e698f9d1 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 25 Jun 2023 12:29:56 -0700
Subject: fix(docs): too much whitespace around <pre> blocks #24151

Problem:
In the generated docs HTML there is too much whitespace before/after `<pre>`
blocks.
- In the old layout (fixed-width), all text in `.old-help-para` is formatted as
  `white-space:pre`.
- In the new layout, when `<pre>` is at the end of a `<div>`, the margins of
  both are redundant, causing too much space.

Solution:
- In the old layout, always remove `<pre>` margin.
- In the new layout, disable `<pre>` margin if it is the last child.
---
 runtime/doc/api.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 3a3d939cd7..f9ab494a3e 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2015,7 +2015,7 @@ Buffer Functions                                                  *api-buffer*
 
 For more information on buffers, see |buffers|.
 
-Unloaded Buffers:~
+Unloaded Buffers: ~
 
 Buffers may be unloaded by the |:bunload| command or the buffer's
 |'bufhidden'| option. When a buffer is unloaded its file contents are
-- 
cgit 


From b697c0cd4fb2ebe3f021599cb77122374db7fd59 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 26 Jun 2023 09:25:46 +0200
Subject: fix(treesitter): update lua parser and queries (#24148)

---
 runtime/queries/lua/highlights.scm | 37 ++++++++++++++++++++++++++++++++-----
 runtime/queries/lua/injections.scm | 27 +++++++++++++--------------
 2 files changed, 45 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 537a171441..96ffeae793 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -180,13 +180,40 @@
 
 (parameters (identifier) @parameter)
 
-(function_call name: (identifier) @function.call)
-(function_declaration name: (identifier) @function)
+(function_declaration
+  name: [
+    (identifier) @function
+    (dot_index_expression
+      field: (identifier) @function)
+  ])
 
-(function_call name: (dot_index_expression field: (identifier) @function.call))
-(function_declaration name: (dot_index_expression field: (identifier) @function))
+(function_declaration
+  name: (method_index_expression
+    method: (identifier) @method))
+
+(assignment_statement
+  (variable_list .
+    name: [
+      (identifier) @function
+      (dot_index_expression
+        field: (identifier) @function)
+    ])
+  (expression_list .
+    value: (function_definition)))
 
-(method_index_expression method: (identifier) @method.call)
+(table_constructor
+  (field
+    name: (identifier) @function
+    value: (function_definition)))
+
+(function_call
+  name: [
+    (identifier) @function.call
+    (dot_index_expression
+      field: (identifier) @function.call)
+    (method_index_expression
+      method: (identifier) @method.call)
+  ])
 
 (function_call
   (identifier) @function.builtin
diff --git a/runtime/queries/lua/injections.scm b/runtime/queries/lua/injections.scm
index 3fcebe83f3..dbfe75ae31 100644
--- a/runtime/queries/lua/injections.scm
+++ b/runtime/queries/lua/injections.scm
@@ -3,7 +3,9 @@
     (identifier) @_cdef_identifier
     (_ _ (identifier) @_cdef_identifier)
   ]
-  arguments: (arguments (string content: _ @injection.content)))
+  arguments:
+    (arguments
+      (string content: _ @injection.content)))
   (#set! injection.language "c")
   (#eq? @_cdef_identifier "cdef"))
 
@@ -11,15 +13,7 @@
   name: (_) @_vimcmd_identifier
   arguments: (arguments (string content: _ @injection.content)))
   (#set! injection.language "vim")
-  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_exec2" "vim.api.nvim_cmd"))
-
-; vim.rcprequest(123, "nvim_exec_lua", "return vim.api.nvim_buf_get_lines(0, 0, -1, false)", false)
-((function_call
-  name: (_) @_vimcmd_identifier
-  arguments: (arguments . (_) . (string content: _ @_method) . (string content: _ @injection.content)))
-  (#set! injection.language "lua")
-  (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
-  (#eq? @_method "nvim_exec_lua"))
+  (#any-of? @_vimcmd_identifier "vim.cmd" "vim.api.nvim_command" "vim.api.nvim_command" "vim.api.nvim_exec2"))
 
 ((function_call
   name: (_) @_vimcmd_identifier
@@ -27,10 +21,15 @@
   (#set! injection.language "query")
   (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse"))
 
+((function_call
+  name: (_) @_vimcmd_identifier
+  arguments: (arguments . (_) . (string content: _ @_method) . (string content: _ @injection.content)))
+  (#any-of? @_vimcmd_identifier "vim.rpcrequest" "vim.rpcnotify")
+  (#eq? @_method "nvim_exec_lua")
+  (#set! injection.language "lua"))
+
 ;; highlight string as query if starts with `;; query`
 (string content: _ @injection.content
- (#set! injection.language "query")
- (#lua-match? @injection.content "^%s*;+%s?query"))
+ (#lua-match? @injection.content "^%s*;+%s?query")
+ (#set! injection.language "query"))
 
-; ((comment) @injection.content
-;  (#set! injection.language "comment"))
-- 
cgit 


From b6878f5d6387bad667edf75cf6c70e846c3b0428 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 26 Jun 2023 11:16:55 +0200
Subject: docs: fix misparsed headings (#24162)

Problem: vimdoc parser requires space between column heading and `~`.

Solution: Add space to docs (and mention it). Also edit `luaref.txt`
headings for consistency.
---
 runtime/doc/api.txt      |  6 +++---
 runtime/doc/helphelp.txt |  7 ++++---
 runtime/doc/luaref.txt   | 19 ++++++++-----------
 3 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index f9ab494a3e..87ea000047 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -280,7 +280,7 @@ nvim_buf_lines_event[{buf}, {changedtick}, {firstline}, {lastline}, {linedata},
     changed but not the buffer contents. {linedata} contains the changed
     screen lines. This happens when 'inccommand' shows a buffer preview.
 
-    Properties:~
+    Properties: ~
         {buf} API buffer handle (buffer number)
 
         {changedtick} value of |b:changedtick| for the buffer. If you send an
@@ -313,7 +313,7 @@ nvim_buf_changedtick_event[{buf}, {changedtick}]  *nvim_buf_changedtick_event*
     When |b:changedtick| was incremented but no text was changed. Relevant for
     undo/redo.
 
-    Properties:~
+    Properties: ~
         {buf} API buffer handle (buffer number)
         {changedtick} new value of |b:changedtick| for the buffer
 
@@ -326,7 +326,7 @@ nvim_buf_detach_event[{buf}]                           *nvim_buf_detach_event*
       |:checktime| or 'autoread'.
     - Generally: whenever the buffer contents are unloaded from memory.
 
-    Properties:~
+    Properties: ~
         {buf} API buffer handle (buffer number)
 
 
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index 80b237160f..efcc6afae9 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -357,10 +357,11 @@ parameter, surround it in backticks, eg. `~/.path/to/init.vim`.
 
 HIGHLIGHTING
 
-To define a column heading, use a tilde character at the end of the line.
-This will highlight the column heading in a different color.  E.g.
+To define a column heading, use a tilde character at the end of the line,
+preceded by a space. This will highlight the column heading in a different
+color.  E.g.
 
-Column heading~
+Column heading ~
 
 To separate sections in a help file, place a series of '=' characters in a
 line starting from the first column.  The section separator line is highlighted
diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index a01196e538..8a1ba88a96 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -3830,7 +3830,7 @@ coroutine.yield({...})                                       *coroutine.yield()*
         to `yield` are passed as extra results to `resume`.
 
 ==============================================================================
-5.3 - Modules                                                 *luaref-libModule*
+5.3 Modules                                                 *luaref-libModule*
 
 The package library provides basic facilities for loading and building modules
 in Lua. It exports two of its functions directly in the global environment:
@@ -3960,7 +3960,7 @@ package.seeall({module})                                      *package.seeall()*
         global environment. To be used as an option to function {module}.
 
 ==============================================================================
-5.4 - String Manipulation                                     *luaref-libString*
+5.4 String Manipulation                                     *luaref-libString*
 
 This library provides generic functions for string manipulation, such as
 finding and extracting substrings, and pattern matching. When indexing a
@@ -4199,9 +4199,8 @@ instance, `%S` represents all non-space characters.
 The definitions of letter, space, and other character groups depend on the
 current locale. In particular, the class `[a-z]` may not be equivalent to `%l`.
 
-                                                            *luaref-patternitem*
-Pattern Item:~
--------------
+PATTERN ITEM                                                *luaref-patternitem*
+
 A pattern item may be
 
    - a single character class, which matches any single character in the
@@ -4226,17 +4225,15 @@ A pattern item may be
       `y` where the count reaches 0. For instance, the item `%b()` matches
       expressions with balanced parentheses.
 
-                                                                *luaref-pattern*
-Pattern:~
---------
+PATTERN                                                         *luaref-pattern*
+
 A pattern is a sequence of pattern items. A `^` at the beginning of a pattern
 anchors the match at the beginning of the subject string. A `$` at the end of
 a pattern anchors the match at the end of the subject string. At other
 positions, `^` and `$` have no special meaning and represent themselves.
 
-                                                                *luaref-capture*
-Captures:~
----------
+CAPTURES                                                        *luaref-capture*
+
 A pattern may contain sub-patterns enclosed in parentheses; they describe
 captures. When a match succeeds, the substrings of the subject string that
 match captures are stored (captured) for future use. Captures are numbered
-- 
cgit 


From 17c59e417f818804187d85760765d51feb4d9c21 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 25 Jun 2023 23:44:45 +0200
Subject: fix(docs): vimdoc syntax errors

Prepare for https://github.com/neovim/tree-sitter-vimdoc/pull/108 which improves
`{arg}` highlighting in many common cases:

    vim.foo({bar})
    vim.foo( {bar})
    nvim_foo({bar})
    nvim_foo({bar},{baz})
    nvim_foo({bar}, {baz})
    foo[{buf}]

The tradeoff is that things like `"[{"` are flagged as parse errors.
We could avoid if we drop support for `foo[{buf}]`, but that is rather common
(see `builtin.txt`).
---
 runtime/doc/builtin.txt  | 10 +++++-----
 runtime/doc/indent.txt   | 12 ++++++------
 runtime/doc/index.txt    |  4 ++--
 runtime/doc/motion.txt   | 12 ++++++------
 runtime/doc/options.txt  | 14 +++++++-------
 runtime/doc/quickref.txt |  4 ++--
 runtime/doc/tips.txt     |  4 ++--
 runtime/doc/usr_29.txt   |  4 ++--
 runtime/doc/usr_40.txt   |  2 +-
 9 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index c8d1d0b25b..150022d62a 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5383,7 +5383,7 @@ matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 <		results in `['two one', 'one two']` . >
 		   :echo ['one two', 'two one']->matchfuzzy('two one',
 						\ {'matchseq': 1})
-<		results in ['two one'].
+<		results in `['two one']`.
 
 matchfuzzypos({list}, {str} [, {dict}])			*matchfuzzypos()*
 		Same as |matchfuzzy()|, but returns the list of matched
@@ -5405,7 +5405,7 @@ matchfuzzypos({list}, {str} [, {dict}])			*matchfuzzypos()*
 <		results in [["lacy", "clay"], [[0, 1], [1, 2]], [153, 133]] >
 			:echo [{'text': 'hello', 'id' : 10}]
 				\ ->matchfuzzypos('ll', {'key' : 'text'})
-<		results in [[{"id": 10, "text": "hello"}], [[2, 3]], [127]]
+<		results in `[[{"id": 10, "text": "hello"}], [[2, 3]], [127]]`
 
 matchlist({expr}, {pat} [, {start} [, {count}]])		*matchlist()*
 		Same as |match()|, but return a |List|.  The first item in the
@@ -9507,11 +9507,11 @@ winlayout([{tabnr}])					*winlayout()*
 		For a leaf window, it returns:
 			["leaf", {winid}]
 		For horizontally split windows, which form a column, it
-		returns:
+		returns: >
 			["col", [{nested list of windows}]]
-		For vertically split windows, which form a row, it returns:
+<		For vertically split windows, which form a row, it returns: >
 			["row", [{nested list of windows}]]
-
+<
 		Example: >
 			" Only one window in the tab page
 			:echo winlayout()
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index dd42f334fb..853facdaa0 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -574,7 +574,7 @@ The examples below assume a 'shiftwidth' of 4.
 	      them like every other preprocessor directive.
 
 
-The defaults, spelled out in full, are:
+The defaults, spelled out in full, are: >
 	cinoptions=>s,e0,n0,f0,{0,}0,^0,L-1,:s,=s,l0,b0,gs,hs,N0,E0,ps,ts,is,+s,
 			c3,C0,/0,(2s,us,U0,w0,W0,k0,m0,j0,J0,)20,*70,#0,P0
 
@@ -1060,19 +1060,19 @@ be configured by setting the following keys in the |Dictionary|
 b:sh_indent_defaults to a specific amount or to a |Funcref| that references a
 function that will return the amount desired:
 
-b:sh_indent_options['default']	Default amount of indent.
+b:sh_indent_options["default"]	Default amount of indent.
 
-b:sh_indent_options['continuation-line']
+b:sh_indent_options["continuation-line"]
 				Amount of indent to add to a continued line.
 
-b:sh_indent_options['case-labels']
+b:sh_indent_options["case-labels"]
 				Amount of indent to add for case labels.
 				(not actually implemented)
 
-b:sh_indent_options['case-statements']
+b:sh_indent_options["case-statements"]
 				Amount of indent to add for case statements.
 
-b:sh_indent_options['case-breaks']
+b:sh_indent_options["case-breaks"]
 				Amount of indent to add (or more likely
 				remove) for case breaks.
 
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index fbd3fccec0..106219693a 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -475,7 +475,7 @@ tag		command		   action in op-pending and Visual mode	~
 |v_a)|		a)		   same as ab
 |v_a<|		a<		   "a <>" from '<' to the matching '>'
 |v_a>|		a>		   same as a<
-|v_aB|		aB		   "a Block" from "[{" to "]}" (with brackets)
+|v_aB|		aB		   "a Block" from `[{` to `]}` (with brackets)
 |v_aW|		aW		   "a WORD" (with white space)
 |v_a[|		a[		   "a []" from '[' to the matching ']'
 |v_a]|		a]		   same as a[
@@ -493,7 +493,7 @@ tag		command		   action in op-pending and Visual mode	~
 |v_i)|		i)		   same as ib
 |v_i<|		i<		   "inner <>" from '<' to the matching '>'
 |v_i>|		i>		   same as i<
-|v_iB|		iB		   "inner Block" from "[{" and "]}"
+|v_iB|		iB		   "inner Block" from `[{` and `]}`
 |v_iW|		iW		   "inner WORD"
 |v_i[|		i[		   "inner []" from '[' to the matching ']'
 |v_i]|		i]		   same as i[
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 51aea42be9..d7a0205ebd 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -620,15 +620,15 @@ it			"inner tag block", select [count] tag blocks, from the
 
 a}							*v_a}* *a}* *a{*
 a{							*v_aB* *v_a{* *aB*
-aB			"a Block", select [count] Blocks, from "[count] [{" to
-			the matching '}', including the '{' and '}' (see
+aB			"a Block", select [count] Blocks, from `[count] [{` to
+			the matching "}", including the "{" and "}" (see
 			|[{|).
 			When used in Visual mode it is made charwise.
 
 i}							*v_i}* *i}* *i{*
 i{							*v_iB* *v_i{* *iB*
-iB			"inner Block", select [count] Blocks, from "[count] [{"
-			to the matching '}', excluding the '{' and '}' (see
+iB			"inner Block", select [count] Blocks, from `[count] [{`
+			to the matching "}", excluding the "{" and "}" (see
 			|[{|).
 			When used in Visual mode it is made charwise.
 
@@ -1279,9 +1279,9 @@ remembered.
 			|exclusive| motion.
 
 The above four commands can be used to go to the start or end of the current
-code block.  It is like doing "%" on the '(', ')', '{' or '}' at the other
+code block.  It is like doing "%" on the "(", ")", "{" or "}" at the other
 end of the code block, but you can do this from anywhere in the code block.
-Very useful for C programs.  Example: When standing on "case x:", "[{" will
+Very useful for C programs.  Example: When standing on "case x:", `[{` will
 bring you back to the switch statement.
 
 						*]m*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7ef2195198..b5d0f6a6b7 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -901,7 +901,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	accidentally overwriting existing files with a backup file.  You might
 	prefer using ".bak", but make sure that you don't have files with
 	".bak" that you want to keep.
-	Only normal file name characters can be used; "/\*?[|<>" are illegal.
+	Only normal file name characters can be used; `/\*?[|<>` are illegal.
 
 	If you like to keep a lot of backups, you could use a BufWritePre
 	autocommand to change 'backupext' just before writing the file to
@@ -2445,7 +2445,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	one dot may appear.
 	This option is not copied to another buffer, independent of the 's' or
 	'S' flag in 'cpoptions'.
-	Only normal file name characters can be used, "/\*?[|<>" are illegal.
+	Only normal file name characters can be used, `/\*?[|<>` are illegal.
 
 						*'fillchars'* *'fcs'*
 'fillchars' 'fcs'	string	(default "")
@@ -2650,7 +2650,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 		item		commands ~
 		all		any
-		block		"(", "{", "[[", "[{", etc.
+		block		(, {, [[, [{, etc.
 		hor		horizontal movements: "l", "w", "fx", etc.
 		insert		any command in Insert mode
 		jump		far jumps: "G", "gg", etc.
@@ -3581,7 +3581,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Setting this option to a valid keymap name has the side effect of
 	setting 'iminsert' to one, so that the keymap becomes effective.
 	'imsearch' is also set to one, unless it was -1
-	Only normal file name characters can be used, "/\*?[|<>" are illegal.
+	Only normal file name characters can be used, `/\*?[|<>` are illegal.
 
 					*'keymodel'* *'km'*
 'keymodel' 'km'		string	(default "")
@@ -3666,7 +3666,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	matter what $LANG is set to: >
 		:set langmenu=nl_NL.ISO_8859-1
 <	When 'langmenu' is empty, |v:lang| is used.
-	Only normal file name characters can be used, "/\*?[|<>" are illegal.
+	Only normal file name characters can be used, `/\*?[|<>` are illegal.
 	If your $LANG is set to a non-English language but you do want to use
 	the English menus: >
 		:set langmenu=none
@@ -4477,7 +4477,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Using 'patchmode' for compressed files appends the extension at the
 	end (e.g., "file.gz.orig"), thus the resulting name isn't always
 	recognized as a compressed file.
-	Only normal file name characters can be used, "/\*?[|<>" are illegal.
+	Only normal file name characters can be used, `/\*?[|<>` are illegal.
 
 				*'path'* *'pa'* *E343* *E345* *E347* *E854*
 'path' 'pa'		string	(default: ".,,")
@@ -6259,7 +6259,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Syntax autocommand event is triggered with the value as argument.
 	This option is not copied to another buffer, independent of the 's' or
 	'S' flag in 'cpoptions'.
-	Only normal file name characters can be used, "/\*?[|<>" are illegal.
+	Only normal file name characters can be used, `/\*?[|<>` are illegal.
 
 						*'tabline'* *'tal'*
 'tabline' 'tal'		string	(default empty)
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index c166ecd79d..fd9eab8646 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -489,8 +489,8 @@ In Insert or Command-line mode:
 |v_ip|	   N  ip	Select "inner paragraph"
 |v_ab|	   N  ab	Select "a block" (from "[(" to "])")
 |v_ib|	   N  ib	Select "inner block" (from "[(" to "])")
-|v_aB|	   N  aB	Select "a Block" (from "[{" to "]}")
-|v_iB|	   N  iB	Select "inner Block" (from "[{" to "]}")
+|v_aB|	   N  aB	Select "a Block" (from `[{` to `]}`)
+|v_iB|	   N  iB	Select "inner Block" (from `[{` to `]}`)
 |v_a>|	   N  a>	Select "a <> block"
 |v_i>|	   N  i>	Select "inner <> block"
 |v_at|	   N  at	Select "a tag block" (from <aaa> to </aaa>)
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index 05f41005cc..7d38b1e0f7 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -59,8 +59,8 @@ is an overview with tags to jump to:
 
 |v_ab|			Select "a block" from "[(" to "])", including braces
 |v_ib|			Select "inner block" from "[(" to "])"
-|v_aB|			Select "a block" from "[{" to "]}", including brackets
-|v_iB|			Select "inner block" from "[{" to "]}"
+|v_aB|			Select "a block" from `[{` to `]}`, including brackets
+|v_iB|			Select "inner block" from `[{` to `]}`
 
 ==============================================================================
 Finding where identifiers are used			*ident-search*
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt
index 918449d2f0..dd8598a3a0 100644
--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -361,7 +361,7 @@ MOVING IN CODE BLOCKS
 In C code blocks are enclosed in {}.  These can get pretty long.  To move to
 the start of the outer block use the "[[" command.  Use "][" to find the end.
 This assumes that the "{" and "}" are in the first column.
-   The "[{" command moves to the start of the current block.  It skips over
+   The [{ command moves to the start of the current block.  It skips over
 pairs of {} at the same level.  "]}" jumps to the end.
    An overview:
 
@@ -410,7 +410,7 @@ That also works when they are many lines apart.
 
 MOVING IN BRACES
 
-The "[(" and "])" commands work similar to "[{" and "]}", except that they
+The [( and ]) commands work similar to [{ and ]}, except that they
 work on () pairs instead of {} pairs.
 >
 				  [(
diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt
index 8002a784c0..b0d53e0d8c 100644
--- a/runtime/doc/usr_40.txt
+++ b/runtime/doc/usr_40.txt
@@ -501,7 +501,7 @@ See |autocmd-events| for a complete list of events.
 PATTERNS
 
 The {file-pattern} argument can actually be a comma-separated list of file
-patterns.  For example: "*.c,*.h" matches files ending in ".c" and ".h".
+patterns.  For example: `*.c,*.h` matches files ending in ".c" and ".h".
    The usual file wildcards can be used.  Here is a summary of the most often
 used ones:
 
-- 
cgit 


From 0ca2d11c1f473d9924c261c9dbd4e38730932bb4 Mon Sep 17 00:00:00 2001
From: Jonas Strittmatter <40792180+smjonas@users.noreply.github.com>
Date: Mon, 26 Jun 2023 12:19:13 +0200
Subject: vim-patch:9.0.1632: not all cabal config files are recognized
 (#24025)

Problem:    Not all cabal config files are recognized.
Solution:   Add a couple of patterns. (Marcin Szamotulski, closes vim/vim#12463)

https://github.com/vim/vim/commit/166cd7b801ebe4aa042a9bbd6007d1951800aaa9

Also:
- Do not expand Lua patterns in environment variables used in file patterns.
- Test $XDG_CONFIG_HOME on Windows, as it can be used by Nvim (and the runner
  sets it).

Co-authored-by: Marcin Szamotulski <coot@coot.me>
---
 runtime/lua/vim/filetype.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 7bcc67313d..fc94091622 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1809,6 +1809,8 @@ local pattern = {
   ['bzr_log%..*'] = 'bzr',
   ['.*enlightenment/.*%.cfg'] = 'c',
   ['${HOME}/cabal%.config'] = 'cabalconfig',
+  ['${HOME}/%.config/cabal/config'] = 'cabalconfig',
+  ['${XDG_CONFIG_HOME}/cabal/config'] = 'cabalconfig',
   ['cabal%.project%..*'] = starsetf('cabalproject'),
   ['.*/%.calendar/.*'] = starsetf('calendar'),
   ['.*/share/calendar/.*/calendar%..*'] = starsetf('calendar'),
@@ -2490,7 +2492,7 @@ local function match_pattern(name, path, tail, pat)
         return_early = true
         return nil
       end
-      return vim.env[env]
+      return vim.pesc(vim.env[env])
     end)
     if return_early then
       return false
-- 
cgit 


From 8ea9a70d05d6a7f9bab410101a87e6b184f14634 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Tue, 27 Jun 2023 10:14:34 +0300
Subject: vim-patch:9.0.1668: PEM files are not recognized (#24169)

Problem:    PEM files are not recognized.
Solution:   Add patterns to match PEM files. (closes vim/vim#12582)

https://github.com/vim/vim/commit/0256d76a3392aef270b38d1cf7633008e45c2003
---
 runtime/lua/vim/filetype.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index fc94091622..bc880ed130 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -783,6 +783,10 @@ local extension = {
   g = 'pccts',
   pcmk = 'pcmk',
   pdf = 'pdf',
+  pem = 'pem',
+  cer = 'pem',
+  crt = 'pem',
+  csr = 'pem',
   plx = 'perl',
   prisma = 'prisma',
   psgi = 'perl',
-- 
cgit 


From 929e4865d1f59cb356f3f2f8a10ad6095b435544 Mon Sep 17 00:00:00 2001
From: NAKAI Tsuyoshi <82267684+uga-rosa@users.noreply.github.com>
Date: Wed, 28 Jun 2023 00:14:17 +0900
Subject: docs(diagnostic): return value of get() #24144

---
 runtime/doc/diagnostic.txt     | 2 +-
 runtime/lua/vim/diagnostic.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index bfcc1c9092..9dd42061ef 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -478,7 +478,7 @@ get({bufnr}, {opts})                                    *vim.diagnostic.get()*
                  • severity: See |diagnostic-severity|.
 
     Return: ~
-        Diagnostic [] table A list of diagnostic items |diagnostic-structure|.
+        Diagnostic [] table A list of diagnostic items |diagnostic-structure|. Keys `bufnr` , `end_lnum` , `end_col` , and `severity` are guaranteed to be present.
 
 get_namespace({namespace})                    *vim.diagnostic.get_namespace()*
     Get namespace metadata.
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 0d1d01b391..093bfb631e 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -767,7 +767,7 @@ end
 ---                        - namespace: (number) Limit diagnostics to the given namespace.
 ---                        - lnum: (number) Limit diagnostics to the given line number.
 ---                        - severity: See |diagnostic-severity|.
----@return Diagnostic[] table A list of diagnostic items |diagnostic-structure|.
+---@return Diagnostic[] table A list of diagnostic items |diagnostic-structure|. Keys `bufnr`, `end_lnum`, `end_col`, and `severity` are guaranteed to be present.
 function M.get(bufnr, opts)
   vim.validate({
     bufnr = { bufnr, 'n', true },
-- 
cgit 


From ab65a98adba4d32b03e7296529c4bf1491c783eb Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 27 Jun 2023 10:21:27 -0700
Subject: fix(docs): ignore_invalid #24174

Regex bug in scripts/gen_help_html.lua:ignore_invalid()
---
 runtime/doc/filetype.txt  | 5 ++---
 runtime/doc/index.txt     | 2 +-
 runtime/doc/lua-guide.txt | 8 ++++----
 runtime/doc/lua.txt       | 2 +-
 runtime/doc/options.txt   | 3 ++-
 runtime/doc/pi_netrw.txt  | 3 ---
 runtime/doc/usr_41.txt    | 2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index d75820732f..bd74f45091 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -668,9 +668,8 @@ QUERY					                *ft-query-plugin*
 
 
 Linting of tree-sitter queries for installed parsers using
-|lua-treesitter-query_linter| is enabled by default on
-`BufEnter` and `BufWrite`. To change the events that
-trigger linting, use >lua
+|vim.treesitter.query.lint()| is enabled by default on `BufEnter` and
+`BufWrite`. To change the events that trigger linting, use >lua
 
 	vim.g.query_lint_on = { 'InsertLeave', 'TextChanged' }
 <
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 106219693a..b0ead51d0c 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1110,7 +1110,7 @@ to terminal mode.
 You found it, Arthur!				*holy-grail*
 
 ==============================================================================
-6. EX commands				*ex-commands* *ex-cmd-index* *:index*
+6. EX commands				*Ex-commands* *ex-cmd-index* *:index*
 
 This is a brief but complete listing of all the ":" commands, without
 mentioning any arguments.  The optional part of the command name is inside [].
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index af7f22304d..b138de85c9 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -30,7 +30,7 @@ The purpose of this guide is to introduce the different ways of interacting
 with Nvim through Lua (the "API"). This API consists of three different
 layers:
 
-1. The "Vim API" inherited from Vim: |ex-commands| and |builtin-functions| as
+1. The "Vim API" inherited from Vim: |Ex-commands| and |builtin-functions| as
 well as |user-function|s in Vimscript. These are accessed through |vim.cmd()|
 and |vim.fn| respectively, which are discussed under |lua-guide-vimscript|
 below.
@@ -80,7 +80,7 @@ exactly like for a Vimscript file:
     :source ~/programs/baz/myluafile.lua
 <
 Finally, you can include Lua code in a Vimscript file by putting it inside a
-|lua-heredoc| block:
+|:lua-heredoc| block:
 >vim
     lua << EOF
       local tbl = {1, 2, 3}
@@ -199,8 +199,8 @@ this allows you to pass multiple commands to a single call of |vim.cmd()|:
       highlight link Warning Error
     ]])
 <
-This is the converse of |lua-heredoc| and allows you to include Vimscript code in
-your `init.lua`.
+This is the converse of |:lua-heredoc| and allows you to include Vimscript
+code in your `init.lua`.
 
 If you want to build your Vim command programmatically, the following form can
 be useful (all these are equivalent to the corresponding line above):
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 822ce4e85a..fb6cbca6e3 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -252,7 +252,7 @@ arguments separated by " " (space) instead of "\t" (tab).
 {endmarker}
     Executes Lua script {script} from within Vimscript. You can omit
     [endmarker] after the "<<" and use a dot "." after {script} (similar to
-    |:append|, |:insert|). Refer to |let-heredoc| for more information.
+    |:append|, |:insert|). Refer to |:let-heredoc| for more information.
 
     Example: >vim
         function! CurrentLineInfo()
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b5d0f6a6b7..da634966f9 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4444,7 +4444,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 				*'packpath'* *'pp'*
 'packpath' 'pp'		string	(default: see 'runtimepath')
-	Directories used to find packages.  See |packages| and |rtp-packages|.
+	Directories used to find packages.
+	See |packages| and |packages-runtimepath|.
 
 
 						*'paragraphs'* *'para'*
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 276041caac..dfe9032506 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -91,7 +91,6 @@ Copyright: Copyright (C) 2017 Charles E Campbell    *netrw-copyright*
       Marked Files: Grep..................................|netrw-mg|
       Marked Files: Hiding and Unhiding by Suffix.........|netrw-mh|
       Marked Files: Moving................................|netrw-mm|
-      Marked Files: Printing..............................|netrw-mp|
       Marked Files: Sourcing..............................|netrw-ms|
       Marked Files: Setting the Target Directory..........|netrw-mt|
       Marked Files: Tagging...............................|netrw-mT|
@@ -1108,7 +1107,6 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   mg	Apply vimgrep to marked files                        |netrw-mg|
 	   mh	Toggle marked file suffices' presence on hiding list |netrw-mh|
 	   mm	Move marked files to marked-file target directory    |netrw-mm|
-	   mp	Print marked files                                   |netrw-mp|
 	   mr	Mark files using a shell-style |regexp|                |netrw-mr|
 	   mt	Current browsing directory becomes markfile target   |netrw-mt|
 	   mT	Apply ctags to marked files                          |netrw-mT|
@@ -2154,7 +2152,6 @@ The following netrw maps make use of marked files:
     |netrw-mF|	Unmark marked files
     |netrw-mg|	Apply vimgrep to marked files
     |netrw-mm|	Move marked files to target
-    |netrw-mp|	Print marked files
     |netrw-ms|	Netrw will source marked files
     |netrw-mt|	Set target for |netrw-mm| and |netrw-mc|
     |netrw-mT|	Generate tags using marked files
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 9075d60b1b..243e8579e0 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1333,7 +1333,7 @@ is a List with arguments.
 Function references are most useful in combination with a Dictionary, as is
 explained in the next section.
 
-More information about defining your own functions here: |user-functions|.
+More information about defining your own functions here: |user-function|.
 
 ==============================================================================
 *41.8*	Lists and Dictionaries
-- 
cgit 


From c7e7f1d4b4b62c75bb54e652f25c6c6b8785a7f4 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Wed, 28 Jun 2023 03:05:09 +0900
Subject: fix(treesitter): make foldexpr work without highlighting (#24167)

Problem: Treesitter fold is not updated if treesitter hightlight is not
active. More precisely, updating folds requires `LanguageTree:parse()`.

Solution: Call `parse()` before computing folds and compute folds when
lines are added/removed.

This doesn't guarantee correctness of the folds, because some changes
that don't add/remove line won't update the folds even if they should
(e.g. adding pair of braces). But it is good enough for most cases,
while not introducing big overhead.

Also, if highlighting is active, it is likely that
`TSHighlighter._on_buf` already ran `parse()` (or vice versa).
---
 runtime/lua/vim/treesitter/_fold.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index a8f8c7967e..d308657237 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -162,9 +162,7 @@ local function get_folds_levels(bufnr, info, srow, erow)
 
   local parser = ts.get_parser(bufnr)
 
-  if not parser:is_valid() then
-    return
-  end
+  parser:parse()
 
   parser:for_each_tree(function(tree, ltree)
     local query = ts.query.get(ltree:lang(), 'folds')
@@ -283,10 +281,12 @@ local function on_bytes(bufnr, foldinfo, start_row, old_row, new_row)
   local end_row_old = start_row + old_row
   local end_row_new = start_row + new_row
 
-  if new_row < old_row then
-    foldinfo:remove_range(end_row_new, end_row_old)
-  elseif new_row > old_row then
-    foldinfo:add_range(start_row, end_row_new)
+  if new_row ~= old_row then
+    if new_row < old_row then
+      foldinfo:remove_range(end_row_new, end_row_old)
+    else
+      foldinfo:add_range(start_row, end_row_new)
+    end
     schedule_if_loaded(bufnr, function()
       get_folds_levels(bufnr, foldinfo, start_row, end_row_new)
       recompute_folds()
-- 
cgit 


From e85e7fc7bcccfa3b8f9e52ec4d6cb21591b50468 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Wed, 28 Jun 2023 03:05:44 +0900
Subject: fix(treesitter): handle empty region when logging (#24173)

---
 runtime/lua/vim/treesitter/languagetree.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index cabfa8ccc0..bf6333aaa4 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -447,6 +447,9 @@ end
 ---@private
 ---@param region Range6[]
 local function region_tostr(region)
+  if #region == 0 then
+    return '[]'
+  end
   local srow, scol = region[1][1], region[1][2]
   local erow, ecol = region[#region][4], region[#region][5]
   return string.format('[%d:%d-%d:%d]', srow, scol, erow, ecol)
-- 
cgit 


From 421c66f741bf4ed4de6bf15df19160df0f90db4b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 29 Jun 2023 07:04:46 +0800
Subject: vim-patch:9.0.1671: Termdebug: error with more than 99 breakpoints
 (#24194)

Problem:    Termdebug: error with more than 99 breakpoints.
Solution:   Use a different sign for breakpoint 100 and over. (closes vim/vim#12589,
            closes vim/vim#12588)

https://github.com/vim/vim/commit/e7d9ca2b3bf99b0b759be8952e02c77110a354c1

Co-authored-by: skywind3000 <skywind3000@163.com>
---
 runtime/doc/nvim_terminal_emulator.txt               | 14 ++++++++++++++
 runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 12 +++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index aa37161d34..bbcc686207 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -493,6 +493,20 @@ If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_popup = 0
 
 
+Change default signs ~
+							*termdebug_signs*
+Termdebug uses the last two characters of the breakpoint ID in the
+signcolumn to represent breakpoints. For example, breakpoint ID 133
+will be displayed as `33`.
+
+If you want to customize the breakpoint signs: >vim
+	let g:termdebug_config['sign'] = '>>'
+If there is no g:terminal_config yet you can use: >vim
+	let g:termdebug_config = {'sign': '>>'}
+
+After this, breakpoints will be displayed as `>>` in the signcolumn.
+
+
 Vim window width ~
 							*termdebug_wide*
 To change the width of the Vim window when debugging starts and use a vertical
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index d4b49e85c8..e8b78b3f5f 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -1543,8 +1543,18 @@ func s:CreateBreakpoint(id, subid, enabled)
     else
       let hiName = "debugBreakpoint"
     endif
+    let label = ''
+    if exists('g:termdebug_config')
+      let label = get(g:termdebug_config, 'sign', '')
+    endif
+    if label == ''
+      let label = substitute(nr, '\..*', '', '')
+      if strlen(label) > 2
+        let label = strpart(label, strlen(label) - 2)
+      endif
+    endif
     call sign_define('debugBreakpoint' .. nr,
-          \ #{text: substitute(nr, '\..*', '', ''),
+          \ #{text: strpart(label, 0, 2),
           \ texthl: hiName})
   endif
 endfunc
-- 
cgit 


From 7968322e7a20b557631f4b496751658e80f6e7b0 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Thu, 29 Jun 2023 19:56:29 +0530
Subject: fix(lsp): inlay_hint nil reference error #24202

Problem:
vim_lsp_inlayhint: Error executing lua: .../lsp/_inlay_hint.lua:249: attempt to index field 'applied' (a nil value)

Solution:
Assign {} to bufstates.applied in on_reload

fixes #24172
---
 runtime/lua/vim/lsp/_inlay_hint.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
index 84794841ae..ccf1b5cca4 100644
--- a/runtime/lua/vim/lsp/_inlay_hint.lua
+++ b/runtime/lua/vim/lsp/_inlay_hint.lua
@@ -188,7 +188,7 @@ function M.enable(bufnr)
       on_reload = function(_, cb_bufnr)
         clear(cb_bufnr)
         if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
-          bufstates[cb_bufnr] = { enabled = true }
+          bufstates[cb_bufnr] = { enabled = true, applied = {} }
         end
         M.refresh({ bufnr = cb_bufnr })
       end,
-- 
cgit 


From 8758c6fb875ff5446c0dff2166e9c3392c2c31d6 Mon Sep 17 00:00:00 2001
From: Frede <frederikbraendstrup@gmail.com>
Date: Thu, 29 Jun 2023 23:14:14 +0200
Subject: feat(defaults): set g:netrw_use_errorwindow = 0 #24179

Problem:
netrw uses a bespoke window to show messages.

Solution:
change the default so that netrw uses normal vim :echoerr
---
 runtime/autoload/netrw.vim | 6 ++----
 runtime/doc/pi_netrw.txt   | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index c9f66f7927..be170d8aec 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -211,10 +211,8 @@ let g:netrw_localmovecmdopt    = ""
 
 " ---------------------------------------------------------------------
 " Default values for netrw's global protocol variables {{{2
-if (v:version > 802 || (v:version == 802 && has("patch486"))) && has("balloon_eval") && !exists("s:initbeval") && !exists("g:netrw_nobeval") && has("syntax") && exists("g:syntax_on") && has("mouse")
-  call s:NetrwInit("g:netrw_use_errorwindow",2)
-else
-  call s:NetrwInit("g:netrw_use_errorwindow",1)
+if !exists("g:netrw_use_errorwindow")
+  let g:netrw_use_errorwindow = 0
 endif
 
 if !exists("g:netrw_dav_cmd")
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index dfe9032506..85ac290361 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -439,12 +439,10 @@ settings are described below, in |netrw-browser-options|, and in
 
  *g:netrw_use_errorwindow* =2: messages from netrw will use a popup window
 			     Move the mouse and pause to remove the popup window.
-			     (default value if popup windows are available)
 			 =1 : messages from netrw will use a separate one
 			      line window.  This window provides reliable
 			      delivery of messages.
-			     (default value if popup windows are not available)
-			 =0 : messages from netrw will use echoerr ;
+			 =0 : (default) messages from netrw will use echoerr ;
 			      messages don't always seem to show up this
 			      way, but one doesn't have to quit the window.
 
-- 
cgit 


From d55d7646c129a9afe1da3a61813bb365d178c421 Mon Sep 17 00:00:00 2001
From: NAKAI Tsuyoshi <82267684+uga-rosa@users.noreply.github.com>
Date: Fri, 30 Jun 2023 10:38:28 +0900
Subject: docs(luaref): fix tags for constants (#24203)

---
 runtime/doc/luaref.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index 8a1ba88a96..dbf2f0de79 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -4361,7 +4361,7 @@ math.frexp({x})                                                   *math.frexp()*
         absolute value of `m` is in the range `[0.5, 1)` (or zero when {x} is
         zero).
 
-math.huge                                                          *math.huge()*
+math.huge                                                            *math.huge*
         The value `HUGE_VAL`, a value larger than or equal to any other
         numerical value.
 
@@ -4384,7 +4384,7 @@ math.modf({x})                                                     *math.modf()*
         Returns two numbers, the integral part of {x} and the fractional part
         of {x}.
 
-math.pi                                                              *math.pi()*
+math.pi                                                                *math.pi*
         The value of `pi`.
 
 math.pow({x}, {y})                                                  *math.pow()*
-- 
cgit 


From 37079fca58f396fd866dc7b7d87a0100c17ee760 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Fri, 30 Jun 2023 11:33:28 +0200
Subject: feat(lsp): move inlay_hint() to vim.lsp (#24130)

Allows to keep more functions hidden and gives a path forward for
further inlay_hint related functions - like applying textEdits.

See https://github.com/neovim/neovim/pull/23984#pullrequestreview-1486624668
---
 runtime/doc/lsp.txt                 |  14 +-
 runtime/doc/news.txt                |   2 +-
 runtime/lua/vim/lsp.lua             |   7 +
 runtime/lua/vim/lsp/_inlay_hint.lua | 284 --------------------------------
 runtime/lua/vim/lsp/buf.lua         |  15 --
 runtime/lua/vim/lsp/handlers.lua    |  20 +--
 runtime/lua/vim/lsp/inlay_hint.lua  | 313 ++++++++++++++++++++++++++++++++++++
 7 files changed, 331 insertions(+), 324 deletions(-)
 delete mode 100644 runtime/lua/vim/lsp/_inlay_hint.lua
 create mode 100644 runtime/lua/vim/lsp/inlay_hint.lua

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 42600e405c..95cbd211bf 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -810,6 +810,13 @@ get_log_path()                                        *vim.lsp.get_log_path()*
     Return: ~
         (string) path to log file
 
+inlay_hint({bufnr}, {enable})                           *vim.lsp.inlay_hint()*
+    Enable/disable/toggle inlay hints for a buffer
+
+    Parameters: ~
+      • {bufnr}   (integer) Buffer handle, or 0 for current
+      • {enable}  (boolean|nil) true/false to enable/disable, nil to toggle
+
 omnifunc({findstart}, {base})                             *vim.lsp.omnifunc()*
     Implements 'omnifunc' compatible LSP completion.
 
@@ -1227,13 +1234,6 @@ incoming_calls()                                *vim.lsp.buf.incoming_calls()*
     window. If the symbol can resolve to multiple items, the user can pick one
     in the |inputlist()|.
 
-inlay_hint({bufnr}, {enable})                       *vim.lsp.buf.inlay_hint()*
-    Enable/disable/toggle inlay hints for a buffer
-
-    Parameters: ~
-      • {bufnr}   (integer) Buffer handle, or 0 for current
-      • {enable}  (boolean|nil) true/false to enable/disable, nil to toggle
-
 list_workspace_folders()                *vim.lsp.buf.list_workspace_folders()*
     List workspace folders.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 153441b0a5..0a9b926b7f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -98,7 +98,7 @@ The following new APIs and features were added.
 
 • |nvim_set_keymap()| and |nvim_del_keymap()| now support abbreviations.
 
-• Implemented LSP inlay hints: |vim.lsp.buf.inlay_hint()|
+• Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
   https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
 
 ==============================================================================
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 1e5ce8fa10..ca4851f8d7 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -2474,6 +2474,13 @@ function lsp.with(handler, override_config)
   end
 end
 
+--- Enable/disable/toggle inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@param enable (boolean|nil) true/false to enable/disable, nil to toggle
+function lsp.inlay_hint(bufnr, enable)
+  return require('vim.lsp.inlay_hint')(bufnr, enable)
+end
+
 --- Helper function to use when implementing a handler.
 --- This will check that all of the keys in the user configuration
 --- are valid keys and make sense to include for this handler.
diff --git a/runtime/lua/vim/lsp/_inlay_hint.lua b/runtime/lua/vim/lsp/_inlay_hint.lua
deleted file mode 100644
index ccf1b5cca4..0000000000
--- a/runtime/lua/vim/lsp/_inlay_hint.lua
+++ /dev/null
@@ -1,284 +0,0 @@
-local util = require('vim.lsp.util')
-local log = require('vim.lsp.log')
-local api = vim.api
-local M = {}
-
----@class lsp._inlay_hint.bufstate
----@field version integer
----@field client_hint table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
----@field enabled boolean Whether inlay hints are enabled for the buffer
----@field timer uv.uv_timer_t? Debounce timer associated with the buffer
----@field applied table<integer, integer> Last version of hints applied to this line
-
----@type table<integer, lsp._inlay_hint.bufstate>
-local bufstates = {}
-
-local namespace = api.nvim_create_namespace('vim_lsp_inlayhint')
-local augroup = api.nvim_create_augroup('vim_lsp_inlayhint', {})
-
---- Reset the request debounce timer of a buffer
----@private
-local function reset_timer(reset_bufnr)
-  local timer = bufstates[reset_bufnr].timer
-  if timer then
-    bufstates[reset_bufnr].timer = nil
-    if not timer:is_closing() then
-      timer:stop()
-      timer:close()
-    end
-  end
-end
-
---- |lsp-handler| for the method `textDocument/inlayHint`
---- Store hints for a specific buffer and client
----@private
-function M.on_inlayhint(err, result, ctx, _)
-  if err then
-    local _ = log.error() and log.error('inlayhint', err)
-    return
-  end
-  local bufnr = ctx.bufnr
-  if util.buf_versions[bufnr] ~= ctx.version then
-    return
-  end
-  local client_id = ctx.client_id
-  if not result then
-    return
-  end
-  local bufstate = bufstates[bufnr]
-  if not (bufstate.client_hint and bufstate.version) then
-    bufstate.client_hint = vim.defaulttable()
-    bufstate.version = ctx.version
-  end
-  local hints_by_client = bufstate.client_hint
-  local client = vim.lsp.get_client_by_id(client_id)
-
-  local new_hints_by_lnum = vim.defaulttable()
-  local num_unprocessed = #result
-  if num_unprocessed == 0 then
-    hints_by_client[client_id] = {}
-    bufstate.version = ctx.version
-    api.nvim__buf_redraw_range(bufnr, 0, -1)
-    return
-  end
-
-  local lines = api.nvim_buf_get_lines(bufnr, 0, -1, false)
-  ---@private
-  local function pos_to_byte(position)
-    local col = position.character
-    if col > 0 then
-      local line = lines[position.line + 1] or ''
-      local ok, convert_result
-      ok, convert_result = pcall(util._str_byteindex_enc, line, col, client.offset_encoding)
-      if ok then
-        return convert_result
-      end
-      return math.min(#line, col)
-    end
-    return col
-  end
-
-  for _, hint in ipairs(result) do
-    local lnum = hint.position.line
-    hint.position.character = pos_to_byte(hint.position)
-    table.insert(new_hints_by_lnum[lnum], hint)
-  end
-
-  hints_by_client[client_id] = new_hints_by_lnum
-  bufstate.version = ctx.version
-  api.nvim__buf_redraw_range(bufnr, 0, -1)
-end
-
----@private
-local function resolve_bufnr(bufnr)
-  return bufnr > 0 and bufnr or api.nvim_get_current_buf()
-end
-
---- Refresh inlay hints for a buffer
----
----@param opts (nil|table) Optional arguments
----  - bufnr (integer, default: 0): Buffer whose hints to refresh
----  - only_visible (boolean, default: false): Whether to only refresh hints for the visible regions of the buffer
----
----@private
-function M.refresh(opts)
-  opts = opts or {}
-  local bufnr = resolve_bufnr(opts.bufnr or 0)
-  local bufstate = bufstates[bufnr]
-  if not (bufstate and bufstate.enabled) then
-    return
-  end
-  local only_visible = opts.only_visible or false
-  local buffer_windows = {}
-  for _, winid in ipairs(api.nvim_list_wins()) do
-    if api.nvim_win_get_buf(winid) == bufnr then
-      table.insert(buffer_windows, winid)
-    end
-  end
-  for _, window in ipairs(buffer_windows) do
-    local first = vim.fn.line('w0', window)
-    local last = vim.fn.line('w$', window)
-    local params = {
-      textDocument = util.make_text_document_params(bufnr),
-      range = {
-        start = { line = first - 1, character = 0 },
-        ['end'] = { line = last, character = 0 },
-      },
-    }
-    vim.lsp.buf_request(bufnr, 'textDocument/inlayHint', params)
-  end
-  if not only_visible then
-    local params = {
-      textDocument = util.make_text_document_params(bufnr),
-      range = {
-        start = { line = 0, character = 0 },
-        ['end'] = { line = api.nvim_buf_line_count(bufnr), character = 0 },
-      },
-    }
-    vim.lsp.buf_request(bufnr, 'textDocument/inlayHint', params)
-  end
-end
-
---- Clear inlay hints
----@param bufnr (integer) Buffer handle, or 0 for current
----@private
-local function clear(bufnr)
-  bufnr = resolve_bufnr(bufnr)
-  if not bufstates[bufnr] then
-    return
-  end
-  reset_timer(bufnr)
-  local bufstate = bufstates[bufnr]
-  local client_lens = (bufstate or {}).client_hint or {}
-  local client_ids = vim.tbl_keys(client_lens)
-  for _, iter_client_id in ipairs(client_ids) do
-    if bufstate then
-      bufstate.client_hint[iter_client_id] = {}
-    end
-  end
-  api.nvim_buf_clear_namespace(bufnr, namespace, 0, -1)
-  api.nvim__buf_redraw_range(bufnr, 0, -1)
-end
-
----@private
-local function make_request(request_bufnr)
-  reset_timer(request_bufnr)
-  M.refresh({ bufnr = request_bufnr })
-end
-
---- Enable inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
----@private
-function M.enable(bufnr)
-  bufnr = resolve_bufnr(bufnr)
-  local bufstate = bufstates[bufnr]
-  if not (bufstate and bufstate.enabled) then
-    bufstates[bufnr] = { enabled = true, timer = nil, applied = {} }
-    M.refresh({ bufnr = bufnr })
-    api.nvim_buf_attach(bufnr, true, {
-      on_lines = function(_, cb_bufnr)
-        if not bufstates[cb_bufnr].enabled then
-          return true
-        end
-        reset_timer(cb_bufnr)
-        bufstates[cb_bufnr].timer = vim.defer_fn(function()
-          make_request(cb_bufnr)
-        end, 200)
-      end,
-      on_reload = function(_, cb_bufnr)
-        clear(cb_bufnr)
-        if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
-          bufstates[cb_bufnr] = { enabled = true, applied = {} }
-        end
-        M.refresh({ bufnr = cb_bufnr })
-      end,
-      on_detach = function(_, cb_bufnr)
-        clear(cb_bufnr)
-        bufstates[cb_bufnr] = nil
-      end,
-    })
-    api.nvim_create_autocmd('LspDetach', {
-      buffer = bufnr,
-      callback = function(opts)
-        clear(opts.buf)
-      end,
-      once = true,
-      group = augroup,
-    })
-  end
-end
-
---- Disable inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
----@private
-function M.disable(bufnr)
-  bufnr = resolve_bufnr(bufnr)
-  if bufstates[bufnr] and bufstates[bufnr].enabled then
-    clear(bufnr)
-    bufstates[bufnr].enabled = nil
-    bufstates[bufnr].timer = nil
-  end
-end
-
---- Toggle inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
----@private
-function M.toggle(bufnr)
-  bufnr = resolve_bufnr(bufnr)
-  local bufstate = bufstates[bufnr]
-  if bufstate and bufstate.enabled then
-    M.disable(bufnr)
-  else
-    M.enable(bufnr)
-  end
-end
-
-api.nvim_set_decoration_provider(namespace, {
-  on_win = function(_, _, bufnr, topline, botline)
-    local bufstate = bufstates[bufnr]
-    if not bufstate then
-      return
-    end
-
-    if bufstate.version ~= util.buf_versions[bufnr] then
-      return
-    end
-    local hints_by_client = bufstate.client_hint
-
-    for lnum = topline, botline do
-      if bufstate.applied[lnum] ~= bufstate.version then
-        api.nvim_buf_clear_namespace(bufnr, namespace, lnum, lnum + 1)
-        for _, hints_by_lnum in pairs(hints_by_client) do
-          local line_hints = hints_by_lnum[lnum] or {}
-          for _, hint in pairs(line_hints) do
-            local text = ''
-            if type(hint.label) == 'string' then
-              text = hint.label
-            else
-              for _, part in ipairs(hint.label) do
-                text = text .. part.value
-              end
-            end
-            local vt = {}
-            if hint.paddingLeft then
-              vt[#vt + 1] = { ' ' }
-            end
-            vt[#vt + 1] = { text, 'LspInlayHint' }
-            if hint.paddingRight then
-              vt[#vt + 1] = { ' ' }
-            end
-            api.nvim_buf_set_extmark(bufnr, namespace, lnum, hint.position.character, {
-              virt_text_pos = 'inline',
-              ephemeral = false,
-              virt_text = vt,
-              hl_mode = 'combine',
-            })
-          end
-        end
-        bufstate.applied[lnum] = bufstate.version
-      end
-    end
-  end,
-})
-
-return M
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index c2e0179cc4..0369725216 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -796,19 +796,4 @@ function M.execute_command(command_params)
   request('workspace/executeCommand', command_params)
 end
 
---- Enable/disable/toggle inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
----@param enable (boolean|nil) true/false to enable/disable, nil to toggle
-function M.inlay_hint(bufnr, enable)
-  vim.validate({ enable = { enable, { 'boolean', 'nil' } }, bufnr = { bufnr, 'number' } })
-  local inlay_hint = require('vim.lsp._inlay_hint')
-  if enable then
-    inlay_hint.enable(bufnr)
-  elseif enable == false then
-    inlay_hint.disable(bufnr)
-  else
-    inlay_hint.toggle(bufnr)
-  end
-end
-
 return M
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 284e3ef2d0..625a2ed282 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -220,7 +220,7 @@ M['textDocument/codeLens'] = function(...)
 end
 
 M['textDocument/inlayHint'] = function(...)
-  return require('vim.lsp._inlay_hint').on_inlayhint(...)
+  return require('vim.lsp.inlay_hint').on_inlayhint(...)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_references
@@ -617,22 +617,8 @@ M['window/showDocument'] = function(_, result, ctx, _)
 end
 
 ---@see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_inlayHint_refresh
-M['workspace/inlayHint/refresh'] = function(err, _, ctx)
-  local inlay_hint = require('vim.lsp._inlay_hint')
-  if err then
-    return vim.NIL
-  end
-
-  for _, bufnr in ipairs(vim.lsp.get_buffers_by_client_id(ctx.client_id)) do
-    for _, winid in ipairs(api.nvim_list_wins()) do
-      if api.nvim_win_get_buf(winid) == bufnr then
-        inlay_hint.refresh({ bufnr = bufnr })
-        break
-      end
-    end
-  end
-
-  return vim.NIL
+M['workspace/inlayHint/refresh'] = function(err, result, ctx, config)
+  return require('vim.lsp.inlay_hint').on_refresh(err, result, ctx, config)
 end
 
 -- Add boilerplate error validation and logging for all of these.
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
new file mode 100644
index 0000000000..1af18bbc61
--- /dev/null
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -0,0 +1,313 @@
+local util = require('vim.lsp.util')
+local log = require('vim.lsp.log')
+local api = vim.api
+local M = {}
+
+---@class lsp._inlay_hint.bufstate
+---@field version integer
+---@field client_hint table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
+---@field enabled boolean Whether inlay hints are enabled for the buffer
+---@field timer uv.uv_timer_t? Debounce timer associated with the buffer
+---@field applied table<integer, integer> Last version of hints applied to this line
+
+---@type table<integer, lsp._inlay_hint.bufstate>
+local bufstates = {}
+
+local namespace = api.nvim_create_namespace('vim_lsp_inlayhint')
+local augroup = api.nvim_create_augroup('vim_lsp_inlayhint', {})
+
+--- Reset the request debounce timer of a buffer
+---@private
+local function reset_timer(reset_bufnr)
+  local timer = bufstates[reset_bufnr].timer
+  if timer then
+    bufstates[reset_bufnr].timer = nil
+    if not timer:is_closing() then
+      timer:stop()
+      timer:close()
+    end
+  end
+end
+
+--- |lsp-handler| for the method `textDocument/inlayHint`
+--- Store hints for a specific buffer and client
+---@private
+function M.on_inlayhint(err, result, ctx, _)
+  if err then
+    local _ = log.error() and log.error('inlayhint', err)
+    return
+  end
+  local bufnr = ctx.bufnr
+  if util.buf_versions[bufnr] ~= ctx.version then
+    return
+  end
+  local client_id = ctx.client_id
+  if not result then
+    return
+  end
+  local bufstate = bufstates[bufnr]
+  if not (bufstate.client_hint and bufstate.version) then
+    bufstate.client_hint = vim.defaulttable()
+    bufstate.version = ctx.version
+  end
+  local hints_by_client = bufstate.client_hint
+  local client = vim.lsp.get_client_by_id(client_id)
+
+  local new_hints_by_lnum = vim.defaulttable()
+  local num_unprocessed = #result
+  if num_unprocessed == 0 then
+    hints_by_client[client_id] = {}
+    bufstate.version = ctx.version
+    api.nvim__buf_redraw_range(bufnr, 0, -1)
+    return
+  end
+
+  local lines = api.nvim_buf_get_lines(bufnr, 0, -1, false)
+  ---@private
+  local function pos_to_byte(position)
+    local col = position.character
+    if col > 0 then
+      local line = lines[position.line + 1] or ''
+      local ok, convert_result
+      ok, convert_result = pcall(util._str_byteindex_enc, line, col, client.offset_encoding)
+      if ok then
+        return convert_result
+      end
+      return math.min(#line, col)
+    end
+    return col
+  end
+
+  for _, hint in ipairs(result) do
+    local lnum = hint.position.line
+    hint.position.character = pos_to_byte(hint.position)
+    table.insert(new_hints_by_lnum[lnum], hint)
+  end
+
+  hints_by_client[client_id] = new_hints_by_lnum
+  bufstate.version = ctx.version
+  api.nvim__buf_redraw_range(bufnr, 0, -1)
+end
+
+---@private
+local function resolve_bufnr(bufnr)
+  return bufnr > 0 and bufnr or api.nvim_get_current_buf()
+end
+
+--- Refresh inlay hints for a buffer
+---
+---@param opts (nil|table) Optional arguments
+---  - bufnr (integer, default: 0): Buffer whose hints to refresh
+---  - only_visible (boolean, default: false): Whether to only refresh hints for the visible regions of the buffer
+---
+---@private
+local function refresh(opts)
+  opts = opts or {}
+  local bufnr = resolve_bufnr(opts.bufnr or 0)
+  local bufstate = bufstates[bufnr]
+  if not (bufstate and bufstate.enabled) then
+    return
+  end
+  local only_visible = opts.only_visible or false
+  local buffer_windows = {}
+  for _, winid in ipairs(api.nvim_list_wins()) do
+    if api.nvim_win_get_buf(winid) == bufnr then
+      table.insert(buffer_windows, winid)
+    end
+  end
+  for _, window in ipairs(buffer_windows) do
+    local first = vim.fn.line('w0', window)
+    local last = vim.fn.line('w$', window)
+    local params = {
+      textDocument = util.make_text_document_params(bufnr),
+      range = {
+        start = { line = first - 1, character = 0 },
+        ['end'] = { line = last, character = 0 },
+      },
+    }
+    vim.lsp.buf_request(bufnr, 'textDocument/inlayHint', params)
+  end
+  if not only_visible then
+    local params = {
+      textDocument = util.make_text_document_params(bufnr),
+      range = {
+        start = { line = 0, character = 0 },
+        ['end'] = { line = api.nvim_buf_line_count(bufnr), character = 0 },
+      },
+    }
+    vim.lsp.buf_request(bufnr, 'textDocument/inlayHint', params)
+  end
+end
+
+--- |lsp-handler| for the method `textDocument/inlayHint/refresh`
+---@private
+function M.on_refresh(err, _, ctx, _)
+  if err then
+    return vim.NIL
+  end
+  for _, bufnr in ipairs(vim.lsp.get_buffers_by_client_id(ctx.client_id)) do
+    for _, winid in ipairs(api.nvim_list_wins()) do
+      if api.nvim_win_get_buf(winid) == bufnr then
+        refresh({ bufnr = bufnr })
+        break
+      end
+    end
+  end
+
+  return vim.NIL
+end
+
+--- Clear inlay hints
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@private
+local function clear(bufnr)
+  bufnr = resolve_bufnr(bufnr)
+  if not bufstates[bufnr] then
+    return
+  end
+  reset_timer(bufnr)
+  local bufstate = bufstates[bufnr]
+  local client_lens = (bufstate or {}).client_hint or {}
+  local client_ids = vim.tbl_keys(client_lens)
+  for _, iter_client_id in ipairs(client_ids) do
+    if bufstate then
+      bufstate.client_hint[iter_client_id] = {}
+    end
+  end
+  api.nvim_buf_clear_namespace(bufnr, namespace, 0, -1)
+  api.nvim__buf_redraw_range(bufnr, 0, -1)
+end
+
+---@private
+local function make_request(request_bufnr)
+  reset_timer(request_bufnr)
+  refresh({ bufnr = request_bufnr })
+end
+
+--- Enable inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@private
+local function enable(bufnr)
+  bufnr = resolve_bufnr(bufnr)
+  local bufstate = bufstates[bufnr]
+  if not (bufstate and bufstate.enabled) then
+    bufstates[bufnr] = { enabled = true, timer = nil, applied = {} }
+    refresh({ bufnr = bufnr })
+    api.nvim_buf_attach(bufnr, true, {
+      on_lines = function(_, cb_bufnr)
+        if not bufstates[cb_bufnr].enabled then
+          return true
+        end
+        reset_timer(cb_bufnr)
+        bufstates[cb_bufnr].timer = vim.defer_fn(function()
+          make_request(cb_bufnr)
+        end, 200)
+      end,
+      on_reload = function(_, cb_bufnr)
+        clear(cb_bufnr)
+        if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
+          bufstates[cb_bufnr] = { enabled = true, applied = {} }
+        end
+        refresh({ bufnr = cb_bufnr })
+      end,
+      on_detach = function(_, cb_bufnr)
+        clear(cb_bufnr)
+        bufstates[cb_bufnr] = nil
+      end,
+    })
+    api.nvim_create_autocmd('LspDetach', {
+      buffer = bufnr,
+      callback = function(opts)
+        clear(opts.buf)
+      end,
+      once = true,
+      group = augroup,
+    })
+  end
+end
+
+--- Disable inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@private
+local function disable(bufnr)
+  bufnr = resolve_bufnr(bufnr)
+  if bufstates[bufnr] and bufstates[bufnr].enabled then
+    clear(bufnr)
+    bufstates[bufnr].enabled = nil
+    bufstates[bufnr].timer = nil
+  end
+end
+
+--- Toggle inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@private
+local function toggle(bufnr)
+  bufnr = resolve_bufnr(bufnr)
+  local bufstate = bufstates[bufnr]
+  if bufstate and bufstate.enabled then
+    M.disable(bufnr)
+  else
+    M.enable(bufnr)
+  end
+end
+
+api.nvim_set_decoration_provider(namespace, {
+  on_win = function(_, _, bufnr, topline, botline)
+    local bufstate = bufstates[bufnr]
+    if not bufstate then
+      return
+    end
+
+    if bufstate.version ~= util.buf_versions[bufnr] then
+      return
+    end
+    local hints_by_client = bufstate.client_hint
+
+    for lnum = topline, botline do
+      if bufstate.applied[lnum] ~= bufstate.version then
+        api.nvim_buf_clear_namespace(bufnr, namespace, lnum, lnum + 1)
+        for _, hints_by_lnum in pairs(hints_by_client) do
+          local line_hints = hints_by_lnum[lnum] or {}
+          for _, hint in pairs(line_hints) do
+            local text = ''
+            if type(hint.label) == 'string' then
+              text = hint.label
+            else
+              for _, part in ipairs(hint.label) do
+                text = text .. part.value
+              end
+            end
+            local vt = {}
+            if hint.paddingLeft then
+              vt[#vt + 1] = { ' ' }
+            end
+            vt[#vt + 1] = { text, 'LspInlayHint' }
+            if hint.paddingRight then
+              vt[#vt + 1] = { ' ' }
+            end
+            api.nvim_buf_set_extmark(bufnr, namespace, lnum, hint.position.character, {
+              virt_text_pos = 'inline',
+              ephemeral = false,
+              virt_text = vt,
+              hl_mode = 'combine',
+            })
+          end
+        end
+        bufstate.applied[lnum] = bufstate.version
+      end
+    end
+  end,
+})
+
+return setmetatable(M, {
+  __call = function(_, bufnr, enable_)
+    vim.validate({ enable = { enable_, { 'boolean', 'nil' } }, bufnr = { bufnr, 'number' } })
+    if enable_ then
+      enable(bufnr)
+    elseif enable_ == false then
+      disable(bufnr)
+    else
+      toggle(bufnr)
+    end
+  end,
+})
-- 
cgit 


From d191bdf9d5e54722e28ddb0cccc8eb2312a234df Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Fri, 30 Jun 2023 17:12:58 +0530
Subject: fix(lsp): fix attempt to call non existent function (#24212)

Commit 37079fc moved inlay_hint to vim.lsp() but in the process did
missed converting a call to disable/enable which are now local.

Fixes the below error when trying to toggle inlay hints.

E5108: Error executing lua /usr/local/share/nvim/runtime/lua/vim/lsp/inlay_hint.lua:248: attempt to call field 'disable' (a nil value)
stack traceback:
        /usr/local/share/nvim/runtime/lua/vim/lsp/inlay_hint.lua:248: in function 'toggle'
        /usr/local/share/nvim/runtime/lua/vim/lsp/inlay_hint.lua:310: in function 'inlay_hint'
        [string ":lua"]:1: in main chunk
---
 runtime/lua/vim/lsp/inlay_hint.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index 1af18bbc61..f577a31696 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -245,9 +245,9 @@ local function toggle(bufnr)
   bufnr = resolve_bufnr(bufnr)
   local bufstate = bufstates[bufnr]
   if bufstate and bufstate.enabled then
-    M.disable(bufnr)
+    disable(bufnr)
   else
-    M.enable(bufnr)
+    enable(bufnr)
   end
 end
 
-- 
cgit 


From 11844dde81c41bded54f2383b57f8eef406f2736 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Jul 2023 11:08:06 +0200
Subject: feat(treesitter): bundle markdown parser and queries (#22481)

* bundle split Markdown parser from https://github.com/MDeiml/tree-sitter-markdown
* add queries from https://github.com/nvim-treesitter/nvim-treesitter/tree/main
* upstream `#trim!` and `#inject-language!` directives

Co-authored-by: dundargoc <gocdundar@gmail.com>
---
 runtime/doc/news.txt                           |  5 +-
 runtime/doc/treesitter.txt                     | 32 +++++++++
 runtime/lua/vim/treesitter/query.lua           | 60 ++++++++++++++++-
 runtime/queries/markdown/folds.scm             |  9 +++
 runtime/queries/markdown/highlights.scm        | 63 ++++++++++++++++++
 runtime/queries/markdown/injections.scm        | 26 ++++++++
 runtime/queries/markdown_inline/highlights.scm | 92 ++++++++++++++++++++++++++
 runtime/queries/markdown_inline/injections.scm |  8 +++
 8 files changed, 293 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/markdown/folds.scm
 create mode 100644 runtime/queries/markdown/highlights.scm
 create mode 100644 runtime/queries/markdown/injections.scm
 create mode 100644 runtime/queries/markdown_inline/highlights.scm
 create mode 100644 runtime/queries/markdown_inline/injections.scm

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 0a9b926b7f..5ee9cb7a14 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -101,6 +101,8 @@ The following new APIs and features were added.
 • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
   https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
 
+• Bundled Markdown parser for treesitter highlighting and folding.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
@@ -120,7 +122,8 @@ The following changes to existing APIs or features add new behavior.
   • Automatic linting of treesitter query files (see |ft-query-plugin|).
     Can be disabled via: >lua
       vim.g.query_lint_on = {}
-<  • Enabled treesitter highlighting for treesitter query files.
+<
+  • Enabled treesitter highlighting for treesitter query files.
 
 • The `workspace/didChangeWatchedFiles` LSP client capability is now enabled
   by default.
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 28ab3ecd8e..7539417197 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -292,7 +292,39 @@ The following directives are built in:
         Example: >query
             ((identifier) @constant (#offset! @constant 0 1 0 -1))
 <
+    `gsub!`                                          *treesitter-directive-gsub!*
+        Transforms the content of the node using a Lua pattern. This will set
+        a new `metadata[capture_id].text`.
 
+        Parameters: ~
+            {capture_id}
+            {pattern}
+
+        Example: >query
+            (#gsub! @_node ".*%.(.*)" "%1")
+<
+    `trim!`                                          *treesitter-directive-trim!*
+        Trim blank lines from the end of the node. This will set a new
+        `metadata[capture_id].range`.
+
+        Parameters: ~
+            {capture_id}
+
+        Example: >query
+            (#inject-language! @_lang)
+<
+    `inject-language!`                    *treesitter-directive-inject-language!*
+        Set the injection language from the node text, interpreted first as a
+        language name, then (if a parser is not found) a filetype. Custom
+        aliases can be added via |vim.treesitter.language.register()|. This
+        will set a new `metadata[capture_id]['injection.language']`.
+
+        Parameters: ~
+            {capture_id}
+
+        Example: >query
+            (#inject-language! @_lang)
+<
 Further directives can be added via |vim.treesitter.query.add_directive()|.
 Use |vim.treesitter.query.list_directives()| to list all available directives.
 
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 73b561c777..7f90fa10e8 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -475,7 +475,6 @@ local directive_handlers = {
       metadata[capture_id].range = range
     end
   end,
-
   -- Transform the content of the node
   -- Example: (#gsub! @_node ".*%.(.*)" "%1")
   ['gsub!'] = function(match, _, bufnr, pred, metadata)
@@ -497,6 +496,65 @@ local directive_handlers = {
 
     metadata[id].text = text:gsub(pattern, replacement)
   end,
+  -- Trim blank lines from end of the node
+  -- Example: (#trim! @fold)
+  -- TODO(clason): generalize to arbitrary whitespace removal
+  ['trim!'] = function(match, _, bufnr, pred, metadata)
+    local node = match[pred[2]]
+    if not node then
+      return
+    end
+
+    local start_row, start_col, end_row, end_col = node:range()
+
+    -- Don't trim if region ends in middle of a line
+    if end_col ~= 0 then
+      return
+    end
+
+    while true do
+      -- As we only care when end_col == 0, always inspect one line above end_row.
+      local end_line = vim.api.nvim_buf_get_lines(bufnr, end_row - 1, end_row, true)[1]
+
+      if end_line ~= '' then
+        break
+      end
+
+      end_row = end_row - 1
+    end
+
+    -- If this produces an invalid range, we just skip it.
+    if start_row < end_row or (start_row == end_row and start_col <= end_col) then
+      metadata.range = { start_row, start_col, end_row, end_col }
+    end
+  end,
+  -- Set injection language from node text, interpreted first as language and then as filetype
+  -- Example: (#inject-language! @_lang)
+  ['inject-language!'] = function(match, _, bufnr, pred, metadata)
+    local id = pred[2]
+    local node = match[id]
+    if not node then
+      return
+    end
+
+    -- TODO(clason): replace by refactored `ts.has_parser` API
+    local has_parser = function(lang)
+      return vim._ts_has_language(lang)
+        or #vim.api.nvim_get_runtime_file('parser/' .. lang .. '.*', false) > 0
+    end
+
+    local alias = vim.treesitter.get_node_text(node, bufnr, { metadata = metadata[id] })
+    if not alias then
+      return
+    elseif has_parser(alias) then
+      metadata['injection.language'] = alias
+    else
+      local lang = vim.treesitter.language.get_lang(alias)
+      if lang and has_parser(lang) then
+        metadata['injection.language'] = lang
+      end
+    end
+  end,
 }
 
 --- Adds a new predicate to be used in queries
diff --git a/runtime/queries/markdown/folds.scm b/runtime/queries/markdown/folds.scm
new file mode 100644
index 0000000000..5900f7ffbe
--- /dev/null
+++ b/runtime/queries/markdown/folds.scm
@@ -0,0 +1,9 @@
+(
+  [
+    (fenced_code_block)
+    (indented_code_block)
+    (list)
+    (section)
+  ] @fold
+  (#trim! @fold)
+)
diff --git a/runtime/queries/markdown/highlights.scm b/runtime/queries/markdown/highlights.scm
new file mode 100644
index 0000000000..e78d233cc6
--- /dev/null
+++ b/runtime/queries/markdown/highlights.scm
@@ -0,0 +1,63 @@
+;From MDeiml/tree-sitter-markdown & Helix
+(setext_heading (paragraph) @text.title.1 (setext_h1_underline) @text.title.1.marker)
+(setext_heading (paragraph) @text.title.2 (setext_h2_underline) @text.title.2.marker)
+
+(atx_heading (atx_h1_marker) @text.title.1.marker (inline) @text.title.1)
+(atx_heading (atx_h2_marker) @text.title.2.marker (inline) @text.title.2)
+(atx_heading (atx_h3_marker) @text.title.3.marker (inline) @text.title.3)
+(atx_heading (atx_h4_marker) @text.title.4.marker (inline) @text.title.4)
+(atx_heading (atx_h5_marker) @text.title.5.marker (inline) @text.title.5)
+(atx_heading (atx_h6_marker) @text.title.6.marker (inline) @text.title.6)
+
+(link_title) @text.literal
+(indented_code_block) @text.literal.block
+((fenced_code_block) @text.literal.block (#set! "priority" 90))
+
+(info_string) @label
+
+(pipe_table_header (pipe_table_cell) @text.title)
+
+(pipe_table_header "|" @punctuation.special)
+(pipe_table_row "|" @punctuation.special)
+(pipe_table_delimiter_row "|" @punctuation.special)
+(pipe_table_delimiter_cell) @punctuation.special
+
+[
+  (fenced_code_block_delimiter)
+] @punctuation.delimiter
+
+(code_fence_content) @none
+
+[
+  (link_destination)
+] @text.uri
+
+[
+  (link_label)
+] @text.reference
+
+[
+  (list_marker_plus)
+  (list_marker_minus)
+  (list_marker_star)
+  (list_marker_dot)
+  (list_marker_parenthesis)
+  (thematic_break)
+] @punctuation.special
+
+
+(task_list_marker_unchecked) @text.todo.unchecked
+(task_list_marker_checked) @text.todo.checked
+
+(block_quote) @text.quote
+
+[
+  (block_continuation)
+  (block_quote_marker)
+] @punctuation.special
+
+[
+  (backslash_escape)
+] @string.escape
+
+(inline) @spell
diff --git a/runtime/queries/markdown/injections.scm b/runtime/queries/markdown/injections.scm
new file mode 100644
index 0000000000..0bead6f4ac
--- /dev/null
+++ b/runtime/queries/markdown/injections.scm
@@ -0,0 +1,26 @@
+(fenced_code_block
+  (info_string
+    (language) @_lang)
+  (code_fence_content) @injection.content
+  (#inject-language! @_lang))
+
+((html_block) @injection.content 
+ (#set! injection.language "html")
+ (#set! injection.combined)
+ (#set! injection.include-children))
+
+((minus_metadata) @injection.content 
+ (#set! injection.language "yaml") 
+ (#offset! @injection.content 1 0 -1 0)
+ (#set! injection.include-children))
+
+((plus_metadata) @injection.content 
+ (#set! injection.language "toml") 
+ (#offset! @injection.content 1 0 -1 0)
+ (#set! injection.include-children))
+
+([
+  (inline)
+  (pipe_table_cell)
+ ] @injection.content
+ (#set! injection.language "markdown_inline"))
diff --git a/runtime/queries/markdown_inline/highlights.scm b/runtime/queries/markdown_inline/highlights.scm
new file mode 100644
index 0000000000..a70e34bb87
--- /dev/null
+++ b/runtime/queries/markdown_inline/highlights.scm
@@ -0,0 +1,92 @@
+;; From MDeiml/tree-sitter-markdown
+[
+  (code_span)
+  (link_title)
+] @text.literal @nospell
+
+[
+  (emphasis_delimiter)
+  (code_span_delimiter)
+] @punctuation.delimiter
+
+(emphasis) @text.emphasis
+
+(strong_emphasis) @text.strong
+
+(strikethrough) @text.strike
+
+[
+  (link_destination)
+  (uri_autolink)
+] @text.uri @nospell
+
+[
+  (link_label)
+  (link_text)
+  (image_description)
+] @text.reference
+
+[
+  (backslash_escape)
+  (hard_line_break)
+] @string.escape
+
+(image "!" @punctuation.special)
+(image ["[" "]" "(" ")"] @punctuation.bracket)
+(inline_link ["[" "]" "(" ")"] @punctuation.bracket)
+(shortcut_link ["[" "]"] @punctuation.bracket)
+
+; Conceal codeblock and text style markers
+([
+  (code_span_delimiter)
+  (emphasis_delimiter)
+] @conceal
+(#set! conceal ""))
+
+; Conceal inline links
+(inline_link
+  [
+    "["
+    "]"
+    "("
+    (link_destination)
+    ")"
+  ] @conceal
+  (#set! conceal ""))
+
+; Conceal image links
+(image
+  [
+    "!"
+    "["
+    "]"
+    "("
+    (link_destination)
+    ")"
+  ] @conceal
+  (#set! conceal ""))
+
+; Conceal full reference links
+(full_reference_link
+  [
+    "["
+    "]"
+    (link_label)
+  ] @conceal
+  (#set! conceal ""))
+
+; Conceal collapsed reference links
+(collapsed_reference_link
+  [
+    "["
+    "]"
+  ] @conceal
+  (#set! conceal ""))
+
+; Conceal shortcut links
+(shortcut_link
+  [
+    "["
+    "]"
+  ] @conceal
+  (#set! conceal ""))
diff --git a/runtime/queries/markdown_inline/injections.scm b/runtime/queries/markdown_inline/injections.scm
new file mode 100644
index 0000000000..f7aa19caff
--- /dev/null
+++ b/runtime/queries/markdown_inline/injections.scm
@@ -0,0 +1,8 @@
+((html_tag) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.combined)
+ (#set! injection.include-children))
+
+((latex_block) @injection.content
+ (#set! injection.language "latex")
+ (#set! injection.include-children))
-- 
cgit 


From 88c8803aa167806f32272e5f344af00b98a91f01 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Jul 2023 11:19:31 +0200
Subject: feat(treesitter): add python parser and queries

---
 runtime/doc/news.txt                  |   3 +-
 runtime/queries/python/folds.scm      |  28 +++
 runtime/queries/python/highlights.scm | 345 ++++++++++++++++++++++++++++++++++
 3 files changed, 375 insertions(+), 1 deletion(-)
 create mode 100644 runtime/queries/python/folds.scm
 create mode 100644 runtime/queries/python/highlights.scm

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 5ee9cb7a14..c76686dda1 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -101,7 +101,8 @@ The following new APIs and features were added.
 • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
   https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
 
-• Bundled Markdown parser for treesitter highlighting and folding.
+• Bundled treesitter parser and queries (highlight, folds) for Markdown and
+Python.
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
diff --git a/runtime/queries/python/folds.scm b/runtime/queries/python/folds.scm
new file mode 100644
index 0000000000..78e1e2c00d
--- /dev/null
+++ b/runtime/queries/python/folds.scm
@@ -0,0 +1,28 @@
+[
+  (function_definition)
+  (class_definition)
+
+  (while_statement)
+  (for_statement)
+  (if_statement)
+  (with_statement)
+  (try_statement)
+  (match_statement)
+
+  (import_from_statement)
+  (parameters)
+  (argument_list)
+
+  (parenthesized_expression)
+  (generator_expression)
+  (list_comprehension)
+  (set_comprehension)
+  (dictionary_comprehension)
+
+  (tuple)
+  (list)
+  (set)
+  (dictionary)
+
+  (string)
+] @fold
diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
new file mode 100644
index 0000000000..c18b748674
--- /dev/null
+++ b/runtime/queries/python/highlights.scm
@@ -0,0 +1,345 @@
+;; From tree-sitter-python licensed under MIT License
+; Copyright (c) 2016 Max Brunsfeld
+
+; Variables
+(identifier) @variable
+
+; Reset highlighting in f-string interpolations
+(interpolation) @none
+
+;; Identifier naming conventions
+((identifier) @type
+ (#lua-match? @type "^[A-Z].*[a-z]"))
+((identifier) @constant
+ (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+
+((identifier) @constant.builtin
+ (#lua-match? @constant.builtin "^__[a-zA-Z0-9_]*__$"))
+
+((identifier) @constant.builtin
+ (#any-of? @constant.builtin
+           ;; https://docs.python.org/3/library/constants.html
+           "NotImplemented"
+           "Ellipsis"
+           "quit"
+           "exit"
+           "copyright"
+           "credits"
+           "license"))
+
+((attribute
+    attribute: (identifier) @field)
+ (#lua-match? @field "^[%l_].*$"))
+
+((assignment
+  left: (identifier) @type.definition
+  (type (identifier) @_annotation))
+ (#eq? @_annotation "TypeAlias"))
+
+((assignment
+  left: (identifier) @type.definition
+  right: (call
+    function: (identifier) @_func))
+ (#any-of? @_func "TypeVar" "NewType"))
+
+; Function calls
+
+(call
+  function: (identifier) @function.call)
+
+(call
+  function: (attribute
+              attribute: (identifier) @method.call))
+
+((call
+   function: (identifier) @constructor)
+ (#lua-match? @constructor "^%u"))
+
+((call
+  function: (attribute
+              attribute: (identifier) @constructor))
+ (#lua-match? @constructor "^%u"))
+
+;; Decorators
+
+((decorator "@" @attribute)
+ (#set! "priority" 101))
+
+(decorator
+  (identifier) @attribute)
+(decorator
+  (attribute
+    attribute: (identifier) @attribute))
+(decorator
+  (call (identifier) @attribute))
+(decorator
+  (call (attribute
+          attribute: (identifier) @attribute)))
+
+((decorator
+  (identifier) @attribute.builtin)
+ (#any-of? @attribute.builtin "classmethod" "property"))
+
+;; Builtin functions
+
+((call
+  function: (identifier) @function.builtin)
+ (#any-of? @function.builtin
+          "abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray" "bytes" "callable" "chr" "classmethod"
+          "compile" "complex" "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec" "filter" "float" "format"
+          "frozenset" "getattr" "globals" "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance" "issubclass"
+          "iter" "len" "list" "locals" "map" "max" "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
+          "print" "property" "range" "repr" "reversed" "round" "set" "setattr" "slice" "sorted" "staticmethod" "str"
+          "sum" "super" "tuple" "type" "vars" "zip" "__import__"))
+
+;; Function definitions
+
+(function_definition
+  name: (identifier) @function)
+
+(type (identifier) @type)
+(type
+  (subscript
+    (identifier) @type)) ; type subscript: Tuple[int]
+
+((call
+  function: (identifier) @_isinstance
+  arguments: (argument_list
+    (_)
+    (identifier) @type))
+ (#eq? @_isinstance "isinstance"))
+
+;; Normal parameters
+(parameters
+  (identifier) @parameter)
+;; Lambda parameters
+(lambda_parameters
+  (identifier) @parameter)
+(lambda_parameters
+  (tuple_pattern
+    (identifier) @parameter))
+; Default parameters
+(keyword_argument
+  name: (identifier) @parameter)
+; Naming parameters on call-site
+(default_parameter
+  name: (identifier) @parameter)
+(typed_parameter
+  (identifier) @parameter)
+(typed_default_parameter
+  (identifier) @parameter)
+; Variadic parameters *args, **kwargs
+(parameters
+  (list_splat_pattern ; *args
+    (identifier) @parameter))
+(parameters
+  (dictionary_splat_pattern ; **kwargs
+    (identifier) @parameter))
+
+
+;; Literals
+
+(none) @constant.builtin
+[(true) (false)] @boolean
+((identifier) @variable.builtin
+ (#eq? @variable.builtin "self"))
+((identifier) @variable.builtin
+ (#eq? @variable.builtin "cls"))
+
+(integer) @number
+(float) @float
+
+(comment) @comment @spell
+
+((module . (comment) @preproc)
+  (#lua-match? @preproc "^#!/"))
+
+(string) @string
+(escape_sequence) @string.escape
+
+; doc-strings
+
+(module . (expression_statement (string) @string.documentation @spell))
+
+(class_definition
+  body:
+    (block
+      . (expression_statement (string) @string.documentation @spell)))
+
+(function_definition
+  body:
+    (block
+      . (expression_statement (string) @string.documentation @spell)))
+
+; Tokens
+
+[
+  "-"
+  "-="
+  ":="
+  "!="
+  "*"
+  "**"
+  "**="
+  "*="
+  "/"
+  "//"
+  "//="
+  "/="
+  "&"
+  "&="
+  "%"
+  "%="
+  "^"
+  "^="
+  "+"
+  "+="
+  "<"
+  "<<"
+  "<<="
+  "<="
+  "<>"
+  "="
+  "=="
+  ">"
+  ">="
+  ">>"
+  ">>="
+  "@"
+  "@="
+  "|"
+  "|="
+  "~"
+  "->"
+] @operator
+
+; Keywords
+[
+  "and"
+  "in"
+  "is"
+  "not"
+  "or"
+  "is not"
+  "not in"
+
+  "del"
+] @keyword.operator
+
+[
+  "def"
+  "lambda"
+] @keyword.function
+
+[
+  "assert"
+  "class"
+  "exec"
+  "global"
+  "nonlocal"
+  "pass"
+  "print"
+  "with"
+  "as"
+] @keyword
+
+[
+  "async"
+  "await"
+] @keyword.coroutine
+
+[
+  "return"
+  "yield"
+] @keyword.return
+(yield "from" @keyword.return)
+
+(future_import_statement
+  "from" @include
+  "__future__" @constant.builtin)
+(import_from_statement "from" @include)
+"import" @include
+
+(aliased_import "as" @include)
+
+["if" "elif" "else" "match" "case"] @conditional
+
+["for" "while" "break" "continue"] @repeat
+
+[
+  "try"
+  "except"
+  "except*"
+  "raise"
+  "finally"
+] @exception
+
+(raise_statement "from" @exception)
+
+(try_statement
+  (else_clause
+    "else" @exception))
+
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+
+(interpolation
+  "{" @punctuation.special
+  "}" @punctuation.special)
+
+(type_conversion) @function.macro
+
+["," "." ":" ";" (ellipsis)] @punctuation.delimiter
+
+;; Class definitions
+
+(class_definition name: (identifier) @type)
+
+(class_definition
+  body: (block
+          (function_definition
+            name: (identifier) @method)))
+
+(class_definition
+  superclasses: (argument_list
+                  (identifier) @type))
+
+((class_definition
+  body: (block
+          (expression_statement
+            (assignment
+              left: (identifier) @field))))
+ (#lua-match? @field "^%l.*$"))
+((class_definition
+  body: (block
+          (expression_statement
+            (assignment
+              left: (_
+                     (identifier) @field)))))
+ (#lua-match? @field "^%l.*$"))
+
+((class_definition
+  (block
+    (function_definition
+      name: (identifier) @constructor)))
+ (#any-of? @constructor "__new__" "__init__"))
+
+((identifier) @type.builtin
+ (#any-of? @type.builtin
+              ;; https://docs.python.org/3/library/exceptions.html
+              "BaseException" "Exception" "ArithmeticError" "BufferError" "LookupError" "AssertionError" "AttributeError"
+              "EOFError" "FloatingPointError" "GeneratorExit" "ImportError" "ModuleNotFoundError" "IndexError" "KeyError"
+              "KeyboardInterrupt" "MemoryError" "NameError" "NotImplementedError" "OSError" "OverflowError" "RecursionError"
+              "ReferenceError" "RuntimeError" "StopIteration" "StopAsyncIteration" "SyntaxError" "IndentationError" "TabError"
+              "SystemError" "SystemExit" "TypeError" "UnboundLocalError" "UnicodeError" "UnicodeEncodeError" "UnicodeDecodeError"
+              "UnicodeTranslateError" "ValueError" "ZeroDivisionError" "EnvironmentError" "IOError" "WindowsError"
+              "BlockingIOError" "ChildProcessError" "ConnectionError" "BrokenPipeError" "ConnectionAbortedError"
+              "ConnectionRefusedError" "ConnectionResetError" "FileExistsError" "FileNotFoundError" "InterruptedError"
+              "IsADirectoryError" "NotADirectoryError" "PermissionError" "ProcessLookupError" "TimeoutError" "Warning"
+              "UserWarning" "DeprecationWarning" "PendingDeprecationWarning" "SyntaxWarning" "RuntimeWarning"
+              "FutureWarning" "ImportWarning" "UnicodeWarning" "BytesWarning" "ResourceWarning"
+              ;; https://docs.python.org/3/library/stdtypes.html
+              "bool" "int" "float" "complex" "list" "tuple" "range" "str"
+              "bytes" "bytearray" "memoryview" "set" "frozenset" "dict" "type" "object"))
+
+;; Error
+(ERROR) @error
-- 
cgit 


From cb0a1a10b22463664b4aecd3aa25e262692c0cab Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 1 Jul 2023 11:22:19 +0200
Subject: feat(treesitter): add bash parser and queries

---
 runtime/doc/news.txt                |   4 +-
 runtime/queries/bash/folds.scm      |   8 ++
 runtime/queries/bash/highlights.scm | 145 ++++++++++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+), 2 deletions(-)
 create mode 100644 runtime/queries/bash/folds.scm
 create mode 100644 runtime/queries/bash/highlights.scm

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c76686dda1..58c338b225 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -101,8 +101,8 @@ The following new APIs and features were added.
 • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
   https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
 
-• Bundled treesitter parser and queries (highlight, folds) for Markdown and
-Python.
+• Bundled treesitter parser and queries (highlight, folds) for Markdown,
+Python, and Bash.
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
diff --git a/runtime/queries/bash/folds.scm b/runtime/queries/bash/folds.scm
new file mode 100644
index 0000000000..851c67eed4
--- /dev/null
+++ b/runtime/queries/bash/folds.scm
@@ -0,0 +1,8 @@
+[
+  (function_definition)
+  (if_statement)
+  (case_statement)
+  (for_statement)
+  (while_statement)
+  (c_style_for_statement)
+] @fold
diff --git a/runtime/queries/bash/highlights.scm b/runtime/queries/bash/highlights.scm
new file mode 100644
index 0000000000..23bf03e697
--- /dev/null
+++ b/runtime/queries/bash/highlights.scm
@@ -0,0 +1,145 @@
+(simple_expansion) @none
+(expansion
+  "${" @punctuation.special
+  "}" @punctuation.special) @none
+[
+ "("
+ ")"
+ "(("
+ "))"
+ "{"
+ "}"
+ "["
+ "]"
+ "[["
+ "]]"
+ ] @punctuation.bracket
+
+[
+ ";"
+ ";;"
+ (heredoc_start)
+ ] @punctuation.delimiter
+
+[
+ "$"
+] @punctuation.special
+
+[
+ ">"
+ ">>"
+ "<"
+ "<<"
+ "&"
+ "&&"
+ "|"
+ "||"
+ "="
+ "=~"
+ "=="
+ "!="
+ ] @operator
+
+[
+ (string)
+ (raw_string)
+ (ansi_c_string)
+ (heredoc_body)
+] @string @spell
+
+(variable_assignment (word) @string)
+
+[
+ "if"
+ "then"
+ "else"
+ "elif"
+ "fi"
+ "case"
+ "in"
+ "esac"
+ ] @conditional
+
+[
+ "for"
+ "do"
+ "done"
+ "select"
+ "until"
+ "while"
+ ] @repeat
+
+[
+ "declare"
+ "export"
+ "local"
+ "readonly"
+ "unset"
+ ] @keyword
+
+"function" @keyword.function
+
+(special_variable_name) @constant
+
+; trap -l
+((word) @constant.builtin
+ (#match? @constant.builtin "^SIG(HUP|INT|QUIT|ILL|TRAP|ABRT|BUS|FPE|KILL|USR[12]|SEGV|PIPE|ALRM|TERM|STKFLT|CHLD|CONT|STOP|TSTP|TT(IN|OU)|URG|XCPU|XFSZ|VTALRM|PROF|WINCH|IO|PWR|SYS|RTMIN([+]([1-9]|1[0-5]))?|RTMAX(-([1-9]|1[0-4]))?)$"))
+
+((word) @boolean
+  (#any-of? @boolean "true" "false"))
+
+(comment) @comment @spell
+(test_operator) @string
+
+(command_substitution
+  [ "$(" ")" ] @punctuation.bracket)
+
+(process_substitution
+  [ "<(" ")" ] @punctuation.bracket)
+
+
+(function_definition
+  name: (word) @function)
+
+(command_name (word) @function.call)
+
+((command_name (word) @function.builtin)
+ (#any-of? @function.builtin
+    "alias" "bg" "bind" "break" "builtin" "caller" "cd"
+    "command" "compgen" "complete" "compopt" "continue"
+    "coproc" "dirs" "disown" "echo" "enable" "eval"
+    "exec" "exit" "fc" "fg" "getopts" "hash" "help"
+    "history" "jobs" "kill" "let" "logout" "mapfile"
+    "popd" "printf" "pushd" "pwd" "read" "readarray"
+    "return" "set" "shift" "shopt" "source" "suspend"
+    "test" "time" "times" "trap" "type" "typeset"
+    "ulimit" "umask" "unalias" "wait"))
+
+(command
+  argument: [
+             (word) @parameter
+             (concatenation (word) @parameter)
+             ])
+
+((word) @number
+  (#lua-match? @number "^[0-9]+$"))
+
+(file_redirect
+  descriptor: (file_descriptor) @operator
+  destination: (word) @parameter)
+
+(expansion
+  [ "${" "}" ] @punctuation.bracket)
+
+(variable_name) @variable
+
+((variable_name) @constant
+ (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+
+(case_item
+  value: (word) @parameter)
+
+(regex) @string.regex
+
+((program . (comment) @preproc)
+  (#lua-match? @preproc "^#!/"))
-- 
cgit 


From ba8f19ebb67ca27d746f4b1cd902ab3d807eace3 Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Sat, 1 Jul 2023 18:42:37 +0800
Subject: fix(lsp): lint warnings, default offset_encoding #24046

- fix lint / analysis warnings
- locations_to_items(): get default offset_encoding from active client
- character_offset(): get default offset_encoding from active client
---
 runtime/doc/lsp.txt              |  84 ++++++++++++------------
 runtime/lua/vim/lsp/buf.lua      |   6 +-
 runtime/lua/vim/lsp/codelens.lua |   4 +-
 runtime/lua/vim/lsp/log.lua      |   2 +-
 runtime/lua/vim/lsp/protocol.lua |  11 +++-
 runtime/lua/vim/lsp/rpc.lua      |   2 +-
 runtime/lua/vim/lsp/util.lua     | 134 +++++++++++++++++++++------------------
 7 files changed, 130 insertions(+), 113 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 95cbd211bf..c6f395dd15 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1078,9 +1078,12 @@ add_workspace_folder({workspace_folder})
     Add the folder at path to the workspace folders. If {path} is not
     provided, the user will be prompted for a path using |input()|.
 
-clear_references()                            *vim.lsp.buf.clear_references()*
+clear_references({bufnr})                     *vim.lsp.buf.clear_references()*
     Removes document highlights from current buffer.
 
+    Parameters: ~
+      • {bufnr}  integer|nil
+
 code_action({options})                             *vim.lsp.buf.code_action()*
     Selects a code action available at the current cursor position.
 
@@ -1587,12 +1590,12 @@ character_offset({buf}, {row}, {col}, {offset_encoding})
       • {buf}              (integer) buffer number (0 for current)
       • {row}              0-indexed line
       • {col}              0-indexed byte offset in line
-      • {offset_encoding}  (string) utf-8|utf-16|utf-32|nil defaults to
+      • {offset_encoding}  (string) utf-8|utf-16|utf-32 defaults to
                            `offset_encoding` of first client of `buf`
 
     Return: ~
-        (integer, integer) `offset_encoding` index of the character in line
-        {row} column {col} in buffer {buf}
+        (integer) `offset_encoding` index of the character in line {row}
+        column {col} in buffer {buf}
 
                               *vim.lsp.util.convert_input_to_markdown_lines()*
 convert_input_to_markdown_lines({input}, {contents})
@@ -1607,7 +1610,7 @@ convert_input_to_markdown_lines({input}, {contents})
                     lines. Defaults to {}.
 
     Return: ~
-        {contents}, extended with lines of converted markdown.
+        (table) {contents} extended with lines of converted markdown.
 
     See also: ~
       • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
@@ -1617,14 +1620,15 @@ convert_signature_help_to_markdown_lines({signature_help}, {ft}, {triggers})
     Converts `textDocument/SignatureHelp` response to markdown lines.
 
     Parameters: ~
-      • {signature_help}  Response of `textDocument/SignatureHelp`
-      • {ft}              optional filetype that will be use as the `lang` for
-                          the label markdown code block
-      • {triggers}        optional list of trigger characters from the lsp
+      • {signature_help}  (table) Response of `textDocument/SignatureHelp`
+      • {ft}              (string|nil) filetype that will be use as the `lang`
+                          for the label markdown code block
+      • {triggers}        (table|nil) list of trigger characters from the lsp
                           server. used to better determine parameter offsets
 
     Return: ~
-        (list) of lines of converted markdown.
+        (table|nil) table list of lines of converted markdown.
+        (table|nil) table of active hl
 
     See also: ~
       • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp
@@ -1660,7 +1664,7 @@ jump_to_location({location}, {offset_encoding}, {reuse_win})
 
     Parameters: ~
       • {location}         (table) (`Location`|`LocationLink`)
-      • {offset_encoding}  "utf-8" | "utf-16" | "utf-32"
+      • {offset_encoding}  (string|nil) utf-8|utf-16|utf-32
       • {reuse_win}        (boolean|nil) Jump to existing window if buffer is
                            already open.
 
@@ -1678,7 +1682,8 @@ locations_to_items({locations}, {offset_encoding})
     Parameters: ~
       • {locations}        (table) list of `Location`s or `LocationLink`s
       • {offset_encoding}  (string) offset_encoding for locations
-                           utf-8|utf-16|utf-32
+                           utf-8|utf-16|utf-32 default to first client of
+                           buffer
 
     Return: ~
         (table) list of items
@@ -1687,11 +1692,11 @@ lookup_section({settings}, {section})          *vim.lsp.util.lookup_section()*
     Helper function to return nested values in language server settings
 
     Parameters: ~
-      • {settings}  a table of language server settings
-      • {section}   a string indicating the field of the settings table
+      • {settings}  (table) language server settings
+      • {section}   string indicating the field of the settings table
 
     Return: ~
-        (table or string) The value of settings accessed via section
+        table|string The value of settings accessed via section
 
                                   *vim.lsp.util.make_floating_popup_options()*
 make_floating_popup_options({width}, {height}, {opts})
@@ -1701,7 +1706,7 @@ make_floating_popup_options({width}, {height}, {opts})
     Parameters: ~
       • {width}   (integer) window width (in character cells)
       • {height}  (integer) window height (in character cells)
-      • {opts}    (table, optional)
+      • {opts}    (table) optional
                   • offset_x (integer) offset to add to `col`
                   • offset_y (integer) offset to add to `row`
                   • border (string or table) override `border`
@@ -1742,8 +1747,8 @@ make_given_range_params({start_pos}, {end_pos}, {bufnr}, {offset_encoding})
                            `offset_encoding` of first client of `bufnr`
 
     Return: ~
-        { textDocument = { uri = `current_file_uri` }, range = { start =
-        `start_position`, end = `end_position` } }
+        (table) { textDocument = { uri = `current_file_uri` }, range = { start
+        = `start_position`, end = `end_position` } }
 
                                          *vim.lsp.util.make_position_params()*
 make_position_params({window}, {offset_encoding})
@@ -1758,7 +1763,7 @@ make_position_params({window}, {offset_encoding})
                            `window`
 
     Return: ~
-        `TextDocumentPositionParams` object
+        (table) `TextDocumentPositionParams` object
 
     See also: ~
       • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentPositionParams
@@ -1778,8 +1783,8 @@ make_range_params({window}, {offset_encoding})
                            `window`
 
     Return: ~
-        { textDocument = { uri = `current_file_uri` }, range = { start =
-        `current_position`, end = `current_position` } }
+        (table) { textDocument = { uri = `current_file_uri` }, range = { start
+        = `current_position`, end = `current_position` } }
 
                                     *vim.lsp.util.make_text_document_params()*
 make_text_document_params({bufnr})
@@ -1789,7 +1794,7 @@ make_text_document_params({bufnr})
       • {bufnr}  (integer|nil) Buffer handle, defaults to current
 
     Return: ~
-        `TextDocumentIdentifier`
+        (table) `TextDocumentIdentifier`
 
     See also: ~
       • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentIdentifier
@@ -1799,8 +1804,8 @@ make_workspace_params({added}, {removed})
     Create the workspace params
 
     Parameters: ~
-      • {added}    
-      • {removed}
+      • {added}    (table)
+      • {removed}  (table)
 
                                         *vim.lsp.util.open_floating_preview()*
 open_floating_preview({contents}, {syntax}, {opts})
@@ -1832,8 +1837,8 @@ open_floating_preview({contents}, {syntax}, {opts})
                       window with the same {focus_id}
 
     Return: ~
-        bufnr,winnr buffer and window number of the newly created floating
-        preview window
+        (integer) bufnr of newly created float window
+        (integer) winid of newly created float window preview window
 
 parse_snippet({input})                          *vim.lsp.util.parse_snippet()*
     Parses snippets in a completion entry.
@@ -1853,10 +1858,11 @@ preview_location({location}, {opts})         *vim.lsp.util.preview_location()*
       definition)
 
     Parameters: ~
-      • {location}  a single `Location` or `LocationLink`
+      • {location}  (table) a single `Location` or `LocationLink`
 
     Return: ~
-        (bufnr,winnr) buffer and window number of floating window or nil
+        (integer|nil) buffer id of float window
+        (integer|nil) window id of float window
 
 rename({old_fname}, {new_fname}, {opts})               *vim.lsp.util.rename()*
     Rename old_fname to new_fname
@@ -1873,7 +1879,7 @@ set_lines({lines}, {A}, {B}, {new_lines})           *vim.lsp.util.set_lines()*
       • {lines}      (table) Original list of strings
       • {A}          (table) Start position; a 2-tuple of {line,col} numbers
       • {B}          (table) End position; a 2-tuple of {line,col} numbers
-      • {new_lines}  A list of strings to replace the original
+      • {new_lines}  (table) list of strings to replace the original
 
     Return: ~
         (table) The modified {lines} object
@@ -1884,7 +1890,7 @@ show_document({location}, {offset_encoding}, {opts})
 
     Parameters: ~
       • {location}         (table) (`Location`|`LocationLink`)
-      • {offset_encoding}  "utf-8" | "utf-16" | "utf-32"
+      • {offset_encoding}  (string|nil) utf-8|utf-16|utf-32
       • {opts}             (table|nil) options
                            • reuse_win (boolean) Jump to existing window if
                              buffer is already open.
@@ -1908,7 +1914,7 @@ stylize_markdown({bufnr}, {contents}, {opts})
 
     Parameters: ~
       • {contents}  (table) of lines to show in window
-      • {opts}      dictionary with optional fields
+      • {opts}      (table) with optional fields
                     • height of floating window
                     • width of floating window
                     • wrap_at character to wrap at for computing height
@@ -1919,13 +1925,13 @@ stylize_markdown({bufnr}, {contents}, {opts})
                     • separator insert separator after code block
 
     Return: ~
-        width,height size of float
+        (table) stripped content
 
 symbols_to_items({symbols}, {bufnr})         *vim.lsp.util.symbols_to_items()*
     Converts symbols to quickfix list items.
 
     Parameters: ~
-      • {symbols}  DocumentSymbol[] or SymbolInformation[]
+      • {symbols}  (table) DocumentSymbol[] or SymbolInformation[]
 
               *vim.lsp.util.text_document_completion_list_to_complete_items()*
 text_document_completion_list_to_complete_items({result}, {prefix})
@@ -1933,16 +1939,16 @@ text_document_completion_list_to_complete_items({result}, {prefix})
     vim-compatible |complete-items|.
 
     Parameters: ~
-      • {result}  The result of a `textDocument/completion` call, e.g. from
-                  |vim.lsp.buf.completion()|, which may be one of
+      • {result}  (table) The result of a `textDocument/completion` call, e.g.
+                  from |vim.lsp.buf.completion()|, which may be one of
                   `CompletionItem[]`, `CompletionList` or `null`
       • {prefix}  (string) the prefix to filter the completion items
 
     Return: ~
-        { matches = complete-items table, incomplete = bool }
+        (table) { matches = complete-items table, incomplete = bool }
 
     See also: ~
-      • |complete-items|
+      • complete-items
 
 trim_empty_lines({lines})                    *vim.lsp.util.trim_empty_lines()*
     Removes empty lines from the beginning and end.
@@ -1980,7 +1986,7 @@ get_level()                                          *vim.lsp.log.get_level()*
     Gets the current log level.
 
     Return: ~
-        (string) current log level
+        (integer) current log level
 
 set_format_func({handle})                      *vim.lsp.log.set_format_func()*
     Sets formatting function used to format logs
@@ -2117,6 +2123,6 @@ resolve_capabilities({server_capabilities})
                                server
 
     Return: ~
-        (table) Normalized table of capabilities
+        (table|nil) Normalized table of capabilities
 
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 0369725216..c742505ec6 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -581,9 +581,9 @@ function M.document_highlight()
 end
 
 --- Removes document highlights from current buffer.
----
-function M.clear_references()
-  util.buf_clear_references()
+--- @param bufnr integer|nil
+function M.clear_references(bufnr)
+  util.buf_clear_references(bufnr or 0)
 end
 
 ---@private
diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index 5acfe90d5e..67104cc40b 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -33,11 +33,9 @@ local function execute_lens(lens, bufnr, client_id)
 
   local client = vim.lsp.get_client_by_id(client_id)
   assert(client, 'Client is required to execute lens, client_id=' .. client_id)
-
   client._exec_cmd(lens.command, { bufnr = bufnr }, function(...)
-    local result = vim.lsp.handlers['workspace/executeCommand'](...)
+    vim.lsp.handlers['workspace/executeCommand'](...)
     M.refresh()
-    return result
   end)
 end
 
diff --git a/runtime/lua/vim/lsp/log.lua b/runtime/lua/vim/lsp/log.lua
index 07d0500797..c77e7c045b 100644
--- a/runtime/lua/vim/lsp/log.lua
+++ b/runtime/lua/vim/lsp/log.lua
@@ -154,7 +154,7 @@ function log.set_level(level)
 end
 
 --- Gets the current log level.
----@return string current log level
+---@return integer current log level
 function log.get_level()
   return current_log_level
 end
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index ea38bfe237..27da891656 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -880,7 +880,7 @@ end
 
 --- Creates a normalized object describing LSP server capabilities.
 ---@param server_capabilities table Table of capabilities supported by the server
----@return table Normalized table of capabilities
+---@return table|nil Normalized table of capabilities
 function protocol.resolve_capabilities(server_capabilities)
   local TextDocumentSyncKind = protocol.TextDocumentSyncKind
   local textDocumentSync = server_capabilities.textDocumentSync
@@ -898,7 +898,8 @@ function protocol.resolve_capabilities(server_capabilities)
   elseif type(textDocumentSync) == 'number' then
     -- Backwards compatibility
     if not TextDocumentSyncKind[textDocumentSync] then
-      return nil, 'Invalid server TextDocumentSyncKind for textDocumentSync'
+      vim.notify('Invalid server TextDocumentSyncKind for textDocumentSync', vim.log.levels.ERROR)
+      return nil
     end
     server_capabilities.textDocumentSync = {
       openClose = true,
@@ -910,7 +911,11 @@ function protocol.resolve_capabilities(server_capabilities)
       },
     }
   elseif type(textDocumentSync) ~= 'table' then
-    return nil, string.format('Invalid type for textDocumentSync: %q', type(textDocumentSync))
+    vim.notify(
+      string.format('Invalid type for textDocumentSync: %q', type(textDocumentSync)),
+      vim.log.levels.ERROR
+    )
+    return nil
   end
   return server_capabilities
 end
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index 64bc732bdf..6552eaa800 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -36,7 +36,7 @@ end
 local function parse_headers(header)
   assert(type(header) == 'string', 'header must be a string')
   local headers = {}
-  for line in vim.gsplit(header, '\r\n', true) do
+  for line in vim.gsplit(header, '\r\n', { plain = true }) do
     if line == '' then
       break
     end
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 4c319e7c41..6cb91417f2 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -25,9 +25,9 @@ local default_border = {
 ---@private
 --- Check the border given by opts or the default border for the additional
 --- size it adds to a float.
----@param opts (table, optional) options for the floating window
+---@param opts table optional options for the floating window
 ---            - border (string or table) the border
----@returns (table) size of border in the form of { height = height, width = width }
+---@return table size of border in the form of { height = height, width = width }
 local function get_border_size(opts)
   local border = opts and opts.border or default_border
   local height = 0
@@ -106,7 +106,7 @@ end
 ---@private
 local function split_lines(value)
   value = string.gsub(value, '\r\n?', '\n')
-  return split(value, '\n', true)
+  return split(value, '\n', { plain = true })
 end
 
 ---@private
@@ -122,7 +122,7 @@ end
 --- Convenience wrapper around vim.str_utfindex
 ---@param line string line to be indexed
 ---@param index integer|nil byte index (utf-8), or `nil` for length
----@param encoding string utf-8|utf-16|utf-32|nil defaults to utf-16
+---@param encoding string|nil utf-8|utf-16|utf-32|nil defaults to utf-16
 ---@return integer `encoding` index of `index` in `line`
 function M._str_utfindex_enc(line, index, encoding)
   if not encoding then
@@ -150,7 +150,7 @@ end
 ---Alternative to vim.str_byteindex that takes an encoding.
 ---@param line string line to be indexed
 ---@param index integer UTF index
----@param encoding string utf-8|utf-16|utf-32|nil defaults to utf-16
+---@param encoding string utf-8|utf-16|utf-32| defaults to utf-16
 ---@return integer byte (utf-8) index of `encoding` index `index` in `line`
 function M._str_byteindex_enc(line, index, encoding)
   if not encoding then
@@ -180,8 +180,8 @@ local _str_byteindex_enc = M._str_byteindex_enc
 ---@param lines (table) Original list of strings
 ---@param A (table) Start position; a 2-tuple of {line,col} numbers
 ---@param B (table) End position; a 2-tuple of {line,col} numbers
----@param new_lines A list of strings to replace the original
----@returns (table) The modified {lines} object
+---@param new_lines (table) list of strings to replace the original
+---@return table The modified {lines} object
 function M.set_lines(lines, A, B, new_lines)
   -- 0-indexing to 1-indexing
   local i_0 = A[1] + 1
@@ -241,7 +241,7 @@ end
 ---
 ---@param bufnr integer bufnr to get the lines from
 ---@param rows integer[] zero-indexed line numbers
----@return table<integer, string> a table mapping rows to lines
+---@return table<integer, string>|string a table mapping rows to lines
 local function get_lines(bufnr, rows)
   rows = type(rows) == 'table' and rows or { rows }
 
@@ -331,8 +331,9 @@ end
 ---@private
 --- Position is a https://microsoft.github.io/language-server-protocol/specifications/specification-current/#position
 --- Returns a zero-indexed column, since set_lines() does the conversion to
----@param offset_encoding string utf-8|utf-16|utf-32
+---@param offset_encoding string|nil utf-8|utf-16|utf-32
 --- 1-indexed
+---@return integer
 local function get_line_byte_from_position(bufnr, position, offset_encoding)
   -- LSP's line and characters are 0-indexed
   -- Vim's line and columns are 1-indexed
@@ -598,8 +599,8 @@ end
 --- Can be used to extract the completion items from a
 --- `textDocument/completion` request, which may return one of
 --- `CompletionItem[]`, `CompletionList` or null.
----@param result (table) The result of a `textDocument/completion` request
----@returns (table) List of completion items
+---@param result table The result of a `textDocument/completion` request
+---@return table List of completion items
 ---@see https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
 function M.extract_completion_items(result)
   if type(result) == 'table' and result.items then
@@ -658,7 +659,7 @@ end
 --- Parses snippets in a completion entry.
 ---
 ---@param input string unparsed snippet
----@returns string parsed snippet
+---@return string parsed snippet
 function M.parse_snippet(input)
   local ok, parsed = pcall(function()
     return tostring(snippet.parse(input))
@@ -718,7 +719,7 @@ end
 --- specification.
 ---
 ---@param completion_item_kind (`vim.lsp.protocol.completionItemKind`)
----@returns (`vim.lsp.protocol.completionItemKind`)
+---@return (`vim.lsp.protocol.completionItemKind`)
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
 function M._get_completion_item_kind_name(completion_item_kind)
   return protocol.CompletionItemKind[completion_item_kind] or 'Unknown'
@@ -727,12 +728,12 @@ end
 --- Turns the result of a `textDocument/completion` request into vim-compatible
 --- |complete-items|.
 ---
----@param result The result of a `textDocument/completion` call, e.g. from
+---@param result table The result of a `textDocument/completion` call, e.g. from
 ---|vim.lsp.buf.completion()|, which may be one of `CompletionItem[]`,
 --- `CompletionList` or `null`
 ---@param prefix (string) the prefix to filter the completion items
----@returns { matches = complete-items table, incomplete = bool }
----@see |complete-items|
+---@return table { matches = complete-items table, incomplete = bool }
+---@see complete-items
 function M.text_document_completion_list_to_complete_items(result, prefix)
   local items = M.extract_completion_items(result)
   if vim.tbl_isempty(items) then
@@ -937,7 +938,7 @@ end
 ---
 ---@param input (`MarkedString` | `MarkedString[]` | `MarkupContent`)
 ---@param contents (table|nil) List of strings to extend with converted lines. Defaults to {}.
----@returns {contents}, extended with lines of converted markdown.
+---@return table {contents} extended with lines of converted markdown.
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
 function M.convert_input_to_markdown_lines(input, contents)
   contents = contents or {}
@@ -985,10 +986,11 @@ end
 
 --- Converts `textDocument/SignatureHelp` response to markdown lines.
 ---
----@param signature_help Response of `textDocument/SignatureHelp`
----@param ft optional filetype that will be use as the `lang` for the label markdown code block
----@param triggers optional list of trigger characters from the lsp server. used to better determine parameter offsets
----@returns list of lines of converted markdown.
+---@param signature_help table Response of `textDocument/SignatureHelp`
+---@param ft string|nil filetype that will be use as the `lang` for the label markdown code block
+---@param triggers table|nil list of trigger characters from the lsp server. used to better determine parameter offsets
+---@return table|nil table list of lines of converted markdown.
+---@return table|nil table of active hl
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp
 function M.convert_signature_help_to_markdown_lines(signature_help, ft, triggers)
   if not signature_help.signatures then
@@ -1015,7 +1017,7 @@ function M.convert_signature_help_to_markdown_lines(signature_help, ft, triggers
     -- wrap inside a code block so stylize_markdown can render it properly
     label = ('```%s\n%s\n```'):format(ft, label)
   end
-  list_extend(contents, split(label, '\n', true))
+  list_extend(contents, split(label, '\n', { plain = true }))
   if signature.documentation then
     M.convert_input_to_markdown_lines(signature.documentation, contents)
   end
@@ -1087,16 +1089,16 @@ end
 --- Creates a table with sensible default options for a floating window. The
 --- table can be passed to |nvim_open_win()|.
 ---
----@param width (integer) window width (in character cells)
----@param height (integer) window height (in character cells)
----@param opts (table, optional)
+---@param width integer window width (in character cells)
+---@param height integer window height (in character cells)
+---@param opts table optional
 ---        - offset_x (integer) offset to add to `col`
 ---        - offset_y (integer) offset to add to `row`
 ---        - border (string or table) override `border`
 ---        - focusable (string or table) override `focusable`
 ---        - zindex (string or table) override `zindex`, defaults to 50
 ---        - relative ("mouse"|"cursor") defaults to "cursor"
----@returns (table) Options
+---@return table Options
 function M.make_floating_popup_options(width, height, opts)
   validate({
     opts = { opts, 't', true },
@@ -1160,7 +1162,7 @@ end
 --- Shows document and optionally jumps to the location.
 ---
 ---@param location table (`Location`|`LocationLink`)
----@param offset_encoding "utf-8" | "utf-16" | "utf-32"
+---@param offset_encoding string|nil utf-8|utf-16|utf-32
 ---@param opts table|nil options
 ---        - reuse_win (boolean) Jump to existing window if buffer is already open.
 ---        - focus (boolean) Whether to focus/jump to location if possible. Defaults to true.
@@ -1217,7 +1219,7 @@ end
 --- Jumps to a location.
 ---
 ---@param location table (`Location`|`LocationLink`)
----@param offset_encoding "utf-8" | "utf-16" | "utf-32"
+---@param offset_encoding string|nil utf-8|utf-16|utf-32
 ---@param reuse_win boolean|nil Jump to existing window if buffer is already open.
 ---@return boolean `true` if the jump succeeded
 function M.jump_to_location(location, offset_encoding, reuse_win)
@@ -1237,8 +1239,9 @@ end
 ---   - for Location, range is shown (e.g., function definition)
 ---   - for LocationLink, targetRange is shown (e.g., body of function definition)
 ---
----@param location a single `Location` or `LocationLink`
----@returns (bufnr,winnr) buffer and window number of floating window or nil
+---@param location table a single `Location` or `LocationLink`
+---@return integer|nil buffer id of float window
+---@return integer|nil window id of float window
 function M.preview_location(location, opts)
   -- location may be LocationLink or Location (more useful for the former)
   local uri = location.targetUri or location.uri
@@ -1275,10 +1278,10 @@ end
 --- Trims empty lines from input and pad top and bottom with empty lines
 ---
 ---@param contents table of lines to trim and pad
----@param opts dictionary with optional fields
+---@param opts table with optional fields
 ---             - pad_top    number of lines to pad contents at top (default 0)
 ---             - pad_bottom number of lines to pad contents at bottom (default 0)
----@return contents table of trimmed and padded lines
+---@return table table of trimmed and padded lines
 function M._trim(contents, opts)
   validate({
     contents = { contents, 't' },
@@ -1301,7 +1304,7 @@ end
 
 --- Generates a table mapping markdown code block lang to vim syntax,
 --- based on g:markdown_fenced_languages
----@return a table of lang -> syntax mappings
+---@return table table of lang -> syntax mappings
 ---@private
 local function get_markdown_fences()
   local fences = {}
@@ -1324,7 +1327,7 @@ end
 --- If you want to open a popup with fancy markdown, use `open_floating_preview` instead
 ---
 ---@param contents table of lines to show in window
----@param opts dictionary with optional fields
+---@param opts table with optional fields
 ---  - height    of floating window
 ---  - width     of floating window
 ---  - wrap_at   character to wrap at for computing height
@@ -1333,7 +1336,7 @@ end
 ---  - pad_top    number of lines to pad contents at top
 ---  - pad_bottom number of lines to pad contents at bottom
 ---  - separator insert separator after code block
----@returns width,height size of float
+---@return table stripped content
 function M.stylize_markdown(bufnr, contents, opts)
   validate({
     contents = { contents, 't' },
@@ -1480,10 +1483,10 @@ function M.stylize_markdown(bufnr, contents, opts)
     if not langs[lang] then
       -- HACK: reset current_syntax, since some syntax files like markdown won't load if it is already set
       pcall(api.nvim_buf_del_var, bufnr, 'current_syntax')
-      -- TODO(ashkan): better validation before this.
-      if not pcall(vim.cmd, string.format('syntax include %s syntax/%s.vim', lang, ft)) then
+      if #api.nvim_get_runtime_file(('syntax/%s.vim'):format(ft), true) == 0 then
         return
       end
+      vim.cmd(string.format('syntax include %s syntax/%s.vim', lang, ft))
       langs[lang] = true
     end
     vim.cmd(
@@ -1542,7 +1545,7 @@ end
 ---@param events table list of events
 ---@param winnr integer window id of preview window
 ---@param bufnrs table list of buffers where the preview window will remain visible
----@see |autocmd-events|
+---@see autocmd-events
 local function close_preview_autocmd(events, winnr, bufnrs)
   local augroup = api.nvim_create_augroup('preview_window_' .. winnr, {
     clear = true,
@@ -1572,13 +1575,14 @@ end
 --- Computes size of float needed to show contents (with optional wrapping)
 ---
 ---@param contents table of lines to show in window
----@param opts dictionary with optional fields
+---@param opts table with optional fields
 ---            - height  of floating window
 ---            - width   of floating window
 ---            - wrap_at character to wrap at for computing height
 ---            - max_width  maximal width of floating window
 ---            - max_height maximal height of floating window
----@returns width,height size of float
+---@return integer width size of float
+---@return integer height size of float
 function M._make_floating_popup_size(contents, opts)
   validate({
     contents = { contents, 't' },
@@ -1662,7 +1666,8 @@ end
 ---             - focus: (boolean, default true) If `true`, and if {focusable}
 ---                      is also `true`, focus an existing floating window with the same
 ---                      {focus_id}
----@returns bufnr,winnr buffer and window number of the newly created floating
+---@return integer bufnr of newly created float window
+---@return integer winid of newly created float window
 ---preview window
 function M.open_floating_preview(contents, syntax, opts)
   validate({
@@ -1766,7 +1771,7 @@ do --[[ References ]]
   ---
   ---@param bufnr integer Buffer id
   function M.buf_clear_references(bufnr)
-    validate({ bufnr = { bufnr, 'n', true } })
+    validate({ bufnr = { bufnr, { 'n', 'nil' }, true } })
     api.nvim_buf_clear_namespace(bufnr or 0, reference_ns, 0, -1)
   end
 
@@ -1828,13 +1833,15 @@ end)
 ---
 ---@param locations table list of `Location`s or `LocationLink`s
 ---@param offset_encoding string offset_encoding for locations utf-8|utf-16|utf-32
----@returns (table) list of items
+---                              default to first client of buffer
+---@return table list of items
 function M.locations_to_items(locations, offset_encoding)
   if offset_encoding == nil then
     vim.notify_once(
       'locations_to_items must be called with valid offset encoding',
       vim.log.levels.WARN
     )
+    offset_encoding = vim.lsp.get_active_clients({ bufnr = 0 })[1].offset_encoding
   end
 
   local items = {}
@@ -1896,7 +1903,7 @@ end
 
 --- Converts symbols to quickfix list items.
 ---
----@param symbols DocumentSymbol[] or SymbolInformation[]
+---@param symbols table DocumentSymbol[] or SymbolInformation[]
 function M.symbols_to_items(symbols, bufnr)
   ---@private
   local function _symbols_to_items(_symbols, _items, _bufnr)
@@ -1936,8 +1943,8 @@ function M.symbols_to_items(symbols, bufnr)
 end
 
 --- Removes empty lines from the beginning and end.
----@param lines (table) list of lines to trim
----@returns (table) trimmed list of lines
+---@param lines table list of lines to trim
+---@return table trimmed list of lines
 function M.trim_empty_lines(lines)
   local start = 1
   for i = 1, #lines do
@@ -1961,8 +1968,8 @@ end
 ---
 --- CAUTION: Modifies the input in-place!
 ---
----@param lines (table) list of lines
----@returns (string) filetype or "markdown" if it was unchanged.
+---@param lines table list of lines
+---@return string filetype or "markdown" if it was unchanged.
 function M.try_trim_markdown_code_blocks(lines)
   local language_id = lines[1]:match('^```(.*)')
   if language_id then
@@ -2007,7 +2014,7 @@ end
 ---
 ---@param window integer|nil: window handle or 0 for current, defaults to current
 ---@param offset_encoding string|nil utf-8|utf-16|utf-32|nil defaults to `offset_encoding` of first client of buffer of `window`
----@returns `TextDocumentPositionParams` object
+---@return table `TextDocumentPositionParams` object
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentPositionParams
 function M.make_position_params(window, offset_encoding)
   window = window or 0
@@ -2021,7 +2028,7 @@ end
 
 --- Utility function for getting the encoding of the first LSP client on the given buffer.
 ---@param bufnr (integer) buffer handle or 0 for current, defaults to current
----@returns (string) encoding first client if there is one, nil otherwise
+---@return string encoding first client if there is one, nil otherwise
 function M._get_offset_encoding(bufnr)
   validate({
     bufnr = { bufnr, 'n', true },
@@ -2060,7 +2067,7 @@ end
 ---
 ---@param window integer|nil: window handle or 0 for current, defaults to current
 ---@param offset_encoding "utf-8"|"utf-16"|"utf-32"|nil defaults to `offset_encoding` of first client of buffer of `window`
----@returns { textDocument = { uri = `current_file_uri` }, range = { start =
+---@return table { textDocument = { uri = `current_file_uri` }, range = { start =
 ---`current_position`, end = `current_position` } }
 function M.make_range_params(window, offset_encoding)
   local buf = api.nvim_win_get_buf(window or 0)
@@ -2081,7 +2088,7 @@ end
 --- Defaults to the end of the last visual selection.
 ---@param bufnr integer|nil buffer handle or 0 for current, defaults to current
 ---@param offset_encoding "utf-8"|"utf-16"|"utf-32"|nil defaults to `offset_encoding` of first client of `bufnr`
----@returns { textDocument = { uri = `current_file_uri` }, range = { start =
+---@return table { textDocument = { uri = `current_file_uri` }, range = { start =
 ---`start_position`, end = `end_position` } }
 function M.make_given_range_params(start_pos, end_pos, bufnr, offset_encoding)
   validate({
@@ -2121,15 +2128,15 @@ end
 --- Creates a `TextDocumentIdentifier` object for the current buffer.
 ---
 ---@param bufnr integer|nil: Buffer handle, defaults to current
----@returns `TextDocumentIdentifier`
+---@return table `TextDocumentIdentifier`
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocumentIdentifier
 function M.make_text_document_params(bufnr)
   return { uri = vim.uri_from_bufnr(bufnr or 0) }
 end
 
 --- Create the workspace params
----@param added
----@param removed
+---@param added table
+---@param removed table
 function M.make_workspace_params(added, removed)
   return { event = { added = added, removed = removed } }
 end
@@ -2137,7 +2144,7 @@ end
 ---
 ---@see 'shiftwidth'
 ---@param bufnr (integer|nil): Buffer handle, defaults to current
----@returns (integer) indentation size
+---@return (integer) indentation size
 function M.get_effective_tabstop(bufnr)
   validate({ bufnr = { bufnr, 'n', true } })
   local bo = bufnr and vim.bo[bufnr] or vim.bo
@@ -2148,7 +2155,7 @@ end
 --- Creates a `DocumentFormattingParams` object for the current buffer and cursor position.
 ---
 ---@param options table|nil with valid `FormattingOptions` entries
----@returns `DocumentFormattingParams` object
+---@return `DocumentFormattingParams` object
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_formatting
 function M.make_formatting_params(options)
   validate({ options = { options, 't', true } })
@@ -2167,8 +2174,8 @@ end
 ---@param buf integer buffer number (0 for current)
 ---@param row 0-indexed line
 ---@param col 0-indexed byte offset in line
----@param offset_encoding string utf-8|utf-16|utf-32|nil defaults to `offset_encoding` of first client of `buf`
----@returns (integer, integer) `offset_encoding` index of the character in line {row} column {col} in buffer {buf}
+---@param offset_encoding string utf-8|utf-16|utf-32 defaults to `offset_encoding` of first client of `buf`
+---@return integer `offset_encoding` index of the character in line {row} column {col} in buffer {buf}
 function M.character_offset(buf, row, col, offset_encoding)
   local line = get_line(buf, row)
   if offset_encoding == nil then
@@ -2176,6 +2183,7 @@ function M.character_offset(buf, row, col, offset_encoding)
       'character_offset must be called with valid offset encoding',
       vim.log.levels.WARN
     )
+    offset_encoding = vim.lsp.get_active_clients({ bufnr = buf })[1].offset_encoding
   end
   -- If the col is past the EOL, use the line length.
   if col > #line then
@@ -2186,11 +2194,11 @@ end
 
 --- Helper function to return nested values in language server settings
 ---
----@param settings a table of language server settings
----@param section  a string indicating the field of the settings table
----@returns (table or string) The value of settings accessed via section
+---@param settings table language server settings
+---@param section  string indicating the field of the settings table
+---@return table|string The value of settings accessed via section
 function M.lookup_section(settings, section)
-  for part in vim.gsplit(section, '.', true) do
+  for part in vim.gsplit(section, '.', { plain = true }) do
     settings = settings[part]
     if settings == nil then
       return vim.NIL
-- 
cgit 


From db590e96d59381f873747e888c9afe3c6378678c Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 2 Jul 2023 05:48:12 +0800
Subject: fix(startup)!: "nvim -l" message does not end with newline #24215

Close #24180
---
 runtime/doc/news.txt     | 3 +++
 runtime/doc/starting.txt | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 58c338b225..61ae92296f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -38,6 +38,9 @@ The following changes may require adaptations in user config or plugins.
 • When switching windows, |CursorMoved| autocommands trigger when Nvim is back
   in the main loop rather than immediately. This is more compatible with Vim.
 
+• |-l| ensures output ends with a newline if the script prints messages and
+  doesn't cause Nvim to exit.
+
 • |LspRequest| and LspProgressUpdate (renamed to |LspProgress|) autocmds were
   promoted from a |User| autocmd to first class citizen.
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 07b6bd93bd..53a14c586f 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -227,6 +227,8 @@ argument.
 		
 		Sets 'verbose' to 1 (like "-V1"), so Lua `print()` writes to
 		output.
+		If {script} prints messages and doesn't cause Nvim to exit,
+		Nvim ensures output ends with a newline.
 
 		Arguments before "-l" are processed before executing {script}.
 		This example quits before executing "foo.lua": >
-- 
cgit 


From 2d40f5e843a99a67efd55304d17ccd48d47d9013 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 2 Jul 2023 11:17:23 +0200
Subject: build(deps): bump luv to 1.45.0-0 (#24228)

https://github.com/luvit/luv/releases/tag/1.45.0-0
---
 runtime/doc/luvref.txt | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 131e7889e4..8c842de97a 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -3510,14 +3510,22 @@ uv.thread_setaffinity({thread}, {affinity} [, {get_old_affinity}])
                   - `[1, 2, 3, ..., n]` : `boolean`
                 - `get_old_affinity`: `boolean`
 
-                Sets the specified thread's affinity setting. `affinity` must
-                be an array-like table where each of the keys correspond to a
-                CPU number and the values are booleans that represent whether
-                the `thread` should be eligible to run on that CPU. The length
-                of the `affinity` table must be greater than or equal to
-                `uv.cpumask_size()`. If `get_old_affinity` is `true`, the
-                previous affinity settings for the `thread` will be returned.
-                Otherwise, `true` is returned after a successful call.
+                Sets the specified thread's affinity setting.
+
+                `affinity` must be a table where each of the keys are a CPU
+                number and the values are booleans that represent whether the
+                `thread` should be eligible to run on that CPU. If the length
+                of the `affinity` table is not greater than or equal to
+                |uv.cpumask_size()|, any CPU numbers missing from the table
+                will have their affinity set to `false`. If setting the
+                affinity of more than |uv.cpumask_size()| CPUs is desired,
+                `affinity` must be an array-like table with no gaps, since
+                `#affinity` will be used as the `cpumask_size` if it is
+                greater than |uv.cpumask_size()|.
+
+                If `get_old_affinity` is `true`, the previous affinity
+                settings for the `thread` will be returned. Otherwise, `true`
+                is returned after a successful call.
 
                 Note: Thread affinity setting is not atomic on Windows.
                 Unsupported on macOS.
@@ -4078,19 +4086,17 @@ uv.metrics_idle_time()                                  *uv.metrics_idle_time()*
 uv.metrics_info()                                            *uv.metrics_info()*
 
                 Get the metrics table from current set of event loop metrics.
+                It is recommended to retrieve these metrics in a `prepare`
+                callback (see |uv.new_prepare()|, |uv.prepare_start()|) in order
+                to make sure there are no inconsistencies with the metrics
+                counters.
 
                 Returns: `table`
 
-                The table contains event loop metrics. It is recommended to
-                retrieve these metrics in a uv_prepare_cb in order to make
-                sure there are no inconsistencies with the metrics counters.
-
                 - `loop_count` : `integer`
                 - `events` : `integer`
                 - `events_waiting` : `integer`
 
-                Note: New in libuv version 1.45.0.
-
 ==============================================================================
 CREDITS                                                            *luv-credits*
 
-- 
cgit 


From 4fd852b8cb88ed035203d3f9ae2e6a8258244974 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Mon, 3 Jul 2023 00:44:21 +0900
Subject: perf(treesitter): cache fold query (#24222)

perf(treesitter): cache vim.treesitter.query.get

Problem:
vim.treesitter.query.get searches and reads query files every time it's
called, if user hasn't overridden the query. So this can incur slowdown
when called frequently.

This can happen when using treesitter foldexpr. For example, when using
`:h :range!` in markdown file to format fenced codeblock, on_changedtree
in _fold.lua is triggered many times despite that the tree doesn't have
syntactic changes (might be a bug in LanguageTree). (Incidentally, the
resulting fold is incorrect due to a bug in `:h range!`.) on_changedtree
calls vim.treesitter.query.get for each tree changes. In addition, it
may request folds queries for injected languages without fold queries,
such as markdown_inline.

Solution:
* Cache the result of vim.treesitter.query.get.
* If query file was not found, fail quickly at later calls.
---
 runtime/lua/vim/treesitter/query.lua | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 7f90fa10e8..7610ef7b7f 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -195,6 +195,12 @@ function M.set(lang, query_name, text)
   explicit_queries[lang][query_name] = M.parse(lang, text)
 end
 
+--- `false` if query files didn't exist or were empty
+---@type table<string, table<string, Query|false>>
+local query_get_cache = vim.defaulttable(function()
+  return setmetatable({}, { __mode = 'v' })
+end)
+
 ---@deprecated
 function M.get_query(...)
   vim.deprecate('vim.treesitter.query.get_query()', 'vim.treesitter.query.get()', '0.10')
@@ -212,16 +218,28 @@ function M.get(lang, query_name)
     return explicit_queries[lang][query_name]
   end
 
+  local cached = query_get_cache[lang][query_name]
+  if cached then
+    return cached
+  elseif cached == false then
+    return nil
+  end
+
   local query_files = M.get_files(lang, query_name)
   local query_string = read_query_files(query_files)
 
-  if #query_string > 0 then
-    return M.parse(lang, query_string)
+  if #query_string == 0 then
+    query_get_cache[lang][query_name] = false
+    return nil
   end
+
+  local query = M.parse(lang, query_string)
+  query_get_cache[lang][query_name] = query
+  return query
 end
 
----@type {[string]: {[string]: Query}}
-local query_cache = vim.defaulttable(function()
+---@type table<string, table<string, Query>>
+local query_parse_cache = vim.defaulttable(function()
   return setmetatable({}, { __mode = 'v' })
 end)
 
@@ -250,7 +268,7 @@ end
 ---@return Query Parsed query
 function M.parse(lang, query)
   language.add(lang)
-  local cached = query_cache[lang][query]
+  local cached = query_parse_cache[lang][query]
   if cached then
     return cached
   end
@@ -259,7 +277,7 @@ function M.parse(lang, query)
   self.query = vim._ts_parse_query(lang, query)
   self.info = self.query:inspect()
   self.captures = self.info.captures
-  query_cache[lang][query] = self
+  query_parse_cache[lang][query] = self
   return self
 end
 
-- 
cgit 


From a76b689b479e89d6feae687443d13ec38602a1a6 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 4 Jul 2023 16:48:53 +0800
Subject: perf(ui-ext): approximate scroll_delta when scrolling too much
 (#24234)

---
 runtime/doc/ui.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index 360189e928..ead5e31e32 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -640,7 +640,8 @@ tabs.
 	the top line of a window moved since `win_viewport` was last emitted.
 	It is intended to be used to implement smooth scrolling. For this
 	purpose it only counts "virtual" or "displayed" lines, so folds
-	only count as one line.
+	only count as one line. When scrolling more than a full screen it is
+	an approximate value.
 
 ["win_extmark", grid, win, ns_id, mark_id, row, col] ~
 	Updates the position of an extmark which is currently visible in a
-- 
cgit 


From cf5f1492d702f940934b0b40024d1741e4474542 Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Tue, 4 Jul 2023 20:30:31 +0800
Subject: fix(lsp): revert change to buf.clear_references() #24238

Problem: in #24046 the signature of buf.clear_references() changed, which
indirectly breaks callers that were passing "ignored" args.

Solution: because util.buf_clear_references() already defaulted to "current buffer",
the change to buf.clear_references() isn't actually needed, so just revert it.
---
 runtime/doc/lsp.txt          | 7 ++-----
 runtime/lua/vim/lsp/buf.lua  | 5 ++---
 runtime/lua/vim/lsp/util.lua | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index c6f395dd15..b21c1d6e9d 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1078,12 +1078,9 @@ add_workspace_folder({workspace_folder})
     Add the folder at path to the workspace folders. If {path} is not
     provided, the user will be prompted for a path using |input()|.
 
-clear_references({bufnr})                     *vim.lsp.buf.clear_references()*
+clear_references()                            *vim.lsp.buf.clear_references()*
     Removes document highlights from current buffer.
 
-    Parameters: ~
-      • {bufnr}  integer|nil
-
 code_action({options})                             *vim.lsp.buf.code_action()*
     Selects a code action available at the current cursor position.
 
@@ -1567,7 +1564,7 @@ buf_clear_references({bufnr})            *vim.lsp.util.buf_clear_references()*
     Removes document highlights from a buffer.
 
     Parameters: ~
-      • {bufnr}  (integer) Buffer id
+      • {bufnr}  (integer|nil) Buffer id
 
                                      *vim.lsp.util.buf_highlight_references()*
 buf_highlight_references({bufnr}, {references}, {offset_encoding})
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index c742505ec6..bac66b671d 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -581,9 +581,8 @@ function M.document_highlight()
 end
 
 --- Removes document highlights from current buffer.
---- @param bufnr integer|nil
-function M.clear_references(bufnr)
-  util.buf_clear_references(bufnr or 0)
+function M.clear_references()
+  util.buf_clear_references()
 end
 
 ---@private
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 6cb91417f2..8d6f88bb2c 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1769,9 +1769,9 @@ do --[[ References ]]
 
   --- Removes document highlights from a buffer.
   ---
-  ---@param bufnr integer Buffer id
+  ---@param bufnr integer|nil Buffer id
   function M.buf_clear_references(bufnr)
-    validate({ bufnr = { bufnr, { 'n', 'nil' }, true } })
+    validate({ bufnr = { bufnr, { 'n' }, true } })
     api.nvim_buf_clear_namespace(bufnr or 0, reference_ns, 0, -1)
   end
 
-- 
cgit 


From af6e6ccf3dee815850639ec5613dda3442caa7d6 Mon Sep 17 00:00:00 2001
From: marshmallow <marshycity@gmail.com>
Date: Sun, 30 Apr 2023 15:53:02 +1000
Subject: feat(vim.ui): vim.ui.open, "gx" without netrw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Co-authored-by: Justin M. Keyes <justinkz@gmail.com>
Co-authored-by: ii14 <59243201+ii14@users.noreply.github.com>
---
 runtime/doc/lua.txt              | 24 +++++++++++++++
 runtime/doc/news.txt             |  6 ++++
 runtime/doc/various.txt          |  8 +++++
 runtime/lua/vim/lsp/handlers.lua | 15 +++-------
 runtime/lua/vim/ui.lua           | 65 ++++++++++++++++++++++++++++++++++++++++
 runtime/plugin/nvim.lua          |  8 +++++
 6 files changed, 115 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index fb6cbca6e3..f180471bde 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2343,6 +2343,30 @@ input({opts}, {on_confirm})                                   *vim.ui.input()*
                       typed (it might be an empty string if nothing was
                       entered), or `nil` if the user aborted the dialog.
 
+open({path})                                                   *vim.ui.open()*
+    Opens a path in the system's default handler. This function utilizes
+    `xdg-open`, `wslview`, `explorer`, or `open` commands depending on the
+    system to open the provided path.
+
+    Notifies the user if unsuccessful
+
+    Example: >lua
+
+     vim.ui.open("https://neovim.io/")
+
+     vim.ui.open("/path/to/file")
+<
+
+    Parameters: ~
+      • {path}  (string) Path to be opened
+
+    Return: ~
+        SystemCompleted|nil result Result of command, if an appropriate one
+        could be found.
+
+    See also: ~
+      • |vim.system|
+
 select({items}, {opts}, {on_choice})                         *vim.ui.select()*
     Prompts the user to pick from a list of items, allowing arbitrary
     (potentially asynchronous) work until `on_choice`.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 61ae92296f..ed797f94ba 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -107,6 +107,9 @@ The following new APIs and features were added.
 • Bundled treesitter parser and queries (highlight, folds) for Markdown,
 Python, and Bash.
 
+• |vim.ui.open()| opens URIs using the system default handler (macOS `open`,
+Windows `explorer`, Linux `xdg-open`, etc.)
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
@@ -143,6 +146,9 @@ The following changes to existing APIs or features add new behavior.
 
 • |:Man| now respects 'wrapmargin'
 
+• The |gx| command now uses |vim.ui.open()| and not netrw. Continue using
+netrw with `vim.g.use_lua_gx = false`.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 1b1dca321b..de1c21b310 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -97,6 +97,14 @@ g8			Print the hex values of the bytes used in the
 			cursor is halfway through a multibyte character the
 			command won't move the cursor.
 
+							*gx*
+gx			Open the current path or URL under the cursor in the 
+			system's default handler with |vim.ui.open|.
+
+			To use the netrw keymap, set `use_lua_gx` to false:
+>lua
+    vim.g.use_lua_gx = false
+<
 						*:p* *:pr* *:print* *E749*
 :[range]p[rint] [flags]
 			Print [range] lines (default current line).
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 625a2ed282..9b102c0f84 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -573,22 +573,15 @@ M['window/showDocument'] = function(_, result, ctx, _)
 
   if result.external then
     -- TODO(lvimuser): ask the user for confirmation
-    local cmd
-    if vim.fn.has('win32') == 1 then
-      cmd = { 'cmd.exe', '/c', 'start', '""', uri }
-    elseif vim.fn.has('macunix') == 1 then
-      cmd = { 'open', uri }
-    else
-      cmd = { 'xdg-open', uri }
-    end
 
-    local ret = vim.fn.system(cmd)
-    if vim.v.shell_error ~= 0 then
+    local ret = vim.ui.open(uri)
+
+    if ret.code ~= 0 or ret == nil then
       return {
         success = false,
         error = {
           code = protocol.ErrorCodes.UnknownErrorCode,
-          message = ret,
+          message = ret and ret.stderr or 'No handler could be found',
         },
       }
     end
diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua
index aaee175f3a..2200ee7bc3 100644
--- a/runtime/lua/vim/ui.lua
+++ b/runtime/lua/vim/ui.lua
@@ -104,4 +104,69 @@ function M.input(opts, on_confirm)
   end
 end
 
+--- Opens a path in the system's default handler.
+--- This function utilizes `xdg-open`, `wslview`, `explorer`, or `open` commands
+--- depending on the system to open the provided path.
+---
+--- Notifies the user if unsuccessful
+---
+---@param path string Path to be opened
+---
+---@return SystemCompleted|nil result Result of command, if an appropriate one
+---could be found.
+---
+---@see |vim.system|
+---
+--- Example:
+--- <pre>lua
+--- vim.ui.open("https://neovim.io/")
+---
+--- vim.ui.open("/path/to/file")
+--- </pre>
+function M.open(path)
+  if not path or path == '' then
+    vim.notify('os_open: No path provided', vim.log.levels.ERROR)
+    return nil
+  end
+
+  local cmd
+
+  if vim.fn.has('macunix') == 1 then
+    cmd = { 'open', path }
+  elseif vim.fn.has('win32') == 1 then
+    cmd = { 'explorer', path }
+  else
+    if vim.fn.executable('wslview') == 1 then
+      cmd = { 'wslview', path }
+    elseif vim.fn.executable('xdg-open') == 1 then
+      cmd = { 'xdg-open', path }
+    else
+      vim.notify(
+        'os_open: Could not find an appropriate command to use (Is xdg-open installed?)',
+        vim.log.levels.ERROR
+      )
+
+      return nil
+    end
+  end
+
+  local ret = vim
+    .system(cmd, {
+      text = true,
+      detach = true,
+    })
+    :wait()
+
+  if ret.code ~= 0 then
+    local msg = {
+      'Failed to open path',
+      ret,
+      vim.inspect(cmd),
+    }
+    vim.notify(table.concat(msg, '\n'), vim.log.levels.ERROR)
+  end
+
+  return ret
+end
+
 return M
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index 0a33826b82..fcc1b016aa 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -18,3 +18,11 @@ vim.api.nvim_create_user_command('InspectTree', function(cmd)
     vim.treesitter.inspect_tree()
   end
 end, { desc = 'Inspect treesitter language tree for buffer', count = true })
+
+if vim.g.use_lua_gx == nil or vim.g.use_lua_gx == true then
+  vim.keymap.set({ 'n', 'x' }, 'gx', function()
+    local uri = vim.fn.expand('<cfile>')
+
+    vim.ui.open(uri)
+  end, { desc = 'Open URI under cursor with system app' })
+end
-- 
cgit 


From 67b2ed1004ae551c9fe1bbd29a86b5a301570800 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 2 Jul 2023 16:51:30 +0200
Subject: fix(gx): visual selection, expand env vars

---
Rejected experiment: move vim.ui.open() to vim.env.open()

Problem:
`vim.ui` is where user-interface "providers" live, which can be
overridden. It would also be useful to have a "providers" namespace for
platform-specific features such as "open", clipboard, python, and the other
providers listed in `:help providers`. We could overload `vim.ui` to
serve that purpose as the single "providers" namespace, but
`vim.ui.nodejs()` for example seems awkward.

Solution:
`vim.env` currently has too narrow of a purpose. Overload it to also be
a namespace for `vim.env.open`.

diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
index 913f1fe20348..17d05ff37595 100644
--- a/runtime/lua/vim/_meta.lua
+++ b/runtime/lua/vim/_meta.lua
@@ -37,8 +37,28 @@ local options_info = setmetatable({}, {
   end,
 })

-vim.env = setmetatable({}, {
-  __index = function(_, k)
+vim.env = setmetatable({
+  open = setmetatable({}, {
+      __call = function(_, uri)
+        print('xxxxx'..uri)
+        return true
+      end,
+      __tostring = function()
+        local v = vim.fn.getenv('open')
+        if v == vim.NIL then
+          return nil
+        end
+        return v
+      end,
+    })
+  },
+  {
+  __index = function(t, k, ...)
+    if k == 'open' then
+      error()
+      -- vim.print({...})
+      -- return rawget(t, k)
+    end
     local v = vim.fn.getenv(k)
     if v == vim.NIL then
       return nil
---
 runtime/doc/lua.txt              | 20 +++++------
 runtime/doc/news.txt             |  9 ++---
 runtime/doc/various.txt          | 13 +++----
 runtime/lua/vim/lsp/handlers.lua |  6 ++--
 runtime/lua/vim/ui.lua           | 75 ++++++++++++++++------------------------
 runtime/plugin/nvim.lua          | 17 +++++----
 6 files changed, 65 insertions(+), 75 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index f180471bde..b09e308e80 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2344,28 +2344,26 @@ input({opts}, {on_confirm})                                   *vim.ui.input()*
                       entered), or `nil` if the user aborted the dialog.
 
 open({path})                                                   *vim.ui.open()*
-    Opens a path in the system's default handler. This function utilizes
-    `xdg-open`, `wslview`, `explorer`, or `open` commands depending on the
-    system to open the provided path.
+    Opens `path` with the system default handler (macOS `open`, Windows
+    `explorer.exe`, Linux `xdg-open`, …), or shows a message on failure.
 
-    Notifies the user if unsuccessful
+    Expands "~/" and environment variables in filesystem paths.
 
-    Example: >lua
+    Examples: >lua
 
      vim.ui.open("https://neovim.io/")
-
-     vim.ui.open("/path/to/file")
+     vim.ui.open("~/path/to/file")
+     vim.ui.open("$VIMRUNTIME")
 <
 
     Parameters: ~
-      • {path}  (string) Path to be opened
+      • {path}  (string) Path or URL to open
 
     Return: ~
-        SystemCompleted|nil result Result of command, if an appropriate one
-        could be found.
+        SystemCompleted|nil result Command result, or nil if not found.
 
     See also: ~
-      • |vim.system|
+      • |vim.system()|
 
 select({items}, {opts}, {on_choice})                         *vim.ui.select()*
     Prompts the user to pick from a list of items, allowing arbitrary
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ed797f94ba..24e9dc917b 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -105,10 +105,10 @@ The following new APIs and features were added.
   https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
 
 • Bundled treesitter parser and queries (highlight, folds) for Markdown,
-Python, and Bash.
+  Python, and Bash.
 
 • |vim.ui.open()| opens URIs using the system default handler (macOS `open`,
-Windows `explorer`, Linux `xdg-open`, etc.)
+  Windows `explorer`, Linux `xdg-open`, etc.)
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
@@ -146,8 +146,9 @@ The following changes to existing APIs or features add new behavior.
 
 • |:Man| now respects 'wrapmargin'
 
-• The |gx| command now uses |vim.ui.open()| and not netrw. Continue using
-netrw with `vim.g.use_lua_gx = false`.
+• |gx| now uses |vim.ui.open()| and not netrw. To customize, you can redefine
+  `vim.ui.open` or remap `gx`. To continue using netrw (deprecated): >vim
+  :call netrw#BrowseX(expand(exists("g:netrw_gx")? g:netrw_gx : '<cfile>'), netrw#CheckIfRemote())<CR>
 
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index de1c21b310..956c37fc0f 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -98,13 +98,14 @@ g8			Print the hex values of the bytes used in the
 			command won't move the cursor.
 
 							*gx*
-gx			Open the current path or URL under the cursor in the 
-			system's default handler with |vim.ui.open|.
+gx			Opens the current filepath or URL (decided by
+			|<cfile>|, 'isfname') at cursor using the system
+			default handler, by calling |vim.ui.open()|.
+
+							*v_gx*
+{Visual}gx		Opens the selected text using the system default
+			handler, by calling |vim.ui.open()|.
 
-			To use the netrw keymap, set `use_lua_gx` to false:
->lua
-    vim.g.use_lua_gx = false
-<
 						*:p* *:pr* *:print* *E749*
 :[range]p[rint] [flags]
 			Print [range] lines (default current line).
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 9b102c0f84..79d3f7aab0 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -576,12 +576,12 @@ M['window/showDocument'] = function(_, result, ctx, _)
 
     local ret = vim.ui.open(uri)
 
-    if ret.code ~= 0 or ret == nil then
+    if ret == nil or ret.code ~= 0 then
       return {
         success = false,
         error = {
           code = protocol.ErrorCodes.UnknownErrorCode,
-          message = ret and ret.stderr or 'No handler could be found',
+          message = ret and ret.stderr or 'No handler found',
         },
       }
     end
@@ -593,7 +593,7 @@ M['window/showDocument'] = function(_, result, ctx, _)
   local client = vim.lsp.get_client_by_id(client_id)
   local client_name = client and client.name or string.format('id=%d', client_id)
   if not client then
-    err_message({ 'LSP[', client_name, '] client has shut down after sending ', ctx.method })
+    err_message('LSP[', client_name, '] client has shut down after sending ', ctx.method)
     return vim.NIL
   end
 
diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua
index 2200ee7bc3..3ffa329f74 100644
--- a/runtime/lua/vim/ui.lua
+++ b/runtime/lua/vim/ui.lua
@@ -104,69 +104,54 @@ function M.input(opts, on_confirm)
   end
 end
 
---- Opens a path in the system's default handler.
---- This function utilizes `xdg-open`, `wslview`, `explorer`, or `open` commands
---- depending on the system to open the provided path.
+--- Opens `path` with the system default handler (macOS `open`, Windows `explorer.exe`, Linux
+--- `xdg-open`, …), or shows a message on failure.
 ---
---- Notifies the user if unsuccessful
+--- Expands "~/" and environment variables in filesystem paths.
 ---
----@param path string Path to be opened
----
----@return SystemCompleted|nil result Result of command, if an appropriate one
----could be found.
----
----@see |vim.system|
----
---- Example:
+--- Examples:
 --- <pre>lua
 --- vim.ui.open("https://neovim.io/")
----
---- vim.ui.open("/path/to/file")
+--- vim.ui.open("~/path/to/file")
+--- vim.ui.open("$VIMRUNTIME")
 --- </pre>
+---
+---@param path string Path or URL to open
+---
+---@return SystemCompleted|nil result Command result, or nil if not found.
+---
+---@see |vim.system()|
 function M.open(path)
-  if not path or path == '' then
-    vim.notify('os_open: No path provided', vim.log.levels.ERROR)
-    return nil
+  vim.validate{
+    path={path, 'string'}
+  }
+  local is_uri = path:match('%w+:')
+  if not is_uri then
+    path = vim.fn.expand(path)
   end
 
   local cmd
 
-  if vim.fn.has('macunix') == 1 then
+  if vim.fn.has('mac') == 1 then
     cmd = { 'open', path }
   elseif vim.fn.has('win32') == 1 then
     cmd = { 'explorer', path }
+  elseif vim.fn.executable('wslview') == 1 then
+    cmd = { 'wslview', path }
+  elseif vim.fn.executable('xdg-open') == 1 then
+    cmd = { 'xdg-open', path }
   else
-    if vim.fn.executable('wslview') == 1 then
-      cmd = { 'wslview', path }
-    elseif vim.fn.executable('xdg-open') == 1 then
-      cmd = { 'xdg-open', path }
-    else
-      vim.notify(
-        'os_open: Could not find an appropriate command to use (Is xdg-open installed?)',
-        vim.log.levels.ERROR
-      )
-
-      return nil
-    end
+    vim.notify('vim.ui.open: no handler found (tried: wslview, xdg-open)', vim.log.levels.ERROR)
+    return nil
   end
 
-  local ret = vim
-    .system(cmd, {
-      text = true,
-      detach = true,
-    })
-    :wait()
-
-  if ret.code ~= 0 then
-    local msg = {
-      'Failed to open path',
-      ret,
-      vim.inspect(cmd),
-    }
-    vim.notify(table.concat(msg, '\n'), vim.log.levels.ERROR)
+  local rv = vim.system(cmd, { text = true, detach = true, }):wait()
+  if rv.code ~= 0 then
+    local msg = ('vim.ui.open: command failed (%d): %s'):format(rv.code, vim.inspect(cmd))
+    vim.notify(msg, vim.log.levels.ERROR)
   end
 
-  return ret
+  return rv
 end
 
 return M
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index fcc1b016aa..9fff6246e3 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -19,10 +19,15 @@ vim.api.nvim_create_user_command('InspectTree', function(cmd)
   end
 end, { desc = 'Inspect treesitter language tree for buffer', count = true })
 
-if vim.g.use_lua_gx == nil or vim.g.use_lua_gx == true then
-  vim.keymap.set({ 'n', 'x' }, 'gx', function()
-    local uri = vim.fn.expand('<cfile>')
-
-    vim.ui.open(uri)
-  end, { desc = 'Open URI under cursor with system app' })
+-- TODO: use vim.region() when it lands... #13896 #16843
+local function get_visual_selection()
+  local save_a = vim.fn.getreginfo('a')
+  vim.cmd[[norm! "ay]]
+  local selection = vim.fn.getreg('a', 1)
+  vim.fn.setreg('a', save_a)
+  return selection
 end
+
+local gx_desc = 'Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)'
+vim.keymap.set({ 'n' }, 'gx', function() vim.ui.open(vim.fn.expand('<cfile>')) end, { desc = gx_desc })
+vim.keymap.set({ 'x' }, 'gx', function() vim.ui.open(get_visual_selection()) end, { desc = gx_desc })
-- 
cgit 


From e644e7ce0b36dd5e75770f3faa0a84f15e2561e8 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 4 Jul 2023 23:33:23 +0200
Subject: fix(vim.ui.open): return (don't show) error message

Problem:
Showing an error via vim.notify() makes it awkward for callers such as
lsp/handlers.lua to avoid showing redundant errors.

Solution:
Return the message instead of showing it. Let the caller decide whether
and when to show the message.
---
 runtime/doc/lua.txt              |  6 ++++--
 runtime/lua/vim/lsp/handlers.lua |  5 ++---
 runtime/lua/vim/ui.lua           | 20 ++++++++++----------
 runtime/plugin/nvim.lua          | 19 +++++++++++++++----
 4 files changed, 31 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index b09e308e80..77a89a123d 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2345,7 +2345,8 @@ input({opts}, {on_confirm})                                   *vim.ui.input()*
 
 open({path})                                                   *vim.ui.open()*
     Opens `path` with the system default handler (macOS `open`, Windows
-    `explorer.exe`, Linux `xdg-open`, …), or shows a message on failure.
+    `explorer.exe`, Linux `xdg-open`, …), or returns (but does not show) an
+    error message on failure.
 
     Expands "~/" and environment variables in filesystem paths.
 
@@ -2360,7 +2361,8 @@ open({path})                                                   *vim.ui.open()*
       • {path}  (string) Path or URL to open
 
     Return: ~
-        SystemCompleted|nil result Command result, or nil if not found.
+        SystemCompleted|nil # Command result, or nil if not found.
+        (string|nil) # Error message on failure
 
     See also: ~
       • |vim.system()|
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 79d3f7aab0..70781cb7a6 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -573,15 +573,14 @@ M['window/showDocument'] = function(_, result, ctx, _)
 
   if result.external then
     -- TODO(lvimuser): ask the user for confirmation
-
-    local ret = vim.ui.open(uri)
+    local ret, err = vim.ui.open(uri)
 
     if ret == nil or ret.code ~= 0 then
       return {
         success = false,
         error = {
           code = protocol.ErrorCodes.UnknownErrorCode,
-          message = ret and ret.stderr or 'No handler found',
+          message = ret and ret.stderr or err,
         },
       }
     end
diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua
index 3ffa329f74..fd06611da2 100644
--- a/runtime/lua/vim/ui.lua
+++ b/runtime/lua/vim/ui.lua
@@ -105,7 +105,7 @@ function M.input(opts, on_confirm)
 end
 
 --- Opens `path` with the system default handler (macOS `open`, Windows `explorer.exe`, Linux
---- `xdg-open`, …), or shows a message on failure.
+--- `xdg-open`, …), or returns (but does not show) an error message on failure.
 ---
 --- Expands "~/" and environment variables in filesystem paths.
 ---
@@ -118,13 +118,14 @@ end
 ---
 ---@param path string Path or URL to open
 ---
----@return SystemCompleted|nil result Command result, or nil if not found.
+---@return SystemCompleted|nil # Command result, or nil if not found.
+---@return string|nil # Error message on failure
 ---
 ---@see |vim.system()|
 function M.open(path)
-  vim.validate{
-    path={path, 'string'}
-  }
+  vim.validate({
+    path = { path, 'string' },
+  })
   local is_uri = path:match('%w+:')
   if not is_uri then
     path = vim.fn.expand(path)
@@ -141,17 +142,16 @@ function M.open(path)
   elseif vim.fn.executable('xdg-open') == 1 then
     cmd = { 'xdg-open', path }
   else
-    vim.notify('vim.ui.open: no handler found (tried: wslview, xdg-open)', vim.log.levels.ERROR)
-    return nil
+    return nil, 'vim.ui.open: no handler found (tried: wslview, xdg-open)'
   end
 
-  local rv = vim.system(cmd, { text = true, detach = true, }):wait()
+  local rv = vim.system(cmd, { text = true, detach = true }):wait()
   if rv.code ~= 0 then
     local msg = ('vim.ui.open: command failed (%d): %s'):format(rv.code, vim.inspect(cmd))
-    vim.notify(msg, vim.log.levels.ERROR)
+    return rv, msg
   end
 
-  return rv
+  return rv, nil
 end
 
 return M
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index 9fff6246e3..33d399e577 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -22,12 +22,23 @@ end, { desc = 'Inspect treesitter language tree for buffer', count = true })
 -- TODO: use vim.region() when it lands... #13896 #16843
 local function get_visual_selection()
   local save_a = vim.fn.getreginfo('a')
-  vim.cmd[[norm! "ay]]
+  vim.cmd([[norm! "ay]])
   local selection = vim.fn.getreg('a', 1)
   vim.fn.setreg('a', save_a)
   return selection
 end
 
-local gx_desc = 'Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)'
-vim.keymap.set({ 'n' }, 'gx', function() vim.ui.open(vim.fn.expand('<cfile>')) end, { desc = gx_desc })
-vim.keymap.set({ 'x' }, 'gx', function() vim.ui.open(get_visual_selection()) end, { desc = gx_desc })
+local gx_desc =
+  'Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)'
+local function do_open(uri)
+  local _, err = vim.ui.open(uri)
+  if err then
+    vim.notify(err, vim.log.levels.ERROR)
+  end
+end
+vim.keymap.set({ 'n' }, 'gx', function()
+  do_open(vim.fn.expand('<cfile>'))
+end, { desc = gx_desc })
+vim.keymap.set({ 'x' }, 'gx', function()
+  do_open(get_visual_selection())
+end, { desc = gx_desc })
-- 
cgit 


From 77118d0da8badc4135be430f4cbb15bc95bc760f Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Thu, 20 Apr 2023 21:17:25 +0100
Subject: fix(api): use text_locked() to check textlock

Problem: some API functions that check textlock (usually those that can change
curwin or curbuf) can break the cmdwin.

Solution: make FUNC_API_CHECK_TEXTLOCK call text_locked() instead, which already
checks for textlock, cmdwin and `<expr>` status.

Add FUNC_API_TEXTLOCK_ALLOW_CMDWIN to allow such functions to be usable in the
cmdwin if they can work properly there; the opt-in nature of this attribute
should hopefully help mitigate future bugs.

Also fix a regression in #22634 that made functions checking textlock usable in
`<expr>` mappings, and rename FUNC_API_CHECK_TEXTLOCK to FUNC_API_TEXTLOCK.
---
 runtime/doc/api.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 87ea000047..203468cc8a 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1365,7 +1365,7 @@ nvim_set_current_buf({buffer})                        *nvim_set_current_buf()*
     Sets the current buffer.
 
     Attributes: ~
-        not allowed when |textlock| is active
+        not allowed when |textlock| is active or in the |cmdwin|
 
     Parameters: ~
       • {buffer}  Buffer handle
@@ -1389,7 +1389,7 @@ nvim_set_current_tabpage({tabpage})               *nvim_set_current_tabpage()*
     Sets the current tabpage.
 
     Attributes: ~
-        not allowed when |textlock| is active
+        not allowed when |textlock| is active or in the |cmdwin|
 
     Parameters: ~
       • {tabpage}  Tabpage handle
@@ -1398,7 +1398,7 @@ nvim_set_current_win({window})                        *nvim_set_current_win()*
     Sets the current window.
 
     Attributes: ~
-        not allowed when |textlock| is active
+        not allowed when |textlock| is active or in the |cmdwin|
 
     Parameters: ~
       • {window}  Window handle
@@ -2163,7 +2163,7 @@ nvim_buf_delete({buffer}, {opts})                          *nvim_buf_delete()*
     Deletes the buffer. See |:bwipeout|
 
     Attributes: ~
-        not allowed when |textlock| is active
+        not allowed when |textlock| is active or in the |cmdwin|
 
     Parameters: ~
       • {buffer}  Buffer handle, or 0 for current buffer
@@ -2894,7 +2894,7 @@ nvim_win_hide({window})                                      *nvim_win_hide()*
     or |nvim_win_close()|, which will close the buffer.
 
     Attributes: ~
-        not allowed when |textlock| is active
+        not allowed when |textlock| is active or in the |cmdwin|
 
     Parameters: ~
       • {window}  Window handle, or 0 for current window
@@ -2912,7 +2912,7 @@ nvim_win_set_buf({window}, {buffer})                      *nvim_win_set_buf()*
     Sets the current buffer in a window, without side effects
 
     Attributes: ~
-        not allowed when |textlock| is active
+        not allowed when |textlock| is active or in the |cmdwin|
 
     Parameters: ~
       • {window}  Window handle, or 0 for current window
@@ -2999,7 +2999,7 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
 <
 
     Attributes: ~
-        not allowed when |textlock| is active
+        not allowed when |textlock| is active or in the |cmdwin|
 
     Parameters: ~
       • {buffer}  Buffer to display, or 0 for current buffer
-- 
cgit 


From aa4e47f704c53ab1d825260d2bf34e2872e3ca89 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Fri, 23 Jun 2023 22:32:07 +0100
Subject: fix(api): disallow some more functions during textlock

Problem: nvim_buf_set_text(), nvim_open_term() and termopen() all change buffer
text, which is forbidden during textlock. Additionally, nvim_open_term() and
termopen() may be used to convert the cmdwin buffer into a terminal buffer,
which is weird.

Solution: Allow nvim_buf_set_text() and nvim_open_term() in the cmdwin, but
disallow nvim_open_term() from converting the cmdwin buffer into a terminal
buffer. termopen() is not allowed in the cmdwin (as it always operates on
curbuf), so just check text_locked().

Also happens to improve the error in #21055: nvim_buf_set_text() was callable
during textlock, but happened to check textlock indirectly via u_save();
however, this caused the error to be overwritten by an unhelpful "Failed to
save undo information" message when msg_list == NULL (e.g: an `<expr>` mapping
invoked outside of do_cmdline()).
---
 runtime/doc/api.txt | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 203468cc8a..46c5f2ea18 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1200,6 +1200,9 @@ nvim_open_term({buffer}, {opts})                            *nvim_open_term()*
     |nvim_chan_send()| can be called immediately to process sequences in a
     virtual terminal having the intended size.
 
+    Attributes: ~
+        not allowed when |textlock| is active
+
     Parameters: ~
       • {buffer}  the buffer to use (expected to be empty)
       • {opts}    Optional parameters.
@@ -2426,6 +2429,9 @@ nvim_buf_set_text({buffer}, {start_row}, {start_col}, {end_row}, {end_col},
     Prefer |nvim_buf_set_lines()| if you are only adding or deleting entire
     lines.
 
+    Attributes: ~
+        not allowed when |textlock| is active
+
     Parameters: ~
       • {buffer}       Buffer handle, or 0 for current buffer
       • {start_row}    First line index
-- 
cgit 


From df297e3c2bd743616371db73467a3f08d2b96d9b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 5 Jul 2023 16:31:45 +0800
Subject: fix(runtime): don't set gx mapping if already mapped (#24262)

This matches netrw's use of maparg().
---
 runtime/plugin/nvim.lua | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index 33d399e577..e3d4625c3b 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -36,9 +36,13 @@ local function do_open(uri)
     vim.notify(err, vim.log.levels.ERROR)
   end
 end
-vim.keymap.set({ 'n' }, 'gx', function()
-  do_open(vim.fn.expand('<cfile>'))
-end, { desc = gx_desc })
-vim.keymap.set({ 'x' }, 'gx', function()
-  do_open(get_visual_selection())
-end, { desc = gx_desc })
+if vim.fn.maparg('gx', 'n') == '' then
+  vim.keymap.set({ 'n' }, 'gx', function()
+    do_open(vim.fn.expand('<cfile>'))
+  end, { desc = gx_desc })
+end
+if vim.fn.maparg('gx', 'x') == '' then
+  vim.keymap.set({ 'x' }, 'gx', function()
+    do_open(get_visual_selection())
+  end, { desc = gx_desc })
+end
-- 
cgit 


From 1de82e16c1216e1dbe22cf7a8ec9ea9e9e69b631 Mon Sep 17 00:00:00 2001
From: fredizzimo <fsundvik@gmail.com>
Date: Wed, 5 Jul 2023 16:31:34 +0300
Subject: fix(ui): delay win_viewport until screen update #24182

Problem:
Sometimes, when nvim sends the `win_viewport` event, for example when scrolling
with visible folds on the screen, it reports the `scroll_delta` value one batch
into "future". So when the client application is trying to show the new viewport
it's not yet updated, resulting in temporary corruption / screen flickering.

For more details see #23609, and starting from [this comment](
https://github.com/neovide/neovide/pull/1790#issuecomment-1518697747) in
https://github.com/neovide/neovide/pull/1790,, where the issue was first
detected. Note that some of the conclusions in those are not fully accurate, but
the general observations are.

Solution:
When there are pending updates to a Window, delay the `win_viewport` UI event
until the updates are sent. This ensures that there's no flush between sending
the viewport and updating of the lines corresponding to the new viewport.

Document the existing viewport behaviour (for cases where there are no
extra flushes), give a hint about how applications can deal with the slightly
surprising behaviour of the viewport event being sent after the updates.

Fixes https://github.com/neovim/neovim/issues/23609
---
 runtime/doc/ui.txt | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index ead5e31e32..ec1d43d878 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -643,6 +643,13 @@ tabs.
 	only count as one line. When scrolling more than a full screen it is
 	an approximate value.
 
+	All updates, such as `grid_line`, in a batch affects the new viewport,
+	despite the fact that `win_viewport` is received after the updates.
+	Applications implementing, for example, smooth scrolling should take
+	this into account and keep the grid separated from what's displayed on
+	the screen and copy it to the viewport destination once `win_viewport`
+	is received.
+
 ["win_extmark", grid, win, ns_id, mark_id, row, col] ~
 	Updates the position of an extmark which is currently visible in a
 	window. Only emitted if the mark has the `ui_watched` attribute. 
-- 
cgit 


From 2afb04758c341e17c70b8d2e3869c901c8cdb7d2 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 6 Jul 2023 12:56:19 +0800
Subject: fix(vim.system): close check handle (#24270)

Fix hang after running vim.system() with sanitizers.
---
 runtime/lua/vim/_system.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua
index eadf801a31..ff566866c0 100644
--- a/runtime/lua/vim/_system.lua
+++ b/runtime/lua/vim/_system.lua
@@ -287,6 +287,7 @@ function M.run(cmd, opts, on_exit)
         end
       end
       check:stop()
+      check:close()
 
       state.done = true
       state.result = {
-- 
cgit 


From 4e34ca8ae71d7dfac5c93ffe8e4e8d00f915c593 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 6 Jul 2023 14:57:46 +0800
Subject: docs(luaref): remove parentheses from tags for typedefs (#24271)

And fix alignment.
---
 runtime/doc/luaref.txt | 96 +++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index dbf2f0de79..a5b9e433ed 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -1528,7 +1528,7 @@ Whenever Lua calls C, the called function gets a new stack, which is
 independent of previous stacks and of stacks of C functions that are still
 active. This stack initially contains any arguments to the C function and it
 is where the C function pushes its results to be returned to the caller (see
-|lua_CFunction()|).
+|lua_CFunction|).
 
                                                              *luaref-stackindex*
 For convenience, most query operations in the API do not follow a strict stack
@@ -1638,7 +1638,7 @@ Inside a C function you can raise an error by calling `lua_error`  (see
 
 Here we list all functions and types from the C API in alphabetical order.
 
-lua_Alloc                                                          *lua_Alloc()*
+lua_Alloc                                                            *lua_Alloc*
 >c
     typedef void * (*lua_Alloc) (void *ud,
                                  void *ptr,
@@ -1736,7 +1736,7 @@ lua_call                                                            *lua_call()*
         to its original configuration. This is considered good programming
         practice.
 
-lua_CFunction                             *luaref-cfunction* *lua_CFunction()*
+lua_CFunction                                   *luaref-cfunction* *lua_CFunction*
 >c
     typedef int (*lua_CFunction) (lua_State *L);
 <
@@ -1836,7 +1836,7 @@ lua_dump                                                            *lua_dump()*
         of the stack and produces a binary chunk that, if loaded again,
         results in a function equivalent to the one dumped. As it produces
         parts of the chunk, `lua_dump` calls function `writer` (see
-        |lua_Writer()|) with the given `data` to write them.
+        |lua_Writer|) with the given `data` to write them.
 
         The value returned is the error code returned by the last call to the
         writer; 0 means no errors.
@@ -1963,7 +1963,7 @@ lua_insert                                                        *lua_insert()*
         elements above this index to open space. Cannot be called with a
         pseudo-index, because a pseudo-index is not an actual stack position.
 
-lua_Integer                                                      *lua_Integer()*
+lua_Integer                                                        *lua_Integer*
 >c
     typedef ptrdiff_t lua_Integer;
 <
@@ -2072,7 +2072,7 @@ lua_load                                                            *lua_load()*
         and loads it accordingly (see program `luac`).
 
         The `lua_load` function uses a user-supplied `reader` function to read
-        the chunk (see |lua_Reader()|). The `data` argument is an opaque
+        the chunk (see |lua_Reader|). The `data` argument is an opaque
         value passed to the reader function.
 
         The `chunkname` argument gives a name to the chunk, which is used for
@@ -2101,7 +2101,7 @@ lua_newthread                                                  *lua_newthread()*
     lua_State *lua_newthread (lua_State *L);
 <
         Creates a new thread, pushes it on the stack, and returns a pointer to
-        a `lua_State`  (see |lua_State()|) that represents this new
+        a `lua_State`  (see |lua_State|) that represents this new
         thread. The new state returned by this function shares with the
         original state all global objects (such as tables), but has an
         independent execution stack.
@@ -2155,7 +2155,7 @@ lua_next                                                            *lua_next()*
         key is actually a string. Recall that `lua_tolstring` `changes` the
         value at the given index; this confuses the next call to `lua_next`.
 
-lua_Number                                                        *lua_Number()*
+lua_Number                                                          *lua_Number*
 >c
     typedef double lua_Number;
 <
@@ -2247,7 +2247,7 @@ lua_pushcfunction                                          *lua_pushcfunction()*
 
         Any function to be registered in Lua must follow the correct protocol
         to receive its parameters and return its results (see
-        |lua_CFunction()|).
+        |lua_CFunction|).
 
         `lua_pushcfunction` is defined as a macro:
 >c
@@ -2386,7 +2386,7 @@ lua_rawseti                                                      *lua_rawseti()*
         This function pops the value from the stack. The assignment is raw;
         that is, it does not invoke metamethods.
 
-lua_Reader                                                        *lua_Reader()*
+lua_Reader                                                          *lua_Reader*
 >c
     typedef const char * (*lua_Reader) (lua_State *L,
                                         void *data,
@@ -2516,7 +2516,7 @@ lua_settop                                                        *lua_settop()*
         elements are filled with `nil`. If `index` is 0, then all stack
         elements are removed.
 
-lua_State                                                          *lua_State()*
+lua_State                                                            *lua_State*
 >c
     typedef struct lua_State lua_State;
 <
@@ -2561,7 +2561,7 @@ lua_tointeger                                                  *lua_tointeger()*
     lua_Integer lua_tointeger (lua_State *L, int idx);
 <
         Converts the Lua value at the given acceptable index to the signed
-        integral type `lua_Integer` (see |lua_Integer()|). The Lua value
+        integral type `lua_Integer` (see |lua_Integer|). The Lua value
         must be a number or a string convertible to a number (see
         |luaref-langCoercion|); otherwise, `lua_tointeger` returns 0.
 
@@ -2592,7 +2592,7 @@ lua_tonumber                                                    *lua_tonumber()*
     lua_Number lua_tonumber (lua_State *L, int index);
 <
         Converts the Lua value at the given acceptable index to the C type
-        `lua_Number` (see |lua_Number()|). The Lua value must be a number
+        `lua_Number` (see |lua_Number|). The Lua value must be a number
         or a string convertible to a number (see |luaref-langCoercion|);
         otherwise, `lua_tonumber` returns 0.
 
@@ -2620,7 +2620,7 @@ lua_tothread                                                    *lua_tothread()*
     lua_State *lua_tothread (lua_State *L, int index);
 <
         Converts the value at the given acceptable index to a Lua thread
-        (represented as `lua_State*` |lua_State()|). This value must be a
+        (represented as `lua_State*` |lua_State|). This value must be a
         thread; otherwise, the function returns `NULL`.
 
 lua_touserdata                                                *lua_touserdata()*
@@ -2649,7 +2649,7 @@ lua_typename                                                    *lua_typename()*
         Returns the name of the type encoded by the value `tp`, which must be
         one the values returned by `lua_type`.
 
-lua_Writer                                                        *lua_Writer()*
+lua_Writer                                                          *lua_Writer*
 >c
     typedef int (*lua_Writer) (lua_State *L,
                                const void* p,
@@ -2713,7 +2713,7 @@ interface by means of functions and hooks. This interface allows the
 construction of different kinds of debuggers, profilers, and other tools that
 need "inside information" from the interpreter.
 
-lua_Debug                                                          *lua_Debug()*
+lua_Debug                                                            *lua_Debug*
 
 >c
     typedef struct lua_Debug {
@@ -2737,7 +2737,7 @@ function. `lua_getstack` (see |lua_getstack()|) fills only the private part
 of this structure, for later use. To fill the other fields of `lua_Debug` with
 useful information, call `lua_getinfo` (see |lua_getinfo()|).
 
-The fields of `lua_Debug`  have the following meaning:
+The fields of `lua_Debug` have the following meaning:
 
 - `source`             If the function was defined in a string, then `source` is
                      that string. If the function was defined in a file, then
@@ -2794,7 +2794,7 @@ lua_getinfo                                                      *lua_getinfo()*
         To get information about a function invocation, the parameter `ar`
         must be a valid activation record that was filled by a previous call
         to `lua_getstack` (see |lua_getstack()|) or given as argument to
-        a hook (see |lua_Hook()|).
+        a hook (see |lua_Hook|).
 
         To get information about a function you push it onto the stack and
         start the `what` string with the character `>`. (In that case,
@@ -2832,7 +2832,7 @@ lua_getlocal                                                    *lua_getlocal()*
         Gets information about a local variable of a given activation record.
         The parameter `ar` must be a valid activation record that was filled
         by a previous call to `lua_getstack` (see |lua_getstack()|) or
-        given as argument to a hook (see |lua_Hook()|). The index `n`
+        given as argument to a hook (see |lua_Hook|). The index `n`
         selects which local variable to inspect (1 is the first parameter or
         active local variable, and so on, until the last active local
         variable). `lua_getlocal` pushes the variable's value onto the stack
@@ -2851,7 +2851,7 @@ lua_getstack                                                    *lua_getstack()*
 <
         Gets information about the interpreter runtime stack.
 
-        This function fills parts of a `lua_Debug` (see |lua_Debug()|)
+        This function fills parts of a `lua_Debug` (see |lua_Debug|)
         structure with an identification of the `activation record` of the
         function executing at a given level. Level 0 is the current running
         function, whereas level `n+1` is the function that has called level
@@ -2874,7 +2874,7 @@ lua_getupvalue                                                *lua_getupvalue()*
         number of upvalues. For C functions, this function uses the empty
         string `""` as a name for all upvalues.
 
-lua_Hook                                                            *lua_Hook()*
+lua_Hook                                                              *lua_Hook*
 >c
     typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
 <
@@ -3005,20 +3005,20 @@ luaL_addchar                                                    *luaL_addchar()*
 >c
     void luaL_addchar (luaL_Buffer *B, char c);
 <
-        Adds the character `c` to the buffer `B` (see |luaL_Buffer()|).
+        Adds the character `c` to the buffer `B` (see |luaL_Buffer|).
 
 luaL_addlstring                                              *luaL_addlstring()*
 >c
     void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l);
 <
         Adds the string pointed to by `s` with length `l` to the buffer `B`
-        (see |luaL_Buffer()|). The string may contain embedded zeros.
+        (see |luaL_Buffer|). The string may contain embedded zeros.
 
 luaL_addsize                                                    *luaL_addsize()*
 >c
     void luaL_addsize (luaL_Buffer *B, size_t n);
 <
-        Adds to the buffer `B` (see |luaL_Buffer()|) a string of length
+        Adds to the buffer `B` (see |luaL_Buffer|) a string of length
         `n` previously copied to the buffer area (see
         |luaL_prepbuffer()|).
 
@@ -3027,14 +3027,14 @@ luaL_addstring                                                *luaL_addstring()*
     void luaL_addstring (luaL_Buffer *B, const char *s);
 <
         Adds the zero-terminated string pointed to by `s` to the buffer `B`
-        (see |luaL_Buffer()|). The string may not contain embedded zeros.
+        (see |luaL_Buffer|). The string may not contain embedded zeros.
 
 luaL_addvalue                                                  *luaL_addvalue()*
 >c
     void luaL_addvalue (luaL_Buffer *B);
 <
         Adds the value at the top of the stack to the buffer `B` (see
-        |luaL_Buffer()|). Pops the value.
+        |luaL_Buffer|). Pops the value.
 
         This is the only function on string buffers that can (and must) be
         called with an extra element on the stack, which is the value to be
@@ -3065,7 +3065,7 @@ luaL_argerror                                                  *luaL_argerror()*
         This function never returns, but it is an idiom to use it in C
         functions as `return luaL_argerror(` `args` `)`.
 
-luaL_Buffer                                                      *luaL_Buffer()*
+luaL_Buffer                                                        *luaL_Buffer*
 >c
     typedef struct luaL_Buffer luaL_Buffer;
 <
@@ -3099,7 +3099,7 @@ luaL_buffinit                                                  *luaL_buffinit()*
     void luaL_buffinit (lua_State *L, luaL_Buffer *B);
 <
         Initializes a buffer `B`. This function does not allocate any space;
-        the buffer must be declared as a variable (see |luaL_Buffer()|).
+        the buffer must be declared as a variable (see |luaL_Buffer|).
 
 luaL_callmeta                                                  *luaL_callmeta()*
 >c
@@ -3133,7 +3133,7 @@ luaL_checkinteger                                          *luaL_checkinteger()*
     lua_Integer luaL_checkinteger (lua_State *L, int narg);
 <
         Checks whether the function argument `narg` is a number and returns
-        this number cast to a `lua_Integer` (see |lua_Integer()|).
+        this number cast to a `lua_Integer` (see |lua_Integer|).
 
 luaL_checklong                                                *luaL_checklong()*
 >c
@@ -3154,7 +3154,7 @@ luaL_checknumber                                            *luaL_checknumber()*
     lua_Number luaL_checknumber (lua_State *L, int narg);
 <
         Checks whether the function argument `narg` is a number and returns
-        this number (see |lua_Number()|).
+        this number (see |lua_Number|).
 
 luaL_checkoption                                            *luaL_checkoption()*
 >c
@@ -3351,7 +3351,7 @@ luaL_optinteger                                              *luaL_optinteger()*
                                  lua_Integer d);
 <
         If the function argument `narg` is a number, returns this number cast
-        to a `lua_Integer` (see |lua_Integer()|). If this argument is
+        to a `lua_Integer` (see |lua_Integer|). If this argument is
         absent or is `nil`, returns `d`. Otherwise, raises an error.
 
 luaL_optlong                                                    *luaL_optlong()*
@@ -3398,7 +3398,7 @@ luaL_prepbuffer                                              *luaL_prepbuffer()*
     char *luaL_prepbuffer (luaL_Buffer *B);
 <
         Returns an address to a space of size `LUAL_BUFFERSIZE` where you can
-        copy a string to be added to buffer `B` (see |luaL_Buffer()|).
+        copy a string to be added to buffer `B` (see |luaL_Buffer|).
         After copying the string into this space you must call `luaL_addsize`
         (see |luaL_addsize()|) with the size of the string to actually
         add it to the buffer.
@@ -3428,7 +3428,7 @@ luaL_ref                                                            *luaL_ref()*
         constant `LUA_REFNIL`. The constant `LUA_NOREF` is guaranteed to be
         different from any reference returned by `luaL_ref`.
 
-luaL_Reg                                                            *luaL_Reg()*
+luaL_Reg                                                              *luaL_Reg*
 >c
     typedef struct luaL_Reg {
         const char *name;
@@ -3449,7 +3449,7 @@ luaL_register                                                  *luaL_register()*
         Opens a library.
 
         When called with `libname` equal to `NULL`, it simply registers all
-        functions in the list `l` (see |luaL_Reg()|) into the table on
+        functions in the list `l` (see |luaL_Reg|) into the table on
         the top of the stack.
 
         When called with a non-null `libname`, `luaL_register` creates a new
@@ -3592,7 +3592,7 @@ error({message} [, {level}])                                    *luaref-error()*
         a level 0 avoids the addition of error position information to the
         message.
 
-_G                                                                 *luaref-_G()*
+_G                                                                   *luaref-_G*
         A global variable (not a function) that holds the global environment
         (that is, `_G._G = _G`). Lua itself does not use this variable;
         changing its value does not affect any environment, nor vice-versa.
@@ -3763,7 +3763,7 @@ unpack({list} [, {i} [, {j}]])                                 *luaref-unpack()*
         elements. By default, {i} is 1 and {j} is the length of the list, as
         defined by the length operator(see |luaref-langLength|).
 
-_VERSION                                                     *luaref-_VERSION()*
+_VERSION                                                       *luaref-_VERSION*
         A global variable (not a function) that holds a string containing the
         current interpreter version. The current contents of this string is
         `"Lua 5.1"` .
@@ -3830,14 +3830,14 @@ coroutine.yield({...})                                       *coroutine.yield()*
         to `yield` are passed as extra results to `resume`.
 
 ==============================================================================
-5.3 Modules                                                 *luaref-libModule*
+5.3 Modules                                                   *luaref-libModule*
 
 The package library provides basic facilities for loading and building modules
 in Lua. It exports two of its functions directly in the global environment:
 `require` and `module` (see |luaref-require()| and |luaref-module()|). Everything else is
 exported in a table `package`.
 
-module({name} [, {...}])                                      *luaref-module()*
+module({name} [, {...}])                                       *luaref-module()*
         Creates a module. If there is a table in `package.loaded[name]`, this
         table is the module. Otherwise, if there is a global table `t` with
         the given name, this table is the module. Otherwise creates a new
@@ -3901,7 +3901,7 @@ require({modname})                                            *luaref-require()*
         If there is any error loading or running the module, or if it cannot
         find any loader for the module, then `require` signals an error.
 
-package.cpath                                                  *package.cpath*
+package.cpath                                                    *package.cpath*
         The path used by `require` to search for a C loader.
 
         Lua initializes the C path `package.cpath` in the same way it
@@ -3914,11 +3914,11 @@ package.loaded                                                *package.loaded()*
         When you require a module `modname` and `package.loaded[modname]` is
         not false, `require` simply returns the value stored there.
 
-package.loadlib({libname}, {funcname})                     *package.loadlib()*
+package.loadlib({libname}, {funcname})                       *package.loadlib()*
         Dynamically links the host program with the C library {libname}.
         Inside this library, looks for a function {funcname} and returns this
         function as a C function. (So, {funcname} must follow the protocol
-        (see |lua_CFunction()|)).
+        (see |lua_CFunction|)).
 
         This is a low-level function. It completely bypasses the package and
         module system. Unlike `require`, it does not perform any path
@@ -3931,7 +3931,7 @@ package.loadlib({libname}, {funcname})                     *package.loadlib()*
         available on some platforms (Windows, Linux, Mac OS X, Solaris, BSD,
         plus other Unix systems that support the `dlfcn` standard).
 
-package.path                                                    *package.path*
+package.path                                                      *package.path*
         The path used by `require` to search for a Lua loader.
 
         At start-up, Lua initializes this variable with the value of the
@@ -3960,7 +3960,7 @@ package.seeall({module})                                      *package.seeall()*
         global environment. To be used as an option to function {module}.
 
 ==============================================================================
-5.4 String Manipulation                                     *luaref-libString*
+5.4 String Manipulation                                       *luaref-libString*
 
 This library provides generic functions for string manipulation, such as
 finding and extracting substrings, and pattern matching. When indexing a
@@ -4060,7 +4060,7 @@ string.gmatch({s}, {pattern})                                  *string.gmatch()*
                end
 <
 
-string.gsub({s}, {pattern}, {repl} [, {n}])                    *string.gsub()*
+string.gsub({s}, {pattern}, {repl} [, {n}])                      *string.gsub()*
         Returns a copy of {s} in which all occurrences of the {pattern} have
         been replaced by a replacement string specified by {repl}, which may
         be a string, a table, or a function. `gsub` also returns, as its
@@ -4265,7 +4265,7 @@ table.concat({table} [, {sep} [, {i} [, {j}]]])                 *table.concat()*
         for {j} is the length of the table. If {i} is greater than {j},
         returns the empty string.
 
-table.foreach({table}, {f})                                  *table.foreach()*
+table.foreach({table}, {f})                                    *table.foreach()*
         Executes the given {f} over all elements of {table}. For each element,
         {f} is called with the index and respective value as arguments. If {f}
         returns a non-`nil` value, then the loop is broken, and this value is
@@ -4273,7 +4273,7 @@ table.foreach({table}, {f})                                  *table.foreach()*
 
         See |luaref-next()| for extra information about table traversals.
 
-table.foreachi({table}, {f})                                *table.foreachi()*
+table.foreachi({table}, {f})                                  *table.foreachi()*
         Executes the given {f} over the numerical indices of {table}. For each
         index, {f} is called with the index and respective value as arguments.
         Indices are visited in sequential order, from 1 to `n`, where `n` is
@@ -4293,14 +4293,14 @@ table.maxn({table})                                               *table.maxn()*
         zero if the table has no positive numerical indices. (To do its job
         this function does a linear traversal of the whole table.)
 
-table.remove({table} [, {pos}])                               *table.remove()*
+table.remove({table} [, {pos}])                                 *table.remove()*
         Removes from {table} the element at position {pos}, shifting down
         other elements to close the space, if necessary. Returns the value of
         the removed element. The default value for {pos} is `n`, where `n` is
         the length of the table (see |luaref-langLength|), so that a call
         `table.remove(t)` removes the last element of table `t`.
 
-table.sort({table} [, {comp}])                                  *table.sort()*
+table.sort({table} [, {comp}])                                    *table.sort()*
         Sorts table elements in a given order, `in-place`, from `table[1]` to
         `table[n]`, where `n` is the length of the table (see
         |luaref-langLength|). If {comp} is given, then it must be a function
-- 
cgit 


From abd380e28d48dd155b1e29cd2453f13b28bf7e08 Mon Sep 17 00:00:00 2001
From: Steven Ward <planet36@users.noreply.github.com>
Date: Mon, 5 Jun 2023 22:05:51 -0500
Subject: fix(defaults): visual mode star (*,#) is fragile

Problem:
Visual mode "*", "#" mappings don't work on text with "/", "\", "?", and
newlines.

Solution:
Get the visual selection and escape it as a search pattern.
Add functions vim.get_visual_selection and _search_for_visual_selection.

Fix #21676
---
 runtime/doc/lua.txt         | 19 ++++++++++
 runtime/doc/vim_diff.txt    |  5 +--
 runtime/lua/vim/_editor.lua | 84 +++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 100 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 77a89a123d..9d3a3dec71 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1410,6 +1410,25 @@ deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
     Return: ~
         Deprecated message, or nil if no message was shown.
 
+                                                  *vim.get_visual_selection()*
+get_visual_selection({list}, {append_empty})
+    Gets the content of the visual selection.
+
+    The result is either a string or, if {list} is `true`, a list of strings.
+    If not in any |visual-mode|, `nil` is returned.
+
+    Parameters: ~
+      • {list}          boolean|nil Return a list of strings instead of a
+                        string. See |getreg()|. Defaults to `false`.
+      • {append_empty}  boolean|nil Append an empty string to the result when
+                        in |linewise-visual| mode and {list} is `true`. This
+                        will preserve the trailing newline of the selection
+                        when the result is concatenated with `"\n"`. Defaults
+                        to `false`.
+
+    Return: ~
+        string|table
+
 inspect({object}, {options})                                   *vim.inspect()*
     Gets a human-readable representation of the given object.
 
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 686905537d..4abecfc321 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -119,10 +119,11 @@ of these in your config by simply removing the mapping, e.g. ":unmap Y".
 	nnoremap <C-L> <Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>
 	inoremap <C-U> <C-G>u<C-U>
 	inoremap <C-W> <C-G>u<C-W>
-	xnoremap * y/\V<C-R>"<CR>
-	xnoremap # y?\V<C-R>"<CR>
 	nnoremap & :&&<CR>
 <
+Default mappings composed of Lua code are not listed above. Use ":map" to see
+the |map-listing|.
+
 DEFAULT AUTOCOMMANDS
 							*default-autocmds*
 Default autocommands exist in the following groups. Use ":autocmd! {group}" to
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index ab20c36b17..e00d512a2a 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -435,7 +435,7 @@ vim.cmd = setmetatable({}, {
 do
   local validate = vim.validate
 
-  --@private
+  ---@private
   local function make_dict_accessor(scope, handle)
     validate({
       scope = { scope, 's' },
@@ -535,6 +535,55 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
   return region
 end
 
+--- Gets the content of the visual selection.
+---
+--- The result is either a string or, if {list} is `true`, a list of strings.
+--- If not in any |visual-mode|, `nil` is returned.
+---
+--- @param list boolean|nil
+---        Return a list of strings instead of a string.  See |getreg()|.
+---        Defaults to `false`.
+--- @param append_empty boolean|nil
+---        Append an empty string to the result when in |linewise-visual| mode and {list} is `true`.
+---        This will preserve the trailing newline of the selection when the result is concatenated with `"\n"`.
+---        Defaults to `false`.
+--- @return string|table
+function vim.get_visual_selection(list, append_empty)
+  list = list or false
+  append_empty = append_empty or false
+
+  local mode = vim.api.nvim_get_mode().mode
+  if mode ~= 'v' and mode ~= 'V' and mode:byte() ~= 22 then
+    return nil
+  end
+
+  local reg_name_unnamed = '"'
+  local reg_name_yank = '0'
+
+  local reg_info_unnamed = vim.fn.getreginfo(reg_name_unnamed)
+  local reg_info_yank = vim.fn.getreginfo(reg_name_yank)
+  local opt_clipboard = vim.o.clipboard
+  local opt_report = vim.o.report
+
+  vim.o.clipboard = ''
+  vim.o.report = vim.v.maxcol
+
+  vim.api.nvim_feedkeys('y', 'nx', false)
+
+  local yanked = vim.fn.getreg(reg_name_yank, 1, list)
+
+  vim.fn.setreg(reg_name_unnamed, reg_info_unnamed)
+  vim.fn.setreg(reg_name_yank, reg_info_yank)
+  vim.o.clipboard = opt_clipboard
+  vim.o.report = opt_report
+
+  if list and append_empty and mode == 'V' then
+    table.insert(yanked, '')
+  end
+
+  return yanked
+end
+
 --- Defers calling {fn} until {timeout} ms passes.
 ---
 --- Use to do a one-shot timer that calls {fn}
@@ -985,7 +1034,7 @@ end
 ---                              Defaults to "Nvim".
 ---@param backtrace   boolean|nil Prints backtrace. Defaults to true.
 ---
----@returns Deprecated message, or nil if no message was shown.
+---@return Deprecated message, or nil if no message was shown.
 function vim.deprecate(name, alternative, version, plugin, backtrace)
   local msg = ('%s is deprecated'):format(name)
   plugin = plugin or 'Nvim'
@@ -1010,9 +1059,28 @@ end
 function vim._init_default_mappings()
   -- mappings
 
-  --@private
+  ---@private
+  local function _search_for_visual_selection(search_prefix)
+    if search_prefix ~= '/' and search_prefix ~= '?' then
+      return
+    end
+    -- Escape these characters
+    local replacements = {
+      [search_prefix] = [[\]] .. search_prefix,
+      [ [[\]] ] = [[\\]],
+      ['\t'] = [[\t]],
+      ['\n'] = [[\n]],
+    }
+    local pattern = '[' .. table.concat(vim.tbl_keys(replacements), '') .. ']'
+    local visual_selection = vim.get_visual_selection(false)
+    local escaped_visual_selection = string.gsub(visual_selection, pattern, replacements)
+    local search_cmd = search_prefix .. [[\V]] .. escaped_visual_selection .. '\n'
+    vim.api.nvim_feedkeys(search_cmd, 'nx', true)
+  end
+
+  ---@private
   local function map(mode, lhs, rhs)
-    vim.api.nvim_set_keymap(mode, lhs, rhs, { noremap = true, desc = 'Nvim builtin' })
+    vim.keymap.set(mode, lhs, rhs, { noremap = true, desc = 'Nvim builtin' })
   end
 
   map('n', 'Y', 'y$')
@@ -1020,8 +1088,12 @@ function vim._init_default_mappings()
   map('n', '<C-L>', '<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>')
   map('i', '<C-U>', '<C-G>u<C-U>')
   map('i', '<C-W>', '<C-G>u<C-W>')
-  map('x', '*', 'y/\\V<C-R>"<CR>')
-  map('x', '#', 'y?\\V<C-R>"<CR>')
+  map('x', '*', function()
+    _search_for_visual_selection('/')
+  end)
+  map('x', '#', function()
+    _search_for_visual_selection('?')
+  end)
   -- Use : instead of <Cmd> so that ranges are supported. #19365
   map('n', '&', ':&&<CR>')
 
-- 
cgit 


From f39ca5df232cb6e70b1932b7444840acf42cf87b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 5 Jul 2023 19:47:43 +0200
Subject: refactor(defaults): use vim.region for visual star (*,#)

Problem:
The parent commit added a new vim.get_visual_selection() function to
improve visual star. But that is redundant with vim.region(). Any
current limitations of vim.region() should be fixed instead of adding
a new function.

Solution:
Delete vim.get_visual_selection().
Use vim.region() to get the visual selection.
TODO: fails with visual "block" selections.
---
 runtime/doc/lua.txt         |  21 +--------
 runtime/doc/vim_diff.txt    |  17 ++++---
 runtime/lua/vim/_editor.lua | 107 ++++++++++++++------------------------------
 3 files changed, 42 insertions(+), 103 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 9d3a3dec71..ca4adbce9c 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1408,26 +1408,7 @@ deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
       • {backtrace}    boolean|nil Prints backtrace. Defaults to true.
 
     Return: ~
-        Deprecated message, or nil if no message was shown.
-
-                                                  *vim.get_visual_selection()*
-get_visual_selection({list}, {append_empty})
-    Gets the content of the visual selection.
-
-    The result is either a string or, if {list} is `true`, a list of strings.
-    If not in any |visual-mode|, `nil` is returned.
-
-    Parameters: ~
-      • {list}          boolean|nil Return a list of strings instead of a
-                        string. See |getreg()|. Defaults to `false`.
-      • {append_empty}  boolean|nil Append an empty string to the result when
-                        in |linewise-visual| mode and {list} is `true`. This
-                        will preserve the trailing newline of the selection
-                        when the result is concatenated with `"\n"`. Defaults
-                        to `false`.
-
-    Return: ~
-        string|table
+        (string|nil) # Deprecated message, or nil if no message was shown.
 
 inspect({object}, {options})                                   *vim.inspect()*
     Gets a human-readable representation of the given object.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 4abecfc321..6ffd45d013 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -114,15 +114,14 @@ DEFAULT MAPPINGS
 							*default-mappings*
 Nvim creates the following default mappings at |startup|. You can disable any
 of these in your config by simply removing the mapping, e.g. ":unmap Y".
->vim
-	nnoremap Y y$
-	nnoremap <C-L> <Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>
-	inoremap <C-U> <C-G>u<C-U>
-	inoremap <C-W> <C-G>u<C-W>
-	nnoremap & :&&<CR>
-<
-Default mappings composed of Lua code are not listed above. Use ":map" to see
-the |map-listing|.
+
+- |Y-default|
+- |i_CTRL-U-default|
+- |i_CTRL-W-default|
+- |CTRL-L-default|
+- |&-default|
+- |v_#-default|
+- |v_star-default|
 
 DEFAULT AUTOCOMMANDS
 							*default-autocmds*
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index e00d512a2a..6f701e9ae9 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -535,55 +535,6 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
   return region
 end
 
---- Gets the content of the visual selection.
----
---- The result is either a string or, if {list} is `true`, a list of strings.
---- If not in any |visual-mode|, `nil` is returned.
----
---- @param list boolean|nil
----        Return a list of strings instead of a string.  See |getreg()|.
----        Defaults to `false`.
---- @param append_empty boolean|nil
----        Append an empty string to the result when in |linewise-visual| mode and {list} is `true`.
----        This will preserve the trailing newline of the selection when the result is concatenated with `"\n"`.
----        Defaults to `false`.
---- @return string|table
-function vim.get_visual_selection(list, append_empty)
-  list = list or false
-  append_empty = append_empty or false
-
-  local mode = vim.api.nvim_get_mode().mode
-  if mode ~= 'v' and mode ~= 'V' and mode:byte() ~= 22 then
-    return nil
-  end
-
-  local reg_name_unnamed = '"'
-  local reg_name_yank = '0'
-
-  local reg_info_unnamed = vim.fn.getreginfo(reg_name_unnamed)
-  local reg_info_yank = vim.fn.getreginfo(reg_name_yank)
-  local opt_clipboard = vim.o.clipboard
-  local opt_report = vim.o.report
-
-  vim.o.clipboard = ''
-  vim.o.report = vim.v.maxcol
-
-  vim.api.nvim_feedkeys('y', 'nx', false)
-
-  local yanked = vim.fn.getreg(reg_name_yank, 1, list)
-
-  vim.fn.setreg(reg_name_unnamed, reg_info_unnamed)
-  vim.fn.setreg(reg_name_yank, reg_info_yank)
-  vim.o.clipboard = opt_clipboard
-  vim.o.report = opt_report
-
-  if list and append_empty and mode == 'V' then
-    table.insert(yanked, '')
-  end
-
-  return yanked
-end
-
 --- Defers calling {fn} until {timeout} ms passes.
 ---
 --- Use to do a one-shot timer that calls {fn}
@@ -1034,7 +985,7 @@ end
 ---                              Defaults to "Nvim".
 ---@param backtrace   boolean|nil Prints backtrace. Defaults to true.
 ---
----@return Deprecated message, or nil if no message was shown.
+---@return string|nil # Deprecated message, or nil if no message was shown.
 function vim.deprecate(name, alternative, version, plugin, backtrace)
   local msg = ('%s is deprecated'):format(name)
   plugin = plugin or 'Nvim'
@@ -1049,9 +1000,7 @@ function vim.deprecate(name, alternative, version, plugin, backtrace)
   if displayed and backtrace ~= false then
     vim.notify(debug.traceback('', 2):sub(2), vim.log.levels.WARN)
   end
-  if displayed then
-    return msg
-  end
+  return displayed and msg or nil
 end
 
 --- Create builtin mappings (incl. menus).
@@ -1060,27 +1009,37 @@ function vim._init_default_mappings()
   -- mappings
 
   ---@private
-  local function _search_for_visual_selection(search_prefix)
-    if search_prefix ~= '/' and search_prefix ~= '?' then
-      return
+  local function region_chunks(region)
+    local chunks = {}
+    local maxcol = vim.v.maxcol
+    for line, cols in vim.spairs(region) do
+      local endcol = cols[2] == maxcol and -1 or cols[2]
+      local chunk = vim.api.nvim_buf_get_text(0, line, cols[1], line, endcol, {})[1]
+      table.insert(chunks, chunk)
     end
-    -- Escape these characters
-    local replacements = {
-      [search_prefix] = [[\]] .. search_prefix,
-      [ [[\]] ] = [[\\]],
-      ['\t'] = [[\t]],
-      ['\n'] = [[\n]],
-    }
-    local pattern = '[' .. table.concat(vim.tbl_keys(replacements), '') .. ']'
-    local visual_selection = vim.get_visual_selection(false)
-    local escaped_visual_selection = string.gsub(visual_selection, pattern, replacements)
-    local search_cmd = search_prefix .. [[\V]] .. escaped_visual_selection .. '\n'
+    return chunks
+  end
+
+  ---@private
+  local function _visual_search(cmd)
+    assert(cmd == '/' or cmd == '?')
+    vim.api.nvim_feedkeys('\27', 'nx', true) -- Escape visual mode.
+    local region = vim.region(0, "'<", "'>", vim.fn.visualmode(), vim.o.selection == 'inclusive')
+    local chunks = region_chunks(region)
+    local esc_chunks = vim
+      .iter(chunks)
+      :map(function(v)
+        return vim.fn.escape(v, [[/\]])
+      end)
+      :totable()
+    local esc_pat = table.concat(esc_chunks, [[\n]])
+    local search_cmd = ([[%s\V%s%s]]):format(cmd, esc_pat, '\n')
     vim.api.nvim_feedkeys(search_cmd, 'nx', true)
   end
 
   ---@private
   local function map(mode, lhs, rhs)
-    vim.keymap.set(mode, lhs, rhs, { noremap = true, desc = 'Nvim builtin' })
+    vim.keymap.set(mode, lhs, rhs, { desc = 'Nvim builtin' })
   end
 
   map('n', 'Y', 'y$')
@@ -1088,12 +1047,12 @@ function vim._init_default_mappings()
   map('n', '<C-L>', '<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>')
   map('i', '<C-U>', '<C-G>u<C-U>')
   map('i', '<C-W>', '<C-G>u<C-W>')
-  map('x', '*', function()
-    _search_for_visual_selection('/')
-  end)
-  map('x', '#', function()
-    _search_for_visual_selection('?')
-  end)
+  vim.keymap.set('x', '*', function()
+    _visual_search('/')
+  end, { desc = 'Nvim builtin', silent = true })
+  vim.keymap.set('x', '#', function()
+    _visual_search('?')
+  end, { desc = 'Nvim builtin', silent = true })
   -- Use : instead of <Cmd> so that ranges are supported. #19365
   map('n', '&', ':&&<CR>')
 
-- 
cgit 


From c44d819ae1f29cd34ee3b2350b5c702caed949c3 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Fri, 7 Jul 2023 19:12:46 +0900
Subject: fix(treesitter): update folds in all relevant windows (#24230)

Problem: When using treesitter foldexpr,
* :diffput/get open diff folds, and
* folds are not updated in other windows that contain the updated
  buffer.

Solution: Update folds in all windows that contain the updated buffer
and use expr foldmethod.
---
 runtime/lua/vim/treesitter/_fold.lua | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index d308657237..a02d0a584d 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -232,20 +232,40 @@ local M = {}
 ---@type table<integer,TS.FoldInfo>
 local foldinfos = {}
 
-local function recompute_folds()
+--- Update the folds in the windows that contain the buffer and use expr foldmethod (assuming that
+--- the user doesn't use different foldexpr for the same buffer).
+---
+--- Nvim usually automatically updates folds when text changes, but it doesn't work here because
+--- FoldInfo update is scheduled. So we do it manually.
+local function foldupdate(bufnr)
+  local function do_update()
+    for _, win in ipairs(vim.fn.win_findbuf(bufnr)) do
+      api.nvim_win_call(win, function()
+        if vim.wo.foldmethod == 'expr' then
+          vim._foldupdate()
+        end
+      end)
+    end
+  end
+
   if api.nvim_get_mode().mode == 'i' then
     -- foldUpdate() is guarded in insert mode. So update folds on InsertLeave
     api.nvim_create_autocmd('InsertLeave', {
       once = true,
-      callback = vim._foldupdate,
+      callback = do_update,
     })
     return
   end
 
-  vim._foldupdate()
+  do_update()
 end
 
---- Schedule a function only if bufnr is loaded
+--- Schedule a function only if bufnr is loaded.
+--- We schedule fold level computation for the following reasons:
+--- * queries seem to use the old buffer state in on_bytes for some unknown reason;
+--- * to avoid textlock;
+--- * to avoid infinite recursion:
+---   get_folds_levels → parse → _do_callback → on_changedtree → get_folds_levels.
 ---@param bufnr integer
 ---@param fn function
 local function schedule_if_loaded(bufnr, fn)
@@ -261,14 +281,12 @@ end
 ---@param foldinfo TS.FoldInfo
 ---@param tree_changes Range4[]
 local function on_changedtree(bufnr, foldinfo, tree_changes)
-  -- For some reason, queries seem to use the old buffer state in on_bytes.
-  -- Get around this by scheduling and manually updating folds.
   schedule_if_loaded(bufnr, function()
     for _, change in ipairs(tree_changes) do
       local srow, _, erow = Range.unpack4(change)
       get_folds_levels(bufnr, foldinfo, srow, erow)
     end
-    recompute_folds()
+    foldupdate(bufnr)
   end)
 end
 
@@ -289,7 +307,7 @@ local function on_bytes(bufnr, foldinfo, start_row, old_row, new_row)
     end
     schedule_if_loaded(bufnr, function()
       get_folds_levels(bufnr, foldinfo, start_row, end_row_new)
-      recompute_folds()
+      foldupdate(bufnr)
     end)
   end
 end
-- 
cgit 


From c379d72c490544b3a56eb0e52ce3c8ef740051d8 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 7 Jul 2023 16:37:36 +0100
Subject: feat(lua): allow vim.wo to be double indexed (#20288)

* feat(lua): allow vim.wo to be double indexed

Problem: `vim.wo` does not implement `setlocal`
Solution: Allow `vim.wo` to be double indexed

Co-authored-by: Christian Clason <c.clason@uni-graz.at>
---
 runtime/doc/lua-guide.txt |  5 ++++-
 runtime/doc/lua.txt       | 17 ++++++++-------
 runtime/doc/news.txt      |  3 +++
 runtime/lua/vim/_meta.lua | 53 +++++++++++++++++++++++++++++++++++++++--------
 4 files changed, 60 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index b138de85c9..28c9ace23b 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -363,7 +363,7 @@ and `:let &listchars='space:_,tab:>~'`:
 • |vim.o|:  behaves like |:set|
 • |vim.go|: behaves like |:setglobal|
 • |vim.bo|: for buffer-scoped options
-• |vim.wo|: for window-scoped options
+• |vim.wo|: for window-scoped options (can be double indexed)
 
 For example:
 >lua
@@ -386,6 +386,9 @@ window is used:
 >lua
     vim.bo[4].expandtab = true -- sets expandtab to true in buffer 4
     vim.wo.number = true       -- sets number to true in current window
+    vim.wo[0].number = true    -- same as above 
+    vim.wo[0][0].number = true -- sets number to true in current buffer
+                               -- in current window only 
     print(vim.wo[0].number)    --> true
 <
 ------------------------------------------------------------------------------
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ca4adbce9c..63523c32d5 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1175,20 +1175,21 @@ vim.bo[{bufnr}]                                                                *
         print(vim.bo.comments)
         print(vim.bo.baz)                 -- error: invalid key
 <
-vim.wo[{winid}]                                                                *vim.wo*
-    Get or set window-scoped |options| for the window with handle {winid}.
-    Like `:set`. If [{winid}] is omitted then the current window is used.
-    Invalid {winid} or key is an error.
+vim.wo[{winid}][{bufnr}]                                                       *vim.wo*
+    Get or set window-scoped |options| for the window with handle {winid} and
+    buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
+    `:set` otherwise. If [{winid}] is omitted then the current window is
+    used. Invalid {winid}, {bufnr} or key is an error.
+
+    Note: only {bufnr} with value `0` (the current buffer in the window) is
+    supported.
 
-    Note: this does not access |local-options| (`:setlocal`) instead use: >lua
-        nvim_get_option_value(OPTION, { scope = 'local', win = winid })
-        nvim_set_option_value(OPTION, VALUE, { scope = 'local', win = winid }
-<
     Example: >lua
         local winid = vim.api.nvim_get_current_win()
         vim.wo[winid].number = true    -- same as vim.wo.number = true
         print(vim.wo.foldmarker)
         print(vim.wo.quux)             -- error: invalid key
+        vim.wo[winid][0].spell = false -- like ':setlocal nospell'
 <
 
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 24e9dc917b..ac0a57e4d3 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -110,6 +110,9 @@ The following new APIs and features were added.
 • |vim.ui.open()| opens URIs using the system default handler (macOS `open`,
   Windows `explorer`, Linux `xdg-open`, etc.)
 
+• |vim.wo| can now be double indexed for |:setlocal| behaviour. Currently only
+  `0` for the buffer index is currently supported.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
index 913f1fe203..41e6e8be86 100644
--- a/runtime/lua/vim/_meta.lua
+++ b/runtime/lua/vim/_meta.lua
@@ -67,25 +67,60 @@ local function opt_validate(option_name, target_scope)
   end
 end
 
-local function new_opt_accessor(handle, scope)
+local function new_buf_opt_accessor(bufnr)
   return setmetatable({}, {
     __index = function(_, k)
-      if handle == nil and type(k) == 'number' then
-        return new_opt_accessor(k, scope)
+      if bufnr == nil and type(k) == 'number' then
+        return new_buf_opt_accessor(k)
       end
-      opt_validate(k, scope)
-      return api.nvim_get_option_value(k, { [scope] = handle or 0 })
+      opt_validate(k, 'buf')
+      return api.nvim_get_option_value(k, { buf = bufnr or 0 })
     end,
 
     __newindex = function(_, k, v)
-      opt_validate(k, scope)
-      return api.nvim_set_option_value(k, v, { [scope] = handle or 0 })
+      opt_validate(k, 'buf')
+      return api.nvim_set_option_value(k, v, { buf = bufnr or 0 })
     end,
   })
 end
 
-vim.bo = new_opt_accessor(nil, 'buf')
-vim.wo = new_opt_accessor(nil, 'win')
+vim.bo = new_buf_opt_accessor()
+
+local function new_win_opt_accessor(winid, bufnr)
+  return setmetatable({}, {
+    __index = function(_, k)
+      if bufnr == nil and type(k) == 'number' then
+        if winid == nil then
+          return new_win_opt_accessor(k)
+        else
+          return new_win_opt_accessor(winid, k)
+        end
+      end
+
+      if bufnr ~= nil and bufnr ~= 0 then
+        error('only bufnr=0 is supported')
+      end
+
+      opt_validate(k, 'win')
+      -- TODO(lewis6991): allow passing both buf and win to nvim_get_option_value
+      return api.nvim_get_option_value(k, {
+        scope = bufnr and 'local' or nil,
+        win = winid or 0,
+      })
+    end,
+
+    __newindex = function(_, k, v)
+      opt_validate(k, 'win')
+      -- TODO(lewis6991): allow passing both buf and win to nvim_set_option_value
+      return api.nvim_set_option_value(k, v, {
+        scope = bufnr and 'local' or nil,
+        win = winid or 0,
+      })
+    end,
+  })
+end
+
+vim.wo = new_win_opt_accessor()
 
 -- vim global option
 --  this ONLY sets the global option. like `setglobal`
-- 
cgit 


From 21fa19f3e8c1d7b427c6d7c0dbcd6702d1e4e397 Mon Sep 17 00:00:00 2001
From: Chinmay Dalal <dalal.chinmay.0101@gmail.com>
Date: Sat, 8 Jul 2023 12:44:52 +0530
Subject: fix(lsp): don't use hl_mode = combine for inlay hints #24276

Problem: `hl_mode` for inlay hints is `combine`, causing bugs like
inlay hints using highlights from the previous character
(#24152, #24068)

Solution: Don't use hl_mode=combine for inlay hints.
---
 runtime/lua/vim/lsp/inlay_hint.lua | 1 -
 1 file changed, 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index f577a31696..6426b0c039 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -289,7 +289,6 @@ api.nvim_set_decoration_provider(namespace, {
               virt_text_pos = 'inline',
               ephemeral = false,
               virt_text = vt,
-              hl_mode = 'combine',
             })
           end
         end
-- 
cgit 


From 00d2f4b96eb9c8dcb6b9f67e256bb7faa19354db Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 4 Jul 2023 19:22:04 +0200
Subject: docs: MAINTAIN.md, nvim_get_mark

---
 runtime/doc/api.txt         | 10 ++++++----
 runtime/doc/lua.txt         | 41 ++++++++++++++++++++++-------------------
 runtime/doc/vim_diff.txt    | 10 +++++++---
 runtime/lua/vim/_editor.lua | 38 +++++++++++++++++++-------------------
 4 files changed, 54 insertions(+), 45 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 46c5f2ea18..c0e6dbc015 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -987,13 +987,14 @@ nvim_get_keymap({mode})                                    *nvim_get_keymap()*
         "buffer" key is always zero.
 
 nvim_get_mark({name}, {opts})                                *nvim_get_mark()*
-    Return a tuple (row, col, buffer, buffername) representing the position of
-    the uppercase/file named mark. See |mark-motions|.
+    Returns a `(row, col, buffer, buffername)` tuple representing the position
+    of the uppercase/file named mark. "End of line" column position is
+    returned as |v:maxcol| (big number). See |mark-motions|.
 
     Marks are (1,0)-indexed. |api-indexing|
 
     Note:
-        fails with error if a lowercase or buffer local named mark is used.
+        Lowercase name (or other buffer-local mark) is an error.
 
     Parameters: ~
       • {name}  Mark name
@@ -2232,7 +2233,8 @@ nvim_buf_get_lines({buffer}, {start}, {end}, {strict_indexing})
         Array of lines, or empty array for unloaded buffer.
 
 nvim_buf_get_mark({buffer}, {name})                      *nvim_buf_get_mark()*
-    Returns a tuple (row,col) representing the position of the named mark. See
+    Returns a `(row,col)` tuple representing the position of the named mark.
+    "End of line" column position is returned as |v:maxcol| (big number). See
     |mark-motions|.
 
     Marks are (1,0)-indexed. |api-indexing|
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 63523c32d5..f33bd3eb5c 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1475,6 +1475,9 @@ on_key({fn}, {ns_id})                                           *vim.on_key()*
     The Nvim command-line option |-w| is related but does not support
     callbacks and cannot be toggled dynamically.
 
+    Note:
+        {fn} will be removed on error.
+
     Note:
         {fn} will not be cleared by |nvim_buf_clear_namespace()|
 
@@ -1482,10 +1485,9 @@ on_key({fn}, {ns_id})                                           *vim.on_key()*
         {fn} will receive the keys after mappings have been evaluated
 
     Parameters: ~
-      • {fn}     (function) Callback function. It should take one string
-                 argument. On each key press, Nvim passes the key char to
-                 fn(). |i_CTRL-V| If {fn} is nil, it removes the callback for
-                 the associated {ns_id}
+      • {fn}     fun(key: string) Function invoked on every key press.
+                 |i_CTRL-V| Returning nil removes the callback associated with
+                 namespace {ns_id}.
       • {ns_id}  integer? Namespace ID. If nil or 0, generates and returns a
                  new |nvim_create_namespace()| id.
 
@@ -1493,9 +1495,6 @@ on_key({fn}, {ns_id})                                           *vim.on_key()*
         (integer) Namespace id associated with {fn}. Or count of all callbacks
         if on_key() is called without arguments.
 
-    Note:
-        {fn} will be removed if an error occurs while calling.
-
 paste({lines}, {phase})                                          *vim.paste()*
     Paste handler, invoked by |nvim_paste()| when a conforming UI (such as the
     |TUI|) pastes text into the editor.
@@ -1543,22 +1542,26 @@ print({...})                                                     *vim.print()*
       • |:=|
 
 region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
-    Get a table of lines with start, end columns for a region marked by two
-    points. Input and output positions are (0,0)-indexed and indicate byte
-    positions.
+    Gets a dict of line segment ("chunk") positions for the region from `pos1`
+    to `pos2`.
+
+    Input and output positions are byte positions, (0,0)-indexed. "End of
+    line" column position (for example, |linewise| visual selection) is
+    returned as |v:maxcol| (big number).
 
     Parameters: ~
-      • {bufnr}      (integer) number of buffer
-      • {pos1}       integer[]|string start of region as a (line, column)
-                     tuple or string accepted by |getpos()|
-      • {pos2}       integer[]|string end of region as a (line, column) tuple
-                     or string accepted by |getpos()|
-      • {regtype}    (string) type of selection, see |setreg()|
-      • {inclusive}  (boolean) indicating whether column of pos2 is inclusive
+      • {bufnr}      (integer) Buffer number, or 0 for current buffer
+      • {pos1}       integer[]|string Start of region as a (line, column)
+                     tuple or |getpos()|-compatible string
+      • {pos2}       integer[]|string End of region as a (line, column) tuple
+                     or |getpos()|-compatible string
+      • {regtype}    (string) |setreg()|-style selection type
+      • {inclusive}  (boolean) Controls whether `pos2` column is inclusive
+                     (see also 'selection').
 
     Return: ~
-        (table) region Table of the form `{linenr = {startcol,endcol}}`.
-        `endcol` is exclusive, and whole lines are marked with
+        (table) region Dict of the form `{linenr = {startcol,endcol}}`.
+        `endcol` is exclusive, and whole lines are returned as
         `{startcol,endcol} = {0,-1}`.
 
 schedule_wrap({cb})                                      *vim.schedule_wrap()*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 6ffd45d013..68ebb8cc94 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -536,12 +536,14 @@ Working directory (Vim implemented some of these after Nvim):
   working directory. Use `getcwd(-1, -1)` to get the global working directory.
 
 ==============================================================================
-Missing legacy features					 *nvim-missing*
+Missing features					 *nvim-missing*
 
 These legacy Vim features are not yet implemented:
 
-*:gui*
-*:gvim*
+- *:gui*
+- *:gvim*
+- *'completepopup'*
+- *'previewpopup'*
 
 ==============================================================================
 Removed legacy features					 *nvim-removed*
@@ -644,6 +646,7 @@ Options:
   'highlight' (Names of builtin |highlight-groups| cannot be changed.)
   *'hkmap'* *'hk'* use `set keymap=hebrew` instead.
   *'hkmapp'* *'hkp'* use `set keymap=hebrewp` instead.
+  keyprotocol
 
   *'pastetoggle'* *'pt'* Just Paste It.™ |paste| is handled automatically when
   you paste text using your terminal's or GUI's paste feature (CTRL-SHIFT-v,
@@ -687,6 +690,7 @@ Options:
     Use |g8| or |ga|.  See |mbyte-combining|.
   *'maxmem'* Nvim delegates memory-management to the OS.
   *'maxmemtot'* Nvim delegates memory-management to the OS.
+  printoptions
   *'printdevice'*
   *'printencoding'*
   *'printexpr'*
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 6f701e9ae9..80e7518b01 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -460,17 +460,18 @@ do
   vim.t = make_dict_accessor('t')
 end
 
---- Get a table of lines with start, end columns for a region marked by two points.
---- Input and output positions are (0,0)-indexed and indicate byte positions.
+--- Gets a dict of line segment ("chunk") positions for the region from `pos1` to `pos2`.
 ---
----@param bufnr integer number of buffer
----@param pos1 integer[]|string start of region as a (line, column) tuple or string accepted by |getpos()|
----@param pos2 integer[]|string end of region as a (line, column) tuple or string accepted by |getpos()|
----@param regtype string type of selection, see |setreg()|
----@param inclusive boolean indicating whether column of pos2 is inclusive
----@return table region Table of the form `{linenr = {startcol,endcol}}`.
----        `endcol` is exclusive, and whole lines are marked with
----        `{startcol,endcol} = {0,-1}`.
+--- Input and output positions are byte positions, (0,0)-indexed. "End of line" column
+--- position (for example, |linewise| visual selection) is returned as |v:maxcol| (big number).
+---
+---@param bufnr integer Buffer number, or 0 for current buffer
+---@param pos1 integer[]|string Start of region as a (line, column) tuple or |getpos()|-compatible string
+---@param pos2 integer[]|string End of region as a (line, column) tuple or |getpos()|-compatible string
+---@param regtype string \|setreg()|-style selection type
+---@param inclusive boolean Controls whether `pos2` column is inclusive (see also 'selection').
+---@return table region Dict of the form `{linenr = {startcol,endcol}}`. `endcol` is exclusive, and
+---whole lines are returned as `{startcol,endcol} = {0,-1}`.
 function vim.region(bufnr, pos1, pos2, regtype, inclusive)
   if not vim.api.nvim_buf_is_loaded(bufnr) then
     vim.fn.bufload(bufnr)
@@ -610,18 +611,17 @@ local on_key_cbs = {}
 --- The Nvim command-line option |-w| is related but does not support callbacks
 --- and cannot be toggled dynamically.
 ---
----@param fn function: Callback function. It should take one string argument.
----                   On each key press, Nvim passes the key char to fn(). |i_CTRL-V|
----                   If {fn} is nil, it removes the callback for the associated {ns_id}
+---@note {fn} will be removed on error.
+---@note {fn} will not be cleared by |nvim_buf_clear_namespace()|
+---@note {fn} will receive the keys after mappings have been evaluated
+---
+---@param fn fun(key: string) Function invoked on every key press. |i_CTRL-V|
+---                   Returning nil removes the callback associated with namespace {ns_id}.
 ---@param ns_id integer? Namespace ID. If nil or 0, generates and returns a new
 ---                    |nvim_create_namespace()| id.
 ---
 ---@return integer Namespace id associated with {fn}. Or count of all callbacks
 ---if on_key() is called without arguments.
----
----@note {fn} will be removed if an error occurs while calling.
----@note {fn} will not be cleared by |nvim_buf_clear_namespace()|
----@note {fn} will receive the keys after mappings have been evaluated
 function vim.on_key(fn, ns_id)
   if fn == nil and ns_id == nil then
     return #on_key_cbs
@@ -1049,10 +1049,10 @@ function vim._init_default_mappings()
   map('i', '<C-W>', '<C-G>u<C-W>')
   vim.keymap.set('x', '*', function()
     _visual_search('/')
-  end, { desc = 'Nvim builtin', silent = true })
+  end, { desc = ':help v_star-default', silent = true })
   vim.keymap.set('x', '#', function()
     _visual_search('?')
-  end, { desc = 'Nvim builtin', silent = true })
+  end, { desc = ':help v_#-default', silent = true })
   -- Use : instead of <Cmd> so that ranges are supported. #19365
   map('n', '&', ':&&<CR>')
 
-- 
cgit 


From 3a721820c39b7524a2e6d6a73774498104a38962 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 6 Jul 2023 15:32:39 +0200
Subject: docs: "Return (multiple)" heading

Problem:
Lua functions that return multiple results are declared by using
multiple `@return` docstring directives. But the generated docs don't
make it obvious what this represents.

Solution:
- Generate a "Return (multiple)" heading for multiple-value functions.
- Fix `@note` directives randomly placed after `@return`.
---
 runtime/doc/api.txt        |  8 ++++----
 runtime/doc/lsp.txt        | 10 +++++-----
 runtime/doc/lua.txt        |  4 ++--
 runtime/doc/treesitter.txt |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index c0e6dbc015..4f3fc470a9 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -952,6 +952,10 @@ nvim_get_current_win()                                *nvim_get_current_win()*
 nvim_get_hl({ns_id}, {*opts})                                  *nvim_get_hl()*
     Gets all or specific highlight groups in a namespace.
 
+    Note:
+        When the `link` attribute is defined in the highlight definition map,
+        other attributes will not be taking effect (see |:hi-link|).
+
     Parameters: ~
       • {ns_id}  Get highlight groups for namespace ns_id
                  |nvim_get_namespaces()|. Use 0 to get global highlight groups
@@ -967,10 +971,6 @@ nvim_get_hl({ns_id}, {*opts})                                  *nvim_get_hl()*
         map as in |nvim_set_hl()|, or only a single highlight definition map
         if requested by name or id.
 
-    Note:
-        When the `link` attribute is defined in the highlight definition map,
-        other attributes will not be taking effect (see |:hi-link|).
-
 nvim_get_hl_id_by_name({name})                      *nvim_get_hl_id_by_name()*
     Gets a highlight group by name
 
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index b21c1d6e9d..5fd06b3a14 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -680,7 +680,7 @@ buf_request_sync({bufnr}, {method}, {params}, {timeout_ms})
       • {timeout_ms}  (integer|nil) Maximum time in milliseconds to wait for a
                       result. Defaults to 1000
 
-    Return: ~
+    Return (multiple): ~
         (table) result Map of client_id:request_result.
         (string|nil) err On timeout, cancel, or error, `err` is a string
         describing the failure reason, and `result` is nil.
@@ -1623,7 +1623,7 @@ convert_signature_help_to_markdown_lines({signature_help}, {ft}, {triggers})
       • {triggers}        (table|nil) list of trigger characters from the lsp
                           server. used to better determine parameter offsets
 
-    Return: ~
+    Return (multiple): ~
         (table|nil) table list of lines of converted markdown.
         (table|nil) table of active hl
 
@@ -1833,7 +1833,7 @@ open_floating_preview({contents}, {syntax}, {opts})
                       {focusable} is also `true`, focus an existing floating
                       window with the same {focus_id}
 
-    Return: ~
+    Return (multiple): ~
         (integer) bufnr of newly created float window
         (integer) winid of newly created float window preview window
 
@@ -1857,7 +1857,7 @@ preview_location({location}, {opts})         *vim.lsp.util.preview_location()*
     Parameters: ~
       • {location}  (table) a single `Location` or `LocationLink`
 
-    Return: ~
+    Return (multiple): ~
         (integer|nil) buffer id of float window
         (integer|nil) window id of float window
 
@@ -2091,7 +2091,7 @@ start({cmd}, {cmd_args}, {dispatchers}, {extra_spawn_params})
                               • {env} (table) Additional environment variables
                                 for LSP server process
 
-    Return: ~
+    Return (multiple): ~
         Client RPC object.
         Methods:
         • `notify()` |vim.lsp.rpc.notify()|
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index f33bd3eb5c..7bc5b4a29b 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2364,7 +2364,7 @@ open({path})                                                   *vim.ui.open()*
     Parameters: ~
       • {path}  (string) Path or URL to open
 
-    Return: ~
+    Return (multiple): ~
         SystemCompleted|nil # Command result, or nil if not found.
         (string|nil) # Error message on failure
 
@@ -2567,7 +2567,7 @@ match({args})                                           *vim.filetype.match()*
                   contents to use for matching. Can be used with {filename}.
                   Mutually exclusive with {buf}.
 
-    Return: ~
+    Return (multiple): ~
         (string|nil) If a match was found, the matched filetype.
         (function|nil) A function that modifies buffer state when called (for
         example, to set some filetype specific buffer variables). The function
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 7539417197..070659ce3d 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -617,7 +617,7 @@ get_node_range({node_or_range})              *vim.treesitter.get_node_range()*
     Parameters: ~
       • {node_or_range}  (|TSNode| | table) Node or table of positions
 
-    Return: ~
+    Return (multiple): ~
         (integer) start_row
         (integer) start_col
         (integer) end_row
-- 
cgit 


From d2e44da516816e2616b531886eb9ba7f4c271fb4 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 6 Jul 2023 22:47:27 +0200
Subject: docs: gather @notes items into one section

related: 21eacbfef399
---
 runtime/doc/api.txt        | 66 +++++++++++++++++++++-------------------------
 runtime/doc/diagnostic.txt |  4 +--
 runtime/doc/lsp.txt        |  5 ++--
 runtime/doc/lua.txt        | 16 +++++------
 4 files changed, 41 insertions(+), 50 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 4f3fc470a9..d96169066c 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -727,8 +727,8 @@ nvim_del_keymap({mode}, {lhs})                             *nvim_del_keymap()*
 nvim_del_mark({name})                                        *nvim_del_mark()*
     Deletes an uppercase/file named mark. See |mark-motions|.
 
-    Note:
-        fails with error if a lowercase or buffer local named mark is used.
+    Note: ~
+      • Lowercase name (or other buffer-local mark) is an error.
 
     Parameters: ~
       • {name}  Mark name
@@ -952,8 +952,8 @@ nvim_get_current_win()                                *nvim_get_current_win()*
 nvim_get_hl({ns_id}, {*opts})                                  *nvim_get_hl()*
     Gets all or specific highlight groups in a namespace.
 
-    Note:
-        When the `link` attribute is defined in the highlight definition map,
+    Note: ~
+      • When the `link` attribute is defined in the highlight definition map,
         other attributes will not be taking effect (see |:hi-link|).
 
     Parameters: ~
@@ -993,8 +993,8 @@ nvim_get_mark({name}, {opts})                                *nvim_get_mark()*
 
     Marks are (1,0)-indexed. |api-indexing|
 
-    Note:
-        Lowercase name (or other buffer-local mark) is an error.
+    Note: ~
+      • Lowercase name (or other buffer-local mark) is an error.
 
     Parameters: ~
       • {name}  Mark name
@@ -1075,12 +1075,10 @@ nvim_input({keys})                                              *nvim_input()*
 
     On execution error: does not fail, but updates v:errmsg.
 
-    Note:
-        |keycodes| like <CR> are translated, so "<" is special. To input a
+    Note: ~
+      • |keycodes| like <CR> are translated, so "<" is special. To input a
         literal "<", send <LT>.
-
-    Note:
-        For mouse events use |nvim_input_mouse()|. The pseudokey form
+      • For mouse events use |nvim_input_mouse()|. The pseudokey form
         "<LeftMouse><col,row>" is deprecated since |api-level| 6.
 
     Attributes: ~
@@ -1100,8 +1098,8 @@ nvim_input_mouse({button}, {action}, {modifier}, {grid}, {row}, {col})
     Non-blocking: does not wait on any result, but queues the event to be
     processed soon by the event loop.
 
-    Note:
-        Currently this doesn't support "scripting" multiple mouse events by
+    Note: ~
+      • Currently this doesn't support "scripting" multiple mouse events by
         calling it multiple times in a loop: the intermediate mouse positions
         will be ignored. It should be used to implement real-time mouse input
         in a GUI. The deprecated pseudokey form ("<LeftMouse><col,row>") of
@@ -1317,8 +1315,8 @@ nvim_set_client_info({name}, {version}, {type}, {methods}, {attributes})
     appropriate. Example: library first identifies the channel, then a plugin
     using that library later identifies itself.
 
-    Note:
-        "Something is better than nothing". You don't need to include all the
+    Note: ~
+      • "Something is better than nothing". You don't need to include all the
         fields.
 
     Attributes: ~
@@ -1410,21 +1408,17 @@ nvim_set_current_win({window})                        *nvim_set_current_win()*
 nvim_set_hl({ns_id}, {name}, {*val})                           *nvim_set_hl()*
     Sets a highlight group.
 
-    Note:
-        Unlike the `:highlight` command which can update a highlight group,
-        this function completely replaces the definition. For example:
+    Note: ~
+      • Unlike the `:highlight` command which can update a highlight group, this
+        function completely replaces the definition. For example:
         `nvim_set_hl(0, 'Visual', {})` will clear the highlight group
         'Visual'.
-
-    Note:
-        The fg and bg keys also accept the string values `"fg"` or `"bg"`
-        which act as aliases to the corresponding foreground and background
-        values of the Normal group. If the Normal group has not been defined,
-        using these values results in an error.
-
-    Note:
-        If `link` is used in combination with other attributes; only the
-        `link` will take effect (see |:hi-link|).
+      • The fg and bg keys also accept the string values `"fg"` or `"bg"` which
+        act as aliases to the corresponding foreground and background values
+        of the Normal group. If the Normal group has not been defined, using
+        these values results in an error.
+      • If `link` is used in combination with other attributes; only the `link`
+        will take effect (see |:hi-link|).
 
     Parameters: ~
       • {ns_id}  Namespace id for this highlight |nvim_create_namespace()|.
@@ -2141,8 +2135,8 @@ nvim_buf_del_keymap({buffer}, {mode}, {lhs})           *nvim_buf_del_keymap()*
 nvim_buf_del_mark({buffer}, {name})                      *nvim_buf_del_mark()*
     Deletes a named mark in the buffer. See |mark-motions|.
 
-    Note:
-        only deletes marks set in the buffer, if the mark is not set in the
+    Note: ~
+      • only deletes marks set in the buffer, if the mark is not set in the
         buffer it will return false.
 
     Parameters: ~
@@ -2325,8 +2319,8 @@ nvim_buf_is_loaded({buffer})                            *nvim_buf_is_loaded()*
 nvim_buf_is_valid({buffer})                              *nvim_buf_is_valid()*
     Checks if a buffer is valid.
 
-    Note:
-        Even if a buffer is valid it may have been unloaded. See |api-buffer|
+    Note: ~
+      • Even if a buffer is valid it may have been unloaded. See |api-buffer|
         for more info about unloaded buffers.
 
     Parameters: ~
@@ -2388,8 +2382,8 @@ nvim_buf_set_mark({buffer}, {name}, {line}, {col}, {opts})
 
     Marks are (1,0)-indexed. |api-indexing|
 
-    Note:
-        Passing 0 as line deletes the mark
+    Note: ~
+      • Passing 0 as line deletes the mark
 
     Parameters: ~
       • {buffer}  Buffer to set the mark on
@@ -3444,8 +3438,8 @@ nvim_ui_attach({width}, {height}, {options})                *nvim_ui_attach()*
     Implies that the client is ready to show the UI. Adds the client to the
     list of UIs. |nvim_list_uis()|
 
-    Note:
-        If multiple UI clients are attached, the global screen dimensions
+    Note: ~
+      • If multiple UI clients are attached, the global screen dimensions
         degrade to the smallest client. E.g. if client A requests 80x40 but
         client B requests 200x100, the global screen has size 80x40.
 
diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index 9dd42061ef..4b2b5e5f9a 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -361,8 +361,8 @@ config({opts}, {namespace})                          *vim.diagnostic.config()*
 
     then virtual text will not be enabled for those diagnostics.
 
-    Note:
-        Each of the configuration options below accepts one of the following:
+    Note: ~
+      • Each of the configuration options below accepts one of the following:
         • `false`: Disable this feature
         • `true`: Enable this feature, use default settings.
         • `table`: Enable this feature with overrides. Use an empty table to
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 5fd06b3a14..7bec93de89 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1126,8 +1126,9 @@ completion({context})                               *vim.lsp.buf.completion()*
 
 declaration({options})                             *vim.lsp.buf.declaration()*
     Jumps to the declaration of the symbol under the cursor.
-    Note:
-        Many servers do not implement this method. Generally, see
+
+    Note: ~
+      • Many servers do not implement this method. Generally, see
         |vim.lsp.buf.definition()| instead.
 
     Parameters: ~
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 7bc5b4a29b..9e4815bea5 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1475,14 +1475,10 @@ on_key({fn}, {ns_id})                                           *vim.on_key()*
     The Nvim command-line option |-w| is related but does not support
     callbacks and cannot be toggled dynamically.
 
-    Note:
-        {fn} will be removed on error.
-
-    Note:
-        {fn} will not be cleared by |nvim_buf_clear_namespace()|
-
-    Note:
-        {fn} will receive the keys after mappings have been evaluated
+    Note: ~
+      • {fn} will be removed on error.
+      • {fn} will not be cleared by |nvim_buf_clear_namespace()|
+      • {fn} will receive the keys after mappings have been evaluated
 
     Parameters: ~
       • {fn}     fun(key: string) Function invoked on every key press.
@@ -2912,8 +2908,8 @@ cmp({v1}, {v2})                                            *vim.version.cmp()*
        end
 <
 
-    Note:
-        Per semver, build metadata is ignored when comparing two
+    Note: ~
+      • Per semver, build metadata is ignored when comparing two
         otherwise-equivalent versions.
 
     Parameters: ~
-- 
cgit 


From 6318edadc32acce3ed41a6995a5faa5395b5f562 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 8 Jul 2023 15:28:13 +0200
Subject: fix(defaults): visual hash (#) on text with "?"

Problem:
The default "#" mapping fails on the following example after v$h# with
cursor at start of the first line:

    aa?/\bb
    aa
    aa?/\bb

Solution:
Also escape "?".
---
 runtime/lua/vim/_editor.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 80e7518b01..0bbbed74bb 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -1029,7 +1029,7 @@ function vim._init_default_mappings()
     local esc_chunks = vim
       .iter(chunks)
       :map(function(v)
-        return vim.fn.escape(v, [[/\]])
+        return vim.fn.escape(v, [[?/\]])
       end)
       :totable()
     local esc_pat = table.concat(esc_chunks, [[\n]])
-- 
cgit 


From 0a90e4b05ad3263bf656e24f616b6dadf6ba92e4 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 8 Jul 2023 15:58:50 +0200
Subject: fix(docs): match DocSearch style with site theme

ref https://github.com/neovim/neovim.github.io/commit/2b4f9e47809c16743f7d31d0dc1f1e3c2f313a56
---
 runtime/doc/pattern.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 7ea3b7df76..d74757de4f 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -72,7 +72,7 @@ N			Repeat the latest "/" or "?" [count] times in
 			command "/\<keyword\>".  |exclusive|
 			'ignorecase' is used, 'smartcase' is not.
 							*v_star-default*
-			In Visual mode, search forward for the current selection.
+{Visual}*		In Visual mode, search forward for the current selection.
 			|default-mappings|
 
 							*#*
@@ -81,7 +81,7 @@ N			Repeat the latest "/" or "?" [count] times in
 			backspace, try using "stty erase <BS>" before starting
 			Vim (<BS> is CTRL-H or a real backspace).
 							*v_#-default*
-			In Visual mode, search backward for the current selection.
+{Visual}#		In Visual mode, search backward for the current selection.
 			|default-mappings|
 
 							*gstar*
-- 
cgit 


From b9a0e762f1d79d17631b7d17cf25b6e25006d8c2 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 8 Jul 2023 16:55:27 +0200
Subject: fix(defaults): visual star (*) on text with "?"

regression from 6318edadc32acce3ed41a6995a5faa5395b5f562
---
 runtime/lua/vim/_editor.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 0bbbed74bb..5a93f5cd60 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -1029,7 +1029,7 @@ function vim._init_default_mappings()
     local esc_chunks = vim
       .iter(chunks)
       :map(function(v)
-        return vim.fn.escape(v, [[?/\]])
+        return vim.fn.escape(v, cmd == '/' and [[/\]] or [[?\]])
       end)
       :totable()
     local esc_pat = table.concat(esc_chunks, [[\n]])
-- 
cgit 


From 766f4978d6cb146511cf0b676c01e5327db46647 Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Mon, 10 Jul 2023 19:38:15 +0800
Subject: fix(lint): lint warnings #24226

---
 runtime/doc/lsp.txt              | 17 ++++++++---------
 runtime/doc/lua.txt              |  6 +++---
 runtime/lua/vim/_editor.lua      |  2 +-
 runtime/lua/vim/_watch.lua       |  4 ++--
 runtime/lua/vim/filetype.lua     |  2 +-
 runtime/lua/vim/fs.lua           |  8 ++++----
 runtime/lua/vim/lsp.lua          | 20 ++++++++++----------
 runtime/lua/vim/lsp/buf.lua      | 15 ++++++++-------
 runtime/lua/vim/lsp/handlers.lua |  7 ++++---
 runtime/lua/vim/lsp/log.lua      |  2 +-
 runtime/lua/vim/lsp/rpc.lua      | 17 ++++++++---------
 runtime/lua/vim/lsp/sync.lua     | 12 +++++++-----
 runtime/lua/vim/uri.lua          | 10 ++--------
 13 files changed, 59 insertions(+), 63 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 7bec93de89..4bafb622a6 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -663,7 +663,7 @@ buf_request_all({bufnr}, {method}, {params}, {handler})
                    Server results are passed as a `client_id:result` map.
 
     Return: ~
-        fun() cancel Function that cancels all requests.
+        (function) cancel Function that cancels all requests.
 
                                                   *vim.lsp.buf_request_sync()*
 buf_request_sync({bufnr}, {method}, {params}, {timeout_ms})
@@ -802,7 +802,7 @@ get_client_by_id({client_id})                     *vim.lsp.get_client_by_id()*
       • {client_id}  (integer) client id
 
     Return: ~
-        |vim.lsp.client| object, or nil
+        (nil|lsp.Client) client rpc object
 
 get_log_path()                                        *vim.lsp.get_log_path()*
     Gets the path of the logfile used by the LSP client.
@@ -825,7 +825,7 @@ omnifunc({findstart}, {base})                             *vim.lsp.omnifunc()*
       • {base}       (integer) findstart=0, text to match against
 
     Return: ~
-        (integer) Decided by {findstart}:
+        integer|table Decided by {findstart}:
         • findstart=0: column where the completion starts, or -2 or -3
         • findstart=1: list of matches (actually just calls |complete()|)
 
@@ -1116,7 +1116,7 @@ completion({context})                               *vim.lsp.buf.completion()*
     called in Insert mode.
 
     Parameters: ~
-      • {context}  (context support not yet implemented) Additional
+      • {context}  (table) (context support not yet implemented) Additional
                    information about the context in which a completion was
                    triggered (how it was triggered, and by which trigger
                    character, if applicable)
@@ -1296,7 +1296,7 @@ workspace_symbol({query}, {options})          *vim.lsp.buf.workspace_symbol()*
     string means no filtering is done.
 
     Parameters: ~
-      • {query}    (string, optional)
+      • {query}    (string|nil) optional
       • {options}  (table|nil) additional options
                    • on_list: (function) handler for list results. See
                      |lsp-on-list-handler|
@@ -2040,7 +2040,7 @@ notify({method}, {params})                              *vim.lsp.rpc.notify()*
       • {params}  (table|nil) Parameters for the invoked LSP method
 
     Return: ~
-        (bool) `true` if notification could be sent, `false` if not
+        (boolean) `true` if notification could be sent, `false` if not
 
                                                        *vim.lsp.rpc.request()*
 request({method}, {params}, {callback}, {notify_reply_callback})
@@ -2092,9 +2092,8 @@ start({cmd}, {cmd_args}, {dispatchers}, {extra_spawn_params})
                               • {env} (table) Additional environment variables
                                 for LSP server process
 
-    Return (multiple): ~
-        Client RPC object.
-        Methods:
+    Return: ~
+        (table|nil) Client RPC object, with these methods:
         • `notify()` |vim.lsp.rpc.notify()|
         • `request()` |vim.lsp.rpc.request()|
         • `is_closing()` returns a boolean indicating if the RPC is closing.
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 9e4815bea5..ae3c248d64 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1518,7 +1518,7 @@ paste({lines}, {phase})                                          *vim.paste()*
                  • 3: ends the paste (exactly once)
 
     Return: ~
-        (boolean) # false if client should cancel the paste.
+        (boolean) result false if client should cancel the paste.
 
     See also: ~
       • |paste| @alias paste_phase -1 | 1 | 2 | 3
@@ -2637,7 +2637,7 @@ basename({file})                                           *vim.fs.basename()*
       • {file}  (string) File or directory
 
     Return: ~
-        (string) Basename of {file}
+        (string|nil) Basename of {file}
 
 dir({path}, {opts})                                             *vim.fs.dir()*
     Return an iterator over the files and directories located in {path}
@@ -2664,7 +2664,7 @@ dirname({file})                                             *vim.fs.dirname()*
       • {file}  (string) File or directory
 
     Return: ~
-        (string) Parent directory of {file}
+        (string|nil) Parent directory of {file}
 
 find({names}, {opts})                                          *vim.fs.find()*
     Find files or directories in the given path.
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 5a93f5cd60..47215416e0 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -219,7 +219,7 @@ do
   ---                - 1: starts the paste (exactly once)
   ---                - 2: continues the paste (zero or more times)
   ---                - 3: ends the paste (exactly once)
-  ---@returns boolean # false if client should cancel the paste.
+  ---@return boolean result false if client should cancel the paste.
   function vim.paste(lines, phase)
     local now = vim.uv.now()
     local is_first_chunk = phase < 2
diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
index d489cef9fc..00b7416098 100644
--- a/runtime/lua/vim/_watch.lua
+++ b/runtime/lua/vim/_watch.lua
@@ -37,7 +37,7 @@ end
 ---     - uvflags (table|nil)
 ---                Same flags as accepted by |uv.fs_event_start()|
 ---@param callback (function) The function called when new events
----@return (function) A function to stop the watch
+---@return (function) Stops the watcher
 function M.watch(path, opts, callback)
   vim.validate({
     path = { path, 'string', false },
@@ -208,7 +208,7 @@ end
 ---                not match the pattern will be reported. Matches against both files and
 ---                directories. When nil, matches nothing.
 ---@param callback (function) The function called when new events
----@returns (function) A function to stop the watch.
+---@return function Stops the watcher
 function M.poll(path, opts, callback)
   vim.validate({
     path = { path, 'string', false },
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index bc880ed130..33d451315d 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -28,7 +28,7 @@ end
 --- If only start_lnum is specified, return a single line as a string.
 --- If both start_lnum and end_lnum are omitted, return all lines from the buffer.
 ---
----@param bufnr integer|nil The buffer to get the lines from
+---@param bufnr integer The buffer to get the lines from
 ---@param start_lnum integer|nil The line number of the first line (inclusive, 1-based)
 ---@param end_lnum integer|nil The line number of the last line (inclusive, 1-based)
 ---@return table<string>|string Array of lines, or string when end_lnum is omitted
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index cdb314fa3d..48d76e5d7e 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -20,7 +20,7 @@ local iswin = vim.uv.os_uname().sysname == 'Windows_NT'
 --- </pre>
 ---
 ---@param start (string) Initial file or directory.
----@return (function) Iterator
+---@return function Iterator
 function M.parents(start)
   return function(_, dir)
     local parent = M.dirname(dir)
@@ -37,7 +37,7 @@ end
 --- Return the parent directory of the given file or directory
 ---
 ---@param file (string) File or directory
----@return (string) Parent directory of {file}
+---@return string|nil Parent directory of {file}
 function M.dirname(file)
   if file == nil then
     return nil
@@ -59,8 +59,8 @@ end
 
 --- Return the basename of the given file or directory
 ---
----@param file (string) File or directory
----@return (string) Basename of {file}
+---@param file string File or directory
+---@return string|nil Basename of {file}
 function M.basename(file)
   if file == nil then
     return nil
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index ca4851f8d7..ed431e080e 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1951,7 +1951,7 @@ end
 ---
 ---@param client_id integer client id
 ---
----@returns |vim.lsp.client| object, or nil
+---@return (nil|lsp.Client) client rpc object
 function lsp.get_client_by_id(client_id)
   return active_clients[client_id] or uninitialized_clients[client_id]
 end
@@ -2090,13 +2090,14 @@ api.nvim_create_autocmd('VimLeavePre', {
 ---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
 ---@param params table|nil Parameters to send to the server
----@param handler lsp-handler|nil See |lsp-handler|
+---@param handler lsp-handler See |lsp-handler|
 ---       If nil, follows resolution strategy defined in |lsp-handler-configuration|
 ---
----@return table<integer, integer>, fun() 2-tuple:
----  - Map of client-id:request-id pairs for all successful requests.
----  - Function which can be used to cancel all the requests. You could instead
----    iterate all clients and call their `cancel_request()` methods.
+---@return table<integer, integer> client_request_ids Map of client-id:request-id pairs
+---for all successful requests.
+---@return function _cancel_all_requests Function which can be used to
+---cancel all the requests. You could instead
+---iterate all clients and call their `cancel_request()` methods.
 function lsp.buf_request(bufnr, method, params, handler)
   validate({
     bufnr = { bufnr, 'n', true },
@@ -2147,8 +2148,7 @@ end
 ---@param handler fun(results: table<integer, {error: lsp.ResponseError, result: any}>) (function)
 --- Handler called after all requests are completed. Server results are passed as
 --- a `client_id:result` map.
----
----@return fun() cancel Function that cancels all requests.
+---@return function cancel Function that cancels all requests.
 function lsp.buf_request_all(bufnr, method, params, handler)
   local results = {}
   local result_count = 0
@@ -2257,7 +2257,7 @@ end
 ---@param findstart integer 0 or 1, decides behavior
 ---@param base integer findstart=0, text to match against
 ---
----@returns (integer) Decided by {findstart}:
+---@return integer|table Decided by {findstart}:
 --- - findstart=0: column where the completion starts, or -2 or -3
 --- - findstart=1: list of matches (actually just calls |complete()|)
 function lsp.omnifunc(findstart, base)
@@ -2405,7 +2405,7 @@ end
 --- is a |vim.lsp.client| object.
 ---
 ---@param bufnr (integer|nil): Buffer handle, or 0 for current
----@returns (table) Table of (client_id, client) pairs
+---@return table result is table of (client_id, client) pairs
 ---@deprecated Use |vim.lsp.get_active_clients()| instead.
 function lsp.buf_get_clients(bufnr)
   local result = {}
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index bac66b671d..8ae0e0cde3 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -13,10 +13,11 @@ local M = {}
 ---@param params (table|nil) Parameters to send to the server
 ---@param handler (function|nil) See |lsp-handler|. Follows |lsp-handler-resolution|
 --
----@returns 2-tuple:
----  - Map of client-id:request-id pairs for all successful requests.
----  - Function which can be used to cancel all the requests. You could instead
----    iterate all clients and call their `cancel_request()` methods.
+---@return table<integer, integer> client_request_ids Map of client-id:request-id pairs
+---for all successful requests.
+---@return function _cancel_all_requests Function which can be used to
+---cancel all the requests. You could instead
+---iterate all clients and call their `cancel_request()` methods.
 ---
 ---@see |vim.lsp.buf_request()|
 local function request(method, params, handler)
@@ -30,7 +31,7 @@ end
 --- Checks whether the language servers attached to the current buffer are
 --- ready.
 ---
----@returns `true` if server responds.
+---@return boolean if server responds.
 ---@deprecated
 function M.server_ready()
   vim.deprecate('vim.lsp.buf.server_ready', nil, '0.10.0')
@@ -108,7 +109,7 @@ end
 --- Retrieves the completion items at the current cursor position. Can only be
 --- called in Insert mode.
 ---
----@param context (context support not yet implemented) Additional information
+---@param context table (context support not yet implemented) Additional information
 --- about the context in which a completion was triggered (how it was triggered,
 --- and by which trigger character, if applicable)
 ---
@@ -549,7 +550,7 @@ end
 --- call, the user is prompted to enter a string on the command line. An empty
 --- string means no filtering is done.
 ---
----@param query (string, optional)
+---@param query string|nil optional
 ---@param options table|nil additional options
 ---     - on_list: (function) handler for list results. See |lsp-on-list-handler|
 function M.workspace_symbol(query, options)
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 70781cb7a6..20c4d7458b 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -382,7 +382,7 @@ M['textDocument/hover'] = M.hover
 
 ---@private
 --- Jumps to a location. Used as a handler for multiple LSP methods.
----@param _ (not used)
+---@param _ nil not used
 ---@param result (table) result of LSP method; a location or a list of locations.
 ---@param ctx (table) table containing the context of the request, including the method
 ---(`textDocument/definition` can return `Location` or `Location[]`
@@ -496,8 +496,9 @@ end
 --- Displays call hierarchy in the quickfix window.
 ---
 ---@param direction `"from"` for incoming calls and `"to"` for outgoing calls
----@returns `CallHierarchyIncomingCall[]` if {direction} is `"from"`,
----@returns `CallHierarchyOutgoingCall[]` if {direction} is `"to"`,
+---@return function
+--- `CallHierarchyIncomingCall[]` if {direction} is `"from"`,
+--- `CallHierarchyOutgoingCall[]` if {direction} is `"to"`,
 local make_call_hierarchy_handler = function(direction)
   return function(_, result)
     if not result then
diff --git a/runtime/lua/vim/lsp/log.lua b/runtime/lua/vim/lsp/log.lua
index c77e7c045b..033f93bd6e 100644
--- a/runtime/lua/vim/lsp/log.lua
+++ b/runtime/lua/vim/lsp/log.lua
@@ -44,7 +44,7 @@ do
   vim.fn.mkdir(vim.fn.stdpath('log'), 'p')
 
   --- Returns the log filename.
-  ---@returns (string) log filename
+  ---@return string log filename
   function log.get_filename()
     return logfilename
   end
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index 6552eaa800..c110c3a67c 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -8,7 +8,7 @@ local is_win = uv.os_uname().version:find('Windows')
 ---@private
 --- Checks whether a given path exists and is a directory.
 ---@param filename (string) path to check
----@returns (bool)
+---@return boolean
 local function is_dir(filename)
   local stat = uv.fs_stat(filename)
   return stat and stat.type == 'directory' or false
@@ -18,7 +18,7 @@ end
 --- Embeds the given string into a table and correctly computes `Content-Length`.
 ---
 ---@param encoded_message (string)
----@returns (table) table containing encoded message and `Content-Length` attribute
+---@return string containing encoded message and `Content-Length` attribute
 local function format_message_with_content_length(encoded_message)
   return table.concat({
     'Content-Length: ',
@@ -32,7 +32,7 @@ end
 --- Parses an LSP Message's header
 ---
 ---@param header string: The header to parse.
----@return table parsed headers
+---@return table # parsed headers
 local function parse_headers(header)
   assert(type(header) == 'string', 'header must be a string')
   local headers = {}
@@ -190,7 +190,8 @@ end
 ---
 ---@param method (string) The invoked LSP method
 ---@param params (table): Parameters for the invoked LSP method
----@returns `nil` and `vim.lsp.protocol.ErrorCodes.MethodNotFound`.
+---@return nil
+---@return table `vim.lsp.protocol.ErrorCodes.MethodNotFound`
 function default_dispatchers.server_request(method, params)
   local _ = log.debug() and log.debug('server_request', method, params)
   return nil, rpc_response_error(protocol.ErrorCodes.MethodNotFound)
@@ -268,7 +269,7 @@ end
 --- Sends a notification to the LSP server.
 ---@param method (string) The invoked LSP method
 ---@param params (any): Parameters for the invoked LSP method
----@returns (bool) `true` if notification could be sent, `false` if not
+---@return boolean `true` if notification could be sent, `false` if not
 function Client:notify(method, params)
   return self:encode_and_send({
     jsonrpc = '2.0',
@@ -522,7 +523,7 @@ local function public_client(client)
   --- Sends a notification to the LSP server.
   ---@param method (string) The invoked LSP method
   ---@param params (table|nil): Parameters for the invoked LSP method
-  ---@returns (bool) `true` if notification could be sent, `false` if not
+  ---@return boolean `true` if notification could be sent, `false` if not
   function result.notify(method, params)
     return client:notify(method, params)
   end
@@ -624,9 +625,7 @@ end
 --- server process. May contain:
 --- - {cwd} (string) Working directory for the LSP server process
 --- - {env} (table) Additional environment variables for LSP server process
----@returns Client RPC object.
----
----@returns Methods:
+---@return table|nil Client RPC object, with these methods:
 --- - `notify()` |vim.lsp.rpc.notify()|
 --- - `request()` |vim.lsp.rpc.request()|
 --- - `is_closing()` returns a boolean indicating if the RPC is closing.
diff --git a/runtime/lua/vim/lsp/sync.lua b/runtime/lua/vim/lsp/sync.lua
index fb5b0b3194..350c096b47 100644
--- a/runtime/lua/vim/lsp/sync.lua
+++ b/runtime/lua/vim/lsp/sync.lua
@@ -94,7 +94,8 @@ end
 ---@param line string the line to index into
 ---@param byte integer the byte idx
 ---@param offset_encoding string utf-8|utf-16|utf-32|nil (default: utf-8)
----@returns table<string, int> byte_idx and char_idx of first change position
+---@return integer byte_idx of first change position
+---@return integer char_idx of first change position
 local function align_end_position(line, byte, offset_encoding)
   local char
   -- If on the first byte, or an empty string: the trivial case
@@ -129,7 +130,7 @@ end
 ---@param lastline integer lastline from on_lines, adjusted to 1-index
 ---@param new_lastline integer new_lastline from on_lines, adjusted to 1-index
 ---@param offset_encoding string utf-8|utf-16|utf-32|nil (fallback to utf-8)
----@returns table<int, int> line_idx, byte_idx, and char_idx of first change position
+---@return table result table include line_idx, byte_idx, and char_idx of first change position
 local function compute_start_range(
   prev_lines,
   curr_lines,
@@ -209,7 +210,8 @@ end
 ---@param lastline integer
 ---@param new_lastline integer
 ---@param offset_encoding string
----@returns (int, int) end_line_idx and end_col_idx of range
+---@return integer|table end_line_idx and end_col_idx of range
+---@return table|nil end_col_idx of range
 local function compute_end_range(
   prev_lines,
   curr_lines,
@@ -310,7 +312,7 @@ end
 ---@param lines table list of lines
 ---@param start_range table table returned by first_difference
 ---@param end_range table new_end_range returned by last_difference
----@returns string text extracted from defined region
+---@return string text extracted from defined region
 local function extract_text(lines, start_range, end_range, line_ending)
   if not lines[start_range.line_idx] then
     return ''
@@ -392,7 +394,7 @@ end
 ---@param lastline integer line to begin search in old_lines for last difference
 ---@param new_lastline integer line to begin search in new_lines for last difference
 ---@param offset_encoding string encoding requested by language server
----@returns table TextDocumentContentChangeEvent see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
+---@return table TextDocumentContentChangeEvent see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
 function M.compute_diff(
   prev_lines,
   curr_lines,
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua
index 08ed829114..dec7840eb0 100644
--- a/runtime/lua/vim/uri.lua
+++ b/runtime/lua/vim/uri.lua
@@ -30,14 +30,8 @@ do
     -- https://tools.ietf.org/html/rfc3986#section-2.2
     rfc3986 = "^A-Za-z0-9%-._~!$&'()*+,;=:@/",
   }
-  local sbyte, tohex = string.byte
-  if jit then
-    tohex = require('bit').tohex
-  else
-    tohex = function(b)
-      return string.format('%02x', b)
-    end
-  end
+  local sbyte = string.byte
+  local tohex = require('bit').tohex
 
   ---@private
   local function percent_encode_char(char)
-- 
cgit 


From 3750e5ed9c740a4334628c4a560d77c1dc2d0bfd Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Mon, 10 Jul 2023 11:55:12 -0500
Subject: vim-patch:9.0.1673: cannot produce a status 418 or 503 message
 (#24287)

Problem:    Cannot produce a status 418 or 503 message.
Solution:   Add err_teapot().

https://github.com/vim/vim/commit/80adaa8ae8398403ca4e9797219ea9a501fc76a5

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/vim_diff.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 68ebb8cc94..5246d3c2b8 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -598,6 +598,7 @@ Cscope:
 Eval:
   Vim9script
   *cscope_connection()*
+  *err_teapot()*
   *js_encode()*
   *js_decode()*
   *v:none* (used by Vim to represent JavaScript "undefined"); use |v:null| instead.
-- 
cgit 


From db8fe63a9398efd57c3ff28aa3d93e45fb70ee1a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 11 Jul 2023 07:15:46 +0800
Subject: feat(api): add nvim_win_text_height (#24236)

It uses the same code as "scroll_delta" of "win_viewport" UI event to
calculate text height, but is more flexible.
---
 runtime/doc/api.txt  | 32 ++++++++++++++++++++++++++++++++
 runtime/doc/news.txt |  3 +++
 2 files changed, 35 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index d96169066c..d128bf0221 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2961,6 +2961,38 @@ nvim_win_set_width({window}, {width})                   *nvim_win_set_width()*
       • {window}  Window handle, or 0 for current window
       • {width}   Width as a count of columns
 
+nvim_win_text_height({window}, {*opts})               *nvim_win_text_height()*
+    Computes the number of screen lines occupied by a range of text in a given
+    window. Works for off-screen text and takes folds into account.
+
+    Diff filler or virtual lines above a line are counted as a part of that
+    line, unless the line is on "start_row" and "start_vcol" is specified.
+
+    Diff filler or virtual lines below the last buffer line are counted in the
+    result when "end_row" is omitted.
+
+    Line indexing is similar to |nvim_buf_get_text()|.
+
+    Parameters: ~
+      • {window}  Window handle, or 0 for current window.
+      • {opts}    Optional parameters:
+                  • start_row: Starting line index, 0-based inclusive. When
+                    omitted start at the very top.
+                  • end_row: Ending line index, 0-based inclusive. When
+                    omitted end at the very bottom.
+                  • start_vcol: Starting virtual column index on "start_row",
+                    0-based inclusive, rounded down to full screen lines. When
+                    omitted include the whole line.
+                  • end_vcol: Ending virtual column index on "end_row",
+                    0-based exclusive, rounded up to full screen lines. When
+                    omitted include the whole line.
+
+    Return: ~
+        The number of screen lines that the range of text occupy.
+
+    See also: ~
+      • |virtcol()| for text width.
+
 
 ==============================================================================
 Win_Config Functions                                          *api-win_config*
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ac0a57e4d3..51ff0b4468 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -99,6 +99,9 @@ The following new APIs and features were added.
 
 • |vim.system()| for running system commands.
 
+• Added |nvim_win_text_height()| to get the number of screen lines occupied by
+  a range of text in a given window.
+
 • |nvim_set_keymap()| and |nvim_del_keymap()| now support abbreviations.
 
 • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
-- 
cgit 


From bf5703042b50c858bfc4633b1807c961089ec5e1 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Tue, 11 Jul 2023 18:09:44 +0100
Subject: fix(tutor): don't use concealed text in expected lines #24316

---
 runtime/tutor/en/vim-01-beginner.tutor      | 2 +-
 runtime/tutor/en/vim-01-beginner.tutor.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/tutor/en/vim-01-beginner.tutor b/runtime/tutor/en/vim-01-beginner.tutor
index e256711e70..3653271000 100644
--- a/runtime/tutor/en/vim-01-beginner.tutor
+++ b/runtime/tutor/en/vim-01-beginner.tutor
@@ -438,7 +438,7 @@ Notice that [c](c)e deletes the word and places you in Insert mode.
  5. Type `c$`{normal} and type the rest of the line like the second and press `<Esc>`{normal}.
 
 The end of this line needs some help to make it like the second.
-The end of this line needs to be corrected using the `c$`{normal} command.
+The end of this line needs to be corrected using the c$ command.
 
 NOTE: You can use the Backspace key to correct mistakes while typing.
 
diff --git a/runtime/tutor/en/vim-01-beginner.tutor.json b/runtime/tutor/en/vim-01-beginner.tutor.json
index 5dccb824e0..fc23a75dae 100644
--- a/runtime/tutor/en/vim-01-beginner.tutor.json
+++ b/runtime/tutor/en/vim-01-beginner.tutor.json
@@ -28,8 +28,8 @@
     "399": "When this line was typed in, someone pressed some wrong keys!",
     "419": "This line has a few words that need changing using the change operator.",
     "420": "This line has a few words that need changing using the change operator.",
-    "440": "The end of this line needs to be corrected using the `c$` command.",
-    "441": "The end of this line needs to be corrected using the `c$` command.",
+    "440": "The end of this line needs to be corrected using the c$ command.",
+    "441": "The end of this line needs to be corrected using the c$ command.",
     "504": -1,
     "523": -1,
     "546": "Usually the best time to see the flowers is in the spring.",
-- 
cgit 


From 317c80f460a7826421f40f57ee8bdbd736b0f225 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Wed, 12 Jul 2023 14:48:21 +0200
Subject: feat(lsp): add method filter to get_active_clients (#24319)

---
 runtime/doc/lsp.txt         |  2 ++
 runtime/lua/vim/lsp.lua     |  3 +++
 runtime/lua/vim/lsp/buf.lua | 28 +++++++++++-----------------
 3 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 4bafb622a6..3aef5bb7dd 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -780,6 +780,8 @@ get_active_clients({filter})                    *vim.lsp.get_active_clients()*
                   • bufnr (number): Only return clients attached to this
                     buffer
                   • name (string): Only return clients with the given name
+                  • method (string): Only return clients supporting the given
+                    method
 
     Return: ~
         lsp.Client []: List of |vim.lsp.client| objects
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index ed431e080e..1f9b6c4360 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1995,6 +1995,7 @@ end
 ---@field id integer|nil Match clients by id
 ---@field bufnr integer|nil match clients attached to the given buffer
 ---@field name string|nil match clients by name
+---@field method string|nil match client by supported method name
 
 --- Get active clients.
 ---
@@ -2004,6 +2005,7 @@ end
 ---               - id (number): Only return clients with the given id
 ---               - bufnr (number): Only return clients attached to this buffer
 ---               - name (string): Only return clients with the given name
+---               - method (string): Only return clients supporting the given method
 ---@return lsp.Client[]: List of |vim.lsp.client| objects
 function lsp.get_active_clients(filter)
   validate({ filter = { filter, 't', true } })
@@ -2020,6 +2022,7 @@ function lsp.get_active_clients(filter)
       client
       and (filter.id == nil or client.id == filter.id)
       and (filter.name == nil or client.name == filter.name)
+      and (filter.method == nil or client.supports_method(filter.method, { bufnr = filter.bufnr }))
     then
       clients[#clients + 1] = client
     end
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 8ae0e0cde3..b238b5c221 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -197,15 +197,6 @@ end
 function M.format(options)
   options = options or {}
   local bufnr = options.bufnr or api.nvim_get_current_buf()
-  local clients = vim.lsp.get_active_clients({
-    id = options.id,
-    bufnr = bufnr,
-    name = options.name,
-  })
-
-  if options.filter then
-    clients = vim.tbl_filter(options.filter, clients)
-  end
 
   local mode = api.nvim_get_mode().mode
   local range = options.range
@@ -214,9 +205,15 @@ function M.format(options)
   end
   local method = range and 'textDocument/rangeFormatting' or 'textDocument/formatting'
 
-  clients = vim.tbl_filter(function(client)
-    return client.supports_method(method)
-  end, clients)
+  local clients = vim.lsp.get_active_clients({
+    id = options.id,
+    bufnr = bufnr,
+    name = options.name,
+    method = method,
+  })
+  if options.filter then
+    clients = vim.tbl_filter(options.filter, clients)
+  end
 
   if #clients == 0 then
     vim.notify('[LSP] Format request failed, no matching language servers.')
@@ -277,16 +274,13 @@ function M.rename(new_name, options)
   local clients = vim.lsp.get_active_clients({
     bufnr = bufnr,
     name = options.name,
+    -- Clients must at least support rename, prepareRename is optional
+    method = 'textDocument/rename',
   })
   if options.filter then
     clients = vim.tbl_filter(options.filter, clients)
   end
 
-  -- Clients must at least support rename, prepareRename is optional
-  clients = vim.tbl_filter(function(client)
-    return client.supports_method('textDocument/rename')
-  end, clients)
-
   if #clients == 0 then
     vim.notify('[LSP] Rename, no matching language servers with rename capability.')
   end
-- 
cgit 


From 9359701eae7bd8a59e4a916e085cc686f609d693 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 13 Jul 2023 07:02:06 +0800
Subject: test(extmarks): add test for virt_text_win_col with cpo+=n (#24328)

---
 runtime/doc/api.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index d128bf0221..a20ba9a348 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2615,15 +2615,16 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {*opts})
                     string or as an integer, the latter which can be obtained
                     using |nvim_get_hl_id_by_name()|.
                   • virt_text_pos : position of virtual text. Possible values:
-                    • "eol": right after eol character (default)
+                    • "eol": right after eol character (default).
                     • "overlay": display over the specified column, without
                       shifting the underlying text.
                     • "right_align": display right aligned in the window.
                     • "inline": display at the specified column, and shift the
-                      buffer text to the right as needed
+                      buffer text to the right as needed.
 
                   • virt_text_win_col : position the virtual text at a fixed
-                    window column (starting from the first text column)
+                    window column (starting from the first text column of the
+                    screen line) instead of "virt_text_pos".
                   • virt_text_hide : hide the virtual text when the background
                     text is selected or hidden because of scrolling with
                     'nowrap' or 'smoothscroll'. Currently only affects
-- 
cgit 


From 516b173780e39de3ce1e4525f0a8f0ff250c992b Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 13 Jul 2023 10:17:19 +0100
Subject: perf(rtp): reduce rtp scans (#24191)

* perf(rtp): reduce rtp scans

Problem:
  Scanning the filesystem is expensive and particularly affects
  startuptime.

Solution:
  Reduce the amount of redundant directory scans by relying less on glob
  patterns and handle vim and lua sourcing lower down.
---
 runtime/doc/repeat.txt   | 4 ++++
 runtime/doc/starting.txt | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 558cc75d65..a66d77910b 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -231,6 +231,10 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 				:runtime plugin/**/*.vim
 <			would source the first file only.
 
+			For each {file} pattern, if a file has both a `.vim`
+			and `.lua` extensions, the `.vim` version will be sourced
+			first.
+
 			When 'verbose' is one or higher, there is a message
 			when no file could be found.
 			When 'verbose' is two or higher, there is a message
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 53a14c586f..b287b43e92 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -506,12 +506,12 @@ accordingly, proceeding as follows:
 
 10. Load the plugin scripts.					*load-plugins*
 	This does the same as the command: >
-		:runtime! plugin/**/*.vim
-		:runtime! plugin/**/*.lua
+		:runtime! plugin/**/*.{vim,lua}
 <	The result is that all directories in 'runtimepath' will be searched
 	for the "plugin" sub-directory and all files ending in ".vim" or
 	".lua" will be sourced (in alphabetical order per directory),
-	also in subdirectories. First "*.vim" are sourced, then "*.lua" files.
+	also in subdirectories. First "*.vim" are sourced, then "*.lua" files,
+	per directory.
 
 	However, directories in 'runtimepath' ending in "after" are skipped
 	here and only loaded after packages, see below.
-- 
cgit 


From a3f4598226c4d01e4fbc41181a1ad21793862fe3 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Thu, 13 Jul 2023 14:43:36 +0200
Subject: docs(lua): adds links to related keymap functions to keymap.set
 (#24337)

Might help with discovery, given that there is no `keymap.get()`
---
 runtime/doc/lua.txt        | 3 +++
 runtime/lua/vim/keymap.lua | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ae3c248d64..3f5ab6e00f 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2625,6 +2625,9 @@ set({mode}, {lhs}, {rhs}, {opts})                           *vim.keymap.set()*
 
     See also: ~
       • |nvim_set_keymap()|
+      • |maparg()|
+      • |mapcheck()|
+      • |mapset()|
 
 
 ==============================================================================
diff --git a/runtime/lua/vim/keymap.lua b/runtime/lua/vim/keymap.lua
index 9dbc65afe8..2b55ddc787 100644
--- a/runtime/lua/vim/keymap.lua
+++ b/runtime/lua/vim/keymap.lua
@@ -32,6 +32,9 @@ local keymap = {}
 ---                        - "remap": (boolean) Make the mapping recursive. Inverse of "noremap".
 ---                        Defaults to `false`.
 ---@see |nvim_set_keymap()|
+---@see |maparg()|
+---@see |mapcheck()|
+---@see |mapset()|
 function keymap.set(mode, lhs, rhs, opts)
   vim.validate({
     mode = { mode, { 's', 't' } },
-- 
cgit 


From dbb840da01c72d8a311e0c55d3248d78a64b63a4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 14 Jul 2023 06:46:16 +0800
Subject: fix(runtime): respect 'rtp' order for all runtime files (#24335)

---
 runtime/doc/quickfix.txt   |  2 +-
 runtime/doc/repeat.txt     | 12 ++++++------
 runtime/doc/syntax.txt     |  4 ++--
 runtime/filetype.lua       |  3 +--
 runtime/ftplugin.vim       |  6 ++----
 runtime/indent.vim         |  4 ++--
 runtime/syntax/synload.vim |  4 ++--
 7 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 7a1649a74b..0bf04034ec 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1246,7 +1246,7 @@ not "b:current_compiler".  What the command actually does is the following:
 - Delete the "current_compiler" and "b:current_compiler" variables.
 - Define the "CompilerSet" user command.  With "!" it does ":set", without "!"
   it does ":setlocal".
-- Execute ":runtime! compiler/{name}.(vim|lua)".  The plugins are expected to
+- Execute ":runtime! compiler/{name}.{vim,lua}".  The plugins are expected to
   set options with "CompilerSet" and set the "current_compiler" variable to the
   name of the compiler.
 - Delete the "CompilerSet" user command.
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index a66d77910b..53f6904170 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -225,15 +225,15 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 
 			When {file} contains wildcards it is expanded to all
 			matching files.  Example: >
-				:runtime! plugin/**/*.vim
-<			This is what Vim uses to load the plugin files when
+				:runtime! plugin/**/*.{vim,lua}
+<			This is what Nvim uses to load the plugin files when
 			starting up.  This similar command: >
-				:runtime plugin/**/*.vim
+				:runtime plugin/**/*.{vim,lua}
 <			would source the first file only.
 
-			For each {file} pattern, if a file has both a `.vim`
-			and `.lua` extensions, the `.vim` version will be sourced
-			first.
+			For each {file} pattern, if two `.vim` and `.lua` file
+			names match and differ only in extension, the `.vim`
+			file is sourced first.
 
 			When 'verbose' is one or higher, there is a message
 			when no file could be found.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 09c935cb9b..631e666b6a 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4895,8 +4895,8 @@ in their own color.
 			output "default".
 
 :colo[rscheme] {name}	Load color scheme {name}.  This searches 'runtimepath'
-			for the file "colors/{name}.(vim|lua)".  The first one that
-			is found is loaded.
+			for the file "colors/{name}.{vim,lua}".  The first one
+			that is found is loaded.
 			Note: "colors/{name}.vim" is tried first.
 			Also searches all plugins in 'packpath', first below
 			"start" and then under "opt".
diff --git a/runtime/filetype.lua b/runtime/filetype.lua
index f772785d21..cf5fe39656 100644
--- a/runtime/filetype.lua
+++ b/runtime/filetype.lua
@@ -32,8 +32,7 @@ vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile', 'StdinReadPost' }, {
 if not vim.g.did_load_ftdetect then
   vim.cmd([[
   augroup filetypedetect
-  runtime! ftdetect/*.vim
-  runtime! ftdetect/*.lua
+  runtime! ftdetect/*.{vim,lua}
   augroup END
   ]])
 end
diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim
index f5c411fbe6..7b55134a4b 100644
--- a/runtime/ftplugin.vim
+++ b/runtime/ftplugin.vim
@@ -30,10 +30,8 @@ augroup filetypeplugin
       for name in split(s, '\.')
         " Load Lua ftplugins after Vim ftplugins _per directory_
         " TODO(clason): use nvim__get_runtime when supports globs and modeline
-        exe printf('runtime! ftplugin/%s.vim ftplugin/%s.lua
-                           \ ftplugin/%s_*.vim ftplugin/%s_*.lua
-                           \ ftplugin/%s/*.vim ftplugin/%s/*.lua',
-                           \ name, name, name, name, name, name)
+        " XXX: "[.]" in the first pattern makes it a wildcard on Windows
+        exe $'runtime! ftplugin/{name}[.]{{vim,lua}} ftplugin/{name}_*.{{vim,lua}} ftplugin/{name}/*.{{vim,lua}}'
       endfor
     endif
   endfunc
diff --git a/runtime/indent.vim b/runtime/indent.vim
index 2b64dd44b9..e4ddc09401 100644
--- a/runtime/indent.vim
+++ b/runtime/indent.vim
@@ -24,8 +24,8 @@ augroup filetypeindent
       " When there is a dot it is used to separate filetype names.  Thus for
       " "aaa.bbb" load "indent/aaa.vim" and then "indent/bbb.vim".
       for name in split(s, '\.')
-        exe 'runtime! indent/' . name . '.vim'
-        exe 'runtime! indent/' . name . '.lua'
+        " XXX: "[.]" in the pattern makes it a wildcard on Windows
+        exe $'runtime! indent/{name}[.]{{vim,lua}}'
       endfor
     endif
   endfunc
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index 056e38bf79..80685a5213 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -48,8 +48,8 @@ fun! s:SynSet()
     " load each in sequence.  Skip empty entries.
     for name in split(s, '\.')
       if !empty(name)
-        exe "runtime! syntax/" . name . ".vim syntax/" . name . "/*.vim"
-        exe "runtime! syntax/" . name . ".lua syntax/" . name . "/*.lua"
+        " XXX: "[.]" in the first pattern makes it a wildcard on Windows
+        exe $'runtime! syntax/{name}[.]{{vim,lua}} syntax/{name}/*.{{vim,lua}}'
       endif
     endfor
   endif
-- 
cgit 


From 2ecba65b4ba741618ecbfd2a50a939987078bc98 Mon Sep 17 00:00:00 2001
From: Techatrix <19954306+Techatrix@users.noreply.github.com>
Date: Fri, 14 Jul 2023 05:36:10 +0000
Subject: fix(lsp): remove unknown LSP protocol property (#24345)

'hierarchicalWorkspaceSymbolSupport' is not part of the LSP Specification
---
 runtime/lua/vim/lsp/protocol.lua | 1 -
 1 file changed, 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 27da891656..5bc0baf241 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -844,7 +844,6 @@ function protocol.make_client_capabilities()
             return res
           end)(),
         },
-        hierarchicalWorkspaceSymbolSupport = true,
       },
       configuration = true,
       workspaceFolders = true,
-- 
cgit 


From 33e1a8cd7042816a064c0d2bf32b6570d7e88b79 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Fri, 14 Jul 2023 18:47:18 +0200
Subject: feat(lsp): map K to hover by default #24331

Related: https://github.com/neovim/neovim/issues/24252
---
 runtime/doc/lsp.txt     |  3 +++
 runtime/doc/news.txt    |  4 ++++
 runtime/lua/vim/lsp.lua | 19 +++++++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 3aef5bb7dd..450690fe3b 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -58,6 +58,8 @@ options are not restored when the LSP client is stopped or detached.
 - 'formatexpr' is set to |vim.lsp.formatexpr()|, so you can format lines via
   |gq| if the language server supports it.
   - To opt out of this use |gw| instead of gq, or set 'formatexpr' on LspAttach.
+- |K| is mapped to |vim.lsp.buf.hover()| unless |'keywordprg'| is customized or
+  a custom keymap for `K` exists.
 
                                                         *lsp-defaults-disable*
 To override the above defaults, set or unset the options on |LspAttach|: >lua
@@ -65,6 +67,7 @@ To override the above defaults, set or unset the options on |LspAttach|: >lua
       callback = function(ev)
         vim.bo[ev.buf].formatexpr = nil
         vim.bo[ev.buf].omnifunc = nil
+        vim.keymap.del("n", "K", { bufnr = ev.buf })
       end,
     })
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 51ff0b4468..e16bcafac2 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -156,6 +156,10 @@ The following changes to existing APIs or features add new behavior.
   `vim.ui.open` or remap `gx`. To continue using netrw (deprecated): >vim
   :call netrw#BrowseX(expand(exists("g:netrw_gx")? g:netrw_gx : '<cfile>'), netrw#CheckIfRemote())<CR>
 
+• |vim.lsp.start()| now maps |K| to use |vim.lsp.buf.hover()| if the server
+  supports it, unless |'keywordprg'| was customized before calling
+  |vim.lsp.start()|.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 1f9b6c4360..e9a1423d2d 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -963,6 +963,15 @@ function lsp._set_defaults(client, bufnr)
   then
     vim.bo[bufnr].formatexpr = 'v:lua.vim.lsp.formatexpr()'
   end
+  api.nvim_buf_call(bufnr, function()
+    if
+      client.supports_method('textDocument/hover')
+      and is_empty_or_default(bufnr, 'keywordprg')
+      and vim.fn.maparg('K', 'n', false, false) == ''
+    then
+      vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = bufnr })
+    end
+  end)
 end
 
 --- @class lsp.ClientConfig
@@ -1202,7 +1211,7 @@ function lsp.start_client(config)
   ---@private
   --- Reset defaults set by `set_defaults`.
   --- Must only be called if the last client attached to a buffer exits.
-  local function unset_defaults(bufnr)
+  local function reset_defaults(bufnr)
     if vim.bo[bufnr].tagfunc == 'v:lua.vim.lsp.tagfunc' then
       vim.bo[bufnr].tagfunc = nil
     end
@@ -1212,6 +1221,12 @@ function lsp.start_client(config)
     if vim.bo[bufnr].formatexpr == 'v:lua.vim.lsp.formatexpr()' then
       vim.bo[bufnr].formatexpr = nil
     end
+    api.nvim_buf_call(bufnr, function()
+      local keymap = vim.fn.maparg('K', 'n', false, true)
+      if keymap and keymap.callback == vim.lsp.buf.hover then
+        vim.keymap.del('n', 'K', { buffer = bufnr })
+      end
+    end)
   end
 
   ---@private
@@ -1243,7 +1258,7 @@ function lsp.start_client(config)
 
           client_ids[client_id] = nil
           if vim.tbl_isempty(client_ids) then
-            unset_defaults(bufnr)
+            reset_defaults(bufnr)
           end
         end)
       end
-- 
cgit 


From abe39f2b243dc813456225a779fbeb7ae6affc27 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Jul 2023 18:02:53 +0800
Subject: feat(api)!: change return type of nvim_win_text_height to Dict
 (#24365)

---
 runtime/doc/api.txt  | 4 +++-
 runtime/doc/news.txt | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index a20ba9a348..b33d251786 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2989,7 +2989,9 @@ nvim_win_text_height({window}, {*opts})               *nvim_win_text_height()*
                     omitted include the whole line.
 
     Return: ~
-        The number of screen lines that the range of text occupy.
+        Dictionary containing text height information, with these keys:
+        • all: The total number of screen lines occupied by the range.
+        • fill: The number of diff filler or virtual lines among them.
 
     See also: ~
       • |virtcol()| for text width.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index e16bcafac2..0a16cb0e96 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -99,8 +99,8 @@ The following new APIs and features were added.
 
 • |vim.system()| for running system commands.
 
-• Added |nvim_win_text_height()| to get the number of screen lines occupied by
-  a range of text in a given window.
+• Added |nvim_win_text_height()| to compute the number of screen lines occupied
+  by a range of text in a given window.
 
 • |nvim_set_keymap()| and |nvim_del_keymap()| now support abbreviations.
 
-- 
cgit 


From 251ca45ac94851c896db0d27685622fb78a73b3e Mon Sep 17 00:00:00 2001
From: Mike <10135646+mikesmithgh@users.noreply.github.com>
Date: Sun, 16 Jul 2023 06:11:45 -0400
Subject: fix(lsp): markdown code fence should allow space before info string
 #24364

Problem:
Bash language server returns "hover" markdown content that starts with
a code fence and info string of `man` preceded by whitespace, which Nvim
does not render properly.

See https://github.com/bash-lsp/bash-language-server/blob/0ee73c53cebdc18311d4a4ad9367185ea4d98a03/server/src/server.ts#L821C15-L821C15
```typescript
function getMarkdownContent(documentation: string, language?: string): LSP.MarkupContent {
  return {
    value: language
      ? // eslint-disable-next-line prefer-template
        ['``` ' + language, documentation, '```'].join('\n')
      : documentation,
    kind: LSP.MarkupKind.Markdown,
  }
}
```

For example,
```
    ``` man
    NAME
       git - the stupid content tracker
    ```
```

If I remove the white space, then it is properly formatted.
```
    ```man instead of ``` man
```

Per CommonMark Spec https://spec.commonmark.org/0.30/#info-string
whitespace is allowed before and after the `info string` which
identifies the language in a codeblock.
> The line with the opening code fence may optionally contain some text
> following the code fence; this is trimmed of leading and trailing
> spaces or tabs and called the [info
> string](https://spec.commonmark.org/0.30/#info-string). If the [info
> string](https://spec.commonmark.org/0.30/#info-string) comes after
> a backtick fence, it may not contain any backtick characters. (The
> reason for this restriction is that otherwise some inline code would
> be incorrectly interpreted as the beginning of a fenced code block.)

 Solution:
 Adjust stylize_markdown() to allow whitespace before codeblock info.
---
 runtime/lua/vim/lsp/util.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 8d6f88bb2c..0da88f800e 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1347,7 +1347,7 @@ function M.stylize_markdown(bufnr, contents, opts)
   -- table of fence types to {ft, begin, end}
   -- when ft is nil, we get the ft from the regex match
   local matchers = {
-    block = { nil, '```+([a-zA-Z0-9_]*)', '```+' },
+    block = { nil, '```+%s*([a-zA-Z0-9_]*)', '```+' },
     pre = { nil, '<pre>([a-z0-9]*)', '</pre>' },
     code = { '', '<code>', '</code>' },
     text = { 'text', '<text>', '</text>' },
-- 
cgit 


From 047c22a28cf1ed723791e714b2a5b7c6b4b0e1fc Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 16 Jul 2023 18:39:45 +0800
Subject: docs(term.txt): reorder paragraphs about TUI input (#24367)

Make |tui-modifyOtherKeys| and |tui-csiu| tags appear at a better place.
Also adapt the |<Tab>| help update from https://github.com/vim/vim/commit/dad4473f02e1fec86d43a2fc094536a4b27d3b25
---
 runtime/doc/intro.txt  |  1 +
 runtime/doc/motion.txt |  6 ++++++
 runtime/doc/news.txt   |  3 +++
 runtime/doc/term.txt   | 42 +++++++++++++++++-------------------------
 4 files changed, 27 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index ab380184fc..b496dc5240 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -372,6 +372,7 @@ notation	meaning		    equivalent	decimal value(s)	~
 <C-…>		control-key			*control* *ctrl* *<C-*
 <M-…>		alt-key or meta-key		*META* *ALT* *<M-*
 <A-…>		same as <M-…>			*<A-*
+<T-…>		meta-key when it's not alt	*<T-*
 <D-…>		command-key or "super" key	*<D-*
 ----------------------------------------------------------------------- ~
 
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index d7a0205ebd..9ce22c9b78 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1026,6 +1026,12 @@ CTRL-O			Go to [count] Older cursor position in jump list
 CTRL-I			Go to [count] newer cursor position in jump list
 			(not a motion command).
 
+			NOTE: In the GUI and in a terminal supporting
+			|tui-modifyOtherKeys| or |tui-csiu|, CTRL-I can be
+			mapped separately from <Tab>, on the condition that
+			both keys are mapped, otherwise the mapping applies to
+			both.
+
 							*:ju* *:jumps*
 :ju[mps]		Print the jump list (not a motion command).
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 0a16cb0e96..7375cd6a82 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -104,6 +104,9 @@ The following new APIs and features were added.
 
 • |nvim_set_keymap()| and |nvim_del_keymap()| now support abbreviations.
 
+• Builtin TUI can now recognize "super" (|<D-|) and "meta" (|<T-|) modifiers in a
+  terminal emulator that supports |tui-csiu|.
+
 • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
   https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
 
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 847b4b6112..ee8a4d8732 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -108,10 +108,22 @@ and right scroll margins as well.  If Nvim detects that the terminal is Xterm,
 it will make use of this ability to speed up scrolling that is not the full
 width of the terminal.
 
-							*tui-input*
+								*tui-input*
+Historically, terminal emulators could not distinguish between certain control
+key modifiers and other keys. For example, <C-I> and <Tab> are represented in
+the same way, as are <Esc> and <C-[>, <CR> and <C-M>, and <NL> and <C-J>.
+
+Modern terminal emulators are able to distinguish between these pairs of keys
+by encoding control modifiers differently. There are two common but distinct
+ways of doing this, known as "modifyOtherKeys" and "CSI u". Nvim supports both
+encoding methods and at startup will tell the terminal emulator that it
+understands these key encodings. If your terminal emulator supports it then
+this will allow you to map the key pairs listed above separately. |<Tab>|
+
 Nvim uses libtermkey to convert terminal escape sequences to key codes.
 |terminfo| is used first, and CSI sequences not in |terminfo| (including
-extended keys a.k.a. modifyOtherKeys or "CSI u") can also be parsed.
+extended keys a.k.a. "modifyOtherKeys" or "CSI u") can also be parsed.
+
 For example, when running Nvim in tmux, this makes Nvim leave Insert mode and
 go to the window below: >
 	tmux send-keys 'Escape' [ 2 7 u 'C-W' j
@@ -124,42 +136,22 @@ For example, this sequence is recognized by Nvim as <C-kEnter>: >
 and can be used differently from <C-CR> in mappings.
 
 						*tui-modifyOtherKeys* *tui-csiu*
-Historically, terminal emulators could not distinguish between certain control
-key modifiers and other keys. For example, <C-I> and <Tab> are represented the
-same way, as are <Esc> and <C-[>, <CR> and <C-M>, and <NL> and <C-J>. This
-meant that Nvim also could not map these keys separately.
-
-Modern terminal emulators are able to distinguish between these pairs of keys
-by encoding control modifiers differently. There are two common but distinct
-ways of doing this, known as "modifyOtherKeys" and "CSI u". Nvim supports both
-encoding methods and at startup will tell the terminal emulator that it
-understands these key encodings. If your terminal emulator supports it then
-this will allow you to map the key pairs listed above separately.
-
-At startup Nvim will query your terminal to see if it supports the CSI u
+At startup Nvim will query your terminal to see if it supports the "CSI u"
 encoding by writing the sequence >
-
 	CSI ? u CSI c
-
 If your terminal emulator responds with >
-
 	CSI ? <flags> u
-
-this means your terminal supports the CSI u encoding and Nvim will tell your
+this means your terminal supports the "CSI u" encoding and Nvim will tell your
 terminal to enable it by writing the sequence >
-
 	CSI > 1 u
-
-If your terminal does not support CSI u then Nvim will instead enable the
+If your terminal does not support "CSI u" then Nvim will instead enable the
 "modifyOtherKeys" encoding by writing the sequence >
-
 	CSI > 4 ; 2 m
 
 When Nvim exits cleanly it will send the corresponding sequence to disable the
 special key encoding. If Nvim does not exit cleanly then your terminal
 emulator could be in a bad state. If this happens, simply run "reset".
 
-
 							*tui-colors*
 Nvim uses 256 colours by default, ignoring |terminfo| for most terminal types,
 including "linux" (whose virtual terminals have had 256-colour support since
-- 
cgit 


From c3de6524a53dc355b1c8074eb6940e9e73714057 Mon Sep 17 00:00:00 2001
From: Kai Ting <kkting@gmail.com>
Date: Sun, 16 Jul 2023 04:15:30 -0700
Subject: fix(clipboard): ignore exit caused by signal #23378

Problem:
If clipboard job exits by signal, the exit code is >=128:
https://github.com/neovim/neovim/commit/939d9053bdf2f56286640c581eb4e2ff5a856540
xclip 0.13 often exits with code 143, which spams unhelpful messages:

    clipboard: error invoking xclip: Waiting for selection requests,
    Control-C to quit   Waiting for selection request number 1

Solution:
Don't show a warning if the clipboard tool exit code is >=128.
Fixes: #7054
---
 runtime/autoload/provider/clipboard.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 6d238ddb55..6ba28dcbfc 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -25,7 +25,8 @@ function! s:selection.on_exit(jobid, data, event) abort
   if self.owner == a:jobid
     let self.owner = 0
   endif
-  if a:data != 0
+  " Don't print if exit code is >= 128 ( exit is 128+SIGNUM if by signal (e.g. 143 on SIGTERM))
+  if a:data > 0 && a:data < 128
     echohl WarningMsg
     echomsg 'clipboard: error invoking '.get(self.argv, 0, '?').': '.join(self.stderr)
     echohl None
-- 
cgit 


From d0b612f360125785eb95afaa51620c5c7695e381 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 16 Jul 2023 09:27:39 +0100
Subject: refactor: rename _meta.lua to _options.lua

---
 runtime/lua/vim/_editor.lua  |   2 +-
 runtime/lua/vim/_meta.lua    | 575 -------------------------------------------
 runtime/lua/vim/_options.lua | 575 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 576 insertions(+), 576 deletions(-)
 delete mode 100644 runtime/lua/vim/_meta.lua
 create mode 100644 runtime/lua/vim/_options.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 47215416e0..bb0aa97a0d 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -1094,7 +1094,7 @@ function vim._init_defaults()
   vim._init_default_autocmds()
 end
 
-require('vim._meta')
+require('vim._options')
 
 -- Remove at Nvim 1.0
 ---@deprecated
diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
deleted file mode 100644
index 41e6e8be86..0000000000
--- a/runtime/lua/vim/_meta.lua
+++ /dev/null
@@ -1,575 +0,0 @@
-local api = vim.api
-
--- TODO(tjdevries): Improve option metadata so that this doesn't have to be hardcoded.
---                  Can be done in a separate PR.
-local key_value_options = {
-  fillchars = true,
-  fcs = true,
-  listchars = true,
-  lcs = true,
-  winhighlight = true,
-  winhl = true,
-}
-
---- Convert a vimoption_T style dictionary to the correct OptionType associated with it.
----@return string
-local function get_option_metatype(name, info)
-  if info.type == 'string' then
-    if info.flaglist then
-      return 'set'
-    elseif info.commalist then
-      if key_value_options[name] then
-        return 'map'
-      end
-      return 'array'
-    end
-    return 'string'
-  end
-  return info.type
-end
-
-local options_info = setmetatable({}, {
-  __index = function(t, k)
-    local info = api.nvim_get_option_info(k)
-    info.metatype = get_option_metatype(k, info)
-    rawset(t, k, info)
-    return rawget(t, k)
-  end,
-})
-
-vim.env = setmetatable({}, {
-  __index = function(_, k)
-    local v = vim.fn.getenv(k)
-    if v == vim.NIL then
-      return nil
-    end
-    return v
-  end,
-
-  __newindex = function(_, k, v)
-    vim.fn.setenv(k, v)
-  end,
-})
-
-local function opt_validate(option_name, target_scope)
-  local scope = options_info[option_name].scope
-  if scope ~= target_scope then
-    local scope_to_string = { buf = 'buffer', win = 'window' }
-    error(
-      string.format(
-        [['%s' is a %s option, not a %s option. See ":help %s"]],
-        option_name,
-        scope_to_string[scope] or scope,
-        scope_to_string[target_scope] or target_scope,
-        option_name
-      )
-    )
-  end
-end
-
-local function new_buf_opt_accessor(bufnr)
-  return setmetatable({}, {
-    __index = function(_, k)
-      if bufnr == nil and type(k) == 'number' then
-        return new_buf_opt_accessor(k)
-      end
-      opt_validate(k, 'buf')
-      return api.nvim_get_option_value(k, { buf = bufnr or 0 })
-    end,
-
-    __newindex = function(_, k, v)
-      opt_validate(k, 'buf')
-      return api.nvim_set_option_value(k, v, { buf = bufnr or 0 })
-    end,
-  })
-end
-
-vim.bo = new_buf_opt_accessor()
-
-local function new_win_opt_accessor(winid, bufnr)
-  return setmetatable({}, {
-    __index = function(_, k)
-      if bufnr == nil and type(k) == 'number' then
-        if winid == nil then
-          return new_win_opt_accessor(k)
-        else
-          return new_win_opt_accessor(winid, k)
-        end
-      end
-
-      if bufnr ~= nil and bufnr ~= 0 then
-        error('only bufnr=0 is supported')
-      end
-
-      opt_validate(k, 'win')
-      -- TODO(lewis6991): allow passing both buf and win to nvim_get_option_value
-      return api.nvim_get_option_value(k, {
-        scope = bufnr and 'local' or nil,
-        win = winid or 0,
-      })
-    end,
-
-    __newindex = function(_, k, v)
-      opt_validate(k, 'win')
-      -- TODO(lewis6991): allow passing both buf and win to nvim_set_option_value
-      return api.nvim_set_option_value(k, v, {
-        scope = bufnr and 'local' or nil,
-        win = winid or 0,
-      })
-    end,
-  })
-end
-
-vim.wo = new_win_opt_accessor()
-
--- vim global option
---  this ONLY sets the global option. like `setglobal`
-vim.go = setmetatable({}, {
-  __index = function(_, k)
-    return api.nvim_get_option_value(k, { scope = 'global' })
-  end,
-  __newindex = function(_, k, v)
-    return api.nvim_set_option_value(k, v, { scope = 'global' })
-  end,
-})
-
--- vim `set` style options.
---  it has no additional metamethod magic.
-vim.o = setmetatable({}, {
-  __index = function(_, k)
-    return api.nvim_get_option_value(k, {})
-  end,
-  __newindex = function(_, k, v)
-    return api.nvim_set_option_value(k, v, {})
-  end,
-})
-
----@brief [[
---- vim.opt, vim.opt_local and vim.opt_global implementation
----
---- To be used as helpers for working with options within neovim.
---- For information on how to use, see :help vim.opt
----
----@brief ]]
-
---- Preserves the order and does not mutate the original list
-local function remove_duplicate_values(t)
-  local result, seen = {}, {}
-  for _, v in ipairs(t) do
-    if not seen[v] then
-      table.insert(result, v)
-    end
-
-    seen[v] = true
-  end
-
-  return result
-end
-
--- Check whether the OptionTypes is allowed for vim.opt
--- If it does not match, throw an error which indicates which option causes the error.
-local function assert_valid_value(name, value, types)
-  local type_of_value = type(value)
-  for _, valid_type in ipairs(types) do
-    if valid_type == type_of_value then
-      return
-    end
-  end
-
-  error(
-    string.format(
-      "Invalid option type '%s' for '%s', should be %s",
-      type_of_value,
-      name,
-      table.concat(types, ' or ')
-    )
-  )
-end
-
-local function passthrough(_, x)
-  return x
-end
-
-local function tbl_merge(left, right)
-  return vim.tbl_extend('force', left, right)
-end
-
-local function tbl_remove(t, value)
-  if type(value) == 'string' then
-    t[value] = nil
-  else
-    for _, v in ipairs(value) do
-      t[v] = nil
-    end
-  end
-
-  return t
-end
-
-local valid_types = {
-  boolean = { 'boolean' },
-  number = { 'number' },
-  string = { 'string' },
-  set = { 'string', 'table' },
-  array = { 'string', 'table' },
-  map = { 'string', 'table' },
-}
-
--- Map of functions to take a Lua style value and convert to vimoption_T style value.
--- Each function takes (info, lua_value) -> vim_value
-local to_vim_value = {
-  boolean = passthrough,
-  number = passthrough,
-  string = passthrough,
-
-  set = function(info, value)
-    if type(value) == 'string' then
-      return value
-    end
-
-    if info.flaglist and info.commalist then
-      local keys = {}
-      for k, v in pairs(value) do
-        if v then
-          table.insert(keys, k)
-        end
-      end
-
-      table.sort(keys)
-      return table.concat(keys, ',')
-    else
-      local result = ''
-      for k, v in pairs(value) do
-        if v then
-          result = result .. k
-        end
-      end
-
-      return result
-    end
-  end,
-
-  array = function(info, value)
-    if type(value) == 'string' then
-      return value
-    end
-    if not info.allows_duplicates then
-      value = remove_duplicate_values(value)
-    end
-    return table.concat(value, ',')
-  end,
-
-  map = function(_, value)
-    if type(value) == 'string' then
-      return value
-    end
-
-    local result = {}
-    for opt_key, opt_value in pairs(value) do
-      table.insert(result, string.format('%s:%s', opt_key, opt_value))
-    end
-
-    table.sort(result)
-    return table.concat(result, ',')
-  end,
-}
-
---- Convert a Lua value to a vimoption_T value
-local function convert_value_to_vim(name, info, value)
-  if value == nil then
-    return vim.NIL
-  end
-
-  assert_valid_value(name, value, valid_types[info.metatype])
-
-  return to_vim_value[info.metatype](info, value)
-end
-
--- Map of OptionType to functions that take vimoption_T values and convert to Lua values.
--- Each function takes (info, vim_value) -> lua_value
-local to_lua_value = {
-  boolean = passthrough,
-  number = passthrough,
-  string = passthrough,
-
-  array = function(info, value)
-    if type(value) == 'table' then
-      if not info.allows_duplicates then
-        value = remove_duplicate_values(value)
-      end
-
-      return value
-    end
-
-    -- Empty strings mean that there is nothing there,
-    -- so empty table should be returned.
-    if value == '' then
-      return {}
-    end
-
-    -- Handles unescaped commas in a list.
-    if string.find(value, ',,,') then
-      local left, right = unpack(vim.split(value, ',,,'))
-
-      local result = {}
-      vim.list_extend(result, vim.split(left, ','))
-      table.insert(result, ',')
-      vim.list_extend(result, vim.split(right, ','))
-
-      table.sort(result)
-
-      return result
-    end
-
-    if string.find(value, ',^,,', 1, true) then
-      local left, right = unpack(vim.split(value, ',^,,', true))
-
-      local result = {}
-      vim.list_extend(result, vim.split(left, ','))
-      table.insert(result, '^,')
-      vim.list_extend(result, vim.split(right, ','))
-
-      table.sort(result)
-
-      return result
-    end
-
-    return vim.split(value, ',')
-  end,
-
-  set = function(info, value)
-    if type(value) == 'table' then
-      return value
-    end
-
-    -- Empty strings mean that there is nothing there,
-    -- so empty table should be returned.
-    if value == '' then
-      return {}
-    end
-
-    assert(info.flaglist, 'That is the only one I know how to handle')
-
-    if info.flaglist and info.commalist then
-      local split_value = vim.split(value, ',')
-      local result = {}
-      for _, v in ipairs(split_value) do
-        result[v] = true
-      end
-
-      return result
-    else
-      local result = {}
-      for i = 1, #value do
-        result[value:sub(i, i)] = true
-      end
-
-      return result
-    end
-  end,
-
-  map = function(info, raw_value)
-    if type(raw_value) == 'table' then
-      return raw_value
-    end
-
-    assert(info.commalist, 'Only commas are supported currently')
-
-    local result = {}
-
-    local comma_split = vim.split(raw_value, ',')
-    for _, key_value_str in ipairs(comma_split) do
-      local key, value = unpack(vim.split(key_value_str, ':'))
-      key = vim.trim(key)
-
-      result[key] = value
-    end
-
-    return result
-  end,
-}
-
---- Converts a vimoption_T style value to a Lua value
-local function convert_value_to_lua(info, option_value)
-  return to_lua_value[info.metatype](info, option_value)
-end
-
-local prepend_methods = {
-  number = function()
-    error("The '^' operator is not currently supported for")
-  end,
-
-  string = function(left, right)
-    return right .. left
-  end,
-
-  array = function(left, right)
-    for i = #right, 1, -1 do
-      table.insert(left, 1, right[i])
-    end
-
-    return left
-  end,
-
-  map = tbl_merge,
-  set = tbl_merge,
-}
-
---- Handles the '^' operator
-local function prepend_value(info, current, new)
-  return prepend_methods[info.metatype](
-    convert_value_to_lua(info, current),
-    convert_value_to_lua(info, new)
-  )
-end
-
-local add_methods = {
-  number = function(left, right)
-    return left + right
-  end,
-
-  string = function(left, right)
-    return left .. right
-  end,
-
-  array = function(left, right)
-    for _, v in ipairs(right) do
-      table.insert(left, v)
-    end
-
-    return left
-  end,
-
-  map = tbl_merge,
-  set = tbl_merge,
-}
-
---- Handles the '+' operator
-local function add_value(info, current, new)
-  return add_methods[info.metatype](
-    convert_value_to_lua(info, current),
-    convert_value_to_lua(info, new)
-  )
-end
-
-local function remove_one_item(t, val)
-  if vim.tbl_islist(t) then
-    local remove_index = nil
-    for i, v in ipairs(t) do
-      if v == val then
-        remove_index = i
-      end
-    end
-
-    if remove_index then
-      table.remove(t, remove_index)
-    end
-  else
-    t[val] = nil
-  end
-end
-
-local remove_methods = {
-  number = function(left, right)
-    return left - right
-  end,
-
-  string = function()
-    error('Subtraction not supported for strings.')
-  end,
-
-  array = function(left, right)
-    if type(right) == 'string' then
-      remove_one_item(left, right)
-    else
-      for _, v in ipairs(right) do
-        remove_one_item(left, v)
-      end
-    end
-
-    return left
-  end,
-
-  map = tbl_remove,
-  set = tbl_remove,
-}
-
---- Handles the '-' operator
-local function remove_value(info, current, new)
-  return remove_methods[info.metatype](convert_value_to_lua(info, current), new)
-end
-
-local function create_option_accessor(scope)
-  local option_mt
-
-  local function make_option(name, value)
-    local info = assert(options_info[name], 'Not a valid option name: ' .. name)
-
-    if type(value) == 'table' and getmetatable(value) == option_mt then
-      assert(name == value._name, "must be the same value, otherwise that's weird.")
-
-      value = value._value
-    end
-
-    return setmetatable({
-      _name = name,
-      _value = value,
-      _info = info,
-    }, option_mt)
-  end
-
-  option_mt = {
-    -- To set a value, instead use:
-    --  opt[my_option] = value
-    _set = function(self)
-      local value = convert_value_to_vim(self._name, self._info, self._value)
-      api.nvim_set_option_value(self._name, value, { scope = scope })
-    end,
-
-    get = function(self)
-      return convert_value_to_lua(self._info, self._value)
-    end,
-
-    append = function(self, right)
-      self._value = add_value(self._info, self._value, right)
-      self:_set()
-    end,
-
-    __add = function(self, right)
-      return make_option(self._name, add_value(self._info, self._value, right))
-    end,
-
-    prepend = function(self, right)
-      self._value = prepend_value(self._info, self._value, right)
-      self:_set()
-    end,
-
-    __pow = function(self, right)
-      return make_option(self._name, prepend_value(self._info, self._value, right))
-    end,
-
-    remove = function(self, right)
-      self._value = remove_value(self._info, self._value, right)
-      self:_set()
-    end,
-
-    __sub = function(self, right)
-      return make_option(self._name, remove_value(self._info, self._value, right))
-    end,
-  }
-  option_mt.__index = option_mt
-
-  return setmetatable({}, {
-    __index = function(_, k)
-      return make_option(k, api.nvim_get_option_value(k, {}))
-    end,
-
-    __newindex = function(_, k, v)
-      make_option(k, v):_set()
-    end,
-  })
-end
-
-vim.opt = create_option_accessor()
-vim.opt_local = create_option_accessor('local')
-vim.opt_global = create_option_accessor('global')
diff --git a/runtime/lua/vim/_options.lua b/runtime/lua/vim/_options.lua
new file mode 100644
index 0000000000..41e6e8be86
--- /dev/null
+++ b/runtime/lua/vim/_options.lua
@@ -0,0 +1,575 @@
+local api = vim.api
+
+-- TODO(tjdevries): Improve option metadata so that this doesn't have to be hardcoded.
+--                  Can be done in a separate PR.
+local key_value_options = {
+  fillchars = true,
+  fcs = true,
+  listchars = true,
+  lcs = true,
+  winhighlight = true,
+  winhl = true,
+}
+
+--- Convert a vimoption_T style dictionary to the correct OptionType associated with it.
+---@return string
+local function get_option_metatype(name, info)
+  if info.type == 'string' then
+    if info.flaglist then
+      return 'set'
+    elseif info.commalist then
+      if key_value_options[name] then
+        return 'map'
+      end
+      return 'array'
+    end
+    return 'string'
+  end
+  return info.type
+end
+
+local options_info = setmetatable({}, {
+  __index = function(t, k)
+    local info = api.nvim_get_option_info(k)
+    info.metatype = get_option_metatype(k, info)
+    rawset(t, k, info)
+    return rawget(t, k)
+  end,
+})
+
+vim.env = setmetatable({}, {
+  __index = function(_, k)
+    local v = vim.fn.getenv(k)
+    if v == vim.NIL then
+      return nil
+    end
+    return v
+  end,
+
+  __newindex = function(_, k, v)
+    vim.fn.setenv(k, v)
+  end,
+})
+
+local function opt_validate(option_name, target_scope)
+  local scope = options_info[option_name].scope
+  if scope ~= target_scope then
+    local scope_to_string = { buf = 'buffer', win = 'window' }
+    error(
+      string.format(
+        [['%s' is a %s option, not a %s option. See ":help %s"]],
+        option_name,
+        scope_to_string[scope] or scope,
+        scope_to_string[target_scope] or target_scope,
+        option_name
+      )
+    )
+  end
+end
+
+local function new_buf_opt_accessor(bufnr)
+  return setmetatable({}, {
+    __index = function(_, k)
+      if bufnr == nil and type(k) == 'number' then
+        return new_buf_opt_accessor(k)
+      end
+      opt_validate(k, 'buf')
+      return api.nvim_get_option_value(k, { buf = bufnr or 0 })
+    end,
+
+    __newindex = function(_, k, v)
+      opt_validate(k, 'buf')
+      return api.nvim_set_option_value(k, v, { buf = bufnr or 0 })
+    end,
+  })
+end
+
+vim.bo = new_buf_opt_accessor()
+
+local function new_win_opt_accessor(winid, bufnr)
+  return setmetatable({}, {
+    __index = function(_, k)
+      if bufnr == nil and type(k) == 'number' then
+        if winid == nil then
+          return new_win_opt_accessor(k)
+        else
+          return new_win_opt_accessor(winid, k)
+        end
+      end
+
+      if bufnr ~= nil and bufnr ~= 0 then
+        error('only bufnr=0 is supported')
+      end
+
+      opt_validate(k, 'win')
+      -- TODO(lewis6991): allow passing both buf and win to nvim_get_option_value
+      return api.nvim_get_option_value(k, {
+        scope = bufnr and 'local' or nil,
+        win = winid or 0,
+      })
+    end,
+
+    __newindex = function(_, k, v)
+      opt_validate(k, 'win')
+      -- TODO(lewis6991): allow passing both buf and win to nvim_set_option_value
+      return api.nvim_set_option_value(k, v, {
+        scope = bufnr and 'local' or nil,
+        win = winid or 0,
+      })
+    end,
+  })
+end
+
+vim.wo = new_win_opt_accessor()
+
+-- vim global option
+--  this ONLY sets the global option. like `setglobal`
+vim.go = setmetatable({}, {
+  __index = function(_, k)
+    return api.nvim_get_option_value(k, { scope = 'global' })
+  end,
+  __newindex = function(_, k, v)
+    return api.nvim_set_option_value(k, v, { scope = 'global' })
+  end,
+})
+
+-- vim `set` style options.
+--  it has no additional metamethod magic.
+vim.o = setmetatable({}, {
+  __index = function(_, k)
+    return api.nvim_get_option_value(k, {})
+  end,
+  __newindex = function(_, k, v)
+    return api.nvim_set_option_value(k, v, {})
+  end,
+})
+
+---@brief [[
+--- vim.opt, vim.opt_local and vim.opt_global implementation
+---
+--- To be used as helpers for working with options within neovim.
+--- For information on how to use, see :help vim.opt
+---
+---@brief ]]
+
+--- Preserves the order and does not mutate the original list
+local function remove_duplicate_values(t)
+  local result, seen = {}, {}
+  for _, v in ipairs(t) do
+    if not seen[v] then
+      table.insert(result, v)
+    end
+
+    seen[v] = true
+  end
+
+  return result
+end
+
+-- Check whether the OptionTypes is allowed for vim.opt
+-- If it does not match, throw an error which indicates which option causes the error.
+local function assert_valid_value(name, value, types)
+  local type_of_value = type(value)
+  for _, valid_type in ipairs(types) do
+    if valid_type == type_of_value then
+      return
+    end
+  end
+
+  error(
+    string.format(
+      "Invalid option type '%s' for '%s', should be %s",
+      type_of_value,
+      name,
+      table.concat(types, ' or ')
+    )
+  )
+end
+
+local function passthrough(_, x)
+  return x
+end
+
+local function tbl_merge(left, right)
+  return vim.tbl_extend('force', left, right)
+end
+
+local function tbl_remove(t, value)
+  if type(value) == 'string' then
+    t[value] = nil
+  else
+    for _, v in ipairs(value) do
+      t[v] = nil
+    end
+  end
+
+  return t
+end
+
+local valid_types = {
+  boolean = { 'boolean' },
+  number = { 'number' },
+  string = { 'string' },
+  set = { 'string', 'table' },
+  array = { 'string', 'table' },
+  map = { 'string', 'table' },
+}
+
+-- Map of functions to take a Lua style value and convert to vimoption_T style value.
+-- Each function takes (info, lua_value) -> vim_value
+local to_vim_value = {
+  boolean = passthrough,
+  number = passthrough,
+  string = passthrough,
+
+  set = function(info, value)
+    if type(value) == 'string' then
+      return value
+    end
+
+    if info.flaglist and info.commalist then
+      local keys = {}
+      for k, v in pairs(value) do
+        if v then
+          table.insert(keys, k)
+        end
+      end
+
+      table.sort(keys)
+      return table.concat(keys, ',')
+    else
+      local result = ''
+      for k, v in pairs(value) do
+        if v then
+          result = result .. k
+        end
+      end
+
+      return result
+    end
+  end,
+
+  array = function(info, value)
+    if type(value) == 'string' then
+      return value
+    end
+    if not info.allows_duplicates then
+      value = remove_duplicate_values(value)
+    end
+    return table.concat(value, ',')
+  end,
+
+  map = function(_, value)
+    if type(value) == 'string' then
+      return value
+    end
+
+    local result = {}
+    for opt_key, opt_value in pairs(value) do
+      table.insert(result, string.format('%s:%s', opt_key, opt_value))
+    end
+
+    table.sort(result)
+    return table.concat(result, ',')
+  end,
+}
+
+--- Convert a Lua value to a vimoption_T value
+local function convert_value_to_vim(name, info, value)
+  if value == nil then
+    return vim.NIL
+  end
+
+  assert_valid_value(name, value, valid_types[info.metatype])
+
+  return to_vim_value[info.metatype](info, value)
+end
+
+-- Map of OptionType to functions that take vimoption_T values and convert to Lua values.
+-- Each function takes (info, vim_value) -> lua_value
+local to_lua_value = {
+  boolean = passthrough,
+  number = passthrough,
+  string = passthrough,
+
+  array = function(info, value)
+    if type(value) == 'table' then
+      if not info.allows_duplicates then
+        value = remove_duplicate_values(value)
+      end
+
+      return value
+    end
+
+    -- Empty strings mean that there is nothing there,
+    -- so empty table should be returned.
+    if value == '' then
+      return {}
+    end
+
+    -- Handles unescaped commas in a list.
+    if string.find(value, ',,,') then
+      local left, right = unpack(vim.split(value, ',,,'))
+
+      local result = {}
+      vim.list_extend(result, vim.split(left, ','))
+      table.insert(result, ',')
+      vim.list_extend(result, vim.split(right, ','))
+
+      table.sort(result)
+
+      return result
+    end
+
+    if string.find(value, ',^,,', 1, true) then
+      local left, right = unpack(vim.split(value, ',^,,', true))
+
+      local result = {}
+      vim.list_extend(result, vim.split(left, ','))
+      table.insert(result, '^,')
+      vim.list_extend(result, vim.split(right, ','))
+
+      table.sort(result)
+
+      return result
+    end
+
+    return vim.split(value, ',')
+  end,
+
+  set = function(info, value)
+    if type(value) == 'table' then
+      return value
+    end
+
+    -- Empty strings mean that there is nothing there,
+    -- so empty table should be returned.
+    if value == '' then
+      return {}
+    end
+
+    assert(info.flaglist, 'That is the only one I know how to handle')
+
+    if info.flaglist and info.commalist then
+      local split_value = vim.split(value, ',')
+      local result = {}
+      for _, v in ipairs(split_value) do
+        result[v] = true
+      end
+
+      return result
+    else
+      local result = {}
+      for i = 1, #value do
+        result[value:sub(i, i)] = true
+      end
+
+      return result
+    end
+  end,
+
+  map = function(info, raw_value)
+    if type(raw_value) == 'table' then
+      return raw_value
+    end
+
+    assert(info.commalist, 'Only commas are supported currently')
+
+    local result = {}
+
+    local comma_split = vim.split(raw_value, ',')
+    for _, key_value_str in ipairs(comma_split) do
+      local key, value = unpack(vim.split(key_value_str, ':'))
+      key = vim.trim(key)
+
+      result[key] = value
+    end
+
+    return result
+  end,
+}
+
+--- Converts a vimoption_T style value to a Lua value
+local function convert_value_to_lua(info, option_value)
+  return to_lua_value[info.metatype](info, option_value)
+end
+
+local prepend_methods = {
+  number = function()
+    error("The '^' operator is not currently supported for")
+  end,
+
+  string = function(left, right)
+    return right .. left
+  end,
+
+  array = function(left, right)
+    for i = #right, 1, -1 do
+      table.insert(left, 1, right[i])
+    end
+
+    return left
+  end,
+
+  map = tbl_merge,
+  set = tbl_merge,
+}
+
+--- Handles the '^' operator
+local function prepend_value(info, current, new)
+  return prepend_methods[info.metatype](
+    convert_value_to_lua(info, current),
+    convert_value_to_lua(info, new)
+  )
+end
+
+local add_methods = {
+  number = function(left, right)
+    return left + right
+  end,
+
+  string = function(left, right)
+    return left .. right
+  end,
+
+  array = function(left, right)
+    for _, v in ipairs(right) do
+      table.insert(left, v)
+    end
+
+    return left
+  end,
+
+  map = tbl_merge,
+  set = tbl_merge,
+}
+
+--- Handles the '+' operator
+local function add_value(info, current, new)
+  return add_methods[info.metatype](
+    convert_value_to_lua(info, current),
+    convert_value_to_lua(info, new)
+  )
+end
+
+local function remove_one_item(t, val)
+  if vim.tbl_islist(t) then
+    local remove_index = nil
+    for i, v in ipairs(t) do
+      if v == val then
+        remove_index = i
+      end
+    end
+
+    if remove_index then
+      table.remove(t, remove_index)
+    end
+  else
+    t[val] = nil
+  end
+end
+
+local remove_methods = {
+  number = function(left, right)
+    return left - right
+  end,
+
+  string = function()
+    error('Subtraction not supported for strings.')
+  end,
+
+  array = function(left, right)
+    if type(right) == 'string' then
+      remove_one_item(left, right)
+    else
+      for _, v in ipairs(right) do
+        remove_one_item(left, v)
+      end
+    end
+
+    return left
+  end,
+
+  map = tbl_remove,
+  set = tbl_remove,
+}
+
+--- Handles the '-' operator
+local function remove_value(info, current, new)
+  return remove_methods[info.metatype](convert_value_to_lua(info, current), new)
+end
+
+local function create_option_accessor(scope)
+  local option_mt
+
+  local function make_option(name, value)
+    local info = assert(options_info[name], 'Not a valid option name: ' .. name)
+
+    if type(value) == 'table' and getmetatable(value) == option_mt then
+      assert(name == value._name, "must be the same value, otherwise that's weird.")
+
+      value = value._value
+    end
+
+    return setmetatable({
+      _name = name,
+      _value = value,
+      _info = info,
+    }, option_mt)
+  end
+
+  option_mt = {
+    -- To set a value, instead use:
+    --  opt[my_option] = value
+    _set = function(self)
+      local value = convert_value_to_vim(self._name, self._info, self._value)
+      api.nvim_set_option_value(self._name, value, { scope = scope })
+    end,
+
+    get = function(self)
+      return convert_value_to_lua(self._info, self._value)
+    end,
+
+    append = function(self, right)
+      self._value = add_value(self._info, self._value, right)
+      self:_set()
+    end,
+
+    __add = function(self, right)
+      return make_option(self._name, add_value(self._info, self._value, right))
+    end,
+
+    prepend = function(self, right)
+      self._value = prepend_value(self._info, self._value, right)
+      self:_set()
+    end,
+
+    __pow = function(self, right)
+      return make_option(self._name, prepend_value(self._info, self._value, right))
+    end,
+
+    remove = function(self, right)
+      self._value = remove_value(self._info, self._value, right)
+      self:_set()
+    end,
+
+    __sub = function(self, right)
+      return make_option(self._name, remove_value(self._info, self._value, right))
+    end,
+  }
+  option_mt.__index = option_mt
+
+  return setmetatable({}, {
+    __index = function(_, k)
+      return make_option(k, api.nvim_get_option_value(k, {}))
+    end,
+
+    __newindex = function(_, k, v)
+      make_option(k, v):_set()
+    end,
+  })
+end
+
+vim.opt = create_option_accessor()
+vim.opt_local = create_option_accessor('local')
+vim.opt_global = create_option_accessor('global')
-- 
cgit 


From a54f88ea64c02f9fa7bf3d7445cdaaea424d439f Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 17 Jul 2023 10:39:52 +0100
Subject: docs(lua): do not render self args

---
 runtime/doc/lua.txt        | 50 +++++++++++++++----------------
 runtime/doc/treesitter.txt | 74 ++++++++++++----------------------------------
 2 files changed, 44 insertions(+), 80 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 3f5ab6e00f..d7b023a4ec 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1888,22 +1888,22 @@ ringbuf({size})                                                *vim.ringbuf()*
     Return: ~
         (table)
 
-Ringbuf:clear({self})                                        *Ringbuf:clear()*
+Ringbuf:clear()                                              *Ringbuf:clear()*
     Clear all items.
 
-Ringbuf:peek({self})                                          *Ringbuf:peek()*
+Ringbuf:peek()                                                *Ringbuf:peek()*
     Returns the first unread item without removing it
 
     Return: ~
         any?|ni
 
-Ringbuf:pop({self})                                            *Ringbuf:pop()*
+Ringbuf:pop()                                                  *Ringbuf:pop()*
     Removes and returns the first unread item
 
     Return: ~
         any?|ni
 
-Ringbuf:push({self}, {item})                                  *Ringbuf:push()*
+Ringbuf:push({item})                                          *Ringbuf:push()*
     Adds an item, overriding the oldest item if the buffer is full.
 
     Parameters: ~
@@ -3101,7 +3101,7 @@ filter({f}, {src}, {...})                                  *vim.iter.filter()*
     See also: ~
       • |Iter:filter()|
 
-Iter:all({self}, {pred})                                          *Iter:all()*
+Iter:all({pred})                                                  *Iter:all()*
     Return true if all of the items in the iterator match the given predicate.
 
     Parameters: ~
@@ -3109,7 +3109,7 @@ Iter:all({self}, {pred})                                          *Iter:all()*
                 returned from the previous stage in the pipeline as arguments
                 and returns true if the predicate matches.
 
-Iter:any({self}, {pred})                                          *Iter:any()*
+Iter:any({pred})                                                  *Iter:any()*
     Return true if any of the items in the iterator match the given predicate.
 
     Parameters: ~
@@ -3117,7 +3117,7 @@ Iter:any({self}, {pred})                                          *Iter:any()*
                 returned from the previous stage in the pipeline as arguments
                 and returns true if the predicate matches.
 
-Iter:each({self}, {f})                                           *Iter:each()*
+Iter:each({f})                                                   *Iter:each()*
     Call a function once for each item in the pipeline.
 
     This is used for functions which have side effects. To modify the values
@@ -3130,7 +3130,7 @@ Iter:each({self}, {f})                                           *Iter:each()*
              Takes all of the values returned by the previous stage in the
              pipeline as arguments.
 
-Iter:enumerate({self})                                      *Iter:enumerate()*
+Iter:enumerate()                                            *Iter:enumerate()*
     Add an iterator stage that returns the current iterator count as well as
     the iterator value.
 
@@ -3160,7 +3160,7 @@ Iter:enumerate({self})                                      *Iter:enumerate()*
     Return: ~
         Iter
 
-Iter:filter({self}, {f})                                       *Iter:filter()*
+Iter:filter({f})                                               *Iter:filter()*
     Add a filter step to the iterator pipeline.
 
     Example: >lua
@@ -3176,7 +3176,7 @@ Iter:filter({self}, {f})                                       *Iter:filter()*
     Return: ~
         Iter
 
-Iter:find({self}, {f})                                           *Iter:find()*
+Iter:find({f})                                                   *Iter:find()*
     Find the first value in the iterator that satisfies the given predicate.
 
     Advances the iterator. Returns nil and drains the iterator if no value is
@@ -3200,7 +3200,7 @@ Iter:find({self}, {f})                                           *Iter:find()*
     Return: ~
         any
 
-Iter:fold({self}, {init}, {f})                                   *Iter:fold()*
+Iter:fold({init}, {f})                                           *Iter:fold()*
     Fold ("reduce") an iterator or table into a single value.
 
     Examples: >lua
@@ -3223,7 +3223,7 @@ Iter:fold({self}, {init}, {f})                                   *Iter:fold()*
     Return: ~
         any
 
-Iter:last({self})                                                *Iter:last()*
+Iter:last()                                                      *Iter:last()*
     Return the last item in the iterator.
 
     Drains the iterator.
@@ -3242,7 +3242,7 @@ Iter:last({self})                                                *Iter:last()*
     Return: ~
         any
 
-Iter:map({self}, {f})                                             *Iter:map()*
+Iter:map({f})                                                     *Iter:map()*
     Add a map step to the iterator pipeline.
 
     If the map function returns nil, the value is filtered from the iterator.
@@ -3267,7 +3267,7 @@ Iter:map({self}, {f})                                             *Iter:map()*
     Return: ~
         Iter
 
-Iter:next({self})                                                *Iter:next()*
+Iter:next()                                                      *Iter:next()*
     Return the next value from the iterator.
 
     Example: >lua
@@ -3284,7 +3284,7 @@ Iter:next({self})                                                *Iter:next()*
     Return: ~
         any
 
-Iter:nextback({self})                                        *Iter:nextback()*
+Iter:nextback()                                              *Iter:nextback()*
     Return the next value from the end of the iterator.
 
     Only supported for iterators on list-like tables.
@@ -3301,7 +3301,7 @@ Iter:nextback({self})                                        *Iter:nextback()*
     Return: ~
         any
 
-Iter:nth({self}, {n})                                             *Iter:nth()*
+Iter:nth({n})                                                     *Iter:nth()*
     Return the nth value in the iterator.
 
     This function advances the iterator.
@@ -3321,7 +3321,7 @@ Iter:nth({self}, {n})                                             *Iter:nth()*
     Return: ~
         any
 
-Iter:nthback({self}, {n})                                     *Iter:nthback()*
+Iter:nthback({n})                                             *Iter:nthback()*
     Return the nth value from the end of the iterator.
 
     This function advances the iterator.
@@ -3343,7 +3343,7 @@ Iter:nthback({self}, {n})                                     *Iter:nthback()*
     Return: ~
         any
 
-Iter:peek({self})                                                *Iter:peek()*
+Iter:peek()                                                      *Iter:peek()*
     Peek at the next value in the iterator without consuming it.
 
     Only supported for iterators on list-like tables.
@@ -3362,7 +3362,7 @@ Iter:peek({self})                                                *Iter:peek()*
     Return: ~
         any
 
-Iter:peekback({self})                                        *Iter:peekback()*
+Iter:peekback()                                              *Iter:peekback()*
     Return the next value from the end of the iterator without consuming it.
 
     Only supported for iterators on list-like tables.
@@ -3381,7 +3381,7 @@ Iter:peekback({self})                                        *Iter:peekback()*
     Return: ~
         any
 
-Iter:rev({self})                                                  *Iter:rev()*
+Iter:rev()                                                        *Iter:rev()*
     Reverse an iterator.
 
     Only supported for iterators on list-like tables.
@@ -3396,7 +3396,7 @@ Iter:rev({self})                                                  *Iter:rev()*
     Return: ~
         Iter
 
-Iter:rfind({self}, {f})                                         *Iter:rfind()*
+Iter:rfind({f})                                                 *Iter:rfind()*
     Find the first value in the iterator that satisfies the given predicate,
     starting from the end.
 
@@ -3420,7 +3420,7 @@ Iter:rfind({self}, {f})                                         *Iter:rfind()*
     See also: ~
       • Iter.find
 
-Iter:skip({self}, {n})                                           *Iter:skip()*
+Iter:skip({n})                                                   *Iter:skip()*
     Skip values in the iterator.
 
     Example: >lua
@@ -3436,7 +3436,7 @@ Iter:skip({self}, {n})                                           *Iter:skip()*
     Return: ~
         Iter
 
-Iter:skipback({self}, {n})                                   *Iter:skipback()*
+Iter:skipback({n})                                           *Iter:skipback()*
     Skip values in the iterator starting from the end.
 
     Only supported for iterators on list-like tables.
@@ -3456,7 +3456,7 @@ Iter:skipback({self}, {n})                                   *Iter:skipback()*
     Return: ~
         Iter
 
-Iter:slice({self}, {first}, {last})                             *Iter:slice()*
+Iter:slice({first}, {last})                                     *Iter:slice()*
     Slice an iterator, changing its start and end positions.
 
     This is equivalent to :skip(first - 1):skipback(len - last + 1)
@@ -3470,7 +3470,7 @@ Iter:slice({self}, {first}, {last})                             *Iter:slice()*
     Return: ~
         Iter
 
-Iter:totable({self})                                          *Iter:totable()*
+Iter:totable()                                                *Iter:totable()*
     Collect the iterator into a table.
 
     The resulting table depends on the initial source in the iterator
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 070659ce3d..9f17b9fb54 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -947,7 +947,7 @@ parse({lang}, {query})                          *vim.treesitter.query.parse()*
         Query Parsed query
 
                                                        *Query:iter_captures()*
-Query:iter_captures({self}, {node}, {source}, {start}, {stop})
+Query:iter_captures({node}, {source}, {start}, {stop})
     Iterate over all captures from all matches inside {node}
 
     {source} is needed if the query contains predicates; then the caller must
@@ -976,14 +976,13 @@ Query:iter_captures({self}, {node}, {source}, {start}, {stop})
                   from
       • {start}   (integer) Starting line for the search
       • {stop}    (integer) Stopping line for the search (end-exclusive)
-      • {self}
 
     Return: ~
         (fun(): integer, TSNode, TSMetadata): capture id, capture node,
         metadata
 
                                                         *Query:iter_matches()*
-Query:iter_matches({self}, {node}, {source}, {start}, {stop}, {opts})
+Query:iter_matches({node}, {source}, {start}, {stop}, {opts})
     Iterates the matches of self on a given range.
 
     Iterate over all matches within a {node}. The arguments are the same as
@@ -1015,7 +1014,6 @@ Query:iter_matches({self}, {node}, {source}, {start}, {stop}, {opts})
                     start depth for each match. This is used to prevent
                     traversing too deep into a tree. Requires treesitter >=
                     0.20.9.
-      • {self}
 
     Return: ~
         (fun(): integer, table<integer,TSNode>, table): pattern id, match,
@@ -1036,12 +1034,9 @@ set({lang}, {query_name}, {text})                 *vim.treesitter.query.set()*
 ==============================================================================
 Lua module: vim.treesitter.highlighter            *lua-treesitter-highlighter*
 
-TSHighlighter:destroy({self})                        *TSHighlighter:destroy()*
+TSHighlighter:destroy()                              *TSHighlighter:destroy()*
     Removes all internal references to the highlighter
 
-    Parameters: ~
-      • {self}
-
 
 ==============================================================================
 Lua module: vim.treesitter.languagetree          *lua-treesitter-languagetree*
@@ -1084,97 +1079,78 @@ change callback anyway as they will be very frequent. Rather a plugin that
 does any kind of analysis on a tree should use a timer to throttle too
 frequent updates.
 
-LanguageTree:children({self})                        *LanguageTree:children()*
+LanguageTree:children()                              *LanguageTree:children()*
     Returns a map of language to child tree.
 
-    Parameters: ~
-      • {self}
-
-LanguageTree:contains({self}, {range})               *LanguageTree:contains()*
+LanguageTree:contains({range})                       *LanguageTree:contains()*
     Determines whether {range} is contained in the |LanguageTree|.
 
     Parameters: ~
       • {range}  (table) `{ start_line, start_col, end_line, end_col }`
-      • {self}
 
     Return: ~
         (boolean)
 
-LanguageTree:destroy({self})                          *LanguageTree:destroy()*
+LanguageTree:destroy()                                *LanguageTree:destroy()*
     Destroys this |LanguageTree| and all its children.
 
     Any cleanup logic should be performed here.
 
     Note: This DOES NOT remove this tree from a parent. Instead, `remove_child` must be called on the parent to remove it.
 
-    Parameters: ~
-      • {self}
-
                                                *LanguageTree:for_each_child()*
-LanguageTree:for_each_child({self}, {fn}, {include_self})
+LanguageTree:for_each_child({fn}, {include_self})
     Invokes the callback for each |LanguageTree| and its children recursively
 
     Parameters: ~
       • {fn}            fun(tree: LanguageTree, lang: string)
       • {include_self}  (boolean|nil) Whether to include the invoking tree in
                         the results
-      • {self}
 
-LanguageTree:for_each_tree({self}, {fn})        *LanguageTree:for_each_tree()*
+LanguageTree:for_each_tree({fn})                *LanguageTree:for_each_tree()*
     Invokes the callback for each |LanguageTree| recursively.
 
     Note: This includes the invoking tree's child trees as well.
 
     Parameters: ~
       • {fn}    fun(tree: TSTree, ltree: LanguageTree)
-      • {self}
 
-LanguageTree:included_regions({self})        *LanguageTree:included_regions()*
+LanguageTree:included_regions()              *LanguageTree:included_regions()*
     Gets the set of included regions
 
-    Parameters: ~
-      • {self}
-
     Return: ~
         integer[][]
 
-LanguageTree:invalidate({self}, {reload})          *LanguageTree:invalidate()*
+LanguageTree:invalidate({reload})                  *LanguageTree:invalidate()*
     Invalidates this parser and all its children
 
     Parameters: ~
       • {reload}  (boolean|nil)
-      • {self}
 
-                                                     *LanguageTree:is_valid()*
-LanguageTree:is_valid({self}, {exclude_children})
+LanguageTree:is_valid({exclude_children})            *LanguageTree:is_valid()*
     Determines whether this tree is valid. If the tree is invalid, call `parse()` . This will return the updated tree.
 
     Parameters: ~
       • {exclude_children}  (boolean|nil)
-      • {self}
 
     Return: ~
         (boolean)
 
-LanguageTree:lang({self})                                *LanguageTree:lang()*
+LanguageTree:lang()                                      *LanguageTree:lang()*
     Gets the language of this tree node.
 
-    Parameters: ~
-      • {self}
-
                                            *LanguageTree:language_for_range()*
-LanguageTree:language_for_range({self}, {range})
+LanguageTree:language_for_range({range})
     Gets the appropriate language that contains {range}.
 
     Parameters: ~
       • {range}  (table) `{ start_line, start_col, end_line, end_col }`
-      • {self}
 
     Return: ~
         |LanguageTree| Managing {range}
 
                                          *LanguageTree:named_node_for_range()*
-LanguageTree:named_node_for_range({self}, {range}, {opts})
+LanguageTree:named_node_for_range({range}, {opts})
     Gets the smallest named node that contains {range}.
 
     Parameters: ~
@@ -1182,24 +1158,20 @@ LanguageTree:named_node_for_range({self}, {range}, {opts})
       • {opts}   (table|nil) Optional keyword arguments:
                  • ignore_injections boolean Ignore injected languages
                    (default true)
-      • {self}
 
     Return: ~
         |TSNode| | nil Found node
 
-LanguageTree:parse({self})                              *LanguageTree:parse()*
+LanguageTree:parse()                                    *LanguageTree:parse()*
     Parses all defined regions using a treesitter parser for the language this
     tree represents. This will run the injection query for this language to
     determine if any child languages should be created.
 
-    Parameters: ~
-      • {self}
-
     Return: ~
         TSTree[]
 
                                                  *LanguageTree:register_cbs()*
-LanguageTree:register_cbs({self}, {cbs}, {recursive})
+LanguageTree:register_cbs({cbs}, {recursive})
     Registers callbacks for the |LanguageTree|.
 
     Parameters: ~
@@ -1219,16 +1191,12 @@ LanguageTree:register_cbs({self}, {cbs}, {recursive})
                         number of the buffer.
       • {recursive?}  boolean Apply callbacks recursively for all children.
                       Any new children will also inherit the callbacks.
-      • {self}
 
-LanguageTree:source({self})                            *LanguageTree:source()*
+LanguageTree:source()                                  *LanguageTree:source()*
     Returns the source content of the language tree (bufnr or string).
 
-    Parameters: ~
-      • {self}
-
                                                *LanguageTree:tree_for_range()*
-LanguageTree:tree_for_range({self}, {range}, {opts})
+LanguageTree:tree_for_range({range}, {opts})
     Gets the tree that contains {range}.
 
     Parameters: ~
@@ -1236,16 +1204,12 @@ LanguageTree:tree_for_range({self}, {range}, {opts})
       • {opts}   (table|nil) Optional keyword arguments:
                  • ignore_injections boolean Ignore injected languages
                    (default true)
-      • {self}
 
     Return: ~
         TSTree|nil
 
-LanguageTree:trees({self})                              *LanguageTree:trees()*
+LanguageTree:trees()                                    *LanguageTree:trees()*
     Returns all trees this language tree contains. Does not include child
     languages.
 
-    Parameters: ~
-      • {self}
-
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
-- 
cgit 


From 3fd504dbec39eeced1bea17d9f3bd06de7f3e4d8 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 16 Jul 2023 09:34:50 +0100
Subject: docs: handle whitespace in emmycomments

---
 runtime/doc/lsp.txt        |  12 ++---
 runtime/doc/lua.txt        | 127 +++++++++++++++++++++++----------------------
 runtime/doc/treesitter.txt |  49 +++++++++--------
 3 files changed, 98 insertions(+), 90 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 450690fe3b..5de3e98b5a 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1189,8 +1189,8 @@ format({options})                                       *vim.lsp.buf.format()*
     server clients.
 
     Parameters: ~
-      • {options}  table|nil Optional table which holds the following optional
-                   fields:
+      • {options}  (table|nil) Optional table which holds the following
+                   optional fields:
                    • formatting_options (table|nil): Can be used to specify
                      FormattingOptions. Some unspecified options will be
                      automatically derived from the current Nvim options. See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#formattingOptions
@@ -1204,10 +1204,10 @@ format({options})                                       *vim.lsp.buf.format()*
                      Receives a client as argument and must return a boolean.
                      Clients matching the predicate are included. Example:               • >lua
 
-              -- Never request typescript-language-server for formatting
-              vim.lsp.buf.format {
-                filter = function(client) return client.name ~= "tsserver" end
-              }
+               -- Never request typescript-language-server for formatting
+               vim.lsp.buf.format {
+                 filter = function(client) return client.name ~= "tsserver" end
+               }
 <
                    • async boolean|nil If true the method won't block.
                      Defaults to false. Editing the buffer while formatting
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index d7b023a4ec..81449bc454 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1423,15 +1423,16 @@ keycode({str})                                                 *vim.keycode()*
     Translate keycodes.
 
     Example: >lua
-      local k = vim.keycode
-      vim.g.mapleader = k'<bs>'
+
+       local k = vim.keycode
+       vim.g.mapleader = k'<bs>'
 <
 
     Parameters: ~
-      • {str}  string String to be converted.
+      • {str}  (string) String to be converted.
 
     Return: ~
-        string
+        (string)
 
     See also: ~
       • |nvim_replace_termcodes()|
@@ -1527,7 +1528,8 @@ print({...})                                                     *vim.print()*
     "Pretty prints" the given arguments and returns them unmodified.
 
     Example: >lua
-      local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
+
+       local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
 <
 
     Return: ~
@@ -1579,19 +1581,19 @@ system({cmd}, {opts}, {on_exit})                                *vim.system()*
 
     Examples: >lua
 
-      local on_exit = function(obj)
-        print(obj.code)
-        print(obj.signal)
-        print(obj.stdout)
-        print(obj.stderr)
-      end
+       local on_exit = function(obj)
+         print(obj.code)
+         print(obj.signal)
+         print(obj.stdout)
+         print(obj.stderr)
+       end
 
-      -- Run asynchronously
-      vim.system({'echo', 'hello'}, { text = true }, on_exit)
+       -- Run asynchronously
+       vim.system({'echo', 'hello'}, { text = true }, on_exit)
 
-      -- Run synchronously
-      local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
-      -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
+       -- Run synchronously
+       local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
+       -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
 <
 
     See |uv.spawn()| for more details.
@@ -1775,8 +1777,8 @@ gsplit({s}, {sep}, {opts})                                      *vim.gsplit()*
 <
 
     Parameters: ~
-      • {s}     string String to split
-      • {sep}   string Separator or pattern
+      • {s}     (string) String to split
+      • {sep}   (string) Separator or pattern
       • {opts}  (table|nil) Keyword arguments |kwargs|:
                 • plain: (boolean) Use `sep` literally (as in string.find).
                 • trimempty: (boolean) Discard empty segments at start and end
@@ -2501,7 +2503,8 @@ get_option({filetype}, {option})                   *vim.filetype.get_option()*
     files.
 
     Example: >lua
-      vim.filetype.get_option('vim', 'commentstring')
+
+       vim.filetype.get_option('vim', 'commentstring')
 <
 
     Note: this uses |nvim_get_option_value()| but caches the result. This
@@ -2509,8 +2512,8 @@ get_option({filetype}, {option})                   *vim.filetype.get_option()*
     may not reflect later changes.
 
     Parameters: ~
-      • {filetype}  string Filetype
-      • {option}    string Option name
+      • {filetype}  (string) Filetype
+      • {option}    (string) Option name
 
     Return: ~
         string|boolean|integer: Option value
@@ -2649,7 +2652,7 @@ dir({path}, {opts})                                             *vim.fs.dir()*
       • {path}  (string) An absolute or relative path to the directory to
                 iterate over. The path is first normalized
                 |vim.fs.normalize()|.
-      • {opts}  table|nil Optional keyword arguments:
+      • {opts}  (table|nil) Optional keyword arguments:
                 • depth: integer|nil How deep the traverse (default 1)
                 • skip: (fun(dir_name: string): boolean)|nil Predicate to
                   control traversal. Return false to stop searching the
@@ -2847,10 +2850,10 @@ and dependencies on the current system.
 
 Example: >lua
 
-  local v = vim.version.parse(vim.fn.system({'tmux', '-V'}), {strict=false})
-  if vim.version.gt(v, {3, 2, 0}) then
-    -- ...
-  end
+   local v = vim.version.parse(vim.fn.system({'tmux', '-V'}), {strict=false})
+   if vim.version.gt(v, {3, 2, 0}) then
+     -- ...
+   end
 
 <
 
@@ -2864,33 +2867,33 @@ tested against a version, using |vim.version.range()|.
 Supported range specs are shown in the following table. Note: suffixed
 versions (1.2.3-rc1) are not matched. >
 
-  1.2.3             is 1.2.3
-  =1.2.3            is 1.2.3
-  >1.2.3            greater than 1.2.3
-  <1.2.3            before 1.2.3
-  >=1.2.3           at least 1.2.3
-  ~1.2.3            is >=1.2.3 <1.3.0       "reasonably close to 1.2.3"
-  ^1.2.3            is >=1.2.3 <2.0.0       "compatible with 1.2.3"
-  ^0.2.3            is >=0.2.3 <0.3.0       (0.x.x is special)
-  ^0.0.1            is =0.0.1               (0.0.x is special)
-  ^1.2              is >=1.2.0 <2.0.0       (like ^1.2.0)
-  ~1.2              is >=1.2.0 <1.3.0       (like ~1.2.0)
-  ^1                is >=1.0.0 <2.0.0       "compatible with 1"
-  ~1                same                    "reasonably close to 1"
-  1.x               same
-  1.*               same
-  1                 same
-  *                 any version
-  x                 same
+   1.2.3             is 1.2.3
+   =1.2.3            is 1.2.3
+   >1.2.3            greater than 1.2.3
+   <1.2.3            before 1.2.3
+   >=1.2.3           at least 1.2.3
+   ~1.2.3            is >=1.2.3 <1.3.0       "reasonably close to 1.2.3"
+   ^1.2.3            is >=1.2.3 <2.0.0       "compatible with 1.2.3"
+   ^0.2.3            is >=0.2.3 <0.3.0       (0.x.x is special)
+   ^0.0.1            is =0.0.1               (0.0.x is special)
+   ^1.2              is >=1.2.0 <2.0.0       (like ^1.2.0)
+   ~1.2              is >=1.2.0 <1.3.0       (like ~1.2.0)
+   ^1                is >=1.0.0 <2.0.0       "compatible with 1"
+   ~1                same                    "reasonably close to 1"
+   1.x               same
+   1.*               same
+   1                 same
+   *                 any version
+   x                 same
 
-  1.2.3 - 2.3.4     is >=1.2.3 <=2.3.4
+   1.2.3 - 2.3.4     is >=1.2.3 <=2.3.4
 
-  Partial right: missing pieces treated as x (2.3 => 2.3.x).
-  1.2.3 - 2.3       is >=1.2.3 <2.4.0
-  1.2.3 - 2         is >=1.2.3 <3.0.0
+   Partial right: missing pieces treated as x (2.3 => 2.3.x).
+   1.2.3 - 2.3       is >=1.2.3 <2.4.0
+   1.2.3 - 2         is >=1.2.3 <3.0.0
 
-  Partial left: missing pieces treated as 0 (1.2 => 1.2.0).
-  1.2 - 2.3.0       is 1.2.0 - 2.3.0
+   Partial left: missing pieces treated as 0 (1.2 => 1.2.0).
+   1.2 - 2.3.0       is 1.2.0 - 2.3.0
 
 <
 
@@ -2985,11 +2988,11 @@ parse({version}, {opts})                                 *vim.version.parse()*
 range({spec})                                            *vim.version.range()*
     Parses a semver |version-range| "spec" and returns a range object: >
 
-      {
-        from: Version
-        to: Version
-        has(v: string|Version)
-      }
+       {
+         from: Version
+         to: Version
+         has(v: string|Version)
+       }
 <
 
     `:has()` checks if a version is in the range (inclusive `from`, exclusive
@@ -2997,20 +3000,20 @@ range({spec})                                            *vim.version.range()*
 
     Example: >lua
 
-      local r = vim.version.range('1.0.0 - 2.0.0')
-      print(r:has('1.9.9'))       -- true
-      print(r:has('2.0.0'))       -- false
-      print(r:has(vim.version())) -- check against current Nvim version
+       local r = vim.version.range('1.0.0 - 2.0.0')
+       print(r:has('1.9.9'))       -- true
+       print(r:has('2.0.0'))       -- false
+       print(r:has(vim.version())) -- check against current Nvim version
 <
 
     Or use cmp(), eq(), lt(), and gt() to compare `.to` and `.from` directly: >lua
 
-      local r = vim.version.range('1.0.0 - 2.0.0')
-      print(vim.version.gt({1,0,3}, r.from) and vim.version.lt({1,0,3}, r.to))
+       local r = vim.version.range('1.0.0 - 2.0.0')
+       print(vim.version.gt({1,0,3}, r.from) and vim.version.lt({1,0,3}, r.to))
 <
 
     Parameters: ~
-      • {spec}  string Version range "spec"
+      • {spec}  (string) Version range "spec"
 
     See also: ~
       • # https://github.com/npm/node-semver#ranges
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 9f17b9fb54..bb0d435f4a 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -793,17 +793,17 @@ get_filetypes({lang})                *vim.treesitter.language.get_filetypes()*
     Get the filetypes associated with the parser named {lang}.
 
     Parameters: ~
-      • {lang}  string Name of parser
+      • {lang}  (string) Name of parser
 
     Return: ~
         string[] filetypes
 
 get_lang({filetype})                      *vim.treesitter.language.get_lang()*
     Parameters: ~
-      • {filetype}  string
+      • {filetype}  (string)
 
     Return: ~
-        string|nil
+        (string|nil)
 
 inspect({lang})                            *vim.treesitter.language.inspect()*
     Inspects the provided language.
@@ -821,7 +821,7 @@ register({lang}, {filetype})              *vim.treesitter.language.register()*
     Register a parser named {lang} to be used for {filetype}(s).
 
     Parameters: ~
-      • {lang}      string Name of parser
+      • {lang}      (string) Name of parser
       • {filetype}  string|string[] Filetype(s) to associate with lang
 
 
@@ -1051,7 +1051,9 @@ contents.
 To create a LanguageTree (parser object) for a given buffer and language, use:
 
 >lua
-    local parser = vim.treesitter.get_parser(bufnr, lang)
+
+     local parser = vim.treesitter.get_parser(bufnr, lang)
+
 <
 
 (where `bufnr=0` means current buffer). `lang` defaults to 'filetype'.
@@ -1062,7 +1064,9 @@ it wants incremental updates.
 Whenever you need to access the current syntax tree, parse the buffer:
 
 >lua
-    local tree = parser:parse()
+
+     local tree = parser:parse()
+
 <
 
 This returns a table of immutable |treesitter-tree| objects representing
@@ -1175,22 +1179,23 @@ LanguageTree:register_cbs({cbs}, {recursive})
     Registers callbacks for the |LanguageTree|.
 
     Parameters: ~
-      • {cbs}         (table) An |nvim_buf_attach()|-like table argument with
-                      the following handlers:
-                      • `on_bytes` : see |nvim_buf_attach()|, but this will be called after the parsers callback.
-                      • `on_changedtree` : a callback that will be called
-                        every time the tree has syntactical changes. It will
-                        be passed two arguments: a table of the ranges (as
-                        node ranges) that changed and the changed tree.
-                      • `on_child_added` : emitted when a child is added to
-                        the tree.
-                      • `on_child_removed` : emitted when a child is removed
-                        from the tree.
-                      • `on_detach` : emitted when the buffer is detached, see
-                        |nvim_buf_detach_event|. Takes one argument, the
-                        number of the buffer.
-      • {recursive?}  boolean Apply callbacks recursively for all children.
-                      Any new children will also inherit the callbacks.
+      • {cbs}        (table) An |nvim_buf_attach()|-like table argument with
+                     the following handlers:
+                     • `on_bytes` : see |nvim_buf_attach()|, but this will be called after the parsers callback.
+                     • `on_changedtree` : a callback that will be called every
+                       time the tree has syntactical changes. It will be
+                       passed two arguments: a table of the ranges (as node
+                       ranges) that changed and the changed tree.
+                     • `on_child_added` : emitted when a child is added to the
+                       tree.
+                     • `on_child_removed` : emitted when a child is removed
+                       from the tree.
+                     • `on_detach` : emitted when the buffer is detached, see
+                       |nvim_buf_detach_event|. Takes one argument, the number
+                       of the buffer.
+      • {recursive}  (boolean|nil) Apply callbacks recursively for all
+                     children. Any new children will also inherit the
+                     callbacks.
 
 LanguageTree:source()                                  *LanguageTree:source()*
     Returns the source content of the language tree (bufnr or string).
-- 
cgit 


From 881d17a11393da75a27c072faa3fd45f510175fe Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 17 Jul 2023 14:27:21 +0100
Subject: feat(options)!: remove compatible behaviours for vim 5.0 and earlier

---
 runtime/doc/news.txt     | 10 ++++++++++
 runtime/doc/options.txt  | 18 ++----------------
 runtime/doc/vim_diff.txt |  8 ++++++++
 3 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 7375cd6a82..67726ebd9c 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -51,6 +51,16 @@ The following changes may require adaptations in user config or plugins.
   • `vim.json.null` is redundant with `vim.NIL`.
   • `vim.json.array_mt` (and related) is redundant with `vim.empty_dict()`.
 
+• Removed some Vim 5.0<= option compatibilities:
+  • |'backspace'| no longer supports number values. Instead:
+    • for `backspace=0` set `backspace=` (empty)
+    • for `backspace=1` set `backspace=indent,eol`
+    • for `backspace=2` set `backspace=indent,eol,start` (default behavior in Nvim)
+    • for `backspace=3` set `backspace=indent,eol,nostop`
+  • paths in |'backupdir'|, |'path'| and |'cdpath'| can no longer be separated with
+    spaces (but paths themselves may contain spaces now).
+  • |'directory'| will no longer remove a `>` at the start of the option.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index da634966f9..4b9797408c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -762,13 +762,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When the value is empty, Vi compatible backspacing is used, none of
 	the ways mentioned for the items above are possible.
 
-	For backwards compatibility with version 5.4 and earlier:
-	value	effect	~
-	  0	same as ":set backspace=" (Vi compatible)
-	  1	same as ":set backspace=indent,eol"
-	  2	same as ":set backspace=indent,eol,start"
-	  3	same as ":set backspace=indent,eol,nostop"
-
 				*'backup'* *'bk'* *'nobackup'* *'nobk'*
 'backup' 'bk'		boolean	(default off)
 			global
@@ -880,8 +873,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- Careful with '\' characters, type one before a space, type two to
 	  get one in the option (see |option-backslash|), for example: >
 	    :set bdir=c:\\tmp,\ dir\\,with\\,commas,\\\ dir\ with\ spaces
-<	- For backwards compatibility with Vim version 3.0 a '>' at the start
-	  of the option is removed.
+<
 	See also 'backup' and 'writebackup' options.
 	If you want to hide your backup files on Unix, consider this value: >
 		:set backupdir=./.backup,~/.backup,.,/tmp
@@ -2083,9 +2075,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- Careful with '\' characters, type one before a space, type two to
 	  get one in the option (see |option-backslash|), for example: >
 	    :set dir=c:\\tmp,\ dir\\,with\\,commas,\\\ dir\ with\ spaces
-<	- For backwards compatibility with Vim version 3.0 a '>' at the start
-	  of the option is removed.
-
+<
 	Editing the same file twice will result in a warning.  Using "/tmp" on
 	is discouraged: if the system crashes you lose the swap file. And
 	others on the computer may be able to see the files.
@@ -4490,10 +4480,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	option may be relative or absolute.
 	- Use commas to separate directory names: >
 		:set path=.,/usr/local/include,/usr/include
-<	- Spaces can also be used to separate directory names (for backwards
-	  compatibility with version 3.0).  To have a space in a directory
-	  name, precede it with an extra backslash, and escape the space: >
-		:set path=.,/dir/with\\\ space
 <	- To include a comma in a directory name precede it with an extra
 	  backslash: >
 		:set path=.,/dir/with\\,comma
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 5246d3c2b8..5a05c04bb8 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -623,10 +623,17 @@ Highlight groups:
 Options:
   *'aleph'* *'al'*
   antialias
+  'backspace' no longer supports number values. Instead:
+    - for `backspace=0` set `backspace=` (empty)
+    - for `backspace=1` set `backspace=indent,eol`
+    - for `backspace=2` set `backspace=indent,eol,start` (default behavior in Nvim)
+    - for `backspace=3` set `backspace=indent,eol,nostop`
   *'balloondelay'* *'bdlay'*
   *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'*
   *'balloonexpr'* *'bexpr'*
+  'backupdir': paths can no longer be separated with spaces.
   bioskey (MS-DOS)
+  'cdpath': paths can no longer be separated with spaces.
   conskey (MS-DOS)
   *'cp'* *'nocompatible'* *'nocp'* *'compatible'* (Nvim is always "nocompatible".)
   'cpoptions' (gjkHw<*- and all POSIX flags were removed)
@@ -691,6 +698,7 @@ Options:
     Use |g8| or |ga|.  See |mbyte-combining|.
   *'maxmem'* Nvim delegates memory-management to the OS.
   *'maxmemtot'* Nvim delegates memory-management to the OS.
+  |'path'|: paths can no longer be separated with spaces.
   printoptions
   *'printdevice'*
   *'printencoding'*
-- 
cgit 


From 0ac3c4d6314df5fe40571a83e157a425ab7ce16d Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 15 Jul 2023 16:55:32 +0100
Subject: docs(lua): move function docs to lua files

---
 runtime/doc/lua.txt               | 936 +++++++++++++++++++++-----------------
 runtime/lua/vim/_meta/builtin.lua | 236 ++++++++++
 runtime/lua/vim/_meta/diff.lua    |  67 +++
 runtime/lua/vim/_meta/json.lua    |  35 ++
 runtime/lua/vim/_meta/misc.lua    |  11 +
 runtime/lua/vim/_meta/mpack.lua   |  13 +
 runtime/lua/vim/_meta/regex.lua   |  34 ++
 runtime/lua/vim/_meta/spell.lua   |  29 ++
 runtime/lua/vim/_options.lua      | 381 +++++++++++++++-
 runtime/lua/vim/highlight.lua     |  65 ++-
 10 files changed, 1354 insertions(+), 453 deletions(-)
 create mode 100644 runtime/lua/vim/_meta/builtin.lua
 create mode 100644 runtime/lua/vim/_meta/diff.lua
 create mode 100644 runtime/lua/vim/_meta/json.lua
 create mode 100644 runtime/lua/vim/_meta/misc.lua
 create mode 100644 runtime/lua/vim/_meta/mpack.lua
 create mode 100644 runtime/lua/vim/_meta/regex.lua
 create mode 100644 runtime/lua/vim/_meta/spell.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 81449bc454..d53b66a865 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -565,51 +565,31 @@ A subset of the `vim.*` API is available in threads. This includes:
 - `vim.is_thread()` returns true from a non-main thread.
 
 ------------------------------------------------------------------------------
+VIM.LPEG                                                            *lua-lpeg*
+
+                                                             *vim.lpeg* *vim.re*
+The Lpeg library for parsing expression grammars is being included as
+`vim.lpeg` (https://www.inf.puc-rio.br/~roberto/lpeg/). In addition, its regex-like
+interface is available as `vim.re` (https://www.inf.puc-rio.br/~roberto/lpeg/re.html).
+
+==============================================================================
 VIM.HIGHLIGHT                                                  *lua-highlight*
 
-Nvim includes a function for highlighting a selection on yank (see for example
-https://github.com/machakann/vim-highlightedyank). To enable it, add
->vim
+
+Nvim includes a function for highlighting a selection on yank.
+
+To enable it, add the following to your `init.vim` : >vim
     au TextYankPost * silent! lua vim.highlight.on_yank()
 <
-to your `init.vim`. You can customize the highlight group and the duration of
-the highlight via
->vim
+
+You can customize the highlight group and the duration of the highlight
+via: >vim
     au TextYankPost * silent! lua vim.highlight.on_yank {higroup="IncSearch", timeout=150}
 <
-If you want to exclude visual selections from highlighting on yank, use
->vim
+
+If you want to exclude visual selections from highlighting on yank, use: >vim
     au TextYankPost * silent! lua vim.highlight.on_yank {on_visual=false}
 <
-vim.highlight.on_yank({opts})                        *vim.highlight.on_yank()*
-    Highlights the yanked text. The fields of the optional dict {opts}
-    control the highlight:
-      - {higroup} highlight group for yanked region (default |hl-IncSearch|)
-      - {timeout} time in ms before highlight is cleared (default `150`)
-      - {on_macro} highlight when executing macro (default `false`)
-      - {on_visual} highlight when yanking visual selection (default `true`)
-      - {event} event structure (default |v:event|)
-      - {priority} priority of highlight (default |vim.highlight.priorities|`.user`)
-
-
-vim.highlight.range({bufnr}, {ns}, {hlgroup}, {start}, {finish}, {opts})
-                                                       *vim.highlight.range()*
-
-    Apply highlight group to range of text.
-
-            Parameters: ~
-              • {bufnr}   buffer number
-              • {ns}      namespace for highlights
-              • {hlgroup} highlight group name
-              • {start}   starting position (tuple {line,col})
-              • {finish}  finish position (tuple {line,col})
-              • {opts}    optional parameters:
-                          • `regtype`: type of range (characterwise, linewise,
-                            or blockwise, see |setreg()|), default `'v'`
-                          • `inclusive`: range includes end position,
-                            default `false`
-                          • `priority`: priority of highlight, default
-                            `vim.highlight.user` (see below)
 
 vim.highlight.priorities                            *vim.highlight.priorities*
 
@@ -621,41 +601,83 @@ vim.highlight.priorities                            *vim.highlight.priorities*
         • `user`: `200`, used for user-triggered highlights such as LSP document
           symbols or `on_yank` autocommands
 
-------------------------------------------------------------------------------
+vim.highlight.on_yank({opts})                        *vim.highlight.on_yank()*
+    Highlight the yanked text
+
+    Parameters: ~
+      • {opts}  (table|nil) Optional parameters
+                • higroup highlight group for yanked region (default
+                  "IncSearch")
+                • timeout time in ms before highlight is cleared (default 150)
+                • on_macro highlight when executing macro (default false)
+                • on_visual highlight when yanking visual selection (default
+                  true)
+                • event event structure (default vim.v.event)
+                • priority integer priority (default
+                  |vim.highlight.priorities|`.user`)
+
+                                                       *vim.highlight.range()*
+vim.highlight.range({bufnr}, {ns}, {higroup}, {start}, {finish}, {opts})
+    Apply highlight group to range of text.
+
+    Parameters: ~
+      • {bufnr}    (integer) Buffer number to apply highlighting to
+      • {ns}       (integer) Namespace to add highlight to
+      • {higroup}  (string) Highlight group to use for highlighting
+      • {start}    integer[]|string Start of region as a (line, column) tuple
+                   or string accepted by |getpos()|
+      • {finish}   integer[]|string End of region as a (line, column) tuple or
+                   string accepted by |getpos()|
+      • {opts}     (table|nil) Optional parameters
+                   • regtype type of range (see |setreg()|, default charwise)
+                   • inclusive boolean indicating whether the range is
+                     end-inclusive (default false)
+                   • priority number indicating priority of highlight (default
+                     priorities.user)
+
+
+==============================================================================
 VIM.REGEX                                                          *lua-regex*
 
+
 Vim regexes can be used directly from Lua. Currently they only allow
 matching within a single line.
 
+
 vim.regex({re})                                                  *vim.regex()*
     Parse the Vim regex {re} and return a regex object. Regexes are "magic"
     and case-sensitive by default, regardless of 'magic' and 'ignorecase'.
     They can be controlled with flags, see |/magic| and |/ignorecase|.
 
-Methods on the regex object:
+    Parameters: ~
+      • {re}  (string)
 
-regex:match_str({str})                                     *regex:match_str()*
-    Match the string against the regex. If the string should match the regex
-    precisely, surround the regex with `^` and `$`. If the was a match, the
-    byte indices for the beginning and end of the match is returned. When
-    there is no match, `nil` is returned. As any integer is truth-y,
-    `regex:match()` can be directly used as a condition in an if-statement.
+    Return: ~
+        vim.regex
 
-regex:match_line({bufnr}, {line_idx} [, {start}, {end}])  *regex:match_line()*
+                                                          *regex:match_line()*
+vim.regex:match_line({bufnr}, {line_idx}, {start}, {end_})
     Match line {line_idx} (zero-based) in buffer {bufnr}. If {start} and {end}
     are supplied, match only this byte index range. Otherwise see
     |regex:match_str()|. If {start} is used, then the returned byte indices
     will be relative {start}.
 
-------------------------------------------------------------------------------
-VIM.LPEG                                                            *lua-lpeg*
+    Parameters: ~
+      • {bufnr}     (integer)
+      • {line_idx}  (integer)
+      • {start}     (integer|nil)
+      • {end_}      (integer|nil)
 
-                                                             *vim.lpeg* *vim.re*
-The Lpeg library for parsing expression grammars is being included as
-`vim.lpeg` (https://www.inf.puc-rio.br/~roberto/lpeg/). In addition, its regex-like
-interface is available as `vim.re` (https://www.inf.puc-rio.br/~roberto/lpeg/re.html).
+vim.regex:match_str({str})                                 *regex:match_str()*
+    Match the string against the regex. If the string should match the regex
+    precisely, surround the regex with `^` and `$` . If the was a match, the byte indices for the beginning and end of the
+    match is returned. When there is no match, `nil` is returned. As any integer is truth-y, `regex:match()` can be directly used as a condition in an if-statement.
 
-------------------------------------------------------------------------------
+    Parameters: ~
+      • {str}   (string)
+
+
+==============================================================================
 VIM.DIFF                                                            *lua-diff*
 
 vim.diff({a}, {b}, {opts})                                        *vim.diff()*
@@ -663,108 +685,127 @@ vim.diff({a}, {b}, {opts})                                        *vim.diff()*
     either directly or via callback arguments, are 1-based.
 
     Examples: >lua
-        vim.diff('a\n', 'b\nc\n')
-        -- =>
-        -- @@ -1 +1,2 @@
-        -- -a
-        -- +b
-        -- +c
-
-        vim.diff('a\n', 'b\nc\n', {result_type = 'indices'})
-        -- =>
-        -- {
-        --   {1, 1, 1, 2}
-        -- }
-<
-    Parameters: ~
-      • {a}      First string to compare
-      • {b}      Second string to compare
-      • {opts}   Optional parameters:
-                 • `on_hunk` (callback):
-                   Invoked for each hunk in the diff. Return a negative number
-                   to cancel the callback for any remaining hunks.
-                   Args:
-                   • `start_a` (integer): Start line of hunk in {a}.
-                   • `count_a` (integer): Hunk size in {a}.
-                   • `start_b` (integer): Start line of hunk in {b}.
-                   • `count_b` (integer): Hunk size in {b}.
-                 • `result_type` (string): Form of the returned diff:
-                   • "unified": (default) String in unified format.
-                   • "indices": Array of hunk locations.
-                   Note: This option is ignored if `on_hunk` is used.
-                 • `linematch` (boolean|integer): Run linematch on the resulting hunks
-                   from xdiff. When integer, only hunks upto this size in
-                   lines are run through linematch. Requires `result_type = indices`,
-                   ignored otherwise.
-                 • `algorithm` (string):
-                   Diff algorithm to use. Values:
-                   • "myers"      the default algorithm
-                   • "minimal"    spend extra time to generate the
-                                  smallest possible diff
-                   • "patience"   patience diff algorithm
-                   • "histogram"  histogram diff algorithm
-                 • `ctxlen` (integer): Context length
-                 • `interhunkctxlen` (integer):
-                   Inter hunk context length
-                 • `ignore_whitespace` (boolean):
-                   Ignore whitespace
-                 • `ignore_whitespace_change` (boolean):
-                   Ignore whitespace change
-                 • `ignore_whitespace_change_at_eol` (boolean)
-                   Ignore whitespace change at end-of-line.
-                 • `ignore_cr_at_eol` (boolean)
-                   Ignore carriage return at end-of-line
-                 • `ignore_blank_lines` (boolean)
-                   Ignore blank lines
-                 • `indent_heuristic` (boolean):
-                   Use the indent heuristic for the internal
-                   diff library.
-
-    Return: ~
-        See {opts.result_type}. nil if {opts.on_hunk} is given.
 
-------------------------------------------------------------------------------
+         vim.diff('a\n', 'b\nc\n')
+         -- =>
+         -- @ -1 +1,2 @
+         -- -a
+         -- +b
+         -- +c
+
+         vim.diff('a\n', 'b\nc\n', {result_type = 'indices'})
+         -- =>
+         -- {
+         --   {1, 1, 1, 2}
+         -- }
+<
+
+    Parameters: ~
+      • {a}     (string) First string to compare
+      • {b}     (string) Second string to compare
+      • {opts}  table<string,any> Optional parameters:
+                • `on_hunk` (callback): Invoked for each hunk in the diff. Return a
+                  negative number to cancel the callback for any remaining
+                  hunks. Args:
+                  • `start_a` (integer): Start line of hunk in {a}.
+                  • `count_a` (integer): Hunk size in {a}.
+                  • `start_b` (integer): Start line of hunk in {b}.
+                  • `count_b` (integer): Hunk size in {b}.
+
+                • `result_type` (string): Form of the returned diff:
+                  • "unified": (default) String in unified format.
+                  • "indices": Array of hunk locations. Note: This option is
+                    ignored if `on_hunk` is used.
+
+                • `linematch` (boolean|integer): Run linematch on the
+                  resulting hunks from xdiff. When integer, only hunks upto
+                  this size in lines are run through linematch. Requires
+                  `result_type = indices`, ignored otherwise.
+                • `algorithm` (string): Diff algorithm to use. Values:
+                  • "myers" the default algorithm
+                  • "minimal" spend extra time to generate the smallest
+                    possible diff
+                  • "patience" patience diff algorithm
+                  • "histogram" histogram diff algorithm
+
+                • `ctxlen` (integer): Context length
+                • `interhunkctxlen` (integer): Inter hunk context length
+                • `ignore_whitespace` (boolean): Ignore whitespace
+                • `ignore_whitespace_change` (boolean): Ignore whitespace
+                  change
+                • `ignore_whitespace_change_at_eol` (boolean) Ignore
+                  whitespace change at end-of-line.
+                • `ignore_cr_at_eol` (boolean) Ignore carriage return at
+                  end-of-line
+                • `ignore_blank_lines` (boolean) Ignore blank lines
+                • `indent_heuristic` (boolean): Use the indent heuristic for
+                  the internal diff library.
+
+    Return: ~
+        string|table|nil See {opts.result_type}. `nil` if {opts.on_hunk} is
+        given.
+
+
+==============================================================================
 VIM.MPACK                                                          *lua-mpack*
 
-The *vim.mpack* module provides encoding and decoding of Lua objects to and
-from msgpack-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
 
-vim.mpack.encode({obj})                                     *vim.mpack.encode*
-    Encodes (or "packs") Lua object {obj} as msgpack in a Lua string.
+The *vim.mpack* module provides encoding and decoding of Lua objects to
+and from msgpack-encoded strings. Supports |vim.NIL| and
+|vim.empty_dict()|.
 
-vim.mpack.decode({str})                                     *vim.mpack.decode*
+
+vim.mpack.decode({str})                                   *vim.mpack.decode()*
     Decodes (or "unpacks") the msgpack-encoded {str} to a Lua object.
 
-------------------------------------------------------------------------------
+    Parameters: ~
+      • {str}  (string)
+
+vim.mpack.encode({obj})                                   *vim.mpack.encode()*
+    Encodes (or "packs") Lua object {obj} as msgpack in a Lua string.
+
+
+==============================================================================
 VIM.JSON                                                            *lua-json*
 
+
 The *vim.json* module provides encoding and decoding of Lua objects to and
 from JSON-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
 
-vim.json.encode({obj})                                       *vim.json.encode*
-    Encodes (or "packs") Lua object {obj} as JSON in a Lua string.
 
-vim.json.decode({str}[, {opts}])                             *vim.json.decode*
+vim.json.decode({str}, {opts})                             *vim.json.decode()*
     Decodes (or "unpacks") the JSON-encoded {str} to a Lua object.
 
-    - Decodes JSON "null" as |vim.NIL| (controllable by {opts}, see below).
-    - Decodes empty object as |vim.empty_dict()|.
-    - Decodes empty array as `{}` (empty Lua table).
+    • Decodes JSON "null" as |vim.NIL| (controllable by {opts}, see below).
+    • Decodes empty object as |vim.empty_dict()|.
+    • Decodes empty array as `{}` (empty Lua table).
 
     Example: >lua
-    :lua vim.print(vim.json.decode('{"bar":[],"foo":{},"zub":null}'))
-    --> { bar = {}, foo = vim.empty_dict(), zub = vim.NIL }
-<
+
+     :lua vim.print(vim.json.decode('{"bar":[],"foo":{},"zub":null}'))
+     --> { bar = {}, foo = vim.empty_dict(), zub = vim.NIL }
+
+    < Parameters: ~ • {str} Stringified JSON data. • {opts} Options map keys: •
+    luanil: { object: bool, array: bool } • `luanil.object=true` converts `null` in JSON objects to Lua `nil` instead of `vim.NIL` . • `luanil.array=true` converts `null` in JSON arrays to Lua `nil` instead of `vim.NIL` .
+
     Parameters: ~
-      • {str}    Stringified JSON data.
-      • {opts}   Options map keys:
-                 • luanil: { object: bool, array: bool }
-                   • `luanil.object=true` converts `null` in JSON objects to
-                     Lua `nil` instead of `vim.NIL`.
-                   • `luanil.array=true` converts `null` in JSON arrays to Lua
-                     `nil` instead of `vim.NIL`.
+      • {str}   (string)
+      • {opts}  table<string,|nil any>
 
-------------------------------------------------------------------------------
+    Return: ~
+        any
+
+vim.json.encode({obj})                                     *vim.json.encode()*
+    Encodes (or "packs") Lua object {obj} as JSON in a Lua string.
+
+    Parameters: ~
+      • {obj}  any
+
+    Return: ~
+        (string)
+
+
+==============================================================================
 VIM.SPELL                                                          *lua-spell*
 
 vim.spell.check({str})                                     *vim.spell.check()*
@@ -776,46 +817,86 @@ vim.spell.check({str})                                     *vim.spell.check()*
     the buffer. Consider calling this with |nvim_buf_call()|.
 
     Example: >lua
-        vim.spell.check("the quik brown fox")
-        -- =>
-        -- {
-        --     {'quik', 'bad', 5}
-        -- }
+
+         vim.spell.check("the quik brown fox")
+         -- =>
+         -- {
+         --     {'quik', 'bad', 5}
+         -- }
 <
+
     Parameters: ~
-      • {str}    String to spell check.
+      • {str}  (string)
 
     Return: ~
-      List of tuples with three items:
-        - The badly spelled word.
-        - The type of the spelling error:
-            "bad"   spelling mistake
-            "rare"  rare word
-            "local" word only valid in another region
-            "caps"  word should start with Capital
-        - The position in {str} where the word begins.
+        {[1]: string, [2]: string, [3]: string}[] List of tuples with three
+        items:
+        • The badly spelled word.
+        • The type of the spelling error: "bad" spelling mistake "rare" rare
+          word "local" word only valid in another region "caps" word should
+          start with Capital
+        • The position in {str} where the word begins.
 
-------------------------------------------------------------------------------
+
+==============================================================================
 VIM                                                              *lua-builtin*
 
-vim.api.{func}({...})                                                *vim.api*
+
+vim.api.{func}({...})                                                    *vim.api*
     Invokes Nvim |API| function {func} with arguments {...}.
     Example: call the "nvim_get_current_line()" API function: >lua
         print(tostring(vim.api.nvim_get_current_line()))
 
-vim.in_fast_event()                                      *vim.in_fast_event()*
-    Returns true if the code is executing as part of a "fast" event handler,
-    where most of the API is disabled. These are low-level events (e.g.
-    |lua-loop-callbacks|) which can be invoked whenever Nvim polls for input.
-    When this is `false` most API functions are callable (but may be subject
-    to other restrictions such as |textlock|).
-
-vim.NIL                                                              *vim.NIL*
+vim.NIL                                                                  *vim.NIL*
     Special value representing NIL in |RPC| and |v:null| in Vimscript
     conversion, and similar cases. Lua `nil` cannot be used as part of a Lua
     table representing a Dictionary or Array, because it is treated as
     missing: `{"foo", nil}` is the same as `{"foo"}`.
 
+vim.type_idx                                                        *vim.type_idx*
+    Type index for use in |lua-special-tbl|. Specifying one of the values from
+    |vim.types| allows typing the empty table (it is unclear whether empty Lua
+    table represents empty list or empty array) and forcing integral numbers
+    to be |Float|. See |lua-special-tbl| for more details.
+
+vim.val_idx                                                          *vim.val_idx*
+    Value index for tables representing |Float|s. A table representing
+    floating-point value 1.0 looks like this: >lua
+        {
+          [vim.type_idx] = vim.types.float,
+          [vim.val_idx] = 1.0,
+        }
+<    See also |vim.type_idx| and |lua-special-tbl|.
+
+vim.types                                                              *vim.types*
+    Table with possible values for |vim.type_idx|. Contains two sets of
+    key-value pairs: first maps possible values for |vim.type_idx| to
+    human-readable strings, second maps human-readable type names to values
+    for |vim.type_idx|. Currently contains pairs for `float`, `array` and
+        `dictionary` types.
+
+    Note: One must expect that values corresponding to `vim.types.float`,
+    `vim.types.array` and `vim.types.dictionary` fall under only two following
+    assumptions:
+    1. Value may serve both as a key and as a value in a table. Given the
+       properties of Lua tables this basically means “value is not `nil`”.
+    2. For each value in `vim.types` table `vim.types[vim.types[value]]` is the
+       same as `value`.
+    No other restrictions are put on types, and it is not guaranteed that
+    values corresponding to `vim.types.float`, `vim.types.array` and
+    `vim.types.dictionary` will not change or that `vim.types` table will only
+    contain values for these three types.
+
+                                                   *log_levels* *vim.log.levels*
+Log levels are one of the values defined in `vim.log.levels`:
+
+    vim.log.levels.DEBUG
+    vim.log.levels.ERROR
+    vim.log.levels.INFO
+    vim.log.levels.TRACE
+    vim.log.levels.WARN
+    vim.log.levels.OFF
+
 vim.empty_dict()                                            *vim.empty_dict()*
     Creates a special empty table (marked with a metatable), which Nvim to an
     empty dictionary when translating Lua values to Vimscript or API types.
@@ -825,215 +906,221 @@ vim.empty_dict()                                            *vim.empty_dict()*
     Note: If numeric keys are present in the table, Nvim ignores the metatable
     marker and converts the dict to a list/array anyway.
 
-vim.rpcnotify({channel}, {method} [, {args}...])             *vim.rpcnotify()*
+vim.iconv({str}, {from}, {to}, {opts})                           *vim.iconv()*
+    The result is a String, which is the text {str} converted from encoding
+    {from} to encoding {to}. When the conversion fails `nil` is returned. When
+    some characters could not be converted they are replaced with "?". The
+    encoding names are whatever the iconv() library function can accept, see
+    ":Man 3 iconv".
+
+    Parameters: ~
+      • {str}   (string) Text to convert
+      • {from}  (number) Encoding of {str}
+      • {to}    (number) Target encoding
+      • {opts}  table<string,|nil any>
+
+    Return: ~
+        (string|nil) Converted string if conversion succeeds, `nil` otherwise.
+
+vim.in_fast_event()                                      *vim.in_fast_event()*
+    Returns true if the code is executing as part of a "fast" event handler,
+    where most of the API is disabled. These are low-level events (e.g.
+    |lua-loop-callbacks|) which can be invoked whenever Nvim polls for input.
+    When this is `false` most API functions are callable (but may be subject
+    to other restrictions such as |textlock|).
+
+vim.rpcnotify({channel}, {method}, {args}, {...})            *vim.rpcnotify()*
     Sends {event} to {channel} via |RPC| and returns immediately. If {channel}
     is 0, the event is broadcast to all channels.
 
     This function also works in a fast callback |lua-loop-callbacks|.
 
-vim.rpcrequest({channel}, {method} [, {args}...])           *vim.rpcrequest()*
+    Parameters: ~
+      • {channel}  (integer)
+      • {method}   (string)
+      • {args}     any[]|nil
+      • {...}      any|nil
+
+vim.rpcrequest({channel}, {method}, {args}, {...})          *vim.rpcrequest()*
     Sends a request to {channel} to invoke {method} via |RPC| and blocks until
     a response is received.
 
     Note: NIL values as part of the return value is represented as |vim.NIL|
     special value
 
-vim.stricmp({a}, {b})                                          *vim.stricmp()*
-    Compares strings case-insensitively. Returns 0, 1 or -1 if strings are
-    equal, {a} is greater than {b} or {a} is lesser than {b}, respectively.
+    Parameters: ~
+      • {channel}  (integer)
+      • {method}   (string)
+      • {args}     any[]|nil
+      • {...}      any|nil
 
-vim.str_utfindex({str} [, {index}])                       *vim.str_utfindex()*
-    Convert byte index to UTF-32 and UTF-16 indices. If {index} is not
-    supplied, the length of the string is used. All indices are zero-based.
-    Returns two values: the UTF-32 and UTF-16 indices respectively.
+vim.schedule({callback})                                      *vim.schedule()*
+    Schedules {callback} to be invoked soon by the main event-loop. Useful to
+    avoid |textlock| or other temporary restrictions.
 
-    Embedded NUL bytes are treated as terminating the string. Invalid UTF-8
-    bytes, and embedded surrogates are counted as one code point each. An
-    {index} in the middle of a UTF-8 sequence is rounded upwards to the end of
-    that sequence.
+    Parameters: ~
+      • {callback}  fun()
 
-vim.str_byteindex({str}, {index} [, {use_utf16}])        *vim.str_byteindex()*
+vim.str_byteindex({str}, {index}, {use_utf16})           *vim.str_byteindex()*
     Convert UTF-32 or UTF-16 {index} to byte index. If {use_utf16} is not
     supplied, it defaults to false (use UTF-32). Returns the byte index.
 
-    Invalid UTF-8 and NUL is treated like by |vim.str_byteindex()|.
-    An {index} in the middle of a UTF-16 sequence is rounded upwards to
-    the end of that sequence.
-
-vim.iconv({str}, {from}, {to}[, {opts}])                        *vim.iconv()*
-        The result is a String, which is the text {str} converted from
-        encoding {from} to encoding {to}. When the conversion fails `nil` is
-        returned.  When some characters could not be converted they
-        are replaced with "?".
-        The encoding names are whatever the iconv() library function
-        can accept, see ":Man 3 iconv".
-
-        Parameters: ~
-          • {str}   (string) Text to convert
-          • {from}  (string) Encoding of {str}
-          • {to}    (string) Target encoding
+    Invalid UTF-8 and NUL is treated like by |vim.str_byteindex()|. An {index}
+    in the middle of a UTF-16 sequence is rounded upwards to the end of that
+    sequence.
 
-        Returns: ~
-            Converted string if conversion succeeds, `nil` otherwise.
-
-vim.schedule({callback})                                      *vim.schedule()*
-    Schedules {callback} to be invoked soon by the main event-loop. Useful
-    to avoid |textlock| or other temporary restrictions.
+    Parameters: ~
+      • {str}        (string)
+      • {index}      (number)
+      • {use_utf16}  any|nil
 
-vim.wait({time} [, {callback}, {interval}, {fast_only}])          *vim.wait()*
-    Wait for {time} in milliseconds until {callback} returns `true`.
+vim.str_utfindex({str}, {index})                          *vim.str_utfindex()*
+    Convert byte index to UTF-32 and UTF-16 indices. If {index} is not
+    supplied, the length of the string is used. All indices are zero-based.
 
-    Executes {callback} immediately and at approximately {interval}
-    milliseconds (default 200). Nvim still processes other events during
-    this time.
+    Embedded NUL bytes are treated as terminating the string. Invalid UTF-8
+    bytes, and embedded surrogates are counted as one code point each. An
+    {index} in the middle of a UTF-8 sequence is rounded upwards to the end of
+    that sequence.
 
     Parameters: ~
-      • {time}      Number of milliseconds to wait
-      • {callback}  Optional callback. Waits until {callback} returns true
-      • {interval}  (Approximate) number of milliseconds to wait between polls
-      • {fast_only} If true, only |api-fast| events will be processed.
-                        If called from while in an |api-fast| event, will
-                        automatically be set to `true`.
+      • {str}    (string)
+      • {index}  (number|nil)
 
-    Returns: ~
-        If {callback} returns `true` during the {time}:
-            `true, nil`
+    Return (multiple): ~
+        (integer) UTF-32 index
+        (integer) UTF-16 index
 
-        If {callback} never returns `true` during the {time}:
-            `false, -1`
+vim.stricmp({a}, {b})                                          *vim.stricmp()*
+    Compares strings case-insensitively.
 
-        If {callback} is interrupted during the {time}:
-            `false, -2`
+    Parameters: ~
+      • {a}  (string)
+      • {b}  (string)
 
-        If {callback} errors, the error is raised.
+    Return: ~
+        0|1|-1 if strings are equal, {a} is greater than {b} or {a} is lesser
+        than {b}, respectively.
 
-        Examples: >lua
+vim.ui_attach({ns}, {options}, {callback})                   *vim.ui_attach()*
+    Attach to ui events, similar to |nvim_ui_attach()| but receive events as
+    Lua callback. Can be used to implement screen elements like popupmenu or
+    message handling in Lua.
 
-    ---
-    -- Wait for 100 ms, allowing other events to process
-    vim.wait(100, function() end)
+    {options} should be a dictionary-like table, where `ext_...` options
+    should be set to true to receive events for the respective external
+    element.
 
-    ---
-    -- Wait for 100 ms or until global variable set.
-    vim.wait(100, function() return vim.g.waiting_for_var end)
+    {callback} receives event name plus additional parameters. See
+    |ui-popupmenu| and the sections below for event format for respective
+    events.
 
-    ---
-    -- Wait for 1 second or until global variable set, checking every ~500 ms
-    vim.wait(1000, function() return vim.g.waiting_for_var end, 500)
+    WARNING: This api is considered experimental. Usability will vary for
+    different screen elements. In particular `ext_messages` behavior is
+    subject to further changes and usability improvements. This is expected to
+    be used to handle messages when setting 'cmdheight' to zero (which is
+    likewise experimental).
 
-    ---
-    -- Schedule a function to set a value in 100ms
-    vim.defer_fn(function() vim.g.timer_result = true end, 100)
+    Example (stub for a |ui-popupmenu| implementation): >lua
 
-    -- Would wait ten seconds if results blocked. Actually only waits  100 ms
-    if vim.wait(10000, function() return vim.g.timer_result end) then
-      print('Only waiting a little bit of time!')
-    end
+       ns = vim.api.nvim_create_namespace('my_fancy_pum')
+
+       vim.ui_attach(ns, {ext_popupmenu=true}, function(event, ...)
+         if event == "popupmenu_show" then
+           local items, selected, row, col, grid = ...
+           print("display pum ", #items)
+         elseif event == "popupmenu_select" then
+           local selected = ...
+           print("selected", selected)
+         elseif event == "popupmenu_hide" then
+           print("FIN")
+         end
+       end)
 <
 
-vim.ui_attach({ns}, {options}, {callback})                *vim.ui_attach()*
-    Attach to ui events, similar to |nvim_ui_attach()| but receive events
-    as Lua callback. Can be used to implement screen elements like
-    popupmenu or message handling in Lua.
+    Parameters: ~
+      • {ns}        (integer)
+      • {options}   table<string, any>
+      • {callback}  fun()
 
-    {options} should be a dictionary-like table, where `ext_...` options should
-    be set to true to receive events for the respective external element.
+vim.ui_detach({ns})                                          *vim.ui_detach()*
+    Detach a callback previously attached with |vim.ui_attach()| for the given
+    namespace {ns}.
 
-    {callback} receives event name plus additional parameters. See |ui-popupmenu|
-    and the sections below for event format for respective events.
+    Parameters: ~
+      • {ns}  (integer)
 
-    WARNING: This api is considered experimental.  Usability will vary for
-    different screen elements. In particular `ext_messages` behavior is subject
-    to further changes and usability improvements.  This is expected to be
-    used to handle messages when setting 'cmdheight' to zero (which is
-    likewise experimental).
+vim.wait({time}, {callback}, {interval}, {fast_only})             *vim.wait()*
+    Wait for {time} in milliseconds until {callback} returns `true`.
 
-    Example (stub for a |ui-popupmenu| implementation): >lua
+    Executes {callback} immediately and at approximately {interval}
+    milliseconds (default 200). Nvim still processes other events during this
+    time.
 
-      ns = vim.api.nvim_create_namespace('my_fancy_pum')
-
-      vim.ui_attach(ns, {ext_popupmenu=true}, function(event, ...)
-        if event == "popupmenu_show" then
-          local items, selected, row, col, grid = ...
-          print("display pum ", #items)
-        elseif event == "popupmenu_select" then
-          local selected = ...
-          print("selected", selected)
-        elseif event == "popupmenu_hide" then
-          print("FIN")
-        end
-      end)
+    Examples: >lua
 
-vim.ui_detach({ns})                                           *vim.ui_detach()*
-    Detach a callback previously attached with |vim.ui_attach()| for the
-    given namespace {ns}.
+     ---
+     -- Wait for 100 ms, allowing other events to process
+     vim.wait(100, function() end)
 
-vim.type_idx                                                    *vim.type_idx*
-    Type index for use in |lua-special-tbl|. Specifying one of the values from
-    |vim.types| allows typing the empty table (it is unclear whether empty Lua
-    table represents empty list or empty array) and forcing integral numbers
-    to be |Float|. See |lua-special-tbl| for more details.
+     ---
+     -- Wait for 100 ms or until global variable set.
+     vim.wait(100, function() return vim.g.waiting_for_var end)
 
-vim.val_idx                                                      *vim.val_idx*
-    Value index for tables representing |Float|s. A table representing
-    floating-point value 1.0 looks like this: >lua
-        {
-          [vim.type_idx] = vim.types.float,
-          [vim.val_idx] = 1.0,
-        }
-<    See also |vim.type_idx| and |lua-special-tbl|.
+     ---
+     -- Wait for 1 second or until global variable set, checking every ~500 ms
+     vim.wait(1000, function() return vim.g.waiting_for_var end, 500)
 
-vim.types                                                          *vim.types*
-    Table with possible values for |vim.type_idx|. Contains two sets of
-    key-value pairs: first maps possible values for |vim.type_idx| to
-    human-readable strings, second maps human-readable type names to values
-    for |vim.type_idx|. Currently contains pairs for `float`, `array` and
-        `dictionary` types.
+     ---
+     -- Schedule a function to set a value in 100ms
+     vim.defer_fn(function() vim.g.timer_result = true end, 100)
 
-    Note: One must expect that values corresponding to `vim.types.float`,
-    `vim.types.array` and `vim.types.dictionary` fall under only two following
-    assumptions:
-    1. Value may serve both as a key and as a value in a table. Given the
-       properties of Lua tables this basically means “value is not `nil`”.
-    2. For each value in `vim.types` table `vim.types[vim.types[value]]` is the
-       same as `value`.
-    No other restrictions are put on types, and it is not guaranteed that
-    values corresponding to `vim.types.float`, `vim.types.array` and
-    `vim.types.dictionary` will not change or that `vim.types` table will only
-    contain values for these three types.
+     -- Would wait ten seconds if results blocked. Actually only waits  100 ms
+     if vim.wait(10000, function() return vim.g.timer_result end) then
+       print('Only waiting a little bit of time!')
+     end
+<
 
-                                                   *log_levels* *vim.log.levels*
-Log levels are one of the values defined in `vim.log.levels`:
+    Parameters: ~
+      • {time}       (integer) Number of milliseconds to wait
+      • {callback}   fun():|nil boolean Optional callback. Waits until
+                     {callback} returns true
+      • {interval}   (integer|nil) (Approximate) number of milliseconds to
+                     wait between polls
+      • {fast_only}  (boolean|nil) If true, only |api-fast| events will be
+                     processed. If called from while in an |api-fast| event,
+                     will automatically be set to `true`.
 
-    vim.log.levels.DEBUG
-    vim.log.levels.ERROR
-    vim.log.levels.INFO
-    vim.log.levels.TRACE
-    vim.log.levels.WARN
-    vim.log.levels.OFF
+    Return: ~
+        boolean, nil|-1|-2
+        • If {callback} returns `true` during the {time}: `true, nil`
+        • If {callback} never returns `true` during the {time}: `false, -1`
+        • If {callback} is interrupted during the {time}: `false, -2`
+        • If {callback} errors, the error is raised.
 
-------------------------------------------------------------------------------
+
+==============================================================================
 LUA-VIMSCRIPT BRIDGE                                           *lua-vimscript*
 
+
 Nvim Lua provides an interface or "bridge" to Vimscript variables and
 functions, and editor commands and options.
 
 Objects passed over this bridge are COPIED (marshalled): there are no
-"references". |lua-guide-variables| For example, using `vim.fn.remove()` on
-a Lua list copies the list object to Vimscript and does NOT modify the Lua
-list: >lua
-
+"references". |lua-guide-variables| For example, using `vim.fn.remove()`
+on a Lua list copies the list object to Vimscript and does NOT modify the
+Lua list: >lua
     local list = { 1, 2, 3 }
     vim.fn.remove(list, 0)
     vim.print(list)  --> "{ 1, 2, 3 }"
-
+<
 
 vim.call({func}, {...})                                           *vim.call()*
     Invokes |vim-function| or |user-function| {func} with arguments {...}.
     See also |vim.fn|.
     Equivalent to: >lua
         vim.fn[func]({...})
-
+<
 vim.cmd({command})
     See |vim.cmd()|.
 
@@ -1115,7 +1202,7 @@ vim.env                                                              *vim.env*
         print(vim.env.TERM)
 <
 
-                                                                 *lua-options*
+` `                                                                *lua-options*
                                                              *lua-vim-options*
                                                                  *lua-vim-set*
                                                             *lua-vim-setlocal*
@@ -1149,6 +1236,7 @@ vim.o                                                                  *vim.o*
         print(vim.o.columns)
         print(vim.o.foo)     -- error: invalid key
 <
+
 vim.go                                                                *vim.go*
     Get or set global |options|. Like `:setglobal`. Invalid key is
     an error.
@@ -1162,6 +1250,7 @@ vim.go                                                                *vim.go*
         print(vim.go.columns)
         print(vim.go.bar)     -- error: invalid key
 <
+
 vim.bo[{bufnr}]                                                                *vim.bo*
     Get or set buffer-scoped |options| for the buffer with number {bufnr}.
     Like `:set` and `:setlocal`. If [{bufnr}] is omitted then the current
@@ -1174,7 +1263,7 @@ vim.bo[{bufnr}]                                                                *
         vim.bo[bufnr].buflisted = true    -- same as vim.bo.buflisted = true
         print(vim.bo.comments)
         print(vim.bo.baz)                 -- error: invalid key
-<
+
 vim.wo[{winid}][{bufnr}]                                                       *vim.wo*
     Get or set window-scoped |options| for the window with handle {winid} and
     buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
@@ -1192,13 +1281,10 @@ vim.wo[{winid}][{bufnr}]                                                       *
         vim.wo[winid][0].spell = false -- like ':setlocal nospell'
 <
 
-
-
-                                                                        *vim.opt_local*
+` `                                                                       *vim.opt_local*
                                                                        *vim.opt_global*
                                                                               *vim.opt*
 
-
 A special interface |vim.opt| exists for conveniently interacting with list-
 and map-style option from Lua: It allows accessing them as Lua tables and
 offers object-oriented method for adding and removing entries.
@@ -1258,11 +1344,18 @@ In any of the above examples, to replicate the behavior |:setlocal|, use
 `vim.opt_local`. Additionally, to replicate the behavior of |:setglobal|, use
 `vim.opt_global`.
 
+Option:append({value})                                      *vim.opt:append()*
+    Append a value to string-style options. See |:set+=|
 
+    These are equivalent: >lua
+        vim.opt.formatoptions:append('j')
+        vim.opt.formatoptions = vim.opt.formatoptions + 'j'
+<
 
-                                                               *vim.opt:get()*
-Option:get()
+    Parameters: ~
+      • {value}  (string) Value to append
 
+Option:get()                                                   *vim.opt:get()*
     Returns a Lua-representation of the option. Boolean, number and string
     values will be returned in exactly the same fashion.
 
@@ -1279,6 +1372,7 @@ Option:get()
         -- Will ignore: *.pyc
         -- Will ignore: *.o
 <
+
     For values that are comma-separated maps, a table will be returned with
     the names as keys and the values as entries: >lua
         vim.cmd [[set listchars=space:_,tab:>~]]
@@ -1290,6 +1384,7 @@ Option:get()
             print(char, "=>", representation)
         end
 <
+
     For values that are lists of flags, a set will be returned with the flags
     as keys and `true` as entries. >lua
         vim.cmd [[set formatoptions=njtcroql]]
@@ -1302,27 +1397,22 @@ Option:get()
             print("J is enabled!")
         end
 <
-                                                            *vim.opt:append()*
-Option:append(value)
 
-    Append a value to string-style options. See |:set+=|
-
-    These are equivalent: >lua
-        vim.opt.formatoptions:append('j')
-        vim.opt.formatoptions = vim.opt.formatoptions + 'j'
-<
-                                                           *vim.opt:prepend()*
-Option:prepend(value)
+    Return: ~
+        string|integer|boolean|nil value of option
 
+Option:prepend({value})                                    *vim.opt:prepend()*
     Prepend a value to string-style options. See |:set^=|
 
     These are equivalent: >lua
         vim.opt.wildignore:prepend('*.o')
         vim.opt.wildignore = vim.opt.wildignore ^ '*.o'
 <
-                                                            *vim.opt:remove()*
-Option:remove(value)
 
+    Parameters: ~
+      • {value}  (string) Value to prepend
+
+Option:remove({value})                                      *vim.opt:remove()*
     Remove a value from string-style options. See |:set-=|
 
     These are equivalent: >lua
@@ -1330,10 +1420,14 @@ Option:remove(value)
         vim.opt.wildignore = vim.opt.wildignore - '*.pyc'
 <
 
+    Parameters: ~
+      • {value}  (string) Value to remove
+
+
 ==============================================================================
 Lua module: vim                                                      *lua-vim*
 
-cmd({command})                                                     *vim.cmd()*
+vim.cmd({command})                                                 *vim.cmd()*
     Execute Vim script commands.
 
     Note that `vim.cmd` can be indexed with a command name to return a
@@ -1379,10 +1473,10 @@ cmd({command})                                                     *vim.cmd()*
       • |ex-cmd-index|
 
                                              *vim.connection_failure_errmsg()*
-connection_failure_errmsg({consequence})
+vim.connection_failure_errmsg({consequence})
     TODO: Documentation
 
-defer_fn({fn}, {timeout})                                     *vim.defer_fn()*
+vim.defer_fn({fn}, {timeout})                                 *vim.defer_fn()*
     Defers calling {fn} until {timeout} ms passes.
 
     Use to do a one-shot timer that calls {fn} Note: The {fn} is
@@ -1397,7 +1491,7 @@ defer_fn({fn}, {timeout})                                     *vim.defer_fn()*
         (table) timer luv timer object
 
                                                              *vim.deprecate()*
-deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
+vim.deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
     Shows a deprecation message to the user.
 
     Parameters: ~
@@ -1411,7 +1505,7 @@ deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
     Return: ~
         (string|nil) # Deprecated message, or nil if no message was shown.
 
-inspect({object}, {options})                                   *vim.inspect()*
+vim.inspect({object}, {options})                               *vim.inspect()*
     Gets a human-readable representation of the given object.
 
     See also: ~
@@ -1419,7 +1513,7 @@ inspect({object}, {options})                                   *vim.inspect()*
       • https://github.com/kikito/inspect.lua
       • https://github.com/mpeterv/vinspect
 
-keycode({str})                                                 *vim.keycode()*
+vim.keycode({str})                                             *vim.keycode()*
     Translate keycodes.
 
     Example: >lua
@@ -1437,13 +1531,13 @@ keycode({str})                                                 *vim.keycode()*
     See also: ~
       • |nvim_replace_termcodes()|
 
-lua_omnifunc({find_start}, {_})                           *vim.lua_omnifunc()*
+vim.lua_omnifunc({find_start}, {_})                       *vim.lua_omnifunc()*
     Omnifunc for completing Lua values from the runtime Lua interpreter,
     similar to the builtin completion for the `:lua` command.
 
     Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a Lua buffer.
 
-notify({msg}, {level}, {opts})                                  *vim.notify()*
+vim.notify({msg}, {level}, {opts})                              *vim.notify()*
     Display a notification to the user.
 
     This function can be overridden by plugins to display notifications using
@@ -1455,7 +1549,7 @@ notify({msg}, {level}, {opts})                                  *vim.notify()*
       • {level}  (integer|nil) One of the values from |vim.log.levels|.
       • {opts}   (table|nil) Optional parameters. Unused by default.
 
-notify_once({msg}, {level}, {opts})                        *vim.notify_once()*
+vim.notify_once({msg}, {level}, {opts})                    *vim.notify_once()*
     Display a notification only one time.
 
     Like |vim.notify()|, but subsequent calls with the same message will not
@@ -1469,7 +1563,7 @@ notify_once({msg}, {level}, {opts})                        *vim.notify_once()*
     Return: ~
         (boolean) true if message was displayed, else false
 
-on_key({fn}, {ns_id})                                           *vim.on_key()*
+vim.on_key({fn}, {ns_id})                                       *vim.on_key()*
     Adds Lua function {fn} with namespace id {ns_id} as a listener to every,
     yes every, input key.
 
@@ -1492,7 +1586,7 @@ on_key({fn}, {ns_id})                                           *vim.on_key()*
         (integer) Namespace id associated with {fn}. Or count of all callbacks
         if on_key() is called without arguments.
 
-paste({lines}, {phase})                                          *vim.paste()*
+vim.paste({lines}, {phase})                                      *vim.paste()*
     Paste handler, invoked by |nvim_paste()| when a conforming UI (such as the
     |TUI|) pastes text into the editor.
 
@@ -1524,7 +1618,7 @@ paste({lines}, {phase})                                          *vim.paste()*
     See also: ~
       • |paste| @alias paste_phase -1 | 1 | 2 | 3
 
-print({...})                                                     *vim.print()*
+vim.print({...})                                                 *vim.print()*
     "Pretty prints" the given arguments and returns them unmodified.
 
     Example: >lua
@@ -1539,7 +1633,8 @@ print({...})                                                     *vim.print()*
       • |vim.inspect()|
       • |:=|
 
-region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
+                                                                *vim.region()*
+vim.region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})
     Gets a dict of line segment ("chunk") positions for the region from `pos1`
     to `pos2`.
 
@@ -1562,7 +1657,7 @@ region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})         *vim.region()*
         `endcol` is exclusive, and whole lines are returned as
         `{startcol,endcol} = {0,-1}`.
 
-schedule_wrap({cb})                                      *vim.schedule_wrap()*
+vim.schedule_wrap({cb})                                  *vim.schedule_wrap()*
     Defers callback `cb` until the Nvim API is safe to call.
 
     Parameters: ~
@@ -1576,7 +1671,7 @@ schedule_wrap({cb})                                      *vim.schedule_wrap()*
       • |vim.schedule()|
       • |vim.in_fast_event()|
 
-system({cmd}, {opts}, {on_exit})                                *vim.system()*
+vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
     Run a system command
 
     Examples: >lua
@@ -1649,9 +1744,9 @@ system({cmd}, {opts}, {on_exit})                                *vim.system()*
 
 
 ==============================================================================
-Lua module: inspector                                          *lua-inspector*
+Lua module: vim.inspector                                      *lua-inspector*
 
-inspect_pos({bufnr}, {row}, {col}, {filter})               *vim.inspect_pos()*
+vim.inspect_pos({bufnr}, {row}, {col}, {filter})           *vim.inspect_pos()*
     Get all the items at a given buffer position.
 
     Can also be pretty-printed with `:Inspect!`.                   *:Inspect!*
@@ -1684,7 +1779,7 @@ inspect_pos({bufnr}, {row}, {col}, {filter})               *vim.inspect_pos()*
         • row: the row used to get the items
         • col: the col used to get the items
 
-show_pos({bufnr}, {row}, {col}, {filter})                     *vim.show_pos()*
+vim.show_pos({bufnr}, {row}, {col}, {filter})                 *vim.show_pos()*
     Show all the items at a given buffer position.
 
     Can also be shown with `:Inspect`.                              *:Inspect*
@@ -1700,7 +1795,7 @@ show_pos({bufnr}, {row}, {col}, {filter})                     *vim.show_pos()*
 
 
 
-deep_equal({a}, {b})                                        *vim.deep_equal()*
+vim.deep_equal({a}, {b})                                    *vim.deep_equal()*
     Deep compare values for equality
 
     Tables are compared recursively unless they both provide the `eq` metamethod. All other types are compared using the equality `==` operator.
@@ -1712,7 +1807,7 @@ deep_equal({a}, {b})                                        *vim.deep_equal()*
     Return: ~
         (boolean) `true` if values are equals, else `false`
 
-deepcopy({orig})                                              *vim.deepcopy()*
+vim.deepcopy({orig})                                          *vim.deepcopy()*
     Returns a deep copy of the given object. Non-table objects are copied as
     in a typical Lua assignment, whereas table objects are copied recursively.
     Functions are naively copied, so functions in the copied table point to
@@ -1725,7 +1820,7 @@ deepcopy({orig})                                              *vim.deepcopy()*
     Return: ~
         (table) Table of copied keys and (nested) values.
 
-defaulttable({create})                                    *vim.defaulttable()*
+vim.defaulttable({create})                                *vim.defaulttable()*
     Creates a table whose members are automatically created when accessed, if
     they don't already exist.
 
@@ -1748,7 +1843,7 @@ defaulttable({create})                                    *vim.defaulttable()*
     Return: ~
         (table) Empty table with metamethod
 
-endswith({s}, {suffix})                                       *vim.endswith()*
+vim.endswith({s}, {suffix})                                   *vim.endswith()*
     Tests if `s` ends with `suffix`.
 
     Parameters: ~
@@ -1758,7 +1853,7 @@ endswith({s}, {suffix})                                       *vim.endswith()*
     Return: ~
         (boolean) `true` if `suffix` is a suffix of `s`
 
-gsplit({s}, {sep}, {opts})                                      *vim.gsplit()*
+vim.gsplit({s}, {sep}, {opts})                                  *vim.gsplit()*
     Splits a string at each instance of a separator.
 
     Example: >lua
@@ -1794,7 +1889,7 @@ gsplit({s}, {sep}, {opts})                                      *vim.gsplit()*
       • https://www.lua.org/pil/20.2.html
       • http://lua-users.org/wiki/StringLibraryTutorial
 
-is_callable({f})                                           *vim.is_callable()*
+vim.is_callable({f})                                       *vim.is_callable()*
     Returns true if object `f` can be called as a function.
 
     Parameters: ~
@@ -1803,7 +1898,7 @@ is_callable({f})                                           *vim.is_callable()*
     Return: ~
         (boolean) `true` if `f` is callable, else `false`
 
-list_contains({t}, {value})                              *vim.list_contains()*
+vim.list_contains({t}, {value})                          *vim.list_contains()*
     Checks if a list-like table (integer keys without gaps) contains `value`.
 
     Parameters: ~
@@ -1816,7 +1911,7 @@ list_contains({t}, {value})                              *vim.list_contains()*
     See also: ~
       • |vim.tbl_contains()| for checking values in general tables
 
-list_extend({dst}, {src}, {start}, {finish})               *vim.list_extend()*
+vim.list_extend({dst}, {src}, {start}, {finish})           *vim.list_extend()*
     Extends a list-like table with the values of another list-like table.
 
     NOTE: This mutates dst!
@@ -1833,7 +1928,7 @@ list_extend({dst}, {src}, {start}, {finish})               *vim.list_extend()*
     See also: ~
       • |vim.tbl_extend()|
 
-list_slice({list}, {start}, {finish})                       *vim.list_slice()*
+vim.list_slice({list}, {start}, {finish})                   *vim.list_slice()*
     Creates a copy of a table containing only elements from start to end
     (inclusive)
 
@@ -1845,7 +1940,7 @@ list_slice({list}, {start}, {finish})                       *vim.list_slice()*
     Return: ~
         (list) Copy of table sliced from start to finish (inclusive)
 
-pesc({s})                                                         *vim.pesc()*
+vim.pesc({s})                                                     *vim.pesc()*
     Escapes magic chars in |lua-patterns|.
 
     Parameters: ~
@@ -1857,7 +1952,7 @@ pesc({s})                                                         *vim.pesc()*
     See also: ~
       • https://github.com/rxi/lume
 
-ringbuf({size})                                                *vim.ringbuf()*
+vim.ringbuf({size})                                            *vim.ringbuf()*
     Create a ring buffer limited to a maximal number of items. Once the buffer
     is full, adding a new entry overrides the oldest entry.
 >
@@ -1890,28 +1985,28 @@ ringbuf({size})                                                *vim.ringbuf()*
     Return: ~
         (table)
 
-Ringbuf:clear()                                              *Ringbuf:clear()*
+vim.Ringbuf:clear()                                          *Ringbuf:clear()*
     Clear all items.
 
-Ringbuf:peek()                                                *Ringbuf:peek()*
+vim.Ringbuf:peek()                                            *Ringbuf:peek()*
     Returns the first unread item without removing it
 
     Return: ~
         any?|ni
 
-Ringbuf:pop()                                                  *Ringbuf:pop()*
+vim.Ringbuf:pop()                                              *Ringbuf:pop()*
     Removes and returns the first unread item
 
     Return: ~
         any?|ni
 
-Ringbuf:push({item})                                          *Ringbuf:push()*
+vim.Ringbuf:push({item})                                      *Ringbuf:push()*
     Adds an item, overriding the oldest item if the buffer is full.
 
     Parameters: ~
       • {item}  any
 
-spairs({t})                                                     *vim.spairs()*
+vim.spairs({t})                                                 *vim.spairs()*
     Enumerate a table sorted by its keys.
 
     Parameters: ~
@@ -1923,7 +2018,7 @@ spairs({t})                                                     *vim.spairs()*
     See also: ~
       • Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
-split({s}, {sep}, {opts})                                        *vim.split()*
+vim.split({s}, {sep}, {opts})                                    *vim.split()*
     Splits a string at each instance of a separator.
 
     Examples: >lua
@@ -1947,7 +2042,7 @@ split({s}, {sep}, {opts})                                        *vim.split()*
       • |vim.gsplit()|
       • |string.gmatch()|
 
-startswith({s}, {prefix})                                   *vim.startswith()*
+vim.startswith({s}, {prefix})                               *vim.startswith()*
     Tests if `s` starts with `prefix`.
 
     Parameters: ~
@@ -1957,7 +2052,7 @@ startswith({s}, {prefix})                                   *vim.startswith()*
     Return: ~
         (boolean) `true` if `prefix` is a prefix of `s`
 
-tbl_add_reverse_lookup({o})                     *vim.tbl_add_reverse_lookup()*
+vim.tbl_add_reverse_lookup({o})                 *vim.tbl_add_reverse_lookup()*
     Add the reverse lookup values to an existing table. For example:
     `tbl_add_reverse_lookup { A = 1 } == { [1] = 'A', A = 1 }`
 
@@ -1969,7 +2064,7 @@ tbl_add_reverse_lookup({o})                     *vim.tbl_add_reverse_lookup()*
     Return: ~
         (table) o
 
-tbl_contains({t}, {value}, {opts})                        *vim.tbl_contains()*
+vim.tbl_contains({t}, {value}, {opts})                    *vim.tbl_contains()*
     Checks if a table contains a given value, specified either directly or via
     a predicate that is checked for each value.
 
@@ -1994,7 +2089,7 @@ tbl_contains({t}, {value}, {opts})                        *vim.tbl_contains()*
     See also: ~
       • |vim.list_contains()| for checking values in list-like tables
 
-tbl_count({t})                                               *vim.tbl_count()*
+vim.tbl_count({t})                                           *vim.tbl_count()*
     Counts the number of non-nil values in table `t`.
 
     >lua
@@ -2012,7 +2107,7 @@ tbl_count({t})                                               *vim.tbl_count()*
     See also: ~
       • https://github.com/Tieske/Penlight/blob/master/lua/pl/tablex.lua
 
-tbl_deep_extend({behavior}, {...})                     *vim.tbl_deep_extend()*
+vim.tbl_deep_extend({behavior}, {...})                 *vim.tbl_deep_extend()*
     Merges recursively two or more tables.
 
     Parameters: ~
@@ -2029,7 +2124,7 @@ tbl_deep_extend({behavior}, {...})                     *vim.tbl_deep_extend()*
     See also: ~
       • |vim.tbl_extend()|
 
-tbl_extend({behavior}, {...})                               *vim.tbl_extend()*
+vim.tbl_extend({behavior}, {...})                           *vim.tbl_extend()*
     Merges two or more tables.
 
     Parameters: ~
@@ -2046,7 +2141,7 @@ tbl_extend({behavior}, {...})                               *vim.tbl_extend()*
     See also: ~
       • |extend()|
 
-tbl_filter({func}, {t})                                     *vim.tbl_filter()*
+vim.tbl_filter({func}, {t})                                 *vim.tbl_filter()*
     Filter a table using a predicate function
 
     Parameters: ~
@@ -2056,7 +2151,7 @@ tbl_filter({func}, {t})                                     *vim.tbl_filter()*
     Return: ~
         (table) Table of filtered values
 
-tbl_flatten({t})                                           *vim.tbl_flatten()*
+vim.tbl_flatten({t})                                       *vim.tbl_flatten()*
     Creates a copy of a list-like table such that any nested tables are
     "unrolled" and appended to the result.
 
@@ -2069,7 +2164,7 @@ tbl_flatten({t})                                           *vim.tbl_flatten()*
     See also: ~
       • From https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
-tbl_get({o}, {...})                                            *vim.tbl_get()*
+vim.tbl_get({o}, {...})                                        *vim.tbl_get()*
     Index into a table (first argument) via string keys passed as subsequent
     arguments. Return `nil` if the key does not exist.
 
@@ -2087,7 +2182,7 @@ tbl_get({o}, {...})                                            *vim.tbl_get()*
     Return: ~
         any Nested value indexed by key (if it exists), else nil
 
-tbl_isarray({t})                                           *vim.tbl_isarray()*
+vim.tbl_isarray({t})                                       *vim.tbl_isarray()*
     Tests if a Lua table can be treated as an array (a table indexed by
     integers).
 
@@ -2101,7 +2196,7 @@ tbl_isarray({t})                                           *vim.tbl_isarray()*
     Return: ~
         (boolean) `true` if array-like table, else `false`.
 
-tbl_isempty({t})                                           *vim.tbl_isempty()*
+vim.tbl_isempty({t})                                       *vim.tbl_isempty()*
     Checks if a table is empty.
 
     Parameters: ~
@@ -2113,7 +2208,7 @@ tbl_isempty({t})                                           *vim.tbl_isempty()*
     See also: ~
       • https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
-tbl_islist({t})                                             *vim.tbl_islist()*
+vim.tbl_islist({t})                                         *vim.tbl_islist()*
     Tests if a Lua table can be treated as a list (a table indexed by
     consecutive integers starting from 1).
 
@@ -2127,7 +2222,7 @@ tbl_islist({t})                                             *vim.tbl_islist()*
     Return: ~
         (boolean) `true` if list-like table, else `false`.
 
-tbl_keys({t})                                                 *vim.tbl_keys()*
+vim.tbl_keys({t})                                             *vim.tbl_keys()*
     Return a list of all keys used in a table. However, the order of the
     return table of keys is not guaranteed.
 
@@ -2140,7 +2235,7 @@ tbl_keys({t})                                                 *vim.tbl_keys()*
     See also: ~
       • From https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
-tbl_map({func}, {t})                                           *vim.tbl_map()*
+vim.tbl_map({func}, {t})                                       *vim.tbl_map()*
     Apply a function to all values of a table.
 
     Parameters: ~
@@ -2150,7 +2245,7 @@ tbl_map({func}, {t})                                           *vim.tbl_map()*
     Return: ~
         (table) Table of transformed values
 
-tbl_values({t})                                             *vim.tbl_values()*
+vim.tbl_values({t})                                         *vim.tbl_values()*
     Return a list of all values used in a table. However, the order of the
     return table of values is not guaranteed.
 
@@ -2160,7 +2255,7 @@ tbl_values({t})                                             *vim.tbl_values()*
     Return: ~
         (list) List of values
 
-trim({s})                                                         *vim.trim()*
+vim.trim({s})                                                     *vim.trim()*
     Trim whitespace (Lua pattern "%s") from both sides of a string.
 
     Parameters: ~
@@ -2173,7 +2268,7 @@ trim({s})                                                         *vim.trim()*
       • |luaref-patterns|
       • https://www.lua.org/pil/20.2.html
 
-validate({opt})                                               *vim.validate()*
+vim.validate({opt})                                           *vim.validate()*
     Validates a parameter specification (types and values).
 
     Usage example: >lua
@@ -2229,21 +2324,21 @@ validate({opt})                                               *vim.validate()*
 
 
 ==============================================================================
-Lua module: loader                                                *lua-loader*
+Lua module: vim.loader                                            *lua-loader*
 
-disable()                                               *vim.loader.disable()*
+vim.loader.disable()                                    *vim.loader.disable()*
     Disables the experimental Lua module loader:
     • removes the loaders
     • adds the default Nvim loader
 
-enable()                                                 *vim.loader.enable()*
+vim.loader.enable()                                      *vim.loader.enable()*
     Enables the experimental Lua module loader:
     • overrides loadfile
     • adds the Lua loader using the byte-compilation cache
     • adds the libs loader
     • removes the default Nvim loader
 
-find({modname}, {opts})                                    *vim.loader.find()*
+vim.loader.find({modname}, {opts})                         *vim.loader.find()*
     Finds Lua modules for the given module name.
 
     Parameters: ~
@@ -2268,7 +2363,7 @@ find({modname}, {opts})                                    *vim.loader.find()*
         • stat: (table|nil) the fs_stat of the module path. Won't be returned
           for `modname="*"`
 
-reset({path})                                             *vim.loader.reset()*
+vim.loader.reset({path})                                  *vim.loader.reset()*
     Resets the cache for the path, or all the paths if path is nil.
 
     Parameters: ~
@@ -2276,9 +2371,9 @@ reset({path})                                             *vim.loader.reset()*
 
 
 ==============================================================================
-Lua module: uri                                                      *lua-uri*
+Lua module: vim.uri                                                  *lua-uri*
 
-uri_from_bufnr({bufnr})                                 *vim.uri_from_bufnr()*
+vim.uri_from_bufnr({bufnr})                             *vim.uri_from_bufnr()*
     Get a URI from a bufnr
 
     Parameters: ~
@@ -2287,7 +2382,7 @@ uri_from_bufnr({bufnr})                                 *vim.uri_from_bufnr()*
     Return: ~
         (string) URI
 
-uri_from_fname({path})                                  *vim.uri_from_fname()*
+vim.uri_from_fname({path})                              *vim.uri_from_fname()*
     Get a URI from a file path.
 
     Parameters: ~
@@ -2296,7 +2391,7 @@ uri_from_fname({path})                                  *vim.uri_from_fname()*
     Return: ~
         (string) URI
 
-uri_to_bufnr({uri})                                       *vim.uri_to_bufnr()*
+vim.uri_to_bufnr({uri})                                   *vim.uri_to_bufnr()*
     Get the buffer for a uri. Creates a new unloaded buffer if no buffer for
     the uri already exists.
 
@@ -2306,7 +2401,7 @@ uri_to_bufnr({uri})                                       *vim.uri_to_bufnr()*
     Return: ~
         (integer) bufnr
 
-uri_to_fname({uri})                                       *vim.uri_to_fname()*
+vim.uri_to_fname({uri})                                   *vim.uri_to_fname()*
     Get a filename from a URI
 
     Parameters: ~
@@ -2317,9 +2412,9 @@ uri_to_fname({uri})                                       *vim.uri_to_fname()*
 
 
 ==============================================================================
-Lua module: ui                                                        *lua-ui*
+Lua module: vim.ui                                                    *lua-ui*
 
-input({opts}, {on_confirm})                                   *vim.ui.input()*
+vim.ui.input({opts}, {on_confirm})                            *vim.ui.input()*
     Prompts the user for input, allowing arbitrary (potentially asynchronous)
     work until `on_confirm`.
 
@@ -2345,7 +2440,7 @@ input({opts}, {on_confirm})                                   *vim.ui.input()*
                       typed (it might be an empty string if nothing was
                       entered), or `nil` if the user aborted the dialog.
 
-open({path})                                                   *vim.ui.open()*
+vim.ui.open({path})                                            *vim.ui.open()*
     Opens `path` with the system default handler (macOS `open`, Windows
     `explorer.exe`, Linux `xdg-open`, …), or returns (but does not show) an
     error message on failure.
@@ -2369,7 +2464,7 @@ open({path})                                                   *vim.ui.open()*
     See also: ~
       • |vim.system()|
 
-select({items}, {opts}, {on_choice})                         *vim.ui.select()*
+vim.ui.select({items}, {opts}, {on_choice})                  *vim.ui.select()*
     Prompts the user to pick from a list of items, allowing arbitrary
     (potentially asynchronous) work until `on_choice`.
 
@@ -2407,9 +2502,9 @@ select({items}, {opts}, {on_choice})                         *vim.ui.select()*
 
 
 ==============================================================================
-Lua module: filetype                                            *lua-filetype*
+Lua module: vim.filetype                                        *lua-filetype*
 
-add({filetypes})                                          *vim.filetype.add()*
+vim.filetype.add({filetypes})                             *vim.filetype.add()*
     Add new filetype mappings.
 
     Filetype mappings can be added either by extension or by filename (either
@@ -2495,7 +2590,8 @@ add({filetypes})                                          *vim.filetype.add()*
       • {filetypes}  (table) A table containing new filetype maps (see
                      example).
 
-get_option({filetype}, {option})                   *vim.filetype.get_option()*
+                                                   *vim.filetype.get_option()*
+vim.filetype.get_option({filetype}, {option})
     Get the default option value for a {filetype}.
 
     The returned value is what would be set in a new buffer after 'filetype'
@@ -2518,7 +2614,7 @@ get_option({filetype}, {option})                   *vim.filetype.get_option()*
     Return: ~
         string|boolean|integer: Option value
 
-match({args})                                           *vim.filetype.match()*
+vim.filetype.match({args})                              *vim.filetype.match()*
     Perform filetype detection.
 
     The filetype can be detected using one of three methods:
@@ -2574,9 +2670,9 @@ match({args})                                           *vim.filetype.match()*
 
 
 ==============================================================================
-Lua module: keymap                                                *lua-keymap*
+Lua module: vim.keymap                                            *lua-keymap*
 
-del({modes}, {lhs}, {opts})                                 *vim.keymap.del()*
+vim.keymap.del({modes}, {lhs}, {opts})                      *vim.keymap.del()*
     Remove an existing mapping. Examples: >lua
 
        vim.keymap.del('n', 'lhs')
@@ -2592,7 +2688,7 @@ del({modes}, {lhs}, {opts})                                 *vim.keymap.del()*
     See also: ~
       • |vim.keymap.set()|
 
-set({mode}, {lhs}, {rhs}, {opts})                           *vim.keymap.set()*
+vim.keymap.set({mode}, {lhs}, {rhs}, {opts})                *vim.keymap.set()*
     Adds a new |mapping|. Examples: >lua
 
        -- Map to a Lua function:
@@ -2634,9 +2730,9 @@ set({mode}, {lhs}, {rhs}, {opts})                           *vim.keymap.set()*
 
 
 ==============================================================================
-Lua module: fs                                                        *lua-fs*
+Lua module: vim.fs                                                    *lua-fs*
 
-basename({file})                                           *vim.fs.basename()*
+vim.fs.basename({file})                                    *vim.fs.basename()*
     Return the basename of the given file or directory
 
     Parameters: ~
@@ -2645,7 +2741,7 @@ basename({file})                                           *vim.fs.basename()*
     Return: ~
         (string|nil) Basename of {file}
 
-dir({path}, {opts})                                             *vim.fs.dir()*
+vim.fs.dir({path}, {opts})                                      *vim.fs.dir()*
     Return an iterator over the files and directories located in {path}
 
     Parameters: ~
@@ -2663,7 +2759,7 @@ dir({path}, {opts})                                             *vim.fs.dir()*
         two values: name and type. Each "name" is the basename of the file or
         directory relative to {path}. Type is one of "file" or "directory".
 
-dirname({file})                                             *vim.fs.dirname()*
+vim.fs.dirname({file})                                      *vim.fs.dirname()*
     Return the parent directory of the given file or directory
 
     Parameters: ~
@@ -2672,7 +2768,7 @@ dirname({file})                                             *vim.fs.dirname()*
     Return: ~
         (string|nil) Parent directory of {file}
 
-find({names}, {opts})                                          *vim.fs.find()*
+vim.fs.find({names}, {opts})                                   *vim.fs.find()*
     Find files or directories in the given path.
 
     Finds any files or directories given in {names} starting from {path}. If
@@ -2734,7 +2830,7 @@ find({names}, {opts})                                          *vim.fs.find()*
         (table) Normalized paths |vim.fs.normalize()| of all matching files or
         directories
 
-joinpath({...})                                            *vim.fs.joinpath()*
+vim.fs.joinpath({...})                                     *vim.fs.joinpath()*
     Concatenate directories and/or file paths into a single path with
     normalization (e.g., `"foo/"` and `"bar"` get joined to `"foo/bar"`)
 
@@ -2744,7 +2840,7 @@ joinpath({...})                                            *vim.fs.joinpath()*
     Return: ~
         (string)
 
-normalize({path}, {opts})                                 *vim.fs.normalize()*
+vim.fs.normalize({path}, {opts})                          *vim.fs.normalize()*
     Normalize a path to a standard format. A tilde (~) character at the
     beginning of the path is expanded to the user's home directory and any
     backslash (\) characters are converted to forward slashes (/). Environment
@@ -2771,7 +2867,7 @@ normalize({path}, {opts})                                 *vim.fs.normalize()*
     Return: ~
         (string) Normalized path
 
-parents({start})                                            *vim.fs.parents()*
+vim.fs.parents({start})                                     *vim.fs.parents()*
     Iterate over all the parents of the given file or directory.
 
     Example: >lua
@@ -2797,9 +2893,9 @@ parents({start})                                            *vim.fs.parents()*
 
 
 ==============================================================================
-Lua module: secure                                                *lua-secure*
+Lua module: vim.secure                                            *lua-secure*
 
-read({path})                                               *vim.secure.read()*
+vim.secure.read({path})                                    *vim.secure.read()*
     Attempt to read the file at {path} prompting the user if the file should
     be trusted. The user's choice is persisted in a trust database at
     $XDG_STATE_HOME/nvim/trust.
@@ -2814,7 +2910,7 @@ read({path})                                               *vim.secure.read()*
     See also: ~
       • |:trust|
 
-trust({opts})                                             *vim.secure.trust()*
+vim.secure.trust({opts})                                  *vim.secure.trust()*
     Manage the trust database.
 
     The trust database is located at |$XDG_STATE_HOME|/nvim/trust.
@@ -2837,7 +2933,7 @@ trust({opts})                                             *vim.secure.trust()*
 
 
 ==============================================================================
-Lua module: version                                              *lua-version*
+Lua module: vim.version                                          *lua-version*
 
 
 The `vim.version` module provides functions for comparing versions and
@@ -2897,7 +2993,7 @@ versions (1.2.3-rc1) are not matched. >
 
 <
 
-cmp({v1}, {v2})                                            *vim.version.cmp()*
+vim.version.cmp({v1}, {v2})                                *vim.version.cmp()*
     Parses and compares two version objects (the result of
     |vim.version.parse()|, or specified literally as a `{major, minor, patch}`
     tuple, e.g. `{1, 0, 3}`).
@@ -2925,7 +3021,7 @@ cmp({v1}, {v2})                                            *vim.version.cmp()*
     Return: ~
         (integer) -1 if `v1 < v2`, 0 if `v1 == v2`, 1 if `v1 > v2`.
 
-eq({v1}, {v2})                                              *vim.version.eq()*
+vim.version.eq({v1}, {v2})                                  *vim.version.eq()*
     Returns `true` if the given versions are equal. See |vim.version.cmp()| for usage.
 
     Parameters: ~
@@ -2935,7 +3031,7 @@ eq({v1}, {v2})                                              *vim.version.eq()*
     Return: ~
         (boolean)
 
-gt({v1}, {v2})                                              *vim.version.gt()*
+vim.version.gt({v1}, {v2})                                  *vim.version.gt()*
     Returns `true` if `v1 > v2` . See |vim.version.cmp()| for usage.
 
     Parameters: ~
@@ -2945,7 +3041,7 @@ gt({v1}, {v2})                                              *vim.version.gt()*
     Return: ~
         (boolean)
 
-last({versions})                                          *vim.version.last()*
+vim.version.last({versions})                              *vim.version.last()*
     TODO: generalize this, move to func.lua
 
     Parameters: ~
@@ -2954,7 +3050,7 @@ last({versions})                                          *vim.version.last()*
     Return: ~
         Version ?|ni
 
-lt({v1}, {v2})                                              *vim.version.lt()*
+vim.version.lt({v1}, {v2})                                  *vim.version.lt()*
     Returns `true` if `v1 < v2` . See |vim.version.cmp()| for usage.
 
     Parameters: ~
@@ -2964,7 +3060,7 @@ lt({v1}, {v2})                                              *vim.version.lt()*
     Return: ~
         (boolean)
 
-parse({version}, {opts})                                 *vim.version.parse()*
+vim.version.parse({version}, {opts})                     *vim.version.parse()*
     Parses a semantic version string and returns a version object which can be
     used with other `vim.version` functions. For example "1.0.1-rc1+build.2" returns: >
 
@@ -2985,7 +3081,7 @@ parse({version}, {opts})                                 *vim.version.parse()*
     See also: ~
       • # https://semver.org/spec/v2.0.0.html
 
-range({spec})                                            *vim.version.range()*
+vim.version.range({spec})                                *vim.version.range()*
     Parses a semver |version-range| "spec" and returns a range object: >
 
        {
@@ -3020,7 +3116,7 @@ range({spec})                                            *vim.version.range()*
 
 
 ==============================================================================
-Lua module: iter                                                    *lua-iter*
+Lua module: vim.iter                                                *lua-iter*
 
 
 The *vim.iter* module provides a generic interface for working with
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
new file mode 100644
index 0000000000..384dd4351d
--- /dev/null
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -0,0 +1,236 @@
+---@meta
+
+---@defgroup lua-builtin
+---
+---@brief <pre>help
+---vim.api.{func}({...})                                                    *vim.api*
+---    Invokes Nvim |API| function {func} with arguments {...}.
+---    Example: call the "nvim_get_current_line()" API function: >lua
+---        print(tostring(vim.api.nvim_get_current_line()))
+---
+---vim.NIL                                                                  *vim.NIL*
+---    Special value representing NIL in |RPC| and |v:null| in Vimscript
+---    conversion, and similar cases. Lua `nil` cannot be used as part of a Lua
+---    table representing a Dictionary or Array, because it is treated as
+---    missing: `{"foo", nil}` is the same as `{"foo"}`.
+---
+---vim.type_idx                                                        *vim.type_idx*
+---    Type index for use in |lua-special-tbl|. Specifying one of the values from
+---    |vim.types| allows typing the empty table (it is unclear whether empty Lua
+---    table represents empty list or empty array) and forcing integral numbers
+---    to be |Float|. See |lua-special-tbl| for more details.
+---
+---vim.val_idx                                                          *vim.val_idx*
+---    Value index for tables representing |Float|s. A table representing
+---    floating-point value 1.0 looks like this: >lua
+---        {
+---          [vim.type_idx] = vim.types.float,
+---          [vim.val_idx] = 1.0,
+---        }
+---<    See also |vim.type_idx| and |lua-special-tbl|.
+---
+---vim.types                                                              *vim.types*
+---    Table with possible values for |vim.type_idx|. Contains two sets of
+---    key-value pairs: first maps possible values for |vim.type_idx| to
+---    human-readable strings, second maps human-readable type names to values
+---    for |vim.type_idx|. Currently contains pairs for `float`, `array` and
+---        `dictionary` types.
+---
+---    Note: One must expect that values corresponding to `vim.types.float`,
+---    `vim.types.array` and `vim.types.dictionary` fall under only two following
+---    assumptions:
+---    1. Value may serve both as a key and as a value in a table. Given the
+---       properties of Lua tables this basically means “value is not `nil`”.
+---    2. For each value in `vim.types` table `vim.types[vim.types[value]]` is the
+---       same as `value`.
+---    No other restrictions are put on types, and it is not guaranteed that
+---    values corresponding to `vim.types.float`, `vim.types.array` and
+---    `vim.types.dictionary` will not change or that `vim.types` table will only
+---    contain values for these three types.
+---
+---                                                   *log_levels* *vim.log.levels*
+---Log levels are one of the values defined in `vim.log.levels`:
+---
+---    vim.log.levels.DEBUG
+---    vim.log.levels.ERROR
+---    vim.log.levels.INFO
+---    vim.log.levels.TRACE
+---    vim.log.levels.WARN
+---    vim.log.levels.OFF
+---
+---</pre>
+
+--- Returns true if the code is executing as part of a "fast" event handler,
+--- where most of the API is disabled. These are low-level events (e.g.
+--- |lua-loop-callbacks|) which can be invoked whenever Nvim polls for input.
+--- When this is `false` most API functions are callable (but may be subject
+--- to other restrictions such as |textlock|).
+function vim.in_fast_event() end
+
+--- Creates a special empty table (marked with a metatable), which Nvim to an
+--- empty dictionary when translating Lua values to Vimscript or API types.
+--- Nvim by default converts an empty table `{}` without this metatable to an
+--- list/array.
+---
+--- Note: If numeric keys are present in the table, Nvim ignores the metatable
+--- marker and converts the dict to a list/array anyway.
+function vim.empty_dict() end
+
+--- Sends {event} to {channel} via |RPC| and returns immediately. If {channel}
+--- is 0, the event is broadcast to all channels.
+---
+--- This function also works in a fast callback |lua-loop-callbacks|.
+--- @param channel integer
+--- @param method string
+--- @param args? any[]
+--- @param ...? any
+function vim.rpcnotify(channel, method, args, ...) end
+
+--- Sends a request to {channel} to invoke {method} via |RPC| and blocks until
+--- a response is received.
+---
+--- Note: NIL values as part of the return value is represented as |vim.NIL|
+--- special value
+--- @param channel integer
+--- @param method string
+--- @param args? any[]
+--- @param ...? any
+function vim.rpcrequest(channel, method, args, ...) end
+
+--- Compares strings case-insensitively.
+--- @param a string
+--- @param b string
+--- @return 0|1|-1
+--- if strings are
+--- equal, {a} is greater than {b} or {a} is lesser than {b}, respectively.
+function vim.stricmp(a, b) end
+
+--- Convert UTF-32 or UTF-16 {index} to byte index. If {use_utf16} is not
+--- supplied, it defaults to false (use UTF-32). Returns the byte index.
+---
+--- Invalid UTF-8 and NUL is treated like by |vim.str_byteindex()|.
+--- An {index} in the middle of a UTF-16 sequence is rounded upwards to
+--- the end of that sequence.
+--- @param str string
+--- @param index number
+--- @param use_utf16? any
+function vim.str_byteindex(str, index, use_utf16) end
+
+--- Convert byte index to UTF-32 and UTF-16 indices. If {index} is not
+--- supplied, the length of the string is used. All indices are zero-based.
+---
+--- Embedded NUL bytes are treated as terminating the string. Invalid UTF-8
+--- bytes, and embedded surrogates are counted as one code point each. An
+--- {index} in the middle of a UTF-8 sequence is rounded upwards to the end of
+--- that sequence.
+--- @param str string
+--- @param index? number
+--- @return integer UTF-32 index
+--- @return integer UTF-16 index
+function vim.str_utfindex(str, index) end
+
+--- The result is a String, which is the text {str} converted from
+--- encoding {from} to encoding {to}. When the conversion fails `nil` is
+--- returned.  When some characters could not be converted they
+--- are replaced with "?".
+--- The encoding names are whatever the iconv() library function
+--- can accept, see ":Man 3 iconv".
+---
+--- @param str string Text to convert
+--- @param from number Encoding of {str}
+--- @param to number Target encoding
+--- @param opts? table<string, any>
+--- @return string|nil Converted string if conversion succeeds, `nil` otherwise.
+function vim.iconv(str, from, to, opts) end
+
+--- Schedules {callback} to be invoked soon by the main event-loop. Useful
+--- to avoid |textlock| or other temporary restrictions.
+--- @param callback fun()
+function vim.schedule(callback) end
+
+--- Wait for {time} in milliseconds until {callback} returns `true`.
+---
+--- Executes {callback} immediately and at approximately {interval}
+--- milliseconds (default 200). Nvim still processes other events during
+--- this time.
+---
+--- Examples:
+--- <pre>lua
+---
+--- ---
+--- -- Wait for 100 ms, allowing other events to process
+--- vim.wait(100, function() end)
+---
+--- ---
+--- -- Wait for 100 ms or until global variable set.
+--- vim.wait(100, function() return vim.g.waiting_for_var end)
+---
+--- ---
+--- -- Wait for 1 second or until global variable set, checking every ~500 ms
+--- vim.wait(1000, function() return vim.g.waiting_for_var end, 500)
+---
+--- ---
+--- -- Schedule a function to set a value in 100ms
+--- vim.defer_fn(function() vim.g.timer_result = true end, 100)
+---
+--- -- Would wait ten seconds if results blocked. Actually only waits  100 ms
+--- if vim.wait(10000, function() return vim.g.timer_result end) then
+---   print('Only waiting a little bit of time!')
+--- end
+--- </pre>
+---
+--- @param time integer Number of milliseconds to wait
+--- @param callback? fun(): boolean Optional callback. Waits until {callback} returns true
+--- @param interval? integer (Approximate) number of milliseconds to wait between polls
+--- @param fast_only? boolean If true, only |api-fast| events will be processed.
+---                           If called from while in an |api-fast| event, will
+---                           automatically be set to `true`.
+--- @return boolean, nil|-1|-2
+---     - If {callback} returns `true` during the {time}: `true, nil`
+---     - If {callback} never returns `true` during the {time}: `false, -1`
+---     - If {callback} is interrupted during the {time}: `false, -2`
+---     - If {callback} errors, the error is raised.
+function vim.wait(time, callback, interval, fast_only) end
+
+--- Attach to ui events, similar to |nvim_ui_attach()| but receive events
+--- as Lua callback. Can be used to implement screen elements like
+--- popupmenu or message handling in Lua.
+---
+--- {options} should be a dictionary-like table, where `ext_...` options should
+--- be set to true to receive events for the respective external element.
+---
+--- {callback} receives event name plus additional parameters. See |ui-popupmenu|
+--- and the sections below for event format for respective events.
+---
+--- WARNING: This api is considered experimental.  Usability will vary for
+--- different screen elements. In particular `ext_messages` behavior is subject
+--- to further changes and usability improvements.  This is expected to be
+--- used to handle messages when setting 'cmdheight' to zero (which is
+--- likewise experimental).
+---
+--- Example (stub for a |ui-popupmenu| implementation):
+--- <pre>lua
+---
+---   ns = vim.api.nvim_create_namespace('my_fancy_pum')
+---
+---   vim.ui_attach(ns, {ext_popupmenu=true}, function(event, ...)
+---     if event == "popupmenu_show" then
+---       local items, selected, row, col, grid = ...
+---       print("display pum ", #items)
+---     elseif event == "popupmenu_select" then
+---       local selected = ...
+---       print("selected", selected)
+---     elseif event == "popupmenu_hide" then
+---       print("FIN")
+---     end
+---   end)
+--- </pre>
+--- @param ns integer
+--- @param options table<string, any>
+--- @param callback fun()
+function vim.ui_attach(ns, options, callback) end
+
+--- Detach a callback previously attached with |vim.ui_attach()| for the
+--- given namespace {ns}.
+--- @param ns integer
+function vim.ui_detach(ns) end
diff --git a/runtime/lua/vim/_meta/diff.lua b/runtime/lua/vim/_meta/diff.lua
new file mode 100644
index 0000000000..8e8aaf8b64
--- /dev/null
+++ b/runtime/lua/vim/_meta/diff.lua
@@ -0,0 +1,67 @@
+---@meta
+
+--- Run diff on strings {a} and {b}. Any indices returned by this function,
+--- either directly or via callback arguments, are 1-based.
+---
+--- Examples:
+--- <pre>lua
+---     vim.diff('a\\n', 'b\\nc\\n')
+---     -- =>
+---     -- @@ -1 +1,2 @@
+---     -- -a
+---     -- +b
+---     -- +c
+---
+---     vim.diff('a\\n', 'b\\nc\\n', {result_type = 'indices'})
+---     -- =>
+---     -- {
+---     --   {1, 1, 1, 2}
+---     -- }
+--- </pre>
+---
+--- @param a string First string to compare
+--- @param b string Second string to compare
+--- @param opts table<string,any> Optional parameters:
+---     - `on_hunk` (callback):
+---       Invoked for each hunk in the diff. Return a negative number
+---       to cancel the callback for any remaining hunks.
+---       Args:
+---       - `start_a` (integer): Start line of hunk in {a}.
+---       - `count_a` (integer): Hunk size in {a}.
+---       - `start_b` (integer): Start line of hunk in {b}.
+---       - `count_b` (integer): Hunk size in {b}.
+---     - `result_type` (string): Form of the returned diff:
+---       - "unified": (default) String in unified format.
+---       - "indices": Array of hunk locations.
+---       Note: This option is ignored if `on_hunk` is used.
+---     - `linematch` (boolean|integer): Run linematch on the resulting hunks
+---       from xdiff. When integer, only hunks upto this size in
+---       lines are run through linematch. Requires `result_type = indices`,
+---       ignored otherwise.
+---     - `algorithm` (string):
+---       Diff algorithm to use. Values:
+---       - "myers"      the default algorithm
+---       - "minimal"    spend extra time to generate the
+---                      smallest possible diff
+---       - "patience"   patience diff algorithm
+---       - "histogram"  histogram diff algorithm
+---     - `ctxlen` (integer): Context length
+---     - `interhunkctxlen` (integer):
+---       Inter hunk context length
+---     - `ignore_whitespace` (boolean):
+---       Ignore whitespace
+---     - `ignore_whitespace_change` (boolean):
+---       Ignore whitespace change
+---     - `ignore_whitespace_change_at_eol` (boolean)
+---       Ignore whitespace change at end-of-line.
+---     - `ignore_cr_at_eol` (boolean)
+---       Ignore carriage return at end-of-line
+---     - `ignore_blank_lines` (boolean)
+---       Ignore blank lines
+---     - `indent_heuristic` (boolean):
+---       Use the indent heuristic for the internal
+---       diff library.
+---
+--- @return string|table|nil
+---     See {opts.result_type}. `nil` if {opts.on_hunk} is given.
+function vim.diff(a, b, opts) end
diff --git a/runtime/lua/vim/_meta/json.lua b/runtime/lua/vim/_meta/json.lua
new file mode 100644
index 0000000000..15e81d5004
--- /dev/null
+++ b/runtime/lua/vim/_meta/json.lua
@@ -0,0 +1,35 @@
+--- @meta
+
+--- @defgroup lua-json
+---
+--- @brief The \*vim.json\* module provides encoding and decoding of Lua objects to and
+--- from JSON-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
+
+--- Decodes (or "unpacks") the JSON-encoded {str} to a Lua object.
+---
+--- - Decodes JSON "null" as |vim.NIL| (controllable by {opts}, see below).
+--- - Decodes empty object as |vim.empty_dict()|.
+--- - Decodes empty array as `{}` (empty Lua table).
+---
+--- Example:
+--- <pre>lua
+--- :lua vim.print(vim.json.decode('{"bar":[],"foo":{},"zub":null}'))
+--- --> { bar = {}, foo = vim.empty_dict(), zub = vim.NIL }
+--- </pre>
+--- Parameters: ~
+---   • {str}    Stringified JSON data.
+---   • {opts}   Options map keys:
+---              • luanil: { object: bool, array: bool }
+---                • `luanil.object=true` converts `null` in JSON objects to
+---                  Lua `nil` instead of `vim.NIL`.
+---                • `luanil.array=true` converts `null` in JSON arrays to Lua
+---                  `nil` instead of `vim.NIL`.
+--- @param str string
+--- @param opts? table<string, any>
+--- @return any
+function vim.json.decode(str, opts) end
+
+--- Encodes (or "packs") Lua object {obj} as JSON in a Lua string.
+--- @param obj any
+--- @return string
+function vim.json.encode(obj) end
diff --git a/runtime/lua/vim/_meta/misc.lua b/runtime/lua/vim/_meta/misc.lua
new file mode 100644
index 0000000000..954e8b4675
--- /dev/null
+++ b/runtime/lua/vim/_meta/misc.lua
@@ -0,0 +1,11 @@
+---@meta
+
+--- Invokes |vim-function| or |user-function| {func} with arguments {...}.
+--- See also |vim.fn|.
+--- Equivalent to:
+--- <pre>lua
+---     vim.fn[func]({...})
+--- </pre>
+--- @param func fun()
+--- @param ... any
+function vim.call(func, ...) end
diff --git a/runtime/lua/vim/_meta/mpack.lua b/runtime/lua/vim/_meta/mpack.lua
new file mode 100644
index 0000000000..2764177e5c
--- /dev/null
+++ b/runtime/lua/vim/_meta/mpack.lua
@@ -0,0 +1,13 @@
+--- @meta
+
+--- @defgroup lua-mpack
+---
+--- @brief The \*vim.mpack\* module provides encoding and decoding of Lua objects to and
+--- from msgpack-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
+
+--- Decodes (or "unpacks") the msgpack-encoded {str} to a Lua object.
+--- @param str string
+function vim.mpack.decode(str) end
+
+--- Encodes (or "packs") Lua object {obj} as msgpack in a Lua string.
+function vim.mpack.encode(obj) end
diff --git a/runtime/lua/vim/_meta/regex.lua b/runtime/lua/vim/_meta/regex.lua
new file mode 100644
index 0000000000..afa78772da
--- /dev/null
+++ b/runtime/lua/vim/_meta/regex.lua
@@ -0,0 +1,34 @@
+--- @meta
+
+--- @defgroup lua-regex
+---
+--- @brief Vim regexes can be used directly from Lua. Currently they only allow
+--- matching within a single line.
+
+--- Parse the Vim regex {re} and return a regex object. Regexes are "magic"
+--- and case-sensitive by default, regardless of 'magic' and 'ignorecase'.
+--- They can be controlled with flags, see |/magic| and |/ignorecase|.
+--- @param re string
+--- @return vim.regex
+function vim.regex(re) end
+
+--- @class vim.regex
+local regex = {}
+
+--- Match the string against the regex. If the string should match the regex
+--- precisely, surround the regex with `^` and `$`. If the was a match, the
+--- byte indices for the beginning and end of the match is returned. When
+--- there is no match, `nil` is returned. As any integer is truth-y,
+--- `regex:match()` can be directly used as a condition in an if-statement.
+--- @param str string
+function regex:match_str(str) end
+
+--- Match line {line_idx} (zero-based) in buffer {bufnr}. If {start} and {end}
+--- are supplied, match only this byte index range. Otherwise see
+--- |regex:match_str()|. If {start} is used, then the returned byte indices
+--- will be relative {start}.
+--- @param bufnr integer
+--- @param line_idx integer
+--- @param start? integer
+--- @param end_? integer
+function regex:match_line(bufnr, line_idx, start, end_) end
diff --git a/runtime/lua/vim/_meta/spell.lua b/runtime/lua/vim/_meta/spell.lua
new file mode 100644
index 0000000000..926c8a686d
--- /dev/null
+++ b/runtime/lua/vim/_meta/spell.lua
@@ -0,0 +1,29 @@
+--- @meta
+
+--- Check {str} for spelling errors. Similar to the Vimscript function
+--- |spellbadword()|.
+---
+--- Note: The behaviour of this function is dependent on: 'spelllang',
+--- 'spellfile', 'spellcapcheck' and 'spelloptions' which can all be local to
+--- the buffer. Consider calling this with |nvim_buf_call()|.
+---
+--- Example:
+--- <pre>lua
+---     vim.spell.check("the quik brown fox")
+---     -- =>
+---     -- {
+---     --     {'quik', 'bad', 5}
+---     -- }
+--- </pre>
+---
+--- @param str string
+--- @return {[1]: string, [2]: string, [3]: string}[]
+---   List of tuples with three items:
+---     - The badly spelled word.
+---     - The type of the spelling error:
+---         "bad"   spelling mistake
+---         "rare"  rare word
+---         "local" word only valid in another region
+---         "caps"  word should start with Capital
+---     - The position in {str} where the word begins.
+function vim.spell.check(str) end
diff --git a/runtime/lua/vim/_options.lua b/runtime/lua/vim/_options.lua
index 41e6e8be86..d498ae0a2c 100644
--- a/runtime/lua/vim/_options.lua
+++ b/runtime/lua/vim/_options.lua
@@ -1,3 +1,108 @@
+---@defgroup lua-vimscript
+---
+---@brief Nvim Lua provides an interface or "bridge" to Vimscript variables and
+---functions, and editor commands and options.
+---
+---Objects passed over this bridge are COPIED (marshalled): there are no
+---"references". |lua-guide-variables| For example, using \`vim.fn.remove()\` on
+---a Lua list copies the list object to Vimscript and does NOT modify the Lua
+---list:
+---<pre>lua
+---    local list = { 1, 2, 3 }
+---    vim.fn.remove(list, 0)
+---    vim.print(list)  --> "{ 1, 2, 3 }"
+---</pre>
+
+---@addtogroup lua-vimscript
+---@brief <pre>help
+---vim.call({func}, {...})                                           *vim.call()*
+---    Invokes |vim-function| or |user-function| {func} with arguments {...}.
+---    See also |vim.fn|.
+---    Equivalent to: >lua
+---        vim.fn[func]({...})
+---<
+---vim.cmd({command})
+---    See |vim.cmd()|.
+---
+---vim.fn.{func}({...})                                                  *vim.fn*
+---    Invokes |vim-function| or |user-function| {func} with arguments {...}.
+---    To call autoload functions, use the syntax: >lua
+---        vim.fn['some\#function']({...})
+---<
+---    Unlike vim.api.|nvim_call_function()| this converts directly between Vim
+---    objects and Lua objects. If the Vim function returns a float, it will be
+---    represented directly as a Lua number. Empty lists and dictionaries both
+---    are represented by an empty table.
+---
+---    Note: |v:null| values as part of the return value is represented as
+---    |vim.NIL| special value
+---
+---    Note: vim.fn keys are generated lazily, thus `pairs(vim.fn)` only
+---    enumerates functions that were called at least once.
+---
+---    Note: The majority of functions cannot run in |api-fast| callbacks with some
+---    undocumented exceptions which are allowed.
+---
+---                                                           *lua-vim-variables*
+---The Vim editor global dictionaries |g:| |w:| |b:| |t:| |v:| can be accessed
+---from Lua conveniently and idiomatically by referencing the `vim.*` Lua tables
+---described below. In this way you can easily read and modify global Vimscript
+---variables from Lua.
+---
+---Example: >lua
+---
+---    vim.g.foo = 5     -- Set the g:foo Vimscript variable.
+---    print(vim.g.foo)  -- Get and print the g:foo Vimscript variable.
+---    vim.g.foo = nil   -- Delete (:unlet) the Vimscript variable.
+---    vim.b[2].foo = 6  -- Set b:foo for buffer 2
+---<
+---
+---Note that setting dictionary fields directly will not write them back into
+---Nvim. This is because the index into the namespace simply returns a copy.
+---Instead the whole dictionary must be written as one. This can be achieved by
+---creating a short-lived temporary.
+---
+---Example: >lua
+---
+---    vim.g.my_dict.field1 = 'value'  -- Does not work
+---
+---    local my_dict = vim.g.my_dict   --
+---    my_dict.field1 = 'value'        -- Instead do
+---    vim.g.my_dict = my_dict         --
+---
+---vim.g                                                                  *vim.g*
+---    Global (|g:|) editor variables.
+---    Key with no value returns `nil`.
+---
+---vim.b                                                                  *vim.b*
+---    Buffer-scoped (|b:|) variables for the current buffer.
+---    Invalid or unset key returns `nil`. Can be indexed with
+---    an integer to access variables for a specific buffer.
+---
+---vim.w                                                                  *vim.w*
+---    Window-scoped (|w:|) variables for the current window.
+---    Invalid or unset key returns `nil`. Can be indexed with
+---    an integer to access variables for a specific window.
+---
+---vim.t                                                                  *vim.t*
+---    Tabpage-scoped (|t:|) variables for the current tabpage.
+---    Invalid or unset key returns `nil`. Can be indexed with
+---    an integer to access variables for a specific tabpage.
+---
+---vim.v                                                                  *vim.v*
+---    |v:| variables.
+---    Invalid or unset key returns `nil`.
+---
+---vim.env                                                              *vim.env*
+---    Environment variables defined in the editor session.
+---    See |expand-env| and |:let-environment| for the Vimscript behavior.
+---    Invalid or unset key returns `nil`.
+---    Example: >lua
+---        vim.env.FOO = 'bar'
+---        print(vim.env.TERM)
+---<
+---</pre>
+
 local api = vim.api
 
 -- TODO(tjdevries): Improve option metadata so that this doesn't have to be hardcoded.
@@ -13,6 +118,7 @@ local key_value_options = {
 
 --- Convert a vimoption_T style dictionary to the correct OptionType associated with it.
 ---@return string
+---@private
 local function get_option_metatype(name, info)
   if info.type == 'string' then
     if info.flaglist then
@@ -51,6 +157,7 @@ vim.env = setmetatable({}, {
   end,
 })
 
+---@private
 local function opt_validate(option_name, target_scope)
   local scope = options_info[option_name].scope
   if scope ~= target_scope then
@@ -67,6 +174,7 @@ local function opt_validate(option_name, target_scope)
   end
 end
 
+---@private
 local function new_buf_opt_accessor(bufnr)
   return setmetatable({}, {
     __index = function(_, k)
@@ -84,8 +192,7 @@ local function new_buf_opt_accessor(bufnr)
   })
 end
 
-vim.bo = new_buf_opt_accessor()
-
+---@private
 local function new_win_opt_accessor(winid, bufnr)
   return setmetatable({}, {
     __index = function(_, k)
@@ -120,30 +227,118 @@ local function new_win_opt_accessor(winid, bufnr)
   })
 end
 
-vim.wo = new_win_opt_accessor()
-
--- vim global option
---  this ONLY sets the global option. like `setglobal`
-vim.go = setmetatable({}, {
+---@addtogroup lua-vimscript
+---@brief <pre>help
+---` `                                                                *lua-options*
+---                                                             *lua-vim-options*
+---                                                                 *lua-vim-set*
+---                                                            *lua-vim-setlocal*
+---
+---Vim options can be accessed through |vim.o|, which behaves like Vimscript
+---|:set|.
+---
+---    Examples: ~
+---
+---    To set a boolean toggle:
+---        Vimscript: `set number`
+---        Lua:       `vim.o.number = true`
+---
+---    To set a string value:
+---        Vimscript: `set wildignore=*.o,*.a,__pycache__`
+---        Lua:       `vim.o.wildignore = '*.o,*.a,__pycache__'`
+---
+---Similarly, there is |vim.bo| and |vim.wo| for setting buffer-scoped and
+---window-scoped options. Note that this must NOT be confused with
+---|local-options| and |:setlocal|. There is also |vim.go| that only accesses the
+---global value of a |global-local| option, see |:setglobal|.
+---</pre>
+
+---@addtogroup lua-vimscript
+---@brief <pre>help
+---vim.o                                                                  *vim.o*
+---    Get or set |options|. Like `:set`. Invalid key is an error.
+---
+---    Note: this works on both buffer-scoped and window-scoped options using the
+---    current buffer and window.
+---
+---    Example: >lua
+---        vim.o.cmdheight = 4
+---        print(vim.o.columns)
+---        print(vim.o.foo)     -- error: invalid key
+---<
+---</pre>
+vim.o = setmetatable({}, {
   __index = function(_, k)
-    return api.nvim_get_option_value(k, { scope = 'global' })
+    return api.nvim_get_option_value(k, {})
   end,
   __newindex = function(_, k, v)
-    return api.nvim_set_option_value(k, v, { scope = 'global' })
+    return api.nvim_set_option_value(k, v, {})
   end,
 })
 
--- vim `set` style options.
---  it has no additional metamethod magic.
-vim.o = setmetatable({}, {
+---@addtogroup lua-vimscript
+---@brief <pre>help
+---vim.go                                                                *vim.go*
+---    Get or set global |options|. Like `:setglobal`. Invalid key is
+---    an error.
+---
+---    Note: this is different from |vim.o| because this accesses the global
+---    option value and thus is mostly useful for use with |global-local|
+---    options.
+---
+---    Example: >lua
+---        vim.go.cmdheight = 4
+---        print(vim.go.columns)
+---        print(vim.go.bar)     -- error: invalid key
+---<
+---</pre>
+vim.go = setmetatable({}, {
   __index = function(_, k)
-    return api.nvim_get_option_value(k, {})
+    return api.nvim_get_option_value(k, { scope = 'global' })
   end,
   __newindex = function(_, k, v)
-    return api.nvim_set_option_value(k, v, {})
+    return api.nvim_set_option_value(k, v, { scope = 'global' })
   end,
 })
 
+---@addtogroup lua-vimscript
+---@brief <pre>help
+---vim.bo[{bufnr}]                                                                *vim.bo*
+---    Get or set buffer-scoped |options| for the buffer with number {bufnr}.
+---    Like `:set` and `:setlocal`. If [{bufnr}] is omitted then the current
+---    buffer is used. Invalid {bufnr} or key is an error.
+---
+---    Note: this is equivalent to both `:set` and `:setlocal`.
+---
+---    Example: >lua
+---        local bufnr = vim.api.nvim_get_current_buf()
+---        vim.bo[bufnr].buflisted = true    -- same as vim.bo.buflisted = true
+---        print(vim.bo.comments)
+---        print(vim.bo.baz)                 -- error: invalid key
+---</pre>
+vim.bo = new_buf_opt_accessor()
+
+---@addtogroup lua-vimscript
+---@brief <pre>help
+---vim.wo[{winid}][{bufnr}]                                                       *vim.wo*
+---    Get or set window-scoped |options| for the window with handle {winid} and
+---    buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
+---    `:set` otherwise. If [{winid}] is omitted then the current window is
+---    used. Invalid {winid}, {bufnr} or key is an error.
+---
+---    Note: only {bufnr} with value `0` (the current buffer in the window) is
+---    supported.
+---
+---    Example: >lua
+---        local winid = vim.api.nvim_get_current_win()
+---        vim.wo[winid].number = true    -- same as vim.wo.number = true
+---        print(vim.wo.foldmarker)
+---        print(vim.wo.quux)             -- error: invalid key
+---        vim.wo[winid][0].spell = false -- like ':setlocal nospell'
+---<
+---</pre>
+vim.wo = new_win_opt_accessor()
+
 ---@brief [[
 --- vim.opt, vim.opt_local and vim.opt_global implementation
 ---
@@ -153,6 +348,7 @@ vim.o = setmetatable({}, {
 ---@brief ]]
 
 --- Preserves the order and does not mutate the original list
+--- @private
 local function remove_duplicate_values(t)
   local result, seen = {}, {}
   for _, v in ipairs(t) do
@@ -168,6 +364,7 @@ end
 
 -- Check whether the OptionTypes is allowed for vim.opt
 -- If it does not match, throw an error which indicates which option causes the error.
+--- @private
 local function assert_valid_value(name, value, types)
   local type_of_value = type(value)
   for _, valid_type in ipairs(types) do
@@ -186,14 +383,17 @@ local function assert_valid_value(name, value, types)
   )
 end
 
+--- @private
 local function passthrough(_, x)
   return x
 end
 
+--- @private
 local function tbl_merge(left, right)
   return vim.tbl_extend('force', left, right)
 end
 
+--- @private
 local function tbl_remove(t, value)
   if type(value) == 'string' then
     t[value] = nil
@@ -275,6 +475,7 @@ local to_vim_value = {
 }
 
 --- Convert a Lua value to a vimoption_T value
+--- @private
 local function convert_value_to_vim(name, info, value)
   if value == nil then
     return vim.NIL
@@ -390,6 +591,7 @@ local to_lua_value = {
 }
 
 --- Converts a vimoption_T style value to a Lua value
+--- @private
 local function convert_value_to_lua(info, option_value)
   return to_lua_value[info.metatype](info, option_value)
 end
@@ -416,6 +618,7 @@ local prepend_methods = {
 }
 
 --- Handles the '^' operator
+--- @private
 local function prepend_value(info, current, new)
   return prepend_methods[info.metatype](
     convert_value_to_lua(info, current),
@@ -445,6 +648,7 @@ local add_methods = {
 }
 
 --- Handles the '+' operator
+--- @private
 local function add_value(info, current, new)
   return add_methods[info.metatype](
     convert_value_to_lua(info, current),
@@ -452,6 +656,7 @@ local function add_value(info, current, new)
   )
 end
 
+--- @private
 local function remove_one_item(t, val)
   if vim.tbl_islist(t) then
     local remove_index = nil
@@ -495,13 +700,16 @@ local remove_methods = {
 }
 
 --- Handles the '-' operator
+--- @private
 local function remove_value(info, current, new)
   return remove_methods[info.metatype](convert_value_to_lua(info, current), new)
 end
 
+--- @private
 local function create_option_accessor(scope)
   local option_mt
 
+  --- @private
   local function make_option(name, value)
     local info = assert(options_info[name], 'Not a valid option name: ' .. name)
 
@@ -570,6 +778,151 @@ local function create_option_accessor(scope)
   })
 end
 
+---@addtogroup lua-vimscript
+---@brief <pre>help
+---` `                                                                       *vim.opt_local*
+---                                                                       *vim.opt_global*
+---                                                                              *vim.opt*
+---
+---
+---A special interface |vim.opt| exists for conveniently interacting with list-
+---and map-style option from Lua: It allows accessing them as Lua tables and
+---offers object-oriented method for adding and removing entries.
+---
+---    Examples: ~
+---
+---    The following methods of setting a list-style option are equivalent:
+---        In Vimscript: >vim
+---            set wildignore=*.o,*.a,__pycache__
+---<
+---        In Lua using `vim.o`: >lua
+---            vim.o.wildignore = '*.o,*.a,__pycache__'
+---<
+---        In Lua using `vim.opt`: >lua
+---            vim.opt.wildignore = { '*.o', '*.a', '__pycache__' }
+---<
+---    To replicate the behavior of |:set+=|, use: >lua
+---
+---        vim.opt.wildignore:append { "*.pyc", "node_modules" }
+---<
+---    To replicate the behavior of |:set^=|, use: >lua
+---
+---        vim.opt.wildignore:prepend { "new_first_value" }
+---<
+---    To replicate the behavior of |:set-=|, use: >lua
+---
+---        vim.opt.wildignore:remove { "node_modules" }
+---<
+---    The following methods of setting a map-style option are equivalent:
+---        In Vimscript: >vim
+---            set listchars=space:_,tab:>~
+---<
+---        In Lua using `vim.o`: >lua
+---            vim.o.listchars = 'space:_,tab:>~'
+---<
+---        In Lua using `vim.opt`: >lua
+---            vim.opt.listchars = { space = '_', tab = '>~' }
+---<
+---
+---Note that |vim.opt| returns an `Option` object, not the value of the option,
+---which is accessed through |vim.opt:get()|:
+---
+---    Examples: ~
+---
+---    The following methods of getting a list-style option are equivalent:
+---        In Vimscript: >vim
+---            echo wildignore
+---<
+---        In Lua using `vim.o`: >lua
+---            print(vim.o.wildignore)
+---<
+---        In Lua using `vim.opt`: >lua
+---            vim.print(vim.opt.wildignore:get())
+---<
+---
+---In any of the above examples, to replicate the behavior |:setlocal|, use
+---`vim.opt_local`. Additionally, to replicate the behavior of |:setglobal|, use
+---`vim.opt_global`.
+---</pre>
+
+--- @diagnostic disable-next-line:unused-local used for gen_vimdoc
+local Option = {}
+
+---Returns a Lua-representation of the option. Boolean, number and string
+---values will be returned in exactly the same fashion.
+---
+---For values that are comma-separated lists, an array will be returned with
+---the values as entries in the array: <pre>lua
+---    vim.cmd [[set wildignore=*.pyc,*.o]]
+---
+---    vim.print(vim.opt.wildignore:get())
+---    -- { "*.pyc", "*.o", }
+---
+---    for _, ignore_pattern in ipairs(vim.opt.wildignore:get()) do
+---        print("Will ignore:", ignore_pattern)
+---    end
+---    -- Will ignore: *.pyc
+---    -- Will ignore: *.o
+---</pre>
+---
+---For values that are comma-separated maps, a table will be returned with
+---the names as keys and the values as entries: <pre>lua
+---    vim.cmd [[set listchars=space:_,tab:>~]]
+---
+---    vim.print(vim.opt.listchars:get())
+---    --  { space = "_", tab = ">~", }
+---
+---    for char, representation in pairs(vim.opt.listchars:get()) do
+---        print(char, "=>", representation)
+---    end
+---</pre>
+---
+---For values that are lists of flags, a set will be returned with the flags
+---as keys and `true` as entries. <pre>lua
+---    vim.cmd [[set formatoptions=njtcroql]]
+---
+---    vim.print(vim.opt.formatoptions:get())
+---    -- { n = true, j = true, c = true, ... }
+---
+---    local format_opts = vim.opt.formatoptions:get()
+---    if format_opts.j then
+---        print("J is enabled!")
+---    end
+---</pre>
+---@return string|integer|boolean|nil value of option
+---@diagnostic disable-next-line:unused-local used for gen_vimdoc
+function Option:get() end
+
+---Append a value to string-style options. See |:set+=|
+---
+---These are equivalent: <pre>lua
+---    vim.opt.formatoptions:append('j')
+---    vim.opt.formatoptions = vim.opt.formatoptions + 'j'
+---</pre>
+---@param value string Value to append
+--- @diagnostic disable-next-line:unused-local used for gen_vimdoc
+function Option:append(value) end
+
+---Prepend a value to string-style options. See |:set^=|
+---
+---These are equivalent: <pre>lua
+---    vim.opt.wildignore:prepend('*.o')
+---    vim.opt.wildignore = vim.opt.wildignore ^ '*.o'
+---</pre>
+---@param value string Value to prepend
+---@diagnostic disable-next-line:unused-local used for gen_vimdoc
+function Option:prepend(value) end
+
+---Remove a value from string-style options. See |:set-=|
+---
+---These are equivalent: <pre>lua
+---    vim.opt.wildignore:remove('*.pyc')
+---    vim.opt.wildignore = vim.opt.wildignore - '*.pyc'
+---</pre>
+---@param value string Value to remove
+---@diagnostic disable-next-line:unused-local used for gen_vimdoc
+function Option:remove(value) end
+
 vim.opt = create_option_accessor()
 vim.opt_local = create_option_accessor('local')
 vim.opt_global = create_option_accessor('global')
diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index 86e1adb49e..97a5a1233f 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -1,3 +1,36 @@
+---@defgroup lua-highlight
+---
+---@brief
+---Nvim includes a function for highlighting a selection on yank.
+---
+---To enable it, add the following to your `init.vim`:
+---<pre>vim
+---    au TextYankPost * silent! lua vim.highlight.on_yank()
+---</pre>
+---
+---You can customize the highlight group and the duration of
+---the highlight via:
+---<pre>vim
+---    au TextYankPost * silent! lua vim.highlight.on_yank {higroup="IncSearch", timeout=150}
+---</pre>
+---
+---If you want to exclude visual selections from highlighting on yank, use:
+---<pre>vim
+---    au TextYankPost * silent! lua vim.highlight.on_yank {on_visual=false}
+---</pre>
+---
+--- <pre>help
+---vim.highlight.priorities                            *vim.highlight.priorities*
+---
+---    Table with default priorities used for highlighting:
+---        • `syntax`: `50`, used for standard syntax highlighting
+---        • `treesitter`: `100`, used for tree-sitter-based highlighting
+---        • `semantic_tokens`: `125`, used for LSP semantic token highlighting
+---        • `diagnostics`: `150`, used for code analysis such as diagnostics
+---        • `user`: `200`, used for user-triggered highlights such as LSP document
+---          symbols or `on_yank` autocommands
+---</pre>
+
 local api = vim.api
 
 local M = {}
@@ -10,7 +43,7 @@ M.priorities = {
   user = 200,
 }
 
---- Highlight range between two positions
+--- Apply highlight group to range of text.
 ---
 ---@param bufnr integer Buffer number to apply highlighting to
 ---@param ns integer Namespace to add highlight to
@@ -18,9 +51,9 @@ M.priorities = {
 ---@param start integer[]|string Start of region as a (line, column) tuple or string accepted by |getpos()|
 ---@param finish integer[]|string End of region as a (line, column) tuple or string accepted by |getpos()|
 ---@param opts table|nil Optional parameters
---             - regtype type of range (see |setreg()|, default charwise)
---             - inclusive boolean indicating whether the range is end-inclusive (default false)
---             - priority number indicating priority of highlight (default priorities.user)
+---            - regtype type of range (see |setreg()|, default charwise)
+---            - inclusive boolean indicating whether the range is end-inclusive (default false)
+---            - priority number indicating priority of highlight (default priorities.user)
 function M.range(bufnr, ns, higroup, start, finish, opts)
   opts = opts or {}
   local regtype = opts.regtype or 'v'
@@ -46,22 +79,16 @@ end
 
 local yank_ns = api.nvim_create_namespace('hlyank')
 local yank_timer
---- Highlight the yanked region
----
---- use from init.vim via
----   au TextYankPost * lua vim.highlight.on_yank()
---- customize highlight group and timeout via
----   au TextYankPost * lua vim.highlight.on_yank {higroup="IncSearch", timeout=150}
---- customize conditions (here: do not highlight a visual selection) via
----   au TextYankPost * lua vim.highlight.on_yank {on_visual=false}
+
+--- Highlight the yanked text
 ---
--- @param opts table|nil Optional parameters
---              - higroup   highlight group for yanked region (default "IncSearch")
---              - timeout   time in ms before highlight is cleared (default 150)
---              - on_macro  highlight when executing macro (default false)
---              - on_visual highlight when yanking visual selection (default true)
---              - event     event structure (default vim.v.event)
---              - priority  integer priority (default |vim.highlight.priorities|`.user`)
+--- @param opts table|nil Optional parameters
+---              - higroup   highlight group for yanked region (default "IncSearch")
+---              - timeout   time in ms before highlight is cleared (default 150)
+---              - on_macro  highlight when executing macro (default false)
+---              - on_visual highlight when yanking visual selection (default true)
+---              - event     event structure (default vim.v.event)
+---              - priority  integer priority (default |vim.highlight.priorities|`.user`)
 function M.on_yank(opts)
   vim.validate({
     opts = {
-- 
cgit 


From c2d7c2826ca77b0ca31bec511fdcdf1e4abaf946 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 17 Jul 2023 15:13:54 +0100
Subject: docs(lua): change *lua-foo* -> *vim.foo*

---
 runtime/doc/lua.txt               | 51 ++++++++++++++++++---------------------
 runtime/lua/vim/_meta/builtin.lua |  2 +-
 runtime/lua/vim/_meta/json.lua    |  4 +--
 runtime/lua/vim/_meta/mpack.lua   |  4 +--
 runtime/lua/vim/_meta/regex.lua   |  2 +-
 runtime/lua/vim/highlight.lua     |  2 +-
 runtime/lua/vim/iter.lua          |  4 +--
 runtime/lua/vim/version.lua       |  2 +-
 8 files changed, 34 insertions(+), 37 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index d53b66a865..3b25e2744e 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -573,7 +573,7 @@ The Lpeg library for parsing expression grammars is being included as
 interface is available as `vim.re` (https://www.inf.puc-rio.br/~roberto/lpeg/re.html).
 
 ==============================================================================
-VIM.HIGHLIGHT                                                  *lua-highlight*
+VIM.HIGHLIGHT                                                  *vim.highlight*
 
 
 Nvim includes a function for highlighting a selection on yank.
@@ -637,7 +637,7 @@ vim.highlight.range({bufnr}, {ns}, {higroup}, {start}, {finish}, {opts})
 
 
 ==============================================================================
-VIM.REGEX                                                          *lua-regex*
+VIM.REGEX                                                          *vim.regex*
 
 
 Vim regexes can be used directly from Lua. Currently they only allow
@@ -678,7 +678,7 @@ vim.regex:match_str({str})                                 *regex:match_str()*
 
 
 ==============================================================================
-VIM.DIFF                                                            *lua-diff*
+VIM.DIFF                                                            *vim.diff*
 
 vim.diff({a}, {b}, {opts})                                        *vim.diff()*
     Run diff on strings {a} and {b}. Any indices returned by this function,
@@ -747,13 +747,11 @@ vim.diff({a}, {b}, {opts})                                        *vim.diff()*
 
 
 ==============================================================================
-VIM.MPACK                                                          *lua-mpack*
+VIM.MPACK                                                          *vim.mpack*
 
 
-The *vim.mpack* module provides encoding and decoding of Lua objects to
-and from msgpack-encoded strings. Supports |vim.NIL| and
-|vim.empty_dict()|.
-
+This module provides encoding and decoding of Lua objects to and from
+msgpack-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
 
 vim.mpack.decode({str})                                   *vim.mpack.decode()*
     Decodes (or "unpacks") the msgpack-encoded {str} to a Lua object.
@@ -766,12 +764,11 @@ vim.mpack.encode({obj})                                   *vim.mpack.encode()*
 
 
 ==============================================================================
-VIM.JSON                                                            *lua-json*
-
+VIM.JSON                                                            *vim.json*
 
-The *vim.json* module provides encoding and decoding of Lua objects to and
-from JSON-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
 
+This module provides encoding and decoding of Lua objects to and from
+JSON-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
 
 vim.json.decode({str}, {opts})                             *vim.json.decode()*
     Decodes (or "unpacks") the JSON-encoded {str} to a Lua object.
@@ -806,7 +803,7 @@ vim.json.encode({obj})                                     *vim.json.encode()*
 
 
 ==============================================================================
-VIM.SPELL                                                          *lua-spell*
+VIM.SPELL                                                          *vim.spell*
 
 vim.spell.check({str})                                     *vim.spell.check()*
     Check {str} for spelling errors. Similar to the Vimscript function
@@ -839,7 +836,7 @@ vim.spell.check({str})                                     *vim.spell.check()*
 
 
 ==============================================================================
-VIM                                                              *lua-builtin*
+VIM                                                              *vim.builtin*
 
 
 vim.api.{func}({...})                                                    *vim.api*
@@ -1744,7 +1741,7 @@ vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
 
 
 ==============================================================================
-Lua module: vim.inspector                                      *lua-inspector*
+Lua module: vim.inspector                                      *vim.inspector*
 
 vim.inspect_pos({bufnr}, {row}, {col}, {filter})           *vim.inspect_pos()*
     Get all the items at a given buffer position.
@@ -2324,7 +2321,7 @@ vim.validate({opt})                                           *vim.validate()*
 
 
 ==============================================================================
-Lua module: vim.loader                                            *lua-loader*
+Lua module: vim.loader                                            *vim.loader*
 
 vim.loader.disable()                                    *vim.loader.disable()*
     Disables the experimental Lua module loader:
@@ -2371,7 +2368,7 @@ vim.loader.reset({path})                                  *vim.loader.reset()*
 
 
 ==============================================================================
-Lua module: vim.uri                                                  *lua-uri*
+Lua module: vim.uri                                                  *vim.uri*
 
 vim.uri_from_bufnr({bufnr})                             *vim.uri_from_bufnr()*
     Get a URI from a bufnr
@@ -2412,7 +2409,7 @@ vim.uri_to_fname({uri})                                   *vim.uri_to_fname()*
 
 
 ==============================================================================
-Lua module: vim.ui                                                    *lua-ui*
+Lua module: vim.ui                                                    *vim.ui*
 
 vim.ui.input({opts}, {on_confirm})                            *vim.ui.input()*
     Prompts the user for input, allowing arbitrary (potentially asynchronous)
@@ -2502,7 +2499,7 @@ vim.ui.select({items}, {opts}, {on_choice})                  *vim.ui.select()*
 
 
 ==============================================================================
-Lua module: vim.filetype                                        *lua-filetype*
+Lua module: vim.filetype                                        *vim.filetype*
 
 vim.filetype.add({filetypes})                             *vim.filetype.add()*
     Add new filetype mappings.
@@ -2670,7 +2667,7 @@ vim.filetype.match({args})                              *vim.filetype.match()*
 
 
 ==============================================================================
-Lua module: vim.keymap                                            *lua-keymap*
+Lua module: vim.keymap                                            *vim.keymap*
 
 vim.keymap.del({modes}, {lhs}, {opts})                      *vim.keymap.del()*
     Remove an existing mapping. Examples: >lua
@@ -2730,7 +2727,7 @@ vim.keymap.set({mode}, {lhs}, {rhs}, {opts})                *vim.keymap.set()*
 
 
 ==============================================================================
-Lua module: vim.fs                                                    *lua-fs*
+Lua module: vim.fs                                                    *vim.fs*
 
 vim.fs.basename({file})                                    *vim.fs.basename()*
     Return the basename of the given file or directory
@@ -2893,7 +2890,7 @@ vim.fs.parents({start})                                     *vim.fs.parents()*
 
 
 ==============================================================================
-Lua module: vim.secure                                            *lua-secure*
+Lua module: vim.secure                                            *vim.secure*
 
 vim.secure.read({path})                                    *vim.secure.read()*
     Attempt to read the file at {path} prompting the user if the file should
@@ -2933,7 +2930,7 @@ vim.secure.trust({opts})                                  *vim.secure.trust()*
 
 
 ==============================================================================
-Lua module: vim.version                                          *lua-version*
+Lua module: vim.version                                          *vim.version*
 
 
 The `vim.version` module provides functions for comparing versions and
@@ -3116,12 +3113,12 @@ vim.version.range({spec})                                *vim.version.range()*
 
 
 ==============================================================================
-Lua module: vim.iter                                                *lua-iter*
+Lua module: vim.iter                                                *vim.iter*
 
 
-The *vim.iter* module provides a generic interface for working with
-iterables: tables, lists, iterator functions, pair()/ipair()-like
-iterators, and `vim.iter()` objects.
+This module provides a generic interface for working with iterables:
+tables, lists, iterator functions, pair()/ipair()-like iterators, and
+`vim.iter()` objects.
 
 *vim.iter()* wraps its table or function argument into an *Iter* object
 with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index 384dd4351d..a1786b2cdb 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -1,6 +1,6 @@
 ---@meta
 
----@defgroup lua-builtin
+---@defgroup vim.builtin
 ---
 ---@brief <pre>help
 ---vim.api.{func}({...})                                                    *vim.api*
diff --git a/runtime/lua/vim/_meta/json.lua b/runtime/lua/vim/_meta/json.lua
index 15e81d5004..2580b56870 100644
--- a/runtime/lua/vim/_meta/json.lua
+++ b/runtime/lua/vim/_meta/json.lua
@@ -1,8 +1,8 @@
 --- @meta
 
---- @defgroup lua-json
+--- @defgroup vim.json
 ---
---- @brief The \*vim.json\* module provides encoding and decoding of Lua objects to and
+--- This module provides encoding and decoding of Lua objects to and
 --- from JSON-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
 
 --- Decodes (or "unpacks") the JSON-encoded {str} to a Lua object.
diff --git a/runtime/lua/vim/_meta/mpack.lua b/runtime/lua/vim/_meta/mpack.lua
index 2764177e5c..1bcb6845b9 100644
--- a/runtime/lua/vim/_meta/mpack.lua
+++ b/runtime/lua/vim/_meta/mpack.lua
@@ -1,8 +1,8 @@
 --- @meta
 
---- @defgroup lua-mpack
+--- @defgroup vim.mpack
 ---
---- @brief The \*vim.mpack\* module provides encoding and decoding of Lua objects to and
+--- This module provides encoding and decoding of Lua objects to and
 --- from msgpack-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
 
 --- Decodes (or "unpacks") the msgpack-encoded {str} to a Lua object.
diff --git a/runtime/lua/vim/_meta/regex.lua b/runtime/lua/vim/_meta/regex.lua
index afa78772da..0af1bccea5 100644
--- a/runtime/lua/vim/_meta/regex.lua
+++ b/runtime/lua/vim/_meta/regex.lua
@@ -1,6 +1,6 @@
 --- @meta
 
---- @defgroup lua-regex
+--- @defgroup vim.regex
 ---
 --- @brief Vim regexes can be used directly from Lua. Currently they only allow
 --- matching within a single line.
diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index 97a5a1233f..0eb782339c 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -1,4 +1,4 @@
----@defgroup lua-highlight
+---@defgroup vim.highlight
 ---
 ---@brief
 ---Nvim includes a function for highlighting a selection on yank.
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 245a33625e..6c1afcad91 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -1,6 +1,6 @@
----@defgroup lua-iter
+---@defgroup vim.iter
 ---
---- @brief The \*vim.iter\* module provides a generic interface for working with
+--- This module provides a generic interface for working with
 --- iterables: tables, lists, iterator functions, pair()/ipair()-like iterators,
 --- and \`vim.iter()\` objects.
 ---
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index cd28a9b54b..8ff8a19cb9 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -1,4 +1,4 @@
---- @defgroup lua-version
+--- @defgroup vim.version
 ---
 --- @brief The \`vim.version\` module provides functions for comparing versions and ranges
 --- conforming to the https://semver.org spec. Plugins, and plugin managers, can use this to check
-- 
cgit 


From 69d49727d7766d799aa1989bf67e763258b868e6 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 17 Jul 2023 16:32:56 +0100
Subject: fix: luacheck

---
 runtime/lua/vim/_meta/builtin.lua | 2 ++
 runtime/lua/vim/_meta/diff.lua    | 2 ++
 runtime/lua/vim/_meta/json.lua    | 2 ++
 runtime/lua/vim/_meta/misc.lua    | 2 ++
 runtime/lua/vim/_meta/mpack.lua   | 2 ++
 runtime/lua/vim/_meta/regex.lua   | 4 +++-
 runtime/lua/vim/_meta/spell.lua   | 2 ++
 runtime/lua/vim/_options.lua      | 8 ++++----
 8 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index a1786b2cdb..1d7b1071b7 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -1,5 +1,7 @@
 ---@meta
 
+-- luacheck: no unused args
+
 ---@defgroup vim.builtin
 ---
 ---@brief <pre>help
diff --git a/runtime/lua/vim/_meta/diff.lua b/runtime/lua/vim/_meta/diff.lua
index 8e8aaf8b64..246ac0c75a 100644
--- a/runtime/lua/vim/_meta/diff.lua
+++ b/runtime/lua/vim/_meta/diff.lua
@@ -1,5 +1,7 @@
 ---@meta
 
+-- luacheck: no unused args
+
 --- Run diff on strings {a} and {b}. Any indices returned by this function,
 --- either directly or via callback arguments, are 1-based.
 ---
diff --git a/runtime/lua/vim/_meta/json.lua b/runtime/lua/vim/_meta/json.lua
index 2580b56870..76a6c7b733 100644
--- a/runtime/lua/vim/_meta/json.lua
+++ b/runtime/lua/vim/_meta/json.lua
@@ -1,5 +1,7 @@
 --- @meta
 
+-- luacheck: no unused args
+
 --- @defgroup vim.json
 ---
 --- This module provides encoding and decoding of Lua objects to and
diff --git a/runtime/lua/vim/_meta/misc.lua b/runtime/lua/vim/_meta/misc.lua
index 954e8b4675..8a76755962 100644
--- a/runtime/lua/vim/_meta/misc.lua
+++ b/runtime/lua/vim/_meta/misc.lua
@@ -1,5 +1,7 @@
 ---@meta
 
+-- luacheck: no unused args
+
 --- Invokes |vim-function| or |user-function| {func} with arguments {...}.
 --- See also |vim.fn|.
 --- Equivalent to:
diff --git a/runtime/lua/vim/_meta/mpack.lua b/runtime/lua/vim/_meta/mpack.lua
index 1bcb6845b9..54e097ad97 100644
--- a/runtime/lua/vim/_meta/mpack.lua
+++ b/runtime/lua/vim/_meta/mpack.lua
@@ -1,5 +1,7 @@
 --- @meta
 
+-- luacheck: no unused args
+
 --- @defgroup vim.mpack
 ---
 --- This module provides encoding and decoding of Lua objects to and
diff --git a/runtime/lua/vim/_meta/regex.lua b/runtime/lua/vim/_meta/regex.lua
index 0af1bccea5..4bca67797a 100644
--- a/runtime/lua/vim/_meta/regex.lua
+++ b/runtime/lua/vim/_meta/regex.lua
@@ -1,5 +1,7 @@
 --- @meta
 
+-- luacheck: no unused args
+
 --- @defgroup vim.regex
 ---
 --- @brief Vim regexes can be used directly from Lua. Currently they only allow
@@ -13,7 +15,7 @@
 function vim.regex(re) end
 
 --- @class vim.regex
-local regex = {}
+local regex = {} -- luacheck: no unused
 
 --- Match the string against the regex. If the string should match the regex
 --- precisely, surround the regex with `^` and `$`. If the was a match, the
diff --git a/runtime/lua/vim/_meta/spell.lua b/runtime/lua/vim/_meta/spell.lua
index 926c8a686d..d55867f769 100644
--- a/runtime/lua/vim/_meta/spell.lua
+++ b/runtime/lua/vim/_meta/spell.lua
@@ -1,5 +1,7 @@
 --- @meta
 
+-- luacheck: no unused args
+
 --- Check {str} for spelling errors. Similar to the Vimscript function
 --- |spellbadword()|.
 ---
diff --git a/runtime/lua/vim/_options.lua b/runtime/lua/vim/_options.lua
index d498ae0a2c..6dbe4cf64a 100644
--- a/runtime/lua/vim/_options.lua
+++ b/runtime/lua/vim/_options.lua
@@ -846,7 +846,7 @@ end
 ---</pre>
 
 --- @diagnostic disable-next-line:unused-local used for gen_vimdoc
-local Option = {}
+local Option = {} -- luacheck: no unused
 
 ---Returns a Lua-representation of the option. Boolean, number and string
 ---values will be returned in exactly the same fashion.
@@ -901,7 +901,7 @@ function Option:get() end
 ---</pre>
 ---@param value string Value to append
 --- @diagnostic disable-next-line:unused-local used for gen_vimdoc
-function Option:append(value) end
+function Option:append(value) end -- luacheck: no unused
 
 ---Prepend a value to string-style options. See |:set^=|
 ---
@@ -911,7 +911,7 @@ function Option:append(value) end
 ---</pre>
 ---@param value string Value to prepend
 ---@diagnostic disable-next-line:unused-local used for gen_vimdoc
-function Option:prepend(value) end
+function Option:prepend(value) end -- luacheck: no unused
 
 ---Remove a value from string-style options. See |:set-=|
 ---
@@ -921,7 +921,7 @@ function Option:prepend(value) end
 ---</pre>
 ---@param value string Value to remove
 ---@diagnostic disable-next-line:unused-local used for gen_vimdoc
-function Option:remove(value) end
+function Option:remove(value) end -- luacheck: no unused
 
 vim.opt = create_option_accessor()
 vim.opt_local = create_option_accessor('local')
-- 
cgit 


From 6e9b204afbe5f16c44a2697aed07aafff36bf856 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 17 Jul 2023 16:39:57 +0100
Subject: fix: doc errors

---
 runtime/doc/lua.txt               | 5 ++---
 runtime/doc/news-0.9.txt          | 6 +++---
 runtime/doc/vim_diff.txt          | 2 +-
 runtime/lua/vim/_meta/builtin.lua | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 3b25e2744e..fd75fdb2dd 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -826,8 +826,7 @@ vim.spell.check({str})                                     *vim.spell.check()*
       • {str}  (string)
 
     Return: ~
-        {[1]: string, [2]: string, [3]: string}[] List of tuples with three
-        items:
+        `{[1]: string, [2]: string, [3]: string}[]` List of tuples with three items:
         • The badly spelled word.
         • The type of the spelling error: "bad" spelling mistake "rare" rare
           word "local" word only valid in another region "caps" word should
@@ -914,7 +913,7 @@ vim.iconv({str}, {from}, {to}, {opts})                           *vim.iconv()*
       • {str}   (string) Text to convert
       • {from}  (number) Encoding of {str}
       • {to}    (number) Target encoding
-      • {opts}  table<string,|nil any>
+      • {opts}  table<string,any>|nil
 
     Return: ~
         (string|nil) Converted string if conversion succeeds, `nil` otherwise.
diff --git a/runtime/doc/news-0.9.txt b/runtime/doc/news-0.9.txt
index 5546703dab..33733822ea 100644
--- a/runtime/doc/news-0.9.txt
+++ b/runtime/doc/news-0.9.txt
@@ -119,11 +119,11 @@ The following new APIs or features were added.
 
 • Added an omnifunc implementation for Lua, |vim.lua_omnifunc()|
 
-• Added a new experimental |lua-loader| that byte-compiles and caches Lua files.
+• Added a new experimental |vim.loader| that byte-compiles and caches Lua files.
   To enable the new loader, add the following at the top of your |init.lua|: >lua
     vim.loader.enable()
 
-• Added |lua-version| for parsing and comparing version strings conforming to
+• Added |vim.version| for parsing and comparing version strings conforming to
   the semver specification.
 
 • When using Nvim inside tmux 3.2 or later, the default clipboard provider
@@ -273,7 +273,7 @@ REMOVED FEATURES
 
 The following deprecated functions or APIs were removed.
 
-• `filetype.vim` is removed in favor of |lua-filetype|
+• `filetype.vim` is removed in favor of |vim.filetype|
   (Note that filetype logic and tests still align with Vim, so additions or
   changes need to be contributed there first.)
   See https://github.com/neovim/neovim/pull/20674.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 5246d3c2b8..f7d0330744 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -186,7 +186,7 @@ backwards-compatibility cost. Some examples:
 
 Some features are built in that otherwise required external plugins:
 
-- Highlighting the yanked region, see |lua-highlight|.
+- Highlighting the yanked region, see |vim.highlight|.
 
 ARCHITECTURE
 
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index 1d7b1071b7..980e40d61b 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -141,7 +141,7 @@ function vim.str_utfindex(str, index) end
 --- @param str string Text to convert
 --- @param from number Encoding of {str}
 --- @param to number Target encoding
---- @param opts? table<string, any>
+--- @param opts? table<string,any>
 --- @return string|nil Converted string if conversion succeeds, `nil` otherwise.
 function vim.iconv(str, from, to, opts) end
 
-- 
cgit 


From 1b9ccd38a12f8fdbdff51ef0b3ff363540f745ec Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Mon, 17 Jul 2023 18:27:16 +0200
Subject: feat(lsp)!: rename vim.lsp.get_active_clients to get_clients (#24113)

---
 runtime/doc/deprecated.txt     |  5 +++--
 runtime/doc/lsp.txt            | 42 +++++++++++++++++++--------------------
 runtime/doc/news.txt           |  3 ++-
 runtime/lua/vim/lsp.lua        | 45 ++++++++++++++++++++++++------------------
 runtime/lua/vim/lsp/buf.lua    | 11 +++++------
 runtime/lua/vim/lsp/health.lua |  2 +-
 runtime/lua/vim/lsp/util.lua   |  8 ++++----
 7 files changed, 62 insertions(+), 54 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 6317789d22..81dd1e64bf 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -129,7 +129,7 @@ LSP FUNCTIONS
 - *vim.lsp.util.diagnostics_to_items()*		Use |vim.diagnostic.toqflist()| instead.
 - *vim.lsp.util.set_qflist()*			Use |setqflist()| instead.
 - *vim.lsp.util.set_loclist()*			Use |setloclist()| instead.
-- *vim.lsp.buf_get_clients()*			Use |vim.lsp.get_active_clients()| with
+- *vim.lsp.buf_get_clients()*			Use |vim.lsp.get_clients()| with
 						{buffer=bufnr} instead.
 - *vim.lsp.buf.formatting()*			Use |vim.lsp.buf.format()| with
 						{async=true} instead.
@@ -139,7 +139,8 @@ LSP FUNCTIONS
 						or |vim.lsp.buf.format()| instead.
 - *vim.lsp.util.get_progress_messages()*	Use |vim.lsp.status()| or access
 						`progress` of |vim.lsp.client|
-- *vim.lsp.for_each_buffer_client()*		Use |vim.lsp.get_active_clients()|
+- *vim.lsp.get_active_clients()*		Use |vim.lsp.get_clients()|
+- *vim.lsp.for_each_buffer_client()*		Use |vim.lsp.get_clients()|
 
 TREESITTER FUNCTIONS
 - *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 450690fe3b..ec0072e10e 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -38,7 +38,7 @@ Follow these steps to get LSP features:
     })
 <
 3. Check that the server attached to the buffer: >
-    :lua =vim.lsp.get_active_clients()
+    :lua =vim.lsp.get_clients()
 
 4. Configure keymaps and autocmds to use LSP features. See |lsp-config|.
 
@@ -105,7 +105,7 @@ calls behind capability checks:
 To learn what capabilities are available you can run the following command in
 a buffer with a started LSP client: >vim
 
-    :lua =vim.lsp.get_active_clients()[1].server_capabilities
+    :lua =vim.lsp.get_clients()[1].server_capabilities
 
 Full list of features provided by default can be found in |lsp-buf|.
 
@@ -114,7 +114,7 @@ FAQ                                                     *lsp-faq*
 
 - Q: How to force-reload LSP?
 - A: Stop all clients, then reload the buffer. >vim
-     :lua vim.lsp.stop_client(vim.lsp.get_active_clients())
+     :lua vim.lsp.stop_client(vim.lsp.get_clients())
      :edit
 
 - Q: Why isn't completion working?
@@ -690,7 +690,7 @@ buf_request_sync({bufnr}, {method}, {params}, {timeout_ms})
 
 client()                                                      *vim.lsp.client*
     LSP client object. You can get an active client object via
-    |vim.lsp.get_client_by_id()| or |vim.lsp.get_active_clients()|.
+    |vim.lsp.get_client_by_id()| or |vim.lsp.get_clients()|.
 
     • Methods:
       • request(method, params, [handler], bufnr) Sends a request to the
@@ -773,22 +773,6 @@ formatexpr({opts})                                      *vim.lsp.formatexpr()*
                 • timeout_ms (default 500ms). The timeout period for the
                   formatting request.
 
-get_active_clients({filter})                    *vim.lsp.get_active_clients()*
-    Get active clients.
-
-    Parameters: ~
-      • {filter}  (table|nil) A table with key-value pairs used to filter the
-                  returned clients. The available keys are:
-                  • id (number): Only return clients with the given id
-                  • bufnr (number): Only return clients attached to this
-                    buffer
-                  • name (string): Only return clients with the given name
-                  • method (string): Only return clients supporting the given
-                    method
-
-    Return: ~
-        lsp.Client []: List of |vim.lsp.client| objects
-
                                           *vim.lsp.get_buffers_by_client_id()*
 get_buffers_by_client_id({client_id})
     Returns list of buffers attached to client_id.
@@ -809,6 +793,22 @@ get_client_by_id({client_id})                     *vim.lsp.get_client_by_id()*
     Return: ~
         (nil|lsp.Client) client rpc object
 
+get_clients({filter})                                  *vim.lsp.get_clients()*
+    Get active clients.
+
+    Parameters: ~
+      • {filter}  (table|nil) A table with key-value pairs used to filter the
+                  returned clients. The available keys are:
+                  • id (number): Only return clients with the given id
+                  • bufnr (number): Only return clients attached to this
+                    buffer
+                  • name (string): Only return clients with the given name
+                  • method (string): Only return clients supporting the given
+                    method
+
+    Return: ~
+        lsp.Client []: List of |vim.lsp.client| objects
+
 get_log_path()                                        *vim.lsp.get_log_path()*
     Gets the path of the logfile used by the LSP client.
 
@@ -1040,7 +1040,7 @@ stop_client({client_id}, {force})                      *vim.lsp.stop_client()*
 
     You can also use the `stop()` function on a |vim.lsp.client| object. To stop all clients: >lua
 
-     vim.lsp.stop_client(vim.lsp.get_active_clients())
+     vim.lsp.stop_client(vim.lsp.get_clients())
 <
 
     By default asks the server to shutdown, unless stop was requested already
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 67726ebd9c..6294a8b505 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -204,7 +204,8 @@ release.
 
 • vim.lsp functions:
   - |vim.lsp.util.get_progress_messages()|	Use |vim.lsp.status()| instead.
-  - |vim.lsp.for_each_buffer_client()|	  	Use |vim.lsp.get_active_clients()| instead.
+  - |vim.lsp.get_active_clients()|	  	Use |vim.lsp.get_clients()| instead.
+  - |vim.lsp.for_each_buffer_client()|	  	Use |vim.lsp.get_clients()| instead.
 
 • `vim.loop` has been renamed to `vim.uv`.
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index e9a1423d2d..97aab45f2c 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -612,7 +612,7 @@ do
   ---@private
   function changetracking.send_changes(bufnr, firstline, lastline, new_lastline)
     local groups = {} ---@type table<string,CTGroup>
-    for _, client in pairs(lsp.get_active_clients({ bufnr = bufnr })) do
+    for _, client in pairs(lsp.get_clients({ bufnr = bufnr })) do
       local group = get_group(client)
       groups[group_key(group)] = group
     end
@@ -734,7 +734,7 @@ end
 -- FIXME: DOC: Shouldn't need to use a dummy function
 --
 --- LSP client object. You can get an active client object via
---- |vim.lsp.get_client_by_id()| or |vim.lsp.get_active_clients()|.
+--- |vim.lsp.get_client_by_id()| or |vim.lsp.get_clients()|.
 ---
 --- - Methods:
 ---
@@ -880,7 +880,7 @@ function lsp.start(config, opts)
   if bufnr == nil or bufnr == 0 then
     bufnr = api.nvim_get_current_buf()
   end
-  for _, clients in ipairs({ uninitialized_clients, lsp.get_active_clients() }) do
+  for _, clients in ipairs({ uninitialized_clients, lsp.get_clients() }) do
     for _, client in pairs(clients) do
       if reuse_client(client, config) then
         lsp.buf_attach_client(bufnr, client.id)
@@ -903,7 +903,7 @@ end
 function lsp.status()
   local percentage = nil
   local messages = {}
-  for _, client in ipairs(vim.lsp.get_active_clients()) do
+  for _, client in ipairs(vim.lsp.get_clients()) do
     for progress in client.progress do
       local value = progress.value
       if type(value) == 'table' and value.kind then
@@ -1755,7 +1755,7 @@ local function text_document_did_save_handler(bufnr)
   bufnr = resolve_bufnr(bufnr)
   local uri = vim.uri_from_bufnr(bufnr)
   local text = once(buf_get_full_text)
-  for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
+  for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
     local name = api.nvim_buf_get_name(bufnr)
     local old_name = changetracking._get_and_set_name(client, bufnr, name)
     if old_name and name ~= old_name then
@@ -1823,7 +1823,7 @@ function lsp.buf_attach_client(bufnr, client_id)
       buffer = bufnr,
       desc = 'vim.lsp: textDocument/willSave',
       callback = function(ctx)
-        for _, client in ipairs(lsp.get_active_clients({ bufnr = ctx.buf })) do
+        for _, client in ipairs(lsp.get_clients({ bufnr = ctx.buf })) do
           local params = {
             textDocument = {
               uri = uri,
@@ -1858,7 +1858,7 @@ function lsp.buf_attach_client(bufnr, client_id)
       on_lines = text_document_did_change_handler,
       on_reload = function()
         local params = { textDocument = { uri = uri } }
-        for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
+        for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
           changetracking.reset_buf(client, bufnr)
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
             client.notify('textDocument/didClose', params)
@@ -1868,7 +1868,7 @@ function lsp.buf_attach_client(bufnr, client_id)
       end,
       on_detach = function()
         local params = { textDocument = { uri = uri } }
-        for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
+        for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
           changetracking.reset_buf(client, bufnr)
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
             client.notify('textDocument/didClose', params)
@@ -1985,7 +1985,7 @@ end
 --- You can also use the `stop()` function on a |vim.lsp.client| object.
 --- To stop all clients:
 --- <pre>lua
---- vim.lsp.stop_client(vim.lsp.get_active_clients())
+--- vim.lsp.stop_client(vim.lsp.get_clients())
 --- </pre>
 ---
 --- By default asks the server to shutdown, unless stop was requested
@@ -2006,7 +2006,7 @@ function lsp.stop_client(client_id, force)
   end
 end
 
----@class vim.lsp.get_active_clients.filter
+---@class vim.lsp.get_clients.filter
 ---@field id integer|nil Match clients by id
 ---@field bufnr integer|nil match clients attached to the given buffer
 ---@field name string|nil match clients by name
@@ -2014,7 +2014,7 @@ end
 
 --- Get active clients.
 ---
----@param filter vim.lsp.get_active_clients.filter|nil (table|nil) A table with
+---@param filter vim.lsp.get_clients.filter|nil (table|nil) A table with
 ---              key-value pairs used to filter the returned clients.
 ---              The available keys are:
 ---               - id (number): Only return clients with the given id
@@ -2022,7 +2022,7 @@ end
 ---               - name (string): Only return clients with the given name
 ---               - method (string): Only return clients supporting the given method
 ---@return lsp.Client[]: List of |vim.lsp.client| objects
-function lsp.get_active_clients(filter)
+function lsp.get_clients(filter)
   validate({ filter = { filter, 't', true } })
 
   filter = filter or {}
@@ -2045,6 +2045,13 @@ function lsp.get_active_clients(filter)
   return clients
 end
 
+---@private
+---@deprecated
+function lsp.get_active_clients(filter)
+  -- TODO: add vim.deprecate call after 0.10 is out for removal in 0.12
+  return lsp.get_clients(filter)
+end
+
 api.nvim_create_autocmd('VimLeavePre', {
   desc = 'vim.lsp: exit handler',
   callback = function()
@@ -2125,7 +2132,7 @@ function lsp.buf_request(bufnr, method, params, handler)
 
   bufnr = resolve_bufnr(bufnr)
   local method_supported = false
-  local clients = lsp.get_active_clients({ bufnr = bufnr })
+  local clients = lsp.get_clients({ bufnr = bufnr })
   local client_request_ids = {}
   for _, client in ipairs(clients) do
     if client.supports_method(method, { bufnr = bufnr }) then
@@ -2173,7 +2180,7 @@ function lsp.buf_request_all(bufnr, method, params, handler)
   local expected_result_count = 0
 
   local set_expected_result_count = once(function()
-    for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
+    for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
       if client.supports_method(method, { bufnr = bufnr }) then
         expected_result_count = expected_result_count + 1
       end
@@ -2240,7 +2247,7 @@ function lsp.buf_notify(bufnr, method, params)
     method = { method, 's' },
   })
   local resp = false
-  for _, client in ipairs(lsp.get_active_clients({ bufnr = bufnr })) do
+  for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
     if client.rpc.notify(method, params) then
       resp = true
     end
@@ -2367,7 +2374,7 @@ function lsp.formatexpr(opts)
     return 0
   end
   local bufnr = api.nvim_get_current_buf()
-  for _, client in pairs(lsp.get_active_clients({ bufnr = bufnr })) do
+  for _, client in pairs(lsp.get_clients({ bufnr = bufnr })) do
     if client.supports_method('textDocument/rangeFormatting') then
       local params = util.make_formatting_params()
       local end_line = vim.fn.getline(end_lnum) --[[@as string]]
@@ -2424,10 +2431,10 @@ end
 ---
 ---@param bufnr (integer|nil): Buffer handle, or 0 for current
 ---@return table result is table of (client_id, client) pairs
----@deprecated Use |vim.lsp.get_active_clients()| instead.
+---@deprecated Use |vim.lsp.get_clients()| instead.
 function lsp.buf_get_clients(bufnr)
   local result = {}
-  for _, client in ipairs(lsp.get_active_clients({ bufnr = resolve_bufnr(bufnr) })) do
+  for _, client in ipairs(lsp.get_clients({ bufnr = resolve_bufnr(bufnr) })) do
     result[client.id] = client
   end
   return result
@@ -2478,7 +2485,7 @@ end
 ---                 vim.print(client)
 ---               end)
 ---             </pre>
----@deprecated use lsp.get_active_clients({ bufnr = bufnr }) with regular loop
+---@deprecated use lsp.get_clients({ bufnr = bufnr }) with regular loop
 function lsp.for_each_buffer_client(bufnr, fn)
   return for_each_buffer_client(bufnr, fn)
 end
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index b238b5c221..2140d3ae37 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -197,7 +197,6 @@ end
 function M.format(options)
   options = options or {}
   local bufnr = options.bufnr or api.nvim_get_current_buf()
-
   local mode = api.nvim_get_mode().mode
   local range = options.range
   if not range and mode == 'v' or mode == 'V' then
@@ -205,7 +204,7 @@ function M.format(options)
   end
   local method = range and 'textDocument/rangeFormatting' or 'textDocument/formatting'
 
-  local clients = vim.lsp.get_active_clients({
+  local clients = vim.lsp.get_clients({
     id = options.id,
     bufnr = bufnr,
     name = options.name,
@@ -271,7 +270,7 @@ end
 function M.rename(new_name, options)
   options = options or {}
   local bufnr = options.bufnr or api.nvim_get_current_buf()
-  local clients = vim.lsp.get_active_clients({
+  local clients = vim.lsp.get_clients({
     bufnr = bufnr,
     name = options.name,
     -- Clients must at least support rename, prepareRename is optional
@@ -468,7 +467,7 @@ end
 ---
 function M.list_workspace_folders()
   local workspace_folders = {}
-  for _, client in pairs(vim.lsp.get_active_clients({ bufnr = 0 })) do
+  for _, client in pairs(vim.lsp.get_clients({ bufnr = 0 })) do
     for _, folder in pairs(client.workspace_folders or {}) do
       table.insert(workspace_folders, folder.name)
     end
@@ -493,7 +492,7 @@ function M.add_workspace_folder(workspace_folder)
     { { uri = vim.uri_from_fname(workspace_folder), name = workspace_folder } },
     {}
   )
-  for _, client in pairs(vim.lsp.get_active_clients({ bufnr = 0 })) do
+  for _, client in pairs(vim.lsp.get_clients({ bufnr = 0 })) do
     local found = false
     for _, folder in pairs(client.workspace_folders or {}) do
       if folder.name == workspace_folder then
@@ -526,7 +525,7 @@ function M.remove_workspace_folder(workspace_folder)
     { {} },
     { { uri = vim.uri_from_fname(workspace_folder), name = workspace_folder } }
   )
-  for _, client in pairs(vim.lsp.get_active_clients({ bufnr = 0 })) do
+  for _, client in pairs(vim.lsp.get_clients({ bufnr = 0 })) do
     for idx, folder in pairs(client.workspace_folders or {}) do
       if folder.name == workspace_folder then
         vim.lsp.buf_notify(0, 'workspace/didChangeWorkspaceFolders', params)
diff --git a/runtime/lua/vim/lsp/health.lua b/runtime/lua/vim/lsp/health.lua
index 8817bb71de..023b1c26be 100644
--- a/runtime/lua/vim/lsp/health.lua
+++ b/runtime/lua/vim/lsp/health.lua
@@ -28,7 +28,7 @@ function M.check()
   local report_fn = (log_size / 1000000 > 100 and report_warn or report_info)
   report_fn(string.format('Log size: %d KB', log_size / 1000))
 
-  local clients = vim.lsp.get_active_clients()
+  local clients = vim.lsp.get_clients()
   vim.health.start('vim.lsp: Active Clients')
   if next(clients) then
     for _, client in pairs(clients) do
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 0da88f800e..59b9916f64 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -360,7 +360,7 @@ function M.get_progress_messages()
   local new_messages = {}
   local progress_remove = {}
 
-  for _, client in ipairs(vim.lsp.get_active_clients()) do
+  for _, client in ipairs(vim.lsp.get_clients()) do
     local groups = {}
     for progress in client.progress do
       local value = progress.value
@@ -1841,7 +1841,7 @@ function M.locations_to_items(locations, offset_encoding)
       'locations_to_items must be called with valid offset encoding',
       vim.log.levels.WARN
     )
-    offset_encoding = vim.lsp.get_active_clients({ bufnr = 0 })[1].offset_encoding
+    offset_encoding = vim.lsp.get_clients({ bufnr = 0 })[1].offset_encoding
   end
 
   local items = {}
@@ -2036,7 +2036,7 @@ function M._get_offset_encoding(bufnr)
 
   local offset_encoding
 
-  for _, client in pairs(vim.lsp.get_active_clients({ bufnr = bufnr })) do
+  for _, client in pairs(vim.lsp.get_clients({ bufnr = bufnr })) do
     if client.offset_encoding == nil then
       vim.notify_once(
         string.format(
@@ -2183,7 +2183,7 @@ function M.character_offset(buf, row, col, offset_encoding)
       'character_offset must be called with valid offset encoding',
       vim.log.levels.WARN
     )
-    offset_encoding = vim.lsp.get_active_clients({ bufnr = buf })[1].offset_encoding
+    offset_encoding = vim.lsp.get_clients({ bufnr = buf })[1].offset_encoding
   end
   -- If the col is past the EOL, use the line length.
   if col > #line then
-- 
cgit 


From e4da418ba8388e94bb186e3f9a2004ee1e96f1e5 Mon Sep 17 00:00:00 2001
From: Mike <4576770+mike325@users.noreply.github.com>
Date: Tue, 18 Jul 2023 08:36:04 +0200
Subject: fix(fs.lua): normalize slash truncation (#23753)

Preserve last slash in windows' root drive directories
---
 runtime/lua/vim/fs.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 48d76e5d7e..d06dcb87cf 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -348,7 +348,11 @@ function M.normalize(path, opts)
     path = path:gsub('%$([%w_]+)', vim.uv.os_getenv)
   end
 
-  return (path:gsub('\\', '/'):gsub('/+', '/'):gsub('(.)/$', '%1'))
+  path = path:gsub('\\', '/'):gsub('/+', '/')
+  if iswin and path:match('^%w:/$') then
+    return path
+  end
+  return (path:gsub('(.)/$', '%1'))
 end
 
 return M
-- 
cgit 


From 9fcb0a64ee9195434113c10cb6e958cfe3b2c2cd Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 18 Jul 2023 12:24:53 +0100
Subject: refactor(lua2dox): overhaul (#24386)

---
 runtime/doc/lua.txt        | 8 ++++----
 runtime/doc/treesitter.txt | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index fd75fdb2dd..ac40d61e20 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -674,7 +674,7 @@ vim.regex:match_str({str})                                 *regex:match_str()*
     match is returned. When there is no match, `nil` is returned. As any integer is truth-y, `regex:match()` can be directly used as a condition in an if-statement.
 
     Parameters: ~
-      • {str}   (string)
+      • {str}  (string)
 
 
 ==============================================================================
@@ -1988,13 +1988,13 @@ vim.Ringbuf:peek()                                            *Ringbuf:peek()*
     Returns the first unread item without removing it
 
     Return: ~
-        any?|ni
+        any?|nil
 
 vim.Ringbuf:pop()                                              *Ringbuf:pop()*
     Removes and returns the first unread item
 
     Return: ~
-        any?|ni
+        any?|nil
 
 vim.Ringbuf:push({item})                                      *Ringbuf:push()*
     Adds an item, overriding the oldest item if the buffer is full.
@@ -3044,7 +3044,7 @@ vim.version.last({versions})                              *vim.version.last()*
       • {versions}  Version []
 
     Return: ~
-        Version ?|ni
+        Version ?|nil
 
 vim.version.lt({v1}, {v2})                                  *vim.version.lt()*
     Returns `true` if `v1 < v2` . See |vim.version.cmp()| for usage.
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index bb0d435f4a..1effc87500 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1035,7 +1035,7 @@ set({lang}, {query_name}, {text})                 *vim.treesitter.query.set()*
 Lua module: vim.treesitter.highlighter            *lua-treesitter-highlighter*
 
 TSHighlighter:destroy()                              *TSHighlighter:destroy()*
-    Removes all internal references to the highlighter
+    Removes all internal references to the highlighter.
 
 
 ==============================================================================
@@ -1100,7 +1100,8 @@ LanguageTree:destroy()                                *LanguageTree:destroy()*
 
     Any cleanup logic should be performed here.
 
-    Note: This DOES NOT remove this tree from a parent. Instead, `remove_child` must be called on the parent to remove it.
+    Note: This DOES NOT remove this tree from a parent. Instead,
+    `remove_child` must be called on the parent to remove it.
 
                                                *LanguageTree:for_each_child()*
 LanguageTree:for_each_child({fn}, {include_self})
@@ -1117,7 +1118,7 @@ LanguageTree:for_each_tree({fn})                *LanguageTree:for_each_tree()*
     Note: This includes the invoking tree's child trees as well.
 
     Parameters: ~
-      • {fn}    fun(tree: TSTree, ltree: LanguageTree)
+      • {fn}  fun(tree: TSTree, ltree: LanguageTree)
 
 LanguageTree:included_regions()              *LanguageTree:included_regions()*
     Gets the set of included regions
-- 
cgit 


From be74807eef13ff8c90d55cf8b22b01d6d33b1641 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 18 Jul 2023 15:42:30 +0100
Subject: docs(lua): more improvements (#24387)

* docs(lua): teach lua2dox how to table

* docs(lua): teach gen_vimdoc.py about local functions

No more need to mark local functions with @private

* docs(lua): mention @nodoc and @meta in dev-lua-doc

* fixup!

Co-authored-by: Justin M. Keyes <justinkz@gmail.com>

---------

Co-authored-by: Justin M. Keyes <justinkz@gmail.com>
---
 runtime/doc/develop.txt                     |   2 +
 runtime/doc/lsp.txt                         |  18 ++++
 runtime/doc/lua.txt                         | 162 ++++++++++++++--------------
 runtime/lua/vim/_editor.lua                 |  20 ++--
 runtime/lua/vim/_inspector.lua              |   6 --
 runtime/lua/vim/_options.lua                | 142 ++++++++++--------------
 runtime/lua/vim/_system.lua                 |   3 -
 runtime/lua/vim/_watch.lua                  |   3 -
 runtime/lua/vim/diagnostic.lua              |  24 -----
 runtime/lua/vim/filetype.lua                |   5 -
 runtime/lua/vim/fs.lua                      |   1 -
 runtime/lua/vim/highlight.lua               |  19 ++--
 runtime/lua/vim/iter.lua                    |  12 ---
 runtime/lua/vim/loader.lua                  |   8 +-
 runtime/lua/vim/lsp.lua                     |  44 ++------
 runtime/lua/vim/lsp/_watchfiles.lua         |   1 -
 runtime/lua/vim/lsp/buf.lua                 |  14 ---
 runtime/lua/vim/lsp/codelens.lua            |   4 -
 runtime/lua/vim/lsp/diagnostic.lua          |   9 +-
 runtime/lua/vim/lsp/handlers.lua            |   3 -
 runtime/lua/vim/lsp/inlay_hint.lua          |   9 --
 runtime/lua/vim/lsp/log.lua                 |  17 ++-
 runtime/lua/vim/lsp/rpc.lua                 |  68 ++++++------
 runtime/lua/vim/lsp/semantic_tokens.lua     |   7 --
 runtime/lua/vim/lsp/sync.lua                |   7 --
 runtime/lua/vim/lsp/tagfunc.lua             |   4 -
 runtime/lua/vim/lsp/util.lua                |  25 +----
 runtime/lua/vim/secure.lua                  |   2 -
 runtime/lua/vim/shared.lua                  |  83 +++++++-------
 runtime/lua/vim/treesitter.lua              |   8 +-
 runtime/lua/vim/treesitter/dev.lua          |   2 -
 runtime/lua/vim/treesitter/highlighter.lua  |   2 +-
 runtime/lua/vim/treesitter/language.lua     |   1 -
 runtime/lua/vim/treesitter/languagetree.lua |   5 -
 runtime/lua/vim/treesitter/query.lua        |   9 --
 runtime/lua/vim/uri.lua                     |  24 ++---
 runtime/lua/vim/version.lua                 |   3 -
 37 files changed, 279 insertions(+), 497 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index db878ac304..f36ef1df0a 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -233,6 +233,8 @@ Docstring format:
   - List-items start with `-` (useful to nest or "indent")
 - Use `<pre>` for code samples.
   Code samples can be annotated as `vim` or `lua`
+- Use `@nodoc` to prevent documentation generation.
+- Files which has `@meta` are only used for typing and documentation.
 
 Example: the help for |vim.paste()| is generated from a docstring decorating
 vim.paste in runtime/lua/vim/_editor.lua like this: >
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index fa109dbc26..edc9f50c8d 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -758,6 +758,24 @@ client_is_stopped({client_id})                   *vim.lsp.client_is_stopped()*
     Return: ~
         (boolean) stopped true if client is stopped, false otherwise.
 
+commands                                                    *vim.lsp.commands*
+    Registry for client side commands. This is an extension point for plugins
+    to handle custom commands which are not part of the core language server
+    protocol specification.
+
+    The registry is a table where the key is a unique command name, and the
+    value is a function which is called if any LSP action (code action, code
+    lenses, ...) triggers the command.
+
+    If a LSP response contains a command for which no matching entry is
+    available in this registry, the command will be executed via the LSP
+    server using `workspace/executeCommand`.
+
+    The first argument to the function will be the `Command`: Command title:
+    String command: String arguments?: any[]
+
+    The second argument is the `ctx` of |lsp-handler|
+
 formatexpr({opts})                                      *vim.lsp.formatexpr()*
     Provides an interface between the built-in client and a `formatexpr`
     function.
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ac40d61e20..0b894897d1 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -591,16 +591,6 @@ If you want to exclude visual selections from highlighting on yank, use: >vim
     au TextYankPost * silent! lua vim.highlight.on_yank {on_visual=false}
 <
 
-vim.highlight.priorities                            *vim.highlight.priorities*
-
-    Table with default priorities used for highlighting:
-        • `syntax`: `50`, used for standard syntax highlighting
-        • `treesitter`: `100`, used for tree-sitter-based highlighting
-        • `semantic_tokens`: `125`, used for LSP semantic token highlighting
-        • `diagnostics`: `150`, used for code analysis such as diagnostics
-        • `user`: `200`, used for user-triggered highlights such as LSP document
-          symbols or `on_yank` autocommands
-
 vim.highlight.on_yank({opts})                        *vim.highlight.on_yank()*
     Highlight the yanked text
 
@@ -616,6 +606,15 @@ vim.highlight.on_yank({opts})                        *vim.highlight.on_yank()*
                 • priority integer priority (default
                   |vim.highlight.priorities|`.user`)
 
+vim.highlight.priorities                            *vim.highlight.priorities*
+    Table with default priorities used for highlighting:
+    • `syntax`: `50`, used for standard syntax highlighting
+    • `treesitter`: `100`, used for tree-sitter-based highlighting
+    • `semantic_tokens`: `125`, used for LSP semantic token highlighting
+    • `diagnostics`: `150`, used for code analysis such as diagnostics
+    • `user`: `200`, used for user-triggered highlights such as LSP document
+      symbols or `on_yank` autocommands
+
                                                        *vim.highlight.range()*
 vim.highlight.range({bufnr}, {ns}, {higroup}, {start}, {finish}, {opts})
     Apply highlight group to range of text.
@@ -1189,15 +1188,6 @@ vim.v                                                                  *vim.v*
     |v:| variables.
     Invalid or unset key returns `nil`.
 
-vim.env                                                              *vim.env*
-    Environment variables defined in the editor session.
-    See |expand-env| and |:let-environment| for the Vimscript behavior.
-    Invalid or unset key returns `nil`.
-    Example: >lua
-        vim.env.FOO = 'bar'
-        print(vim.env.TERM)
-<
-
 ` `                                                                *lua-options*
                                                              *lua-vim-options*
                                                                  *lua-vim-set*
@@ -1221,62 +1211,6 @@ window-scoped options. Note that this must NOT be confused with
 |local-options| and |:setlocal|. There is also |vim.go| that only accesses the
 global value of a |global-local| option, see |:setglobal|.
 
-vim.o                                                                  *vim.o*
-    Get or set |options|. Like `:set`. Invalid key is an error.
-
-    Note: this works on both buffer-scoped and window-scoped options using the
-    current buffer and window.
-
-    Example: >lua
-        vim.o.cmdheight = 4
-        print(vim.o.columns)
-        print(vim.o.foo)     -- error: invalid key
-<
-
-vim.go                                                                *vim.go*
-    Get or set global |options|. Like `:setglobal`. Invalid key is
-    an error.
-
-    Note: this is different from |vim.o| because this accesses the global
-    option value and thus is mostly useful for use with |global-local|
-    options.
-
-    Example: >lua
-        vim.go.cmdheight = 4
-        print(vim.go.columns)
-        print(vim.go.bar)     -- error: invalid key
-<
-
-vim.bo[{bufnr}]                                                                *vim.bo*
-    Get or set buffer-scoped |options| for the buffer with number {bufnr}.
-    Like `:set` and `:setlocal`. If [{bufnr}] is omitted then the current
-    buffer is used. Invalid {bufnr} or key is an error.
-
-    Note: this is equivalent to both `:set` and `:setlocal`.
-
-    Example: >lua
-        local bufnr = vim.api.nvim_get_current_buf()
-        vim.bo[bufnr].buflisted = true    -- same as vim.bo.buflisted = true
-        print(vim.bo.comments)
-        print(vim.bo.baz)                 -- error: invalid key
-
-vim.wo[{winid}][{bufnr}]                                                       *vim.wo*
-    Get or set window-scoped |options| for the window with handle {winid} and
-    buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
-    `:set` otherwise. If [{winid}] is omitted then the current window is
-    used. Invalid {winid}, {bufnr} or key is an error.
-
-    Note: only {bufnr} with value `0` (the current buffer in the window) is
-    supported.
-
-    Example: >lua
-        local winid = vim.api.nvim_get_current_win()
-        vim.wo[winid].number = true    -- same as vim.wo.number = true
-        print(vim.wo.foldmarker)
-        print(vim.wo.quux)             -- error: invalid key
-        vim.wo[winid][0].spell = false -- like ':setlocal nospell'
-<
-
 ` `                                                                       *vim.opt_local*
                                                                        *vim.opt_global*
                                                                               *vim.opt*
@@ -1419,11 +1353,81 @@ Option:remove({value})                                      *vim.opt:remove()*
     Parameters: ~
       • {value}  (string) Value to remove
 
+vim.bo                                                                *vim.bo*
+    Get or set buffer-scoped |options| for the buffer with number {bufnr}.
+    Like `:set` and `:setlocal`. If [{bufnr}] is omitted then the current
+    buffer is used. Invalid {bufnr} or key is an error.
+
+    Note: this is equivalent to both `:set` and `:setlocal`.
+
+    Example: >lua
+        local bufnr = vim.api.nvim_get_current_buf()
+        vim.bo[bufnr].buflisted = true    -- same as vim.bo.buflisted = true
+        print(vim.bo.comments)
+        print(vim.bo.baz)                 -- error: invalid key
+<
+
+    Parameters: ~
+      • {bufnr}  (integer|nil)
+
+vim.env                                                              *vim.env*
+    Environment variables defined in the editor session. See |expand-env| and
+    |:let-environment| for the Vimscript behavior. Invalid or unset key
+    returns `nil` . Example: >lua
+        vim.env.FOO = 'bar'
+        print(vim.env.TERM)
+<
+
+    Parameters: ~
+      • {var}  (string)
+
+vim.go                                                                *vim.go*
+    Get or set global |options|. Like `:setglobal`. Invalid key is an error.
+
+    Note: this is different from |vim.o| because this accesses the global
+    option value and thus is mostly useful for use with |global-local|
+    options.
+
+    Example: >lua
+        vim.go.cmdheight = 4
+        print(vim.go.columns)
+        print(vim.go.bar)     -- error: invalid key
+<
+
+vim.o                                                                  *vim.o*
+    Get or set |options|. Like `:set`. Invalid key is an error.
+
+    Note: this works on both buffer-scoped and window-scoped options using the
+    current buffer and window.
+
+    Example: >lua
+        vim.o.cmdheight = 4
+        print(vim.o.columns)
+        print(vim.o.foo)     -- error: invalid key
+<
+
+vim.wo                                                                *vim.wo*
+    Get or set window-scoped |options| for the window with handle {winid} and
+    buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
+    `:set` otherwise. If [{winid}] is omitted then the current window is used.
+    Invalid {winid}, {bufnr} or key is an error.
+
+    Note: only {bufnr} with value `0` (the current buffer in the window) is
+    supported.
+
+    Example: >lua
+        local winid = vim.api.nvim_get_current_win()
+        vim.wo[winid].number = true    -- same as vim.wo.number = true
+        print(vim.wo.foldmarker)
+        print(vim.wo.quux)             -- error: invalid key
+        vim.wo[winid][0].spell = false -- like ':setlocal nospell'
+<
+
 
 ==============================================================================
 Lua module: vim                                                      *lua-vim*
 
-vim.cmd({command})                                                 *vim.cmd()*
+vim.cmd                                                            *vim.cmd()*
     Execute Vim script commands.
 
     Note that `vim.cmd` can be indexed with a command name to return a
@@ -1468,10 +1472,6 @@ vim.cmd({command})                                                 *vim.cmd()*
     See also: ~
       • |ex-cmd-index|
 
-                                             *vim.connection_failure_errmsg()*
-vim.connection_failure_errmsg({consequence})
-    TODO: Documentation
-
 vim.defer_fn({fn}, {timeout})                                 *vim.defer_fn()*
     Defers calling {fn} until {timeout} ms passes.
 
@@ -1501,7 +1501,7 @@ vim.deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
     Return: ~
         (string|nil) # Deprecated message, or nil if no message was shown.
 
-vim.inspect({object}, {options})                               *vim.inspect()*
+vim.inspect                                                    *vim.inspect()*
     Gets a human-readable representation of the given object.
 
     See also: ~
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index bb0aa97a0d..4372aef7b3 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -54,6 +54,7 @@ vim._extra = {
   inspect_pos = true,
 }
 
+--- @private
 vim.log = {
   levels = {
     TRACE = 0,
@@ -187,9 +188,7 @@ end
 ---@see |vim.print()|
 ---@see https://github.com/kikito/inspect.lua
 ---@see https://github.com/mpeterv/vinspect
-local function inspect(object, options) -- luacheck: no unused
-  error(object, options) -- Stub for gen_vimdoc.py
-end
+vim.inspect = vim.inspect
 
 do
   local tdots, tick, got_line1, undo_started, trailing_nl = 0, 0, false, false, false
@@ -328,6 +327,7 @@ function vim.schedule_wrap(cb)
 end
 
 -- vim.fn.{func}(...)
+---@private
 vim.fn = setmetatable({}, {
   __index = function(t, key)
     local _fn
@@ -345,10 +345,13 @@ vim.fn = setmetatable({}, {
   end,
 })
 
+--- @private
 vim.funcref = function(viml_func_name)
   return vim.fn[viml_func_name]
 end
 
+local VIM_CMD_ARG_MAX = 20
+
 --- Execute Vim script commands.
 ---
 --- Note that `vim.cmd` can be indexed with a command name to return a callable function to the
@@ -389,12 +392,6 @@ end
 ---                            If a table, executes a single command. In this case, it is an alias
 ---                            to |nvim_cmd()| where `opts` is empty.
 ---@see |ex-cmd-index|
-function vim.cmd(command) -- luacheck: no unused
-  error(command) -- Stub for gen_vimdoc.py
-end
-
-local VIM_CMD_ARG_MAX = 20
-
 vim.cmd = setmetatable({}, {
   __call = function(_, command)
     if type(command) == 'table' then
@@ -435,7 +432,6 @@ vim.cmd = setmetatable({}, {
 do
   local validate = vim.validate
 
-  ---@private
   local function make_dict_accessor(scope, handle)
     validate({
       scope = { scope, 's' },
@@ -745,7 +741,6 @@ function vim._expand_pat(pat, env)
   end
 
   local keys = {}
-  ---@private
   local function insert_keys(obj)
     for k, _ in pairs(obj) do
       if type(k) == 'string' and string.sub(k, 1, string.len(match_part)) == match_part then
@@ -1008,7 +1003,6 @@ end
 function vim._init_default_mappings()
   -- mappings
 
-  ---@private
   local function region_chunks(region)
     local chunks = {}
     local maxcol = vim.v.maxcol
@@ -1020,7 +1014,6 @@ function vim._init_default_mappings()
     return chunks
   end
 
-  ---@private
   local function _visual_search(cmd)
     assert(cmd == '/' or cmd == '?')
     vim.api.nvim_feedkeys('\27', 'nx', true) -- Escape visual mode.
@@ -1037,7 +1030,6 @@ function vim._init_default_mappings()
     vim.api.nvim_feedkeys(search_cmd, 'nx', true)
   end
 
-  ---@private
   local function map(mode, lhs, rhs)
     vim.keymap.set(mode, lhs, rhs, { desc = 'Nvim builtin' })
   end
diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua
index ecd39c35bc..3f7b9d2c23 100644
--- a/runtime/lua/vim/_inspector.lua
+++ b/runtime/lua/vim/_inspector.lua
@@ -56,7 +56,6 @@ function vim.inspect_pos(bufnr, row, col, filter)
   }
 
   -- resolve hl links
-  ---@private
   local function resolve_hl(data)
     if data.hl_group then
       local hlid = vim.api.nvim_get_hl_id_by_name(data.hl_group)
@@ -91,7 +90,6 @@ function vim.inspect_pos(bufnr, row, col, filter)
   end
 
   --- Convert an extmark tuple into a table
-  --- @private
   local function to_map(extmark)
     extmark = {
       id = extmark[1],
@@ -107,7 +105,6 @@ function vim.inspect_pos(bufnr, row, col, filter)
   end
 
   --- Check if an extmark overlaps this position
-  --- @private
   local function is_here(extmark)
     return (row >= extmark.row and row <= extmark.end_row) -- within the rows of the extmark
       and (row > extmark.row or col >= extmark.col) -- either not the first row, or in range of the col
@@ -148,17 +145,14 @@ function vim.show_pos(bufnr, row, col, filter)
 
   local lines = { {} }
 
-  ---@private
   local function append(str, hl)
     table.insert(lines[#lines], { str, hl })
   end
 
-  ---@private
   local function nl()
     table.insert(lines, {})
   end
 
-  ---@private
   local function item(data, comment)
     append('  - ')
     append(data.hl_group, data.hl_group)
diff --git a/runtime/lua/vim/_options.lua b/runtime/lua/vim/_options.lua
index 6dbe4cf64a..d54e8b447c 100644
--- a/runtime/lua/vim/_options.lua
+++ b/runtime/lua/vim/_options.lua
@@ -92,15 +92,6 @@
 ---vim.v                                                                  *vim.v*
 ---    |v:| variables.
 ---    Invalid or unset key returns `nil`.
----
----vim.env                                                              *vim.env*
----    Environment variables defined in the editor session.
----    See |expand-env| and |:let-environment| for the Vimscript behavior.
----    Invalid or unset key returns `nil`.
----    Example: >lua
----        vim.env.FOO = 'bar'
----        print(vim.env.TERM)
----<
 ---</pre>
 
 local api = vim.api
@@ -118,7 +109,6 @@ local key_value_options = {
 
 --- Convert a vimoption_T style dictionary to the correct OptionType associated with it.
 ---@return string
----@private
 local function get_option_metatype(name, info)
   if info.type == 'string' then
     if info.flaglist then
@@ -143,6 +133,14 @@ local options_info = setmetatable({}, {
   end,
 })
 
+---Environment variables defined in the editor session.
+---See |expand-env| and |:let-environment| for the Vimscript behavior.
+---Invalid or unset key returns `nil`.
+---Example: <pre>lua
+---    vim.env.FOO = 'bar'
+---    print(vim.env.TERM)
+---</pre>
+---@param var string
 vim.env = setmetatable({}, {
   __index = function(_, k)
     local v = vim.fn.getenv(k)
@@ -157,7 +155,6 @@ vim.env = setmetatable({}, {
   end,
 })
 
----@private
 local function opt_validate(option_name, target_scope)
   local scope = options_info[option_name].scope
   if scope ~= target_scope then
@@ -174,7 +171,6 @@ local function opt_validate(option_name, target_scope)
   end
 end
 
----@private
 local function new_buf_opt_accessor(bufnr)
   return setmetatable({}, {
     __index = function(_, k)
@@ -192,7 +188,6 @@ local function new_buf_opt_accessor(bufnr)
   })
 end
 
----@private
 local function new_win_opt_accessor(winid, bufnr)
   return setmetatable({}, {
     __index = function(_, k)
@@ -253,19 +248,15 @@ end
 ---global value of a |global-local| option, see |:setglobal|.
 ---</pre>
 
----@addtogroup lua-vimscript
----@brief <pre>help
----vim.o                                                                  *vim.o*
----    Get or set |options|. Like `:set`. Invalid key is an error.
+---Get or set |options|. Like `:set`. Invalid key is an error.
 ---
----    Note: this works on both buffer-scoped and window-scoped options using the
----    current buffer and window.
+---Note: this works on both buffer-scoped and window-scoped options using the
+---current buffer and window.
 ---
----    Example: >lua
----        vim.o.cmdheight = 4
----        print(vim.o.columns)
----        print(vim.o.foo)     -- error: invalid key
----<
+---Example: <pre>lua
+---    vim.o.cmdheight = 4
+---    print(vim.o.columns)
+---    print(vim.o.foo)     -- error: invalid key
 ---</pre>
 vim.o = setmetatable({}, {
   __index = function(_, k)
@@ -276,21 +267,17 @@ vim.o = setmetatable({}, {
   end,
 })
 
----@addtogroup lua-vimscript
----@brief <pre>help
----vim.go                                                                *vim.go*
----    Get or set global |options|. Like `:setglobal`. Invalid key is
----    an error.
----
----    Note: this is different from |vim.o| because this accesses the global
----    option value and thus is mostly useful for use with |global-local|
----    options.
----
----    Example: >lua
----        vim.go.cmdheight = 4
----        print(vim.go.columns)
----        print(vim.go.bar)     -- error: invalid key
----<
+---Get or set global |options|. Like `:setglobal`. Invalid key is
+---an error.
+---
+---Note: this is different from |vim.o| because this accesses the global
+---option value and thus is mostly useful for use with |global-local|
+---options.
+---
+---Example: <pre>lua
+---    vim.go.cmdheight = 4
+---    print(vim.go.columns)
+---    print(vim.go.bar)     -- error: invalid key
 ---</pre>
 vim.go = setmetatable({}, {
   __index = function(_, k)
@@ -301,41 +288,36 @@ vim.go = setmetatable({}, {
   end,
 })
 
----@addtogroup lua-vimscript
----@brief <pre>help
----vim.bo[{bufnr}]                                                                *vim.bo*
----    Get or set buffer-scoped |options| for the buffer with number {bufnr}.
----    Like `:set` and `:setlocal`. If [{bufnr}] is omitted then the current
----    buffer is used. Invalid {bufnr} or key is an error.
----
----    Note: this is equivalent to both `:set` and `:setlocal`.
----
----    Example: >lua
----        local bufnr = vim.api.nvim_get_current_buf()
----        vim.bo[bufnr].buflisted = true    -- same as vim.bo.buflisted = true
----        print(vim.bo.comments)
----        print(vim.bo.baz)                 -- error: invalid key
+---Get or set buffer-scoped |options| for the buffer with number {bufnr}.
+---Like `:set` and `:setlocal`. If [{bufnr}] is omitted then the current
+---buffer is used. Invalid {bufnr} or key is an error.
+---
+---Note: this is equivalent to both `:set` and `:setlocal`.
+---
+---Example: <pre>lua
+---    local bufnr = vim.api.nvim_get_current_buf()
+---    vim.bo[bufnr].buflisted = true    -- same as vim.bo.buflisted = true
+---    print(vim.bo.comments)
+---    print(vim.bo.baz)                 -- error: invalid key
 ---</pre>
+---@param bufnr integer|nil
 vim.bo = new_buf_opt_accessor()
 
----@addtogroup lua-vimscript
----@brief <pre>help
----vim.wo[{winid}][{bufnr}]                                                       *vim.wo*
----    Get or set window-scoped |options| for the window with handle {winid} and
----    buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
----    `:set` otherwise. If [{winid}] is omitted then the current window is
----    used. Invalid {winid}, {bufnr} or key is an error.
----
----    Note: only {bufnr} with value `0` (the current buffer in the window) is
----    supported.
----
----    Example: >lua
----        local winid = vim.api.nvim_get_current_win()
----        vim.wo[winid].number = true    -- same as vim.wo.number = true
----        print(vim.wo.foldmarker)
----        print(vim.wo.quux)             -- error: invalid key
----        vim.wo[winid][0].spell = false -- like ':setlocal nospell'
----<
+---Get or set window-scoped |options| for the window with handle {winid} and
+---buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
+---`:set` otherwise. If [{winid}] is omitted then the current window is
+---used. Invalid {winid}, {bufnr} or key is an error.
+---
+---Note: only {bufnr} with value `0` (the current buffer in the window) is
+---supported.
+---
+---Example: <pre>lua
+---    local winid = vim.api.nvim_get_current_win()
+---    vim.wo[winid].number = true    -- same as vim.wo.number = true
+---    print(vim.wo.foldmarker)
+---    print(vim.wo.quux)             -- error: invalid key
+---    vim.wo[winid][0].spell = false -- like ':setlocal nospell'
+---
 ---</pre>
 vim.wo = new_win_opt_accessor()
 
@@ -348,7 +330,6 @@ vim.wo = new_win_opt_accessor()
 ---@brief ]]
 
 --- Preserves the order and does not mutate the original list
---- @private
 local function remove_duplicate_values(t)
   local result, seen = {}, {}
   for _, v in ipairs(t) do
@@ -364,7 +345,6 @@ end
 
 -- Check whether the OptionTypes is allowed for vim.opt
 -- If it does not match, throw an error which indicates which option causes the error.
---- @private
 local function assert_valid_value(name, value, types)
   local type_of_value = type(value)
   for _, valid_type in ipairs(types) do
@@ -383,17 +363,14 @@ local function assert_valid_value(name, value, types)
   )
 end
 
---- @private
 local function passthrough(_, x)
   return x
 end
 
---- @private
 local function tbl_merge(left, right)
   return vim.tbl_extend('force', left, right)
 end
 
---- @private
 local function tbl_remove(t, value)
   if type(value) == 'string' then
     t[value] = nil
@@ -475,7 +452,6 @@ local to_vim_value = {
 }
 
 --- Convert a Lua value to a vimoption_T value
---- @private
 local function convert_value_to_vim(name, info, value)
   if value == nil then
     return vim.NIL
@@ -591,7 +567,6 @@ local to_lua_value = {
 }
 
 --- Converts a vimoption_T style value to a Lua value
---- @private
 local function convert_value_to_lua(info, option_value)
   return to_lua_value[info.metatype](info, option_value)
 end
@@ -618,7 +593,6 @@ local prepend_methods = {
 }
 
 --- Handles the '^' operator
---- @private
 local function prepend_value(info, current, new)
   return prepend_methods[info.metatype](
     convert_value_to_lua(info, current),
@@ -648,7 +622,6 @@ local add_methods = {
 }
 
 --- Handles the '+' operator
---- @private
 local function add_value(info, current, new)
   return add_methods[info.metatype](
     convert_value_to_lua(info, current),
@@ -656,7 +629,6 @@ local function add_value(info, current, new)
   )
 end
 
---- @private
 local function remove_one_item(t, val)
   if vim.tbl_islist(t) then
     local remove_index = nil
@@ -700,16 +672,13 @@ local remove_methods = {
 }
 
 --- Handles the '-' operator
---- @private
 local function remove_value(info, current, new)
   return remove_methods[info.metatype](convert_value_to_lua(info, current), new)
 end
 
---- @private
 local function create_option_accessor(scope)
   local option_mt
 
-  --- @private
   local function make_option(name, value)
     local info = assert(options_info[name], 'Not a valid option name: ' .. name)
 
@@ -923,6 +892,11 @@ function Option:prepend(value) end -- luacheck: no unused
 ---@diagnostic disable-next-line:unused-local used for gen_vimdoc
 function Option:remove(value) end -- luacheck: no unused
 
+---@private
 vim.opt = create_option_accessor()
+
+---@private
 vim.opt_local = create_option_accessor('local')
+
+---@private
 vim.opt_global = create_option_accessor('global')
diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua
index ff566866c0..e6dab90425 100644
--- a/runtime/lua/vim/_system.lua
+++ b/runtime/lua/vim/_system.lua
@@ -30,7 +30,6 @@ local uv = vim.uv
 --- @field cmd string[]
 --- @field result? SystemCompleted
 
----@private
 ---@param state SystemState
 local function close_handles(state)
   for _, handle in pairs({ state.handle, state.stdin, state.stdout, state.stderr }) do
@@ -128,7 +127,6 @@ function SystemObj:is_closing()
   return handle == nil or handle:is_closing()
 end
 
----@private
 ---@param output function|'false'
 ---@return uv_stream_t?
 ---@return function? Handler
@@ -145,7 +143,6 @@ local function setup_output(output)
   return nil, nil
 end
 
----@private
 ---@param input string|string[]|true|nil
 ---@return uv_stream_t?
 ---@return string|string[]?
diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
index 00b7416098..dc5f59f38b 100644
--- a/runtime/lua/vim/_watch.lua
+++ b/runtime/lua/vim/_watch.lua
@@ -7,7 +7,6 @@ M.FileChangeType = vim.tbl_add_reverse_lookup({
   Deleted = 3,
 })
 
----@private
 --- Joins filepath elements by static '/' separator
 ---
 ---@param ... (string) The path elements.
@@ -16,7 +15,6 @@ local function filepath_join(...)
   return table.concat({ ... }, '/')
 end
 
----@private
 --- Stops and closes a libuv |uv_fs_event_t| or |uv_fs_poll_t| handle
 ---
 ---@param handle (uv_fs_event_t|uv_fs_poll_t) The handle to stop
@@ -88,7 +86,6 @@ local default_poll_interval_ms = 2000
 --- @field include_pattern? userdata
 --- @field exclude_pattern? userdata
 
----@private
 --- Implementation for poll, hiding internally-used parameters.
 ---
 ---@param path string
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 093bfb631e..f0adc4104e 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -72,7 +72,6 @@ local bufs_waiting_to_update = setmetatable({}, bufnr_and_namespace_cacher_mt)
 
 local all_namespaces = {}
 
----@private
 local function to_severity(severity)
   if type(severity) == 'string' then
     return assert(
@@ -83,7 +82,6 @@ local function to_severity(severity)
   return severity
 end
 
----@private
 local function filter_by_severity(severity, diagnostics)
   if not severity then
     return diagnostics
@@ -104,7 +102,6 @@ local function filter_by_severity(severity, diagnostics)
   end, diagnostics)
 end
 
----@private
 local function count_sources(bufnr)
   local seen = {}
   local count = 0
@@ -119,7 +116,6 @@ local function count_sources(bufnr)
   return count
 end
 
----@private
 local function prefix_source(diagnostics)
   return vim.tbl_map(function(d)
     if not d.source then
@@ -132,7 +128,6 @@ local function prefix_source(diagnostics)
   end, diagnostics)
 end
 
----@private
 local function reformat_diagnostics(format, diagnostics)
   vim.validate({
     format = { format, 'f' },
@@ -146,7 +141,6 @@ local function reformat_diagnostics(format, diagnostics)
   return formatted
 end
 
----@private
 local function enabled_value(option, namespace)
   local ns = namespace and M.get_namespace(namespace) or {}
   if ns.opts and type(ns.opts[option]) == 'table' then
@@ -160,7 +154,6 @@ local function enabled_value(option, namespace)
   return {}
 end
 
----@private
 local function resolve_optional_value(option, value, namespace, bufnr)
   if not value then
     return false
@@ -180,7 +173,6 @@ local function resolve_optional_value(option, value, namespace, bufnr)
   end
 end
 
----@private
 local function get_resolved_options(opts, namespace, bufnr)
   local ns = namespace and M.get_namespace(namespace) or {}
   -- Do not use tbl_deep_extend so that an empty table can be used to reset to default values
@@ -202,7 +194,6 @@ local diagnostic_severities = {
 }
 
 -- Make a map from DiagnosticSeverity -> Highlight Name
----@private
 local function make_highlight_map(base_name)
   local result = {}
   for k in pairs(diagnostic_severities) do
@@ -243,7 +234,6 @@ local define_default_signs = (function()
   end
 end)()
 
----@private
 local function get_bufnr(bufnr)
   if not bufnr or bufnr == 0 then
     return api.nvim_get_current_buf()
@@ -251,7 +241,6 @@ local function get_bufnr(bufnr)
   return bufnr
 end
 
----@private
 local function diagnostic_lines(diagnostics)
   if not diagnostics then
     return {}
@@ -269,7 +258,6 @@ local function diagnostic_lines(diagnostics)
   return diagnostics_by_line
 end
 
----@private
 local function set_diagnostic_cache(namespace, bufnr, diagnostics)
   for _, diagnostic in ipairs(diagnostics) do
     assert(diagnostic.lnum, 'Diagnostic line number is required')
@@ -284,7 +272,6 @@ local function set_diagnostic_cache(namespace, bufnr, diagnostics)
   diagnostic_cache[bufnr][namespace] = diagnostics
 end
 
----@private
 local function restore_extmarks(bufnr, last)
   for ns, extmarks in pairs(diagnostic_cache_extmarks[bufnr]) do
     local extmarks_current = api.nvim_buf_get_extmarks(bufnr, ns, 0, -1, { details = true })
@@ -306,7 +293,6 @@ local function restore_extmarks(bufnr, last)
   end
 end
 
----@private
 local function save_extmarks(namespace, bufnr)
   bufnr = get_bufnr(bufnr)
   if not diagnostic_attached_buffers[bufnr] then
@@ -326,13 +312,11 @@ end
 
 local registered_autocmds = {}
 
----@private
 local function make_augroup_key(namespace, bufnr)
   local ns = M.get_namespace(namespace)
   return string.format('DiagnosticInsertLeave:%s:%s', bufnr, ns.name)
 end
 
----@private
 local function execute_scheduled_display(namespace, bufnr)
   local args = bufs_waiting_to_update[bufnr][namespace]
   if not args then
@@ -348,7 +332,6 @@ end
 --- Table of autocmd events to fire the update for displaying new diagnostic information
 local insert_leave_auto_cmds = { 'InsertLeave', 'CursorHoldI' }
 
----@private
 local function schedule_display(namespace, bufnr, args)
   bufs_waiting_to_update[bufnr][namespace] = args
 
@@ -367,7 +350,6 @@ local function schedule_display(namespace, bufnr, args)
   end
 end
 
----@private
 local function clear_scheduled_display(namespace, bufnr)
   local key = make_augroup_key(namespace, bufnr)
 
@@ -377,7 +359,6 @@ local function clear_scheduled_display(namespace, bufnr)
   end
 end
 
----@private
 local function get_diagnostics(bufnr, opts, clamp)
   opts = opts or {}
 
@@ -392,7 +373,6 @@ local function get_diagnostics(bufnr, opts, clamp)
     end,
   })
 
-  ---@private
   local function add(b, d)
     if not opts.lnum or d.lnum == opts.lnum then
       if clamp and api.nvim_buf_is_loaded(b) then
@@ -416,7 +396,6 @@ local function get_diagnostics(bufnr, opts, clamp)
     end
   end
 
-  ---@private
   local function add_all_diags(buf, diags)
     for _, diagnostic in pairs(diags) do
       add(buf, diagnostic)
@@ -450,7 +429,6 @@ local function get_diagnostics(bufnr, opts, clamp)
   return diagnostics
 end
 
----@private
 local function set_list(loclist, opts)
   opts = opts or {}
   local open = vim.F.if_nil(opts.open, true)
@@ -474,7 +452,6 @@ local function set_list(loclist, opts)
   end
 end
 
----@private
 local function next_diagnostic(position, search_forward, bufnr, opts, namespace)
   position[1] = position[1] - 1
   bufnr = get_bufnr(bufnr)
@@ -525,7 +502,6 @@ local function next_diagnostic(position, search_forward, bufnr, opts, namespace)
   end
 end
 
----@private
 local function diagnostic_move_pos(opts, pos)
   opts = opts or {}
 
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 33d451315d..40f72a217d 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2,7 +2,6 @@ local api = vim.api
 
 local M = {}
 
----@private
 local function starsetf(ft, opts)
   return {
     function(path, bufnr)
@@ -2317,7 +2316,6 @@ local pattern = {
 -- luacheck: pop
 -- luacheck: pop
 
----@private
 local function sort_by_priority(t)
   local sorted = {}
   for k, v in pairs(t) do
@@ -2341,7 +2339,6 @@ end
 
 local pattern_sorted = sort_by_priority(pattern)
 
----@private
 local function normalize_path(path, as_pattern)
   local normal = path:gsub('\\', '/')
   if normal:find('^~') then
@@ -2456,7 +2453,6 @@ function M.add(filetypes)
   end
 end
 
----@private
 local function dispatch(ft, path, bufnr, ...)
   local on_detect
   if type(ft) == 'function' then
@@ -2483,7 +2479,6 @@ end
 -- Lookup table/cache for patterns that contain an environment variable pattern, e.g. ${SOME_VAR}.
 local expand_env_lookup = {}
 
----@private
 local function match_pattern(name, path, tail, pat)
   if expand_env_lookup[pat] == nil then
     expand_env_lookup[pat] = pat:find('%${') ~= nil
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index d06dcb87cf..842767098c 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -218,7 +218,6 @@ function M.find(names, opts)
 
   local matches = {}
 
-  ---@private
   local function add(match)
     matches[#matches + 1] = M.normalize(match)
     if #matches == limit then
diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index 0eb782339c..14b0e71312 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -18,23 +18,18 @@
 ---<pre>vim
 ---    au TextYankPost * silent! lua vim.highlight.on_yank {on_visual=false}
 ---</pre>
----
---- <pre>help
----vim.highlight.priorities                            *vim.highlight.priorities*
----
----    Table with default priorities used for highlighting:
----        • `syntax`: `50`, used for standard syntax highlighting
----        • `treesitter`: `100`, used for tree-sitter-based highlighting
----        • `semantic_tokens`: `125`, used for LSP semantic token highlighting
----        • `diagnostics`: `150`, used for code analysis such as diagnostics
----        • `user`: `200`, used for user-triggered highlights such as LSP document
----          symbols or `on_yank` autocommands
----</pre>
 
 local api = vim.api
 
 local M = {}
 
+--- Table with default priorities used for highlighting:
+---     - `syntax`: `50`, used for standard syntax highlighting
+---     - `treesitter`: `100`, used for tree-sitter-based highlighting
+---     - `semantic_tokens`: `125`, used for LSP semantic token highlighting
+---     - `diagnostics`: `150`, used for code analysis such as diagnostics
+---     - `user`: `200`, used for user-triggered highlights such as LSP document
+---       symbols or `on_yank` autocommands
 M.priorities = {
   syntax = 50,
   treesitter = 100,
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 6c1afcad91..7bffcc9c20 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -85,7 +85,6 @@ end
 --- Packed tables use this as their metatable
 local packedmt = {}
 
----@private
 local function unpack(t)
   if type(t) == 'table' and getmetatable(t) == packedmt then
     return _G.unpack(t, 1, t.n)
@@ -93,7 +92,6 @@ local function unpack(t)
   return t
 end
 
----@private
 local function pack(...)
   local n = select('#', ...)
   if n > 1 then
@@ -102,7 +100,6 @@ local function pack(...)
   return ...
 end
 
----@private
 local function sanitize(t)
   if type(t) == 'table' and getmetatable(t) == packedmt then
     -- Remove length tag
@@ -120,7 +117,6 @@ end
 ---@param ... any Function arguments.
 ---@return boolean True if the iterator stage should continue, false otherwise
 ---@return any Function arguments.
----@private
 local function continue(...)
   if select('#', ...) > 0 then
     return false, ...
@@ -137,7 +133,6 @@ end
 ---@param ... any Arguments to apply to f
 ---@return boolean True if the iterator pipeline should continue, false otherwise
 ---@return any Return values of f
----@private
 local function apply(f, ...)
   if select('#', ...) > 0 then
     return continue(f(...))
@@ -230,7 +225,6 @@ function Iter.map(self, f)
   ---                    values passed.
   ---@param ... any Values to return if cont is false.
   ---@return any
-  ---@private
   local function fn(cont, ...)
     if cont then
       return fn(apply(f, next(self)))
@@ -270,7 +264,6 @@ end
 ---                       Takes all of the values returned by the previous stage
 ---                       in the pipeline as arguments.
 function Iter.each(self, f)
-  ---@private
   local function fn(...)
     if select('#', ...) > 0 then
       f(...)
@@ -383,7 +376,6 @@ function Iter.fold(self, init, f)
   local acc = init
 
   --- Use a closure to handle var args returned from iterator
-  ---@private
   local function fn(...)
     if select(1, ...) ~= nil then
       acc = f(acc, ...)
@@ -525,7 +517,6 @@ function Iter.find(self, f)
   local result = nil
 
   --- Use a closure to handle var args returned from iterator
-  ---@private
   local function fn(...)
     if select(1, ...) ~= nil then
       if f(...) then
@@ -768,7 +759,6 @@ function Iter.any(self, pred)
   local any = false
 
   --- Use a closure to handle var args returned from iterator
-  ---@private
   local function fn(...)
     if select(1, ...) ~= nil then
       if pred(...) then
@@ -792,7 +782,6 @@ end
 function Iter.all(self, pred)
   local all = true
 
-  ---@private
   local function fn(...)
     if select(1, ...) ~= nil then
       if not pred(...) then
@@ -929,7 +918,6 @@ function Iter.new(src, ...)
     local s, var = ...
 
     --- Use a closure to handle var args returned from iterator
-    ---@private
     local function fn(...)
       if select(1, ...) ~= nil then
         var = select(1, ...)
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index f340dc85b5..4f4722b0c3 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -21,7 +21,10 @@ local M = {}
 
 ---@alias LoaderStats table<string, {total:number, time:number, [string]:number?}?>
 
+---@nodoc
 M.path = vim.fn.stdpath('cache') .. '/luac'
+
+---@nodoc
 M.enabled = false
 
 ---@class Loader
@@ -58,7 +61,6 @@ function Loader.get_hash(path)
   return Loader._hashes[path]
 end
 
----@private
 local function normalize(path)
   return vim.fs.normalize(path, { expand_env = false })
 end
@@ -122,7 +124,6 @@ end
 --- @param path string
 --- @param mode integer
 --- @return string? data
---- @private
 local function readfile(path, mode)
   local f = uv.fs_open(path, 'r', mode)
   if f then
@@ -310,7 +311,6 @@ function M.find(modname, opts)
   local results = {}
 
   -- Only continue if we haven't found anything yet or we want to find all
-  ---@private
   local function continue()
     return #results == 0 or opts.all
   end
@@ -318,7 +318,6 @@ function M.find(modname, opts)
   -- Checks if the given paths contain the top-level module.
   -- If so, it tries to find the module path for the given module name.
   ---@param paths string[]
-  ---@private
   local function _find(paths)
     for _, path in ipairs(paths) do
       if topmod == '*' then
@@ -504,7 +503,6 @@ end
 ---@private
 function M._inspect(opts)
   if opts and opts.print then
-    ---@private
     local function ms(nsec)
       return math.floor(nsec / 1e6 * 1000 + 0.5) / 1000 .. 'ms'
     end
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 97aab45f2c..35e4bc9dd8 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -66,7 +66,6 @@ lsp._request_name_to_capability = {
 
 -- TODO improve handling of scratch buffers with LSP attached.
 
----@private
 --- Concatenates and writes a list of strings to the Vim error buffer.
 ---
 ---@param ... string List to write to the buffer
@@ -75,7 +74,6 @@ local function err_message(...)
   nvim_command('redraw')
 end
 
----@private
 --- Returns the buffer number for the given {bufnr}.
 ---
 ---@param bufnr (integer|nil) Buffer number to resolve. Defaults to current buffer
@@ -101,7 +99,6 @@ function lsp._unsupported_method(method)
   return msg
 end
 
----@private
 --- Checks whether a given path is a directory.
 ---
 ---@param filename (string) path to check
@@ -132,7 +129,6 @@ local format_line_ending = {
   ['mac'] = '\r',
 }
 
----@private
 ---@param bufnr (number)
 ---@return string
 local function buf_get_line_ending(bufnr)
@@ -140,7 +136,6 @@ local function buf_get_line_ending(bufnr)
 end
 
 local client_index = 0
----@private
 --- Returns a new, unused client id.
 ---
 ---@return integer client_id
@@ -153,7 +148,6 @@ local active_clients = {} --- @type table<integer,lsp.Client>
 local all_buffer_active_clients = {} --- @type table<integer,table<integer,true>>
 local uninitialized_clients = {} --- @type table<integer,lsp.Client>
 
----@private
 ---@param bufnr? integer
 ---@param fn fun(client: lsp.Client, client_id: integer, bufnr: integer)
 local function for_each_buffer_client(bufnr, fn, restrict_client_ids)
@@ -185,9 +179,10 @@ local function for_each_buffer_client(bufnr, fn, restrict_client_ids)
   end
 end
 
--- Error codes to be used with `on_error` from |vim.lsp.start_client|.
--- Can be used to look up the string from a the number or the number
--- from the string.
+--- Error codes to be used with `on_error` from |vim.lsp.start_client|.
+--- Can be used to look up the string from a the number or the number
+--- from the string.
+--- @nodoc
 lsp.client_errors = tbl_extend(
   'error',
   lsp_rpc.client_errors,
@@ -196,7 +191,6 @@ lsp.client_errors = tbl_extend(
   })
 )
 
----@private
 --- Normalizes {encoding} to valid LSP encoding names.
 ---
 ---@param encoding (string) Encoding to normalize
@@ -243,7 +237,6 @@ function lsp._cmd_parts(input)
   return cmd, cmd_args
 end
 
----@private
 --- Augments a validator function with support for optional (nil) values.
 ---
 ---@param fn (fun(v): boolean) The original validator function; should return a
@@ -256,7 +249,6 @@ local function optional_validator(fn)
   end
 end
 
----@private
 --- Validates a client configuration as given to |vim.lsp.start_client()|.
 ---
 ---@param config (lsp.ClientConfig)
@@ -308,7 +300,6 @@ local function validate_client_config(config)
   return cmd, cmd_args, offset_encoding
 end
 
----@private
 --- Returns full text of buffer {bufnr} as a string.
 ---
 ---@param bufnr (number) Buffer handle, or 0 for current.
@@ -322,7 +313,6 @@ local function buf_get_full_text(bufnr)
   return text
 end
 
----@private
 --- Memoizes a function. On first run, the function return value is saved and
 --- immediately returned on subsequent runs. If the function returns a multival,
 --- only the first returned value will be memoized and returned. The function will only be run once,
@@ -382,7 +372,6 @@ do
   --- @field debounce integer debounce duration in ms
   --- @field clients table<integer, table> clients using this state. {client_id, client}
 
-  ---@private
   ---@param group CTGroup
   ---@return string
   local function group_key(group)
@@ -403,7 +392,6 @@ do
     end,
   })
 
-  ---@private
   ---@return CTGroup
   local function get_group(client)
     local allow_inc_sync = if_nil(client.config.flags.allow_incremental_sync, true)
@@ -419,7 +407,6 @@ do
     }
   end
 
-  ---@private
   ---@param state CTBufferState
   local function incremental_changes(state, encoding, bufnr, firstline, lastline, new_lastline)
     local prev_lines = state.lines
@@ -543,8 +530,6 @@ do
     end
   end
 
-  ---@private
-  --
   -- Adjust debounce time by taking time of last didChange notification into
   -- consideration. If the last didChange happened more than `debounce` time ago,
   -- debounce can be skipped and otherwise maybe reduced.
@@ -567,7 +552,6 @@ do
     return math.max(debounce - ms_since_last_flush, 0)
   end
 
-  ---@private
   ---@param bufnr integer
   ---@param sync_kind integer protocol.TextDocumentSyncKind
   ---@param state CTGroupState
@@ -694,7 +678,6 @@ do
   end
 end
 
----@private
 --- Default handler for the 'textDocument/didOpen' LSP notification.
 ---
 ---@param bufnr integer Number of the buffer, or 0 for current
@@ -924,7 +907,6 @@ function lsp.status()
   return message
 end
 
----@private
 -- Determines whether the given option can be set by `set_defaults`.
 local function is_empty_or_default(bufnr, option)
   if vim.bo[bufnr][option] == '' then
@@ -1138,7 +1120,6 @@ function lsp.start_client(config)
 
   local dispatch = {}
 
-  ---@private
   --- Returns the handler associated with an LSP method.
   --- Returns the default handler if the user hasn't set a custom one.
   ---
@@ -1208,7 +1189,6 @@ function lsp.start_client(config)
     end
   end
 
-  ---@private
   --- Reset defaults set by `set_defaults`.
   --- Must only be called if the last client attached to a buffer exits.
   local function reset_defaults(bufnr)
@@ -1337,7 +1317,6 @@ function lsp.start_client(config)
   -- Store the uninitialized_clients for cleanup in case we exit before initialize finishes.
   uninitialized_clients[client_id] = client
 
-  ---@private
   local function initialize()
     local valid_traces = {
       off = 'off',
@@ -1749,7 +1728,6 @@ do
   end
 end
 
----@private
 ---Buffer lifecycle handler for textDocument/didSave
 local function text_document_did_save_handler(bufnr)
   bufnr = resolve_bufnr(bufnr)
@@ -2082,7 +2060,6 @@ api.nvim_create_autocmd('VimLeavePre', {
 
     local poll_time = 50
 
-    ---@private
     local function check_clients_closed()
       for client_id, timeout in pairs(timeouts) do
         timeouts[client_id] = timeout - poll_time
@@ -2440,12 +2417,13 @@ function lsp.buf_get_clients(bufnr)
   return result
 end
 
--- Log level dictionary with reverse lookup as well.
---
--- Can be used to lookup the number from the name or the
--- name from the number.
--- Levels by name: "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF"
--- Level numbers begin with "TRACE" at 0
+--- Log level dictionary with reverse lookup as well.
+---
+--- Can be used to lookup the number from the name or the
+--- name from the number.
+--- Levels by name: "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF"
+--- Level numbers begin with "TRACE" at 0
+--- @nodoc
 lsp.log_levels = log.levels
 
 --- Sets the global log level for LSP logging.
diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index 87938fe4d5..b66f2f6f32 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -5,7 +5,6 @@ local lpeg = vim.lpeg
 
 local M = {}
 
----@private
 --- Parses the raw pattern into an |lpeg| pattern. LPeg patterns natively support the "this" or "that"
 --- alternative constructions described in the LSP spec that cannot be expressed in a standard Lua pattern.
 ---
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 2140d3ae37..46f582dc7e 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -5,7 +5,6 @@ local npcall = vim.F.npcall
 
 local M = {}
 
----@private
 --- Sends an async request to all active clients attached to the current
 --- buffer.
 ---
@@ -45,7 +44,6 @@ function M.hover()
   request('textDocument/hover', params)
 end
 
----@private
 local function request_with_options(name, params, options)
   local req_handler
   if options then
@@ -120,7 +118,6 @@ function M.completion(context)
   return request('textDocument/completion', params)
 end
 
----@private
 ---@param bufnr integer
 ---@param mode "v"|"V"
 ---@return table {start={row,col}, end={row,col}} using (1, 0) indexing
@@ -218,7 +215,6 @@ function M.format(options)
     vim.notify('[LSP] Format request failed, no matching language servers.')
   end
 
-  ---@private
   local function set_range(client, params)
     if range then
       local range_params =
@@ -289,7 +285,6 @@ function M.rename(new_name, options)
   -- Compute early to account for cursor movements after going async
   local cword = vim.fn.expand('<cword>')
 
-  ---@private
   local function get_text_at_range(range, offset_encoding)
     return api.nvim_buf_get_text(
       bufnr,
@@ -307,7 +302,6 @@ function M.rename(new_name, options)
       return
     end
 
-    ---@private
     local function rename(name)
       local params = util.make_position_params(win, client.offset_encoding)
       params.newName = name
@@ -408,7 +402,6 @@ function M.document_symbol(options)
   request_with_options('textDocument/documentSymbol', params, options)
 end
 
----@private
 local function pick_call_hierarchy_item(call_hierarchy_items)
   if not call_hierarchy_items then
     return
@@ -428,7 +421,6 @@ local function pick_call_hierarchy_item(call_hierarchy_items)
   return choice
 end
 
----@private
 local function call_hierarchy(method)
   local params = util.make_position_params()
   request('textDocument/prepareCallHierarchy', params, function(err, result, ctx)
@@ -579,8 +571,6 @@ function M.clear_references()
   util.buf_clear_references()
 end
 
----@private
---
 --- This is not public because the main extension point is
 --- vim.ui.select which can be overridden independently.
 ---
@@ -592,7 +582,6 @@ end
 local function on_code_action_results(results, ctx, options)
   local action_tuples = {}
 
-  ---@private
   local function action_filter(a)
     -- filter by specified action kind
     if options and options.context and options.context.only then
@@ -632,7 +621,6 @@ local function on_code_action_results(results, ctx, options)
     return
   end
 
-  ---@private
   local function apply_action(action, client)
     if action.edit then
       util.apply_workspace_edit(action.edit, client.offset_encoding)
@@ -643,7 +631,6 @@ local function on_code_action_results(results, ctx, options)
     end
   end
 
-  ---@private
   local function on_user_choice(action_tuple)
     if not action_tuple then
       return
@@ -701,7 +688,6 @@ end
 
 --- Requests code actions from all clients and calls the handler exactly once
 --- with all aggregated results
----@private
 local function code_action_request(params, options)
   local bufnr = api.nvim_get_current_buf()
   local method = 'textDocument/codeAction'
diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index 67104cc40b..a516238ae0 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -26,7 +26,6 @@ local namespaces = setmetatable({}, {
 ---@private
 M.__namespaces = namespaces
 
----@private
 local function execute_lens(lens, bufnr, client_id)
   local line = lens.range.start.line
   api.nvim_buf_clear_namespace(bufnr, namespaces[client_id], line, line + 1)
@@ -89,7 +88,6 @@ function M.run()
   end
 end
 
----@private
 local function resolve_bufnr(bufnr)
   return bufnr == 0 and api.nvim_get_current_buf() or bufnr
 end
@@ -186,7 +184,6 @@ function M.save(lenses, bufnr, client_id)
   lenses_by_client[client_id] = lenses
 end
 
----@private
 local function resolve_lenses(lenses, bufnr, client_id, callback)
   lenses = lenses or {}
   local num_lens = vim.tbl_count(lenses)
@@ -195,7 +192,6 @@ local function resolve_lenses(lenses, bufnr, client_id, callback)
     return
   end
 
-  ---@private
   local function countdown()
     num_lens = num_lens - 1
     if num_lens == 0 then
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index 3efa5c51ff..c2cf7c6ba5 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -5,7 +5,7 @@ local protocol = require('vim.lsp.protocol')
 local M = {}
 
 local DEFAULT_CLIENT_ID = -1
----@private
+
 local function get_client_id(client_id)
   if client_id == nil then
     client_id = DEFAULT_CLIENT_ID
@@ -14,7 +14,6 @@ local function get_client_id(client_id)
   return client_id
 end
 
----@private
 ---@param severity lsp.DiagnosticSeverity
 local function severity_lsp_to_vim(severity)
   if type(severity) == 'string' then
@@ -23,7 +22,6 @@ local function severity_lsp_to_vim(severity)
   return severity
 end
 
----@private
 ---@return lsp.DiagnosticSeverity
 local function severity_vim_to_lsp(severity)
   if type(severity) == 'string' then
@@ -32,7 +30,6 @@ local function severity_vim_to_lsp(severity)
   return severity
 end
 
----@private
 ---@return integer
 local function line_byte_from_position(lines, lnum, col, offset_encoding)
   if not lines or offset_encoding == 'utf-8' then
@@ -48,7 +45,6 @@ local function line_byte_from_position(lines, lnum, col, offset_encoding)
   return col
 end
 
----@private
 local function get_buf_lines(bufnr)
   if vim.api.nvim_buf_is_loaded(bufnr) then
     return vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
@@ -73,7 +69,6 @@ local function get_buf_lines(bufnr)
   return lines
 end
 
---- @private
 --- @param diagnostic lsp.Diagnostic
 --- @param client_id integer
 --- @return table?
@@ -96,7 +91,6 @@ local function tags_lsp_to_vim(diagnostic, client_id)
   return tags
 end
 
----@private
 ---@param diagnostics lsp.Diagnostic[]
 ---@param bufnr integer
 ---@param client_id integer
@@ -133,7 +127,6 @@ local function diagnostic_lsp_to_vim(diagnostics, bufnr, client_id)
   end, diagnostics)
 end
 
---- @private
 --- @param diagnostics Diagnostic[]
 --- @return lsp.Diagnostic[]
 local function diagnostic_vim_to_lsp(diagnostics)
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 20c4d7458b..ce3db68618 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -7,7 +7,6 @@ local M = {}
 
 -- FIXME: DOC: Expose in vimdocs
 
----@private
 --- Writes to error buffer.
 ---@param ... string Will be concatenated before being written
 local function err_message(...)
@@ -246,7 +245,6 @@ M['textDocument/references'] = function(_, result, ctx, config)
   end
 end
 
----@private
 --- Return a function that converts LSP responses to list items and opens the list
 ---
 --- The returned function has an optional {config} parameter that accepts a table
@@ -380,7 +378,6 @@ end
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
 M['textDocument/hover'] = M.hover
 
----@private
 --- Jumps to a location. Used as a handler for multiple LSP methods.
 ---@param _ nil not used
 ---@param result (table) result of LSP method; a location or a list of locations.
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index 6426b0c039..bec6f33e93 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -17,7 +17,6 @@ local namespace = api.nvim_create_namespace('vim_lsp_inlayhint')
 local augroup = api.nvim_create_augroup('vim_lsp_inlayhint', {})
 
 --- Reset the request debounce timer of a buffer
----@private
 local function reset_timer(reset_bufnr)
   local timer = bufstates[reset_bufnr].timer
   if timer then
@@ -63,7 +62,6 @@ function M.on_inlayhint(err, result, ctx, _)
   end
 
   local lines = api.nvim_buf_get_lines(bufnr, 0, -1, false)
-  ---@private
   local function pos_to_byte(position)
     local col = position.character
     if col > 0 then
@@ -89,7 +87,6 @@ function M.on_inlayhint(err, result, ctx, _)
   api.nvim__buf_redraw_range(bufnr, 0, -1)
 end
 
----@private
 local function resolve_bufnr(bufnr)
   return bufnr > 0 and bufnr or api.nvim_get_current_buf()
 end
@@ -100,7 +97,6 @@ end
 ---  - bufnr (integer, default: 0): Buffer whose hints to refresh
 ---  - only_visible (boolean, default: false): Whether to only refresh hints for the visible regions of the buffer
 ---
----@private
 local function refresh(opts)
   opts = opts or {}
   local bufnr = resolve_bufnr(opts.bufnr or 0)
@@ -159,7 +155,6 @@ end
 
 --- Clear inlay hints
 ---@param bufnr (integer) Buffer handle, or 0 for current
----@private
 local function clear(bufnr)
   bufnr = resolve_bufnr(bufnr)
   if not bufstates[bufnr] then
@@ -178,7 +173,6 @@ local function clear(bufnr)
   api.nvim__buf_redraw_range(bufnr, 0, -1)
 end
 
----@private
 local function make_request(request_bufnr)
   reset_timer(request_bufnr)
   refresh({ bufnr = request_bufnr })
@@ -186,7 +180,6 @@ end
 
 --- Enable inlay hints for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
----@private
 local function enable(bufnr)
   bufnr = resolve_bufnr(bufnr)
   local bufstate = bufstates[bufnr]
@@ -228,7 +221,6 @@ end
 
 --- Disable inlay hints for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
----@private
 local function disable(bufnr)
   bufnr = resolve_bufnr(bufnr)
   if bufstates[bufnr] and bufstates[bufnr].enabled then
@@ -240,7 +232,6 @@ end
 
 --- Toggle inlay hints for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
----@private
 local function toggle(bufnr)
   bufnr = resolve_bufnr(bufnr)
   local bufstate = bufstates[bufnr]
diff --git a/runtime/lua/vim/lsp/log.lua b/runtime/lua/vim/lsp/log.lua
index 033f93bd6e..6d2e0bc292 100644
--- a/runtime/lua/vim/lsp/log.lua
+++ b/runtime/lua/vim/lsp/log.lua
@@ -2,14 +2,12 @@
 
 local log = {}
 
--- FIXME: DOC
--- Should be exposed in the vim docs.
---
--- Log level dictionary with reverse lookup as well.
---
--- Can be used to lookup the number from the name or the name from the number.
--- Levels by name: "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF"
--- Level numbers begin with "TRACE" at 0
+--- Log level dictionary with reverse lookup as well.
+---
+--- Can be used to lookup the number from the name or the name from the number.
+--- Levels by name: "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF"
+--- Level numbers begin with "TRACE" at 0
+--- @nodoc
 log.levels = vim.deepcopy(vim.log.levels)
 
 -- Default log level is warn.
@@ -20,7 +18,6 @@ local format_func = function(arg)
 end
 
 do
-  ---@private
   local function notify(msg, level)
     if vim.in_fast_event() then
       vim.schedule(function()
@@ -32,7 +29,6 @@ do
   end
 
   local path_sep = vim.uv.os_uname().version:match('Windows') and '\\' or '/'
-  ---@private
   local function path_join(...)
     return table.concat(vim.tbl_flatten({ ... }), path_sep)
   end
@@ -50,7 +46,6 @@ do
   end
 
   local logfile, openerr
-  ---@private
   --- Opens log file. Returns true if file is open, false on error
   local function open_logfile()
     -- Try to open file only once
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index c110c3a67c..a77af937b3 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -5,7 +5,6 @@ local validate, schedule, schedule_wrap = vim.validate, vim.schedule, vim.schedu
 
 local is_win = uv.os_uname().version:find('Windows')
 
----@private
 --- Checks whether a given path exists and is a directory.
 ---@param filename (string) path to check
 ---@return boolean
@@ -14,7 +13,6 @@ local function is_dir(filename)
   return stat and stat.type == 'directory' or false
 end
 
----@private
 --- Embeds the given string into a table and correctly computes `Content-Length`.
 ---
 ---@param encoded_message (string)
@@ -28,7 +26,6 @@ local function format_message_with_content_length(encoded_message)
   })
 end
 
----@private
 --- Parses an LSP Message's header
 ---
 ---@param header string: The header to parse.
@@ -60,7 +57,6 @@ local header_start_pattern = ('content'):gsub('%w', function(c)
   return '[' .. c .. c:upper() .. ']'
 end)
 
----@private
 --- The actual workhorse.
 local function request_parser_loop()
   local buffer = '' -- only for header part
@@ -115,8 +111,11 @@ local function request_parser_loop()
   end
 end
 
+local M = {}
+
 --- Mapping of error codes used by the client
-local client_errors = {
+--- @nodoc
+M.client_errors = {
   INVALID_SERVER_MESSAGE = 1,
   INVALID_SERVER_JSON = 2,
   NO_RESULT_CALLBACK_FOUND = 3,
@@ -126,13 +125,13 @@ local client_errors = {
   SERVER_RESULT_CALLBACK_ERROR = 7,
 }
 
-client_errors = vim.tbl_add_reverse_lookup(client_errors)
+M.client_errors = vim.tbl_add_reverse_lookup(M.client_errors)
 
 --- Constructs an error message from an LSP error object.
 ---
 ---@param err (table) The error object
 ---@returns (string) The formatted error message
-local function format_rpc_error(err)
+function M.format_rpc_error(err)
   validate({
     err = { err, 't' },
   })
@@ -163,7 +162,7 @@ end
 ---@param code integer RPC error code defined in `vim.lsp.protocol.ErrorCodes`
 ---@param message string|nil arbitrary message to send to server
 ---@param data any|nil arbitrary data to send to server
-local function rpc_response_error(code, message, data)
+function M.rpc_response_error(code, message, data)
   -- TODO should this error or just pick a sane error (like InternalError)?
   local code_name = assert(protocol.ErrorCodes[code], 'Invalid RPC error code')
   return setmetatable({
@@ -171,7 +170,7 @@ local function rpc_response_error(code, message, data)
     message = message or code_name,
     data = data,
   }, {
-    __tostring = format_rpc_error,
+    __tostring = M.format_rpc_error,
   })
 end
 
@@ -185,6 +184,7 @@ local default_dispatchers = {}
 function default_dispatchers.notification(method, params)
   local _ = log.debug() and log.debug('notification', method, params)
 end
+
 ---@private
 --- Default dispatcher for requests sent to an LSP server.
 ---
@@ -194,8 +194,9 @@ end
 ---@return table `vim.lsp.protocol.ErrorCodes.MethodNotFound`
 function default_dispatchers.server_request(method, params)
   local _ = log.debug() and log.debug('server_request', method, params)
-  return nil, rpc_response_error(protocol.ErrorCodes.MethodNotFound)
+  return nil, M.rpc_response_error(protocol.ErrorCodes.MethodNotFound)
 end
+
 ---@private
 --- Default dispatcher for when a client exits.
 ---
@@ -205,6 +206,7 @@ end
 function default_dispatchers.on_exit(code, signal)
   local _ = log.info() and log.info('client_exit', { code = code, signal = signal })
 end
+
 ---@private
 --- Default dispatcher for client errors.
 ---
@@ -212,11 +214,11 @@ end
 ---@param err (any): Details about the error
 ---any)
 function default_dispatchers.on_error(code, err)
-  local _ = log.error() and log.error('client_error:', client_errors[code], err)
+  local _ = log.error() and log.error('client_error:', M.client_errors[code], err)
 end
 
 ---@private
-local function create_read_loop(handle_body, on_no_chunk, on_error)
+function M.create_read_loop(handle_body, on_no_chunk, on_error)
   local parse_chunk = coroutine.wrap(request_parser_loop)
   parse_chunk()
   return function(err, chunk)
@@ -329,7 +331,7 @@ end
 
 ---@private
 function Client:on_error(errkind, ...)
-  assert(client_errors[errkind])
+  assert(M.client_errors[errkind])
   -- TODO what to do if this fails?
   pcall(self.dispatchers.on_error, errkind, ...)
 end
@@ -356,7 +358,7 @@ end
 function Client:handle_body(body)
   local ok, decoded = pcall(vim.json.decode, body, { luanil = { object = true } })
   if not ok then
-    self:on_error(client_errors.INVALID_SERVER_JSON, decoded)
+    self:on_error(M.client_errors.INVALID_SERVER_JSON, decoded)
     return
   end
   local _ = log.debug() and log.debug('rpc.receive', decoded)
@@ -369,7 +371,7 @@ function Client:handle_body(body)
       coroutine.wrap(function()
         local status, result
         status, result, err = self:try_call(
-          client_errors.SERVER_REQUEST_HANDLER_ERROR,
+          M.client_errors.SERVER_REQUEST_HANDLER_ERROR,
           self.dispatchers.server_request,
           decoded.method,
           decoded.params
@@ -401,7 +403,7 @@ function Client:handle_body(body)
           end
         else
           -- On an exception, result will contain the error message.
-          err = rpc_response_error(protocol.ErrorCodes.InternalError, result)
+          err = M.rpc_response_error(protocol.ErrorCodes.InternalError, result)
           result = nil
         end
         self:send_response(decoded.id, err, result)
@@ -454,34 +456,33 @@ function Client:handle_body(body)
       })
       if decoded.error then
         decoded.error = setmetatable(decoded.error, {
-          __tostring = format_rpc_error,
+          __tostring = M.format_rpc_error,
         })
       end
       self:try_call(
-        client_errors.SERVER_RESULT_CALLBACK_ERROR,
+        M.client_errors.SERVER_RESULT_CALLBACK_ERROR,
         callback,
         decoded.error,
         decoded.result
       )
     else
-      self:on_error(client_errors.NO_RESULT_CALLBACK_FOUND, decoded)
+      self:on_error(M.client_errors.NO_RESULT_CALLBACK_FOUND, decoded)
       local _ = log.error() and log.error('No callback found for server response id ' .. result_id)
     end
   elseif type(decoded.method) == 'string' then
     -- Notification
     self:try_call(
-      client_errors.NOTIFICATION_HANDLER_ERROR,
+      M.client_errors.NOTIFICATION_HANDLER_ERROR,
       self.dispatchers.notification,
       decoded.method,
       decoded.params
     )
   else
     -- Invalid server message
-    self:on_error(client_errors.INVALID_SERVER_MESSAGE, decoded)
+    self:on_error(M.client_errors.INVALID_SERVER_MESSAGE, decoded)
   end
 end
 
----@private
 ---@return RpcClient
 local function new_client(dispatchers, transport)
   local state = {
@@ -494,7 +495,6 @@ local function new_client(dispatchers, transport)
   return setmetatable(state, { __index = Client })
 end
 
----@private
 ---@param client RpcClient
 local function public_client(client)
   local result = {}
@@ -531,7 +531,6 @@ local function public_client(client)
   return result
 end
 
----@private
 local function merge_dispatchers(dispatchers)
   if dispatchers then
     local user_dispatchers = dispatchers
@@ -565,7 +564,7 @@ end
 ---@param host string
 ---@param port integer
 ---@return function
-local function connect(host, port)
+function M.connect(host, port)
   return function(dispatchers)
     dispatchers = merge_dispatchers(dispatchers)
     local tcp = uv.new_tcp()
@@ -600,8 +599,8 @@ local function connect(host, port)
       local handle_body = function(body)
         client:handle_body(body)
       end
-      tcp:read_start(create_read_loop(handle_body, transport.terminate, function(read_err)
-        client:on_error(client_errors.READ_ERROR, read_err)
+      tcp:read_start(M.create_read_loop(handle_body, transport.terminate, function(read_err)
+        client:on_error(M.client_errors.READ_ERROR, read_err)
       end))
     end)
 
@@ -630,7 +629,7 @@ end
 --- - `request()` |vim.lsp.rpc.request()|
 --- - `is_closing()` returns a boolean indicating if the RPC is closing.
 --- - `terminate()` terminates the RPC client.
-local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
+function M.start(cmd, cmd_args, dispatchers, extra_spawn_params)
   if log.info() then
     log.info('Starting RPC client', { cmd = cmd, args = cmd_args, extra = extra_spawn_params })
   end
@@ -667,8 +666,8 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
     client:handle_body(body)
   end
 
-  local stdout_handler = create_read_loop(handle_body, nil, function(err)
-    client:on_error(client_errors.READ_ERROR, err)
+  local stdout_handler = M.create_read_loop(handle_body, nil, function(err)
+    client:on_error(M.client_errors.READ_ERROR, err)
   end)
 
   local stderr_handler = function(_, chunk)
@@ -714,11 +713,4 @@ local function start(cmd, cmd_args, dispatchers, extra_spawn_params)
   return public_client(client)
 end
 
-return {
-  start = start,
-  connect = connect,
-  rpc_response_error = rpc_response_error,
-  format_rpc_error = format_rpc_error,
-  client_errors = client_errors,
-  create_read_loop = create_read_loop,
-}
+return M
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 191cc7b400..84723bbc05 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -41,8 +41,6 @@ local STHighlighter = { active = {} }
 ---
 --- Return the index i in range such that tokens[j].line < line for all j < i, and
 --- tokens[j].line >= line for all j >= i, or return hi if no such index is found.
----
----@private
 local function lower_bound(tokens, line, lo, hi)
   while lo < hi do
     local mid = bit.rshift(lo + hi, 1) -- Equivalent to floor((lo + hi) / 2).
@@ -59,8 +57,6 @@ end
 ---
 --- Return the index i in range such that tokens[j].line <= line for all j < i, and
 --- tokens[j].line > line for all j >= i, or return hi if no such index is found.
----
----@private
 local function upper_bound(tokens, line, lo, hi)
   while lo < hi do
     local mid = bit.rshift(lo + hi, 1) -- Equivalent to floor((lo + hi) / 2).
@@ -75,7 +71,6 @@ end
 
 --- Extracts modifier strings from the encoded number in the token array
 ---
----@private
 ---@return table<string, boolean>
 local function modifiers_from_number(x, modifiers_table)
   local modifiers = {}
@@ -93,7 +88,6 @@ end
 
 --- Converts a raw token list to a list of highlight ranges used by the on_win callback
 ---
----@private
 ---@return STTokenRange[]
 local function tokens_to_ranges(data, bufnr, client, request)
   local legend = client.server_capabilities.semanticTokensProvider.legend
@@ -137,7 +131,6 @@ local function tokens_to_ranges(data, bufnr, client, request)
     local token_type = token_types[data[i + 3] + 1]
     local modifiers = modifiers_from_number(data[i + 4], token_modifiers)
 
-    ---@private
     local function _get_byte_pos(col)
       if col > 0 then
         local buf_line = lines[line + 1] or ''
diff --git a/runtime/lua/vim/lsp/sync.lua b/runtime/lua/vim/lsp/sync.lua
index 350c096b47..9c1bbf3892 100644
--- a/runtime/lua/vim/lsp/sync.lua
+++ b/runtime/lua/vim/lsp/sync.lua
@@ -48,7 +48,6 @@ local str_utfindex = vim.str_utfindex
 local str_utf_start = vim.str_utf_start
 local str_utf_end = vim.str_utf_end
 
----@private
 -- Given a line, byte idx, and offset_encoding convert to the
 -- utf-8, utf-16, or utf-32 index.
 ---@param line string the line to index into
@@ -74,7 +73,6 @@ local function byte_to_utf(line, byte, offset_encoding)
   return utf_idx + 1
 end
 
----@private
 local function compute_line_length(line, offset_encoding)
   local length
   local _
@@ -88,7 +86,6 @@ local function compute_line_length(line, offset_encoding)
   return length
 end
 
----@private
 -- Given a line, byte idx, alignment, and offset_encoding convert to the aligned
 -- utf-8 index and either the utf-16, or utf-32 index.
 ---@param line string the line to index into
@@ -122,7 +119,6 @@ local function align_end_position(line, byte, offset_encoding)
   return byte, char
 end
 
----@private
 --- Finds the first line, byte, and char index of the difference between the previous and current lines buffer normalized to the previous codepoint.
 ---@param prev_lines table list of lines from previous buffer
 ---@param curr_lines table list of lines from current buffer
@@ -198,7 +194,6 @@ local function compute_start_range(
   return { line_idx = firstline, byte_idx = byte_idx, char_idx = char_idx }
 end
 
----@private
 --- Finds the last line and byte index of the differences between prev and current buffer.
 --- Normalized to the next codepoint.
 --- prev_end_range is the text range sent to the server representing the changed region.
@@ -307,7 +302,6 @@ local function compute_end_range(
   return prev_end_range, curr_end_range
 end
 
----@private
 --- Get the text of the range defined by start and end line/column
 ---@param lines table list of lines
 ---@param start_range table table returned by first_difference
@@ -343,7 +337,6 @@ local function extract_text(lines, start_range, end_range, line_ending)
   end
 end
 
----@private
 -- rangelength depends on the offset encoding
 -- bytes for utf-8 (clangd with extension)
 -- codepoints for utf-16
diff --git a/runtime/lua/vim/lsp/tagfunc.lua b/runtime/lua/vim/lsp/tagfunc.lua
index eb25b67db9..c70eb573c2 100644
--- a/runtime/lua/vim/lsp/tagfunc.lua
+++ b/runtime/lua/vim/lsp/tagfunc.lua
@@ -1,7 +1,6 @@
 local lsp = vim.lsp
 local util = lsp.util
 
----@private
 local function mk_tag_item(name, range, uri, offset_encoding)
   local bufnr = vim.uri_to_bufnr(uri)
   -- This is get_line_byte_from_position is 0-indexed, call cursor expects a 1-indexed position
@@ -13,7 +12,6 @@ local function mk_tag_item(name, range, uri, offset_encoding)
   }
 end
 
----@private
 local function query_definition(pattern)
   local params = util.make_position_params()
   local results_by_client, err = lsp.buf_request_sync(0, 'textDocument/definition', params, 1000)
@@ -42,7 +40,6 @@ local function query_definition(pattern)
   return results
 end
 
----@private
 local function query_workspace_symbols(pattern)
   local results_by_client, err =
     lsp.buf_request_sync(0, 'workspace/symbol', { query = pattern }, 1000)
@@ -62,7 +59,6 @@ local function query_workspace_symbols(pattern)
   return results
 end
 
----@private
 local function tagfunc(pattern, flags)
   local matches
   if string.match(flags, 'c') then
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 59b9916f64..9a6114c35b 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -22,7 +22,6 @@ local default_border = {
   { ' ', 'NormalFloat' },
 }
 
----@private
 --- Check the border given by opts or the default border for the additional
 --- size it adds to a float.
 ---@param opts table optional options for the floating window
@@ -60,7 +59,6 @@ local function get_border_size(opts)
         )
       )
     end
-    ---@private
     local function border_width(id)
       id = (id - 1) % #border + 1
       if type(border[id]) == 'table' then
@@ -77,7 +75,6 @@ local function get_border_size(opts)
         )
       )
     end
-    ---@private
     local function border_height(id)
       id = (id - 1) % #border + 1
       if type(border[id]) == 'table' then
@@ -103,13 +100,11 @@ local function get_border_size(opts)
   return { height = height, width = width }
 end
 
----@private
 local function split_lines(value)
   value = string.gsub(value, '\r\n?', '\n')
   return split(value, '\n', { plain = true })
 end
 
----@private
 local function create_window_without_focus()
   local prev = vim.api.nvim_get_current_win()
   vim.cmd.new()
@@ -219,7 +214,6 @@ function M.set_lines(lines, A, B, new_lines)
   return lines
 end
 
----@private
 local function sort_by_key(fn)
   return function(a, b)
     local ka, kb = fn(a), fn(b)
@@ -234,7 +228,6 @@ local function sort_by_key(fn)
   end
 end
 
----@private
 --- Gets the zero-indexed lines from the given buffer.
 --- Works on unloaded buffers by reading the file using libuv to bypass buf reading events.
 --- Falls back to loading the buffer and nvim_buf_get_lines for buffers with non-file URI.
@@ -250,7 +243,6 @@ local function get_lines(bufnr, rows)
     bufnr = api.nvim_get_current_buf()
   end
 
-  ---@private
   local function buf_lines()
     local lines = {}
     for _, row in ipairs(rows) do
@@ -316,7 +308,6 @@ local function get_lines(bufnr, rows)
   return lines
 end
 
----@private
 --- Gets the zero-indexed line from the given buffer.
 --- Works on unloaded buffers by reading the file using libuv to bypass buf reading events.
 --- Falls back to loading the buffer and nvim_buf_get_lines for buffers with non-file URI.
@@ -328,7 +319,6 @@ local function get_line(bufnr, row)
   return get_lines(bufnr, { row })[row]
 end
 
----@private
 --- Position is a https://microsoft.github.io/language-server-protocol/specifications/specification-current/#position
 --- Returns a zero-indexed column, since set_lines() does the conversion to
 ---@param offset_encoding string|nil utf-8|utf-16|utf-32
@@ -670,7 +660,6 @@ function M.parse_snippet(input)
   return parsed
 end
 
----@private
 --- Sorts by CompletionItem.sortText.
 ---
 --see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
@@ -680,7 +669,6 @@ local function sort_completion_items(items)
   end)
 end
 
----@private
 --- Returns text that should be inserted when selecting completion item. The
 --- precedence is as follows: textEdit.newText > insertText > label
 --see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
@@ -703,7 +691,6 @@ local function get_completion_word(item)
   return item.label
 end
 
----@private
 --- Some language servers return complementary candidates whose prefixes do not
 --- match are also returned. So we exclude completion candidates whose prefix
 --- does not match.
@@ -784,7 +771,6 @@ function M.text_document_completion_list_to_complete_items(result, prefix)
   return matches
 end
 
----@private
 --- Like vim.fn.bufwinid except it works across tabpages.
 local function bufwinid(bufnr)
   for _, win in ipairs(api.nvim_list_wins()) do
@@ -795,7 +781,6 @@ local function bufwinid(bufnr)
 end
 
 --- Get list of buffers for a directory
----@private
 local function get_dir_bufs(path)
   path = path:gsub('([^%w])', '%%%1')
   local buffers = {}
@@ -855,7 +840,6 @@ function M.rename(old_fname, new_fname, opts)
   end
 end
 
----@private
 local function create_file(change)
   local opts = change.options or {}
   -- from spec: Overwrite wins over `ignoreIfExists`
@@ -870,7 +854,6 @@ local function create_file(change)
   vim.fn.bufadd(fname)
 end
 
----@private
 local function delete_file(change)
   local opts = change.options or {}
   local fname = vim.uri_to_fname(change.uri)
@@ -1266,7 +1249,6 @@ function M.preview_location(location, opts)
   return M.open_floating_preview(contents, syntax, opts)
 end
 
----@private
 local function find_window_by_var(name, value)
   for _, win in ipairs(api.nvim_list_wins()) do
     if npcall(api.nvim_win_get_var, win, name) == value then
@@ -1305,7 +1287,6 @@ end
 --- Generates a table mapping markdown code block lang to vim syntax,
 --- based on g:markdown_fenced_languages
 ---@return table table of lang -> syntax mappings
----@private
 local function get_markdown_fences()
   local fences = {}
   for _, fence in pairs(vim.g.markdown_fenced_languages or {}) do
@@ -1460,7 +1441,6 @@ function M.stylize_markdown(bufnr, contents, opts)
   api.nvim_buf_set_lines(bufnr, 0, -1, false, stripped)
 
   local idx = 1
-  ---@private
   -- keep track of syntaxes we already included.
   -- no need to include the same syntax more than once
   local langs = {}
@@ -1521,7 +1501,6 @@ function M.stylize_markdown(bufnr, contents, opts)
   return stripped
 end
 
----@private
 --- Closes the preview window
 ---
 ---@param winnr integer window id of preview window
@@ -1539,7 +1518,6 @@ local function close_preview_window(winnr, bufnrs)
   end)
 end
 
----@private
 --- Creates autocommands to close a preview window when events happen.
 ---
 ---@param events table list of events
@@ -1905,7 +1883,6 @@ end
 ---
 ---@param symbols table DocumentSymbol[] or SymbolInformation[]
 function M.symbols_to_items(symbols, bufnr)
-  ---@private
   local function _symbols_to_items(_symbols, _items, _bufnr)
     for _, symbol in ipairs(_symbols) do
       if symbol.location then -- SymbolInformation type
@@ -1991,7 +1968,6 @@ function M.try_trim_markdown_code_blocks(lines)
   return 'markdown'
 end
 
----@private
 ---@param window integer|nil: window handle or 0 for current, defaults to current
 ---@param offset_encoding string utf-8|utf-16|utf-32|nil defaults to `offset_encoding` of first client of buffer of `window`
 local function make_position_param(window, offset_encoding)
@@ -2209,6 +2185,7 @@ end
 
 M._get_line_byte_from_position = get_line_byte_from_position
 
+---@nodoc
 M.buf_versions = {}
 
 return M
diff --git a/runtime/lua/vim/secure.lua b/runtime/lua/vim/secure.lua
index 1a04e11231..837738c041 100644
--- a/runtime/lua/vim/secure.lua
+++ b/runtime/lua/vim/secure.lua
@@ -1,6 +1,5 @@
 local M = {}
 
----@private
 --- Reads trust database from $XDG_STATE_HOME/nvim/trust.
 ---
 ---@return (table) Contents of trust database, if it exists. Empty table otherwise.
@@ -22,7 +21,6 @@ local function read_trust()
   return trust
 end
 
----@private
 --- Writes provided {trust} table to trust database at
 --- $XDG_STATE_HOME/nvim/trust.
 ---
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index dd05299295..291b003d87 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -8,6 +8,45 @@
 
 vim = vim or {}
 
+local function _id(v)
+  return v
+end
+
+local deepcopy
+
+local deepcopy_funcs = {
+  table = function(orig, cache)
+    if cache[orig] then
+      return cache[orig]
+    end
+    local copy = {}
+
+    cache[orig] = copy
+    local mt = getmetatable(orig)
+    for k, v in pairs(orig) do
+      copy[deepcopy(k, cache)] = deepcopy(v, cache)
+    end
+    return setmetatable(copy, mt)
+  end,
+  number = _id,
+  string = _id,
+  ['nil'] = _id,
+  boolean = _id,
+  ['function'] = _id,
+}
+
+deepcopy = function(orig, _cache)
+  local f = deepcopy_funcs[type(orig)]
+  if f then
+    return f(orig, _cache or {})
+  else
+    if type(orig) == 'userdata' and orig == vim.NIL then
+      return vim.NIL
+    end
+    error('Cannot deepcopy object of type ' .. type(orig))
+  end
+end
+
 --- Returns a deep copy of the given object. Non-table objects are copied as
 --- in a typical Lua assignment, whereas table objects are copied recursively.
 --- Functions are naively copied, so functions in the copied table point to the
@@ -17,45 +56,9 @@ vim = vim or {}
 ---@generic T: table
 ---@param orig T Table to copy
 ---@return T Table of copied keys and (nested) values.
-function vim.deepcopy(orig) end -- luacheck: no unused
-vim.deepcopy = (function()
-  local function _id(v)
-    return v
-  end
-
-  local deepcopy_funcs = {
-    table = function(orig, cache)
-      if cache[orig] then
-        return cache[orig]
-      end
-      local copy = {}
-
-      cache[orig] = copy
-      local mt = getmetatable(orig)
-      for k, v in pairs(orig) do
-        copy[vim.deepcopy(k, cache)] = vim.deepcopy(v, cache)
-      end
-      return setmetatable(copy, mt)
-    end,
-    number = _id,
-    string = _id,
-    ['nil'] = _id,
-    boolean = _id,
-    ['function'] = _id,
-  }
-
-  return function(orig, cache)
-    local f = deepcopy_funcs[type(orig)]
-    if f then
-      return f(orig, cache or {})
-    else
-      if type(orig) == 'userdata' and orig == vim.NIL then
-        return vim.NIL
-      end
-      error('Cannot deepcopy object of type ' .. type(orig))
-    end
-  end
-end)()
+function vim.deepcopy(orig)
+  return deepcopy(orig)
+end
 
 --- Splits a string at each instance of a separator.
 ---
@@ -318,7 +321,6 @@ function vim.tbl_isempty(t)
 end
 
 --- We only merge empty tables or tables that are not an array (indexed by integers)
----@private
 local function can_merge(v)
   return type(v) == 'table' and (vim.tbl_isempty(v) or not vim.tbl_isarray(v))
 end
@@ -770,7 +772,6 @@ do
     return type(val) == t or (t == 'callable' and vim.is_callable(val))
   end
 
-  ---@private
   local function is_valid(opt)
     if type(opt) ~= 'table' then
       return false, string.format('opt: expected table, got %s', type(opt))
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 5526c9858c..8bd85d3734 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -39,7 +39,10 @@ local M = setmetatable({}, {
   end,
 })
 
+--- @nodoc
 M.language_version = vim._ts_get_language_version()
+
+--- @nodoc
 M.minimum_language_version = vim._ts_get_minimum_language_version()
 
 --- Creates a new parser
@@ -60,12 +63,10 @@ function M._create_parser(bufnr, lang, opts)
 
   local self = LanguageTree.new(bufnr, lang, opts)
 
-  ---@private
   local function bytes_cb(_, ...)
     self:_on_bytes(...)
   end
 
-  ---@private
   local function detach_cb(_, ...)
     if parsers[bufnr] == self then
       parsers[bufnr] = nil
@@ -73,7 +74,6 @@ function M._create_parser(bufnr, lang, opts)
     self:_on_detach(...)
   end
 
-  ---@private
   local function reload_cb(_)
     self:_on_reload()
   end
@@ -91,7 +91,6 @@ function M._create_parser(bufnr, lang, opts)
   return self
 end
 
---- @private
 local function valid_lang(lang)
   return lang and lang ~= ''
 end
@@ -205,7 +204,6 @@ function M.get_range(node, source, metadata)
   return { node:range(true) }
 end
 
----@private
 ---@param buf integer
 ---@param range Range
 ---@returns string
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 99cd147658..1bb5a08205 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -42,7 +42,6 @@ local TSTreeView = {}
 ---@param injections table<integer,TSP.Node> Mapping of node ids to root nodes of injected language trees (see
 ---                        explanation above)
 ---@param tree TSP.Node[] Output table containing a list of tables each representing a node in the tree
----@private
 local function traverse(node, depth, lang, injections, tree)
   local injection = injections[node:id()]
   if injection then
@@ -141,7 +140,6 @@ end
 
 local decor_ns = api.nvim_create_namespace('ts.dev')
 
----@private
 ---@param lnum integer
 ---@param col integer
 ---@param end_lnum integer
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index d4db6bc404..f8ec5b175d 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -17,6 +17,7 @@ local query = vim.treesitter.query
 local TSHighlighter = rawget(vim.treesitter, 'TSHighlighter') or {}
 TSHighlighter.__index = TSHighlighter
 
+--- @nodoc
 TSHighlighter.active = TSHighlighter.active or {}
 
 ---@class TSHighlighterQuery
@@ -205,7 +206,6 @@ function TSHighlighter:get_query(lang)
   return self._queries[lang]
 end
 
----@private
 ---@param self TSHighlighter
 ---@param buf integer
 ---@param line integer
diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 08c297c9ad..9695e2c41c 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -104,7 +104,6 @@ function M.add(lang, opts)
   vim._ts_add_language(path, lang, symbol_name)
 end
 
---- @private
 --- @param x string|string[]
 --- @return string[]
 local function ensure_list(x)
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index bf6333aaa4..0d4a1a54dd 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -164,7 +164,6 @@ function LanguageTree:_set_logger()
   self._parser:_set_logger(log_lex, log_parse, self._logger)
 end
 
----@private
 ---Measure execution time of a function
 ---@generic R1, R2, R3
 ---@param f fun(): R1, R2, R2
@@ -444,7 +443,6 @@ function LanguageTree:destroy()
   end
 end
 
----@private
 ---@param region Range6[]
 local function region_tostr(region)
   if #region == 0 then
@@ -560,7 +558,6 @@ function LanguageTree:included_regions()
   return regions
 end
 
----@private
 ---@param node TSNode
 ---@param source string|integer
 ---@param metadata TSMetadata
@@ -600,7 +597,6 @@ end
 
 ---@alias TSInjection table<string,table<integer,TSInjectionElem>>
 
----@private
 ---@param t table<integer,TSInjection>
 ---@param tree_index integer
 ---@param pattern integer
@@ -963,7 +959,6 @@ function LanguageTree:register_cbs(cbs, recursive)
   end
 end
 
----@private
 ---@param tree TSTree
 ---@param range Range
 ---@return boolean
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 7610ef7b7f..08186468a5 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -15,7 +15,6 @@ Query.__index = Query
 ---@class TSQueryModule
 local M = {}
 
----@private
 ---@param files string[]
 ---@return string[]
 local function dedupe_files(files)
@@ -33,7 +32,6 @@ local function dedupe_files(files)
   return result
 end
 
----@private
 local function safe_read(filename, read_quantifier)
   local file, err = io.open(filename, 'r')
   if not file then
@@ -44,7 +42,6 @@ local function safe_read(filename, read_quantifier)
   return content
 end
 
----@private
 --- Adds {ilang} to {base_langs}, only if {ilang} is different than {lang}
 ---
 ---@return boolean true If lang == ilang
@@ -153,7 +150,6 @@ function M.get_files(lang, query_name, is_included)
   return query_files
 end
 
----@private
 ---@param filenames string[]
 ---@return string
 local function read_query_files(filenames)
@@ -335,7 +331,6 @@ local predicate_handlers = {
 
   ['match?'] = (function()
     local magic_prefixes = { ['\\v'] = true, ['\\m'] = true, ['\\M'] = true, ['\\V'] = true }
-    ---@private
     local function check_magic(str)
       if string.len(str) < 2 or magic_prefixes[string.sub(str, 1, 2)] then
         return str
@@ -624,12 +619,10 @@ function M.list_predicates()
   return vim.tbl_keys(predicate_handlers)
 end
 
----@private
 local function xor(x, y)
   return (x or y) and not (x and y)
 end
 
----@private
 local function is_directive(name)
   return string.sub(name, -1) == '!'
 end
@@ -700,7 +693,6 @@ end
 --- Returns the start and stop value if set else the node's range.
 -- When the node's range is used, the stop is incremented by 1
 -- to make the search inclusive.
----@private
 ---@param start integer
 ---@param stop integer
 ---@param node TSNode
@@ -750,7 +742,6 @@ function Query:iter_captures(node, source, start, stop)
   start, stop = value_or_node_range(start, stop, node)
 
   local raw_iter = node:_rawquery(self.query, true, start, stop)
-  ---@private
   local function iter()
     local capture, captured_node, match = raw_iter()
     local metadata = {}
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua
index dec7840eb0..eaa64a6fad 100644
--- a/runtime/lua/vim/uri.lua
+++ b/runtime/lua/vim/uri.lua
@@ -8,7 +8,6 @@ do
   local schar = string.char
 
   --- Convert hex to char
-  ---@private
   local function hex_to_char(hex)
     return schar(tonumber(hex, 16))
   end
@@ -33,7 +32,6 @@ do
   local sbyte = string.byte
   local tohex = require('bit').tohex
 
-  ---@private
   local function percent_encode_char(char)
     return '%' .. tohex(sbyte(char), 2)
   end
@@ -46,15 +44,16 @@ do
   end
 end
 
----@private
 local function is_windows_file_uri(uri)
   return uri:match('^file:/+[a-zA-Z]:') ~= nil
 end
 
+local M = {}
+
 --- Get a URI from a file path.
 ---@param path string Path to file
 ---@return string URI
-local function uri_from_fname(path)
+function M.uri_from_fname(path)
   local volume_path, fname = path:match('^([a-zA-Z]:)(.*)')
   local is_windows = volume_path ~= nil
   if is_windows then
@@ -76,7 +75,7 @@ local WINDOWS_URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9.+-]*):[a-zA-Z]:.*'
 --- Get a URI from a bufnr
 ---@param bufnr integer
 ---@return string URI
-local function uri_from_bufnr(bufnr)
+function M.uri_from_bufnr(bufnr)
   local fname = vim.api.nvim_buf_get_name(bufnr)
   local volume_path = fname:match('^([a-zA-Z]:).*')
   local is_windows = volume_path ~= nil
@@ -90,14 +89,14 @@ local function uri_from_bufnr(bufnr)
   if scheme then
     return fname
   else
-    return uri_from_fname(fname)
+    return M.uri_from_fname(fname)
   end
 end
 
 --- Get a filename from a URI
 ---@param uri string
 ---@return string filename or unchanged URI for non-file URIs
-local function uri_to_fname(uri)
+function M.uri_to_fname(uri)
   local scheme = assert(uri:match(URI_SCHEME_PATTERN), 'URI must contain a scheme: ' .. uri)
   if scheme ~= 'file' then
     return uri
@@ -118,13 +117,8 @@ end
 --
 ---@param uri string
 ---@return integer bufnr
-local function uri_to_bufnr(uri)
-  return vim.fn.bufadd(uri_to_fname(uri))
+function M.uri_to_bufnr(uri)
+  return vim.fn.bufadd(M.uri_to_fname(uri))
 end
 
-return {
-  uri_from_fname = uri_from_fname,
-  uri_from_bufnr = uri_from_bufnr,
-  uri_to_fname = uri_to_fname,
-  uri_to_bufnr = uri_to_bufnr,
-}
+return M
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 8ff8a19cb9..96889438eb 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -65,8 +65,6 @@ local M = {}
 local Version = {}
 Version.__index = Version
 
---- @private
----
 --- Compares prerelease strings: per semver, number parts must be must be treated as numbers:
 --- "pre1.10" is greater than "pre1.2". https://semver.org/#spec-item-11
 local function cmp_prerel(prerel1, prerel2)
@@ -332,7 +330,6 @@ function M.range(spec) -- Adapted from https://github.com/folke/lazy.nvim
   end
 end
 
----@private
 ---@param v string|Version
 ---@return string
 local function create_err_msg(v)
-- 
cgit 


From 2f22ed6a00db10c4852a8fa232b8782f8b6a6646 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Wed, 19 Jul 2023 07:10:11 +0200
Subject: feat(lsp): handle multiple clients in omnifunc (#24381)

Also fixes https://github.com/neovim/neovim/issues/24369 by adding an
extra `vim.schedule` to ensure the `vim.fn.complete` call happens
outside of a luv callback
---
 runtime/lua/vim/lsp.lua | 88 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 34 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 35e4bc9dd8..65cce6af47 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -2268,8 +2268,9 @@ function lsp.omnifunc(findstart, base)
   end
 
   local bufnr = resolve_bufnr()
-  local has_buffer_clients = not tbl_isempty(all_buffer_active_clients[bufnr] or {})
-  if not has_buffer_clients then
+  local clients = lsp.get_clients({ bufnr = bufnr, method = 'textDocument/completion' })
+  local remaining = #clients
+  if remaining == 0 then
     return findstart == 1 and -1 or {}
   end
 
@@ -2278,47 +2279,66 @@ function lsp.omnifunc(findstart, base)
     log.info('base ', base)
   end
 
-  local pos = api.nvim_win_get_cursor(0)
+  local win = api.nvim_get_current_win()
+  local pos = api.nvim_win_get_cursor(win)
   local line = api.nvim_get_current_line()
   local line_to_cursor = line:sub(1, pos[2])
   local _ = log.trace() and log.trace('omnifunc.line', pos, line)
 
   -- Get the start position of the current keyword
-  local textMatch = vim.fn.match(line_to_cursor, '\\k*$')
+  local match_pos = vim.fn.match(line_to_cursor, '\\k*$') + 1
+  local items = {}
 
-  local params = util.make_position_params()
+  local startbyte
 
-  local items = {}
-  lsp.buf_request(bufnr, 'textDocument/completion', params, function(err, result, ctx)
-    if err or not result or vim.fn.mode() ~= 'i' then
-      return
+  ---@private
+  local function on_done()
+    local mode = api.nvim_get_mode()['mode']
+    if mode == 'i' or mode == 'ic' then
+      vim.fn.complete(startbyte or match_pos, items)
     end
+  end
 
-    -- Completion response items may be relative to a position different than `textMatch`.
-    -- Concrete example, with sumneko/lua-language-server:
-    --
-    -- require('plenary.asy|
-    --         ▲       ▲   ▲
-    --         │       │   └── cursor_pos: 20
-    --         │       └────── textMatch: 17
-    --         └────────────── textEdit.range.start.character: 9
-    --                                 .newText = 'plenary.async'
-    --                  ^^^
-    --                  prefix (We'd remove everything not starting with `asy`,
-    --                  so we'd eliminate the `plenary.async` result
-    --
-    -- `adjust_start_col` is used to prefer the language server boundary.
-    --
-    local client = lsp.get_client_by_id(ctx.client_id)
-    local encoding = client and client.offset_encoding or 'utf-16'
-    local candidates = util.extract_completion_items(result)
-    local startbyte = adjust_start_col(pos[1], line, candidates, encoding) or textMatch
-    local prefix = line:sub(startbyte + 1, pos[2])
-    local matches = util.text_document_completion_list_to_complete_items(result, prefix)
-    -- TODO(ashkan): is this the best way to do this?
-    vim.list_extend(items, matches)
-    vim.fn.complete(startbyte + 1, items)
-  end)
+  for _, client in ipairs(clients) do
+    local params = util.make_position_params(win, client.offset_encoding)
+    client.request('textDocument/completion', params, function(err, result)
+      if err then
+        log.warn(err.message)
+      end
+      if result and vim.fn.mode() == 'i' then
+        -- Completion response items may be relative to a position different than `textMatch`.
+        -- Concrete example, with sumneko/lua-language-server:
+        --
+        -- require('plenary.asy|
+        --         ▲       ▲   ▲
+        --         │       │   └── cursor_pos: 20
+        --         │       └────── textMatch: 17
+        --         └────────────── textEdit.range.start.character: 9
+        --                                 .newText = 'plenary.async'
+        --                  ^^^
+        --                  prefix (We'd remove everything not starting with `asy`,
+        --                  so we'd eliminate the `plenary.async` result
+        --
+        -- `adjust_start_col` is used to prefer the language server boundary.
+        --
+        local encoding = client.offset_encoding
+        local candidates = util.extract_completion_items(result)
+        local curstartbyte = adjust_start_col(pos[1], line, candidates, encoding)
+        if startbyte == nil then
+          startbyte = curstartbyte
+        elseif curstartbyte ~= nil and curstartbyte ~= startbyte then
+          startbyte = match_pos
+        end
+        local prefix = startbyte and line:sub(startbyte + 1) or line_to_cursor:sub(match_pos)
+        local matches = util.text_document_completion_list_to_complete_items(result, prefix)
+        vim.list_extend(items, matches)
+      end
+      remaining = remaining - 1
+      if remaining == 0 then
+        vim.schedule(on_done)
+      end
+    end, bufnr)
+  end
 
   -- Return -2 to signal that we should continue completion so that we can
   -- async complete.
-- 
cgit 


From 86ce3878d662c1dbfec61a5ad8e7c16c4283ed5c Mon Sep 17 00:00:00 2001
From: futsuuu <105504350+futsuuu@users.noreply.github.com>
Date: Thu, 20 Jul 2023 01:55:35 +0900
Subject: docs(lua): clarify fs.find() documentation #24394

---
 runtime/doc/lua.txt    | 61 +++++++++++++++++++++++++-------------------------
 runtime/lua/vim/fs.lua | 54 +++++++++++++++++++++-----------------------
 2 files changed, 56 insertions(+), 59 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 0b894897d1..d6d0f1a9f8 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2729,16 +2729,16 @@ vim.keymap.set({mode}, {lhs}, {rhs}, {opts})                *vim.keymap.set()*
 Lua module: vim.fs                                                    *vim.fs*
 
 vim.fs.basename({file})                                    *vim.fs.basename()*
-    Return the basename of the given file or directory
+    Return the basename of the given path
 
     Parameters: ~
-      • {file}  (string) File or directory
+      • {file}  (string) Path
 
     Return: ~
         (string|nil) Basename of {file}
 
 vim.fs.dir({path}, {opts})                                      *vim.fs.dir()*
-    Return an iterator over the files and directories located in {path}
+    Return an iterator over the items located in {path}
 
     Parameters: ~
       • {path}  (string) An absolute or relative path to the directory to
@@ -2751,30 +2751,32 @@ vim.fs.dir({path}, {opts})                                      *vim.fs.dir()*
                   current directory. Only useful when depth > 1
 
     Return: ~
-        Iterator over files and directories in {path}. Each iteration yields
-        two values: name and type. Each "name" is the basename of the file or
-        directory relative to {path}. Type is one of "file" or "directory".
+        Iterator over items in {path}. Each iteration yields two values:
+        "name" and "type". "name" is the basename of the item relative to
+        {path}. "type" is one of the following: "file", "directory", "link",
+        "fifo", "socket", "char", "block", "unknown".
 
 vim.fs.dirname({file})                                      *vim.fs.dirname()*
-    Return the parent directory of the given file or directory
+    Return the parent directory of the given path
 
     Parameters: ~
-      • {file}  (string) File or directory
+      • {file}  (string) Path
 
     Return: ~
         (string|nil) Parent directory of {file}
 
 vim.fs.find({names}, {opts})                                   *vim.fs.find()*
-    Find files or directories in the given path.
-
-    Finds any files or directories given in {names} starting from {path}. If
-    {upward} is "true" then the search traverses upward through parent
-    directories; otherwise, the search traverses downward. Note that downward
-    searches are recursive and may search through many directories! If {stop}
-    is non-nil, then the search stops when the directory given in {stop} is
-    reached. The search terminates when {limit} (default 1) matches are found.
-    The search can be narrowed to find only files or only directories by
-    specifying {type} to be "file" or "directory", respectively.
+    Find files or directories (or other items as specified by `opts.type`) in
+    the given path.
+
+    Finds items given in {names} starting from {path}. If {upward} is "true"
+    then the search traverses upward through parent directories; otherwise,
+    the search traverses downward. Note that downward searches are recursive
+    and may search through many directories! If {stop} is non-nil, then the
+    search stops when the directory given in {stop} is reached. The search
+    terminates when {limit} (default 1) matches are found. You can set {type}
+    to "file", "directory", "link", "socket", "char", "block", or "fifo" to
+    narrow the search to find only that type.
 
     Examples: >lua
 
@@ -2799,14 +2801,13 @@ vim.fs.find({names}, {opts})                                   *vim.fs.find()*
 
     Parameters: ~
       • {names}  (string|table|fun(name: string, path: string): boolean) Names
-                 of the files and directories to find. Must be base names,
-                 paths and globs are not supported when {names} is a string or
-                 a table. If {names} is a function, it is called for each
-                 traversed file and directory with args:
+                 of the items to find. Must be base names, paths and globs are
+                 not supported when {names} is a string or a table. If {names}
+                 is a function, it is called for each traversed item with
+                 args:
                  • name: base name of the current item
                  • path: full path of the current item The function should
-                   return `true` if the given file or directory is considered
-                   a match.
+                   return `true` if the given item is considered a match.
       • {opts}   (table) Optional keyword arguments:
                  • path (string): Path to begin searching from. If omitted,
                    the |current-directory| is used.
@@ -2815,16 +2816,14 @@ vim.fs.find({names}, {opts})                                   *vim.fs.find()*
                    directories (recursively).
                  • stop (string): Stop searching when this directory is
                    reached. The directory itself is not searched.
-                 • type (string): Find only files ("file") or directories
-                   ("directory"). If omitted, both files and directories that
-                   match {names} are included.
+                 • type (string): Find only items of the given type. If
+                   omitted, all items that match {names} are included.
                  • limit (number, default 1): Stop the search after finding
                    this many matches. Use `math.huge` to place no limit on the
                    number of matches.
 
     Return: ~
-        (table) Normalized paths |vim.fs.normalize()| of all matching files or
-        directories
+        (table) Normalized paths |vim.fs.normalize()| of all matching items
 
 vim.fs.joinpath({...})                                     *vim.fs.joinpath()*
     Concatenate directories and/or file paths into a single path with
@@ -2864,7 +2863,7 @@ vim.fs.normalize({path}, {opts})                          *vim.fs.normalize()*
         (string) Normalized path
 
 vim.fs.parents({start})                                     *vim.fs.parents()*
-    Iterate over all the parents of the given file or directory.
+    Iterate over all the parents of the given path.
 
     Example: >lua
 
@@ -2882,7 +2881,7 @@ vim.fs.parents({start})                                     *vim.fs.parents()*
 <
 
     Parameters: ~
-      • {start}  (string) Initial file or directory.
+      • {start}  (string) Initial path.
 
     Return: ~
         (function) Iterator
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 842767098c..92966523c0 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -2,7 +2,7 @@ local M = {}
 
 local iswin = vim.uv.os_uname().sysname == 'Windows_NT'
 
---- Iterate over all the parents of the given file or directory.
+--- Iterate over all the parents of the given path.
 ---
 --- Example:
 --- <pre>lua
@@ -19,7 +19,7 @@ local iswin = vim.uv.os_uname().sysname == 'Windows_NT'
 --- end
 --- </pre>
 ---
----@param start (string) Initial file or directory.
+---@param start (string) Initial path.
 ---@return function Iterator
 function M.parents(start)
   return function(_, dir)
@@ -34,9 +34,9 @@ function M.parents(start)
     start
 end
 
---- Return the parent directory of the given file or directory
+--- Return the parent directory of the given path
 ---
----@param file (string) File or directory
+---@param file (string) Path
 ---@return string|nil Parent directory of {file}
 function M.dirname(file)
   if file == nil then
@@ -57,9 +57,9 @@ function M.dirname(file)
   return (dir:gsub('\\', '/'))
 end
 
---- Return the basename of the given file or directory
+--- Return the basename of the given path
 ---
----@param file string File or directory
+---@param file string Path
 ---@return string|nil Basename of {file}
 function M.basename(file)
   if file == nil then
@@ -83,7 +83,7 @@ end
 
 ---@alias Iterator fun(): string?, string?
 
---- Return an iterator over the files and directories located in {path}
+--- Return an iterator over the items located in {path}
 ---
 ---@param path (string) An absolute or relative path to the directory to iterate
 ---            over. The path is first normalized |vim.fs.normalize()|.
@@ -93,9 +93,10 @@ end
 ---               to control traversal. Return false to stop searching the current directory.
 ---               Only useful when depth > 1
 ---
----@return Iterator over files and directories in {path}. Each iteration yields
----        two values: name and type. Each "name" is the basename of the file or
----        directory relative to {path}. Type is one of "file" or "directory".
+---@return Iterator over items in {path}. Each iteration yields two values: "name" and "type".
+---        "name" is the basename of the item relative to {path}.
+---        "type" is one of the following:
+---        "file", "directory", "link", "fifo", "socket", "char", "block", "unknown".
 function M.dir(path, opts)
   opts = opts or {}
 
@@ -142,16 +143,16 @@ function M.dir(path, opts)
   end)
 end
 
---- Find files or directories in the given path.
+--- Find files or directories (or other items as specified by `opts.type`) in the given path.
 ---
---- Finds any files or directories given in {names} starting from {path}. If
---- {upward} is "true" then the search traverses upward through parent
---- directories; otherwise, the search traverses downward. Note that downward
---- searches are recursive and may search through many directories! If {stop}
---- is non-nil, then the search stops when the directory given in {stop} is
---- reached. The search terminates when {limit} (default 1) matches are found.
---- The search can be narrowed to find only files or only directories by
---- specifying {type} to be "file" or "directory", respectively.
+--- Finds items given in {names} starting from {path}. If {upward} is "true"
+--- then the search traverses upward through parent directories; otherwise,
+--- the search traverses downward. Note that downward searches are recursive
+--- and may search through many directories! If {stop} is non-nil, then the
+--- search stops when the directory given in {stop} is reached. The search
+--- terminates when {limit} (default 1) matches are found. You can set {type}
+--- to "file", "directory", "link", "socket", "char", "block", or "fifo"
+--- to narrow the search to find only that type.
 ---
 --- Examples:
 --- <pre>lua
@@ -174,13 +175,12 @@ end
 --- end, {limit = math.huge, type = 'file'})
 --- </pre>
 ---
----@param names (string|table|fun(name: string, path: string): boolean) Names of the files
----             and directories to find.
+---@param names (string|table|fun(name: string, path: string): boolean) Names of the items to find.
 ---             Must be base names, paths and globs are not supported when {names} is a string or a table.
----             If {names} is a function, it is called for each traversed file and directory with args:
+---             If {names} is a function, it is called for each traversed item with args:
 ---             - name: base name of the current item
 ---             - path: full path of the current item
----             The function should return `true` if the given file or directory is considered a match.
+---             The function should return `true` if the given item is considered a match.
 ---
 ---@param opts (table) Optional keyword arguments:
 ---                       - path (string): Path to begin searching from. If
@@ -191,14 +191,12 @@ end
 ---                                (recursively).
 ---                       - stop (string): Stop searching when this directory is
 ---                              reached. The directory itself is not searched.
----                       - type (string): Find only files ("file") or
----                              directories ("directory"). If omitted, both
----                              files and directories that match {names} are
----                              included.
+---                       - type (string): Find only items of the given type.
+---                               If omitted, all items that match {names} are included.
 ---                       - limit (number, default 1): Stop the search after
 ---                               finding this many matches. Use `math.huge` to
 ---                               place no limit on the number of matches.
----@return (table) Normalized paths |vim.fs.normalize()| of all matching files or directories
+---@return (table) Normalized paths |vim.fs.normalize()| of all matching items
 function M.find(names, opts)
   opts = opts or {}
   vim.validate({
-- 
cgit 


From 63b3408551561127f7845470eb51404bcd6f547b Mon Sep 17 00:00:00 2001
From: Chris AtLee <chris@atlee.ca>
Date: Thu, 20 Jul 2023 03:03:48 -0400
Subject: feat(lsp): implement textDocument/diagnostic (#24128)

---
 runtime/doc/lsp.txt                |  58 +++++++++++-
 runtime/doc/news.txt               |   7 +-
 runtime/lua/vim/lsp.lua            |  22 ++++-
 runtime/lua/vim/lsp/diagnostic.lua | 187 ++++++++++++++++++++++++++++++++++---
 runtime/lua/vim/lsp/handlers.lua   |   4 +
 runtime/lua/vim/lsp/inlay_hint.lua |  77 ++++-----------
 runtime/lua/vim/lsp/protocol.lua   |   3 +
 runtime/lua/vim/lsp/util.lua       |  40 ++++++++
 8 files changed, 324 insertions(+), 74 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index edc9f50c8d..899066ff00 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -175,6 +175,7 @@ won't run if your server doesn't support them.
 - textDocument/completion
 - textDocument/declaration*
 - textDocument/definition
+- textDocument/diagnostic
 - textDocument/documentHighlight
 - textDocument/documentSymbol
 - textDocument/formatting
@@ -553,6 +554,27 @@ to the callback in the "data" table. The token fields are documented in
 Note: doing anything other than calling
 |vim.lsp.semantic_tokens.highlight_token()| is considered experimental.
 
+LspNotify                                                          *LspNotify*
+
+This event is triggered after each successful notification sent to an LSP server.
+
+When used from Lua, the client_id, LSP method, and parameters are sent in the
+"data" table. Example: >lua
+
+    vim.api.nvim_create_autocmd('LspNotify', {
+      callback = function(args)
+        local bufnr = args.buf
+        local client_id = args.data.client_id
+        local method = args.data.method
+        local params = args.data.params
+
+        -- do something with the notification
+        if method == 'textDocument/...' then
+          update_buffer(bufnr)
+        end
+      end,
+    })
+<
 
 LspRequest                                                        *LspRequest*
 
@@ -1328,12 +1350,44 @@ workspace_symbol({query}, {options})          *vim.lsp.buf.workspace_symbol()*
 ==============================================================================
 Lua module: vim.lsp.diagnostic                                *lsp-diagnostic*
 
-get_namespace({client_id})                *vim.lsp.diagnostic.get_namespace()*
+                                          *vim.lsp.diagnostic.get_namespace()*
+get_namespace({client_id}, {is_pull})
     Get the diagnostic namespace associated with an LSP client
-    |vim.diagnostic|.
+    |vim.diagnostic| for diagnostics
 
     Parameters: ~
       • {client_id}  (integer) The id of the LSP client
+      • {is_pull}    (boolean) Whether the namespace is for a pull or push
+                     client
+
+                                          *vim.lsp.diagnostic.on_diagnostic()*
+on_diagnostic({_}, {result}, {ctx}, {config})
+    |lsp-handler| for the method "textDocument/diagnostic"
+
+    See |vim.diagnostic.config()| for configuration options. Handler-specific
+    configuration can be set using |vim.lsp.with()|: >lua
+
+     vim.lsp.handlers["textDocument/diagnostic"] = vim.lsp.with(
+       vim.lsp.diagnostic.on_diagnostic, {
+         -- Enable underline, use default values
+         underline = true,
+         -- Enable virtual text, override spacing to 4
+         virtual_text = {
+           spacing = 4,
+         },
+         -- Use a function to dynamically turn signs off
+         -- and on, using buffer local variables
+         signs = function(namespace, bufnr)
+           return vim.b[bufnr].show_signs == true
+         end,
+         -- Disable a feature
+         update_in_insert = false,
+       }
+     )
+<
+
+    Parameters: ~
+      • {config}  (table) Configuration table (see |vim.diagnostic.config()|).
 
                                  *vim.lsp.diagnostic.on_publish_diagnostics()*
 on_publish_diagnostics({_}, {result}, {ctx}, {config})
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 6294a8b505..4e24bb6dac 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -117,8 +117,11 @@ The following new APIs and features were added.
 • Builtin TUI can now recognize "super" (|<D-|) and "meta" (|<T-|) modifiers in a
   terminal emulator that supports |tui-csiu|.
 
-• Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
-  https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
+• LSP
+  • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
+    https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
+  • Implemented pull diagnostic textDocument/diagnostic: |vim.lsp.diagnostic.on_diagnostic()|
+    https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_diagnostic
 
 • Bundled treesitter parser and queries (highlight, folds) for Markdown,
   Python, and Bash.
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 65cce6af47..fa2a888a54 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -61,6 +61,7 @@ lsp._request_name_to_capability = {
   ['textDocument/semanticTokens/full'] = { 'semanticTokensProvider' },
   ['textDocument/semanticTokens/full/delta'] = { 'semanticTokensProvider' },
   ['textDocument/inlayHint'] = { 'inlayHintProvider' },
+  ['textDocument/diagnostic'] = { 'diagnosticProvider' },
   ['inlayHint/resolve'] = { 'inlayHintProvider', 'resolveProvider' },
 }
 
@@ -954,6 +955,9 @@ function lsp._set_defaults(client, bufnr)
       vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = bufnr })
     end
   end)
+  if client.supports_method('textDocument/diagnostic') then
+    lsp.diagnostic._enable(bufnr)
+  end
 end
 
 --- @class lsp.ClientConfig
@@ -1567,7 +1571,23 @@ function lsp.start_client(config)
     if method ~= 'textDocument/didChange' then
       changetracking.flush(client)
     end
-    return rpc.notify(method, params)
+
+    local result = rpc.notify(method, params)
+
+    if result then
+      vim.schedule(function()
+        nvim_exec_autocmds('LspNotify', {
+          modeline = false,
+          data = {
+            client_id = client.id,
+            method = method,
+            params = params,
+          },
+        })
+      end)
+    end
+
+    return result
   end
 
   ---@private
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index c2cf7c6ba5..34be13096d 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -1,9 +1,14 @@
 ---@brief lsp-diagnostic
 
+local util = require('vim.lsp.util')
 local protocol = require('vim.lsp.protocol')
 
+local api = vim.api
+
 local M = {}
 
+local augroup = api.nvim_create_augroup('vim_lsp_diagnostic', {})
+
 local DEFAULT_CLIENT_ID = -1
 
 local function get_client_id(client_id)
@@ -154,19 +159,43 @@ local function diagnostic_vim_to_lsp(diagnostics)
 end
 
 ---@type table<integer,integer>
-local _client_namespaces = {}
+local _client_push_namespaces = {}
+---@type table<integer,integer>
+local _client_pull_namespaces = {}
 
---- Get the diagnostic namespace associated with an LSP client |vim.diagnostic|.
+--- Get the diagnostic namespace associated with an LSP client |vim.diagnostic| for diagnostics
 ---
 ---@param client_id integer The id of the LSP client
-function M.get_namespace(client_id)
+---@param is_pull boolean Whether the namespace is for a pull or push client
+function M.get_namespace(client_id, is_pull)
   vim.validate({ client_id = { client_id, 'n' } })
-  if not _client_namespaces[client_id] then
-    local client = vim.lsp.get_client_by_id(client_id)
-    local name = string.format('vim.lsp.%s.%d', client and client.name or 'unknown', client_id)
-    _client_namespaces[client_id] = vim.api.nvim_create_namespace(name)
+
+  local namespace_table
+  local key
+  local name
+  local client = vim.lsp.get_client_by_id(client_id)
+
+  if is_pull then
+    namespace_table = _client_pull_namespaces
+    local server_id = vim.tbl_get(client.server_capabilities, 'diagnosticProvider', 'identifier')
+    key = string.format('%d:%s', client_id, server_id or 'nil')
+    name = string.format(
+      'vim.lsp.%s.%d.%s',
+      client and client.name or 'unknown',
+      client_id,
+      server_id or 'nil'
+    )
+  else
+    namespace_table = _client_push_namespaces
+    key = client_id
+    name = string.format('vim.lsp.%s.%d', client and client.name or 'unknown', client_id)
   end
-  return _client_namespaces[client_id]
+
+  if not namespace_table[key] then
+    namespace_table[key] = api.nvim_create_namespace(name)
+  end
+
+  return namespace_table[key]
 end
 
 --- |lsp-handler| for the method "textDocument/publishDiagnostics"
@@ -209,7 +238,7 @@ function M.on_publish_diagnostics(_, result, ctx, config)
   end
 
   client_id = get_client_id(client_id)
-  local namespace = M.get_namespace(client_id)
+  local namespace = M.get_namespace(client_id, false)
 
   if config then
     for _, opt in pairs(config) do
@@ -229,7 +258,75 @@ function M.on_publish_diagnostics(_, result, ctx, config)
   vim.diagnostic.set(namespace, bufnr, diagnostic_lsp_to_vim(diagnostics, bufnr, client_id))
 end
 
---- Clear diagnostics and diagnostic cache.
+--- |lsp-handler| for the method "textDocument/diagnostic"
+---
+--- See |vim.diagnostic.config()| for configuration options. Handler-specific
+--- configuration can be set using |vim.lsp.with()|:
+--- <pre>lua
+--- vim.lsp.handlers["textDocument/diagnostic"] = vim.lsp.with(
+---   vim.lsp.diagnostic.on_diagnostic, {
+---     -- Enable underline, use default values
+---     underline = true,
+---     -- Enable virtual text, override spacing to 4
+---     virtual_text = {
+---       spacing = 4,
+---     },
+---     -- Use a function to dynamically turn signs off
+---     -- and on, using buffer local variables
+---     signs = function(namespace, bufnr)
+---       return vim.b[bufnr].show_signs == true
+---     end,
+---     -- Disable a feature
+---     update_in_insert = false,
+---   }
+--- )
+--- </pre>
+---
+---@param config table Configuration table (see |vim.diagnostic.config()|).
+function M.on_diagnostic(_, result, ctx, config)
+  local client_id = ctx.client_id
+  local uri = ctx.params.textDocument.uri
+  local fname = vim.uri_to_fname(uri)
+
+  if result == nil then
+    return
+  end
+
+  if result.kind == 'unchanged' then
+    return
+  end
+
+  local diagnostics = result.items
+  if #diagnostics == 0 and vim.fn.bufexists(fname) == 0 then
+    return
+  end
+  local bufnr = vim.fn.bufadd(fname)
+
+  if not bufnr then
+    return
+  end
+
+  client_id = get_client_id(client_id)
+
+  local namespace = M.get_namespace(client_id, true)
+
+  if config then
+    for _, opt in pairs(config) do
+      if type(opt) == 'table' and not opt.severity and opt.severity_limit then
+        opt.severity = { min = severity_lsp_to_vim(opt.severity_limit) }
+      end
+    end
+
+    -- Persist configuration to ensure buffer reloads use the same
+    -- configuration. To make lsp.with configuration work (See :help
+    -- lsp-handler-configuration)
+    vim.diagnostic.config(config, namespace)
+  end
+
+  vim.diagnostic.set(namespace, bufnr, diagnostic_lsp_to_vim(diagnostics, bufnr, client_id))
+end
+
+--- Clear push diagnostics and diagnostic cache.
 ---
 --- Diagnostic producers should prefer |vim.diagnostic.reset()|. However,
 --- this method signature is still used internally in some parts of the LSP
@@ -243,7 +340,7 @@ function M.reset(client_id, buffer_client_map)
   vim.schedule(function()
     for bufnr, client_ids in pairs(buffer_client_map) do
       if client_ids[client_id] then
-        local namespace = M.get_namespace(client_id)
+        local namespace = M.get_namespace(client_id, false)
         vim.diagnostic.reset(namespace, bufnr)
       end
     end
@@ -275,7 +372,7 @@ function M.get_line_diagnostics(bufnr, line_nr, opts, client_id)
   end
 
   if client_id then
-    opts.namespace = M.get_namespace(client_id)
+    opts.namespace = M.get_namespace(client_id, false)
   end
 
   if not line_nr then
@@ -287,4 +384,70 @@ function M.get_line_diagnostics(bufnr, line_nr, opts, client_id)
   return diagnostic_vim_to_lsp(vim.diagnostic.get(bufnr, opts))
 end
 
+--- Clear diagnostics from pull based clients
+--- @private
+local function clear(bufnr)
+  for _, namespace in pairs(_client_pull_namespaces) do
+    vim.diagnostic.reset(namespace, bufnr)
+  end
+end
+
+--- autocmd ids for LspNotify handlers per buffer
+--- @private
+--- @type table<integer,integer>
+local _autocmd_ids = {}
+
+--- Disable pull diagnostics for a buffer
+--- @private
+local function disable(bufnr)
+  if not _autocmd_ids[bufnr] then
+    return
+  end
+  api.nvim_del_autocmd(_autocmd_ids[bufnr])
+  _autocmd_ids[bufnr] = nil
+  clear(bufnr)
+end
+
+--- Enable pull diagnostics for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@private
+function M._enable(bufnr)
+  if bufnr == nil or bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
+
+  if _autocmd_ids[bufnr] then
+    return
+  end
+
+  _autocmd_ids[bufnr] = api.nvim_create_autocmd('LspNotify', {
+    buffer = bufnr,
+    callback = function(opts)
+      if opts.data.method ~= 'textDocument/didChange' then
+        return
+      end
+      util._refresh('textDocument/diagnostic', { bufnr = bufnr, only_visible = true })
+    end,
+    group = augroup,
+  })
+
+  api.nvim_buf_attach(bufnr, false, {
+    on_reload = function()
+      util._refresh('textDocument/diagnostic', { bufnr = bufnr })
+    end,
+    on_detach = function()
+      disable(bufnr)
+    end,
+  })
+
+  api.nvim_create_autocmd('LspDetach', {
+    buffer = bufnr,
+    callback = function()
+      disable(bufnr)
+    end,
+    once = true,
+    group = augroup,
+  })
+end
+
 return M
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index ce3db68618..d887183972 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -214,6 +214,10 @@ M['textDocument/publishDiagnostics'] = function(...)
   return require('vim.lsp.diagnostic').on_publish_diagnostics(...)
 end
 
+M['textDocument/diagnostic'] = function(...)
+  return require('vim.lsp.diagnostic').on_diagnostic(...)
+end
+
 M['textDocument/codeLens'] = function(...)
   return require('vim.lsp.codelens').on_codelens(...)
 end
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index bec6f33e93..1c29e8a866 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -87,54 +87,6 @@ function M.on_inlayhint(err, result, ctx, _)
   api.nvim__buf_redraw_range(bufnr, 0, -1)
 end
 
-local function resolve_bufnr(bufnr)
-  return bufnr > 0 and bufnr or api.nvim_get_current_buf()
-end
-
---- Refresh inlay hints for a buffer
----
----@param opts (nil|table) Optional arguments
----  - bufnr (integer, default: 0): Buffer whose hints to refresh
----  - only_visible (boolean, default: false): Whether to only refresh hints for the visible regions of the buffer
----
-local function refresh(opts)
-  opts = opts or {}
-  local bufnr = resolve_bufnr(opts.bufnr or 0)
-  local bufstate = bufstates[bufnr]
-  if not (bufstate and bufstate.enabled) then
-    return
-  end
-  local only_visible = opts.only_visible or false
-  local buffer_windows = {}
-  for _, winid in ipairs(api.nvim_list_wins()) do
-    if api.nvim_win_get_buf(winid) == bufnr then
-      table.insert(buffer_windows, winid)
-    end
-  end
-  for _, window in ipairs(buffer_windows) do
-    local first = vim.fn.line('w0', window)
-    local last = vim.fn.line('w$', window)
-    local params = {
-      textDocument = util.make_text_document_params(bufnr),
-      range = {
-        start = { line = first - 1, character = 0 },
-        ['end'] = { line = last, character = 0 },
-      },
-    }
-    vim.lsp.buf_request(bufnr, 'textDocument/inlayHint', params)
-  end
-  if not only_visible then
-    local params = {
-      textDocument = util.make_text_document_params(bufnr),
-      range = {
-        start = { line = 0, character = 0 },
-        ['end'] = { line = api.nvim_buf_line_count(bufnr), character = 0 },
-      },
-    }
-    vim.lsp.buf_request(bufnr, 'textDocument/inlayHint', params)
-  end
-end
-
 --- |lsp-handler| for the method `textDocument/inlayHint/refresh`
 ---@private
 function M.on_refresh(err, _, ctx, _)
@@ -144,8 +96,11 @@ function M.on_refresh(err, _, ctx, _)
   for _, bufnr in ipairs(vim.lsp.get_buffers_by_client_id(ctx.client_id)) do
     for _, winid in ipairs(api.nvim_list_wins()) do
       if api.nvim_win_get_buf(winid) == bufnr then
-        refresh({ bufnr = bufnr })
-        break
+        local bufstate = bufstates[bufnr]
+        if bufstate and bufstate.enabled then
+          util._refresh('textDocument/inlayHint', { bufnr = bufnr })
+          break
+        end
       end
     end
   end
@@ -156,7 +111,9 @@ end
 --- Clear inlay hints
 ---@param bufnr (integer) Buffer handle, or 0 for current
 local function clear(bufnr)
-  bufnr = resolve_bufnr(bufnr)
+  if bufnr == nil or bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
   if not bufstates[bufnr] then
     return
   end
@@ -175,17 +132,19 @@ end
 
 local function make_request(request_bufnr)
   reset_timer(request_bufnr)
-  refresh({ bufnr = request_bufnr })
+  util._refresh('textDocument/inlayHint', { bufnr = request_bufnr })
 end
 
 --- Enable inlay hints for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
 local function enable(bufnr)
-  bufnr = resolve_bufnr(bufnr)
+  if bufnr == nil or bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
   local bufstate = bufstates[bufnr]
   if not (bufstate and bufstate.enabled) then
     bufstates[bufnr] = { enabled = true, timer = nil, applied = {} }
-    refresh({ bufnr = bufnr })
+    util._refresh('textDocument/inlayHint', { bufnr = bufnr })
     api.nvim_buf_attach(bufnr, true, {
       on_lines = function(_, cb_bufnr)
         if not bufstates[cb_bufnr].enabled then
@@ -201,7 +160,7 @@ local function enable(bufnr)
         if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
           bufstates[cb_bufnr] = { enabled = true, applied = {} }
         end
-        refresh({ bufnr = cb_bufnr })
+        util._refresh('textDocument/inlayHint', { bufnr = cb_bufnr })
       end,
       on_detach = function(_, cb_bufnr)
         clear(cb_bufnr)
@@ -222,7 +181,9 @@ end
 --- Disable inlay hints for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
 local function disable(bufnr)
-  bufnr = resolve_bufnr(bufnr)
+  if bufnr == nil or bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
   if bufstates[bufnr] and bufstates[bufnr].enabled then
     clear(bufnr)
     bufstates[bufnr].enabled = nil
@@ -233,7 +194,9 @@ end
 --- Toggle inlay hints for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
 local function toggle(bufnr)
-  bufnr = resolve_bufnr(bufnr)
+  if bufnr == nil or bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
   local bufstate = bufstates[bufnr]
   if bufstate and bufstate.enabled then
     disable(bufnr)
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 5bc0baf241..537a5eda39 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -641,6 +641,9 @@ function protocol.make_client_capabilities()
       },
     },
     textDocument = {
+      diagnostic = {
+        dynamicRegistration = false,
+      },
       inlayHint = {
         dynamicRegistration = true,
         resolveSupport = {
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 9a6114c35b..0b06d2bbb5 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -2183,6 +2183,46 @@ function M.lookup_section(settings, section)
   return settings
 end
 
+---@private
+--- Request updated LSP information for a buffer.
+---
+---@param method string LSP method to call
+---@param opts (nil|table) Optional arguments
+---  - bufnr (integer, default: 0): Buffer to refresh
+---  - only_visible (boolean, default: false): Whether to only refresh for the visible regions of the buffer
+function M._refresh(method, opts)
+  opts = opts or {}
+  local bufnr = opts.bufnr
+  if bufnr == nil or bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
+  local only_visible = opts.only_visible or false
+  for _, window in ipairs(api.nvim_list_wins()) do
+    if api.nvim_win_get_buf(window) == bufnr then
+      local first = vim.fn.line('w0', window)
+      local last = vim.fn.line('w$', window)
+      local params = {
+        textDocument = M.make_text_document_params(bufnr),
+        range = {
+          start = { line = first - 1, character = 0 },
+          ['end'] = { line = last, character = 0 },
+        },
+      }
+      vim.lsp.buf_request(bufnr, method, params)
+    end
+  end
+  if not only_visible then
+    local params = {
+      textDocument = M.make_text_document_params(bufnr),
+      range = {
+        start = { line = 0, character = 0 },
+        ['end'] = { line = api.nvim_buf_line_count(bufnr), character = 0 },
+      },
+    }
+    vim.lsp.buf_request(bufnr, method, params)
+  end
+end
+
 M._get_line_byte_from_position = get_line_byte_from_position
 
 ---@nodoc
-- 
cgit 


From ca9f4a7cb1fea1ef1f22c011679fd8afa0a5d161 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 21 Jul 2023 16:30:05 +0800
Subject: docs: also change "vimL" and "viml" to "Vimscript" (#24414)

---
 runtime/doc/api.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index b33d251786..5b6a901970 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1674,8 +1674,8 @@ nvim_parse_expression({expr}, {flags}, {highlight})
               stringified without "kExprNode" prefix.
             • "start": a pair [line, column] describing where node is
               "started" where "line" is always 0 (will not be 0 if you will be
-              using nvim_parse_viml() on e.g. ":let", but that is not present
-              yet). Both elements are Integers.
+              using this API on e.g. ":let", but that is not present yet).
+              Both elements are Integers.
             • "len": “length” of the node. This and "start" are there for
               debugging purposes primary (debugging parser and providing debug
               information).
@@ -2108,8 +2108,8 @@ nvim_buf_call({buffer}, {fun})                               *nvim_buf_call()*
     a temporary scratch window (called the "autocmd window" for historical
     reasons) will be used.
 
-    This is useful e.g. to call vimL functions that only work with the current
-    buffer/window currently, like |termopen()|.
+    This is useful e.g. to call Vimscript functions that only work with the
+    current buffer/window currently, like |termopen()|.
 
     Attributes: ~
         Lua |vim.api| only
-- 
cgit 


From 519b9929e94c94965b73ac4b04aedb03fd2708ca Mon Sep 17 00:00:00 2001
From: marshmallow <marshycity@gmail.com>
Date: Wed, 19 Jul 2023 10:06:20 +1000
Subject: fix(ui.open): some URLs fail on Windows

Problem:
On Windows, `explorer.exe` fails to open some URLs, for example:

    :lua vim.ui.open('https://devdocs.io/#q=lua%20lua_call')

https://github.com/neovim/neovim/pull/23401#issuecomment-1641015704

Solution:
Use rundll32 instead.
---
 runtime/lua/vim/ui.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua
index fd06611da2..87b52787a0 100644
--- a/runtime/lua/vim/ui.lua
+++ b/runtime/lua/vim/ui.lua
@@ -136,7 +136,11 @@ function M.open(path)
   if vim.fn.has('mac') == 1 then
     cmd = { 'open', path }
   elseif vim.fn.has('win32') == 1 then
-    cmd = { 'explorer', path }
+    if vim.fn.executable('rundll32') == 1 then
+      cmd = { 'rundll32', 'url.dll,FileProtocolHandler', path }
+    else
+      return nil, 'vim.ui.open: rundll32 not found'
+    end
   elseif vim.fn.executable('wslview') == 1 then
     cmd = { 'wslview', path }
   elseif vim.fn.executable('xdg-open') == 1 then
-- 
cgit 


From 4448f594d3d6fbe873fc2b2d832551ef454ed908 Mon Sep 17 00:00:00 2001
From: Chris AtLee <chris.atlee@shopify.com>
Date: Fri, 21 Jul 2023 07:42:47 -0400
Subject: docs(lsp): clean up LSP event documentation #24413

Alphabetize LSP events, and make formatting consistent.
---
 runtime/doc/lsp.txt | 123 ++++++++++++++++++++++++++--------------------------
 1 file changed, 62 insertions(+), 61 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 899066ff00..3d7e1ed582 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -500,10 +500,10 @@ The following groups are linked by default to standard |group-name|s:
 ==============================================================================
 EVENTS                                                            *lsp-events*
 
-                                                                   *LspAttach*
-After an LSP client attaches to a buffer. The |autocmd-pattern| is the
-name of the buffer. When used from Lua, the client ID is passed to the
-callback in the "data" table. Example: >lua
+LspAttach                                                          *LspAttach*
+    After an LSP client attaches to a buffer. The |autocmd-pattern| is the
+    name of the buffer. When used from Lua, the client ID is passed to the
+    callback in the "data" table. Example: >lua
 
     vim.api.nvim_create_autocmd("LspAttach", {
       callback = function(args)
@@ -518,10 +518,11 @@ callback in the "data" table. Example: >lua
       end,
     })
 <
-                                                                   *LspDetach*
-Just before an LSP client detaches from a buffer. The |autocmd-pattern| is the
-name of the buffer. When used from Lua, the client ID is passed to the
-callback in the "data" table. Example: >lua
+
+LspDetach                                                          *LspDetach*
+    Just before an LSP client detaches from a buffer. The |autocmd-pattern|
+    is the name of the buffer. When used from Lua, the client ID is passed
+    to the callback in the "data" table. Example: >lua
 
     vim.api.nvim_create_autocmd("LspDetach", {
       callback = function(args)
@@ -532,34 +533,12 @@ callback in the "data" table. Example: >lua
     })
 <
 
-LspTokenUpdate                                                *LspTokenUpdate*
-
-When a visible semantic token is sent or updated by the LSP server, or when an
-existing token becomes visible for the first time. The |autocmd-pattern| is
-the name of the buffer. When used from Lua, the token and client ID are passed
-to the callback in the "data" table. The token fields are documented in
-|vim.lsp.semantic_tokens.get_at_pos()|. Example: >lua
-
-    vim.api.nvim_create_autocmd('LspTokenUpdate', {
-      callback = function(args)
-        local token = args.data.token
-        if token.type == 'variable' and not token.modifiers.readonly then
-          vim.lsp.semantic_tokens.highlight_token(
-            token, args.buf, args.data.client_id, 'MyMutableVariableHighlight'
-          )
-        end
-      end,
-    })
-<
-Note: doing anything other than calling
-|vim.lsp.semantic_tokens.highlight_token()| is considered experimental.
-
 LspNotify                                                          *LspNotify*
+    This event is triggered after each successful notification sent to an
+    LSP server.
 
-This event is triggered after each successful notification sent to an LSP server.
-
-When used from Lua, the client_id, LSP method, and parameters are sent in the
-"data" table. Example: >lua
+    When used from Lua, the client_id, LSP method, and parameters are sent
+    in the "data" table. Example: >lua
 
     vim.api.nvim_create_autocmd('LspNotify', {
       callback = function(args)
@@ -576,23 +555,38 @@ When used from Lua, the client_id, LSP method, and parameters are sent in the
     })
 <
 
-LspRequest                                                        *LspRequest*
+LspProgress                                                       *LspProgress*
+    Upon receipt of a progress notification from the server. Notifications can
+    be polled from a `progress` ring buffer of a |vim.lsp.client| or use
+    |vim.lsp.status()| to get an aggregate message
 
-For each request sent to an LSP server, this event is triggered for every
-change to the request's status. The status can be one of `pending`,
-`complete`, or `cancel` and is sent as the {type} on the "data" table passed
-to the callback function.
+    If the server sends a "work done progress", the `pattern` is set to `kind`
+    (one of `begin`, `report` or `end`).
 
-It triggers when the initial request is sent ({type} == `pending`) and when
-the LSP server responds ({type} == `complete`). If a cancelation is requested
-using `client.cancel_request(request_id)`, then this event will trigger with
-{type} == `cancel`.
+    When used from Lua, the event contains a `data` table with `client_id` and
+    `result` properties. `result` will contain the request params sent by the
+    server.
 
-When used from Lua, the client ID, request ID, and request are sent in the
-"data" table. See {requests} in |vim.lsp.client| for details on the {request}
-value. If the request type is `complete`, the request will be deleted from the
-client's pending requests table immediately after calling the event's
-callbacks. Example: >lua
+    Example: >vim
+        autocmd LspProgress * redrawstatus
+<
+
+LspRequest                                                        *LspRequest*
+    For each request sent to an LSP server, this event is triggered for
+    every change to the request's status. The status can be one of
+    `pending`, `complete`, or `cancel` and is sent as the {type} on the
+    "data" table passed to the callback function.
+
+    It triggers when the initial request is sent ({type} == `pending`) and
+    when the LSP server responds ({type} == `complete`). If a cancelation
+    is requested using `client.cancel_request(request_id)`, then this event
+    will trigger with {type} == `cancel`.
+
+    When used from Lua, the client ID, request ID, and request are sent in
+    the "data" table. See {requests} in |vim.lsp.client| for details on the
+    {request} value. If the request type is `complete`, the request will be
+    deleted from the client's pending requests table immediately after
+    calling the event's callbacks. Example: >lua
 
     vim.api.nvim_create_autocmd('LspRequest', {
       callback = function(args)
@@ -615,21 +609,28 @@ callbacks. Example: >lua
     })
 <
 
-LspProgress                                                       *LspProgress*
-    Upon receipt of a progress notification from the server. Notifications can
-    be polled from a `progress` ring buffer of a |vim.lsp.client| or use
-    |vim.lsp.status()| to get an aggregate message
-
-    If the server sends a "work done progress", the `pattern` is set to `kind`
-    (one of `begin`, `report` or `end`).
-
-    When used from Lua, the event contains a `data` table with `client_id` and
-    `result` properties. `result` will contain the request params sent by the
-    server.
+LspTokenUpdate                                                *LspTokenUpdate*
+    When a visible semantic token is sent or updated by the LSP server, or
+    when an existing token becomes visible for the first time. The
+    |autocmd-pattern| is the name of the buffer. When used from Lua, the
+    token and client ID are passed to the callback in the "data" table. The
+    token fields are documented in |vim.lsp.semantic_tokens.get_at_pos()|.
+    Example:
+    >lua
 
-Example: >vim
-    autocmd LspProgress * redrawstatus
+    vim.api.nvim_create_autocmd('LspTokenUpdate', {
+      callback = function(args)
+        local token = args.data.token
+        if token.type == 'variable' and not token.modifiers.readonly then
+          vim.lsp.semantic_tokens.highlight_token(
+            token, args.buf, args.data.client_id, 'MyMutableVariableHighlight'
+          )
+        end
+      end,
+    })
 <
+    Note: doing anything other than calling
+    |vim.lsp.semantic_tokens.highlight_token()| is considered experimental.
 
 ==============================================================================
 Lua module: vim.lsp                                                 *lsp-core*
-- 
cgit 


From cfcda91827d73dda740e372b237383c19e63dab9 Mon Sep 17 00:00:00 2001
From: Gnik <gnikdroy@gmail.com>
Date: Sat, 22 Jul 2023 13:27:25 +0545
Subject: docs(lua): add missing word in docs for vim.empty_dict (#24401)

---
 runtime/doc/lua.txt               | 8 ++++----
 runtime/lua/vim/_meta/builtin.lua | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index d6d0f1a9f8..6a839b205c 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -893,10 +893,10 @@ Log levels are one of the values defined in `vim.log.levels`:
     vim.log.levels.OFF
 
 vim.empty_dict()                                            *vim.empty_dict()*
-    Creates a special empty table (marked with a metatable), which Nvim to an
-    empty dictionary when translating Lua values to Vimscript or API types.
-    Nvim by default converts an empty table `{}` without this metatable to an
-    list/array.
+    Creates a special empty table (marked with a metatable), which Nvim
+    converts to an empty dictionary when translating Lua values to Vimscript
+    or API types. Nvim by default converts an empty table `{}` without this
+    metatable to an list/array.
 
     Note: If numeric keys are present in the table, Nvim ignores the metatable
     marker and converts the dict to a list/array anyway.
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index 980e40d61b..88f07f2a51 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -69,10 +69,10 @@
 --- to other restrictions such as |textlock|).
 function vim.in_fast_event() end
 
---- Creates a special empty table (marked with a metatable), which Nvim to an
---- empty dictionary when translating Lua values to Vimscript or API types.
---- Nvim by default converts an empty table `{}` without this metatable to an
---- list/array.
+--- Creates a special empty table (marked with a metatable), which Nvim
+--- converts to an empty dictionary when translating Lua values to Vimscript
+--- or API types. Nvim by default converts an empty table `{}` without this
+--- metatable to an list/array.
 ---
 --- Note: If numeric keys are present in the table, Nvim ignores the metatable
 --- marker and converts the dict to a list/array anyway.
-- 
cgit 


From 24e3ee9d07e1433cb13b4d96ec20999f5f02b204 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 22 Jul 2023 09:52:13 +0100
Subject: fix(api/options): validate buf and win

Fixes #24398
---
 runtime/lua/vim/_options.lua | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_options.lua b/runtime/lua/vim/_options.lua
index d54e8b447c..e1c125baf2 100644
--- a/runtime/lua/vim/_options.lua
+++ b/runtime/lua/vim/_options.lua
@@ -124,14 +124,12 @@ local function get_option_metatype(name, info)
   return info.type
 end
 
-local options_info = setmetatable({}, {
-  __index = function(t, k)
-    local info = api.nvim_get_option_info(k)
-    info.metatype = get_option_metatype(k, info)
-    rawset(t, k, info)
-    return rawget(t, k)
-  end,
-})
+--- @param name string
+local function get_options_info(name)
+  local info = api.nvim_get_option_info(name)
+  info.metatype = get_option_metatype(name, info)
+  return info
+end
 
 ---Environment variables defined in the editor session.
 ---See |expand-env| and |:let-environment| for the Vimscript behavior.
@@ -155,34 +153,16 @@ vim.env = setmetatable({}, {
   end,
 })
 
-local function opt_validate(option_name, target_scope)
-  local scope = options_info[option_name].scope
-  if scope ~= target_scope then
-    local scope_to_string = { buf = 'buffer', win = 'window' }
-    error(
-      string.format(
-        [['%s' is a %s option, not a %s option. See ":help %s"]],
-        option_name,
-        scope_to_string[scope] or scope,
-        scope_to_string[target_scope] or target_scope,
-        option_name
-      )
-    )
-  end
-end
-
 local function new_buf_opt_accessor(bufnr)
   return setmetatable({}, {
     __index = function(_, k)
       if bufnr == nil and type(k) == 'number' then
         return new_buf_opt_accessor(k)
       end
-      opt_validate(k, 'buf')
       return api.nvim_get_option_value(k, { buf = bufnr or 0 })
     end,
 
     __newindex = function(_, k, v)
-      opt_validate(k, 'buf')
       return api.nvim_set_option_value(k, v, { buf = bufnr or 0 })
     end,
   })
@@ -203,7 +183,6 @@ local function new_win_opt_accessor(winid, bufnr)
         error('only bufnr=0 is supported')
       end
 
-      opt_validate(k, 'win')
       -- TODO(lewis6991): allow passing both buf and win to nvim_get_option_value
       return api.nvim_get_option_value(k, {
         scope = bufnr and 'local' or nil,
@@ -212,7 +191,6 @@ local function new_win_opt_accessor(winid, bufnr)
     end,
 
     __newindex = function(_, k, v)
-      opt_validate(k, 'win')
       -- TODO(lewis6991): allow passing both buf and win to nvim_set_option_value
       return api.nvim_set_option_value(k, v, {
         scope = bufnr and 'local' or nil,
@@ -680,7 +658,7 @@ local function create_option_accessor(scope)
   local option_mt
 
   local function make_option(name, value)
-    local info = assert(options_info[name], 'Not a valid option name: ' .. name)
+    local info = assert(get_options_info(name), 'Not a valid option name: ' .. name)
 
     if type(value) == 'table' and getmetatable(value) == option_mt then
       assert(name == value._name, "must be the same value, otherwise that's weird.")
-- 
cgit 


From 4b57ff77febbe6073bc4c5c3a45b0ad0d5d40e6c Mon Sep 17 00:00:00 2001
From: Chris AtLee <chris.atlee@shopify.com>
Date: Sat, 22 Jul 2023 05:00:17 -0400
Subject: refactor(lsp): use LspNotify for inlay_hint (#24411)

---
 runtime/lua/vim/lsp.lua            |  6 +--
 runtime/lua/vim/lsp/inlay_hint.lua | 86 +++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 55 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index fa2a888a54..78b5f53723 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1572,9 +1572,9 @@ function lsp.start_client(config)
       changetracking.flush(client)
     end
 
-    local result = rpc.notify(method, params)
+    local client_active = rpc.notify(method, params)
 
-    if result then
+    if client_active then
       vim.schedule(function()
         nvim_exec_autocmds('LspNotify', {
           modeline = false,
@@ -1587,7 +1587,7 @@ function lsp.start_client(config)
       end)
     end
 
-    return result
+    return client_active
   end
 
   ---@private
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index 1c29e8a866..912ce6898e 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -6,28 +6,14 @@ local M = {}
 ---@class lsp._inlay_hint.bufstate
 ---@field version integer
 ---@field client_hint table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
----@field enabled boolean Whether inlay hints are enabled for the buffer
----@field timer uv.uv_timer_t? Debounce timer associated with the buffer
 ---@field applied table<integer, integer> Last version of hints applied to this line
-
+---@field autocmd_id integer The autocmd id for the buffer
 ---@type table<integer, lsp._inlay_hint.bufstate>
 local bufstates = {}
 
 local namespace = api.nvim_create_namespace('vim_lsp_inlayhint')
 local augroup = api.nvim_create_augroup('vim_lsp_inlayhint', {})
 
---- Reset the request debounce timer of a buffer
-local function reset_timer(reset_bufnr)
-  local timer = bufstates[reset_bufnr].timer
-  if timer then
-    bufstates[reset_bufnr].timer = nil
-    if not timer:is_closing() then
-      timer:stop()
-      timer:close()
-    end
-  end
-end
-
 --- |lsp-handler| for the method `textDocument/inlayHint`
 --- Store hints for a specific buffer and client
 ---@private
@@ -97,7 +83,7 @@ function M.on_refresh(err, _, ctx, _)
     for _, winid in ipairs(api.nvim_list_wins()) do
       if api.nvim_win_get_buf(winid) == bufnr then
         local bufstate = bufstates[bufnr]
-        if bufstate and bufstate.enabled then
+        if bufstate then
           util._refresh('textDocument/inlayHint', { bufnr = bufnr })
           break
         end
@@ -117,7 +103,6 @@ local function clear(bufnr)
   if not bufstates[bufnr] then
     return
   end
-  reset_timer(bufnr)
   local bufstate = bufstates[bufnr]
   local client_lens = (bufstate or {}).client_hint or {}
   local client_ids = vim.tbl_keys(client_lens)
@@ -130,9 +115,17 @@ local function clear(bufnr)
   api.nvim__buf_redraw_range(bufnr, 0, -1)
 end
 
-local function make_request(request_bufnr)
-  reset_timer(request_bufnr)
-  util._refresh('textDocument/inlayHint', { bufnr = request_bufnr })
+--- Disable inlay hints for a buffer
+---@param bufnr (integer) Buffer handle, or 0 for current
+local function disable(bufnr)
+  if bufnr == nil or bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
+  clear(bufnr)
+  if bufstates[bufnr] and bufstates[bufnr].autocmd_id then
+    api.nvim_del_autocmd(bufstates[bufnr].autocmd_id)
+  end
+  bufstates[bufnr] = nil
 end
 
 --- Enable inlay hints for a buffer
@@ -142,35 +135,37 @@ local function enable(bufnr)
     bufnr = api.nvim_get_current_buf()
   end
   local bufstate = bufstates[bufnr]
-  if not (bufstate and bufstate.enabled) then
-    bufstates[bufnr] = { enabled = true, timer = nil, applied = {} }
-    util._refresh('textDocument/inlayHint', { bufnr = bufnr })
-    api.nvim_buf_attach(bufnr, true, {
-      on_lines = function(_, cb_bufnr)
-        if not bufstates[cb_bufnr].enabled then
-          return true
+  if not bufstate then
+    bufstates[bufnr] = { applied = {} }
+    bufstates[bufnr].autocmd_id = api.nvim_create_autocmd('LspNotify', {
+      buffer = bufnr,
+      callback = function(opts)
+        if opts.data.method ~= 'textDocument/didChange' then
+          return
+        end
+        if bufstates[bufnr] then
+          util._refresh('textDocument/inlayHint', { bufnr = bufnr })
         end
-        reset_timer(cb_bufnr)
-        bufstates[cb_bufnr].timer = vim.defer_fn(function()
-          make_request(cb_bufnr)
-        end, 200)
       end,
+      group = augroup,
+    })
+    util._refresh('textDocument/inlayHint', { bufnr = bufnr })
+    api.nvim_buf_attach(bufnr, true, {
       on_reload = function(_, cb_bufnr)
         clear(cb_bufnr)
-        if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
-          bufstates[cb_bufnr] = { enabled = true, applied = {} }
+        if bufstates[cb_bufnr] then
+          bufstates[cb_bufnr].applied = {}
+          util._refresh('textDocument/inlayHint', { bufnr = cb_bufnr })
         end
-        util._refresh('textDocument/inlayHint', { bufnr = cb_bufnr })
       end,
       on_detach = function(_, cb_bufnr)
-        clear(cb_bufnr)
-        bufstates[cb_bufnr] = nil
+        disable(cb_bufnr)
       end,
     })
     api.nvim_create_autocmd('LspDetach', {
       buffer = bufnr,
-      callback = function(opts)
-        clear(opts.buf)
+      callback = function()
+        disable(bufnr)
       end,
       once = true,
       group = augroup,
@@ -178,19 +173,6 @@ local function enable(bufnr)
   end
 end
 
---- Disable inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
-local function disable(bufnr)
-  if bufnr == nil or bufnr == 0 then
-    bufnr = api.nvim_get_current_buf()
-  end
-  if bufstates[bufnr] and bufstates[bufnr].enabled then
-    clear(bufnr)
-    bufstates[bufnr].enabled = nil
-    bufstates[bufnr].timer = nil
-  end
-end
-
 --- Toggle inlay hints for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
 local function toggle(bufnr)
@@ -198,7 +180,7 @@ local function toggle(bufnr)
     bufnr = api.nvim_get_current_buf()
   end
   local bufstate = bufstates[bufnr]
-  if bufstate and bufstate.enabled then
+  if bufstate then
     disable(bufnr)
   else
     enable(bufnr)
-- 
cgit 


From ad95b369856969ccb05b3f92b24d7262b4de3d71 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 22 Jul 2023 19:57:58 +0200
Subject: fix(treesitter): update markdown parser and queries (#24429)

---
 runtime/queries/markdown_inline/highlights.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/queries/markdown_inline/highlights.scm b/runtime/queries/markdown_inline/highlights.scm
index a70e34bb87..cd5da530d7 100644
--- a/runtime/queries/markdown_inline/highlights.scm
+++ b/runtime/queries/markdown_inline/highlights.scm
@@ -20,6 +20,8 @@
   (uri_autolink)
 ] @text.uri @nospell
 
+(shortcut_link (link_text) @nospell)
+
 [
   (link_label)
   (link_text)
-- 
cgit 


From 78b56b21b4a80fcc7deaf131e49536e23c73c6d8 Mon Sep 17 00:00:00 2001
From: ii14 <59243201+ii14@users.noreply.github.com>
Date: Mon, 24 Jul 2023 16:10:55 +0200
Subject: docs(vim_diff): fixed inconsistent autocmds behavior #24453

---
 runtime/doc/vim_diff.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 8e87c7ee6c..6d9f8a13a9 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -535,6 +535,10 @@ Working directory (Vim implemented some of these after Nvim):
 - `getcwd(-1)` is equivalent to `getcwd(-1, 0)` instead of returning the global
   working directory. Use `getcwd(-1, -1)` to get the global working directory.
 
+Autocommands:
+- Fixed inconsistent behavior in execution of nested autocommands:
+  https://github.com/neovim/neovim/issues/23368
+
 ==============================================================================
 Missing features					 *nvim-missing*
 
-- 
cgit 


From 48085e40bb0e4435ddb2eb7f14b4531b943e0c89 Mon Sep 17 00:00:00 2001
From: Micah Halter <micah@mehalter.com>
Date: Mon, 24 Jul 2023 10:26:38 -0400
Subject: fix(treesitter): stop() should treat 0 as current buffer #24450

---
 runtime/lua/vim/treesitter.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 8bd85d3734..04420c81e3 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -462,7 +462,7 @@ end
 ---
 ---@param bufnr (integer|nil) Buffer to stop highlighting (default: current buffer)
 function M.stop(bufnr)
-  bufnr = bufnr or api.nvim_get_current_buf()
+  bufnr = (bufnr and bufnr ~= 0) and bufnr or api.nvim_get_current_buf()
 
   if M.highlighter.active[bufnr] then
     M.highlighter.active[bufnr]:destroy()
-- 
cgit 


From 6a486c44e66f05ae11137ad7a192b89989192566 Mon Sep 17 00:00:00 2001
From: marshmallow <marshycity@gmail.com>
Date: Tue, 25 Jul 2023 01:35:19 +1000
Subject: fix(gx): move to to _init_default_mappings #24420

Problem:
netrw may conflict with the Nvim default "gx" mapping.

Solution:
Initialize keymapping earlier by moving it to vim._init_default_mappings().
That also avoids needing to check maparg().
---
 runtime/lua/vim/_editor.lua | 27 +++++++++++++++++++++++++++
 runtime/plugin/nvim.lua     | 28 ----------------------------
 2 files changed, 27 insertions(+), 28 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 4372aef7b3..87f6d6581c 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -1048,6 +1048,33 @@ function vim._init_default_mappings()
   -- Use : instead of <Cmd> so that ranges are supported. #19365
   map('n', '&', ':&&<CR>')
 
+  -- gx
+
+  -- TODO: use vim.region() when it lands... #13896 #16843
+  local function get_visual_selection()
+    local save_a = vim.fn.getreginfo('a')
+    vim.cmd([[norm! "ay]])
+    local selection = vim.fn.getreg('a', 1)
+    vim.fn.setreg('a', save_a)
+    return selection
+  end
+
+  local function do_open(uri)
+    local _, err = vim.ui.open(uri)
+    if err then
+      vim.notify(err, vim.log.levels.ERROR)
+    end
+  end
+
+  local gx_desc =
+    'Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)'
+  vim.keymap.set({ 'n' }, 'gx', function()
+    do_open(vim.fn.expand('<cfile>'))
+  end, { desc = gx_desc })
+  vim.keymap.set({ 'x' }, 'gx', function()
+    do_open(get_visual_selection())
+  end, { desc = gx_desc })
+
   -- menus
 
   -- TODO VimScript, no l10n
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index e3d4625c3b..0a33826b82 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -18,31 +18,3 @@ vim.api.nvim_create_user_command('InspectTree', function(cmd)
     vim.treesitter.inspect_tree()
   end
 end, { desc = 'Inspect treesitter language tree for buffer', count = true })
-
--- TODO: use vim.region() when it lands... #13896 #16843
-local function get_visual_selection()
-  local save_a = vim.fn.getreginfo('a')
-  vim.cmd([[norm! "ay]])
-  local selection = vim.fn.getreg('a', 1)
-  vim.fn.setreg('a', save_a)
-  return selection
-end
-
-local gx_desc =
-  'Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)'
-local function do_open(uri)
-  local _, err = vim.ui.open(uri)
-  if err then
-    vim.notify(err, vim.log.levels.ERROR)
-  end
-end
-if vim.fn.maparg('gx', 'n') == '' then
-  vim.keymap.set({ 'n' }, 'gx', function()
-    do_open(vim.fn.expand('<cfile>'))
-  end, { desc = gx_desc })
-end
-if vim.fn.maparg('gx', 'x') == '' then
-  vim.keymap.set({ 'x' }, 'gx', function()
-    do_open(get_visual_selection())
-  end, { desc = gx_desc })
-end
-- 
cgit 


From add7e106d59b8e3822310846a850b3ed3fb5db0e Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley@gmail.com>
Date: Mon, 24 Jul 2023 08:58:59 -0700
Subject: fix(lsp): noisy warning about offset_encodings #24441

In the case you hit this warning in a buffer (like with C++ and clangd),
this message potentially fires over and over again making it difficult
to use the editor at all.
---
 runtime/lua/vim/lsp/util.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 0b06d2bbb5..4ff420cf48 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -2026,7 +2026,7 @@ function M._get_offset_encoding(bufnr)
     if not offset_encoding then
       offset_encoding = this_offset_encoding
     elseif offset_encoding ~= this_offset_encoding then
-      vim.notify(
+      vim.notify_once(
         'warning: multiple different client offset_encodings detected for buffer, this is not supported yet',
         vim.log.levels.WARN
       )
-- 
cgit 


From a37d568082ad2a6fd479bc0584f1088b51019b7f Mon Sep 17 00:00:00 2001
From: Mitchell Hanberg <mitch@mitchellhanberg.com>
Date: Mon, 24 Jul 2023 12:09:53 -0400
Subject: fix(lsp): send empty "added" list when removing workspace folder
 #24440

When adding `workspace/didChangeWorkspaceFolders` support to my [language server](https://github.com/elixir-tools/next-ls), I noticed that when neovim removes a workspace, it sends an empty table (which is serialized to an empty JSON array) for the value in the `added` field.

This does not follow the spec; the `added` table should just be empty.

The following error led me to this discovery. Note the payload includes `"added" => [[]]`:

```
22:46:48.476 [error] LSP Exited.

Last message received: handle_notification %{"jsonrpc" => "2.0", "method" => "workspace/didChangeWorkspaceFolders", "params" => %{"event" => %{"added" => [[]], "removed" => [%{"name" => "/Users/mitchell/src/gen_lsp", "uri" => "file:///Users/mitchell/src/gen_lsp"}]}}}

** (MatchError) no match of right hand side value: {:error, %{"params" => %{"event" => %{"added" => [error: "expected a map"]}}}}
    (gen_lsp 0.4.0) lib/gen_lsp.ex:265: anonymous fn/4 in GenLSP.loop/3
    (gen_lsp 0.4.0) lib/gen_lsp.ex:292: GenLSP.attempt/3
    (stdlib 5.0.2) proc_lib.erl:241: :proc_lib.init_p_do_apply/3
```
---
 runtime/lua/vim/lsp/buf.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 46f582dc7e..02d8d0fa7b 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -514,7 +514,7 @@ function M.remove_workspace_folder(workspace_folder)
     return
   end
   local params = util.make_workspace_params(
-    { {} },
+    {},
     { { uri = vim.uri_from_fname(workspace_folder), name = workspace_folder } }
   )
   for _, client in pairs(vim.lsp.get_clients({ bufnr = 0 })) do
-- 
cgit 


From 966eb8e0b3be1b409e491d5cf1e32e82e806a134 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Mon, 24 Jul 2023 19:26:17 +0200
Subject: fix(lsp): announce publishDiagnostics.dataSupport (#24442)

Neovim already passed `data` element from published diagnostic to code action, but failed to announce it in client capabilities.

Here is the test that shows that `data` element is returned by `vim.lsp.diagnostic.get_line_diagnostics()`:

https://github.com/neovim/neovim/blob/f56c1848091bb64c63b5bc25ec74bcbd2f52bdde/test/functional/plugin/lsp/diagnostic_spec.lua#L103-L115

and then `get_line_diagnostics()` is used to construct the context for code action request:

https://github.com/neovim/neovim/blob/f56c1848091bb64c63b5bc25ec74bcbd2f52bdde/runtime/lua/vim/lsp/buf.lua#L742
---
 runtime/lua/vim/lsp/protocol.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 537a5eda39..31cc071d18 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -828,6 +828,7 @@ function protocol.make_client_capabilities()
             return res
           end)(),
         },
+        dataSupport = true,
       },
       callHierarchy = {
         dynamicRegistration = false,
-- 
cgit 


From 7668f89d5be6d463bf6ab0c2d3a0393e3ec26e7f Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Mon, 24 Jul 2023 20:21:35 +0200
Subject: fix(lsp): replace @private with @nodoc for public client functions
 (#24415)

* fix(lsp): replace @private with @nodoc for public client functions

To prevent lua-ls warnings in plugins which use the functions.

* fix(lsp): remove duplicate type annotations/class definitions

These annotations became duplicate with https://github.com/neovim/neovim/pull/23750
---
 runtime/lua/vim/lsp.lua       | 10 +++---
 runtime/lua/vim/lsp/types.lua | 79 ++-----------------------------------------
 2 files changed, 7 insertions(+), 82 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 78b5f53723..1a1dc684ba 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1455,7 +1455,7 @@ function lsp.start_client(config)
     end)
   end
 
-  ---@private
+  ---@nodoc
   --- Sends a request to the server.
   ---
   --- This is a thin wrapper around {client.rpc.request} with some additional
@@ -1559,7 +1559,7 @@ function lsp.start_client(config)
     return request_result
   end
 
-  ---@private
+  ---@nodoc
   --- Sends a notification to an LSP server.
   ---
   ---@param method string LSP method name.
@@ -1590,7 +1590,7 @@ function lsp.start_client(config)
     return client_active
   end
 
-  ---@private
+  ---@nodoc
   --- Cancels a request with a given request id.
   ---
   ---@param id (integer) id of request to cancel
@@ -1613,7 +1613,8 @@ function lsp.start_client(config)
   -- Track this so that we can escalate automatically if we've already tried a
   -- graceful shutdown
   local graceful_shutdown_failed = false
-  ---@private
+
+  ---@nodoc
   --- Stops a client, optionally with force.
   ---
   ---By default, it will just ask the - server to shutdown without force. If
@@ -2311,7 +2312,6 @@ function lsp.omnifunc(findstart, base)
 
   local startbyte
 
-  ---@private
   local function on_done()
     local mode = api.nvim_get_mode()['mode']
     if mode == 'i' or mode == 'ic' then
diff --git a/runtime/lua/vim/lsp/types.lua b/runtime/lua/vim/lsp/types.lua
index cdfbcfb11b..98e948c945 100644
--- a/runtime/lua/vim/lsp/types.lua
+++ b/runtime/lua/vim/lsp/types.lua
@@ -5,92 +5,17 @@
 ---@class lsp.HandlerContext
 ---@field method string
 ---@field client_id integer
----@field bufnr integer
----@field params any
+---@field bufnr? integer
+---@field params? any
 
 ---@class lsp.ResponseError
 ---@field code integer
 ---@field message string
 ---@field data string|number|boolean|table[]|table|nil
 
----@class lsp.ShowMessageRequestParams
----@field type lsp.MessageType
----@field message string
----@field actions nil|lsp.MessageActionItem[]
-
----@class lsp.MessageActionItem
----@field title string
-
----@class lsp.FileEvent
----@field uri string
----@field type lsp.FileChangeType
-
----@class lsp.Position
----@field line integer
----@field character integer
-
----@class lsp.Range
----@field start lsp.Position
----@field end lsp.Position
-
----@class lsp.Diagnostic
----@field range lsp.Range
----@field message string
----@field severity? lsp.DiagnosticSeverity
----@field code integer | string
----@field source string
----@field tags? lsp.DiagnosticTag[]
----@field relatedInformation DiagnosticRelatedInformation[]
-
 --- @class lsp.DocumentFilter
 --- @field language? string
 --- @field scheme? string
 --- @field pattern? string
 
---- @alias lsp.DocumentSelector lsp.DocumentFilter[]
-
 --- @alias lsp.RegisterOptions any | lsp.StaticRegistrationOptions | lsp.TextDocumentRegistrationOptions
-
---- @class lsp.Registration
---- @field id string
---- @field method string
---- @field registerOptions? lsp.RegisterOptions
-
---- @alias lsp.RegistrationParams {registrations: lsp.Registration[]}
-
---- @class lsp.StaticRegistrationOptions
---- @field id? string
-
---- @class lsp.TextDocumentRegistrationOptions
---- @field documentSelector? lsp.DocumentSelector
-
---- @class lsp.Unregistration
---- @field id string
---- @field method string
-
---- @alias lsp.UnregistrationParams {unregisterations: lsp.Unregistration[]}
-
----@class lsp.Location
----@field uri string
----@field range lsp.Range
-
----@class lsp.MarkupContent
----@field kind string
----@field value string
-
----@class lsp.InlayHintLabelPart
----@field value string
----@field tooltip? string | lsp.MarkupContent
----@field location? lsp.Location
-
----@class lsp.TextEdit
----@field range lsp.Range
----@field newText string
-
----@class lsp.InlayHint
----@field position lsp.Position
----@field label string | lsp.InlayHintLabelPart[]
----@field kind? integer
----@field textEdits? lsp.TextEdit[]
----@field paddingLeft? boolean
----@field paddingRight? boolean
-- 
cgit 


From 4d0f4c3de9cbdcf85e606b5aaf9488820b95b679 Mon Sep 17 00:00:00 2001
From: Raphael <glepnir@neovim.pro>
Date: Tue, 25 Jul 2023 19:38:48 +0800
Subject: fix(lsp): E403 if doc contains multiple codeblocks #24458

Problem:
Content that has codeblocks with different languages, results in
multiple calls to:
    syntax include vim syntax/vim.vim
which raises error:
    E403: syntax sync: line continuations pattern specified twice
Before ba8f19ebb67ca27d746f4b1cd902ab3d807eace3, this was avoided by
using pcall() to ignore the error.

Solution:
Restore the use of pcall() to ignore the error.
We plan to replace this logic with a treesitter approach, so this is
good enough for now.

Fix #24431
---
 runtime/lua/vim/lsp/util.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 4ff420cf48..4d3071fd68 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1466,7 +1466,7 @@ function M.stylize_markdown(bufnr, contents, opts)
       if #api.nvim_get_runtime_file(('syntax/%s.vim'):format(ft), true) == 0 then
         return
       end
-      vim.cmd(string.format('syntax include %s syntax/%s.vim', lang, ft))
+      pcall(vim.cmd, string.format('syntax include %s syntax/%s.vim', lang, ft))
       langs[lang] = true
     end
     vim.cmd(
-- 
cgit 


From aaa151d506dffa01506619fbdf57537cd2318675 Mon Sep 17 00:00:00 2001
From: ii14 <59243201+ii14@users.noreply.github.com>
Date: Tue, 25 Jul 2023 14:07:13 +0200
Subject: docs: remove trailing spaces #24455

---
 runtime/doc/arabic.txt    |   2 +-
 runtime/doc/autocmd.txt   |   4 +-
 runtime/doc/channel.txt   |   2 +-
 runtime/doc/cmdline.txt   |   2 +-
 runtime/doc/filetype.txt  |  78 ++++++++++++++++-----------------
 runtime/doc/if_pyth.txt   |   2 +-
 runtime/doc/lua-guide.txt |   4 +-
 runtime/doc/motion.txt    |   6 +--
 runtime/doc/options.txt   | 108 +++++++++++++++++++++++-----------------------
 runtime/doc/starting.txt  |   2 +-
 runtime/doc/syntax.txt    |   4 +-
 runtime/doc/tagsrch.txt   |   2 +-
 runtime/doc/ui.txt        |   4 +-
 runtime/doc/undo.txt      |   2 +-
 runtime/doc/usr_21.txt    |  10 ++---
 runtime/doc/usr_41.txt    |   8 ++--
 runtime/doc/usr_43.txt    |   4 +-
 runtime/doc/vim_diff.txt  |  16 +++----
 18 files changed, 130 insertions(+), 130 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt
index 0a80edb981..f9d7ee1a8a 100644
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
@@ -231,7 +231,7 @@ o  Enable Arabic settings [short-cut]
       - While in Left-to-right mode, enter ':set rl' in the command line
 	('rl' is the abbreviation for rightleft).
 
-      - Put the ':set rl' line in your vimrc file to start Vim in 
+      - Put the ':set rl' line in your vimrc file to start Vim in
         right-to-left mode permanently.
 
    +  Arabic right-to-left command-line Mode
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index ffa7d6282a..a7c28e25d0 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -293,7 +293,7 @@ BufReadPre			When starting to edit a new buffer, before
 				reading the file into the buffer.  Not used
 				if the file doesn't exist.
 							*BufUnload*
-BufUnload			Before unloading a buffer, when the text in 
+BufUnload			Before unloading a buffer, when the text in
 				the buffer is going to be freed.
 				After BufWritePost.
 				Before BufDelete.
@@ -590,7 +590,7 @@ FileChangedShell		When Vim notices that the modification time of
 				Triggered for each changed file, after:
 				- executing a shell command
 				- |:checktime|
-				- |FocusGained| 
+				- |FocusGained|
 
 				Not used when 'autoread' is set and the buffer
 				was not changed.  If a FileChangedShell
diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt
index afc4ef3787..e517d0d9cd 100644
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -82,7 +82,7 @@ only bytes can be written to Nvim's own stderr.
     thus the first and last items in the {data} list may be partial lines.
     Empty string completes the previous partial line. Examples (not including
     the final `['']` emitted at EOF):
-      - `foobar` may arrive as `['fo'], ['obar']` 
+      - `foobar` may arrive as `['fo'], ['obar']`
       - `foo\nbar` may arrive as
 	- `['foo','bar']`
 	- or `['foo',''], ['bar']`
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 0213888537..5ee1a2af13 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -981,7 +981,7 @@ These modifiers can be given, in this order:
 		precede any :r or :e.
 	:r	Root of the file name (the last extension removed).  When
 		there is only an extension (file name that starts with '.',
-		e.g., ".nvimrc"), it is not removed.  Can be repeated to 
+		e.g., ".nvimrc"), it is not removed.  Can be repeated to
 		remove several extensions (last one first).
 	:e	Extension of the file name.  Only makes sense when used alone.
 		When there is no extension the result is empty.
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index bd74f45091..1dad3cd433 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -725,7 +725,7 @@ file: |pi_spec.txt|.
 
 SHADA							*ft-shada*
 
-Allows editing binary |shada-file|s in a nice way.  Opened binary files are 
+Allows editing binary |shada-file|s in a nice way.  Opened binary files are
 displayed in the following format: >
 
     Type with timestamp YYYY-mm-ddTHH:MM:SS:
@@ -740,31 +740,31 @@ displayed in the following format: >
       # Unexpected type: type instead of map
       = {msgpack-value}
 
-Filetype plugin defines all |Cmd-event|s.  Defined |SourceCmd| event makes 
-"source file.shada" be equivalent to "|:rshada| file.shada".  |BufWriteCmd|, 
-|FileWriteCmd| and |FileAppendCmd| events are affected by the following 
+Filetype plugin defines all |Cmd-event|s.  Defined |SourceCmd| event makes
+"source file.shada" be equivalent to "|:rshada| file.shada".  |BufWriteCmd|,
+|FileWriteCmd| and |FileAppendCmd| events are affected by the following
 settings:
 
-*g:shada#keep_old_header*	Boolean, if set to false all header entries 
+*g:shada#keep_old_header*	Boolean, if set to false all header entries
 				are ignored when writing.  Defaults to 1.
-*g:shada#add_own_header*	Boolean, if set to true first written entry 
-				will always be header entry with two values in 
-				a map with attached data: |v:version| attached 
-				to "version" key and "shada.vim" attached to 
+*g:shada#add_own_header*	Boolean, if set to true first written entry
+				will always be header entry with two values in
+				a map with attached data: |v:version| attached
+				to "version" key and "shada.vim" attached to
 				"generator" key.  Defaults to 1.
 
 Format description:
 
-1. `#` starts a comment.  Lines starting with space characters and then `#` 
-   are ignored.  Plugin may only add comment lines to indicate some errors in 
-   ShaDa format.  Lines containing no non-whitespace characters are also 
+1. `#` starts a comment.  Lines starting with space characters and then `#`
+   are ignored.  Plugin may only add comment lines to indicate some errors in
+   ShaDa format.  Lines containing no non-whitespace characters are also
    ignored.
-2. Each entry starts with line that has format "{type} with timestamp 
-   {timestamp}:". {timestamp} is |strftime()|-formatted string representing 
+2. Each entry starts with line that has format "{type} with timestamp
+   {timestamp}:". {timestamp} is |strftime()|-formatted string representing
    actual Unix timestamp value. First strftime() argument is equal to
-   `%Y-%m-%dT%H:%M:%S`.  When writing this timestamp is parsed using 
-   |msgpack#strptime()|, with caching (it remembers which timestamp produced 
-   particular strftime() output and uses this value if you did not change 
+   `%Y-%m-%dT%H:%M:%S`.  When writing this timestamp is parsed using
+   |msgpack#strptime()|, with caching (it remembers which timestamp produced
+   particular strftime() output and uses this value if you did not change
    timestamp). {type} is one of
     1 - Header
     2 - Search pattern
@@ -779,28 +779,28 @@ Format description:
    11 - Change
     * - Unknown (0x{type-hex})
 
-   Each type may be represented using Unknown entry: "Jump with timestamp ..." 
+   Each type may be represented using Unknown entry: "Jump with timestamp ..."
    is the same as "Unknown (0x8) with timestamp ....".
 3. After header there is one of the following lines:
-   1. "  % Key__  Description__  Value": map header.  After mapping header 
-      follows a table which may contain comments and lines consisting of 
-      "  +", key, description and |{msgpack-value}|.  Key is separated by at 
-      least two spaces with description, description is separated by at least 
-      two spaces with the value.  Each key in the map must be at most as wide 
-      as "Key__" header: "Key" allows at most 3-byte keys, "Key__" allows at 
-      most 5-byte keys.  If keys actually occupy less bytes then the rest is 
-      filled with spaces.  Keys cannot be empty, end with spaces, contain two 
-      consequent spaces inside of them or contain multibyte characters (use 
-      "=" format if you need this).  Descriptions have the same restrictions 
-      on width and contents, except that empty descriptions are allowed.  
+   1. "  % Key__  Description__  Value": map header.  After mapping header
+      follows a table which may contain comments and lines consisting of
+      "  +", key, description and |{msgpack-value}|.  Key is separated by at
+      least two spaces with description, description is separated by at least
+      two spaces with the value.  Each key in the map must be at most as wide
+      as "Key__" header: "Key" allows at most 3-byte keys, "Key__" allows at
+      most 5-byte keys.  If keys actually occupy less bytes then the rest is
+      filled with spaces.  Keys cannot be empty, end with spaces, contain two
+      consequent spaces inside of them or contain multibyte characters (use
+      "=" format if you need this).  Descriptions have the same restrictions
+      on width and contents, except that empty descriptions are allowed.
       Description column may be omitted.
 
-      When writing description is ignored.  Keys with values |msgpack#equal| 
-      to default ones are ignored.  Order of keys is preserved.  All keys are 
+      When writing description is ignored.  Keys with values |msgpack#equal|
+      to default ones are ignored.  Order of keys is preserved.  All keys are
       treated as strings (not binary strings).
 
-      Note: specifically for buffer list entries it is allowed to have more 
-      then one map header.  Each map header starts a new map entry inside 
+      Note: specifically for buffer list entries it is allowed to have more
+      then one map header.  Each map header starts a new map entry inside
       buffer list because ShaDa buffer list entry is an array of maps.  I.e. >
 
         Buffer list with timestamp 1970-01-01T00:00:00:
@@ -828,7 +828,7 @@ Format description:
         Buffer list with timestamp 1970-01-01T00:00:00:
           = [{="f": "/foo"}, {="f": "/bar"}]
 <
-      Note 2: specifically for register entries special syntax for arrays was 
+      Note 2: specifically for register entries special syntax for arrays was
       designed: >
 
         Register with timestamp 1970-01-01T00:00:00:
@@ -843,10 +843,10 @@ Format description:
           % Key  Description  Value
           + rc   contents     ["line1", "line2"]
 <
-      Such syntax is automatically used if array representation appears to be 
+      Such syntax is automatically used if array representation appears to be
       too lengthy.
-   2. "  @  Description__  Value": array header.  Same as map, but key is 
-      omitted and description cannot be omitted.  Array entries start with 
+   2. "  @  Description__  Value": array header.  Same as map, but key is
+      omitted and description cannot be omitted.  Array entries start with
       "  -". Example: >
 
         History entry with timestamp 1970-01-01T00:00:00:
@@ -861,8 +861,8 @@ Format description:
           = [SEARCH, "foo", '/']
 <
       Note: special array syntax for register entries is not recognized here.
-   3. "  = {msgpack-value}": raw values.  |{msgpack-value}| in this case may 
-      have absolutely any type.  Special array syntax for register entries is 
+   3. "  = {msgpack-value}": raw values.  |{msgpack-value}| in this case may
+      have absolutely any type.  Special array syntax for register entries is
       not recognized here as well.
 
 
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index c7f431481f..0836ec54d8 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -635,7 +635,7 @@ To see what version of Python is being used: >vim
 	:pyx print(sys.version)
 <
 					*:pyxfile* *python_x-special-comments*
-`:pyxfile` works the same as `:py3file`. 
+`:pyxfile` works the same as `:py3file`.
 
 							*:pyxdo*
 `:pyxdo` works the same as `:py3do`.
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 28c9ace23b..61c3925a07 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -386,9 +386,9 @@ window is used:
 >lua
     vim.bo[4].expandtab = true -- sets expandtab to true in buffer 4
     vim.wo.number = true       -- sets number to true in current window
-    vim.wo[0].number = true    -- same as above 
+    vim.wo[0].number = true    -- same as above
     vim.wo[0][0].number = true -- sets number to true in current buffer
-                               -- in current window only 
+                               -- in current window only
     print(vim.wo[0].number)    --> true
 <
 ------------------------------------------------------------------------------
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 9ce22c9b78..9e5913a900 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -892,7 +892,7 @@ was made yet in the current file.
 			for each opened file.
 			Only one position is remembered per buffer, not one
 			for each window.  As long as the buffer is visible in
-			a window the position won't be changed.  Mark is also 
+			a window the position won't be changed.  Mark is also
 			reset when |:wshada| is run.
 
 							*'^* *`^*
@@ -1149,7 +1149,7 @@ locations being removed:
    3  1260    8 src/nvim/mark.c
    2   685    0 src/nvim/option_defs.h
    1   462   36 src/nvim/option_defs.h  <-- location X
-> 
+>
 
 Then, when yet another location Z is jumped to, the new location Y appears
 directly after location X in the jumplist and location X remains in the same
@@ -1161,7 +1161,7 @@ prior to the original jump from X to Y:
    3   685    0 src/nvim/option_defs.h  <-- location X-1
    2   462   36 src/nvim/option_defs.h  <-- location X
    1   100    0 src/nvim/option_defs.h  <-- location Y
-> 
+>
 
 CHANGE LIST JUMPS			*changelist* *change-list-jumps* *E664*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4b9797408c..ee5e1f5589 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2046,7 +2046,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	Possible items:
 	- The swap file will be created in the first directory where this is
-	  possible.  If it is not possible in any directory, but last 
+	  possible.  If it is not possible in any directory, but last
 	  directory listed in the option does not exist, it is created.
 	- Empty means that no swap file will be used (recovery is
 	  impossible!) and no |E303| error will be given.
@@ -4830,7 +4830,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Defaults are setup to search these locations:
 	1. Your home directory, for personal preferences.
 	   Given by `stdpath("config")`.  |$XDG_CONFIG_HOME|
-	2. Directories which must contain configuration files according to 
+	2. Directories which must contain configuration files according to
 	   |xdg| ($XDG_CONFIG_DIRS, defaults to /etc/xdg).  This also contains
 	   preferences from system administrator.
 	3. Data home directory, for plugins installed by user.
@@ -5070,8 +5070,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	%	When included, save and restore the buffer list.  If Vim is
 		started with a file name argument, the buffer list is not
 		restored.  If Vim is started without a file name argument, the
-		buffer list is restored from the shada file.  Quickfix 
-		('buftype'), unlisted ('buflisted'), unnamed and buffers on 
+		buffer list is restored from the shada file.  Quickfix
+		('buftype'), unlisted ('buflisted'), unnamed and buffers on
 		removable media (|shada-r|) are not saved.
 		When followed by a number, the number specifies the maximum
 		number of buffers that are stored.  Without a number all
@@ -5099,8 +5099,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	@	Maximum number of items in the input-line history to be
 		saved.  When not included, the value of 'history' is used.
 							*shada-c*
-	c	Dummy option, kept for compatibility reasons.  Has no actual 
-		effect: ShaDa always uses UTF-8 and 'encoding' value is fixed 
+	c	Dummy option, kept for compatibility reasons.  Has no actual
+		effect: ShaDa always uses UTF-8 and 'encoding' value is fixed
 		to UTF-8 as well.
 							*shada-f*
 	f	Whether file marks need to be stored.  If zero, file marks ('0
@@ -5125,13 +5125,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 		could use "ra:,rb:".  You can also use it for temp files,
 		e.g., for Unix: "r/tmp".  Case is ignored.
 							*shada-s*
-	s	Maximum size of an item contents in KiB.  If zero then nothing 
-		is saved.  Unlike Vim this applies to all items, except for 
-		the buffer list and header.  Full item size is off by three 
-		unsigned integers: with `s10` maximum item size may be 1 byte 
-		(type: 7-bit integer) + 9 bytes (timestamp: up to 64-bit 
-		integer) + 3 bytes (item size: up to 16-bit integer because 
-		2^8 < 10240 < 2^16) + 10240 bytes (requested maximum item 
+	s	Maximum size of an item contents in KiB.  If zero then nothing
+		is saved.  Unlike Vim this applies to all items, except for
+		the buffer list and header.  Full item size is off by three
+		unsigned integers: with `s10` maximum item size may be 1 byte
+		(type: 7-bit integer) + 9 bytes (timestamp: up to 64-bit
+		integer) + 3 bytes (item size: up to 16-bit integer because
+		2^8 < 10240 < 2^16) + 10240 bytes (requested maximum item
 		contents size) = 10253 bytes.
 
 	Example: >
@@ -5141,7 +5141,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			edited.
 	<1000		Contents of registers (up to 1000 lines each) will be
 			remembered.
-	s100		Items with contents occupying more then 100 KiB are 
+	s100		Items with contents occupying more then 100 KiB are
 			skipped.
 	:0		Command-line history will not be saved.
 	n~/nvim/shada	The name of the file to use is "~/nvim/shada".
@@ -5180,30 +5180,30 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If the name of the shell contains a space, you need to enclose it in
 	quotes.  Example with quotes: >
 		:set shell=\"c:\program\ files\unix\sh.exe\"\ -f
-<	Note the backslash before each quote (to avoid starting a comment) and 
-	each space (to avoid ending the option value), so better use |:let-&| 
+<	Note the backslash before each quote (to avoid starting a comment) and
+	each space (to avoid ending the option value), so better use |:let-&|
 	like this: >
 		:let &shell='"C:\Program Files\unix\sh.exe" -f'
-<	Also note that the "-f" is not inside the quotes, because it is not 
+<	Also note that the "-f" is not inside the quotes, because it is not
 	part of the command name.
 							*shell-unquoting*
 	Rules regarding quotes:
-	1. Option is split on space and tab characters that are not inside 
-	   quotes: "abc def" runs shell named "abc" with additional argument 
-	   "def", '"abc def"' runs shell named "abc def" with no additional 
-	   arguments (here and below: additional means “additional to 
+	1. Option is split on space and tab characters that are not inside
+	   quotes: "abc def" runs shell named "abc" with additional argument
+	   "def", '"abc def"' runs shell named "abc def" with no additional
+	   arguments (here and below: additional means “additional to
 	   'shellcmdflag'”).
-	2. Quotes in option may be present in any position and any number: 
-	   '"abc"', '"a"bc', 'a"b"c', 'ab"c"' and '"a"b"c"' are all equivalent 
+	2. Quotes in option may be present in any position and any number:
+	   '"abc"', '"a"bc', 'a"b"c', 'ab"c"' and '"a"b"c"' are all equivalent
 	   to just "abc".
-	3. Inside quotes backslash preceding backslash means one backslash.  
-	   Backslash preceding quote means one quote. Backslash preceding 
-	   anything else means backslash and next character literally: 
-	   '"a\\b"' is the same as "a\b", '"a\\"b"' runs shell named literally 
+	3. Inside quotes backslash preceding backslash means one backslash.
+	   Backslash preceding quote means one quote. Backslash preceding
+	   anything else means backslash and next character literally:
+	   '"a\\b"' is the same as "a\b", '"a\\"b"' runs shell named literally
 	   'a"b', '"a\b"' is the same as "a\b" again.
-	4. Outside of quotes backslash always means itself, it cannot be used 
+	4. Outside of quotes backslash always means itself, it cannot be used
 	   to escape quote: 'a\"b"' is the same as "a\b".
-	Note that such processing is done after |:set| did its own round of 
+	Note that such processing is done after |:set| did its own round of
 	unescaping, so to keep yourself sane use |:let-&| like shown above.
 							*shell-powershell*
 	To use PowerShell: >
@@ -5226,7 +5226,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	On Unix it can have more than one flag.  Each white space separated
 	part is passed as an argument to the shell command.
 	See |option-backslash| about including spaces and backslashes.
-	See |shell-unquoting| which talks about separating this option into 
+	See |shell-unquoting| which talks about separating this option into
 	multiple arguments.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
@@ -6032,36 +6032,36 @@ A jump table for the options with a short description can be found at |Q_op|.
 	( -   Start of item group.  Can be used for setting the width and
 	      alignment of a section.  Must be followed by %) somewhere.
 	) -   End of item group.  No width fields allowed.
-	T N   For 'tabline': start of tab page N label.  Use %T or %X to end 
-	      the label.  Clicking this label with left mouse button switches 
+	T N   For 'tabline': start of tab page N label.  Use %T or %X to end
+	      the label.  Clicking this label with left mouse button switches
 	      to the specified tab page.
-	X N   For 'tabline': start of close tab N label.  Use %X or %T to end 
-	      the label, e.g.: %3Xclose%X.  Use %999X for a "close current 
-	      tab" label.    Clicking this label with left mouse button closes 
+	X N   For 'tabline': start of close tab N label.  Use %X or %T to end
+	      the label, e.g.: %3Xclose%X.  Use %999X for a "close current
+	      tab" label.    Clicking this label with left mouse button closes
 	      specified tab page.
-	@ N   Start of execute function label. Use %X or %T to 
-	      end the label, e.g.: %10@SwitchBuffer@foo.c%X.  Clicking this 
-	      label runs specified function: in the example when clicking once 
-	      using left mouse button on "foo.c" "SwitchBuffer(10, 1, 'l', 
-	      '    ')" expression will be run.  Function receives the 
+	@ N   Start of execute function label. Use %X or %T to
+	      end the label, e.g.: %10@SwitchBuffer@foo.c%X.  Clicking this
+	      label runs specified function: in the example when clicking once
+	      using left mouse button on "foo.c" "SwitchBuffer(10, 1, 'l',
+	      '    ')" expression will be run.  Function receives the
 	      following arguments in order:
 	      1. minwid field value or zero if no N was specified
 	      2. number of mouse clicks to detect multiple clicks
-	      3. mouse button used: "l", "r" or "m" for left, right or middle 
-	         button respectively; one should not rely on third argument 
-	         being only "l", "r" or "m": any other non-empty string value 
-	         that contains only ASCII lower case letters may be expected 
+	      3. mouse button used: "l", "r" or "m" for left, right or middle
+	         button respectively; one should not rely on third argument
+	         being only "l", "r" or "m": any other non-empty string value
+	         that contains only ASCII lower case letters may be expected
 	         for other mouse buttons
-	      4. modifiers pressed: string which contains "s" if shift 
-	         modifier was pressed, "c" for control, "a" for alt and "m" 
-	         for meta; currently if modifier is not pressed string 
-	         contains space instead, but one should not rely on presence 
-	         of spaces or specific order of modifiers: use |stridx()| to 
-	         test whether some modifier is present; string is guaranteed 
-	         to contain only ASCII letters and spaces, one letter per 
-	         modifier; "?" modifier may also be present, but its presence 
-	         is a bug that denotes that new mouse button recognition was 
-	         added without modifying code that reacts on mouse clicks on 
+	      4. modifiers pressed: string which contains "s" if shift
+	         modifier was pressed, "c" for control, "a" for alt and "m"
+	         for meta; currently if modifier is not pressed string
+	         contains space instead, but one should not rely on presence
+	         of spaces or specific order of modifiers: use |stridx()| to
+	         test whether some modifier is present; string is guaranteed
+	         to contain only ASCII letters and spaces, one letter per
+	         modifier; "?" modifier may also be present, but its presence
+	         is a bug that denotes that new mouse button recognition was
+	         added without modifying code that reacts on mouse clicks on
 	         this label.
 	      Use |getmousepos()|.winid in the specified function to get the
 	      corresponding window id of the clicked item.
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index b287b43e92..5f6e932693 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -224,7 +224,7 @@ argument.
 		All [args] are treated as {script} arguments and stored in the
 		Lua `_G.arg` global table, thus "-l" ends processing of Nvim
 		arguments. The {script} name is stored at `_G.arg[0]`.
-		
+
 		Sets 'verbose' to 1 (like "-V1"), so Lua `print()` writes to
 		output.
 		If {script} prints messages and doesn't cause Nvim to exit,
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 631e666b6a..703ccd2e01 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -3270,7 +3270,7 @@ This covers the shell named "tcsh".  It is a superset of csh.  See |csh.vim|
 for how the filetype is detected.
 
 Tcsh does not allow \" in strings unless the "backslash_quote" shell variable
-is set.  If you want VIM to assume that no backslash quote constructs exist 
+is set.  If you want VIM to assume that no backslash quote constructs exist
 add this line to your vimrc: >
 
 	:let tcsh_backslash_quote = 0
@@ -5067,7 +5067,7 @@ ctermbg={color-nr}				*ctermbg*
 	a number instead of a color name.
 
 	Note that for 16 color ansi style terminals (including xterms), the
-	numbers in the NR-8 column is used.  Here "*" means "add 8" so that 
+	numbers in the NR-8 column is used.  Here "*" means "add 8" so that
 	Blue is 12, DarkGray is 8 etc.
 
 	Note that for some color terminals these names may result in the wrong
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index cf8f307ca4..2b5b253a09 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -907,7 +907,7 @@ The following fields are optional:
 If the function returns |v:null| instead of a List, a standard tag lookup will
 be performed instead.
 
-It is not allowed to change the tagstack from inside 'tagfunc'.  *E986* 
+It is not allowed to change the tagstack from inside 'tagfunc'.  *E986*
 It is not allowed to close a window or change window from inside 'tagfunc'.
 *E1299*
 
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index ec1d43d878..8784a395f2 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -434,7 +434,7 @@ numerical highlight ids to the actual attributes.
 		+-------------------------+
 <
 	`cols` is always zero in this version of Nvim, and reserved for future
-	use. 
+	use.
 
 	Note when updating code from |ui-grid-old| events: ranges are
 	end-exclusive, which is consistent with API conventions, but different
@@ -652,7 +652,7 @@ tabs.
 
 ["win_extmark", grid, win, ns_id, mark_id, row, col] ~
 	Updates the position of an extmark which is currently visible in a
-	window. Only emitted if the mark has the `ui_watched` attribute. 
+	window. Only emitted if the mark has the `ui_watched` attribute.
 
 ==============================================================================
 Popupmenu Events						 *ui-popupmenu*
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 98ab60c7e7..36b2ff9e4e 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -255,7 +255,7 @@ ignored if its owner differs from the owner of the edited file, except when
 the owner of the undo file is the current user.  Set 'verbose' to get a
 message about that when opening a file.
 
-Location of the undo files is controlled by the 'undodir' option, by default 
+Location of the undo files is controlled by the 'undodir' option, by default
 they are saved to the dedicated directory in the application data folder.
 
 You can also save and restore undo histories by using ":wundo" and ":rundo"
diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt
index b084936857..4ae72bbe84 100644
--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -82,7 +82,7 @@ After editing for a while you will have text in registers, marks in various
 files, a command line history filled with carefully crafted commands.  When
 you exit Vim all of this is lost.  But you can get it back!
 
-The ShaDa (abbreviation of SHAred DAta) file is designed to store status 
+The ShaDa (abbreviation of SHAred DAta) file is designed to store status
 information:
 
 	Command-line and Search pattern history
@@ -218,8 +218,8 @@ Obviously, the "w" stands for "write" and the "r" for "read".
    The ! character is used by ":wshada" to forcefully overwrite an existing
 file.  When it is omitted, and the file exists, the information is merged into
 the file.
-   The ! character used for ":rshada" means that all the information in ShaDa 
-file has priority over existing information, this may overwrite it.  Without 
+   The ! character used for ":rshada" means that all the information in ShaDa
+file has priority over existing information, this may overwrite it.  Without
 the ! only information that wasn't set is used.
    These commands can also be used to store info and use it again later.  You
 could make a directory full of ShaDa files, each containing info for a
@@ -277,8 +277,8 @@ example, use: >
 SESSION HERE, SESSION THERE
 
 The obvious way to use sessions is when working on different projects.
-Suppose you store your session files in the directory "~/.config/nvim".  You 
-are currently working on the "secret" project and have to switch to the 
+Suppose you store your session files in the directory "~/.config/nvim".  You
+are currently working on the "secret" project and have to switch to the
 "boring" project: >
 
 	:wall
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 243e8579e0..261cdc91f7 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1782,7 +1782,7 @@ PITFALLS
 Even bigger problem arises in the following example: >
 
 	:map ,ab o#include
-	:unmap ,ab 
+	:unmap ,ab
 
 Here the unmap command will not work, because it tries to unmap ",ab ".  This
 does not exist as a mapped sequence.  An error will be issued, which is very
@@ -2244,7 +2244,7 @@ Example: >
 
 Write this single-line file as "ftdetect/foofoo.vim" in the first directory
 that appears in 'runtimepath'.  For Unix that would be
-"~/.config/nvim/ftdetect/foofoo.vim".  The convention is to use the name of 
+"~/.config/nvim/ftdetect/foofoo.vim".  The convention is to use the name of
 the filetype for the script name.
 
 You can make more complicated checks if you like, for example to inspect the
@@ -2315,7 +2315,7 @@ you can write the different setting in a script: >
 
 Now write this in the "after" directory, so that it gets sourced after the
 distributed "vim.vim" ftplugin |after-directory|.  For Unix this would be
-"~/.config/nvim/after/ftplugin/vim.vim".  Note that the default plugin will 
+"~/.config/nvim/after/ftplugin/vim.vim".  Note that the default plugin will
 have set "b:did_ftplugin", but it is ignored here.
 
 
@@ -2485,7 +2485,7 @@ a user to overrule or add to the default file.  The default files start with: >
 	:let current_compiler = "mine"
 
 When you write a compiler file and put it in your personal runtime directory
-(e.g., ~/.config/nvim/compiler for Unix), you set the "current_compiler" 
+(e.g., ~/.config/nvim/compiler for Unix), you set the "current_compiler"
 variable to make the default file skip the settings.
 							*:CompilerSet*
 The second mechanism is to use ":set" for ":compiler!" and ":setlocal" for
diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt
index 54eded5111..0de972b8cc 100644
--- a/runtime/doc/usr_43.txt
+++ b/runtime/doc/usr_43.txt
@@ -27,7 +27,7 @@ want to set the 'softtabstop' option to 4 and define a mapping to insert a
 three-line comment.  You do this with only two steps:
 
 							*your-runtime-dir*
-1. Create your own runtime directory.  On Unix this usually is 
+1. Create your own runtime directory.  On Unix this usually is
    "~/.config/nvim".  In this directory create the "ftplugin" directory: >
 
 	mkdir -p ~/.config/nvim/ftplugin
@@ -125,7 +125,7 @@ What will happen now is that Vim searches for "filetype.vim" files in each
 directory in 'runtimepath'.  First ~/.config/nvim/filetype.vim is found.  The
 autocommand to catch `*.txt` files is defined there.  Then Vim finds the
 filetype.vim file in $VIMRUNTIME, which is halfway 'runtimepath'.  Finally
-~/.config/nvim/after/filetype.vim is found and the autocommand for detecting 
+~/.config/nvim/after/filetype.vim is found and the autocommand for detecting
 ruby files in /usr/share/scripts is added.
    When you now edit /usr/share/scripts/README.txt, the autocommands are
 checked in the order in which they were defined.  The `*.txt` pattern matches,
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 6d9f8a13a9..1230769c1a 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -391,7 +391,7 @@ This section documents various low-level behavior changes.
 
 |mkdir()| behaviour changed:
 1. Assuming /tmp/foo does not exist and /tmp can be written to
-   mkdir('/tmp/foo/bar', 'p', 0700) will create both /tmp/foo and /tmp/foo/bar 
+   mkdir('/tmp/foo/bar', 'p', 0700) will create both /tmp/foo and /tmp/foo/bar
    with 0700 permissions. Vim mkdir will create /tmp/foo with 0755.
 2. If you try to create an existing directory with `'p'` (e.g. mkdir('/',
    'p')) mkdir() will silently exit. In Vim this was an error.
@@ -416,16 +416,16 @@ This section documents various low-level behavior changes.
    error out.
 5. Stringifyed infinite and NaN values now use |str2float()| and can be evaled
    back.
-6. (internal) Trying to print or stringify VAR_UNKNOWN in Vim results in 
+6. (internal) Trying to print or stringify VAR_UNKNOWN in Vim results in
    nothing, E908, in Nvim it is internal error.
 
 |json_decode()| behaviour changed:
 1. It may output |msgpack-special-dict|.
-2. |msgpack-special-dict| is emitted also in case of duplicate keys, while in 
+2. |msgpack-special-dict| is emitted also in case of duplicate keys, while in
    Vim it errors out.
 3. It accepts only valid JSON.  Trailing commas are not accepted.
 
-|json_encode()| behaviour slightly changed: now |msgpack-special-dict| values 
+|json_encode()| behaviour slightly changed: now |msgpack-special-dict| values
 are accepted, but |v:none| is not.
 
 Viminfo text files were replaced with binary (messagepack) |shada| files.
@@ -444,10 +444,10 @@ Additional differences:
   |shada-error-handling|
 - ShaDa file keeps search direction (|v:searchforward|), viminfo does not.
 
-|printf()| returns something meaningful when used with `%p` argument: in Vim 
-it used to return useless address of the string (strings are copied to the 
-newly allocated memory all over the place) and fail on types which cannot be 
-coerced to strings. See |id()| for more details, currently it uses 
+|printf()| returns something meaningful when used with `%p` argument: in Vim
+it used to return useless address of the string (strings are copied to the
+newly allocated memory all over the place) and fail on types which cannot be
+coerced to strings. See |id()| for more details, currently it uses
 `printf("%p", {expr})` internally.
 
 |c_CTRL-R| pasting a non-special register into |cmdline| omits the last <CR>.
-- 
cgit 


From 20c331915f4e317c615c7cfea469a9baedd2e4f7 Mon Sep 17 00:00:00 2001
From: Christoph Hasse <hassec@users.noreply.github.com>
Date: Tue, 25 Jul 2023 08:40:13 -0400
Subject: fix(lsp): SignatureHelp docstring is not escaped #16702

Problem:
Nvim LSP client always treats signature.documentation as markdown, even
if the server returns a plain string.
Per https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#signatureInformation
in a SignatureInformation response, the documentation field can be
either "string" or "MarkupContent".

Solution:
If signature.documentation is a string, treat it as "plaintext".

Closes #16563
---
 runtime/lua/vim/lsp/util.lua | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 4d3071fd68..738e23ff28 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1002,6 +1002,12 @@ function M.convert_signature_help_to_markdown_lines(signature_help, ft, triggers
   end
   list_extend(contents, split(label, '\n', { plain = true }))
   if signature.documentation then
+    -- if LSP returns plain string, we treat it as plaintext. This avoids
+    -- special characters like underscore or similar from being interpreted
+    -- as markdown font modifiers
+    if type(signature.documentation) == 'string' then
+      signature.documentation = { kind = 'plaintext', value = signature.documentation }
+    end
     M.convert_input_to_markdown_lines(signature.documentation, contents)
   end
   if signature.parameters and #signature.parameters > 0 then
-- 
cgit 


From aba3ceccb77518b93891af97fe93f5c8734eccf4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 25 Jul 2023 20:58:09 +0800
Subject: vim-patch:9.0.1335: no test for bad use of spaces in help files
 (#24483)

Problem:    No test for bad use of spaces in help files.
Solution:   Add checks for use of spaces in help files.  Ignore intentional
            spaces. (Hirohito Higashi, closes vim/vim#11952)

https://github.com/vim/vim/commit/d950984489e50b12d87c85f0cce1d672c880aa23

Cherry-pick changes from patch 9.0.1604.

Co-authored-by: h-east <h.east.727@gmail.com>
Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/digraph.txt    |  2 +-
 runtime/doc/news.txt       |  4 +-
 runtime/doc/pi_msgpack.txt | 94 +++++++++++++++++++++++-----------------------
 3 files changed, 50 insertions(+), 50 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index b024894c96..bd47f5ca2c 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -203,7 +203,7 @@ The rouble sign was added in 2014 as 0x20bd.  Vim supports the digraphs =R and
   ^]	GS	0x1d	 29	GROUP SEPARATOR (IS3)
   ^^	RS	0x1e	 30	RECORD SEPARATOR (IS2)
   ^_	US	0x1f	 31	UNIT SEPARATOR (IS1)
-  	SP	0x20	 32	SPACE
+	SP	0x20	 32	SPACE
   #	Nb	0x23	 35	NUMBER SIGN
   $	DO	0x24	 36	DOLLAR SIGN
   @	At	0x40	 64	COMMERCIAL AT
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 4e24bb6dac..e40fdda3f8 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -207,8 +207,8 @@ release.
 
 • vim.lsp functions:
   - |vim.lsp.util.get_progress_messages()|	Use |vim.lsp.status()| instead.
-  - |vim.lsp.get_active_clients()|	  	Use |vim.lsp.get_clients()| instead.
-  - |vim.lsp.for_each_buffer_client()|	  	Use |vim.lsp.get_clients()| instead.
+  - |vim.lsp.get_active_clients()|		Use |vim.lsp.get_clients()| instead.
+  - |vim.lsp.for_each_buffer_client()|		Use |vim.lsp.get_clients()| instead.
 
 • `vim.loop` has been renamed to `vim.uv`.
 
diff --git a/runtime/doc/pi_msgpack.txt b/runtime/doc/pi_msgpack.txt
index bcb7b9dc25..e900af97a8 100644
--- a/runtime/doc/pi_msgpack.txt
+++ b/runtime/doc/pi_msgpack.txt
@@ -3,13 +3,13 @@
 Author:  Nikolay Pavlov <kp-pav@yandex.ru>
 Copyright: (c) 2015 by Nikolay Pavlov
 
-The Apache license applies to the files in this package, including 
-runtime/autoload/msgpack.vim, runtime/doc/pi_msgpack.txt and 
-test/functional/plugin/msgpack_spec.lua.  Like anything else that's free, 
-msgpack.vim and its associated files are provided as is and comes with no 
-warranty of any kind, either expressed or implied.  No guarantees of 
-merchantability.  No guarantees of suitability for any purpose.  By using this 
-plugin, you agree that in no event will the copyright holder be liable for any 
+The Apache license applies to the files in this package, including
+runtime/autoload/msgpack.vim, runtime/doc/pi_msgpack.txt and
+test/functional/plugin/msgpack_spec.lua.  Like anything else that's free,
+msgpack.vim and its associated files are provided as is and comes with no
+warranty of any kind, either expressed or implied.  No guarantees of
+merchantability.  No guarantees of suitability for any purpose.  By using this
+plugin, you agree that in no event will the copyright holder be liable for any
 damages resulting from the use of this software. Use at your own risk!
 
 ==============================================================================
@@ -35,7 +35,7 @@ damages resulting from the use of this software. Use at your own risk!
 ==============================================================================
 2. Msgpack.vim introduction			*msgpack.vim-intro*
 
-This plugin contains utility functions to be used in conjunction with 
+This plugin contains utility functions to be used in conjunction with
 |msgpackdump()| and |msgpackparse()| functions.
 
 ==============================================================================
@@ -43,13 +43,13 @@ This plugin contains utility functions to be used in conjunction with
 
 FUNCTION ARGUMENTS				*msgpack.vim-arguments*
 
-Disambiguation of arguments described below.  Note: if e.g. function is listed 
-as accepting |{msgpack-integer}| (or anything else) it means that function 
+Disambiguation of arguments described below.  Note: if e.g. function is listed
+as accepting |{msgpack-integer}| (or anything else) it means that function
 does not check whether argument matches its description.
 
-*{msgpack-value}*	Either |msgpack-special-dict| or a regular value, but 
+*{msgpack-value}*	Either |msgpack-special-dict| or a regular value, but
 			not function reference.
-*{msgpack-integer}*	Any value for which |msgpack#type()| will return 
+*{msgpack-integer}*	Any value for which |msgpack#type()| will return
 			"integer".
 *{msgpack-special-int}*	|msgpack-special-dict| representing integer.
 
@@ -57,87 +57,87 @@ msgpack#is_int({msgpack-value})				*msgpack#is_int()*
 	Returns 1 if given {msgpack-value} is integer value, 0 otherwise.
 
 msgpack#is_uint({msgpack-value})			*msgpack#is_uint()*
-	Returns 1 if given {msgpack-value} is integer value greater or equal 
+	Returns 1 if given {msgpack-value} is integer value greater or equal
 	to zero, 0 otherwise.
 
 							*msgpack#strftime*
 msgpack#strftime({format}, {msgpack-integer})		*msgpack#strftime()*
-	Same as |strftime()|, but second argument may be 
+	Same as |strftime()|, but second argument may be
 	|msgpack-special-dict|.  Requires |Python| to really work with
 	|msgpack-special-dict|s.
 
 							*msgpack#strptime*
 msgpack#strptime({format}, {time})			*msgpack#strptime()*
-	Reverse of |msgpack#strftime()|: for any time and format 
-	|msgpack#equal|( |msgpack#strptime|(format, |msgpack#strftime|(format, 
+	Reverse of |msgpack#strftime()|: for any time and format
+	|msgpack#equal|( |msgpack#strptime|(format, |msgpack#strftime|(format,
 	time)), time) be true.  Requires ||Python|, without it only supports
 	non-|msgpack-special-dict| nonnegative times and format equal to
 	`%Y-%m-%dT%H:%M:%S`.
 
 msgpack#int_dict_to_str({msgpack-special-int})	*msgpack#int_dict_to_str()*
-	Function which converts |msgpack-special-dict| integer value to 
-	a hexadecimal value like 0x1234567890ABCDEF (always returns exactly 16 
+	Function which converts |msgpack-special-dict| integer value to
+	a hexadecimal value like 0x1234567890ABCDEF (always returns exactly 16
 	hexadecimal digits).
 
 msgpack#special_type({msgpack-value})		*msgpack#special_type()*
-	Returns zero if {msgpack-value} is not |msgpack-special-dict|.  If it 
-	is it returns name of the key in |v:msgpack_types| which represents 
+	Returns zero if {msgpack-value} is not |msgpack-special-dict|.  If it
+	is it returns name of the key in |v:msgpack_types| which represents
 	{msgpack-value} type.
 
 msgpack#type({msgpack-value})				*msgpack#type()*
-	Returns name of the key in |v:msgpack_types| that represents 
-	{msgpack-value} type.  Never returns zero: this function returns 
-	msgpack type which will be dumped by |msgpackdump()| should it receive 
+	Returns name of the key in |v:msgpack_types| that represents
+	{msgpack-value} type.  Never returns zero: this function returns
+	msgpack type which will be dumped by |msgpackdump()| should it receive
 	a list with single {msgpack-value} as input.
 
 msgpack#deepcopy({msgpack-value})			*msgpack#deepcopy()*
-	Like |deepcopy()|, but works correctly with |msgpack-special-dict| 
-	values.  Plain |deepcopy()| will destroy all types in 
-	|msgpack-special-dict| values because it will copy _TYPE key values, 
+	Like |deepcopy()|, but works correctly with |msgpack-special-dict|
+	values.  Plain |deepcopy()| will destroy all types in
+	|msgpack-special-dict| values because it will copy _TYPE key values,
 	while they should be preserved.
 
 msgpack#string({msgpack-value})				*msgpack#string()*
-	Like |string()|, but saves information about msgpack types.  Values 
-	dumped by msgpack#string may be read back by |msgpack#eval()|.  
+	Like |string()|, but saves information about msgpack types.  Values
+	dumped by msgpack#string may be read back by |msgpack#eval()|.
 	Returns is the following:
 
-	- Dictionaries are dumped as "{key1: value1, key2: value2}". Note: 
-	  msgpack allows any values in keys, so with some 
-	  |msgpack-special-dict| values |msgpack#string()| may produce even 
+	- Dictionaries are dumped as "{key1: value1, key2: value2}". Note:
+	  msgpack allows any values in keys, so with some
+	  |msgpack-special-dict| values |msgpack#string()| may produce even
 	  "{{1: 2}: 3, [4]: 5}".
 	- Lists are dumped as "[value1, value2]".
 	- Strings are dumped as
 	  1. `"abc"`: binary string.
 	  2. `="abc"`: string.
-	  3. `+(10)"ext"`: extension strings (10 may be replaced with any 
+	  3. `+(10)"ext"`: extension strings (10 may be replaced with any
 	     8-bit signed integer).
-	  Inside strings the following escape sequences may be present: "\0" 
-	  (represents NUL byte), "\n" (represents line feed) and "\"" 
+	  Inside strings the following escape sequences may be present: "\0"
+	  (represents NUL byte), "\n" (represents line feed) and "\""
 	  (represents double quote).
-	- Floating-point and integer values are dumped using |string()| or 
+	- Floating-point and integer values are dumped using |string()| or
 	  |msgpack#int_dict_to_str()|.
 	- Booleans are dumped as "TRUE" or "FALSE".
 	- Nil values are dumped as "NIL".
 
 msgpack#eval({string}, {dict})				*msgpack#eval()*
-	Transforms string created by |msgpack#string()| into a value suitable 
-	for |msgpackdump()|.  Second argument allows adding special values 
-	that start with head characters (|/\h|) and contain only word 
-	characters (|/\w|).  Built-in special values are "TRUE", "FALSE", 
-	"NIL", "nan" and "inf" and they cannot be overridden.  Map values are 
-	always evaluated to |msgpack-special-dict| values, as well as 
+	Transforms string created by |msgpack#string()| into a value suitable
+	for |msgpackdump()|.  Second argument allows adding special values
+	that start with head characters (|/\h|) and contain only word
+	characters (|/\w|).  Built-in special values are "TRUE", "FALSE",
+	"NIL", "nan" and "inf" and they cannot be overridden.  Map values are
+	always evaluated to |msgpack-special-dict| values, as well as
 	hexadecimal digits.  When evaluating maps order of keys is preserved.
 
-	Note that in addition to regular integer representations that may be 
-	obtained using |msgpack#string()| msgpack#eval() also supports C-style 
-	“character” integer constants like `'/'` (equivalent to 
+	Note that in addition to regular integer representations that may be
+	obtained using |msgpack#string()| msgpack#eval() also supports C-style
+	“character” integer constants like `'/'` (equivalent to
 	`char2nr('/')`: `47`). This also allows `'\0'` (number is decimal).
 
 							*msgpack#equal*
 msgpack#equal({msgpack-value}, {msgpack-value})		*msgpack#equal()*
-	Returns 1 if given values are equal, 0 otherwise.  When comparing 
-	msgpack map values order of keys is ignored.  Comparing 
-	|msgpack-special-dict| with equivalent non-special-dict value 
+	Returns 1 if given values are equal, 0 otherwise.  When comparing
+	msgpack map values order of keys is ignored.  Comparing
+	|msgpack-special-dict| with equivalent non-special-dict value
 	evaluates to 1.
 
 ==============================================================================
-- 
cgit 


From 74bd4aba57d2f1b224abe46a6de82911d14ef6c1 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Tue, 25 Jul 2023 16:57:19 +0200
Subject: fix(lsp): fix multi client handling workspace_folder methods (#18839)

`buf_notify` sends the notification to all clients of a buffer, calling
that inside a loop over clients multiplies the amount of notifications.
---
 runtime/lua/vim/lsp/buf.lua | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 02d8d0fa7b..5e0e429021 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -480,11 +480,13 @@ function M.add_workspace_folder(workspace_folder)
     print(workspace_folder, ' is not a valid directory')
     return
   end
-  local params = util.make_workspace_params(
-    { { uri = vim.uri_from_fname(workspace_folder), name = workspace_folder } },
-    {}
-  )
-  for _, client in pairs(vim.lsp.get_clients({ bufnr = 0 })) do
+  local new_workspace = {
+    uri = vim.uri_from_fname(workspace_folder),
+    name = workspace_folder,
+  }
+  local params = { event = { added = { new_workspace }, removed = {} } }
+  local bufnr = vim.api.nvim_get_current_buf()
+  for _, client in pairs(vim.lsp.get_clients({ bufnr = bufnr })) do
     local found = false
     for _, folder in pairs(client.workspace_folders or {}) do
       if folder.name == workspace_folder then
@@ -494,11 +496,11 @@ function M.add_workspace_folder(workspace_folder)
       end
     end
     if not found then
-      vim.lsp.buf_notify(0, 'workspace/didChangeWorkspaceFolders', params)
+      client.notify('workspace/didChangeWorkspaceFolders', params)
       if not client.workspace_folders then
         client.workspace_folders = {}
       end
-      table.insert(client.workspace_folders, params.event.added[1])
+      table.insert(client.workspace_folders, new_workspace)
     end
   end
 end
@@ -513,14 +515,16 @@ function M.remove_workspace_folder(workspace_folder)
   if not (workspace_folder and #workspace_folder > 0) then
     return
   end
-  local params = util.make_workspace_params(
-    {},
-    { { uri = vim.uri_from_fname(workspace_folder), name = workspace_folder } }
-  )
-  for _, client in pairs(vim.lsp.get_clients({ bufnr = 0 })) do
-    for idx, folder in pairs(client.workspace_folders or {}) do
+  local workspace = {
+    uri = vim.uri_from_fname(workspace_folder),
+    name = workspace_folder,
+  }
+  local params = { event = { added = {}, removed = { workspace } } }
+  local bufnr = vim.api.nvim_get_current_buf()
+  for _, client in pairs(vim.lsp.get_clients({ bufnr = bufnr })) do
+    for idx, folder in pairs(client.workspace_folders) do
       if folder.name == workspace_folder then
-        vim.lsp.buf_notify(0, 'workspace/didChangeWorkspaceFolders', params)
+        client.notify('workspace/didChangeWorkspaceFolders', params)
         client.workspace_folders[idx] = nil
         return
       end
-- 
cgit 


From fd089c8e50c211d7beae15dbc9492ae5a1a5f2e2 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 26 Jul 2023 09:50:54 +0100
Subject: feat(lua): typing for vim.fn.* (#24473)

Problem:
  No LSP information for `vim.fn.*`

Solution:
  Add meta file for `vim.fn.*`.
---
 runtime/lua/vim/_meta/vimfn.lua | 11162 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 11162 insertions(+)
 create mode 100644 runtime/lua/vim/_meta/vimfn.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
new file mode 100644
index 0000000000..b70e361e48
--- /dev/null
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -0,0 +1,11162 @@
+--- @meta
+-- THIS FILE IS GENERATED
+-- DO NOT EDIT
+
+--- Return the absolute value of {expr}.  When {expr} evaluates to
+--- a |Float| abs() returns a |Float|.  When {expr} can be
+--- converted to a |Number| abs() returns a |Number|.  Otherwise
+--- abs() gives an error message and returns -1.
+--- Examples: >
+---   echo abs(1.456)
+--- <  1.456  >
+---   echo abs(-5.456)
+--- <  5.456  >
+---   echo abs(-4)
+--- <  4
+---
+--- Can also be used as a |method|: >
+---   Compute()->abs()
+---
+--- @param expr any
+--- @return any
+function vim.fn.abs(expr) end
+
+--- Return the arc cosine of {expr} measured in radians, as a
+--- |Float| in the range of [0, pi].
+--- {expr} must evaluate to a |Float| or a |Number| in the range
+--- [-1, 1].
+--- Returns NaN if {expr} is outside the range [-1, 1].  Returns
+--- 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo acos(0)
+--- <  1.570796 >
+---   :echo acos(-0.5)
+--- <  2.094395
+---
+--- Can also be used as a |method|: >
+---   Compute()->acos()
+---
+--- @param expr any
+--- @return number
+function vim.fn.acos(expr) end
+
+--- Append the item {expr} to |List| or |Blob| {object}.  Returns
+--- the resulting |List| or |Blob|.  Examples: >
+---   :let alist = add([1, 2, 3], item)
+---   :call add(mylist, "woodstock")
+--- <Note that when {expr} is a |List| it is appended as a single
+--- item.  Use |extend()| to concatenate |Lists|.
+--- When {object} is a |Blob| then {expr} must be a number.
+--- Use |insert()| to add an item at another position.
+--- Returns 1 if {object} is not a |List| or a |Blob|.
+---
+--- Can also be used as a |method|: >
+---   mylist->add(val1)->add(val2)
+---
+--- @param object any
+--- @param expr any
+--- @return any
+function vim.fn.add(object, expr) end
+
+--- Bitwise AND on the two arguments.  The arguments are converted
+--- to a number.  A List, Dict or Float argument causes an error.
+--- Also see `or()` and `xor()`.
+--- Example: >
+---   :let flag = and(bits, 0x80)
+--- <Can also be used as a |method|: >
+---   :let flag = bits->and(0x80)
+---
+--- @param expr any
+--- @param expr1 any
+--- @return any
+vim.fn['and'] = function(expr, expr1) end
+
+--- Returns Dictionary of |api-metadata|.
+---
+--- View it in a nice human-readable format: >
+---        :lua vim.print(vim.fn.api_info())
+---
+--- @return any
+function vim.fn.api_info() end
+
+--- When {text} is a |List|: Append each item of the |List| as a
+--- text line below line {lnum} in the current buffer.
+--- Otherwise append {text} as one text line below line {lnum} in
+--- the current buffer.
+--- Any type of item is accepted and converted to a String.
+--- {lnum} can be zero to insert a line before the first one.
+--- {lnum} is used like with |getline()|.
+--- Returns 1 for failure ({lnum} out of range or out of memory),
+--- 0 for success.  Example: >
+---   :let failed = append(line('$'), "# THE END")
+---   :let failed = append(0, ["Chapter 1", "the beginning"])
+---
+--- <Can also be used as a |method| after a List: >
+---   mylist->append(lnum)
+---
+--- @param lnum integer
+--- @param text any
+--- @return any
+function vim.fn.append(lnum, text) end
+
+--- Like |append()| but append the text in buffer {expr}.
+---
+--- This function works only for loaded buffers. First call
+--- |bufload()| if needed.
+---
+--- For the use of {buf}, see |bufname()|.
+---
+--- {lnum} is the line number to append below.  Note that using
+--- |line()| would use the current buffer, not the one appending
+--- to.  Use "$" to append at the end of the buffer.  Other string
+--- values are not supported.
+---
+--- On success 0 is returned, on failure 1 is returned.
+---
+--- If {buf} is not a valid buffer or {lnum} is not valid, an
+--- error message is given. Example: >
+---   :let failed = appendbufline(13, 0, "# THE START")
+--- <
+--- Can also be used as a |method| after a List: >
+---   mylist->appendbufline(buf, lnum)
+---
+--- @param buf any
+--- @param lnum integer
+--- @param text any
+--- @return any
+function vim.fn.appendbufline(buf, lnum, text) end
+
+--- The result is the number of files in the argument list.  See
+--- |arglist|.
+--- If {winid} is not supplied, the argument list of the current
+--- window is used.
+--- If {winid} is -1, the global argument list is used.
+--- Otherwise {winid} specifies the window of which the argument
+--- list is used: either the window number or the window ID.
+--- Returns -1 if the {winid} argument is invalid.
+---
+---           *argidx()*
+--- @param winid? integer
+--- @return integer
+function vim.fn.argc(winid) end
+
+--- the first file.  argc() - 1 is the last one.  See |arglist|.
+---
+---           *arglistid()*
+--- @return integer
+function vim.fn.argidx() end
+
+--- Return the argument list ID.  This is a number which
+--- identifies the argument list being used.  Zero is used for the
+--- global argument list.  See |arglist|.
+--- Returns -1 if the arguments are invalid.
+---
+--- Without arguments use the current window.
+--- With {winnr} only use this window in the current tab page.
+--- With {winnr} and {tabnr} use the window in the specified tab
+--- page.
+--- {winnr} can be the window number or the |window-ID|.
+---
+---           *argv()*
+--- @param winnr? integer
+--- @param tabnr? integer
+--- @return integer
+function vim.fn.arglistid(winnr, tabnr) end
+
+--- The result is the {nr}th file in the argument list.  See
+--- |arglist|.  "argv(0)" is the first one.  Example: >
+---   :let i = 0
+---   :while i < argc()
+---   :  let f = escape(fnameescape(argv(i)), '.')
+---   :  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
+---   :  let i = i + 1
+---   :endwhile
+--- <Without the {nr} argument, or when {nr} is -1, a |List| with
+--- the whole |arglist| is returned.
+---
+--- The {winid} argument specifies the window ID, see |argc()|.
+--- For the Vim command line arguments see |v:argv|.
+---
+--- Returns an empty string if {nr}th argument is not present in
+--- the argument list.  Returns an empty List if the {winid}
+--- argument is invalid.
+---
+--- @param nr? integer
+--- @param winid? integer
+--- @return any
+function vim.fn.argv(nr, winid) end
+
+--- Return the arc sine of {expr} measured in radians, as a |Float|
+--- in the range of [-pi/2, pi/2].
+--- {expr} must evaluate to a |Float| or a |Number| in the range
+--- [-1, 1].
+--- Returns NaN if {expr} is outside the range [-1, 1].  Returns
+--- 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo asin(0.8)
+--- <  0.927295 >
+---   :echo asin(-0.5)
+--- <  -0.523599
+---
+--- Can also be used as a |method|: >
+---   Compute()->asin()
+---
+---
+--- assert_ functions are documented here: |assert-functions-details|
+---
+---
+--- @param expr any
+--- @return any
+function vim.fn.asin(expr) end
+
+--- Run {cmd} and add an error message to |v:errors| if it does
+--- NOT produce a beep or visual bell.
+--- Also see |assert_fails()|, |assert_nobeep()| and
+--- |assert-return|.
+---
+--- Can also be used as a |method|: >
+---   GetCmd()->assert_beeps()
+--- <
+---           *assert_equal()*
+--- @param cmd any
+--- @return 0|1
+function vim.fn.assert_beeps(cmd) end
+
+--- When {expected} and {actual} are not equal an error message is
+--- added to |v:errors| and 1 is returned.  Otherwise zero is
+--- returned. |assert-return|
+--- The error is in the form "Expected {expected} but got
+--- {actual}".  When {msg} is present it is prefixed to that.
+---
+--- There is no automatic conversion, the String "4" is different
+--- from the Number 4.  And the number 4 is different from the
+--- Float 4.0.  The value of 'ignorecase' is not used here, case
+--- always matters.
+--- Example: >
+---   assert_equal('foo', 'bar')
+--- <Will result in a string to be added to |v:errors|:
+---   test.vim line 12: Expected 'foo' but got 'bar' ~
+---
+--- Can also be used as a |method|: >
+---   mylist->assert_equal([1, 2, 3])
+---
+--- <          *assert_equalfile()*
+--- @param expected any
+--- @param actual any
+--- @param msg? any
+--- @return 0|1
+function vim.fn.assert_equal(expected, actual, msg) end
+
+--- When the files {fname-one} and {fname-two} do not contain
+--- exactly the same text an error message is added to |v:errors|.
+--- Also see |assert-return|.
+--- When {fname-one} or {fname-two} does not exist the error will
+--- mention that.
+---
+--- Can also be used as a |method|: >
+---   GetLog()->assert_equalfile('expected.log')
+---
+--- @return any
+function vim.fn.assert_equalfile() end
+
+--- When v:exception does not contain the string {error} an error
+--- message is added to |v:errors|.  Also see |assert-return|.
+--- This can be used to assert that a command throws an exception.
+--- Using the error number, followed by a colon, avoids problems
+--- with translations: >
+---   try
+---     commandthatfails
+---     call assert_false(1, 'command should have failed')
+---   catch
+---     call assert_exception('E492:')
+---   endtry
+--- <
+---           *assert_fails()*
+--- @param error any
+--- @param msg? any
+--- @return 0|1
+function vim.fn.assert_exception(error, msg) end
+
+--- Run {cmd} and add an error message to |v:errors| if it does
+--- NOT produce an error or when {error} is not found in the
+--- error message.  Also see |assert-return|.
+---
+--- When {error} is a string it must be found literally in the
+--- first reported error. Most often this will be the error code,
+--- including the colon, e.g. "E123:". >
+---   assert_fails('bad cmd', 'E987:')
+--- <
+--- When {error} is a |List| with one or two strings, these are
+--- used as patterns.  The first pattern is matched against the
+--- first reported error: >
+---   assert_fails('cmd', ['E987:.*expected bool'])
+--- <The second pattern, if present, is matched against the last
+--- reported error.  To only match the last error use an empty
+--- string for the first error: >
+---   assert_fails('cmd', ['', 'E987:'])
+--- <
+--- If {msg} is empty then it is not used.  Do this to get the
+--- default message when passing the {lnum} argument.
+---
+--- When {lnum} is present and not negative, and the {error}
+--- argument is present and matches, then this is compared with
+--- the line number at which the error was reported. That can be
+--- the line number in a function or in a script.
+---
+--- When {context} is present it is used as a pattern and matched
+--- against the context (script name or function name) where
+--- {lnum} is located in.
+---
+--- Note that beeping is not considered an error, and some failing
+--- commands only beep.  Use |assert_beeps()| for those.
+---
+--- Can also be used as a |method|: >
+---   GetCmd()->assert_fails('E99:')
+---
+--- @param cmd any
+--- @param error? any
+--- @param msg? any
+--- @param lnum? integer
+--- @param context? any
+--- @return 0|1
+function vim.fn.assert_fails(cmd, error, msg, lnum, context) end
+
+--- When {actual} is not false an error message is added to
+--- |v:errors|, like with |assert_equal()|.
+--- The error is in the form "Expected False but got {actual}".
+--- When {msg} is present it is prepended to that.
+--- Also see |assert-return|.
+---
+--- A value is false when it is zero. When {actual} is not a
+--- number the assert fails.
+---
+--- Can also be used as a |method|: >
+---   GetResult()->assert_false()
+---
+--- @param actual any
+--- @param msg? any
+--- @return 0|1
+function vim.fn.assert_false(actual, msg) end
+
+--- This asserts number and |Float| values.  When {actual}  is lower
+--- than {lower} or higher than {upper} an error message is added
+--- to |v:errors|.  Also see |assert-return|.
+--- The error is in the form "Expected range {lower} - {upper},
+--- but got {actual}".  When {msg} is present it is prefixed to
+--- that.
+---
+---             *assert_match()*
+--- @param lower any
+--- @param upper any
+--- @param actual any
+--- @param msg? any
+--- @return 0|1
+function vim.fn.assert_inrange(lower, upper, actual, msg) end
+
+--- When {pattern} does not match {actual} an error message is
+--- added to |v:errors|.  Also see |assert-return|.
+--- The error is in the form "Pattern {pattern} does not match
+--- {actual}".  When {msg} is present it is prefixed to that.
+---
+--- {pattern} is used as with |expr-=~|: The matching is always done
+--- like 'magic' was set and 'cpoptions' is empty, no matter what
+--- the actual value of 'magic' or 'cpoptions' is.
+---
+--- {actual} is used as a string, automatic conversion applies.
+--- Use "^" and "$" to match with the start and end of the text.
+--- Use both to match the whole text.
+---
+--- Example: >
+---   assert_match('^f.*o$', 'foobar')
+--- <Will result in a string to be added to |v:errors|:
+---   test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
+---
+--- Can also be used as a |method|: >
+---   getFile()->assert_match('foo.*')
+--- <
+--- @param pattern any
+--- @param actual any
+--- @param msg? any
+--- @return 0|1
+function vim.fn.assert_match(pattern, actual, msg) end
+
+--- Run {cmd} and add an error message to |v:errors| if it
+--- produces a beep or visual bell.
+--- Also see |assert_beeps()|.
+---
+--- Can also be used as a |method|: >
+---   GetCmd()->assert_nobeep()
+--- <
+---           *assert_notequal()*
+--- @param cmd any
+--- @return 0|1
+function vim.fn.assert_nobeep(cmd) end
+
+--- The opposite of `assert_equal()`: add an error message to
+--- |v:errors| when {expected} and {actual} are equal.
+--- Also see |assert-return|.
+---
+--- Can also be used as a |method|: >
+---   mylist->assert_notequal([1, 2, 3])
+---
+--- <          *assert_notmatch()*
+--- @param expected any
+--- @param actual any
+--- @param msg? any
+--- @return any
+function vim.fn.assert_notequal(expected, actual, msg) end
+
+--- The opposite of `assert_match()`: add an error message to
+--- |v:errors| when {pattern} matches {actual}.
+--- Also see |assert-return|.
+---
+--- Can also be used as a |method|: >
+---   getFile()->assert_notmatch('bar.*')
+---
+---
+--- @param pattern any
+--- @param actual any
+--- @param msg? any
+--- @return any
+function vim.fn.assert_notmatch(pattern, actual, msg) end
+
+--- Report a test failure directly, using String {msg}.
+--- Always returns one.
+---
+--- Can also be used as a |method|: >
+---   GetMessage()->assert_report()
+---
+---
+--- @param msg any
+--- @return any
+function vim.fn.assert_report(msg) end
+
+--- When {actual} is not true an error message is added to
+--- |v:errors|, like with |assert_equal()|.
+--- Also see |assert-return|.
+--- A value is |TRUE| when it is a non-zero number or |v:true|.
+--- When {actual} is not a number or |v:true| the assert fails.
+--- When {msg} is given it precedes the default message.
+---
+--- Can also be used as a |method|: >
+---   GetResult()->assert_true()
+--- <
+---
+--- @param actual any
+--- @param msg? any
+--- @return any
+function vim.fn.assert_true(actual, msg) end
+
+--- Return the principal value of the arc tangent of {expr}, in
+--- the range [-pi/2, +pi/2] radians, as a |Float|.
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo atan(100)
+--- <  1.560797 >
+---   :echo atan(-4.01)
+--- <  -1.326405
+---
+--- Can also be used as a |method|: >
+---   Compute()->atan()
+---
+--- @param expr any
+--- @return number
+function vim.fn.atan(expr) end
+
+--- Return the arc tangent of {expr1} / {expr2}, measured in
+--- radians, as a |Float| in the range [-pi, pi].
+--- {expr1} and {expr2} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
+--- |Number|.
+--- Examples: >
+---   :echo atan2(-1, 1)
+--- <  -0.785398 >
+---   :echo atan2(1, -1)
+--- <  2.356194
+---
+--- Can also be used as a |method|: >
+---   Compute()->atan2(1)
+---
+--- @param expr1 any
+--- @param expr2 any
+--- @return number
+function vim.fn.atan2(expr1, expr2) end
+
+--- Return a List containing the number value of each byte in Blob
+--- {blob}.  Examples: >
+---   blob2list(0z0102.0304)  returns [1, 2, 3, 4]
+---   blob2list(0z)    returns []
+--- <Returns an empty List on error.  |list2blob()| does the
+--- opposite.
+---
+--- Can also be used as a |method|: >
+---   GetBlob()->blob2list()
+--- <
+---           *browse()*
+--- @param blob any
+--- @return any
+function vim.fn.blob2list(blob) end
+
+--- Put up a file requester.  This only works when "has("browse")"
+--- returns |TRUE| (only in some GUI versions).
+--- The input fields are:
+---     {save}  when |TRUE|, select file to write
+---     {title}  title for the requester
+---     {initdir}  directory to start browsing in
+---     {default}  default file name
+--- An empty string is returned when the "Cancel" button is hit,
+--- something went wrong, or browsing is not possible.
+---
+---           *browsedir()*
+--- @param save any
+--- @param title any
+--- @param initdir any
+--- @param default any
+--- @return any
+function vim.fn.browse(save, title, initdir, default) end
+
+--- Put up a directory requester.  This only works when
+--- "has("browse")" returns |TRUE| (only in some GUI versions).
+--- On systems where a directory browser is not supported a file
+--- browser is used.  In that case: select a file in the directory
+--- to be used.
+--- The input fields are:
+---     {title}  title for the requester
+---     {initdir}  directory to start browsing in
+--- When the "Cancel" button is hit, something went wrong, or
+--- browsing is not possible, an empty string is returned.
+---
+--- @param title any
+--- @param initdir any
+--- @return any
+function vim.fn.browsedir(title, initdir) end
+
+--- Add a buffer to the buffer list with name {name} (must be a
+--- String).
+--- If a buffer for file {name} already exists, return that buffer
+--- number.  Otherwise return the buffer number of the newly
+--- created buffer.  When {name} is an empty string then a new
+--- buffer is always created.
+--- The buffer will not have 'buflisted' set and not be loaded
+--- yet.  To add some text to the buffer use this: >
+---   let bufnr = bufadd('someName')
+---   call bufload(bufnr)
+---   call setbufline(bufnr, 1, ['some', 'text'])
+--- <Returns 0 on error.
+--- Can also be used as a |method|: >
+---   let bufnr = 'somename'->bufadd()
+---
+--- @param name string
+--- @return integer
+function vim.fn.bufadd(name) end
+
+--- The result is a Number, which is |TRUE| if a buffer called
+--- {buf} exists.
+--- If the {buf} argument is a number, buffer numbers are used.
+--- Number zero is the alternate buffer for the current window.
+---
+--- If the {buf} argument is a string it must match a buffer name
+--- exactly.  The name can be:
+--- - Relative to the current directory.
+--- - A full path.
+--- - The name of a buffer with 'buftype' set to "nofile".
+--- - A URL name.
+--- Unlisted buffers will be found.
+--- Note that help files are listed by their short name in the
+--- output of |:buffers|, but bufexists() requires using their
+--- long name to be able to find them.
+--- bufexists() may report a buffer exists, but to use the name
+--- with a |:buffer| command you may need to use |expand()|.  Esp
+--- for MS-Windows 8.3 names in the form "c:\DOCUME~1"
+--- Use "bufexists(0)" to test for the existence of an alternate
+--- file name.
+---
+--- Can also be used as a |method|: >
+---   let exists = 'somename'->bufexists()
+---
+--- @param buf any
+--- @return 0|1
+function vim.fn.bufexists(buf) end
+
+--- @deprecated
+--- Obsolete name for |bufexists()|.
+function vim.fn.buffer_exists(...) end
+
+--- @deprecated
+--- Obsolete name for |bufname()|.
+function vim.fn.buffer_name(...) end
+
+--- @deprecated
+--- Obsolete name for |bufnr()|.
+function vim.fn.buffer_number(...) end
+
+--- The result is a Number, which is |TRUE| if a buffer called
+--- {buf} exists and is listed (has the 'buflisted' option set).
+--- The {buf} argument is used like with |bufexists()|.
+---
+--- Can also be used as a |method|: >
+---   let listed = 'somename'->buflisted()
+---
+--- @param buf any
+--- @return 0|1
+function vim.fn.buflisted(buf) end
+
+--- Ensure the buffer {buf} is loaded.  When the buffer name
+--- refers to an existing file then the file is read.  Otherwise
+--- the buffer will be empty.  If the buffer was already loaded
+--- then there is no change.  If the buffer is not related to a
+--- file the no file is read (e.g., when 'buftype' is "nofile").
+--- If there is an existing swap file for the file of the buffer,
+--- there will be no dialog, the buffer will be loaded anyway.
+--- The {buf} argument is used like with |bufexists()|.
+---
+--- Can also be used as a |method|: >
+---   eval 'somename'->bufload()
+---
+--- @param buf any
+function vim.fn.bufload(buf) end
+
+--- The result is a Number, which is |TRUE| if a buffer called
+--- {buf} exists and is loaded (shown in a window or hidden).
+--- The {buf} argument is used like with |bufexists()|.
+---
+--- Can also be used as a |method|: >
+---   let loaded = 'somename'->bufloaded()
+---
+--- @param buf any
+--- @return 0|1
+function vim.fn.bufloaded(buf) end
+
+--- The result is the name of a buffer.  Mostly as it is displayed
+--- by the `:ls` command, but not using special names such as
+--- "[No Name]".
+--- If {buf} is omitted the current buffer is used.
+--- If {buf} is a Number, that buffer number's name is given.
+--- Number zero is the alternate buffer for the current window.
+--- If {buf} is a String, it is used as a |file-pattern| to match
+--- with the buffer names.  This is always done like 'magic' is
+--- set and 'cpoptions' is empty.  When there is more than one
+--- match an empty string is returned.
+--- "" or "%" can be used for the current buffer, "#" for the
+--- alternate buffer.
+--- A full match is preferred, otherwise a match at the start, end
+--- or middle of the buffer name is accepted.  If you only want a
+--- full match then put "^" at the start and "$" at the end of the
+--- pattern.
+--- Listed buffers are found first.  If there is a single match
+--- with a listed buffer, that one is returned.  Next unlisted
+--- buffers are searched for.
+--- If the {buf} is a String, but you want to use it as a buffer
+--- number, force it to be a Number by adding zero to it: >
+---   :echo bufname("3" + 0)
+--- <Can also be used as a |method|: >
+---   echo bufnr->bufname()
+---
+--- <If the buffer doesn't exist, or doesn't have a name, an empty
+--- string is returned. >
+---   bufname("#")    alternate buffer name
+---   bufname(3)    name of buffer 3
+---   bufname("%")    name of current buffer
+---   bufname("file2")  name of buffer where "file2" matches.
+--- <
+---           *bufnr()*
+--- @param buf? any
+--- @return string
+function vim.fn.bufname(buf) end
+
+--- The result is the number of a buffer, as it is displayed by
+--- the `:ls` command.  For the use of {buf}, see |bufname()|
+--- above.
+--- If the buffer doesn't exist, -1 is returned.  Or, if the
+--- {create} argument is present and TRUE, a new, unlisted,
+--- buffer is created and its number is returned.
+--- bufnr("$") is the last buffer: >
+---   :let last_buffer = bufnr("$")
+--- <The result is a Number, which is the highest buffer number
+--- of existing buffers.  Note that not all buffers with a smaller
+--- number necessarily exist, because ":bwipeout" may have removed
+--- them.  Use bufexists() to test for the existence of a buffer.
+---
+--- Can also be used as a |method|: >
+---   echo bufref->bufnr()
+---
+--- @param buf? any
+--- @param create? any
+--- @return integer
+function vim.fn.bufnr(buf, create) end
+
+--- The result is a Number, which is the |window-ID| of the first
+--- window associated with buffer {buf}.  For the use of {buf},
+--- see |bufname()| above.  If buffer {buf} doesn't exist or
+--- there is no such window, -1 is returned.  Example: >
+---
+---   echo "A window containing buffer 1 is " .. (bufwinid(1))
+--- <
+--- Only deals with the current tab page.  See |win_findbuf()| for
+--- finding more.
+---
+--- Can also be used as a |method|: >
+---   FindBuffer()->bufwinid()
+---
+--- @param buf any
+--- @return integer
+function vim.fn.bufwinid(buf) end
+
+--- Like |bufwinid()| but return the window number instead of the
+--- |window-ID|.
+--- If buffer {buf} doesn't exist or there is no such window, -1
+--- is returned.  Example: >
+---
+---   echo "A window containing buffer 1 is " .. (bufwinnr(1))
+---
+--- <The number can be used with |CTRL-W_w| and ":wincmd w"
+--- |:wincmd|.
+---
+--- Can also be used as a |method|: >
+---   FindBuffer()->bufwinnr()
+---
+--- @param buf any
+--- @return integer
+function vim.fn.bufwinnr(buf) end
+
+--- Return the line number that contains the character at byte
+--- count {byte} in the current buffer.  This includes the
+--- end-of-line character, depending on the 'fileformat' option
+--- for the current buffer.  The first character has byte count
+--- one.
+--- Also see |line2byte()|, |go| and |:goto|.
+---
+--- Returns -1 if the {byte} value is invalid.
+---
+--- Can also be used as a |method|: >
+---   GetOffset()->byte2line()
+---
+--- @param byte any
+--- @return integer
+function vim.fn.byte2line(byte) end
+
+--- Return byte index of the {nr}th character in the String
+--- {expr}.  Use zero for the first character, it then returns
+--- zero.
+--- If there are no multibyte characters the returned value is
+--- equal to {nr}.
+--- Composing characters are not counted separately, their byte
+--- length is added to the preceding base character.  See
+--- |byteidxcomp()| below for counting composing characters
+--- separately.
+--- When {utf16} is present and TRUE, {nr} is used as the UTF-16
+--- index in the String {expr} instead of as the character index.
+--- The UTF-16 index is the index in the string when it is encoded
+--- with 16-bit words.  If the specified UTF-16 index is in the
+--- middle of a character (e.g. in a 4-byte character), then the
+--- byte index of the first byte in the character is returned.
+--- Refer to |string-offset-encoding| for more information.
+--- Example : >
+---   echo matchstr(str, ".", byteidx(str, 3))
+--- <will display the fourth character.  Another way to do the
+--- same: >
+---   let s = strpart(str, byteidx(str, 3))
+---   echo strpart(s, 0, byteidx(s, 1))
+--- <Also see |strgetchar()| and |strcharpart()|.
+---
+--- If there are less than {nr} characters -1 is returned.
+--- If there are exactly {nr} characters the length of the string
+--- in bytes is returned.
+--- See |charidx()| and |utf16idx()| for getting the character and
+--- UTF-16 index respectively from the byte index.
+--- Examples: >
+---   echo byteidx('a😊😊', 2)  returns 5
+---   echo byteidx('a😊😊', 2, 1)  returns 1
+---   echo byteidx('a😊😊', 3, 1)  returns 5
+--- <
+--- Can also be used as a |method|: >
+---   GetName()->byteidx(idx)
+---
+--- @param expr any
+--- @param nr integer
+--- @param utf16? any
+--- @return integer
+function vim.fn.byteidx(expr, nr, utf16) end
+
+--- Like byteidx(), except that a composing character is counted
+--- as a separate character.  Example: >
+---   let s = 'e' .. nr2char(0x301)
+---   echo byteidx(s, 1)
+---   echo byteidxcomp(s, 1)
+---   echo byteidxcomp(s, 2)
+--- <The first and third echo result in 3 ('e' plus composing
+--- character is 3 bytes), the second echo results in 1 ('e' is
+--- one byte).
+---
+--- Can also be used as a |method|: >
+---   GetName()->byteidxcomp(idx)
+---
+--- @param expr any
+--- @param nr integer
+--- @param utf16? any
+--- @return integer
+function vim.fn.byteidxcomp(expr, nr, utf16) end
+
+--- Call function {func} with the items in |List| {arglist} as
+--- arguments.
+--- {func} can either be a |Funcref| or the name of a function.
+--- a:firstline and a:lastline are set to the cursor line.
+--- Returns the return value of the called function.
+--- {dict} is for functions with the "dict" attribute.  It will be
+--- used to set the local variable "self". |Dictionary-function|
+---
+--- Can also be used as a |method|: >
+---   GetFunc()->call([arg, arg], dict)
+---
+--- @param func any
+--- @param arglist any
+--- @param dict? any
+--- @return any
+function vim.fn.call(func, arglist, dict) end
+
+--- Return the smallest integral value greater than or equal to
+--- {expr} as a |Float| (round up).
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Examples: >
+---   echo ceil(1.456)
+--- <  2.0  >
+---   echo ceil(-5.456)
+--- <  -5.0  >
+---   echo ceil(4.0)
+--- <  4.0
+---
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+---
+--- Can also be used as a |method|: >
+---   Compute()->ceil()
+---
+--- @param expr any
+--- @return any
+function vim.fn.ceil(expr) end
+
+--- Close a channel or a specific stream associated with it.
+--- For a job, {stream} can be one of "stdin", "stdout",
+--- "stderr" or "rpc" (closes stdin/stdout for a job started
+--- with `"rpc":v:true`) If {stream} is omitted, all streams
+--- are closed. If the channel is a pty, this will then close the
+--- pty master, sending SIGHUP to the job process.
+--- For a socket, there is only one stream, and {stream} should be
+--- omitted.
+---
+--- @param id any
+--- @param stream? any
+--- @return any
+function vim.fn.chanclose(id, stream) end
+
+--- Return the number of the most recent change.  This is the same
+--- number as what is displayed with |:undolist| and can be used
+--- with the |:undo| command.
+--- When a change was made it is the number of that change.  After
+--- redo it is the number of the redone change.  After undo it is
+--- one less than the number of the undone change.
+--- Returns 0 if the undo list is empty.
+---
+--- @return integer
+function vim.fn.changenr() end
+
+--- Send data to channel {id}. For a job, it writes it to the
+--- stdin of the process. For the stdio channel |channel-stdio|,
+--- it writes to Nvim's stdout.  Returns the number of bytes
+--- written if the write succeeded, 0 otherwise.
+--- See |channel-bytes| for more information.
+---
+--- {data} may be a string, string convertible, |Blob|, or a list.
+--- If {data} is a list, the items will be joined by newlines; any
+--- newlines in an item will be sent as NUL. To send a final
+--- newline, include a final empty string. Example: >
+---   :call chansend(id, ["abc", "123\n456", ""])
+--- <will send "abc<NL>123<NUL>456<NL>".
+---
+--- chansend() writes raw data, not RPC messages.  If the channel
+--- was created with `"rpc":v:true` then the channel expects RPC
+--- messages, use |rpcnotify()| and |rpcrequest()| instead.
+---
+---
+--- @param id any
+--- @param data any
+--- @return any
+function vim.fn.chansend(id, data) end
+
+--- Return Number value of the first char in {string}.
+--- Examples: >
+---   char2nr(" ")    returns 32
+---   char2nr("ABC")    returns 65
+---   char2nr("á")    returns 225
+---   char2nr("á"[0])    returns 195
+---   char2nr("\<M-x>")  returns 128
+--- <Non-ASCII characters are always treated as UTF-8 characters.
+--- {utf8} is ignored, it exists only for backwards-compatibility.
+--- A combining character is a separate character.
+--- |nr2char()| does the opposite.
+---
+--- Returns 0 if {string} is not a |String|.
+---
+--- Can also be used as a |method|: >
+---   GetChar()->char2nr()
+---
+--- @param string string
+--- @param utf8? any
+--- @return any
+function vim.fn.char2nr(string, utf8) end
+
+--- Return the character class of the first character in {string}.
+--- The character class is one of:
+---   0  blank
+---   1  punctuation
+---   2  word character
+---   3  emoji
+---   other  specific Unicode class
+--- The class is used in patterns and word motions.
+--- Returns 0 if {string} is not a |String|.
+---
+---
+--- @param string string
+--- @return any
+function vim.fn.charclass(string) end
+
+--- Same as |col()| but returns the character index of the column
+--- position given with {expr} instead of the byte position.
+---
+--- Example:
+--- With the cursor on '세' in line 5 with text "여보세요": >
+---   charcol('.')    returns 3
+---   col('.')    returns 7
+---
+--- <Can also be used as a |method|: >
+---   GetPos()->col()
+--- <
+---           *charidx()*
+--- @param expr any
+--- @param winid? integer
+--- @return any
+function vim.fn.charcol(expr, winid) end
+
+--- Return the character index of the byte at {idx} in {string}.
+--- The index of the first character is zero.
+--- If there are no multibyte characters the returned value is
+--- equal to {idx}.
+---
+--- When {countcc} is omitted or |FALSE|, then composing characters
+--- are not counted separately, their byte length is added to the
+--- preceding base character.
+--- When {countcc} is |TRUE|, then composing characters are
+--- counted as separate characters.
+---
+--- When {utf16} is present and TRUE, {idx} is used as the UTF-16
+--- index in the String {expr} instead of as the byte index.
+---
+--- Returns -1 if the arguments are invalid or if there are less
+--- than {idx} bytes. If there are exactly {idx} bytes the length
+--- of the string in characters is returned.
+---
+--- An error is given and -1 is returned if the first argument is
+--- not a string, the second argument is not a number or when the
+--- third argument is present and is not zero or one.
+---
+--- See |byteidx()| and |byteidxcomp()| for getting the byte index
+--- from the character index and |utf16idx()| for getting the
+--- UTF-16 index from the character index.
+--- Refer to |string-offset-encoding| for more information.
+--- Examples: >
+---   echo charidx('áb́ć', 3)    returns 1
+---   echo charidx('áb́ć', 6, 1)  returns 4
+---   echo charidx('áb́ć', 16)    returns -1
+---   echo charidx('a😊😊', 4, 0, 1)  returns 2
+--- <
+--- Can also be used as a |method|: >
+---   GetName()->charidx(idx)
+---
+--- @param string string
+--- @param idx integer
+--- @param countcc? any
+--- @param utf16? any
+--- @return any
+function vim.fn.charidx(string, idx, countcc, utf16) end
+
+--- Change the current working directory to {dir}.  The scope of
+--- the directory change depends on the directory of the current
+--- window:
+---   - If the current window has a window-local directory
+---     (|:lcd|), then changes the window local directory.
+---   - Otherwise, if the current tabpage has a local
+---     directory (|:tcd|) then changes the tabpage local
+---     directory.
+---   - Otherwise, changes the global directory.
+--- {dir} must be a String.
+--- If successful, returns the previous working directory.  Pass
+--- this to another chdir() to restore the directory.
+--- On failure, returns an empty string.
+---
+--- Example: >
+---   let save_dir = chdir(newdir)
+---   if save_dir != ""
+---      " ... do some work
+---      call chdir(save_dir)
+---   endif
+---
+--- <Can also be used as a |method|: >
+---   GetDir()->chdir()
+--- <
+--- @param dir string
+--- @return any
+function vim.fn.chdir(dir) end
+
+--- Get the amount of indent for line {lnum} according the C
+--- indenting rules, as with 'cindent'.
+--- The indent is counted in spaces, the value of 'tabstop' is
+--- relevant.  {lnum} is used just like in |getline()|.
+--- When {lnum} is invalid -1 is returned.
+--- See |C-indenting|.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->cindent()
+---
+--- @param lnum integer
+--- @return any
+function vim.fn.cindent(lnum) end
+
+--- Clears all matches previously defined for the current window
+--- by |matchadd()| and the |:match| commands.
+--- If {win} is specified, use the window with this number or
+--- window ID instead of the current window.
+---
+--- Can also be used as a |method|: >
+---   GetWin()->clearmatches()
+--- <
+--- @param win? any
+--- @return any
+function vim.fn.clearmatches(win) end
+
+--- The result is a Number, which is the byte index of the column
+--- position given with {expr}.  The accepted positions are:
+---     .      the cursor position
+---     $      the end of the cursor line (the result is the
+---       number of bytes in the cursor line plus one)
+---     'x      position of mark x (if the mark is not set, 0 is
+---       returned)
+---     v       In Visual mode: the start of the Visual area (the
+---       cursor is the end).  When not in Visual mode
+---       returns the cursor position.  Differs from |'<| in
+---       that it's updated right away.
+--- Additionally {expr} can be [lnum, col]: a |List| with the line
+--- and column number. Most useful when the column is "$", to get
+--- the last column of a specific line.  When "lnum" or "col" is
+--- out of range then col() returns zero.
+--- With the optional {winid} argument the values are obtained for
+--- that window instead of the current window.
+--- To get the line number use |line()|.  To get both use
+--- |getpos()|.
+--- For the screen column position use |virtcol()|.  For the
+--- character position use |charcol()|.
+--- Note that only marks in the current file can be used.
+--- Examples: >
+---   col(".")    column of cursor
+---   col("$")    length of cursor line plus one
+---   col("'t")    column of mark t
+---   col("'" .. markname)  column of mark markname
+--- <The first column is 1.  Returns 0 if {expr} is invalid or when
+--- the window with ID {winid} is not found.
+--- For an uppercase mark the column may actually be in another
+--- buffer.
+--- For the cursor position, when 'virtualedit' is active, the
+--- column is one higher if the cursor is after the end of the
+--- line.  Also, when using a <Cmd> mapping the cursor isn't
+--- moved, this can be used to obtain the column in Insert mode: >
+---   :imap <F2> <Cmd>echo col(".").."\n"<CR>
+---
+--- <Can also be used as a |method|: >
+---   GetPos()->col()
+--- <
+---
+--- @param expr any
+--- @param winid? integer
+--- @return integer
+function vim.fn.col(expr, winid) end
+
+--- Set the matches for Insert mode completion.
+--- Can only be used in Insert mode.  You need to use a mapping
+--- with CTRL-R = (see |i_CTRL-R|).  It does not work after CTRL-O
+--- or with an expression mapping.
+--- {startcol} is the byte offset in the line where the completed
+--- text start.  The text up to the cursor is the original text
+--- that will be replaced by the matches.  Use col('.') for an
+--- empty string.  "col('.') - 1" will replace one character by a
+--- match.
+--- {matches} must be a |List|.  Each |List| item is one match.
+--- See |complete-items| for the kind of items that are possible.
+--- "longest" in 'completeopt' is ignored.
+--- Note that the after calling this function you need to avoid
+--- inserting anything that would cause completion to stop.
+--- The match can be selected with CTRL-N and CTRL-P as usual with
+--- Insert mode completion.  The popup menu will appear if
+--- specified, see |ins-completion-menu|.
+--- Example: >
+---   inoremap <F5> <C-R>=ListMonths()<CR>
+---
+---   func ListMonths()
+---     call complete(col('.'), ['January', 'February', 'March',
+--- \ 'April', 'May', 'June', 'July', 'August', 'September',
+--- \ 'October', 'November', 'December'])
+---     return ''
+---   endfunc
+--- <This isn't very useful, but it shows how it works.  Note that
+--- an empty string is returned to avoid a zero being inserted.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetMatches()->complete(col('.'))
+---
+--- @param startcol any
+--- @param matches any
+function vim.fn.complete(startcol, matches) end
+
+--- Add {expr} to the list of matches.  Only to be used by the
+--- function specified with the 'completefunc' option.
+--- Returns 0 for failure (empty string or out of memory),
+--- 1 when the match was added, 2 when the match was already in
+--- the list.
+--- See |complete-functions| for an explanation of {expr}.  It is
+--- the same as one item in the list that 'omnifunc' would return.
+---
+--- Can also be used as a |method|: >
+---   GetMoreMatches()->complete_add()
+---
+--- @param expr any
+--- @return 0|1|2
+function vim.fn.complete_add(expr) end
+
+--- Check for a key typed while looking for completion matches.
+--- This is to be used when looking for matches takes some time.
+--- Returns |TRUE| when searching for matches is to be aborted,
+--- zero otherwise.
+--- Only to be used by the function specified with the
+--- 'completefunc' option.
+---
+---
+--- @return 0|1
+function vim.fn.complete_check() end
+
+--- Returns a |Dictionary| with information about Insert mode
+--- completion.  See |ins-completion|.
+--- The items are:
+---    mode    Current completion mode name string.
+---     See |complete_info_mode| for the values.
+---    pum_visible  |TRUE| if popup menu is visible.
+---     See |pumvisible()|.
+---    items  List of completion matches.  Each item is a
+---     dictionary containing the entries "word",
+---     "abbr", "menu", "kind", "info" and "user_data".
+---     See |complete-items|.
+---    selected  Selected item index.  First index is zero.
+---     Index is -1 if no item is selected (showing
+---     typed text only, or the last completion after
+---     no item is selected when using the <Up> or
+---     <Down> keys)
+---    inserted  Inserted string. [NOT IMPLEMENTED YET]
+---
+---           *complete_info_mode*
+--- mode values are:
+---    ""         Not in completion mode
+---    "keyword"       Keyword completion |i_CTRL-X_CTRL-N|
+---    "ctrl_x"       Just pressed CTRL-X |i_CTRL-X|
+---    "scroll"       Scrolling with |i_CTRL-X_CTRL-E| or
+---          |i_CTRL-X_CTRL-Y|
+---    "whole_line"       Whole lines |i_CTRL-X_CTRL-L|
+---    "files"       File names |i_CTRL-X_CTRL-F|
+---    "tags"       Tags |i_CTRL-X_CTRL-]|
+---    "path_defines"    Definition completion |i_CTRL-X_CTRL-D|
+---    "path_patterns"   Include completion |i_CTRL-X_CTRL-I|
+---    "dictionary"       Dictionary |i_CTRL-X_CTRL-K|
+---    "thesaurus"       Thesaurus |i_CTRL-X_CTRL-T|
+---    "cmdline"       Vim Command line |i_CTRL-X_CTRL-V|
+---    "function"       User defined completion |i_CTRL-X_CTRL-U|
+---    "omni"       Omni completion |i_CTRL-X_CTRL-O|
+---    "spell"       Spelling suggestions |i_CTRL-X_s|
+---    "eval"       |complete()| completion
+---    "unknown"       Other internal modes
+---
+--- If the optional {what} list argument is supplied, then only
+--- the items listed in {what} are returned.  Unsupported items in
+--- {what} are silently ignored.
+---
+--- To get the position and size of the popup menu, see
+--- |pum_getpos()|. It's also available in |v:event| during the
+--- |CompleteChanged| event.
+---
+--- Returns an empty |Dictionary| on error.
+---
+--- Examples: >
+---   " Get all items
+---   call complete_info()
+---   " Get only 'mode'
+---   call complete_info(['mode'])
+---   " Get only 'mode' and 'pum_visible'
+---   call complete_info(['mode', 'pum_visible'])
+---
+--- <Can also be used as a |method|: >
+---   GetItems()->complete_info()
+--- <
+---         *confirm()*
+--- @param what? any
+--- @return table
+function vim.fn.complete_info(what) end
+
+--- confirm() offers the user a dialog, from which a choice can be
+--- made.  It returns the number of the choice.  For the first
+--- choice this is 1.
+---
+--- {msg} is displayed in a dialog with {choices} as the
+--- alternatives.  When {choices} is missing or empty, "&OK" is
+--- used (and translated).
+--- {msg} is a String, use '\n' to include a newline.  Only on
+--- some systems the string is wrapped when it doesn't fit.
+---
+--- {choices} is a String, with the individual choices separated
+--- by '\n', e.g. >
+---   confirm("Save changes?", "&Yes\n&No\n&Cancel")
+--- <The letter after the '&' is the shortcut key for that choice.
+--- Thus you can type 'c' to select "Cancel".  The shortcut does
+--- not need to be the first letter: >
+---   confirm("file has been modified", "&Save\nSave &All")
+--- <For the console, the first letter of each choice is used as
+--- the default shortcut key.  Case is ignored.
+---
+--- The optional {type} String argument gives the type of dialog.
+--- It can be one of these values: "Error", "Question", "Info",
+--- "Warning" or "Generic".  Only the first character is relevant.
+--- When {type} is omitted, "Generic" is used.
+---
+--- The optional {type} argument gives the type of dialog.  This
+--- is only used for the icon of the Win32 GUI.  It can be one of
+--- these values: "Error", "Question", "Info", "Warning" or
+--- "Generic".  Only the first character is relevant.
+--- When {type} is omitted, "Generic" is used.
+---
+--- If the user aborts the dialog by pressing <Esc>, CTRL-C,
+--- or another valid interrupt key, confirm() returns 0.
+---
+--- An example: >
+---    let choice = confirm("What do you want?",
+---       \ "&Apples\n&Oranges\n&Bananas", 2)
+---    if choice == 0
+---   echo "make up your mind!"
+---    elseif choice == 3
+---   echo "tasteful"
+---    else
+---   echo "I prefer bananas myself."
+---    endif
+--- <In a GUI dialog, buttons are used.  The layout of the buttons
+--- depends on the 'v' flag in 'guioptions'.  If it is included,
+--- the buttons are always put vertically.  Otherwise,  confirm()
+--- tries to put the buttons in one horizontal line.  If they
+--- don't fit, a vertical layout is used anyway.  For some systems
+--- the horizontal layout is always used.
+---
+--- Can also be used as a |method|in: >
+---   BuildMessage()->confirm("&Yes\n&No")
+--- <
+---           *copy()*
+--- @param msg any
+--- @param choices? any
+--- @param default? any
+--- @param type? any
+--- @return any
+function vim.fn.confirm(msg, choices, default, type) end
+
+--- different from using {expr} directly.
+--- When {expr} is a |List| a shallow copy is created.  This means
+--- that the original |List| can be changed without changing the
+--- copy, and vice versa.  But the items are identical, thus
+--- changing an item changes the contents of both |Lists|.
+--- A |Dictionary| is copied in a similar way as a |List|.
+--- Also see |deepcopy()|.
+--- Can also be used as a |method|: >
+---   mylist->copy()
+---
+--- @param expr any
+--- @return any
+function vim.fn.copy(expr) end
+
+--- Return the cosine of {expr}, measured in radians, as a |Float|.
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo cos(100)
+--- <  0.862319 >
+---   :echo cos(-4.01)
+--- <  -0.646043
+---
+--- Can also be used as a |method|: >
+---   Compute()->cos()
+---
+--- @param expr any
+--- @return any
+function vim.fn.cos(expr) end
+
+--- Return the hyperbolic cosine of {expr} as a |Float| in the range
+--- [1, inf].
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo cosh(0.5)
+--- <  1.127626 >
+---   :echo cosh(-0.5)
+--- <  -1.127626
+---
+--- Can also be used as a |method|: >
+---   Compute()->cosh()
+---
+--- @param expr any
+--- @return any
+function vim.fn.cosh(expr) end
+
+--- Return the number of times an item with value {expr} appears
+--- in |String|, |List| or |Dictionary| {comp}.
+---
+--- If {start} is given then start with the item with this index.
+--- {start} can only be used with a |List|.
+---
+--- When {ic} is given and it's |TRUE| then case is ignored.
+---
+--- When {comp} is a string then the number of not overlapping
+--- occurrences of {expr} is returned. Zero is returned when
+--- {expr} is an empty string.
+---
+--- Can also be used as a |method|: >
+---   mylist->count(val)
+--- <
+--- @param comp any
+--- @param expr any
+--- @param ic? any
+--- @param start? any
+--- @return any
+function vim.fn.count(comp, expr, ic, start) end
+
+--- Returns a |Dictionary| representing the |context| at {index}
+--- from the top of the |context-stack| (see |context-dict|).
+--- If {index} is not given, it is assumed to be 0 (i.e.: top).
+---
+--- @param index? any
+--- @return any
+function vim.fn.ctxget(index) end
+
+--- Pops and restores the |context| at the top of the
+--- |context-stack|.
+---
+--- @return any
+function vim.fn.ctxpop() end
+
+--- Pushes the current editor state (|context|) on the
+--- |context-stack|.
+--- If {types} is given and is a |List| of |String|s, it specifies
+--- which |context-types| to include in the pushed context.
+--- Otherwise, all context types are included.
+---
+--- @param types? any
+--- @return any
+function vim.fn.ctxpush(types) end
+
+--- Sets the |context| at {index} from the top of the
+--- |context-stack| to that represented by {context}.
+--- {context} is a Dictionary with context data (|context-dict|).
+--- If {index} is not given, it is assumed to be 0 (i.e.: top).
+---
+--- @param context any
+--- @param index? any
+--- @return any
+function vim.fn.ctxset(context, index) end
+
+--- Returns the size of the |context-stack|.
+---
+--- @return any
+function vim.fn.ctxsize() end
+
+--- Positions the cursor at the column (byte count) {col} in the
+--- line {lnum}.  The first column is one.
+---
+--- When there is one argument {list} this is used as a |List|
+--- with two, three or four item:
+---   [{lnum}, {col}]
+---   [{lnum}, {col}, {off}]
+---   [{lnum}, {col}, {off}, {curswant}]
+--- This is like the return value of |getpos()| or |getcurpos()|,
+--- but without the first item.
+---
+--- To position the cursor using {col} as the character count, use
+--- |setcursorcharpos()|.
+---
+--- Does not change the jumplist.
+--- {lnum} is used like with |getline()|, except that if {lnum} is
+--- zero, the cursor will stay in the current line.
+--- If {lnum} is greater than the number of lines in the buffer,
+--- the cursor will be positioned at the last line in the buffer.
+--- If {col} is greater than the number of bytes in the line,
+--- the cursor will be positioned at the last character in the
+--- line.
+--- If {col} is zero, the cursor will stay in the current column.
+--- If {curswant} is given it is used to set the preferred column
+--- for vertical movement.  Otherwise {col} is used.
+---
+--- When 'virtualedit' is used {off} specifies the offset in
+--- screen columns from the start of the character.  E.g., a
+--- position within a <Tab> or after the last character.
+--- Returns 0 when the position could be set, -1 otherwise.
+---
+--- Can also be used as a |method|: >
+---   GetCursorPos()->cursor()
+---
+--- @param list any
+--- @return any
+function vim.fn.cursor(list) end
+
+--- Specifically used to interrupt a program being debugged.  It
+--- will cause process {pid} to get a SIGTRAP.  Behavior for other
+--- processes is undefined. See |terminal-debug|.
+--- (Sends a SIGINT to a process {pid} other than MS-Windows)
+---
+--- Returns |TRUE| if successfully interrupted the program.
+--- Otherwise returns |FALSE|.
+---
+--- Can also be used as a |method|: >
+---   GetPid()->debugbreak()
+---
+--- @param pid any
+--- @return any
+function vim.fn.debugbreak(pid) end
+
+--- Make a copy of {expr}.  For Numbers and Strings this isn't
+--- different from using {expr} directly.
+--- When {expr} is a |List| a full copy is created.  This means
+--- that the original |List| can be changed without changing the
+--- copy, and vice versa.  When an item is a |List|, a copy for it
+--- is made, recursively.  Thus changing an item in the copy does
+--- not change the contents of the original |List|.
+---
+--- When {noref} is omitted or zero a contained |List| or
+--- |Dictionary| is only copied once.  All references point to
+--- this single copy.  With {noref} set to 1 every occurrence of a
+--- |List| or |Dictionary| results in a new copy.  This also means
+--- that a cyclic reference causes deepcopy() to fail.
+---             *E724*
+--- Nesting is possible up to 100 levels.  When there is an item
+--- that refers back to a higher level making a deep copy with
+--- {noref} set to 1 will fail.
+--- Also see |copy()|.
+---
+--- Can also be used as a |method|: >
+---   GetObject()->deepcopy()
+---
+--- @param expr any
+--- @param noref? any
+--- @return any
+function vim.fn.deepcopy(expr, noref) end
+
+--- Without {flags} or with {flags} empty: Deletes the file by the
+--- name {fname}.
+---
+--- This also works when {fname} is a symbolic link.  The symbolic
+--- link itself is deleted, not what it points to.
+---
+--- When {flags} is "d": Deletes the directory by the name
+--- {fname}.  This fails when directory {fname} is not empty.
+---
+--- When {flags} is "rf": Deletes the directory by the name
+--- {fname} and everything in it, recursively.  BE CAREFUL!
+--- Note: on MS-Windows it is not possible to delete a directory
+--- that is being used.
+---
+--- The result is a Number, which is 0/false if the delete
+--- operation was successful and -1/true when the deletion failed
+--- or partly failed.
+---
+--- Can also be used as a |method|: >
+---   GetName()->delete()
+---
+--- @param fname integer
+--- @param flags? string
+--- @return integer
+function vim.fn.delete(fname, flags) end
+
+--- Delete lines {first} to {last} (inclusive) from buffer {buf}.
+--- If {last} is omitted then delete line {first} only.
+--- On success 0 is returned, on failure 1 is returned.
+---
+--- This function works only for loaded buffers. First call
+--- |bufload()| if needed.
+---
+--- For the use of {buf}, see |bufname()| above.
+---
+--- {first} and {last} are used like with |getline()|. Note that
+--- when using |line()| this refers to the current buffer. Use "$"
+--- to refer to the last line in buffer {buf}.
+---
+--- Can also be used as a |method|: >
+---   GetBuffer()->deletebufline(1)
+--- <
+--- @param buf any
+--- @param first any
+--- @param last? any
+--- @return any
+function vim.fn.deletebufline(buf, first, last) end
+
+--- Adds a watcher to a dictionary. A dictionary watcher is
+--- identified by three components:
+---
+--- - A dictionary({dict});
+--- - A key pattern({pattern}).
+--- - A function({callback}).
+---
+--- After this is called, every change on {dict} and on keys
+--- matching {pattern} will result in {callback} being invoked.
+---
+--- For example, to watch all global variables: >
+---   silent! call dictwatcherdel(g:, '*', 'OnDictChanged')
+---   function! OnDictChanged(d,k,z)
+---     echomsg string(a:k) string(a:z)
+---   endfunction
+---   call dictwatcheradd(g:, '*', 'OnDictChanged')
+--- <
+--- For now {pattern} only accepts very simple patterns that can
+--- contain a "*" at the end of the string, in which case it will
+--- match every key that begins with the substring before the "*".
+--- That means if "*" is not the last character of {pattern}, only
+--- keys that are exactly equal as {pattern} will be matched.
+---
+--- The {callback} receives three arguments:
+---
+--- - The dictionary being watched.
+--- - The key which changed.
+--- - A dictionary containing the new and old values for the key.
+---
+--- The type of change can be determined by examining the keys
+--- present on the third argument:
+---
+--- - If contains both `old` and `new`, the key was updated.
+--- - If it contains only `new`, the key was added.
+--- - If it contains only `old`, the key was deleted.
+---
+--- This function can be used by plugins to implement options with
+--- validation and parsing logic.
+---
+--- @param dict any
+--- @param pattern any
+--- @param callback any
+--- @return any
+function vim.fn.dictwatcheradd(dict, pattern, callback) end
+
+--- Removes a watcher added  with |dictwatcheradd()|. All three
+--- arguments must match the ones passed to |dictwatcheradd()| in
+--- order for the watcher to be successfully deleted.
+---
+---           *did_filetype()*
+--- @param dict any
+--- @param pattern any
+--- @param callback any
+--- @return any
+function vim.fn.dictwatcherdel(dict, pattern, callback) end
+
+--- FileType event has been triggered at least once.  Can be used
+--- to avoid triggering the FileType event again in the scripts
+--- that detect the file type. |FileType|
+--- Returns |FALSE| when `:setf FALLBACK` was used.
+--- When editing another file, the counter is reset, thus this
+--- really checks if the FileType event has been triggered for the
+--- current buffer.  This allows an autocommand that starts
+--- editing another buffer to set 'filetype' and load a syntax
+--- file.
+---
+--- @return any
+function vim.fn.did_filetype() end
+
+--- Returns the number of filler lines above line {lnum}.
+--- These are the lines that were inserted at this point in
+--- another diff'ed window.  These filler lines are shown in the
+--- display but don't exist in the buffer.
+--- {lnum} is used like with |getline()|.  Thus "." is the current
+--- line, "'m" mark m, etc.
+--- Returns 0 if the current window is not in diff mode.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->diff_filler()
+---
+--- @param lnum integer
+--- @return any
+function vim.fn.diff_filler(lnum) end
+
+--- Returns the highlight ID for diff mode at line {lnum} column
+--- {col} (byte index).  When the current line does not have a
+--- diff change zero is returned.
+--- {lnum} is used like with |getline()|.  Thus "." is the current
+--- line, "'m" mark m, etc.
+--- {col} is 1 for the leftmost column, {lnum} is 1 for the first
+--- line.
+--- The highlight ID can be used with |synIDattr()| to obtain
+--- syntax information about the highlighting.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->diff_hlID(col)
+--- <
+---
+--- @param lnum integer
+--- @param col integer
+--- @return any
+function vim.fn.diff_hlID(lnum, col) end
+
+--- Return the digraph of {chars}.  This should be a string with
+--- exactly two characters.  If {chars} are not just two
+--- characters, or the digraph of {chars} does not exist, an error
+--- is given and an empty string is returned.
+---
+--- Also see |digraph_getlist()|.
+---
+--- Examples: >
+--- " Get a built-in digraph
+--- :echo digraph_get('00')    " Returns '∞'
+---
+--- " Get a user-defined digraph
+--- :call digraph_set('aa', 'あ')
+--- :echo digraph_get('aa')    " Returns 'あ'
+--- <
+--- Can also be used as a |method|: >
+---   GetChars()->digraph_get()
+--- <
+---
+--- @param chars any
+--- @return any
+function vim.fn.digraph_get(chars) end
+
+--- Return a list of digraphs.  If the {listall} argument is given
+--- and it is TRUE, return all digraphs, including the default
+--- digraphs.  Otherwise, return only user-defined digraphs.
+---
+--- Also see |digraph_get()|.
+---
+--- Examples: >
+--- " Get user-defined digraphs
+--- :echo digraph_getlist()
+---
+--- " Get all the digraphs, including default digraphs
+--- :echo digraph_getlist(1)
+--- <
+--- Can also be used as a |method|: >
+---   GetNumber()->digraph_getlist()
+--- <
+---
+--- @param listall? any
+--- @return any
+function vim.fn.digraph_getlist(listall) end
+
+--- Add digraph {chars} to the list.  {chars} must be a string
+--- with two characters.  {digraph} is a string with one UTF-8
+--- encoded character.  *E1215*
+--- Be careful, composing characters are NOT ignored.  This
+--- function is similar to |:digraphs| command, but useful to add
+--- digraphs start with a white space.
+---
+--- The function result is v:true if |digraph| is registered.  If
+--- this fails an error message is given and v:false is returned.
+---
+--- If you want to define multiple digraphs at once, you can use
+--- |digraph_setlist()|.
+---
+--- Example: >
+---   call digraph_set('  ', 'あ')
+--- <
+--- Can be used as a |method|: >
+---   GetString()->digraph_set('あ')
+--- <
+---
+--- @param chars any
+--- @param digraph any
+--- @return any
+function vim.fn.digraph_set(chars, digraph) end
+
+--- Similar to |digraph_set()| but this function can add multiple
+--- digraphs at once.  {digraphlist} is a list composed of lists,
+--- where each list contains two strings with {chars} and
+--- {digraph} as in |digraph_set()|. *E1216*
+--- Example: >
+---     call digraph_setlist([['aa', 'あ'], ['ii', 'い']])
+--- <
+--- It is similar to the following: >
+---     for [chars, digraph] in [['aa', 'あ'], ['ii', 'い']]
+---     call digraph_set(chars, digraph)
+---     endfor
+--- <Except that the function returns after the first error,
+--- following digraphs will not be added.
+---
+--- Can be used as a |method|: >
+---     GetList()->digraph_setlist()
+--- <
+---
+--- @param digraphlist any
+--- @return any
+function vim.fn.digraph_setlist(digraphlist) end
+
+--- Return the Number 1 if {expr} is empty, zero otherwise.
+--- - A |List| or |Dictionary| is empty when it does not have any
+---   items.
+--- - A |String| is empty when its length is zero.
+--- - A |Number| and |Float| are empty when their value is zero.
+--- - |v:false| and |v:null| are empty, |v:true| is not.
+--- - A |Blob| is empty when its length is zero.
+---
+--- Can also be used as a |method|: >
+---   mylist->empty()
+---
+--- @param expr any
+--- @return any
+function vim.fn.empty(expr) end
+
+--- Return all of environment variables as dictionary. You can
+--- check if an environment variable exists like this: >
+---   :echo has_key(environ(), 'HOME')
+--- <Note that the variable name may be CamelCase; to ignore case
+--- use this: >
+---   :echo index(keys(environ()), 'HOME', 0, 1) != -1
+---
+--- @return any
+function vim.fn.environ() end
+
+--- Escape the characters in {chars} that occur in {string} with a
+--- backslash.  Example: >
+---   :echo escape('c:\program files\vim', ' \')
+--- <results in: >
+---   c:\\program\ files\\vim
+--- <Also see |shellescape()| and |fnameescape()|.
+---
+--- Can also be used as a |method|: >
+---   GetText()->escape(' \')
+--- <
+---           *eval()*
+--- @param string string
+--- @param chars any
+--- @return any
+function vim.fn.escape(string, chars) end
+
+--- turn the result of |string()| back into the original value.
+--- This works for Numbers, Floats, Strings, Blobs and composites
+--- of them.  Also works for |Funcref|s that refer to existing
+--- functions.
+---
+--- Can also be used as a |method|: >
+---   argv->join()->eval()
+---
+--- @param string string
+--- @return any
+function vim.fn.eval(string) end
+
+--- Returns 1 when inside an event handler.  That is that Vim got
+--- interrupted while waiting for the user to type a character,
+--- e.g., when dropping a file on Vim.  This means interactive
+--- commands cannot be used.  Otherwise zero is returned.
+---
+--- @return any
+function vim.fn.eventhandler() end
+
+--- This function checks if an executable with the name {expr}
+--- exists.  {expr} must be the name of the program without any
+--- arguments.
+--- executable() uses the value of $PATH and/or the normal
+--- searchpath for programs.    *PATHEXT*
+--- On MS-Windows the ".exe", ".bat", etc. can optionally be
+--- included.  Then the extensions in $PATHEXT are tried.  Thus if
+--- "foo.exe" does not exist, "foo.exe.bat" can be found.  If
+--- $PATHEXT is not set then ".exe;.com;.bat;.cmd" is used.  A dot
+--- by itself can be used in $PATHEXT to try using the name
+--- without an extension.  When 'shell' looks like a Unix shell,
+--- then the name is also tried without adding an extension.
+--- On MS-Windows it only checks if the file exists and is not a
+--- directory, not if it's really executable.
+--- On Windows an executable in the same directory as Vim is
+--- always found (it is added to $PATH at |startup|).
+--- The result is a Number:
+---   1  exists
+---   0  does not exist
+---   -1  not implemented on this system
+--- |exepath()| can be used to get the full path of an executable.
+---
+--- Can also be used as a |method|: >
+---   GetCommand()->executable()
+---
+--- @param expr any
+--- @return any
+function vim.fn.executable(expr) end
+
+--- Execute {command} and capture its output.
+--- If {command} is a |String|, returns {command} output.
+--- If {command} is a |List|, returns concatenated outputs.
+--- Line continuations in {command} are not recognized.
+--- Examples: >
+---   echo execute('echon "foo"')
+--- <  foo >
+---   echo execute(['echon "foo"', 'echon "bar"'])
+--- <  foobar
+---
+--- The optional {silent} argument can have these values:
+---   ""    no `:silent` used
+---   "silent"  `:silent` used
+---   "silent!"  `:silent!` used
+--- The default is "silent".  Note that with "silent!", unlike
+--- `:redir`, error messages are dropped.
+---
+--- To get a list of lines use `split()` on the result: >
+---   execute('args')->split("\n")
+---
+--- <This function is not available in the |sandbox|.
+--- Note: If nested, an outer execute() will not observe output of
+--- the inner calls.
+--- Note: Text attributes (highlights) are not captured.
+--- To execute a command in another window than the current one
+--- use `win_execute()`.
+---
+--- Can also be used as a |method|: >
+---   GetCommand()->execute()
+---
+--- @param command any
+--- @param silent? boolean
+--- @return any
+function vim.fn.execute(command, silent) end
+
+--- Returns the full path of {expr} if it is an executable and
+--- given as a (partial or full) path or is found in $PATH.
+--- Returns empty string otherwise.
+--- If {expr} starts with "./" the |current-directory| is used.
+---
+--- Can also be used as a |method|: >
+---   GetCommand()->exepath()
+--- <
+---           *exists()*
+--- @param expr any
+--- @return any
+function vim.fn.exepath(expr) end
+
+--- defined, zero otherwise.
+---
+--- For checking for a supported feature use |has()|.
+--- For checking if a file exists use |filereadable()|.
+---
+--- The {expr} argument is a string, which contains one of these:
+---   varname    internal variable (see
+---   dict.key  |internal-variables|).  Also works
+---   list[i]    for |curly-braces-names|, |Dictionary|
+---       entries, |List| items, etc.
+---       Beware that evaluating an index may
+---       cause an error message for an invalid
+---       expression.  E.g.: >
+---          :let l = [1, 2, 3]
+---          :echo exists("l[5]")
+--- <         0 >
+---          :echo exists("l[xx]")
+--- <         E121: Undefined variable: xx
+---          0
+---   &option-name  Vim option (only checks if it exists,
+---       not if it really works)
+---   +option-name  Vim option that works.
+---   $ENVNAME  environment variable (could also be
+---       done by comparing with an empty
+---       string)
+---   `*funcname`  built-in function (see |functions|)
+---       or user defined function (see
+---       |user-function|). Also works for a
+---       variable that is a Funcref.
+---   :cmdname  Ex command: built-in command, user
+---       command or command modifier |:command|.
+---       Returns:
+---       1  for match with start of a command
+---       2  full match with a command
+---       3  matches several user commands
+---       To check for a supported command
+---       always check the return value to be 2.
+---   :2match    The |:2match| command.
+---   :3match    The |:3match| command (but you
+---       probably should not use it, it is
+---       reserved for internal usage)
+---   #event    autocommand defined for this event
+---   #event#pattern  autocommand defined for this event and
+---       pattern (the pattern is taken
+---       literally and compared to the
+---       autocommand patterns character by
+---       character)
+---   #group    autocommand group exists
+---   #group#event  autocommand defined for this group and
+---       event.
+---   #group#event#pattern
+---       autocommand defined for this group,
+---       event and pattern.
+---   ##event    autocommand for this event is
+---       supported.
+---
+--- Examples: >
+---   exists("&mouse")
+---   exists("$HOSTNAME")
+---   exists("*strftime")
+---   exists("*s:MyFunc")
+---   exists("*MyFunc")
+---   exists("bufcount")
+---   exists(":Make")
+---   exists("#CursorHold")
+---   exists("#BufReadPre#*.gz")
+---   exists("#filetypeindent")
+---   exists("#filetypeindent#FileType")
+---   exists("#filetypeindent#FileType#*")
+---   exists("##ColorScheme")
+--- <There must be no space between the symbol (&/$/*/#) and the
+--- name.
+--- There must be no extra characters after the name, although in
+--- a few cases this is ignored.  That may become stricter in the
+--- future, thus don't count on it!
+--- Working example: >
+---   exists(":make")
+--- <NOT working example: >
+---   exists(":make install")
+---
+--- <Note that the argument must be a string, not the name of the
+--- variable itself.  For example: >
+---   exists(bufcount)
+--- <This doesn't check for existence of the "bufcount" variable,
+--- but gets the value of "bufcount", and checks if that exists.
+---
+--- Can also be used as a |method|: >
+---   Varname()->exists()
+---
+--- @param expr any
+--- @return 0|1
+function vim.fn.exists(expr) end
+
+--- Return the exponential of {expr} as a |Float| in the range
+--- [0, inf].
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo exp(2)
+--- <  7.389056 >
+---   :echo exp(-1)
+--- <  0.367879
+---
+--- Can also be used as a |method|: >
+---   Compute()->exp()
+---
+--- @param expr any
+--- @return any
+function vim.fn.exp(expr) end
+
+--- Expand wildcards and the following special keywords in
+--- {string}.  'wildignorecase' applies.
+---
+--- If {list} is given and it is |TRUE|, a List will be returned.
+--- Otherwise the result is a String and when there are several
+--- matches, they are separated by <NL> characters.
+---
+--- If the expansion fails, the result is an empty string.  A name
+--- for a non-existing file is not included, unless {string} does
+--- not start with '%', '#' or '<', see below.
+---
+--- When {string} starts with '%', '#' or '<', the expansion is
+--- done like for the |cmdline-special| variables with their
+--- associated modifiers.  Here is a short overview:
+---
+---   %    current file name
+---   #    alternate file name
+---   #n    alternate file name n
+---   <cfile>    file name under the cursor
+---   <afile>    autocmd file name
+---   <abuf>    autocmd buffer number (as a String!)
+---   <amatch>  autocmd matched name
+---   <cexpr>    C expression under the cursor
+---   <sfile>    sourced script file or function name
+---   <slnum>    sourced script line number or function
+---       line number
+---   <sflnum>  script file line number, also when in
+---       a function
+---   <SID>    "<SNR>123_"  where "123" is the
+---       current script ID  |<SID>|
+---   <script>  sourced script file, or script file
+---       where the current function was defined
+---   <stack>    call stack
+---   <cword>    word under the cursor
+---   <cWORD>    WORD under the cursor
+---   <client>  the {clientid} of the last received
+---       message
+--- Modifiers:
+---   :p    expand to full path
+---   :h    head (last path component removed)
+---   :t    tail (last path component only)
+---   :r    root (one extension removed)
+---   :e    extension only
+---
+--- Example: >
+---   :let &tags = expand("%:p:h") .. "/tags"
+--- <Note that when expanding a string that starts with '%', '#' or
+--- '<', any following text is ignored.  This does NOT work: >
+---   :let doesntwork = expand("%:h.bak")
+--- <Use this: >
+---   :let doeswork = expand("%:h") .. ".bak"
+--- <Also note that expanding "<cfile>" and others only returns the
+--- referenced file name without further expansion.  If "<cfile>"
+--- is "~/.cshrc", you need to do another expand() to have the
+--- "~/" expanded into the path of the home directory: >
+---   :echo expand(expand("<cfile>"))
+--- <
+--- There cannot be white space between the variables and the
+--- following modifier.  The |fnamemodify()| function can be used
+--- to modify normal file names.
+---
+--- When using '%' or '#', and the current or alternate file name
+--- is not defined, an empty string is used.  Using "%:p" in a
+--- buffer with no name, results in the current directory, with a
+--- '/' added.
+--- When 'verbose' is set then expanding '%', '#' and <> items
+--- will result in an error message if the argument cannot be
+--- expanded.
+---
+--- When {string} does not start with '%', '#' or '<', it is
+--- expanded like a file name is expanded on the command line.
+--- 'suffixes' and 'wildignore' are used, unless the optional
+--- {nosuf} argument is given and it is |TRUE|.
+--- Names for non-existing files are included.  The "**" item can
+--- be used to search in a directory tree.  For example, to find
+--- all "README" files in the current directory and below: >
+---   :echo expand("**/README")
+--- <
+--- expand() can also be used to expand variables and environment
+--- variables that are only known in a shell.  But this can be
+--- slow, because a shell may be used to do the expansion.  See
+--- |expr-env-expand|.
+--- The expanded variable is still handled like a list of file
+--- names.  When an environment variable cannot be expanded, it is
+--- left unchanged.  Thus ":echo expand('$FOOBAR')" results in
+--- "$FOOBAR".
+---
+--- See |glob()| for finding existing files.  See |system()| for
+--- getting the raw output of an external command.
+---
+--- Can also be used as a |method|: >
+---   Getpattern()->expand()
+---
+--- @param string string
+--- @param nosuf? boolean
+--- @param list? any
+--- @return string|string[]
+function vim.fn.expand(string, nosuf, list) end
+
+--- Expand special items in String {string} like what is done for
+--- an Ex command such as `:edit`.  This expands special keywords,
+--- like with |expand()|, and environment variables, anywhere in
+--- {string}.  "~user" and "~/path" are only expanded at the
+--- start.
+---
+--- The following items are supported in the {options} Dict
+--- argument:
+---     errmsg  If set to TRUE, error messages are displayed
+---     if an error is encountered during expansion.
+---     By default, error messages are not displayed.
+---
+--- Returns the expanded string.  If an error is encountered
+--- during expansion, the unmodified {string} is returned.
+---
+--- Example: >
+---   :echo expandcmd('make %<.o')
+---   make /path/runtime/doc/builtin.o
+---   :echo expandcmd('make %<.o', {'errmsg': v:true})
+--- <
+--- Can also be used as a |method|: >
+---   GetCommand()->expandcmd()
+--- <
+--- @param string string
+--- @param options? table
+--- @return any
+function vim.fn.expandcmd(string, options) end
+
+--- {expr1} and {expr2} must be both |Lists| or both
+--- |Dictionaries|.
+---
+--- If they are |Lists|: Append {expr2} to {expr1}.
+--- If {expr3} is given insert the items of {expr2} before the
+--- item with index {expr3} in {expr1}.  When {expr3} is zero
+--- insert before the first item.  When {expr3} is equal to
+--- len({expr1}) then {expr2} is appended.
+--- Examples: >
+---   :echo sort(extend(mylist, [7, 5]))
+---   :call extend(mylist, [2, 3], 1)
+--- <When {expr1} is the same List as {expr2} then the number of
+--- items copied is equal to the original length of the List.
+--- E.g., when {expr3} is 1 you get N new copies of the first item
+--- (where N is the original length of the List).
+--- Use |add()| to concatenate one item to a list.  To concatenate
+--- two lists into a new list use the + operator: >
+---   :let newlist = [1, 2, 3] + [4, 5]
+--- <
+--- If they are |Dictionaries|:
+--- Add all entries from {expr2} to {expr1}.
+--- If a key exists in both {expr1} and {expr2} then {expr3} is
+--- used to decide what to do:
+--- {expr3} = "keep": keep the value of {expr1}
+--- {expr3} = "force": use the value of {expr2}
+--- {expr3} = "error": give an error message    *E737*
+--- When {expr3} is omitted then "force" is assumed.
+---
+--- {expr1} is changed when {expr2} is not empty.  If necessary
+--- make a copy of {expr1} first.
+--- {expr2} remains unchanged.
+--- When {expr1} is locked and {expr2} is not empty the operation
+--- fails.
+--- Returns {expr1}.  Returns 0 on error.
+---
+--- Can also be used as a |method|: >
+---   mylist->extend(otherlist)
+---
+---
+--- @param expr1 any
+--- @param expr2 any
+--- @param expr3? any
+--- @return any
+function vim.fn.extend(expr1, expr2, expr3) end
+
+--- Like |extend()| but instead of adding items to {expr1} a new
+--- List or Dictionary is created and returned.  {expr1} remains
+--- unchanged.
+---
+---
+--- @param expr1 any
+--- @param expr2 any
+--- @param expr3? any
+--- @return any
+function vim.fn.extendnew(expr1, expr2, expr3) end
+
+--- Characters in {string} are queued for processing as if they
+--- come from a mapping or were typed by the user.
+---
+--- By default the string is added to the end of the typeahead
+--- buffer, thus if a mapping is still being executed the
+--- characters come after them.  Use the 'i' flag to insert before
+--- other characters, they will be executed next, before any
+--- characters from a mapping.
+---
+--- The function does not wait for processing of keys contained in
+--- {string}.
+---
+--- To include special keys into {string}, use double-quotes
+--- and "\..." notation |expr-quote|. For example,
+--- feedkeys("\<CR>") simulates pressing of the <Enter> key. But
+--- feedkeys('\<CR>') pushes 5 characters.
+--- The |<Ignore>| keycode may be used to exit the
+--- wait-for-character without doing anything.
+---
+--- {mode} is a String, which can contain these character flags:
+--- 'm'  Remap keys. This is default.  If {mode} is absent,
+---   keys are remapped.
+--- 'n'  Do not remap keys.
+--- 't'  Handle keys as if typed; otherwise they are handled as
+---   if coming from a mapping.  This matters for undo,
+---   opening folds, etc.
+--- 'i'  Insert the string instead of appending (see above).
+--- 'x'  Execute commands until typeahead is empty.  This is
+---   similar to using ":normal!".  You can call feedkeys()
+---   several times without 'x' and then one time with 'x'
+---   (possibly with an empty {string}) to execute all the
+---   typeahead.  Note that when Vim ends in Insert mode it
+---   will behave as if <Esc> is typed, to avoid getting
+---   stuck, waiting for a character to be typed before the
+---   script continues.
+---   Note that if you manage to call feedkeys() while
+---   executing commands, thus calling it recursively, then
+---   all typeahead will be consumed by the last call.
+--- '!'  When used with 'x' will not end Insert mode. Can be
+---   used in a test when a timer is set to exit Insert mode
+---   a little later.  Useful for testing CursorHoldI.
+---
+--- Return value is always 0.
+---
+--- Can also be used as a |method|: >
+---   GetInput()->feedkeys()
+---
+--- @param string string
+--- @param mode? string
+--- @return any
+function vim.fn.feedkeys(string, mode) end
+
+--- @deprecated
+--- Obsolete name for |filereadable()|.
+function vim.fn.file_readable(...) end
+
+--- The result is a Number, which is |TRUE| when a file with the
+--- name {file} exists, and can be read.  If {file} doesn't exist,
+--- or is a directory, the result is |FALSE|.  {file} is any
+--- expression, which is used as a String.
+--- If you don't care about the file being readable you can use
+--- |glob()|.
+--- {file} is used as-is, you may want to expand wildcards first: >
+---   echo filereadable('~/.vimrc')
+---   0
+---   echo filereadable(expand('~/.vimrc'))
+---   1
+---
+--- <Can also be used as a |method|: >
+---   GetName()->filereadable()
+---
+--- @param file string
+--- @return 0|1
+function vim.fn.filereadable(file) end
+
+--- The result is a Number, which is 1 when a file with the
+--- name {file} exists, and can be written.  If {file} doesn't
+--- exist, or is not writable, the result is 0.  If {file} is a
+--- directory, and we can write to it, the result is 2.
+---
+--- Can also be used as a |method|: >
+---   GetName()->filewritable()
+---
+--- @param file string
+--- @return 0|1
+function vim.fn.filewritable(file) end
+
+--- {expr1} must be a |List|, |Blob|, or a |Dictionary|.
+--- For each item in {expr1} evaluate {expr2} and when the result
+--- is zero remove the item from the |List| or |Dictionary|. For a
+--- |Blob| each byte is removed.
+---
+--- {expr2} must be a |string| or |Funcref|.
+---
+--- If {expr2} is a |string|, inside {expr2} |v:val| has the value
+--- of the current item.  For a |Dictionary| |v:key| has the key
+--- of the current item and for a |List| |v:key| has the index of
+--- the current item.  For a |Blob| |v:key| has the index of the
+--- current byte.
+---
+--- Examples: >
+---   call filter(mylist, 'v:val !~ "OLD"')
+--- <Removes the items where "OLD" appears. >
+---   call filter(mydict, 'v:key >= 8')
+--- <Removes the items with a key below 8. >
+---   call filter(var, 0)
+--- <Removes all the items, thus clears the |List| or |Dictionary|.
+---
+--- Note that {expr2} is the result of expression and is then
+--- used as an expression again.  Often it is good to use a
+--- |literal-string| to avoid having to double backslashes.
+---
+--- If {expr2} is a |Funcref| it must take two arguments:
+---   1. the key or the index of the current item.
+---   2. the value of the current item.
+--- The function must return |TRUE| if the item should be kept.
+--- Example that keeps the odd items of a list: >
+---   func Odd(idx, val)
+---     return a:idx % 2 == 1
+---   endfunc
+---   call filter(mylist, function('Odd'))
+--- <It is shorter when using a |lambda|: >
+---   call filter(myList, {idx, val -> idx * val <= 42})
+--- <If you do not use "val" you can leave it out: >
+---   call filter(myList, {idx -> idx % 2 == 1})
+--- <
+--- The operation is done in-place.  If you want a |List| or
+--- |Dictionary| to remain unmodified make a copy first: >
+---   :let l = filter(copy(mylist), 'v:val =~ "KEEP"')
+---
+--- <Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
+--- filtered.  When an error is encountered while evaluating
+--- {expr2} no further items in {expr1} are processed.  When
+--- {expr2} is a Funcref errors inside a function are ignored,
+--- unless it was defined with the "abort" flag.
+---
+--- Can also be used as a |method|: >
+---   mylist->filter(expr2)
+---
+--- @param expr1 any
+--- @param expr2 any
+--- @return any
+function vim.fn.filter(expr1, expr2) end
+
+--- Find directory {name} in {path}.  Supports both downwards and
+--- upwards recursive directory searches.  See |file-searching|
+--- for the syntax of {path}.
+---
+--- Returns the path of the first found match.  When the found
+--- directory is below the current directory a relative path is
+--- returned.  Otherwise a full path is returned.
+--- If {path} is omitted or empty then 'path' is used.
+---
+--- If the optional {count} is given, find {count}'s occurrence of
+--- {name} in {path} instead of the first one.
+--- When {count} is negative return all the matches in a |List|.
+---
+--- Returns an empty string if the directory is not found.
+---
+--- This is quite similar to the ex-command `:find`.
+---
+--- Can also be used as a |method|: >
+---   GetName()->finddir()
+---
+--- @param name string
+--- @param path? string
+--- @param count? any
+--- @return any
+function vim.fn.finddir(name, path, count) end
+
+--- Just like |finddir()|, but find a file instead of a directory.
+--- Uses 'suffixesadd'.
+--- Example: >
+---   :echo findfile("tags.vim", ".;")
+--- <Searches from the directory of the current file upwards until
+--- it finds the file "tags.vim".
+---
+--- Can also be used as a |method|: >
+---   GetName()->findfile()
+---
+--- @param name string
+--- @param path? string
+--- @param count? any
+--- @return any
+function vim.fn.findfile(name, path, count) end
+
+--- Flatten {list} up to {maxdepth} levels.  Without {maxdepth}
+--- the result is a |List| without nesting, as if {maxdepth} is
+--- a very large number.
+--- The {list} is changed in place, use |flattennew()| if you do
+--- not want that.
+---             *E900*
+--- {maxdepth} means how deep in nested lists changes are made.
+--- {list} is not modified when {maxdepth} is 0.
+--- {maxdepth} must be positive number.
+---
+--- If there is an error the number zero is returned.
+---
+--- Example: >
+---   :echo flatten([1, [2, [3, 4]], 5])
+--- <  [1, 2, 3, 4, 5] >
+---   :echo flatten([1, [2, [3, 4]], 5], 1)
+--- <  [1, 2, [3, 4], 5]
+---
+--- Can also be used as a |method|: >
+---   mylist->flatten()
+--- <
+--- @param list any
+--- @param maxdepth? any
+--- @return any[]|0
+function vim.fn.flatten(list, maxdepth) end
+
+--- Like |flatten()| but first make a copy of {list}.
+---
+---
+--- @param list any
+--- @param maxdepth? any
+--- @return any[]|0
+function vim.fn.flattennew(list, maxdepth) end
+
+--- Convert {expr} to a Number by omitting the part after the
+--- decimal point.
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0 if {expr} is not a |Float| or a |Number|.
+--- When the value of {expr} is out of range for a |Number| the
+--- result is truncated to 0x7fffffff or -0x7fffffff (or when
+--- 64-bit Number support is enabled, 0x7fffffffffffffff or
+--- -0x7fffffffffffffff).  NaN results in -0x80000000 (or when
+--- 64-bit Number support is enabled, -0x8000000000000000).
+--- Examples: >
+---   echo float2nr(3.95)
+--- <  3  >
+---   echo float2nr(-23.45)
+--- <  -23  >
+---   echo float2nr(1.0e100)
+--- <  2147483647  (or 9223372036854775807) >
+---   echo float2nr(-1.0e150)
+--- <  -2147483647 (or -9223372036854775807) >
+---   echo float2nr(1.0e-100)
+--- <  0
+---
+--- Can also be used as a |method|: >
+---   Compute()->float2nr()
+---
+--- @param expr any
+--- @return any
+function vim.fn.float2nr(expr) end
+
+--- Return the largest integral value less than or equal to
+--- {expr} as a |Float| (round down).
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   echo floor(1.856)
+--- <  1.0  >
+---   echo floor(-5.456)
+--- <  -6.0  >
+---   echo floor(4.0)
+--- <  4.0
+---
+--- Can also be used as a |method|: >
+---   Compute()->floor()
+---
+--- @param expr any
+--- @return any
+function vim.fn.floor(expr) end
+
+--- Return the remainder of {expr1} / {expr2}, even if the
+--- division is not representable.  Returns {expr1} - i * {expr2}
+--- for some integer i such that if {expr2} is non-zero, the
+--- result has the same sign as {expr1} and magnitude less than
+--- the magnitude of {expr2}.  If {expr2} is zero, the value
+--- returned is zero.  The value returned is a |Float|.
+--- {expr1} and {expr2} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
+--- |Number|.
+--- Examples: >
+---   :echo fmod(12.33, 1.22)
+--- <  0.13 >
+---   :echo fmod(-12.33, 1.22)
+--- <  -0.13
+---
+--- Can also be used as a |method|: >
+---   Compute()->fmod(1.22)
+---
+--- @param expr1 any
+--- @param expr2 any
+--- @return any
+function vim.fn.fmod(expr1, expr2) end
+
+--- Escape {string} for use as file name command argument.  All
+--- characters that have a special meaning, such as '%' and '|'
+--- are escaped with a backslash.
+--- For most systems the characters escaped are
+--- " \t\n*?[{`$\\%#'\"|!<".  For systems where a backslash
+--- appears in a filename, it depends on the value of 'isfname'.
+--- A leading '+' and '>' is also escaped (special after |:edit|
+--- and |:write|).  And a "-" by itself (special after |:cd|).
+--- Returns an empty string on error.
+--- Example: >
+---   :let fname = '+some str%nge|name'
+---   :exe "edit " .. fnameescape(fname)
+--- <results in executing: >
+---   edit \+some\ str\%nge\|name
+--- <
+--- Can also be used as a |method|: >
+---   GetName()->fnameescape()
+---
+--- @param string string
+--- @return string
+function vim.fn.fnameescape(string) end
+
+--- Modify file name {fname} according to {mods}.  {mods} is a
+--- string of characters like it is used for file names on the
+--- command line.  See |filename-modifiers|.
+--- Example: >
+---   :echo fnamemodify("main.c", ":p:h")
+--- <results in: >
+---   /home/user/vim/vim/src
+--- <If {mods} is empty or an unsupported modifier is used then
+--- {fname} is returned.
+--- When {fname} is empty then with {mods} ":h" returns ".", so
+--- that `:cd` can be used with it.  This is different from
+--- expand('%:h') without a buffer name, which returns an empty
+--- string.
+--- Note: Environment variables don't work in {fname}, use
+--- |expand()| first then.
+---
+--- Can also be used as a |method|: >
+---   GetName()->fnamemodify(':p:h')
+---
+--- @param fname integer
+--- @param mods string
+--- @return string
+function vim.fn.fnamemodify(fname, mods) end
+
+--- The result is a Number.  If the line {lnum} is in a closed
+--- fold, the result is the number of the first line in that fold.
+--- If the line {lnum} is not in a closed fold, -1 is returned.
+--- {lnum} is used like with |getline()|.  Thus "." is the current
+--- line, "'m" mark m, etc.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->foldclosed()
+---
+--- @param lnum integer
+--- @return integer
+function vim.fn.foldclosed(lnum) end
+
+--- The result is a Number.  If the line {lnum} is in a closed
+--- fold, the result is the number of the last line in that fold.
+--- If the line {lnum} is not in a closed fold, -1 is returned.
+--- {lnum} is used like with |getline()|.  Thus "." is the current
+--- line, "'m" mark m, etc.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->foldclosedend()
+---
+--- @param lnum integer
+--- @return integer
+function vim.fn.foldclosedend(lnum) end
+
+--- The result is a Number, which is the foldlevel of line {lnum}
+--- in the current buffer.  For nested folds the deepest level is
+--- returned.  If there is no fold at line {lnum}, zero is
+--- returned.  It doesn't matter if the folds are open or closed.
+--- When used while updating folds (from 'foldexpr') -1 is
+--- returned for lines where folds are still to be updated and the
+--- foldlevel is unknown.  As a special case the level of the
+--- previous line is usually available.
+--- {lnum} is used like with |getline()|.  Thus "." is the current
+--- line, "'m" mark m, etc.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->foldlevel()
+--- <
+---           *foldtext()*
+--- @param lnum integer
+--- @return integer
+function vim.fn.foldlevel(lnum) end
+
+--- the default function used for the 'foldtext' option and should
+--- only be called from evaluating 'foldtext'.  It uses the
+--- |v:foldstart|, |v:foldend| and |v:folddashes| variables.
+--- The returned string looks like this: >
+---   +-- 45 lines: abcdef
+--- <The number of leading dashes depends on the foldlevel.  The
+--- "45" is the number of lines in the fold.  "abcdef" is the text
+--- in the first non-blank line of the fold.  Leading white space,
+--- "//" or "/*" and the text from the 'foldmarker' and
+--- 'commentstring' options is removed.
+--- When used to draw the actual foldtext, the rest of the line
+--- will be filled with the fold char from the 'fillchars'
+--- setting.
+--- Returns an empty string when there is no fold.
+---
+--- @return string
+function vim.fn.foldtext() end
+
+--- Returns the text that is displayed for the closed fold at line
+--- {lnum}.  Evaluates 'foldtext' in the appropriate context.
+--- When there is no closed fold at {lnum} an empty string is
+--- returned.
+--- {lnum} is used like with |getline()|.  Thus "." is the current
+--- line, "'m" mark m, etc.
+--- Useful when exporting folded text, e.g., to HTML.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->foldtextresult()
+--- <
+--- @param lnum integer
+--- @return string
+function vim.fn.foldtextresult(lnum) end
+
+--- Get the full command name from a short abbreviated command
+--- name; see |20.2| for details on command abbreviations.
+---
+--- The string argument {name} may start with a `:` and can
+--- include a [range], these are skipped and not returned.
+--- Returns an empty string if a command doesn't exist or if it's
+--- ambiguous (for user-defined commands).
+---
+--- For example `fullcommand('s')`, `fullcommand('sub')`,
+--- `fullcommand(':%substitute')` all return "substitute".
+---
+--- Can also be used as a |method|: >
+---   GetName()->fullcommand()
+--- <
+---         *funcref()*
+--- @param name string
+--- @return string
+function vim.fn.fullcommand(name) end
+
+--- Just like |function()|, but the returned Funcref will lookup
+--- the function by reference, not by name.  This matters when the
+--- function {name} is redefined later.
+---
+--- Unlike |function()|, {name} must be an existing user function.
+--- It only works for an autoloaded function if it has already
+--- been loaded (to avoid mistakenly loading the autoload script
+--- when only intending to use the function name, use |function()|
+--- instead). {name} cannot be a builtin function.
+--- Returns 0 on error.
+---
+--- Can also be used as a |method|: >
+---   GetFuncname()->funcref([arg])
+--- <
+---     *function()* *partial* *E700* *E923*
+--- @param name string
+--- @param arglist? any
+--- @param dict? any
+--- @return any
+function vim.fn.funcref(name, arglist, dict) end
+
+--- Return a |Funcref| variable that refers to function {name}.
+--- {name} can be the name of a user defined function or an
+--- internal function.
+---
+--- {name} can also be a Funcref or a partial. When it is a
+--- partial the dict stored in it will be used and the {dict}
+--- argument is not allowed. E.g.: >
+---   let FuncWithArg = function(dict.Func, [arg])
+---   let Broken = function(dict.Func, [arg], dict)
+--- <
+--- When using the Funcref the function will be found by {name},
+--- also when it was redefined later. Use |funcref()| to keep the
+--- same function.
+---
+--- When {arglist} or {dict} is present this creates a partial.
+--- That means the argument list and/or the dictionary is stored in
+--- the Funcref and will be used when the Funcref is called.
+---
+--- The arguments are passed to the function in front of other
+--- arguments, but after any argument from |method|.  Example: >
+---   func Callback(arg1, arg2, name)
+---   "...
+---   let Partial = function('Callback', ['one', 'two'])
+---   "...
+---   call Partial('name')
+--- <Invokes the function as with: >
+---   call Callback('one', 'two', 'name')
+---
+--- <With a |method|: >
+---   func Callback(one, two, three)
+---   "...
+---   let Partial = function('Callback', ['two'])
+---   "...
+---   eval 'one'->Partial('three')
+--- <Invokes the function as with: >
+---   call Callback('one', 'two', 'three')
+---
+--- <The function() call can be nested to add more arguments to the
+--- Funcref.  The extra arguments are appended to the list of
+--- arguments.  Example: >
+---   func Callback(arg1, arg2, name)
+---   "...
+---   let Func = function('Callback', ['one'])
+---   let Func2 = function(Func, ['two'])
+---   "...
+---   call Func2('name')
+--- <Invokes the function as with: >
+---   call Callback('one', 'two', 'name')
+---
+--- <The Dictionary is only useful when calling a "dict" function.
+--- In that case the {dict} is passed in as "self". Example: >
+---   function Callback() dict
+---      echo "called for " .. self.name
+---   endfunction
+---   "...
+---   let context = {"name": "example"}
+---   let Func = function('Callback', context)
+---   "...
+---   call Func()  " will echo: called for example
+--- <The use of function() is not needed when there are no extra
+--- arguments, these two are equivalent, if Callback() is defined
+--- as context.Callback(): >
+---   let Func = function('Callback', context)
+---   let Func = context.Callback
+---
+--- <The argument list and the Dictionary can be combined: >
+---   function Callback(arg1, count) dict
+---   "...
+---   let context = {"name": "example"}
+---   let Func = function('Callback', ['one'], context)
+---   "...
+---   call Func(500)
+--- <Invokes the function as with: >
+---   call context.Callback('one', 500)
+--- <
+--- Returns 0 on error.
+---
+--- Can also be used as a |method|: >
+---   GetFuncname()->function([arg])
+---
+--- @param name string
+--- @param arglist? any
+--- @param dict? any
+--- @return any
+vim.fn['function'] = function(name, arglist, dict) end
+
+--- Cleanup unused |Lists| and |Dictionaries| that have circular
+--- references.
+---
+--- There is hardly ever a need to invoke this function, as it is
+--- automatically done when Vim runs out of memory or is waiting
+--- for the user to press a key after 'updatetime'.  Items without
+--- circular references are always freed when they become unused.
+--- This is useful if you have deleted a very big |List| and/or
+--- |Dictionary| with circular references in a script that runs
+--- for a long time.
+---
+--- When the optional {atexit} argument is one, garbage
+--- collection will also be done when exiting Vim, if it wasn't
+--- done before.  This is useful when checking for memory leaks.
+---
+--- The garbage collection is not done immediately but only when
+--- it's safe to perform.  This is when waiting for the user to
+--- type a character.
+---
+--- @param atexit? any
+--- @return any
+function vim.fn.garbagecollect(atexit) end
+
+--- Get item {what} from Funcref {func}.  Possible values for
+--- {what} are:
+---   "name"  The function name
+---   "func"  The function
+---   "dict"  The dictionary
+---   "args"  The list with arguments
+--- Returns zero on error.
+---
+---           *getbufinfo()*
+--- @param func any
+--- @param what any
+--- @return any
+function vim.fn.get(func, what) end
+
+--- Get information about buffers as a List of Dictionaries.
+---
+--- Without an argument information about all the buffers is
+--- returned.
+---
+--- When the argument is a |Dictionary| only the buffers matching
+--- the specified criteria are returned.  The following keys can
+--- be specified in {dict}:
+---   buflisted  include only listed buffers.
+---   bufloaded  include only loaded buffers.
+---   bufmodified  include only modified buffers.
+---
+--- Otherwise, {buf} specifies a particular buffer to return
+--- information for.  For the use of {buf}, see |bufname()|
+--- above.  If the buffer is found the returned List has one item.
+--- Otherwise the result is an empty list.
+---
+--- Each returned List item is a dictionary with the following
+--- entries:
+---   bufnr    Buffer number.
+---   changed    TRUE if the buffer is modified.
+---   changedtick  Number of changes made to the buffer.
+---   hidden    TRUE if the buffer is hidden.
+---   lastused  Timestamp in seconds, like
+---       |localtime()|, when the buffer was
+---       last used.
+---   listed    TRUE if the buffer is listed.
+---   lnum    Line number used for the buffer when
+---       opened in the current window.
+---       Only valid if the buffer has been
+---       displayed in the window in the past.
+---       If you want the line number of the
+---       last known cursor position in a given
+---       window, use |line()|: >
+---         :echo line('.', {winid})
+--- <
+---   linecount  Number of lines in the buffer (only
+---       valid when loaded)
+---   loaded    TRUE if the buffer is loaded.
+---   name    Full path to the file in the buffer.
+---   signs    List of signs placed in the buffer.
+---       Each list item is a dictionary with
+---       the following fields:
+---           id    sign identifier
+---           lnum  line number
+---           name  sign name
+---   variables  A reference to the dictionary with
+---       buffer-local variables.
+---   windows    List of |window-ID|s that display this
+---       buffer
+---
+--- Examples: >
+---   for buf in getbufinfo()
+---       echo buf.name
+---   endfor
+---   for buf in getbufinfo({'buflisted':1})
+---       if buf.changed
+---     ....
+---       endif
+---   endfor
+--- <
+--- To get buffer-local options use: >
+---   getbufvar({bufnr}, '&option_name')
+--- <
+--- Can also be used as a |method|: >
+---   GetBufnr()->getbufinfo()
+--- <
+---
+---           *getbufline()*
+--- @param dict? any
+--- @return any
+function vim.fn.getbufinfo(dict) end
+
+--- Return a |List| with the lines starting from {lnum} to {end}
+--- (inclusive) in the buffer {buf}.  If {end} is omitted, a
+--- |List| with only the line {lnum} is returned.  See
+--- `getbufoneline()` for only getting the line.
+---
+--- For the use of {buf}, see |bufname()| above.
+---
+--- For {lnum} and {end} "$" can be used for the last line of the
+--- buffer.  Otherwise a number must be used.
+---
+--- When {lnum} is smaller than 1 or bigger than the number of
+--- lines in the buffer, an empty |List| is returned.
+---
+--- When {end} is greater than the number of lines in the buffer,
+--- it is treated as {end} is set to the number of lines in the
+--- buffer.  When {end} is before {lnum} an empty |List| is
+--- returned.
+---
+--- This function works only for loaded buffers.  For unloaded and
+--- non-existing buffers, an empty |List| is returned.
+---
+--- Example: >
+---   :let lines = getbufline(bufnr("myfile"), 1, "$")
+---
+--- <Can also be used as a |method|: >
+---   GetBufnr()->getbufline(lnum)
+--- <
+---           *getbufoneline()*
+--- @param buf any
+--- @param lnum integer
+--- @param end_? any
+--- @return any
+function vim.fn.getbufline(buf, lnum, end_) end
+
+--- Just like `getbufline()` but only get one line and return it
+--- as a string.
+---
+--- @param buf any
+--- @param lnum integer
+--- @return any
+function vim.fn.getbufoneline(buf, lnum) end
+
+--- The result is the value of option or local buffer variable
+--- {varname} in buffer {buf}.  Note that the name without "b:"
+--- must be used.
+--- The {varname} argument is a string.
+--- When {varname} is empty returns a |Dictionary| with all the
+--- buffer-local variables.
+--- When {varname} is equal to "&" returns a |Dictionary| with all
+--- the buffer-local options.
+--- Otherwise, when {varname} starts with "&" returns the value of
+--- a buffer-local option.
+--- This also works for a global or buffer-local option, but it
+--- doesn't work for a global variable, window-local variable or
+--- window-local option.
+--- For the use of {buf}, see |bufname()| above.
+--- When the buffer or variable doesn't exist {def} or an empty
+--- string is returned, there is no error message.
+--- Examples: >
+---   :let bufmodified = getbufvar(1, "&mod")
+---   :echo "todo myvar = " .. getbufvar("todo", "myvar")
+---
+--- <Can also be used as a |method|: >
+---   GetBufnr()->getbufvar(varname)
+--- <
+--- @param buf any
+--- @param varname string
+--- @param def? any
+--- @return any
+function vim.fn.getbufvar(buf, varname, def) end
+
+--- Returns a |List| of cell widths of character ranges overridden
+--- by |setcellwidths()|.  The format is equal to the argument of
+--- |setcellwidths()|.  If no character ranges have their cell
+--- widths overridden, an empty List is returned.
+---
+---
+--- @return any
+function vim.fn.getcellwidths() end
+
+--- Returns the |changelist| for the buffer {buf}. For the use
+--- of {buf}, see |bufname()| above. If buffer {buf} doesn't
+--- exist, an empty list is returned.
+---
+--- The returned list contains two entries: a list with the change
+--- locations and the current position in the list.  Each
+--- entry in the change list is a dictionary with the following
+--- entries:
+---   col    column number
+---   coladd    column offset for 'virtualedit'
+---   lnum    line number
+--- If buffer {buf} is the current buffer, then the current
+--- position refers to the position in the list. For other
+--- buffers, it is set to the length of the list.
+---
+--- Can also be used as a |method|: >
+---   GetBufnr()->getchangelist()
+---
+--- @param buf? any
+--- @return any
+function vim.fn.getchangelist(buf) end
+
+--- Get a single character from the user or input stream.
+--- If [expr] is omitted, wait until a character is available.
+--- If [expr] is 0, only get a character when one is available.
+---   Return zero otherwise.
+--- If [expr] is 1, only check if a character is available, it is
+---   not consumed.  Return zero if no character available.
+--- If you prefer always getting a string use |getcharstr()|.
+---
+--- Without [expr] and when [expr] is 0 a whole character or
+--- special key is returned.  If it is a single character, the
+--- result is a Number.  Use |nr2char()| to convert it to a String.
+--- Otherwise a String is returned with the encoded character.
+--- For a special key it's a String with a sequence of bytes
+--- starting with 0x80 (decimal: 128).  This is the same value as
+--- the String "\<Key>", e.g., "\<Left>".  The returned value is
+--- also a String when a modifier (shift, control, alt) was used
+--- that is not included in the character.
+---
+--- When [expr] is 0 and Esc is typed, there will be a short delay
+--- while Vim waits to see if this is the start of an escape
+--- sequence.
+---
+--- When [expr] is 1 only the first byte is returned.  For a
+--- one-byte character it is the character itself as a number.
+--- Use nr2char() to convert it to a String.
+---
+--- Use getcharmod() to obtain any additional modifiers.
+---
+--- When the user clicks a mouse button, the mouse event will be
+--- returned.  The position can then be found in |v:mouse_col|,
+--- |v:mouse_lnum|, |v:mouse_winid| and |v:mouse_win|.
+--- |getmousepos()| can also be used.  Mouse move events will be
+--- ignored.
+--- This example positions the mouse as it would normally happen: >
+---   let c = getchar()
+---   if c == "\<LeftMouse>" && v:mouse_win > 0
+---     exe v:mouse_win .. "wincmd w"
+---     exe v:mouse_lnum
+---     exe "normal " .. v:mouse_col .. "|"
+---   endif
+--- <
+--- There is no prompt, you will somehow have to make clear to the
+--- user that a character has to be typed.  The screen is not
+--- redrawn, e.g. when resizing the window.
+---
+--- There is no mapping for the character.
+--- Key codes are replaced, thus when the user presses the <Del>
+--- key you get the code for the <Del> key, not the raw character
+--- sequence.  Examples: >
+---   getchar() == "\<Del>"
+---   getchar() == "\<S-Left>"
+--- <This example redefines "f" to ignore case: >
+---   :nmap f :call FindChar()<CR>
+---   :function FindChar()
+---   :  let c = nr2char(getchar())
+---   :  while col('.') < col('$') - 1
+---   :    normal l
+---   :    if getline('.')[col('.') - 1] ==? c
+---   :      break
+---   :    endif
+---   :  endwhile
+---   :endfunction
+--- <
+--- @return integer
+function vim.fn.getchar() end
+
+--- The result is a Number which is the state of the modifiers for
+--- the last obtained character with getchar() or in another way.
+--- These values are added together:
+---   2  shift
+---   4  control
+---   8  alt (meta)
+---   16  meta (when it's different from ALT)
+---   32  mouse double click
+---   64  mouse triple click
+---   96  mouse quadruple click (== 32 + 64)
+---   128  command (Macintosh only)
+--- Only the modifiers that have not been included in the
+--- character itself are obtained.  Thus Shift-a results in "A"
+--- without a modifier.  Returns 0 if no modifiers are used.
+---
+---           *getcharpos()*
+--- @return integer
+function vim.fn.getcharmod() end
+
+--- Get the position for String {expr}. Same as |getpos()| but the
+--- column number in the returned List is a character index
+--- instead of a byte index.
+--- If |getpos()| returns a very large column number, equal to
+--- |v:maxcol|, then getcharpos() will return the character index
+--- of the last character.
+---
+--- Example:
+--- With the cursor on '세' in line 5 with text "여보세요": >
+---   getcharpos('.')    returns [0, 5, 3, 0]
+---   getpos('.')    returns [0, 5, 7, 0]
+--- <
+--- Can also be used as a |method|: >
+---   GetMark()->getcharpos()
+---
+--- @param expr any
+--- @return any
+function vim.fn.getcharpos(expr) end
+
+--- Return the current character search information as a {dict}
+--- with the following entries:
+---
+---     char  character previously used for a character
+---     search (|t|, |f|, |T|, or |F|); empty string
+---     if no character search has been performed
+---     forward  direction of character search; 1 for forward,
+---     0 for backward
+---     until  type of character search; 1 for a |t| or |T|
+---     character search, 0 for an |f| or |F|
+---     character search
+---
+--- This can be useful to always have |;| and |,| search
+--- forward/backward regardless of the direction of the previous
+--- character search: >
+---   :nnoremap <expr> ; getcharsearch().forward ? ';' : ','
+---   :nnoremap <expr> , getcharsearch().forward ? ',' : ';'
+--- <Also see |setcharsearch()|.
+---
+---
+--- @return any
+function vim.fn.getcharsearch() end
+
+--- Get a single character from the user or input stream as a
+--- string.
+--- If [expr] is omitted, wait until a character is available.
+--- If [expr] is 0 or false, only get a character when one is
+---   available.  Return an empty string otherwise.
+--- If [expr] is 1 or true, only check if a character is
+---   available, it is not consumed.  Return an empty string
+---   if no character is available.
+--- Otherwise this works like |getchar()|, except that a number
+--- result is converted to a string.
+---
+--- @return string
+function vim.fn.getcharstr() end
+
+--- Return the type of the current command-line completion.
+--- Only works when the command line is being edited, thus
+--- requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
+--- See |:command-completion| for the return string.
+--- Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
+--- |setcmdline()|.
+--- Returns an empty string when completion is not defined.
+---
+--- @return string
+function vim.fn.getcmdcompltype() end
+
+--- Return the current command-line.  Only works when the command
+--- line is being edited, thus requires use of |c_CTRL-\_e| or
+--- |c_CTRL-R_=|.
+--- Example: >
+---   :cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
+--- <Also see |getcmdtype()|, |getcmdpos()|, |setcmdpos()| and
+--- |setcmdline()|.
+--- Returns an empty string when entering a password or using
+--- |inputsecret()|.
+---
+--- @return string
+function vim.fn.getcmdline() end
+
+--- Return the position of the cursor in the command line as a
+--- byte count.  The first column is 1.
+--- Only works when editing the command line, thus requires use of
+--- |c_CTRL-\_e| or |c_CTRL-R_=| or an expression mapping.
+--- Returns 0 otherwise.
+--- Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
+--- |setcmdline()|.
+---
+--- @return any
+function vim.fn.getcmdpos() end
+
+--- Return the screen position of the cursor in the command line
+--- as a byte count.  The first column is 1.
+--- Instead of |getcmdpos()|, it adds the prompt position.
+--- Only works when editing the command line, thus requires use of
+--- |c_CTRL-\_e| or |c_CTRL-R_=| or an expression mapping.
+--- Returns 0 otherwise.
+--- Also see |getcmdpos()|, |setcmdpos()|, |getcmdline()| and
+--- |setcmdline()|.
+---
+--- @return any
+function vim.fn.getcmdscreenpos() end
+
+--- Return the current command-line type. Possible return values
+--- are:
+---     :  normal Ex command
+---     >  debug mode command |debug-mode|
+---     /  forward search command
+---     ?  backward search command
+---     \@  |input()| command
+---     `-`  |:insert| or |:append| command
+---     =  |i_CTRL-R_=|
+--- Only works when editing the command line, thus requires use of
+--- |c_CTRL-\_e| or |c_CTRL-R_=| or an expression mapping.
+--- Returns an empty string otherwise.
+--- Also see |getcmdpos()|, |setcmdpos()| and |getcmdline()|.
+---
+--- @return ':'|'>'|'/'|'?'|'@'|'-'|'='
+function vim.fn.getcmdtype() end
+
+--- Return the current |command-line-window| type. Possible return
+--- values are the same as |getcmdtype()|. Returns an empty string
+--- when not in the command-line window.
+---
+--- @return ':'|'>'|'/'|'?'|'@'|'-'|'='
+function vim.fn.getcmdwintype() end
+
+--- Return a list of command-line completion matches. The String
+--- {type} argument specifies what for.  The following completion
+--- types are supported:
+---
+--- arglist    file names in argument list
+--- augroup    autocmd groups
+--- buffer    buffer names
+--- breakpoint  |:breakadd| and |:breakdel| suboptions
+--- cmdline    |cmdline-completion| result
+--- color    color schemes
+--- command    Ex command
+--- compiler  compilers
+--- diff_buffer     |:diffget| and |:diffput| completion
+--- dir    directory names
+--- environment  environment variable names
+--- event    autocommand events
+--- expression  Vim expression
+--- file    file and directory names
+--- file_in_path  file and directory names in |'path'|
+--- filetype  filetype names |'filetype'|
+--- function  function name
+--- help    help subjects
+--- highlight  highlight groups
+--- history    |:history| suboptions
+--- locale    locale names (as output of locale -a)
+--- mapclear  buffer argument
+--- mapping    mapping name
+--- menu    menus
+--- messages  |:messages| suboptions
+--- option    options
+--- packadd    optional package |pack-add| names
+--- runtime    |:runtime| completion
+--- scriptnames  sourced script names |:scriptnames|
+--- shellcmd  Shell command
+--- sign    |:sign| suboptions
+--- syntax    syntax file names |'syntax'|
+--- syntime    |:syntime| suboptions
+--- tag    tags
+--- tag_listfiles  tags, file names
+--- user    user names
+--- var    user variables
+---
+--- If {pat} is an empty string, then all the matches are
+--- returned.  Otherwise only items matching {pat} are returned.
+--- See |wildcards| for the use of special characters in {pat}.
+---
+--- If the optional {filtered} flag is set to 1, then 'wildignore'
+--- is applied to filter the results.  Otherwise all the matches
+--- are returned. The 'wildignorecase' option always applies.
+---
+--- If the 'wildoptions' option contains "fuzzy", then fuzzy
+--- matching is used to get the completion matches. Otherwise
+--- regular expression matching is used.  Thus this function
+--- follows the user preference, what happens on the command line.
+--- If you do not want this you can make 'wildoptions' empty
+--- before calling getcompletion() and restore it afterwards.
+---
+--- If {type} is "cmdline", then the |cmdline-completion| result is
+--- returned.  For example, to complete the possible values after
+--- a ":call" command: >
+---   echo getcompletion('call ', 'cmdline')
+--- <
+--- If there are no matches, an empty list is returned.  An
+--- invalid value for {type} produces an error.
+---
+--- Can also be used as a |method|: >
+---   GetPattern()->getcompletion('color')
+--- <
+---           *getcurpos()*
+--- @param pat any
+--- @param type any
+--- @param filtered? any
+--- @return string[]
+function vim.fn.getcompletion(pat, type, filtered) end
+
+--- Get the position of the cursor.  This is like getpos('.'), but
+--- includes an extra "curswant" item in the list:
+---     [0, lnum, col, off, curswant] ~
+--- The "curswant" number is the preferred column when moving the
+--- cursor vertically.  After |$| command it will be a very large
+--- number equal to |v:maxcol|.  Also see |getcursorcharpos()| and
+--- |getpos()|.
+--- The first "bufnum" item is always zero. The byte position of
+--- the cursor is returned in "col". To get the character
+--- position, use |getcursorcharpos()|.
+---
+--- The optional {winid} argument can specify the window.  It can
+--- be the window number or the |window-ID|.  The last known
+--- cursor position is returned, this may be invalid for the
+--- current value of the buffer if it is not the current window.
+--- If {winid} is invalid a list with zeroes is returned.
+---
+--- This can be used to save and restore the cursor position: >
+---   let save_cursor = getcurpos()
+---   MoveTheCursorAround
+---   call setpos('.', save_cursor)
+--- <Note that this only works within the window.  See
+--- |winrestview()| for restoring more state.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->getcurpos()
+--- <
+---           *getcursorcharpos()*
+--- @param winid? integer
+--- @return any
+function vim.fn.getcurpos(winid) end
+
+--- Same as |getcurpos()| but the column number in the returned
+--- List is a character index instead of a byte index.
+---
+--- Example:
+--- With the cursor on '보' in line 3 with text "여보세요": >
+---   getcursorcharpos()  returns [0, 3, 2, 0, 3]
+---   getcurpos()    returns [0, 3, 4, 0, 3]
+--- <
+--- Can also be used as a |method|: >
+---   GetWinid()->getcursorcharpos()
+---
+--- @param winid? integer
+--- @return any
+function vim.fn.getcursorcharpos(winid) end
+
+--- With no arguments, returns the name of the effective
+--- |current-directory|. With {winnr} or {tabnr} the working
+--- directory of that scope is returned, and 'autochdir' is
+--- ignored.
+--- Tabs and windows are identified by their respective numbers,
+--- 0 means current tab or window. Missing tab number implies 0.
+--- Thus the following are equivalent: >
+---   getcwd(0)
+---   getcwd(0, 0)
+--- <If {winnr} is -1 it is ignored, only the tab is resolved.
+--- {winnr} can be the window number or the |window-ID|.
+--- If both {winnr} and {tabnr} are -1 the global working
+--- directory is returned.
+--- Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
+---
+--- Can also be used as a |method|: >
+---   GetWinnr()->getcwd()
+---
+--- @param winnr? integer
+--- @param tabnr? integer
+--- @return string
+function vim.fn.getcwd(winnr, tabnr) end
+
+--- Return the value of environment variable {name}.  The {name}
+--- argument is a string, without a leading '$'.  Example: >
+---   myHome = getenv('HOME')
+---
+--- <When the variable does not exist |v:null| is returned.  That
+--- is different from a variable set to an empty string.
+--- See also |expr-env|.
+---
+--- Can also be used as a |method|: >
+---   GetVarname()->getenv()
+---
+--- @param name string
+--- @return string
+function vim.fn.getenv(name) end
+
+--- Without an argument returns the name of the normal font being
+--- used.  Like what is used for the Normal highlight group
+--- |hl-Normal|.
+--- With an argument a check is done whether String {name} is a
+--- valid font name.  If not then an empty string is returned.
+--- Otherwise the actual font name is returned, or {name} if the
+--- GUI does not support obtaining the real name.
+--- Only works when the GUI is running, thus not in your vimrc or
+--- gvimrc file.  Use the |GUIEnter| autocommand to use this
+--- function just after the GUI has started.
+---
+--- @param name? string
+--- @return string
+function vim.fn.getfontname(name) end
+
+--- The result is a String, which is the read, write, and execute
+--- permissions of the given file {fname}.
+--- If {fname} does not exist or its directory cannot be read, an
+--- empty string is returned.
+--- The result is of the form "rwxrwxrwx", where each group of
+--- "rwx" flags represent, in turn, the permissions of the owner
+--- of the file, the group the file belongs to, and other users.
+--- If a user does not have a given permission the flag for this
+--- is replaced with the string "-".  Examples: >
+---   :echo getfperm("/etc/passwd")
+---   :echo getfperm(expand("~/.config/nvim/init.vim"))
+--- <This will hopefully (from a security point of view) display
+--- the string "rw-r--r--" or even "rw-------".
+---
+--- Can also be used as a |method|: >
+---   GetFilename()->getfperm()
+--- <
+--- For setting permissions use |setfperm()|.
+---
+--- @param fname integer
+--- @return string
+function vim.fn.getfperm(fname) end
+
+--- The result is a Number, which is the size in bytes of the
+--- given file {fname}.
+--- If {fname} is a directory, 0 is returned.
+--- If the file {fname} can't be found, -1 is returned.
+--- If the size of {fname} is too big to fit in a Number then -2
+--- is returned.
+---
+--- Can also be used as a |method|: >
+---   GetFilename()->getfsize()
+---
+--- @param fname integer
+--- @return integer
+function vim.fn.getfsize(fname) end
+
+--- The result is a Number, which is the last modification time of
+--- the given file {fname}.  The value is measured as seconds
+--- since 1st Jan 1970, and may be passed to strftime().  See also
+--- |localtime()| and |strftime()|.
+--- If the file {fname} can't be found -1 is returned.
+---
+--- Can also be used as a |method|: >
+---   GetFilename()->getftime()
+---
+--- @param fname integer
+--- @return integer
+function vim.fn.getftime(fname) end
+
+--- The result is a String, which is a description of the kind of
+--- file of the given file {fname}.
+--- If {fname} does not exist an empty string is returned.
+--- Here is a table over different kinds of files and their
+--- results:
+---   Normal file    "file"
+---   Directory    "dir"
+---   Symbolic link    "link"
+---   Block device    "bdev"
+---   Character device  "cdev"
+---   Socket      "socket"
+---   FIFO      "fifo"
+---   All other    "other"
+--- Example: >
+---   getftype("/home")
+--- <Note that a type such as "link" will only be returned on
+--- systems that support it.  On some systems only "dir" and
+--- "file" are returned.
+---
+--- Can also be used as a |method|: >
+---   GetFilename()->getftype()
+---
+--- @param fname integer
+--- @return 'file'|'dir'|'link'|'bdev'|'cdev'|'socket'|'fifo'|'other'
+function vim.fn.getftype(fname) end
+
+--- Returns the |jumplist| for the specified window.
+---
+--- Without arguments use the current window.
+--- With {winnr} only use this window in the current tab page.
+--- {winnr} can also be a |window-ID|.
+--- With {winnr} and {tabnr} use the window in the specified tab
+--- page.  If {winnr} or {tabnr} is invalid, an empty list is
+--- returned.
+---
+--- The returned list contains two entries: a list with the jump
+--- locations and the last used jump position number in the list.
+--- Each entry in the jump location list is a dictionary with
+--- the following entries:
+---   bufnr    buffer number
+---   col    column number
+---   coladd    column offset for 'virtualedit'
+---   filename  filename if available
+---   lnum    line number
+---
+--- Can also be used as a |method|: >
+---   GetWinnr()->getjumplist()
+---
+--- <          *getline()*
+--- @param winnr? integer
+--- @param tabnr? integer
+--- @return any
+function vim.fn.getjumplist(winnr, tabnr) end
+
+--- Without {end} the result is a String, which is line {lnum}
+--- from the current buffer.  Example: >
+---   getline(1)
+--- <When {lnum} is a String that doesn't start with a
+--- digit, |line()| is called to translate the String into a Number.
+--- To get the line under the cursor: >
+---   getline(".")
+--- <When {lnum} is a number smaller than 1 or bigger than the
+--- number of lines in the buffer, an empty string is returned.
+---
+--- When {end} is given the result is a |List| where each item is
+--- a line from the current buffer in the range {lnum} to {end},
+--- including line {end}.
+--- {end} is used in the same way as {lnum}.
+--- Non-existing lines are silently omitted.
+--- When {end} is before {lnum} an empty |List| is returned.
+--- Example: >
+---   :let start = line('.')
+---   :let end = search("^$") - 1
+---   :let lines = getline(start, end)
+---
+--- <Can also be used as a |method|: >
+---   ComputeLnum()->getline()
+---
+--- <To get lines from another buffer see |getbufline()| and
+--- |getbufoneline()|
+---
+--- @param lnum integer
+--- @param end_? any
+--- @return any
+function vim.fn.getline(lnum, end_) end
+
+--- Returns a |List| with all the entries in the location list for
+--- window {nr}.  {nr} can be the window number or the |window-ID|.
+--- When {nr} is zero the current window is used.
+---
+--- For a location list window, the displayed location list is
+--- returned.  For an invalid window number {nr}, an empty list is
+--- returned. Otherwise, same as |getqflist()|.
+---
+--- If the optional {what} dictionary argument is supplied, then
+--- returns the items listed in {what} as a dictionary. Refer to
+--- |getqflist()| for the supported items in {what}.
+---
+--- In addition to the items supported by |getqflist()| in {what},
+--- the following item is supported by |getloclist()|:
+---
+---   filewinid  id of the window used to display files
+---       from the location list. This field is
+---       applicable only when called from a
+---       location list window. See
+---       |location-list-file-window| for more
+---       details.
+---
+--- Returns a |Dictionary| with default values if there is no
+--- location list for the window {nr}.
+--- Returns an empty Dictionary if window {nr} does not exist.
+---
+--- Examples (See also |getqflist-examples|): >
+---   :echo getloclist(3, {'all': 0})
+---   :echo getloclist(5, {'filewinid': 0})
+---
+---
+--- @param nr integer
+--- @param what? any
+--- @return any
+function vim.fn.getloclist(nr, what) end
+
+--- Without the {buf} argument returns a |List| with information
+--- about all the global marks. |mark|
+---
+--- If the optional {buf} argument is specified, returns the
+--- local marks defined in buffer {buf}.  For the use of {buf},
+--- see |bufname()|.  If {buf} is invalid, an empty list is
+--- returned.
+---
+--- Each item in the returned List is a |Dict| with the following:
+---     mark   name of the mark prefixed by "'"
+---     pos     a |List| with the position of the mark:
+---     [bufnum, lnum, col, off]
+---      Refer to |getpos()| for more information.
+---     file   file name
+---
+--- Refer to |getpos()| for getting information about a specific
+--- mark.
+---
+--- Can also be used as a |method|: >
+---   GetBufnr()->getmarklist()
+---
+--- @param buf? any
+--- @return any
+function vim.fn.getmarklist(buf) end
+
+--- Returns a |List| with all matches previously defined for the
+--- current window by |matchadd()| and the |:match| commands.
+--- |getmatches()| is useful in combination with |setmatches()|,
+--- as |setmatches()| can restore a list of matches saved by
+--- |getmatches()|.
+--- If {win} is specified, use the window with this number or
+--- window ID instead of the current window.  If {win} is invalid,
+--- an empty list is returned.
+--- Example: >vim
+---   :echo getmatches()
+--- >
+---        [{"group": "MyGroup1", "pattern": "TODO",
+---   "priority": 10, "id": 1}, {"group": "MyGroup2",
+---   "pattern": "FIXME", "priority": 10, "id": 2}]
+--- >vim
+---   :let m = getmatches()
+---   :call clearmatches()
+---   :echo getmatches()
+--- >
+---   []
+--- >vim
+---   :call setmatches(m)
+---   :echo getmatches()
+--- >
+---   [{"group": "MyGroup1", "pattern": "TODO",
+---   "priority": 10, "id": 1}, {"group": "MyGroup2",
+---   "pattern": "FIXME", "priority": 10, "id": 2}]
+--- >vim
+---   :unlet m
+--- <
+--- @param win? any
+--- @return any
+function vim.fn.getmatches(win) end
+
+--- Returns a Dictionary with the last known position of the
+--- mouse.  This can be used in a mapping for a mouse click.  The
+--- items are:
+---   screenrow  screen row
+---   screencol  screen column
+---   winid    Window ID of the click
+---   winrow    row inside "winid"
+---   wincol    column inside "winid"
+---   line    text line inside "winid"
+---   column    text column inside "winid"
+--- All numbers are 1-based.
+---
+--- If not over a window, e.g. when in the command line, then only
+--- "screenrow" and "screencol" are valid, the others are zero.
+---
+--- When on the status line below a window or the vertical
+--- separator right of a window, the "line" and "column" values
+--- are zero.
+---
+--- When the position is after the text then "column" is the
+--- length of the text in bytes plus one.
+---
+--- If the mouse is over a focusable floating window then that
+--- window is used.
+---
+--- When using |getchar()| the Vim variables |v:mouse_lnum|,
+--- |v:mouse_col| and |v:mouse_winid| also provide these values.
+---
+---           *getpid()*
+--- @return any
+function vim.fn.getmousepos() end
+
+--- This is a unique number, until Vim exits.
+---
+---           *getpos()*
+--- @return integer
+function vim.fn.getpid() end
+
+--- {expr} see |line()|.  For getting the cursor position see
+--- |getcurpos()|.
+--- The result is a |List| with four numbers:
+---     [bufnum, lnum, col, off]
+--- "bufnum" is zero, unless a mark like '0 or 'A is used, then it
+--- is the buffer number of the mark.
+--- "lnum" and "col" are the position in the buffer.  The first
+--- column is 1.
+--- The "off" number is zero, unless 'virtualedit' is used.  Then
+--- it is the offset in screen columns from the start of the
+--- character.  E.g., a position within a <Tab> or after the last
+--- character.
+--- Note that for '< and '> Visual mode matters: when it is "V"
+--- (visual line mode) the column of '< is zero and the column of
+--- '> is a large number equal to |v:maxcol|.
+--- The column number in the returned List is the byte position
+--- within the line. To get the character position in the line,
+--- use |getcharpos()|.
+--- A very large column number equal to |v:maxcol| can be returned,
+--- in which case it means "after the end of the line".
+--- If {expr} is invalid, returns a list with all zeros.
+--- This can be used to save and restore the position of a mark: >
+---   let save_a_mark = getpos("'a")
+---   ...
+---   call setpos("'a", save_a_mark)
+--- <Also see |getcharpos()|, |getcurpos()| and |setpos()|.
+---
+--- Can also be used as a |method|: >
+---   GetMark()->getpos()
+---
+--- @param expr any
+--- @return any
+function vim.fn.getpos(expr) end
+
+--- Returns a |List| with all the current quickfix errors.  Each
+--- list item is a dictionary with these entries:
+---   bufnr  number of buffer that has the file name, use
+---     bufname() to get the name
+---   module  module name
+---   lnum  line number in the buffer (first line is 1)
+---   end_lnum
+---     end of line number if the item is multiline
+---   col  column number (first column is 1)
+---   end_col  end of column number if the item has range
+---   vcol  |TRUE|: "col" is visual column
+---     |FALSE|: "col" is byte index
+---   nr  error number
+---   pattern  search pattern used to locate the error
+---   text  description of the error
+---   type  type of the error, 'E', '1', etc.
+---   valid  |TRUE|: recognized error message
+---
+--- When there is no error list or it's empty, an empty list is
+--- returned. Quickfix list entries with a non-existing buffer
+--- number are returned with "bufnr" set to zero (Note: some
+--- functions accept buffer number zero for the alternate buffer,
+--- you may need to explicitly check for zero).
+---
+--- Useful application: Find pattern matches in multiple files and
+--- do something with them: >
+---   :vimgrep /theword/jg *.c
+---   :for d in getqflist()
+---   :   echo bufname(d.bufnr) ':' d.lnum '=' d.text
+---   :endfor
+--- <
+--- If the optional {what} dictionary argument is supplied, then
+--- returns only the items listed in {what} as a dictionary. The
+--- following string items are supported in {what}:
+---   changedtick  get the total number of changes made
+---       to the list |quickfix-changedtick|
+---   context  get the |quickfix-context|
+---   efm  errorformat to use when parsing "lines". If
+---     not present, then the 'errorformat' option
+---     value is used.
+---   id  get information for the quickfix list with
+---     |quickfix-ID|; zero means the id for the
+---     current list or the list specified by "nr"
+---   idx  get information for the quickfix entry at this
+---     index in the list specified by "id" or "nr".
+---     If set to zero, then uses the current entry.
+---     See |quickfix-index|
+---   items  quickfix list entries
+---   lines  parse a list of lines using 'efm' and return
+---     the resulting entries.  Only a |List| type is
+---     accepted.  The current quickfix list is not
+---     modified. See |quickfix-parse|.
+---   nr  get information for this quickfix list; zero
+---     means the current quickfix list and "$" means
+---     the last quickfix list
+---   qfbufnr number of the buffer displayed in the quickfix
+---     window. Returns 0 if the quickfix buffer is
+---     not present. See |quickfix-buffer|.
+---   size  number of entries in the quickfix list
+---   title  get the list title |quickfix-title|
+---   winid  get the quickfix |window-ID|
+---   all  all of the above quickfix properties
+--- Non-string items in {what} are ignored. To get the value of a
+--- particular item, set it to zero.
+--- If "nr" is not present then the current quickfix list is used.
+--- If both "nr" and a non-zero "id" are specified, then the list
+--- specified by "id" is used.
+--- To get the number of lists in the quickfix stack, set "nr" to
+--- "$" in {what}. The "nr" value in the returned dictionary
+--- contains the quickfix stack size.
+--- When "lines" is specified, all the other items except "efm"
+--- are ignored.  The returned dictionary contains the entry
+--- "items" with the list of entries.
+---
+--- The returned dictionary contains the following entries:
+---   changedtick  total number of changes made to the
+---       list |quickfix-changedtick|
+---   context  quickfix list context. See |quickfix-context|
+---     If not present, set to "".
+---   id  quickfix list ID |quickfix-ID|. If not
+---     present, set to 0.
+---   idx  index of the quickfix entry in the list. If not
+---     present, set to 0.
+---   items  quickfix list entries. If not present, set to
+---     an empty list.
+---   nr  quickfix list number. If not present, set to 0
+---   qfbufnr  number of the buffer displayed in the quickfix
+---     window. If not present, set to 0.
+---   size  number of entries in the quickfix list. If not
+---     present, set to 0.
+---   title  quickfix list title text. If not present, set
+---     to "".
+---   winid  quickfix |window-ID|. If not present, set to 0
+---
+--- Examples (See also |getqflist-examples|): >
+---   :echo getqflist({'all': 1})
+---   :echo getqflist({'nr': 2, 'title': 1})
+---   :echo getqflist({'lines' : ["F1:10:L10"]})
+--- <
+--- @param what? any
+--- @return any
+function vim.fn.getqflist(what) end
+
+--- The result is a String, which is the contents of register
+--- {regname}.  Example: >
+---   :let cliptext = getreg('*')
+--- <When register {regname} was not set the result is an empty
+--- string.
+--- The {regname} argument must be a string.
+---
+--- getreg('=') returns the last evaluated value of the expression
+--- register.  (For use in maps.)
+--- getreg('=', 1) returns the expression itself, so that it can
+--- be restored with |setreg()|.  For other registers the extra
+--- argument is ignored, thus you can always give it.
+---
+--- If {list} is present and |TRUE|, the result type is changed
+--- to |List|. Each list item is one text line. Use it if you care
+--- about zero bytes possibly present inside register: without
+--- third argument both NLs and zero bytes are represented as NLs
+--- (see |NL-used-for-Nul|).
+--- When the register was not set an empty list is returned.
+---
+--- If {regname} is not specified, |v:register| is used.
+---
+--- Can also be used as a |method|: >
+---   GetRegname()->getreg()
+---
+--- @param regname? string
+--- @param list? any
+--- @return string|string[]
+function vim.fn.getreg(regname, list) end
+
+--- Returns detailed information about register {regname} as a
+--- Dictionary with the following entries:
+---   regcontents  List of lines contained in register
+---       {regname}, like
+---       getreg({regname}, 1, 1).
+---   regtype    the type of register {regname}, as in
+---       |getregtype()|.
+---   isunnamed  Boolean flag, v:true if this register
+---       is currently pointed to by the unnamed
+---       register.
+---   points_to  for the unnamed register, gives the
+---       single letter name of the register
+---       currently pointed to (see |quotequote|).
+---       For example, after deleting a line
+---       with `dd`, this field will be "1",
+---       which is the register that got the
+---       deleted text.
+---
+--- The {regname} argument is a string.  If {regname} is invalid
+--- or not set, an empty Dictionary will be returned.
+--- If {regname} is not specified, |v:register| is used.
+--- The returned Dictionary can be passed to |setreg()|.
+---
+--- Can also be used as a |method|: >
+---   GetRegname()->getreginfo()
+---
+--- @param regname? string
+--- @return table
+function vim.fn.getreginfo(regname) end
+
+--- The result is a String, which is type of register {regname}.
+--- The value will be one of:
+---     "v"      for |charwise| text
+---     "V"      for |linewise| text
+---     "<CTRL-V>{width}"  for |blockwise-visual| text
+---     ""      for an empty or unknown register
+--- <CTRL-V> is one character with value 0x16.
+--- The {regname} argument is a string.  If {regname} is not
+--- specified, |v:register| is used.
+---
+--- Can also be used as a |method|: >
+---   GetRegname()->getregtype()
+---
+--- @param regname? string
+--- @return string
+function vim.fn.getregtype(regname) end
+
+--- Returns a |List| with information about all the sourced Vim
+--- scripts in the order they were sourced, like what
+--- `:scriptnames` shows.
+---
+--- The optional Dict argument {opts} supports the following
+--- optional items:
+---     name  Script name match pattern. If specified,
+---     and "sid" is not specified, information about
+---     scripts with a name that match the pattern
+---     "name" are returned.
+---     sid    Script ID |<SID>|.  If specified, only
+---     information about the script with ID "sid" is
+---     returned and "name" is ignored.
+---
+--- Each item in the returned List is a |Dict| with the following
+--- items:
+---     autoload  Always set to FALSE.
+---     functions   List of script-local function names defined in
+---     the script.  Present only when a particular
+---     script is specified using the "sid" item in
+---     {opts}.
+---     name  Vim script file name.
+---     sid    Script ID |<SID>|.
+---     variables   A dictionary with the script-local variables.
+---     Present only when a particular script is
+---     specified using the "sid" item in {opts}.
+---     Note that this is a copy, the value of
+---     script-local variables cannot be changed using
+---     this dictionary.
+---     version  Vimscript version, always 1
+---
+--- Examples: >
+---   :echo getscriptinfo({'name': 'myscript'})
+---   :echo getscriptinfo({'sid': 15}).variables
+--- <
+--- @param opts? table
+--- @return any
+function vim.fn.getscriptinfo(opts) end
+
+--- If {tabnr} is not specified, then information about all the
+--- tab pages is returned as a |List|. Each List item is a
+--- |Dictionary|.  Otherwise, {tabnr} specifies the tab page
+--- number and information about that one is returned.  If the tab
+--- page does not exist an empty List is returned.
+---
+--- Each List item is a |Dictionary| with the following entries:
+---   tabnr    tab page number.
+---   variables  a reference to the dictionary with
+---       tabpage-local variables
+---   windows    List of |window-ID|s in the tab page.
+---
+--- Can also be used as a |method|: >
+---   GetTabnr()->gettabinfo()
+---
+--- @param tabnr? integer
+--- @return any
+function vim.fn.gettabinfo(tabnr) end
+
+--- Get the value of a tab-local variable {varname} in tab page
+--- {tabnr}. |t:var|
+--- Tabs are numbered starting with one.
+--- The {varname} argument is a string.  When {varname} is empty a
+--- dictionary with all tab-local variables is returned.
+--- Note that the name without "t:" must be used.
+--- When the tab or variable doesn't exist {def} or an empty
+--- string is returned, there is no error message.
+---
+--- Can also be used as a |method|: >
+---   GetTabnr()->gettabvar(varname)
+---
+--- @param tabnr integer
+--- @param varname string
+--- @param def? any
+--- @return any
+function vim.fn.gettabvar(tabnr, varname, def) end
+
+--- Get the value of window-local variable {varname} in window
+--- {winnr} in tab page {tabnr}.
+--- The {varname} argument is a string.  When {varname} is empty a
+--- dictionary with all window-local variables is returned.
+--- When {varname} is equal to "&" get the values of all
+--- window-local options in a |Dictionary|.
+--- Otherwise, when {varname} starts with "&" get the value of a
+--- window-local option.
+--- Note that {varname} must be the name without "w:".
+--- Tabs are numbered starting with one.  For the current tabpage
+--- use |getwinvar()|.
+--- {winnr} can be the window number or the |window-ID|.
+--- When {winnr} is zero the current window is used.
+--- This also works for a global option, buffer-local option and
+--- window-local option, but it doesn't work for a global variable
+--- or buffer-local variable.
+--- When the tab, window or variable doesn't exist {def} or an
+--- empty string is returned, there is no error message.
+--- Examples: >
+---   :let list_is_on = gettabwinvar(1, 2, '&list')
+---   :echo "myvar = " .. gettabwinvar(3, 1, 'myvar')
+--- <
+--- To obtain all window-local variables use: >
+---   gettabwinvar({tabnr}, {winnr}, '&')
+---
+--- <Can also be used as a |method|: >
+---   GetTabnr()->gettabwinvar(winnr, varname)
+---
+--- @param tabnr integer
+--- @param winnr integer
+--- @param varname string
+--- @param def? any
+--- @return any
+function vim.fn.gettabwinvar(tabnr, winnr, varname, def) end
+
+--- The result is a Dict, which is the tag stack of window {winnr}.
+--- {winnr} can be the window number or the |window-ID|.
+--- When {winnr} is not specified, the current window is used.
+--- When window {winnr} doesn't exist, an empty Dict is returned.
+---
+--- The returned dictionary contains the following entries:
+---   curidx    Current index in the stack. When at
+---       top of the stack, set to (length + 1).
+---       Index of bottom of the stack is 1.
+---   items    List of items in the stack. Each item
+---       is a dictionary containing the
+---       entries described below.
+---   length    Number of entries in the stack.
+---
+--- Each item in the stack is a dictionary with the following
+--- entries:
+---   bufnr    buffer number of the current jump
+---   from    cursor position before the tag jump.
+---       See |getpos()| for the format of the
+---       returned list.
+---   matchnr    current matching tag number. Used when
+---       multiple matching tags are found for a
+---       name.
+---   tagname    name of the tag
+---
+--- See |tagstack| for more information about the tag stack.
+---
+--- Can also be used as a |method|: >
+---   GetWinnr()->gettagstack()
+---
+---
+--- @param winnr? integer
+--- @return any
+function vim.fn.gettagstack(winnr) end
+
+--- Translate String {text} if possible.
+--- This is mainly for use in the distributed Vim scripts.  When
+--- generating message translations the {text} is extracted by
+--- xgettext, the translator can add the translated message in the
+--- .po file and Vim will lookup the translation when gettext() is
+--- called.
+--- For {text} double quoted strings are preferred, because
+--- xgettext does not understand escaping in single quoted
+--- strings.
+---
+---
+--- @param text any
+--- @return any
+function vim.fn.gettext(text) end
+
+--- Returns information about windows as a |List| with Dictionaries.
+---
+--- If {winid} is given Information about the window with that ID
+--- is returned, as a |List| with one item.  If the window does not
+--- exist the result is an empty list.
+---
+--- Without {winid} information about all the windows in all the
+--- tab pages is returned.
+---
+--- Each List item is a |Dictionary| with the following entries:
+---   botline    last complete displayed buffer line
+---   bufnr    number of buffer in the window
+---   height    window height (excluding winbar)
+---   loclist    1 if showing a location list
+---   quickfix  1 if quickfix or location list window
+---   terminal  1 if a terminal window
+---   tabnr    tab page number
+---   topline    first displayed buffer line
+---   variables  a reference to the dictionary with
+---       window-local variables
+---   width    window width
+---   winbar    1 if the window has a toolbar, 0
+---       otherwise
+---   wincol    leftmost screen column of the window;
+---       "col" from |win_screenpos()|
+---   textoff    number of columns occupied by any
+---       'foldcolumn', 'signcolumn' and line
+---       number in front of the text
+---   winid    |window-ID|
+---   winnr    window number
+---   winrow    topmost screen line of the window;
+---       "row" from |win_screenpos()|
+---
+--- Can also be used as a |method|: >
+---   GetWinnr()->getwininfo()
+---
+--- @param winid? integer
+--- @return any
+function vim.fn.getwininfo(winid) end
+
+--- The result is a |List| with two numbers, the result of
+--- |getwinposx()| and |getwinposy()| combined:
+---   [x-pos, y-pos]
+--- {timeout} can be used to specify how long to wait in msec for
+--- a response from the terminal.  When omitted 100 msec is used.
+---
+--- Use a longer time for a remote terminal.
+--- When using a value less than 10 and no response is received
+--- within that time, a previously reported position is returned,
+--- if available.  This can be used to poll for the position and
+--- do some work in the meantime: >
+---   while 1
+---     let res = getwinpos(1)
+---     if res[0] >= 0
+---       break
+---     endif
+---     " Do some work here
+---   endwhile
+--- <
+--- Can also be used as a |method|: >
+---   GetTimeout()->getwinpos()
+--- <
+---           *getwinposx()*
+--- @param timeout? integer
+--- @return any
+function vim.fn.getwinpos(timeout) end
+
+--- the left hand side of the GUI Vim window.  The result will be
+--- -1 if the information is not available.
+--- The value can be used with `:winpos`.
+---
+---           *getwinposy()*
+--- @return integer
+function vim.fn.getwinposx() end
+
+--- the top of the GUI Vim window.  The result will be -1 if the
+--- information is not available.
+--- The value can be used with `:winpos`.
+---
+--- @return integer
+function vim.fn.getwinposy() end
+
+--- Like |gettabwinvar()| for the current tabpage.
+--- Examples: >
+---   :let list_is_on = getwinvar(2, '&list')
+---   :echo "myvar = " .. getwinvar(1, 'myvar')
+---
+--- <Can also be used as a |method|: >
+---   GetWinnr()->getwinvar(varname)
+--- <
+--- @param winnr integer
+--- @param varname string
+--- @param def? any
+--- @return any
+function vim.fn.getwinvar(winnr, varname, def) end
+
+--- Expand the file wildcards in {expr}.  See |wildcards| for the
+--- use of special characters.
+---
+--- Unless the optional {nosuf} argument is given and is |TRUE|,
+--- the 'suffixes' and 'wildignore' options apply: Names matching
+--- one of the patterns in 'wildignore' will be skipped and
+--- 'suffixes' affect the ordering of matches.
+--- 'wildignorecase' always applies.
+---
+--- When {list} is present and it is |TRUE| the result is a |List|
+--- with all matching files. The advantage of using a List is,
+--- you also get filenames containing newlines correctly.
+--- Otherwise the result is a String and when there are several
+--- matches, they are separated by <NL> characters.
+---
+--- If the expansion fails, the result is an empty String or List.
+---
+--- You can also use |readdir()| if you need to do complicated
+--- things, such as limiting the number of matches.
+---
+--- A name for a non-existing file is not included.  A symbolic
+--- link is only included if it points to an existing file.
+--- However, when the {alllinks} argument is present and it is
+--- |TRUE| then all symbolic links are included.
+---
+--- For most systems backticks can be used to get files names from
+--- any external command.  Example: >
+---   :let tagfiles = glob("`find . -name tags -print`")
+---   :let &tags = substitute(tagfiles, "\n", ",", "g")
+--- <The result of the program inside the backticks should be one
+--- item per line.  Spaces inside an item are allowed.
+---
+--- See |expand()| for expanding special Vim variables.  See
+--- |system()| for getting the raw output of an external command.
+---
+--- Can also be used as a |method|: >
+---   GetExpr()->glob()
+---
+--- @param expr any
+--- @param nosuf? boolean
+--- @param list? any
+--- @param alllinks? any
+--- @return any
+function vim.fn.glob(expr, nosuf, list, alllinks) end
+
+--- Convert a file pattern, as used by glob(), into a search
+--- pattern.  The result can be used to match with a string that
+--- is a file name.  E.g. >
+---   if filename =~ glob2regpat('Make*.mak')
+--- <This is equivalent to: >
+---   if filename =~ '^Make.*\.mak$'
+--- <When {string} is an empty string the result is "^$", match an
+--- empty string.
+--- Note that the result depends on the system.  On MS-Windows
+--- a backslash usually means a path separator.
+---
+--- Can also be used as a |method|: >
+---   GetExpr()->glob2regpat()
+--- <            *globpath()*
+--- @param string string
+--- @return any
+function vim.fn.glob2regpat(string) end
+
+--- Perform glob() for String {expr} on all directories in {path}
+--- and concatenate the results.  Example: >
+---   :echo globpath(&rtp, "syntax/c.vim")
+--- <
+--- {path} is a comma-separated list of directory names.  Each
+--- directory name is prepended to {expr} and expanded like with
+--- |glob()|.  A path separator is inserted when needed.
+--- To add a comma inside a directory name escape it with a
+--- backslash.  Note that on MS-Windows a directory may have a
+--- trailing backslash, remove it if you put a comma after it.
+--- If the expansion fails for one of the directories, there is no
+--- error message.
+---
+--- Unless the optional {nosuf} argument is given and is |TRUE|,
+--- the 'suffixes' and 'wildignore' options apply: Names matching
+--- one of the patterns in 'wildignore' will be skipped and
+--- 'suffixes' affect the ordering of matches.
+---
+--- When {list} is present and it is |TRUE| the result is a |List|
+--- with all matching files. The advantage of using a List is, you
+--- also get filenames containing newlines correctly. Otherwise
+--- the result is a String and when there are several matches,
+--- they are separated by <NL> characters.  Example: >
+---   :echo globpath(&rtp, "syntax/c.vim", 0, 1)
+--- <
+--- {allinks} is used as with |glob()|.
+---
+--- The "**" item can be used to search in a directory tree.
+--- For example, to find all "README.txt" files in the directories
+--- in 'runtimepath' and below: >
+---   :echo globpath(&rtp, "**/README.txt")
+--- <Upwards search and limiting the depth of "**" is not
+--- supported, thus using 'path' will not always work properly.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetExpr()->globpath(&rtp)
+--- <
+---           *has()*
+--- @param path string
+--- @param expr any
+--- @param nosuf? boolean
+--- @param list? any
+--- @param allinks? any
+--- @return any
+function vim.fn.globpath(path, expr, nosuf, list, allinks) end
+
+--- {feature} argument is a feature name like "nvim-0.2.1" or
+--- "win32", see below.  See also |exists()|.
+---
+--- To get the system name use |vim.uv|.os_uname() in Lua: >lua
+---   print(vim.uv.os_uname().sysname)
+---
+--- <If the code has a syntax error then Vimscript may skip the
+--- rest of the line.  Put |:if| and |:endif| on separate lines to
+--- avoid the syntax error: >
+---   if has('feature')
+---     let x = this->breaks->without->the->feature
+---   endif
+--- <
+--- Vim's compile-time feature-names (prefixed with "+") are not
+--- recognized because Nvim is always compiled with all possible
+--- features. |feature-compile|
+---
+--- Feature names can be:
+--- 1.  Nvim version. For example the "nvim-0.2.1" feature means
+---     that Nvim is version 0.2.1 or later: >
+---   :if has("nvim-0.2.1")
+---
+--- <2.  Runtime condition or other pseudo-feature. For example the
+---     "win32" feature checks if the current system is Windows: >
+---   :if has("win32")
+--- <          *feature-list*
+---     List of supported pseudo-feature names:
+---   acl    |ACL| support.
+---   bsd    BSD system (not macOS, use "mac" for that).
+---   clipboard  |clipboard| provider is available.
+---   fname_case  Case in file names matters (for Darwin and MS-Windows
+---       this is not present).
+---                         gui_running  Nvim has a GUI.
+---   iconv    Can use |iconv()| for conversion.
+---   linux    Linux system.
+---   mac    MacOS system.
+---   nvim    This is Nvim.
+---   python3    Legacy Vim |python3| interface. |has-python|
+---   pythonx    Legacy Vim |python_x| interface. |has-pythonx|
+---   sun    SunOS system.
+---   ttyin    input is a terminal (tty).
+---   ttyout    output is a terminal (tty).
+---   unix    Unix system.
+---   *vim_starting*  True during |startup|.
+---   win32    Windows system (32 or 64 bit).
+---   win64    Windows system (64 bit).
+---   wsl    WSL (Windows Subsystem for Linux) system.
+---
+---           *has-patch*
+--- 3.  Vim patch. For example the "patch123" feature means that
+---     Vim patch 123 at the current |v:version| was included: >
+---   :if v:version > 602 || v:version == 602 && has("patch148")
+---
+--- <4.  Vim version. For example the "patch-7.4.237" feature means
+---     that Nvim is Vim-compatible to version 7.4.237 or later. >
+---   :if has("patch-7.4.237")
+---
+---
+--- @param feature any
+--- @return 0|1
+function vim.fn.has(feature) end
+
+--- The result is a Number, which is TRUE if |Dictionary| {dict}
+--- has an entry with key {key}.  FALSE otherwise. The {key}
+--- argument is a string.
+---
+--- Can also be used as a |method|: >
+---   mydict->has_key(key)
+---
+--- @param dict any
+--- @param key any
+--- @return 0|1
+function vim.fn.has_key(dict, key) end
+
+--- The result is a Number, which is 1 when the window has set a
+--- local path via |:lcd| or when {winnr} is -1 and the tabpage
+--- has set a local path via |:tcd|, otherwise 0.
+---
+--- Tabs and windows are identified by their respective numbers,
+--- 0 means current tab or window. Missing argument implies 0.
+--- Thus the following are equivalent: >
+---   haslocaldir()
+---   haslocaldir(0)
+---   haslocaldir(0, 0)
+--- <With {winnr} use that window in the current tabpage.
+--- With {winnr} and {tabnr} use the window in that tabpage.
+--- {winnr} can be the window number or the |window-ID|.
+--- If {winnr} is -1 it is ignored, only the tab is resolved.
+--- Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
+---
+--- Can also be used as a |method|: >
+---   GetWinnr()->haslocaldir()
+---
+--- @param winnr? integer
+--- @param tabnr? integer
+--- @return 0|1
+function vim.fn.haslocaldir(winnr, tabnr) end
+
+--- The result is a Number, which is TRUE if there is a mapping
+--- that contains {what} in somewhere in the rhs (what it is
+--- mapped to) and this mapping exists in one of the modes
+--- indicated by {mode}.
+--- The arguments {what} and {mode} are strings.
+--- When {abbr} is there and it is |TRUE| use abbreviations
+--- instead of mappings.  Don't forget to specify Insert and/or
+--- Command-line mode.
+--- Both the global mappings and the mappings local to the current
+--- buffer are checked for a match.
+--- If no matching mapping is found FALSE is returned.
+--- The following characters are recognized in {mode}:
+---   n  Normal mode
+---   v  Visual and Select mode
+---   x  Visual mode
+---   s  Select mode
+---   o  Operator-pending mode
+---   i  Insert mode
+---   l  Language-Argument ("r", "f", "t", etc.)
+---   c  Command-line mode
+--- When {mode} is omitted, "nvo" is used.
+---
+--- This function is useful to check if a mapping already exists
+--- to a function in a Vim script.  Example: >
+---   :if !hasmapto('\ABCdoit')
+---   :   map <Leader>d \ABCdoit
+---   :endif
+--- <This installs the mapping to "\ABCdoit" only if there isn't
+--- already a mapping to "\ABCdoit".
+---
+--- Can also be used as a |method|: >
+---   GetRHS()->hasmapto()
+---
+--- @param what any
+--- @param mode? string
+--- @param abbr? any
+--- @return 0|1
+function vim.fn.hasmapto(what, mode, abbr) end
+
+--- @deprecated
+--- Obsolete name for |hlID()|.
+function vim.fn.highlightID(...) end
+
+--- @deprecated
+--- Obsolete name for |hlexists()|.
+function vim.fn.highlight_exists(...) end
+
+--- Add the String {item} to the history {history} which can be
+--- one of:          *hist-names*
+---   "cmd"   or ":"    command line history
+---   "search" or "/"   search pattern history
+---   "expr"   or "="   typed expression history
+---   "input"  or "\@"    input line history
+---   "debug"  or ">"   debug command history
+---   empty      the current or last used history
+--- The {history} string does not need to be the whole name, one
+--- character is sufficient.
+--- If {item} does already exist in the history, it will be
+--- shifted to become the newest entry.
+--- The result is a Number: TRUE if the operation was successful,
+--- otherwise FALSE is returned.
+---
+--- Example: >
+---   :call histadd("input", strftime("%Y %b %d"))
+---   :let date=input("Enter date: ")
+--- <This function is not available in the |sandbox|.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetHistory()->histadd('search')
+---
+--- @param history any
+--- @param item any
+--- @return 0|1
+function vim.fn.histadd(history, item) end
+
+--- Clear {history}, i.e. delete all its entries.  See |hist-names|
+--- for the possible values of {history}.
+---
+--- If the parameter {item} evaluates to a String, it is used as a
+--- regular expression.  All entries matching that expression will
+--- be removed from the history (if there are any).
+--- Upper/lowercase must match, unless "\c" is used |/\c|.
+--- If {item} evaluates to a Number, it will be interpreted as
+--- an index, see |:history-indexing|.  The respective entry will
+--- be removed if it exists.
+---
+--- The result is TRUE for a successful operation, otherwise FALSE
+--- is returned.
+---
+--- Examples:
+--- Clear expression register history: >
+---   :call histdel("expr")
+--- <
+--- Remove all entries starting with "*" from the search history: >
+---   :call histdel("/", '^\*')
+--- <
+--- The following three are equivalent: >
+---   :call histdel("search", histnr("search"))
+---   :call histdel("search", -1)
+---   :call histdel("search", '^' .. histget("search", -1) .. '$')
+--- <
+--- To delete the last search pattern and use the last-but-one for
+--- the "n" command and 'hlsearch': >
+---   :call histdel("search", -1)
+---   :let \@/ = histget("search", -1)
+--- <
+--- Can also be used as a |method|: >
+---   GetHistory()->histdel()
+---
+--- @param history any
+--- @param item? any
+--- @return 0|1
+function vim.fn.histdel(history, item) end
+
+--- The result is a String, the entry with Number {index} from
+--- {history}.  See |hist-names| for the possible values of
+--- {history}, and |:history-indexing| for {index}.  If there is
+--- no such entry, an empty String is returned.  When {index} is
+--- omitted, the most recent item from the history is used.
+---
+--- Examples:
+--- Redo the second last search from history. >
+---   :execute '/' .. histget("search", -2)
+---
+--- <Define an Ex command ":H {num}" that supports re-execution of
+--- the {num}th entry from the output of |:history|. >
+---   :command -nargs=1 H execute histget("cmd", 0+<args>)
+--- <
+--- Can also be used as a |method|: >
+---   GetHistory()->histget()
+---
+--- @param history any
+--- @param index? any
+--- @return string
+function vim.fn.histget(history, index) end
+
+--- The result is the Number of the current entry in {history}.
+--- See |hist-names| for the possible values of {history}.
+--- If an error occurred, -1 is returned.
+---
+--- Example: >
+---   :let inp_index = histnr("expr")
+---
+--- <Can also be used as a |method|: >
+---   GetHistory()->histnr()
+--- <
+--- @param history any
+--- @return integer
+function vim.fn.histnr(history) end
+
+--- with name {name}.  When the highlight group doesn't exist,
+--- zero is returned.
+--- This can be used to retrieve information about the highlight
+--- group.  For example, to get the background color of the
+--- "Comment" group: >
+---   :echo synIDattr(synIDtrans(hlID("Comment")), "bg")
+--- <
+--- Can also be used as a |method|: >
+---   GetName()->hlID()
+---
+--- @param name string
+--- @return integer
+function vim.fn.hlID(name) end
+
+--- The result is a Number, which is TRUE if a highlight group
+--- called {name} exists.  This is when the group has been
+--- defined in some way.  Not necessarily when highlighting has
+--- been defined for it, it may also have been used for a syntax
+--- item.
+---
+--- Can also be used as a |method|: >
+---   GetName()->hlexists()
+--- <
+---           *hlID()*
+--- @param name string
+--- @return 0|1
+function vim.fn.hlexists(name) end
+
+--- The result is a String, which is the name of the machine on
+--- which Vim is currently running.  Machine names greater than
+--- 256 characters long are truncated.
+---
+--- @return string
+function vim.fn.hostname() end
+
+--- The result is a String, which is the text {string} converted
+--- from encoding {from} to encoding {to}.
+--- When the conversion completely fails an empty string is
+--- returned.  When some characters could not be converted they
+--- are replaced with "?".
+--- The encoding names are whatever the iconv() library function
+--- can accept, see ":!man 3 iconv".
+--- Note that Vim uses UTF-8 for all Unicode encodings, conversion
+--- from/to UCS-2 is automatically changed to use UTF-8.  You
+--- cannot use UCS-2 in a string anyway, because of the NUL bytes.
+---
+--- Can also be used as a |method|: >
+---   GetText()->iconv('latin1', 'utf-8')
+--- <
+---           *indent()*
+--- @param string string
+--- @param from any
+--- @param to any
+--- @return any
+function vim.fn.iconv(string, from, to) end
+
+--- Returns a |String| which is a unique identifier of the
+--- container type (|List|, |Dict|, |Blob| and |Partial|). It is
+--- guaranteed that for the mentioned types `id(v1) ==# id(v2)`
+--- returns true iff `type(v1) == type(v2) && v1 is v2`.
+--- Note that |v:_null_string|, |v:_null_list|, |v:_null_dict| and
+--- |v:_null_blob| have the same `id()` with different types
+--- because they are internally represented as NULL pointers.
+--- `id()` returns a hexadecimal representanion of the pointers to
+--- the containers (i.e. like `0x994a40`), same as `printf("%p",
+--- {expr})`, but it is advised against counting on the exact
+--- format of the return value.
+---
+--- It is not guaranteed that `id(no_longer_existing_container)`
+--- will not be equal to some other `id()`: new containers may
+--- reuse identifiers of the garbage-collected ones.
+---
+--- @param expr any
+--- @return any
+function vim.fn.id(expr) end
+
+--- current buffer.  The indent is counted in spaces, the value
+--- of 'tabstop' is relevant.  {lnum} is used just like in
+--- |getline()|.
+--- When {lnum} is invalid -1 is returned.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->indent()
+---
+--- @param lnum integer
+--- @return integer
+function vim.fn.indent(lnum) end
+
+--- Find {expr} in {object} and return its index.  See
+--- |indexof()| for using a lambda to select the item.
+---
+--- If {object} is a |List| return the lowest index where the item
+--- has a value equal to {expr}.  There is no automatic
+--- conversion, so the String "4" is different from the Number 4.
+--- And the Number 4 is different from the Float 4.0.  The value
+--- of 'ignorecase' is not used here, case matters as indicated by
+--- the {ic} argument.
+---
+--- If {object} is a |Blob| return the lowest index where the byte
+--- value is equal to {expr}.
+---
+--- If {start} is given then start looking at the item with index
+--- {start} (may be negative for an item relative to the end).
+---
+--- When {ic} is given and it is |TRUE|, ignore case.  Otherwise
+--- case must match.
+---
+--- -1 is returned when {expr} is not found in {object}.
+--- Example: >
+---   :let idx = index(words, "the")
+---   :if index(numbers, 123) >= 0
+---
+--- <Can also be used as a |method|: >
+---   GetObject()->index(what)
+---
+--- @param object any
+--- @param expr any
+--- @param start? any
+--- @param ic? any
+--- @return any
+function vim.fn.index(object, expr, start, ic) end
+
+--- Returns the index of an item in {object} where {expr} is
+--- v:true.  {object} must be a |List| or a |Blob|.
+---
+--- If {object} is a |List|, evaluate {expr} for each item in the
+--- List until the expression is v:true and return the index of
+--- this item.
+---
+--- If {object} is a |Blob| evaluate {expr} for each byte in the
+--- Blob until the expression is v:true and return the index of
+--- this byte.
+---
+--- {expr} must be a |string| or |Funcref|.
+---
+--- If {expr} is a |string|: If {object} is a |List|, inside
+--- {expr} |v:key| has the index of the current List item and
+--- |v:val| has the value of the item.  If {object} is a |Blob|,
+--- inside {expr} |v:key| has the index of the current byte and
+--- |v:val| has the byte value.
+---
+--- If {expr} is a |Funcref| it must take two arguments:
+---   1. the key or the index of the current item.
+---   2. the value of the current item.
+--- The function must return |TRUE| if the item is found and the
+--- search should stop.
+---
+--- The optional argument {opts} is a Dict and supports the
+--- following items:
+---     startidx  start evaluating {expr} at the item with this
+---     index; may be negative for an item relative to
+---     the end
+--- Returns -1 when {expr} evaluates to v:false for all the items.
+--- Example: >
+---   :let l = [#{n: 10}, #{n: 20}, #{n: 30}]
+---   :echo indexof(l, "v:val.n == 20")
+---   :echo indexof(l, {i, v -> v.n == 30})
+---   :echo indexof(l, "v:val.n == 20", #{startidx: 1})
+---
+--- <Can also be used as a |method|: >
+---   mylist->indexof(expr)
+---
+--- @param object any
+--- @param expr any
+--- @param opts? table
+--- @return any
+function vim.fn.indexof(object, expr, opts) end
+
+--- The result is a String, which is whatever the user typed on
+--- the command-line.  The {prompt} argument is either a prompt
+--- string, or a blank string (for no prompt).  A '\n' can be used
+--- in the prompt to start a new line.
+---
+--- In the second form it accepts a single dictionary with the
+--- following keys, any of which may be omitted:
+---
+--- Key           Default  Description ~
+--- prompt        ""       Same as {prompt} in the first form.
+--- default       ""       Same as {text} in the first form.
+--- completion    nothing  Same as {completion} in the first form.
+--- cancelreturn  ""       The value returned when the dialog is
+---                        cancelled.
+--- highlight     nothing  Highlight handler: |Funcref|.
+---
+--- The highlighting set with |:echohl| is used for the prompt.
+--- The input is entered just like a command-line, with the same
+--- editing commands and mappings.  There is a separate history
+--- for lines typed for input().
+--- Example: >
+---   :if input("Coffee or beer? ") == "beer"
+---   :  echo "Cheers!"
+---   :endif
+--- <
+--- If the optional {text} argument is present and not empty, this
+--- is used for the default reply, as if the user typed this.
+--- Example: >
+---   :let color = input("Color? ", "white")
+---
+--- <The optional {completion} argument specifies the type of
+--- completion supported for the input.  Without it completion is
+--- not performed.  The supported completion types are the same as
+--- that can be supplied to a user-defined command using the
+--- "-complete=" argument.  Refer to |:command-completion| for
+--- more information.  Example: >
+---   let fname = input("File: ", "", "file")
+---
+--- <      *input()-highlight* *E5400* *E5402*
+--- The optional `highlight` key allows specifying function which
+--- will be used for highlighting user input.  This function
+--- receives user input as its only argument and must return
+--- a list of 3-tuples [hl_start_col, hl_end_col + 1, hl_group]
+--- where
+---   hl_start_col is the first highlighted column,
+---   hl_end_col is the last highlighted column (+ 1!),
+---   hl_group is |:hi| group used for highlighting.
+---             *E5403* *E5404* *E5405* *E5406*
+--- Both hl_start_col and hl_end_col + 1 must point to the start
+--- of the multibyte character (highlighting must not break
+--- multibyte characters), hl_end_col + 1 may be equal to the
+--- input length.  Start column must be in range [0, len(input)),
+--- end column must be in range (hl_start_col, len(input)],
+--- sections must be ordered so that next hl_start_col is greater
+--- then or equal to previous hl_end_col.
+---
+--- Example (try some input with parentheses): >
+---   highlight RBP1 guibg=Red ctermbg=red
+---   highlight RBP2 guibg=Yellow ctermbg=yellow
+---   highlight RBP3 guibg=Green ctermbg=green
+---   highlight RBP4 guibg=Blue ctermbg=blue
+---   let g:rainbow_levels = 4
+---   function! RainbowParens(cmdline)
+---     let ret = []
+---     let i = 0
+---     let lvl = 0
+---     while i < len(a:cmdline)
+---       if a:cmdline[i] is# '('
+---         call add(ret, [i, i + 1, 'RBP' .. ((lvl % g:rainbow_levels) + 1)])
+---         let lvl += 1
+---       elseif a:cmdline[i] is# ')'
+---         let lvl -= 1
+---         call add(ret, [i, i + 1, 'RBP' .. ((lvl % g:rainbow_levels) + 1)])
+---       endif
+---       let i += 1
+---     endwhile
+---     return ret
+---   endfunction
+---   call input({'prompt':'>','highlight':'RainbowParens'})
+--- <
+--- Highlight function is called at least once for each new
+--- displayed input string, before command-line is redrawn.  It is
+--- expected that function is pure for the duration of one input()
+--- call, i.e. it produces the same output for the same input, so
+--- output may be memoized.  Function is run like under |:silent|
+--- modifier. If the function causes any errors, it will be
+--- skipped for the duration of the current input() call.
+---
+--- Highlighting is disabled if command-line contains arabic
+--- characters.
+---
+--- NOTE: This function must not be used in a startup file, for
+--- the versions that only run in GUI mode (e.g., the Win32 GUI).
+--- Note: When input() is called from within a mapping it will
+--- consume remaining characters from that mapping, because a
+--- mapping is handled like the characters were typed.
+--- Use |inputsave()| before input() and |inputrestore()|
+--- after input() to avoid that.  Another solution is to avoid
+--- that further characters follow in the mapping, e.g., by using
+--- |:execute| or |:normal|.
+---
+--- Example with a mapping: >
+---   :nmap \x :call GetFoo()<CR>:exe "/" .. Foo<CR>
+---   :function GetFoo()
+---   :  call inputsave()
+---   :  let g:Foo = input("enter search pattern: ")
+---   :  call inputrestore()
+---   :endfunction
+---
+--- <Can also be used as a |method|: >
+---   GetPrompt()->input()
+---
+--- @param opts table
+--- @return any
+function vim.fn.input(opts) end
+
+--- @deprecated
+--- Use |input()| instead.
+function vim.fn.inputdialog(...) end
+
+--- {textlist} must be a |List| of strings.  This |List| is
+--- displayed, one string per line.  The user will be prompted to
+--- enter a number, which is returned.
+--- The user can also select an item by clicking on it with the
+--- mouse, if the mouse is enabled in the command line ('mouse' is
+--- "a" or includes "c").  For the first string 0 is returned.
+--- When clicking above the first item a negative number is
+--- returned.  When clicking on the prompt one more than the
+--- length of {textlist} is returned.
+--- Make sure {textlist} has less than 'lines' entries, otherwise
+--- it won't work.  It's a good idea to put the entry number at
+--- the start of the string.  And put a prompt in the first item.
+--- Example: >
+---   let color = inputlist(['Select color:', '1. red',
+---     \ '2. green', '3. blue'])
+---
+--- <Can also be used as a |method|: >
+---   GetChoices()->inputlist()
+---
+--- @param textlist any
+--- @return any
+function vim.fn.inputlist(textlist) end
+
+--- Restore typeahead that was saved with a previous |inputsave()|.
+--- Should be called the same number of times inputsave() is
+--- called.  Calling it more often is harmless though.
+--- Returns TRUE when there is nothing to restore, FALSE otherwise.
+---
+--- @return any
+function vim.fn.inputrestore() end
+
+--- Preserve typeahead (also from mappings) and clear it, so that
+--- a following prompt gets input from the user.  Should be
+--- followed by a matching inputrestore() after the prompt.  Can
+--- be used several times, in which case there must be just as
+--- many inputrestore() calls.
+--- Returns TRUE when out of memory, FALSE otherwise.
+---
+--- @return any
+function vim.fn.inputsave() end
+
+--- This function acts much like the |input()| function with but
+--- two exceptions:
+--- a) the user's response will be displayed as a sequence of
+--- asterisks ("*") thereby keeping the entry secret, and
+--- b) the user's response will not be recorded on the input
+--- |history| stack.
+--- The result is a String, which is whatever the user actually
+--- typed on the command-line in response to the issued prompt.
+--- NOTE: Command-line completion is not supported.
+---
+--- Can also be used as a |method|: >
+---   GetPrompt()->inputsecret()
+---
+--- @param prompt any
+--- @param text? any
+--- @return any
+function vim.fn.inputsecret(prompt, text) end
+
+--- When {object} is a |List| or a |Blob| insert {item} at the start
+--- of it.
+---
+--- If {idx} is specified insert {item} before the item with index
+--- {idx}.  If {idx} is zero it goes before the first item, just
+--- like omitting {idx}.  A negative {idx} is also possible, see
+--- |list-index|.  -1 inserts just before the last item.
+---
+--- Returns the resulting |List| or |Blob|.  Examples: >
+---   :let mylist = insert([2, 3, 5], 1)
+---   :call insert(mylist, 4, -1)
+---   :call insert(mylist, 6, len(mylist))
+--- <The last example can be done simpler with |add()|.
+--- Note that when {item} is a |List| it is inserted as a single
+--- item.  Use |extend()| to concatenate |Lists|.
+---
+--- Can also be used as a |method|: >
+---   mylist->insert(item)
+---
+--- @param object any
+--- @param item any
+--- @param idx? integer
+--- @return any
+function vim.fn.insert(object, item, idx) end
+
+--- Interrupt script execution.  It works more or less like the
+--- user typing CTRL-C, most commands won't execute and control
+--- returns to the user.  This is useful to abort execution
+--- from lower down, e.g. in an autocommand.  Example: >
+--- :function s:check_typoname(file)
+--- :   if fnamemodify(a:file, ':t') == '['
+--- :       echomsg 'Maybe typo'
+--- :       call interrupt()
+--- :   endif
+--- :endfunction
+--- :au BufWritePre * call s:check_typoname(expand('<amatch>'))
+---
+--- @return any
+function vim.fn.interrupt() end
+
+--- Bitwise invert.  The argument is converted to a number.  A
+--- List, Dict or Float argument causes an error.  Example: >
+---   :let bits = invert(bits)
+--- <Can also be used as a |method|: >
+---   :let bits = bits->invert()
+---
+--- @param expr any
+--- @return any
+function vim.fn.invert(expr) end
+
+--- The result is a Number, which is |TRUE| when a directory
+--- with the name {directory} exists.  If {directory} doesn't
+--- exist, or isn't a directory, the result is |FALSE|.  {directory}
+--- is any expression, which is used as a String.
+---
+--- Can also be used as a |method|: >
+---   GetName()->isdirectory()
+---
+--- @param directory any
+--- @return 0|1
+function vim.fn.isdirectory(directory) end
+
+--- Return 1 if {expr} is a positive infinity, or -1 a negative
+--- infinity, otherwise 0. >
+---   :echo isinf(1.0 / 0.0)
+--- <  1 >
+---   :echo isinf(-1.0 / 0.0)
+--- <  -1
+---
+--- Can also be used as a |method|: >
+---   Compute()->isinf()
+---
+--- @param expr any
+--- @return 1|0|-1
+function vim.fn.isinf(expr) end
+
+--- The result is a Number, which is |TRUE| when {expr} is the
+--- name of a locked variable.
+--- The string argument {expr} must be the name of a variable,
+--- |List| item or |Dictionary| entry, not the variable itself!
+--- Example: >
+---   :let alist = [0, ['a', 'b'], 2, 3]
+---   :lockvar 1 alist
+---   :echo islocked('alist')    " 1
+---   :echo islocked('alist[1]')  " 0
+---
+--- <When {expr} is a variable that does not exist you get an error
+--- message.  Use |exists()| to check for existence.
+---
+--- Can also be used as a |method|: >
+---   GetName()->islocked()
+---
+--- @param expr any
+--- @return 0|1
+function vim.fn.islocked(expr) end
+
+--- Return |TRUE| if {expr} is a float with value NaN. >
+---   echo isnan(0.0 / 0.0)
+--- <  1
+---
+--- Can also be used as a |method|: >
+---   Compute()->isnan()
+---
+--- @param expr any
+--- @return 0|1
+function vim.fn.isnan(expr) end
+
+--- Return a |List| with all the key-value pairs of {dict}.  Each
+--- |List| item is a list with two items: the key of a {dict}
+--- entry and the value of this entry.  The |List| is in arbitrary
+--- order.  Also see |keys()| and |values()|.
+--- Example: >
+---   for [key, value] in items(mydict)
+---      echo key .. ': ' .. value
+---   endfor
+---
+--- <Can also be used as a |method|: >
+---   mydict->items()
+---
+--- @param dict any
+--- @return any
+function vim.fn.items(dict) end
+
+--- @deprecated
+--- Obsolete name for |chanclose()|
+function vim.fn.jobclose(...) end
+
+--- Return the PID (process id) of |job-id| {job}.
+---
+--- @param job any
+--- @return integer
+function vim.fn.jobpid(job) end
+
+--- Resize the pseudo terminal window of |job-id| {job} to {width}
+--- columns and {height} rows.
+--- Fails if the job was not started with `"pty":v:true`.
+---
+--- @param job any
+--- @param width integer
+--- @param height integer
+--- @return any
+function vim.fn.jobresize(job, width, height) end
+
+--- @deprecated
+--- Obsolete name for |chansend()|
+function vim.fn.jobsend(...) end
+
+--- Note: Prefer |vim.system()| in Lua.
+---
+--- Spawns {cmd} as a job.
+--- If {cmd} is a List it runs directly (no 'shell').
+--- If {cmd} is a String it runs in the 'shell', like this: >
+---   :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+--- <(See |shell-unquoting| for details.)
+---
+--- Example: >
+---   :call jobstart('nvim -h', {'on_stdout':{j,d,e->append(line('.'),d)}})
+--- <
+--- Returns |job-id| on success, 0 on invalid arguments (or job
+--- table is full), -1 if {cmd}[0] or 'shell' is not executable.
+--- The returned job-id is a valid |channel-id| representing the
+--- job's stdio streams. Use |chansend()| (or |rpcnotify()| and
+--- |rpcrequest()| if "rpc" was enabled) to send data to stdin and
+--- |chanclose()| to close the streams without stopping the job.
+---
+--- See |job-control| and |RPC|.
+---
+--- NOTE: on Windows if {cmd} is a List:
+---   - cmd[0] must be an executable (not a "built-in"). If it is
+---     in $PATH it can be called by name, without an extension: >
+---       :call jobstart(['ping', 'neovim.io'])
+--- <    If it is a full or partial path, extension is required: >
+---       :call jobstart(['System32\ping.exe', 'neovim.io'])
+--- <  - {cmd} is collapsed to a string of quoted args as expected
+---     by CommandLineToArgvW https://msdn.microsoft.com/bb776391
+---     unless cmd[0] is some form of "cmd.exe".
+---
+---           *jobstart-env*
+--- The job environment is initialized as follows:
+---   $NVIM                is set to |v:servername| of the parent Nvim
+---   $NVIM_LISTEN_ADDRESS is unset
+---   $NVIM_LOG_FILE       is unset
+---   $VIM                 is unset
+---   $VIMRUNTIME          is unset
+--- You can set these with the `env` option.
+---
+---           *jobstart-options*
+--- {opts} is a dictionary with these keys:
+---   clear_env:  (boolean) `env` defines the job environment
+---         exactly, instead of merging current environment.
+---   cwd:        (string, default=|current-directory|) Working
+---         directory of the job.
+---   detach:     (boolean) Detach the job process: it will not be
+---         killed when Nvim exits. If the process exits
+---         before Nvim, `on_exit` will be invoked.
+---   env:        (dict) Map of environment variable name:value
+---         pairs extending (or replace with "clear_env")
+---         the current environment. |jobstart-env|
+---   height:     (number) Height of the `pty` terminal.
+---   |on_exit|:    (function) Callback invoked when the job exits.
+---   |on_stdout|:  (function) Callback invoked when the job emits
+---         stdout data.
+---   |on_stderr|:  (function) Callback invoked when the job emits
+---         stderr data.
+---   overlapped: (boolean) Sets FILE_FLAG_OVERLAPPED for the
+---         stdio passed to the child process. Only on
+---         MS-Windows; ignored on other platforms.
+---   pty:        (boolean) Connect the job to a new pseudo
+---         terminal, and its streams to the master file
+---         descriptor. `on_stdout` receives all output,
+---         `on_stderr` is ignored. |terminal-start|
+---   rpc:        (boolean) Use |msgpack-rpc| to communicate with
+---         the job over stdio. Then `on_stdout` is ignored,
+---         but `on_stderr` can still be used.
+---   stderr_buffered: (boolean) Collect data until EOF (stream closed)
+---         before invoking `on_stderr`. |channel-buffered|
+---   stdout_buffered: (boolean) Collect data until EOF (stream
+---         closed) before invoking `on_stdout`. |channel-buffered|
+---   stdin:      (string) Either "pipe" (default) to connect the
+---         job's stdin to a channel or "null" to disconnect
+---         stdin.
+---   width:      (number) Width of the `pty` terminal.
+---
+--- {opts} is passed as |self| dictionary to the callback; the
+--- caller may set other keys to pass application-specific data.
+---
+--- Returns:
+---   - |channel-id| on success
+---   - 0 on invalid arguments
+---   - -1 if {cmd}[0] is not executable.
+--- See also |job-control|, |channel|, |msgpack-rpc|.
+---
+--- @param cmd any
+--- @param opts? table
+--- @return any
+function vim.fn.jobstart(cmd, opts) end
+
+--- Stop |job-id| {id} by sending SIGTERM to the job process. If
+--- the process does not terminate after a timeout then SIGKILL
+--- will be sent. When the job terminates its |on_exit| handler
+--- (if any) will be invoked.
+--- See |job-control|.
+---
+--- Returns 1 for valid job id, 0 for invalid id, including jobs have
+--- exited or stopped.
+---
+--- @param id any
+--- @return any
+function vim.fn.jobstop(id) end
+
+--- Waits for jobs and their |on_exit| handlers to complete.
+---
+--- {jobs} is a List of |job-id|s to wait for.
+--- {timeout} is the maximum waiting time in milliseconds. If
+--- omitted or -1, wait forever.
+---
+--- Timeout of 0 can be used to check the status of a job: >
+---   let running = jobwait([{job-id}], 0)[0] == -1
+--- <
+--- During jobwait() callbacks for jobs not in the {jobs} list may
+--- be invoked. The screen will not redraw unless |:redraw| is
+--- invoked by a callback.
+---
+--- Returns a list of len({jobs}) integers, where each integer is
+--- the status of the corresponding job:
+---   Exit-code, if the job exited
+---   -1 if the timeout was exceeded
+---   -2 if the job was interrupted (by |CTRL-C|)
+---   -3 if the job-id is invalid
+---
+--- @param jobs any
+--- @param timeout? integer
+--- @return any
+function vim.fn.jobwait(jobs, timeout) end
+
+--- Join the items in {list} together into one String.
+--- When {sep} is specified it is put in between the items.  If
+--- {sep} is omitted a single space is used.
+--- Note that {sep} is not added at the end.  You might want to
+--- add it there too: >
+---   let lines = join(mylist, "\n") .. "\n"
+--- <String items are used as-is.  |Lists| and |Dictionaries| are
+--- converted into a string like with |string()|.
+--- The opposite function is |split()|.
+---
+--- Can also be used as a |method|: >
+---   mylist->join()
+---
+--- @param list any
+--- @param sep? any
+--- @return any
+function vim.fn.join(list, sep) end
+
+--- Convert {expr} from JSON object.  Accepts |readfile()|-style
+--- list as the input, as well as regular string.  May output any
+--- Vim value. In the following cases it will output
+--- |msgpack-special-dict|:
+--- 1. Dictionary contains duplicate key.
+--- 2. Dictionary contains empty key.
+--- 3. String contains NUL byte.  Two special dictionaries: for
+---    dictionary and for string will be emitted in case string
+---    with NUL byte was a dictionary key.
+---
+--- Note: function treats its input as UTF-8 always.  The JSON
+--- standard allows only a few encodings, of which UTF-8 is
+--- recommended and the only one required to be supported.
+--- Non-UTF-8 characters are an error.
+---
+--- Can also be used as a |method|: >
+---   ReadObject()->json_decode()
+---
+--- @param expr any
+--- @return any
+function vim.fn.json_decode(expr) end
+
+--- Convert {expr} into a JSON string.  Accepts
+--- |msgpack-special-dict| as the input.  Will not convert
+--- |Funcref|s, mappings with non-string keys (can be created as
+--- |msgpack-special-dict|), values with self-referencing
+--- containers, strings which contain non-UTF-8 characters,
+--- pseudo-UTF-8 strings which contain codepoints reserved for
+--- surrogate pairs (such strings are not valid UTF-8 strings).
+--- Non-printable characters are converted into "\u1234" escapes
+--- or special escapes like "\t", other are dumped as-is.
+--- |Blob|s are converted to arrays of the individual bytes.
+---
+--- Can also be used as a |method|: >
+---   GetObject()->json_encode()
+---
+--- @param expr any
+--- @return any
+function vim.fn.json_encode(expr) end
+
+--- Return a |List| with all the keys of {dict}.  The |List| is in
+--- arbitrary order.  Also see |items()| and |values()|.
+---
+--- Can also be used as a |method|: >
+---   mydict->keys()
+---
+--- @param dict any
+--- @return any
+function vim.fn.keys(dict) end
+
+--- Turn the internal byte representation of keys into a form that
+--- can be used for |:map|.  E.g. >
+---   :let xx = "\<C-Home>"
+---   :echo keytrans(xx)
+--- <  <C-Home>
+---
+--- Can also be used as a |method|: >
+---   "\<C-Home>"->keytrans()
+---
+--- <          *len()* *E701*
+--- @param string string
+--- @return any
+function vim.fn.keytrans(string) end
+
+--- @deprecated
+--- Obsolete name for bufnr("$").
+function vim.fn.last_buffer_nr(...) end
+
+--- When {expr} is a String or a Number the length in bytes is
+--- used, as with |strlen()|.
+--- When {expr} is a |List| the number of items in the |List| is
+--- returned.
+--- When {expr} is a |Blob| the number of bytes is returned.
+--- When {expr} is a |Dictionary| the number of entries in the
+--- |Dictionary| is returned.
+--- Otherwise an error is given and returns zero.
+---
+--- Can also be used as a |method|: >
+---   mylist->len()
+---
+--- <        *libcall()* *E364* *E368*
+--- @param expr any
+--- @return any
+function vim.fn.len(expr) end
+
+--- Call function {funcname} in the run-time library {libname}
+--- with single argument {argument}.
+--- This is useful to call functions in a library that you
+--- especially made to be used with Vim.  Since only one argument
+--- is possible, calling standard library functions is rather
+--- limited.
+--- The result is the String returned by the function.  If the
+--- function returns NULL, this will appear as an empty string ""
+--- to Vim.
+--- If the function returns a number, use libcallnr()!
+--- If {argument} is a number, it is passed to the function as an
+--- int; if {argument} is a string, it is passed as a
+--- null-terminated string.
+---
+--- libcall() allows you to write your own 'plug-in' extensions to
+--- Vim without having to recompile the program.  It is NOT a
+--- means to call system functions!  If you try to do so Vim will
+--- very probably crash.
+---
+--- For Win32, the functions you write must be placed in a DLL
+--- and use the normal C calling convention (NOT Pascal which is
+--- used in Windows System DLLs).  The function must take exactly
+--- one parameter, either a character pointer or a long integer,
+--- and must return a character pointer or NULL.  The character
+--- pointer returned must point to memory that will remain valid
+--- after the function has returned (e.g. in static data in the
+--- DLL).  If it points to allocated memory, that memory will
+--- leak away.  Using a static buffer in the function should work,
+--- it's then freed when the DLL is unloaded.
+---
+--- WARNING: If the function returns a non-valid pointer, Vim may
+--- crash!  This also happens if the function returns a number,
+--- because Vim thinks it's a pointer.
+--- For Win32 systems, {libname} should be the filename of the DLL
+--- without the ".DLL" suffix.  A full path is only required if
+--- the DLL is not in the usual places.
+--- For Unix: When compiling your own plugins, remember that the
+--- object code must be compiled as position-independent ('PIC').
+--- Examples: >
+---   :echo libcall("libc.so", "getenv", "HOME")
+---
+--- <Can also be used as a |method|, the base is passed as the
+--- third argument: >
+---   GetValue()->libcall("libc.so", "getenv")
+--- <
+---           *libcallnr()*
+--- @param libname string
+--- @param funcname string
+--- @param argument any
+--- @return any
+function vim.fn.libcall(libname, funcname, argument) end
+
+--- Just like |libcall()|, but used for a function that returns an
+--- int instead of a string.
+--- Examples: >
+---   :echo libcallnr("/usr/lib/libc.so", "getpid", "")
+---   :call libcallnr("libc.so", "printf", "Hello World!\n")
+---   :call libcallnr("libc.so", "sleep", 10)
+--- <
+--- Can also be used as a |method|, the base is passed as the
+--- third argument: >
+---   GetValue()->libcallnr("libc.so", "printf")
+--- <
+--- @param libname string
+--- @param funcname string
+--- @param argument any
+--- @return any
+function vim.fn.libcallnr(libname, funcname, argument) end
+
+--- The result is a Number, which is the line number of the file
+--- position given with {expr}.  The {expr} argument is a string.
+--- The accepted positions are:
+---     .      the cursor position
+---     $      the last line in the current buffer
+---     'x      position of mark x (if the mark is not set, 0 is
+---       returned)
+---     w0      first line visible in current window (one if the
+---       display isn't updated, e.g. in silent Ex mode)
+---     w$      last line visible in current window (this is one
+---       less than "w0" if no lines are visible)
+---     v      In Visual mode: the start of the Visual area (the
+---       cursor is the end).  When not in Visual mode
+---       returns the cursor position.  Differs from |'<| in
+---       that it's updated right away.
+--- Note that a mark in another file can be used.  The line number
+--- then applies to another buffer.
+--- To get the column number use |col()|.  To get both use
+--- |getpos()|.
+--- With the optional {winid} argument the values are obtained for
+--- that window instead of the current window.
+--- Returns 0 for invalid values of {expr} and {winid}.
+--- Examples: >
+---   line(".")    line number of the cursor
+---   line(".", winid)  idem, in window "winid"
+---   line("'t")    line number of mark t
+---   line("'" .. marker)  line number of mark marker
+--- <
+--- To jump to the last known position when opening a file see
+--- |last-position-jump|.
+---
+--- Can also be used as a |method|: >
+---   GetValue()->line()
+---
+--- @param expr any
+--- @param winid? integer
+--- @return integer
+function vim.fn.line(expr, winid) end
+
+--- Return the byte count from the start of the buffer for line
+--- {lnum}.  This includes the end-of-line character, depending on
+--- the 'fileformat' option for the current buffer.  The first
+--- line returns 1. UTF-8 encoding is used, 'fileencoding' is
+--- ignored.  This can also be used to get the byte count for the
+--- line just below the last line: >
+---   line2byte(line("$") + 1)
+--- <This is the buffer size plus one.  If 'fileencoding' is empty
+--- it is the file size plus one.  {lnum} is used like with
+--- |getline()|.  When {lnum} is invalid -1 is returned.
+--- Also see |byte2line()|, |go| and |:goto|.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->line2byte()
+---
+--- @param lnum integer
+--- @return integer
+function vim.fn.line2byte(lnum) end
+
+--- Get the amount of indent for line {lnum} according the lisp
+--- indenting rules, as with 'lisp'.
+--- The indent is counted in spaces, the value of 'tabstop' is
+--- relevant.  {lnum} is used just like in |getline()|.
+--- When {lnum} is invalid, -1 is returned.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->lispindent()
+---
+--- @param lnum integer
+--- @return any
+function vim.fn.lispindent(lnum) end
+
+--- Return a Blob concatenating all the number values in {list}.
+--- Examples: >
+---   list2blob([1, 2, 3, 4])  returns 0z01020304
+---   list2blob([])    returns 0z
+--- <Returns an empty Blob on error.  If one of the numbers is
+--- negative or more than 255 error *E1239* is given.
+---
+--- |blob2list()| does the opposite.
+---
+--- Can also be used as a |method|: >
+---   GetList()->list2blob()
+---
+--- @param list any
+--- @return any
+function vim.fn.list2blob(list) end
+
+--- Convert each number in {list} to a character string can
+--- concatenate them all.  Examples: >
+---   list2str([32])    returns " "
+---   list2str([65, 66, 67])  returns "ABC"
+--- <The same can be done (slowly) with: >
+---   join(map(list, {nr, val -> nr2char(val)}), '')
+--- <|str2list()| does the opposite.
+---
+--- UTF-8 encoding is always used, {utf8} option has no effect,
+--- and exists only for backwards-compatibility.
+--- With UTF-8 composing characters work as expected: >
+---   list2str([97, 769])  returns "á"
+--- <
+--- Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   GetList()->list2str()
+---
+--- @param list any
+--- @param utf8? any
+--- @return any
+function vim.fn.list2str(list, utf8) end
+
+--- Return the current time, measured as seconds since 1st Jan
+--- 1970.  See also |strftime()|, |strptime()| and |getftime()|.
+---
+---
+--- @return any
+function vim.fn.localtime() end
+
+--- Return the natural logarithm (base e) of {expr} as a |Float|.
+--- {expr} must evaluate to a |Float| or a |Number| in the range
+--- (0, inf].
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo log(10)
+--- <  2.302585 >
+---   :echo log(exp(5))
+--- <  5.0
+---
+--- Can also be used as a |method|: >
+---   Compute()->log()
+---
+--- @param expr any
+--- @return any
+function vim.fn.log(expr) end
+
+--- Return the logarithm of Float {expr} to base 10 as a |Float|.
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo log10(1000)
+--- <  3.0 >
+---   :echo log10(0.01)
+--- <  -2.0
+---
+--- Can also be used as a |method|: >
+---   Compute()->log10()
+---
+--- @param expr any
+--- @return any
+function vim.fn.log10(expr) end
+
+--- Evaluate Lua expression {expr} and return its result converted
+--- to Vim data structures. See |lua-eval| for more details.
+---
+--- Can also be used as a |method|: >
+---   GetExpr()->luaeval()
+---
+--- @param expr any
+--- @param expr1? any
+--- @return any
+function vim.fn.luaeval(expr, expr1) end
+
+--- {expr1} must be a |List|, |Blob| or |Dictionary|.
+--- Replace each item in {expr1} with the result of evaluating
+--- {expr2}.  For a |Blob| each byte is replaced.
+---
+--- {expr2} must be a |string| or |Funcref|.
+---
+--- If {expr2} is a |string|, inside {expr2} |v:val| has the value
+--- of the current item.  For a |Dictionary| |v:key| has the key
+--- of the current item and for a |List| |v:key| has the index of
+--- the current item.  For a |Blob| |v:key| has the index of the
+--- current byte.
+--- Example: >
+---   :call map(mylist, '"> " .. v:val .. " <"')
+--- <This puts "> " before and " <" after each item in "mylist".
+---
+--- Note that {expr2} is the result of an expression and is then
+--- used as an expression again.  Often it is good to use a
+--- |literal-string| to avoid having to double backslashes.  You
+--- still have to double ' quotes
+---
+--- If {expr2} is a |Funcref| it is called with two arguments:
+---   1. The key or the index of the current item.
+---   2. the value of the current item.
+--- The function must return the new value of the item. Example
+--- that changes each value by "key-value": >
+---   func KeyValue(key, val)
+---     return a:key .. '-' .. a:val
+---   endfunc
+---   call map(myDict, function('KeyValue'))
+--- <It is shorter when using a |lambda|: >
+---   call map(myDict, {key, val -> key .. '-' .. val})
+--- <If you do not use "val" you can leave it out: >
+---   call map(myDict, {key -> 'item: ' .. key})
+--- <If you do not use "key" you can use a short name: >
+---   call map(myDict, {_, val -> 'item: ' .. val})
+--- <
+--- The operation is done in-place.  If you want a |List| or
+--- |Dictionary| to remain unmodified make a copy first: >
+---   :let tlist = map(copy(mylist), ' v:val .. "\t"')
+---
+--- <Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
+--- filtered.  When an error is encountered while evaluating
+--- {expr2} no further items in {expr1} are processed.  When
+--- {expr2} is a Funcref errors inside a function are ignored,
+--- unless it was defined with the "abort" flag.
+---
+--- Can also be used as a |method|: >
+---   mylist->map(expr2)
+---
+---
+--- @param expr1 any
+--- @param expr2 any
+--- @return any
+function vim.fn.map(expr1, expr2) end
+
+--- When {dict} is omitted or zero: Return the rhs of mapping
+--- {name} in mode {mode}.  The returned String has special
+--- characters translated like in the output of the ":map" command
+--- listing.
+---
+--- When there is no mapping for {name}, an empty String is
+--- returned if {dict} is FALSE, otherwise returns an empty Dict.
+--- When the mapping for {name} is empty, then "<Nop>" is
+--- returned.
+---
+--- The {name} can have special key names, like in the ":map"
+--- command.
+---
+--- {mode} can be one of these strings:
+---   "n"  Normal
+---   "v"  Visual (including Select)
+---   "o"  Operator-pending
+---   "i"  Insert
+---   "c"  Cmd-line
+---   "s"  Select
+---   "x"  Visual
+---   "l"  langmap |language-mapping|
+---   "t"  Terminal
+---   ""  Normal, Visual and Operator-pending
+--- When {mode} is omitted, the modes for "" are used.
+---
+--- When {abbr} is there and it is |TRUE| use abbreviations
+--- instead of mappings.
+---
+--- When {dict} is there and it is |TRUE| return a dictionary
+--- containing all the information of the mapping with the
+--- following items:
+---   "lhs"       The {lhs} of the mapping as it would be typed
+---   "lhsraw"   The {lhs} of the mapping as raw bytes
+---   "lhsrawalt" The {lhs} of the mapping as raw bytes, alternate
+---         form, only present when it differs from "lhsraw"
+---   "rhs"       The {rhs} of the mapping as typed.
+---   "silent"   1 for a |:map-silent| mapping, else 0.
+---   "noremap"  1 if the {rhs} of the mapping is not remappable.
+---   "script"   1 if mapping was defined with <script>.
+---   "expr"     1 for an expression mapping (|:map-<expr>|).
+---   "buffer"   1 for a buffer local mapping (|:map-local|).
+---   "mode"     Modes for which the mapping is defined. In
+---        addition to the modes mentioned above, these
+---        characters will be used:
+---        " "     Normal, Visual and Operator-pending
+---        "!"     Insert and Commandline mode
+---          (|mapmode-ic|)
+---   "sid"       The script local ID, used for <sid> mappings
+---        (|<SID>|).  Negative for special contexts.
+---   "lnum"     The line number in "sid", zero if unknown.
+---   "nowait"   Do not wait for other, longer mappings.
+---        (|:map-<nowait>|).
+---
+--- The dictionary can be used to restore a mapping with
+--- |mapset()|.
+---
+--- The mappings local to the current buffer are checked first,
+--- then the global mappings.
+--- This function can be used to map a key even when it's already
+--- mapped, and have it do the original mapping too.  Sketch: >
+---   exe 'nnoremap <Tab> ==' .. maparg('<Tab>', 'n')
+---
+--- <Can also be used as a |method|: >
+---   GetKey()->maparg('n')
+---
+--- @param name string
+--- @param mode? string
+--- @param abbr? any
+--- @param dict? any
+--- @return any
+function vim.fn.maparg(name, mode, abbr, dict) end
+
+--- Check if there is a mapping that matches with {name} in mode
+--- {mode}.  See |maparg()| for {mode} and special names in
+--- {name}.
+--- When {abbr} is there and it is non-zero use abbreviations
+--- instead of mappings.
+--- A match happens with a mapping that starts with {name} and
+--- with a mapping which is equal to the start of {name}.
+---
+---   matches mapping "a"  "ab"  "abc" ~
+---    mapcheck("a")  yes  yes   yes
+---    mapcheck("abc")  yes  yes   yes
+---    mapcheck("ax")  yes  no   no
+---    mapcheck("b")  no  no   no
+---
+--- The difference with maparg() is that mapcheck() finds a
+--- mapping that matches with {name}, while maparg() only finds a
+--- mapping for {name} exactly.
+--- When there is no mapping that starts with {name}, an empty
+--- String is returned.  If there is one, the RHS of that mapping
+--- is returned.  If there are several mappings that start with
+--- {name}, the RHS of one of them is returned.  This will be
+--- "<Nop>" if the RHS is empty.
+--- The mappings local to the current buffer are checked first,
+--- then the global mappings.
+--- This function can be used to check if a mapping can be added
+--- without being ambiguous.  Example: >
+---   :if mapcheck("_vv") == ""
+---   :   map _vv :set guifont=7x13<CR>
+---   :endif
+--- <This avoids adding the "_vv" mapping when there already is a
+--- mapping for "_v" or for "_vvv".
+---
+--- Can also be used as a |method|: >
+---   GetKey()->mapcheck('n')
+---
+--- @param name string
+--- @param mode? string
+--- @param abbr? any
+--- @return any
+function vim.fn.mapcheck(name, mode, abbr) end
+
+--- Restore a mapping from a dictionary returned by |maparg()|.
+--- {mode} and {abbr} should be the same as for the call to
+--- |maparg()|. *E460*
+--- {mode} is used to define the mode in which the mapping is set,
+--- not the "mode" entry in {dict}.
+--- Example for saving and restoring a mapping: >
+---   let save_map = maparg('K', 'n', 0, 1)
+---   nnoremap K somethingelse
+---   ...
+---   call mapset('n', 0, save_map)
+--- <Note that if you are going to replace a map in several modes,
+--- e.g. with `:map!`, you need to save the mapping for all of
+--- them, since they can differ.
+---
+---
+--- @param mode string
+--- @param abbr any
+--- @param dict any
+--- @return any
+function vim.fn.mapset(mode, abbr, dict) end
+
+--- When {expr} is a |List| then this returns the index of the
+--- first item where {pat} matches.  Each item is used as a
+--- String, |Lists| and |Dictionaries| are used as echoed.
+---
+--- Otherwise, {expr} is used as a String.  The result is a
+--- Number, which gives the index (byte offset) in {expr} where
+--- {pat} matches.
+---
+--- A match at the first character or |List| item returns zero.
+--- If there is no match -1 is returned.
+---
+--- For getting submatches see |matchlist()|.
+--- Example: >
+---   :echo match("testing", "ing")  " results in 4
+---   :echo match([1, 'x'], '\a')  " results in 1
+--- <See |string-match| for how {pat} is used.
+---             *strpbrk()*
+--- Vim doesn't have a strpbrk() function.  But you can do: >
+---   :let sepidx = match(line, '[.,;: \t]')
+--- <            *strcasestr()*
+--- Vim doesn't have a strcasestr() function.  But you can add
+--- "\c" to the pattern to ignore case: >
+---   :let idx = match(haystack, '\cneedle')
+--- <
+--- If {start} is given, the search starts from byte index
+--- {start} in a String or item {start} in a |List|.
+--- The result, however, is still the index counted from the
+--- first character/item.  Example: >
+---   :echo match("testing", "ing", 2)
+--- <result is again "4". >
+---   :echo match("testing", "ing", 4)
+--- <result is again "4". >
+---   :echo match("testing", "t", 2)
+--- <result is "3".
+--- For a String, if {start} > 0 then it is like the string starts
+--- {start} bytes later, thus "^" will match at {start}.  Except
+--- when {count} is given, then it's like matches before the
+--- {start} byte are ignored (this is a bit complicated to keep it
+--- backwards compatible).
+--- For a String, if {start} < 0, it will be set to 0.  For a list
+--- the index is counted from the end.
+--- If {start} is out of range ({start} > strlen({expr}) for a
+--- String or {start} > len({expr}) for a |List|) -1 is returned.
+---
+--- When {count} is given use the {count}th match.  When a match
+--- is found in a String the search for the next one starts one
+--- character further.  Thus this example results in 1: >
+---   echo match("testing", "..", 0, 2)
+--- <In a |List| the search continues in the next item.
+--- Note that when {count} is added the way {start} works changes,
+--- see above.
+---
+--- See |pattern| for the patterns that are accepted.
+--- The 'ignorecase' option is used to set the ignore-caseness of
+--- the pattern.  'smartcase' is NOT used.  The matching is always
+--- done like 'magic' is set and 'cpoptions' is empty.
+--- Note that a match at the start is preferred, thus when the
+--- pattern is using "*" (any number of matches) it tends to find
+--- zero matches at the start instead of a number of matches
+--- further down in the text.
+---
+--- Can also be used as a |method|: >
+---   GetText()->match('word')
+---   GetList()->match('word')
+--- <
+---   *matchadd()* *E798* *E799* *E801* *E957*
+--- @param expr any
+--- @param pat any
+--- @param start? any
+--- @param count? any
+--- @return any
+function vim.fn.match(expr, pat, start, count) end
+
+--- Defines a pattern to be highlighted in the current window (a
+--- "match").  It will be highlighted with {group}.  Returns an
+--- identification number (ID), which can be used to delete the
+--- match using |matchdelete()|.  The ID is bound to the window.
+--- Matching is case sensitive and magic, unless case sensitivity
+--- or magicness are explicitly overridden in {pattern}.  The
+--- 'magic', 'smartcase' and 'ignorecase' options are not used.
+--- The "Conceal" value is special, it causes the match to be
+--- concealed.
+---
+--- The optional {priority} argument assigns a priority to the
+--- match.  A match with a high priority will have its
+--- highlighting overrule that of a match with a lower priority.
+--- A priority is specified as an integer (negative numbers are no
+--- exception).  If the {priority} argument is not specified, the
+--- default priority is 10.  The priority of 'hlsearch' is zero,
+--- hence all matches with a priority greater than zero will
+--- overrule it.  Syntax highlighting (see 'syntax') is a separate
+--- mechanism, and regardless of the chosen priority a match will
+--- always overrule syntax highlighting.
+---
+--- The optional {id} argument allows the request for a specific
+--- match ID.  If a specified ID is already taken, an error
+--- message will appear and the match will not be added.  An ID
+--- is specified as a positive integer (zero excluded).  IDs 1, 2
+--- and 3 are reserved for |:match|, |:2match| and |:3match|,
+--- respectively.  3 is reserved for use by the |matchparen|
+--- plugin.
+--- If the {id} argument is not specified or -1, |matchadd()|
+--- automatically chooses a free ID, which is at least 1000.
+---
+--- The optional {dict} argument allows for further custom
+--- values. Currently this is used to specify a match specific
+--- conceal character that will be shown for |hl-Conceal|
+--- highlighted matches. The dict can have the following members:
+---
+---   conceal      Special character to show instead of the
+---         match (only for |hl-Conceal| highlighted
+---         matches, see |:syn-cchar|)
+---   window      Instead of the current window use the
+---         window with this number or window ID.
+---
+--- The number of matches is not limited, as it is the case with
+--- the |:match| commands.
+---
+--- Returns -1 on error.
+---
+--- Example: >
+---   :highlight MyGroup ctermbg=green guibg=green
+---   :let m = matchadd("MyGroup", "TODO")
+--- <Deletion of the pattern: >
+---   :call matchdelete(m)
+---
+--- <A list of matches defined by |matchadd()| and |:match| are
+--- available from |getmatches()|.  All matches can be deleted in
+--- one operation by |clearmatches()|.
+---
+--- Can also be used as a |method|: >
+---   GetGroup()->matchadd('TODO')
+--- <
+---           *matchaddpos()*
+--- @param group any
+--- @param pattern any
+--- @param priority? any
+--- @param id? any
+--- @param dict? any
+--- @return any
+function vim.fn.matchadd(group, pattern, priority, id, dict) end
+
+--- Same as |matchadd()|, but requires a list of positions {pos}
+--- instead of a pattern. This command is faster than |matchadd()|
+--- because it does not require to handle regular expressions and
+--- sets buffer line boundaries to redraw screen. It is supposed
+--- to be used when fast match additions and deletions are
+--- required, for example to highlight matching parentheses.
+---           *E5030* *E5031*
+--- {pos} is a list of positions.  Each position can be one of
+--- these:
+--- - A number.  This whole line will be highlighted.  The first
+---   line has number 1.
+--- - A list with one number, e.g., [23]. The whole line with this
+---   number will be highlighted.
+--- - A list with two numbers, e.g., [23, 11]. The first number is
+---   the line number, the second one is the column number (first
+---   column is 1, the value must correspond to the byte index as
+---   |col()| would return).  The character at this position will
+---   be highlighted.
+--- - A list with three numbers, e.g., [23, 11, 3]. As above, but
+---   the third number gives the length of the highlight in bytes.
+---
+--- Entries with zero and negative line numbers are silently
+--- ignored, as well as entries with negative column numbers and
+--- lengths.
+---
+--- Returns -1 on error.
+---
+--- Example: >
+---   :highlight MyGroup ctermbg=green guibg=green
+---   :let m = matchaddpos("MyGroup", [[23, 24], 34])
+--- <Deletion of the pattern: >
+---   :call matchdelete(m)
+---
+--- <Matches added by |matchaddpos()| are returned by
+--- |getmatches()|.
+---
+--- Can also be used as a |method|: >
+---   GetGroup()->matchaddpos([23, 11])
+---
+--- @param group any
+--- @param pos any
+--- @param priority? any
+--- @param id? any
+--- @param dict? any
+--- @return any
+function vim.fn.matchaddpos(group, pos, priority, id, dict) end
+
+--- Selects the {nr} match item, as set with a |:match|,
+--- |:2match| or |:3match| command.
+--- Return a |List| with two elements:
+---   The name of the highlight group used
+---   The pattern used.
+--- When {nr} is not 1, 2 or 3 returns an empty |List|.
+--- When there is no match item set returns ['', ''].
+--- This is useful to save and restore a |:match|.
+--- Highlighting matches using the |:match| commands are limited
+--- to three matches. |matchadd()| does not have this limitation.
+---
+--- Can also be used as a |method|: >
+---   GetMatch()->matcharg()
+---
+--- @param nr integer
+--- @return any
+function vim.fn.matcharg(nr) end
+
+--- Deletes a match with ID {id} previously defined by |matchadd()|
+--- or one of the |:match| commands.  Returns 0 if successful,
+--- otherwise -1.  See example for |matchadd()|.  All matches can
+--- be deleted in one operation by |clearmatches()|.
+--- If {win} is specified, use the window with this number or
+--- window ID instead of the current window.
+---
+--- Can also be used as a |method|: >
+---   GetMatch()->matchdelete()
+---
+--- @param id any
+--- @param win? any
+--- @return any
+function vim.fn.matchdelete(id, win) end
+
+--- Same as |match()|, but return the index of first character
+--- after the match.  Example: >
+---   :echo matchend("testing", "ing")
+--- <results in "7".
+---           *strspn()* *strcspn()*
+--- Vim doesn't have a strspn() or strcspn() function, but you can
+--- do it with matchend(): >
+---   :let span = matchend(line, '[a-zA-Z]')
+---   :let span = matchend(line, '[^a-zA-Z]')
+--- <Except that -1 is returned when there are no matches.
+---
+--- The {start}, if given, has the same meaning as for |match()|. >
+---   :echo matchend("testing", "ing", 2)
+--- <results in "7". >
+---   :echo matchend("testing", "ing", 5)
+--- <result is "-1".
+--- When {expr} is a |List| the result is equal to |match()|.
+---
+--- Can also be used as a |method|: >
+---   GetText()->matchend('word')
+---
+--- @param expr any
+--- @param pat any
+--- @param start? any
+--- @param count? any
+--- @return any
+function vim.fn.matchend(expr, pat, start, count) end
+
+--- If {list} is a list of strings, then returns a |List| with all
+--- the strings in {list} that fuzzy match {str}. The strings in
+--- the returned list are sorted based on the matching score.
+---
+--- The optional {dict} argument always supports the following
+--- items:
+---     matchseq  When this item is present return only matches
+---     that contain the characters in {str} in the
+---     given sequence.
+---     limit  Maximum number of matches in {list} to be
+---     returned.  Zero means no limit.
+---
+--- If {list} is a list of dictionaries, then the optional {dict}
+--- argument supports the following additional items:
+---     key    Key of the item which is fuzzy matched against
+---     {str}. The value of this item should be a
+---     string.
+---     text_cb  |Funcref| that will be called for every item
+---     in {list} to get the text for fuzzy matching.
+---     This should accept a dictionary item as the
+---     argument and return the text for that item to
+---     use for fuzzy matching.
+---
+--- {str} is treated as a literal string and regular expression
+--- matching is NOT supported.  The maximum supported {str} length
+--- is 256.
+---
+--- When {str} has multiple words each separated by white space,
+--- then the list of strings that have all the words is returned.
+---
+--- If there are no matching strings or there is an error, then an
+--- empty list is returned. If length of {str} is greater than
+--- 256, then returns an empty list.
+---
+--- When {limit} is given, matchfuzzy() will find up to this
+--- number of matches in {list} and return them in sorted order.
+---
+--- Refer to |fuzzy-matching| for more information about fuzzy
+--- matching strings.
+---
+--- Example: >
+---    :echo matchfuzzy(["clay", "crow"], "cay")
+--- <results in ["clay"]. >
+---    :echo getbufinfo()->map({_, v -> v.name})->matchfuzzy("ndl")
+--- <results in a list of buffer names fuzzy matching "ndl". >
+---    :echo getbufinfo()->matchfuzzy("ndl", {'key' : 'name'})
+--- <results in a list of buffer information dicts with buffer
+--- names fuzzy matching "ndl". >
+---    :echo getbufinfo()->matchfuzzy("spl",
+---         \ {'text_cb' : {v -> v.name}})
+--- <results in a list of buffer information dicts with buffer
+--- names fuzzy matching "spl". >
+---    :echo v:oldfiles->matchfuzzy("test")
+--- <results in a list of file names fuzzy matching "test". >
+---    :let l = readfile("buffer.c")->matchfuzzy("str")
+--- <results in a list of lines in "buffer.c" fuzzy matching "str". >
+---    :echo ['one two', 'two one']->matchfuzzy('two one')
+--- <results in `['two one', 'one two']` . >
+---    :echo ['one two', 'two one']->matchfuzzy('two one',
+---         \ {'matchseq': 1})
+--- <results in `['two one']`.
+---
+--- @param list any
+--- @param str any
+--- @param dict? any
+--- @return any
+function vim.fn.matchfuzzy(list, str, dict) end
+
+--- Same as |matchfuzzy()|, but returns the list of matched
+--- strings, the list of character positions where characters
+--- in {str} matches and a list of matching scores.  You can
+--- use |byteidx()| to convert a character position to a byte
+--- position.
+---
+--- If {str} matches multiple times in a string, then only the
+--- positions for the best match is returned.
+---
+--- If there are no matching strings or there is an error, then a
+--- list with three empty list items is returned.
+---
+--- Example: >
+---   :echo matchfuzzypos(['testing'], 'tsg')
+--- <results in [["testing"], [[0, 2, 6]], [99]] >
+---   :echo matchfuzzypos(['clay', 'lacy'], 'la')
+--- <results in [["lacy", "clay"], [[0, 1], [1, 2]], [153, 133]] >
+---   :echo [{'text': 'hello', 'id' : 10}]
+---     \ ->matchfuzzypos('ll', {'key' : 'text'})
+--- <results in `[[{"id": 10, "text": "hello"}], [[2, 3]], [127]]`
+---
+--- @param list any
+--- @param str any
+--- @param dict? any
+--- @return any
+function vim.fn.matchfuzzypos(list, str, dict) end
+
+--- Same as |match()|, but return a |List|.  The first item in the
+--- list is the matched string, same as what matchstr() would
+--- return.  Following items are submatches, like "\1", "\2", etc.
+--- in |:substitute|.  When an optional submatch didn't match an
+--- empty string is used.  Example: >
+---   echo matchlist('acd', '\(a\)\?\(b\)\?\(c\)\?\(.*\)')
+--- <Results in: ['acd', 'a', '', 'c', 'd', '', '', '', '', '']
+--- When there is no match an empty list is returned.
+---
+--- You can pass in a List, but that is not very useful.
+---
+--- Can also be used as a |method|: >
+---   GetText()->matchlist('word')
+---
+--- @param expr any
+--- @param pat any
+--- @param start? any
+--- @param count? any
+--- @return any
+function vim.fn.matchlist(expr, pat, start, count) end
+
+--- Same as |match()|, but return the matched string.  Example: >
+---   :echo matchstr("testing", "ing")
+--- <results in "ing".
+--- When there is no match "" is returned.
+--- The {start}, if given, has the same meaning as for |match()|. >
+---   :echo matchstr("testing", "ing", 2)
+--- <results in "ing". >
+---   :echo matchstr("testing", "ing", 5)
+--- <result is "".
+--- When {expr} is a |List| then the matching item is returned.
+--- The type isn't changed, it's not necessarily a String.
+---
+--- Can also be used as a |method|: >
+---   GetText()->matchstr('word')
+---
+--- @param expr any
+--- @param pat any
+--- @param start? any
+--- @param count? any
+--- @return any
+function vim.fn.matchstr(expr, pat, start, count) end
+
+--- Same as |matchstr()|, but return the matched string, the start
+--- position and the end position of the match.  Example: >
+---   :echo matchstrpos("testing", "ing")
+--- <results in ["ing", 4, 7].
+--- When there is no match ["", -1, -1] is returned.
+--- The {start}, if given, has the same meaning as for |match()|. >
+---   :echo matchstrpos("testing", "ing", 2)
+--- <results in ["ing", 4, 7]. >
+---   :echo matchstrpos("testing", "ing", 5)
+--- <result is ["", -1, -1].
+--- When {expr} is a |List| then the matching item, the index
+--- of first item where {pat} matches, the start position and the
+--- end position of the match are returned. >
+---   :echo matchstrpos([1, '__x'], '\a')
+--- <result is ["x", 1, 2, 3].
+--- The type isn't changed, it's not necessarily a String.
+---
+--- Can also be used as a |method|: >
+---   GetText()->matchstrpos('word')
+--- <
+---
+---           *max()*
+--- @param expr any
+--- @param pat any
+--- @param start? any
+--- @param count? any
+--- @return any
+function vim.fn.matchstrpos(expr, pat, start, count) end
+
+---   echo max([apples, pears, oranges])
+---
+--- <{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
+--- it returns the maximum of all values in the Dictionary.
+--- If {expr} is neither a List nor a Dictionary, or one of the
+--- items in {expr} cannot be used as a Number this results in
+---                 an error.  An empty |List| or |Dictionary| results in zero.
+---
+--- Can also be used as a |method|: >
+---   mylist->max()
+---
+---
+--- @param expr any
+--- @return any
+function vim.fn.max(expr) end
+
+--- Returns a |List| of |Dictionaries| describing |menus| (defined
+--- by |:menu|, |:amenu|, …), including |hidden-menus|.
+---
+--- {path} matches a menu by name, or all menus if {path} is an
+--- empty string.  Example: >
+---   :echo menu_get('File','')
+---   :echo menu_get('')
+--- <
+--- {modes} is a string of zero or more modes (see |maparg()| or
+--- |creating-menus| for the list of modes). "a" means "all".
+---
+--- Example: >
+---   nnoremenu &Test.Test inormal
+---   inoremenu Test.Test insert
+---   vnoremenu Test.Test x
+---   echo menu_get("")
+---
+--- <returns something like this: >
+---
+---   [ {
+---     "hidden": 0,
+---     "name": "Test",
+---     "priority": 500,
+---     "shortcut": 84,
+---     "submenus": [ {
+---       "hidden": 0,
+---       "mappings": {
+---         i": {
+---     "enabled": 1,
+---     "noremap": 1,
+---     "rhs": "insert",
+---     "sid": 1,
+---     "silent": 0
+---         },
+---         n": { ... },
+---         s": { ... },
+---         v": { ... }
+---       },
+---       "name": "Test",
+---       "priority": 500,
+---       "shortcut": 0
+---     } ]
+---   } ]
+--- <
+---
+--- @param path string
+--- @param modes? any
+--- @return any
+function vim.fn.menu_get(path, modes) end
+
+--- Return information about the specified menu {name} in
+--- mode {mode}. The menu name should be specified without the
+--- shortcut character ('&'). If {name} is "", then the top-level
+--- menu names are returned.
+---
+--- {mode} can be one of these strings:
+---   "n"  Normal
+---   "v"  Visual (including Select)
+---   "o"  Operator-pending
+---   "i"  Insert
+---   "c"  Cmd-line
+---   "s"  Select
+---   "x"  Visual
+---   "t"  Terminal-Job
+---   ""  Normal, Visual and Operator-pending
+---   "!"  Insert and Cmd-line
+--- When {mode} is omitted, the modes for "" are used.
+---
+--- Returns a |Dictionary| containing the following items:
+---   accel    menu item accelerator text |menu-text|
+---   display  display name (name without '&')
+---   enabled  v:true if this menu item is enabled
+---     Refer to |:menu-enable|
+---   icon    name of the icon file (for toolbar)
+---     |toolbar-icon|
+---   iconidx  index of a built-in icon
+---   modes    modes for which the menu is defined. In
+---     addition to the modes mentioned above, these
+---     characters will be used:
+---     " "  Normal, Visual and Operator-pending
+---   name    menu item name.
+---   noremenu  v:true if the {rhs} of the menu item is not
+---     remappable else v:false.
+---   priority  menu order priority |menu-priority|
+---   rhs    right-hand-side of the menu item. The returned
+---     string has special characters translated like
+---     in the output of the ":menu" command listing.
+---     When the {rhs} of a menu item is empty, then
+---     "<Nop>" is returned.
+---   script  v:true if script-local remapping of {rhs} is
+---     allowed else v:false.  See |:menu-script|.
+---   shortcut  shortcut key (character after '&' in
+---     the menu name) |menu-shortcut|
+---   silent  v:true if the menu item is created
+---     with <silent> argument |:menu-silent|
+---   submenus  |List| containing the names of
+---     all the submenus.  Present only if the menu
+---     item has submenus.
+---
+--- Returns an empty dictionary if the menu item is not found.
+---
+--- Examples: >
+---   :echo menu_info('Edit.Cut')
+---   :echo menu_info('File.Save', 'n')
+---
+---   " Display the entire menu hierarchy in a buffer
+---   func ShowMenu(name, pfx)
+---     let m = menu_info(a:name)
+---     call append(line('$'), a:pfx .. m.display)
+---     for child in m->get('submenus', [])
+---       call ShowMenu(a:name .. '.' .. escape(child, '.'),
+---           \ a:pfx .. '    ')
+---     endfor
+---   endfunc
+---   new
+---   for topmenu in menu_info('').submenus
+---     call ShowMenu(topmenu, '')
+---   endfor
+--- <
+--- Can also be used as a |method|: >
+---   GetMenuName()->menu_info('v')
+---
+---
+--- <          *min()*
+--- @param name string
+--- @param mode? string
+--- @return any
+function vim.fn.menu_info(name, mode) end
+
+---   echo min([apples, pears, oranges])
+---
+--- <{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
+--- it returns the minimum of all values in the Dictionary.
+--- If {expr} is neither a List nor a Dictionary, or one of the
+--- items in {expr} cannot be used as a Number this results in
+--- an error.  An empty |List| or |Dictionary| results in zero.
+---
+--- Can also be used as a |method|: >
+---   mylist->min()
+---
+--- <          *mkdir()* *E739*
+--- @param expr any
+--- @return any
+function vim.fn.min(expr) end
+
+--- Create directory {name}.
+---
+--- When {flags} is present it must be a string.  An empty string
+--- has no effect.
+---
+--- If {flags} contains "p" then intermediate directories are
+--- created as necessary.
+---
+--- If {flags} contains "D" then {name} is deleted at the end of
+--- the current function, as with: >
+---   defer delete({name}, 'd')
+--- <
+--- If {flags} contains "R" then {name} is deleted recursively at
+--- the end of the current function, as with: >
+---   defer delete({name}, 'rf')
+--- <Note that when {name} has more than one part and "p" is used
+--- some directories may already exist.  Only the first one that
+--- is created and what it contains is scheduled to be deleted.
+--- E.g. when using: >
+---   call mkdir('subdir/tmp/autoload', 'pR')
+--- <and "subdir" already exists then "subdir/tmp" will be
+--- scheduled for deletion, like with: >
+---   defer delete('subdir/tmp', 'rf')
+--- <
+--- If {prot} is given it is used to set the protection bits of
+--- the new directory.  The default is 0o755 (rwxr-xr-x: r/w for
+--- the user, readable for others).  Use 0o700 to make it
+--- unreadable for others.
+---
+--- {prot} is applied for all parts of {name}.  Thus if you create
+--- /tmp/foo/bar then /tmp/foo will be created with 0o700. Example: >
+---   :call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
+---
+--- <This function is not available in the |sandbox|.
+---
+--- If you try to create an existing directory with {flags} set to
+--- "p" mkdir() will silently exit.
+---
+--- The function result is a Number, which is TRUE if the call was
+--- successful or FALSE if the directory creation failed or partly
+--- failed.
+---
+--- Can also be used as a |method|: >
+---   GetName()->mkdir()
+--- <
+---           *mode()*
+--- @param name string
+--- @param flags? string
+--- @param prot? any
+--- @return any
+function vim.fn.mkdir(name, flags, prot) end
+
+--- If [expr] is supplied and it evaluates to a non-zero Number or
+--- a non-empty String (|non-zero-arg|), then the full mode is
+--- returned, otherwise only the first letter is returned.
+---
+---    n      Normal
+---    no      Operator-pending
+---    nov      Operator-pending (forced charwise |o_v|)
+---    noV      Operator-pending (forced linewise |o_V|)
+---    noCTRL-V Operator-pending (forced blockwise |o_CTRL-V|)
+---     CTRL-V is one character
+---    niI      Normal using |i_CTRL-O| in |Insert-mode|
+---    niR      Normal using |i_CTRL-O| in |Replace-mode|
+---    niV      Normal using |i_CTRL-O| in |Virtual-Replace-mode|
+---    nt      Normal in |terminal-emulator| (insert goes to
+---     Terminal mode)
+---    ntT      Normal using |t_CTRL-\_CTRL-O| in |Terminal-mode|
+---    v      Visual by character
+---    vs      Visual by character using |v_CTRL-O| in Select mode
+---    V      Visual by line
+---    Vs      Visual by line using |v_CTRL-O| in Select mode
+---    CTRL-V   Visual blockwise
+---    CTRL-Vs  Visual blockwise using |v_CTRL-O| in Select mode
+---    s      Select by character
+---    S      Select by line
+---    CTRL-S   Select blockwise
+---    i      Insert
+---    ic      Insert mode completion |compl-generic|
+---    ix      Insert mode |i_CTRL-X| completion
+---    R      Replace |R|
+---    Rc      Replace mode completion |compl-generic|
+---    Rx      Replace mode |i_CTRL-X| completion
+---    Rv      Virtual Replace |gR|
+---    Rvc      Virtual Replace mode completion |compl-generic|
+---    Rvx      Virtual Replace mode |i_CTRL-X| completion
+---    c      Command-line editing
+---    cv      Vim Ex mode |gQ|
+---    r      Hit-enter prompt
+---    rm      The -- more -- prompt
+---    r?      A |:confirm| query of some sort
+---    !      Shell or external command is executing
+---    t      Terminal mode: keys go to the job
+---
+--- This is useful in the 'statusline' option or RPC calls. In
+--- most other places it always returns "c" or "n".
+--- Note that in the future more modes and more specific modes may
+--- be added. It's better not to compare the whole string but only
+--- the leading character(s).
+--- Also see |visualmode()|.
+---
+--- Can also be used as a |method|: >
+---   DoFull()->mode()
+---
+--- @return any
+function vim.fn.mode() end
+
+--- Convert a list of Vimscript objects to msgpack. Returned value is a
+--- |readfile()|-style list. When {type} contains "B", a |Blob| is
+--- returned instead. Example: >
+---   call writefile(msgpackdump([{}]), 'fname.mpack', 'b')
+--- <or, using a |Blob|: >
+---   call writefile(msgpackdump([{}], 'B'), 'fname.mpack')
+--- <
+--- This will write the single 0x80 byte to a `fname.mpack` file
+--- (dictionary with zero items is represented by 0x80 byte in
+--- messagepack).
+---
+--- Limitations:        *E5004* *E5005*
+--- 1. |Funcref|s cannot be dumped.
+--- 2. Containers that reference themselves cannot be dumped.
+--- 3. Dictionary keys are always dumped as STR strings.
+--- 4. Other strings and |Blob|s are always dumped as BIN strings.
+--- 5. Points 3. and 4. do not apply to |msgpack-special-dict|s.
+---
+--- @param list any
+--- @param type? any
+--- @return any
+function vim.fn.msgpackdump(list, type) end
+
+--- Convert a |readfile()|-style list or a |Blob| to a list of
+--- Vimscript objects.
+--- Example: >
+---   let fname = expand('~/.config/nvim/shada/main.shada')
+---   let mpack = readfile(fname, 'b')
+---   let shada_objects = msgpackparse(mpack)
+--- <This will read ~/.config/nvim/shada/main.shada file to
+--- `shada_objects` list.
+---
+--- Limitations:
+--- 1. Mapping ordering is not preserved unless messagepack
+---    mapping is dumped using generic mapping
+---    (|msgpack-special-map|).
+--- 2. Since the parser aims to preserve all data untouched
+---    (except for 1.) some strings are parsed to
+---    |msgpack-special-dict| format which is not convenient to
+---    use.
+---           *msgpack-special-dict*
+--- Some messagepack strings may be parsed to special
+--- dictionaries. Special dictionaries are dictionaries which
+---
+--- 1. Contain exactly two keys: `_TYPE` and `_VAL`.
+--- 2. `_TYPE` key is one of the types found in |v:msgpack_types|
+---    variable.
+--- 3. Value for `_VAL` has the following format (Key column
+---    contains name of the key from |v:msgpack_types|):
+---
+--- Key  Value ~
+--- nil  Zero, ignored when dumping.  Not returned by
+---   |msgpackparse()| since |v:null| was introduced.
+--- boolean  One or zero.  When dumping it is only checked that
+---   value is a |Number|.  Not returned by |msgpackparse()|
+---   since |v:true| and |v:false| were introduced.
+--- integer  |List| with four numbers: sign (-1 or 1), highest two
+---   bits, number with bits from 62nd to 31st, lowest 31
+---   bits. I.e. to get actual number one will need to use
+---   code like >
+---     _VAL[0] * ((_VAL[1] << 62)
+---                & (_VAL[2] << 31)
+---                & _VAL[3])
+--- <  Special dictionary with this type will appear in
+---   |msgpackparse()| output under one of the following
+---   circumstances:
+---   1. |Number| is 32-bit and value is either above
+---      INT32_MAX or below INT32_MIN.
+---   2. |Number| is 64-bit and value is above INT64_MAX. It
+---      cannot possibly be below INT64_MIN because msgpack
+---      C parser does not support such values.
+--- float  |Float|. This value cannot possibly appear in
+---   |msgpackparse()| output.
+--- string  |readfile()|-style list of strings. This value will
+---   appear in |msgpackparse()| output if string contains
+---   zero byte or if string is a mapping key and mapping is
+---   being represented as special dictionary for other
+---   reasons.
+--- binary  |String|, or |Blob| if binary string contains zero
+---   byte. This value cannot appear in |msgpackparse()|
+---   output since blobs were introduced.
+--- array  |List|. This value cannot appear in |msgpackparse()|
+---   output.
+---           *msgpack-special-map*
+--- map  |List| of |List|s with two items (key and value) each.
+---   This value will appear in |msgpackparse()| output if
+---   parsed mapping contains one of the following keys:
+---   1. Any key that is not a string (including keys which
+---      are binary strings).
+---   2. String with NUL byte inside.
+---   3. Duplicate key.
+---   4. Empty key.
+--- ext  |List| with two values: first is a signed integer
+---   representing extension type. Second is
+---   |readfile()|-style list of strings.
+---
+--- @param data any
+--- @return any
+function vim.fn.msgpackparse(data) end
+
+--- Return the line number of the first line at or below {lnum}
+--- that is not blank.  Example: >
+---   if getline(nextnonblank(1)) =~ "Java"
+--- <When {lnum} is invalid or there is no non-blank line at or
+--- below it, zero is returned.
+--- {lnum} is used like with |getline()|.
+--- See also |prevnonblank()|.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->nextnonblank()
+---
+--- @param lnum integer
+--- @return any
+function vim.fn.nextnonblank(lnum) end
+
+--- Return a string with a single character, which has the number
+--- value {expr}.  Examples: >
+---   nr2char(64)    returns "\@"
+---   nr2char(32)    returns " "
+--- <Example for "utf-8": >
+---   nr2char(300)    returns I with bow character
+--- <UTF-8 encoding is always used, {utf8} option has no effect,
+--- and exists only for backwards-compatibility.
+--- Note that a NUL character in the file is specified with
+--- nr2char(10), because NULs are represented with newline
+--- characters.  nr2char(0) is a real NUL and terminates the
+--- string, thus results in an empty string.
+---
+--- Can also be used as a |method|: >
+---   GetNumber()->nr2char()
+---
+--- nvim_...({...})          *E5555* *nvim_...()* *eval-api*
+--- Call nvim |api| functions. The type checking of arguments will
+--- be stricter than for most other builtins. For instance,
+--- if Integer is expected, a |Number| must be passed in, a
+--- |String| will not be autoconverted.
+--- Buffer numbers, as returned by |bufnr()| could be used as
+--- first argument to nvim_buf_... functions.  All functions
+--- expecting an object (buffer, window or tabpage) can
+--- also take the numerical value 0 to indicate the current
+--- (focused) object.
+---
+--- @param expr any
+--- @param utf8? any
+--- @return any
+function vim.fn.nr2char(expr, utf8) end
+
+--- Bitwise OR on the two arguments.  The arguments are converted
+--- to a number.  A List, Dict or Float argument causes an error.
+--- Also see `and()` and `xor()`.
+--- Example: >
+---   :let bits = or(bits, 0x80)
+--- <Can also be used as a |method|: >
+---   :let bits = bits->or(0x80)
+---
+--- <Rationale: The reason this is a function and not using the "|"
+--- character like many languages, is that Vi has always used "|"
+--- to separate commands.  In many places it would not be clear if
+--- "|" is an operator or a command separator.
+---
+---
+--- @param expr any
+--- @param expr1 any
+--- @return any
+vim.fn['or'] = function(expr, expr1) end
+
+--- Shorten directory names in the path {path} and return the
+--- result.  The tail, the file name, is kept as-is.  The other
+--- components in the path are reduced to {len} letters in length.
+--- If {len} is omitted or smaller than 1 then 1 is used (single
+--- letters).  Leading '~' and '.' characters are kept.  Examples: >
+---   :echo pathshorten('~/.config/nvim/autoload/file1.vim')
+--- <  ~/.c/n/a/file1.vim ~
+--- >
+---   :echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
+--- <  ~/.co/nv/au/file2.vim ~
+--- It doesn't matter if the path exists or not.
+--- Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   GetDirectories()->pathshorten()
+---
+--- @param path string
+--- @param len? any
+--- @return any
+function vim.fn.pathshorten(path, len) end
+
+--- Evaluate |perl| expression {expr} and return its result
+--- converted to Vim data structures.
+--- Numbers and strings are returned as they are (strings are
+--- copied though).
+--- Lists are represented as Vim |List| type.
+--- Dictionaries are represented as Vim |Dictionary| type,
+--- non-string keys result in error.
+---
+--- Note: If you want an array or hash, {expr} must return a
+--- reference to it.
+--- Example: >
+---   :echo perleval('[1 .. 4]')
+--- <  [1, 2, 3, 4]
+---
+--- Can also be used as a |method|: >
+---   GetExpr()->perleval()
+---
+--- @param expr any
+--- @return any
+function vim.fn.perleval(expr) end
+
+--- Return the power of {x} to the exponent {y} as a |Float|.
+--- {x} and {y} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {x} or {y} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo pow(3, 3)
+--- <  27.0 >
+---   :echo pow(2, 16)
+--- <  65536.0 >
+---   :echo pow(32, 0.20)
+--- <  2.0
+---
+--- Can also be used as a |method|: >
+---   Compute()->pow(3)
+---
+--- @param x any
+--- @param y any
+--- @return any
+function vim.fn.pow(x, y) end
+
+--- Return the line number of the first line at or above {lnum}
+--- that is not blank.  Example: >
+---   let ind = indent(prevnonblank(v:lnum - 1))
+--- <When {lnum} is invalid or there is no non-blank line at or
+--- above it, zero is returned.
+--- {lnum} is used like with |getline()|.
+--- Also see |nextnonblank()|.
+---
+--- Can also be used as a |method|: >
+---   GetLnum()->prevnonblank()
+---
+--- @param lnum integer
+--- @return any
+function vim.fn.prevnonblank(lnum) end
+
+--- Return a String with {fmt}, where "%" items are replaced by
+--- the formatted form of their respective arguments.  Example: >
+---   printf("%4d: E%d %.30s", lnum, errno, msg)
+--- <May result in:
+---   "  99: E42 asdfasdfasdfasdfasdfasdfasdfas" ~
+---
+--- When used as a |method| the base is passed as the second
+--- argument: >
+---   Compute()->printf("result: %d")
+--- <
+--- You can use `call()` to pass the items as a list.
+---
+--- Often used items are:
+---   %s  string
+---   %6S  string right-aligned in 6 display cells
+---   %6s  string right-aligned in 6 bytes
+---   %.9s  string truncated to 9 bytes
+---   %c  single byte
+---   %d  decimal number
+---   %5d  decimal number padded with spaces to 5 characters
+---   %b  binary number
+---   %08b  binary number padded with zeros to at least 8 characters
+---   %B  binary number using upper case letters
+---   %x  hex number
+---   %04x  hex number padded with zeros to at least 4 characters
+---   %X  hex number using upper case letters
+---   %o  octal number
+---   %f  floating point number as 12.23, inf, -inf or nan
+---   %F  floating point number as 12.23, INF, -INF or NAN
+---   %e  floating point number as 1.23e3, inf, -inf or nan
+---   %E  floating point number as 1.23E3, INF, -INF or NAN
+---   %g  floating point number, as %f or %e depending on value
+---   %G  floating point number, as %F or %E depending on value
+---   %%  the % character itself
+---   %p  representation of the pointer to the container
+---
+--- Conversion specifications start with '%' and end with the
+--- conversion type.  All other characters are copied unchanged to
+--- the result.
+---
+--- The "%" starts a conversion specification.  The following
+--- arguments appear in sequence:
+---
+---   %  [flags]  [field-width]  [.precision]  type
+---
+--- flags
+---   Zero or more of the following flags:
+---
+---     #        The value should be converted to an "alternate
+---         form".  For c, d, and s conversions, this option
+---         has no effect.  For o conversions, the precision
+---         of the number is increased to force the first
+---         character of the output string to a zero (except
+---         if a zero value is printed with an explicit
+---         precision of zero).
+---         For x and X conversions, a non-zero result has
+---         the string "0x" (or "0X" for X conversions)
+---         prepended to it.
+---
+---     0 (zero)  Zero padding.  For all conversions the converted
+---         value is padded on the left with zeros rather
+---         than blanks.  If a precision is given with a
+---         numeric conversion (d, o, x, and X), the 0 flag
+---         is ignored.
+---
+---     -        A negative field width flag; the converted value
+---         is to be left adjusted on the field boundary.
+---         The converted value is padded on the right with
+---         blanks, rather than on the left with blanks or
+---         zeros.  A - overrides a 0 if both are given.
+---
+---     ' ' (space)  A blank should be left before a positive
+---         number produced by a signed conversion (d).
+---
+---     +        A sign must always be placed before a number
+---         produced by a signed conversion.  A + overrides
+---         a space if both are used.
+---
+--- field-width
+---   An optional decimal digit string specifying a minimum
+---   field width.  If the converted value has fewer bytes
+---   than the field width, it will be padded with spaces on
+---   the left (or right, if the left-adjustment flag has
+---   been given) to fill out the field width.  For the S
+---   conversion the count is in cells.
+---
+--- .precision
+---   An optional precision, in the form of a period '.'
+---   followed by an optional digit string.  If the digit
+---   string is omitted, the precision is taken as zero.
+---   This gives the minimum number of digits to appear for
+---   d, o, x, and X conversions, the maximum number of
+---   bytes to be printed from a string for s conversions,
+---   or the maximum number of cells to be printed from a
+---   string for S conversions.
+---   For floating point it is the number of digits after
+---   the decimal point.
+---
+--- type
+---   A character that specifies the type of conversion to
+---   be applied, see below.
+---
+--- A field width or precision, or both, may be indicated by an
+--- asterisk "*" instead of a digit string.  In this case, a
+--- Number argument supplies the field width or precision.  A
+--- negative field width is treated as a left adjustment flag
+--- followed by a positive field width; a negative precision is
+--- treated as though it were missing.  Example: >
+---   :echo printf("%d: %.*s", nr, width, line)
+--- <This limits the length of the text used from "line" to
+--- "width" bytes.
+---
+--- The conversion specifiers and their meanings are:
+---
+---     *printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X*
+--- dbBoxX  The Number argument is converted to signed decimal (d),
+---   unsigned binary (b and B), unsigned octal (o), or
+---   unsigned hexadecimal (x and X) notation.  The letters
+---   "abcdef" are used for x conversions; the letters
+---   "ABCDEF" are used for X conversions.  The precision, if
+---   any, gives the minimum number of digits that must
+---   appear; if the converted value requires fewer digits, it
+---   is padded on the left with zeros.  In no case does a
+---   non-existent or small field width cause truncation of a
+---   numeric field; if the result of a conversion is wider
+---   than the field width, the field is expanded to contain
+---   the conversion result.
+---   The 'h' modifier indicates the argument is 16 bits.
+---   The 'l' modifier indicates the argument is 32 bits.
+---   The 'L' modifier indicates the argument is 64 bits.
+---   Generally, these modifiers are not useful. They are
+---   ignored when type is known from the argument.
+---
+--- i  alias for d
+--- D  alias for ld
+--- U  alias for lu
+--- O  alias for lo
+---
+---           *printf-c*
+--- c  The Number argument is converted to a byte, and the
+---   resulting character is written.
+---
+---           *printf-s*
+--- s  The text of the String argument is used.  If a
+---   precision is specified, no more bytes than the number
+---   specified are used.
+---   If the argument is not a String type, it is
+---   automatically converted to text with the same format
+---   as ":echo".
+---           *printf-S*
+--- S  The text of the String argument is used.  If a
+---   precision is specified, no more display cells than the
+---   number specified are used.
+---
+---           *printf-f* *E807*
+--- f F  The Float argument is converted into a string of the
+---   form 123.456.  The precision specifies the number of
+---   digits after the decimal point.  When the precision is
+---   zero the decimal point is omitted.  When the precision
+---   is not specified 6 is used.  A really big number
+---   (out of range or dividing by zero) results in "inf"
+---    or "-inf" with %f (INF or -INF with %F).
+---    "0.0 / 0.0" results in "nan" with %f (NAN with %F).
+---   Example: >
+---     echo printf("%.2f", 12.115)
+--- <    12.12
+---   Note that roundoff depends on the system libraries.
+---   Use |round()| when in doubt.
+---
+---           *printf-e* *printf-E*
+--- e E  The Float argument is converted into a string of the
+---   form 1.234e+03 or 1.234E+03 when using 'E'.  The
+---   precision specifies the number of digits after the
+---   decimal point, like with 'f'.
+---
+---           *printf-g* *printf-G*
+--- g G  The Float argument is converted like with 'f' if the
+---   value is between 0.001 (inclusive) and 10000000.0
+---   (exclusive).  Otherwise 'e' is used for 'g' and 'E'
+---   for 'G'.  When no precision is specified superfluous
+---   zeroes and '+' signs are removed, except for the zero
+---   immediately after the decimal point.  Thus 10000000.0
+---   results in 1.0e7.
+---
+---           *printf-%*
+--- %  A '%' is written.  No argument is converted.  The
+---   complete conversion specification is "%%".
+---
+--- When a Number argument is expected a String argument is also
+--- accepted and automatically converted.
+--- When a Float or String argument is expected a Number argument
+--- is also accepted and automatically converted.
+--- Any other argument type results in an error message.
+---
+---           *E766* *E767*
+--- The number of {exprN} arguments must exactly match the number
+--- of "%" items.  If there are not sufficient or too many
+--- arguments an error is given.  Up to 18 arguments can be used.
+---
+--- @param fmt any
+--- @param expr1? any
+--- @return any
+function vim.fn.printf(fmt, expr1) end
+
+--- Returns the effective prompt text for buffer {buf}.  {buf} can
+--- be a buffer name or number.  See |prompt-buffer|.
+---
+--- If the buffer doesn't exist or isn't a prompt buffer, an empty
+--- string is returned.
+---
+--- Can also be used as a |method|: >
+---   GetBuffer()->prompt_getprompt()
+---
+--- @param buf any
+--- @return any
+function vim.fn.prompt_getprompt(buf) end
+
+--- Set prompt callback for buffer {buf} to {expr}.  When {expr}
+--- is an empty string the callback is removed.  This has only
+--- effect if {buf} has 'buftype' set to "prompt".
+---
+--- The callback is invoked when pressing Enter.  The current
+--- buffer will always be the prompt buffer.  A new line for a
+--- prompt is added before invoking the callback, thus the prompt
+--- for which the callback was invoked will be in the last but one
+--- line.
+--- If the callback wants to add text to the buffer, it must
+--- insert it above the last line, since that is where the current
+--- prompt is.  This can also be done asynchronously.
+--- The callback is invoked with one argument, which is the text
+--- that was entered at the prompt.  This can be an empty string
+--- if the user only typed Enter.
+--- Example: >
+---    func s:TextEntered(text)
+---      if a:text == 'exit' || a:text == 'quit'
+---        stopinsert
+---        " Reset 'modified' to allow the buffer to be closed.
+---        " We assume there is nothing useful to be saved.
+---        set nomodified
+---        close
+---      else
+---        " Do something useful with "a:text".  In this example
+---        " we just repeat it.
+---        call append(line('$') - 1, 'Entered: "' .. a:text .. '"')
+---      endif
+---    endfunc
+---    call prompt_setcallback(bufnr(), function('s:TextEntered'))
+---
+--- <Can also be used as a |method|: >
+---   GetBuffer()->prompt_setcallback(callback)
+---
+--- @param buf any
+--- @param expr any
+--- @return any
+function vim.fn.prompt_setcallback(buf, expr) end
+
+--- Set a callback for buffer {buf} to {expr}.  When {expr} is an
+--- empty string the callback is removed.  This has only effect if
+--- {buf} has 'buftype' set to "prompt".
+---
+--- This callback will be invoked when pressing CTRL-C in Insert
+--- mode.  Without setting a callback Vim will exit Insert mode,
+--- as in any buffer.
+---
+--- Can also be used as a |method|: >
+---   GetBuffer()->prompt_setinterrupt(callback)
+---
+--- @param buf any
+--- @param expr any
+--- @return any
+function vim.fn.prompt_setinterrupt(buf, expr) end
+
+--- Set prompt for buffer {buf} to {text}.  You most likely want
+--- {text} to end in a space.
+--- The result is only visible if {buf} has 'buftype' set to
+--- "prompt".  Example: >
+---   call prompt_setprompt(bufnr(''), 'command: ')
+--- <
+--- Can also be used as a |method|: >
+---   GetBuffer()->prompt_setprompt('command: ')
+---
+--- @param buf any
+--- @param text any
+--- @return any
+function vim.fn.prompt_setprompt(buf, text) end
+
+--- If the popup menu (see |ins-completion-menu|) is not visible,
+--- returns an empty |Dictionary|, otherwise, returns a
+--- |Dictionary| with the following keys:
+---   height    nr of items visible
+---   width    screen cells
+---   row    top screen row (0 first row)
+---   col    leftmost screen column (0 first col)
+---   size    total nr of items
+---   scrollbar  |TRUE| if scrollbar is visible
+---
+--- The values are the same as in |v:event| during |CompleteChanged|.
+---
+--- @return any
+function vim.fn.pum_getpos() end
+
+--- Returns non-zero when the popup menu is visible, zero
+--- otherwise.  See |ins-completion-menu|.
+--- This can be used to avoid some things that would remove the
+--- popup menu.
+---
+--- @return any
+function vim.fn.pumvisible() end
+
+--- Evaluate Python expression {expr} and return its result
+--- converted to Vim data structures.
+--- Numbers and strings are returned as they are (strings are
+--- copied though, Unicode strings are additionally converted to
+--- UTF-8).
+--- Lists are represented as Vim |List| type.
+--- Dictionaries are represented as Vim |Dictionary| type with
+--- keys converted to strings.
+---
+--- Can also be used as a |method|: >
+---   GetExpr()->py3eval()
+--- <
+---           *E858* *E859*
+--- @param expr any
+--- @return any
+function vim.fn.py3eval(expr) end
+
+--- Evaluate Python expression {expr} and return its result
+--- converted to Vim data structures.
+--- Numbers and strings are returned as they are (strings are
+--- copied though).
+--- Lists are represented as Vim |List| type.
+--- Dictionaries are represented as Vim |Dictionary| type,
+--- non-string keys result in error.
+---
+--- Can also be used as a |method|: >
+---   GetExpr()->pyeval()
+---
+--- @param expr any
+--- @return any
+function vim.fn.pyeval(expr) end
+
+--- Evaluate Python expression {expr} and return its result
+--- converted to Vim data structures.
+--- Uses Python 2 or 3, see |python_x| and 'pyxversion'.
+--- See also: |pyeval()|, |py3eval()|
+---
+--- Can also be used as a |method|: >
+---   GetExpr()->pyxeval()
+--- <
+--- @param expr any
+--- @return any
+function vim.fn.pyxeval(expr) end
+
+--- Return a pseudo-random Number generated with an xoshiro128**
+--- algorithm using seed {expr}.  The returned number is 32 bits,
+--- also on 64 bits systems, for consistency.
+--- {expr} can be initialized by |srand()| and will be updated by
+--- rand().  If {expr} is omitted, an internal seed value is used
+--- and updated.
+--- Returns -1 if {expr} is invalid.
+---
+--- Examples: >
+---   :echo rand()
+---   :let seed = srand()
+---   :echo rand(seed)
+---   :echo rand(seed) % 16  " random number 0 - 15
+--- <
+--- Can also be used as a |method|: >
+---   seed->rand()
+--- <
+---
+---           *E726* *E727*
+--- @param expr? any
+--- @return any
+function vim.fn.rand(expr) end
+
+--- Returns a |List| with Numbers:
+--- - If only {expr} is specified: [0, 1, ..., {expr} - 1]
+--- - If {max} is specified: [{expr}, {expr} + 1, ..., {max}]
+--- - If {stride} is specified: [{expr}, {expr} + {stride}, ...,
+---   {max}] (increasing {expr} with {stride} each time, not
+---   producing a value past {max}).
+--- When the maximum is one before the start the result is an
+--- empty list.  When the maximum is more than one before the
+--- start this is an error.
+--- Examples: >
+---   range(4)    " [0, 1, 2, 3]
+---   range(2, 4)    " [2, 3, 4]
+---   range(2, 9, 3)    " [2, 5, 8]
+---   range(2, -2, -1)  " [2, 1, 0, -1, -2]
+---   range(0)    " []
+---   range(2, 0)    " error!
+--- <
+--- Can also be used as a |method|: >
+---   GetExpr()->range()
+--- <
+---
+--- @param expr any
+--- @param max? any
+--- @param stride? any
+--- @return any
+function vim.fn.range(expr, max, stride) end
+
+--- Read file {fname} in binary mode and return a |Blob|.
+--- If {offset} is specified, read the file from the specified
+--- offset.  If it is a negative value, it is used as an offset
+--- from the end of the file.  E.g., to read the last 12 bytes: >
+---   readblob('file.bin', -12)
+--- <If {size} is specified, only the specified size will be read.
+--- E.g. to read the first 100 bytes of a file: >
+---   readblob('file.bin', 0, 100)
+--- <If {size} is -1 or omitted, the whole data starting from
+--- {offset} will be read.
+--- This can be also used to read the data from a character device
+--- on Unix when {size} is explicitly set.  Only if the device
+--- supports seeking {offset} can be used.  Otherwise it should be
+--- zero.  E.g. to read 10 bytes from a serial console: >
+---   readblob('/dev/ttyS0', 0, 10)
+--- <When the file can't be opened an error message is given and
+--- the result is an empty |Blob|.
+--- When the offset is beyond the end of the file the result is an
+--- empty blob.
+--- When trying to read more bytes than are available the result
+--- is truncated.
+--- Also see |readfile()| and |writefile()|.
+---
+---
+---           *readdir()*
+--- @param fname integer
+--- @param offset? any
+--- @param size? any
+--- @return any
+function vim.fn.readblob(fname, offset, size) end
+
+--- Return a list with file and directory names in {directory}.
+--- You can also use |glob()| if you don't need to do complicated
+--- things, such as limiting the number of matches.
+---
+--- When {expr} is omitted all entries are included.
+--- When {expr} is given, it is evaluated to check what to do:
+---   If {expr} results in -1 then no further entries will
+---   be handled.
+---   If {expr} results in 0 then this entry will not be
+---   added to the list.
+---   If {expr} results in 1 then this entry will be added
+---   to the list.
+--- Each time {expr} is evaluated |v:val| is set to the entry name.
+--- When {expr} is a function the name is passed as the argument.
+--- For example, to get a list of files ending in ".txt": >
+---   readdir(dirname, {n -> n =~ '.txt$'})
+--- <To skip hidden and backup files: >
+---   readdir(dirname, {n -> n !~ '^\.\|\~$'})
+---
+--- <If you want to get a directory tree: >
+---                   function! s:tree(dir)
+---                       return {a:dir : map(readdir(a:dir),
+---       \ {_, x -> isdirectory(x) ?
+---       \          {x : s:tree(a:dir .. '/' .. x)} : x})}
+---                   endfunction
+---                   echo s:tree(".")
+--- <
+--- Returns an empty List on error.
+---
+--- Can also be used as a |method|: >
+---   GetDirName()->readdir()
+--- <
+---
+---           *readfile()*
+--- @param directory any
+--- @param expr? any
+--- @return any
+function vim.fn.readdir(directory, expr) end
+
+--- Read file {fname} and return a |List|, each line of the file
+--- as an item.  Lines are broken at NL characters.  Macintosh
+--- files separated with CR will result in a single long line
+--- (unless a NL appears somewhere).
+--- All NUL characters are replaced with a NL character.
+--- When {type} contains "b" binary mode is used:
+--- - When the last line ends in a NL an extra empty list item is
+---   added.
+--- - No CR characters are removed.
+--- Otherwise:
+--- - CR characters that appear before a NL are removed.
+--- - Whether the last line ends in a NL or not does not matter.
+--- - Any UTF-8 byte order mark is removed from the text.
+--- When {max} is given this specifies the maximum number of lines
+--- to be read.  Useful if you only want to check the first ten
+--- lines of a file: >
+---   :for line in readfile(fname, '', 10)
+---   :  if line =~ 'Date' | echo line | endif
+---   :endfor
+--- <When {max} is negative -{max} lines from the end of the file
+--- are returned, or as many as there are.
+--- When {max} is zero the result is an empty list.
+--- Note that without {max} the whole file is read into memory.
+--- Also note that there is no recognition of encoding.  Read a
+--- file into a buffer if you need to.
+--- Deprecated (use |readblob()| instead): When {type} contains
+--- "B" a |Blob| is returned with the binary data of the file
+--- unmodified.
+--- When the file can't be opened an error message is given and
+--- the result is an empty list.
+--- Also see |writefile()|.
+---
+--- Can also be used as a |method|: >
+---   GetFileName()->readfile()
+---
+--- @param fname integer
+--- @param type? any
+--- @param max? any
+--- @return any
+function vim.fn.readfile(fname, type, max) end
+
+--- {func} is called for every item in {object}, which can be a
+--- |List| or a |Blob|.  {func} is called with two arguments: the
+--- result so far and current item.  After processing all items
+--- the result is returned.
+---
+--- {initial} is the initial result.  When omitted, the first item
+--- in {object} is used and {func} is first called for the second
+--- item.  If {initial} is not given and {object} is empty no
+--- result can be computed, an E998 error is given.
+---
+--- Examples: >
+---   echo reduce([1, 3, 5], { acc, val -> acc + val })
+---   echo reduce(['x', 'y'], { acc, val -> acc .. val }, 'a')
+---   echo reduce(0z1122, { acc, val -> 2 * acc + val })
+--- <
+--- Can also be used as a |method|: >
+---   echo mylist->reduce({ acc, val -> acc + val }, 0)
+---
+--- @param object any
+--- @param func any
+--- @param initial? any
+--- @return any
+function vim.fn.reduce(object, func, initial) end
+
+--- Returns the single letter name of the register being executed.
+--- Returns an empty string when no register is being executed.
+--- See |\@|.
+---
+--- @return any
+function vim.fn.reg_executing() end
+
+--- Returns the single letter name of the last recorded register.
+--- Returns an empty string when nothing was recorded yet.
+--- See |q| and |Q|.
+---
+--- @return any
+function vim.fn.reg_recorded() end
+
+--- Returns the single letter name of the register being recorded.
+--- Returns an empty string when not recording.  See |q|.
+---
+--- @return any
+function vim.fn.reg_recording() end
+
+--- Return an item that represents a time value.  The item is a
+--- list with items that depend on the system.
+--- The item can be passed to |reltimestr()| to convert it to a
+--- string or |reltimefloat()| to convert to a Float.
+---
+--- Without an argument it returns the current "relative time", an
+--- implementation-defined value meaningful only when used as an
+--- argument to |reltime()|, |reltimestr()| and |reltimefloat()|.
+---
+--- With one argument it returns the time passed since the time
+--- specified in the argument.
+--- With two arguments it returns the time passed between {start}
+--- and {end}.
+---
+--- The {start} and {end} arguments must be values returned by
+--- reltime().  Returns zero on error.
+---
+--- Can also be used as a |method|: >
+---   GetStart()->reltime()
+--- <
+--- Note: |localtime()| returns the current (non-relative) time.
+---
+--- @param start? any
+--- @param end_? any
+--- @return any
+function vim.fn.reltime(start, end_) end
+
+--- Return a Float that represents the time value of {time}.
+--- Unit of time is seconds.
+--- Example:
+---   let start = reltime()
+---   call MyFunction()
+---   let seconds = reltimefloat(reltime(start))
+--- See the note of reltimestr() about overhead.
+--- Also see |profiling|.
+--- If there is an error an empty string is returned
+---
+--- Can also be used as a |method|: >
+---   reltime(start)->reltimefloat()
+---
+--- @param time any
+--- @return any
+function vim.fn.reltimefloat(time) end
+
+--- Return a String that represents the time value of {time}.
+--- This is the number of seconds, a dot and the number of
+--- microseconds.  Example: >
+---   let start = reltime()
+---   call MyFunction()
+---   echo reltimestr(reltime(start))
+--- <Note that overhead for the commands will be added to the time.
+--- Leading spaces are used to make the string align nicely.  You
+--- can use split() to remove it. >
+---   echo split(reltimestr(reltime(start)))[0]
+--- <Also see |profiling|.
+--- If there is an error an empty string is returned
+---
+--- Can also be used as a |method|: >
+---   reltime(start)->reltimestr()
+--- <
+--- @param time any
+--- @return any
+function vim.fn.reltimestr(time) end
+
+--- Remove the entry from {dict} with key {key} and return it.
+--- Example: >
+---   :echo "removed " .. remove(dict, "one")
+--- <If there is no {key} in {dict} this is an error.
+--- Returns zero on error.
+---
+--- @param dict any
+--- @param key any
+--- @return any
+function vim.fn.remove(dict, key) end
+
+--- Rename the file by the name {from} to the name {to}.  This
+--- should also work to move files across file systems.  The
+--- result is a Number, which is 0 if the file was renamed
+--- successfully, and non-zero when the renaming failed.
+--- NOTE: If {to} exists it is overwritten without warning.
+--- This function is not available in the |sandbox|.
+---
+--- Can also be used as a |method|: >
+---   GetOldName()->rename(newname)
+---
+--- @param from any
+--- @param to any
+--- @return any
+function vim.fn.rename(from, to) end
+
+--- Repeat {expr} {count} times and return the concatenated
+--- result.  Example: >
+---   :let separator = repeat('-', 80)
+--- <When {count} is zero or negative the result is empty.
+--- When {expr} is a |List| or a |Blob| the result is {expr}
+--- concatenated {count} times.  Example: >
+---   :let longlist = repeat(['a', 'b'], 3)
+--- <Results in ['a', 'b', 'a', 'b', 'a', 'b'].
+---
+--- Can also be used as a |method|: >
+---   mylist->repeat(count)
+---
+--- @param expr any
+--- @param count any
+--- @return any
+vim.fn['repeat'] = function(expr, count) end
+
+--- On MS-Windows, when {filename} is a shortcut (a .lnk file),
+--- returns the path the shortcut points to in a simplified form.
+--- On Unix, repeat resolving symbolic links in all path
+--- components of {filename} and return the simplified result.
+--- To cope with link cycles, resolving of symbolic links is
+--- stopped after 100 iterations.
+--- On other systems, return the simplified {filename}.
+--- The simplification step is done as by |simplify()|.
+--- resolve() keeps a leading path component specifying the
+--- current directory (provided the result is still a relative
+--- path name) and also keeps a trailing path separator.
+---
+--- Can also be used as a |method|: >
+---   GetName()->resolve()
+--- <
+---           *reverse()*
+--- @param filename any
+--- @return any
+function vim.fn.resolve(filename) end
+
+--- Reverse the order of items in {object} in-place.
+--- {object} can be a |List| or a |Blob|.
+--- Returns {object}.
+--- Returns zero if {object} is not a List or a Blob.
+--- If you want an object to remain unmodified make a copy first: >
+---   :let revlist = reverse(copy(mylist))
+--- <Can also be used as a |method|: >
+---   mylist->reverse()
+---
+--- @param object any
+--- @return any
+function vim.fn.reverse(object) end
+
+--- Round off {expr} to the nearest integral value and return it
+--- as a |Float|.  If {expr} lies halfway between two integral
+--- values, then use the larger one (away from zero).
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   echo round(0.456)
+--- <  0.0  >
+---   echo round(4.5)
+--- <  5.0 >
+---   echo round(-4.5)
+--- <  -5.0
+---
+--- Can also be used as a |method|: >
+---   Compute()->round()
+---
+--- @param expr any
+--- @return any
+function vim.fn.round(expr) end
+
+--- Sends {event} to {channel} via |RPC| and returns immediately.
+--- If {channel} is 0, the event is broadcast to all channels.
+--- Example: >
+---   :au VimLeave call rpcnotify(0, "leaving")
+---
+--- @param channel any
+--- @param event any
+--- @param args? any
+--- @return any
+function vim.fn.rpcnotify(channel, event, args) end
+
+--- Sends a request to {channel} to invoke {method} via
+--- |RPC| and blocks until a response is received.
+--- Example: >
+---   :let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
+---
+--- @param channel any
+--- @param method any
+--- @param args? any
+--- @return any
+function vim.fn.rpcrequest(channel, method, args) end
+
+--- Deprecated. Replace  >
+---   :let id = rpcstart('prog', ['arg1', 'arg2'])
+--- <with >
+---   :let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
+---
+--- @param prog any
+--- @param argv? any
+--- @return any
+function vim.fn.rpcstart(prog, argv) end
+
+--- @deprecated
+--- Use |jobstop()| instead to stop any job, or
+--- `chanclose(id, "rpc")` to close RPC communication
+--- without stopping the job. Use chanclose(id) to close
+--- any socket.
+function vim.fn.rpcstop(...) end
+
+--- Evaluate Ruby expression {expr} and return its result
+--- converted to Vim data structures.
+--- Numbers, floats and strings are returned as they are (strings
+--- are copied though).
+--- Arrays are represented as Vim |List| type.
+--- Hashes are represented as Vim |Dictionary| type.
+--- Other objects are represented as strings resulted from their
+--- "Object#to_s" method.
+---
+--- Can also be used as a |method|: >
+---   GetRubyExpr()->rubyeval()
+---
+--- @param expr any
+--- @return any
+function vim.fn.rubyeval(expr) end
+
+--- Like |screenchar()|, but return the attribute.  This is a rather
+--- arbitrary number that can only be used to compare to the
+--- attribute at other positions.
+--- Returns -1 when row or col is out of range.
+---
+--- Can also be used as a |method|: >
+---   GetRow()->screenattr(col)
+---
+--- @param row any
+--- @param col integer
+--- @return any
+function vim.fn.screenattr(row, col) end
+
+--- The result is a Number, which is the character at position
+--- [row, col] on the screen.  This works for every possible
+--- screen position, also status lines, window separators and the
+--- command line.  The top left position is row one, column one
+--- The character excludes composing characters.  For double-byte
+--- encodings it may only be the first byte.
+--- This is mainly to be used for testing.
+--- Returns -1 when row or col is out of range.
+---
+--- Can also be used as a |method|: >
+---   GetRow()->screenchar(col)
+---
+--- @param row any
+--- @param col integer
+--- @return any
+function vim.fn.screenchar(row, col) end
+
+--- The result is a List of Numbers.  The first number is the same
+--- as what |screenchar()| returns.  Further numbers are
+--- composing characters on top of the base character.
+--- This is mainly to be used for testing.
+--- Returns an empty List when row or col is out of range.
+---
+--- Can also be used as a |method|: >
+---   GetRow()->screenchars(col)
+---
+--- @param row any
+--- @param col integer
+--- @return any
+function vim.fn.screenchars(row, col) end
+
+--- The result is a Number, which is the current screen column of
+--- the cursor. The leftmost column has number 1.
+--- This function is mainly used for testing.
+---
+--- Note: Always returns the current screen column, thus if used
+--- in a command (e.g. ":echo screencol()") it will return the
+--- column inside the command line, which is 1 when the command is
+--- executed. To get the cursor position in the file use one of
+--- the following mappings: >
+---   nnoremap <expr> GG ":echom " .. screencol() .. "\n"
+---   nnoremap <silent> GG :echom screencol()<CR>
+---   noremap GG <Cmd>echom screencol()<Cr>
+--- <
+--- @return any
+function vim.fn.screencol() end
+
+--- The result is a Dict with the screen position of the text
+--- character in window {winid} at buffer line {lnum} and column
+--- {col}.  {col} is a one-based byte index.
+--- The Dict has these members:
+---   row  screen row
+---   col  first screen column
+---   endcol  last screen column
+---   curscol  cursor screen column
+--- If the specified position is not visible, all values are zero.
+--- The "endcol" value differs from "col" when the character
+--- occupies more than one screen cell.  E.g. for a Tab "col" can
+--- be 1 and "endcol" can be 8.
+--- The "curscol" value is where the cursor would be placed.  For
+--- a Tab it would be the same as "endcol", while for a double
+--- width character it would be the same as "col".
+--- The |conceal| feature is ignored here, the column numbers are
+--- as if 'conceallevel' is zero.  You can set the cursor to the
+--- right position and use |screencol()| to get the value with
+--- |conceal| taken into account.
+--- If the position is in a closed fold the screen position of the
+--- first character is returned, {col} is not used.
+--- Returns an empty Dict if {winid} is invalid.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->screenpos(lnum, col)
+---
+--- @param winid integer
+--- @param lnum integer
+--- @param col integer
+--- @return any
+function vim.fn.screenpos(winid, lnum, col) end
+
+--- The result is a Number, which is the current screen row of the
+--- cursor.  The top line has number one.
+--- This function is mainly used for testing.
+--- Alternatively you can use |winline()|.
+---
+--- Note: Same restrictions as with |screencol()|.
+---
+--- @return any
+function vim.fn.screenrow() end
+
+--- The result is a String that contains the base character and
+--- any composing characters at position [row, col] on the screen.
+--- This is like |screenchars()| but returning a String with the
+--- characters.
+--- This is mainly to be used for testing.
+--- Returns an empty String when row or col is out of range.
+---
+--- Can also be used as a |method|: >
+---   GetRow()->screenstring(col)
+--- <
+---             *search()*
+--- @param row any
+--- @param col integer
+--- @return any
+function vim.fn.screenstring(row, col) end
+
+--- Search for regexp pattern {pattern}.  The search starts at the
+--- cursor position (you can use |cursor()| to set it).
+---
+--- When a match has been found its line number is returned.
+--- If there is no match a 0 is returned and the cursor doesn't
+--- move.  No error message is given.
+---
+--- {flags} is a String, which can contain these character flags:
+--- 'b'  search Backward instead of forward
+--- 'c'  accept a match at the Cursor position
+--- 'e'  move to the End of the match
+--- 'n'  do Not move the cursor
+--- 'p'  return number of matching sub-Pattern (see below)
+--- 's'  Set the ' mark at the previous location of the cursor
+--- 'w'  Wrap around the end of the file
+--- 'W'  don't Wrap around the end of the file
+--- 'z'  start searching at the cursor column instead of Zero
+--- If neither 'w' or 'W' is given, the 'wrapscan' option applies.
+---
+--- If the 's' flag is supplied, the ' mark is set, only if the
+--- cursor is moved. The 's' flag cannot be combined with the 'n'
+--- flag.
+---
+--- 'ignorecase', 'smartcase' and 'magic' are used.
+---
+--- When the 'z' flag is not given, forward searching always
+--- starts in column zero and then matches before the cursor are
+--- skipped.  When the 'c' flag is present in 'cpo' the next
+--- search starts after the match.  Without the 'c' flag the next
+--- search starts one column after the start of the match.  This
+--- matters for overlapping matches.  See |cpo-c|.  You can also
+--- insert "\ze" to change where the match ends, see  |/\ze|.
+---
+--- When searching backwards and the 'z' flag is given then the
+--- search starts in column zero, thus no match in the current
+--- line will be found (unless wrapping around the end of the
+--- file).
+---
+--- When the {stopline} argument is given then the search stops
+--- after searching this line.  This is useful to restrict the
+--- search to a range of lines.  Examples: >
+---   let match = search('(', 'b', line("w0"))
+---   let end = search('END', '', line("w$"))
+--- <When {stopline} is used and it is not zero this also implies
+--- that the search does not wrap around the end of the file.
+--- A zero value is equal to not giving the argument.
+---
+--- When the {timeout} argument is given the search stops when
+--- more than this many milliseconds have passed.  Thus when
+--- {timeout} is 500 the search stops after half a second.
+--- The value must not be negative.  A zero value is like not
+--- giving the argument.
+---
+--- If the {skip} expression is given it is evaluated with the
+--- cursor positioned on the start of a match.  If it evaluates to
+--- non-zero this match is skipped.  This can be used, for
+--- example, to skip a match in a comment or a string.
+--- {skip} can be a string, which is evaluated as an expression, a
+--- function reference or a lambda.
+--- When {skip} is omitted or empty, every match is accepted.
+--- When evaluating {skip} causes an error the search is aborted
+--- and -1 returned.
+---           *search()-sub-match*
+--- With the 'p' flag the returned value is one more than the
+--- first sub-match in \(\).  One if none of them matched but the
+--- whole pattern did match.
+--- To get the column number too use |searchpos()|.
+---
+--- The cursor will be positioned at the match, unless the 'n'
+--- flag is used.
+---
+--- Example (goes over all files in the argument list): >
+---     :let n = 1
+---     :while n <= argc()      " loop over all files in arglist
+---     :  exe "argument " .. n
+---     :  " start at the last char in the file and wrap for the
+---     :  " first search to find match at start of file
+---     :  normal G$
+---     :  let flags = "w"
+---     :  while search("foo", flags) > 0
+---     :   s/foo/bar/g
+---     :   let flags = "W"
+---     :  endwhile
+---     :  update        " write the file if modified
+---     :  let n = n + 1
+---     :endwhile
+--- <
+--- Example for using some flags: >
+---     :echo search('\<if\|\(else\)\|\(endif\)', 'ncpe')
+--- <This will search for the keywords "if", "else", and "endif"
+--- under or after the cursor.  Because of the 'p' flag, it
+--- returns 1, 2, or 3 depending on which keyword is found, or 0
+--- if the search fails.  With the cursor on the first word of the
+--- line:
+---     if (foo == 0) | let foo = foo + 1 | endif ~
+--- the function returns 1.  Without the 'c' flag, the function
+--- finds the "endif" and returns 3.  The same thing happens
+--- without the 'e' flag if the cursor is on the "f" of "if".
+--- The 'n' flag tells the function not to move the cursor.
+---
+--- Can also be used as a |method|: >
+---   GetPattern()->search()
+---
+--- @param pattern any
+--- @param flags? string
+--- @param stopline? any
+--- @param timeout? integer
+--- @param skip? any
+--- @return any
+function vim.fn.search(pattern, flags, stopline, timeout, skip) end
+
+--- Get or update the last search count, like what is displayed
+--- without the "S" flag in 'shortmess'.  This works even if
+--- 'shortmess' does contain the "S" flag.
+---
+--- This returns a Dictionary. The dictionary is empty if the
+--- previous pattern was not set and "pattern" was not specified.
+---
+---   key    type    meaning ~
+---   current  |Number|  current position of match;
+---         0 if the cursor position is
+---         before the first match
+---   exact_match  |Boolean|  1 if "current" is matched on
+---         "pos", otherwise 0
+---   total    |Number|  total count of matches found
+---   incomplete  |Number|  0: search was fully completed
+---         1: recomputing was timed out
+---         2: max count exceeded
+---
+--- For {options} see further down.
+---
+--- To get the last search count when |n| or |N| was pressed, call
+--- this function with `recompute: 0` . This sometimes returns
+--- wrong information because |n| and |N|'s maximum count is 99.
+--- If it exceeded 99 the result must be max count + 1 (100). If
+--- you want to get correct information, specify `recompute: 1`: >
+---
+---   " result == maxcount + 1 (100) when many matches
+---   let result = searchcount(#{recompute: 0})
+---
+---   " Below returns correct result (recompute defaults
+---   " to 1)
+---   let result = searchcount()
+--- <
+--- The function is useful to add the count to 'statusline': >
+---   function! LastSearchCount() abort
+---     let result = searchcount(#{recompute: 0})
+---     if empty(result)
+---       return ''
+---     endif
+---     if result.incomplete ==# 1     " timed out
+---       return printf(' /%s [?/??]', \@/)
+---     elseif result.incomplete ==# 2 " max count exceeded
+---       if result.total > result.maxcount &&
+---       \  result.current > result.maxcount
+---         return printf(' /%s [>%d/>%d]', \@/,
+---         \             result.current, result.total)
+---       elseif result.total > result.maxcount
+---         return printf(' /%s [%d/>%d]', \@/,
+---         \             result.current, result.total)
+---       endif
+---     endif
+---     return printf(' /%s [%d/%d]', \@/,
+---     \             result.current, result.total)
+---   endfunction
+---   let &statusline ..= '%{LastSearchCount()}'
+---
+---   " Or if you want to show the count only when
+---   " 'hlsearch' was on
+---   " let &statusline ..=
+---   " \   '%{v:hlsearch ? LastSearchCount() : ""}'
+--- <
+--- You can also update the search count, which can be useful in a
+--- |CursorMoved| or |CursorMovedI| autocommand: >
+---
+---   autocmd CursorMoved,CursorMovedI *
+---     \ let s:searchcount_timer = timer_start(
+---     \   200, function('s:update_searchcount'))
+---   function! s:update_searchcount(timer) abort
+---     if a:timer ==# s:searchcount_timer
+---       call searchcount(#{
+---       \ recompute: 1, maxcount: 0, timeout: 100})
+---       redrawstatus
+---     endif
+---   endfunction
+--- <
+--- This can also be used to count matched texts with specified
+--- pattern in the current buffer using "pattern":  >
+---
+---   " Count '\<foo\>' in this buffer
+---   " (Note that it also updates search count)
+---   let result = searchcount(#{pattern: '\<foo\>'})
+---
+---   " To restore old search count by old pattern,
+---   " search again
+---   call searchcount()
+--- <
+--- {options} must be a Dictionary. It can contain:
+---   key    type    meaning ~
+---   recompute  |Boolean|  if |TRUE|, recompute the count
+---         like |n| or |N| was executed.
+---         otherwise returns the last
+---         computed result (when |n| or
+---         |N| was used when "S" is not
+---         in 'shortmess', or this
+---         function was called).
+---         (default: |TRUE|)
+---   pattern  |String|  recompute if this was given
+---         and different with |\@/|.
+---         this works as same as the
+---         below command is executed
+---         before calling this function >
+---           let \@/ = pattern
+--- <        (default: |\@/|)
+---   timeout  |Number|  0 or negative number is no
+---         timeout. timeout milliseconds
+---         for recomputing the result
+---         (default: 0)
+---   maxcount  |Number|  0 or negative number is no
+---         limit. max count of matched
+---         text while recomputing the
+---         result.  if search exceeded
+---         total count, "total" value
+---         becomes `maxcount + 1`
+---         (default: 0)
+---   pos    |List|    `[lnum, col, off]` value
+---         when recomputing the result.
+---         this changes "current" result
+---         value. see |cursor()|, |getpos()|
+---         (default: cursor's position)
+---
+--- Can also be used as a |method|: >
+---   GetSearchOpts()->searchcount()
+--- <
+--- @param options? table
+--- @return any
+function vim.fn.searchcount(options) end
+
+--- Search for the declaration of {name}.
+---
+--- With a non-zero {global} argument it works like |gD|, find
+--- first match in the file.  Otherwise it works like |gd|, find
+--- first match in the function.
+---
+--- With a non-zero {thisblock} argument matches in a {} block
+--- that ends before the cursor position are ignored.  Avoids
+--- finding variable declarations only valid in another scope.
+---
+--- Moves the cursor to the found match.
+--- Returns zero for success, non-zero for failure.
+--- Example: >
+---   if searchdecl('myvar') == 0
+---      echo getline('.')
+---   endif
+--- <
+--- Can also be used as a |method|: >
+---   GetName()->searchdecl()
+--- <
+---           *searchpair()*
+--- @param name string
+--- @param global? any
+--- @param thisblock? any
+--- @return any
+function vim.fn.searchdecl(name, global, thisblock) end
+
+--- Same as |search()|, but returns a |List| with the line and
+--- column position of the match. The first element of the |List|
+--- is the line number and the second element is the byte index of
+--- the column position of the match. If no match is found,
+--- returns [0, 0].
+--- Example: >
+---   :let [lnum, col] = searchpos('mypattern', 'n')
+---
+--- <When the 'p' flag is given then there is an extra item with
+--- the sub-pattern match number |search()-sub-match|.  Example: >
+---   :let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
+--- <In this example "submatch" is 2 when a lowercase letter is
+--- found |/\l|, 3 when an uppercase letter is found |/\u|.
+---
+--- Can also be used as a |method|: >
+---   GetPattern()->searchpos()
+---
+--- @param pattern any
+--- @param flags? string
+--- @param stopline? any
+--- @param timeout? integer
+--- @param skip? any
+--- @return any
+function vim.fn.searchpos(pattern, flags, stopline, timeout, skip) end
+
+--- Returns a list of server addresses, or empty if all servers
+--- were stopped. |serverstart()| |serverstop()|
+--- Example: >
+---   :echo serverlist()
+---
+--- @return any
+function vim.fn.serverlist() end
+
+--- Opens a socket or named pipe at {address} and listens for
+--- |RPC| messages. Clients can send |API| commands to the
+--- returned address to control Nvim.
+---
+--- Returns the address string (which may differ from the
+--- {address} argument, see below).
+---
+--- - If {address} has a colon (":") it is a TCP/IPv4/IPv6 address
+---   where the last ":" separates host and port (empty or zero
+---   assigns a random port).
+--- - Else {address} is the path to a named pipe (except on Windows).
+---   - If {address} has no slashes ("/") it is treated as the
+---     "name" part of a generated path in this format: >
+---   stdpath("run").."/{name}.{pid}.{counter}"
+--- <  - If {address} is omitted the name is "nvim". >
+---   :echo serverstart()
+---   => /tmp/nvim.bram/oknANW/nvim.15430.5
+---
+--- <Example bash command to list all Nvim servers: >
+---   ls ${XDG_RUNTIME_DIR:-${TMPDIR}nvim.${USER}}/*/nvim.*.0
+---
+--- <Example named pipe: >
+---   if has('win32')
+---     echo serverstart('\\.\pipe\nvim-pipe-1234')
+---   else
+---     echo serverstart('nvim.sock')
+---   endif
+--- <
+--- Example TCP/IP address: >
+---   echo serverstart('::1:12345')
+---
+--- @param address? any
+--- @return any
+function vim.fn.serverstart(address) end
+
+--- Closes the pipe or socket at {address}.
+--- Returns TRUE if {address} is valid, else FALSE.
+--- If |v:servername| is stopped it is set to the next available
+--- address in |serverlist()|.
+---
+--- @param address any
+--- @return any
+function vim.fn.serverstop(address) end
+
+--- Set line {lnum} to {text} in buffer {buf}.  This works like
+--- |setline()| for the specified buffer.
+---
+--- This function works only for loaded buffers. First call
+--- |bufload()| if needed.
+---
+--- To insert lines use |appendbufline()|.
+---
+--- {text} can be a string to set one line, or a list of strings
+--- to set multiple lines.  If the list extends below the last
+--- line then those lines are added.
+---
+--- For the use of {buf}, see |bufname()| above.
+---
+--- {lnum} is used like with |setline()|.
+--- Use "$" to refer to the last line in buffer {buf}.
+--- When {lnum} is just below the last line the {text} will be
+--- added below the last line.
+--- On success 0 is returned, on failure 1 is returned.
+---
+--- If {buf} is not a valid buffer or {lnum} is not valid, an
+--- error message is given.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- third argument: >
+---   GetText()->setbufline(buf, lnum)
+---
+--- @param buf any
+--- @param lnum integer
+--- @param text any
+--- @return any
+function vim.fn.setbufline(buf, lnum, text) end
+
+--- Set option or local variable {varname} in buffer {buf} to
+--- {val}.
+--- This also works for a global or local window option, but it
+--- doesn't work for a global or local window variable.
+--- For a local window option the global value is unchanged.
+--- For the use of {buf}, see |bufname()| above.
+--- The {varname} argument is a string.
+--- Note that the variable name without "b:" must be used.
+--- Examples: >
+---   :call setbufvar(1, "&mod", 1)
+---   :call setbufvar("todo", "myvar", "foobar")
+--- <This function is not available in the |sandbox|.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- third argument: >
+---   GetValue()->setbufvar(buf, varname)
+---
+---
+--- @param buf any
+--- @param varname string
+--- @param val any
+--- @return any
+function vim.fn.setbufvar(buf, varname, val) end
+
+--- Specify overrides for cell widths of character ranges.  This
+--- tells Vim how wide characters are when displayed in the
+--- terminal, counted in screen cells.  The values override
+--- 'ambiwidth'.  Example: >
+---    call setcellwidths([
+---     \ [0x111, 0x111, 1],
+---     \ [0x2194, 0x2199, 2],
+---     \ ])
+---
+--- <The {list} argument is a List of Lists with each three
+--- numbers: [{low}, {high}, {width}].  *E1109* *E1110*
+--- {low} and {high} can be the same, in which case this refers to
+--- one character.  Otherwise it is the range of characters from
+--- {low} to {high} (inclusive).    *E1111* *E1114*
+--- Only characters with value 0x80 and higher can be used.
+---
+--- {width} must be either 1 or 2, indicating the character width
+--- in screen cells.      *E1112*
+--- An error is given if the argument is invalid, also when a
+--- range overlaps with another.    *E1113*
+---
+--- If the new value causes 'fillchars' or 'listchars' to become
+--- invalid it is rejected and an error is given.
+---
+--- To clear the overrides pass an empty {list}: >
+---    call setcellwidths([])
+---
+--- <You can use the script $VIMRUNTIME/tools/emoji_list.vim to see
+--- the effect for known emoji characters.  Move the cursor
+--- through the text to check if the cell widths of your terminal
+--- match with what Vim knows about each emoji.  If it doesn't
+--- look right you need to adjust the {list} argument.
+---
+---
+--- @param list any
+--- @return any
+function vim.fn.setcellwidths(list) end
+
+--- Same as |setpos()| but uses the specified column number as the
+--- character index instead of the byte index in the line.
+---
+--- Example:
+--- With the text "여보세요" in line 8: >
+---   call setcharpos('.', [0, 8, 4, 0])
+--- <positions the cursor on the fourth character '요'. >
+---   call setpos('.', [0, 8, 4, 0])
+--- <positions the cursor on the second character '보'.
+---
+--- Can also be used as a |method|: >
+---   GetPosition()->setcharpos('.')
+---
+--- @param expr any
+--- @param list any
+--- @return any
+function vim.fn.setcharpos(expr, list) end
+
+--- Set the current character search information to {dict},
+--- which contains one or more of the following entries:
+---
+---     char  character which will be used for a subsequent
+---     |,| or |;| command; an empty string clears the
+---     character search
+---     forward  direction of character search; 1 for forward,
+---     0 for backward
+---     until  type of character search; 1 for a |t| or |T|
+---     character search, 0 for an |f| or |F|
+---     character search
+---
+--- This can be useful to save/restore a user's character search
+--- from a script: >
+---   :let prevsearch = getcharsearch()
+---   :" Perform a command which clobbers user's search
+---   :call setcharsearch(prevsearch)
+--- <Also see |getcharsearch()|.
+---
+--- Can also be used as a |method|: >
+---   SavedSearch()->setcharsearch()
+---
+--- @param dict any
+--- @return any
+function vim.fn.setcharsearch(dict) end
+
+--- Set the command line to {str} and set the cursor position to
+--- {pos}.
+--- If {pos} is omitted, the cursor is positioned after the text.
+--- Returns 0 when successful, 1 when not editing the command
+--- line.
+---
+--- Can also be used as a |method|: >
+---   GetText()->setcmdline()
+---
+--- @param str any
+--- @param pos? any
+--- @return any
+function vim.fn.setcmdline(str, pos) end
+
+--- Set the cursor position in the command line to byte position
+--- {pos}.  The first position is 1.
+--- Use |getcmdpos()| to obtain the current position.
+--- Only works while editing the command line, thus you must use
+--- |c_CTRL-\_e|, |c_CTRL-R_=| or |c_CTRL-R_CTRL-R| with '='.  For
+--- |c_CTRL-\_e| and |c_CTRL-R_CTRL-R| with '=' the position is
+--- set after the command line is set to the expression.  For
+--- |c_CTRL-R_=| it is set after evaluating the expression but
+--- before inserting the resulting text.
+--- When the number is too big the cursor is put at the end of the
+--- line.  A number smaller than one has undefined results.
+--- Returns 0 when successful, 1 when not editing the command
+--- line.
+---
+--- Can also be used as a |method|: >
+---   GetPos()->setcmdpos()
+---
+--- @param pos any
+--- @return any
+function vim.fn.setcmdpos(pos) end
+
+--- Same as |cursor()| but uses the specified column number as the
+--- character index instead of the byte index in the line.
+---
+--- Example:
+--- With the text "여보세요" in line 4: >
+---   call setcursorcharpos(4, 3)
+--- <positions the cursor on the third character '세'. >
+---   call cursor(4, 3)
+--- <positions the cursor on the first character '여'.
+---
+--- Can also be used as a |method|: >
+---   GetCursorPos()->setcursorcharpos()
+---
+--- @param list any
+--- @return any
+function vim.fn.setcursorcharpos(list) end
+
+--- Set environment variable {name} to {val}.  Example: >
+---   call setenv('HOME', '/home/myhome')
+---
+--- <When {val} is |v:null| the environment variable is deleted.
+--- See also |expr-env|.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetPath()->setenv('PATH')
+---
+--- @param name string
+--- @param val any
+--- @return any
+function vim.fn.setenv(name, val) end
+
+--- Set the file permissions for {fname} to {mode}.
+--- {mode} must be a string with 9 characters.  It is of the form
+--- "rwxrwxrwx", where each group of "rwx" flags represent, in
+--- turn, the permissions of the owner of the file, the group the
+--- file belongs to, and other users.  A '-' character means the
+--- permission is off, any other character means on.  Multi-byte
+--- characters are not supported.
+---
+--- For example "rw-r-----" means read-write for the user,
+--- readable by the group, not accessible by others.  "xx-x-----"
+--- would do the same thing.
+---
+--- Returns non-zero for success, zero for failure.
+---
+--- Can also be used as a |method|: >
+---   GetFilename()->setfperm(mode)
+--- <
+--- To read permissions see |getfperm()|.
+---
+--- @param fname integer
+--- @param mode string
+--- @return any
+function vim.fn.setfperm(fname, mode) end
+
+--- Set line {lnum} of the current buffer to {text}.  To insert
+--- lines use |append()|. To set lines in another buffer use
+--- |setbufline()|.
+---
+--- {lnum} is used like with |getline()|.
+--- When {lnum} is just below the last line the {text} will be
+--- added below the last line.
+--- {text} can be any type or a List of any type, each item is
+--- converted to a String.
+---
+--- If this succeeds, FALSE is returned.  If this fails (most likely
+--- because {lnum} is invalid) TRUE is returned.
+---
+--- Example: >
+---   :call setline(5, strftime("%c"))
+---
+--- <When {text} is a |List| then line {lnum} and following lines
+--- will be set to the items in the list.  Example: >
+---   :call setline(5, ['aaa', 'bbb', 'ccc'])
+--- <This is equivalent to: >
+---   :for [n, l] in [[5, 'aaa'], [6, 'bbb'], [7, 'ccc']]
+---   :  call setline(n, l)
+---   :endfor
+---
+--- <Note: The '[ and '] marks are not set.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetText()->setline(lnum)
+---
+--- @param lnum integer
+--- @param text any
+--- @return any
+function vim.fn.setline(lnum, text) end
+
+--- Create or replace or add to the location list for window {nr}.
+--- {nr} can be the window number or the |window-ID|.
+--- When {nr} is zero the current window is used.
+---
+--- For a location list window, the displayed location list is
+--- modified.  For an invalid window number {nr}, -1 is returned.
+--- Otherwise, same as |setqflist()|.
+--- Also see |location-list|.
+---
+--- For {action} see |setqflist-action|.
+---
+--- If the optional {what} dictionary argument is supplied, then
+--- only the items listed in {what} are set. Refer to |setqflist()|
+--- for the list of supported keys in {what}.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetLoclist()->setloclist(winnr)
+---
+--- @param nr integer
+--- @param list any
+--- @param action? any
+--- @param what? any
+--- @return any
+function vim.fn.setloclist(nr, list, action, what) end
+
+--- Restores a list of matches saved by |getmatches()| for the
+--- current window.  Returns 0 if successful, otherwise -1.  All
+--- current matches are cleared before the list is restored.  See
+--- example for |getmatches()|.
+--- If {win} is specified, use the window with this number or
+--- window ID instead of the current window.
+---
+--- Can also be used as a |method|: >
+---   GetMatches()->setmatches()
+--- <
+---           *setpos()*
+--- @param list any
+--- @param win? any
+--- @return any
+function vim.fn.setmatches(list, win) end
+
+--- Set the position for String {expr}.  Possible values:
+---   .  the cursor
+---   'x  mark x
+---
+--- {list} must be a |List| with four or five numbers:
+---     [bufnum, lnum, col, off]
+---     [bufnum, lnum, col, off, curswant]
+---
+--- "bufnum" is the buffer number.  Zero can be used for the
+--- current buffer.  When setting an uppercase mark "bufnum" is
+--- used for the mark position.  For other marks it specifies the
+--- buffer to set the mark in.  You can use the |bufnr()| function
+--- to turn a file name into a buffer number.
+--- For setting the cursor and the ' mark "bufnum" is ignored,
+--- since these are associated with a window, not a buffer.
+--- Does not change the jumplist.
+---
+--- "lnum" and "col" are the position in the buffer.  The first
+--- column is 1.  Use a zero "lnum" to delete a mark.  If "col" is
+--- smaller than 1 then 1 is used. To use the character count
+--- instead of the byte count, use |setcharpos()|.
+---
+--- The "off" number is only used when 'virtualedit' is set. Then
+--- it is the offset in screen columns from the start of the
+--- character.  E.g., a position within a <Tab> or after the last
+--- character.
+---
+--- The "curswant" number is only used when setting the cursor
+--- position.  It sets the preferred column for when moving the
+--- cursor vertically.  When the "curswant" number is missing the
+--- preferred column is not set.  When it is present and setting a
+--- mark position it is not used.
+---
+--- Note that for '< and '> changing the line number may result in
+--- the marks to be effectively be swapped, so that '< is always
+--- before '>.
+---
+--- Returns 0 when the position could be set, -1 otherwise.
+--- An error message is given if {expr} is invalid.
+---
+--- Also see |setcharpos()|, |getpos()| and |getcurpos()|.
+---
+--- This does not restore the preferred column for moving
+--- vertically; if you set the cursor position with this, |j| and
+--- |k| motions will jump to previous columns!  Use |cursor()| to
+--- also set the preferred column.  Also see the "curswant" key in
+--- |winrestview()|.
+---
+--- Can also be used as a |method|: >
+---   GetPosition()->setpos('.')
+---
+--- @param expr any
+--- @param list any
+--- @return any
+function vim.fn.setpos(expr, list) end
+
+--- Create or replace or add to the quickfix list.
+---
+--- If the optional {what} dictionary argument is supplied, then
+--- only the items listed in {what} are set. The first {list}
+--- argument is ignored.  See below for the supported items in
+--- {what}.
+---           *setqflist-what*
+--- When {what} is not present, the items in {list} are used.  Each
+--- item must be a dictionary.  Non-dictionary items in {list} are
+--- ignored.  Each dictionary item can contain the following
+--- entries:
+---
+---     bufnr  buffer number; must be the number of a valid
+---     buffer
+---     filename  name of a file; only used when "bufnr" is not
+---     present or it is invalid.
+---     module  name of a module; if given it will be used in
+---     quickfix error window instead of the filename.
+---     lnum  line number in the file
+---     end_lnum  end of lines, if the item spans multiple lines
+---     pattern  search pattern used to locate the error
+---     col    column number
+---     vcol  when non-zero: "col" is visual column
+---     when zero: "col" is byte index
+---     end_col  end column, if the item spans multiple columns
+---     nr    error number
+---     text  description of the error
+---     type  single-character error type, 'E', 'W', etc.
+---     valid  recognized error message
+---
+--- The "col", "vcol", "nr", "type" and "text" entries are
+--- optional.  Either "lnum" or "pattern" entry can be used to
+--- locate a matching error line.
+--- If the "filename" and "bufnr" entries are not present or
+--- neither the "lnum" or "pattern" entries are present, then the
+--- item will not be handled as an error line.
+--- If both "pattern" and "lnum" are present then "pattern" will
+--- be used.
+--- If the "valid" entry is not supplied, then the valid flag is
+--- set when "bufnr" is a valid buffer or "filename" exists.
+--- If you supply an empty {list}, the quickfix list will be
+--- cleared.
+--- Note that the list is not exactly the same as what
+--- |getqflist()| returns.
+---
+--- {action} values:    *setqflist-action* *E927*
+--- 'a'  The items from {list} are added to the existing
+---   quickfix list. If there is no existing list, then a
+---   new list is created.
+---
+--- 'r'  The items from the current quickfix list are replaced
+---   with the items from {list}.  This can also be used to
+---   clear the list: >
+---     :call setqflist([], 'r')
+--- <
+--- 'f'  All the quickfix lists in the quickfix stack are
+---   freed.
+---
+--- If {action} is not present or is set to ' ', then a new list
+--- is created. The new quickfix list is added after the current
+--- quickfix list in the stack and all the following lists are
+--- freed. To add a new quickfix list at the end of the stack,
+--- set "nr" in {what} to "$".
+---
+--- The following items can be specified in dictionary {what}:
+---     context  quickfix list context. See |quickfix-context|
+---     efm    errorformat to use when parsing text from
+---     "lines". If this is not present, then the
+---     'errorformat' option value is used.
+---     See |quickfix-parse|
+---     id    quickfix list identifier |quickfix-ID|
+---     idx    index of the current entry in the quickfix
+---     list specified by "id" or "nr". If set to '$',
+---     then the last entry in the list is set as the
+---     current entry.  See |quickfix-index|
+---     items  list of quickfix entries. Same as the {list}
+---     argument.
+---     lines  use 'errorformat' to parse a list of lines and
+---     add the resulting entries to the quickfix list
+---     {nr} or {id}.  Only a |List| value is supported.
+---     See |quickfix-parse|
+---     nr    list number in the quickfix stack; zero
+---     means the current quickfix list and "$" means
+---     the last quickfix list.
+---     quickfixtextfunc
+---     function to get the text to display in the
+---     quickfix window.  The value can be the name of
+---     a function or a funcref or a lambda.  Refer to
+---     |quickfix-window-function| for an explanation
+---     of how to write the function and an example.
+---     title  quickfix list title text. See |quickfix-title|
+--- Unsupported keys in {what} are ignored.
+--- If the "nr" item is not present, then the current quickfix list
+--- is modified. When creating a new quickfix list, "nr" can be
+--- set to a value one greater than the quickfix stack size.
+--- When modifying a quickfix list, to guarantee that the correct
+--- list is modified, "id" should be used instead of "nr" to
+--- specify the list.
+---
+--- Examples (See also |setqflist-examples|): >
+---    :call setqflist([], 'r', {'title': 'My search'})
+---    :call setqflist([], 'r', {'nr': 2, 'title': 'Errors'})
+---    :call setqflist([], 'a', {'id':qfid, 'lines':["F1:10:L10"]})
+--- <
+--- Returns zero for success, -1 for failure.
+---
+--- This function can be used to create a quickfix list
+--- independent of the 'errorformat' setting.  Use a command like
+--- `:cc 1` to jump to the first position.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetErrorlist()->setqflist()
+--- <
+---           *setreg()*
+--- @param list any
+--- @param action? any
+--- @param what? any
+--- @return any
+function vim.fn.setqflist(list, action, what) end
+
+--- Set the register {regname} to {value}.
+--- If {regname} is "" or "\@", the unnamed register '"' is used.
+--- The {regname} argument is a string.
+---
+--- {value} may be any value returned by |getreg()| or
+--- |getreginfo()|, including a |List| or |Dict|.
+--- If {options} contains "a" or {regname} is upper case,
+--- then the value is appended.
+---
+--- {options} can also contain a register type specification:
+---     "c" or "v"        |charwise| mode
+---     "l" or "V"        |linewise| mode
+---     "b" or "<CTRL-V>" |blockwise-visual| mode
+--- If a number immediately follows "b" or "<CTRL-V>" then this is
+--- used as the width of the selection - if it is not specified
+--- then the width of the block is set to the number of characters
+--- in the longest line (counting a <Tab> as 1 character).
+--- If {options} contains "u" or '"', then the unnamed register is
+--- set to point to register {regname}.
+---
+--- If {options} contains no register settings, then the default
+--- is to use character mode unless {value} ends in a <NL> for
+--- string {value} and linewise mode for list {value}. Blockwise
+--- mode is never selected automatically.
+--- Returns zero for success, non-zero for failure.
+---
+---           *E883*
+--- Note: you may not use |List| containing more than one item to
+---       set search and expression registers. Lists containing no
+---       items act like empty strings.
+---
+--- Examples: >
+---   :call setreg(v:register, \@*)
+---   :call setreg('*', \@%, 'ac')
+---   :call setreg('a', "1\n2\n3", 'b5')
+---   :call setreg('"', { 'points_to': 'a'})
+---
+--- <This example shows using the functions to save and restore a
+--- register: >
+---   :let var_a = getreginfo()
+---   :call setreg('a', var_a)
+--- <or: >
+---   :let var_a = getreg('a', 1, 1)
+---   :let var_amode = getregtype('a')
+---       ....
+---   :call setreg('a', var_a, var_amode)
+--- <Note: you may not reliably restore register value
+--- without using the third argument to |getreg()| as without it
+--- newlines are represented as newlines AND Nul bytes are
+--- represented as newlines as well, see |NL-used-for-Nul|.
+---
+--- You can also change the type of a register by appending
+--- nothing: >
+---   :call setreg('a', '', 'al')
+---
+--- <Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetText()->setreg('a')
+---
+--- @param regname string
+--- @param value any
+--- @param options? table
+--- @return any
+function vim.fn.setreg(regname, value, options) end
+
+--- Set tab-local variable {varname} to {val} in tab page {tabnr}.
+--- |t:var|
+--- The {varname} argument is a string.
+--- Note that the variable name without "t:" must be used.
+--- Tabs are numbered starting with one.
+--- This function is not available in the |sandbox|.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- third argument: >
+---   GetValue()->settabvar(tab, name)
+---
+--- @param tabnr integer
+--- @param varname string
+--- @param val any
+--- @return any
+function vim.fn.settabvar(tabnr, varname, val) end
+
+--- Set option or local variable {varname} in window {winnr} to
+--- {val}.
+--- Tabs are numbered starting with one.  For the current tabpage
+--- use |setwinvar()|.
+--- {winnr} can be the window number or the |window-ID|.
+--- When {winnr} is zero the current window is used.
+--- This also works for a global or local buffer option, but it
+--- doesn't work for a global or local buffer variable.
+--- For a local buffer option the global value is unchanged.
+--- Note that the variable name without "w:" must be used.
+--- Examples: >
+---   :call settabwinvar(1, 1, "&list", 0)
+---   :call settabwinvar(3, 2, "myvar", "foobar")
+--- <This function is not available in the |sandbox|.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- fourth argument: >
+---   GetValue()->settabwinvar(tab, winnr, name)
+---
+--- @param tabnr integer
+--- @param winnr integer
+--- @param varname string
+--- @param val any
+--- @return any
+function vim.fn.settabwinvar(tabnr, winnr, varname, val) end
+
+--- Modify the tag stack of the window {nr} using {dict}.
+--- {nr} can be the window number or the |window-ID|.
+---
+--- For a list of supported items in {dict}, refer to
+--- |gettagstack()|. "curidx" takes effect before changing the tag
+--- stack.
+---           *E962*
+--- How the tag stack is modified depends on the {action}
+--- argument:
+--- - If {action} is not present or is set to 'r', then the tag
+---   stack is replaced.
+--- - If {action} is set to 'a', then new entries from {dict} are
+---   pushed (added) onto the tag stack.
+--- - If {action} is set to 't', then all the entries from the
+---   current entry in the tag stack or "curidx" in {dict} are
+---   removed and then new entries are pushed to the stack.
+---
+--- The current index is set to one after the length of the tag
+--- stack after the modification.
+---
+--- Returns zero for success, -1 for failure.
+---
+--- Examples (for more examples see |tagstack-examples|):
+---     Empty the tag stack of window 3: >
+---   call settagstack(3, {'items' : []})
+---
+--- <    Save and restore the tag stack: >
+---   let stack = gettagstack(1003)
+---   " do something else
+---   call settagstack(1003, stack)
+---   unlet stack
+--- <
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetStack()->settagstack(winnr)
+---
+--- @param nr integer
+--- @param dict any
+--- @param action? any
+--- @return any
+function vim.fn.settagstack(nr, dict, action) end
+
+--- Like |settabwinvar()| for the current tab page.
+--- Examples: >
+---   :call setwinvar(1, "&list", 0)
+---   :call setwinvar(2, "myvar", "foobar")
+---
+--- <Can also be used as a |method|, the base is passed as the
+--- third argument: >
+---   GetValue()->setwinvar(winnr, name)
+---
+--- @param nr integer
+--- @param varname string
+--- @param val any
+--- @return any
+function vim.fn.setwinvar(nr, varname, val) end
+
+--- Returns a String with 64 hex characters, which is the SHA256
+--- checksum of {string}.
+---
+--- Can also be used as a |method|: >
+---   GetText()->sha256()
+---
+--- @param string string
+--- @return any
+function vim.fn.sha256(string) end
+
+--- Escape {string} for use as a shell command argument.
+---
+--- On Windows when 'shellslash' is not set, encloses {string} in
+--- double-quotes and doubles all double-quotes within {string}.
+--- Otherwise encloses {string} in single-quotes and replaces all
+--- "'" with "'\''".
+---
+--- If {special} is a |non-zero-arg|:
+--- - Special items such as "!", "%", "#" and "<cword>" will be
+---   preceded by a backslash. The backslash will be removed again
+---   by the |:!| command.
+--- - The <NL> character is escaped.
+---
+--- If 'shell' contains "csh" in the tail:
+--- - The "!" character will be escaped. This is because csh and
+---   tcsh use "!" for history replacement even in single-quotes.
+--- - The <NL> character is escaped (twice if {special} is
+---   a |non-zero-arg|).
+---
+--- If 'shell' contains "fish" in the tail, the "\" character will
+--- be escaped because in fish it is used as an escape character
+--- inside single quotes.
+---
+--- Example of use with a |:!| command: >
+---     :exe '!dir ' .. shellescape(expand('<cfile>'), 1)
+--- <This results in a directory listing for the file under the
+--- cursor.  Example of use with |system()|: >
+---     :call system("chmod +w -- " .. shellescape(expand("%")))
+--- <See also |::S|.
+---
+--- Can also be used as a |method|: >
+---   GetCommand()->shellescape()
+---
+--- @param string string
+--- @param special? any
+--- @return any
+function vim.fn.shellescape(string, special) end
+
+--- Returns the effective value of 'shiftwidth'. This is the
+--- 'shiftwidth' value unless it is zero, in which case it is the
+--- 'tabstop' value.  To be backwards compatible in indent
+--- plugins, use this: >
+---   if exists('*shiftwidth')
+---     func s:sw()
+---       return shiftwidth()
+---     endfunc
+---   else
+---     func s:sw()
+---       return &sw
+---     endfunc
+---   endif
+--- <And then use s:sw() instead of &sw.
+---
+--- When there is one argument {col} this is used as column number
+--- for which to return the 'shiftwidth' value. This matters for the
+--- 'vartabstop' feature. If no {col} argument is given, column 1
+--- will be assumed.
+---
+--- Can also be used as a |method|: >
+---   GetColumn()->shiftwidth()
+---
+--- sign_ functions are documented here: |sign-functions-details|
+---
+--- @param col? integer
+--- @return any
+function vim.fn.shiftwidth(col) end
+
+--- Define a new sign named {name} or modify the attributes of an
+--- existing sign.  This is similar to the |:sign-define| command.
+---
+--- Prefix {name} with a unique text to avoid name collisions.
+--- There is no {group} like with placing signs.
+---
+--- The {name} can be a String or a Number.  The optional {dict}
+--- argument specifies the sign attributes.  The following values
+--- are supported:
+---    icon    full path to the bitmap file for the sign.
+---    linehl  highlight group used for the whole line the
+---     sign is placed in.
+---    numhl  highlight group used for the line number where
+---     the sign is placed.
+---    text    text that is displayed when there is no icon
+---     or the GUI is not being used.
+---    texthl  highlight group used for the text item
+---    culhl  highlight group used for the text item when
+---     the cursor is on the same line as the sign and
+---     'cursorline' is enabled.
+---
+--- If the sign named {name} already exists, then the attributes
+--- of the sign are updated.
+---
+--- The one argument {list} can be used to define a list of signs.
+--- Each list item is a dictionary with the above items in {dict}
+--- and a "name" item for the sign name.
+---
+--- Returns 0 on success and -1 on failure.  When the one argument
+--- {list} is used, then returns a List of values one for each
+--- defined sign.
+---
+--- Examples: >
+---   call sign_define("mySign", {
+---     \ "text" : "=>",
+---     \ "texthl" : "Error",
+---     \ "linehl" : "Search"})
+---   call sign_define([
+---     \ {'name' : 'sign1',
+---     \  'text' : '=>'},
+---     \ {'name' : 'sign2',
+---     \  'text' : '!!'}
+---     \ ])
+--- <
+--- Can also be used as a |method|: >
+---   GetSignList()->sign_define()
+---
+--- @param list any
+--- @return any
+function vim.fn.sign_define(list) end
+
+--- Get a list of defined signs and their attributes.
+--- This is similar to the |:sign-list| command.
+---
+--- If the {name} is not supplied, then a list of all the defined
+--- signs is returned. Otherwise the attribute of the specified
+--- sign is returned.
+---
+--- Each list item in the returned value is a dictionary with the
+--- following entries:
+---    icon    full path to the bitmap file of the sign
+---    linehl  highlight group used for the whole line the
+---     sign is placed in; not present if not set.
+---    name    name of the sign
+---    numhl  highlight group used for the line number where
+---     the sign is placed; not present if not set.
+---    text    text that is displayed when there is no icon
+---     or the GUI is not being used.
+---    texthl  highlight group used for the text item; not
+---     present if not set.
+---    culhl  highlight group used for the text item when
+---     the cursor is on the same line as the sign and
+---     'cursorline' is enabled; not present if not
+---     set.
+---
+--- Returns an empty List if there are no signs and when {name} is
+--- not found.
+---
+--- Examples: >
+---   " Get a list of all the defined signs
+---   echo sign_getdefined()
+---
+---   " Get the attribute of the sign named mySign
+---   echo sign_getdefined("mySign")
+--- <
+--- Can also be used as a |method|: >
+---   GetSignList()->sign_getdefined()
+---
+--- @param name? string
+--- @return any
+function vim.fn.sign_getdefined(name) end
+
+--- Return a list of signs placed in a buffer or all the buffers.
+--- This is similar to the |:sign-place-list| command.
+---
+--- If the optional buffer name {buf} is specified, then only the
+--- list of signs placed in that buffer is returned.  For the use
+--- of {buf}, see |bufname()|. The optional {dict} can contain
+--- the following entries:
+---    group  select only signs in this group
+---    id    select sign with this identifier
+---    lnum    select signs placed in this line. For the use
+---     of {lnum}, see |line()|.
+--- If {group} is "*", then signs in all the groups including the
+--- global group are returned. If {group} is not supplied or is an
+--- empty string, then only signs in the global group are
+--- returned.  If no arguments are supplied, then signs in the
+--- global group placed in all the buffers are returned.
+--- See |sign-group|.
+---
+--- Each list item in the returned value is a dictionary with the
+--- following entries:
+---   bufnr  number of the buffer with the sign
+---   signs  list of signs placed in {bufnr}. Each list
+---     item is a dictionary with the below listed
+---     entries
+---
+--- The dictionary for each sign contains the following entries:
+---   group   sign group. Set to '' for the global group.
+---   id   identifier of the sign
+---   lnum   line number where the sign is placed
+---   name   name of the defined sign
+---   priority sign priority
+---
+--- The returned signs in a buffer are ordered by their line
+--- number and priority.
+---
+--- Returns an empty list on failure or if there are no placed
+--- signs.
+---
+--- Examples: >
+---   " Get a List of signs placed in eval.c in the
+---   " global group
+---   echo sign_getplaced("eval.c")
+---
+---   " Get a List of signs in group 'g1' placed in eval.c
+---   echo sign_getplaced("eval.c", {'group' : 'g1'})
+---
+---   " Get a List of signs placed at line 10 in eval.c
+---   echo sign_getplaced("eval.c", {'lnum' : 10})
+---
+---   " Get sign with identifier 10 placed in a.py
+---   echo sign_getplaced("a.py", {'id' : 10})
+---
+---   " Get sign with id 20 in group 'g1' placed in a.py
+---   echo sign_getplaced("a.py", {'group' : 'g1',
+---           \  'id' : 20})
+---
+---   " Get a List of all the placed signs
+---   echo sign_getplaced()
+--- <
+--- Can also be used as a |method|: >
+---   GetBufname()->sign_getplaced()
+--- <
+---           *sign_jump()*
+--- @param buf? any
+--- @param dict? any
+--- @return any
+function vim.fn.sign_getplaced(buf, dict) end
+
+--- Open the buffer {buf} or jump to the window that contains
+--- {buf} and position the cursor at sign {id} in group {group}.
+--- This is similar to the |:sign-jump| command.
+---
+--- If {group} is an empty string, then the global group is used.
+--- For the use of {buf}, see |bufname()|.
+---
+--- Returns the line number of the sign. Returns -1 if the
+--- arguments are invalid.
+---
+--- Example: >
+---   " Jump to sign 10 in the current buffer
+---   call sign_jump(10, '', '')
+--- <
+--- Can also be used as a |method|: >
+---   GetSignid()->sign_jump()
+--- <
+---           *sign_place()*
+--- @param id any
+--- @param group any
+--- @param buf any
+--- @return any
+function vim.fn.sign_jump(id, group, buf) end
+
+--- Place the sign defined as {name} at line {lnum} in file or
+--- buffer {buf} and assign {id} and {group} to sign.  This is
+--- similar to the |:sign-place| command.
+---
+--- If the sign identifier {id} is zero, then a new identifier is
+--- allocated.  Otherwise the specified number is used. {group} is
+--- the sign group name. To use the global sign group, use an
+--- empty string.  {group} functions as a namespace for {id}, thus
+--- two groups can use the same IDs. Refer to |sign-identifier|
+--- and |sign-group| for more information.
+---
+--- {name} refers to a defined sign.
+--- {buf} refers to a buffer name or number. For the accepted
+--- values, see |bufname()|.
+---
+--- The optional {dict} argument supports the following entries:
+---   lnum    line number in the file or buffer
+---       {buf} where the sign is to be placed.
+---       For the accepted values, see |line()|.
+---   priority  priority of the sign. See
+---       |sign-priority| for more information.
+---
+--- If the optional {dict} is not specified, then it modifies the
+--- placed sign {id} in group {group} to use the defined sign
+--- {name}.
+---
+--- Returns the sign identifier on success and -1 on failure.
+---
+--- Examples: >
+---   " Place a sign named sign1 with id 5 at line 20 in
+---   " buffer json.c
+---   call sign_place(5, '', 'sign1', 'json.c',
+---           \ {'lnum' : 20})
+---
+---   " Updates sign 5 in buffer json.c to use sign2
+---   call sign_place(5, '', 'sign2', 'json.c')
+---
+---   " Place a sign named sign3 at line 30 in
+---   " buffer json.c with a new identifier
+---   let id = sign_place(0, '', 'sign3', 'json.c',
+---           \ {'lnum' : 30})
+---
+---   " Place a sign named sign4 with id 10 in group 'g3'
+---   " at line 40 in buffer json.c with priority 90
+---   call sign_place(10, 'g3', 'sign4', 'json.c',
+---       \ {'lnum' : 40, 'priority' : 90})
+--- <
+--- Can also be used as a |method|: >
+---   GetSignid()->sign_place(group, name, expr)
+--- <
+---           *sign_placelist()*
+--- @param id any
+--- @param group any
+--- @param name string
+--- @param buf any
+--- @param dict? any
+--- @return any
+function vim.fn.sign_place(id, group, name, buf, dict) end
+
+--- Place one or more signs.  This is similar to the
+--- |sign_place()| function.  The {list} argument specifies the
+--- List of signs to place. Each list item is a dict with the
+--- following sign attributes:
+---     buffer  Buffer name or number. For the accepted
+---     values, see |bufname()|.
+---     group  Sign group. {group} functions as a namespace
+---     for {id}, thus two groups can use the same
+---     IDs. If not specified or set to an empty
+---     string, then the global group is used.   See
+---     |sign-group| for more information.
+---     id    Sign identifier. If not specified or zero,
+---     then a new unique identifier is allocated.
+---     Otherwise the specified number is used. See
+---     |sign-identifier| for more information.
+---     lnum  Line number in the buffer where the sign is to
+---     be placed. For the accepted values, see
+---     |line()|.
+---     name  Name of the sign to place. See |sign_define()|
+---     for more information.
+---     priority  Priority of the sign. When multiple signs are
+---     placed on a line, the sign with the highest
+---     priority is used. If not specified, the
+---     default value of 10 is used. See
+---     |sign-priority| for more information.
+---
+--- If {id} refers to an existing sign, then the existing sign is
+--- modified to use the specified {name} and/or {priority}.
+---
+--- Returns a List of sign identifiers. If failed to place a
+--- sign, the corresponding list item is set to -1.
+---
+--- Examples: >
+---   " Place sign s1 with id 5 at line 20 and id 10 at line
+---   " 30 in buffer a.c
+---   let [n1, n2] = sign_placelist([
+---     \ {'id' : 5,
+---     \  'name' : 's1',
+---     \  'buffer' : 'a.c',
+---     \  'lnum' : 20},
+---     \ {'id' : 10,
+---     \  'name' : 's1',
+---     \  'buffer' : 'a.c',
+---     \  'lnum' : 30}
+---     \ ])
+---
+---   " Place sign s1 in buffer a.c at line 40 and 50
+---   " with auto-generated identifiers
+---   let [n1, n2] = sign_placelist([
+---     \ {'name' : 's1',
+---     \  'buffer' : 'a.c',
+---     \  'lnum' : 40},
+---     \ {'name' : 's1',
+---     \  'buffer' : 'a.c',
+---     \  'lnum' : 50}
+---     \ ])
+--- <
+--- Can also be used as a |method|: >
+---   GetSignlist()->sign_placelist()
+---
+--- @param list any
+--- @return any
+function vim.fn.sign_placelist(list) end
+
+--- Deletes a previously defined sign {name}. This is similar to
+--- the |:sign-undefine| command. If {name} is not supplied, then
+--- deletes all the defined signs.
+---
+--- The one argument {list} can be used to undefine a list of
+--- signs. Each list item is the name of a sign.
+---
+--- Returns 0 on success and -1 on failure.  For the one argument
+--- {list} call, returns a list of values one for each undefined
+--- sign.
+---
+--- Examples: >
+---   " Delete a sign named mySign
+---   call sign_undefine("mySign")
+---
+---   " Delete signs 'sign1' and 'sign2'
+---   call sign_undefine(["sign1", "sign2"])
+---
+---   " Delete all the signs
+---   call sign_undefine()
+--- <
+--- Can also be used as a |method|: >
+---   GetSignlist()->sign_undefine()
+---
+--- @param list? any
+--- @return any
+function vim.fn.sign_undefine(list) end
+
+--- Remove a previously placed sign in one or more buffers.  This
+--- is similar to the |:sign-unplace| command.
+---
+--- {group} is the sign group name. To use the global sign group,
+--- use an empty string.  If {group} is set to "*", then all the
+--- groups including the global group are used.
+--- The signs in {group} are selected based on the entries in
+--- {dict}.  The following optional entries in {dict} are
+--- supported:
+---   buffer  buffer name or number. See |bufname()|.
+---   id  sign identifier
+--- If {dict} is not supplied, then all the signs in {group} are
+--- removed.
+---
+--- Returns 0 on success and -1 on failure.
+---
+--- Examples: >
+---   " Remove sign 10 from buffer a.vim
+---   call sign_unplace('', {'buffer' : "a.vim", 'id' : 10})
+---
+---   " Remove sign 20 in group 'g1' from buffer 3
+---   call sign_unplace('g1', {'buffer' : 3, 'id' : 20})
+---
+---   " Remove all the signs in group 'g2' from buffer 10
+---   call sign_unplace('g2', {'buffer' : 10})
+---
+---   " Remove sign 30 in group 'g3' from all the buffers
+---   call sign_unplace('g3', {'id' : 30})
+---
+---   " Remove all the signs placed in buffer 5
+---   call sign_unplace('*', {'buffer' : 5})
+---
+---   " Remove the signs in group 'g4' from all the buffers
+---   call sign_unplace('g4')
+---
+---   " Remove sign 40 from all the buffers
+---   call sign_unplace('*', {'id' : 40})
+---
+---   " Remove all the placed signs from all the buffers
+---   call sign_unplace('*')
+---
+--- <Can also be used as a |method|: >
+---   GetSigngroup()->sign_unplace()
+--- <
+--- @param group any
+--- @param dict? any
+--- @return any
+function vim.fn.sign_unplace(group, dict) end
+
+--- Remove previously placed signs from one or more buffers.  This
+--- is similar to the |sign_unplace()| function.
+---
+--- The {list} argument specifies the List of signs to remove.
+--- Each list item is a dict with the following sign attributes:
+---     buffer  buffer name or number. For the accepted
+---     values, see |bufname()|. If not specified,
+---     then the specified sign is removed from all
+---     the buffers.
+---     group  sign group name. If not specified or set to an
+---     empty string, then the global sign group is
+---     used. If set to "*", then all the groups
+---     including the global group are used.
+---     id    sign identifier. If not specified, then all
+---     the signs in the specified group are removed.
+---
+--- Returns a List where an entry is set to 0 if the corresponding
+--- sign was successfully removed or -1 on failure.
+---
+--- Example: >
+---   " Remove sign with id 10 from buffer a.vim and sign
+---   " with id 20 from buffer b.vim
+---   call sign_unplacelist([
+---     \ {'id' : 10, 'buffer' : "a.vim"},
+---     \ {'id' : 20, 'buffer' : 'b.vim'},
+---     \ ])
+--- <
+--- Can also be used as a |method|: >
+---   GetSignlist()->sign_unplacelist()
+--- <
+---
+--- @param list any
+--- @return any
+function vim.fn.sign_unplacelist(list) end
+
+--- Simplify the file name as much as possible without changing
+--- the meaning.  Shortcuts (on MS-Windows) or symbolic links (on
+--- Unix) are not resolved.  If the first path component in
+--- {filename} designates the current directory, this will be
+--- valid for the result as well.  A trailing path separator is
+--- not removed either. On Unix "//path" is unchanged, but
+--- "///path" is simplified to "/path" (this follows the Posix
+--- standard).
+--- Example: >
+---   simplify("./dir/.././/file/") == "./file/"
+--- <Note: The combination "dir/.." is only removed if "dir" is
+--- a searchable directory or does not exist.  On Unix, it is also
+--- removed when "dir" is a symbolic link within the same
+--- directory.  In order to resolve all the involved symbolic
+--- links before simplifying the path name, use |resolve()|.
+---
+--- Can also be used as a |method|: >
+---   GetName()->simplify()
+---
+--- @param filename any
+--- @return any
+function vim.fn.simplify(filename) end
+
+--- Return the sine of {expr}, measured in radians, as a |Float|.
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo sin(100)
+--- <  -0.506366 >
+---   :echo sin(-4.01)
+--- <  0.763301
+---
+--- Can also be used as a |method|: >
+---   Compute()->sin()
+---
+--- @param expr any
+--- @return any
+function vim.fn.sin(expr) end
+
+--- Return the hyperbolic sine of {expr} as a |Float| in the range
+--- [-inf, inf].
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo sinh(0.5)
+--- <  0.521095 >
+---   :echo sinh(-0.9)
+--- <  -1.026517
+---
+--- Can also be used as a |method|: >
+---   Compute()->sinh()
+---
+--- @param expr any
+--- @return any
+function vim.fn.sinh(expr) end
+
+--- Similar to using a |slice| "expr[start : end]", but "end" is
+--- used exclusive.  And for a string the indexes are used as
+--- character indexes instead of byte indexes.
+--- Also, composing characters are not counted.
+--- When {end} is omitted the slice continues to the last item.
+--- When {end} is -1 the last item is omitted.
+--- Returns an empty value if {start} or {end} are invalid.
+---
+--- Can also be used as a |method|: >
+---   GetList()->slice(offset)
+---
+---
+--- @param expr any
+--- @param start any
+--- @param end_? any
+--- @return any
+function vim.fn.slice(expr, start, end_) end
+
+--- Connect a socket to an address. If {mode} is "pipe" then
+--- {address} should be the path of a local domain socket (on
+--- unix) or named pipe (on Windows). If {mode} is "tcp" then
+--- {address} should be of the form "host:port" where the host
+--- should be an ip adderess or host name, and port the port
+--- number.
+---
+--- For "pipe" mode, see |luv-pipe-handle|. For "tcp" mode, see
+--- |luv-tcp-handle|.
+---
+--- Returns a |channel| ID. Close the socket with |chanclose()|.
+--- Use |chansend()| to send data over a bytes socket, and
+--- |rpcrequest()| and |rpcnotify()| to communicate with a RPC
+--- socket.
+---
+--- {opts} is an optional dictionary with these keys:
+---   |on_data| : callback invoked when data was read from socket
+---   data_buffered : read socket data in |channel-buffered| mode.
+---   rpc     : If set, |msgpack-rpc| will be used to communicate
+---       over the socket.
+--- Returns:
+---   - The channel ID on success (greater than zero)
+---   - 0 on invalid arguments or connection failure.
+---
+--- @param mode string
+--- @param address any
+--- @param opts? table
+--- @return any
+function vim.fn.sockconnect(mode, address, opts) end
+
+--- Sort the items in {list} in-place.  Returns {list}.
+---
+--- If you want a list to remain unmodified make a copy first: >
+---   :let sortedlist = sort(copy(mylist))
+---
+--- <When {func} is omitted, is empty or zero, then sort() uses the
+--- string representation of each item to sort on.  Numbers sort
+--- after Strings, |Lists| after Numbers.  For sorting text in the
+--- current buffer use |:sort|.
+---
+--- When {func} is given and it is '1' or 'i' then case is
+--- ignored.
+---
+--- When {func} is given and it is 'l' then the current collation
+--- locale is used for ordering. Implementation details: strcoll()
+--- is used to compare strings. See |:language| check or set the
+--- collation locale. |v:collate| can also be used to check the
+--- current locale. Sorting using the locale typically ignores
+--- case. Example: >
+---   " ö is sorted similarly to o with English locale.
+---   :language collate en_US.UTF8
+---   :echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+--- <  ['n', 'o', 'O', 'ö', 'p', 'z'] ~
+--- >
+---   " ö is sorted after z with Swedish locale.
+---   :language collate sv_SE.UTF8
+---   :echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+--- <  ['n', 'o', 'O', 'p', 'z', 'ö'] ~
+--- This does not work properly on Mac.
+---
+--- When {func} is given and it is 'n' then all items will be
+--- sorted numerical (Implementation detail: this uses the
+--- strtod() function to parse numbers, Strings, Lists, Dicts and
+--- Funcrefs will be considered as being 0).
+---
+--- When {func} is given and it is 'N' then all items will be
+--- sorted numerical. This is like 'n' but a string containing
+--- digits will be used as the number they represent.
+---
+--- When {func} is given and it is 'f' then all items will be
+--- sorted numerical. All values must be a Number or a Float.
+---
+--- When {func} is a |Funcref| or a function name, this function
+--- is called to compare items.  The function is invoked with two
+--- items as argument and must return zero if they are equal, 1 or
+--- bigger if the first one sorts after the second one, -1 or
+--- smaller if the first one sorts before the second one.
+---
+--- {dict} is for functions with the "dict" attribute.  It will be
+--- used to set the local variable "self". |Dictionary-function|
+---
+--- The sort is stable, items which compare equal (as number or as
+--- string) will keep their relative position. E.g., when sorting
+--- on numbers, text strings will sort next to each other, in the
+--- same order as they were originally.
+---
+--- Can also be used as a |method|: >
+---   mylist->sort()
+---
+--- <Also see |uniq()|.
+---
+--- Example: >
+---   func MyCompare(i1, i2)
+---      return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
+---   endfunc
+---   eval mylist->sort("MyCompare")
+--- <A shorter compare version for this specific simple case, which
+--- ignores overflow: >
+---   func MyCompare(i1, i2)
+---      return a:i1 - a:i2
+---   endfunc
+--- <For a simple expression you can use a lambda: >
+---   eval mylist->sort({i1, i2 -> i1 - i2})
+--- <
+---           *soundfold()*
+--- @param list any
+--- @param func? any
+--- @param dict? any
+--- @return any
+function vim.fn.sort(list, func, dict) end
+
+--- Return the sound-folded equivalent of {word}.  Uses the first
+--- language in 'spelllang' for the current window that supports
+--- soundfolding.  'spell' must be set.  When no sound folding is
+--- possible the {word} is returned unmodified.
+--- This can be used for making spelling suggestions.  Note that
+--- the method can be quite slow.
+---
+--- Can also be used as a |method|: >
+---   GetWord()->soundfold()
+--- <
+---           *spellbadword()*
+--- @param word any
+--- @return any
+function vim.fn.soundfold(word) end
+
+--- Without argument: The result is the badly spelled word under
+--- or after the cursor.  The cursor is moved to the start of the
+--- bad word.  When no bad word is found in the cursor line the
+--- result is an empty string and the cursor doesn't move.
+---
+--- With argument: The result is the first word in {sentence} that
+--- is badly spelled.  If there are no spelling mistakes the
+--- result is an empty string.
+---
+--- The return value is a list with two items:
+--- - The badly spelled word or an empty string.
+--- - The type of the spelling error:
+---   "bad"    spelling mistake
+---   "rare"    rare word
+---   "local"    word only valid in another region
+---   "caps"    word should start with Capital
+--- Example: >
+---   echo spellbadword("the quik brown fox")
+--- <  ['quik', 'bad'] ~
+---
+--- The spelling information for the current window and the value
+--- of 'spelllang' are used.
+---
+--- Can also be used as a |method|: >
+---   GetText()->spellbadword()
+--- <
+---           *spellsuggest()*
+--- @param sentence? any
+--- @return any
+function vim.fn.spellbadword(sentence) end
+
+--- Return a |List| with spelling suggestions to replace {word}.
+--- When {max} is given up to this number of suggestions are
+--- returned.  Otherwise up to 25 suggestions are returned.
+---
+--- When the {capital} argument is given and it's non-zero only
+--- suggestions with a leading capital will be given.  Use this
+--- after a match with 'spellcapcheck'.
+---
+--- {word} can be a badly spelled word followed by other text.
+--- This allows for joining two words that were split.  The
+--- suggestions also include the following text, thus you can
+--- replace a line.
+---
+--- {word} may also be a good word.  Similar words will then be
+--- returned.  {word} itself is not included in the suggestions,
+--- although it may appear capitalized.
+---
+--- The spelling information for the current window is used.  The
+--- values of 'spelllang' and 'spellsuggest' are used.
+---
+--- Can also be used as a |method|: >
+---   GetWord()->spellsuggest()
+---
+--- @param word any
+--- @param max? any
+--- @param capital? any
+--- @return any
+function vim.fn.spellsuggest(word, max, capital) end
+
+--- Make a |List| out of {string}.  When {pattern} is omitted or
+--- empty each white-separated sequence of characters becomes an
+--- item.
+--- Otherwise the string is split where {pattern} matches,
+--- removing the matched characters. 'ignorecase' is not used
+--- here, add \c to ignore case. |/\c|
+--- When the first or last item is empty it is omitted, unless the
+--- {keepempty} argument is given and it's non-zero.
+--- Other empty items are kept when {pattern} matches at least one
+--- character or when {keepempty} is non-zero.
+--- Example: >
+---   :let words = split(getline('.'), '\W\+')
+--- <To split a string in individual characters: >
+---   :for c in split(mystring, '\zs')
+--- <If you want to keep the separator you can also use '\zs' at
+--- the end of the pattern: >
+---   :echo split('abc:def:ghi', ':\zs')
+--- <  ['abc:', 'def:', 'ghi'] ~
+--- Splitting a table where the first element can be empty: >
+---   :let items = split(line, ':', 1)
+--- <The opposite function is |join()|.
+---
+--- Can also be used as a |method|: >
+---   GetString()->split()
+---
+--- @param string string
+--- @param pattern? any
+--- @param keepempty? any
+--- @return any
+function vim.fn.split(string, pattern, keepempty) end
+
+--- Return the non-negative square root of Float {expr} as a
+--- |Float|.
+--- {expr} must evaluate to a |Float| or a |Number|.  When {expr}
+--- is negative the result is NaN (Not a Number).  Returns 0.0 if
+--- {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo sqrt(100)
+--- <  10.0 >
+---   :echo sqrt(-4.01)
+--- <  str2float("nan")
+--- NaN may be different, it depends on system libraries.
+---
+--- Can also be used as a |method|: >
+---   Compute()->sqrt()
+---
+--- @param expr any
+--- @return any
+function vim.fn.sqrt(expr) end
+
+--- Initialize seed used by |rand()|:
+--- - If {expr} is not given, seed values are initialized by
+---   reading from /dev/urandom, if possible, or using time(NULL)
+---   a.k.a. epoch time otherwise; this only has second accuracy.
+--- - If {expr} is given it must be a Number.  It is used to
+---   initialize the seed values.  This is useful for testing or
+---   when a predictable sequence is intended.
+---
+--- Examples: >
+---   :let seed = srand()
+---   :let seed = srand(userinput)
+---   :echo rand(seed)
+--- <
+--- Can also be used as a |method|: >
+---   userinput->srand()
+---
+--- @param expr? any
+--- @return any
+function vim.fn.srand(expr) end
+
+--- With |--headless| this opens stdin and stdout as a |channel|.
+--- May be called only once. See |channel-stdio|. stderr is not
+--- handled by this function, see |v:stderr|.
+---
+--- Close the stdio handles with |chanclose()|. Use |chansend()|
+--- to send data to stdout, and |rpcrequest()| and |rpcnotify()|
+--- to communicate over RPC.
+---
+--- {opts} is a dictionary with these keys:
+---   |on_stdin| : callback invoked when stdin is written to.
+---   on_print : callback invoked when Nvim needs to print a
+---        message, with the message (whose type is string)
+---        as sole argument.
+---   stdin_buffered : read stdin in |channel-buffered| mode.
+---   rpc      : If set, |msgpack-rpc| will be used to communicate
+---        over stdio
+--- Returns:
+---   - |channel-id| on success (value is always 1)
+---   - 0 on invalid arguments
+---
+---
+--- @param opts table
+--- @return any
+function vim.fn.stdioopen(opts) end
+
+--- Returns |standard-path| locations of various default files and
+--- directories.
+---
+--- {what}       Type    Description ~
+--- cache        String  Cache directory: arbitrary temporary
+---                      storage for plugins, etc.
+--- config       String  User configuration directory. |init.vim|
+---                      is stored here.
+--- config_dirs  List    Other configuration directories.
+--- data         String  User data directory.
+--- data_dirs    List    Other data directories.
+--- log          String  Logs directory (for use by plugins too).
+--- run          String  Run directory: temporary, local storage
+---          for sockets, named pipes, etc.
+--- state        String  Session state directory: storage for file
+---          drafts, swap, undo, |shada|.
+---
+--- Example: >
+---   :echo stdpath("config")
+---
+---
+--- @param what any
+--- @return any
+function vim.fn.stdpath(what) end
+
+--- Convert String {string} to a Float.  This mostly works the
+--- same as when using a floating point number in an expression,
+--- see |floating-point-format|.  But it's a bit more permissive.
+--- E.g., "1e40" is accepted, while in an expression you need to
+--- write "1.0e40".  The hexadecimal form "0x123" is also
+--- accepted, but not others, like binary or octal.
+--- When {quoted} is present and non-zero then embedded single
+--- quotes before the dot are ignored, thus "1'000.0" is a
+--- thousand.
+--- Text after the number is silently ignored.
+--- The decimal point is always '.', no matter what the locale is
+--- set to.  A comma ends the number: "12,345.67" is converted to
+--- 12.0.  You can strip out thousands separators with
+--- |substitute()|: >
+---   let f = str2float(substitute(text, ',', '', 'g'))
+--- <
+--- Returns 0.0 if the conversion fails.
+---
+--- Can also be used as a |method|: >
+---   let f = text->substitute(',', '', 'g')->str2float()
+---
+--- @param string string
+--- @param quoted? any
+--- @return any
+function vim.fn.str2float(string, quoted) end
+
+--- Return a list containing the number values which represent
+--- each character in String {string}.  Examples: >
+---   str2list(" ")    returns [32]
+---   str2list("ABC")    returns [65, 66, 67]
+--- <|list2str()| does the opposite.
+---
+--- UTF-8 encoding is always used, {utf8} option has no effect,
+--- and exists only for backwards-compatibility.
+--- With UTF-8 composing characters are handled properly: >
+---   str2list("á")    returns [97, 769]
+---
+--- <Can also be used as a |method|: >
+---   GetString()->str2list()
+---
+--- @param string string
+--- @param utf8? any
+--- @return any
+function vim.fn.str2list(string, utf8) end
+
+--- Convert string {string} to a number.
+--- {base} is the conversion base, it can be 2, 8, 10 or 16.
+--- When {quoted} is present and non-zero then embedded single
+--- quotes are ignored, thus "1'000'000" is a million.
+---
+--- When {base} is omitted base 10 is used.  This also means that
+--- a leading zero doesn't cause octal conversion to be used, as
+--- with the default String to Number conversion.  Example: >
+---   let nr = str2nr('0123')
+--- <
+--- When {base} is 16 a leading "0x" or "0X" is ignored.  With a
+--- different base the result will be zero. Similarly, when
+--- {base} is 8 a leading "0", "0o" or "0O" is ignored, and when
+--- {base} is 2 a leading "0b" or "0B" is ignored.
+--- Text after the number is silently ignored.
+---
+--- Returns 0 if {string} is empty or on error.
+---
+--- Can also be used as a |method|: >
+---   GetText()->str2nr()
+---
+---
+--- @param string string
+--- @param base? any
+--- @return any
+function vim.fn.str2nr(string, base) end
+
+--- The result is a Number, which is the number of characters
+--- in String {string}.  Composing characters are ignored.
+--- |strchars()| can count the number of characters, counting
+--- composing characters separately.
+---
+--- Returns 0 if {string} is empty or on error.
+---
+--- Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
+---
+--- Can also be used as a |method|: >
+---   GetText()->strcharlen()
+---
+---
+--- @param string string
+--- @return any
+function vim.fn.strcharlen(string) end
+
+--- Like |strpart()| but using character index and length instead
+--- of byte index and length.
+--- When {skipcc} is omitted or zero, composing characters are
+--- counted separately.
+--- When {skipcc} set to 1, Composing characters are ignored,
+--- similar to  |slice()|.
+--- When a character index is used where a character does not
+--- exist it is omitted and counted as one character.  For
+--- example: >
+---   strcharpart('abc', -1, 2)
+--- <results in 'a'.
+---
+--- Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   GetText()->strcharpart(5)
+---
+---
+--- @param src any
+--- @param start any
+--- @param len? any
+--- @param skipcc? any
+--- @return any
+function vim.fn.strcharpart(src, start, len, skipcc) end
+
+--- The result is a Number, which is the number of characters
+--- in String {string}.
+--- When {skipcc} is omitted or zero, composing characters are
+--- counted separately.
+--- When {skipcc} set to 1, Composing characters are ignored.
+--- |strcharlen()| always does this.
+---
+--- Returns zero on error.
+---
+--- Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
+---
+--- {skipcc} is only available after 7.4.755.  For backward
+--- compatibility, you can define a wrapper function: >
+---     if has("patch-7.4.755")
+---       function s:strchars(str, skipcc)
+---   return strchars(a:str, a:skipcc)
+---       endfunction
+---     else
+---       function s:strchars(str, skipcc)
+---   if a:skipcc
+---     return strlen(substitute(a:str, ".", "x", "g"))
+---   else
+---     return strchars(a:str)
+---   endif
+---       endfunction
+---     endif
+--- <
+--- Can also be used as a |method|: >
+---   GetText()->strchars()
+---
+--- @param string string
+--- @param skipcc? any
+--- @return any
+function vim.fn.strchars(string, skipcc) end
+
+--- The result is a Number, which is the number of display cells
+--- String {string} occupies on the screen when it starts at {col}
+--- (first column is zero).  When {col} is omitted zero is used.
+--- Otherwise it is the screen column where to start.  This
+--- matters for Tab characters.
+--- The option settings of the current window are used.  This
+--- matters for anything that's displayed differently, such as
+--- 'tabstop' and 'display'.
+--- When {string} contains characters with East Asian Width Class
+--- Ambiguous, this function's return value depends on 'ambiwidth'.
+--- Returns zero on error.
+--- Also see |strlen()|, |strwidth()| and |strchars()|.
+---
+--- Can also be used as a |method|: >
+---   GetText()->strdisplaywidth()
+---
+--- @param string string
+--- @param col? integer
+--- @return any
+function vim.fn.strdisplaywidth(string, col) end
+
+--- The result is a String, which is a formatted date and time, as
+--- specified by the {format} string.  The given {time} is used,
+--- or the current time if no time is given.  The accepted
+--- {format} depends on your system, thus this is not portable!
+--- See the manual page of the C function strftime() for the
+--- format.  The maximum length of the result is 80 characters.
+--- See also |localtime()|, |getftime()| and |strptime()|.
+--- The language can be changed with the |:language| command.
+--- Examples: >
+---   :echo strftime("%c")       Sun Apr 27 11:49:23 1997
+---   :echo strftime("%Y %b %d %X")     1997 Apr 27 11:53:25
+---   :echo strftime("%y%m%d %T")     970427 11:53:55
+---   :echo strftime("%H:%M")     11:55
+---   :echo strftime("%c", getftime("file.c"))
+---            Show mod time of file.c.
+---
+--- <Can also be used as a |method|: >
+---   GetFormat()->strftime()
+---
+--- @param format any
+--- @param time? any
+--- @return any
+function vim.fn.strftime(format, time) end
+
+--- Get a Number corresponding to the character at {index} in
+--- {str}.  This uses a zero-based character index, not a byte
+--- index.  Composing characters are considered separate
+--- characters here.  Use |nr2char()| to convert the Number to a
+--- String.
+--- Returns -1 if {index} is invalid.
+--- Also see |strcharpart()| and |strchars()|.
+---
+--- Can also be used as a |method|: >
+---   GetText()->strgetchar(5)
+---
+--- @param str any
+--- @param index any
+--- @return any
+function vim.fn.strgetchar(str, index) end
+
+--- The result is a Number, which gives the byte index in
+--- {haystack} of the first occurrence of the String {needle}.
+--- If {start} is specified, the search starts at index {start}.
+--- This can be used to find a second match: >
+---   :let colon1 = stridx(line, ":")
+---   :let colon2 = stridx(line, ":", colon1 + 1)
+--- <The search is done case-sensitive.
+--- For pattern searches use |match()|.
+--- -1 is returned if the {needle} does not occur in {haystack}.
+--- See also |strridx()|.
+--- Examples: >
+---   :echo stridx("An Example", "Example")       3
+---   :echo stridx("Starting point", "Start")    0
+---   :echo stridx("Starting point", "start")   -1
+--- <        *strstr()* *strchr()*
+--- stridx() works similar to the C function strstr().  When used
+--- with a single character it works similar to strchr().
+---
+--- Can also be used as a |method|: >
+---   GetHaystack()->stridx(needle)
+--- <
+---           *string()*
+--- @param haystack any
+--- @param needle any
+--- @param start? any
+--- @return any
+function vim.fn.stridx(haystack, needle, start) end
+
+--- Float, String, Blob or a composition of them, then the result
+--- can be parsed back with |eval()|.
+---   {expr} type  result ~
+---   String    'string'
+---   Number    123
+---   Float    123.123456 or 1.123456e8 or
+---       `str2float('inf')`
+---   Funcref    `function('name')`
+---   Blob    0z00112233.44556677.8899
+---   List    [item, item]
+---   Dictionary  `{key: value, key: value}`
+--- Note that in String values the ' character is doubled.
+--- Also see |strtrans()|.
+--- Note 2: Output format is mostly compatible with YAML, except
+--- for infinite and NaN floating-point values representations
+--- which use |str2float()|.  Strings are also dumped literally,
+--- only single quote is escaped, which does not allow using YAML
+--- for parsing back binary strings.  |eval()| should always work for
+--- strings and floats though and this is the only official
+--- method, use |msgpackdump()| or |json_encode()| if you need to
+--- share data with other application.
+---
+--- Can also be used as a |method|: >
+---   mylist->string()
+---
+--- @param expr any
+--- @return any
+function vim.fn.string(expr) end
+
+--- The result is a Number, which is the length of the String
+--- {string} in bytes.
+--- If the argument is a Number it is first converted to a String.
+--- For other types an error is given and zero is returned.
+--- If you want to count the number of multibyte characters use
+--- |strchars()|.
+--- Also see |len()|, |strdisplaywidth()| and |strwidth()|.
+---
+--- Can also be used as a |method|: >
+---   GetString()->strlen()
+---
+--- @param string string
+--- @return any
+function vim.fn.strlen(string) end
+
+--- The result is a String, which is part of {src}, starting from
+--- byte {start}, with the byte length {len}.
+--- When {chars} is present and TRUE then {len} is the number of
+--- characters positions (composing characters are not counted
+--- separately, thus "1" means one base character and any
+--- following composing characters).
+--- To count {start} as characters instead of bytes use
+--- |strcharpart()|.
+---
+--- When bytes are selected which do not exist, this doesn't
+--- result in an error, the bytes are simply omitted.
+--- If {len} is missing, the copy continues from {start} till the
+--- end of the {src}. >
+---   strpart("abcdefg", 3, 2)    == "de"
+---   strpart("abcdefg", -2, 4)   == "ab"
+---   strpart("abcdefg", 5, 4)    == "fg"
+---   strpart("abcdefg", 3)      == "defg"
+---
+--- <Note: To get the first character, {start} must be 0.  For
+--- example, to get the character under the cursor: >
+---   strpart(getline("."), col(".") - 1, 1, v:true)
+--- <
+--- Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   GetText()->strpart(5)
+---
+--- @param src any
+--- @param start any
+--- @param len? any
+--- @param chars? any
+--- @return any
+function vim.fn.strpart(src, start, len, chars) end
+
+--- The result is a Number, which is a unix timestamp representing
+--- the date and time in {timestring}, which is expected to match
+--- the format specified in {format}.
+---
+--- The accepted {format} depends on your system, thus this is not
+--- portable!  See the manual page of the C function strptime()
+--- for the format.  Especially avoid "%c".  The value of $TZ also
+--- matters.
+---
+--- If the {timestring} cannot be parsed with {format} zero is
+--- returned.  If you do not know the format of {timestring} you
+--- can try different {format} values until you get a non-zero
+--- result.
+---
+--- See also |strftime()|.
+--- Examples: >
+---   :echo strptime("%Y %b %d %X", "1997 Apr 27 11:49:23")
+--- <  862156163 >
+---   :echo strftime("%c", strptime("%y%m%d %T", "970427 11:53:55"))
+--- <  Sun Apr 27 11:53:55 1997 >
+---   :echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
+--- <  Sun Apr 27 12:53:55 1997
+---
+--- Can also be used as a |method|: >
+---   GetFormat()->strptime(timestring)
+--- <
+--- @param format any
+--- @param timestring any
+--- @return any
+function vim.fn.strptime(format, timestring) end
+
+--- The result is a Number, which gives the byte index in
+--- {haystack} of the last occurrence of the String {needle}.
+--- When {start} is specified, matches beyond this index are
+--- ignored.  This can be used to find a match before a previous
+--- match: >
+---   :let lastcomma = strridx(line, ",")
+---   :let comma2 = strridx(line, ",", lastcomma - 1)
+--- <The search is done case-sensitive.
+--- For pattern searches use |match()|.
+--- -1 is returned if the {needle} does not occur in {haystack}.
+--- If the {needle} is empty the length of {haystack} is returned.
+--- See also |stridx()|.  Examples: >
+---   :echo strridx("an angry armadillo", "an")       3
+--- <          *strrchr()*
+--- When used with a single character it works similar to the C
+--- function strrchr().
+---
+--- Can also be used as a |method|: >
+---   GetHaystack()->strridx(needle)
+---
+--- @param haystack any
+--- @param needle any
+--- @param start? any
+--- @return any
+function vim.fn.strridx(haystack, needle, start) end
+
+--- The result is a String, which is {string} with all unprintable
+--- characters translated into printable characters |'isprint'|.
+--- Like they are shown in a window.  Example: >
+---   echo strtrans(\@a)
+--- <This displays a newline in register a as "^\@" instead of
+--- starting a new line.
+---
+--- Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   GetString()->strtrans()
+---
+--- @param string string
+--- @return any
+function vim.fn.strtrans(string) end
+
+--- The result is a Number, which is the number of UTF-16 code
+--- units in String {string} (after converting it to UTF-16).
+---
+--- When {countcc} is TRUE, composing characters are counted
+--- separately.
+--- When {countcc} is omitted or FALSE, composing characters are
+--- ignored.
+---
+--- Returns zero on error.
+---
+--- Also see |strlen()| and |strcharlen()|.
+--- Examples: >
+---     echo strutf16len('a')    returns 1
+---     echo strutf16len('©')    returns 1
+---     echo strutf16len('😊')    returns 2
+---     echo strutf16len('ą́')    returns 1
+---     echo strutf16len('ą́', v:true)  returns 3
+---
+--- Can also be used as a |method|: >
+---   GetText()->strutf16len()
+--- <
+--- @param string string
+--- @param countcc? any
+--- @return any
+function vim.fn.strutf16len(string, countcc) end
+
+--- The result is a Number, which is the number of display cells
+--- String {string} occupies.  A Tab character is counted as one
+--- cell, alternatively use |strdisplaywidth()|.
+--- When {string} contains characters with East Asian Width Class
+--- Ambiguous, this function's return value depends on 'ambiwidth'.
+--- Returns zero on error.
+--- Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
+---
+--- Can also be used as a |method|: >
+---   GetString()->strwidth()
+---
+--- @param string string
+--- @return any
+function vim.fn.strwidth(string) end
+
+--- Only for an expression in a |:substitute| command or
+--- substitute() function.
+--- Returns the {nr}th submatch of the matched text.  When {nr}
+--- is 0 the whole matched text is returned.
+--- Note that a NL in the string can stand for a line break of a
+--- multi-line match or a NUL character in the text.
+--- Also see |sub-replace-expression|.
+---
+--- If {list} is present and non-zero then submatch() returns
+--- a list of strings, similar to |getline()| with two arguments.
+--- NL characters in the text represent NUL characters in the
+--- text.
+--- Only returns more than one item for |:substitute|, inside
+--- |substitute()| this list will always contain one or zero
+--- items, since there are no real line breaks.
+---
+--- When substitute() is used recursively only the submatches in
+--- the current (deepest) call can be obtained.
+---
+--- Returns an empty string or list on error.
+---
+--- Examples: >
+---   :s/\d\+/\=submatch(0) + 1/
+---   :echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
+--- <This finds the first number in the line and adds one to it.
+--- A line break is included as a newline character.
+---
+--- Can also be used as a |method|: >
+---   GetNr()->submatch()
+---
+--- @param nr integer
+--- @param list? any
+--- @return any
+function vim.fn.submatch(nr, list) end
+
+--- The result is a String, which is a copy of {string}, in which
+--- the first match of {pat} is replaced with {sub}.
+--- When {flags} is "g", all matches of {pat} in {string} are
+--- replaced.  Otherwise {flags} should be "".
+---
+--- This works like the ":substitute" command (without any flags).
+--- But the matching with {pat} is always done like the 'magic'
+--- option is set and 'cpoptions' is empty (to make scripts
+--- portable).  'ignorecase' is still relevant, use |/\c| or |/\C|
+--- if you want to ignore or match case and ignore 'ignorecase'.
+--- 'smartcase' is not used.  See |string-match| for how {pat} is
+--- used.
+---
+--- A "~" in {sub} is not replaced with the previous {sub}.
+--- Note that some codes in {sub} have a special meaning
+--- |sub-replace-special|.  For example, to replace something with
+--- "\n" (two characters), use "\\\\n" or '\\n'.
+---
+--- When {pat} does not match in {string}, {string} is returned
+--- unmodified.
+---
+--- Example: >
+---   :let &path = substitute(&path, ",\\=[^,]*$", "", "")
+--- <This removes the last component of the 'path' option. >
+---   :echo substitute("testing", ".*", "\\U\\0", "")
+--- <results in "TESTING".
+---
+--- When {sub} starts with "\=", the remainder is interpreted as
+--- an expression. See |sub-replace-expression|.  Example: >
+---   :echo substitute(s, '%\(\x\x\)',
+---      \ '\=nr2char("0x" .. submatch(1))', 'g')
+---
+--- <When {sub} is a Funcref that function is called, with one
+--- optional argument.  Example: >
+---    :echo substitute(s, '%\(\x\x\)', SubNr, 'g')
+--- <The optional argument is a list which contains the whole
+--- matched string and up to nine submatches, like what
+--- |submatch()| returns.  Example: >
+---    :echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
+---
+--- <Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   GetString()->substitute(pat, sub, flags)
+---
+--- @param string string
+--- @param pat any
+--- @param sub any
+--- @param flags string
+--- @return any
+function vim.fn.substitute(string, pat, sub, flags) end
+
+--- Returns a list of swap file names, like what "vim -r" shows.
+--- See the |-r| command argument.  The 'directory' option is used
+--- for the directories to inspect.  If you only want to get a
+--- list of swap files in the current directory then temporarily
+--- set 'directory' to a dot: >
+---   let save_dir = &directory
+---   let &directory = '.'
+---   let swapfiles = swapfilelist()
+---   let &directory = save_dir
+---
+--- @return any
+function vim.fn.swapfilelist() end
+
+--- The result is a dictionary, which holds information about the
+--- swapfile {fname}. The available fields are:
+---   version Vim version
+---   user  user name
+---   host  host name
+---   fname  original file name
+---   pid  PID of the Vim process that created the swap
+---     file
+---   mtime  last modification time in seconds
+---   inode  Optional: INODE number of the file
+---   dirty  1 if file was modified, 0 if not
+--- In case of failure an "error" item is added with the reason:
+---   Cannot open file: file not found or in accessible
+---   Cannot read file: cannot read first block
+---   Not a swap file: does not contain correct block ID
+---   Magic number mismatch: Info in first block is invalid
+---
+--- Can also be used as a |method|: >
+---   GetFilename()->swapinfo()
+---
+--- @param fname integer
+--- @return any
+function vim.fn.swapinfo(fname) end
+
+--- The result is the swap file path of the buffer {buf}.
+--- For the use of {buf}, see |bufname()| above.
+--- If buffer {buf} is the current buffer, the result is equal to
+--- |:swapname| (unless there is no swap file).
+--- If buffer {buf} has no swap file, returns an empty string.
+---
+--- Can also be used as a |method|: >
+---   GetBufname()->swapname()
+---
+--- @param buf any
+--- @return any
+function vim.fn.swapname(buf) end
+
+--- The result is a Number, which is the syntax ID at the position
+--- {lnum} and {col} in the current window.
+--- The syntax ID can be used with |synIDattr()| and
+--- |synIDtrans()| to obtain syntax information about text.
+---
+--- {col} is 1 for the leftmost column, {lnum} is 1 for the first
+--- line.  'synmaxcol' applies, in a longer line zero is returned.
+--- Note that when the position is after the last character,
+--- that's where the cursor can be in Insert mode, synID() returns
+--- zero.  {lnum} is used like with |getline()|.
+---
+--- When {trans} is |TRUE|, transparent items are reduced to the
+--- item that they reveal.  This is useful when wanting to know
+--- the effective color.  When {trans} is |FALSE|, the transparent
+--- item is returned.  This is useful when wanting to know which
+--- syntax item is effective (e.g. inside parens).
+--- Warning: This function can be very slow.  Best speed is
+--- obtained by going through the file in forward direction.
+---
+--- Returns zero on error.
+---
+--- Example (echoes the name of the syntax item under the cursor): >
+---   :echo synIDattr(synID(line("."), col("."), 1), "name")
+--- <
+---
+--- @param lnum integer
+--- @param col integer
+--- @param trans any
+--- @return any
+function vim.fn.synID(lnum, col, trans) end
+
+--- The result is a String, which is the {what} attribute of
+--- syntax ID {synID}.  This can be used to obtain information
+--- about a syntax item.
+--- {mode} can be "gui" or "cterm", to get the attributes
+--- for that mode.  When {mode} is omitted, or an invalid value is
+--- used, the attributes for the currently active highlighting are
+--- used (GUI or cterm).
+--- Use synIDtrans() to follow linked highlight groups.
+--- {what}    result
+--- "name"    the name of the syntax item
+--- "fg"    foreground color (GUI: color name used to set
+---     the color, cterm: color number as a string,
+---     term: empty string)
+--- "bg"    background color (as with "fg")
+--- "font"    font name (only available in the GUI)
+---     |highlight-font|
+--- "sp"    special color (as with "fg") |guisp|
+--- "fg#"    like "fg", but for the GUI and the GUI is
+---     running the name in "#RRGGBB" form
+--- "bg#"    like "fg#" for "bg"
+--- "sp#"    like "fg#" for "sp"
+--- "bold"    "1" if bold
+--- "italic"  "1" if italic
+--- "reverse"  "1" if reverse
+--- "inverse"  "1" if inverse (= reverse)
+--- "standout"  "1" if standout
+--- "underline"  "1" if underlined
+--- "undercurl"  "1" if undercurled
+--- "underdouble"  "1" if double underlined
+--- "underdotted"  "1" if dotted underlined
+--- "underdashed"  "1" if dashed underlined
+--- "strikethrough"  "1" if struckthrough
+--- "altfont"  "1" if alternative font
+--- "nocombine"  "1" if nocombine
+---
+--- Returns an empty string on error.
+---
+--- Example (echoes the color of the syntax item under the
+--- cursor): >
+---   :echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
+--- <
+--- Can also be used as a |method|: >
+---   :echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
+---
+--- @param synID any
+--- @param what any
+--- @param mode? string
+--- @return any
+function vim.fn.synIDattr(synID, what, mode) end
+
+--- The result is a Number, which is the translated syntax ID of
+--- {synID}.  This is the syntax group ID of what is being used to
+--- highlight the character.  Highlight links given with
+--- ":highlight link" are followed.
+---
+--- Returns zero on error.
+---
+--- Can also be used as a |method|: >
+---   :echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
+---
+--- @param synID any
+--- @return any
+function vim.fn.synIDtrans(synID) end
+
+--- The result is a |List| with currently three items:
+--- 1. The first item in the list is 0 if the character at the
+---    position {lnum} and {col} is not part of a concealable
+---    region, 1 if it is.  {lnum} is used like with |getline()|.
+--- 2. The second item in the list is a string. If the first item
+---    is 1, the second item contains the text which will be
+---    displayed in place of the concealed text, depending on the
+---    current setting of 'conceallevel' and 'listchars'.
+--- 3. The third and final item in the list is a number
+---    representing the specific syntax region matched in the
+---    line. When the character is not concealed the value is
+---    zero. This allows detection of the beginning of a new
+---    concealable region if there are two consecutive regions
+---    with the same replacement character.  For an example, if
+---    the text is "123456" and both "23" and "45" are concealed
+---    and replaced by the character "X", then:
+---   call      returns ~
+---   synconcealed(lnum, 1)   [0, '', 0]
+---   synconcealed(lnum, 2)   [1, 'X', 1]
+---   synconcealed(lnum, 3)   [1, 'X', 1]
+---   synconcealed(lnum, 4)   [1, 'X', 2]
+---   synconcealed(lnum, 5)   [1, 'X', 2]
+---   synconcealed(lnum, 6)   [0, '', 0]
+---
+---
+--- @param lnum integer
+--- @param col integer
+--- @return any
+function vim.fn.synconcealed(lnum, col) end
+
+--- Return a |List|, which is the stack of syntax items at the
+--- position {lnum} and {col} in the current window.  {lnum} is
+--- used like with |getline()|.  Each item in the List is an ID
+--- like what |synID()| returns.
+--- The first item in the List is the outer region, following are
+--- items contained in that one.  The last one is what |synID()|
+--- returns, unless not the whole item is highlighted or it is a
+--- transparent item.
+--- This function is useful for debugging a syntax file.
+--- Example that shows the syntax stack under the cursor: >
+---   for id in synstack(line("."), col("."))
+---      echo synIDattr(id, "name")
+---   endfor
+--- <When the position specified with {lnum} and {col} is invalid
+--- an empty list is returned.  The position just after the last
+--- character in a line and the first column in an empty line are
+--- valid positions.
+---
+--- @param lnum integer
+--- @param col integer
+--- @return any
+function vim.fn.synstack(lnum, col) end
+
+--- Note: Prefer |vim.system()| in Lua.
+---
+--- Gets the output of {cmd} as a |string| (|systemlist()| returns
+--- a |List|) and sets |v:shell_error| to the error code.
+--- {cmd} is treated as in |jobstart()|:
+--- If {cmd} is a List it runs directly (no 'shell').
+--- If {cmd} is a String it runs in the 'shell', like this: >
+---   :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+---
+--- <Not to be used for interactive commands.
+---
+--- Result is a String, filtered to avoid platform-specific quirks:
+--- - <CR><NL> is replaced with <NL>
+--- - NUL characters are replaced with SOH (0x01)
+---
+--- Example: >
+---     :echo system(['ls', expand('%:h')])
+---
+--- <If {input} is a string it is written to a pipe and passed as
+--- stdin to the command.  The string is written as-is, line
+--- separators are not changed.
+--- If {input} is a |List| it is written to the pipe as
+--- |writefile()| does with {binary} set to "b" (i.e. with
+--- a newline between each list item, and newlines inside list
+--- items converted to NULs).
+--- When {input} is given and is a valid buffer id, the content of
+--- the buffer is written to the file line by line, each line
+--- terminated by NL (and NUL where the text has NL).
+---             *E5677*
+--- Note: system() cannot write to or read from backgrounded ("&")
+--- shell commands, e.g.: >
+---     :echo system("cat - &", "foo")
+--- <which is equivalent to: >
+---     $ echo foo | bash -c 'cat - &'
+--- <The pipes are disconnected (unless overridden by shell
+--- redirection syntax) before input can reach it. Use
+--- |jobstart()| instead.
+---
+--- Note: Use |shellescape()| or |::S| with |expand()| or
+--- |fnamemodify()| to escape special characters in a command
+--- argument. 'shellquote' and 'shellxquote' must be properly
+--- configured. Example: >
+---     :echo system('ls '..shellescape(expand('%:h')))
+---     :echo system('ls '..expand('%:h:S'))
+---
+--- <Unlike ":!cmd" there is no automatic check for changed files.
+--- Use |:checktime| to force a check.
+---
+--- Can also be used as a |method|: >
+---   :echo GetCmd()->system()
+---
+--- @param cmd any
+--- @param input? any
+--- @return any
+function vim.fn.system(cmd, input) end
+
+--- Same as |system()|, but returns a |List| with lines (parts of
+--- output separated by NL) with NULs transformed into NLs. Output
+--- is the same as |readfile()| will output with {binary} argument
+--- set to "b", except that a final newline is not preserved,
+--- unless {keepempty} is non-zero.
+--- Note that on MS-Windows you may get trailing CR characters.
+---
+--- To see the difference between "echo hello" and "echo -n hello"
+--- use |system()| and |split()|: >
+---   echo split(system('echo hello'), '\n', 1)
+--- <
+--- Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   :echo GetCmd()->systemlist()
+---
+--- @param cmd any
+--- @param input? any
+--- @param keepempty? any
+--- @return any
+function vim.fn.systemlist(cmd, input, keepempty) end
+
+--- The result is a |List|, where each item is the number of the
+--- buffer associated with each window in the current tab page.
+--- {arg} specifies the number of the tab page to be used. When
+--- omitted the current tab page is used.
+--- When {arg} is invalid the number zero is returned.
+--- To get a list of all buffers in all tabs use this: >
+---   let buflist = []
+---   for i in range(tabpagenr('$'))
+---      call extend(buflist, tabpagebuflist(i + 1))
+---   endfor
+--- <Note that a buffer may appear in more than one window.
+---
+--- Can also be used as a |method|: >
+---   GetTabpage()->tabpagebuflist()
+---
+--- @param arg? any
+--- @return any
+function vim.fn.tabpagebuflist(arg) end
+
+--- The result is a Number, which is the number of the current
+--- tab page.  The first tab page has number 1.
+---
+--- The optional argument {arg} supports the following values:
+---   $  the number of the last tab page (the tab page
+---     count).
+---   #  the number of the last accessed tab page
+---     (where |g<Tab>| goes to).  If there is no
+---     previous tab page, 0 is returned.
+--- The number can be used with the |:tab| command.
+---
+--- Returns zero on error.
+---
+--- @param arg? any
+--- @return any
+function vim.fn.tabpagenr(arg) end
+
+--- Like |winnr()| but for tab page {tabarg}.
+--- {tabarg} specifies the number of tab page to be used.
+--- {arg} is used like with |winnr()|:
+--- - When omitted the current window number is returned.  This is
+---   the window which will be used when going to this tab page.
+--- - When "$" the number of windows is returned.
+--- - When "#" the previous window nr is returned.
+--- Useful examples: >
+---     tabpagewinnr(1)      " current window of tab page 1
+---     tabpagewinnr(4, '$')    " number of windows in tab page 4
+--- <When {tabarg} is invalid zero is returned.
+---
+--- Can also be used as a |method|: >
+---   GetTabpage()->tabpagewinnr()
+--- <
+---           *tagfiles()*
+--- @param tabarg any
+--- @param arg? any
+--- @return any
+function vim.fn.tabpagewinnr(tabarg, arg) end
+
+--- for the current buffer.  This is the 'tags' option expanded.
+---
+---
+--- @return any
+function vim.fn.tagfiles() end
+
+--- Returns a |List| of tags matching the regular expression {expr}.
+---
+--- If {filename} is passed it is used to prioritize the results
+--- in the same way that |:tselect| does. See |tag-priority|.
+--- {filename} should be the full path of the file.
+---
+--- Each list item is a dictionary with at least the following
+--- entries:
+---   name    Name of the tag.
+---   filename  Name of the file where the tag is
+---       defined.  It is either relative to the
+---       current directory or a full path.
+---   cmd    Ex command used to locate the tag in
+---       the file.
+---   kind    Type of the tag.  The value for this
+---       entry depends on the language specific
+---       kind values.  Only available when
+---       using a tags file generated by
+---       Universal/Exuberant ctags or hdrtag.
+---   static    A file specific tag.  Refer to
+---       |static-tag| for more information.
+--- More entries may be present, depending on the content of the
+--- tags file: access, implementation, inherits and signature.
+--- Refer to the ctags documentation for information about these
+--- fields.  For C code the fields "struct", "class" and "enum"
+--- may appear, they give the name of the entity the tag is
+--- contained in.
+---
+--- The ex-command "cmd" can be either an ex search pattern, a
+--- line number or a line number followed by a byte number.
+---
+--- If there are no matching tags, then an empty list is returned.
+---
+--- To get an exact tag match, the anchors '^' and '$' should be
+--- used in {expr}.  This also make the function work faster.
+--- Refer to |tag-regexp| for more information about the tag
+--- search regular expression pattern.
+---
+--- Refer to |'tags'| for information about how the tags file is
+--- located by Vim. Refer to |tags-file-format| for the format of
+--- the tags file generated by the different ctags tools.
+---
+--- Can also be used as a |method|: >
+---   GetTagpattern()->taglist()
+---
+--- @param expr any
+--- @param filename? any
+--- @return any
+function vim.fn.taglist(expr, filename) end
+
+--- Return the tangent of {expr}, measured in radians, as a |Float|
+--- in the range [-inf, inf].
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo tan(10)
+--- <  0.648361 >
+---   :echo tan(-4.01)
+--- <  -1.181502
+---
+--- Can also be used as a |method|: >
+---   Compute()->tan()
+---
+--- @param expr any
+--- @return any
+function vim.fn.tan(expr) end
+
+--- Return the hyperbolic tangent of {expr} as a |Float| in the
+--- range [-1, 1].
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   :echo tanh(0.5)
+--- <  0.462117 >
+---   :echo tanh(-1)
+--- <  -0.761594
+---
+--- Can also be used as a |method|: >
+---   Compute()->tanh()
+--- <
+---           *timer_info()*
+--- @param expr any
+--- @return any
+function vim.fn.tanh(expr) end
+
+--- Generates a (non-existent) filename located in the Nvim root
+--- |tempdir|. Scripts can use the filename as a temporary file.
+--- Example: >
+---   :let tmpfile = tempname()
+---   :exe "redir > " .. tmpfile
+---
+--- @return string
+function vim.fn.tempname() end
+
+--- Spawns {cmd} in a new pseudo-terminal session connected
+--- to the current (unmodified) buffer. Parameters and behavior
+--- are the same as |jobstart()| except "pty", "width", "height",
+--- and "TERM" are ignored: "height" and "width" are taken from
+--- the current window. Note that termopen() implies a "pty" arg
+--- to jobstart(), and thus has the implications documented at
+--- |jobstart()|.
+---
+--- Returns the same values as jobstart().
+---
+--- Terminal environment is initialized as in |jobstart-env|,
+--- except $TERM is set to "xterm-256color". Full behavior is
+--- described in |terminal|.
+---
+--- @param cmd any
+--- @param opts? table
+--- @return any
+function vim.fn.termopen(cmd, opts) end
+
+--- Return a list with information about timers.
+--- When {id} is given only information about this timer is
+--- returned.  When timer {id} does not exist an empty list is
+--- returned.
+--- When {id} is omitted information about all timers is returned.
+---
+--- For each timer the information is stored in a |Dictionary| with
+--- these items:
+---     "id"      the timer ID
+---     "time"      time the timer was started with
+---     "repeat"      number of times the timer will still fire;
+---         -1 means forever
+---     "callback"      the callback
+---
+--- Can also be used as a |method|: >
+---   GetTimer()->timer_info()
+--- <
+--- @param id? any
+--- @return any
+function vim.fn.timer_info(id) end
+
+--- Pause or unpause a timer.  A paused timer does not invoke its
+--- callback when its time expires.  Unpausing a timer may cause
+--- the callback to be invoked almost immediately if enough time
+--- has passed.
+---
+--- Pausing a timer is useful to avoid the callback to be called
+--- for a short time.
+---
+--- If {paused} evaluates to a non-zero Number or a non-empty
+--- String, then the timer is paused, otherwise it is unpaused.
+--- See |non-zero-arg|.
+---
+--- Can also be used as a |method|: >
+---   GetTimer()->timer_pause(1)
+--- <
+---         *timer_start()* *timer* *timers*
+--- @param timer any
+--- @param paused any
+--- @return any
+function vim.fn.timer_pause(timer, paused) end
+
+--- Create a timer and return the timer ID.
+---
+--- {time} is the waiting time in milliseconds. This is the
+--- minimum time before invoking the callback.  When the system is
+--- busy or Vim is not waiting for input the time will be longer.
+--- Zero can be used to execute the callback when Vim is back in
+--- the main loop.
+---
+--- {callback} is the function to call.  It can be the name of a
+--- function or a |Funcref|.  It is called with one argument, which
+--- is the timer ID.  The callback is only invoked when Vim is
+--- waiting for input.
+---
+--- {options} is a dictionary.  Supported entries:
+---    "repeat"  Number of times to repeat the callback.
+---     -1 means forever.  Default is 1.
+---     If the timer causes an error three times in a
+---     row the repeat is cancelled.
+---
+--- Returns -1 on error.
+---
+--- Example: >
+---   func MyHandler(timer)
+---     echo 'Handler called'
+---   endfunc
+---   let timer = timer_start(500, 'MyHandler',
+---     \ {'repeat': 3})
+--- <This invokes MyHandler() three times at 500 msec intervals.
+---
+--- Can also be used as a |method|: >
+---   GetMsec()->timer_start(callback)
+---
+--- <Not available in the |sandbox|.
+---
+--- @param time any
+--- @param callback any
+--- @param options? table
+--- @return any
+function vim.fn.timer_start(time, callback, options) end
+
+--- Stop a timer.  The timer callback will no longer be invoked.
+--- {timer} is an ID returned by timer_start(), thus it must be a
+--- Number.  If {timer} does not exist there is no error.
+---
+--- Can also be used as a |method|: >
+---   GetTimer()->timer_stop()
+--- <
+--- @param timer any
+--- @return any
+function vim.fn.timer_stop(timer) end
+
+--- Stop all timers.  The timer callbacks will no longer be
+--- invoked.  Useful if some timers is misbehaving.  If there are
+--- no timers there is no error.
+---
+--- @return any
+function vim.fn.timer_stopall() end
+
+--- The result is a copy of the String given, with all uppercase
+--- characters turned into lowercase (just like applying |gu| to
+--- the string).  Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   GetText()->tolower()
+---
+--- @param expr any
+--- @return string
+function vim.fn.tolower(expr) end
+
+--- The result is a copy of the String given, with all lowercase
+--- characters turned into uppercase (just like applying |gU| to
+--- the string).  Returns an empty string on error.
+---
+--- Can also be used as a |method|: >
+---   GetText()->toupper()
+---
+--- @param expr any
+--- @return string
+function vim.fn.toupper(expr) end
+
+--- The result is a copy of the {src} string with all characters
+--- which appear in {fromstr} replaced by the character in that
+--- position in the {tostr} string.  Thus the first character in
+--- {fromstr} is translated into the first character in {tostr}
+--- and so on.  Exactly like the unix "tr" command.
+--- This code also deals with multibyte characters properly.
+---
+--- Returns an empty string on error.
+---
+--- Examples: >
+---   echo tr("hello there", "ht", "HT")
+--- <returns "Hello THere" >
+---   echo tr("<blob>", "<>", "{}")
+--- <returns "{blob}"
+---
+--- Can also be used as a |method|: >
+---   GetText()->tr(from, to)
+---
+--- @param src any
+--- @param fromstr any
+--- @param tostr any
+--- @return any
+function vim.fn.tr(src, fromstr, tostr) end
+
+--- Return {text} as a String where any character in {mask} is
+--- removed from the beginning and/or end of {text}.
+--- If {mask} is not given, {mask} is all characters up to 0x20,
+--- which includes Tab, space, NL and CR, plus the non-breaking
+--- space character 0xa0.
+--- The optional {dir} argument specifies where to remove the
+--- characters:
+---   0  remove from the beginning and end of {text}
+---   1  remove only at the beginning of {text}
+---   2  remove only at the end of {text}
+--- When omitted both ends are trimmed.
+--- This function deals with multibyte characters properly.
+--- Returns an empty string on error.
+---
+--- Examples: >
+---   echo trim("   some text ")
+--- <returns "some text" >
+---   echo trim("  \r\t\t\r RESERVE \t\n\x0B\xA0") .. "_TAIL"
+--- <returns "RESERVE_TAIL" >
+---   echo trim("rm<Xrm<>X>rrm", "rm<>")
+--- <returns "Xrm<>X" (characters in the middle are not removed) >
+---   echo trim("  vim  ", " ", 2)
+--- <returns "  vim"
+---
+--- Can also be used as a |method|: >
+---   GetText()->trim()
+---
+--- @param text any
+--- @param mask? any
+--- @param dir? string
+--- @return string
+function vim.fn.trim(text, mask, dir) end
+
+--- Return the largest integral value with magnitude less than or
+--- equal to {expr} as a |Float| (truncate towards zero).
+--- {expr} must evaluate to a |Float| or a |Number|.
+--- Returns 0.0 if {expr} is not a |Float| or a |Number|.
+--- Examples: >
+---   echo trunc(1.456)
+--- <  1.0  >
+---   echo trunc(-5.456)
+--- <  -5.0  >
+---   echo trunc(4.0)
+--- <  4.0
+---
+--- Can also be used as a |method|: >
+---   Compute()->trunc()
+---
+--- @param expr any
+--- @return any
+function vim.fn.trunc(expr) end
+
+--- The result is a Number representing the type of {expr}.
+--- Instead of using the number directly, it is better to use the
+--- v:t_ variable that has the value:
+---         Number:     0 (|v:t_number|)
+---   String:     1 (|v:t_string|)
+---   Funcref:    2 (|v:t_func|)
+---   List:       3 (|v:t_list|)
+---   Dictionary: 4 (|v:t_dict|)
+---   Float:      5 (|v:t_float|)
+---   Boolean:    6 (|v:true| and |v:false|)
+---   Null:       7 (|v:null|)
+---   Blob:      10 (|v:t_blob|)
+--- For backward compatibility, this method can be used: >
+---   :if type(myvar) == type(0)
+---   :if type(myvar) == type("")
+---   :if type(myvar) == type(function("tr"))
+---   :if type(myvar) == type([])
+---   :if type(myvar) == type({})
+---   :if type(myvar) == type(0.0)
+---   :if type(myvar) == type(v:true)
+--- <In place of checking for |v:null| type it is better to check
+--- for |v:null| directly as it is the only value of this type: >
+---   :if myvar is v:null
+--- <               To check if the v:t_ variables exist use this: >
+---                         :if exists('v:t_number')
+---
+--- <Can also be used as a |method|: >
+---   mylist->type()
+---
+--- @param expr any
+--- @return any
+function vim.fn.type(expr) end
+
+--- Return the name of the undo file that would be used for a file
+--- with name {name} when writing.  This uses the 'undodir'
+--- option, finding directories that exist.  It does not check if
+--- the undo file exists.
+--- {name} is always expanded to the full path, since that is what
+--- is used internally.
+--- If {name} is empty undofile() returns an empty string, since a
+--- buffer without a file name will not write an undo file.
+--- Useful in combination with |:wundo| and |:rundo|.
+---
+--- Can also be used as a |method|: >
+---   GetFilename()->undofile()
+---
+--- @param name string
+--- @return string
+function vim.fn.undofile(name) end
+
+--- Return the current state of the undo tree in a dictionary with
+--- the following items:
+---   "seq_last"  The highest undo sequence number used.
+---   "seq_cur"  The sequence number of the current position in
+---     the undo tree.  This differs from "seq_last"
+---     when some changes were undone.
+---   "time_cur"  Time last used for |:earlier| and related
+---     commands.  Use |strftime()| to convert to
+---     something readable.
+---   "save_last"  Number of the last file write.  Zero when no
+---     write yet.
+---   "save_cur"  Number of the current position in the undo
+---     tree.
+---   "synced"  Non-zero when the last undo block was synced.
+---     This happens when waiting from input from the
+---     user.  See |undo-blocks|.
+---   "entries"  A list of dictionaries with information about
+---     undo blocks.
+---
+--- The first item in the "entries" list is the oldest undo item.
+--- Each List item is a |Dictionary| with these items:
+---   "seq"    Undo sequence number.  Same as what appears in
+---     |:undolist|.
+---   "time"  Timestamp when the change happened.  Use
+---     |strftime()| to convert to something readable.
+---   "newhead"  Only appears in the item that is the last one
+---     that was added.  This marks the last change
+---     and where further changes will be added.
+---   "curhead"  Only appears in the item that is the last one
+---     that was undone.  This marks the current
+---     position in the undo tree, the block that will
+---     be used by a redo command.  When nothing was
+---     undone after the last change this item will
+---     not appear anywhere.
+---   "save"  Only appears on the last block before a file
+---     write.  The number is the write count.  The
+---     first write has number 1, the last one the
+---     "save_last" mentioned above.
+---   "alt"    Alternate entry.  This is again a List of undo
+---     blocks.  Each item may again have an "alt"
+---     item.
+---
+--- @return any
+function vim.fn.undotree() end
+
+--- Remove second and succeeding copies of repeated adjacent
+--- {list} items in-place.  Returns {list}.  If you want a list
+--- to remain unmodified make a copy first: >
+---   :let newlist = uniq(copy(mylist))
+--- <The default compare function uses the string representation of
+--- each item.  For the use of {func} and {dict} see |sort()|.
+---
+--- Returns zero if {list} is not a |List|.
+---
+--- Can also be used as a |method|: >
+---   mylist->uniq()
+--- <
+---           *utf16idx()*
+--- @param list any
+--- @param func? any
+--- @param dict? any
+--- @return any[]|0
+function vim.fn.uniq(list, func, dict) end
+
+--- Same as |charidx()| but returns the UTF-16 code unit index of
+--- the byte at {idx} in {string} (after converting it to UTF-16).
+---
+--- When {charidx} is present and TRUE, {idx} is used as the
+--- character index in the String {string} instead of as the byte
+--- index.
+--- An {idx} in the middle of a UTF-8 sequence is rounded
+--- downwards to the beginning of that sequence.
+---
+--- Returns -1 if the arguments are invalid or if there are less
+--- than {idx} bytes in {string}. If there are exactly {idx} bytes
+--- the length of the string in UTF-16 code units is returned.
+---
+--- See |byteidx()| and |byteidxcomp()| for getting the byte index
+--- from the UTF-16 index and |charidx()| for getting the
+--- character index from the UTF-16 index.
+--- Refer to |string-offset-encoding| for more information.
+--- Examples: >
+---   echo utf16idx('a😊😊', 3)  returns 2
+---   echo utf16idx('a😊😊', 7)  returns 4
+---   echo utf16idx('a😊😊', 1, 0, 1)  returns 2
+---   echo utf16idx('a😊😊', 2, 0, 1)  returns 4
+---   echo utf16idx('aą́c', 6)    returns 2
+---   echo utf16idx('aą́c', 6, 1)  returns 4
+---   echo utf16idx('a😊😊', 9)  returns -1
+--- <
+--- Can also be used as a |method|: >
+---   GetName()->utf16idx(idx)
+---
+---
+--- @param string string
+--- @param idx integer
+--- @param countcc? any
+--- @param charidx? any
+--- @return integer
+function vim.fn.utf16idx(string, idx, countcc, charidx) end
+
+--- Return a |List| with all the values of {dict}.  The |List| is
+--- in arbitrary order.  Also see |items()| and |keys()|.
+--- Returns zero if {dict} is not a |Dict|.
+---
+--- Can also be used as a |method|: >
+---   mydict->values()
+---
+--- @param dict any
+--- @return any
+function vim.fn.values(dict) end
+
+--- The result is a Number, which is the screen column of the file
+--- position given with {expr}.  That is, the last screen position
+--- occupied by the character at that position, when the screen
+--- would be of unlimited width.  When there is a <Tab> at the
+--- position, the returned Number will be the column at the end of
+--- the <Tab>.  For example, for a <Tab> in column 1, with 'ts'
+--- set to 8, it returns 8. |conceal| is ignored.
+--- For the byte position use |col()|.
+---
+--- For the use of {expr} see |col()|.
+---
+--- When 'virtualedit' is used {expr} can be [lnum, col, off],
+--- where "off" is the offset in screen columns from the start of
+--- the character.  E.g., a position within a <Tab> or after the
+--- last character.  When "off" is omitted zero is used.  When
+--- Virtual editing is active in the current mode, a position
+--- beyond the end of the line can be returned.  Also see
+--- |'virtualedit'|
+---
+--- The accepted positions are:
+---     .      the cursor position
+---     $      the end of the cursor line (the result is the
+---       number of displayed characters in the cursor line
+---       plus one)
+---     'x      position of mark x (if the mark is not set, 0 is
+---       returned)
+---     v       In Visual mode: the start of the Visual area (the
+---       cursor is the end).  When not in Visual mode
+---       returns the cursor position.  Differs from |'<| in
+---       that it's updated right away.
+---
+--- If {list} is present and non-zero then virtcol() returns a List
+--- with the first and last screen position occupied by the
+--- character.
+---
+--- Note that only marks in the current file can be used.
+--- Examples: >
+---   " With text "foo^Lbar" and cursor on the "^L":
+---
+---   virtcol(".")  " returns 5
+---   virtcol(".", 1)  " returns [4, 5]
+---   virtcol("$")  " returns 9
+---
+---   " With text "    there", with 't at 'h':
+---
+---   virtcol("'t")  " returns 6
+--- <The first column is 1.  0 is returned for an error.
+--- A more advanced example that echoes the maximum length of
+--- all lines: >
+---     echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
+---
+--- <Can also be used as a |method|: >
+---   GetPos()->virtcol()
+---
+--- @param expr any
+--- @param list? any
+--- @return any
+function vim.fn.virtcol(expr, list) end
+
+--- The result is a Number, which is the byte index of the
+--- character in window {winid} at buffer line {lnum} and virtual
+--- column {col}.
+---
+--- If {col} is greater than the last virtual column in line
+--- {lnum}, then the byte index of the character at the last
+--- virtual column is returned.
+---
+--- The {winid} argument can be the window number or the
+--- |window-ID|. If this is zero, then the current window is used.
+---
+--- Returns -1 if the window {winid} doesn't exist or the buffer
+--- line {lnum} or virtual column {col} is invalid.
+---
+--- See also |screenpos()|, |virtcol()| and |col()|.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->virtcol2col(lnum, col)
+---
+--- @param winid integer
+--- @param lnum integer
+--- @param col integer
+--- @return any
+function vim.fn.virtcol2col(winid, lnum, col) end
+
+--- The result is a String, which describes the last Visual mode
+--- used in the current buffer.  Initially it returns an empty
+--- string, but once Visual mode has been used, it returns "v",
+--- "V", or "<CTRL-V>" (a single CTRL-V character) for
+--- character-wise, line-wise, or block-wise Visual mode
+--- respectively.
+--- Example: >
+---   :exe "normal " .. visualmode()
+--- <This enters the same Visual mode as before.  It is also useful
+--- in scripts if you wish to act differently depending on the
+--- Visual mode that was used.
+--- If Visual mode is active, use |mode()| to get the Visual mode
+--- (e.g., in a |:vmap|).
+--- If {expr} is supplied and it evaluates to a non-zero Number or
+--- a non-empty String, then the Visual mode will be cleared and
+--- the old value is returned.  See |non-zero-arg|.
+---
+--- @param expr? any
+--- @return any
+function vim.fn.visualmode(expr) end
+
+--- Waits until {condition} evaluates to |TRUE|, where {condition}
+--- is a |Funcref| or |string| containing an expression.
+---
+--- {timeout} is the maximum waiting time in milliseconds, -1
+--- means forever.
+---
+--- Condition is evaluated on user events, internal events, and
+--- every {interval} milliseconds (default: 200).
+---
+--- Returns a status integer:
+---   0 if the condition was satisfied before timeout
+---   -1 if the timeout was exceeded
+---   -2 if the function was interrupted (by |CTRL-C|)
+---   -3 if an error occurred
+---
+--- @param timeout integer
+--- @param condition any
+--- @param interval? any
+--- @return any
+function vim.fn.wait(timeout, condition, interval) end
+
+--- Returns |TRUE| when the wildmenu is active and |FALSE|
+--- otherwise.  See 'wildmenu' and 'wildmode'.
+--- This can be used in mappings to handle the 'wildcharm' option
+--- gracefully. (Makes only sense with |mapmode-c| mappings).
+---
+--- For example to make <c-j> work like <down> in wildmode, use: >
+---     :cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
+--- <
+--- (Note, this needs the 'wildcharm' option set appropriately).
+---
+--- @return any
+function vim.fn.wildmenumode() end
+
+--- Like `execute()` but in the context of window {id}.
+--- The window will temporarily be made the current window,
+--- without triggering autocommands or changing directory.  When
+--- executing {command} autocommands will be triggered, this may
+--- have unexpected side effects.  Use `:noautocmd` if needed.
+--- Example: >
+---   call win_execute(winid, 'syntax enable')
+--- <Doing the same with `setwinvar()` would not trigger
+--- autocommands and not actually show syntax highlighting.
+---
+--- When window {id} does not exist then no error is given and
+--- an empty string is returned.
+---
+--- Can also be used as a |method|, the base is passed as the
+--- second argument: >
+---   GetCommand()->win_execute(winid)
+---
+--- @param id any
+--- @param command any
+--- @param silent? boolean
+--- @return any
+function vim.fn.win_execute(id, command, silent) end
+
+--- Returns a |List| with |window-ID|s for windows that contain
+--- buffer {bufnr}.  When there is none the list is empty.
+---
+--- Can also be used as a |method|: >
+---   GetBufnr()->win_findbuf()
+---
+--- @param bufnr any
+--- @return integer[]
+function vim.fn.win_findbuf(bufnr) end
+
+--- Get the |window-ID| for the specified window.
+--- When {win} is missing use the current window.
+--- With {win} this is the window number.  The top window has
+--- number 1.
+--- Without {tab} use the current tab, otherwise the tab with
+--- number {tab}.  The first tab has number one.
+--- Return zero if the window cannot be found.
+---
+--- Can also be used as a |method|: >
+---   GetWinnr()->win_getid()
+---
+--- @param win? any
+--- @param tab? any
+--- @return integer
+function vim.fn.win_getid(win, tab) end
+
+--- Return the type of the window:
+---   "autocmd"  autocommand window. Temporary window
+---       used to execute autocommands.
+---   "command"  command-line window |cmdwin|
+---   (empty)    normal window
+---   "loclist"  |location-list-window|
+---   "popup"    floating window |api-floatwin|
+---   "preview"  preview window |preview-window|
+---   "quickfix"  |quickfix-window|
+---   "unknown"  window {nr} not found
+---
+--- When {nr} is omitted return the type of the current window.
+--- When {nr} is given return the type of this window by number or
+--- |window-ID|.
+---
+--- Also see the 'buftype' option.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->win_gettype()
+--- <
+--- @param nr? integer
+--- @return 'autocmd'|'command'|''|'loclist'|'popup'|'preview'|'quickfix'|'unknown'
+function vim.fn.win_gettype(nr) end
+
+--- Go to window with ID {expr}.  This may also change the current
+--- tabpage.
+--- Return TRUE if successful, FALSE if the window cannot be found.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->win_gotoid()
+---
+--- @param expr any
+--- @return 0|1
+function vim.fn.win_gotoid(expr) end
+
+--- Return a list with the tab number and window number of window
+--- with ID {expr}: [tabnr, winnr].
+--- Return [0, 0] if the window cannot be found.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->win_id2tabwin()
+---
+--- @param expr any
+--- @return any
+function vim.fn.win_id2tabwin(expr) end
+
+--- Return the window number of window with ID {expr}.
+--- Return 0 if the window cannot be found in the current tabpage.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->win_id2win()
+---
+--- @param expr any
+--- @return any
+function vim.fn.win_id2win(expr) end
+
+--- Move window {nr}'s vertical separator (i.e., the right border)
+--- by {offset} columns, as if being dragged by the mouse. {nr}
+--- can be a window number or |window-ID|. A positive {offset}
+--- moves right and a negative {offset} moves left. Moving a
+--- window's vertical separator will change the width of the
+--- window and the width of other windows adjacent to the vertical
+--- separator. The magnitude of movement may be smaller than
+--- specified (e.g., as a consequence of maintaining
+--- 'winminwidth'). Returns TRUE if the window can be found and
+--- FALSE otherwise.
+--- This will fail for the rightmost window and a full-width
+--- window, since it has no separator on the right.
+--- Only works for the current tab page. *E1308*
+---
+--- Can also be used as a |method|: >
+---   GetWinnr()->win_move_separator(offset)
+---
+--- @param nr integer
+--- @param offset any
+--- @return any
+function vim.fn.win_move_separator(nr, offset) end
+
+--- Move window {nr}'s status line (i.e., the bottom border) by
+--- {offset} rows, as if being dragged by the mouse. {nr} can be a
+--- window number or |window-ID|. A positive {offset} moves down
+--- and a negative {offset} moves up. Moving a window's status
+--- line will change the height of the window and the height of
+--- other windows adjacent to the status line. The magnitude of
+--- movement may be smaller than specified (e.g., as a consequence
+--- of maintaining 'winminheight'). Returns TRUE if the window can
+--- be found and FALSE otherwise.
+--- Only works for the current tab page.
+---
+--- Can also be used as a |method|: >
+---   GetWinnr()->win_move_statusline(offset)
+---
+--- @param nr integer
+--- @param offset any
+--- @return any
+function vim.fn.win_move_statusline(nr, offset) end
+
+--- Return the screen position of window {nr} as a list with two
+--- numbers: [row, col].  The first window always has position
+--- [1, 1], unless there is a tabline, then it is [2, 1].
+--- {nr} can be the window number or the |window-ID|.  Use zero
+--- for the current window.
+--- Returns [0, 0] if the window cannot be found in the current
+--- tabpage.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->win_screenpos()
+--- <
+--- @param nr integer
+--- @return any
+function vim.fn.win_screenpos(nr) end
+
+--- Move the window {nr} to a new split of the window {target}.
+--- This is similar to moving to {target}, creating a new window
+--- using |:split| but having the same contents as window {nr}, and
+--- then closing {nr}.
+---
+--- Both {nr} and {target} can be window numbers or |window-ID|s.
+--- Both must be in the current tab page.
+---
+--- Returns zero for success, non-zero for failure.
+---
+--- {options} is a |Dictionary| with the following optional entries:
+---   "vertical"  When TRUE, the split is created vertically,
+---     like with |:vsplit|.
+---   "rightbelow"  When TRUE, the split is made below or to the
+---     right (if vertical).  When FALSE, it is done
+---     above or to the left (if vertical).  When not
+---     present, the values of 'splitbelow' and
+---     'splitright' are used.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->win_splitmove(target)
+--- <
+---           *winbufnr()*
+--- @param nr integer
+--- @param target any
+--- @param options? table
+--- @return any
+function vim.fn.win_splitmove(nr, target, options) end
+
+--- associated with window {nr}.  {nr} can be the window number or
+--- the |window-ID|.
+--- When {nr} is zero, the number of the buffer in the current
+--- window is returned.
+--- When window {nr} doesn't exist, -1 is returned.
+--- Example: >
+---   :echo "The file in the current window is " .. bufname(winbufnr(0))
+--- <
+--- Can also be used as a |method|: >
+---   FindWindow()->winbufnr()->bufname()
+--- <
+---           *wincol()*
+--- @param nr integer
+--- @return integer
+function vim.fn.winbufnr(nr) end
+
+--- cursor in the window.  This is counting screen cells from the
+--- left side of the window.  The leftmost column is one.
+---
+---           *windowsversion()*
+--- @return integer
+function vim.fn.wincol() end
+
+--- The result is a String.  For MS-Windows it indicates the OS
+--- version.  E.g, Windows 10 is "10.0", Windows 8 is "6.2",
+--- Windows XP is "5.1".  For non-MS-Windows systems the result is
+--- an empty string.
+---
+--- @return string
+function vim.fn.windowsversion() end
+
+--- The result is a Number, which is the height of window {nr}.
+--- {nr} can be the window number or the |window-ID|.
+--- When {nr} is zero, the height of the current window is
+--- returned.  When window {nr} doesn't exist, -1 is returned.
+--- An existing window always has a height of zero or more.
+--- This excludes any window toolbar line.
+--- Examples: >
+---   :echo "The current window has " .. winheight(0) .. " lines."
+---
+--- <Can also be used as a |method|: >
+---   GetWinid()->winheight()
+--- <
+--- @param nr integer
+--- @return integer
+function vim.fn.winheight(nr) end
+
+--- The result is a nested List containing the layout of windows
+--- in a tabpage.
+---
+--- Without {tabnr} use the current tabpage, otherwise the tabpage
+--- with number {tabnr}. If the tabpage {tabnr} is not found,
+--- returns an empty list.
+---
+--- For a leaf window, it returns:
+---   ["leaf", {winid}]
+--- For horizontally split windows, which form a column, it
+--- returns: >
+---   ["col", [{nested list of windows}]]
+--- <For vertically split windows, which form a row, it returns: >
+---   ["row", [{nested list of windows}]]
+--- <
+--- Example: >
+---   " Only one window in the tab page
+---   :echo winlayout()
+---   ['leaf', 1000]
+---   " Two horizontally split windows
+---   :echo winlayout()
+---   ['col', [['leaf', 1000], ['leaf', 1001]]]
+---   " The second tab page, with three horizontally split
+---   " windows, with two vertically split windows in the
+---   " middle window
+---   :echo winlayout(2)
+---   ['col', [['leaf', 1002], ['row', [['leaf', 1003],
+---           ['leaf', 1001]]], ['leaf', 1000]]]
+--- <
+--- Can also be used as a |method|: >
+---   GetTabnr()->winlayout()
+--- <
+---           *winline()*
+--- @param tabnr? integer
+--- @return any
+function vim.fn.winlayout(tabnr) end
+
+--- in the window.  This is counting screen lines from the top of
+--- the window.  The first line is one.
+--- If the cursor was moved the view on the file will be updated
+--- first, this may cause a scroll.
+---
+---           *winnr()*
+--- @return integer
+function vim.fn.winline() end
+
+--- window.  The top window has number 1.
+--- Returns zero for a popup window.
+---
+--- The optional argument {arg} supports the following values:
+---   $  the number of the last window (the window
+---     count).
+---   #  the number of the last accessed window (where
+---     |CTRL-W_p| goes to).  If there is no previous
+---     window or it is in another tab page 0 is
+---     returned.
+---   {N}j  the number of the Nth window below the
+---     current window (where |CTRL-W_j| goes to).
+---   {N}k  the number of the Nth window above the current
+---     window (where |CTRL-W_k| goes to).
+---   {N}h  the number of the Nth window left of the
+---     current window (where |CTRL-W_h| goes to).
+---   {N}l  the number of the Nth window right of the
+---     current window (where |CTRL-W_l| goes to).
+--- The number can be used with |CTRL-W_w| and ":wincmd w"
+--- |:wincmd|.
+--- When {arg} is invalid an error is given and zero is returned.
+--- Also see |tabpagewinnr()| and |win_getid()|.
+--- Examples: >
+---   let window_count = winnr('$')
+---   let prev_window = winnr('#')
+---   let wnum = winnr('3k')
+---
+--- <Can also be used as a |method|: >
+---   GetWinval()->winnr()
+--- <
+---           *winrestcmd()*
+--- @param arg? any
+--- @return any
+function vim.fn.winnr(arg) end
+
+--- the current window sizes.  Only works properly when no windows
+--- are opened or closed and the current window and tab page is
+--- unchanged.
+--- Example: >
+---   :let cmd = winrestcmd()
+---   :call MessWithWindowSizes()
+---   :exe cmd
+--- <
+---           *winrestview()*
+--- @return any
+function vim.fn.winrestcmd() end
+
+--- Uses the |Dictionary| returned by |winsaveview()| to restore
+--- the view of the current window.
+--- Note: The {dict} does not have to contain all values, that are
+--- returned by |winsaveview()|. If values are missing, those
+--- settings won't be restored. So you can use: >
+---     :call winrestview({'curswant': 4})
+--- <
+--- This will only set the curswant value (the column the cursor
+--- wants to move on vertical movements) of the cursor to column 5
+--- (yes, that is 5), while all other settings will remain the
+--- same. This is useful, if you set the cursor position manually.
+---
+--- If you have changed the values the result is unpredictable.
+--- If the window size changed the result won't be the same.
+---
+--- Can also be used as a |method|: >
+---   GetView()->winrestview()
+--- <
+---           *winsaveview()*
+--- @param dict any
+--- @return any
+function vim.fn.winrestview(dict) end
+
+--- the view of the current window.  Use |winrestview()| to
+--- restore the view.
+--- This is useful if you have a mapping that jumps around in the
+--- buffer and you want to go back to the original view.
+--- This does not save fold information.  Use the 'foldenable'
+--- option to temporarily switch off folding, so that folds are
+--- not opened when moving around. This may have side effects.
+--- The return value includes:
+---   lnum    cursor line number
+---   col    cursor column (Note: the first column
+---       zero, as opposed to what |getcurpos()|
+---       returns)
+---   coladd    cursor column offset for 'virtualedit'
+---   curswant  column for vertical movement (Note:
+---       the first column is zero, as opposed
+---       to what |getcurpos()| returns).  After
+---       |$| command it will be a very large
+---       number equal to |v:maxcol|.
+---   topline    first line in the window
+---   topfill    filler lines, only in diff mode
+---   leftcol    first column displayed; only used when
+---       'wrap' is off
+---   skipcol    columns skipped
+--- Note that no option values are saved.
+---
+---
+--- @return any
+function vim.fn.winsaveview() end
+
+--- The result is a Number, which is the width of window {nr}.
+--- {nr} can be the window number or the |window-ID|.
+--- When {nr} is zero, the width of the current window is
+--- returned.  When window {nr} doesn't exist, -1 is returned.
+--- An existing window always has a width of zero or more.
+--- Examples: >
+---   :echo "The current window has " .. winwidth(0) .. " columns."
+---   :if winwidth(0) <= 50
+---   :  50 wincmd |
+---   :endif
+--- <For getting the terminal or screen size, see the 'columns'
+--- option.
+---
+--- Can also be used as a |method|: >
+---   GetWinid()->winwidth()
+---
+--- @param nr integer
+--- @return any
+function vim.fn.winwidth(nr) end
+
+--- The result is a dictionary of byte/chars/word statistics for
+--- the current buffer.  This is the same info as provided by
+--- |g_CTRL-G|
+--- The return value includes:
+---   bytes    Number of bytes in the buffer
+---   chars    Number of chars in the buffer
+---   words    Number of words in the buffer
+---   cursor_bytes    Number of bytes before cursor position
+---       (not in Visual mode)
+---   cursor_chars    Number of chars before cursor position
+---       (not in Visual mode)
+---   cursor_words    Number of words before cursor position
+---       (not in Visual mode)
+---   visual_bytes    Number of bytes visually selected
+---       (only in Visual mode)
+---   visual_chars    Number of chars visually selected
+---       (only in Visual mode)
+---   visual_words    Number of words visually selected
+---       (only in Visual mode)
+---
+---
+---           *writefile()*
+--- @return any
+function vim.fn.wordcount() end
+
+--- When {object} is a |List| write it to file {fname}.  Each list
+--- item is separated with a NL.  Each list item must be a String
+--- or Number.
+--- All NL characters are replaced with a NUL character.
+--- Inserting CR characters needs to be done before passing {list}
+--- to writefile().
+---
+--- When {object} is a |Blob| write the bytes to file {fname}
+--- unmodified, also when binary mode is not specified.
+---
+--- {flags} must be a String.  These characters are recognized:
+---
+--- 'b'  Binary mode is used: There will not be a NL after the
+---      last list item.  An empty item at the end does cause the
+---      last line in the file to end in a NL.
+---
+--- 'a'  Append mode is used, lines are appended to the file: >
+---   :call writefile(["foo"], "event.log", "a")
+---   :call writefile(["bar"], "event.log", "a")
+--- <
+--- 'D'  Delete the file when the current function ends.  This
+---      works like: >
+---   :defer delete({fname})
+--- <     Fails when not in a function.  Also see |:defer|.
+---
+--- 's'  fsync() is called after writing the file.  This flushes
+---      the file to disk, if possible.  This takes more time but
+---      avoids losing the file if the system crashes.
+---
+--- 'S'  fsync() is not called, even when 'fsync' is set.
+---
+---      When {flags} does not contain "S" or "s" then fsync() is
+---      called if the 'fsync' option is set.
+---
+--- An existing file is overwritten, if possible.
+---
+--- When the write fails -1 is returned, otherwise 0.  There is an
+--- error message if the file can't be created or when writing
+--- fails.
+---
+--- Also see |readfile()|.
+--- To copy a file byte for byte: >
+---   :let fl = readfile("foo", "b")
+---   :call writefile(fl, "foocopy", "b")
+---
+--- <Can also be used as a |method|: >
+---   GetText()->writefile("thefile")
+---
+--- @param object any
+--- @param fname integer
+--- @param flags? string
+--- @return any
+function vim.fn.writefile(object, fname, flags) end
+
+--- Bitwise XOR on the two arguments.  The arguments are converted
+--- to a number.  A List, Dict or Float argument causes an error.
+--- Also see `and()` and `or()`.
+--- Example: >
+---   :let bits = xor(bits, 0x80)
+--- <
+--- Can also be used as a |method|: >
+---   :let bits = bits->xor(0x80)
+--- <
+--- @param expr any
+--- @param expr1 any
+--- @return any
+function vim.fn.xor(expr, expr1) end
-- 
cgit 


From ccf328172bac2b02f9bd19fa58e105958514a28a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 26 Jul 2023 21:07:39 +0800
Subject: fix(gen_vimfn_types): don't include tag before signature's line
 (#24492)

When signature is a bit long or there are too many tags, the tags appear
before the signature's line. Don't include the line with tags in the
previous function' docs.

Also fix lint warnings.
---
 runtime/lua/vim/_meta/vimfn.lua | 72 -----------------------------------------
 1 file changed, 72 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index b70e361e48..409c288036 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -135,14 +135,12 @@ function vim.fn.appendbufline(buf, lnum, text) end
 --- list is used: either the window number or the window ID.
 --- Returns -1 if the {winid} argument is invalid.
 ---
----           *argidx()*
 --- @param winid? integer
 --- @return integer
 function vim.fn.argc(winid) end
 
 --- the first file.  argc() - 1 is the last one.  See |arglist|.
 ---
----           *arglistid()*
 --- @return integer
 function vim.fn.argidx() end
 
@@ -157,7 +155,6 @@ function vim.fn.argidx() end
 --- page.
 --- {winnr} can be the window number or the |window-ID|.
 ---
----           *argv()*
 --- @param winnr? integer
 --- @param tabnr? integer
 --- @return integer
@@ -217,7 +214,6 @@ function vim.fn.asin(expr) end
 --- Can also be used as a |method|: >
 ---   GetCmd()->assert_beeps()
 --- <
----           *assert_equal()*
 --- @param cmd any
 --- @return 0|1
 function vim.fn.assert_beeps(cmd) end
@@ -240,7 +236,6 @@ function vim.fn.assert_beeps(cmd) end
 --- Can also be used as a |method|: >
 ---   mylist->assert_equal([1, 2, 3])
 ---
---- <          *assert_equalfile()*
 --- @param expected any
 --- @param actual any
 --- @param msg? any
@@ -271,7 +266,6 @@ function vim.fn.assert_equalfile() end
 ---     call assert_exception('E492:')
 ---   endtry
 --- <
----           *assert_fails()*
 --- @param error any
 --- @param msg? any
 --- @return 0|1
@@ -345,7 +339,6 @@ function vim.fn.assert_false(actual, msg) end
 --- but got {actual}".  When {msg} is present it is prefixed to
 --- that.
 ---
----             *assert_match()*
 --- @param lower any
 --- @param upper any
 --- @param actual any
@@ -387,7 +380,6 @@ function vim.fn.assert_match(pattern, actual, msg) end
 --- Can also be used as a |method|: >
 ---   GetCmd()->assert_nobeep()
 --- <
----           *assert_notequal()*
 --- @param cmd any
 --- @return 0|1
 function vim.fn.assert_nobeep(cmd) end
@@ -399,7 +391,6 @@ function vim.fn.assert_nobeep(cmd) end
 --- Can also be used as a |method|: >
 ---   mylist->assert_notequal([1, 2, 3])
 ---
---- <          *assert_notmatch()*
 --- @param expected any
 --- @param actual any
 --- @param msg? any
@@ -493,7 +484,6 @@ function vim.fn.atan2(expr1, expr2) end
 --- Can also be used as a |method|: >
 ---   GetBlob()->blob2list()
 --- <
----           *browse()*
 --- @param blob any
 --- @return any
 function vim.fn.blob2list(blob) end
@@ -508,7 +498,6 @@ function vim.fn.blob2list(blob) end
 --- An empty string is returned when the "Cancel" button is hit,
 --- something went wrong, or browsing is not possible.
 ---
----           *browsedir()*
 --- @param save any
 --- @param title any
 --- @param initdir any
@@ -660,7 +649,6 @@ function vim.fn.bufloaded(buf) end
 ---   bufname("%")    name of current buffer
 ---   bufname("file2")  name of buffer where "file2" matches.
 --- <
----           *bufnr()*
 --- @param buf? any
 --- @return string
 function vim.fn.bufname(buf) end
@@ -931,7 +919,6 @@ function vim.fn.charclass(string) end
 --- <Can also be used as a |method|: >
 ---   GetPos()->col()
 --- <
----           *charidx()*
 --- @param expr any
 --- @param winid? integer
 --- @return any
@@ -1202,7 +1189,6 @@ function vim.fn.complete_check() end
 --- <Can also be used as a |method|: >
 ---   GetItems()->complete_info()
 --- <
----         *confirm()*
 --- @param what? any
 --- @return table
 function vim.fn.complete_info(what) end
@@ -1261,7 +1247,6 @@ function vim.fn.complete_info(what) end
 --- Can also be used as a |method|in: >
 ---   BuildMessage()->confirm("&Yes\n&No")
 --- <
----           *copy()*
 --- @param msg any
 --- @param choices? any
 --- @param default? any
@@ -1554,7 +1539,6 @@ function vim.fn.dictwatcheradd(dict, pattern, callback) end
 --- arguments must match the ones passed to |dictwatcheradd()| in
 --- order for the watcher to be successfully deleted.
 ---
----           *did_filetype()*
 --- @param dict any
 --- @param pattern any
 --- @param callback any
@@ -1734,7 +1718,6 @@ function vim.fn.environ() end
 --- Can also be used as a |method|: >
 ---   GetText()->escape(' \')
 --- <
----           *eval()*
 --- @param string string
 --- @param chars any
 --- @return any
@@ -1832,7 +1815,6 @@ function vim.fn.execute(command, silent) end
 --- Can also be used as a |method|: >
 ---   GetCommand()->exepath()
 --- <
----           *exists()*
 --- @param expr any
 --- @return any
 function vim.fn.exepath(expr) end
@@ -2506,7 +2488,6 @@ function vim.fn.foldclosedend(lnum) end
 --- Can also be used as a |method|: >
 ---   GetLnum()->foldlevel()
 --- <
----           *foldtext()*
 --- @param lnum integer
 --- @return integer
 function vim.fn.foldlevel(lnum) end
@@ -2558,7 +2539,6 @@ function vim.fn.foldtextresult(lnum) end
 --- Can also be used as a |method|: >
 ---   GetName()->fullcommand()
 --- <
----         *funcref()*
 --- @param name string
 --- @return string
 function vim.fn.fullcommand(name) end
@@ -2577,7 +2557,6 @@ function vim.fn.fullcommand(name) end
 --- Can also be used as a |method|: >
 ---   GetFuncname()->funcref([arg])
 --- <
----     *function()* *partial* *E700* *E923*
 --- @param name string
 --- @param arglist? any
 --- @param dict? any
@@ -2701,7 +2680,6 @@ function vim.fn.garbagecollect(atexit) end
 ---   "args"  The list with arguments
 --- Returns zero on error.
 ---
----           *getbufinfo()*
 --- @param func any
 --- @param what any
 --- @return any
@@ -2775,7 +2753,6 @@ function vim.fn.get(func, what) end
 ---   GetBufnr()->getbufinfo()
 --- <
 ---
----           *getbufline()*
 --- @param dict? any
 --- @return any
 function vim.fn.getbufinfo(dict) end
@@ -2807,7 +2784,6 @@ function vim.fn.getbufinfo(dict) end
 --- <Can also be used as a |method|: >
 ---   GetBufnr()->getbufline(lnum)
 --- <
----           *getbufoneline()*
 --- @param buf any
 --- @param lnum integer
 --- @param end_? any
@@ -2963,7 +2939,6 @@ function vim.fn.getchar() end
 --- character itself are obtained.  Thus Shift-a results in "A"
 --- without a modifier.  Returns 0 if no modifiers are used.
 ---
----           *getcharpos()*
 --- @return integer
 function vim.fn.getcharmod() end
 
@@ -3162,7 +3137,6 @@ function vim.fn.getcmdwintype() end
 --- Can also be used as a |method|: >
 ---   GetPattern()->getcompletion('color')
 --- <
----           *getcurpos()*
 --- @param pat any
 --- @param type any
 --- @param filtered? any
@@ -3196,7 +3170,6 @@ function vim.fn.getcompletion(pat, type, filtered) end
 --- Can also be used as a |method|: >
 ---   GetWinid()->getcurpos()
 --- <
----           *getcursorcharpos()*
 --- @param winid? integer
 --- @return any
 function vim.fn.getcurpos(winid) end
@@ -3367,7 +3340,6 @@ function vim.fn.getftype(fname) end
 --- Can also be used as a |method|: >
 ---   GetWinnr()->getjumplist()
 ---
---- <          *getline()*
 --- @param winnr? integer
 --- @param tabnr? integer
 --- @return any
@@ -3528,13 +3500,11 @@ function vim.fn.getmatches(win) end
 --- When using |getchar()| the Vim variables |v:mouse_lnum|,
 --- |v:mouse_col| and |v:mouse_winid| also provide these values.
 ---
----           *getpid()*
 --- @return any
 function vim.fn.getmousepos() end
 
 --- This is a unique number, until Vim exits.
 ---
----           *getpos()*
 --- @return integer
 function vim.fn.getpid() end
 
@@ -3975,7 +3945,6 @@ function vim.fn.getwininfo(winid) end
 --- Can also be used as a |method|: >
 ---   GetTimeout()->getwinpos()
 --- <
----           *getwinposx()*
 --- @param timeout? integer
 --- @return any
 function vim.fn.getwinpos(timeout) end
@@ -3984,7 +3953,6 @@ function vim.fn.getwinpos(timeout) end
 --- -1 if the information is not available.
 --- The value can be used with `:winpos`.
 ---
----           *getwinposy()*
 --- @return integer
 function vim.fn.getwinposx() end
 
@@ -4067,7 +4035,6 @@ function vim.fn.glob(expr, nosuf, list, alllinks) end
 ---
 --- Can also be used as a |method|: >
 ---   GetExpr()->glob2regpat()
---- <            *globpath()*
 --- @param string string
 --- @return any
 function vim.fn.glob2regpat(string) end
@@ -4110,7 +4077,6 @@ function vim.fn.glob2regpat(string) end
 --- second argument: >
 ---   GetExpr()->globpath(&rtp)
 --- <
----           *has()*
 --- @param path string
 --- @param expr any
 --- @param nosuf? boolean
@@ -4391,7 +4357,6 @@ function vim.fn.hlID(name) end
 --- Can also be used as a |method|: >
 ---   GetName()->hlexists()
 --- <
----           *hlID()*
 --- @param name string
 --- @return 0|1
 function vim.fn.hlexists(name) end
@@ -4417,7 +4382,6 @@ function vim.fn.hostname() end
 --- Can also be used as a |method|: >
 ---   GetText()->iconv('latin1', 'utf-8')
 --- <
----           *indent()*
 --- @param string string
 --- @param from any
 --- @param to any
@@ -5067,7 +5031,6 @@ function vim.fn.keys(dict) end
 --- Can also be used as a |method|: >
 ---   "\<C-Home>"->keytrans()
 ---
---- <          *len()* *E701*
 --- @param string string
 --- @return any
 function vim.fn.keytrans(string) end
@@ -5088,7 +5051,6 @@ function vim.fn.last_buffer_nr(...) end
 --- Can also be used as a |method|: >
 ---   mylist->len()
 ---
---- <        *libcall()* *E364* *E368*
 --- @param expr any
 --- @return any
 function vim.fn.len(expr) end
@@ -5138,7 +5100,6 @@ function vim.fn.len(expr) end
 --- third argument: >
 ---   GetValue()->libcall("libc.so", "getenv")
 --- <
----           *libcallnr()*
 --- @param libname string
 --- @param funcname string
 --- @param argument any
@@ -5578,7 +5539,6 @@ function vim.fn.mapset(mode, abbr, dict) end
 ---   GetText()->match('word')
 ---   GetList()->match('word')
 --- <
----   *matchadd()* *E798* *E799* *E801* *E957*
 --- @param expr any
 --- @param pat any
 --- @param start? any
@@ -5646,7 +5606,6 @@ function vim.fn.match(expr, pat, start, count) end
 --- Can also be used as a |method|: >
 ---   GetGroup()->matchadd('TODO')
 --- <
----           *matchaddpos()*
 --- @param group any
 --- @param pattern any
 --- @param priority? any
@@ -5922,7 +5881,6 @@ function vim.fn.matchstr(expr, pat, start, count) end
 ---   GetText()->matchstrpos('word')
 --- <
 ---
----           *max()*
 --- @param expr any
 --- @param pat any
 --- @param start? any
@@ -6069,7 +6027,6 @@ function vim.fn.menu_get(path, modes) end
 ---   GetMenuName()->menu_info('v')
 ---
 ---
---- <          *min()*
 --- @param name string
 --- @param mode? string
 --- @return any
@@ -6086,7 +6043,6 @@ function vim.fn.menu_info(name, mode) end
 --- Can also be used as a |method|: >
 ---   mylist->min()
 ---
---- <          *mkdir()* *E739*
 --- @param expr any
 --- @return any
 function vim.fn.min(expr) end
@@ -6136,7 +6092,6 @@ function vim.fn.min(expr) end
 --- Can also be used as a |method|: >
 ---   GetName()->mkdir()
 --- <
----           *mode()*
 --- @param name string
 --- @param flags? string
 --- @param prot? any
@@ -6867,7 +6822,6 @@ function vim.fn.range(expr, max, stride) end
 --- Also see |readfile()| and |writefile()|.
 ---
 ---
----           *readdir()*
 --- @param fname integer
 --- @param offset? any
 --- @param size? any
@@ -6907,7 +6861,6 @@ function vim.fn.readblob(fname, offset, size) end
 ---   GetDirName()->readdir()
 --- <
 ---
----           *readfile()*
 --- @param directory any
 --- @param expr? any
 --- @return any
@@ -7120,7 +7073,6 @@ vim.fn['repeat'] = function(expr, count) end
 --- Can also be used as a |method|: >
 ---   GetName()->resolve()
 --- <
----           *reverse()*
 --- @param filename any
 --- @return any
 function vim.fn.resolve(filename) end
@@ -7325,7 +7277,6 @@ function vim.fn.screenrow() end
 --- Can also be used as a |method|: >
 ---   GetRow()->screenstring(col)
 --- <
----             *search()*
 --- @param row any
 --- @param col integer
 --- @return any
@@ -7589,7 +7540,6 @@ function vim.fn.searchcount(options) end
 --- Can also be used as a |method|: >
 ---   GetName()->searchdecl()
 --- <
----           *searchpair()*
 --- @param name string
 --- @param global? any
 --- @param thisblock? any
@@ -7974,7 +7924,6 @@ function vim.fn.setloclist(nr, list, action, what) end
 --- Can also be used as a |method|: >
 ---   GetMatches()->setmatches()
 --- <
----           *setpos()*
 --- @param list any
 --- @param win? any
 --- @return any
@@ -8150,7 +8099,6 @@ function vim.fn.setpos(expr, list) end
 --- second argument: >
 ---   GetErrorlist()->setqflist()
 --- <
----           *setreg()*
 --- @param list any
 --- @param action? any
 --- @param what? any
@@ -8553,7 +8501,6 @@ function vim.fn.sign_getdefined(name) end
 --- Can also be used as a |method|: >
 ---   GetBufname()->sign_getplaced()
 --- <
----           *sign_jump()*
 --- @param buf? any
 --- @param dict? any
 --- @return any
@@ -8576,7 +8523,6 @@ function vim.fn.sign_getplaced(buf, dict) end
 --- Can also be used as a |method|: >
 ---   GetSignid()->sign_jump()
 --- <
----           *sign_place()*
 --- @param id any
 --- @param group any
 --- @param buf any
@@ -8633,7 +8579,6 @@ function vim.fn.sign_jump(id, group, buf) end
 --- Can also be used as a |method|: >
 ---   GetSignid()->sign_place(group, name, expr)
 --- <
----           *sign_placelist()*
 --- @param id any
 --- @param group any
 --- @param name string
@@ -8996,7 +8941,6 @@ function vim.fn.sockconnect(mode, address, opts) end
 --- <For a simple expression you can use a lambda: >
 ---   eval mylist->sort({i1, i2 -> i1 - i2})
 --- <
----           *soundfold()*
 --- @param list any
 --- @param func? any
 --- @param dict? any
@@ -9013,7 +8957,6 @@ function vim.fn.sort(list, func, dict) end
 --- Can also be used as a |method|: >
 ---   GetWord()->soundfold()
 --- <
----           *spellbadword()*
 --- @param word any
 --- @return any
 function vim.fn.soundfold(word) end
@@ -9044,7 +8987,6 @@ function vim.fn.soundfold(word) end
 --- Can also be used as a |method|: >
 ---   GetText()->spellbadword()
 --- <
----           *spellsuggest()*
 --- @param sentence? any
 --- @return any
 function vim.fn.spellbadword(sentence) end
@@ -9429,7 +9371,6 @@ function vim.fn.strgetchar(str, index) end
 --- Can also be used as a |method|: >
 ---   GetHaystack()->stridx(needle)
 --- <
----           *string()*
 --- @param haystack any
 --- @param needle any
 --- @param start? any
@@ -10042,7 +9983,6 @@ function vim.fn.tabpagenr(arg) end
 --- Can also be used as a |method|: >
 ---   GetTabpage()->tabpagewinnr()
 --- <
----           *tagfiles()*
 --- @param tabarg any
 --- @param arg? any
 --- @return any
@@ -10134,7 +10074,6 @@ function vim.fn.tan(expr) end
 --- Can also be used as a |method|: >
 ---   Compute()->tanh()
 --- <
----           *timer_info()*
 --- @param expr any
 --- @return any
 function vim.fn.tanh(expr) end
@@ -10203,7 +10142,6 @@ function vim.fn.timer_info(id) end
 --- Can also be used as a |method|: >
 ---   GetTimer()->timer_pause(1)
 --- <
----         *timer_start()* *timer* *timers*
 --- @param timer any
 --- @param paused any
 --- @return any
@@ -10472,7 +10410,6 @@ function vim.fn.undotree() end
 --- Can also be used as a |method|: >
 ---   mylist->uniq()
 --- <
----           *utf16idx()*
 --- @param list any
 --- @param func? any
 --- @param dict? any
@@ -10849,7 +10786,6 @@ function vim.fn.win_screenpos(nr) end
 --- Can also be used as a |method|: >
 ---   GetWinid()->win_splitmove(target)
 --- <
----           *winbufnr()*
 --- @param nr integer
 --- @param target any
 --- @param options? table
@@ -10867,7 +10803,6 @@ function vim.fn.win_splitmove(nr, target, options) end
 --- Can also be used as a |method|: >
 ---   FindWindow()->winbufnr()->bufname()
 --- <
----           *wincol()*
 --- @param nr integer
 --- @return integer
 function vim.fn.winbufnr(nr) end
@@ -10875,7 +10810,6 @@ function vim.fn.winbufnr(nr) end
 --- cursor in the window.  This is counting screen cells from the
 --- left side of the window.  The leftmost column is one.
 ---
----           *windowsversion()*
 --- @return integer
 function vim.fn.wincol() end
 
@@ -10935,7 +10869,6 @@ function vim.fn.winheight(nr) end
 --- Can also be used as a |method|: >
 ---   GetTabnr()->winlayout()
 --- <
----           *winline()*
 --- @param tabnr? integer
 --- @return any
 function vim.fn.winlayout(tabnr) end
@@ -10945,7 +10878,6 @@ function vim.fn.winlayout(tabnr) end
 --- If the cursor was moved the view on the file will be updated
 --- first, this may cause a scroll.
 ---
----           *winnr()*
 --- @return integer
 function vim.fn.winline() end
 
@@ -10979,7 +10911,6 @@ function vim.fn.winline() end
 --- <Can also be used as a |method|: >
 ---   GetWinval()->winnr()
 --- <
----           *winrestcmd()*
 --- @param arg? any
 --- @return any
 function vim.fn.winnr(arg) end
@@ -10992,7 +10923,6 @@ function vim.fn.winnr(arg) end
 ---   :call MessWithWindowSizes()
 ---   :exe cmd
 --- <
----           *winrestview()*
 --- @return any
 function vim.fn.winrestcmd() end
 
@@ -11014,7 +10944,6 @@ function vim.fn.winrestcmd() end
 --- Can also be used as a |method|: >
 ---   GetView()->winrestview()
 --- <
----           *winsaveview()*
 --- @param dict any
 --- @return any
 function vim.fn.winrestview(dict) end
@@ -11089,7 +11018,6 @@ function vim.fn.winwidth(nr) end
 ---       (only in Visual mode)
 ---
 ---
----           *writefile()*
 --- @return any
 function vim.fn.wordcount() end
 
-- 
cgit 


From 6b4970f6e0ac36021b2a8bd0533f5078040d31f7 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Sun, 23 Jul 2023 19:50:20 +0100
Subject: feat(api): allow open_win/win_set_buf in the cmdwin in some cases

Problem: As discussed on Matrix, there was some interest in having
`nvim_open_win` again be able to open floats in the cmdwin (e.g: displaying a
hover doc related to what's in the cmdwin). After #23228, this was disallowed.

Solution: Allow `nvim_open_win` in the cmdwin as long as `!enter` and
`buffer != curbuf` (the former can cause all sorts of issues, and the latter
can crash Nvim after closing cmdwin). Also allow `nvim_win_set_buf` in a similar
fashion.

Note that we're not *entirely* sure if this is 100% safe (cmdwin is a
global-state-using-main-loop-calling beast), but this seems to work OK..?

Also:
  - Check the buffer argument of `nvim_open_win` earlier, and abort if it's
    invalid (it used to still open a window in this case).

  - Untranslate `e_cmdwin` errors in the API (other errors in the API are not
    translated: although not detailed in the API contract yet, errors are
    supposed to be stable).
---
 runtime/doc/api.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 5b6a901970..1e5b6b0b40 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2915,7 +2915,7 @@ nvim_win_set_buf({window}, {buffer})                      *nvim_win_set_buf()*
     Sets the current buffer in a window, without side effects
 
     Attributes: ~
-        not allowed when |textlock| is active or in the |cmdwin|
+        not allowed when |textlock| is active
 
     Parameters: ~
       • {window}  Window handle, or 0 for current window
@@ -3036,7 +3036,7 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
 <
 
     Attributes: ~
-        not allowed when |textlock| is active or in the |cmdwin|
+        not allowed when |textlock| is active
 
     Parameters: ~
       • {buffer}  Buffer to display, or 0 for current buffer
-- 
cgit 


From 472271199e483d3f23d62c272b20c5290eec5474 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:19:01 +0100
Subject: feat(api): allow win_hide to close cmdwin or non-previous windows

This aligns its behaviour better with `nvim_win_close`.

Note that `:hide` is actually incapable of closing the cmdwin, unlike `:close`
and `:quit`, so this is a bit of a difference in behaviour.
---
 runtime/doc/api.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 1e5b6b0b40..417137c166 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2897,7 +2897,7 @@ nvim_win_hide({window})                                      *nvim_win_hide()*
     or |nvim_win_close()|, which will close the buffer.
 
     Attributes: ~
-        not allowed when |textlock| is active or in the |cmdwin|
+        not allowed when |textlock| is active
 
     Parameters: ~
       • {window}  Window handle, or 0 for current window
-- 
cgit 


From 41cefe513054edd1c12f235125220dbc6b4d9451 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 27 Jul 2023 12:45:08 +0200
Subject: build(deps): bump tree-sitter-c to v0.20.4 (#24495)

---
 runtime/queries/c/folds.scm      |  3 ++-
 runtime/queries/c/highlights.scm | 32 ++++++++++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/queries/c/folds.scm b/runtime/queries/c/folds.scm
index 80c3039b6b..5a35334a24 100644
--- a/runtime/queries/c/folds.scm
+++ b/runtime/queries/c/folds.scm
@@ -13,7 +13,8 @@
  (preproc_else)
  (preproc_ifdef)
  (initializer_list)
+ (gnu_asm_expression)
 ] @fold
 
- (compound_statement
+(compound_statement
   (compound_statement) @fold)
diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index 523a792403..ef70a7103c 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -8,9 +8,14 @@
   "typedef"
   "union"
   "goto"
+  "asm"
+  "__asm__"
 ] @keyword
 
-"sizeof" @keyword.operator
+[
+  "sizeof"
+  "offsetof"
+] @keyword.operator
 
 "return" @keyword.return
 
@@ -36,6 +41,8 @@
   "#else"
   "#elif"
   "#endif"
+  "#elifdef"
+  "#elifndef"
   (preproc_directive)
 ] @preproc
 
@@ -43,7 +50,7 @@
 
 "#include" @include
 
-[ ";" ":" "," ] @punctuation.delimiter
+[ ";" ":" "," "::" ] @punctuation.delimiter
 
 "..." @punctuation.special
 
@@ -98,8 +105,8 @@
 (comma_expression [ "," ] @operator)
 
 [
- (true)
- (false)
+  (true)
+  (false)
 ] @boolean
 
 (conditional_expression [ "?" ":" ] @conditional.ternary)
@@ -112,10 +119,8 @@
 (number_literal) @number
 (char_literal) @character
 
-[
- (preproc_arg)
- (preproc_defined)
-]  @function.macro
+((preproc_arg) @function.macro (#set! "priority" 90))
+(preproc_defined) @function.macro
 
 (((field_expression
      (field_identifier) @property)) @_parent
@@ -135,7 +140,10 @@
 
 (storage_class_specifier) @storageclass
 
-(type_qualifier) @type.qualifier
+[
+  (type_qualifier) 
+  (gnu_asm_qualifier)
+] @type.qualifier
 
 (linkage_specification
   "extern" @storageclass)
@@ -195,15 +203,15 @@
 
 [
   "__attribute__"
+  "__declspec"
+  "__based"
   "__cdecl"
   "__clrcall"
   "__stdcall"
   "__fastcall"
   "__thiscall"
   "__vectorcall"
-  "_unaligned"
-  "__unaligned"
-  "__declspec"
+  (ms_pointer_modifier)
   (attribute_declaration)
 ] @attribute
 
-- 
cgit 


From df2f5e39127e283a7ac74a21cb0323c437c3294f Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Thu, 27 Jul 2023 15:39:05 +0300
Subject: fix(editorconfig): highlight properties with dashes (#24407)

also add metadata comment and update Lua code in syntax file
---
 runtime/syntax/editorconfig.vim | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/editorconfig.vim b/runtime/syntax/editorconfig.vim
index 4392d2b2d5..74a0e56131 100644
--- a/runtime/syntax/editorconfig.vim
+++ b/runtime/syntax/editorconfig.vim
@@ -1,15 +1,18 @@
+" Nvim syntax file
+" Language:     EditorConfig
+" Last Change:  2023-07-20
+"
+" This file is intentionally _not_ copied from Vim.
+
 runtime! syntax/dosini.vim
 unlet! b:current_syntax
 
-syntax match editorconfigUnknownProperty "^\s*\zs\w\+\ze\s*="
+syntax match editorconfigUnknownProperty "^\s*\zs[a-zA-Z0-9_-]\+\ze\s*="
 syntax keyword editorconfigProperty root
 
 lua<<
-local props = {}
-for k in pairs(require('editorconfig').properties) do
-  props[#props + 1] = k
-end
-vim.cmd(string.format('syntax keyword editorconfigProperty %s', table.concat(props, ' ')))
+local props = vim.tbl_keys(require('editorconfig').properties)
+vim.cmd.syntax { 'keyword', 'editorconfigProperty', unpack(props) }
 .
 
 hi def link editorconfigProperty dosiniLabel
-- 
cgit 


From 42333ea98dfcd2994ee128a3467dfe68205154cd Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 28 Jul 2023 14:48:41 +0100
Subject: feat(docs): generate builtin.txt (#24493)

- eval.lua is now the source of truth.

- Formatting is much more consistent.

- Fixed Lua type generation for polymorphic functions (get(), etc).

- Removed "Overview" section from builtin.txt
  - Can generate this if we really want it.

- Moved functions from sign.txt and testing.txt into builtin.txt.

- Removed the *timer* *timers* tags since libuv timers via vim.uv should be preferred.

- Removed the temp-file-name tag from tempname()

- Moved lueval() from lua.txt to builtin.txt.

* Fix indent

* fixup!

* fixup! fixup!

* fixup! better tag formatting

* fixup: revert changes no longer needed

* fixup! CI

---------

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 runtime/doc/builtin.txt         | 2050 ++++++++++++++++++++-------------------
 runtime/doc/lua.txt             |    2 +-
 runtime/doc/sign.txt            |  395 +-------
 runtime/doc/testing.txt         |  196 +---
 runtime/doc/usr_41.txt          |    2 +-
 runtime/lua/vim/_meta/vimfn.lua |  575 ++++++++---
 6 files changed, 1506 insertions(+), 1714 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 150022d62a..0e49c70470 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -9,593 +9,8 @@ Builtin functions		*vimscript-functions* *builtin-functions*
 For functions grouped by what they are used for see |function-list|.
 
 				      Type |gO| to see the table of contents.
-
 ==============================================================================
-1. Overview					*builtin-function-list*
-
-Use CTRL-] on the function name to jump to the full explanation.
-
-USAGE				RESULT	DESCRIPTION	~
-
-abs({expr})			Float or Number  absolute value of {expr}
-acos({expr})			Float	arc cosine of {expr}
-add({object}, {item})		List/Blob   append {item} to {object}
-and({expr}, {expr})		Number	bitwise AND
-api_info()			Dict	api metadata
-append({lnum}, {text})		Number	append {text} below line {lnum}
-appendbufline({expr}, {lnum}, {text})
-				Number	append {text} below line {lnum}
-					in buffer {expr}
-argc([{winid}])			Number	number of files in the argument list
-argidx()			Number	current index in the argument list
-arglistid([{winnr} [, {tabnr}]]) Number	argument list id
-argv({nr} [, {winid}])		String	{nr} entry of the argument list
-argv([-1, {winid}])		List	the argument list
-asin({expr})			Float	arc sine of {expr}
-assert_beeps({cmd})		Number	assert {cmd} causes a beep
-assert_equal({exp}, {act} [, {msg}])
-				Number	assert {exp} is equal to {act}
-assert_equalfile({fname-one}, {fname-two} [, {msg}])
-				Number	assert file contents are equal
-assert_exception({error} [, {msg}])
-				Number	assert {error} is in v:exception
-assert_fails({cmd} [, {error}])	Number	assert {cmd} fails
-assert_false({actual} [, {msg}])
-				Number	assert {actual} is false
-assert_inrange({lower}, {upper}, {actual} [, {msg}])
-				Number	assert {actual} is inside the range
-assert_match({pat}, {text} [, {msg}])
-				Number	assert {pat} matches {text}
-assert_nobeep({cmd})		Number	assert {cmd} does not cause a beep
-assert_notequal({exp}, {act} [, {msg}])
-				Number	assert {exp} is not equal {act}
-assert_notmatch({pat}, {text} [, {msg}])
-				Number	assert {pat} not matches {text}
-assert_report({msg})		Number	report a test failure
-assert_true({actual} [, {msg}])	Number	assert {actual} is true
-atan({expr})			Float	arc tangent of {expr}
-atan2({expr1}, {expr2})		Float	arc tangent of {expr1} / {expr2}
-blob2list({blob})		List	convert {blob} into a list of numbers
-browse({save}, {title}, {initdir}, {default})
-				String	put up a file requester
-browsedir({title}, {initdir})	String	put up a directory requester
-bufadd({name})			Number	add a buffer to the buffer list
-bufexists({buf})		Number	|TRUE| if buffer {buf} exists
-buflisted({buf})		Number	|TRUE| if buffer {buf} is listed
-bufload({buf})			Number	load buffer {buf} if not loaded yet
-bufloaded({buf})		Number	|TRUE| if buffer {buf} is loaded
-bufname([{buf}])		String	Name of the buffer {buf}
-bufnr([{buf} [, {create}]])	Number	Number of the buffer {buf}
-bufwinid({buf})			Number	window ID of buffer {buf}
-bufwinnr({buf})			Number	window number of buffer {buf}
-byte2line({byte})		Number	line number at byte count {byte}
-byteidx({expr}, {nr} [, {utf16}])
-				Number	byte index of {nr}th char in {expr}
-byteidxcomp({expr}, {nr} [, {utf16}])
-				Number	byte index of {nr}th char in {expr}
-call({func}, {arglist} [, {dict}])
-				any	call {func} with arguments {arglist}
-ceil({expr})			Float	round {expr} up
-changenr()			Number	current change number
-chanclose({id} [, {stream}])	Number	Closes a channel or one of its streams
-chansend({id}, {data})		Number	Writes {data} to channel
-char2nr({expr} [, {utf8}])	Number	ASCII/UTF-8 value of first char in {expr}
-charclass({string})		Number	character class of {string}
-charcol({expr} [, {winid}])	Number	column number of cursor or mark
-charidx({string}, {idx} [, {countcc} [, {utf16}]])
-				Number	char index of byte {idx} in {string}
-chdir({dir})			String	change current working directory
-cindent({lnum})			Number	C indent for line {lnum}
-clearmatches([{win}])		none	clear all matches
-col({expr} [, {winid}])		Number	column byte index of cursor or mark
-complete({startcol}, {matches}) none	set Insert mode completion
-complete_add({expr})		Number	add completion match
-complete_check()		Number	check for key typed during completion
-complete_info([{what}])		Dict	get current completion information
-confirm({msg} [, {choices} [, {default} [, {type}]]])
-				Number	number of choice picked by user
-copy({expr})			any	make a shallow copy of {expr}
-cos({expr})			Float	cosine of {expr}
-cosh({expr})			Float	hyperbolic cosine of {expr}
-count({comp}, {expr} [, {ic} [, {start}]])
-				Number	count how many {expr} are in {comp}
-ctxget([{index}])		Dict	return the |context| dict at {index}
-ctxpop()			none	pop and restore |context| from the
-					|context-stack|
-ctxpush([{types}])		none	push the current |context| to the
-					|context-stack|
-ctxset({context} [, {index}])	none	set |context| at {index}
-ctxsize()			Number	return |context-stack| size
-cursor({lnum}, {col} [, {off}])
-				Number	move cursor to {lnum}, {col}, {off}
-cursor({list})			Number	move cursor to position in {list}
-debugbreak({pid})		Number	interrupt process being debugged
-deepcopy({expr} [, {noref}])	any	make a full copy of {expr}
-delete({fname} [, {flags}])	Number	delete the file or directory {fname}
-deletebufline({buf}, {first} [, {last}])
-				Number	delete lines from buffer {buf}
-dictwatcheradd({dict}, {pattern}, {callback})
-				Start watching a dictionary
-dictwatcherdel({dict}, {pattern}, {callback})
-				Stop watching a dictionary
-did_filetype()			Number	|TRUE| if FileType autocommand event used
-diff_filler({lnum})		Number	diff filler lines about {lnum}
-diff_hlID({lnum}, {col})	Number	diff highlighting at {lnum}/{col}
-digraph_get({chars})		String	get the |digraph| of {chars}
-digraph_getlist([{listall}])	List	get all |digraph|s
-digraph_set({chars}, {digraph})	Boolean	register |digraph|
-digraph_setlist({digraphlist})	Boolean	register multiple |digraph|s
-empty({expr})			Number	|TRUE| if {expr} is empty
-environ()			Dict	return environment variables
-escape({string}, {chars})	String	escape {chars} in {string} with '\'
-eval({string})			any	evaluate {string} into its value
-eventhandler()			Number	|TRUE| if inside an event handler
-executable({expr})		Number	1 if executable {expr} exists
-execute({command})		String	execute and capture output of {command}
-exepath({expr})			String	full path of the command {expr}
-exists({expr})			Number	|TRUE| if {expr} exists
-exp({expr})			Float	exponential of {expr}
-expand({expr} [, {nosuf} [, {list}]])
-				any	expand special keywords in {expr}
-expandcmd({string} [, {options}])
-				String	expand {string} like with `:edit`
-extend({expr1}, {expr2} [, {expr3}])
-				List/Dict insert items of {expr2} into {expr1}
-extendnew({expr1}, {expr2} [, {expr3}])
-				List/Dict like |extend()| but creates a new
-					List or Dictionary
-feedkeys({string} [, {mode}])	Number	add key sequence to typeahead buffer
-filereadable({file})		Number	|TRUE| if {file} is a readable file
-filewritable({file})		Number	|TRUE| if {file} is a writable file
-filter({expr1}, {expr2})	List/Dict  remove items from {expr1} where
-					{expr2} is 0
-finddir({name} [, {path} [, {count}]])
-				String	find directory {name} in {path}
-findfile({name} [, {path} [, {count}]])
-				String	find file {name} in {path}
-flatten({list} [, {maxdepth}])	List	flatten {list} up to {maxdepth} levels
-flattennew({list} [, {maxdepth}])
-				List	flatten a copy of {list}
-float2nr({expr})		Number	convert Float {expr} to a Number
-floor({expr})			Float	round {expr} down
-fmod({expr1}, {expr2})		Float	remainder of {expr1} / {expr2}
-fnameescape({fname})		String	escape special characters in {fname}
-fnamemodify({fname}, {mods})	String	modify file name
-foldclosed({lnum})		Number	first line of fold at {lnum} if closed
-foldclosedend({lnum})		Number	last line of fold at {lnum} if closed
-foldlevel({lnum})		Number	fold level at {lnum}
-foldtext()			String	line displayed for closed fold
-foldtextresult({lnum})		String	text for closed fold at {lnum}
-fullcommand({name})		String	get full command from {name}
-funcref({name} [, {arglist}] [, {dict}])
-				Funcref	reference to function {name}
-function({name} [, {arglist}] [, {dict}])
-				Funcref	named reference to function {name}
-garbagecollect([{atexit}])	none	free memory, breaking cyclic references
-get({list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
-get({dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
-get({func}, {what})		any	get property of funcref/partial {func}
-getbufinfo([{buf}])		List	information about buffers
-getbufline({buf}, {lnum} [, {end}])
-				List	lines {lnum} to {end} of buffer {buf}
-getbufoneline({buf}, {lnum})	String	line {lnum} of buffer {buf}
-getbufvar({buf}, {varname} [, {def}])
-				any	variable {varname} in buffer {buf}
-getcellwidths()			List	get character cell width overrides
-getchangelist([{buf}])		List	list of change list items
-getchar([expr])			Number or String
-					get one character from the user
-getcharmod()			Number	modifiers for the last typed character
-getcharpos({expr})		List	position of cursor, mark, etc.
-getcharsearch()			Dict	last character search
-getcharstr([expr])		String	get one character from the user
-getcmdcompltype()		String	return the type of the current
-					command-line completion
-getcmdline()			String	return the current command-line
-getcmdpos()			Number	return cursor position in command-line
-getcmdscreenpos()		Number	return cursor screen position in
-					command-line
-getcmdtype()			String	return current command-line type
-getcmdwintype()			String	return current command-line window type
-getcompletion({pat}, {type} [, {filtered}])
-				List	list of cmdline completion matches
-getcurpos([{winnr}])		List	position of the cursor
-getcursorcharpos([{winnr}])	List	character position of the cursor
-getcwd([{winnr} [, {tabnr}]])	String	get the current working directory
-getenv({name})			String	return environment variable
-getfontname([{name}])		String	name of font being used
-getfperm({fname})		String	file permissions of file {fname}
-getfsize({fname})		Number	size in bytes of file {fname}
-getftime({fname})		Number	last modification time of file
-getftype({fname})		String	description of type of file {fname}
-getjumplist([{winnr} [, {tabnr}]])
-				List	list of jump list items
-getline({lnum})			String	line {lnum} of current buffer
-getline({lnum}, {end})		List	lines {lnum} to {end} of current buffer
-getloclist({nr})		List	list of location list items
-getloclist({nr}, {what})	Dict	get specific location list properties
-getmarklist([{buf}])		List	list of global/local marks
-getmatches([{win}])		List	list of current matches
-getmousepos()			Dict	last known mouse position
-getpid()			Number	process ID of Vim
-getpos({expr})			List	position of cursor, mark, etc.
-getqflist()			List	list of quickfix items
-getqflist({what})		Dict	get specific quickfix list properties
-getreg([{regname} [, 1 [, {list}]]])
-				String or List   contents of a register
-getreginfo([{regname}])		Dict	information about a register
-getregtype([{regname}])		String	type of a register
-getscriptinfo([{opts}])		List	list of sourced scripts
-gettabinfo([{expr}])		List	list of tab pages
-gettabvar({nr}, {varname} [, {def}])
-				any	variable {varname} in tab {nr} or {def}
-gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
-				any	{name} in {winnr} in tab page {tabnr}
-gettagstack([{nr}])		Dict	get the tag stack of window {nr}
-gettext({text})			String	lookup translation of {text}
-getwininfo([{winid}])		List	list of info about each window
-getwinpos([{timeout}])		List	X and Y coord in pixels of Vim window
-getwinposx()			Number	X coord in pixels of Vim window
-getwinposy()			Number	Y coord in pixels of Vim window
-getwinvar({nr}, {varname} [, {def}])
-				any	variable {varname} in window {nr}
-glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])
-				any	expand file wildcards in {expr}
-glob2regpat({expr})		String	convert a glob pat into a search pat
-globpath({path}, {expr} [, {nosuf} [, {list} [, {alllinks}]]])
-				String	do glob({expr}) for all dirs in {path}
-has({feature})			Number	|TRUE| if feature {feature} supported
-has_key({dict}, {key})		Number	|TRUE| if {dict} has entry {key}
-haslocaldir([{winnr} [, {tabnr}]])
-				Number	|TRUE| if the window executed |:lcd| or
-					the tab executed |:tcd|
-hasmapto({what} [, {mode} [, {abbr}]])
-				Number	|TRUE| if mapping to {what} exists
-histadd({history}, {item})	Number	add an item to a history
-histdel({history} [, {item}])	Number	remove an item from a history
-histget({history} [, {index}])	String	get the item {index} from a history
-histnr({history})		Number	highest index of a history
-hlID({name})			Number	syntax ID of highlight group {name}
-hlexists({name})		Number	|TRUE| if highlight group {name} exists
-hostname()			String	name of the machine Vim is running on
-iconv({expr}, {from}, {to})	String	convert encoding of {expr}
-indent({lnum})			Number	indent of line {lnum}
-index({object}, {expr} [, {start} [, {ic}]])
-				Number	index in {object} where {expr} appears
-indexof({object}, {expr} [, {opts}]])
-				Number	index in {object} where {expr} is true
-input({prompt} [, {text} [, {completion}]])
-				String	get input from the user
-inputlist({textlist})		Number	let the user pick from a choice list
-inputrestore()			Number	restore typeahead
-inputsave()			Number	save and clear typeahead
-inputsecret({prompt} [, {text}])
-				String	like input() but hiding the text
-insert({object}, {item} [, {idx}])
-				List	insert {item} in {object} [before {idx}]
-interrupt()			none	interrupt script execution
-invert({expr})			Number	bitwise invert
-isdirectory({directory})	Number	|TRUE| if {directory} is a directory
-isinf({expr})			Number	determine if {expr} is infinity value
-					(positive or negative)
-islocked({expr})		Number	|TRUE| if {expr} is locked
-isnan({expr})			Number	|TRUE| if {expr} is NaN
-id({expr})			String	identifier of the container
-items({dict})			List	key-value pairs in {dict}
-jobpid({id})			Number	Returns pid of a job.
-jobresize({id}, {width}, {height})
-				Number	Resize pseudo terminal window of a job
-jobstart({cmd} [, {opts}])	Number	Spawns {cmd} as a job
-jobstop({id})			Number	Stops a job
-jobwait({ids} [, {timeout}])	Number	Wait for a set of jobs
-join({list} [, {sep}])		String	join {list} items into one String
-json_decode({expr})		any	Convert {expr} from JSON
-json_encode({expr})		String	Convert {expr} to JSON
-keys({dict})			List	keys in {dict}
-keytrans({string})		String	translate internal keycodes to a form
-					that can be used by |:map|
-len({expr})			Number	the length of {expr}
-libcall({lib}, {func}, {arg})	String	call {func} in library {lib} with {arg}
-libcallnr({lib}, {func}, {arg})	Number	idem, but return a Number
-line({expr} [, {winid}])	Number	line nr of cursor, last line or mark
-line2byte({lnum})		Number	byte count of line {lnum}
-lispindent({lnum})		Number	Lisp indent for line {lnum}
-list2blob({list})		Blob	turn {list} of numbers into a Blob
-list2str({list} [, {utf8}])	String	turn {list} of numbers into a String
-localtime()			Number	current time
-log({expr})			Float	natural logarithm (base e) of {expr}
-log10({expr})			Float	logarithm of Float {expr} to base 10
-luaeval({expr} [, {expr}])	any	evaluate |Lua| expression
-map({expr1}, {expr2})		List/Dict  change each item in {expr1} to {expr}
-maparg({name} [, {mode} [, {abbr} [, {dict}]]])
-				String or Dict
-					rhs of mapping {name} in mode {mode}
-mapcheck({name} [, {mode} [, {abbr}]])
-				String	check for mappings matching {name}
-mapset({mode}, {abbr}, {dict})
-				none	restore mapping from |maparg()| result
-match({expr}, {pat} [, {start} [, {count}]])
-				Number	position where {pat} matches in {expr}
-matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
-				Number	highlight {pattern} with {group}
-matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
-				Number	highlight positions with {group}
-matcharg({nr})			List	arguments of |:match|
-matchdelete({id} [, {win}])	Number	delete match identified by {id}
-matchend({expr}, {pat} [, {start} [, {count}]])
-				Number	position where {pat} ends in {expr}
-matchfuzzy({list}, {str} [, {dict}])
-				List	fuzzy match {str} in {list}
-matchfuzzypos({list}, {str} [, {dict}])
-				List	fuzzy match {str} in {list}
-matchlist({expr}, {pat} [, {start} [, {count}]])
-				List	match and submatches of {pat} in {expr}
-matchstr({expr}, {pat} [, {start} [, {count}]])
-				String	{count}th match of {pat} in {expr}
-matchstrpos({expr}, {pat} [, {start} [, {count}]])
-				List	{count}th match of {pat} in {expr}
-max({expr})			Number	maximum value of items in {expr}
-menu_get({path} [, {modes}])	List	description of |menus| matched by {path}
-menu_info({name} [, {mode}])	Dict	get menu item information
-min({expr})			Number	minimum value of items in {expr}
-mkdir({name} [, {flags} [, {prot}]])
-				Number	create directory {name}
-mode([expr])			String	current editing mode
-msgpackdump({list} [, {type}])	List/Blob  dump objects to msgpack
-msgpackparse({data})		List	parse msgpack to a list of objects
-nextnonblank({lnum})		Number	line nr of non-blank line >= {lnum}
-nr2char({expr} [, {utf8}])	String	single char with ASCII/UTF-8 value {expr}
-nvim_...({args}...)		any	call nvim |api| functions
-or({expr}, {expr})		Number	bitwise OR
-pathshorten({expr} [, {len}])	String	shorten directory names in a path
-perleval({expr})		any	evaluate |perl| expression
-pow({x}, {y})			Float	{x} to the power of {y}
-prevnonblank({lnum})		Number	line nr of non-blank line <= {lnum}
-printf({fmt}, {expr1}...)	String	format text
-prompt_getprompt({buf})		String	get prompt text
-prompt_setcallback({buf}, {expr}) none	set prompt callback function
-prompt_setinterrupt({buf}, {text}) none	set prompt interrupt function
-prompt_setprompt({buf}, {text}) none	set prompt text
-pum_getpos()			Dict	position and size of pum if visible
-pumvisible()			Number	whether popup menu is visible
-py3eval({expr})			any	evaluate |python3| expression
-pyeval({expr})			any	evaluate |Python| expression
-pyxeval({expr})			any	evaluate |python_x| expression
-rand([{expr}])			Number	get pseudo-random number
-range({expr} [, {max} [, {stride}]])
-				List	items from {expr} to {max}
-readblob({fname} [, {offset} [, {size}]])
-				Blob	read a |Blob| from {fname}
-readdir({dir} [, {expr}])	List	file names in {dir} selected by {expr}
-readfile({fname} [, {type} [, {max}]])
-				List	get list of lines from file {fname}
-reduce({object}, {func} [, {initial}])
-				any	reduce {object} using {func}
-reg_executing()			String	get the executing register name
-reg_recorded()			String	get the last recorded register name
-reg_recording()			String	get the recording register name
-reltime([{start} [, {end}]])	List	get time value
-reltimefloat({time})		Float	turn the time value into a Float
-reltimestr({time})		String	turn time value into a String
-remove({list}, {idx} [, {end}])	any/List
-					remove items {idx}-{end} from {list}
-remove({blob}, {idx} [, {end}])	Number/Blob
-					remove bytes {idx}-{end} from {blob}
-remove({dict}, {key})		any	remove entry {key} from {dict}
-rename({from}, {to})		Number	rename (move) file from {from} to {to}
-repeat({expr}, {count})		List/Blob/String
-					repeat {expr} {count} times
-resolve({filename})		String	get filename a shortcut points to
-reverse({list})			List	reverse {list} in-place
-round({expr})			Float	round off {expr}
-rubyeval({expr})		any	evaluate |Ruby| expression
-rpcnotify({channel}, {event} [, {args}...])
-				Sends an |RPC| notification to {channel}
-rpcrequest({channel}, {method} [, {args}...])
-				Sends an |RPC| request to {channel}
-screenattr({row}, {col})	Number	attribute at screen position
-screenchar({row}, {col})	Number	character at screen position
-screenchars({row}, {col})	List	List of characters at screen position
-screencol()			Number	current cursor column
-screenpos({winid}, {lnum}, {col}) Dict	screen row and col of a text character
-screenrow()			Number	current cursor row
-screenstring({row}, {col})	String	characters at screen position
-search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
-				Number	search for {pattern}
-searchcount([{options}])	Dict	Get or update the last search count
-searchdecl({name} [, {global} [, {thisblock}]])
-				Number	search for variable declaration
-searchpair({start}, {middle}, {end} [, {flags} [, {skip} [...]]])
-				Number	search for other end of start/end pair
-searchpairpos({start}, {middle}, {end} [, {flags} [, {skip} [...]]])
-				List	search for other end of start/end pair
-searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
-				List	search for {pattern}
-serverlist()			String	get a list of available servers
-setbufline({expr}, {lnum}, {text})
-				Number	set line {lnum} to {text} in buffer
-					{expr}
-setbufvar({buf}, {varname}, {val})	set {varname} in buffer {buf} to {val}
-setcellwidths({list})		none	set character cell width overrides
-setcharpos({expr}, {list})	Number	set the {expr} position to {list}
-setcharsearch({dict})		Dict	set character search from {dict}
-setcmdline({str} [, {pos}])	Number	set command-line
-setcmdpos({pos})		Number	set cursor position in command-line
-setcursorcharpos({list})	Number	move cursor to position in {list}
-setenv({name}, {val})		none	set environment variable
-setfperm({fname}, {mode}	Number	set {fname} file permissions to {mode}
-setline({lnum}, {line})		Number	set line {lnum} to {line}
-setloclist({nr}, {list} [, {action}])
-				Number	modify location list using {list}
-setloclist({nr}, {list}, {action}, {what})
-				Number	modify specific location list props
-setmatches({list} [, {win}])	Number	restore a list of matches
-setpos({expr}, {list})		Number	set the {expr} position to {list}
-setqflist({list} [, {action}])	Number	modify quickfix list using {list}
-setqflist({list}, {action}, {what})
-				Number	modify specific quickfix list props
-setreg({n}, {v} [, {opt}])	Number	set register to value and type
-settabvar({nr}, {varname}, {val})	set {varname} in tab page {nr} to {val}
-settabwinvar({tabnr}, {winnr}, {varname}, {val})    set {varname} in window
-					{winnr} in tab page {tabnr} to {val}
-settagstack({nr}, {dict} [, {action}])
-				Number	modify tag stack using {dict}
-setwinvar({nr}, {varname}, {val})	set {varname} in window {nr} to {val}
-sha256({string})		String	SHA256 checksum of {string}
-shellescape({string} [, {special}])
-				String	escape {string} for use as shell
-					command argument
-shiftwidth([{col}])		Number	effective value of 'shiftwidth'
-sign_define({name} [, {dict}])	Number	define or update a sign
-sign_define({list})		List	define or update a list of signs
-sign_getdefined([{name}])	List	get a list of defined signs
-sign_getplaced([{buf} [, {dict}]])
-				List	get a list of placed signs
-sign_jump({id}, {group}, {buf})
-				Number	jump to a sign
-sign_place({id}, {group}, {name}, {buf} [, {dict}])
-				Number	place a sign
-sign_placelist({list})		List	place a list of signs
-sign_undefine([{name}])		Number	undefine a sign
-sign_undefine({list})		List	undefine a list of signs
-sign_unplace({group} [, {dict}])
-				Number	unplace a sign
-sign_unplacelist({list})	List	unplace a list of signs
-simplify({filename})		String	simplify filename as much as possible
-sin({expr})			Float	sine of {expr}
-sinh({expr})			Float	hyperbolic sine of {expr}
-slice({expr}, {start} [, {end}])  String, List or Blob
-					slice of a String, List or Blob
-sockconnect({mode}, {address} [, {opts}])
-				Number	Connects to socket
-sort({list} [, {func} [, {dict}]])
-				List	sort {list}, using {func} to compare
-soundfold({word})		String	sound-fold {word}
-spellbadword()			String	badly spelled word at cursor
-spellsuggest({word} [, {max} [, {capital}]])
-				List	spelling suggestions
-split({expr} [, {pat} [, {keepempty}]])
-				List	make |List| from {pat} separated {expr}
-sqrt({expr})			Float	square root of {expr}
-srand([{expr}])			List	get seed for |rand()|
-stdioopen({dict})		Number	open stdio in a headless instance.
-stdpath({what})			String/List  returns the standard path(s) for {what}
-str2float({expr} [, {quoted}])	Float	convert String to Float
-str2list({expr} [, {utf8}])	List	convert each character of {expr} to
-					ASCII/UTF-8 value
-str2nr({expr} [, {base} [, {quoted}]])
-				Number	convert String to Number
-strcharlen({expr})		Number	character length of the String {expr}
-strcharpart({str}, {start} [, {len} [, {skipcc}]])
-				String	{len} characters of {str} at
-					character {start}
-strchars({expr} [, {skipcc}])	Number	character count of the String {expr}
-strdisplaywidth({expr} [, {col}]) Number display length of the String {expr}
-strftime({format} [, {time}])	String	format time with a specified format
-strgetchar({str}, {index})	Number	get char {index} from {str}
-stridx({haystack}, {needle} [, {start}])
-				Number	index of {needle} in {haystack}
-string({expr})			String	String representation of {expr} value
-strlen({expr})			Number	length of the String {expr}
-strpart({str}, {start} [, {len} [, {chars}]])
-				String	{len} bytes/chars of {str} at
-					byte {start}
-strptime({format}, {timestring})
-				Number	Convert {timestring} to unix timestamp
-strridx({haystack}, {needle} [, {start}])
-				Number	last index of {needle} in {haystack}
-strtrans({expr})		String	translate string to make it printable
-strutf16len({string} [, {countcc}])
-				Number	number of UTF-16 code units in {string}
-strwidth({expr})		Number	display cell length of the String {expr}
-submatch({nr} [, {list}])	String or List
-					specific match in ":s" or substitute()
-substitute({expr}, {pat}, {sub}, {flags})
-				String	all {pat} in {expr} replaced with {sub}
-swapfilelist()			List	swap files found in 'directory'
-swapinfo({fname})		Dict	information about swap file {fname}
-swapname({buf})			String	swap file of buffer {buf}
-synID({lnum}, {col}, {trans})	Number	syntax ID at {lnum} and {col}
-synIDattr({synID}, {what} [, {mode}])
-				String	attribute {what} of syntax ID {synID}
-synIDtrans({synID})		Number	translated syntax ID of {synID}
-synconcealed({lnum}, {col})	List	info about concealing
-synstack({lnum}, {col})	List	stack of syntax IDs at {lnum} and {col}
-system({cmd} [, {input}])	String	output of shell command/filter {cmd}
-systemlist({cmd} [, {input}])	List	output of shell command/filter {cmd}
-tabpagebuflist([{arg}])		List	list of buffer numbers in tab page
-tabpagenr([{arg}])		Number	number of current or last tab page
-tabpagewinnr({tabarg} [, {arg}])
-				Number	number of current window in tab page
-tagfiles()			List	tags files used
-taglist({expr} [, {filename}])	List	list of tags matching {expr}
-tan({expr})			Float	tangent of {expr}
-tanh({expr})			Float	hyperbolic tangent of {expr}
-tempname()			String	name for a temporary file
-test_garbagecollect_now()	none	free memory right now for testing
-timer_info([{id}])		List	information about timers
-timer_pause({id}, {pause})	none	pause or unpause a timer
-timer_start({time}, {callback} [, {options}])
-				Number	create a timer
-timer_stop({timer})		none	stop a timer
-timer_stopall()			none	stop all timers
-tolower({expr})			String	the String {expr} switched to lowercase
-toupper({expr})			String	the String {expr} switched to uppercase
-tr({src}, {fromstr}, {tostr})	String	translate chars of {src} in {fromstr}
-					to chars in {tostr}
-trim({text} [, {mask} [, {dir}]])
-				String	trim characters in {mask} from {text}
-trunc({expr})			Float	truncate Float {expr}
-type({name})			Number	type of variable {name}
-undofile({name})		String	undo file name for {name}
-undotree()			List	undo file tree
-uniq({list} [, {func} [, {dict}]])
-				List	remove adjacent duplicates from a list
-utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
-				Number	UTF-16 index of byte {idx} in {string}
-values({dict})			List	values in {dict}
-virtcol({expr} [, {list}])	Number or List
-					screen column of cursor or mark
-virtcol2col({winid}, {lnum}, {col})
-				Number  byte index of a character on screen
-visualmode([expr])		String	last visual mode used
-wait({timeout}, {condition} [, {interval}])
-				Number	Wait until {condition} is satisfied
-wildmenumode()			Number	whether 'wildmenu' mode is active
-win_execute({id}, {command} [, {silent}])
-				String	execute {command} in window {id}
-win_findbuf({bufnr})		List	find windows containing {bufnr}
-win_getid([{win} [, {tab}]])	Number	get |window-ID| for {win} in {tab}
-win_gettype([{nr}])		String	type of window {nr}
-win_gotoid({expr})		Number	go to |window-ID| {expr}
-win_id2tabwin({expr})		List	get tab and window nr from |window-ID|
-win_id2win({expr})		Number	get window nr from |window-ID|
-win_move_separator({nr})	Number	move window vertical separator
-win_move_statusline({nr})	Number	move window status line
-win_screenpos({nr})		List	get screen position of window {nr}
-win_splitmove({nr}, {target} [, {options}])
-				Number	move window {nr} to split of {target}
-winbufnr({nr})			Number	buffer number of window {nr}
-wincol()			Number	window column of the cursor
-windowsversion()		String	MS-Windows OS version
-winheight({nr})			Number	height of window {nr}
-winlayout([{tabnr}])		List	layout of windows in tab {tabnr}
-winline()			Number	window line of the cursor
-winnr([{expr}])			Number	number of current window
-winrestcmd()			String	returns command to restore window sizes
-winrestview({dict})		none	restore view of current window
-winsaveview()			Dict	save view of current window
-winwidth({nr})			Number	width of window {nr}
-wordcount()			Dict	get byte/char/word statistics
-writefile({object}, {fname} [, {flags}])
-				Number	write |Blob| or |List| of lines to file
-xor({expr}, {expr})		Number	bitwise XOR
-
-==============================================================================
-2. Details					*builtin-function-details*
-
-Not all functions are here, some have been moved to a help file covering the
-specific functionality.
+1. Details					*builtin-function-details*
 
 abs({expr})							*abs()*
 		Return the absolute value of {expr}.  When {expr} evaluates to
@@ -629,7 +44,7 @@ acos({expr})							*acos()*
 		Can also be used as a |method|: >
 			Compute()->acos()
 
-add({object}, {expr})					*add()*
+add({object}, {expr})						*add()*
 		Append the item {expr} to |List| or |Blob| {object}.  Returns
 		the resulting |List| or |Blob|.  Examples: >
 			:let alist = add([1, 2, 3], item)
@@ -643,7 +58,7 @@ add({object}, {expr})					*add()*
 		Can also be used as a |method|: >
 			mylist->add(val1)->add(val2)
 
-and({expr}, {expr})					*and()*
+and({expr}, {expr})						*and()*
 		Bitwise AND on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `or()` and `xor()`.
@@ -674,7 +89,7 @@ append({lnum}, {text})					*append()*
 <		Can also be used as a |method| after a List: >
 			mylist->append(lnum)
 
-appendbufline({buf}, {lnum}, {text})			*appendbufline()*
+appendbufline({buf}, {lnum}, {text})		*appendbufline()*
 		Like |append()| but append the text in buffer {expr}.
 
 		This function works only for loaded buffers. First call
@@ -696,7 +111,7 @@ appendbufline({buf}, {lnum}, {text})			*appendbufline()*
 		Can also be used as a |method| after a List: >
 			mylist->appendbufline(buf, lnum)
 
-argc([{winid}])					*argc()*
+argc([{winid}])						*argc()*
 		The result is the number of files in the argument list.  See
 		|arglist|.
 		If {winid} is not supplied, the argument list of the current
@@ -706,12 +121,11 @@ argc([{winid}])					*argc()*
 		list is used: either the window number or the window ID.
 		Returns -1 if the {winid} argument is invalid.
 
-							*argidx()*
-argidx()	The result is the current index in the argument list.  0 is
+argidx()							*argidx()*
+		The result is the current index in the argument list.  0 is
 		the first file.  argc() - 1 is the last one.  See |arglist|.
 
-							*arglistid()*
-arglistid([{winnr} [, {tabnr}]])
+arglistid([{winnr} [, {tabnr}]])			*arglistid()*
 		Return the argument list ID.  This is a number which
 		identifies the argument list being used.  Zero is used for the
 		global argument list.  See |arglist|.
@@ -723,16 +137,15 @@ arglistid([{winnr} [, {tabnr}]])
 		page.
 		{winnr} can be the window number or the |window-ID|.
 
-							*argv()*
-argv([{nr} [, {winid}]])
+argv([{nr} [, {winid}]])					*argv()*
 		The result is the {nr}th file in the argument list.  See
 		|arglist|.  "argv(0)" is the first one.  Example: >
-	:let i = 0
-	:while i < argc()
-	:  let f = escape(fnameescape(argv(i)), '.')
-	:  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
-	:  let i = i + 1
-	:endwhile
+			:let i = 0
+			:while i < argc()
+			:  let f = escape(fnameescape(argv(i)), '.')
+			:  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
+			:  let i = i + 1
+			:endwhile
 <		Without the {nr} argument, or when {nr} is -1, a |List| with
 		the whole |arglist| is returned.
 
@@ -743,7 +156,7 @@ argv([{nr} [, {winid}]])
 		the argument list.  Returns an empty List if the {winid}
 		argument is invalid.
 
-asin({expr})						*asin()*
+asin({expr})							*asin()*
 		Return the arc sine of {expr} measured in radians, as a |Float|
 		in the range of [-pi/2, pi/2].
 		{expr} must evaluate to a |Float| or a |Number| in the range
@@ -758,12 +171,192 @@ asin({expr})						*asin()*
 
 		Can also be used as a |method|: >
 			Compute()->asin()
+<
+
+assert_beeps({cmd})					*assert_beeps()*
+		Run {cmd} and add an error message to |v:errors| if it does
+		NOT produce a beep or visual bell.
+		Also see |assert_fails()|, |assert_nobeep()| and
+		|assert-return|.
 
+		Can also be used as a |method|: >
+			GetCmd()->assert_beeps()
+<
 
-assert_ functions are documented here: |assert-functions-details|
+assert_equal({expected}, {actual} [, {msg}])		*assert_equal()*
+		When {expected} and {actual} are not equal an error message is
+		added to |v:errors| and 1 is returned.  Otherwise zero is
+		returned. |assert-return|
+		The error is in the form "Expected {expected} but got
+		{actual}".  When {msg} is present it is prefixed to that.
 
+		There is no automatic conversion, the String "4" is different
+		from the Number 4.  And the number 4 is different from the
+		Float 4.0.  The value of 'ignorecase' is not used here, case
+		always matters.
+		Example: >
+			assert_equal('foo', 'bar')
+<		Will result in a string to be added to |v:errors|:
+			test.vim line 12: Expected 'foo' but got 'bar' ~
+
+		Can also be used as a |method|: >
+			mylist->assert_equal([1, 2, 3])
+
+assert_equalfile({fname-one}, {fname-two})	*assert_equalfile()*
+		When the files {fname-one} and {fname-two} do not contain
+		exactly the same text an error message is added to |v:errors|.
+		Also see |assert-return|.
+		When {fname-one} or {fname-two} does not exist the error will
+		mention that.
+
+		Can also be used as a |method|: >
+			GetLog()->assert_equalfile('expected.log')
+
+assert_exception({error} [, {msg}])		*assert_exception()*
+		When v:exception does not contain the string {error} an error
+		message is added to |v:errors|.  Also see |assert-return|.
+		This can be used to assert that a command throws an exception.
+		Using the error number, followed by a colon, avoids problems
+		with translations: >
+			try
+			  commandthatfails
+			  call assert_false(1, 'command should have failed')
+			catch
+			  call assert_exception('E492:')
+			endtry
+<
+
+						*assert_fails()*
+assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
+		Run {cmd} and add an error message to |v:errors| if it does
+		NOT produce an error or when {error} is not found in the
+		error message.  Also see |assert-return|.
+
+		When {error} is a string it must be found literally in the
+		first reported error. Most often this will be the error code,
+		including the colon, e.g. "E123:". >
+			assert_fails('bad cmd', 'E987:')
+<
+		When {error} is a |List| with one or two strings, these are
+		used as patterns.  The first pattern is matched against the
+		first reported error: >
+			assert_fails('cmd', ['E987:.*expected bool'])
+<		The second pattern, if present, is matched against the last
+		reported error.  To only match the last error use an empty
+		string for the first error: >
+			assert_fails('cmd', ['', 'E987:'])
+<
+		If {msg} is empty then it is not used.  Do this to get the
+		default message when passing the {lnum} argument.
+
+		When {lnum} is present and not negative, and the {error}
+		argument is present and matches, then this is compared with
+		the line number at which the error was reported. That can be
+		the line number in a function or in a script.
+
+		When {context} is present it is used as a pattern and matched
+		against the context (script name or function name) where
+		{lnum} is located in.
+
+		Note that beeping is not considered an error, and some failing
+		commands only beep.  Use |assert_beeps()| for those.
+
+		Can also be used as a |method|: >
+			GetCmd()->assert_fails('E99:')
+
+assert_false({actual} [, {msg}])			*assert_false()*
+		When {actual} is not false an error message is added to
+		|v:errors|, like with |assert_equal()|.
+		The error is in the form "Expected False but got {actual}".
+		When {msg} is present it is prepended to that.
+		Also see |assert-return|.
+
+		A value is false when it is zero. When {actual} is not a
+		number the assert fails.
+
+		Can also be used as a |method|: >
+			GetResult()->assert_false()
+
+assert_inrange({lower}, {upper}, {actual} [, {msg}])	*assert_inrange()*
+		This asserts number and |Float| values.  When {actual}  is lower
+		than {lower} or higher than {upper} an error message is added
+		to |v:errors|.  Also see |assert-return|.
+		The error is in the form "Expected range {lower} - {upper},
+		but got {actual}".  When {msg} is present it is prefixed to
+		that.
+
+assert_match({pattern}, {actual} [, {msg}])		*assert_match()*
+		When {pattern} does not match {actual} an error message is
+		added to |v:errors|.  Also see |assert-return|.
+		The error is in the form "Pattern {pattern} does not match
+		{actual}".  When {msg} is present it is prefixed to that.
+
+		{pattern} is used as with |expr-=~|: The matching is always done
+		like 'magic' was set and 'cpoptions' is empty, no matter what
+		the actual value of 'magic' or 'cpoptions' is.
+
+		{actual} is used as a string, automatic conversion applies.
+		Use "^" and "$" to match with the start and end of the text.
+		Use both to match the whole text.
 
-atan({expr})						*atan()*
+		Example: >
+			assert_match('^f.*o$', 'foobar')
+<		Will result in a string to be added to |v:errors|:
+			test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
+
+		Can also be used as a |method|: >
+			getFile()->assert_match('foo.*')
+<
+
+assert_nobeep({cmd})				*assert_nobeep()*
+		Run {cmd} and add an error message to |v:errors| if it
+		produces a beep or visual bell.
+		Also see |assert_beeps()|.
+
+		Can also be used as a |method|: >
+			GetCmd()->assert_nobeep()
+<
+
+assert_notequal({expected}, {actual} [, {msg}])	*assert_notequal()*
+		The opposite of `assert_equal()`: add an error message to
+		|v:errors| when {expected} and {actual} are equal.
+		Also see |assert-return|.
+
+		Can also be used as a |method|: >
+			mylist->assert_notequal([1, 2, 3])
+
+<
+
+assert_notmatch({pattern}, {actual} [, {msg}])	*assert_notmatch()*
+		The opposite of `assert_match()`: add an error message to
+		|v:errors| when {pattern} matches {actual}.
+		Also see |assert-return|.
+
+		Can also be used as a |method|: >
+			getFile()->assert_notmatch('bar.*')
+<
+
+assert_report({msg})				*assert_report()*
+		Report a test failure directly, using String {msg}.
+		Always returns one.
+
+		Can also be used as a |method|: >
+			GetMessage()->assert_report()
+<
+
+assert_true({actual} [, {msg}])			*assert_true()*
+		When {actual} is not true an error message is added to
+		|v:errors|, like with |assert_equal()|.
+		Also see |assert-return|.
+		A value is |TRUE| when it is a non-zero number or |v:true|.
+		When {actual} is not a number or |v:true| the assert fails.
+		When {msg} is given it precedes the default message.
+
+		Can also be used as a |method|: >
+			GetResult()->assert_true()
+<
+
+atan({expr})							*atan()*
 		Return the principal value of the arc tangent of {expr}, in
 		the range [-pi/2, +pi/2] radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -803,8 +396,8 @@ blob2list({blob})					*blob2list()*
 		Can also be used as a |method|: >
 			GetBlob()->blob2list()
 <
-							*browse()*
-browse({save}, {title}, {initdir}, {default})
+
+browse({save}, {title}, {initdir}, {default})		*browse()*
 		Put up a file requester.  This only works when "has("browse")"
 		returns |TRUE| (only in some GUI versions).
 		The input fields are:
@@ -815,8 +408,7 @@ browse({save}, {title}, {initdir}, {default})
 		An empty string is returned when the "Cancel" button is hit,
 		something went wrong, or browsing is not possible.
 
-							*browsedir()*
-browsedir({title}, {initdir})
+browsedir({title}, {initdir})				*browsedir()*
 		Put up a directory requester.  This only works when
 		"has("browse")" returns |TRUE| (only in some GUI versions).
 		On systems where a directory browser is not supported a file
@@ -926,13 +518,13 @@ bufname([{buf}])						*bufname()*
 
 <		If the buffer doesn't exist, or doesn't have a name, an empty
 		string is returned. >
-	bufname("#")		alternate buffer name
-	bufname(3)		name of buffer 3
-	bufname("%")		name of current buffer
-	bufname("file2")	name of buffer where "file2" matches.
+			bufname("#")		alternate buffer name
+			bufname(3)		name of buffer 3
+			bufname("%")		name of current buffer
+			bufname("file2")	name of buffer where "file2" matches.
 <
-							*bufnr()*
-bufnr([{buf} [, {create}]])
+
+bufnr([{buf} [, {create}]])					*bufnr()*
 		The result is the number of a buffer, as it is displayed by
 		the `:ls` command.  For the use of {buf}, see |bufname()|
 		above.
@@ -955,7 +547,7 @@ bufwinid({buf})						*bufwinid()*
 		see |bufname()| above.  If buffer {buf} doesn't exist or
 		there is no such window, -1 is returned.  Example: >
 
-	echo "A window containing buffer 1 is " .. (bufwinid(1))
+			echo "A window containing buffer 1 is " .. (bufwinid(1))
 <
 		Only deals with the current tab page.  See |win_findbuf()| for
 		finding more.
@@ -969,7 +561,7 @@ bufwinnr({buf})						*bufwinnr()*
 		If buffer {buf} doesn't exist or there is no such window, -1
 		is returned.  Example: >
 
-	echo "A window containing buffer 1 is " .. (bufwinnr(1))
+			echo "A window containing buffer 1 is " .. (bufwinnr(1))
 
 <		The number can be used with |CTRL-W_w| and ":wincmd w"
 		|:wincmd|.
@@ -990,7 +582,7 @@ byte2line({byte})					*byte2line()*
 		Can also be used as a |method|: >
 			GetOffset()->byte2line()
 
-byteidx({expr}, {nr} [, {utf16}])			*byteidx()*
+byteidx({expr}, {nr} [, {utf16}])				*byteidx()*
 		Return byte index of the {nr}th character in the String
 		{expr}.  Use zero for the first character, it then returns
 		zero.
@@ -1053,6 +645,7 @@ call({func}, {arglist} [, {dict}])			*call()* *E699*
 
 		Can also be used as a |method|: >
 			GetFunc()->call([arg, arg], dict)
+<
 
 ceil({expr})							*ceil()*
 		Return the smallest integral value greater than or equal to
@@ -1070,15 +663,7 @@ ceil({expr})							*ceil()*
 
 		Can also be used as a |method|: >
 			Compute()->ceil()
-
-changenr()						*changenr()*
-		Return the number of the most recent change.  This is the same
-		number as what is displayed with |:undolist| and can be used
-		with the |:undo| command.
-		When a change was made it is the number of that change.  After
-		redo it is the number of the redone change.  After undo it is
-		one less than the number of the undone change.
-		Returns 0 if the undo list is empty.
+<
 
 chanclose({id} [, {stream}])				*chanclose()*
 		Close a channel or a specific stream associated with it.
@@ -1090,6 +675,15 @@ chanclose({id} [, {stream}])				*chanclose()*
 		For a socket, there is only one stream, and {stream} should be
 		omitted.
 
+changenr()						*changenr()*
+		Return the number of the most recent change.  This is the same
+		number as what is displayed with |:undolist| and can be used
+		with the |:undo| command.
+		When a change was made it is the number of that change.  After
+		redo it is the number of the redone change.  After undo it is
+		one less than the number of the undone change.
+		Returns 0 if the undo list is empty.
+
 chansend({id}, {data})					*chansend()*
 		Send data to channel {id}. For a job, it writes it to the
 		stdin of the process. For the stdio channel |channel-stdio|,
@@ -1108,8 +702,7 @@ chansend({id}, {data})					*chansend()*
 		was created with `"rpc":v:true` then the channel expects RPC
 		messages, use |rpcnotify()| and |rpcrequest()| instead.
 
-
-char2nr({string} [, {utf8}])					*char2nr()*
+char2nr({string} [, {utf8}])				*char2nr()*
 		Return Number value of the first char in {string}.
 		Examples: >
 			char2nr(" ")		returns 32
@@ -1138,7 +731,6 @@ charclass({string})					*charclass()*
 		The class is used in patterns and word motions.
 		Returns 0 if {string} is not a |String|.
 
-
 charcol({expr} [, {winid}])				*charcol()*
 		Same as |col()| but returns the character index of the column
 		position given with {expr} instead of the byte position.
@@ -1151,8 +743,8 @@ charcol({expr} [, {winid}])				*charcol()*
 <		Can also be used as a |method|: >
 			GetPos()->col()
 <
-							*charidx()*
-charidx({string}, {idx} [, {countcc} [, {utf16}]])
+
+charidx({string}, {idx} [, {countcc} [, {utf16}]])	*charidx()*
 		Return the character index of the byte at {idx} in {string}.
 		The index of the first character is zero.
 		If there are no multibyte characters the returned value is
@@ -1213,6 +805,7 @@ chdir({dir})						*chdir()*
 <		Can also be used as a |method|: >
 			GetDir()->chdir()
 <
+
 cindent({lnum})						*cindent()*
 		Get the amount of indent for line {lnum} according the C
 		indenting rules, as with 'cindent'.
@@ -1224,7 +817,7 @@ cindent({lnum})						*cindent()*
 		Can also be used as a |method|: >
 			GetLnum()->cindent()
 
-clearmatches([{win}])					*clearmatches()*
+clearmatches([{win}])				*clearmatches()*
 		Clears all matches previously defined for the current window
 		by |matchadd()| and the |:match| commands.
 		If {win} is specified, use the window with this number or
@@ -1233,6 +826,7 @@ clearmatches([{win}])					*clearmatches()*
 		Can also be used as a |method|: >
 			GetWin()->clearmatches()
 <
+
 col({expr} [, {winid}])					*col()*
 		The result is a Number, which is the byte index of the column
 		position given with {expr}.  The accepted positions are:
@@ -1294,14 +888,14 @@ complete({startcol}, {matches})			*complete()* *E785*
 		Insert mode completion.  The popup menu will appear if
 		specified, see |ins-completion-menu|.
 		Example: >
-	inoremap <F5> <C-R>=ListMonths()<CR>
-
-	func ListMonths()
-	  call complete(col('.'), ['January', 'February', 'March',
-		\ 'April', 'May', 'June', 'July', 'August', 'September',
-		\ 'October', 'November', 'December'])
-	  return ''
-	endfunc
+			inoremap <F5> <C-R>=ListMonths()<CR>
+
+			func ListMonths()
+			  call complete(col('.'), ['January', 'February', 'March',
+			    \ 'April', 'May', 'June', 'July', 'August', 'September',
+			    \ 'October', 'November', 'December'])
+			  return ''
+			endfunc
 <		This isn't very useful, but it shows how it works.  Note that
 		an empty string is returned to avoid a zero being inserted.
 
@@ -1309,7 +903,7 @@ complete({startcol}, {matches})			*complete()* *E785*
 		second argument: >
 			GetMatches()->complete(col('.'))
 
-complete_add({expr})				*complete_add()*
+complete_add({expr})					*complete_add()*
 		Add {expr} to the list of matches.  Only to be used by the
 		function specified with the 'completefunc' option.
 		Returns 0 for failure (empty string or out of memory),
@@ -1321,7 +915,7 @@ complete_add({expr})				*complete_add()*
 		Can also be used as a |method|: >
 			GetMoreMatches()->complete_add()
 
-complete_check()				*complete_check()*
+complete_check()					*complete_check()*
 		Check for a key typed while looking for completion matches.
 		This is to be used when looking for matches takes some time.
 		Returns |TRUE| when searching for matches is to be aborted,
@@ -1329,7 +923,6 @@ complete_check()				*complete_check()*
 		Only to be used by the function specified with the
 		'completefunc' option.
 
-
 complete_info([{what}])				*complete_info()*
 		Returns a |Dictionary| with information about Insert mode
 		completion.  See |ins-completion|.
@@ -1391,8 +984,8 @@ complete_info([{what}])				*complete_info()*
 <		Can also be used as a |method|: >
 			GetItems()->complete_info()
 <
-						*confirm()*
-confirm({msg} [, {choices} [, {default} [, {type}]]])
+
+confirm({msg} [, {choices} [, {default} [, {type}]]])	*confirm()*
 		confirm() offers the user a dialog, from which a choice can be
 		made.  It returns the number of the choice.  For the first
 		choice this is 1.
@@ -1447,8 +1040,9 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])
 		Can also be used as a |method|in: >
 			BuildMessage()->confirm("&Yes\n&No")
 <
-							*copy()*
-copy({expr})	Make a copy of {expr}.  For Numbers and Strings this isn't
+
+copy({expr})							*copy()*
+		Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
 		When {expr} is a |List| a shallow copy is created.  This means
 		that the original |List| can be changed without changing the
@@ -1459,7 +1053,7 @@ copy({expr})	Make a copy of {expr}.  For Numbers and Strings this isn't
 		Can also be used as a |method|: >
 			mylist->copy()
 
-cos({expr})						*cos()*
+cos({expr})							*cos()*
 		Return the cosine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
@@ -1472,7 +1066,7 @@ cos({expr})						*cos()*
 		Can also be used as a |method|: >
 			Compute()->cos()
 
-cosh({expr})						*cosh()*
+cosh({expr})							*cosh()*
 		Return the hyperbolic cosine of {expr} as a |Float| in the range
 		[1, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -1502,12 +1096,13 @@ count({comp}, {expr} [, {ic} [, {start}]])			*count()*
 		Can also be used as a |method|: >
 			mylist->count(val)
 <
-ctxget([{index}])					*ctxget()*
+
+ctxget([{index}])						*ctxget()*
 		Returns a |Dictionary| representing the |context| at {index}
 		from the top of the |context-stack| (see |context-dict|).
 		If {index} is not given, it is assumed to be 0 (i.e.: top).
 
-ctxpop()						*ctxpop()*
+ctxpop()							*ctxpop()*
 		Pops and restores the |context| at the top of the
 		|context-stack|.
 
@@ -1524,11 +1119,11 @@ ctxset({context} [, {index}])				*ctxset()*
 		{context} is a Dictionary with context data (|context-dict|).
 		If {index} is not given, it is assumed to be 0 (i.e.: top).
 
-ctxsize()						*ctxsize()*
+ctxsize()							*ctxsize()*
 		Returns the size of the |context-stack|.
 
-cursor({lnum}, {col} [, {off}])				*cursor()*
-cursor({list})
+cursor({lnum}, {col} [, {off}])
+cursor({list})						*cursor()*
 		Positions the cursor at the column (byte count) {col} in the
 		line {lnum}.  The first column is one.
 
@@ -1574,8 +1169,9 @@ debugbreak({pid})					*debugbreak()*
 
 		Can also be used as a |method|: >
 			GetPid()->debugbreak()
+<
 
-deepcopy({expr} [, {noref}])				*deepcopy()* *E698*
+deepcopy({expr} [, {noref}])			*deepcopy()* *E698*
 		Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
 		When {expr} is a |List| a full copy is created.  This means
@@ -1637,7 +1233,8 @@ deletebufline({buf}, {first} [, {last}])		*deletebufline()*
 		Can also be used as a |method|: >
 			GetBuffer()->deletebufline(1)
 <
-dictwatcheradd({dict}, {pattern}, {callback})		      *dictwatcheradd()*
+
+dictwatcheradd({dict}, {pattern}, {callback})	*dictwatcheradd()*
 		Adds a watcher to a dictionary. A dictionary watcher is
 		identified by three components:
 
@@ -1677,13 +1274,13 @@ dictwatcheradd({dict}, {pattern}, {callback})		      *dictwatcheradd()*
 		This function can be used by plugins to implement options with
 		validation and parsing logic.
 
-dictwatcherdel({dict}, {pattern}, {callback})		      *dictwatcherdel()*
+dictwatcherdel({dict}, {pattern}, {callback})	*dictwatcherdel()*
 		Removes a watcher added  with |dictwatcheradd()|. All three
 		arguments must match the ones passed to |dictwatcheradd()| in
 		order for the watcher to be successfully deleted.
 
-							*did_filetype()*
-did_filetype()	Returns |TRUE| when autocommands are being executed and the
+did_filetype()					*did_filetype()*
+		Returns |TRUE| when autocommands are being executed and the
 		FileType event has been triggered at least once.  Can be used
 		to avoid triggering the FileType event again in the scripts
 		that detect the file type. |FileType|
@@ -1721,7 +1318,7 @@ diff_hlID({lnum}, {col})				*diff_hlID()*
 			GetLnum()->diff_hlID(col)
 <
 
-digraph_get({chars})					*digraph_get()* *E1214*
+digraph_get({chars})				*digraph_get()* *E1214*
 		Return the digraph of {chars}.  This should be a string with
 		exactly two characters.  If {chars} are not just two
 		characters, or the digraph of {chars} does not exist, an error
@@ -1741,7 +1338,7 @@ digraph_get({chars})					*digraph_get()* *E1214*
 			GetChars()->digraph_get()
 <
 
-digraph_getlist([{listall}])				*digraph_getlist()*
+digraph_getlist([{listall}])			*digraph_getlist()*
 		Return a list of digraphs.  If the {listall} argument is given
 		and it is TRUE, return all digraphs, including the default
 		digraphs.  Otherwise, return only user-defined digraphs.
@@ -1759,7 +1356,7 @@ digraph_getlist([{listall}])				*digraph_getlist()*
 			GetNumber()->digraph_getlist()
 <
 
-digraph_set({chars}, {digraph})				*digraph_set()*
+digraph_set({chars}, {digraph})			*digraph_set()*
 		Add digraph {chars} to the list.  {chars} must be a string
 		with two characters.  {digraph} is a string with one UTF-8
 		encoded character.  *E1215*
@@ -1780,7 +1377,7 @@ digraph_set({chars}, {digraph})				*digraph_set()*
 			GetString()->digraph_set('あ')
 <
 
-digraph_setlist({digraphlist})				*digraph_setlist()*
+digraph_setlist({digraphlist})			*digraph_setlist()*
 		Similar to |digraph_set()| but this function can add multiple
 		digraphs at once.  {digraphlist} is a list composed of lists,
 		where each list contains two strings with {chars} and
@@ -1811,7 +1408,7 @@ empty({expr})						*empty()*
 		Can also be used as a |method|: >
 			mylist->empty()
 
-environ()						*environ()*
+environ()							*environ()*
 		Return all of environment variables as dictionary. You can
 		check if an environment variable exists like this: >
 			:echo has_key(environ(), 'HOME')
@@ -1819,7 +1416,7 @@ environ()						*environ()*
 		use this: >
 			:echo index(keys(environ()), 'HOME', 0, 1) != -1
 
-escape({string}, {chars})				*escape()*
+escape({string}, {chars})					*escape()*
 		Escape the characters in {chars} that occur in {string} with a
 		backslash.  Example: >
 			:echo escape('c:\program files\vim', ' \')
@@ -1830,8 +1427,9 @@ escape({string}, {chars})				*escape()*
 		Can also be used as a |method|: >
 			GetText()->escape(' \')
 <
-							*eval()*
-eval({string})	Evaluate {string} and return the result.  Especially useful to
+
+eval({string})						*eval()*
+		Evaluate {string} and return the result.  Especially useful to
 		turn the result of |string()| back into the original value.
 		This works for Numbers, Floats, Strings, Blobs and composites
 		of them.  Also works for |Funcref|s that refer to existing
@@ -1840,7 +1438,7 @@ eval({string})	Evaluate {string} and return the result.  Especially useful to
 		Can also be used as a |method|: >
 			argv->join()->eval()
 
-eventhandler()						*eventhandler()*
+eventhandler()					*eventhandler()*
 		Returns 1 when inside an event handler.  That is that Vim got
 		interrupted while waiting for the user to type a character,
 		e.g., when dropping a file on Vim.  This means interactive
@@ -1912,8 +1510,9 @@ exepath({expr})						*exepath()*
 		Can also be used as a |method|: >
 			GetCommand()->exepath()
 <
-							*exists()*
-exists({expr})	The result is a Number, which is |TRUE| if {expr} is
+
+exists({expr})						*exists()*
+		The result is a Number, which is |TRUE| if {expr} is
 		defined, zero otherwise.
 
 		For checking for a supported feature use |has()|.
@@ -1991,7 +1590,7 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is
 		future, thus don't count on it!
 		Working example: >
 			exists(":make")
-<		NOT working example: >
+		<NOT working example: >
 			exists(":make install")
 
 <		Note that the argument must be a string, not the name of the
@@ -2017,7 +1616,7 @@ exp({expr})							*exp()*
 		Can also be used as a |method|: >
 			Compute()->exp()
 
-expand({string} [, {nosuf} [, {list}]])				*expand()*
+expand({string} [, {nosuf} [, {list}]])			*expand()*
 		Expand wildcards and the following special keywords in
 		{string}.  'wildignorecase' applies.
 
@@ -2135,6 +1734,7 @@ expandcmd({string} [, {options}])			*expandcmd()*
 		Can also be used as a |method|: >
 			GetCommand()->expandcmd()
 <
+
 extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		{expr1} and {expr2} must be both |Lists| or both
 		|Dictionaries|.
@@ -2173,14 +1773,13 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 
 		Can also be used as a |method|: >
 			mylist->extend(otherlist)
-
+<
 
 extendnew({expr1}, {expr2} [, {expr3}])			*extendnew()*
 		Like |extend()| but instead of adding items to {expr1} a new
 		List or Dictionary is created and returned.  {expr1} remains
 		unchanged.
 
-
 feedkeys({string} [, {mode}])				*feedkeys()*
 		Characters in {string} are queued for processing as if they
 		come from a mapping or were typed by the user.
@@ -2307,7 +1906,7 @@ filter({expr1}, {expr2})					*filter()*
 		Can also be used as a |method|: >
 			mylist->filter(expr2)
 
-finddir({name} [, {path} [, {count}]])				*finddir()*
+finddir({name} [, {path} [, {count}]])			*finddir()*
 		Find directory {name} in {path}.  Supports both downwards and
 		upwards recursive directory searches.  See |file-searching|
 		for the syntax of {path}.
@@ -2328,7 +1927,7 @@ finddir({name} [, {path} [, {count}]])				*finddir()*
 		Can also be used as a |method|: >
 			GetName()->finddir()
 
-findfile({name} [, {path} [, {count}]])				*findfile()*
+findfile({name} [, {path} [, {count}]])			*findfile()*
 		Just like |finddir()|, but find a file instead of a directory.
 		Uses 'suffixesadd'.
 		Example: >
@@ -2339,7 +1938,7 @@ findfile({name} [, {path} [, {count}]])				*findfile()*
 		Can also be used as a |method|: >
 			GetName()->findfile()
 
-flatten({list} [, {maxdepth}])					*flatten()*
+flatten({list} [, {maxdepth}])				*flatten()*
 		Flatten {list} up to {maxdepth} levels.  Without {maxdepth}
 		the result is a |List| without nesting, as if {maxdepth} is
 		a very large number.
@@ -2361,11 +1960,11 @@ flatten({list} [, {maxdepth}])					*flatten()*
 		Can also be used as a |method|: >
 			mylist->flatten()
 <
+
 flattennew({list} [, {maxdepth}])			*flattennew()*
 		Like |flatten()| but first make a copy of {list}.
 
-
-float2nr({expr})					*float2nr()*
+float2nr({expr})						*float2nr()*
 		Convert {expr} to a Number by omitting the part after the
 		decimal point.
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -2390,7 +1989,7 @@ float2nr({expr})					*float2nr()*
 		Can also be used as a |method|: >
 			Compute()->float2nr()
 
-floor({expr})							*floor()*
+floor({expr})						*floor()*
 		Return the largest integral value less than or equal to
 		{expr} as a |Float| (round down).
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -2474,7 +2073,7 @@ foldclosed({lnum})					*foldclosed()*
 		Can also be used as a |method|: >
 			GetLnum()->foldclosed()
 
-foldclosedend({lnum})					*foldclosedend()*
+foldclosedend({lnum})				*foldclosedend()*
 		The result is a Number.  If the line {lnum} is in a closed
 		fold, the result is the number of the last line in that fold.
 		If the line {lnum} is not in a closed fold, -1 is returned.
@@ -2499,8 +2098,9 @@ foldlevel({lnum})					*foldlevel()*
 		Can also be used as a |method|: >
 			GetLnum()->foldlevel()
 <
-							*foldtext()*
-foldtext()	Returns a String, to be displayed for a closed fold.  This is
+
+foldtext()						*foldtext()*
+		Returns a String, to be displayed for a closed fold.  This is
 		the default function used for the 'foldtext' option and should
 		only be called from evaluating 'foldtext'.  It uses the
 		|v:foldstart|, |v:foldend| and |v:folddashes| variables.
@@ -2516,7 +2116,7 @@ foldtext()	Returns a String, to be displayed for a closed fold.  This is
 		setting.
 		Returns an empty string when there is no fold.
 
-foldtextresult({lnum})					*foldtextresult()*
+foldtextresult({lnum})				*foldtextresult()*
 		Returns the text that is displayed for the closed fold at line
 		{lnum}.  Evaluates 'foldtext' in the appropriate context.
 		When there is no closed fold at {lnum} an empty string is
@@ -2528,7 +2128,8 @@ foldtextresult({lnum})					*foldtextresult()*
 		Can also be used as a |method|: >
 			GetLnum()->foldtextresult()
 <
-fullcommand({name})						*fullcommand()*
+
+fullcommand({name})					*fullcommand()*
 		Get the full command name from a short abbreviated command
 		name; see |20.2| for details on command abbreviations.
 
@@ -2543,8 +2144,8 @@ fullcommand({name})						*fullcommand()*
 		Can also be used as a |method|: >
 			GetName()->fullcommand()
 <
-						*funcref()*
-funcref({name} [, {arglist}] [, {dict}])
+
+funcref({name} [, {arglist}] [, {dict}])			*funcref()*
 		Just like |function()|, but the returned Funcref will lookup
 		the function by reference, not by name.  This matters when the
 		function {name} is redefined later.
@@ -2559,8 +2160,8 @@ funcref({name} [, {arglist}] [, {dict}])
 		Can also be used as a |method|: >
 			GetFuncname()->funcref([arg])
 <
-				*function()* *partial* *E700* *E923*
-function({name} [, {arglist}] [, {dict}])
+
+function({name} [, {arglist}] [, {dict}])	*function()* *partial* *E700* *E923*
 		Return a |Funcref| variable that refers to function {name}.
 		{name} can be the name of a user defined function or an
 		internal function.
@@ -2661,16 +2262,18 @@ garbagecollect([{atexit}])				*garbagecollect()*
 		it's safe to perform.  This is when waiting for the user to
 		type a character.
 
-get({list}, {idx} [, {default}])			*get()*
+get({list}, {idx} [, {default}])				*get()*
 		Get item {idx} from |List| {list}.  When this item is not
 		available return {default}.  Return zero when {default} is
 		omitted.
 		Can also be used as a |method|: >
 			mylist->get(idx)
+
 get({blob}, {idx} [, {default}])
 		Get byte {idx} from |Blob| {blob}.  When this byte is not
 		available return {default}.  Return -1 when {default} is
 		omitted.
+
 get({dict}, {key} [, {default}])
 		Get item with key {key} from |Dictionary| {dict}.  When this
 		item is not available return {default}.  Return zero when
@@ -2678,6 +2281,7 @@ get({dict}, {key} [, {default}])
 			let val = get(g:, 'var_name', 'default')
 <		This gets the value of g:var_name if it exists, and uses
 		"default" when it does not exist.
+
 get({func}, {what})
 		Get item {what} from Funcref {func}.  Possible values for
 		{what} are:
@@ -2687,9 +2291,8 @@ get({func}, {what})
 			"args"	The list with arguments
 		Returns zero on error.
 
-							*getbufinfo()*
 getbufinfo([{buf}])
-getbufinfo([{dict}])
+getbufinfo([{dict}])					*getbufinfo()*
 		Get information about buffers as a List of Dictionaries.
 
 		Without an argument information about all the buffers is
@@ -2758,8 +2361,7 @@ getbufinfo([{dict}])
 			GetBufnr()->getbufinfo()
 <
 
-							*getbufline()*
-getbufline({buf}, {lnum} [, {end}])
+getbufline({buf}, {lnum} [, {end}])			*getbufline()*
 		Return a |List| with the lines starting from {lnum} to {end}
 		(inclusive) in the buffer {buf}.  If {end} is omitted, a
 		|List| with only the line {lnum} is returned.  See
@@ -2787,12 +2389,12 @@ getbufline({buf}, {lnum} [, {end}])
 <		Can also be used as a |method|: >
 			GetBufnr()->getbufline(lnum)
 <
-							*getbufoneline()*
-getbufoneline({buf}, {lnum})
+
+getbufoneline({buf}, {lnum})			*getbufoneline()*
 		Just like `getbufline()` but only get one line and return it
 		as a string.
 
-getbufvar({buf}, {varname} [, {def}])				*getbufvar()*
+getbufvar({buf}, {varname} [, {def}])			*getbufvar()*
 		The result is the value of option or local buffer variable
 		{varname} in buffer {buf}.  Note that the name without "b:"
 		must be used.
@@ -2816,14 +2418,14 @@ getbufvar({buf}, {varname} [, {def}])				*getbufvar()*
 <		Can also be used as a |method|: >
 			GetBufnr()->getbufvar(varname)
 <
-getcellwidths()						*getcellwidths()*
+
+getcellwidths()					*getcellwidths()*
 		Returns a |List| of cell widths of character ranges overridden
 		by |setcellwidths()|.  The format is equal to the argument of
 		|setcellwidths()|.  If no character ranges have their cell
 		widths overridden, an empty List is returned.
 
-
-getchangelist([{buf}])					*getchangelist()*
+getchangelist([{buf}])				*getchangelist()*
 		Returns the |changelist| for the buffer {buf}. For the use
 		of {buf}, see |bufname()| above. If buffer {buf} doesn't
 		exist, an empty list is returned.
@@ -2906,6 +2508,7 @@ getchar([expr])						*getchar()*
 			:  endwhile
 			:endfunction
 <
+
 getcharmod()						*getcharmod()*
 		The result is a Number which is the state of the modifiers for
 		the last obtained character with getchar() or in another way.
@@ -2922,8 +2525,7 @@ getcharmod()						*getcharmod()*
 		character itself are obtained.  Thus Shift-a results in "A"
 		without a modifier.  Returns 0 if no modifiers are used.
 
-							*getcharpos()*
-getcharpos({expr})
+getcharpos({expr})					*getcharpos()*
 		Get the position for String {expr}. Same as |getpos()| but the
 		column number in the returned List is a character index
 		instead of a byte index.
@@ -2939,7 +2541,7 @@ getcharpos({expr})
 		Can also be used as a |method|: >
 			GetMark()->getcharpos()
 
-getcharsearch()						*getcharsearch()*
+getcharsearch()					*getcharsearch()*
 		Return the current character search information as a {dict}
 		with the following entries:
 
@@ -2959,7 +2561,6 @@ getcharsearch()						*getcharsearch()*
 			:nnoremap <expr> , getcharsearch().forward ? ',' : ';'
 <		Also see |setcharsearch()|.
 
-
 getcharstr([expr])					*getcharstr()*
 		Get a single character from the user or input stream as a
 		string.
@@ -3026,7 +2627,7 @@ getcmdtype()						*getcmdtype()*
 		Returns an empty string otherwise.
 		Also see |getcmdpos()|, |setcmdpos()| and |getcmdline()|.
 
-getcmdwintype()						*getcmdwintype()*
+getcmdwintype()					*getcmdwintype()*
 		Return the current |command-line-window| type. Possible return
 		values are the same as |getcmdtype()|. Returns an empty string
 		when not in the command-line window.
@@ -3100,8 +2701,8 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		Can also be used as a |method|: >
 			GetPattern()->getcompletion('color')
 <
-							*getcurpos()*
-getcurpos([{winid}])
+
+getcurpos([{winid}])					*getcurpos()*
 		Get the position of the cursor.  This is like getpos('.'), but
 		includes an extra "curswant" item in the list:
 		    [0, lnum, col, off, curswant] ~
@@ -3129,8 +2730,8 @@ getcurpos([{winid}])
 		Can also be used as a |method|: >
 			GetWinid()->getcurpos()
 <
-							*getcursorcharpos()*
-getcursorcharpos([{winid}])
+
+getcursorcharpos([{winid}])			*getcursorcharpos()*
 		Same as |getcurpos()| but the column number in the returned
 		List is a character index instead of a byte index.
 
@@ -3271,9 +2872,9 @@ getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
 
 		Can also be used as a |method|: >
 			GetWinnr()->getjumplist()
+<
 
-<							*getline()*
-getline({lnum} [, {end}])
+getline({lnum} [, {end}])					*getline()*
 		Without {end} the result is a String, which is line {lnum}
 		from the current buffer.  Example: >
 			getline(1)
@@ -3331,7 +2932,7 @@ getloclist({nr} [, {what}])				*getloclist()*
 		Examples (See also |getqflist-examples|): >
 			:echo getloclist(3, {'all': 0})
 			:echo getloclist(5, {'filewinid': 0})
-
+<
 
 getmarklist([{buf}])					*getmarklist()*
 		Without the {buf} argument returns a |List| with information
@@ -3366,26 +2967,27 @@ getmatches([{win}])					*getmatches()*
 		an empty list is returned.
 		Example: >vim
 			:echo getmatches()
->
- 			[{"group": "MyGroup1", "pattern": "TODO",
+<		 >
+			[{"group": "MyGroup1", "pattern": "TODO",
 			"priority": 10, "id": 1}, {"group": "MyGroup2",
 			"pattern": "FIXME", "priority": 10, "id": 2}]
->vim
+<		 >vim
 			:let m = getmatches()
 			:call clearmatches()
 			:echo getmatches()
->
+<		 >
 			[]
->vim
+<		 >vim
 			:call setmatches(m)
 			:echo getmatches()
->
+<		 >
 			[{"group": "MyGroup1", "pattern": "TODO",
 			"priority": 10, "id": 1}, {"group": "MyGroup2",
 			"pattern": "FIXME", "priority": 10, "id": 2}]
->vim
+<		 >vim
 			:unlet m
 <
+
 getmousepos()						*getmousepos()*
 		Returns a Dictionary with the last known position of the
 		mouse.  This can be used in a mapping for a mouse click.  The
@@ -3415,12 +3017,12 @@ getmousepos()						*getmousepos()*
 		When using |getchar()| the Vim variables |v:mouse_lnum|,
 		|v:mouse_col| and |v:mouse_winid| also provide these values.
 
-							*getpid()*
-getpid()	Return a Number which is the process ID of the Vim process.
+getpid()							*getpid()*
+		Return a Number which is the process ID of the Vim process.
 		This is a unique number, until Vim exits.
 
-							*getpos()*
-getpos({expr})	Get the position for String {expr}.  For possible values of
+getpos({expr})						*getpos()*
+		Get the position for String {expr}.  For possible values of
 		{expr} see |line()|.  For getting the cursor position see
 		|getcurpos()|.
 		The result is a |List| with four numbers:
@@ -3551,6 +3153,7 @@ getqflist([{what}])					*getqflist()*
 			:echo getqflist({'nr': 2, 'title': 1})
 			:echo getqflist({'lines' : ["F1:10:L10"]})
 <
+
 getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 		The result is a String, which is the contents of register
 		{regname}.  Example: >
@@ -3577,7 +3180,7 @@ getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 		Can also be used as a |method|: >
 			GetRegname()->getreg()
 
-getreginfo([{regname}])					*getreginfo()*
+getreginfo([{regname}])				*getreginfo()*
 		Returns detailed information about register {regname} as a
 		Dictionary with the following entries:
 			regcontents	List of lines contained in register
@@ -3604,7 +3207,7 @@ getreginfo([{regname}])					*getreginfo()*
 		Can also be used as a |method|: >
 			GetRegname()->getreginfo()
 
-getregtype([{regname}])					*getregtype()*
+getregtype([{regname}])				*getregtype()*
 		The result is a String, which is type of register {regname}.
 		The value will be one of:
 		    "v"			for |charwise| text
@@ -3618,7 +3221,7 @@ getregtype([{regname}])					*getregtype()*
 		Can also be used as a |method|: >
 			GetRegname()->getregtype()
 
-getscriptinfo([{opts}])					*getscriptinfo()*
+getscriptinfo([{opts}])				*getscriptinfo()*
 		Returns a |List| with information about all the sourced Vim
 		scripts in the order they were sourced, like what
 		`:scriptnames` shows.
@@ -3654,6 +3257,7 @@ getscriptinfo([{opts}])					*getscriptinfo()*
 			:echo getscriptinfo({'name': 'myscript'})
 			:echo getscriptinfo({'sid': 15}).variables
 <
+
 gettabinfo([{tabnr}])					*gettabinfo()*
 		If {tabnr} is not specified, then information about all the
 		tab pages is returned as a |List|. Each List item is a
@@ -3670,7 +3274,7 @@ gettabinfo([{tabnr}])					*gettabinfo()*
 		Can also be used as a |method|: >
 			GetTabnr()->gettabinfo()
 
-gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
+gettabvar({tabnr}, {varname} [, {def}])			*gettabvar()*
 		Get the value of a tab-local variable {varname} in tab page
 		{tabnr}. |t:var|
 		Tabs are numbered starting with one.
@@ -3683,7 +3287,7 @@ gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
 		Can also be used as a |method|: >
 			GetTabnr()->gettabvar(varname)
 
-gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
+gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])	*gettabwinvar()*
 		Get the value of window-local variable {varname} in window
 		{winnr} in tab page {tabnr}.
 		The {varname} argument is a string.  When {varname} is empty a
@@ -3708,11 +3312,11 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
 <
 		To obtain all window-local variables use: >
 			gettabwinvar({tabnr}, {winnr}, '&')
-
-<		Can also be used as a |method|: >
+<
+		Can also be used as a |method|: >
 			GetTabnr()->gettabwinvar(winnr, varname)
 
-gettagstack([{winnr}])					*gettagstack()*
+gettagstack([{winnr}])				*gettagstack()*
 		The result is a Dict, which is the tag stack of window {winnr}.
 		{winnr} can be the window number or the |window-ID|.
 		When {winnr} is not specified, the current window is used.
@@ -3742,7 +3346,7 @@ gettagstack([{winnr}])					*gettagstack()*
 
 		Can also be used as a |method|: >
 			GetWinnr()->gettagstack()
-
+<
 
 gettext({text})						*gettext()*
 		Translate String {text} if possible.
@@ -3755,7 +3359,6 @@ gettext({text})						*gettext()*
 		xgettext does not understand escaping in single quoted
 		strings.
 
-
 getwininfo([{winid}])					*getwininfo()*
 		Returns information about windows as a |List| with Dictionaries.
 
@@ -3816,19 +3419,20 @@ getwinpos([{timeout}])					*getwinpos()*
 		Can also be used as a |method|: >
 			GetTimeout()->getwinpos()
 <
-							*getwinposx()*
-getwinposx()	The result is a Number, which is the X coordinate in pixels of
+
+getwinposx()						*getwinposx()*
+		The result is a Number, which is the X coordinate in pixels of
 		the left hand side of the GUI Vim window.  The result will be
 		-1 if the information is not available.
 		The value can be used with `:winpos`.
 
-							*getwinposy()*
-getwinposy()	The result is a Number, which is the Y coordinate in pixels of
+getwinposy()						*getwinposy()*
+		The result is a Number, which is the Y coordinate in pixels of
 		the top of the GUI Vim window.  The result will be -1 if the
 		information is not available.
 		The value can be used with `:winpos`.
 
-getwinvar({winnr}, {varname} [, {def}])				*getwinvar()*
+getwinvar({winnr}, {varname} [, {def}])			*getwinvar()*
 		Like |gettabwinvar()| for the current tabpage.
 		Examples: >
 			:let list_is_on = getwinvar(2, '&list')
@@ -3837,6 +3441,7 @@ getwinvar({winnr}, {varname} [, {def}])				*getwinvar()*
 <		Can also be used as a |method|: >
 			GetWinnr()->getwinvar(varname)
 <
+
 glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])		*glob()*
 		Expand the file wildcards in {expr}.  See |wildcards| for the
 		use of special characters.
@@ -3876,7 +3481,7 @@ glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])		*glob()*
 		Can also be used as a |method|: >
 			GetExpr()->glob()
 
-glob2regpat({string})					 *glob2regpat()*
+glob2regpat({string})					*glob2regpat()*
 		Convert a file pattern, as used by glob(), into a search
 		pattern.  The result can be used to match with a string that
 		is a file name.  E.g. >
@@ -3890,8 +3495,9 @@ glob2regpat({string})					 *glob2regpat()*
 
 		Can also be used as a |method|: >
 			GetExpr()->glob2regpat()
-<								*globpath()*
-globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])
+<
+
+globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])	*globpath()*
 		Perform glob() for String {expr} on all directories in {path}
 		and concatenate the results.  Example: >
 			:echo globpath(&rtp, "syntax/c.vim")
@@ -3930,8 +3536,9 @@ globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])
 		second argument: >
 			GetExpr()->globpath(&rtp)
 <
-							*has()*
-has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
+
+has({feature})						*has()*
+		Returns 1 if {feature} is supported, 0 otherwise.  The
 		{feature} argument is a feature name like "nvim-0.2.1" or
 		"win32", see below.  See also |exists()|.
 
@@ -3964,7 +3571,7 @@ has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
 			clipboard	|clipboard| provider is available.
 			fname_case	Case in file names matters (for Darwin and MS-Windows
 					this is not present).
-                        gui_running	Nvim has a GUI.
+		                        gui_running	Nvim has a GUI.
 			iconv		Can use |iconv()| for conversion.
 			linux		Linux system.
 			mac		MacOS system.
@@ -3988,7 +3595,7 @@ has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
 <		4.  Vim version. For example the "patch-7.4.237" feature means
 		    that Nvim is Vim-compatible to version 7.4.237 or later. >
 			:if has("patch-7.4.237")
-
+<
 
 has_key({dict}, {key})					*has_key()*
 		The result is a Number, which is TRUE if |Dictionary| {dict}
@@ -4130,7 +3737,7 @@ histget({history} [, {index}])				*histget()*
 		Can also be used as a |method|: >
 			GetHistory()->histget()
 
-histnr({history})					*histnr()*
+histnr({history})						*histnr()*
 		The result is the Number of the current entry in {history}.
 		See |hist-names| for the possible values of {history}.
 		If an error occurred, -1 is returned.
@@ -4141,28 +3748,30 @@ histnr({history})					*histnr()*
 <		Can also be used as a |method|: >
 			GetHistory()->histnr()
 <
-hlexists({name})					*hlexists()*
-		The result is a Number, which is TRUE if a highlight group
-		called {name} exists.  This is when the group has been
-		defined in some way.  Not necessarily when highlighting has
-		been defined for it, it may also have been used for a syntax
-		item.
 
-		Can also be used as a |method|: >
-			GetName()->hlexists()
-<
-							*hlID()*
-hlID({name})	The result is a Number, which is the ID of the highlight group
+hlID({name})							*hlID()*
+		The result is a Number, which is the ID of the highlight group
 		with name {name}.  When the highlight group doesn't exist,
 		zero is returned.
 		This can be used to retrieve information about the highlight
 		group.  For example, to get the background color of the
 		"Comment" group: >
-	:echo synIDattr(synIDtrans(hlID("Comment")), "bg")
+			:echo synIDattr(synIDtrans(hlID("Comment")), "bg")
 <
 		Can also be used as a |method|: >
 			GetName()->hlID()
 
+hlexists({name})						*hlexists()*
+		The result is a Number, which is TRUE if a highlight group
+		called {name} exists.  This is when the group has been
+		defined in some way.  Not necessarily when highlighting has
+		been defined for it, it may also have been used for a syntax
+		item.
+
+		Can also be used as a |method|: >
+			GetName()->hlexists()
+<
+
 hostname()						*hostname()*
 		The result is a String, which is the name of the machine on
 		which Vim is currently running.  Machine names greater than
@@ -4183,8 +3792,25 @@ iconv({string}, {from}, {to})				*iconv()*
 		Can also be used as a |method|: >
 			GetText()->iconv('latin1', 'utf-8')
 <
-							*indent()*
-indent({lnum})	The result is a Number, which is indent of line {lnum} in the
+
+id({expr})							*id()*
+		Returns a |String| which is a unique identifier of the
+		container type (|List|, |Dict|, |Blob| and |Partial|). It is
+		guaranteed that for the mentioned types `id(v1) ==# id(v2)`
+		returns true iff `type(v1) == type(v2) && v1 is v2`.
+		Note that |v:_null_string|, |v:_null_list|, |v:_null_dict| and
+		|v:_null_blob| have the same `id()` with different types
+		because they are internally represented as NULL pointers.
+		`id()` returns a hexadecimal representanion of the pointers to
+		the containers (i.e. like `0x994a40`), same as `printf("%p",
+		{expr})`, but it is advised against counting on the exact
+		format of the return value.
+
+		It is not guaranteed that `id(no_longer_existing_container)`
+		will not be equal to some other `id()`: new containers may
+		reuse identifiers of the garbage-collected ones.
+
+indent({lnum})						*indent()*
 		current buffer.  The indent is counted in spaces, the value
 		of 'tabstop' is relevant.  {lnum} is used just like in
 		|getline()|.
@@ -4193,7 +3819,7 @@ indent({lnum})	The result is a Number, which is indent of line {lnum} in the
 		Can also be used as a |method|: >
 			GetLnum()->indent()
 
-index({object}, {expr} [, {start} [, {ic}]])			*index()*
+index({object}, {expr} [, {start} [, {ic}]])		*index()*
 		Find {expr} in {object} and return its index.  See
 		|indexof()| for using a lambda to select the item.
 
@@ -4262,7 +3888,8 @@ indexof({object}, {expr} [, {opts}])			*indexof()*
 <		Can also be used as a |method|: >
 			mylist->indexof(expr)
 
-input({prompt} [, {text} [, {completion}]])		*input()*
+input({prompt} [, {text} [, {completion}]])			*input()*
+
 input({opts})
 		The result is a String, which is whatever the user typed on
 		the command-line.  The {prompt} argument is either a prompt
@@ -4396,7 +4023,7 @@ inputlist({textlist})					*inputlist()*
 <		Can also be used as a |method|: >
 			GetChoices()->inputlist()
 
-inputrestore()						*inputrestore()*
+inputrestore()					*inputrestore()*
 		Restore typeahead that was saved with a previous |inputsave()|.
 		Should be called the same number of times inputsave() is
 		called.  Calling it more often is harmless though.
@@ -4424,7 +4051,7 @@ inputsecret({prompt} [, {text}])			*inputsecret()*
 		Can also be used as a |method|: >
 			GetPrompt()->inputsecret()
 
-insert({object}, {item} [, {idx}])			*insert()*
+insert({object}, {item} [, {idx}])				*insert()*
 		When {object} is a |List| or a |Blob| insert {item} at the start
 		of it.
 
@@ -4501,22 +4128,13 @@ islocked({expr})					*islocked()* *E786*
 		Can also be used as a |method|: >
 			GetName()->islocked()
 
-id({expr})						*id()*
-		Returns a |String| which is a unique identifier of the
-		container type (|List|, |Dict|, |Blob| and |Partial|). It is
-		guaranteed that for the mentioned types `id(v1) ==# id(v2)`
-		returns true iff `type(v1) == type(v2) && v1 is v2`.
-		Note that |v:_null_string|, |v:_null_list|, |v:_null_dict| and
-		|v:_null_blob| have the same `id()` with different types
-		because they are internally represented as NULL pointers.
-		`id()` returns a hexadecimal representanion of the pointers to
-		the containers (i.e. like `0x994a40`), same as `printf("%p",
-		{expr})`, but it is advised against counting on the exact
-		format of the return value.
+isnan({expr})						*isnan()*
+		Return |TRUE| if {expr} is a float with value NaN. >
+			echo isnan(0.0 / 0.0)
+<			1
 
-		It is not guaranteed that `id(no_longer_existing_container)`
-		will not be equal to some other `id()`: new containers may
-		reuse identifiers of the garbage-collected ones.
+		Can also be used as a |method|: >
+			Compute()->isnan()
 
 items({dict})						*items()*
 		Return a |List| with all the key-value pairs of {dict}.  Each
@@ -4531,14 +4149,6 @@ items({dict})						*items()*
 <		Can also be used as a |method|: >
 			mydict->items()
 
-isnan({expr})						*isnan()*
-		Return |TRUE| if {expr} is a float with value NaN. >
-			echo isnan(0.0 / 0.0)
-<			1
-
-		Can also be used as a |method|: >
-			Compute()->isnan()
-
 jobpid({job})						*jobpid()*
 		Return the PID (process id) of |job-id| {job}.
 
@@ -4712,7 +4322,7 @@ json_encode({expr})					*json_encode()*
 		Can also be used as a |method|: >
 			GetObject()->json_encode()
 
-keys({dict})						*keys()*
+keys({dict})							*keys()*
 		Return a |List| with all the keys of {dict}.  The |List| is in
 		arbitrary order.  Also see |items()| and |values()|.
 
@@ -4728,9 +4338,9 @@ keytrans({string})					*keytrans()*
 
 		Can also be used as a |method|: >
 			"\<C-Home>"->keytrans()
+<
 
-<							*len()* *E701*
-len({expr})	The result is a Number, which is the length of the argument.
+len({expr})						*len()* *E701*
 		When {expr} is a String or a Number the length in bytes is
 		used, as with |strlen()|.
 		When {expr} is a |List| the number of items in the |List| is
@@ -4742,9 +4352,9 @@ len({expr})	The result is a Number, which is the length of the argument.
 
 		Can also be used as a |method|: >
 			mylist->len()
+<
 
-<						*libcall()* *E364* *E368*
-libcall({libname}, {funcname}, {argument})
+libcall({libname}, {funcname}, {argument})	*libcall()* *E364* *E368*
 		Call function {funcname} in the run-time library {libname}
 		with single argument {argument}.
 		This is useful to call functions in a library that you
@@ -4790,8 +4400,8 @@ libcall({libname}, {funcname}, {argument})
 		third argument: >
 			GetValue()->libcall("libc.so", "getenv")
 <
-							*libcallnr()*
-libcallnr({libname}, {funcname}, {argument})
+
+libcallnr({libname}, {funcname}, {argument})		*libcallnr()*
 		Just like |libcall()|, but used for a function that returns an
 		int instead of a string.
 		Examples: >
@@ -4803,7 +4413,8 @@ libcallnr({libname}, {funcname}, {argument})
 		third argument: >
 			GetValue()->libcallnr("libc.so", "printf")
 <
-line({expr} [, {winid}])				*line()*
+
+line({expr} [, {winid}])					*line()*
 		The result is a Number, which is the line number of the file
 		position given with {expr}.  The {expr} argument is a string.
 		The accepted positions are:
@@ -4900,8 +4511,7 @@ localtime()						*localtime()*
 		Return the current time, measured as seconds since 1st Jan
 		1970.  See also |strftime()|, |strptime()| and |getftime()|.
 
-
-log({expr})						*log()*
+log({expr})							*log()*
 		Return the natural logarithm (base e) of {expr} as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number| in the range
 		(0, inf].
@@ -4928,14 +4538,15 @@ log10({expr})						*log10()*
 		Can also be used as a |method|: >
 			Compute()->log10()
 
-luaeval({expr} [, {expr}])
+luaeval({expr} [, {expr}])				*luaeval()*
 		Evaluate Lua expression {expr} and return its result converted
 		to Vim data structures. See |lua-eval| for more details.
 
 		Can also be used as a |method|: >
 			GetExpr()->luaeval()
+<
 
-map({expr1}, {expr2})					*map()*
+map({expr1}, {expr2})						*map()*
 		{expr1} must be a |List|, |Blob| or |Dictionary|.
 		Replace each item in {expr1} with the result of evaluating
 		{expr2}.  For a |Blob| each byte is replaced.
@@ -4984,9 +4595,9 @@ map({expr1}, {expr2})					*map()*
 
 		Can also be used as a |method|: >
 			mylist->map(expr2)
+<
 
-
-maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
+maparg({name} [, {mode} [, {abbr} [, {dict}]]])		*maparg()*
 		When {dict} is omitted or zero: Return the rhs of mapping
 		{name} in mode {mode}.  The returned String has special
 		characters translated like in the output of the ":map" command
@@ -5080,9 +4691,9 @@ mapcheck({name} [, {mode} [, {abbr}]])			*mapcheck()*
 		then the global mappings.
 		This function can be used to check if a mapping can be added
 		without being ambiguous.  Example: >
-	:if mapcheck("_vv") == ""
-	:   map _vv :set guifont=7x13<CR>
-	:endif
+			:if mapcheck("_vv") == ""
+			:   map _vv :set guifont=7x13<CR>
+			:endif
 <		This avoids adding the "_vv" mapping when there already is a
 		mapping for "_v" or for "_vvv".
 
@@ -5104,8 +4715,7 @@ mapset({mode}, {abbr}, {dict})				*mapset()*
 		e.g. with `:map!`, you need to save the mapping for all of
 		them, since they can differ.
 
-
-match({expr}, {pat} [, {start} [, {count}]])			*match()*
+match({expr}, {pat} [, {start} [, {count}]])		*match()*
 		When {expr} is a |List| then this returns the index of the
 		first item where {pat} matches.  Each item is used as a
 		String, |Lists| and |Dictionaries| are used as echoed.
@@ -5171,7 +4781,8 @@ match({expr}, {pat} [, {start} [, {count}]])			*match()*
 			GetText()->match('word')
 			GetList()->match('word')
 <
-			*matchadd()* *E798* *E799* *E801* *E957*
+
+						*matchadd()* *E798* *E799* *E801* *E957*
 matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		Defines a pattern to be highlighted in the current window (a
 		"match").  It will be highlighted with {group}.  Returns an
@@ -5233,8 +4844,8 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		Can also be used as a |method|: >
 			GetGroup()->matchadd('TODO')
 <
-							*matchaddpos()*
-matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
+
+matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])	*matchaddpos()*
 		Same as |matchadd()|, but requires a list of positions {pos}
 		instead of a pattern. This command is faster than |matchadd()|
 		because it does not require to handle regular expressions and
@@ -5274,7 +4885,7 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
 		Can also be used as a |method|: >
 			GetGroup()->matchaddpos([23, 11])
 
-matcharg({nr})							*matcharg()*
+matcharg({nr})						*matcharg()*
 		Selects the {nr} match item, as set with a |:match|,
 		|:2match| or |:3match| command.
 		Return a |List| with two elements:
@@ -5289,7 +4900,7 @@ matcharg({nr})							*matcharg()*
 		Can also be used as a |method|: >
 			GetMatch()->matcharg()
 
-matchdelete({id} [, {win}])		       *matchdelete()* *E802* *E803*
+matchdelete({id} [, {win}])		*matchdelete()* *E802* *E803*
 		Deletes a match with ID {id} previously defined by |matchadd()|
 		or one of the |:match| commands.  Returns 0 if successful,
 		otherwise -1.  See example for |matchadd()|.  All matches can
@@ -5300,7 +4911,7 @@ matchdelete({id} [, {win}])		       *matchdelete()* *E802* *E803*
 		Can also be used as a |method|: >
 			GetMatch()->matchdelete()
 
-matchend({expr}, {pat} [, {start} [, {count}]])			*matchend()*
+matchend({expr}, {pat} [, {start} [, {count}]])		*matchend()*
 		Same as |match()|, but return the index of first character
 		after the match.  Example: >
 			:echo matchend("testing", "ing")
@@ -5385,7 +4996,7 @@ matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 						\ {'matchseq': 1})
 <		results in `['two one']`.
 
-matchfuzzypos({list}, {str} [, {dict}])			*matchfuzzypos()*
+matchfuzzypos({list}, {str} [, {dict}])		*matchfuzzypos()*
 		Same as |matchfuzzy()|, but returns the list of matched
 		strings, the list of character positions where characters
 		in {str} matches and a list of matching scores.  You can
@@ -5407,7 +5018,7 @@ matchfuzzypos({list}, {str} [, {dict}])			*matchfuzzypos()*
 				\ ->matchfuzzypos('ll', {'key' : 'text'})
 <		results in `[[{"id": 10, "text": "hello"}], [[2, 3]], [127]]`
 
-matchlist({expr}, {pat} [, {start} [, {count}]])		*matchlist()*
+matchlist({expr}, {pat} [, {start} [, {count}]])	*matchlist()*
 		Same as |match()|, but return a |List|.  The first item in the
 		list is the matched string, same as what matchstr() would
 		return.  Following items are submatches, like "\1", "\2", etc.
@@ -5422,7 +5033,7 @@ matchlist({expr}, {pat} [, {start} [, {count}]])		*matchlist()*
 		Can also be used as a |method|: >
 			GetText()->matchlist('word')
 
-matchstr({expr}, {pat} [, {start} [, {count}]])			*matchstr()*
+matchstr({expr}, {pat} [, {start} [, {count}]])		*matchstr()*
 		Same as |match()|, but return the matched string.  Example: >
 			:echo matchstr("testing", "ing")
 <		results in "ing".
@@ -5438,7 +5049,7 @@ matchstr({expr}, {pat} [, {start} [, {count}]])			*matchstr()*
 		Can also be used as a |method|: >
 			GetText()->matchstr('word')
 
-matchstrpos({expr}, {pat} [, {start} [, {count}]])		*matchstrpos()*
+matchstrpos({expr}, {pat} [, {start} [, {count}]])	*matchstrpos()*
 		Same as |matchstr()|, but return the matched string, the start
 		position and the end position of the match.  Example: >
 			:echo matchstrpos("testing", "ing")
@@ -5460,19 +5071,19 @@ matchstrpos({expr}, {pat} [, {start} [, {count}]])		*matchstrpos()*
 			GetText()->matchstrpos('word')
 <
 
-							*max()*
-max({expr})	Return the maximum value of all items in {expr}. Example: >
+max({expr})							*max()*
+		Return the maximum value of all items in {expr}. Example: >
 			echo max([apples, pears, oranges])
 
 <		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
 		it returns the maximum of all values in the Dictionary.
 		If {expr} is neither a List nor a Dictionary, or one of the
 		items in {expr} cannot be used as a Number this results in
-                an error.  An empty |List| or |Dictionary| results in zero.
+		                an error.  An empty |List| or |Dictionary| results in zero.
 
 		Can also be used as a |method|: >
 			mylist->max()
-
+<
 
 menu_get({path} [, {modes}])				*menu_get()*
 		Returns a |List| of |Dictionaries| describing |menus| (defined
@@ -5592,10 +5203,10 @@ menu_info({name} [, {mode}])				*menu_info()*
 <
 		Can also be used as a |method|: >
 			GetMenuName()->menu_info('v')
+<
 
-
-<							*min()*
-min({expr})	Return the minimum value of all items in {expr}. Example:  >
+min({expr})							*min()*
+		Return the minimum value of all items in {expr}. Example: >
 			echo min([apples, pears, oranges])
 
 <		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
@@ -5606,9 +5217,9 @@ min({expr})	Return the minimum value of all items in {expr}. Example:  >
 
 		Can also be used as a |method|: >
 			mylist->min()
+<
 
-<							*mkdir()* *E739*
-mkdir({name} [, {flags} [, {prot}]])
+mkdir({name} [, {flags} [, {prot}]])			*mkdir()* *E739*
 		Create directory {name}.
 
 		When {flags} is present it must be a string.  An empty string
@@ -5654,8 +5265,9 @@ mkdir({name} [, {flags} [, {prot}]])
 		Can also be used as a |method|: >
 			GetName()->mkdir()
 <
-							*mode()*
-mode([expr])	Return a string that indicates the current mode.
+
+mode([expr])							*mode()*
+		Return a string that indicates the current mode.
 		If [expr] is supplied and it evaluates to a non-zero Number or
 		a non-empty String (|non-zero-arg|), then the full mode is
 		returned, otherwise only the first letter is returned.
@@ -5708,7 +5320,7 @@ mode([expr])	Return a string that indicates the current mode.
 		Can also be used as a |method|: >
 			DoFull()->mode()
 
-msgpackdump({list} [, {type}])				*msgpackdump()*
+msgpackdump({list} [, {type}])			*msgpackdump()*
 		Convert a list of Vimscript objects to msgpack. Returned value is a
 		|readfile()|-style list. When {type} contains "B", a |Blob| is
 		returned instead. Example: >
@@ -5820,7 +5432,7 @@ nr2char({expr} [, {utf8}])				*nr2char()*
 			nr2char(32)		returns " "
 <		Example for "utf-8": >
 			nr2char(300)		returns I with bow character
-<		UTF-8 encoding is always used, {utf8} option has no effect,
+		<UTF-8 encoding is always used, {utf8} option has no effect,
 		and exists only for backwards-compatibility.
 		Note that a NUL character in the file is specified with
 		nr2char(10), because NULs are represented with newline
@@ -5829,8 +5441,9 @@ nr2char({expr} [, {utf8}])				*nr2char()*
 
 		Can also be used as a |method|: >
 			GetNumber()->nr2char()
+<
 
-nvim_...({...})					*E5555* *nvim_...()* *eval-api*
+nvim_...({...})			*nvim_...()* *E5555* *eval-api*
 		Call nvim |api| functions. The type checking of arguments will
 		be stricter than for most other builtins. For instance,
 		if Integer is expected, a |Number| must be passed in, a
@@ -5841,7 +5454,7 @@ nvim_...({...})					*E5555* *nvim_...()* *eval-api*
 		also take the numerical value 0 to indicate the current
 		(focused) object.
 
-or({expr}, {expr})					*or()*
+or({expr}, {expr})						*or()*
 		Bitwise OR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `and()` and `xor()`.
@@ -5855,7 +5468,6 @@ or({expr}, {expr})					*or()*
 		to separate commands.  In many places it would not be clear if
 		"|" is an operator or a command separator.
 
-
 pathshorten({path} [, {len}])				*pathshorten()*
 		Shorten directory names in the path {path} and return the
 		result.  The tail, the file name, is kept as-is.  The other
@@ -5864,7 +5476,7 @@ pathshorten({path} [, {len}])				*pathshorten()*
 		letters).  Leading '~' and '.' characters are kept.  Examples: >
 			:echo pathshorten('~/.config/nvim/autoload/file1.vim')
 <			~/.c/n/a/file1.vim ~
->
+		>
 			:echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
 <			~/.co/nv/au/file2.vim ~
 		It doesn't matter if the path exists or not.
@@ -5873,7 +5485,7 @@ pathshorten({path} [, {len}])				*pathshorten()*
 		Can also be used as a |method|: >
 			GetDirectories()->pathshorten()
 
-perleval({expr})					*perleval()*
+perleval({expr})						*perleval()*
 		Evaluate |perl| expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are
@@ -5891,7 +5503,7 @@ perleval({expr})					*perleval()*
 		Can also be used as a |method|: >
 			GetExpr()->perleval()
 
-pow({x}, {y})						*pow()*
+pow({x}, {y})							*pow()*
 		Return the power of {x} to the exponent {y} as a |Float|.
 		{x} and {y} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {x} or {y} is not a |Float| or a |Number|.
@@ -5918,7 +5530,7 @@ prevnonblank({lnum})					*prevnonblank()*
 		Can also be used as a |method|: >
 			GetLnum()->prevnonblank()
 
-printf({fmt}, {expr1} ...)				*printf()*
+printf({fmt}, {expr1} ...)					*printf()*
 		Return a String with {fmt}, where "%" items are replaced by
 		the formatted form of their respective arguments.  Example: >
 			printf("%4d: E%d %.30s", lnum, errno, msg)
@@ -6118,7 +5730,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 		of "%" items.  If there are not sufficient or too many
 		arguments an error is given.  Up to 18 arguments can be used.
 
-prompt_getprompt({buf})					*prompt_getprompt()*
+prompt_getprompt({buf})				*prompt_getprompt()*
 		Returns the effective prompt text for buffer {buf}.  {buf} can
 		be a buffer name or number.  See |prompt-buffer|.
 
@@ -6128,7 +5740,7 @@ prompt_getprompt({buf})					*prompt_getprompt()*
 		Can also be used as a |method|: >
 			GetBuffer()->prompt_getprompt()
 
-prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
+prompt_setcallback({buf}, {expr})		*prompt_setcallback()*
 		Set prompt callback for buffer {buf} to {expr}.  When {expr}
 		is an empty string the callback is removed.  This has only
 		effect if {buf} has 'buftype' set to "prompt".
@@ -6163,7 +5775,7 @@ prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
 <		Can also be used as a |method|: >
 			GetBuffer()->prompt_setcallback(callback)
 
-prompt_setinterrupt({buf}, {expr})			*prompt_setinterrupt()*
+prompt_setinterrupt({buf}, {expr})		*prompt_setinterrupt()*
 		Set a callback for buffer {buf} to {expr}.  When {expr} is an
 		empty string the callback is removed.  This has only effect if
 		{buf} has 'buftype' set to "prompt".
@@ -6175,7 +5787,7 @@ prompt_setinterrupt({buf}, {expr})			*prompt_setinterrupt()*
 		Can also be used as a |method|: >
 			GetBuffer()->prompt_setinterrupt(callback)
 
-prompt_setprompt({buf}, {text})				*prompt_setprompt()*
+prompt_setprompt({buf}, {text})			*prompt_setprompt()*
 		Set prompt for buffer {buf} to {text}.  You most likely want
 		{text} to end in a space.
 		The result is only visible if {buf} has 'buftype' set to
@@ -6217,8 +5829,8 @@ py3eval({expr})						*py3eval()*
 		Can also be used as a |method|: >
 			GetExpr()->py3eval()
 <
-							*E858* *E859*
-pyeval({expr})						*pyeval()*
+
+pyeval({expr})				*pyeval()* *E858* *E859*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are
@@ -6239,6 +5851,7 @@ pyxeval({expr})						*pyxeval()*
 		Can also be used as a |method|: >
 			GetExpr()->pyxeval()
 <
+
 rand([{expr}])						*rand()*
 		Return a pseudo-random Number generated with an xoshiro128**
 		algorithm using seed {expr}.  The returned number is 32 bits,
@@ -6258,8 +5871,7 @@ rand([{expr}])						*rand()*
 			seed->rand()
 <
 
-							*E726* *E727*
-range({expr} [, {max} [, {stride}]])				*range()*
+range({expr} [, {max} [, {stride}]])		*range()* *E726* *E727*
 		Returns a |List| with Numbers:
 		- If only {expr} is specified: [0, 1, ..., {expr} - 1]
 		- If {max} is specified: [{expr}, {expr} + 1, ..., {max}]
@@ -6281,7 +5893,7 @@ range({expr} [, {max} [, {stride}]])				*range()*
 			GetExpr()->range()
 <
 
-readblob({fname} [, {offset} [, {size}]])			*readblob()*
+readblob({fname} [, {offset} [, {size}]])		*readblob()*
 		Read file {fname} in binary mode and return a |Blob|.
 		If {offset} is specified, read the file from the specified
 		offset.  If it is a negative value, it is used as an offset
@@ -6305,9 +5917,7 @@ readblob({fname} [, {offset} [, {size}]])			*readblob()*
 		is truncated.
 		Also see |readfile()| and |writefile()|.
 
-
-							*readdir()*
-readdir({directory} [, {expr}])
+readdir({directory} [, {expr}])				*readdir()*
 		Return a list with file and directory names in {directory}.
 		You can also use |glob()| if you don't need to do complicated
 		things, such as limiting the number of matches.
@@ -6328,12 +5938,12 @@ readdir({directory} [, {expr}])
 		  readdir(dirname, {n -> n !~ '^\.\|\~$'})
 
 <		If you want to get a directory tree: >
-                  function! s:tree(dir)
-                      return {a:dir : map(readdir(a:dir),
+		  function! s:tree(dir)
+		      return {a:dir : map(readdir(a:dir),
 		      \ {_, x -> isdirectory(x) ?
 		      \          {x : s:tree(a:dir .. '/' .. x)} : x})}
-                  endfunction
-                  echo s:tree(".")
+		  endfunction
+		  echo s:tree(".")
 <
 		Returns an empty List on error.
 
@@ -6341,8 +5951,7 @@ readdir({directory} [, {expr}])
 			GetDirName()->readdir()
 <
 
-							*readfile()*
-readfile({fname} [, {type} [, {max}]])
+readfile({fname} [, {type} [, {max}]])			*readfile()*
 		Read file {fname} and return a |List|, each line of the file
 		as an item.  Lines are broken at NL characters.  Macintosh
 		files separated with CR will result in a single long line
@@ -6377,8 +5986,9 @@ readfile({fname} [, {type} [, {max}]])
 
 		Can also be used as a |method|: >
 			GetFileName()->readfile()
+<
 
-reduce({object}, {func} [, {initial}])			*reduce()* *E998*
+reduce({object}, {func} [, {initial}])		*reduce()* *E998*
 		{func} is called for every item in {object}, which can be a
 		|List| or a |Blob|.  {func} is called with two arguments: the
 		result so far and current item.  After processing all items
@@ -6397,17 +6007,17 @@ reduce({object}, {func} [, {initial}])			*reduce()* *E998*
 		Can also be used as a |method|: >
 			echo mylist->reduce({ acc, val -> acc + val }, 0)
 
-reg_executing()						*reg_executing()*
+reg_executing()					*reg_executing()*
 		Returns the single letter name of the register being executed.
 		Returns an empty string when no register is being executed.
 		See |@|.
 
-reg_recorded()						*reg_recorded()*
+reg_recorded()					*reg_recorded()*
 		Returns the single letter name of the last recorded register.
 		Returns an empty string when nothing was recorded yet.
 		See |q| and |Q|.
 
-reg_recording()						*reg_recording()*
+reg_recording()					*reg_recording()*
 		Returns the single letter name of the register being recorded.
 		Returns an empty string when not recording.  See |q|.
 
@@ -6436,7 +6046,7 @@ reltime({start}, {end})					*reltime()*
 <
 		Note: |localtime()| returns the current (non-relative) time.
 
-reltimefloat({time})				*reltimefloat()*
+reltimefloat({time})					*reltimefloat()*
 		Return a Float that represents the time value of {time}.
 		Unit of time is seconds.
 		Example:
@@ -6450,7 +6060,7 @@ reltimefloat({time})				*reltimefloat()*
 		Can also be used as a |method|: >
 			reltime(start)->reltimefloat()
 
-reltimestr({time})				*reltimestr()*
+reltimestr({time})					*reltimestr()*
 		Return a String that represents the time value of {time}.
 		This is the number of seconds, a dot and the number of
 		microseconds.  Example: >
@@ -6467,6 +6077,7 @@ reltimestr({time})				*reltimestr()*
 		Can also be used as a |method|: >
 			reltime(start)->reltimestr()
 <
+
 remove({list}, {idx})
 remove({list}, {idx}, {end})				*remove()*
 		Without {end}: Remove the item at {idx} from |List| {list} and
@@ -6529,8 +6140,9 @@ repeat({expr}, {count})					*repeat()*
 
 		Can also be used as a |method|: >
 			mylist->repeat(count)
+<
 
-resolve({filename})					*resolve()* *E655*
+resolve({filename})				*resolve()* *E655*
 		On MS-Windows, when {filename} is a shortcut (a .lnk file),
 		returns the path the shortcut points to in a simplified form.
 		On Unix, repeat resolving symbolic links in all path
@@ -6546,8 +6158,8 @@ resolve({filename})					*resolve()* *E655*
 		Can also be used as a |method|: >
 			GetName()->resolve()
 <
-							*reverse()*
-reverse({object})
+
+reverse({object})						*reverse()*
 		Reverse the order of items in {object} in-place.
 		{object} can be a |List| or a |Blob|.
 		Returns {object}.
@@ -6557,7 +6169,7 @@ reverse({object})
 <		Can also be used as a |method|: >
 			mylist->reverse()
 
-round({expr})							*round()*
+round({expr})						*round()*
 		Round off {expr} to the nearest integral value and return it
 		as a |Float|.  If {expr} lies halfway between two integral
 		values, then use the larger one (away from zero).
@@ -6574,25 +6186,25 @@ round({expr})							*round()*
 		Can also be used as a |method|: >
 			Compute()->round()
 
-rpcnotify({channel}, {event} [, {args}...])			*rpcnotify()*
+rpcnotify({channel}, {event} [, {args}...])		*rpcnotify()*
 		Sends {event} to {channel} via |RPC| and returns immediately.
 		If {channel} is 0, the event is broadcast to all channels.
 		Example: >
 			:au VimLeave call rpcnotify(0, "leaving")
 
-rpcrequest({channel}, {method} [, {args}...])			*rpcrequest()*
+rpcrequest({channel}, {method} [, {args}...])		*rpcrequest()*
 		Sends a request to {channel} to invoke {method} via
 		|RPC| and blocks until a response is received.
 		Example: >
 			:let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
 
-rpcstart({prog} [, {argv}])					*rpcstart()*
+rpcstart({prog} [, {argv}])				*rpcstart()*
 		Deprecated. Replace  >
 			:let id = rpcstart('prog', ['arg1', 'arg2'])
 <		with >
 			:let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
 
-rubyeval({expr})					*rubyeval()*
+rubyeval({expr})						*rubyeval()*
 		Evaluate Ruby expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers, floats and strings are returned as they are (strings
@@ -6605,7 +6217,7 @@ rubyeval({expr})					*rubyeval()*
 		Can also be used as a |method|: >
 			GetRubyExpr()->rubyeval()
 
-screenattr({row}, {col})					*screenattr()*
+screenattr({row}, {col})				*screenattr()*
 		Like |screenchar()|, but return the attribute.  This is a rather
 		arbitrary number that can only be used to compare to the
 		attribute at other positions.
@@ -6614,7 +6226,7 @@ screenattr({row}, {col})					*screenattr()*
 		Can also be used as a |method|: >
 			GetRow()->screenattr(col)
 
-screenchar({row}, {col})					*screenchar()*
+screenchar({row}, {col})				*screenchar()*
 		The result is a Number, which is the character at position
 		[row, col] on the screen.  This works for every possible
 		screen position, also status lines, window separators and the
@@ -6627,7 +6239,7 @@ screenchar({row}, {col})					*screenchar()*
 		Can also be used as a |method|: >
 			GetRow()->screenchar(col)
 
-screenchars({row}, {col})					*screenchars()*
+screenchars({row}, {col})				*screenchars()*
 		The result is a List of Numbers.  The first number is the same
 		as what |screenchar()| returns.  Further numbers are
 		composing characters on top of the base character.
@@ -6637,7 +6249,7 @@ screenchars({row}, {col})					*screenchars()*
 		Can also be used as a |method|: >
 			GetRow()->screenchars(col)
 
-screencol()							*screencol()*
+screencol()						*screencol()*
 		The result is a Number, which is the current screen column of
 		the cursor. The leftmost column has number 1.
 		This function is mainly used for testing.
@@ -6651,7 +6263,8 @@ screencol()							*screencol()*
 			nnoremap <silent> GG :echom screencol()<CR>
 			noremap GG <Cmd>echom screencol()<Cr>
 <
-screenpos({winid}, {lnum}, {col})				*screenpos()*
+
+screenpos({winid}, {lnum}, {col})			*screenpos()*
 		The result is a Dict with the screen position of the text
 		character in window {winid} at buffer line {lnum} and column
 		{col}.  {col} is a one-based byte index.
@@ -6678,7 +6291,7 @@ screenpos({winid}, {lnum}, {col})				*screenpos()*
 		Can also be used as a |method|: >
 			GetWinid()->screenpos(lnum, col)
 
-screenrow()							*screenrow()*
+screenrow()						*screenrow()*
 		The result is a Number, which is the current screen row of the
 		cursor.  The top line has number one.
 		This function is mainly used for testing.
@@ -6686,7 +6299,7 @@ screenrow()							*screenrow()*
 
 		Note: Same restrictions as with |screencol()|.
 
-screenstring({row}, {col})					*screenstring()*
+screenstring({row}, {col})				*screenstring()*
 		The result is a String that contains the base character and
 		any composing characters at position [row, col] on the screen.
 		This is like |screenchars()| but returning a String with the
@@ -6697,8 +6310,8 @@ screenstring({row}, {col})					*screenstring()*
 		Can also be used as a |method|: >
 			GetRow()->screenstring(col)
 <
-								*search()*
-search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
+
+search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])	*search()*
 		Search for regexp pattern {pattern}.  The search starts at the
 		cursor position (you can use |cursor()| to set it).
 
@@ -6802,7 +6415,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		Can also be used as a |method|: >
 			GetPattern()->search()
 
-searchcount([{options}])					*searchcount()*
+searchcount([{options}])				*searchcount()*
 		Get or update the last search count, like what is displayed
 		without the "S" flag in 'shortmess'.  This works even if
 		'shortmess' does contain the "S" flag.
@@ -6926,7 +6539,8 @@ searchcount([{options}])					*searchcount()*
 		Can also be used as a |method|: >
 			GetSearchOpts()->searchcount()
 <
-searchdecl({name} [, {global} [, {thisblock}]])			*searchdecl()*
+
+searchdecl({name} [, {global} [, {thisblock}]])	*searchdecl()*
 		Search for the declaration of {name}.
 
 		With a non-zero {global} argument it works like |gD|, find
@@ -6947,9 +6561,9 @@ searchdecl({name} [, {global} [, {thisblock}]])			*searchdecl()*
 		Can also be used as a |method|: >
 			GetName()->searchdecl()
 <
-							*searchpair()*
-searchpair({start}, {middle}, {end} [, {flags} [, {skip}
-				[, {stopline} [, {timeout}]]]])
+
+						*searchpair()*
+searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeout}]]]])
 		Search for the match of a nested start-end pair.  This can be
 		used to find the "endif" that matches an "if", while other
 		if/endif pairs in between are ignored.
@@ -7013,7 +6627,7 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 
 		Example, to find the "endif" command in a Vim script: >
 
-	:echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
+			:echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
 			\ 'getline(".") =~ "^\\s*\""')
 
 <		The cursor must be at or after the "if" for which a match is
@@ -7024,18 +6638,18 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 		a match.
 		Another example, to search for the matching "{" of a "}": >
 
-	:echo searchpair('{', '', '}', 'bW')
+			:echo searchpair('{', '', '}', 'bW')
 
 <		This works when the cursor is at or before the "}" for which a
 		match is to be found.  To reject matches that syntax
 		highlighting recognized as strings: >
 
-	:echo searchpair('{', '', '}', 'bW',
-	     \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')
+			:echo searchpair('{', '', '}', 'bW',
+			     \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')
 <
-							*searchpairpos()*
-searchpairpos({start}, {middle}, {end} [, {flags} [, {skip}
-				[, {stopline} [, {timeout}]]]])
+
+						*searchpairpos()*
+searchpairpos({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeout}]]]])
 		Same as |searchpair()|, but returns a |List| with the line and
 		column position of the match. The first element of the |List|
 		is the line number and the second element is the byte index of
@@ -7046,7 +6660,7 @@ searchpairpos({start}, {middle}, {end} [, {flags} [, {skip}
 <
 		See |match-parens| for a bigger and more useful example.
 
-							*searchpos()*
+						*searchpos()*
 searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		Same as |search()|, but returns a |List| with the line and
 		column position of the match. The first element of the |List|
@@ -7054,11 +6668,11 @@ searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		the column position of the match. If no match is found,
 		returns [0, 0].
 		Example: >
-	:let [lnum, col] = searchpos('mypattern', 'n')
+			:let [lnum, col] = searchpos('mypattern', 'n')
 
 <		When the 'p' flag is given then there is an extra item with
 		the sub-pattern match number |search()-sub-match|.  Example: >
-	:let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
+			:let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
 <		In this example "submatch" is 2 when a lowercase letter is
 		found |/\l|, 3 when an uppercase letter is found |/\u|.
 
@@ -7154,9 +6768,9 @@ setbufvar({buf}, {varname}, {val})			*setbufvar()*
 		Can also be used as a |method|, the base is passed as the
 		third argument: >
 			GetValue()->setbufvar(buf, varname)
+<
 
-
-setcellwidths({list})					*setcellwidths()*
+setcellwidths({list})				*setcellwidths()*
 		Specify overrides for cell widths of character ranges.  This
 		tells Vim how wide characters are when displayed in the
 		terminal, counted in screen cells.  The values override
@@ -7190,7 +6804,6 @@ setcellwidths({list})					*setcellwidths()*
 		match with what Vim knows about each emoji.  If it doesn't
 		look right you need to adjust the {list} argument.
 
-
 setcharpos({expr}, {list})				*setcharpos()*
 		Same as |setpos()| but uses the specified column number as the
 		character index instead of the byte index in the line.
@@ -7205,7 +6818,7 @@ setcharpos({expr}, {list})				*setcharpos()*
 		Can also be used as a |method|: >
 			GetPosition()->setcharpos('.')
 
-setcharsearch({dict})					*setcharsearch()*
+setcharsearch({dict})				*setcharsearch()*
 		Set the current character search information to {dict},
 		which contains one or more of the following entries:
 
@@ -7228,7 +6841,7 @@ setcharsearch({dict})					*setcharsearch()*
 		Can also be used as a |method|: >
 			SavedSearch()->setcharsearch()
 
-setcmdline({str} [, {pos}])					*setcmdline()*
+setcmdline({str} [, {pos}])				*setcmdline()*
 		Set the command line to {str} and set the cursor position to
 		{pos}.
 		If {pos} is omitted, the cursor is positioned after the text.
@@ -7256,8 +6869,8 @@ setcmdpos({pos})					*setcmdpos()*
 		Can also be used as a |method|: >
 			GetPos()->setcmdpos()
 
-setcursorcharpos({lnum}, {col} [, {off}])		*setcursorcharpos()*
-setcursorcharpos({list})
+setcursorcharpos({lnum}, {col} [, {off}])
+setcursorcharpos({list})				*setcursorcharpos()*
 		Same as |cursor()| but uses the specified column number as the
 		character index instead of the byte index in the line.
 
@@ -7271,7 +6884,7 @@ setcursorcharpos({list})
 		Can also be used as a |method|: >
 			GetCursorPos()->setcursorcharpos()
 
-setenv({name}, {val})						*setenv()*
+setenv({name}, {val})					*setenv()*
 		Set environment variable {name} to {val}.  Example: >
 			call setenv('HOME', '/home/myhome')
 
@@ -7281,8 +6894,9 @@ setenv({name}, {val})						*setenv()*
 		Can also be used as a |method|, the base is passed as the
 		second argument: >
 			GetPath()->setenv('PATH')
+<
 
-setfperm({fname}, {mode})				*setfperm()* *chmod*
+setfperm({fname}, {mode})			*setfperm()* *chmod*
 		Set the file permissions for {fname} to {mode}.
 		{mode} must be a string with 9 characters.  It is of the form
 		"rwxrwxrwx", where each group of "rwx" flags represent, in
@@ -7333,7 +6947,7 @@ setline({lnum}, {text})					*setline()*
 		second argument: >
 			GetText()->setline(lnum)
 
-setloclist({nr}, {list} [, {action} [, {what}]])		*setloclist()*
+setloclist({nr}, {list} [, {action} [, {what}]])	*setloclist()*
 		Create or replace or add to the location list for window {nr}.
 		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero the current window is used.
@@ -7364,8 +6978,8 @@ setmatches({list} [, {win}])				*setmatches()*
 		Can also be used as a |method|: >
 			GetMatches()->setmatches()
 <
-							*setpos()*
-setpos({expr}, {list})
+
+setpos({expr}, {list})					*setpos()*
 		Set the position for String {expr}.  Possible values:
 			.	the cursor
 			'x	mark x
@@ -7532,8 +7146,8 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		second argument: >
 			GetErrorlist()->setqflist()
 <
-							*setreg()*
-setreg({regname}, {value} [, {options}])
+
+setreg({regname}, {value} [, {options}])			*setreg()*
 		Set the register {regname} to {value}.
 		If {regname} is "" or "@", the unnamed register '"' is used.
 		The {regname} argument is a string.
@@ -7625,7 +7239,7 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
 		fourth argument: >
 			GetValue()->settabwinvar(tab, winnr, name)
 
-settagstack({nr}, {dict} [, {action}])			*settagstack()*
+settagstack({nr}, {dict} [, {action}])		*settagstack()*
 		Modify the tag stack of the window {nr} using {dict}.
 		{nr} can be the window number or the |window-ID|.
 
@@ -7713,7 +7327,7 @@ shellescape({string} [, {special}])			*shellescape()*
 		Can also be used as a |method|: >
 			GetCommand()->shellescape()
 
-shiftwidth([{col}])						*shiftwidth()*
+shiftwidth([{col}])					*shiftwidth()*
 		Returns the effective value of 'shiftwidth'. This is the
 		'shiftwidth' value unless it is zero, in which case it is the
 		'tabstop' value.  To be backwards compatible in indent
@@ -7737,7 +7351,394 @@ shiftwidth([{col}])						*shiftwidth()*
 		Can also be used as a |method|: >
 			GetColumn()->shiftwidth()
 
-sign_ functions are documented here: |sign-functions-details|
+		sign_ functions are documented here: |sign-functions-details|
+
+sign_define({name} [, {dict}])
+sign_define({list})					*sign_define()*
+		Define a new sign named {name} or modify the attributes of an
+		existing sign.  This is similar to the |:sign-define| command.
+
+		Prefix {name} with a unique text to avoid name collisions.
+		There is no {group} like with placing signs.
+
+		The {name} can be a String or a Number.  The optional {dict}
+		argument specifies the sign attributes.  The following values
+		are supported:
+		   icon		full path to the bitmap file for the sign.
+		   linehl	highlight group used for the whole line the
+				sign is placed in.
+		   numhl	highlight group used for the line number where
+				the sign is placed.
+		   text		text that is displayed when there is no icon
+				or the GUI is not being used.
+		   texthl	highlight group used for the text item
+		   culhl	highlight group used for the text item when
+				the cursor is on the same line as the sign and
+				'cursorline' is enabled.
+
+		If the sign named {name} already exists, then the attributes
+		of the sign are updated.
+
+		The one argument {list} can be used to define a list of signs.
+		Each list item is a dictionary with the above items in {dict}
+		and a "name" item for the sign name.
+
+		Returns 0 on success and -1 on failure.  When the one argument
+		{list} is used, then returns a List of values one for each
+		defined sign.
+
+		Examples: >
+			call sign_define("mySign", {
+				\ "text" : "=>",
+				\ "texthl" : "Error",
+				\ "linehl" : "Search"})
+			call sign_define([
+				\ {'name' : 'sign1',
+				\  'text' : '=>'},
+				\ {'name' : 'sign2',
+				\  'text' : '!!'}
+				\ ])
+<
+		Can also be used as a |method|: >
+			GetSignList()->sign_define()
+
+sign_getdefined([{name}])				*sign_getdefined()*
+		Get a list of defined signs and their attributes.
+		This is similar to the |:sign-list| command.
+
+		If the {name} is not supplied, then a list of all the defined
+		signs is returned. Otherwise the attribute of the specified
+		sign is returned.
+
+		Each list item in the returned value is a dictionary with the
+		following entries:
+		   icon		full path to the bitmap file of the sign
+		   linehl	highlight group used for the whole line the
+				sign is placed in; not present if not set.
+		   name		name of the sign
+		   numhl	highlight group used for the line number where
+				the sign is placed; not present if not set.
+		   text		text that is displayed when there is no icon
+				or the GUI is not being used.
+		   texthl	highlight group used for the text item; not
+				present if not set.
+		   culhl	highlight group used for the text item when
+				the cursor is on the same line as the sign and
+				'cursorline' is enabled; not present if not
+				set.
+
+		Returns an empty List if there are no signs and when {name} is
+		not found.
+
+		Examples: >
+			" Get a list of all the defined signs
+			echo sign_getdefined()
+
+			" Get the attribute of the sign named mySign
+			echo sign_getdefined("mySign")
+<
+		Can also be used as a |method|: >
+			GetSignList()->sign_getdefined()
+
+sign_getplaced([{buf} [, {dict}]])			*sign_getplaced()*
+		Return a list of signs placed in a buffer or all the buffers.
+		This is similar to the |:sign-place-list| command.
+
+		If the optional buffer name {buf} is specified, then only the
+		list of signs placed in that buffer is returned.  For the use
+		of {buf}, see |bufname()|. The optional {dict} can contain
+		the following entries:
+		   group	select only signs in this group
+		   id		select sign with this identifier
+		   lnum		select signs placed in this line. For the use
+				of {lnum}, see |line()|.
+		If {group} is "*", then signs in all the groups including the
+		global group are returned. If {group} is not supplied or is an
+		empty string, then only signs in the global group are
+		returned.  If no arguments are supplied, then signs in the
+		global group placed in all the buffers are returned.
+		See |sign-group|.
+
+		Each list item in the returned value is a dictionary with the
+		following entries:
+			bufnr	number of the buffer with the sign
+			signs	list of signs placed in {bufnr}. Each list
+				item is a dictionary with the below listed
+				entries
+
+		The dictionary for each sign contains the following entries:
+			group	 sign group. Set to '' for the global group.
+			id	 identifier of the sign
+			lnum	 line number where the sign is placed
+			name	 name of the defined sign
+			priority sign priority
+
+		The returned signs in a buffer are ordered by their line
+		number and priority.
+
+		Returns an empty list on failure or if there are no placed
+		signs.
+
+		Examples: >
+			" Get a List of signs placed in eval.c in the
+			" global group
+			echo sign_getplaced("eval.c")
+
+			" Get a List of signs in group 'g1' placed in eval.c
+			echo sign_getplaced("eval.c", {'group' : 'g1'})
+
+			" Get a List of signs placed at line 10 in eval.c
+			echo sign_getplaced("eval.c", {'lnum' : 10})
+
+			" Get sign with identifier 10 placed in a.py
+			echo sign_getplaced("a.py", {'id' : 10})
+
+			" Get sign with id 20 in group 'g1' placed in a.py
+			echo sign_getplaced("a.py", {'group' : 'g1',
+							\  'id' : 20})
+
+			" Get a List of all the placed signs
+			echo sign_getplaced()
+<
+		Can also be used as a |method|: >
+			GetBufname()->sign_getplaced()
+<
+
+sign_jump({id}, {group}, {buf})				*sign_jump()*
+		Open the buffer {buf} or jump to the window that contains
+		{buf} and position the cursor at sign {id} in group {group}.
+		This is similar to the |:sign-jump| command.
+
+		If {group} is an empty string, then the global group is used.
+		For the use of {buf}, see |bufname()|.
+
+		Returns the line number of the sign. Returns -1 if the
+		arguments are invalid.
+
+		Example: >
+			" Jump to sign 10 in the current buffer
+			call sign_jump(10, '', '')
+<
+		Can also be used as a |method|: >
+			GetSignid()->sign_jump()
+<
+
+sign_place({id}, {group}, {name}, {buf} [, {dict}])	*sign_place()*
+		Place the sign defined as {name} at line {lnum} in file or
+		buffer {buf} and assign {id} and {group} to sign.  This is
+		similar to the |:sign-place| command.
+
+		If the sign identifier {id} is zero, then a new identifier is
+		allocated.  Otherwise the specified number is used. {group} is
+		the sign group name. To use the global sign group, use an
+		empty string.  {group} functions as a namespace for {id}, thus
+		two groups can use the same IDs. Refer to |sign-identifier|
+		and |sign-group| for more information.
+
+		{name} refers to a defined sign.
+		{buf} refers to a buffer name or number. For the accepted
+		values, see |bufname()|.
+
+		The optional {dict} argument supports the following entries:
+			lnum		line number in the file or buffer
+					{buf} where the sign is to be placed.
+					For the accepted values, see |line()|.
+			priority	priority of the sign. See
+					|sign-priority| for more information.
+
+		If the optional {dict} is not specified, then it modifies the
+		placed sign {id} in group {group} to use the defined sign
+		{name}.
+
+		Returns the sign identifier on success and -1 on failure.
+
+		Examples: >
+			" Place a sign named sign1 with id 5 at line 20 in
+			" buffer json.c
+			call sign_place(5, '', 'sign1', 'json.c',
+							\ {'lnum' : 20})
+
+			" Updates sign 5 in buffer json.c to use sign2
+			call sign_place(5, '', 'sign2', 'json.c')
+
+			" Place a sign named sign3 at line 30 in
+			" buffer json.c with a new identifier
+			let id = sign_place(0, '', 'sign3', 'json.c',
+							\ {'lnum' : 30})
+
+			" Place a sign named sign4 with id 10 in group 'g3'
+			" at line 40 in buffer json.c with priority 90
+			call sign_place(10, 'g3', 'sign4', 'json.c',
+					\ {'lnum' : 40, 'priority' : 90})
+<
+		Can also be used as a |method|: >
+			GetSignid()->sign_place(group, name, expr)
+<
+
+sign_placelist({list})				*sign_placelist()*
+		Place one or more signs.  This is similar to the
+		|sign_place()| function.  The {list} argument specifies the
+		List of signs to place. Each list item is a dict with the
+		following sign attributes:
+		    buffer	Buffer name or number. For the accepted
+				values, see |bufname()|.
+		    group	Sign group. {group} functions as a namespace
+				for {id}, thus two groups can use the same
+				IDs. If not specified or set to an empty
+				string, then the global group is used.   See
+				|sign-group| for more information.
+		    id		Sign identifier. If not specified or zero,
+				then a new unique identifier is allocated.
+				Otherwise the specified number is used. See
+				|sign-identifier| for more information.
+		    lnum	Line number in the buffer where the sign is to
+				be placed. For the accepted values, see
+				|line()|.
+		    name	Name of the sign to place. See |sign_define()|
+				for more information.
+		    priority	Priority of the sign. When multiple signs are
+				placed on a line, the sign with the highest
+				priority is used. If not specified, the
+				default value of 10 is used. See
+				|sign-priority| for more information.
+
+		If {id} refers to an existing sign, then the existing sign is
+		modified to use the specified {name} and/or {priority}.
+
+		Returns a List of sign identifiers. If failed to place a
+		sign, the corresponding list item is set to -1.
+
+		Examples: >
+			" Place sign s1 with id 5 at line 20 and id 10 at line
+			" 30 in buffer a.c
+			let [n1, n2] = sign_placelist([
+				\ {'id' : 5,
+				\  'name' : 's1',
+				\  'buffer' : 'a.c',
+				\  'lnum' : 20},
+				\ {'id' : 10,
+				\  'name' : 's1',
+				\  'buffer' : 'a.c',
+				\  'lnum' : 30}
+				\ ])
+
+			" Place sign s1 in buffer a.c at line 40 and 50
+			" with auto-generated identifiers
+			let [n1, n2] = sign_placelist([
+				\ {'name' : 's1',
+				\  'buffer' : 'a.c',
+				\  'lnum' : 40},
+				\ {'name' : 's1',
+				\  'buffer' : 'a.c',
+				\  'lnum' : 50}
+				\ ])
+<
+		Can also be used as a |method|: >
+			GetSignlist()->sign_placelist()
+
+sign_undefine([{name}])
+sign_undefine({list})				*sign_undefine()*
+		Deletes a previously defined sign {name}. This is similar to
+		the |:sign-undefine| command. If {name} is not supplied, then
+		deletes all the defined signs.
+
+		The one argument {list} can be used to undefine a list of
+		signs. Each list item is the name of a sign.
+
+		Returns 0 on success and -1 on failure.  For the one argument
+		{list} call, returns a list of values one for each undefined
+		sign.
+
+		Examples: >
+			" Delete a sign named mySign
+			call sign_undefine("mySign")
+
+			" Delete signs 'sign1' and 'sign2'
+			call sign_undefine(["sign1", "sign2"])
+
+			" Delete all the signs
+			call sign_undefine()
+<
+		Can also be used as a |method|: >
+			GetSignlist()->sign_undefine()
+
+sign_unplace({group} [, {dict}])			*sign_unplace()*
+		Remove a previously placed sign in one or more buffers.  This
+		is similar to the |:sign-unplace| command.
+
+		{group} is the sign group name. To use the global sign group,
+		use an empty string.  If {group} is set to "*", then all the
+		groups including the global group are used.
+		The signs in {group} are selected based on the entries in
+		{dict}.  The following optional entries in {dict} are
+		supported:
+			buffer	buffer name or number. See |bufname()|.
+			id	sign identifier
+		If {dict} is not supplied, then all the signs in {group} are
+		removed.
+
+		Returns 0 on success and -1 on failure.
+
+		Examples: >
+			" Remove sign 10 from buffer a.vim
+			call sign_unplace('', {'buffer' : "a.vim", 'id' : 10})
+
+			" Remove sign 20 in group 'g1' from buffer 3
+			call sign_unplace('g1', {'buffer' : 3, 'id' : 20})
+
+			" Remove all the signs in group 'g2' from buffer 10
+			call sign_unplace('g2', {'buffer' : 10})
+
+			" Remove sign 30 in group 'g3' from all the buffers
+			call sign_unplace('g3', {'id' : 30})
+
+			" Remove all the signs placed in buffer 5
+			call sign_unplace('*', {'buffer' : 5})
+
+			" Remove the signs in group 'g4' from all the buffers
+			call sign_unplace('g4')
+
+			" Remove sign 40 from all the buffers
+			call sign_unplace('*', {'id' : 40})
+
+			" Remove all the placed signs from all the buffers
+			call sign_unplace('*')
+
+<		Can also be used as a |method|: >
+			GetSigngroup()->sign_unplace()
+<
+
+sign_unplacelist({list})				*sign_unplacelist()*
+		Remove previously placed signs from one or more buffers.  This
+		is similar to the |sign_unplace()| function.
+
+		The {list} argument specifies the List of signs to remove.
+		Each list item is a dict with the following sign attributes:
+		    buffer	buffer name or number. For the accepted
+				values, see |bufname()|. If not specified,
+				then the specified sign is removed from all
+				the buffers.
+		    group	sign group name. If not specified or set to an
+				empty string, then the global sign group is
+				used. If set to "*", then all the groups
+				including the global group are used.
+		    id		sign identifier. If not specified, then all
+				the signs in the specified group are removed.
+
+		Returns a List where an entry is set to 0 if the corresponding
+		sign was successfully removed or -1 on failure.
+
+		Example: >
+			" Remove sign with id 10 from buffer a.vim and sign
+			" with id 20 from buffer b.vim
+			call sign_unplacelist([
+				\ {'id' : 10, 'buffer' : "a.vim"},
+				\ {'id' : 20, 'buffer' : 'b.vim'},
+				\ ])
+<
+		Can also be used as a |method|: >
+			GetSignlist()->sign_unplacelist()
+<
 
 simplify({filename})					*simplify()*
 		Simplify the file name as much as possible without changing
@@ -7759,7 +7760,7 @@ simplify({filename})					*simplify()*
 		Can also be used as a |method|: >
 			GetName()->simplify()
 
-sin({expr})						*sin()*
+sin({expr})							*sin()*
 		Return the sine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
@@ -7772,7 +7773,7 @@ sin({expr})						*sin()*
 		Can also be used as a |method|: >
 			Compute()->sin()
 
-sinh({expr})						*sinh()*
+sinh({expr})							*sinh()*
 		Return the hyperbolic sine of {expr} as a |Float| in the range
 		[-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -7786,7 +7787,7 @@ sinh({expr})						*sinh()*
 		Can also be used as a |method|: >
 			Compute()->sinh()
 
-slice({expr}, {start} [, {end}])			*slice()*
+slice({expr}, {start} [, {end}])				*slice()*
 		Similar to using a |slice| "expr[start : end]", but "end" is
 		used exclusive.  And for a string the indexes are used as
 		character indexes instead of byte indexes.
@@ -7797,9 +7798,9 @@ slice({expr}, {start} [, {end}])			*slice()*
 
 		Can also be used as a |method|: >
 			GetList()->slice(offset)
+<
 
-
-sockconnect({mode}, {address} [, {opts}])		 *sockconnect()*
+sockconnect({mode}, {address} [, {opts}])		*sockconnect()*
 		Connect a socket to an address. If {mode} is "pipe" then
 		{address} should be the path of a local domain socket (on
 		unix) or named pipe (on Windows). If {mode} is "tcp" then
@@ -7848,7 +7849,7 @@ sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 			:language collate en_US.UTF8
 			:echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
 <			['n', 'o', 'O', 'ö', 'p', 'z'] ~
->
+		>
 			" ö is sorted after z with Swedish locale.
 			:language collate sv_SE.UTF8
 			:echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
@@ -7899,8 +7900,8 @@ sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 <		For a simple expression you can use a lambda: >
 			eval mylist->sort({i1, i2 -> i1 - i2})
 <
-							*soundfold()*
-soundfold({word})
+
+soundfold({word})					*soundfold()*
 		Return the sound-folded equivalent of {word}.  Uses the first
 		language in 'spelllang' for the current window that supports
 		soundfolding.  'spell' must be set.  When no sound folding is
@@ -7911,8 +7912,8 @@ soundfold({word})
 		Can also be used as a |method|: >
 			GetWord()->soundfold()
 <
-							*spellbadword()*
-spellbadword([{sentence}])
+
+spellbadword([{sentence}])				*spellbadword()*
 		Without argument: The result is the badly spelled word under
 		or after the cursor.  The cursor is moved to the start of the
 		bad word.  When no bad word is found in the cursor line the
@@ -7939,8 +7940,8 @@ spellbadword([{sentence}])
 		Can also be used as a |method|: >
 			GetText()->spellbadword()
 <
-							*spellsuggest()*
-spellsuggest({word} [, {max} [, {capital}]])
+
+spellsuggest({word} [, {max} [, {capital}]])		*spellsuggest()*
 		Return a |List| with spelling suggestions to replace {word}.
 		When {max} is given up to this number of suggestions are
 		returned.  Otherwise up to 25 suggestions are returned.
@@ -7964,7 +7965,7 @@ spellsuggest({word} [, {max} [, {capital}]])
 		Can also be used as a |method|: >
 			GetWord()->spellsuggest()
 
-split({string} [, {pattern} [, {keepempty}]])			*split()*
+split({string} [, {pattern} [, {keepempty}]])		*split()*
 		Make a |List| out of {string}.  When {pattern} is omitted or
 		empty each white-separated sequence of characters becomes an
 		item.
@@ -7990,7 +7991,7 @@ split({string} [, {pattern} [, {keepempty}]])			*split()*
 		Can also be used as a |method|: >
 			GetString()->split()
 
-sqrt({expr})						*sqrt()*
+sqrt({expr})							*sqrt()*
 		Return the non-negative square root of Float {expr} as a
 		|Float|.
 		{expr} must evaluate to a |Float| or a |Number|.  When {expr}
@@ -8023,7 +8024,7 @@ srand([{expr}])						*srand()*
 		Can also be used as a |method|: >
 			userinput->srand()
 
-stdioopen({opts})			 *stdioopen()*
+stdioopen({opts})					*stdioopen()*
 		With |--headless| this opens stdin and stdout as a |channel|.
 		May be called only once. See |channel-stdio|. stderr is not
 		handled by this function, see |v:stderr|.
@@ -8044,7 +8045,6 @@ stdioopen({opts})			 *stdioopen()*
 		  - |channel-id| on success (value is always 1)
 		  - 0 on invalid arguments
 
-
 stdpath({what})					*stdpath()* *E6100*
 		Returns |standard-path| locations of various default files and
 		directories.
@@ -8065,9 +8065,9 @@ stdpath({what})					*stdpath()* *E6100*
 
 		Example: >
 			:echo stdpath("config")
+<
 
-
-str2float({string} [, {quoted}])				*str2float()*
+str2float({string} [, {quoted}])			*str2float()*
 		Convert String {string} to a Float.  This mostly works the
 		same as when using a floating point number in an expression,
 		see |floating-point-format|.  But it's a bit more permissive.
@@ -8104,7 +8104,7 @@ str2list({string} [, {utf8}])				*str2list()*
 <		Can also be used as a |method|: >
 			GetString()->str2list()
 
-str2nr({string} [, {base}])			*str2nr()*
+str2nr({string} [, {base}])				*str2nr()*
 		Convert string {string} to a number.
 		{base} is the conversion base, it can be 2, 8, 10 or 16.
 		When {quoted} is present and non-zero then embedded single
@@ -8125,7 +8125,7 @@ str2nr({string} [, {base}])			*str2nr()*
 
 		Can also be used as a |method|: >
 			GetText()->str2nr()
-
+<
 
 strcharlen({string})					*strcharlen()*
 		The result is a Number, which is the number of characters
@@ -8139,9 +8139,9 @@ strcharlen({string})					*strcharlen()*
 
 		Can also be used as a |method|: >
 			GetText()->strcharlen()
+<
 
-
-strcharpart({src}, {start} [, {len} [, {skipcc}]])		*strcharpart()*
+strcharpart({src}, {start} [, {len} [, {skipcc}]])	*strcharpart()*
 		Like |strpart()| but using character index and length instead
 		of byte index and length.
 		When {skipcc} is omitted or zero, composing characters are
@@ -8158,9 +8158,9 @@ strcharpart({src}, {start} [, {len} [, {skipcc}]])		*strcharpart()*
 
 		Can also be used as a |method|: >
 			GetText()->strcharpart(5)
+<
 
-
-strchars({string} [, {skipcc}])					*strchars()*
+strchars({string} [, {skipcc}])				*strchars()*
 		The result is a Number, which is the number of characters
 		in String {string}.
 		When {skipcc} is omitted or zero, composing characters are
@@ -8191,7 +8191,7 @@ strchars({string} [, {skipcc}])					*strchars()*
 		Can also be used as a |method|: >
 			GetText()->strchars()
 
-strdisplaywidth({string} [, {col}])			*strdisplaywidth()*
+strdisplaywidth({string} [, {col}])		*strdisplaywidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies on the screen when it starts at {col}
 		(first column is zero).  When {col} is omitted zero is used.
@@ -8240,7 +8240,7 @@ strgetchar({str}, {index})				*strgetchar()*
 		Can also be used as a |method|: >
 			GetText()->strgetchar(5)
 
-stridx({haystack}, {needle} [, {start}])		*stridx()*
+stridx({haystack}, {needle} [, {start}])			*stridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the first occurrence of the String {needle}.
 		If {start} is specified, the search starts at index {start}.
@@ -8262,8 +8262,9 @@ stridx({haystack}, {needle} [, {start}])		*stridx()*
 		Can also be used as a |method|: >
 			GetHaystack()->stridx(needle)
 <
-							*string()*
-string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
+
+string({expr})						*string()*
+		Return {expr} converted to a String.  If {expr} is a Number,
 		Float, String, Blob or a composition of them, then the result
 		can be parsed back with |eval()|.
 			{expr} type	result ~
@@ -8301,7 +8302,7 @@ strlen({string})						*strlen()*
 		Can also be used as a |method|: >
 			GetString()->strlen()
 
-strpart({src}, {start} [, {len} [, {chars}]])			*strpart()*
+strpart({src}, {start} [, {len} [, {chars}]])		*strpart()*
 		The result is a String, which is part of {src}, starting from
 		byte {start}, with the byte length {len}.
 		When {chars} is present and TRUE then {len} is the number of
@@ -8356,6 +8357,7 @@ strptime({format}, {timestring})				*strptime()*
 		Can also be used as a |method|: >
 			GetFormat()->strptime(timestring)
 <
+
 strridx({haystack}, {needle} [, {start}])			*strridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the last occurrence of the String {needle}.
@@ -8412,6 +8414,7 @@ strutf16len({string} [, {countcc}])			*strutf16len()*
 		Can also be used as a |method|: >
 			GetText()->strutf16len()
 <
+
 strwidth({string})					*strwidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies.  A Tab character is counted as one
@@ -8424,7 +8427,7 @@ strwidth({string})					*strwidth()*
 		Can also be used as a |method|: >
 			GetString()->strwidth()
 
-submatch({nr} [, {list}])			*submatch()* *E935*
+submatch({nr} [, {list}])				*submatch()* *E935*
 		Only for an expression in a |:substitute| command or
 		substitute() function.
 		Returns the {nr}th submatch of the matched text.  When {nr}
@@ -8501,7 +8504,7 @@ substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 		Can also be used as a |method|: >
 			GetString()->substitute(pat, sub, flags)
 
-swapfilelist()						*swapfilelist()*
+swapfilelist()					*swapfilelist()*
 		Returns a list of swap file names, like what "vim -r" shows.
 		See the |-r| command argument.  The 'directory' option is used
 		for the directories to inspect.  If you only want to get a
@@ -8609,10 +8612,10 @@ synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
 
 		Example (echoes the color of the syntax item under the
 		cursor): >
-	:echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
+			:echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
 <
 		Can also be used as a |method|: >
-	:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
+			:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 
 synIDtrans({synID})					*synIDtrans()*
 		The result is a Number, which is the translated syntax ID of
@@ -8623,7 +8626,7 @@ synIDtrans({synID})					*synIDtrans()*
 		Returns zero on error.
 
 		Can also be used as a |method|: >
-	:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
+			:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 
 synconcealed({lnum}, {col})				*synconcealed()*
 		The result is a |List| with currently three items:
@@ -8649,7 +8652,7 @@ synconcealed({lnum}, {col})				*synconcealed()*
 			synconcealed(lnum, 4)   [1, 'X', 2]
 			synconcealed(lnum, 5)   [1, 'X', 2]
 			synconcealed(lnum, 6)   [0, '', 0]
-
+<
 
 synstack({lnum}, {col})					*synstack()*
 		Return a |List|, which is the stack of syntax items at the
@@ -8739,7 +8742,7 @@ systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
 		Can also be used as a |method|: >
 			:echo GetCmd()->systemlist()
 
-tabpagebuflist([{arg}])					*tabpagebuflist()*
+tabpagebuflist([{arg}])				*tabpagebuflist()*
 		The result is a |List|, where each item is the number of the
 		buffer associated with each window in the current tab page.
 		{arg} specifies the number of the tab page to be used. When
@@ -8785,10 +8788,10 @@ tabpagewinnr({tabarg} [, {arg}])			*tabpagewinnr()*
 		Can also be used as a |method|: >
 			GetTabpage()->tabpagewinnr()
 <
-							*tagfiles()*
-tagfiles()	Returns a |List| with the file names used to search for tags
-		for the current buffer.  This is the 'tags' option expanded.
 
+tagfiles()						*tagfiles()*
+		Returns a |List| with the file names used to search for tags
+		for the current buffer.  This is the 'tags' option expanded.
 
 taglist({expr} [, {filename}])				*taglist()*
 		Returns a |List| of tags matching the regular expression {expr}.
@@ -8836,29 +8839,7 @@ taglist({expr} [, {filename}])				*taglist()*
 		Can also be used as a |method|: >
 			GetTagpattern()->taglist()
 
-tempname()					*tempname()* *temp-file-name*
-		Generates a (non-existent) filename located in the Nvim root
-		|tempdir|. Scripts can use the filename as a temporary file.
-		Example: >
-			:let tmpfile = tempname()
-			:exe "redir > " .. tmpfile
-
-termopen({cmd} [, {opts}])			*termopen()*
-		Spawns {cmd} in a new pseudo-terminal session connected
-		to the current (unmodified) buffer. Parameters and behavior
-		are the same as |jobstart()| except "pty", "width", "height",
-		and "TERM" are ignored: "height" and "width" are taken from
-		the current window. Note that termopen() implies a "pty" arg
-		to jobstart(), and thus has the implications documented at
-		|jobstart()|.
-
-		Returns the same values as jobstart().
-
-		Terminal environment is initialized as in |jobstart-env|,
-		except $TERM is set to "xterm-256color". Full behavior is
-		described in |terminal|.
-
-tan({expr})						*tan()*
+tan({expr})							*tan()*
 		Return the tangent of {expr}, measured in radians, as a |Float|
 		in the range [-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -8872,7 +8853,7 @@ tan({expr})						*tan()*
 		Can also be used as a |method|: >
 			Compute()->tan()
 
-tanh({expr})						*tanh()*
+tanh({expr})							*tanh()*
 		Return the hyperbolic tangent of {expr} as a |Float| in the
 		range [-1, 1].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -8886,8 +8867,30 @@ tanh({expr})						*tanh()*
 		Can also be used as a |method|: >
 			Compute()->tanh()
 <
-							*timer_info()*
-timer_info([{id}])
+
+tempname()						*tempname()*
+		Generates a (non-existent) filename located in the Nvim root
+		|tempdir|. Scripts can use the filename as a temporary file.
+		Example: >
+			:let tmpfile = tempname()
+			:exe "redir > " .. tmpfile
+
+termopen({cmd} [, {opts}])				*termopen()*
+		Spawns {cmd} in a new pseudo-terminal session connected
+		to the current (unmodified) buffer. Parameters and behavior
+		are the same as |jobstart()| except "pty", "width", "height",
+		and "TERM" are ignored: "height" and "width" are taken from
+		the current window. Note that termopen() implies a "pty" arg
+		to jobstart(), and thus has the implications documented at
+		|jobstart()|.
+
+		Returns the same values as jobstart().
+
+		Terminal environment is initialized as in |jobstart-env|,
+		except $TERM is set to "xterm-256color". Full behavior is
+		described in |terminal|.
+
+timer_info([{id}])					*timer_info()*
 		Return a list with information about timers.
 		When {id} is given only information about this timer is
 		returned.  When timer {id} does not exist an empty list is
@@ -8905,7 +8908,8 @@ timer_info([{id}])
 		Can also be used as a |method|: >
 			GetTimer()->timer_info()
 <
-timer_pause({timer}, {paused})				*timer_pause()*
+
+timer_pause({timer}, {paused})			*timer_pause()*
 		Pause or unpause a timer.  A paused timer does not invoke its
 		callback when its time expires.  Unpausing a timer may cause
 		the callback to be invoked almost immediately if enough time
@@ -8921,8 +8925,8 @@ timer_pause({timer}, {paused})				*timer_pause()*
 		Can also be used as a |method|: >
 			GetTimer()->timer_pause(1)
 <
-						*timer_start()* *timer* *timers*
-timer_start({time}, {callback} [, {options}])
+
+timer_start({time}, {callback} [, {options}])	*timer_start()* *timer*
 		Create a timer and return the timer ID.
 
 		{time} is the waiting time in milliseconds. This is the
@@ -8965,7 +8969,8 @@ timer_stop({timer})					*timer_stop()*
 		Can also be used as a |method|: >
 			GetTimer()->timer_stop()
 <
-timer_stopall()						*timer_stopall()*
+
+timer_stopall()					*timer_stopall()*
 		Stop all timers.  The timer callbacks will no longer be
 		invoked.  Useful if some timers is misbehaving.  If there are
 		no timers there is no error.
@@ -8986,7 +8991,7 @@ toupper({expr})						*toupper()*
 		Can also be used as a |method|: >
 			GetText()->toupper()
 
-tr({src}, {fromstr}, {tostr})				*tr()*
+tr({src}, {fromstr}, {tostr})					*tr()*
 		The result is a copy of the {src} string with all characters
 		which appear in {fromstr} replaced by the character in that
 		position in the {tostr} string.  Thus the first character in
@@ -9033,7 +9038,7 @@ trim({text} [, {mask} [, {dir}]])				*trim()*
 		Can also be used as a |method|: >
 			GetText()->trim()
 
-trunc({expr})							*trunc()*
+trunc({expr})						*trunc()*
 		Return the largest integral value with magnitude less than or
 		equal to {expr} as a |Float| (truncate towards zero).
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -9073,13 +9078,13 @@ type({expr})							*type()*
 <		In place of checking for |v:null| type it is better to check
 		for |v:null| directly as it is the only value of this type: >
 			:if myvar is v:null
-<               To check if the v:t_ variables exist use this: >
-                        :if exists('v:t_number')
+<		               To check if the v:t_ variables exist use this: >
+		                        :if exists('v:t_number')
 
 <		Can also be used as a |method|: >
 			mylist->type()
 
-undofile({name})					*undofile()*
+undofile({name})						*undofile()*
 		Return the name of the undo file that would be used for a file
 		with name {name} when writing.  This uses the 'undodir'
 		option, finding directories that exist.  It does not check if
@@ -9149,8 +9154,8 @@ uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
 		Can also be used as a |method|: >
 			mylist->uniq()
 <
-							*utf16idx()*
-utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
+
+utf16idx({string}, {idx} [, {countcc} [, {charidx}]])	*utf16idx()*
 		Same as |charidx()| but returns the UTF-16 code unit index of
 		the byte at {idx} in {string} (after converting it to UTF-16).
 
@@ -9179,7 +9184,7 @@ utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
 <
 		Can also be used as a |method|: >
 			GetName()->utf16idx(idx)
-
+<
 
 values({dict})						*values()*
 		Return a |List| with all the values of {dict}.  The |List| is
@@ -9264,7 +9269,7 @@ virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
 		Can also be used as a |method|: >
 			GetWinid()->virtcol2col(lnum, col)
 
-visualmode([{expr}])						*visualmode()*
+visualmode([{expr}])					*visualmode()*
 		The result is a String, which describes the last Visual mode
 		used in the current buffer.  Initially it returns an empty
 		string, but once Visual mode has been used, it returns "v",
@@ -9305,7 +9310,7 @@ wildmenumode()					*wildmenumode()*
 		gracefully. (Makes only sense with |mapmode-c| mappings).
 
 		For example to make <c-j> work like <down> in wildmode, use: >
-    :cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
+		    :cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
 <
 		(Note, this needs the 'wildcharm' option set appropriately).
 
@@ -9367,6 +9372,7 @@ win_gettype([{nr}])					*win_gettype()*
 		Can also be used as a |method|: >
 			GetWinid()->win_gettype()
 <
+
 win_gotoid({expr})					*win_gotoid()*
 		Go to window with ID {expr}.  This may also change the current
 		tabpage.
@@ -9375,7 +9381,7 @@ win_gotoid({expr})					*win_gotoid()*
 		Can also be used as a |method|: >
 			GetWinid()->win_gotoid()
 
-win_id2tabwin({expr})					*win_id2tabwin()*
+win_id2tabwin({expr})				*win_id2tabwin()*
 		Return a list with the tab number and window number of window
 		with ID {expr}: [tabnr, winnr].
 		Return [0, 0] if the window cannot be found.
@@ -9390,7 +9396,7 @@ win_id2win({expr})					*win_id2win()*
 		Can also be used as a |method|: >
 			GetWinid()->win_id2win()
 
-win_move_separator({nr}, {offset})			*win_move_separator()*
+win_move_separator({nr}, {offset})		*win_move_separator()*
 		Move window {nr}'s vertical separator (i.e., the right border)
 		by {offset} columns, as if being dragged by the mouse. {nr}
 		can be a window number or |window-ID|. A positive {offset}
@@ -9408,7 +9414,7 @@ win_move_separator({nr}, {offset})			*win_move_separator()*
 		Can also be used as a |method|: >
 			GetWinnr()->win_move_separator(offset)
 
-win_move_statusline({nr}, {offset})			*win_move_statusline()*
+win_move_statusline({nr}, {offset})		*win_move_statusline()*
 		Move window {nr}'s status line (i.e., the bottom border) by
 		{offset} rows, as if being dragged by the mouse. {nr} can be a
 		window number or |window-ID|. A positive {offset} moves down
@@ -9435,6 +9441,7 @@ win_screenpos({nr})					*win_screenpos()*
 		Can also be used as a |method|: >
 			GetWinid()->win_screenpos()
 <
+
 win_splitmove({nr}, {target} [, {options}])		*win_splitmove()*
 		Move the window {nr} to a new split of the window {target}.
 		This is similar to moving to {target}, creating a new window
@@ -9458,26 +9465,27 @@ win_splitmove({nr}, {target} [, {options}])		*win_splitmove()*
 		Can also be used as a |method|: >
 			GetWinid()->win_splitmove(target)
 <
-							*winbufnr()*
-winbufnr({nr})	The result is a Number, which is the number of the buffer
+
+winbufnr({nr})						*winbufnr()*
+		The result is a Number, which is the number of the buffer
 		associated with window {nr}.  {nr} can be the window number or
 		the |window-ID|.
 		When {nr} is zero, the number of the buffer in the current
 		window is returned.
 		When window {nr} doesn't exist, -1 is returned.
 		Example: >
-  :echo "The file in the current window is " .. bufname(winbufnr(0))
+		  :echo "The file in the current window is " .. bufname(winbufnr(0))
 <
 		Can also be used as a |method|: >
 			FindWindow()->winbufnr()->bufname()
 <
-							*wincol()*
-wincol()	The result is a Number, which is the virtual column of the
+
+wincol()							*wincol()*
+		The result is a Number, which is the virtual column of the
 		cursor in the window.  This is counting screen cells from the
 		left side of the window.  The leftmost column is one.
 
-							*windowsversion()*
-windowsversion()
+windowsversion()					*windowsversion()*
 		The result is a String.  For MS-Windows it indicates the OS
 		version.  E.g, Windows 10 is "10.0", Windows 8 is "6.2",
 		Windows XP is "5.1".  For non-MS-Windows systems the result is
@@ -9491,11 +9499,12 @@ winheight({nr})						*winheight()*
 		An existing window always has a height of zero or more.
 		This excludes any window toolbar line.
 		Examples: >
-  :echo "The current window has " .. winheight(0) .. " lines."
+		  :echo "The current window has " .. winheight(0) .. " lines."
 
 <		Can also be used as a |method|: >
 			GetWinid()->winheight()
 <
+
 winlayout([{tabnr}])					*winlayout()*
 		The result is a nested List containing the layout of windows
 		in a tabpage.
@@ -9529,15 +9538,16 @@ winlayout([{tabnr}])					*winlayout()*
 		Can also be used as a |method|: >
 			GetTabnr()->winlayout()
 <
-							*winline()*
-winline()	The result is a Number, which is the screen line of the cursor
+
+winline()							*winline()*
+		The result is a Number, which is the screen line of the cursor
 		in the window.  This is counting screen lines from the top of
 		the window.  The first line is one.
 		If the cursor was moved the view on the file will be updated
 		first, this may cause a scroll.
 
-							*winnr()*
-winnr([{arg}])	The result is a Number, which is the number of the current
+winnr([{arg}])						*winnr()*
+		The result is a Number, which is the number of the current
 		window.  The top window has number 1.
 		Returns zero for a popup window.
 
@@ -9568,8 +9578,9 @@ winnr([{arg}])	The result is a Number, which is the number of the current
 <		Can also be used as a |method|: >
 			GetWinval()->winnr()
 <
-							*winrestcmd()*
-winrestcmd()	Returns a sequence of |:resize| commands that should restore
+
+winrestcmd()						*winrestcmd()*
+		Returns a sequence of |:resize| commands that should restore
 		the current window sizes.  Only works properly when no windows
 		are opened or closed and the current window and tab page is
 		unchanged.
@@ -9578,8 +9589,8 @@ winrestcmd()	Returns a sequence of |:resize| commands that should restore
 			:call MessWithWindowSizes()
 			:exe cmd
 <
-							*winrestview()*
-winrestview({dict})
+
+winrestview({dict})					*winrestview()*
 		Uses the |Dictionary| returned by |winsaveview()| to restore
 		the view of the current window.
 		Note: The {dict} does not have to contain all values, that are
@@ -9598,8 +9609,9 @@ winrestview({dict})
 		Can also be used as a |method|: >
 			GetView()->winrestview()
 <
-							*winsaveview()*
-winsaveview()	Returns a |Dictionary| that contains information to restore
+
+winsaveview()						*winsaveview()*
+		Returns a |Dictionary| that contains information to restore
 		the view of the current window.  Use |winrestview()| to
 		restore the view.
 		This is useful if you have a mapping that jumps around in the
@@ -9625,7 +9637,6 @@ winsaveview()	Returns a |Dictionary| that contains information to restore
 			skipcol		columns skipped
 		Note that no option values are saved.
 
-
 winwidth({nr})						*winwidth()*
 		The result is a Number, which is the width of window {nr}.
 		{nr} can be the window number or the |window-ID|.
@@ -9633,10 +9644,10 @@ winwidth({nr})						*winwidth()*
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a width of zero or more.
 		Examples: >
-  :echo "The current window has " .. winwidth(0) .. " columns."
-  :if winwidth(0) <= 50
-  :  50 wincmd |
-  :endif
+		  :echo "The current window has " .. winwidth(0) .. " columns."
+		  :if winwidth(0) <= 50
+		  :  50 wincmd |
+		  :endif
 <		For getting the terminal or screen size, see the 'columns'
 		option.
 
@@ -9664,9 +9675,7 @@ wordcount()						*wordcount()*
 			visual_words    Number of words visually selected
 					(only in Visual mode)
 
-
-							*writefile()*
-writefile({object}, {fname} [, {flags}])
+writefile({object}, {fname} [, {flags}])		*writefile()*
 		When {object} is a |List| write it to file {fname}.  Each list
 		item is separated with a NL.  Each list item must be a String
 		or Number.
@@ -9715,7 +9724,7 @@ writefile({object}, {fname} [, {flags}])
 <		Can also be used as a |method|: >
 			GetText()->writefile("thefile")
 
-xor({expr}, {expr})					*xor()*
+xor({expr}, {expr})						*xor()*
 		Bitwise XOR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `and()` and `or()`.
@@ -9725,8 +9734,9 @@ xor({expr}, {expr})					*xor()*
 		Can also be used as a |method|: >
 			:let bits = bits->xor(0x80)
 <
+
 ==============================================================================
-3. Matching a pattern in a String			*string-match*
+2. Matching a pattern in a String			*string-match*
 
 This is common between several functions. A regexp pattern as explained at
 |pattern| is normally used to find a match in the buffer lines.  When a
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 6a839b205c..660d930f5f 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -296,7 +296,7 @@ arguments separated by " " (space) instead of "\t" (tab).
 <
 
 ==============================================================================
-luaeval()                                                 *lua-eval* *luaeval()*
+luaeval()                                                 *lua-eval*
 
 The (dual) equivalent of "vim.eval" for passing Lua values to Nvim is
 "luaeval". "luaeval" takes an expression string and an optional argument used
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index b4c4debac7..8ecfadce17 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -369,390 +369,15 @@ See |sign_jump()| for the equivalent Vim script function.
 ==============================================================================
 3. Functions					*sign-functions-details*
 
-sign_define({name} [, {dict}])				*sign_define()*
-sign_define({list})
-		Define a new sign named {name} or modify the attributes of an
-		existing sign.  This is similar to the |:sign-define| command.
-
-		Prefix {name} with a unique text to avoid name collisions.
-		There is no {group} like with placing signs.
-
-		The {name} can be a String or a Number.  The optional {dict}
-		argument specifies the sign attributes.  The following values
-		are supported:
-		   icon		full path to the bitmap file for the sign.
-		   linehl	highlight group used for the whole line the
-				sign is placed in.
-		   numhl	highlight group used for the line number where
-				the sign is placed.
-		   text		text that is displayed when there is no icon
-				or the GUI is not being used.
-		   texthl	highlight group used for the text item
-		   culhl	highlight group used for the text item when
-				the cursor is on the same line as the sign and
-				'cursorline' is enabled.
-
-		If the sign named {name} already exists, then the attributes
-		of the sign are updated.
-
-		The one argument {list} can be used to define a list of signs.
-		Each list item is a dictionary with the above items in {dict}
-		and a "name" item for the sign name.
-
-		Returns 0 on success and -1 on failure.  When the one argument
-		{list} is used, then returns a List of values one for each
-		defined sign.
-
-		Examples: >
-			call sign_define("mySign", {
-				\ "text" : "=>",
-				\ "texthl" : "Error",
-				\ "linehl" : "Search"})
-			call sign_define([
-				\ {'name' : 'sign1',
-				\  'text' : '=>'},
-				\ {'name' : 'sign2',
-				\  'text' : '!!'}
-				\ ])
-<
-		Can also be used as a |method|: >
-			GetSignList()->sign_define()
-
-sign_getdefined([{name}])				*sign_getdefined()*
-		Get a list of defined signs and their attributes.
-		This is similar to the |:sign-list| command.
-
-		If the {name} is not supplied, then a list of all the defined
-		signs is returned. Otherwise the attribute of the specified
-		sign is returned.
-
-		Each list item in the returned value is a dictionary with the
-		following entries:
-		   icon		full path to the bitmap file of the sign
-		   linehl	highlight group used for the whole line the
-				sign is placed in; not present if not set.
-		   name		name of the sign
-		   numhl	highlight group used for the line number where
-				the sign is placed; not present if not set.
-		   text		text that is displayed when there is no icon
-				or the GUI is not being used.
-		   texthl	highlight group used for the text item; not
-				present if not set.
-		   culhl	highlight group used for the text item when
-				the cursor is on the same line as the sign and
-				'cursorline' is enabled; not present if not
-				set.
-
-		Returns an empty List if there are no signs and when {name} is
-		not found.
-
-		Examples: >
-			" Get a list of all the defined signs
-			echo sign_getdefined()
-
-			" Get the attribute of the sign named mySign
-			echo sign_getdefined("mySign")
-<
-		Can also be used as a |method|: >
-			GetSignList()->sign_getdefined()
-
-sign_getplaced([{buf} [, {dict}]])			*sign_getplaced()*
-		Return a list of signs placed in a buffer or all the buffers.
-		This is similar to the |:sign-place-list| command.
-
-		If the optional buffer name {buf} is specified, then only the
-		list of signs placed in that buffer is returned.  For the use
-		of {buf}, see |bufname()|. The optional {dict} can contain
-		the following entries:
-		   group	select only signs in this group
-		   id		select sign with this identifier
-		   lnum		select signs placed in this line. For the use
-				of {lnum}, see |line()|.
-		If {group} is "*", then signs in all the groups including the
-		global group are returned. If {group} is not supplied or is an
-		empty string, then only signs in the global group are
-		returned.  If no arguments are supplied, then signs in the
-		global group placed in all the buffers are returned.
-		See |sign-group|.
-
-		Each list item in the returned value is a dictionary with the
-		following entries:
-			bufnr	number of the buffer with the sign
-			signs	list of signs placed in {bufnr}. Each list
-				item is a dictionary with the below listed
-				entries
-
-		The dictionary for each sign contains the following entries:
-			group	 sign group. Set to '' for the global group.
-			id	 identifier of the sign
-			lnum	 line number where the sign is placed
-			name	 name of the defined sign
-			priority sign priority
-
-		The returned signs in a buffer are ordered by their line
-		number and priority.
-
-		Returns an empty list on failure or if there are no placed
-		signs.
-
-		Examples: >
-			" Get a List of signs placed in eval.c in the
-			" global group
-			echo sign_getplaced("eval.c")
-
-			" Get a List of signs in group 'g1' placed in eval.c
-			echo sign_getplaced("eval.c", {'group' : 'g1'})
-
-			" Get a List of signs placed at line 10 in eval.c
-			echo sign_getplaced("eval.c", {'lnum' : 10})
-
-			" Get sign with identifier 10 placed in a.py
-			echo sign_getplaced("a.py", {'id' : 10})
-
-			" Get sign with id 20 in group 'g1' placed in a.py
-			echo sign_getplaced("a.py", {'group' : 'g1',
-							\  'id' : 20})
-
-			" Get a List of all the placed signs
-			echo sign_getplaced()
-<
-		Can also be used as a |method|: >
-			GetBufname()->sign_getplaced()
-<
-							*sign_jump()*
-sign_jump({id}, {group}, {buf})
-		Open the buffer {buf} or jump to the window that contains
-		{buf} and position the cursor at sign {id} in group {group}.
-		This is similar to the |:sign-jump| command.
-
-		If {group} is an empty string, then the global group is used.
-		For the use of {buf}, see |bufname()|.
-
-		Returns the line number of the sign. Returns -1 if the
-		arguments are invalid.
-
-		Example: >
-			" Jump to sign 10 in the current buffer
-			call sign_jump(10, '', '')
-<
-		Can also be used as a |method|: >
-			GetSignid()->sign_jump()
-<
-							*sign_place()*
-sign_place({id}, {group}, {name}, {buf} [, {dict}])
-		Place the sign defined as {name} at line {lnum} in file or
-		buffer {buf} and assign {id} and {group} to sign.  This is
-		similar to the |:sign-place| command.
-
-		If the sign identifier {id} is zero, then a new identifier is
-		allocated.  Otherwise the specified number is used. {group} is
-		the sign group name. To use the global sign group, use an
-		empty string.  {group} functions as a namespace for {id}, thus
-		two groups can use the same IDs. Refer to |sign-identifier|
-		and |sign-group| for more information.
-
-		{name} refers to a defined sign.
-		{buf} refers to a buffer name or number. For the accepted
-		values, see |bufname()|.
-
-		The optional {dict} argument supports the following entries:
-			lnum		line number in the file or buffer
-					{buf} where the sign is to be placed.
-					For the accepted values, see |line()|.
-			priority	priority of the sign. See
-					|sign-priority| for more information.
-
-		If the optional {dict} is not specified, then it modifies the
-		placed sign {id} in group {group} to use the defined sign
-		{name}.
-
-		Returns the sign identifier on success and -1 on failure.
-
-		Examples: >
-			" Place a sign named sign1 with id 5 at line 20 in
-			" buffer json.c
-			call sign_place(5, '', 'sign1', 'json.c',
-							\ {'lnum' : 20})
-
-			" Updates sign 5 in buffer json.c to use sign2
-			call sign_place(5, '', 'sign2', 'json.c')
-
-			" Place a sign named sign3 at line 30 in
-			" buffer json.c with a new identifier
-			let id = sign_place(0, '', 'sign3', 'json.c',
-							\ {'lnum' : 30})
-
-			" Place a sign named sign4 with id 10 in group 'g3'
-			" at line 40 in buffer json.c with priority 90
-			call sign_place(10, 'g3', 'sign4', 'json.c',
-					\ {'lnum' : 40, 'priority' : 90})
-<
-		Can also be used as a |method|: >
-			GetSignid()->sign_place(group, name, expr)
-<
-							*sign_placelist()*
-sign_placelist({list})
-		Place one or more signs.  This is similar to the
-		|sign_place()| function.  The {list} argument specifies the
-		List of signs to place. Each list item is a dict with the
-		following sign attributes:
-		    buffer	Buffer name or number. For the accepted
-				values, see |bufname()|.
-		    group	Sign group. {group} functions as a namespace
-				for {id}, thus two groups can use the same
-				IDs. If not specified or set to an empty
-				string, then the global group is used.   See
-				|sign-group| for more information.
-		    id		Sign identifier. If not specified or zero,
-				then a new unique identifier is allocated.
-				Otherwise the specified number is used. See
-				|sign-identifier| for more information.
-		    lnum	Line number in the buffer where the sign is to
-				be placed. For the accepted values, see
-				|line()|.
-		    name	Name of the sign to place. See |sign_define()|
-				for more information.
-		    priority	Priority of the sign. When multiple signs are
-				placed on a line, the sign with the highest
-				priority is used. If not specified, the
-				default value of 10 is used. See
-				|sign-priority| for more information.
-
-		If {id} refers to an existing sign, then the existing sign is
-		modified to use the specified {name} and/or {priority}.
-
-		Returns a List of sign identifiers. If failed to place a
-		sign, the corresponding list item is set to -1.
-
-		Examples: >
-			" Place sign s1 with id 5 at line 20 and id 10 at line
-			" 30 in buffer a.c
-			let [n1, n2] = sign_placelist([
-				\ {'id' : 5,
-				\  'name' : 's1',
-				\  'buffer' : 'a.c',
-				\  'lnum' : 20},
-				\ {'id' : 10,
-				\  'name' : 's1',
-				\  'buffer' : 'a.c',
-				\  'lnum' : 30}
-				\ ])
-
-			" Place sign s1 in buffer a.c at line 40 and 50
-			" with auto-generated identifiers
-			let [n1, n2] = sign_placelist([
-				\ {'name' : 's1',
-				\  'buffer' : 'a.c',
-				\  'lnum' : 40},
-				\ {'name' : 's1',
-				\  'buffer' : 'a.c',
-				\  'lnum' : 50}
-				\ ])
-<
-		Can also be used as a |method|: >
-			GetSignlist()->sign_placelist()
-
-sign_undefine([{name}])					*sign_undefine()*
-sign_undefine({list})
-		Deletes a previously defined sign {name}. This is similar to
-		the |:sign-undefine| command. If {name} is not supplied, then
-		deletes all the defined signs.
-
-		The one argument {list} can be used to undefine a list of
-		signs. Each list item is the name of a sign.
-
-		Returns 0 on success and -1 on failure.  For the one argument
-		{list} call, returns a list of values one for each undefined
-		sign.
-
-		Examples: >
-			" Delete a sign named mySign
-			call sign_undefine("mySign")
-
-			" Delete signs 'sign1' and 'sign2'
-			call sign_undefine(["sign1", "sign2"])
-
-			" Delete all the signs
-			call sign_undefine()
-<
-		Can also be used as a |method|: >
-			GetSignlist()->sign_undefine()
-
-sign_unplace({group} [, {dict}])			*sign_unplace()*
-		Remove a previously placed sign in one or more buffers.  This
-		is similar to the |:sign-unplace| command.
-
-		{group} is the sign group name. To use the global sign group,
-		use an empty string.  If {group} is set to "*", then all the
-		groups including the global group are used.
-		The signs in {group} are selected based on the entries in
-		{dict}.  The following optional entries in {dict} are
-		supported:
-			buffer	buffer name or number. See |bufname()|.
-			id	sign identifier
-		If {dict} is not supplied, then all the signs in {group} are
-		removed.
-
-		Returns 0 on success and -1 on failure.
-
-		Examples: >
-			" Remove sign 10 from buffer a.vim
-			call sign_unplace('', {'buffer' : "a.vim", 'id' : 10})
-
-			" Remove sign 20 in group 'g1' from buffer 3
-			call sign_unplace('g1', {'buffer' : 3, 'id' : 20})
-
-			" Remove all the signs in group 'g2' from buffer 10
-			call sign_unplace('g2', {'buffer' : 10})
-
-			" Remove sign 30 in group 'g3' from all the buffers
-			call sign_unplace('g3', {'id' : 30})
-
-			" Remove all the signs placed in buffer 5
-			call sign_unplace('*', {'buffer' : 5})
-
-			" Remove the signs in group 'g4' from all the buffers
-			call sign_unplace('g4')
-
-			" Remove sign 40 from all the buffers
-			call sign_unplace('*', {'id' : 40})
-
-			" Remove all the placed signs from all the buffers
-			call sign_unplace('*')
-
-<		Can also be used as a |method|: >
-			GetSigngroup()->sign_unplace()
-<
-sign_unplacelist({list})				*sign_unplacelist()*
-		Remove previously placed signs from one or more buffers.  This
-		is similar to the |sign_unplace()| function.
-
-		The {list} argument specifies the List of signs to remove.
-		Each list item is a dict with the following sign attributes:
-		    buffer	buffer name or number. For the accepted
-				values, see |bufname()|. If not specified,
-				then the specified sign is removed from all
-				the buffers.
-		    group	sign group name. If not specified or set to an
-				empty string, then the global sign group is
-				used. If set to "*", then all the groups
-				including the global group are used.
-		    id		sign identifier. If not specified, then all
-				the signs in the specified group are removed.
-
-		Returns a List where an entry is set to 0 if the corresponding
-		sign was successfully removed or -1 on failure.
-
-		Example: >
-			" Remove sign with id 10 from buffer a.vim and sign
-			" with id 20 from buffer b.vim
-			call sign_unplacelist([
-				\ {'id' : 10, 'buffer' : "a.vim"},
-				\ {'id' : 20, 'buffer' : 'b.vim'},
-				\ ])
-<
-		Can also be used as a |method|: >
-			GetSignlist()->sign_unplacelist()
-<
+See:
+  - |sign_define()|
+  - |sign_getdefined()|
+  - |sign_getplaced()|
+  - |sign_jump()|
+  - |sign_place()|
+  - |sign_placelist()|
+  - |sign_undefine()|
+  - |sign_unplace()|
+  - |sign_unplacelist()|
 
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index 2c1c77a51d..cce96132a1 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -40,187 +40,19 @@ test_garbagecollect_now()			 *test_garbagecollect_now()*
 ==============================================================================
 3. Assert functions				*assert-functions-details*
 
-
-assert_beeps({cmd})					*assert_beeps()*
-		Run {cmd} and add an error message to |v:errors| if it does
-		NOT produce a beep or visual bell.
-		Also see |assert_fails()|, |assert_nobeep()| and
-		|assert-return|.
-
-		Can also be used as a |method|: >
-			GetCmd()->assert_beeps()
-<
-							*assert_equal()*
-assert_equal({expected}, {actual} [, {msg}])
-		When {expected} and {actual} are not equal an error message is
-		added to |v:errors| and 1 is returned.  Otherwise zero is
-		returned. |assert-return|
-		The error is in the form "Expected {expected} but got
-		{actual}".  When {msg} is present it is prefixed to that.
-
-		There is no automatic conversion, the String "4" is different
-		from the Number 4.  And the number 4 is different from the
-		Float 4.0.  The value of 'ignorecase' is not used here, case
-		always matters.
-		Example: >
-	assert_equal('foo', 'bar')
-<		Will result in a string to be added to |v:errors|:
-	test.vim line 12: Expected 'foo' but got 'bar' ~
-
-		Can also be used as a |method|: >
-			mylist->assert_equal([1, 2, 3])
-
-<							*assert_equalfile()*
-assert_equalfile({fname-one}, {fname-two})
-		When the files {fname-one} and {fname-two} do not contain
-		exactly the same text an error message is added to |v:errors|.
-		Also see |assert-return|.
-		When {fname-one} or {fname-two} does not exist the error will
-		mention that.
-
-		Can also be used as a |method|: >
-			GetLog()->assert_equalfile('expected.log')
-
-assert_exception({error} [, {msg}])			*assert_exception()*
-		When v:exception does not contain the string {error} an error
-		message is added to |v:errors|.  Also see |assert-return|.
-		This can be used to assert that a command throws an exception.
-		Using the error number, followed by a colon, avoids problems
-		with translations: >
-			try
-			  commandthatfails
-			  call assert_false(1, 'command should have failed')
-			catch
-			  call assert_exception('E492:')
-			endtry
-<
-							*assert_fails()*
-assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
-		Run {cmd} and add an error message to |v:errors| if it does
-		NOT produce an error or when {error} is not found in the
-		error message.  Also see |assert-return|.
-
-		When {error} is a string it must be found literally in the
-		first reported error. Most often this will be the error code,
-		including the colon, e.g. "E123:". >
-			assert_fails('bad cmd', 'E987:')
-<
-		When {error} is a |List| with one or two strings, these are
-		used as patterns.  The first pattern is matched against the
-		first reported error: >
-			assert_fails('cmd', ['E987:.*expected bool'])
-<		The second pattern, if present, is matched against the last
-		reported error.  To only match the last error use an empty
-		string for the first error: >
-			assert_fails('cmd', ['', 'E987:'])
-<
-		If {msg} is empty then it is not used.  Do this to get the
-		default message when passing the {lnum} argument.
-
-		When {lnum} is present and not negative, and the {error}
-		argument is present and matches, then this is compared with
-		the line number at which the error was reported. That can be
-		the line number in a function or in a script.
-
-		When {context} is present it is used as a pattern and matched
-		against the context (script name or function name) where
-		{lnum} is located in.
-
-		Note that beeping is not considered an error, and some failing
-		commands only beep.  Use |assert_beeps()| for those.
-
-		Can also be used as a |method|: >
-			GetCmd()->assert_fails('E99:')
-
-assert_false({actual} [, {msg}])			*assert_false()*
-		When {actual} is not false an error message is added to
-		|v:errors|, like with |assert_equal()|.
-		The error is in the form "Expected False but got {actual}".
-		When {msg} is present it is prepended to that.
-		Also see |assert-return|.
-
-		A value is false when it is zero. When {actual} is not a
-		number the assert fails.
-
-		Can also be used as a |method|: >
-			GetResult()->assert_false()
-
-assert_inrange({lower}, {upper}, {actual} [, {msg}])	 *assert_inrange()*
-		This asserts number and |Float| values.  When {actual}  is lower
-		than {lower} or higher than {upper} an error message is added
-		to |v:errors|.  Also see |assert-return|.
-		The error is in the form "Expected range {lower} - {upper},
-		but got {actual}".  When {msg} is present it is prefixed to
-		that.
-
-								*assert_match()*
-assert_match({pattern}, {actual} [, {msg}])
-		When {pattern} does not match {actual} an error message is
-		added to |v:errors|.  Also see |assert-return|.
-		The error is in the form "Pattern {pattern} does not match
-		{actual}".  When {msg} is present it is prefixed to that.
-
-		{pattern} is used as with |expr-=~|: The matching is always done
-		like 'magic' was set and 'cpoptions' is empty, no matter what
-		the actual value of 'magic' or 'cpoptions' is.
-
-		{actual} is used as a string, automatic conversion applies.
-		Use "^" and "$" to match with the start and end of the text.
-		Use both to match the whole text.
-
-		Example: >
-	assert_match('^f.*o$', 'foobar')
-<		Will result in a string to be added to |v:errors|:
-	test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
-
-		Can also be used as a |method|: >
-			getFile()->assert_match('foo.*')
-<
-assert_nobeep({cmd})					*assert_nobeep()*
-		Run {cmd} and add an error message to |v:errors| if it
-		produces a beep or visual bell.
-		Also see |assert_beeps()|.
-
-		Can also be used as a |method|: >
-			GetCmd()->assert_nobeep()
-<
-							*assert_notequal()*
-assert_notequal({expected}, {actual} [, {msg}])
-		The opposite of `assert_equal()`: add an error message to
-		|v:errors| when {expected} and {actual} are equal.
-		Also see |assert-return|.
-
-		Can also be used as a |method|: >
-			mylist->assert_notequal([1, 2, 3])
-
-<							*assert_notmatch()*
-assert_notmatch({pattern}, {actual} [, {msg}])
-		The opposite of `assert_match()`: add an error message to
-		|v:errors| when {pattern} matches {actual}.
-		Also see |assert-return|.
-
-		Can also be used as a |method|: >
-			getFile()->assert_notmatch('bar.*')
-
-
-assert_report({msg})					*assert_report()*
-		Report a test failure directly, using String {msg}.
-		Always returns one.
-
-		Can also be used as a |method|: >
-			GetMessage()->assert_report()
-
-
-assert_true({actual} [, {msg}])				*assert_true()*
-		When {actual} is not true an error message is added to
-		|v:errors|, like with |assert_equal()|.
-		Also see |assert-return|.
-		A value is |TRUE| when it is a non-zero number or |v:true|.
-		When {actual} is not a number or |v:true| the assert fails.
-		When {msg} is given it precedes the default message.
-
-		Can also be used as a |method|: >
-			GetResult()->assert_true()
-<
+See:
+  - |assert_beeps()|
+  - |assert_equal()|
+  - |assert_equalfile()|
+  - |assert_exception()|
+  - |assert_fails()|
+  - |assert_false()|
+  - |assert_inrange()|
+  - |assert_match()|
+  - |assert_nobeep()|
+  - |assert_notequal()|
+  - |assert_notmatch()|
+  - |assert_report()|
+  - |assert_true()|
 
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 261cdc91f7..e1bb6c4af1 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -588,7 +588,7 @@ after the substitute() call.
 FUNCTIONS						*function-list*
 
 There are many functions.  We will mention them here, grouped by what they are
-used for.  You can find an alphabetical list here: |builtin-function-list|.
+used for.  You can find an alphabetical list here: |builtin-function-details|.
 Use CTRL-] on the function name to jump to detailed help on it.
 
 String manipulation:					*string-functions*
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 409c288036..82213324e3 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -18,7 +18,7 @@
 ---   Compute()->abs()
 ---
 --- @param expr any
---- @return any
+--- @return number
 function vim.fn.abs(expr) end
 
 --- Return the arc cosine of {expr} measured in radians, as a
@@ -68,7 +68,7 @@ function vim.fn.add(object, expr) end
 ---
 --- @param expr any
 --- @param expr1 any
---- @return any
+--- @return integer
 vim.fn['and'] = function(expr, expr1) end
 
 --- Returns Dictionary of |api-metadata|.
@@ -76,7 +76,7 @@ vim.fn['and'] = function(expr, expr1) end
 --- View it in a nice human-readable format: >
 ---        :lua vim.print(vim.fn.api_info())
 ---
---- @return any
+--- @return table
 function vim.fn.api_info() end
 
 --- When {text} is a |List|: Append each item of the |List| as a
@@ -96,7 +96,7 @@ function vim.fn.api_info() end
 ---
 --- @param lnum integer
 --- @param text any
---- @return any
+--- @return 0|1
 function vim.fn.append(lnum, text) end
 
 --- Like |append()| but append the text in buffer {expr}.
@@ -122,8 +122,8 @@ function vim.fn.append(lnum, text) end
 ---
 --- @param buf any
 --- @param lnum integer
---- @param text any
---- @return any
+--- @param text string
+--- @return 0|1
 function vim.fn.appendbufline(buf, lnum, text) end
 
 --- The result is the number of files in the argument list.  See
@@ -139,6 +139,7 @@ function vim.fn.appendbufline(buf, lnum, text) end
 --- @return integer
 function vim.fn.argc(winid) end
 
+--- The result is the current index in the argument list.  0 is
 --- the first file.  argc() - 1 is the last one.  See |arglist|.
 ---
 --- @return integer
@@ -180,7 +181,7 @@ function vim.fn.arglistid(winnr, tabnr) end
 ---
 --- @param nr? integer
 --- @param winid? integer
---- @return any
+--- @return string|string[]
 function vim.fn.argv(nr, winid) end
 
 --- Return the arc sine of {expr} measured in radians, as a |Float|
@@ -197,13 +198,10 @@ function vim.fn.argv(nr, winid) end
 ---
 --- Can also be used as a |method|: >
 ---   Compute()->asin()
----
----
---- assert_ functions are documented here: |assert-functions-details|
----
+--- <
 ---
 --- @param expr any
---- @return any
+--- @return number
 function vim.fn.asin(expr) end
 
 --- Run {cmd} and add an error message to |v:errors| if it does
@@ -214,6 +212,7 @@ function vim.fn.asin(expr) end
 --- Can also be used as a |method|: >
 ---   GetCmd()->assert_beeps()
 --- <
+---
 --- @param cmd any
 --- @return 0|1
 function vim.fn.assert_beeps(cmd) end
@@ -251,7 +250,7 @@ function vim.fn.assert_equal(expected, actual, msg) end
 --- Can also be used as a |method|: >
 ---   GetLog()->assert_equalfile('expected.log')
 ---
---- @return any
+--- @return 0|1
 function vim.fn.assert_equalfile() end
 
 --- When v:exception does not contain the string {error} an error
@@ -266,6 +265,7 @@ function vim.fn.assert_equalfile() end
 ---     call assert_exception('E492:')
 ---   endtry
 --- <
+---
 --- @param error any
 --- @param msg? any
 --- @return 0|1
@@ -367,6 +367,7 @@ function vim.fn.assert_inrange(lower, upper, actual, msg) end
 --- Can also be used as a |method|: >
 ---   getFile()->assert_match('foo.*')
 --- <
+---
 --- @param pattern any
 --- @param actual any
 --- @param msg? any
@@ -380,6 +381,7 @@ function vim.fn.assert_match(pattern, actual, msg) end
 --- Can also be used as a |method|: >
 ---   GetCmd()->assert_nobeep()
 --- <
+---
 --- @param cmd any
 --- @return 0|1
 function vim.fn.assert_nobeep(cmd) end
@@ -391,10 +393,12 @@ function vim.fn.assert_nobeep(cmd) end
 --- Can also be used as a |method|: >
 ---   mylist->assert_notequal([1, 2, 3])
 ---
+--- <
+---
 --- @param expected any
 --- @param actual any
 --- @param msg? any
---- @return any
+--- @return 0|1
 function vim.fn.assert_notequal(expected, actual, msg) end
 
 --- The opposite of `assert_match()`: add an error message to
@@ -403,12 +407,12 @@ function vim.fn.assert_notequal(expected, actual, msg) end
 ---
 --- Can also be used as a |method|: >
 ---   getFile()->assert_notmatch('bar.*')
----
+--- <
 ---
 --- @param pattern any
 --- @param actual any
 --- @param msg? any
---- @return any
+--- @return 0|1
 function vim.fn.assert_notmatch(pattern, actual, msg) end
 
 --- Report a test failure directly, using String {msg}.
@@ -416,10 +420,10 @@ function vim.fn.assert_notmatch(pattern, actual, msg) end
 ---
 --- Can also be used as a |method|: >
 ---   GetMessage()->assert_report()
----
+--- <
 ---
 --- @param msg any
---- @return any
+--- @return 0|1
 function vim.fn.assert_report(msg) end
 
 --- When {actual} is not true an error message is added to
@@ -435,7 +439,7 @@ function vim.fn.assert_report(msg) end
 ---
 --- @param actual any
 --- @param msg? any
---- @return any
+--- @return 0|1
 function vim.fn.assert_true(actual, msg) end
 
 --- Return the principal value of the arc tangent of {expr}, in
@@ -484,8 +488,9 @@ function vim.fn.atan2(expr1, expr2) end
 --- Can also be used as a |method|: >
 ---   GetBlob()->blob2list()
 --- <
+---
 --- @param blob any
---- @return any
+--- @return any[]
 function vim.fn.blob2list(blob) end
 
 --- Put up a file requester.  This only works when "has("browse")"
@@ -502,7 +507,7 @@ function vim.fn.blob2list(blob) end
 --- @param title any
 --- @param initdir any
 --- @param default any
---- @return any
+--- @return 0|1
 function vim.fn.browse(save, title, initdir, default) end
 
 --- Put up a directory requester.  This only works when
@@ -518,7 +523,7 @@ function vim.fn.browse(save, title, initdir, default) end
 ---
 --- @param title any
 --- @param initdir any
---- @return any
+--- @return 0|1
 function vim.fn.browsedir(title, initdir) end
 
 --- Add a buffer to the buffer list with name {name} (must be a
@@ -570,14 +575,23 @@ function vim.fn.bufexists(buf) end
 
 --- @deprecated
 --- Obsolete name for |bufexists()|.
+---
+--- @param ... any
+--- @return 0|1
 function vim.fn.buffer_exists(...) end
 
 --- @deprecated
 --- Obsolete name for |bufname()|.
+---
+--- @param ... any
+--- @return string
 function vim.fn.buffer_name(...) end
 
 --- @deprecated
 --- Obsolete name for |bufnr()|.
+---
+--- @param ... any
+--- @return integer
 function vim.fn.buffer_number(...) end
 
 --- The result is a Number, which is |TRUE| if a buffer called
@@ -649,6 +663,7 @@ function vim.fn.bufloaded(buf) end
 ---   bufname("%")    name of current buffer
 ---   bufname("file2")  name of buffer where "file2" matches.
 --- <
+---
 --- @param buf? any
 --- @return string
 function vim.fn.bufname(buf) end
@@ -796,6 +811,7 @@ function vim.fn.byteidxcomp(expr, nr, utf16) end
 ---
 --- Can also be used as a |method|: >
 ---   GetFunc()->call([arg, arg], dict)
+--- <
 ---
 --- @param func any
 --- @param arglist any
@@ -818,9 +834,10 @@ function vim.fn.call(func, arglist, dict) end
 ---
 --- Can also be used as a |method|: >
 ---   Compute()->ceil()
+--- <
 ---
 --- @param expr any
---- @return any
+--- @return number
 function vim.fn.ceil(expr) end
 
 --- Close a channel or a specific stream associated with it.
@@ -834,7 +851,7 @@ function vim.fn.ceil(expr) end
 ---
 --- @param id any
 --- @param stream? any
---- @return any
+--- @return 0|1
 function vim.fn.chanclose(id, stream) end
 
 --- Return the number of the most recent change.  This is the same
@@ -865,10 +882,9 @@ function vim.fn.changenr() end
 --- was created with `"rpc":v:true` then the channel expects RPC
 --- messages, use |rpcnotify()| and |rpcrequest()| instead.
 ---
----
 --- @param id any
 --- @param data any
---- @return any
+--- @return 0|1
 function vim.fn.chansend(id, data) end
 
 --- Return Number value of the first char in {string}.
@@ -890,7 +906,7 @@ function vim.fn.chansend(id, data) end
 ---
 --- @param string string
 --- @param utf8? any
---- @return any
+--- @return 0|1
 function vim.fn.char2nr(string, utf8) end
 
 --- Return the character class of the first character in {string}.
@@ -903,9 +919,8 @@ function vim.fn.char2nr(string, utf8) end
 --- The class is used in patterns and word motions.
 --- Returns 0 if {string} is not a |String|.
 ---
----
 --- @param string string
---- @return any
+--- @return 0|1|2|3|'other'
 function vim.fn.charclass(string) end
 
 --- Same as |col()| but returns the character index of the column
@@ -919,9 +934,10 @@ function vim.fn.charclass(string) end
 --- <Can also be used as a |method|: >
 ---   GetPos()->col()
 --- <
+---
 --- @param expr any
 --- @param winid? integer
---- @return any
+--- @return integer
 function vim.fn.charcol(expr, winid) end
 
 --- Return the character index of the byte at {idx} in {string}.
@@ -963,7 +979,7 @@ function vim.fn.charcol(expr, winid) end
 --- @param idx integer
 --- @param countcc? any
 --- @param utf16? any
---- @return any
+--- @return integer
 function vim.fn.charidx(string, idx, countcc, utf16) end
 
 --- Change the current working directory to {dir}.  The scope of
@@ -990,8 +1006,9 @@ function vim.fn.charidx(string, idx, countcc, utf16) end
 --- <Can also be used as a |method|: >
 ---   GetDir()->chdir()
 --- <
+---
 --- @param dir string
---- @return any
+--- @return string
 function vim.fn.chdir(dir) end
 
 --- Get the amount of indent for line {lnum} according the C
@@ -1005,7 +1022,7 @@ function vim.fn.chdir(dir) end
 ---   GetLnum()->cindent()
 ---
 --- @param lnum integer
---- @return any
+--- @return integer
 function vim.fn.cindent(lnum) end
 
 --- Clears all matches previously defined for the current window
@@ -1016,8 +1033,8 @@ function vim.fn.cindent(lnum) end
 --- Can also be used as a |method|: >
 ---   GetWin()->clearmatches()
 --- <
+---
 --- @param win? any
---- @return any
 function vim.fn.clearmatches(win) end
 
 --- The result is a Number, which is the byte index of the column
@@ -1088,8 +1105,8 @@ function vim.fn.col(expr, winid) end
 ---
 ---   func ListMonths()
 ---     call complete(col('.'), ['January', 'February', 'March',
---- \ 'April', 'May', 'June', 'July', 'August', 'September',
---- \ 'October', 'November', 'December'])
+---       \ 'April', 'May', 'June', 'July', 'August', 'September',
+---       \ 'October', 'November', 'December'])
 ---     return ''
 ---   endfunc
 --- <This isn't very useful, but it shows how it works.  Note that
@@ -1125,7 +1142,6 @@ function vim.fn.complete_add(expr) end
 --- Only to be used by the function specified with the
 --- 'completefunc' option.
 ---
----
 --- @return 0|1
 function vim.fn.complete_check() end
 
@@ -1189,6 +1205,7 @@ function vim.fn.complete_check() end
 --- <Can also be used as a |method|: >
 ---   GetItems()->complete_info()
 --- <
+---
 --- @param what? any
 --- @return table
 function vim.fn.complete_info(what) end
@@ -1247,13 +1264,15 @@ function vim.fn.complete_info(what) end
 --- Can also be used as a |method|in: >
 ---   BuildMessage()->confirm("&Yes\n&No")
 --- <
+---
 --- @param msg any
 --- @param choices? any
 --- @param default? any
 --- @param type? any
---- @return any
+--- @return integer
 function vim.fn.confirm(msg, choices, default, type) end
 
+--- Make a copy of {expr}.  For Numbers and Strings this isn't
 --- different from using {expr} directly.
 --- When {expr} is a |List| a shallow copy is created.  This means
 --- that the original |List| can be changed without changing the
@@ -1281,7 +1300,7 @@ function vim.fn.copy(expr) end
 ---   Compute()->cos()
 ---
 --- @param expr any
---- @return any
+--- @return number
 function vim.fn.cos(expr) end
 
 --- Return the hyperbolic cosine of {expr} as a |Float| in the range
@@ -1298,7 +1317,7 @@ function vim.fn.cos(expr) end
 ---   Compute()->cosh()
 ---
 --- @param expr any
---- @return any
+--- @return number
 function vim.fn.cosh(expr) end
 
 --- Return the number of times an item with value {expr} appears
@@ -1316,11 +1335,12 @@ function vim.fn.cosh(expr) end
 --- Can also be used as a |method|: >
 ---   mylist->count(val)
 --- <
+---
 --- @param comp any
 --- @param expr any
 --- @param ic? any
 --- @param start? any
---- @return any
+--- @return integer
 function vim.fn.count(comp, expr, ic, start) end
 
 --- Returns a |Dictionary| representing the |context| at {index}
@@ -1328,7 +1348,7 @@ function vim.fn.count(comp, expr, ic, start) end
 --- If {index} is not given, it is assumed to be 0 (i.e.: top).
 ---
 --- @param index? any
---- @return any
+--- @return table
 function vim.fn.ctxget(index) end
 
 --- Pops and restores the |context| at the top of the
@@ -1362,6 +1382,12 @@ function vim.fn.ctxset(context, index) end
 --- @return any
 function vim.fn.ctxsize() end
 
+--- @param lnum integer
+--- @param col? integer
+--- @param off? any
+--- @return any
+function vim.fn.cursor(lnum, col, off) end
+
 --- Positions the cursor at the column (byte count) {col} in the
 --- line {lnum}.  The first column is one.
 ---
@@ -1410,6 +1436,7 @@ function vim.fn.cursor(list) end
 ---
 --- Can also be used as a |method|: >
 ---   GetPid()->debugbreak()
+--- <
 ---
 --- @param pid any
 --- @return any
@@ -1484,6 +1511,7 @@ function vim.fn.delete(fname, flags) end
 --- Can also be used as a |method|: >
 ---   GetBuffer()->deletebufline(1)
 --- <
+---
 --- @param buf any
 --- @param first any
 --- @param last? any
@@ -1545,6 +1573,7 @@ function vim.fn.dictwatcheradd(dict, pattern, callback) end
 --- @return any
 function vim.fn.dictwatcherdel(dict, pattern, callback) end
 
+--- Returns |TRUE| when autocommands are being executed and the
 --- FileType event has been triggered at least once.  Can be used
 --- to avoid triggering the FileType event again in the scripts
 --- that detect the file type. |FileType|
@@ -1718,11 +1747,13 @@ function vim.fn.environ() end
 --- Can also be used as a |method|: >
 ---   GetText()->escape(' \')
 --- <
+---
 --- @param string string
 --- @param chars any
 --- @return any
 function vim.fn.escape(string, chars) end
 
+--- Evaluate {string} and return the result.  Especially useful to
 --- turn the result of |string()| back into the original value.
 --- This works for Numbers, Floats, Strings, Blobs and composites
 --- of them.  Also works for |Funcref|s that refer to existing
@@ -1815,10 +1846,12 @@ function vim.fn.execute(command, silent) end
 --- Can also be used as a |method|: >
 ---   GetCommand()->exepath()
 --- <
+---
 --- @param expr any
 --- @return any
 function vim.fn.exepath(expr) end
 
+--- The result is a Number, which is |TRUE| if {expr} is
 --- defined, zero otherwise.
 ---
 --- For checking for a supported feature use |has()|.
@@ -2051,6 +2084,7 @@ function vim.fn.expand(string, nosuf, list) end
 --- Can also be used as a |method|: >
 ---   GetCommand()->expandcmd()
 --- <
+---
 --- @param string string
 --- @param options? table
 --- @return any
@@ -2093,7 +2127,7 @@ function vim.fn.expandcmd(string, options) end
 ---
 --- Can also be used as a |method|: >
 ---   mylist->extend(otherlist)
----
+--- <
 ---
 --- @param expr1 any
 --- @param expr2 any
@@ -2105,7 +2139,6 @@ function vim.fn.extend(expr1, expr2, expr3) end
 --- List or Dictionary is created and returned.  {expr1} remains
 --- unchanged.
 ---
----
 --- @param expr1 any
 --- @param expr2 any
 --- @param expr3? any
@@ -2166,7 +2199,10 @@ function vim.fn.feedkeys(string, mode) end
 
 --- @deprecated
 --- Obsolete name for |filereadable()|.
-function vim.fn.file_readable(...) end
+---
+--- @param file string
+--- @return any
+function vim.fn.file_readable(file) end
 
 --- The result is a Number, which is |TRUE| when a file with the
 --- name {file} exists, and can be read.  If {file} doesn't exist,
@@ -2319,6 +2355,7 @@ function vim.fn.findfile(name, path, count) end
 --- Can also be used as a |method|: >
 ---   mylist->flatten()
 --- <
+---
 --- @param list any
 --- @param maxdepth? any
 --- @return any[]|0
@@ -2326,7 +2363,6 @@ function vim.fn.flatten(list, maxdepth) end
 
 --- Like |flatten()| but first make a copy of {list}.
 ---
----
 --- @param list any
 --- @param maxdepth? any
 --- @return any[]|0
@@ -2488,10 +2524,12 @@ function vim.fn.foldclosedend(lnum) end
 --- Can also be used as a |method|: >
 ---   GetLnum()->foldlevel()
 --- <
+---
 --- @param lnum integer
 --- @return integer
 function vim.fn.foldlevel(lnum) end
 
+--- Returns a String, to be displayed for a closed fold.  This is
 --- the default function used for the 'foldtext' option and should
 --- only be called from evaluating 'foldtext'.  It uses the
 --- |v:foldstart|, |v:foldend| and |v:folddashes| variables.
@@ -2521,6 +2559,7 @@ function vim.fn.foldtext() end
 --- Can also be used as a |method|: >
 ---   GetLnum()->foldtextresult()
 --- <
+---
 --- @param lnum integer
 --- @return string
 function vim.fn.foldtextresult(lnum) end
@@ -2539,6 +2578,7 @@ function vim.fn.foldtextresult(lnum) end
 --- Can also be used as a |method|: >
 ---   GetName()->fullcommand()
 --- <
+---
 --- @param name string
 --- @return string
 function vim.fn.fullcommand(name) end
@@ -2557,6 +2597,7 @@ function vim.fn.fullcommand(name) end
 --- Can also be used as a |method|: >
 ---   GetFuncname()->funcref([arg])
 --- <
+---
 --- @param name string
 --- @param arglist? any
 --- @param dict? any
@@ -2672,6 +2713,41 @@ vim.fn['function'] = function(name, arglist, dict) end
 --- @return any
 function vim.fn.garbagecollect(atexit) end
 
+--- Get item {idx} from |List| {list}.  When this item is not
+--- available return {default}.  Return zero when {default} is
+--- omitted.
+--- Can also be used as a |method|: >
+---   mylist->get(idx)
+---
+--- @param list any[]
+--- @param idx integer
+--- @param default? any
+--- @return any
+function vim.fn.get(list, idx, default) end
+
+--- Get byte {idx} from |Blob| {blob}.  When this byte is not
+--- available return {default}.  Return -1 when {default} is
+--- omitted.
+---
+--- @param blob string
+--- @param idx integer
+--- @param default? any
+--- @return any
+function vim.fn.get(blob, idx, default) end
+
+--- Get item with key {key} from |Dictionary| {dict}.  When this
+--- item is not available return {default}.  Return zero when
+--- {default} is omitted.  Useful example: >
+---   let val = get(g:, 'var_name', 'default')
+--- <This gets the value of g:var_name if it exists, and uses
+--- "default" when it does not exist.
+---
+--- @param dict table<string,any>
+--- @param key string
+--- @param default? any
+--- @return any
+function vim.fn.get(dict, key, default) end
+
 --- Get item {what} from Funcref {func}.  Possible values for
 --- {what} are:
 ---   "name"  The function name
@@ -2680,11 +2756,15 @@ function vim.fn.garbagecollect(atexit) end
 ---   "args"  The list with arguments
 --- Returns zero on error.
 ---
---- @param func any
---- @param what any
+--- @param func function
+--- @param what string
 --- @return any
 function vim.fn.get(func, what) end
 
+--- @param buf? integer|string
+--- @return any
+function vim.fn.getbufinfo(buf) end
+
 --- Get information about buffers as a List of Dictionaries.
 ---
 --- Without an argument information about all the buffers is
@@ -2753,7 +2833,7 @@ function vim.fn.get(func, what) end
 ---   GetBufnr()->getbufinfo()
 --- <
 ---
---- @param dict? any
+--- @param dict? table<string,any>
 --- @return any
 function vim.fn.getbufinfo(dict) end
 
@@ -2784,9 +2864,10 @@ function vim.fn.getbufinfo(dict) end
 --- <Can also be used as a |method|: >
 ---   GetBufnr()->getbufline(lnum)
 --- <
+---
 --- @param buf any
 --- @param lnum integer
---- @param end_? any
+--- @param end_? integer
 --- @return any
 function vim.fn.getbufline(buf, lnum, end_) end
 
@@ -2821,6 +2902,7 @@ function vim.fn.getbufoneline(buf, lnum) end
 --- <Can also be used as a |method|: >
 ---   GetBufnr()->getbufvar(varname)
 --- <
+---
 --- @param buf any
 --- @param varname string
 --- @param def? any
@@ -2832,7 +2914,6 @@ function vim.fn.getbufvar(buf, varname, def) end
 --- |setcellwidths()|.  If no character ranges have their cell
 --- widths overridden, an empty List is returned.
 ---
----
 --- @return any
 function vim.fn.getcellwidths() end
 
@@ -2854,8 +2935,8 @@ function vim.fn.getcellwidths() end
 --- Can also be used as a |method|: >
 ---   GetBufnr()->getchangelist()
 ---
---- @param buf? any
---- @return any
+--- @param buf? integer|string
+--- @return table[]
 function vim.fn.getchangelist(buf) end
 
 --- Get a single character from the user or input stream.
@@ -2921,6 +3002,7 @@ function vim.fn.getchangelist(buf) end
 ---   :  endwhile
 ---   :endfunction
 --- <
+---
 --- @return integer
 function vim.fn.getchar() end
 
@@ -2958,7 +3040,7 @@ function vim.fn.getcharmod() end
 ---   GetMark()->getcharpos()
 ---
 --- @param expr any
---- @return any
+--- @return integer[]
 function vim.fn.getcharpos(expr) end
 
 --- Return the current character search information as a {dict}
@@ -2980,8 +3062,7 @@ function vim.fn.getcharpos(expr) end
 ---   :nnoremap <expr> , getcharsearch().forward ? ',' : ';'
 --- <Also see |setcharsearch()|.
 ---
----
---- @return any
+--- @return table[]
 function vim.fn.getcharsearch() end
 
 --- Get a single character from the user or input stream as a
@@ -3030,7 +3111,7 @@ function vim.fn.getcmdline() end
 --- Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
 --- |setcmdline()|.
 ---
---- @return any
+--- @return integer
 function vim.fn.getcmdpos() end
 
 --- Return the screen position of the cursor in the command line
@@ -3137,6 +3218,7 @@ function vim.fn.getcmdwintype() end
 --- Can also be used as a |method|: >
 ---   GetPattern()->getcompletion('color')
 --- <
+---
 --- @param pat any
 --- @param type any
 --- @param filtered? any
@@ -3170,6 +3252,7 @@ function vim.fn.getcompletion(pat, type, filtered) end
 --- Can also be used as a |method|: >
 ---   GetWinid()->getcurpos()
 --- <
+---
 --- @param winid? integer
 --- @return any
 function vim.fn.getcurpos(winid) end
@@ -3339,6 +3422,7 @@ function vim.fn.getftype(fname) end
 ---
 --- Can also be used as a |method|: >
 ---   GetWinnr()->getjumplist()
+--- <
 ---
 --- @param winnr? integer
 --- @param tabnr? integer
@@ -3374,7 +3458,7 @@ function vim.fn.getjumplist(winnr, tabnr) end
 ---
 --- @param lnum integer
 --- @param end_? any
---- @return any
+--- @return string|string[]
 function vim.fn.getline(lnum, end_) end
 
 --- Returns a |List| with all the entries in the location list for
@@ -3406,7 +3490,7 @@ function vim.fn.getline(lnum, end_) end
 --- Examples (See also |getqflist-examples|): >
 ---   :echo getloclist(3, {'all': 0})
 ---   :echo getloclist(5, {'filewinid': 0})
----
+--- <
 ---
 --- @param nr integer
 --- @param what? any
@@ -3448,26 +3532,27 @@ function vim.fn.getmarklist(buf) end
 --- an empty list is returned.
 --- Example: >vim
 ---   :echo getmatches()
---- >
----        [{"group": "MyGroup1", "pattern": "TODO",
+--- < >
+---   [{"group": "MyGroup1", "pattern": "TODO",
 ---   "priority": 10, "id": 1}, {"group": "MyGroup2",
 ---   "pattern": "FIXME", "priority": 10, "id": 2}]
---- >vim
+--- < >vim
 ---   :let m = getmatches()
 ---   :call clearmatches()
 ---   :echo getmatches()
---- >
+--- < >
 ---   []
---- >vim
+--- < >vim
 ---   :call setmatches(m)
 ---   :echo getmatches()
---- >
+--- < >
 ---   [{"group": "MyGroup1", "pattern": "TODO",
 ---   "priority": 10, "id": 1}, {"group": "MyGroup2",
 ---   "pattern": "FIXME", "priority": 10, "id": 2}]
---- >vim
+--- < >vim
 ---   :unlet m
 --- <
+---
 --- @param win? any
 --- @return any
 function vim.fn.getmatches(win) end
@@ -3503,11 +3588,13 @@ function vim.fn.getmatches(win) end
 --- @return any
 function vim.fn.getmousepos() end
 
+--- Return a Number which is the process ID of the Vim process.
 --- This is a unique number, until Vim exits.
 ---
 --- @return integer
 function vim.fn.getpid() end
 
+--- Get the position for String {expr}.  For possible values of
 --- {expr} see |line()|.  For getting the cursor position see
 --- |getcurpos()|.
 --- The result is a |List| with four numbers:
@@ -3641,6 +3728,7 @@ function vim.fn.getpos(expr) end
 ---   :echo getqflist({'nr': 2, 'title': 1})
 ---   :echo getqflist({'lines' : ["F1:10:L10"]})
 --- <
+---
 --- @param what? any
 --- @return any
 function vim.fn.getqflist(what) end
@@ -3757,6 +3845,7 @@ function vim.fn.getregtype(regname) end
 ---   :echo getscriptinfo({'name': 'myscript'})
 ---   :echo getscriptinfo({'sid': 15}).variables
 --- <
+---
 --- @param opts? table
 --- @return any
 function vim.fn.getscriptinfo(opts) end
@@ -3822,8 +3911,8 @@ function vim.fn.gettabvar(tabnr, varname, def) end
 --- <
 --- To obtain all window-local variables use: >
 ---   gettabwinvar({tabnr}, {winnr}, '&')
----
---- <Can also be used as a |method|: >
+--- <
+--- Can also be used as a |method|: >
 ---   GetTabnr()->gettabwinvar(winnr, varname)
 ---
 --- @param tabnr integer
@@ -3862,7 +3951,7 @@ function vim.fn.gettabwinvar(tabnr, winnr, varname, def) end
 ---
 --- Can also be used as a |method|: >
 ---   GetWinnr()->gettagstack()
----
+--- <
 ---
 --- @param winnr? integer
 --- @return any
@@ -3878,7 +3967,6 @@ function vim.fn.gettagstack(winnr) end
 --- xgettext does not understand escaping in single quoted
 --- strings.
 ---
----
 --- @param text any
 --- @return any
 function vim.fn.gettext(text) end
@@ -3945,10 +4033,12 @@ function vim.fn.getwininfo(winid) end
 --- Can also be used as a |method|: >
 ---   GetTimeout()->getwinpos()
 --- <
+---
 --- @param timeout? integer
 --- @return any
 function vim.fn.getwinpos(timeout) end
 
+--- The result is a Number, which is the X coordinate in pixels of
 --- the left hand side of the GUI Vim window.  The result will be
 --- -1 if the information is not available.
 --- The value can be used with `:winpos`.
@@ -3956,6 +4046,7 @@ function vim.fn.getwinpos(timeout) end
 --- @return integer
 function vim.fn.getwinposx() end
 
+--- The result is a Number, which is the Y coordinate in pixels of
 --- the top of the GUI Vim window.  The result will be -1 if the
 --- information is not available.
 --- The value can be used with `:winpos`.
@@ -3971,6 +4062,7 @@ function vim.fn.getwinposy() end
 --- <Can also be used as a |method|: >
 ---   GetWinnr()->getwinvar(varname)
 --- <
+---
 --- @param winnr integer
 --- @param varname string
 --- @param def? any
@@ -4035,6 +4127,8 @@ function vim.fn.glob(expr, nosuf, list, alllinks) end
 ---
 --- Can also be used as a |method|: >
 ---   GetExpr()->glob2regpat()
+--- <
+---
 --- @param string string
 --- @return any
 function vim.fn.glob2regpat(string) end
@@ -4077,6 +4171,7 @@ function vim.fn.glob2regpat(string) end
 --- second argument: >
 ---   GetExpr()->globpath(&rtp)
 --- <
+---
 --- @param path string
 --- @param expr any
 --- @param nosuf? boolean
@@ -4085,6 +4180,7 @@ function vim.fn.glob2regpat(string) end
 --- @return any
 function vim.fn.globpath(path, expr, nosuf, list, allinks) end
 
+--- Returns 1 if {feature} is supported, 0 otherwise.  The
 --- {feature} argument is a feature name like "nvim-0.2.1" or
 --- "win32", see below.  See also |exists()|.
 ---
@@ -4141,7 +4237,7 @@ function vim.fn.globpath(path, expr, nosuf, list, allinks) end
 --- <4.  Vim version. For example the "patch-7.4.237" feature means
 ---     that Nvim is Vim-compatible to version 7.4.237 or later. >
 ---   :if has("patch-7.4.237")
----
+--- <
 ---
 --- @param feature any
 --- @return 0|1
@@ -4224,11 +4320,17 @@ function vim.fn.hasmapto(what, mode, abbr) end
 
 --- @deprecated
 --- Obsolete name for |hlID()|.
-function vim.fn.highlightID(...) end
+---
+--- @param name string
+--- @return any
+function vim.fn.highlightID(name) end
 
 --- @deprecated
 --- Obsolete name for |hlexists()|.
-function vim.fn.highlight_exists(...) end
+---
+--- @param name string
+--- @return any
+function vim.fn.highlight_exists(name) end
 
 --- Add the String {item} to the history {history} which can be
 --- one of:          *hist-names*
@@ -4330,10 +4432,12 @@ function vim.fn.histget(history, index) end
 --- <Can also be used as a |method|: >
 ---   GetHistory()->histnr()
 --- <
+---
 --- @param history any
 --- @return integer
 function vim.fn.histnr(history) end
 
+--- The result is a Number, which is the ID of the highlight group
 --- with name {name}.  When the highlight group doesn't exist,
 --- zero is returned.
 --- This can be used to retrieve information about the highlight
@@ -4357,6 +4461,7 @@ function vim.fn.hlID(name) end
 --- Can also be used as a |method|: >
 ---   GetName()->hlexists()
 --- <
+---
 --- @param name string
 --- @return 0|1
 function vim.fn.hlexists(name) end
@@ -4382,6 +4487,7 @@ function vim.fn.hostname() end
 --- Can also be used as a |method|: >
 ---   GetText()->iconv('latin1', 'utf-8')
 --- <
+---
 --- @param string string
 --- @param from any
 --- @param to any
@@ -4500,6 +4606,13 @@ function vim.fn.index(object, expr, start, ic) end
 --- @return any
 function vim.fn.indexof(object, expr, opts) end
 
+---
+--- @param prompt any
+--- @param text? any
+--- @param completion? any
+--- @return any
+function vim.fn.input(prompt, text, completion) end
+
 --- The result is a String, which is whatever the user typed on
 --- the command-line.  The {prompt} argument is either a prompt
 --- string, or a blank string (for no prompt).  A '\n' can be used
@@ -4618,6 +4731,9 @@ function vim.fn.input(opts) end
 
 --- @deprecated
 --- Use |input()| instead.
+---
+--- @param ... any
+--- @return any
 function vim.fn.inputdialog(...) end
 
 --- {textlist} must be a |List| of strings.  This |List| is
@@ -4804,6 +4920,9 @@ function vim.fn.items(dict) end
 
 --- @deprecated
 --- Obsolete name for |chanclose()|
+---
+--- @param ... any
+--- @return any
 function vim.fn.jobclose(...) end
 
 --- Return the PID (process id) of |job-id| {job}.
@@ -4824,6 +4943,9 @@ function vim.fn.jobresize(job, width, height) end
 
 --- @deprecated
 --- Obsolete name for |chansend()|
+---
+--- @param ... any
+--- @return any
 function vim.fn.jobsend(...) end
 
 --- Note: Prefer |vim.system()| in Lua.
@@ -5030,6 +5152,7 @@ function vim.fn.keys(dict) end
 ---
 --- Can also be used as a |method|: >
 ---   "\<C-Home>"->keytrans()
+--- <
 ---
 --- @param string string
 --- @return any
@@ -5037,7 +5160,9 @@ function vim.fn.keytrans(string) end
 
 --- @deprecated
 --- Obsolete name for bufnr("$").
-function vim.fn.last_buffer_nr(...) end
+---
+--- @return any
+function vim.fn.last_buffer_nr() end
 
 --- When {expr} is a String or a Number the length in bytes is
 --- used, as with |strlen()|.
@@ -5050,6 +5175,7 @@ function vim.fn.last_buffer_nr(...) end
 ---
 --- Can also be used as a |method|: >
 ---   mylist->len()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -5100,6 +5226,7 @@ function vim.fn.len(expr) end
 --- third argument: >
 ---   GetValue()->libcall("libc.so", "getenv")
 --- <
+---
 --- @param libname string
 --- @param funcname string
 --- @param argument any
@@ -5117,6 +5244,7 @@ function vim.fn.libcall(libname, funcname, argument) end
 --- third argument: >
 ---   GetValue()->libcallnr("libc.so", "printf")
 --- <
+---
 --- @param libname string
 --- @param funcname string
 --- @param argument any
@@ -5236,7 +5364,6 @@ function vim.fn.list2str(list, utf8) end
 --- Return the current time, measured as seconds since 1st Jan
 --- 1970.  See also |strftime()|, |strptime()| and |getftime()|.
 ---
----
 --- @return any
 function vim.fn.localtime() end
 
@@ -5273,17 +5400,6 @@ function vim.fn.log(expr) end
 --- @return any
 function vim.fn.log10(expr) end
 
---- Evaluate Lua expression {expr} and return its result converted
---- to Vim data structures. See |lua-eval| for more details.
----
---- Can also be used as a |method|: >
----   GetExpr()->luaeval()
----
---- @param expr any
---- @param expr1? any
---- @return any
-function vim.fn.luaeval(expr, expr1) end
-
 --- {expr1} must be a |List|, |Blob| or |Dictionary|.
 --- Replace each item in {expr1} with the result of evaluating
 --- {expr2}.  For a |Blob| each byte is replaced.
@@ -5332,7 +5448,7 @@ function vim.fn.luaeval(expr, expr1) end
 ---
 --- Can also be used as a |method|: >
 ---   mylist->map(expr2)
----
+--- <
 ---
 --- @param expr1 any
 --- @param expr2 any
@@ -5407,9 +5523,9 @@ function vim.fn.map(expr1, expr2) end
 ---
 --- @param name string
 --- @param mode? string
---- @param abbr? any
---- @param dict? any
---- @return any
+--- @param abbr? boolean
+--- @param dict? boolean
+--- @return string|table<string,any>
 function vim.fn.maparg(name, mode, abbr, dict) end
 
 --- Check if there is a mapping that matches with {name} in mode
@@ -5467,7 +5583,6 @@ function vim.fn.mapcheck(name, mode, abbr) end
 --- e.g. with `:map!`, you need to save the mapping for all of
 --- them, since they can differ.
 ---
----
 --- @param mode string
 --- @param abbr any
 --- @param dict any
@@ -5539,6 +5654,7 @@ function vim.fn.mapset(mode, abbr, dict) end
 ---   GetText()->match('word')
 ---   GetList()->match('word')
 --- <
+---
 --- @param expr any
 --- @param pat any
 --- @param start? any
@@ -5606,6 +5722,7 @@ function vim.fn.match(expr, pat, start, count) end
 --- Can also be used as a |method|: >
 ---   GetGroup()->matchadd('TODO')
 --- <
+---
 --- @param group any
 --- @param pattern any
 --- @param priority? any
@@ -5888,6 +6005,7 @@ function vim.fn.matchstr(expr, pat, start, count) end
 --- @return any
 function vim.fn.matchstrpos(expr, pat, start, count) end
 
+--- Return the maximum value of all items in {expr}. Example: >
 ---   echo max([apples, pears, oranges])
 ---
 --- <{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
@@ -5898,7 +6016,7 @@ function vim.fn.matchstrpos(expr, pat, start, count) end
 ---
 --- Can also be used as a |method|: >
 ---   mylist->max()
----
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -6025,13 +6143,14 @@ function vim.fn.menu_get(path, modes) end
 --- <
 --- Can also be used as a |method|: >
 ---   GetMenuName()->menu_info('v')
----
+--- <
 ---
 --- @param name string
 --- @param mode? string
 --- @return any
 function vim.fn.menu_info(name, mode) end
 
+--- Return the minimum value of all items in {expr}. Example: >
 ---   echo min([apples, pears, oranges])
 ---
 --- <{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
@@ -6042,6 +6161,7 @@ function vim.fn.menu_info(name, mode) end
 ---
 --- Can also be used as a |method|: >
 ---   mylist->min()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -6092,12 +6212,14 @@ function vim.fn.min(expr) end
 --- Can also be used as a |method|: >
 ---   GetName()->mkdir()
 --- <
+---
 --- @param name string
 --- @param flags? string
 --- @param prot? any
 --- @return any
 function vim.fn.mkdir(name, flags, prot) end
 
+--- Return a string that indicates the current mode.
 --- If [expr] is supplied and it evaluates to a non-zero Number or
 --- a non-empty String (|non-zero-arg|), then the full mode is
 --- returned, otherwise only the first letter is returned.
@@ -6283,17 +6405,7 @@ function vim.fn.nextnonblank(lnum) end
 ---
 --- Can also be used as a |method|: >
 ---   GetNumber()->nr2char()
----
---- nvim_...({...})          *E5555* *nvim_...()* *eval-api*
---- Call nvim |api| functions. The type checking of arguments will
---- be stricter than for most other builtins. For instance,
---- if Integer is expected, a |Number| must be passed in, a
---- |String| will not be autoconverted.
---- Buffer numbers, as returned by |bufnr()| could be used as
---- first argument to nvim_buf_... functions.  All functions
---- expecting an object (buffer, window or tabpage) can
---- also take the numerical value 0 to indicate the current
---- (focused) object.
+--- <
 ---
 --- @param expr any
 --- @param utf8? any
@@ -6313,7 +6425,6 @@ function vim.fn.nr2char(expr, utf8) end
 --- to separate commands.  In many places it would not be clear if
 --- "|" is an operator or a command separator.
 ---
----
 --- @param expr any
 --- @param expr1 any
 --- @return any
@@ -6716,7 +6827,7 @@ function vim.fn.pumvisible() end
 --- Can also be used as a |method|: >
 ---   GetExpr()->py3eval()
 --- <
----           *E858* *E859*
+---
 --- @param expr any
 --- @return any
 function vim.fn.py3eval(expr) end
@@ -6744,6 +6855,7 @@ function vim.fn.pyeval(expr) end
 --- Can also be used as a |method|: >
 ---   GetExpr()->pyxeval()
 --- <
+---
 --- @param expr any
 --- @return any
 function vim.fn.pyxeval(expr) end
@@ -6766,7 +6878,6 @@ function vim.fn.pyxeval(expr) end
 ---   seed->rand()
 --- <
 ---
----           *E726* *E727*
 --- @param expr? any
 --- @return any
 function vim.fn.rand(expr) end
@@ -6821,7 +6932,6 @@ function vim.fn.range(expr, max, stride) end
 --- is truncated.
 --- Also see |readfile()| and |writefile()|.
 ---
----
 --- @param fname integer
 --- @param offset? any
 --- @param size? any
@@ -6848,12 +6958,12 @@ function vim.fn.readblob(fname, offset, size) end
 ---   readdir(dirname, {n -> n !~ '^\.\|\~$'})
 ---
 --- <If you want to get a directory tree: >
----                   function! s:tree(dir)
----                       return {a:dir : map(readdir(a:dir),
+---   function! s:tree(dir)
+---       return {a:dir : map(readdir(a:dir),
 ---       \ {_, x -> isdirectory(x) ?
 ---       \          {x : s:tree(a:dir .. '/' .. x)} : x})}
----                   endfunction
----                   echo s:tree(".")
+---   endfunction
+---   echo s:tree(".")
 --- <
 --- Returns an empty List on error.
 ---
@@ -6900,6 +7010,7 @@ function vim.fn.readdir(directory, expr) end
 ---
 --- Can also be used as a |method|: >
 ---   GetFileName()->readfile()
+--- <
 ---
 --- @param fname integer
 --- @param type? any
@@ -6951,6 +7062,13 @@ function vim.fn.reg_recorded() end
 --- @return any
 function vim.fn.reg_recording() end
 
+--- @return any
+function vim.fn.reltime() end
+
+--- @param start? any
+--- @return any
+function vim.fn.reltime(start) end
+
 --- Return an item that represents a time value.  The item is a
 --- list with items that depend on the system.
 --- The item can be passed to |reltimestr()| to convert it to a
@@ -7011,10 +7129,61 @@ function vim.fn.reltimefloat(time) end
 --- Can also be used as a |method|: >
 ---   reltime(start)->reltimestr()
 --- <
+---
 --- @param time any
 --- @return any
 function vim.fn.reltimestr(time) end
 
+--- @param list any
+--- @param idx integer
+--- @return any
+function vim.fn.remove(list, idx) end
+
+--- Without {end}: Remove the item at {idx} from |List| {list} and
+--- return the item.
+--- With {end}: Remove items from {idx} to {end} (inclusive) and
+--- return a |List| with these items.  When {idx} points to the same
+--- item as {end} a list with one item is returned.  When {end}
+--- points to an item before {idx} this is an error.
+--- See |list-index| for possible values of {idx} and {end}.
+--- Returns zero on error.
+--- Example: >
+---   :echo "last item: " .. remove(mylist, -1)
+---   :call remove(mylist, 0, 9)
+--- <
+--- Use |delete()| to remove a file.
+---
+--- Can also be used as a |method|: >
+---   mylist->remove(idx)
+---
+--- @param list any
+--- @param idx integer
+--- @param end_? any
+--- @return any
+function vim.fn.remove(list, idx, end_) end
+
+--- @param blob any
+--- @param idx integer
+--- @return any
+function vim.fn.remove(blob, idx) end
+
+--- Without {end}: Remove the byte at {idx} from |Blob| {blob} and
+--- return the byte.
+--- With {end}: Remove bytes from {idx} to {end} (inclusive) and
+--- return a |Blob| with these bytes.  When {idx} points to the same
+--- byte as {end} a |Blob| with one byte is returned.  When {end}
+--- points to a byte before {idx} this is an error.
+--- Returns zero on error.
+--- Example: >
+---   :echo "last byte: " .. remove(myblob, -1)
+---   :call remove(mylist, 0, 9)
+---
+--- @param blob any
+--- @param idx integer
+--- @param end_? any
+--- @return any
+function vim.fn.remove(blob, idx, end_) end
+
 --- Remove the entry from {dict} with key {key} and return it.
 --- Example: >
 ---   :echo "removed " .. remove(dict, "one")
@@ -7052,6 +7221,7 @@ function vim.fn.rename(from, to) end
 ---
 --- Can also be used as a |method|: >
 ---   mylist->repeat(count)
+--- <
 ---
 --- @param expr any
 --- @param count any
@@ -7073,6 +7243,7 @@ vim.fn['repeat'] = function(expr, count) end
 --- Can also be used as a |method|: >
 ---   GetName()->resolve()
 --- <
+---
 --- @param filename any
 --- @return any
 function vim.fn.resolve(filename) end
@@ -7147,6 +7318,9 @@ function vim.fn.rpcstart(prog, argv) end
 --- `chanclose(id, "rpc")` to close RPC communication
 --- without stopping the job. Use chanclose(id) to close
 --- any socket.
+---
+--- @param ... any
+--- @return any
 function vim.fn.rpcstop(...) end
 
 --- Evaluate Ruby expression {expr} and return its result
@@ -7222,6 +7396,7 @@ function vim.fn.screenchars(row, col) end
 ---   nnoremap <silent> GG :echom screencol()<CR>
 ---   noremap GG <Cmd>echom screencol()<Cr>
 --- <
+---
 --- @return any
 function vim.fn.screencol() end
 
@@ -7277,6 +7452,7 @@ function vim.fn.screenrow() end
 --- Can also be used as a |method|: >
 ---   GetRow()->screenstring(col)
 --- <
+---
 --- @param row any
 --- @param col integer
 --- @return any
@@ -7516,6 +7692,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 --- Can also be used as a |method|: >
 ---   GetSearchOpts()->searchcount()
 --- <
+---
 --- @param options? table
 --- @return any
 function vim.fn.searchcount(options) end
@@ -7540,12 +7717,113 @@ function vim.fn.searchcount(options) end
 --- Can also be used as a |method|: >
 ---   GetName()->searchdecl()
 --- <
+---
 --- @param name string
 --- @param global? any
 --- @param thisblock? any
 --- @return any
 function vim.fn.searchdecl(name, global, thisblock) end
 
+--- Search for the match of a nested start-end pair.  This can be
+--- used to find the "endif" that matches an "if", while other
+--- if/endif pairs in between are ignored.
+--- The search starts at the cursor.  The default is to search
+--- forward, include 'b' in {flags} to search backward.
+--- If a match is found, the cursor is positioned at it and the
+--- line number is returned.  If no match is found 0 or -1 is
+--- returned and the cursor doesn't move.  No error message is
+--- given.
+---
+--- {start}, {middle} and {end} are patterns, see |pattern|.  They
+--- must not contain \( \) pairs.  Use of \%( \) is allowed.  When
+--- {middle} is not empty, it is found when searching from either
+--- direction, but only when not in a nested start-end pair.  A
+--- typical use is: >
+---   searchpair('\<if\>', '\<else\>', '\<endif\>')
+--- <By leaving {middle} empty the "else" is skipped.
+---
+--- {flags} 'b', 'c', 'n', 's', 'w' and 'W' are used like with
+--- |search()|.  Additionally:
+--- 'r'  Repeat until no more matches found; will find the
+---   outer pair.  Implies the 'W' flag.
+--- 'm'  Return number of matches instead of line number with
+---   the match; will be > 1 when 'r' is used.
+--- Note: it's nearly always a good idea to use the 'W' flag, to
+--- avoid wrapping around the end of the file.
+---
+--- When a match for {start}, {middle} or {end} is found, the
+--- {skip} expression is evaluated with the cursor positioned on
+--- the start of the match.  It should return non-zero if this
+--- match is to be skipped.  E.g., because it is inside a comment
+--- or a string.
+--- When {skip} is omitted or empty, every match is accepted.
+--- When evaluating {skip} causes an error the search is aborted
+--- and -1 returned.
+--- {skip} can be a string, a lambda, a funcref or a partial.
+--- Anything else makes the function fail.
+---
+--- For {stopline} and {timeout} see |search()|.
+---
+--- The value of 'ignorecase' is used.  'magic' is ignored, the
+--- patterns are used like it's on.
+---
+--- The search starts exactly at the cursor.  A match with
+--- {start}, {middle} or {end} at the next character, in the
+--- direction of searching, is the first one found.  Example: >
+---   if 1
+---     if 2
+---     endif 2
+---   endif 1
+--- <When starting at the "if 2", with the cursor on the "i", and
+--- searching forwards, the "endif 2" is found.  When starting on
+--- the character just before the "if 2", the "endif 1" will be
+--- found.  That's because the "if 2" will be found first, and
+--- then this is considered to be a nested if/endif from "if 2" to
+--- "endif 2".
+--- When searching backwards and {end} is more than one character,
+--- it may be useful to put "\zs" at the end of the pattern, so
+--- that when the cursor is inside a match with the end it finds
+--- the matching start.
+---
+--- Example, to find the "endif" command in a Vim script: >
+---
+---   :echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
+---   \ 'getline(".") =~ "^\\s*\""')
+---
+--- <The cursor must be at or after the "if" for which a match is
+--- to be found.  Note that single-quote strings are used to avoid
+--- having to double the backslashes.  The skip expression only
+--- catches comments at the start of a line, not after a command.
+--- Also, a word "en" or "if" halfway through a line is considered
+--- a match.
+--- Another example, to search for the matching "{" of a "}": >
+---
+---   :echo searchpair('{', '', '}', 'bW')
+---
+--- <This works when the cursor is at or before the "}" for which a
+--- match is to be found.  To reject matches that syntax
+--- highlighting recognized as strings: >
+---
+---   :echo searchpair('{', '', '}', 'bW',
+---        \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')
+--- <
+---
+--- @return any
+function vim.fn.searchpair() end
+
+--- Same as |searchpair()|, but returns a |List| with the line and
+--- column position of the match. The first element of the |List|
+--- is the line number and the second element is the byte index of
+--- the column position of the match.  If no match is found,
+--- returns [0, 0]. >
+---
+---   :let [lnum,col] = searchpairpos('{', '', '}', 'n')
+--- <
+--- See |match-parens| for a bigger and more useful example.
+---
+--- @return any
+function vim.fn.searchpairpos() end
+
 --- Same as |search()|, but returns a |List| with the line and
 --- column position of the match. The first element of the |List|
 --- is the line number and the second element is the byte index of
@@ -7672,7 +7950,7 @@ function vim.fn.setbufline(buf, lnum, text) end
 --- Can also be used as a |method|, the base is passed as the
 --- third argument: >
 ---   GetValue()->setbufvar(buf, varname)
----
+--- <
 ---
 --- @param buf any
 --- @param varname string
@@ -7713,7 +7991,6 @@ function vim.fn.setbufvar(buf, varname, val) end
 --- match with what Vim knows about each emoji.  If it doesn't
 --- look right you need to adjust the {list} argument.
 ---
----
 --- @param list any
 --- @return any
 function vim.fn.setcellwidths(list) end
@@ -7797,6 +8074,12 @@ function vim.fn.setcmdline(str, pos) end
 --- @return any
 function vim.fn.setcmdpos(pos) end
 
+--- @param lnum integer
+--- @param col? integer
+--- @param off? any
+--- @return any
+function vim.fn.setcursorcharpos(lnum, col, off) end
+
 --- Same as |cursor()| but uses the specified column number as the
 --- character index instead of the byte index in the line.
 ---
@@ -7823,6 +8106,7 @@ function vim.fn.setcursorcharpos(list) end
 --- Can also be used as a |method|, the base is passed as the
 --- second argument: >
 ---   GetPath()->setenv('PATH')
+--- <
 ---
 --- @param name string
 --- @param val any
@@ -7924,6 +8208,7 @@ function vim.fn.setloclist(nr, list, action, what) end
 --- Can also be used as a |method|: >
 ---   GetMatches()->setmatches()
 --- <
+---
 --- @param list any
 --- @param win? any
 --- @return any
@@ -8099,6 +8384,7 @@ function vim.fn.setpos(expr, list) end
 --- second argument: >
 ---   GetErrorlist()->setqflist()
 --- <
+---
 --- @param list any
 --- @param action? any
 --- @param what? any
@@ -8347,6 +8633,11 @@ function vim.fn.shellescape(string, special) end
 --- @return any
 function vim.fn.shiftwidth(col) end
 
+--- @param name string
+--- @param dict? any
+--- @return any
+function vim.fn.sign_define(name, dict) end
+
 --- Define a new sign named {name} or modify the attributes of an
 --- existing sign.  This is similar to the |:sign-define| command.
 ---
@@ -8501,6 +8792,7 @@ function vim.fn.sign_getdefined(name) end
 --- Can also be used as a |method|: >
 ---   GetBufname()->sign_getplaced()
 --- <
+---
 --- @param buf? any
 --- @param dict? any
 --- @return any
@@ -8523,6 +8815,7 @@ function vim.fn.sign_getplaced(buf, dict) end
 --- Can also be used as a |method|: >
 ---   GetSignid()->sign_jump()
 --- <
+---
 --- @param id any
 --- @param group any
 --- @param buf any
@@ -8579,6 +8872,7 @@ function vim.fn.sign_jump(id, group, buf) end
 --- Can also be used as a |method|: >
 ---   GetSignid()->sign_place(group, name, expr)
 --- <
+---
 --- @param id any
 --- @param group any
 --- @param name string
@@ -8651,6 +8945,10 @@ function vim.fn.sign_place(id, group, name, buf, dict) end
 --- @return any
 function vim.fn.sign_placelist(list) end
 
+--- @param name? string
+--- @return any
+function vim.fn.sign_undefine(name) end
+
 --- Deletes a previously defined sign {name}. This is similar to
 --- the |:sign-undefine| command. If {name} is not supplied, then
 --- deletes all the defined signs.
@@ -8723,6 +9021,7 @@ function vim.fn.sign_undefine(list) end
 --- <Can also be used as a |method|: >
 ---   GetSigngroup()->sign_unplace()
 --- <
+---
 --- @param group any
 --- @param dict? any
 --- @return any
@@ -8829,7 +9128,7 @@ function vim.fn.sinh(expr) end
 ---
 --- Can also be used as a |method|: >
 ---   GetList()->slice(offset)
----
+--- <
 ---
 --- @param expr any
 --- @param start any
@@ -8941,6 +9240,7 @@ function vim.fn.sockconnect(mode, address, opts) end
 --- <For a simple expression you can use a lambda: >
 ---   eval mylist->sort({i1, i2 -> i1 - i2})
 --- <
+---
 --- @param list any
 --- @param func? any
 --- @param dict? any
@@ -8957,6 +9257,7 @@ function vim.fn.sort(list, func, dict) end
 --- Can also be used as a |method|: >
 ---   GetWord()->soundfold()
 --- <
+---
 --- @param word any
 --- @return any
 function vim.fn.soundfold(word) end
@@ -8987,6 +9288,7 @@ function vim.fn.soundfold(word) end
 --- Can also be used as a |method|: >
 ---   GetText()->spellbadword()
 --- <
+---
 --- @param sentence? any
 --- @return any
 function vim.fn.spellbadword(sentence) end
@@ -9110,7 +9412,6 @@ function vim.fn.srand(expr) end
 ---   - |channel-id| on success (value is always 1)
 ---   - 0 on invalid arguments
 ---
----
 --- @param opts table
 --- @return any
 function vim.fn.stdioopen(opts) end
@@ -9134,7 +9435,7 @@ function vim.fn.stdioopen(opts) end
 ---
 --- Example: >
 ---   :echo stdpath("config")
----
+--- <
 ---
 --- @param what any
 --- @return any
@@ -9205,7 +9506,7 @@ function vim.fn.str2list(string, utf8) end
 ---
 --- Can also be used as a |method|: >
 ---   GetText()->str2nr()
----
+--- <
 ---
 --- @param string string
 --- @param base? any
@@ -9223,7 +9524,7 @@ function vim.fn.str2nr(string, base) end
 ---
 --- Can also be used as a |method|: >
 ---   GetText()->strcharlen()
----
+--- <
 ---
 --- @param string string
 --- @return any
@@ -9245,7 +9546,7 @@ function vim.fn.strcharlen(string) end
 ---
 --- Can also be used as a |method|: >
 ---   GetText()->strcharpart(5)
----
+--- <
 ---
 --- @param src any
 --- @param start any
@@ -9371,12 +9672,14 @@ function vim.fn.strgetchar(str, index) end
 --- Can also be used as a |method|: >
 ---   GetHaystack()->stridx(needle)
 --- <
+---
 --- @param haystack any
 --- @param needle any
 --- @param start? any
 --- @return any
 function vim.fn.stridx(haystack, needle, start) end
 
+--- Return {expr} converted to a String.  If {expr} is a Number,
 --- Float, String, Blob or a composition of them, then the result
 --- can be parsed back with |eval()|.
 ---   {expr} type  result ~
@@ -9481,6 +9784,7 @@ function vim.fn.strpart(src, start, len, chars) end
 --- Can also be used as a |method|: >
 ---   GetFormat()->strptime(timestring)
 --- <
+---
 --- @param format any
 --- @param timestring any
 --- @return any
@@ -9549,6 +9853,7 @@ function vim.fn.strtrans(string) end
 --- Can also be used as a |method|: >
 ---   GetText()->strutf16len()
 --- <
+---
 --- @param string string
 --- @param countcc? any
 --- @return any
@@ -9824,7 +10129,7 @@ function vim.fn.synIDtrans(synID) end
 ---   synconcealed(lnum, 4)   [1, 'X', 2]
 ---   synconcealed(lnum, 5)   [1, 'X', 2]
 ---   synconcealed(lnum, 6)   [0, '', 0]
----
+--- <
 ---
 --- @param lnum integer
 --- @param col integer
@@ -9983,14 +10288,15 @@ function vim.fn.tabpagenr(arg) end
 --- Can also be used as a |method|: >
 ---   GetTabpage()->tabpagewinnr()
 --- <
+---
 --- @param tabarg any
 --- @param arg? any
 --- @return any
 function vim.fn.tabpagewinnr(tabarg, arg) end
 
+--- Returns a |List| with the file names used to search for tags
 --- for the current buffer.  This is the 'tags' option expanded.
 ---
----
 --- @return any
 function vim.fn.tagfiles() end
 
@@ -10074,6 +10380,7 @@ function vim.fn.tan(expr) end
 --- Can also be used as a |method|: >
 ---   Compute()->tanh()
 --- <
+---
 --- @param expr any
 --- @return any
 function vim.fn.tanh(expr) end
@@ -10123,6 +10430,7 @@ function vim.fn.termopen(cmd, opts) end
 --- Can also be used as a |method|: >
 ---   GetTimer()->timer_info()
 --- <
+---
 --- @param id? any
 --- @return any
 function vim.fn.timer_info(id) end
@@ -10142,6 +10450,7 @@ function vim.fn.timer_info(id) end
 --- Can also be used as a |method|: >
 ---   GetTimer()->timer_pause(1)
 --- <
+---
 --- @param timer any
 --- @param paused any
 --- @return any
@@ -10194,6 +10503,7 @@ function vim.fn.timer_start(time, callback, options) end
 --- Can also be used as a |method|: >
 ---   GetTimer()->timer_stop()
 --- <
+---
 --- @param timer any
 --- @return any
 function vim.fn.timer_stop(timer) end
@@ -10410,6 +10720,7 @@ function vim.fn.undotree() end
 --- Can also be used as a |method|: >
 ---   mylist->uniq()
 --- <
+---
 --- @param list any
 --- @param func? any
 --- @param dict? any
@@ -10444,7 +10755,7 @@ function vim.fn.uniq(list, func, dict) end
 --- <
 --- Can also be used as a |method|: >
 ---   GetName()->utf16idx(idx)
----
+--- <
 ---
 --- @param string string
 --- @param idx integer
@@ -10672,6 +10983,7 @@ function vim.fn.win_getid(win, tab) end
 --- Can also be used as a |method|: >
 ---   GetWinid()->win_gettype()
 --- <
+---
 --- @param nr? integer
 --- @return 'autocmd'|'command'|''|'loclist'|'popup'|'preview'|'quickfix'|'unknown'
 function vim.fn.win_gettype(nr) end
@@ -10760,6 +11072,7 @@ function vim.fn.win_move_statusline(nr, offset) end
 --- Can also be used as a |method|: >
 ---   GetWinid()->win_screenpos()
 --- <
+---
 --- @param nr integer
 --- @return any
 function vim.fn.win_screenpos(nr) end
@@ -10786,12 +11099,14 @@ function vim.fn.win_screenpos(nr) end
 --- Can also be used as a |method|: >
 ---   GetWinid()->win_splitmove(target)
 --- <
+---
 --- @param nr integer
 --- @param target any
 --- @param options? table
 --- @return any
 function vim.fn.win_splitmove(nr, target, options) end
 
+--- The result is a Number, which is the number of the buffer
 --- associated with window {nr}.  {nr} can be the window number or
 --- the |window-ID|.
 --- When {nr} is zero, the number of the buffer in the current
@@ -10803,10 +11118,12 @@ function vim.fn.win_splitmove(nr, target, options) end
 --- Can also be used as a |method|: >
 ---   FindWindow()->winbufnr()->bufname()
 --- <
+---
 --- @param nr integer
 --- @return integer
 function vim.fn.winbufnr(nr) end
 
+--- The result is a Number, which is the virtual column of the
 --- cursor in the window.  This is counting screen cells from the
 --- left side of the window.  The leftmost column is one.
 ---
@@ -10833,6 +11150,7 @@ function vim.fn.windowsversion() end
 --- <Can also be used as a |method|: >
 ---   GetWinid()->winheight()
 --- <
+---
 --- @param nr integer
 --- @return integer
 function vim.fn.winheight(nr) end
@@ -10869,10 +11187,12 @@ function vim.fn.winheight(nr) end
 --- Can also be used as a |method|: >
 ---   GetTabnr()->winlayout()
 --- <
+---
 --- @param tabnr? integer
 --- @return any
 function vim.fn.winlayout(tabnr) end
 
+--- The result is a Number, which is the screen line of the cursor
 --- in the window.  This is counting screen lines from the top of
 --- the window.  The first line is one.
 --- If the cursor was moved the view on the file will be updated
@@ -10881,6 +11201,7 @@ function vim.fn.winlayout(tabnr) end
 --- @return integer
 function vim.fn.winline() end
 
+--- The result is a Number, which is the number of the current
 --- window.  The top window has number 1.
 --- Returns zero for a popup window.
 ---
@@ -10911,10 +11232,12 @@ function vim.fn.winline() end
 --- <Can also be used as a |method|: >
 ---   GetWinval()->winnr()
 --- <
+---
 --- @param arg? any
 --- @return any
 function vim.fn.winnr(arg) end
 
+--- Returns a sequence of |:resize| commands that should restore
 --- the current window sizes.  Only works properly when no windows
 --- are opened or closed and the current window and tab page is
 --- unchanged.
@@ -10923,6 +11246,7 @@ function vim.fn.winnr(arg) end
 ---   :call MessWithWindowSizes()
 ---   :exe cmd
 --- <
+---
 --- @return any
 function vim.fn.winrestcmd() end
 
@@ -10944,10 +11268,12 @@ function vim.fn.winrestcmd() end
 --- Can also be used as a |method|: >
 ---   GetView()->winrestview()
 --- <
+---
 --- @param dict any
 --- @return any
 function vim.fn.winrestview(dict) end
 
+--- Returns a |Dictionary| that contains information to restore
 --- the view of the current window.  Use |winrestview()| to
 --- restore the view.
 --- This is useful if you have a mapping that jumps around in the
@@ -10973,7 +11299,6 @@ function vim.fn.winrestview(dict) end
 ---   skipcol    columns skipped
 --- Note that no option values are saved.
 ---
----
 --- @return any
 function vim.fn.winsaveview() end
 
@@ -11017,7 +11342,6 @@ function vim.fn.winwidth(nr) end
 ---   visual_words    Number of words visually selected
 ---       (only in Visual mode)
 ---
----
 --- @return any
 function vim.fn.wordcount() end
 
@@ -11084,6 +11408,7 @@ function vim.fn.writefile(object, fname, flags) end
 --- Can also be used as a |method|: >
 ---   :let bits = bits->xor(0x80)
 --- <
+---
 --- @param expr any
 --- @param expr1 any
 --- @return any
-- 
cgit 


From 2736cb3adf4ff2b9e3ba188eb7d081e1cb938fb4 Mon Sep 17 00:00:00 2001
From: altermo <107814000+altermo@users.noreply.github.com>
Date: Sat, 29 Jul 2023 16:08:32 +0200
Subject: docs(lua): vim.str_utf_{start,end,pos} #24424

Closes #24422
---
 runtime/doc/lua.txt               | 59 +++++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/_meta/builtin.lua | 47 +++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 660d930f5f..96569f8d52 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -969,6 +969,65 @@ vim.str_byteindex({str}, {index}, {use_utf16})           *vim.str_byteindex()*
       • {index}      (number)
       • {use_utf16}  any|nil
 
+vim.str_utf_end({str}, {index})                            *vim.str_utf_end()*
+    Gets the distance (in bytes) from the last byte of the codepoint
+    (character) that {index} points to.
+
+    Examples: >lua
+
+     -- The character 'æ' are equal to the bytes '\xc3\xa6' (using UTF-8)
+
+     -- Returns 0 because the index is pointing at the last byte of a character
+     vim.str_utf_end('æ', 2)
+
+     -- Returns 1 because the index is pointing at the second last byte of a character
+     vim.str_utf_end('æ', 1)
+<
+
+    Parameters: ~
+      • {str}    (string)
+      • {index}  (number)
+
+    Return: ~
+        (number)
+
+vim.str_utf_pos({str})                                     *vim.str_utf_pos()*
+    Gets a list of the starting byte positions of each UTF-8 codepoint in the
+    given string.
+
+    Embedded NUL bytes are treated as terminating the string.
+
+    Parameters: ~
+      • {str}  (string)
+
+    Return: ~
+        (table)
+
+vim.str_utf_start({str}, {index})                        *vim.str_utf_start()*
+    Gets the distance (in bytes) from the starting byte of the codepoint
+    (character) that {index} points to.
+
+    The result can be added to {index} to get the starting byte of a
+    character.
+
+    Examples: >lua
+
+     -- The character 'æ' are equal to the bytes '\xc3\xa6' (using UTF-8)
+
+     -- Returns 0 because the index is pointing at the first byte of a character
+     vim.str_utf_start('æ', 1)
+
+     -- Returns -1 because the index is pointing at the second byte of a character
+     vim.str_utf_start('æ', 2)
+<
+
+    Parameters: ~
+      • {str}    (string)
+      • {index}  (number)
+
+    Return: ~
+        (number)
+
 vim.str_utfindex({str}, {index})                          *vim.str_utfindex()*
     Convert byte index to UTF-32 and UTF-16 indices. If {index} is not
     supplied, the length of the string is used. All indices are zero-based.
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index 88f07f2a51..a5508bdc04 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -118,6 +118,53 @@ function vim.stricmp(a, b) end
 --- @param use_utf16? any
 function vim.str_byteindex(str, index, use_utf16) end
 
+--- Gets a list of the starting byte positions of each UTF-8 codepoint in the given string.
+---
+--- Embedded NUL bytes are treated as terminating the string.
+--- @param str string
+--- @return table
+function vim.str_utf_pos(str) end
+
+--- Gets the distance (in bytes) from the starting byte of the codepoint (character) that {index}
+--- points to.
+---
+--- The result can be added to {index} to get the starting byte of a character.
+---
+--- Examples:
+--- <pre>lua
+--- -- The character 'æ' are equal to the bytes '\xc3\xa6' (using UTF-8)
+---
+--- -- Returns 0 because the index is pointing at the first byte of a character
+--- vim.str_utf_start('æ', 1)
+---
+--- -- Returns -1 because the index is pointing at the second byte of a character
+--- vim.str_utf_start('æ', 2)
+--- </pre>
+---
+--- @param str string
+--- @param index number
+--- @return number
+function vim.str_utf_start(str, index) end
+
+--- Gets the distance (in bytes) from the last byte of the codepoint (character) that {index} points
+--- to.
+---
+--- Examples:
+--- <pre>lua
+--- -- The character 'æ' are equal to the bytes '\xc3\xa6' (using UTF-8)
+---
+--- -- Returns 0 because the index is pointing at the last byte of a character
+--- vim.str_utf_end('æ', 2)
+---
+--- -- Returns 1 because the index is pointing at the second last byte of a character
+--- vim.str_utf_end('æ', 1)
+--- </pre>
+---
+--- @param str string
+--- @param index number
+--- @return number
+function vim.str_utf_end(str, index) end
+
 --- Convert byte index to UTF-32 and UTF-16 indices. If {index} is not
 --- supplied, the length of the string is used. All indices are zero-based.
 ---
-- 
cgit 


From 996dd36c77321ea91758b5996d152a2f37af99dd Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sat, 29 Jul 2023 16:10:40 +0200
Subject: feat(lsp): add actionable advice to lsp client quit error msg
 (#24510)

Co-authored-by: Justin M. Keyes <justinkz@gmail.com>
---
 runtime/lua/vim/lsp.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 1a1dc684ba..edf69af718 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1260,8 +1260,13 @@ function lsp.start_client(config)
         changetracking.reset(client)
       end
       if code ~= 0 or (signal ~= 0 and signal ~= 15) then
-        local msg =
-          string.format('Client %s quit with exit code %s and signal %s', client_id, code, signal)
+        local msg = string.format(
+          'Client %s quit with exit code %s and signal %s. Check log for errors: %s',
+          name,
+          code,
+          signal,
+          lsp.get_log_path()
+        )
         vim.notify(msg, vim.log.levels.WARN)
       end
     end)
-- 
cgit 


From 9b5f58185e1ff0597c7e95b7205d9ec11be1848c Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 1 Aug 2023 09:57:52 +0100
Subject: docs(builtin): fix and annotate language blocks (#24506)

---
 runtime/doc/builtin.txt         | 2857 +++++++++++++++++++++------------------
 runtime/lua/vim/_meta/vimfn.lua | 2839 ++++++++++++++++++++------------------
 2 files changed, 3097 insertions(+), 2599 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 0e49c70470..3033435ee6 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -17,16 +17,17 @@ abs({expr})							*abs()*
 		a |Float| abs() returns a |Float|.  When {expr} can be
 		converted to a |Number| abs() returns a |Number|.  Otherwise
 		abs() gives an error message and returns -1.
-		Examples: >
+		Examples: >vim
 			echo abs(1.456)
-<			1.456  >
+<			1.456  >vim
 			echo abs(-5.456)
-<			5.456  >
+<			5.456  >vim
 			echo abs(-4)
 <			4
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->abs()
+<
 
 acos({expr})							*acos()*
 		Return the arc cosine of {expr} measured in radians, as a
@@ -35,43 +36,47 @@ acos({expr})							*acos()*
 		[-1, 1].
 		Returns NaN if {expr} is outside the range [-1, 1].  Returns
 		0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo acos(0)
-<			1.570796 >
-			:echo acos(-0.5)
+		Examples: >vim
+			echo acos(0)
+<			1.570796 >vim
+			echo acos(-0.5)
 <			2.094395
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->acos()
+<
 
 add({object}, {expr})						*add()*
 		Append the item {expr} to |List| or |Blob| {object}.  Returns
-		the resulting |List| or |Blob|.  Examples: >
-			:let alist = add([1, 2, 3], item)
-			:call add(mylist, "woodstock")
+		the resulting |List| or |Blob|.  Examples: >vim
+			let alist = add([1, 2, 3], item)
+			call add(mylist, "woodstock")
 <		Note that when {expr} is a |List| it is appended as a single
 		item.  Use |extend()| to concatenate |Lists|.
 		When {object} is a |Blob| then {expr} must be a number.
 		Use |insert()| to add an item at another position.
 		Returns 1 if {object} is not a |List| or a |Blob|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->add(val1)->add(val2)
+<
 
 and({expr}, {expr})						*and()*
 		Bitwise AND on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `or()` and `xor()`.
-		Example: >
-			:let flag = and(bits, 0x80)
-<		Can also be used as a |method|: >
-			:let flag = bits->and(0x80)
+		Example: >vim
+			let flag = and(bits, 0x80)
+<		Can also be used as a |method|: >vim
+			let flag = bits->and(0x80)
+<
 
 api_info()						*api_info()*
 		Returns Dictionary of |api-metadata|.
 
-		View it in a nice human-readable format: >
-		       :lua vim.print(vim.fn.api_info())
+		View it in a nice human-readable format: >vim
+		       lua vim.print(vim.fn.api_info())
+<
 
 append({lnum}, {text})					*append()*
 		When {text} is a |List|: Append each item of the |List| as a
@@ -82,12 +87,13 @@ append({lnum}, {text})					*append()*
 		{lnum} can be zero to insert a line before the first one.
 		{lnum} is used like with |getline()|.
 		Returns 1 for failure ({lnum} out of range or out of memory),
-		0 for success.  Example: >
-			:let failed = append(line('$'), "# THE END")
-			:let failed = append(0, ["Chapter 1", "the beginning"])
+		0 for success.  Example: >vim
+			let failed = append(line('$'), "# THE END")
+			let failed = append(0, ["Chapter 1", "the beginning"])
 
-<		Can also be used as a |method| after a List: >
+<		Can also be used as a |method| after a List: >vim
 			mylist->append(lnum)
+<
 
 appendbufline({buf}, {lnum}, {text})		*appendbufline()*
 		Like |append()| but append the text in buffer {expr}.
@@ -105,11 +111,12 @@ appendbufline({buf}, {lnum}, {text})		*appendbufline()*
 		On success 0 is returned, on failure 1 is returned.
 
 		If {buf} is not a valid buffer or {lnum} is not valid, an
-		error message is given. Example: >
-			:let failed = appendbufline(13, 0, "# THE START")
+		error message is given. Example: >vim
+			let failed = appendbufline(13, 0, "# THE START")
 <
-		Can also be used as a |method| after a List: >
+		Can also be used as a |method| after a List: >vim
 			mylist->appendbufline(buf, lnum)
+<
 
 argc([{winid}])						*argc()*
 		The result is the number of files in the argument list.  See
@@ -139,13 +146,13 @@ arglistid([{winnr} [, {tabnr}]])			*arglistid()*
 
 argv([{nr} [, {winid}]])					*argv()*
 		The result is the {nr}th file in the argument list.  See
-		|arglist|.  "argv(0)" is the first one.  Example: >
-			:let i = 0
-			:while i < argc()
-			:  let f = escape(fnameescape(argv(i)), '.')
-			:  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
-			:  let i = i + 1
-			:endwhile
+		|arglist|.  "argv(0)" is the first one.  Example: >vim
+			let i = 0
+			while i < argc()
+			  let f = escape(fnameescape(argv(i)), '.')
+			  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
+			  let i = i + 1
+			endwhile
 <		Without the {nr} argument, or when {nr} is -1, a |List| with
 		the whole |arglist| is returned.
 
@@ -163,13 +170,13 @@ asin({expr})							*asin()*
 		[-1, 1].
 		Returns NaN if {expr} is outside the range [-1, 1].  Returns
 		0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo asin(0.8)
-<			0.927295 >
-			:echo asin(-0.5)
+		Examples: >vim
+			echo asin(0.8)
+<			0.927295 >vim
+			echo asin(-0.5)
 <			-0.523599
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->asin()
 <
 
@@ -179,7 +186,7 @@ assert_beeps({cmd})					*assert_beeps()*
 		Also see |assert_fails()|, |assert_nobeep()| and
 		|assert-return|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCmd()->assert_beeps()
 <
 
@@ -194,13 +201,14 @@ assert_equal({expected}, {actual} [, {msg}])		*assert_equal()*
 		from the Number 4.  And the number 4 is different from the
 		Float 4.0.  The value of 'ignorecase' is not used here, case
 		always matters.
-		Example: >
+		Example: >vim
 			assert_equal('foo', 'bar')
 <		Will result in a string to be added to |v:errors|:
 			test.vim line 12: Expected 'foo' but got 'bar' ~
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->assert_equal([1, 2, 3])
+<
 
 assert_equalfile({fname-one}, {fname-two})	*assert_equalfile()*
 		When the files {fname-one} and {fname-two} do not contain
@@ -209,15 +217,16 @@ assert_equalfile({fname-one}, {fname-two})	*assert_equalfile()*
 		When {fname-one} or {fname-two} does not exist the error will
 		mention that.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLog()->assert_equalfile('expected.log')
+<
 
 assert_exception({error} [, {msg}])		*assert_exception()*
 		When v:exception does not contain the string {error} an error
 		message is added to |v:errors|.  Also see |assert-return|.
 		This can be used to assert that a command throws an exception.
 		Using the error number, followed by a colon, avoids problems
-		with translations: >
+		with translations: >vim
 			try
 			  commandthatfails
 			  call assert_false(1, 'command should have failed')
@@ -234,16 +243,16 @@ assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 
 		When {error} is a string it must be found literally in the
 		first reported error. Most often this will be the error code,
-		including the colon, e.g. "E123:". >
+		including the colon, e.g. "E123:". >vim
 			assert_fails('bad cmd', 'E987:')
 <
 		When {error} is a |List| with one or two strings, these are
 		used as patterns.  The first pattern is matched against the
-		first reported error: >
+		first reported error: >vim
 			assert_fails('cmd', ['E987:.*expected bool'])
 <		The second pattern, if present, is matched against the last
 		reported error.  To only match the last error use an empty
-		string for the first error: >
+		string for the first error: >vim
 			assert_fails('cmd', ['', 'E987:'])
 <
 		If {msg} is empty then it is not used.  Do this to get the
@@ -261,8 +270,9 @@ assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 		Note that beeping is not considered an error, and some failing
 		commands only beep.  Use |assert_beeps()| for those.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCmd()->assert_fails('E99:')
+<
 
 assert_false({actual} [, {msg}])			*assert_false()*
 		When {actual} is not false an error message is added to
@@ -274,8 +284,9 @@ assert_false({actual} [, {msg}])			*assert_false()*
 		A value is false when it is zero. When {actual} is not a
 		number the assert fails.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetResult()->assert_false()
+<
 
 assert_inrange({lower}, {upper}, {actual} [, {msg}])	*assert_inrange()*
 		This asserts number and |Float| values.  When {actual}  is lower
@@ -299,12 +310,12 @@ assert_match({pattern}, {actual} [, {msg}])		*assert_match()*
 		Use "^" and "$" to match with the start and end of the text.
 		Use both to match the whole text.
 
-		Example: >
+		Example: >vim
 			assert_match('^f.*o$', 'foobar')
 <		Will result in a string to be added to |v:errors|:
 			test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			getFile()->assert_match('foo.*')
 <
 
@@ -313,7 +324,7 @@ assert_nobeep({cmd})				*assert_nobeep()*
 		produces a beep or visual bell.
 		Also see |assert_beeps()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCmd()->assert_nobeep()
 <
 
@@ -322,9 +333,8 @@ assert_notequal({expected}, {actual} [, {msg}])	*assert_notequal()*
 		|v:errors| when {expected} and {actual} are equal.
 		Also see |assert-return|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->assert_notequal([1, 2, 3])
-
 <
 
 assert_notmatch({pattern}, {actual} [, {msg}])	*assert_notmatch()*
@@ -332,7 +342,7 @@ assert_notmatch({pattern}, {actual} [, {msg}])	*assert_notmatch()*
 		|v:errors| when {pattern} matches {actual}.
 		Also see |assert-return|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			getFile()->assert_notmatch('bar.*')
 <
 
@@ -340,7 +350,7 @@ assert_report({msg})				*assert_report()*
 		Report a test failure directly, using String {msg}.
 		Always returns one.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMessage()->assert_report()
 <
 
@@ -352,7 +362,7 @@ assert_true({actual} [, {msg}])			*assert_true()*
 		When {actual} is not a number or |v:true| the assert fails.
 		When {msg} is given it precedes the default message.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetResult()->assert_true()
 <
 
@@ -361,14 +371,15 @@ atan({expr})							*atan()*
 		the range [-pi/2, +pi/2] radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo atan(100)
-<			1.560797 >
-			:echo atan(-4.01)
+		Examples: >vim
+			echo atan(100)
+<			1.560797 >vim
+			echo atan(-4.01)
 <			-1.326405
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->atan()
+<
 
 atan2({expr1}, {expr2})					*atan2()*
 		Return the arc tangent of {expr1} / {expr2}, measured in
@@ -376,24 +387,25 @@ atan2({expr1}, {expr2})					*atan2()*
 		{expr1} and {expr2} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
 		|Number|.
-		Examples: >
-			:echo atan2(-1, 1)
-<			-0.785398 >
-			:echo atan2(1, -1)
+		Examples: >vim
+			echo atan2(-1, 1)
+<			-0.785398 >vim
+			echo atan2(1, -1)
 <			2.356194
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->atan2(1)
+<
 
 blob2list({blob})					*blob2list()*
 		Return a List containing the number value of each byte in Blob
-		{blob}.  Examples: >
-			blob2list(0z0102.0304)	returns [1, 2, 3, 4]
-			blob2list(0z)		returns []
+		{blob}.  Examples: >vim
+			blob2list(0z0102.0304)	" returns [1, 2, 3, 4]
+			blob2list(0z)		" returns []
 <		Returns an empty List on error.  |list2blob()| does the
 		opposite.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBlob()->blob2list()
 <
 
@@ -428,13 +440,14 @@ bufadd({name})						*bufadd()*
 		created buffer.  When {name} is an empty string then a new
 		buffer is always created.
 		The buffer will not have 'buflisted' set and not be loaded
-		yet.  To add some text to the buffer use this: >
+		yet.  To add some text to the buffer use this: >vim
 			let bufnr = bufadd('someName')
 			call bufload(bufnr)
 			call setbufline(bufnr, 1, ['some', 'text'])
 <		Returns 0 on error.
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			let bufnr = 'somename'->bufadd()
+<
 
 bufexists({buf})					*bufexists()*
 		The result is a Number, which is |TRUE| if a buffer called
@@ -458,16 +471,18 @@ bufexists({buf})					*bufexists()*
 		Use "bufexists(0)" to test for the existence of an alternate
 		file name.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			let exists = 'somename'->bufexists()
+<
 
 buflisted({buf})					*buflisted()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists and is listed (has the 'buflisted' option set).
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			let listed = 'somename'->buflisted()
+<
 
 bufload({buf})						*bufload()*
 		Ensure the buffer {buf} is loaded.  When the buffer name
@@ -479,16 +494,18 @@ bufload({buf})						*bufload()*
 		there will be no dialog, the buffer will be loaded anyway.
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			eval 'somename'->bufload()
+<
 
 bufloaded({buf})					*bufloaded()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists and is loaded (shown in a window or hidden).
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			let loaded = 'somename'->bufloaded()
+<
 
 bufname([{buf}])						*bufname()*
 		The result is the name of a buffer.  Mostly as it is displayed
@@ -511,17 +528,17 @@ bufname([{buf}])						*bufname()*
 		with a listed buffer, that one is returned.  Next unlisted
 		buffers are searched for.
 		If the {buf} is a String, but you want to use it as a buffer
-		number, force it to be a Number by adding zero to it: >
-			:echo bufname("3" + 0)
-<		Can also be used as a |method|: >
+		number, force it to be a Number by adding zero to it: >vim
+			echo bufname("3" + 0)
+<		Can also be used as a |method|: >vim
 			echo bufnr->bufname()
 
 <		If the buffer doesn't exist, or doesn't have a name, an empty
-		string is returned. >
-			bufname("#")		alternate buffer name
-			bufname(3)		name of buffer 3
-			bufname("%")		name of current buffer
-			bufname("file2")	name of buffer where "file2" matches.
+		string is returned. >vim
+			echo bufname("#")		" alternate buffer name
+			echo bufname(3)		" name of buffer 3
+			echo bufname("%")		" name of current buffer
+			echo bufname("file2")	" name of buffer where "file2" matches.
 <
 
 bufnr([{buf} [, {create}]])					*bufnr()*
@@ -531,43 +548,46 @@ bufnr([{buf} [, {create}]])					*bufnr()*
 		If the buffer doesn't exist, -1 is returned.  Or, if the
 		{create} argument is present and TRUE, a new, unlisted,
 		buffer is created and its number is returned.
-		bufnr("$") is the last buffer: >
-			:let last_buffer = bufnr("$")
+		bufnr("$") is the last buffer: >vim
+			let last_buffer = bufnr("$")
 <		The result is a Number, which is the highest buffer number
 		of existing buffers.  Note that not all buffers with a smaller
 		number necessarily exist, because ":bwipeout" may have removed
 		them.  Use bufexists() to test for the existence of a buffer.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			echo bufref->bufnr()
+<
 
 bufwinid({buf})						*bufwinid()*
 		The result is a Number, which is the |window-ID| of the first
 		window associated with buffer {buf}.  For the use of {buf},
 		see |bufname()| above.  If buffer {buf} doesn't exist or
-		there is no such window, -1 is returned.  Example: >
+		there is no such window, -1 is returned.  Example: >vim
 
 			echo "A window containing buffer 1 is " .. (bufwinid(1))
 <
 		Only deals with the current tab page.  See |win_findbuf()| for
 		finding more.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			FindBuffer()->bufwinid()
+<
 
 bufwinnr({buf})						*bufwinnr()*
 		Like |bufwinid()| but return the window number instead of the
 		|window-ID|.
 		If buffer {buf} doesn't exist or there is no such window, -1
-		is returned.  Example: >
+		is returned.  Example: >vim
 
 			echo "A window containing buffer 1 is " .. (bufwinnr(1))
 
 <		The number can be used with |CTRL-W_w| and ":wincmd w"
 		|:wincmd|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			FindBuffer()->bufwinnr()
+<
 
 byte2line({byte})					*byte2line()*
 		Return the line number that contains the character at byte
@@ -579,8 +599,9 @@ byte2line({byte})					*byte2line()*
 
 		Returns -1 if the {byte} value is invalid.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetOffset()->byte2line()
+<
 
 byteidx({expr}, {nr} [, {utf16}])				*byteidx()*
 		Return byte index of the {nr}th character in the String
@@ -599,10 +620,10 @@ byteidx({expr}, {nr} [, {utf16}])				*byteidx()*
 		middle of a character (e.g. in a 4-byte character), then the
 		byte index of the first byte in the character is returned.
 		Refer to |string-offset-encoding| for more information.
-		Example : >
+		Example : >vim
 			echo matchstr(str, ".", byteidx(str, 3))
 <		will display the fourth character.  Another way to do the
-		same: >
+		same: >vim
 			let s = strpart(str, byteidx(str, 3))
 			echo strpart(s, 0, byteidx(s, 1))
 <		Also see |strgetchar()| and |strcharpart()|.
@@ -612,17 +633,18 @@ byteidx({expr}, {nr} [, {utf16}])				*byteidx()*
 		in bytes is returned.
 		See |charidx()| and |utf16idx()| for getting the character and
 		UTF-16 index respectively from the byte index.
-		Examples: >
-			echo byteidx('a😊😊', 2)	returns 5
-			echo byteidx('a😊😊', 2, 1)	returns 1
-			echo byteidx('a😊😊', 3, 1)	returns 5
+		Examples: >vim
+			echo byteidx('a😊😊', 2)	" returns 5
+			echo byteidx('a😊😊', 2, 1)	" returns 1
+			echo byteidx('a😊😊', 3, 1)	" returns 5
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->byteidx(idx)
+<
 
 byteidxcomp({expr}, {nr} [, {utf16}])			*byteidxcomp()*
 		Like byteidx(), except that a composing character is counted
-		as a separate character.  Example: >
+		as a separate character.  Example: >vim
 			let s = 'e' .. nr2char(0x301)
 			echo byteidx(s, 1)
 			echo byteidxcomp(s, 1)
@@ -631,8 +653,9 @@ byteidxcomp({expr}, {nr} [, {utf16}])			*byteidxcomp()*
 		character is 3 bytes), the second echo results in 1 ('e' is
 		one byte).
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->byteidxcomp(idx)
+<
 
 call({func}, {arglist} [, {dict}])			*call()* *E699*
 		Call function {func} with the items in |List| {arglist} as
@@ -643,7 +666,7 @@ call({func}, {arglist} [, {dict}])			*call()* *E699*
 		{dict} is for functions with the "dict" attribute.  It will be
 		used to set the local variable "self". |Dictionary-function|
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFunc()->call([arg, arg], dict)
 <
 
@@ -651,17 +674,17 @@ ceil({expr})							*ceil()*
 		Return the smallest integral value greater than or equal to
 		{expr} as a |Float| (round up).
 		{expr} must evaluate to a |Float| or a |Number|.
-		Examples: >
+		Examples: >vim
 			echo ceil(1.456)
-<			2.0  >
+<			2.0  >vim
 			echo ceil(-5.456)
-<			-5.0  >
+<			-5.0  >vim
 			echo ceil(4.0)
 <			4.0
 
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->ceil()
 <
 
@@ -694,8 +717,8 @@ chansend({id}, {data})					*chansend()*
 		{data} may be a string, string convertible, |Blob|, or a list.
 		If {data} is a list, the items will be joined by newlines; any
 		newlines in an item will be sent as NUL. To send a final
-		newline, include a final empty string. Example: >
-			:call chansend(id, ["abc", "123\n456", ""])
+		newline, include a final empty string. Example: >vim
+			call chansend(id, ["abc", "123\n456", ""])
 <		will send "abc<NL>123<NUL>456<NL>".
 
 		chansend() writes raw data, not RPC messages.  If the channel
@@ -704,12 +727,12 @@ chansend({id}, {data})					*chansend()*
 
 char2nr({string} [, {utf8}])				*char2nr()*
 		Return Number value of the first char in {string}.
-		Examples: >
-			char2nr(" ")		returns 32
-			char2nr("ABC")		returns 65
-			char2nr("á")		returns 225
-			char2nr("á"[0])		returns 195
-			char2nr("\<M-x>")	returns 128
+		Examples: >vim
+			echo char2nr(" ")		" returns 32
+			echo char2nr("ABC")		" returns 65
+			echo char2nr("á")		" returns 225
+			echo char2nr("á"[0])		" returns 195
+			echo char2nr("\<M-x>")	" returns 128
 <		Non-ASCII characters are always treated as UTF-8 characters.
 		{utf8} is ignored, it exists only for backwards-compatibility.
 		A combining character is a separate character.
@@ -717,8 +740,9 @@ char2nr({string} [, {utf8}])				*char2nr()*
 
 		Returns 0 if {string} is not a |String|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetChar()->char2nr()
+<
 
 charclass({string})					*charclass()*
 		Return the character class of the first character in {string}.
@@ -736,11 +760,11 @@ charcol({expr} [, {winid}])				*charcol()*
 		position given with {expr} instead of the byte position.
 
 		Example:
-		With the cursor on '세' in line 5 with text "여보세요": >
-			charcol('.')		returns 3
-			col('.')		returns 7
+		With the cursor on '세' in line 5 with text "여보세요": >vim
+			echo charcol('.')		" returns 3
+			echo col('.')		" returns 7
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetPos()->col()
 <
 
@@ -771,14 +795,15 @@ charidx({string}, {idx} [, {countcc} [, {utf16}]])	*charidx()*
 		from the character index and |utf16idx()| for getting the
 		UTF-16 index from the character index.
 		Refer to |string-offset-encoding| for more information.
-		Examples: >
-			echo charidx('áb́ć', 3)		returns 1
-			echo charidx('áb́ć', 6, 1)	returns 4
-			echo charidx('áb́ć', 16)		returns -1
-			echo charidx('a😊😊', 4, 0, 1)	returns 2
+		Examples: >vim
+			echo charidx('áb́ć', 3)		" returns 1
+			echo charidx('áb́ć', 6, 1)	" returns 4
+			echo charidx('áb́ć', 16)		" returns -1
+			echo charidx('a😊😊', 4, 0, 1)	" returns 2
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->charidx(idx)
+<
 
 chdir({dir})						*chdir()*
 		Change the current working directory to {dir}.  The scope of
@@ -795,14 +820,14 @@ chdir({dir})						*chdir()*
 		this to another chdir() to restore the directory.
 		On failure, returns an empty string.
 
-		Example: >
+		Example: >vim
 			let save_dir = chdir(newdir)
 			if save_dir != ""
 			   " ... do some work
 			   call chdir(save_dir)
 			endif
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetDir()->chdir()
 <
 
@@ -814,8 +839,9 @@ cindent({lnum})						*cindent()*
 		When {lnum} is invalid -1 is returned.
 		See |C-indenting|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->cindent()
+<
 
 clearmatches([{win}])				*clearmatches()*
 		Clears all matches previously defined for the current window
@@ -823,7 +849,7 @@ clearmatches([{win}])				*clearmatches()*
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWin()->clearmatches()
 <
 
@@ -850,11 +876,11 @@ col({expr} [, {winid}])					*col()*
 		For the screen column position use |virtcol()|.  For the
 		character position use |charcol()|.
 		Note that only marks in the current file can be used.
-		Examples: >
-			col(".")		column of cursor
-			col("$")		length of cursor line plus one
-			col("'t")		column of mark t
-			col("'" .. markname)	column of mark markname
+		Examples: >vim
+			echo col(".")		" column of cursor
+			echo col("$")		" length of cursor line plus one
+			echo col("'t")		" column of mark t
+			echo col("'" .. markname)	" column of mark markname
 <		The first column is 1.  Returns 0 if {expr} is invalid or when
 		the window with ID {winid} is not found.
 		For an uppercase mark the column may actually be in another
@@ -862,10 +888,10 @@ col({expr} [, {winid}])					*col()*
 		For the cursor position, when 'virtualedit' is active, the
 		column is one higher if the cursor is after the end of the
 		line.  Also, when using a <Cmd> mapping the cursor isn't
-		moved, this can be used to obtain the column in Insert mode: >
-			:imap <F2> <Cmd>echo col(".").."\n"<CR>
+		moved, this can be used to obtain the column in Insert mode: >vim
+			imap <F2> <Cmd>echo col(".").."\n"<CR>
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetPos()->col()
 <
 
@@ -887,7 +913,7 @@ complete({startcol}, {matches})			*complete()* *E785*
 		The match can be selected with CTRL-N and CTRL-P as usual with
 		Insert mode completion.  The popup menu will appear if
 		specified, see |ins-completion-menu|.
-		Example: >
+		Example: >vim
 			inoremap <F5> <C-R>=ListMonths()<CR>
 
 			func ListMonths()
@@ -900,8 +926,9 @@ complete({startcol}, {matches})			*complete()* *E785*
 		an empty string is returned to avoid a zero being inserted.
 
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetMatches()->complete(col('.'))
+<
 
 complete_add({expr})					*complete_add()*
 		Add {expr} to the list of matches.  Only to be used by the
@@ -912,8 +939,9 @@ complete_add({expr})					*complete_add()*
 		See |complete-functions| for an explanation of {expr}.  It is
 		the same as one item in the list that 'omnifunc' would return.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMoreMatches()->complete_add()
+<
 
 complete_check()					*complete_check()*
 		Check for a key typed while looking for completion matches.
@@ -973,7 +1001,7 @@ complete_info([{what}])				*complete_info()*
 
 		Returns an empty |Dictionary| on error.
 
-		Examples: >
+		Examples: >vim
 			" Get all items
 			call complete_info()
 			" Get only 'mode'
@@ -981,7 +1009,7 @@ complete_info([{what}])				*complete_info()*
 			" Get only 'mode' and 'pum_visible'
 			call complete_info(['mode', 'pum_visible'])
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetItems()->complete_info()
 <
 
@@ -997,11 +1025,11 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])	*confirm()*
 		some systems the string is wrapped when it doesn't fit.
 
 		{choices} is a String, with the individual choices separated
-		by '\n', e.g. >
+		by '\n', e.g. >vim
 			confirm("Save changes?", "&Yes\n&No\n&Cancel")
 <		The letter after the '&' is the shortcut key for that choice.
 		Thus you can type 'c' to select "Cancel".  The shortcut does
-		not need to be the first letter: >
+		not need to be the first letter: >vim
 			confirm("file has been modified", "&Save\nSave &All")
 <		For the console, the first letter of each choice is used as
 		the default shortcut key.  Case is ignored.
@@ -1020,7 +1048,7 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])	*confirm()*
 		If the user aborts the dialog by pressing <Esc>, CTRL-C,
 		or another valid interrupt key, confirm() returns 0.
 
-		An example: >
+		An example: >vim
 		   let choice = confirm("What do you want?",
 					\ "&Apples\n&Oranges\n&Bananas", 2)
 		   if choice == 0
@@ -1037,7 +1065,7 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])	*confirm()*
 		don't fit, a vertical layout is used anyway.  For some systems
 		the horizontal layout is always used.
 
-		Can also be used as a |method|in: >
+		Can also be used as a |method|in: >vim
 			BuildMessage()->confirm("&Yes\n&No")
 <
 
@@ -1050,35 +1078,38 @@ copy({expr})							*copy()*
 		changing an item changes the contents of both |Lists|.
 		A |Dictionary| is copied in a similar way as a |List|.
 		Also see |deepcopy()|.
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->copy()
+<
 
 cos({expr})							*cos()*
 		Return the cosine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo cos(100)
-<			0.862319 >
-			:echo cos(-4.01)
+		Examples: >vim
+			echo cos(100)
+<			0.862319 >vim
+			echo cos(-4.01)
 <			-0.646043
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->cos()
+<
 
 cosh({expr})							*cosh()*
 		Return the hyperbolic cosine of {expr} as a |Float| in the range
 		[1, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo cosh(0.5)
-<			1.127626 >
-			:echo cosh(-0.5)
+		Examples: >vim
+			echo cosh(0.5)
+<			1.127626 >vim
+			echo cosh(-0.5)
 <			-1.127626
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->cosh()
+<
 
 count({comp}, {expr} [, {ic} [, {start}]])			*count()*
 		Return the number of times an item with value {expr} appears
@@ -1093,7 +1124,7 @@ count({comp}, {expr} [, {ic} [, {start}]])			*count()*
 		occurrences of {expr} is returned. Zero is returned when
 		{expr} is an empty string.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->count(val)
 <
 
@@ -1155,8 +1186,9 @@ cursor({list})						*cursor()*
 		position within a <Tab> or after the last character.
 		Returns 0 when the position could be set, -1 otherwise.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCursorPos()->cursor()
+<
 
 debugbreak({pid})					*debugbreak()*
 		Specifically used to interrupt a program being debugged.  It
@@ -1167,7 +1199,7 @@ debugbreak({pid})					*debugbreak()*
 		Returns |TRUE| if successfully interrupted the program.
 		Otherwise returns |FALSE|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetPid()->debugbreak()
 <
 
@@ -1191,8 +1223,9 @@ deepcopy({expr} [, {noref}])			*deepcopy()* *E698*
 		{noref} set to 1 will fail.
 		Also see |copy()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetObject()->deepcopy()
+<
 
 delete({fname} [, {flags}])				*delete()*
 		Without {flags} or with {flags} empty: Deletes the file by the
@@ -1213,8 +1246,9 @@ delete({fname} [, {flags}])				*delete()*
 		operation was successful and -1/true when the deletion failed
 		or partly failed.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->delete()
+<
 
 deletebufline({buf}, {first} [, {last}])		*deletebufline()*
 		Delete lines {first} to {last} (inclusive) from buffer {buf}.
@@ -1230,7 +1264,7 @@ deletebufline({buf}, {first} [, {last}])		*deletebufline()*
 		when using |line()| this refers to the current buffer. Use "$"
 		to refer to the last line in buffer {buf}.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBuffer()->deletebufline(1)
 <
 
@@ -1245,7 +1279,7 @@ dictwatcheradd({dict}, {pattern}, {callback})	*dictwatcheradd()*
 		After this is called, every change on {dict} and on keys
 		matching {pattern} will result in {callback} being invoked.
 
-		For example, to watch all global variables: >
+		For example, to watch all global variables: >vim
 			silent! call dictwatcherdel(g:, '*', 'OnDictChanged')
 			function! OnDictChanged(d,k,z)
 			  echomsg string(a:k) string(a:z)
@@ -1300,8 +1334,9 @@ diff_filler({lnum})					*diff_filler()*
 		line, "'m" mark m, etc.
 		Returns 0 if the current window is not in diff mode.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->diff_filler()
+<
 
 diff_hlID({lnum}, {col})				*diff_hlID()*
 		Returns the highlight ID for diff mode at line {lnum} column
@@ -1314,7 +1349,7 @@ diff_hlID({lnum}, {col})				*diff_hlID()*
 		The highlight ID can be used with |synIDattr()| to obtain
 		syntax information about the highlighting.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->diff_hlID(col)
 <
 
@@ -1326,15 +1361,15 @@ digraph_get({chars})				*digraph_get()* *E1214*
 
 		Also see |digraph_getlist()|.
 
-		Examples: >
+		Examples: >vim
 		" Get a built-in digraph
-		:echo digraph_get('00')		" Returns '∞'
+		echo digraph_get('00')		" Returns '∞'
 
 		" Get a user-defined digraph
-		:call digraph_set('aa', 'あ')
-		:echo digraph_get('aa')		" Returns 'あ'
+		call digraph_set('aa', 'あ')
+		echo digraph_get('aa')		" Returns 'あ'
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetChars()->digraph_get()
 <
 
@@ -1345,14 +1380,14 @@ digraph_getlist([{listall}])			*digraph_getlist()*
 
 		Also see |digraph_get()|.
 
-		Examples: >
+		Examples: >vim
 		" Get user-defined digraphs
-		:echo digraph_getlist()
+		echo digraph_getlist()
 
 		" Get all the digraphs, including default digraphs
-		:echo digraph_getlist(1)
+		echo digraph_getlist(1)
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetNumber()->digraph_getlist()
 <
 
@@ -1370,10 +1405,10 @@ digraph_set({chars}, {digraph})			*digraph_set()*
 		If you want to define multiple digraphs at once, you can use
 		|digraph_setlist()|.
 
-		Example: >
+		Example: >vim
 			call digraph_set('  ', 'あ')
 <
-		Can be used as a |method|: >
+		Can be used as a |method|: >vim
 			GetString()->digraph_set('あ')
 <
 
@@ -1382,17 +1417,17 @@ digraph_setlist({digraphlist})			*digraph_setlist()*
 		digraphs at once.  {digraphlist} is a list composed of lists,
 		where each list contains two strings with {chars} and
 		{digraph} as in |digraph_set()|. *E1216*
-		Example: >
+		Example: >vim
 		    call digraph_setlist([['aa', 'あ'], ['ii', 'い']])
 <
-		It is similar to the following: >
+		It is similar to the following: >vim
 		    for [chars, digraph] in [['aa', 'あ'], ['ii', 'い']]
 			  call digraph_set(chars, digraph)
 		    endfor
 <		Except that the function returns after the first error,
 		following digraphs will not be added.
 
-		Can be used as a |method|: >
+		Can be used as a |method|: >vim
 		    GetList()->digraph_setlist()
 <
 
@@ -1405,26 +1440,28 @@ empty({expr})						*empty()*
 		- |v:false| and |v:null| are empty, |v:true| is not.
 		- A |Blob| is empty when its length is zero.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->empty()
+<
 
 environ()							*environ()*
 		Return all of environment variables as dictionary. You can
-		check if an environment variable exists like this: >
-			:echo has_key(environ(), 'HOME')
+		check if an environment variable exists like this: >vim
+			echo has_key(environ(), 'HOME')
 <		Note that the variable name may be CamelCase; to ignore case
-		use this: >
-			:echo index(keys(environ()), 'HOME', 0, 1) != -1
+		use this: >vim
+			echo index(keys(environ()), 'HOME', 0, 1) != -1
+<
 
 escape({string}, {chars})					*escape()*
 		Escape the characters in {chars} that occur in {string} with a
-		backslash.  Example: >
-			:echo escape('c:\program files\vim', ' \')
+		backslash.  Example: >vim
+			echo escape('c:\program files\vim', ' \')
 <		results in: >
 			c:\\program\ files\\vim
 <		Also see |shellescape()| and |fnameescape()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->escape(' \')
 <
 
@@ -1435,8 +1472,9 @@ eval({string})						*eval()*
 		of them.  Also works for |Funcref|s that refer to existing
 		functions.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			argv->join()->eval()
+<
 
 eventhandler()					*eventhandler()*
 		Returns 1 when inside an event handler.  That is that Vim got
@@ -1467,17 +1505,18 @@ executable({expr})					*executable()*
 			-1	not implemented on this system
 		|exepath()| can be used to get the full path of an executable.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCommand()->executable()
+<
 
 execute({command} [, {silent}])				*execute()*
 		Execute {command} and capture its output.
 		If {command} is a |String|, returns {command} output.
 		If {command} is a |List|, returns concatenated outputs.
 		Line continuations in {command} are not recognized.
-		Examples: >
+		Examples: >vim
 			echo execute('echon "foo"')
-<			foo >
+<			foo >vim
 			echo execute(['echon "foo"', 'echon "bar"'])
 <			foobar
 
@@ -1488,7 +1527,7 @@ execute({command} [, {silent}])				*execute()*
 		The default is "silent".  Note that with "silent!", unlike
 		`:redir`, error messages are dropped.
 
-		To get a list of lines use `split()` on the result: >
+		To get a list of lines use `split()` on the result: >vim
 			execute('args')->split("\n")
 
 <		This function is not available in the |sandbox|.
@@ -1498,8 +1537,9 @@ execute({command} [, {silent}])				*execute()*
 		To execute a command in another window than the current one
 		use `win_execute()`.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCommand()->execute()
+<
 
 exepath({expr})						*exepath()*
 		Returns the full path of {expr} if it is an executable and
@@ -1507,7 +1547,7 @@ exepath({expr})						*exepath()*
 		Returns empty string otherwise.
 		If {expr} starts with "./" the |current-directory| is used.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCommand()->exepath()
 <
 
@@ -1525,11 +1565,11 @@ exists({expr})						*exists()*
 					entries, |List| items, etc.
 					Beware that evaluating an index may
 					cause an error message for an invalid
-					expression.  E.g.: >
-					   :let l = [1, 2, 3]
-					   :echo exists("l[5]")
-<					   0 >
-					   :echo exists("l[xx]")
+					expression.  E.g.: >vim
+					   let l = [1, 2, 3]
+					   echo exists("l[5]")
+<					   0 >vim
+					   echo exists("l[xx]")
 <					   E121: Undefined variable: xx
 					   0
 			&option-name	Vim option (only checks if it exists,
@@ -1569,52 +1609,54 @@ exists({expr})						*exists()*
 			##event		autocommand for this event is
 					supported.
 
-		Examples: >
-			exists("&mouse")
-			exists("$HOSTNAME")
-			exists("*strftime")
-			exists("*s:MyFunc")
-			exists("*MyFunc")
-			exists("bufcount")
-			exists(":Make")
-			exists("#CursorHold")
-			exists("#BufReadPre#*.gz")
-			exists("#filetypeindent")
-			exists("#filetypeindent#FileType")
-			exists("#filetypeindent#FileType#*")
-			exists("##ColorScheme")
+		Examples: >vim
+			echo exists("&mouse")
+			echo exists("$HOSTNAME")
+			echo exists("*strftime")
+			echo exists("*s:MyFunc")
+			echo exists("*MyFunc")
+			echo exists("bufcount")
+			echo exists(":Make")
+			echo exists("#CursorHold")
+			echo exists("#BufReadPre#*.gz")
+			echo exists("#filetypeindent")
+			echo exists("#filetypeindent#FileType")
+			echo exists("#filetypeindent#FileType#*")
+			echo exists("##ColorScheme")
 <		There must be no space between the symbol (&/$/*/#) and the
 		name.
 		There must be no extra characters after the name, although in
 		a few cases this is ignored.  That may become stricter in the
 		future, thus don't count on it!
-		Working example: >
-			exists(":make")
-		<NOT working example: >
-			exists(":make install")
+		Working example: >vim
+			echo exists(":make")
+		<NOT working example: >vim
+			echo exists(":make install")
 
 <		Note that the argument must be a string, not the name of the
-		variable itself.  For example: >
-			exists(bufcount)
+		variable itself.  For example: >vim
+			echo exists(bufcount)
 <		This doesn't check for existence of the "bufcount" variable,
 		but gets the value of "bufcount", and checks if that exists.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Varname()->exists()
+<
 
 exp({expr})							*exp()*
 		Return the exponential of {expr} as a |Float| in the range
 		[0, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo exp(2)
-<			7.389056 >
-			:echo exp(-1)
+		Examples: >vim
+			echo exp(2)
+<			7.389056 >vim
+			echo exp(-1)
 <			0.367879
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->exp()
+<
 
 expand({string} [, {nosuf} [, {list}]])			*expand()*
 		Expand wildcards and the following special keywords in
@@ -1661,18 +1703,18 @@ expand({string} [, {nosuf} [, {list}]])			*expand()*
 			:r		root (one extension removed)
 			:e		extension only
 
-		Example: >
-			:let &tags = expand("%:p:h") .. "/tags"
+		Example: >vim
+			let &tags = expand("%:p:h") .. "/tags"
 <		Note that when expanding a string that starts with '%', '#' or
-		'<', any following text is ignored.  This does NOT work: >
-			:let doesntwork = expand("%:h.bak")
-<		Use this: >
-			:let doeswork = expand("%:h") .. ".bak"
+		'<', any following text is ignored.  This does NOT work: >vim
+			let doesntwork = expand("%:h.bak")
+<		Use this: >vim
+			let doeswork = expand("%:h") .. ".bak"
 <		Also note that expanding "<cfile>" and others only returns the
 		referenced file name without further expansion.  If "<cfile>"
 		is "~/.cshrc", you need to do another expand() to have the
-		"~/" expanded into the path of the home directory: >
-			:echo expand(expand("<cfile>"))
+		"~/" expanded into the path of the home directory: >vim
+			echo expand(expand("<cfile>"))
 <
 		There cannot be white space between the variables and the
 		following modifier.  The |fnamemodify()| function can be used
@@ -1692,8 +1734,8 @@ expand({string} [, {nosuf} [, {list}]])			*expand()*
 		{nosuf} argument is given and it is |TRUE|.
 		Names for non-existing files are included.  The "**" item can
 		be used to search in a directory tree.  For example, to find
-		all "README" files in the current directory and below: >
-			:echo expand("**/README")
+		all "README" files in the current directory and below: >vim
+			echo expand("**/README")
 <
 		expand() can also be used to expand variables and environment
 		variables that are only known in a shell.  But this can be
@@ -1707,8 +1749,9 @@ expand({string} [, {nosuf} [, {list}]])			*expand()*
 		See |glob()| for finding existing files.  See |system()| for
 		getting the raw output of an external command.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Getpattern()->expand()
+<
 
 expandcmd({string} [, {options}])			*expandcmd()*
 		Expand special items in String {string} like what is done for
@@ -1726,12 +1769,14 @@ expandcmd({string} [, {options}])			*expandcmd()*
 		Returns the expanded string.  If an error is encountered
 		during expansion, the unmodified {string} is returned.
 
-		Example: >
-			:echo expandcmd('make %<.o')
+		Example: >vim
+			echo expandcmd('make %<.o')
+<		 >
 			make /path/runtime/doc/builtin.o
-			:echo expandcmd('make %<.o', {'errmsg': v:true})
+<		 >vim
+			echo expandcmd('make %<.o', {'errmsg': v:true})
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCommand()->expandcmd()
 <
 
@@ -1744,16 +1789,16 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		item with index {expr3} in {expr1}.  When {expr3} is zero
 		insert before the first item.  When {expr3} is equal to
 		len({expr1}) then {expr2} is appended.
-		Examples: >
-			:echo sort(extend(mylist, [7, 5]))
-			:call extend(mylist, [2, 3], 1)
+		Examples: >vim
+			echo sort(extend(mylist, [7, 5]))
+			call extend(mylist, [2, 3], 1)
 <		When {expr1} is the same List as {expr2} then the number of
 		items copied is equal to the original length of the List.
 		E.g., when {expr3} is 1 you get N new copies of the first item
 		(where N is the original length of the List).
 		Use |add()| to concatenate one item to a list.  To concatenate
-		two lists into a new list use the + operator: >
-			:let newlist = [1, 2, 3] + [4, 5]
+		two lists into a new list use the + operator: >vim
+			let newlist = [1, 2, 3] + [4, 5]
 <
 		If they are |Dictionaries|:
 		Add all entries from {expr2} to {expr1}.
@@ -1771,7 +1816,7 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		fails.
 		Returns {expr1}.  Returns 0 on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->extend(otherlist)
 <
 
@@ -1825,8 +1870,9 @@ feedkeys({string} [, {mode}])				*feedkeys()*
 
 		Return value is always 0.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetInput()->feedkeys()
+<
 
 filereadable({file})					*filereadable()*
 		The result is a Number, which is |TRUE| when a file with the
@@ -1835,14 +1881,19 @@ filereadable({file})					*filereadable()*
 		expression, which is used as a String.
 		If you don't care about the file being readable you can use
 		|glob()|.
-		{file} is used as-is, you may want to expand wildcards first: >
+		{file} is used as-is, you may want to expand wildcards first: >vim
 			echo filereadable('~/.vimrc')
+<		 >
 			0
+<		 >vim
 			echo filereadable(expand('~/.vimrc'))
+<		 >
 			1
+<
 
-<		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->filereadable()
+<
 
 filewritable({file})					*filewritable()*
 		The result is a Number, which is 1 when a file with the
@@ -1850,8 +1901,9 @@ filewritable({file})					*filewritable()*
 		exist, or is not writable, the result is 0.  If {file} is a
 		directory, and we can write to it, the result is 2.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->filewritable()
+<
 
 filter({expr1}, {expr2})					*filter()*
 		{expr1} must be a |List|, |Blob|, or a |Dictionary|.
@@ -1867,11 +1919,11 @@ filter({expr1}, {expr2})					*filter()*
 		the current item.  For a |Blob| |v:key| has the index of the
 		current byte.
 
-		Examples: >
+		Examples: >vim
 			call filter(mylist, 'v:val !~ "OLD"')
-<		Removes the items where "OLD" appears. >
+<		Removes the items where "OLD" appears. >vim
 			call filter(mydict, 'v:key >= 8')
-<		Removes the items with a key below 8. >
+<		Removes the items with a key below 8. >vim
 			call filter(var, 0)
 <		Removes all the items, thus clears the |List| or |Dictionary|.
 
@@ -1883,19 +1935,19 @@ filter({expr1}, {expr2})					*filter()*
 			1. the key or the index of the current item.
 			2. the value of the current item.
 		The function must return |TRUE| if the item should be kept.
-		Example that keeps the odd items of a list: >
+		Example that keeps the odd items of a list: >vim
 			func Odd(idx, val)
 			  return a:idx % 2 == 1
 			endfunc
 			call filter(mylist, function('Odd'))
-<		It is shorter when using a |lambda|: >
+<		It is shorter when using a |lambda|: >vim
 			call filter(myList, {idx, val -> idx * val <= 42})
-<		If you do not use "val" you can leave it out: >
+<		If you do not use "val" you can leave it out: >vim
 			call filter(myList, {idx -> idx % 2 == 1})
 <
 		The operation is done in-place.  If you want a |List| or
-		|Dictionary| to remain unmodified make a copy first: >
-			:let l = filter(copy(mylist), 'v:val =~ "KEEP"')
+		|Dictionary| to remain unmodified make a copy first: >vim
+			let l = filter(copy(mylist), 'v:val =~ "KEEP"')
 
 <		Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
 		filtered.  When an error is encountered while evaluating
@@ -1903,8 +1955,9 @@ filter({expr1}, {expr2})					*filter()*
 		{expr2} is a Funcref errors inside a function are ignored,
 		unless it was defined with the "abort" flag.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->filter(expr2)
+<
 
 finddir({name} [, {path} [, {count}]])			*finddir()*
 		Find directory {name} in {path}.  Supports both downwards and
@@ -1924,19 +1977,21 @@ finddir({name} [, {path} [, {count}]])			*finddir()*
 
 		This is quite similar to the ex-command `:find`.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->finddir()
+<
 
 findfile({name} [, {path} [, {count}]])			*findfile()*
 		Just like |finddir()|, but find a file instead of a directory.
 		Uses 'suffixesadd'.
-		Example: >
-			:echo findfile("tags.vim", ".;")
+		Example: >vim
+			echo findfile("tags.vim", ".;")
 <		Searches from the directory of the current file upwards until
 		it finds the file "tags.vim".
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->findfile()
+<
 
 flatten({list} [, {maxdepth}])				*flatten()*
 		Flatten {list} up to {maxdepth} levels.  Without {maxdepth}
@@ -1951,13 +2006,13 @@ flatten({list} [, {maxdepth}])				*flatten()*
 
 		If there is an error the number zero is returned.
 
-		Example: >
-			:echo flatten([1, [2, [3, 4]], 5])
-<			[1, 2, 3, 4, 5] >
-			:echo flatten([1, [2, [3, 4]], 5], 1)
+		Example: >vim
+			echo flatten([1, [2, [3, 4]], 5])
+<			[1, 2, 3, 4, 5] >vim
+			echo flatten([1, [2, [3, 4]], 5], 1)
 <			[1, 2, [3, 4], 5]
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->flatten()
 <
 
@@ -1974,36 +2029,38 @@ float2nr({expr})						*float2nr()*
 		64-bit Number support is enabled, 0x7fffffffffffffff or
 		-0x7fffffffffffffff).  NaN results in -0x80000000 (or when
 		64-bit Number support is enabled, -0x8000000000000000).
-		Examples: >
+		Examples: >vim
 			echo float2nr(3.95)
-<			3  >
+<			3  >vim
 			echo float2nr(-23.45)
-<			-23  >
+<			-23  >vim
 			echo float2nr(1.0e100)
-<			2147483647  (or 9223372036854775807) >
+<			2147483647  (or 9223372036854775807) >vim
 			echo float2nr(-1.0e150)
-<			-2147483647 (or -9223372036854775807) >
+<			-2147483647 (or -9223372036854775807) >vim
 			echo float2nr(1.0e-100)
 <			0
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->float2nr()
+<
 
 floor({expr})						*floor()*
 		Return the largest integral value less than or equal to
 		{expr} as a |Float| (round down).
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
+		Examples: >vim
 			echo floor(1.856)
-<			1.0  >
+<			1.0  >vim
 			echo floor(-5.456)
-<			-6.0  >
+<			-6.0  >vim
 			echo floor(4.0)
 <			4.0
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->floor()
+<
 
 fmod({expr1}, {expr2})					*fmod()*
 		Return the remainder of {expr1} / {expr2}, even if the
@@ -2015,18 +2072,19 @@ fmod({expr1}, {expr2})					*fmod()*
 		{expr1} and {expr2} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
 		|Number|.
-		Examples: >
-			:echo fmod(12.33, 1.22)
-<			0.13 >
-			:echo fmod(-12.33, 1.22)
+		Examples: >vim
+			echo fmod(12.33, 1.22)
+<			0.13 >vim
+			echo fmod(-12.33, 1.22)
 <			-0.13
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->fmod(1.22)
+<
 
 fnameescape({string})					*fnameescape()*
 		Escape {string} for use as file name command argument.  All
-		characters that have a special meaning, such as '%' and '|'
+		characters that have a special meaning, such as `'%'` and `'|'`
 		are escaped with a backslash.
 		For most systems the characters escaped are
 		" \t\n*?[{`$\\%#'\"|!<".  For systems where a backslash
@@ -2034,21 +2092,22 @@ fnameescape({string})					*fnameescape()*
 		A leading '+' and '>' is also escaped (special after |:edit|
 		and |:write|).  And a "-" by itself (special after |:cd|).
 		Returns an empty string on error.
-		Example: >
-			:let fname = '+some str%nge|name'
-			:exe "edit " .. fnameescape(fname)
-<		results in executing: >
+		Example: >vim
+			let fname = '+some str%nge|name'
+			exe "edit " .. fnameescape(fname)
+<		results in executing: >vim
 			edit \+some\ str\%nge\|name
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->fnameescape()
+<
 
 fnamemodify({fname}, {mods})				*fnamemodify()*
 		Modify file name {fname} according to {mods}.  {mods} is a
 		string of characters like it is used for file names on the
 		command line.  See |filename-modifiers|.
-		Example: >
-			:echo fnamemodify("main.c", ":p:h")
+		Example: >vim
+			echo fnamemodify("main.c", ":p:h")
 <		results in: >
 			/home/user/vim/vim/src
 <		If {mods} is empty or an unsupported modifier is used then
@@ -2060,8 +2119,9 @@ fnamemodify({fname}, {mods})				*fnamemodify()*
 		Note: Environment variables don't work in {fname}, use
 		|expand()| first then.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->fnamemodify(':p:h')
+<
 
 foldclosed({lnum})					*foldclosed()*
 		The result is a Number.  If the line {lnum} is in a closed
@@ -2070,8 +2130,9 @@ foldclosed({lnum})					*foldclosed()*
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->foldclosed()
+<
 
 foldclosedend({lnum})				*foldclosedend()*
 		The result is a Number.  If the line {lnum} is in a closed
@@ -2080,8 +2141,9 @@ foldclosedend({lnum})				*foldclosedend()*
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->foldclosedend()
+<
 
 foldlevel({lnum})					*foldlevel()*
 		The result is a Number, which is the foldlevel of line {lnum}
@@ -2095,7 +2157,7 @@ foldlevel({lnum})					*foldlevel()*
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->foldlevel()
 <
 
@@ -2125,7 +2187,7 @@ foldtextresult({lnum})				*foldtextresult()*
 		line, "'m" mark m, etc.
 		Useful when exporting folded text, e.g., to HTML.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->foldtextresult()
 <
 
@@ -2141,7 +2203,7 @@ fullcommand({name})					*fullcommand()*
 		For example `fullcommand('s')`, `fullcommand('sub')`,
 		`fullcommand(':%substitute')` all return "substitute".
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->fullcommand()
 <
 
@@ -2157,7 +2219,7 @@ funcref({name} [, {arglist}] [, {dict}])			*funcref()*
 		instead). {name} cannot be a builtin function.
 		Returns 0 on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFuncname()->funcref([arg])
 <
 
@@ -2168,7 +2230,7 @@ function({name} [, {arglist}] [, {dict}])	*function()* *partial* *E700* *E923*
 
 		{name} can also be a Funcref or a partial. When it is a
 		partial the dict stored in it will be used and the {dict}
-		argument is not allowed. E.g.: >
+		argument is not allowed. E.g.: >vim
 			let FuncWithArg = function(dict.Func, [arg])
 			let Broken = function(dict.Func, [arg], dict)
 <
@@ -2181,38 +2243,41 @@ function({name} [, {arglist}] [, {dict}])	*function()* *partial* *E700* *E923*
 		the Funcref and will be used when the Funcref is called.
 
 		The arguments are passed to the function in front of other
-		arguments, but after any argument from |method|.  Example: >
+		arguments, but after any argument from |method|.  Example: >vim
 			func Callback(arg1, arg2, name)
 			"...
+			endfunc
 			let Partial = function('Callback', ['one', 'two'])
 			"...
 			call Partial('name')
-<		Invokes the function as with: >
+<		Invokes the function as with: >vim
 			call Callback('one', 'two', 'name')
 
-<		With a |method|: >
+<		With a |method|: >vim
 			func Callback(one, two, three)
 			"...
+			endfunc
 			let Partial = function('Callback', ['two'])
 			"...
 			eval 'one'->Partial('three')
-<		Invokes the function as with: >
+<		Invokes the function as with: >vim
 			call Callback('one', 'two', 'three')
 
 <		The function() call can be nested to add more arguments to the
 		Funcref.  The extra arguments are appended to the list of
-		arguments.  Example: >
+		arguments.  Example: >vim
 			func Callback(arg1, arg2, name)
 			"...
+			endfunc
 			let Func = function('Callback', ['one'])
 			let Func2 = function(Func, ['two'])
 			"...
 			call Func2('name')
-<		Invokes the function as with: >
+<		Invokes the function as with: >vim
 			call Callback('one', 'two', 'name')
 
 <		The Dictionary is only useful when calling a "dict" function.
-		In that case the {dict} is passed in as "self". Example: >
+		In that case the {dict} is passed in as "self". Example: >vim
 			function Callback() dict
 			   echo "called for " .. self.name
 			endfunction
@@ -2223,24 +2288,26 @@ function({name} [, {arglist}] [, {dict}])	*function()* *partial* *E700* *E923*
 			call Func()	" will echo: called for example
 <		The use of function() is not needed when there are no extra
 		arguments, these two are equivalent, if Callback() is defined
-		as context.Callback(): >
+		as context.Callback(): >vim
 			let Func = function('Callback', context)
 			let Func = context.Callback
 
-<		The argument list and the Dictionary can be combined: >
+<		The argument list and the Dictionary can be combined: >vim
 			function Callback(arg1, count) dict
 			"...
+			endfunction
 			let context = {"name": "example"}
 			let Func = function('Callback', ['one'], context)
 			"...
 			call Func(500)
-<		Invokes the function as with: >
+<		Invokes the function as with: >vim
 			call context.Callback('one', 500)
 <
 		Returns 0 on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFuncname()->function([arg])
+<
 
 garbagecollect([{atexit}])				*garbagecollect()*
 		Cleanup unused |Lists| and |Dictionaries| that have circular
@@ -2266,8 +2333,9 @@ get({list}, {idx} [, {default}])				*get()*
 		Get item {idx} from |List| {list}.  When this item is not
 		available return {default}.  Return zero when {default} is
 		omitted.
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->get(idx)
+<
 
 get({blob}, {idx} [, {default}])
 		Get byte {idx} from |Blob| {blob}.  When this byte is not
@@ -2277,7 +2345,7 @@ get({blob}, {idx} [, {default}])
 get({dict}, {key} [, {default}])
 		Get item with key {key} from |Dictionary| {dict}.  When this
 		item is not available return {default}.  Return zero when
-		{default} is omitted.  Useful example: >
+		{default} is omitted.  Useful example: >vim
 			let val = get(g:, 'var_name', 'default')
 <		This gets the value of g:var_name if it exists, and uses
 		"default" when it does not exist.
@@ -2326,8 +2394,8 @@ getbufinfo([{dict}])					*getbufinfo()*
 					displayed in the window in the past.
 					If you want the line number of the
 					last known cursor position in a given
-					window, use |line()|: >
-						:echo line('.', {winid})
+					window, use |line()|: >vim
+						echo line('.', {winid})
 <
 			linecount	Number of lines in the buffer (only
 					valid when loaded)
@@ -2344,20 +2412,20 @@ getbufinfo([{dict}])					*getbufinfo()*
 			windows		List of |window-ID|s that display this
 					buffer
 
-		Examples: >
+		Examples: >vim
 			for buf in getbufinfo()
 			    echo buf.name
 			endfor
 			for buf in getbufinfo({'buflisted':1})
 			    if buf.changed
-				....
+				" ....
 			    endif
 			endfor
 <
-		To get buffer-local options use: >
+		To get buffer-local options use: >vim
 			getbufvar({bufnr}, '&option_name')
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBufnr()->getbufinfo()
 <
 
@@ -2383,10 +2451,10 @@ getbufline({buf}, {lnum} [, {end}])			*getbufline()*
 		This function works only for loaded buffers.  For unloaded and
 		non-existing buffers, an empty |List| is returned.
 
-		Example: >
-			:let lines = getbufline(bufnr("myfile"), 1, "$")
+		Example: >vim
+			let lines = getbufline(bufnr("myfile"), 1, "$")
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetBufnr()->getbufline(lnum)
 <
 
@@ -2411,11 +2479,11 @@ getbufvar({buf}, {varname} [, {def}])			*getbufvar()*
 		For the use of {buf}, see |bufname()| above.
 		When the buffer or variable doesn't exist {def} or an empty
 		string is returned, there is no error message.
-		Examples: >
-			:let bufmodified = getbufvar(1, "&mod")
-			:echo "todo myvar = " .. getbufvar("todo", "myvar")
+		Examples: >vim
+			let bufmodified = getbufvar(1, "&mod")
+			echo "todo myvar = " .. getbufvar("todo", "myvar")
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetBufnr()->getbufvar(varname)
 <
 
@@ -2441,8 +2509,9 @@ getchangelist([{buf}])				*getchangelist()*
 		position refers to the position in the list. For other
 		buffers, it is set to the length of the list.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBufnr()->getchangelist()
+<
 
 getchar([expr])						*getchar()*
 		Get a single character from the user or input stream.
@@ -2478,7 +2547,7 @@ getchar([expr])						*getchar()*
 		|v:mouse_lnum|, |v:mouse_winid| and |v:mouse_win|.
 		|getmousepos()| can also be used.  Mouse move events will be
 		ignored.
-		This example positions the mouse as it would normally happen: >
+		This example positions the mouse as it would normally happen: >vim
 			let c = getchar()
 			if c == "\<LeftMouse>" && v:mouse_win > 0
 			  exe v:mouse_win .. "wincmd w"
@@ -2493,20 +2562,20 @@ getchar([expr])						*getchar()*
 		There is no mapping for the character.
 		Key codes are replaced, thus when the user presses the <Del>
 		key you get the code for the <Del> key, not the raw character
-		sequence.  Examples: >
+		sequence.  Examples: >vim
 			getchar() == "\<Del>"
 			getchar() == "\<S-Left>"
-<		This example redefines "f" to ignore case: >
-			:nmap f :call FindChar()<CR>
-			:function FindChar()
-			:  let c = nr2char(getchar())
-			:  while col('.') < col('$') - 1
-			:    normal l
-			:    if getline('.')[col('.') - 1] ==? c
-			:      break
-			:    endif
-			:  endwhile
-			:endfunction
+<		This example redefines "f" to ignore case: >vim
+			nmap f :call FindChar()<CR>
+			function FindChar()
+			  let c = nr2char(getchar())
+			  while col('.') < col('$') - 1
+			    normal l
+			    if getline('.')[col('.') - 1] ==? c
+			      break
+			    endif
+			  endwhile
+			endfunction
 <
 
 getcharmod()						*getcharmod()*
@@ -2534,12 +2603,13 @@ getcharpos({expr})					*getcharpos()*
 		of the last character.
 
 		Example:
-		With the cursor on '세' in line 5 with text "여보세요": >
+		With the cursor on '세' in line 5 with text "여보세요": >vim
 			getcharpos('.')		returns [0, 5, 3, 0]
 			getpos('.')		returns [0, 5, 7, 0]
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMark()->getcharpos()
+<
 
 getcharsearch()					*getcharsearch()*
 		Return the current character search information as a {dict}
@@ -2556,9 +2626,9 @@ getcharsearch()					*getcharsearch()*
 
 		This can be useful to always have |;| and |,| search
 		forward/backward regardless of the direction of the previous
-		character search: >
-			:nnoremap <expr> ; getcharsearch().forward ? ';' : ','
-			:nnoremap <expr> , getcharsearch().forward ? ',' : ';'
+		character search: >vim
+			nnoremap <expr> ; getcharsearch().forward ? ';' : ','
+			nnoremap <expr> , getcharsearch().forward ? ',' : ';'
 <		Also see |setcharsearch()|.
 
 getcharstr([expr])					*getcharstr()*
@@ -2586,8 +2656,8 @@ getcmdline()						*getcmdline()*
 		Return the current command-line.  Only works when the command
 		line is being edited, thus requires use of |c_CTRL-\_e| or
 		|c_CTRL-R_=|.
-		Example: >
-			:cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
+		Example: >vim
+			cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
 <		Also see |getcmdtype()|, |getcmdpos()|, |setcmdpos()| and
 		|setcmdline()|.
 		Returns an empty string when entering a password or using
@@ -2692,13 +2762,13 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 
 		If {type} is "cmdline", then the |cmdline-completion| result is
 		returned.  For example, to complete the possible values after
-		a ":call" command: >
+		a ":call" command: >vim
 			echo getcompletion('call ', 'cmdline')
 <
 		If there are no matches, an empty list is returned.  An
 		invalid value for {type} produces an error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetPattern()->getcompletion('color')
 <
 
@@ -2720,14 +2790,14 @@ getcurpos([{winid}])					*getcurpos()*
 		current value of the buffer if it is not the current window.
 		If {winid} is invalid a list with zeroes is returned.
 
-		This can be used to save and restore the cursor position: >
+		This can be used to save and restore the cursor position: >vim
 			let save_cursor = getcurpos()
 			MoveTheCursorAround
 			call setpos('.', save_cursor)
 <		Note that this only works within the window.  See
 		|winrestview()| for restoring more state.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->getcurpos()
 <
 
@@ -2736,12 +2806,13 @@ getcursorcharpos([{winid}])			*getcursorcharpos()*
 		List is a character index instead of a byte index.
 
 		Example:
-		With the cursor on '보' in line 3 with text "여보세요": >
-			getcursorcharpos()	returns [0, 3, 2, 0, 3]
-			getcurpos()		returns [0, 3, 4, 0, 3]
+		With the cursor on '보' in line 3 with text "여보세요": >vim
+			getcursorcharpos()	" returns [0, 3, 2, 0, 3]
+			getcurpos()		" returns [0, 3, 4, 0, 3]
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->getcursorcharpos()
+<
 
 getcwd([{winnr} [, {tabnr}]])				*getcwd()*
 		With no arguments, returns the name of the effective
@@ -2750,7 +2821,7 @@ getcwd([{winnr} [, {tabnr}]])				*getcwd()*
 		ignored.
 		Tabs and windows are identified by their respective numbers,
 		0 means current tab or window. Missing tab number implies 0.
-		Thus the following are equivalent: >
+		Thus the following are equivalent: >vim
 			getcwd(0)
 			getcwd(0, 0)
 <		If {winnr} is -1 it is ignored, only the tab is resolved.
@@ -2759,20 +2830,22 @@ getcwd([{winnr} [, {tabnr}]])				*getcwd()*
 		directory is returned.
 		Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinnr()->getcwd()
+<
 
 getenv({name})						*getenv()*
 		Return the value of environment variable {name}.  The {name}
-		argument is a string, without a leading '$'.  Example: >
+		argument is a string, without a leading '$'.  Example: >vim
 			myHome = getenv('HOME')
 
 <		When the variable does not exist |v:null| is returned.  That
 		is different from a variable set to an empty string.
 		See also |expr-env|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetVarname()->getenv()
+<
 
 getfontname([{name}])					*getfontname()*
 		Without an argument returns the name of the normal font being
@@ -2795,13 +2868,13 @@ getfperm({fname})					*getfperm()*
 		"rwx" flags represent, in turn, the permissions of the owner
 		of the file, the group the file belongs to, and other users.
 		If a user does not have a given permission the flag for this
-		is replaced with the string "-".  Examples: >
-			:echo getfperm("/etc/passwd")
-			:echo getfperm(expand("~/.config/nvim/init.vim"))
+		is replaced with the string "-".  Examples: >vim
+			echo getfperm("/etc/passwd")
+			echo getfperm(expand("~/.config/nvim/init.vim"))
 <		This will hopefully (from a security point of view) display
 		the string "rw-r--r--" or even "rw-------".
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFilename()->getfperm()
 <
 		For setting permissions use |setfperm()|.
@@ -2814,8 +2887,9 @@ getfsize({fname})					*getfsize()*
 		If the size of {fname} is too big to fit in a Number then -2
 		is returned.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFilename()->getfsize()
+<
 
 getftime({fname})					*getftime()*
 		The result is a Number, which is the last modification time of
@@ -2824,8 +2898,9 @@ getftime({fname})					*getftime()*
 		|localtime()| and |strftime()|.
 		If the file {fname} can't be found -1 is returned.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFilename()->getftime()
+<
 
 getftype({fname})					*getftype()*
 		The result is a String, which is a description of the kind of
@@ -2841,14 +2916,15 @@ getftype({fname})					*getftype()*
 			Socket			"socket"
 			FIFO			"fifo"
 			All other		"other"
-		Example: >
+		Example: >vim
 			getftype("/home")
 <		Note that a type such as "link" will only be returned on
 		systems that support it.  On some systems only "dir" and
 		"file" are returned.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFilename()->getftype()
+<
 
 getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
 		Returns the |jumplist| for the specified window.
@@ -2870,17 +2946,17 @@ getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
 			filename	filename if available
 			lnum		line number
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinnr()->getjumplist()
 <
 
 getline({lnum} [, {end}])					*getline()*
 		Without {end} the result is a String, which is line {lnum}
-		from the current buffer.  Example: >
+		from the current buffer.  Example: >vim
 			getline(1)
 <		When {lnum} is a String that doesn't start with a
 		digit, |line()| is called to translate the String into a Number.
-		To get the line under the cursor: >
+		To get the line under the cursor: >vim
 			getline(".")
 <		When {lnum} is a number smaller than 1 or bigger than the
 		number of lines in the buffer, an empty string is returned.
@@ -2891,12 +2967,12 @@ getline({lnum} [, {end}])					*getline()*
 		{end} is used in the same way as {lnum}.
 		Non-existing lines are silently omitted.
 		When {end} is before {lnum} an empty |List| is returned.
-		Example: >
-			:let start = line('.')
-			:let end = search("^$") - 1
-			:let lines = getline(start, end)
+		Example: >vim
+			let start = line('.')
+			let end = search("^$") - 1
+			let lines = getline(start, end)
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			ComputeLnum()->getline()
 
 <		To get lines from another buffer see |getbufline()| and
@@ -2929,9 +3005,9 @@ getloclist({nr} [, {what}])				*getloclist()*
 		location list for the window {nr}.
 		Returns an empty Dictionary if window {nr} does not exist.
 
-		Examples (See also |getqflist-examples|): >
-			:echo getloclist(3, {'all': 0})
-			:echo getloclist(5, {'filewinid': 0})
+		Examples (See also |getqflist-examples|): >vim
+			echo getloclist(3, {'all': 0})
+			echo getloclist(5, {'filewinid': 0})
 <
 
 getmarklist([{buf}])					*getmarklist()*
@@ -2953,8 +3029,9 @@ getmarklist([{buf}])					*getmarklist()*
 		Refer to |getpos()| for getting information about a specific
 		mark.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBufnr()->getmarklist()
+<
 
 getmatches([{win}])					*getmatches()*
 		Returns a |List| with all matches previously defined for the
@@ -2966,26 +3043,26 @@ getmatches([{win}])					*getmatches()*
 		window ID instead of the current window.  If {win} is invalid,
 		an empty list is returned.
 		Example: >vim
-			:echo getmatches()
+			echo getmatches()
 <		 >
 			[{"group": "MyGroup1", "pattern": "TODO",
 			"priority": 10, "id": 1}, {"group": "MyGroup2",
 			"pattern": "FIXME", "priority": 10, "id": 2}]
 <		 >vim
-			:let m = getmatches()
-			:call clearmatches()
-			:echo getmatches()
+			let m = getmatches()
+			call clearmatches()
+			echo getmatches()
 <		 >
 			[]
 <		 >vim
-			:call setmatches(m)
-			:echo getmatches()
+			call setmatches(m)
+			echo getmatches()
 <		 >
 			[{"group": "MyGroup1", "pattern": "TODO",
 			"priority": 10, "id": 1}, {"group": "MyGroup2",
 			"pattern": "FIXME", "priority": 10, "id": 2}]
 <		 >vim
-			:unlet m
+			unlet m
 <
 
 getmousepos()						*getmousepos()*
@@ -3044,14 +3121,15 @@ getpos({expr})						*getpos()*
 		A very large column number equal to |v:maxcol| can be returned,
 		in which case it means "after the end of the line".
 		If {expr} is invalid, returns a list with all zeros.
-		This can be used to save and restore the position of a mark: >
+		This can be used to save and restore the position of a mark: >vim
 			let save_a_mark = getpos("'a")
-			...
+			" ...
 			call setpos("'a", save_a_mark)
 <		Also see |getcharpos()|, |getcurpos()| and |setpos()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMark()->getpos()
+<
 
 getqflist([{what}])					*getqflist()*
 		Returns a |List| with all the current quickfix errors.  Each
@@ -3079,11 +3157,11 @@ getqflist([{what}])					*getqflist()*
 		you may need to explicitly check for zero).
 
 		Useful application: Find pattern matches in multiple files and
-		do something with them: >
-			:vimgrep /theword/jg *.c
-			:for d in getqflist()
-			:   echo bufname(d.bufnr) ':' d.lnum '=' d.text
-			:endfor
+		do something with them: >vim
+			vimgrep /theword/jg *.c
+			for d in getqflist()
+			   echo bufname(d.bufnr) ':' d.lnum '=' d.text
+			endfor
 <
 		If the optional {what} dictionary argument is supplied, then
 		returns only the items listed in {what} as a dictionary. The
@@ -3148,16 +3226,16 @@ getqflist([{what}])					*getqflist()*
 				to "".
 			winid	quickfix |window-ID|. If not present, set to 0
 
-		Examples (See also |getqflist-examples|): >
-			:echo getqflist({'all': 1})
-			:echo getqflist({'nr': 2, 'title': 1})
-			:echo getqflist({'lines' : ["F1:10:L10"]})
+		Examples (See also |getqflist-examples|): >vim
+			echo getqflist({'all': 1})
+			echo getqflist({'nr': 2, 'title': 1})
+			echo getqflist({'lines' : ["F1:10:L10"]})
 <
 
 getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 		The result is a String, which is the contents of register
-		{regname}.  Example: >
-			:let cliptext = getreg('*')
+		{regname}.  Example: >vim
+			let cliptext = getreg('*')
 <		When register {regname} was not set the result is an empty
 		string.
 		The {regname} argument must be a string.
@@ -3177,8 +3255,9 @@ getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 
 		If {regname} is not specified, |v:register| is used.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRegname()->getreg()
+<
 
 getreginfo([{regname}])				*getreginfo()*
 		Returns detailed information about register {regname} as a
@@ -3204,8 +3283,9 @@ getreginfo([{regname}])				*getreginfo()*
 		If {regname} is not specified, |v:register| is used.
 		The returned Dictionary can be passed to |setreg()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRegname()->getreginfo()
+<
 
 getregtype([{regname}])				*getregtype()*
 		The result is a String, which is type of register {regname}.
@@ -3218,8 +3298,9 @@ getregtype([{regname}])				*getregtype()*
 		The {regname} argument is a string.  If {regname} is not
 		specified, |v:register| is used.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRegname()->getregtype()
+<
 
 getscriptinfo([{opts}])				*getscriptinfo()*
 		Returns a |List| with information about all the sourced Vim
@@ -3253,9 +3334,9 @@ getscriptinfo([{opts}])				*getscriptinfo()*
 				this dictionary.
 		    version	Vimscript version, always 1
 
-		Examples: >
-			:echo getscriptinfo({'name': 'myscript'})
-			:echo getscriptinfo({'sid': 15}).variables
+		Examples: >vim
+			echo getscriptinfo({'name': 'myscript'})
+			echo getscriptinfo({'sid': 15}).variables
 <
 
 gettabinfo([{tabnr}])					*gettabinfo()*
@@ -3271,8 +3352,9 @@ gettabinfo([{tabnr}])					*gettabinfo()*
 					tabpage-local variables
 			windows		List of |window-ID|s in the tab page.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTabnr()->gettabinfo()
+<
 
 gettabvar({tabnr}, {varname} [, {def}])			*gettabvar()*
 		Get the value of a tab-local variable {varname} in tab page
@@ -3284,8 +3366,9 @@ gettabvar({tabnr}, {varname} [, {def}])			*gettabvar()*
 		When the tab or variable doesn't exist {def} or an empty
 		string is returned, there is no error message.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTabnr()->gettabvar(varname)
+<
 
 gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])	*gettabwinvar()*
 		Get the value of window-local variable {varname} in window
@@ -3306,15 +3389,16 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])	*gettabwinvar()*
 		or buffer-local variable.
 		When the tab, window or variable doesn't exist {def} or an
 		empty string is returned, there is no error message.
-		Examples: >
-			:let list_is_on = gettabwinvar(1, 2, '&list')
-			:echo "myvar = " .. gettabwinvar(3, 1, 'myvar')
+		Examples: >vim
+			let list_is_on = gettabwinvar(1, 2, '&list')
+			echo "myvar = " .. gettabwinvar(3, 1, 'myvar')
 <
-		To obtain all window-local variables use: >
+		To obtain all window-local variables use: >vim
 			gettabwinvar({tabnr}, {winnr}, '&')
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTabnr()->gettabwinvar(winnr, varname)
+<
 
 gettagstack([{winnr}])				*gettagstack()*
 		The result is a Dict, which is the tag stack of window {winnr}.
@@ -3344,7 +3428,7 @@ gettagstack([{winnr}])				*gettagstack()*
 
 		See |tagstack| for more information about the tag stack.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinnr()->gettagstack()
 <
 
@@ -3393,8 +3477,9 @@ getwininfo([{winid}])					*getwininfo()*
 			winrow		topmost screen line of the window;
 					"row" from |win_screenpos()|
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinnr()->getwininfo()
+<
 
 getwinpos([{timeout}])					*getwinpos()*
 		The result is a |List| with two numbers, the result of
@@ -3407,7 +3492,7 @@ getwinpos([{timeout}])					*getwinpos()*
 		When using a value less than 10 and no response is received
 		within that time, a previously reported position is returned,
 		if available.  This can be used to poll for the position and
-		do some work in the meantime: >
+		do some work in the meantime: >vim
 			while 1
 			  let res = getwinpos(1)
 			  if res[0] >= 0
@@ -3416,7 +3501,7 @@ getwinpos([{timeout}])					*getwinpos()*
 			  " Do some work here
 			endwhile
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTimeout()->getwinpos()
 <
 
@@ -3434,11 +3519,11 @@ getwinposy()						*getwinposy()*
 
 getwinvar({winnr}, {varname} [, {def}])			*getwinvar()*
 		Like |gettabwinvar()| for the current tabpage.
-		Examples: >
-			:let list_is_on = getwinvar(2, '&list')
-			:echo "myvar = " .. getwinvar(1, 'myvar')
+		Examples: >vim
+			let list_is_on = getwinvar(2, '&list')
+			echo "myvar = " .. getwinvar(1, 'myvar')
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetWinnr()->getwinvar(varname)
 <
 
@@ -3469,38 +3554,43 @@ glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])		*glob()*
 		|TRUE| then all symbolic links are included.
 
 		For most systems backticks can be used to get files names from
-		any external command.  Example: >
-			:let tagfiles = glob("`find . -name tags -print`")
-			:let &tags = substitute(tagfiles, "\n", ",", "g")
+		any external command.  Example: >vim
+			let tagfiles = glob("`find . -name tags -print`")
+			let &tags = substitute(tagfiles, "\n", ",", "g")
 <		The result of the program inside the backticks should be one
 		item per line.  Spaces inside an item are allowed.
 
 		See |expand()| for expanding special Vim variables.  See
 		|system()| for getting the raw output of an external command.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetExpr()->glob()
+<
 
 glob2regpat({string})					*glob2regpat()*
 		Convert a file pattern, as used by glob(), into a search
 		pattern.  The result can be used to match with a string that
-		is a file name.  E.g. >
+		is a file name.  E.g. >vim
 			if filename =~ glob2regpat('Make*.mak')
-<		This is equivalent to: >
+			  " ...
+			endif
+<		This is equivalent to: >vim
 			if filename =~ '^Make.*\.mak$'
+			  " ...
+			endif
 <		When {string} is an empty string the result is "^$", match an
 		empty string.
 		Note that the result depends on the system.  On MS-Windows
 		a backslash usually means a path separator.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetExpr()->glob2regpat()
 <
 
 globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])	*globpath()*
 		Perform glob() for String {expr} on all directories in {path}
-		and concatenate the results.  Example: >
-			:echo globpath(&rtp, "syntax/c.vim")
+		and concatenate the results.  Example: >vim
+			echo globpath(&rtp, "syntax/c.vim")
 <
 		{path} is a comma-separated list of directory names.  Each
 		directory name is prepended to {expr} and expanded like with
@@ -3520,20 +3610,20 @@ globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])	*globpath()*
 		with all matching files. The advantage of using a List is, you
 		also get filenames containing newlines correctly. Otherwise
 		the result is a String and when there are several matches,
-		they are separated by <NL> characters.  Example: >
-			:echo globpath(&rtp, "syntax/c.vim", 0, 1)
+		they are separated by <NL> characters.  Example: >vim
+			echo globpath(&rtp, "syntax/c.vim", 0, 1)
 <
 		{allinks} is used as with |glob()|.
 
 		The "**" item can be used to search in a directory tree.
 		For example, to find all "README.txt" files in the directories
-		in 'runtimepath' and below: >
-			:echo globpath(&rtp, "**/README.txt")
+		in 'runtimepath' and below: >vim
+			echo globpath(&rtp, "**/README.txt")
 <		Upwards search and limiting the depth of "**" is not
 		supported, thus using 'path' will not always work properly.
 
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetExpr()->globpath(&rtp)
 <
 
@@ -3547,9 +3637,9 @@ has({feature})						*has()*
 
 <		If the code has a syntax error then Vimscript may skip the
 		rest of the line.  Put |:if| and |:endif| on separate lines to
-		avoid the syntax error: >
+		avoid the syntax error: >vim
 			if has('feature')
-			  let x = this->breaks->without->the->feature
+			  let x = this_breaks_without_the_feature()
 			endif
 <
 		Vim's compile-time feature-names (prefixed with "+") are not
@@ -3558,12 +3648,16 @@ has({feature})						*has()*
 
 		Feature names can be:
 		1.  Nvim version. For example the "nvim-0.2.1" feature means
-		    that Nvim is version 0.2.1 or later: >
-			:if has("nvim-0.2.1")
+		    that Nvim is version 0.2.1 or later: >vim
+			if has("nvim-0.2.1")
+			  " ...
+			endif
 
 <		2.  Runtime condition or other pseudo-feature. For example the
-		    "win32" feature checks if the current system is Windows: >
-			:if has("win32")
+		    "win32" feature checks if the current system is Windows: >vim
+			if has("win32")
+			  " ...
+			endif
 <							*feature-list*
 		    List of supported pseudo-feature names:
 			acl		|ACL| support.
@@ -3589,12 +3683,16 @@ has({feature})						*has()*
 
 							*has-patch*
 		3.  Vim patch. For example the "patch123" feature means that
-		    Vim patch 123 at the current |v:version| was included: >
-			:if v:version > 602 || v:version == 602 && has("patch148")
+		    Vim patch 123 at the current |v:version| was included: >vim
+			if v:version > 602 || v:version == 602 && has("patch148")
+			  " ...
+			endif
 
 <		4.  Vim version. For example the "patch-7.4.237" feature means
-		    that Nvim is Vim-compatible to version 7.4.237 or later. >
-			:if has("patch-7.4.237")
+		    that Nvim is Vim-compatible to version 7.4.237 or later. >vim
+			if has("patch-7.4.237")
+			  " ...
+			endif
 <
 
 has_key({dict}, {key})					*has_key()*
@@ -3602,8 +3700,9 @@ has_key({dict}, {key})					*has_key()*
 		has an entry with key {key}.  FALSE otherwise. The {key}
 		argument is a string.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mydict->has_key(key)
+<
 
 haslocaldir([{winnr} [, {tabnr}]])			*haslocaldir()*
 		The result is a Number, which is 1 when the window has set a
@@ -3612,18 +3711,19 @@ haslocaldir([{winnr} [, {tabnr}]])			*haslocaldir()*
 
 		Tabs and windows are identified by their respective numbers,
 		0 means current tab or window. Missing argument implies 0.
-		Thus the following are equivalent: >
-			haslocaldir()
-			haslocaldir(0)
-			haslocaldir(0, 0)
+		Thus the following are equivalent: >vim
+			echo haslocaldir()
+			echo haslocaldir(0)
+			echo haslocaldir(0, 0)
 <		With {winnr} use that window in the current tabpage.
 		With {winnr} and {tabnr} use the window in that tabpage.
 		{winnr} can be the window number or the |window-ID|.
 		If {winnr} is -1 it is ignored, only the tab is resolved.
 		Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinnr()->haslocaldir()
+<
 
 hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
 		The result is a Number, which is TRUE if there is a mapping
@@ -3649,15 +3749,16 @@ hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
 		When {mode} is omitted, "nvo" is used.
 
 		This function is useful to check if a mapping already exists
-		to a function in a Vim script.  Example: >
-			:if !hasmapto('\ABCdoit')
-			:   map <Leader>d \ABCdoit
-			:endif
+		to a function in a Vim script.  Example: >vim
+			if !hasmapto('\ABCdoit')
+			   map <Leader>d \ABCdoit
+			endif
 <		This installs the mapping to "\ABCdoit" only if there isn't
 		already a mapping to "\ABCdoit".
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRHS()->hasmapto()
+<
 
 histadd({history}, {item})				*histadd()*
 		Add the String {item} to the history {history} which can be
@@ -3675,14 +3776,15 @@ histadd({history}, {item})				*histadd()*
 		The result is a Number: TRUE if the operation was successful,
 		otherwise FALSE is returned.
 
-		Example: >
-			:call histadd("input", strftime("%Y %b %d"))
-			:let date=input("Enter date: ")
+		Example: >vim
+			call histadd("input", strftime("%Y %b %d"))
+			let date=input("Enter date: ")
 <		This function is not available in the |sandbox|.
 
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetHistory()->histadd('search')
+<
 
 histdel({history} [, {item}])				*histdel()*
 		Clear {history}, i.e. delete all its entries.  See |hist-names|
@@ -3700,24 +3802,25 @@ histdel({history} [, {item}])				*histdel()*
 		is returned.
 
 		Examples:
-		Clear expression register history: >
-			:call histdel("expr")
+		Clear expression register history: >vim
+			call histdel("expr")
 <
-		Remove all entries starting with "*" from the search history: >
-			:call histdel("/", '^\*')
+		Remove all entries starting with "*" from the search history: >vim
+			call histdel("/", '^\*')
 <
-		The following three are equivalent: >
-			:call histdel("search", histnr("search"))
-			:call histdel("search", -1)
-			:call histdel("search", '^' .. histget("search", -1) .. '$')
+		The following three are equivalent: >vim
+			call histdel("search", histnr("search"))
+			call histdel("search", -1)
+			call histdel("search", '^' .. histget("search", -1) .. '$')
 <
 		To delete the last search pattern and use the last-but-one for
-		the "n" command and 'hlsearch': >
-			:call histdel("search", -1)
-			:let @/ = histget("search", -1)
+		the "n" command and 'hlsearch': >vim
+			call histdel("search", -1)
+			let @/ = histget("search", -1)
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetHistory()->histdel()
+<
 
 histget({history} [, {index}])				*histget()*
 		The result is a String, the entry with Number {index} from
@@ -3727,25 +3830,26 @@ histget({history} [, {index}])				*histget()*
 		omitted, the most recent item from the history is used.
 
 		Examples:
-		Redo the second last search from history. >
-			:execute '/' .. histget("search", -2)
+		Redo the second last search from history. >vim
+			execute '/' .. histget("search", -2)
 
 <		Define an Ex command ":H {num}" that supports re-execution of
-		the {num}th entry from the output of |:history|. >
-			:command -nargs=1 H execute histget("cmd", 0+<args>)
+		the {num}th entry from the output of |:history|. >vim
+			command -nargs=1 H execute histget("cmd", 0+<args>)
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetHistory()->histget()
+<
 
 histnr({history})						*histnr()*
 		The result is the Number of the current entry in {history}.
 		See |hist-names| for the possible values of {history}.
 		If an error occurred, -1 is returned.
 
-		Example: >
-			:let inp_index = histnr("expr")
+		Example: >vim
+			let inp_index = histnr("expr")
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetHistory()->histnr()
 <
 
@@ -3755,11 +3859,12 @@ hlID({name})							*hlID()*
 		zero is returned.
 		This can be used to retrieve information about the highlight
 		group.  For example, to get the background color of the
-		"Comment" group: >
-			:echo synIDattr(synIDtrans(hlID("Comment")), "bg")
+		"Comment" group: >vim
+			echo synIDattr(synIDtrans(hlID("Comment")), "bg")
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->hlID()
+<
 
 hlexists({name})						*hlexists()*
 		The result is a Number, which is TRUE if a highlight group
@@ -3768,7 +3873,7 @@ hlexists({name})						*hlexists()*
 		been defined for it, it may also have been used for a syntax
 		item.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->hlexists()
 <
 
@@ -3789,7 +3894,7 @@ iconv({string}, {from}, {to})				*iconv()*
 		from/to UCS-2 is automatically changed to use UTF-8.  You
 		cannot use UCS-2 in a string anyway, because of the NUL bytes.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->iconv('latin1', 'utf-8')
 <
 
@@ -3798,8 +3903,8 @@ id({expr})							*id()*
 		container type (|List|, |Dict|, |Blob| and |Partial|). It is
 		guaranteed that for the mentioned types `id(v1) ==# id(v2)`
 		returns true iff `type(v1) == type(v2) && v1 is v2`.
-		Note that |v:_null_string|, |v:_null_list|, |v:_null_dict| and
-		|v:_null_blob| have the same `id()` with different types
+		Note that `v:_null_string`, `v:_null_list`, `v:_null_dict` and
+		`v:_null_blob` have the same `id()` with different types
 		because they are internally represented as NULL pointers.
 		`id()` returns a hexadecimal representanion of the pointers to
 		the containers (i.e. like `0x994a40`), same as `printf("%p",
@@ -3816,8 +3921,9 @@ indent({lnum})						*indent()*
 		|getline()|.
 		When {lnum} is invalid -1 is returned.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->indent()
+<
 
 index({object}, {expr} [, {start} [, {ic}]])		*index()*
 		Find {expr} in {object} and return its index.  See
@@ -3840,12 +3946,15 @@ index({object}, {expr} [, {start} [, {ic}]])		*index()*
 		case must match.
 
 		-1 is returned when {expr} is not found in {object}.
-		Example: >
-			:let idx = index(words, "the")
-			:if index(numbers, 123) >= 0
+		Example: >vim
+			let idx = index(words, "the")
+			if index(numbers, 123) >= 0
+			  " ...
+			endif
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetObject()->index(what)
+<
 
 indexof({object}, {expr} [, {opts}])			*indexof()*
 		Returns the index of an item in {object} where {expr} is
@@ -3879,14 +3988,15 @@ indexof({object}, {expr} [, {opts}])			*indexof()*
 				index; may be negative for an item relative to
 				the end
 		Returns -1 when {expr} evaluates to v:false for all the items.
-		Example: >
-			:let l = [#{n: 10}, #{n: 20}, #{n: 30}]
-			:echo indexof(l, "v:val.n == 20")
-			:echo indexof(l, {i, v -> v.n == 30})
-			:echo indexof(l, "v:val.n == 20", #{startidx: 1})
+		Example: >vim
+			let l = [#{n: 10}, #{n: 20}, #{n: 30}]
+			echo indexof(l, "v:val.n == 20")
+			echo indexof(l, {i, v -> v.n == 30})
+			echo indexof(l, "v:val.n == 20", #{startidx: 1})
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			mylist->indexof(expr)
+<
 
 input({prompt} [, {text} [, {completion}]])			*input()*
 
@@ -3911,22 +4021,22 @@ input({opts})
 		The input is entered just like a command-line, with the same
 		editing commands and mappings.  There is a separate history
 		for lines typed for input().
-		Example: >
-			:if input("Coffee or beer? ") == "beer"
-			:  echo "Cheers!"
-			:endif
+		Example: >vim
+			if input("Coffee or beer? ") == "beer"
+			  echo "Cheers!"
+			endif
 <
 		If the optional {text} argument is present and not empty, this
 		is used for the default reply, as if the user typed this.
-		Example: >
-			:let color = input("Color? ", "white")
+		Example: >vim
+			let color = input("Color? ", "white")
 
 <		The optional {completion} argument specifies the type of
 		completion supported for the input.  Without it completion is
 		not performed.  The supported completion types are the same as
 		that can be supplied to a user-defined command using the
 		"-complete=" argument.  Refer to |:command-completion| for
-		more information.  Example: >
+		more information.  Example: >vim
 			let fname = input("File: ", "", "file")
 
 <					*input()-highlight* *E5400* *E5402*
@@ -3947,7 +4057,7 @@ input({opts})
 		sections must be ordered so that next hl_start_col is greater
 		then or equal to previous hl_end_col.
 
-		Example (try some input with parentheses): >
+		Example (try some input with parentheses): >vim
 			highlight RBP1 guibg=Red ctermbg=red
 			highlight RBP2 guibg=Yellow ctermbg=yellow
 			highlight RBP3 guibg=Green ctermbg=green
@@ -3992,16 +4102,17 @@ input({opts})
 		that further characters follow in the mapping, e.g., by using
 		|:execute| or |:normal|.
 
-		Example with a mapping: >
-			:nmap \x :call GetFoo()<CR>:exe "/" .. Foo<CR>
-			:function GetFoo()
-			:  call inputsave()
-			:  let g:Foo = input("enter search pattern: ")
-			:  call inputrestore()
-			:endfunction
+		Example with a mapping: >vim
+			nmap \x :call GetFoo()<CR>:exe "/" .. Foo<CR>
+			function GetFoo()
+			  call inputsave()
+			  let g:Foo = input("enter search pattern: ")
+			  call inputrestore()
+			endfunction
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetPrompt()->input()
+<
 
 inputlist({textlist})					*inputlist()*
 		{textlist} must be a |List| of strings.  This |List| is
@@ -4016,12 +4127,13 @@ inputlist({textlist})					*inputlist()*
 		Make sure {textlist} has less than 'lines' entries, otherwise
 		it won't work.  It's a good idea to put the entry number at
 		the start of the string.  And put a prompt in the first item.
-		Example: >
+		Example: >vim
 			let color = inputlist(['Select color:', '1. red',
 				\ '2. green', '3. blue'])
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetChoices()->inputlist()
+<
 
 inputrestore()					*inputrestore()*
 		Restore typeahead that was saved with a previous |inputsave()|.
@@ -4048,8 +4160,9 @@ inputsecret({prompt} [, {text}])			*inputsecret()*
 		typed on the command-line in response to the issued prompt.
 		NOTE: Command-line completion is not supported.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetPrompt()->inputsecret()
+<
 
 insert({object}, {item} [, {idx}])				*insert()*
 		When {object} is a |List| or a |Blob| insert {item} at the start
@@ -4060,36 +4173,39 @@ insert({object}, {item} [, {idx}])				*insert()*
 		like omitting {idx}.  A negative {idx} is also possible, see
 		|list-index|.  -1 inserts just before the last item.
 
-		Returns the resulting |List| or |Blob|.  Examples: >
-			:let mylist = insert([2, 3, 5], 1)
-			:call insert(mylist, 4, -1)
-			:call insert(mylist, 6, len(mylist))
+		Returns the resulting |List| or |Blob|.  Examples: >vim
+			let mylist = insert([2, 3, 5], 1)
+			call insert(mylist, 4, -1)
+			call insert(mylist, 6, len(mylist))
 <		The last example can be done simpler with |add()|.
 		Note that when {item} is a |List| it is inserted as a single
 		item.  Use |extend()| to concatenate |Lists|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->insert(item)
+<
 
 interrupt()						*interrupt()*
 		Interrupt script execution.  It works more or less like the
 		user typing CTRL-C, most commands won't execute and control
 		returns to the user.  This is useful to abort execution
-		from lower down, e.g. in an autocommand.  Example: >
-		:function s:check_typoname(file)
-		:   if fnamemodify(a:file, ':t') == '['
-		:       echomsg 'Maybe typo'
-		:       call interrupt()
-		:   endif
-		:endfunction
-		:au BufWritePre * call s:check_typoname(expand('<amatch>'))
+		from lower down, e.g. in an autocommand.  Example: >vim
+		function s:check_typoname(file)
+		   if fnamemodify(a:file, ':t') == '['
+		       echomsg 'Maybe typo'
+		       call interrupt()
+		   endif
+		endfunction
+		au BufWritePre * call s:check_typoname(expand('<amatch>'))
+<
 
 invert({expr})						*invert()*
 		Bitwise invert.  The argument is converted to a number.  A
-		List, Dict or Float argument causes an error.  Example: >
-			:let bits = invert(bits)
-<		Can also be used as a |method|: >
-			:let bits = bits->invert()
+		List, Dict or Float argument causes an error.  Example: >vim
+			let bits = invert(bits)
+<		Can also be used as a |method|: >vim
+			let bits = bits->invert()
+<
 
 isdirectory({directory})				*isdirectory()*
 		The result is a Number, which is |TRUE| when a directory
@@ -4097,57 +4213,62 @@ isdirectory({directory})				*isdirectory()*
 		exist, or isn't a directory, the result is |FALSE|.  {directory}
 		is any expression, which is used as a String.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->isdirectory()
+<
 
 isinf({expr})						*isinf()*
 		Return 1 if {expr} is a positive infinity, or -1 a negative
-		infinity, otherwise 0. >
-			:echo isinf(1.0 / 0.0)
-<			1 >
-			:echo isinf(-1.0 / 0.0)
+		infinity, otherwise 0. >vim
+			echo isinf(1.0 / 0.0)
+<			1 >vim
+			echo isinf(-1.0 / 0.0)
 <			-1
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->isinf()
+<
 
 islocked({expr})					*islocked()* *E786*
 		The result is a Number, which is |TRUE| when {expr} is the
 		name of a locked variable.
 		The string argument {expr} must be the name of a variable,
 		|List| item or |Dictionary| entry, not the variable itself!
-		Example: >
-			:let alist = [0, ['a', 'b'], 2, 3]
-			:lockvar 1 alist
-			:echo islocked('alist')		" 1
-			:echo islocked('alist[1]')	" 0
+		Example: >vim
+			let alist = [0, ['a', 'b'], 2, 3]
+			lockvar 1 alist
+			echo islocked('alist')		" 1
+			echo islocked('alist[1]')	" 0
 
 <		When {expr} is a variable that does not exist you get an error
 		message.  Use |exists()| to check for existence.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->islocked()
+<
 
 isnan({expr})						*isnan()*
-		Return |TRUE| if {expr} is a float with value NaN. >
+		Return |TRUE| if {expr} is a float with value NaN. >vim
 			echo isnan(0.0 / 0.0)
 <			1
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->isnan()
+<
 
 items({dict})						*items()*
 		Return a |List| with all the key-value pairs of {dict}.  Each
 		|List| item is a list with two items: the key of a {dict}
 		entry and the value of this entry.  The |List| is in arbitrary
 		order.  Also see |keys()| and |values()|.
-		Example: >
+		Example: >vim
 			for [key, value] in items(mydict)
 			   echo key .. ': ' .. value
 			endfor
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			mydict->items()
+<
 
 jobpid({job})						*jobpid()*
 		Return the PID (process id) of |job-id| {job}.
@@ -4162,12 +4283,12 @@ jobstart({cmd} [, {opts}])				*jobstart()*
 
 		Spawns {cmd} as a job.
 		If {cmd} is a List it runs directly (no 'shell').
-		If {cmd} is a String it runs in the 'shell', like this: >
-		  :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+		If {cmd} is a String it runs in the 'shell', like this: >vim
+		  call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
 <		(See |shell-unquoting| for details.)
 
-		Example: >
-		  :call jobstart('nvim -h', {'on_stdout':{j,d,e->append(line('.'),d)}})
+		Example: >vim
+		  call jobstart('nvim -h', {'on_stdout':{j,d,e->append(line('.'),d)}})
 <
 		Returns |job-id| on success, 0 on invalid arguments (or job
 		table is full), -1 if {cmd}[0] or 'shell' is not executable.
@@ -4180,10 +4301,10 @@ jobstart({cmd} [, {opts}])				*jobstart()*
 
 		NOTE: on Windows if {cmd} is a List:
 		  - cmd[0] must be an executable (not a "built-in"). If it is
-		    in $PATH it can be called by name, without an extension: >
-		      :call jobstart(['ping', 'neovim.io'])
-<		    If it is a full or partial path, extension is required: >
-		      :call jobstart(['System32\ping.exe', 'neovim.io'])
+		    in $PATH it can be called by name, without an extension: >vim
+		      call jobstart(['ping', 'neovim.io'])
+<		    If it is a full or partial path, extension is required: >vim
+		      call jobstart(['System32\ping.exe', 'neovim.io'])
 <		  - {cmd} is collapsed to a string of quoted args as expected
 		    by CommandLineToArgvW https://msdn.microsoft.com/bb776391
 		    unless cmd[0] is some form of "cmd.exe".
@@ -4260,7 +4381,7 @@ jobwait({jobs} [, {timeout}])				*jobwait()*
 		{timeout} is the maximum waiting time in milliseconds. If
 		omitted or -1, wait forever.
 
-		Timeout of 0 can be used to check the status of a job: >
+		Timeout of 0 can be used to check the status of a job: >vim
 			let running = jobwait([{job-id}], 0)[0] == -1
 <
 		During jobwait() callbacks for jobs not in the {jobs} list may
@@ -4279,14 +4400,15 @@ join({list} [, {sep}])					*join()*
 		When {sep} is specified it is put in between the items.  If
 		{sep} is omitted a single space is used.
 		Note that {sep} is not added at the end.  You might want to
-		add it there too: >
+		add it there too: >vim
 			let lines = join(mylist, "\n") .. "\n"
 <		String items are used as-is.  |Lists| and |Dictionaries| are
 		converted into a string like with |string()|.
 		The opposite function is |split()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->join()
+<
 
 json_decode({expr})					*json_decode()*
 		Convert {expr} from JSON object.  Accepts |readfile()|-style
@@ -4304,8 +4426,9 @@ json_decode({expr})					*json_decode()*
 		recommended and the only one required to be supported.
 		Non-UTF-8 characters are an error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			ReadObject()->json_decode()
+<
 
 json_encode({expr})					*json_encode()*
 		Convert {expr} into a JSON string.  Accepts
@@ -4319,24 +4442,26 @@ json_encode({expr})					*json_encode()*
 		or special escapes like "\t", other are dumped as-is.
 		|Blob|s are converted to arrays of the individual bytes.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetObject()->json_encode()
+<
 
 keys({dict})							*keys()*
 		Return a |List| with all the keys of {dict}.  The |List| is in
 		arbitrary order.  Also see |items()| and |values()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mydict->keys()
+<
 
 keytrans({string})					*keytrans()*
 		Turn the internal byte representation of keys into a form that
-		can be used for |:map|.  E.g. >
-			:let xx = "\<C-Home>"
-			:echo keytrans(xx)
+		can be used for |:map|.  E.g. >vim
+			let xx = "\<C-Home>"
+			echo keytrans(xx)
 <			<C-Home>
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			"\<C-Home>"->keytrans()
 <
 
@@ -4350,7 +4475,7 @@ len({expr})						*len()* *E701*
 		|Dictionary| is returned.
 		Otherwise an error is given and returns zero.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->len()
 <
 
@@ -4393,24 +4518,24 @@ libcall({libname}, {funcname}, {argument})	*libcall()* *E364* *E368*
 		the DLL is not in the usual places.
 		For Unix: When compiling your own plugins, remember that the
 		object code must be compiled as position-independent ('PIC').
-		Examples: >
-			:echo libcall("libc.so", "getenv", "HOME")
+		Examples: >vim
+			echo libcall("libc.so", "getenv", "HOME")
 
 <		Can also be used as a |method|, the base is passed as the
-		third argument: >
+		third argument: >vim
 			GetValue()->libcall("libc.so", "getenv")
 <
 
 libcallnr({libname}, {funcname}, {argument})		*libcallnr()*
 		Just like |libcall()|, but used for a function that returns an
 		int instead of a string.
-		Examples: >
-			:echo libcallnr("/usr/lib/libc.so", "getpid", "")
-			:call libcallnr("libc.so", "printf", "Hello World!\n")
-			:call libcallnr("libc.so", "sleep", 10)
+		Examples: >vim
+			echo libcallnr("/usr/lib/libc.so", "getpid", "")
+			call libcallnr("libc.so", "printf", "Hello World!\n")
+			call libcallnr("libc.so", "sleep", 10)
 <
 		Can also be used as a |method|, the base is passed as the
-		third argument: >
+		third argument: >vim
 			GetValue()->libcallnr("libc.so", "printf")
 <
 
@@ -4437,17 +4562,18 @@ line({expr} [, {winid}])					*line()*
 		With the optional {winid} argument the values are obtained for
 		that window instead of the current window.
 		Returns 0 for invalid values of {expr} and {winid}.
-		Examples: >
-			line(".")		line number of the cursor
-			line(".", winid)	idem, in window "winid"
-			line("'t")		line number of mark t
-			line("'" .. marker)	line number of mark marker
+		Examples: >vim
+			echo line(".")		" line number of the cursor
+			echo line(".", winid)	" idem, in window "winid"
+			echo line("'t")		" line number of mark t
+			echo line("'" .. marker)	" line number of mark marker
 <
 		To jump to the last known position when opening a file see
 		|last-position-jump|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetValue()->line()
+<
 
 line2byte({lnum})					*line2byte()*
 		Return the byte count from the start of the buffer for line
@@ -4455,15 +4581,16 @@ line2byte({lnum})					*line2byte()*
 		the 'fileformat' option for the current buffer.  The first
 		line returns 1. UTF-8 encoding is used, 'fileencoding' is
 		ignored.  This can also be used to get the byte count for the
-		line just below the last line: >
-			line2byte(line("$") + 1)
+		line just below the last line: >vim
+			echo line2byte(line("$") + 1)
 <		This is the buffer size plus one.  If 'fileencoding' is empty
 		it is the file size plus one.  {lnum} is used like with
 		|getline()|.  When {lnum} is invalid -1 is returned.
 		Also see |byte2line()|, |go| and |:goto|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->line2byte()
+<
 
 lispindent({lnum})					*lispindent()*
 		Get the amount of indent for line {lnum} according the lisp
@@ -4472,40 +4599,43 @@ lispindent({lnum})					*lispindent()*
 		relevant.  {lnum} is used just like in |getline()|.
 		When {lnum} is invalid, -1 is returned.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->lispindent()
+<
 
 list2blob({list})					*list2blob()*
 		Return a Blob concatenating all the number values in {list}.
-		Examples: >
-			list2blob([1, 2, 3, 4])	returns 0z01020304
-			list2blob([])		returns 0z
+		Examples: >vim
+			echo list2blob([1, 2, 3, 4])	" returns 0z01020304
+			echo list2blob([])		" returns 0z
 <		Returns an empty Blob on error.  If one of the numbers is
 		negative or more than 255 error *E1239* is given.
 
 		|blob2list()| does the opposite.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetList()->list2blob()
+<
 
 list2str({list} [, {utf8}])				*list2str()*
 		Convert each number in {list} to a character string can
-		concatenate them all.  Examples: >
-			list2str([32])		returns " "
-			list2str([65, 66, 67])	returns "ABC"
-<		The same can be done (slowly) with: >
-			join(map(list, {nr, val -> nr2char(val)}), '')
+		concatenate them all.  Examples: >vim
+			echo list2str([32])		" returns " "
+			echo list2str([65, 66, 67])	" returns "ABC"
+<		The same can be done (slowly) with: >vim
+			echo join(map(list, {nr, val -> nr2char(val)}), '')
 <		|str2list()| does the opposite.
 
 		UTF-8 encoding is always used, {utf8} option has no effect,
 		and exists only for backwards-compatibility.
-		With UTF-8 composing characters work as expected: >
-			list2str([97, 769])	returns "á"
+		With UTF-8 composing characters work as expected: >vim
+			echo list2str([97, 769])	" returns "á"
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetList()->list2str()
+<
 
 localtime()						*localtime()*
 		Return the current time, measured as seconds since 1st Jan
@@ -4516,33 +4646,35 @@ log({expr})							*log()*
 		{expr} must evaluate to a |Float| or a |Number| in the range
 		(0, inf].
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo log(10)
-<			2.302585 >
-			:echo log(exp(5))
+		Examples: >vim
+			echo log(10)
+<			2.302585 >vim
+			echo log(exp(5))
 <			5.0
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->log()
+<
 
 log10({expr})						*log10()*
 		Return the logarithm of Float {expr} to base 10 as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo log10(1000)
-<			3.0 >
-			:echo log10(0.01)
+		Examples: >vim
+			echo log10(1000)
+<			3.0 >vim
+			echo log10(0.01)
 <			-2.0
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->log10()
+<
 
 luaeval({expr} [, {expr}])				*luaeval()*
 		Evaluate Lua expression {expr} and return its result converted
 		to Vim data structures. See |lua-eval| for more details.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetExpr()->luaeval()
 <
 
@@ -4558,8 +4690,8 @@ map({expr1}, {expr2})						*map()*
 		of the current item and for a |List| |v:key| has the index of
 		the current item.  For a |Blob| |v:key| has the index of the
 		current byte.
-		Example: >
-			:call map(mylist, '"> " .. v:val .. " <"')
+		Example: >vim
+			call map(mylist, '"> " .. v:val .. " <"')
 <		This puts "> " before and " <" after each item in "mylist".
 
 		Note that {expr2} is the result of an expression and is then
@@ -4571,21 +4703,21 @@ map({expr1}, {expr2})						*map()*
 			1. The key or the index of the current item.
 			2. the value of the current item.
 		The function must return the new value of the item. Example
-		that changes each value by "key-value": >
+		that changes each value by "key-value": >vim
 			func KeyValue(key, val)
 			  return a:key .. '-' .. a:val
 			endfunc
 			call map(myDict, function('KeyValue'))
-<		It is shorter when using a |lambda|: >
+<		It is shorter when using a |lambda|: >vim
 			call map(myDict, {key, val -> key .. '-' .. val})
-<		If you do not use "val" you can leave it out: >
+<		If you do not use "val" you can leave it out: >vim
 			call map(myDict, {key -> 'item: ' .. key})
-<		If you do not use "key" you can use a short name: >
+<		If you do not use "key" you can use a short name: >vim
 			call map(myDict, {_, val -> 'item: ' .. val})
 <
 		The operation is done in-place.  If you want a |List| or
-		|Dictionary| to remain unmodified make a copy first: >
-			:let tlist = map(copy(mylist), ' v:val .. "\t"')
+		|Dictionary| to remain unmodified make a copy first: >vim
+			let tlist = map(copy(mylist), ' v:val .. "\t"')
 
 <		Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
 		filtered.  When an error is encountered while evaluating
@@ -4593,7 +4725,7 @@ map({expr1}, {expr2})						*map()*
 		{expr2} is a Funcref errors inside a function are ignored,
 		unless it was defined with the "abort" flag.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->map(expr2)
 <
 
@@ -4658,11 +4790,12 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])		*maparg()*
 		The mappings local to the current buffer are checked first,
 		then the global mappings.
 		This function can be used to map a key even when it's already
-		mapped, and have it do the original mapping too.  Sketch: >
+		mapped, and have it do the original mapping too.  Sketch: >vim
 			exe 'nnoremap <Tab> ==' .. maparg('<Tab>', 'n')
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetKey()->maparg('n')
+<
 
 mapcheck({name} [, {mode} [, {abbr}]])			*mapcheck()*
 		Check if there is a mapping that matches with {name} in mode
@@ -4690,15 +4823,16 @@ mapcheck({name} [, {mode} [, {abbr}]])			*mapcheck()*
 		The mappings local to the current buffer are checked first,
 		then the global mappings.
 		This function can be used to check if a mapping can be added
-		without being ambiguous.  Example: >
-			:if mapcheck("_vv") == ""
-			:   map _vv :set guifont=7x13<CR>
-			:endif
+		without being ambiguous.  Example: >vim
+			if mapcheck("_vv") == ""
+			   map _vv :set guifont=7x13<CR>
+			endif
 <		This avoids adding the "_vv" mapping when there already is a
 		mapping for "_v" or for "_vvv".
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetKey()->mapcheck('n')
+<
 
 mapset({mode}, {abbr}, {dict})				*mapset()*
 		Restore a mapping from a dictionary returned by |maparg()|.
@@ -4706,10 +4840,10 @@ mapset({mode}, {abbr}, {dict})				*mapset()*
 		|maparg()|. *E460*
 		{mode} is used to define the mode in which the mapping is set,
 		not the "mode" entry in {dict}.
-		Example for saving and restoring a mapping: >
+		Example for saving and restoring a mapping: >vim
 			let save_map = maparg('K', 'n', 0, 1)
 			nnoremap K somethingelse
-			...
+			" ...
 			call mapset('n', 0, save_map)
 <		Note that if you are going to replace a map in several modes,
 		e.g. with `:map!`, you need to save the mapping for all of
@@ -4728,27 +4862,27 @@ match({expr}, {pat} [, {start} [, {count}]])		*match()*
 		If there is no match -1 is returned.
 
 		For getting submatches see |matchlist()|.
-		Example: >
-			:echo match("testing", "ing")	" results in 4
-			:echo match([1, 'x'], '\a')	" results in 1
+		Example: >vim
+			echo match("testing", "ing")	" results in 4
+			echo match([1, 'x'], '\a')	" results in 1
 <		See |string-match| for how {pat} is used.
 								*strpbrk()*
-		Vim doesn't have a strpbrk() function.  But you can do: >
-			:let sepidx = match(line, '[.,;: \t]')
+		Vim doesn't have a strpbrk() function.  But you can do: >vim
+			let sepidx = match(line, '[.,;: \t]')
 <								*strcasestr()*
 		Vim doesn't have a strcasestr() function.  But you can add
-		"\c" to the pattern to ignore case: >
-			:let idx = match(haystack, '\cneedle')
+		"\c" to the pattern to ignore case: >vim
+			let idx = match(haystack, '\cneedle')
 <
 		If {start} is given, the search starts from byte index
 		{start} in a String or item {start} in a |List|.
 		The result, however, is still the index counted from the
-		first character/item.  Example: >
-			:echo match("testing", "ing", 2)
-<		result is again "4". >
-			:echo match("testing", "ing", 4)
-<		result is again "4". >
-			:echo match("testing", "t", 2)
+		first character/item.  Example: >vim
+			echo match("testing", "ing", 2)
+<		result is again "4". >vim
+			echo match("testing", "ing", 4)
+<		result is again "4". >vim
+			echo match("testing", "t", 2)
 <		result is "3".
 		For a String, if {start} > 0 then it is like the string starts
 		{start} bytes later, thus "^" will match at {start}.  Except
@@ -4762,7 +4896,7 @@ match({expr}, {pat} [, {start} [, {count}]])		*match()*
 
 		When {count} is given use the {count}th match.  When a match
 		is found in a String the search for the next one starts one
-		character further.  Thus this example results in 1: >
+		character further.  Thus this example results in 1: >vim
 			echo match("testing", "..", 0, 2)
 <		In a |List| the search continues in the next item.
 		Note that when {count} is added the way {start} works changes,
@@ -4777,7 +4911,7 @@ match({expr}, {pat} [, {start} [, {count}]])		*match()*
 		zero matches at the start instead of a number of matches
 		further down in the text.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->match('word')
 			GetList()->match('word')
 <
@@ -4831,17 +4965,17 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 
 		Returns -1 on error.
 
-		Example: >
-			:highlight MyGroup ctermbg=green guibg=green
-			:let m = matchadd("MyGroup", "TODO")
-<		Deletion of the pattern: >
-			:call matchdelete(m)
+		Example: >vim
+			highlight MyGroup ctermbg=green guibg=green
+			let m = matchadd("MyGroup", "TODO")
+<		Deletion of the pattern: >vim
+			call matchdelete(m)
 
 <		A list of matches defined by |matchadd()| and |:match| are
 		available from |getmatches()|.  All matches can be deleted in
 		one operation by |clearmatches()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetGroup()->matchadd('TODO')
 <
 
@@ -4873,17 +5007,18 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])	*matchaddpos()*
 
 		Returns -1 on error.
 
-		Example: >
-			:highlight MyGroup ctermbg=green guibg=green
-			:let m = matchaddpos("MyGroup", [[23, 24], 34])
-<		Deletion of the pattern: >
-			:call matchdelete(m)
+		Example: >vim
+			highlight MyGroup ctermbg=green guibg=green
+			let m = matchaddpos("MyGroup", [[23, 24], 34])
+<		Deletion of the pattern: >vim
+			call matchdelete(m)
 
 <		Matches added by |matchaddpos()| are returned by
 		|getmatches()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetGroup()->matchaddpos([23, 11])
+<
 
 matcharg({nr})						*matcharg()*
 		Selects the {nr} match item, as set with a |:match|,
@@ -4897,8 +5032,9 @@ matcharg({nr})						*matcharg()*
 		Highlighting matches using the |:match| commands are limited
 		to three matches. |matchadd()| does not have this limitation.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMatch()->matcharg()
+<
 
 matchdelete({id} [, {win}])		*matchdelete()* *E802* *E803*
 		Deletes a match with ID {id} previously defined by |matchadd()|
@@ -4908,30 +5044,32 @@ matchdelete({id} [, {win}])		*matchdelete()* *E802* *E803*
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMatch()->matchdelete()
+<
 
 matchend({expr}, {pat} [, {start} [, {count}]])		*matchend()*
 		Same as |match()|, but return the index of first character
-		after the match.  Example: >
-			:echo matchend("testing", "ing")
+		after the match.  Example: >vim
+			echo matchend("testing", "ing")
 <		results in "7".
 							*strspn()* *strcspn()*
 		Vim doesn't have a strspn() or strcspn() function, but you can
-		do it with matchend(): >
-			:let span = matchend(line, '[a-zA-Z]')
-			:let span = matchend(line, '[^a-zA-Z]')
+		do it with matchend(): >vim
+			let span = matchend(line, '[a-zA-Z]')
+			let span = matchend(line, '[^a-zA-Z]')
 <		Except that -1 is returned when there are no matches.
 
-		The {start}, if given, has the same meaning as for |match()|. >
-			:echo matchend("testing", "ing", 2)
-<		results in "7". >
-			:echo matchend("testing", "ing", 5)
+		The {start}, if given, has the same meaning as for |match()|. >vim
+			echo matchend("testing", "ing", 2)
+<		results in "7". >vim
+			echo matchend("testing", "ing", 5)
 <		result is "-1".
 		When {expr} is a |List| the result is equal to |match()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->matchend('word')
+<
 
 matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 		If {list} is a list of strings, then returns a |List| with all
@@ -4974,25 +5112,25 @@ matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 		Refer to |fuzzy-matching| for more information about fuzzy
 		matching strings.
 
-		Example: >
-		   :echo matchfuzzy(["clay", "crow"], "cay")
-<		results in ["clay"]. >
-		   :echo getbufinfo()->map({_, v -> v.name})->matchfuzzy("ndl")
-<		results in a list of buffer names fuzzy matching "ndl". >
-		   :echo getbufinfo()->matchfuzzy("ndl", {'key' : 'name'})
+		Example: >vim
+		   echo matchfuzzy(["clay", "crow"], "cay")
+<		results in ["clay"]. >vim
+		   echo getbufinfo()->map({_, v -> v.name})->matchfuzzy("ndl")
+<		results in a list of buffer names fuzzy matching "ndl". >vim
+		   echo getbufinfo()->matchfuzzy("ndl", {'key' : 'name'})
 <		results in a list of buffer information dicts with buffer
-		names fuzzy matching "ndl". >
-		   :echo getbufinfo()->matchfuzzy("spl",
+		names fuzzy matching "ndl". >vim
+		   echo getbufinfo()->matchfuzzy("spl",
 						\ {'text_cb' : {v -> v.name}})
 <		results in a list of buffer information dicts with buffer
-		names fuzzy matching "spl". >
-		   :echo v:oldfiles->matchfuzzy("test")
-<		results in a list of file names fuzzy matching "test". >
-		   :let l = readfile("buffer.c")->matchfuzzy("str")
-<		results in a list of lines in "buffer.c" fuzzy matching "str". >
-		   :echo ['one two', 'two one']->matchfuzzy('two one')
-<		results in `['two one', 'one two']` . >
-		   :echo ['one two', 'two one']->matchfuzzy('two one',
+		names fuzzy matching "spl". >vim
+		   echo v:oldfiles->matchfuzzy("test")
+<		results in a list of file names fuzzy matching "test". >vim
+		   let l = readfile("buffer.c")->matchfuzzy("str")
+<		results in a list of lines in "buffer.c" fuzzy matching "str". >vim
+		   echo ['one two', 'two one']->matchfuzzy('two one')
+<		results in `['two one', 'one two']` . >vim
+		   echo ['one two', 'two one']->matchfuzzy('two one',
 						\ {'matchseq': 1})
 <		results in `['two one']`.
 
@@ -5009,12 +5147,12 @@ matchfuzzypos({list}, {str} [, {dict}])		*matchfuzzypos()*
 		If there are no matching strings or there is an error, then a
 		list with three empty list items is returned.
 
-		Example: >
-			:echo matchfuzzypos(['testing'], 'tsg')
-<		results in [["testing"], [[0, 2, 6]], [99]] >
-			:echo matchfuzzypos(['clay', 'lacy'], 'la')
-<		results in [["lacy", "clay"], [[0, 1], [1, 2]], [153, 133]] >
-			:echo [{'text': 'hello', 'id' : 10}]
+		Example: >vim
+			echo matchfuzzypos(['testing'], 'tsg')
+<		results in [["testing"], [[0, 2, 6]], [99]] >vim
+			echo matchfuzzypos(['clay', 'lacy'], 'la')
+<		results in [["lacy", "clay"], [[0, 1], [1, 2]], [153, 133]] >vim
+			echo [{'text': 'hello', 'id' : 10}]
 				\ ->matchfuzzypos('ll', {'key' : 'text'})
 <		results in `[[{"id": 10, "text": "hello"}], [[2, 3]], [127]]`
 
@@ -5023,56 +5161,58 @@ matchlist({expr}, {pat} [, {start} [, {count}]])	*matchlist()*
 		list is the matched string, same as what matchstr() would
 		return.  Following items are submatches, like "\1", "\2", etc.
 		in |:substitute|.  When an optional submatch didn't match an
-		empty string is used.  Example: >
+		empty string is used.  Example: >vim
 			echo matchlist('acd', '\(a\)\?\(b\)\?\(c\)\?\(.*\)')
 <		Results in: ['acd', 'a', '', 'c', 'd', '', '', '', '', '']
 		When there is no match an empty list is returned.
 
 		You can pass in a List, but that is not very useful.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->matchlist('word')
+<
 
 matchstr({expr}, {pat} [, {start} [, {count}]])		*matchstr()*
-		Same as |match()|, but return the matched string.  Example: >
-			:echo matchstr("testing", "ing")
+		Same as |match()|, but return the matched string.  Example: >vim
+			echo matchstr("testing", "ing")
 <		results in "ing".
 		When there is no match "" is returned.
-		The {start}, if given, has the same meaning as for |match()|. >
-			:echo matchstr("testing", "ing", 2)
-<		results in "ing". >
-			:echo matchstr("testing", "ing", 5)
+		The {start}, if given, has the same meaning as for |match()|. >vim
+			echo matchstr("testing", "ing", 2)
+<		results in "ing". >vim
+			echo matchstr("testing", "ing", 5)
 <		result is "".
 		When {expr} is a |List| then the matching item is returned.
 		The type isn't changed, it's not necessarily a String.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->matchstr('word')
+<
 
 matchstrpos({expr}, {pat} [, {start} [, {count}]])	*matchstrpos()*
 		Same as |matchstr()|, but return the matched string, the start
-		position and the end position of the match.  Example: >
-			:echo matchstrpos("testing", "ing")
+		position and the end position of the match.  Example: >vim
+			echo matchstrpos("testing", "ing")
 <		results in ["ing", 4, 7].
 		When there is no match ["", -1, -1] is returned.
-		The {start}, if given, has the same meaning as for |match()|. >
-			:echo matchstrpos("testing", "ing", 2)
-<		results in ["ing", 4, 7]. >
-			:echo matchstrpos("testing", "ing", 5)
+		The {start}, if given, has the same meaning as for |match()|. >vim
+			echo matchstrpos("testing", "ing", 2)
+<		results in ["ing", 4, 7]. >vim
+			echo matchstrpos("testing", "ing", 5)
 <		result is ["", -1, -1].
 		When {expr} is a |List| then the matching item, the index
 		of first item where {pat} matches, the start position and the
-		end position of the match are returned. >
-			:echo matchstrpos([1, '__x'], '\a')
+		end position of the match are returned. >vim
+			echo matchstrpos([1, '__x'], '\a')
 <		result is ["x", 1, 2, 3].
 		The type isn't changed, it's not necessarily a String.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->matchstrpos('word')
 <
 
 max({expr})							*max()*
-		Return the maximum value of all items in {expr}. Example: >
+		Return the maximum value of all items in {expr}. Example: >vim
 			echo max([apples, pears, oranges])
 
 <		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
@@ -5081,7 +5221,7 @@ max({expr})							*max()*
 		items in {expr} cannot be used as a Number this results in
 		                an error.  An empty |List| or |Dictionary| results in zero.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->max()
 <
 
@@ -5090,14 +5230,14 @@ menu_get({path} [, {modes}])				*menu_get()*
 		by |:menu|, |:amenu|, …), including |hidden-menus|.
 
 		{path} matches a menu by name, or all menus if {path} is an
-		empty string.  Example: >
-			:echo menu_get('File','')
-			:echo menu_get('')
+		empty string.  Example: >vim
+			echo menu_get('File','')
+			echo menu_get('')
 <
 		{modes} is a string of zero or more modes (see |maparg()| or
 		|creating-menus| for the list of modes). "a" means "all".
 
-		Example: >
+		Example: >vim
 			nnoremenu &Test.Test inormal
 			inoremenu Test.Test insert
 			vnoremenu Test.Test x
@@ -5183,9 +5323,9 @@ menu_info({name} [, {mode}])				*menu_info()*
 
 		Returns an empty dictionary if the menu item is not found.
 
-		Examples: >
-			:echo menu_info('Edit.Cut')
-			:echo menu_info('File.Save', 'n')
+		Examples: >vim
+			echo menu_info('Edit.Cut')
+			echo menu_info('File.Save', 'n')
 
 			" Display the entire menu hierarchy in a buffer
 			func ShowMenu(name, pfx)
@@ -5201,12 +5341,12 @@ menu_info({name} [, {mode}])				*menu_info()*
 			  call ShowMenu(topmenu, '')
 			endfor
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMenuName()->menu_info('v')
 <
 
 min({expr})							*min()*
-		Return the minimum value of all items in {expr}. Example: >
+		Return the minimum value of all items in {expr}. Example: >vim
 			echo min([apples, pears, oranges])
 
 <		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
@@ -5215,7 +5355,7 @@ min({expr})							*min()*
 		items in {expr} cannot be used as a Number this results in
 		an error.  An empty |List| or |Dictionary| results in zero.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->min()
 <
 
@@ -5229,19 +5369,19 @@ mkdir({name} [, {flags} [, {prot}]])			*mkdir()* *E739*
 		created as necessary.
 
 		If {flags} contains "D" then {name} is deleted at the end of
-		the current function, as with: >
+		the current function, as with: >vim
 			defer delete({name}, 'd')
 <
 		If {flags} contains "R" then {name} is deleted recursively at
-		the end of the current function, as with: >
+		the end of the current function, as with: >vim
 			defer delete({name}, 'rf')
 <		Note that when {name} has more than one part and "p" is used
 		some directories may already exist.  Only the first one that
 		is created and what it contains is scheduled to be deleted.
-		E.g. when using: >
+		E.g. when using: >vim
 			call mkdir('subdir/tmp/autoload', 'pR')
 <		and "subdir" already exists then "subdir/tmp" will be
-		scheduled for deletion, like with: >
+		scheduled for deletion, like with: >vim
 			defer delete('subdir/tmp', 'rf')
 <
 		If {prot} is given it is used to set the protection bits of
@@ -5250,8 +5390,8 @@ mkdir({name} [, {flags} [, {prot}]])			*mkdir()* *E739*
 		unreadable for others.
 
 		{prot} is applied for all parts of {name}.  Thus if you create
-		/tmp/foo/bar then /tmp/foo will be created with 0o700. Example: >
-			:call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
+		/tmp/foo/bar then /tmp/foo will be created with 0o700. Example: >vim
+			call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
 
 <		This function is not available in the |sandbox|.
 
@@ -5262,7 +5402,7 @@ mkdir({name} [, {flags} [, {prot}]])			*mkdir()* *E739*
 		successful or FALSE if the directory creation failed or partly
 		failed.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->mkdir()
 <
 
@@ -5317,15 +5457,16 @@ mode([expr])							*mode()*
 		the leading character(s).
 		Also see |visualmode()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			DoFull()->mode()
+<
 
 msgpackdump({list} [, {type}])			*msgpackdump()*
 		Convert a list of Vimscript objects to msgpack. Returned value is a
 		|readfile()|-style list. When {type} contains "B", a |Blob| is
-		returned instead. Example: >
+		returned instead. Example: >vim
 			call writefile(msgpackdump([{}]), 'fname.mpack', 'b')
-<		or, using a |Blob|: >
+<		or, using a |Blob|: >vim
 			call writefile(msgpackdump([{}], 'B'), 'fname.mpack')
 <
 		This will write the single 0x80 byte to a `fname.mpack` file
@@ -5342,7 +5483,7 @@ msgpackdump({list} [, {type}])			*msgpackdump()*
 msgpackparse({data})					*msgpackparse()*
 		Convert a |readfile()|-style list or a |Blob| to a list of
 		Vimscript objects.
-		Example: >
+		Example: >vim
 			let fname = expand('~/.config/nvim/shada/main.shada')
 			let mpack = readfile(fname, 'b')
 			let shada_objects = msgpackparse(mpack)
@@ -5415,31 +5556,33 @@ msgpackparse({data})					*msgpackparse()*
 
 nextnonblank({lnum})					*nextnonblank()*
 		Return the line number of the first line at or below {lnum}
-		that is not blank.  Example: >
-			if getline(nextnonblank(1)) =~ "Java"
+		that is not blank.  Example: >vim
+			if getline(nextnonblank(1)) =~ "Java" | endif
 <		When {lnum} is invalid or there is no non-blank line at or
 		below it, zero is returned.
 		{lnum} is used like with |getline()|.
 		See also |prevnonblank()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->nextnonblank()
+<
 
 nr2char({expr} [, {utf8}])				*nr2char()*
 		Return a string with a single character, which has the number
-		value {expr}.  Examples: >
-			nr2char(64)		returns "@"
-			nr2char(32)		returns " "
-<		Example for "utf-8": >
-			nr2char(300)		returns I with bow character
-		<UTF-8 encoding is always used, {utf8} option has no effect,
+		value {expr}.  Examples: >vim
+			echo nr2char(64)		" returns '@'
+			echo nr2char(32)		" returns ' '
+<		Example for "utf-8": >vim
+			echo nr2char(300)		" returns I with bow character
+<
+		UTF-8 encoding is always used, {utf8} option has no effect,
 		and exists only for backwards-compatibility.
 		Note that a NUL character in the file is specified with
 		nr2char(10), because NULs are represented with newline
 		characters.  nr2char(0) is a real NUL and terminates the
 		string, thus results in an empty string.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetNumber()->nr2char()
 <
 
@@ -5458,10 +5601,10 @@ or({expr}, {expr})						*or()*
 		Bitwise OR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `and()` and `xor()`.
-		Example: >
-			:let bits = or(bits, 0x80)
-<		Can also be used as a |method|: >
-			:let bits = bits->or(0x80)
+		Example: >vim
+			let bits = or(bits, 0x80)
+<		Can also be used as a |method|: >vim
+			let bits = bits->or(0x80)
 
 <		Rationale: The reason this is a function and not using the "|"
 		character like many languages, is that Vi has always used "|"
@@ -5473,17 +5616,18 @@ pathshorten({path} [, {len}])				*pathshorten()*
 		result.  The tail, the file name, is kept as-is.  The other
 		components in the path are reduced to {len} letters in length.
 		If {len} is omitted or smaller than 1 then 1 is used (single
-		letters).  Leading '~' and '.' characters are kept.  Examples: >
-			:echo pathshorten('~/.config/nvim/autoload/file1.vim')
+		letters).  Leading '~' and '.' characters are kept.  Examples: >vim
+			echo pathshorten('~/.config/nvim/autoload/file1.vim')
 <			~/.c/n/a/file1.vim ~
-		>
-			:echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
+		>vim
+			echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
 <			~/.co/nv/au/file2.vim ~
 		It doesn't matter if the path exists or not.
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetDirectories()->pathshorten()
+<
 
 perleval({expr})						*perleval()*
 		Evaluate |perl| expression {expr} and return its result
@@ -5496,49 +5640,52 @@ perleval({expr})						*perleval()*
 
 		Note: If you want an array or hash, {expr} must return a
 		reference to it.
-		Example: >
-			:echo perleval('[1 .. 4]')
+		Example: >vim
+			echo perleval('[1 .. 4]')
 <			[1, 2, 3, 4]
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetExpr()->perleval()
+<
 
 pow({x}, {y})							*pow()*
 		Return the power of {x} to the exponent {y} as a |Float|.
 		{x} and {y} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {x} or {y} is not a |Float| or a |Number|.
-		Examples: >
-			:echo pow(3, 3)
-<			27.0 >
-			:echo pow(2, 16)
-<			65536.0 >
-			:echo pow(32, 0.20)
+		Examples: >vim
+			echo pow(3, 3)
+<			27.0 >vim
+			echo pow(2, 16)
+<			65536.0 >vim
+			echo pow(32, 0.20)
 <			2.0
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->pow(3)
+<
 
 prevnonblank({lnum})					*prevnonblank()*
 		Return the line number of the first line at or above {lnum}
-		that is not blank.  Example: >
+		that is not blank.  Example: >vim
 			let ind = indent(prevnonblank(v:lnum - 1))
 <		When {lnum} is invalid or there is no non-blank line at or
 		above it, zero is returned.
 		{lnum} is used like with |getline()|.
 		Also see |nextnonblank()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetLnum()->prevnonblank()
+<
 
 printf({fmt}, {expr1} ...)					*printf()*
 		Return a String with {fmt}, where "%" items are replaced by
-		the formatted form of their respective arguments.  Example: >
-			printf("%4d: E%d %.30s", lnum, errno, msg)
+		the formatted form of their respective arguments.  Example: >vim
+			echo printf("%4d: E%d %.30s", lnum, errno, msg)
 <		May result in:
 			"  99: E42 asdfasdfasdfasdfasdfasdfasdfas" ~
 
 		When used as a |method| the base is passed as the second
-		argument: >
+		argument: >vim
 			Compute()->printf("result: %d")
 <
 		You can use `call()` to pass the items as a list.
@@ -5638,8 +5785,8 @@ printf({fmt}, {expr1} ...)					*printf()*
 		Number argument supplies the field width or precision.  A
 		negative field width is treated as a left adjustment flag
 		followed by a positive field width; a negative precision is
-		treated as though it were missing.  Example: >
-			:echo printf("%d: %.*s", nr, width, line)
+		treated as though it were missing.  Example: >vim
+			echo printf("%d: %.*s", nr, width, line)
 <		This limits the length of the text used from "line" to
 		"width" bytes.
 
@@ -5694,7 +5841,7 @@ printf({fmt}, {expr1} ...)					*printf()*
 			(out of range or dividing by zero) results in "inf"
 			 or "-inf" with %f (INF or -INF with %F).
 			 "0.0 / 0.0" results in "nan" with %f (NAN with %F).
-			Example: >
+			Example: >vim
 				echo printf("%.2f", 12.115)
 <				12.12
 			Note that roundoff depends on the system libraries.
@@ -5737,8 +5884,9 @@ prompt_getprompt({buf})				*prompt_getprompt()*
 		If the buffer doesn't exist or isn't a prompt buffer, an empty
 		string is returned.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBuffer()->prompt_getprompt()
+<
 
 prompt_setcallback({buf}, {expr})		*prompt_setcallback()*
 		Set prompt callback for buffer {buf} to {expr}.  When {expr}
@@ -5756,7 +5904,7 @@ prompt_setcallback({buf}, {expr})		*prompt_setcallback()*
 		The callback is invoked with one argument, which is the text
 		that was entered at the prompt.  This can be an empty string
 		if the user only typed Enter.
-		Example: >
+		Example: >vim
 		   func s:TextEntered(text)
 		     if a:text == 'exit' || a:text == 'quit'
 		       stopinsert
@@ -5772,8 +5920,9 @@ prompt_setcallback({buf}, {expr})		*prompt_setcallback()*
 		   endfunc
 		   call prompt_setcallback(bufnr(), function('s:TextEntered'))
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetBuffer()->prompt_setcallback(callback)
+<
 
 prompt_setinterrupt({buf}, {expr})		*prompt_setinterrupt()*
 		Set a callback for buffer {buf} to {expr}.  When {expr} is an
@@ -5784,18 +5933,20 @@ prompt_setinterrupt({buf}, {expr})		*prompt_setinterrupt()*
 		mode.  Without setting a callback Vim will exit Insert mode,
 		as in any buffer.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBuffer()->prompt_setinterrupt(callback)
+<
 
 prompt_setprompt({buf}, {text})			*prompt_setprompt()*
 		Set prompt for buffer {buf} to {text}.  You most likely want
 		{text} to end in a space.
 		The result is only visible if {buf} has 'buftype' set to
-		"prompt".  Example: >
+		"prompt".  Example: >vim
 			call prompt_setprompt(bufnr(''), 'command: ')
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBuffer()->prompt_setprompt('command: ')
+<
 
 pum_getpos()						*pum_getpos()*
 		If the popup menu (see |ins-completion-menu|) is not visible,
@@ -5826,7 +5977,7 @@ py3eval({expr})						*py3eval()*
 		Dictionaries are represented as Vim |Dictionary| type with
 		keys converted to strings.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetExpr()->py3eval()
 <
 
@@ -5839,8 +5990,9 @@ pyeval({expr})				*pyeval()* *E858* *E859*
 		Dictionaries are represented as Vim |Dictionary| type,
 		non-string keys result in error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetExpr()->pyeval()
+<
 
 pyxeval({expr})						*pyxeval()*
 		Evaluate Python expression {expr} and return its result
@@ -5848,7 +6000,7 @@ pyxeval({expr})						*pyxeval()*
 		Uses Python 2 or 3, see |python_x| and 'pyxversion'.
 		See also: |pyeval()|, |py3eval()|
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetExpr()->pyxeval()
 <
 
@@ -5861,13 +6013,13 @@ rand([{expr}])						*rand()*
 		and updated.
 		Returns -1 if {expr} is invalid.
 
-		Examples: >
-			:echo rand()
-			:let seed = srand()
-			:echo rand(seed)
-			:echo rand(seed) % 16  " random number 0 - 15
+		Examples: >vim
+			echo rand()
+			let seed = srand()
+			echo rand(seed)
+			echo rand(seed) % 16  " random number 0 - 15
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			seed->rand()
 <
 
@@ -5881,15 +6033,15 @@ range({expr} [, {max} [, {stride}]])		*range()* *E726* *E727*
 		When the maximum is one before the start the result is an
 		empty list.  When the maximum is more than one before the
 		start this is an error.
-		Examples: >
-			range(4)		" [0, 1, 2, 3]
-			range(2, 4)		" [2, 3, 4]
-			range(2, 9, 3)		" [2, 5, 8]
-			range(2, -2, -1)	" [2, 1, 0, -1, -2]
-			range(0)		" []
-			range(2, 0)		" error!
-<
-		Can also be used as a |method|: >
+		Examples: >vim
+			echo range(4)		" [0, 1, 2, 3]
+			echo range(2, 4)		" [2, 3, 4]
+			echo range(2, 9, 3)		" [2, 5, 8]
+			echo range(2, -2, -1)	" [2, 1, 0, -1, -2]
+			echo range(0)		" []
+			echo range(2, 0)		" error!
+<
+		Can also be used as a |method|: >vim
 			GetExpr()->range()
 <
 
@@ -5897,18 +6049,18 @@ readblob({fname} [, {offset} [, {size}]])		*readblob()*
 		Read file {fname} in binary mode and return a |Blob|.
 		If {offset} is specified, read the file from the specified
 		offset.  If it is a negative value, it is used as an offset
-		from the end of the file.  E.g., to read the last 12 bytes: >
-			readblob('file.bin', -12)
+		from the end of the file.  E.g., to read the last 12 bytes: >vim
+			echo readblob('file.bin', -12)
 <		If {size} is specified, only the specified size will be read.
-		E.g. to read the first 100 bytes of a file: >
-			readblob('file.bin', 0, 100)
+		E.g. to read the first 100 bytes of a file: >vim
+			echo readblob('file.bin', 0, 100)
 <		If {size} is -1 or omitted, the whole data starting from
 		{offset} will be read.
 		This can be also used to read the data from a character device
 		on Unix when {size} is explicitly set.  Only if the device
 		supports seeking {offset} can be used.  Otherwise it should be
-		zero.  E.g. to read 10 bytes from a serial console: >
-			readblob('/dev/ttyS0', 0, 10)
+		zero.  E.g. to read 10 bytes from a serial console: >vim
+			echo readblob('/dev/ttyS0', 0, 10)
 <		When the file can't be opened an error message is given and
 		the result is an empty |Blob|.
 		When the offset is beyond the end of the file the result is an
@@ -5932,12 +6084,12 @@ readdir({directory} [, {expr}])				*readdir()*
 			to the list.
 		Each time {expr} is evaluated |v:val| is set to the entry name.
 		When {expr} is a function the name is passed as the argument.
-		For example, to get a list of files ending in ".txt": >
-		  readdir(dirname, {n -> n =~ '.txt$'})
-<		To skip hidden and backup files: >
-		  readdir(dirname, {n -> n !~ '^\.\|\~$'})
+		For example, to get a list of files ending in ".txt": >vim
+		  echo readdir(dirname, {n -> n =~ '.txt$'})
+<		To skip hidden and backup files: >vim
+		  echo readdir(dirname, {n -> n !~ '^\.\|\~$'})
 
-<		If you want to get a directory tree: >
+<		If you want to get a directory tree: >vim
 		  function! s:tree(dir)
 		      return {a:dir : map(readdir(a:dir),
 		      \ {_, x -> isdirectory(x) ?
@@ -5947,7 +6099,7 @@ readdir({directory} [, {expr}])				*readdir()*
 <
 		Returns an empty List on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetDirName()->readdir()
 <
 
@@ -5967,10 +6119,10 @@ readfile({fname} [, {type} [, {max}]])			*readfile()*
 		- Any UTF-8 byte order mark is removed from the text.
 		When {max} is given this specifies the maximum number of lines
 		to be read.  Useful if you only want to check the first ten
-		lines of a file: >
-			:for line in readfile(fname, '', 10)
-			:  if line =~ 'Date' | echo line | endif
-			:endfor
+		lines of a file: >vim
+			for line in readfile(fname, '', 10)
+			  if line =~ 'Date' | echo line | endif
+			endfor
 <		When {max} is negative -{max} lines from the end of the file
 		are returned, or as many as there are.
 		When {max} is zero the result is an empty list.
@@ -5984,7 +6136,7 @@ readfile({fname} [, {type} [, {max}]])			*readfile()*
 		the result is an empty list.
 		Also see |writefile()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFileName()->readfile()
 <
 
@@ -5999,13 +6151,14 @@ reduce({object}, {func} [, {initial}])		*reduce()* *E998*
 		item.  If {initial} is not given and {object} is empty no
 		result can be computed, an E998 error is given.
 
-		Examples: >
+		Examples: >vim
 			echo reduce([1, 3, 5], { acc, val -> acc + val })
 			echo reduce(['x', 'y'], { acc, val -> acc .. val }, 'a')
 			echo reduce(0z1122, { acc, val -> 2 * acc + val })
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			echo mylist->reduce({ acc, val -> acc + val }, 0)
+<
 
 reg_executing()					*reg_executing()*
 		Returns the single letter name of the register being executed.
@@ -6041,7 +6194,7 @@ reltime({start}, {end})					*reltime()*
 		The {start} and {end} arguments must be values returned by
 		reltime().  Returns zero on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetStart()->reltime()
 <
 		Note: |localtime()| returns the current (non-relative) time.
@@ -6057,25 +6210,26 @@ reltimefloat({time})					*reltimefloat()*
 		Also see |profiling|.
 		If there is an error an empty string is returned
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			reltime(start)->reltimefloat()
+<
 
 reltimestr({time})					*reltimestr()*
 		Return a String that represents the time value of {time}.
 		This is the number of seconds, a dot and the number of
-		microseconds.  Example: >
+		microseconds.  Example: >vim
 			let start = reltime()
 			call MyFunction()
 			echo reltimestr(reltime(start))
 <		Note that overhead for the commands will be added to the time.
 		Leading spaces are used to make the string align nicely.  You
-		can use split() to remove it. >
+		can use split() to remove it. >vim
 			echo split(reltimestr(reltime(start)))[0]
 <		Also see |profiling|.
 		If there is an error an empty string is returned
 
-		Can also be used as a |method|: >
-			reltime(start)->reltimestr()
+		Can also be used as a |method|: >vim
+			echo reltime(start)->reltimestr()
 <
 
 remove({list}, {idx})
@@ -6088,14 +6242,15 @@ remove({list}, {idx}, {end})				*remove()*
 		points to an item before {idx} this is an error.
 		See |list-index| for possible values of {idx} and {end}.
 		Returns zero on error.
-		Example: >
-			:echo "last item: " .. remove(mylist, -1)
-			:call remove(mylist, 0, 9)
+		Example: >vim
+			echo "last item: " .. remove(mylist, -1)
+			call remove(mylist, 0, 9)
 <
 		Use |delete()| to remove a file.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->remove(idx)
+<
 
 remove({blob}, {idx})
 remove({blob}, {idx}, {end})
@@ -6106,14 +6261,15 @@ remove({blob}, {idx}, {end})
 		byte as {end} a |Blob| with one byte is returned.  When {end}
 		points to a byte before {idx} this is an error.
 		Returns zero on error.
-		Example: >
-			:echo "last byte: " .. remove(myblob, -1)
-			:call remove(mylist, 0, 9)
+		Example: >vim
+			echo "last byte: " .. remove(myblob, -1)
+			call remove(mylist, 0, 9)
+<
 
 remove({dict}, {key})
 		Remove the entry from {dict} with key {key} and return it.
-		Example: >
-			:echo "removed " .. remove(dict, "one")
+		Example: >vim
+			echo "removed " .. remove(dict, "one")
 <		If there is no {key} in {dict} this is an error.
 		Returns zero on error.
 
@@ -6125,20 +6281,21 @@ rename({from}, {to})					*rename()*
 		NOTE: If {to} exists it is overwritten without warning.
 		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetOldName()->rename(newname)
+<
 
 repeat({expr}, {count})					*repeat()*
 		Repeat {expr} {count} times and return the concatenated
-		result.  Example: >
-			:let separator = repeat('-', 80)
+		result.  Example: >vim
+			let separator = repeat('-', 80)
 <		When {count} is zero or negative the result is empty.
 		When {expr} is a |List| or a |Blob| the result is {expr}
-		concatenated {count} times.  Example: >
-			:let longlist = repeat(['a', 'b'], 3)
+		concatenated {count} times.  Example: >vim
+			let longlist = repeat(['a', 'b'], 3)
 <		Results in ['a', 'b', 'a', 'b', 'a', 'b'].
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->repeat(count)
 <
 
@@ -6155,7 +6312,7 @@ resolve({filename})				*resolve()* *E655*
 		current directory (provided the result is still a relative
 		path name) and also keeps a trailing path separator.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->resolve()
 <
 
@@ -6164,10 +6321,11 @@ reverse({object})						*reverse()*
 		{object} can be a |List| or a |Blob|.
 		Returns {object}.
 		Returns zero if {object} is not a List or a Blob.
-		If you want an object to remain unmodified make a copy first: >
-			:let revlist = reverse(copy(mylist))
-<		Can also be used as a |method|: >
+		If you want an object to remain unmodified make a copy first: >vim
+			let revlist = reverse(copy(mylist))
+<		Can also be used as a |method|: >vim
 			mylist->reverse()
+<
 
 round({expr})						*round()*
 		Round off {expr} to the nearest integral value and return it
@@ -6175,34 +6333,38 @@ round({expr})						*round()*
 		values, then use the larger one (away from zero).
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
+		Examples: >vim
 			echo round(0.456)
-<			0.0  >
+<			0.0  >vim
 			echo round(4.5)
-<			5.0 >
+<			5.0 >vim
 			echo round(-4.5)
 <			-5.0
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->round()
+<
 
 rpcnotify({channel}, {event} [, {args}...])		*rpcnotify()*
 		Sends {event} to {channel} via |RPC| and returns immediately.
 		If {channel} is 0, the event is broadcast to all channels.
-		Example: >
-			:au VimLeave call rpcnotify(0, "leaving")
+		Example: >vim
+			au VimLeave call rpcnotify(0, "leaving")
+<
 
 rpcrequest({channel}, {method} [, {args}...])		*rpcrequest()*
 		Sends a request to {channel} to invoke {method} via
 		|RPC| and blocks until a response is received.
-		Example: >
-			:let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
+		Example: >vim
+			let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
+<
 
 rpcstart({prog} [, {argv}])				*rpcstart()*
-		Deprecated. Replace  >
-			:let id = rpcstart('prog', ['arg1', 'arg2'])
-<		with >
-			:let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
+		Deprecated. Replace  >vim
+			let id = rpcstart('prog', ['arg1', 'arg2'])
+<		with >vim
+			let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
+<
 
 rubyeval({expr})						*rubyeval()*
 		Evaluate Ruby expression {expr} and return its result
@@ -6214,8 +6376,9 @@ rubyeval({expr})						*rubyeval()*
 		Other objects are represented as strings resulted from their
 		"Object#to_s" method.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRubyExpr()->rubyeval()
+<
 
 screenattr({row}, {col})				*screenattr()*
 		Like |screenchar()|, but return the attribute.  This is a rather
@@ -6223,8 +6386,9 @@ screenattr({row}, {col})				*screenattr()*
 		attribute at other positions.
 		Returns -1 when row or col is out of range.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRow()->screenattr(col)
+<
 
 screenchar({row}, {col})				*screenchar()*
 		The result is a Number, which is the character at position
@@ -6236,8 +6400,9 @@ screenchar({row}, {col})				*screenchar()*
 		This is mainly to be used for testing.
 		Returns -1 when row or col is out of range.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRow()->screenchar(col)
+<
 
 screenchars({row}, {col})				*screenchars()*
 		The result is a List of Numbers.  The first number is the same
@@ -6246,8 +6411,9 @@ screenchars({row}, {col})				*screenchars()*
 		This is mainly to be used for testing.
 		Returns an empty List when row or col is out of range.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRow()->screenchars(col)
+<
 
 screencol()						*screencol()*
 		The result is a Number, which is the current screen column of
@@ -6258,7 +6424,7 @@ screencol()						*screencol()*
 		in a command (e.g. ":echo screencol()") it will return the
 		column inside the command line, which is 1 when the command is
 		executed. To get the cursor position in the file use one of
-		the following mappings: >
+		the following mappings: >vim
 			nnoremap <expr> GG ":echom " .. screencol() .. "\n"
 			nnoremap <silent> GG :echom screencol()<CR>
 			noremap GG <Cmd>echom screencol()<Cr>
@@ -6288,8 +6454,9 @@ screenpos({winid}, {lnum}, {col})			*screenpos()*
 		first character is returned, {col} is not used.
 		Returns an empty Dict if {winid} is invalid.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->screenpos(lnum, col)
+<
 
 screenrow()						*screenrow()*
 		The result is a Number, which is the current screen row of the
@@ -6307,7 +6474,7 @@ screenstring({row}, {col})				*screenstring()*
 		This is mainly to be used for testing.
 		Returns an empty String when row or col is out of range.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetRow()->screenstring(col)
 <
 
@@ -6352,7 +6519,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])	*search()*
 
 		When the {stopline} argument is given then the search stops
 		after searching this line.  This is useful to restrict the
-		search to a range of lines.  Examples: >
+		search to a range of lines.  Examples: >vim
 			let match = search('(', 'b', line("w0"))
 			let end = search('END', '', line("w$"))
 <		When {stopline} is used and it is not zero this also implies
@@ -6383,24 +6550,24 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])	*search()*
 		The cursor will be positioned at the match, unless the 'n'
 		flag is used.
 
-		Example (goes over all files in the argument list): >
-		    :let n = 1
-		    :while n <= argc()	    " loop over all files in arglist
-		    :  exe "argument " .. n
-		    :  " start at the last char in the file and wrap for the
-		    :  " first search to find match at start of file
-		    :  normal G$
-		    :  let flags = "w"
-		    :  while search("foo", flags) > 0
-		    :	 s/foo/bar/g
-		    :	 let flags = "W"
-		    :  endwhile
-		    :  update		    " write the file if modified
-		    :  let n = n + 1
-		    :endwhile
-<
-		Example for using some flags: >
-		    :echo search('\<if\|\(else\)\|\(endif\)', 'ncpe')
+		Example (goes over all files in the argument list): >vim
+		    let n = 1
+		    while n <= argc()	    " loop over all files in arglist
+		      exe "argument " .. n
+		      " start at the last char in the file and wrap for the
+		      " first search to find match at start of file
+		      normal G$
+		      let flags = "w"
+		      while search("foo", flags) > 0
+		        s/foo/bar/g
+		        let flags = "W"
+		      endwhile
+		      update		    " write the file if modified
+		      let n = n + 1
+		    endwhile
+<
+		Example for using some flags: >vim
+		    echo search('\<if\|\(else\)\|\(endif\)', 'ncpe')
 <		This will search for the keywords "if", "else", and "endif"
 		under or after the cursor.  Because of the 'p' flag, it
 		returns 1, 2, or 3 depending on which keyword is found, or 0
@@ -6412,8 +6579,9 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])	*search()*
 		without the 'e' flag if the cursor is on the "f" of "if".
 		The 'n' flag tells the function not to move the cursor.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetPattern()->search()
+<
 
 searchcount([{options}])				*searchcount()*
 		Get or update the last search count, like what is displayed
@@ -6440,7 +6608,7 @@ searchcount([{options}])				*searchcount()*
 		this function with `recompute: 0` . This sometimes returns
 		wrong information because |n| and |N|'s maximum count is 99.
 		If it exceeded 99 the result must be max count + 1 (100). If
-		you want to get correct information, specify `recompute: 1`: >
+		you want to get correct information, specify `recompute: 1`: >vim
 
 			" result == maxcount + 1 (100) when many matches
 			let result = searchcount(#{recompute: 0})
@@ -6449,7 +6617,7 @@ searchcount([{options}])				*searchcount()*
 			" to 1)
 			let result = searchcount()
 <
-		The function is useful to add the count to 'statusline': >
+		The function is useful to add the count to 'statusline': >vim
 			function! LastSearchCount() abort
 			  let result = searchcount(#{recompute: 0})
 			  if empty(result)
@@ -6478,7 +6646,7 @@ searchcount([{options}])				*searchcount()*
 			" \   '%{v:hlsearch ? LastSearchCount() : ""}'
 <
 		You can also update the search count, which can be useful in a
-		|CursorMoved| or |CursorMovedI| autocommand: >
+		|CursorMoved| or |CursorMovedI| autocommand: >vim
 
 			autocmd CursorMoved,CursorMovedI *
 			  \ let s:searchcount_timer = timer_start(
@@ -6492,7 +6660,7 @@ searchcount([{options}])				*searchcount()*
 			endfunction
 <
 		This can also be used to count matched texts with specified
-		pattern in the current buffer using "pattern":  >
+		pattern in the current buffer using "pattern":  >vim
 
 			" Count '\<foo\>' in this buffer
 			" (Note that it also updates search count)
@@ -6516,7 +6684,7 @@ searchcount([{options}])				*searchcount()*
 						and different with |@/|.
 						this works as same as the
 						below command is executed
-						before calling this function >
+						before calling this function >vim
 						  let @/ = pattern
 <						(default: |@/|)
 		  timeout	|Number|	0 or negative number is no
@@ -6536,7 +6704,7 @@ searchcount([{options}])				*searchcount()*
 						value. see |cursor()|, |getpos()|
 						(default: cursor's position)
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetSearchOpts()->searchcount()
 <
 
@@ -6553,12 +6721,12 @@ searchdecl({name} [, {global} [, {thisblock}]])	*searchdecl()*
 
 		Moves the cursor to the found match.
 		Returns zero for success, non-zero for failure.
-		Example: >
+		Example: >vim
 			if searchdecl('myvar') == 0
 			   echo getline('.')
 			endif
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->searchdecl()
 <
 
@@ -6578,8 +6746,8 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeo
 		must not contain \( \) pairs.  Use of \%( \) is allowed.  When
 		{middle} is not empty, it is found when searching from either
 		direction, but only when not in a nested start-end pair.  A
-		typical use is: >
-			searchpair('\<if\>', '\<else\>', '\<endif\>')
+		typical use is: >vim
+			echo searchpair('\<if\>', '\<else\>', '\<endif\>')
 <		By leaving {middle} empty the "else" is skipped.
 
 		{flags} 'b', 'c', 'n', 's', 'w' and 'W' are used like with
@@ -6609,7 +6777,7 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeo
 
 		The search starts exactly at the cursor.  A match with
 		{start}, {middle} or {end} at the next character, in the
-		direction of searching, is the first one found.  Example: >
+		direction of searching, is the first one found.  Example: >vim
 			if 1
 			  if 2
 			  endif 2
@@ -6625,9 +6793,9 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeo
 		that when the cursor is inside a match with the end it finds
 		the matching start.
 
-		Example, to find the "endif" command in a Vim script: >
+		Example, to find the "endif" command in a Vim script: >vim
 
-			:echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
+			echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
 			\ 'getline(".") =~ "^\\s*\""')
 
 <		The cursor must be at or after the "if" for which a match is
@@ -6636,15 +6804,15 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeo
 		catches comments at the start of a line, not after a command.
 		Also, a word "en" or "if" halfway through a line is considered
 		a match.
-		Another example, to search for the matching "{" of a "}": >
+		Another example, to search for the matching "{" of a "}": >vim
 
-			:echo searchpair('{', '', '}', 'bW')
+			echo searchpair('{', '', '}', 'bW')
 
 <		This works when the cursor is at or before the "}" for which a
 		match is to be found.  To reject matches that syntax
-		highlighting recognized as strings: >
+		highlighting recognized as strings: >vim
 
-			:echo searchpair('{', '', '}', 'bW',
+			echo searchpair('{', '', '}', 'bW',
 			     \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')
 <
 
@@ -6654,9 +6822,9 @@ searchpairpos({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {ti
 		column position of the match. The first element of the |List|
 		is the line number and the second element is the byte index of
 		the column position of the match.  If no match is found,
-		returns [0, 0]. >
+		returns [0, 0]. >vim
 
-			:let [lnum,col] = searchpairpos('{', '', '}', 'n')
+			let [lnum,col] = searchpairpos('{', '', '}', 'n')
 <
 		See |match-parens| for a bigger and more useful example.
 
@@ -6667,23 +6835,25 @@ searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		is the line number and the second element is the byte index of
 		the column position of the match. If no match is found,
 		returns [0, 0].
-		Example: >
-			:let [lnum, col] = searchpos('mypattern', 'n')
+		Example: >vim
+			let [lnum, col] = searchpos('mypattern', 'n')
 
 <		When the 'p' flag is given then there is an extra item with
-		the sub-pattern match number |search()-sub-match|.  Example: >
-			:let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
+		the sub-pattern match number |search()-sub-match|.  Example: >vim
+			let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
 <		In this example "submatch" is 2 when a lowercase letter is
 		found |/\l|, 3 when an uppercase letter is found |/\u|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetPattern()->searchpos()
+<
 
 serverlist()						*serverlist()*
 		Returns a list of server addresses, or empty if all servers
 		were stopped. |serverstart()| |serverstop()|
-		Example: >
-			:echo serverlist()
+		Example: >vim
+			echo serverlist()
+<
 
 serverstart([{address}])				*serverstart()*
 		Opens a socket or named pipe at {address} and listens for
@@ -6698,24 +6868,26 @@ serverstart([{address}])				*serverstart()*
 		  assigns a random port).
 		- Else {address} is the path to a named pipe (except on Windows).
 		  - If {address} has no slashes ("/") it is treated as the
-		    "name" part of a generated path in this format: >
+		    "name" part of a generated path in this format: >vim
 			stdpath("run").."/{name}.{pid}.{counter}"
-<		  - If {address} is omitted the name is "nvim". >
-			:echo serverstart()
+<		  - If {address} is omitted the name is "nvim". >vim
+			echo serverstart()
+<		 >
 			=> /tmp/nvim.bram/oknANW/nvim.15430.5
-
-<		Example bash command to list all Nvim servers: >
+<
+		Example bash command to list all Nvim servers: >bash
 			ls ${XDG_RUNTIME_DIR:-${TMPDIR}nvim.${USER}}/*/nvim.*.0
 
-<		Example named pipe: >
+<		Example named pipe: >vim
 			if has('win32')
 			  echo serverstart('\\.\pipe\nvim-pipe-1234')
 			else
 			  echo serverstart('nvim.sock')
 			endif
 <
-		Example TCP/IP address: >
+		Example TCP/IP address: >vim
 			echo serverstart('::1:12345')
+<
 
 serverstop({address})					*serverstop()*
 		Closes the pipe or socket at {address}.
@@ -6748,8 +6920,9 @@ setbufline({buf}, {lnum}, {text})			*setbufline()*
 		error message is given.
 
 		Can also be used as a |method|, the base is passed as the
-		third argument: >
+		third argument: >vim
 			GetText()->setbufline(buf, lnum)
+<
 
 setbufvar({buf}, {varname}, {val})			*setbufvar()*
 		Set option or local variable {varname} in buffer {buf} to
@@ -6760,13 +6933,13 @@ setbufvar({buf}, {varname}, {val})			*setbufvar()*
 		For the use of {buf}, see |bufname()| above.
 		The {varname} argument is a string.
 		Note that the variable name without "b:" must be used.
-		Examples: >
-			:call setbufvar(1, "&mod", 1)
-			:call setbufvar("todo", "myvar", "foobar")
+		Examples: >vim
+			call setbufvar(1, "&mod", 1)
+			call setbufvar("todo", "myvar", "foobar")
 <		This function is not available in the |sandbox|.
 
 		Can also be used as a |method|, the base is passed as the
-		third argument: >
+		third argument: >vim
 			GetValue()->setbufvar(buf, varname)
 <
 
@@ -6774,7 +6947,7 @@ setcellwidths({list})				*setcellwidths()*
 		Specify overrides for cell widths of character ranges.  This
 		tells Vim how wide characters are when displayed in the
 		terminal, counted in screen cells.  The values override
-		'ambiwidth'.  Example: >
+		'ambiwidth'.  Example: >vim
 		   call setcellwidths([
 				\ [0x111, 0x111, 1],
 				\ [0x2194, 0x2199, 2],
@@ -6795,7 +6968,7 @@ setcellwidths({list})				*setcellwidths()*
 		If the new value causes 'fillchars' or 'listchars' to become
 		invalid it is rejected and an error is given.
 
-		To clear the overrides pass an empty {list}: >
+		To clear the overrides pass an empty {list}: >vim
 		   call setcellwidths([])
 
 <		You can use the script $VIMRUNTIME/tools/emoji_list.vim to see
@@ -6809,14 +6982,15 @@ setcharpos({expr}, {list})				*setcharpos()*
 		character index instead of the byte index in the line.
 
 		Example:
-		With the text "여보세요" in line 8: >
+		With the text "여보세요" in line 8: >vim
 			call setcharpos('.', [0, 8, 4, 0])
-<		positions the cursor on the fourth character '요'. >
+<		positions the cursor on the fourth character '요'. >vim
 			call setpos('.', [0, 8, 4, 0])
 <		positions the cursor on the second character '보'.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetPosition()->setcharpos('.')
+<
 
 setcharsearch({dict})				*setcharsearch()*
 		Set the current character search information to {dict},
@@ -6832,14 +7006,15 @@ setcharsearch({dict})				*setcharsearch()*
 				character search
 
 		This can be useful to save/restore a user's character search
-		from a script: >
-			:let prevsearch = getcharsearch()
-			:" Perform a command which clobbers user's search
-			:call setcharsearch(prevsearch)
+		from a script: >vim
+			let prevsearch = getcharsearch()
+			" Perform a command which clobbers user's search
+			call setcharsearch(prevsearch)
 <		Also see |getcharsearch()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			SavedSearch()->setcharsearch()
+<
 
 setcmdline({str} [, {pos}])				*setcmdline()*
 		Set the command line to {str} and set the cursor position to
@@ -6848,8 +7023,9 @@ setcmdline({str} [, {pos}])				*setcmdline()*
 		Returns 0 when successful, 1 when not editing the command
 		line.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->setcmdline()
+<
 
 setcmdpos({pos})					*setcmdpos()*
 		Set the cursor position in the command line to byte position
@@ -6866,8 +7042,9 @@ setcmdpos({pos})					*setcmdpos()*
 		Returns 0 when successful, 1 when not editing the command
 		line.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetPos()->setcmdpos()
+<
 
 setcursorcharpos({lnum}, {col} [, {off}])
 setcursorcharpos({list})				*setcursorcharpos()*
@@ -6875,24 +7052,25 @@ setcursorcharpos({list})				*setcursorcharpos()*
 		character index instead of the byte index in the line.
 
 		Example:
-		With the text "여보세요" in line 4: >
+		With the text "여보세요" in line 4: >vim
 			call setcursorcharpos(4, 3)
-<		positions the cursor on the third character '세'. >
+<		positions the cursor on the third character '세'. >vim
 			call cursor(4, 3)
 <		positions the cursor on the first character '여'.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCursorPos()->setcursorcharpos()
+<
 
 setenv({name}, {val})					*setenv()*
-		Set environment variable {name} to {val}.  Example: >
+		Set environment variable {name} to {val}.  Example: >vim
 			call setenv('HOME', '/home/myhome')
 
 <		When {val} is |v:null| the environment variable is deleted.
 		See also |expr-env|.
 
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetPath()->setenv('PATH')
 <
 
@@ -6911,7 +7089,7 @@ setfperm({fname}, {mode})			*setfperm()* *chmod*
 
 		Returns non-zero for success, zero for failure.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFilename()->setfperm(mode)
 <
 		To read permissions see |getfperm()|.
@@ -6930,22 +7108,23 @@ setline({lnum}, {text})					*setline()*
 		If this succeeds, FALSE is returned.  If this fails (most likely
 		because {lnum} is invalid) TRUE is returned.
 
-		Example: >
-			:call setline(5, strftime("%c"))
+		Example: >vim
+			call setline(5, strftime("%c"))
 
 <		When {text} is a |List| then line {lnum} and following lines
-		will be set to the items in the list.  Example: >
-			:call setline(5, ['aaa', 'bbb', 'ccc'])
-<		This is equivalent to: >
-			:for [n, l] in [[5, 'aaa'], [6, 'bbb'], [7, 'ccc']]
-			:  call setline(n, l)
-			:endfor
+		will be set to the items in the list.  Example: >vim
+			call setline(5, ['aaa', 'bbb', 'ccc'])
+<		This is equivalent to: >vim
+			for [n, l] in [[5, 'aaa'], [6, 'bbb'], [7, 'ccc']]
+			  call setline(n, l)
+			endfor
 
 <		Note: The '[ and '] marks are not set.
 
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetText()->setline(lnum)
+<
 
 setloclist({nr}, {list} [, {action} [, {what}]])	*setloclist()*
 		Create or replace or add to the location list for window {nr}.
@@ -6964,8 +7143,9 @@ setloclist({nr}, {list} [, {action} [, {what}]])	*setloclist()*
 		for the list of supported keys in {what}.
 
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetLoclist()->setloclist(winnr)
+<
 
 setmatches({list} [, {win}])				*setmatches()*
 		Restores a list of matches saved by |getmatches()| for the
@@ -6975,7 +7155,7 @@ setmatches({list} [, {win}])				*setmatches()*
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMatches()->setmatches()
 <
 
@@ -7028,8 +7208,9 @@ setpos({expr}, {list})					*setpos()*
 		also set the preferred column.  Also see the "curswant" key in
 		|winrestview()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetPosition()->setpos('.')
+<
 
 setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		Create or replace or add to the quickfix list.
@@ -7084,8 +7265,8 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 
 		'r'	The items from the current quickfix list are replaced
 			with the items from {list}.  This can also be used to
-			clear the list: >
-				:call setqflist([], 'r')
+			clear the list: >vim
+				call setqflist([], 'r')
 <
 		'f'	All the quickfix lists in the quickfix stack are
 			freed.
@@ -7131,10 +7312,10 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		list is modified, "id" should be used instead of "nr" to
 		specify the list.
 
-		Examples (See also |setqflist-examples|): >
-		   :call setqflist([], 'r', {'title': 'My search'})
-		   :call setqflist([], 'r', {'nr': 2, 'title': 'Errors'})
-		   :call setqflist([], 'a', {'id':qfid, 'lines':["F1:10:L10"]})
+		Examples (See also |setqflist-examples|): >vim
+		   call setqflist([], 'r', {'title': 'My search'})
+		   call setqflist([], 'r', {'nr': 2, 'title': 'Errors'})
+		   call setqflist([], 'a', {'id':qfid, 'lines':["F1:10:L10"]})
 <
 		Returns zero for success, -1 for failure.
 
@@ -7143,7 +7324,7 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		`:cc 1` to jump to the first position.
 
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetErrorlist()->setqflist()
 <
 
@@ -7179,33 +7360,34 @@ setreg({regname}, {value} [, {options}])			*setreg()*
 		      set search and expression registers. Lists containing no
 		      items act like empty strings.
 
-		Examples: >
-			:call setreg(v:register, @*)
-			:call setreg('*', @%, 'ac')
-			:call setreg('a', "1\n2\n3", 'b5')
-			:call setreg('"', { 'points_to': 'a'})
+		Examples: >vim
+			call setreg(v:register, @*)
+			call setreg('*', @%, 'ac')
+			call setreg('a', "1\n2\n3", 'b5')
+			call setreg('"', { 'points_to': 'a'})
 
 <		This example shows using the functions to save and restore a
-		register: >
-			:let var_a = getreginfo()
-			:call setreg('a', var_a)
-<		or: >
-			:let var_a = getreg('a', 1, 1)
-			:let var_amode = getregtype('a')
-			    ....
-			:call setreg('a', var_a, var_amode)
+		register: >vim
+			let var_a = getreginfo()
+			call setreg('a', var_a)
+<		or: >vim
+			let var_a = getreg('a', 1, 1)
+			let var_amode = getregtype('a')
+			" ....
+			call setreg('a', var_a, var_amode)
 <		Note: you may not reliably restore register value
 		without using the third argument to |getreg()| as without it
 		newlines are represented as newlines AND Nul bytes are
 		represented as newlines as well, see |NL-used-for-Nul|.
 
 		You can also change the type of a register by appending
-		nothing: >
-			:call setreg('a', '', 'al')
+		nothing: >vim
+			call setreg('a', '', 'al')
 
 <		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetText()->setreg('a')
+<
 
 settabvar({tabnr}, {varname}, {val})			*settabvar()*
 		Set tab-local variable {varname} to {val} in tab page {tabnr}.
@@ -7216,8 +7398,9 @@ settabvar({tabnr}, {varname}, {val})			*settabvar()*
 		This function is not available in the |sandbox|.
 
 		Can also be used as a |method|, the base is passed as the
-		third argument: >
+		third argument: >vim
 			GetValue()->settabvar(tab, name)
+<
 
 settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
 		Set option or local variable {varname} in window {winnr} to
@@ -7230,14 +7413,15 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
 		doesn't work for a global or local buffer variable.
 		For a local buffer option the global value is unchanged.
 		Note that the variable name without "w:" must be used.
-		Examples: >
-			:call settabwinvar(1, 1, "&list", 0)
-			:call settabwinvar(3, 2, "myvar", "foobar")
+		Examples: >vim
+			call settabwinvar(1, 1, "&list", 0)
+			call settabwinvar(3, 2, "myvar", "foobar")
 <		This function is not available in the |sandbox|.
 
 		Can also be used as a |method|, the base is passed as the
-		fourth argument: >
+		fourth argument: >vim
 			GetValue()->settabwinvar(tab, winnr, name)
+<
 
 settagstack({nr}, {dict} [, {action}])		*settagstack()*
 		Modify the tag stack of the window {nr} using {dict}.
@@ -7263,35 +7447,38 @@ settagstack({nr}, {dict} [, {action}])		*settagstack()*
 		Returns zero for success, -1 for failure.
 
 		Examples (for more examples see |tagstack-examples|):
-		    Empty the tag stack of window 3: >
+		    Empty the tag stack of window 3: >vim
 			call settagstack(3, {'items' : []})
 
-<		    Save and restore the tag stack: >
+<		    Save and restore the tag stack: >vim
 			let stack = gettagstack(1003)
 			" do something else
 			call settagstack(1003, stack)
 			unlet stack
 <
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetStack()->settagstack(winnr)
+<
 
 setwinvar({nr}, {varname}, {val})			*setwinvar()*
 		Like |settabwinvar()| for the current tab page.
-		Examples: >
-			:call setwinvar(1, "&list", 0)
-			:call setwinvar(2, "myvar", "foobar")
+		Examples: >vim
+			call setwinvar(1, "&list", 0)
+			call setwinvar(2, "myvar", "foobar")
 
 <		Can also be used as a |method|, the base is passed as the
-		third argument: >
+		third argument: >vim
 			GetValue()->setwinvar(winnr, name)
+<
 
 sha256({string})						*sha256()*
 		Returns a String with 64 hex characters, which is the SHA256
 		checksum of {string}.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->sha256()
+<
 
 shellescape({string} [, {special}])			*shellescape()*
 		Escape {string} for use as a shell command argument.
@@ -7317,21 +7504,22 @@ shellescape({string} [, {special}])			*shellescape()*
 		be escaped because in fish it is used as an escape character
 		inside single quotes.
 
-		Example of use with a |:!| command: >
-		    :exe '!dir ' .. shellescape(expand('<cfile>'), 1)
+		Example of use with a |:!| command: >vim
+		    exe '!dir ' .. shellescape(expand('<cfile>'), 1)
 <		This results in a directory listing for the file under the
-		cursor.  Example of use with |system()|: >
-		    :call system("chmod +w -- " .. shellescape(expand("%")))
+		cursor.  Example of use with |system()|: >vim
+		    call system("chmod +w -- " .. shellescape(expand("%")))
 <		See also |::S|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetCommand()->shellescape()
+<
 
 shiftwidth([{col}])					*shiftwidth()*
 		Returns the effective value of 'shiftwidth'. This is the
 		'shiftwidth' value unless it is zero, in which case it is the
 		'tabstop' value.  To be backwards compatible in indent
-		plugins, use this: >
+		plugins, use this: >vim
 			if exists('*shiftwidth')
 			  func s:sw()
 			    return shiftwidth()
@@ -7348,10 +7536,9 @@ shiftwidth([{col}])					*shiftwidth()*
 		'vartabstop' feature. If no {col} argument is given, column 1
 		will be assumed.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetColumn()->shiftwidth()
-
-		sign_ functions are documented here: |sign-functions-details|
+<
 
 sign_define({name} [, {dict}])
 sign_define({list})					*sign_define()*
@@ -7387,7 +7574,7 @@ sign_define({list})					*sign_define()*
 		{list} is used, then returns a List of values one for each
 		defined sign.
 
-		Examples: >
+		Examples: >vim
 			call sign_define("mySign", {
 				\ "text" : "=>",
 				\ "texthl" : "Error",
@@ -7399,8 +7586,9 @@ sign_define({list})					*sign_define()*
 				\  'text' : '!!'}
 				\ ])
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetSignList()->sign_define()
+<
 
 sign_getdefined([{name}])				*sign_getdefined()*
 		Get a list of defined signs and their attributes.
@@ -7430,15 +7618,16 @@ sign_getdefined([{name}])				*sign_getdefined()*
 		Returns an empty List if there are no signs and when {name} is
 		not found.
 
-		Examples: >
+		Examples: >vim
 			" Get a list of all the defined signs
 			echo sign_getdefined()
 
 			" Get the attribute of the sign named mySign
 			echo sign_getdefined("mySign")
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetSignList()->sign_getdefined()
+<
 
 sign_getplaced([{buf} [, {dict}]])			*sign_getplaced()*
 		Return a list of signs placed in a buffer or all the buffers.
@@ -7479,7 +7668,7 @@ sign_getplaced([{buf} [, {dict}]])			*sign_getplaced()*
 		Returns an empty list on failure or if there are no placed
 		signs.
 
-		Examples: >
+		Examples: >vim
 			" Get a List of signs placed in eval.c in the
 			" global group
 			echo sign_getplaced("eval.c")
@@ -7500,7 +7689,7 @@ sign_getplaced([{buf} [, {dict}]])			*sign_getplaced()*
 			" Get a List of all the placed signs
 			echo sign_getplaced()
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBufname()->sign_getplaced()
 <
 
@@ -7515,11 +7704,11 @@ sign_jump({id}, {group}, {buf})				*sign_jump()*
 		Returns the line number of the sign. Returns -1 if the
 		arguments are invalid.
 
-		Example: >
+		Example: >vim
 			" Jump to sign 10 in the current buffer
 			call sign_jump(10, '', '')
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetSignid()->sign_jump()
 <
 
@@ -7552,7 +7741,7 @@ sign_place({id}, {group}, {name}, {buf} [, {dict}])	*sign_place()*
 
 		Returns the sign identifier on success and -1 on failure.
 
-		Examples: >
+		Examples: >vim
 			" Place a sign named sign1 with id 5 at line 20 in
 			" buffer json.c
 			call sign_place(5, '', 'sign1', 'json.c',
@@ -7571,7 +7760,7 @@ sign_place({id}, {group}, {name}, {buf} [, {dict}])	*sign_place()*
 			call sign_place(10, 'g3', 'sign4', 'json.c',
 					\ {'lnum' : 40, 'priority' : 90})
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetSignid()->sign_place(group, name, expr)
 <
 
@@ -7608,7 +7797,7 @@ sign_placelist({list})				*sign_placelist()*
 		Returns a List of sign identifiers. If failed to place a
 		sign, the corresponding list item is set to -1.
 
-		Examples: >
+		Examples: >vim
 			" Place sign s1 with id 5 at line 20 and id 10 at line
 			" 30 in buffer a.c
 			let [n1, n2] = sign_placelist([
@@ -7633,8 +7822,9 @@ sign_placelist({list})				*sign_placelist()*
 				\  'lnum' : 50}
 				\ ])
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetSignlist()->sign_placelist()
+<
 
 sign_undefine([{name}])
 sign_undefine({list})				*sign_undefine()*
@@ -7649,7 +7839,7 @@ sign_undefine({list})				*sign_undefine()*
 		{list} call, returns a list of values one for each undefined
 		sign.
 
-		Examples: >
+		Examples: >vim
 			" Delete a sign named mySign
 			call sign_undefine("mySign")
 
@@ -7659,8 +7849,9 @@ sign_undefine({list})				*sign_undefine()*
 			" Delete all the signs
 			call sign_undefine()
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetSignlist()->sign_undefine()
+<
 
 sign_unplace({group} [, {dict}])			*sign_unplace()*
 		Remove a previously placed sign in one or more buffers.  This
@@ -7679,7 +7870,7 @@ sign_unplace({group} [, {dict}])			*sign_unplace()*
 
 		Returns 0 on success and -1 on failure.
 
-		Examples: >
+		Examples: >vim
 			" Remove sign 10 from buffer a.vim
 			call sign_unplace('', {'buffer' : "a.vim", 'id' : 10})
 
@@ -7704,7 +7895,7 @@ sign_unplace({group} [, {dict}])			*sign_unplace()*
 			" Remove all the placed signs from all the buffers
 			call sign_unplace('*')
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetSigngroup()->sign_unplace()
 <
 
@@ -7728,7 +7919,7 @@ sign_unplacelist({list})				*sign_unplacelist()*
 		Returns a List where an entry is set to 0 if the corresponding
 		sign was successfully removed or -1 on failure.
 
-		Example: >
+		Example: >vim
 			" Remove sign with id 10 from buffer a.vim and sign
 			" with id 20 from buffer b.vim
 			call sign_unplacelist([
@@ -7736,7 +7927,7 @@ sign_unplacelist({list})				*sign_unplacelist()*
 				\ {'id' : 20, 'buffer' : 'b.vim'},
 				\ ])
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetSignlist()->sign_unplacelist()
 <
 
@@ -7749,7 +7940,7 @@ simplify({filename})					*simplify()*
 		not removed either. On Unix "//path" is unchanged, but
 		"///path" is simplified to "/path" (this follows the Posix
 		standard).
-		Example: >
+		Example: >vim
 			simplify("./dir/.././/file/") == "./file/"
 <		Note: The combination "dir/.." is only removed if "dir" is
 		a searchable directory or does not exist.  On Unix, it is also
@@ -7757,35 +7948,38 @@ simplify({filename})					*simplify()*
 		directory.  In order to resolve all the involved symbolic
 		links before simplifying the path name, use |resolve()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetName()->simplify()
+<
 
 sin({expr})							*sin()*
 		Return the sine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo sin(100)
-<			-0.506366 >
-			:echo sin(-4.01)
+		Examples: >vim
+			echo sin(100)
+<			-0.506366 >vim
+			echo sin(-4.01)
 <			0.763301
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->sin()
+<
 
 sinh({expr})							*sinh()*
 		Return the hyperbolic sine of {expr} as a |Float| in the range
 		[-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo sinh(0.5)
-<			0.521095 >
-			:echo sinh(-0.9)
+		Examples: >vim
+			echo sinh(0.5)
+<			0.521095 >vim
+			echo sinh(-0.9)
 <			-1.026517
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->sinh()
+<
 
 slice({expr}, {start} [, {end}])				*slice()*
 		Similar to using a |slice| "expr[start : end]", but "end" is
@@ -7796,7 +7990,7 @@ slice({expr}, {start} [, {end}])				*slice()*
 		When {end} is -1 the last item is omitted.
 		Returns an empty value if {start} or {end} are invalid.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetList()->slice(offset)
 <
 
@@ -7828,8 +8022,8 @@ sockconnect({mode}, {address} [, {opts}])		*sockconnect()*
 sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 		Sort the items in {list} in-place.  Returns {list}.
 
-		If you want a list to remain unmodified make a copy first: >
-			:let sortedlist = sort(copy(mylist))
+		If you want a list to remain unmodified make a copy first: >vim
+			let sortedlist = sort(copy(mylist))
 
 <		When {func} is omitted, is empty or zero, then sort() uses the
 		string representation of each item to sort on.  Numbers sort
@@ -7844,15 +8038,15 @@ sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 		is used to compare strings. See |:language| check or set the
 		collation locale. |v:collate| can also be used to check the
 		current locale. Sorting using the locale typically ignores
-		case. Example: >
+		case. Example: >vim
 			" ö is sorted similarly to o with English locale.
-			:language collate en_US.UTF8
-			:echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+			language collate en_US.UTF8
+			echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
 <			['n', 'o', 'O', 'ö', 'p', 'z'] ~
-		>
+		>vim
 			" ö is sorted after z with Swedish locale.
-			:language collate sv_SE.UTF8
-			:echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+			language collate sv_SE.UTF8
+			echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
 <			['n', 'o', 'O', 'p', 'z', 'ö'] ~
 		This does not work properly on Mac.
 
@@ -7882,22 +8076,22 @@ sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 		on numbers, text strings will sort next to each other, in the
 		same order as they were originally.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->sort()
 
 <		Also see |uniq()|.
 
-		Example: >
+		Example: >vim
 			func MyCompare(i1, i2)
 			   return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
 			endfunc
 			eval mylist->sort("MyCompare")
 <		A shorter compare version for this specific simple case, which
-		ignores overflow: >
+		ignores overflow: >vim
 			func MyCompare(i1, i2)
 			   return a:i1 - a:i2
 			endfunc
-<		For a simple expression you can use a lambda: >
+<		For a simple expression you can use a lambda: >vim
 			eval mylist->sort({i1, i2 -> i1 - i2})
 <
 
@@ -7909,7 +8103,7 @@ soundfold({word})					*soundfold()*
 		This can be used for making spelling suggestions.  Note that
 		the method can be quite slow.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWord()->soundfold()
 <
 
@@ -7930,14 +8124,14 @@ spellbadword([{sentence}])				*spellbadword()*
 			"rare"		rare word
 			"local"		word only valid in another region
 			"caps"		word should start with Capital
-		Example: >
+		Example: >vim
 			echo spellbadword("the quik brown fox")
 <			['quik', 'bad'] ~
 
 		The spelling information for the current window and the value
 		of 'spelllang' are used.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->spellbadword()
 <
 
@@ -7962,8 +8156,9 @@ spellsuggest({word} [, {max} [, {capital}]])		*spellsuggest()*
 		The spelling information for the current window is used.  The
 		values of 'spelllang' and 'spellsuggest' are used.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWord()->spellsuggest()
+<
 
 split({string} [, {pattern} [, {keepempty}]])		*split()*
 		Make a |List| out of {string}.  When {pattern} is omitted or
@@ -7976,20 +8171,23 @@ split({string} [, {pattern} [, {keepempty}]])		*split()*
 		{keepempty} argument is given and it's non-zero.
 		Other empty items are kept when {pattern} matches at least one
 		character or when {keepempty} is non-zero.
-		Example: >
-			:let words = split(getline('.'), '\W\+')
-<		To split a string in individual characters: >
-			:for c in split(mystring, '\zs')
+		Example: >vim
+			let words = split(getline('.'), '\W\+')
+<		To split a string in individual characters: >vim
+			for c in split(mystring, '\zs') | endfor
 <		If you want to keep the separator you can also use '\zs' at
-		the end of the pattern: >
-			:echo split('abc:def:ghi', ':\zs')
-<			['abc:', 'def:', 'ghi'] ~
-		Splitting a table where the first element can be empty: >
-			:let items = split(line, ':', 1)
+		the end of the pattern: >vim
+			echo split('abc:def:ghi', ':\zs')
+<		 >
+			['abc:', 'def:', 'ghi']
+<
+		Splitting a table where the first element can be empty: >vim
+			let items = split(line, ':', 1)
 <		The opposite function is |join()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetString()->split()
+<
 
 sqrt({expr})							*sqrt()*
 		Return the non-negative square root of Float {expr} as a
@@ -7997,15 +8195,16 @@ sqrt({expr})							*sqrt()*
 		{expr} must evaluate to a |Float| or a |Number|.  When {expr}
 		is negative the result is NaN (Not a Number).  Returns 0.0 if
 		{expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo sqrt(100)
-<			10.0 >
-			:echo sqrt(-4.01)
+		Examples: >vim
+			echo sqrt(100)
+<			10.0 >vim
+			echo sqrt(-4.01)
 <			str2float("nan")
 		NaN may be different, it depends on system libraries.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->sqrt()
+<
 
 srand([{expr}])						*srand()*
 		Initialize seed used by |rand()|:
@@ -8016,13 +8215,14 @@ srand([{expr}])						*srand()*
 		  initialize the seed values.  This is useful for testing or
 		  when a predictable sequence is intended.
 
-		Examples: >
-			:let seed = srand()
-			:let seed = srand(userinput)
-			:echo rand(seed)
+		Examples: >vim
+			let seed = srand()
+			let seed = srand(userinput)
+			echo rand(seed)
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			userinput->srand()
+<
 
 stdioopen({opts})					*stdioopen()*
 		With |--headless| this opens stdin and stdout as a |channel|.
@@ -8063,8 +8263,8 @@ stdpath({what})					*stdpath()* *E6100*
 		state        String  Session state directory: storage for file
 				     drafts, swap, undo, |shada|.
 
-		Example: >
-			:echo stdpath("config")
+		Example: >vim
+			echo stdpath("config")
 <
 
 str2float({string} [, {quoted}])			*str2float()*
@@ -8081,28 +8281,30 @@ str2float({string} [, {quoted}])			*str2float()*
 		The decimal point is always '.', no matter what the locale is
 		set to.  A comma ends the number: "12,345.67" is converted to
 		12.0.  You can strip out thousands separators with
-		|substitute()|: >
+		|substitute()|: >vim
 			let f = str2float(substitute(text, ',', '', 'g'))
 <
 		Returns 0.0 if the conversion fails.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			let f = text->substitute(',', '', 'g')->str2float()
+<
 
 str2list({string} [, {utf8}])				*str2list()*
 		Return a list containing the number values which represent
-		each character in String {string}.  Examples: >
-			str2list(" ")		returns [32]
-			str2list("ABC")		returns [65, 66, 67]
+		each character in String {string}.  Examples: >vim
+			echo str2list(" ")		" returns [32]
+			echo str2list("ABC")		" returns [65, 66, 67]
 <		|list2str()| does the opposite.
 
 		UTF-8 encoding is always used, {utf8} option has no effect,
 		and exists only for backwards-compatibility.
-		With UTF-8 composing characters are handled properly: >
-			str2list("á")		returns [97, 769]
+		With UTF-8 composing characters are handled properly: >vim
+			echo str2list("á")		" returns [97, 769]
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetString()->str2list()
+<
 
 str2nr({string} [, {base}])				*str2nr()*
 		Convert string {string} to a number.
@@ -8112,7 +8314,7 @@ str2nr({string} [, {base}])				*str2nr()*
 
 		When {base} is omitted base 10 is used.  This also means that
 		a leading zero doesn't cause octal conversion to be used, as
-		with the default String to Number conversion.  Example: >
+		with the default String to Number conversion.  Example: >vim
 			let nr = str2nr('0123')
 <
 		When {base} is 16 a leading "0x" or "0X" is ignored.  With a
@@ -8123,7 +8325,7 @@ str2nr({string} [, {base}])				*str2nr()*
 
 		Returns 0 if {string} is empty or on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->str2nr()
 <
 
@@ -8137,7 +8339,7 @@ strcharlen({string})					*strcharlen()*
 
 		Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->strcharlen()
 <
 
@@ -8150,13 +8352,13 @@ strcharpart({src}, {start} [, {len} [, {skipcc}]])	*strcharpart()*
 		similar to  |slice()|.
 		When a character index is used where a character does not
 		exist it is omitted and counted as one character.  For
-		example: >
-			strcharpart('abc', -1, 2)
+		example: >vim
+			echo strcharpart('abc', -1, 2)
 <		results in 'a'.
 
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->strcharpart(5)
 <
 
@@ -8173,7 +8375,7 @@ strchars({string} [, {skipcc}])				*strchars()*
 		Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 
 		{skipcc} is only available after 7.4.755.  For backward
-		compatibility, you can define a wrapper function: >
+		compatibility, you can define a wrapper function: >vim
 		    if has("patch-7.4.755")
 		      function s:strchars(str, skipcc)
 			return strchars(a:str, a:skipcc)
@@ -8188,8 +8390,9 @@ strchars({string} [, {skipcc}])				*strchars()*
 		      endfunction
 		    endif
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->strchars()
+<
 
 strdisplaywidth({string} [, {col}])		*strdisplaywidth()*
 		The result is a Number, which is the number of display cells
@@ -8205,8 +8408,9 @@ strdisplaywidth({string} [, {col}])		*strdisplaywidth()*
 		Returns zero on error.
 		Also see |strlen()|, |strwidth()| and |strchars()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->strdisplaywidth()
+<
 
 strftime({format} [, {time}])				*strftime()*
 		The result is a String, which is a formatted date and time, as
@@ -8217,16 +8421,17 @@ strftime({format} [, {time}])				*strftime()*
 		format.  The maximum length of the result is 80 characters.
 		See also |localtime()|, |getftime()| and |strptime()|.
 		The language can be changed with the |:language| command.
-		Examples: >
-		  :echo strftime("%c")		   Sun Apr 27 11:49:23 1997
-		  :echo strftime("%Y %b %d %X")	   1997 Apr 27 11:53:25
-		  :echo strftime("%y%m%d %T")	   970427 11:53:55
-		  :echo strftime("%H:%M")	   11:55
-		  :echo strftime("%c", getftime("file.c"))
-						   Show mod time of file.c.
-
-<		Can also be used as a |method|: >
+		Examples: >vim
+		  echo strftime("%c")		   " Sun Apr 27 11:49:23 1997
+		  echo strftime("%Y %b %d %X")	   " 1997 Apr 27 11:53:25
+		  echo strftime("%y%m%d %T")	   " 970427 11:53:55
+		  echo strftime("%H:%M")	           " 11:55
+		  echo strftime("%c", getftime("file.c"))
+						   " Show mod time of file.c.
+
+<		Can also be used as a |method|: >vim
 			GetFormat()->strftime()
+<
 
 strgetchar({str}, {index})				*strgetchar()*
 		Get a Number corresponding to the character at {index} in
@@ -8237,29 +8442,30 @@ strgetchar({str}, {index})				*strgetchar()*
 		Returns -1 if {index} is invalid.
 		Also see |strcharpart()| and |strchars()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->strgetchar(5)
+<
 
 stridx({haystack}, {needle} [, {start}])			*stridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the first occurrence of the String {needle}.
 		If {start} is specified, the search starts at index {start}.
-		This can be used to find a second match: >
-			:let colon1 = stridx(line, ":")
-			:let colon2 = stridx(line, ":", colon1 + 1)
+		This can be used to find a second match: >vim
+			let colon1 = stridx(line, ":")
+			let colon2 = stridx(line, ":", colon1 + 1)
 <		The search is done case-sensitive.
 		For pattern searches use |match()|.
 		-1 is returned if the {needle} does not occur in {haystack}.
 		See also |strridx()|.
-		Examples: >
-		  :echo stridx("An Example", "Example")	     3
-		  :echo stridx("Starting point", "Start")    0
-		  :echo stridx("Starting point", "start")   -1
+		Examples: >vim
+		  echo stridx("An Example", "Example")	     " 3
+		  echo stridx("Starting point", "Start")    " 0
+		  echo stridx("Starting point", "start")   " -1
 <						*strstr()* *strchr()*
 		stridx() works similar to the C function strstr().  When used
 		with a single character it works similar to strchr().
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetHaystack()->stridx(needle)
 <
 
@@ -8287,8 +8493,9 @@ string({expr})						*string()*
 		method, use |msgpackdump()| or |json_encode()| if you need to
 		share data with other application.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->string()
+<
 
 strlen({string})						*strlen()*
 		The result is a Number, which is the length of the String
@@ -8299,8 +8506,9 @@ strlen({string})						*strlen()*
 		|strchars()|.
 		Also see |len()|, |strdisplaywidth()| and |strwidth()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetString()->strlen()
+<
 
 strpart({src}, {start} [, {len} [, {chars}]])		*strpart()*
 		The result is a String, which is part of {src}, starting from
@@ -8315,20 +8523,21 @@ strpart({src}, {start} [, {len} [, {chars}]])		*strpart()*
 		When bytes are selected which do not exist, this doesn't
 		result in an error, the bytes are simply omitted.
 		If {len} is missing, the copy continues from {start} till the
-		end of the {src}. >
-			strpart("abcdefg", 3, 2)    == "de"
-			strpart("abcdefg", -2, 4)   == "ab"
-			strpart("abcdefg", 5, 4)    == "fg"
-			strpart("abcdefg", 3)	    == "defg"
+		end of the {src}. >vim
+			echo strpart("abcdefg", 3, 2)    " returns 'de'
+			echo strpart("abcdefg", -2, 4)   " returns 'ab'
+			echo strpart("abcdefg", 5, 4)    " returns 'fg'
+			echo strpart("abcdefg", 3)	 " returns 'defg'
 
 <		Note: To get the first character, {start} must be 0.  For
-		example, to get the character under the cursor: >
+		example, to get the character under the cursor: >vim
 			strpart(getline("."), col(".") - 1, 1, v:true)
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->strpart(5)
+<
 
 strptime({format}, {timestring})				*strptime()*
 		The result is a Number, which is a unix timestamp representing
@@ -8346,15 +8555,15 @@ strptime({format}, {timestring})				*strptime()*
 		result.
 
 		See also |strftime()|.
-		Examples: >
-		  :echo strptime("%Y %b %d %X", "1997 Apr 27 11:49:23")
-<		  862156163 >
-		  :echo strftime("%c", strptime("%y%m%d %T", "970427 11:53:55"))
-<		  Sun Apr 27 11:53:55 1997 >
-		  :echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
+		Examples: >vim
+		  echo strptime("%Y %b %d %X", "1997 Apr 27 11:49:23")
+<		  862156163 >vim
+		  echo strftime("%c", strptime("%y%m%d %T", "970427 11:53:55"))
+<		  Sun Apr 27 11:53:55 1997 >vim
+		  echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
 <		  Sun Apr 27 12:53:55 1997
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFormat()->strptime(timestring)
 <
 
@@ -8363,34 +8572,36 @@ strridx({haystack}, {needle} [, {start}])			*strridx()*
 		{haystack} of the last occurrence of the String {needle}.
 		When {start} is specified, matches beyond this index are
 		ignored.  This can be used to find a match before a previous
-		match: >
-			:let lastcomma = strridx(line, ",")
-			:let comma2 = strridx(line, ",", lastcomma - 1)
+		match: >vim
+			let lastcomma = strridx(line, ",")
+			let comma2 = strridx(line, ",", lastcomma - 1)
 <		The search is done case-sensitive.
 		For pattern searches use |match()|.
 		-1 is returned if the {needle} does not occur in {haystack}.
 		If the {needle} is empty the length of {haystack} is returned.
-		See also |stridx()|.  Examples: >
-		  :echo strridx("an angry armadillo", "an")	     3
+		See also |stridx()|.  Examples: >vim
+		  echo strridx("an angry armadillo", "an")	     3
 <							*strrchr()*
 		When used with a single character it works similar to the C
 		function strrchr().
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetHaystack()->strridx(needle)
+<
 
 strtrans({string})					*strtrans()*
 		The result is a String, which is {string} with all unprintable
 		characters translated into printable characters |'isprint'|.
-		Like they are shown in a window.  Example: >
+		Like they are shown in a window.  Example: >vim
 			echo strtrans(@a)
 <		This displays a newline in register a as "^@" instead of
 		starting a new line.
 
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetString()->strtrans()
+<
 
 strutf16len({string} [, {countcc}])			*strutf16len()*
 		The result is a Number, which is the number of UTF-16 code
@@ -8404,14 +8615,14 @@ strutf16len({string} [, {countcc}])			*strutf16len()*
 		Returns zero on error.
 
 		Also see |strlen()| and |strcharlen()|.
-		Examples: >
-		    echo strutf16len('a')		returns 1
-		    echo strutf16len('©')		returns 1
-		    echo strutf16len('😊')		returns 2
-		    echo strutf16len('ą́')		returns 1
-		    echo strutf16len('ą́', v:true)	returns 3
-
-		Can also be used as a |method|: >
+		Examples: >vim
+		    echo strutf16len('a')		" returns 1
+		    echo strutf16len('©')		" returns 1
+		    echo strutf16len('😊')		" returns 2
+		    echo strutf16len('ą́')		" returns 1
+		    echo strutf16len('ą́', v:true)	" returns 3
+
+		Can also be used as a |method|: >vim
 			GetText()->strutf16len()
 <
 
@@ -8424,8 +8635,9 @@ strwidth({string})					*strwidth()*
 		Returns zero on error.
 		Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetString()->strwidth()
+<
 
 submatch({nr} [, {list}])				*submatch()* *E935*
 		Only for an expression in a |:substitute| command or
@@ -8449,14 +8661,15 @@ submatch({nr} [, {list}])				*submatch()* *E935*
 
 		Returns an empty string or list on error.
 
-		Examples: >
-			:s/\d\+/\=submatch(0) + 1/
-			:echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
+		Examples: >vim
+			s/\d\+/\=submatch(0) + 1/
+			echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
 <		This finds the first number in the line and adds one to it.
 		A line break is included as a newline character.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetNr()->submatch()
+<
 
 substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 		The result is a String, which is a copy of {string}, in which
@@ -8480,36 +8693,37 @@ substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 		When {pat} does not match in {string}, {string} is returned
 		unmodified.
 
-		Example: >
-			:let &path = substitute(&path, ",\\=[^,]*$", "", "")
-<		This removes the last component of the 'path' option. >
-			:echo substitute("testing", ".*", "\\U\\0", "")
+		Example: >vim
+			let &path = substitute(&path, ",\\=[^,]*$", "", "")
+<		This removes the last component of the 'path' option. >vim
+			echo substitute("testing", ".*", "\\U\\0", "")
 <		results in "TESTING".
 
 		When {sub} starts with "\=", the remainder is interpreted as
-		an expression. See |sub-replace-expression|.  Example: >
-			:echo substitute(s, '%\(\x\x\)',
+		an expression. See |sub-replace-expression|.  Example: >vim
+			echo substitute(s, '%\(\x\x\)',
 			   \ '\=nr2char("0x" .. submatch(1))', 'g')
 
 <		When {sub} is a Funcref that function is called, with one
-		optional argument.  Example: >
-		   :echo substitute(s, '%\(\x\x\)', SubNr, 'g')
+		optional argument.  Example: >vim
+		   echo substitute(s, '%\(\x\x\)', SubNr, 'g')
 <		The optional argument is a list which contains the whole
 		matched string and up to nine submatches, like what
-		|submatch()| returns.  Example: >
-		   :echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
+		|submatch()| returns.  Example: >vim
+		   echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
 
 <		Returns an empty string on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetString()->substitute(pat, sub, flags)
+<
 
 swapfilelist()					*swapfilelist()*
 		Returns a list of swap file names, like what "vim -r" shows.
 		See the |-r| command argument.  The 'directory' option is used
 		for the directories to inspect.  If you only want to get a
 		list of swap files in the current directory then temporarily
-		set 'directory' to a dot: >
+		set 'directory' to a dot: >vim
 			let save_dir = &directory
 			let &directory = '.'
 			let swapfiles = swapfilelist()
@@ -8533,8 +8747,9 @@ swapinfo({fname})					*swapinfo()*
 			Not a swap file: does not contain correct block ID
 			Magic number mismatch: Info in first block is invalid
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFilename()->swapinfo()
+<
 
 swapname({buf})						*swapname()*
 		The result is the swap file path of the buffer {buf}.
@@ -8543,8 +8758,9 @@ swapname({buf})						*swapname()*
 		|:swapname| (unless there is no swap file).
 		If buffer {buf} has no swap file, returns an empty string.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBufname()->swapname()
+<
 
 synID({lnum}, {col}, {trans})				*synID()*
 		The result is a Number, which is the syntax ID at the position
@@ -8568,8 +8784,8 @@ synID({lnum}, {col}, {trans})				*synID()*
 
 		Returns zero on error.
 
-		Example (echoes the name of the syntax item under the cursor): >
-			:echo synIDattr(synID(line("."), col("."), 1), "name")
+		Example (echoes the name of the syntax item under the cursor): >vim
+			echo synIDattr(synID(line("."), col("."), 1), "name")
 <
 
 synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
@@ -8611,11 +8827,12 @@ synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
 		Returns an empty string on error.
 
 		Example (echoes the color of the syntax item under the
-		cursor): >
-			:echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
+		cursor): >vim
+			echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
+<
+		Can also be used as a |method|: >vim
+			echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 <
-		Can also be used as a |method|: >
-			:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 
 synIDtrans({synID})					*synIDtrans()*
 		The result is a Number, which is the translated syntax ID of
@@ -8625,8 +8842,9 @@ synIDtrans({synID})					*synIDtrans()*
 
 		Returns zero on error.
 
-		Can also be used as a |method|: >
-			:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
+		Can also be used as a |method|: >vim
+			echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
+<
 
 synconcealed({lnum}, {col})				*synconcealed()*
 		The result is a |List| with currently three items:
@@ -8664,7 +8882,7 @@ synstack({lnum}, {col})					*synstack()*
 		returns, unless not the whole item is highlighted or it is a
 		transparent item.
 		This function is useful for debugging a syntax file.
-		Example that shows the syntax stack under the cursor: >
+		Example that shows the syntax stack under the cursor: >vim
 			for id in synstack(line("."), col("."))
 			   echo synIDattr(id, "name")
 			endfor
@@ -8680,8 +8898,8 @@ system({cmd} [, {input}])				*system()* *E677*
 		a |List|) and sets |v:shell_error| to the error code.
 		{cmd} is treated as in |jobstart()|:
 		If {cmd} is a List it runs directly (no 'shell').
-		If {cmd} is a String it runs in the 'shell', like this: >
-		  :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+		If {cmd} is a String it runs in the 'shell', like this: >vim
+		  call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
 
 <		Not to be used for interactive commands.
 
@@ -8689,8 +8907,8 @@ system({cmd} [, {input}])				*system()* *E677*
 		- <CR><NL> is replaced with <NL>
 		- NUL characters are replaced with SOH (0x01)
 
-		Example: >
-		    :echo system(['ls', expand('%:h')])
+		Example: >vim
+		    echo system(['ls', expand('%:h')])
 
 <		If {input} is a string it is written to a pipe and passed as
 		stdin to the command.  The string is written as-is, line
@@ -8704,8 +8922,8 @@ system({cmd} [, {input}])				*system()* *E677*
 		terminated by NL (and NUL where the text has NL).
 								*E5677*
 		Note: system() cannot write to or read from backgrounded ("&")
-		shell commands, e.g.: >
-		    :echo system("cat - &", "foo")
+		shell commands, e.g.: >vim
+		    echo system("cat - &", "foo")
 <		which is equivalent to: >
 		    $ echo foo | bash -c 'cat - &'
 <		The pipes are disconnected (unless overridden by shell
@@ -8715,15 +8933,16 @@ system({cmd} [, {input}])				*system()* *E677*
 		Note: Use |shellescape()| or |::S| with |expand()| or
 		|fnamemodify()| to escape special characters in a command
 		argument. 'shellquote' and 'shellxquote' must be properly
-		configured. Example: >
-		    :echo system('ls '..shellescape(expand('%:h')))
-		    :echo system('ls '..expand('%:h:S'))
+		configured. Example: >vim
+		    echo system('ls '..shellescape(expand('%:h')))
+		    echo system('ls '..expand('%:h:S'))
 
 <		Unlike ":!cmd" there is no automatic check for changed files.
 		Use |:checktime| to force a check.
 
-		Can also be used as a |method|: >
-			:echo GetCmd()->system()
+		Can also be used as a |method|: >vim
+			echo GetCmd()->system()
+<
 
 systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
 		Same as |system()|, but returns a |List| with lines (parts of
@@ -8734,13 +8953,14 @@ systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
 		Note that on MS-Windows you may get trailing CR characters.
 
 		To see the difference between "echo hello" and "echo -n hello"
-		use |system()| and |split()|: >
+		use |system()| and |split()|: >vim
 			echo split(system('echo hello'), '\n', 1)
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			:echo GetCmd()->systemlist()
+		Can also be used as a |method|: >vim
+			echo GetCmd()->systemlist()
+<
 
 tabpagebuflist([{arg}])				*tabpagebuflist()*
 		The result is a |List|, where each item is the number of the
@@ -8748,15 +8968,16 @@ tabpagebuflist([{arg}])				*tabpagebuflist()*
 		{arg} specifies the number of the tab page to be used. When
 		omitted the current tab page is used.
 		When {arg} is invalid the number zero is returned.
-		To get a list of all buffers in all tabs use this: >
+		To get a list of all buffers in all tabs use this: >vim
 			let buflist = []
 			for i in range(tabpagenr('$'))
 			   call extend(buflist, tabpagebuflist(i + 1))
 			endfor
 <		Note that a buffer may appear in more than one window.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTabpage()->tabpagebuflist()
+<
 
 tabpagenr([{arg}])					*tabpagenr()*
 		The result is a Number, which is the number of the current
@@ -8780,12 +9001,12 @@ tabpagewinnr({tabarg} [, {arg}])			*tabpagewinnr()*
 		  the window which will be used when going to this tab page.
 		- When "$" the number of windows is returned.
 		- When "#" the previous window nr is returned.
-		Useful examples: >
+		Useful examples: >vim
 		    tabpagewinnr(1)	    " current window of tab page 1
 		    tabpagewinnr(4, '$')    " number of windows in tab page 4
 <		When {tabarg} is invalid zero is returned.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTabpage()->tabpagewinnr()
 <
 
@@ -8836,7 +9057,7 @@ taglist({expr} [, {filename}])				*taglist()*
 		located by Vim. Refer to |tags-file-format| for the format of
 		the tags file generated by the different ctags tools.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTagpattern()->taglist()
 
 tan({expr})							*tan()*
@@ -8844,36 +9065,38 @@ tan({expr})							*tan()*
 		in the range [-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo tan(10)
-<			0.648361 >
-			:echo tan(-4.01)
+		Examples: >vim
+			echo tan(10)
+<			0.648361 >vim
+			echo tan(-4.01)
 <			-1.181502
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->tan()
+<
 
 tanh({expr})							*tanh()*
 		Return the hyperbolic tangent of {expr} as a |Float| in the
 		range [-1, 1].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo tanh(0.5)
-<			0.462117 >
-			:echo tanh(-1)
+		Examples: >vim
+			echo tanh(0.5)
+<			0.462117 >vim
+			echo tanh(-1)
 <			-0.761594
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->tanh()
 <
 
 tempname()						*tempname()*
 		Generates a (non-existent) filename located in the Nvim root
 		|tempdir|. Scripts can use the filename as a temporary file.
-		Example: >
-			:let tmpfile = tempname()
-			:exe "redir > " .. tmpfile
+		Example: >vim
+			let tmpfile = tempname()
+			exe "redir > " .. tmpfile
+<
 
 termopen({cmd} [, {opts}])				*termopen()*
 		Spawns {cmd} in a new pseudo-terminal session connected
@@ -8905,7 +9128,7 @@ timer_info([{id}])					*timer_info()*
 				    -1 means forever
 		    "callback"	    the callback
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTimer()->timer_info()
 <
 
@@ -8922,7 +9145,7 @@ timer_pause({timer}, {paused})			*timer_pause()*
 		String, then the timer is paused, otherwise it is unpaused.
 		See |non-zero-arg|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTimer()->timer_pause(1)
 <
 
@@ -8948,7 +9171,7 @@ timer_start({time}, {callback} [, {options}])	*timer_start()* *timer*
 
 		Returns -1 on error.
 
-		Example: >
+		Example: >vim
 			func MyHandler(timer)
 			  echo 'Handler called'
 			endfunc
@@ -8956,7 +9179,7 @@ timer_start({time}, {callback} [, {options}])	*timer_start()* *timer*
 				\ {'repeat': 3})
 <		This invokes MyHandler() three times at 500 msec intervals.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetMsec()->timer_start(callback)
 
 <		Not available in the |sandbox|.
@@ -8966,7 +9189,7 @@ timer_stop({timer})					*timer_stop()*
 		{timer} is an ID returned by timer_start(), thus it must be a
 		Number.  If {timer} does not exist there is no error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTimer()->timer_stop()
 <
 
@@ -8980,16 +9203,18 @@ tolower({expr})						*tolower()*
 		characters turned into lowercase (just like applying |gu| to
 		the string).  Returns an empty string on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->tolower()
+<
 
 toupper({expr})						*toupper()*
 		The result is a copy of the String given, with all lowercase
 		characters turned into uppercase (just like applying |gU| to
 		the string).  Returns an empty string on error.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->toupper()
+<
 
 tr({src}, {fromstr}, {tostr})					*tr()*
 		The result is a copy of the {src} string with all characters
@@ -9001,14 +9226,15 @@ tr({src}, {fromstr}, {tostr})					*tr()*
 
 		Returns an empty string on error.
 
-		Examples: >
+		Examples: >vim
 			echo tr("hello there", "ht", "HT")
-<		returns "Hello THere" >
+<		returns "Hello THere" >vim
 			echo tr("<blob>", "<>", "{}")
 <		returns "{blob}"
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->tr(from, to)
+<
 
 trim({text} [, {mask} [, {dir}]])				*trim()*
 		Return {text} as a String where any character in {mask} is
@@ -9025,34 +9251,36 @@ trim({text} [, {mask} [, {dir}]])				*trim()*
 		This function deals with multibyte characters properly.
 		Returns an empty string on error.
 
-		Examples: >
+		Examples: >vim
 			echo trim("   some text ")
-<		returns "some text" >
+<		returns "some text" >vim
 			echo trim("  \r\t\t\r RESERVE \t\n\x0B\xA0") .. "_TAIL"
-<		returns "RESERVE_TAIL" >
+<		returns "RESERVE_TAIL" >vim
 			echo trim("rm<Xrm<>X>rrm", "rm<>")
-<		returns "Xrm<>X" (characters in the middle are not removed) >
+<		returns "Xrm<>X" (characters in the middle are not removed) >vim
 			echo trim("  vim  ", " ", 2)
 <		returns "  vim"
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetText()->trim()
+<
 
 trunc({expr})						*trunc()*
 		Return the largest integral value with magnitude less than or
 		equal to {expr} as a |Float| (truncate towards zero).
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
+		Examples: >vim
 			echo trunc(1.456)
-<			1.0  >
+<			1.0  >vim
 			echo trunc(-5.456)
-<			-5.0  >
+<			-5.0  >vim
 			echo trunc(4.0)
 <			4.0
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			Compute()->trunc()
+<
 
 type({expr})							*type()*
 		The result is a Number representing the type of {expr}.
@@ -9067,22 +9295,23 @@ type({expr})							*type()*
 			Boolean:    6 (|v:true| and |v:false|)
 			Null:       7 (|v:null|)
 			Blob:      10 (|v:t_blob|)
-		For backward compatibility, this method can be used: >
-			:if type(myvar) == type(0)
-			:if type(myvar) == type("")
-			:if type(myvar) == type(function("tr"))
-			:if type(myvar) == type([])
-			:if type(myvar) == type({})
-			:if type(myvar) == type(0.0)
-			:if type(myvar) == type(v:true)
+		For backward compatibility, this method can be used: >vim
+			if type(myvar) == type(0) | endif
+			if type(myvar) == type("") | endif
+			if type(myvar) == type(function("tr")) | endif
+			if type(myvar) == type([]) | endif
+			if type(myvar) == type({}) | endif
+			if type(myvar) == type(0.0) | endif
+			if type(myvar) == type(v:true) | endif
 <		In place of checking for |v:null| type it is better to check
-		for |v:null| directly as it is the only value of this type: >
-			:if myvar is v:null
-<		               To check if the v:t_ variables exist use this: >
-		                        :if exists('v:t_number')
+		for |v:null| directly as it is the only value of this type: >vim
+			if myvar is v:null | endif
+<		To check if the v:t_ variables exist use this: >vim
+			if exists('v:t_number') | endif
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			mylist->type()
+<
 
 undofile({name})						*undofile()*
 		Return the name of the undo file that would be used for a file
@@ -9095,8 +9324,9 @@ undofile({name})						*undofile()*
 		buffer without a file name will not write an undo file.
 		Useful in combination with |:wundo| and |:rundo|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetFilename()->undofile()
+<
 
 undotree()						*undotree()*
 		Return the current state of the undo tree in a dictionary with
@@ -9144,14 +9374,14 @@ undotree()						*undotree()*
 uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
 		Remove second and succeeding copies of repeated adjacent
 		{list} items in-place.  Returns {list}.  If you want a list
-		to remain unmodified make a copy first: >
-			:let newlist = uniq(copy(mylist))
+		to remain unmodified make a copy first: >vim
+			let newlist = uniq(copy(mylist))
 <		The default compare function uses the string representation of
 		each item.  For the use of {func} and {dict} see |sort()|.
 
 		Returns zero if {list} is not a |List|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mylist->uniq()
 <
 
@@ -9173,16 +9403,16 @@ utf16idx({string}, {idx} [, {countcc} [, {charidx}]])	*utf16idx()*
 		from the UTF-16 index and |charidx()| for getting the
 		character index from the UTF-16 index.
 		Refer to |string-offset-encoding| for more information.
-		Examples: >
-			echo utf16idx('a😊😊', 3)	returns 2
-			echo utf16idx('a😊😊', 7)	returns 4
-			echo utf16idx('a😊😊', 1, 0, 1)	returns 2
-			echo utf16idx('a😊😊', 2, 0, 1)	returns 4
-			echo utf16idx('aą́c', 6)		returns 2
-			echo utf16idx('aą́c', 6, 1)	returns 4
-			echo utf16idx('a😊😊', 9)	returns -1
-<
-		Can also be used as a |method|: >
+		Examples: >vim
+			echo utf16idx('a😊😊', 3)	" returns 2
+			echo utf16idx('a😊😊', 7)	" returns 4
+			echo utf16idx('a😊😊', 1, 0, 1)	" returns 2
+			echo utf16idx('a😊😊', 2, 0, 1)	" returns 4
+			echo utf16idx('aą́c', 6)		" returns 2
+			echo utf16idx('aą́c', 6, 1)	" returns 4
+			echo utf16idx('a😊😊', 9)	" returns -1
+<
+		Can also be used as a |method|: >vim
 			GetName()->utf16idx(idx)
 <
 
@@ -9191,8 +9421,9 @@ values({dict})						*values()*
 		in arbitrary order.  Also see |items()| and |keys()|.
 		Returns zero if {dict} is not a |Dict|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			mydict->values()
+<
 
 virtcol({expr} [, {list}])				*virtcol()*
 		The result is a Number, which is the screen column of the file
@@ -9231,23 +9462,24 @@ virtcol({expr} [, {list}])				*virtcol()*
 		character.
 
 		Note that only marks in the current file can be used.
-		Examples: >
+		Examples: >vim
 			" With text "foo^Lbar" and cursor on the "^L":
 
-			virtcol(".")	" returns 5
-			virtcol(".", 1)	" returns [4, 5]
-			virtcol("$")	" returns 9
+			echo virtcol(".")	" returns 5
+			echo virtcol(".", 1)	" returns [4, 5]
+			echo virtcol("$")	" returns 9
 
 			" With text "	  there", with 't at 'h':
 
-			virtcol("'t")	" returns 6
-<		The first column is 1.  0 is returned for an error.
-		A more advanced example that echoes the maximum length of
-		all lines: >
+			echo virtcol("'t")	" returns 6
+<		Techo he first column is 1.  0 is returned for an error.
+		A echo more advanced example that echoes the maximum length of
+		all lines: >vim
 		    echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetPos()->virtcol()
+<
 
 virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
 		The result is a Number, which is the byte index of the
@@ -9266,8 +9498,9 @@ virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
 
 		See also |screenpos()|, |virtcol()| and |col()|.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->virtcol2col(lnum, col)
+<
 
 visualmode([{expr}])					*visualmode()*
 		The result is a String, which describes the last Visual mode
@@ -9276,8 +9509,8 @@ visualmode([{expr}])					*visualmode()*
 		"V", or "<CTRL-V>" (a single CTRL-V character) for
 		character-wise, line-wise, or block-wise Visual mode
 		respectively.
-		Example: >
-			:exe "normal " .. visualmode()
+		Example: >vim
+			exe "normal " .. visualmode()
 <		This enters the same Visual mode as before.  It is also useful
 		in scripts if you wish to act differently depending on the
 		Visual mode that was used.
@@ -9309,8 +9542,8 @@ wildmenumode()					*wildmenumode()*
 		This can be used in mappings to handle the 'wildcharm' option
 		gracefully. (Makes only sense with |mapmode-c| mappings).
 
-		For example to make <c-j> work like <down> in wildmode, use: >
-		    :cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
+		For example to make <c-j> work like <down> in wildmode, use: >vim
+		    cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
 <
 		(Note, this needs the 'wildcharm' option set appropriately).
 
@@ -9320,7 +9553,7 @@ win_execute({id}, {command} [, {silent}])		*win_execute()*
 		without triggering autocommands or changing directory.  When
 		executing {command} autocommands will be triggered, this may
 		have unexpected side effects.  Use `:noautocmd` if needed.
-		Example: >
+		Example: >vim
 			call win_execute(winid, 'syntax enable')
 <		Doing the same with `setwinvar()` would not trigger
 		autocommands and not actually show syntax highlighting.
@@ -9329,15 +9562,17 @@ win_execute({id}, {command} [, {silent}])		*win_execute()*
 		an empty string is returned.
 
 		Can also be used as a |method|, the base is passed as the
-		second argument: >
+		second argument: >vim
 			GetCommand()->win_execute(winid)
+<
 
 win_findbuf({bufnr})					*win_findbuf()*
 		Returns a |List| with |window-ID|s for windows that contain
 		buffer {bufnr}.  When there is none the list is empty.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetBufnr()->win_findbuf()
+<
 
 win_getid([{win} [, {tab}]])				*win_getid()*
 		Get the |window-ID| for the specified window.
@@ -9348,8 +9583,9 @@ win_getid([{win} [, {tab}]])				*win_getid()*
 		number {tab}.  The first tab has number one.
 		Return zero if the window cannot be found.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinnr()->win_getid()
+<
 
 win_gettype([{nr}])					*win_gettype()*
 		Return the type of the window:
@@ -9369,7 +9605,7 @@ win_gettype([{nr}])					*win_gettype()*
 
 		Also see the 'buftype' option.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->win_gettype()
 <
 
@@ -9378,23 +9614,26 @@ win_gotoid({expr})					*win_gotoid()*
 		tabpage.
 		Return TRUE if successful, FALSE if the window cannot be found.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->win_gotoid()
+<
 
 win_id2tabwin({expr})				*win_id2tabwin()*
 		Return a list with the tab number and window number of window
 		with ID {expr}: [tabnr, winnr].
 		Return [0, 0] if the window cannot be found.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->win_id2tabwin()
+<
 
 win_id2win({expr})					*win_id2win()*
 		Return the window number of window with ID {expr}.
 		Return 0 if the window cannot be found in the current tabpage.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->win_id2win()
+<
 
 win_move_separator({nr}, {offset})		*win_move_separator()*
 		Move window {nr}'s vertical separator (i.e., the right border)
@@ -9411,8 +9650,9 @@ win_move_separator({nr}, {offset})		*win_move_separator()*
 		window, since it has no separator on the right.
 		Only works for the current tab page. *E1308*
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinnr()->win_move_separator(offset)
+<
 
 win_move_statusline({nr}, {offset})		*win_move_statusline()*
 		Move window {nr}'s status line (i.e., the bottom border) by
@@ -9426,8 +9666,9 @@ win_move_statusline({nr}, {offset})		*win_move_statusline()*
 		be found and FALSE otherwise.
 		Only works for the current tab page.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinnr()->win_move_statusline(offset)
+<
 
 win_screenpos({nr})					*win_screenpos()*
 		Return the screen position of window {nr} as a list with two
@@ -9438,7 +9679,7 @@ win_screenpos({nr})					*win_screenpos()*
 		Returns [0, 0] if the window cannot be found in the current
 		tabpage.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->win_screenpos()
 <
 
@@ -9462,7 +9703,7 @@ win_splitmove({nr}, {target} [, {options}])		*win_splitmove()*
 				present, the values of 'splitbelow' and
 				'splitright' are used.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->win_splitmove(target)
 <
 
@@ -9473,10 +9714,10 @@ winbufnr({nr})						*winbufnr()*
 		When {nr} is zero, the number of the buffer in the current
 		window is returned.
 		When window {nr} doesn't exist, -1 is returned.
-		Example: >
-		  :echo "The file in the current window is " .. bufname(winbufnr(0))
+		Example: >vim
+		  echo "The file in the current window is " .. bufname(winbufnr(0))
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			FindWindow()->winbufnr()->bufname()
 <
 
@@ -9498,10 +9739,10 @@ winheight({nr})						*winheight()*
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a height of zero or more.
 		This excludes any window toolbar line.
-		Examples: >
-		  :echo "The current window has " .. winheight(0) .. " lines."
+		Examples: >vim
+		  echo "The current window has " .. winheight(0) .. " lines."
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetWinid()->winheight()
 <
 
@@ -9513,29 +9754,35 @@ winlayout([{tabnr}])					*winlayout()*
 		with number {tabnr}. If the tabpage {tabnr} is not found,
 		returns an empty list.
 
-		For a leaf window, it returns:
+		For a leaf window, it returns: >
 			["leaf", {winid}]
+<
 		For horizontally split windows, which form a column, it
 		returns: >
 			["col", [{nested list of windows}]]
 <		For vertically split windows, which form a row, it returns: >
 			["row", [{nested list of windows}]]
 <
-		Example: >
+		Example: >vim
 			" Only one window in the tab page
-			:echo winlayout()
+			echo winlayout()
+<		 >
 			['leaf', 1000]
+<		 >vim
 			" Two horizontally split windows
-			:echo winlayout()
+			echo winlayout()
+<		 >
 			['col', [['leaf', 1000], ['leaf', 1001]]]
+<		 >vim
 			" The second tab page, with three horizontally split
 			" windows, with two vertically split windows in the
 			" middle window
-			:echo winlayout(2)
+			echo winlayout(2)
+<		 >
 			['col', [['leaf', 1002], ['row', [['leaf', 1003],
 					    ['leaf', 1001]]], ['leaf', 1000]]]
 <
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetTabnr()->winlayout()
 <
 
@@ -9570,12 +9817,12 @@ winnr([{arg}])						*winnr()*
 		|:wincmd|.
 		When {arg} is invalid an error is given and zero is returned.
 		Also see |tabpagewinnr()| and |win_getid()|.
-		Examples: >
+		Examples: >vim
 			let window_count = winnr('$')
 			let prev_window = winnr('#')
 			let wnum = winnr('3k')
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetWinval()->winnr()
 <
 
@@ -9584,10 +9831,10 @@ winrestcmd()						*winrestcmd()*
 		the current window sizes.  Only works properly when no windows
 		are opened or closed and the current window and tab page is
 		unchanged.
-		Example: >
-			:let cmd = winrestcmd()
-			:call MessWithWindowSizes()
-			:exe cmd
+		Example: >vim
+			let cmd = winrestcmd()
+			call MessWithWindowSizes()
+			exe cmd
 <
 
 winrestview({dict})					*winrestview()*
@@ -9595,8 +9842,8 @@ winrestview({dict})					*winrestview()*
 		the view of the current window.
 		Note: The {dict} does not have to contain all values, that are
 		returned by |winsaveview()|. If values are missing, those
-		settings won't be restored. So you can use: >
-		    :call winrestview({'curswant': 4})
+		settings won't be restored. So you can use: >vim
+		    call winrestview({'curswant': 4})
 <
 		This will only set the curswant value (the column the cursor
 		wants to move on vertical movements) of the cursor to column 5
@@ -9606,7 +9853,7 @@ winrestview({dict})					*winrestview()*
 		If you have changed the values the result is unpredictable.
 		If the window size changed the result won't be the same.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetView()->winrestview()
 <
 
@@ -9643,16 +9890,17 @@ winwidth({nr})						*winwidth()*
 		When {nr} is zero, the width of the current window is
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a width of zero or more.
-		Examples: >
-		  :echo "The current window has " .. winwidth(0) .. " columns."
-		  :if winwidth(0) <= 50
-		  :  50 wincmd |
-		  :endif
+		Examples: >vim
+		  echo "The current window has " .. winwidth(0) .. " columns."
+		  if winwidth(0) <= 50
+		    50 wincmd |
+		  endif
 <		For getting the terminal or screen size, see the 'columns'
 		option.
 
-		Can also be used as a |method|: >
+		Can also be used as a |method|: >vim
 			GetWinid()->winwidth()
+<
 
 wordcount()						*wordcount()*
 		The result is a dictionary of byte/chars/word statistics for
@@ -9692,13 +9940,13 @@ writefile({object}, {fname} [, {flags}])		*writefile()*
 		     last list item.  An empty item at the end does cause the
 		     last line in the file to end in a NL.
 
-		'a'  Append mode is used, lines are appended to the file: >
-			:call writefile(["foo"], "event.log", "a")
-			:call writefile(["bar"], "event.log", "a")
+		'a'  Append mode is used, lines are appended to the file: >vim
+			call writefile(["foo"], "event.log", "a")
+			call writefile(["bar"], "event.log", "a")
 <
 		'D'  Delete the file when the current function ends.  This
-		     works like: >
-			:defer delete({fname})
+		     works like: >vim
+			defer delete({fname})
 <		     Fails when not in a function.  Also see |:defer|.
 
 		's'  fsync() is called after writing the file.  This flushes
@@ -9717,22 +9965,23 @@ writefile({object}, {fname} [, {flags}])		*writefile()*
 		fails.
 
 		Also see |readfile()|.
-		To copy a file byte for byte: >
-			:let fl = readfile("foo", "b")
-			:call writefile(fl, "foocopy", "b")
+		To copy a file byte for byte: >vim
+			let fl = readfile("foo", "b")
+			call writefile(fl, "foocopy", "b")
 
-<		Can also be used as a |method|: >
+<		Can also be used as a |method|: >vim
 			GetText()->writefile("thefile")
+<
 
 xor({expr}, {expr})						*xor()*
 		Bitwise XOR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `and()` and `or()`.
-		Example: >
-			:let bits = xor(bits, 0x80)
+		Example: >vim
+			let bits = xor(bits, 0x80)
 <
-		Can also be used as a |method|: >
-			:let bits = bits->xor(0x80)
+		Can also be used as a |method|: >vim
+			let bits = bits->xor(0x80)
 <
 
 ==============================================================================
@@ -9744,14 +9993,14 @@ pattern is used to find a match in a String, almost everything works in the
 same way.  The difference is that a String is handled like it is one line.
 When it contains a "\n" character, this is not seen as a line break for the
 pattern.  It can be matched with a "\n" in the pattern, or with ".".  Example:
->
-	:let a = "aaaa\nxxxx"
-	:echo matchstr(a, "..\n..")
-	aa
-	xx
-	:echo matchstr(a, "a.x")
-	a
-	x
+>vim
+	let a = "aaaa\nxxxx"
+	echo matchstr(a, "..\n..")
+	" aa
+	" xx
+	echo matchstr(a, "a.x")
+	" a
+	" x
 
 Don't forget that "^" will only match at the first character of the String and
 "$" at the last character of the string.  They don't match after or before a
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 82213324e3..8b56d8e708 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6,16 +6,17 @@
 --- a |Float| abs() returns a |Float|.  When {expr} can be
 --- converted to a |Number| abs() returns a |Number|.  Otherwise
 --- abs() gives an error message and returns -1.
---- Examples: >
+--- Examples: >vim
 ---   echo abs(1.456)
---- <  1.456  >
+--- <  1.456  >vim
 ---   echo abs(-5.456)
---- <  5.456  >
+--- <  5.456  >vim
 ---   echo abs(-4)
 --- <  4
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->abs()
+--- <
 ---
 --- @param expr any
 --- @return number
@@ -27,31 +28,33 @@ function vim.fn.abs(expr) end
 --- [-1, 1].
 --- Returns NaN if {expr} is outside the range [-1, 1].  Returns
 --- 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo acos(0)
---- <  1.570796 >
----   :echo acos(-0.5)
+--- Examples: >vim
+---   echo acos(0)
+--- <  1.570796 >vim
+---   echo acos(-0.5)
 --- <  2.094395
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->acos()
+--- <
 ---
 --- @param expr any
 --- @return number
 function vim.fn.acos(expr) end
 
 --- Append the item {expr} to |List| or |Blob| {object}.  Returns
---- the resulting |List| or |Blob|.  Examples: >
----   :let alist = add([1, 2, 3], item)
----   :call add(mylist, "woodstock")
+--- the resulting |List| or |Blob|.  Examples: >vim
+---   let alist = add([1, 2, 3], item)
+---   call add(mylist, "woodstock")
 --- <Note that when {expr} is a |List| it is appended as a single
 --- item.  Use |extend()| to concatenate |Lists|.
 --- When {object} is a |Blob| then {expr} must be a number.
 --- Use |insert()| to add an item at another position.
 --- Returns 1 if {object} is not a |List| or a |Blob|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->add(val1)->add(val2)
+--- <
 ---
 --- @param object any
 --- @param expr any
@@ -61,10 +64,11 @@ function vim.fn.add(object, expr) end
 --- Bitwise AND on the two arguments.  The arguments are converted
 --- to a number.  A List, Dict or Float argument causes an error.
 --- Also see `or()` and `xor()`.
---- Example: >
----   :let flag = and(bits, 0x80)
---- <Can also be used as a |method|: >
----   :let flag = bits->and(0x80)
+--- Example: >vim
+---   let flag = and(bits, 0x80)
+--- <Can also be used as a |method|: >vim
+---   let flag = bits->and(0x80)
+--- <
 ---
 --- @param expr any
 --- @param expr1 any
@@ -73,8 +77,9 @@ vim.fn['and'] = function(expr, expr1) end
 
 --- Returns Dictionary of |api-metadata|.
 ---
---- View it in a nice human-readable format: >
----        :lua vim.print(vim.fn.api_info())
+--- View it in a nice human-readable format: >vim
+---        lua vim.print(vim.fn.api_info())
+--- <
 ---
 --- @return table
 function vim.fn.api_info() end
@@ -87,12 +92,13 @@ function vim.fn.api_info() end
 --- {lnum} can be zero to insert a line before the first one.
 --- {lnum} is used like with |getline()|.
 --- Returns 1 for failure ({lnum} out of range or out of memory),
---- 0 for success.  Example: >
----   :let failed = append(line('$'), "# THE END")
----   :let failed = append(0, ["Chapter 1", "the beginning"])
+--- 0 for success.  Example: >vim
+---   let failed = append(line('$'), "# THE END")
+---   let failed = append(0, ["Chapter 1", "the beginning"])
 ---
---- <Can also be used as a |method| after a List: >
+--- <Can also be used as a |method| after a List: >vim
 ---   mylist->append(lnum)
+--- <
 ---
 --- @param lnum integer
 --- @param text any
@@ -114,11 +120,12 @@ function vim.fn.append(lnum, text) end
 --- On success 0 is returned, on failure 1 is returned.
 ---
 --- If {buf} is not a valid buffer or {lnum} is not valid, an
---- error message is given. Example: >
----   :let failed = appendbufline(13, 0, "# THE START")
+--- error message is given. Example: >vim
+---   let failed = appendbufline(13, 0, "# THE START")
 --- <
---- Can also be used as a |method| after a List: >
+--- Can also be used as a |method| after a List: >vim
 ---   mylist->appendbufline(buf, lnum)
+--- <
 ---
 --- @param buf any
 --- @param lnum integer
@@ -162,13 +169,13 @@ function vim.fn.argidx() end
 function vim.fn.arglistid(winnr, tabnr) end
 
 --- The result is the {nr}th file in the argument list.  See
---- |arglist|.  "argv(0)" is the first one.  Example: >
----   :let i = 0
----   :while i < argc()
----   :  let f = escape(fnameescape(argv(i)), '.')
----   :  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
----   :  let i = i + 1
----   :endwhile
+--- |arglist|.  "argv(0)" is the first one.  Example: >vim
+---   let i = 0
+---   while i < argc()
+---     let f = escape(fnameescape(argv(i)), '.')
+---     exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
+---     let i = i + 1
+---   endwhile
 --- <Without the {nr} argument, or when {nr} is -1, a |List| with
 --- the whole |arglist| is returned.
 ---
@@ -190,13 +197,13 @@ function vim.fn.argv(nr, winid) end
 --- [-1, 1].
 --- Returns NaN if {expr} is outside the range [-1, 1].  Returns
 --- 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo asin(0.8)
---- <  0.927295 >
----   :echo asin(-0.5)
+--- Examples: >vim
+---   echo asin(0.8)
+--- <  0.927295 >vim
+---   echo asin(-0.5)
 --- <  -0.523599
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->asin()
 --- <
 ---
@@ -209,7 +216,7 @@ function vim.fn.asin(expr) end
 --- Also see |assert_fails()|, |assert_nobeep()| and
 --- |assert-return|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCmd()->assert_beeps()
 --- <
 ---
@@ -227,13 +234,14 @@ function vim.fn.assert_beeps(cmd) end
 --- from the Number 4.  And the number 4 is different from the
 --- Float 4.0.  The value of 'ignorecase' is not used here, case
 --- always matters.
---- Example: >
+--- Example: >vim
 ---   assert_equal('foo', 'bar')
 --- <Will result in a string to be added to |v:errors|:
 ---   test.vim line 12: Expected 'foo' but got 'bar' ~
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->assert_equal([1, 2, 3])
+--- <
 ---
 --- @param expected any
 --- @param actual any
@@ -247,8 +255,9 @@ function vim.fn.assert_equal(expected, actual, msg) end
 --- When {fname-one} or {fname-two} does not exist the error will
 --- mention that.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLog()->assert_equalfile('expected.log')
+--- <
 ---
 --- @return 0|1
 function vim.fn.assert_equalfile() end
@@ -257,7 +266,7 @@ function vim.fn.assert_equalfile() end
 --- message is added to |v:errors|.  Also see |assert-return|.
 --- This can be used to assert that a command throws an exception.
 --- Using the error number, followed by a colon, avoids problems
---- with translations: >
+--- with translations: >vim
 ---   try
 ---     commandthatfails
 ---     call assert_false(1, 'command should have failed')
@@ -277,16 +286,16 @@ function vim.fn.assert_exception(error, msg) end
 ---
 --- When {error} is a string it must be found literally in the
 --- first reported error. Most often this will be the error code,
---- including the colon, e.g. "E123:". >
+--- including the colon, e.g. "E123:". >vim
 ---   assert_fails('bad cmd', 'E987:')
 --- <
 --- When {error} is a |List| with one or two strings, these are
 --- used as patterns.  The first pattern is matched against the
---- first reported error: >
+--- first reported error: >vim
 ---   assert_fails('cmd', ['E987:.*expected bool'])
 --- <The second pattern, if present, is matched against the last
 --- reported error.  To only match the last error use an empty
---- string for the first error: >
+--- string for the first error: >vim
 ---   assert_fails('cmd', ['', 'E987:'])
 --- <
 --- If {msg} is empty then it is not used.  Do this to get the
@@ -304,8 +313,9 @@ function vim.fn.assert_exception(error, msg) end
 --- Note that beeping is not considered an error, and some failing
 --- commands only beep.  Use |assert_beeps()| for those.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCmd()->assert_fails('E99:')
+--- <
 ---
 --- @param cmd any
 --- @param error? any
@@ -324,8 +334,9 @@ function vim.fn.assert_fails(cmd, error, msg, lnum, context) end
 --- A value is false when it is zero. When {actual} is not a
 --- number the assert fails.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetResult()->assert_false()
+--- <
 ---
 --- @param actual any
 --- @param msg? any
@@ -359,12 +370,12 @@ function vim.fn.assert_inrange(lower, upper, actual, msg) end
 --- Use "^" and "$" to match with the start and end of the text.
 --- Use both to match the whole text.
 ---
---- Example: >
+--- Example: >vim
 ---   assert_match('^f.*o$', 'foobar')
 --- <Will result in a string to be added to |v:errors|:
 ---   test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   getFile()->assert_match('foo.*')
 --- <
 ---
@@ -378,7 +389,7 @@ function vim.fn.assert_match(pattern, actual, msg) end
 --- produces a beep or visual bell.
 --- Also see |assert_beeps()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCmd()->assert_nobeep()
 --- <
 ---
@@ -390,9 +401,8 @@ function vim.fn.assert_nobeep(cmd) end
 --- |v:errors| when {expected} and {actual} are equal.
 --- Also see |assert-return|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->assert_notequal([1, 2, 3])
----
 --- <
 ---
 --- @param expected any
@@ -405,7 +415,7 @@ function vim.fn.assert_notequal(expected, actual, msg) end
 --- |v:errors| when {pattern} matches {actual}.
 --- Also see |assert-return|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   getFile()->assert_notmatch('bar.*')
 --- <
 ---
@@ -418,7 +428,7 @@ function vim.fn.assert_notmatch(pattern, actual, msg) end
 --- Report a test failure directly, using String {msg}.
 --- Always returns one.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMessage()->assert_report()
 --- <
 ---
@@ -433,7 +443,7 @@ function vim.fn.assert_report(msg) end
 --- When {actual} is not a number or |v:true| the assert fails.
 --- When {msg} is given it precedes the default message.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetResult()->assert_true()
 --- <
 ---
@@ -446,14 +456,15 @@ function vim.fn.assert_true(actual, msg) end
 --- the range [-pi/2, +pi/2] radians, as a |Float|.
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo atan(100)
---- <  1.560797 >
----   :echo atan(-4.01)
+--- Examples: >vim
+---   echo atan(100)
+--- <  1.560797 >vim
+---   echo atan(-4.01)
 --- <  -1.326405
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->atan()
+--- <
 ---
 --- @param expr any
 --- @return number
@@ -464,14 +475,15 @@ function vim.fn.atan(expr) end
 --- {expr1} and {expr2} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
 --- |Number|.
---- Examples: >
----   :echo atan2(-1, 1)
---- <  -0.785398 >
----   :echo atan2(1, -1)
+--- Examples: >vim
+---   echo atan2(-1, 1)
+--- <  -0.785398 >vim
+---   echo atan2(1, -1)
 --- <  2.356194
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->atan2(1)
+--- <
 ---
 --- @param expr1 any
 --- @param expr2 any
@@ -479,13 +491,13 @@ function vim.fn.atan(expr) end
 function vim.fn.atan2(expr1, expr2) end
 
 --- Return a List containing the number value of each byte in Blob
---- {blob}.  Examples: >
----   blob2list(0z0102.0304)  returns [1, 2, 3, 4]
----   blob2list(0z)    returns []
+--- {blob}.  Examples: >vim
+---   blob2list(0z0102.0304)  " returns [1, 2, 3, 4]
+---   blob2list(0z)    " returns []
 --- <Returns an empty List on error.  |list2blob()| does the
 --- opposite.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBlob()->blob2list()
 --- <
 ---
@@ -533,13 +545,14 @@ function vim.fn.browsedir(title, initdir) end
 --- created buffer.  When {name} is an empty string then a new
 --- buffer is always created.
 --- The buffer will not have 'buflisted' set and not be loaded
---- yet.  To add some text to the buffer use this: >
+--- yet.  To add some text to the buffer use this: >vim
 ---   let bufnr = bufadd('someName')
 ---   call bufload(bufnr)
 ---   call setbufline(bufnr, 1, ['some', 'text'])
 --- <Returns 0 on error.
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   let bufnr = 'somename'->bufadd()
+--- <
 ---
 --- @param name string
 --- @return integer
@@ -566,8 +579,9 @@ function vim.fn.bufadd(name) end
 --- Use "bufexists(0)" to test for the existence of an alternate
 --- file name.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   let exists = 'somename'->bufexists()
+--- <
 ---
 --- @param buf any
 --- @return 0|1
@@ -598,8 +612,9 @@ function vim.fn.buffer_number(...) end
 --- {buf} exists and is listed (has the 'buflisted' option set).
 --- The {buf} argument is used like with |bufexists()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   let listed = 'somename'->buflisted()
+--- <
 ---
 --- @param buf any
 --- @return 0|1
@@ -614,8 +629,9 @@ function vim.fn.buflisted(buf) end
 --- there will be no dialog, the buffer will be loaded anyway.
 --- The {buf} argument is used like with |bufexists()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   eval 'somename'->bufload()
+--- <
 ---
 --- @param buf any
 function vim.fn.bufload(buf) end
@@ -624,8 +640,9 @@ function vim.fn.bufload(buf) end
 --- {buf} exists and is loaded (shown in a window or hidden).
 --- The {buf} argument is used like with |bufexists()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   let loaded = 'somename'->bufloaded()
+--- <
 ---
 --- @param buf any
 --- @return 0|1
@@ -651,17 +668,17 @@ function vim.fn.bufloaded(buf) end
 --- with a listed buffer, that one is returned.  Next unlisted
 --- buffers are searched for.
 --- If the {buf} is a String, but you want to use it as a buffer
---- number, force it to be a Number by adding zero to it: >
----   :echo bufname("3" + 0)
---- <Can also be used as a |method|: >
+--- number, force it to be a Number by adding zero to it: >vim
+---   echo bufname("3" + 0)
+--- <Can also be used as a |method|: >vim
 ---   echo bufnr->bufname()
 ---
 --- <If the buffer doesn't exist, or doesn't have a name, an empty
---- string is returned. >
----   bufname("#")    alternate buffer name
----   bufname(3)    name of buffer 3
----   bufname("%")    name of current buffer
----   bufname("file2")  name of buffer where "file2" matches.
+--- string is returned. >vim
+---   echo bufname("#")    " alternate buffer name
+---   echo bufname(3)    " name of buffer 3
+---   echo bufname("%")    " name of current buffer
+---   echo bufname("file2")  " name of buffer where "file2" matches.
 --- <
 ---
 --- @param buf? any
@@ -674,15 +691,16 @@ function vim.fn.bufname(buf) end
 --- If the buffer doesn't exist, -1 is returned.  Or, if the
 --- {create} argument is present and TRUE, a new, unlisted,
 --- buffer is created and its number is returned.
---- bufnr("$") is the last buffer: >
----   :let last_buffer = bufnr("$")
+--- bufnr("$") is the last buffer: >vim
+---   let last_buffer = bufnr("$")
 --- <The result is a Number, which is the highest buffer number
 --- of existing buffers.  Note that not all buffers with a smaller
 --- number necessarily exist, because ":bwipeout" may have removed
 --- them.  Use bufexists() to test for the existence of a buffer.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   echo bufref->bufnr()
+--- <
 ---
 --- @param buf? any
 --- @param create? any
@@ -692,15 +710,16 @@ function vim.fn.bufnr(buf, create) end
 --- The result is a Number, which is the |window-ID| of the first
 --- window associated with buffer {buf}.  For the use of {buf},
 --- see |bufname()| above.  If buffer {buf} doesn't exist or
---- there is no such window, -1 is returned.  Example: >
+--- there is no such window, -1 is returned.  Example: >vim
 ---
 ---   echo "A window containing buffer 1 is " .. (bufwinid(1))
 --- <
 --- Only deals with the current tab page.  See |win_findbuf()| for
 --- finding more.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   FindBuffer()->bufwinid()
+--- <
 ---
 --- @param buf any
 --- @return integer
@@ -709,15 +728,16 @@ function vim.fn.bufwinid(buf) end
 --- Like |bufwinid()| but return the window number instead of the
 --- |window-ID|.
 --- If buffer {buf} doesn't exist or there is no such window, -1
---- is returned.  Example: >
+--- is returned.  Example: >vim
 ---
 ---   echo "A window containing buffer 1 is " .. (bufwinnr(1))
 ---
 --- <The number can be used with |CTRL-W_w| and ":wincmd w"
 --- |:wincmd|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   FindBuffer()->bufwinnr()
+--- <
 ---
 --- @param buf any
 --- @return integer
@@ -732,8 +752,9 @@ function vim.fn.bufwinnr(buf) end
 ---
 --- Returns -1 if the {byte} value is invalid.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetOffset()->byte2line()
+--- <
 ---
 --- @param byte any
 --- @return integer
@@ -755,10 +776,10 @@ function vim.fn.byte2line(byte) end
 --- middle of a character (e.g. in a 4-byte character), then the
 --- byte index of the first byte in the character is returned.
 --- Refer to |string-offset-encoding| for more information.
---- Example : >
+--- Example : >vim
 ---   echo matchstr(str, ".", byteidx(str, 3))
 --- <will display the fourth character.  Another way to do the
---- same: >
+--- same: >vim
 ---   let s = strpart(str, byteidx(str, 3))
 ---   echo strpart(s, 0, byteidx(s, 1))
 --- <Also see |strgetchar()| and |strcharpart()|.
@@ -768,13 +789,14 @@ function vim.fn.byte2line(byte) end
 --- in bytes is returned.
 --- See |charidx()| and |utf16idx()| for getting the character and
 --- UTF-16 index respectively from the byte index.
---- Examples: >
----   echo byteidx('a😊😊', 2)  returns 5
----   echo byteidx('a😊😊', 2, 1)  returns 1
----   echo byteidx('a😊😊', 3, 1)  returns 5
+--- Examples: >vim
+---   echo byteidx('a😊😊', 2)  " returns 5
+---   echo byteidx('a😊😊', 2, 1)  " returns 1
+---   echo byteidx('a😊😊', 3, 1)  " returns 5
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->byteidx(idx)
+--- <
 ---
 --- @param expr any
 --- @param nr integer
@@ -783,7 +805,7 @@ function vim.fn.byte2line(byte) end
 function vim.fn.byteidx(expr, nr, utf16) end
 
 --- Like byteidx(), except that a composing character is counted
---- as a separate character.  Example: >
+--- as a separate character.  Example: >vim
 ---   let s = 'e' .. nr2char(0x301)
 ---   echo byteidx(s, 1)
 ---   echo byteidxcomp(s, 1)
@@ -792,8 +814,9 @@ function vim.fn.byteidx(expr, nr, utf16) end
 --- character is 3 bytes), the second echo results in 1 ('e' is
 --- one byte).
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->byteidxcomp(idx)
+--- <
 ---
 --- @param expr any
 --- @param nr integer
@@ -809,7 +832,7 @@ function vim.fn.byteidxcomp(expr, nr, utf16) end
 --- {dict} is for functions with the "dict" attribute.  It will be
 --- used to set the local variable "self". |Dictionary-function|
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFunc()->call([arg, arg], dict)
 --- <
 ---
@@ -822,17 +845,17 @@ function vim.fn.call(func, arglist, dict) end
 --- Return the smallest integral value greater than or equal to
 --- {expr} as a |Float| (round up).
 --- {expr} must evaluate to a |Float| or a |Number|.
---- Examples: >
+--- Examples: >vim
 ---   echo ceil(1.456)
---- <  2.0  >
+--- <  2.0  >vim
 ---   echo ceil(-5.456)
---- <  -5.0  >
+--- <  -5.0  >vim
 ---   echo ceil(4.0)
 --- <  4.0
 ---
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->ceil()
 --- <
 ---
@@ -874,8 +897,8 @@ function vim.fn.changenr() end
 --- {data} may be a string, string convertible, |Blob|, or a list.
 --- If {data} is a list, the items will be joined by newlines; any
 --- newlines in an item will be sent as NUL. To send a final
---- newline, include a final empty string. Example: >
----   :call chansend(id, ["abc", "123\n456", ""])
+--- newline, include a final empty string. Example: >vim
+---   call chansend(id, ["abc", "123\n456", ""])
 --- <will send "abc<NL>123<NUL>456<NL>".
 ---
 --- chansend() writes raw data, not RPC messages.  If the channel
@@ -888,12 +911,12 @@ function vim.fn.changenr() end
 function vim.fn.chansend(id, data) end
 
 --- Return Number value of the first char in {string}.
---- Examples: >
----   char2nr(" ")    returns 32
----   char2nr("ABC")    returns 65
----   char2nr("á")    returns 225
----   char2nr("á"[0])    returns 195
----   char2nr("\<M-x>")  returns 128
+--- Examples: >vim
+---   echo char2nr(" ")    " returns 32
+---   echo char2nr("ABC")    " returns 65
+---   echo char2nr("á")    " returns 225
+---   echo char2nr("á"[0])    " returns 195
+---   echo char2nr("\<M-x>")  " returns 128
 --- <Non-ASCII characters are always treated as UTF-8 characters.
 --- {utf8} is ignored, it exists only for backwards-compatibility.
 --- A combining character is a separate character.
@@ -901,8 +924,9 @@ function vim.fn.chansend(id, data) end
 ---
 --- Returns 0 if {string} is not a |String|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetChar()->char2nr()
+--- <
 ---
 --- @param string string
 --- @param utf8? any
@@ -927,11 +951,11 @@ function vim.fn.charclass(string) end
 --- position given with {expr} instead of the byte position.
 ---
 --- Example:
---- With the cursor on '세' in line 5 with text "여보세요": >
----   charcol('.')    returns 3
----   col('.')    returns 7
+--- With the cursor on '세' in line 5 with text "여보세요": >vim
+---   echo charcol('.')    " returns 3
+---   echo col('.')    " returns 7
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetPos()->col()
 --- <
 ---
@@ -966,14 +990,15 @@ function vim.fn.charcol(expr, winid) end
 --- from the character index and |utf16idx()| for getting the
 --- UTF-16 index from the character index.
 --- Refer to |string-offset-encoding| for more information.
---- Examples: >
----   echo charidx('áb́ć', 3)    returns 1
----   echo charidx('áb́ć', 6, 1)  returns 4
----   echo charidx('áb́ć', 16)    returns -1
----   echo charidx('a😊😊', 4, 0, 1)  returns 2
+--- Examples: >vim
+---   echo charidx('áb́ć', 3)    " returns 1
+---   echo charidx('áb́ć', 6, 1)  " returns 4
+---   echo charidx('áb́ć', 16)    " returns -1
+---   echo charidx('a😊😊', 4, 0, 1)  " returns 2
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->charidx(idx)
+--- <
 ---
 --- @param string string
 --- @param idx integer
@@ -996,14 +1021,14 @@ function vim.fn.charidx(string, idx, countcc, utf16) end
 --- this to another chdir() to restore the directory.
 --- On failure, returns an empty string.
 ---
---- Example: >
+--- Example: >vim
 ---   let save_dir = chdir(newdir)
 ---   if save_dir != ""
 ---      " ... do some work
 ---      call chdir(save_dir)
 ---   endif
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetDir()->chdir()
 --- <
 ---
@@ -1018,8 +1043,9 @@ function vim.fn.chdir(dir) end
 --- When {lnum} is invalid -1 is returned.
 --- See |C-indenting|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->cindent()
+--- <
 ---
 --- @param lnum integer
 --- @return integer
@@ -1030,7 +1056,7 @@ function vim.fn.cindent(lnum) end
 --- If {win} is specified, use the window with this number or
 --- window ID instead of the current window.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWin()->clearmatches()
 --- <
 ---
@@ -1059,11 +1085,11 @@ function vim.fn.clearmatches(win) end
 --- For the screen column position use |virtcol()|.  For the
 --- character position use |charcol()|.
 --- Note that only marks in the current file can be used.
---- Examples: >
----   col(".")    column of cursor
----   col("$")    length of cursor line plus one
----   col("'t")    column of mark t
----   col("'" .. markname)  column of mark markname
+--- Examples: >vim
+---   echo col(".")    " column of cursor
+---   echo col("$")    " length of cursor line plus one
+---   echo col("'t")    " column of mark t
+---   echo col("'" .. markname)  " column of mark markname
 --- <The first column is 1.  Returns 0 if {expr} is invalid or when
 --- the window with ID {winid} is not found.
 --- For an uppercase mark the column may actually be in another
@@ -1071,10 +1097,10 @@ function vim.fn.clearmatches(win) end
 --- For the cursor position, when 'virtualedit' is active, the
 --- column is one higher if the cursor is after the end of the
 --- line.  Also, when using a <Cmd> mapping the cursor isn't
---- moved, this can be used to obtain the column in Insert mode: >
----   :imap <F2> <Cmd>echo col(".").."\n"<CR>
+--- moved, this can be used to obtain the column in Insert mode: >vim
+---   imap <F2> <Cmd>echo col(".").."\n"<CR>
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetPos()->col()
 --- <
 ---
@@ -1100,7 +1126,7 @@ function vim.fn.col(expr, winid) end
 --- The match can be selected with CTRL-N and CTRL-P as usual with
 --- Insert mode completion.  The popup menu will appear if
 --- specified, see |ins-completion-menu|.
---- Example: >
+--- Example: >vim
 ---   inoremap <F5> <C-R>=ListMonths()<CR>
 ---
 ---   func ListMonths()
@@ -1113,8 +1139,9 @@ function vim.fn.col(expr, winid) end
 --- an empty string is returned to avoid a zero being inserted.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetMatches()->complete(col('.'))
+--- <
 ---
 --- @param startcol any
 --- @param matches any
@@ -1128,8 +1155,9 @@ function vim.fn.complete(startcol, matches) end
 --- See |complete-functions| for an explanation of {expr}.  It is
 --- the same as one item in the list that 'omnifunc' would return.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMoreMatches()->complete_add()
+--- <
 ---
 --- @param expr any
 --- @return 0|1|2
@@ -1194,7 +1222,7 @@ function vim.fn.complete_check() end
 ---
 --- Returns an empty |Dictionary| on error.
 ---
---- Examples: >
+--- Examples: >vim
 ---   " Get all items
 ---   call complete_info()
 ---   " Get only 'mode'
@@ -1202,7 +1230,7 @@ function vim.fn.complete_check() end
 ---   " Get only 'mode' and 'pum_visible'
 ---   call complete_info(['mode', 'pum_visible'])
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetItems()->complete_info()
 --- <
 ---
@@ -1221,11 +1249,11 @@ function vim.fn.complete_info(what) end
 --- some systems the string is wrapped when it doesn't fit.
 ---
 --- {choices} is a String, with the individual choices separated
---- by '\n', e.g. >
+--- by '\n', e.g. >vim
 ---   confirm("Save changes?", "&Yes\n&No\n&Cancel")
 --- <The letter after the '&' is the shortcut key for that choice.
 --- Thus you can type 'c' to select "Cancel".  The shortcut does
---- not need to be the first letter: >
+--- not need to be the first letter: >vim
 ---   confirm("file has been modified", "&Save\nSave &All")
 --- <For the console, the first letter of each choice is used as
 --- the default shortcut key.  Case is ignored.
@@ -1244,7 +1272,7 @@ function vim.fn.complete_info(what) end
 --- If the user aborts the dialog by pressing <Esc>, CTRL-C,
 --- or another valid interrupt key, confirm() returns 0.
 ---
---- An example: >
+--- An example: >vim
 ---    let choice = confirm("What do you want?",
 ---       \ "&Apples\n&Oranges\n&Bananas", 2)
 ---    if choice == 0
@@ -1261,7 +1289,7 @@ function vim.fn.complete_info(what) end
 --- don't fit, a vertical layout is used anyway.  For some systems
 --- the horizontal layout is always used.
 ---
---- Can also be used as a |method|in: >
+--- Can also be used as a |method|in: >vim
 ---   BuildMessage()->confirm("&Yes\n&No")
 --- <
 ---
@@ -1280,8 +1308,9 @@ function vim.fn.confirm(msg, choices, default, type) end
 --- changing an item changes the contents of both |Lists|.
 --- A |Dictionary| is copied in a similar way as a |List|.
 --- Also see |deepcopy()|.
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->copy()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -1290,14 +1319,15 @@ function vim.fn.copy(expr) end
 --- Return the cosine of {expr}, measured in radians, as a |Float|.
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo cos(100)
---- <  0.862319 >
----   :echo cos(-4.01)
+--- Examples: >vim
+---   echo cos(100)
+--- <  0.862319 >vim
+---   echo cos(-4.01)
 --- <  -0.646043
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->cos()
+--- <
 ---
 --- @param expr any
 --- @return number
@@ -1307,14 +1337,15 @@ function vim.fn.cos(expr) end
 --- [1, inf].
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo cosh(0.5)
---- <  1.127626 >
----   :echo cosh(-0.5)
+--- Examples: >vim
+---   echo cosh(0.5)
+--- <  1.127626 >vim
+---   echo cosh(-0.5)
 --- <  -1.127626
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->cosh()
+--- <
 ---
 --- @param expr any
 --- @return number
@@ -1332,7 +1363,7 @@ function vim.fn.cosh(expr) end
 --- occurrences of {expr} is returned. Zero is returned when
 --- {expr} is an empty string.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->count(val)
 --- <
 ---
@@ -1419,8 +1450,9 @@ function vim.fn.cursor(lnum, col, off) end
 --- position within a <Tab> or after the last character.
 --- Returns 0 when the position could be set, -1 otherwise.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCursorPos()->cursor()
+--- <
 ---
 --- @param list any
 --- @return any
@@ -1434,7 +1466,7 @@ function vim.fn.cursor(list) end
 --- Returns |TRUE| if successfully interrupted the program.
 --- Otherwise returns |FALSE|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetPid()->debugbreak()
 --- <
 ---
@@ -1461,8 +1493,9 @@ function vim.fn.debugbreak(pid) end
 --- {noref} set to 1 will fail.
 --- Also see |copy()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetObject()->deepcopy()
+--- <
 ---
 --- @param expr any
 --- @param noref? any
@@ -1487,8 +1520,9 @@ function vim.fn.deepcopy(expr, noref) end
 --- operation was successful and -1/true when the deletion failed
 --- or partly failed.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->delete()
+--- <
 ---
 --- @param fname integer
 --- @param flags? string
@@ -1508,7 +1542,7 @@ function vim.fn.delete(fname, flags) end
 --- when using |line()| this refers to the current buffer. Use "$"
 --- to refer to the last line in buffer {buf}.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBuffer()->deletebufline(1)
 --- <
 ---
@@ -1528,7 +1562,7 @@ function vim.fn.deletebufline(buf, first, last) end
 --- After this is called, every change on {dict} and on keys
 --- matching {pattern} will result in {callback} being invoked.
 ---
---- For example, to watch all global variables: >
+--- For example, to watch all global variables: >vim
 ---   silent! call dictwatcherdel(g:, '*', 'OnDictChanged')
 ---   function! OnDictChanged(d,k,z)
 ---     echomsg string(a:k) string(a:z)
@@ -1595,8 +1629,9 @@ function vim.fn.did_filetype() end
 --- line, "'m" mark m, etc.
 --- Returns 0 if the current window is not in diff mode.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->diff_filler()
+--- <
 ---
 --- @param lnum integer
 --- @return any
@@ -1612,7 +1647,7 @@ function vim.fn.diff_filler(lnum) end
 --- The highlight ID can be used with |synIDattr()| to obtain
 --- syntax information about the highlighting.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->diff_hlID(col)
 --- <
 ---
@@ -1628,15 +1663,15 @@ function vim.fn.diff_hlID(lnum, col) end
 ---
 --- Also see |digraph_getlist()|.
 ---
---- Examples: >
+--- Examples: >vim
 --- " Get a built-in digraph
---- :echo digraph_get('00')    " Returns '∞'
+--- echo digraph_get('00')    " Returns '∞'
 ---
 --- " Get a user-defined digraph
---- :call digraph_set('aa', 'あ')
---- :echo digraph_get('aa')    " Returns 'あ'
+--- call digraph_set('aa', 'あ')
+--- echo digraph_get('aa')    " Returns 'あ'
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetChars()->digraph_get()
 --- <
 ---
@@ -1650,14 +1685,14 @@ function vim.fn.digraph_get(chars) end
 ---
 --- Also see |digraph_get()|.
 ---
---- Examples: >
+--- Examples: >vim
 --- " Get user-defined digraphs
---- :echo digraph_getlist()
+--- echo digraph_getlist()
 ---
 --- " Get all the digraphs, including default digraphs
---- :echo digraph_getlist(1)
+--- echo digraph_getlist(1)
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetNumber()->digraph_getlist()
 --- <
 ---
@@ -1678,10 +1713,10 @@ function vim.fn.digraph_getlist(listall) end
 --- If you want to define multiple digraphs at once, you can use
 --- |digraph_setlist()|.
 ---
---- Example: >
+--- Example: >vim
 ---   call digraph_set('  ', 'あ')
 --- <
---- Can be used as a |method|: >
+--- Can be used as a |method|: >vim
 ---   GetString()->digraph_set('あ')
 --- <
 ---
@@ -1694,17 +1729,17 @@ function vim.fn.digraph_set(chars, digraph) end
 --- digraphs at once.  {digraphlist} is a list composed of lists,
 --- where each list contains two strings with {chars} and
 --- {digraph} as in |digraph_set()|. *E1216*
---- Example: >
+--- Example: >vim
 ---     call digraph_setlist([['aa', 'あ'], ['ii', 'い']])
 --- <
---- It is similar to the following: >
+--- It is similar to the following: >vim
 ---     for [chars, digraph] in [['aa', 'あ'], ['ii', 'い']]
 ---     call digraph_set(chars, digraph)
 ---     endfor
 --- <Except that the function returns after the first error,
 --- following digraphs will not be added.
 ---
---- Can be used as a |method|: >
+--- Can be used as a |method|: >vim
 ---     GetList()->digraph_setlist()
 --- <
 ---
@@ -1720,31 +1755,33 @@ function vim.fn.digraph_setlist(digraphlist) end
 --- - |v:false| and |v:null| are empty, |v:true| is not.
 --- - A |Blob| is empty when its length is zero.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->empty()
+--- <
 ---
 --- @param expr any
 --- @return any
 function vim.fn.empty(expr) end
 
 --- Return all of environment variables as dictionary. You can
---- check if an environment variable exists like this: >
----   :echo has_key(environ(), 'HOME')
+--- check if an environment variable exists like this: >vim
+---   echo has_key(environ(), 'HOME')
 --- <Note that the variable name may be CamelCase; to ignore case
---- use this: >
----   :echo index(keys(environ()), 'HOME', 0, 1) != -1
+--- use this: >vim
+---   echo index(keys(environ()), 'HOME', 0, 1) != -1
+--- <
 ---
 --- @return any
 function vim.fn.environ() end
 
 --- Escape the characters in {chars} that occur in {string} with a
---- backslash.  Example: >
----   :echo escape('c:\program files\vim', ' \')
+--- backslash.  Example: >vim
+---   echo escape('c:\program files\vim', ' \')
 --- <results in: >
 ---   c:\\program\ files\\vim
 --- <Also see |shellescape()| and |fnameescape()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->escape(' \')
 --- <
 ---
@@ -1759,8 +1796,9 @@ function vim.fn.escape(string, chars) end
 --- of them.  Also works for |Funcref|s that refer to existing
 --- functions.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   argv->join()->eval()
+--- <
 ---
 --- @param string string
 --- @return any
@@ -1796,8 +1834,9 @@ function vim.fn.eventhandler() end
 ---   -1  not implemented on this system
 --- |exepath()| can be used to get the full path of an executable.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCommand()->executable()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -1807,9 +1846,9 @@ function vim.fn.executable(expr) end
 --- If {command} is a |String|, returns {command} output.
 --- If {command} is a |List|, returns concatenated outputs.
 --- Line continuations in {command} are not recognized.
---- Examples: >
+--- Examples: >vim
 ---   echo execute('echon "foo"')
---- <  foo >
+--- <  foo >vim
 ---   echo execute(['echon "foo"', 'echon "bar"'])
 --- <  foobar
 ---
@@ -1820,7 +1859,7 @@ function vim.fn.executable(expr) end
 --- The default is "silent".  Note that with "silent!", unlike
 --- `:redir`, error messages are dropped.
 ---
---- To get a list of lines use `split()` on the result: >
+--- To get a list of lines use `split()` on the result: >vim
 ---   execute('args')->split("\n")
 ---
 --- <This function is not available in the |sandbox|.
@@ -1830,8 +1869,9 @@ function vim.fn.executable(expr) end
 --- To execute a command in another window than the current one
 --- use `win_execute()`.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCommand()->execute()
+--- <
 ---
 --- @param command any
 --- @param silent? boolean
@@ -1843,7 +1883,7 @@ function vim.fn.execute(command, silent) end
 --- Returns empty string otherwise.
 --- If {expr} starts with "./" the |current-directory| is used.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCommand()->exepath()
 --- <
 ---
@@ -1864,11 +1904,11 @@ function vim.fn.exepath(expr) end
 ---       entries, |List| items, etc.
 ---       Beware that evaluating an index may
 ---       cause an error message for an invalid
----       expression.  E.g.: >
----          :let l = [1, 2, 3]
----          :echo exists("l[5]")
---- <         0 >
----          :echo exists("l[xx]")
+---       expression.  E.g.: >vim
+---          let l = [1, 2, 3]
+---          echo exists("l[5]")
+--- <         0 >vim
+---          echo exists("l[xx]")
 --- <         E121: Undefined variable: xx
 ---          0
 ---   &option-name  Vim option (only checks if it exists,
@@ -1908,38 +1948,39 @@ function vim.fn.exepath(expr) end
 ---   ##event    autocommand for this event is
 ---       supported.
 ---
---- Examples: >
----   exists("&mouse")
----   exists("$HOSTNAME")
----   exists("*strftime")
----   exists("*s:MyFunc")
----   exists("*MyFunc")
----   exists("bufcount")
----   exists(":Make")
----   exists("#CursorHold")
----   exists("#BufReadPre#*.gz")
----   exists("#filetypeindent")
----   exists("#filetypeindent#FileType")
----   exists("#filetypeindent#FileType#*")
----   exists("##ColorScheme")
+--- Examples: >vim
+---   echo exists("&mouse")
+---   echo exists("$HOSTNAME")
+---   echo exists("*strftime")
+---   echo exists("*s:MyFunc")
+---   echo exists("*MyFunc")
+---   echo exists("bufcount")
+---   echo exists(":Make")
+---   echo exists("#CursorHold")
+---   echo exists("#BufReadPre#*.gz")
+---   echo exists("#filetypeindent")
+---   echo exists("#filetypeindent#FileType")
+---   echo exists("#filetypeindent#FileType#*")
+---   echo exists("##ColorScheme")
 --- <There must be no space between the symbol (&/$/*/#) and the
 --- name.
 --- There must be no extra characters after the name, although in
 --- a few cases this is ignored.  That may become stricter in the
 --- future, thus don't count on it!
---- Working example: >
----   exists(":make")
---- <NOT working example: >
----   exists(":make install")
+--- Working example: >vim
+---   echo exists(":make")
+--- <NOT working example: >vim
+---   echo exists(":make install")
 ---
 --- <Note that the argument must be a string, not the name of the
---- variable itself.  For example: >
----   exists(bufcount)
+--- variable itself.  For example: >vim
+---   echo exists(bufcount)
 --- <This doesn't check for existence of the "bufcount" variable,
 --- but gets the value of "bufcount", and checks if that exists.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Varname()->exists()
+--- <
 ---
 --- @param expr any
 --- @return 0|1
@@ -1949,14 +1990,15 @@ function vim.fn.exists(expr) end
 --- [0, inf].
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo exp(2)
---- <  7.389056 >
----   :echo exp(-1)
+--- Examples: >vim
+---   echo exp(2)
+--- <  7.389056 >vim
+---   echo exp(-1)
 --- <  0.367879
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->exp()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -2006,18 +2048,18 @@ function vim.fn.exp(expr) end
 ---   :r    root (one extension removed)
 ---   :e    extension only
 ---
---- Example: >
----   :let &tags = expand("%:p:h") .. "/tags"
+--- Example: >vim
+---   let &tags = expand("%:p:h") .. "/tags"
 --- <Note that when expanding a string that starts with '%', '#' or
---- '<', any following text is ignored.  This does NOT work: >
----   :let doesntwork = expand("%:h.bak")
---- <Use this: >
----   :let doeswork = expand("%:h") .. ".bak"
+--- '<', any following text is ignored.  This does NOT work: >vim
+---   let doesntwork = expand("%:h.bak")
+--- <Use this: >vim
+---   let doeswork = expand("%:h") .. ".bak"
 --- <Also note that expanding "<cfile>" and others only returns the
 --- referenced file name without further expansion.  If "<cfile>"
 --- is "~/.cshrc", you need to do another expand() to have the
---- "~/" expanded into the path of the home directory: >
----   :echo expand(expand("<cfile>"))
+--- "~/" expanded into the path of the home directory: >vim
+---   echo expand(expand("<cfile>"))
 --- <
 --- There cannot be white space between the variables and the
 --- following modifier.  The |fnamemodify()| function can be used
@@ -2037,8 +2079,8 @@ function vim.fn.exp(expr) end
 --- {nosuf} argument is given and it is |TRUE|.
 --- Names for non-existing files are included.  The "**" item can
 --- be used to search in a directory tree.  For example, to find
---- all "README" files in the current directory and below: >
----   :echo expand("**/README")
+--- all "README" files in the current directory and below: >vim
+---   echo expand("**/README")
 --- <
 --- expand() can also be used to expand variables and environment
 --- variables that are only known in a shell.  But this can be
@@ -2052,8 +2094,9 @@ function vim.fn.exp(expr) end
 --- See |glob()| for finding existing files.  See |system()| for
 --- getting the raw output of an external command.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Getpattern()->expand()
+--- <
 ---
 --- @param string string
 --- @param nosuf? boolean
@@ -2076,12 +2119,14 @@ function vim.fn.expand(string, nosuf, list) end
 --- Returns the expanded string.  If an error is encountered
 --- during expansion, the unmodified {string} is returned.
 ---
---- Example: >
----   :echo expandcmd('make %<.o')
+--- Example: >vim
+---   echo expandcmd('make %<.o')
+--- < >
 ---   make /path/runtime/doc/builtin.o
----   :echo expandcmd('make %<.o', {'errmsg': v:true})
+--- < >vim
+---   echo expandcmd('make %<.o', {'errmsg': v:true})
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCommand()->expandcmd()
 --- <
 ---
@@ -2098,16 +2143,16 @@ function vim.fn.expandcmd(string, options) end
 --- item with index {expr3} in {expr1}.  When {expr3} is zero
 --- insert before the first item.  When {expr3} is equal to
 --- len({expr1}) then {expr2} is appended.
---- Examples: >
----   :echo sort(extend(mylist, [7, 5]))
----   :call extend(mylist, [2, 3], 1)
+--- Examples: >vim
+---   echo sort(extend(mylist, [7, 5]))
+---   call extend(mylist, [2, 3], 1)
 --- <When {expr1} is the same List as {expr2} then the number of
 --- items copied is equal to the original length of the List.
 --- E.g., when {expr3} is 1 you get N new copies of the first item
 --- (where N is the original length of the List).
 --- Use |add()| to concatenate one item to a list.  To concatenate
---- two lists into a new list use the + operator: >
----   :let newlist = [1, 2, 3] + [4, 5]
+--- two lists into a new list use the + operator: >vim
+---   let newlist = [1, 2, 3] + [4, 5]
 --- <
 --- If they are |Dictionaries|:
 --- Add all entries from {expr2} to {expr1}.
@@ -2125,7 +2170,7 @@ function vim.fn.expandcmd(string, options) end
 --- fails.
 --- Returns {expr1}.  Returns 0 on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->extend(otherlist)
 --- <
 ---
@@ -2189,8 +2234,9 @@ function vim.fn.extendnew(expr1, expr2, expr3) end
 ---
 --- Return value is always 0.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetInput()->feedkeys()
+--- <
 ---
 --- @param string string
 --- @param mode? string
@@ -2210,14 +2256,19 @@ function vim.fn.file_readable(file) end
 --- expression, which is used as a String.
 --- If you don't care about the file being readable you can use
 --- |glob()|.
---- {file} is used as-is, you may want to expand wildcards first: >
+--- {file} is used as-is, you may want to expand wildcards first: >vim
 ---   echo filereadable('~/.vimrc')
+--- < >
 ---   0
+--- < >vim
 ---   echo filereadable(expand('~/.vimrc'))
+--- < >
 ---   1
+--- <
 ---
---- <Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->filereadable()
+--- <
 ---
 --- @param file string
 --- @return 0|1
@@ -2228,8 +2279,9 @@ function vim.fn.filereadable(file) end
 --- exist, or is not writable, the result is 0.  If {file} is a
 --- directory, and we can write to it, the result is 2.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->filewritable()
+--- <
 ---
 --- @param file string
 --- @return 0|1
@@ -2248,11 +2300,11 @@ function vim.fn.filewritable(file) end
 --- the current item.  For a |Blob| |v:key| has the index of the
 --- current byte.
 ---
---- Examples: >
+--- Examples: >vim
 ---   call filter(mylist, 'v:val !~ "OLD"')
---- <Removes the items where "OLD" appears. >
+--- <Removes the items where "OLD" appears. >vim
 ---   call filter(mydict, 'v:key >= 8')
---- <Removes the items with a key below 8. >
+--- <Removes the items with a key below 8. >vim
 ---   call filter(var, 0)
 --- <Removes all the items, thus clears the |List| or |Dictionary|.
 ---
@@ -2264,19 +2316,19 @@ function vim.fn.filewritable(file) end
 ---   1. the key or the index of the current item.
 ---   2. the value of the current item.
 --- The function must return |TRUE| if the item should be kept.
---- Example that keeps the odd items of a list: >
+--- Example that keeps the odd items of a list: >vim
 ---   func Odd(idx, val)
 ---     return a:idx % 2 == 1
 ---   endfunc
 ---   call filter(mylist, function('Odd'))
---- <It is shorter when using a |lambda|: >
+--- <It is shorter when using a |lambda|: >vim
 ---   call filter(myList, {idx, val -> idx * val <= 42})
---- <If you do not use "val" you can leave it out: >
+--- <If you do not use "val" you can leave it out: >vim
 ---   call filter(myList, {idx -> idx % 2 == 1})
 --- <
 --- The operation is done in-place.  If you want a |List| or
---- |Dictionary| to remain unmodified make a copy first: >
----   :let l = filter(copy(mylist), 'v:val =~ "KEEP"')
+--- |Dictionary| to remain unmodified make a copy first: >vim
+---   let l = filter(copy(mylist), 'v:val =~ "KEEP"')
 ---
 --- <Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
 --- filtered.  When an error is encountered while evaluating
@@ -2284,8 +2336,9 @@ function vim.fn.filewritable(file) end
 --- {expr2} is a Funcref errors inside a function are ignored,
 --- unless it was defined with the "abort" flag.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->filter(expr2)
+--- <
 ---
 --- @param expr1 any
 --- @param expr2 any
@@ -2309,8 +2362,9 @@ function vim.fn.filter(expr1, expr2) end
 ---
 --- This is quite similar to the ex-command `:find`.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->finddir()
+--- <
 ---
 --- @param name string
 --- @param path? string
@@ -2320,13 +2374,14 @@ function vim.fn.finddir(name, path, count) end
 
 --- Just like |finddir()|, but find a file instead of a directory.
 --- Uses 'suffixesadd'.
---- Example: >
----   :echo findfile("tags.vim", ".;")
+--- Example: >vim
+---   echo findfile("tags.vim", ".;")
 --- <Searches from the directory of the current file upwards until
 --- it finds the file "tags.vim".
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->findfile()
+--- <
 ---
 --- @param name string
 --- @param path? string
@@ -2346,13 +2401,13 @@ function vim.fn.findfile(name, path, count) end
 ---
 --- If there is an error the number zero is returned.
 ---
---- Example: >
----   :echo flatten([1, [2, [3, 4]], 5])
---- <  [1, 2, 3, 4, 5] >
----   :echo flatten([1, [2, [3, 4]], 5], 1)
+--- Example: >vim
+---   echo flatten([1, [2, [3, 4]], 5])
+--- <  [1, 2, 3, 4, 5] >vim
+---   echo flatten([1, [2, [3, 4]], 5], 1)
 --- <  [1, 2, [3, 4], 5]
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->flatten()
 --- <
 ---
@@ -2377,20 +2432,21 @@ function vim.fn.flattennew(list, maxdepth) end
 --- 64-bit Number support is enabled, 0x7fffffffffffffff or
 --- -0x7fffffffffffffff).  NaN results in -0x80000000 (or when
 --- 64-bit Number support is enabled, -0x8000000000000000).
---- Examples: >
+--- Examples: >vim
 ---   echo float2nr(3.95)
---- <  3  >
+--- <  3  >vim
 ---   echo float2nr(-23.45)
---- <  -23  >
+--- <  -23  >vim
 ---   echo float2nr(1.0e100)
---- <  2147483647  (or 9223372036854775807) >
+--- <  2147483647  (or 9223372036854775807) >vim
 ---   echo float2nr(-1.0e150)
---- <  -2147483647 (or -9223372036854775807) >
+--- <  -2147483647 (or -9223372036854775807) >vim
 ---   echo float2nr(1.0e-100)
 --- <  0
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->float2nr()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -2400,16 +2456,17 @@ function vim.fn.float2nr(expr) end
 --- {expr} as a |Float| (round down).
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
+--- Examples: >vim
 ---   echo floor(1.856)
---- <  1.0  >
+--- <  1.0  >vim
 ---   echo floor(-5.456)
---- <  -6.0  >
+--- <  -6.0  >vim
 ---   echo floor(4.0)
 --- <  4.0
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->floor()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -2424,14 +2481,15 @@ function vim.fn.floor(expr) end
 --- {expr1} and {expr2} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
 --- |Number|.
---- Examples: >
----   :echo fmod(12.33, 1.22)
---- <  0.13 >
----   :echo fmod(-12.33, 1.22)
+--- Examples: >vim
+---   echo fmod(12.33, 1.22)
+--- <  0.13 >vim
+---   echo fmod(-12.33, 1.22)
 --- <  -0.13
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->fmod(1.22)
+--- <
 ---
 --- @param expr1 any
 --- @param expr2 any
@@ -2439,7 +2497,7 @@ function vim.fn.floor(expr) end
 function vim.fn.fmod(expr1, expr2) end
 
 --- Escape {string} for use as file name command argument.  All
---- characters that have a special meaning, such as '%' and '|'
+--- characters that have a special meaning, such as `'%'` and `'|'`
 --- are escaped with a backslash.
 --- For most systems the characters escaped are
 --- " \t\n*?[{`$\\%#'\"|!<".  For systems where a backslash
@@ -2447,14 +2505,15 @@ function vim.fn.fmod(expr1, expr2) end
 --- A leading '+' and '>' is also escaped (special after |:edit|
 --- and |:write|).  And a "-" by itself (special after |:cd|).
 --- Returns an empty string on error.
---- Example: >
----   :let fname = '+some str%nge|name'
----   :exe "edit " .. fnameescape(fname)
---- <results in executing: >
+--- Example: >vim
+---   let fname = '+some str%nge|name'
+---   exe "edit " .. fnameescape(fname)
+--- <results in executing: >vim
 ---   edit \+some\ str\%nge\|name
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->fnameescape()
+--- <
 ---
 --- @param string string
 --- @return string
@@ -2463,8 +2522,8 @@ function vim.fn.fnameescape(string) end
 --- Modify file name {fname} according to {mods}.  {mods} is a
 --- string of characters like it is used for file names on the
 --- command line.  See |filename-modifiers|.
---- Example: >
----   :echo fnamemodify("main.c", ":p:h")
+--- Example: >vim
+---   echo fnamemodify("main.c", ":p:h")
 --- <results in: >
 ---   /home/user/vim/vim/src
 --- <If {mods} is empty or an unsupported modifier is used then
@@ -2476,8 +2535,9 @@ function vim.fn.fnameescape(string) end
 --- Note: Environment variables don't work in {fname}, use
 --- |expand()| first then.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->fnamemodify(':p:h')
+--- <
 ---
 --- @param fname integer
 --- @param mods string
@@ -2490,8 +2550,9 @@ function vim.fn.fnamemodify(fname, mods) end
 --- {lnum} is used like with |getline()|.  Thus "." is the current
 --- line, "'m" mark m, etc.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->foldclosed()
+--- <
 ---
 --- @param lnum integer
 --- @return integer
@@ -2503,8 +2564,9 @@ function vim.fn.foldclosed(lnum) end
 --- {lnum} is used like with |getline()|.  Thus "." is the current
 --- line, "'m" mark m, etc.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->foldclosedend()
+--- <
 ---
 --- @param lnum integer
 --- @return integer
@@ -2521,7 +2583,7 @@ function vim.fn.foldclosedend(lnum) end
 --- {lnum} is used like with |getline()|.  Thus "." is the current
 --- line, "'m" mark m, etc.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->foldlevel()
 --- <
 ---
@@ -2556,7 +2618,7 @@ function vim.fn.foldtext() end
 --- line, "'m" mark m, etc.
 --- Useful when exporting folded text, e.g., to HTML.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->foldtextresult()
 --- <
 ---
@@ -2575,7 +2637,7 @@ function vim.fn.foldtextresult(lnum) end
 --- For example `fullcommand('s')`, `fullcommand('sub')`,
 --- `fullcommand(':%substitute')` all return "substitute".
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->fullcommand()
 --- <
 ---
@@ -2594,7 +2656,7 @@ function vim.fn.fullcommand(name) end
 --- instead). {name} cannot be a builtin function.
 --- Returns 0 on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFuncname()->funcref([arg])
 --- <
 ---
@@ -2610,7 +2672,7 @@ function vim.fn.funcref(name, arglist, dict) end
 ---
 --- {name} can also be a Funcref or a partial. When it is a
 --- partial the dict stored in it will be used and the {dict}
---- argument is not allowed. E.g.: >
+--- argument is not allowed. E.g.: >vim
 ---   let FuncWithArg = function(dict.Func, [arg])
 ---   let Broken = function(dict.Func, [arg], dict)
 --- <
@@ -2623,38 +2685,41 @@ function vim.fn.funcref(name, arglist, dict) end
 --- the Funcref and will be used when the Funcref is called.
 ---
 --- The arguments are passed to the function in front of other
---- arguments, but after any argument from |method|.  Example: >
+--- arguments, but after any argument from |method|.  Example: >vim
 ---   func Callback(arg1, arg2, name)
 ---   "...
+---   endfunc
 ---   let Partial = function('Callback', ['one', 'two'])
 ---   "...
 ---   call Partial('name')
---- <Invokes the function as with: >
+--- <Invokes the function as with: >vim
 ---   call Callback('one', 'two', 'name')
 ---
---- <With a |method|: >
+--- <With a |method|: >vim
 ---   func Callback(one, two, three)
 ---   "...
+---   endfunc
 ---   let Partial = function('Callback', ['two'])
 ---   "...
 ---   eval 'one'->Partial('three')
---- <Invokes the function as with: >
+--- <Invokes the function as with: >vim
 ---   call Callback('one', 'two', 'three')
 ---
 --- <The function() call can be nested to add more arguments to the
 --- Funcref.  The extra arguments are appended to the list of
---- arguments.  Example: >
+--- arguments.  Example: >vim
 ---   func Callback(arg1, arg2, name)
 ---   "...
+---   endfunc
 ---   let Func = function('Callback', ['one'])
 ---   let Func2 = function(Func, ['two'])
 ---   "...
 ---   call Func2('name')
---- <Invokes the function as with: >
+--- <Invokes the function as with: >vim
 ---   call Callback('one', 'two', 'name')
 ---
 --- <The Dictionary is only useful when calling a "dict" function.
---- In that case the {dict} is passed in as "self". Example: >
+--- In that case the {dict} is passed in as "self". Example: >vim
 ---   function Callback() dict
 ---      echo "called for " .. self.name
 ---   endfunction
@@ -2665,24 +2730,26 @@ function vim.fn.funcref(name, arglist, dict) end
 ---   call Func()  " will echo: called for example
 --- <The use of function() is not needed when there are no extra
 --- arguments, these two are equivalent, if Callback() is defined
---- as context.Callback(): >
+--- as context.Callback(): >vim
 ---   let Func = function('Callback', context)
 ---   let Func = context.Callback
 ---
---- <The argument list and the Dictionary can be combined: >
+--- <The argument list and the Dictionary can be combined: >vim
 ---   function Callback(arg1, count) dict
 ---   "...
+---   endfunction
 ---   let context = {"name": "example"}
 ---   let Func = function('Callback', ['one'], context)
 ---   "...
 ---   call Func(500)
---- <Invokes the function as with: >
+--- <Invokes the function as with: >vim
 ---   call context.Callback('one', 500)
 --- <
 --- Returns 0 on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFuncname()->function([arg])
+--- <
 ---
 --- @param name string
 --- @param arglist? any
@@ -2716,8 +2783,9 @@ function vim.fn.garbagecollect(atexit) end
 --- Get item {idx} from |List| {list}.  When this item is not
 --- available return {default}.  Return zero when {default} is
 --- omitted.
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->get(idx)
+--- <
 ---
 --- @param list any[]
 --- @param idx integer
@@ -2737,7 +2805,7 @@ function vim.fn.get(blob, idx, default) end
 
 --- Get item with key {key} from |Dictionary| {dict}.  When this
 --- item is not available return {default}.  Return zero when
---- {default} is omitted.  Useful example: >
+--- {default} is omitted.  Useful example: >vim
 ---   let val = get(g:, 'var_name', 'default')
 --- <This gets the value of g:var_name if it exists, and uses
 --- "default" when it does not exist.
@@ -2798,8 +2866,8 @@ function vim.fn.getbufinfo(buf) end
 ---       displayed in the window in the past.
 ---       If you want the line number of the
 ---       last known cursor position in a given
----       window, use |line()|: >
----         :echo line('.', {winid})
+---       window, use |line()|: >vim
+---         echo line('.', {winid})
 --- <
 ---   linecount  Number of lines in the buffer (only
 ---       valid when loaded)
@@ -2816,20 +2884,20 @@ function vim.fn.getbufinfo(buf) end
 ---   windows    List of |window-ID|s that display this
 ---       buffer
 ---
---- Examples: >
+--- Examples: >vim
 ---   for buf in getbufinfo()
 ---       echo buf.name
 ---   endfor
 ---   for buf in getbufinfo({'buflisted':1})
 ---       if buf.changed
----     ....
+---     " ....
 ---       endif
 ---   endfor
 --- <
---- To get buffer-local options use: >
+--- To get buffer-local options use: >vim
 ---   getbufvar({bufnr}, '&option_name')
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBufnr()->getbufinfo()
 --- <
 ---
@@ -2858,10 +2926,10 @@ function vim.fn.getbufinfo(dict) end
 --- This function works only for loaded buffers.  For unloaded and
 --- non-existing buffers, an empty |List| is returned.
 ---
---- Example: >
----   :let lines = getbufline(bufnr("myfile"), 1, "$")
+--- Example: >vim
+---   let lines = getbufline(bufnr("myfile"), 1, "$")
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetBufnr()->getbufline(lnum)
 --- <
 ---
@@ -2895,11 +2963,11 @@ function vim.fn.getbufoneline(buf, lnum) end
 --- For the use of {buf}, see |bufname()| above.
 --- When the buffer or variable doesn't exist {def} or an empty
 --- string is returned, there is no error message.
---- Examples: >
----   :let bufmodified = getbufvar(1, "&mod")
----   :echo "todo myvar = " .. getbufvar("todo", "myvar")
+--- Examples: >vim
+---   let bufmodified = getbufvar(1, "&mod")
+---   echo "todo myvar = " .. getbufvar("todo", "myvar")
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetBufnr()->getbufvar(varname)
 --- <
 ---
@@ -2932,8 +3000,9 @@ function vim.fn.getcellwidths() end
 --- position refers to the position in the list. For other
 --- buffers, it is set to the length of the list.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBufnr()->getchangelist()
+--- <
 ---
 --- @param buf? integer|string
 --- @return table[]
@@ -2972,7 +3041,7 @@ function vim.fn.getchangelist(buf) end
 --- |v:mouse_lnum|, |v:mouse_winid| and |v:mouse_win|.
 --- |getmousepos()| can also be used.  Mouse move events will be
 --- ignored.
---- This example positions the mouse as it would normally happen: >
+--- This example positions the mouse as it would normally happen: >vim
 ---   let c = getchar()
 ---   if c == "\<LeftMouse>" && v:mouse_win > 0
 ---     exe v:mouse_win .. "wincmd w"
@@ -2987,20 +3056,20 @@ function vim.fn.getchangelist(buf) end
 --- There is no mapping for the character.
 --- Key codes are replaced, thus when the user presses the <Del>
 --- key you get the code for the <Del> key, not the raw character
---- sequence.  Examples: >
+--- sequence.  Examples: >vim
 ---   getchar() == "\<Del>"
 ---   getchar() == "\<S-Left>"
---- <This example redefines "f" to ignore case: >
----   :nmap f :call FindChar()<CR>
----   :function FindChar()
----   :  let c = nr2char(getchar())
----   :  while col('.') < col('$') - 1
----   :    normal l
----   :    if getline('.')[col('.') - 1] ==? c
----   :      break
----   :    endif
----   :  endwhile
----   :endfunction
+--- <This example redefines "f" to ignore case: >vim
+---   nmap f :call FindChar()<CR>
+---   function FindChar()
+---     let c = nr2char(getchar())
+---     while col('.') < col('$') - 1
+---       normal l
+---       if getline('.')[col('.') - 1] ==? c
+---         break
+---       endif
+---     endwhile
+---   endfunction
 --- <
 ---
 --- @return integer
@@ -3032,12 +3101,13 @@ function vim.fn.getcharmod() end
 --- of the last character.
 ---
 --- Example:
---- With the cursor on '세' in line 5 with text "여보세요": >
+--- With the cursor on '세' in line 5 with text "여보세요": >vim
 ---   getcharpos('.')    returns [0, 5, 3, 0]
 ---   getpos('.')    returns [0, 5, 7, 0]
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMark()->getcharpos()
+--- <
 ---
 --- @param expr any
 --- @return integer[]
@@ -3057,9 +3127,9 @@ function vim.fn.getcharpos(expr) end
 ---
 --- This can be useful to always have |;| and |,| search
 --- forward/backward regardless of the direction of the previous
---- character search: >
----   :nnoremap <expr> ; getcharsearch().forward ? ';' : ','
----   :nnoremap <expr> , getcharsearch().forward ? ',' : ';'
+--- character search: >vim
+---   nnoremap <expr> ; getcharsearch().forward ? ';' : ','
+---   nnoremap <expr> , getcharsearch().forward ? ',' : ';'
 --- <Also see |setcharsearch()|.
 ---
 --- @return table[]
@@ -3093,8 +3163,8 @@ function vim.fn.getcmdcompltype() end
 --- Return the current command-line.  Only works when the command
 --- line is being edited, thus requires use of |c_CTRL-\_e| or
 --- |c_CTRL-R_=|.
---- Example: >
----   :cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
+--- Example: >vim
+---   cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
 --- <Also see |getcmdtype()|, |getcmdpos()|, |setcmdpos()| and
 --- |setcmdline()|.
 --- Returns an empty string when entering a password or using
@@ -3209,13 +3279,13 @@ function vim.fn.getcmdwintype() end
 ---
 --- If {type} is "cmdline", then the |cmdline-completion| result is
 --- returned.  For example, to complete the possible values after
---- a ":call" command: >
+--- a ":call" command: >vim
 ---   echo getcompletion('call ', 'cmdline')
 --- <
 --- If there are no matches, an empty list is returned.  An
 --- invalid value for {type} produces an error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetPattern()->getcompletion('color')
 --- <
 ---
@@ -3242,14 +3312,14 @@ function vim.fn.getcompletion(pat, type, filtered) end
 --- current value of the buffer if it is not the current window.
 --- If {winid} is invalid a list with zeroes is returned.
 ---
---- This can be used to save and restore the cursor position: >
+--- This can be used to save and restore the cursor position: >vim
 ---   let save_cursor = getcurpos()
 ---   MoveTheCursorAround
 ---   call setpos('.', save_cursor)
 --- <Note that this only works within the window.  See
 --- |winrestview()| for restoring more state.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->getcurpos()
 --- <
 ---
@@ -3261,12 +3331,13 @@ function vim.fn.getcurpos(winid) end
 --- List is a character index instead of a byte index.
 ---
 --- Example:
---- With the cursor on '보' in line 3 with text "여보세요": >
----   getcursorcharpos()  returns [0, 3, 2, 0, 3]
----   getcurpos()    returns [0, 3, 4, 0, 3]
+--- With the cursor on '보' in line 3 with text "여보세요": >vim
+---   getcursorcharpos()  " returns [0, 3, 2, 0, 3]
+---   getcurpos()    " returns [0, 3, 4, 0, 3]
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->getcursorcharpos()
+--- <
 ---
 --- @param winid? integer
 --- @return any
@@ -3278,7 +3349,7 @@ function vim.fn.getcursorcharpos(winid) end
 --- ignored.
 --- Tabs and windows are identified by their respective numbers,
 --- 0 means current tab or window. Missing tab number implies 0.
---- Thus the following are equivalent: >
+--- Thus the following are equivalent: >vim
 ---   getcwd(0)
 ---   getcwd(0, 0)
 --- <If {winnr} is -1 it is ignored, only the tab is resolved.
@@ -3287,8 +3358,9 @@ function vim.fn.getcursorcharpos(winid) end
 --- directory is returned.
 --- Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinnr()->getcwd()
+--- <
 ---
 --- @param winnr? integer
 --- @param tabnr? integer
@@ -3296,15 +3368,16 @@ function vim.fn.getcursorcharpos(winid) end
 function vim.fn.getcwd(winnr, tabnr) end
 
 --- Return the value of environment variable {name}.  The {name}
---- argument is a string, without a leading '$'.  Example: >
+--- argument is a string, without a leading '$'.  Example: >vim
 ---   myHome = getenv('HOME')
 ---
 --- <When the variable does not exist |v:null| is returned.  That
 --- is different from a variable set to an empty string.
 --- See also |expr-env|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetVarname()->getenv()
+--- <
 ---
 --- @param name string
 --- @return string
@@ -3333,13 +3406,13 @@ function vim.fn.getfontname(name) end
 --- "rwx" flags represent, in turn, the permissions of the owner
 --- of the file, the group the file belongs to, and other users.
 --- If a user does not have a given permission the flag for this
---- is replaced with the string "-".  Examples: >
----   :echo getfperm("/etc/passwd")
----   :echo getfperm(expand("~/.config/nvim/init.vim"))
+--- is replaced with the string "-".  Examples: >vim
+---   echo getfperm("/etc/passwd")
+---   echo getfperm(expand("~/.config/nvim/init.vim"))
 --- <This will hopefully (from a security point of view) display
 --- the string "rw-r--r--" or even "rw-------".
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFilename()->getfperm()
 --- <
 --- For setting permissions use |setfperm()|.
@@ -3355,8 +3428,9 @@ function vim.fn.getfperm(fname) end
 --- If the size of {fname} is too big to fit in a Number then -2
 --- is returned.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFilename()->getfsize()
+--- <
 ---
 --- @param fname integer
 --- @return integer
@@ -3368,8 +3442,9 @@ function vim.fn.getfsize(fname) end
 --- |localtime()| and |strftime()|.
 --- If the file {fname} can't be found -1 is returned.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFilename()->getftime()
+--- <
 ---
 --- @param fname integer
 --- @return integer
@@ -3388,14 +3463,15 @@ function vim.fn.getftime(fname) end
 ---   Socket      "socket"
 ---   FIFO      "fifo"
 ---   All other    "other"
---- Example: >
+--- Example: >vim
 ---   getftype("/home")
 --- <Note that a type such as "link" will only be returned on
 --- systems that support it.  On some systems only "dir" and
 --- "file" are returned.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFilename()->getftype()
+--- <
 ---
 --- @param fname integer
 --- @return 'file'|'dir'|'link'|'bdev'|'cdev'|'socket'|'fifo'|'other'
@@ -3420,7 +3496,7 @@ function vim.fn.getftype(fname) end
 ---   filename  filename if available
 ---   lnum    line number
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinnr()->getjumplist()
 --- <
 ---
@@ -3430,11 +3506,11 @@ function vim.fn.getftype(fname) end
 function vim.fn.getjumplist(winnr, tabnr) end
 
 --- Without {end} the result is a String, which is line {lnum}
---- from the current buffer.  Example: >
+--- from the current buffer.  Example: >vim
 ---   getline(1)
 --- <When {lnum} is a String that doesn't start with a
 --- digit, |line()| is called to translate the String into a Number.
---- To get the line under the cursor: >
+--- To get the line under the cursor: >vim
 ---   getline(".")
 --- <When {lnum} is a number smaller than 1 or bigger than the
 --- number of lines in the buffer, an empty string is returned.
@@ -3445,12 +3521,12 @@ function vim.fn.getjumplist(winnr, tabnr) end
 --- {end} is used in the same way as {lnum}.
 --- Non-existing lines are silently omitted.
 --- When {end} is before {lnum} an empty |List| is returned.
---- Example: >
----   :let start = line('.')
----   :let end = search("^$") - 1
----   :let lines = getline(start, end)
+--- Example: >vim
+---   let start = line('.')
+---   let end = search("^$") - 1
+---   let lines = getline(start, end)
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   ComputeLnum()->getline()
 ---
 --- <To get lines from another buffer see |getbufline()| and
@@ -3487,9 +3563,9 @@ function vim.fn.getline(lnum, end_) end
 --- location list for the window {nr}.
 --- Returns an empty Dictionary if window {nr} does not exist.
 ---
---- Examples (See also |getqflist-examples|): >
----   :echo getloclist(3, {'all': 0})
----   :echo getloclist(5, {'filewinid': 0})
+--- Examples (See also |getqflist-examples|): >vim
+---   echo getloclist(3, {'all': 0})
+---   echo getloclist(5, {'filewinid': 0})
 --- <
 ---
 --- @param nr integer
@@ -3515,8 +3591,9 @@ function vim.fn.getloclist(nr, what) end
 --- Refer to |getpos()| for getting information about a specific
 --- mark.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBufnr()->getmarklist()
+--- <
 ---
 --- @param buf? any
 --- @return any
@@ -3531,26 +3608,26 @@ function vim.fn.getmarklist(buf) end
 --- window ID instead of the current window.  If {win} is invalid,
 --- an empty list is returned.
 --- Example: >vim
----   :echo getmatches()
+---   echo getmatches()
 --- < >
 ---   [{"group": "MyGroup1", "pattern": "TODO",
 ---   "priority": 10, "id": 1}, {"group": "MyGroup2",
 ---   "pattern": "FIXME", "priority": 10, "id": 2}]
 --- < >vim
----   :let m = getmatches()
----   :call clearmatches()
----   :echo getmatches()
+---   let m = getmatches()
+---   call clearmatches()
+---   echo getmatches()
 --- < >
 ---   []
 --- < >vim
----   :call setmatches(m)
----   :echo getmatches()
+---   call setmatches(m)
+---   echo getmatches()
 --- < >
 ---   [{"group": "MyGroup1", "pattern": "TODO",
 ---   "priority": 10, "id": 1}, {"group": "MyGroup2",
 ---   "pattern": "FIXME", "priority": 10, "id": 2}]
 --- < >vim
----   :unlet m
+---   unlet m
 --- <
 ---
 --- @param win? any
@@ -3616,14 +3693,15 @@ function vim.fn.getpid() end
 --- A very large column number equal to |v:maxcol| can be returned,
 --- in which case it means "after the end of the line".
 --- If {expr} is invalid, returns a list with all zeros.
---- This can be used to save and restore the position of a mark: >
+--- This can be used to save and restore the position of a mark: >vim
 ---   let save_a_mark = getpos("'a")
----   ...
+---   " ...
 ---   call setpos("'a", save_a_mark)
 --- <Also see |getcharpos()|, |getcurpos()| and |setpos()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMark()->getpos()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -3654,11 +3732,11 @@ function vim.fn.getpos(expr) end
 --- you may need to explicitly check for zero).
 ---
 --- Useful application: Find pattern matches in multiple files and
---- do something with them: >
----   :vimgrep /theword/jg *.c
----   :for d in getqflist()
----   :   echo bufname(d.bufnr) ':' d.lnum '=' d.text
----   :endfor
+--- do something with them: >vim
+---   vimgrep /theword/jg *.c
+---   for d in getqflist()
+---      echo bufname(d.bufnr) ':' d.lnum '=' d.text
+---   endfor
 --- <
 --- If the optional {what} dictionary argument is supplied, then
 --- returns only the items listed in {what} as a dictionary. The
@@ -3723,10 +3801,10 @@ function vim.fn.getpos(expr) end
 ---     to "".
 ---   winid  quickfix |window-ID|. If not present, set to 0
 ---
---- Examples (See also |getqflist-examples|): >
----   :echo getqflist({'all': 1})
----   :echo getqflist({'nr': 2, 'title': 1})
----   :echo getqflist({'lines' : ["F1:10:L10"]})
+--- Examples (See also |getqflist-examples|): >vim
+---   echo getqflist({'all': 1})
+---   echo getqflist({'nr': 2, 'title': 1})
+---   echo getqflist({'lines' : ["F1:10:L10"]})
 --- <
 ---
 --- @param what? any
@@ -3734,8 +3812,8 @@ function vim.fn.getpos(expr) end
 function vim.fn.getqflist(what) end
 
 --- The result is a String, which is the contents of register
---- {regname}.  Example: >
----   :let cliptext = getreg('*')
+--- {regname}.  Example: >vim
+---   let cliptext = getreg('*')
 --- <When register {regname} was not set the result is an empty
 --- string.
 --- The {regname} argument must be a string.
@@ -3755,8 +3833,9 @@ function vim.fn.getqflist(what) end
 ---
 --- If {regname} is not specified, |v:register| is used.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRegname()->getreg()
+--- <
 ---
 --- @param regname? string
 --- @param list? any
@@ -3786,8 +3865,9 @@ function vim.fn.getreg(regname, list) end
 --- If {regname} is not specified, |v:register| is used.
 --- The returned Dictionary can be passed to |setreg()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRegname()->getreginfo()
+--- <
 ---
 --- @param regname? string
 --- @return table
@@ -3803,8 +3883,9 @@ function vim.fn.getreginfo(regname) end
 --- The {regname} argument is a string.  If {regname} is not
 --- specified, |v:register| is used.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRegname()->getregtype()
+--- <
 ---
 --- @param regname? string
 --- @return string
@@ -3841,9 +3922,9 @@ function vim.fn.getregtype(regname) end
 ---     this dictionary.
 ---     version  Vimscript version, always 1
 ---
---- Examples: >
----   :echo getscriptinfo({'name': 'myscript'})
----   :echo getscriptinfo({'sid': 15}).variables
+--- Examples: >vim
+---   echo getscriptinfo({'name': 'myscript'})
+---   echo getscriptinfo({'sid': 15}).variables
 --- <
 ---
 --- @param opts? table
@@ -3862,8 +3943,9 @@ function vim.fn.getscriptinfo(opts) end
 ---       tabpage-local variables
 ---   windows    List of |window-ID|s in the tab page.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTabnr()->gettabinfo()
+--- <
 ---
 --- @param tabnr? integer
 --- @return any
@@ -3878,8 +3960,9 @@ function vim.fn.gettabinfo(tabnr) end
 --- When the tab or variable doesn't exist {def} or an empty
 --- string is returned, there is no error message.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTabnr()->gettabvar(varname)
+--- <
 ---
 --- @param tabnr integer
 --- @param varname string
@@ -3905,15 +3988,16 @@ function vim.fn.gettabvar(tabnr, varname, def) end
 --- or buffer-local variable.
 --- When the tab, window or variable doesn't exist {def} or an
 --- empty string is returned, there is no error message.
---- Examples: >
----   :let list_is_on = gettabwinvar(1, 2, '&list')
----   :echo "myvar = " .. gettabwinvar(3, 1, 'myvar')
+--- Examples: >vim
+---   let list_is_on = gettabwinvar(1, 2, '&list')
+---   echo "myvar = " .. gettabwinvar(3, 1, 'myvar')
 --- <
---- To obtain all window-local variables use: >
+--- To obtain all window-local variables use: >vim
 ---   gettabwinvar({tabnr}, {winnr}, '&')
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTabnr()->gettabwinvar(winnr, varname)
+--- <
 ---
 --- @param tabnr integer
 --- @param winnr integer
@@ -3949,7 +4033,7 @@ function vim.fn.gettabwinvar(tabnr, winnr, varname, def) end
 ---
 --- See |tagstack| for more information about the tag stack.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinnr()->gettagstack()
 --- <
 ---
@@ -4004,8 +4088,9 @@ function vim.fn.gettext(text) end
 ---   winrow    topmost screen line of the window;
 ---       "row" from |win_screenpos()|
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinnr()->getwininfo()
+--- <
 ---
 --- @param winid? integer
 --- @return any
@@ -4021,7 +4106,7 @@ function vim.fn.getwininfo(winid) end
 --- When using a value less than 10 and no response is received
 --- within that time, a previously reported position is returned,
 --- if available.  This can be used to poll for the position and
---- do some work in the meantime: >
+--- do some work in the meantime: >vim
 ---   while 1
 ---     let res = getwinpos(1)
 ---     if res[0] >= 0
@@ -4030,7 +4115,7 @@ function vim.fn.getwininfo(winid) end
 ---     " Do some work here
 ---   endwhile
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTimeout()->getwinpos()
 --- <
 ---
@@ -4055,11 +4140,11 @@ function vim.fn.getwinposx() end
 function vim.fn.getwinposy() end
 
 --- Like |gettabwinvar()| for the current tabpage.
---- Examples: >
----   :let list_is_on = getwinvar(2, '&list')
----   :echo "myvar = " .. getwinvar(1, 'myvar')
+--- Examples: >vim
+---   let list_is_on = getwinvar(2, '&list')
+---   echo "myvar = " .. getwinvar(1, 'myvar')
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetWinnr()->getwinvar(varname)
 --- <
 ---
@@ -4095,17 +4180,18 @@ function vim.fn.getwinvar(winnr, varname, def) end
 --- |TRUE| then all symbolic links are included.
 ---
 --- For most systems backticks can be used to get files names from
---- any external command.  Example: >
----   :let tagfiles = glob("`find . -name tags -print`")
----   :let &tags = substitute(tagfiles, "\n", ",", "g")
+--- any external command.  Example: >vim
+---   let tagfiles = glob("`find . -name tags -print`")
+---   let &tags = substitute(tagfiles, "\n", ",", "g")
 --- <The result of the program inside the backticks should be one
 --- item per line.  Spaces inside an item are allowed.
 ---
 --- See |expand()| for expanding special Vim variables.  See
 --- |system()| for getting the raw output of an external command.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetExpr()->glob()
+--- <
 ---
 --- @param expr any
 --- @param nosuf? boolean
@@ -4116,16 +4202,20 @@ function vim.fn.glob(expr, nosuf, list, alllinks) end
 
 --- Convert a file pattern, as used by glob(), into a search
 --- pattern.  The result can be used to match with a string that
---- is a file name.  E.g. >
+--- is a file name.  E.g. >vim
 ---   if filename =~ glob2regpat('Make*.mak')
---- <This is equivalent to: >
+---     " ...
+---   endif
+--- <This is equivalent to: >vim
 ---   if filename =~ '^Make.*\.mak$'
+---     " ...
+---   endif
 --- <When {string} is an empty string the result is "^$", match an
 --- empty string.
 --- Note that the result depends on the system.  On MS-Windows
 --- a backslash usually means a path separator.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetExpr()->glob2regpat()
 --- <
 ---
@@ -4134,8 +4224,8 @@ function vim.fn.glob(expr, nosuf, list, alllinks) end
 function vim.fn.glob2regpat(string) end
 
 --- Perform glob() for String {expr} on all directories in {path}
---- and concatenate the results.  Example: >
----   :echo globpath(&rtp, "syntax/c.vim")
+--- and concatenate the results.  Example: >vim
+---   echo globpath(&rtp, "syntax/c.vim")
 --- <
 --- {path} is a comma-separated list of directory names.  Each
 --- directory name is prepended to {expr} and expanded like with
@@ -4155,20 +4245,20 @@ function vim.fn.glob2regpat(string) end
 --- with all matching files. The advantage of using a List is, you
 --- also get filenames containing newlines correctly. Otherwise
 --- the result is a String and when there are several matches,
---- they are separated by <NL> characters.  Example: >
----   :echo globpath(&rtp, "syntax/c.vim", 0, 1)
+--- they are separated by <NL> characters.  Example: >vim
+---   echo globpath(&rtp, "syntax/c.vim", 0, 1)
 --- <
 --- {allinks} is used as with |glob()|.
 ---
 --- The "**" item can be used to search in a directory tree.
 --- For example, to find all "README.txt" files in the directories
---- in 'runtimepath' and below: >
----   :echo globpath(&rtp, "**/README.txt")
+--- in 'runtimepath' and below: >vim
+---   echo globpath(&rtp, "**/README.txt")
 --- <Upwards search and limiting the depth of "**" is not
 --- supported, thus using 'path' will not always work properly.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetExpr()->globpath(&rtp)
 --- <
 ---
@@ -4189,9 +4279,9 @@ function vim.fn.globpath(path, expr, nosuf, list, allinks) end
 ---
 --- <If the code has a syntax error then Vimscript may skip the
 --- rest of the line.  Put |:if| and |:endif| on separate lines to
---- avoid the syntax error: >
+--- avoid the syntax error: >vim
 ---   if has('feature')
----     let x = this->breaks->without->the->feature
+---     let x = this_breaks_without_the_feature()
 ---   endif
 --- <
 --- Vim's compile-time feature-names (prefixed with "+") are not
@@ -4200,12 +4290,16 @@ function vim.fn.globpath(path, expr, nosuf, list, allinks) end
 ---
 --- Feature names can be:
 --- 1.  Nvim version. For example the "nvim-0.2.1" feature means
----     that Nvim is version 0.2.1 or later: >
----   :if has("nvim-0.2.1")
+---     that Nvim is version 0.2.1 or later: >vim
+---   if has("nvim-0.2.1")
+---     " ...
+---   endif
 ---
 --- <2.  Runtime condition or other pseudo-feature. For example the
----     "win32" feature checks if the current system is Windows: >
----   :if has("win32")
+---     "win32" feature checks if the current system is Windows: >vim
+---   if has("win32")
+---     " ...
+---   endif
 --- <          *feature-list*
 ---     List of supported pseudo-feature names:
 ---   acl    |ACL| support.
@@ -4231,12 +4325,16 @@ function vim.fn.globpath(path, expr, nosuf, list, allinks) end
 ---
 ---           *has-patch*
 --- 3.  Vim patch. For example the "patch123" feature means that
----     Vim patch 123 at the current |v:version| was included: >
----   :if v:version > 602 || v:version == 602 && has("patch148")
+---     Vim patch 123 at the current |v:version| was included: >vim
+---   if v:version > 602 || v:version == 602 && has("patch148")
+---     " ...
+---   endif
 ---
 --- <4.  Vim version. For example the "patch-7.4.237" feature means
----     that Nvim is Vim-compatible to version 7.4.237 or later. >
----   :if has("patch-7.4.237")
+---     that Nvim is Vim-compatible to version 7.4.237 or later. >vim
+---   if has("patch-7.4.237")
+---     " ...
+---   endif
 --- <
 ---
 --- @param feature any
@@ -4247,8 +4345,9 @@ function vim.fn.has(feature) end
 --- has an entry with key {key}.  FALSE otherwise. The {key}
 --- argument is a string.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mydict->has_key(key)
+--- <
 ---
 --- @param dict any
 --- @param key any
@@ -4261,18 +4360,19 @@ function vim.fn.has_key(dict, key) end
 ---
 --- Tabs and windows are identified by their respective numbers,
 --- 0 means current tab or window. Missing argument implies 0.
---- Thus the following are equivalent: >
----   haslocaldir()
----   haslocaldir(0)
----   haslocaldir(0, 0)
+--- Thus the following are equivalent: >vim
+---   echo haslocaldir()
+---   echo haslocaldir(0)
+---   echo haslocaldir(0, 0)
 --- <With {winnr} use that window in the current tabpage.
 --- With {winnr} and {tabnr} use the window in that tabpage.
 --- {winnr} can be the window number or the |window-ID|.
 --- If {winnr} is -1 it is ignored, only the tab is resolved.
 --- Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinnr()->haslocaldir()
+--- <
 ---
 --- @param winnr? integer
 --- @param tabnr? integer
@@ -4302,15 +4402,16 @@ function vim.fn.haslocaldir(winnr, tabnr) end
 --- When {mode} is omitted, "nvo" is used.
 ---
 --- This function is useful to check if a mapping already exists
---- to a function in a Vim script.  Example: >
----   :if !hasmapto('\ABCdoit')
----   :   map <Leader>d \ABCdoit
----   :endif
+--- to a function in a Vim script.  Example: >vim
+---   if !hasmapto('\ABCdoit')
+---      map <Leader>d \ABCdoit
+---   endif
 --- <This installs the mapping to "\ABCdoit" only if there isn't
 --- already a mapping to "\ABCdoit".
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRHS()->hasmapto()
+--- <
 ---
 --- @param what any
 --- @param mode? string
@@ -4347,14 +4448,15 @@ function vim.fn.highlight_exists(name) end
 --- The result is a Number: TRUE if the operation was successful,
 --- otherwise FALSE is returned.
 ---
---- Example: >
----   :call histadd("input", strftime("%Y %b %d"))
----   :let date=input("Enter date: ")
+--- Example: >vim
+---   call histadd("input", strftime("%Y %b %d"))
+---   let date=input("Enter date: ")
 --- <This function is not available in the |sandbox|.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetHistory()->histadd('search')
+--- <
 ---
 --- @param history any
 --- @param item any
@@ -4376,24 +4478,25 @@ function vim.fn.histadd(history, item) end
 --- is returned.
 ---
 --- Examples:
---- Clear expression register history: >
----   :call histdel("expr")
+--- Clear expression register history: >vim
+---   call histdel("expr")
 --- <
---- Remove all entries starting with "*" from the search history: >
----   :call histdel("/", '^\*')
+--- Remove all entries starting with "*" from the search history: >vim
+---   call histdel("/", '^\*')
 --- <
---- The following three are equivalent: >
----   :call histdel("search", histnr("search"))
----   :call histdel("search", -1)
----   :call histdel("search", '^' .. histget("search", -1) .. '$')
+--- The following three are equivalent: >vim
+---   call histdel("search", histnr("search"))
+---   call histdel("search", -1)
+---   call histdel("search", '^' .. histget("search", -1) .. '$')
 --- <
 --- To delete the last search pattern and use the last-but-one for
---- the "n" command and 'hlsearch': >
----   :call histdel("search", -1)
----   :let \@/ = histget("search", -1)
+--- the "n" command and 'hlsearch': >vim
+---   call histdel("search", -1)
+---   let \@/ = histget("search", -1)
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetHistory()->histdel()
+--- <
 ---
 --- @param history any
 --- @param item? any
@@ -4407,15 +4510,16 @@ function vim.fn.histdel(history, item) end
 --- omitted, the most recent item from the history is used.
 ---
 --- Examples:
---- Redo the second last search from history. >
----   :execute '/' .. histget("search", -2)
+--- Redo the second last search from history. >vim
+---   execute '/' .. histget("search", -2)
 ---
 --- <Define an Ex command ":H {num}" that supports re-execution of
---- the {num}th entry from the output of |:history|. >
----   :command -nargs=1 H execute histget("cmd", 0+<args>)
+--- the {num}th entry from the output of |:history|. >vim
+---   command -nargs=1 H execute histget("cmd", 0+<args>)
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetHistory()->histget()
+--- <
 ---
 --- @param history any
 --- @param index? any
@@ -4426,10 +4530,10 @@ function vim.fn.histget(history, index) end
 --- See |hist-names| for the possible values of {history}.
 --- If an error occurred, -1 is returned.
 ---
---- Example: >
----   :let inp_index = histnr("expr")
+--- Example: >vim
+---   let inp_index = histnr("expr")
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetHistory()->histnr()
 --- <
 ---
@@ -4442,11 +4546,12 @@ function vim.fn.histnr(history) end
 --- zero is returned.
 --- This can be used to retrieve information about the highlight
 --- group.  For example, to get the background color of the
---- "Comment" group: >
----   :echo synIDattr(synIDtrans(hlID("Comment")), "bg")
+--- "Comment" group: >vim
+---   echo synIDattr(synIDtrans(hlID("Comment")), "bg")
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->hlID()
+--- <
 ---
 --- @param name string
 --- @return integer
@@ -4458,7 +4563,7 @@ function vim.fn.hlID(name) end
 --- been defined for it, it may also have been used for a syntax
 --- item.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->hlexists()
 --- <
 ---
@@ -4484,7 +4589,7 @@ function vim.fn.hostname() end
 --- from/to UCS-2 is automatically changed to use UTF-8.  You
 --- cannot use UCS-2 in a string anyway, because of the NUL bytes.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->iconv('latin1', 'utf-8')
 --- <
 ---
@@ -4498,8 +4603,8 @@ function vim.fn.iconv(string, from, to) end
 --- container type (|List|, |Dict|, |Blob| and |Partial|). It is
 --- guaranteed that for the mentioned types `id(v1) ==# id(v2)`
 --- returns true iff `type(v1) == type(v2) && v1 is v2`.
---- Note that |v:_null_string|, |v:_null_list|, |v:_null_dict| and
---- |v:_null_blob| have the same `id()` with different types
+--- Note that `v:_null_string`, `v:_null_list`, `v:_null_dict` and
+--- `v:_null_blob` have the same `id()` with different types
 --- because they are internally represented as NULL pointers.
 --- `id()` returns a hexadecimal representanion of the pointers to
 --- the containers (i.e. like `0x994a40`), same as `printf("%p",
@@ -4519,8 +4624,9 @@ function vim.fn.id(expr) end
 --- |getline()|.
 --- When {lnum} is invalid -1 is returned.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->indent()
+--- <
 ---
 --- @param lnum integer
 --- @return integer
@@ -4546,12 +4652,15 @@ function vim.fn.indent(lnum) end
 --- case must match.
 ---
 --- -1 is returned when {expr} is not found in {object}.
---- Example: >
----   :let idx = index(words, "the")
----   :if index(numbers, 123) >= 0
+--- Example: >vim
+---   let idx = index(words, "the")
+---   if index(numbers, 123) >= 0
+---     " ...
+---   endif
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetObject()->index(what)
+--- <
 ---
 --- @param object any
 --- @param expr any
@@ -4591,14 +4700,15 @@ function vim.fn.index(object, expr, start, ic) end
 ---     index; may be negative for an item relative to
 ---     the end
 --- Returns -1 when {expr} evaluates to v:false for all the items.
---- Example: >
----   :let l = [#{n: 10}, #{n: 20}, #{n: 30}]
----   :echo indexof(l, "v:val.n == 20")
----   :echo indexof(l, {i, v -> v.n == 30})
----   :echo indexof(l, "v:val.n == 20", #{startidx: 1})
+--- Example: >vim
+---   let l = [#{n: 10}, #{n: 20}, #{n: 30}]
+---   echo indexof(l, "v:val.n == 20")
+---   echo indexof(l, {i, v -> v.n == 30})
+---   echo indexof(l, "v:val.n == 20", #{startidx: 1})
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   mylist->indexof(expr)
+--- <
 ---
 --- @param object any
 --- @param expr any
@@ -4633,22 +4743,22 @@ function vim.fn.input(prompt, text, completion) end
 --- The input is entered just like a command-line, with the same
 --- editing commands and mappings.  There is a separate history
 --- for lines typed for input().
---- Example: >
----   :if input("Coffee or beer? ") == "beer"
----   :  echo "Cheers!"
----   :endif
+--- Example: >vim
+---   if input("Coffee or beer? ") == "beer"
+---     echo "Cheers!"
+---   endif
 --- <
 --- If the optional {text} argument is present and not empty, this
 --- is used for the default reply, as if the user typed this.
---- Example: >
----   :let color = input("Color? ", "white")
+--- Example: >vim
+---   let color = input("Color? ", "white")
 ---
 --- <The optional {completion} argument specifies the type of
 --- completion supported for the input.  Without it completion is
 --- not performed.  The supported completion types are the same as
 --- that can be supplied to a user-defined command using the
 --- "-complete=" argument.  Refer to |:command-completion| for
---- more information.  Example: >
+--- more information.  Example: >vim
 ---   let fname = input("File: ", "", "file")
 ---
 --- <      *input()-highlight* *E5400* *E5402*
@@ -4669,7 +4779,7 @@ function vim.fn.input(prompt, text, completion) end
 --- sections must be ordered so that next hl_start_col is greater
 --- then or equal to previous hl_end_col.
 ---
---- Example (try some input with parentheses): >
+--- Example (try some input with parentheses): >vim
 ---   highlight RBP1 guibg=Red ctermbg=red
 ---   highlight RBP2 guibg=Yellow ctermbg=yellow
 ---   highlight RBP3 guibg=Green ctermbg=green
@@ -4714,16 +4824,17 @@ function vim.fn.input(prompt, text, completion) end
 --- that further characters follow in the mapping, e.g., by using
 --- |:execute| or |:normal|.
 ---
---- Example with a mapping: >
----   :nmap \x :call GetFoo()<CR>:exe "/" .. Foo<CR>
----   :function GetFoo()
----   :  call inputsave()
----   :  let g:Foo = input("enter search pattern: ")
----   :  call inputrestore()
----   :endfunction
+--- Example with a mapping: >vim
+---   nmap \x :call GetFoo()<CR>:exe "/" .. Foo<CR>
+---   function GetFoo()
+---     call inputsave()
+---     let g:Foo = input("enter search pattern: ")
+---     call inputrestore()
+---   endfunction
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetPrompt()->input()
+--- <
 ---
 --- @param opts table
 --- @return any
@@ -4748,12 +4859,13 @@ function vim.fn.inputdialog(...) end
 --- Make sure {textlist} has less than 'lines' entries, otherwise
 --- it won't work.  It's a good idea to put the entry number at
 --- the start of the string.  And put a prompt in the first item.
---- Example: >
+--- Example: >vim
 ---   let color = inputlist(['Select color:', '1. red',
 ---     \ '2. green', '3. blue'])
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetChoices()->inputlist()
+--- <
 ---
 --- @param textlist any
 --- @return any
@@ -4787,8 +4899,9 @@ function vim.fn.inputsave() end
 --- typed on the command-line in response to the issued prompt.
 --- NOTE: Command-line completion is not supported.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetPrompt()->inputsecret()
+--- <
 ---
 --- @param prompt any
 --- @param text? any
@@ -4803,16 +4916,17 @@ function vim.fn.inputsecret(prompt, text) end
 --- like omitting {idx}.  A negative {idx} is also possible, see
 --- |list-index|.  -1 inserts just before the last item.
 ---
---- Returns the resulting |List| or |Blob|.  Examples: >
----   :let mylist = insert([2, 3, 5], 1)
----   :call insert(mylist, 4, -1)
----   :call insert(mylist, 6, len(mylist))
+--- Returns the resulting |List| or |Blob|.  Examples: >vim
+---   let mylist = insert([2, 3, 5], 1)
+---   call insert(mylist, 4, -1)
+---   call insert(mylist, 6, len(mylist))
 --- <The last example can be done simpler with |add()|.
 --- Note that when {item} is a |List| it is inserted as a single
 --- item.  Use |extend()| to concatenate |Lists|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->insert(item)
+--- <
 ---
 --- @param object any
 --- @param item any
@@ -4823,23 +4937,25 @@ function vim.fn.insert(object, item, idx) end
 --- Interrupt script execution.  It works more or less like the
 --- user typing CTRL-C, most commands won't execute and control
 --- returns to the user.  This is useful to abort execution
---- from lower down, e.g. in an autocommand.  Example: >
---- :function s:check_typoname(file)
---- :   if fnamemodify(a:file, ':t') == '['
---- :       echomsg 'Maybe typo'
---- :       call interrupt()
---- :   endif
---- :endfunction
---- :au BufWritePre * call s:check_typoname(expand('<amatch>'))
+--- from lower down, e.g. in an autocommand.  Example: >vim
+--- function s:check_typoname(file)
+---    if fnamemodify(a:file, ':t') == '['
+---        echomsg 'Maybe typo'
+---        call interrupt()
+---    endif
+--- endfunction
+--- au BufWritePre * call s:check_typoname(expand('<amatch>'))
+--- <
 ---
 --- @return any
 function vim.fn.interrupt() end
 
 --- Bitwise invert.  The argument is converted to a number.  A
---- List, Dict or Float argument causes an error.  Example: >
----   :let bits = invert(bits)
---- <Can also be used as a |method|: >
----   :let bits = bits->invert()
+--- List, Dict or Float argument causes an error.  Example: >vim
+---   let bits = invert(bits)
+--- <Can also be used as a |method|: >vim
+---   let bits = bits->invert()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -4850,22 +4966,24 @@ function vim.fn.invert(expr) end
 --- exist, or isn't a directory, the result is |FALSE|.  {directory}
 --- is any expression, which is used as a String.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->isdirectory()
+--- <
 ---
 --- @param directory any
 --- @return 0|1
 function vim.fn.isdirectory(directory) end
 
 --- Return 1 if {expr} is a positive infinity, or -1 a negative
---- infinity, otherwise 0. >
----   :echo isinf(1.0 / 0.0)
---- <  1 >
----   :echo isinf(-1.0 / 0.0)
+--- infinity, otherwise 0. >vim
+---   echo isinf(1.0 / 0.0)
+--- <  1 >vim
+---   echo isinf(-1.0 / 0.0)
 --- <  -1
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->isinf()
+--- <
 ---
 --- @param expr any
 --- @return 1|0|-1
@@ -4875,28 +4993,30 @@ function vim.fn.isinf(expr) end
 --- name of a locked variable.
 --- The string argument {expr} must be the name of a variable,
 --- |List| item or |Dictionary| entry, not the variable itself!
---- Example: >
----   :let alist = [0, ['a', 'b'], 2, 3]
----   :lockvar 1 alist
----   :echo islocked('alist')    " 1
----   :echo islocked('alist[1]')  " 0
+--- Example: >vim
+---   let alist = [0, ['a', 'b'], 2, 3]
+---   lockvar 1 alist
+---   echo islocked('alist')    " 1
+---   echo islocked('alist[1]')  " 0
 ---
 --- <When {expr} is a variable that does not exist you get an error
 --- message.  Use |exists()| to check for existence.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->islocked()
+--- <
 ---
 --- @param expr any
 --- @return 0|1
 function vim.fn.islocked(expr) end
 
---- Return |TRUE| if {expr} is a float with value NaN. >
+--- Return |TRUE| if {expr} is a float with value NaN. >vim
 ---   echo isnan(0.0 / 0.0)
 --- <  1
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->isnan()
+--- <
 ---
 --- @param expr any
 --- @return 0|1
@@ -4906,13 +5026,14 @@ function vim.fn.isnan(expr) end
 --- |List| item is a list with two items: the key of a {dict}
 --- entry and the value of this entry.  The |List| is in arbitrary
 --- order.  Also see |keys()| and |values()|.
---- Example: >
+--- Example: >vim
 ---   for [key, value] in items(mydict)
 ---      echo key .. ': ' .. value
 ---   endfor
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   mydict->items()
+--- <
 ---
 --- @param dict any
 --- @return any
@@ -4952,12 +5073,12 @@ function vim.fn.jobsend(...) end
 ---
 --- Spawns {cmd} as a job.
 --- If {cmd} is a List it runs directly (no 'shell').
---- If {cmd} is a String it runs in the 'shell', like this: >
----   :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+--- If {cmd} is a String it runs in the 'shell', like this: >vim
+---   call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
 --- <(See |shell-unquoting| for details.)
 ---
---- Example: >
----   :call jobstart('nvim -h', {'on_stdout':{j,d,e->append(line('.'),d)}})
+--- Example: >vim
+---   call jobstart('nvim -h', {'on_stdout':{j,d,e->append(line('.'),d)}})
 --- <
 --- Returns |job-id| on success, 0 on invalid arguments (or job
 --- table is full), -1 if {cmd}[0] or 'shell' is not executable.
@@ -4970,10 +5091,10 @@ function vim.fn.jobsend(...) end
 ---
 --- NOTE: on Windows if {cmd} is a List:
 ---   - cmd[0] must be an executable (not a "built-in"). If it is
----     in $PATH it can be called by name, without an extension: >
----       :call jobstart(['ping', 'neovim.io'])
---- <    If it is a full or partial path, extension is required: >
----       :call jobstart(['System32\ping.exe', 'neovim.io'])
+---     in $PATH it can be called by name, without an extension: >vim
+---       call jobstart(['ping', 'neovim.io'])
+--- <    If it is a full or partial path, extension is required: >vim
+---       call jobstart(['System32\ping.exe', 'neovim.io'])
 --- <  - {cmd} is collapsed to a string of quoted args as expected
 ---     by CommandLineToArgvW https://msdn.microsoft.com/bb776391
 ---     unless cmd[0] is some form of "cmd.exe".
@@ -5057,7 +5178,7 @@ function vim.fn.jobstop(id) end
 --- {timeout} is the maximum waiting time in milliseconds. If
 --- omitted or -1, wait forever.
 ---
---- Timeout of 0 can be used to check the status of a job: >
+--- Timeout of 0 can be used to check the status of a job: >vim
 ---   let running = jobwait([{job-id}], 0)[0] == -1
 --- <
 --- During jobwait() callbacks for jobs not in the {jobs} list may
@@ -5080,14 +5201,15 @@ function vim.fn.jobwait(jobs, timeout) end
 --- When {sep} is specified it is put in between the items.  If
 --- {sep} is omitted a single space is used.
 --- Note that {sep} is not added at the end.  You might want to
---- add it there too: >
+--- add it there too: >vim
 ---   let lines = join(mylist, "\n") .. "\n"
 --- <String items are used as-is.  |Lists| and |Dictionaries| are
 --- converted into a string like with |string()|.
 --- The opposite function is |split()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->join()
+--- <
 ---
 --- @param list any
 --- @param sep? any
@@ -5109,8 +5231,9 @@ function vim.fn.join(list, sep) end
 --- recommended and the only one required to be supported.
 --- Non-UTF-8 characters are an error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   ReadObject()->json_decode()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -5127,8 +5250,9 @@ function vim.fn.json_decode(expr) end
 --- or special escapes like "\t", other are dumped as-is.
 --- |Blob|s are converted to arrays of the individual bytes.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetObject()->json_encode()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -5137,20 +5261,21 @@ function vim.fn.json_encode(expr) end
 --- Return a |List| with all the keys of {dict}.  The |List| is in
 --- arbitrary order.  Also see |items()| and |values()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mydict->keys()
+--- <
 ---
 --- @param dict any
 --- @return any
 function vim.fn.keys(dict) end
 
 --- Turn the internal byte representation of keys into a form that
---- can be used for |:map|.  E.g. >
----   :let xx = "\<C-Home>"
----   :echo keytrans(xx)
+--- can be used for |:map|.  E.g. >vim
+---   let xx = "\<C-Home>"
+---   echo keytrans(xx)
 --- <  <C-Home>
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   "\<C-Home>"->keytrans()
 --- <
 ---
@@ -5173,7 +5298,7 @@ function vim.fn.last_buffer_nr() end
 --- |Dictionary| is returned.
 --- Otherwise an error is given and returns zero.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->len()
 --- <
 ---
@@ -5219,11 +5344,11 @@ function vim.fn.len(expr) end
 --- the DLL is not in the usual places.
 --- For Unix: When compiling your own plugins, remember that the
 --- object code must be compiled as position-independent ('PIC').
---- Examples: >
----   :echo libcall("libc.so", "getenv", "HOME")
+--- Examples: >vim
+---   echo libcall("libc.so", "getenv", "HOME")
 ---
 --- <Can also be used as a |method|, the base is passed as the
---- third argument: >
+--- third argument: >vim
 ---   GetValue()->libcall("libc.so", "getenv")
 --- <
 ---
@@ -5235,13 +5360,13 @@ function vim.fn.libcall(libname, funcname, argument) end
 
 --- Just like |libcall()|, but used for a function that returns an
 --- int instead of a string.
---- Examples: >
----   :echo libcallnr("/usr/lib/libc.so", "getpid", "")
----   :call libcallnr("libc.so", "printf", "Hello World!\n")
----   :call libcallnr("libc.so", "sleep", 10)
+--- Examples: >vim
+---   echo libcallnr("/usr/lib/libc.so", "getpid", "")
+---   call libcallnr("libc.so", "printf", "Hello World!\n")
+---   call libcallnr("libc.so", "sleep", 10)
 --- <
 --- Can also be used as a |method|, the base is passed as the
---- third argument: >
+--- third argument: >vim
 ---   GetValue()->libcallnr("libc.so", "printf")
 --- <
 ---
@@ -5273,17 +5398,18 @@ function vim.fn.libcallnr(libname, funcname, argument) end
 --- With the optional {winid} argument the values are obtained for
 --- that window instead of the current window.
 --- Returns 0 for invalid values of {expr} and {winid}.
---- Examples: >
----   line(".")    line number of the cursor
----   line(".", winid)  idem, in window "winid"
----   line("'t")    line number of mark t
----   line("'" .. marker)  line number of mark marker
+--- Examples: >vim
+---   echo line(".")    " line number of the cursor
+---   echo line(".", winid)  " idem, in window "winid"
+---   echo line("'t")    " line number of mark t
+---   echo line("'" .. marker)  " line number of mark marker
 --- <
 --- To jump to the last known position when opening a file see
 --- |last-position-jump|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetValue()->line()
+--- <
 ---
 --- @param expr any
 --- @param winid? integer
@@ -5295,15 +5421,16 @@ function vim.fn.line(expr, winid) end
 --- the 'fileformat' option for the current buffer.  The first
 --- line returns 1. UTF-8 encoding is used, 'fileencoding' is
 --- ignored.  This can also be used to get the byte count for the
---- line just below the last line: >
----   line2byte(line("$") + 1)
+--- line just below the last line: >vim
+---   echo line2byte(line("$") + 1)
 --- <This is the buffer size plus one.  If 'fileencoding' is empty
 --- it is the file size plus one.  {lnum} is used like with
 --- |getline()|.  When {lnum} is invalid -1 is returned.
 --- Also see |byte2line()|, |go| and |:goto|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->line2byte()
+--- <
 ---
 --- @param lnum integer
 --- @return integer
@@ -5315,46 +5442,49 @@ function vim.fn.line2byte(lnum) end
 --- relevant.  {lnum} is used just like in |getline()|.
 --- When {lnum} is invalid, -1 is returned.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->lispindent()
+--- <
 ---
 --- @param lnum integer
 --- @return any
 function vim.fn.lispindent(lnum) end
 
 --- Return a Blob concatenating all the number values in {list}.
---- Examples: >
----   list2blob([1, 2, 3, 4])  returns 0z01020304
----   list2blob([])    returns 0z
+--- Examples: >vim
+---   echo list2blob([1, 2, 3, 4])  " returns 0z01020304
+---   echo list2blob([])    " returns 0z
 --- <Returns an empty Blob on error.  If one of the numbers is
 --- negative or more than 255 error *E1239* is given.
 ---
 --- |blob2list()| does the opposite.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetList()->list2blob()
+--- <
 ---
 --- @param list any
 --- @return any
 function vim.fn.list2blob(list) end
 
 --- Convert each number in {list} to a character string can
---- concatenate them all.  Examples: >
----   list2str([32])    returns " "
----   list2str([65, 66, 67])  returns "ABC"
---- <The same can be done (slowly) with: >
----   join(map(list, {nr, val -> nr2char(val)}), '')
+--- concatenate them all.  Examples: >vim
+---   echo list2str([32])    " returns " "
+---   echo list2str([65, 66, 67])  " returns "ABC"
+--- <The same can be done (slowly) with: >vim
+---   echo join(map(list, {nr, val -> nr2char(val)}), '')
 --- <|str2list()| does the opposite.
 ---
 --- UTF-8 encoding is always used, {utf8} option has no effect,
 --- and exists only for backwards-compatibility.
---- With UTF-8 composing characters work as expected: >
----   list2str([97, 769])  returns "á"
+--- With UTF-8 composing characters work as expected: >vim
+---   echo list2str([97, 769])  " returns "á"
 --- <
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetList()->list2str()
+--- <
 ---
 --- @param list any
 --- @param utf8? any
@@ -5371,14 +5501,15 @@ function vim.fn.localtime() end
 --- {expr} must evaluate to a |Float| or a |Number| in the range
 --- (0, inf].
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo log(10)
---- <  2.302585 >
----   :echo log(exp(5))
+--- Examples: >vim
+---   echo log(10)
+--- <  2.302585 >vim
+---   echo log(exp(5))
 --- <  5.0
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->log()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -5387,14 +5518,15 @@ function vim.fn.log(expr) end
 --- Return the logarithm of Float {expr} to base 10 as a |Float|.
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo log10(1000)
---- <  3.0 >
----   :echo log10(0.01)
+--- Examples: >vim
+---   echo log10(1000)
+--- <  3.0 >vim
+---   echo log10(0.01)
 --- <  -2.0
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->log10()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -5411,8 +5543,8 @@ function vim.fn.log10(expr) end
 --- of the current item and for a |List| |v:key| has the index of
 --- the current item.  For a |Blob| |v:key| has the index of the
 --- current byte.
---- Example: >
----   :call map(mylist, '"> " .. v:val .. " <"')
+--- Example: >vim
+---   call map(mylist, '"> " .. v:val .. " <"')
 --- <This puts "> " before and " <" after each item in "mylist".
 ---
 --- Note that {expr2} is the result of an expression and is then
@@ -5424,21 +5556,21 @@ function vim.fn.log10(expr) end
 ---   1. The key or the index of the current item.
 ---   2. the value of the current item.
 --- The function must return the new value of the item. Example
---- that changes each value by "key-value": >
+--- that changes each value by "key-value": >vim
 ---   func KeyValue(key, val)
 ---     return a:key .. '-' .. a:val
 ---   endfunc
 ---   call map(myDict, function('KeyValue'))
---- <It is shorter when using a |lambda|: >
+--- <It is shorter when using a |lambda|: >vim
 ---   call map(myDict, {key, val -> key .. '-' .. val})
---- <If you do not use "val" you can leave it out: >
+--- <If you do not use "val" you can leave it out: >vim
 ---   call map(myDict, {key -> 'item: ' .. key})
---- <If you do not use "key" you can use a short name: >
+--- <If you do not use "key" you can use a short name: >vim
 ---   call map(myDict, {_, val -> 'item: ' .. val})
 --- <
 --- The operation is done in-place.  If you want a |List| or
---- |Dictionary| to remain unmodified make a copy first: >
----   :let tlist = map(copy(mylist), ' v:val .. "\t"')
+--- |Dictionary| to remain unmodified make a copy first: >vim
+---   let tlist = map(copy(mylist), ' v:val .. "\t"')
 ---
 --- <Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
 --- filtered.  When an error is encountered while evaluating
@@ -5446,7 +5578,7 @@ function vim.fn.log10(expr) end
 --- {expr2} is a Funcref errors inside a function are ignored,
 --- unless it was defined with the "abort" flag.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->map(expr2)
 --- <
 ---
@@ -5515,11 +5647,12 @@ function vim.fn.map(expr1, expr2) end
 --- The mappings local to the current buffer are checked first,
 --- then the global mappings.
 --- This function can be used to map a key even when it's already
---- mapped, and have it do the original mapping too.  Sketch: >
+--- mapped, and have it do the original mapping too.  Sketch: >vim
 ---   exe 'nnoremap <Tab> ==' .. maparg('<Tab>', 'n')
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetKey()->maparg('n')
+--- <
 ---
 --- @param name string
 --- @param mode? string
@@ -5553,15 +5686,16 @@ function vim.fn.maparg(name, mode, abbr, dict) end
 --- The mappings local to the current buffer are checked first,
 --- then the global mappings.
 --- This function can be used to check if a mapping can be added
---- without being ambiguous.  Example: >
----   :if mapcheck("_vv") == ""
----   :   map _vv :set guifont=7x13<CR>
----   :endif
+--- without being ambiguous.  Example: >vim
+---   if mapcheck("_vv") == ""
+---      map _vv :set guifont=7x13<CR>
+---   endif
 --- <This avoids adding the "_vv" mapping when there already is a
 --- mapping for "_v" or for "_vvv".
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetKey()->mapcheck('n')
+--- <
 ---
 --- @param name string
 --- @param mode? string
@@ -5574,10 +5708,10 @@ function vim.fn.mapcheck(name, mode, abbr) end
 --- |maparg()|. *E460*
 --- {mode} is used to define the mode in which the mapping is set,
 --- not the "mode" entry in {dict}.
---- Example for saving and restoring a mapping: >
+--- Example for saving and restoring a mapping: >vim
 ---   let save_map = maparg('K', 'n', 0, 1)
 ---   nnoremap K somethingelse
----   ...
+---   " ...
 ---   call mapset('n', 0, save_map)
 --- <Note that if you are going to replace a map in several modes,
 --- e.g. with `:map!`, you need to save the mapping for all of
@@ -5601,27 +5735,27 @@ function vim.fn.mapset(mode, abbr, dict) end
 --- If there is no match -1 is returned.
 ---
 --- For getting submatches see |matchlist()|.
---- Example: >
----   :echo match("testing", "ing")  " results in 4
----   :echo match([1, 'x'], '\a')  " results in 1
+--- Example: >vim
+---   echo match("testing", "ing")  " results in 4
+---   echo match([1, 'x'], '\a')  " results in 1
 --- <See |string-match| for how {pat} is used.
 ---             *strpbrk()*
---- Vim doesn't have a strpbrk() function.  But you can do: >
----   :let sepidx = match(line, '[.,;: \t]')
+--- Vim doesn't have a strpbrk() function.  But you can do: >vim
+---   let sepidx = match(line, '[.,;: \t]')
 --- <            *strcasestr()*
 --- Vim doesn't have a strcasestr() function.  But you can add
---- "\c" to the pattern to ignore case: >
----   :let idx = match(haystack, '\cneedle')
+--- "\c" to the pattern to ignore case: >vim
+---   let idx = match(haystack, '\cneedle')
 --- <
 --- If {start} is given, the search starts from byte index
 --- {start} in a String or item {start} in a |List|.
 --- The result, however, is still the index counted from the
---- first character/item.  Example: >
----   :echo match("testing", "ing", 2)
---- <result is again "4". >
----   :echo match("testing", "ing", 4)
---- <result is again "4". >
----   :echo match("testing", "t", 2)
+--- first character/item.  Example: >vim
+---   echo match("testing", "ing", 2)
+--- <result is again "4". >vim
+---   echo match("testing", "ing", 4)
+--- <result is again "4". >vim
+---   echo match("testing", "t", 2)
 --- <result is "3".
 --- For a String, if {start} > 0 then it is like the string starts
 --- {start} bytes later, thus "^" will match at {start}.  Except
@@ -5635,7 +5769,7 @@ function vim.fn.mapset(mode, abbr, dict) end
 ---
 --- When {count} is given use the {count}th match.  When a match
 --- is found in a String the search for the next one starts one
---- character further.  Thus this example results in 1: >
+--- character further.  Thus this example results in 1: >vim
 ---   echo match("testing", "..", 0, 2)
 --- <In a |List| the search continues in the next item.
 --- Note that when {count} is added the way {start} works changes,
@@ -5650,7 +5784,7 @@ function vim.fn.mapset(mode, abbr, dict) end
 --- zero matches at the start instead of a number of matches
 --- further down in the text.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->match('word')
 ---   GetList()->match('word')
 --- <
@@ -5709,17 +5843,17 @@ function vim.fn.match(expr, pat, start, count) end
 ---
 --- Returns -1 on error.
 ---
---- Example: >
----   :highlight MyGroup ctermbg=green guibg=green
----   :let m = matchadd("MyGroup", "TODO")
---- <Deletion of the pattern: >
----   :call matchdelete(m)
+--- Example: >vim
+---   highlight MyGroup ctermbg=green guibg=green
+---   let m = matchadd("MyGroup", "TODO")
+--- <Deletion of the pattern: >vim
+---   call matchdelete(m)
 ---
 --- <A list of matches defined by |matchadd()| and |:match| are
 --- available from |getmatches()|.  All matches can be deleted in
 --- one operation by |clearmatches()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetGroup()->matchadd('TODO')
 --- <
 ---
@@ -5758,17 +5892,18 @@ function vim.fn.matchadd(group, pattern, priority, id, dict) end
 ---
 --- Returns -1 on error.
 ---
---- Example: >
----   :highlight MyGroup ctermbg=green guibg=green
----   :let m = matchaddpos("MyGroup", [[23, 24], 34])
---- <Deletion of the pattern: >
----   :call matchdelete(m)
+--- Example: >vim
+---   highlight MyGroup ctermbg=green guibg=green
+---   let m = matchaddpos("MyGroup", [[23, 24], 34])
+--- <Deletion of the pattern: >vim
+---   call matchdelete(m)
 ---
 --- <Matches added by |matchaddpos()| are returned by
 --- |getmatches()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetGroup()->matchaddpos([23, 11])
+--- <
 ---
 --- @param group any
 --- @param pos any
@@ -5789,8 +5924,9 @@ function vim.fn.matchaddpos(group, pos, priority, id, dict) end
 --- Highlighting matches using the |:match| commands are limited
 --- to three matches. |matchadd()| does not have this limitation.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMatch()->matcharg()
+--- <
 ---
 --- @param nr integer
 --- @return any
@@ -5803,8 +5939,9 @@ function vim.fn.matcharg(nr) end
 --- If {win} is specified, use the window with this number or
 --- window ID instead of the current window.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMatch()->matchdelete()
+--- <
 ---
 --- @param id any
 --- @param win? any
@@ -5812,25 +5949,26 @@ function vim.fn.matcharg(nr) end
 function vim.fn.matchdelete(id, win) end
 
 --- Same as |match()|, but return the index of first character
---- after the match.  Example: >
----   :echo matchend("testing", "ing")
+--- after the match.  Example: >vim
+---   echo matchend("testing", "ing")
 --- <results in "7".
 ---           *strspn()* *strcspn()*
 --- Vim doesn't have a strspn() or strcspn() function, but you can
---- do it with matchend(): >
----   :let span = matchend(line, '[a-zA-Z]')
----   :let span = matchend(line, '[^a-zA-Z]')
+--- do it with matchend(): >vim
+---   let span = matchend(line, '[a-zA-Z]')
+---   let span = matchend(line, '[^a-zA-Z]')
 --- <Except that -1 is returned when there are no matches.
 ---
---- The {start}, if given, has the same meaning as for |match()|. >
----   :echo matchend("testing", "ing", 2)
---- <results in "7". >
----   :echo matchend("testing", "ing", 5)
+--- The {start}, if given, has the same meaning as for |match()|. >vim
+---   echo matchend("testing", "ing", 2)
+--- <results in "7". >vim
+---   echo matchend("testing", "ing", 5)
 --- <result is "-1".
 --- When {expr} is a |List| the result is equal to |match()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->matchend('word')
+--- <
 ---
 --- @param expr any
 --- @param pat any
@@ -5879,25 +6017,25 @@ function vim.fn.matchend(expr, pat, start, count) end
 --- Refer to |fuzzy-matching| for more information about fuzzy
 --- matching strings.
 ---
---- Example: >
----    :echo matchfuzzy(["clay", "crow"], "cay")
---- <results in ["clay"]. >
----    :echo getbufinfo()->map({_, v -> v.name})->matchfuzzy("ndl")
---- <results in a list of buffer names fuzzy matching "ndl". >
----    :echo getbufinfo()->matchfuzzy("ndl", {'key' : 'name'})
+--- Example: >vim
+---    echo matchfuzzy(["clay", "crow"], "cay")
+--- <results in ["clay"]. >vim
+---    echo getbufinfo()->map({_, v -> v.name})->matchfuzzy("ndl")
+--- <results in a list of buffer names fuzzy matching "ndl". >vim
+---    echo getbufinfo()->matchfuzzy("ndl", {'key' : 'name'})
 --- <results in a list of buffer information dicts with buffer
---- names fuzzy matching "ndl". >
----    :echo getbufinfo()->matchfuzzy("spl",
+--- names fuzzy matching "ndl". >vim
+---    echo getbufinfo()->matchfuzzy("spl",
 ---         \ {'text_cb' : {v -> v.name}})
 --- <results in a list of buffer information dicts with buffer
---- names fuzzy matching "spl". >
----    :echo v:oldfiles->matchfuzzy("test")
---- <results in a list of file names fuzzy matching "test". >
----    :let l = readfile("buffer.c")->matchfuzzy("str")
---- <results in a list of lines in "buffer.c" fuzzy matching "str". >
----    :echo ['one two', 'two one']->matchfuzzy('two one')
---- <results in `['two one', 'one two']` . >
----    :echo ['one two', 'two one']->matchfuzzy('two one',
+--- names fuzzy matching "spl". >vim
+---    echo v:oldfiles->matchfuzzy("test")
+--- <results in a list of file names fuzzy matching "test". >vim
+---    let l = readfile("buffer.c")->matchfuzzy("str")
+--- <results in a list of lines in "buffer.c" fuzzy matching "str". >vim
+---    echo ['one two', 'two one']->matchfuzzy('two one')
+--- <results in `['two one', 'one two']` . >vim
+---    echo ['one two', 'two one']->matchfuzzy('two one',
 ---         \ {'matchseq': 1})
 --- <results in `['two one']`.
 ---
@@ -5919,12 +6057,12 @@ function vim.fn.matchfuzzy(list, str, dict) end
 --- If there are no matching strings or there is an error, then a
 --- list with three empty list items is returned.
 ---
---- Example: >
----   :echo matchfuzzypos(['testing'], 'tsg')
---- <results in [["testing"], [[0, 2, 6]], [99]] >
----   :echo matchfuzzypos(['clay', 'lacy'], 'la')
---- <results in [["lacy", "clay"], [[0, 1], [1, 2]], [153, 133]] >
----   :echo [{'text': 'hello', 'id' : 10}]
+--- Example: >vim
+---   echo matchfuzzypos(['testing'], 'tsg')
+--- <results in [["testing"], [[0, 2, 6]], [99]] >vim
+---   echo matchfuzzypos(['clay', 'lacy'], 'la')
+--- <results in [["lacy", "clay"], [[0, 1], [1, 2]], [153, 133]] >vim
+---   echo [{'text': 'hello', 'id' : 10}]
 ---     \ ->matchfuzzypos('ll', {'key' : 'text'})
 --- <results in `[[{"id": 10, "text": "hello"}], [[2, 3]], [127]]`
 ---
@@ -5938,15 +6076,16 @@ function vim.fn.matchfuzzypos(list, str, dict) end
 --- list is the matched string, same as what matchstr() would
 --- return.  Following items are submatches, like "\1", "\2", etc.
 --- in |:substitute|.  When an optional submatch didn't match an
---- empty string is used.  Example: >
+--- empty string is used.  Example: >vim
 ---   echo matchlist('acd', '\(a\)\?\(b\)\?\(c\)\?\(.*\)')
 --- <Results in: ['acd', 'a', '', 'c', 'd', '', '', '', '', '']
 --- When there is no match an empty list is returned.
 ---
 --- You can pass in a List, but that is not very useful.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->matchlist('word')
+--- <
 ---
 --- @param expr any
 --- @param pat any
@@ -5955,20 +6094,21 @@ function vim.fn.matchfuzzypos(list, str, dict) end
 --- @return any
 function vim.fn.matchlist(expr, pat, start, count) end
 
---- Same as |match()|, but return the matched string.  Example: >
----   :echo matchstr("testing", "ing")
+--- Same as |match()|, but return the matched string.  Example: >vim
+---   echo matchstr("testing", "ing")
 --- <results in "ing".
 --- When there is no match "" is returned.
---- The {start}, if given, has the same meaning as for |match()|. >
----   :echo matchstr("testing", "ing", 2)
---- <results in "ing". >
----   :echo matchstr("testing", "ing", 5)
+--- The {start}, if given, has the same meaning as for |match()|. >vim
+---   echo matchstr("testing", "ing", 2)
+--- <results in "ing". >vim
+---   echo matchstr("testing", "ing", 5)
 --- <result is "".
 --- When {expr} is a |List| then the matching item is returned.
 --- The type isn't changed, it's not necessarily a String.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->matchstr('word')
+--- <
 ---
 --- @param expr any
 --- @param pat any
@@ -5978,23 +6118,23 @@ function vim.fn.matchlist(expr, pat, start, count) end
 function vim.fn.matchstr(expr, pat, start, count) end
 
 --- Same as |matchstr()|, but return the matched string, the start
---- position and the end position of the match.  Example: >
----   :echo matchstrpos("testing", "ing")
+--- position and the end position of the match.  Example: >vim
+---   echo matchstrpos("testing", "ing")
 --- <results in ["ing", 4, 7].
 --- When there is no match ["", -1, -1] is returned.
---- The {start}, if given, has the same meaning as for |match()|. >
----   :echo matchstrpos("testing", "ing", 2)
---- <results in ["ing", 4, 7]. >
----   :echo matchstrpos("testing", "ing", 5)
+--- The {start}, if given, has the same meaning as for |match()|. >vim
+---   echo matchstrpos("testing", "ing", 2)
+--- <results in ["ing", 4, 7]. >vim
+---   echo matchstrpos("testing", "ing", 5)
 --- <result is ["", -1, -1].
 --- When {expr} is a |List| then the matching item, the index
 --- of first item where {pat} matches, the start position and the
---- end position of the match are returned. >
----   :echo matchstrpos([1, '__x'], '\a')
+--- end position of the match are returned. >vim
+---   echo matchstrpos([1, '__x'], '\a')
 --- <result is ["x", 1, 2, 3].
 --- The type isn't changed, it's not necessarily a String.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->matchstrpos('word')
 --- <
 ---
@@ -6005,7 +6145,7 @@ function vim.fn.matchstr(expr, pat, start, count) end
 --- @return any
 function vim.fn.matchstrpos(expr, pat, start, count) end
 
---- Return the maximum value of all items in {expr}. Example: >
+--- Return the maximum value of all items in {expr}. Example: >vim
 ---   echo max([apples, pears, oranges])
 ---
 --- <{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
@@ -6014,7 +6154,7 @@ function vim.fn.matchstrpos(expr, pat, start, count) end
 --- items in {expr} cannot be used as a Number this results in
 ---                 an error.  An empty |List| or |Dictionary| results in zero.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->max()
 --- <
 ---
@@ -6026,14 +6166,14 @@ function vim.fn.max(expr) end
 --- by |:menu|, |:amenu|, …), including |hidden-menus|.
 ---
 --- {path} matches a menu by name, or all menus if {path} is an
---- empty string.  Example: >
----   :echo menu_get('File','')
----   :echo menu_get('')
+--- empty string.  Example: >vim
+---   echo menu_get('File','')
+---   echo menu_get('')
 --- <
 --- {modes} is a string of zero or more modes (see |maparg()| or
 --- |creating-menus| for the list of modes). "a" means "all".
 ---
---- Example: >
+--- Example: >vim
 ---   nnoremenu &Test.Test inormal
 ---   inoremenu Test.Test insert
 ---   vnoremenu Test.Test x
@@ -6123,9 +6263,9 @@ function vim.fn.menu_get(path, modes) end
 ---
 --- Returns an empty dictionary if the menu item is not found.
 ---
---- Examples: >
----   :echo menu_info('Edit.Cut')
----   :echo menu_info('File.Save', 'n')
+--- Examples: >vim
+---   echo menu_info('Edit.Cut')
+---   echo menu_info('File.Save', 'n')
 ---
 ---   " Display the entire menu hierarchy in a buffer
 ---   func ShowMenu(name, pfx)
@@ -6141,7 +6281,7 @@ function vim.fn.menu_get(path, modes) end
 ---     call ShowMenu(topmenu, '')
 ---   endfor
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMenuName()->menu_info('v')
 --- <
 ---
@@ -6150,7 +6290,7 @@ function vim.fn.menu_get(path, modes) end
 --- @return any
 function vim.fn.menu_info(name, mode) end
 
---- Return the minimum value of all items in {expr}. Example: >
+--- Return the minimum value of all items in {expr}. Example: >vim
 ---   echo min([apples, pears, oranges])
 ---
 --- <{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
@@ -6159,7 +6299,7 @@ function vim.fn.menu_info(name, mode) end
 --- items in {expr} cannot be used as a Number this results in
 --- an error.  An empty |List| or |Dictionary| results in zero.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->min()
 --- <
 ---
@@ -6176,19 +6316,19 @@ function vim.fn.min(expr) end
 --- created as necessary.
 ---
 --- If {flags} contains "D" then {name} is deleted at the end of
---- the current function, as with: >
+--- the current function, as with: >vim
 ---   defer delete({name}, 'd')
 --- <
 --- If {flags} contains "R" then {name} is deleted recursively at
---- the end of the current function, as with: >
+--- the end of the current function, as with: >vim
 ---   defer delete({name}, 'rf')
 --- <Note that when {name} has more than one part and "p" is used
 --- some directories may already exist.  Only the first one that
 --- is created and what it contains is scheduled to be deleted.
---- E.g. when using: >
+--- E.g. when using: >vim
 ---   call mkdir('subdir/tmp/autoload', 'pR')
 --- <and "subdir" already exists then "subdir/tmp" will be
---- scheduled for deletion, like with: >
+--- scheduled for deletion, like with: >vim
 ---   defer delete('subdir/tmp', 'rf')
 --- <
 --- If {prot} is given it is used to set the protection bits of
@@ -6197,8 +6337,8 @@ function vim.fn.min(expr) end
 --- unreadable for others.
 ---
 --- {prot} is applied for all parts of {name}.  Thus if you create
---- /tmp/foo/bar then /tmp/foo will be created with 0o700. Example: >
----   :call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
+--- /tmp/foo/bar then /tmp/foo will be created with 0o700. Example: >vim
+---   call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
 ---
 --- <This function is not available in the |sandbox|.
 ---
@@ -6209,7 +6349,7 @@ function vim.fn.min(expr) end
 --- successful or FALSE if the directory creation failed or partly
 --- failed.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->mkdir()
 --- <
 ---
@@ -6269,17 +6409,18 @@ function vim.fn.mkdir(name, flags, prot) end
 --- the leading character(s).
 --- Also see |visualmode()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   DoFull()->mode()
+--- <
 ---
 --- @return any
 function vim.fn.mode() end
 
 --- Convert a list of Vimscript objects to msgpack. Returned value is a
 --- |readfile()|-style list. When {type} contains "B", a |Blob| is
---- returned instead. Example: >
+--- returned instead. Example: >vim
 ---   call writefile(msgpackdump([{}]), 'fname.mpack', 'b')
---- <or, using a |Blob|: >
+--- <or, using a |Blob|: >vim
 ---   call writefile(msgpackdump([{}], 'B'), 'fname.mpack')
 --- <
 --- This will write the single 0x80 byte to a `fname.mpack` file
@@ -6300,7 +6441,7 @@ function vim.fn.msgpackdump(list, type) end
 
 --- Convert a |readfile()|-style list or a |Blob| to a list of
 --- Vimscript objects.
---- Example: >
+--- Example: >vim
 ---   let fname = expand('~/.config/nvim/shada/main.shada')
 ---   let mpack = readfile(fname, 'b')
 ---   let shada_objects = msgpackparse(mpack)
@@ -6376,34 +6517,36 @@ function vim.fn.msgpackdump(list, type) end
 function vim.fn.msgpackparse(data) end
 
 --- Return the line number of the first line at or below {lnum}
---- that is not blank.  Example: >
----   if getline(nextnonblank(1)) =~ "Java"
+--- that is not blank.  Example: >vim
+---   if getline(nextnonblank(1)) =~ "Java" | endif
 --- <When {lnum} is invalid or there is no non-blank line at or
 --- below it, zero is returned.
 --- {lnum} is used like with |getline()|.
 --- See also |prevnonblank()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->nextnonblank()
+--- <
 ---
 --- @param lnum integer
 --- @return any
 function vim.fn.nextnonblank(lnum) end
 
 --- Return a string with a single character, which has the number
---- value {expr}.  Examples: >
----   nr2char(64)    returns "\@"
----   nr2char(32)    returns " "
---- <Example for "utf-8": >
----   nr2char(300)    returns I with bow character
---- <UTF-8 encoding is always used, {utf8} option has no effect,
+--- value {expr}.  Examples: >vim
+---   echo nr2char(64)    " returns '\@'
+---   echo nr2char(32)    " returns ' '
+--- <Example for "utf-8": >vim
+---   echo nr2char(300)    " returns I with bow character
+--- <
+--- UTF-8 encoding is always used, {utf8} option has no effect,
 --- and exists only for backwards-compatibility.
 --- Note that a NUL character in the file is specified with
 --- nr2char(10), because NULs are represented with newline
 --- characters.  nr2char(0) is a real NUL and terminates the
 --- string, thus results in an empty string.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetNumber()->nr2char()
 --- <
 ---
@@ -6415,10 +6558,10 @@ function vim.fn.nr2char(expr, utf8) end
 --- Bitwise OR on the two arguments.  The arguments are converted
 --- to a number.  A List, Dict or Float argument causes an error.
 --- Also see `and()` and `xor()`.
---- Example: >
----   :let bits = or(bits, 0x80)
---- <Can also be used as a |method|: >
----   :let bits = bits->or(0x80)
+--- Example: >vim
+---   let bits = or(bits, 0x80)
+--- <Can also be used as a |method|: >vim
+---   let bits = bits->or(0x80)
 ---
 --- <Rationale: The reason this is a function and not using the "|"
 --- character like many languages, is that Vi has always used "|"
@@ -6434,17 +6577,18 @@ vim.fn['or'] = function(expr, expr1) end
 --- result.  The tail, the file name, is kept as-is.  The other
 --- components in the path are reduced to {len} letters in length.
 --- If {len} is omitted or smaller than 1 then 1 is used (single
---- letters).  Leading '~' and '.' characters are kept.  Examples: >
----   :echo pathshorten('~/.config/nvim/autoload/file1.vim')
+--- letters).  Leading '~' and '.' characters are kept.  Examples: >vim
+---   echo pathshorten('~/.config/nvim/autoload/file1.vim')
 --- <  ~/.c/n/a/file1.vim ~
---- >
----   :echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
+--- >vim
+---   echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
 --- <  ~/.co/nv/au/file2.vim ~
 --- It doesn't matter if the path exists or not.
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetDirectories()->pathshorten()
+--- <
 ---
 --- @param path string
 --- @param len? any
@@ -6461,12 +6605,13 @@ function vim.fn.pathshorten(path, len) end
 ---
 --- Note: If you want an array or hash, {expr} must return a
 --- reference to it.
---- Example: >
----   :echo perleval('[1 .. 4]')
+--- Example: >vim
+---   echo perleval('[1 .. 4]')
 --- <  [1, 2, 3, 4]
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetExpr()->perleval()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -6475,16 +6620,17 @@ function vim.fn.perleval(expr) end
 --- Return the power of {x} to the exponent {y} as a |Float|.
 --- {x} and {y} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {x} or {y} is not a |Float| or a |Number|.
---- Examples: >
----   :echo pow(3, 3)
---- <  27.0 >
----   :echo pow(2, 16)
---- <  65536.0 >
----   :echo pow(32, 0.20)
+--- Examples: >vim
+---   echo pow(3, 3)
+--- <  27.0 >vim
+---   echo pow(2, 16)
+--- <  65536.0 >vim
+---   echo pow(32, 0.20)
 --- <  2.0
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->pow(3)
+--- <
 ---
 --- @param x any
 --- @param y any
@@ -6492,28 +6638,29 @@ function vim.fn.perleval(expr) end
 function vim.fn.pow(x, y) end
 
 --- Return the line number of the first line at or above {lnum}
---- that is not blank.  Example: >
+--- that is not blank.  Example: >vim
 ---   let ind = indent(prevnonblank(v:lnum - 1))
 --- <When {lnum} is invalid or there is no non-blank line at or
 --- above it, zero is returned.
 --- {lnum} is used like with |getline()|.
 --- Also see |nextnonblank()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetLnum()->prevnonblank()
+--- <
 ---
 --- @param lnum integer
 --- @return any
 function vim.fn.prevnonblank(lnum) end
 
 --- Return a String with {fmt}, where "%" items are replaced by
---- the formatted form of their respective arguments.  Example: >
----   printf("%4d: E%d %.30s", lnum, errno, msg)
+--- the formatted form of their respective arguments.  Example: >vim
+---   echo printf("%4d: E%d %.30s", lnum, errno, msg)
 --- <May result in:
 ---   "  99: E42 asdfasdfasdfasdfasdfasdfasdfas" ~
 ---
 --- When used as a |method| the base is passed as the second
---- argument: >
+--- argument: >vim
 ---   Compute()->printf("result: %d")
 --- <
 --- You can use `call()` to pass the items as a list.
@@ -6613,8 +6760,8 @@ function vim.fn.prevnonblank(lnum) end
 --- Number argument supplies the field width or precision.  A
 --- negative field width is treated as a left adjustment flag
 --- followed by a positive field width; a negative precision is
---- treated as though it were missing.  Example: >
----   :echo printf("%d: %.*s", nr, width, line)
+--- treated as though it were missing.  Example: >vim
+---   echo printf("%d: %.*s", nr, width, line)
 --- <This limits the length of the text used from "line" to
 --- "width" bytes.
 ---
@@ -6669,7 +6816,7 @@ function vim.fn.prevnonblank(lnum) end
 ---   (out of range or dividing by zero) results in "inf"
 ---    or "-inf" with %f (INF or -INF with %F).
 ---    "0.0 / 0.0" results in "nan" with %f (NAN with %F).
----   Example: >
+---   Example: >vim
 ---     echo printf("%.2f", 12.115)
 --- <    12.12
 ---   Note that roundoff depends on the system libraries.
@@ -6716,8 +6863,9 @@ function vim.fn.printf(fmt, expr1) end
 --- If the buffer doesn't exist or isn't a prompt buffer, an empty
 --- string is returned.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBuffer()->prompt_getprompt()
+--- <
 ---
 --- @param buf any
 --- @return any
@@ -6738,7 +6886,7 @@ function vim.fn.prompt_getprompt(buf) end
 --- The callback is invoked with one argument, which is the text
 --- that was entered at the prompt.  This can be an empty string
 --- if the user only typed Enter.
---- Example: >
+--- Example: >vim
 ---    func s:TextEntered(text)
 ---      if a:text == 'exit' || a:text == 'quit'
 ---        stopinsert
@@ -6754,8 +6902,9 @@ function vim.fn.prompt_getprompt(buf) end
 ---    endfunc
 ---    call prompt_setcallback(bufnr(), function('s:TextEntered'))
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetBuffer()->prompt_setcallback(callback)
+--- <
 ---
 --- @param buf any
 --- @param expr any
@@ -6770,8 +6919,9 @@ function vim.fn.prompt_setcallback(buf, expr) end
 --- mode.  Without setting a callback Vim will exit Insert mode,
 --- as in any buffer.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBuffer()->prompt_setinterrupt(callback)
+--- <
 ---
 --- @param buf any
 --- @param expr any
@@ -6781,11 +6931,12 @@ function vim.fn.prompt_setinterrupt(buf, expr) end
 --- Set prompt for buffer {buf} to {text}.  You most likely want
 --- {text} to end in a space.
 --- The result is only visible if {buf} has 'buftype' set to
---- "prompt".  Example: >
+--- "prompt".  Example: >vim
 ---   call prompt_setprompt(bufnr(''), 'command: ')
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBuffer()->prompt_setprompt('command: ')
+--- <
 ---
 --- @param buf any
 --- @param text any
@@ -6824,7 +6975,7 @@ function vim.fn.pumvisible() end
 --- Dictionaries are represented as Vim |Dictionary| type with
 --- keys converted to strings.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetExpr()->py3eval()
 --- <
 ---
@@ -6840,8 +6991,9 @@ function vim.fn.py3eval(expr) end
 --- Dictionaries are represented as Vim |Dictionary| type,
 --- non-string keys result in error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetExpr()->pyeval()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -6852,7 +7004,7 @@ function vim.fn.pyeval(expr) end
 --- Uses Python 2 or 3, see |python_x| and 'pyxversion'.
 --- See also: |pyeval()|, |py3eval()|
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetExpr()->pyxeval()
 --- <
 ---
@@ -6868,13 +7020,13 @@ function vim.fn.pyxeval(expr) end
 --- and updated.
 --- Returns -1 if {expr} is invalid.
 ---
---- Examples: >
----   :echo rand()
----   :let seed = srand()
----   :echo rand(seed)
----   :echo rand(seed) % 16  " random number 0 - 15
+--- Examples: >vim
+---   echo rand()
+---   let seed = srand()
+---   echo rand(seed)
+---   echo rand(seed) % 16  " random number 0 - 15
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   seed->rand()
 --- <
 ---
@@ -6891,15 +7043,15 @@ function vim.fn.rand(expr) end
 --- When the maximum is one before the start the result is an
 --- empty list.  When the maximum is more than one before the
 --- start this is an error.
---- Examples: >
----   range(4)    " [0, 1, 2, 3]
----   range(2, 4)    " [2, 3, 4]
----   range(2, 9, 3)    " [2, 5, 8]
----   range(2, -2, -1)  " [2, 1, 0, -1, -2]
----   range(0)    " []
----   range(2, 0)    " error!
---- <
---- Can also be used as a |method|: >
+--- Examples: >vim
+---   echo range(4)    " [0, 1, 2, 3]
+---   echo range(2, 4)    " [2, 3, 4]
+---   echo range(2, 9, 3)    " [2, 5, 8]
+---   echo range(2, -2, -1)  " [2, 1, 0, -1, -2]
+---   echo range(0)    " []
+---   echo range(2, 0)    " error!
+--- <
+--- Can also be used as a |method|: >vim
 ---   GetExpr()->range()
 --- <
 ---
@@ -6912,18 +7064,18 @@ function vim.fn.range(expr, max, stride) end
 --- Read file {fname} in binary mode and return a |Blob|.
 --- If {offset} is specified, read the file from the specified
 --- offset.  If it is a negative value, it is used as an offset
---- from the end of the file.  E.g., to read the last 12 bytes: >
----   readblob('file.bin', -12)
+--- from the end of the file.  E.g., to read the last 12 bytes: >vim
+---   echo readblob('file.bin', -12)
 --- <If {size} is specified, only the specified size will be read.
---- E.g. to read the first 100 bytes of a file: >
----   readblob('file.bin', 0, 100)
+--- E.g. to read the first 100 bytes of a file: >vim
+---   echo readblob('file.bin', 0, 100)
 --- <If {size} is -1 or omitted, the whole data starting from
 --- {offset} will be read.
 --- This can be also used to read the data from a character device
 --- on Unix when {size} is explicitly set.  Only if the device
 --- supports seeking {offset} can be used.  Otherwise it should be
---- zero.  E.g. to read 10 bytes from a serial console: >
----   readblob('/dev/ttyS0', 0, 10)
+--- zero.  E.g. to read 10 bytes from a serial console: >vim
+---   echo readblob('/dev/ttyS0', 0, 10)
 --- <When the file can't be opened an error message is given and
 --- the result is an empty |Blob|.
 --- When the offset is beyond the end of the file the result is an
@@ -6952,12 +7104,12 @@ function vim.fn.readblob(fname, offset, size) end
 ---   to the list.
 --- Each time {expr} is evaluated |v:val| is set to the entry name.
 --- When {expr} is a function the name is passed as the argument.
---- For example, to get a list of files ending in ".txt": >
----   readdir(dirname, {n -> n =~ '.txt$'})
---- <To skip hidden and backup files: >
----   readdir(dirname, {n -> n !~ '^\.\|\~$'})
+--- For example, to get a list of files ending in ".txt": >vim
+---   echo readdir(dirname, {n -> n =~ '.txt$'})
+--- <To skip hidden and backup files: >vim
+---   echo readdir(dirname, {n -> n !~ '^\.\|\~$'})
 ---
---- <If you want to get a directory tree: >
+--- <If you want to get a directory tree: >vim
 ---   function! s:tree(dir)
 ---       return {a:dir : map(readdir(a:dir),
 ---       \ {_, x -> isdirectory(x) ?
@@ -6967,7 +7119,7 @@ function vim.fn.readblob(fname, offset, size) end
 --- <
 --- Returns an empty List on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetDirName()->readdir()
 --- <
 ---
@@ -6991,10 +7143,10 @@ function vim.fn.readdir(directory, expr) end
 --- - Any UTF-8 byte order mark is removed from the text.
 --- When {max} is given this specifies the maximum number of lines
 --- to be read.  Useful if you only want to check the first ten
---- lines of a file: >
----   :for line in readfile(fname, '', 10)
----   :  if line =~ 'Date' | echo line | endif
----   :endfor
+--- lines of a file: >vim
+---   for line in readfile(fname, '', 10)
+---     if line =~ 'Date' | echo line | endif
+---   endfor
 --- <When {max} is negative -{max} lines from the end of the file
 --- are returned, or as many as there are.
 --- When {max} is zero the result is an empty list.
@@ -7008,7 +7160,7 @@ function vim.fn.readdir(directory, expr) end
 --- the result is an empty list.
 --- Also see |writefile()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFileName()->readfile()
 --- <
 ---
@@ -7028,13 +7180,14 @@ function vim.fn.readfile(fname, type, max) end
 --- item.  If {initial} is not given and {object} is empty no
 --- result can be computed, an E998 error is given.
 ---
---- Examples: >
+--- Examples: >vim
 ---   echo reduce([1, 3, 5], { acc, val -> acc + val })
 ---   echo reduce(['x', 'y'], { acc, val -> acc .. val }, 'a')
 ---   echo reduce(0z1122, { acc, val -> 2 * acc + val })
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   echo mylist->reduce({ acc, val -> acc + val }, 0)
+--- <
 ---
 --- @param object any
 --- @param func any
@@ -7086,7 +7239,7 @@ function vim.fn.reltime(start) end
 --- The {start} and {end} arguments must be values returned by
 --- reltime().  Returns zero on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetStart()->reltime()
 --- <
 --- Note: |localtime()| returns the current (non-relative) time.
@@ -7106,8 +7259,9 @@ function vim.fn.reltime(start, end_) end
 --- Also see |profiling|.
 --- If there is an error an empty string is returned
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   reltime(start)->reltimefloat()
+--- <
 ---
 --- @param time any
 --- @return any
@@ -7115,19 +7269,19 @@ function vim.fn.reltimefloat(time) end
 
 --- Return a String that represents the time value of {time}.
 --- This is the number of seconds, a dot and the number of
---- microseconds.  Example: >
+--- microseconds.  Example: >vim
 ---   let start = reltime()
 ---   call MyFunction()
 ---   echo reltimestr(reltime(start))
 --- <Note that overhead for the commands will be added to the time.
 --- Leading spaces are used to make the string align nicely.  You
---- can use split() to remove it. >
+--- can use split() to remove it. >vim
 ---   echo split(reltimestr(reltime(start)))[0]
 --- <Also see |profiling|.
 --- If there is an error an empty string is returned
 ---
---- Can also be used as a |method|: >
----   reltime(start)->reltimestr()
+--- Can also be used as a |method|: >vim
+---   echo reltime(start)->reltimestr()
 --- <
 ---
 --- @param time any
@@ -7147,14 +7301,15 @@ function vim.fn.remove(list, idx) end
 --- points to an item before {idx} this is an error.
 --- See |list-index| for possible values of {idx} and {end}.
 --- Returns zero on error.
---- Example: >
----   :echo "last item: " .. remove(mylist, -1)
----   :call remove(mylist, 0, 9)
+--- Example: >vim
+---   echo "last item: " .. remove(mylist, -1)
+---   call remove(mylist, 0, 9)
 --- <
 --- Use |delete()| to remove a file.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->remove(idx)
+--- <
 ---
 --- @param list any
 --- @param idx integer
@@ -7174,9 +7329,10 @@ function vim.fn.remove(blob, idx) end
 --- byte as {end} a |Blob| with one byte is returned.  When {end}
 --- points to a byte before {idx} this is an error.
 --- Returns zero on error.
---- Example: >
----   :echo "last byte: " .. remove(myblob, -1)
----   :call remove(mylist, 0, 9)
+--- Example: >vim
+---   echo "last byte: " .. remove(myblob, -1)
+---   call remove(mylist, 0, 9)
+--- <
 ---
 --- @param blob any
 --- @param idx integer
@@ -7185,8 +7341,8 @@ function vim.fn.remove(blob, idx) end
 function vim.fn.remove(blob, idx, end_) end
 
 --- Remove the entry from {dict} with key {key} and return it.
---- Example: >
----   :echo "removed " .. remove(dict, "one")
+--- Example: >vim
+---   echo "removed " .. remove(dict, "one")
 --- <If there is no {key} in {dict} this is an error.
 --- Returns zero on error.
 ---
@@ -7202,8 +7358,9 @@ function vim.fn.remove(dict, key) end
 --- NOTE: If {to} exists it is overwritten without warning.
 --- This function is not available in the |sandbox|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetOldName()->rename(newname)
+--- <
 ---
 --- @param from any
 --- @param to any
@@ -7211,15 +7368,15 @@ function vim.fn.remove(dict, key) end
 function vim.fn.rename(from, to) end
 
 --- Repeat {expr} {count} times and return the concatenated
---- result.  Example: >
----   :let separator = repeat('-', 80)
+--- result.  Example: >vim
+---   let separator = repeat('-', 80)
 --- <When {count} is zero or negative the result is empty.
 --- When {expr} is a |List| or a |Blob| the result is {expr}
---- concatenated {count} times.  Example: >
----   :let longlist = repeat(['a', 'b'], 3)
+--- concatenated {count} times.  Example: >vim
+---   let longlist = repeat(['a', 'b'], 3)
 --- <Results in ['a', 'b', 'a', 'b', 'a', 'b'].
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->repeat(count)
 --- <
 ---
@@ -7240,7 +7397,7 @@ vim.fn['repeat'] = function(expr, count) end
 --- current directory (provided the result is still a relative
 --- path name) and also keeps a trailing path separator.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->resolve()
 --- <
 ---
@@ -7252,10 +7409,11 @@ function vim.fn.resolve(filename) end
 --- {object} can be a |List| or a |Blob|.
 --- Returns {object}.
 --- Returns zero if {object} is not a List or a Blob.
---- If you want an object to remain unmodified make a copy first: >
----   :let revlist = reverse(copy(mylist))
---- <Can also be used as a |method|: >
+--- If you want an object to remain unmodified make a copy first: >vim
+---   let revlist = reverse(copy(mylist))
+--- <Can also be used as a |method|: >vim
 ---   mylist->reverse()
+--- <
 ---
 --- @param object any
 --- @return any
@@ -7266,16 +7424,17 @@ function vim.fn.reverse(object) end
 --- values, then use the larger one (away from zero).
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
+--- Examples: >vim
 ---   echo round(0.456)
---- <  0.0  >
+--- <  0.0  >vim
 ---   echo round(4.5)
---- <  5.0 >
+--- <  5.0 >vim
 ---   echo round(-4.5)
 --- <  -5.0
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->round()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -7283,8 +7442,9 @@ function vim.fn.round(expr) end
 
 --- Sends {event} to {channel} via |RPC| and returns immediately.
 --- If {channel} is 0, the event is broadcast to all channels.
---- Example: >
----   :au VimLeave call rpcnotify(0, "leaving")
+--- Example: >vim
+---   au VimLeave call rpcnotify(0, "leaving")
+--- <
 ---
 --- @param channel any
 --- @param event any
@@ -7294,8 +7454,9 @@ function vim.fn.rpcnotify(channel, event, args) end
 
 --- Sends a request to {channel} to invoke {method} via
 --- |RPC| and blocks until a response is received.
---- Example: >
----   :let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
+--- Example: >vim
+---   let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
+--- <
 ---
 --- @param channel any
 --- @param method any
@@ -7303,10 +7464,11 @@ function vim.fn.rpcnotify(channel, event, args) end
 --- @return any
 function vim.fn.rpcrequest(channel, method, args) end
 
---- Deprecated. Replace  >
----   :let id = rpcstart('prog', ['arg1', 'arg2'])
---- <with >
----   :let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
+--- Deprecated. Replace  >vim
+---   let id = rpcstart('prog', ['arg1', 'arg2'])
+--- <with >vim
+---   let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
+--- <
 ---
 --- @param prog any
 --- @param argv? any
@@ -7332,8 +7494,9 @@ function vim.fn.rpcstop(...) end
 --- Other objects are represented as strings resulted from their
 --- "Object#to_s" method.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRubyExpr()->rubyeval()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -7344,8 +7507,9 @@ function vim.fn.rubyeval(expr) end
 --- attribute at other positions.
 --- Returns -1 when row or col is out of range.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRow()->screenattr(col)
+--- <
 ---
 --- @param row any
 --- @param col integer
@@ -7361,8 +7525,9 @@ function vim.fn.screenattr(row, col) end
 --- This is mainly to be used for testing.
 --- Returns -1 when row or col is out of range.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRow()->screenchar(col)
+--- <
 ---
 --- @param row any
 --- @param col integer
@@ -7375,8 +7540,9 @@ function vim.fn.screenchar(row, col) end
 --- This is mainly to be used for testing.
 --- Returns an empty List when row or col is out of range.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRow()->screenchars(col)
+--- <
 ---
 --- @param row any
 --- @param col integer
@@ -7391,7 +7557,7 @@ function vim.fn.screenchars(row, col) end
 --- in a command (e.g. ":echo screencol()") it will return the
 --- column inside the command line, which is 1 when the command is
 --- executed. To get the cursor position in the file use one of
---- the following mappings: >
+--- the following mappings: >vim
 ---   nnoremap <expr> GG ":echom " .. screencol() .. "\n"
 ---   nnoremap <silent> GG :echom screencol()<CR>
 ---   noremap GG <Cmd>echom screencol()<Cr>
@@ -7423,8 +7589,9 @@ function vim.fn.screencol() end
 --- first character is returned, {col} is not used.
 --- Returns an empty Dict if {winid} is invalid.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->screenpos(lnum, col)
+--- <
 ---
 --- @param winid integer
 --- @param lnum integer
@@ -7449,7 +7616,7 @@ function vim.fn.screenrow() end
 --- This is mainly to be used for testing.
 --- Returns an empty String when row or col is out of range.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetRow()->screenstring(col)
 --- <
 ---
@@ -7498,7 +7665,7 @@ function vim.fn.screenstring(row, col) end
 ---
 --- When the {stopline} argument is given then the search stops
 --- after searching this line.  This is useful to restrict the
---- search to a range of lines.  Examples: >
+--- search to a range of lines.  Examples: >vim
 ---   let match = search('(', 'b', line("w0"))
 ---   let end = search('END', '', line("w$"))
 --- <When {stopline} is used and it is not zero this also implies
@@ -7529,24 +7696,24 @@ function vim.fn.screenstring(row, col) end
 --- The cursor will be positioned at the match, unless the 'n'
 --- flag is used.
 ---
---- Example (goes over all files in the argument list): >
----     :let n = 1
----     :while n <= argc()      " loop over all files in arglist
----     :  exe "argument " .. n
----     :  " start at the last char in the file and wrap for the
----     :  " first search to find match at start of file
----     :  normal G$
----     :  let flags = "w"
----     :  while search("foo", flags) > 0
----     :   s/foo/bar/g
----     :   let flags = "W"
----     :  endwhile
----     :  update        " write the file if modified
----     :  let n = n + 1
----     :endwhile
---- <
---- Example for using some flags: >
----     :echo search('\<if\|\(else\)\|\(endif\)', 'ncpe')
+--- Example (goes over all files in the argument list): >vim
+---     let n = 1
+---     while n <= argc()      " loop over all files in arglist
+---       exe "argument " .. n
+---       " start at the last char in the file and wrap for the
+---       " first search to find match at start of file
+---       normal G$
+---       let flags = "w"
+---       while search("foo", flags) > 0
+---         s/foo/bar/g
+---         let flags = "W"
+---       endwhile
+---       update        " write the file if modified
+---       let n = n + 1
+---     endwhile
+--- <
+--- Example for using some flags: >vim
+---     echo search('\<if\|\(else\)\|\(endif\)', 'ncpe')
 --- <This will search for the keywords "if", "else", and "endif"
 --- under or after the cursor.  Because of the 'p' flag, it
 --- returns 1, 2, or 3 depending on which keyword is found, or 0
@@ -7558,8 +7725,9 @@ function vim.fn.screenstring(row, col) end
 --- without the 'e' flag if the cursor is on the "f" of "if".
 --- The 'n' flag tells the function not to move the cursor.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetPattern()->search()
+--- <
 ---
 --- @param pattern any
 --- @param flags? string
@@ -7593,7 +7761,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 --- this function with `recompute: 0` . This sometimes returns
 --- wrong information because |n| and |N|'s maximum count is 99.
 --- If it exceeded 99 the result must be max count + 1 (100). If
---- you want to get correct information, specify `recompute: 1`: >
+--- you want to get correct information, specify `recompute: 1`: >vim
 ---
 ---   " result == maxcount + 1 (100) when many matches
 ---   let result = searchcount(#{recompute: 0})
@@ -7602,7 +7770,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 ---   " to 1)
 ---   let result = searchcount()
 --- <
---- The function is useful to add the count to 'statusline': >
+--- The function is useful to add the count to 'statusline': >vim
 ---   function! LastSearchCount() abort
 ---     let result = searchcount(#{recompute: 0})
 ---     if empty(result)
@@ -7631,7 +7799,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 ---   " \   '%{v:hlsearch ? LastSearchCount() : ""}'
 --- <
 --- You can also update the search count, which can be useful in a
---- |CursorMoved| or |CursorMovedI| autocommand: >
+--- |CursorMoved| or |CursorMovedI| autocommand: >vim
 ---
 ---   autocmd CursorMoved,CursorMovedI *
 ---     \ let s:searchcount_timer = timer_start(
@@ -7645,7 +7813,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 ---   endfunction
 --- <
 --- This can also be used to count matched texts with specified
---- pattern in the current buffer using "pattern":  >
+--- pattern in the current buffer using "pattern":  >vim
 ---
 ---   " Count '\<foo\>' in this buffer
 ---   " (Note that it also updates search count)
@@ -7669,7 +7837,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 ---         and different with |\@/|.
 ---         this works as same as the
 ---         below command is executed
----         before calling this function >
+---         before calling this function >vim
 ---           let \@/ = pattern
 --- <        (default: |\@/|)
 ---   timeout  |Number|  0 or negative number is no
@@ -7689,7 +7857,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 ---         value. see |cursor()|, |getpos()|
 ---         (default: cursor's position)
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetSearchOpts()->searchcount()
 --- <
 ---
@@ -7709,12 +7877,12 @@ function vim.fn.searchcount(options) end
 ---
 --- Moves the cursor to the found match.
 --- Returns zero for success, non-zero for failure.
---- Example: >
+--- Example: >vim
 ---   if searchdecl('myvar') == 0
 ---      echo getline('.')
 ---   endif
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->searchdecl()
 --- <
 ---
@@ -7738,8 +7906,8 @@ function vim.fn.searchdecl(name, global, thisblock) end
 --- must not contain \( \) pairs.  Use of \%( \) is allowed.  When
 --- {middle} is not empty, it is found when searching from either
 --- direction, but only when not in a nested start-end pair.  A
---- typical use is: >
----   searchpair('\<if\>', '\<else\>', '\<endif\>')
+--- typical use is: >vim
+---   echo searchpair('\<if\>', '\<else\>', '\<endif\>')
 --- <By leaving {middle} empty the "else" is skipped.
 ---
 --- {flags} 'b', 'c', 'n', 's', 'w' and 'W' are used like with
@@ -7769,7 +7937,7 @@ function vim.fn.searchdecl(name, global, thisblock) end
 ---
 --- The search starts exactly at the cursor.  A match with
 --- {start}, {middle} or {end} at the next character, in the
---- direction of searching, is the first one found.  Example: >
+--- direction of searching, is the first one found.  Example: >vim
 ---   if 1
 ---     if 2
 ---     endif 2
@@ -7785,9 +7953,9 @@ function vim.fn.searchdecl(name, global, thisblock) end
 --- that when the cursor is inside a match with the end it finds
 --- the matching start.
 ---
---- Example, to find the "endif" command in a Vim script: >
+--- Example, to find the "endif" command in a Vim script: >vim
 ---
----   :echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
+---   echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
 ---   \ 'getline(".") =~ "^\\s*\""')
 ---
 --- <The cursor must be at or after the "if" for which a match is
@@ -7796,15 +7964,15 @@ function vim.fn.searchdecl(name, global, thisblock) end
 --- catches comments at the start of a line, not after a command.
 --- Also, a word "en" or "if" halfway through a line is considered
 --- a match.
---- Another example, to search for the matching "{" of a "}": >
+--- Another example, to search for the matching "{" of a "}": >vim
 ---
----   :echo searchpair('{', '', '}', 'bW')
+---   echo searchpair('{', '', '}', 'bW')
 ---
 --- <This works when the cursor is at or before the "}" for which a
 --- match is to be found.  To reject matches that syntax
---- highlighting recognized as strings: >
+--- highlighting recognized as strings: >vim
 ---
----   :echo searchpair('{', '', '}', 'bW',
+---   echo searchpair('{', '', '}', 'bW',
 ---        \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')
 --- <
 ---
@@ -7815,9 +7983,9 @@ function vim.fn.searchpair() end
 --- column position of the match. The first element of the |List|
 --- is the line number and the second element is the byte index of
 --- the column position of the match.  If no match is found,
---- returns [0, 0]. >
+--- returns [0, 0]. >vim
 ---
----   :let [lnum,col] = searchpairpos('{', '', '}', 'n')
+---   let [lnum,col] = searchpairpos('{', '', '}', 'n')
 --- <
 --- See |match-parens| for a bigger and more useful example.
 ---
@@ -7829,17 +7997,18 @@ function vim.fn.searchpairpos() end
 --- is the line number and the second element is the byte index of
 --- the column position of the match. If no match is found,
 --- returns [0, 0].
---- Example: >
----   :let [lnum, col] = searchpos('mypattern', 'n')
+--- Example: >vim
+---   let [lnum, col] = searchpos('mypattern', 'n')
 ---
 --- <When the 'p' flag is given then there is an extra item with
---- the sub-pattern match number |search()-sub-match|.  Example: >
----   :let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
+--- the sub-pattern match number |search()-sub-match|.  Example: >vim
+---   let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
 --- <In this example "submatch" is 2 when a lowercase letter is
 --- found |/\l|, 3 when an uppercase letter is found |/\u|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetPattern()->searchpos()
+--- <
 ---
 --- @param pattern any
 --- @param flags? string
@@ -7851,8 +8020,9 @@ function vim.fn.searchpos(pattern, flags, stopline, timeout, skip) end
 
 --- Returns a list of server addresses, or empty if all servers
 --- were stopped. |serverstart()| |serverstop()|
---- Example: >
----   :echo serverlist()
+--- Example: >vim
+---   echo serverlist()
+--- <
 ---
 --- @return any
 function vim.fn.serverlist() end
@@ -7869,24 +8039,26 @@ function vim.fn.serverlist() end
 ---   assigns a random port).
 --- - Else {address} is the path to a named pipe (except on Windows).
 ---   - If {address} has no slashes ("/") it is treated as the
----     "name" part of a generated path in this format: >
+---     "name" part of a generated path in this format: >vim
 ---   stdpath("run").."/{name}.{pid}.{counter}"
---- <  - If {address} is omitted the name is "nvim". >
----   :echo serverstart()
+--- <  - If {address} is omitted the name is "nvim". >vim
+---   echo serverstart()
+--- < >
 ---   => /tmp/nvim.bram/oknANW/nvim.15430.5
----
---- <Example bash command to list all Nvim servers: >
+--- <
+--- Example bash command to list all Nvim servers: >bash
 ---   ls ${XDG_RUNTIME_DIR:-${TMPDIR}nvim.${USER}}/*/nvim.*.0
 ---
---- <Example named pipe: >
+--- <Example named pipe: >vim
 ---   if has('win32')
 ---     echo serverstart('\\.\pipe\nvim-pipe-1234')
 ---   else
 ---     echo serverstart('nvim.sock')
 ---   endif
 --- <
---- Example TCP/IP address: >
+--- Example TCP/IP address: >vim
 ---   echo serverstart('::1:12345')
+--- <
 ---
 --- @param address? any
 --- @return any
@@ -7925,8 +8097,9 @@ function vim.fn.serverstop(address) end
 --- error message is given.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- third argument: >
+--- third argument: >vim
 ---   GetText()->setbufline(buf, lnum)
+--- <
 ---
 --- @param buf any
 --- @param lnum integer
@@ -7942,13 +8115,13 @@ function vim.fn.setbufline(buf, lnum, text) end
 --- For the use of {buf}, see |bufname()| above.
 --- The {varname} argument is a string.
 --- Note that the variable name without "b:" must be used.
---- Examples: >
----   :call setbufvar(1, "&mod", 1)
----   :call setbufvar("todo", "myvar", "foobar")
+--- Examples: >vim
+---   call setbufvar(1, "&mod", 1)
+---   call setbufvar("todo", "myvar", "foobar")
 --- <This function is not available in the |sandbox|.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- third argument: >
+--- third argument: >vim
 ---   GetValue()->setbufvar(buf, varname)
 --- <
 ---
@@ -7961,7 +8134,7 @@ function vim.fn.setbufvar(buf, varname, val) end
 --- Specify overrides for cell widths of character ranges.  This
 --- tells Vim how wide characters are when displayed in the
 --- terminal, counted in screen cells.  The values override
---- 'ambiwidth'.  Example: >
+--- 'ambiwidth'.  Example: >vim
 ---    call setcellwidths([
 ---     \ [0x111, 0x111, 1],
 ---     \ [0x2194, 0x2199, 2],
@@ -7982,7 +8155,7 @@ function vim.fn.setbufvar(buf, varname, val) end
 --- If the new value causes 'fillchars' or 'listchars' to become
 --- invalid it is rejected and an error is given.
 ---
---- To clear the overrides pass an empty {list}: >
+--- To clear the overrides pass an empty {list}: >vim
 ---    call setcellwidths([])
 ---
 --- <You can use the script $VIMRUNTIME/tools/emoji_list.vim to see
@@ -7999,14 +8172,15 @@ function vim.fn.setcellwidths(list) end
 --- character index instead of the byte index in the line.
 ---
 --- Example:
---- With the text "여보세요" in line 8: >
+--- With the text "여보세요" in line 8: >vim
 ---   call setcharpos('.', [0, 8, 4, 0])
---- <positions the cursor on the fourth character '요'. >
+--- <positions the cursor on the fourth character '요'. >vim
 ---   call setpos('.', [0, 8, 4, 0])
 --- <positions the cursor on the second character '보'.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetPosition()->setcharpos('.')
+--- <
 ---
 --- @param expr any
 --- @param list any
@@ -8026,14 +8200,15 @@ function vim.fn.setcharpos(expr, list) end
 ---     character search
 ---
 --- This can be useful to save/restore a user's character search
---- from a script: >
----   :let prevsearch = getcharsearch()
----   :" Perform a command which clobbers user's search
----   :call setcharsearch(prevsearch)
+--- from a script: >vim
+---   let prevsearch = getcharsearch()
+---   " Perform a command which clobbers user's search
+---   call setcharsearch(prevsearch)
 --- <Also see |getcharsearch()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   SavedSearch()->setcharsearch()
+--- <
 ---
 --- @param dict any
 --- @return any
@@ -8045,8 +8220,9 @@ function vim.fn.setcharsearch(dict) end
 --- Returns 0 when successful, 1 when not editing the command
 --- line.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->setcmdline()
+--- <
 ---
 --- @param str any
 --- @param pos? any
@@ -8067,8 +8243,9 @@ function vim.fn.setcmdline(str, pos) end
 --- Returns 0 when successful, 1 when not editing the command
 --- line.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetPos()->setcmdpos()
+--- <
 ---
 --- @param pos any
 --- @return any
@@ -8084,27 +8261,28 @@ function vim.fn.setcursorcharpos(lnum, col, off) end
 --- character index instead of the byte index in the line.
 ---
 --- Example:
---- With the text "여보세요" in line 4: >
+--- With the text "여보세요" in line 4: >vim
 ---   call setcursorcharpos(4, 3)
---- <positions the cursor on the third character '세'. >
+--- <positions the cursor on the third character '세'. >vim
 ---   call cursor(4, 3)
 --- <positions the cursor on the first character '여'.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCursorPos()->setcursorcharpos()
+--- <
 ---
 --- @param list any
 --- @return any
 function vim.fn.setcursorcharpos(list) end
 
---- Set environment variable {name} to {val}.  Example: >
+--- Set environment variable {name} to {val}.  Example: >vim
 ---   call setenv('HOME', '/home/myhome')
 ---
 --- <When {val} is |v:null| the environment variable is deleted.
 --- See also |expr-env|.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetPath()->setenv('PATH')
 --- <
 ---
@@ -8127,7 +8305,7 @@ function vim.fn.setenv(name, val) end
 ---
 --- Returns non-zero for success, zero for failure.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFilename()->setfperm(mode)
 --- <
 --- To read permissions see |getfperm()|.
@@ -8150,22 +8328,23 @@ function vim.fn.setfperm(fname, mode) end
 --- If this succeeds, FALSE is returned.  If this fails (most likely
 --- because {lnum} is invalid) TRUE is returned.
 ---
---- Example: >
----   :call setline(5, strftime("%c"))
+--- Example: >vim
+---   call setline(5, strftime("%c"))
 ---
 --- <When {text} is a |List| then line {lnum} and following lines
---- will be set to the items in the list.  Example: >
----   :call setline(5, ['aaa', 'bbb', 'ccc'])
---- <This is equivalent to: >
----   :for [n, l] in [[5, 'aaa'], [6, 'bbb'], [7, 'ccc']]
----   :  call setline(n, l)
----   :endfor
+--- will be set to the items in the list.  Example: >vim
+---   call setline(5, ['aaa', 'bbb', 'ccc'])
+--- <This is equivalent to: >vim
+---   for [n, l] in [[5, 'aaa'], [6, 'bbb'], [7, 'ccc']]
+---     call setline(n, l)
+---   endfor
 ---
 --- <Note: The '[ and '] marks are not set.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetText()->setline(lnum)
+--- <
 ---
 --- @param lnum integer
 --- @param text any
@@ -8188,8 +8367,9 @@ function vim.fn.setline(lnum, text) end
 --- for the list of supported keys in {what}.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetLoclist()->setloclist(winnr)
+--- <
 ---
 --- @param nr integer
 --- @param list any
@@ -8205,7 +8385,7 @@ function vim.fn.setloclist(nr, list, action, what) end
 --- If {win} is specified, use the window with this number or
 --- window ID instead of the current window.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMatches()->setmatches()
 --- <
 ---
@@ -8262,8 +8442,9 @@ function vim.fn.setmatches(list, win) end
 --- also set the preferred column.  Also see the "curswant" key in
 --- |winrestview()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetPosition()->setpos('.')
+--- <
 ---
 --- @param expr any
 --- @param list any
@@ -8322,8 +8503,8 @@ function vim.fn.setpos(expr, list) end
 ---
 --- 'r'  The items from the current quickfix list are replaced
 ---   with the items from {list}.  This can also be used to
----   clear the list: >
----     :call setqflist([], 'r')
+---   clear the list: >vim
+---     call setqflist([], 'r')
 --- <
 --- 'f'  All the quickfix lists in the quickfix stack are
 ---   freed.
@@ -8369,10 +8550,10 @@ function vim.fn.setpos(expr, list) end
 --- list is modified, "id" should be used instead of "nr" to
 --- specify the list.
 ---
---- Examples (See also |setqflist-examples|): >
----    :call setqflist([], 'r', {'title': 'My search'})
----    :call setqflist([], 'r', {'nr': 2, 'title': 'Errors'})
----    :call setqflist([], 'a', {'id':qfid, 'lines':["F1:10:L10"]})
+--- Examples (See also |setqflist-examples|): >vim
+---    call setqflist([], 'r', {'title': 'My search'})
+---    call setqflist([], 'r', {'nr': 2, 'title': 'Errors'})
+---    call setqflist([], 'a', {'id':qfid, 'lines':["F1:10:L10"]})
 --- <
 --- Returns zero for success, -1 for failure.
 ---
@@ -8381,7 +8562,7 @@ function vim.fn.setpos(expr, list) end
 --- `:cc 1` to jump to the first position.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetErrorlist()->setqflist()
 --- <
 ---
@@ -8422,33 +8603,34 @@ function vim.fn.setqflist(list, action, what) end
 ---       set search and expression registers. Lists containing no
 ---       items act like empty strings.
 ---
---- Examples: >
----   :call setreg(v:register, \@*)
----   :call setreg('*', \@%, 'ac')
----   :call setreg('a', "1\n2\n3", 'b5')
----   :call setreg('"', { 'points_to': 'a'})
+--- Examples: >vim
+---   call setreg(v:register, \@*)
+---   call setreg('*', \@%, 'ac')
+---   call setreg('a', "1\n2\n3", 'b5')
+---   call setreg('"', { 'points_to': 'a'})
 ---
 --- <This example shows using the functions to save and restore a
---- register: >
----   :let var_a = getreginfo()
----   :call setreg('a', var_a)
---- <or: >
----   :let var_a = getreg('a', 1, 1)
----   :let var_amode = getregtype('a')
----       ....
----   :call setreg('a', var_a, var_amode)
+--- register: >vim
+---   let var_a = getreginfo()
+---   call setreg('a', var_a)
+--- <or: >vim
+---   let var_a = getreg('a', 1, 1)
+---   let var_amode = getregtype('a')
+---   " ....
+---   call setreg('a', var_a, var_amode)
 --- <Note: you may not reliably restore register value
 --- without using the third argument to |getreg()| as without it
 --- newlines are represented as newlines AND Nul bytes are
 --- represented as newlines as well, see |NL-used-for-Nul|.
 ---
 --- You can also change the type of a register by appending
---- nothing: >
----   :call setreg('a', '', 'al')
+--- nothing: >vim
+---   call setreg('a', '', 'al')
 ---
 --- <Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetText()->setreg('a')
+--- <
 ---
 --- @param regname string
 --- @param value any
@@ -8464,8 +8646,9 @@ function vim.fn.setreg(regname, value, options) end
 --- This function is not available in the |sandbox|.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- third argument: >
+--- third argument: >vim
 ---   GetValue()->settabvar(tab, name)
+--- <
 ---
 --- @param tabnr integer
 --- @param varname string
@@ -8483,14 +8666,15 @@ function vim.fn.settabvar(tabnr, varname, val) end
 --- doesn't work for a global or local buffer variable.
 --- For a local buffer option the global value is unchanged.
 --- Note that the variable name without "w:" must be used.
---- Examples: >
----   :call settabwinvar(1, 1, "&list", 0)
----   :call settabwinvar(3, 2, "myvar", "foobar")
+--- Examples: >vim
+---   call settabwinvar(1, 1, "&list", 0)
+---   call settabwinvar(3, 2, "myvar", "foobar")
 --- <This function is not available in the |sandbox|.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- fourth argument: >
+--- fourth argument: >vim
 ---   GetValue()->settabwinvar(tab, winnr, name)
+--- <
 ---
 --- @param tabnr integer
 --- @param winnr integer
@@ -8522,18 +8706,19 @@ function vim.fn.settabwinvar(tabnr, winnr, varname, val) end
 --- Returns zero for success, -1 for failure.
 ---
 --- Examples (for more examples see |tagstack-examples|):
----     Empty the tag stack of window 3: >
+---     Empty the tag stack of window 3: >vim
 ---   call settagstack(3, {'items' : []})
 ---
---- <    Save and restore the tag stack: >
+--- <    Save and restore the tag stack: >vim
 ---   let stack = gettagstack(1003)
 ---   " do something else
 ---   call settagstack(1003, stack)
 ---   unlet stack
 --- <
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetStack()->settagstack(winnr)
+--- <
 ---
 --- @param nr integer
 --- @param dict any
@@ -8542,13 +8727,14 @@ function vim.fn.settabwinvar(tabnr, winnr, varname, val) end
 function vim.fn.settagstack(nr, dict, action) end
 
 --- Like |settabwinvar()| for the current tab page.
---- Examples: >
----   :call setwinvar(1, "&list", 0)
----   :call setwinvar(2, "myvar", "foobar")
+--- Examples: >vim
+---   call setwinvar(1, "&list", 0)
+---   call setwinvar(2, "myvar", "foobar")
 ---
 --- <Can also be used as a |method|, the base is passed as the
---- third argument: >
+--- third argument: >vim
 ---   GetValue()->setwinvar(winnr, name)
+--- <
 ---
 --- @param nr integer
 --- @param varname string
@@ -8559,8 +8745,9 @@ function vim.fn.setwinvar(nr, varname, val) end
 --- Returns a String with 64 hex characters, which is the SHA256
 --- checksum of {string}.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->sha256()
+--- <
 ---
 --- @param string string
 --- @return any
@@ -8589,15 +8776,16 @@ function vim.fn.sha256(string) end
 --- be escaped because in fish it is used as an escape character
 --- inside single quotes.
 ---
---- Example of use with a |:!| command: >
----     :exe '!dir ' .. shellescape(expand('<cfile>'), 1)
+--- Example of use with a |:!| command: >vim
+---     exe '!dir ' .. shellescape(expand('<cfile>'), 1)
 --- <This results in a directory listing for the file under the
---- cursor.  Example of use with |system()|: >
----     :call system("chmod +w -- " .. shellescape(expand("%")))
+--- cursor.  Example of use with |system()|: >vim
+---     call system("chmod +w -- " .. shellescape(expand("%")))
 --- <See also |::S|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetCommand()->shellescape()
+--- <
 ---
 --- @param string string
 --- @param special? any
@@ -8607,7 +8795,7 @@ function vim.fn.shellescape(string, special) end
 --- Returns the effective value of 'shiftwidth'. This is the
 --- 'shiftwidth' value unless it is zero, in which case it is the
 --- 'tabstop' value.  To be backwards compatible in indent
---- plugins, use this: >
+--- plugins, use this: >vim
 ---   if exists('*shiftwidth')
 ---     func s:sw()
 ---       return shiftwidth()
@@ -8624,10 +8812,9 @@ function vim.fn.shellescape(string, special) end
 --- 'vartabstop' feature. If no {col} argument is given, column 1
 --- will be assumed.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetColumn()->shiftwidth()
----
---- sign_ functions are documented here: |sign-functions-details|
+--- <
 ---
 --- @param col? integer
 --- @return any
@@ -8670,7 +8857,7 @@ function vim.fn.sign_define(name, dict) end
 --- {list} is used, then returns a List of values one for each
 --- defined sign.
 ---
---- Examples: >
+--- Examples: >vim
 ---   call sign_define("mySign", {
 ---     \ "text" : "=>",
 ---     \ "texthl" : "Error",
@@ -8682,8 +8869,9 @@ function vim.fn.sign_define(name, dict) end
 ---     \  'text' : '!!'}
 ---     \ ])
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetSignList()->sign_define()
+--- <
 ---
 --- @param list any
 --- @return any
@@ -8716,15 +8904,16 @@ function vim.fn.sign_define(list) end
 --- Returns an empty List if there are no signs and when {name} is
 --- not found.
 ---
---- Examples: >
+--- Examples: >vim
 ---   " Get a list of all the defined signs
 ---   echo sign_getdefined()
 ---
 ---   " Get the attribute of the sign named mySign
 ---   echo sign_getdefined("mySign")
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetSignList()->sign_getdefined()
+--- <
 ---
 --- @param name? string
 --- @return any
@@ -8768,7 +8957,7 @@ function vim.fn.sign_getdefined(name) end
 --- Returns an empty list on failure or if there are no placed
 --- signs.
 ---
---- Examples: >
+--- Examples: >vim
 ---   " Get a List of signs placed in eval.c in the
 ---   " global group
 ---   echo sign_getplaced("eval.c")
@@ -8789,7 +8978,7 @@ function vim.fn.sign_getdefined(name) end
 ---   " Get a List of all the placed signs
 ---   echo sign_getplaced()
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBufname()->sign_getplaced()
 --- <
 ---
@@ -8808,11 +8997,11 @@ function vim.fn.sign_getplaced(buf, dict) end
 --- Returns the line number of the sign. Returns -1 if the
 --- arguments are invalid.
 ---
---- Example: >
+--- Example: >vim
 ---   " Jump to sign 10 in the current buffer
 ---   call sign_jump(10, '', '')
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetSignid()->sign_jump()
 --- <
 ---
@@ -8850,7 +9039,7 @@ function vim.fn.sign_jump(id, group, buf) end
 ---
 --- Returns the sign identifier on success and -1 on failure.
 ---
---- Examples: >
+--- Examples: >vim
 ---   " Place a sign named sign1 with id 5 at line 20 in
 ---   " buffer json.c
 ---   call sign_place(5, '', 'sign1', 'json.c',
@@ -8869,7 +9058,7 @@ function vim.fn.sign_jump(id, group, buf) end
 ---   call sign_place(10, 'g3', 'sign4', 'json.c',
 ---       \ {'lnum' : 40, 'priority' : 90})
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetSignid()->sign_place(group, name, expr)
 --- <
 ---
@@ -8913,7 +9102,7 @@ function vim.fn.sign_place(id, group, name, buf, dict) end
 --- Returns a List of sign identifiers. If failed to place a
 --- sign, the corresponding list item is set to -1.
 ---
---- Examples: >
+--- Examples: >vim
 ---   " Place sign s1 with id 5 at line 20 and id 10 at line
 ---   " 30 in buffer a.c
 ---   let [n1, n2] = sign_placelist([
@@ -8938,8 +9127,9 @@ function vim.fn.sign_place(id, group, name, buf, dict) end
 ---     \  'lnum' : 50}
 ---     \ ])
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetSignlist()->sign_placelist()
+--- <
 ---
 --- @param list any
 --- @return any
@@ -8960,7 +9150,7 @@ function vim.fn.sign_undefine(name) end
 --- {list} call, returns a list of values one for each undefined
 --- sign.
 ---
---- Examples: >
+--- Examples: >vim
 ---   " Delete a sign named mySign
 ---   call sign_undefine("mySign")
 ---
@@ -8970,8 +9160,9 @@ function vim.fn.sign_undefine(name) end
 ---   " Delete all the signs
 ---   call sign_undefine()
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetSignlist()->sign_undefine()
+--- <
 ---
 --- @param list? any
 --- @return any
@@ -8993,7 +9184,7 @@ function vim.fn.sign_undefine(list) end
 ---
 --- Returns 0 on success and -1 on failure.
 ---
---- Examples: >
+--- Examples: >vim
 ---   " Remove sign 10 from buffer a.vim
 ---   call sign_unplace('', {'buffer' : "a.vim", 'id' : 10})
 ---
@@ -9018,7 +9209,7 @@ function vim.fn.sign_undefine(list) end
 ---   " Remove all the placed signs from all the buffers
 ---   call sign_unplace('*')
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetSigngroup()->sign_unplace()
 --- <
 ---
@@ -9046,7 +9237,7 @@ function vim.fn.sign_unplace(group, dict) end
 --- Returns a List where an entry is set to 0 if the corresponding
 --- sign was successfully removed or -1 on failure.
 ---
---- Example: >
+--- Example: >vim
 ---   " Remove sign with id 10 from buffer a.vim and sign
 ---   " with id 20 from buffer b.vim
 ---   call sign_unplacelist([
@@ -9054,7 +9245,7 @@ function vim.fn.sign_unplace(group, dict) end
 ---     \ {'id' : 20, 'buffer' : 'b.vim'},
 ---     \ ])
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetSignlist()->sign_unplacelist()
 --- <
 ---
@@ -9070,7 +9261,7 @@ function vim.fn.sign_unplacelist(list) end
 --- not removed either. On Unix "//path" is unchanged, but
 --- "///path" is simplified to "/path" (this follows the Posix
 --- standard).
---- Example: >
+--- Example: >vim
 ---   simplify("./dir/.././/file/") == "./file/"
 --- <Note: The combination "dir/.." is only removed if "dir" is
 --- a searchable directory or does not exist.  On Unix, it is also
@@ -9078,8 +9269,9 @@ function vim.fn.sign_unplacelist(list) end
 --- directory.  In order to resolve all the involved symbolic
 --- links before simplifying the path name, use |resolve()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetName()->simplify()
+--- <
 ---
 --- @param filename any
 --- @return any
@@ -9088,14 +9280,15 @@ function vim.fn.simplify(filename) end
 --- Return the sine of {expr}, measured in radians, as a |Float|.
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo sin(100)
---- <  -0.506366 >
----   :echo sin(-4.01)
+--- Examples: >vim
+---   echo sin(100)
+--- <  -0.506366 >vim
+---   echo sin(-4.01)
 --- <  0.763301
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->sin()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -9105,14 +9298,15 @@ function vim.fn.sin(expr) end
 --- [-inf, inf].
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo sinh(0.5)
---- <  0.521095 >
----   :echo sinh(-0.9)
+--- Examples: >vim
+---   echo sinh(0.5)
+--- <  0.521095 >vim
+---   echo sinh(-0.9)
 --- <  -1.026517
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->sinh()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -9126,7 +9320,7 @@ function vim.fn.sinh(expr) end
 --- When {end} is -1 the last item is omitted.
 --- Returns an empty value if {start} or {end} are invalid.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetList()->slice(offset)
 --- <
 ---
@@ -9168,8 +9362,8 @@ function vim.fn.sockconnect(mode, address, opts) end
 
 --- Sort the items in {list} in-place.  Returns {list}.
 ---
---- If you want a list to remain unmodified make a copy first: >
----   :let sortedlist = sort(copy(mylist))
+--- If you want a list to remain unmodified make a copy first: >vim
+---   let sortedlist = sort(copy(mylist))
 ---
 --- <When {func} is omitted, is empty or zero, then sort() uses the
 --- string representation of each item to sort on.  Numbers sort
@@ -9184,15 +9378,15 @@ function vim.fn.sockconnect(mode, address, opts) end
 --- is used to compare strings. See |:language| check or set the
 --- collation locale. |v:collate| can also be used to check the
 --- current locale. Sorting using the locale typically ignores
---- case. Example: >
+--- case. Example: >vim
 ---   " ö is sorted similarly to o with English locale.
----   :language collate en_US.UTF8
----   :echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+---   language collate en_US.UTF8
+---   echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
 --- <  ['n', 'o', 'O', 'ö', 'p', 'z'] ~
---- >
+--- >vim
 ---   " ö is sorted after z with Swedish locale.
----   :language collate sv_SE.UTF8
----   :echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+---   language collate sv_SE.UTF8
+---   echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
 --- <  ['n', 'o', 'O', 'p', 'z', 'ö'] ~
 --- This does not work properly on Mac.
 ---
@@ -9222,22 +9416,22 @@ function vim.fn.sockconnect(mode, address, opts) end
 --- on numbers, text strings will sort next to each other, in the
 --- same order as they were originally.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->sort()
 ---
 --- <Also see |uniq()|.
 ---
---- Example: >
+--- Example: >vim
 ---   func MyCompare(i1, i2)
 ---      return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
 ---   endfunc
 ---   eval mylist->sort("MyCompare")
 --- <A shorter compare version for this specific simple case, which
---- ignores overflow: >
+--- ignores overflow: >vim
 ---   func MyCompare(i1, i2)
 ---      return a:i1 - a:i2
 ---   endfunc
---- <For a simple expression you can use a lambda: >
+--- <For a simple expression you can use a lambda: >vim
 ---   eval mylist->sort({i1, i2 -> i1 - i2})
 --- <
 ---
@@ -9254,7 +9448,7 @@ function vim.fn.sort(list, func, dict) end
 --- This can be used for making spelling suggestions.  Note that
 --- the method can be quite slow.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWord()->soundfold()
 --- <
 ---
@@ -9278,14 +9472,14 @@ function vim.fn.soundfold(word) end
 ---   "rare"    rare word
 ---   "local"    word only valid in another region
 ---   "caps"    word should start with Capital
---- Example: >
+--- Example: >vim
 ---   echo spellbadword("the quik brown fox")
 --- <  ['quik', 'bad'] ~
 ---
 --- The spelling information for the current window and the value
 --- of 'spelllang' are used.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->spellbadword()
 --- <
 ---
@@ -9313,8 +9507,9 @@ function vim.fn.spellbadword(sentence) end
 --- The spelling information for the current window is used.  The
 --- values of 'spelllang' and 'spellsuggest' are used.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWord()->spellsuggest()
+--- <
 ---
 --- @param word any
 --- @param max? any
@@ -9332,20 +9527,23 @@ function vim.fn.spellsuggest(word, max, capital) end
 --- {keepempty} argument is given and it's non-zero.
 --- Other empty items are kept when {pattern} matches at least one
 --- character or when {keepempty} is non-zero.
---- Example: >
----   :let words = split(getline('.'), '\W\+')
---- <To split a string in individual characters: >
----   :for c in split(mystring, '\zs')
+--- Example: >vim
+---   let words = split(getline('.'), '\W\+')
+--- <To split a string in individual characters: >vim
+---   for c in split(mystring, '\zs') | endfor
 --- <If you want to keep the separator you can also use '\zs' at
---- the end of the pattern: >
----   :echo split('abc:def:ghi', ':\zs')
---- <  ['abc:', 'def:', 'ghi'] ~
---- Splitting a table where the first element can be empty: >
----   :let items = split(line, ':', 1)
+--- the end of the pattern: >vim
+---   echo split('abc:def:ghi', ':\zs')
+--- < >
+---   ['abc:', 'def:', 'ghi']
+--- <
+--- Splitting a table where the first element can be empty: >vim
+---   let items = split(line, ':', 1)
 --- <The opposite function is |join()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetString()->split()
+--- <
 ---
 --- @param string string
 --- @param pattern? any
@@ -9358,15 +9556,16 @@ function vim.fn.split(string, pattern, keepempty) end
 --- {expr} must evaluate to a |Float| or a |Number|.  When {expr}
 --- is negative the result is NaN (Not a Number).  Returns 0.0 if
 --- {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo sqrt(100)
---- <  10.0 >
----   :echo sqrt(-4.01)
+--- Examples: >vim
+---   echo sqrt(100)
+--- <  10.0 >vim
+---   echo sqrt(-4.01)
 --- <  str2float("nan")
 --- NaN may be different, it depends on system libraries.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->sqrt()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -9380,13 +9579,14 @@ function vim.fn.sqrt(expr) end
 ---   initialize the seed values.  This is useful for testing or
 ---   when a predictable sequence is intended.
 ---
---- Examples: >
----   :let seed = srand()
----   :let seed = srand(userinput)
----   :echo rand(seed)
+--- Examples: >vim
+---   let seed = srand()
+---   let seed = srand(userinput)
+---   echo rand(seed)
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   userinput->srand()
+--- <
 ---
 --- @param expr? any
 --- @return any
@@ -9433,8 +9633,8 @@ function vim.fn.stdioopen(opts) end
 --- state        String  Session state directory: storage for file
 ---          drafts, swap, undo, |shada|.
 ---
---- Example: >
----   :echo stdpath("config")
+--- Example: >vim
+---   echo stdpath("config")
 --- <
 ---
 --- @param what any
@@ -9454,13 +9654,14 @@ function vim.fn.stdpath(what) end
 --- The decimal point is always '.', no matter what the locale is
 --- set to.  A comma ends the number: "12,345.67" is converted to
 --- 12.0.  You can strip out thousands separators with
---- |substitute()|: >
+--- |substitute()|: >vim
 ---   let f = str2float(substitute(text, ',', '', 'g'))
 --- <
 --- Returns 0.0 if the conversion fails.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   let f = text->substitute(',', '', 'g')->str2float()
+--- <
 ---
 --- @param string string
 --- @param quoted? any
@@ -9468,18 +9669,19 @@ function vim.fn.stdpath(what) end
 function vim.fn.str2float(string, quoted) end
 
 --- Return a list containing the number values which represent
---- each character in String {string}.  Examples: >
----   str2list(" ")    returns [32]
----   str2list("ABC")    returns [65, 66, 67]
+--- each character in String {string}.  Examples: >vim
+---   echo str2list(" ")    " returns [32]
+---   echo str2list("ABC")    " returns [65, 66, 67]
 --- <|list2str()| does the opposite.
 ---
 --- UTF-8 encoding is always used, {utf8} option has no effect,
 --- and exists only for backwards-compatibility.
---- With UTF-8 composing characters are handled properly: >
----   str2list("á")    returns [97, 769]
+--- With UTF-8 composing characters are handled properly: >vim
+---   echo str2list("á")    " returns [97, 769]
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetString()->str2list()
+--- <
 ---
 --- @param string string
 --- @param utf8? any
@@ -9493,7 +9695,7 @@ function vim.fn.str2list(string, utf8) end
 ---
 --- When {base} is omitted base 10 is used.  This also means that
 --- a leading zero doesn't cause octal conversion to be used, as
---- with the default String to Number conversion.  Example: >
+--- with the default String to Number conversion.  Example: >vim
 ---   let nr = str2nr('0123')
 --- <
 --- When {base} is 16 a leading "0x" or "0X" is ignored.  With a
@@ -9504,7 +9706,7 @@ function vim.fn.str2list(string, utf8) end
 ---
 --- Returns 0 if {string} is empty or on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->str2nr()
 --- <
 ---
@@ -9522,7 +9724,7 @@ function vim.fn.str2nr(string, base) end
 ---
 --- Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->strcharlen()
 --- <
 ---
@@ -9538,13 +9740,13 @@ function vim.fn.strcharlen(string) end
 --- similar to  |slice()|.
 --- When a character index is used where a character does not
 --- exist it is omitted and counted as one character.  For
---- example: >
----   strcharpart('abc', -1, 2)
+--- example: >vim
+---   echo strcharpart('abc', -1, 2)
 --- <results in 'a'.
 ---
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->strcharpart(5)
 --- <
 ---
@@ -9567,7 +9769,7 @@ function vim.fn.strcharpart(src, start, len, skipcc) end
 --- Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 ---
 --- {skipcc} is only available after 7.4.755.  For backward
---- compatibility, you can define a wrapper function: >
+--- compatibility, you can define a wrapper function: >vim
 ---     if has("patch-7.4.755")
 ---       function s:strchars(str, skipcc)
 ---   return strchars(a:str, a:skipcc)
@@ -9582,8 +9784,9 @@ function vim.fn.strcharpart(src, start, len, skipcc) end
 ---       endfunction
 ---     endif
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->strchars()
+--- <
 ---
 --- @param string string
 --- @param skipcc? any
@@ -9603,8 +9806,9 @@ function vim.fn.strchars(string, skipcc) end
 --- Returns zero on error.
 --- Also see |strlen()|, |strwidth()| and |strchars()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->strdisplaywidth()
+--- <
 ---
 --- @param string string
 --- @param col? integer
@@ -9619,16 +9823,17 @@ function vim.fn.strdisplaywidth(string, col) end
 --- format.  The maximum length of the result is 80 characters.
 --- See also |localtime()|, |getftime()| and |strptime()|.
 --- The language can be changed with the |:language| command.
---- Examples: >
----   :echo strftime("%c")       Sun Apr 27 11:49:23 1997
----   :echo strftime("%Y %b %d %X")     1997 Apr 27 11:53:25
----   :echo strftime("%y%m%d %T")     970427 11:53:55
----   :echo strftime("%H:%M")     11:55
----   :echo strftime("%c", getftime("file.c"))
----            Show mod time of file.c.
----
---- <Can also be used as a |method|: >
+--- Examples: >vim
+---   echo strftime("%c")       " Sun Apr 27 11:49:23 1997
+---   echo strftime("%Y %b %d %X")     " 1997 Apr 27 11:53:25
+---   echo strftime("%y%m%d %T")     " 970427 11:53:55
+---   echo strftime("%H:%M")             " 11:55
+---   echo strftime("%c", getftime("file.c"))
+---            " Show mod time of file.c.
+---
+--- <Can also be used as a |method|: >vim
 ---   GetFormat()->strftime()
+--- <
 ---
 --- @param format any
 --- @param time? any
@@ -9643,8 +9848,9 @@ function vim.fn.strftime(format, time) end
 --- Returns -1 if {index} is invalid.
 --- Also see |strcharpart()| and |strchars()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->strgetchar(5)
+--- <
 ---
 --- @param str any
 --- @param index any
@@ -9654,22 +9860,22 @@ function vim.fn.strgetchar(str, index) end
 --- The result is a Number, which gives the byte index in
 --- {haystack} of the first occurrence of the String {needle}.
 --- If {start} is specified, the search starts at index {start}.
---- This can be used to find a second match: >
----   :let colon1 = stridx(line, ":")
----   :let colon2 = stridx(line, ":", colon1 + 1)
+--- This can be used to find a second match: >vim
+---   let colon1 = stridx(line, ":")
+---   let colon2 = stridx(line, ":", colon1 + 1)
 --- <The search is done case-sensitive.
 --- For pattern searches use |match()|.
 --- -1 is returned if the {needle} does not occur in {haystack}.
 --- See also |strridx()|.
---- Examples: >
----   :echo stridx("An Example", "Example")       3
----   :echo stridx("Starting point", "Start")    0
----   :echo stridx("Starting point", "start")   -1
+--- Examples: >vim
+---   echo stridx("An Example", "Example")       " 3
+---   echo stridx("Starting point", "Start")    " 0
+---   echo stridx("Starting point", "start")   " -1
 --- <        *strstr()* *strchr()*
 --- stridx() works similar to the C function strstr().  When used
 --- with a single character it works similar to strchr().
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetHaystack()->stridx(needle)
 --- <
 ---
@@ -9702,8 +9908,9 @@ function vim.fn.stridx(haystack, needle, start) end
 --- method, use |msgpackdump()| or |json_encode()| if you need to
 --- share data with other application.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->string()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -9717,8 +9924,9 @@ function vim.fn.string(expr) end
 --- |strchars()|.
 --- Also see |len()|, |strdisplaywidth()| and |strwidth()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetString()->strlen()
+--- <
 ---
 --- @param string string
 --- @return any
@@ -9736,20 +9944,21 @@ function vim.fn.strlen(string) end
 --- When bytes are selected which do not exist, this doesn't
 --- result in an error, the bytes are simply omitted.
 --- If {len} is missing, the copy continues from {start} till the
---- end of the {src}. >
----   strpart("abcdefg", 3, 2)    == "de"
----   strpart("abcdefg", -2, 4)   == "ab"
----   strpart("abcdefg", 5, 4)    == "fg"
----   strpart("abcdefg", 3)      == "defg"
+--- end of the {src}. >vim
+---   echo strpart("abcdefg", 3, 2)    " returns 'de'
+---   echo strpart("abcdefg", -2, 4)   " returns 'ab'
+---   echo strpart("abcdefg", 5, 4)    " returns 'fg'
+---   echo strpart("abcdefg", 3)   " returns 'defg'
 ---
 --- <Note: To get the first character, {start} must be 0.  For
---- example, to get the character under the cursor: >
+--- example, to get the character under the cursor: >vim
 ---   strpart(getline("."), col(".") - 1, 1, v:true)
 --- <
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->strpart(5)
+--- <
 ---
 --- @param src any
 --- @param start any
@@ -9773,15 +9982,15 @@ function vim.fn.strpart(src, start, len, chars) end
 --- result.
 ---
 --- See also |strftime()|.
---- Examples: >
----   :echo strptime("%Y %b %d %X", "1997 Apr 27 11:49:23")
---- <  862156163 >
----   :echo strftime("%c", strptime("%y%m%d %T", "970427 11:53:55"))
---- <  Sun Apr 27 11:53:55 1997 >
----   :echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
+--- Examples: >vim
+---   echo strptime("%Y %b %d %X", "1997 Apr 27 11:49:23")
+--- <  862156163 >vim
+---   echo strftime("%c", strptime("%y%m%d %T", "970427 11:53:55"))
+--- <  Sun Apr 27 11:53:55 1997 >vim
+---   echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
 --- <  Sun Apr 27 12:53:55 1997
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFormat()->strptime(timestring)
 --- <
 ---
@@ -9794,21 +10003,22 @@ function vim.fn.strptime(format, timestring) end
 --- {haystack} of the last occurrence of the String {needle}.
 --- When {start} is specified, matches beyond this index are
 --- ignored.  This can be used to find a match before a previous
---- match: >
----   :let lastcomma = strridx(line, ",")
----   :let comma2 = strridx(line, ",", lastcomma - 1)
+--- match: >vim
+---   let lastcomma = strridx(line, ",")
+---   let comma2 = strridx(line, ",", lastcomma - 1)
 --- <The search is done case-sensitive.
 --- For pattern searches use |match()|.
 --- -1 is returned if the {needle} does not occur in {haystack}.
 --- If the {needle} is empty the length of {haystack} is returned.
---- See also |stridx()|.  Examples: >
----   :echo strridx("an angry armadillo", "an")       3
+--- See also |stridx()|.  Examples: >vim
+---   echo strridx("an angry armadillo", "an")       3
 --- <          *strrchr()*
 --- When used with a single character it works similar to the C
 --- function strrchr().
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetHaystack()->strridx(needle)
+--- <
 ---
 --- @param haystack any
 --- @param needle any
@@ -9818,15 +10028,16 @@ function vim.fn.strridx(haystack, needle, start) end
 
 --- The result is a String, which is {string} with all unprintable
 --- characters translated into printable characters |'isprint'|.
---- Like they are shown in a window.  Example: >
+--- Like they are shown in a window.  Example: >vim
 ---   echo strtrans(\@a)
 --- <This displays a newline in register a as "^\@" instead of
 --- starting a new line.
 ---
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetString()->strtrans()
+--- <
 ---
 --- @param string string
 --- @return any
@@ -9843,14 +10054,14 @@ function vim.fn.strtrans(string) end
 --- Returns zero on error.
 ---
 --- Also see |strlen()| and |strcharlen()|.
---- Examples: >
----     echo strutf16len('a')    returns 1
----     echo strutf16len('©')    returns 1
----     echo strutf16len('😊')    returns 2
----     echo strutf16len('ą́')    returns 1
----     echo strutf16len('ą́', v:true)  returns 3
----
---- Can also be used as a |method|: >
+--- Examples: >vim
+---     echo strutf16len('a')    " returns 1
+---     echo strutf16len('©')    " returns 1
+---     echo strutf16len('😊')    " returns 2
+---     echo strutf16len('ą́')    " returns 1
+---     echo strutf16len('ą́', v:true)  " returns 3
+---
+--- Can also be used as a |method|: >vim
 ---   GetText()->strutf16len()
 --- <
 ---
@@ -9867,8 +10078,9 @@ function vim.fn.strutf16len(string, countcc) end
 --- Returns zero on error.
 --- Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetString()->strwidth()
+--- <
 ---
 --- @param string string
 --- @return any
@@ -9895,14 +10107,15 @@ function vim.fn.strwidth(string) end
 ---
 --- Returns an empty string or list on error.
 ---
---- Examples: >
----   :s/\d\+/\=submatch(0) + 1/
----   :echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
+--- Examples: >vim
+---   s/\d\+/\=submatch(0) + 1/
+---   echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
 --- <This finds the first number in the line and adds one to it.
 --- A line break is included as a newline character.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetNr()->submatch()
+--- <
 ---
 --- @param nr integer
 --- @param list? any
@@ -9930,29 +10143,30 @@ function vim.fn.submatch(nr, list) end
 --- When {pat} does not match in {string}, {string} is returned
 --- unmodified.
 ---
---- Example: >
----   :let &path = substitute(&path, ",\\=[^,]*$", "", "")
---- <This removes the last component of the 'path' option. >
----   :echo substitute("testing", ".*", "\\U\\0", "")
+--- Example: >vim
+---   let &path = substitute(&path, ",\\=[^,]*$", "", "")
+--- <This removes the last component of the 'path' option. >vim
+---   echo substitute("testing", ".*", "\\U\\0", "")
 --- <results in "TESTING".
 ---
 --- When {sub} starts with "\=", the remainder is interpreted as
---- an expression. See |sub-replace-expression|.  Example: >
----   :echo substitute(s, '%\(\x\x\)',
+--- an expression. See |sub-replace-expression|.  Example: >vim
+---   echo substitute(s, '%\(\x\x\)',
 ---      \ '\=nr2char("0x" .. submatch(1))', 'g')
 ---
 --- <When {sub} is a Funcref that function is called, with one
---- optional argument.  Example: >
----    :echo substitute(s, '%\(\x\x\)', SubNr, 'g')
+--- optional argument.  Example: >vim
+---    echo substitute(s, '%\(\x\x\)', SubNr, 'g')
 --- <The optional argument is a list which contains the whole
 --- matched string and up to nine submatches, like what
---- |submatch()| returns.  Example: >
----    :echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
+--- |submatch()| returns.  Example: >vim
+---    echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
 ---
 --- <Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetString()->substitute(pat, sub, flags)
+--- <
 ---
 --- @param string string
 --- @param pat any
@@ -9965,7 +10179,7 @@ function vim.fn.substitute(string, pat, sub, flags) end
 --- See the |-r| command argument.  The 'directory' option is used
 --- for the directories to inspect.  If you only want to get a
 --- list of swap files in the current directory then temporarily
---- set 'directory' to a dot: >
+--- set 'directory' to a dot: >vim
 ---   let save_dir = &directory
 ---   let &directory = '.'
 ---   let swapfiles = swapfilelist()
@@ -9991,8 +10205,9 @@ function vim.fn.swapfilelist() end
 ---   Not a swap file: does not contain correct block ID
 ---   Magic number mismatch: Info in first block is invalid
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFilename()->swapinfo()
+--- <
 ---
 --- @param fname integer
 --- @return any
@@ -10004,8 +10219,9 @@ function vim.fn.swapinfo(fname) end
 --- |:swapname| (unless there is no swap file).
 --- If buffer {buf} has no swap file, returns an empty string.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBufname()->swapname()
+--- <
 ---
 --- @param buf any
 --- @return any
@@ -10032,8 +10248,8 @@ function vim.fn.swapname(buf) end
 ---
 --- Returns zero on error.
 ---
---- Example (echoes the name of the syntax item under the cursor): >
----   :echo synIDattr(synID(line("."), col("."), 1), "name")
+--- Example (echoes the name of the syntax item under the cursor): >vim
+---   echo synIDattr(synID(line("."), col("."), 1), "name")
 --- <
 ---
 --- @param lnum integer
@@ -10080,11 +10296,12 @@ function vim.fn.synID(lnum, col, trans) end
 --- Returns an empty string on error.
 ---
 --- Example (echoes the color of the syntax item under the
---- cursor): >
----   :echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
+--- cursor): >vim
+---   echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
+--- <
+--- Can also be used as a |method|: >vim
+---   echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 --- <
---- Can also be used as a |method|: >
----   :echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 ---
 --- @param synID any
 --- @param what any
@@ -10099,8 +10316,9 @@ function vim.fn.synIDattr(synID, what, mode) end
 ---
 --- Returns zero on error.
 ---
---- Can also be used as a |method|: >
----   :echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
+--- Can also be used as a |method|: >vim
+---   echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
+--- <
 ---
 --- @param synID any
 --- @return any
@@ -10145,7 +10363,7 @@ function vim.fn.synconcealed(lnum, col) end
 --- returns, unless not the whole item is highlighted or it is a
 --- transparent item.
 --- This function is useful for debugging a syntax file.
---- Example that shows the syntax stack under the cursor: >
+--- Example that shows the syntax stack under the cursor: >vim
 ---   for id in synstack(line("."), col("."))
 ---      echo synIDattr(id, "name")
 ---   endfor
@@ -10165,8 +10383,8 @@ function vim.fn.synstack(lnum, col) end
 --- a |List|) and sets |v:shell_error| to the error code.
 --- {cmd} is treated as in |jobstart()|:
 --- If {cmd} is a List it runs directly (no 'shell').
---- If {cmd} is a String it runs in the 'shell', like this: >
----   :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+--- If {cmd} is a String it runs in the 'shell', like this: >vim
+---   call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
 ---
 --- <Not to be used for interactive commands.
 ---
@@ -10174,8 +10392,8 @@ function vim.fn.synstack(lnum, col) end
 --- - <CR><NL> is replaced with <NL>
 --- - NUL characters are replaced with SOH (0x01)
 ---
---- Example: >
----     :echo system(['ls', expand('%:h')])
+--- Example: >vim
+---     echo system(['ls', expand('%:h')])
 ---
 --- <If {input} is a string it is written to a pipe and passed as
 --- stdin to the command.  The string is written as-is, line
@@ -10189,8 +10407,8 @@ function vim.fn.synstack(lnum, col) end
 --- terminated by NL (and NUL where the text has NL).
 ---             *E5677*
 --- Note: system() cannot write to or read from backgrounded ("&")
---- shell commands, e.g.: >
----     :echo system("cat - &", "foo")
+--- shell commands, e.g.: >vim
+---     echo system("cat - &", "foo")
 --- <which is equivalent to: >
 ---     $ echo foo | bash -c 'cat - &'
 --- <The pipes are disconnected (unless overridden by shell
@@ -10200,15 +10418,16 @@ function vim.fn.synstack(lnum, col) end
 --- Note: Use |shellescape()| or |::S| with |expand()| or
 --- |fnamemodify()| to escape special characters in a command
 --- argument. 'shellquote' and 'shellxquote' must be properly
---- configured. Example: >
----     :echo system('ls '..shellescape(expand('%:h')))
----     :echo system('ls '..expand('%:h:S'))
+--- configured. Example: >vim
+---     echo system('ls '..shellescape(expand('%:h')))
+---     echo system('ls '..expand('%:h:S'))
 ---
 --- <Unlike ":!cmd" there is no automatic check for changed files.
 --- Use |:checktime| to force a check.
 ---
---- Can also be used as a |method|: >
----   :echo GetCmd()->system()
+--- Can also be used as a |method|: >vim
+---   echo GetCmd()->system()
+--- <
 ---
 --- @param cmd any
 --- @param input? any
@@ -10223,13 +10442,14 @@ function vim.fn.system(cmd, input) end
 --- Note that on MS-Windows you may get trailing CR characters.
 ---
 --- To see the difference between "echo hello" and "echo -n hello"
---- use |system()| and |split()|: >
+--- use |system()| and |split()|: >vim
 ---   echo split(system('echo hello'), '\n', 1)
 --- <
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
----   :echo GetCmd()->systemlist()
+--- Can also be used as a |method|: >vim
+---   echo GetCmd()->systemlist()
+--- <
 ---
 --- @param cmd any
 --- @param input? any
@@ -10242,15 +10462,16 @@ function vim.fn.systemlist(cmd, input, keepempty) end
 --- {arg} specifies the number of the tab page to be used. When
 --- omitted the current tab page is used.
 --- When {arg} is invalid the number zero is returned.
---- To get a list of all buffers in all tabs use this: >
+--- To get a list of all buffers in all tabs use this: >vim
 ---   let buflist = []
 ---   for i in range(tabpagenr('$'))
 ---      call extend(buflist, tabpagebuflist(i + 1))
 ---   endfor
 --- <Note that a buffer may appear in more than one window.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTabpage()->tabpagebuflist()
+--- <
 ---
 --- @param arg? any
 --- @return any
@@ -10280,12 +10501,12 @@ function vim.fn.tabpagenr(arg) end
 ---   the window which will be used when going to this tab page.
 --- - When "$" the number of windows is returned.
 --- - When "#" the previous window nr is returned.
---- Useful examples: >
+--- Useful examples: >vim
 ---     tabpagewinnr(1)      " current window of tab page 1
 ---     tabpagewinnr(4, '$')    " number of windows in tab page 4
 --- <When {tabarg} is invalid zero is returned.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTabpage()->tabpagewinnr()
 --- <
 ---
@@ -10342,7 +10563,7 @@ function vim.fn.tagfiles() end
 --- located by Vim. Refer to |tags-file-format| for the format of
 --- the tags file generated by the different ctags tools.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTagpattern()->taglist()
 ---
 --- @param expr any
@@ -10354,14 +10575,15 @@ function vim.fn.taglist(expr, filename) end
 --- in the range [-inf, inf].
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo tan(10)
---- <  0.648361 >
----   :echo tan(-4.01)
+--- Examples: >vim
+---   echo tan(10)
+--- <  0.648361 >vim
+---   echo tan(-4.01)
 --- <  -1.181502
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->tan()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -10371,13 +10593,13 @@ function vim.fn.tan(expr) end
 --- range [-1, 1].
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
----   :echo tanh(0.5)
---- <  0.462117 >
----   :echo tanh(-1)
+--- Examples: >vim
+---   echo tanh(0.5)
+--- <  0.462117 >vim
+---   echo tanh(-1)
 --- <  -0.761594
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->tanh()
 --- <
 ---
@@ -10387,9 +10609,10 @@ function vim.fn.tanh(expr) end
 
 --- Generates a (non-existent) filename located in the Nvim root
 --- |tempdir|. Scripts can use the filename as a temporary file.
---- Example: >
----   :let tmpfile = tempname()
----   :exe "redir > " .. tmpfile
+--- Example: >vim
+---   let tmpfile = tempname()
+---   exe "redir > " .. tmpfile
+--- <
 ---
 --- @return string
 function vim.fn.tempname() end
@@ -10427,7 +10650,7 @@ function vim.fn.termopen(cmd, opts) end
 ---         -1 means forever
 ---     "callback"      the callback
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTimer()->timer_info()
 --- <
 ---
@@ -10447,7 +10670,7 @@ function vim.fn.timer_info(id) end
 --- String, then the timer is paused, otherwise it is unpaused.
 --- See |non-zero-arg|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTimer()->timer_pause(1)
 --- <
 ---
@@ -10477,7 +10700,7 @@ function vim.fn.timer_pause(timer, paused) end
 ---
 --- Returns -1 on error.
 ---
---- Example: >
+--- Example: >vim
 ---   func MyHandler(timer)
 ---     echo 'Handler called'
 ---   endfunc
@@ -10485,7 +10708,7 @@ function vim.fn.timer_pause(timer, paused) end
 ---     \ {'repeat': 3})
 --- <This invokes MyHandler() three times at 500 msec intervals.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetMsec()->timer_start(callback)
 ---
 --- <Not available in the |sandbox|.
@@ -10500,7 +10723,7 @@ function vim.fn.timer_start(time, callback, options) end
 --- {timer} is an ID returned by timer_start(), thus it must be a
 --- Number.  If {timer} does not exist there is no error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTimer()->timer_stop()
 --- <
 ---
@@ -10519,8 +10742,9 @@ function vim.fn.timer_stopall() end
 --- characters turned into lowercase (just like applying |gu| to
 --- the string).  Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->tolower()
+--- <
 ---
 --- @param expr any
 --- @return string
@@ -10530,8 +10754,9 @@ function vim.fn.tolower(expr) end
 --- characters turned into uppercase (just like applying |gU| to
 --- the string).  Returns an empty string on error.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->toupper()
+--- <
 ---
 --- @param expr any
 --- @return string
@@ -10546,14 +10771,15 @@ function vim.fn.toupper(expr) end
 ---
 --- Returns an empty string on error.
 ---
---- Examples: >
+--- Examples: >vim
 ---   echo tr("hello there", "ht", "HT")
---- <returns "Hello THere" >
+--- <returns "Hello THere" >vim
 ---   echo tr("<blob>", "<>", "{}")
 --- <returns "{blob}"
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->tr(from, to)
+--- <
 ---
 --- @param src any
 --- @param fromstr any
@@ -10575,18 +10801,19 @@ function vim.fn.tr(src, fromstr, tostr) end
 --- This function deals with multibyte characters properly.
 --- Returns an empty string on error.
 ---
---- Examples: >
+--- Examples: >vim
 ---   echo trim("   some text ")
---- <returns "some text" >
+--- <returns "some text" >vim
 ---   echo trim("  \r\t\t\r RESERVE \t\n\x0B\xA0") .. "_TAIL"
---- <returns "RESERVE_TAIL" >
+--- <returns "RESERVE_TAIL" >vim
 ---   echo trim("rm<Xrm<>X>rrm", "rm<>")
---- <returns "Xrm<>X" (characters in the middle are not removed) >
+--- <returns "Xrm<>X" (characters in the middle are not removed) >vim
 ---   echo trim("  vim  ", " ", 2)
 --- <returns "  vim"
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetText()->trim()
+--- <
 ---
 --- @param text any
 --- @param mask? any
@@ -10598,16 +10825,17 @@ function vim.fn.trim(text, mask, dir) end
 --- equal to {expr} as a |Float| (truncate towards zero).
 --- {expr} must evaluate to a |Float| or a |Number|.
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
---- Examples: >
+--- Examples: >vim
 ---   echo trunc(1.456)
---- <  1.0  >
+--- <  1.0  >vim
 ---   echo trunc(-5.456)
---- <  -5.0  >
+--- <  -5.0  >vim
 ---   echo trunc(4.0)
 --- <  4.0
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   Compute()->trunc()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -10625,22 +10853,23 @@ function vim.fn.trunc(expr) end
 ---   Boolean:    6 (|v:true| and |v:false|)
 ---   Null:       7 (|v:null|)
 ---   Blob:      10 (|v:t_blob|)
---- For backward compatibility, this method can be used: >
----   :if type(myvar) == type(0)
----   :if type(myvar) == type("")
----   :if type(myvar) == type(function("tr"))
----   :if type(myvar) == type([])
----   :if type(myvar) == type({})
----   :if type(myvar) == type(0.0)
----   :if type(myvar) == type(v:true)
+--- For backward compatibility, this method can be used: >vim
+---   if type(myvar) == type(0) | endif
+---   if type(myvar) == type("") | endif
+---   if type(myvar) == type(function("tr")) | endif
+---   if type(myvar) == type([]) | endif
+---   if type(myvar) == type({}) | endif
+---   if type(myvar) == type(0.0) | endif
+---   if type(myvar) == type(v:true) | endif
 --- <In place of checking for |v:null| type it is better to check
---- for |v:null| directly as it is the only value of this type: >
----   :if myvar is v:null
---- <               To check if the v:t_ variables exist use this: >
----                         :if exists('v:t_number')
+--- for |v:null| directly as it is the only value of this type: >vim
+---   if myvar is v:null | endif
+--- <To check if the v:t_ variables exist use this: >vim
+---   if exists('v:t_number') | endif
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   mylist->type()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -10656,8 +10885,9 @@ function vim.fn.type(expr) end
 --- buffer without a file name will not write an undo file.
 --- Useful in combination with |:wundo| and |:rundo|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetFilename()->undofile()
+--- <
 ---
 --- @param name string
 --- @return string
@@ -10710,14 +10940,14 @@ function vim.fn.undotree() end
 
 --- Remove second and succeeding copies of repeated adjacent
 --- {list} items in-place.  Returns {list}.  If you want a list
---- to remain unmodified make a copy first: >
----   :let newlist = uniq(copy(mylist))
+--- to remain unmodified make a copy first: >vim
+---   let newlist = uniq(copy(mylist))
 --- <The default compare function uses the string representation of
 --- each item.  For the use of {func} and {dict} see |sort()|.
 ---
 --- Returns zero if {list} is not a |List|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mylist->uniq()
 --- <
 ---
@@ -10744,16 +10974,16 @@ function vim.fn.uniq(list, func, dict) end
 --- from the UTF-16 index and |charidx()| for getting the
 --- character index from the UTF-16 index.
 --- Refer to |string-offset-encoding| for more information.
---- Examples: >
----   echo utf16idx('a😊😊', 3)  returns 2
----   echo utf16idx('a😊😊', 7)  returns 4
----   echo utf16idx('a😊😊', 1, 0, 1)  returns 2
----   echo utf16idx('a😊😊', 2, 0, 1)  returns 4
----   echo utf16idx('aą́c', 6)    returns 2
----   echo utf16idx('aą́c', 6, 1)  returns 4
----   echo utf16idx('a😊😊', 9)  returns -1
---- <
---- Can also be used as a |method|: >
+--- Examples: >vim
+---   echo utf16idx('a😊😊', 3)  " returns 2
+---   echo utf16idx('a😊😊', 7)  " returns 4
+---   echo utf16idx('a😊😊', 1, 0, 1)  " returns 2
+---   echo utf16idx('a😊😊', 2, 0, 1)  " returns 4
+---   echo utf16idx('aą́c', 6)    " returns 2
+---   echo utf16idx('aą́c', 6, 1)  " returns 4
+---   echo utf16idx('a😊😊', 9)  " returns -1
+--- <
+--- Can also be used as a |method|: >vim
 ---   GetName()->utf16idx(idx)
 --- <
 ---
@@ -10768,8 +10998,9 @@ function vim.fn.utf16idx(string, idx, countcc, charidx) end
 --- in arbitrary order.  Also see |items()| and |keys()|.
 --- Returns zero if {dict} is not a |Dict|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   mydict->values()
+--- <
 ---
 --- @param dict any
 --- @return any
@@ -10811,23 +11042,24 @@ function vim.fn.values(dict) end
 --- character.
 ---
 --- Note that only marks in the current file can be used.
---- Examples: >
+--- Examples: >vim
 ---   " With text "foo^Lbar" and cursor on the "^L":
 ---
----   virtcol(".")  " returns 5
----   virtcol(".", 1)  " returns [4, 5]
----   virtcol("$")  " returns 9
+---   echo virtcol(".")  " returns 5
+---   echo virtcol(".", 1)  " returns [4, 5]
+---   echo virtcol("$")  " returns 9
 ---
 ---   " With text "    there", with 't at 'h':
 ---
----   virtcol("'t")  " returns 6
---- <The first column is 1.  0 is returned for an error.
---- A more advanced example that echoes the maximum length of
---- all lines: >
+---   echo virtcol("'t")  " returns 6
+--- <Techo he first column is 1.  0 is returned for an error.
+--- A echo more advanced example that echoes the maximum length of
+--- all lines: >vim
 ---     echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetPos()->virtcol()
+--- <
 ---
 --- @param expr any
 --- @param list? any
@@ -10850,8 +11082,9 @@ function vim.fn.virtcol(expr, list) end
 ---
 --- See also |screenpos()|, |virtcol()| and |col()|.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->virtcol2col(lnum, col)
+--- <
 ---
 --- @param winid integer
 --- @param lnum integer
@@ -10865,8 +11098,8 @@ function vim.fn.virtcol2col(winid, lnum, col) end
 --- "V", or "<CTRL-V>" (a single CTRL-V character) for
 --- character-wise, line-wise, or block-wise Visual mode
 --- respectively.
---- Example: >
----   :exe "normal " .. visualmode()
+--- Example: >vim
+---   exe "normal " .. visualmode()
 --- <This enters the same Visual mode as before.  It is also useful
 --- in scripts if you wish to act differently depending on the
 --- Visual mode that was used.
@@ -10906,8 +11139,8 @@ function vim.fn.wait(timeout, condition, interval) end
 --- This can be used in mappings to handle the 'wildcharm' option
 --- gracefully. (Makes only sense with |mapmode-c| mappings).
 ---
---- For example to make <c-j> work like <down> in wildmode, use: >
----     :cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
+--- For example to make <c-j> work like <down> in wildmode, use: >vim
+---     cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
 --- <
 --- (Note, this needs the 'wildcharm' option set appropriately).
 ---
@@ -10919,7 +11152,7 @@ function vim.fn.wildmenumode() end
 --- without triggering autocommands or changing directory.  When
 --- executing {command} autocommands will be triggered, this may
 --- have unexpected side effects.  Use `:noautocmd` if needed.
---- Example: >
+--- Example: >vim
 ---   call win_execute(winid, 'syntax enable')
 --- <Doing the same with `setwinvar()` would not trigger
 --- autocommands and not actually show syntax highlighting.
@@ -10928,8 +11161,9 @@ function vim.fn.wildmenumode() end
 --- an empty string is returned.
 ---
 --- Can also be used as a |method|, the base is passed as the
---- second argument: >
+--- second argument: >vim
 ---   GetCommand()->win_execute(winid)
+--- <
 ---
 --- @param id any
 --- @param command any
@@ -10940,8 +11174,9 @@ function vim.fn.win_execute(id, command, silent) end
 --- Returns a |List| with |window-ID|s for windows that contain
 --- buffer {bufnr}.  When there is none the list is empty.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetBufnr()->win_findbuf()
+--- <
 ---
 --- @param bufnr any
 --- @return integer[]
@@ -10955,8 +11190,9 @@ function vim.fn.win_findbuf(bufnr) end
 --- number {tab}.  The first tab has number one.
 --- Return zero if the window cannot be found.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinnr()->win_getid()
+--- <
 ---
 --- @param win? any
 --- @param tab? any
@@ -10980,7 +11216,7 @@ function vim.fn.win_getid(win, tab) end
 ---
 --- Also see the 'buftype' option.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->win_gettype()
 --- <
 ---
@@ -10992,8 +11228,9 @@ function vim.fn.win_gettype(nr) end
 --- tabpage.
 --- Return TRUE if successful, FALSE if the window cannot be found.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->win_gotoid()
+--- <
 ---
 --- @param expr any
 --- @return 0|1
@@ -11003,8 +11240,9 @@ function vim.fn.win_gotoid(expr) end
 --- with ID {expr}: [tabnr, winnr].
 --- Return [0, 0] if the window cannot be found.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->win_id2tabwin()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -11013,8 +11251,9 @@ function vim.fn.win_id2tabwin(expr) end
 --- Return the window number of window with ID {expr}.
 --- Return 0 if the window cannot be found in the current tabpage.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->win_id2win()
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -11034,8 +11273,9 @@ function vim.fn.win_id2win(expr) end
 --- window, since it has no separator on the right.
 --- Only works for the current tab page. *E1308*
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinnr()->win_move_separator(offset)
+--- <
 ---
 --- @param nr integer
 --- @param offset any
@@ -11053,8 +11293,9 @@ function vim.fn.win_move_separator(nr, offset) end
 --- be found and FALSE otherwise.
 --- Only works for the current tab page.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinnr()->win_move_statusline(offset)
+--- <
 ---
 --- @param nr integer
 --- @param offset any
@@ -11069,7 +11310,7 @@ function vim.fn.win_move_statusline(nr, offset) end
 --- Returns [0, 0] if the window cannot be found in the current
 --- tabpage.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->win_screenpos()
 --- <
 ---
@@ -11096,7 +11337,7 @@ function vim.fn.win_screenpos(nr) end
 ---     present, the values of 'splitbelow' and
 ---     'splitright' are used.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->win_splitmove(target)
 --- <
 ---
@@ -11112,10 +11353,10 @@ function vim.fn.win_splitmove(nr, target, options) end
 --- When {nr} is zero, the number of the buffer in the current
 --- window is returned.
 --- When window {nr} doesn't exist, -1 is returned.
---- Example: >
----   :echo "The file in the current window is " .. bufname(winbufnr(0))
+--- Example: >vim
+---   echo "The file in the current window is " .. bufname(winbufnr(0))
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   FindWindow()->winbufnr()->bufname()
 --- <
 ---
@@ -11144,10 +11385,10 @@ function vim.fn.windowsversion() end
 --- returned.  When window {nr} doesn't exist, -1 is returned.
 --- An existing window always has a height of zero or more.
 --- This excludes any window toolbar line.
---- Examples: >
----   :echo "The current window has " .. winheight(0) .. " lines."
+--- Examples: >vim
+---   echo "The current window has " .. winheight(0) .. " lines."
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetWinid()->winheight()
 --- <
 ---
@@ -11162,29 +11403,35 @@ function vim.fn.winheight(nr) end
 --- with number {tabnr}. If the tabpage {tabnr} is not found,
 --- returns an empty list.
 ---
---- For a leaf window, it returns:
+--- For a leaf window, it returns: >
 ---   ["leaf", {winid}]
+--- <
 --- For horizontally split windows, which form a column, it
 --- returns: >
 ---   ["col", [{nested list of windows}]]
 --- <For vertically split windows, which form a row, it returns: >
 ---   ["row", [{nested list of windows}]]
 --- <
---- Example: >
+--- Example: >vim
 ---   " Only one window in the tab page
----   :echo winlayout()
+---   echo winlayout()
+--- < >
 ---   ['leaf', 1000]
+--- < >vim
 ---   " Two horizontally split windows
----   :echo winlayout()
+---   echo winlayout()
+--- < >
 ---   ['col', [['leaf', 1000], ['leaf', 1001]]]
+--- < >vim
 ---   " The second tab page, with three horizontally split
 ---   " windows, with two vertically split windows in the
 ---   " middle window
----   :echo winlayout(2)
+---   echo winlayout(2)
+--- < >
 ---   ['col', [['leaf', 1002], ['row', [['leaf', 1003],
 ---           ['leaf', 1001]]], ['leaf', 1000]]]
 --- <
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetTabnr()->winlayout()
 --- <
 ---
@@ -11224,12 +11471,12 @@ function vim.fn.winline() end
 --- |:wincmd|.
 --- When {arg} is invalid an error is given and zero is returned.
 --- Also see |tabpagewinnr()| and |win_getid()|.
---- Examples: >
+--- Examples: >vim
 ---   let window_count = winnr('$')
 ---   let prev_window = winnr('#')
 ---   let wnum = winnr('3k')
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetWinval()->winnr()
 --- <
 ---
@@ -11241,10 +11488,10 @@ function vim.fn.winnr(arg) end
 --- the current window sizes.  Only works properly when no windows
 --- are opened or closed and the current window and tab page is
 --- unchanged.
---- Example: >
----   :let cmd = winrestcmd()
----   :call MessWithWindowSizes()
----   :exe cmd
+--- Example: >vim
+---   let cmd = winrestcmd()
+---   call MessWithWindowSizes()
+---   exe cmd
 --- <
 ---
 --- @return any
@@ -11254,8 +11501,8 @@ function vim.fn.winrestcmd() end
 --- the view of the current window.
 --- Note: The {dict} does not have to contain all values, that are
 --- returned by |winsaveview()|. If values are missing, those
---- settings won't be restored. So you can use: >
----     :call winrestview({'curswant': 4})
+--- settings won't be restored. So you can use: >vim
+---     call winrestview({'curswant': 4})
 --- <
 --- This will only set the curswant value (the column the cursor
 --- wants to move on vertical movements) of the cursor to column 5
@@ -11265,7 +11512,7 @@ function vim.fn.winrestcmd() end
 --- If you have changed the values the result is unpredictable.
 --- If the window size changed the result won't be the same.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetView()->winrestview()
 --- <
 ---
@@ -11307,16 +11554,17 @@ function vim.fn.winsaveview() end
 --- When {nr} is zero, the width of the current window is
 --- returned.  When window {nr} doesn't exist, -1 is returned.
 --- An existing window always has a width of zero or more.
---- Examples: >
----   :echo "The current window has " .. winwidth(0) .. " columns."
----   :if winwidth(0) <= 50
----   :  50 wincmd |
----   :endif
+--- Examples: >vim
+---   echo "The current window has " .. winwidth(0) .. " columns."
+---   if winwidth(0) <= 50
+---     50 wincmd |
+---   endif
 --- <For getting the terminal or screen size, see the 'columns'
 --- option.
 ---
---- Can also be used as a |method|: >
+--- Can also be used as a |method|: >vim
 ---   GetWinid()->winwidth()
+--- <
 ---
 --- @param nr integer
 --- @return any
@@ -11361,13 +11609,13 @@ function vim.fn.wordcount() end
 ---      last list item.  An empty item at the end does cause the
 ---      last line in the file to end in a NL.
 ---
---- 'a'  Append mode is used, lines are appended to the file: >
----   :call writefile(["foo"], "event.log", "a")
----   :call writefile(["bar"], "event.log", "a")
+--- 'a'  Append mode is used, lines are appended to the file: >vim
+---   call writefile(["foo"], "event.log", "a")
+---   call writefile(["bar"], "event.log", "a")
 --- <
 --- 'D'  Delete the file when the current function ends.  This
----      works like: >
----   :defer delete({fname})
+---      works like: >vim
+---   defer delete({fname})
 --- <     Fails when not in a function.  Also see |:defer|.
 ---
 --- 's'  fsync() is called after writing the file.  This flushes
@@ -11386,12 +11634,13 @@ function vim.fn.wordcount() end
 --- fails.
 ---
 --- Also see |readfile()|.
---- To copy a file byte for byte: >
----   :let fl = readfile("foo", "b")
----   :call writefile(fl, "foocopy", "b")
+--- To copy a file byte for byte: >vim
+---   let fl = readfile("foo", "b")
+---   call writefile(fl, "foocopy", "b")
 ---
---- <Can also be used as a |method|: >
+--- <Can also be used as a |method|: >vim
 ---   GetText()->writefile("thefile")
+--- <
 ---
 --- @param object any
 --- @param fname integer
@@ -11402,11 +11651,11 @@ function vim.fn.writefile(object, fname, flags) end
 --- Bitwise XOR on the two arguments.  The arguments are converted
 --- to a number.  A List, Dict or Float argument causes an error.
 --- Also see `and()` and `or()`.
---- Example: >
----   :let bits = xor(bits, 0x80)
+--- Example: >vim
+---   let bits = xor(bits, 0x80)
 --- <
---- Can also be used as a |method|: >
----   :let bits = bits->xor(0x80)
+--- Can also be used as a |method|: >vim
+---   let bits = bits->xor(0x80)
 --- <
 ---
 --- @param expr any
-- 
cgit 


From ccb5a76e5a2cc8627da6e3453697d2628ed0c6ac Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 1 Aug 2023 18:07:02 +0800
Subject: fix(defaults): don't use nvim_feedkeys in default mappings (#24520)

Problem:    Using nvim_feedkeys in default mappings makes it hard to use
            them as a part of another mapping.
Solution:   Use an expression mapping and stop Visual mode later.

Fix #24518.
---
 runtime/lua/vim/_editor.lua | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 87f6d6581c..6182270708 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -1016,8 +1016,13 @@ function vim._init_default_mappings()
 
   local function _visual_search(cmd)
     assert(cmd == '/' or cmd == '?')
-    vim.api.nvim_feedkeys('\27', 'nx', true) -- Escape visual mode.
-    local region = vim.region(0, "'<", "'>", vim.fn.visualmode(), vim.o.selection == 'inclusive')
+    local region = vim.region(
+      0,
+      '.',
+      'v',
+      vim.api.nvim_get_mode().mode:sub(1, 1),
+      vim.o.selection == 'inclusive'
+    )
     local chunks = region_chunks(region)
     local esc_chunks = vim
       .iter(chunks)
@@ -1027,7 +1032,7 @@ function vim._init_default_mappings()
       :totable()
     local esc_pat = table.concat(esc_chunks, [[\n]])
     local search_cmd = ([[%s\V%s%s]]):format(cmd, esc_pat, '\n')
-    vim.api.nvim_feedkeys(search_cmd, 'nx', true)
+    return '\27' .. search_cmd
   end
 
   local function map(mode, lhs, rhs)
@@ -1040,11 +1045,11 @@ function vim._init_default_mappings()
   map('i', '<C-U>', '<C-G>u<C-U>')
   map('i', '<C-W>', '<C-G>u<C-W>')
   vim.keymap.set('x', '*', function()
-    _visual_search('/')
-  end, { desc = ':help v_star-default', silent = true })
+    return _visual_search('/')
+  end, { desc = ':help v_star-default', expr = true, silent = true })
   vim.keymap.set('x', '#', function()
-    _visual_search('?')
-  end, { desc = ':help v_#-default', silent = true })
+    return _visual_search('?')
+  end, { desc = ':help v_#-default', expr = true, silent = true })
   -- Use : instead of <Cmd> so that ranges are supported. #19365
   map('n', '&', ':&&<CR>')
 
-- 
cgit 


From 20bfdbe83253cf5ec0a42bd75bd4ed7df945ab37 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 1 Aug 2023 11:12:00 +0100
Subject: docs(builtin): right align tags (#24522)

---
 runtime/doc/builtin.txt | 868 ++++++++++++++++++++++++------------------------
 1 file changed, 434 insertions(+), 434 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 3033435ee6..6a89eb0524 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -12,7 +12,7 @@ For functions grouped by what they are used for see |function-list|.
 ==============================================================================
 1. Details					*builtin-function-details*
 
-abs({expr})							*abs()*
+abs({expr})                                                              *abs()*
 		Return the absolute value of {expr}.  When {expr} evaluates to
 		a |Float| abs() returns a |Float|.  When {expr} can be
 		converted to a |Number| abs() returns a |Number|.  Otherwise
@@ -29,7 +29,7 @@ abs({expr})							*abs()*
 			Compute()->abs()
 <
 
-acos({expr})							*acos()*
+acos({expr})                                                            *acos()*
 		Return the arc cosine of {expr} measured in radians, as a
 		|Float| in the range of [0, pi].
 		{expr} must evaluate to a |Float| or a |Number| in the range
@@ -46,7 +46,7 @@ acos({expr})							*acos()*
 			Compute()->acos()
 <
 
-add({object}, {expr})						*add()*
+add({object}, {expr})                                                    *add()*
 		Append the item {expr} to |List| or |Blob| {object}.  Returns
 		the resulting |List| or |Blob|.  Examples: >vim
 			let alist = add([1, 2, 3], item)
@@ -61,7 +61,7 @@ add({object}, {expr})						*add()*
 			mylist->add(val1)->add(val2)
 <
 
-and({expr}, {expr})						*and()*
+and({expr}, {expr})                                                      *and()*
 		Bitwise AND on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `or()` and `xor()`.
@@ -71,14 +71,14 @@ and({expr}, {expr})						*and()*
 			let flag = bits->and(0x80)
 <
 
-api_info()						*api_info()*
+api_info()                                                          *api_info()*
 		Returns Dictionary of |api-metadata|.
 
 		View it in a nice human-readable format: >vim
 		       lua vim.print(vim.fn.api_info())
 <
 
-append({lnum}, {text})					*append()*
+append({lnum}, {text})                                                *append()*
 		When {text} is a |List|: Append each item of the |List| as a
 		text line below line {lnum} in the current buffer.
 		Otherwise append {text} as one text line below line {lnum} in
@@ -95,7 +95,7 @@ append({lnum}, {text})					*append()*
 			mylist->append(lnum)
 <
 
-appendbufline({buf}, {lnum}, {text})		*appendbufline()*
+appendbufline({buf}, {lnum}, {text})                           *appendbufline()*
 		Like |append()| but append the text in buffer {expr}.
 
 		This function works only for loaded buffers. First call
@@ -118,7 +118,7 @@ appendbufline({buf}, {lnum}, {text})		*appendbufline()*
 			mylist->appendbufline(buf, lnum)
 <
 
-argc([{winid}])						*argc()*
+argc([{winid}])                                                         *argc()*
 		The result is the number of files in the argument list.  See
 		|arglist|.
 		If {winid} is not supplied, the argument list of the current
@@ -128,11 +128,11 @@ argc([{winid}])						*argc()*
 		list is used: either the window number or the window ID.
 		Returns -1 if the {winid} argument is invalid.
 
-argidx()							*argidx()*
+argidx()                                                              *argidx()*
 		The result is the current index in the argument list.  0 is
 		the first file.  argc() - 1 is the last one.  See |arglist|.
 
-arglistid([{winnr} [, {tabnr}]])			*arglistid()*
+arglistid([{winnr} [, {tabnr}]])                                   *arglistid()*
 		Return the argument list ID.  This is a number which
 		identifies the argument list being used.  Zero is used for the
 		global argument list.  See |arglist|.
@@ -144,7 +144,7 @@ arglistid([{winnr} [, {tabnr}]])			*arglistid()*
 		page.
 		{winnr} can be the window number or the |window-ID|.
 
-argv([{nr} [, {winid}]])					*argv()*
+argv([{nr} [, {winid}]])                                                *argv()*
 		The result is the {nr}th file in the argument list.  See
 		|arglist|.  "argv(0)" is the first one.  Example: >vim
 			let i = 0
@@ -163,7 +163,7 @@ argv([{nr} [, {winid}]])					*argv()*
 		the argument list.  Returns an empty List if the {winid}
 		argument is invalid.
 
-asin({expr})							*asin()*
+asin({expr})                                                            *asin()*
 		Return the arc sine of {expr} measured in radians, as a |Float|
 		in the range of [-pi/2, pi/2].
 		{expr} must evaluate to a |Float| or a |Number| in the range
@@ -180,7 +180,7 @@ asin({expr})							*asin()*
 			Compute()->asin()
 <
 
-assert_beeps({cmd})					*assert_beeps()*
+assert_beeps({cmd})                                             *assert_beeps()*
 		Run {cmd} and add an error message to |v:errors| if it does
 		NOT produce a beep or visual bell.
 		Also see |assert_fails()|, |assert_nobeep()| and
@@ -190,7 +190,7 @@ assert_beeps({cmd})					*assert_beeps()*
 			GetCmd()->assert_beeps()
 <
 
-assert_equal({expected}, {actual} [, {msg}])		*assert_equal()*
+assert_equal({expected}, {actual} [, {msg}])                    *assert_equal()*
 		When {expected} and {actual} are not equal an error message is
 		added to |v:errors| and 1 is returned.  Otherwise zero is
 		returned. |assert-return|
@@ -210,7 +210,7 @@ assert_equal({expected}, {actual} [, {msg}])		*assert_equal()*
 			mylist->assert_equal([1, 2, 3])
 <
 
-assert_equalfile({fname-one}, {fname-two})	*assert_equalfile()*
+assert_equalfile({fname-one}, {fname-two})                  *assert_equalfile()*
 		When the files {fname-one} and {fname-two} do not contain
 		exactly the same text an error message is added to |v:errors|.
 		Also see |assert-return|.
@@ -221,7 +221,7 @@ assert_equalfile({fname-one}, {fname-two})	*assert_equalfile()*
 			GetLog()->assert_equalfile('expected.log')
 <
 
-assert_exception({error} [, {msg}])		*assert_exception()*
+assert_exception({error} [, {msg}])                         *assert_exception()*
 		When v:exception does not contain the string {error} an error
 		message is added to |v:errors|.  Also see |assert-return|.
 		This can be used to assert that a command throws an exception.
@@ -235,7 +235,7 @@ assert_exception({error} [, {msg}])		*assert_exception()*
 			endtry
 <
 
-						*assert_fails()*
+                                                                *assert_fails()*
 assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 		Run {cmd} and add an error message to |v:errors| if it does
 		NOT produce an error or when {error} is not found in the
@@ -274,7 +274,7 @@ assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 			GetCmd()->assert_fails('E99:')
 <
 
-assert_false({actual} [, {msg}])			*assert_false()*
+assert_false({actual} [, {msg}])                                *assert_false()*
 		When {actual} is not false an error message is added to
 		|v:errors|, like with |assert_equal()|.
 		The error is in the form "Expected False but got {actual}".
@@ -288,7 +288,7 @@ assert_false({actual} [, {msg}])			*assert_false()*
 			GetResult()->assert_false()
 <
 
-assert_inrange({lower}, {upper}, {actual} [, {msg}])	*assert_inrange()*
+assert_inrange({lower}, {upper}, {actual} [, {msg}])          *assert_inrange()*
 		This asserts number and |Float| values.  When {actual}  is lower
 		than {lower} or higher than {upper} an error message is added
 		to |v:errors|.  Also see |assert-return|.
@@ -296,7 +296,7 @@ assert_inrange({lower}, {upper}, {actual} [, {msg}])	*assert_inrange()*
 		but got {actual}".  When {msg} is present it is prefixed to
 		that.
 
-assert_match({pattern}, {actual} [, {msg}])		*assert_match()*
+assert_match({pattern}, {actual} [, {msg}])                     *assert_match()*
 		When {pattern} does not match {actual} an error message is
 		added to |v:errors|.  Also see |assert-return|.
 		The error is in the form "Pattern {pattern} does not match
@@ -319,7 +319,7 @@ assert_match({pattern}, {actual} [, {msg}])		*assert_match()*
 			getFile()->assert_match('foo.*')
 <
 
-assert_nobeep({cmd})				*assert_nobeep()*
+assert_nobeep({cmd})                                           *assert_nobeep()*
 		Run {cmd} and add an error message to |v:errors| if it
 		produces a beep or visual bell.
 		Also see |assert_beeps()|.
@@ -328,7 +328,7 @@ assert_nobeep({cmd})				*assert_nobeep()*
 			GetCmd()->assert_nobeep()
 <
 
-assert_notequal({expected}, {actual} [, {msg}])	*assert_notequal()*
+assert_notequal({expected}, {actual} [, {msg}])              *assert_notequal()*
 		The opposite of `assert_equal()`: add an error message to
 		|v:errors| when {expected} and {actual} are equal.
 		Also see |assert-return|.
@@ -337,7 +337,7 @@ assert_notequal({expected}, {actual} [, {msg}])	*assert_notequal()*
 			mylist->assert_notequal([1, 2, 3])
 <
 
-assert_notmatch({pattern}, {actual} [, {msg}])	*assert_notmatch()*
+assert_notmatch({pattern}, {actual} [, {msg}])               *assert_notmatch()*
 		The opposite of `assert_match()`: add an error message to
 		|v:errors| when {pattern} matches {actual}.
 		Also see |assert-return|.
@@ -346,7 +346,7 @@ assert_notmatch({pattern}, {actual} [, {msg}])	*assert_notmatch()*
 			getFile()->assert_notmatch('bar.*')
 <
 
-assert_report({msg})				*assert_report()*
+assert_report({msg})                                           *assert_report()*
 		Report a test failure directly, using String {msg}.
 		Always returns one.
 
@@ -354,7 +354,7 @@ assert_report({msg})				*assert_report()*
 			GetMessage()->assert_report()
 <
 
-assert_true({actual} [, {msg}])			*assert_true()*
+assert_true({actual} [, {msg}])                                  *assert_true()*
 		When {actual} is not true an error message is added to
 		|v:errors|, like with |assert_equal()|.
 		Also see |assert-return|.
@@ -366,7 +366,7 @@ assert_true({actual} [, {msg}])			*assert_true()*
 			GetResult()->assert_true()
 <
 
-atan({expr})							*atan()*
+atan({expr})                                                            *atan()*
 		Return the principal value of the arc tangent of {expr}, in
 		the range [-pi/2, +pi/2] radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -381,7 +381,7 @@ atan({expr})							*atan()*
 			Compute()->atan()
 <
 
-atan2({expr1}, {expr2})					*atan2()*
+atan2({expr1}, {expr2})                                                *atan2()*
 		Return the arc tangent of {expr1} / {expr2}, measured in
 		radians, as a |Float| in the range [-pi, pi].
 		{expr1} and {expr2} must evaluate to a |Float| or a |Number|.
@@ -397,7 +397,7 @@ atan2({expr1}, {expr2})					*atan2()*
 			Compute()->atan2(1)
 <
 
-blob2list({blob})					*blob2list()*
+blob2list({blob})                                                  *blob2list()*
 		Return a List containing the number value of each byte in Blob
 		{blob}.  Examples: >vim
 			blob2list(0z0102.0304)	" returns [1, 2, 3, 4]
@@ -409,7 +409,7 @@ blob2list({blob})					*blob2list()*
 			GetBlob()->blob2list()
 <
 
-browse({save}, {title}, {initdir}, {default})		*browse()*
+browse({save}, {title}, {initdir}, {default})                         *browse()*
 		Put up a file requester.  This only works when "has("browse")"
 		returns |TRUE| (only in some GUI versions).
 		The input fields are:
@@ -420,7 +420,7 @@ browse({save}, {title}, {initdir}, {default})		*browse()*
 		An empty string is returned when the "Cancel" button is hit,
 		something went wrong, or browsing is not possible.
 
-browsedir({title}, {initdir})				*browsedir()*
+browsedir({title}, {initdir})                                      *browsedir()*
 		Put up a directory requester.  This only works when
 		"has("browse")" returns |TRUE| (only in some GUI versions).
 		On systems where a directory browser is not supported a file
@@ -432,7 +432,7 @@ browsedir({title}, {initdir})				*browsedir()*
 		When the "Cancel" button is hit, something went wrong, or
 		browsing is not possible, an empty string is returned.
 
-bufadd({name})						*bufadd()*
+bufadd({name})                                                        *bufadd()*
 		Add a buffer to the buffer list with name {name} (must be a
 		String).
 		If a buffer for file {name} already exists, return that buffer
@@ -449,7 +449,7 @@ bufadd({name})						*bufadd()*
 			let bufnr = 'somename'->bufadd()
 <
 
-bufexists({buf})					*bufexists()*
+bufexists({buf})                                                   *bufexists()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists.
 		If the {buf} argument is a number, buffer numbers are used.
@@ -475,7 +475,7 @@ bufexists({buf})					*bufexists()*
 			let exists = 'somename'->bufexists()
 <
 
-buflisted({buf})					*buflisted()*
+buflisted({buf})                                                   *buflisted()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists and is listed (has the 'buflisted' option set).
 		The {buf} argument is used like with |bufexists()|.
@@ -484,7 +484,7 @@ buflisted({buf})					*buflisted()*
 			let listed = 'somename'->buflisted()
 <
 
-bufload({buf})						*bufload()*
+bufload({buf})                                                       *bufload()*
 		Ensure the buffer {buf} is loaded.  When the buffer name
 		refers to an existing file then the file is read.  Otherwise
 		the buffer will be empty.  If the buffer was already loaded
@@ -498,7 +498,7 @@ bufload({buf})						*bufload()*
 			eval 'somename'->bufload()
 <
 
-bufloaded({buf})					*bufloaded()*
+bufloaded({buf})                                                   *bufloaded()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists and is loaded (shown in a window or hidden).
 		The {buf} argument is used like with |bufexists()|.
@@ -507,7 +507,7 @@ bufloaded({buf})					*bufloaded()*
 			let loaded = 'somename'->bufloaded()
 <
 
-bufname([{buf}])						*bufname()*
+bufname([{buf}])                                                     *bufname()*
 		The result is the name of a buffer.  Mostly as it is displayed
 		by the `:ls` command, but not using special names such as
 		"[No Name]".
@@ -541,7 +541,7 @@ bufname([{buf}])						*bufname()*
 			echo bufname("file2")	" name of buffer where "file2" matches.
 <
 
-bufnr([{buf} [, {create}]])					*bufnr()*
+bufnr([{buf} [, {create}]])                                            *bufnr()*
 		The result is the number of a buffer, as it is displayed by
 		the `:ls` command.  For the use of {buf}, see |bufname()|
 		above.
@@ -559,7 +559,7 @@ bufnr([{buf} [, {create}]])					*bufnr()*
 			echo bufref->bufnr()
 <
 
-bufwinid({buf})						*bufwinid()*
+bufwinid({buf})                                                     *bufwinid()*
 		The result is a Number, which is the |window-ID| of the first
 		window associated with buffer {buf}.  For the use of {buf},
 		see |bufname()| above.  If buffer {buf} doesn't exist or
@@ -574,7 +574,7 @@ bufwinid({buf})						*bufwinid()*
 			FindBuffer()->bufwinid()
 <
 
-bufwinnr({buf})						*bufwinnr()*
+bufwinnr({buf})                                                     *bufwinnr()*
 		Like |bufwinid()| but return the window number instead of the
 		|window-ID|.
 		If buffer {buf} doesn't exist or there is no such window, -1
@@ -589,7 +589,7 @@ bufwinnr({buf})						*bufwinnr()*
 			FindBuffer()->bufwinnr()
 <
 
-byte2line({byte})					*byte2line()*
+byte2line({byte})                                                  *byte2line()*
 		Return the line number that contains the character at byte
 		count {byte} in the current buffer.  This includes the
 		end-of-line character, depending on the 'fileformat' option
@@ -603,7 +603,7 @@ byte2line({byte})					*byte2line()*
 			GetOffset()->byte2line()
 <
 
-byteidx({expr}, {nr} [, {utf16}])				*byteidx()*
+byteidx({expr}, {nr} [, {utf16}])                                    *byteidx()*
 		Return byte index of the {nr}th character in the String
 		{expr}.  Use zero for the first character, it then returns
 		zero.
@@ -642,7 +642,7 @@ byteidx({expr}, {nr} [, {utf16}])				*byteidx()*
 			GetName()->byteidx(idx)
 <
 
-byteidxcomp({expr}, {nr} [, {utf16}])			*byteidxcomp()*
+byteidxcomp({expr}, {nr} [, {utf16}])                            *byteidxcomp()*
 		Like byteidx(), except that a composing character is counted
 		as a separate character.  Example: >vim
 			let s = 'e' .. nr2char(0x301)
@@ -657,7 +657,7 @@ byteidxcomp({expr}, {nr} [, {utf16}])			*byteidxcomp()*
 			GetName()->byteidxcomp(idx)
 <
 
-call({func}, {arglist} [, {dict}])			*call()* *E699*
+call({func}, {arglist} [, {dict}])                                 *call()* *E699*
 		Call function {func} with the items in |List| {arglist} as
 		arguments.
 		{func} can either be a |Funcref| or the name of a function.
@@ -670,7 +670,7 @@ call({func}, {arglist} [, {dict}])			*call()* *E699*
 			GetFunc()->call([arg, arg], dict)
 <
 
-ceil({expr})							*ceil()*
+ceil({expr})                                                            *ceil()*
 		Return the smallest integral value greater than or equal to
 		{expr} as a |Float| (round up).
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -688,7 +688,7 @@ ceil({expr})							*ceil()*
 			Compute()->ceil()
 <
 
-chanclose({id} [, {stream}])				*chanclose()*
+chanclose({id} [, {stream}])                                       *chanclose()*
 		Close a channel or a specific stream associated with it.
 		For a job, {stream} can be one of "stdin", "stdout",
 		"stderr" or "rpc" (closes stdin/stdout for a job started
@@ -698,7 +698,7 @@ chanclose({id} [, {stream}])				*chanclose()*
 		For a socket, there is only one stream, and {stream} should be
 		omitted.
 
-changenr()						*changenr()*
+changenr()                                                          *changenr()*
 		Return the number of the most recent change.  This is the same
 		number as what is displayed with |:undolist| and can be used
 		with the |:undo| command.
@@ -707,7 +707,7 @@ changenr()						*changenr()*
 		one less than the number of the undone change.
 		Returns 0 if the undo list is empty.
 
-chansend({id}, {data})					*chansend()*
+chansend({id}, {data})                                              *chansend()*
 		Send data to channel {id}. For a job, it writes it to the
 		stdin of the process. For the stdio channel |channel-stdio|,
 		it writes to Nvim's stdout.  Returns the number of bytes
@@ -725,7 +725,7 @@ chansend({id}, {data})					*chansend()*
 		was created with `"rpc":v:true` then the channel expects RPC
 		messages, use |rpcnotify()| and |rpcrequest()| instead.
 
-char2nr({string} [, {utf8}])				*char2nr()*
+char2nr({string} [, {utf8}])                                         *char2nr()*
 		Return Number value of the first char in {string}.
 		Examples: >vim
 			echo char2nr(" ")		" returns 32
@@ -744,7 +744,7 @@ char2nr({string} [, {utf8}])				*char2nr()*
 			GetChar()->char2nr()
 <
 
-charclass({string})					*charclass()*
+charclass({string})                                                *charclass()*
 		Return the character class of the first character in {string}.
 		The character class is one of:
 			0	blank
@@ -755,7 +755,7 @@ charclass({string})					*charclass()*
 		The class is used in patterns and word motions.
 		Returns 0 if {string} is not a |String|.
 
-charcol({expr} [, {winid}])				*charcol()*
+charcol({expr} [, {winid}])                                          *charcol()*
 		Same as |col()| but returns the character index of the column
 		position given with {expr} instead of the byte position.
 
@@ -768,7 +768,7 @@ charcol({expr} [, {winid}])				*charcol()*
 			GetPos()->col()
 <
 
-charidx({string}, {idx} [, {countcc} [, {utf16}]])	*charidx()*
+charidx({string}, {idx} [, {countcc} [, {utf16}]])                   *charidx()*
 		Return the character index of the byte at {idx} in {string}.
 		The index of the first character is zero.
 		If there are no multibyte characters the returned value is
@@ -805,7 +805,7 @@ charidx({string}, {idx} [, {countcc} [, {utf16}]])	*charidx()*
 			GetName()->charidx(idx)
 <
 
-chdir({dir})						*chdir()*
+chdir({dir})                                                           *chdir()*
 		Change the current working directory to {dir}.  The scope of
 		the directory change depends on the directory of the current
 		window:
@@ -831,7 +831,7 @@ chdir({dir})						*chdir()*
 			GetDir()->chdir()
 <
 
-cindent({lnum})						*cindent()*
+cindent({lnum})                                                      *cindent()*
 		Get the amount of indent for line {lnum} according the C
 		indenting rules, as with 'cindent'.
 		The indent is counted in spaces, the value of 'tabstop' is
@@ -843,7 +843,7 @@ cindent({lnum})						*cindent()*
 			GetLnum()->cindent()
 <
 
-clearmatches([{win}])				*clearmatches()*
+clearmatches([{win}])                                           *clearmatches()*
 		Clears all matches previously defined for the current window
 		by |matchadd()| and the |:match| commands.
 		If {win} is specified, use the window with this number or
@@ -853,7 +853,7 @@ clearmatches([{win}])				*clearmatches()*
 			GetWin()->clearmatches()
 <
 
-col({expr} [, {winid}])					*col()*
+col({expr} [, {winid}])                                                  *col()*
 		The result is a Number, which is the byte index of the column
 		position given with {expr}.  The accepted positions are:
 		    .	    the cursor position
@@ -895,7 +895,7 @@ col({expr} [, {winid}])					*col()*
 			GetPos()->col()
 <
 
-complete({startcol}, {matches})			*complete()* *E785*
+complete({startcol}, {matches})                                *complete()* *E785*
 		Set the matches for Insert mode completion.
 		Can only be used in Insert mode.  You need to use a mapping
 		with CTRL-R = (see |i_CTRL-R|).  It does not work after CTRL-O
@@ -930,7 +930,7 @@ complete({startcol}, {matches})			*complete()* *E785*
 			GetMatches()->complete(col('.'))
 <
 
-complete_add({expr})					*complete_add()*
+complete_add({expr})                                            *complete_add()*
 		Add {expr} to the list of matches.  Only to be used by the
 		function specified with the 'completefunc' option.
 		Returns 0 for failure (empty string or out of memory),
@@ -943,7 +943,7 @@ complete_add({expr})					*complete_add()*
 			GetMoreMatches()->complete_add()
 <
 
-complete_check()					*complete_check()*
+complete_check()                                              *complete_check()*
 		Check for a key typed while looking for completion matches.
 		This is to be used when looking for matches takes some time.
 		Returns |TRUE| when searching for matches is to be aborted,
@@ -951,7 +951,7 @@ complete_check()					*complete_check()*
 		Only to be used by the function specified with the
 		'completefunc' option.
 
-complete_info([{what}])				*complete_info()*
+complete_info([{what}])                                        *complete_info()*
 		Returns a |Dictionary| with information about Insert mode
 		completion.  See |ins-completion|.
 		The items are:
@@ -1013,7 +1013,7 @@ complete_info([{what}])				*complete_info()*
 			GetItems()->complete_info()
 <
 
-confirm({msg} [, {choices} [, {default} [, {type}]]])	*confirm()*
+confirm({msg} [, {choices} [, {default} [, {type}]]])                *confirm()*
 		confirm() offers the user a dialog, from which a choice can be
 		made.  It returns the number of the choice.  For the first
 		choice this is 1.
@@ -1069,7 +1069,7 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])	*confirm()*
 			BuildMessage()->confirm("&Yes\n&No")
 <
 
-copy({expr})							*copy()*
+copy({expr})                                                            *copy()*
 		Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
 		When {expr} is a |List| a shallow copy is created.  This means
@@ -1082,7 +1082,7 @@ copy({expr})							*copy()*
 			mylist->copy()
 <
 
-cos({expr})							*cos()*
+cos({expr})                                                              *cos()*
 		Return the cosine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
@@ -1096,7 +1096,7 @@ cos({expr})							*cos()*
 			Compute()->cos()
 <
 
-cosh({expr})							*cosh()*
+cosh({expr})                                                            *cosh()*
 		Return the hyperbolic cosine of {expr} as a |Float| in the range
 		[1, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -1111,7 +1111,7 @@ cosh({expr})							*cosh()*
 			Compute()->cosh()
 <
 
-count({comp}, {expr} [, {ic} [, {start}]])			*count()*
+count({comp}, {expr} [, {ic} [, {start}]])                             *count()*
 		Return the number of times an item with value {expr} appears
 		in |String|, |List| or |Dictionary| {comp}.
 
@@ -1128,33 +1128,33 @@ count({comp}, {expr} [, {ic} [, {start}]])			*count()*
 			mylist->count(val)
 <
 
-ctxget([{index}])						*ctxget()*
+ctxget([{index}])                                                     *ctxget()*
 		Returns a |Dictionary| representing the |context| at {index}
 		from the top of the |context-stack| (see |context-dict|).
 		If {index} is not given, it is assumed to be 0 (i.e.: top).
 
-ctxpop()							*ctxpop()*
+ctxpop()                                                              *ctxpop()*
 		Pops and restores the |context| at the top of the
 		|context-stack|.
 
-ctxpush([{types}])					*ctxpush()*
+ctxpush([{types}])                                                   *ctxpush()*
 		Pushes the current editor state (|context|) on the
 		|context-stack|.
 		If {types} is given and is a |List| of |String|s, it specifies
 		which |context-types| to include in the pushed context.
 		Otherwise, all context types are included.
 
-ctxset({context} [, {index}])				*ctxset()*
+ctxset({context} [, {index}])                                         *ctxset()*
 		Sets the |context| at {index} from the top of the
 		|context-stack| to that represented by {context}.
 		{context} is a Dictionary with context data (|context-dict|).
 		If {index} is not given, it is assumed to be 0 (i.e.: top).
 
-ctxsize()							*ctxsize()*
+ctxsize()                                                            *ctxsize()*
 		Returns the size of the |context-stack|.
 
 cursor({lnum}, {col} [, {off}])
-cursor({list})						*cursor()*
+cursor({list})                                                        *cursor()*
 		Positions the cursor at the column (byte count) {col} in the
 		line {lnum}.  The first column is one.
 
@@ -1190,7 +1190,7 @@ cursor({list})						*cursor()*
 			GetCursorPos()->cursor()
 <
 
-debugbreak({pid})					*debugbreak()*
+debugbreak({pid})                                                 *debugbreak()*
 		Specifically used to interrupt a program being debugged.  It
 		will cause process {pid} to get a SIGTRAP.  Behavior for other
 		processes is undefined. See |terminal-debug|.
@@ -1203,7 +1203,7 @@ debugbreak({pid})					*debugbreak()*
 			GetPid()->debugbreak()
 <
 
-deepcopy({expr} [, {noref}])			*deepcopy()* *E698*
+deepcopy({expr} [, {noref}])                                   *deepcopy()* *E698*
 		Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
 		When {expr} is a |List| a full copy is created.  This means
@@ -1227,7 +1227,7 @@ deepcopy({expr} [, {noref}])			*deepcopy()* *E698*
 			GetObject()->deepcopy()
 <
 
-delete({fname} [, {flags}])				*delete()*
+delete({fname} [, {flags}])                                           *delete()*
 		Without {flags} or with {flags} empty: Deletes the file by the
 		name {fname}.
 
@@ -1250,7 +1250,7 @@ delete({fname} [, {flags}])				*delete()*
 			GetName()->delete()
 <
 
-deletebufline({buf}, {first} [, {last}])		*deletebufline()*
+deletebufline({buf}, {first} [, {last}])                       *deletebufline()*
 		Delete lines {first} to {last} (inclusive) from buffer {buf}.
 		If {last} is omitted then delete line {first} only.
 		On success 0 is returned, on failure 1 is returned.
@@ -1268,7 +1268,7 @@ deletebufline({buf}, {first} [, {last}])		*deletebufline()*
 			GetBuffer()->deletebufline(1)
 <
 
-dictwatcheradd({dict}, {pattern}, {callback})	*dictwatcheradd()*
+dictwatcheradd({dict}, {pattern}, {callback})                 *dictwatcheradd()*
 		Adds a watcher to a dictionary. A dictionary watcher is
 		identified by three components:
 
@@ -1308,12 +1308,12 @@ dictwatcheradd({dict}, {pattern}, {callback})	*dictwatcheradd()*
 		This function can be used by plugins to implement options with
 		validation and parsing logic.
 
-dictwatcherdel({dict}, {pattern}, {callback})	*dictwatcherdel()*
+dictwatcherdel({dict}, {pattern}, {callback})                 *dictwatcherdel()*
 		Removes a watcher added  with |dictwatcheradd()|. All three
 		arguments must match the ones passed to |dictwatcheradd()| in
 		order for the watcher to be successfully deleted.
 
-did_filetype()					*did_filetype()*
+did_filetype()                                                  *did_filetype()*
 		Returns |TRUE| when autocommands are being executed and the
 		FileType event has been triggered at least once.  Can be used
 		to avoid triggering the FileType event again in the scripts
@@ -1325,7 +1325,7 @@ did_filetype()					*did_filetype()*
 		editing another buffer to set 'filetype' and load a syntax
 		file.
 
-diff_filler({lnum})					*diff_filler()*
+diff_filler({lnum})                                              *diff_filler()*
 		Returns the number of filler lines above line {lnum}.
 		These are the lines that were inserted at this point in
 		another diff'ed window.  These filler lines are shown in the
@@ -1338,7 +1338,7 @@ diff_filler({lnum})					*diff_filler()*
 			GetLnum()->diff_filler()
 <
 
-diff_hlID({lnum}, {col})				*diff_hlID()*
+diff_hlID({lnum}, {col})                                           *diff_hlID()*
 		Returns the highlight ID for diff mode at line {lnum} column
 		{col} (byte index).  When the current line does not have a
 		diff change zero is returned.
@@ -1353,7 +1353,7 @@ diff_hlID({lnum}, {col})				*diff_hlID()*
 			GetLnum()->diff_hlID(col)
 <
 
-digraph_get({chars})				*digraph_get()* *E1214*
+digraph_get({chars})                                       *digraph_get()* *E1214*
 		Return the digraph of {chars}.  This should be a string with
 		exactly two characters.  If {chars} are not just two
 		characters, or the digraph of {chars} does not exist, an error
@@ -1373,7 +1373,7 @@ digraph_get({chars})				*digraph_get()* *E1214*
 			GetChars()->digraph_get()
 <
 
-digraph_getlist([{listall}])			*digraph_getlist()*
+digraph_getlist([{listall}])                                 *digraph_getlist()*
 		Return a list of digraphs.  If the {listall} argument is given
 		and it is TRUE, return all digraphs, including the default
 		digraphs.  Otherwise, return only user-defined digraphs.
@@ -1391,7 +1391,7 @@ digraph_getlist([{listall}])			*digraph_getlist()*
 			GetNumber()->digraph_getlist()
 <
 
-digraph_set({chars}, {digraph})			*digraph_set()*
+digraph_set({chars}, {digraph})                                  *digraph_set()*
 		Add digraph {chars} to the list.  {chars} must be a string
 		with two characters.  {digraph} is a string with one UTF-8
 		encoded character.  *E1215*
@@ -1412,7 +1412,7 @@ digraph_set({chars}, {digraph})			*digraph_set()*
 			GetString()->digraph_set('あ')
 <
 
-digraph_setlist({digraphlist})			*digraph_setlist()*
+digraph_setlist({digraphlist})                               *digraph_setlist()*
 		Similar to |digraph_set()| but this function can add multiple
 		digraphs at once.  {digraphlist} is a list composed of lists,
 		where each list contains two strings with {chars} and
@@ -1431,7 +1431,7 @@ digraph_setlist({digraphlist})			*digraph_setlist()*
 		    GetList()->digraph_setlist()
 <
 
-empty({expr})						*empty()*
+empty({expr})                                                          *empty()*
 		Return the Number 1 if {expr} is empty, zero otherwise.
 		- A |List| or |Dictionary| is empty when it does not have any
 		  items.
@@ -1444,7 +1444,7 @@ empty({expr})						*empty()*
 			mylist->empty()
 <
 
-environ()							*environ()*
+environ()                                                            *environ()*
 		Return all of environment variables as dictionary. You can
 		check if an environment variable exists like this: >vim
 			echo has_key(environ(), 'HOME')
@@ -1453,7 +1453,7 @@ environ()							*environ()*
 			echo index(keys(environ()), 'HOME', 0, 1) != -1
 <
 
-escape({string}, {chars})					*escape()*
+escape({string}, {chars})                                             *escape()*
 		Escape the characters in {chars} that occur in {string} with a
 		backslash.  Example: >vim
 			echo escape('c:\program files\vim', ' \')
@@ -1465,7 +1465,7 @@ escape({string}, {chars})					*escape()*
 			GetText()->escape(' \')
 <
 
-eval({string})						*eval()*
+eval({string})                                                          *eval()*
 		Evaluate {string} and return the result.  Especially useful to
 		turn the result of |string()| back into the original value.
 		This works for Numbers, Floats, Strings, Blobs and composites
@@ -1476,13 +1476,13 @@ eval({string})						*eval()*
 			argv->join()->eval()
 <
 
-eventhandler()					*eventhandler()*
+eventhandler()                                                  *eventhandler()*
 		Returns 1 when inside an event handler.  That is that Vim got
 		interrupted while waiting for the user to type a character,
 		e.g., when dropping a file on Vim.  This means interactive
 		commands cannot be used.  Otherwise zero is returned.
 
-executable({expr})					*executable()*
+executable({expr})                                                *executable()*
 		This function checks if an executable with the name {expr}
 		exists.  {expr} must be the name of the program without any
 		arguments.
@@ -1509,7 +1509,7 @@ executable({expr})					*executable()*
 			GetCommand()->executable()
 <
 
-execute({command} [, {silent}])				*execute()*
+execute({command} [, {silent}])                                      *execute()*
 		Execute {command} and capture its output.
 		If {command} is a |String|, returns {command} output.
 		If {command} is a |List|, returns concatenated outputs.
@@ -1541,7 +1541,7 @@ execute({command} [, {silent}])				*execute()*
 			GetCommand()->execute()
 <
 
-exepath({expr})						*exepath()*
+exepath({expr})                                                      *exepath()*
 		Returns the full path of {expr} if it is an executable and
 		given as a (partial or full) path or is found in $PATH.
 		Returns empty string otherwise.
@@ -1551,7 +1551,7 @@ exepath({expr})						*exepath()*
 			GetCommand()->exepath()
 <
 
-exists({expr})						*exists()*
+exists({expr})                                                        *exists()*
 		The result is a Number, which is |TRUE| if {expr} is
 		defined, zero otherwise.
 
@@ -1643,7 +1643,7 @@ exists({expr})						*exists()*
 			Varname()->exists()
 <
 
-exp({expr})							*exp()*
+exp({expr})                                                              *exp()*
 		Return the exponential of {expr} as a |Float| in the range
 		[0, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -1658,7 +1658,7 @@ exp({expr})							*exp()*
 			Compute()->exp()
 <
 
-expand({string} [, {nosuf} [, {list}]])			*expand()*
+expand({string} [, {nosuf} [, {list}]])                               *expand()*
 		Expand wildcards and the following special keywords in
 		{string}.  'wildignorecase' applies.
 
@@ -1753,7 +1753,7 @@ expand({string} [, {nosuf} [, {list}]])			*expand()*
 			Getpattern()->expand()
 <
 
-expandcmd({string} [, {options}])			*expandcmd()*
+expandcmd({string} [, {options}])                                  *expandcmd()*
 		Expand special items in String {string} like what is done for
 		an Ex command such as `:edit`.  This expands special keywords,
 		like with |expand()|, and environment variables, anywhere in
@@ -1780,7 +1780,7 @@ expandcmd({string} [, {options}])			*expandcmd()*
 			GetCommand()->expandcmd()
 <
 
-extend({expr1}, {expr2} [, {expr3}])			*extend()*
+extend({expr1}, {expr2} [, {expr3}])                                  *extend()*
 		{expr1} and {expr2} must be both |Lists| or both
 		|Dictionaries|.
 
@@ -1820,12 +1820,12 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 			mylist->extend(otherlist)
 <
 
-extendnew({expr1}, {expr2} [, {expr3}])			*extendnew()*
+extendnew({expr1}, {expr2} [, {expr3}])                            *extendnew()*
 		Like |extend()| but instead of adding items to {expr1} a new
 		List or Dictionary is created and returned.  {expr1} remains
 		unchanged.
 
-feedkeys({string} [, {mode}])				*feedkeys()*
+feedkeys({string} [, {mode}])                                       *feedkeys()*
 		Characters in {string} are queued for processing as if they
 		come from a mapping or were typed by the user.
 
@@ -1874,7 +1874,7 @@ feedkeys({string} [, {mode}])				*feedkeys()*
 			GetInput()->feedkeys()
 <
 
-filereadable({file})					*filereadable()*
+filereadable({file})                                            *filereadable()*
 		The result is a Number, which is |TRUE| when a file with the
 		name {file} exists, and can be read.  If {file} doesn't exist,
 		or is a directory, the result is |FALSE|.  {file} is any
@@ -1895,7 +1895,7 @@ filereadable({file})					*filereadable()*
 			GetName()->filereadable()
 <
 
-filewritable({file})					*filewritable()*
+filewritable({file})                                            *filewritable()*
 		The result is a Number, which is 1 when a file with the
 		name {file} exists, and can be written.  If {file} doesn't
 		exist, or is not writable, the result is 0.  If {file} is a
@@ -1905,7 +1905,7 @@ filewritable({file})					*filewritable()*
 			GetName()->filewritable()
 <
 
-filter({expr1}, {expr2})					*filter()*
+filter({expr1}, {expr2})                                              *filter()*
 		{expr1} must be a |List|, |Blob|, or a |Dictionary|.
 		For each item in {expr1} evaluate {expr2} and when the result
 		is zero remove the item from the |List| or |Dictionary|. For a
@@ -1959,7 +1959,7 @@ filter({expr1}, {expr2})					*filter()*
 			mylist->filter(expr2)
 <
 
-finddir({name} [, {path} [, {count}]])			*finddir()*
+finddir({name} [, {path} [, {count}]])                               *finddir()*
 		Find directory {name} in {path}.  Supports both downwards and
 		upwards recursive directory searches.  See |file-searching|
 		for the syntax of {path}.
@@ -1981,7 +1981,7 @@ finddir({name} [, {path} [, {count}]])			*finddir()*
 			GetName()->finddir()
 <
 
-findfile({name} [, {path} [, {count}]])			*findfile()*
+findfile({name} [, {path} [, {count}]])                             *findfile()*
 		Just like |finddir()|, but find a file instead of a directory.
 		Uses 'suffixesadd'.
 		Example: >vim
@@ -1993,7 +1993,7 @@ findfile({name} [, {path} [, {count}]])			*findfile()*
 			GetName()->findfile()
 <
 
-flatten({list} [, {maxdepth}])				*flatten()*
+flatten({list} [, {maxdepth}])                                       *flatten()*
 		Flatten {list} up to {maxdepth} levels.  Without {maxdepth}
 		the result is a |List| without nesting, as if {maxdepth} is
 		a very large number.
@@ -2016,10 +2016,10 @@ flatten({list} [, {maxdepth}])				*flatten()*
 			mylist->flatten()
 <
 
-flattennew({list} [, {maxdepth}])			*flattennew()*
+flattennew({list} [, {maxdepth}])                                 *flattennew()*
 		Like |flatten()| but first make a copy of {list}.
 
-float2nr({expr})						*float2nr()*
+float2nr({expr})                                                    *float2nr()*
 		Convert {expr} to a Number by omitting the part after the
 		decimal point.
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -2045,7 +2045,7 @@ float2nr({expr})						*float2nr()*
 			Compute()->float2nr()
 <
 
-floor({expr})						*floor()*
+floor({expr})                                                          *floor()*
 		Return the largest integral value less than or equal to
 		{expr} as a |Float| (round down).
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -2062,7 +2062,7 @@ floor({expr})						*floor()*
 			Compute()->floor()
 <
 
-fmod({expr1}, {expr2})					*fmod()*
+fmod({expr1}, {expr2})                                                  *fmod()*
 		Return the remainder of {expr1} / {expr2}, even if the
 		division is not representable.  Returns {expr1} - i * {expr2}
 		for some integer i such that if {expr2} is non-zero, the
@@ -2082,7 +2082,7 @@ fmod({expr1}, {expr2})					*fmod()*
 			Compute()->fmod(1.22)
 <
 
-fnameescape({string})					*fnameescape()*
+fnameescape({string})                                            *fnameescape()*
 		Escape {string} for use as file name command argument.  All
 		characters that have a special meaning, such as `'%'` and `'|'`
 		are escaped with a backslash.
@@ -2102,7 +2102,7 @@ fnameescape({string})					*fnameescape()*
 			GetName()->fnameescape()
 <
 
-fnamemodify({fname}, {mods})				*fnamemodify()*
+fnamemodify({fname}, {mods})                                     *fnamemodify()*
 		Modify file name {fname} according to {mods}.  {mods} is a
 		string of characters like it is used for file names on the
 		command line.  See |filename-modifiers|.
@@ -2123,7 +2123,7 @@ fnamemodify({fname}, {mods})				*fnamemodify()*
 			GetName()->fnamemodify(':p:h')
 <
 
-foldclosed({lnum})					*foldclosed()*
+foldclosed({lnum})                                                *foldclosed()*
 		The result is a Number.  If the line {lnum} is in a closed
 		fold, the result is the number of the first line in that fold.
 		If the line {lnum} is not in a closed fold, -1 is returned.
@@ -2134,7 +2134,7 @@ foldclosed({lnum})					*foldclosed()*
 			GetLnum()->foldclosed()
 <
 
-foldclosedend({lnum})				*foldclosedend()*
+foldclosedend({lnum})                                          *foldclosedend()*
 		The result is a Number.  If the line {lnum} is in a closed
 		fold, the result is the number of the last line in that fold.
 		If the line {lnum} is not in a closed fold, -1 is returned.
@@ -2145,7 +2145,7 @@ foldclosedend({lnum})				*foldclosedend()*
 			GetLnum()->foldclosedend()
 <
 
-foldlevel({lnum})					*foldlevel()*
+foldlevel({lnum})                                                  *foldlevel()*
 		The result is a Number, which is the foldlevel of line {lnum}
 		in the current buffer.  For nested folds the deepest level is
 		returned.  If there is no fold at line {lnum}, zero is
@@ -2161,7 +2161,7 @@ foldlevel({lnum})					*foldlevel()*
 			GetLnum()->foldlevel()
 <
 
-foldtext()						*foldtext()*
+foldtext()                                                          *foldtext()*
 		Returns a String, to be displayed for a closed fold.  This is
 		the default function used for the 'foldtext' option and should
 		only be called from evaluating 'foldtext'.  It uses the
@@ -2178,7 +2178,7 @@ foldtext()						*foldtext()*
 		setting.
 		Returns an empty string when there is no fold.
 
-foldtextresult({lnum})				*foldtextresult()*
+foldtextresult({lnum})                                        *foldtextresult()*
 		Returns the text that is displayed for the closed fold at line
 		{lnum}.  Evaluates 'foldtext' in the appropriate context.
 		When there is no closed fold at {lnum} an empty string is
@@ -2191,7 +2191,7 @@ foldtextresult({lnum})				*foldtextresult()*
 			GetLnum()->foldtextresult()
 <
 
-fullcommand({name})					*fullcommand()*
+fullcommand({name})                                              *fullcommand()*
 		Get the full command name from a short abbreviated command
 		name; see |20.2| for details on command abbreviations.
 
@@ -2207,7 +2207,7 @@ fullcommand({name})					*fullcommand()*
 			GetName()->fullcommand()
 <
 
-funcref({name} [, {arglist}] [, {dict}])			*funcref()*
+funcref({name} [, {arglist}] [, {dict}])                             *funcref()*
 		Just like |function()|, but the returned Funcref will lookup
 		the function by reference, not by name.  This matters when the
 		function {name} is redefined later.
@@ -2223,7 +2223,7 @@ funcref({name} [, {arglist}] [, {dict}])			*funcref()*
 			GetFuncname()->funcref([arg])
 <
 
-function({name} [, {arglist}] [, {dict}])	*function()* *partial* *E700* *E923*
+function({name} [, {arglist}] [, {dict}])         *function()* *partial* *E700* *E923*
 		Return a |Funcref| variable that refers to function {name}.
 		{name} can be the name of a user defined function or an
 		internal function.
@@ -2309,7 +2309,7 @@ function({name} [, {arglist}] [, {dict}])	*function()* *partial* *E700* *E923*
 			GetFuncname()->function([arg])
 <
 
-garbagecollect([{atexit}])				*garbagecollect()*
+garbagecollect([{atexit}])                                    *garbagecollect()*
 		Cleanup unused |Lists| and |Dictionaries| that have circular
 		references.
 
@@ -2329,7 +2329,7 @@ garbagecollect([{atexit}])				*garbagecollect()*
 		it's safe to perform.  This is when waiting for the user to
 		type a character.
 
-get({list}, {idx} [, {default}])				*get()*
+get({list}, {idx} [, {default}])                                         *get()*
 		Get item {idx} from |List| {list}.  When this item is not
 		available return {default}.  Return zero when {default} is
 		omitted.
@@ -2360,7 +2360,7 @@ get({func}, {what})
 		Returns zero on error.
 
 getbufinfo([{buf}])
-getbufinfo([{dict}])					*getbufinfo()*
+getbufinfo([{dict}])                                              *getbufinfo()*
 		Get information about buffers as a List of Dictionaries.
 
 		Without an argument information about all the buffers is
@@ -2429,7 +2429,7 @@ getbufinfo([{dict}])					*getbufinfo()*
 			GetBufnr()->getbufinfo()
 <
 
-getbufline({buf}, {lnum} [, {end}])			*getbufline()*
+getbufline({buf}, {lnum} [, {end}])                               *getbufline()*
 		Return a |List| with the lines starting from {lnum} to {end}
 		(inclusive) in the buffer {buf}.  If {end} is omitted, a
 		|List| with only the line {lnum} is returned.  See
@@ -2458,11 +2458,11 @@ getbufline({buf}, {lnum} [, {end}])			*getbufline()*
 			GetBufnr()->getbufline(lnum)
 <
 
-getbufoneline({buf}, {lnum})			*getbufoneline()*
+getbufoneline({buf}, {lnum})                                   *getbufoneline()*
 		Just like `getbufline()` but only get one line and return it
 		as a string.
 
-getbufvar({buf}, {varname} [, {def}])			*getbufvar()*
+getbufvar({buf}, {varname} [, {def}])                              *getbufvar()*
 		The result is the value of option or local buffer variable
 		{varname} in buffer {buf}.  Note that the name without "b:"
 		must be used.
@@ -2487,13 +2487,13 @@ getbufvar({buf}, {varname} [, {def}])			*getbufvar()*
 			GetBufnr()->getbufvar(varname)
 <
 
-getcellwidths()					*getcellwidths()*
+getcellwidths()                                                *getcellwidths()*
 		Returns a |List| of cell widths of character ranges overridden
 		by |setcellwidths()|.  The format is equal to the argument of
 		|setcellwidths()|.  If no character ranges have their cell
 		widths overridden, an empty List is returned.
 
-getchangelist([{buf}])				*getchangelist()*
+getchangelist([{buf}])                                         *getchangelist()*
 		Returns the |changelist| for the buffer {buf}. For the use
 		of {buf}, see |bufname()| above. If buffer {buf} doesn't
 		exist, an empty list is returned.
@@ -2513,7 +2513,7 @@ getchangelist([{buf}])				*getchangelist()*
 			GetBufnr()->getchangelist()
 <
 
-getchar([expr])						*getchar()*
+getchar([expr])                                                      *getchar()*
 		Get a single character from the user or input stream.
 		If [expr] is omitted, wait until a character is available.
 		If [expr] is 0, only get a character when one is available.
@@ -2578,7 +2578,7 @@ getchar([expr])						*getchar()*
 			endfunction
 <
 
-getcharmod()						*getcharmod()*
+getcharmod()                                                      *getcharmod()*
 		The result is a Number which is the state of the modifiers for
 		the last obtained character with getchar() or in another way.
 		These values are added together:
@@ -2594,7 +2594,7 @@ getcharmod()						*getcharmod()*
 		character itself are obtained.  Thus Shift-a results in "A"
 		without a modifier.  Returns 0 if no modifiers are used.
 
-getcharpos({expr})					*getcharpos()*
+getcharpos({expr})                                                *getcharpos()*
 		Get the position for String {expr}. Same as |getpos()| but the
 		column number in the returned List is a character index
 		instead of a byte index.
@@ -2611,7 +2611,7 @@ getcharpos({expr})					*getcharpos()*
 			GetMark()->getcharpos()
 <
 
-getcharsearch()					*getcharsearch()*
+getcharsearch()                                                *getcharsearch()*
 		Return the current character search information as a {dict}
 		with the following entries:
 
@@ -2631,7 +2631,7 @@ getcharsearch()					*getcharsearch()*
 			nnoremap <expr> , getcharsearch().forward ? ',' : ';'
 <		Also see |setcharsearch()|.
 
-getcharstr([expr])					*getcharstr()*
+getcharstr([expr])                                                *getcharstr()*
 		Get a single character from the user or input stream as a
 		string.
 		If [expr] is omitted, wait until a character is available.
@@ -2643,7 +2643,7 @@ getcharstr([expr])					*getcharstr()*
 		Otherwise this works like |getchar()|, except that a number
 		result is converted to a string.
 
-getcmdcompltype()					*getcmdcompltype()*
+getcmdcompltype()                                            *getcmdcompltype()*
 		Return the type of the current command-line completion.
 		Only works when the command line is being edited, thus
 		requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
@@ -2652,7 +2652,7 @@ getcmdcompltype()					*getcmdcompltype()*
 		|setcmdline()|.
 		Returns an empty string when completion is not defined.
 
-getcmdline()						*getcmdline()*
+getcmdline()                                                      *getcmdline()*
 		Return the current command-line.  Only works when the command
 		line is being edited, thus requires use of |c_CTRL-\_e| or
 		|c_CTRL-R_=|.
@@ -2663,7 +2663,7 @@ getcmdline()						*getcmdline()*
 		Returns an empty string when entering a password or using
 		|inputsecret()|.
 
-getcmdpos()						*getcmdpos()*
+getcmdpos()                                                        *getcmdpos()*
 		Return the position of the cursor in the command line as a
 		byte count.  The first column is 1.
 		Only works when editing the command line, thus requires use of
@@ -2672,7 +2672,7 @@ getcmdpos()						*getcmdpos()*
 		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
 		|setcmdline()|.
 
-getcmdscreenpos()					*getcmdscreenpos()*
+getcmdscreenpos()                                            *getcmdscreenpos()*
 		Return the screen position of the cursor in the command line
 		as a byte count.  The first column is 1.
 		Instead of |getcmdpos()|, it adds the prompt position.
@@ -2682,7 +2682,7 @@ getcmdscreenpos()					*getcmdscreenpos()*
 		Also see |getcmdpos()|, |setcmdpos()|, |getcmdline()| and
 		|setcmdline()|.
 
-getcmdtype()						*getcmdtype()*
+getcmdtype()                                                      *getcmdtype()*
 		Return the current command-line type. Possible return values
 		are:
 		    :	normal Ex command
@@ -2697,12 +2697,12 @@ getcmdtype()						*getcmdtype()*
 		Returns an empty string otherwise.
 		Also see |getcmdpos()|, |setcmdpos()| and |getcmdline()|.
 
-getcmdwintype()					*getcmdwintype()*
+getcmdwintype()                                                *getcmdwintype()*
 		Return the current |command-line-window| type. Possible return
 		values are the same as |getcmdtype()|. Returns an empty string
 		when not in the command-line window.
 
-getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
+getcompletion({pat}, {type} [, {filtered}])                    *getcompletion()*
 		Return a list of command-line completion matches. The String
 		{type} argument specifies what for.  The following completion
 		types are supported:
@@ -2772,7 +2772,7 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 			GetPattern()->getcompletion('color')
 <
 
-getcurpos([{winid}])					*getcurpos()*
+getcurpos([{winid}])                                               *getcurpos()*
 		Get the position of the cursor.  This is like getpos('.'), but
 		includes an extra "curswant" item in the list:
 		    [0, lnum, col, off, curswant] ~
@@ -2801,7 +2801,7 @@ getcurpos([{winid}])					*getcurpos()*
 			GetWinid()->getcurpos()
 <
 
-getcursorcharpos([{winid}])			*getcursorcharpos()*
+getcursorcharpos([{winid}])                                 *getcursorcharpos()*
 		Same as |getcurpos()| but the column number in the returned
 		List is a character index instead of a byte index.
 
@@ -2814,7 +2814,7 @@ getcursorcharpos([{winid}])			*getcursorcharpos()*
 			GetWinid()->getcursorcharpos()
 <
 
-getcwd([{winnr} [, {tabnr}]])				*getcwd()*
+getcwd([{winnr} [, {tabnr}]])                                         *getcwd()*
 		With no arguments, returns the name of the effective
 		|current-directory|. With {winnr} or {tabnr} the working
 		directory of that scope is returned, and 'autochdir' is
@@ -2834,7 +2834,7 @@ getcwd([{winnr} [, {tabnr}]])				*getcwd()*
 			GetWinnr()->getcwd()
 <
 
-getenv({name})						*getenv()*
+getenv({name})                                                        *getenv()*
 		Return the value of environment variable {name}.  The {name}
 		argument is a string, without a leading '$'.  Example: >vim
 			myHome = getenv('HOME')
@@ -2847,7 +2847,7 @@ getenv({name})						*getenv()*
 			GetVarname()->getenv()
 <
 
-getfontname([{name}])					*getfontname()*
+getfontname([{name}])                                            *getfontname()*
 		Without an argument returns the name of the normal font being
 		used.  Like what is used for the Normal highlight group
 		|hl-Normal|.
@@ -2859,7 +2859,7 @@ getfontname([{name}])					*getfontname()*
 		gvimrc file.  Use the |GUIEnter| autocommand to use this
 		function just after the GUI has started.
 
-getfperm({fname})					*getfperm()*
+getfperm({fname})                                                   *getfperm()*
 		The result is a String, which is the read, write, and execute
 		permissions of the given file {fname}.
 		If {fname} does not exist or its directory cannot be read, an
@@ -2879,7 +2879,7 @@ getfperm({fname})					*getfperm()*
 <
 		For setting permissions use |setfperm()|.
 
-getfsize({fname})					*getfsize()*
+getfsize({fname})                                                   *getfsize()*
 		The result is a Number, which is the size in bytes of the
 		given file {fname}.
 		If {fname} is a directory, 0 is returned.
@@ -2891,7 +2891,7 @@ getfsize({fname})					*getfsize()*
 			GetFilename()->getfsize()
 <
 
-getftime({fname})					*getftime()*
+getftime({fname})                                                   *getftime()*
 		The result is a Number, which is the last modification time of
 		the given file {fname}.  The value is measured as seconds
 		since 1st Jan 1970, and may be passed to strftime().  See also
@@ -2902,7 +2902,7 @@ getftime({fname})					*getftime()*
 			GetFilename()->getftime()
 <
 
-getftype({fname})					*getftype()*
+getftype({fname})                                                   *getftype()*
 		The result is a String, which is a description of the kind of
 		file of the given file {fname}.
 		If {fname} does not exist an empty string is returned.
@@ -2926,7 +2926,7 @@ getftype({fname})					*getftype()*
 			GetFilename()->getftype()
 <
 
-getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
+getjumplist([{winnr} [, {tabnr}]])                               *getjumplist()*
 		Returns the |jumplist| for the specified window.
 
 		Without arguments use the current window.
@@ -2950,7 +2950,7 @@ getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
 			GetWinnr()->getjumplist()
 <
 
-getline({lnum} [, {end}])					*getline()*
+getline({lnum} [, {end}])                                            *getline()*
 		Without {end} the result is a String, which is line {lnum}
 		from the current buffer.  Example: >vim
 			getline(1)
@@ -2978,7 +2978,7 @@ getline({lnum} [, {end}])					*getline()*
 <		To get lines from another buffer see |getbufline()| and
 		|getbufoneline()|
 
-getloclist({nr} [, {what}])				*getloclist()*
+getloclist({nr} [, {what}])                                       *getloclist()*
 		Returns a |List| with all the entries in the location list for
 		window {nr}.  {nr} can be the window number or the |window-ID|.
 		When {nr} is zero the current window is used.
@@ -3010,7 +3010,7 @@ getloclist({nr} [, {what}])				*getloclist()*
 			echo getloclist(5, {'filewinid': 0})
 <
 
-getmarklist([{buf}])					*getmarklist()*
+getmarklist([{buf}])                                             *getmarklist()*
 		Without the {buf} argument returns a |List| with information
 		about all the global marks. |mark|
 
@@ -3033,7 +3033,7 @@ getmarklist([{buf}])					*getmarklist()*
 			GetBufnr()->getmarklist()
 <
 
-getmatches([{win}])					*getmatches()*
+getmatches([{win}])                                               *getmatches()*
 		Returns a |List| with all matches previously defined for the
 		current window by |matchadd()| and the |:match| commands.
 		|getmatches()| is useful in combination with |setmatches()|,
@@ -3065,7 +3065,7 @@ getmatches([{win}])					*getmatches()*
 			unlet m
 <
 
-getmousepos()						*getmousepos()*
+getmousepos()                                                    *getmousepos()*
 		Returns a Dictionary with the last known position of the
 		mouse.  This can be used in a mapping for a mouse click.  The
 		items are:
@@ -3094,11 +3094,11 @@ getmousepos()						*getmousepos()*
 		When using |getchar()| the Vim variables |v:mouse_lnum|,
 		|v:mouse_col| and |v:mouse_winid| also provide these values.
 
-getpid()							*getpid()*
+getpid()                                                              *getpid()*
 		Return a Number which is the process ID of the Vim process.
 		This is a unique number, until Vim exits.
 
-getpos({expr})						*getpos()*
+getpos({expr})                                                        *getpos()*
 		Get the position for String {expr}.  For possible values of
 		{expr} see |line()|.  For getting the cursor position see
 		|getcurpos()|.
@@ -3131,7 +3131,7 @@ getpos({expr})						*getpos()*
 			GetMark()->getpos()
 <
 
-getqflist([{what}])					*getqflist()*
+getqflist([{what}])                                                *getqflist()*
 		Returns a |List| with all the current quickfix errors.  Each
 		list item is a dictionary with these entries:
 			bufnr	number of buffer that has the file name, use
@@ -3232,7 +3232,7 @@ getqflist([{what}])					*getqflist()*
 			echo getqflist({'lines' : ["F1:10:L10"]})
 <
 
-getreg([{regname} [, 1 [, {list}]]])			*getreg()*
+getreg([{regname} [, 1 [, {list}]]])                                  *getreg()*
 		The result is a String, which is the contents of register
 		{regname}.  Example: >vim
 			let cliptext = getreg('*')
@@ -3259,7 +3259,7 @@ getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 			GetRegname()->getreg()
 <
 
-getreginfo([{regname}])				*getreginfo()*
+getreginfo([{regname}])                                           *getreginfo()*
 		Returns detailed information about register {regname} as a
 		Dictionary with the following entries:
 			regcontents	List of lines contained in register
@@ -3287,7 +3287,7 @@ getreginfo([{regname}])				*getreginfo()*
 			GetRegname()->getreginfo()
 <
 
-getregtype([{regname}])				*getregtype()*
+getregtype([{regname}])                                           *getregtype()*
 		The result is a String, which is type of register {regname}.
 		The value will be one of:
 		    "v"			for |charwise| text
@@ -3302,7 +3302,7 @@ getregtype([{regname}])				*getregtype()*
 			GetRegname()->getregtype()
 <
 
-getscriptinfo([{opts}])				*getscriptinfo()*
+getscriptinfo([{opts}])                                        *getscriptinfo()*
 		Returns a |List| with information about all the sourced Vim
 		scripts in the order they were sourced, like what
 		`:scriptnames` shows.
@@ -3339,7 +3339,7 @@ getscriptinfo([{opts}])				*getscriptinfo()*
 			echo getscriptinfo({'sid': 15}).variables
 <
 
-gettabinfo([{tabnr}])					*gettabinfo()*
+gettabinfo([{tabnr}])                                             *gettabinfo()*
 		If {tabnr} is not specified, then information about all the
 		tab pages is returned as a |List|. Each List item is a
 		|Dictionary|.  Otherwise, {tabnr} specifies the tab page
@@ -3356,7 +3356,7 @@ gettabinfo([{tabnr}])					*gettabinfo()*
 			GetTabnr()->gettabinfo()
 <
 
-gettabvar({tabnr}, {varname} [, {def}])			*gettabvar()*
+gettabvar({tabnr}, {varname} [, {def}])                            *gettabvar()*
 		Get the value of a tab-local variable {varname} in tab page
 		{tabnr}. |t:var|
 		Tabs are numbered starting with one.
@@ -3370,7 +3370,7 @@ gettabvar({tabnr}, {varname} [, {def}])			*gettabvar()*
 			GetTabnr()->gettabvar(varname)
 <
 
-gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])	*gettabwinvar()*
+gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])             *gettabwinvar()*
 		Get the value of window-local variable {varname} in window
 		{winnr} in tab page {tabnr}.
 		The {varname} argument is a string.  When {varname} is empty a
@@ -3400,7 +3400,7 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])	*gettabwinvar()*
 			GetTabnr()->gettabwinvar(winnr, varname)
 <
 
-gettagstack([{winnr}])				*gettagstack()*
+gettagstack([{winnr}])                                           *gettagstack()*
 		The result is a Dict, which is the tag stack of window {winnr}.
 		{winnr} can be the window number or the |window-ID|.
 		When {winnr} is not specified, the current window is used.
@@ -3432,7 +3432,7 @@ gettagstack([{winnr}])				*gettagstack()*
 			GetWinnr()->gettagstack()
 <
 
-gettext({text})						*gettext()*
+gettext({text})                                                      *gettext()*
 		Translate String {text} if possible.
 		This is mainly for use in the distributed Vim scripts.  When
 		generating message translations the {text} is extracted by
@@ -3443,7 +3443,7 @@ gettext({text})						*gettext()*
 		xgettext does not understand escaping in single quoted
 		strings.
 
-getwininfo([{winid}])					*getwininfo()*
+getwininfo([{winid}])                                             *getwininfo()*
 		Returns information about windows as a |List| with Dictionaries.
 
 		If {winid} is given Information about the window with that ID
@@ -3481,7 +3481,7 @@ getwininfo([{winid}])					*getwininfo()*
 			GetWinnr()->getwininfo()
 <
 
-getwinpos([{timeout}])					*getwinpos()*
+getwinpos([{timeout}])                                             *getwinpos()*
 		The result is a |List| with two numbers, the result of
 		|getwinposx()| and |getwinposy()| combined:
 			[x-pos, y-pos]
@@ -3505,19 +3505,19 @@ getwinpos([{timeout}])					*getwinpos()*
 			GetTimeout()->getwinpos()
 <
 
-getwinposx()						*getwinposx()*
+getwinposx()                                                      *getwinposx()*
 		The result is a Number, which is the X coordinate in pixels of
 		the left hand side of the GUI Vim window.  The result will be
 		-1 if the information is not available.
 		The value can be used with `:winpos`.
 
-getwinposy()						*getwinposy()*
+getwinposy()                                                      *getwinposy()*
 		The result is a Number, which is the Y coordinate in pixels of
 		the top of the GUI Vim window.  The result will be -1 if the
 		information is not available.
 		The value can be used with `:winpos`.
 
-getwinvar({winnr}, {varname} [, {def}])			*getwinvar()*
+getwinvar({winnr}, {varname} [, {def}])                            *getwinvar()*
 		Like |gettabwinvar()| for the current tabpage.
 		Examples: >vim
 			let list_is_on = getwinvar(2, '&list')
@@ -3527,7 +3527,7 @@ getwinvar({winnr}, {varname} [, {def}])			*getwinvar()*
 			GetWinnr()->getwinvar(varname)
 <
 
-glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])		*glob()*
+glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])                      *glob()*
 		Expand the file wildcards in {expr}.  See |wildcards| for the
 		use of special characters.
 
@@ -3567,7 +3567,7 @@ glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])		*glob()*
 			GetExpr()->glob()
 <
 
-glob2regpat({string})					*glob2regpat()*
+glob2regpat({string})                                            *glob2regpat()*
 		Convert a file pattern, as used by glob(), into a search
 		pattern.  The result can be used to match with a string that
 		is a file name.  E.g. >vim
@@ -3587,7 +3587,7 @@ glob2regpat({string})					*glob2regpat()*
 			GetExpr()->glob2regpat()
 <
 
-globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])	*globpath()*
+globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])       *globpath()*
 		Perform glob() for String {expr} on all directories in {path}
 		and concatenate the results.  Example: >vim
 			echo globpath(&rtp, "syntax/c.vim")
@@ -3627,7 +3627,7 @@ globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])	*globpath()*
 			GetExpr()->globpath(&rtp)
 <
 
-has({feature})						*has()*
+has({feature})                                                           *has()*
 		Returns 1 if {feature} is supported, 0 otherwise.  The
 		{feature} argument is a feature name like "nvim-0.2.1" or
 		"win32", see below.  See also |exists()|.
@@ -3695,7 +3695,7 @@ has({feature})						*has()*
 			endif
 <
 
-has_key({dict}, {key})					*has_key()*
+has_key({dict}, {key})                                               *has_key()*
 		The result is a Number, which is TRUE if |Dictionary| {dict}
 		has an entry with key {key}.  FALSE otherwise. The {key}
 		argument is a string.
@@ -3704,7 +3704,7 @@ has_key({dict}, {key})					*has_key()*
 			mydict->has_key(key)
 <
 
-haslocaldir([{winnr} [, {tabnr}]])			*haslocaldir()*
+haslocaldir([{winnr} [, {tabnr}]])                               *haslocaldir()*
 		The result is a Number, which is 1 when the window has set a
 		local path via |:lcd| or when {winnr} is -1 and the tabpage
 		has set a local path via |:tcd|, otherwise 0.
@@ -3725,7 +3725,7 @@ haslocaldir([{winnr} [, {tabnr}]])			*haslocaldir()*
 			GetWinnr()->haslocaldir()
 <
 
-hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
+hasmapto({what} [, {mode} [, {abbr}]])                              *hasmapto()*
 		The result is a Number, which is TRUE if there is a mapping
 		that contains {what} in somewhere in the rhs (what it is
 		mapped to) and this mapping exists in one of the modes
@@ -3760,7 +3760,7 @@ hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
 			GetRHS()->hasmapto()
 <
 
-histadd({history}, {item})				*histadd()*
+histadd({history}, {item})                                           *histadd()*
 		Add the String {item} to the history {history} which can be
 		one of:					*hist-names*
 			"cmd"	 or ":"	  command line history
@@ -3786,7 +3786,7 @@ histadd({history}, {item})				*histadd()*
 			GetHistory()->histadd('search')
 <
 
-histdel({history} [, {item}])				*histdel()*
+histdel({history} [, {item}])                                        *histdel()*
 		Clear {history}, i.e. delete all its entries.  See |hist-names|
 		for the possible values of {history}.
 
@@ -3822,7 +3822,7 @@ histdel({history} [, {item}])				*histdel()*
 			GetHistory()->histdel()
 <
 
-histget({history} [, {index}])				*histget()*
+histget({history} [, {index}])                                       *histget()*
 		The result is a String, the entry with Number {index} from
 		{history}.  See |hist-names| for the possible values of
 		{history}, and |:history-indexing| for {index}.  If there is
@@ -3841,7 +3841,7 @@ histget({history} [, {index}])				*histget()*
 			GetHistory()->histget()
 <
 
-histnr({history})						*histnr()*
+histnr({history})                                                     *histnr()*
 		The result is the Number of the current entry in {history}.
 		See |hist-names| for the possible values of {history}.
 		If an error occurred, -1 is returned.
@@ -3853,7 +3853,7 @@ histnr({history})						*histnr()*
 			GetHistory()->histnr()
 <
 
-hlID({name})							*hlID()*
+hlID({name})                                                            *hlID()*
 		The result is a Number, which is the ID of the highlight group
 		with name {name}.  When the highlight group doesn't exist,
 		zero is returned.
@@ -3866,7 +3866,7 @@ hlID({name})							*hlID()*
 			GetName()->hlID()
 <
 
-hlexists({name})						*hlexists()*
+hlexists({name})                                                    *hlexists()*
 		The result is a Number, which is TRUE if a highlight group
 		called {name} exists.  This is when the group has been
 		defined in some way.  Not necessarily when highlighting has
@@ -3877,12 +3877,12 @@ hlexists({name})						*hlexists()*
 			GetName()->hlexists()
 <
 
-hostname()						*hostname()*
+hostname()                                                          *hostname()*
 		The result is a String, which is the name of the machine on
 		which Vim is currently running.  Machine names greater than
 		256 characters long are truncated.
 
-iconv({string}, {from}, {to})				*iconv()*
+iconv({string}, {from}, {to})                                          *iconv()*
 		The result is a String, which is the text {string} converted
 		from encoding {from} to encoding {to}.
 		When the conversion completely fails an empty string is
@@ -3898,7 +3898,7 @@ iconv({string}, {from}, {to})				*iconv()*
 			GetText()->iconv('latin1', 'utf-8')
 <
 
-id({expr})							*id()*
+id({expr})                                                                *id()*
 		Returns a |String| which is a unique identifier of the
 		container type (|List|, |Dict|, |Blob| and |Partial|). It is
 		guaranteed that for the mentioned types `id(v1) ==# id(v2)`
@@ -3915,7 +3915,7 @@ id({expr})							*id()*
 		will not be equal to some other `id()`: new containers may
 		reuse identifiers of the garbage-collected ones.
 
-indent({lnum})						*indent()*
+indent({lnum})                                                        *indent()*
 		current buffer.  The indent is counted in spaces, the value
 		of 'tabstop' is relevant.  {lnum} is used just like in
 		|getline()|.
@@ -3925,7 +3925,7 @@ indent({lnum})						*indent()*
 			GetLnum()->indent()
 <
 
-index({object}, {expr} [, {start} [, {ic}]])		*index()*
+index({object}, {expr} [, {start} [, {ic}]])                           *index()*
 		Find {expr} in {object} and return its index.  See
 		|indexof()| for using a lambda to select the item.
 
@@ -3956,7 +3956,7 @@ index({object}, {expr} [, {start} [, {ic}]])		*index()*
 			GetObject()->index(what)
 <
 
-indexof({object}, {expr} [, {opts}])			*indexof()*
+indexof({object}, {expr} [, {opts}])                                 *indexof()*
 		Returns the index of an item in {object} where {expr} is
 		v:true.  {object} must be a |List| or a |Blob|.
 
@@ -3998,7 +3998,7 @@ indexof({object}, {expr} [, {opts}])			*indexof()*
 			mylist->indexof(expr)
 <
 
-input({prompt} [, {text} [, {completion}]])			*input()*
+input({prompt} [, {text} [, {completion}]])                            *input()*
 
 input({opts})
 		The result is a String, which is whatever the user typed on
@@ -4114,7 +4114,7 @@ input({opts})
 			GetPrompt()->input()
 <
 
-inputlist({textlist})					*inputlist()*
+inputlist({textlist})                                              *inputlist()*
 		{textlist} must be a |List| of strings.  This |List| is
 		displayed, one string per line.  The user will be prompted to
 		enter a number, which is returned.
@@ -4135,13 +4135,13 @@ inputlist({textlist})					*inputlist()*
 			GetChoices()->inputlist()
 <
 
-inputrestore()					*inputrestore()*
+inputrestore()                                                  *inputrestore()*
 		Restore typeahead that was saved with a previous |inputsave()|.
 		Should be called the same number of times inputsave() is
 		called.  Calling it more often is harmless though.
 		Returns TRUE when there is nothing to restore, FALSE otherwise.
 
-inputsave()						*inputsave()*
+inputsave()                                                        *inputsave()*
 		Preserve typeahead (also from mappings) and clear it, so that
 		a following prompt gets input from the user.  Should be
 		followed by a matching inputrestore() after the prompt.  Can
@@ -4149,7 +4149,7 @@ inputsave()						*inputsave()*
 		many inputrestore() calls.
 		Returns TRUE when out of memory, FALSE otherwise.
 
-inputsecret({prompt} [, {text}])			*inputsecret()*
+inputsecret({prompt} [, {text}])                                 *inputsecret()*
 		This function acts much like the |input()| function with but
 		two exceptions:
 		a) the user's response will be displayed as a sequence of
@@ -4164,7 +4164,7 @@ inputsecret({prompt} [, {text}])			*inputsecret()*
 			GetPrompt()->inputsecret()
 <
 
-insert({object}, {item} [, {idx}])				*insert()*
+insert({object}, {item} [, {idx}])                                    *insert()*
 		When {object} is a |List| or a |Blob| insert {item} at the start
 		of it.
 
@@ -4185,7 +4185,7 @@ insert({object}, {item} [, {idx}])				*insert()*
 			mylist->insert(item)
 <
 
-interrupt()						*interrupt()*
+interrupt()                                                        *interrupt()*
 		Interrupt script execution.  It works more or less like the
 		user typing CTRL-C, most commands won't execute and control
 		returns to the user.  This is useful to abort execution
@@ -4199,7 +4199,7 @@ interrupt()						*interrupt()*
 		au BufWritePre * call s:check_typoname(expand('<amatch>'))
 <
 
-invert({expr})						*invert()*
+invert({expr})                                                        *invert()*
 		Bitwise invert.  The argument is converted to a number.  A
 		List, Dict or Float argument causes an error.  Example: >vim
 			let bits = invert(bits)
@@ -4207,7 +4207,7 @@ invert({expr})						*invert()*
 			let bits = bits->invert()
 <
 
-isdirectory({directory})				*isdirectory()*
+isdirectory({directory})                                         *isdirectory()*
 		The result is a Number, which is |TRUE| when a directory
 		with the name {directory} exists.  If {directory} doesn't
 		exist, or isn't a directory, the result is |FALSE|.  {directory}
@@ -4217,7 +4217,7 @@ isdirectory({directory})				*isdirectory()*
 			GetName()->isdirectory()
 <
 
-isinf({expr})						*isinf()*
+isinf({expr})                                                          *isinf()*
 		Return 1 if {expr} is a positive infinity, or -1 a negative
 		infinity, otherwise 0. >vim
 			echo isinf(1.0 / 0.0)
@@ -4229,7 +4229,7 @@ isinf({expr})						*isinf()*
 			Compute()->isinf()
 <
 
-islocked({expr})					*islocked()* *E786*
+islocked({expr})                                               *islocked()* *E786*
 		The result is a Number, which is |TRUE| when {expr} is the
 		name of a locked variable.
 		The string argument {expr} must be the name of a variable,
@@ -4247,7 +4247,7 @@ islocked({expr})					*islocked()* *E786*
 			GetName()->islocked()
 <
 
-isnan({expr})						*isnan()*
+isnan({expr})                                                          *isnan()*
 		Return |TRUE| if {expr} is a float with value NaN. >vim
 			echo isnan(0.0 / 0.0)
 <			1
@@ -4256,7 +4256,7 @@ isnan({expr})						*isnan()*
 			Compute()->isnan()
 <
 
-items({dict})						*items()*
+items({dict})                                                          *items()*
 		Return a |List| with all the key-value pairs of {dict}.  Each
 		|List| item is a list with two items: the key of a {dict}
 		entry and the value of this entry.  The |List| is in arbitrary
@@ -4270,15 +4270,15 @@ items({dict})						*items()*
 			mydict->items()
 <
 
-jobpid({job})						*jobpid()*
+jobpid({job})                                                         *jobpid()*
 		Return the PID (process id) of |job-id| {job}.
 
-jobresize({job}, {width}, {height})			*jobresize()*
+jobresize({job}, {width}, {height})                                *jobresize()*
 		Resize the pseudo terminal window of |job-id| {job} to {width}
 		columns and {height} rows.
 		Fails if the job was not started with `"pty":v:true`.
 
-jobstart({cmd} [, {opts}])				*jobstart()*
+jobstart({cmd} [, {opts}])                                          *jobstart()*
 		Note: Prefer |vim.system()| in Lua.
 
 		Spawns {cmd} as a job.
@@ -4364,7 +4364,7 @@ jobstart({cmd} [, {opts}])				*jobstart()*
 		  - -1 if {cmd}[0] is not executable.
 		See also |job-control|, |channel|, |msgpack-rpc|.
 
-jobstop({id})						*jobstop()*
+jobstop({id})                                                        *jobstop()*
 		Stop |job-id| {id} by sending SIGTERM to the job process. If
 		the process does not terminate after a timeout then SIGKILL
 		will be sent. When the job terminates its |on_exit| handler
@@ -4374,7 +4374,7 @@ jobstop({id})						*jobstop()*
 		Returns 1 for valid job id, 0 for invalid id, including jobs have
 		exited or stopped.
 
-jobwait({jobs} [, {timeout}])				*jobwait()*
+jobwait({jobs} [, {timeout}])                                        *jobwait()*
 		Waits for jobs and their |on_exit| handlers to complete.
 
 		{jobs} is a List of |job-id|s to wait for.
@@ -4395,7 +4395,7 @@ jobwait({jobs} [, {timeout}])				*jobwait()*
 			-2 if the job was interrupted (by |CTRL-C|)
 			-3 if the job-id is invalid
 
-join({list} [, {sep}])					*join()*
+join({list} [, {sep}])                                                  *join()*
 		Join the items in {list} together into one String.
 		When {sep} is specified it is put in between the items.  If
 		{sep} is omitted a single space is used.
@@ -4410,7 +4410,7 @@ join({list} [, {sep}])					*join()*
 			mylist->join()
 <
 
-json_decode({expr})					*json_decode()*
+json_decode({expr})                                              *json_decode()*
 		Convert {expr} from JSON object.  Accepts |readfile()|-style
 		list as the input, as well as regular string.  May output any
 		Vim value. In the following cases it will output
@@ -4430,7 +4430,7 @@ json_decode({expr})					*json_decode()*
 			ReadObject()->json_decode()
 <
 
-json_encode({expr})					*json_encode()*
+json_encode({expr})                                              *json_encode()*
 		Convert {expr} into a JSON string.  Accepts
 		|msgpack-special-dict| as the input.  Will not convert
 		|Funcref|s, mappings with non-string keys (can be created as
@@ -4446,7 +4446,7 @@ json_encode({expr})					*json_encode()*
 			GetObject()->json_encode()
 <
 
-keys({dict})							*keys()*
+keys({dict})                                                            *keys()*
 		Return a |List| with all the keys of {dict}.  The |List| is in
 		arbitrary order.  Also see |items()| and |values()|.
 
@@ -4454,7 +4454,7 @@ keys({dict})							*keys()*
 			mydict->keys()
 <
 
-keytrans({string})					*keytrans()*
+keytrans({string})                                                  *keytrans()*
 		Turn the internal byte representation of keys into a form that
 		can be used for |:map|.  E.g. >vim
 			let xx = "\<C-Home>"
@@ -4465,7 +4465,7 @@ keytrans({string})					*keytrans()*
 			"\<C-Home>"->keytrans()
 <
 
-len({expr})						*len()* *E701*
+len({expr})                                                         *len()* *E701*
 		When {expr} is a String or a Number the length in bytes is
 		used, as with |strlen()|.
 		When {expr} is a |List| the number of items in the |List| is
@@ -4479,7 +4479,7 @@ len({expr})						*len()* *E701*
 			mylist->len()
 <
 
-libcall({libname}, {funcname}, {argument})	*libcall()* *E364* *E368*
+libcall({libname}, {funcname}, {argument})                 *libcall()* *E364* *E368*
 		Call function {funcname} in the run-time library {libname}
 		with single argument {argument}.
 		This is useful to call functions in a library that you
@@ -4526,7 +4526,7 @@ libcall({libname}, {funcname}, {argument})	*libcall()* *E364* *E368*
 			GetValue()->libcall("libc.so", "getenv")
 <
 
-libcallnr({libname}, {funcname}, {argument})		*libcallnr()*
+libcallnr({libname}, {funcname}, {argument})                       *libcallnr()*
 		Just like |libcall()|, but used for a function that returns an
 		int instead of a string.
 		Examples: >vim
@@ -4539,7 +4539,7 @@ libcallnr({libname}, {funcname}, {argument})		*libcallnr()*
 			GetValue()->libcallnr("libc.so", "printf")
 <
 
-line({expr} [, {winid}])					*line()*
+line({expr} [, {winid}])                                                *line()*
 		The result is a Number, which is the line number of the file
 		position given with {expr}.  The {expr} argument is a string.
 		The accepted positions are:
@@ -4575,7 +4575,7 @@ line({expr} [, {winid}])					*line()*
 			GetValue()->line()
 <
 
-line2byte({lnum})					*line2byte()*
+line2byte({lnum})                                                  *line2byte()*
 		Return the byte count from the start of the buffer for line
 		{lnum}.  This includes the end-of-line character, depending on
 		the 'fileformat' option for the current buffer.  The first
@@ -4592,7 +4592,7 @@ line2byte({lnum})					*line2byte()*
 			GetLnum()->line2byte()
 <
 
-lispindent({lnum})					*lispindent()*
+lispindent({lnum})                                                *lispindent()*
 		Get the amount of indent for line {lnum} according the lisp
 		indenting rules, as with 'lisp'.
 		The indent is counted in spaces, the value of 'tabstop' is
@@ -4603,7 +4603,7 @@ lispindent({lnum})					*lispindent()*
 			GetLnum()->lispindent()
 <
 
-list2blob({list})					*list2blob()*
+list2blob({list})                                                  *list2blob()*
 		Return a Blob concatenating all the number values in {list}.
 		Examples: >vim
 			echo list2blob([1, 2, 3, 4])	" returns 0z01020304
@@ -4617,7 +4617,7 @@ list2blob({list})					*list2blob()*
 			GetList()->list2blob()
 <
 
-list2str({list} [, {utf8}])				*list2str()*
+list2str({list} [, {utf8}])                                         *list2str()*
 		Convert each number in {list} to a character string can
 		concatenate them all.  Examples: >vim
 			echo list2str([32])		" returns " "
@@ -4637,11 +4637,11 @@ list2str({list} [, {utf8}])				*list2str()*
 			GetList()->list2str()
 <
 
-localtime()						*localtime()*
+localtime()                                                        *localtime()*
 		Return the current time, measured as seconds since 1st Jan
 		1970.  See also |strftime()|, |strptime()| and |getftime()|.
 
-log({expr})							*log()*
+log({expr})                                                              *log()*
 		Return the natural logarithm (base e) of {expr} as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number| in the range
 		(0, inf].
@@ -4656,7 +4656,7 @@ log({expr})							*log()*
 			Compute()->log()
 <
 
-log10({expr})						*log10()*
+log10({expr})                                                          *log10()*
 		Return the logarithm of Float {expr} to base 10 as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
@@ -4670,7 +4670,7 @@ log10({expr})						*log10()*
 			Compute()->log10()
 <
 
-luaeval({expr} [, {expr}])				*luaeval()*
+luaeval({expr} [, {expr}])                                           *luaeval()*
 		Evaluate Lua expression {expr} and return its result converted
 		to Vim data structures. See |lua-eval| for more details.
 
@@ -4678,7 +4678,7 @@ luaeval({expr} [, {expr}])				*luaeval()*
 			GetExpr()->luaeval()
 <
 
-map({expr1}, {expr2})						*map()*
+map({expr1}, {expr2})                                                    *map()*
 		{expr1} must be a |List|, |Blob| or |Dictionary|.
 		Replace each item in {expr1} with the result of evaluating
 		{expr2}.  For a |Blob| each byte is replaced.
@@ -4729,7 +4729,7 @@ map({expr1}, {expr2})						*map()*
 			mylist->map(expr2)
 <
 
-maparg({name} [, {mode} [, {abbr} [, {dict}]]])		*maparg()*
+maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 		When {dict} is omitted or zero: Return the rhs of mapping
 		{name} in mode {mode}.  The returned String has special
 		characters translated like in the output of the ":map" command
@@ -4797,7 +4797,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])		*maparg()*
 			GetKey()->maparg('n')
 <
 
-mapcheck({name} [, {mode} [, {abbr}]])			*mapcheck()*
+mapcheck({name} [, {mode} [, {abbr}]])                              *mapcheck()*
 		Check if there is a mapping that matches with {name} in mode
 		{mode}.  See |maparg()| for {mode} and special names in
 		{name}.
@@ -4834,7 +4834,7 @@ mapcheck({name} [, {mode} [, {abbr}]])			*mapcheck()*
 			GetKey()->mapcheck('n')
 <
 
-mapset({mode}, {abbr}, {dict})				*mapset()*
+mapset({mode}, {abbr}, {dict})                                        *mapset()*
 		Restore a mapping from a dictionary returned by |maparg()|.
 		{mode} and {abbr} should be the same as for the call to
 		|maparg()|. *E460*
@@ -4849,7 +4849,7 @@ mapset({mode}, {abbr}, {dict})				*mapset()*
 		e.g. with `:map!`, you need to save the mapping for all of
 		them, since they can differ.
 
-match({expr}, {pat} [, {start} [, {count}]])		*match()*
+match({expr}, {pat} [, {start} [, {count}]])                           *match()*
 		When {expr} is a |List| then this returns the index of the
 		first item where {pat} matches.  Each item is used as a
 		String, |Lists| and |Dictionaries| are used as echoed.
@@ -4916,7 +4916,7 @@ match({expr}, {pat} [, {start} [, {count}]])		*match()*
 			GetList()->match('word')
 <
 
-						*matchadd()* *E798* *E799* *E801* *E957*
+                                                *matchadd()* *E798* *E799* *E801* *E957*
 matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		Defines a pattern to be highlighted in the current window (a
 		"match").  It will be highlighted with {group}.  Returns an
@@ -4979,7 +4979,7 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 			GetGroup()->matchadd('TODO')
 <
 
-matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])	*matchaddpos()*
+matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])   *matchaddpos()*
 		Same as |matchadd()|, but requires a list of positions {pos}
 		instead of a pattern. This command is faster than |matchadd()|
 		because it does not require to handle regular expressions and
@@ -5020,7 +5020,7 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])	*matchaddpos()*
 			GetGroup()->matchaddpos([23, 11])
 <
 
-matcharg({nr})						*matcharg()*
+matcharg({nr})                                                      *matcharg()*
 		Selects the {nr} match item, as set with a |:match|,
 		|:2match| or |:3match| command.
 		Return a |List| with two elements:
@@ -5036,7 +5036,7 @@ matcharg({nr})						*matcharg()*
 			GetMatch()->matcharg()
 <
 
-matchdelete({id} [, {win}])		*matchdelete()* *E802* *E803*
+matchdelete({id} [, {win}])                            *matchdelete()* *E802* *E803*
 		Deletes a match with ID {id} previously defined by |matchadd()|
 		or one of the |:match| commands.  Returns 0 if successful,
 		otherwise -1.  See example for |matchadd()|.  All matches can
@@ -5048,7 +5048,7 @@ matchdelete({id} [, {win}])		*matchdelete()* *E802* *E803*
 			GetMatch()->matchdelete()
 <
 
-matchend({expr}, {pat} [, {start} [, {count}]])		*matchend()*
+matchend({expr}, {pat} [, {start} [, {count}]])                     *matchend()*
 		Same as |match()|, but return the index of first character
 		after the match.  Example: >vim
 			echo matchend("testing", "ing")
@@ -5071,7 +5071,7 @@ matchend({expr}, {pat} [, {start} [, {count}]])		*matchend()*
 			GetText()->matchend('word')
 <
 
-matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
+matchfuzzy({list}, {str} [, {dict}])                              *matchfuzzy()*
 		If {list} is a list of strings, then returns a |List| with all
 		the strings in {list} that fuzzy match {str}. The strings in
 		the returned list are sorted based on the matching score.
@@ -5134,7 +5134,7 @@ matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 						\ {'matchseq': 1})
 <		results in `['two one']`.
 
-matchfuzzypos({list}, {str} [, {dict}])		*matchfuzzypos()*
+matchfuzzypos({list}, {str} [, {dict}])                        *matchfuzzypos()*
 		Same as |matchfuzzy()|, but returns the list of matched
 		strings, the list of character positions where characters
 		in {str} matches and a list of matching scores.  You can
@@ -5156,7 +5156,7 @@ matchfuzzypos({list}, {str} [, {dict}])		*matchfuzzypos()*
 				\ ->matchfuzzypos('ll', {'key' : 'text'})
 <		results in `[[{"id": 10, "text": "hello"}], [[2, 3]], [127]]`
 
-matchlist({expr}, {pat} [, {start} [, {count}]])	*matchlist()*
+matchlist({expr}, {pat} [, {start} [, {count}]])                   *matchlist()*
 		Same as |match()|, but return a |List|.  The first item in the
 		list is the matched string, same as what matchstr() would
 		return.  Following items are submatches, like "\1", "\2", etc.
@@ -5172,7 +5172,7 @@ matchlist({expr}, {pat} [, {start} [, {count}]])	*matchlist()*
 			GetText()->matchlist('word')
 <
 
-matchstr({expr}, {pat} [, {start} [, {count}]])		*matchstr()*
+matchstr({expr}, {pat} [, {start} [, {count}]])                     *matchstr()*
 		Same as |match()|, but return the matched string.  Example: >vim
 			echo matchstr("testing", "ing")
 <		results in "ing".
@@ -5189,7 +5189,7 @@ matchstr({expr}, {pat} [, {start} [, {count}]])		*matchstr()*
 			GetText()->matchstr('word')
 <
 
-matchstrpos({expr}, {pat} [, {start} [, {count}]])	*matchstrpos()*
+matchstrpos({expr}, {pat} [, {start} [, {count}]])               *matchstrpos()*
 		Same as |matchstr()|, but return the matched string, the start
 		position and the end position of the match.  Example: >vim
 			echo matchstrpos("testing", "ing")
@@ -5211,7 +5211,7 @@ matchstrpos({expr}, {pat} [, {start} [, {count}]])	*matchstrpos()*
 			GetText()->matchstrpos('word')
 <
 
-max({expr})							*max()*
+max({expr})                                                              *max()*
 		Return the maximum value of all items in {expr}. Example: >vim
 			echo max([apples, pears, oranges])
 
@@ -5225,7 +5225,7 @@ max({expr})							*max()*
 			mylist->max()
 <
 
-menu_get({path} [, {modes}])				*menu_get()*
+menu_get({path} [, {modes}])                                        *menu_get()*
 		Returns a |List| of |Dictionaries| describing |menus| (defined
 		by |:menu|, |:amenu|, …), including |hidden-menus|.
 
@@ -5271,7 +5271,7 @@ menu_get({path} [, {modes}])				*menu_get()*
 			} ]
 <
 
-menu_info({name} [, {mode}])				*menu_info()*
+menu_info({name} [, {mode}])                                       *menu_info()*
 		Return information about the specified menu {name} in
 		mode {mode}. The menu name should be specified without the
 		shortcut character ('&'). If {name} is "", then the top-level
@@ -5345,7 +5345,7 @@ menu_info({name} [, {mode}])				*menu_info()*
 			GetMenuName()->menu_info('v')
 <
 
-min({expr})							*min()*
+min({expr})                                                              *min()*
 		Return the minimum value of all items in {expr}. Example: >vim
 			echo min([apples, pears, oranges])
 
@@ -5359,7 +5359,7 @@ min({expr})							*min()*
 			mylist->min()
 <
 
-mkdir({name} [, {flags} [, {prot}]])			*mkdir()* *E739*
+mkdir({name} [, {flags} [, {prot}]])                              *mkdir()* *E739*
 		Create directory {name}.
 
 		When {flags} is present it must be a string.  An empty string
@@ -5406,7 +5406,7 @@ mkdir({name} [, {flags} [, {prot}]])			*mkdir()* *E739*
 			GetName()->mkdir()
 <
 
-mode([expr])							*mode()*
+mode([expr])                                                            *mode()*
 		Return a string that indicates the current mode.
 		If [expr] is supplied and it evaluates to a non-zero Number or
 		a non-empty String (|non-zero-arg|), then the full mode is
@@ -5461,7 +5461,7 @@ mode([expr])							*mode()*
 			DoFull()->mode()
 <
 
-msgpackdump({list} [, {type}])			*msgpackdump()*
+msgpackdump({list} [, {type}])                                   *msgpackdump()*
 		Convert a list of Vimscript objects to msgpack. Returned value is a
 		|readfile()|-style list. When {type} contains "B", a |Blob| is
 		returned instead. Example: >vim
@@ -5480,7 +5480,7 @@ msgpackdump({list} [, {type}])			*msgpackdump()*
 		4. Other strings and |Blob|s are always dumped as BIN strings.
 		5. Points 3. and 4. do not apply to |msgpack-special-dict|s.
 
-msgpackparse({data})					*msgpackparse()*
+msgpackparse({data})                                            *msgpackparse()*
 		Convert a |readfile()|-style list or a |Blob| to a list of
 		Vimscript objects.
 		Example: >vim
@@ -5554,7 +5554,7 @@ msgpackparse({data})					*msgpackparse()*
 			representing extension type. Second is
 			|readfile()|-style list of strings.
 
-nextnonblank({lnum})					*nextnonblank()*
+nextnonblank({lnum})                                            *nextnonblank()*
 		Return the line number of the first line at or below {lnum}
 		that is not blank.  Example: >vim
 			if getline(nextnonblank(1)) =~ "Java" | endif
@@ -5567,7 +5567,7 @@ nextnonblank({lnum})					*nextnonblank()*
 			GetLnum()->nextnonblank()
 <
 
-nr2char({expr} [, {utf8}])				*nr2char()*
+nr2char({expr} [, {utf8}])                                           *nr2char()*
 		Return a string with a single character, which has the number
 		value {expr}.  Examples: >vim
 			echo nr2char(64)		" returns '@'
@@ -5586,7 +5586,7 @@ nr2char({expr} [, {utf8}])				*nr2char()*
 			GetNumber()->nr2char()
 <
 
-nvim_...({...})			*nvim_...()* *E5555* *eval-api*
+nvim_...({...})                                      *nvim_...()* *E5555* *eval-api*
 		Call nvim |api| functions. The type checking of arguments will
 		be stricter than for most other builtins. For instance,
 		if Integer is expected, a |Number| must be passed in, a
@@ -5597,7 +5597,7 @@ nvim_...({...})			*nvim_...()* *E5555* *eval-api*
 		also take the numerical value 0 to indicate the current
 		(focused) object.
 
-or({expr}, {expr})						*or()*
+or({expr}, {expr})                                                        *or()*
 		Bitwise OR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `and()` and `xor()`.
@@ -5611,7 +5611,7 @@ or({expr}, {expr})						*or()*
 		to separate commands.  In many places it would not be clear if
 		"|" is an operator or a command separator.
 
-pathshorten({path} [, {len}])				*pathshorten()*
+pathshorten({path} [, {len}])                                    *pathshorten()*
 		Shorten directory names in the path {path} and return the
 		result.  The tail, the file name, is kept as-is.  The other
 		components in the path are reduced to {len} letters in length.
@@ -5629,7 +5629,7 @@ pathshorten({path} [, {len}])				*pathshorten()*
 			GetDirectories()->pathshorten()
 <
 
-perleval({expr})						*perleval()*
+perleval({expr})                                                    *perleval()*
 		Evaluate |perl| expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are
@@ -5648,7 +5648,7 @@ perleval({expr})						*perleval()*
 			GetExpr()->perleval()
 <
 
-pow({x}, {y})							*pow()*
+pow({x}, {y})                                                            *pow()*
 		Return the power of {x} to the exponent {y} as a |Float|.
 		{x} and {y} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {x} or {y} is not a |Float| or a |Number|.
@@ -5664,7 +5664,7 @@ pow({x}, {y})							*pow()*
 			Compute()->pow(3)
 <
 
-prevnonblank({lnum})					*prevnonblank()*
+prevnonblank({lnum})                                            *prevnonblank()*
 		Return the line number of the first line at or above {lnum}
 		that is not blank.  Example: >vim
 			let ind = indent(prevnonblank(v:lnum - 1))
@@ -5677,7 +5677,7 @@ prevnonblank({lnum})					*prevnonblank()*
 			GetLnum()->prevnonblank()
 <
 
-printf({fmt}, {expr1} ...)					*printf()*
+printf({fmt}, {expr1} ...)                                            *printf()*
 		Return a String with {fmt}, where "%" items are replaced by
 		the formatted form of their respective arguments.  Example: >vim
 			echo printf("%4d: E%d %.30s", lnum, errno, msg)
@@ -5877,7 +5877,7 @@ printf({fmt}, {expr1} ...)					*printf()*
 		of "%" items.  If there are not sufficient or too many
 		arguments an error is given.  Up to 18 arguments can be used.
 
-prompt_getprompt({buf})				*prompt_getprompt()*
+prompt_getprompt({buf})                                     *prompt_getprompt()*
 		Returns the effective prompt text for buffer {buf}.  {buf} can
 		be a buffer name or number.  See |prompt-buffer|.
 
@@ -5888,7 +5888,7 @@ prompt_getprompt({buf})				*prompt_getprompt()*
 			GetBuffer()->prompt_getprompt()
 <
 
-prompt_setcallback({buf}, {expr})		*prompt_setcallback()*
+prompt_setcallback({buf}, {expr})                         *prompt_setcallback()*
 		Set prompt callback for buffer {buf} to {expr}.  When {expr}
 		is an empty string the callback is removed.  This has only
 		effect if {buf} has 'buftype' set to "prompt".
@@ -5924,7 +5924,7 @@ prompt_setcallback({buf}, {expr})		*prompt_setcallback()*
 			GetBuffer()->prompt_setcallback(callback)
 <
 
-prompt_setinterrupt({buf}, {expr})		*prompt_setinterrupt()*
+prompt_setinterrupt({buf}, {expr})                       *prompt_setinterrupt()*
 		Set a callback for buffer {buf} to {expr}.  When {expr} is an
 		empty string the callback is removed.  This has only effect if
 		{buf} has 'buftype' set to "prompt".
@@ -5937,7 +5937,7 @@ prompt_setinterrupt({buf}, {expr})		*prompt_setinterrupt()*
 			GetBuffer()->prompt_setinterrupt(callback)
 <
 
-prompt_setprompt({buf}, {text})			*prompt_setprompt()*
+prompt_setprompt({buf}, {text})                             *prompt_setprompt()*
 		Set prompt for buffer {buf} to {text}.  You most likely want
 		{text} to end in a space.
 		The result is only visible if {buf} has 'buftype' set to
@@ -5948,7 +5948,7 @@ prompt_setprompt({buf}, {text})			*prompt_setprompt()*
 			GetBuffer()->prompt_setprompt('command: ')
 <
 
-pum_getpos()						*pum_getpos()*
+pum_getpos()                                                      *pum_getpos()*
 		If the popup menu (see |ins-completion-menu|) is not visible,
 		returns an empty |Dictionary|, otherwise, returns a
 		|Dictionary| with the following keys:
@@ -5961,13 +5961,13 @@ pum_getpos()						*pum_getpos()*
 
 		The values are the same as in |v:event| during |CompleteChanged|.
 
-pumvisible()						*pumvisible()*
+pumvisible()                                                      *pumvisible()*
 		Returns non-zero when the popup menu is visible, zero
 		otherwise.  See |ins-completion-menu|.
 		This can be used to avoid some things that would remove the
 		popup menu.
 
-py3eval({expr})						*py3eval()*
+py3eval({expr})                                                      *py3eval()*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are
@@ -5981,7 +5981,7 @@ py3eval({expr})						*py3eval()*
 			GetExpr()->py3eval()
 <
 
-pyeval({expr})				*pyeval()* *E858* *E859*
+pyeval({expr})                                              *pyeval()* *E858* *E859*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are
@@ -5994,7 +5994,7 @@ pyeval({expr})				*pyeval()* *E858* *E859*
 			GetExpr()->pyeval()
 <
 
-pyxeval({expr})						*pyxeval()*
+pyxeval({expr})                                                      *pyxeval()*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Uses Python 2 or 3, see |python_x| and 'pyxversion'.
@@ -6004,7 +6004,7 @@ pyxeval({expr})						*pyxeval()*
 			GetExpr()->pyxeval()
 <
 
-rand([{expr}])						*rand()*
+rand([{expr}])                                                          *rand()*
 		Return a pseudo-random Number generated with an xoshiro128**
 		algorithm using seed {expr}.  The returned number is 32 bits,
 		also on 64 bits systems, for consistency.
@@ -6023,7 +6023,7 @@ rand([{expr}])						*rand()*
 			seed->rand()
 <
 
-range({expr} [, {max} [, {stride}]])		*range()* *E726* *E727*
+range({expr} [, {max} [, {stride}]])                         *range()* *E726* *E727*
 		Returns a |List| with Numbers:
 		- If only {expr} is specified: [0, 1, ..., {expr} - 1]
 		- If {max} is specified: [{expr}, {expr} + 1, ..., {max}]
@@ -6045,7 +6045,7 @@ range({expr} [, {max} [, {stride}]])		*range()* *E726* *E727*
 			GetExpr()->range()
 <
 
-readblob({fname} [, {offset} [, {size}]])		*readblob()*
+readblob({fname} [, {offset} [, {size}]])                           *readblob()*
 		Read file {fname} in binary mode and return a |Blob|.
 		If {offset} is specified, read the file from the specified
 		offset.  If it is a negative value, it is used as an offset
@@ -6069,7 +6069,7 @@ readblob({fname} [, {offset} [, {size}]])		*readblob()*
 		is truncated.
 		Also see |readfile()| and |writefile()|.
 
-readdir({directory} [, {expr}])				*readdir()*
+readdir({directory} [, {expr}])                                      *readdir()*
 		Return a list with file and directory names in {directory}.
 		You can also use |glob()| if you don't need to do complicated
 		things, such as limiting the number of matches.
@@ -6103,7 +6103,7 @@ readdir({directory} [, {expr}])				*readdir()*
 			GetDirName()->readdir()
 <
 
-readfile({fname} [, {type} [, {max}]])			*readfile()*
+readfile({fname} [, {type} [, {max}]])                              *readfile()*
 		Read file {fname} and return a |List|, each line of the file
 		as an item.  Lines are broken at NL characters.  Macintosh
 		files separated with CR will result in a single long line
@@ -6140,7 +6140,7 @@ readfile({fname} [, {type} [, {max}]])			*readfile()*
 			GetFileName()->readfile()
 <
 
-reduce({object}, {func} [, {initial}])		*reduce()* *E998*
+reduce({object}, {func} [, {initial}])                           *reduce()* *E998*
 		{func} is called for every item in {object}, which can be a
 		|List| or a |Blob|.  {func} is called with two arguments: the
 		result so far and current item.  After processing all items
@@ -6160,23 +6160,23 @@ reduce({object}, {func} [, {initial}])		*reduce()* *E998*
 			echo mylist->reduce({ acc, val -> acc + val }, 0)
 <
 
-reg_executing()					*reg_executing()*
+reg_executing()                                                *reg_executing()*
 		Returns the single letter name of the register being executed.
 		Returns an empty string when no register is being executed.
 		See |@|.
 
-reg_recorded()					*reg_recorded()*
+reg_recorded()                                                  *reg_recorded()*
 		Returns the single letter name of the last recorded register.
 		Returns an empty string when nothing was recorded yet.
 		See |q| and |Q|.
 
-reg_recording()					*reg_recording()*
+reg_recording()                                                *reg_recording()*
 		Returns the single letter name of the register being recorded.
 		Returns an empty string when not recording.  See |q|.
 
 reltime()
 reltime({start})
-reltime({start}, {end})					*reltime()*
+reltime({start}, {end})                                              *reltime()*
 		Return an item that represents a time value.  The item is a
 		list with items that depend on the system.
 		The item can be passed to |reltimestr()| to convert it to a
@@ -6199,7 +6199,7 @@ reltime({start}, {end})					*reltime()*
 <
 		Note: |localtime()| returns the current (non-relative) time.
 
-reltimefloat({time})					*reltimefloat()*
+reltimefloat({time})                                            *reltimefloat()*
 		Return a Float that represents the time value of {time}.
 		Unit of time is seconds.
 		Example:
@@ -6214,7 +6214,7 @@ reltimefloat({time})					*reltimefloat()*
 			reltime(start)->reltimefloat()
 <
 
-reltimestr({time})					*reltimestr()*
+reltimestr({time})                                                *reltimestr()*
 		Return a String that represents the time value of {time}.
 		This is the number of seconds, a dot and the number of
 		microseconds.  Example: >vim
@@ -6233,7 +6233,7 @@ reltimestr({time})					*reltimestr()*
 <
 
 remove({list}, {idx})
-remove({list}, {idx}, {end})				*remove()*
+remove({list}, {idx}, {end})                                          *remove()*
 		Without {end}: Remove the item at {idx} from |List| {list} and
 		return the item.
 		With {end}: Remove items from {idx} to {end} (inclusive) and
@@ -6273,7 +6273,7 @@ remove({dict}, {key})
 <		If there is no {key} in {dict} this is an error.
 		Returns zero on error.
 
-rename({from}, {to})					*rename()*
+rename({from}, {to})                                                  *rename()*
 		Rename the file by the name {from} to the name {to}.  This
 		should also work to move files across file systems.  The
 		result is a Number, which is 0 if the file was renamed
@@ -6285,7 +6285,7 @@ rename({from}, {to})					*rename()*
 			GetOldName()->rename(newname)
 <
 
-repeat({expr}, {count})					*repeat()*
+repeat({expr}, {count})                                               *repeat()*
 		Repeat {expr} {count} times and return the concatenated
 		result.  Example: >vim
 			let separator = repeat('-', 80)
@@ -6299,7 +6299,7 @@ repeat({expr}, {count})					*repeat()*
 			mylist->repeat(count)
 <
 
-resolve({filename})				*resolve()* *E655*
+resolve({filename})                                             *resolve()* *E655*
 		On MS-Windows, when {filename} is a shortcut (a .lnk file),
 		returns the path the shortcut points to in a simplified form.
 		On Unix, repeat resolving symbolic links in all path
@@ -6316,7 +6316,7 @@ resolve({filename})				*resolve()* *E655*
 			GetName()->resolve()
 <
 
-reverse({object})						*reverse()*
+reverse({object})                                                    *reverse()*
 		Reverse the order of items in {object} in-place.
 		{object} can be a |List| or a |Blob|.
 		Returns {object}.
@@ -6327,7 +6327,7 @@ reverse({object})						*reverse()*
 			mylist->reverse()
 <
 
-round({expr})						*round()*
+round({expr})                                                          *round()*
 		Round off {expr} to the nearest integral value and return it
 		as a |Float|.  If {expr} lies halfway between two integral
 		values, then use the larger one (away from zero).
@@ -6345,28 +6345,28 @@ round({expr})						*round()*
 			Compute()->round()
 <
 
-rpcnotify({channel}, {event} [, {args}...])		*rpcnotify()*
+rpcnotify({channel}, {event} [, {args}...])                        *rpcnotify()*
 		Sends {event} to {channel} via |RPC| and returns immediately.
 		If {channel} is 0, the event is broadcast to all channels.
 		Example: >vim
 			au VimLeave call rpcnotify(0, "leaving")
 <
 
-rpcrequest({channel}, {method} [, {args}...])		*rpcrequest()*
+rpcrequest({channel}, {method} [, {args}...])                     *rpcrequest()*
 		Sends a request to {channel} to invoke {method} via
 		|RPC| and blocks until a response is received.
 		Example: >vim
 			let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
 <
 
-rpcstart({prog} [, {argv}])				*rpcstart()*
+rpcstart({prog} [, {argv}])                                         *rpcstart()*
 		Deprecated. Replace  >vim
 			let id = rpcstart('prog', ['arg1', 'arg2'])
 <		with >vim
 			let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
 <
 
-rubyeval({expr})						*rubyeval()*
+rubyeval({expr})                                                    *rubyeval()*
 		Evaluate Ruby expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers, floats and strings are returned as they are (strings
@@ -6380,7 +6380,7 @@ rubyeval({expr})						*rubyeval()*
 			GetRubyExpr()->rubyeval()
 <
 
-screenattr({row}, {col})				*screenattr()*
+screenattr({row}, {col})                                          *screenattr()*
 		Like |screenchar()|, but return the attribute.  This is a rather
 		arbitrary number that can only be used to compare to the
 		attribute at other positions.
@@ -6390,7 +6390,7 @@ screenattr({row}, {col})				*screenattr()*
 			GetRow()->screenattr(col)
 <
 
-screenchar({row}, {col})				*screenchar()*
+screenchar({row}, {col})                                          *screenchar()*
 		The result is a Number, which is the character at position
 		[row, col] on the screen.  This works for every possible
 		screen position, also status lines, window separators and the
@@ -6404,7 +6404,7 @@ screenchar({row}, {col})				*screenchar()*
 			GetRow()->screenchar(col)
 <
 
-screenchars({row}, {col})				*screenchars()*
+screenchars({row}, {col})                                        *screenchars()*
 		The result is a List of Numbers.  The first number is the same
 		as what |screenchar()| returns.  Further numbers are
 		composing characters on top of the base character.
@@ -6415,7 +6415,7 @@ screenchars({row}, {col})				*screenchars()*
 			GetRow()->screenchars(col)
 <
 
-screencol()						*screencol()*
+screencol()                                                        *screencol()*
 		The result is a Number, which is the current screen column of
 		the cursor. The leftmost column has number 1.
 		This function is mainly used for testing.
@@ -6430,7 +6430,7 @@ screencol()						*screencol()*
 			noremap GG <Cmd>echom screencol()<Cr>
 <
 
-screenpos({winid}, {lnum}, {col})			*screenpos()*
+screenpos({winid}, {lnum}, {col})                                  *screenpos()*
 		The result is a Dict with the screen position of the text
 		character in window {winid} at buffer line {lnum} and column
 		{col}.  {col} is a one-based byte index.
@@ -6458,7 +6458,7 @@ screenpos({winid}, {lnum}, {col})			*screenpos()*
 			GetWinid()->screenpos(lnum, col)
 <
 
-screenrow()						*screenrow()*
+screenrow()                                                        *screenrow()*
 		The result is a Number, which is the current screen row of the
 		cursor.  The top line has number one.
 		This function is mainly used for testing.
@@ -6466,7 +6466,7 @@ screenrow()						*screenrow()*
 
 		Note: Same restrictions as with |screencol()|.
 
-screenstring({row}, {col})				*screenstring()*
+screenstring({row}, {col})                                      *screenstring()*
 		The result is a String that contains the base character and
 		any composing characters at position [row, col] on the screen.
 		This is like |screenchars()| but returning a String with the
@@ -6478,7 +6478,7 @@ screenstring({row}, {col})				*screenstring()*
 			GetRow()->screenstring(col)
 <
 
-search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])	*search()*
+search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]]) *search()*
 		Search for regexp pattern {pattern}.  The search starts at the
 		cursor position (you can use |cursor()| to set it).
 
@@ -6583,7 +6583,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])	*search()*
 			GetPattern()->search()
 <
 
-searchcount([{options}])				*searchcount()*
+searchcount([{options}])                                         *searchcount()*
 		Get or update the last search count, like what is displayed
 		without the "S" flag in 'shortmess'.  This works even if
 		'shortmess' does contain the "S" flag.
@@ -6708,7 +6708,7 @@ searchcount([{options}])				*searchcount()*
 			GetSearchOpts()->searchcount()
 <
 
-searchdecl({name} [, {global} [, {thisblock}]])	*searchdecl()*
+searchdecl({name} [, {global} [, {thisblock}]])                   *searchdecl()*
 		Search for the declaration of {name}.
 
 		With a non-zero {global} argument it works like |gD|, find
@@ -6730,7 +6730,7 @@ searchdecl({name} [, {global} [, {thisblock}]])	*searchdecl()*
 			GetName()->searchdecl()
 <
 
-						*searchpair()*
+                                                                  *searchpair()*
 searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeout}]]]])
 		Search for the match of a nested start-end pair.  This can be
 		used to find the "endif" that matches an "if", while other
@@ -6816,7 +6816,7 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeo
 			     \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')
 <
 
-						*searchpairpos()*
+                                                               *searchpairpos()*
 searchpairpos({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeout}]]]])
 		Same as |searchpair()|, but returns a |List| with the line and
 		column position of the match. The first element of the |List|
@@ -6828,7 +6828,7 @@ searchpairpos({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {ti
 <
 		See |match-parens| for a bigger and more useful example.
 
-						*searchpos()*
+                                                                   *searchpos()*
 searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		Same as |search()|, but returns a |List| with the line and
 		column position of the match. The first element of the |List|
@@ -6848,14 +6848,14 @@ searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 			GetPattern()->searchpos()
 <
 
-serverlist()						*serverlist()*
+serverlist()                                                      *serverlist()*
 		Returns a list of server addresses, or empty if all servers
 		were stopped. |serverstart()| |serverstop()|
 		Example: >vim
 			echo serverlist()
 <
 
-serverstart([{address}])				*serverstart()*
+serverstart([{address}])                                         *serverstart()*
 		Opens a socket or named pipe at {address} and listens for
 		|RPC| messages. Clients can send |API| commands to the
 		returned address to control Nvim.
@@ -6889,13 +6889,13 @@ serverstart([{address}])				*serverstart()*
 			echo serverstart('::1:12345')
 <
 
-serverstop({address})					*serverstop()*
+serverstop({address})                                             *serverstop()*
 		Closes the pipe or socket at {address}.
 		Returns TRUE if {address} is valid, else FALSE.
 		If |v:servername| is stopped it is set to the next available
 		address in |serverlist()|.
 
-setbufline({buf}, {lnum}, {text})			*setbufline()*
+setbufline({buf}, {lnum}, {text})                                 *setbufline()*
 		Set line {lnum} to {text} in buffer {buf}.  This works like
 		|setline()| for the specified buffer.
 
@@ -6924,7 +6924,7 @@ setbufline({buf}, {lnum}, {text})			*setbufline()*
 			GetText()->setbufline(buf, lnum)
 <
 
-setbufvar({buf}, {varname}, {val})			*setbufvar()*
+setbufvar({buf}, {varname}, {val})                                 *setbufvar()*
 		Set option or local variable {varname} in buffer {buf} to
 		{val}.
 		This also works for a global or local window option, but it
@@ -6943,7 +6943,7 @@ setbufvar({buf}, {varname}, {val})			*setbufvar()*
 			GetValue()->setbufvar(buf, varname)
 <
 
-setcellwidths({list})				*setcellwidths()*
+setcellwidths({list})                                          *setcellwidths()*
 		Specify overrides for cell widths of character ranges.  This
 		tells Vim how wide characters are when displayed in the
 		terminal, counted in screen cells.  The values override
@@ -6977,7 +6977,7 @@ setcellwidths({list})				*setcellwidths()*
 		match with what Vim knows about each emoji.  If it doesn't
 		look right you need to adjust the {list} argument.
 
-setcharpos({expr}, {list})				*setcharpos()*
+setcharpos({expr}, {list})                                        *setcharpos()*
 		Same as |setpos()| but uses the specified column number as the
 		character index instead of the byte index in the line.
 
@@ -6992,7 +6992,7 @@ setcharpos({expr}, {list})				*setcharpos()*
 			GetPosition()->setcharpos('.')
 <
 
-setcharsearch({dict})				*setcharsearch()*
+setcharsearch({dict})                                          *setcharsearch()*
 		Set the current character search information to {dict},
 		which contains one or more of the following entries:
 
@@ -7016,7 +7016,7 @@ setcharsearch({dict})				*setcharsearch()*
 			SavedSearch()->setcharsearch()
 <
 
-setcmdline({str} [, {pos}])				*setcmdline()*
+setcmdline({str} [, {pos}])                                       *setcmdline()*
 		Set the command line to {str} and set the cursor position to
 		{pos}.
 		If {pos} is omitted, the cursor is positioned after the text.
@@ -7027,7 +7027,7 @@ setcmdline({str} [, {pos}])				*setcmdline()*
 			GetText()->setcmdline()
 <
 
-setcmdpos({pos})					*setcmdpos()*
+setcmdpos({pos})                                                   *setcmdpos()*
 		Set the cursor position in the command line to byte position
 		{pos}.  The first position is 1.
 		Use |getcmdpos()| to obtain the current position.
@@ -7047,7 +7047,7 @@ setcmdpos({pos})					*setcmdpos()*
 <
 
 setcursorcharpos({lnum}, {col} [, {off}])
-setcursorcharpos({list})				*setcursorcharpos()*
+setcursorcharpos({list})                                    *setcursorcharpos()*
 		Same as |cursor()| but uses the specified column number as the
 		character index instead of the byte index in the line.
 
@@ -7062,7 +7062,7 @@ setcursorcharpos({list})				*setcursorcharpos()*
 			GetCursorPos()->setcursorcharpos()
 <
 
-setenv({name}, {val})					*setenv()*
+setenv({name}, {val})                                                 *setenv()*
 		Set environment variable {name} to {val}.  Example: >vim
 			call setenv('HOME', '/home/myhome')
 
@@ -7074,7 +7074,7 @@ setenv({name}, {val})					*setenv()*
 			GetPath()->setenv('PATH')
 <
 
-setfperm({fname}, {mode})			*setfperm()* *chmod*
+setfperm({fname}, {mode})                                     *setfperm()* *chmod*
 		Set the file permissions for {fname} to {mode}.
 		{mode} must be a string with 9 characters.  It is of the form
 		"rwxrwxrwx", where each group of "rwx" flags represent, in
@@ -7094,7 +7094,7 @@ setfperm({fname}, {mode})			*setfperm()* *chmod*
 <
 		To read permissions see |getfperm()|.
 
-setline({lnum}, {text})					*setline()*
+setline({lnum}, {text})                                              *setline()*
 		Set line {lnum} of the current buffer to {text}.  To insert
 		lines use |append()|. To set lines in another buffer use
 		|setbufline()|.
@@ -7126,7 +7126,7 @@ setline({lnum}, {text})					*setline()*
 			GetText()->setline(lnum)
 <
 
-setloclist({nr}, {list} [, {action} [, {what}]])	*setloclist()*
+setloclist({nr}, {list} [, {action} [, {what}]])                  *setloclist()*
 		Create or replace or add to the location list for window {nr}.
 		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero the current window is used.
@@ -7147,7 +7147,7 @@ setloclist({nr}, {list} [, {action} [, {what}]])	*setloclist()*
 			GetLoclist()->setloclist(winnr)
 <
 
-setmatches({list} [, {win}])				*setmatches()*
+setmatches({list} [, {win}])                                      *setmatches()*
 		Restores a list of matches saved by |getmatches()| for the
 		current window.  Returns 0 if successful, otherwise -1.  All
 		current matches are cleared before the list is restored.  See
@@ -7159,7 +7159,7 @@ setmatches({list} [, {win}])				*setmatches()*
 			GetMatches()->setmatches()
 <
 
-setpos({expr}, {list})					*setpos()*
+setpos({expr}, {list})                                                *setpos()*
 		Set the position for String {expr}.  Possible values:
 			.	the cursor
 			'x	mark x
@@ -7212,7 +7212,7 @@ setpos({expr}, {list})					*setpos()*
 			GetPosition()->setpos('.')
 <
 
-setqflist({list} [, {action} [, {what}]])		*setqflist()*
+setqflist({list} [, {action} [, {what}]])                          *setqflist()*
 		Create or replace or add to the quickfix list.
 
 		If the optional {what} dictionary argument is supplied, then
@@ -7328,7 +7328,7 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 			GetErrorlist()->setqflist()
 <
 
-setreg({regname}, {value} [, {options}])			*setreg()*
+setreg({regname}, {value} [, {options}])                              *setreg()*
 		Set the register {regname} to {value}.
 		If {regname} is "" or "@", the unnamed register '"' is used.
 		The {regname} argument is a string.
@@ -7389,7 +7389,7 @@ setreg({regname}, {value} [, {options}])			*setreg()*
 			GetText()->setreg('a')
 <
 
-settabvar({tabnr}, {varname}, {val})			*settabvar()*
+settabvar({tabnr}, {varname}, {val})                               *settabvar()*
 		Set tab-local variable {varname} to {val} in tab page {tabnr}.
 		|t:var|
 		The {varname} argument is a string.
@@ -7402,7 +7402,7 @@ settabvar({tabnr}, {varname}, {val})			*settabvar()*
 			GetValue()->settabvar(tab, name)
 <
 
-settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
+settabwinvar({tabnr}, {winnr}, {varname}, {val})                *settabwinvar()*
 		Set option or local variable {varname} in window {winnr} to
 		{val}.
 		Tabs are numbered starting with one.  For the current tabpage
@@ -7423,7 +7423,7 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
 			GetValue()->settabwinvar(tab, winnr, name)
 <
 
-settagstack({nr}, {dict} [, {action}])		*settagstack()*
+settagstack({nr}, {dict} [, {action}])                           *settagstack()*
 		Modify the tag stack of the window {nr} using {dict}.
 		{nr} can be the window number or the |window-ID|.
 
@@ -7461,7 +7461,7 @@ settagstack({nr}, {dict} [, {action}])		*settagstack()*
 			GetStack()->settagstack(winnr)
 <
 
-setwinvar({nr}, {varname}, {val})			*setwinvar()*
+setwinvar({nr}, {varname}, {val})                                  *setwinvar()*
 		Like |settabwinvar()| for the current tab page.
 		Examples: >vim
 			call setwinvar(1, "&list", 0)
@@ -7472,7 +7472,7 @@ setwinvar({nr}, {varname}, {val})			*setwinvar()*
 			GetValue()->setwinvar(winnr, name)
 <
 
-sha256({string})						*sha256()*
+sha256({string})                                                      *sha256()*
 		Returns a String with 64 hex characters, which is the SHA256
 		checksum of {string}.
 
@@ -7480,7 +7480,7 @@ sha256({string})						*sha256()*
 			GetText()->sha256()
 <
 
-shellescape({string} [, {special}])			*shellescape()*
+shellescape({string} [, {special}])                              *shellescape()*
 		Escape {string} for use as a shell command argument.
 
 		On Windows when 'shellslash' is not set, encloses {string} in
@@ -7515,7 +7515,7 @@ shellescape({string} [, {special}])			*shellescape()*
 			GetCommand()->shellescape()
 <
 
-shiftwidth([{col}])					*shiftwidth()*
+shiftwidth([{col}])                                               *shiftwidth()*
 		Returns the effective value of 'shiftwidth'. This is the
 		'shiftwidth' value unless it is zero, in which case it is the
 		'tabstop' value.  To be backwards compatible in indent
@@ -7541,7 +7541,7 @@ shiftwidth([{col}])					*shiftwidth()*
 <
 
 sign_define({name} [, {dict}])
-sign_define({list})					*sign_define()*
+sign_define({list})                                              *sign_define()*
 		Define a new sign named {name} or modify the attributes of an
 		existing sign.  This is similar to the |:sign-define| command.
 
@@ -7590,7 +7590,7 @@ sign_define({list})					*sign_define()*
 			GetSignList()->sign_define()
 <
 
-sign_getdefined([{name}])				*sign_getdefined()*
+sign_getdefined([{name}])                                    *sign_getdefined()*
 		Get a list of defined signs and their attributes.
 		This is similar to the |:sign-list| command.
 
@@ -7629,7 +7629,7 @@ sign_getdefined([{name}])				*sign_getdefined()*
 			GetSignList()->sign_getdefined()
 <
 
-sign_getplaced([{buf} [, {dict}]])			*sign_getplaced()*
+sign_getplaced([{buf} [, {dict}]])                            *sign_getplaced()*
 		Return a list of signs placed in a buffer or all the buffers.
 		This is similar to the |:sign-place-list| command.
 
@@ -7693,7 +7693,7 @@ sign_getplaced([{buf} [, {dict}]])			*sign_getplaced()*
 			GetBufname()->sign_getplaced()
 <
 
-sign_jump({id}, {group}, {buf})				*sign_jump()*
+sign_jump({id}, {group}, {buf})                                    *sign_jump()*
 		Open the buffer {buf} or jump to the window that contains
 		{buf} and position the cursor at sign {id} in group {group}.
 		This is similar to the |:sign-jump| command.
@@ -7712,7 +7712,7 @@ sign_jump({id}, {group}, {buf})				*sign_jump()*
 			GetSignid()->sign_jump()
 <
 
-sign_place({id}, {group}, {name}, {buf} [, {dict}])	*sign_place()*
+sign_place({id}, {group}, {name}, {buf} [, {dict}])               *sign_place()*
 		Place the sign defined as {name} at line {lnum} in file or
 		buffer {buf} and assign {id} and {group} to sign.  This is
 		similar to the |:sign-place| command.
@@ -7764,7 +7764,7 @@ sign_place({id}, {group}, {name}, {buf} [, {dict}])	*sign_place()*
 			GetSignid()->sign_place(group, name, expr)
 <
 
-sign_placelist({list})				*sign_placelist()*
+sign_placelist({list})                                        *sign_placelist()*
 		Place one or more signs.  This is similar to the
 		|sign_place()| function.  The {list} argument specifies the
 		List of signs to place. Each list item is a dict with the
@@ -7827,7 +7827,7 @@ sign_placelist({list})				*sign_placelist()*
 <
 
 sign_undefine([{name}])
-sign_undefine({list})				*sign_undefine()*
+sign_undefine({list})                                          *sign_undefine()*
 		Deletes a previously defined sign {name}. This is similar to
 		the |:sign-undefine| command. If {name} is not supplied, then
 		deletes all the defined signs.
@@ -7853,7 +7853,7 @@ sign_undefine({list})				*sign_undefine()*
 			GetSignlist()->sign_undefine()
 <
 
-sign_unplace({group} [, {dict}])			*sign_unplace()*
+sign_unplace({group} [, {dict}])                                *sign_unplace()*
 		Remove a previously placed sign in one or more buffers.  This
 		is similar to the |:sign-unplace| command.
 
@@ -7899,7 +7899,7 @@ sign_unplace({group} [, {dict}])			*sign_unplace()*
 			GetSigngroup()->sign_unplace()
 <
 
-sign_unplacelist({list})				*sign_unplacelist()*
+sign_unplacelist({list})                                    *sign_unplacelist()*
 		Remove previously placed signs from one or more buffers.  This
 		is similar to the |sign_unplace()| function.
 
@@ -7931,7 +7931,7 @@ sign_unplacelist({list})				*sign_unplacelist()*
 			GetSignlist()->sign_unplacelist()
 <
 
-simplify({filename})					*simplify()*
+simplify({filename})                                                *simplify()*
 		Simplify the file name as much as possible without changing
 		the meaning.  Shortcuts (on MS-Windows) or symbolic links (on
 		Unix) are not resolved.  If the first path component in
@@ -7952,7 +7952,7 @@ simplify({filename})					*simplify()*
 			GetName()->simplify()
 <
 
-sin({expr})							*sin()*
+sin({expr})                                                              *sin()*
 		Return the sine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
@@ -7966,7 +7966,7 @@ sin({expr})							*sin()*
 			Compute()->sin()
 <
 
-sinh({expr})							*sinh()*
+sinh({expr})                                                            *sinh()*
 		Return the hyperbolic sine of {expr} as a |Float| in the range
 		[-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -7981,7 +7981,7 @@ sinh({expr})							*sinh()*
 			Compute()->sinh()
 <
 
-slice({expr}, {start} [, {end}])				*slice()*
+slice({expr}, {start} [, {end}])                                       *slice()*
 		Similar to using a |slice| "expr[start : end]", but "end" is
 		used exclusive.  And for a string the indexes are used as
 		character indexes instead of byte indexes.
@@ -7994,7 +7994,7 @@ slice({expr}, {start} [, {end}])				*slice()*
 			GetList()->slice(offset)
 <
 
-sockconnect({mode}, {address} [, {opts}])		*sockconnect()*
+sockconnect({mode}, {address} [, {opts}])                        *sockconnect()*
 		Connect a socket to an address. If {mode} is "pipe" then
 		{address} should be the path of a local domain socket (on
 		unix) or named pipe (on Windows). If {mode} is "tcp" then
@@ -8019,7 +8019,7 @@ sockconnect({mode}, {address} [, {opts}])		*sockconnect()*
 		  - The channel ID on success (greater than zero)
 		  - 0 on invalid arguments or connection failure.
 
-sort({list} [, {func} [, {dict}]])			*sort()* *E702*
+sort({list} [, {func} [, {dict}]])                                 *sort()* *E702*
 		Sort the items in {list} in-place.  Returns {list}.
 
 		If you want a list to remain unmodified make a copy first: >vim
@@ -8095,7 +8095,7 @@ sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 			eval mylist->sort({i1, i2 -> i1 - i2})
 <
 
-soundfold({word})					*soundfold()*
+soundfold({word})                                                  *soundfold()*
 		Return the sound-folded equivalent of {word}.  Uses the first
 		language in 'spelllang' for the current window that supports
 		soundfolding.  'spell' must be set.  When no sound folding is
@@ -8107,7 +8107,7 @@ soundfold({word})					*soundfold()*
 			GetWord()->soundfold()
 <
 
-spellbadword([{sentence}])				*spellbadword()*
+spellbadword([{sentence}])                                      *spellbadword()*
 		Without argument: The result is the badly spelled word under
 		or after the cursor.  The cursor is moved to the start of the
 		bad word.  When no bad word is found in the cursor line the
@@ -8135,7 +8135,7 @@ spellbadword([{sentence}])				*spellbadword()*
 			GetText()->spellbadword()
 <
 
-spellsuggest({word} [, {max} [, {capital}]])		*spellsuggest()*
+spellsuggest({word} [, {max} [, {capital}]])                    *spellsuggest()*
 		Return a |List| with spelling suggestions to replace {word}.
 		When {max} is given up to this number of suggestions are
 		returned.  Otherwise up to 25 suggestions are returned.
@@ -8160,7 +8160,7 @@ spellsuggest({word} [, {max} [, {capital}]])		*spellsuggest()*
 			GetWord()->spellsuggest()
 <
 
-split({string} [, {pattern} [, {keepempty}]])		*split()*
+split({string} [, {pattern} [, {keepempty}]])                          *split()*
 		Make a |List| out of {string}.  When {pattern} is omitted or
 		empty each white-separated sequence of characters becomes an
 		item.
@@ -8189,7 +8189,7 @@ split({string} [, {pattern} [, {keepempty}]])		*split()*
 			GetString()->split()
 <
 
-sqrt({expr})							*sqrt()*
+sqrt({expr})                                                            *sqrt()*
 		Return the non-negative square root of Float {expr} as a
 		|Float|.
 		{expr} must evaluate to a |Float| or a |Number|.  When {expr}
@@ -8206,7 +8206,7 @@ sqrt({expr})							*sqrt()*
 			Compute()->sqrt()
 <
 
-srand([{expr}])						*srand()*
+srand([{expr}])                                                        *srand()*
 		Initialize seed used by |rand()|:
 		- If {expr} is not given, seed values are initialized by
 		  reading from /dev/urandom, if possible, or using time(NULL)
@@ -8224,7 +8224,7 @@ srand([{expr}])						*srand()*
 			userinput->srand()
 <
 
-stdioopen({opts})					*stdioopen()*
+stdioopen({opts})                                                  *stdioopen()*
 		With |--headless| this opens stdin and stdout as a |channel|.
 		May be called only once. See |channel-stdio|. stderr is not
 		handled by this function, see |v:stderr|.
@@ -8245,7 +8245,7 @@ stdioopen({opts})					*stdioopen()*
 		  - |channel-id| on success (value is always 1)
 		  - 0 on invalid arguments
 
-stdpath({what})					*stdpath()* *E6100*
+stdpath({what})                                                *stdpath()* *E6100*
 		Returns |standard-path| locations of various default files and
 		directories.
 
@@ -8267,7 +8267,7 @@ stdpath({what})					*stdpath()* *E6100*
 			echo stdpath("config")
 <
 
-str2float({string} [, {quoted}])			*str2float()*
+str2float({string} [, {quoted}])                                   *str2float()*
 		Convert String {string} to a Float.  This mostly works the
 		same as when using a floating point number in an expression,
 		see |floating-point-format|.  But it's a bit more permissive.
@@ -8290,7 +8290,7 @@ str2float({string} [, {quoted}])			*str2float()*
 			let f = text->substitute(',', '', 'g')->str2float()
 <
 
-str2list({string} [, {utf8}])				*str2list()*
+str2list({string} [, {utf8}])                                       *str2list()*
 		Return a list containing the number values which represent
 		each character in String {string}.  Examples: >vim
 			echo str2list(" ")		" returns [32]
@@ -8306,7 +8306,7 @@ str2list({string} [, {utf8}])				*str2list()*
 			GetString()->str2list()
 <
 
-str2nr({string} [, {base}])				*str2nr()*
+str2nr({string} [, {base}])                                           *str2nr()*
 		Convert string {string} to a number.
 		{base} is the conversion base, it can be 2, 8, 10 or 16.
 		When {quoted} is present and non-zero then embedded single
@@ -8329,7 +8329,7 @@ str2nr({string} [, {base}])				*str2nr()*
 			GetText()->str2nr()
 <
 
-strcharlen({string})					*strcharlen()*
+strcharlen({string})                                              *strcharlen()*
 		The result is a Number, which is the number of characters
 		in String {string}.  Composing characters are ignored.
 		|strchars()| can count the number of characters, counting
@@ -8343,7 +8343,7 @@ strcharlen({string})					*strcharlen()*
 			GetText()->strcharlen()
 <
 
-strcharpart({src}, {start} [, {len} [, {skipcc}]])	*strcharpart()*
+strcharpart({src}, {start} [, {len} [, {skipcc}]])               *strcharpart()*
 		Like |strpart()| but using character index and length instead
 		of byte index and length.
 		When {skipcc} is omitted or zero, composing characters are
@@ -8362,7 +8362,7 @@ strcharpart({src}, {start} [, {len} [, {skipcc}]])	*strcharpart()*
 			GetText()->strcharpart(5)
 <
 
-strchars({string} [, {skipcc}])				*strchars()*
+strchars({string} [, {skipcc}])                                     *strchars()*
 		The result is a Number, which is the number of characters
 		in String {string}.
 		When {skipcc} is omitted or zero, composing characters are
@@ -8394,7 +8394,7 @@ strchars({string} [, {skipcc}])				*strchars()*
 			GetText()->strchars()
 <
 
-strdisplaywidth({string} [, {col}])		*strdisplaywidth()*
+strdisplaywidth({string} [, {col}])                          *strdisplaywidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies on the screen when it starts at {col}
 		(first column is zero).  When {col} is omitted zero is used.
@@ -8412,7 +8412,7 @@ strdisplaywidth({string} [, {col}])		*strdisplaywidth()*
 			GetText()->strdisplaywidth()
 <
 
-strftime({format} [, {time}])				*strftime()*
+strftime({format} [, {time}])                                       *strftime()*
 		The result is a String, which is a formatted date and time, as
 		specified by the {format} string.  The given {time} is used,
 		or the current time if no time is given.  The accepted
@@ -8433,7 +8433,7 @@ strftime({format} [, {time}])				*strftime()*
 			GetFormat()->strftime()
 <
 
-strgetchar({str}, {index})				*strgetchar()*
+strgetchar({str}, {index})                                        *strgetchar()*
 		Get a Number corresponding to the character at {index} in
 		{str}.  This uses a zero-based character index, not a byte
 		index.  Composing characters are considered separate
@@ -8446,7 +8446,7 @@ strgetchar({str}, {index})				*strgetchar()*
 			GetText()->strgetchar(5)
 <
 
-stridx({haystack}, {needle} [, {start}])			*stridx()*
+stridx({haystack}, {needle} [, {start}])                              *stridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the first occurrence of the String {needle}.
 		If {start} is specified, the search starts at index {start}.
@@ -8469,7 +8469,7 @@ stridx({haystack}, {needle} [, {start}])			*stridx()*
 			GetHaystack()->stridx(needle)
 <
 
-string({expr})						*string()*
+string({expr})                                                        *string()*
 		Return {expr} converted to a String.  If {expr} is a Number,
 		Float, String, Blob or a composition of them, then the result
 		can be parsed back with |eval()|.
@@ -8497,7 +8497,7 @@ string({expr})						*string()*
 			mylist->string()
 <
 
-strlen({string})						*strlen()*
+strlen({string})                                                      *strlen()*
 		The result is a Number, which is the length of the String
 		{string} in bytes.
 		If the argument is a Number it is first converted to a String.
@@ -8510,7 +8510,7 @@ strlen({string})						*strlen()*
 			GetString()->strlen()
 <
 
-strpart({src}, {start} [, {len} [, {chars}]])		*strpart()*
+strpart({src}, {start} [, {len} [, {chars}]])                        *strpart()*
 		The result is a String, which is part of {src}, starting from
 		byte {start}, with the byte length {len}.
 		When {chars} is present and TRUE then {len} is the number of
@@ -8539,7 +8539,7 @@ strpart({src}, {start} [, {len} [, {chars}]])		*strpart()*
 			GetText()->strpart(5)
 <
 
-strptime({format}, {timestring})				*strptime()*
+strptime({format}, {timestring})                                    *strptime()*
 		The result is a Number, which is a unix timestamp representing
 		the date and time in {timestring}, which is expected to match
 		the format specified in {format}.
@@ -8567,7 +8567,7 @@ strptime({format}, {timestring})				*strptime()*
 			GetFormat()->strptime(timestring)
 <
 
-strridx({haystack}, {needle} [, {start}])			*strridx()*
+strridx({haystack}, {needle} [, {start}])                            *strridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the last occurrence of the String {needle}.
 		When {start} is specified, matches beyond this index are
@@ -8589,7 +8589,7 @@ strridx({haystack}, {needle} [, {start}])			*strridx()*
 			GetHaystack()->strridx(needle)
 <
 
-strtrans({string})					*strtrans()*
+strtrans({string})                                                  *strtrans()*
 		The result is a String, which is {string} with all unprintable
 		characters translated into printable characters |'isprint'|.
 		Like they are shown in a window.  Example: >vim
@@ -8603,7 +8603,7 @@ strtrans({string})					*strtrans()*
 			GetString()->strtrans()
 <
 
-strutf16len({string} [, {countcc}])			*strutf16len()*
+strutf16len({string} [, {countcc}])                              *strutf16len()*
 		The result is a Number, which is the number of UTF-16 code
 		units in String {string} (after converting it to UTF-16).
 
@@ -8626,7 +8626,7 @@ strutf16len({string} [, {countcc}])			*strutf16len()*
 			GetText()->strutf16len()
 <
 
-strwidth({string})					*strwidth()*
+strwidth({string})                                                  *strwidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies.  A Tab character is counted as one
 		cell, alternatively use |strdisplaywidth()|.
@@ -8639,7 +8639,7 @@ strwidth({string})					*strwidth()*
 			GetString()->strwidth()
 <
 
-submatch({nr} [, {list}])				*submatch()* *E935*
+submatch({nr} [, {list}])                                      *submatch()* *E935*
 		Only for an expression in a |:substitute| command or
 		substitute() function.
 		Returns the {nr}th submatch of the matched text.  When {nr}
@@ -8671,7 +8671,7 @@ submatch({nr} [, {list}])				*submatch()* *E935*
 			GetNr()->submatch()
 <
 
-substitute({string}, {pat}, {sub}, {flags})		*substitute()*
+substitute({string}, {pat}, {sub}, {flags})                       *substitute()*
 		The result is a String, which is a copy of {string}, in which
 		the first match of {pat} is replaced with {sub}.
 		When {flags} is "g", all matches of {pat} in {string} are
@@ -8718,7 +8718,7 @@ substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 			GetString()->substitute(pat, sub, flags)
 <
 
-swapfilelist()					*swapfilelist()*
+swapfilelist()                                                  *swapfilelist()*
 		Returns a list of swap file names, like what "vim -r" shows.
 		See the |-r| command argument.  The 'directory' option is used
 		for the directories to inspect.  If you only want to get a
@@ -8729,7 +8729,7 @@ swapfilelist()					*swapfilelist()*
 			let swapfiles = swapfilelist()
 			let &directory = save_dir
 
-swapinfo({fname})					*swapinfo()*
+swapinfo({fname})                                                   *swapinfo()*
 		The result is a dictionary, which holds information about the
 		swapfile {fname}. The available fields are:
 			version Vim version
@@ -8751,7 +8751,7 @@ swapinfo({fname})					*swapinfo()*
 			GetFilename()->swapinfo()
 <
 
-swapname({buf})						*swapname()*
+swapname({buf})                                                     *swapname()*
 		The result is the swap file path of the buffer {buf}.
 		For the use of {buf}, see |bufname()| above.
 		If buffer {buf} is the current buffer, the result is equal to
@@ -8762,7 +8762,7 @@ swapname({buf})						*swapname()*
 			GetBufname()->swapname()
 <
 
-synID({lnum}, {col}, {trans})				*synID()*
+synID({lnum}, {col}, {trans})                                          *synID()*
 		The result is a Number, which is the syntax ID at the position
 		{lnum} and {col} in the current window.
 		The syntax ID can be used with |synIDattr()| and
@@ -8788,7 +8788,7 @@ synID({lnum}, {col}, {trans})				*synID()*
 			echo synIDattr(synID(line("."), col("."), 1), "name")
 <
 
-synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
+synIDattr({synID}, {what} [, {mode}])                              *synIDattr()*
 		The result is a String, which is the {what} attribute of
 		syntax ID {synID}.  This can be used to obtain information
 		about a syntax item.
@@ -8834,7 +8834,7 @@ synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
 			echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 <
 
-synIDtrans({synID})					*synIDtrans()*
+synIDtrans({synID})                                               *synIDtrans()*
 		The result is a Number, which is the translated syntax ID of
 		{synID}.  This is the syntax group ID of what is being used to
 		highlight the character.  Highlight links given with
@@ -8846,7 +8846,7 @@ synIDtrans({synID})					*synIDtrans()*
 			echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 <
 
-synconcealed({lnum}, {col})				*synconcealed()*
+synconcealed({lnum}, {col})                                     *synconcealed()*
 		The result is a |List| with currently three items:
 		1. The first item in the list is 0 if the character at the
 		   position {lnum} and {col} is not part of a concealable
@@ -8872,7 +8872,7 @@ synconcealed({lnum}, {col})				*synconcealed()*
 			synconcealed(lnum, 6)   [0, '', 0]
 <
 
-synstack({lnum}, {col})					*synstack()*
+synstack({lnum}, {col})                                             *synstack()*
 		Return a |List|, which is the stack of syntax items at the
 		position {lnum} and {col} in the current window.  {lnum} is
 		used like with |getline()|.  Each item in the List is an ID
@@ -8891,7 +8891,7 @@ synstack({lnum}, {col})					*synstack()*
 		character in a line and the first column in an empty line are
 		valid positions.
 
-system({cmd} [, {input}])				*system()* *E677*
+system({cmd} [, {input}])                                        *system()* *E677*
 		Note: Prefer |vim.system()| in Lua.
 
 		Gets the output of {cmd} as a |string| (|systemlist()| returns
@@ -8944,7 +8944,7 @@ system({cmd} [, {input}])				*system()* *E677*
 			echo GetCmd()->system()
 <
 
-systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
+systemlist({cmd} [, {input} [, {keepempty}]])                     *systemlist()*
 		Same as |system()|, but returns a |List| with lines (parts of
 		output separated by NL) with NULs transformed into NLs. Output
 		is the same as |readfile()| will output with {binary} argument
@@ -8962,7 +8962,7 @@ systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
 			echo GetCmd()->systemlist()
 <
 
-tabpagebuflist([{arg}])				*tabpagebuflist()*
+tabpagebuflist([{arg}])                                       *tabpagebuflist()*
 		The result is a |List|, where each item is the number of the
 		buffer associated with each window in the current tab page.
 		{arg} specifies the number of the tab page to be used. When
@@ -8979,7 +8979,7 @@ tabpagebuflist([{arg}])				*tabpagebuflist()*
 			GetTabpage()->tabpagebuflist()
 <
 
-tabpagenr([{arg}])					*tabpagenr()*
+tabpagenr([{arg}])                                                 *tabpagenr()*
 		The result is a Number, which is the number of the current
 		tab page.  The first tab page has number 1.
 
@@ -8993,7 +8993,7 @@ tabpagenr([{arg}])					*tabpagenr()*
 
 		Returns zero on error.
 
-tabpagewinnr({tabarg} [, {arg}])			*tabpagewinnr()*
+tabpagewinnr({tabarg} [, {arg}])                                *tabpagewinnr()*
 		Like |winnr()| but for tab page {tabarg}.
 		{tabarg} specifies the number of tab page to be used.
 		{arg} is used like with |winnr()|:
@@ -9010,11 +9010,11 @@ tabpagewinnr({tabarg} [, {arg}])			*tabpagewinnr()*
 			GetTabpage()->tabpagewinnr()
 <
 
-tagfiles()						*tagfiles()*
+tagfiles()                                                          *tagfiles()*
 		Returns a |List| with the file names used to search for tags
 		for the current buffer.  This is the 'tags' option expanded.
 
-taglist({expr} [, {filename}])				*taglist()*
+taglist({expr} [, {filename}])                                       *taglist()*
 		Returns a |List| of tags matching the regular expression {expr}.
 
 		If {filename} is passed it is used to prioritize the results
@@ -9060,7 +9060,7 @@ taglist({expr} [, {filename}])				*taglist()*
 		Can also be used as a |method|: >vim
 			GetTagpattern()->taglist()
 
-tan({expr})							*tan()*
+tan({expr})                                                              *tan()*
 		Return the tangent of {expr}, measured in radians, as a |Float|
 		in the range [-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -9075,7 +9075,7 @@ tan({expr})							*tan()*
 			Compute()->tan()
 <
 
-tanh({expr})							*tanh()*
+tanh({expr})                                                            *tanh()*
 		Return the hyperbolic tangent of {expr} as a |Float| in the
 		range [-1, 1].
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -9090,7 +9090,7 @@ tanh({expr})							*tanh()*
 			Compute()->tanh()
 <
 
-tempname()						*tempname()*
+tempname()                                                          *tempname()*
 		Generates a (non-existent) filename located in the Nvim root
 		|tempdir|. Scripts can use the filename as a temporary file.
 		Example: >vim
@@ -9098,7 +9098,7 @@ tempname()						*tempname()*
 			exe "redir > " .. tmpfile
 <
 
-termopen({cmd} [, {opts}])				*termopen()*
+termopen({cmd} [, {opts}])                                          *termopen()*
 		Spawns {cmd} in a new pseudo-terminal session connected
 		to the current (unmodified) buffer. Parameters and behavior
 		are the same as |jobstart()| except "pty", "width", "height",
@@ -9113,7 +9113,7 @@ termopen({cmd} [, {opts}])				*termopen()*
 		except $TERM is set to "xterm-256color". Full behavior is
 		described in |terminal|.
 
-timer_info([{id}])					*timer_info()*
+timer_info([{id}])                                                *timer_info()*
 		Return a list with information about timers.
 		When {id} is given only information about this timer is
 		returned.  When timer {id} does not exist an empty list is
@@ -9132,7 +9132,7 @@ timer_info([{id}])					*timer_info()*
 			GetTimer()->timer_info()
 <
 
-timer_pause({timer}, {paused})			*timer_pause()*
+timer_pause({timer}, {paused})                                   *timer_pause()*
 		Pause or unpause a timer.  A paused timer does not invoke its
 		callback when its time expires.  Unpausing a timer may cause
 		the callback to be invoked almost immediately if enough time
@@ -9149,7 +9149,7 @@ timer_pause({timer}, {paused})			*timer_pause()*
 			GetTimer()->timer_pause(1)
 <
 
-timer_start({time}, {callback} [, {options}])	*timer_start()* *timer*
+timer_start({time}, {callback} [, {options}])              *timer_start()* *timer*
 		Create a timer and return the timer ID.
 
 		{time} is the waiting time in milliseconds. This is the
@@ -9184,7 +9184,7 @@ timer_start({time}, {callback} [, {options}])	*timer_start()* *timer*
 
 <		Not available in the |sandbox|.
 
-timer_stop({timer})					*timer_stop()*
+timer_stop({timer})                                               *timer_stop()*
 		Stop a timer.  The timer callback will no longer be invoked.
 		{timer} is an ID returned by timer_start(), thus it must be a
 		Number.  If {timer} does not exist there is no error.
@@ -9193,12 +9193,12 @@ timer_stop({timer})					*timer_stop()*
 			GetTimer()->timer_stop()
 <
 
-timer_stopall()					*timer_stopall()*
+timer_stopall()                                                *timer_stopall()*
 		Stop all timers.  The timer callbacks will no longer be
 		invoked.  Useful if some timers is misbehaving.  If there are
 		no timers there is no error.
 
-tolower({expr})						*tolower()*
+tolower({expr})                                                      *tolower()*
 		The result is a copy of the String given, with all uppercase
 		characters turned into lowercase (just like applying |gu| to
 		the string).  Returns an empty string on error.
@@ -9207,7 +9207,7 @@ tolower({expr})						*tolower()*
 			GetText()->tolower()
 <
 
-toupper({expr})						*toupper()*
+toupper({expr})                                                      *toupper()*
 		The result is a copy of the String given, with all lowercase
 		characters turned into uppercase (just like applying |gU| to
 		the string).  Returns an empty string on error.
@@ -9216,7 +9216,7 @@ toupper({expr})						*toupper()*
 			GetText()->toupper()
 <
 
-tr({src}, {fromstr}, {tostr})					*tr()*
+tr({src}, {fromstr}, {tostr})                                             *tr()*
 		The result is a copy of the {src} string with all characters
 		which appear in {fromstr} replaced by the character in that
 		position in the {tostr} string.  Thus the first character in
@@ -9236,7 +9236,7 @@ tr({src}, {fromstr}, {tostr})					*tr()*
 			GetText()->tr(from, to)
 <
 
-trim({text} [, {mask} [, {dir}]])				*trim()*
+trim({text} [, {mask} [, {dir}]])                                       *trim()*
 		Return {text} as a String where any character in {mask} is
 		removed from the beginning and/or end of {text}.
 		If {mask} is not given, {mask} is all characters up to 0x20,
@@ -9265,7 +9265,7 @@ trim({text} [, {mask} [, {dir}]])				*trim()*
 			GetText()->trim()
 <
 
-trunc({expr})						*trunc()*
+trunc({expr})                                                          *trunc()*
 		Return the largest integral value with magnitude less than or
 		equal to {expr} as a |Float| (truncate towards zero).
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -9282,7 +9282,7 @@ trunc({expr})						*trunc()*
 			Compute()->trunc()
 <
 
-type({expr})							*type()*
+type({expr})                                                            *type()*
 		The result is a Number representing the type of {expr}.
 		Instead of using the number directly, it is better to use the
 		v:t_ variable that has the value:
@@ -9313,7 +9313,7 @@ type({expr})							*type()*
 			mylist->type()
 <
 
-undofile({name})						*undofile()*
+undofile({name})                                                    *undofile()*
 		Return the name of the undo file that would be used for a file
 		with name {name} when writing.  This uses the 'undodir'
 		option, finding directories that exist.  It does not check if
@@ -9328,7 +9328,7 @@ undofile({name})						*undofile()*
 			GetFilename()->undofile()
 <
 
-undotree()						*undotree()*
+undotree()                                                          *undotree()*
 		Return the current state of the undo tree in a dictionary with
 		the following items:
 		  "seq_last"	The highest undo sequence number used.
@@ -9371,7 +9371,7 @@ undotree()						*undotree()*
 				blocks.  Each item may again have an "alt"
 				item.
 
-uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
+uniq({list} [, {func} [, {dict}]])                                 *uniq()* *E882*
 		Remove second and succeeding copies of repeated adjacent
 		{list} items in-place.  Returns {list}.  If you want a list
 		to remain unmodified make a copy first: >vim
@@ -9385,7 +9385,7 @@ uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
 			mylist->uniq()
 <
 
-utf16idx({string}, {idx} [, {countcc} [, {charidx}]])	*utf16idx()*
+utf16idx({string}, {idx} [, {countcc} [, {charidx}]])               *utf16idx()*
 		Same as |charidx()| but returns the UTF-16 code unit index of
 		the byte at {idx} in {string} (after converting it to UTF-16).
 
@@ -9416,7 +9416,7 @@ utf16idx({string}, {idx} [, {countcc} [, {charidx}]])	*utf16idx()*
 			GetName()->utf16idx(idx)
 <
 
-values({dict})						*values()*
+values({dict})                                                        *values()*
 		Return a |List| with all the values of {dict}.  The |List| is
 		in arbitrary order.  Also see |items()| and |keys()|.
 		Returns zero if {dict} is not a |Dict|.
@@ -9425,7 +9425,7 @@ values({dict})						*values()*
 			mydict->values()
 <
 
-virtcol({expr} [, {list}])				*virtcol()*
+virtcol({expr} [, {list}])                                           *virtcol()*
 		The result is a Number, which is the screen column of the file
 		position given with {expr}.  That is, the last screen position
 		occupied by the character at that position, when the screen
@@ -9481,7 +9481,7 @@ virtcol({expr} [, {list}])				*virtcol()*
 			GetPos()->virtcol()
 <
 
-virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
+virtcol2col({winid}, {lnum}, {col})                              *virtcol2col()*
 		The result is a Number, which is the byte index of the
 		character in window {winid} at buffer line {lnum} and virtual
 		column {col}.
@@ -9502,7 +9502,7 @@ virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
 			GetWinid()->virtcol2col(lnum, col)
 <
 
-visualmode([{expr}])					*visualmode()*
+visualmode([{expr}])                                              *visualmode()*
 		The result is a String, which describes the last Visual mode
 		used in the current buffer.  Initially it returns an empty
 		string, but once Visual mode has been used, it returns "v",
@@ -9520,7 +9520,7 @@ visualmode([{expr}])					*visualmode()*
 		a non-empty String, then the Visual mode will be cleared and
 		the old value is returned.  See |non-zero-arg|.
 
-wait({timeout}, {condition} [, {interval}])			*wait()*
+wait({timeout}, {condition} [, {interval}])                             *wait()*
 		Waits until {condition} evaluates to |TRUE|, where {condition}
 		is a |Funcref| or |string| containing an expression.
 
@@ -9536,7 +9536,7 @@ wait({timeout}, {condition} [, {interval}])			*wait()*
 			-2 if the function was interrupted (by |CTRL-C|)
 			-3 if an error occurred
 
-wildmenumode()					*wildmenumode()*
+wildmenumode()                                                  *wildmenumode()*
 		Returns |TRUE| when the wildmenu is active and |FALSE|
 		otherwise.  See 'wildmenu' and 'wildmode'.
 		This can be used in mappings to handle the 'wildcharm' option
@@ -9547,7 +9547,7 @@ wildmenumode()					*wildmenumode()*
 <
 		(Note, this needs the 'wildcharm' option set appropriately).
 
-win_execute({id}, {command} [, {silent}])		*win_execute()*
+win_execute({id}, {command} [, {silent}])                        *win_execute()*
 		Like `execute()` but in the context of window {id}.
 		The window will temporarily be made the current window,
 		without triggering autocommands or changing directory.  When
@@ -9566,7 +9566,7 @@ win_execute({id}, {command} [, {silent}])		*win_execute()*
 			GetCommand()->win_execute(winid)
 <
 
-win_findbuf({bufnr})					*win_findbuf()*
+win_findbuf({bufnr})                                             *win_findbuf()*
 		Returns a |List| with |window-ID|s for windows that contain
 		buffer {bufnr}.  When there is none the list is empty.
 
@@ -9574,7 +9574,7 @@ win_findbuf({bufnr})					*win_findbuf()*
 			GetBufnr()->win_findbuf()
 <
 
-win_getid([{win} [, {tab}]])				*win_getid()*
+win_getid([{win} [, {tab}]])                                       *win_getid()*
 		Get the |window-ID| for the specified window.
 		When {win} is missing use the current window.
 		With {win} this is the window number.  The top window has
@@ -9587,7 +9587,7 @@ win_getid([{win} [, {tab}]])				*win_getid()*
 			GetWinnr()->win_getid()
 <
 
-win_gettype([{nr}])					*win_gettype()*
+win_gettype([{nr}])                                              *win_gettype()*
 		Return the type of the window:
 			"autocmd"	autocommand window. Temporary window
 					used to execute autocommands.
@@ -9609,7 +9609,7 @@ win_gettype([{nr}])					*win_gettype()*
 			GetWinid()->win_gettype()
 <
 
-win_gotoid({expr})					*win_gotoid()*
+win_gotoid({expr})                                                *win_gotoid()*
 		Go to window with ID {expr}.  This may also change the current
 		tabpage.
 		Return TRUE if successful, FALSE if the window cannot be found.
@@ -9618,7 +9618,7 @@ win_gotoid({expr})					*win_gotoid()*
 			GetWinid()->win_gotoid()
 <
 
-win_id2tabwin({expr})				*win_id2tabwin()*
+win_id2tabwin({expr})                                          *win_id2tabwin()*
 		Return a list with the tab number and window number of window
 		with ID {expr}: [tabnr, winnr].
 		Return [0, 0] if the window cannot be found.
@@ -9627,7 +9627,7 @@ win_id2tabwin({expr})				*win_id2tabwin()*
 			GetWinid()->win_id2tabwin()
 <
 
-win_id2win({expr})					*win_id2win()*
+win_id2win({expr})                                                *win_id2win()*
 		Return the window number of window with ID {expr}.
 		Return 0 if the window cannot be found in the current tabpage.
 
@@ -9635,7 +9635,7 @@ win_id2win({expr})					*win_id2win()*
 			GetWinid()->win_id2win()
 <
 
-win_move_separator({nr}, {offset})		*win_move_separator()*
+win_move_separator({nr}, {offset})                        *win_move_separator()*
 		Move window {nr}'s vertical separator (i.e., the right border)
 		by {offset} columns, as if being dragged by the mouse. {nr}
 		can be a window number or |window-ID|. A positive {offset}
@@ -9654,7 +9654,7 @@ win_move_separator({nr}, {offset})		*win_move_separator()*
 			GetWinnr()->win_move_separator(offset)
 <
 
-win_move_statusline({nr}, {offset})		*win_move_statusline()*
+win_move_statusline({nr}, {offset})                      *win_move_statusline()*
 		Move window {nr}'s status line (i.e., the bottom border) by
 		{offset} rows, as if being dragged by the mouse. {nr} can be a
 		window number or |window-ID|. A positive {offset} moves down
@@ -9670,7 +9670,7 @@ win_move_statusline({nr}, {offset})		*win_move_statusline()*
 			GetWinnr()->win_move_statusline(offset)
 <
 
-win_screenpos({nr})					*win_screenpos()*
+win_screenpos({nr})                                            *win_screenpos()*
 		Return the screen position of window {nr} as a list with two
 		numbers: [row, col].  The first window always has position
 		[1, 1], unless there is a tabline, then it is [2, 1].
@@ -9683,7 +9683,7 @@ win_screenpos({nr})					*win_screenpos()*
 			GetWinid()->win_screenpos()
 <
 
-win_splitmove({nr}, {target} [, {options}])		*win_splitmove()*
+win_splitmove({nr}, {target} [, {options}])                    *win_splitmove()*
 		Move the window {nr} to a new split of the window {target}.
 		This is similar to moving to {target}, creating a new window
 		using |:split| but having the same contents as window {nr}, and
@@ -9707,7 +9707,7 @@ win_splitmove({nr}, {target} [, {options}])		*win_splitmove()*
 			GetWinid()->win_splitmove(target)
 <
 
-winbufnr({nr})						*winbufnr()*
+winbufnr({nr})                                                      *winbufnr()*
 		The result is a Number, which is the number of the buffer
 		associated with window {nr}.  {nr} can be the window number or
 		the |window-ID|.
@@ -9721,18 +9721,18 @@ winbufnr({nr})						*winbufnr()*
 			FindWindow()->winbufnr()->bufname()
 <
 
-wincol()							*wincol()*
+wincol()                                                              *wincol()*
 		The result is a Number, which is the virtual column of the
 		cursor in the window.  This is counting screen cells from the
 		left side of the window.  The leftmost column is one.
 
-windowsversion()					*windowsversion()*
+windowsversion()                                              *windowsversion()*
 		The result is a String.  For MS-Windows it indicates the OS
 		version.  E.g, Windows 10 is "10.0", Windows 8 is "6.2",
 		Windows XP is "5.1".  For non-MS-Windows systems the result is
 		an empty string.
 
-winheight({nr})						*winheight()*
+winheight({nr})                                                    *winheight()*
 		The result is a Number, which is the height of window {nr}.
 		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero, the height of the current window is
@@ -9746,7 +9746,7 @@ winheight({nr})						*winheight()*
 			GetWinid()->winheight()
 <
 
-winlayout([{tabnr}])					*winlayout()*
+winlayout([{tabnr}])                                               *winlayout()*
 		The result is a nested List containing the layout of windows
 		in a tabpage.
 
@@ -9786,14 +9786,14 @@ winlayout([{tabnr}])					*winlayout()*
 			GetTabnr()->winlayout()
 <
 
-winline()							*winline()*
+winline()                                                            *winline()*
 		The result is a Number, which is the screen line of the cursor
 		in the window.  This is counting screen lines from the top of
 		the window.  The first line is one.
 		If the cursor was moved the view on the file will be updated
 		first, this may cause a scroll.
 
-winnr([{arg}])						*winnr()*
+winnr([{arg}])                                                         *winnr()*
 		The result is a Number, which is the number of the current
 		window.  The top window has number 1.
 		Returns zero for a popup window.
@@ -9826,7 +9826,7 @@ winnr([{arg}])						*winnr()*
 			GetWinval()->winnr()
 <
 
-winrestcmd()						*winrestcmd()*
+winrestcmd()                                                      *winrestcmd()*
 		Returns a sequence of |:resize| commands that should restore
 		the current window sizes.  Only works properly when no windows
 		are opened or closed and the current window and tab page is
@@ -9837,7 +9837,7 @@ winrestcmd()						*winrestcmd()*
 			exe cmd
 <
 
-winrestview({dict})					*winrestview()*
+winrestview({dict})                                              *winrestview()*
 		Uses the |Dictionary| returned by |winsaveview()| to restore
 		the view of the current window.
 		Note: The {dict} does not have to contain all values, that are
@@ -9857,7 +9857,7 @@ winrestview({dict})					*winrestview()*
 			GetView()->winrestview()
 <
 
-winsaveview()						*winsaveview()*
+winsaveview()                                                    *winsaveview()*
 		Returns a |Dictionary| that contains information to restore
 		the view of the current window.  Use |winrestview()| to
 		restore the view.
@@ -9884,7 +9884,7 @@ winsaveview()						*winsaveview()*
 			skipcol		columns skipped
 		Note that no option values are saved.
 
-winwidth({nr})						*winwidth()*
+winwidth({nr})                                                      *winwidth()*
 		The result is a Number, which is the width of window {nr}.
 		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero, the width of the current window is
@@ -9902,7 +9902,7 @@ winwidth({nr})						*winwidth()*
 			GetWinid()->winwidth()
 <
 
-wordcount()						*wordcount()*
+wordcount()                                                        *wordcount()*
 		The result is a dictionary of byte/chars/word statistics for
 		the current buffer.  This is the same info as provided by
 		|g_CTRL-G|
@@ -9923,7 +9923,7 @@ wordcount()						*wordcount()*
 			visual_words    Number of words visually selected
 					(only in Visual mode)
 
-writefile({object}, {fname} [, {flags}])		*writefile()*
+writefile({object}, {fname} [, {flags}])                           *writefile()*
 		When {object} is a |List| write it to file {fname}.  Each list
 		item is separated with a NL.  Each list item must be a String
 		or Number.
@@ -9973,7 +9973,7 @@ writefile({object}, {fname} [, {flags}])		*writefile()*
 			GetText()->writefile("thefile")
 <
 
-xor({expr}, {expr})						*xor()*
+xor({expr}, {expr})                                                      *xor()*
 		Bitwise XOR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `and()` and `or()`.
-- 
cgit 


From e55e80d51ca5d85770981bffb9254badc3662e0c Mon Sep 17 00:00:00 2001
From: Chris AtLee <chris@atlee.ca>
Date: Tue, 1 Aug 2023 08:13:52 -0400
Subject: fix(lsp): inlay hints: "Failed to delete autocmd" when closing buffer
 #24469
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
"Failed to delete autocmd" error when deleting LspNotify autocmd. #24456

Solution:
Change a few things in the inlay_hint and diagnostic LSP code:
1. Re-introduce the `enabled` flag for the buffer state tables. Previously I was
   relying on the presence of an autocmd id in the state table to track whether
   inlay_hint / diagnostic was enabled for a buffer. There are two reasons why
   this doesn't work well:
  - Each time inlay_hint / diagnostic is enabled, we call `nvim_buf_attach` on
    the buffer, resulting in multiple `on_reload` or `on_detach` callbacks being
    registered.
  - Commands like `bwipeout` delete buffer local autocmds, sometimes before our
    `on_detach` callbacks have a chance to delete them first. This causes the
  - Use module local enabled state for diagnostic as well. bwipeout can race
    with on_detach callbacks for deleting autocmds. Error referenced in #24456.
2. Change the `LspDetach` autocmd to run each time (i.e., remove the `once`
   flag). Since we're only registering autocmds once per buffer now, we
   need to make sure that we set the enabled flag properly each time the LSP
   client detaches from the buffer.
  - Remove `once` from the LspDetach autocmds for inlay_hint and diagnostic.
    We only set up the autocmd once now. Gets removed when buffer is deleted.
3. Have the `LspNotify` handler also refresh the inlay_hint / diagnostics when
   receiving the `textDocument/didOpen` event. Before this point, the LSP
   backend doesn't have the contents of the buffer, so can't provide inlay hints
   or diagnostics.

Downsides of this approach:
* When inlay_hint / diagnostics are disabled on a buffer, it will continue to
  receive `LspNotify` events for that buffer. The callback exits early since the
  `enabled` flag is false.

Alternatives:
* Can we wrap the call to `nvim_del_autocmd` in `pcall` to swallow any errors
  resulting from trying to delete the autocmd?

Fixes #24456

Helped-by: Maria José Solano <majosolano99@gmail.com>
---
 runtime/lua/vim/lsp/diagnostic.lua | 85 +++++++++++++++++++++-----------------
 runtime/lua/vim/lsp/inlay_hint.lua | 35 +++++++++-------
 2 files changed, 67 insertions(+), 53 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index 34be13096d..44bb90d985 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -392,19 +392,18 @@ local function clear(bufnr)
   end
 end
 
---- autocmd ids for LspNotify handlers per buffer
---- @private
---- @type table<integer,integer>
-local _autocmd_ids = {}
+---@class lsp.diagnostic.bufstate
+---@field enabled boolean Whether inlay hints are enabled for this buffer
+---@type table<integer, lsp.diagnostic.bufstate>
+local bufstates = {}
 
 --- Disable pull diagnostics for a buffer
 --- @private
 local function disable(bufnr)
-  if not _autocmd_ids[bufnr] then
-    return
+  local bufstate = bufstates[bufnr]
+  if bufstate then
+    bufstate.enabled = false
   end
-  api.nvim_del_autocmd(_autocmd_ids[bufnr])
-  _autocmd_ids[bufnr] = nil
   clear(bufnr)
 end
 
@@ -416,38 +415,46 @@ function M._enable(bufnr)
     bufnr = api.nvim_get_current_buf()
   end
 
-  if _autocmd_ids[bufnr] then
-    return
+  if not bufstates[bufnr] then
+    bufstates[bufnr] = { enabled = true }
+
+    api.nvim_create_autocmd('LspNotify', {
+      buffer = bufnr,
+      callback = function(opts)
+        if
+          opts.data.method ~= 'textDocument/didChange'
+          and opts.data.method ~= 'textDocument/didOpen'
+        then
+          return
+        end
+        if bufstates[bufnr] and bufstates[bufnr].enabled then
+          util._refresh('textDocument/diagnostic', { bufnr = bufnr, only_visible = true })
+        end
+      end,
+      group = augroup,
+    })
+
+    api.nvim_buf_attach(bufnr, false, {
+      on_reload = function()
+        if bufstates[bufnr] and bufstates[bufnr].enabled then
+          util._refresh('textDocument/diagnostic', { bufnr = bufnr })
+        end
+      end,
+      on_detach = function()
+        disable(bufnr)
+      end,
+    })
+
+    api.nvim_create_autocmd('LspDetach', {
+      buffer = bufnr,
+      callback = function()
+        disable(bufnr)
+      end,
+      group = augroup,
+    })
+  else
+    bufstates[bufnr].enabled = true
   end
-
-  _autocmd_ids[bufnr] = api.nvim_create_autocmd('LspNotify', {
-    buffer = bufnr,
-    callback = function(opts)
-      if opts.data.method ~= 'textDocument/didChange' then
-        return
-      end
-      util._refresh('textDocument/diagnostic', { bufnr = bufnr, only_visible = true })
-    end,
-    group = augroup,
-  })
-
-  api.nvim_buf_attach(bufnr, false, {
-    on_reload = function()
-      util._refresh('textDocument/diagnostic', { bufnr = bufnr })
-    end,
-    on_detach = function()
-      disable(bufnr)
-    end,
-  })
-
-  api.nvim_create_autocmd('LspDetach', {
-    buffer = bufnr,
-    callback = function()
-      disable(bufnr)
-    end,
-    once = true,
-    group = augroup,
-  })
 end
 
 return M
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index 912ce6898e..2bf0fb9cb2 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -3,12 +3,12 @@ local log = require('vim.lsp.log')
 local api = vim.api
 local M = {}
 
----@class lsp._inlay_hint.bufstate
+---@class lsp.inlay_hint.bufstate
 ---@field version integer
 ---@field client_hint table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
 ---@field applied table<integer, integer> Last version of hints applied to this line
----@field autocmd_id integer The autocmd id for the buffer
----@type table<integer, lsp._inlay_hint.bufstate>
+---@field enabled boolean Whether inlay hints are enabled for this buffer
+---@type table<integer, lsp.inlay_hint.bufstate>
 local bufstates = {}
 
 local namespace = api.nvim_create_namespace('vim_lsp_inlayhint')
@@ -31,6 +31,9 @@ function M.on_inlayhint(err, result, ctx, _)
     return
   end
   local bufstate = bufstates[bufnr]
+  if not bufstate or not bufstate.enabled then
+    return
+  end
   if not (bufstate.client_hint and bufstate.version) then
     bufstate.client_hint = vim.defaulttable()
     bufstate.version = ctx.version
@@ -122,10 +125,9 @@ local function disable(bufnr)
     bufnr = api.nvim_get_current_buf()
   end
   clear(bufnr)
-  if bufstates[bufnr] and bufstates[bufnr].autocmd_id then
-    api.nvim_del_autocmd(bufstates[bufnr].autocmd_id)
+  if bufstates[bufnr] then
+    bufstates[bufnr] = { enabled = false, applied = {} }
   end
-  bufstates[bufnr] = nil
 end
 
 --- Enable inlay hints for a buffer
@@ -136,24 +138,27 @@ local function enable(bufnr)
   end
   local bufstate = bufstates[bufnr]
   if not bufstate then
-    bufstates[bufnr] = { applied = {} }
-    bufstates[bufnr].autocmd_id = api.nvim_create_autocmd('LspNotify', {
+    bufstates[bufnr] = { applied = {}, enabled = true }
+    api.nvim_create_autocmd('LspNotify', {
       buffer = bufnr,
       callback = function(opts)
-        if opts.data.method ~= 'textDocument/didChange' then
+        if
+          opts.data.method ~= 'textDocument/didChange'
+          and opts.data.method ~= 'textDocument/didOpen'
+        then
           return
         end
-        if bufstates[bufnr] then
+        if bufstates[bufnr] and bufstates[bufnr].enabled then
           util._refresh('textDocument/inlayHint', { bufnr = bufnr })
         end
       end,
       group = augroup,
     })
     util._refresh('textDocument/inlayHint', { bufnr = bufnr })
-    api.nvim_buf_attach(bufnr, true, {
+    api.nvim_buf_attach(bufnr, false, {
       on_reload = function(_, cb_bufnr)
         clear(cb_bufnr)
-        if bufstates[cb_bufnr] then
+        if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
           bufstates[cb_bufnr].applied = {}
           util._refresh('textDocument/inlayHint', { bufnr = cb_bufnr })
         end
@@ -167,9 +172,11 @@ local function enable(bufnr)
       callback = function()
         disable(bufnr)
       end,
-      once = true,
       group = augroup,
     })
+  else
+    bufstate.enabled = true
+    util._refresh('textDocument/inlayHint', { bufnr = bufnr })
   end
 end
 
@@ -180,7 +187,7 @@ local function toggle(bufnr)
     bufnr = api.nvim_get_current_buf()
   end
   local bufstate = bufstates[bufnr]
-  if bufstate then
+  if bufstate and bufstate.enabled then
     disable(bufnr)
   else
     enable(bufnr)
-- 
cgit 


From 48d533272e57e91e4d14c93b26d4922957f40cd7 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 1 Aug 2023 14:20:44 +0100
Subject: feat(lua-types): types for vim.api.* (#24523)

---
 runtime/doc/news.txt                  |    5 +
 runtime/lua/vim/_meta/api.lua         | 2178 +++++++++++++++++++++++++++++++++
 runtime/lua/vim/_meta/api_keysets.lua |  249 ++++
 runtime/lua/vim/_meta/vimfn.lua       |    1 +
 4 files changed, 2433 insertions(+)
 create mode 100644 runtime/lua/vim/_meta/api.lua
 create mode 100644 runtime/lua/vim/_meta/api_keysets.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index e40fdda3f8..3cc59af63f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -132,6 +132,11 @@ The following new APIs and features were added.
 • |vim.wo| can now be double indexed for |:setlocal| behaviour. Currently only
   `0` for the buffer index is currently supported.
 
+• Lua type annotations for:
+  • `vim.*`
+  • `vim.fn.*`
+  • `vim.api.*`
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
new file mode 100644
index 0000000000..3622ba5d19
--- /dev/null
+++ b/runtime/lua/vim/_meta/api.lua
@@ -0,0 +1,2178 @@
+--- @meta
+-- THIS FILE IS GENERATED
+-- DO NOT EDIT
+error('Cannot require a meta file')
+
+vim.api = {}
+
+--- @private
+--- @param buffer integer
+--- @param first integer
+--- @param last integer
+function vim.api.nvim__buf_redraw_range(buffer, first, last) end
+
+--- @private
+--- @param buffer integer
+--- @return table<string,any>
+function vim.api.nvim__buf_stats(buffer) end
+
+--- @private
+--- @return string
+function vim.api.nvim__get_lib_dir() end
+
+--- @private
+--- Find files in runtime directories
+---
+--- @param pat any[] pattern of files to search for
+--- @param all boolean whether to return all matches or only the first
+--- @param opts vim.api.keyset.runtime is_lua: only search Lua subdirs
+--- @return string[]
+function vim.api.nvim__get_runtime(pat, all, opts) end
+
+--- @private
+--- Returns object given as argument.
+--- This API function is used for testing. One should not rely on its presence
+--- in plugins.
+---
+--- @param obj any Object to return.
+--- @return any
+function vim.api.nvim__id(obj) end
+
+--- @private
+--- Returns array given as argument.
+--- This API function is used for testing. One should not rely on its presence
+--- in plugins.
+---
+--- @param arr any[] Array to return.
+--- @return any[]
+function vim.api.nvim__id_array(arr) end
+
+--- @private
+--- Returns dictionary given as argument.
+--- This API function is used for testing. One should not rely on its presence
+--- in plugins.
+---
+--- @param dct table<string,any> Dictionary to return.
+--- @return table<string,any>
+function vim.api.nvim__id_dictionary(dct) end
+
+--- @private
+--- Returns floating-point value given as argument.
+--- This API function is used for testing. One should not rely on its presence
+--- in plugins.
+---
+--- @param flt number Value to return.
+--- @return number
+function vim.api.nvim__id_float(flt) end
+
+--- @private
+--- @param grid integer
+--- @param row integer
+--- @param col integer
+--- @return any[]
+function vim.api.nvim__inspect_cell(grid, row, col) end
+
+--- @private
+--- @return any[]
+function vim.api.nvim__runtime_inspect() end
+
+--- @private
+--- @param path string
+function vim.api.nvim__screenshot(path) end
+
+--- @private
+--- Gets internal stats.
+---
+--- @return table<string,any>
+function vim.api.nvim__stats() end
+
+--- @private
+--- @param str string
+--- @return any
+function vim.api.nvim__unpack(str) end
+
+--- Adds a highlight to buffer.
+--- Useful for plugins that dynamically generate highlights to a buffer (like
+--- a semantic highlighter or linter). The function adds a single highlight to
+--- a buffer. Unlike `matchaddpos()` highlights follow changes to line
+--- numbering (as lines are inserted/removed above the highlighted line), like
+--- signs and marks do.
+--- Namespaces are used for batch deletion/updating of a set of highlights. To
+--- create a namespace, use `nvim_create_namespace()` which returns a
+--- namespace id. Pass it in to this function as `ns_id` to add highlights to
+--- the namespace. All highlights in the same namespace can then be cleared
+--- with single call to `nvim_buf_clear_namespace()`. If the highlight never
+--- will be deleted by an API call, pass `ns_id = -1`.
+--- As a shorthand, `ns_id = 0` can be used to create a new namespace for the
+--- highlight, the allocated id is then returned. If `hl_group` is the empty
+--- string no highlight is added, but a new `ns_id` is still returned. This is
+--- supported for backwards compatibility, new code should use
+--- `nvim_create_namespace()` to create a new empty namespace.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param ns_id integer namespace to use or -1 for ungrouped highlight
+--- @param hl_group string Name of the highlight group to use
+--- @param line integer Line to highlight (zero-indexed)
+--- @param col_start integer Start of (byte-indexed) column range to highlight
+--- @param col_end integer End of (byte-indexed) column range to highlight, or -1 to
+---                  highlight to end of line
+--- @return integer
+function vim.api.nvim_buf_add_highlight(buffer, ns_id, hl_group, line, col_start, col_end) end
+
+--- Activates buffer-update events on a channel, or as Lua callbacks.
+--- Example (Lua): capture buffer updates in a global `events` variable (use "vim.print(events)" to see its contents):
+--- ```lua
+---   events = {}
+---   vim.api.nvim_buf_attach(0, false, {
+---     on_lines=function(...) table.insert(events, {...}) end})
+--- ```
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param send_buffer boolean True if the initial notification should contain the
+---                    whole buffer: first notification will be
+---                    `nvim_buf_lines_event`. Else the first notification
+---                    will be `nvim_buf_changedtick_event`. Not for Lua
+---                    callbacks.
+--- @param opts table<string,function> Optional parameters.
+---                    • on_lines: Lua callback invoked on change. Return `true` to detach. Args:
+---                      • the string "lines"
+---                      • buffer handle
+---                      • b:changedtick
+---                      • first line that changed (zero-indexed)
+---                      • last line that was changed
+---                      • last line in the updated range
+---                      • byte count of previous contents
+---                      • deleted_codepoints (if `utf_sizes` is true)
+---                      • deleted_codeunits (if `utf_sizes` is true)
+---
+---                    • on_bytes: Lua callback invoked on change. This
+---                      callback receives more granular information about the
+---                      change compared to on_lines. Return `true` to detach. Args:
+---                      • the string "bytes"
+---                      • buffer handle
+---                      • b:changedtick
+---                      • start row of the changed text (zero-indexed)
+---                      • start column of the changed text
+---                      • byte offset of the changed text (from the start of
+---                        the buffer)
+---                      • old end row of the changed text
+---                      • old end column of the changed text
+---                      • old end byte length of the changed text
+---                      • new end row of the changed text
+---                      • new end column of the changed text
+---                      • new end byte length of the changed text
+---
+---                    • on_changedtick: Lua callback invoked on changedtick
+---                      increment without text change. Args:
+---                      • the string "changedtick"
+---                      • buffer handle
+---                      • b:changedtick
+---
+---                    • on_detach: Lua callback invoked on detach. Args:
+---                      • the string "detach"
+---                      • buffer handle
+---
+---                    • on_reload: Lua callback invoked on reload. The entire
+---                      buffer content should be considered changed. Args:
+---                      • the string "reload"
+---                      • buffer handle
+---
+---                    • utf_sizes: include UTF-32 and UTF-16 size of the
+---                      replaced region, as args to `on_lines`.
+---                    • preview: also attach to command preview (i.e.
+---                      'inccommand') events.
+--- @return boolean
+function vim.api.nvim_buf_attach(buffer, send_buffer, opts) end
+
+--- call a function with buffer as temporary current buffer
+--- This temporarily switches current buffer to "buffer". If the current
+--- window already shows "buffer", the window is not switched If a window
+--- inside the current tabpage (including a float) already shows the buffer
+--- One of these windows will be set as current window temporarily. Otherwise
+--- a temporary scratch window (called the "autocmd window" for historical
+--- reasons) will be used.
+--- This is useful e.g. to call Vimscript functions that only work with the
+--- current buffer/window currently, like `termopen()`.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param fun function Function to call inside the buffer (currently Lua callable
+---               only)
+--- @return any
+function vim.api.nvim_buf_call(buffer, fun) end
+
+--- @deprecated
+--- @param buffer integer
+--- @param ns_id integer
+--- @param line_start integer
+--- @param line_end integer
+function vim.api.nvim_buf_clear_highlight(buffer, ns_id, line_start, line_end) end
+
+--- Clears `namespace`d objects (highlights, `extmarks`, virtual text) from a
+--- region.
+--- Lines are 0-indexed. `api-indexing` To clear the namespace in the entire
+--- buffer, specify line_start=0 and line_end=-1.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param ns_id integer Namespace to clear, or -1 to clear all namespaces.
+--- @param line_start integer Start of range of lines to clear
+--- @param line_end integer End of range of lines to clear (exclusive) or -1 to
+---                   clear to end of buffer.
+function vim.api.nvim_buf_clear_namespace(buffer, ns_id, line_start, line_end) end
+
+--- Creates a buffer-local command `user-commands`.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer.
+--- @param name string
+--- @param command any
+--- @param opts vim.api.keyset.user_command
+function vim.api.nvim_buf_create_user_command(buffer, name, command, opts) end
+
+--- Removes an `extmark`.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param ns_id integer Namespace id from `nvim_create_namespace()`
+--- @param id integer Extmark id
+--- @return boolean
+function vim.api.nvim_buf_del_extmark(buffer, ns_id, id) end
+
+--- Unmaps a buffer-local `mapping` for the given mode.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param mode string
+--- @param lhs string
+function vim.api.nvim_buf_del_keymap(buffer, mode, lhs) end
+
+--- Deletes a named mark in the buffer. See `mark-motions`.
+---
+--- @param buffer integer Buffer to set the mark on
+--- @param name string Mark name
+--- @return boolean
+function vim.api.nvim_buf_del_mark(buffer, name) end
+
+--- Delete a buffer-local user-defined command.
+--- Only commands created with `:command-buffer` or
+--- `nvim_buf_create_user_command()` can be deleted with this function.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer.
+--- @param name string Name of the command to delete.
+function vim.api.nvim_buf_del_user_command(buffer, name) end
+
+--- Removes a buffer-scoped (b:) variable
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param name string Variable name
+function vim.api.nvim_buf_del_var(buffer, name) end
+
+--- Deletes the buffer. See `:bwipeout`
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param opts table<string,any> Optional parameters. Keys:
+---               • force: Force deletion and ignore unsaved changes.
+---               • unload: Unloaded only, do not delete. See `:bunload`
+function vim.api.nvim_buf_delete(buffer, opts) end
+
+--- Deactivates buffer-update events on the channel.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @return boolean
+function vim.api.nvim_buf_detach(buffer) end
+
+--- Gets a changed tick of a buffer
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @return integer
+function vim.api.nvim_buf_get_changedtick(buffer) end
+
+--- Gets a map of buffer-local `user-commands`.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param opts vim.api.keyset.get_commands Optional parameters. Currently not used.
+--- @return table<string,any>
+function vim.api.nvim_buf_get_commands(buffer, opts) end
+
+--- Gets the position (0-indexed) of an `extmark`.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param ns_id integer Namespace id from `nvim_create_namespace()`
+--- @param id integer Extmark id
+--- @param opts table<string,any> Optional parameters. Keys:
+---               • details: Whether to include the details dict
+---               • hl_name: Whether to include highlight group name instead
+---                 of id, true if omitted
+--- @return integer[]
+function vim.api.nvim_buf_get_extmark_by_id(buffer, ns_id, id, opts) end
+
+--- Gets `extmarks` in "traversal order" from a `charwise` region defined by
+--- buffer positions (inclusive, 0-indexed `api-indexing`).
+--- Region can be given as (row,col) tuples, or valid extmark ids (whose
+--- positions define the bounds). 0 and -1 are understood as (0,0) and (-1,-1)
+--- respectively, thus the following are equivalent:
+--- ```lua
+---   vim.api.nvim_buf_get_extmarks(0, my_ns, 0, -1, {})
+---   vim.api.nvim_buf_get_extmarks(0, my_ns, {0,0}, {-1,-1}, {})
+--- ```
+--- If `end` is less than `start`, traversal works backwards. (Useful with
+--- `limit`, to get the first marks prior to a given position.)
+--- Example:
+--- ```lua
+---   local api = vim.api
+---   local pos = api.nvim_win_get_cursor(0)
+---   local ns  = api.nvim_create_namespace('my-plugin')
+---   -- Create new extmark at line 1, column 1.
+---   local m1  = api.nvim_buf_set_extmark(0, ns, 0, 0, {})
+---   -- Create new extmark at line 3, column 1.
+---   local m2  = api.nvim_buf_set_extmark(0, ns, 2, 0, {})
+---   -- Get extmarks only from line 3.
+---   local ms  = api.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
+---   -- Get all marks in this buffer + namespace.
+---   local all = api.nvim_buf_get_extmarks(0, ns, 0, -1, {})
+---   vim.print(ms)
+--- ```
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param ns_id integer Namespace id from `nvim_create_namespace()` or -1 for all
+---               namespaces
+--- @param start any Start of range: a 0-indexed (row, col) or valid extmark id
+---               (whose position defines the bound). `api-indexing`
+--- @param end_ any End of range (inclusive): a 0-indexed (row, col) or valid
+---               extmark id (whose position defines the bound).
+---               `api-indexing`
+--- @param opts table<string,any> Optional parameters. Keys:
+---               • limit: Maximum number of marks to return
+---               • details: Whether to include the details dict
+---               • hl_name: Whether to include highlight group name instead
+---                 of id, true if omitted
+---               • type: Filter marks by type: "highlight", "sign",
+---                 "virt_text" and "virt_lines"
+--- @return any[]
+function vim.api.nvim_buf_get_extmarks(buffer, ns_id, start, end_, opts) end
+
+--- Gets a list of buffer-local `mapping` definitions.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param mode string Mode short-name ("n", "i", "v", ...)
+--- @return table<string,any>[]
+function vim.api.nvim_buf_get_keymap(buffer, mode) end
+
+--- Gets a line-range from the buffer.
+--- Indexing is zero-based, end-exclusive. Negative indices are interpreted as
+--- length+1+index: -1 refers to the index past the end. So to get the last
+--- element use start=-2 and end=-1.
+--- Out-of-bounds indices are clamped to the nearest valid value, unless
+--- `strict_indexing` is set.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param start integer First line index
+--- @param end_ integer Last line index, exclusive
+--- @param strict_indexing boolean Whether out-of-bounds should be an error.
+--- @return string[]
+function vim.api.nvim_buf_get_lines(buffer, start, end_, strict_indexing) end
+
+--- Returns a `(row,col)` tuple representing the position of the named mark.
+--- "End of line" column position is returned as `v:maxcol` (big number). See
+--- `mark-motions`.
+--- Marks are (1,0)-indexed. `api-indexing`
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param name string Mark name
+--- @return integer[]
+function vim.api.nvim_buf_get_mark(buffer, name) end
+
+--- Gets the full file name for the buffer
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @return string
+function vim.api.nvim_buf_get_name(buffer) end
+
+--- @deprecated
+--- @param buffer integer
+--- @return integer
+function vim.api.nvim_buf_get_number(buffer) end
+
+--- Returns the byte offset of a line (0-indexed). `api-indexing`
+--- Line 1 (index=0) has offset 0. UTF-8 bytes are counted. EOL is one byte.
+--- 'fileformat' and 'fileencoding' are ignored. The line index just after the
+--- last line gives the total byte-count of the buffer. A final EOL byte is
+--- counted if it would be written, see 'eol'.
+--- Unlike `line2byte()`, throws error for out-of-bounds indexing. Returns -1
+--- for unloaded buffer.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param index integer Line index
+--- @return integer
+function vim.api.nvim_buf_get_offset(buffer, index) end
+
+--- @param buffer integer
+--- @param name string
+--- @return any
+function vim.api.nvim_buf_get_option(buffer, name) end
+
+--- Gets a range from the buffer.
+--- This differs from `nvim_buf_get_lines()` in that it allows retrieving only
+--- portions of a line.
+--- Indexing is zero-based. Row indices are end-inclusive, and column indices
+--- are end-exclusive.
+--- Prefer `nvim_buf_get_lines()` when retrieving entire lines.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param start_row integer First line index
+--- @param start_col integer Starting column (byte offset) on first line
+--- @param end_row integer Last line index, inclusive
+--- @param end_col integer Ending column (byte offset) on last line, exclusive
+--- @param opts table<string,any> Optional parameters. Currently unused.
+--- @return string[]
+function vim.api.nvim_buf_get_text(buffer, start_row, start_col, end_row, end_col, opts) end
+
+--- Gets a buffer-scoped (b:) variable.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param name string Variable name
+--- @return any
+function vim.api.nvim_buf_get_var(buffer, name) end
+
+--- Checks if a buffer is valid and loaded. See `api-buffer` for more info
+--- about unloaded buffers.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @return boolean
+function vim.api.nvim_buf_is_loaded(buffer) end
+
+--- Checks if a buffer is valid.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @return boolean
+function vim.api.nvim_buf_is_valid(buffer) end
+
+--- Returns the number of lines in the given buffer.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @return integer
+function vim.api.nvim_buf_line_count(buffer) end
+
+--- Creates or updates an `extmark`.
+--- By default a new extmark is created when no id is passed in, but it is
+--- also possible to create a new mark by passing in a previously unused id or
+--- move an existing mark by passing in its id. The caller must then keep
+--- track of existing and unused ids itself. (Useful over RPC, to avoid
+--- waiting for the return value.)
+--- Using the optional arguments, it is possible to use this to highlight a
+--- range of text, and also to associate virtual text to the mark.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param ns_id integer Namespace id from `nvim_create_namespace()`
+--- @param line integer Line where to place the mark, 0-based. `api-indexing`
+--- @param col integer Column where to place the mark, 0-based. `api-indexing`
+--- @param opts vim.api.keyset.set_extmark Optional parameters.
+---               • id : id of the extmark to edit.
+---               • end_row : ending line of the mark, 0-based inclusive.
+---               • end_col : ending col of the mark, 0-based exclusive.
+---               • hl_group : name of the highlight group used to highlight
+---                 this mark.
+---               • hl_eol : when true, for a multiline highlight covering the
+---                 EOL of a line, continue the highlight for the rest of the
+---                 screen line (just like for diff and cursorline highlight).
+---               • virt_text : virtual text to link to this mark. A list of
+---                 [text, highlight] tuples, each representing a text chunk
+---                 with specified highlight. `highlight` element can either
+---                 be a single highlight group, or an array of multiple
+---                 highlight groups that will be stacked (highest priority
+---                 last). A highlight group can be supplied either as a
+---                 string or as an integer, the latter which can be obtained
+---                 using `nvim_get_hl_id_by_name()`.
+---               • virt_text_pos : position of virtual text. Possible values:
+---                 • "eol": right after eol character (default).
+---                 • "overlay": display over the specified column, without
+---                   shifting the underlying text.
+---                 • "right_align": display right aligned in the window.
+---                 • "inline": display at the specified column, and shift the
+---                   buffer text to the right as needed.
+---
+---               • virt_text_win_col : position the virtual text at a fixed
+---                 window column (starting from the first text column of the
+---                 screen line) instead of "virt_text_pos".
+---               • virt_text_hide : hide the virtual text when the background
+---                 text is selected or hidden because of scrolling with
+---                 'nowrap' or 'smoothscroll'. Currently only affects
+---                 "overlay" virt_text.
+---               • hl_mode : control how highlights are combined with the
+---                 highlights of the text. Currently only affects virt_text
+---                 highlights, but might affect `hl_group` in later versions.
+---                 • "replace": only show the virt_text color. This is the
+---                   default.
+---                 • "combine": combine with background text color.
+---                 • "blend": blend with background text color. Not supported
+---                   for "inline" virt_text.
+---
+---               • virt_lines : virtual lines to add next to this mark This
+---                 should be an array over lines, where each line in turn is
+---                 an array over [text, highlight] tuples. In general, buffer
+---                 and window options do not affect the display of the text.
+---                 In particular 'wrap' and 'linebreak' options do not take
+---                 effect, so the number of extra screen lines will always
+---                 match the size of the array. However the 'tabstop' buffer
+---                 option is still used for hard tabs. By default lines are
+---                 placed below the buffer line containing the mark.
+---               • virt_lines_above: place virtual lines above instead.
+---               • virt_lines_leftcol: Place extmarks in the leftmost column
+---                 of the window, bypassing sign and number columns.
+---               • ephemeral : for use with `nvim_set_decoration_provider()`
+---                 callbacks. The mark will only be used for the current
+---                 redraw cycle, and not be permantently stored in the
+---                 buffer.
+---               • right_gravity : boolean that indicates the direction the
+---                 extmark will be shifted in when new text is inserted (true
+---                 for right, false for left). Defaults to true.
+---               • end_right_gravity : boolean that indicates the direction
+---                 the extmark end position (if it exists) will be shifted in
+---                 when new text is inserted (true for right, false for
+---                 left). Defaults to false.
+---               • priority: a priority value for the highlight group or sign
+---                 attribute. For example treesitter highlighting uses a
+---                 value of 100.
+---               • strict: boolean that indicates extmark should not be
+---                 placed if the line or column value is past the end of the
+---                 buffer or end of the line respectively. Defaults to true.
+---               • sign_text: string of length 1-2 used to display in the
+---                 sign column. Note: ranges are unsupported and decorations
+---                 are only applied to start_row
+---               • sign_hl_group: name of the highlight group used to
+---                 highlight the sign column text. Note: ranges are
+---                 unsupported and decorations are only applied to start_row
+---               • number_hl_group: name of the highlight group used to
+---                 highlight the number column. Note: ranges are unsupported
+---                 and decorations are only applied to start_row
+---               • line_hl_group: name of the highlight group used to
+---                 highlight the whole line. Note: ranges are unsupported and
+---                 decorations are only applied to start_row
+---               • cursorline_hl_group: name of the highlight group used to
+---                 highlight the line when the cursor is on the same line as
+---                 the mark and 'cursorline' is enabled. Note: ranges are
+---                 unsupported and decorations are only applied to start_row
+---               • conceal: string which should be either empty or a single
+---                 character. Enable concealing similar to `:syn-conceal`.
+---                 When a character is supplied it is used as `:syn-cchar`.
+---                 "hl_group" is used as highlight for the cchar if provided,
+---                 otherwise it defaults to `hl-Conceal`.
+---               • spell: boolean indicating that spell checking should be
+---                 performed within this extmark
+---               • ui_watched: boolean that indicates the mark should be
+---                 drawn by a UI. When set, the UI will receive win_extmark
+---                 events. Note: the mark is positioned by virt_text
+---                 attributes. Can be used together with virt_text.
+--- @return integer
+function vim.api.nvim_buf_set_extmark(buffer, ns_id, line, col, opts) end
+
+--- Sets a buffer-local `mapping` for the given mode.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param mode string
+--- @param lhs string
+--- @param rhs string
+--- @param opts vim.api.keyset.keymap
+function vim.api.nvim_buf_set_keymap(buffer, mode, lhs, rhs, opts) end
+
+--- Sets (replaces) a line-range in the buffer.
+--- Indexing is zero-based, end-exclusive. Negative indices are interpreted as
+--- length+1+index: -1 refers to the index past the end. So to change or
+--- delete the last element use start=-2 and end=-1.
+--- To insert lines at a given index, set `start` and `end` to the same index.
+--- To delete a range of lines, set `replacement` to an empty array.
+--- Out-of-bounds indices are clamped to the nearest valid value, unless
+--- `strict_indexing` is set.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param start integer First line index
+--- @param end_ integer Last line index, exclusive
+--- @param strict_indexing boolean Whether out-of-bounds should be an error.
+--- @param replacement string[] Array of lines to use as replacement
+function vim.api.nvim_buf_set_lines(buffer, start, end_, strict_indexing, replacement) end
+
+--- Sets a named mark in the given buffer, all marks are allowed
+--- file/uppercase, visual, last change, etc. See `mark-motions`.
+--- Marks are (1,0)-indexed. `api-indexing`
+---
+--- @param buffer integer Buffer to set the mark on
+--- @param name string Mark name
+--- @param line integer Line number
+--- @param col integer Column/row number
+--- @param opts table<string,any> Optional parameters. Reserved for future use.
+--- @return boolean
+function vim.api.nvim_buf_set_mark(buffer, name, line, col, opts) end
+
+--- Sets the full file name for a buffer
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param name string Buffer name
+function vim.api.nvim_buf_set_name(buffer, name) end
+
+--- @param buffer integer
+--- @param name string
+--- @param value any
+function vim.api.nvim_buf_set_option(buffer, name, value) end
+
+--- Sets (replaces) a range in the buffer
+--- This is recommended over `nvim_buf_set_lines()` when only modifying parts
+--- of a line, as extmarks will be preserved on non-modified parts of the
+--- touched lines.
+--- Indexing is zero-based. Row indices are end-inclusive, and column indices
+--- are end-exclusive.
+--- To insert text at a given `(row, column)` location, use `start_row =
+--- end_row = row` and `start_col = end_col = col`. To delete the text in a
+--- range, use `replacement = {}`.
+--- Prefer `nvim_buf_set_lines()` if you are only adding or deleting entire
+--- lines.
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param start_row integer First line index
+--- @param start_col integer Starting column (byte offset) on first line
+--- @param end_row integer Last line index, inclusive
+--- @param end_col integer Ending column (byte offset) on last line, exclusive
+--- @param replacement string[] Array of lines to use as replacement
+function vim.api.nvim_buf_set_text(buffer, start_row, start_col, end_row, end_col, replacement) end
+
+--- Sets a buffer-scoped (b:) variable
+---
+--- @param buffer integer Buffer handle, or 0 for current buffer
+--- @param name string Variable name
+--- @param value any Variable value
+function vim.api.nvim_buf_set_var(buffer, name, value) end
+
+--- @deprecated
+--- @param buffer integer
+--- @param src_id integer
+--- @param line integer
+--- @param chunks any[]
+--- @param opts table<string,any>
+--- @return integer
+function vim.api.nvim_buf_set_virtual_text(buffer, src_id, line, chunks, opts) end
+
+--- Calls many API methods atomically.
+--- This has two main usages:
+--- 1. To perform several requests from an async context atomically, i.e.
+---    without interleaving redraws, RPC requests from other clients, or user
+---    interactions (however API methods may trigger autocommands or event
+---    processing which have such side effects, e.g. `:sleep` may wake
+---    timers).
+--- 2. To minimize RPC overhead (roundtrips) of a sequence of many requests.
+---
+---
+--- @param calls any[] an array of calls, where each call is described by an array
+---              with two elements: the request name, and an array of
+---              arguments.
+--- @return any[]
+function vim.api.nvim_call_atomic(calls) end
+
+--- Calls a Vimscript `Dictionary-function` with the given arguments.
+--- On execution error: fails with Vimscript error, updates v:errmsg.
+---
+--- @param dict any Dictionary, or String evaluating to a Vimscript `self` dict
+--- @param fn string Name of the function defined on the Vimscript dict
+--- @param args any[] Function arguments packed in an Array
+--- @return any
+function vim.api.nvim_call_dict_function(dict, fn, args) end
+
+--- Calls a Vimscript function with the given arguments.
+--- On execution error: fails with Vimscript error, updates v:errmsg.
+---
+--- @param fn string Function to call
+--- @param args any[] Function arguments packed in an Array
+--- @return any
+function vim.api.nvim_call_function(fn, args) end
+
+--- Send data to channel `id`. For a job, it writes it to the stdin of the
+--- process. For the stdio channel `channel-stdio`, it writes to Nvim's
+--- stdout. For an internal terminal instance (`nvim_open_term()`) it writes
+--- directly to terminal output. See `channel-bytes` for more information.
+--- This function writes raw data, not RPC messages. If the channel was
+--- created with `rpc=true` then the channel expects RPC messages, use
+--- `vim.rpcnotify()` and `vim.rpcrequest()` instead.
+---
+--- @param chan integer id of the channel
+--- @param data string data to write. 8-bit clean: can contain NUL bytes.
+function vim.api.nvim_chan_send(chan, data) end
+
+--- Clear all autocommands that match the corresponding {opts}. To delete a
+--- particular autocmd, see `nvim_del_autocmd()`.
+---
+--- @param opts vim.api.keyset.clear_autocmds Parameters
+---             • event: (string|table) Examples:
+---               • event: "pat1"
+---               • event: { "pat1" }
+---               • event: { "pat1", "pat2", "pat3" }
+---
+---             • pattern: (string|table)
+---               • pattern or patterns to match exactly.
+---                 • For example, if you have `*.py` as that pattern for the
+---                   autocmd, you must pass `*.py` exactly to clear it.
+---                   `test.py` will not match the pattern.
+---
+---               • defaults to clearing all patterns.
+---               • NOTE: Cannot be used with {buffer}
+---
+---             • buffer: (bufnr)
+---               • clear only `autocmd-buflocal` autocommands.
+---               • NOTE: Cannot be used with {pattern}
+---
+---             • group: (string|int) The augroup name or id.
+---               • NOTE: If not passed, will only delete autocmds not in any group.
+function vim.api.nvim_clear_autocmds(opts) end
+
+--- Executes an Ex command.
+--- Unlike `nvim_command()` this command takes a structured Dictionary instead
+--- of a String. This allows for easier construction and manipulation of an Ex
+--- command. This also allows for things such as having spaces inside a
+--- command argument, expanding filenames in a command that otherwise doesn't
+--- expand filenames, etc. Command arguments may also be Number, Boolean or
+--- String.
+--- The first argument may also be used instead of count for commands that
+--- support it in order to make their usage simpler with `vim.cmd()`. For
+--- example, instead of `vim.cmd.bdelete{ count = 2 }`, you may do
+--- `vim.cmd.bdelete(2)`.
+--- On execution error: fails with Vimscript error, updates v:errmsg.
+---
+--- @param cmd vim.api.keyset.cmd Command to execute. Must be a Dictionary that can contain the
+---             same values as the return value of `nvim_parse_cmd()` except
+---             "addr", "nargs" and "nextcmd" which are ignored if provided.
+---             All values except for "cmd" are optional.
+--- @param opts vim.api.keyset.cmd_opts Optional parameters.
+---             • output: (boolean, default false) Whether to return command
+---               output.
+--- @return string
+function vim.api.nvim_cmd(cmd, opts) end
+
+--- Executes an Ex command.
+--- On execution error: fails with Vimscript error, updates v:errmsg.
+--- Prefer using `nvim_cmd()` or `nvim_exec2()` over this. To evaluate
+--- multiple lines of Vim script or an Ex command directly, use
+--- `nvim_exec2()`. To construct an Ex command using a structured format and
+--- then execute it, use `nvim_cmd()`. To modify an Ex command before
+--- evaluating it, use `nvim_parse_cmd()` in conjunction with `nvim_cmd()`.
+---
+--- @param command string Ex command string
+function vim.api.nvim_command(command) end
+
+--- @deprecated
+--- @param command string
+--- @return string
+function vim.api.nvim_command_output(command) end
+
+--- Create or get an autocommand group `autocmd-groups`.
+--- To get an existing group id, do:
+--- ```lua
+---     local id = vim.api.nvim_create_augroup("MyGroup", {
+---         clear = false
+---     })
+--- ```
+---
+--- @param name string String: The name of the group
+--- @param opts vim.api.keyset.create_augroup Dictionary Parameters
+---             • clear (bool) optional: defaults to true. Clear existing
+---               commands if the group already exists `autocmd-groups`.
+--- @return integer
+function vim.api.nvim_create_augroup(name, opts) end
+
+--- Creates an `autocommand` event handler, defined by `callback` (Lua function or Vimscript function name string) or `command` (Ex command string).
+--- Example using Lua callback:
+--- ```lua
+---     vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
+---       pattern = {"*.c", "*.h"},
+---       callback = function(ev)
+---         print(string.format('event fired: %s', vim.inspect(ev)))
+---       end
+---     })
+--- ```
+--- Example using an Ex command as the handler:
+--- ```lua
+---     vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
+---       pattern = {"*.c", "*.h"},
+---       command = "echo 'Entering a C or C++ file'",
+---     })
+--- ```
+--- Note: `pattern` is NOT automatically expanded (unlike with `:autocmd`), thus names like
+--- "$HOME" and "~" must be expanded explicitly:
+--- ```lua
+---   pattern = vim.fn.expand("~") .. "/some/path/*.py"
+--- ```
+---
+--- @param event any (string|array) Event(s) that will trigger the handler
+---              (`callback` or `command`).
+--- @param opts vim.api.keyset.create_autocmd Options dict:
+---              • group (string|integer) optional: autocommand group name or
+---                id to match against.
+---              • pattern (string|array) optional: pattern(s) to match
+---                literally `autocmd-pattern`.
+---              • buffer (integer) optional: buffer number for buffer-local
+---                autocommands `autocmd-buflocal`. Cannot be used with
+---                {pattern}.
+---              • desc (string) optional: description (for documentation and
+---                troubleshooting).
+---              • callback (function|string) optional: Lua function (or
+---                Vimscript function name, if string) called when the
+---                event(s) is triggered. Lua callback can return true to
+---                delete the autocommand, and receives a table argument with
+---                these keys:
+---                • id: (number) autocommand id
+---                • event: (string) name of the triggered event
+---                  `autocmd-events`
+---                • group: (number|nil) autocommand group id, if any
+---                • match: (string) expanded value of `<amatch>`
+---                • buf: (number) expanded value of `<abuf>`
+---                • file: (string) expanded value of `<afile>`
+---                • data: (any) arbitrary data passed from
+---                  `nvim_exec_autocmds()`
+---
+---              • command (string) optional: Vim command to execute on event.
+---                Cannot be used with {callback}
+---              • once (boolean) optional: defaults to false. Run the
+---                autocommand only once `autocmd-once`.
+---              • nested (boolean) optional: defaults to false. Run nested
+---                autocommands `autocmd-nested`.
+--- @return integer
+function vim.api.nvim_create_autocmd(event, opts) end
+
+--- Creates a new, empty, unnamed buffer.
+---
+--- @param listed boolean Sets 'buflisted'
+--- @param scratch boolean Creates a "throwaway" `scratch-buffer` for temporary work
+---                (always 'nomodified'). Also sets 'nomodeline' on the
+---                buffer.
+--- @return integer
+function vim.api.nvim_create_buf(listed, scratch) end
+
+--- Creates a new namespace or gets an existing one. *namespace*
+--- Namespaces are used for buffer highlights and virtual text, see
+--- `nvim_buf_add_highlight()` and `nvim_buf_set_extmark()`.
+--- Namespaces can be named or anonymous. If `name` matches an existing
+--- namespace, the associated id is returned. If `name` is an empty string a
+--- new, anonymous namespace is created.
+---
+--- @param name string Namespace name or empty string
+--- @return integer
+function vim.api.nvim_create_namespace(name) end
+
+--- Creates a global `user-commands` command.
+--- For Lua usage see `lua-guide-commands-create`.
+--- Example:
+--- ```vim
+---    :call nvim_create_user_command('SayHello', 'echo "Hello world!"', {'bang': v:true})
+---    :SayHello
+---    Hello world!
+--- ```
+---
+--- @param name string Name of the new user command. Must begin with an uppercase
+---                letter.
+--- @param command any Replacement command to execute when this user command is
+---                executed. When called from Lua, the command can also be a
+---                Lua function. The function is called with a single table
+---                argument that contains the following keys:
+---                • name: (string) Command name
+---                • args: (string) The args passed to the command, if any
+---                  `<args>`
+---                • fargs: (table) The args split by unescaped whitespace
+---                  (when more than one argument is allowed), if any
+---                  `<f-args>`
+---                • nargs: (string) Number of arguments `:command-nargs`
+---                • bang: (boolean) "true" if the command was executed with a
+---                  ! modifier `<bang>`
+---                • line1: (number) The starting line of the command range
+---                  `<line1>`
+---                • line2: (number) The final line of the command range
+---                  `<line2>`
+---                • range: (number) The number of items in the command range:
+---                  0, 1, or 2 `<range>`
+---                • count: (number) Any count supplied `<count>`
+---                • reg: (string) The optional register, if specified `<reg>`
+---                • mods: (string) Command modifiers, if any `<mods>`
+---                • smods: (table) Command modifiers in a structured format.
+---                  Has the same structure as the "mods" key of
+---                  `nvim_parse_cmd()`.
+--- @param opts vim.api.keyset.user_command Optional `command-attributes`.
+---                • Set boolean attributes such as `:command-bang` or
+---                  `:command-bar` to true (but not `:command-buffer`, use
+---                  `nvim_buf_create_user_command()` instead).
+---                • "complete" `:command-complete` also accepts a Lua
+---                  function which works like
+---                  `:command-completion-customlist`.
+---                • Other parameters:
+---                  • desc: (string) Used for listing the command when a Lua
+---                    function is used for {command}.
+---                  • force: (boolean, default true) Override any previous
+---                    definition.
+---                  • preview: (function) Preview callback for 'inccommand'
+---                    `:command-preview`
+function vim.api.nvim_create_user_command(name, command, opts) end
+
+--- Delete an autocommand group by id.
+--- To get a group id one can use `nvim_get_autocmds()`.
+--- NOTE: behavior differs from `:augroup-delete`. When deleting a group,
+--- autocommands contained in this group will also be deleted and cleared.
+--- This group will no longer exist.
+---
+--- @param id integer Integer The id of the group.
+function vim.api.nvim_del_augroup_by_id(id) end
+
+--- Delete an autocommand group by name.
+--- NOTE: behavior differs from `:augroup-delete`. When deleting a group,
+--- autocommands contained in this group will also be deleted and cleared.
+--- This group will no longer exist.
+---
+--- @param name string String The name of the group.
+function vim.api.nvim_del_augroup_by_name(name) end
+
+--- Delete an autocommand by id.
+--- NOTE: Only autocommands created via the API have an id.
+---
+--- @param id integer Integer The id returned by nvim_create_autocmd
+function vim.api.nvim_del_autocmd(id) end
+
+--- Deletes the current line.
+---
+function vim.api.nvim_del_current_line() end
+
+--- Unmaps a global `mapping` for the given mode.
+--- To unmap a buffer-local mapping, use `nvim_buf_del_keymap()`.
+---
+--- @param mode string
+--- @param lhs string
+function vim.api.nvim_del_keymap(mode, lhs) end
+
+--- Deletes an uppercase/file named mark. See `mark-motions`.
+---
+--- @param name string Mark name
+--- @return boolean
+function vim.api.nvim_del_mark(name) end
+
+--- Delete a user-defined command.
+---
+--- @param name string Name of the command to delete.
+function vim.api.nvim_del_user_command(name) end
+
+--- Removes a global (g:) variable.
+---
+--- @param name string Variable name
+function vim.api.nvim_del_var(name) end
+
+--- Echo a message.
+---
+--- @param chunks any[] A list of [text, hl_group] arrays, each representing a text
+---                chunk with specified highlight. `hl_group` element can be
+---                omitted for no highlight.
+--- @param history boolean if true, add to `message-history`.
+--- @param opts vim.api.keyset.echo_opts Optional parameters.
+---                • verbose: Message was printed as a result of 'verbose'
+---                  option if Nvim was invoked with -V3log_file, the message
+---                  will be redirected to the log_file and suppressed from
+---                  direct output.
+function vim.api.nvim_echo(chunks, history, opts) end
+
+--- Writes a message to the Vim error buffer. Does not append "\n", the
+--- message is buffered (won't display) until a linefeed is written.
+---
+--- @param str string Message
+function vim.api.nvim_err_write(str) end
+
+--- Writes a message to the Vim error buffer. Appends "\n", so the buffer is
+--- flushed (and displayed).
+---
+--- @param str string Message
+function vim.api.nvim_err_writeln(str) end
+
+--- @param lvl integer
+--- @param data string
+function vim.api.nvim_error_event(lvl, data) end
+
+--- Evaluates a Vimscript `expression`. Dictionaries and Lists are recursively
+--- expanded.
+--- On execution error: fails with Vimscript error, updates v:errmsg.
+---
+--- @param expr string Vimscript expression string
+--- @return any
+function vim.api.nvim_eval(expr) end
+
+--- Evaluates statusline string.
+---
+--- @param str string Statusline string (see 'statusline').
+--- @param opts vim.api.keyset.eval_statusline Optional parameters.
+---             • winid: (number) `window-ID` of the window to use as context
+---               for statusline.
+---             • maxwidth: (number) Maximum width of statusline.
+---             • fillchar: (string) Character to fill blank spaces in the
+---               statusline (see 'fillchars'). Treated as single-width even
+---               if it isn't.
+---             • highlights: (boolean) Return highlight information.
+---             • use_winbar: (boolean) Evaluate winbar instead of statusline.
+---             • use_tabline: (boolean) Evaluate tabline instead of
+---               statusline. When true, {winid} is ignored. Mutually
+---               exclusive with {use_winbar}.
+---             • use_statuscol_lnum: (number) Evaluate statuscolumn for this
+---               line number instead of statusline.
+--- @return table<string,any>
+function vim.api.nvim_eval_statusline(str, opts) end
+
+--- @deprecated
+--- @param src string
+--- @param output boolean
+--- @return string
+function vim.api.nvim_exec(src, output) end
+
+--- Executes Vimscript (multiline block of Ex commands), like anonymous
+--- `:source`.
+--- Unlike `nvim_command()` this function supports heredocs, script-scope
+--- (s:), etc.
+--- On execution error: fails with Vimscript error, updates v:errmsg.
+---
+--- @param src string Vimscript code
+--- @param opts vim.api.keyset.exec_opts Optional parameters.
+---             • output: (boolean, default false) Whether to capture and
+---               return all (non-error, non-shell `:!`) output.
+--- @return table<string,any>
+function vim.api.nvim_exec2(src, opts) end
+
+--- Execute all autocommands for {event} that match the corresponding {opts}
+--- `autocmd-execute`.
+---
+--- @param event any (String|Array) The event or events to execute
+--- @param opts vim.api.keyset.exec_autocmds Dictionary of autocommand options:
+---              • group (string|integer) optional: the autocommand group name
+---                or id to match against. `autocmd-groups`.
+---              • pattern (string|array) optional: defaults to "*"
+---                `autocmd-pattern`. Cannot be used with {buffer}.
+---              • buffer (integer) optional: buffer number
+---                `autocmd-buflocal`. Cannot be used with {pattern}.
+---              • modeline (bool) optional: defaults to true. Process the
+---                modeline after the autocommands `<nomodeline>`.
+---              • data (any): arbitrary data to send to the autocommand
+---                callback. See `nvim_create_autocmd()` for details.
+function vim.api.nvim_exec_autocmds(event, opts) end
+
+--- Execute Lua code. Parameters (if any) are available as `...` inside the
+--- chunk. The chunk can return a value.
+--- Only statements are executed. To evaluate an expression, prefix it with
+--- `return`: return my_function(...)
+---
+--- @param code string Lua code to execute
+--- @param args any[] Arguments to the code
+--- @return any
+function vim.api.nvim_exec_lua(code, args) end
+
+--- @deprecated
+--- @param code string
+--- @param args any[]
+--- @return any
+function vim.api.nvim_execute_lua(code, args) end
+
+--- Sends input-keys to Nvim, subject to various quirks controlled by `mode`
+--- flags. This is a blocking call, unlike `nvim_input()`.
+--- On execution error: does not fail, but updates v:errmsg.
+--- To input sequences like <C-o> use `nvim_replace_termcodes()` (typically
+--- with escape_ks=false) to replace `keycodes`, then pass the result to
+--- nvim_feedkeys().
+--- Example:
+--- ```vim
+---     :let key = nvim_replace_termcodes("<C-o>", v:true, v:false, v:true)
+---     :call nvim_feedkeys(key, 'n', v:false)
+--- ```
+---
+--- @param keys string to be typed
+--- @param mode string behavior flags, see `feedkeys()`
+--- @param escape_ks boolean If true, escape K_SPECIAL bytes in `keys`. This should be
+---                  false if you already used `nvim_replace_termcodes()`, and
+---                  true otherwise.
+function vim.api.nvim_feedkeys(keys, mode, escape_ks) end
+
+--- Gets the option information for all options.
+--- The dictionary has the full option names as keys and option metadata
+--- dictionaries as detailed at `nvim_get_option_info2()`.
+---
+--- @return table<string,any>
+function vim.api.nvim_get_all_options_info() end
+
+--- Returns a 2-tuple (Array), where item 0 is the current channel id and item
+--- 1 is the `api-metadata` map (Dictionary).
+---
+--- @return any[]
+function vim.api.nvim_get_api_info() end
+
+--- Get all autocommands that match the corresponding {opts}.
+--- These examples will get autocommands matching ALL the given criteria:
+--- ```lua
+---   -- Matches all criteria
+---   autocommands = vim.api.nvim_get_autocmds({
+---     group = "MyGroup",
+---     event = {"BufEnter", "BufWinEnter"},
+---     pattern = {"*.c", "*.h"}
+---   })
+---
+---   -- All commands from one group
+---   autocommands = vim.api.nvim_get_autocmds({
+---     group = "MyGroup",
+---   })
+--- ```
+--- NOTE: When multiple patterns or events are provided, it will find all the
+--- autocommands that match any combination of them.
+---
+--- @param opts vim.api.keyset.get_autocmds Dictionary with at least one of the following:
+---             • group (string|integer): the autocommand group name or id to
+---               match against.
+---             • event (string|array): event or events to match against
+---               `autocmd-events`.
+---             • pattern (string|array): pattern or patterns to match against
+---               `autocmd-pattern`. Cannot be used with {buffer}
+---             • buffer: Buffer number or list of buffer numbers for buffer
+---               local autocommands `autocmd-buflocal`. Cannot be used with
+---               {pattern}
+--- @return any[]
+function vim.api.nvim_get_autocmds(opts) end
+
+--- Gets information about a channel.
+---
+--- @param chan integer
+--- @return table<string,any>
+function vim.api.nvim_get_chan_info(chan) end
+
+--- Returns the 24-bit RGB value of a `nvim_get_color_map()` color name or
+--- "#rrggbb" hexadecimal string.
+--- Example:
+--- ```vim
+---     :echo nvim_get_color_by_name("Pink")
+---     :echo nvim_get_color_by_name("#cbcbcb")
+--- ```
+---
+--- @param name string Color name or "#rrggbb" string
+--- @return integer
+function vim.api.nvim_get_color_by_name(name) end
+
+--- Returns a map of color names and RGB values.
+--- Keys are color names (e.g. "Aqua") and values are 24-bit RGB color values
+--- (e.g. 65535).
+---
+--- @return table<string,any>
+function vim.api.nvim_get_color_map() end
+
+--- Gets a map of global (non-buffer-local) Ex commands.
+--- Currently only `user-commands` are supported, not builtin Ex commands.
+---
+--- @param opts vim.api.keyset.get_commands Optional parameters. Currently only supports {"builtin":false}
+--- @return table<string,any>
+function vim.api.nvim_get_commands(opts) end
+
+--- Gets a map of the current editor state.
+---
+--- @param opts vim.api.keyset.context Optional parameters.
+---             • types: List of `context-types` ("regs", "jumps", "bufs",
+---               "gvars", …) to gather, or empty for "all".
+--- @return table<string,any>
+function vim.api.nvim_get_context(opts) end
+
+--- Gets the current buffer.
+---
+--- @return integer
+function vim.api.nvim_get_current_buf() end
+
+--- Gets the current line.
+---
+--- @return string
+function vim.api.nvim_get_current_line() end
+
+--- Gets the current tabpage.
+---
+--- @return integer
+function vim.api.nvim_get_current_tabpage() end
+
+--- Gets the current window.
+---
+--- @return integer
+function vim.api.nvim_get_current_win() end
+
+--- Gets all or specific highlight groups in a namespace.
+---
+--- @param ns_id integer Get highlight groups for namespace ns_id
+---              `nvim_get_namespaces()`. Use 0 to get global highlight groups
+---              `:highlight`.
+--- @param opts vim.api.keyset.get_highlight Options dict:
+---              • name: (string) Get a highlight definition by name.
+---              • id: (integer) Get a highlight definition by id.
+---              • link: (boolean, default true) Show linked group name
+---                instead of effective definition `:hi-link`.
+--- @return table<string,any>
+function vim.api.nvim_get_hl(ns_id, opts) end
+
+--- @deprecated
+--- @param hl_id integer
+--- @param rgb boolean
+--- @return table<string,any>
+function vim.api.nvim_get_hl_by_id(hl_id, rgb) end
+
+--- @deprecated
+--- @param name string
+--- @param rgb boolean
+--- @return table<string,any>
+function vim.api.nvim_get_hl_by_name(name, rgb) end
+
+--- Gets a highlight group by name
+--- similar to `hlID()`, but allocates a new ID if not present.
+---
+--- @param name string
+--- @return integer
+function vim.api.nvim_get_hl_id_by_name(name) end
+
+--- Gets a list of global (non-buffer-local) `mapping` definitions.
+---
+--- @param mode string Mode short-name ("n", "i", "v", ...)
+--- @return table<string,any>[]
+function vim.api.nvim_get_keymap(mode) end
+
+--- Returns a `(row, col, buffer, buffername)` tuple representing the position
+--- of the uppercase/file named mark. "End of line" column position is
+--- returned as `v:maxcol` (big number). See `mark-motions`.
+--- Marks are (1,0)-indexed. `api-indexing`
+---
+--- @param name string Mark name
+--- @param opts table<string,any> Optional parameters. Reserved for future use.
+--- @return any[]
+function vim.api.nvim_get_mark(name, opts) end
+
+--- Gets the current mode. `mode()` "blocking" is true if Nvim is waiting for
+--- input.
+---
+--- @return table<string,any>
+function vim.api.nvim_get_mode() end
+
+--- Gets existing, non-anonymous `namespace`s.
+---
+--- @return table<string,any>
+function vim.api.nvim_get_namespaces() end
+
+--- @param name string
+--- @return any
+function vim.api.nvim_get_option(name) end
+
+--- @param name string
+--- @return table<string,any>
+function vim.api.nvim_get_option_info(name) end
+
+--- Gets the option information for one option from arbitrary buffer or window
+--- Resulting dictionary has keys:
+--- • name: Name of the option (like 'filetype')
+--- • shortname: Shortened name of the option (like 'ft')
+--- • type: type of option ("string", "number" or "boolean")
+--- • default: The default value for the option
+--- • was_set: Whether the option was set.
+--- • last_set_sid: Last set script id (if any)
+--- • last_set_linenr: line number where option was set
+--- • last_set_chan: Channel where option was set (0 for local)
+--- • scope: one of "global", "win", or "buf"
+--- • global_local: whether win or buf option has a global value
+--- • commalist: List of comma separated values
+--- • flaglist: List of single char flags
+---
+--- When {scope} is not provided, the last set information applies to the
+--- local value in the current buffer or window if it is available, otherwise
+--- the global value information is returned. This behavior can be disabled by
+--- explicitly specifying {scope} in the {opts} table.
+---
+--- @param name string Option name
+--- @param opts vim.api.keyset.option Optional parameters
+---             • scope: One of "global" or "local". Analogous to `:setglobal`
+---               and `:setlocal`, respectively.
+---             • win: `window-ID`. Used for getting window local options.
+---             • buf: Buffer number. Used for getting buffer local options.
+---               Implies {scope} is "local".
+--- @return table<string,any>
+function vim.api.nvim_get_option_info2(name, opts) end
+
+--- Gets the value of an option. The behavior of this function matches that of
+--- `:set`: the local value of an option is returned if it exists; otherwise,
+--- the global value is returned. Local values always correspond to the
+--- current buffer or window, unless "buf" or "win" is set in {opts}.
+---
+--- @param name string Option name
+--- @param opts vim.api.keyset.option Optional parameters
+---             • scope: One of "global" or "local". Analogous to `:setglobal`
+---               and `:setlocal`, respectively.
+---             • win: `window-ID`. Used for getting window local options.
+---             • buf: Buffer number. Used for getting buffer local options.
+---               Implies {scope} is "local".
+---             • filetype: `filetype`. Used to get the default option for a
+---               specific filetype. Cannot be used with any other option.
+---               Note: this will trigger `ftplugin` and all `FileType`
+---               autocommands for the corresponding filetype.
+--- @return any
+function vim.api.nvim_get_option_value(name, opts) end
+
+--- Gets info describing process `pid`.
+---
+--- @param pid integer
+--- @return any
+function vim.api.nvim_get_proc(pid) end
+
+--- Gets the immediate children of process `pid`.
+---
+--- @param pid integer
+--- @return any[]
+function vim.api.nvim_get_proc_children(pid) end
+
+--- Find files in runtime directories
+--- "name" can contain wildcards. For example
+--- nvim_get_runtime_file("colors/*.vim", true) will return all color scheme
+--- files. Always use forward slashes (/) in the search pattern for
+--- subdirectories regardless of platform.
+--- It is not an error to not find any files. An empty array is returned then.
+---
+--- @param name string pattern of files to search for
+--- @param all boolean whether to return all matches or only the first
+--- @return string[]
+function vim.api.nvim_get_runtime_file(name, all) end
+
+--- Gets a global (g:) variable.
+---
+--- @param name string Variable name
+--- @return any
+function vim.api.nvim_get_var(name) end
+
+--- Gets a v: variable.
+---
+--- @param name string Variable name
+--- @return any
+function vim.api.nvim_get_vvar(name) end
+
+--- Queues raw user-input. Unlike `nvim_feedkeys()`, this uses a low-level
+--- input buffer and the call is non-blocking (input is processed
+--- asynchronously by the eventloop).
+--- On execution error: does not fail, but updates v:errmsg.
+---
+--- @param keys string to be typed
+--- @return integer
+function vim.api.nvim_input(keys) end
+
+--- Send mouse event from GUI.
+--- Non-blocking: does not wait on any result, but queues the event to be
+--- processed soon by the event loop.
+---
+--- @param button string Mouse button: one of "left", "right", "middle", "wheel",
+---                 "move".
+--- @param action string For ordinary buttons, one of "press", "drag", "release".
+---                 For the wheel, one of "up", "down", "left", "right".
+---                 Ignored for "move".
+--- @param modifier string String of modifiers each represented by a single char. The
+---                 same specifiers are used as for a key press, except that
+---                 the "-" separator is optional, so "C-A-", "c-a" and "CA"
+---                 can all be used to specify Ctrl+Alt+click.
+--- @param grid integer Grid number if the client uses `ui-multigrid`, else 0.
+--- @param row integer Mouse row-position (zero-based, like redraw events)
+--- @param col integer Mouse column-position (zero-based, like redraw events)
+function vim.api.nvim_input_mouse(button, action, modifier, grid, row, col) end
+
+--- Gets the current list of buffer handles
+--- Includes unlisted (unloaded/deleted) buffers, like `:ls!`. Use
+--- `nvim_buf_is_loaded()` to check if a buffer is loaded.
+---
+--- @return integer[]
+function vim.api.nvim_list_bufs() end
+
+--- Get information about all open channels.
+---
+--- @return any[]
+function vim.api.nvim_list_chans() end
+
+--- Gets the paths contained in `runtime-search-path`.
+---
+--- @return string[]
+function vim.api.nvim_list_runtime_paths() end
+
+--- Gets the current list of tabpage handles.
+---
+--- @return integer[]
+function vim.api.nvim_list_tabpages() end
+
+--- Gets a list of dictionaries representing attached UIs.
+---
+--- @return any[]
+function vim.api.nvim_list_uis() end
+
+--- Gets the current list of window handles.
+---
+--- @return integer[]
+function vim.api.nvim_list_wins() end
+
+--- Sets the current editor state from the given `context` map.
+---
+--- @param dict table<string,any> `Context` map.
+--- @return any
+function vim.api.nvim_load_context(dict) end
+
+--- Notify the user with a message
+--- Relays the call to vim.notify . By default forwards your message in the
+--- echo area but can be overridden to trigger desktop notifications.
+---
+--- @param msg string Message to display to the user
+--- @param log_level integer The log level
+--- @param opts table<string,any> Reserved for future use.
+--- @return any
+function vim.api.nvim_notify(msg, log_level, opts) end
+
+--- Open a terminal instance in a buffer
+--- By default (and currently the only option) the terminal will not be
+--- connected to an external process. Instead, input send on the channel will
+--- be echoed directly by the terminal. This is useful to display ANSI
+--- terminal sequences returned as part of a rpc message, or similar.
+--- Note: to directly initiate the terminal using the right size, display the
+--- buffer in a configured window before calling this. For instance, for a
+--- floating display, first create an empty buffer using `nvim_create_buf()`,
+--- then display it using `nvim_open_win()`, and then call this function. Then
+--- `nvim_chan_send()` can be called immediately to process sequences in a
+--- virtual terminal having the intended size.
+---
+--- @param buffer integer the buffer to use (expected to be empty)
+--- @param opts table<string,function> Optional parameters.
+---               • on_input: Lua callback for input sent, i e keypresses in
+---                 terminal mode. Note: keypresses are sent raw as they would
+---                 be to the pty master end. For instance, a carriage return
+---                 is sent as a "\r", not as a "\n". `textlock` applies. It
+---                 is possible to call `nvim_chan_send()` directly in the
+---                 callback however. ["input", term, bufnr, data]
+--- @return integer
+function vim.api.nvim_open_term(buffer, opts) end
+
+--- Open a new window.
+--- Currently this is used to open floating and external windows. Floats are
+--- windows that are drawn above the split layout, at some anchor position in
+--- some other window. Floats can be drawn internally or by external GUI with
+--- the `ui-multigrid` extension. External windows are only supported with
+--- multigrid GUIs, and are displayed as separate top-level windows.
+--- For a general overview of floats, see `api-floatwin`.
+--- Exactly one of `external` and `relative` must be specified. The `width`
+--- and `height` of the new window must be specified.
+--- With relative=editor (row=0,col=0) refers to the top-left corner of the
+--- screen-grid and (row=Lines-1,col=Columns-1) refers to the bottom-right
+--- corner. Fractional values are allowed, but the builtin implementation
+--- (used by non-multigrid UIs) will always round down to nearest integer.
+--- Out-of-bounds values, and configurations that make the float not fit
+--- inside the main editor, are allowed. The builtin implementation truncates
+--- values so floats are fully within the main screen grid. External GUIs
+--- could let floats hover outside of the main window like a tooltip, but this
+--- should not be used to specify arbitrary WM screen positions.
+--- Example (Lua): window-relative float
+--- ```lua
+---     vim.api.nvim_open_win(0, false,
+---       {relative='win', row=3, col=3, width=12, height=3})
+--- ```
+--- Example (Lua): buffer-relative float (travels as buffer is scrolled)
+--- ```lua
+---     vim.api.nvim_open_win(0, false,
+---       {relative='win', width=12, height=3, bufpos={100,10}})
+--- ```
+---
+--- @param buffer integer Buffer to display, or 0 for current buffer
+--- @param enter boolean Enter the window (make it the current window)
+--- @param config vim.api.keyset.float_config Map defining the window configuration. Keys:
+---               • relative: Sets the window layout to "floating", placed at
+---                 (row,col) coordinates relative to:
+---                 • "editor" The global editor grid
+---                 • "win" Window given by the `win` field, or current
+---                   window.
+---                 • "cursor" Cursor position in current window.
+---                 • "mouse" Mouse position
+---
+---               • win: `window-ID` for relative="win".
+---               • anchor: Decides which corner of the float to place at
+---                 (row,col):
+---                 • "NW" northwest (default)
+---                 • "NE" northeast
+---                 • "SW" southwest
+---                 • "SE" southeast
+---
+---               • width: Window width (in character cells). Minimum of 1.
+---               • height: Window height (in character cells). Minimum of 1.
+---               • bufpos: Places float relative to buffer text (only when
+---                 relative="win"). Takes a tuple of zero-indexed [line,
+---                 column]. `row` and `col` if given are applied relative to this position, else they
+---                 default to:
+---                 • `row=1` and `col=0` if `anchor` is "NW" or "NE"
+---                 • `row=0` and `col=0` if `anchor` is "SW" or "SE" (thus
+---                   like a tooltip near the buffer text).
+---
+---               • row: Row position in units of "screen cell height", may be
+---                 fractional.
+---               • col: Column position in units of "screen cell width", may
+---                 be fractional.
+---               • focusable: Enable focus by user actions (wincmds, mouse
+---                 events). Defaults to true. Non-focusable windows can be
+---                 entered by `nvim_set_current_win()`.
+---               • external: GUI should display the window as an external
+---                 top-level window. Currently accepts no other positioning
+---                 configuration together with this.
+---               • zindex: Stacking order. floats with higher `zindex` go on top on floats with lower indices. Must be larger
+---                 than zero. The following screen elements have hard-coded
+---                 z-indices:
+---                 • 100: insert completion popupmenu
+---                 • 200: message scrollback
+---                 • 250: cmdline completion popupmenu (when
+---                   wildoptions+=pum) The default value for floats are 50.
+---                   In general, values below 100 are recommended, unless
+---                   there is a good reason to overshadow builtin elements.
+---
+---               • style: (optional) Configure the appearance of the window.
+---                 Currently only supports one value:
+---                 • "minimal" Nvim will display the window with many UI
+---                   options disabled. This is useful when displaying a
+---                   temporary float where the text should not be edited.
+---                   Disables 'number', 'relativenumber', 'cursorline',
+---                   'cursorcolumn', 'foldcolumn', 'spell' and 'list'
+---                   options. 'signcolumn' is changed to `auto` and
+---                   'colorcolumn' is cleared. 'statuscolumn' is changed to
+---                   empty. The end-of-buffer region is hidden by setting
+---                   `eob` flag of 'fillchars' to a space char, and clearing
+---                   the `hl-EndOfBuffer` region in 'winhighlight'.
+---
+---               • border: Style of (optional) window border. This can either
+---                 be a string or an array. The string values are
+---                 • "none": No border (default).
+---                 • "single": A single line box.
+---                 • "double": A double line box.
+---                 • "rounded": Like "single", but with rounded corners ("╭"
+---                   etc.).
+---                 • "solid": Adds padding by a single whitespace cell.
+---                 • "shadow": A drop shadow effect by blending with the
+---                   background.
+---                 • If it is an array, it should have a length of eight or
+---                   any divisor of eight. The array will specifify the eight
+---                   chars building up the border in a clockwise fashion
+---                   starting with the top-left corner. As an example, the
+---                   double box style could be specified as [ "╔", "═" ,"╗",
+---                   "║", "╝", "═", "╚", "║" ]. If the number of chars are
+---                   less than eight, they will be repeated. Thus an ASCII
+---                   border could be specified as [ "/", "-", "\\", "|" ], or
+---                   all chars the same as [ "x" ]. An empty string can be
+---                   used to turn off a specific border, for instance, [ "",
+---                   "", "", ">", "", "", "", "<" ] will only make vertical
+---                   borders but not horizontal ones. By default,
+---                   `FloatBorder` highlight is used, which links to
+---                   `WinSeparator` when not defined. It could also be
+---                   specified by character: [ ["+", "MyCorner"], ["x",
+---                   "MyBorder"] ].
+---
+---               • title: Title (optional) in window border, String or list.
+---                 List is [text, highlight] tuples. if is string the default
+---                 highlight group is `FloatTitle`.
+---               • title_pos: Title position must set with title option.
+---                 value can be of `left` `center` `right` default is left.
+---               • noautocmd: If true then no buffer-related autocommand
+---                 events such as `BufEnter`, `BufLeave` or `BufWinEnter` may
+---                 fire from calling this function.
+--- @return integer
+function vim.api.nvim_open_win(buffer, enter, config) end
+
+--- Writes a message to the Vim output buffer. Does not append "\n", the
+--- message is buffered (won't display) until a linefeed is written.
+---
+--- @param str string Message
+function vim.api.nvim_out_write(str) end
+
+--- Parse command line.
+--- Doesn't check the validity of command arguments.
+---
+--- @param str string Command line string to parse. Cannot contain "\n".
+--- @param opts table<string,any> Optional parameters. Reserved for future use.
+--- @return table<string,any>
+function vim.api.nvim_parse_cmd(str, opts) end
+
+--- Parse a Vimscript expression.
+---
+--- @param expr string Expression to parse. Always treated as a single line.
+--- @param flags string Flags:
+---                  • "m" if multiple expressions in a row are allowed (only
+---                    the first one will be parsed),
+---                  • "E" if EOC tokens are not allowed (determines whether
+---                    they will stop parsing process or be recognized as an
+---                    operator/space, though also yielding an error).
+---                  • "l" when needing to start parsing with lvalues for
+---                    ":let" or ":for". Common flag sets:
+---                  • "m" to parse like for ":echo".
+---                  • "E" to parse like for "<C-r>=".
+---                  • empty string for ":call".
+---                  • "lm" to parse for ":let".
+--- @param highlight boolean If true, return value will also include "highlight" key
+---                  containing array of 4-tuples (arrays) (Integer, Integer,
+---                  Integer, String), where first three numbers define the
+---                  highlighted region and represent line, starting column
+---                  and ending column (latter exclusive: one should highlight
+---                  region [start_col, end_col)).
+--- @return table<string,any>
+function vim.api.nvim_parse_expression(expr, flags, highlight) end
+
+--- Pastes at cursor, in any mode.
+--- Invokes the `vim.paste` handler, which handles each mode appropriately.
+--- Sets redo/undo. Faster than `nvim_input()`. Lines break at LF ("\n").
+--- Errors ('nomodifiable', `vim.paste()` failure, …) are reflected in `err`
+--- but do not affect the return value (which is strictly decided by
+--- `vim.paste()`). On error, subsequent calls are ignored ("drained") until
+--- the next paste is initiated (phase 1 or -1).
+---
+--- @param data string Multiline input. May be binary (containing NUL bytes).
+--- @param crlf boolean Also break lines at CR and CRLF.
+--- @param phase integer -1: paste in a single call (i.e. without streaming). To
+---              "stream" a paste, call `nvim_paste` sequentially with these `phase` values:
+---              • 1: starts the paste (exactly once)
+---              • 2: continues the paste (zero or more times)
+---              • 3: ends the paste (exactly once)
+--- @return boolean
+function vim.api.nvim_paste(data, crlf, phase) end
+
+--- Puts text at cursor, in any mode.
+--- Compare `:put` and `p` which are always linewise.
+---
+--- @param lines string[] `readfile()`-style list of lines. `channel-lines`
+--- @param type string Edit behavior: any `getregtype()` result, or:
+---               • "b" `blockwise-visual` mode (may include width, e.g. "b3")
+---               • "c" `charwise` mode
+---               • "l" `linewise` mode
+---               • "" guess by contents, see `setreg()`
+--- @param after boolean If true insert after cursor (like `p`), or before (like
+---               `P`).
+--- @param follow boolean If true place cursor at end of inserted text.
+function vim.api.nvim_put(lines, type, after, follow) end
+
+--- Replaces terminal codes and `keycodes` (<CR>, <Esc>, ...) in a string with
+--- the internal representation.
+---
+--- @param str string String to be converted.
+--- @param from_part boolean Legacy Vim parameter. Usually true.
+--- @param do_lt boolean Also translate <lt>. Ignored if `special` is false.
+--- @param special boolean Replace `keycodes`, e.g. <CR> becomes a "\r" char.
+--- @return string
+function vim.api.nvim_replace_termcodes(str, from_part, do_lt, special) end
+
+--- Selects an item in the completion popup menu.
+--- If neither `ins-completion` nor `cmdline-completion` popup menu is active
+--- this API call is silently ignored. Useful for an external UI using
+--- `ui-popupmenu` to control the popup menu with the mouse. Can also be used
+--- in a mapping; use <Cmd> `:map-cmd` or a Lua mapping to ensure the mapping
+--- doesn't end completion mode.
+---
+--- @param item integer Index (zero-based) of the item to select. Value of -1
+---               selects nothing and restores the original text.
+--- @param insert boolean For `ins-completion`, whether the selection should be
+---               inserted in the buffer. Ignored for `cmdline-completion`.
+--- @param finish boolean Finish the completion and dismiss the popup menu. Implies
+---               {insert}.
+--- @param opts table<string,any> Optional parameters. Reserved for future use.
+function vim.api.nvim_select_popupmenu_item(item, insert, finish, opts) end
+
+--- Self-identifies the client.
+--- The client/plugin/application should call this after connecting, to
+--- provide hints about its identity and purpose, for debugging and
+--- orchestration.
+--- Can be called more than once; the caller should merge old info if
+--- appropriate. Example: library first identifies the channel, then a plugin
+--- using that library later identifies itself.
+---
+--- @param name string Short name for the connected client
+--- @param version table<string,any> Dictionary describing the version, with these (optional)
+---                   keys:
+---                   • "major" major version (defaults to 0 if not set, for
+---                     no release yet)
+---                   • "minor" minor version
+---                   • "patch" patch number
+---                   • "prerelease" string describing a prerelease, like
+---                     "dev" or "beta1"
+---                   • "commit" hash or similar identifier of commit
+--- @param type string Must be one of the following values. Client libraries
+---                   should default to "remote" unless overridden by the
+---                   user.
+---                   • "remote" remote client connected to Nvim.
+---                   • "ui" gui frontend
+---                   • "embedder" application using Nvim as a component (for
+---                     example, IDE/editor implementing a vim mode).
+---                   • "host" plugin host, typically started by nvim
+---                   • "plugin" single plugin, started by nvim
+--- @param methods table<string,any> Builtin methods in the client. For a host, this does not
+---                   include plugin methods which will be discovered later.
+---                   The key should be the method name, the values are dicts
+---                   with these (optional) keys (more keys may be added in
+---                   future versions of Nvim, thus unknown keys are ignored.
+---                   Clients must only use keys defined in this or later
+---                   versions of Nvim):
+---                   • "async" if true, send as a notification. If false or
+---                     unspecified, use a blocking request
+---                   • "nargs" Number of arguments. Could be a single integer
+---                     or an array of two integers, minimum and maximum
+---                     inclusive.
+--- @param attributes table<string,any> Arbitrary string:string map of informal client
+---                   properties. Suggested keys:
+---                   • "website": Client homepage URL (e.g. GitHub
+---                     repository)
+---                   • "license": License description ("Apache 2", "GPLv3",
+---                     "MIT", …)
+---                   • "logo": URI or path to image, preferably small logo or
+---                     icon. .png or .svg format is preferred.
+function vim.api.nvim_set_client_info(name, version, type, methods, attributes) end
+
+--- Sets the current buffer.
+---
+--- @param buffer integer Buffer handle
+function vim.api.nvim_set_current_buf(buffer) end
+
+--- Changes the global working directory.
+---
+--- @param dir string Directory path
+function vim.api.nvim_set_current_dir(dir) end
+
+--- Sets the current line.
+---
+--- @param line string Line contents
+function vim.api.nvim_set_current_line(line) end
+
+--- Sets the current tabpage.
+---
+--- @param tabpage integer Tabpage handle
+function vim.api.nvim_set_current_tabpage(tabpage) end
+
+--- Sets the current window.
+---
+--- @param window integer Window handle
+function vim.api.nvim_set_current_win(window) end
+
+--- Set or change decoration provider for a `namespace`
+--- This is a very general purpose interface for having Lua callbacks being
+--- triggered during the redraw code.
+--- The expected usage is to set `extmarks` for the currently redrawn buffer.
+--- `nvim_buf_set_extmark()` can be called to add marks on a per-window or
+--- per-lines basis. Use the `ephemeral` key to only use the mark for the
+--- current screen redraw (the callback will be called again for the next
+--- redraw ).
+--- Note: this function should not be called often. Rather, the callbacks
+--- themselves can be used to throttle unneeded callbacks. the `on_start`
+--- callback can return `false` to disable the provider until the next redraw.
+--- Similarly, return `false` in `on_win` will skip the `on_lines` calls for
+--- that window (but any extmarks set in `on_win` will still be used). A
+--- plugin managing multiple sources of decoration should ideally only set one
+--- provider, and merge the sources internally. You can use multiple `ns_id`
+--- for the extmarks set/modified inside the callback anyway.
+--- Note: doing anything other than setting extmarks is considered
+--- experimental. Doing things like changing options are not explicitly
+--- forbidden, but is likely to have unexpected consequences (such as 100% CPU
+--- consumption). doing `vim.rpcnotify` should be OK, but `vim.rpcrequest` is
+--- quite dubious for the moment.
+--- Note: It is not allowed to remove or update extmarks in 'on_line'
+--- callbacks.
+---
+--- @param ns_id integer Namespace id from `nvim_create_namespace()`
+--- @param opts vim.api.keyset.set_decoration_provider Table of callbacks:
+---              • on_start: called first on each screen redraw ["start",
+---                tick]
+---              • on_buf: called for each buffer being redrawn (before window
+---                callbacks) ["buf", bufnr, tick]
+---              • on_win: called when starting to redraw a specific window.
+---                ["win", winid, bufnr, topline, botline_guess]
+---              • on_line: called for each buffer line being redrawn. (The
+---                interaction with fold lines is subject to change) ["win",
+---                winid, bufnr, row]
+---              • on_end: called at the end of a redraw cycle ["end", tick]
+function vim.api.nvim_set_decoration_provider(ns_id, opts) end
+
+--- Sets a highlight group.
+---
+--- @param ns_id integer Namespace id for this highlight `nvim_create_namespace()`.
+---              Use 0 to set a highlight group globally `:highlight`.
+---              Highlights from non-global namespaces are not active by
+---              default, use `nvim_set_hl_ns()` or `nvim_win_set_hl_ns()` to
+---              activate them.
+--- @param name string Highlight group name, e.g. "ErrorMsg"
+--- @param val vim.api.keyset.highlight Highlight definition map, accepts the following keys:
+---              • fg (or foreground): color name or "#RRGGBB", see note.
+---              • bg (or background): color name or "#RRGGBB", see note.
+---              • sp (or special): color name or "#RRGGBB"
+---              • blend: integer between 0 and 100
+---              • bold: boolean
+---              • standout: boolean
+---              • underline: boolean
+---              • undercurl: boolean
+---              • underdouble: boolean
+---              • underdotted: boolean
+---              • underdashed: boolean
+---              • strikethrough: boolean
+---              • italic: boolean
+---              • reverse: boolean
+---              • nocombine: boolean
+---              • link: name of another highlight group to link to, see
+---                `:hi-link`.
+---              • default: Don't override existing definition `:hi-default`
+---              • ctermfg: Sets foreground of cterm color `ctermfg`
+---              • ctermbg: Sets background of cterm color `ctermbg`
+---              • cterm: cterm attribute map, like `highlight-args`. If not
+---                set, cterm attributes will match those from the attribute
+---                map documented above.
+function vim.api.nvim_set_hl(ns_id, name, val) end
+
+--- Set active namespace for highlights defined with `nvim_set_hl()`. This can
+--- be set for a single window, see `nvim_win_set_hl_ns()`.
+---
+--- @param ns_id integer the namespace to use
+function vim.api.nvim_set_hl_ns(ns_id) end
+
+--- Set active namespace for highlights defined with `nvim_set_hl()` while
+--- redrawing.
+--- This function meant to be called while redrawing, primarily from
+--- `nvim_set_decoration_provider()` on_win and on_line callbacks, which are
+--- allowed to change the namespace during a redraw cycle.
+---
+--- @param ns_id integer the namespace to activate
+function vim.api.nvim_set_hl_ns_fast(ns_id) end
+
+--- Sets a global `mapping` for the given mode.
+--- To set a buffer-local mapping, use `nvim_buf_set_keymap()`.
+--- Unlike `:map`, leading/trailing whitespace is accepted as part of the
+--- {lhs} or {rhs}. Empty {rhs} is `<Nop>`. `keycodes` are replaced as usual.
+--- Example:
+--- ```vim
+---     call nvim_set_keymap('n', ' <NL>', '', {'nowait': v:true})
+--- ```
+--- is equivalent to:
+--- ```vim
+---     nmap <nowait> <Space><NL> <Nop>
+--- ```
+---
+--- @param mode string Mode short-name (map command prefix: "n", "i", "v", "x", …) or
+---             "!" for `:map!`, or empty string for `:map`. "ia", "ca" or
+---             "!a" for abbreviation in Insert mode, Cmdline mode, or both,
+---             respectively
+--- @param lhs string Left-hand-side `{lhs}` of the mapping.
+--- @param rhs string Right-hand-side `{rhs}` of the mapping.
+--- @param opts vim.api.keyset.keymap Optional parameters map: Accepts all `:map-arguments` as keys
+---             except `<buffer>`, values are booleans (default false). Also:
+---             • "noremap" non-recursive mapping `:noremap`
+---             • "desc" human-readable description.
+---             • "callback" Lua function called in place of {rhs}.
+---             • "replace_keycodes" (boolean) When "expr" is true, replace
+---               keycodes in the resulting string (see
+---               `nvim_replace_termcodes()`). Returning nil from the Lua
+---               "callback" is equivalent to returning an empty string.
+function vim.api.nvim_set_keymap(mode, lhs, rhs, opts) end
+
+--- @param name string
+--- @param value any
+function vim.api.nvim_set_option(name, value) end
+
+--- Sets the value of an option. The behavior of this function matches that of
+--- `:set`: for global-local options, both the global and local value are set
+--- unless otherwise specified with {scope}.
+--- Note the options {win} and {buf} cannot be used together.
+---
+--- @param name string Option name
+--- @param value any New option value
+--- @param opts vim.api.keyset.option Optional parameters
+---              • scope: One of "global" or "local". Analogous to
+---                `:setglobal` and `:setlocal`, respectively.
+---              • win: `window-ID`. Used for setting window local option.
+---              • buf: Buffer number. Used for setting buffer local option.
+function vim.api.nvim_set_option_value(name, value, opts) end
+
+--- Sets a global (g:) variable.
+---
+--- @param name string Variable name
+--- @param value any Variable value
+function vim.api.nvim_set_var(name, value) end
+
+--- Sets a v: variable, if it is not readonly.
+---
+--- @param name string Variable name
+--- @param value any Variable value
+function vim.api.nvim_set_vvar(name, value) end
+
+--- Calculates the number of display cells occupied by `text`. Control
+--- characters including <Tab> count as one cell.
+---
+--- @param text string Some text
+--- @return integer
+function vim.api.nvim_strwidth(text) end
+
+--- Subscribes to event broadcasts.
+---
+--- @param event string Event type string
+function vim.api.nvim_subscribe(event) end
+
+--- Removes a tab-scoped (t:) variable
+---
+--- @param tabpage integer Tabpage handle, or 0 for current tabpage
+--- @param name string Variable name
+function vim.api.nvim_tabpage_del_var(tabpage, name) end
+
+--- Gets the tabpage number
+---
+--- @param tabpage integer Tabpage handle, or 0 for current tabpage
+--- @return integer
+function vim.api.nvim_tabpage_get_number(tabpage) end
+
+--- Gets a tab-scoped (t:) variable
+---
+--- @param tabpage integer Tabpage handle, or 0 for current tabpage
+--- @param name string Variable name
+--- @return any
+function vim.api.nvim_tabpage_get_var(tabpage, name) end
+
+--- Gets the current window in a tabpage
+---
+--- @param tabpage integer Tabpage handle, or 0 for current tabpage
+--- @return integer
+function vim.api.nvim_tabpage_get_win(tabpage) end
+
+--- Checks if a tabpage is valid
+---
+--- @param tabpage integer Tabpage handle, or 0 for current tabpage
+--- @return boolean
+function vim.api.nvim_tabpage_is_valid(tabpage) end
+
+--- Gets the windows in a tabpage
+---
+--- @param tabpage integer Tabpage handle, or 0 for current tabpage
+--- @return integer[]
+function vim.api.nvim_tabpage_list_wins(tabpage) end
+
+--- Sets a tab-scoped (t:) variable
+---
+--- @param tabpage integer Tabpage handle, or 0 for current tabpage
+--- @param name string Variable name
+--- @param value any Variable value
+function vim.api.nvim_tabpage_set_var(tabpage, name, value) end
+
+--- Activates UI events on the channel.
+--- Entry point of all UI clients. Allows `--embed` to continue startup.
+--- Implies that the client is ready to show the UI. Adds the client to the
+--- list of UIs. `nvim_list_uis()`
+---
+--- @param width integer Requested screen columns
+--- @param height integer Requested screen rows
+--- @param options table<string,any> `ui-option` map
+function vim.api.nvim_ui_attach(width, height, options) end
+
+--- Deactivates UI events on the channel.
+--- Removes the client from the list of UIs. `nvim_list_uis()`
+---
+function vim.api.nvim_ui_detach() end
+
+--- Tells Nvim the geometry of the popupmenu, to align floating windows with
+--- an external popup menu.
+--- Note that this method is not to be confused with
+--- `nvim_ui_pum_set_height()`, which sets the number of visible items in the
+--- popup menu, while this function sets the bounding box of the popup menu,
+--- including visual elements such as borders and sliders. Floats need not use
+--- the same font size, nor be anchored to exact grid corners, so one can set
+--- floating-point numbers to the popup menu geometry.
+---
+--- @param width number Popupmenu width.
+--- @param height number Popupmenu height.
+--- @param row number Popupmenu row.
+--- @param col number Popupmenu height.
+function vim.api.nvim_ui_pum_set_bounds(width, height, row, col) end
+
+--- Tells Nvim the number of elements displaying in the popupmenu, to decide
+--- <PageUp> and <PageDown> movement.
+---
+--- @param height integer Popupmenu height, must be greater than zero.
+function vim.api.nvim_ui_pum_set_height(height) end
+
+--- @param gained boolean
+function vim.api.nvim_ui_set_focus(gained) end
+
+--- @param name string
+--- @param value any
+function vim.api.nvim_ui_set_option(name, value) end
+
+--- @param width integer
+--- @param height integer
+function vim.api.nvim_ui_try_resize(width, height) end
+
+--- Tell Nvim to resize a grid. Triggers a grid_resize event with the
+--- requested grid size or the maximum size if it exceeds size limits.
+--- On invalid grid handle, fails with error.
+---
+--- @param grid integer The handle of the grid to be changed.
+--- @param width integer The new requested width.
+--- @param height integer The new requested height.
+function vim.api.nvim_ui_try_resize_grid(grid, width, height) end
+
+--- Unsubscribes to event broadcasts.
+---
+--- @param event string Event type string
+function vim.api.nvim_unsubscribe(event) end
+
+--- Calls a function with window as temporary current window.
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param fun function Function to call inside the window (currently Lua callable
+---               only)
+--- @return any
+function vim.api.nvim_win_call(window, fun) end
+
+--- Closes the window (like `:close` with a `window-ID`).
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param force boolean Behave like `:close!` The last window of a buffer with
+---               unwritten changes can be closed. The buffer will become
+---               hidden, even if 'hidden' is not set.
+function vim.api.nvim_win_close(window, force) end
+
+--- Removes a window-scoped (w:) variable
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param name string Variable name
+function vim.api.nvim_win_del_var(window, name) end
+
+--- Gets the current buffer in a window
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return integer
+function vim.api.nvim_win_get_buf(window) end
+
+--- Gets window configuration.
+--- The returned value may be given to `nvim_open_win()`.
+--- `relative` is empty for normal windows.
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return table<string,any>
+function vim.api.nvim_win_get_config(window) end
+
+--- Gets the (1,0)-indexed, buffer-relative cursor position for a given window
+--- (different windows showing the same buffer have independent cursor
+--- positions). `api-indexing`
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return integer[]
+function vim.api.nvim_win_get_cursor(window) end
+
+--- Gets the window height
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return integer
+function vim.api.nvim_win_get_height(window) end
+
+--- Gets the window number
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return integer
+function vim.api.nvim_win_get_number(window) end
+
+--- @param window integer
+--- @param name string
+--- @return any
+function vim.api.nvim_win_get_option(window, name) end
+
+--- Gets the window position in display cells. First position is zero.
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return integer[]
+function vim.api.nvim_win_get_position(window) end
+
+--- Gets the window tabpage
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return integer
+function vim.api.nvim_win_get_tabpage(window) end
+
+--- Gets a window-scoped (w:) variable
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param name string Variable name
+--- @return any
+function vim.api.nvim_win_get_var(window, name) end
+
+--- Gets the window width
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return integer
+function vim.api.nvim_win_get_width(window) end
+
+--- Closes the window and hide the buffer it contains (like `:hide` with a
+--- `window-ID`).
+--- Like `:hide` the buffer becomes hidden unless another window is editing
+--- it, or 'bufhidden' is `unload`, `delete` or `wipe` as opposed to `:close`
+--- or `nvim_win_close()`, which will close the buffer.
+---
+--- @param window integer Window handle, or 0 for current window
+function vim.api.nvim_win_hide(window) end
+
+--- Checks if a window is valid
+---
+--- @param window integer Window handle, or 0 for current window
+--- @return boolean
+function vim.api.nvim_win_is_valid(window) end
+
+--- Sets the current buffer in a window, without side effects
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param buffer integer Buffer handle
+function vim.api.nvim_win_set_buf(window, buffer) end
+
+--- Configures window layout. Currently only for floating and external windows
+--- (including changing a split window to those layouts).
+--- When reconfiguring a floating window, absent option keys will not be
+--- changed. `row`/`col` and `relative` must be reconfigured together.
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param config vim.api.keyset.float_config Map defining the window configuration, see `nvim_open_win()`
+function vim.api.nvim_win_set_config(window, config) end
+
+--- Sets the (1,0)-indexed cursor position in the window. `api-indexing` This
+--- scrolls the window even if it is not the current one.
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param pos integer[] (row, col) tuple representing the new position
+function vim.api.nvim_win_set_cursor(window, pos) end
+
+--- Sets the window height.
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param height integer Height as a count of rows
+function vim.api.nvim_win_set_height(window, height) end
+
+--- Set highlight namespace for a window. This will use highlights defined
+--- with `nvim_set_hl()` for this namespace, but fall back to global
+--- highlights (ns=0) when missing.
+--- This takes precedence over the 'winhighlight' option.
+---
+--- @param window integer
+--- @param ns_id integer the namespace to use
+function vim.api.nvim_win_set_hl_ns(window, ns_id) end
+
+--- @param window integer
+--- @param name string
+--- @param value any
+function vim.api.nvim_win_set_option(window, name, value) end
+
+--- Sets a window-scoped (w:) variable
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param name string Variable name
+--- @param value any Variable value
+function vim.api.nvim_win_set_var(window, name, value) end
+
+--- Sets the window width. This will only succeed if the screen is split
+--- vertically.
+---
+--- @param window integer Window handle, or 0 for current window
+--- @param width integer Width as a count of columns
+function vim.api.nvim_win_set_width(window, width) end
+
+--- Computes the number of screen lines occupied by a range of text in a given
+--- window. Works for off-screen text and takes folds into account.
+--- Diff filler or virtual lines above a line are counted as a part of that
+--- line, unless the line is on "start_row" and "start_vcol" is specified.
+--- Diff filler or virtual lines below the last buffer line are counted in the
+--- result when "end_row" is omitted.
+--- Line indexing is similar to `nvim_buf_get_text()`.
+---
+--- @param window integer Window handle, or 0 for current window.
+--- @param opts vim.api.keyset.win_text_height Optional parameters:
+---               • start_row: Starting line index, 0-based inclusive. When
+---                 omitted start at the very top.
+---               • end_row: Ending line index, 0-based inclusive. When
+---                 omitted end at the very bottom.
+---               • start_vcol: Starting virtual column index on "start_row",
+---                 0-based inclusive, rounded down to full screen lines. When
+---                 omitted include the whole line.
+---               • end_vcol: Ending virtual column index on "end_row",
+---                 0-based exclusive, rounded up to full screen lines. When
+---                 omitted include the whole line.
+--- @return table<string,any>
+function vim.api.nvim_win_text_height(window, opts) end
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
new file mode 100644
index 0000000000..184eb7a060
--- /dev/null
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -0,0 +1,249 @@
+--- @meta
+-- THIS FILE IS GENERATED
+-- DO NOT EDIT
+error('Cannot require a meta file')
+
+--- @class vim.api.keyset.clear_autocmds
+--- @field buffer any
+--- @field event any
+--- @field group any
+--- @field pattern any
+
+--- @class vim.api.keyset.cmd
+--- @field cmd any
+--- @field range any
+--- @field count any
+--- @field reg any
+--- @field bang any
+--- @field args any
+--- @field magic any
+--- @field mods any
+--- @field nargs any
+--- @field addr any
+--- @field nextcmd any
+
+--- @class vim.api.keyset.cmd_magic
+--- @field file any
+--- @field bar any
+
+--- @class vim.api.keyset.cmd_mods
+--- @field silent any
+--- @field emsg_silent any
+--- @field unsilent any
+--- @field filter any
+--- @field sandbox any
+--- @field noautocmd any
+--- @field browse any
+--- @field confirm any
+--- @field hide any
+--- @field horizontal any
+--- @field keepalt any
+--- @field keepjumps any
+--- @field keepmarks any
+--- @field keeppatterns any
+--- @field lockmarks any
+--- @field noswapfile any
+--- @field tab any
+--- @field verbose any
+--- @field vertical any
+--- @field split any
+
+--- @class vim.api.keyset.cmd_mods_filter
+--- @field pattern any
+--- @field force any
+
+--- @class vim.api.keyset.cmd_opts
+--- @field output any
+
+--- @class vim.api.keyset.context
+--- @field types any
+
+--- @class vim.api.keyset.create_augroup
+--- @field clear any
+
+--- @class vim.api.keyset.create_autocmd
+--- @field buffer any
+--- @field callback any
+--- @field command any
+--- @field desc any
+--- @field group any
+--- @field nested any
+--- @field once any
+--- @field pattern any
+
+--- @class vim.api.keyset.echo_opts
+--- @field verbose any
+
+--- @class vim.api.keyset.eval_statusline
+--- @field winid any
+--- @field maxwidth any
+--- @field fillchar any
+--- @field highlights any
+--- @field use_winbar any
+--- @field use_tabline any
+--- @field use_statuscol_lnum any
+
+--- @class vim.api.keyset.exec_autocmds
+--- @field buffer any
+--- @field group any
+--- @field modeline any
+--- @field pattern any
+--- @field data any
+
+--- @class vim.api.keyset.exec_opts
+--- @field output any
+
+--- @class vim.api.keyset.float_config
+--- @field row any
+--- @field col any
+--- @field width any
+--- @field height any
+--- @field anchor any
+--- @field relative any
+--- @field win any
+--- @field bufpos any
+--- @field external any
+--- @field focusable any
+--- @field zindex any
+--- @field border any
+--- @field title any
+--- @field title_pos any
+--- @field style any
+--- @field noautocmd any
+
+--- @class vim.api.keyset.get_autocmds
+--- @field event any
+--- @field group any
+--- @field pattern any
+--- @field buffer any
+
+--- @class vim.api.keyset.get_commands
+--- @field builtin any
+
+--- @class vim.api.keyset.get_highlight
+--- @field id any
+--- @field name any
+--- @field link any
+
+--- @class vim.api.keyset.highlight
+--- @field bold any
+--- @field standout any
+--- @field strikethrough any
+--- @field underline any
+--- @field undercurl any
+--- @field underdouble any
+--- @field underdotted any
+--- @field underdashed any
+--- @field italic any
+--- @field reverse any
+--- @field altfont any
+--- @field nocombine any
+--- @field default_ any
+--- @field cterm any
+--- @field foreground any
+--- @field fg any
+--- @field background any
+--- @field bg any
+--- @field ctermfg any
+--- @field ctermbg any
+--- @field special any
+--- @field sp any
+--- @field link any
+--- @field global_link any
+--- @field fallback any
+--- @field blend any
+--- @field fg_indexed any
+--- @field bg_indexed any
+
+--- @class vim.api.keyset.highlight_cterm
+--- @field bold any
+--- @field standout any
+--- @field strikethrough any
+--- @field underline any
+--- @field undercurl any
+--- @field underdouble any
+--- @field underdotted any
+--- @field underdashed any
+--- @field italic any
+--- @field reverse any
+--- @field altfont any
+--- @field nocombine any
+
+--- @class vim.api.keyset.keymap
+--- @field noremap any
+--- @field nowait any
+--- @field silent any
+--- @field script any
+--- @field expr any
+--- @field unique any
+--- @field callback any
+--- @field desc any
+--- @field replace_keycodes any
+
+--- @class vim.api.keyset.option
+--- @field scope any
+--- @field win any
+--- @field buf any
+--- @field filetype any
+
+--- @class vim.api.keyset.runtime
+--- @field is_lua any
+--- @field do_source any
+
+--- @class vim.api.keyset.set_decoration_provider
+--- @field on_start any
+--- @field on_buf any
+--- @field on_win any
+--- @field on_line any
+--- @field on_end any
+--- @field _on_hl_def any
+--- @field _on_spell_nav any
+
+--- @class vim.api.keyset.set_extmark
+--- @field id any
+--- @field end_line any
+--- @field end_row any
+--- @field end_col any
+--- @field hl_group any
+--- @field virt_text any
+--- @field virt_text_pos any
+--- @field virt_text_win_col any
+--- @field virt_text_hide any
+--- @field hl_eol any
+--- @field hl_mode any
+--- @field ephemeral any
+--- @field priority any
+--- @field right_gravity any
+--- @field end_right_gravity any
+--- @field virt_lines any
+--- @field virt_lines_above any
+--- @field virt_lines_leftcol any
+--- @field strict any
+--- @field sign_text any
+--- @field sign_hl_group any
+--- @field number_hl_group any
+--- @field line_hl_group any
+--- @field cursorline_hl_group any
+--- @field conceal any
+--- @field spell any
+--- @field ui_watched any
+
+--- @class vim.api.keyset.user_command
+--- @field addr any
+--- @field bang any
+--- @field bar any
+--- @field complete any
+--- @field count any
+--- @field desc any
+--- @field force any
+--- @field keepscript any
+--- @field nargs any
+--- @field preview any
+--- @field range any
+--- @field register_ any
+
+--- @class vim.api.keyset.win_text_height
+--- @field start_row any
+--- @field end_row any
+--- @field start_vcol any
+--- @field end_vcol any
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 8b56d8e708..261f349756 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -1,6 +1,7 @@
 --- @meta
 -- THIS FILE IS GENERATED
 -- DO NOT EDIT
+error('Cannot require a meta file')
 
 --- Return the absolute value of {expr}.  When {expr} evaluates to
 --- a |Float| abs() returns a |Float|.  When {expr} can be
-- 
cgit 


From da09f9b551badfb3fd363589009168560ae607f6 Mon Sep 17 00:00:00 2001
From: mathew <glepnir@neovim.pro>
Date: Fri, 28 Jul 2023 15:24:18 +0800
Subject: feat(gen_lsp.lua): protocol.Methods #24504

---
 runtime/doc/lsp.txt                    |   6 +
 runtime/doc/news.txt                   |   2 +
 runtime/lua/vim/lsp/protocol.lua       | 270 +++++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/types/protocol.lua |   2 +-
 4 files changed, 279 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 3d7e1ed582..f85150adb6 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -2189,6 +2189,12 @@ make_client_capabilities()
     Return: ~
         lsp.ClientCapabilities
 
+Methods                                             *vim.lsp.protocol.Methods*
+    LSP method names.
+
+    See also: ~
+      • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#metaModel
+
                                      *vim.lsp.protocol.resolve_capabilities()*
 resolve_capabilities({server_capabilities})
     Creates a normalized object describing LSP server capabilities.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index e40fdda3f8..f9ee9e02a1 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -176,6 +176,8 @@ The following changes to existing APIs or features add new behavior.
   supports it, unless |'keywordprg'| was customized before calling
   |vim.lsp.start()|.
 
+• |vim.lsp.protocol.Methods| all the lsp methods constants.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 31cc071d18..e45baa59c5 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -923,4 +923,274 @@ function protocol.resolve_capabilities(server_capabilities)
   return server_capabilities
 end
 
+-- Generated by lsp_types.lua, keep at end of file.
+--- LSP method names.
+---
+---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#metaModel
+protocol.Methods = {
+  --- The initialize request is sent from the client to the server.
+  --- It is sent once as the request after starting up the server.
+  --- The requests parameter is of type {@link InitializeParams}
+  --- the response if of type {@link InitializeResult} of a Thenable that
+  --- resolves to such.
+  initialize = 'initialize',
+  --- A shutdown request is sent from the client to the server.
+  --- It is sent once when the client decides to shutdown the
+  --- server. The only notification that is sent after a shutdown request
+  --- is the exit event.
+  shutdown = 'shutdown',
+  --- The `client/registerCapability` request is sent from the server to the client to register a new capability
+  --- handler on the client side.
+  client_registerCapability = 'client/registerCapability',
+  --- The `client/unregisterCapability` request is sent from the server to the client to unregister a previously registered capability
+  --- handler on the client side.
+  client_unregisterCapability = 'client/unregisterCapability',
+  --- A request to resolve the implementation locations of a symbol at a given text
+  --- document position. The request's parameter is of type [TextDocumentPositionParams]
+  --- (#TextDocumentPositionParams) the response is of type {@link Definition} or a
+  --- Thenable that resolves to such.
+  textDocument_implementation = 'textDocument/implementation',
+  --- A request to resolve the type definition locations of a symbol at a given text
+  --- document position. The request's parameter is of type [TextDocumentPositionParams]
+  --- (#TextDocumentPositionParams) the response is of type {@link Definition} or a
+  --- Thenable that resolves to such.
+  textDocument_typeDefinition = 'textDocument/typeDefinition',
+  --- A request to list all color symbols found in a given text document. The request's
+  --- parameter is of type {@link DocumentColorParams} the
+  --- response is of type {@link ColorInformation ColorInformation[]} or a Thenable
+  --- that resolves to such.
+  textDocument_documentColor = 'textDocument/documentColor',
+  --- A request to list all presentation for a color. The request's
+  --- parameter is of type {@link ColorPresentationParams} the
+  --- response is of type {@link ColorInformation ColorInformation[]} or a Thenable
+  --- that resolves to such.
+  textDocument_colorPresentation = 'textDocument/colorPresentation',
+  --- A request to provide folding ranges in a document. The request's
+  --- parameter is of type {@link FoldingRangeParams}, the
+  --- response is of type {@link FoldingRangeList} or a Thenable
+  --- that resolves to such.
+  textDocument_foldingRange = 'textDocument/foldingRange',
+  --- A request to resolve the type definition locations of a symbol at a given text
+  --- document position. The request's parameter is of type [TextDocumentPositionParams]
+  --- (#TextDocumentPositionParams) the response is of type {@link Declaration}
+  --- or a typed array of {@link DeclarationLink} or a Thenable that resolves
+  --- to such.
+  textDocument_declaration = 'textDocument/declaration',
+  --- A request to provide selection ranges in a document. The request's
+  --- parameter is of type {@link SelectionRangeParams}, the
+  --- response is of type {@link SelectionRange SelectionRange[]} or a Thenable
+  --- that resolves to such.
+  textDocument_selectionRange = 'textDocument/selectionRange',
+  --- A request to result a `CallHierarchyItem` in a document at a given position.
+  --- Can be used as an input to an incoming or outgoing call hierarchy.
+  --- @since 3.16.0
+  textDocument_prepareCallHierarchy = 'textDocument/prepareCallHierarchy',
+  --- @since 3.16.0
+  textDocument_semanticTokens_full = 'textDocument/semanticTokens/full',
+  --- @since 3.16.0
+  textDocument_semanticTokens_full_delta = 'textDocument/semanticTokens/full/delta',
+  --- @since 3.16.0
+  textDocument_semanticTokens_range = 'textDocument/semanticTokens/range',
+  --- A request to provide ranges that can be edited together.
+  --- @since 3.16.0
+  textDocument_linkedEditingRange = 'textDocument/linkedEditingRange',
+  --- A request to get the moniker of a symbol at a given text document position.
+  --- The request parameter is of type {@link TextDocumentPositionParams}.
+  --- The response is of type {@link Moniker Moniker[]} or `null`.
+  textDocument_moniker = 'textDocument/moniker',
+  --- A request to result a `TypeHierarchyItem` in a document at a given position.
+  --- Can be used as an input to a subtypes or supertypes type hierarchy.
+  --- @since 3.17.0
+  textDocument_prepareTypeHierarchy = 'textDocument/prepareTypeHierarchy',
+  --- A request to provide inline values in a document. The request's parameter is of
+  --- type {@link InlineValueParams}, the response is of type
+  --- {@link InlineValue InlineValue[]} or a Thenable that resolves to such.
+  --- @since 3.17.0
+  textDocument_inlineValue = 'textDocument/inlineValue',
+  --- A request to provide inlay hints in a document. The request's parameter is of
+  --- type {@link InlayHintsParams}, the response is of type
+  --- {@link InlayHint InlayHint[]} or a Thenable that resolves to such.
+  --- @since 3.17.0
+  textDocument_inlayHint = 'textDocument/inlayHint',
+  --- The document diagnostic request definition.
+  --- @since 3.17.0
+  textDocument_diagnostic = 'textDocument/diagnostic',
+  --- A request to provide inline completions in a document. The request's parameter is of
+  --- type {@link InlineCompletionParams}, the response is of type
+  --- {@link InlineCompletion InlineCompletion[]} or a Thenable that resolves to such.
+  --- @since 3.18.0
+  textDocument_inlineCompletion = 'textDocument/inlineCompletion',
+  --- A document will save request is sent from the client to the server before
+  --- the document is actually saved. The request can return an array of TextEdits
+  --- which will be applied to the text document before it is saved. Please note that
+  --- clients might drop results if computing the text edits took too long or if a
+  --- server constantly fails on this request. This is done to keep the save fast and
+  --- reliable.
+  textDocument_willSaveWaitUntil = 'textDocument/willSaveWaitUntil',
+  --- Request to request completion at a given text document position. The request's
+  --- parameter is of type {@link TextDocumentPosition} the response
+  --- is of type {@link CompletionItem CompletionItem[]} or {@link CompletionList}
+  --- or a Thenable that resolves to such.
+  --- The request can delay the computation of the {@link CompletionItem.detail `detail`}
+  --- and {@link CompletionItem.documentation `documentation`} properties to the `completionItem/resolve`
+  --- request. However, properties that are needed for the initial sorting and filtering, like `sortText`,
+  --- `filterText`, `insertText`, and `textEdit`, must not be changed during resolve.
+  textDocument_completion = 'textDocument/completion',
+  --- Request to request hover information at a given text document position. The request's
+  --- parameter is of type {@link TextDocumentPosition} the response is of
+  --- type {@link Hover} or a Thenable that resolves to such.
+  textDocument_hover = 'textDocument/hover',
+  textDocument_signatureHelp = 'textDocument/signatureHelp',
+  --- A request to resolve the definition location of a symbol at a given text
+  --- document position. The request's parameter is of type [TextDocumentPosition]
+  --- (#TextDocumentPosition) the response is of either type {@link Definition}
+  --- or a typed array of {@link DefinitionLink} or a Thenable that resolves
+  --- to such.
+  textDocument_definition = 'textDocument/definition',
+  --- A request to resolve project-wide references for the symbol denoted
+  --- by the given text document position. The request's parameter is of
+  --- type {@link ReferenceParams} the response is of type
+  --- {@link Location Location[]} or a Thenable that resolves to such.
+  textDocument_references = 'textDocument/references',
+  --- Request to resolve a {@link DocumentHighlight} for a given
+  --- text document position. The request's parameter is of type [TextDocumentPosition]
+  --- (#TextDocumentPosition) the request response is of type [DocumentHighlight[]]
+  --- (#DocumentHighlight) or a Thenable that resolves to such.
+  textDocument_documentHighlight = 'textDocument/documentHighlight',
+  --- A request to list all symbols found in a given text document. The request's
+  --- parameter is of type {@link TextDocumentIdentifier} the
+  --- response is of type {@link SymbolInformation SymbolInformation[]} or a Thenable
+  --- that resolves to such.
+  textDocument_documentSymbol = 'textDocument/documentSymbol',
+  --- A request to provide commands for the given text document and range.
+  textDocument_codeAction = 'textDocument/codeAction',
+  --- A request to provide code lens for the given text document.
+  textDocument_codeLens = 'textDocument/codeLens',
+  --- A request to provide document links
+  textDocument_documentLink = 'textDocument/documentLink',
+  --- A request to to format a whole document.
+  textDocument_formatting = 'textDocument/formatting',
+  --- A request to format a range in a document.
+  textDocument_rangeFormatting = 'textDocument/rangeFormatting',
+  --- A request to format ranges in a document.
+  --- @since 3.18.0
+  --- @proposed
+  textDocument_rangesFormatting = 'textDocument/rangesFormatting',
+  --- A request to format a document on type.
+  textDocument_onTypeFormatting = 'textDocument/onTypeFormatting',
+  --- A request to rename a symbol.
+  textDocument_rename = 'textDocument/rename',
+  --- A request to test and perform the setup necessary for a rename.
+  --- @since 3.16 - support for default behavior
+  textDocument_prepareRename = 'textDocument/prepareRename',
+  --- The `workspace/workspaceFolders` is sent from the server to the client to fetch the open workspace folders.
+  workspace_workspaceFolders = 'workspace/workspaceFolders',
+  --- The 'workspace/configuration' request is sent from the server to the client to fetch a certain
+  --- configuration setting.
+  --- This pull model replaces the old push model were the client signaled configuration change via an
+  --- event. If the server still needs to react to configuration changes (since the server caches the
+  --- result of `workspace/configuration` requests) the server should register for an empty configuration
+  --- change event and empty the cache if such an event is received.
+  workspace_configuration = 'workspace/configuration',
+  --- @since 3.16.0
+  workspace_semanticTokens_refresh = 'workspace/semanticTokens/refresh',
+  --- The will create files request is sent from the client to the server before files are actually
+  --- created as long as the creation is triggered from within the client.
+  --- The request can return a `WorkspaceEdit` which will be applied to workspace before the
+  --- files are created. Hence the `WorkspaceEdit` can not manipulate the content of the file
+  --- to be created.
+  --- @since 3.16.0
+  workspace_willCreateFiles = 'workspace/willCreateFiles',
+  --- The will rename files request is sent from the client to the server before files are actually
+  --- renamed as long as the rename is triggered from within the client.
+  --- @since 3.16.0
+  workspace_willRenameFiles = 'workspace/willRenameFiles',
+  --- The did delete files notification is sent from the client to the server when
+  --- files were deleted from within the client.
+  --- @since 3.16.0
+  workspace_willDeleteFiles = 'workspace/willDeleteFiles',
+  --- @since 3.17.0
+  workspace_inlineValue_refresh = 'workspace/inlineValue/refresh',
+  --- @since 3.17.0
+  workspace_inlayHint_refresh = 'workspace/inlayHint/refresh',
+  --- The workspace diagnostic request definition.
+  --- @since 3.17.0
+  workspace_diagnostic = 'workspace/diagnostic',
+  --- The diagnostic refresh request definition.
+  --- @since 3.17.0
+  workspace_diagnostic_refresh = 'workspace/diagnostic/refresh',
+  --- A request to list project-wide symbols matching the query string given
+  --- by the {@link WorkspaceSymbolParams}. The response is
+  --- of type {@link SymbolInformation SymbolInformation[]} or a Thenable that
+  --- resolves to such.
+  --- @since 3.17.0 - support for WorkspaceSymbol in the returned data. Clients
+  ---  need to advertise support for WorkspaceSymbols via the client capability
+  ---  `workspace.symbol.resolveSupport`.
+  workspace_symbol = 'workspace/symbol',
+  --- A request to refresh all code actions
+  --- @since 3.16.0
+  workspace_codeLens_refresh = 'workspace/codeLens/refresh',
+  --- A request send from the client to the server to execute a command. The request might return
+  --- a workspace edit which the client will apply to the workspace.
+  workspace_executeCommand = 'workspace/executeCommand',
+  --- A request sent from the server to the client to modified certain resources.
+  workspace_applyEdit = 'workspace/applyEdit',
+  --- The `window/workDoneProgress/create` request is sent from the server to the client to initiate progress
+  --- reporting from the server.
+  window_workDoneProgress_create = 'window/workDoneProgress/create',
+  --- A request to resolve the incoming calls for a given `CallHierarchyItem`.
+  --- @since 3.16.0
+  callHierarchy_incomingCalls = 'callHierarchy/incomingCalls',
+  --- A request to resolve the outgoing calls for a given `CallHierarchyItem`.
+  --- @since 3.16.0
+  callHierarchy_outgoingCalls = 'callHierarchy/outgoingCalls',
+  --- A request to show a document. This request might open an
+  --- external program depending on the value of the URI to open.
+  --- For example a request to open `https://code.visualstudio.com/`
+  --- will very likely open the URI in a WEB browser.
+  --- @since 3.16.0
+  window_showDocument = 'window/showDocument',
+  --- A request to resolve the supertypes for a given `TypeHierarchyItem`.
+  --- @since 3.17.0
+  typeHierarchy_supertypes = 'typeHierarchy/supertypes',
+  --- A request to resolve the subtypes for a given `TypeHierarchyItem`.
+  --- @since 3.17.0
+  typeHierarchy_subtypes = 'typeHierarchy/subtypes',
+  --- A request to resolve additional properties for an inlay hint.
+  --- The request's parameter is of type {@link InlayHint}, the response is
+  --- of type {@link InlayHint} or a Thenable that resolves to such.
+  --- @since 3.17.0
+  inlayHint_resolve = 'inlayHint/resolve',
+  --- The show message request is sent from the server to the client to show a message
+  --- and a set of options actions to the user.
+  window_showMessageRequest = 'window/showMessageRequest',
+  --- Request to resolve additional information for a given completion item.The request's
+  --- parameter is of type {@link CompletionItem} the response
+  --- is of type {@link CompletionItem} or a Thenable that resolves to such.
+  completionItem_resolve = 'completionItem/resolve',
+  --- Request to resolve additional information for a given code action.The request's
+  --- parameter is of type {@link CodeAction} the response
+  --- is of type {@link CodeAction} or a Thenable that resolves to such.
+  codeAction_resolve = 'codeAction/resolve',
+  --- A request to resolve the range inside the workspace
+  --- symbol's location.
+  --- @since 3.17.0
+  workspaceSymbol_resolve = 'workspaceSymbol/resolve',
+  --- A request to resolve a command for a given code lens.
+  codeLens_resolve = 'codeLens/resolve',
+  --- Request to resolve additional information for a given document link. The request's
+  --- parameter is of type {@link DocumentLink} the response
+  --- is of type {@link DocumentLink} or a Thenable that resolves to such.
+  documentLink_resolve = 'documentLink/resolve',
+}
+local function freeze(t)
+  return setmetatable({}, {
+    __index = t,
+    __newindex = function()
+      error('cannot modify immutable table')
+    end,
+  })
+end
+protocol.Methods = freeze(protocol.Methods)
+
 return protocol
diff --git a/runtime/lua/vim/lsp/types/protocol.lua b/runtime/lua/vim/lsp/types/protocol.lua
index 4b6660eb51..241d64e6e5 100644
--- a/runtime/lua/vim/lsp/types/protocol.lua
+++ b/runtime/lua/vim/lsp/types/protocol.lua
@@ -1,7 +1,7 @@
 --[[
 This file is autogenerated from scripts/lsp_types.lua
 Regenerate:
-nvim -l scripts/lsp_types.lua gen --runtime/lua/vim/lsp/types/protocol.lua
+nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/protocol.lua
 --]]
 
 ---@alias lsp.null nil
-- 
cgit 


From f41496ce74fb30c18bb9a03027a172800b269643 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 1 Aug 2023 15:52:53 +0200
Subject: feat(gen_lsp.lua): sort by name, handle failure #24504

---
 runtime/doc/news.txt                   |  29 ++-
 runtime/lua/vim/lsp/protocol.lua       | 362 ++++++++++++++++-----------------
 runtime/lua/vim/lsp/types/protocol.lua |  73 ++++---
 3 files changed, 227 insertions(+), 237 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f9ee9e02a1..6b5e9b8d4a 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -70,21 +70,6 @@ The following new APIs and features were added.
   • 'diffopt' "linematch" scoring algorithm now favours larger and less groups
     https://github.com/neovim/neovim/pull/23611
 
-• Added |vim.lsp.status()| to consume the last progress messages as a string.
-
-• Neovim's LSP client now always saves and restores named buffer marks when
-  applying text edits.
-
-• Nvim now supports the `positionEncoding` server capability. If a server
-  responds with the `positionEncoding` capability in its initialization
-  response, Nvim automatically sets the client's `offset_encoding` field.
-
-• Dynamic registration of LSP capabilities. An implication of this change is
-  that checking a client's `server_capabilities` is no longer a sufficient
-  indicator to see if a server supports a feature. Instead use
-  `client.supports_method(<method>)`. It considers both the dynamic
-  capabilities and static `server_capabilities`.
-
 • |vim.iter()| provides a generic iterator interface for tables and Lua
   iterators |luaref-in|.
 
@@ -118,10 +103,22 @@ The following new APIs and features were added.
   terminal emulator that supports |tui-csiu|.
 
 • LSP
+  • LSP method names are available in |vim.lsp.protocol.Methods|.
   • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
     https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
   • Implemented pull diagnostic textDocument/diagnostic: |vim.lsp.diagnostic.on_diagnostic()|
     https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_diagnostic
+  • Added |vim.lsp.status()| to consume the last progress messages as a string.
+  • LSP client now always saves and restores named buffer marks when applying
+    text edits.
+  • LSP client now supports the `positionEncoding` server capability. If a server
+    responds with the `positionEncoding` capability in its initialization
+    response, Nvim automatically sets the client's `offset_encoding` field.
+  • Dynamic registration of LSP capabilities. An implication of this change is
+    that checking a client's `server_capabilities` is no longer a sufficient
+    indicator to see if a server supports a feature. Instead use
+    `client.supports_method(<method>)`. It considers both the dynamic
+    capabilities and static `server_capabilities`.
 
 • Bundled treesitter parser and queries (highlight, folds) for Markdown,
   Python, and Bash.
@@ -176,8 +173,6 @@ The following changes to existing APIs or features add new behavior.
   supports it, unless |'keywordprg'| was customized before calling
   |vim.lsp.start()|.
 
-• |vim.lsp.protocol.Methods| all the lsp methods constants.
-
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index e45baa59c5..3844c697c6 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -923,110 +923,62 @@ function protocol.resolve_capabilities(server_capabilities)
   return server_capabilities
 end
 
--- Generated by lsp_types.lua, keep at end of file.
+-- Generated by gen_lsp.lua, keep at end of file.
 --- LSP method names.
 ---
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#metaModel
 protocol.Methods = {
+  --- A request to resolve the incoming calls for a given `CallHierarchyItem`.
+  --- @since 3.16.0
+  callHierarchy_incomingCalls = 'callHierarchy/incomingCalls',
+  --- A request to resolve the outgoing calls for a given `CallHierarchyItem`.
+  --- @since 3.16.0
+  callHierarchy_outgoingCalls = 'callHierarchy/outgoingCalls',
+  --- The `client/registerCapability` request is sent from the server to the client to register a new capability
+  --- handler on the client side.
+  client_registerCapability = 'client/registerCapability',
+  --- The `client/unregisterCapability` request is sent from the server to the client to unregister a previously registered capability
+  --- handler on the client side.
+  client_unregisterCapability = 'client/unregisterCapability',
+  --- Request to resolve additional information for a given code action.The request's
+  --- parameter is of type {@link CodeAction} the response
+  --- is of type {@link CodeAction} or a Thenable that resolves to such.
+  codeAction_resolve = 'codeAction/resolve',
+  --- A request to resolve a command for a given code lens.
+  codeLens_resolve = 'codeLens/resolve',
+  --- Request to resolve additional information for a given completion item.The request's
+  --- parameter is of type {@link CompletionItem} the response
+  --- is of type {@link CompletionItem} or a Thenable that resolves to such.
+  completionItem_resolve = 'completionItem/resolve',
+  --- Request to resolve additional information for a given document link. The request's
+  --- parameter is of type {@link DocumentLink} the response
+  --- is of type {@link DocumentLink} or a Thenable that resolves to such.
+  documentLink_resolve = 'documentLink/resolve',
   --- The initialize request is sent from the client to the server.
   --- It is sent once as the request after starting up the server.
   --- The requests parameter is of type {@link InitializeParams}
   --- the response if of type {@link InitializeResult} of a Thenable that
   --- resolves to such.
   initialize = 'initialize',
+  --- A request to resolve additional properties for an inlay hint.
+  --- The request's parameter is of type {@link InlayHint}, the response is
+  --- of type {@link InlayHint} or a Thenable that resolves to such.
+  --- @since 3.17.0
+  inlayHint_resolve = 'inlayHint/resolve',
   --- A shutdown request is sent from the client to the server.
   --- It is sent once when the client decides to shutdown the
   --- server. The only notification that is sent after a shutdown request
   --- is the exit event.
   shutdown = 'shutdown',
-  --- The `client/registerCapability` request is sent from the server to the client to register a new capability
-  --- handler on the client side.
-  client_registerCapability = 'client/registerCapability',
-  --- The `client/unregisterCapability` request is sent from the server to the client to unregister a previously registered capability
-  --- handler on the client side.
-  client_unregisterCapability = 'client/unregisterCapability',
-  --- A request to resolve the implementation locations of a symbol at a given text
-  --- document position. The request's parameter is of type [TextDocumentPositionParams]
-  --- (#TextDocumentPositionParams) the response is of type {@link Definition} or a
-  --- Thenable that resolves to such.
-  textDocument_implementation = 'textDocument/implementation',
-  --- A request to resolve the type definition locations of a symbol at a given text
-  --- document position. The request's parameter is of type [TextDocumentPositionParams]
-  --- (#TextDocumentPositionParams) the response is of type {@link Definition} or a
-  --- Thenable that resolves to such.
-  textDocument_typeDefinition = 'textDocument/typeDefinition',
-  --- A request to list all color symbols found in a given text document. The request's
-  --- parameter is of type {@link DocumentColorParams} the
-  --- response is of type {@link ColorInformation ColorInformation[]} or a Thenable
-  --- that resolves to such.
-  textDocument_documentColor = 'textDocument/documentColor',
+  --- A request to provide commands for the given text document and range.
+  textDocument_codeAction = 'textDocument/codeAction',
+  --- A request to provide code lens for the given text document.
+  textDocument_codeLens = 'textDocument/codeLens',
   --- A request to list all presentation for a color. The request's
   --- parameter is of type {@link ColorPresentationParams} the
   --- response is of type {@link ColorInformation ColorInformation[]} or a Thenable
   --- that resolves to such.
   textDocument_colorPresentation = 'textDocument/colorPresentation',
-  --- A request to provide folding ranges in a document. The request's
-  --- parameter is of type {@link FoldingRangeParams}, the
-  --- response is of type {@link FoldingRangeList} or a Thenable
-  --- that resolves to such.
-  textDocument_foldingRange = 'textDocument/foldingRange',
-  --- A request to resolve the type definition locations of a symbol at a given text
-  --- document position. The request's parameter is of type [TextDocumentPositionParams]
-  --- (#TextDocumentPositionParams) the response is of type {@link Declaration}
-  --- or a typed array of {@link DeclarationLink} or a Thenable that resolves
-  --- to such.
-  textDocument_declaration = 'textDocument/declaration',
-  --- A request to provide selection ranges in a document. The request's
-  --- parameter is of type {@link SelectionRangeParams}, the
-  --- response is of type {@link SelectionRange SelectionRange[]} or a Thenable
-  --- that resolves to such.
-  textDocument_selectionRange = 'textDocument/selectionRange',
-  --- A request to result a `CallHierarchyItem` in a document at a given position.
-  --- Can be used as an input to an incoming or outgoing call hierarchy.
-  --- @since 3.16.0
-  textDocument_prepareCallHierarchy = 'textDocument/prepareCallHierarchy',
-  --- @since 3.16.0
-  textDocument_semanticTokens_full = 'textDocument/semanticTokens/full',
-  --- @since 3.16.0
-  textDocument_semanticTokens_full_delta = 'textDocument/semanticTokens/full/delta',
-  --- @since 3.16.0
-  textDocument_semanticTokens_range = 'textDocument/semanticTokens/range',
-  --- A request to provide ranges that can be edited together.
-  --- @since 3.16.0
-  textDocument_linkedEditingRange = 'textDocument/linkedEditingRange',
-  --- A request to get the moniker of a symbol at a given text document position.
-  --- The request parameter is of type {@link TextDocumentPositionParams}.
-  --- The response is of type {@link Moniker Moniker[]} or `null`.
-  textDocument_moniker = 'textDocument/moniker',
-  --- A request to result a `TypeHierarchyItem` in a document at a given position.
-  --- Can be used as an input to a subtypes or supertypes type hierarchy.
-  --- @since 3.17.0
-  textDocument_prepareTypeHierarchy = 'textDocument/prepareTypeHierarchy',
-  --- A request to provide inline values in a document. The request's parameter is of
-  --- type {@link InlineValueParams}, the response is of type
-  --- {@link InlineValue InlineValue[]} or a Thenable that resolves to such.
-  --- @since 3.17.0
-  textDocument_inlineValue = 'textDocument/inlineValue',
-  --- A request to provide inlay hints in a document. The request's parameter is of
-  --- type {@link InlayHintsParams}, the response is of type
-  --- {@link InlayHint InlayHint[]} or a Thenable that resolves to such.
-  --- @since 3.17.0
-  textDocument_inlayHint = 'textDocument/inlayHint',
-  --- The document diagnostic request definition.
-  --- @since 3.17.0
-  textDocument_diagnostic = 'textDocument/diagnostic',
-  --- A request to provide inline completions in a document. The request's parameter is of
-  --- type {@link InlineCompletionParams}, the response is of type
-  --- {@link InlineCompletion InlineCompletion[]} or a Thenable that resolves to such.
-  --- @since 3.18.0
-  textDocument_inlineCompletion = 'textDocument/inlineCompletion',
-  --- A document will save request is sent from the client to the server before
-  --- the document is actually saved. The request can return an array of TextEdits
-  --- which will be applied to the text document before it is saved. Please note that
-  --- clients might drop results if computing the text edits took too long or if a
-  --- server constantly fails on this request. This is done to keep the save fast and
-  --- reliable.
-  textDocument_willSaveWaitUntil = 'textDocument/willSaveWaitUntil',
   --- Request to request completion at a given text document position. The request's
   --- parameter is of type {@link TextDocumentPosition} the response
   --- is of type {@link CompletionItem CompletionItem[]} or {@link CompletionList}
@@ -1036,55 +988,153 @@ protocol.Methods = {
   --- request. However, properties that are needed for the initial sorting and filtering, like `sortText`,
   --- `filterText`, `insertText`, and `textEdit`, must not be changed during resolve.
   textDocument_completion = 'textDocument/completion',
-  --- Request to request hover information at a given text document position. The request's
-  --- parameter is of type {@link TextDocumentPosition} the response is of
-  --- type {@link Hover} or a Thenable that resolves to such.
-  textDocument_hover = 'textDocument/hover',
-  textDocument_signatureHelp = 'textDocument/signatureHelp',
+  --- A request to resolve the type definition locations of a symbol at a given text
+  --- document position. The request's parameter is of type [TextDocumentPositionParams]
+  --- (#TextDocumentPositionParams) the response is of type {@link Declaration}
+  --- or a typed array of {@link DeclarationLink} or a Thenable that resolves
+  --- to such.
+  textDocument_declaration = 'textDocument/declaration',
   --- A request to resolve the definition location of a symbol at a given text
   --- document position. The request's parameter is of type [TextDocumentPosition]
   --- (#TextDocumentPosition) the response is of either type {@link Definition}
   --- or a typed array of {@link DefinitionLink} or a Thenable that resolves
   --- to such.
   textDocument_definition = 'textDocument/definition',
-  --- A request to resolve project-wide references for the symbol denoted
-  --- by the given text document position. The request's parameter is of
-  --- type {@link ReferenceParams} the response is of type
-  --- {@link Location Location[]} or a Thenable that resolves to such.
-  textDocument_references = 'textDocument/references',
+  --- The document diagnostic request definition.
+  --- @since 3.17.0
+  textDocument_diagnostic = 'textDocument/diagnostic',
+  --- A request to list all color symbols found in a given text document. The request's
+  --- parameter is of type {@link DocumentColorParams} the
+  --- response is of type {@link ColorInformation ColorInformation[]} or a Thenable
+  --- that resolves to such.
+  textDocument_documentColor = 'textDocument/documentColor',
   --- Request to resolve a {@link DocumentHighlight} for a given
   --- text document position. The request's parameter is of type [TextDocumentPosition]
   --- (#TextDocumentPosition) the request response is of type [DocumentHighlight[]]
   --- (#DocumentHighlight) or a Thenable that resolves to such.
   textDocument_documentHighlight = 'textDocument/documentHighlight',
+  --- A request to provide document links
+  textDocument_documentLink = 'textDocument/documentLink',
   --- A request to list all symbols found in a given text document. The request's
   --- parameter is of type {@link TextDocumentIdentifier} the
   --- response is of type {@link SymbolInformation SymbolInformation[]} or a Thenable
   --- that resolves to such.
   textDocument_documentSymbol = 'textDocument/documentSymbol',
-  --- A request to provide commands for the given text document and range.
-  textDocument_codeAction = 'textDocument/codeAction',
-  --- A request to provide code lens for the given text document.
-  textDocument_codeLens = 'textDocument/codeLens',
-  --- A request to provide document links
-  textDocument_documentLink = 'textDocument/documentLink',
-  --- A request to to format a whole document.
+  --- A request to provide folding ranges in a document. The request's
+  --- parameter is of type {@link FoldingRangeParams}, the
+  --- response is of type {@link FoldingRangeList} or a Thenable
+  --- that resolves to such.
+  textDocument_foldingRange = 'textDocument/foldingRange',
+  --- A request to format a whole document.
   textDocument_formatting = 'textDocument/formatting',
+  --- Request to request hover information at a given text document position. The request's
+  --- parameter is of type {@link TextDocumentPosition} the response is of
+  --- type {@link Hover} or a Thenable that resolves to such.
+  textDocument_hover = 'textDocument/hover',
+  --- A request to resolve the implementation locations of a symbol at a given text
+  --- document position. The request's parameter is of type [TextDocumentPositionParams]
+  --- (#TextDocumentPositionParams) the response is of type {@link Definition} or a
+  --- Thenable that resolves to such.
+  textDocument_implementation = 'textDocument/implementation',
+  --- A request to provide inlay hints in a document. The request's parameter is of
+  --- type {@link InlayHintsParams}, the response is of type
+  --- {@link InlayHint InlayHint[]} or a Thenable that resolves to such.
+  --- @since 3.17.0
+  textDocument_inlayHint = 'textDocument/inlayHint',
+  --- A request to provide inline completions in a document. The request's parameter is of
+  --- type {@link InlineCompletionParams}, the response is of type
+  --- {@link InlineCompletion InlineCompletion[]} or a Thenable that resolves to such.
+  --- @since 3.18.0
+  textDocument_inlineCompletion = 'textDocument/inlineCompletion',
+  --- A request to provide inline values in a document. The request's parameter is of
+  --- type {@link InlineValueParams}, the response is of type
+  --- {@link InlineValue InlineValue[]} or a Thenable that resolves to such.
+  --- @since 3.17.0
+  textDocument_inlineValue = 'textDocument/inlineValue',
+  --- A request to provide ranges that can be edited together.
+  --- @since 3.16.0
+  textDocument_linkedEditingRange = 'textDocument/linkedEditingRange',
+  --- A request to get the moniker of a symbol at a given text document position.
+  --- The request parameter is of type {@link TextDocumentPositionParams}.
+  --- The response is of type {@link Moniker Moniker[]} or `null`.
+  textDocument_moniker = 'textDocument/moniker',
+  --- A request to format a document on type.
+  textDocument_onTypeFormatting = 'textDocument/onTypeFormatting',
+  --- A request to result a `CallHierarchyItem` in a document at a given position.
+  --- Can be used as an input to an incoming or outgoing call hierarchy.
+  --- @since 3.16.0
+  textDocument_prepareCallHierarchy = 'textDocument/prepareCallHierarchy',
+  --- A request to test and perform the setup necessary for a rename.
+  --- @since 3.16 - support for default behavior
+  textDocument_prepareRename = 'textDocument/prepareRename',
+  --- A request to result a `TypeHierarchyItem` in a document at a given position.
+  --- Can be used as an input to a subtypes or supertypes type hierarchy.
+  --- @since 3.17.0
+  textDocument_prepareTypeHierarchy = 'textDocument/prepareTypeHierarchy',
   --- A request to format a range in a document.
   textDocument_rangeFormatting = 'textDocument/rangeFormatting',
   --- A request to format ranges in a document.
   --- @since 3.18.0
   --- @proposed
   textDocument_rangesFormatting = 'textDocument/rangesFormatting',
-  --- A request to format a document on type.
-  textDocument_onTypeFormatting = 'textDocument/onTypeFormatting',
+  --- A request to resolve project-wide references for the symbol denoted
+  --- by the given text document position. The request's parameter is of
+  --- type {@link ReferenceParams} the response is of type
+  --- {@link Location Location[]} or a Thenable that resolves to such.
+  textDocument_references = 'textDocument/references',
   --- A request to rename a symbol.
   textDocument_rename = 'textDocument/rename',
-  --- A request to test and perform the setup necessary for a rename.
-  --- @since 3.16 - support for default behavior
-  textDocument_prepareRename = 'textDocument/prepareRename',
-  --- The `workspace/workspaceFolders` is sent from the server to the client to fetch the open workspace folders.
-  workspace_workspaceFolders = 'workspace/workspaceFolders',
+  --- A request to provide selection ranges in a document. The request's
+  --- parameter is of type {@link SelectionRangeParams}, the
+  --- response is of type {@link SelectionRange SelectionRange[]} or a Thenable
+  --- that resolves to such.
+  textDocument_selectionRange = 'textDocument/selectionRange',
+  --- @since 3.16.0
+  textDocument_semanticTokens_full = 'textDocument/semanticTokens/full',
+  --- @since 3.16.0
+  textDocument_semanticTokens_full_delta = 'textDocument/semanticTokens/full/delta',
+  --- @since 3.16.0
+  textDocument_semanticTokens_range = 'textDocument/semanticTokens/range',
+  textDocument_signatureHelp = 'textDocument/signatureHelp',
+  --- A request to resolve the type definition locations of a symbol at a given text
+  --- document position. The request's parameter is of type [TextDocumentPositionParams]
+  --- (#TextDocumentPositionParams) the response is of type {@link Definition} or a
+  --- Thenable that resolves to such.
+  textDocument_typeDefinition = 'textDocument/typeDefinition',
+  --- A document will save request is sent from the client to the server before
+  --- the document is actually saved. The request can return an array of TextEdits
+  --- which will be applied to the text document before it is saved. Please note that
+  --- clients might drop results if computing the text edits took too long or if a
+  --- server constantly fails on this request. This is done to keep the save fast and
+  --- reliable.
+  textDocument_willSaveWaitUntil = 'textDocument/willSaveWaitUntil',
+  --- A request to resolve the subtypes for a given `TypeHierarchyItem`.
+  --- @since 3.17.0
+  typeHierarchy_subtypes = 'typeHierarchy/subtypes',
+  --- A request to resolve the supertypes for a given `TypeHierarchyItem`.
+  --- @since 3.17.0
+  typeHierarchy_supertypes = 'typeHierarchy/supertypes',
+  --- A request to show a document. This request might open an
+  --- external program depending on the value of the URI to open.
+  --- For example a request to open `https://code.visualstudio.com/`
+  --- will very likely open the URI in a WEB browser.
+  --- @since 3.16.0
+  window_showDocument = 'window/showDocument',
+  --- The show message request is sent from the server to the client to show a message
+  --- and a set of options actions to the user.
+  window_showMessageRequest = 'window/showMessageRequest',
+  --- The `window/workDoneProgress/create` request is sent from the server to the client to initiate progress
+  --- reporting from the server.
+  window_workDoneProgress_create = 'window/workDoneProgress/create',
+  --- A request to resolve the range inside the workspace
+  --- symbol's location.
+  --- @since 3.17.0
+  workspaceSymbol_resolve = 'workspaceSymbol/resolve',
+  --- A request sent from the server to the client to modified certain resources.
+  workspace_applyEdit = 'workspace/applyEdit',
+  --- A request to refresh all code actions
+  --- @since 3.16.0
+  workspace_codeLens_refresh = 'workspace/codeLens/refresh',
   --- The 'workspace/configuration' request is sent from the server to the client to fetch a certain
   --- configuration setting.
   --- This pull model replaces the old push model were the client signaled configuration change via an
@@ -1092,33 +1142,21 @@ protocol.Methods = {
   --- result of `workspace/configuration` requests) the server should register for an empty configuration
   --- change event and empty the cache if such an event is received.
   workspace_configuration = 'workspace/configuration',
-  --- @since 3.16.0
-  workspace_semanticTokens_refresh = 'workspace/semanticTokens/refresh',
-  --- The will create files request is sent from the client to the server before files are actually
-  --- created as long as the creation is triggered from within the client.
-  --- The request can return a `WorkspaceEdit` which will be applied to workspace before the
-  --- files are created. Hence the `WorkspaceEdit` can not manipulate the content of the file
-  --- to be created.
-  --- @since 3.16.0
-  workspace_willCreateFiles = 'workspace/willCreateFiles',
-  --- The will rename files request is sent from the client to the server before files are actually
-  --- renamed as long as the rename is triggered from within the client.
-  --- @since 3.16.0
-  workspace_willRenameFiles = 'workspace/willRenameFiles',
-  --- The did delete files notification is sent from the client to the server when
-  --- files were deleted from within the client.
-  --- @since 3.16.0
-  workspace_willDeleteFiles = 'workspace/willDeleteFiles',
-  --- @since 3.17.0
-  workspace_inlineValue_refresh = 'workspace/inlineValue/refresh',
-  --- @since 3.17.0
-  workspace_inlayHint_refresh = 'workspace/inlayHint/refresh',
   --- The workspace diagnostic request definition.
   --- @since 3.17.0
   workspace_diagnostic = 'workspace/diagnostic',
   --- The diagnostic refresh request definition.
   --- @since 3.17.0
   workspace_diagnostic_refresh = 'workspace/diagnostic/refresh',
+  --- A request send from the client to the server to execute a command. The request might return
+  --- a workspace edit which the client will apply to the workspace.
+  workspace_executeCommand = 'workspace/executeCommand',
+  --- @since 3.17.0
+  workspace_inlayHint_refresh = 'workspace/inlayHint/refresh',
+  --- @since 3.17.0
+  workspace_inlineValue_refresh = 'workspace/inlineValue/refresh',
+  --- @since 3.16.0
+  workspace_semanticTokens_refresh = 'workspace/semanticTokens/refresh',
   --- A request to list project-wide symbols matching the query string given
   --- by the {@link WorkspaceSymbolParams}. The response is
   --- of type {@link SymbolInformation SymbolInformation[]} or a Thenable that
@@ -1127,61 +1165,23 @@ protocol.Methods = {
   ---  need to advertise support for WorkspaceSymbols via the client capability
   ---  `workspace.symbol.resolveSupport`.
   workspace_symbol = 'workspace/symbol',
-  --- A request to refresh all code actions
-  --- @since 3.16.0
-  workspace_codeLens_refresh = 'workspace/codeLens/refresh',
-  --- A request send from the client to the server to execute a command. The request might return
-  --- a workspace edit which the client will apply to the workspace.
-  workspace_executeCommand = 'workspace/executeCommand',
-  --- A request sent from the server to the client to modified certain resources.
-  workspace_applyEdit = 'workspace/applyEdit',
-  --- The `window/workDoneProgress/create` request is sent from the server to the client to initiate progress
-  --- reporting from the server.
-  window_workDoneProgress_create = 'window/workDoneProgress/create',
-  --- A request to resolve the incoming calls for a given `CallHierarchyItem`.
+  --- The will create files request is sent from the client to the server before files are actually
+  --- created as long as the creation is triggered from within the client.
+  --- The request can return a `WorkspaceEdit` which will be applied to workspace before the
+  --- files are created. Hence the `WorkspaceEdit` can not manipulate the content of the file
+  --- to be created.
   --- @since 3.16.0
-  callHierarchy_incomingCalls = 'callHierarchy/incomingCalls',
-  --- A request to resolve the outgoing calls for a given `CallHierarchyItem`.
+  workspace_willCreateFiles = 'workspace/willCreateFiles',
+  --- The did delete files notification is sent from the client to the server when
+  --- files were deleted from within the client.
   --- @since 3.16.0
-  callHierarchy_outgoingCalls = 'callHierarchy/outgoingCalls',
-  --- A request to show a document. This request might open an
-  --- external program depending on the value of the URI to open.
-  --- For example a request to open `https://code.visualstudio.com/`
-  --- will very likely open the URI in a WEB browser.
+  workspace_willDeleteFiles = 'workspace/willDeleteFiles',
+  --- The will rename files request is sent from the client to the server before files are actually
+  --- renamed as long as the rename is triggered from within the client.
   --- @since 3.16.0
-  window_showDocument = 'window/showDocument',
-  --- A request to resolve the supertypes for a given `TypeHierarchyItem`.
-  --- @since 3.17.0
-  typeHierarchy_supertypes = 'typeHierarchy/supertypes',
-  --- A request to resolve the subtypes for a given `TypeHierarchyItem`.
-  --- @since 3.17.0
-  typeHierarchy_subtypes = 'typeHierarchy/subtypes',
-  --- A request to resolve additional properties for an inlay hint.
-  --- The request's parameter is of type {@link InlayHint}, the response is
-  --- of type {@link InlayHint} or a Thenable that resolves to such.
-  --- @since 3.17.0
-  inlayHint_resolve = 'inlayHint/resolve',
-  --- The show message request is sent from the server to the client to show a message
-  --- and a set of options actions to the user.
-  window_showMessageRequest = 'window/showMessageRequest',
-  --- Request to resolve additional information for a given completion item.The request's
-  --- parameter is of type {@link CompletionItem} the response
-  --- is of type {@link CompletionItem} or a Thenable that resolves to such.
-  completionItem_resolve = 'completionItem/resolve',
-  --- Request to resolve additional information for a given code action.The request's
-  --- parameter is of type {@link CodeAction} the response
-  --- is of type {@link CodeAction} or a Thenable that resolves to such.
-  codeAction_resolve = 'codeAction/resolve',
-  --- A request to resolve the range inside the workspace
-  --- symbol's location.
-  --- @since 3.17.0
-  workspaceSymbol_resolve = 'workspaceSymbol/resolve',
-  --- A request to resolve a command for a given code lens.
-  codeLens_resolve = 'codeLens/resolve',
-  --- Request to resolve additional information for a given document link. The request's
-  --- parameter is of type {@link DocumentLink} the response
-  --- is of type {@link DocumentLink} or a Thenable that resolves to such.
-  documentLink_resolve = 'documentLink/resolve',
+  workspace_willRenameFiles = 'workspace/willRenameFiles',
+  --- The `workspace/workspaceFolders` is sent from the server to the client to fetch the open workspace folders.
+  workspace_workspaceFolders = 'workspace/workspaceFolders',
 }
 local function freeze(t)
   return setmetatable({}, {
diff --git a/runtime/lua/vim/lsp/types/protocol.lua b/runtime/lua/vim/lsp/types/protocol.lua
index 241d64e6e5..e1ed8dbcc3 100644
--- a/runtime/lua/vim/lsp/types/protocol.lua
+++ b/runtime/lua/vim/lsp/types/protocol.lua
@@ -1,7 +1,7 @@
 --[[
-This file is autogenerated from scripts/lsp_types.lua
+This file is autogenerated from scripts/gen_lsp.lua
 Regenerate:
-nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/protocol.lua
+nvim -l scripts/gen_lsp.lua gen --version 3.18 --runtime/lua/vim/lsp/types/protocol.lua
 --]]
 
 ---@alias lsp.null nil
@@ -611,16 +611,12 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---A parameter literal used in inline completion requests.
 ---
 ---@since 3.18.0
----@proposed
 ---@class lsp.InlineCompletionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
 ---Additional information about the context in which inline completions were
 ---requested.
 ---@field context lsp.InlineCompletionContext
 
 ---Represents a collection of {@link InlineCompletionItem inline completion items} to be presented in the editor.
----
----@since 3.18.0
----@proposed
 ---@class lsp.InlineCompletionList
 ---The inline completion items
 ---@field items lsp.InlineCompletionItem[]
@@ -628,10 +624,11 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---An inline completion item represents a text snippet that is proposed inline to complete text that is being typed.
 ---
 ---@since 3.18.0
----@proposed
 ---@class lsp.InlineCompletionItem
 ---The text to replace the range with. Must be set.
----@field insertText string|lsp.StringValue
+---@field insertText string
+---The format of the insert text. The format applies to the `insertText`. If omitted defaults to `InsertTextFormat.PlainText`.
+---@field insertTextFormat? lsp.InsertTextFormat
 ---A text that is used to decide if this inline completion should be shown. When `falsy` the {@link InlineCompletionItem.insertText} is used.
 ---@field filterText? string
 ---The range to replace. Must begin and end on the same line.
@@ -642,7 +639,6 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---Inline completion options used during static or dynamic registration.
 ---
 ---@since 3.18.0
----@proposed
 ---@class lsp.InlineCompletionRegistrationOptions: lsp.InlineCompletionOptions, lsp.StaticRegistrationOptions
 
 ---@class lsp.RegistrationParams
@@ -1249,6 +1245,18 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---Registration options for a {@link DocumentRangeFormattingRequest}.
 ---@class lsp.DocumentRangeFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
 
+---The parameters of a {@link DocumentRangesFormattingRequest}.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.DocumentRangesFormattingParams
+---The document to format.
+---@field textDocument lsp.TextDocumentIdentifier
+---The ranges to format
+---@field ranges lsp.Range[]
+---The format options
+---@field options lsp.FormattingOptions
+
 ---The parameters of a {@link DocumentOnTypeFormattingRequest}.
 ---@class lsp.DocumentOnTypeFormattingParams
 ---The document to format.
@@ -1904,36 +1912,18 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---Provides information about the context in which an inline completion was requested.
 ---
 ---@since 3.18.0
----@proposed
 ---@class lsp.InlineCompletionContext
 ---Describes how the inline completion was triggered.
 ---@field triggerKind lsp.InlineCompletionTriggerKind
 ---Provides information about the currently selected item in the autocomplete widget if it is visible.
 ---@field selectedCompletionInfo? lsp.SelectedCompletionInfo
 
----A string value used as a snippet is a template which allows to insert text
----and to control the editor cursor when insertion happens.
----
----A snippet can define tab stops and placeholders with `$1`, `$2`
----and `${3:foo}`. `$0` defines the final tab stop, it defaults to
----the end of the snippet. Variables are defined with `$name` and
----`${name:default value}`.
----
----@since 3.18.0
----@proposed
----@class lsp.StringValue
----The kind of string value.
----@field kind "snippet"
----The snippet string.
----@field value string
-
 ---Inline completion options used during static registration.
 ---
 ---@since 3.18.0
----@proposed
 ---@class lsp.InlineCompletionOptions
 
----General parameters to register for a notification or to register a provider.
+---General parameters to to register for an notification or to register a provider.
 ---@class lsp.Registration
 ---The id used to register the request. The id can be used to deregister
 ---the request again.
@@ -2104,7 +2094,6 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---Inline completion options used during static registration.
 ---
 ---@since 3.18.0
----@proposed
 ---@field inlineCompletionProvider? boolean|lsp.InlineCompletionOptions
 ---Workspace specific server capabilities.
 ---@field workspace? anonym12
@@ -2399,6 +2388,11 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 
 ---Provider options for a {@link DocumentRangeFormattingRequest}.
 ---@class lsp.DocumentRangeFormattingOptions
+---Whether the server supports formatting multiple ranges at once.
+---
+---@since 3.18.0
+---@proposed
+---@field rangesSupport? boolean
 
 ---Provider options for a {@link DocumentOnTypeFormattingRequest}.
 ---@class lsp.DocumentOnTypeFormattingOptions
@@ -2548,7 +2542,6 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---Describes the currently selected completion item.
 ---
 ---@since 3.18.0
----@proposed
 ---@class lsp.SelectedCompletionInfo
 ---The range that will be replaced if this completion item is accepted.
 ---@field range lsp.Range
@@ -2857,7 +2850,6 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---Client capabilities specific to inline completions.
 ---
 ---@since 3.18.0
----@proposed
 ---@field inlineCompletion? lsp.InlineCompletionClientCapabilities
 
 ---Capabilities specific to the notebook document support.
@@ -3283,6 +3275,11 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---@class lsp.DocumentRangeFormattingClientCapabilities
 ---Whether range formatting supports dynamic registration.
 ---@field dynamicRegistration? boolean
+---Whether the client supports formatting multiple ranges at once.
+---
+---@since 3.18.0
+---@proposed
+---@field rangesSupport? boolean
 
 ---Client capabilities of a {@link DocumentOnTypeFormattingRequest}.
 ---@class lsp.DocumentOnTypeFormattingClientCapabilities
@@ -3474,7 +3471,6 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---Client capabilities specific to inline completions.
 ---
 ---@since 3.18.0
----@proposed
 ---@class lsp.InlineCompletionClientCapabilities
 ---Whether implementation supports dynamic registration for inline completion providers.
 ---@field dynamicRegistration? boolean
@@ -3663,6 +3659,12 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---| 1 # Type
 ---| 2 # Parameter
 
+---Defines whether the insert text in a completion item should be interpreted as
+---plain text or a snippet.
+---@alias lsp.InsertTextFormat
+---| 1 # PlainText
+---| 2 # Snippet
+
 ---The message type
 ---@alias lsp.MessageType
 ---| 1 # Error
@@ -3718,12 +3720,6 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---@alias lsp.CompletionItemTag
 ---| 1 # Deprecated
 
----Defines whether the insert text in a completion item should be interpreted as
----plain text or a snippet.
----@alias lsp.InsertTextFormat
----| 1 # PlainText
----| 2 # Snippet
-
 ---How whitespace and indentation is handled during completion
 ---item insertion.
 ---
@@ -3767,7 +3763,6 @@ nvim -l scripts/lsp_types.lua gen --version 3.1x --runtime/lua/vim/lsp/types/pro
 ---Describes how an {@link InlineCompletionItemProvider inline completion provider} was triggered.
 ---
 ---@since 3.18.0
----@proposed
 ---@alias lsp.InlineCompletionTriggerKind
 ---| 0 # Invoked
 ---| 1 # Automatic
-- 
cgit 


From 0804034c07ad5883bc653d054e549a87d429a8b7 Mon Sep 17 00:00:00 2001
From: Tyler Miller <tmillr@proton.me>
Date: Tue, 1 Aug 2023 08:28:28 -0700
Subject: fix(loader): cache path ambiguity #24491

Problem: cache paths are derived by replacing each reserved/filesystem-
path-sensitive char with a `%` char in the original path. With this
method, two different files at two different paths (each containing `%`
chars) can erroneously resolve to the very same cache path in certain
edge-cases.

Solution: derive cache paths by url-encoding the original (path) instead
using `vim.uri_encode()` with `"rfc2396"`. Increment `Loader.VERSION` to
denote this change.
---
 runtime/doc/lua.txt        |  27 ++++++++++--
 runtime/lua/vim/loader.lua |   5 ++-
 runtime/lua/vim/uri.lua    | 103 +++++++++++++++++++++++----------------------
 3 files changed, 79 insertions(+), 56 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 96569f8d52..32dcd930bb 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2428,8 +2428,27 @@ vim.loader.reset({path})                                  *vim.loader.reset()*
 ==============================================================================
 Lua module: vim.uri                                                  *vim.uri*
 
+vim.uri_decode({str})                                       *vim.uri_decode()*
+    URI-decodes a string containing percent escapes.
+
+    Parameters: ~
+      • {str}  (string) string to decode
+
+    Return: ~
+        (string) decoded string
+
+vim.uri_encode({str}, {rfc})                                *vim.uri_encode()*
+    URI-encodes a string using percent escapes.
+
+    Parameters: ~
+      • {str}  (string) string to encode
+      • {rfc}  "rfc2396" | "rfc2732" | "rfc3986" | nil
+
+    Return: ~
+        (string) encoded string
+
 vim.uri_from_bufnr({bufnr})                             *vim.uri_from_bufnr()*
-    Get a URI from a bufnr
+    Gets a URI from a bufnr.
 
     Parameters: ~
       • {bufnr}  (integer)
@@ -2438,7 +2457,7 @@ vim.uri_from_bufnr({bufnr})                             *vim.uri_from_bufnr()*
         (string) URI
 
 vim.uri_from_fname({path})                              *vim.uri_from_fname()*
-    Get a URI from a file path.
+    Gets a URI from a file path.
 
     Parameters: ~
       • {path}  (string) Path to file
@@ -2447,7 +2466,7 @@ vim.uri_from_fname({path})                              *vim.uri_from_fname()*
         (string) URI
 
 vim.uri_to_bufnr({uri})                                   *vim.uri_to_bufnr()*
-    Get the buffer for a uri. Creates a new unloaded buffer if no buffer for
+    Gets the buffer for a uri. Creates a new unloaded buffer if no buffer for
     the uri already exists.
 
     Parameters: ~
@@ -2457,7 +2476,7 @@ vim.uri_to_bufnr({uri})                                   *vim.uri_to_bufnr()*
         (integer) bufnr
 
 vim.uri_to_fname({uri})                                   *vim.uri_to_fname()*
-    Get a filename from a URI
+    Gets a filename from a URI.
 
     Parameters: ~
       • {uri}  (string)
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index 4f4722b0c3..e08ccba701 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -1,4 +1,5 @@
 local uv = vim.uv
+local uri_encode = vim.uri_encode
 
 --- @type (fun(modename: string): fun()|string)[]
 local loaders = package.loaders
@@ -33,7 +34,7 @@ M.enabled = false
 ---@field _rtp_key string
 ---@field _hashes? table<string, CacheHash>
 local Loader = {
-  VERSION = 3,
+  VERSION = 4,
   ---@type table<string, table<string,ModuleInfo>>
   _indexed = {},
   ---@type table<string, string[]>
@@ -99,7 +100,7 @@ end
 ---@return string file_name
 ---@private
 function Loader.cache_file(name)
-  local ret = M.path .. '/' .. name:gsub('[/\\:]', '%%')
+  local ret = ('%s/%s'):format(M.path, uri_encode(name, 'rfc2396'))
   return ret:sub(-4) == '.lua' and (ret .. 'c') or (ret .. '.luac')
 end
 
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua
index eaa64a6fad..9dce80b77e 100644
--- a/runtime/lua/vim/uri.lua
+++ b/runtime/lua/vim/uri.lua
@@ -1,65 +1,71 @@
---- TODO: This is implemented only for files now.
+---TODO: This is implemented only for files currently.
 -- https://tools.ietf.org/html/rfc3986
 -- https://tools.ietf.org/html/rfc2732
 -- https://tools.ietf.org/html/rfc2396
 
-local uri_decode
-do
-  local schar = string.char
+local M = {}
+local sbyte = string.byte
+local schar = string.char
+local tohex = require('bit').tohex
+local URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9.+-]*):.*'
+local WINDOWS_URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9.+-]*):[a-zA-Z]:.*'
+local PATTERNS = {
+  ---RFC 2396
+  ---https://tools.ietf.org/html/rfc2396#section-2.2
+  rfc2396 = "^A-Za-z0-9%-_.!~*'()",
+  ---RFC 2732
+  ---https://tools.ietf.org/html/rfc2732
+  rfc2732 = "^A-Za-z0-9%-_.!~*'()[]",
+  ---RFC 3986
+  ---https://tools.ietf.org/html/rfc3986#section-2.2
+  rfc3986 = "^A-Za-z0-9%-._~!$&'()*+,;=:@/",
+}
 
-  --- Convert hex to char
-  local function hex_to_char(hex)
-    return schar(tonumber(hex, 16))
-  end
-  uri_decode = function(str)
-    return str:gsub('%%([a-fA-F0-9][a-fA-F0-9])', hex_to_char)
-  end
+---Converts hex to char
+---@param hex string
+---@return string
+local function hex_to_char(hex)
+  return schar(tonumber(hex, 16))
 end
 
-local uri_encode
-do
-  local PATTERNS = {
-    --- RFC 2396
-    -- https://tools.ietf.org/html/rfc2396#section-2.2
-    rfc2396 = "^A-Za-z0-9%-_.!~*'()",
-    --- RFC 2732
-    -- https://tools.ietf.org/html/rfc2732
-    rfc2732 = "^A-Za-z0-9%-_.!~*'()[]",
-    --- RFC 3986
-    -- https://tools.ietf.org/html/rfc3986#section-2.2
-    rfc3986 = "^A-Za-z0-9%-._~!$&'()*+,;=:@/",
-  }
-  local sbyte = string.byte
-  local tohex = require('bit').tohex
-
-  local function percent_encode_char(char)
-    return '%' .. tohex(sbyte(char), 2)
-  end
-  uri_encode = function(text, rfc)
-    if not text then
-      return
-    end
-    local pattern = PATTERNS[rfc] or PATTERNS.rfc3986
-    return text:gsub('([' .. pattern .. '])', percent_encode_char)
-  end
+---@param char string
+---@return string
+local function percent_encode_char(char)
+  return '%' .. tohex(sbyte(char), 2)
 end
 
+---@param uri string
+---@return boolean
 local function is_windows_file_uri(uri)
   return uri:match('^file:/+[a-zA-Z]:') ~= nil
 end
 
-local M = {}
+---URI-encodes a string using percent escapes.
+---@param str string string to encode
+---@param rfc "rfc2396" | "rfc2732" | "rfc3986" | nil
+---@return string encoded string
+function M.uri_encode(str, rfc)
+  local pattern = PATTERNS[rfc] or PATTERNS.rfc3986
+  return (str:gsub('([' .. pattern .. '])', percent_encode_char)) -- clamped to 1 retval with ()
+end
+
+---URI-decodes a string containing percent escapes.
+---@param str string string to decode
+---@return string decoded string
+function M.uri_decode(str)
+  return (str:gsub('%%([a-fA-F0-9][a-fA-F0-9])', hex_to_char)) -- clamped to 1 retval with ()
+end
 
---- Get a URI from a file path.
+---Gets a URI from a file path.
 ---@param path string Path to file
 ---@return string URI
 function M.uri_from_fname(path)
   local volume_path, fname = path:match('^([a-zA-Z]:)(.*)')
   local is_windows = volume_path ~= nil
   if is_windows then
-    path = volume_path .. uri_encode(fname:gsub('\\', '/'))
+    path = volume_path .. M.uri_encode(fname:gsub('\\', '/'))
   else
-    path = uri_encode(path)
+    path = M.uri_encode(path)
   end
   local uri_parts = { 'file://' }
   if is_windows then
@@ -69,10 +75,7 @@ function M.uri_from_fname(path)
   return table.concat(uri_parts)
 end
 
-local URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9.+-]*):.*'
-local WINDOWS_URI_SCHEME_PATTERN = '^([a-zA-Z]+[a-zA-Z0-9.+-]*):[a-zA-Z]:.*'
-
---- Get a URI from a bufnr
+---Gets a URI from a bufnr.
 ---@param bufnr integer
 ---@return string URI
 function M.uri_from_bufnr(bufnr)
@@ -93,7 +96,7 @@ function M.uri_from_bufnr(bufnr)
   end
 end
 
---- Get a filename from a URI
+---Gets a filename from a URI.
 ---@param uri string
 ---@return string filename or unchanged URI for non-file URIs
 function M.uri_to_fname(uri)
@@ -101,8 +104,8 @@ function M.uri_to_fname(uri)
   if scheme ~= 'file' then
     return uri
   end
-  uri = uri_decode(uri)
-  -- TODO improve this.
+  uri = M.uri_decode(uri)
+  --TODO improve this.
   if is_windows_file_uri(uri) then
     uri = uri:gsub('^file:/+', '')
     uri = uri:gsub('/', '\\')
@@ -112,8 +115,8 @@ function M.uri_to_fname(uri)
   return uri
 end
 
---- Get the buffer for a uri.
---- Creates a new unloaded buffer if no buffer for the uri already exists.
+---Gets the buffer for a uri.
+---Creates a new unloaded buffer if no buffer for the uri already exists.
 --
 ---@param uri string
 ---@return integer bufnr
-- 
cgit 


From 642586977158b44c007177169d3091840a72a8fd Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 1 Aug 2023 18:03:33 +0100
Subject: feat(lua): add meta file for vim submodules (#24525)

---
 runtime/lua/vim/_meta.lua | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 runtime/lua/vim/_meta.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
new file mode 100644
index 0000000000..839830294e
--- /dev/null
+++ b/runtime/lua/vim/_meta.lua
@@ -0,0 +1,26 @@
+--- @meta
+
+--- The following modules are loaded specially in _init_packages.lua
+
+vim.F = require('vim.F')
+vim._watch = require('vim._watch')
+vim.diagnostic = require('vim.diagnostic')
+vim.filetype = require('vim.filetype')
+vim.fs = require('vim.fs')
+vim.health = require('vim.health')
+vim.highlight = require('vim.highlight')
+vim.iter = require('vim.iter')
+vim.keymap = require('vim.keymap')
+vim.loader = require('vim.loader')
+vim.lsp = require('vim.lsp')
+vim.re = require('vim.re')
+vim.secure = require('vim.secure')
+vim.ui = require('vim.ui')
+vim.version = require('vim.version')
+
+local uri = require('vim.uri')
+
+vim.uri_from_fname = uri.uri_from_fname
+vim.uri_from_bufnr = uri.uri_from_bufnr
+vim.uri_to_fname = uri.uri_to_fname
+vim.uri_to_bufnr = uri.uri_to_bufnr
-- 
cgit 


From d086bc1e8590a92a70c414bd60e1e988bbdd3c0a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 1 Aug 2023 16:17:26 -0700
Subject: docs: drop "Can also be used as a method" #24508

Now that we "own" builtin.txt, we cant remove the repetitive mention of
Vimscript's UFCS syntax. It's noisy to mention this for each function,
and it's also not a Vimscript feature that should be encouraged.

Also change the builtin.txt heading to "NVIM REFERENCE MANUAL", which
indicates when a help file is Nvim-owned.
---
 runtime/doc/builtin.txt         | 1268 +--------------------------------------
 runtime/lua/vim/_meta/vimfn.lua | 1264 +-------------------------------------
 2 files changed, 8 insertions(+), 2524 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 6a89eb0524..5813ca5494 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,7 +1,7 @@
 *builtin.txt*	Nvim
 
 
-		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+		  NVIM REFERENCE MANUAL
 
 
 Builtin functions		*vimscript-functions* *builtin-functions*
@@ -25,10 +25,6 @@ abs({expr})                                                              *abs()*
 			echo abs(-4)
 <			4
 
-		Can also be used as a |method|: >vim
-			Compute()->abs()
-<
-
 acos({expr})                                                            *acos()*
 		Return the arc cosine of {expr} measured in radians, as a
 		|Float| in the range of [0, pi].
@@ -42,10 +38,6 @@ acos({expr})                                                            *acos()*
 			echo acos(-0.5)
 <			2.094395
 
-		Can also be used as a |method|: >vim
-			Compute()->acos()
-<
-
 add({object}, {expr})                                                    *add()*
 		Append the item {expr} to |List| or |Blob| {object}.  Returns
 		the resulting |List| or |Blob|.  Examples: >vim
@@ -57,18 +49,12 @@ add({object}, {expr})                                                    *add()*
 		Use |insert()| to add an item at another position.
 		Returns 1 if {object} is not a |List| or a |Blob|.
 
-		Can also be used as a |method|: >vim
-			mylist->add(val1)->add(val2)
-<
-
 and({expr}, {expr})                                                      *and()*
 		Bitwise AND on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `or()` and `xor()`.
 		Example: >vim
 			let flag = and(bits, 0x80)
-<		Can also be used as a |method|: >vim
-			let flag = bits->and(0x80)
 <
 
 api_info()                                                          *api_info()*
@@ -90,9 +76,6 @@ append({lnum}, {text})                                                *append()*
 		0 for success.  Example: >vim
 			let failed = append(line('$'), "# THE END")
 			let failed = append(0, ["Chapter 1", "the beginning"])
-
-<		Can also be used as a |method| after a List: >vim
-			mylist->append(lnum)
 <
 
 appendbufline({buf}, {lnum}, {text})                           *appendbufline()*
@@ -114,9 +97,6 @@ appendbufline({buf}, {lnum}, {text})                           *appendbufline()*
 		error message is given. Example: >vim
 			let failed = appendbufline(13, 0, "# THE START")
 <
-		Can also be used as a |method| after a List: >vim
-			mylist->appendbufline(buf, lnum)
-<
 
 argc([{winid}])                                                         *argc()*
 		The result is the number of files in the argument list.  See
@@ -176,20 +156,12 @@ asin({expr})                                                            *asin()*
 			echo asin(-0.5)
 <			-0.523599
 
-		Can also be used as a |method|: >vim
-			Compute()->asin()
-<
-
 assert_beeps({cmd})                                             *assert_beeps()*
 		Run {cmd} and add an error message to |v:errors| if it does
 		NOT produce a beep or visual bell.
 		Also see |assert_fails()|, |assert_nobeep()| and
 		|assert-return|.
 
-		Can also be used as a |method|: >vim
-			GetCmd()->assert_beeps()
-<
-
 assert_equal({expected}, {actual} [, {msg}])                    *assert_equal()*
 		When {expected} and {actual} are not equal an error message is
 		added to |v:errors| and 1 is returned.  Otherwise zero is
@@ -206,10 +178,6 @@ assert_equal({expected}, {actual} [, {msg}])                    *assert_equal()*
 <		Will result in a string to be added to |v:errors|:
 			test.vim line 12: Expected 'foo' but got 'bar' ~
 
-		Can also be used as a |method|: >vim
-			mylist->assert_equal([1, 2, 3])
-<
-
 assert_equalfile({fname-one}, {fname-two})                  *assert_equalfile()*
 		When the files {fname-one} and {fname-two} do not contain
 		exactly the same text an error message is added to |v:errors|.
@@ -217,10 +185,6 @@ assert_equalfile({fname-one}, {fname-two})                  *assert_equalfile()*
 		When {fname-one} or {fname-two} does not exist the error will
 		mention that.
 
-		Can also be used as a |method|: >vim
-			GetLog()->assert_equalfile('expected.log')
-<
-
 assert_exception({error} [, {msg}])                         *assert_exception()*
 		When v:exception does not contain the string {error} an error
 		message is added to |v:errors|.  Also see |assert-return|.
@@ -270,10 +234,6 @@ assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 		Note that beeping is not considered an error, and some failing
 		commands only beep.  Use |assert_beeps()| for those.
 
-		Can also be used as a |method|: >vim
-			GetCmd()->assert_fails('E99:')
-<
-
 assert_false({actual} [, {msg}])                                *assert_false()*
 		When {actual} is not false an error message is added to
 		|v:errors|, like with |assert_equal()|.
@@ -284,10 +244,6 @@ assert_false({actual} [, {msg}])                                *assert_false()*
 		A value is false when it is zero. When {actual} is not a
 		number the assert fails.
 
-		Can also be used as a |method|: >vim
-			GetResult()->assert_false()
-<
-
 assert_inrange({lower}, {upper}, {actual} [, {msg}])          *assert_inrange()*
 		This asserts number and |Float| values.  When {actual}  is lower
 		than {lower} or higher than {upper} an error message is added
@@ -315,45 +271,25 @@ assert_match({pattern}, {actual} [, {msg}])                     *assert_match()*
 <		Will result in a string to be added to |v:errors|:
 			test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
 
-		Can also be used as a |method|: >vim
-			getFile()->assert_match('foo.*')
-<
-
 assert_nobeep({cmd})                                           *assert_nobeep()*
 		Run {cmd} and add an error message to |v:errors| if it
 		produces a beep or visual bell.
 		Also see |assert_beeps()|.
 
-		Can also be used as a |method|: >vim
-			GetCmd()->assert_nobeep()
-<
-
 assert_notequal({expected}, {actual} [, {msg}])              *assert_notequal()*
 		The opposite of `assert_equal()`: add an error message to
 		|v:errors| when {expected} and {actual} are equal.
 		Also see |assert-return|.
 
-		Can also be used as a |method|: >vim
-			mylist->assert_notequal([1, 2, 3])
-<
-
 assert_notmatch({pattern}, {actual} [, {msg}])               *assert_notmatch()*
 		The opposite of `assert_match()`: add an error message to
 		|v:errors| when {pattern} matches {actual}.
 		Also see |assert-return|.
 
-		Can also be used as a |method|: >vim
-			getFile()->assert_notmatch('bar.*')
-<
-
 assert_report({msg})                                           *assert_report()*
 		Report a test failure directly, using String {msg}.
 		Always returns one.
 
-		Can also be used as a |method|: >vim
-			GetMessage()->assert_report()
-<
-
 assert_true({actual} [, {msg}])                                  *assert_true()*
 		When {actual} is not true an error message is added to
 		|v:errors|, like with |assert_equal()|.
@@ -362,10 +298,6 @@ assert_true({actual} [, {msg}])                                  *assert_true()*
 		When {actual} is not a number or |v:true| the assert fails.
 		When {msg} is given it precedes the default message.
 
-		Can also be used as a |method|: >vim
-			GetResult()->assert_true()
-<
-
 atan({expr})                                                            *atan()*
 		Return the principal value of the arc tangent of {expr}, in
 		the range [-pi/2, +pi/2] radians, as a |Float|.
@@ -377,10 +309,6 @@ atan({expr})                                                            *atan()*
 			echo atan(-4.01)
 <			-1.326405
 
-		Can also be used as a |method|: >vim
-			Compute()->atan()
-<
-
 atan2({expr1}, {expr2})                                                *atan2()*
 		Return the arc tangent of {expr1} / {expr2}, measured in
 		radians, as a |Float| in the range [-pi, pi].
@@ -393,10 +321,6 @@ atan2({expr1}, {expr2})                                                *atan2()*
 			echo atan2(1, -1)
 <			2.356194
 
-		Can also be used as a |method|: >vim
-			Compute()->atan2(1)
-<
-
 blob2list({blob})                                                  *blob2list()*
 		Return a List containing the number value of each byte in Blob
 		{blob}.  Examples: >vim
@@ -405,10 +329,6 @@ blob2list({blob})                                                  *blob2list()*
 <		Returns an empty List on error.  |list2blob()| does the
 		opposite.
 
-		Can also be used as a |method|: >vim
-			GetBlob()->blob2list()
-<
-
 browse({save}, {title}, {initdir}, {default})                         *browse()*
 		Put up a file requester.  This only works when "has("browse")"
 		returns |TRUE| (only in some GUI versions).
@@ -445,9 +365,6 @@ bufadd({name})                                                        *bufadd()*
 			call bufload(bufnr)
 			call setbufline(bufnr, 1, ['some', 'text'])
 <		Returns 0 on error.
-		Can also be used as a |method|: >vim
-			let bufnr = 'somename'->bufadd()
-<
 
 bufexists({buf})                                                   *bufexists()*
 		The result is a Number, which is |TRUE| if a buffer called
@@ -471,19 +388,11 @@ bufexists({buf})                                                   *bufexists()*
 		Use "bufexists(0)" to test for the existence of an alternate
 		file name.
 
-		Can also be used as a |method|: >vim
-			let exists = 'somename'->bufexists()
-<
-
 buflisted({buf})                                                   *buflisted()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists and is listed (has the 'buflisted' option set).
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >vim
-			let listed = 'somename'->buflisted()
-<
-
 bufload({buf})                                                       *bufload()*
 		Ensure the buffer {buf} is loaded.  When the buffer name
 		refers to an existing file then the file is read.  Otherwise
@@ -494,19 +403,11 @@ bufload({buf})                                                       *bufload()*
 		there will be no dialog, the buffer will be loaded anyway.
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >vim
-			eval 'somename'->bufload()
-<
-
 bufloaded({buf})                                                   *bufloaded()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists and is loaded (shown in a window or hidden).
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >vim
-			let loaded = 'somename'->bufloaded()
-<
-
 bufname([{buf}])                                                     *bufname()*
 		The result is the name of a buffer.  Mostly as it is displayed
 		by the `:ls` command, but not using special names such as
@@ -528,11 +429,6 @@ bufname([{buf}])                                                     *bufname()*
 		with a listed buffer, that one is returned.  Next unlisted
 		buffers are searched for.
 		If the {buf} is a String, but you want to use it as a buffer
-		number, force it to be a Number by adding zero to it: >vim
-			echo bufname("3" + 0)
-<		Can also be used as a |method|: >vim
-			echo bufnr->bufname()
-
 <		If the buffer doesn't exist, or doesn't have a name, an empty
 		string is returned. >vim
 			echo bufname("#")		" alternate buffer name
@@ -555,10 +451,6 @@ bufnr([{buf} [, {create}]])                                            *bufnr()*
 		number necessarily exist, because ":bwipeout" may have removed
 		them.  Use bufexists() to test for the existence of a buffer.
 
-		Can also be used as a |method|: >vim
-			echo bufref->bufnr()
-<
-
 bufwinid({buf})                                                     *bufwinid()*
 		The result is a Number, which is the |window-ID| of the first
 		window associated with buffer {buf}.  For the use of {buf},
@@ -570,10 +462,6 @@ bufwinid({buf})                                                     *bufwinid()*
 		Only deals with the current tab page.  See |win_findbuf()| for
 		finding more.
 
-		Can also be used as a |method|: >vim
-			FindBuffer()->bufwinid()
-<
-
 bufwinnr({buf})                                                     *bufwinnr()*
 		Like |bufwinid()| but return the window number instead of the
 		|window-ID|.
@@ -585,10 +473,6 @@ bufwinnr({buf})                                                     *bufwinnr()*
 <		The number can be used with |CTRL-W_w| and ":wincmd w"
 		|:wincmd|.
 
-		Can also be used as a |method|: >vim
-			FindBuffer()->bufwinnr()
-<
-
 byte2line({byte})                                                  *byte2line()*
 		Return the line number that contains the character at byte
 		count {byte} in the current buffer.  This includes the
@@ -599,10 +483,6 @@ byte2line({byte})                                                  *byte2line()*
 
 		Returns -1 if the {byte} value is invalid.
 
-		Can also be used as a |method|: >vim
-			GetOffset()->byte2line()
-<
-
 byteidx({expr}, {nr} [, {utf16}])                                    *byteidx()*
 		Return byte index of the {nr}th character in the String
 		{expr}.  Use zero for the first character, it then returns
@@ -638,9 +518,6 @@ byteidx({expr}, {nr} [, {utf16}])                                    *byteidx()*
 			echo byteidx('a😊😊', 2, 1)	" returns 1
 			echo byteidx('a😊😊', 3, 1)	" returns 5
 <
-		Can also be used as a |method|: >vim
-			GetName()->byteidx(idx)
-<
 
 byteidxcomp({expr}, {nr} [, {utf16}])                            *byteidxcomp()*
 		Like byteidx(), except that a composing character is counted
@@ -653,10 +530,6 @@ byteidxcomp({expr}, {nr} [, {utf16}])                            *byteidxcomp()*
 		character is 3 bytes), the second echo results in 1 ('e' is
 		one byte).
 
-		Can also be used as a |method|: >vim
-			GetName()->byteidxcomp(idx)
-<
-
 call({func}, {arglist} [, {dict}])                                 *call()* *E699*
 		Call function {func} with the items in |List| {arglist} as
 		arguments.
@@ -666,10 +539,6 @@ call({func}, {arglist} [, {dict}])                                 *call()* *E69
 		{dict} is for functions with the "dict" attribute.  It will be
 		used to set the local variable "self". |Dictionary-function|
 
-		Can also be used as a |method|: >vim
-			GetFunc()->call([arg, arg], dict)
-<
-
 ceil({expr})                                                            *ceil()*
 		Return the smallest integral value greater than or equal to
 		{expr} as a |Float| (round up).
@@ -684,10 +553,6 @@ ceil({expr})                                                            *ceil()*
 
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 
-		Can also be used as a |method|: >vim
-			Compute()->ceil()
-<
-
 chanclose({id} [, {stream}])                                       *chanclose()*
 		Close a channel or a specific stream associated with it.
 		For a job, {stream} can be one of "stdin", "stdout",
@@ -740,10 +605,6 @@ char2nr({string} [, {utf8}])                                         *char2nr()*
 
 		Returns 0 if {string} is not a |String|.
 
-		Can also be used as a |method|: >vim
-			GetChar()->char2nr()
-<
-
 charclass({string})                                                *charclass()*
 		Return the character class of the first character in {string}.
 		The character class is one of:
@@ -764,10 +625,6 @@ charcol({expr} [, {winid}])                                          *charcol()*
 			echo charcol('.')		" returns 3
 			echo col('.')		" returns 7
 
-<		Can also be used as a |method|: >vim
-			GetPos()->col()
-<
-
 charidx({string}, {idx} [, {countcc} [, {utf16}]])                   *charidx()*
 		Return the character index of the byte at {idx} in {string}.
 		The index of the first character is zero.
@@ -801,9 +658,6 @@ charidx({string}, {idx} [, {countcc} [, {utf16}]])                   *charidx()*
 			echo charidx('áb́ć', 16)		" returns -1
 			echo charidx('a😊😊', 4, 0, 1)	" returns 2
 <
-		Can also be used as a |method|: >vim
-			GetName()->charidx(idx)
-<
 
 chdir({dir})                                                           *chdir()*
 		Change the current working directory to {dir}.  The scope of
@@ -827,10 +681,6 @@ chdir({dir})                                                           *chdir()*
 			   call chdir(save_dir)
 			endif
 
-<		Can also be used as a |method|: >vim
-			GetDir()->chdir()
-<
-
 cindent({lnum})                                                      *cindent()*
 		Get the amount of indent for line {lnum} according the C
 		indenting rules, as with 'cindent'.
@@ -839,20 +689,12 @@ cindent({lnum})                                                      *cindent()*
 		When {lnum} is invalid -1 is returned.
 		See |C-indenting|.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->cindent()
-<
-
 clearmatches([{win}])                                           *clearmatches()*
 		Clears all matches previously defined for the current window
 		by |matchadd()| and the |:match| commands.
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.
 
-		Can also be used as a |method|: >vim
-			GetWin()->clearmatches()
-<
-
 col({expr} [, {winid}])                                                  *col()*
 		The result is a Number, which is the byte index of the column
 		position given with {expr}.  The accepted positions are:
@@ -891,10 +733,6 @@ col({expr} [, {winid}])                                                  *col()*
 		moved, this can be used to obtain the column in Insert mode: >vim
 			imap <F2> <Cmd>echo col(".").."\n"<CR>
 
-<		Can also be used as a |method|: >vim
-			GetPos()->col()
-<
-
 complete({startcol}, {matches})                                *complete()* *E785*
 		Set the matches for Insert mode completion.
 		Can only be used in Insert mode.  You need to use a mapping
@@ -925,11 +763,6 @@ complete({startcol}, {matches})                                *complete()* *E78
 <		This isn't very useful, but it shows how it works.  Note that
 		an empty string is returned to avoid a zero being inserted.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetMatches()->complete(col('.'))
-<
-
 complete_add({expr})                                            *complete_add()*
 		Add {expr} to the list of matches.  Only to be used by the
 		function specified with the 'completefunc' option.
@@ -939,10 +772,6 @@ complete_add({expr})                                            *complete_add()*
 		See |complete-functions| for an explanation of {expr}.  It is
 		the same as one item in the list that 'omnifunc' would return.
 
-		Can also be used as a |method|: >vim
-			GetMoreMatches()->complete_add()
-<
-
 complete_check()                                              *complete_check()*
 		Check for a key typed while looking for completion matches.
 		This is to be used when looking for matches takes some time.
@@ -1009,10 +838,6 @@ complete_info([{what}])                                        *complete_info()*
 			" Get only 'mode' and 'pum_visible'
 			call complete_info(['mode', 'pum_visible'])
 
-<		Can also be used as a |method|: >vim
-			GetItems()->complete_info()
-<
-
 confirm({msg} [, {choices} [, {default} [, {type}]]])                *confirm()*
 		confirm() offers the user a dialog, from which a choice can be
 		made.  It returns the number of the choice.  For the first
@@ -1065,10 +890,6 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])                *confirm()*
 		don't fit, a vertical layout is used anyway.  For some systems
 		the horizontal layout is always used.
 
-		Can also be used as a |method|in: >vim
-			BuildMessage()->confirm("&Yes\n&No")
-<
-
 copy({expr})                                                            *copy()*
 		Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
@@ -1078,9 +899,6 @@ copy({expr})                                                            *copy()*
 		changing an item changes the contents of both |Lists|.
 		A |Dictionary| is copied in a similar way as a |List|.
 		Also see |deepcopy()|.
-		Can also be used as a |method|: >vim
-			mylist->copy()
-<
 
 cos({expr})                                                              *cos()*
 		Return the cosine of {expr}, measured in radians, as a |Float|.
@@ -1092,10 +910,6 @@ cos({expr})                                                              *cos()*
 			echo cos(-4.01)
 <			-0.646043
 
-		Can also be used as a |method|: >vim
-			Compute()->cos()
-<
-
 cosh({expr})                                                            *cosh()*
 		Return the hyperbolic cosine of {expr} as a |Float| in the range
 		[1, inf].
@@ -1107,10 +921,6 @@ cosh({expr})                                                            *cosh()*
 			echo cosh(-0.5)
 <			-1.127626
 
-		Can also be used as a |method|: >vim
-			Compute()->cosh()
-<
-
 count({comp}, {expr} [, {ic} [, {start}]])                             *count()*
 		Return the number of times an item with value {expr} appears
 		in |String|, |List| or |Dictionary| {comp}.
@@ -1124,10 +934,6 @@ count({comp}, {expr} [, {ic} [, {start}]])                             *count()*
 		occurrences of {expr} is returned. Zero is returned when
 		{expr} is an empty string.
 
-		Can also be used as a |method|: >vim
-			mylist->count(val)
-<
-
 ctxget([{index}])                                                     *ctxget()*
 		Returns a |Dictionary| representing the |context| at {index}
 		from the top of the |context-stack| (see |context-dict|).
@@ -1186,10 +992,6 @@ cursor({list})                                                        *cursor()*
 		position within a <Tab> or after the last character.
 		Returns 0 when the position could be set, -1 otherwise.
 
-		Can also be used as a |method|: >vim
-			GetCursorPos()->cursor()
-<
-
 debugbreak({pid})                                                 *debugbreak()*
 		Specifically used to interrupt a program being debugged.  It
 		will cause process {pid} to get a SIGTRAP.  Behavior for other
@@ -1199,10 +1001,6 @@ debugbreak({pid})                                                 *debugbreak()*
 		Returns |TRUE| if successfully interrupted the program.
 		Otherwise returns |FALSE|.
 
-		Can also be used as a |method|: >vim
-			GetPid()->debugbreak()
-<
-
 deepcopy({expr} [, {noref}])                                   *deepcopy()* *E698*
 		Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
@@ -1223,10 +1021,6 @@ deepcopy({expr} [, {noref}])                                   *deepcopy()* *E69
 		{noref} set to 1 will fail.
 		Also see |copy()|.
 
-		Can also be used as a |method|: >vim
-			GetObject()->deepcopy()
-<
-
 delete({fname} [, {flags}])                                           *delete()*
 		Without {flags} or with {flags} empty: Deletes the file by the
 		name {fname}.
@@ -1246,10 +1040,6 @@ delete({fname} [, {flags}])                                           *delete()*
 		operation was successful and -1/true when the deletion failed
 		or partly failed.
 
-		Can also be used as a |method|: >vim
-			GetName()->delete()
-<
-
 deletebufline({buf}, {first} [, {last}])                       *deletebufline()*
 		Delete lines {first} to {last} (inclusive) from buffer {buf}.
 		If {last} is omitted then delete line {first} only.
@@ -1264,10 +1054,6 @@ deletebufline({buf}, {first} [, {last}])                       *deletebufline()*
 		when using |line()| this refers to the current buffer. Use "$"
 		to refer to the last line in buffer {buf}.
 
-		Can also be used as a |method|: >vim
-			GetBuffer()->deletebufline(1)
-<
-
 dictwatcheradd({dict}, {pattern}, {callback})                 *dictwatcheradd()*
 		Adds a watcher to a dictionary. A dictionary watcher is
 		identified by three components:
@@ -1334,10 +1120,6 @@ diff_filler({lnum})                                              *diff_filler()*
 		line, "'m" mark m, etc.
 		Returns 0 if the current window is not in diff mode.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->diff_filler()
-<
-
 diff_hlID({lnum}, {col})                                           *diff_hlID()*
 		Returns the highlight ID for diff mode at line {lnum} column
 		{col} (byte index).  When the current line does not have a
@@ -1349,10 +1131,6 @@ diff_hlID({lnum}, {col})                                           *diff_hlID()*
 		The highlight ID can be used with |synIDattr()| to obtain
 		syntax information about the highlighting.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->diff_hlID(col)
-<
-
 digraph_get({chars})                                       *digraph_get()* *E1214*
 		Return the digraph of {chars}.  This should be a string with
 		exactly two characters.  If {chars} are not just two
@@ -1369,9 +1147,6 @@ digraph_get({chars})                                       *digraph_get()* *E121
 		call digraph_set('aa', 'あ')
 		echo digraph_get('aa')		" Returns 'あ'
 <
-		Can also be used as a |method|: >vim
-			GetChars()->digraph_get()
-<
 
 digraph_getlist([{listall}])                                 *digraph_getlist()*
 		Return a list of digraphs.  If the {listall} argument is given
@@ -1387,9 +1162,6 @@ digraph_getlist([{listall}])                                 *digraph_getlist()*
 		" Get all the digraphs, including default digraphs
 		echo digraph_getlist(1)
 <
-		Can also be used as a |method|: >vim
-			GetNumber()->digraph_getlist()
-<
 
 digraph_set({chars}, {digraph})                                  *digraph_set()*
 		Add digraph {chars} to the list.  {chars} must be a string
@@ -1440,10 +1212,6 @@ empty({expr})                                                          *empty()*
 		- |v:false| and |v:null| are empty, |v:true| is not.
 		- A |Blob| is empty when its length is zero.
 
-		Can also be used as a |method|: >vim
-			mylist->empty()
-<
-
 environ()                                                            *environ()*
 		Return all of environment variables as dictionary. You can
 		check if an environment variable exists like this: >vim
@@ -1461,10 +1229,6 @@ escape({string}, {chars})                                             *escape()*
 			c:\\program\ files\\vim
 <		Also see |shellescape()| and |fnameescape()|.
 
-		Can also be used as a |method|: >vim
-			GetText()->escape(' \')
-<
-
 eval({string})                                                          *eval()*
 		Evaluate {string} and return the result.  Especially useful to
 		turn the result of |string()| back into the original value.
@@ -1472,10 +1236,6 @@ eval({string})                                                          *eval()*
 		of them.  Also works for |Funcref|s that refer to existing
 		functions.
 
-		Can also be used as a |method|: >vim
-			argv->join()->eval()
-<
-
 eventhandler()                                                  *eventhandler()*
 		Returns 1 when inside an event handler.  That is that Vim got
 		interrupted while waiting for the user to type a character,
@@ -1505,10 +1265,6 @@ executable({expr})                                                *executable()*
 			-1	not implemented on this system
 		|exepath()| can be used to get the full path of an executable.
 
-		Can also be used as a |method|: >vim
-			GetCommand()->executable()
-<
-
 execute({command} [, {silent}])                                      *execute()*
 		Execute {command} and capture its output.
 		If {command} is a |String|, returns {command} output.
@@ -1537,20 +1293,12 @@ execute({command} [, {silent}])                                      *execute()*
 		To execute a command in another window than the current one
 		use `win_execute()`.
 
-		Can also be used as a |method|: >vim
-			GetCommand()->execute()
-<
-
 exepath({expr})                                                      *exepath()*
 		Returns the full path of {expr} if it is an executable and
 		given as a (partial or full) path or is found in $PATH.
 		Returns empty string otherwise.
 		If {expr} starts with "./" the |current-directory| is used.
 
-		Can also be used as a |method|: >vim
-			GetCommand()->exepath()
-<
-
 exists({expr})                                                        *exists()*
 		The result is a Number, which is |TRUE| if {expr} is
 		defined, zero otherwise.
@@ -1639,10 +1387,6 @@ exists({expr})                                                        *exists()*
 <		This doesn't check for existence of the "bufcount" variable,
 		but gets the value of "bufcount", and checks if that exists.
 
-		Can also be used as a |method|: >vim
-			Varname()->exists()
-<
-
 exp({expr})                                                              *exp()*
 		Return the exponential of {expr} as a |Float| in the range
 		[0, inf].
@@ -1654,10 +1398,6 @@ exp({expr})                                                              *exp()*
 			echo exp(-1)
 <			0.367879
 
-		Can also be used as a |method|: >vim
-			Compute()->exp()
-<
-
 expand({string} [, {nosuf} [, {list}]])                               *expand()*
 		Expand wildcards and the following special keywords in
 		{string}.  'wildignorecase' applies.
@@ -1749,10 +1489,6 @@ expand({string} [, {nosuf} [, {list}]])                               *expand()*
 		See |glob()| for finding existing files.  See |system()| for
 		getting the raw output of an external command.
 
-		Can also be used as a |method|: >vim
-			Getpattern()->expand()
-<
-
 expandcmd({string} [, {options}])                                  *expandcmd()*
 		Expand special items in String {string} like what is done for
 		an Ex command such as `:edit`.  This expands special keywords,
@@ -1776,9 +1512,6 @@ expandcmd({string} [, {options}])                                  *expandcmd()*
 <		 >vim
 			echo expandcmd('make %<.o', {'errmsg': v:true})
 <
-		Can also be used as a |method|: >vim
-			GetCommand()->expandcmd()
-<
 
 extend({expr1}, {expr2} [, {expr3}])                                  *extend()*
 		{expr1} and {expr2} must be both |Lists| or both
@@ -1816,10 +1549,6 @@ extend({expr1}, {expr2} [, {expr3}])                                  *extend()*
 		fails.
 		Returns {expr1}.  Returns 0 on error.
 
-		Can also be used as a |method|: >vim
-			mylist->extend(otherlist)
-<
-
 extendnew({expr1}, {expr2} [, {expr3}])                            *extendnew()*
 		Like |extend()| but instead of adding items to {expr1} a new
 		List or Dictionary is created and returned.  {expr1} remains
@@ -1870,10 +1599,6 @@ feedkeys({string} [, {mode}])                                       *feedkeys()*
 
 		Return value is always 0.
 
-		Can also be used as a |method|: >vim
-			GetInput()->feedkeys()
-<
-
 filereadable({file})                                            *filereadable()*
 		The result is a Number, which is |TRUE| when a file with the
 		name {file} exists, and can be read.  If {file} doesn't exist,
@@ -1891,20 +1616,12 @@ filereadable({file})                                            *filereadable()*
 			1
 <
 
-		Can also be used as a |method|: >vim
-			GetName()->filereadable()
-<
-
 filewritable({file})                                            *filewritable()*
 		The result is a Number, which is 1 when a file with the
 		name {file} exists, and can be written.  If {file} doesn't
 		exist, or is not writable, the result is 0.  If {file} is a
 		directory, and we can write to it, the result is 2.
 
-		Can also be used as a |method|: >vim
-			GetName()->filewritable()
-<
-
 filter({expr1}, {expr2})                                              *filter()*
 		{expr1} must be a |List|, |Blob|, or a |Dictionary|.
 		For each item in {expr1} evaluate {expr2} and when the result
@@ -1955,10 +1672,6 @@ filter({expr1}, {expr2})                                              *filter()*
 		{expr2} is a Funcref errors inside a function are ignored,
 		unless it was defined with the "abort" flag.
 
-		Can also be used as a |method|: >vim
-			mylist->filter(expr2)
-<
-
 finddir({name} [, {path} [, {count}]])                               *finddir()*
 		Find directory {name} in {path}.  Supports both downwards and
 		upwards recursive directory searches.  See |file-searching|
@@ -1977,10 +1690,6 @@ finddir({name} [, {path} [, {count}]])                               *finddir()*
 
 		This is quite similar to the ex-command `:find`.
 
-		Can also be used as a |method|: >vim
-			GetName()->finddir()
-<
-
 findfile({name} [, {path} [, {count}]])                             *findfile()*
 		Just like |finddir()|, but find a file instead of a directory.
 		Uses 'suffixesadd'.
@@ -1989,10 +1698,6 @@ findfile({name} [, {path} [, {count}]])                             *findfile()*
 <		Searches from the directory of the current file upwards until
 		it finds the file "tags.vim".
 
-		Can also be used as a |method|: >vim
-			GetName()->findfile()
-<
-
 flatten({list} [, {maxdepth}])                                       *flatten()*
 		Flatten {list} up to {maxdepth} levels.  Without {maxdepth}
 		the result is a |List| without nesting, as if {maxdepth} is
@@ -2012,10 +1717,6 @@ flatten({list} [, {maxdepth}])                                       *flatten()*
 			echo flatten([1, [2, [3, 4]], 5], 1)
 <			[1, 2, [3, 4], 5]
 
-		Can also be used as a |method|: >vim
-			mylist->flatten()
-<
-
 flattennew({list} [, {maxdepth}])                                 *flattennew()*
 		Like |flatten()| but first make a copy of {list}.
 
@@ -2041,10 +1742,6 @@ float2nr({expr})                                                    *float2nr()*
 			echo float2nr(1.0e-100)
 <			0
 
-		Can also be used as a |method|: >vim
-			Compute()->float2nr()
-<
-
 floor({expr})                                                          *floor()*
 		Return the largest integral value less than or equal to
 		{expr} as a |Float| (round down).
@@ -2058,10 +1755,6 @@ floor({expr})                                                          *floor()*
 			echo floor(4.0)
 <			4.0
 
-		Can also be used as a |method|: >vim
-			Compute()->floor()
-<
-
 fmod({expr1}, {expr2})                                                  *fmod()*
 		Return the remainder of {expr1} / {expr2}, even if the
 		division is not representable.  Returns {expr1} - i * {expr2}
@@ -2078,10 +1771,6 @@ fmod({expr1}, {expr2})                                                  *fmod()*
 			echo fmod(-12.33, 1.22)
 <			-0.13
 
-		Can also be used as a |method|: >vim
-			Compute()->fmod(1.22)
-<
-
 fnameescape({string})                                            *fnameescape()*
 		Escape {string} for use as file name command argument.  All
 		characters that have a special meaning, such as `'%'` and `'|'`
@@ -2098,9 +1787,6 @@ fnameescape({string})                                            *fnameescape()*
 <		results in executing: >vim
 			edit \+some\ str\%nge\|name
 <
-		Can also be used as a |method|: >vim
-			GetName()->fnameescape()
-<
 
 fnamemodify({fname}, {mods})                                     *fnamemodify()*
 		Modify file name {fname} according to {mods}.  {mods} is a
@@ -2119,10 +1805,6 @@ fnamemodify({fname}, {mods})                                     *fnamemodify()*
 		Note: Environment variables don't work in {fname}, use
 		|expand()| first then.
 
-		Can also be used as a |method|: >vim
-			GetName()->fnamemodify(':p:h')
-<
-
 foldclosed({lnum})                                                *foldclosed()*
 		The result is a Number.  If the line {lnum} is in a closed
 		fold, the result is the number of the first line in that fold.
@@ -2130,10 +1812,6 @@ foldclosed({lnum})                                                *foldclosed()*
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->foldclosed()
-<
-
 foldclosedend({lnum})                                          *foldclosedend()*
 		The result is a Number.  If the line {lnum} is in a closed
 		fold, the result is the number of the last line in that fold.
@@ -2141,10 +1819,6 @@ foldclosedend({lnum})                                          *foldclosedend()*
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->foldclosedend()
-<
-
 foldlevel({lnum})                                                  *foldlevel()*
 		The result is a Number, which is the foldlevel of line {lnum}
 		in the current buffer.  For nested folds the deepest level is
@@ -2157,10 +1831,6 @@ foldlevel({lnum})                                                  *foldlevel()*
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->foldlevel()
-<
-
 foldtext()                                                          *foldtext()*
 		Returns a String, to be displayed for a closed fold.  This is
 		the default function used for the 'foldtext' option and should
@@ -2187,10 +1857,6 @@ foldtextresult({lnum})                                        *foldtextresult()*
 		line, "'m" mark m, etc.
 		Useful when exporting folded text, e.g., to HTML.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->foldtextresult()
-<
-
 fullcommand({name})                                              *fullcommand()*
 		Get the full command name from a short abbreviated command
 		name; see |20.2| for details on command abbreviations.
@@ -2203,10 +1869,6 @@ fullcommand({name})                                              *fullcommand()*
 		For example `fullcommand('s')`, `fullcommand('sub')`,
 		`fullcommand(':%substitute')` all return "substitute".
 
-		Can also be used as a |method|: >vim
-			GetName()->fullcommand()
-<
-
 funcref({name} [, {arglist}] [, {dict}])                             *funcref()*
 		Just like |function()|, but the returned Funcref will lookup
 		the function by reference, not by name.  This matters when the
@@ -2219,10 +1881,6 @@ funcref({name} [, {arglist}] [, {dict}])                             *funcref()*
 		instead). {name} cannot be a builtin function.
 		Returns 0 on error.
 
-		Can also be used as a |method|: >vim
-			GetFuncname()->funcref([arg])
-<
-
 function({name} [, {arglist}] [, {dict}])         *function()* *partial* *E700* *E923*
 		Return a |Funcref| variable that refers to function {name}.
 		{name} can be the name of a user defined function or an
@@ -2305,10 +1963,6 @@ function({name} [, {arglist}] [, {dict}])         *function()* *partial* *E700*
 <
 		Returns 0 on error.
 
-		Can also be used as a |method|: >vim
-			GetFuncname()->function([arg])
-<
-
 garbagecollect([{atexit}])                                    *garbagecollect()*
 		Cleanup unused |Lists| and |Dictionaries| that have circular
 		references.
@@ -2333,9 +1987,6 @@ get({list}, {idx} [, {default}])                                         *get()*
 		Get item {idx} from |List| {list}.  When this item is not
 		available return {default}.  Return zero when {default} is
 		omitted.
-		Can also be used as a |method|: >vim
-			mylist->get(idx)
-<
 
 get({blob}, {idx} [, {default}])
 		Get byte {idx} from |Blob| {blob}.  When this byte is not
@@ -2425,9 +2076,6 @@ getbufinfo([{dict}])                                              *getbufinfo()*
 		To get buffer-local options use: >vim
 			getbufvar({bufnr}, '&option_name')
 <
-		Can also be used as a |method|: >vim
-			GetBufnr()->getbufinfo()
-<
 
 getbufline({buf}, {lnum} [, {end}])                               *getbufline()*
 		Return a |List| with the lines starting from {lnum} to {end}
@@ -2454,10 +2102,6 @@ getbufline({buf}, {lnum} [, {end}])                               *getbufline()*
 		Example: >vim
 			let lines = getbufline(bufnr("myfile"), 1, "$")
 
-<		Can also be used as a |method|: >vim
-			GetBufnr()->getbufline(lnum)
-<
-
 getbufoneline({buf}, {lnum})                                   *getbufoneline()*
 		Just like `getbufline()` but only get one line and return it
 		as a string.
@@ -2483,10 +2127,6 @@ getbufvar({buf}, {varname} [, {def}])                              *getbufvar()*
 			let bufmodified = getbufvar(1, "&mod")
 			echo "todo myvar = " .. getbufvar("todo", "myvar")
 
-<		Can also be used as a |method|: >vim
-			GetBufnr()->getbufvar(varname)
-<
-
 getcellwidths()                                                *getcellwidths()*
 		Returns a |List| of cell widths of character ranges overridden
 		by |setcellwidths()|.  The format is equal to the argument of
@@ -2509,10 +2149,6 @@ getchangelist([{buf}])                                         *getchangelist()*
 		position refers to the position in the list. For other
 		buffers, it is set to the length of the list.
 
-		Can also be used as a |method|: >vim
-			GetBufnr()->getchangelist()
-<
-
 getchar([expr])                                                      *getchar()*
 		Get a single character from the user or input stream.
 		If [expr] is omitted, wait until a character is available.
@@ -2607,9 +2243,6 @@ getcharpos({expr})                                                *getcharpos()*
 			getcharpos('.')		returns [0, 5, 3, 0]
 			getpos('.')		returns [0, 5, 7, 0]
 <
-		Can also be used as a |method|: >vim
-			GetMark()->getcharpos()
-<
 
 getcharsearch()                                                *getcharsearch()*
 		Return the current character search information as a {dict}
@@ -2768,10 +2401,6 @@ getcompletion({pat}, {type} [, {filtered}])                    *getcompletion()*
 		If there are no matches, an empty list is returned.  An
 		invalid value for {type} produces an error.
 
-		Can also be used as a |method|: >vim
-			GetPattern()->getcompletion('color')
-<
-
 getcurpos([{winid}])                                               *getcurpos()*
 		Get the position of the cursor.  This is like getpos('.'), but
 		includes an extra "curswant" item in the list:
@@ -2797,10 +2426,6 @@ getcurpos([{winid}])                                               *getcurpos()*
 <		Note that this only works within the window.  See
 		|winrestview()| for restoring more state.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->getcurpos()
-<
-
 getcursorcharpos([{winid}])                                 *getcursorcharpos()*
 		Same as |getcurpos()| but the column number in the returned
 		List is a character index instead of a byte index.
@@ -2810,9 +2435,6 @@ getcursorcharpos([{winid}])                                 *getcursorcharpos()*
 			getcursorcharpos()	" returns [0, 3, 2, 0, 3]
 			getcurpos()		" returns [0, 3, 4, 0, 3]
 <
-		Can also be used as a |method|: >vim
-			GetWinid()->getcursorcharpos()
-<
 
 getcwd([{winnr} [, {tabnr}]])                                         *getcwd()*
 		With no arguments, returns the name of the effective
@@ -2830,10 +2452,6 @@ getcwd([{winnr} [, {tabnr}]])                                         *getcwd()*
 		directory is returned.
 		Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 
-		Can also be used as a |method|: >vim
-			GetWinnr()->getcwd()
-<
-
 getenv({name})                                                        *getenv()*
 		Return the value of environment variable {name}.  The {name}
 		argument is a string, without a leading '$'.  Example: >vim
@@ -2843,10 +2461,6 @@ getenv({name})                                                        *getenv()*
 		is different from a variable set to an empty string.
 		See also |expr-env|.
 
-		Can also be used as a |method|: >vim
-			GetVarname()->getenv()
-<
-
 getfontname([{name}])                                            *getfontname()*
 		Without an argument returns the name of the normal font being
 		used.  Like what is used for the Normal highlight group
@@ -2874,9 +2488,6 @@ getfperm({fname})                                                   *getfperm()*
 <		This will hopefully (from a security point of view) display
 		the string "rw-r--r--" or even "rw-------".
 
-		Can also be used as a |method|: >vim
-			GetFilename()->getfperm()
-<
 		For setting permissions use |setfperm()|.
 
 getfsize({fname})                                                   *getfsize()*
@@ -2887,10 +2498,6 @@ getfsize({fname})                                                   *getfsize()*
 		If the size of {fname} is too big to fit in a Number then -2
 		is returned.
 
-		Can also be used as a |method|: >vim
-			GetFilename()->getfsize()
-<
-
 getftime({fname})                                                   *getftime()*
 		The result is a Number, which is the last modification time of
 		the given file {fname}.  The value is measured as seconds
@@ -2898,10 +2505,6 @@ getftime({fname})                                                   *getftime()*
 		|localtime()| and |strftime()|.
 		If the file {fname} can't be found -1 is returned.
 
-		Can also be used as a |method|: >vim
-			GetFilename()->getftime()
-<
-
 getftype({fname})                                                   *getftype()*
 		The result is a String, which is a description of the kind of
 		file of the given file {fname}.
@@ -2922,10 +2525,6 @@ getftype({fname})                                                   *getftype()*
 		systems that support it.  On some systems only "dir" and
 		"file" are returned.
 
-		Can also be used as a |method|: >vim
-			GetFilename()->getftype()
-<
-
 getjumplist([{winnr} [, {tabnr}]])                               *getjumplist()*
 		Returns the |jumplist| for the specified window.
 
@@ -2946,10 +2545,6 @@ getjumplist([{winnr} [, {tabnr}]])                               *getjumplist()*
 			filename	filename if available
 			lnum		line number
 
-		Can also be used as a |method|: >vim
-			GetWinnr()->getjumplist()
-<
-
 getline({lnum} [, {end}])                                            *getline()*
 		Without {end} the result is a String, which is line {lnum}
 		from the current buffer.  Example: >vim
@@ -2972,9 +2567,6 @@ getline({lnum} [, {end}])                                            *getline()*
 			let end = search("^$") - 1
 			let lines = getline(start, end)
 
-<		Can also be used as a |method|: >vim
-			ComputeLnum()->getline()
-
 <		To get lines from another buffer see |getbufline()| and
 		|getbufoneline()|
 
@@ -3029,10 +2621,6 @@ getmarklist([{buf}])                                             *getmarklist()*
 		Refer to |getpos()| for getting information about a specific
 		mark.
 
-		Can also be used as a |method|: >vim
-			GetBufnr()->getmarklist()
-<
-
 getmatches([{win}])                                               *getmatches()*
 		Returns a |List| with all matches previously defined for the
 		current window by |matchadd()| and the |:match| commands.
@@ -3127,10 +2715,6 @@ getpos({expr})                                                        *getpos()*
 			call setpos("'a", save_a_mark)
 <		Also see |getcharpos()|, |getcurpos()| and |setpos()|.
 
-		Can also be used as a |method|: >vim
-			GetMark()->getpos()
-<
-
 getqflist([{what}])                                                *getqflist()*
 		Returns a |List| with all the current quickfix errors.  Each
 		list item is a dictionary with these entries:
@@ -3255,10 +2839,6 @@ getreg([{regname} [, 1 [, {list}]]])                                  *getreg()*
 
 		If {regname} is not specified, |v:register| is used.
 
-		Can also be used as a |method|: >vim
-			GetRegname()->getreg()
-<
-
 getreginfo([{regname}])                                           *getreginfo()*
 		Returns detailed information about register {regname} as a
 		Dictionary with the following entries:
@@ -3283,10 +2863,6 @@ getreginfo([{regname}])                                           *getreginfo()*
 		If {regname} is not specified, |v:register| is used.
 		The returned Dictionary can be passed to |setreg()|.
 
-		Can also be used as a |method|: >vim
-			GetRegname()->getreginfo()
-<
-
 getregtype([{regname}])                                           *getregtype()*
 		The result is a String, which is type of register {regname}.
 		The value will be one of:
@@ -3298,10 +2874,6 @@ getregtype([{regname}])                                           *getregtype()*
 		The {regname} argument is a string.  If {regname} is not
 		specified, |v:register| is used.
 
-		Can also be used as a |method|: >vim
-			GetRegname()->getregtype()
-<
-
 getscriptinfo([{opts}])                                        *getscriptinfo()*
 		Returns a |List| with information about all the sourced Vim
 		scripts in the order they were sourced, like what
@@ -3352,10 +2924,6 @@ gettabinfo([{tabnr}])                                             *gettabinfo()*
 					tabpage-local variables
 			windows		List of |window-ID|s in the tab page.
 
-		Can also be used as a |method|: >vim
-			GetTabnr()->gettabinfo()
-<
-
 gettabvar({tabnr}, {varname} [, {def}])                            *gettabvar()*
 		Get the value of a tab-local variable {varname} in tab page
 		{tabnr}. |t:var|
@@ -3366,10 +2934,6 @@ gettabvar({tabnr}, {varname} [, {def}])                            *gettabvar()*
 		When the tab or variable doesn't exist {def} or an empty
 		string is returned, there is no error message.
 
-		Can also be used as a |method|: >vim
-			GetTabnr()->gettabvar(varname)
-<
-
 gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])             *gettabwinvar()*
 		Get the value of window-local variable {varname} in window
 		{winnr} in tab page {tabnr}.
@@ -3396,9 +2960,6 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])             *gettabwinvar()*
 		To obtain all window-local variables use: >vim
 			gettabwinvar({tabnr}, {winnr}, '&')
 <
-		Can also be used as a |method|: >vim
-			GetTabnr()->gettabwinvar(winnr, varname)
-<
 
 gettagstack([{winnr}])                                           *gettagstack()*
 		The result is a Dict, which is the tag stack of window {winnr}.
@@ -3428,10 +2989,6 @@ gettagstack([{winnr}])                                           *gettagstack()*
 
 		See |tagstack| for more information about the tag stack.
 
-		Can also be used as a |method|: >vim
-			GetWinnr()->gettagstack()
-<
-
 gettext({text})                                                      *gettext()*
 		Translate String {text} if possible.
 		This is mainly for use in the distributed Vim scripts.  When
@@ -3477,10 +3034,6 @@ getwininfo([{winid}])                                             *getwininfo()*
 			winrow		topmost screen line of the window;
 					"row" from |win_screenpos()|
 
-		Can also be used as a |method|: >vim
-			GetWinnr()->getwininfo()
-<
-
 getwinpos([{timeout}])                                             *getwinpos()*
 		The result is a |List| with two numbers, the result of
 		|getwinposx()| and |getwinposy()| combined:
@@ -3501,9 +3054,6 @@ getwinpos([{timeout}])                                             *getwinpos()*
 			  " Do some work here
 			endwhile
 <
-		Can also be used as a |method|: >vim
-			GetTimeout()->getwinpos()
-<
 
 getwinposx()                                                      *getwinposx()*
 		The result is a Number, which is the X coordinate in pixels of
@@ -3523,10 +3073,6 @@ getwinvar({winnr}, {varname} [, {def}])                            *getwinvar()*
 			let list_is_on = getwinvar(2, '&list')
 			echo "myvar = " .. getwinvar(1, 'myvar')
 
-<		Can also be used as a |method|: >vim
-			GetWinnr()->getwinvar(varname)
-<
-
 glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])                      *glob()*
 		Expand the file wildcards in {expr}.  See |wildcards| for the
 		use of special characters.
@@ -3563,10 +3109,6 @@ glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])                      *glob()*
 		See |expand()| for expanding special Vim variables.  See
 		|system()| for getting the raw output of an external command.
 
-		Can also be used as a |method|: >vim
-			GetExpr()->glob()
-<
-
 glob2regpat({string})                                            *glob2regpat()*
 		Convert a file pattern, as used by glob(), into a search
 		pattern.  The result can be used to match with a string that
@@ -3583,10 +3125,6 @@ glob2regpat({string})                                            *glob2regpat()*
 		Note that the result depends on the system.  On MS-Windows
 		a backslash usually means a path separator.
 
-		Can also be used as a |method|: >vim
-			GetExpr()->glob2regpat()
-<
-
 globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])       *globpath()*
 		Perform glob() for String {expr} on all directories in {path}
 		and concatenate the results.  Example: >vim
@@ -3622,11 +3160,6 @@ globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])       *globpath()*
 <		Upwards search and limiting the depth of "**" is not
 		supported, thus using 'path' will not always work properly.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetExpr()->globpath(&rtp)
-<
-
 has({feature})                                                           *has()*
 		Returns 1 if {feature} is supported, 0 otherwise.  The
 		{feature} argument is a feature name like "nvim-0.2.1" or
@@ -3700,10 +3233,6 @@ has_key({dict}, {key})                                               *has_key()*
 		has an entry with key {key}.  FALSE otherwise. The {key}
 		argument is a string.
 
-		Can also be used as a |method|: >vim
-			mydict->has_key(key)
-<
-
 haslocaldir([{winnr} [, {tabnr}]])                               *haslocaldir()*
 		The result is a Number, which is 1 when the window has set a
 		local path via |:lcd| or when {winnr} is -1 and the tabpage
@@ -3721,10 +3250,6 @@ haslocaldir([{winnr} [, {tabnr}]])                               *haslocaldir()*
 		If {winnr} is -1 it is ignored, only the tab is resolved.
 		Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 
-		Can also be used as a |method|: >vim
-			GetWinnr()->haslocaldir()
-<
-
 hasmapto({what} [, {mode} [, {abbr}]])                              *hasmapto()*
 		The result is a Number, which is TRUE if there is a mapping
 		that contains {what} in somewhere in the rhs (what it is
@@ -3756,10 +3281,6 @@ hasmapto({what} [, {mode} [, {abbr}]])                              *hasmapto()*
 <		This installs the mapping to "\ABCdoit" only if there isn't
 		already a mapping to "\ABCdoit".
 
-		Can also be used as a |method|: >vim
-			GetRHS()->hasmapto()
-<
-
 histadd({history}, {item})                                           *histadd()*
 		Add the String {item} to the history {history} which can be
 		one of:					*hist-names*
@@ -3781,11 +3302,6 @@ histadd({history}, {item})                                           *histadd()*
 			let date=input("Enter date: ")
 <		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetHistory()->histadd('search')
-<
-
 histdel({history} [, {item}])                                        *histdel()*
 		Clear {history}, i.e. delete all its entries.  See |hist-names|
 		for the possible values of {history}.
@@ -3818,9 +3334,6 @@ histdel({history} [, {item}])                                        *histdel()*
 			call histdel("search", -1)
 			let @/ = histget("search", -1)
 <
-		Can also be used as a |method|: >vim
-			GetHistory()->histdel()
-<
 
 histget({history} [, {index}])                                       *histget()*
 		The result is a String, the entry with Number {index} from
@@ -3837,9 +3350,6 @@ histget({history} [, {index}])                                       *histget()*
 		the {num}th entry from the output of |:history|. >vim
 			command -nargs=1 H execute histget("cmd", 0+<args>)
 <
-		Can also be used as a |method|: >vim
-			GetHistory()->histget()
-<
 
 histnr({history})                                                     *histnr()*
 		The result is the Number of the current entry in {history}.
@@ -3849,10 +3359,6 @@ histnr({history})                                                     *histnr()*
 		Example: >vim
 			let inp_index = histnr("expr")
 
-<		Can also be used as a |method|: >vim
-			GetHistory()->histnr()
-<
-
 hlID({name})                                                            *hlID()*
 		The result is a Number, which is the ID of the highlight group
 		with name {name}.  When the highlight group doesn't exist,
@@ -3862,9 +3368,6 @@ hlID({name})                                                            *hlID()*
 		"Comment" group: >vim
 			echo synIDattr(synIDtrans(hlID("Comment")), "bg")
 <
-		Can also be used as a |method|: >vim
-			GetName()->hlID()
-<
 
 hlexists({name})                                                    *hlexists()*
 		The result is a Number, which is TRUE if a highlight group
@@ -3873,10 +3376,6 @@ hlexists({name})                                                    *hlexists()*
 		been defined for it, it may also have been used for a syntax
 		item.
 
-		Can also be used as a |method|: >vim
-			GetName()->hlexists()
-<
-
 hostname()                                                          *hostname()*
 		The result is a String, which is the name of the machine on
 		which Vim is currently running.  Machine names greater than
@@ -3894,10 +3393,6 @@ iconv({string}, {from}, {to})                                          *iconv()*
 		from/to UCS-2 is automatically changed to use UTF-8.  You
 		cannot use UCS-2 in a string anyway, because of the NUL bytes.
 
-		Can also be used as a |method|: >vim
-			GetText()->iconv('latin1', 'utf-8')
-<
-
 id({expr})                                                                *id()*
 		Returns a |String| which is a unique identifier of the
 		container type (|List|, |Dict|, |Blob| and |Partial|). It is
@@ -3921,10 +3416,6 @@ indent({lnum})                                                        *indent()*
 		|getline()|.
 		When {lnum} is invalid -1 is returned.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->indent()
-<
-
 index({object}, {expr} [, {start} [, {ic}]])                           *index()*
 		Find {expr} in {object} and return its index.  See
 		|indexof()| for using a lambda to select the item.
@@ -3950,11 +3441,7 @@ index({object}, {expr} [, {start} [, {ic}]])                           *index()*
 			let idx = index(words, "the")
 			if index(numbers, 123) >= 0
 			  " ...
-			endif
-
-<		Can also be used as a |method|: >vim
-			GetObject()->index(what)
-<
+			endif
 
 indexof({object}, {expr} [, {opts}])                                 *indexof()*
 		Returns the index of an item in {object} where {expr} is
@@ -3994,10 +3481,6 @@ indexof({object}, {expr} [, {opts}])                                 *indexof()*
 			echo indexof(l, {i, v -> v.n == 30})
 			echo indexof(l, "v:val.n == 20", #{startidx: 1})
 
-<		Can also be used as a |method|: >vim
-			mylist->indexof(expr)
-<
-
 input({prompt} [, {text} [, {completion}]])                            *input()*
 
 input({opts})
@@ -4110,10 +3593,6 @@ input({opts})
 			  call inputrestore()
 			endfunction
 
-<		Can also be used as a |method|: >vim
-			GetPrompt()->input()
-<
-
 inputlist({textlist})                                              *inputlist()*
 		{textlist} must be a |List| of strings.  This |List| is
 		displayed, one string per line.  The user will be prompted to
@@ -4131,10 +3610,6 @@ inputlist({textlist})                                              *inputlist()*
 			let color = inputlist(['Select color:', '1. red',
 				\ '2. green', '3. blue'])
 
-<		Can also be used as a |method|: >vim
-			GetChoices()->inputlist()
-<
-
 inputrestore()                                                  *inputrestore()*
 		Restore typeahead that was saved with a previous |inputsave()|.
 		Should be called the same number of times inputsave() is
@@ -4160,10 +3635,6 @@ inputsecret({prompt} [, {text}])                                 *inputsecret()*
 		typed on the command-line in response to the issued prompt.
 		NOTE: Command-line completion is not supported.
 
-		Can also be used as a |method|: >vim
-			GetPrompt()->inputsecret()
-<
-
 insert({object}, {item} [, {idx}])                                    *insert()*
 		When {object} is a |List| or a |Blob| insert {item} at the start
 		of it.
@@ -4181,10 +3652,6 @@ insert({object}, {item} [, {idx}])                                    *insert()*
 		Note that when {item} is a |List| it is inserted as a single
 		item.  Use |extend()| to concatenate |Lists|.
 
-		Can also be used as a |method|: >vim
-			mylist->insert(item)
-<
-
 interrupt()                                                        *interrupt()*
 		Interrupt script execution.  It works more or less like the
 		user typing CTRL-C, most commands won't execute and control
@@ -4201,11 +3668,6 @@ interrupt()                                                        *interrupt()*
 
 invert({expr})                                                        *invert()*
 		Bitwise invert.  The argument is converted to a number.  A
-		List, Dict or Float argument causes an error.  Example: >vim
-			let bits = invert(bits)
-<		Can also be used as a |method|: >vim
-			let bits = bits->invert()
-<
 
 isdirectory({directory})                                         *isdirectory()*
 		The result is a Number, which is |TRUE| when a directory
@@ -4213,10 +3675,6 @@ isdirectory({directory})                                         *isdirectory()*
 		exist, or isn't a directory, the result is |FALSE|.  {directory}
 		is any expression, which is used as a String.
 
-		Can also be used as a |method|: >vim
-			GetName()->isdirectory()
-<
-
 isinf({expr})                                                          *isinf()*
 		Return 1 if {expr} is a positive infinity, or -1 a negative
 		infinity, otherwise 0. >vim
@@ -4225,10 +3683,6 @@ isinf({expr})                                                          *isinf()*
 			echo isinf(-1.0 / 0.0)
 <			-1
 
-		Can also be used as a |method|: >vim
-			Compute()->isinf()
-<
-
 islocked({expr})                                               *islocked()* *E786*
 		The result is a Number, which is |TRUE| when {expr} is the
 		name of a locked variable.
@@ -4243,19 +3697,11 @@ islocked({expr})                                               *islocked()* *E78
 <		When {expr} is a variable that does not exist you get an error
 		message.  Use |exists()| to check for existence.
 
-		Can also be used as a |method|: >vim
-			GetName()->islocked()
-<
-
 isnan({expr})                                                          *isnan()*
 		Return |TRUE| if {expr} is a float with value NaN. >vim
 			echo isnan(0.0 / 0.0)
 <			1
 
-		Can also be used as a |method|: >vim
-			Compute()->isnan()
-<
-
 items({dict})                                                          *items()*
 		Return a |List| with all the key-value pairs of {dict}.  Each
 		|List| item is a list with two items: the key of a {dict}
@@ -4266,10 +3712,6 @@ items({dict})                                                          *items()*
 			   echo key .. ': ' .. value
 			endfor
 
-<		Can also be used as a |method|: >vim
-			mydict->items()
-<
-
 jobpid({job})                                                         *jobpid()*
 		Return the PID (process id) of |job-id| {job}.
 
@@ -4406,10 +3848,6 @@ join({list} [, {sep}])                                                  *join()*
 		converted into a string like with |string()|.
 		The opposite function is |split()|.
 
-		Can also be used as a |method|: >vim
-			mylist->join()
-<
-
 json_decode({expr})                                              *json_decode()*
 		Convert {expr} from JSON object.  Accepts |readfile()|-style
 		list as the input, as well as regular string.  May output any
@@ -4426,10 +3864,6 @@ json_decode({expr})                                              *json_decode()*
 		recommended and the only one required to be supported.
 		Non-UTF-8 characters are an error.
 
-		Can also be used as a |method|: >vim
-			ReadObject()->json_decode()
-<
-
 json_encode({expr})                                              *json_encode()*
 		Convert {expr} into a JSON string.  Accepts
 		|msgpack-special-dict| as the input.  Will not convert
@@ -4442,18 +3876,10 @@ json_encode({expr})                                              *json_encode()*
 		or special escapes like "\t", other are dumped as-is.
 		|Blob|s are converted to arrays of the individual bytes.
 
-		Can also be used as a |method|: >vim
-			GetObject()->json_encode()
-<
-
 keys({dict})                                                            *keys()*
 		Return a |List| with all the keys of {dict}.  The |List| is in
 		arbitrary order.  Also see |items()| and |values()|.
 
-		Can also be used as a |method|: >vim
-			mydict->keys()
-<
-
 keytrans({string})                                                  *keytrans()*
 		Turn the internal byte representation of keys into a form that
 		can be used for |:map|.  E.g. >vim
@@ -4461,10 +3887,6 @@ keytrans({string})                                                  *keytrans()*
 			echo keytrans(xx)
 <			<C-Home>
 
-		Can also be used as a |method|: >vim
-			"\<C-Home>"->keytrans()
-<
-
 len({expr})                                                         *len()* *E701*
 		When {expr} is a String or a Number the length in bytes is
 		used, as with |strlen()|.
@@ -4475,10 +3897,6 @@ len({expr})                                                         *len()* *E70
 		|Dictionary| is returned.
 		Otherwise an error is given and returns zero.
 
-		Can also be used as a |method|: >vim
-			mylist->len()
-<
-
 libcall({libname}, {funcname}, {argument})                 *libcall()* *E364* *E368*
 		Call function {funcname} in the run-time library {libname}
 		with single argument {argument}.
@@ -4521,11 +3939,6 @@ libcall({libname}, {funcname}, {argument})                 *libcall()* *E364* *E
 		Examples: >vim
 			echo libcall("libc.so", "getenv", "HOME")
 
-<		Can also be used as a |method|, the base is passed as the
-		third argument: >vim
-			GetValue()->libcall("libc.so", "getenv")
-<
-
 libcallnr({libname}, {funcname}, {argument})                       *libcallnr()*
 		Just like |libcall()|, but used for a function that returns an
 		int instead of a string.
@@ -4534,10 +3947,6 @@ libcallnr({libname}, {funcname}, {argument})                       *libcallnr()*
 			call libcallnr("libc.so", "printf", "Hello World!\n")
 			call libcallnr("libc.so", "sleep", 10)
 <
-		Can also be used as a |method|, the base is passed as the
-		third argument: >vim
-			GetValue()->libcallnr("libc.so", "printf")
-<
 
 line({expr} [, {winid}])                                                *line()*
 		The result is a Number, which is the line number of the file
@@ -4571,10 +3980,6 @@ line({expr} [, {winid}])                                                *line()*
 		To jump to the last known position when opening a file see
 		|last-position-jump|.
 
-		Can also be used as a |method|: >vim
-			GetValue()->line()
-<
-
 line2byte({lnum})                                                  *line2byte()*
 		Return the byte count from the start of the buffer for line
 		{lnum}.  This includes the end-of-line character, depending on
@@ -4588,10 +3993,6 @@ line2byte({lnum})                                                  *line2byte()*
 		|getline()|.  When {lnum} is invalid -1 is returned.
 		Also see |byte2line()|, |go| and |:goto|.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->line2byte()
-<
-
 lispindent({lnum})                                                *lispindent()*
 		Get the amount of indent for line {lnum} according the lisp
 		indenting rules, as with 'lisp'.
@@ -4599,10 +4000,6 @@ lispindent({lnum})                                                *lispindent()*
 		relevant.  {lnum} is used just like in |getline()|.
 		When {lnum} is invalid, -1 is returned.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->lispindent()
-<
-
 list2blob({list})                                                  *list2blob()*
 		Return a Blob concatenating all the number values in {list}.
 		Examples: >vim
@@ -4613,10 +4010,6 @@ list2blob({list})                                                  *list2blob()*
 
 		|blob2list()| does the opposite.
 
-		Can also be used as a |method|: >vim
-			GetList()->list2blob()
-<
-
 list2str({list} [, {utf8}])                                         *list2str()*
 		Convert each number in {list} to a character string can
 		concatenate them all.  Examples: >vim
@@ -4633,10 +4026,6 @@ list2str({list} [, {utf8}])                                         *list2str()*
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			GetList()->list2str()
-<
-
 localtime()                                                        *localtime()*
 		Return the current time, measured as seconds since 1st Jan
 		1970.  See also |strftime()|, |strptime()| and |getftime()|.
@@ -4652,10 +4041,6 @@ log({expr})                                                              *log()*
 			echo log(exp(5))
 <			5.0
 
-		Can also be used as a |method|: >vim
-			Compute()->log()
-<
-
 log10({expr})                                                          *log10()*
 		Return the logarithm of Float {expr} to base 10 as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -4666,18 +4051,10 @@ log10({expr})                                                          *log10()*
 			echo log10(0.01)
 <			-2.0
 
-		Can also be used as a |method|: >vim
-			Compute()->log10()
-<
-
 luaeval({expr} [, {expr}])                                           *luaeval()*
 		Evaluate Lua expression {expr} and return its result converted
 		to Vim data structures. See |lua-eval| for more details.
 
-		Can also be used as a |method|: >vim
-			GetExpr()->luaeval()
-<
-
 map({expr1}, {expr2})                                                    *map()*
 		{expr1} must be a |List|, |Blob| or |Dictionary|.
 		Replace each item in {expr1} with the result of evaluating
@@ -4725,10 +4102,6 @@ map({expr1}, {expr2})                                                    *map()*
 		{expr2} is a Funcref errors inside a function are ignored,
 		unless it was defined with the "abort" flag.
 
-		Can also be used as a |method|: >vim
-			mylist->map(expr2)
-<
-
 maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 		When {dict} is omitted or zero: Return the rhs of mapping
 		{name} in mode {mode}.  The returned String has special
@@ -4793,10 +4166,6 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 		mapped, and have it do the original mapping too.  Sketch: >vim
 			exe 'nnoremap <Tab> ==' .. maparg('<Tab>', 'n')
 
-<		Can also be used as a |method|: >vim
-			GetKey()->maparg('n')
-<
-
 mapcheck({name} [, {mode} [, {abbr}]])                              *mapcheck()*
 		Check if there is a mapping that matches with {name} in mode
 		{mode}.  See |maparg()| for {mode} and special names in
@@ -4830,10 +4199,6 @@ mapcheck({name} [, {mode} [, {abbr}]])                              *mapcheck()*
 <		This avoids adding the "_vv" mapping when there already is a
 		mapping for "_v" or for "_vvv".
 
-		Can also be used as a |method|: >vim
-			GetKey()->mapcheck('n')
-<
-
 mapset({mode}, {abbr}, {dict})                                        *mapset()*
 		Restore a mapping from a dictionary returned by |maparg()|.
 		{mode} and {abbr} should be the same as for the call to
@@ -4911,11 +4276,6 @@ match({expr}, {pat} [, {start} [, {count}]])                           *match()*
 		zero matches at the start instead of a number of matches
 		further down in the text.
 
-		Can also be used as a |method|: >vim
-			GetText()->match('word')
-			GetList()->match('word')
-<
-
                                                 *matchadd()* *E798* *E799* *E801* *E957*
 matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		Defines a pattern to be highlighted in the current window (a
@@ -4975,10 +4335,6 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		available from |getmatches()|.  All matches can be deleted in
 		one operation by |clearmatches()|.
 
-		Can also be used as a |method|: >vim
-			GetGroup()->matchadd('TODO')
-<
-
 matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])   *matchaddpos()*
 		Same as |matchadd()|, but requires a list of positions {pos}
 		instead of a pattern. This command is faster than |matchadd()|
@@ -5016,10 +4372,6 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])   *matchaddpos()*
 <		Matches added by |matchaddpos()| are returned by
 		|getmatches()|.
 
-		Can also be used as a |method|: >vim
-			GetGroup()->matchaddpos([23, 11])
-<
-
 matcharg({nr})                                                      *matcharg()*
 		Selects the {nr} match item, as set with a |:match|,
 		|:2match| or |:3match| command.
@@ -5032,10 +4384,6 @@ matcharg({nr})                                                      *matcharg()*
 		Highlighting matches using the |:match| commands are limited
 		to three matches. |matchadd()| does not have this limitation.
 
-		Can also be used as a |method|: >vim
-			GetMatch()->matcharg()
-<
-
 matchdelete({id} [, {win}])                            *matchdelete()* *E802* *E803*
 		Deletes a match with ID {id} previously defined by |matchadd()|
 		or one of the |:match| commands.  Returns 0 if successful,
@@ -5044,10 +4392,6 @@ matchdelete({id} [, {win}])                            *matchdelete()* *E802* *E
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.
 
-		Can also be used as a |method|: >vim
-			GetMatch()->matchdelete()
-<
-
 matchend({expr}, {pat} [, {start} [, {count}]])                     *matchend()*
 		Same as |match()|, but return the index of first character
 		after the match.  Example: >vim
@@ -5067,10 +4411,6 @@ matchend({expr}, {pat} [, {start} [, {count}]])                     *matchend()*
 <		result is "-1".
 		When {expr} is a |List| the result is equal to |match()|.
 
-		Can also be used as a |method|: >vim
-			GetText()->matchend('word')
-<
-
 matchfuzzy({list}, {str} [, {dict}])                              *matchfuzzy()*
 		If {list} is a list of strings, then returns a |List| with all
 		the strings in {list} that fuzzy match {str}. The strings in
@@ -5168,10 +4508,6 @@ matchlist({expr}, {pat} [, {start} [, {count}]])                   *matchlist()*
 
 		You can pass in a List, but that is not very useful.
 
-		Can also be used as a |method|: >vim
-			GetText()->matchlist('word')
-<
-
 matchstr({expr}, {pat} [, {start} [, {count}]])                     *matchstr()*
 		Same as |match()|, but return the matched string.  Example: >vim
 			echo matchstr("testing", "ing")
@@ -5185,10 +4521,6 @@ matchstr({expr}, {pat} [, {start} [, {count}]])                     *matchstr()*
 		When {expr} is a |List| then the matching item is returned.
 		The type isn't changed, it's not necessarily a String.
 
-		Can also be used as a |method|: >vim
-			GetText()->matchstr('word')
-<
-
 matchstrpos({expr}, {pat} [, {start} [, {count}]])               *matchstrpos()*
 		Same as |matchstr()|, but return the matched string, the start
 		position and the end position of the match.  Example: >vim
@@ -5207,10 +4539,6 @@ matchstrpos({expr}, {pat} [, {start} [, {count}]])               *matchstrpos()*
 <		result is ["x", 1, 2, 3].
 		The type isn't changed, it's not necessarily a String.
 
-		Can also be used as a |method|: >vim
-			GetText()->matchstrpos('word')
-<
-
 max({expr})                                                              *max()*
 		Return the maximum value of all items in {expr}. Example: >vim
 			echo max([apples, pears, oranges])
@@ -5221,10 +4549,6 @@ max({expr})                                                              *max()*
 		items in {expr} cannot be used as a Number this results in
 		                an error.  An empty |List| or |Dictionary| results in zero.
 
-		Can also be used as a |method|: >vim
-			mylist->max()
-<
-
 menu_get({path} [, {modes}])                                        *menu_get()*
 		Returns a |List| of |Dictionaries| describing |menus| (defined
 		by |:menu|, |:amenu|, …), including |hidden-menus|.
@@ -5341,9 +4665,6 @@ menu_info({name} [, {mode}])                                       *menu_info()*
 			  call ShowMenu(topmenu, '')
 			endfor
 <
-		Can also be used as a |method|: >vim
-			GetMenuName()->menu_info('v')
-<
 
 min({expr})                                                              *min()*
 		Return the minimum value of all items in {expr}. Example: >vim
@@ -5355,10 +4676,6 @@ min({expr})                                                              *min()*
 		items in {expr} cannot be used as a Number this results in
 		an error.  An empty |List| or |Dictionary| results in zero.
 
-		Can also be used as a |method|: >vim
-			mylist->min()
-<
-
 mkdir({name} [, {flags} [, {prot}]])                              *mkdir()* *E739*
 		Create directory {name}.
 
@@ -5402,10 +4719,6 @@ mkdir({name} [, {flags} [, {prot}]])                              *mkdir()* *E73
 		successful or FALSE if the directory creation failed or partly
 		failed.
 
-		Can also be used as a |method|: >vim
-			GetName()->mkdir()
-<
-
 mode([expr])                                                            *mode()*
 		Return a string that indicates the current mode.
 		If [expr] is supplied and it evaluates to a non-zero Number or
@@ -5457,10 +4770,6 @@ mode([expr])                                                            *mode()*
 		the leading character(s).
 		Also see |visualmode()|.
 
-		Can also be used as a |method|: >vim
-			DoFull()->mode()
-<
-
 msgpackdump({list} [, {type}])                                   *msgpackdump()*
 		Convert a list of Vimscript objects to msgpack. Returned value is a
 		|readfile()|-style list. When {type} contains "B", a |Blob| is
@@ -5563,10 +4872,6 @@ nextnonblank({lnum})                                            *nextnonblank()*
 		{lnum} is used like with |getline()|.
 		See also |prevnonblank()|.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->nextnonblank()
-<
-
 nr2char({expr} [, {utf8}])                                           *nr2char()*
 		Return a string with a single character, which has the number
 		value {expr}.  Examples: >vim
@@ -5582,10 +4887,6 @@ nr2char({expr} [, {utf8}])                                           *nr2char()*
 		characters.  nr2char(0) is a real NUL and terminates the
 		string, thus results in an empty string.
 
-		Can also be used as a |method|: >vim
-			GetNumber()->nr2char()
-<
-
 nvim_...({...})                                      *nvim_...()* *E5555* *eval-api*
 		Call nvim |api| functions. The type checking of arguments will
 		be stricter than for most other builtins. For instance,
@@ -5603,8 +4904,6 @@ or({expr}, {expr})                                                        *or()*
 		Also see `and()` and `xor()`.
 		Example: >vim
 			let bits = or(bits, 0x80)
-<		Can also be used as a |method|: >vim
-			let bits = bits->or(0x80)
 
 <		Rationale: The reason this is a function and not using the "|"
 		character like many languages, is that Vi has always used "|"
@@ -5625,10 +4924,6 @@ pathshorten({path} [, {len}])                                    *pathshorten()*
 		It doesn't matter if the path exists or not.
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			GetDirectories()->pathshorten()
-<
-
 perleval({expr})                                                    *perleval()*
 		Evaluate |perl| expression {expr} and return its result
 		converted to Vim data structures.
@@ -5644,10 +4939,6 @@ perleval({expr})                                                    *perleval()*
 			echo perleval('[1 .. 4]')
 <			[1, 2, 3, 4]
 
-		Can also be used as a |method|: >vim
-			GetExpr()->perleval()
-<
-
 pow({x}, {y})                                                            *pow()*
 		Return the power of {x} to the exponent {y} as a |Float|.
 		{x} and {y} must evaluate to a |Float| or a |Number|.
@@ -5660,10 +4951,6 @@ pow({x}, {y})                                                            *pow()*
 			echo pow(32, 0.20)
 <			2.0
 
-		Can also be used as a |method|: >vim
-			Compute()->pow(3)
-<
-
 prevnonblank({lnum})                                            *prevnonblank()*
 		Return the line number of the first line at or above {lnum}
 		that is not blank.  Example: >vim
@@ -5673,10 +4960,6 @@ prevnonblank({lnum})                                            *prevnonblank()*
 		{lnum} is used like with |getline()|.
 		Also see |nextnonblank()|.
 
-		Can also be used as a |method|: >vim
-			GetLnum()->prevnonblank()
-<
-
 printf({fmt}, {expr1} ...)                                            *printf()*
 		Return a String with {fmt}, where "%" items are replaced by
 		the formatted form of their respective arguments.  Example: >vim
@@ -5884,10 +5167,6 @@ prompt_getprompt({buf})                                     *prompt_getprompt()*
 		If the buffer doesn't exist or isn't a prompt buffer, an empty
 		string is returned.
 
-		Can also be used as a |method|: >vim
-			GetBuffer()->prompt_getprompt()
-<
-
 prompt_setcallback({buf}, {expr})                         *prompt_setcallback()*
 		Set prompt callback for buffer {buf} to {expr}.  When {expr}
 		is an empty string the callback is removed.  This has only
@@ -5920,10 +5199,6 @@ prompt_setcallback({buf}, {expr})                         *prompt_setcallback()*
 		   endfunc
 		   call prompt_setcallback(bufnr(), function('s:TextEntered'))
 
-<		Can also be used as a |method|: >vim
-			GetBuffer()->prompt_setcallback(callback)
-<
-
 prompt_setinterrupt({buf}, {expr})                       *prompt_setinterrupt()*
 		Set a callback for buffer {buf} to {expr}.  When {expr} is an
 		empty string the callback is removed.  This has only effect if
@@ -5933,10 +5208,6 @@ prompt_setinterrupt({buf}, {expr})                       *prompt_setinterrupt()*
 		mode.  Without setting a callback Vim will exit Insert mode,
 		as in any buffer.
 
-		Can also be used as a |method|: >vim
-			GetBuffer()->prompt_setinterrupt(callback)
-<
-
 prompt_setprompt({buf}, {text})                             *prompt_setprompt()*
 		Set prompt for buffer {buf} to {text}.  You most likely want
 		{text} to end in a space.
@@ -5944,9 +5215,6 @@ prompt_setprompt({buf}, {text})                             *prompt_setprompt()*
 		"prompt".  Example: >vim
 			call prompt_setprompt(bufnr(''), 'command: ')
 <
-		Can also be used as a |method|: >vim
-			GetBuffer()->prompt_setprompt('command: ')
-<
 
 pum_getpos()                                                      *pum_getpos()*
 		If the popup menu (see |ins-completion-menu|) is not visible,
@@ -5977,10 +5245,6 @@ py3eval({expr})                                                      *py3eval()*
 		Dictionaries are represented as Vim |Dictionary| type with
 		keys converted to strings.
 
-		Can also be used as a |method|: >vim
-			GetExpr()->py3eval()
-<
-
 pyeval({expr})                                              *pyeval()* *E858* *E859*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
@@ -5990,20 +5254,12 @@ pyeval({expr})                                              *pyeval()* *E858* *E
 		Dictionaries are represented as Vim |Dictionary| type,
 		non-string keys result in error.
 
-		Can also be used as a |method|: >vim
-			GetExpr()->pyeval()
-<
-
 pyxeval({expr})                                                      *pyxeval()*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Uses Python 2 or 3, see |python_x| and 'pyxversion'.
 		See also: |pyeval()|, |py3eval()|
 
-		Can also be used as a |method|: >vim
-			GetExpr()->pyxeval()
-<
-
 rand([{expr}])                                                          *rand()*
 		Return a pseudo-random Number generated with an xoshiro128**
 		algorithm using seed {expr}.  The returned number is 32 bits,
@@ -6019,9 +5275,6 @@ rand([{expr}])                                                          *rand()*
 			echo rand(seed)
 			echo rand(seed) % 16  " random number 0 - 15
 <
-		Can also be used as a |method|: >vim
-			seed->rand()
-<
 
 range({expr} [, {max} [, {stride}]])                         *range()* *E726* *E727*
 		Returns a |List| with Numbers:
@@ -6041,9 +5294,6 @@ range({expr} [, {max} [, {stride}]])                         *range()* *E726* *E
 			echo range(0)		" []
 			echo range(2, 0)		" error!
 <
-		Can also be used as a |method|: >vim
-			GetExpr()->range()
-<
 
 readblob({fname} [, {offset} [, {size}]])                           *readblob()*
 		Read file {fname} in binary mode and return a |Blob|.
@@ -6099,10 +5349,6 @@ readdir({directory} [, {expr}])                                      *readdir()*
 <
 		Returns an empty List on error.
 
-		Can also be used as a |method|: >vim
-			GetDirName()->readdir()
-<
-
 readfile({fname} [, {type} [, {max}]])                              *readfile()*
 		Read file {fname} and return a |List|, each line of the file
 		as an item.  Lines are broken at NL characters.  Macintosh
@@ -6136,10 +5382,6 @@ readfile({fname} [, {type} [, {max}]])                              *readfile()*
 		the result is an empty list.
 		Also see |writefile()|.
 
-		Can also be used as a |method|: >vim
-			GetFileName()->readfile()
-<
-
 reduce({object}, {func} [, {initial}])                           *reduce()* *E998*
 		{func} is called for every item in {object}, which can be a
 		|List| or a |Blob|.  {func} is called with two arguments: the
@@ -6156,9 +5398,6 @@ reduce({object}, {func} [, {initial}])                           *reduce()* *E99
 			echo reduce(['x', 'y'], { acc, val -> acc .. val }, 'a')
 			echo reduce(0z1122, { acc, val -> 2 * acc + val })
 <
-		Can also be used as a |method|: >vim
-			echo mylist->reduce({ acc, val -> acc + val }, 0)
-<
 
 reg_executing()                                                *reg_executing()*
 		Returns the single letter name of the register being executed.
@@ -6194,9 +5433,6 @@ reltime({start}, {end})                                              *reltime()*
 		The {start} and {end} arguments must be values returned by
 		reltime().  Returns zero on error.
 
-		Can also be used as a |method|: >vim
-			GetStart()->reltime()
-<
 		Note: |localtime()| returns the current (non-relative) time.
 
 reltimefloat({time})                                            *reltimefloat()*
@@ -6210,10 +5446,6 @@ reltimefloat({time})                                            *reltimefloat()*
 		Also see |profiling|.
 		If there is an error an empty string is returned
 
-		Can also be used as a |method|: >vim
-			reltime(start)->reltimefloat()
-<
-
 reltimestr({time})                                                *reltimestr()*
 		Return a String that represents the time value of {time}.
 		This is the number of seconds, a dot and the number of
@@ -6228,10 +5460,6 @@ reltimestr({time})                                                *reltimestr()*
 <		Also see |profiling|.
 		If there is an error an empty string is returned
 
-		Can also be used as a |method|: >vim
-			echo reltime(start)->reltimestr()
-<
-
 remove({list}, {idx})
 remove({list}, {idx}, {end})                                          *remove()*
 		Without {end}: Remove the item at {idx} from |List| {list} and
@@ -6248,10 +5476,6 @@ remove({list}, {idx}, {end})                                          *remove()*
 <
 		Use |delete()| to remove a file.
 
-		Can also be used as a |method|: >vim
-			mylist->remove(idx)
-<
-
 remove({blob}, {idx})
 remove({blob}, {idx}, {end})
 		Without {end}: Remove the byte at {idx} from |Blob| {blob} and
@@ -6281,10 +5505,6 @@ rename({from}, {to})                                                  *rename()*
 		NOTE: If {to} exists it is overwritten without warning.
 		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|: >vim
-			GetOldName()->rename(newname)
-<
-
 repeat({expr}, {count})                                               *repeat()*
 		Repeat {expr} {count} times and return the concatenated
 		result.  Example: >vim
@@ -6295,10 +5515,6 @@ repeat({expr}, {count})                                               *repeat()*
 			let longlist = repeat(['a', 'b'], 3)
 <		Results in ['a', 'b', 'a', 'b', 'a', 'b'].
 
-		Can also be used as a |method|: >vim
-			mylist->repeat(count)
-<
-
 resolve({filename})                                             *resolve()* *E655*
 		On MS-Windows, when {filename} is a shortcut (a .lnk file),
 		returns the path the shortcut points to in a simplified form.
@@ -6312,20 +5528,11 @@ resolve({filename})                                             *resolve()* *E65
 		current directory (provided the result is still a relative
 		path name) and also keeps a trailing path separator.
 
-		Can also be used as a |method|: >vim
-			GetName()->resolve()
-<
-
 reverse({object})                                                    *reverse()*
 		Reverse the order of items in {object} in-place.
 		{object} can be a |List| or a |Blob|.
 		Returns {object}.
 		Returns zero if {object} is not a List or a Blob.
-		If you want an object to remain unmodified make a copy first: >vim
-			let revlist = reverse(copy(mylist))
-<		Can also be used as a |method|: >vim
-			mylist->reverse()
-<
 
 round({expr})                                                          *round()*
 		Round off {expr} to the nearest integral value and return it
@@ -6341,10 +5548,6 @@ round({expr})                                                          *round()*
 			echo round(-4.5)
 <			-5.0
 
-		Can also be used as a |method|: >vim
-			Compute()->round()
-<
-
 rpcnotify({channel}, {event} [, {args}...])                        *rpcnotify()*
 		Sends {event} to {channel} via |RPC| and returns immediately.
 		If {channel} is 0, the event is broadcast to all channels.
@@ -6376,20 +5579,12 @@ rubyeval({expr})                                                    *rubyeval()*
 		Other objects are represented as strings resulted from their
 		"Object#to_s" method.
 
-		Can also be used as a |method|: >vim
-			GetRubyExpr()->rubyeval()
-<
-
 screenattr({row}, {col})                                          *screenattr()*
 		Like |screenchar()|, but return the attribute.  This is a rather
 		arbitrary number that can only be used to compare to the
 		attribute at other positions.
 		Returns -1 when row or col is out of range.
 
-		Can also be used as a |method|: >vim
-			GetRow()->screenattr(col)
-<
-
 screenchar({row}, {col})                                          *screenchar()*
 		The result is a Number, which is the character at position
 		[row, col] on the screen.  This works for every possible
@@ -6400,10 +5595,6 @@ screenchar({row}, {col})                                          *screenchar()*
 		This is mainly to be used for testing.
 		Returns -1 when row or col is out of range.
 
-		Can also be used as a |method|: >vim
-			GetRow()->screenchar(col)
-<
-
 screenchars({row}, {col})                                        *screenchars()*
 		The result is a List of Numbers.  The first number is the same
 		as what |screenchar()| returns.  Further numbers are
@@ -6411,10 +5602,6 @@ screenchars({row}, {col})                                        *screenchars()*
 		This is mainly to be used for testing.
 		Returns an empty List when row or col is out of range.
 
-		Can also be used as a |method|: >vim
-			GetRow()->screenchars(col)
-<
-
 screencol()                                                        *screencol()*
 		The result is a Number, which is the current screen column of
 		the cursor. The leftmost column has number 1.
@@ -6454,10 +5641,6 @@ screenpos({winid}, {lnum}, {col})                                  *screenpos()*
 		first character is returned, {col} is not used.
 		Returns an empty Dict if {winid} is invalid.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->screenpos(lnum, col)
-<
-
 screenrow()                                                        *screenrow()*
 		The result is a Number, which is the current screen row of the
 		cursor.  The top line has number one.
@@ -6474,10 +5657,6 @@ screenstring({row}, {col})                                      *screenstring()*
 		This is mainly to be used for testing.
 		Returns an empty String when row or col is out of range.
 
-		Can also be used as a |method|: >vim
-			GetRow()->screenstring(col)
-<
-
 search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]]) *search()*
 		Search for regexp pattern {pattern}.  The search starts at the
 		cursor position (you can use |cursor()| to set it).
@@ -6579,10 +5758,6 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]]) *search()*
 		without the 'e' flag if the cursor is on the "f" of "if".
 		The 'n' flag tells the function not to move the cursor.
 
-		Can also be used as a |method|: >vim
-			GetPattern()->search()
-<
-
 searchcount([{options}])                                         *searchcount()*
 		Get or update the last search count, like what is displayed
 		without the "S" flag in 'shortmess'.  This works even if
@@ -6704,10 +5879,6 @@ searchcount([{options}])                                         *searchcount()*
 						value. see |cursor()|, |getpos()|
 						(default: cursor's position)
 
-		Can also be used as a |method|: >vim
-			GetSearchOpts()->searchcount()
-<
-
 searchdecl({name} [, {global} [, {thisblock}]])                   *searchdecl()*
 		Search for the declaration of {name}.
 
@@ -6726,9 +5897,6 @@ searchdecl({name} [, {global} [, {thisblock}]])                   *searchdecl()*
 			   echo getline('.')
 			endif
 <
-		Can also be used as a |method|: >vim
-			GetName()->searchdecl()
-<
 
                                                                   *searchpair()*
 searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeout}]]]])
@@ -6844,10 +6012,6 @@ searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 <		In this example "submatch" is 2 when a lowercase letter is
 		found |/\l|, 3 when an uppercase letter is found |/\u|.
 
-		Can also be used as a |method|: >vim
-			GetPattern()->searchpos()
-<
-
 serverlist()                                                      *serverlist()*
 		Returns a list of server addresses, or empty if all servers
 		were stopped. |serverstart()| |serverstop()|
@@ -6919,11 +6083,6 @@ setbufline({buf}, {lnum}, {text})                                 *setbufline()*
 		If {buf} is not a valid buffer or {lnum} is not valid, an
 		error message is given.
 
-		Can also be used as a |method|, the base is passed as the
-		third argument: >vim
-			GetText()->setbufline(buf, lnum)
-<
-
 setbufvar({buf}, {varname}, {val})                                 *setbufvar()*
 		Set option or local variable {varname} in buffer {buf} to
 		{val}.
@@ -6938,11 +6097,6 @@ setbufvar({buf}, {varname}, {val})                                 *setbufvar()*
 			call setbufvar("todo", "myvar", "foobar")
 <		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|, the base is passed as the
-		third argument: >vim
-			GetValue()->setbufvar(buf, varname)
-<
-
 setcellwidths({list})                                          *setcellwidths()*
 		Specify overrides for cell widths of character ranges.  This
 		tells Vim how wide characters are when displayed in the
@@ -6988,10 +6142,6 @@ setcharpos({expr}, {list})                                        *setcharpos()*
 			call setpos('.', [0, 8, 4, 0])
 <		positions the cursor on the second character '보'.
 
-		Can also be used as a |method|: >vim
-			GetPosition()->setcharpos('.')
-<
-
 setcharsearch({dict})                                          *setcharsearch()*
 		Set the current character search information to {dict},
 		which contains one or more of the following entries:
@@ -7012,10 +6162,6 @@ setcharsearch({dict})                                          *setcharsearch()*
 			call setcharsearch(prevsearch)
 <		Also see |getcharsearch()|.
 
-		Can also be used as a |method|: >vim
-			SavedSearch()->setcharsearch()
-<
-
 setcmdline({str} [, {pos}])                                       *setcmdline()*
 		Set the command line to {str} and set the cursor position to
 		{pos}.
@@ -7023,10 +6169,6 @@ setcmdline({str} [, {pos}])                                       *setcmdline()*
 		Returns 0 when successful, 1 when not editing the command
 		line.
 
-		Can also be used as a |method|: >vim
-			GetText()->setcmdline()
-<
-
 setcmdpos({pos})                                                   *setcmdpos()*
 		Set the cursor position in the command line to byte position
 		{pos}.  The first position is 1.
@@ -7042,10 +6184,6 @@ setcmdpos({pos})                                                   *setcmdpos()*
 		Returns 0 when successful, 1 when not editing the command
 		line.
 
-		Can also be used as a |method|: >vim
-			GetPos()->setcmdpos()
-<
-
 setcursorcharpos({lnum}, {col} [, {off}])
 setcursorcharpos({list})                                    *setcursorcharpos()*
 		Same as |cursor()| but uses the specified column number as the
@@ -7058,10 +6196,6 @@ setcursorcharpos({list})                                    *setcursorcharpos()*
 			call cursor(4, 3)
 <		positions the cursor on the first character '여'.
 
-		Can also be used as a |method|: >vim
-			GetCursorPos()->setcursorcharpos()
-<
-
 setenv({name}, {val})                                                 *setenv()*
 		Set environment variable {name} to {val}.  Example: >vim
 			call setenv('HOME', '/home/myhome')
@@ -7069,11 +6203,6 @@ setenv({name}, {val})                                                 *setenv()*
 <		When {val} is |v:null| the environment variable is deleted.
 		See also |expr-env|.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetPath()->setenv('PATH')
-<
-
 setfperm({fname}, {mode})                                     *setfperm()* *chmod*
 		Set the file permissions for {fname} to {mode}.
 		{mode} must be a string with 9 characters.  It is of the form
@@ -7089,9 +6218,6 @@ setfperm({fname}, {mode})                                     *setfperm()* *chmo
 
 		Returns non-zero for success, zero for failure.
 
-		Can also be used as a |method|: >vim
-			GetFilename()->setfperm(mode)
-<
 		To read permissions see |getfperm()|.
 
 setline({lnum}, {text})                                              *setline()*
@@ -7121,11 +6247,6 @@ setline({lnum}, {text})                                              *setline()*
 
 <		Note: The '[ and '] marks are not set.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetText()->setline(lnum)
-<
-
 setloclist({nr}, {list} [, {action} [, {what}]])                  *setloclist()*
 		Create or replace or add to the location list for window {nr}.
 		{nr} can be the window number or the |window-ID|.
@@ -7142,22 +6263,13 @@ setloclist({nr}, {list} [, {action} [, {what}]])                  *setloclist()*
 		only the items listed in {what} are set. Refer to |setqflist()|
 		for the list of supported keys in {what}.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetLoclist()->setloclist(winnr)
-<
-
 setmatches({list} [, {win}])                                      *setmatches()*
 		Restores a list of matches saved by |getmatches()| for the
 		current window.  Returns 0 if successful, otherwise -1.  All
 		current matches are cleared before the list is restored.  See
 		example for |getmatches()|.
-		If {win} is specified, use the window with this number or
-		window ID instead of the current window.
-
-		Can also be used as a |method|: >vim
-			GetMatches()->setmatches()
-<
+		If {win} is specified, use the window with this number or
+		window ID instead of the current window.
 
 setpos({expr}, {list})                                                *setpos()*
 		Set the position for String {expr}.  Possible values:
@@ -7208,10 +6320,6 @@ setpos({expr}, {list})                                                *setpos()*
 		also set the preferred column.  Also see the "curswant" key in
 		|winrestview()|.
 
-		Can also be used as a |method|: >vim
-			GetPosition()->setpos('.')
-<
-
 setqflist({list} [, {action} [, {what}]])                          *setqflist()*
 		Create or replace or add to the quickfix list.
 
@@ -7323,11 +6431,6 @@ setqflist({list} [, {action} [, {what}]])                          *setqflist()*
 		independent of the 'errorformat' setting.  Use a command like
 		`:cc 1` to jump to the first position.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetErrorlist()->setqflist()
-<
-
 setreg({regname}, {value} [, {options}])                              *setreg()*
 		Set the register {regname} to {value}.
 		If {regname} is "" or "@", the unnamed register '"' is used.
@@ -7384,11 +6487,6 @@ setreg({regname}, {value} [, {options}])                              *setreg()*
 		nothing: >vim
 			call setreg('a', '', 'al')
 
-<		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetText()->setreg('a')
-<
-
 settabvar({tabnr}, {varname}, {val})                               *settabvar()*
 		Set tab-local variable {varname} to {val} in tab page {tabnr}.
 		|t:var|
@@ -7397,11 +6495,6 @@ settabvar({tabnr}, {varname}, {val})                               *settabvar()*
 		Tabs are numbered starting with one.
 		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|, the base is passed as the
-		third argument: >vim
-			GetValue()->settabvar(tab, name)
-<
-
 settabwinvar({tabnr}, {winnr}, {varname}, {val})                *settabwinvar()*
 		Set option or local variable {varname} in window {winnr} to
 		{val}.
@@ -7418,11 +6511,6 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val})                *settabwinvar()*
 			call settabwinvar(3, 2, "myvar", "foobar")
 <		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|, the base is passed as the
-		fourth argument: >vim
-			GetValue()->settabwinvar(tab, winnr, name)
-<
-
 settagstack({nr}, {dict} [, {action}])                           *settagstack()*
 		Modify the tag stack of the window {nr} using {dict}.
 		{nr} can be the window number or the |window-ID|.
@@ -7456,10 +6544,6 @@ settagstack({nr}, {dict} [, {action}])                           *settagstack()*
 			call settagstack(1003, stack)
 			unlet stack
 <
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetStack()->settagstack(winnr)
-<
 
 setwinvar({nr}, {varname}, {val})                                  *setwinvar()*
 		Like |settabwinvar()| for the current tab page.
@@ -7467,19 +6551,10 @@ setwinvar({nr}, {varname}, {val})                                  *setwinvar()*
 			call setwinvar(1, "&list", 0)
 			call setwinvar(2, "myvar", "foobar")
 
-<		Can also be used as a |method|, the base is passed as the
-		third argument: >vim
-			GetValue()->setwinvar(winnr, name)
-<
-
 sha256({string})                                                      *sha256()*
 		Returns a String with 64 hex characters, which is the SHA256
 		checksum of {string}.
 
-		Can also be used as a |method|: >vim
-			GetText()->sha256()
-<
-
 shellescape({string} [, {special}])                              *shellescape()*
 		Escape {string} for use as a shell command argument.
 
@@ -7511,10 +6586,6 @@ shellescape({string} [, {special}])                              *shellescape()*
 		    call system("chmod +w -- " .. shellescape(expand("%")))
 <		See also |::S|.
 
-		Can also be used as a |method|: >vim
-			GetCommand()->shellescape()
-<
-
 shiftwidth([{col}])                                               *shiftwidth()*
 		Returns the effective value of 'shiftwidth'. This is the
 		'shiftwidth' value unless it is zero, in which case it is the
@@ -7536,10 +6607,6 @@ shiftwidth([{col}])                                               *shiftwidth()*
 		'vartabstop' feature. If no {col} argument is given, column 1
 		will be assumed.
 
-		Can also be used as a |method|: >vim
-			GetColumn()->shiftwidth()
-<
-
 sign_define({name} [, {dict}])
 sign_define({list})                                              *sign_define()*
 		Define a new sign named {name} or modify the attributes of an
@@ -7586,9 +6653,6 @@ sign_define({list})                                              *sign_define()*
 				\  'text' : '!!'}
 				\ ])
 <
-		Can also be used as a |method|: >vim
-			GetSignList()->sign_define()
-<
 
 sign_getdefined([{name}])                                    *sign_getdefined()*
 		Get a list of defined signs and their attributes.
@@ -7625,9 +6689,6 @@ sign_getdefined([{name}])                                    *sign_getdefined()*
 			" Get the attribute of the sign named mySign
 			echo sign_getdefined("mySign")
 <
-		Can also be used as a |method|: >vim
-			GetSignList()->sign_getdefined()
-<
 
 sign_getplaced([{buf} [, {dict}]])                            *sign_getplaced()*
 		Return a list of signs placed in a buffer or all the buffers.
@@ -7689,9 +6750,6 @@ sign_getplaced([{buf} [, {dict}]])                            *sign_getplaced()*
 			" Get a List of all the placed signs
 			echo sign_getplaced()
 <
-		Can also be used as a |method|: >vim
-			GetBufname()->sign_getplaced()
-<
 
 sign_jump({id}, {group}, {buf})                                    *sign_jump()*
 		Open the buffer {buf} or jump to the window that contains
@@ -7708,9 +6766,6 @@ sign_jump({id}, {group}, {buf})                                    *sign_jump()*
 			" Jump to sign 10 in the current buffer
 			call sign_jump(10, '', '')
 <
-		Can also be used as a |method|: >vim
-			GetSignid()->sign_jump()
-<
 
 sign_place({id}, {group}, {name}, {buf} [, {dict}])               *sign_place()*
 		Place the sign defined as {name} at line {lnum} in file or
@@ -7760,9 +6815,6 @@ sign_place({id}, {group}, {name}, {buf} [, {dict}])               *sign_place()*
 			call sign_place(10, 'g3', 'sign4', 'json.c',
 					\ {'lnum' : 40, 'priority' : 90})
 <
-		Can also be used as a |method|: >vim
-			GetSignid()->sign_place(group, name, expr)
-<
 
 sign_placelist({list})                                        *sign_placelist()*
 		Place one or more signs.  This is similar to the
@@ -7822,9 +6874,6 @@ sign_placelist({list})                                        *sign_placelist()*
 				\  'lnum' : 50}
 				\ ])
 <
-		Can also be used as a |method|: >vim
-			GetSignlist()->sign_placelist()
-<
 
 sign_undefine([{name}])
 sign_undefine({list})                                          *sign_undefine()*
@@ -7849,9 +6898,6 @@ sign_undefine({list})                                          *sign_undefine()*
 			" Delete all the signs
 			call sign_undefine()
 <
-		Can also be used as a |method|: >vim
-			GetSignlist()->sign_undefine()
-<
 
 sign_unplace({group} [, {dict}])                                *sign_unplace()*
 		Remove a previously placed sign in one or more buffers.  This
@@ -7895,10 +6941,6 @@ sign_unplace({group} [, {dict}])                                *sign_unplace()*
 			" Remove all the placed signs from all the buffers
 			call sign_unplace('*')
 
-<		Can also be used as a |method|: >vim
-			GetSigngroup()->sign_unplace()
-<
-
 sign_unplacelist({list})                                    *sign_unplacelist()*
 		Remove previously placed signs from one or more buffers.  This
 		is similar to the |sign_unplace()| function.
@@ -7927,9 +6969,6 @@ sign_unplacelist({list})                                    *sign_unplacelist()*
 				\ {'id' : 20, 'buffer' : 'b.vim'},
 				\ ])
 <
-		Can also be used as a |method|: >vim
-			GetSignlist()->sign_unplacelist()
-<
 
 simplify({filename})                                                *simplify()*
 		Simplify the file name as much as possible without changing
@@ -7948,10 +6987,6 @@ simplify({filename})                                                *simplify()*
 		directory.  In order to resolve all the involved symbolic
 		links before simplifying the path name, use |resolve()|.
 
-		Can also be used as a |method|: >vim
-			GetName()->simplify()
-<
-
 sin({expr})                                                              *sin()*
 		Return the sine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -7962,10 +6997,6 @@ sin({expr})                                                              *sin()*
 			echo sin(-4.01)
 <			0.763301
 
-		Can also be used as a |method|: >vim
-			Compute()->sin()
-<
-
 sinh({expr})                                                            *sinh()*
 		Return the hyperbolic sine of {expr} as a |Float| in the range
 		[-inf, inf].
@@ -7977,10 +7008,6 @@ sinh({expr})                                                            *sinh()*
 			echo sinh(-0.9)
 <			-1.026517
 
-		Can also be used as a |method|: >vim
-			Compute()->sinh()
-<
-
 slice({expr}, {start} [, {end}])                                       *slice()*
 		Similar to using a |slice| "expr[start : end]", but "end" is
 		used exclusive.  And for a string the indexes are used as
@@ -7990,10 +7017,6 @@ slice({expr}, {start} [, {end}])                                       *slice()*
 		When {end} is -1 the last item is omitted.
 		Returns an empty value if {start} or {end} are invalid.
 
-		Can also be used as a |method|: >vim
-			GetList()->slice(offset)
-<
-
 sockconnect({mode}, {address} [, {opts}])                        *sockconnect()*
 		Connect a socket to an address. If {mode} is "pipe" then
 		{address} should be the path of a local domain socket (on
@@ -8076,10 +7099,6 @@ sort({list} [, {func} [, {dict}]])                                 *sort()* *E70
 		on numbers, text strings will sort next to each other, in the
 		same order as they were originally.
 
-		Can also be used as a |method|: >vim
-			mylist->sort()
-
-<		Also see |uniq()|.
 
 		Example: >vim
 			func MyCompare(i1, i2)
@@ -8103,10 +7122,6 @@ soundfold({word})                                                  *soundfold()*
 		This can be used for making spelling suggestions.  Note that
 		the method can be quite slow.
 
-		Can also be used as a |method|: >vim
-			GetWord()->soundfold()
-<
-
 spellbadword([{sentence}])                                      *spellbadword()*
 		Without argument: The result is the badly spelled word under
 		or after the cursor.  The cursor is moved to the start of the
@@ -8131,10 +7146,6 @@ spellbadword([{sentence}])                                      *spellbadword()*
 		The spelling information for the current window and the value
 		of 'spelllang' are used.
 
-		Can also be used as a |method|: >vim
-			GetText()->spellbadword()
-<
-
 spellsuggest({word} [, {max} [, {capital}]])                    *spellsuggest()*
 		Return a |List| with spelling suggestions to replace {word}.
 		When {max} is given up to this number of suggestions are
@@ -8156,10 +7167,6 @@ spellsuggest({word} [, {max} [, {capital}]])                    *spellsuggest()*
 		The spelling information for the current window is used.  The
 		values of 'spelllang' and 'spellsuggest' are used.
 
-		Can also be used as a |method|: >vim
-			GetWord()->spellsuggest()
-<
-
 split({string} [, {pattern} [, {keepempty}]])                          *split()*
 		Make a |List| out of {string}.  When {pattern} is omitted or
 		empty each white-separated sequence of characters becomes an
@@ -8185,10 +7192,6 @@ split({string} [, {pattern} [, {keepempty}]])                          *split()*
 			let items = split(line, ':', 1)
 <		The opposite function is |join()|.
 
-		Can also be used as a |method|: >vim
-			GetString()->split()
-<
-
 sqrt({expr})                                                            *sqrt()*
 		Return the non-negative square root of Float {expr} as a
 		|Float|.
@@ -8202,10 +7205,6 @@ sqrt({expr})                                                            *sqrt()*
 <			str2float("nan")
 		NaN may be different, it depends on system libraries.
 
-		Can also be used as a |method|: >vim
-			Compute()->sqrt()
-<
-
 srand([{expr}])                                                        *srand()*
 		Initialize seed used by |rand()|:
 		- If {expr} is not given, seed values are initialized by
@@ -8220,9 +7219,6 @@ srand([{expr}])                                                        *srand()*
 			let seed = srand(userinput)
 			echo rand(seed)
 <
-		Can also be used as a |method|: >vim
-			userinput->srand()
-<
 
 stdioopen({opts})                                                  *stdioopen()*
 		With |--headless| this opens stdin and stdout as a |channel|.
@@ -8286,10 +7282,6 @@ str2float({string} [, {quoted}])                                   *str2float()*
 <
 		Returns 0.0 if the conversion fails.
 
-		Can also be used as a |method|: >vim
-			let f = text->substitute(',', '', 'g')->str2float()
-<
-
 str2list({string} [, {utf8}])                                       *str2list()*
 		Return a list containing the number values which represent
 		each character in String {string}.  Examples: >vim
@@ -8302,10 +7294,6 @@ str2list({string} [, {utf8}])                                       *str2list()*
 		With UTF-8 composing characters are handled properly: >vim
 			echo str2list("á")		" returns [97, 769]
 
-<		Can also be used as a |method|: >vim
-			GetString()->str2list()
-<
-
 str2nr({string} [, {base}])                                           *str2nr()*
 		Convert string {string} to a number.
 		{base} is the conversion base, it can be 2, 8, 10 or 16.
@@ -8325,10 +7313,6 @@ str2nr({string} [, {base}])                                           *str2nr()*
 
 		Returns 0 if {string} is empty or on error.
 
-		Can also be used as a |method|: >vim
-			GetText()->str2nr()
-<
-
 strcharlen({string})                                              *strcharlen()*
 		The result is a Number, which is the number of characters
 		in String {string}.  Composing characters are ignored.
@@ -8339,10 +7323,6 @@ strcharlen({string})                                              *strcharlen()*
 
 		Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 
-		Can also be used as a |method|: >vim
-			GetText()->strcharlen()
-<
-
 strcharpart({src}, {start} [, {len} [, {skipcc}]])               *strcharpart()*
 		Like |strpart()| but using character index and length instead
 		of byte index and length.
@@ -8358,10 +7338,6 @@ strcharpart({src}, {start} [, {len} [, {skipcc}]])               *strcharpart()*
 
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			GetText()->strcharpart(5)
-<
-
 strchars({string} [, {skipcc}])                                     *strchars()*
 		The result is a Number, which is the number of characters
 		in String {string}.
@@ -8390,9 +7366,6 @@ strchars({string} [, {skipcc}])                                     *strchars()*
 		      endfunction
 		    endif
 <
-		Can also be used as a |method|: >vim
-			GetText()->strchars()
-<
 
 strdisplaywidth({string} [, {col}])                          *strdisplaywidth()*
 		The result is a Number, which is the number of display cells
@@ -8408,10 +7381,6 @@ strdisplaywidth({string} [, {col}])                          *strdisplaywidth()*
 		Returns zero on error.
 		Also see |strlen()|, |strwidth()| and |strchars()|.
 
-		Can also be used as a |method|: >vim
-			GetText()->strdisplaywidth()
-<
-
 strftime({format} [, {time}])                                       *strftime()*
 		The result is a String, which is a formatted date and time, as
 		specified by the {format} string.  The given {time} is used,
@@ -8429,10 +7398,6 @@ strftime({format} [, {time}])                                       *strftime()*
 		  echo strftime("%c", getftime("file.c"))
 						   " Show mod time of file.c.
 
-<		Can also be used as a |method|: >vim
-			GetFormat()->strftime()
-<
-
 strgetchar({str}, {index})                                        *strgetchar()*
 		Get a Number corresponding to the character at {index} in
 		{str}.  This uses a zero-based character index, not a byte
@@ -8442,10 +7407,6 @@ strgetchar({str}, {index})                                        *strgetchar()*
 		Returns -1 if {index} is invalid.
 		Also see |strcharpart()| and |strchars()|.
 
-		Can also be used as a |method|: >vim
-			GetText()->strgetchar(5)
-<
-
 stridx({haystack}, {needle} [, {start}])                              *stridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the first occurrence of the String {needle}.
@@ -8465,10 +7426,6 @@ stridx({haystack}, {needle} [, {start}])                              *stridx()*
 		stridx() works similar to the C function strstr().  When used
 		with a single character it works similar to strchr().
 
-		Can also be used as a |method|: >vim
-			GetHaystack()->stridx(needle)
-<
-
 string({expr})                                                        *string()*
 		Return {expr} converted to a String.  If {expr} is a Number,
 		Float, String, Blob or a composition of them, then the result
@@ -8493,10 +7450,6 @@ string({expr})                                                        *string()*
 		method, use |msgpackdump()| or |json_encode()| if you need to
 		share data with other application.
 
-		Can also be used as a |method|: >vim
-			mylist->string()
-<
-
 strlen({string})                                                      *strlen()*
 		The result is a Number, which is the length of the String
 		{string} in bytes.
@@ -8506,10 +7459,6 @@ strlen({string})                                                      *strlen()*
 		|strchars()|.
 		Also see |len()|, |strdisplaywidth()| and |strwidth()|.
 
-		Can also be used as a |method|: >vim
-			GetString()->strlen()
-<
-
 strpart({src}, {start} [, {len} [, {chars}]])                        *strpart()*
 		The result is a String, which is part of {src}, starting from
 		byte {start}, with the byte length {len}.
@@ -8535,10 +7484,6 @@ strpart({src}, {start} [, {len} [, {chars}]])                        *strpart()*
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			GetText()->strpart(5)
-<
-
 strptime({format}, {timestring})                                    *strptime()*
 		The result is a Number, which is a unix timestamp representing
 		the date and time in {timestring}, which is expected to match
@@ -8563,10 +7508,6 @@ strptime({format}, {timestring})                                    *strptime()*
 		  echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
 <		  Sun Apr 27 12:53:55 1997
 
-		Can also be used as a |method|: >vim
-			GetFormat()->strptime(timestring)
-<
-
 strridx({haystack}, {needle} [, {start}])                            *strridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the last occurrence of the String {needle}.
@@ -8585,10 +7526,6 @@ strridx({haystack}, {needle} [, {start}])                            *strridx()*
 		When used with a single character it works similar to the C
 		function strrchr().
 
-		Can also be used as a |method|: >vim
-			GetHaystack()->strridx(needle)
-<
-
 strtrans({string})                                                  *strtrans()*
 		The result is a String, which is {string} with all unprintable
 		characters translated into printable characters |'isprint'|.
@@ -8599,10 +7536,6 @@ strtrans({string})                                                  *strtrans()*
 
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			GetString()->strtrans()
-<
-
 strutf16len({string} [, {countcc}])                              *strutf16len()*
 		The result is a Number, which is the number of UTF-16 code
 		units in String {string} (after converting it to UTF-16).
@@ -8622,10 +7555,6 @@ strutf16len({string} [, {countcc}])                              *strutf16len()*
 		    echo strutf16len('ą́')		" returns 1
 		    echo strutf16len('ą́', v:true)	" returns 3
 
-		Can also be used as a |method|: >vim
-			GetText()->strutf16len()
-<
-
 strwidth({string})                                                  *strwidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies.  A Tab character is counted as one
@@ -8635,10 +7564,6 @@ strwidth({string})                                                  *strwidth()*
 		Returns zero on error.
 		Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
 
-		Can also be used as a |method|: >vim
-			GetString()->strwidth()
-<
-
 submatch({nr} [, {list}])                                      *submatch()* *E935*
 		Only for an expression in a |:substitute| command or
 		substitute() function.
@@ -8667,10 +7592,6 @@ submatch({nr} [, {list}])                                      *submatch()* *E93
 <		This finds the first number in the line and adds one to it.
 		A line break is included as a newline character.
 
-		Can also be used as a |method|: >vim
-			GetNr()->submatch()
-<
-
 substitute({string}, {pat}, {sub}, {flags})                       *substitute()*
 		The result is a String, which is a copy of {string}, in which
 		the first match of {pat} is replaced with {sub}.
@@ -8714,10 +7635,6 @@ substitute({string}, {pat}, {sub}, {flags})                       *substitute()*
 
 <		Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			GetString()->substitute(pat, sub, flags)
-<
-
 swapfilelist()                                                  *swapfilelist()*
 		Returns a list of swap file names, like what "vim -r" shows.
 		See the |-r| command argument.  The 'directory' option is used
@@ -8747,10 +7664,6 @@ swapinfo({fname})                                                   *swapinfo()*
 			Not a swap file: does not contain correct block ID
 			Magic number mismatch: Info in first block is invalid
 
-		Can also be used as a |method|: >vim
-			GetFilename()->swapinfo()
-<
-
 swapname({buf})                                                     *swapname()*
 		The result is the swap file path of the buffer {buf}.
 		For the use of {buf}, see |bufname()| above.
@@ -8758,10 +7671,6 @@ swapname({buf})                                                     *swapname()*
 		|:swapname| (unless there is no swap file).
 		If buffer {buf} has no swap file, returns an empty string.
 
-		Can also be used as a |method|: >vim
-			GetBufname()->swapname()
-<
-
 synID({lnum}, {col}, {trans})                                          *synID()*
 		The result is a Number, which is the syntax ID at the position
 		{lnum} and {col} in the current window.
@@ -8842,10 +7751,6 @@ synIDtrans({synID})                                               *synIDtrans()*
 
 		Returns zero on error.
 
-		Can also be used as a |method|: >vim
-			echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
-<
-
 synconcealed({lnum}, {col})                                     *synconcealed()*
 		The result is a |List| with currently three items:
 		1. The first item in the list is 0 if the character at the
@@ -8940,10 +7845,6 @@ system({cmd} [, {input}])                                        *system()* *E67
 <		Unlike ":!cmd" there is no automatic check for changed files.
 		Use |:checktime| to force a check.
 
-		Can also be used as a |method|: >vim
-			echo GetCmd()->system()
-<
-
 systemlist({cmd} [, {input} [, {keepempty}]])                     *systemlist()*
 		Same as |system()|, but returns a |List| with lines (parts of
 		output separated by NL) with NULs transformed into NLs. Output
@@ -8958,10 +7859,6 @@ systemlist({cmd} [, {input} [, {keepempty}]])                     *systemlist()*
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			echo GetCmd()->systemlist()
-<
-
 tabpagebuflist([{arg}])                                       *tabpagebuflist()*
 		The result is a |List|, where each item is the number of the
 		buffer associated with each window in the current tab page.
@@ -8975,10 +7872,6 @@ tabpagebuflist([{arg}])                                       *tabpagebuflist()*
 			endfor
 <		Note that a buffer may appear in more than one window.
 
-		Can also be used as a |method|: >vim
-			GetTabpage()->tabpagebuflist()
-<
-
 tabpagenr([{arg}])                                                 *tabpagenr()*
 		The result is a Number, which is the number of the current
 		tab page.  The first tab page has number 1.
@@ -9006,10 +7899,6 @@ tabpagewinnr({tabarg} [, {arg}])                                *tabpagewinnr()*
 		    tabpagewinnr(4, '$')    " number of windows in tab page 4
 <		When {tabarg} is invalid zero is returned.
 
-		Can also be used as a |method|: >vim
-			GetTabpage()->tabpagewinnr()
-<
-
 tagfiles()                                                          *tagfiles()*
 		Returns a |List| with the file names used to search for tags
 		for the current buffer.  This is the 'tags' option expanded.
@@ -9057,9 +7946,6 @@ taglist({expr} [, {filename}])                                       *taglist()*
 		located by Vim. Refer to |tags-file-format| for the format of
 		the tags file generated by the different ctags tools.
 
-		Can also be used as a |method|: >vim
-			GetTagpattern()->taglist()
-
 tan({expr})                                                              *tan()*
 		Return the tangent of {expr}, measured in radians, as a |Float|
 		in the range [-inf, inf].
@@ -9071,10 +7957,6 @@ tan({expr})                                                              *tan()*
 			echo tan(-4.01)
 <			-1.181502
 
-		Can also be used as a |method|: >vim
-			Compute()->tan()
-<
-
 tanh({expr})                                                            *tanh()*
 		Return the hyperbolic tangent of {expr} as a |Float| in the
 		range [-1, 1].
@@ -9086,10 +7968,6 @@ tanh({expr})                                                            *tanh()*
 			echo tanh(-1)
 <			-0.761594
 
-		Can also be used as a |method|: >vim
-			Compute()->tanh()
-<
-
 tempname()                                                          *tempname()*
 		Generates a (non-existent) filename located in the Nvim root
 		|tempdir|. Scripts can use the filename as a temporary file.
@@ -9128,10 +8006,6 @@ timer_info([{id}])                                                *timer_info()*
 				    -1 means forever
 		    "callback"	    the callback
 
-		Can also be used as a |method|: >vim
-			GetTimer()->timer_info()
-<
-
 timer_pause({timer}, {paused})                                   *timer_pause()*
 		Pause or unpause a timer.  A paused timer does not invoke its
 		callback when its time expires.  Unpausing a timer may cause
@@ -9145,10 +8019,6 @@ timer_pause({timer}, {paused})                                   *timer_pause()*
 		String, then the timer is paused, otherwise it is unpaused.
 		See |non-zero-arg|.
 
-		Can also be used as a |method|: >vim
-			GetTimer()->timer_pause(1)
-<
-
 timer_start({time}, {callback} [, {options}])              *timer_start()* *timer*
 		Create a timer and return the timer ID.
 
@@ -9179,20 +8049,11 @@ timer_start({time}, {callback} [, {options}])              *timer_start()* *time
 				\ {'repeat': 3})
 <		This invokes MyHandler() three times at 500 msec intervals.
 
-		Can also be used as a |method|: >vim
-			GetMsec()->timer_start(callback)
-
-<		Not available in the |sandbox|.
-
 timer_stop({timer})                                               *timer_stop()*
 		Stop a timer.  The timer callback will no longer be invoked.
 		{timer} is an ID returned by timer_start(), thus it must be a
 		Number.  If {timer} does not exist there is no error.
 
-		Can also be used as a |method|: >vim
-			GetTimer()->timer_stop()
-<
-
 timer_stopall()                                                *timer_stopall()*
 		Stop all timers.  The timer callbacks will no longer be
 		invoked.  Useful if some timers is misbehaving.  If there are
@@ -9203,19 +8064,11 @@ tolower({expr})                                                      *tolower()*
 		characters turned into lowercase (just like applying |gu| to
 		the string).  Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			GetText()->tolower()
-<
-
 toupper({expr})                                                      *toupper()*
 		The result is a copy of the String given, with all lowercase
 		characters turned into uppercase (just like applying |gU| to
 		the string).  Returns an empty string on error.
 
-		Can also be used as a |method|: >vim
-			GetText()->toupper()
-<
-
 tr({src}, {fromstr}, {tostr})                                             *tr()*
 		The result is a copy of the {src} string with all characters
 		which appear in {fromstr} replaced by the character in that
@@ -9232,10 +8085,6 @@ tr({src}, {fromstr}, {tostr})                                             *tr()*
 			echo tr("<blob>", "<>", "{}")
 <		returns "{blob}"
 
-		Can also be used as a |method|: >vim
-			GetText()->tr(from, to)
-<
-
 trim({text} [, {mask} [, {dir}]])                                       *trim()*
 		Return {text} as a String where any character in {mask} is
 		removed from the beginning and/or end of {text}.
@@ -9261,10 +8110,6 @@ trim({text} [, {mask} [, {dir}]])                                       *trim()*
 			echo trim("  vim  ", " ", 2)
 <		returns "  vim"
 
-		Can also be used as a |method|: >vim
-			GetText()->trim()
-<
-
 trunc({expr})                                                          *trunc()*
 		Return the largest integral value with magnitude less than or
 		equal to {expr} as a |Float| (truncate towards zero).
@@ -9278,10 +8123,6 @@ trunc({expr})                                                          *trunc()*
 			echo trunc(4.0)
 <			4.0
 
-		Can also be used as a |method|: >vim
-			Compute()->trunc()
-<
-
 type({expr})                                                            *type()*
 		The result is a Number representing the type of {expr}.
 		Instead of using the number directly, it is better to use the
@@ -9309,10 +8150,6 @@ type({expr})                                                            *type()*
 <		To check if the v:t_ variables exist use this: >vim
 			if exists('v:t_number') | endif
 
-<		Can also be used as a |method|: >vim
-			mylist->type()
-<
-
 undofile({name})                                                    *undofile()*
 		Return the name of the undo file that would be used for a file
 		with name {name} when writing.  This uses the 'undodir'
@@ -9324,10 +8161,6 @@ undofile({name})                                                    *undofile()*
 		buffer without a file name will not write an undo file.
 		Useful in combination with |:wundo| and |:rundo|.
 
-		Can also be used as a |method|: >vim
-			GetFilename()->undofile()
-<
-
 undotree()                                                          *undotree()*
 		Return the current state of the undo tree in a dictionary with
 		the following items:
@@ -9381,10 +8214,6 @@ uniq({list} [, {func} [, {dict}]])                                 *uniq()* *E88
 
 		Returns zero if {list} is not a |List|.
 
-		Can also be used as a |method|: >vim
-			mylist->uniq()
-<
-
 utf16idx({string}, {idx} [, {countcc} [, {charidx}]])               *utf16idx()*
 		Same as |charidx()| but returns the UTF-16 code unit index of
 		the byte at {idx} in {string} (after converting it to UTF-16).
@@ -9412,19 +8241,12 @@ utf16idx({string}, {idx} [, {countcc} [, {charidx}]])               *utf16idx()*
 			echo utf16idx('aą́c', 6, 1)	" returns 4
 			echo utf16idx('a😊😊', 9)	" returns -1
 <
-		Can also be used as a |method|: >vim
-			GetName()->utf16idx(idx)
-<
 
 values({dict})                                                        *values()*
 		Return a |List| with all the values of {dict}.  The |List| is
 		in arbitrary order.  Also see |items()| and |keys()|.
 		Returns zero if {dict} is not a |Dict|.
 
-		Can also be used as a |method|: >vim
-			mydict->values()
-<
-
 virtcol({expr} [, {list}])                                           *virtcol()*
 		The result is a Number, which is the screen column of the file
 		position given with {expr}.  That is, the last screen position
@@ -9477,10 +8299,6 @@ virtcol({expr} [, {list}])                                           *virtcol()*
 		all lines: >vim
 		    echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
 
-<		Can also be used as a |method|: >vim
-			GetPos()->virtcol()
-<
-
 virtcol2col({winid}, {lnum}, {col})                              *virtcol2col()*
 		The result is a Number, which is the byte index of the
 		character in window {winid} at buffer line {lnum} and virtual
@@ -9498,10 +8316,6 @@ virtcol2col({winid}, {lnum}, {col})                              *virtcol2col()*
 
 		See also |screenpos()|, |virtcol()| and |col()|.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->virtcol2col(lnum, col)
-<
-
 visualmode([{expr}])                                              *visualmode()*
 		The result is a String, which describes the last Visual mode
 		used in the current buffer.  Initially it returns an empty
@@ -9561,19 +8375,10 @@ win_execute({id}, {command} [, {silent}])                        *win_execute()*
 		When window {id} does not exist then no error is given and
 		an empty string is returned.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >vim
-			GetCommand()->win_execute(winid)
-<
-
 win_findbuf({bufnr})                                             *win_findbuf()*
 		Returns a |List| with |window-ID|s for windows that contain
 		buffer {bufnr}.  When there is none the list is empty.
 
-		Can also be used as a |method|: >vim
-			GetBufnr()->win_findbuf()
-<
-
 win_getid([{win} [, {tab}]])                                       *win_getid()*
 		Get the |window-ID| for the specified window.
 		When {win} is missing use the current window.
@@ -9583,10 +8388,6 @@ win_getid([{win} [, {tab}]])                                       *win_getid()*
 		number {tab}.  The first tab has number one.
 		Return zero if the window cannot be found.
 
-		Can also be used as a |method|: >vim
-			GetWinnr()->win_getid()
-<
-
 win_gettype([{nr}])                                              *win_gettype()*
 		Return the type of the window:
 			"autocmd"	autocommand window. Temporary window
@@ -9605,36 +8406,20 @@ win_gettype([{nr}])                                              *win_gettype()*
 
 		Also see the 'buftype' option.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->win_gettype()
-<
-
 win_gotoid({expr})                                                *win_gotoid()*
 		Go to window with ID {expr}.  This may also change the current
 		tabpage.
 		Return TRUE if successful, FALSE if the window cannot be found.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->win_gotoid()
-<
-
 win_id2tabwin({expr})                                          *win_id2tabwin()*
 		Return a list with the tab number and window number of window
 		with ID {expr}: [tabnr, winnr].
 		Return [0, 0] if the window cannot be found.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->win_id2tabwin()
-<
-
 win_id2win({expr})                                                *win_id2win()*
 		Return the window number of window with ID {expr}.
 		Return 0 if the window cannot be found in the current tabpage.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->win_id2win()
-<
-
 win_move_separator({nr}, {offset})                        *win_move_separator()*
 		Move window {nr}'s vertical separator (i.e., the right border)
 		by {offset} columns, as if being dragged by the mouse. {nr}
@@ -9650,10 +8435,6 @@ win_move_separator({nr}, {offset})                        *win_move_separator()*
 		window, since it has no separator on the right.
 		Only works for the current tab page. *E1308*
 
-		Can also be used as a |method|: >vim
-			GetWinnr()->win_move_separator(offset)
-<
-
 win_move_statusline({nr}, {offset})                      *win_move_statusline()*
 		Move window {nr}'s status line (i.e., the bottom border) by
 		{offset} rows, as if being dragged by the mouse. {nr} can be a
@@ -9666,10 +8447,6 @@ win_move_statusline({nr}, {offset})                      *win_move_statusline()*
 		be found and FALSE otherwise.
 		Only works for the current tab page.
 
-		Can also be used as a |method|: >vim
-			GetWinnr()->win_move_statusline(offset)
-<
-
 win_screenpos({nr})                                            *win_screenpos()*
 		Return the screen position of window {nr} as a list with two
 		numbers: [row, col].  The first window always has position
@@ -9679,10 +8456,6 @@ win_screenpos({nr})                                            *win_screenpos()*
 		Returns [0, 0] if the window cannot be found in the current
 		tabpage.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->win_screenpos()
-<
-
 win_splitmove({nr}, {target} [, {options}])                    *win_splitmove()*
 		Move the window {nr} to a new split of the window {target}.
 		This is similar to moving to {target}, creating a new window
@@ -9703,10 +8476,6 @@ win_splitmove({nr}, {target} [, {options}])                    *win_splitmove()*
 				present, the values of 'splitbelow' and
 				'splitright' are used.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->win_splitmove(target)
-<
-
 winbufnr({nr})                                                      *winbufnr()*
 		The result is a Number, which is the number of the buffer
 		associated with window {nr}.  {nr} can be the window number or
@@ -9717,9 +8486,6 @@ winbufnr({nr})                                                      *winbufnr()*
 		Example: >vim
 		  echo "The file in the current window is " .. bufname(winbufnr(0))
 <
-		Can also be used as a |method|: >vim
-			FindWindow()->winbufnr()->bufname()
-<
 
 wincol()                                                              *wincol()*
 		The result is a Number, which is the virtual column of the
@@ -9742,10 +8508,6 @@ winheight({nr})                                                    *winheight()*
 		Examples: >vim
 		  echo "The current window has " .. winheight(0) .. " lines."
 
-<		Can also be used as a |method|: >vim
-			GetWinid()->winheight()
-<
-
 winlayout([{tabnr}])                                               *winlayout()*
 		The result is a nested List containing the layout of windows
 		in a tabpage.
@@ -9782,9 +8544,6 @@ winlayout([{tabnr}])                                               *winlayout()*
 			['col', [['leaf', 1002], ['row', [['leaf', 1003],
 					    ['leaf', 1001]]], ['leaf', 1000]]]
 <
-		Can also be used as a |method|: >vim
-			GetTabnr()->winlayout()
-<
 
 winline()                                                            *winline()*
 		The result is a Number, which is the screen line of the cursor
@@ -9822,10 +8581,6 @@ winnr([{arg}])                                                         *winnr()*
 			let prev_window = winnr('#')
 			let wnum = winnr('3k')
 
-<		Can also be used as a |method|: >vim
-			GetWinval()->winnr()
-<
-
 winrestcmd()                                                      *winrestcmd()*
 		Returns a sequence of |:resize| commands that should restore
 		the current window sizes.  Only works properly when no windows
@@ -9853,10 +8608,6 @@ winrestview({dict})                                              *winrestview()*
 		If you have changed the values the result is unpredictable.
 		If the window size changed the result won't be the same.
 
-		Can also be used as a |method|: >vim
-			GetView()->winrestview()
-<
-
 winsaveview()                                                    *winsaveview()*
 		Returns a |Dictionary| that contains information to restore
 		the view of the current window.  Use |winrestview()| to
@@ -9898,10 +8649,6 @@ winwidth({nr})                                                      *winwidth()*
 <		For getting the terminal or screen size, see the 'columns'
 		option.
 
-		Can also be used as a |method|: >vim
-			GetWinid()->winwidth()
-<
-
 wordcount()                                                        *wordcount()*
 		The result is a dictionary of byte/chars/word statistics for
 		the current buffer.  This is the same info as provided by
@@ -9969,10 +8716,6 @@ writefile({object}, {fname} [, {flags}])                           *writefile()*
 			let fl = readfile("foo", "b")
 			call writefile(fl, "foocopy", "b")
 
-<		Can also be used as a |method|: >vim
-			GetText()->writefile("thefile")
-<
-
 xor({expr}, {expr})                                                      *xor()*
 		Bitwise XOR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
@@ -9980,9 +8723,6 @@ xor({expr}, {expr})                                                      *xor()*
 		Example: >vim
 			let bits = xor(bits, 0x80)
 <
-		Can also be used as a |method|: >vim
-			let bits = bits->xor(0x80)
-<
 
 ==============================================================================
 2. Matching a pattern in a String			*string-match*
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 261f349756..3de2e5ac4f 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -15,10 +15,6 @@ error('Cannot require a meta file')
 ---   echo abs(-4)
 --- <  4
 ---
---- Can also be used as a |method|: >vim
----   Compute()->abs()
---- <
----
 --- @param expr any
 --- @return number
 function vim.fn.abs(expr) end
@@ -35,10 +31,6 @@ function vim.fn.abs(expr) end
 ---   echo acos(-0.5)
 --- <  2.094395
 ---
---- Can also be used as a |method|: >vim
----   Compute()->acos()
---- <
----
 --- @param expr any
 --- @return number
 function vim.fn.acos(expr) end
@@ -53,10 +45,6 @@ function vim.fn.acos(expr) end
 --- Use |insert()| to add an item at another position.
 --- Returns 1 if {object} is not a |List| or a |Blob|.
 ---
---- Can also be used as a |method|: >vim
----   mylist->add(val1)->add(val2)
---- <
----
 --- @param object any
 --- @param expr any
 --- @return any
@@ -67,8 +55,6 @@ function vim.fn.add(object, expr) end
 --- Also see `or()` and `xor()`.
 --- Example: >vim
 ---   let flag = and(bits, 0x80)
---- <Can also be used as a |method|: >vim
----   let flag = bits->and(0x80)
 --- <
 ---
 --- @param expr any
@@ -96,9 +82,6 @@ function vim.fn.api_info() end
 --- 0 for success.  Example: >vim
 ---   let failed = append(line('$'), "# THE END")
 ---   let failed = append(0, ["Chapter 1", "the beginning"])
----
---- <Can also be used as a |method| after a List: >vim
----   mylist->append(lnum)
 --- <
 ---
 --- @param lnum integer
@@ -124,9 +107,6 @@ function vim.fn.append(lnum, text) end
 --- error message is given. Example: >vim
 ---   let failed = appendbufline(13, 0, "# THE START")
 --- <
---- Can also be used as a |method| after a List: >vim
----   mylist->appendbufline(buf, lnum)
---- <
 ---
 --- @param buf any
 --- @param lnum integer
@@ -204,10 +184,6 @@ function vim.fn.argv(nr, winid) end
 ---   echo asin(-0.5)
 --- <  -0.523599
 ---
---- Can also be used as a |method|: >vim
----   Compute()->asin()
---- <
----
 --- @param expr any
 --- @return number
 function vim.fn.asin(expr) end
@@ -217,10 +193,6 @@ function vim.fn.asin(expr) end
 --- Also see |assert_fails()|, |assert_nobeep()| and
 --- |assert-return|.
 ---
---- Can also be used as a |method|: >vim
----   GetCmd()->assert_beeps()
---- <
----
 --- @param cmd any
 --- @return 0|1
 function vim.fn.assert_beeps(cmd) end
@@ -240,10 +212,6 @@ function vim.fn.assert_beeps(cmd) end
 --- <Will result in a string to be added to |v:errors|:
 ---   test.vim line 12: Expected 'foo' but got 'bar' ~
 ---
---- Can also be used as a |method|: >vim
----   mylist->assert_equal([1, 2, 3])
---- <
----
 --- @param expected any
 --- @param actual any
 --- @param msg? any
@@ -256,10 +224,6 @@ function vim.fn.assert_equal(expected, actual, msg) end
 --- When {fname-one} or {fname-two} does not exist the error will
 --- mention that.
 ---
---- Can also be used as a |method|: >vim
----   GetLog()->assert_equalfile('expected.log')
---- <
----
 --- @return 0|1
 function vim.fn.assert_equalfile() end
 
@@ -314,10 +278,6 @@ function vim.fn.assert_exception(error, msg) end
 --- Note that beeping is not considered an error, and some failing
 --- commands only beep.  Use |assert_beeps()| for those.
 ---
---- Can also be used as a |method|: >vim
----   GetCmd()->assert_fails('E99:')
---- <
----
 --- @param cmd any
 --- @param error? any
 --- @param msg? any
@@ -335,10 +295,6 @@ function vim.fn.assert_fails(cmd, error, msg, lnum, context) end
 --- A value is false when it is zero. When {actual} is not a
 --- number the assert fails.
 ---
---- Can also be used as a |method|: >vim
----   GetResult()->assert_false()
---- <
----
 --- @param actual any
 --- @param msg? any
 --- @return 0|1
@@ -376,10 +332,6 @@ function vim.fn.assert_inrange(lower, upper, actual, msg) end
 --- <Will result in a string to be added to |v:errors|:
 ---   test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
 ---
---- Can also be used as a |method|: >vim
----   getFile()->assert_match('foo.*')
---- <
----
 --- @param pattern any
 --- @param actual any
 --- @param msg? any
@@ -390,10 +342,6 @@ function vim.fn.assert_match(pattern, actual, msg) end
 --- produces a beep or visual bell.
 --- Also see |assert_beeps()|.
 ---
---- Can also be used as a |method|: >vim
----   GetCmd()->assert_nobeep()
---- <
----
 --- @param cmd any
 --- @return 0|1
 function vim.fn.assert_nobeep(cmd) end
@@ -402,10 +350,6 @@ function vim.fn.assert_nobeep(cmd) end
 --- |v:errors| when {expected} and {actual} are equal.
 --- Also see |assert-return|.
 ---
---- Can also be used as a |method|: >vim
----   mylist->assert_notequal([1, 2, 3])
---- <
----
 --- @param expected any
 --- @param actual any
 --- @param msg? any
@@ -416,10 +360,6 @@ function vim.fn.assert_notequal(expected, actual, msg) end
 --- |v:errors| when {pattern} matches {actual}.
 --- Also see |assert-return|.
 ---
---- Can also be used as a |method|: >vim
----   getFile()->assert_notmatch('bar.*')
---- <
----
 --- @param pattern any
 --- @param actual any
 --- @param msg? any
@@ -429,10 +369,6 @@ function vim.fn.assert_notmatch(pattern, actual, msg) end
 --- Report a test failure directly, using String {msg}.
 --- Always returns one.
 ---
---- Can also be used as a |method|: >vim
----   GetMessage()->assert_report()
---- <
----
 --- @param msg any
 --- @return 0|1
 function vim.fn.assert_report(msg) end
@@ -444,10 +380,6 @@ function vim.fn.assert_report(msg) end
 --- When {actual} is not a number or |v:true| the assert fails.
 --- When {msg} is given it precedes the default message.
 ---
---- Can also be used as a |method|: >vim
----   GetResult()->assert_true()
---- <
----
 --- @param actual any
 --- @param msg? any
 --- @return 0|1
@@ -463,10 +395,6 @@ function vim.fn.assert_true(actual, msg) end
 ---   echo atan(-4.01)
 --- <  -1.326405
 ---
---- Can also be used as a |method|: >vim
----   Compute()->atan()
---- <
----
 --- @param expr any
 --- @return number
 function vim.fn.atan(expr) end
@@ -482,10 +410,6 @@ function vim.fn.atan(expr) end
 ---   echo atan2(1, -1)
 --- <  2.356194
 ---
---- Can also be used as a |method|: >vim
----   Compute()->atan2(1)
---- <
----
 --- @param expr1 any
 --- @param expr2 any
 --- @return number
@@ -498,10 +422,6 @@ function vim.fn.atan2(expr1, expr2) end
 --- <Returns an empty List on error.  |list2blob()| does the
 --- opposite.
 ---
---- Can also be used as a |method|: >vim
----   GetBlob()->blob2list()
---- <
----
 --- @param blob any
 --- @return any[]
 function vim.fn.blob2list(blob) end
@@ -551,9 +471,6 @@ function vim.fn.browsedir(title, initdir) end
 ---   call bufload(bufnr)
 ---   call setbufline(bufnr, 1, ['some', 'text'])
 --- <Returns 0 on error.
---- Can also be used as a |method|: >vim
----   let bufnr = 'somename'->bufadd()
---- <
 ---
 --- @param name string
 --- @return integer
@@ -580,10 +497,6 @@ function vim.fn.bufadd(name) end
 --- Use "bufexists(0)" to test for the existence of an alternate
 --- file name.
 ---
---- Can also be used as a |method|: >vim
----   let exists = 'somename'->bufexists()
---- <
----
 --- @param buf any
 --- @return 0|1
 function vim.fn.bufexists(buf) end
@@ -613,10 +526,6 @@ function vim.fn.buffer_number(...) end
 --- {buf} exists and is listed (has the 'buflisted' option set).
 --- The {buf} argument is used like with |bufexists()|.
 ---
---- Can also be used as a |method|: >vim
----   let listed = 'somename'->buflisted()
---- <
----
 --- @param buf any
 --- @return 0|1
 function vim.fn.buflisted(buf) end
@@ -630,10 +539,6 @@ function vim.fn.buflisted(buf) end
 --- there will be no dialog, the buffer will be loaded anyway.
 --- The {buf} argument is used like with |bufexists()|.
 ---
---- Can also be used as a |method|: >vim
----   eval 'somename'->bufload()
---- <
----
 --- @param buf any
 function vim.fn.bufload(buf) end
 
@@ -641,10 +546,6 @@ function vim.fn.bufload(buf) end
 --- {buf} exists and is loaded (shown in a window or hidden).
 --- The {buf} argument is used like with |bufexists()|.
 ---
---- Can also be used as a |method|: >vim
----   let loaded = 'somename'->bufloaded()
---- <
----
 --- @param buf any
 --- @return 0|1
 function vim.fn.bufloaded(buf) end
@@ -669,11 +570,6 @@ function vim.fn.bufloaded(buf) end
 --- with a listed buffer, that one is returned.  Next unlisted
 --- buffers are searched for.
 --- If the {buf} is a String, but you want to use it as a buffer
---- number, force it to be a Number by adding zero to it: >vim
----   echo bufname("3" + 0)
---- <Can also be used as a |method|: >vim
----   echo bufnr->bufname()
----
 --- <If the buffer doesn't exist, or doesn't have a name, an empty
 --- string is returned. >vim
 ---   echo bufname("#")    " alternate buffer name
@@ -699,10 +595,6 @@ function vim.fn.bufname(buf) end
 --- number necessarily exist, because ":bwipeout" may have removed
 --- them.  Use bufexists() to test for the existence of a buffer.
 ---
---- Can also be used as a |method|: >vim
----   echo bufref->bufnr()
---- <
----
 --- @param buf? any
 --- @param create? any
 --- @return integer
@@ -718,10 +610,6 @@ function vim.fn.bufnr(buf, create) end
 --- Only deals with the current tab page.  See |win_findbuf()| for
 --- finding more.
 ---
---- Can also be used as a |method|: >vim
----   FindBuffer()->bufwinid()
---- <
----
 --- @param buf any
 --- @return integer
 function vim.fn.bufwinid(buf) end
@@ -736,10 +624,6 @@ function vim.fn.bufwinid(buf) end
 --- <The number can be used with |CTRL-W_w| and ":wincmd w"
 --- |:wincmd|.
 ---
---- Can also be used as a |method|: >vim
----   FindBuffer()->bufwinnr()
---- <
----
 --- @param buf any
 --- @return integer
 function vim.fn.bufwinnr(buf) end
@@ -753,10 +637,6 @@ function vim.fn.bufwinnr(buf) end
 ---
 --- Returns -1 if the {byte} value is invalid.
 ---
---- Can also be used as a |method|: >vim
----   GetOffset()->byte2line()
---- <
----
 --- @param byte any
 --- @return integer
 function vim.fn.byte2line(byte) end
@@ -795,9 +675,6 @@ function vim.fn.byte2line(byte) end
 ---   echo byteidx('a😊😊', 2, 1)  " returns 1
 ---   echo byteidx('a😊😊', 3, 1)  " returns 5
 --- <
---- Can also be used as a |method|: >vim
----   GetName()->byteidx(idx)
---- <
 ---
 --- @param expr any
 --- @param nr integer
@@ -815,10 +692,6 @@ function vim.fn.byteidx(expr, nr, utf16) end
 --- character is 3 bytes), the second echo results in 1 ('e' is
 --- one byte).
 ---
---- Can also be used as a |method|: >vim
----   GetName()->byteidxcomp(idx)
---- <
----
 --- @param expr any
 --- @param nr integer
 --- @param utf16? any
@@ -833,10 +706,6 @@ function vim.fn.byteidxcomp(expr, nr, utf16) end
 --- {dict} is for functions with the "dict" attribute.  It will be
 --- used to set the local variable "self". |Dictionary-function|
 ---
---- Can also be used as a |method|: >vim
----   GetFunc()->call([arg, arg], dict)
---- <
----
 --- @param func any
 --- @param arglist any
 --- @param dict? any
@@ -856,10 +725,6 @@ function vim.fn.call(func, arglist, dict) end
 ---
 --- Returns 0.0 if {expr} is not a |Float| or a |Number|.
 ---
---- Can also be used as a |method|: >vim
----   Compute()->ceil()
---- <
----
 --- @param expr any
 --- @return number
 function vim.fn.ceil(expr) end
@@ -925,10 +790,6 @@ function vim.fn.chansend(id, data) end
 ---
 --- Returns 0 if {string} is not a |String|.
 ---
---- Can also be used as a |method|: >vim
----   GetChar()->char2nr()
---- <
----
 --- @param string string
 --- @param utf8? any
 --- @return 0|1
@@ -956,10 +817,6 @@ function vim.fn.charclass(string) end
 ---   echo charcol('.')    " returns 3
 ---   echo col('.')    " returns 7
 ---
---- <Can also be used as a |method|: >vim
----   GetPos()->col()
---- <
----
 --- @param expr any
 --- @param winid? integer
 --- @return integer
@@ -997,9 +854,6 @@ function vim.fn.charcol(expr, winid) end
 ---   echo charidx('áb́ć', 16)    " returns -1
 ---   echo charidx('a😊😊', 4, 0, 1)  " returns 2
 --- <
---- Can also be used as a |method|: >vim
----   GetName()->charidx(idx)
---- <
 ---
 --- @param string string
 --- @param idx integer
@@ -1029,10 +883,6 @@ function vim.fn.charidx(string, idx, countcc, utf16) end
 ---      call chdir(save_dir)
 ---   endif
 ---
---- <Can also be used as a |method|: >vim
----   GetDir()->chdir()
---- <
----
 --- @param dir string
 --- @return string
 function vim.fn.chdir(dir) end
@@ -1044,10 +894,6 @@ function vim.fn.chdir(dir) end
 --- When {lnum} is invalid -1 is returned.
 --- See |C-indenting|.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->cindent()
---- <
----
 --- @param lnum integer
 --- @return integer
 function vim.fn.cindent(lnum) end
@@ -1057,10 +903,6 @@ function vim.fn.cindent(lnum) end
 --- If {win} is specified, use the window with this number or
 --- window ID instead of the current window.
 ---
---- Can also be used as a |method|: >vim
----   GetWin()->clearmatches()
---- <
----
 --- @param win? any
 function vim.fn.clearmatches(win) end
 
@@ -1101,10 +943,6 @@ function vim.fn.clearmatches(win) end
 --- moved, this can be used to obtain the column in Insert mode: >vim
 ---   imap <F2> <Cmd>echo col(".").."\n"<CR>
 ---
---- <Can also be used as a |method|: >vim
----   GetPos()->col()
---- <
----
 --- @param expr any
 --- @param winid? integer
 --- @return integer
@@ -1139,11 +977,6 @@ function vim.fn.col(expr, winid) end
 --- <This isn't very useful, but it shows how it works.  Note that
 --- an empty string is returned to avoid a zero being inserted.
 ---
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetMatches()->complete(col('.'))
---- <
----
 --- @param startcol any
 --- @param matches any
 function vim.fn.complete(startcol, matches) end
@@ -1156,10 +989,6 @@ function vim.fn.complete(startcol, matches) end
 --- See |complete-functions| for an explanation of {expr}.  It is
 --- the same as one item in the list that 'omnifunc' would return.
 ---
---- Can also be used as a |method|: >vim
----   GetMoreMatches()->complete_add()
---- <
----
 --- @param expr any
 --- @return 0|1|2
 function vim.fn.complete_add(expr) end
@@ -1231,10 +1060,6 @@ function vim.fn.complete_check() end
 ---   " Get only 'mode' and 'pum_visible'
 ---   call complete_info(['mode', 'pum_visible'])
 ---
---- <Can also be used as a |method|: >vim
----   GetItems()->complete_info()
---- <
----
 --- @param what? any
 --- @return table
 function vim.fn.complete_info(what) end
@@ -1290,10 +1115,6 @@ function vim.fn.complete_info(what) end
 --- don't fit, a vertical layout is used anyway.  For some systems
 --- the horizontal layout is always used.
 ---
---- Can also be used as a |method|in: >vim
----   BuildMessage()->confirm("&Yes\n&No")
---- <
----
 --- @param msg any
 --- @param choices? any
 --- @param default? any
@@ -1309,9 +1130,6 @@ function vim.fn.confirm(msg, choices, default, type) end
 --- changing an item changes the contents of both |Lists|.
 --- A |Dictionary| is copied in a similar way as a |List|.
 --- Also see |deepcopy()|.
---- Can also be used as a |method|: >vim
----   mylist->copy()
---- <
 ---
 --- @param expr any
 --- @return any
@@ -1326,10 +1144,6 @@ function vim.fn.copy(expr) end
 ---   echo cos(-4.01)
 --- <  -0.646043
 ---
---- Can also be used as a |method|: >vim
----   Compute()->cos()
---- <
----
 --- @param expr any
 --- @return number
 function vim.fn.cos(expr) end
@@ -1344,10 +1158,6 @@ function vim.fn.cos(expr) end
 ---   echo cosh(-0.5)
 --- <  -1.127626
 ---
---- Can also be used as a |method|: >vim
----   Compute()->cosh()
---- <
----
 --- @param expr any
 --- @return number
 function vim.fn.cosh(expr) end
@@ -1364,10 +1174,6 @@ function vim.fn.cosh(expr) end
 --- occurrences of {expr} is returned. Zero is returned when
 --- {expr} is an empty string.
 ---
---- Can also be used as a |method|: >vim
----   mylist->count(val)
---- <
----
 --- @param comp any
 --- @param expr any
 --- @param ic? any
@@ -1451,10 +1257,6 @@ function vim.fn.cursor(lnum, col, off) end
 --- position within a <Tab> or after the last character.
 --- Returns 0 when the position could be set, -1 otherwise.
 ---
---- Can also be used as a |method|: >vim
----   GetCursorPos()->cursor()
---- <
----
 --- @param list any
 --- @return any
 function vim.fn.cursor(list) end
@@ -1467,10 +1269,6 @@ function vim.fn.cursor(list) end
 --- Returns |TRUE| if successfully interrupted the program.
 --- Otherwise returns |FALSE|.
 ---
---- Can also be used as a |method|: >vim
----   GetPid()->debugbreak()
---- <
----
 --- @param pid any
 --- @return any
 function vim.fn.debugbreak(pid) end
@@ -1494,10 +1292,6 @@ function vim.fn.debugbreak(pid) end
 --- {noref} set to 1 will fail.
 --- Also see |copy()|.
 ---
---- Can also be used as a |method|: >vim
----   GetObject()->deepcopy()
---- <
----
 --- @param expr any
 --- @param noref? any
 --- @return any
@@ -1521,10 +1315,6 @@ function vim.fn.deepcopy(expr, noref) end
 --- operation was successful and -1/true when the deletion failed
 --- or partly failed.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->delete()
---- <
----
 --- @param fname integer
 --- @param flags? string
 --- @return integer
@@ -1543,10 +1333,6 @@ function vim.fn.delete(fname, flags) end
 --- when using |line()| this refers to the current buffer. Use "$"
 --- to refer to the last line in buffer {buf}.
 ---
---- Can also be used as a |method|: >vim
----   GetBuffer()->deletebufline(1)
---- <
----
 --- @param buf any
 --- @param first any
 --- @param last? any
@@ -1630,10 +1416,6 @@ function vim.fn.did_filetype() end
 --- line, "'m" mark m, etc.
 --- Returns 0 if the current window is not in diff mode.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->diff_filler()
---- <
----
 --- @param lnum integer
 --- @return any
 function vim.fn.diff_filler(lnum) end
@@ -1648,10 +1430,6 @@ function vim.fn.diff_filler(lnum) end
 --- The highlight ID can be used with |synIDattr()| to obtain
 --- syntax information about the highlighting.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->diff_hlID(col)
---- <
----
 --- @param lnum integer
 --- @param col integer
 --- @return any
@@ -1672,9 +1450,6 @@ function vim.fn.diff_hlID(lnum, col) end
 --- call digraph_set('aa', 'あ')
 --- echo digraph_get('aa')    " Returns 'あ'
 --- <
---- Can also be used as a |method|: >vim
----   GetChars()->digraph_get()
---- <
 ---
 --- @param chars any
 --- @return any
@@ -1693,9 +1468,6 @@ function vim.fn.digraph_get(chars) end
 --- " Get all the digraphs, including default digraphs
 --- echo digraph_getlist(1)
 --- <
---- Can also be used as a |method|: >vim
----   GetNumber()->digraph_getlist()
---- <
 ---
 --- @param listall? any
 --- @return any
@@ -1756,10 +1528,6 @@ function vim.fn.digraph_setlist(digraphlist) end
 --- - |v:false| and |v:null| are empty, |v:true| is not.
 --- - A |Blob| is empty when its length is zero.
 ---
---- Can also be used as a |method|: >vim
----   mylist->empty()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.empty(expr) end
@@ -1782,10 +1550,6 @@ function vim.fn.environ() end
 ---   c:\\program\ files\\vim
 --- <Also see |shellescape()| and |fnameescape()|.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->escape(' \')
---- <
----
 --- @param string string
 --- @param chars any
 --- @return any
@@ -1797,10 +1561,6 @@ function vim.fn.escape(string, chars) end
 --- of them.  Also works for |Funcref|s that refer to existing
 --- functions.
 ---
---- Can also be used as a |method|: >vim
----   argv->join()->eval()
---- <
----
 --- @param string string
 --- @return any
 function vim.fn.eval(string) end
@@ -1835,10 +1595,6 @@ function vim.fn.eventhandler() end
 ---   -1  not implemented on this system
 --- |exepath()| can be used to get the full path of an executable.
 ---
---- Can also be used as a |method|: >vim
----   GetCommand()->executable()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.executable(expr) end
@@ -1870,10 +1626,6 @@ function vim.fn.executable(expr) end
 --- To execute a command in another window than the current one
 --- use `win_execute()`.
 ---
---- Can also be used as a |method|: >vim
----   GetCommand()->execute()
---- <
----
 --- @param command any
 --- @param silent? boolean
 --- @return any
@@ -1884,10 +1636,6 @@ function vim.fn.execute(command, silent) end
 --- Returns empty string otherwise.
 --- If {expr} starts with "./" the |current-directory| is used.
 ---
---- Can also be used as a |method|: >vim
----   GetCommand()->exepath()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.exepath(expr) end
@@ -1979,10 +1727,6 @@ function vim.fn.exepath(expr) end
 --- <This doesn't check for existence of the "bufcount" variable,
 --- but gets the value of "bufcount", and checks if that exists.
 ---
---- Can also be used as a |method|: >vim
----   Varname()->exists()
---- <
----
 --- @param expr any
 --- @return 0|1
 function vim.fn.exists(expr) end
@@ -1997,10 +1741,6 @@ function vim.fn.exists(expr) end
 ---   echo exp(-1)
 --- <  0.367879
 ---
---- Can also be used as a |method|: >vim
----   Compute()->exp()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.exp(expr) end
@@ -2095,10 +1835,6 @@ function vim.fn.exp(expr) end
 --- See |glob()| for finding existing files.  See |system()| for
 --- getting the raw output of an external command.
 ---
---- Can also be used as a |method|: >vim
----   Getpattern()->expand()
---- <
----
 --- @param string string
 --- @param nosuf? boolean
 --- @param list? any
@@ -2127,9 +1863,6 @@ function vim.fn.expand(string, nosuf, list) end
 --- < >vim
 ---   echo expandcmd('make %<.o', {'errmsg': v:true})
 --- <
---- Can also be used as a |method|: >vim
----   GetCommand()->expandcmd()
---- <
 ---
 --- @param string string
 --- @param options? table
@@ -2171,10 +1904,6 @@ function vim.fn.expandcmd(string, options) end
 --- fails.
 --- Returns {expr1}.  Returns 0 on error.
 ---
---- Can also be used as a |method|: >vim
----   mylist->extend(otherlist)
---- <
----
 --- @param expr1 any
 --- @param expr2 any
 --- @param expr3? any
@@ -2235,10 +1964,6 @@ function vim.fn.extendnew(expr1, expr2, expr3) end
 ---
 --- Return value is always 0.
 ---
---- Can also be used as a |method|: >vim
----   GetInput()->feedkeys()
---- <
----
 --- @param string string
 --- @param mode? string
 --- @return any
@@ -2267,10 +1992,6 @@ function vim.fn.file_readable(file) end
 ---   1
 --- <
 ---
---- Can also be used as a |method|: >vim
----   GetName()->filereadable()
---- <
----
 --- @param file string
 --- @return 0|1
 function vim.fn.filereadable(file) end
@@ -2280,10 +2001,6 @@ function vim.fn.filereadable(file) end
 --- exist, or is not writable, the result is 0.  If {file} is a
 --- directory, and we can write to it, the result is 2.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->filewritable()
---- <
----
 --- @param file string
 --- @return 0|1
 function vim.fn.filewritable(file) end
@@ -2337,10 +2054,6 @@ function vim.fn.filewritable(file) end
 --- {expr2} is a Funcref errors inside a function are ignored,
 --- unless it was defined with the "abort" flag.
 ---
---- Can also be used as a |method|: >vim
----   mylist->filter(expr2)
---- <
----
 --- @param expr1 any
 --- @param expr2 any
 --- @return any
@@ -2363,10 +2076,6 @@ function vim.fn.filter(expr1, expr2) end
 ---
 --- This is quite similar to the ex-command `:find`.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->finddir()
---- <
----
 --- @param name string
 --- @param path? string
 --- @param count? any
@@ -2380,10 +2089,6 @@ function vim.fn.finddir(name, path, count) end
 --- <Searches from the directory of the current file upwards until
 --- it finds the file "tags.vim".
 ---
---- Can also be used as a |method|: >vim
----   GetName()->findfile()
---- <
----
 --- @param name string
 --- @param path? string
 --- @param count? any
@@ -2408,10 +2113,6 @@ function vim.fn.findfile(name, path, count) end
 ---   echo flatten([1, [2, [3, 4]], 5], 1)
 --- <  [1, 2, [3, 4], 5]
 ---
---- Can also be used as a |method|: >vim
----   mylist->flatten()
---- <
----
 --- @param list any
 --- @param maxdepth? any
 --- @return any[]|0
@@ -2445,10 +2146,6 @@ function vim.fn.flattennew(list, maxdepth) end
 ---   echo float2nr(1.0e-100)
 --- <  0
 ---
---- Can also be used as a |method|: >vim
----   Compute()->float2nr()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.float2nr(expr) end
@@ -2465,10 +2162,6 @@ function vim.fn.float2nr(expr) end
 ---   echo floor(4.0)
 --- <  4.0
 ---
---- Can also be used as a |method|: >vim
----   Compute()->floor()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.floor(expr) end
@@ -2488,10 +2181,6 @@ function vim.fn.floor(expr) end
 ---   echo fmod(-12.33, 1.22)
 --- <  -0.13
 ---
---- Can also be used as a |method|: >vim
----   Compute()->fmod(1.22)
---- <
----
 --- @param expr1 any
 --- @param expr2 any
 --- @return any
@@ -2512,9 +2201,6 @@ function vim.fn.fmod(expr1, expr2) end
 --- <results in executing: >vim
 ---   edit \+some\ str\%nge\|name
 --- <
---- Can also be used as a |method|: >vim
----   GetName()->fnameescape()
---- <
 ---
 --- @param string string
 --- @return string
@@ -2536,10 +2222,6 @@ function vim.fn.fnameescape(string) end
 --- Note: Environment variables don't work in {fname}, use
 --- |expand()| first then.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->fnamemodify(':p:h')
---- <
----
 --- @param fname integer
 --- @param mods string
 --- @return string
@@ -2551,10 +2233,6 @@ function vim.fn.fnamemodify(fname, mods) end
 --- {lnum} is used like with |getline()|.  Thus "." is the current
 --- line, "'m" mark m, etc.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->foldclosed()
---- <
----
 --- @param lnum integer
 --- @return integer
 function vim.fn.foldclosed(lnum) end
@@ -2565,10 +2243,6 @@ function vim.fn.foldclosed(lnum) end
 --- {lnum} is used like with |getline()|.  Thus "." is the current
 --- line, "'m" mark m, etc.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->foldclosedend()
---- <
----
 --- @param lnum integer
 --- @return integer
 function vim.fn.foldclosedend(lnum) end
@@ -2584,10 +2258,6 @@ function vim.fn.foldclosedend(lnum) end
 --- {lnum} is used like with |getline()|.  Thus "." is the current
 --- line, "'m" mark m, etc.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->foldlevel()
---- <
----
 --- @param lnum integer
 --- @return integer
 function vim.fn.foldlevel(lnum) end
@@ -2619,10 +2289,6 @@ function vim.fn.foldtext() end
 --- line, "'m" mark m, etc.
 --- Useful when exporting folded text, e.g., to HTML.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->foldtextresult()
---- <
----
 --- @param lnum integer
 --- @return string
 function vim.fn.foldtextresult(lnum) end
@@ -2638,10 +2304,6 @@ function vim.fn.foldtextresult(lnum) end
 --- For example `fullcommand('s')`, `fullcommand('sub')`,
 --- `fullcommand(':%substitute')` all return "substitute".
 ---
---- Can also be used as a |method|: >vim
----   GetName()->fullcommand()
---- <
----
 --- @param name string
 --- @return string
 function vim.fn.fullcommand(name) end
@@ -2657,10 +2319,6 @@ function vim.fn.fullcommand(name) end
 --- instead). {name} cannot be a builtin function.
 --- Returns 0 on error.
 ---
---- Can also be used as a |method|: >vim
----   GetFuncname()->funcref([arg])
---- <
----
 --- @param name string
 --- @param arglist? any
 --- @param dict? any
@@ -2748,10 +2406,6 @@ function vim.fn.funcref(name, arglist, dict) end
 --- <
 --- Returns 0 on error.
 ---
---- Can also be used as a |method|: >vim
----   GetFuncname()->function([arg])
---- <
----
 --- @param name string
 --- @param arglist? any
 --- @param dict? any
@@ -2784,9 +2438,6 @@ function vim.fn.garbagecollect(atexit) end
 --- Get item {idx} from |List| {list}.  When this item is not
 --- available return {default}.  Return zero when {default} is
 --- omitted.
---- Can also be used as a |method|: >vim
----   mylist->get(idx)
---- <
 ---
 --- @param list any[]
 --- @param idx integer
@@ -2898,9 +2549,6 @@ function vim.fn.getbufinfo(buf) end
 --- To get buffer-local options use: >vim
 ---   getbufvar({bufnr}, '&option_name')
 --- <
---- Can also be used as a |method|: >vim
----   GetBufnr()->getbufinfo()
---- <
 ---
 --- @param dict? table<string,any>
 --- @return any
@@ -2930,10 +2578,6 @@ function vim.fn.getbufinfo(dict) end
 --- Example: >vim
 ---   let lines = getbufline(bufnr("myfile"), 1, "$")
 ---
---- <Can also be used as a |method|: >vim
----   GetBufnr()->getbufline(lnum)
---- <
----
 --- @param buf any
 --- @param lnum integer
 --- @param end_? integer
@@ -2968,10 +2612,6 @@ function vim.fn.getbufoneline(buf, lnum) end
 ---   let bufmodified = getbufvar(1, "&mod")
 ---   echo "todo myvar = " .. getbufvar("todo", "myvar")
 ---
---- <Can also be used as a |method|: >vim
----   GetBufnr()->getbufvar(varname)
---- <
----
 --- @param buf any
 --- @param varname string
 --- @param def? any
@@ -3001,10 +2641,6 @@ function vim.fn.getcellwidths() end
 --- position refers to the position in the list. For other
 --- buffers, it is set to the length of the list.
 ---
---- Can also be used as a |method|: >vim
----   GetBufnr()->getchangelist()
---- <
----
 --- @param buf? integer|string
 --- @return table[]
 function vim.fn.getchangelist(buf) end
@@ -3106,9 +2742,6 @@ function vim.fn.getcharmod() end
 ---   getcharpos('.')    returns [0, 5, 3, 0]
 ---   getpos('.')    returns [0, 5, 7, 0]
 --- <
---- Can also be used as a |method|: >vim
----   GetMark()->getcharpos()
---- <
 ---
 --- @param expr any
 --- @return integer[]
@@ -3286,10 +2919,6 @@ function vim.fn.getcmdwintype() end
 --- If there are no matches, an empty list is returned.  An
 --- invalid value for {type} produces an error.
 ---
---- Can also be used as a |method|: >vim
----   GetPattern()->getcompletion('color')
---- <
----
 --- @param pat any
 --- @param type any
 --- @param filtered? any
@@ -3320,10 +2949,6 @@ function vim.fn.getcompletion(pat, type, filtered) end
 --- <Note that this only works within the window.  See
 --- |winrestview()| for restoring more state.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->getcurpos()
---- <
----
 --- @param winid? integer
 --- @return any
 function vim.fn.getcurpos(winid) end
@@ -3336,9 +2961,6 @@ function vim.fn.getcurpos(winid) end
 ---   getcursorcharpos()  " returns [0, 3, 2, 0, 3]
 ---   getcurpos()    " returns [0, 3, 4, 0, 3]
 --- <
---- Can also be used as a |method|: >vim
----   GetWinid()->getcursorcharpos()
---- <
 ---
 --- @param winid? integer
 --- @return any
@@ -3359,10 +2981,6 @@ function vim.fn.getcursorcharpos(winid) end
 --- directory is returned.
 --- Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 ---
---- Can also be used as a |method|: >vim
----   GetWinnr()->getcwd()
---- <
----
 --- @param winnr? integer
 --- @param tabnr? integer
 --- @return string
@@ -3376,10 +2994,6 @@ function vim.fn.getcwd(winnr, tabnr) end
 --- is different from a variable set to an empty string.
 --- See also |expr-env|.
 ---
---- Can also be used as a |method|: >vim
----   GetVarname()->getenv()
---- <
----
 --- @param name string
 --- @return string
 function vim.fn.getenv(name) end
@@ -3413,9 +3027,6 @@ function vim.fn.getfontname(name) end
 --- <This will hopefully (from a security point of view) display
 --- the string "rw-r--r--" or even "rw-------".
 ---
---- Can also be used as a |method|: >vim
----   GetFilename()->getfperm()
---- <
 --- For setting permissions use |setfperm()|.
 ---
 --- @param fname integer
@@ -3429,10 +3040,6 @@ function vim.fn.getfperm(fname) end
 --- If the size of {fname} is too big to fit in a Number then -2
 --- is returned.
 ---
---- Can also be used as a |method|: >vim
----   GetFilename()->getfsize()
---- <
----
 --- @param fname integer
 --- @return integer
 function vim.fn.getfsize(fname) end
@@ -3443,10 +3050,6 @@ function vim.fn.getfsize(fname) end
 --- |localtime()| and |strftime()|.
 --- If the file {fname} can't be found -1 is returned.
 ---
---- Can also be used as a |method|: >vim
----   GetFilename()->getftime()
---- <
----
 --- @param fname integer
 --- @return integer
 function vim.fn.getftime(fname) end
@@ -3470,10 +3073,6 @@ function vim.fn.getftime(fname) end
 --- systems that support it.  On some systems only "dir" and
 --- "file" are returned.
 ---
---- Can also be used as a |method|: >vim
----   GetFilename()->getftype()
---- <
----
 --- @param fname integer
 --- @return 'file'|'dir'|'link'|'bdev'|'cdev'|'socket'|'fifo'|'other'
 function vim.fn.getftype(fname) end
@@ -3497,10 +3096,6 @@ function vim.fn.getftype(fname) end
 ---   filename  filename if available
 ---   lnum    line number
 ---
---- Can also be used as a |method|: >vim
----   GetWinnr()->getjumplist()
---- <
----
 --- @param winnr? integer
 --- @param tabnr? integer
 --- @return any
@@ -3527,9 +3122,6 @@ function vim.fn.getjumplist(winnr, tabnr) end
 ---   let end = search("^$") - 1
 ---   let lines = getline(start, end)
 ---
---- <Can also be used as a |method|: >vim
----   ComputeLnum()->getline()
----
 --- <To get lines from another buffer see |getbufline()| and
 --- |getbufoneline()|
 ---
@@ -3592,10 +3184,6 @@ function vim.fn.getloclist(nr, what) end
 --- Refer to |getpos()| for getting information about a specific
 --- mark.
 ---
---- Can also be used as a |method|: >vim
----   GetBufnr()->getmarklist()
---- <
----
 --- @param buf? any
 --- @return any
 function vim.fn.getmarklist(buf) end
@@ -3700,10 +3288,6 @@ function vim.fn.getpid() end
 ---   call setpos("'a", save_a_mark)
 --- <Also see |getcharpos()|, |getcurpos()| and |setpos()|.
 ---
---- Can also be used as a |method|: >vim
----   GetMark()->getpos()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.getpos(expr) end
@@ -3834,10 +3418,6 @@ function vim.fn.getqflist(what) end
 ---
 --- If {regname} is not specified, |v:register| is used.
 ---
---- Can also be used as a |method|: >vim
----   GetRegname()->getreg()
---- <
----
 --- @param regname? string
 --- @param list? any
 --- @return string|string[]
@@ -3866,10 +3446,6 @@ function vim.fn.getreg(regname, list) end
 --- If {regname} is not specified, |v:register| is used.
 --- The returned Dictionary can be passed to |setreg()|.
 ---
---- Can also be used as a |method|: >vim
----   GetRegname()->getreginfo()
---- <
----
 --- @param regname? string
 --- @return table
 function vim.fn.getreginfo(regname) end
@@ -3884,10 +3460,6 @@ function vim.fn.getreginfo(regname) end
 --- The {regname} argument is a string.  If {regname} is not
 --- specified, |v:register| is used.
 ---
---- Can also be used as a |method|: >vim
----   GetRegname()->getregtype()
---- <
----
 --- @param regname? string
 --- @return string
 function vim.fn.getregtype(regname) end
@@ -3944,10 +3516,6 @@ function vim.fn.getscriptinfo(opts) end
 ---       tabpage-local variables
 ---   windows    List of |window-ID|s in the tab page.
 ---
---- Can also be used as a |method|: >vim
----   GetTabnr()->gettabinfo()
---- <
----
 --- @param tabnr? integer
 --- @return any
 function vim.fn.gettabinfo(tabnr) end
@@ -3961,10 +3529,6 @@ function vim.fn.gettabinfo(tabnr) end
 --- When the tab or variable doesn't exist {def} or an empty
 --- string is returned, there is no error message.
 ---
---- Can also be used as a |method|: >vim
----   GetTabnr()->gettabvar(varname)
---- <
----
 --- @param tabnr integer
 --- @param varname string
 --- @param def? any
@@ -3996,9 +3560,6 @@ function vim.fn.gettabvar(tabnr, varname, def) end
 --- To obtain all window-local variables use: >vim
 ---   gettabwinvar({tabnr}, {winnr}, '&')
 --- <
---- Can also be used as a |method|: >vim
----   GetTabnr()->gettabwinvar(winnr, varname)
---- <
 ---
 --- @param tabnr integer
 --- @param winnr integer
@@ -4034,10 +3595,6 @@ function vim.fn.gettabwinvar(tabnr, winnr, varname, def) end
 ---
 --- See |tagstack| for more information about the tag stack.
 ---
---- Can also be used as a |method|: >vim
----   GetWinnr()->gettagstack()
---- <
----
 --- @param winnr? integer
 --- @return any
 function vim.fn.gettagstack(winnr) end
@@ -4089,10 +3646,6 @@ function vim.fn.gettext(text) end
 ---   winrow    topmost screen line of the window;
 ---       "row" from |win_screenpos()|
 ---
---- Can also be used as a |method|: >vim
----   GetWinnr()->getwininfo()
---- <
----
 --- @param winid? integer
 --- @return any
 function vim.fn.getwininfo(winid) end
@@ -4116,9 +3669,6 @@ function vim.fn.getwininfo(winid) end
 ---     " Do some work here
 ---   endwhile
 --- <
---- Can also be used as a |method|: >vim
----   GetTimeout()->getwinpos()
---- <
 ---
 --- @param timeout? integer
 --- @return any
@@ -4145,10 +3695,6 @@ function vim.fn.getwinposy() end
 ---   let list_is_on = getwinvar(2, '&list')
 ---   echo "myvar = " .. getwinvar(1, 'myvar')
 ---
---- <Can also be used as a |method|: >vim
----   GetWinnr()->getwinvar(varname)
---- <
----
 --- @param winnr integer
 --- @param varname string
 --- @param def? any
@@ -4190,10 +3736,6 @@ function vim.fn.getwinvar(winnr, varname, def) end
 --- See |expand()| for expanding special Vim variables.  See
 --- |system()| for getting the raw output of an external command.
 ---
---- Can also be used as a |method|: >vim
----   GetExpr()->glob()
---- <
----
 --- @param expr any
 --- @param nosuf? boolean
 --- @param list? any
@@ -4216,10 +3758,6 @@ function vim.fn.glob(expr, nosuf, list, alllinks) end
 --- Note that the result depends on the system.  On MS-Windows
 --- a backslash usually means a path separator.
 ---
---- Can also be used as a |method|: >vim
----   GetExpr()->glob2regpat()
---- <
----
 --- @param string string
 --- @return any
 function vim.fn.glob2regpat(string) end
@@ -4258,11 +3796,6 @@ function vim.fn.glob2regpat(string) end
 --- <Upwards search and limiting the depth of "**" is not
 --- supported, thus using 'path' will not always work properly.
 ---
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetExpr()->globpath(&rtp)
---- <
----
 --- @param path string
 --- @param expr any
 --- @param nosuf? boolean
@@ -4346,10 +3879,6 @@ function vim.fn.has(feature) end
 --- has an entry with key {key}.  FALSE otherwise. The {key}
 --- argument is a string.
 ---
---- Can also be used as a |method|: >vim
----   mydict->has_key(key)
---- <
----
 --- @param dict any
 --- @param key any
 --- @return 0|1
@@ -4371,10 +3900,6 @@ function vim.fn.has_key(dict, key) end
 --- If {winnr} is -1 it is ignored, only the tab is resolved.
 --- Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 ---
---- Can also be used as a |method|: >vim
----   GetWinnr()->haslocaldir()
---- <
----
 --- @param winnr? integer
 --- @param tabnr? integer
 --- @return 0|1
@@ -4410,10 +3935,6 @@ function vim.fn.haslocaldir(winnr, tabnr) end
 --- <This installs the mapping to "\ABCdoit" only if there isn't
 --- already a mapping to "\ABCdoit".
 ---
---- Can also be used as a |method|: >vim
----   GetRHS()->hasmapto()
---- <
----
 --- @param what any
 --- @param mode? string
 --- @param abbr? any
@@ -4454,11 +3975,6 @@ function vim.fn.highlight_exists(name) end
 ---   let date=input("Enter date: ")
 --- <This function is not available in the |sandbox|.
 ---
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetHistory()->histadd('search')
---- <
----
 --- @param history any
 --- @param item any
 --- @return 0|1
@@ -4495,9 +4011,6 @@ function vim.fn.histadd(history, item) end
 ---   call histdel("search", -1)
 ---   let \@/ = histget("search", -1)
 --- <
---- Can also be used as a |method|: >vim
----   GetHistory()->histdel()
---- <
 ---
 --- @param history any
 --- @param item? any
@@ -4518,9 +4031,6 @@ function vim.fn.histdel(history, item) end
 --- the {num}th entry from the output of |:history|. >vim
 ---   command -nargs=1 H execute histget("cmd", 0+<args>)
 --- <
---- Can also be used as a |method|: >vim
----   GetHistory()->histget()
---- <
 ---
 --- @param history any
 --- @param index? any
@@ -4534,10 +4044,6 @@ function vim.fn.histget(history, index) end
 --- Example: >vim
 ---   let inp_index = histnr("expr")
 ---
---- <Can also be used as a |method|: >vim
----   GetHistory()->histnr()
---- <
----
 --- @param history any
 --- @return integer
 function vim.fn.histnr(history) end
@@ -4550,9 +4056,6 @@ function vim.fn.histnr(history) end
 --- "Comment" group: >vim
 ---   echo synIDattr(synIDtrans(hlID("Comment")), "bg")
 --- <
---- Can also be used as a |method|: >vim
----   GetName()->hlID()
---- <
 ---
 --- @param name string
 --- @return integer
@@ -4564,10 +4067,6 @@ function vim.fn.hlID(name) end
 --- been defined for it, it may also have been used for a syntax
 --- item.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->hlexists()
---- <
----
 --- @param name string
 --- @return 0|1
 function vim.fn.hlexists(name) end
@@ -4590,10 +4089,6 @@ function vim.fn.hostname() end
 --- from/to UCS-2 is automatically changed to use UTF-8.  You
 --- cannot use UCS-2 in a string anyway, because of the NUL bytes.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->iconv('latin1', 'utf-8')
---- <
----
 --- @param string string
 --- @param from any
 --- @param to any
@@ -4622,12 +4117,8 @@ function vim.fn.id(expr) end
 
 --- current buffer.  The indent is counted in spaces, the value
 --- of 'tabstop' is relevant.  {lnum} is used just like in
---- |getline()|.
---- When {lnum} is invalid -1 is returned.
----
---- Can also be used as a |method|: >vim
----   GetLnum()->indent()
---- <
+--- |getline()|.
+--- When {lnum} is invalid -1 is returned.
 ---
 --- @param lnum integer
 --- @return integer
@@ -4659,10 +4150,6 @@ function vim.fn.indent(lnum) end
 ---     " ...
 ---   endif
 ---
---- <Can also be used as a |method|: >vim
----   GetObject()->index(what)
---- <
----
 --- @param object any
 --- @param expr any
 --- @param start? any
@@ -4707,10 +4194,6 @@ function vim.fn.index(object, expr, start, ic) end
 ---   echo indexof(l, {i, v -> v.n == 30})
 ---   echo indexof(l, "v:val.n == 20", #{startidx: 1})
 ---
---- <Can also be used as a |method|: >vim
----   mylist->indexof(expr)
---- <
----
 --- @param object any
 --- @param expr any
 --- @param opts? table
@@ -4833,10 +4316,6 @@ function vim.fn.input(prompt, text, completion) end
 ---     call inputrestore()
 ---   endfunction
 ---
---- <Can also be used as a |method|: >vim
----   GetPrompt()->input()
---- <
----
 --- @param opts table
 --- @return any
 function vim.fn.input(opts) end
@@ -4864,10 +4343,6 @@ function vim.fn.inputdialog(...) end
 ---   let color = inputlist(['Select color:', '1. red',
 ---     \ '2. green', '3. blue'])
 ---
---- <Can also be used as a |method|: >vim
----   GetChoices()->inputlist()
---- <
----
 --- @param textlist any
 --- @return any
 function vim.fn.inputlist(textlist) end
@@ -4900,10 +4375,6 @@ function vim.fn.inputsave() end
 --- typed on the command-line in response to the issued prompt.
 --- NOTE: Command-line completion is not supported.
 ---
---- Can also be used as a |method|: >vim
----   GetPrompt()->inputsecret()
---- <
----
 --- @param prompt any
 --- @param text? any
 --- @return any
@@ -4925,10 +4396,6 @@ function vim.fn.inputsecret(prompt, text) end
 --- Note that when {item} is a |List| it is inserted as a single
 --- item.  Use |extend()| to concatenate |Lists|.
 ---
---- Can also be used as a |method|: >vim
----   mylist->insert(item)
---- <
----
 --- @param object any
 --- @param item any
 --- @param idx? integer
@@ -4952,11 +4419,6 @@ function vim.fn.insert(object, item, idx) end
 function vim.fn.interrupt() end
 
 --- Bitwise invert.  The argument is converted to a number.  A
---- List, Dict or Float argument causes an error.  Example: >vim
----   let bits = invert(bits)
---- <Can also be used as a |method|: >vim
----   let bits = bits->invert()
---- <
 ---
 --- @param expr any
 --- @return any
@@ -4967,10 +4429,6 @@ function vim.fn.invert(expr) end
 --- exist, or isn't a directory, the result is |FALSE|.  {directory}
 --- is any expression, which is used as a String.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->isdirectory()
---- <
----
 --- @param directory any
 --- @return 0|1
 function vim.fn.isdirectory(directory) end
@@ -4982,10 +4440,6 @@ function vim.fn.isdirectory(directory) end
 ---   echo isinf(-1.0 / 0.0)
 --- <  -1
 ---
---- Can also be used as a |method|: >vim
----   Compute()->isinf()
---- <
----
 --- @param expr any
 --- @return 1|0|-1
 function vim.fn.isinf(expr) end
@@ -5003,10 +4457,6 @@ function vim.fn.isinf(expr) end
 --- <When {expr} is a variable that does not exist you get an error
 --- message.  Use |exists()| to check for existence.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->islocked()
---- <
----
 --- @param expr any
 --- @return 0|1
 function vim.fn.islocked(expr) end
@@ -5015,10 +4465,6 @@ function vim.fn.islocked(expr) end
 ---   echo isnan(0.0 / 0.0)
 --- <  1
 ---
---- Can also be used as a |method|: >vim
----   Compute()->isnan()
---- <
----
 --- @param expr any
 --- @return 0|1
 function vim.fn.isnan(expr) end
@@ -5032,10 +4478,6 @@ function vim.fn.isnan(expr) end
 ---      echo key .. ': ' .. value
 ---   endfor
 ---
---- <Can also be used as a |method|: >vim
----   mydict->items()
---- <
----
 --- @param dict any
 --- @return any
 function vim.fn.items(dict) end
@@ -5208,10 +4650,6 @@ function vim.fn.jobwait(jobs, timeout) end
 --- converted into a string like with |string()|.
 --- The opposite function is |split()|.
 ---
---- Can also be used as a |method|: >vim
----   mylist->join()
---- <
----
 --- @param list any
 --- @param sep? any
 --- @return any
@@ -5232,10 +4670,6 @@ function vim.fn.join(list, sep) end
 --- recommended and the only one required to be supported.
 --- Non-UTF-8 characters are an error.
 ---
---- Can also be used as a |method|: >vim
----   ReadObject()->json_decode()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.json_decode(expr) end
@@ -5251,10 +4685,6 @@ function vim.fn.json_decode(expr) end
 --- or special escapes like "\t", other are dumped as-is.
 --- |Blob|s are converted to arrays of the individual bytes.
 ---
---- Can also be used as a |method|: >vim
----   GetObject()->json_encode()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.json_encode(expr) end
@@ -5262,10 +4692,6 @@ function vim.fn.json_encode(expr) end
 --- Return a |List| with all the keys of {dict}.  The |List| is in
 --- arbitrary order.  Also see |items()| and |values()|.
 ---
---- Can also be used as a |method|: >vim
----   mydict->keys()
---- <
----
 --- @param dict any
 --- @return any
 function vim.fn.keys(dict) end
@@ -5276,10 +4702,6 @@ function vim.fn.keys(dict) end
 ---   echo keytrans(xx)
 --- <  <C-Home>
 ---
---- Can also be used as a |method|: >vim
----   "\<C-Home>"->keytrans()
---- <
----
 --- @param string string
 --- @return any
 function vim.fn.keytrans(string) end
@@ -5299,10 +4721,6 @@ function vim.fn.last_buffer_nr() end
 --- |Dictionary| is returned.
 --- Otherwise an error is given and returns zero.
 ---
---- Can also be used as a |method|: >vim
----   mylist->len()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.len(expr) end
@@ -5348,11 +4766,6 @@ function vim.fn.len(expr) end
 --- Examples: >vim
 ---   echo libcall("libc.so", "getenv", "HOME")
 ---
---- <Can also be used as a |method|, the base is passed as the
---- third argument: >vim
----   GetValue()->libcall("libc.so", "getenv")
---- <
----
 --- @param libname string
 --- @param funcname string
 --- @param argument any
@@ -5366,10 +4779,6 @@ function vim.fn.libcall(libname, funcname, argument) end
 ---   call libcallnr("libc.so", "printf", "Hello World!\n")
 ---   call libcallnr("libc.so", "sleep", 10)
 --- <
---- Can also be used as a |method|, the base is passed as the
---- third argument: >vim
----   GetValue()->libcallnr("libc.so", "printf")
---- <
 ---
 --- @param libname string
 --- @param funcname string
@@ -5408,10 +4817,6 @@ function vim.fn.libcallnr(libname, funcname, argument) end
 --- To jump to the last known position when opening a file see
 --- |last-position-jump|.
 ---
---- Can also be used as a |method|: >vim
----   GetValue()->line()
---- <
----
 --- @param expr any
 --- @param winid? integer
 --- @return integer
@@ -5429,10 +4834,6 @@ function vim.fn.line(expr, winid) end
 --- |getline()|.  When {lnum} is invalid -1 is returned.
 --- Also see |byte2line()|, |go| and |:goto|.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->line2byte()
---- <
----
 --- @param lnum integer
 --- @return integer
 function vim.fn.line2byte(lnum) end
@@ -5443,10 +4844,6 @@ function vim.fn.line2byte(lnum) end
 --- relevant.  {lnum} is used just like in |getline()|.
 --- When {lnum} is invalid, -1 is returned.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->lispindent()
---- <
----
 --- @param lnum integer
 --- @return any
 function vim.fn.lispindent(lnum) end
@@ -5460,10 +4857,6 @@ function vim.fn.lispindent(lnum) end
 ---
 --- |blob2list()| does the opposite.
 ---
---- Can also be used as a |method|: >vim
----   GetList()->list2blob()
---- <
----
 --- @param list any
 --- @return any
 function vim.fn.list2blob(list) end
@@ -5483,10 +4876,6 @@ function vim.fn.list2blob(list) end
 --- <
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   GetList()->list2str()
---- <
----
 --- @param list any
 --- @param utf8? any
 --- @return any
@@ -5508,10 +4897,6 @@ function vim.fn.localtime() end
 ---   echo log(exp(5))
 --- <  5.0
 ---
---- Can also be used as a |method|: >vim
----   Compute()->log()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.log(expr) end
@@ -5525,10 +4910,6 @@ function vim.fn.log(expr) end
 ---   echo log10(0.01)
 --- <  -2.0
 ---
---- Can also be used as a |method|: >vim
----   Compute()->log10()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.log10(expr) end
@@ -5579,10 +4960,6 @@ function vim.fn.log10(expr) end
 --- {expr2} is a Funcref errors inside a function are ignored,
 --- unless it was defined with the "abort" flag.
 ---
---- Can also be used as a |method|: >vim
----   mylist->map(expr2)
---- <
----
 --- @param expr1 any
 --- @param expr2 any
 --- @return any
@@ -5651,10 +5028,6 @@ function vim.fn.map(expr1, expr2) end
 --- mapped, and have it do the original mapping too.  Sketch: >vim
 ---   exe 'nnoremap <Tab> ==' .. maparg('<Tab>', 'n')
 ---
---- <Can also be used as a |method|: >vim
----   GetKey()->maparg('n')
---- <
----
 --- @param name string
 --- @param mode? string
 --- @param abbr? boolean
@@ -5694,10 +5067,6 @@ function vim.fn.maparg(name, mode, abbr, dict) end
 --- <This avoids adding the "_vv" mapping when there already is a
 --- mapping for "_v" or for "_vvv".
 ---
---- Can also be used as a |method|: >vim
----   GetKey()->mapcheck('n')
---- <
----
 --- @param name string
 --- @param mode? string
 --- @param abbr? any
@@ -5785,11 +5154,6 @@ function vim.fn.mapset(mode, abbr, dict) end
 --- zero matches at the start instead of a number of matches
 --- further down in the text.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->match('word')
----   GetList()->match('word')
---- <
----
 --- @param expr any
 --- @param pat any
 --- @param start? any
@@ -5854,10 +5218,6 @@ function vim.fn.match(expr, pat, start, count) end
 --- available from |getmatches()|.  All matches can be deleted in
 --- one operation by |clearmatches()|.
 ---
---- Can also be used as a |method|: >vim
----   GetGroup()->matchadd('TODO')
---- <
----
 --- @param group any
 --- @param pattern any
 --- @param priority? any
@@ -5902,10 +5262,6 @@ function vim.fn.matchadd(group, pattern, priority, id, dict) end
 --- <Matches added by |matchaddpos()| are returned by
 --- |getmatches()|.
 ---
---- Can also be used as a |method|: >vim
----   GetGroup()->matchaddpos([23, 11])
---- <
----
 --- @param group any
 --- @param pos any
 --- @param priority? any
@@ -5925,10 +5281,6 @@ function vim.fn.matchaddpos(group, pos, priority, id, dict) end
 --- Highlighting matches using the |:match| commands are limited
 --- to three matches. |matchadd()| does not have this limitation.
 ---
---- Can also be used as a |method|: >vim
----   GetMatch()->matcharg()
---- <
----
 --- @param nr integer
 --- @return any
 function vim.fn.matcharg(nr) end
@@ -5940,10 +5292,6 @@ function vim.fn.matcharg(nr) end
 --- If {win} is specified, use the window with this number or
 --- window ID instead of the current window.
 ---
---- Can also be used as a |method|: >vim
----   GetMatch()->matchdelete()
---- <
----
 --- @param id any
 --- @param win? any
 --- @return any
@@ -5967,10 +5315,6 @@ function vim.fn.matchdelete(id, win) end
 --- <result is "-1".
 --- When {expr} is a |List| the result is equal to |match()|.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->matchend('word')
---- <
----
 --- @param expr any
 --- @param pat any
 --- @param start? any
@@ -6084,10 +5428,6 @@ function vim.fn.matchfuzzypos(list, str, dict) end
 ---
 --- You can pass in a List, but that is not very useful.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->matchlist('word')
---- <
----
 --- @param expr any
 --- @param pat any
 --- @param start? any
@@ -6107,10 +5447,6 @@ function vim.fn.matchlist(expr, pat, start, count) end
 --- When {expr} is a |List| then the matching item is returned.
 --- The type isn't changed, it's not necessarily a String.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->matchstr('word')
---- <
----
 --- @param expr any
 --- @param pat any
 --- @param start? any
@@ -6135,10 +5471,6 @@ function vim.fn.matchstr(expr, pat, start, count) end
 --- <result is ["x", 1, 2, 3].
 --- The type isn't changed, it's not necessarily a String.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->matchstrpos('word')
---- <
----
 --- @param expr any
 --- @param pat any
 --- @param start? any
@@ -6155,10 +5487,6 @@ function vim.fn.matchstrpos(expr, pat, start, count) end
 --- items in {expr} cannot be used as a Number this results in
 ---                 an error.  An empty |List| or |Dictionary| results in zero.
 ---
---- Can also be used as a |method|: >vim
----   mylist->max()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.max(expr) end
@@ -6282,9 +5610,6 @@ function vim.fn.menu_get(path, modes) end
 ---     call ShowMenu(topmenu, '')
 ---   endfor
 --- <
---- Can also be used as a |method|: >vim
----   GetMenuName()->menu_info('v')
---- <
 ---
 --- @param name string
 --- @param mode? string
@@ -6300,10 +5625,6 @@ function vim.fn.menu_info(name, mode) end
 --- items in {expr} cannot be used as a Number this results in
 --- an error.  An empty |List| or |Dictionary| results in zero.
 ---
---- Can also be used as a |method|: >vim
----   mylist->min()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.min(expr) end
@@ -6350,10 +5671,6 @@ function vim.fn.min(expr) end
 --- successful or FALSE if the directory creation failed or partly
 --- failed.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->mkdir()
---- <
----
 --- @param name string
 --- @param flags? string
 --- @param prot? any
@@ -6410,10 +5727,6 @@ function vim.fn.mkdir(name, flags, prot) end
 --- the leading character(s).
 --- Also see |visualmode()|.
 ---
---- Can also be used as a |method|: >vim
----   DoFull()->mode()
---- <
----
 --- @return any
 function vim.fn.mode() end
 
@@ -6525,10 +5838,6 @@ function vim.fn.msgpackparse(data) end
 --- {lnum} is used like with |getline()|.
 --- See also |prevnonblank()|.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->nextnonblank()
---- <
----
 --- @param lnum integer
 --- @return any
 function vim.fn.nextnonblank(lnum) end
@@ -6547,10 +5856,6 @@ function vim.fn.nextnonblank(lnum) end
 --- characters.  nr2char(0) is a real NUL and terminates the
 --- string, thus results in an empty string.
 ---
---- Can also be used as a |method|: >vim
----   GetNumber()->nr2char()
---- <
----
 --- @param expr any
 --- @param utf8? any
 --- @return any
@@ -6561,8 +5866,6 @@ function vim.fn.nr2char(expr, utf8) end
 --- Also see `and()` and `xor()`.
 --- Example: >vim
 ---   let bits = or(bits, 0x80)
---- <Can also be used as a |method|: >vim
----   let bits = bits->or(0x80)
 ---
 --- <Rationale: The reason this is a function and not using the "|"
 --- character like many languages, is that Vi has always used "|"
@@ -6587,10 +5890,6 @@ vim.fn['or'] = function(expr, expr1) end
 --- It doesn't matter if the path exists or not.
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   GetDirectories()->pathshorten()
---- <
----
 --- @param path string
 --- @param len? any
 --- @return any
@@ -6610,10 +5909,6 @@ function vim.fn.pathshorten(path, len) end
 ---   echo perleval('[1 .. 4]')
 --- <  [1, 2, 3, 4]
 ---
---- Can also be used as a |method|: >vim
----   GetExpr()->perleval()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.perleval(expr) end
@@ -6629,10 +5924,6 @@ function vim.fn.perleval(expr) end
 ---   echo pow(32, 0.20)
 --- <  2.0
 ---
---- Can also be used as a |method|: >vim
----   Compute()->pow(3)
---- <
----
 --- @param x any
 --- @param y any
 --- @return any
@@ -6646,10 +5937,6 @@ function vim.fn.pow(x, y) end
 --- {lnum} is used like with |getline()|.
 --- Also see |nextnonblank()|.
 ---
---- Can also be used as a |method|: >vim
----   GetLnum()->prevnonblank()
---- <
----
 --- @param lnum integer
 --- @return any
 function vim.fn.prevnonblank(lnum) end
@@ -6864,10 +6151,6 @@ function vim.fn.printf(fmt, expr1) end
 --- If the buffer doesn't exist or isn't a prompt buffer, an empty
 --- string is returned.
 ---
---- Can also be used as a |method|: >vim
----   GetBuffer()->prompt_getprompt()
---- <
----
 --- @param buf any
 --- @return any
 function vim.fn.prompt_getprompt(buf) end
@@ -6903,10 +6186,6 @@ function vim.fn.prompt_getprompt(buf) end
 ---    endfunc
 ---    call prompt_setcallback(bufnr(), function('s:TextEntered'))
 ---
---- <Can also be used as a |method|: >vim
----   GetBuffer()->prompt_setcallback(callback)
---- <
----
 --- @param buf any
 --- @param expr any
 --- @return any
@@ -6920,10 +6199,6 @@ function vim.fn.prompt_setcallback(buf, expr) end
 --- mode.  Without setting a callback Vim will exit Insert mode,
 --- as in any buffer.
 ---
---- Can also be used as a |method|: >vim
----   GetBuffer()->prompt_setinterrupt(callback)
---- <
----
 --- @param buf any
 --- @param expr any
 --- @return any
@@ -6935,9 +6210,6 @@ function vim.fn.prompt_setinterrupt(buf, expr) end
 --- "prompt".  Example: >vim
 ---   call prompt_setprompt(bufnr(''), 'command: ')
 --- <
---- Can also be used as a |method|: >vim
----   GetBuffer()->prompt_setprompt('command: ')
---- <
 ---
 --- @param buf any
 --- @param text any
@@ -6976,10 +6248,6 @@ function vim.fn.pumvisible() end
 --- Dictionaries are represented as Vim |Dictionary| type with
 --- keys converted to strings.
 ---
---- Can also be used as a |method|: >vim
----   GetExpr()->py3eval()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.py3eval(expr) end
@@ -6992,10 +6260,6 @@ function vim.fn.py3eval(expr) end
 --- Dictionaries are represented as Vim |Dictionary| type,
 --- non-string keys result in error.
 ---
---- Can also be used as a |method|: >vim
----   GetExpr()->pyeval()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.pyeval(expr) end
@@ -7005,10 +6269,6 @@ function vim.fn.pyeval(expr) end
 --- Uses Python 2 or 3, see |python_x| and 'pyxversion'.
 --- See also: |pyeval()|, |py3eval()|
 ---
---- Can also be used as a |method|: >vim
----   GetExpr()->pyxeval()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.pyxeval(expr) end
@@ -7027,9 +6287,6 @@ function vim.fn.pyxeval(expr) end
 ---   echo rand(seed)
 ---   echo rand(seed) % 16  " random number 0 - 15
 --- <
---- Can also be used as a |method|: >vim
----   seed->rand()
---- <
 ---
 --- @param expr? any
 --- @return any
@@ -7052,9 +6309,6 @@ function vim.fn.rand(expr) end
 ---   echo range(0)    " []
 ---   echo range(2, 0)    " error!
 --- <
---- Can also be used as a |method|: >vim
----   GetExpr()->range()
---- <
 ---
 --- @param expr any
 --- @param max? any
@@ -7120,10 +6374,6 @@ function vim.fn.readblob(fname, offset, size) end
 --- <
 --- Returns an empty List on error.
 ---
---- Can also be used as a |method|: >vim
----   GetDirName()->readdir()
---- <
----
 --- @param directory any
 --- @param expr? any
 --- @return any
@@ -7161,10 +6411,6 @@ function vim.fn.readdir(directory, expr) end
 --- the result is an empty list.
 --- Also see |writefile()|.
 ---
---- Can also be used as a |method|: >vim
----   GetFileName()->readfile()
---- <
----
 --- @param fname integer
 --- @param type? any
 --- @param max? any
@@ -7186,9 +6432,6 @@ function vim.fn.readfile(fname, type, max) end
 ---   echo reduce(['x', 'y'], { acc, val -> acc .. val }, 'a')
 ---   echo reduce(0z1122, { acc, val -> 2 * acc + val })
 --- <
---- Can also be used as a |method|: >vim
----   echo mylist->reduce({ acc, val -> acc + val }, 0)
---- <
 ---
 --- @param object any
 --- @param func any
@@ -7240,9 +6483,6 @@ function vim.fn.reltime(start) end
 --- The {start} and {end} arguments must be values returned by
 --- reltime().  Returns zero on error.
 ---
---- Can also be used as a |method|: >vim
----   GetStart()->reltime()
---- <
 --- Note: |localtime()| returns the current (non-relative) time.
 ---
 --- @param start? any
@@ -7260,10 +6500,6 @@ function vim.fn.reltime(start, end_) end
 --- Also see |profiling|.
 --- If there is an error an empty string is returned
 ---
---- Can also be used as a |method|: >vim
----   reltime(start)->reltimefloat()
---- <
----
 --- @param time any
 --- @return any
 function vim.fn.reltimefloat(time) end
@@ -7281,10 +6517,6 @@ function vim.fn.reltimefloat(time) end
 --- <Also see |profiling|.
 --- If there is an error an empty string is returned
 ---
---- Can also be used as a |method|: >vim
----   echo reltime(start)->reltimestr()
---- <
----
 --- @param time any
 --- @return any
 function vim.fn.reltimestr(time) end
@@ -7308,10 +6540,6 @@ function vim.fn.remove(list, idx) end
 --- <
 --- Use |delete()| to remove a file.
 ---
---- Can also be used as a |method|: >vim
----   mylist->remove(idx)
---- <
----
 --- @param list any
 --- @param idx integer
 --- @param end_? any
@@ -7359,10 +6587,6 @@ function vim.fn.remove(dict, key) end
 --- NOTE: If {to} exists it is overwritten without warning.
 --- This function is not available in the |sandbox|.
 ---
---- Can also be used as a |method|: >vim
----   GetOldName()->rename(newname)
---- <
----
 --- @param from any
 --- @param to any
 --- @return any
@@ -7377,10 +6601,6 @@ function vim.fn.rename(from, to) end
 ---   let longlist = repeat(['a', 'b'], 3)
 --- <Results in ['a', 'b', 'a', 'b', 'a', 'b'].
 ---
---- Can also be used as a |method|: >vim
----   mylist->repeat(count)
---- <
----
 --- @param expr any
 --- @param count any
 --- @return any
@@ -7398,10 +6618,6 @@ vim.fn['repeat'] = function(expr, count) end
 --- current directory (provided the result is still a relative
 --- path name) and also keeps a trailing path separator.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->resolve()
---- <
----
 --- @param filename any
 --- @return any
 function vim.fn.resolve(filename) end
@@ -7410,11 +6626,6 @@ function vim.fn.resolve(filename) end
 --- {object} can be a |List| or a |Blob|.
 --- Returns {object}.
 --- Returns zero if {object} is not a List or a Blob.
---- If you want an object to remain unmodified make a copy first: >vim
----   let revlist = reverse(copy(mylist))
---- <Can also be used as a |method|: >vim
----   mylist->reverse()
---- <
 ---
 --- @param object any
 --- @return any
@@ -7433,10 +6644,6 @@ function vim.fn.reverse(object) end
 ---   echo round(-4.5)
 --- <  -5.0
 ---
---- Can also be used as a |method|: >vim
----   Compute()->round()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.round(expr) end
@@ -7495,10 +6702,6 @@ function vim.fn.rpcstop(...) end
 --- Other objects are represented as strings resulted from their
 --- "Object#to_s" method.
 ---
---- Can also be used as a |method|: >vim
----   GetRubyExpr()->rubyeval()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.rubyeval(expr) end
@@ -7508,10 +6711,6 @@ function vim.fn.rubyeval(expr) end
 --- attribute at other positions.
 --- Returns -1 when row or col is out of range.
 ---
---- Can also be used as a |method|: >vim
----   GetRow()->screenattr(col)
---- <
----
 --- @param row any
 --- @param col integer
 --- @return any
@@ -7526,10 +6725,6 @@ function vim.fn.screenattr(row, col) end
 --- This is mainly to be used for testing.
 --- Returns -1 when row or col is out of range.
 ---
---- Can also be used as a |method|: >vim
----   GetRow()->screenchar(col)
---- <
----
 --- @param row any
 --- @param col integer
 --- @return any
@@ -7541,10 +6736,6 @@ function vim.fn.screenchar(row, col) end
 --- This is mainly to be used for testing.
 --- Returns an empty List when row or col is out of range.
 ---
---- Can also be used as a |method|: >vim
----   GetRow()->screenchars(col)
---- <
----
 --- @param row any
 --- @param col integer
 --- @return any
@@ -7590,10 +6781,6 @@ function vim.fn.screencol() end
 --- first character is returned, {col} is not used.
 --- Returns an empty Dict if {winid} is invalid.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->screenpos(lnum, col)
---- <
----
 --- @param winid integer
 --- @param lnum integer
 --- @param col integer
@@ -7617,10 +6804,6 @@ function vim.fn.screenrow() end
 --- This is mainly to be used for testing.
 --- Returns an empty String when row or col is out of range.
 ---
---- Can also be used as a |method|: >vim
----   GetRow()->screenstring(col)
---- <
----
 --- @param row any
 --- @param col integer
 --- @return any
@@ -7726,10 +6909,6 @@ function vim.fn.screenstring(row, col) end
 --- without the 'e' flag if the cursor is on the "f" of "if".
 --- The 'n' flag tells the function not to move the cursor.
 ---
---- Can also be used as a |method|: >vim
----   GetPattern()->search()
---- <
----
 --- @param pattern any
 --- @param flags? string
 --- @param stopline? any
@@ -7858,10 +7037,6 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 ---         value. see |cursor()|, |getpos()|
 ---         (default: cursor's position)
 ---
---- Can also be used as a |method|: >vim
----   GetSearchOpts()->searchcount()
---- <
----
 --- @param options? table
 --- @return any
 function vim.fn.searchcount(options) end
@@ -7883,9 +7058,6 @@ function vim.fn.searchcount(options) end
 ---      echo getline('.')
 ---   endif
 --- <
---- Can also be used as a |method|: >vim
----   GetName()->searchdecl()
---- <
 ---
 --- @param name string
 --- @param global? any
@@ -8007,10 +7179,6 @@ function vim.fn.searchpairpos() end
 --- <In this example "submatch" is 2 when a lowercase letter is
 --- found |/\l|, 3 when an uppercase letter is found |/\u|.
 ---
---- Can also be used as a |method|: >vim
----   GetPattern()->searchpos()
---- <
----
 --- @param pattern any
 --- @param flags? string
 --- @param stopline? any
@@ -8097,11 +7265,6 @@ function vim.fn.serverstop(address) end
 --- If {buf} is not a valid buffer or {lnum} is not valid, an
 --- error message is given.
 ---
---- Can also be used as a |method|, the base is passed as the
---- third argument: >vim
----   GetText()->setbufline(buf, lnum)
---- <
----
 --- @param buf any
 --- @param lnum integer
 --- @param text any
@@ -8121,11 +7284,6 @@ function vim.fn.setbufline(buf, lnum, text) end
 ---   call setbufvar("todo", "myvar", "foobar")
 --- <This function is not available in the |sandbox|.
 ---
---- Can also be used as a |method|, the base is passed as the
---- third argument: >vim
----   GetValue()->setbufvar(buf, varname)
---- <
----
 --- @param buf any
 --- @param varname string
 --- @param val any
@@ -8179,10 +7337,6 @@ function vim.fn.setcellwidths(list) end
 ---   call setpos('.', [0, 8, 4, 0])
 --- <positions the cursor on the second character '보'.
 ---
---- Can also be used as a |method|: >vim
----   GetPosition()->setcharpos('.')
---- <
----
 --- @param expr any
 --- @param list any
 --- @return any
@@ -8207,10 +7361,6 @@ function vim.fn.setcharpos(expr, list) end
 ---   call setcharsearch(prevsearch)
 --- <Also see |getcharsearch()|.
 ---
---- Can also be used as a |method|: >vim
----   SavedSearch()->setcharsearch()
---- <
----
 --- @param dict any
 --- @return any
 function vim.fn.setcharsearch(dict) end
@@ -8221,10 +7371,6 @@ function vim.fn.setcharsearch(dict) end
 --- Returns 0 when successful, 1 when not editing the command
 --- line.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->setcmdline()
---- <
----
 --- @param str any
 --- @param pos? any
 --- @return any
@@ -8244,10 +7390,6 @@ function vim.fn.setcmdline(str, pos) end
 --- Returns 0 when successful, 1 when not editing the command
 --- line.
 ---
---- Can also be used as a |method|: >vim
----   GetPos()->setcmdpos()
---- <
----
 --- @param pos any
 --- @return any
 function vim.fn.setcmdpos(pos) end
@@ -8268,10 +7410,6 @@ function vim.fn.setcursorcharpos(lnum, col, off) end
 ---   call cursor(4, 3)
 --- <positions the cursor on the first character '여'.
 ---
---- Can also be used as a |method|: >vim
----   GetCursorPos()->setcursorcharpos()
---- <
----
 --- @param list any
 --- @return any
 function vim.fn.setcursorcharpos(list) end
@@ -8282,11 +7420,6 @@ function vim.fn.setcursorcharpos(list) end
 --- <When {val} is |v:null| the environment variable is deleted.
 --- See also |expr-env|.
 ---
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetPath()->setenv('PATH')
---- <
----
 --- @param name string
 --- @param val any
 --- @return any
@@ -8306,9 +7439,6 @@ function vim.fn.setenv(name, val) end
 ---
 --- Returns non-zero for success, zero for failure.
 ---
---- Can also be used as a |method|: >vim
----   GetFilename()->setfperm(mode)
---- <
 --- To read permissions see |getfperm()|.
 ---
 --- @param fname integer
@@ -8342,11 +7472,6 @@ function vim.fn.setfperm(fname, mode) end
 ---
 --- <Note: The '[ and '] marks are not set.
 ---
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetText()->setline(lnum)
---- <
----
 --- @param lnum integer
 --- @param text any
 --- @return any
@@ -8367,11 +7492,6 @@ function vim.fn.setline(lnum, text) end
 --- only the items listed in {what} are set. Refer to |setqflist()|
 --- for the list of supported keys in {what}.
 ---
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetLoclist()->setloclist(winnr)
---- <
----
 --- @param nr integer
 --- @param list any
 --- @param action? any
@@ -8383,12 +7503,8 @@ function vim.fn.setloclist(nr, list, action, what) end
 --- current window.  Returns 0 if successful, otherwise -1.  All
 --- current matches are cleared before the list is restored.  See
 --- example for |getmatches()|.
---- If {win} is specified, use the window with this number or
---- window ID instead of the current window.
----
---- Can also be used as a |method|: >vim
----   GetMatches()->setmatches()
---- <
+--- If {win} is specified, use the window with this number or
+--- window ID instead of the current window.
 ---
 --- @param list any
 --- @param win? any
@@ -8443,10 +7559,6 @@ function vim.fn.setmatches(list, win) end
 --- also set the preferred column.  Also see the "curswant" key in
 --- |winrestview()|.
 ---
---- Can also be used as a |method|: >vim
----   GetPosition()->setpos('.')
---- <
----
 --- @param expr any
 --- @param list any
 --- @return any
@@ -8562,11 +7674,6 @@ function vim.fn.setpos(expr, list) end
 --- independent of the 'errorformat' setting.  Use a command like
 --- `:cc 1` to jump to the first position.
 ---
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetErrorlist()->setqflist()
---- <
----
 --- @param list any
 --- @param action? any
 --- @param what? any
@@ -8628,11 +7735,6 @@ function vim.fn.setqflist(list, action, what) end
 --- nothing: >vim
 ---   call setreg('a', '', 'al')
 ---
---- <Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetText()->setreg('a')
---- <
----
 --- @param regname string
 --- @param value any
 --- @param options? table
@@ -8646,11 +7748,6 @@ function vim.fn.setreg(regname, value, options) end
 --- Tabs are numbered starting with one.
 --- This function is not available in the |sandbox|.
 ---
---- Can also be used as a |method|, the base is passed as the
---- third argument: >vim
----   GetValue()->settabvar(tab, name)
---- <
----
 --- @param tabnr integer
 --- @param varname string
 --- @param val any
@@ -8672,11 +7769,6 @@ function vim.fn.settabvar(tabnr, varname, val) end
 ---   call settabwinvar(3, 2, "myvar", "foobar")
 --- <This function is not available in the |sandbox|.
 ---
---- Can also be used as a |method|, the base is passed as the
---- fourth argument: >vim
----   GetValue()->settabwinvar(tab, winnr, name)
---- <
----
 --- @param tabnr integer
 --- @param winnr integer
 --- @param varname string
@@ -8716,10 +7808,6 @@ function vim.fn.settabwinvar(tabnr, winnr, varname, val) end
 ---   call settagstack(1003, stack)
 ---   unlet stack
 --- <
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetStack()->settagstack(winnr)
---- <
 ---
 --- @param nr integer
 --- @param dict any
@@ -8732,11 +7820,6 @@ function vim.fn.settagstack(nr, dict, action) end
 ---   call setwinvar(1, "&list", 0)
 ---   call setwinvar(2, "myvar", "foobar")
 ---
---- <Can also be used as a |method|, the base is passed as the
---- third argument: >vim
----   GetValue()->setwinvar(winnr, name)
---- <
----
 --- @param nr integer
 --- @param varname string
 --- @param val any
@@ -8746,10 +7829,6 @@ function vim.fn.setwinvar(nr, varname, val) end
 --- Returns a String with 64 hex characters, which is the SHA256
 --- checksum of {string}.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->sha256()
---- <
----
 --- @param string string
 --- @return any
 function vim.fn.sha256(string) end
@@ -8784,10 +7863,6 @@ function vim.fn.sha256(string) end
 ---     call system("chmod +w -- " .. shellescape(expand("%")))
 --- <See also |::S|.
 ---
---- Can also be used as a |method|: >vim
----   GetCommand()->shellescape()
---- <
----
 --- @param string string
 --- @param special? any
 --- @return any
@@ -8813,10 +7888,6 @@ function vim.fn.shellescape(string, special) end
 --- 'vartabstop' feature. If no {col} argument is given, column 1
 --- will be assumed.
 ---
---- Can also be used as a |method|: >vim
----   GetColumn()->shiftwidth()
---- <
----
 --- @param col? integer
 --- @return any
 function vim.fn.shiftwidth(col) end
@@ -8870,9 +7941,6 @@ function vim.fn.sign_define(name, dict) end
 ---     \  'text' : '!!'}
 ---     \ ])
 --- <
---- Can also be used as a |method|: >vim
----   GetSignList()->sign_define()
---- <
 ---
 --- @param list any
 --- @return any
@@ -8912,9 +7980,6 @@ function vim.fn.sign_define(list) end
 ---   " Get the attribute of the sign named mySign
 ---   echo sign_getdefined("mySign")
 --- <
---- Can also be used as a |method|: >vim
----   GetSignList()->sign_getdefined()
---- <
 ---
 --- @param name? string
 --- @return any
@@ -8979,9 +8044,6 @@ function vim.fn.sign_getdefined(name) end
 ---   " Get a List of all the placed signs
 ---   echo sign_getplaced()
 --- <
---- Can also be used as a |method|: >vim
----   GetBufname()->sign_getplaced()
---- <
 ---
 --- @param buf? any
 --- @param dict? any
@@ -9002,9 +8064,6 @@ function vim.fn.sign_getplaced(buf, dict) end
 ---   " Jump to sign 10 in the current buffer
 ---   call sign_jump(10, '', '')
 --- <
---- Can also be used as a |method|: >vim
----   GetSignid()->sign_jump()
---- <
 ---
 --- @param id any
 --- @param group any
@@ -9059,9 +8118,6 @@ function vim.fn.sign_jump(id, group, buf) end
 ---   call sign_place(10, 'g3', 'sign4', 'json.c',
 ---       \ {'lnum' : 40, 'priority' : 90})
 --- <
---- Can also be used as a |method|: >vim
----   GetSignid()->sign_place(group, name, expr)
---- <
 ---
 --- @param id any
 --- @param group any
@@ -9128,9 +8184,6 @@ function vim.fn.sign_place(id, group, name, buf, dict) end
 ---     \  'lnum' : 50}
 ---     \ ])
 --- <
---- Can also be used as a |method|: >vim
----   GetSignlist()->sign_placelist()
---- <
 ---
 --- @param list any
 --- @return any
@@ -9161,9 +8214,6 @@ function vim.fn.sign_undefine(name) end
 ---   " Delete all the signs
 ---   call sign_undefine()
 --- <
---- Can also be used as a |method|: >vim
----   GetSignlist()->sign_undefine()
---- <
 ---
 --- @param list? any
 --- @return any
@@ -9210,10 +8260,6 @@ function vim.fn.sign_undefine(list) end
 ---   " Remove all the placed signs from all the buffers
 ---   call sign_unplace('*')
 ---
---- <Can also be used as a |method|: >vim
----   GetSigngroup()->sign_unplace()
---- <
----
 --- @param group any
 --- @param dict? any
 --- @return any
@@ -9246,9 +8292,6 @@ function vim.fn.sign_unplace(group, dict) end
 ---     \ {'id' : 20, 'buffer' : 'b.vim'},
 ---     \ ])
 --- <
---- Can also be used as a |method|: >vim
----   GetSignlist()->sign_unplacelist()
---- <
 ---
 --- @param list any
 --- @return any
@@ -9270,10 +8313,6 @@ function vim.fn.sign_unplacelist(list) end
 --- directory.  In order to resolve all the involved symbolic
 --- links before simplifying the path name, use |resolve()|.
 ---
---- Can also be used as a |method|: >vim
----   GetName()->simplify()
---- <
----
 --- @param filename any
 --- @return any
 function vim.fn.simplify(filename) end
@@ -9287,10 +8326,6 @@ function vim.fn.simplify(filename) end
 ---   echo sin(-4.01)
 --- <  0.763301
 ---
---- Can also be used as a |method|: >vim
----   Compute()->sin()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.sin(expr) end
@@ -9305,10 +8340,6 @@ function vim.fn.sin(expr) end
 ---   echo sinh(-0.9)
 --- <  -1.026517
 ---
---- Can also be used as a |method|: >vim
----   Compute()->sinh()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.sinh(expr) end
@@ -9321,10 +8352,6 @@ function vim.fn.sinh(expr) end
 --- When {end} is -1 the last item is omitted.
 --- Returns an empty value if {start} or {end} are invalid.
 ---
---- Can also be used as a |method|: >vim
----   GetList()->slice(offset)
---- <
----
 --- @param expr any
 --- @param start any
 --- @param end_? any
@@ -9417,10 +8444,6 @@ function vim.fn.sockconnect(mode, address, opts) end
 --- on numbers, text strings will sort next to each other, in the
 --- same order as they were originally.
 ---
---- Can also be used as a |method|: >vim
----   mylist->sort()
----
---- <Also see |uniq()|.
 ---
 --- Example: >vim
 ---   func MyCompare(i1, i2)
@@ -9449,10 +8472,6 @@ function vim.fn.sort(list, func, dict) end
 --- This can be used for making spelling suggestions.  Note that
 --- the method can be quite slow.
 ---
---- Can also be used as a |method|: >vim
----   GetWord()->soundfold()
---- <
----
 --- @param word any
 --- @return any
 function vim.fn.soundfold(word) end
@@ -9480,10 +8499,6 @@ function vim.fn.soundfold(word) end
 --- The spelling information for the current window and the value
 --- of 'spelllang' are used.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->spellbadword()
---- <
----
 --- @param sentence? any
 --- @return any
 function vim.fn.spellbadword(sentence) end
@@ -9508,10 +8523,6 @@ function vim.fn.spellbadword(sentence) end
 --- The spelling information for the current window is used.  The
 --- values of 'spelllang' and 'spellsuggest' are used.
 ---
---- Can also be used as a |method|: >vim
----   GetWord()->spellsuggest()
---- <
----
 --- @param word any
 --- @param max? any
 --- @param capital? any
@@ -9542,10 +8553,6 @@ function vim.fn.spellsuggest(word, max, capital) end
 ---   let items = split(line, ':', 1)
 --- <The opposite function is |join()|.
 ---
---- Can also be used as a |method|: >vim
----   GetString()->split()
---- <
----
 --- @param string string
 --- @param pattern? any
 --- @param keepempty? any
@@ -9564,10 +8571,6 @@ function vim.fn.split(string, pattern, keepempty) end
 --- <  str2float("nan")
 --- NaN may be different, it depends on system libraries.
 ---
---- Can also be used as a |method|: >vim
----   Compute()->sqrt()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.sqrt(expr) end
@@ -9585,9 +8588,6 @@ function vim.fn.sqrt(expr) end
 ---   let seed = srand(userinput)
 ---   echo rand(seed)
 --- <
---- Can also be used as a |method|: >vim
----   userinput->srand()
---- <
 ---
 --- @param expr? any
 --- @return any
@@ -9660,10 +8660,6 @@ function vim.fn.stdpath(what) end
 --- <
 --- Returns 0.0 if the conversion fails.
 ---
---- Can also be used as a |method|: >vim
----   let f = text->substitute(',', '', 'g')->str2float()
---- <
----
 --- @param string string
 --- @param quoted? any
 --- @return any
@@ -9680,10 +8676,6 @@ function vim.fn.str2float(string, quoted) end
 --- With UTF-8 composing characters are handled properly: >vim
 ---   echo str2list("á")    " returns [97, 769]
 ---
---- <Can also be used as a |method|: >vim
----   GetString()->str2list()
---- <
----
 --- @param string string
 --- @param utf8? any
 --- @return any
@@ -9707,10 +8699,6 @@ function vim.fn.str2list(string, utf8) end
 ---
 --- Returns 0 if {string} is empty or on error.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->str2nr()
---- <
----
 --- @param string string
 --- @param base? any
 --- @return any
@@ -9725,10 +8713,6 @@ function vim.fn.str2nr(string, base) end
 ---
 --- Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->strcharlen()
---- <
----
 --- @param string string
 --- @return any
 function vim.fn.strcharlen(string) end
@@ -9747,10 +8731,6 @@ function vim.fn.strcharlen(string) end
 ---
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->strcharpart(5)
---- <
----
 --- @param src any
 --- @param start any
 --- @param len? any
@@ -9785,9 +8765,6 @@ function vim.fn.strcharpart(src, start, len, skipcc) end
 ---       endfunction
 ---     endif
 --- <
---- Can also be used as a |method|: >vim
----   GetText()->strchars()
---- <
 ---
 --- @param string string
 --- @param skipcc? any
@@ -9807,10 +8784,6 @@ function vim.fn.strchars(string, skipcc) end
 --- Returns zero on error.
 --- Also see |strlen()|, |strwidth()| and |strchars()|.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->strdisplaywidth()
---- <
----
 --- @param string string
 --- @param col? integer
 --- @return any
@@ -9832,10 +8805,6 @@ function vim.fn.strdisplaywidth(string, col) end
 ---   echo strftime("%c", getftime("file.c"))
 ---            " Show mod time of file.c.
 ---
---- <Can also be used as a |method|: >vim
----   GetFormat()->strftime()
---- <
----
 --- @param format any
 --- @param time? any
 --- @return any
@@ -9849,10 +8818,6 @@ function vim.fn.strftime(format, time) end
 --- Returns -1 if {index} is invalid.
 --- Also see |strcharpart()| and |strchars()|.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->strgetchar(5)
---- <
----
 --- @param str any
 --- @param index any
 --- @return any
@@ -9876,10 +8841,6 @@ function vim.fn.strgetchar(str, index) end
 --- stridx() works similar to the C function strstr().  When used
 --- with a single character it works similar to strchr().
 ---
---- Can also be used as a |method|: >vim
----   GetHaystack()->stridx(needle)
---- <
----
 --- @param haystack any
 --- @param needle any
 --- @param start? any
@@ -9909,10 +8870,6 @@ function vim.fn.stridx(haystack, needle, start) end
 --- method, use |msgpackdump()| or |json_encode()| if you need to
 --- share data with other application.
 ---
---- Can also be used as a |method|: >vim
----   mylist->string()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.string(expr) end
@@ -9925,10 +8882,6 @@ function vim.fn.string(expr) end
 --- |strchars()|.
 --- Also see |len()|, |strdisplaywidth()| and |strwidth()|.
 ---
---- Can also be used as a |method|: >vim
----   GetString()->strlen()
---- <
----
 --- @param string string
 --- @return any
 function vim.fn.strlen(string) end
@@ -9957,10 +8910,6 @@ function vim.fn.strlen(string) end
 --- <
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->strpart(5)
---- <
----
 --- @param src any
 --- @param start any
 --- @param len? any
@@ -9991,10 +8940,6 @@ function vim.fn.strpart(src, start, len, chars) end
 ---   echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
 --- <  Sun Apr 27 12:53:55 1997
 ---
---- Can also be used as a |method|: >vim
----   GetFormat()->strptime(timestring)
---- <
----
 --- @param format any
 --- @param timestring any
 --- @return any
@@ -10017,10 +8962,6 @@ function vim.fn.strptime(format, timestring) end
 --- When used with a single character it works similar to the C
 --- function strrchr().
 ---
---- Can also be used as a |method|: >vim
----   GetHaystack()->strridx(needle)
---- <
----
 --- @param haystack any
 --- @param needle any
 --- @param start? any
@@ -10036,10 +8977,6 @@ function vim.fn.strridx(haystack, needle, start) end
 ---
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   GetString()->strtrans()
---- <
----
 --- @param string string
 --- @return any
 function vim.fn.strtrans(string) end
@@ -10062,10 +8999,6 @@ function vim.fn.strtrans(string) end
 ---     echo strutf16len('ą́')    " returns 1
 ---     echo strutf16len('ą́', v:true)  " returns 3
 ---
---- Can also be used as a |method|: >vim
----   GetText()->strutf16len()
---- <
----
 --- @param string string
 --- @param countcc? any
 --- @return any
@@ -10079,10 +9012,6 @@ function vim.fn.strutf16len(string, countcc) end
 --- Returns zero on error.
 --- Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
 ---
---- Can also be used as a |method|: >vim
----   GetString()->strwidth()
---- <
----
 --- @param string string
 --- @return any
 function vim.fn.strwidth(string) end
@@ -10114,10 +9043,6 @@ function vim.fn.strwidth(string) end
 --- <This finds the first number in the line and adds one to it.
 --- A line break is included as a newline character.
 ---
---- Can also be used as a |method|: >vim
----   GetNr()->submatch()
---- <
----
 --- @param nr integer
 --- @param list? any
 --- @return any
@@ -10165,10 +9090,6 @@ function vim.fn.submatch(nr, list) end
 ---
 --- <Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   GetString()->substitute(pat, sub, flags)
---- <
----
 --- @param string string
 --- @param pat any
 --- @param sub any
@@ -10206,10 +9127,6 @@ function vim.fn.swapfilelist() end
 ---   Not a swap file: does not contain correct block ID
 ---   Magic number mismatch: Info in first block is invalid
 ---
---- Can also be used as a |method|: >vim
----   GetFilename()->swapinfo()
---- <
----
 --- @param fname integer
 --- @return any
 function vim.fn.swapinfo(fname) end
@@ -10220,10 +9137,6 @@ function vim.fn.swapinfo(fname) end
 --- |:swapname| (unless there is no swap file).
 --- If buffer {buf} has no swap file, returns an empty string.
 ---
---- Can also be used as a |method|: >vim
----   GetBufname()->swapname()
---- <
----
 --- @param buf any
 --- @return any
 function vim.fn.swapname(buf) end
@@ -10317,10 +9230,6 @@ function vim.fn.synIDattr(synID, what, mode) end
 ---
 --- Returns zero on error.
 ---
---- Can also be used as a |method|: >vim
----   echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
---- <
----
 --- @param synID any
 --- @return any
 function vim.fn.synIDtrans(synID) end
@@ -10426,10 +9335,6 @@ function vim.fn.synstack(lnum, col) end
 --- <Unlike ":!cmd" there is no automatic check for changed files.
 --- Use |:checktime| to force a check.
 ---
---- Can also be used as a |method|: >vim
----   echo GetCmd()->system()
---- <
----
 --- @param cmd any
 --- @param input? any
 --- @return any
@@ -10448,10 +9353,6 @@ function vim.fn.system(cmd, input) end
 --- <
 --- Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   echo GetCmd()->systemlist()
---- <
----
 --- @param cmd any
 --- @param input? any
 --- @param keepempty? any
@@ -10470,10 +9371,6 @@ function vim.fn.systemlist(cmd, input, keepempty) end
 ---   endfor
 --- <Note that a buffer may appear in more than one window.
 ---
---- Can also be used as a |method|: >vim
----   GetTabpage()->tabpagebuflist()
---- <
----
 --- @param arg? any
 --- @return any
 function vim.fn.tabpagebuflist(arg) end
@@ -10507,10 +9404,6 @@ function vim.fn.tabpagenr(arg) end
 ---     tabpagewinnr(4, '$')    " number of windows in tab page 4
 --- <When {tabarg} is invalid zero is returned.
 ---
---- Can also be used as a |method|: >vim
----   GetTabpage()->tabpagewinnr()
---- <
----
 --- @param tabarg any
 --- @param arg? any
 --- @return any
@@ -10564,9 +9457,6 @@ function vim.fn.tagfiles() end
 --- located by Vim. Refer to |tags-file-format| for the format of
 --- the tags file generated by the different ctags tools.
 ---
---- Can also be used as a |method|: >vim
----   GetTagpattern()->taglist()
----
 --- @param expr any
 --- @param filename? any
 --- @return any
@@ -10582,10 +9472,6 @@ function vim.fn.taglist(expr, filename) end
 ---   echo tan(-4.01)
 --- <  -1.181502
 ---
---- Can also be used as a |method|: >vim
----   Compute()->tan()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.tan(expr) end
@@ -10600,10 +9486,6 @@ function vim.fn.tan(expr) end
 ---   echo tanh(-1)
 --- <  -0.761594
 ---
---- Can also be used as a |method|: >vim
----   Compute()->tanh()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.tanh(expr) end
@@ -10651,10 +9533,6 @@ function vim.fn.termopen(cmd, opts) end
 ---         -1 means forever
 ---     "callback"      the callback
 ---
---- Can also be used as a |method|: >vim
----   GetTimer()->timer_info()
---- <
----
 --- @param id? any
 --- @return any
 function vim.fn.timer_info(id) end
@@ -10671,10 +9549,6 @@ function vim.fn.timer_info(id) end
 --- String, then the timer is paused, otherwise it is unpaused.
 --- See |non-zero-arg|.
 ---
---- Can also be used as a |method|: >vim
----   GetTimer()->timer_pause(1)
---- <
----
 --- @param timer any
 --- @param paused any
 --- @return any
@@ -10709,11 +9583,6 @@ function vim.fn.timer_pause(timer, paused) end
 ---     \ {'repeat': 3})
 --- <This invokes MyHandler() three times at 500 msec intervals.
 ---
---- Can also be used as a |method|: >vim
----   GetMsec()->timer_start(callback)
----
---- <Not available in the |sandbox|.
----
 --- @param time any
 --- @param callback any
 --- @param options? table
@@ -10724,10 +9593,6 @@ function vim.fn.timer_start(time, callback, options) end
 --- {timer} is an ID returned by timer_start(), thus it must be a
 --- Number.  If {timer} does not exist there is no error.
 ---
---- Can also be used as a |method|: >vim
----   GetTimer()->timer_stop()
---- <
----
 --- @param timer any
 --- @return any
 function vim.fn.timer_stop(timer) end
@@ -10743,10 +9608,6 @@ function vim.fn.timer_stopall() end
 --- characters turned into lowercase (just like applying |gu| to
 --- the string).  Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->tolower()
---- <
----
 --- @param expr any
 --- @return string
 function vim.fn.tolower(expr) end
@@ -10755,10 +9616,6 @@ function vim.fn.tolower(expr) end
 --- characters turned into uppercase (just like applying |gU| to
 --- the string).  Returns an empty string on error.
 ---
---- Can also be used as a |method|: >vim
----   GetText()->toupper()
---- <
----
 --- @param expr any
 --- @return string
 function vim.fn.toupper(expr) end
@@ -10778,10 +9635,6 @@ function vim.fn.toupper(expr) end
 ---   echo tr("<blob>", "<>", "{}")
 --- <returns "{blob}"
 ---
---- Can also be used as a |method|: >vim
----   GetText()->tr(from, to)
---- <
----
 --- @param src any
 --- @param fromstr any
 --- @param tostr any
@@ -10812,10 +9665,6 @@ function vim.fn.tr(src, fromstr, tostr) end
 ---   echo trim("  vim  ", " ", 2)
 --- <returns "  vim"
 ---
---- Can also be used as a |method|: >vim
----   GetText()->trim()
---- <
----
 --- @param text any
 --- @param mask? any
 --- @param dir? string
@@ -10834,10 +9683,6 @@ function vim.fn.trim(text, mask, dir) end
 ---   echo trunc(4.0)
 --- <  4.0
 ---
---- Can also be used as a |method|: >vim
----   Compute()->trunc()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.trunc(expr) end
@@ -10868,10 +9713,6 @@ function vim.fn.trunc(expr) end
 --- <To check if the v:t_ variables exist use this: >vim
 ---   if exists('v:t_number') | endif
 ---
---- <Can also be used as a |method|: >vim
----   mylist->type()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.type(expr) end
@@ -10886,10 +9727,6 @@ function vim.fn.type(expr) end
 --- buffer without a file name will not write an undo file.
 --- Useful in combination with |:wundo| and |:rundo|.
 ---
---- Can also be used as a |method|: >vim
----   GetFilename()->undofile()
---- <
----
 --- @param name string
 --- @return string
 function vim.fn.undofile(name) end
@@ -10948,10 +9785,6 @@ function vim.fn.undotree() end
 ---
 --- Returns zero if {list} is not a |List|.
 ---
---- Can also be used as a |method|: >vim
----   mylist->uniq()
---- <
----
 --- @param list any
 --- @param func? any
 --- @param dict? any
@@ -10984,9 +9817,6 @@ function vim.fn.uniq(list, func, dict) end
 ---   echo utf16idx('aą́c', 6, 1)  " returns 4
 ---   echo utf16idx('a😊😊', 9)  " returns -1
 --- <
---- Can also be used as a |method|: >vim
----   GetName()->utf16idx(idx)
---- <
 ---
 --- @param string string
 --- @param idx integer
@@ -10999,10 +9829,6 @@ function vim.fn.utf16idx(string, idx, countcc, charidx) end
 --- in arbitrary order.  Also see |items()| and |keys()|.
 --- Returns zero if {dict} is not a |Dict|.
 ---
---- Can also be used as a |method|: >vim
----   mydict->values()
---- <
----
 --- @param dict any
 --- @return any
 function vim.fn.values(dict) end
@@ -11058,10 +9884,6 @@ function vim.fn.values(dict) end
 --- all lines: >vim
 ---     echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
 ---
---- <Can also be used as a |method|: >vim
----   GetPos()->virtcol()
---- <
----
 --- @param expr any
 --- @param list? any
 --- @return any
@@ -11083,10 +9905,6 @@ function vim.fn.virtcol(expr, list) end
 ---
 --- See also |screenpos()|, |virtcol()| and |col()|.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->virtcol2col(lnum, col)
---- <
----
 --- @param winid integer
 --- @param lnum integer
 --- @param col integer
@@ -11161,11 +9979,6 @@ function vim.fn.wildmenumode() end
 --- When window {id} does not exist then no error is given and
 --- an empty string is returned.
 ---
---- Can also be used as a |method|, the base is passed as the
---- second argument: >vim
----   GetCommand()->win_execute(winid)
---- <
----
 --- @param id any
 --- @param command any
 --- @param silent? boolean
@@ -11175,10 +9988,6 @@ function vim.fn.win_execute(id, command, silent) end
 --- Returns a |List| with |window-ID|s for windows that contain
 --- buffer {bufnr}.  When there is none the list is empty.
 ---
---- Can also be used as a |method|: >vim
----   GetBufnr()->win_findbuf()
---- <
----
 --- @param bufnr any
 --- @return integer[]
 function vim.fn.win_findbuf(bufnr) end
@@ -11191,10 +10000,6 @@ function vim.fn.win_findbuf(bufnr) end
 --- number {tab}.  The first tab has number one.
 --- Return zero if the window cannot be found.
 ---
---- Can also be used as a |method|: >vim
----   GetWinnr()->win_getid()
---- <
----
 --- @param win? any
 --- @param tab? any
 --- @return integer
@@ -11217,10 +10022,6 @@ function vim.fn.win_getid(win, tab) end
 ---
 --- Also see the 'buftype' option.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->win_gettype()
---- <
----
 --- @param nr? integer
 --- @return 'autocmd'|'command'|''|'loclist'|'popup'|'preview'|'quickfix'|'unknown'
 function vim.fn.win_gettype(nr) end
@@ -11229,10 +10030,6 @@ function vim.fn.win_gettype(nr) end
 --- tabpage.
 --- Return TRUE if successful, FALSE if the window cannot be found.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->win_gotoid()
---- <
----
 --- @param expr any
 --- @return 0|1
 function vim.fn.win_gotoid(expr) end
@@ -11241,10 +10038,6 @@ function vim.fn.win_gotoid(expr) end
 --- with ID {expr}: [tabnr, winnr].
 --- Return [0, 0] if the window cannot be found.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->win_id2tabwin()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.win_id2tabwin(expr) end
@@ -11252,10 +10045,6 @@ function vim.fn.win_id2tabwin(expr) end
 --- Return the window number of window with ID {expr}.
 --- Return 0 if the window cannot be found in the current tabpage.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->win_id2win()
---- <
----
 --- @param expr any
 --- @return any
 function vim.fn.win_id2win(expr) end
@@ -11274,10 +10063,6 @@ function vim.fn.win_id2win(expr) end
 --- window, since it has no separator on the right.
 --- Only works for the current tab page. *E1308*
 ---
---- Can also be used as a |method|: >vim
----   GetWinnr()->win_move_separator(offset)
---- <
----
 --- @param nr integer
 --- @param offset any
 --- @return any
@@ -11294,10 +10079,6 @@ function vim.fn.win_move_separator(nr, offset) end
 --- be found and FALSE otherwise.
 --- Only works for the current tab page.
 ---
---- Can also be used as a |method|: >vim
----   GetWinnr()->win_move_statusline(offset)
---- <
----
 --- @param nr integer
 --- @param offset any
 --- @return any
@@ -11311,10 +10092,6 @@ function vim.fn.win_move_statusline(nr, offset) end
 --- Returns [0, 0] if the window cannot be found in the current
 --- tabpage.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->win_screenpos()
---- <
----
 --- @param nr integer
 --- @return any
 function vim.fn.win_screenpos(nr) end
@@ -11338,10 +10115,6 @@ function vim.fn.win_screenpos(nr) end
 ---     present, the values of 'splitbelow' and
 ---     'splitright' are used.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->win_splitmove(target)
---- <
----
 --- @param nr integer
 --- @param target any
 --- @param options? table
@@ -11357,9 +10130,6 @@ function vim.fn.win_splitmove(nr, target, options) end
 --- Example: >vim
 ---   echo "The file in the current window is " .. bufname(winbufnr(0))
 --- <
---- Can also be used as a |method|: >vim
----   FindWindow()->winbufnr()->bufname()
---- <
 ---
 --- @param nr integer
 --- @return integer
@@ -11389,10 +10159,6 @@ function vim.fn.windowsversion() end
 --- Examples: >vim
 ---   echo "The current window has " .. winheight(0) .. " lines."
 ---
---- <Can also be used as a |method|: >vim
----   GetWinid()->winheight()
---- <
----
 --- @param nr integer
 --- @return integer
 function vim.fn.winheight(nr) end
@@ -11432,9 +10198,6 @@ function vim.fn.winheight(nr) end
 ---   ['col', [['leaf', 1002], ['row', [['leaf', 1003],
 ---           ['leaf', 1001]]], ['leaf', 1000]]]
 --- <
---- Can also be used as a |method|: >vim
----   GetTabnr()->winlayout()
---- <
 ---
 --- @param tabnr? integer
 --- @return any
@@ -11477,10 +10240,6 @@ function vim.fn.winline() end
 ---   let prev_window = winnr('#')
 ---   let wnum = winnr('3k')
 ---
---- <Can also be used as a |method|: >vim
----   GetWinval()->winnr()
---- <
----
 --- @param arg? any
 --- @return any
 function vim.fn.winnr(arg) end
@@ -11513,10 +10272,6 @@ function vim.fn.winrestcmd() end
 --- If you have changed the values the result is unpredictable.
 --- If the window size changed the result won't be the same.
 ---
---- Can also be used as a |method|: >vim
----   GetView()->winrestview()
---- <
----
 --- @param dict any
 --- @return any
 function vim.fn.winrestview(dict) end
@@ -11563,10 +10318,6 @@ function vim.fn.winsaveview() end
 --- <For getting the terminal or screen size, see the 'columns'
 --- option.
 ---
---- Can also be used as a |method|: >vim
----   GetWinid()->winwidth()
---- <
----
 --- @param nr integer
 --- @return any
 function vim.fn.winwidth(nr) end
@@ -11639,10 +10390,6 @@ function vim.fn.wordcount() end
 ---   let fl = readfile("foo", "b")
 ---   call writefile(fl, "foocopy", "b")
 ---
---- <Can also be used as a |method|: >vim
----   GetText()->writefile("thefile")
---- <
----
 --- @param object any
 --- @param fname integer
 --- @param flags? string
@@ -11655,9 +10402,6 @@ function vim.fn.writefile(object, fname, flags) end
 --- Example: >vim
 ---   let bits = xor(bits, 0x80)
 --- <
---- Can also be used as a |method|: >vim
----   let bits = bits->xor(0x80)
---- <
 ---
 --- @param expr any
 --- @param expr1 any
-- 
cgit 


From 1ee905a63aa9f3d6873ec75a0954866d8660699e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 2 Aug 2023 22:14:32 +0800
Subject: docs(builtin): fix alignment of comments in code blocks (#24529)

---
 runtime/doc/builtin.txt         | 38 +++++++++++++++++++-------------------
 runtime/lua/vim/_meta/vimfn.lua | 38 +++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5813ca5494..61d5dd35e3 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -431,9 +431,9 @@ bufname([{buf}])                                                     *bufname()*
 		If the {buf} is a String, but you want to use it as a buffer
 <		If the buffer doesn't exist, or doesn't have a name, an empty
 		string is returned. >vim
-			echo bufname("#")		" alternate buffer name
+			echo bufname("#")	" alternate buffer name
 			echo bufname(3)		" name of buffer 3
-			echo bufname("%")		" name of current buffer
+			echo bufname("%")	" name of current buffer
 			echo bufname("file2")	" name of buffer where "file2" matches.
 <
 
@@ -593,10 +593,10 @@ chansend({id}, {data})                                              *chansend()*
 char2nr({string} [, {utf8}])                                         *char2nr()*
 		Return Number value of the first char in {string}.
 		Examples: >vim
-			echo char2nr(" ")		" returns 32
-			echo char2nr("ABC")		" returns 65
-			echo char2nr("á")		" returns 225
-			echo char2nr("á"[0])		" returns 195
+			echo char2nr(" ")	" returns 32
+			echo char2nr("ABC")	" returns 65
+			echo char2nr("á")	" returns 225
+			echo char2nr("á"[0])	" returns 195
 			echo char2nr("\<M-x>")	" returns 128
 <		Non-ASCII characters are always treated as UTF-8 characters.
 		{utf8} is ignored, it exists only for backwards-compatibility.
@@ -622,7 +622,7 @@ charcol({expr} [, {winid}])                                          *charcol()*
 
 		Example:
 		With the cursor on '세' in line 5 with text "여보세요": >vim
-			echo charcol('.')		" returns 3
+			echo charcol('.')	" returns 3
 			echo col('.')		" returns 7
 
 charidx({string}, {idx} [, {countcc} [, {utf16}]])                   *charidx()*
@@ -719,9 +719,9 @@ col({expr} [, {winid}])                                                  *col()*
 		character position use |charcol()|.
 		Note that only marks in the current file can be used.
 		Examples: >vim
-			echo col(".")		" column of cursor
-			echo col("$")		" length of cursor line plus one
-			echo col("'t")		" column of mark t
+			echo col(".")			" column of cursor
+			echo col("$")			" length of cursor line plus one
+			echo col("'t")			" column of mark t
 			echo col("'" .. markname)	" column of mark markname
 <		The first column is 1.  Returns 0 if {expr} is invalid or when
 		the window with ID {winid} is not found.
@@ -3972,9 +3972,9 @@ line({expr} [, {winid}])                                                *line()*
 		that window instead of the current window.
 		Returns 0 for invalid values of {expr} and {winid}.
 		Examples: >vim
-			echo line(".")		" line number of the cursor
-			echo line(".", winid)	" idem, in window "winid"
-			echo line("'t")		" line number of mark t
+			echo line(".")			" line number of the cursor
+			echo line(".", winid)		" idem, in window "winid"
+			echo line("'t")			" line number of mark t
 			echo line("'" .. marker)	" line number of mark marker
 <
 		To jump to the last known position when opening a file see
@@ -5288,11 +5288,11 @@ range({expr} [, {max} [, {stride}]])                         *range()* *E726* *E
 		start this is an error.
 		Examples: >vim
 			echo range(4)		" [0, 1, 2, 3]
-			echo range(2, 4)		" [2, 3, 4]
-			echo range(2, 9, 3)		" [2, 5, 8]
+			echo range(2, 4)	" [2, 3, 4]
+			echo range(2, 9, 3)	" [2, 5, 8]
 			echo range(2, -2, -1)	" [2, 1, 0, -1, -2]
 			echo range(0)		" []
-			echo range(2, 0)		" error!
+			echo range(2, 0)	" error!
 <
 
 readblob({fname} [, {offset} [, {size}]])                           *readblob()*
@@ -7394,7 +7394,7 @@ strftime({format} [, {time}])                                       *strftime()*
 		  echo strftime("%c")		   " Sun Apr 27 11:49:23 1997
 		  echo strftime("%Y %b %d %X")	   " 1997 Apr 27 11:53:25
 		  echo strftime("%y%m%d %T")	   " 970427 11:53:55
-		  echo strftime("%H:%M")	           " 11:55
+		  echo strftime("%H:%M")		   " 11:55
 		  echo strftime("%c", getftime("file.c"))
 						   " Show mod time of file.c.
 
@@ -7419,8 +7419,8 @@ stridx({haystack}, {needle} [, {start}])                              *stridx()*
 		-1 is returned if the {needle} does not occur in {haystack}.
 		See also |strridx()|.
 		Examples: >vim
-		  echo stridx("An Example", "Example")	     " 3
-		  echo stridx("Starting point", "Start")    " 0
+		  echo stridx("An Example", "Example")     " 3
+		  echo stridx("Starting point", "Start")   " 0
 		  echo stridx("Starting point", "start")   " -1
 <						*strstr()* *strchr()*
 		stridx() works similar to the C function strstr().  When used
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 3de2e5ac4f..b15d780121 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -572,9 +572,9 @@ function vim.fn.bufloaded(buf) end
 --- If the {buf} is a String, but you want to use it as a buffer
 --- <If the buffer doesn't exist, or doesn't have a name, an empty
 --- string is returned. >vim
----   echo bufname("#")    " alternate buffer name
+---   echo bufname("#")  " alternate buffer name
 ---   echo bufname(3)    " name of buffer 3
----   echo bufname("%")    " name of current buffer
+---   echo bufname("%")  " name of current buffer
 ---   echo bufname("file2")  " name of buffer where "file2" matches.
 --- <
 ---
@@ -778,10 +778,10 @@ function vim.fn.chansend(id, data) end
 
 --- Return Number value of the first char in {string}.
 --- Examples: >vim
----   echo char2nr(" ")    " returns 32
----   echo char2nr("ABC")    " returns 65
----   echo char2nr("á")    " returns 225
----   echo char2nr("á"[0])    " returns 195
+---   echo char2nr(" ")  " returns 32
+---   echo char2nr("ABC")  " returns 65
+---   echo char2nr("á")  " returns 225
+---   echo char2nr("á"[0])  " returns 195
 ---   echo char2nr("\<M-x>")  " returns 128
 --- <Non-ASCII characters are always treated as UTF-8 characters.
 --- {utf8} is ignored, it exists only for backwards-compatibility.
@@ -814,7 +814,7 @@ function vim.fn.charclass(string) end
 ---
 --- Example:
 --- With the cursor on '세' in line 5 with text "여보세요": >vim
----   echo charcol('.')    " returns 3
+---   echo charcol('.')  " returns 3
 ---   echo col('.')    " returns 7
 ---
 --- @param expr any
@@ -929,9 +929,9 @@ function vim.fn.clearmatches(win) end
 --- character position use |charcol()|.
 --- Note that only marks in the current file can be used.
 --- Examples: >vim
----   echo col(".")    " column of cursor
----   echo col("$")    " length of cursor line plus one
----   echo col("'t")    " column of mark t
+---   echo col(".")      " column of cursor
+---   echo col("$")      " length of cursor line plus one
+---   echo col("'t")      " column of mark t
 ---   echo col("'" .. markname)  " column of mark markname
 --- <The first column is 1.  Returns 0 if {expr} is invalid or when
 --- the window with ID {winid} is not found.
@@ -4809,9 +4809,9 @@ function vim.fn.libcallnr(libname, funcname, argument) end
 --- that window instead of the current window.
 --- Returns 0 for invalid values of {expr} and {winid}.
 --- Examples: >vim
----   echo line(".")    " line number of the cursor
----   echo line(".", winid)  " idem, in window "winid"
----   echo line("'t")    " line number of mark t
+---   echo line(".")      " line number of the cursor
+---   echo line(".", winid)    " idem, in window "winid"
+---   echo line("'t")      " line number of mark t
 ---   echo line("'" .. marker)  " line number of mark marker
 --- <
 --- To jump to the last known position when opening a file see
@@ -6303,11 +6303,11 @@ function vim.fn.rand(expr) end
 --- start this is an error.
 --- Examples: >vim
 ---   echo range(4)    " [0, 1, 2, 3]
----   echo range(2, 4)    " [2, 3, 4]
----   echo range(2, 9, 3)    " [2, 5, 8]
+---   echo range(2, 4)  " [2, 3, 4]
+---   echo range(2, 9, 3)  " [2, 5, 8]
 ---   echo range(2, -2, -1)  " [2, 1, 0, -1, -2]
 ---   echo range(0)    " []
----   echo range(2, 0)    " error!
+---   echo range(2, 0)  " error!
 --- <
 ---
 --- @param expr any
@@ -8801,7 +8801,7 @@ function vim.fn.strdisplaywidth(string, col) end
 ---   echo strftime("%c")       " Sun Apr 27 11:49:23 1997
 ---   echo strftime("%Y %b %d %X")     " 1997 Apr 27 11:53:25
 ---   echo strftime("%y%m%d %T")     " 970427 11:53:55
----   echo strftime("%H:%M")             " 11:55
+---   echo strftime("%H:%M")       " 11:55
 ---   echo strftime("%c", getftime("file.c"))
 ---            " Show mod time of file.c.
 ---
@@ -8834,8 +8834,8 @@ function vim.fn.strgetchar(str, index) end
 --- -1 is returned if the {needle} does not occur in {haystack}.
 --- See also |strridx()|.
 --- Examples: >vim
----   echo stridx("An Example", "Example")       " 3
----   echo stridx("Starting point", "Start")    " 0
+---   echo stridx("An Example", "Example")     " 3
+---   echo stridx("Starting point", "Start")   " 0
 ---   echo stridx("Starting point", "start")   " -1
 --- <        *strstr()* *strchr()*
 --- stridx() works similar to the C function strstr().  When used
-- 
cgit 


From 4a06de40e7c5bfe3be8f243b23b1676034fc6b08 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Wed, 2 Aug 2023 20:22:44 +0200
Subject: docs(lua): fix generated `fname` param annotations #24533

---
 runtime/lua/vim/_meta/vimfn.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index b15d780121..bb11e34a57 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -1315,7 +1315,7 @@ function vim.fn.deepcopy(expr, noref) end
 --- operation was successful and -1/true when the deletion failed
 --- or partly failed.
 ---
---- @param fname integer
+--- @param fname string
 --- @param flags? string
 --- @return integer
 function vim.fn.delete(fname, flags) end
@@ -2222,7 +2222,7 @@ function vim.fn.fnameescape(string) end
 --- Note: Environment variables don't work in {fname}, use
 --- |expand()| first then.
 ---
---- @param fname integer
+--- @param fname string
 --- @param mods string
 --- @return string
 function vim.fn.fnamemodify(fname, mods) end
@@ -3029,7 +3029,7 @@ function vim.fn.getfontname(name) end
 ---
 --- For setting permissions use |setfperm()|.
 ---
---- @param fname integer
+--- @param fname string
 --- @return string
 function vim.fn.getfperm(fname) end
 
@@ -3040,7 +3040,7 @@ function vim.fn.getfperm(fname) end
 --- If the size of {fname} is too big to fit in a Number then -2
 --- is returned.
 ---
---- @param fname integer
+--- @param fname string
 --- @return integer
 function vim.fn.getfsize(fname) end
 
@@ -3050,7 +3050,7 @@ function vim.fn.getfsize(fname) end
 --- |localtime()| and |strftime()|.
 --- If the file {fname} can't be found -1 is returned.
 ---
---- @param fname integer
+--- @param fname string
 --- @return integer
 function vim.fn.getftime(fname) end
 
@@ -3073,7 +3073,7 @@ function vim.fn.getftime(fname) end
 --- systems that support it.  On some systems only "dir" and
 --- "file" are returned.
 ---
---- @param fname integer
+--- @param fname string
 --- @return 'file'|'dir'|'link'|'bdev'|'cdev'|'socket'|'fifo'|'other'
 function vim.fn.getftype(fname) end
 
@@ -6339,7 +6339,7 @@ function vim.fn.range(expr, max, stride) end
 --- is truncated.
 --- Also see |readfile()| and |writefile()|.
 ---
---- @param fname integer
+--- @param fname string
 --- @param offset? any
 --- @param size? any
 --- @return any
@@ -6411,7 +6411,7 @@ function vim.fn.readdir(directory, expr) end
 --- the result is an empty list.
 --- Also see |writefile()|.
 ---
---- @param fname integer
+--- @param fname string
 --- @param type? any
 --- @param max? any
 --- @return any
@@ -7441,7 +7441,7 @@ function vim.fn.setenv(name, val) end
 ---
 --- To read permissions see |getfperm()|.
 ---
---- @param fname integer
+--- @param fname string
 --- @param mode string
 --- @return any
 function vim.fn.setfperm(fname, mode) end
@@ -9127,7 +9127,7 @@ function vim.fn.swapfilelist() end
 ---   Not a swap file: does not contain correct block ID
 ---   Magic number mismatch: Info in first block is invalid
 ---
---- @param fname integer
+--- @param fname string
 --- @return any
 function vim.fn.swapinfo(fname) end
 
@@ -10391,7 +10391,7 @@ function vim.fn.wordcount() end
 ---   call writefile(fl, "foocopy", "b")
 ---
 --- @param object any
---- @param fname integer
+--- @param fname string
 --- @param flags? string
 --- @return any
 function vim.fn.writefile(object, fname, flags) end
-- 
cgit 


From 214b125132778c5d51d4d7e673d31a9be835e150 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Thu, 3 Aug 2023 17:52:21 +0800
Subject: fix(gen_lsp.lua): no notifications in lsp.Methods #24530

Problem:
- Notifications are missing from `lsp.Methods`.
- Need a way to represent `$/` prefixed methods.

Solution:
- Generate notifications.
- Use "dollar_" prefix for `$/` methods.
---
 runtime/lua/vim/lsp/protocol.lua | 86 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 3844c697c6..0755fa991f 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -954,22 +954,46 @@ protocol.Methods = {
   --- parameter is of type {@link DocumentLink} the response
   --- is of type {@link DocumentLink} or a Thenable that resolves to such.
   documentLink_resolve = 'documentLink/resolve',
+  dollar_cancelRequest = '$/cancelRequest',
+  dollar_logTrace = '$/logTrace',
+  dollar_progress = '$/progress',
+  dollar_setTrace = '$/setTrace',
+  --- The exit event is sent from the client to the server to
+  --- ask the server to exit its process.
+  exit = 'exit',
   --- The initialize request is sent from the client to the server.
   --- It is sent once as the request after starting up the server.
   --- The requests parameter is of type {@link InitializeParams}
   --- the response if of type {@link InitializeResult} of a Thenable that
   --- resolves to such.
   initialize = 'initialize',
+  --- The initialized notification is sent from the client to the
+  --- server after the client is fully initialized and the server
+  --- is allowed to send requests from the server to the client.
+  initialized = 'initialized',
   --- A request to resolve additional properties for an inlay hint.
   --- The request's parameter is of type {@link InlayHint}, the response is
   --- of type {@link InlayHint} or a Thenable that resolves to such.
   --- @since 3.17.0
   inlayHint_resolve = 'inlayHint/resolve',
+  notebookDocument_didChange = 'notebookDocument/didChange',
+  --- A notification sent when a notebook closes.
+  --- @since 3.17.0
+  notebookDocument_didClose = 'notebookDocument/didClose',
+  --- A notification sent when a notebook opens.
+  --- @since 3.17.0
+  notebookDocument_didOpen = 'notebookDocument/didOpen',
+  --- A notification sent when a notebook document is saved.
+  --- @since 3.17.0
+  notebookDocument_didSave = 'notebookDocument/didSave',
   --- A shutdown request is sent from the client to the server.
   --- It is sent once when the client decides to shutdown the
   --- server. The only notification that is sent after a shutdown request
   --- is the exit event.
   shutdown = 'shutdown',
+  --- The telemetry event notification is sent from the server to the client to ask
+  --- the client to log telemetry data.
+  telemetry_event = 'telemetry/event',
   --- A request to provide commands for the given text document and range.
   textDocument_codeAction = 'textDocument/codeAction',
   --- A request to provide code lens for the given text document.
@@ -1003,6 +1027,29 @@ protocol.Methods = {
   --- The document diagnostic request definition.
   --- @since 3.17.0
   textDocument_diagnostic = 'textDocument/diagnostic',
+  --- The document change notification is sent from the client to the server to signal
+  --- changes to a text document.
+  textDocument_didChange = 'textDocument/didChange',
+  --- The document close notification is sent from the client to the server when
+  --- the document got closed in the client. The document's truth now exists where
+  --- the document's uri points to (e.g. if the document's uri is a file uri the
+  --- truth now exists on disk). As with the open notification the close notification
+  --- is about managing the document's content. Receiving a close notification
+  --- doesn't mean that the document was open in an editor before. A close
+  --- notification requires a previous open notification to be sent.
+  textDocument_didClose = 'textDocument/didClose',
+  --- The document open notification is sent from the client to the server to signal
+  --- newly opened text documents. The document's truth is now managed by the client
+  --- and the server must not try to read the document's truth using the document's
+  --- uri. Open in this sense means it is managed by the client. It doesn't necessarily
+  --- mean that its content is presented in an editor. An open notification must not
+  --- be sent more than once without a corresponding close notification send before.
+  --- This means open and close notification must be balanced and the max open count
+  --- is one.
+  textDocument_didOpen = 'textDocument/didOpen',
+  --- The document save notification is sent from the client to the server when
+  --- the document got saved in the client.
+  textDocument_didSave = 'textDocument/didSave',
   --- A request to list all color symbols found in a given text document. The request's
   --- parameter is of type {@link DocumentColorParams} the
   --- response is of type {@link ColorInformation ColorInformation[]} or a Thenable
@@ -1025,7 +1072,7 @@ protocol.Methods = {
   --- response is of type {@link FoldingRangeList} or a Thenable
   --- that resolves to such.
   textDocument_foldingRange = 'textDocument/foldingRange',
-  --- A request to format a whole document.
+  --- A request to to format a whole document.
   textDocument_formatting = 'textDocument/formatting',
   --- Request to request hover information at a given text document position. The request's
   --- parameter is of type {@link TextDocumentPosition} the response is of
@@ -1071,6 +1118,9 @@ protocol.Methods = {
   --- Can be used as an input to a subtypes or supertypes type hierarchy.
   --- @since 3.17.0
   textDocument_prepareTypeHierarchy = 'textDocument/prepareTypeHierarchy',
+  --- Diagnostics notification are sent from the server to the client to signal
+  --- results of validation runs.
+  textDocument_publishDiagnostics = 'textDocument/publishDiagnostics',
   --- A request to format a range in a document.
   textDocument_rangeFormatting = 'textDocument/rangeFormatting',
   --- A request to format ranges in a document.
@@ -1101,6 +1151,9 @@ protocol.Methods = {
   --- (#TextDocumentPositionParams) the response is of type {@link Definition} or a
   --- Thenable that resolves to such.
   textDocument_typeDefinition = 'textDocument/typeDefinition',
+  --- A document will save notification is sent from the client to the server before
+  --- the document is actually saved.
+  textDocument_willSave = 'textDocument/willSave',
   --- A document will save request is sent from the client to the server before
   --- the document is actually saved. The request can return an array of TextEdits
   --- which will be applied to the text document before it is saved. Please note that
@@ -1114,15 +1167,24 @@ protocol.Methods = {
   --- A request to resolve the supertypes for a given `TypeHierarchyItem`.
   --- @since 3.17.0
   typeHierarchy_supertypes = 'typeHierarchy/supertypes',
+  --- The log message notification is sent from the server to the client to ask
+  --- the client to log a particular message.
+  window_logMessage = 'window/logMessage',
   --- A request to show a document. This request might open an
   --- external program depending on the value of the URI to open.
   --- For example a request to open `https://code.visualstudio.com/`
   --- will very likely open the URI in a WEB browser.
   --- @since 3.16.0
   window_showDocument = 'window/showDocument',
+  --- The show message notification is sent from a server to a client to ask
+  --- the client to display a particular message in the user interface.
+  window_showMessage = 'window/showMessage',
   --- The show message request is sent from the server to the client to show a message
   --- and a set of options actions to the user.
   window_showMessageRequest = 'window/showMessageRequest',
+  --- The `window/workDoneProgress/cancel` notification is sent from  the client to the server to cancel a progress
+  --- initiated on the server side.
+  window_workDoneProgress_cancel = 'window/workDoneProgress/cancel',
   --- The `window/workDoneProgress/create` request is sent from the server to the client to initiate progress
   --- reporting from the server.
   window_workDoneProgress_create = 'window/workDoneProgress/create',
@@ -1148,6 +1210,28 @@ protocol.Methods = {
   --- The diagnostic refresh request definition.
   --- @since 3.17.0
   workspace_diagnostic_refresh = 'workspace/diagnostic/refresh',
+  --- The configuration change notification is sent from the client to the server
+  --- when the client's configuration has changed. The notification contains
+  --- the changed configuration as defined by the language client.
+  workspace_didChangeConfiguration = 'workspace/didChangeConfiguration',
+  --- The watched files notification is sent from the client to the server when
+  --- the client detects changes to file watched by the language client.
+  workspace_didChangeWatchedFiles = 'workspace/didChangeWatchedFiles',
+  --- The `workspace/didChangeWorkspaceFolders` notification is sent from the client to the server when the workspace
+  --- folder configuration changes.
+  workspace_didChangeWorkspaceFolders = 'workspace/didChangeWorkspaceFolders',
+  --- The did create files notification is sent from the client to the server when
+  --- files were created from within the client.
+  --- @since 3.16.0
+  workspace_didCreateFiles = 'workspace/didCreateFiles',
+  --- The will delete files request is sent from the client to the server before files are actually
+  --- deleted as long as the deletion is triggered from within the client.
+  --- @since 3.16.0
+  workspace_didDeleteFiles = 'workspace/didDeleteFiles',
+  --- The did rename files notification is sent from the client to the server when
+  --- files were renamed from within the client.
+  --- @since 3.16.0
+  workspace_didRenameFiles = 'workspace/didRenameFiles',
   --- A request send from the client to the server to execute a command. The request might return
   --- a workspace edit which the client will apply to the workspace.
   workspace_executeCommand = 'workspace/executeCommand',
-- 
cgit 


From f1772272b4fda43c093fc495f54b5e7c11968d62 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Thu, 3 Aug 2023 19:03:48 +0800
Subject: refactor(lsp): use protocol.Methods instead of strings #24537

---
 runtime/lua/vim/lsp.lua                 | 101 ++++++++++++++++----------------
 runtime/lua/vim/lsp/_watchfiles.lua     |   3 +-
 runtime/lua/vim/lsp/buf.lua             |  54 ++++++++---------
 runtime/lua/vim/lsp/codelens.lua        |   5 +-
 runtime/lua/vim/lsp/diagnostic.lua      |   9 +--
 runtime/lua/vim/lsp/handlers.lua        |  71 +++++++++++-----------
 runtime/lua/vim/lsp/inlay_hint.lua      |  15 ++---
 runtime/lua/vim/lsp/semantic_tokens.lua |   5 +-
 runtime/lua/vim/lsp/tagfunc.lua         |   5 +-
 9 files changed, 138 insertions(+), 130 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index edf69af718..b4c853d3d4 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -3,6 +3,7 @@ local default_handlers = require('vim.lsp.handlers')
 local log = require('vim.lsp.log')
 local lsp_rpc = require('vim.lsp.rpc')
 local protocol = require('vim.lsp.protocol')
+local ms = protocol.Methods
 local util = require('vim.lsp.util')
 local sync = require('vim.lsp.sync')
 local semantic_tokens = require('vim.lsp.semantic_tokens')
@@ -35,34 +36,34 @@ local lsp = {
 
 -- maps request name to the required server_capability in the client.
 lsp._request_name_to_capability = {
-  ['textDocument/hover'] = { 'hoverProvider' },
-  ['textDocument/signatureHelp'] = { 'signatureHelpProvider' },
-  ['textDocument/definition'] = { 'definitionProvider' },
-  ['textDocument/implementation'] = { 'implementationProvider' },
-  ['textDocument/declaration'] = { 'declarationProvider' },
-  ['textDocument/typeDefinition'] = { 'typeDefinitionProvider' },
-  ['textDocument/documentSymbol'] = { 'documentSymbolProvider' },
-  ['textDocument/prepareCallHierarchy'] = { 'callHierarchyProvider' },
-  ['callHierarchy/incomingCalls'] = { 'callHierarchyProvider' },
-  ['callHierarchy/outgoingCalls'] = { 'callHierarchyProvider' },
-  ['textDocument/rename'] = { 'renameProvider' },
-  ['textDocument/prepareRename'] = { 'renameProvider', 'prepareProvider' },
-  ['textDocument/codeAction'] = { 'codeActionProvider' },
-  ['textDocument/codeLens'] = { 'codeLensProvider' },
-  ['codeLens/resolve'] = { 'codeLensProvider', 'resolveProvider' },
-  ['codeAction/resolve'] = { 'codeActionProvider', 'resolveProvider' },
-  ['workspace/executeCommand'] = { 'executeCommandProvider' },
-  ['workspace/symbol'] = { 'workspaceSymbolProvider' },
-  ['textDocument/references'] = { 'referencesProvider' },
-  ['textDocument/rangeFormatting'] = { 'documentRangeFormattingProvider' },
-  ['textDocument/formatting'] = { 'documentFormattingProvider' },
-  ['textDocument/completion'] = { 'completionProvider' },
-  ['textDocument/documentHighlight'] = { 'documentHighlightProvider' },
-  ['textDocument/semanticTokens/full'] = { 'semanticTokensProvider' },
-  ['textDocument/semanticTokens/full/delta'] = { 'semanticTokensProvider' },
-  ['textDocument/inlayHint'] = { 'inlayHintProvider' },
-  ['textDocument/diagnostic'] = { 'diagnosticProvider' },
-  ['inlayHint/resolve'] = { 'inlayHintProvider', 'resolveProvider' },
+  [ms.textDocument_hover] = { 'hoverProvider' },
+  [ms.textDocument_signatureHelp] = { 'signatureHelpProvider' },
+  [ms.textDocument_definition] = { 'definitionProvider' },
+  [ms.textDocument_implementation] = { 'implementationProvider' },
+  [ms.textDocument_declaration] = { 'declarationProvider' },
+  [ms.textDocument_typeDefinition] = { 'typeDefinitionProvider' },
+  [ms.textDocument_documentSymbol] = { 'documentSymbolProvider' },
+  [ms.textDocument_prepareCallHierarchy] = { 'callHierarchyProvider' },
+  [ms.callHierarchy_incomingCalls] = { 'callHierarchyProvider' },
+  [ms.callHierarchy_outgoingCalls] = { 'callHierarchyProvider' },
+  [ms.textDocument_rename] = { 'renameProvider' },
+  [ms.textDocument_prepareRename] = { 'renameProvider', 'prepareProvider' },
+  [ms.textDocument_codeAction] = { 'codeActionProvider' },
+  [ms.textDocument_codeLens] = { 'codeLensProvider' },
+  [ms.codeLens_resolve] = { 'codeLensProvider', 'resolveProvider' },
+  [ms.codeAction_resolve] = { 'codeActionProvider', 'resolveProvider' },
+  [ms.workspace_executeCommand] = { 'executeCommandProvider' },
+  [ms.workspace_symbol] = { 'workspaceSymbolProvider' },
+  [ms.textDocument_references] = { 'referencesProvider' },
+  [ms.textDocument_rangeFormatting] = { 'documentRangeFormattingProvider' },
+  [ms.textDocument_formatting] = { 'documentFormattingProvider' },
+  [ms.textDocument_completion] = { 'completionProvider' },
+  [ms.textDocument_documentHighlight] = { 'documentHighlightProvider' },
+  [ms.textDocument_semanticTokens_full] = { 'semanticTokensProvider' },
+  [ms.textDocument_semanticTokens_full_delta] = { 'semanticTokensProvider' },
+  [ms.textDocument_inlayHint] = { 'inlayHintProvider' },
+  [ms.textDocument_diagnostic] = { 'diagnosticProvider' },
+  [ms.inlayHint_resolve] = { 'inlayHintProvider', 'resolveProvider' },
 }
 
 -- TODO improve handling of scratch buffers with LSP attached.
@@ -583,7 +584,7 @@ do
     local uri = vim.uri_from_bufnr(bufnr)
     for _, client in pairs(state.clients) do
       if not client.is_stopped() and lsp.buf_is_attached(bufnr, client.id) then
-        client.notify('textDocument/didChange', {
+        client.notify(ms.textDocument_didChange, {
           textDocument = {
             uri = uri,
             version = util.buf_versions[bufnr],
@@ -701,7 +702,7 @@ local function text_document_did_open_handler(bufnr, client)
       text = buf_get_full_text(bufnr),
     },
   }
-  client.notify('textDocument/didOpen', params)
+  client.notify(ms.textDocument_didOpen, params)
   util.buf_versions[bufnr] = params.textDocument.version
 
   -- Next chance we get, we should re-do the diagnostics
@@ -930,17 +931,17 @@ end
 ---@param client lsp.Client
 function lsp._set_defaults(client, bufnr)
   if
-    client.supports_method('textDocument/definition') and is_empty_or_default(bufnr, 'tagfunc')
+    client.supports_method(ms.textDocument_definition) and is_empty_or_default(bufnr, 'tagfunc')
   then
     vim.bo[bufnr].tagfunc = 'v:lua.vim.lsp.tagfunc'
   end
   if
-    client.supports_method('textDocument/completion') and is_empty_or_default(bufnr, 'omnifunc')
+    client.supports_method(ms.textDocument_completion) and is_empty_or_default(bufnr, 'omnifunc')
   then
     vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc'
   end
   if
-    client.supports_method('textDocument/rangeFormatting')
+    client.supports_method(ms.textDocument_rangeFormatting)
     and is_empty_or_default(bufnr, 'formatprg')
     and is_empty_or_default(bufnr, 'formatexpr')
   then
@@ -948,14 +949,14 @@ function lsp._set_defaults(client, bufnr)
   end
   api.nvim_buf_call(bufnr, function()
     if
-      client.supports_method('textDocument/hover')
+      client.supports_method(ms.textDocument_hover)
       and is_empty_or_default(bufnr, 'keywordprg')
       and vim.fn.maparg('K', 'n', false, false) == ''
     then
       vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = bufnr })
     end
   end)
-  if client.supports_method('textDocument/diagnostic') then
+  if client.supports_method(ms.textDocument_diagnostic) then
     lsp.diagnostic._enable(bufnr)
   end
 end
@@ -1431,7 +1432,7 @@ function lsp.start_client(config)
       end
 
       if next(config.settings) then
-        client.notify('workspace/didChangeConfiguration', { settings = config.settings })
+        client.notify(ms.workspace_didChangeConfiguration, { settings = config.settings })
       end
 
       if config.on_init then
@@ -1573,7 +1574,7 @@ function lsp.start_client(config)
   ---If it is false, then it will always be false
   ---(the client has shutdown).
   function client.notify(method, params)
-    if method ~= 'textDocument/didChange' then
+    if method ~= ms.textDocument_didChange then
       changetracking.flush(client)
     end
 
@@ -1693,7 +1694,7 @@ function lsp.start_client(config)
       command = command.command,
       arguments = command.arguments,
     }
-    client.request('workspace/executeCommand', params, handler, context.bufnr)
+    client.request(ms.workspace_executeCommand, params, handler, context.bufnr)
   end
 
   ---@private
@@ -1763,12 +1764,12 @@ local function text_document_did_save_handler(bufnr)
     local name = api.nvim_buf_get_name(bufnr)
     local old_name = changetracking._get_and_set_name(client, bufnr, name)
     if old_name and name ~= old_name then
-      client.notify('textDocument/didClose', {
+      client.notify(ms.textDocument_didClose, {
         textDocument = {
           uri = vim.uri_from_fname(old_name),
         },
       })
-      client.notify('textDocument/didOpen', {
+      client.notify(ms.textDocument_didOpen, {
         textDocument = {
           version = 0,
           uri = uri,
@@ -1784,7 +1785,7 @@ local function text_document_did_save_handler(bufnr)
       if type(save_capability) == 'table' and save_capability.includeText then
         included_text = text(bufnr)
       end
-      client.notify('textDocument/didSave', {
+      client.notify(ms.textDocument_didSave, {
         textDocument = {
           uri = uri,
         },
@@ -1835,11 +1836,11 @@ function lsp.buf_attach_client(bufnr, client_id)
             reason = protocol.TextDocumentSaveReason.Manual,
           }
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'willSave') then
-            client.notify('textDocument/willSave', params)
+            client.notify(ms.textDocument_willSave, params)
           end
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'willSaveWaitUntil') then
             local result, err =
-              client.request_sync('textDocument/willSaveWaitUntil', params, 1000, ctx.buf)
+              client.request_sync(ms.textDocument_willSaveWaitUntil, params, 1000, ctx.buf)
             if result and result.result then
               util.apply_text_edits(result.result, ctx.buf, client.offset_encoding)
             elseif err then
@@ -1865,7 +1866,7 @@ function lsp.buf_attach_client(bufnr, client_id)
         for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
           changetracking.reset_buf(client, bufnr)
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
-            client.notify('textDocument/didClose', params)
+            client.notify(ms.textDocument_didClose, params)
           end
           text_document_did_open_handler(bufnr, client)
         end
@@ -1875,7 +1876,7 @@ function lsp.buf_attach_client(bufnr, client_id)
         for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
           changetracking.reset_buf(client, bufnr)
           if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
-            client.notify('textDocument/didClose', params)
+            client.notify(ms.textDocument_didClose, params)
           end
           client.attached_buffers[bufnr] = nil
         end
@@ -1940,7 +1941,7 @@ function lsp.buf_detach_client(bufnr, client_id)
   if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then
     local uri = vim.uri_from_bufnr(bufnr)
     local params = { textDocument = { uri = uri } }
-    client.notify('textDocument/didClose', params)
+    client.notify(ms.textDocument_didClose, params)
   end
 
   client.attached_buffers[bufnr] = nil
@@ -2294,7 +2295,7 @@ function lsp.omnifunc(findstart, base)
   end
 
   local bufnr = resolve_bufnr()
-  local clients = lsp.get_clients({ bufnr = bufnr, method = 'textDocument/completion' })
+  local clients = lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_completion })
   local remaining = #clients
   if remaining == 0 then
     return findstart == 1 and -1 or {}
@@ -2326,7 +2327,7 @@ function lsp.omnifunc(findstart, base)
 
   for _, client in ipairs(clients) do
     local params = util.make_position_params(win, client.offset_encoding)
-    client.request('textDocument/completion', params, function(err, result)
+    client.request(ms.textDocument_completion, params, function(err, result)
       if err then
         log.warn(err.message)
       end
@@ -2397,7 +2398,7 @@ function lsp.formatexpr(opts)
   end
   local bufnr = api.nvim_get_current_buf()
   for _, client in pairs(lsp.get_clients({ bufnr = bufnr })) do
-    if client.supports_method('textDocument/rangeFormatting') then
+    if client.supports_method(ms.textDocument_rangeFormatting) then
       local params = util.make_formatting_params()
       local end_line = vim.fn.getline(end_lnum) --[[@as string]]
       local end_col = util._str_utfindex_enc(end_line, nil, client.offset_encoding)
@@ -2412,7 +2413,7 @@ function lsp.formatexpr(opts)
         },
       }
       local response =
-        client.request_sync('textDocument/rangeFormatting', params, timeout_ms, bufnr)
+        client.request_sync(ms.textDocument_rangeFormatting, params, timeout_ms, bufnr)
       if response and response.result then
         lsp.util.apply_text_edits(response.result, 0, client.offset_encoding)
         return 0
diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index b66f2f6f32..c271dc6e14 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -1,6 +1,7 @@
 local bit = require('bit')
 local watch = require('vim._watch')
 local protocol = require('vim.lsp.protocol')
+local ms = protocol.Methods
 local lpeg = vim.lpeg
 
 local M = {}
@@ -190,7 +191,7 @@ function M.register(reg, ctx)
 
           if not queue_timers[client_id] then
             queue_timers[client_id] = vim.defer_fn(function()
-              client.notify('workspace/didChangeWatchedFiles', {
+              client.notify(ms.workspace_didChangeWatchedFiles, {
                 changes = change_queues[client_id],
               })
               queue_timers[client_id] = nil
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 5e0e429021..59afaf6fa0 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -2,6 +2,7 @@ local api = vim.api
 local validate = vim.validate
 local util = require('vim.lsp.util')
 local npcall = vim.F.npcall
+local ms = require('vim.lsp.protocol').Methods
 
 local M = {}
 
@@ -41,7 +42,7 @@ end
 --- window. Calling the function twice will jump into the floating window.
 function M.hover()
   local params = util.make_position_params()
-  request('textDocument/hover', params)
+  request(ms.textDocument_hover, params)
 end
 
 local function request_with_options(name, params, options)
@@ -64,7 +65,7 @@ end
 ---     - on_list: (function) handler for list results. See |lsp-on-list-handler|
 function M.declaration(options)
   local params = util.make_position_params()
-  request_with_options('textDocument/declaration', params, options)
+  request_with_options(ms.textDocument_declaration, params, options)
 end
 
 --- Jumps to the definition of the symbol under the cursor.
@@ -74,7 +75,7 @@ end
 ---     - on_list: (function) handler for list results. See |lsp-on-list-handler|
 function M.definition(options)
   local params = util.make_position_params()
-  request_with_options('textDocument/definition', params, options)
+  request_with_options(ms.textDocument_definition, params, options)
 end
 
 --- Jumps to the definition of the type of the symbol under the cursor.
@@ -84,7 +85,7 @@ end
 ---     - on_list: (function) handler for list results. See |lsp-on-list-handler|
 function M.type_definition(options)
   local params = util.make_position_params()
-  request_with_options('textDocument/typeDefinition', params, options)
+  request_with_options(ms.textDocument_typeDefinition, params, options)
 end
 
 --- Lists all the implementations for the symbol under the cursor in the
@@ -94,14 +95,14 @@ end
 ---     - on_list: (function) handler for list results. See |lsp-on-list-handler|
 function M.implementation(options)
   local params = util.make_position_params()
-  request_with_options('textDocument/implementation', params, options)
+  request_with_options(ms.textDocument_implementation, params, options)
 end
 
 --- Displays signature information about the symbol under the cursor in a
 --- floating window.
 function M.signature_help()
   local params = util.make_position_params()
-  request('textDocument/signatureHelp', params)
+  request(ms.textDocument_signatureHelp, params)
 end
 
 --- Retrieves the completion items at the current cursor position. Can only be
@@ -115,7 +116,7 @@ end
 function M.completion(context)
   local params = util.make_position_params()
   params.context = context
-  return request('textDocument/completion', params)
+  return request(ms.textDocument_completion, params)
 end
 
 ---@param bufnr integer
@@ -199,7 +200,7 @@ function M.format(options)
   if not range and mode == 'v' or mode == 'V' then
     range = range_from_selection(bufnr, mode)
   end
-  local method = range and 'textDocument/rangeFormatting' or 'textDocument/formatting'
+  local method = range and ms.textDocument_rangeFormatting or ms.textDocument_formatting
 
   local clients = vim.lsp.get_clients({
     id = options.id,
@@ -270,7 +271,7 @@ function M.rename(new_name, options)
     bufnr = bufnr,
     name = options.name,
     -- Clients must at least support rename, prepareRename is optional
-    method = 'textDocument/rename',
+    method = ms.textDocument_rename,
   })
   if options.filter then
     clients = vim.tbl_filter(options.filter, clients)
@@ -305,17 +306,17 @@ function M.rename(new_name, options)
     local function rename(name)
       local params = util.make_position_params(win, client.offset_encoding)
       params.newName = name
-      local handler = client.handlers['textDocument/rename']
-        or vim.lsp.handlers['textDocument/rename']
-      client.request('textDocument/rename', params, function(...)
+      local handler = client.handlers[ms.textDocument_rename]
+        or vim.lsp.handlers[ms.textDocument_rename]
+      client.request(ms.textDocument_rename, params, function(...)
         handler(...)
         try_use_client(next(clients, idx))
       end, bufnr)
     end
 
-    if client.supports_method('textDocument/prepareRename') then
+    if client.supports_method(ms.textDocument_prepareRename) then
       local params = util.make_position_params(win, client.offset_encoding)
-      client.request('textDocument/prepareRename', params, function(err, result)
+      client.request(ms.textDocument_prepareRename, params, function(err, result)
         if err or result == nil then
           if next(clients, idx) then
             try_use_client(next(clients, idx))
@@ -354,7 +355,7 @@ function M.rename(new_name, options)
       end, bufnr)
     else
       assert(
-        client.supports_method('textDocument/rename'),
+        client.supports_method(ms.textDocument_rename),
         'Client must support textDocument/rename'
       )
       if new_name then
@@ -390,7 +391,7 @@ function M.references(context, options)
   params.context = context or {
     includeDeclaration = true,
   }
-  request_with_options('textDocument/references', params, options)
+  request_with_options(ms.textDocument_references, params, options)
 end
 
 --- Lists all symbols in the current buffer in the quickfix window.
@@ -399,7 +400,7 @@ end
 ---     - on_list: (function) handler for list results. See |lsp-on-list-handler|
 function M.document_symbol(options)
   local params = { textDocument = util.make_text_document_params() }
-  request_with_options('textDocument/documentSymbol', params, options)
+  request_with_options(ms.textDocument_documentSymbol, params, options)
 end
 
 local function pick_call_hierarchy_item(call_hierarchy_items)
@@ -423,7 +424,7 @@ end
 
 local function call_hierarchy(method)
   local params = util.make_position_params()
-  request('textDocument/prepareCallHierarchy', params, function(err, result, ctx)
+  request(ms.textDocument_prepareCallHierarchy, params, function(err, result, ctx)
     if err then
       vim.notify(err.message, vim.log.levels.WARN)
       return
@@ -496,7 +497,7 @@ function M.add_workspace_folder(workspace_folder)
       end
     end
     if not found then
-      client.notify('workspace/didChangeWorkspaceFolders', params)
+      client.notify(ms.workspace_didChangeWorkspaceFolders, params)
       if not client.workspace_folders then
         client.workspace_folders = {}
       end
@@ -524,7 +525,7 @@ function M.remove_workspace_folder(workspace_folder)
   for _, client in pairs(vim.lsp.get_clients({ bufnr = bufnr })) do
     for idx, folder in pairs(client.workspace_folders) do
       if folder.name == workspace_folder then
-        client.notify('workspace/didChangeWorkspaceFolders', params)
+        client.notify(ms.workspace_didChangeWorkspaceFolders, params)
         client.workspace_folders[idx] = nil
         return
       end
@@ -548,7 +549,7 @@ function M.workspace_symbol(query, options)
     return
   end
   local params = { query = query }
-  request_with_options('workspace/symbol', params, options)
+  request_with_options(ms.workspace_symbol, params, options)
 end
 
 --- Send request to the server to resolve document highlights for the current
@@ -567,7 +568,7 @@ end
 ---         |hl-LspReferenceWrite|
 function M.document_highlight()
   local params = util.make_position_params()
-  request('textDocument/documentHighlight', params)
+  request(ms.textDocument_documentHighlight, params)
 end
 
 --- Removes document highlights from current buffer.
@@ -655,7 +656,7 @@ local function on_code_action_results(results, ctx, options)
     local client = vim.lsp.get_client_by_id(action_tuple[1])
     local action = action_tuple[2]
 
-    local reg = client.dynamic_capabilities:get('textDocument/codeAction', { bufnr = ctx.bufnr })
+    local reg = client.dynamic_capabilities:get(ms.textDocument_codeAction, { bufnr = ctx.bufnr })
 
     local supports_resolve = vim.tbl_get(reg or {}, 'registerOptions', 'resolveProvider')
       or client.supports_method('codeAction/resolve')
@@ -694,9 +695,8 @@ end
 --- with all aggregated results
 local function code_action_request(params, options)
   local bufnr = api.nvim_get_current_buf()
-  local method = 'textDocument/codeAction'
-  vim.lsp.buf_request_all(bufnr, method, params, function(results)
-    local ctx = { bufnr = bufnr, method = method, params = params }
+  vim.lsp.buf_request_all(bufnr, ms.textDocument_codeAction, params, function(results)
+    local ctx = { bufnr = bufnr, method = ms.textDocument_codeAction, params = params }
     on_code_action_results(results, ctx, options)
   end)
 end
@@ -776,7 +776,7 @@ function M.execute_command(command_params)
     arguments = command_params.arguments,
     workDoneToken = command_params.workDoneToken,
   }
-  request('workspace/executeCommand', command_params)
+  request(ms.workspace_executeCommand, command_params)
 end
 
 return M
diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index a516238ae0..d581eb985f 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -1,5 +1,6 @@
 local util = require('vim.lsp.util')
 local log = require('vim.lsp.log')
+local ms = require('vim.lsp.protocol').Methods
 local api = vim.api
 local M = {}
 
@@ -33,7 +34,7 @@ local function execute_lens(lens, bufnr, client_id)
   local client = vim.lsp.get_client_by_id(client_id)
   assert(client, 'Client is required to execute lens, client_id=' .. client_id)
   client._exec_cmd(lens.command, { bufnr = bufnr }, function(...)
-    vim.lsp.handlers['workspace/executeCommand'](...)
+    vim.lsp.handlers[ms.workspace_executeCommand](...)
     M.refresh()
   end)
 end
@@ -267,7 +268,7 @@ function M.refresh()
     return
   end
   active_refreshes[bufnr] = true
-  vim.lsp.buf_request(0, 'textDocument/codeLens', params, M.on_codelens)
+  vim.lsp.buf_request(0, ms.textDocument_codeLens, params, M.on_codelens)
 end
 
 return M
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index 44bb90d985..a0568bc09c 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -2,6 +2,7 @@
 
 local util = require('vim.lsp.util')
 local protocol = require('vim.lsp.protocol')
+local ms = protocol.Methods
 
 local api = vim.api
 
@@ -422,13 +423,13 @@ function M._enable(bufnr)
       buffer = bufnr,
       callback = function(opts)
         if
-          opts.data.method ~= 'textDocument/didChange'
-          and opts.data.method ~= 'textDocument/didOpen'
+          opts.data.method ~= ms.textDocument_didChange
+          and opts.data.method ~= ms.textDocument_didOpen
         then
           return
         end
         if bufstates[bufnr] and bufstates[bufnr].enabled then
-          util._refresh('textDocument/diagnostic', { bufnr = bufnr, only_visible = true })
+          util._refresh(ms.textDocument_diagnostic, { bufnr = bufnr, only_visible = true })
         end
       end,
       group = augroup,
@@ -437,7 +438,7 @@ function M._enable(bufnr)
     api.nvim_buf_attach(bufnr, false, {
       on_reload = function()
         if bufstates[bufnr] and bufstates[bufnr].enabled then
-          util._refresh('textDocument/diagnostic', { bufnr = bufnr })
+          util._refresh(ms.textDocument_diagnostic, { bufnr = bufnr })
         end
       end,
       on_detach = function()
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index d887183972..6fe4b7f939 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -1,5 +1,6 @@
 local log = require('vim.lsp.log')
 local protocol = require('vim.lsp.protocol')
+local ms = protocol.Methods
 local util = require('vim.lsp.util')
 local api = vim.api
 
@@ -15,14 +16,14 @@ local function err_message(...)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_executeCommand
-M['workspace/executeCommand'] = function(_, _, _, _)
+M[ms.workspace_executeCommand] = function(_, _, _, _)
   -- Error handling is done implicitly by wrapping all handlers; see end of this file
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#progress
 ---@param result lsp.ProgressParams
 ---@param ctx lsp.HandlerContext
-M['$/progress'] = function(_, result, ctx)
+M[ms.dollar_progress] = function(_, result, ctx)
   local client = vim.lsp.get_client_by_id(ctx.client_id)
   if not client then
     err_message('LSP[id=', tostring(ctx.client_id), '] client has shut down during progress update')
@@ -58,7 +59,7 @@ end
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#window_workDoneProgress_create
 ---@param result lsp.WorkDoneProgressCreateParams
 ---@param ctx lsp.HandlerContext
-M['window/workDoneProgress/create'] = function(_, result, ctx)
+M[ms.window_workDoneProgress_create] = function(_, result, ctx)
   local client = vim.lsp.get_client_by_id(ctx.client_id)
   if not client then
     err_message('LSP[id=', tostring(ctx.client_id), '] client has shut down during progress update')
@@ -70,7 +71,7 @@ end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#window_showMessageRequest
 ---@param result lsp.ShowMessageRequestParams
-M['window/showMessageRequest'] = function(_, result)
+M[ms.window_showMessageRequest] = function(_, result)
   local actions = result.actions or {}
   local co, is_main = coroutine.running()
   if co and not is_main then
@@ -105,7 +106,7 @@ M['window/showMessageRequest'] = function(_, result)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_registerCapability
-M['client/registerCapability'] = function(_, result, ctx)
+M[ms.client_registerCapability] = function(_, result, ctx)
   local client_id = ctx.client_id
   ---@type lsp.Client
   local client = vim.lsp.get_client_by_id(client_id)
@@ -118,7 +119,7 @@ M['client/registerCapability'] = function(_, result, ctx)
   ---@type string[]
   local unsupported = {}
   for _, reg in ipairs(result.registrations) do
-    if reg.method == 'workspace/didChangeWatchedFiles' then
+    if reg.method == ms.workspace_didChangeWatchedFiles then
       require('vim.lsp._watchfiles').register(reg, ctx)
     elseif not client.dynamic_capabilities:supports_registration(reg.method) then
       unsupported[#unsupported + 1] = reg.method
@@ -136,13 +137,13 @@ M['client/registerCapability'] = function(_, result, ctx)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#client_unregisterCapability
-M['client/unregisterCapability'] = function(_, result, ctx)
+M[ms.client_unregisterCapability] = function(_, result, ctx)
   local client_id = ctx.client_id
   local client = vim.lsp.get_client_by_id(client_id)
   client.dynamic_capabilities:unregister(result.unregisterations)
 
   for _, unreg in ipairs(result.unregisterations) do
-    if unreg.method == 'workspace/didChangeWatchedFiles' then
+    if unreg.method == ms.workspace_didChangeWatchedFiles then
       require('vim.lsp._watchfiles').unregister(unreg, ctx)
     end
   end
@@ -150,7 +151,7 @@ M['client/unregisterCapability'] = function(_, result, ctx)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_applyEdit
-M['workspace/applyEdit'] = function(_, workspace_edit, ctx)
+M[ms.workspace_applyEdit] = function(_, workspace_edit, ctx)
   assert(
     workspace_edit,
     'workspace/applyEdit must be called with `ApplyWorkspaceEditParams`. Server is violating the specification'
@@ -170,7 +171,7 @@ M['workspace/applyEdit'] = function(_, workspace_edit, ctx)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_configuration
-M['workspace/configuration'] = function(_, result, ctx)
+M[ms.workspace_configuration] = function(_, result, ctx)
   local client_id = ctx.client_id
   local client = vim.lsp.get_client_by_id(client_id)
   if not client then
@@ -200,7 +201,7 @@ M['workspace/configuration'] = function(_, result, ctx)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_workspaceFolders
-M['workspace/workspaceFolders'] = function(_, _, ctx)
+M[ms.workspace_workspaceFolders] = function(_, _, ctx)
   local client_id = ctx.client_id
   local client = vim.lsp.get_client_by_id(client_id)
   if not client then
@@ -210,24 +211,24 @@ M['workspace/workspaceFolders'] = function(_, _, ctx)
   return client.workspace_folders or vim.NIL
 end
 
-M['textDocument/publishDiagnostics'] = function(...)
+M[ms.textDocument_publishDiagnostics] = function(...)
   return require('vim.lsp.diagnostic').on_publish_diagnostics(...)
 end
 
-M['textDocument/diagnostic'] = function(...)
+M[ms.textDocument_diagnostic] = function(...)
   return require('vim.lsp.diagnostic').on_diagnostic(...)
 end
 
-M['textDocument/codeLens'] = function(...)
+M[ms.textDocument_codeLens] = function(...)
   return require('vim.lsp.codelens').on_codelens(...)
 end
 
-M['textDocument/inlayHint'] = function(...)
+M[ms.textDocument_inlayHint] = function(...)
   return require('vim.lsp.inlay_hint').on_inlayhint(...)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_references
-M['textDocument/references'] = function(_, result, ctx, config)
+M[ms.textDocument_references] = function(_, result, ctx, config)
   if not result or vim.tbl_isempty(result) then
     vim.notify('No references found')
   else
@@ -283,7 +284,7 @@ local function response_to_list(map_result, entity, title_fn)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentSymbol
-M['textDocument/documentSymbol'] = response_to_list(
+M[ms.textDocument_documentSymbol] = response_to_list(
   util.symbols_to_items,
   'document symbols',
   function(ctx)
@@ -293,12 +294,12 @@ M['textDocument/documentSymbol'] = response_to_list(
 )
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_symbol
-M['workspace/symbol'] = response_to_list(util.symbols_to_items, 'symbols', function(ctx)
+M[ms.workspace_symbol] = response_to_list(util.symbols_to_items, 'symbols', function(ctx)
   return string.format("Symbols matching '%s'", ctx.params.query)
 end)
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_rename
-M['textDocument/rename'] = function(_, result, ctx, _)
+M[ms.textDocument_rename] = function(_, result, ctx, _)
   if not result then
     vim.notify("Language server couldn't provide rename result", vim.log.levels.INFO)
     return
@@ -308,7 +309,7 @@ M['textDocument/rename'] = function(_, result, ctx, _)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_rangeFormatting
-M['textDocument/rangeFormatting'] = function(_, result, ctx, _)
+M[ms.textDocument_rangeFormatting] = function(_, result, ctx, _)
   if not result then
     return
   end
@@ -317,7 +318,7 @@ M['textDocument/rangeFormatting'] = function(_, result, ctx, _)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_formatting
-M['textDocument/formatting'] = function(_, result, ctx, _)
+M[ms.textDocument_formatting] = function(_, result, ctx, _)
   if not result then
     return
   end
@@ -326,7 +327,7 @@ M['textDocument/formatting'] = function(_, result, ctx, _)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
-M['textDocument/completion'] = function(_, result, _, _)
+M[ms.textDocument_completion] = function(_, result, _, _)
   if vim.tbl_isempty(result or {}) then
     return
   end
@@ -380,7 +381,7 @@ function M.hover(_, result, ctx, config)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
-M['textDocument/hover'] = M.hover
+M[ms.textDocument_hover] = M.hover
 
 --- Jumps to a location. Used as a handler for multiple LSP methods.
 ---@param _ nil not used
@@ -420,13 +421,13 @@ local function location_handler(_, result, ctx, config)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_declaration
-M['textDocument/declaration'] = location_handler
+M[ms.textDocument_declaration] = location_handler
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_definition
-M['textDocument/definition'] = location_handler
+M[ms.textDocument_definition] = location_handler
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_typeDefinition
-M['textDocument/typeDefinition'] = location_handler
+M[ms.textDocument_typeDefinition] = location_handler
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_implementation
-M['textDocument/implementation'] = location_handler
+M[ms.textDocument_implementation] = location_handler
 
 --- |lsp-handler| for the method "textDocument/signatureHelp".
 --- The active parameter is highlighted with |hl-LspSignatureActiveParameter|.
@@ -477,10 +478,10 @@ function M.signature_help(_, result, ctx, config)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp
-M['textDocument/signatureHelp'] = M.signature_help
+M[ms.textDocument_signatureHelp] = M.signature_help
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentHighlight
-M['textDocument/documentHighlight'] = function(_, result, ctx, _)
+M[ms.textDocument_documentHighlight] = function(_, result, ctx, _)
   if not result then
     return
   end
@@ -523,13 +524,13 @@ local make_call_hierarchy_handler = function(direction)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#callHierarchy_incomingCalls
-M['callHierarchy/incomingCalls'] = make_call_hierarchy_handler('from')
+M[ms.callHierarchy_incomingCalls] = make_call_hierarchy_handler('from')
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#callHierarchy_outgoingCalls
-M['callHierarchy/outgoingCalls'] = make_call_hierarchy_handler('to')
+M[ms.callHierarchy_outgoingCalls] = make_call_hierarchy_handler('to')
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#window_logMessage
-M['window/logMessage'] = function(_, result, ctx, _)
+M[ms.window_logMessage] = function(_, result, ctx, _)
   local message_type = result.type
   local message = result.message
   local client_id = ctx.client_id
@@ -551,7 +552,7 @@ M['window/logMessage'] = function(_, result, ctx, _)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#window_showMessage
-M['window/showMessage'] = function(_, result, ctx, _)
+M[ms.window_showMessage] = function(_, result, ctx, _)
   local message_type = result.type
   local message = result.message
   local client_id = ctx.client_id
@@ -570,7 +571,7 @@ M['window/showMessage'] = function(_, result, ctx, _)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#window_showDocument
-M['window/showDocument'] = function(_, result, ctx, _)
+M[ms.window_showDocument] = function(_, result, ctx, _)
   local uri = result.uri
 
   if result.external then
@@ -611,7 +612,7 @@ M['window/showDocument'] = function(_, result, ctx, _)
 end
 
 ---@see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_inlayHint_refresh
-M['workspace/inlayHint/refresh'] = function(err, result, ctx, config)
+M[ms.workspace_inlayHint_refresh] = function(err, result, ctx, config)
   return require('vim.lsp.inlay_hint').on_refresh(err, result, ctx, config)
 end
 
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index 2bf0fb9cb2..eb2f59b312 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -1,5 +1,6 @@
 local util = require('vim.lsp.util')
 local log = require('vim.lsp.log')
+local ms = require('vim.lsp.protocol').Methods
 local api = vim.api
 local M = {}
 
@@ -87,7 +88,7 @@ function M.on_refresh(err, _, ctx, _)
       if api.nvim_win_get_buf(winid) == bufnr then
         local bufstate = bufstates[bufnr]
         if bufstate then
-          util._refresh('textDocument/inlayHint', { bufnr = bufnr })
+          util._refresh(ms.textDocument_inlayHint, { bufnr = bufnr })
           break
         end
       end
@@ -143,24 +144,24 @@ local function enable(bufnr)
       buffer = bufnr,
       callback = function(opts)
         if
-          opts.data.method ~= 'textDocument/didChange'
-          and opts.data.method ~= 'textDocument/didOpen'
+          opts.data.method ~= ms.textDocument_didChange
+          and opts.data.method ~= ms.textDocument_didOpen
         then
           return
         end
         if bufstates[bufnr] and bufstates[bufnr].enabled then
-          util._refresh('textDocument/inlayHint', { bufnr = bufnr })
+          util._refresh(ms.textDocument_inlayHint, { bufnr = bufnr })
         end
       end,
       group = augroup,
     })
-    util._refresh('textDocument/inlayHint', { bufnr = bufnr })
+    util._refresh(ms.textDocument_inlayHint, { bufnr = bufnr })
     api.nvim_buf_attach(bufnr, false, {
       on_reload = function(_, cb_bufnr)
         clear(cb_bufnr)
         if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
           bufstates[cb_bufnr].applied = {}
-          util._refresh('textDocument/inlayHint', { bufnr = cb_bufnr })
+          util._refresh(ms.textDocument_inlayHint, { bufnr = cb_bufnr })
         end
       end,
       on_detach = function(_, cb_bufnr)
@@ -176,7 +177,7 @@ local function enable(bufnr)
     })
   else
     bufstate.enabled = true
-    util._refresh('textDocument/inlayHint', { bufnr = bufnr })
+    util._refresh(ms.textDocument_inlayHint, { bufnr = bufnr })
   end
 end
 
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 84723bbc05..bab1b23ee4 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -1,6 +1,7 @@
 local api = vim.api
 local bit = require('bit')
 local handlers = require('vim.lsp.handlers')
+local ms = require('vim.lsp.protocol').Methods
 local util = require('vim.lsp.util')
 local uv = vim.uv
 
@@ -292,7 +293,7 @@ function STHighlighter:send_request()
       local hasEditProvider = type(spec) == 'table' and spec.delta
 
       local params = { textDocument = util.make_text_document_params(self.bufnr) }
-      local method = 'textDocument/semanticTokens/full'
+      local method = ms.textDocument_semanticTokens_full
 
       if hasEditProvider and current_result.result_id then
         method = method .. '/delta'
@@ -755,7 +756,7 @@ end
 --- the BufWinEnter event should take care of it next time it's displayed.
 ---
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#semanticTokens_refreshRequest
-handlers['workspace/semanticTokens/refresh'] = function(err, _, ctx)
+handlers[ms.workspace_semanticTokens_refresh] = function(err, _, ctx)
   if err then
     return vim.NIL
   end
diff --git a/runtime/lua/vim/lsp/tagfunc.lua b/runtime/lua/vim/lsp/tagfunc.lua
index c70eb573c2..957449743b 100644
--- a/runtime/lua/vim/lsp/tagfunc.lua
+++ b/runtime/lua/vim/lsp/tagfunc.lua
@@ -1,5 +1,6 @@
 local lsp = vim.lsp
 local util = lsp.util
+local ms = lsp.protocol.Methods
 
 local function mk_tag_item(name, range, uri, offset_encoding)
   local bufnr = vim.uri_to_bufnr(uri)
@@ -14,7 +15,7 @@ end
 
 local function query_definition(pattern)
   local params = util.make_position_params()
-  local results_by_client, err = lsp.buf_request_sync(0, 'textDocument/definition', params, 1000)
+  local results_by_client, err = lsp.buf_request_sync(0, ms.textDocument_definition, params, 1000)
   if err then
     return {}
   end
@@ -42,7 +43,7 @@ end
 
 local function query_workspace_symbols(pattern)
   local results_by_client, err =
-    lsp.buf_request_sync(0, 'workspace/symbol', { query = pattern }, 1000)
+    lsp.buf_request_sync(0, ms.workspace_symbol, { query = pattern }, 1000)
   if err then
     return {}
   end
-- 
cgit 


From d2f81330247ee060d557330b2716ccea8f789a50 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 12 Jul 2023 19:27:14 +0200
Subject: docs: misc

Co-authored-by: Kevin Pham <keevan.pham@gmail.com>
---
 runtime/doc/api.txt           | 19 ++++++++++---------
 runtime/doc/develop.txt       |  2 +-
 runtime/doc/lua.txt           | 44 ++++++++++++++++++++++++++-----------------
 runtime/doc/luaref.txt        | 30 ++++++++++++++---------------
 runtime/doc/news.txt          |  2 +-
 runtime/doc/various.txt       |  3 +++
 runtime/doc/vim_diff.txt      | 22 ++++++++++++----------
 runtime/lua/vim/_meta/api.lua |  9 ++++-----
 runtime/lua/vim/iter.lua      | 23 ++++++++--------------
 runtime/lua/vim/shared.lua    | 10 ++++++----
 10 files changed, 87 insertions(+), 77 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 417137c166..793fcd703b 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1849,6 +1849,9 @@ nvim_get_commands({*opts})                               *nvim_get_commands()*
     Return: ~
         Map of maps describing commands.
 
+    See also: ~
+      • |nvim_get_all_options_info()|
+
 nvim_parse_cmd({str}, {opts})                               *nvim_parse_cmd()*
     Parse command line.
 
@@ -1933,6 +1936,9 @@ nvim_get_all_options_info()                      *nvim_get_all_options_info()*
     Return: ~
         dictionary of all options
 
+    See also: ~
+      • |nvim_get_commands()|
+
 nvim_get_option_info2({name}, {*opts})               *nvim_get_option_info2()*
     Gets the option information for one option from arbitrary buffer or window
 
@@ -3238,8 +3244,8 @@ nvim_tabpage_set_var({tabpage}, {name}, {value})
 Autocmd Functions                                                *api-autocmd*
 
 nvim_clear_autocmds({*opts})                           *nvim_clear_autocmds()*
-    Clear all autocommands that match the corresponding {opts}. To delete a
-    particular autocmd, see |nvim_del_autocmd()|.
+    Clears all autocommands selected by {opts}. To delete autocmds see
+    |nvim_del_autocmd()|.
 
     Parameters: ~
       • {opts}  Parameters
@@ -3381,15 +3387,10 @@ nvim_del_augroup_by_name({name})                  *nvim_del_augroup_by_name()*
       • |autocmd-groups|
 
 nvim_del_autocmd({id})                                    *nvim_del_autocmd()*
-    Delete an autocommand by id.
-
-    NOTE: Only autocommands created via the API have an id.
+    Deletes an autocommand by id.
 
     Parameters: ~
-      • {id}  Integer The id returned by nvim_create_autocmd
-
-    See also: ~
-      • |nvim_create_autocmd()|
+      • {id}  Integer Autocommand id returned by |nvim_create_autocmd()|
 
 nvim_exec_autocmds({event}, {*opts})                    *nvim_exec_autocmds()*
     Execute all autocommands for {event} that match the corresponding {opts}
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index f36ef1df0a..25f570e38a 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -132,7 +132,7 @@ DOCUMENTATION						*dev-doc*
   optimize for the reader's time and energy: be "precise yet concise".
     - Prefer the active voice: "Foo does X", not "X is done by Foo".
     - "The words you choose are an essential part of the user experience."
-      https://developer.apple.com/design/human-interface-guidelines/foundations/writing/
+      https://developer.apple.com/design/human-interface-guidelines/writing
     - "...without being overly colloquial or frivolous."
       https://developers.google.com/style/tone
 - Write docstrings (as opposed to inline comments) with present tense ("Gets"),
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 32dcd930bb..b087156766 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -70,6 +70,17 @@ https://www.lua.org/doc/cacm2018.pdf
 - Stackful coroutines enable cooperative multithreading, generators, and
   versatile control for both Lua and its host (Nvim).
 
+                                                           *iterator*
+An iterator is just a function that can be called repeatedly to get the "next"
+value of a collection (or any other |iterable|). This interface is expected by
+|for-in| loops, produced by |pairs()|, supported by |vim.iter|, etc.
+https://www.lua.org/pil/7.1.html
+
+                                                           *iterable*
+An "iterable" is anything that |vim.iter()| can consume: tables, dicts, lists,
+iterator functions, tables implementing the |__call()| metamethod, and
+|vim.iter()| objects.
+
                                                            *lua-call-function*
 Lua functions can be called in multiple ways. Consider the function: >lua
     local foo = function(a, b)
@@ -1909,7 +1920,8 @@ vim.endswith({s}, {suffix})                                   *vim.endswith()*
         (boolean) `true` if `suffix` is a suffix of `s`
 
 vim.gsplit({s}, {sep}, {opts})                                  *vim.gsplit()*
-    Splits a string at each instance of a separator.
+    Gets an |iterator| that splits a string at each instance of a separator,
+    in "lazy" fashion (as opposed to |vim.split()| which is "eager").
 
     Example: >lua
 
@@ -2065,16 +2077,17 @@ vim.spairs({t})                                                 *vim.spairs()*
     Enumerate a table sorted by its keys.
 
     Parameters: ~
-      • {t}  (table) List-like table
+      • {t}  (table) Dict-like table
 
     Return: ~
-        iterator over sorted keys and their values
+        _ iterator over sorted keys and their values
 
     See also: ~
       • Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
 vim.split({s}, {sep}, {opts})                                    *vim.split()*
-    Splits a string at each instance of a separator.
+    Splits a string at each instance of a separator and returns the result as
+    a table (unlike |vim.gsplit()|).
 
     Examples: >lua
 
@@ -3192,22 +3205,19 @@ vim.version.range({spec})                                *vim.version.range()*
 Lua module: vim.iter                                                *vim.iter*
 
 
-This module provides a generic interface for working with iterables:
-tables, lists, iterator functions, pair()/ipair()-like iterators, and
-`vim.iter()` objects.
-
-*vim.iter()* wraps its table or function argument into an *Iter* object
-with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
-underlying source data. These methods can be chained together to create
-iterator "pipelines". Each pipeline stage receives as input the output
-values from the prior stage. The values used in the first stage of the
-pipeline depend on the type passed to this function:
+*vim.iter()* is an interface for |iterable|s: it wraps a table or function
+argument into an *Iter* object with methods (such as |Iter:filter()| and
+|Iter:map()|) that transform the underlying source data. These methods can
+be chained together to create iterator "pipelines". Each pipeline stage
+receives as input the output values from the prior stage. The values used
+in the first stage of the pipeline depend on the type passed to this
+function:
 
 • List tables pass only the value of each element
-• Non-list tables pass both the key and value of each element
-• Function iterators pass all of the values returned by their respective
+• Non-list (dict) tables pass both the key and value of each element
+• Function |iterator|s pass all of the values returned by their respective
   function
-• Tables with a metatable implementing __call are treated as function
+• Tables with a metatable implementing |__call()| are treated as function
   iterators
 
 Examples: >lua
diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index a5b9e433ed..1096759ad8 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -437,7 +437,7 @@ middle of a block, then an explicit inner block can be used, as in the idioms
 the last statements in their (inner) blocks.
 
 ------------------------------------------------------------------------------
-2.4.5  For Statement                             *luaref-for* *luaref-langForStat*
+2.4.5  For Statement                             *for* *luaref-langForStat*
 
 The `for` statement has two forms: one numeric and one generic.
 
@@ -477,8 +477,8 @@ Note the following:
    after the `for` ends or is broken. If you need this value, assign it to
    another variable before breaking or exiting the loop.
 
-                                                                     *luaref-in*
-The generic `for` statement works over functions, called iterators. On each
+                                                                      *for-in*
+The generic `for` statement works over functions, called |iterator|s. On each
 iteration, the iterator function is called to produce a new value, stopping
 when this new value is `nil`. The generic `for` loop has the following syntax:
 >
@@ -3611,8 +3611,8 @@ getmetatable({object})                                   *luaref-getmetatable()*
         associated value. Otherwise, returns the metatable of the given
         object.
 
-ipairs({t})                                                    *luaref-ipairs()*
-        Returns three values: an iterator function, the table {t}, and 0, so
+ipairs({t})                                                           *ipairs()*
+        Returns three values: an |iterator| function, the table {t}, and 0, so
         that the construction
 
                `for i,v in ipairs(t) do`  `body`  `end`
@@ -3645,7 +3645,7 @@ loadstring({string} [, {chunkname}])                       *luaref-loadstring()*
                assert(loadstring(s))()
 <
 
-next({table} [, {index}])                                        *luaref-next()*
+next({table} [, {index}])                                        *next()*
         Allows a program to traverse all fields of a table. Its first argument
         is a table and its second argument is an index in this table. `next`
         returns the next index of the table and its associated value. When
@@ -3657,15 +3657,15 @@ next({table} [, {index}])                                        *luaref-next()*
 
         The order in which the indices are enumerated is not specified, `even
         for` `numeric indices`. (To traverse a table in numeric order, use a
-        numerical `for` or the `ipairs` |luaref-ipairs()| function.)
+        numerical `for` or the |ipairs()| function.)
 
         The behavior of `next` is `undefined` if, during the traversal, you
         assign any value to a non-existent field in the table. You may however
         modify existing fields. In particular, you may clear existing fields.
 
-pairs({t})                                                      *luaref-pairs()*
-        Returns three values: the `next` |luaref-next()| function, the table
-        {t}, and `nil`, so that the construction
+pairs({t})                                                             *pairs()*
+        Returns three values: the |next()| function, the table {t}, and `nil`,
+        so that the construction
 
                `for k,v in pairs(t) do`  `body`  `end`
 
@@ -3826,7 +3826,7 @@ coroutine.wrap({f})                                           *coroutine.wrap()*
 
 coroutine.yield({...})                                       *coroutine.yield()*
         Suspends the execution of the calling coroutine. The coroutine cannot
-        be running a C function, a metamethod, or an iterator. Any arguments
+        be running a C function, a metamethod, or an |iterator|. Any arguments
         to `yield` are passed as extra results to `resume`.
 
 ==============================================================================
@@ -4036,7 +4036,7 @@ string.format({formatstring}, {...})                           *string.format()*
         This function does not accept string values containing embedded zeros.
 
 string.gmatch({s}, {pattern})                                  *string.gmatch()*
-        Returns an iterator function that, each time it is called, returns the
+        Returns an |iterator| function that, each time it is called, returns the
         next captures from {pattern} over string {s}.
 
         If {pattern} specifies no captures, then the whole match is produced
@@ -4271,7 +4271,7 @@ table.foreach({table}, {f})                                    *table.foreach()*
         returns a non-`nil` value, then the loop is broken, and this value is
         returned as the final value of `table.foreach`.
 
-        See |luaref-next()| for extra information about table traversals.
+        See |next()| for extra information about table traversals.
 
 table.foreachi({table}, {f})                                  *table.foreachi()*
         Executes the given {f} over the numerical indices of {table}. For each
@@ -4464,7 +4464,7 @@ io.input([{file}])                                                  *io.input()*
         an error code.
 
 io.lines([{filename}])                                              *io.lines()*
-        Opens the given file name in read mode and returns an iterator
+        Opens the given file name in read mode and returns an |iterator|
         function that, each time it is called, returns a new line from the
         file. Therefore, the construction
 
@@ -4533,7 +4533,7 @@ file:flush()                                               *luaref-file:flush()*
         Saves any written data to `file`.
 
 file:lines()                                               *luaref-file:lines()*
-        Returns an iterator function that, each time it is called, returns a
+        Returns an |iterator| function that, each time it is called, returns a
         new line from the file. Therefore, the construction
 
                `for line in file:lines() do`  `body`  `end`
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c3fec85163..2d56fc4fc4 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -71,7 +71,7 @@ The following new APIs and features were added.
     https://github.com/neovim/neovim/pull/23611
 
 • |vim.iter()| provides a generic iterator interface for tables and Lua
-  iterators |luaref-in|.
+  iterators |for-in|.
 
 • Added |vim.ringbuf()| to create ring buffers.
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 956c37fc0f..52e8f4d86c 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -495,6 +495,9 @@ user command or autocommand, the script in which it was defined is reported.
 <			- When 'keywordprg' is equal to "man -s", a [count]
 			  before "K" is inserted after the "-s".  If there is
 			  no count, the "-s" is removed.
+							       *K-lsp-default*
+			- The Nvim |LSP| client sets K to show LSP "hover"
+			  feature. |lsp-defaults|
 
 							*v_K*
 {Visual}K		Like "K", but use the visually highlighted text for
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 1230769c1a..be187f842a 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -115,13 +115,15 @@ DEFAULT MAPPINGS
 Nvim creates the following default mappings at |startup|. You can disable any
 of these in your config by simply removing the mapping, e.g. ":unmap Y".
 
-- |Y-default|
-- |i_CTRL-U-default|
-- |i_CTRL-W-default|
-- |CTRL-L-default|
-- |&-default|
-- |v_#-default|
-- |v_star-default|
+- Y |Y-default|
+- <C-U> |i_CTRL-U-default|
+- <C-W> |i_CTRL-W-default|
+- <C-L> |CTRL-L-default|
+- & |&-default|
+- # |v_#-default|
+- * |v_star-default|
+- Nvim LSP client defaults |lsp-defaults|
+  - K |K-lsp-default|
 
 DEFAULT AUTOCOMMANDS
 							*default-autocmds*
@@ -511,6 +513,9 @@ Mappings:
 Motion:
   The |jumplist| avoids useless/phantom jumps.
 
+Performance:
+  Folds are not updated during insert-mode.
+
 Syntax highlighting:
   syncolor.vim has been removed. Nvim now sets up default highlighting groups
   automatically for both light and dark backgrounds, regardless of whether or
@@ -732,9 +737,6 @@ Options:
   *'ttytype'* *'tty'*
   weirdinvert
 
-Performance:
-  Folds are not updated during insert-mode.
-
 Plugins:
 
 - logiPat
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 3622ba5d19..c0e4e35e7d 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -691,8 +691,8 @@ function vim.api.nvim_call_function(fn, args) end
 --- @param data string data to write. 8-bit clean: can contain NUL bytes.
 function vim.api.nvim_chan_send(chan, data) end
 
---- Clear all autocommands that match the corresponding {opts}. To delete a
---- particular autocmd, see `nvim_del_autocmd()`.
+--- Clears all autocommands selected by {opts}. To delete autocmds see
+--- `nvim_del_autocmd()`.
 ---
 --- @param opts vim.api.keyset.clear_autocmds Parameters
 ---             • event: (string|table) Examples:
@@ -919,10 +919,9 @@ function vim.api.nvim_del_augroup_by_id(id) end
 --- @param name string String The name of the group.
 function vim.api.nvim_del_augroup_by_name(name) end
 
---- Delete an autocommand by id.
---- NOTE: Only autocommands created via the API have an id.
+--- Deletes an autocommand by id.
 ---
---- @param id integer Integer The id returned by nvim_create_autocmd
+--- @param id integer Integer Autocommand id returned by `nvim_create_autocmd()`
 function vim.api.nvim_del_autocmd(id) end
 
 --- Deletes the current line.
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 7bffcc9c20..a278e96a5f 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -1,22 +1,15 @@
 ---@defgroup vim.iter
 ---
---- This module provides a generic interface for working with
---- iterables: tables, lists, iterator functions, pair()/ipair()-like iterators,
---- and \`vim.iter()\` objects.
----
---- \*vim.iter()\* wraps its table or function argument into an \*Iter\* object
---- with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
---- underlying source data. These methods can be chained together to create
---- iterator "pipelines". Each pipeline stage receives as input the output
---- values from the prior stage. The values used in the first stage of the
---- pipeline depend on the type passed to this function:
+--- \*vim.iter()\* is an interface for |iterable|s: it wraps a table or function argument into an
+--- \*Iter\* object with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
+--- underlying source data. These methods can be chained together to create iterator "pipelines".
+--- Each pipeline stage receives as input the output values from the prior stage. The values used in
+--- the first stage of the pipeline depend on the type passed to this function:
 ---
 --- - List tables pass only the value of each element
---- - Non-list tables pass both the key and value of each element
---- - Function iterators pass all of the values returned by their respective
----   function
---- - Tables with a metatable implementing __call are treated as function
----   iterators
+--- - Non-list (dict) tables pass both the key and value of each element
+--- - Function |iterator|s pass all of the values returned by their respective function
+--- - Tables with a metatable implementing |__call()| are treated as function iterators
 ---
 --- Examples:
 --- <pre>lua
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 291b003d87..5ce5b200d3 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -60,7 +60,8 @@ function vim.deepcopy(orig)
   return deepcopy(orig)
 end
 
---- Splits a string at each instance of a separator.
+--- Gets an |iterator| that splits a string at each instance of a separator, in "lazy" fashion
+--- (as opposed to |vim.split()| which is "eager").
 ---
 --- Example:
 ---   <pre>lua
@@ -159,7 +160,8 @@ function vim.gsplit(s, sep, opts)
   end
 end
 
---- Splits a string at each instance of a separator.
+--- Splits a string at each instance of a separator and returns the result as a table (unlike
+--- |vim.gsplit()|).
 ---
 --- Examples:
 --- <pre>lua
@@ -530,8 +532,8 @@ end
 ---
 ---@see Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
 ---
----@param t table List-like table
----@return iterator over sorted keys and their values
+---@param t table Dict-like table
+---@return # iterator over sorted keys and their values
 function vim.spairs(t)
   assert(type(t) == 'table', string.format('Expected table, got %s', type(t)))
 
-- 
cgit 


From b1fb04475e6fa0c44895cb6fe97b75816d74c297 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 3 Aug 2023 13:41:47 +0200
Subject: docs: remove "#" comment char in @return

Everything after a "#" char is a "description" comment, i.e. luals won't
treat it as a type, name, etc. But "#" should not be present in the
generated docs (such as :help docs).
https://github.com/LuaLS/lua-language-server/wiki/Annotations#return
---
 runtime/doc/develop.txt |  1 +
 runtime/doc/lua.txt     | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 25f570e38a..b3f7d1fadc 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -226,6 +226,7 @@ Lua documentation lives in the source code, as docstrings on the function
 definitions.  The |lua-vim| :help is generated from the docstrings.
 
 Docstring format:
+- Use LuaLS annotations: https://github.com/LuaLS/lua-language-server/wiki/Annotations
 - Lines in the main description start with `---`
 - Special tokens start with `---@` followed by the token name:
   `---@see`, `---@param`, `---@returns`
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index b087156766..94a2c0d45e 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1569,7 +1569,7 @@ vim.deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
       • {backtrace}    boolean|nil Prints backtrace. Defaults to true.
 
     Return: ~
-        (string|nil) # Deprecated message, or nil if no message was shown.
+        (string|nil) Deprecated message, or nil if no message was shown.
 
 vim.inspect                                                    *vim.inspect()*
     Gets a human-readable representation of the given object.
@@ -1693,7 +1693,7 @@ vim.print({...})                                                 *vim.print()*
 <
 
     Return: ~
-        any # given arguments.
+        any given arguments.
 
     See also: ~
       • |vim.inspect()|
@@ -2080,7 +2080,7 @@ vim.spairs({t})                                                 *vim.spairs()*
       • {t}  (table) Dict-like table
 
     Return: ~
-        _ iterator over sorted keys and their values
+        iterator over sorted keys and their values
 
     See also: ~
       • Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
@@ -2545,8 +2545,8 @@ vim.ui.open({path})                                            *vim.ui.open()*
       • {path}  (string) Path or URL to open
 
     Return (multiple): ~
-        SystemCompleted|nil # Command result, or nil if not found.
-        (string|nil) # Error message on failure
+        SystemCompleted|nil Command result, or nil if not found.
+        (string|nil) Error message on failure
 
     See also: ~
       • |vim.system()|
-- 
cgit 


From b034378cf58bea18ea1bdb4d63692a1336b5752b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 3 Aug 2023 08:35:10 -0700
Subject: docs: luaref cleanup #24541
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- drop "luaref-" prefix in favor of "lua-" or nothing, where possible.
- remove redundant "luaref--lang…" and "luaref-api…" tags.
---
 runtime/doc/lsp.txt             |   2 +-
 runtime/doc/lua-guide.txt       |   6 +-
 runtime/doc/lua.txt             |  53 ++---
 runtime/doc/luaref.txt          | 469 ++++++++++++++++++++--------------------
 runtime/doc/treesitter.txt      |   8 +-
 runtime/doc/vim_diff.txt        |   2 +-
 runtime/lua/vim/_meta/regex.lua |   6 +-
 runtime/lua/vim/shared.lua      |   4 +-
 8 files changed, 270 insertions(+), 280 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index f85150adb6..1b35219bb8 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -67,7 +67,7 @@ To override the above defaults, set or unset the options on |LspAttach|: >lua
       callback = function(ev)
         vim.bo[ev.buf].formatexpr = nil
         vim.bo[ev.buf].omnifunc = nil
-        vim.keymap.del("n", "K", { bufnr = ev.buf })
+        vim.keymap.del("n", "K", { buffer = ev.buf })
       end,
     })
 
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index 61c3925a07..e2fece916c 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -167,8 +167,8 @@ the cache manually first:
 <
 ------------------------------------------------------------------------------
 See also:
-• |lua-require|
-• |luaref-pcall()|
+• |lua-module-load|
+• |pcall()|
 
 ==============================================================================
 Using Vim commands and functions from Lua                  *lua-guide-vimscript*
@@ -186,7 +186,7 @@ Note that special characters will need to be escaped with backslashes:
 >lua
     vim.cmd("%s/\\Vfoo/bar/g")
 <
-An alternative is to use a literal string (see |luaref-literal|) delimited by
+An alternative is to use a literal string (see |lua-literal|) delimited by
 double brackets `[[ ]]` as in
 >lua
     vim.cmd([[%s/\Vfoo/bar/g]])
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 94a2c0d45e..bee3a761f3 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -62,10 +62,10 @@ programming": tables, closures, and coroutines.
 https://www.lua.org/doc/cacm2018.pdf
 - Tables are the "object" or container datastructure: they represent both
   lists and maps, you can extend them to represent your own datatypes and
-  change their behavior using |luaref-metatable| (like Python's "datamodel").
+  change their behavior using |metatable|s (like Python's "datamodel").
 - EVERY scope in Lua is a closure: a function is a closure, a module is
-  a closure, a `do` block (|luaref-do|) is a closure--and they all work the
-  same. A Lua module is literally just a big closure discovered on the "path"
+  a closure, a `do` block (|lua-do|) is a closure--and they all work the same.
+  A Lua module is literally just a big closure discovered on the "path"
   (where your modules are found: |package.cpath|).
 - Stackful coroutines enable cooperative multithreading, generators, and
   versatile control for both Lua and its host (Nvim).
@@ -81,7 +81,7 @@ An "iterable" is anything that |vim.iter()| can consume: tables, dicts, lists,
 iterator functions, tables implementing the |__call()| metamethod, and
 |vim.iter()| objects.
 
-                                                           *lua-call-function*
+                                                           *lua-function-call*
 Lua functions can be called in multiple ways. Consider the function: >lua
     local foo = function(a, b)
         print("A: ", a)
@@ -94,21 +94,19 @@ The first way to call this function is: >lua
     -- A: 1
     -- B: 2
 
-This way of calling a function is familiar from most scripting languages.
-In Lua, any missing arguments are passed as `nil`. Example: >lua
+This way of calling a function is familiar from most scripting languages. In
+Lua, any missing arguments are passed as `nil`, and extra parameters are
+silently discarded. Example: >lua
     foo(1)
     -- ==== Result ====
     -- A: 1
     -- B: nil
-
-Furthermore it is not an error if extra parameters are passed, they are just
-discarded.
-
+<
                                                                       *kwargs*
 When calling a function, you can omit the parentheses if the function takes
 exactly one string literal (`"foo"`) or table literal (`{1,2,3}`). The latter
-is often used to approximate "named parameters" ("kwargs" or "keyword args")
-as in languages like Python and C#. Example: >lua
+is often used to mimic "named parameters" ("kwargs" or "keyword args") as in
+languages like Python and C#. Example: >lua
     local func_with_opts = function(opts)
         local will_do_foo = opts.foo
         local filename = opts.filename
@@ -119,21 +117,16 @@ as in languages like Python and C#. Example: >lua
 <
 There's nothing special going on here except that parentheses are treated as
 whitespace. But visually, this small bit of sugar gets reasonably close to
-a "keyword args" interface.
-
-It is of course also valid to call the function with parentheses: >lua
-    func_with_opts({ foo = true, filename = "hello.world" })
-<
-Nvim tends to prefer the keyword args style.
+a "keyword args" interface. Nvim code tends to prefer this style.
 
 ------------------------------------------------------------------------------
 LUA PATTERNS                                                    *lua-patterns*
 
 Lua intentionally does not support regular expressions, instead it has limited
-"patterns" |luaref-patterns| which avoid the performance pitfalls of extended
+"patterns" |lua-pattern| which avoid the performance pitfalls of extended
 regex. Lua scripts can also use Vim regex via |vim.regex()|.
 
-These examples use |string.match()| to demonstrate Lua patterns: >lua
+Examples: >lua
 
     print(string.match("foo123bar123", "%d+"))
     -- 123
@@ -145,7 +138,7 @@ These examples use |string.match()| to demonstrate Lua patterns: >lua
     -- .bar
 
 ==============================================================================
-IMPORTING LUA MODULES                                  *require()* *lua-require*
+IMPORTING LUA MODULES                                        *lua-module-load*
 
 Modules are searched for under the directories specified in 'runtimepath', in
 the order they appear.  Any "." in the module name is treated as a directory
@@ -159,7 +152,7 @@ back to Lua's default search mechanism. The first script found is run and
 
 The return value is cached after the first call to `require()` for each module,
 with subsequent calls returning the cached value without searching for, or
-executing any script. For further details on `require()`, see |luaref-require()|.
+executing any script. For further details see |require()|.
 
 For example, if 'runtimepath' is `foo,bar` and |package.cpath| was
 `./?.so;./?.dll` at startup, `require('mod')` searches these paths in order
@@ -332,22 +325,22 @@ Example: >vim
     :echo luaeval('string.match(_A, "[a-z]+")', 'XYXfoo123')
     " foo
 <
-                                                                    *lua-table*
+                                                         *lua-table-ambiguous*
 Lua tables are used as both dictionaries and lists, so it is impossible to
 determine whether empty table is meant to be empty list or empty dictionary.
 Additionally Lua does not have integer numbers. To distinguish between these
 cases there is the following agreement:
-                                                                     *lua-list*
+                                                                    *lua-list*
 0. Empty table is empty list.
 1. Table with N incrementally growing integral numbers, starting from 1 and
    ending with N is considered to be a list.
-                                                                     *lua-dict*
+                                                                    *lua-dict*
 2. Table with string keys, none of which contains NUL byte, is considered to
    be a dictionary.
 3. Table with string keys, at least one of which contains NUL byte, is also
    considered to be a dictionary, but this time it is converted to
    a |msgpack-special-map|.
-                                                              *lua-special-tbl*
+                                                             *lua-special-tbl*
 4. Table with `vim.type_idx` key may be a dictionary, a list or floating-point
    value:
    - `{[vim.type_idx]=vim.types.float, [vim.val_idx]=1}` is converted to
@@ -680,8 +673,8 @@ vim.regex:match_line({bufnr}, {line_idx}, {start}, {end_})
 
 vim.regex:match_str({str})                                 *regex:match_str()*
     Match the string against the regex. If the string should match the regex
-    precisely, surround the regex with `^` and `$` . If the was a match, the byte indices for the beginning and end of the
-    match is returned. When there is no match, `nil` is returned. As any integer is truth-y, `regex:match()` can be directly used as a condition in an if-statement.
+    precisely, surround the regex with `^` and `$` . If there was a match, the byte indices for the beginning and end of the
+    match are returned. When there is no match, `nil` is returned. Because any integer is "truthy", `regex:match()` can be directly used as a condition in an if-statement.
 
     Parameters: ~
       • {str}  (string)
@@ -1952,7 +1945,7 @@ vim.gsplit({s}, {sep}, {opts})                                  *vim.gsplit()*
     See also: ~
       • |string.gmatch()|
       • |vim.split()|
-      • |luaref-patterns|
+      • |lua-patterns|
       • https://www.lua.org/pil/20.2.html
       • http://lua-users.org/wiki/StringLibraryTutorial
 
@@ -2333,7 +2326,7 @@ vim.trim({s})                                                     *vim.trim()*
         (string) String with whitespace removed from its beginning and end
 
     See also: ~
-      • |luaref-patterns|
+      • |lua-patterns|
       • https://www.lua.org/pil/20.2.html
 
 vim.validate({opt})                                           *vim.validate()*
diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index 1096759ad8..341f620a8d 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -1,5 +1,5 @@
 *luaref.txt*           Nvim
-                                                          *luaref* *Lua-Reference*
+                                                                *luaref*
 
                              LUA REFERENCE MANUAL
 
@@ -16,14 +16,14 @@
                       Copyright (c) 2006 Lua.org, PUC-Rio.
 
 
-                 See |luaref-doc| for information on this manual.
-                 See |luaref-copyright| for copyright and licenses.
+                 See |lua-ref-doc| for information on this manual.
+                 See |lua-ref-copyright| for copyright and licenses.
 
 
 Type |gO| to see the table of contents.
 
 ==============================================================================
-1  INTRODUCTION                                                   *luaref-intro*
+1  INTRODUCTION                                                 *luaref-intro*
 
 Lua is an extension programming language designed to support general
 procedural programming with data description facilities.  It also offers good
@@ -47,13 +47,13 @@ Lua's official web site, www.lua.org.
 
 Like any other reference manual, this document is dry in places. For a
 discussion of the decisions behind the design of Lua, see references at
-|luaref-bibliography|. For a detailed introduction to programming in Lua, see
+|lua-ref-bibliography|. For a detailed introduction to programming in Lua, see
 Roberto's book, Programming in Lua.
 
 Lua means "moon" in Portuguese and is pronounced LOO-ah.
 
 ==============================================================================
-2  THE LANGUAGE                                                *luaref-language*
+2  THE LANGUAGE                                         *lua-language*
 
 This section describes the lexis, the syntax, and the semantics of Lua. In
 other words, this section describes which tokens are valid, how they can be
@@ -63,9 +63,9 @@ The language constructs will be explained using the usual extended BNF
 notation, in which `{ a }` means 0 or more `a`'s, and `[ a ]` means an optional `a`.
 
 ==============================================================================
-2.1  Lexical Conventions                                    *luaref-langLexConv*
+2.1  Lexical Conventions                                *lua-lexical*
 
-                                               *luaref-names* *luaref-identifiers*
+                                               *lua-names* *lua-identifiers*
 Names (also called identifiers) in Lua can be any string of letters, digits,
 and underscores, not beginning with a digit. This coincides with the
 definition of identifiers in most languages. (The definition of letter depends
@@ -92,7 +92,7 @@ The following strings denote other tokens:
        (     )     {     }     [     ]
        ;     :     ,     .     ..    ...
 <
-                                                                *luaref-literal*
+                                                                *lua-literal*
 Literal strings can be delimited by matching single or double quotes, and can
 contain the following C-like escape sequences:
 
@@ -146,14 +146,14 @@ coded as 49), the five literals below denote the same string:
        alo
        123"]==]
 <
-                                                            *luaref-numconstant*
+                                                            *lua-numconstant*
 A numerical constant may be written with an optional decimal part and an
 optional decimal exponent. Lua also accepts integer hexadecimal constants, by
 prefixing them with `0x`. Examples of valid numerical constants are
 >
      3     3.0     3.1416  314.16e-2   0.31416E1   0xff   0x56
 <
-                                                                *luaref-comment*
+                                                                *lua-comment*
 A comment starts with a double hyphen (`--`) anywhere outside a string. If the
 text immediately after `--` is not an opening long bracket, the comment is a
 short comment, which runs until the end of the line. Otherwise, it is a long
@@ -161,7 +161,7 @@ comment, which runs until the corresponding closing long bracket. Long
 comments are frequently used to disable code temporarily.
 
 ==============================================================================
-2.2  Values and Types                                      *luaref-langValTypes*
+2.2  Values and Types                           *lua-values*
 
 Lua is a dynamically typed language. This means that variables do not have
 types; only values do. There are no type definitions in the language. All
@@ -171,9 +171,9 @@ All values in Lua are first-class values. This means that all values can be
 stored in variables, passed as arguments to other functions, and returned as
 results.
 
-                                                       *luaref-types* *luaref-nil*
-                                                      *luaref-true* *luaref-false*
-                                                   *luaref-number* *luaref-string*
+                                                *lua-types* *lua-nil*
+                                                *lua-true* *lua-false*
+                                                *lua-number* *lua-string*
 There are eight basic types in Lua: `nil`, `boolean`, `number`, `string`,
 `function`, `userdata`, `thread`, and `table`. Nil is the type of the value
 `nil`, whose main property is to be different from any other value; it usually
@@ -184,27 +184,27 @@ numbers. (It is easy to build Lua interpreters that use other internal
 representations for numbers, such as single-precision float or long integers;
 see file `luaconf.h`.) String represents arrays of characters. Lua is 8-bit
 clean: strings may contain any 8-bit character, including embedded zeros
-(`\0`) (see |luaref-literal|).
+(`\0`) (see |lua-literal|).
 
 Lua can call (and manipulate) functions written in Lua and functions written
-in C (see |luaref-langFuncCalls|).
+in C (see |lua-function|).
 
-                                                           *luaref-userdatatype*
+                                                            *lua-userdatatype*
 The type userdata is provided to allow arbitrary C data to be stored in Lua
 variables. This type corresponds to a block of raw memory and has no
 pre-defined operations in Lua, except assignment and identity test. However,
 by using metatables, the programmer can define operations for userdata values
-(see |luaref-langMetatables|). Userdata values cannot be created or modified
-in Lua, only through the C API. This guarantees the integrity of data owned by
-the host program.
+(see |lua-metatable|). Userdata values cannot be created or modified in Lua,
+only through the C API. This guarantees the integrity of data owned by the
+host program.
 
-                                                                 *luaref-thread*
+                                                                 *lua-thread*
 The type `thread` represents independent threads of execution and it is used to
-implement coroutines (see |luaref-langCoro|). Do not confuse Lua threads with
+implement coroutines (see |lua-coroutine|). Do not confuse Lua threads with
 operating-system threads. Lua supports coroutines on all systems, even those
 that do not support threads.
 
-                                                                  *luaref-table*
+                                                                  *lua-table*
 The type `table` implements associative arrays, that is, arrays that can be
 indexed not only with numbers, but with any value (except `nil`). Tables can
 be heterogeneous; that is, they can contain values of all types (except
@@ -213,11 +213,11 @@ used to represent ordinary arrays, symbol tables, sets, records, graphs,
 trees, etc. To represent records, Lua uses the field name as an index. The
 language supports this representation by providing `a.name` as syntactic sugar
 for `a["name"]`. There are several convenient ways to create tables in Lua
-(see |luaref-langTableConst|).
+(see |lua-tableconstructor|).
 
 Like indices, the value of a table field can be of any type (except `nil`). In
 particular, because functions are first-class values, table fields may contain
-functions. Thus tables may also carry methods (see |luaref-langFuncDefs|).
+functions. Thus tables may also carry methods (see |lua-function-define|).
 
 Tables, functions, threads and (full) userdata values are objects: variables
 do not actually contain these values, only references to them. Assignment,
@@ -225,10 +225,10 @@ parameter passing, and function returns always manipulate references to such
 values; these operations do not imply any kind of copy.
 
 The library function `type` returns a string describing the type of a given
-value (see |luaref-type()|).
+value (see |lua-type()|).
 
 ------------------------------------------------------------------------------
-2.2.1  Coercion                                            *luaref-langCoercion*
+2.2.1  Coercion                                            *lua-coercion*
 
 Lua provides automatic conversion between string and number values at run
 time. Any arithmetic operation applied to a string tries to convert that
@@ -239,7 +239,7 @@ converted to strings, use the `format` function from the string library (see
 |string.format()|).
 
 ==============================================================================
-2.3  Variables                                            *luaref-langVariables*
+2.3  Variables                                            *lua-variables*
 
 Variables are places that store values. There are three kinds of variables in
 Lua: global variables, local variables, and table fields.
@@ -249,12 +249,12 @@ function's formal parameter, which is a particular form of local variable):
 >
        var ::= Name
 <
-Name denotes identifiers, as defined in |luaref-langLexConv|.
+Name denotes identifiers, as defined in |lua-lexical|.
 
 Any variable is assumed to be global unless explicitly declared as a local
-(see |luaref-langLocalDec|). Local variables are lexically scoped: local
+(see |lua-local|). Local variables are lexically scoped: local
 variables can be freely accessed by functions defined inside their scope (see
-|luaref-langVisibRules|).
+|lua-visibility|).
 
 Before the first assignment to a variable, its value is `nil`.
 
@@ -265,21 +265,21 @@ Square brackets are used to index a table:
 The first expression (`prefixexp`) should result in a table value; the second
 expression (`exp`) identifies a specific entry inside that table. The
 expression denoting the table to be indexed has a restricted syntax; see
-|luaref-langExpressions| for details.
+|lua-expressions| for details.
 
 The syntax `var.NAME` is just syntactic sugar for `var["NAME"]` :
 >
        var ::= prefixexp . Name
 <
 All global variables live as fields in ordinary Lua tables, called environment
-tables or simply environments (see |luaref-langEnvironments|). Each function
+tables or simply environments (see |lua-environments|). Each function
 has its own reference to an environment, so that all global variables in this
 function will refer to this environment table. When a function is created, it
 inherits the environment from the function that created it. To get the
 environment table of a Lua function, you call `getfenv` (see
-|lua_getfenv()|). To replace it, you call `setfenv` (see |luaref-setfenv()|).
+|lua_getfenv()|). To replace it, you call `setfenv` (see |setfenv()|).
 (You can only manipulate the environment of C functions through the debug
-library; see |luaref-libDebug|.)
+library; see |lua-lib-debug|.)
 
 An access to a global variable `x` is equivalent to `_env.x`, which in turn is
 equivalent to
@@ -291,19 +291,19 @@ not defined in Lua. We use it here only for explanatory purposes.)
 
 The meaning of accesses to global variables and table fields can be changed
 via metatables. An access to an indexed variable `t[i]` is equivalent to a
-call `gettable_event(t,i)`. (See |luaref-langMetatables| for a complete
-description of the `gettable_event` function. This function is not defined or
-callable in Lua. We use it here only for explanatory purposes.)
+call `gettable_event(t,i)`. (See |lua-metatable| for a complete description of
+the `gettable_event` function. This function is not defined or callable in
+Lua. We use it here only for explanatory purposes.)
 
 ==============================================================================
-2.4  Statements                                               *luaref-langStats*
+2.4  Statements                                 *lua-statement*
 
 Lua supports an almost conventional set of statements, similar to those in
 Pascal or C. This set includes assignment, control structures, function
 calls, and variable declarations.
 
 ------------------------------------------------------------------------------
-2.4.1  Chunks                                   *luaref-chunk* *luaref-langChunks*
+2.4.1  Chunks                                   *lua-chunk*
 
 The unit of execution of Lua is called a chunk. A chunk is simply a sequence
 of statements, which are executed sequentially. Each statement can be
@@ -314,7 +314,7 @@ optionally followed by a semicolon:
 There are no empty statements and thus `;;` is not legal.
 
 Lua handles a chunk as the body of an anonymous function with a variable
-number of arguments (see |luaref-langFuncDefs|). As such, chunks can define
+number of arguments (see |lua-function-define|). As such, chunks can define
 local variables, receive arguments, and return values.
 
 A chunk may be stored in a file or in a string inside the host program. When a
@@ -327,24 +327,24 @@ details. Programs in source and compiled forms are interchangeable; Lua
 automatically detects the file type and acts accordingly.
 
 ------------------------------------------------------------------------------
-2.4.2  Blocks                                   *luaref-block* *luaref-langBlocks*
+2.4.2  Blocks                                   *lua-block*
 
 A block is a list of statements; syntactically, a block is the same as a
 chunk:
 >
        block ::= chunk
 <
-                                                          *luaref-do* *luaref-end*
+                                                *lua-do* *lua-end*
 A block may be explicitly delimited to produce a single statement:
 >
        stat ::= do block end
 <
 Explicit blocks are useful to control the scope of variable declarations.
 Explicit blocks are also sometimes used to add a `return` or `break` statement
-in the middle of another block (see |luaref-langContStructs|).
+in the middle of another block (see |lua-control|).
 
 ------------------------------------------------------------------------------
-2.4.3  Assignment                                            *luaref-langAssign*
+2.4.3  Assignment                               *lua-assign*
 
 Lua allows multiple assignment. Therefore, the syntax for assignment defines a
 list of variables on the left side and a list of expressions on the right
@@ -354,7 +354,7 @@ side. The elements in both lists are separated by commas:
        varlist1 ::= var { , var }
        explist1 ::= exp { , exp }
 <
-Expressions are discussed in |luaref-langExpressions|.
+Expressions are discussed in |lua-expressions|.
 
 Before the assignment, the list of values is adjusted to the length of the
 list of variables. If there are more values than needed, the excess values are
@@ -362,7 +362,7 @@ thrown away. If there are fewer values than needed, the list is extended with
 as many `nil`s as needed. If the list of expressions ends with a function
 call, then all values returned by this call enter in the list of values,
 before the adjustment (except when the call is enclosed in parentheses; see
-|luaref-langExpressions|).
+|lua-expressions|).
 
 The assignment statement first evaluates all its expressions and only then are
 the assignments performed. Thus the code
@@ -379,9 +379,9 @@ exchanges the values of `x` and `y`.
 
 The meaning of assignments to global variables and table fields can be changed
 via metatables. An assignment to an indexed variable `t[i] = val` is
-equivalent to `settable_event(t,i,val)`. (See |luaref-langMetatables| for a
-complete description of the `settable_event` function. This function is not
-defined or callable in Lua. We use it here only for explanatory purposes.)
+equivalent to `settable_event(t,i,val)`. (See |lua-metatable| for a complete
+description of the `settable_event` function. This function is not defined or
+callable in Lua. We use it here only for explanatory purposes.)
 
 An assignment to a global variable `x = val` is equivalent to the
 assignment `_env.x = val`, which in turn is equivalent to
@@ -392,10 +392,10 @@ where `_env` is the environment of the running function. (The `_env` variable is
 not defined in Lua. We use it here only for explanatory purposes.)
 
 ------------------------------------------------------------------------------
-2.4.4  Control Structures                               *luaref-langContStructs*
+2.4.4  Control Structures                               *lua-control*
 
-                               *luaref-if* *luaref-then* *luaref-else* *luaref-elseif*
-                                       *luaref-while* *luaref-repeat* *luaref-until*
+                                   *lua-if* *lua-then* *lua-else* *lua-elseif*
+                                   *lua-while* *lua-repeat* *lua-until*
 The control structures `if`, `while`, and `repeat` have the usual meaning and
 familiar syntax:
 >
@@ -404,7 +404,7 @@ familiar syntax:
        stat ::=  if  exp then block { elseif exp then block }
                  [ else block ] end
 <
-Lua also has a `for` statement, in two flavors (see |luaref-langForStat|).
+Lua also has a `for` statement, in two flavors (see |lua-for|).
 
 The condition expression of a control structure may return any value.
 Both `false` and `nil` are considered false. All values different
@@ -415,14 +415,14 @@ In the `repeat-until` loop, the inner block does not end at the `until` keyword,
 but only after the condition. So, the condition can refer to local variables
 declared inside the loop block.
 
-                                                                 *luaref-return*
+                                                                 *lua-return*
 The `return` statement is used to return values from a function or a chunk
 (which is just a function). Functions and chunks may return more than one
 value, so the syntax for the `return` statement is
 
        `stat ::=`  `return`  `[explist1]`
 
-                                                                  *luaref-break*
+                                                                  *lua-break*
 The `break` statement is used to terminate the execution of a `while`, `repeat`,
 or `for` loop, skipping to the next statement after the loop:
 
@@ -437,7 +437,7 @@ middle of a block, then an explicit inner block can be used, as in the idioms
 the last statements in their (inner) blocks.
 
 ------------------------------------------------------------------------------
-2.4.5  For Statement                             *for* *luaref-langForStat*
+2.4.5  For Statement                             *for* *lua-for*
 
 The `for` statement has two forms: one numeric and one generic.
 
@@ -513,17 +513,17 @@ Note the following:
    them to other variables before breaking or exiting the loop.
 
 ------------------------------------------------------------------------------
-2.4.6  Function Calls as Statements                        *luaref-langFuncStat*
+2.4.6  Function Calls as Statements           *lua-funcstatement*
 
 To allow possible side-effects, function calls can be executed as statements:
 >
        stat ::= functioncall
 <
 In this case, all returned values are thrown away. Function calls are
-explained in |luaref-langFuncCalls|.
+explained in |lua-function|.
 
 ------------------------------------------------------------------------------
-2.4.7  Local Declarations                     *luaref-local* *luaref-langLocalDec*
+2.4.7  Local Declarations                     *lua-local*
 
 Local variables may be declared anywhere inside a block. The declaration may
 include an initial assignment:
@@ -532,18 +532,17 @@ include an initial assignment:
        namelist ::= Name { , Name }
 <
 If present, an initial assignment has the same semantics of a multiple
-assignment (see |luaref-langAssign|). Otherwise, all variables are initialized
+assignment (see |lua-assign|). Otherwise, all variables are initialized
 with `nil`.
 
-A chunk is also a block (see |luaref-langChunks|), and so local variables can be
+A chunk is also a block (see |lua-chunk|), and so local variables can be
 declared in a chunk outside any explicit block. The scope of such local
 variables extends until the end of the chunk.
 
-The visibility rules for local variables are explained in
-|luaref-langVisibRules|.
+The visibility rules for local variables are explained in |lua-visibility|.
 
 ==============================================================================
-2.5  Expressions                                        *luaref-langExpressions*
+2.5  Expressions                                        *lua-expressions*
 
 The basic expressions in Lua are the following:
 >
@@ -558,22 +557,22 @@ The basic expressions in Lua are the following:
        exp ::= unop exp
        prefixexp ::= var | functioncall | ( exp )
 <
-Numbers and literal strings are explained in |luaref-langLexConv|; variables are
-explained in |luaref-langVariables|; function definitions are explained in
-|luaref-langFuncDefs|; function calls are explained in |luaref-langFuncCalls|;
-table constructors are explained in |luaref-langTableConst|. Vararg expressions,
+Numbers and literal strings are explained in |lua-lexical|; variables are
+explained in |lua-variables|; function definitions are explained in
+|lua-function-define|; function calls are explained in |lua-function|;
+table constructors are explained in |lua-tableconstructor|. Vararg expressions,
 denoted by three dots (`...`), can only be used inside vararg functions;
-they are explained in |luaref-langFuncDefs|.
+they are explained in |lua-function-define|.
 
-Binary operators comprise arithmetic operators (see |luaref-langArithOp|),
-relational operators (see |luaref-langRelOp|), logical operators (see
-|luaref-langLogOp|), and the concatenation operator (see |luaref-langConcat|).
-Unary operators comprise the unary minus (see |luaref-langArithOp|), the unary
-`not` (see |luaref-langLogOp|), and the unary length operator (see
-|luaref-langLength|).
+Binary operators comprise arithmetic operators (see |lua-arithmetic|),
+relational operators (see |lua-relational|), logical operators (see
+|lua-logicalop|), and the concatenation operator (see |lua-concat|).
+Unary operators comprise the unary minus (see |lua-arithmetic|), the unary
+`not` (see |lua-logicalop|), and the unary length operator (see
+|lua-length|).
 
 Both function calls and vararg expressions may result in multiple values. If
-the expression is used as a statement (see |luaref-langFuncStat|)
+the expression is used as a statement (see |lua-funcstatement|)
 (only possible for function calls), then its return list is adjusted to zero
 elements, thus discarding all returned values. If the expression is used as
 the last (or the only) element of a list of expressions, then no adjustment is
@@ -606,12 +605,12 @@ An expression enclosed in parentheses always results in only one value. Thus,
 return any values.)
 
 ------------------------------------------------------------------------------
-2.5.1  Arithmetic Operators                                 *luaref-langArithOp*
+2.5.1  Arithmetic Operators                                 *lua-arithmetic*
 
 Lua supports the usual arithmetic operators: the binary `+` (addition),
 `-` (subtraction), `*` (multiplication), `/` (division), `%` (modulo)
 and `^` (exponentiation); and unary `-` (negation). If the operands are numbers,
-or strings that can be converted to numbers (see |luaref-langCoercion|), then all
+or strings that can be converted to numbers (see |lua-coercion|), then all
 operations have the usual meaning. Exponentiation works for any exponent. For
 instance, `x^(-0.5)` computes the inverse of the square root of `x`. Modulo is
 defined as
@@ -622,7 +621,7 @@ That is, it is the remainder of a division that rounds the quotient towards
 minus infinity.
 
 ------------------------------------------------------------------------------
-2.5.2  Relational Operators                                   *luaref-langRelOp*
+2.5.2  Relational Operators                                   *lua-relational*
 
 The relational operators in Lua are
 >
@@ -639,9 +638,9 @@ create a new object (a table, userdata, or function), this new object is
 different from any previously existing object.
 
 You can change the way that Lua compares tables and userdata using the "eq"
-metamethod (see |luaref-langMetatables|).
+metamethod (see |lua-metatable|).
 
-The conversion rules of coercion |luaref-langCoercion| do not apply to
+The conversion rules of coercion |lua-coercion| do not apply to
 equality comparisons. Thus, `"0"==0` evaluates to `false`, and `t[0]` and
 `t["0"]` denote different entries in a table.
 
@@ -650,19 +649,19 @@ The operator `~=` is exactly the negation of equality (`==`).
 The order operators work as follows. If both arguments are numbers, then they
 are compared as such. Otherwise, if both arguments are strings, then their
 values are compared according to the current locale. Otherwise, Lua tries to
-call the "lt" or the "le" metamethod (see |luaref-langMetatables|).
+call the "lt" or the "le" metamethod (see |lua-metatable|).
 
 ------------------------------------------------------------------------------
-2.5.3  Logical Operators                                      *luaref-langLogOp*
+2.5.3  Logical Operators                                      *lua-logicalop*
 
 The logical operators in Lua are
 >
        and    or    not
 <
-Like the control structures (see |luaref-langContStructs|), all logical operators
+Like the control structures (see |lua-control|), all logical operators
 consider both `false` and `nil` as false and anything else as true.
 
-                                               *luaref-not* *luaref-and* *luaref-or*
+                                                  *lua-not* *lua-and* *lua-or*
 The negation operator `not` always returns `false` or `true`. The conjunction
 operator `and` returns its first argument if this value is `false` or `nil`;
 otherwise, `and` returns its second argument. The disjunction
@@ -683,15 +682,15 @@ evaluated only if necessary. Here are some examples:
 (In this manual, `-->` indicates the result of the preceding expression.)
 
 ------------------------------------------------------------------------------
-2.5.4  Concatenation                                         *luaref-langConcat*
+2.5.4  Concatenation                                         *lua-concat*
 
 The string concatenation operator in Lua is denoted by two dots (`..`).
 If both operands are strings or numbers, then they are converted to strings
-according to the rules mentioned in |luaref-langCoercion|. Otherwise, the
-"concat" metamethod is called (see |luaref-langMetatables|).
+according to the rules mentioned in |lua-coercion|. Otherwise, the
+"concat" metamethod is called (see |lua-metatable|).
 
 ------------------------------------------------------------------------------
-2.5.5  The Length Operator                                   *luaref-langLength*
+2.5.5  The Length Operator                                   *lua-length*
 
 The length operator is denoted by the unary operator `#`. The length of a
 string is its number of bytes (that is, the usual meaning of string length
@@ -706,7 +705,7 @@ indices that directly precedes a `nil` value (that is, it may consider any
 such `nil` value as the end of the array).
 
 ------------------------------------------------------------------------------
-2.5.6  Precedence                                              *luaref-langPrec*
+2.5.6  Precedence                                              *lua-precedence*
 
 Operator precedence in Lua follows the table below, from lower to higher
 priority:
@@ -725,7 +724,7 @@ The concatenation (`..`) and exponentiation (`^`) operators are right
 associative. All other binary operators are left associative.
 
 ------------------------------------------------------------------------------
-2.5.7  Table Constructors                                *luaref-langTableConst*
+2.5.7  Table Constructors                                *lua-tableconstructor*
 
 Table constructors are expressions that create tables. Every time a
 constructor is evaluated, a new table is created. Constructors can be used to
@@ -761,14 +760,14 @@ is equivalent to
 <
 If the last field in the list has the form `exp` and the expression is a
 function call, then all values returned by the call enter the list
-consecutively (see |luaref-langFuncCalls|). To avoid this, enclose the function
-call in parentheses (see |luaref-langExpressions|).
+consecutively (see |lua-function|). To avoid this, enclose the function
+call in parentheses (see |lua-expressions|).
 
 The field list may have an optional trailing separator, as a convenience for
 machine-generated code.
 
 ------------------------------------------------------------------------------
-2.5.8  Function Calls                     *luaref-function* *luaref-langFuncCalls*
+2.5.8  Function Calls                     *lua-function*
 
 A function call in Lua has the following syntax:
 >
@@ -778,7 +777,7 @@ In a function call, first `prefixexp` and `args` are evaluated. If the value
 of `prefixexp` has type `function`, then this function is called with the given
 arguments. Otherwise, the `prefixexp` "call" metamethod is called, having as
 first parameter the value of `prefixexp`, followed by the original call
-arguments (see |luaref-langMetatables|).
+arguments (see |lua-metatable|).
 
 The form
 >
@@ -810,7 +809,7 @@ Lua would see that as a single statement, `a = f(g).x(a)`. So, if you want two
 statements, you must add a semi-colon between them. If you actually want to
 call `f`, you must remove the line break before `(g)`.
 
-                                                               *luaref-tailcall*
+                                                               *lua-tailcall*
 A call of the form `return` `functioncall` is called a tail call. Lua
 implements proper tail calls (or proper tail recursion): in a tail call, the
 called function reuses the stack entry of the calling function. Therefore,
@@ -829,7 +828,7 @@ of the following examples are tail calls:
 <
 
 ------------------------------------------------------------------------------
-2.5.9  Function Definitions                                *luaref-langFuncDefs*
+2.5.9  Function Definitions                     *lua-function-define*
 
 The syntax for function definition is
 >
@@ -873,7 +872,7 @@ not to
 (This only makes a difference when the body of the function contains
 references to `f`.)
 
-                                                                *luaref-closure*
+                                                                *lua-closure*
 A function definition is an executable expression, whose value has type
 `function`. When Lua pre-compiles a chunk, all its function bodies are
 pre-compiled too. Then, whenever Lua executes the function definition, the
@@ -887,7 +886,7 @@ values:
 >
        parlist1 ::= namelist [ , ... ] | ...
 <
-                                                                 *luaref-vararg*
+                                                                 *lua-vararg*
 When a function is called, the list of arguments is adjusted to the length of
 the list of parameters, unless the function is a variadic or vararg function,
 which is indicated by three dots (`...`) at the end of its parameter list. A
@@ -922,11 +921,11 @@ vararg expression:
        g(3, 4, 5, 8)    a=3, b=4,   ... -->  5  8
        g(5, r())        a=5, b=1,   ... -->  2  3
 <
-Results are returned using the `return` statement (see |luaref-langContStructs|).
+Results are returned using the `return` statement (see |lua-control|).
 If control reaches the end of a function without encountering
 a `return` statement, then the function returns with no results.
 
-                                                            *luaref-colonsyntax*
+                                                            *lua-colonsyntax*
 The colon syntax is used for defining methods, that is, functions that have an
 implicit extra parameter `self`. Thus, the statement
 
@@ -937,7 +936,7 @@ is syntactic sugar for
        `t.a.b.c:f = function (self, (`  `params`  `)`  `body`  `end`
 
 ==============================================================================
-2.6  Visibility Rules                                    *luaref-langVisibRules*
+2.6  Visibility Rules                                    *lua-visibility*
 
 Lua is a lexically scoped language. The scope of variables begins at the first
 statement after their declaration and lasts until the end of the innermost
@@ -959,7 +958,7 @@ block that includes the declaration. Consider the following example:
 Notice that, in a declaration like `local x = x`, the new `x` being declared is
 not in scope yet, and so the second `x` refers to the outside variable.
 
-                                                                *luaref-upvalue*
+                                                                *lua-upvalue*
 Because of the lexical scoping rules, local variables can be freely accessed
 by functions defined inside their scope. A local variable used by an inner
 function is called an upvalue, or external local variable, inside the inner
@@ -980,7 +979,7 @@ function). Each of these closures uses a different `y` variable, while all of
 them share the same `x`.
 
 ==============================================================================
-2.7  Error Handling                                           *luaref-langError*
+2.7  Error Handling                                           *lua-errors*
 
 Because Lua is an embedded extension language, all Lua actions start from
 C code in the host program calling a function from the Lua library (see
@@ -989,11 +988,11 @@ execution, control returns to C, which can take appropriate measures (such as
 print an error message).
 
 Lua code can explicitly generate an error by calling the `error` function (see
-|luaref-error()|). If you need to catch errors in Lua, you can use
-the `pcall` function (see |luaref-pcall()|).
+|error()|). If you need to catch errors in Lua, you can use the `pcall`
+function (see |pcall()|).
 
 ==============================================================================
-2.8  Metatables                         *luaref-metatable* *luaref-langMetatables*
+2.8  Metatables                         *metatable* *lua-metatable*
 
 Every value in Lua may have a metatable. This metatable is an ordinary Lua
 table that defines the behavior of the original table and userdata under
@@ -1008,10 +1007,10 @@ previous example, the event is "add" and the metamethod is the function that
 performs the addition.
 
 You can query the metatable of any value through the `getmetatable` function
-(see |luaref-getmetatable()|).
+(see |getmetatable()|).
 
 You can replace the metatable of tables through the `setmetatable` function (see
-|luaref-setmetatable()|). You cannot change the metatable of other types from Lua
+|setmetatable()|). You cannot change the metatable of other types from Lua
 (except using the debug library); you must use the C API for that.
 
 Tables and userdata have individual metatables (although multiple tables and
@@ -1037,7 +1036,7 @@ by a Lua function describing how the interpreter executes that operation.
 The code shown here in Lua is only illustrative; the real behavior is hard
 coded in the interpreter and it is much more efficient than this simulation.
 All functions used in these descriptions (`rawget`, `tonumber`, etc.) are
-described in |luaref-libBasic|. In particular, to retrieve the metamethod of a
+described in |lua-lib-core|. In particular, to retrieve the metamethod of a
 given object, we use the expression
 >
        metatable(obj)[event]
@@ -1307,7 +1306,7 @@ called when Lua calls a value.
 <
 
 ==============================================================================
-2.9  Environments                   *luaref-environment* *luaref-langEnvironments*
+2.9  Environments                               *lua-environments*
 
 Besides metatables, objects of types thread, function, and userdata have
 another table associated with them, called their environment. Like metatables,
@@ -1319,16 +1318,15 @@ convenience feature for programmers to associate a table to a userdata.
 
 Environments associated with threads are called global environments. They are
 used as the default environment for their threads and non-nested functions
-created by the thread (through `loadfile` |luaref-loadfile()|, `loadstring`
-|luaref-loadstring()| or `load` |luaref-load()|) and can be directly accessed by C
-code (see |luaref-apiPseudoIndices|).
+created by the thread (through |loadfile()|, |loadstring()| or |load()|) and
+can be directly accessed by C code (see |lua-pseudoindex|).
 
 Environments associated with C functions can be directly accessed by C code
-(see |luaref-apiPseudoIndices|). They are used as the default environment for
+(see |lua-pseudoindex|). They are used as the default environment for
 other C functions created by the function.
 
 Environments associated with Lua functions are used to resolve all accesses to
-global variables within the function (see |luaref-langVariables|). They are
+global variables within the function (see |lua-variables|). They are
 used as the default environment for other Lua functions created by the
 function.
 
@@ -1339,7 +1337,7 @@ environment of other objects (userdata, C functions, other threads) you must
 use the C API.
 
 ==============================================================================
-2.10  Garbage Collection                                         *luaref-langGC*
+2.10  Garbage Collection                                         *lua-gc*
 
 Lua performs automatic memory management. This means that you do not have to
 worry neither about allocating memory for new objects nor about freeing it
@@ -1367,16 +1365,16 @@ The default, 2, means that the collector runs at "twice" the speed of memory
 allocation.
 
 You can change these numbers by calling `lua_gc` (see |lua_gc()|) in C or
-`collectgarbage` (see |luaref-collectgarbage()|) in Lua. Both get percentage
-points as arguments (so an argument of 100 means a real value of 1). With
-these functions you can also control the collector directly (e.g., stop and
-restart it).
+`collectgarbage` (see |collectgarbage()|) in Lua. Both get percentage points
+as arguments (so an argument of 100 means a real value of 1). With these
+functions you can also control the collector directly (e.g., stop and restart
+it).
 
 ------------------------------------------------------------------------------
-2.10.1  Garbage-Collection Metamethods                       *luaref-langGCMeta*
+2.10.1  Garbage-Collection Metamethods                       *lua-gc-meta*
 
 Using the C API, you can set garbage-collector metamethods for userdata (see
-|luaref-langMetatables|). These metamethods are also called finalizers.
+|lua-metatable|). These metamethods are also called finalizers.
 Finalizers allow you to coordinate Lua's garbage collection with external
 resource management (such as closing files, network or database connections,
 or freeing your own memory).
@@ -1400,7 +1398,7 @@ cycle. That is, the first finalizer to be called is the one associated with
 the userdata created last in the program.
 
 ------------------------------------------------------------------------------
-2.10.2 - Weak Tables                    *luaref-weaktable* *luaref-langWeaktables*
+2.10.2 - Weak Tables                            *lua-weaktable*
 
 A weak table is a table whose elements are weak references. A weak reference
 is ignored by the garbage collector. In other words, if the only references to
@@ -1422,7 +1420,7 @@ field `__mode`. Otherwise, the weak behavior of the tables controlled by this
 metatable is undefined.
 
 ==============================================================================
-2.11  Coroutines                              *luaref-coroutine* *luaref-langCoro*
+2.11  Coroutines                                *lua-coroutine*
 
 Lua supports coroutines, also called collaborative multithreading. A coroutine
 in Lua represents an independent thread of execution. Unlike threads in
@@ -1502,7 +1500,7 @@ When you run it, it produces the following output:
 <
 
 ==============================================================================
-3  THE APPLICATION PROGRAM INTERFACE                                *luaref-API*
+3  THE APPLICATION PROGRAM INTERFACE                                *lua-API*
 
 This section describes the C API for Lua, that is, the set of C functions
 available to the host program to communicate with Lua. All API functions and
@@ -1519,7 +1517,7 @@ Lua with a proper definition for the macro `luai_apicheck`,in file
 `luaconf.h`.
 
 ==============================================================================
-3.1  The Stack                                    *luaref-stack* *luaref-apiStack*
+3.1  The Stack                                    *lua-stack* *lua-apiStack*
 
 Lua uses a virtual stack to pass values to and from C. Each element in this
 stack represents a Lua value (`nil`, number, string, etc.).
@@ -1530,7 +1528,7 @@ active. This stack initially contains any arguments to the C function and it
 is where the C function pushes its results to be returned to the caller (see
 |lua_CFunction|).
 
-                                                             *luaref-stackindex*
+                                                             *lua-stackindex*
 For convenience, most query operations in the API do not follow a strict stack
 discipline. Instead, they can refer to any element in the stack by using an
 index: a positive index represents an absolute stack position (starting at 1);
@@ -1543,7 +1541,7 @@ We say that an index is valid if it lies between 1 and the stack top (that is,
 if `1 <= abs(index) <= top`).
 
 ==============================================================================
-3.2  Stack Size                                            *luaref-apiStackSize*
+3.2  Stack Size                                            *lua-apiStackSize*
 
 When you interact with Lua API, you are responsible for ensuring consistency.
 In particular, you are responsible for controlling stack overflow. You can
@@ -1565,13 +1563,13 @@ we define an acceptable index as follows:
 Note that 0 is never an acceptable index.
 
 ==============================================================================
-3.3  Pseudo-Indices                 *luaref-pseudoindex* *luaref-apiPseudoIndices*
+3.3  Pseudo-Indices                                     *lua-pseudoindex*
 
 Unless otherwise noted, any function that accepts valid indices can also be
 called with pseudo-indices, which represent some Lua values that are
 accessible to the C code but which are not in the stack. Pseudo-indices are
 used to access the thread environment, the function environment, the registry,
-and the upvalues of a C function (see |luaref-apiCClosures|).
+and the upvalues of a C function (see |lua-cclosure|).
 
 The thread environment (where global variables live) is always at pseudo-index
 `LUA_GLOBALSINDEX`. The environment of the running C function is always at
@@ -1585,7 +1583,7 @@ global variable, do
 <
 
 ==============================================================================
-3.4  C Closures                            *luaref-cclosure* *luaref-apiCClosures*
+3.4  C Closures                                         *lua-cclosure*
 
 When a C function is created, it is possible to associate some values with it,
 thus creating a C closure; these values are called upvalues and are accessible
@@ -1599,7 +1597,7 @@ where `n` is greater than the number of upvalues of the current function,
 produces an acceptable (but invalid) index.
 
 ==============================================================================
-3.5  Registry                               *luaref-registry* *luaref-apiRegistry*
+3.5  Registry                                           *lua-registry*
 
 Lua provides a registry, a pre-defined table that can be used by any C code to
 store whatever Lua value it needs to store. This table is always located at
@@ -1614,7 +1612,7 @@ implemented by the auxiliary library, and therefore should not be used for
 other purposes.
 
 ==============================================================================
-3.6  Error Handling in C                                       *luaref-apiError*
+3.6  Error Handling in C                                *lua-apiError*
 
 Internally, Lua uses the C `longjmp` facility to handle errors. (You can also
 choose to use exceptions if you use C++; see file `luaconf.h`.) When Lua faces
@@ -1634,7 +1632,7 @@ Inside a C function you can raise an error by calling `lua_error`  (see
 |lua_error()|).
 
 ==============================================================================
-3.7  Functions and Types                                   *luaref-apiFunctions*
+3.7  Functions and Types                                   *lua-apiFunctions*
 
 Here we list all functions and types from the C API in alphabetical order.
 
@@ -1736,7 +1734,7 @@ lua_call                                                            *lua_call()*
         to its original configuration. This is considered good programming
         practice.
 
-lua_CFunction                                   *luaref-cfunction* *lua_CFunction*
+lua_CFunction                                   *lua-cfunction* *lua_CFunction*
 >c
     typedef int (*lua_CFunction) (lua_State *L);
 <
@@ -1755,7 +1753,7 @@ lua_CFunction                                   *luaref-cfunction* *lua_CFunctio
         be properly discarded by Lua. Like a Lua function, a C function called
         by Lua can also return many results.
 
-                                                       *luaref-cfunctionexample*
+                                                       *lua-cfunctionexample*
         As an example, the following function receives a variable number of
         numerical arguments and returns their average and sum:
 >c
@@ -1805,7 +1803,7 @@ lua_concat                                                        *lua_concat()*
         leaves the result at the top. If `n` is 1, the result is the single
         string on the stack (that is, the function does nothing); if `n` is 0,
         the result is the empty string. Concatenation is done following the
-        usual semantics of Lua (see |luaref-langConcat|).
+        usual semantics of Lua (see |lua-concat|).
 
 lua_cpcall                                                        *lua_cpcall()*
 >c
@@ -1884,12 +1882,12 @@ lua_gc                                                                *lua_gc()*
                           function returns 1 if the step finished a
                           garbage-collection cycle.
         - `LUA_GCSETPAUSE`  sets `data` /100 as the new value for the
-                          `pause` of the collector (see |luaref-langGC|).
+                          `pause` of the collector (see |lua-gc|).
                           The function returns the previous value of the
                           pause.
         - `LUA_GCSETSTEPMUL`sets `data` /100 as the new value for the
                           `step` `multiplier`  of the collector (see
-                          |luaref-langGC|). The function returns the
+                          |lua-gc|). The function returns the
                           previous value of the step multiplier.
 
 lua_getallocf                                                  *lua_getallocf()*
@@ -1913,7 +1911,7 @@ lua_getfield                                                    *lua_getfield()*
 <
         Pushes onto the stack the value `t[k]`, where `t` is the value at the
         given valid index `index`. As in Lua, this function may trigger a
-        metamethod for the "index" event (see |luaref-langMetatables|).
+        metamethod for the "index" event (see |lua-metatable|).
 
 lua_getglobal                                                  *lua_getglobal()*
 >c
@@ -1944,7 +1942,7 @@ lua_gettable                                                    *lua_gettable()*
 
         This function pops the key from the stack (putting the resulting value
         in its place). As in Lua, this function may trigger a metamethod for
-        the "index" event (see |luaref-langMetatables|).
+        the "index" event (see |lua-metatable|).
 
 lua_gettop                                                        *lua_gettop()*
 >c
@@ -2076,7 +2074,7 @@ lua_load                                                            *lua_load()*
         value passed to the reader function.
 
         The `chunkname` argument gives a name to the chunk, which is used for
-        error messages and in debug information (see |luaref-apiDebug|).
+        error messages and in debug information (see |lua-apiDebug|).
 
 lua_newstate                                                    *lua_newstate()*
 >c
@@ -2116,7 +2114,7 @@ lua_newuserdata                                              *lua_newuserdata()*
         This function allocates a new block of memory with the given size,
         pushes onto the stack a new full userdata with the block address, and
         returns this address.
-                                                               *luaref-userdata*
+                                                                    *userdata*
         Userdata represents C values in Lua. A full userdata represents a
         block of memory. It is an object (like a table): you must create it,
         it can have its own metatable, and you can detect when it is being
@@ -2136,7 +2134,7 @@ lua_next                                                            *lua_next()*
         no more elements in the table, then `lua_next` returns 0 (and pushes
         nothing).
 
-                                                         *luaref-tabletraversal*
+                                                         *lua-tabletraversal*
         A typical traversal looks like this:
 >c
                /* table is in the stack at index 't' */
@@ -2228,7 +2226,7 @@ lua_pushcclosure                                            *lua_pushcclosure()*
         Pushes a new C closure onto the stack.
 
         When a C function is created, it is possible to associate some values
-        with it, thus creating a C closure (see |luaref-apiCClosures|); these
+        with it, thus creating a C closure (see |lua-cclosure|); these
         values are then accessible to the function whenever it is called. To
         associate values with a C function, first these values should be
         pushed onto the stack (when there are multiple values, the first value
@@ -2284,7 +2282,7 @@ lua_pushlightuserdata                                  *lua_pushlightuserdata()*
     void lua_pushlightuserdata (lua_State *L, void *p);
 <
         Pushes a light userdata onto the stack.
-                                                          *luaref-lightuserdata*
+                                                          *lua-lightuserdata*
         Userdata represents C values in Lua. A light userdata represents a
         pointer. It is a value (like a number): you do not create it, it has
         no individual metatable, and it is not collected (as it was never
@@ -2476,7 +2474,7 @@ lua_setfield                                                    *lua_setfield()*
 
         This function pops the value from the stack. As in Lua, this function
         may trigger a metamethod for the "newindex" event (see
-        |luaref-langMetatables|).
+        |lua-metatable|).
 
 lua_setglobal                                                  *lua_setglobal()*
 >c
@@ -2505,7 +2503,7 @@ lua_settable                                                    *lua_settable()*
 
         This function pops both the key and the value from the stack. As in
         Lua, this function may trigger a metamethod for the "newindex" event
-        (see |luaref-langMetatables|).
+        (see |lua-metatable|).
 
 lua_settop                                                        *lua_settop()*
 >c
@@ -2563,7 +2561,7 @@ lua_tointeger                                                  *lua_tointeger()*
         Converts the Lua value at the given acceptable index to the signed
         integral type `lua_Integer` (see |lua_Integer|). The Lua value
         must be a number or a string convertible to a number (see
-        |luaref-langCoercion|); otherwise, `lua_tointeger` returns 0.
+        |lua-coercion|); otherwise, `lua_tointeger` returns 0.
 
         If the number is not an integer, it is truncated in some non-specified
         way.
@@ -2593,7 +2591,7 @@ lua_tonumber                                                    *lua_tonumber()*
 <
         Converts the Lua value at the given acceptable index to the C type
         `lua_Number` (see |lua_Number|). The Lua value must be a number
-        or a string convertible to a number (see |luaref-langCoercion|);
+        or a string convertible to a number (see |lua-coercion|);
         otherwise, `lua_tonumber` returns 0.
 
 lua_topointer                                                  *lua_topointer()*
@@ -2690,7 +2688,7 @@ lua_yield                                                          *lua_yield()*
         parameter `nresults` is the number of values from the stack that are
         passed as results to `lua_resume`.
 
-                                                           *luaref-stackexample*
+                                                           *lua-stackexample*
         As an example of stack manipulation, if the stack starts as
         `10 20 30 40 50*` (from bottom to top; the `*` marks the top), then
 >
@@ -2706,7 +2704,7 @@ lua_yield                                                          *lua_yield()*
 <
 
 ==============================================================================
-3.8  The Debug Interface                                       *luaref-apiDebug*
+3.8  The Debug Interface                                       *lua-apiDebug*
 
 Lua has no built-in debugging facilities. Instead, it offers a special
 interface by means of functions and hooks. This interface allows the
@@ -2950,7 +2948,7 @@ lua_setupvalue                                                *lua_setupvalue()*
         Returns `NULL` (and pops nothing) when the index is greater than the
         number of upvalues.
 
-                                                           *luaref-debugexample*
+                                                           *lua-debugexample*
         As an example, the following function lists the names of all local
         variables and upvalues for a function at a given level of the stack:
 >c
@@ -2976,7 +2974,7 @@ lua_setupvalue                                                *lua_setupvalue()*
 <
 
 ==============================================================================
-4  THE AUXILIARY LIBRARY                                            *luaref-aux*
+4  THE AUXILIARY LIBRARY                                            *lua-aux*
 
 The auxiliary library provides several convenient functions to interface C
 with Lua. While the basic API provides the primitive functions for all
@@ -2996,7 +2994,7 @@ message is formatted for arguments (e.g., "bad argument #1"), you should not
 use these functions for other stack values.
 
 ==============================================================================
-4.1  Functions and Types                                   *luaref-auxFunctions*
+4.1  Functions and Types                                   *lua-auxFunctions*
 
 Here we list all functions and types from the auxiliary library in
 alphabetical order.
@@ -3334,7 +3332,7 @@ luaL_openlibs                                                  *luaL_openlibs()*
     void luaL_openlibs (lua_State *L);
 <
         Opens all standard Lua libraries into the given state. See also
-        |luaref-openlibs| for details on how to open individual libraries.
+        |lua-openlibs| for details on how to open individual libraries.
 
 luaL_optint                                                      *luaL_optint()*
 >c
@@ -3507,7 +3505,7 @@ luaL_where                                                        *luaL_where()*
         This function is used to build a prefix for error messages.
 
 ==============================================================================
-5  STANDARD LIBRARIES                                               *luaref-Lib*
+5  STANDARD LIBRARIES                                               *lua-Lib*
 
 The standard libraries provide useful functions that are implemented directly
 through the C API. Some of these functions provide essential services to the
@@ -3531,7 +3529,7 @@ separate C modules. Currently, Lua has the following standard libraries:
 Except for the basic and package libraries, each library provides all its
 functions as fields of a global table or as methods of its objects.
 
-                                                               *luaref-openlibs*
+                                                               *lua-openlibs*
 To have access to these libraries, the C host program should call the
 `luaL_openlibs` function, which opens all standard libraries (see
 |luaL_openlibs()|). Alternatively, the host program can open the libraries
@@ -3544,18 +3542,18 @@ declared in `lualib.h` and should not be called directly: you must call them
 like any other Lua C function, e.g., by using `lua_call` (see |lua_call()|).
 
 ==============================================================================
-5.1  Basic Functions                                           *luaref-libBasic*
+5.1  Basic Functions                                           *lua-lib-core*
 
 The basic library provides some core functions to Lua. If you do not include
 this library in your application, you should check carefully whether you need
 to provide implementations for some of its facilities.
 
-assert({v} [, {message}])                                      *luaref-assert()*
+assert({v} [, {message}])                               *assert()*
     Issues an error when the value of its argument `v` is false (i.e., `nil` or
     `false`); otherwise, returns all its arguments. `message` is an error message;
     when absent, it defaults to "assertion failed!"
 
-collectgarbage({opt} [, {arg}])                        *luaref-collectgarbage()*
+collectgarbage({opt} [, {arg}])                         *collectgarbage()*
         This function is a generic interface to the garbage collector. It
         performs different functions according to its first argument, {opt}:
 
@@ -3569,18 +3567,18 @@ collectgarbage({opt} [, {arg}])                        *luaref-collectgarbage()*
                      you must experimentally tune the value of {arg}. Returns
                      `true` if the step finished a collection cycle.
         `"setpause"`   sets {arg} /100 as the new value for the `pause` of
-                     the collector (see |luaref-langGC|).
+                     the collector (see |lua-gc|).
         `"setstepmul"` sets {arg} /100 as the new value for the `step
-                     multiplier` of the collector (see |luaref-langGC|).
+                     multiplier` of the collector (see |lua-gc|).
 
-dofile({filename})                                             *luaref-dofile()*
+dofile({filename})                                      *dofile()*
         Opens the named file and executes its contents as a Lua chunk. When
         called without arguments, `dofile` executes the contents of the
         standard input (`stdin`). Returns all values returned by the chunk. In
         case of errors, `dofile` propagates the error to its caller (that is,
         `dofile` does not run in protected mode).
 
-error({message} [, {level}])                                    *luaref-error()*
+error({message} [, {level}])                            *error()*
         Terminates the last protected function called and returns `message` as
         the error message. Function {error} never returns.
 
@@ -3592,26 +3590,26 @@ error({message} [, {level}])                                    *luaref-error()*
         a level 0 avoids the addition of error position information to the
         message.
 
-_G                                                                   *luaref-_G*
+_G                                                      *_G*
         A global variable (not a function) that holds the global environment
         (that is, `_G._G = _G`). Lua itself does not use this variable;
         changing its value does not affect any environment, nor vice-versa.
         (Use `setfenv` to change environments.)
 
-getfenv({f})                                                  *luaref-getfenv()*
+getfenv({f})                                            *getfenv()*
         Returns the current environment in use by the function. {f} can be a
         Lua function or a number that specifies the function at that stack
         level: Level 1 is the function calling `getfenv`. If the given
         function is not a Lua function, or if {f} is 0, `getfenv` returns the
         global environment. The default for {f} is 1.
 
-getmetatable({object})                                   *luaref-getmetatable()*
+getmetatable({object})                                  *getmetatable()*
         If {object} does not have a metatable, returns `nil`. Otherwise, if
         the object's metatable has a `"__metatable"` field, returns the
         associated value. Otherwise, returns the metatable of the given
         object.
 
-ipairs({t})                                                           *ipairs()*
+ipairs({t})                                             *ipairs()*
         Returns three values: an |iterator| function, the table {t}, and 0, so
         that the construction
 
@@ -3620,7 +3618,7 @@ ipairs({t})                                                           *ipairs()*
         will iterate over the pairs (`1,t[1]`), (`2,t[2]`), ..., up to the
         first integer key absent from the table.
 
-load({func} [, {chunkname}])                                     *luaref-load()*
+load({func} [, {chunkname}])                            *load()*
         Loads a chunk using function {func} to get its pieces. Each call to
         {func} must return a string that concatenates with previous results. A
         return of `nil` (or no value) signals the end of the chunk.
@@ -3632,12 +3630,12 @@ load({func} [, {chunkname}])                                     *luaref-load()*
         {chunkname} is used as the chunk name for error messages and debug
         information.
 
-loadfile([{filename}])                                       *luaref-loadfile()*
-        Similar to `load` (see |luaref-load()|), but gets the chunk from file
+loadfile([{filename}])                                  *loadfile()*
+        Similar to `load` (see |load()|), but gets the chunk from file
         {filename} or from the standard input, if no file name is given.
 
-loadstring({string} [, {chunkname}])                       *luaref-loadstring()*
-        Similar to `load` (see |luaref-load()|), but gets the chunk from the
+loadstring({string} [, {chunkname}])                    *loadstring()*
+        Similar to `load` (see |load()|), but gets the chunk from the
         given {string}.
 
         To load and run a given string, use the idiom
@@ -3645,7 +3643,7 @@ loadstring({string} [, {chunkname}])                       *luaref-loadstring()*
                assert(loadstring(s))()
 <
 
-next({table} [, {index}])                                        *next()*
+next({table} [, {index}])                               *next()*
         Allows a program to traverse all fields of a table. Its first argument
         is a table and its second argument is an index in this table. `next`
         returns the next index of the table and its associated value. When
@@ -3663,7 +3661,7 @@ next({table} [, {index}])                                        *next()*
         assign any value to a non-existent field in the table. You may however
         modify existing fields. In particular, you may clear existing fields.
 
-pairs({t})                                                             *pairs()*
+pairs({t})                                              *pairs()*
         Returns three values: the |next()| function, the table {t}, and `nil`,
         so that the construction
 
@@ -3671,7 +3669,7 @@ pairs({t})                                                             *pairs()*
 
         will iterate over all key-value pairs of table {t}.
 
-pcall({f}, {arg1}, {...})                                       *luaref-pcall()*
+pcall({f}, {arg1}, {...})                               *pcall()*
         Calls function {f} with the given arguments in `protected mode`. This
         means that any error inside {f} is not propagated; instead, `pcall`
         catches the error and returns a status code. Its first result is the
@@ -3680,34 +3678,34 @@ pcall({f}, {arg1}, {...})                                       *luaref-pcall()*
         after this first result. In case of any error, `pcall` returns `false`
         plus the error message.
 
-print({...})                                                    *luaref-print()*
+print({...})                                            *print()*
         Receives any number of arguments, and prints their values to `stdout`,
-        using the `tostring` |luaref-tostring()| function to convert them to
+        using the `tostring` |tostring()| function to convert them to
         strings. `print` is not intended for formatted output, but only as a
         quick way to show a value, typically for debugging. For formatted
         output, use `string.format` (see |string.format()|).
 
-rawequal({v1}, {v2})                                         *luaref-rawequal()*
+rawequal({v1}, {v2})                                    *rawequal()*
         Checks whether {v1} is equal to {v2}, without invoking any metamethod.
         Returns a boolean.
 
-rawget({table}, {index})                                       *luaref-rawget()*
+rawget({table}, {index})                                *rawget()*
         Gets the real value of `table[index]`, without invoking any
         metamethod. {table} must be a table; {index} may be any value.
 
-rawset({table}, {index}, {value})                              *luaref-rawset()*
+rawset({table}, {index}, {value})                       *rawset()*
         Sets the real value of `table[index]` to {value}, without invoking any
         metamethod. {table} must be a table, {index} any value different from
         `nil`, and {value} any Lua value.
 
         This function returns {table}.
 
-select({index}, {...})                                         *luaref-select()*
+select({index}, {...})                                  *select()*
         If {index} is a number, returns all arguments after argument number
         {index}. Otherwise, {index} must be the string `"#"`, and `select`
         returns the total number of extra arguments it received.
 
-setfenv({f}, {table})                                         *luaref-setfenv()*
+setfenv({f}, {table})                                   *setfenv()*
         Sets the environment to be used by the given function. {f} can be a
         Lua function or a number that specifies the function at that stack
         level: Level 1 is the function calling `setfenv`. `setfenv` returns
@@ -3716,7 +3714,7 @@ setfenv({f}, {table})                                         *luaref-setfenv()*
         As a special case, when {f} is 0 `setfenv` changes the environment of
         the running thread. In this case, `setfenv` returns no values.
 
-setmetatable({table}, {metatable})                       *luaref-setmetatable()*
+setmetatable({table}, {metatable})                      *setmetatable()*
         Sets the metatable for the given table. (You cannot change the
         metatable of other types from Lua, only from C.) If {metatable} is
         `nil`, removes the metatable of the given table. If the original
@@ -3724,7 +3722,7 @@ setmetatable({table}, {metatable})                       *luaref-setmetatable()*
 
         This function returns {table}.
 
-tonumber({e} [, {base}])                                     *luaref-tonumber()*
+tonumber({e} [, {base}])                                *tonumber()*
         Tries to convert its argument to a number. If the argument is already
         a number or a string convertible to a number, then `tonumber` returns
         this number; otherwise, it returns `nil`.
@@ -3734,26 +3732,26 @@ tonumber({e} [, {base}])                                     *luaref-tonumber()*
         10, the letter `A` (in either upper or lower case) represents 10, `B`
         represents 11, and so forth, with `Z'` representing 35. In base 10
         (the default), the number may have a decimal part, as well as an
-        optional exponent part (see |luaref-langLexConv|). In other bases,
+        optional exponent part (see |lua-lexical|). In other bases,
         only unsigned integers are accepted.
 
-tostring({e})                                                *luaref-tostring()*
+tostring({e})                                           *tostring()*
         Receives an argument of any type and converts it to a string in a
         reasonable format. For complete control of how numbers are converted,
         use `string.format` (see |string.format()|).
 
-                                                                    *__tostring*
+                                                        *__tostring*
         If the metatable of {e} has a `"__tostring"` field, `tostring` calls
         the corresponding value with {e} as argument, and uses the result of
         the call as its result.
 
-type({v})                                                        *luaref-type()*
+type({v})                                               *lua-type()*
         Returns the type of its only argument, coded as a string. The possible
         results of this function are `"nil"` (a string, not the value `nil`),
         `"number"`, `"string"`, `"boolean`, `"table"`, `"function"`,
         `"thread"`, and `"userdata"`.
 
-unpack({list} [, {i} [, {j}]])                                 *luaref-unpack()*
+unpack({list} [, {i} [, {j}]])                          *unpack()*
         Returns the elements from the given table. This function is equivalent
         to
 >lua
@@ -3761,16 +3759,16 @@ unpack({list} [, {i} [, {j}]])                                 *luaref-unpack()*
 <
         except that the above code can be written only for a fixed number of
         elements. By default, {i} is 1 and {j} is the length of the list, as
-        defined by the length operator(see |luaref-langLength|).
+        defined by the length operator(see |lua-length|).
 
-_VERSION                                                       *luaref-_VERSION*
+_VERSION                                                *_VERSION*
         A global variable (not a function) that holds a string containing the
         current interpreter version. The current contents of this string is
         `"Lua 5.1"` .
 
-xpcall({f}, {err})                                             *luaref-xpcall()*
-        This function is similar to `pcall` (see |luaref-pcall()|), except that
-        you can set a new error handler.
+xpcall({f}, {err})                                      *xpcall()*
+        This function is similar to `pcall` (see |pcall()|), except that you
+        can set a new error handler.
 
         `xpcall` calls function {f} in protected mode, using {err} as the
         error handler. Any error inside {f} is not propagated; instead,
@@ -3782,10 +3780,10 @@ xpcall({f}, {err})                                             *luaref-xpcall()*
         `false` plus the result from {err}.
 
 ==============================================================================
-5.2  Coroutine Manipulation                                     *luaref-libCoro*
+5.2  Coroutine Manipulation                     *lua-lib-coroutine*
 
 The operations related to coroutines comprise a sub-library of the basic
-library and come inside the table `coroutine`. See |luaref-langCoro| for a
+library and come inside the table `coroutine`. See |lua-coroutine| for a
 general description of coroutines.
 
 coroutine.create({f})                                       *coroutine.create()*
@@ -3830,14 +3828,14 @@ coroutine.yield({...})                                       *coroutine.yield()*
         to `yield` are passed as extra results to `resume`.
 
 ==============================================================================
-5.3 Modules                                                   *luaref-libModule*
+5.3 Modules                                                   *lua-modules*
 
 The package library provides basic facilities for loading and building modules
 in Lua. It exports two of its functions directly in the global environment:
-`require` and `module` (see |luaref-require()| and |luaref-module()|). Everything else is
+`require` and `module` (see |require()| and |module()|). Everything else is
 exported in a table `package`.
 
-module({name} [, {...}])                                       *luaref-module()*
+module({name} [, {...}])                                *module()*
         Creates a module. If there is a table in `package.loaded[name]`, this
         table is the module. Otherwise, if there is a global table `t` with
         the given name, this table is the module. Otherwise creates a new
@@ -3847,8 +3845,7 @@ module({name} [, {...}])                                       *luaref-module()*
         `t._PACKAGE` with the package name (the full module name minus last
         component; see below). Finally, `module` sets `t` as the new
         environment of the current function and the new value of
-        `package.loaded[name]`, so that `require` (see |luaref-require()|)
-        returns `t`.
+        `package.loaded[name]`, so that |require()| returns `t`.
 
         If {name} is a compound name (that is, one with components separated
         by dots), `module` creates (or reuses, if they already exist) tables
@@ -3858,7 +3855,7 @@ module({name} [, {...}])                                       *luaref-module()*
         This function may receive optional `options` after the module name,
         where each option is a function to be applied over the module.
 
-require({modname})                                            *luaref-require()*
+require({modname})                                      *require()*
         Loads the given module. The function starts by looking into the
         `package.loaded` table to determine whether {modname} is already
         loaded. If it is, then `require` returns the value stored at
@@ -3952,7 +3949,7 @@ package.path                                                      *package.path*
         order.
 
 package.preload                                              *package.preload()*
-        A table to store loaders for specific modules (see |luaref-require()|).
+        A table to store loaders for specific modules (see |require()|).
 
 package.seeall({module})                                      *package.seeall()*
         Sets a metatable for {module} with its `__index` field referring to
@@ -3960,7 +3957,7 @@ package.seeall({module})                                      *package.seeall()*
         global environment. To be used as an option to function {module}.
 
 ==============================================================================
-5.4 String Manipulation                                       *luaref-libString*
+5.4 String Manipulation                                       *lua-lib-string*
 
 This library provides generic functions for string manipulation, such as
 finding and extracting substrings, and pattern matching. When indexing a
@@ -3992,7 +3989,7 @@ string.char({...})                                               *string.char()*
 
 string.dump({function})                                          *string.dump()*
         Returns a string containing a binary representation of the given
-        function, so that a later |luaref-loadstring()| on this string returns a
+        function, so that a later |loadstring()| on this string returns a
         copy of the function. {function} must be a Lua function without
         upvalues.
 
@@ -4154,7 +4151,7 @@ string.upper({s})                                               *string.upper()*
         locale.
 
 ------------------------------------------------------------------------------
-5.4.1  Patterns                            *luaref-patterns* *luaref-libStringPat*
+5.4.1  Patterns                                 *lua-patterns
 
 A character class is used to represent a set of characters. The following
 combinations are allowed in describing a character class:
@@ -4199,7 +4196,7 @@ instance, `%S` represents all non-space characters.
 The definitions of letter, space, and other character groups depend on the
 current locale. In particular, the class `[a-z]` may not be equivalent to `%l`.
 
-PATTERN ITEM                                                *luaref-patternitem*
+PATTERN ITEM                                                *lua-patternitem*
 
 A pattern item may be
 
@@ -4225,14 +4222,14 @@ A pattern item may be
       `y` where the count reaches 0. For instance, the item `%b()` matches
       expressions with balanced parentheses.
 
-PATTERN                                                         *luaref-pattern*
+PATTERN                                                         *lua-pattern*
 
 A pattern is a sequence of pattern items. A `^` at the beginning of a pattern
 anchors the match at the beginning of the subject string. A `$` at the end of
 a pattern anchors the match at the end of the subject string. At other
 positions, `^` and `$` have no special meaning and represent themselves.
 
-CAPTURES                                                        *luaref-capture*
+CAPTURES                                                        *lua-capture*
 
 A pattern may contain sub-patterns enclosed in parentheses; they describe
 captures. When a match succeeds, the substrings of the subject string that
@@ -4249,7 +4246,7 @@ string `"flaaap"`, there will be two captures: 3 and 5.
 A pattern cannot contain embedded zeros.  Use `%z` instead.
 
 ==============================================================================
-5.5  Table Manipulation                                        *luaref-libTable*
+5.5  Table Manipulation                                        *lua-lib-table*
 
 This library provides generic functions for table manipulation. It provides
 all its functions inside the table `table`.
@@ -4285,7 +4282,7 @@ table.insert({table}, [{pos},] {value})                         *table.insert()*
         Inserts element {value} at position {pos} in {table}, shifting up
         other elements to open space, if necessary. The default value for
         {pos} is `n+1`, where `n` is the length of the table (see
-        |luaref-langLength|), so that a call `table.insert(t,x)` inserts `x`
+        |lua-length|), so that a call `table.insert(t,x)` inserts `x`
         at the end of table `t`.
 
 table.maxn({table})                                               *table.maxn()*
@@ -4297,13 +4294,13 @@ table.remove({table} [, {pos}])                                 *table.remove()*
         Removes from {table} the element at position {pos}, shifting down
         other elements to close the space, if necessary. Returns the value of
         the removed element. The default value for {pos} is `n`, where `n` is
-        the length of the table (see |luaref-langLength|), so that a call
+        the length of the table (see |lua-length|), so that a call
         `table.remove(t)` removes the last element of table `t`.
 
 table.sort({table} [, {comp}])                                    *table.sort()*
         Sorts table elements in a given order, `in-place`, from `table[1]` to
         `table[n]`, where `n` is the length of the table (see
-        |luaref-langLength|). If {comp} is given, then it must be a function
+        |lua-length|). If {comp} is given, then it must be a function
         that receives two table elements, and returns true when the first is
         less than the second (so that `not comp(a[i+1],a[i])` will be true
         after the sort). If {comp} is not given, then the standard Lua
@@ -4313,7 +4310,7 @@ The sort algorithm is `not` stable, that is, elements considered equal by the
 given order may have their relative positions changed by the sort.
 
 ==============================================================================
-5.6  Mathematical Functions                                     *luaref-libMath*
+5.6  Mathematical Functions                                     *lua-lib-math*
 
 This library is an interface to most of the functions of the standard C math
 library. It provides all its functions inside the table `math`.
@@ -4426,7 +4423,7 @@ math.tanh({x})                                                     *math.tanh()*
         Returns the hyperbolic tangent of {x}.
 
 ==============================================================================
-5.6  Input and Output Facilities                                  *luaref-libIO*
+5.6  Input and Output Facilities                                  *lua-lib-io*
 
 The I/O library provides two different styles for file manipulation. The first
 one uses implicit file descriptors; that is, there are operations to set a
@@ -4524,15 +4521,15 @@ io.type({obj})                                                       *io.type()*
 io.write({...})                                                     *io.write()*
         Equivalent to `io.output():write`.
 
-file:close()                                               *luaref-file:close()*
+file:close()                                               *file:close()*
         Closes `file`. Note that files are automatically closed when their
         handles are garbage collected, but that takes an unpredictable amount
         of time to happen.
 
-file:flush()                                               *luaref-file:flush()*
+file:flush()                                               *file:flush()*
         Saves any written data to `file`.
 
-file:lines()                                               *luaref-file:lines()*
+file:lines()                                               *file:lines()*
         Returns an |iterator| function that, each time it is called, returns a
         new line from the file. Therefore, the construction
 
@@ -4541,7 +4538,7 @@ file:lines()                                               *luaref-file:lines()*
         will iterate over all lines of the file. (Unlike `io.lines`, this
         function does not close the file when the loop ends.)
 
-file:read({...})                                            *luaref-file:read()*
+file:read({...})                                            *file:read()*
         Reads the file `file`, according to the given formats, which specify
         what to read. For each format, the function returns a string (or a
         number) with the characters read, or `nil` if it cannot read data with
@@ -4560,7 +4557,7 @@ file:read({...})                                            *luaref-file:read()*
                  returning `nil` on end of file. If number is zero, it reads
                  nothing and returns an empty string, or `nil` on end of file.
 
-file:seek([{whence}] [, {offset}])                          *luaref-file:seek()*
+file:seek([{whence}] [, {offset}])                          *file:seek()*
         Sets and gets the file position, measured from the beginning of the
         file, to the position given by {offset} plus a base specified by the
         string {whence}, as follows:
@@ -4580,7 +4577,7 @@ file:seek([{whence}] [, {offset}])                          *luaref-file:seek()*
         `file:seek("end")` sets the position to the end of the file, and
         returns its size.
 
-file:setvbuf({mode} [, {size}])                          *luaref-file:setvbuf()*
+file:setvbuf({mode} [, {size}])                          *file:setvbuf()*
         Sets the buffering mode for an output file. There are three available
         modes:
 
@@ -4596,14 +4593,14 @@ file:setvbuf({mode} [, {size}])                          *luaref-file:setvbuf()*
         For the last two cases, {size} specifies the size of the buffer, in
         bytes. The default is an appropriate size.
 
-file:write({...})                                          *luaref-file:write()*
+file:write({...})                                          *file:write()*
         Writes the value of each of its arguments to `file`. The arguments
         must be strings or numbers. To write other values, use `tostring`
-        |luaref-tostring()| or `string.format` |string.format()| before
+        |tostring()| or `string.format` |string.format()| before
         `write`.
 
 ==============================================================================
-5.8  Operating System Facilities                                  *luaref-libOS*
+5.8  Operating System Facilities                                  *lua-lib-os*
 
 This library is implemented through table `os`.
 
@@ -4688,7 +4685,7 @@ os.tmpname()                                                      *os.tmpname()*
         removed when no longer needed.
 
 ==============================================================================
-5.9  The Debug Library                                         *luaref-libDebug*
+5.9  The Debug Library                                         *lua-lib-debug*
 
 This library provides the functionality of the debug interface to Lua
 programs. You should exert care when using this library. The functions
@@ -4762,7 +4759,7 @@ debug.getmetatable({object})                              *debug.getmetatable()*
         have a metatable.
 
 debug.getregistry()                                        *debug.getregistry()*
-        Returns the registry table (see |luaref-apiRegistry|).
+        Returns the registry table (see |lua-registry|).
 
 debug.getupvalue({func}, {up})                              *debug.getupvalue()*
         This function returns the name and the value of the upvalue with index
@@ -4823,7 +4820,7 @@ debug.traceback([{thread},] [{message}] [,{level}])          *debug.traceback()*
         (default is 1, the function calling `traceback`).
 
 ==============================================================================
-A  BIBLIOGRAPHY                                            *luaref-bibliography*
+A  BIBLIOGRAPHY                                            *lua-ref-bibliography*
 
 This help file is a minor adaptation from this main reference:
 
@@ -4849,7 +4846,7 @@ Lua is discussed in these references:
    "Proc. of V Brazilian Symposium on Programming Languages" (2001) B-14-B-28.
 
 ==============================================================================
-B  COPYRIGHT AND LICENSES                                     *luaref-copyright*
+B  COPYRIGHT AND LICENSES                               *lua-ref-copyright*
 
 This help file has the same copyright and license as Lua 5.1 and the Lua 5.1
  manual:
@@ -4875,12 +4872,12 @@ copies or substantial portions of the Software.
  SOFTWARE.
 
 ==============================================================================
-C  LUAREF DOC                 *luarefvim* *luarefvimdoc* *luaref-help* *luaref-doc*
+C  LUAREF DOC                                   *lua-ref-doc*
 
 This is a Vim help file containing a reference for Lua 5.1, and it is -- with
 a few exceptions and adaptations -- a copy of the Lua 5.1 Reference Manual
-(see |luaref-bibliography|). For usage information, refer to
-|luaref-doc|. For copyright information, see |luaref-copyright|.
+(see |lua-ref-bibliography|). For usage information, refer to
+|lua-ref-doc|. For copyright information, see |lua-ref-copyright|.
 
 The main ideas and concepts on how to implement this reference were taken from
 Christian Habermann's CRefVim project
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 1effc87500..7c7be5f214 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -34,8 +34,8 @@ TREESITTER TREES                                             *treesitter-tree*
                                                                       *TSTree*
 
 A "treesitter tree" represents the parsed contents of a buffer, which can be
-used to perform further analysis. It is a |luaref-userdata| reference to an
-object held by the tree-sitter library.
+used to perform further analysis. It is a |userdata| reference to an object
+held by the tree-sitter library.
 
 An instance `TSTree` of a treesitter tree supports the following methods.
 
@@ -50,8 +50,8 @@ TREESITTER NODES                                             *treesitter-node*
                                                                       *TSNode*
 
 A "treesitter node" represents one specific element of the parsed contents of
-a buffer, which can be captured by a |Query| for, e.g., highlighting. It is a
-|luaref-userdata| reference to an object held by the tree-sitter library.
+a buffer, which can be captured by a |Query| for, e.g., highlighting. It is
+a |userdata| reference to an object held by the tree-sitter library.
 
 An instance `TSNode` of a treesitter node supports the following methods.
 
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index be187f842a..f9926bfb53 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -466,7 +466,7 @@ Lua interface (|lua.txt|):
 <  whereas Vim emits only "TEST".
 - Lua has direct access to Nvim |API| via `vim.api`.
 - Lua package.path and package.cpath are automatically updated according to
-  'runtimepath': |lua-require|.
+  'runtimepath'. |lua-module-load|
 
 Commands:
   |:doautocmd| does not warn about "No matching autocommands".
diff --git a/runtime/lua/vim/_meta/regex.lua b/runtime/lua/vim/_meta/regex.lua
index 4bca67797a..ab4f46d43f 100644
--- a/runtime/lua/vim/_meta/regex.lua
+++ b/runtime/lua/vim/_meta/regex.lua
@@ -18,9 +18,9 @@ function vim.regex(re) end
 local regex = {} -- luacheck: no unused
 
 --- Match the string against the regex. If the string should match the regex
---- precisely, surround the regex with `^` and `$`. If the was a match, the
---- byte indices for the beginning and end of the match is returned. When
---- there is no match, `nil` is returned. As any integer is truth-y,
+--- precisely, surround the regex with `^` and `$`. If there was a match, the
+--- byte indices for the beginning and end of the match are returned. When
+--- there is no match, `nil` is returned. Because any integer is "truthy",
 --- `regex:match()` can be directly used as a condition in an if-statement.
 --- @param str string
 function regex:match_str(str) end
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 5ce5b200d3..32575a1cc9 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -80,7 +80,7 @@ end
 ---
 --- @see |string.gmatch()|
 --- @see |vim.split()|
---- @see |luaref-patterns|
+--- @see |lua-patterns|
 --- @see https://www.lua.org/pil/20.2.html
 --- @see http://lua-users.org/wiki/StringLibraryTutorial
 ---
@@ -660,7 +660,7 @@ end
 
 --- Trim whitespace (Lua pattern "%s") from both sides of a string.
 ---
----@see |luaref-patterns|
+---@see |lua-patterns|
 ---@see https://www.lua.org/pil/20.2.html
 ---@param s string String to trim
 ---@return string String with whitespace removed from its beginning and end
-- 
cgit 


From cc87dda31a5b5637ade7ddcfe5199f2df5fd47df Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Fri, 4 Aug 2023 07:10:54 +0100
Subject: fix(lsp): do not assume client capability exists in watchfiles check
 (#24550)

PR #23689 assumes `client.config.capabilities.workspace.didChangeWatchedFiles`
exists when checking `dynamicRegistration`, but thats's true only if it was
passed to `vim.lsp.start{_client}`.

This caused #23806 (still an issue in v0.9.1; needs manual backport), but #23681
fixed it by defaulting `config.capabilities` to `make_client_capabilities` if
not passed to `vim.lsp.start{_client}`.

However, the bug resurfaces on HEAD if you provide a non-nil `capabilities` to
`vim.lsp.start{_client}` with missing fields (e.g: not made via
`make_client_capabilities`).

From what I see, the spec says such missing fields should be interpreted as an
absence of the capability (including those indicated by missing sub-fields):
https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#clientCapabilities

Also, suggest `vim.empty_dict()` for an empty dict in
`:h vim.lsp.start_client()` (`{[vim.type_idx]=vim.types.dictionary}`
no longer works anyway, probably since the cjson switch).
---
 runtime/doc/lsp.txt                 |  3 +--
 runtime/lua/vim/lsp.lua             |  3 +--
 runtime/lua/vim/lsp/_watchfiles.lua | 15 +++++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 1b35219bb8..da624dba65 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -988,8 +988,7 @@ start_client({config})                                *vim.lsp.start_client()*
                     passed to the language server on initialization. Hint: use
                     make_client_capabilities() and modify its result.
                     • Note: To send an empty dictionary use
-                      `{[vim.type_idx]=vim.types.dictionary}`, else it will be
-                      encoded as an array.
+                      |vim.empty_dict()|, else it will be encoded as an array.
 
                   • handlers: Map of language server method names to
                     |lsp-handler|
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index b4c853d3d4..ea6b386b28 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1027,8 +1027,7 @@ end
 ---       \|vim.lsp.protocol.make_client_capabilities()|, passed to the language
 ---       server on initialization. Hint: use make_client_capabilities() and modify
 ---       its result.
----       - Note: To send an empty dictionary use
----         `{[vim.type_idx]=vim.types.dictionary}`, else it will be encoded as an
+---       - Note: To send an empty dictionary use |vim.empty_dict()|, else it will be encoded as an
 ---         array.
 ---
 --- - handlers: Map of language server method names to |lsp-handler|
diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index c271dc6e14..5dbd4a7199 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -121,12 +121,15 @@ M._poll_exclude_pattern = parse('**/.git/{objects,subtree-cache}/**')
 function M.register(reg, ctx)
   local client_id = ctx.client_id
   local client = vim.lsp.get_client_by_id(client_id)
-  if
-    -- Ill-behaved servers may not honor the client capability and try to register
-    -- anyway, so ignore requests when the user has opted out of the feature.
-    not client.config.capabilities.workspace.didChangeWatchedFiles.dynamicRegistration
-    or not client.workspace_folders
-  then
+  -- Ill-behaved servers may not honor the client capability and try to register
+  -- anyway, so ignore requests when the user has opted out of the feature.
+  local has_capability = vim.tbl_get(
+    client.config.capabilities or {},
+    'workspace',
+    'didChangeWatchedFiles',
+    'dynamicRegistration'
+  )
+  if not has_capability or not client.workspace_folders then
     return
   end
   local watch_regs = {} --- @type table<string,{pattern:userdata,kind:integer}>
-- 
cgit 


From 6fa17da39b270bf230764859a9537124b18d3ed5 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 4 Aug 2023 21:26:53 +0100
Subject: docs(options): take ownership of options.txt (#24528)

* docs(options): take ownership of options.txt

- `src/nvim/options.lua` is now the source of truth
- generate runtime/lua/vim/_meta/options.lua

* fixup! zeer comments

* fixup! zeer comments (2)

* fixup! re-enable luacheck

* fixup! regen
---
 runtime/doc/builtin.txt           |    2 +-
 runtime/doc/options.txt           |  752 ++--
 runtime/lua/vim/_meta/options.lua | 7908 +++++++++++++++++++++++++++++++++++++
 3 files changed, 8280 insertions(+), 382 deletions(-)
 create mode 100644 runtime/lua/vim/_meta/options.lua

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 61d5dd35e3..dc4f9610e0 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1378,7 +1378,7 @@ exists({expr})                                                        *exists()*
 		future, thus don't count on it!
 		Working example: >vim
 			echo exists(":make")
-		<NOT working example: >vim
+<		NOT working example: >vim
 			echo exists(":make install")
 
 <		Note that the argument must be a string, not the name of the
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ee5e1f5589..70329a170a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -584,7 +584,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'revins'.
 
 						*'ambiwidth'* *'ambw'*
-'ambiwidth' 'ambw'	string (default: "single")
+'ambiwidth' 'ambw'	string	(default "single")
 			global
 	Tells Vim what to do with characters with East Asian Width Class
 	Ambiguous (such as Euro, Registered Sign, Copyright Sign, Greek
@@ -617,18 +617,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set to one of CJK locales.  See Unicode Standard Annex #11
 	(https://www.unicode.org/reports/tr11).
 
-			*'autochdir'* *'acd'* *'noautochdir'* *'noacd'*
-'autochdir' 'acd'	boolean (default off)
-			global
-	When on, Vim will change the current working directory whenever you
-	open a file, switch buffers, delete a buffer or open/close a window.
-	It will change to the directory containing the file which was opened
-	or selected.  When a buffer has no name it also has no directory, thus
-	the current directory won't change when navigating to it.
-	Note: When this option is on some plugins may not work.
-
 				*'arabic'* *'arab'* *'noarabic'* *'noarab'*
-'arabic' 'arab'		boolean (default off)
+'arabic' 'arab'		boolean	(default off)
 			local to window
 	This option can be set to start editing Arabic text.
 	Setting this option will:
@@ -645,9 +635,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	option).
 	Also see |arabic.txt|.
 
-					*'arabicshape'* *'arshape'*
-					*'noarabicshape'* *'noarshape'*
-'arabicshape' 'arshape'	boolean (default on)
+		*'arabicshape'* *'arshape'* *'noarabicshape'* *'noarshape'*
+'arabicshape' 'arshape'	boolean	(default on)
 			global
 	When on and 'termbidi' is off, the required visual character
 	corrections that need to take place for displaying the Arabic language
@@ -662,6 +651,16 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Arabic is a complex language which requires other settings, for
 	further details see |arabic.txt|.
 
+			*'autochdir'* *'acd'* *'noautochdir'* *'noacd'*
+'autochdir' 'acd'	boolean	(default off)
+			global
+	When on, Vim will change the current working directory whenever you
+	open a file, switch buffers, delete a buffer or open/close a window.
+	It will change to the directory containing the file which was opened
+	or selected.  When a buffer has no name it also has no directory, thus
+	the current directory won't change when navigating to it.
+	Note: When this option is on some plugins may not work.
+
 			*'autoindent'* *'ai'* *'noautoindent'* *'noai'*
 'autoindent' 'ai'	boolean	(default on)
 			local to buffer
@@ -677,7 +676,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When 'smartindent' or 'cindent' is on the indent is changed in
 	a different way.
 
-				 *'autoread'* *'ar'* *'noautoread'* *'noar'*
+				*'autoread'* *'ar'* *'noautoread'* *'noar'*
 'autoread' 'ar'		boolean	(default on)
 			global or local to buffer |global-local|
 	When a file has been detected to have been changed outside of Vim and
@@ -689,7 +688,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	using the global value: >
 		:set autoread<
 <
-				 *'autowrite'* *'aw'* *'noautowrite'* *'noaw'*
+
+				*'autowrite'* *'aw'* *'noautowrite'* *'noaw'*
 'autowrite' 'aw'	boolean	(default off)
 			global
 	Write the contents of the file, if it has been modified, on each
@@ -707,7 +707,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	don't want to be saved this option may cause it to be saved anyway.
 	Renaming the buffer with ":file {name}" may help avoid this.
 
-			 *'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'*
+			*'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'*
 'autowriteall' 'awa'	boolean	(default off)
 			global
 	Like 'autowrite', but also used for commands ":edit", ":enew", ":quit",
@@ -715,7 +715,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Setting this option also implies that Vim behaves like 'autowrite' has
 	been set.
 
-							*'background'* *'bg'*
+						*'background'* *'bg'*
 'background' 'bg'	string	(default "dark")
 			global
 	When set to "dark" or "light", adjusts the default color groups for
@@ -745,7 +745,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	option, you must load syntax.vim again to see the result.  This can be
 	done with ":syntax on".
 
-							*'backspace'* *'bs'*
+						*'backspace'* *'bs'*
 'backspace' 'bs'	string	(default "indent,eol,start")
 			global
 	Influences the working of <BS>, <Del>, CTRL-W and CTRL-U in Insert
@@ -777,7 +777,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	oldest version of a file.
 
 						*'backupcopy'* *'bkc'*
-'backupcopy' 'bkc'	string	(default: "auto")
+'backupcopy' 'bkc'	string	(default "auto")
 			global or local to buffer |global-local|
 	When writing a file and a backup is made, this option tells how it's
 	done.  This is a comma-separated list of words.
@@ -885,7 +885,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-						*'backupext'* *'bex'* *E589*
+					*'backupext'* *'bex'* *E589*
 'backupext' 'bex'	string	(default "~")
 			global
 	String which is appended to a file name to make the name of the
@@ -902,9 +902,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Use 'backupdir' to put the backup in a different directory.
 
 						*'backupskip'* *'bsk'*
-'backupskip' 'bsk'	string	(default: "$TMPDIR/*,$TMP/*,$TEMP/*"
-				 Unix: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"
-				 Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
+'backupskip' 'bsk'	string	(default "$TMPDIR/*,$TMP/*,$TEMP/*"
+                                 Unix: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"
+                                 Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"))
 			global
 	A list of file patterns.  When one of the patterns matches with the
 	name of the file which is written, no backup file is created.  Both
@@ -965,7 +965,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	indicate that an error occurred. It can be silenced by adding the
 	"error" keyword.
 
-				     *'binary'* *'bin'* *'nobinary'* *'nobin'*
+				*'binary'* *'bin'* *'nobinary'* *'nobin'*
 'binary' 'bin'		boolean	(default off)
 			local to buffer
 	This option should be set before editing a binary file.  You can also
@@ -995,7 +995,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	the last line if there is none; this would make the file longer).  See
 	the 'endofline' option.
 
-							*'bomb'* *'nobomb'*
+						*'bomb'* *'nobomb'*
 'bomb'			boolean	(default off)
 			local to buffer
 	When writing a file and the following conditions are met, a BOM (Byte
@@ -1021,14 +1021,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	break if 'linebreak' is on.  Only works for ASCII characters.
 
 			*'breakindent'* *'bri'* *'nobreakindent'* *'nobri'*
-'breakindent' 'bri'	boolean (default off)
+'breakindent' 'bri'	boolean	(default off)
 			local to window
 	Every wrapped line will continue visually indented (same amount of
 	space as the beginning of that line), thus preserving horizontal blocks
 	of text.
 
-						*'breakindentopt'* *'briopt'*
-'breakindentopt' 'briopt' string (default empty)
+					*'breakindentopt'* *'briopt'*
+'breakindentopt' 'briopt'	string	(default "")
 			local to window
 	Settings for 'breakindent'. It can consist of the following optional
 	items and must be separated by a comma:
@@ -1059,7 +1059,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			    (default: off)
 
 						*'browsedir'* *'bsdir'*
-'browsedir' 'bsdir'	string	(default: "last")
+'browsedir' 'bsdir'	string	(default "last")
 			global
 	Which directory to use for the file browser:
 	   last		Use same directory as with last file browser, where a
@@ -1069,7 +1069,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   {path}	Use the specified directory
 
 						*'bufhidden'* *'bh'*
-'bufhidden' 'bh'	string (default: "")
+'bufhidden' 'bh'	string	(default "")
 			local to buffer
 	This option specifies what happens when a buffer is no longer
 	displayed in a window:
@@ -1092,7 +1092,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	special kinds of buffers.   See |special-buffers|.
 
 			*'buflisted'* *'bl'* *'nobuflisted'* *'nobl'* *E85*
-'buflisted' 'bl'	boolean (default: on)
+'buflisted' 'bl'	boolean	(default on)
 			local to buffer
 	When this option is set, the buffer shows up in the buffer list.  If
 	it is reset it is not used for ":bnext", "ls", the Buffers menu, etc.
@@ -1101,7 +1101,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	But not when moving to a buffer with ":buffer".
 
 						*'buftype'* *'bt'* *E382*
-'buftype' 'bt'		string (default: "")
+'buftype' 'bt'		string	(default "")
 			local to buffer
 	The value of this option specifies the type of a buffer:
 	  <empty>	normal buffer
@@ -1149,7 +1149,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|FileWriteCmd| or |FileAppendCmd| autocommands.
 
 						*'casemap'* *'cmp'*
-'casemap' 'cmp'		string	(default: "internal,keepascii")
+'casemap' 'cmp'		string	(default "internal,keepascii")
 			global
 	Specifies details about changing the case of letters.  It may contain
 	these words, separated by a comma:
@@ -1162,15 +1162,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 			This probably only matters for Turkish.
 
 				*'cdhome'* *'cdh'* *'nocdhome'* *'nocdh'*
-'cdhome' 'cdh'		boolean	(default: off)
+'cdhome' 'cdh'		boolean	(default off)
 			global
 	When on, |:cd|, |:tcd| and |:lcd| without an argument changes the
 	current working directory to the |$HOME| directory like in Unix.
 	When off, those commands just print the current directory name.
 	On Unix this option has no effect.
 
-						*'cdpath'* *'cd'* *E344* *E346*
-'cdpath' 'cd'		string	(default: equivalent to $CDPATH or ",,")
+					*'cdpath'* *'cd'* *E344* *E346*
+'cdpath' 'cd'		string	(default equivalent to $CDPATH or ",,")
 			global
 	This is a list of directories which will be searched when using the
 	|:cd|, |:tcd| and |:lcd| commands, provided that the directory being
@@ -1188,8 +1188,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 	(parts of 'cdpath' can be passed to the shell to expand file names).
 
-						*'cedit'*
-'cedit'			string	(default: CTRL-F)
+							*'cedit'*
+'cedit'			string	(default CTRL-F)
 			global
 	The key used in Command-line Mode to open the command-line window.
 	Only non-printable keys are allowed.
@@ -1200,15 +1200,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	|Nvi| also has this option, but it only uses the first character.
 	See |cmdwin|.
 
-						*'channel'*
-'channel'		number (default: 0)
+							*'channel'*
+'channel'		number	(default 0)
 			local to buffer
 	|channel| connected to the buffer, or 0 if no channel is connected.
 	In a |:terminal| buffer this is the terminal channel.
 	Read-only.
 
 				*'charconvert'* *'ccv'* *E202* *E214* *E513*
-'charconvert' 'ccv'	string (default "")
+'charconvert' 'ccv'	string	(default "")
 			global
 	An expression that is used for character encoding conversion.  It is
 	evaluated when a file that is to be read or has been written has a
@@ -1243,7 +1243,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-				   *'cindent'* *'cin'* *'nocindent'* *'nocin'*
+				*'cindent'* *'cin'* *'nocindent'* *'nocin'*
 'cindent' 'cin'		boolean	(default off)
 			local to buffer
 	Enables automatic C program indenting.  See 'cinkeys' to set the keys
@@ -1257,7 +1257,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When you don't like the way 'cindent' works, try the 'smartindent'
 	option or 'indentexpr'.
 
-							*'cinkeys'* *'cink'*
+						*'cinkeys'* *'cink'*
 'cinkeys' 'cink'	string	(default "0{,0},0),0],:,0#,!^F,o,O,e")
 			local to buffer
 	A list of keys that, when typed in Insert mode, cause reindenting of
@@ -1273,6 +1273,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	program.  See |cinoptions-values| for the values of this option, and
 	|C-indenting| for info on C indenting in general.
 
+					*'cinscopedecls'* *'cinsd'*
+'cinscopedecls' 'cinsd'	string	(default "public,protected,private")
+			local to buffer
+	Keywords that are interpreted as a C++ scope declaration by |cino-g|.
+	Useful e.g. for working with the Qt framework that defines additional
+	scope declarations "signals", "public slots" and "private slots": >
+		set cinscopedecls+=signals,public\ slots,private\ slots
+<
 
 						*'cinwords'* *'cinw'*
 'cinwords' 'cinw'	string	(default "if,else,while,do,for,switch")
@@ -1284,15 +1292,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	matter, include the keyword both the uppercase and lowercase:
 	"if,If,IF".
 
-						*'cinscopedecls'* *'cinsd'*
-'cinscopedecls' 'cinsd'	string	(default "public,protected,private")
-			local to buffer
-	Keywords that are interpreted as a C++ scope declaration by |cino-g|.
-	Useful e.g. for working with the Qt framework that defines additional
-	scope declarations "signals", "public slots" and "private slots": >
-		set cinscopedecls+=signals,public\ slots,private\ slots
-
-<						*'clipboard'* *'cb'*
+						*'clipboard'* *'cb'*
 'clipboard' 'cb'	string	(default "")
 			global
 	This option is a list of comma-separated names.
@@ -1320,7 +1320,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'cmdheight'* *'ch'*
 'cmdheight' 'ch'	number	(default 1)
-			global or local to tab page
+			global or local to tab page |global-local|
 	Number of screen lines to use for the command-line.  Helps avoiding
 	|hit-enter| prompts.
 	The value of this option is stored with the tab page, so that each tab
@@ -1374,8 +1374,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Minimum value is 12, maximum value is 10000.
 
 					*'comments'* *'com'* *E524* *E525*
-'comments' 'com'	string	(default
-				"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-")
+'comments' 'com'	string	(default "s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-")
 			local to buffer
 	A comma-separated list of strings that can start a comment line.  See
 	|format-comments|.  See |option-backslash| about using backslashes to
@@ -1389,7 +1388,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	add markers for folding, see |fold-marker|.
 
 						*'complete'* *'cpt'* *E535*
-'complete' 'cpt'	string	(default: ".,w,b,u,t")
+'complete' 'cpt'	string	(default ".,w,b,u,t")
 			local to buffer
 	This option specifies how keyword completion |ins-completion| works
 	when CTRL-P or CTRL-N are used.  It is also used for whole-line
@@ -1424,7 +1423,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|i_CTRL-X_CTRL-I|, tags |i_CTRL-X_CTRL-]| and normal expansions).
 
 						*'completefunc'* *'cfu'*
-'completefunc' 'cfu'	string	(default: empty)
+'completefunc' 'cfu'	string	(default "")
 			local to buffer
 	This option specifies a function to be used for Insert mode completion
 	with CTRL-X CTRL-U. |i_CTRL-X_CTRL-U|
@@ -1435,23 +1434,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-						*'completeslash'* *'csl'*
-'completeslash' 'csl'	string	(default: "")
-			local to buffer
-			only for MS-Windows
-	When this option is set it overrules 'shellslash' for completion:
-	- When this option is set to "slash", a forward slash is used for path
-	  completion in insert mode. This is useful when editing HTML tag, or
-	  Makefile with 'noshellslash' on MS-Windows.
-	- When this option is set to "backslash", backslash is used. This is
-	  useful when editing a batch file with 'shellslash' set on MS-Windows.
-	- When this option is empty, same character is used as for
-	  'shellslash'.
-	For Insert mode completion the buffer-local value is used.  For
-	command line completion the global value is used.
-
 						*'completeopt'* *'cot'*
-'completeopt' 'cot'	string	(default: "menu,preview")
+'completeopt' 'cot'	string	(default "menu,preview")
 			global
 	A comma-separated list of options for Insert mode completion
 	|ins-completion|.  The supported values are:
@@ -1482,9 +1466,23 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    select one from the menu. Only works in combination with
 		    "menu" or "menuone".
 
+						*'completeslash'* *'csl'*
+'completeslash' 'csl'	string	(default "")
+			local to buffer
+			only for MS-Windows
+	When this option is set it overrules 'shellslash' for completion:
+	- When this option is set to "slash", a forward slash is used for path
+	  completion in insert mode. This is useful when editing HTML tag, or
+	  Makefile with 'noshellslash' on MS-Windows.
+	- When this option is set to "backslash", backslash is used. This is
+	  useful when editing a batch file with 'shellslash' set on MS-Windows.
+	- When this option is empty, same character is used as for
+	  'shellslash'.
+	For Insert mode completion the buffer-local value is used.  For
+	command line completion the global value is used.
 
-						*'concealcursor'* *'cocu'*
-'concealcursor' 'cocu'	string (default: "")
+					*'concealcursor'* *'cocu'*
+'concealcursor' 'cocu'	string	(default "")
 			local to window
 	Sets the modes in which text in the cursor line can also be concealed.
 	When the current mode is listed then concealing happens just like in
@@ -1502,9 +1500,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Keep in mind that the cursor position is not always where it's
 	displayed.  E.g., when moving vertically it may change column.
 
-
 						*'conceallevel'* *'cole'*
-'conceallevel' 'cole'	number (default 0)
+'conceallevel' 'cole'	number	(default 0)
 			local to window
 	Determine how text with the "conceal" syntax attribute |:syn-conceal|
 	is shown:
@@ -1526,7 +1523,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	option.
 
 				*'confirm'* *'cf'* *'noconfirm'* *'nocf'*
-'confirm' 'cf'		boolean (default off)
+'confirm' 'cf'		boolean	(default off)
 			global
 	When 'confirm' is on, certain operations that would normally
 	fail because of unsaved changes to a buffer, e.g. ":q" and ":e",
@@ -1551,7 +1548,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See 'preserveindent'.
 
 						*'cpoptions'* *'cpo'* *cpo*
-'cpoptions' 'cpo'	string	(default: "aABceFs_")
+'cpoptions' 'cpo'	string	(default "aABceFs_")
 			global
 	A sequence of single character flags.  When a character is present
 	this indicates Vi-compatible behavior.  This is used for things where
@@ -1785,7 +1782,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			whitespace following the word in the motion.
 
 			*'cursorbind'* *'crb'* *'nocursorbind'* *'nocrb'*
-'cursorbind' 'crb'	boolean  (default off)
+'cursorbind' 'crb'	boolean	(default off)
 			local to window
 	When this option is set, as the cursor in the current
 	window moves other cursorbound windows (windows that also have
@@ -1795,7 +1792,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	inserted and deleted lines (though not characters within a line) are
 	taken into account.
 
-
 			*'cursorcolumn'* *'cuc'* *'nocursorcolumn'* *'nocuc'*
 'cursorcolumn' 'cuc'	boolean	(default off)
 			local to window
@@ -1816,9 +1812,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When Visual mode is active the highlighting isn't used to make it
 	easier to see the selected text.
 
-
-						*'cursorlineopt'* *'culopt'*
-'cursorlineopt' 'culopt' string (default: "number,line")
+					*'cursorlineopt'* *'culopt'*
+'cursorlineopt' 'culopt'	string	(default "both")
 			local to window
 	Comma-separated list of settings for how 'cursorline' is displayed.
 	Valid values:
@@ -1834,8 +1829,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	"line" and "screenline" cannot be used together.
 
-
-						*'debug'*
+							*'debug'*
 'debug'			string	(default "")
 			global
 	These values can be used:
@@ -1873,7 +1867,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <
 
 			*'delcombine'* *'deco'* *'nodelcombine'* *'nodeco'*
-'delcombine' 'deco'	boolean (default off)
+'delcombine' 'deco'	boolean	(default off)
 			global
 	If editing Unicode and this option is set, backspace and Normal mode
 	"x" delete each combining character on its own.  When it is off (the
@@ -1911,13 +1905,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	uses another default.
 	Backticks cannot be used in this option for security reasons.
 
-							*'diff'* *'nodiff'*
+						*'diff'* *'nodiff'*
 'diff'			boolean	(default off)
 			local to window
 	Join the current window in the group of windows that shows differences
 	between files.  See |diff-mode|.
 
-						*'dex'* *'diffexpr'*
+						*'diffexpr'* *'dex'*
 'diffexpr' 'dex'	string	(default "")
 			global
 	Expression which is evaluated to obtain a diff file (either ed-style
@@ -1925,7 +1919,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-						*'dip'* *'diffopt'*
+						*'diffopt'* *'dip'*
 'diffopt' 'dip'		string	(default "internal,filler,closeoff")
 			global
 	Option settings for diff mode.  It can consist of the following items.
@@ -2018,7 +2012,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 				hunks of up to 30 lines each, or a 3 buffer
 				diff with hunks of up to 20 lines each.
 
-                algorithm:{text} Use the specified diff algorithm with the
+		algorithm:{text} Use the specified diff algorithm with the
 				internal diff engine. Currently supported
 				algorithms are:
 				myers      the default algorithm
@@ -2033,7 +2027,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:set diffopt=internal,filler,foldcolumn:3
 		:set diffopt-=internal  " do NOT use the internal diff parser
 <
-				     *'digraph'* *'dg'* *'nodigraph'* *'nodg'*
+
+				*'digraph'* *'dg'* *'nodigraph'* *'nodg'*
 'digraph' 'dg'		boolean	(default off)
 			global
 	Enable the entering of digraphs in Insert mode with {char1} <BS>
@@ -2085,7 +2080,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-					*'display'* *'dy'*
+						*'display'* *'dy'*
 'display' 'dy'		string	(default "lastline")
 			global
 	Change the way text is displayed.  This is a comma-separated list of
@@ -2114,8 +2109,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		hor	horizontally, height of windows is not affected
 		both	width and height of windows is affected
 
-					*'emoji'* *'emo'* *'noemoji'* *'noemo'*
-'emoji' 'emo'	boolean (default: on)
+				*'emoji'* *'emo'* *'noemoji'* *'noemo'*
+'emoji' 'emo'		boolean	(default on)
 			global
 	When on all Unicode emoji characters are considered to be full width.
 	This excludes "text emoji" characters, which are normally displayed as
@@ -2123,8 +2118,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	and it has been determined on trial-and-error basis.  Use the
 	|setcellwidths()| function to change the behavior.
 
-					*'encoding'* *'enc'* *E543*
-'encoding' 'enc'
+						*'encoding'* *'enc'*
+'encoding' 'enc'	string	(default "utf-8")
+			global
 	String-encoding used internally and for |RPC| communication.
 	Always UTF-8.
 
@@ -2156,7 +2152,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	be kept.  But you can change it if you want to.
 	See |eol-and-eof| for example settings.
 
-			     *'equalalways'* *'ea'* *'noequalalways'* *'noea'*
+			*'equalalways'* *'ea'* *'noequalalways'* *'noea'*
 'equalalways' 'ea'	boolean	(default on)
 			global
 	When on, all the windows are automatically made the same size after
@@ -2195,7 +2191,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	or do nothing. See 'belloff' to finetune when to ring the bell.
 
 						*'errorfile'* *'ef'*
-'errorfile' 'ef'	string	(default: "errors.err")
+'errorfile' 'ef'	string	(default "errors.err")
 			global
 	Name of the errorfile for the QuickFix mode (see |:cf|).
 	When the "-q" command-line argument is used, 'errorfile' is set to the
@@ -2221,7 +2217,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Otherwise this is a comma-separated list of event names.  Example: >
 	    :set ei=WinEnter,WinLeave
 <
-				 *'expandtab'* *'et'* *'noexpandtab'* *'noet'*
+
+				*'expandtab'* *'et'* *'noexpandtab'* *'noet'*
 'expandtab' 'et'	boolean	(default off)
 			local to buffer
 	In Insert mode: Use the appropriate number of spaces to insert a
@@ -2230,7 +2227,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	on, use CTRL-V<Tab>.  See also |:retab| and |ins-expandtab|.
 
 					*'exrc'* *'ex'* *'noexrc'* *'noex'*
-'exrc' 'ex'		boolean (default off)
+'exrc' 'ex'		boolean	(default off)
 			global
 	Automatically execute .nvim.lua, .nvimrc, and .exrc files in the
 	current directory, if the file is in the |trust| list. Use |:trust| to
@@ -2243,8 +2240,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-				*'fileencoding'* *'fenc'* *E213*
-'fileencoding' 'fenc'	string (default: "")
+					*'fileencoding'* *'fenc'* *E213*
+'fileencoding' 'fenc'	string	(default "")
 			local to buffer
 	File-content encoding for the current buffer. Conversion is done with
 	iconv() or as specified with 'charconvert'.
@@ -2285,7 +2282,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be changed when 'modifiable' is off.
 
 					*'fileencodings'* *'fencs'*
-'fileencodings' 'fencs'	string (default: "ucs-bom,utf-8,default,latin1")
+'fileencodings' 'fencs'	string	(default "ucs-bom,utf-8,default,latin1")
 			global
 	This is a list of character encodings considered when starting to edit
 	an existing file.  When a file is read, Vim tries to use the first
@@ -2334,9 +2331,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Setting this option does not have an effect until the next time a file
 	is read.
 
-					*'fileformat'* *'ff'*
-'fileformat' 'ff'	string (Windows default: "dos",
-				Unix default: "unix")
+						*'fileformat'* *'ff'*
+'fileformat' 'ff'	string	(default Windows: "dos", Unix: "unix")
 			local to buffer
 	This gives the <EOL> of the current buffer, which is used for
 	reading/writing the buffer from/to a file:
@@ -2354,10 +2350,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	option is set, because the file would be different when written.
 	This option cannot be changed when 'modifiable' is off.
 
-					*'fileformats'* *'ffs'*
-'fileformats' 'ffs'	string (default:
-				Win32: "dos,unix",
-				Unix: "unix,dos")
+						*'fileformats'* *'ffs'*
+'fileformats' 'ffs'	string	(default Windows: "dos,unix", Unix: "unix,dos")
 			global
 	This gives the end-of-line (<EOL>) formats that will be tried when
 	starting to edit a new buffer and when reading a file into an existing
@@ -2407,13 +2401,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 		*'fileignorecase'* *'fic'* *'nofileignorecase'* *'nofic'*
 'fileignorecase' 'fic'	boolean	(default on for systems where case in file
-				 names is normally ignored)
+                                 names is normally ignored)
 			global
 	When set case is ignored when using file names and directories.
 	See 'wildignorecase' for only ignoring case when doing completion.
 
-					*'filetype'* *'ft'*
-'filetype' 'ft'		string (default: "")
+						*'filetype'* *'ft'*
+'filetype' 'ft'		string	(default "")
 			local to buffer
 	When this option is set, the FileType autocommand event is triggered.
 	All autocommands that match with the value of this option will be
@@ -2516,25 +2510,25 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See |eol-and-eof| for example settings.
 
 						*'foldclose'* *'fcl'*
-'foldclose' 'fcl'	string (default "")
+'foldclose' 'fcl'	string	(default "")
 			global
 	When set to "all", a fold is closed when the cursor isn't in it and
 	its level is higher than 'foldlevel'.  Useful if you want folds to
 	automatically close when moving out of them.
 
 						*'foldcolumn'* *'fdc'*
-'foldcolumn' 'fdc'	string (default "0")
+'foldcolumn' 'fdc'	string	(default "0")
 			local to window
 	When and how to draw the foldcolumn. Valid values are:
 	    "auto":       resize to the minimum amount of folds to display.
 	    "auto:[1-9]": resize to accommodate multiple folds up to the
 			  selected level
-            0:            to disable foldcolumn
+	    0:            to disable foldcolumn
 	    "[1-9]":      to display a fixed number of columns
 	See |folding|.
 
 			*'foldenable'* *'fen'* *'nofoldenable'* *'nofen'*
-'foldenable' 'fen'	boolean (default on)
+'foldenable' 'fen'	boolean	(default on)
 			local to window
 	When off, all folds are open.  This option can be used to quickly
 	switch between showing all text unfolded and viewing the text with
@@ -2545,7 +2539,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See |folding|.
 
 						*'foldexpr'* *'fde'*
-'foldexpr' 'fde'	string (default: "0")
+'foldexpr' 'fde'	string	(default "0")
 			local to window
 	The expression used for when 'foldmethod' is "expr".  It is evaluated
 	for each line to obtain its fold level.  The context is set to the
@@ -2561,7 +2555,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	evaluating 'foldexpr' |textlock|.
 
 						*'foldignore'* *'fdi'*
-'foldignore' 'fdi'	string (default: "#")
+'foldignore' 'fdi'	string	(default "#")
 			local to window
 	Used only when 'foldmethod' is "indent".  Lines starting with
 	characters in 'foldignore' will get their fold level from surrounding
@@ -2569,7 +2563,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The default "#" works well for C programs.  See |fold-indent|.
 
 						*'foldlevel'* *'fdl'*
-'foldlevel' 'fdl'	number (default: 0)
+'foldlevel' 'fdl'	number	(default 0)
 			local to window
 	Sets the fold level: Folds with a higher level will be closed.
 	Setting this option to zero will close all folds.  Higher numbers will
@@ -2577,8 +2571,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option is set by commands like |zm|, |zM| and |zR|.
 	See |fold-foldlevel|.
 
-						*'foldlevelstart'* *'fdls'*
-'foldlevelstart' 'fdls'	number (default: -1)
+					*'foldlevelstart'* *'fdls'*
+'foldlevelstart' 'fdls'	number	(default -1)
 			global
 	Sets 'foldlevel' when starting to edit another buffer in a window.
 	Useful to always start editing with all folds closed (value zero),
@@ -2590,8 +2584,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	overrule the 'foldlevel' value for specific files.
 	When the value is negative, it is not used.
 
-						*'foldmarker'* *'fmr'* *E536*
-'foldmarker' 'fmr'	string (default: "{{{,}}}")
+					*'foldmarker'* *'fmr'* *E536*
+'foldmarker' 'fmr'	string	(default "{{{,}}}")
 			local to window
 	The start and end marker used when 'foldmethod' is "marker".  There
 	must be one comma, which separates the start and end marker.  The
@@ -2599,7 +2593,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See |fold-marker|.
 
 						*'foldmethod'* *'fdm'*
-'foldmethod' 'fdm'	string (default: "manual")
+'foldmethod' 'fdm'	string	(default "manual")
 			local to window
 	The kind of folding used for the current window.  Possible values:
 	|fold-manual|	manual	    Folds are created manually.
@@ -2610,7 +2604,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|fold-diff|	diff	    Fold text that is not changed.
 
 						*'foldminlines'* *'fml'*
-'foldminlines' 'fml'	number (default: 1)
+'foldminlines' 'fml'	number	(default 1)
 			local to window
 	Sets the number of screen lines above which a fold can be displayed
 	closed.  Also for manually closed folds.  With the default value of
@@ -2621,15 +2615,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	than 'foldminlines', a following "zc" may close a containing fold.
 
 						*'foldnestmax'* *'fdn'*
-'foldnestmax' 'fdn'	number (default: 20)
+'foldnestmax' 'fdn'	number	(default 20)
 			local to window
 	Sets the maximum nesting of folds for the "indent" and "syntax"
 	methods.  This avoids that too many folds will be created.  Using more
 	than 20 doesn't work, because the internal limit is 20.
 
 						*'foldopen'* *'fdo'*
-'foldopen' 'fdo'	string (default: "block,hor,mark,percent,quickfix,
-							     search,tag,undo")
+'foldopen' 'fdo'	string	(default "block,hor,mark,percent,quickfix,search,tag,undo")
 			global
 	Specifies for which type of commands folds will be opened, if the
 	command moves the cursor into a closed fold.  It is a comma-separated
@@ -2663,7 +2656,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set the 'foldclose' option to "all".
 
 						*'foldtext'* *'fdt'*
-'foldtext' 'fdt'	string (default: "foldtext()")
+'foldtext' 'fdt'	string	(default "foldtext()")
 			local to window
 	An expression which is used to specify the text displayed for a closed
 	fold.  The context is set to the script where 'foldexpr' was set,
@@ -2678,7 +2671,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	evaluating 'foldtext' |textlock|.
 
 						*'formatexpr'* *'fex'*
-'formatexpr' 'fex'	string (default "")
+'formatexpr' 'fex'	string	(default "")
 			local to buffer
 	Expression which is evaluated to format a range of lines for the |gq|
 	operator or automatic formatting (see 'formatoptions').  When this
@@ -2718,8 +2711,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set in a modeline when 'modelineexpr' is off.
 	NOTE: This option is set to "" when 'compatible' is set.
 
-					*'formatlistpat'* *'flp'*
-'formatlistpat' 'flp'	string (default: "^\s*\d\+[\]:.)}\t ]\s*")
+						*'formatlistpat'* *'flp'*
+'formatlistpat' 'flp'	string	(default "^\s*\d\+[\]:.)}\t ]\s*")
 			local to buffer
 	A pattern that is used to recognize a list header.  This is used for
 	the "n" flag in 'formatoptions'.
@@ -2731,8 +2724,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The default recognizes a number, followed by an optional punctuation
 	character and white space.
 
-					*'formatoptions'* *'fo'*
-'formatoptions' 'fo'	string (default: "tcqj")
+						*'formatoptions'* *'fo'*
+'formatoptions' 'fo'	string	(default "tcqj")
 			local to buffer
 	This is a sequence of letters which describes how automatic
 	formatting is to be done.  See |fo-table|.  Commas can be inserted for
@@ -2741,7 +2734,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"+=" and "-=" feature of ":set" |add-option-flags|.
 
 						*'formatprg'* *'fp'*
-'formatprg' 'fp'	string (default "")
+'formatprg' 'fp'	string	(default "")
 			global or local to buffer |global-local|
 	The name of an external program that will be used to format the lines
 	selected with the |gq| operator.  The program must take the input on
@@ -2773,7 +2766,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-				   *'gdefault'* *'gd'* *'nogdefault'* *'nogd'*
+				*'gdefault'* *'gd'* *'nogdefault'* *'nogd'*
 'gdefault' 'gd'		boolean	(default off)
 			global
 	When on, the ":substitute" flag 'g' is default on.  This means that
@@ -2799,7 +2792,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'grepprg'* *'gp'*
 'grepprg' 'gp'		string	(default "grep -n ",
-				 Unix: "grep -n $* /dev/null")
+                                 Unix: "grep -n $* /dev/null")
 			global or local to buffer |global-local|
 	Program to use for the |:grep| command.  This option may contain '%'
 	and '#' characters, which are expanded like when used in a command-
@@ -2817,7 +2810,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-			*'guicursor'* *'gcr'* *E545* *E546* *E548* *E549*
+				*'guicursor'* *'gcr'* *E545* *E546* *E548* *E549*
 'guicursor' 'gcr'	string	(default "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20")
 			global
 	Configures the cursor style for each mode. Works in the GUI and many
@@ -2903,8 +2896,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    :highlight Cursor gui=reverse guifg=NONE guibg=NONE
 	    :highlight Cursor gui=NONE guifg=bg guibg=fg
 <
-					*'guifont'* *'gfn'*
-						   *E235* *E596*
+
+					*'guifont'* *'gfn'* *E235* *E596*
 'guifont' 'gfn'		string	(default "")
 			global
 	This is a list of fonts which will be used for the GUI version of Vim.
@@ -2964,6 +2957,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    :set guifont=courier_new:h12:w5:b:cRUSSIAN
 	    :set guifont=Andale_Mono:h7.5:w4.5
 <
+
 				*'guifontwide'* *'gfw'* *E231* *E533* *E534*
 'guifontwide' 'gfw'	string	(default "")
 			global
@@ -3079,7 +3073,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		removing GUI components.
 
 						*'guitablabel'* *'gtl'*
-'guitablabel' 'gtl'	string	(default empty)
+'guitablabel' 'gtl'	string	(default "")
 			global
 	When non-empty describes the text to use in a label of the GUI tab
 	pages line.  When empty and when the result is empty Vim will use a
@@ -3096,7 +3090,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	used.
 
 						*'guitabtooltip'* *'gtt'*
-'guitabtooltip' 'gtt'	string	(default empty)
+'guitabtooltip' 'gtt'	string	(default "")
 			global
 	When non-empty describes the text to use in a tooltip for the GUI tab
 	pages line.  When empty Vim will use a default tooltip.
@@ -3107,7 +3101,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'helpfile'* *'hf'*
 'helpfile' 'hf'		string	(default (MS-Windows) "$VIMRUNTIME\doc\help.txt"
-					 (others) "$VIMRUNTIME/doc/help.txt")
+                                         (others) "$VIMRUNTIME/doc/help.txt")
+                             )
 			global
 	Name of the main help file.  All distributed help files should be
 	placed together in one directory.  Additionally, all "doc" directories
@@ -3129,7 +3124,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set to 'helpheight'.  Set to zero to disable.
 
 						*'helplang'* *'hlg'*
-'helplang' 'hlg'	string	(default: messages language or empty)
+'helplang' 'hlg'	string	(default messages language or empty)
 			global
 	Comma-separated list of languages.  Vim will use the first language
 	for which the desired help can be found.  The English help will always
@@ -3144,7 +3139,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	try to find the tag in the current language before using this option.
 	See |help-translated|.
 
-				     *'hidden'* *'hid'* *'nohidden'* *'nohid'*
+				*'hidden'* *'hid'* *'nohidden'* *'nohid'*
 'hidden' 'hid'		boolean	(default on)
 			global
 	When off a buffer is unloaded (including loss of undo information)
@@ -3163,14 +3158,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'hidden' is set for one command with ":hide {command}" |:hide|.
 
 						*'history'* *'hi'*
-'history' 'hi'		number	(default: 10000)
+'history' 'hi'		number	(default 10000)
 			global
 	A history of ":" commands, and a history of previous search patterns
 	is remembered.  This option decides how many entries may be stored in
 	each of these histories (see |cmdline-editing|).
 	The maximum value is 10000.
 
-				 *'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'*
+				*'hlsearch'* *'hls'* *'nohlsearch'* *'nohls'*
 'hlsearch' 'hls'	boolean	(default on)
 			global
 	When there is a previous search pattern, highlight all its matches.
@@ -3202,7 +3197,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Overridden by the 'iconstring' option.
 	Only works if the terminal supports setting window icons.
 
-						*'iconstring'*
+							*'iconstring'*
 'iconstring'		string	(default "")
 			global
 	When this option is not empty, it will be used for the icon text of
@@ -3222,8 +3217,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Can be overruled by using "\c" or "\C" in the pattern, see
 	|/ignorecase|.
 
-				*'imcmdline'* *'imc'* *'noimcmdline'* *'noimc'*
-'imcmdline' 'imc'	boolean (default off)
+			*'imcmdline'* *'imc'* *'noimcmdline'* *'noimc'*
+'imcmdline' 'imc'	boolean	(default off)
 			global
 	When set the Input Method is always on when starting to edit a command
 	line, unless entering a search pattern (see 'imsearch' for that).
@@ -3231,8 +3226,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	English characters directly, e.g., when it's used to type accented
 	characters with dead keys.
 
-				*'imdisable'* *'imd'* *'noimdisable'* *'noimd'*
-'imdisable' 'imd'	boolean (default off, on for some systems (SGI))
+			*'imdisable'* *'imd'* *'noimdisable'* *'noimd'*
+'imdisable' 'imd'	boolean	(default off, on for some systems (SGI))
 			global
 	When set the Input Method is never used.  This is useful to disable
 	the IM when it doesn't work properly.
@@ -3240,7 +3235,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	may change in later releases.
 
 						*'iminsert'* *'imi'*
-'iminsert' 'imi'	number (default 0)
+'iminsert' 'imi'	number	(default 0)
 			local to buffer
 	Specifies whether :lmap or an Input Method (IM) is to be used in
 	Insert mode.  Valid values:
@@ -3258,7 +3253,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	It is also used for the argument of commands like "r" and "f".
 
 						*'imsearch'* *'ims'*
-'imsearch' 'ims'	number (default -1)
+'imsearch' 'ims'	number	(default -1)
 			local to buffer
 	Specifies whether :lmap or an Input Method (IM) is to be used when
 	entering a search pattern.  Valid values:
@@ -3275,7 +3270,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'inccommand'* *'icm'*
 'inccommand' 'icm'	string	(default "nosplit")
 			global
-
 	When nonempty, shows the effects of |:substitute|, |:smagic|,
 	|:snomagic| and user commands with the |:command-preview| flag as you
 	type.
@@ -3334,7 +3328,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	It is not allowed to change text or jump to another window while
 	evaluating 'includeexpr' |textlock|.
 
-				 *'incsearch'* *'is'* *'noincsearch'* *'nois'*
+				*'incsearch'* *'is'* *'noincsearch'* *'nois'*
 'incsearch' 'is'	boolean	(default on)
 			global
 	While typing a search command, show where the pattern, as it was typed
@@ -3410,7 +3404,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	It is not allowed to change text or jump to another window while
 	evaluating 'indentexpr' |textlock|.
 
-
 						*'indentkeys'* *'indk'*
 'indentkeys' 'indk'	string	(default "0{,0},0),0],:,0#,!^F,o,O,e")
 			local to buffer
@@ -3433,8 +3426,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'isfname'* *'isf'*
 'isfname' 'isf'		string	(default for Windows:
-			     "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,="
-			    otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=")
+                             "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,="
+                            otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=")
+                             )
 			global
 	The characters specified by this option are included in file names and
 	path names.  Filenames are used for commands like "gf", "[i" and in
@@ -3484,8 +3478,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'isident'* *'isi'*
 'isident' 'isi'		string	(default for Windows:
-					   "@,48-57,_,128-167,224-235"
-				otherwise: "@,48-57,_,192-255")
+                                           "@,48-57,_,128-167,224-235"
+                                otherwise: "@,48-57,_,192-255")
+                             )
 			global
 	The characters given by this option are included in identifiers.
 	Identifiers are used in recognizing environment variables and after a
@@ -3498,7 +3493,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	change 'iskeyword' instead.
 
 						*'iskeyword'* *'isk'*
-'iskeyword' 'isk'	string (default: @,48-57,_,192-255)
+'iskeyword' 'isk'	string	(default "@,48-57,_,192-255")
 			local to buffer
 	Keywords are used in searching and recognizing with many commands:
 	"w", "*", "[i", etc.  It is also used for "\k" in a |pattern|.  See
@@ -3514,7 +3509,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	uses |:syn-iskeyword|.
 
 						*'isprint'* *'isp'*
-'isprint' 'isp'	string	(default: "@,161-255")
+'isprint' 'isp'		string	(default "@,161-255")
 			global
 	The characters given by this option are displayed directly on the
 	screen.  It is also used for "\p" in a |pattern|.  The characters from
@@ -3543,6 +3538,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Unprintable and zero-width Unicode characters are displayed as <xxxx>.
 	There is no option to specify these characters.
 
+			*'joinspaces'* *'js'* *'nojoinspaces'* *'nojs'*
+'joinspaces' 'js'	boolean	(default off)
+			global
+	Insert two spaces after a '.', '?' and '!' with a join command.
+	Otherwise only one space is inserted.
+
 						*'jumpoptions'* *'jop'*
 'jumpoptions' 'jop'	string	(default "")
 			global
@@ -3558,13 +3559,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			|alternate-file| or using |mark-motions| try to
 			restore the |mark-view| in which the action occurred.
 
-			*'joinspaces'* *'js'* *'nojoinspaces'* *'nojs'*
-'joinspaces' 'js'	boolean	(default off)
-			global
-	Insert two spaces after a '.', '?' and '!' with a join command.
-	Otherwise only one space is inserted.
-
-					*'keymap'* *'kmp'* *E544*
+						*'keymap'* *'kmp'*
 'keymap' 'kmp'		string	(default "")
 			local to buffer
 	Name of a keyboard mapping.  See |mbyte-keymap|.
@@ -3573,7 +3568,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'imsearch' is also set to one, unless it was -1
 	Only normal file name characters can be used, `/\*?[|<>` are illegal.
 
-					*'keymodel'* *'km'*
+						*'keymodel'* *'km'*
 'keymodel' 'km'		string	(default "")
 			global
 	List of comma-separated words, which enable special things that keys
@@ -3585,7 +3580,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Special keys in this context are the cursor keys, <End>, <Home>,
 	<PageUp> and <PageDown>.
 
-					*'keywordprg'* *'kp'*
+						*'keywordprg'* *'kp'*
 'keywordprg' 'kp'	string	(default ":Man", Windows: ":help")
 			global or local to buffer |global-local|
 	Program to use for the |K| command.  Environment variables are
@@ -3646,7 +3641,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	allowing to switch between mappings for different languages/encodings.
 	Use a mapping to avoid having to type it each time!
 
-					*'langmenu'* *'lm'*
+						*'langmenu'* *'lm'*
 'langmenu' 'lm'		string	(default "")
 			global
 	Language to use for menu translation.  Tells which file is loaded
@@ -3669,13 +3664,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Warning: This deletes all menus that you defined yourself!
 
 			*'langremap'* *'lrm'* *'nolangremap'* *'nolrm'*
-'langremap' 'lrm'	boolean (default off)
+'langremap' 'lrm'	boolean	(default off)
 			global
 	When off, setting 'langmap' does not apply to characters resulting from
 	a mapping.  If setting 'langmap' disables some of your mappings, make
 	sure this option is off.
 
-					*'laststatus'* *'ls'*
+						*'laststatus'* *'ls'*
 'laststatus' 'ls'	number	(default 2)
 			global
 	The value of this option influences when the last window will have a
@@ -3711,7 +3706,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note that <Tab> characters after an <EOL> are mostly not displayed
 	with the right amount of white space.
 
-						*'lines'* *E593*
+							*'lines'* *E593*
 'lines'			number	(default 24 or terminal height)
 			global
 	Number of lines of the Vim window.
@@ -3777,14 +3772,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The cursor is displayed at the start of the space a Tab character
 	occupies, not at the end as usual in Normal mode.  To get this cursor
 	position while displaying Tabs with spaces, use: >
-		:set list lcs=tab:\ \ 
+		:set list lcs=tab:\ \
 <
 	Note that list mode will also affect formatting (set with 'textwidth'
 	or 'wrapmargin') when 'cpoptions' includes 'L'.  See 'listchars' for
 	changing the way tabs are displayed.
 
 						*'listchars'* *'lcs'*
-'listchars' 'lcs'	string	(default: "tab:> ,trail:-,nbsp:+")
+'listchars' 'lcs'	string	(default "tab:> ,trail:-,nbsp:+")
 			global or local to window |global-local|
 	Strings to use in 'list' mode and for the |:list| command.  It is a
 	comma-separated list of string settings.
@@ -3883,7 +3878,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"precedes". |hl-Whitespace| for "nbsp", "space", "tab", "multispace",
 	"lead" and "trail".
 
-			*'lpl'* *'nolpl'* *'loadplugins'* *'noloadplugins'*
+			*'loadplugins'* *'lpl'* *'noloadplugins'* *'nolpl'*
 'loadplugins' 'lpl'	boolean	(default on)
 			global
 	When on the plugin scripts are loaded when starting up |load-plugins|.
@@ -3904,7 +3899,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	when you want to |/\M|.
 
 						*'makeef'* *'mef'*
-'makeef' 'mef'		string	(default: "")
+'makeef' 'mef'		string	(default "")
 			global
 	Name of the errorfile for the |:make| command (see |:make_makeprg|)
 	and the |:grep| command.
@@ -3918,7 +3913,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-					*'makeencoding'* *'menc'*
+						*'makeencoding'* *'menc'*
 'makeencoding' 'menc'	string	(default "")
 			global or local to buffer |global-local|
 	Encoding used for reading the output of external commands.  When empty,
@@ -3932,6 +3927,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	setting to the system locale encoding.  Example: >
 		:set makeencoding=char	" system locale is used
 <
+
 						*'makeprg'* *'mp'*
 'makeprg' 'mp'		string	(default "make")
 			global or local to buffer |global-local|
@@ -3988,7 +3984,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	command recursion, see |E169|.
 	See also |:function|.
 
-						*'maxmapdepth'* *'mmd'* *E223*
+					*'maxmapdepth'* *'mmd'* *E223*
 'maxmapdepth' 'mmd'	number	(default 1000)
 			global
 	Maximum number of times a mapping is done without resulting in a
@@ -4058,15 +4054,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	This option cannot be set from a |modeline| or in the |sandbox|.
 
-				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
-'modeline' 'ml'		boolean	(default: on (off for root))
+				*'modeline'* *'ml'* *'nomodeline'* *'noml'*
+'modeline' 'ml'		boolean	(default on (off for root))
 			local to buffer
 	If 'modeline' is on 'modelines' gives the number of lines that is
 	checked for set commands.  If 'modeline' is off or 'modelines' is zero
 	no lines are checked.  See |modeline|.
 
-			   *'modelineexpr'* *'mle'* *'nomodelineexpr'* *'nomle'*
-'modelineexpr' 'mle'	boolean (default: off)
+			*'modelineexpr'* *'mle'* *'nomodelineexpr'* *'nomle'*
+'modelineexpr' 'mle'	boolean	(default off)
 			global
 	When on allow some options that are an expression to be set in the
 	modeline.  Check the option for whether it is affected by
@@ -4081,8 +4077,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	checked for set commands.  If 'modeline' is off or 'modelines' is zero
 	no lines are checked.  See |modeline|.
 
-				*'modifiable'* *'ma'* *'nomodifiable'* *'noma'*
-				*E21*
+
+			*'modifiable'* *'ma'* *'nomodifiable'* *'noma'* *E21*
 'modifiable' 'ma'	boolean	(default on)
 			local to buffer
 	When off the buffer contents cannot be changed.  The 'fileformat' and
@@ -4115,16 +4111,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 	when using "rA" on an "A".
 
 						*'more'* *'nomore'*
-'more'			boolean	(default: on)
+'more'			boolean	(default on)
 			global
 	When on, listings pause when the whole screen is filled.  You will get
 	the |more-prompt|.  When this option is off there are no pauses, the
 	listing continues until finished.
 
-						*'mouse'*
+							*'mouse'*
 'mouse'			string	(default "nvi")
 			global
-
 	Enables mouse support. For example, to enable the mouse in Normal mode
 	and Visual mode: >
 		:set mouse=nv
@@ -4162,7 +4157,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'mousehide'	hide mouse pointer while typing text
 	'selectmode'	whether to start Select mode or Visual mode
 
-			*'mousefocus'* *'mousef'* *'nomousefocus'* *'nomousef'*
+		*'mousefocus'* *'mousef'* *'nomousefocus'* *'nomousef'*
 'mousefocus' 'mousef'	boolean	(default off)
 			global
 	The window that the mouse pointer is on is automatically activated.
@@ -4171,7 +4166,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	default because it makes using the pull down menus a little goofy, as
 	a pointer transit may activate a window unintentionally.
 
-			*'mousehide'* *'mh'* *'nomousehide'* *'nomh'*
+				*'mousehide'* *'mh'* *'nomousehide'* *'nomh'*
 'mousehide' 'mh'	boolean	(default on)
 			global
 			only in the GUI
@@ -4229,8 +4224,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    "g<LeftMouse>"  is "<C-LeftMouse>	(jump to tag under mouse click)
 	    "g<RightMouse>" is "<C-RightMouse>	("CTRL-T")
 
-	      *'mousemoveevent'* *'mousemev'* *'nomousemoveevent'* *'nomousemev'*
-'mousemoveevent' 'mousemev'  boolean	(default off)
+	*'mousemoveevent'* *'mousemev'* *'nomousemoveevent'* *'nomousemev'*
+'mousemoveevent' 'mousemev'	boolean	(default off)
 			global
 	When on, mouse move events are delivered to the input queue and are
 	available for mapping. The default, off, avoids the mouse movement
@@ -4260,7 +4255,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 					*'mouseshape'* *'mouses'* *E547*
 'mouseshape' 'mouses'	string	(default "i:beam,r:beam,s:updown,sd:cross,
-					m:no,ml:up-arrow,v:rightup-arrow")
+                                        m:no,ml:up-arrow,v:rightup-arrow")
 			global
 	This option tells Vim what the mouse pointer should look like in
 	different modes.  The option is a comma-separated list of parts, much
@@ -4327,7 +4322,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Defines the maximum time in msec between two mouse clicks for the
 	second click to be recognized as a multi click.
 
-							*'nrformats'* *'nf'*
+						*'nrformats'* *'nf'*
 'nrformats' 'nf'	string	(default "bin,hex")
 			local to buffer
 	This defines what bases Vim will consider for numbers when using the
@@ -4375,14 +4370,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 		'nonu'          'nu'            'nonu'          'nu'
 		'nornu'         'nornu'         'rnu'           'rnu'
->
+	>
 	    |apple          |  1 apple      |  2 apple      |  2 apple
 	    |pear           |  2 pear       |  1 pear       |  1 pear
 	    |nobody         |  3 nobody     |  0 nobody     |3   nobody
 	    |there          |  4 there      |  1 there      |  1 there
 <
+
 						*'numberwidth'* *'nuw'*
-'numberwidth' 'nuw'	number	(default: 4)
+'numberwidth' 'nuw'	number	(default 4)
 			local to window
 	Minimal number of columns to use for the line number.  Only relevant
 	when the 'number' or 'relativenumber' option is set or printing lines
@@ -4396,7 +4392,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The minimum value is 1, the maximum value is 20.
 
 						*'omnifunc'* *'ofu'*
-'omnifunc' 'ofu'	string	(default: empty)
+'omnifunc' 'ofu'	string	(default "")
 			local to buffer
 	This option specifies a function to be used for Insert mode omni
 	completion with CTRL-X CTRL-O. |i_CTRL-X_CTRL-O|
@@ -4409,8 +4405,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-
-			    *'opendevice'* *'odev'* *'noopendevice'* *'noodev'*
+			*'opendevice'* *'odev'* *'noopendevice'* *'noodev'*
 'opendevice' 'odev'	boolean	(default off)
 			global
 			only for Windows
@@ -4420,9 +4415,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note that on Windows editing "aux.h", "lpt1.txt" and the like also
 	result in editing a device.
 
-
-						*'operatorfunc'* *'opfunc'*
-'operatorfunc' 'opfunc'	string	(default: empty)
+					*'operatorfunc'* *'opfunc'*
+'operatorfunc' 'opfunc'	string	(default "")
 			global
 	This option specifies a function to be called by the |g@| operator.
 	See |:map-operator| for more info and an example.  The value can be
@@ -4432,19 +4426,19 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-				*'packpath'* *'pp'*
-'packpath' 'pp'		string	(default: see 'runtimepath')
+						*'packpath'* *'pp'*
+'packpath' 'pp'		string	(default see 'runtimepath')
+			global
 	Directories used to find packages.
 	See |packages| and |packages-runtimepath|.
 
-
 						*'paragraphs'* *'para'*
 'paragraphs' 'para'	string	(default "IPLPPPQPP TPHPLIPpLpItpplpipbp")
 			global
 	Specifies the nroff macros that separate paragraphs.  These are pairs
 	of two letters (see |object-motions|).
 
-						*'pex'* *'patchexpr'*
+						*'patchexpr'* *'pex'*
 'patchexpr' 'pex'	string	(default "")
 			global
 	Expression which is evaluated to apply a patch to a file and generate
@@ -4471,7 +4465,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Only normal file name characters can be used, `/\*?[|<>` are illegal.
 
 				*'path'* *'pa'* *E343* *E345* *E347* *E854*
-'path' 'pa'		string	(default: ".,,")
+'path' 'pa'		string	(default ".,,")
 			global or local to buffer |global-local|
 	This is a list of directories which will be searched when using the
 	|gf|, [f, ]f, ^Wf, |:find|, |:sfind|, |:tabfind| and other commands,
@@ -4517,7 +4511,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Replace the ';' with a ':' or whatever separator is used.  Note that
 	this doesn't work when $INCL contains a comma or white space.
 
-			*'preserveindent'* *'pi'* *'nopreserveindent'* *'nopi'*
+		*'preserveindent'* *'pi'* *'nopreserveindent'* *'nopi'*
 'preserveindent' 'pi'	boolean	(default off)
 			local to buffer
 	When changing the indent of the current line, preserve as much of the
@@ -4533,15 +4527,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Also see 'copyindent'.
 	Use |:retab| to clean up white space.
 
-					*'previewheight'* *'pvh'*
-'previewheight' 'pvh'	number (default 12)
+						*'previewheight'* *'pvh'*
+'previewheight' 'pvh'	number	(default 12)
 			global
 	Default height for a preview window.  Used for |:ptag| and associated
 	commands.  Used for |CTRL-W_}| when no count is given.
 
-					*'previewwindow'* *'nopreviewwindow'*
-					*'pvw'* *'nopvw'* *E590*
-'previewwindow' 'pvw'	boolean (default off)
+		*'previewwindow'* *'pvw'* *'nopreviewwindow'* *'nopvw'* *E590*
+'previewwindow' 'pvw'	boolean	(default off)
 			local to window
 	Identifies the preview window.  Only one window can have this option
 	set.  It's normally not set directly, but by using one of the commands
@@ -4586,8 +4579,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-						*'quickfixtextfunc'* *'qftf'*
-'quickfixtextfunc' 'qftf'	string (default "")
+					*'quickfixtextfunc'* *'qftf'*
+'quickfixtextfunc' 'qftf'	string	(default "")
 			global
 	This option specifies a function to be used to get the text to display
 	in the quickfix and location list windows.  This can be used to
@@ -4610,7 +4603,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	the following character will be skipped.  The default value makes the
 	text "foo\"bar\\" considered to be one string.
 
-				   *'readonly'* *'ro'* *'noreadonly'* *'noro'*
+				*'readonly'* *'ro'* *'noreadonly'* *'noro'*
 'readonly' 'ro'		boolean	(default off)
 			local to buffer
 	If on, writes fail unless you use a '!'.  Protects you from
@@ -4623,7 +4616,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See 'modifiable' for disallowing changes to the buffer.
 
 						*'redrawdebug'* *'rdb'*
-'redrawdebug' 'rdb'	string	(default '')
+'redrawdebug' 'rdb'	string	(default "")
 			global
 	Flags to change the way redrawing works, for debugging purposes.
 	Most useful with 'writedelay' set to some reasonable value.
@@ -4706,7 +4699,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'number', see |number_relativenumber| for all combinations of the two
 	options.
 
-						*'report'*
+							*'report'*
 'report'		number	(default 2)
 			global
 	Threshold for reporting number of lines changed.  When the number of
@@ -4722,7 +4715,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	backwards" |ins-reverse|.  This option can be toggled with the CTRL-_
 	command in Insert mode, when 'allowrevins' is set.
 
-				 *'rightleft'* *'rl'* *'norightleft'* *'norl'*
+				*'rightleft'* *'rl'* *'norightleft'* *'norl'*
 'rightleft' 'rl'	boolean	(default off)
 			local to window
 	When on, display orientation becomes right-to-left, i.e., characters
@@ -4735,7 +4728,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	and left-to-right strings so that both sets are displayed properly
 	in different windows).  Also see |rileft.txt|.
 
-			*'rightleftcmd'* *'rlc'*
+						*'rightleftcmd'* *'rlc'*
 'rightleftcmd' 'rlc'	string	(default "search")
 			local to window
 	Each word in this option enables the command line editing to work in
@@ -4746,7 +4739,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This is useful for languages such as Hebrew, Arabic and Farsi.
 	The 'rightleft' option must be set for 'rightleftcmd' to take effect.
 
-					 *'ruler'* *'ru'* *'noruler'* *'noru'*
+					*'ruler'* *'ru'* *'noruler'* *'noru'*
 'ruler' 'ru'		boolean	(default on)
 			global
 	Show the line and column number of the cursor position, separated by a
@@ -4773,7 +4766,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	you are, use "g CTRL-G" |g_CTRL-G|.
 
 						*'rulerformat'* *'ruf'*
-'rulerformat' 'ruf'	string	(default empty)
+'rulerformat' 'ruf'	string	(default "")
 			global
 	When this option is not empty, it determines the content of the ruler
 	string, as displayed for the 'ruler' option.
@@ -4785,24 +4778,25 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Example: >
 		:set rulerformat=%15(%c%V\ %p%%%)
 <
-				*'runtimepath'* *'rtp'* *vimfiles*
-'runtimepath' 'rtp'	string	(default:     "$XDG_CONFIG_HOME/nvim,
-					       $XDG_CONFIG_DIRS[1]/nvim,
-					       $XDG_CONFIG_DIRS[2]/nvim,
-					       …
-					       $XDG_DATA_HOME/nvim[-data]/site,
-					       $XDG_DATA_DIRS[1]/nvim/site,
-					       $XDG_DATA_DIRS[2]/nvim/site,
-					       …
-					       $VIMRUNTIME,
-					       …
-					       $XDG_DATA_DIRS[2]/nvim/site/after,
-					       $XDG_DATA_DIRS[1]/nvim/site/after,
-					       $XDG_DATA_HOME/nvim[-data]/site/after,
-					       …
-					       $XDG_CONFIG_DIRS[2]/nvim/after,
-					       $XDG_CONFIG_DIRS[1]/nvim/after,
-					       $XDG_CONFIG_HOME/nvim/after")
+
+					*'runtimepath'* *'rtp'* *vimfiles*
+'runtimepath' 'rtp'	string	(default "$XDG_CONFIG_HOME/nvim,
+                                               $XDG_CONFIG_DIRS[1]/nvim,
+                                               $XDG_CONFIG_DIRS[2]/nvim,
+                                               …
+                                               $XDG_DATA_HOME/nvim[-data]/site,
+                                               $XDG_DATA_DIRS[1]/nvim/site,
+                                               $XDG_DATA_DIRS[2]/nvim/site,
+                                               …
+                                               $VIMRUNTIME,
+                                               …
+                                               $XDG_DATA_DIRS[2]/nvim/site/after,
+                                               $XDG_DATA_DIRS[1]/nvim/site/after,
+                                               $XDG_DATA_HOME/nvim[-data]/site/after,
+                                               …
+                                               $XDG_CONFIG_DIRS[2]/nvim/after,
+                                               $XDG_CONFIG_DIRS[1]/nvim/after,
+                                               $XDG_CONFIG_HOME/nvim/after")
 			global
 	List of directories to be searched for these runtime files:
 	  filetype.lua	filetypes |new-filetype|
@@ -4872,7 +4866,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	With |--clean| the home directory entries are not included.
 
 						*'scroll'* *'scr'*
-'scroll' 'scr'		number	(default: half the window height)
+'scroll' 'scr'		number	(default half the window height)
 			local to window
 	Number of lines to scroll with CTRL-U and CTRL-D commands.  Will be
 	set to half the number of lines in the window when the window size
@@ -4883,7 +4877,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	height with ":set scroll=0".
 
 						*'scrollback'* *'scbk'*
-'scrollback' 'scbk'	number	(default: 10000)
+'scrollback' 'scbk'	number	(default 10000)
 			local to buffer
 	Maximum number of lines kept beyond the visible screen. Lines at the
 	top are deleted if new lines exceed this limit.
@@ -4894,7 +4888,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	reflown when the terminal buffer is resized horizontally.
 
 			*'scrollbind'* *'scb'* *'noscrollbind'* *'noscb'*
-'scrollbind' 'scb'	boolean  (default off)
+'scrollbind' 'scb'	boolean	(default off)
 			local to window
 	See also |scroll-binding|.  When this option is set, the current
 	window scrolls as other scrollbind windows (windows that also have
@@ -5000,9 +4994,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   cmd		when using "v", "V" or CTRL-V
 	See |Select-mode|.
 
-						*'sessionoptions'* *'ssop'*
-'sessionoptions' 'ssop'	string	(default: "blank,buffers,curdir,folds,
-					       help,tabpages,winsize,terminal")
+					*'sessionoptions'* *'ssop'*
+'sessionoptions' 'ssop'	string	(default "blank,buffers,curdir,folds,help,tabpages,winsize,terminal")
 			global
 	Changes the effect of the |:mksession| command.  It is a comma-
 	separated list of words.  Each word enables saving and restoring
@@ -5041,10 +5034,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	filenames are stored as absolute paths.
 	If you leave out "options" many things won't work well after restoring
 	the session.
-				*'shada'* *'sd'* *E526* *E527* *E528*
+
+					*'shada'* *'sd'* *E526* *E527* *E528*
 'shada' 'sd'		string	(default for
-				   Win32:  !,'100,<50,s10,h,rA:,rB:
-				   others: !,'100,<50,s10,h)
+                                   Win32:  !,'100,<50,s10,h,rA:,rB:
+                                   others: !,'100,<50,s10,h)
 			global
 	When non-empty, the shada file is read upon startup and written
 	when exiting Vim (see |shada-file|).  The string should be a comma-
@@ -5157,8 +5151,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-				*'shadafile'* *'sdf'*
-'shadafile' 'sdf'	string	(default: "")
+						*'shadafile'* *'sdf'*
+'shadafile' 'sdf'	string	(default "")
 			global
 	When non-empty, overrides the file name used for |shada| (viminfo).
 	When equal to "NONE" no shada file will be read or written.
@@ -5217,7 +5211,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 						*'shellcmdflag'* *'shcf'*
-'shellcmdflag' 'shcf'	string	(default: "-c"; Windows: "/s /c")
+'shellcmdflag' 'shcf'	string	(default "-c"; Windows: "/s /c")
 			global
 	Flag passed to the shell to execute "!" and ":!" commands; e.g.,
 	`bash.exe -c ls` or `cmd.exe /s /c "dir"`.  For MS-Windows, the
@@ -5264,8 +5258,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 						*'shellquote'* *'shq'*
-'shellquote' 'shq'	string	(default: ""; Windows, when 'shell'
-					contains "sh" somewhere: "\"")
+'shellquote' 'shq'	string	(default ""; Windows, when 'shell'
+                                        contains "sh" somewhere: "\"")
 			global
 	Quoting character(s), put around the command passed to the shell, for
 	the "!" and ":!" commands.  The redirection is kept outside of the
@@ -5335,14 +5329,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|system()| does not respect this option, it always uses pipes.
 
 						*'shellxescape'* *'sxe'*
-'shellxescape' 'sxe'	string	(default: "")
+'shellxescape' 'sxe'	string	(default "")
 			global
 	When 'shellxquote' is set to "(" then the characters listed in this
 	option will be escaped with a '^' character.  This makes it possible
 	to execute most external commands with cmd.exe.
 
 						*'shellxquote'* *'sxq'*
-'shellxquote' 'sxq'	string	(default: "", Windows: "\"")
+'shellxquote' 'sxq'	string	(default "", Windows: "\"")
 			global
 	Quoting character(s), put around the command passed to the shell, for
 	the "!" and ":!" commands.  Includes the redirection.  See
@@ -5369,9 +5363,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When zero the 'tabstop' value will be used.  Use the |shiftwidth()|
 	function to get the effective shiftwidth value.
 
-						*'shortmess'* *'shm'*
+					*'shortmess'* *'shm'* *E1336*
 'shortmess' 'shm'	string	(default "filnxtToOCF")
-			global					*E1336*
+			global
 	This option helps to avoid all the |hit-enter| prompts caused by file
 	messages, for example  with CTRL-G, and to avoid some other messages.
 	It is a list of flags:
@@ -5429,14 +5423,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    shm=a	Abbreviation, but no loss of information.
 	    shm=at	Abbreviation, and truncate message when necessary.
 
-						*'showbreak'* *'sbr'* *E595*
+					*'showbreak'* *'sbr'* *E595*
 'showbreak' 'sbr'	string	(default "")
 			global or local to window |global-local|
 	String to put at the start of lines that have been wrapped.  Useful
 	values are "> " or "+++ ": >
-		:set showbreak=>\ 
-<	Note the backslash to escape the trailing space.  It's easier like
-	this: >
+		:let &showbreak = "> "
 		:let &showbreak = '+++ '
 <	Only printable single-cell characters are allowed, excluding <Tab> and
 	comma (in a future version the comma might be used to separate the
@@ -5449,8 +5441,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set and you want no value in the current window use NONE: >
 		:setlocal showbreak=NONE
 <
-				     *'showcmd'* *'sc'* *'noshowcmd'* *'nosc'*
-'showcmd' 'sc'		boolean	(default: on)
+
+				*'showcmd'* *'sc'* *'noshowcmd'* *'nosc'*
+'showcmd' 'sc'		boolean	(default on)
 			global
 	Show (partial) command in the last line of the screen.  Set this
 	option off if your terminal is slow.
@@ -5464,7 +5457,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This information can be displayed in an alternative location using the
 	'showcmdloc' option, useful when 'cmdheight' is 0.
 
-			*'showcmdloc'* *'sloc'*
+						*'showcmdloc'* *'sloc'*
 'showcmdloc' 'sloc'	string	(default "last")
 			global
 	This option can be used to display the (partially) entered command in
@@ -5480,7 +5473,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	displayed in a convenient location.
 
 			*'showfulltag'* *'sft'* *'noshowfulltag'* *'nosft'*
-'showfulltag' 'sft'	boolean (default off)
+'showfulltag' 'sft'	boolean	(default off)
 			global
 	When completing a word in insert mode (see |ins-completion|) from the
 	tags file, show both the tag name and a tidied-up form of the search
@@ -5491,7 +5484,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'completeopt', because the completion from the search pattern may not
 	match the typed text.
 
-				 *'showmatch'* *'sm'* *'noshowmatch'* *'nosm'*
+				*'showmatch'* *'sm'* *'noshowmatch'* *'nosm'*
 'showmatch' 'sm'	boolean	(default off)
 			global
 	When a bracket is inserted, briefly jump to the matching one.  The
@@ -5510,8 +5503,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	around |pi_paren.txt|.
 	Note: Use of the short form is rated PG.
 
-				 *'showmode'* *'smd'* *'noshowmode'* *'nosmd'*
-'showmode' 'smd'	boolean	(default: on)
+				*'showmode'* *'smd'* *'noshowmode'* *'nosmd'*
+'showmode' 'smd'	boolean	(default on)
 			global
 	If in Insert, Replace or Visual mode put a message on the last line.
 	The |hl-ModeMsg| highlight group determines the highlighting.
@@ -5538,8 +5531,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When using a slow terminal set it to a large number or 0.  Not used
 	for "zh" and "zl" commands.
 
-						*'sidescrolloff'* *'siso'*
-'sidescrolloff' 'siso'	number (default 0)
+					*'sidescrolloff'* *'siso'*
+'sidescrolloff' 'siso'	number	(default 0)
 			global or local to window |global-local|
 	The minimal number of screen columns to keep to the left and to the
 	right of the cursor if 'nowrap' is set.  Setting this option to a
@@ -5561,6 +5554,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		 :set nowrap sidescroll=1 listchars=extends:>,precedes:<
 		 :set sidescrolloff=1
 <
+
 						*'signcolumn'* *'scl'*
 'signcolumn' 'scl'	string	(default "auto")
 			local to window
@@ -5587,7 +5581,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This is done in order for the signcolumn appearance not appear weird
 	during line deletion.
 
-
 			*'smartcase'* *'scs'* *'nosmartcase'* *'noscs'*
 'smartcase' 'scs'	boolean	(default off)
 			global
@@ -5598,7 +5591,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"*" and "#" you can make 'smartcase' used by doing a "/" command,
 	recalling the search pattern from history and hitting <Enter>.
 
-			     *'smartindent'* *'si'* *'nosmartindent'* *'nosi'*
+			*'smartindent'* *'si'* *'nosmartindent'* *'nosi'*
 'smartindent' 'si'	boolean	(default off)
 			local to buffer
 	Do smart autoindenting when starting a new line.  Works for C-like
@@ -5621,7 +5614,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When using the ">>" command, lines starting with '#' are not shifted
 	right.
 
-				 *'smarttab'* *'sta'* *'nosmarttab'* *'nosta'*
+				*'smarttab'* *'sta'* *'nosmarttab'* *'nosta'*
 'smarttab' 'sta'	boolean	(default on)
 			global
 	When on, a <Tab> in front of a line inserts blanks according to
@@ -5636,7 +5629,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	number of spaces is minimized by using <Tab>s.
 
 			*'smoothscroll'* *'sms'* *'nosmoothscroll'* *'nosms'*
-'smoothscroll' 'sms'	boolean  (default off)
+'smoothscroll' 'sms'	boolean	(default off)
 			local to window
 	Scrolling works with screen lines.  When 'wrap' is set and the first
 	line in the window wraps part of it may not be visible, as if it is
@@ -5647,7 +5640,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y
 	and scrolling with the mouse.
 
-					*'softtabstop'* *'sts'*
+						*'softtabstop'* *'sts'*
 'softtabstop' 'sts'	number	(default 0)
 			local to buffer
 	Number of spaces that a <Tab> counts for while performing editing
@@ -5673,7 +5666,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The languages are specified with 'spelllang'.
 
 						*'spellcapcheck'* *'spc'*
-'spellcapcheck' 'spc'	string	(default "[.?!]\_[\])'" \t]\+")
+'spellcapcheck' 'spc'	string	(default "[.?!]\_[\])'"\t ]\+")
 			local to buffer
 	Pattern to locate the end of a sentence.  The following word will be
 	checked to start with a capital letter.  If not then it is highlighted
@@ -5686,7 +5679,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|set-spc-auto|.
 
 						*'spellfile'* *'spf'*
-'spellfile' 'spf'	string	(default empty)
+'spellfile' 'spf'	string	(default "")
 			local to buffer
 	Name of the word list file where words are added for the |zg| and |zw|
 	commands.  It must end in ".{encoding}.add".  You need to include the
@@ -5830,14 +5823,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-
 			*'splitbelow'* *'sb'* *'nosplitbelow'* *'nosb'*
 'splitbelow' 'sb'	boolean	(default off)
 			global
 	When on, splitting a window will put the new window below the current
 	one. |:split|
 
-			*'splitkeep'* *'spk'*
+						*'splitkeep'* *'spk'*
 'splitkeep' 'spk'	string	(default "cursor")
 			global
 	The value of this option determines the scroll behavior when opening,
@@ -5859,7 +5851,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When on, splitting a window will put the new window right of the
 	current one. |:vsplit|
 
-			   *'startofline'* *'sol'* *'nostartofline'* *'nosol'*
+			*'startofline'* *'sol'* *'nostartofline'* *'nosol'*
 'startofline' 'sol'	boolean	(default off)
 			global
 	When "on" the commands listed below move the cursor to the first
@@ -5873,8 +5865,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	In case of buffer changing commands the cursor is placed at the column
 	where it was the last time the buffer was edited.
 
-				*'statuscolumn'* *'stc'*
-'statuscolumn' 'stc'	string	(default: empty)
+						*'statuscolumn'* *'stc'*
+'statuscolumn' 'stc'	string	(default "")
 			local to window
 	EXPERIMENTAL
 	When non-empty, this option determines the content of the area to the
@@ -5927,8 +5919,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	WARNING: this expression is evaluated for each screen line so defining
 	an expensive expression can negatively affect render performance.
 
-			   *'statusline'* *'stl'* *E540* *E542*
-'statusline' 'stl'	string	(default empty)
+					*'statusline'* *'stl'* *E540* *E542*
+'statusline' 'stl'	string	(default "")
 			global or local to window |global-local|
 	When non-empty, this option determines the content of the status line.
 	Also see |status-line|.
@@ -6139,6 +6131,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  :    if exists(a:var) | return a:val | else | return '' | endif
 	  :endfunction
 <
+
 						*'suffixes'* *'su'*
 'suffixes' 'su'		string	(default ".bak,~,.o,.h,.info,.swp,.obj")
 			global
@@ -6160,8 +6153,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	file for the "gf", "[I", etc. commands.  Example: >
 		:set suffixesadd=.java
 <
+
 				*'swapfile'* *'swf'* *'noswapfile'* *'noswf'*
-'swapfile' 'swf'	boolean (default on)
+'swapfile' 'swf'	boolean	(default on)
 			local to buffer
 	Use a swapfile for the buffer.  This option can be reset when a
 	swapfile is not wanted for a specific buffer.  For example, with
@@ -6222,7 +6216,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Set to zero to remove the limit.
 
 						*'syntax'* *'syn'*
-'syntax' 'syn'		string	(default empty)
+'syntax' 'syn'		string	(default "")
 			local to buffer
 	When this option is set, the syntax with this name is loaded, unless
 	syntax highlighting has been switched off with ":syntax off".
@@ -6249,7 +6243,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Only normal file name characters can be used, `/\*?[|<>` are illegal.
 
 						*'tabline'* *'tal'*
-'tabline' 'tal'		string	(default empty)
+'tabline' 'tal'		string	(default "")
 			global
 	When non-empty, this option determines the content of the tab pages
 	line at the top of the Vim window.  When empty Vim will use a default
@@ -6272,14 +6266,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Keep in mind that only one of the tab pages is the current one, others
 	are invisible and you can't jump to their windows.
 
-
 						*'tabpagemax'* *'tpm'*
 'tabpagemax' 'tpm'	number	(default 50)
 			global
 	Maximum number of tab pages to be opened by the |-p| command line
 	argument or the ":tab all" command. |tabpage|
 
-
 						*'tabstop'* *'ts'*
 'tabstop' 'ts'		number	(default 8)
 			local to buffer
@@ -6341,7 +6333,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	Linear searching is done anyway, for one file, when Vim finds a line
 	at the start of the file indicating that it's not sorted: >
-   !_TAG_FILE_SORTED	0	/some comment/
+	   !_TAG_FILE_SORTED	0	/some comment/
 <	[The whitespace before and after the '0' must be a single <Tab>]
 
 	When a binary search was done and no match was found in any of the
@@ -6375,7 +6367,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option doesn't affect commands that find all matching tags (e.g.,
 	command-line completion and ":help").
 
-							*'tagcase'* *'tc'*
+						*'tagcase'* *'tc'*
 'tagcase' 'tc'		string	(default "followic")
 			global or local to buffer |global-local|
 	This option specifies how case is handled when searching the tags
@@ -6386,8 +6378,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   match	Match case
 	   smart	Ignore case unless an upper case letter is used
 
-							*'tagfunc'* *'tfu'*
-'tagfunc' 'tfu'		string	(default: empty)
+						*'tagfunc'* *'tfu'*
+'tagfunc' 'tfu'		string	(default "")
 			local to buffer
 	This option specifies a function to be used to perform tag searches.
 	The function gets the tag pattern and should return a List of matching
@@ -6402,7 +6394,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If non-zero, tags are significant up to this number of characters.
 
 			*'tagrelative'* *'tr'* *'notagrelative'* *'notr'*
-'tagrelative' 'tr'	boolean	(default: on)
+'tagrelative' 'tr'	boolean	(default on)
 			global
 	If on and using a tags file in another directory, file names in that
 	tags file are relative to the directory where the tags file is.
@@ -6428,7 +6420,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	file names from the list.  This avoids problems when a future version
 	uses another default.
 
-				*'tagstack'* *'tgst'* *'notagstack'* *'notgst'*
+			*'tagstack'* *'tgst'* *'notagstack'* *'notgst'*
 'tagstack' 'tgst'	boolean	(default on)
 			global
 	When on, the |tagstack| is used normally.  When off, a ":tag" or
@@ -6439,9 +6431,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Resetting this option is useful when using a ":tag" command in a
 	mapping which should not change the tagstack.
 
-						*'termbidi'* *'tbidi'*
-						*'notermbidi'* *'notbidi'*
-'termbidi' 'tbidi'	boolean (default off)
+			*'termbidi'* *'tbidi'* *'notermbidi'* *'notbidi'*
+'termbidi' 'tbidi'	boolean	(default off)
 			global
 	The terminal is in charge of Bi-directionality of text (as specified
 	by Unicode).  The terminal is also expected to do the required shaping
@@ -6452,15 +6443,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'arabicshape' is ignored, but 'rightleft' isn't changed automatically.
 	For further details see |arabic.txt|.
 
-			*'termguicolors'* *'tgc'* *'notermguicolors'* *'notgc'*
-'termguicolors' 'tgc'	boolean (default off)
+		*'termguicolors'* *'tgc'* *'notermguicolors'* *'notgc'*
+'termguicolors' 'tgc'	boolean	(default off)
 			global
 	Enables 24-bit RGB color in the |TUI|.  Uses "gui" |:highlight|
 	attributes instead of "cterm" attributes. |guifg|
 	Requires an ISO-8613-3 compatible terminal.
 
-						*'termpastefilter'* *'tpf'*
-'termpastefilter' 'tpf'	string	(default: "BS,HT,ESC,DEL")
+					*'termpastefilter'* *'tpf'*
+'termpastefilter' 'tpf'	string	(default "BS,HT,ESC,DEL")
 			global
 	A comma-separated list of options for specifying control characters
 	to be removed from the text pasted into the terminal window. The
@@ -6481,7 +6472,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	   C1	    Control characters 0x80...0x9F
 
-
 						*'textwidth'* *'tw'*
 'textwidth' 'tw'	number	(default 0)
 			local to buffer
@@ -6510,8 +6500,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	another default.  Backticks cannot be used in this option for security
 	reasons.
 
-						*'thesaurusfunc'* *'tsrfu'*
-'thesaurusfunc' 'tsrfu'	string	(default: empty)
+					*'thesaurusfunc'* *'tsrfu'*
+'thesaurusfunc' 'tsrfu'	string	(default "")
 			global or local to buffer |global-local|
 	This option specifies a function to be used for thesaurus completion
 	with CTRL-X CTRL-T. |i_CTRL-X_CTRL-T| See |compl-thesaurusfunc|.
@@ -6521,46 +6511,24 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-			     *'tildeop'* *'top'* *'notildeop'* *'notop'*
+				*'tildeop'* *'top'* *'notildeop'* *'notop'*
 'tildeop' 'top'		boolean	(default off)
 			global
 	When on: The tilde command "~" behaves like an operator.
 
 				*'timeout'* *'to'* *'notimeout'* *'noto'*
-'timeout' 'to'		boolean (default on)
+'timeout' 'to'		boolean	(default on)
 			global
 	This option and 'timeoutlen' determine the behavior when part of a
 	mapped key sequence has been received. For example, if <c-f> is
 	pressed and 'timeout' is set, Nvim will wait 'timeoutlen' milliseconds
 	for any key that can follow <c-f> in a mapping.
 
-						*'ttimeout'* *'nottimeout'*
-'ttimeout'		boolean (default on)
-			global
-	This option and 'ttimeoutlen' determine the behavior when part of a
-	key code sequence has been received by the |TUI|.
-
-	For example if <Esc> (the \x1b byte) is received and 'ttimeout' is
-	set, Nvim waits 'ttimeoutlen' milliseconds for the terminal to
-	complete a key code sequence. If no input arrives before the timeout,
-	a single <Esc> is assumed. Many TUI cursor key codes start with <Esc>.
-
-	On very slow systems this may fail, causing cursor keys not to work
-	sometimes.  If you discover this problem you can ":set ttimeoutlen=9999".
-	Nvim will wait for the next character to arrive after an <Esc>.
-
 						*'timeoutlen'* *'tm'*
 'timeoutlen' 'tm'	number	(default 1000)
 			global
 	Time in milliseconds to wait for a mapped sequence to complete.
 
-						*'ttimeoutlen'* *'ttm'*
-'ttimeoutlen' 'ttm'	number	(default 50)
-			global
-	Time in milliseconds to wait for a key code sequence to complete. Also
-	used for CTRL-\ CTRL-N and CTRL-\ CTRL-G when part of a command has
-	been typed.
-
 						*'title'* *'notitle'*
 'title'			boolean	(default off)
 			global
@@ -6576,7 +6544,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		(path)		is the path of the file being edited
 		- NVIM		the server name |v:servername| or "NVIM"
 
-								*'titlelen'*
+							*'titlelen'*
 'titlelen'		number	(default 85)
 			global
 	Gives the percentage of 'columns' to use for the length of the window
@@ -6589,14 +6557,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 	values from 1 to 30000 percent can be used.
 	'titlelen' is also used for the 'titlestring' option.
 
-						*'titleold'*
+							*'titleold'*
 'titleold'		string	(default "")
 			global
 	If not empty, this option will be used to set the window title when
 	exiting.  Only if 'title' is enabled.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
-						*'titlestring'*
+
+							*'titlestring'*
 'titlestring'		string	(default "")
 			global
 	When this option is not empty, it will be used for the title of the
@@ -6619,7 +6588,29 @@ A jump table for the options with a short description can be found at |Q_op|.
 	NOTE: Use of special characters in 'titlestring' may cause the display
 	to be garbled (e.g., when it contains a CR or NL character).
 
-						*'undodir'* *'udir'* *E5003*
+					*'ttimeout'* *'nottimeout'*
+'ttimeout'		boolean	(default on)
+			global
+	This option and 'ttimeoutlen' determine the behavior when part of a
+	key code sequence has been received by the |TUI|.
+
+	For example if <Esc> (the \x1b byte) is received and 'ttimeout' is
+	set, Nvim waits 'ttimeoutlen' milliseconds for the terminal to
+	complete a key code sequence. If no input arrives before the timeout,
+	a single <Esc> is assumed. Many TUI cursor key codes start with <Esc>.
+
+	On very slow systems this may fail, causing cursor keys not to work
+	sometimes.  If you discover this problem you can ":set ttimeoutlen=9999".
+	Nvim will wait for the next character to arrive after an <Esc>.
+
+						*'ttimeoutlen'* *'ttm'*
+'ttimeoutlen' 'ttm'	number	(default 50)
+			global
+	Time in milliseconds to wait for a key code sequence to complete. Also
+	used for CTRL-\ CTRL-N and CTRL-\ CTRL-G when part of a command has
+	been typed.
+
+						*'undodir'* *'udir'*
 'undodir' 'udir'	string	(default "$XDG_STATE_HOME/nvim/undo//")
 			global
 	List of directory names for undo files, separated with commas.
@@ -6643,7 +6634,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	though the trailing slashes are present (see 'backupdir' for what this
 	means).
 
-				*'undofile'* *'noundofile'* *'udf'* *'noudf'*
+				*'undofile'* *'udf'* *'noundofile'* *'noudf'*
 'undofile' 'udf'	boolean	(default off)
 			local to buffer
 	When on, Vim automatically saves undo history to an undo file when
@@ -6692,7 +6683,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	this option to a lower value if you run out of memory.
 
 						*'updatecount'* *'uc'*
-'updatecount' 'uc'	number	(default: 200)
+'updatecount' 'uc'	number	(default 200)
 			global
 	After typing this many characters the swap file will be written to
 	disk.  When zero, no swap file will be created at all (see chapter on
@@ -6775,7 +6766,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If 'verbosefile' is set then the verbose messages are not displayed.
 
 						*'verbosefile'* *'vfile'*
-'verbosefile' 'vfile'	string	(default empty)
+'verbosefile' 'vfile'	string	(default "")
 			global
 	When not empty all messages are written in a file with this name.
 	When the file exists messages are appended.
@@ -6786,14 +6777,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	displayed when 'verbosefile' is set.
 
 						*'viewdir'* *'vdir'*
-'viewdir' 'vdir'	string	(default: "$XDG_STATE_HOME/nvim/view//")
+'viewdir' 'vdir'	string	(default "$XDG_STATE_HOME/nvim/view//")
 			global
 	Name of the directory where to store files for |:mkview|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
 						*'viewoptions'* *'vop'*
-'viewoptions' 'vop'	string	(default: "folds,cursor,curdir")
+'viewoptions' 'vop'	string	(default "folds,cursor,curdir")
 			global
 	Changes the effect of the |:mkview| command.  It is a comma-separated
 	list of words.  Each word enables saving and restoring something:
@@ -6808,7 +6799,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   slash	|deprecated| Always enabled. Uses "/" in filenames.
 	   unix		|deprecated| Always enabled. Uses "\n" line endings.
 
-					    *'virtualedit'* *'ve'*
+						*'virtualedit'* *'ve'*
 'virtualedit' 've'	string	(default "")
 			global or local to window |global-local|
 	A comma-separated list of these words:
@@ -6838,7 +6829,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	not get a warning for it.
 	When combined with other words, "none" is ignored.
 
-			*'visualbell'* *'vb'* *'novisualbell'* *'novb'* *beep*
+			*'visualbell'* *'vb'* *'novisualbell'* *'novb'*
 'visualbell' 'vb'	boolean	(default off)
 			global
 	Use visual bell instead of beeping.  Also see 'errorbells'.
@@ -6850,7 +6841,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	has been changed.
 
 						*'whichwrap'* *'ww'*
-'whichwrap' 'ww'	string	(default: "b,s")
+'whichwrap' 'ww'	string	(default "b,s")
 			global
 	Allow specified keys that move the cursor left/right to move to the
 	previous/next line when the cursor is on the first/last character in
@@ -6880,7 +6871,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	makes "dl", "cl", "yl" etc. work normally.
 
 						*'wildchar'* *'wc'*
-'wildchar' 'wc'		number	(default: <Tab>)
+'wildchar' 'wc'		number	(default <Tab>)
 			global
 	Character you have to type to start wildcard expansion in the
 	command-line, as specified with 'wildmode'.
@@ -6893,7 +6884,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <
 
 						*'wildcharm'* *'wcm'*
-'wildcharm' 'wcm'	number	(default: none (0))
+'wildcharm' 'wcm'	number	(default 0)
 			global
 	'wildcharm' works exactly like 'wildchar', except that it is
 	recognized when used inside a macro.  You can find "spare" command-line
@@ -6919,8 +6910,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	a pattern from the list.  This avoids problems when a future version
 	uses another default.
 
-
-			*'wildignorecase'* *'wic'* *'nowildignorecase'* *'nowic'*
+		*'wildignorecase'* *'wic'* *'nowildignorecase'* *'nowic'*
 'wildignorecase' 'wic'	boolean	(default off)
 			global
 	When set case is ignored when completing file names and directories.
@@ -6928,8 +6918,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Does not apply when the shell is used to expand wildcards, which
 	happens when there are special characters.
 
-
-				*'wildmenu'* *'wmnu'* *'nowildmenu'* *'nowmnu'*
+			*'wildmenu'* *'wmnu'* *'nowildmenu'* *'nowmnu'*
 'wildmenu' 'wmnu'	boolean	(default on)
 			global
 	When 'wildmenu' is on, command-line completion operates in an enhanced
@@ -6968,7 +6957,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-WildMenu| highlights the current match.
 
 						*'wildmode'* *'wim'*
-'wildmode' 'wim'	string	(default: "full")
+'wildmode' 'wim'	string	(default "full")
 			global
 	Completion mode that is used for the character specified with
 	'wildchar'.  It is a comma-separated list of up to four parts.  Each
@@ -7055,7 +7044,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option is not used for <F10>; on Win32.
 
 						*'winbar'* *'wbr'*
-'winbar' 'wbr'		string (default empty)
+'winbar' 'wbr'		string	(default "")
 			global or local to window |global-local|
 	When non-empty, this option enables the window bar and determines its
 	contents. The window bar is a bar that's shown at the top of every
@@ -7072,7 +7061,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set in a modeline when 'modelineexpr' is off.
 
 						*'winblend'* *'winbl'*
-'winblend' 'winbl'		number	(default 0)
+'winblend' 'winbl'	number	(default 0)
 			local to window
 	Enables pseudo-transparency for a floating window. Valid values are in
 	the range of 0 for fully opaque window (disabled) to 100 for fully
@@ -7080,8 +7069,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	UI-dependent. Works best with RGB colors. 'termguicolors'
 
-						*'window'* *'wi'*
-'window' 'wi'		number  (default screen height - 1)
+							*'window'* *'wi'*
+'window' 'wi'		number	(default screen height - 1)
 			global
 	Window height used for |CTRL-F| and |CTRL-B| when there is only one
 	window and the value is smaller than 'lines' minus one.  The screen
@@ -7093,6 +7082,21 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note: Do not confuse this with the height of the Vim window, use
 	'lines' for that.
 
+			*'winfixheight'* *'wfh'* *'nowinfixheight'* *'nowfh'*
+'winfixheight' 'wfh'	boolean	(default off)
+			local to window
+	Keep the window height when windows are opened or closed and
+	'equalalways' is set.  Also for |CTRL-W_=|.  Set by default for the
+	|preview-window| and |quickfix-window|.
+	The height may be changed anyway when running out of room.
+
+			*'winfixwidth'* *'wfw'* *'nowinfixwidth'* *'nowfw'*
+'winfixwidth' 'wfw'	boolean	(default off)
+			local to window
+	Keep the window width when windows are opened or closed and
+	'equalalways' is set.  Also for |CTRL-W_=|.
+	The width may be changed anyway when running out of room.
+
 						*'winheight'* *'wh'* *E591*
 'winheight' 'wh'	number	(default 1)
 			global
@@ -7113,8 +7117,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'winheight' applies to the current window.  Use 'winminheight' to set
 	the minimal height for other windows.
 
-						*'winhighlight'* *'winhl'*
-'winhighlight' 'winhl'	string (default empty)
+					*'winhighlight'* *'winhl'*
+'winhighlight' 'winhl'	string	(default "")
 			local to window
 	Window-local highlights.  Comma-delimited list of highlight
 	|group-name| pairs "{hl-from}:{hl-to},..." where each {hl-from} is
@@ -7133,20 +7137,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Example: show a different color for non-current windows: >
 		set winhighlight=Normal:MyNormal,NormalNC:MyNormalNC
 <
-			*'winfixheight'* *'wfh'* *'nowinfixheight'* *'nowfh'*
-'winfixheight' 'wfh'	boolean	(default off)
-			local to window
-	Keep the window height when windows are opened or closed and
-	'equalalways' is set.  Also for |CTRL-W_=|.  Set by default for the
-	|preview-window| and |quickfix-window|.
-	The height may be changed anyway when running out of room.
-
-			*'winfixwidth'* *'wfw'* *'nowinfixwidth'* *'nowfw'*
-'winfixwidth' 'wfw'	boolean	(default off)
-			local to window
-	Keep the window width when windows are opened or closed and
-	'equalalways' is set.  Also for |CTRL-W_=|.
-	The width may be changed anyway when running out of room.
 
 						*'winminheight'* *'wmh'*
 'winminheight' 'wmh'	number	(default 1)
@@ -7218,13 +7208,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When 'textwidth' is non-zero, this option is not used.
 	See also 'formatoptions' and |ins-textwidth|.
 
-				   *'wrapscan'* *'ws'* *'nowrapscan'* *'nows'*
-'wrapscan' 'ws'		boolean	(default on)			*E384* *E385*
+			*'wrapscan'* *'ws'* *'nowrapscan'* *'nows'* *E384* *E385*
+'wrapscan' 'ws'		boolean	(default on)
 			global
 	Searches wrap around the end of the file.  Also applies to |]s| and
 	|[s|, searching for spelling mistakes.
 
-						   *'write'* *'nowrite'*
+						*'write'* *'nowrite'*
 'write'			boolean	(default on)
 			global
 	Allows writing files.  When not set, writing a file is not allowed.
@@ -7233,12 +7223,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	argument.  Filtering text is still possible, even though this requires
 	writing a temporary file.
 
-				   *'writeany'* *'wa'* *'nowriteany'* *'nowa'*
+				*'writeany'* *'wa'* *'nowriteany'* *'nowa'*
 'writeany' 'wa'		boolean	(default off)
 			global
 	Allows writing to any file with no need for "!" override.
 
-			     *'writebackup'* *'wb'* *'nowritebackup'* *'nowb'*
+			*'writebackup'* *'wb'* *'nowritebackup'* *'nowb'*
 'writebackup' 'wb'	boolean	(default on)
 			global
 	Make a backup before overwriting a file.  The backup is removed after
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
new file mode 100644
index 0000000000..94e26742e6
--- /dev/null
+++ b/runtime/lua/vim/_meta/options.lua
@@ -0,0 +1,7908 @@
+--- @meta
+-- THIS FILE IS GENERATED
+-- DO NOT EDIT
+error('Cannot require a meta file')
+
+---@class vim.bo
+---@field [integer] vim.bo
+vim.bo = vim.bo
+
+---@class vim.wo
+---@field [integer] vim.wo
+vim.wo = vim.wo
+
+--- Allow CTRL-_ in Insert and Command-line mode.  This is default off, to
+--- avoid that users that accidentally type CTRL-_ instead of SHIFT-_ get
+--- into reverse Insert mode, and don't know how to get out.  See
+--- 'revins'.
+---
+--- @type boolean
+vim.o.allowrevins = false
+vim.o.ari = vim.o.allowrevins
+vim.go.allowrevins = vim.o.allowrevins
+vim.go.ari = vim.go.allowrevins
+
+--- Tells Vim what to do with characters with East Asian Width Class
+--- Ambiguous (such as Euro, Registered Sign, Copyright Sign, Greek
+--- letters, Cyrillic letters).
+---
+--- There are currently two possible values:
+--- "single":	Use the same width as characters in US-ASCII.  This is
+--- 		expected by most users.
+--- "double":	Use twice the width of ASCII characters.
+--- 						*E834* *E835*
+--- The value "double" cannot be used if 'listchars' or 'fillchars'
+--- contains a character that would be double width.  These errors may
+--- also be given when calling setcellwidths().
+---
+--- The values are overruled for characters specified with
+--- `setcellwidths()`.
+---
+--- There are a number of CJK fonts for which the width of glyphs for
+--- those characters are solely based on how many octets they take in
+--- legacy/traditional CJK encodings.  In those encodings, Euro,
+--- Registered sign, Greek/Cyrillic letters are represented by two octets,
+--- therefore those fonts have "wide" glyphs for them.  This is also
+--- true of some line drawing characters used to make tables in text
+--- file.  Therefore, when a CJK font is used for GUI Vim or
+--- Vim is running inside a terminal (emulators) that uses a CJK font
+--- (or Vim is run inside an xterm invoked with "-cjkwidth" option.),
+--- this option should be set to "double" to match the width perceived
+--- by Vim with the width of glyphs in the font.  Perhaps it also has
+--- to be set to "double" under CJK MS-Windows when the system locale is
+--- set to one of CJK locales.  See Unicode Standard Annex #11
+--- (https://www.unicode.org/reports/tr11).
+---
+--- @type string
+vim.o.ambiwidth = "single"
+vim.o.ambw = vim.o.ambiwidth
+vim.go.ambiwidth = vim.o.ambiwidth
+vim.go.ambw = vim.go.ambiwidth
+
+--- This option can be set to start editing Arabic text.
+--- Setting this option will:
+--- - Set the 'rightleft' option, unless 'termbidi' is set.
+--- - Set the 'arabicshape' option, unless 'termbidi' is set.
+--- - Set the 'keymap' option to "arabic"; in Insert mode CTRL-^ toggles
+---   between typing English and Arabic key mapping.
+--- - Set the 'delcombine' option
+---
+--- Resetting this option will:
+--- - Reset the 'rightleft' option.
+--- - Disable the use of 'keymap' (without changing its value).
+--- Note that 'arabicshape' and 'delcombine' are not reset (it is a global
+--- option).
+--- Also see `arabic.txt`.
+---
+--- @type boolean
+vim.o.arabic = false
+vim.o.arab = vim.o.arabic
+vim.wo.arabic = vim.o.arabic
+vim.wo.arab = vim.wo.arabic
+
+--- When on and 'termbidi' is off, the required visual character
+--- corrections that need to take place for displaying the Arabic language
+--- take effect.  Shaping, in essence, gets enabled; the term is a broad
+--- one which encompasses:
+---   a) the changing/morphing of characters based on their location
+---      within a word (initial, medial, final and stand-alone).
+---   b) the enabling of the ability to compose characters
+---   c) the enabling of the required combining of some characters
+--- When disabled the display shows each character's true stand-alone
+--- form.
+--- Arabic is a complex language which requires other settings, for
+--- further details see `arabic.txt`.
+---
+--- @type boolean
+vim.o.arabicshape = true
+vim.o.arshape = vim.o.arabicshape
+vim.go.arabicshape = vim.o.arabicshape
+vim.go.arshape = vim.go.arabicshape
+
+--- When on, Vim will change the current working directory whenever you
+--- open a file, switch buffers, delete a buffer or open/close a window.
+--- It will change to the directory containing the file which was opened
+--- or selected.  When a buffer has no name it also has no directory, thus
+--- the current directory won't change when navigating to it.
+--- Note: When this option is on some plugins may not work.
+---
+--- @type boolean
+vim.o.autochdir = false
+vim.o.acd = vim.o.autochdir
+vim.go.autochdir = vim.o.autochdir
+vim.go.acd = vim.go.autochdir
+
+--- Copy indent from current line when starting a new line (typing <CR>
+--- in Insert mode or when using the "o" or "O" command).  If you do not
+--- type anything on the new line except <BS> or CTRL-D and then type
+--- <Esc>, CTRL-O or <CR>, the indent is deleted again.  Moving the cursor
+--- to another line has the same effect, unless the 'I' flag is included
+--- in 'cpoptions'.
+--- When autoindent is on, formatting (with the "gq" command or when you
+--- reach 'textwidth' in Insert mode) uses the indentation of the first
+--- line.
+--- When 'smartindent' or 'cindent' is on the indent is changed in
+--- a different way.
+---
+--- @type boolean
+vim.o.autoindent = true
+vim.o.ai = vim.o.autoindent
+vim.bo.autoindent = vim.o.autoindent
+vim.bo.ai = vim.bo.autoindent
+
+--- When a file has been detected to have been changed outside of Vim and
+--- it has not been changed inside of Vim, automatically read it again.
+--- When the file has been deleted this is not done, so you have the text
+--- from before it was deleted.  When it appears again then it is read.
+--- `timestamp`
+--- If this option has a local value, use this command to switch back to
+--- using the global value:
+--- ```
+--- 	:set autoread<
+--- ```
+---
+--- @type boolean
+vim.o.autoread = true
+vim.o.ar = vim.o.autoread
+vim.bo.autoread = vim.o.autoread
+vim.bo.ar = vim.bo.autoread
+vim.go.autoread = vim.o.autoread
+vim.go.ar = vim.go.autoread
+
+--- Write the contents of the file, if it has been modified, on each
+--- `:next`, `:rewind`, `:last`, `:first`, `:previous`, `:stop`,
+--- `:suspend`, `:tag`, `:!`, `:make`, CTRL-] and CTRL-^ command; and when
+--- a `:buffer`, CTRL-O, CTRL-I, '{A-Z0-9}, or `{A-Z0-9} command takes one
+--- to another file.
+--- A buffer is not written if it becomes hidden, e.g. when 'bufhidden' is
+--- set to "hide" and `:next` is used.
+--- Note that for some commands the 'autowrite' option is not used, see
+--- 'autowriteall' for that.
+--- Some buffers will not be written, specifically when 'buftype' is
+--- "nowrite", "nofile", "terminal" or "prompt".
+--- USE WITH CARE: If you make temporary changes to a buffer that you
+--- don't want to be saved this option may cause it to be saved anyway.
+--- Renaming the buffer with ":file {name}" may help avoid this.
+---
+--- @type boolean
+vim.o.autowrite = false
+vim.o.aw = vim.o.autowrite
+vim.go.autowrite = vim.o.autowrite
+vim.go.aw = vim.go.autowrite
+
+--- Like 'autowrite', but also used for commands ":edit", ":enew", ":quit",
+--- ":qall", ":exit", ":xit", ":recover" and closing the Vim window.
+--- Setting this option also implies that Vim behaves like 'autowrite' has
+--- been set.
+---
+--- @type boolean
+vim.o.autowriteall = false
+vim.o.awa = vim.o.autowriteall
+vim.go.autowriteall = vim.o.autowriteall
+vim.go.awa = vim.go.autowriteall
+
+--- When set to "dark" or "light", adjusts the default color groups for
+--- that background type.  The `TUI` or other UI sets this on startup
+--- (triggering `OptionSet`) if it can detect the background color.
+---
+--- This option does NOT change the background color, it tells Nvim what
+--- the "inherited" (terminal/GUI) background looks like.
+--- See `:hi-normal` if you want to set the background color explicitly.
+--- 					*g:colors_name*
+--- When a color scheme is loaded (the "g:colors_name" variable is set)
+--- setting 'background' will cause the color scheme to be reloaded.  If
+--- the color scheme adjusts to the value of 'background' this will work.
+--- However, if the color scheme sets 'background' itself the effect may
+--- be undone.  First delete the "g:colors_name" variable when needed.
+---
+--- Normally this option would be set in the vimrc file.  Possibly
+--- depending on the terminal name.  Example:
+--- ```
+--- 	:if $TERM ==# "xterm"
+--- 	:  set background=dark
+--- 	:endif
+--- ```
+--- When this option is set, the default settings for the highlight groups
+--- will change.  To use other settings, place ":highlight" commands AFTER
+--- the setting of the 'background' option.
+--- This option is also used in the "$VIMRUNTIME/syntax/syntax.vim" file
+--- to select the colors for syntax highlighting.  After changing this
+--- option, you must load syntax.vim again to see the result.  This can be
+--- done with ":syntax on".
+---
+--- @type string
+vim.o.background = "dark"
+vim.o.bg = vim.o.background
+vim.go.background = vim.o.background
+vim.go.bg = vim.go.background
+
+--- Influences the working of <BS>, <Del>, CTRL-W and CTRL-U in Insert
+--- mode.  This is a list of items, separated by commas.  Each item allows
+--- a way to backspace over something:
+--- value	effect	~
+--- indent	allow backspacing over autoindent
+--- eol	allow backspacing over line breaks (join lines)
+--- start	allow backspacing over the start of insert; CTRL-W and CTRL-U
+--- 	stop once at the start of insert.
+--- nostop	like start, except CTRL-W and CTRL-U do not stop at the start of
+--- 	insert.
+---
+--- When the value is empty, Vi compatible backspacing is used, none of
+--- the ways mentioned for the items above are possible.
+---
+--- @type string
+vim.o.backspace = "indent,eol,start"
+vim.o.bs = vim.o.backspace
+vim.go.backspace = vim.o.backspace
+vim.go.bs = vim.go.backspace
+
+--- Make a backup before overwriting a file.  Leave it around after the
+--- file has been successfully written.  If you do not want to keep the
+--- backup file, but you do want a backup while the file is being
+--- written, reset this option and set the 'writebackup' option (this is
+--- the default).  If you do not want a backup file at all reset both
+--- options (use this if your file system is almost full).  See the
+--- `backup-table` for more explanations.
+--- When the 'backupskip' pattern matches, a backup is not made anyway.
+--- When 'patchmode' is set, the backup may be renamed to become the
+--- oldest version of a file.
+---
+--- @type boolean
+vim.o.backup = false
+vim.o.bk = vim.o.backup
+vim.go.backup = vim.o.backup
+vim.go.bk = vim.go.backup
+
+--- When writing a file and a backup is made, this option tells how it's
+--- done.  This is a comma-separated list of words.
+---
+--- The main values are:
+--- "yes"	make a copy of the file and overwrite the original one
+--- "no"	rename the file and write a new one
+--- "auto"	one of the previous, what works best
+---
+--- Extra values that can be combined with the ones above are:
+--- "breaksymlink"	always break symlinks when writing
+--- "breakhardlink"	always break hardlinks when writing
+---
+--- Making a copy and overwriting the original file:
+--- - Takes extra time to copy the file.
+--- + When the file has special attributes, is a (hard/symbolic) link or
+---   has a resource fork, all this is preserved.
+--- - When the file is a link the backup will have the name of the link,
+---   not of the real file.
+---
+--- Renaming the file and writing a new one:
+--- + It's fast.
+--- - Sometimes not all attributes of the file can be copied to the new
+---   file.
+--- - When the file is a link the new file will not be a link.
+---
+--- The "auto" value is the middle way: When Vim sees that renaming the
+--- file is possible without side effects (the attributes can be passed on
+--- and the file is not a link) that is used.  When problems are expected,
+--- a copy will be made.
+---
+--- The "breaksymlink" and "breakhardlink" values can be used in
+--- combination with any of "yes", "no" and "auto".  When included, they
+--- force Vim to always break either symbolic or hard links by doing
+--- exactly what the "no" option does, renaming the original file to
+--- become the backup and writing a new file in its place.  This can be
+--- useful for example in source trees where all the files are symbolic or
+--- hard links and any changes should stay in the local source tree, not
+--- be propagated back to the original source.
+--- 						*crontab*
+--- One situation where "no" and "auto" will cause problems: A program
+--- that opens a file, invokes Vim to edit that file, and then tests if
+--- the open file was changed (through the file descriptor) will check the
+--- backup file instead of the newly created file.  "crontab -e" is an
+--- example.
+---
+--- When a copy is made, the original file is truncated and then filled
+--- with the new text.  This means that protection bits, owner and
+--- symbolic links of the original file are unmodified.  The backup file,
+--- however, is a new file, owned by the user who edited the file.  The
+--- group of the backup is set to the group of the original file.  If this
+--- fails, the protection bits for the group are made the same as for
+--- others.
+---
+--- When the file is renamed, this is the other way around: The backup has
+--- the same attributes of the original file, and the newly written file
+--- is owned by the current user.  When the file was a (hard/symbolic)
+--- link, the new file will not!  That's why the "auto" value doesn't
+--- rename when the file is a link.  The owner and group of the newly
+--- written file will be set to the same ones as the original file, but
+--- the system may refuse to do this.  In that case the "auto" value will
+--- again not rename the file.
+---
+--- @type string
+vim.o.backupcopy = "auto"
+vim.o.bkc = vim.o.backupcopy
+vim.bo.backupcopy = vim.o.backupcopy
+vim.bo.bkc = vim.bo.backupcopy
+vim.go.backupcopy = vim.o.backupcopy
+vim.go.bkc = vim.go.backupcopy
+
+--- List of directories for the backup file, separated with commas.
+--- - The backup file will be created in the first directory in the list
+---   where this is possible.  If none of the directories exist Nvim will
+---   attempt to create the last directory in the list.
+--- - Empty means that no backup file will be created ('patchmode' is
+---   impossible!).  Writing may fail because of this.
+--- - A directory "." means to put the backup file in the same directory
+---   as the edited file.
+--- - A directory starting with "./" (or ".\" for MS-Windows) means to put
+---   the backup file relative to where the edited file is.  The leading
+---   "." is replaced with the path name of the edited file.
+---   ("." inside a directory name has no special meaning).
+--- - Spaces after the comma are ignored, other spaces are considered part
+---   of the directory name.  To have a space at the start of a directory
+---   name, precede it with a backslash.
+--- - To include a comma in a directory name precede it with a backslash.
+--- - A directory name may end in an '/'.
+--- - For Unix and Win32, if a directory ends in two path separators "//",
+---   the swap file name will be built from the complete path to the file
+---   with all path separators changed to percent '%' signs. This will
+---   ensure file name uniqueness in the backup directory.
+---   On Win32, it is also possible to end with "\\".  However, When a
+---   separating comma is following, you must use "//", since "\\" will
+---   include the comma in the file name. Therefore it is recommended to
+---   use '//', instead of '\\'.
+--- - Environment variables are expanded `:set_env`.
+--- - Careful with '\' characters, type one before a space, type two to
+---   get one in the option (see `option-backslash`), for example:
+--- ```
+---     :set bdir=c:\\tmp,\ dir\\,with\\,commas,\\\ dir\ with\ spaces
+--- ```
+--- See also 'backup' and 'writebackup' options.
+--- If you want to hide your backup files on Unix, consider this value:
+--- ```
+--- 	:set backupdir=./.backup,~/.backup,.,/tmp
+--- ```
+--- You must create a ".backup" directory in each directory and in your
+--- home directory for this to work properly.
+--- The use of `:set+=` and `:set-=` is preferred when adding or removing
+--- directories from the list.  This avoids problems when a future version
+--- uses another default.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.backupdir = ".,$XDG_STATE_HOME/nvim/backup//"
+vim.o.bdir = vim.o.backupdir
+vim.go.backupdir = vim.o.backupdir
+vim.go.bdir = vim.go.backupdir
+
+--- String which is appended to a file name to make the name of the
+--- backup file.  The default is quite unusual, because this avoids
+--- accidentally overwriting existing files with a backup file.  You might
+--- prefer using ".bak", but make sure that you don't have files with
+--- ".bak" that you want to keep.
+--- Only normal file name characters can be used; `/\*?[|<>` are illegal.
+---
+--- If you like to keep a lot of backups, you could use a BufWritePre
+--- autocommand to change 'backupext' just before writing the file to
+--- include a timestamp.
+--- ```
+--- 	:au BufWritePre * let &bex = '-' .. strftime("%Y%b%d%X") .. '~'
+--- ```
+--- Use 'backupdir' to put the backup in a different directory.
+---
+--- @type string
+vim.o.backupext = "~"
+vim.o.bex = vim.o.backupext
+vim.go.backupext = vim.o.backupext
+vim.go.bex = vim.go.backupext
+
+--- A list of file patterns.  When one of the patterns matches with the
+--- name of the file which is written, no backup file is created.  Both
+--- the specified file name and the full path name of the file are used.
+--- The pattern is used like with `:autocmd`, see `autocmd-pattern`.
+--- Watch out for special characters, see `option-backslash`.
+--- When $TMPDIR, $TMP or $TEMP is not defined, it is not used for the
+--- default value.  "/tmp/*" is only used for Unix.
+---
+--- WARNING: Not having a backup file means that when Vim fails to write
+--- your buffer correctly and then, for whatever reason, Vim exits, you
+--- lose both the original file and what you were writing.  Only disable
+--- backups if you don't care about losing the file.
+---
+--- Note that environment variables are not expanded.  If you want to use
+--- $HOME you must expand it explicitly, e.g.:
+--- ```
+--- 	:let &backupskip = escape(expand('$HOME'), '\') .. '/tmp/*'
+---
+--- ```
+--- Note that the default also makes sure that "crontab -e" works (when a
+--- backup would be made by renaming the original file crontab won't see
+--- the newly created file).  Also see 'backupcopy' and `crontab`.
+---
+--- @type string
+vim.o.backupskip = "/tmp/*"
+vim.o.bsk = vim.o.backupskip
+vim.go.backupskip = vim.o.backupskip
+vim.go.bsk = vim.go.backupskip
+
+--- Specifies for which events the bell will not be rung. It is a comma-
+--- separated list of items. For each item that is present, the bell
+--- will be silenced. This is most useful to specify specific events in
+--- insert mode to be silenced.
+---
+--- item	    meaning when present	~
+--- all	    All events.
+--- backspace   When hitting <BS> or <Del> and deleting results in an
+--- 	    error.
+--- cursor	    Fail to move around using the cursor keys or
+--- 	    <PageUp>/<PageDown> in `Insert-mode`.
+--- complete    Error occurred when using `i_CTRL-X_CTRL-K` or
+--- 	    `i_CTRL-X_CTRL-T`.
+--- copy	    Cannot copy char from insert mode using `i_CTRL-Y` or
+--- 	    `i_CTRL-E`.
+--- ctrlg	    Unknown Char after <C-G> in Insert mode.
+--- error	    Other Error occurred (e.g. try to join last line)
+--- 	    (mostly used in `Normal-mode` or `Cmdline-mode`).
+--- esc	    hitting <Esc> in `Normal-mode`.
+--- hangul	    Ignored.
+--- lang	    Calling the beep module for Lua/Mzscheme/TCL.
+--- mess	    No output available for `g<`.
+--- showmatch   Error occurred for 'showmatch' function.
+--- operator    Empty region error `cpo-E`.
+--- register    Unknown register after <C-R> in `Insert-mode`.
+--- shell	    Bell from shell output `:!`.
+--- spell	    Error happened on spell suggest.
+--- wildmode    More matches in `cmdline-completion` available
+--- 	    (depends on the 'wildmode' setting).
+---
+--- This is most useful to fine tune when in Insert mode the bell should
+--- be rung. For Normal mode and Ex commands, the bell is often rung to
+--- indicate that an error occurred. It can be silenced by adding the
+--- "error" keyword.
+---
+--- @type string
+vim.o.belloff = "all"
+vim.o.bo = vim.o.belloff
+vim.go.belloff = vim.o.belloff
+vim.go.bo = vim.go.belloff
+
+--- This option should be set before editing a binary file.  You can also
+--- use the `-b` Vim argument.  When this option is switched on a few
+--- options will be changed (also when it already was on):
+--- 	'textwidth'  will be set to 0
+--- 	'wrapmargin' will be set to 0
+--- 	'modeline'   will be off
+--- 	'expandtab'  will be off
+--- Also, 'fileformat' and 'fileformats' options will not be used, the
+--- file is read and written like 'fileformat' was "unix" (a single <NL>
+--- separates lines).
+--- The 'fileencoding' and 'fileencodings' options will not be used, the
+--- file is read without conversion.
+--- NOTE: When you start editing a(nother) file while the 'bin' option is
+--- on, settings from autocommands may change the settings again (e.g.,
+--- 'textwidth'), causing trouble when editing.  You might want to set
+--- 'bin' again when the file has been loaded.
+--- The previous values of these options are remembered and restored when
+--- 'bin' is switched from on to off.  Each buffer has its own set of
+--- saved option values.
+--- To edit a file with 'binary' set you can use the `++bin` argument.
+--- This avoids you have to do ":set bin", which would have effect for all
+--- files you edit.
+--- When writing a file the <EOL> for the last line is only written if
+--- there was one in the original file (normally Vim appends an <EOL> to
+--- the last line if there is none; this would make the file longer).  See
+--- the 'endofline' option.
+---
+--- @type boolean
+vim.o.binary = false
+vim.o.bin = vim.o.binary
+vim.bo.binary = vim.o.binary
+vim.bo.bin = vim.bo.binary
+
+--- When writing a file and the following conditions are met, a BOM (Byte
+--- Order Mark) is prepended to the file:
+--- - this option is on
+--- - the 'binary' option is off
+--- - 'fileencoding' is "utf-8", "ucs-2", "ucs-4" or one of the little/big
+---   endian variants.
+--- Some applications use the BOM to recognize the encoding of the file.
+--- Often used for UCS-2 files on MS-Windows.  For other applications it
+--- causes trouble, for example: "cat file1 file2" makes the BOM of file2
+--- appear halfway through the resulting file.  Gcc doesn't accept a BOM.
+--- When Vim reads a file and 'fileencodings' starts with "ucs-bom", a
+--- check for the presence of the BOM is done and 'bomb' set accordingly.
+--- Unless 'binary' is set, it is removed from the first line, so that you
+--- don't see it when editing.  When you don't change the options, the BOM
+--- will be restored when writing the file.
+---
+--- @type boolean
+vim.o.bomb = false
+vim.bo.bomb = vim.o.bomb
+
+--- This option lets you choose which characters might cause a line
+--- break if 'linebreak' is on.  Only works for ASCII characters.
+---
+--- @type string
+vim.o.breakat = " \t!@*-+;:,./?"
+vim.o.brk = vim.o.breakat
+vim.go.breakat = vim.o.breakat
+vim.go.brk = vim.go.breakat
+
+--- Every wrapped line will continue visually indented (same amount of
+--- space as the beginning of that line), thus preserving horizontal blocks
+--- of text.
+---
+--- @type boolean
+vim.o.breakindent = false
+vim.o.bri = vim.o.breakindent
+vim.wo.breakindent = vim.o.breakindent
+vim.wo.bri = vim.wo.breakindent
+
+--- Settings for 'breakindent'. It can consist of the following optional
+--- items and must be separated by a comma:
+--- 	min:{n}	    Minimum text width that will be kept after
+--- 		    applying 'breakindent', even if the resulting
+--- 		    text should normally be narrower. This prevents
+--- 		    text indented almost to the right window border
+--- 		    occupying lot of vertical space when broken.
+--- 		    (default: 20)
+--- 	shift:{n}   After applying 'breakindent', the wrapped line's
+--- 		    beginning will be shifted by the given number of
+--- 		    characters.  It permits dynamic French paragraph
+--- 		    indentation (negative) or emphasizing the line
+--- 		    continuation (positive).
+--- 		    (default: 0)
+--- 	sbr	    Display the 'showbreak' value before applying the
+--- 		    additional indent.
+--- 		    (default: off)
+--- 	list:{n}    Adds an additional indent for lines that match a
+--- 		    numbered or bulleted list (using the
+--- 		    'formatlistpat' setting).
+--- 	list:-1	    Uses the length of a match with 'formatlistpat'
+--- 		    for indentation.
+--- 		    (default: 0)
+--- 	column:{n}  Indent at column {n}. Will overrule the other
+--- 		    sub-options. Note: an additional indent may be
+--- 		    added for the 'showbreak' setting.
+--- 		    (default: off)
+---
+--- @type string
+vim.o.breakindentopt = ""
+vim.o.briopt = vim.o.breakindentopt
+vim.wo.breakindentopt = vim.o.breakindentopt
+vim.wo.briopt = vim.wo.breakindentopt
+
+--- Which directory to use for the file browser:
+---    last		Use same directory as with last file browser, where a
+--- 		file was opened or saved.
+---    buffer	Use the directory of the related buffer.
+---    current	Use the current directory.
+---    {path}	Use the specified directory
+---
+--- @type string
+vim.o.browsedir = ""
+vim.o.bsdir = vim.o.browsedir
+vim.go.browsedir = vim.o.browsedir
+vim.go.bsdir = vim.go.browsedir
+
+--- This option specifies what happens when a buffer is no longer
+--- displayed in a window:
+---   <empty>	follow the global 'hidden' option
+---   hide		hide the buffer (don't unload it), even if 'hidden' is
+--- 		not set
+---   unload	unload the buffer, even if 'hidden' is set; the
+--- 		`:hide` command will also unload the buffer
+---   delete	delete the buffer from the buffer list, even if
+--- 		'hidden' is set; the `:hide` command will also delete
+--- 		the buffer, making it behave like `:bdelete`
+---   wipe		wipe the buffer from the buffer list, even if
+--- 		'hidden' is set; the `:hide` command will also wipe
+--- 		out the buffer, making it behave like `:bwipeout`
+---
+--- CAREFUL: when "unload", "delete" or "wipe" is used changes in a buffer
+--- are lost without a warning.  Also, these values may break autocommands
+--- that switch between buffers temporarily.
+--- This option is used together with 'buftype' and 'swapfile' to specify
+--- special kinds of buffers.   See `special-buffers`.
+---
+--- @type string
+vim.o.bufhidden = ""
+vim.o.bh = vim.o.bufhidden
+vim.bo.bufhidden = vim.o.bufhidden
+vim.bo.bh = vim.bo.bufhidden
+
+--- When this option is set, the buffer shows up in the buffer list.  If
+--- it is reset it is not used for ":bnext", "ls", the Buffers menu, etc.
+--- This option is reset by Vim for buffers that are only used to remember
+--- a file name or marks.  Vim sets it when starting to edit a buffer.
+--- But not when moving to a buffer with ":buffer".
+---
+--- @type boolean
+vim.o.buflisted = true
+vim.o.bl = vim.o.buflisted
+vim.bo.buflisted = vim.o.buflisted
+vim.bo.bl = vim.bo.buflisted
+
+--- The value of this option specifies the type of a buffer:
+---   <empty>	normal buffer
+---   acwrite	buffer will always be written with `BufWriteCmd`s
+---   help		help buffer (do not set this manually)
+---   nofile	buffer is not related to a file, will not be written
+---   nowrite	buffer will not be written
+---   quickfix	list of errors `:cwindow` or locations `:lwindow`
+---   terminal	`terminal-emulator` buffer
+---   prompt	buffer where only the last line can be edited, meant
+--- 		to be used by a plugin, see `prompt-buffer`
+---
+--- This option is used together with 'bufhidden' and 'swapfile' to
+--- specify special kinds of buffers.   See `special-buffers`.
+--- Also see `win_gettype()`, which returns the type of the window.
+---
+--- Be careful with changing this option, it can have many side effects!
+--- One such effect is that Vim will not check the timestamp of the file,
+--- if the file is changed by another program this will not be noticed.
+---
+--- A "quickfix" buffer is only used for the error list and the location
+--- list.  This value is set by the `:cwindow` and `:lwindow` commands and
+--- you are not supposed to change it.
+---
+--- "nofile" and "nowrite" buffers are similar:
+--- both:		The buffer is not to be written to disk, ":w" doesn't
+--- 		work (":w filename" does work though).
+--- both:		The buffer is never considered to be `'modified'`.
+--- 		There is no warning when the changes will be lost, for
+--- 		example when you quit Vim.
+--- both:		A swap file is only created when using too much memory
+--- 		(when 'swapfile' has been reset there is never a swap
+--- 		file).
+--- nofile only:	The buffer name is fixed, it is not handled like a
+--- 		file name.  It is not modified in response to a `:cd`
+--- 		command.
+--- both:		When using ":e bufname" and already editing "bufname"
+--- 		the buffer is made empty and autocommands are
+--- 		triggered as usual for `:edit`.
+--- 						*E676*
+--- "acwrite" implies that the buffer name is not related to a file, like
+--- "nofile", but it will be written.  Thus, in contrast to "nofile" and
+--- "nowrite", ":w" does work and a modified buffer can't be abandoned
+--- without saving.  For writing there must be matching `BufWriteCmd|,
+--- |FileWriteCmd` or `FileAppendCmd` autocommands.
+---
+--- @type string
+vim.o.buftype = ""
+vim.o.bt = vim.o.buftype
+vim.bo.buftype = vim.o.buftype
+vim.bo.bt = vim.bo.buftype
+
+--- Specifies details about changing the case of letters.  It may contain
+--- these words, separated by a comma:
+--- internal	Use internal case mapping functions, the current
+--- 		locale does not change the case mapping. When
+--- 		"internal" is omitted, the towupper() and towlower()
+--- 		system library functions are used when available.
+--- keepascii	For the ASCII characters (0x00 to 0x7f) use the US
+--- 		case mapping, the current locale is not effective.
+--- 		This probably only matters for Turkish.
+---
+--- @type string
+vim.o.casemap = "internal,keepascii"
+vim.o.cmp = vim.o.casemap
+vim.go.casemap = vim.o.casemap
+vim.go.cmp = vim.go.casemap
+
+--- When on, `:cd`, `:tcd` and `:lcd` without an argument changes the
+--- current working directory to the `$HOME` directory like in Unix.
+--- When off, those commands just print the current directory name.
+--- On Unix this option has no effect.
+---
+--- @type boolean
+vim.o.cdhome = false
+vim.o.cdh = vim.o.cdhome
+vim.go.cdhome = vim.o.cdhome
+vim.go.cdh = vim.go.cdhome
+
+--- This is a list of directories which will be searched when using the
+--- `:cd`, `:tcd` and `:lcd` commands, provided that the directory being
+--- searched for has a relative path, not an absolute part starting with
+--- "/", "./" or "../", the 'cdpath' option is not used then.
+--- The 'cdpath' option's value has the same form and semantics as
+--- `'path'`.  Also see `file-searching`.
+--- The default value is taken from $CDPATH, with a "," prepended to look
+--- in the current directory first.
+--- If the default value taken from $CDPATH is not what you want, include
+--- a modified version of the following command in your vimrc file to
+--- override it:
+--- ```
+---   :let &cdpath = ',' .. substitute(substitute($CDPATH, '[, ]', '\\\0', 'g'), ':', ',', 'g')
+--- ```
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+--- (parts of 'cdpath' can be passed to the shell to expand file names).
+---
+--- @type string
+vim.o.cdpath = ",,"
+vim.o.cd = vim.o.cdpath
+vim.go.cdpath = vim.o.cdpath
+vim.go.cd = vim.go.cdpath
+
+--- The key used in Command-line Mode to open the command-line window.
+--- Only non-printable keys are allowed.
+--- The key can be specified as a single character, but it is difficult to
+--- type.  The preferred way is to use the <> notation.  Examples:
+--- ```
+--- 	:exe "set cedit=\\<C-Y>"
+--- 	:exe "set cedit=\\<Esc>"
+--- ```
+--- `Nvi` also has this option, but it only uses the first character.
+--- See `cmdwin`.
+---
+--- @type string
+vim.o.cedit = "\6"
+vim.go.cedit = vim.o.cedit
+
+--- `channel` connected to the buffer, or 0 if no channel is connected.
+--- In a `:terminal` buffer this is the terminal channel.
+--- Read-only.
+---
+--- @type integer
+vim.o.channel = 0
+vim.bo.channel = vim.o.channel
+
+--- An expression that is used for character encoding conversion.  It is
+--- evaluated when a file that is to be read or has been written has a
+--- different encoding from what is desired.
+--- 'charconvert' is not used when the internal iconv() function is
+--- supported and is able to do the conversion.  Using iconv() is
+--- preferred, because it is much faster.
+--- 'charconvert' is not used when reading stdin `--`, because there is no
+--- file to convert from.  You will have to save the text in a file first.
+--- The expression must return zero, false or an empty string for success,
+--- non-zero or true for failure.
+--- See `encoding-names` for possible encoding names.
+--- Additionally, names given in 'fileencodings' and 'fileencoding' are
+--- used.
+--- Conversion between "latin1", "unicode", "ucs-2", "ucs-4" and "utf-8"
+--- is done internally by Vim, 'charconvert' is not used for this.
+--- Also used for Unicode conversion.
+--- Example:
+--- ```
+--- 	set charconvert=CharConvert()
+--- 	fun CharConvert()
+--- 	  system("recode "
+--- 		\ .. v:charconvert_from .. ".." .. v:charconvert_to
+--- 		\ .. " <" .. v:fname_in .. " >" .. v:fname_out)
+--- 	  return v:shell_error
+--- 	endfun
+--- ```
+--- The related Vim variables are:
+--- 	v:charconvert_from	name of the current encoding
+--- 	v:charconvert_to	name of the desired encoding
+--- 	v:fname_in		name of the input file
+--- 	v:fname_out		name of the output file
+--- Note that v:fname_in and v:fname_out will never be the same.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.charconvert = ""
+vim.o.ccv = vim.o.charconvert
+vim.go.charconvert = vim.o.charconvert
+vim.go.ccv = vim.go.charconvert
+
+--- Enables automatic C program indenting.  See 'cinkeys' to set the keys
+--- that trigger reindenting in insert mode and 'cinoptions' to set your
+--- preferred indent style.
+--- If 'indentexpr' is not empty, it overrules 'cindent'.
+--- If 'lisp' is not on and both 'indentexpr' and 'equalprg' are empty,
+--- the "=" operator indents using this algorithm rather than calling an
+--- external program.
+--- See `C-indenting`.
+--- When you don't like the way 'cindent' works, try the 'smartindent'
+--- option or 'indentexpr'.
+---
+--- @type boolean
+vim.o.cindent = false
+vim.o.cin = vim.o.cindent
+vim.bo.cindent = vim.o.cindent
+vim.bo.cin = vim.bo.cindent
+
+--- A list of keys that, when typed in Insert mode, cause reindenting of
+--- the current line.  Only used if 'cindent' is on and 'indentexpr' is
+--- empty.
+--- For the format of this option see `cinkeys-format`.
+--- See `C-indenting`.
+---
+--- @type string
+vim.o.cinkeys = "0{,0},0),0],:,0#,!^F,o,O,e"
+vim.o.cink = vim.o.cinkeys
+vim.bo.cinkeys = vim.o.cinkeys
+vim.bo.cink = vim.bo.cinkeys
+
+--- The 'cinoptions' affect the way 'cindent' reindents lines in a C
+--- program.  See `cinoptions-values` for the values of this option, and
+--- `C-indenting` for info on C indenting in general.
+---
+--- @type string
+vim.o.cinoptions = ""
+vim.o.cino = vim.o.cinoptions
+vim.bo.cinoptions = vim.o.cinoptions
+vim.bo.cino = vim.bo.cinoptions
+
+--- Keywords that are interpreted as a C++ scope declaration by `cino-g`.
+--- Useful e.g. for working with the Qt framework that defines additional
+--- scope declarations "signals", "public slots" and "private slots":
+--- ```
+--- 	set cinscopedecls+=signals,public\ slots,private\ slots
+--- ```
+---
+--- @type string
+vim.o.cinscopedecls = "public,protected,private"
+vim.o.cinsd = vim.o.cinscopedecls
+vim.bo.cinscopedecls = vim.o.cinscopedecls
+vim.bo.cinsd = vim.bo.cinscopedecls
+
+--- These keywords start an extra indent in the next line when
+--- 'smartindent' or 'cindent' is set.  For 'cindent' this is only done at
+--- an appropriate place (inside {}).
+--- Note that 'ignorecase' isn't used for 'cinwords'.  If case doesn't
+--- matter, include the keyword both the uppercase and lowercase:
+--- "if,If,IF".
+---
+--- @type string
+vim.o.cinwords = "if,else,while,do,for,switch"
+vim.o.cinw = vim.o.cinwords
+vim.bo.cinwords = vim.o.cinwords
+vim.bo.cinw = vim.bo.cinwords
+
+--- This option is a list of comma-separated names.
+--- These names are recognized:
+---
+--- 					*clipboard-unnamed*
+--- unnamed		When included, Vim will use the clipboard register "*"
+--- 		for all yank, delete, change and put operations which
+--- 		would normally go to the unnamed register.  When a
+--- 		register is explicitly specified, it will always be
+--- 		used regardless of whether "unnamed" is in 'clipboard'
+--- 		or not.  The clipboard register can always be
+--- 		explicitly accessed using the "* notation.  Also see
+--- 		`clipboard`.
+---
+--- 					*clipboard-unnamedplus*
+--- unnamedplus	A variant of the "unnamed" flag which uses the
+--- 		clipboard register "+" (`quoteplus`) instead of
+--- 		register "*" for all yank, delete, change and put
+--- 		operations which would normally go to the unnamed
+--- 		register.  When "unnamed" is also included to the
+--- 		option, yank and delete operations (but not put)
+--- 		will additionally copy the text into register
+--- 		"*". See `clipboard`.
+---
+--- @type string
+vim.o.clipboard = ""
+vim.o.cb = vim.o.clipboard
+vim.go.clipboard = vim.o.clipboard
+vim.go.cb = vim.go.clipboard
+
+--- Number of screen lines to use for the command-line.  Helps avoiding
+--- `hit-enter` prompts.
+--- The value of this option is stored with the tab page, so that each tab
+--- page can have a different value.
+---
+--- When 'cmdheight' is zero, there is no command-line unless it is being
+--- used.  The command-line will cover the last line of the screen when
+--- shown.
+---
+--- WARNING: `cmdheight=0` is considered experimental. Expect some
+--- unwanted behaviour. Some 'shortmess' flags and similar
+--- mechanism might fail to take effect, causing unwanted hit-enter
+--- prompts.  Some informative messages, both from Nvim itself and
+--- plugins, will not be displayed.
+---
+--- @type integer
+vim.o.cmdheight = 1
+vim.o.ch = vim.o.cmdheight
+vim.go.cmdheight = vim.o.cmdheight
+vim.go.ch = vim.go.cmdheight
+
+--- Number of screen lines to use for the command-line window. `cmdwin`
+---
+--- @type integer
+vim.o.cmdwinheight = 7
+vim.o.cwh = vim.o.cmdwinheight
+vim.go.cmdwinheight = vim.o.cmdwinheight
+vim.go.cwh = vim.go.cmdwinheight
+
+--- 'colorcolumn' is a comma-separated list of screen columns that are
+--- highlighted with ColorColumn `hl-ColorColumn`.  Useful to align
+--- text.  Will make screen redrawing slower.
+--- The screen column can be an absolute number, or a number preceded with
+--- '+' or '-', which is added to or subtracted from 'textwidth'.
+--- ```
+---
+--- 	:set cc=+1	  " highlight column after 'textwidth'
+--- 	:set cc=+1,+2,+3  " highlight three columns after 'textwidth'
+--- 	:hi ColorColumn ctermbg=lightgrey guibg=lightgrey
+--- ```
+--- When 'textwidth' is zero then the items with '-' and '+' are not used.
+--- A maximum of 256 columns are highlighted.
+---
+--- @type string
+vim.o.colorcolumn = ""
+vim.o.cc = vim.o.colorcolumn
+vim.wo.colorcolumn = vim.o.colorcolumn
+vim.wo.cc = vim.wo.colorcolumn
+
+--- Number of columns of the screen.  Normally this is set by the terminal
+--- initialization and does not have to be set by hand.
+--- When Vim is running in the GUI or in a resizable window, setting this
+--- option will cause the window size to be changed.  When you only want
+--- to use the size for the GUI, put the command in your `ginit.vim` file.
+--- When you set this option and Vim is unable to change the physical
+--- number of columns of the display, the display may be messed up.  For
+--- the GUI it is always possible and Vim limits the number of columns to
+--- what fits on the screen.  You can use this command to get the widest
+--- window possible:
+--- ```
+--- 	:set columns=9999
+--- ```
+--- Minimum value is 12, maximum value is 10000.
+---
+--- @type integer
+vim.o.columns = 80
+vim.o.co = vim.o.columns
+vim.go.columns = vim.o.columns
+vim.go.co = vim.go.columns
+
+--- A comma-separated list of strings that can start a comment line.  See
+--- `format-comments`.  See `option-backslash` about using backslashes to
+--- insert a space.
+---
+--- @type string
+vim.o.comments = "s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-"
+vim.o.com = vim.o.comments
+vim.bo.comments = vim.o.comments
+vim.bo.com = vim.bo.comments
+
+--- A template for a comment.  The "%s" in the value is replaced with the
+--- comment text.  For example, C uses "/*%s*/". Currently only used to
+--- add markers for folding, see `fold-marker`.
+---
+--- @type string
+vim.o.commentstring = ""
+vim.o.cms = vim.o.commentstring
+vim.bo.commentstring = vim.o.commentstring
+vim.bo.cms = vim.bo.commentstring
+
+--- This option specifies how keyword completion `ins-completion` works
+--- when CTRL-P or CTRL-N are used.  It is also used for whole-line
+--- completion `i_CTRL-X_CTRL-L`.  It indicates the type of completion
+--- and the places to scan.  It is a comma-separated list of flags:
+--- .	scan the current buffer ('wrapscan' is ignored)
+--- w	scan buffers from other windows
+--- b	scan other loaded buffers that are in the buffer list
+--- u	scan the unloaded buffers that are in the buffer list
+--- U	scan the buffers that are not in the buffer list
+--- k	scan the files given with the 'dictionary' option
+--- kspell  use the currently active spell checking `spell`
+--- k{dict}	scan the file {dict}.  Several "k" flags can be given,
+--- 	patterns are valid too.  For example:
+--- ```
+--- 		:set cpt=k/usr/dict/*,k~/spanish
+--- ```
+--- s	scan the files given with the 'thesaurus' option
+--- s{tsr}	scan the file {tsr}.  Several "s" flags can be given, patterns
+--- 	are valid too.
+--- i	scan current and included files
+--- d	scan current and included files for defined name or macro
+--- 	`i_CTRL-X_CTRL-D`
+--- ]	tag completion
+--- t	same as "]"
+---
+--- Unloaded buffers are not loaded, thus their autocmds `:autocmd` are
+--- not executed, this may lead to unexpected completions from some files
+--- (gzipped files for example).  Unloaded buffers are not scanned for
+--- whole-line completion.
+---
+--- As you can see, CTRL-N and CTRL-P can be used to do any 'iskeyword'-
+--- based expansion (e.g., dictionary `i_CTRL-X_CTRL-K`, included patterns
+--- `i_CTRL-X_CTRL-I`, tags `i_CTRL-X_CTRL-]` and normal expansions).
+---
+--- @type string
+vim.o.complete = ".,w,b,u,t"
+vim.o.cpt = vim.o.complete
+vim.bo.complete = vim.o.complete
+vim.bo.cpt = vim.bo.complete
+
+--- This option specifies a function to be used for Insert mode completion
+--- with CTRL-X CTRL-U. `i_CTRL-X_CTRL-U`
+--- See `complete-functions` for an explanation of how the function is
+--- invoked and what it should return.  The value can be the name of a
+--- function, a `lambda` or a `Funcref`. See `option-value-function` for
+--- more information.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.completefunc = ""
+vim.o.cfu = vim.o.completefunc
+vim.bo.completefunc = vim.o.completefunc
+vim.bo.cfu = vim.bo.completefunc
+
+--- A comma-separated list of options for Insert mode completion
+--- `ins-completion`.  The supported values are:
+---
+---    menu	    Use a popup menu to show the possible completions.  The
+--- 	    menu is only shown when there is more than one match and
+--- 	    sufficient colors are available.  `ins-completion-menu`
+---
+---    menuone  Use the popup menu also when there is only one match.
+--- 	    Useful when there is additional information about the
+--- 	    match, e.g., what file it comes from.
+---
+---    longest  Only insert the longest common text of the matches.  If
+--- 	    the menu is displayed you can use CTRL-L to add more
+--- 	    characters.  Whether case is ignored depends on the kind
+--- 	    of completion.  For buffer text the 'ignorecase' option is
+--- 	    used.
+---
+---    preview  Show extra information about the currently selected
+--- 	    completion in the preview window.  Only works in
+--- 	    combination with "menu" or "menuone".
+---
+---   noinsert  Do not insert any text for a match until the user selects
+--- 	    a match from the menu. Only works in combination with
+--- 	    "menu" or "menuone". No effect if "longest" is present.
+---
+---   noselect  Do not select a match in the menu, force the user to
+--- 	    select one from the menu. Only works in combination with
+--- 	    "menu" or "menuone".
+---
+--- @type string
+vim.o.completeopt = "menu,preview"
+vim.o.cot = vim.o.completeopt
+vim.go.completeopt = vim.o.completeopt
+vim.go.cot = vim.go.completeopt
+
+--- 		only for MS-Windows
+--- When this option is set it overrules 'shellslash' for completion:
+--- - When this option is set to "slash", a forward slash is used for path
+---   completion in insert mode. This is useful when editing HTML tag, or
+---   Makefile with 'noshellslash' on MS-Windows.
+--- - When this option is set to "backslash", backslash is used. This is
+---   useful when editing a batch file with 'shellslash' set on MS-Windows.
+--- - When this option is empty, same character is used as for
+---   'shellslash'.
+--- For Insert mode completion the buffer-local value is used.  For
+--- command line completion the global value is used.
+---
+--- @type string
+vim.o.completeslash = ""
+vim.o.csl = vim.o.completeslash
+vim.bo.completeslash = vim.o.completeslash
+vim.bo.csl = vim.bo.completeslash
+
+--- Sets the modes in which text in the cursor line can also be concealed.
+--- When the current mode is listed then concealing happens just like in
+--- other lines.
+---   n		Normal mode
+---   v		Visual mode
+---   i		Insert mode
+---   c		Command line editing, for 'incsearch'
+---
+--- 'v' applies to all lines in the Visual area, not only the cursor.
+--- A useful value is "nc".  This is used in help files.  So long as you
+--- are moving around text is concealed, but when starting to insert text
+--- or selecting a Visual area the concealed text is displayed, so that
+--- you can see what you are doing.
+--- Keep in mind that the cursor position is not always where it's
+--- displayed.  E.g., when moving vertically it may change column.
+---
+--- @type string
+vim.o.concealcursor = ""
+vim.o.cocu = vim.o.concealcursor
+vim.wo.concealcursor = vim.o.concealcursor
+vim.wo.cocu = vim.wo.concealcursor
+
+--- Determine how text with the "conceal" syntax attribute `:syn-conceal`
+--- is shown:
+---
+--- Value		Effect ~
+--- 0		Text is shown normally
+--- 1		Each block of concealed text is replaced with one
+--- 		character.  If the syntax item does not have a custom
+--- 		replacement character defined (see `:syn-cchar`) the
+--- 		character defined in 'listchars' is used.
+--- 		It is highlighted with the "Conceal" highlight group.
+--- 2		Concealed text is completely hidden unless it has a
+--- 		custom replacement character defined (see
+--- 		`:syn-cchar`).
+--- 3		Concealed text is completely hidden.
+---
+--- Note: in the cursor line concealed text is not hidden, so that you can
+--- edit and copy the text.  This can be changed with the 'concealcursor'
+--- option.
+---
+--- @type integer
+vim.o.conceallevel = 0
+vim.o.cole = vim.o.conceallevel
+vim.wo.conceallevel = vim.o.conceallevel
+vim.wo.cole = vim.wo.conceallevel
+
+--- When 'confirm' is on, certain operations that would normally
+--- fail because of unsaved changes to a buffer, e.g. ":q" and ":e",
+--- instead raise a dialog asking if you wish to save the current
+--- file(s).  You can still use a ! to unconditionally `abandon` a buffer.
+--- If 'confirm' is off you can still activate confirmation for one
+--- command only (this is most useful in mappings) with the `:confirm`
+--- command.
+--- Also see the `confirm()` function and the 'v' flag in 'guioptions'.
+---
+--- @type boolean
+vim.o.confirm = false
+vim.o.cf = vim.o.confirm
+vim.go.confirm = vim.o.confirm
+vim.go.cf = vim.go.confirm
+
+--- Copy the structure of the existing lines indent when autoindenting a
+--- new line.  Normally the new indent is reconstructed by a series of
+--- tabs followed by spaces as required (unless `'expandtab'` is enabled,
+--- in which case only spaces are used).  Enabling this option makes the
+--- new line copy whatever characters were used for indenting on the
+--- existing line.  'expandtab' has no effect on these characters, a Tab
+--- remains a Tab.  If the new indent is greater than on the existing
+--- line, the remaining space is filled in the normal manner.
+--- See 'preserveindent'.
+---
+--- @type boolean
+vim.o.copyindent = false
+vim.o.ci = vim.o.copyindent
+vim.bo.copyindent = vim.o.copyindent
+vim.bo.ci = vim.bo.copyindent
+
+--- A sequence of single character flags.  When a character is present
+--- this indicates Vi-compatible behavior.  This is used for things where
+--- not being Vi-compatible is mostly or sometimes preferred.
+--- 'cpoptions' stands for "compatible-options".
+--- Commas can be added for readability.
+--- To avoid problems with flags that are added in the future, use the
+--- "+=" and "-=" feature of ":set" `add-option-flags`.
+---
+---     contains	behavior	~
+--- 							*cpo-a*
+--- 	a	When included, a ":read" command with a file name
+--- 		argument will set the alternate file name for the
+--- 		current window.
+--- 							*cpo-A*
+--- 	A	When included, a ":write" command with a file name
+--- 		argument will set the alternate file name for the
+--- 		current window.
+--- 							*cpo-b*
+--- 	b	"\|" in a ":map" command is recognized as the end of
+--- 		the map command.  The '\' is included in the mapping,
+--- 		the text after the '|' is interpreted as the next
+--- 		command.  Use a CTRL-V instead of a backslash to
+--- 		include the '|' in the mapping.  Applies to all
+--- 		mapping, abbreviation, menu and autocmd commands.
+--- 		See also `map_bar`.
+--- 							*cpo-B*
+--- 	B	A backslash has no special meaning in mappings,
+--- 		abbreviations, user commands and the "to" part of the
+--- 		menu commands.  Remove this flag to be able to use a
+--- 		backslash like a CTRL-V.  For example, the command
+--- 		":map X \\<Esc>" results in X being mapped to:
+--- 			'B' included:	"\^["	 (^[ is a real <Esc>)
+--- 			'B' excluded:	"<Esc>"  (5 characters)
+--- 							*cpo-c*
+--- 	c	Searching continues at the end of any match at the
+--- 		cursor position, but not further than the start of the
+--- 		next line.  When not present searching continues
+--- 		one character from the cursor position.  With 'c'
+--- 		"abababababab" only gets three matches when repeating
+--- 		"/abab", without 'c' there are five matches.
+--- 							*cpo-C*
+--- 	C	Do not concatenate sourced lines that start with a
+--- 		backslash.  See `line-continuation`.
+--- 							*cpo-d*
+--- 	d	Using "./" in the 'tags' option doesn't mean to use
+--- 		the tags file relative to the current file, but the
+--- 		tags file in the current directory.
+--- 							*cpo-D*
+--- 	D	Can't use CTRL-K to enter a digraph after Normal mode
+--- 		commands with a character argument, like `r`, `f` and
+--- 		`t`.
+--- 							*cpo-e*
+--- 	e	When executing a register with ":@r", always add a
+--- 		<CR> to the last line, also when the register is not
+--- 		linewise.  If this flag is not present, the register
+--- 		is not linewise and the last line does not end in a
+--- 		<CR>, then the last line is put on the command-line
+--- 		and can be edited before hitting <CR>.
+--- 							*cpo-E*
+--- 	E	It is an error when using "y", "d", "c", "g~", "gu" or
+--- 		"gU" on an Empty region.  The operators only work when
+--- 		at least one character is to be operated on.  Example:
+--- 		This makes "y0" fail in the first column.
+--- 							*cpo-f*
+--- 	f	When included, a ":read" command with a file name
+--- 		argument will set the file name for the current buffer,
+--- 		if the current buffer doesn't have a file name yet.
+--- 							*cpo-F*
+--- 	F	When included, a ":write" command with a file name
+--- 		argument will set the file name for the current
+--- 		buffer, if the current buffer doesn't have a file name
+--- 		yet.  Also see `cpo-P`.
+--- 							*cpo-i*
+--- 	i	When included, interrupting the reading of a file will
+--- 		leave it modified.
+--- 							*cpo-I*
+--- 	I	When moving the cursor up or down just after inserting
+--- 		indent for 'autoindent', do not delete the indent.
+--- 							*cpo-J*
+--- 	J	A `sentence` has to be followed by two spaces after
+--- 		the '.', '!' or '?'.  A <Tab> is not recognized as
+--- 		white space.
+--- 							*cpo-K*
+--- 	K	Don't wait for a key code to complete when it is
+--- 		halfway through a mapping.  This breaks mapping
+--- 		<F1><F1> when only part of the second <F1> has been
+--- 		read.  It enables cancelling the mapping by typing
+--- 		<F1><Esc>.
+--- 							*cpo-l*
+--- 	l	Backslash in a [] range in a search pattern is taken
+--- 		literally, only "\]", "\^", "\-" and "\\" are special.
+--- 		See `/[]`
+--- 		   'l' included: "/[ \t]"  finds <Space>, '\' and 't'
+--- 		   'l' excluded: "/[ \t]"  finds <Space> and <Tab>
+--- 							*cpo-L*
+--- 	L	When the 'list' option is set, 'wrapmargin',
+--- 		'textwidth', 'softtabstop' and Virtual Replace mode
+--- 		(see `gR`) count a <Tab> as two characters, instead of
+--- 		the normal behavior of a <Tab>.
+--- 							*cpo-m*
+--- 	m	When included, a showmatch will always wait half a
+--- 		second.  When not included, a showmatch will wait half
+--- 		a second or until a character is typed.  `'showmatch'`
+--- 							*cpo-M*
+--- 	M	When excluded, "%" matching will take backslashes into
+--- 		account.  Thus in "( \( )" and "\( ( \)" the outer
+--- 		parenthesis match.  When included "%" ignores
+--- 		backslashes, which is Vi compatible.
+--- 							*cpo-n*
+--- 	n	When included, the column used for 'number' and
+--- 		'relativenumber' will also be used for text of wrapped
+--- 		lines.
+--- 							*cpo-o*
+--- 	o	Line offset to search command is not remembered for
+--- 		next search.
+--- 							*cpo-O*
+--- 	O	Don't complain if a file is being overwritten, even
+--- 		when it didn't exist when editing it.  This is a
+--- 		protection against a file unexpectedly created by
+--- 		someone else.  Vi didn't complain about this.
+--- 							*cpo-p*
+--- 	p	Vi compatible Lisp indenting.  When not present, a
+--- 		slightly better algorithm is used.
+--- 							*cpo-P*
+--- 	P	When included, a ":write" command that appends to a
+--- 		file will set the file name for the current buffer, if
+--- 		the current buffer doesn't have a file name yet and
+--- 		the 'F' flag is also included `cpo-F`.
+--- 							*cpo-q*
+--- 	q	When joining multiple lines leave the cursor at the
+--- 		position where it would be when joining two lines.
+--- 							*cpo-r*
+--- 	r	Redo ("." command) uses "/" to repeat a search
+--- 		command, instead of the actually used search string.
+--- 							*cpo-R*
+--- 	R	Remove marks from filtered lines.  Without this flag
+--- 		marks are kept like `:keepmarks` was used.
+--- 							*cpo-s*
+--- 	s	Set buffer options when entering the buffer for the
+--- 		first time.  This is like it is in Vim version 3.0.
+--- 		And it is the default.  If not present the options are
+--- 		set when the buffer is created.
+--- 							*cpo-S*
+--- 	S	Set buffer options always when entering a buffer
+--- 		(except 'readonly', 'fileformat', 'filetype' and
+--- 		'syntax').  This is the (most) Vi compatible setting.
+--- 		The options are set to the values in the current
+--- 		buffer.  When you change an option and go to another
+--- 		buffer, the value is copied.  Effectively makes the
+--- 		buffer options global to all buffers.
+---
+--- 		's'    'S'     copy buffer options
+--- 		no     no      when buffer created
+--- 		yes    no      when buffer first entered (default)
+--- 		 X     yes     each time when buffer entered (vi comp.)
+--- 							*cpo-t*
+--- 	t	Search pattern for the tag command is remembered for
+--- 		"n" command.  Otherwise Vim only puts the pattern in
+--- 		the history for search pattern, but doesn't change the
+--- 		last used search pattern.
+--- 							*cpo-u*
+--- 	u	Undo is Vi compatible.  See `undo-two-ways`.
+--- 							*cpo-v*
+--- 	v	Backspaced characters remain visible on the screen in
+--- 		Insert mode.  Without this flag the characters are
+--- 		erased from the screen right away.  With this flag the
+--- 		screen newly typed text overwrites backspaced
+--- 		characters.
+--- 							*cpo-W*
+--- 	W	Don't overwrite a readonly file.  When omitted, ":w!"
+--- 		overwrites a readonly file, if possible.
+--- 							*cpo-x*
+--- 	x	<Esc> on the command-line executes the command-line.
+--- 		The default in Vim is to abandon the command-line,
+--- 		because <Esc> normally aborts a command.  `c_<Esc>`
+--- 							*cpo-X*
+--- 	X	When using a count with "R" the replaced text is
+--- 		deleted only once.  Also when repeating "R" with "."
+--- 		and a count.
+--- 							*cpo-y*
+--- 	y	A yank command can be redone with ".".  Think twice if
+--- 		you really want to use this, it may break some
+--- 		plugins, since most people expect "." to only repeat a
+--- 		change.
+--- 							*cpo-Z*
+--- 	Z	When using "w!" while the 'readonly' option is set,
+--- 		don't reset 'readonly'.
+--- 							*cpo-!*
+--- 	!	When redoing a filter command, use the last used
+--- 		external command, whatever it was.  Otherwise the last
+--- 		used -filter- command is used.
+--- 							*cpo-$*
+--- 	$	When making a change to one line, don't redisplay the
+--- 		line, but put a '$' at the end of the changed text.
+--- 		The changed text will be overwritten when you type the
+--- 		new text.  The line is redisplayed if you type any
+--- 		command that moves the cursor from the insertion
+--- 		point.
+--- 							*cpo-%*
+--- 	%	Vi-compatible matching is done for the "%" command.
+--- 		Does not recognize "#if", "#endif", etc.
+--- 		Does not recognize "/*" and "*/".
+--- 		Parens inside single and double quotes are also
+--- 		counted, causing a string that contains a paren to
+--- 		disturb the matching.  For example, in a line like
+--- 		"if (strcmp("foo(", s))" the first paren does not
+--- 		match the last one.  When this flag is not included,
+--- 		parens inside single and double quotes are treated
+--- 		specially.  When matching a paren outside of quotes,
+--- 		everything inside quotes is ignored.  When matching a
+--- 		paren inside quotes, it will find the matching one (if
+--- 		there is one).  This works very well for C programs.
+--- 		This flag is also used for other features, such as
+--- 		C-indenting.
+--- 							*cpo-+*
+--- 	+	When included, a ":write file" command will reset the
+--- 		'modified' flag of the buffer, even though the buffer
+--- 		itself may still be different from its file.
+--- 							*cpo->*
+--- 	>	When appending to a register, put a line break before
+--- 		the appended text.
+--- 							*cpo-;*
+--- 	;	When using `,` or `;` to repeat the last `t` search
+--- 		and the cursor is right in front of the searched
+--- 		character, the cursor won't move. When not included,
+--- 		the cursor would skip over it and jump to the
+--- 		following occurrence.
+--- 							*cpo-_*
+--- 	_	When using `cw` on a word, do not include the
+--- 		whitespace following the word in the motion.
+---
+--- @type string
+vim.o.cpoptions = "aABceFs_"
+vim.o.cpo = vim.o.cpoptions
+vim.go.cpoptions = vim.o.cpoptions
+vim.go.cpo = vim.go.cpoptions
+
+--- When this option is set, as the cursor in the current
+--- window moves other cursorbound windows (windows that also have
+--- this option set) move their cursors to the corresponding line and
+--- column.  This option is useful for viewing the
+--- differences between two versions of a file (see 'diff'); in diff mode,
+--- inserted and deleted lines (though not characters within a line) are
+--- taken into account.
+---
+--- @type boolean
+vim.o.cursorbind = false
+vim.o.crb = vim.o.cursorbind
+vim.wo.cursorbind = vim.o.cursorbind
+vim.wo.crb = vim.wo.cursorbind
+
+--- Highlight the screen column of the cursor with CursorColumn
+--- `hl-CursorColumn`.  Useful to align text.  Will make screen redrawing
+--- slower.
+--- If you only want the highlighting in the current window you can use
+--- these autocommands:
+--- ```
+--- 	au WinLeave * set nocursorline nocursorcolumn
+--- 	au WinEnter * set cursorline cursorcolumn
+--- ```
+---
+--- @type boolean
+vim.o.cursorcolumn = false
+vim.o.cuc = vim.o.cursorcolumn
+vim.wo.cursorcolumn = vim.o.cursorcolumn
+vim.wo.cuc = vim.wo.cursorcolumn
+
+--- Highlight the text line of the cursor with CursorLine `hl-CursorLine`.
+--- Useful to easily spot the cursor.  Will make screen redrawing slower.
+--- When Visual mode is active the highlighting isn't used to make it
+--- easier to see the selected text.
+---
+--- @type boolean
+vim.o.cursorline = false
+vim.o.cul = vim.o.cursorline
+vim.wo.cursorline = vim.o.cursorline
+vim.wo.cul = vim.wo.cursorline
+
+--- Comma-separated list of settings for how 'cursorline' is displayed.
+--- Valid values:
+--- "line"		Highlight the text line of the cursor with
+--- 		CursorLine `hl-CursorLine`.
+--- "screenline"	Highlight only the screen line of the cursor with
+--- 		CursorLine `hl-CursorLine`.
+--- "number"	Highlight the line number of the cursor with
+--- 		CursorLineNr `hl-CursorLineNr`.
+---
+--- Special value:
+--- "both"		Alias for the values "line,number".
+---
+--- "line" and "screenline" cannot be used together.
+---
+--- @type string
+vim.o.cursorlineopt = "both"
+vim.o.culopt = vim.o.cursorlineopt
+vim.wo.cursorlineopt = vim.o.cursorlineopt
+vim.wo.culopt = vim.wo.cursorlineopt
+
+--- These values can be used:
+--- msg	Error messages that would otherwise be omitted will be given
+--- 	anyway.
+--- throw	Error messages that would otherwise be omitted will be given
+--- 	anyway and also throw an exception and set `v:errmsg`.
+--- beep	A message will be given when otherwise only a beep would be
+--- 	produced.
+--- The values can be combined, separated by a comma.
+--- "msg" and "throw" are useful for debugging 'foldexpr', 'formatexpr' or
+--- 'indentexpr'.
+---
+--- @type string
+vim.o.debug = ""
+vim.go.debug = vim.o.debug
+
+--- Pattern to be used to find a macro definition.  It is a search
+--- pattern, just like for the "/" command.  This option is used for the
+--- commands like "[i" and "[d" `include-search`.  The 'isident' option is
+--- used to recognize the defined name after the match:
+--- ```
+--- 	{match with 'define'}{non-ID chars}{defined name}{non-ID char}
+--- ```
+--- See `option-backslash` about inserting backslashes to include a space
+--- or backslash.
+--- For C++ this value would be useful, to include const type declarations:
+--- ```
+--- 	^\(#\s*define\|[a-z]*\s*const\s*[a-z]*\)
+--- ```
+--- You can also use "\ze" just before the name and continue the pattern
+--- to check what is following.  E.g. for Javascript, if a function is
+--- defined with `func_name = function(args)`:
+--- ```
+--- 	^\s*\ze\i\+\s*=\s*function(
+--- ```
+--- If the function is defined with `func_name : function() {...`:
+--- ```
+---         ^\s*\ze\i\+\s*[:]\s*(*function\s*(
+--- ```
+--- When using the ":set" command, you need to double the backslashes!
+--- To avoid that use `:let` with a single quote string:
+--- ```
+--- 	let &l:define = '^\s*\ze\k\+\s*=\s*function('
+--- ```
+---
+--- @type string
+vim.o.define = ""
+vim.o.def = vim.o.define
+vim.bo.define = vim.o.define
+vim.bo.def = vim.bo.define
+vim.go.define = vim.o.define
+vim.go.def = vim.go.define
+
+--- If editing Unicode and this option is set, backspace and Normal mode
+--- "x" delete each combining character on its own.  When it is off (the
+--- default) the character along with its combining characters are
+--- deleted.
+--- Note: When 'delcombine' is set "xx" may work differently from "2x"!
+---
+--- This is useful for Arabic, Hebrew and many other languages where one
+--- may have combining characters overtop of base characters, and want
+--- to remove only the combining ones.
+---
+--- @type boolean
+vim.o.delcombine = false
+vim.o.deco = vim.o.delcombine
+vim.go.delcombine = vim.o.delcombine
+vim.go.deco = vim.go.delcombine
+
+--- List of file names, separated by commas, that are used to lookup words
+--- for keyword completion commands `i_CTRL-X_CTRL-K`.  Each file should
+--- contain a list of words.  This can be one word per line, or several
+--- words per line, separated by non-keyword characters (white space is
+--- preferred).  Maximum line length is 510 bytes.
+---
+--- When this option is empty or an entry "spell" is present, and spell
+--- checking is enabled, words in the word lists for the currently active
+--- 'spelllang' are used. See `spell`.
+---
+--- To include a comma in a file name precede it with a backslash.  Spaces
+--- after a comma are ignored, otherwise spaces are included in the file
+--- name.  See `option-backslash` about using backslashes.
+--- This has nothing to do with the `Dictionary` variable type.
+--- Where to find a list of words?
+--- - BSD/macOS include the "/usr/share/dict/words" file.
+--- - Try "apt install spell" to get the "/usr/share/dict/words" file on
+---   apt-managed systems (Debian/Ubuntu).
+--- The use of `:set+=` and `:set-=` is preferred when adding or removing
+--- directories from the list.  This avoids problems when a future version
+--- uses another default.
+--- Backticks cannot be used in this option for security reasons.
+---
+--- @type string
+vim.o.dictionary = ""
+vim.o.dict = vim.o.dictionary
+vim.bo.dictionary = vim.o.dictionary
+vim.bo.dict = vim.bo.dictionary
+vim.go.dictionary = vim.o.dictionary
+vim.go.dict = vim.go.dictionary
+
+--- Join the current window in the group of windows that shows differences
+--- between files.  See `diff-mode`.
+---
+--- @type boolean
+vim.o.diff = false
+vim.wo.diff = vim.o.diff
+
+--- Expression which is evaluated to obtain a diff file (either ed-style
+--- or unified-style) from two versions of a file.  See `diff-diffexpr`.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.diffexpr = ""
+vim.o.dex = vim.o.diffexpr
+vim.go.diffexpr = vim.o.diffexpr
+vim.go.dex = vim.go.diffexpr
+
+--- Option settings for diff mode.  It can consist of the following items.
+--- All are optional.  Items must be separated by a comma.
+---
+--- 	filler		Show filler lines, to keep the text
+--- 			synchronized with a window that has inserted
+--- 			lines at the same position.  Mostly useful
+--- 			when windows are side-by-side and 'scrollbind'
+--- 			is set.
+---
+--- 	context:{n}	Use a context of {n} lines between a change
+--- 			and a fold that contains unchanged lines.
+--- 			When omitted a context of six lines is used.
+--- 			When using zero the context is actually one,
+--- 			since folds require a line in between, also
+--- 			for a deleted line.
+--- 			See `fold-diff`.
+---
+--- 	iblank		Ignore changes where lines are all blank.  Adds
+--- 			the "-B" flag to the "diff" command if
+--- 			'diffexpr' is empty.  Check the documentation
+--- 			of the "diff" command for what this does
+--- 			exactly.
+--- 			NOTE: the diff windows will get out of sync,
+--- 			because no differences between blank lines are
+--- 			taken into account.
+---
+--- 	icase		Ignore changes in case of text.  "a" and "A"
+--- 			are considered the same.  Adds the "-i" flag
+--- 			to the "diff" command if 'diffexpr' is empty.
+---
+--- 	iwhite		Ignore changes in amount of white space.  Adds
+--- 			the "-b" flag to the "diff" command if
+--- 			'diffexpr' is empty.  Check the documentation
+--- 			of the "diff" command for what this does
+--- 			exactly.  It should ignore adding trailing
+--- 			white space, but not leading white space.
+---
+--- 	iwhiteall	Ignore all white space changes.  Adds
+--- 			the "-w" flag to the "diff" command if
+--- 			'diffexpr' is empty.  Check the documentation
+--- 			of the "diff" command for what this does
+--- 			exactly.
+---
+--- 	iwhiteeol	Ignore white space changes at end of line.
+--- 			Adds the "-Z" flag to the "diff" command if
+--- 			'diffexpr' is empty.  Check the documentation
+--- 			of the "diff" command for what this does
+--- 			exactly.
+---
+--- 	horizontal	Start diff mode with horizontal splits (unless
+--- 			explicitly specified otherwise).
+---
+--- 	vertical	Start diff mode with vertical splits (unless
+--- 			explicitly specified otherwise).
+---
+--- 	closeoff	When a window is closed where 'diff' is set
+--- 			and there is only one window remaining in the
+--- 			same tab page with 'diff' set, execute
+--- 			`:diffoff` in that window.  This undoes a
+--- 			`:diffsplit` command.
+---
+--- 	hiddenoff	Do not use diff mode for a buffer when it
+--- 			becomes hidden.
+---
+--- 	foldcolumn:{n}	Set the 'foldcolumn' option to {n} when
+--- 			starting diff mode.  Without this 2 is used.
+---
+--- 	followwrap	Follow the 'wrap' option and leave as it is.
+---
+--- 	internal	Use the internal diff library.  This is
+--- 			ignored when 'diffexpr' is set.  *E960*
+--- 			When running out of memory when writing a
+--- 			buffer this item will be ignored for diffs
+--- 			involving that buffer.  Set the 'verbose'
+--- 			option to see when this happens.
+---
+--- 	indent-heuristic
+--- 			Use the indent heuristic for the internal
+--- 			diff library.
+---
+--- 	linematch:{n}   Enable a second stage diff on each generated
+--- 			hunk in order to align lines. When the total
+--- 			number of lines in a hunk exceeds {n}, the
+--- 			second stage diff will not be performed as
+--- 			very large hunks can cause noticeable lag. A
+--- 			recommended setting is "linematch:60", as this
+--- 			will enable alignment for a 2 buffer diff with
+--- 			hunks of up to 30 lines each, or a 3 buffer
+--- 			diff with hunks of up to 20 lines each.
+---
+--- 	algorithm:{text} Use the specified diff algorithm with the
+--- 			internal diff engine. Currently supported
+--- 			algorithms are:
+--- 			myers      the default algorithm
+--- 			minimal    spend extra time to generate the
+--- 				   smallest possible diff
+--- 			patience   patience diff algorithm
+--- 			histogram  histogram diff algorithm
+---
+--- Examples:
+--- ```
+--- 	:set diffopt=internal,filler,context:4
+--- 	:set diffopt=
+--- 	:set diffopt=internal,filler,foldcolumn:3
+--- 	:set diffopt-=internal  " do NOT use the internal diff parser
+--- ```
+---
+--- @type string
+vim.o.diffopt = "internal,filler,closeoff"
+vim.o.dip = vim.o.diffopt
+vim.go.diffopt = vim.o.diffopt
+vim.go.dip = vim.go.diffopt
+
+--- Enable the entering of digraphs in Insert mode with {char1} <BS>
+--- {char2}.  See `digraphs`.
+---
+--- @type boolean
+vim.o.digraph = false
+vim.o.dg = vim.o.digraph
+vim.go.digraph = vim.o.digraph
+vim.go.dg = vim.go.digraph
+
+--- List of directory names for the swap file, separated with commas.
+---
+--- Possible items:
+--- - The swap file will be created in the first directory where this is
+---   possible.  If it is not possible in any directory, but last
+---   directory listed in the option does not exist, it is created.
+--- - Empty means that no swap file will be used (recovery is
+---   impossible!) and no `E303` error will be given.
+--- - A directory "." means to put the swap file in the same directory as
+---   the edited file.  On Unix, a dot is prepended to the file name, so
+---   it doesn't show in a directory listing.  On MS-Windows the "hidden"
+---   attribute is set and a dot prepended if possible.
+--- - A directory starting with "./" (or ".\" for MS-Windows) means to put
+---   the swap file relative to where the edited file is.  The leading "."
+---   is replaced with the path name of the edited file.
+--- - For Unix and Win32, if a directory ends in two path separators "//",
+---   the swap file name will be built from the complete path to the file
+---   with all path separators replaced by percent '%' signs (including
+---   the colon following the drive letter on Win32). This will ensure
+---   file name uniqueness in the preserve directory.
+---   On Win32, it is also possible to end with "\\".  However, When a
+---   separating comma is following, you must use "//", since "\\" will
+---   include the comma in the file name. Therefore it is recommended to
+---   use '//', instead of '\\'.
+--- - Spaces after the comma are ignored, other spaces are considered part
+---   of the directory name.  To have a space at the start of a directory
+---   name, precede it with a backslash.
+--- - To include a comma in a directory name precede it with a backslash.
+--- - A directory name may end in an ':' or '/'.
+--- - Environment variables are expanded `:set_env`.
+--- - Careful with '\' characters, type one before a space, type two to
+---   get one in the option (see `option-backslash`), for example:
+--- ```
+---     :set dir=c:\\tmp,\ dir\\,with\\,commas,\\\ dir\ with\ spaces
+--- ```
+--- Editing the same file twice will result in a warning.  Using "/tmp" on
+--- is discouraged: if the system crashes you lose the swap file. And
+--- others on the computer may be able to see the files.
+--- Use `:set+=` and `:set-=` when adding or removing directories from the
+--- list, this avoids problems if the Nvim default is changed.
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.directory = "$XDG_STATE_HOME/nvim/swap//"
+vim.o.dir = vim.o.directory
+vim.go.directory = vim.o.directory
+vim.go.dir = vim.go.directory
+
+--- Change the way text is displayed.  This is a comma-separated list of
+--- flags:
+--- lastline	When included, as much as possible of the last line
+--- 		in a window will be displayed.  "@@@" is put in the
+--- 		last columns of the last screen line to indicate the
+--- 		rest of the line is not displayed.
+--- truncate	Like "lastline", but "@@@" is displayed in the first
+--- 		column of the last screen line.  Overrules "lastline".
+--- uhex		Show unprintable characters hexadecimal as <xx>
+--- 		instead of using ^C and ~C.
+--- msgsep		Obsolete flag. Allowed but takes no effect. `msgsep`
+---
+--- When neither "lastline" nor "truncate" is included, a last line that
+--- doesn't fit is replaced with "@" lines.
+---
+--- The "@" character can be changed by setting the "lastline" item in
+--- 'fillchars'.  The character is highlighted with `hl-NonText`.
+---
+--- @type string
+vim.o.display = "lastline"
+vim.o.dy = vim.o.display
+vim.go.display = vim.o.display
+vim.go.dy = vim.go.display
+
+--- Tells when the 'equalalways' option applies:
+--- 	ver	vertically, width of windows is not affected
+--- 	hor	horizontally, height of windows is not affected
+--- 	both	width and height of windows is affected
+---
+--- @type string
+vim.o.eadirection = "both"
+vim.o.ead = vim.o.eadirection
+vim.go.eadirection = vim.o.eadirection
+vim.go.ead = vim.go.eadirection
+
+--- When on all Unicode emoji characters are considered to be full width.
+--- This excludes "text emoji" characters, which are normally displayed as
+--- single width.  Unfortunately there is no good specification for this
+--- and it has been determined on trial-and-error basis.  Use the
+--- `setcellwidths()` function to change the behavior.
+---
+--- @type boolean
+vim.o.emoji = true
+vim.o.emo = vim.o.emoji
+vim.go.emoji = vim.o.emoji
+vim.go.emo = vim.go.emoji
+
+--- String-encoding used internally and for `RPC` communication.
+--- Always UTF-8.
+---
+--- See 'fileencoding' to control file-content encoding.
+---
+--- @type string
+vim.o.encoding = "utf-8"
+vim.o.enc = vim.o.encoding
+vim.go.encoding = vim.o.encoding
+vim.go.enc = vim.go.encoding
+
+--- Indicates that a CTRL-Z character was found at the end of the file
+--- when reading it.  Normally only happens when 'fileformat' is "dos".
+--- When writing a file and this option is off and the 'binary' option
+--- is on, or 'fixeol' option is off, no CTRL-Z will be written at the
+--- end of the file.
+--- See `eol-and-eof` for example settings.
+---
+--- @type boolean
+vim.o.endoffile = false
+vim.o.eof = vim.o.endoffile
+vim.bo.endoffile = vim.o.endoffile
+vim.bo.eof = vim.bo.endoffile
+
+--- When writing a file and this option is off and the 'binary' option
+--- is on, or 'fixeol' option is off, no <EOL> will be written for the
+--- last line in the file.  This option is automatically set or reset when
+--- starting to edit a new file, depending on whether file has an <EOL>
+--- for the last line in the file.  Normally you don't have to set or
+--- reset this option.
+--- When 'binary' is off and 'fixeol' is on the value is not used when
+--- writing the file.  When 'binary' is on or 'fixeol' is off it is used
+--- to remember the presence of a <EOL> for the last line in the file, so
+--- that when you write the file the situation from the original file can
+--- be kept.  But you can change it if you want to.
+--- See `eol-and-eof` for example settings.
+---
+--- @type boolean
+vim.o.endofline = true
+vim.o.eol = vim.o.endofline
+vim.bo.endofline = vim.o.endofline
+vim.bo.eol = vim.bo.endofline
+
+--- When on, all the windows are automatically made the same size after
+--- splitting or closing a window.  This also happens the moment the
+--- option is switched on.  When off, splitting a window will reduce the
+--- size of the current window and leave the other windows the same.  When
+--- closing a window the extra lines are given to the window next to it
+--- (depending on 'splitbelow' and 'splitright').
+--- When mixing vertically and horizontally split windows, a minimal size
+--- is computed and some windows may be larger if there is room.  The
+--- 'eadirection' option tells in which direction the size is affected.
+--- Changing the height and width of a window can be avoided by setting
+--- 'winfixheight' and 'winfixwidth', respectively.
+--- If a window size is specified when creating a new window sizes are
+--- currently not equalized (it's complicated, but may be implemented in
+--- the future).
+---
+--- @type boolean
+vim.o.equalalways = true
+vim.o.ea = vim.o.equalalways
+vim.go.equalalways = vim.o.equalalways
+vim.go.ea = vim.go.equalalways
+
+--- External program to use for "=" command.  When this option is empty
+--- the internal formatting functions are used; either 'lisp', 'cindent'
+--- or 'indentexpr'.
+--- Environment variables are expanded `:set_env`.  See `option-backslash`
+--- about including spaces and backslashes.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.equalprg = ""
+vim.o.ep = vim.o.equalprg
+vim.bo.equalprg = vim.o.equalprg
+vim.bo.ep = vim.bo.equalprg
+vim.go.equalprg = vim.o.equalprg
+vim.go.ep = vim.go.equalprg
+
+--- Ring the bell (beep or screen flash) for error messages.  This only
+--- makes a difference for error messages, the bell will be used always
+--- for a lot of errors without a message (e.g., hitting <Esc> in Normal
+--- mode).  See 'visualbell' to make the bell behave like a screen flash
+--- or do nothing. See 'belloff' to finetune when to ring the bell.
+---
+--- @type boolean
+vim.o.errorbells = false
+vim.o.eb = vim.o.errorbells
+vim.go.errorbells = vim.o.errorbells
+vim.go.eb = vim.go.errorbells
+
+--- Name of the errorfile for the QuickFix mode (see `:cf`).
+--- When the "-q" command-line argument is used, 'errorfile' is set to the
+--- following argument.  See `-q`.
+--- NOT used for the ":make" command.  See 'makeef' for that.
+--- Environment variables are expanded `:set_env`.
+--- See `option-backslash` about including spaces and backslashes.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.errorfile = "errors.err"
+vim.o.ef = vim.o.errorfile
+vim.go.errorfile = vim.o.errorfile
+vim.go.ef = vim.go.errorfile
+
+--- Scanf-like description of the format for the lines in the error file
+--- (see `errorformat`).
+---
+--- @type string
+vim.o.errorformat = "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-Gg%\\?make[%*\\d]: *** [%f:%l:%m,%-Gg%\\?make: *** [%f:%l:%m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%-GIn file included from %f:%l:%c:,%-GIn file included from %f:%l:%c\\,,%-GIn file included from %f:%l:%c,%-GIn file included from %f:%l,%-G%*[ ]from %f:%l:%c,%-G%*[ ]from %f:%l:,%-G%*[ ]from %f:%l\\,,%-G%*[ ]from %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory %*[`']%f',%X%*\\a[%*\\d]: Leaving directory %*[`']%f',%D%*\\a: Entering directory %*[`']%f',%X%*\\a: Leaving directory %*[`']%f',%DMaking %*\\a in %f,%f|%l| %m"
+vim.o.efm = vim.o.errorformat
+vim.bo.errorformat = vim.o.errorformat
+vim.bo.efm = vim.bo.errorformat
+vim.go.errorformat = vim.o.errorformat
+vim.go.efm = vim.go.errorformat
+
+--- A list of autocommand event names, which are to be ignored.
+--- When set to "all" or when "all" is one of the items, all autocommand
+--- events are ignored, autocommands will not be executed.
+--- Otherwise this is a comma-separated list of event names.  Example:
+--- ```
+---     :set ei=WinEnter,WinLeave
+--- ```
+---
+--- @type string
+vim.o.eventignore = ""
+vim.o.ei = vim.o.eventignore
+vim.go.eventignore = vim.o.eventignore
+vim.go.ei = vim.go.eventignore
+
+--- In Insert mode: Use the appropriate number of spaces to insert a
+--- <Tab>.  Spaces are used in indents with the '>' and '<' commands and
+--- when 'autoindent' is on.  To insert a real tab when 'expandtab' is
+--- on, use CTRL-V<Tab>.  See also `:retab` and `ins-expandtab`.
+---
+--- @type boolean
+vim.o.expandtab = false
+vim.o.et = vim.o.expandtab
+vim.bo.expandtab = vim.o.expandtab
+vim.bo.et = vim.bo.expandtab
+
+--- Automatically execute .nvim.lua, .nvimrc, and .exrc files in the
+--- current directory, if the file is in the `trust` list. Use `:trust` to
+--- manage trusted files. See also `vim.secure.read()`.
+---
+--- Compare 'exrc' to `editorconfig`:
+--- - 'exrc' can execute any code; editorconfig only specifies settings.
+--- - 'exrc' is Nvim-specific; editorconfig works in other editors.
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type boolean
+vim.o.exrc = false
+vim.o.ex = vim.o.exrc
+vim.go.exrc = vim.o.exrc
+vim.go.ex = vim.go.exrc
+
+--- File-content encoding for the current buffer. Conversion is done with
+--- iconv() or as specified with 'charconvert'.
+---
+--- When 'fileencoding' is not UTF-8, conversion will be done when
+--- writing the file.  For reading see below.
+--- When 'fileencoding' is empty, the file will be saved with UTF-8
+--- encoding (no conversion when reading or writing a file).
+---
+--- WARNING: Conversion to a non-Unicode encoding can cause loss of
+--- information!
+---
+--- See `encoding-names` for the possible values.  Additionally, values may be
+--- specified that can be handled by the converter, see
+--- `mbyte-conversion`.
+---
+--- When reading a file 'fileencoding' will be set from 'fileencodings'.
+--- To read a file in a certain encoding it won't work by setting
+--- 'fileencoding', use the `++enc` argument.  One exception: when
+--- 'fileencodings' is empty the value of 'fileencoding' is used.
+--- For a new file the global value of 'fileencoding' is used.
+---
+--- Prepending "8bit-" and "2byte-" has no meaning here, they are ignored.
+--- When the option is set, the value is converted to lowercase.  Thus
+--- you can set it with uppercase values too.  '_' characters are
+--- replaced with '-'.  If a name is recognized from the list at
+--- `encoding-names`, it is replaced by the standard name.  For example
+--- "ISO8859-2" becomes "iso-8859-2".
+---
+--- When this option is set, after starting to edit a file, the 'modified'
+--- option is set, because the file would be different when written.
+---
+--- Keep in mind that changing 'fenc' from a modeline happens
+--- AFTER the text has been read, thus it applies to when the file will be
+--- written.  If you do set 'fenc' in a modeline, you might want to set
+--- 'nomodified' to avoid not being able to ":q".
+---
+--- This option cannot be changed when 'modifiable' is off.
+---
+--- @type string
+vim.o.fileencoding = ""
+vim.o.fenc = vim.o.fileencoding
+vim.bo.fileencoding = vim.o.fileencoding
+vim.bo.fenc = vim.bo.fileencoding
+
+--- This is a list of character encodings considered when starting to edit
+--- an existing file.  When a file is read, Vim tries to use the first
+--- mentioned character encoding.  If an error is detected, the next one
+--- in the list is tried.  When an encoding is found that works,
+--- 'fileencoding' is set to it.  If all fail, 'fileencoding' is set to
+--- an empty string, which means that UTF-8 is used.
+--- 	WARNING: Conversion can cause loss of information! You can use
+--- 	the `++bad` argument to specify what is done with characters
+--- 	that can't be converted.
+--- For an empty file or a file with only ASCII characters most encodings
+--- will work and the first entry of 'fileencodings' will be used (except
+--- "ucs-bom", which requires the BOM to be present).  If you prefer
+--- another encoding use an BufReadPost autocommand event to test if your
+--- preferred encoding is to be used.  Example:
+--- ```
+--- 	au BufReadPost * if search('\S', 'w') == 0 |
+--- 		\ set fenc=iso-2022-jp | endif
+--- ```
+--- This sets 'fileencoding' to "iso-2022-jp" if the file does not contain
+--- non-blank characters.
+--- When the `++enc` argument is used then the value of 'fileencodings' is
+--- not used.
+--- Note that 'fileencodings' is not used for a new file, the global value
+--- of 'fileencoding' is used instead.  You can set it with:
+--- ```
+--- 	:setglobal fenc=iso-8859-2
+--- ```
+--- This means that a non-existing file may get a different encoding than
+--- an empty file.
+--- The special value "ucs-bom" can be used to check for a Unicode BOM
+--- (Byte Order Mark) at the start of the file.  It must not be preceded
+--- by "utf-8" or another Unicode encoding for this to work properly.
+--- An entry for an 8-bit encoding (e.g., "latin1") should be the last,
+--- because Vim cannot detect an error, thus the encoding is always
+--- accepted.
+--- The special value "default" can be used for the encoding from the
+--- environment.  It is useful when your environment uses a non-latin1
+--- encoding, such as Russian.
+--- When a file contains an illegal UTF-8 byte sequence it won't be
+--- recognized as "utf-8".  You can use the `8g8` command to find the
+--- illegal byte sequence.
+--- WRONG VALUES:			WHAT'S WRONG:
+--- 	latin1,utf-8		"latin1" will always be used
+--- 	utf-8,ucs-bom,latin1	BOM won't be recognized in an utf-8
+--- 				file
+--- 	cp1250,latin1		"cp1250" will always be used
+--- If 'fileencodings' is empty, 'fileencoding' is not modified.
+--- See 'fileencoding' for the possible values.
+--- Setting this option does not have an effect until the next time a file
+--- is read.
+---
+--- @type string
+vim.o.fileencodings = "ucs-bom,utf-8,default,latin1"
+vim.o.fencs = vim.o.fileencodings
+vim.go.fileencodings = vim.o.fileencodings
+vim.go.fencs = vim.go.fileencodings
+
+--- This gives the <EOL> of the current buffer, which is used for
+--- reading/writing the buffer from/to a file:
+---     dos	    <CR><NL>
+---     unix    <NL>
+---     mac	    <CR>
+--- When "dos" is used, CTRL-Z at the end of a file is ignored.
+--- See `file-formats` and `file-read`.
+--- For the character encoding of the file see 'fileencoding'.
+--- When 'binary' is set, the value of 'fileformat' is ignored, file I/O
+--- works like it was set to "unix".
+--- This option is set automatically when starting to edit a file and
+--- 'fileformats' is not empty and 'binary' is off.
+--- When this option is set, after starting to edit a file, the 'modified'
+--- option is set, because the file would be different when written.
+--- This option cannot be changed when 'modifiable' is off.
+---
+--- @type string
+vim.o.fileformat = "unix"
+vim.o.ff = vim.o.fileformat
+vim.bo.fileformat = vim.o.fileformat
+vim.bo.ff = vim.bo.fileformat
+
+--- This gives the end-of-line (<EOL>) formats that will be tried when
+--- starting to edit a new buffer and when reading a file into an existing
+--- buffer:
+--- - When empty, the format defined with 'fileformat' will be used
+---   always.  It is not set automatically.
+--- - When set to one name, that format will be used whenever a new buffer
+---   is opened.  'fileformat' is set accordingly for that buffer.  The
+---   'fileformats' name will be used when a file is read into an existing
+---   buffer, no matter what 'fileformat' for that buffer is set to.
+--- - When more than one name is present, separated by commas, automatic
+---   <EOL> detection will be done when reading a file.  When starting to
+---   edit a file, a check is done for the <EOL>:
+---   1. If all lines end in <CR><NL>, and 'fileformats' includes "dos",
+---      'fileformat' is set to "dos".
+---   2. If a <NL> is found and 'fileformats' includes "unix", 'fileformat'
+---      is set to "unix".  Note that when a <NL> is found without a
+---      preceding <CR>, "unix" is preferred over "dos".
+---   3. If 'fileformat' has not yet been set, and if a <CR> is found, and
+---      if 'fileformats' includes "mac", 'fileformat' is set to "mac".
+---      This means that "mac" is only chosen when:
+---       "unix" is not present or no <NL> is found in the file, and
+---       "dos" is not present or no <CR><NL> is found in the file.
+---      Except: if "unix" was chosen, but there is a <CR> before
+---      the first <NL>, and there appear to be more <CR>s than <NL>s in
+---      the first few lines, "mac" is used.
+---   4. If 'fileformat' is still not set, the first name from
+---      'fileformats' is used.
+---   When reading a file into an existing buffer, the same is done, but
+---   this happens like 'fileformat' has been set appropriately for that
+---   file only, the option is not changed.
+--- When 'binary' is set, the value of 'fileformats' is not used.
+---
+--- When Vim starts up with an empty buffer the first item is used.  You
+--- can overrule this by setting 'fileformat' in your .vimrc.
+---
+--- For systems with a Dos-like <EOL> (<CR><NL>), when reading files that
+--- are ":source"ed and for vimrc files, automatic <EOL> detection may be
+--- done:
+--- - When 'fileformats' is empty, there is no automatic detection.  Dos
+---   format will be used.
+--- - When 'fileformats' is set to one or more names, automatic detection
+---   is done.  This is based on the first <NL> in the file: If there is a
+---   <CR> in front of it, Dos format is used, otherwise Unix format is
+---   used.
+--- Also see `file-formats`.
+---
+--- @type string
+vim.o.fileformats = "unix,dos"
+vim.o.ffs = vim.o.fileformats
+vim.go.fileformats = vim.o.fileformats
+vim.go.ffs = vim.go.fileformats
+
+--- When set case is ignored when using file names and directories.
+--- See 'wildignorecase' for only ignoring case when doing completion.
+---
+--- @type boolean
+vim.o.fileignorecase = false
+vim.o.fic = vim.o.fileignorecase
+vim.go.fileignorecase = vim.o.fileignorecase
+vim.go.fic = vim.go.fileignorecase
+
+--- When this option is set, the FileType autocommand event is triggered.
+--- All autocommands that match with the value of this option will be
+--- executed.  Thus the value of 'filetype' is used in place of the file
+--- name.
+--- Otherwise this option does not always reflect the current file type.
+--- This option is normally set when the file type is detected.  To enable
+--- this use the ":filetype on" command. `:filetype`
+--- Setting this option to a different value is most useful in a modeline,
+--- for a file for which the file type is not automatically recognized.
+--- Example, for in an IDL file:
+--- ```
+--- 	/* vim: set filetype=idl : */
+--- ```
+--- `FileType` `filetypes`
+--- When a dot appears in the value then this separates two filetype
+--- names.  Example:
+--- ```
+--- 	/* vim: set filetype=c.doxygen : */
+--- ```
+--- This will use the "c" filetype first, then the "doxygen" filetype.
+--- This works both for filetype plugins and for syntax files.  More than
+--- one dot may appear.
+--- This option is not copied to another buffer, independent of the 's' or
+--- 'S' flag in 'cpoptions'.
+--- Only normal file name characters can be used, `/\*?[|<>` are illegal.
+---
+--- @type string
+vim.o.filetype = ""
+vim.o.ft = vim.o.filetype
+vim.bo.filetype = vim.o.filetype
+vim.bo.ft = vim.bo.filetype
+
+--- Characters to fill the statuslines, vertical separators and special
+--- lines in the window.
+--- It is a comma-separated list of items.  Each item has a name, a colon
+--- and the value of that item:
+---
+---   item		default		Used for ~
+---   stl		' ' or '^'	statusline of the current window
+---   stlnc		' ' or '='	statusline of the non-current windows
+---   wbr		' '		window bar
+---   horiz		'─' or '-'	horizontal separators `:split`
+---   horizup	'┴' or '-'	upwards facing horizontal separator
+---   horizdown	'┬' or '-'	downwards facing horizontal separator
+---   vert		'│' or '|'	vertical separators `:vsplit`
+---   vertleft	'┤' or '|'	left facing vertical separator
+---   vertright	'├' or '|'	right facing vertical separator
+---   verthoriz	'┼' or '+'	overlapping vertical and horizontal
+--- 				separator
+---   fold		'·' or '-'	filling 'foldtext'
+---   foldopen	'-'		mark the beginning of a fold
+---   foldclose	'+'		show a closed fold
+---   foldsep	'│' or '|'      open fold middle marker
+---   diff		'-'		deleted lines of the 'diff' option
+---   msgsep	' '		message separator 'display'
+---   eob		'~'		empty lines at the end of a buffer
+---   lastline	'@'		'display' contains lastline/truncate
+---
+--- Any one that is omitted will fall back to the default.  For "stl" and
+--- "stlnc" the space will be used when there is highlighting, '^' or '='
+--- otherwise.
+---
+--- Note that "horiz", "horizup", "horizdown", "vertleft", "vertright" and
+--- "verthoriz" are only used when 'laststatus' is 3, since only vertical
+--- window separators are used otherwise.
+---
+--- If 'ambiwidth' is "double" then "horiz", "horizup", "horizdown",
+--- "vert", "vertleft", "vertright", "verthoriz", "foldsep" and "fold"
+--- default to single-byte alternatives.
+---
+--- Example:
+--- ```
+---     :set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:-
+--- ```
+--- This is similar to the default, except that these characters will also
+--- be used when there is highlighting.
+---
+--- For the "stl", "stlnc", "foldopen", "foldclose" and "foldsep" items
+--- single-byte and multibyte characters are supported.  But double-width
+--- characters are not supported.
+---
+--- The highlighting used for these items:
+---   item		highlight group ~
+---   stl		StatusLine		`hl-StatusLine`
+---   stlnc		StatusLineNC		`hl-StatusLineNC`
+---   wbr		WinBar			`hl-WinBar` or `hl-WinBarNC`
+---   horiz		WinSeparator		`hl-WinSeparator`
+---   horizup	WinSeparator		`hl-WinSeparator`
+---   horizdown	WinSeparator		`hl-WinSeparator`
+---   vert		WinSeparator		`hl-WinSeparator`
+---   vertleft	WinSeparator		`hl-WinSeparator`
+---   vertright	WinSeparator		`hl-WinSeparator`
+---   verthoriz	WinSeparator		`hl-WinSeparator`
+---   fold		Folded			`hl-Folded`
+---   diff		DiffDelete		`hl-DiffDelete`
+---   eob		EndOfBuffer		`hl-EndOfBuffer`
+---   lastline	NonText			`hl-NonText`
+---
+--- @type string
+vim.o.fillchars = ""
+vim.o.fcs = vim.o.fillchars
+vim.wo.fillchars = vim.o.fillchars
+vim.wo.fcs = vim.wo.fillchars
+vim.go.fillchars = vim.o.fillchars
+vim.go.fcs = vim.go.fillchars
+
+--- When writing a file and this option is on, <EOL> at the end of file
+--- will be restored if missing.  Turn this option off if you want to
+--- preserve the situation from the original file.
+--- When the 'binary' option is set the value of this option doesn't
+--- matter.
+--- See the 'endofline' option.
+--- See `eol-and-eof` for example settings.
+---
+--- @type boolean
+vim.o.fixendofline = true
+vim.o.fixeol = vim.o.fixendofline
+vim.bo.fixendofline = vim.o.fixendofline
+vim.bo.fixeol = vim.bo.fixendofline
+
+--- When set to "all", a fold is closed when the cursor isn't in it and
+--- its level is higher than 'foldlevel'.  Useful if you want folds to
+--- automatically close when moving out of them.
+---
+--- @type string
+vim.o.foldclose = ""
+vim.o.fcl = vim.o.foldclose
+vim.go.foldclose = vim.o.foldclose
+vim.go.fcl = vim.go.foldclose
+
+--- When and how to draw the foldcolumn. Valid values are:
+---     "auto":       resize to the minimum amount of folds to display.
+---     "auto:[1-9]": resize to accommodate multiple folds up to the
+--- 		  selected level
+---     0:            to disable foldcolumn
+---     "[1-9]":      to display a fixed number of columns
+--- See `folding`.
+---
+--- @type string
+vim.o.foldcolumn = "0"
+vim.o.fdc = vim.o.foldcolumn
+vim.wo.foldcolumn = vim.o.foldcolumn
+vim.wo.fdc = vim.wo.foldcolumn
+
+--- When off, all folds are open.  This option can be used to quickly
+--- switch between showing all text unfolded and viewing the text with
+--- folds (including manually opened or closed folds).  It can be toggled
+--- with the `zi` command.  The 'foldcolumn' will remain blank when
+--- 'foldenable' is off.
+--- This option is set by commands that create a new fold or close a fold.
+--- See `folding`.
+---
+--- @type boolean
+vim.o.foldenable = true
+vim.o.fen = vim.o.foldenable
+vim.wo.foldenable = vim.o.foldenable
+vim.wo.fen = vim.wo.foldenable
+
+--- The expression used for when 'foldmethod' is "expr".  It is evaluated
+--- for each line to obtain its fold level.  The context is set to the
+--- script where 'foldexpr' was set, script-local items can be accessed.
+--- See `fold-expr` for the usage.
+---
+--- The expression will be evaluated in the `sandbox` if set from a
+--- modeline, see `sandbox-option`.
+--- This option can't be set from a `modeline` when the 'diff' option is
+--- on or the 'modelineexpr' option is off.
+---
+--- It is not allowed to change text or jump to another window while
+--- evaluating 'foldexpr' `textlock`.
+---
+--- @type string
+vim.o.foldexpr = "0"
+vim.o.fde = vim.o.foldexpr
+vim.wo.foldexpr = vim.o.foldexpr
+vim.wo.fde = vim.wo.foldexpr
+
+--- Used only when 'foldmethod' is "indent".  Lines starting with
+--- characters in 'foldignore' will get their fold level from surrounding
+--- lines.  White space is skipped before checking for this character.
+--- The default "#" works well for C programs.  See `fold-indent`.
+---
+--- @type string
+vim.o.foldignore = "#"
+vim.o.fdi = vim.o.foldignore
+vim.wo.foldignore = vim.o.foldignore
+vim.wo.fdi = vim.wo.foldignore
+
+--- Sets the fold level: Folds with a higher level will be closed.
+--- Setting this option to zero will close all folds.  Higher numbers will
+--- close fewer folds.
+--- This option is set by commands like `zm`, `zM` and `zR`.
+--- See `fold-foldlevel`.
+---
+--- @type integer
+vim.o.foldlevel = 0
+vim.o.fdl = vim.o.foldlevel
+vim.wo.foldlevel = vim.o.foldlevel
+vim.wo.fdl = vim.wo.foldlevel
+
+--- Sets 'foldlevel' when starting to edit another buffer in a window.
+--- Useful to always start editing with all folds closed (value zero),
+--- some folds closed (one) or no folds closed (99).
+--- This is done before reading any modeline, thus a setting in a modeline
+--- overrules this option.  Starting to edit a file for `diff-mode` also
+--- ignores this option and closes all folds.
+--- It is also done before BufReadPre autocommands, to allow an autocmd to
+--- overrule the 'foldlevel' value for specific files.
+--- When the value is negative, it is not used.
+---
+--- @type integer
+vim.o.foldlevelstart = -1
+vim.o.fdls = vim.o.foldlevelstart
+vim.go.foldlevelstart = vim.o.foldlevelstart
+vim.go.fdls = vim.go.foldlevelstart
+
+--- The start and end marker used when 'foldmethod' is "marker".  There
+--- must be one comma, which separates the start and end marker.  The
+--- marker is a literal string (a regular expression would be too slow).
+--- See `fold-marker`.
+---
+--- @type string
+vim.o.foldmarker = "{{{,}}}"
+vim.o.fmr = vim.o.foldmarker
+vim.wo.foldmarker = vim.o.foldmarker
+vim.wo.fmr = vim.wo.foldmarker
+
+--- The kind of folding used for the current window.  Possible values:
+--- `fold-manual`	manual	    Folds are created manually.
+--- `fold-indent`	indent	    Lines with equal indent form a fold.
+--- `fold-expr`	expr	    'foldexpr' gives the fold level of a line.
+--- `fold-marker`	marker	    Markers are used to specify folds.
+--- `fold-syntax`	syntax	    Syntax highlighting items specify folds.
+--- `fold-diff`	diff	    Fold text that is not changed.
+---
+--- @type string
+vim.o.foldmethod = "manual"
+vim.o.fdm = vim.o.foldmethod
+vim.wo.foldmethod = vim.o.foldmethod
+vim.wo.fdm = vim.wo.foldmethod
+
+--- Sets the number of screen lines above which a fold can be displayed
+--- closed.  Also for manually closed folds.  With the default value of
+--- one a fold can only be closed if it takes up two or more screen lines.
+--- Set to zero to be able to close folds of just one screen line.
+--- Note that this only has an effect on what is displayed.  After using
+--- "zc" to close a fold, which is displayed open because it's smaller
+--- than 'foldminlines', a following "zc" may close a containing fold.
+---
+--- @type integer
+vim.o.foldminlines = 1
+vim.o.fml = vim.o.foldminlines
+vim.wo.foldminlines = vim.o.foldminlines
+vim.wo.fml = vim.wo.foldminlines
+
+--- Sets the maximum nesting of folds for the "indent" and "syntax"
+--- methods.  This avoids that too many folds will be created.  Using more
+--- than 20 doesn't work, because the internal limit is 20.
+---
+--- @type integer
+vim.o.foldnestmax = 20
+vim.o.fdn = vim.o.foldnestmax
+vim.wo.foldnestmax = vim.o.foldnestmax
+vim.wo.fdn = vim.wo.foldnestmax
+
+--- Specifies for which type of commands folds will be opened, if the
+--- command moves the cursor into a closed fold.  It is a comma-separated
+--- list of items.
+--- NOTE: When the command is part of a mapping this option is not used.
+--- Add the `zv` command to the mapping to get the same effect.
+--- (rationale: the mapping may want to control opening folds itself)
+---
+--- 	item		commands ~
+--- 	all		any
+--- 	block		(, {, [[, [{, etc.
+--- 	hor		horizontal movements: "l", "w", "fx", etc.
+--- 	insert		any command in Insert mode
+--- 	jump		far jumps: "G", "gg", etc.
+--- 	mark		jumping to a mark: "'m", CTRL-O, etc.
+--- 	percent		"%"
+--- 	quickfix	":cn", ":crew", ":make", etc.
+--- 	search		search for a pattern: "/", "n", "*", "gd", etc.
+--- 			(not for a search pattern in a ":" command)
+--- 			Also for `[s` and `]s`.
+--- 	tag		jumping to a tag: ":ta", CTRL-T, etc.
+--- 	undo		undo or redo: "u" and CTRL-R
+--- When a movement command is used for an operator (e.g., "dl" or "y%")
+--- this option is not used.  This means the operator will include the
+--- whole closed fold.
+--- Note that vertical movements are not here, because it would make it
+--- very difficult to move onto a closed fold.
+--- In insert mode the folds containing the cursor will always be open
+--- when text is inserted.
+--- To close folds you can re-apply 'foldlevel' with the `zx` command or
+--- set the 'foldclose' option to "all".
+---
+--- @type string
+vim.o.foldopen = "block,hor,mark,percent,quickfix,search,tag,undo"
+vim.o.fdo = vim.o.foldopen
+vim.go.foldopen = vim.o.foldopen
+vim.go.fdo = vim.go.foldopen
+
+--- An expression which is used to specify the text displayed for a closed
+--- fold.  The context is set to the script where 'foldexpr' was set,
+--- script-local items can be accessed.  See `fold-foldtext` for the
+--- usage.
+---
+--- The expression will be evaluated in the `sandbox` if set from a
+--- modeline, see `sandbox-option`.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- It is not allowed to change text or jump to another window while
+--- evaluating 'foldtext' `textlock`.
+---
+--- @type string
+vim.o.foldtext = "foldtext()"
+vim.o.fdt = vim.o.foldtext
+vim.wo.foldtext = vim.o.foldtext
+vim.wo.fdt = vim.wo.foldtext
+
+--- Expression which is evaluated to format a range of lines for the `gq`
+--- operator or automatic formatting (see 'formatoptions').  When this
+--- option is empty 'formatprg' is used.
+---
+--- The `v:lnum`  variable holds the first line to be formatted.
+--- The `v:count` variable holds the number of lines to be formatted.
+--- The `v:char`  variable holds the character that is going to be
+--- 	      inserted if the expression is being evaluated due to
+--- 	      automatic formatting.  This can be empty.  Don't insert
+--- 	      it yet!
+---
+--- Example:
+--- ```
+--- 	:set formatexpr=mylang#Format()
+--- ```
+--- This will invoke the mylang#Format() function in the
+--- autoload/mylang.vim file in 'runtimepath'. `autoload`
+---
+--- The expression is also evaluated when 'textwidth' is set and adding
+--- text beyond that limit.  This happens under the same conditions as
+--- when internal formatting is used.  Make sure the cursor is kept in the
+--- same spot relative to the text then!  The `mode()` function will
+--- return "i" or "R" in this situation.
+---
+--- When the expression evaluates to non-zero Vim will fall back to using
+--- the internal format mechanism.
+---
+--- If the expression starts with s: or `<SID>`, then it is replaced with
+--- the script ID (`local-function`). Example:
+--- ```
+--- 	set formatexpr=s:MyFormatExpr()
+--- 	set formatexpr=<SID>SomeFormatExpr()
+--- ```
+--- Otherwise, the expression is evaluated in the context of the script
+--- where the option was set, thus script-local items are available.
+---
+--- The expression will be evaluated in the `sandbox` when set from a
+--- modeline, see `sandbox-option`.  That stops the option from working,
+--- since changing the buffer text is not allowed.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+--- NOTE: This option is set to "" when 'compatible' is set.
+---
+--- @type string
+vim.o.formatexpr = ""
+vim.o.fex = vim.o.formatexpr
+vim.bo.formatexpr = vim.o.formatexpr
+vim.bo.fex = vim.bo.formatexpr
+
+--- A pattern that is used to recognize a list header.  This is used for
+--- the "n" flag in 'formatoptions'.
+--- The pattern must match exactly the text that will be the indent for
+--- the line below it.  You can use `/\ze` to mark the end of the match
+--- while still checking more characters.  There must be a character
+--- following the pattern, when it matches the whole line it is handled
+--- like there is no match.
+--- The default recognizes a number, followed by an optional punctuation
+--- character and white space.
+---
+--- @type string
+vim.o.formatlistpat = "^\\s*\\d\\+[\\]:.)}\\t ]\\s*"
+vim.o.flp = vim.o.formatlistpat
+vim.bo.formatlistpat = vim.o.formatlistpat
+vim.bo.flp = vim.bo.formatlistpat
+
+--- This is a sequence of letters which describes how automatic
+--- formatting is to be done.  See `fo-table`.  Commas can be inserted for
+--- readability.
+--- To avoid problems with flags that are added in the future, use the
+--- "+=" and "-=" feature of ":set" `add-option-flags`.
+---
+--- @type string
+vim.o.formatoptions = "tcqj"
+vim.o.fo = vim.o.formatoptions
+vim.bo.formatoptions = vim.o.formatoptions
+vim.bo.fo = vim.bo.formatoptions
+
+--- The name of an external program that will be used to format the lines
+--- selected with the `gq` operator.  The program must take the input on
+--- stdin and produce the output on stdout.  The Unix program "fmt" is
+--- such a program.
+--- If the 'formatexpr' option is not empty it will be used instead.
+--- Otherwise, if 'formatprg' option is an empty string, the internal
+--- format function will be used `C-indenting`.
+--- Environment variables are expanded `:set_env`.  See `option-backslash`
+--- about including spaces and backslashes.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.formatprg = ""
+vim.o.fp = vim.o.formatprg
+vim.bo.formatprg = vim.o.formatprg
+vim.bo.fp = vim.bo.formatprg
+vim.go.formatprg = vim.o.formatprg
+vim.go.fp = vim.go.formatprg
+
+--- When on, the OS function fsync() will be called after saving a file
+--- (`:write`, `writefile()`, …), `swap-file`, `undo-persistence` and `shada-file`.
+--- This flushes the file to disk, ensuring that it is safely written.
+--- Slow on some systems: writing buffers, quitting Nvim, and other
+--- operations may sometimes take a few seconds.
+---
+--- Files are ALWAYS flushed ('fsync' is ignored) when:
+--- - `CursorHold` event is triggered
+--- - `:preserve` is called
+--- - system signals low battery life
+--- - Nvim exits abnormally
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type boolean
+vim.o.fsync = false
+vim.o.fs = vim.o.fsync
+vim.go.fsync = vim.o.fsync
+vim.go.fs = vim.go.fsync
+
+--- When on, the ":substitute" flag 'g' is default on.  This means that
+--- all matches in a line are substituted instead of one.  When a 'g' flag
+--- is given to a ":substitute" command, this will toggle the substitution
+--- of all or one match.  See `complex-change`.
+---
+--- 	command		'gdefault' on	'gdefault' off	~
+--- 	:s///		  subst. all	  subst. one
+--- 	:s///g		  subst. one	  subst. all
+--- 	:s///gg		  subst. all	  subst. one
+---
+--- DEPRECATED: Setting this option may break plugins that are not aware
+--- of this option.  Also, many users get confused that adding the /g flag
+--- has the opposite effect of that it normally does.
+---
+--- @type boolean
+vim.o.gdefault = false
+vim.o.gd = vim.o.gdefault
+vim.go.gdefault = vim.o.gdefault
+vim.go.gd = vim.go.gdefault
+
+--- Format to recognize for the ":grep" command output.
+--- This is a scanf-like string that uses the same format as the
+--- 'errorformat' option: see `errorformat`.
+---
+--- @type string
+vim.o.grepformat = "%f:%l:%m,%f:%l%m,%f  %l%m"
+vim.o.gfm = vim.o.grepformat
+vim.go.grepformat = vim.o.grepformat
+vim.go.gfm = vim.go.grepformat
+
+--- Program to use for the `:grep` command.  This option may contain '%'
+--- and '#' characters, which are expanded like when used in a command-
+--- line.  The placeholder "$*" is allowed to specify where the arguments
+--- will be included.  Environment variables are expanded `:set_env`.  See
+--- `option-backslash` about including spaces and backslashes.
+--- When your "grep" accepts the "-H" argument, use this to make ":grep"
+--- also work well with a single file:
+--- ```
+--- 	:set grepprg=grep\ -nH
+--- ```
+--- Special value: When 'grepprg' is set to "internal" the `:grep` command
+--- works like `:vimgrep`, `:lgrep` like `:lvimgrep`, `:grepadd` like
+--- `:vimgrepadd` and `:lgrepadd` like `:lvimgrepadd`.
+--- See also the section `:make_makeprg`, since most of the comments there
+--- apply equally to 'grepprg'.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.grepprg = "grep -n $* /dev/null"
+vim.o.gp = vim.o.grepprg
+vim.bo.grepprg = vim.o.grepprg
+vim.bo.gp = vim.bo.grepprg
+vim.go.grepprg = vim.o.grepprg
+vim.go.gp = vim.go.grepprg
+
+--- Configures the cursor style for each mode. Works in the GUI and many
+--- terminals.  See `tui-cursor-shape`.
+---
+--- To disable cursor-styling, reset the option:
+--- ```
+--- 	:set guicursor=
+---
+--- ```
+--- To enable mode shapes, "Cursor" highlight, and blinking:
+--- ```
+--- 	:set guicursor=n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50
+--- 	  \,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor
+--- 	  \,sm:block-blinkwait175-blinkoff150-blinkon175
+---
+--- ```
+--- The option is a comma-separated list of parts.  Each part consists of a
+--- mode-list and an argument-list:
+--- 	mode-list:argument-list,mode-list:argument-list,..
+--- The mode-list is a dash separated list of these modes:
+--- 	n	Normal mode
+--- 	v	Visual mode
+--- 	ve	Visual mode with 'selection' "exclusive" (same as 'v',
+--- 		if not specified)
+--- 	o	Operator-pending mode
+--- 	i	Insert mode
+--- 	r	Replace mode
+--- 	c	Command-line Normal (append) mode
+--- 	ci	Command-line Insert mode
+--- 	cr	Command-line Replace mode
+--- 	sm	showmatch in Insert mode
+--- 	a	all modes
+--- The argument-list is a dash separated list of these arguments:
+--- 	hor{N}	horizontal bar, {N} percent of the character height
+--- 	ver{N}	vertical bar, {N} percent of the character width
+--- 	block	block cursor, fills the whole character
+--- 		- Only one of the above three should be present.
+--- 		- Default is "block" for each mode.
+--- 	blinkwait{N}				*cursor-blinking*
+--- 	blinkon{N}
+--- 	blinkoff{N}
+--- 		blink times for cursor: blinkwait is the delay before
+--- 		the cursor starts blinking, blinkon is the time that
+--- 		the cursor is shown and blinkoff is the time that the
+--- 		cursor is not shown.  Times are in msec.  When one of
+--- 		the numbers is zero, there is no blinking. E.g.:
+--- ```
+--- 			:set guicursor=n:blinkon0
+--- ```
+--- - Default is "blinkon0" for each mode.
+--- 	{group-name}
+--- 		Highlight group that decides the color and font of the
+--- 		cursor.
+--- 		In the `TUI`:
+--- 		- `inverse`/reverse and no group-name are interpreted
+--- 		  as "host-terminal default cursor colors" which
+--- 		  typically means "inverted bg and fg colors".
+--- 		- `ctermfg` and `guifg` are ignored.
+--- 	{group-name}/{group-name}
+--- 		Two highlight group names, the first is used when
+--- 		no language mappings are used, the other when they
+--- 		are. `language-mapping`
+---
+--- Examples of parts:
+---    n-c-v:block-nCursor	In Normal, Command-line and Visual mode, use a
+--- 			block cursor with colors from the "nCursor"
+--- 			highlight group
+---    n-v-c-sm:block,i-ci-ve:ver25-Cursor,r-cr-o:hor20
+--- 			In Normal et al. modes, use a block cursor
+--- 			with the default colors defined by the host
+--- 			terminal.  In Insert-likes modes, use
+--- 			a vertical bar cursor with colors from
+--- 			"Cursor" highlight group.  In Replace-likes
+--- 			modes, use a underline cursor with
+--- 			default colors.
+---    i-ci:ver30-iCursor-blinkwait300-blinkon200-blinkoff150
+--- 			In Insert and Command-line Insert mode, use a
+--- 			30% vertical bar cursor with colors from the
+--- 			"iCursor" highlight group.  Blink a bit
+--- 			faster.
+---
+--- The 'a' mode is different.  It will set the given argument-list for
+--- all modes.  It does not reset anything to defaults.  This can be used
+--- to do a common setting for all modes.  For example, to switch off
+--- blinking: "a:blinkon0"
+---
+--- Examples of cursor highlighting:
+--- ```
+---     :highlight Cursor gui=reverse guifg=NONE guibg=NONE
+---     :highlight Cursor gui=NONE guifg=bg guibg=fg
+--- ```
+---
+--- @type string
+vim.o.guicursor = "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20"
+vim.o.gcr = vim.o.guicursor
+vim.go.guicursor = vim.o.guicursor
+vim.go.gcr = vim.go.guicursor
+
+--- This is a list of fonts which will be used for the GUI version of Vim.
+--- In its simplest form the value is just one font name.  When
+--- the font cannot be found you will get an error message.  To try other
+--- font names a list can be specified, font names separated with commas.
+--- The first valid font is used.
+---
+--- Spaces after a comma are ignored.  To include a comma in a font name
+--- precede it with a backslash.  Setting an option requires an extra
+--- backslash before a space and a backslash.  See also
+--- `option-backslash`.  For example:
+--- ```
+---     :set guifont=Screen15,\ 7x13,font\\,with\\,commas
+--- ```
+--- will make Vim try to use the font "Screen15" first, and if it fails it
+--- will try to use "7x13" and then "font,with,commas" instead.
+---
+--- If none of the fonts can be loaded, Vim will keep the current setting.
+--- If an empty font list is given, Vim will try using other resource
+--- settings (for X, it will use the Vim.font resource), and finally it
+--- will try some builtin default which should always be there ("7x13" in
+--- the case of X).  The font names given should be "normal" fonts.  Vim
+--- will try to find the related bold and italic fonts.
+---
+--- For Win32 and Mac OS:
+--- ```
+---     :set guifont=*
+--- ```
+--- will bring up a font requester, where you can pick the font you want.
+---
+--- The font name depends on the GUI used.
+---
+--- For Mac OSX you can use something like this:
+--- ```
+---     :set guifont=Monaco:h10
+--- ```
+--- *E236*
+--- Note that the fonts must be mono-spaced (all characters have the same
+--- width).
+---
+--- To preview a font on X11, you might be able to use the "xfontsel"
+--- program.  The "xlsfonts" program gives a list of all available fonts.
+---
+--- For the Win32 GUI					*E244* *E245*
+--- - takes these options in the font name:
+--- 	hXX - height is XX (points, can be floating-point)
+--- 	wXX - width is XX (points, can be floating-point)
+--- 	b   - bold
+--- 	i   - italic
+--- 	u   - underline
+--- 	s   - strikeout
+--- 	cXX - character set XX.  Valid charsets are: ANSI, ARABIC,
+--- 	      BALTIC, CHINESEBIG5, DEFAULT, EASTEUROPE, GB2312, GREEK,
+--- 	      HANGEUL, HEBREW, JOHAB, MAC, OEM, RUSSIAN, SHIFTJIS,
+--- 	      SYMBOL, THAI, TURKISH, VIETNAMESE ANSI and BALTIC.
+--- 	      Normally you would use "cDEFAULT".
+---
+---   Use a ':' to separate the options.
+--- - A '_' can be used in the place of a space, so you don't need to use
+---   backslashes to escape the spaces.
+--- - Examples:
+--- ```
+---     :set guifont=courier_new:h12:w5:b:cRUSSIAN
+---     :set guifont=Andale_Mono:h7.5:w4.5
+--- ```
+---
+--- @type string
+vim.o.guifont = ""
+vim.o.gfn = vim.o.guifont
+vim.go.guifont = vim.o.guifont
+vim.go.gfn = vim.go.guifont
+
+--- Comma-separated list of fonts to be used for double-width characters.
+--- The first font that can be loaded is used.
+--- Note: The size of these fonts must be exactly twice as wide as the one
+--- specified with 'guifont' and the same height.
+---
+--- When 'guifont' has a valid font and 'guifontwide' is empty Vim will
+--- attempt to set 'guifontwide' to a matching double-width font.
+---
+--- @type string
+vim.o.guifontwide = ""
+vim.o.gfw = vim.o.guifontwide
+vim.go.guifontwide = vim.o.guifontwide
+vim.go.gfw = vim.go.guifontwide
+
+--- This option only has an effect in the GUI version of Vim.  It is a
+--- sequence of letters which describes what components and options of the
+--- GUI should be used.
+--- To avoid problems with flags that are added in the future, use the
+--- "+=" and "-=" feature of ":set" `add-option-flags`.
+---
+--- Valid letters are as follows:
+--- 						*guioptions_a* *'go-a'*
+---   'a'	Autoselect:  If present, then whenever VISUAL mode is started,
+--- 	or the Visual area extended, Vim tries to become the owner of
+--- 	the windowing system's global selection.  This means that the
+--- 	Visually highlighted text is available for pasting into other
+--- 	applications as well as into Vim itself.  When the Visual mode
+--- 	ends, possibly due to an operation on the text, or when an
+--- 	application wants to paste the selection, the highlighted text
+--- 	is automatically yanked into the "* selection register.
+--- 	Thus the selection is still available for pasting into other
+--- 	applications after the VISUAL mode has ended.
+--- 	    If not present, then Vim won't become the owner of the
+--- 	windowing system's global selection unless explicitly told to
+--- 	by a yank or delete operation for the "* register.
+--- 	The same applies to the modeless selection.
+--- 							*'go-P'*
+---   'P'	Like autoselect but using the "+ register instead of the "*
+--- 	register.
+--- 							*'go-A'*
+---   'A'	Autoselect for the modeless selection.  Like 'a', but only
+--- 	applies to the modeless selection.
+---
+--- 	    'guioptions'   autoselect Visual  autoselect modeless ~
+--- 		 ""		 -			 -
+--- 		 "a"		yes			yes
+--- 		 "A"		 -			yes
+--- 		 "aA"		yes			yes
+---
+--- 							*'go-c'*
+---   'c'	Use console dialogs instead of popup dialogs for simple
+--- 	choices.
+--- 							*'go-d'*
+---   'd'	Use dark theme variant if available.
+--- 							*'go-e'*
+---   'e'	Add tab pages when indicated with 'showtabline'.
+--- 	'guitablabel' can be used to change the text in the labels.
+--- 	When 'e' is missing a non-GUI tab pages line may be used.
+--- 	The GUI tabs are only supported on some systems, currently
+--- 	Mac OS/X and MS-Windows.
+--- 							*'go-i'*
+---   'i'	Use a Vim icon.
+--- 							*'go-m'*
+---   'm'	Menu bar is present.
+--- 							*'go-M'*
+---   'M'	The system menu "$VIMRUNTIME/menu.vim" is not sourced.  Note
+--- 	that this flag must be added in the vimrc file, before
+--- 	switching on syntax or filetype recognition (when the `gvimrc`
+--- 	file is sourced the system menu has already been loaded; the
+--- 	`:syntax on` and `:filetype on` commands load the menu too).
+--- 							*'go-g'*
+---   'g'	Grey menu items: Make menu items that are not active grey.  If
+--- 	'g' is not included inactive menu items are not shown at all.
+--- 							*'go-T'*
+---   'T'	Include Toolbar.  Currently only in Win32 GUI.
+--- 							*'go-r'*
+---   'r'	Right-hand scrollbar is always present.
+--- 							*'go-R'*
+---   'R'	Right-hand scrollbar is present when there is a vertically
+--- 	split window.
+--- 							*'go-l'*
+---   'l'	Left-hand scrollbar is always present.
+--- 							*'go-L'*
+---   'L'	Left-hand scrollbar is present when there is a vertically
+--- 	split window.
+--- 							*'go-b'*
+---   'b'	Bottom (horizontal) scrollbar is present.  Its size depends on
+--- 	the longest visible line, or on the cursor line if the 'h'
+--- 	flag is included. `gui-horiz-scroll`
+--- 							*'go-h'*
+---   'h'	Limit horizontal scrollbar size to the length of the cursor
+--- 	line.  Reduces computations. `gui-horiz-scroll`
+---
+--- And yes, you may even have scrollbars on the left AND the right if
+--- you really want to :-).  See `gui-scrollbars` for more information.
+---
+--- 							*'go-v'*
+---   'v'	Use a vertical button layout for dialogs.  When not included,
+--- 	a horizontal layout is preferred, but when it doesn't fit a
+--- 	vertical layout is used anyway.  Not supported in GTK 3.
+--- 							*'go-p'*
+---   'p'	Use Pointer callbacks for X11 GUI.  This is required for some
+--- 	window managers.  If the cursor is not blinking or hollow at
+--- 	the right moment, try adding this flag.  This must be done
+--- 	before starting the GUI.  Set it in your `gvimrc`.  Adding or
+--- 	removing it after the GUI has started has no effect.
+--- 							*'go-k'*
+---   'k'	Keep the GUI window size when adding/removing a scrollbar, or
+--- 	toolbar, tabline, etc.  Instead, the behavior is similar to
+--- 	when the window is maximized and will adjust 'lines' and
+--- 	'columns' to fit to the window.  Without the 'k' flag Vim will
+--- 	try to keep 'lines' and 'columns' the same when adding and
+--- 	removing GUI components.
+---
+--- @type string
+vim.o.guioptions = ""
+vim.o.go = vim.o.guioptions
+vim.go.guioptions = vim.o.guioptions
+vim.go.go = vim.go.guioptions
+
+--- When non-empty describes the text to use in a label of the GUI tab
+--- pages line.  When empty and when the result is empty Vim will use a
+--- default label.  See `setting-guitablabel` for more info.
+---
+--- The format of this option is like that of 'statusline'.
+--- 'guitabtooltip' is used for the tooltip, see below.
+--- The expression will be evaluated in the `sandbox` when set from a
+--- modeline, see `sandbox-option`.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- Only used when the GUI tab pages line is displayed.  'e' must be
+--- present in 'guioptions'.  For the non-GUI tab pages line 'tabline' is
+--- used.
+---
+--- @type string
+vim.o.guitablabel = ""
+vim.o.gtl = vim.o.guitablabel
+vim.go.guitablabel = vim.o.guitablabel
+vim.go.gtl = vim.go.guitablabel
+
+--- When non-empty describes the text to use in a tooltip for the GUI tab
+--- pages line.  When empty Vim will use a default tooltip.
+--- This option is otherwise just like 'guitablabel' above.
+--- You can include a line break.  Simplest method is to use `:let`:
+--- ```
+--- 	:let &guitabtooltip = "line one\nline two"
+--- ```
+---
+--- @type string
+vim.o.guitabtooltip = ""
+vim.o.gtt = vim.o.guitabtooltip
+vim.go.guitabtooltip = vim.o.guitabtooltip
+vim.go.gtt = vim.go.guitabtooltip
+
+--- Name of the main help file.  All distributed help files should be
+--- placed together in one directory.  Additionally, all "doc" directories
+--- in 'runtimepath' will be used.
+--- Environment variables are expanded `:set_env`.  For example:
+--- "$VIMRUNTIME/doc/help.txt".  If $VIMRUNTIME is not set, $VIM is also
+--- tried.  Also see `$VIMRUNTIME` and `option-backslash` about including
+--- spaces and backslashes.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.helpfile = "$VIMRUNTIME/doc/help.txt"
+vim.o.hf = vim.o.helpfile
+vim.go.helpfile = vim.o.helpfile
+vim.go.hf = vim.go.helpfile
+
+--- Minimal initial height of the help window when it is opened with the
+--- ":help" command.  The initial height of the help window is half of the
+--- current window, or (when the 'ea' option is on) the same as other
+--- windows.  When the height is less than 'helpheight', the height is
+--- set to 'helpheight'.  Set to zero to disable.
+---
+--- @type integer
+vim.o.helpheight = 20
+vim.o.hh = vim.o.helpheight
+vim.go.helpheight = vim.o.helpheight
+vim.go.hh = vim.go.helpheight
+
+--- Comma-separated list of languages.  Vim will use the first language
+--- for which the desired help can be found.  The English help will always
+--- be used as a last resort.  You can add "en" to prefer English over
+--- another language, but that will only find tags that exist in that
+--- language and not in the English help.
+--- Example:
+--- ```
+--- 	:set helplang=de,it
+--- ```
+--- This will first search German, then Italian and finally English help
+--- files.
+--- When using `CTRL-]` and ":help!" in a non-English help file Vim will
+--- try to find the tag in the current language before using this option.
+--- See `help-translated`.
+---
+--- @type string
+vim.o.helplang = ""
+vim.o.hlg = vim.o.helplang
+vim.go.helplang = vim.o.helplang
+vim.go.hlg = vim.go.helplang
+
+--- When off a buffer is unloaded (including loss of undo information)
+--- when it is `abandon`ed.  When on a buffer becomes hidden when it is
+--- `abandon`ed.  A buffer displayed in another window does not become
+--- hidden, of course.
+---
+--- Commands that move through the buffer list sometimes hide a buffer
+--- although the 'hidden' option is off when these three are true:
+--- - the buffer is modified
+--- - 'autowrite' is off or writing is not possible
+--- - the '!' flag was used
+--- Also see `windows`.
+---
+--- To hide a specific buffer use the 'bufhidden' option.
+--- 'hidden' is set for one command with ":hide {command}" `:hide`.
+---
+--- @type boolean
+vim.o.hidden = true
+vim.o.hid = vim.o.hidden
+vim.go.hidden = vim.o.hidden
+vim.go.hid = vim.go.hidden
+
+--- A history of ":" commands, and a history of previous search patterns
+--- is remembered.  This option decides how many entries may be stored in
+--- each of these histories (see `cmdline-editing`).
+--- The maximum value is 10000.
+---
+--- @type integer
+vim.o.history = 10000
+vim.o.hi = vim.o.history
+vim.go.history = vim.o.history
+vim.go.hi = vim.go.history
+
+--- When there is a previous search pattern, highlight all its matches.
+--- The `hl-Search` highlight group determines the highlighting for all
+--- matches not under the cursor while the `hl-CurSearch` highlight group
+--- (if defined) determines the highlighting for the match under the
+--- cursor. If `hl-CurSearch` is not defined, then `hl-Search` is used for
+--- both. Note that only the matching text is highlighted, any offsets
+--- are not applied.
+--- See also: 'incsearch' and `:match`.
+--- When you get bored looking at the highlighted matches, you can turn it
+--- off with `:nohlsearch`.  This does not change the option value, as
+--- soon as you use a search command, the highlighting comes back.
+--- 'redrawtime' specifies the maximum time spent on finding matches.
+--- When the search pattern can match an end-of-line, Vim will try to
+--- highlight all of the matched text.  However, this depends on where the
+--- search starts.  This will be the first line in the window or the first
+--- line below a closed fold.  A match in a previous line which is not
+--- drawn may not continue in a newly drawn line.
+--- You can specify whether the highlight status is restored on startup
+--- with the 'h' flag in 'shada' `shada-h`.
+---
+--- @type boolean
+vim.o.hlsearch = true
+vim.o.hls = vim.o.hlsearch
+vim.go.hlsearch = vim.o.hlsearch
+vim.go.hls = vim.go.hlsearch
+
+--- When on, the icon text of the window will be set to the value of
+--- 'iconstring' (if it is not empty), or to the name of the file
+--- currently being edited.  Only the last part of the name is used.
+--- Overridden by the 'iconstring' option.
+--- Only works if the terminal supports setting window icons.
+---
+--- @type boolean
+vim.o.icon = false
+vim.go.icon = vim.o.icon
+
+--- When this option is not empty, it will be used for the icon text of
+--- the window.  This happens only when the 'icon' option is on.
+--- Only works if the terminal supports setting window icon text
+--- When this option contains printf-style '%' items, they will be
+--- expanded according to the rules used for 'statusline'.  See
+--- 'titlestring' for example settings.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- @type string
+vim.o.iconstring = ""
+vim.go.iconstring = vim.o.iconstring
+
+--- Ignore case in search patterns.  Also used when searching in the tags
+--- file.
+--- Also see 'smartcase' and 'tagcase'.
+--- Can be overruled by using "\c" or "\C" in the pattern, see
+--- `/ignorecase`.
+---
+--- @type boolean
+vim.o.ignorecase = false
+vim.o.ic = vim.o.ignorecase
+vim.go.ignorecase = vim.o.ignorecase
+vim.go.ic = vim.go.ignorecase
+
+--- When set the Input Method is always on when starting to edit a command
+--- line, unless entering a search pattern (see 'imsearch' for that).
+--- Setting this option is useful when your input method allows entering
+--- English characters directly, e.g., when it's used to type accented
+--- characters with dead keys.
+---
+--- @type boolean
+vim.o.imcmdline = false
+vim.o.imc = vim.o.imcmdline
+vim.go.imcmdline = vim.o.imcmdline
+vim.go.imc = vim.go.imcmdline
+
+--- When set the Input Method is never used.  This is useful to disable
+--- the IM when it doesn't work properly.
+--- Currently this option is on by default for SGI/IRIX machines.  This
+--- may change in later releases.
+---
+--- @type boolean
+vim.o.imdisable = false
+vim.o.imd = vim.o.imdisable
+vim.go.imdisable = vim.o.imdisable
+vim.go.imd = vim.go.imdisable
+
+--- Specifies whether :lmap or an Input Method (IM) is to be used in
+--- Insert mode.  Valid values:
+--- 	0	:lmap is off and IM is off
+--- 	1	:lmap is ON and IM is off
+--- 	2	:lmap is off and IM is ON
+--- To always reset the option to zero when leaving Insert mode with <Esc>
+--- this can be used:
+--- ```
+--- 	:inoremap <ESC> <ESC>:set iminsert=0<CR>
+--- ```
+--- This makes :lmap and IM turn off automatically when leaving Insert
+--- mode.
+--- Note that this option changes when using CTRL-^ in Insert mode
+--- `i_CTRL-^`.
+--- The value is set to 1 when setting 'keymap' to a valid keymap name.
+--- It is also used for the argument of commands like "r" and "f".
+---
+--- @type integer
+vim.o.iminsert = 0
+vim.o.imi = vim.o.iminsert
+vim.bo.iminsert = vim.o.iminsert
+vim.bo.imi = vim.bo.iminsert
+
+--- Specifies whether :lmap or an Input Method (IM) is to be used when
+--- entering a search pattern.  Valid values:
+--- 	-1	the value of 'iminsert' is used, makes it look like
+--- 		'iminsert' is also used when typing a search pattern
+--- 	0	:lmap is off and IM is off
+--- 	1	:lmap is ON and IM is off
+--- 	2	:lmap is off and IM is ON
+--- Note that this option changes when using CTRL-^ in Command-line mode
+--- `c_CTRL-^`.
+--- The value is set to 1 when it is not -1 and setting the 'keymap'
+--- option to a valid keymap name.
+---
+--- @type integer
+vim.o.imsearch = -1
+vim.o.ims = vim.o.imsearch
+vim.bo.imsearch = vim.o.imsearch
+vim.bo.ims = vim.bo.imsearch
+
+--- When nonempty, shows the effects of `:substitute`, `:smagic|,
+--- |:snomagic` and user commands with the `:command-preview` flag as you
+--- type.
+---
+--- Possible values:
+--- 	nosplit	Shows the effects of a command incrementally in the
+--- 		buffer.
+--- 	split	Like "nosplit", but also shows partial off-screen
+--- 		results in a preview window.
+---
+--- If the preview for built-in commands is too slow (exceeds
+--- 'redrawtime') then 'inccommand' is automatically disabled until
+--- `Command-line-mode` is done.
+---
+--- @type string
+vim.o.inccommand = "nosplit"
+vim.o.icm = vim.o.inccommand
+vim.go.inccommand = vim.o.inccommand
+vim.go.icm = vim.go.inccommand
+
+--- Pattern to be used to find an include command.  It is a search
+--- pattern, just like for the "/" command (See `pattern`).  This option
+--- is used for the commands "[i", "]I", "[d", etc.
+--- Normally the 'isfname' option is used to recognize the file name that
+--- comes after the matched pattern.  But if "\zs" appears in the pattern
+--- then the text matched from "\zs" to the end, or until "\ze" if it
+--- appears, is used as the file name.  Use this to include characters
+--- that are not in 'isfname', such as a space.  You can then use
+--- 'includeexpr' to process the matched text.
+--- See `option-backslash` about including spaces and backslashes.
+---
+--- @type string
+vim.o.include = ""
+vim.o.inc = vim.o.include
+vim.bo.include = vim.o.include
+vim.bo.inc = vim.bo.include
+vim.go.include = vim.o.include
+vim.go.inc = vim.go.include
+
+--- Expression to be used to transform the string found with the 'include'
+--- option to a file name.  Mostly useful to change "." to "/" for Java:
+--- ```
+--- 	:setlocal includeexpr=substitute(v:fname,'\\.','/','g')
+--- ```
+--- The "v:fname" variable will be set to the file name that was detected.
+--- Note the double backslash: the `:set` command first halves them, then
+--- one remains in the value, where "\." matches a dot literally.  For
+--- simple character replacements `tr()` avoids the need for escaping:
+--- ```
+--- 	:setlocal includeexpr=tr(v:fname,'.','/')
+--- ```
+--- Also used for the `gf` command if an unmodified file name can't be
+--- found.  Allows doing "gf" on the name after an 'include' statement.
+--- Also used for `<cfile>`.
+---
+--- If the expression starts with s: or `<SID>`, then it is replaced with
+--- the script ID (`local-function`). Example:
+--- ```
+--- 	setlocal includeexpr=s:MyIncludeExpr(v:fname)
+--- 	setlocal includeexpr=<SID>SomeIncludeExpr(v:fname)
+--- ```
+--- Otherwise, the expression is evaluated in the context of the script
+--- where the option was set, thus script-local items are available.
+---
+--- The expression will be evaluated in the `sandbox` when set from a
+--- modeline, see `sandbox-option`.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- It is not allowed to change text or jump to another window while
+--- evaluating 'includeexpr' `textlock`.
+---
+--- @type string
+vim.o.includeexpr = ""
+vim.o.inex = vim.o.includeexpr
+vim.bo.includeexpr = vim.o.includeexpr
+vim.bo.inex = vim.bo.includeexpr
+
+--- While typing a search command, show where the pattern, as it was typed
+--- so far, matches.  The matched string is highlighted.  If the pattern
+--- is invalid or not found, nothing is shown.  The screen will be updated
+--- often, this is only useful on fast terminals.
+--- Note that the match will be shown, but the cursor will return to its
+--- original position when no match is found and when pressing <Esc>.  You
+--- still need to finish the search command with <Enter> to move the
+--- cursor to the match.
+--- You can use the CTRL-G and CTRL-T keys to move to the next and
+--- previous match. `c_CTRL-G` `c_CTRL-T`
+--- Vim only searches for about half a second.  With a complicated
+--- pattern and/or a lot of text the match may not be found.  This is to
+--- avoid that Vim hangs while you are typing the pattern.
+--- The `hl-IncSearch` highlight group determines the highlighting.
+--- When 'hlsearch' is on, all matched strings are highlighted too while
+--- typing a search command. See also: 'hlsearch'.
+--- If you don't want to turn 'hlsearch' on, but want to highlight all
+--- matches while searching, you can turn on and off 'hlsearch' with
+--- autocmd.  Example:
+--- ```
+--- 	augroup vimrc-incsearch-highlight
+--- 	  autocmd!
+--- 	  autocmd CmdlineEnter /,\? :set hlsearch
+--- 	  autocmd CmdlineLeave /,\? :set nohlsearch
+--- 	augroup END
+--- ```
+--- CTRL-L can be used to add one character from after the current match
+--- to the command line.  If 'ignorecase' and 'smartcase' are set and the
+--- command line has no uppercase characters, the added character is
+--- converted to lowercase.
+--- CTRL-R CTRL-W can be used to add the word at the end of the current
+--- match, excluding the characters that were already typed.
+---
+--- @type boolean
+vim.o.incsearch = true
+vim.o.is = vim.o.incsearch
+vim.go.incsearch = vim.o.incsearch
+vim.go.is = vim.go.incsearch
+
+--- Expression which is evaluated to obtain the proper indent for a line.
+--- It is used when a new line is created, for the `=` operator and
+--- in Insert mode as specified with the 'indentkeys' option.
+--- When this option is not empty, it overrules the 'cindent' and
+--- 'smartindent' indenting.  When 'lisp' is set, this option is
+--- is only used when 'lispoptions' contains "expr:1".
+--- The expression is evaluated with `v:lnum` set to the line number for
+--- which the indent is to be computed.  The cursor is also in this line
+--- when the expression is evaluated (but it may be moved around).
+---
+--- If the expression starts with s: or `<SID>`, then it is replaced with
+--- the script ID (`local-function`). Example:
+--- ```
+--- 	set indentexpr=s:MyIndentExpr()
+--- 	set indentexpr=<SID>SomeIndentExpr()
+--- ```
+--- Otherwise, the expression is evaluated in the context of the script
+--- where the option was set, thus script-local items are available.
+---
+--- The expression must return the number of spaces worth of indent.  It
+--- can return "-1" to keep the current indent (this means 'autoindent' is
+--- used for the indent).
+--- Functions useful for computing the indent are `indent()`, `cindent()`
+--- and `lispindent()`.
+--- The evaluation of the expression must not have side effects!  It must
+--- not change the text, jump to another window, etc.  Afterwards the
+--- cursor position is always restored, thus the cursor may be moved.
+--- Normally this option would be set to call a function:
+--- ```
+--- 	:set indentexpr=GetMyIndent()
+--- ```
+--- Error messages will be suppressed, unless the 'debug' option contains
+--- "msg".
+--- See `indent-expression`.
+---
+--- The expression will be evaluated in the `sandbox` when set from a
+--- modeline, see `sandbox-option`.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- It is not allowed to change text or jump to another window while
+--- evaluating 'indentexpr' `textlock`.
+---
+--- @type string
+vim.o.indentexpr = ""
+vim.o.inde = vim.o.indentexpr
+vim.bo.indentexpr = vim.o.indentexpr
+vim.bo.inde = vim.bo.indentexpr
+
+--- A list of keys that, when typed in Insert mode, cause reindenting of
+--- the current line.  Only happens if 'indentexpr' isn't empty.
+--- The format is identical to 'cinkeys', see `indentkeys-format`.
+--- See `C-indenting` and `indent-expression`.
+---
+--- @type string
+vim.o.indentkeys = "0{,0},0),0],:,0#,!^F,o,O,e"
+vim.o.indk = vim.o.indentkeys
+vim.bo.indentkeys = vim.o.indentkeys
+vim.bo.indk = vim.bo.indentkeys
+
+--- When doing keyword completion in insert mode `ins-completion`, and
+--- 'ignorecase' is also on, the case of the match is adjusted depending
+--- on the typed text.  If the typed text contains a lowercase letter
+--- where the match has an upper case letter, the completed part is made
+--- lowercase.  If the typed text has no lowercase letters and the match
+--- has a lowercase letter where the typed text has an uppercase letter,
+--- and there is a letter before it, the completed part is made uppercase.
+--- With 'noinfercase' the match is used as-is.
+---
+--- @type boolean
+vim.o.infercase = false
+vim.o.inf = vim.o.infercase
+vim.bo.infercase = vim.o.infercase
+vim.bo.inf = vim.bo.infercase
+
+--- The characters specified by this option are included in file names and
+--- path names.  Filenames are used for commands like "gf", "[i" and in
+--- the tags file.  It is also used for "\f" in a `pattern`.
+--- Multi-byte characters 256 and above are always included, only the
+--- characters up to 255 are specified with this option.
+--- For UTF-8 the characters 0xa0 to 0xff are included as well.
+--- Think twice before adding white space to this option.  Although a
+--- space may appear inside a file name, the effect will be that Vim
+--- doesn't know where a file name starts or ends when doing completion.
+--- It most likely works better without a space in 'isfname'.
+---
+--- Note that on systems using a backslash as path separator, Vim tries to
+--- do its best to make it work as you would expect.  That is a bit
+--- tricky, since Vi originally used the backslash to escape special
+--- characters.  Vim will not remove a backslash in front of a normal file
+--- name character on these systems, but it will on Unix and alikes.  The
+--- '&' and '^' are not included by default, because these are special for
+--- cmd.exe.
+---
+--- The format of this option is a list of parts, separated with commas.
+--- Each part can be a single character number or a range.  A range is two
+--- character numbers with '-' in between.  A character number can be a
+--- decimal number between 0 and 255 or the ASCII character itself (does
+--- not work for digits).  Example:
+--- 	"_,-,128-140,#-43"	(include '_' and '-' and the range
+--- 				128 to 140 and '#' to 43)
+--- If a part starts with '^', the following character number or range
+--- will be excluded from the option.  The option is interpreted from left
+--- to right.  Put the excluded character after the range where it is
+--- included.  To include '^' itself use it as the last character of the
+--- option or the end of a range.  Example:
+--- 	"^a-z,#,^"	(exclude 'a' to 'z', include '#' and '^')
+--- If the character is '@', all characters where isalpha() returns TRUE
+--- are included.  Normally these are the characters a to z and A to Z,
+--- plus accented characters.  To include '@' itself use "@-@".  Examples:
+--- 	"@,^a-z"	All alphabetic characters, excluding lower
+--- 			case ASCII letters.
+--- 	"a-z,A-Z,@-@"	All letters plus the '@' character.
+--- A comma can be included by using it where a character number is
+--- expected.  Example:
+--- 	"48-57,,,_"	Digits, comma and underscore.
+--- A comma can be excluded by prepending a '^'.  Example:
+--- 	" -~,^,,9"	All characters from space to '~', excluding
+--- 			comma, plus <Tab>.
+--- See `option-backslash` about including spaces and backslashes.
+---
+--- @type string
+vim.o.isfname = "@,48-57,/,.,-,_,+,,,#,$,%,~,="
+vim.o.isf = vim.o.isfname
+vim.go.isfname = vim.o.isfname
+vim.go.isf = vim.go.isfname
+
+--- The characters given by this option are included in identifiers.
+--- Identifiers are used in recognizing environment variables and after a
+--- match of the 'define' option.  It is also used for "\i" in a
+--- `pattern`.  See 'isfname' for a description of the format of this
+--- option.  For '@' only characters up to 255 are used.
+--- Careful: If you change this option, it might break expanding
+--- environment variables.  E.g., when '/' is included and Vim tries to
+--- expand "$HOME/.local/state/nvim/shada/main.shada".  Maybe you should
+--- change 'iskeyword' instead.
+---
+--- @type string
+vim.o.isident = "@,48-57,_,192-255"
+vim.o.isi = vim.o.isident
+vim.go.isident = vim.o.isident
+vim.go.isi = vim.go.isident
+
+--- Keywords are used in searching and recognizing with many commands:
+--- "w", "*", "[i", etc.  It is also used for "\k" in a `pattern`.  See
+--- 'isfname' for a description of the format of this option.  For '@'
+--- characters above 255 check the "word" character class (any character
+--- that is not white space or punctuation).
+--- For C programs you could use "a-z,A-Z,48-57,_,.,-,>".
+--- For a help file it is set to all non-blank printable characters except
+--- "*", '"' and '|' (so that CTRL-] on a command finds the help for that
+--- command).
+--- When the 'lisp' option is on the '-' character is always included.
+--- This option also influences syntax highlighting, unless the syntax
+--- uses `:syn-iskeyword`.
+---
+--- @type string
+vim.o.iskeyword = "@,48-57,_,192-255"
+vim.o.isk = vim.o.iskeyword
+vim.bo.iskeyword = vim.o.iskeyword
+vim.bo.isk = vim.bo.iskeyword
+
+--- The characters given by this option are displayed directly on the
+--- screen.  It is also used for "\p" in a `pattern`.  The characters from
+--- space (ASCII 32) to '~' (ASCII 126) are always displayed directly,
+--- even when they are not included in 'isprint' or excluded.  See
+--- 'isfname' for a description of the format of this option.
+---
+--- Non-printable characters are displayed with two characters:
+--- 	  0 -  31	"^@" - "^_"
+--- 	 32 - 126	always single characters
+--- 	   127		"^?"
+--- 	128 - 159	"~@" - "~_"
+--- 	160 - 254	"| " - "|~"
+--- 	   255		"~?"
+--- Illegal bytes from 128 to 255 (invalid UTF-8) are
+--- displayed as <xx>, with the hexadecimal value of the byte.
+--- When 'display' contains "uhex" all unprintable characters are
+--- displayed as <xx>.
+--- The SpecialKey highlighting will be used for unprintable characters.
+--- `hl-SpecialKey`
+---
+--- Multi-byte characters 256 and above are always included, only the
+--- characters up to 255 are specified with this option.  When a character
+--- is printable but it is not available in the current font, a
+--- replacement character will be shown.
+--- Unprintable and zero-width Unicode characters are displayed as <xxxx>.
+--- There is no option to specify these characters.
+---
+--- @type string
+vim.o.isprint = "@,161-255"
+vim.o.isp = vim.o.isprint
+vim.go.isprint = vim.o.isprint
+vim.go.isp = vim.go.isprint
+
+--- Insert two spaces after a '.', '?' and '!' with a join command.
+--- Otherwise only one space is inserted.
+---
+--- @type boolean
+vim.o.joinspaces = false
+vim.o.js = vim.o.joinspaces
+vim.go.joinspaces = vim.o.joinspaces
+vim.go.js = vim.go.joinspaces
+
+--- List of words that change the behavior of the `jumplist`.
+---   stack         Make the jumplist behave like the tagstack or like a
+---                 web browser.  Relative location of entries in the
+--- 		jumplist is preserved at the cost of discarding
+--- 		subsequent entries when navigating backwards in the
+--- 		jumplist and then jumping to a location.
+--- 		`jumplist-stack`
+---
+---   view          When moving through the jumplist, `changelist|,
+--- 		|alternate-file` or using `mark-motions` try to
+--- 		restore the `mark-view` in which the action occurred.
+---
+--- @type string
+vim.o.jumpoptions = ""
+vim.o.jop = vim.o.jumpoptions
+vim.go.jumpoptions = vim.o.jumpoptions
+vim.go.jop = vim.go.jumpoptions
+
+--- Name of a keyboard mapping.  See `mbyte-keymap`.
+--- Setting this option to a valid keymap name has the side effect of
+--- setting 'iminsert' to one, so that the keymap becomes effective.
+--- 'imsearch' is also set to one, unless it was -1
+--- Only normal file name characters can be used, `/\*?[|<>` are illegal.
+---
+--- @type string
+vim.o.keymap = ""
+vim.o.kmp = vim.o.keymap
+vim.bo.keymap = vim.o.keymap
+vim.bo.kmp = vim.bo.keymap
+
+--- List of comma-separated words, which enable special things that keys
+--- can do.  These values can be used:
+---    startsel	Using a shifted special key starts selection (either
+--- 		Select mode or Visual mode, depending on "key" being
+--- 		present in 'selectmode').
+---    stopsel	Using a not-shifted special key stops selection.
+--- Special keys in this context are the cursor keys, <End>, <Home>,
+--- <PageUp> and <PageDown>.
+---
+--- @type string
+vim.o.keymodel = ""
+vim.o.km = vim.o.keymodel
+vim.go.keymodel = vim.o.keymodel
+vim.go.km = vim.go.keymodel
+
+--- Program to use for the `K` command.  Environment variables are
+--- expanded `:set_env`.  ":help" may be used to access the Vim internal
+--- help.  (Note that previously setting the global option to the empty
+--- value did this, which is now deprecated.)
+--- When the first character is ":", the command is invoked as a Vim
+--- Ex command prefixed with [count].
+--- When "man" or "man -s" is used, Vim will automatically translate
+--- a [count] for the "K" command to a section number.
+--- See `option-backslash` about including spaces and backslashes.
+--- Example:
+--- ```
+--- 	:set keywordprg=man\ -s
+--- 	:set keywordprg=:Man
+--- ```
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.keywordprg = ":Man"
+vim.o.kp = vim.o.keywordprg
+vim.bo.keywordprg = vim.o.keywordprg
+vim.bo.kp = vim.bo.keywordprg
+vim.go.keywordprg = vim.o.keywordprg
+vim.go.kp = vim.go.keywordprg
+
+--- This option allows switching your keyboard into a special language
+--- mode.  When you are typing text in Insert mode the characters are
+--- inserted directly.  When in Normal mode the 'langmap' option takes
+--- care of translating these special characters to the original meaning
+--- of the key.  This means you don't have to change the keyboard mode to
+--- be able to execute Normal mode commands.
+--- This is the opposite of the 'keymap' option, where characters are
+--- mapped in Insert mode.
+--- Also consider setting 'langremap' to off, to prevent 'langmap' from
+--- applying to characters resulting from a mapping.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- Example (for Greek, in UTF-8):				*greek*
+--- ```
+---     :set langmap=ΑA,ΒB,ΨC,ΔD,ΕE,ΦF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,ΠP,QQ,ΡR,ΣS,ΤT,ΘU,ΩV,WW,ΧX,ΥY,ΖZ,αa,βb,ψc,δd,εe,φf,γg,ηh,ιi,ξj,κk,λl,μm,νn,οo,πp,qq,ρr,σs,τt,θu,ωv,ςw,χx,υy,ζz
+--- ```
+--- Example (exchanges meaning of z and y for commands):
+--- ```
+---     :set langmap=zy,yz,ZY,YZ
+--- ```
+--- The 'langmap' option is a list of parts, separated with commas.  Each
+--- part can be in one of two forms:
+--- 1.  A list of pairs.  Each pair is a "from" character immediately
+---     followed by the "to" character.  Examples: "aA", "aAbBcC".
+--- 2.  A list of "from" characters, a semi-colon and a list of "to"
+---     characters.  Example: "abc;ABC"
+--- Example: "aA,fgh;FGH,cCdDeE"
+--- Special characters need to be preceded with a backslash.  These are
+--- ";", ',', '"', '|' and backslash itself.
+---
+--- This will allow you to activate vim actions without having to switch
+--- back and forth between the languages.  Your language characters will
+--- be understood as normal vim English characters (according to the
+--- langmap mappings) in the following cases:
+---  o Normal/Visual mode (commands, buffer/register names, user mappings)
+---  o Insert/Replace Mode: Register names after CTRL-R
+---  o Insert/Replace Mode: Mappings
+--- Characters entered in Command-line mode will NOT be affected by
+--- this option.   Note that this option can be changed at any time
+--- allowing to switch between mappings for different languages/encodings.
+--- Use a mapping to avoid having to type it each time!
+---
+--- @type string
+vim.o.langmap = ""
+vim.o.lmap = vim.o.langmap
+vim.go.langmap = vim.o.langmap
+vim.go.lmap = vim.go.langmap
+
+--- Language to use for menu translation.  Tells which file is loaded
+--- from the "lang" directory in 'runtimepath':
+--- ```
+--- 	"lang/menu_" .. &langmenu .. ".vim"
+--- ```
+--- (without the spaces).  For example, to always use the Dutch menus, no
+--- matter what $LANG is set to:
+--- ```
+--- 	:set langmenu=nl_NL.ISO_8859-1
+--- ```
+--- When 'langmenu' is empty, `v:lang` is used.
+--- Only normal file name characters can be used, `/\*?[|<>` are illegal.
+--- If your $LANG is set to a non-English language but you do want to use
+--- the English menus:
+--- ```
+--- 	:set langmenu=none
+--- ```
+--- This option must be set before loading menus, switching on filetype
+--- detection or syntax highlighting.  Once the menus are defined setting
+--- this option has no effect.  But you could do this:
+--- ```
+--- 	:source $VIMRUNTIME/delmenu.vim
+--- 	:set langmenu=de_DE.ISO_8859-1
+--- 	:source $VIMRUNTIME/menu.vim
+--- ```
+--- Warning: This deletes all menus that you defined yourself!
+---
+--- @type string
+vim.o.langmenu = ""
+vim.o.lm = vim.o.langmenu
+vim.go.langmenu = vim.o.langmenu
+vim.go.lm = vim.go.langmenu
+
+--- When off, setting 'langmap' does not apply to characters resulting from
+--- a mapping.  If setting 'langmap' disables some of your mappings, make
+--- sure this option is off.
+---
+--- @type boolean
+vim.o.langremap = false
+vim.o.lrm = vim.o.langremap
+vim.go.langremap = vim.o.langremap
+vim.go.lrm = vim.go.langremap
+
+--- The value of this option influences when the last window will have a
+--- status line:
+--- 	0: never
+--- 	1: only if there are at least two windows
+--- 	2: always
+--- 	3: always and ONLY the last window
+--- The screen looks nicer with a status line if you have several
+--- windows, but it takes another screen line. `status-line`
+---
+--- @type integer
+vim.o.laststatus = 2
+vim.o.ls = vim.o.laststatus
+vim.go.laststatus = vim.o.laststatus
+vim.go.ls = vim.go.laststatus
+
+--- When this option is set, the screen will not be redrawn while
+--- executing macros, registers and other commands that have not been
+--- typed.  Also, updating the window title is postponed.  To force an
+--- update use `:redraw`.
+--- This may occasionally cause display errors.  It is only meant to be set
+--- temporarily when performing an operation where redrawing may cause
+--- flickering or cause a slow down.
+---
+--- @type boolean
+vim.o.lazyredraw = false
+vim.o.lz = vim.o.lazyredraw
+vim.go.lazyredraw = vim.o.lazyredraw
+vim.go.lz = vim.go.lazyredraw
+
+--- If on, Vim will wrap long lines at a character in 'breakat' rather
+--- than at the last character that fits on the screen.  Unlike
+--- 'wrapmargin' and 'textwidth', this does not insert <EOL>s in the file,
+--- it only affects the way the file is displayed, not its contents.
+--- If 'breakindent' is set, line is visually indented. Then, the value
+--- of 'showbreak' is used to put in front of wrapped lines. This option
+--- is not used when the 'wrap' option is off.
+--- Note that <Tab> characters after an <EOL> are mostly not displayed
+--- with the right amount of white space.
+---
+--- @type boolean
+vim.o.linebreak = false
+vim.o.lbr = vim.o.linebreak
+vim.wo.linebreak = vim.o.linebreak
+vim.wo.lbr = vim.wo.linebreak
+
+--- Number of lines of the Vim window.
+--- Normally you don't need to set this.  It is done automatically by the
+--- terminal initialization code.
+--- When Vim is running in the GUI or in a resizable window, setting this
+--- option will cause the window size to be changed.  When you only want
+--- to use the size for the GUI, put the command in your `gvimrc` file.
+--- Vim limits the number of lines to what fits on the screen.  You can
+--- use this command to get the tallest window possible:
+--- ```
+--- 	:set lines=999
+--- ```
+--- Minimum value is 2, maximum value is 1000.
+---
+--- @type integer
+vim.o.lines = 24
+vim.go.lines = vim.o.lines
+
+--- 		only in the GUI
+--- Number of pixel lines inserted between characters.  Useful if the font
+--- uses the full character cell height, making lines touch each other.
+--- When non-zero there is room for underlining.
+--- With some fonts there can be too much room between lines (to have
+--- space for ascents and descents).  Then it makes sense to set
+--- 'linespace' to a negative value.  This may cause display problems
+--- though!
+---
+--- @type integer
+vim.o.linespace = 0
+vim.o.lsp = vim.o.linespace
+vim.go.linespace = vim.o.linespace
+vim.go.lsp = vim.go.linespace
+
+--- Lisp mode: When <Enter> is typed in insert mode set the indent for
+--- the next line to Lisp standards (well, sort of).  Also happens with
+--- "cc" or "S".  'autoindent' must also be on for this to work.  The 'p'
+--- flag in 'cpoptions' changes the method of indenting: Vi compatible or
+--- better.  Also see 'lispwords'.
+--- The '-' character is included in keyword characters.  Redefines the
+--- "=" operator to use this same indentation algorithm rather than
+--- calling an external program if 'equalprg' is empty.
+---
+--- @type boolean
+vim.o.lisp = false
+vim.bo.lisp = vim.o.lisp
+
+--- Comma-separated list of items that influence the Lisp indenting when
+--- enabled with the `'lisp'` option.  Currently only one item is
+--- supported:
+--- 	expr:1	use 'indentexpr' for Lisp indenting when it is set
+--- 	expr:0	do not use 'indentexpr' for Lisp indenting (default)
+--- Note that when using 'indentexpr' the `=` operator indents all the
+--- lines, otherwise the first line is not indented (Vi-compatible).
+---
+--- @type string
+vim.o.lispoptions = ""
+vim.o.lop = vim.o.lispoptions
+vim.bo.lispoptions = vim.o.lispoptions
+vim.bo.lop = vim.bo.lispoptions
+
+--- Comma-separated list of words that influence the Lisp indenting when
+--- enabled with the `'lisp'` option.
+---
+--- @type string
+vim.o.lispwords = "defun,define,defmacro,set!,lambda,if,case,let,flet,let*,letrec,do,do*,define-syntax,let-syntax,letrec-syntax,destructuring-bind,defpackage,defparameter,defstruct,deftype,defvar,do-all-symbols,do-external-symbols,do-symbols,dolist,dotimes,ecase,etypecase,eval-when,labels,macrolet,multiple-value-bind,multiple-value-call,multiple-value-prog1,multiple-value-setq,prog1,progv,typecase,unless,unwind-protect,when,with-input-from-string,with-open-file,with-open-stream,with-output-to-string,with-package-iterator,define-condition,handler-bind,handler-case,restart-bind,restart-case,with-simple-restart,store-value,use-value,muffle-warning,abort,continue,with-slots,with-slots*,with-accessors,with-accessors*,defclass,defmethod,print-unreadable-object"
+vim.o.lw = vim.o.lispwords
+vim.bo.lispwords = vim.o.lispwords
+vim.bo.lw = vim.bo.lispwords
+vim.go.lispwords = vim.o.lispwords
+vim.go.lw = vim.go.lispwords
+
+--- List mode: By default, show tabs as ">", trailing spaces as "-", and
+--- non-breakable space characters as "+". Useful to see the difference
+--- between tabs and spaces and for trailing blanks. Further changed by
+--- the 'listchars' option.
+---
+--- The cursor is displayed at the start of the space a Tab character
+--- occupies, not at the end as usual in Normal mode.  To get this cursor
+--- position while displaying Tabs with spaces, use:
+--- ```
+--- 	:set list lcs=tab:\ \
+--- ```
+--- Note that list mode will also affect formatting (set with 'textwidth'
+--- or 'wrapmargin') when 'cpoptions' includes 'L'.  See 'listchars' for
+--- changing the way tabs are displayed.
+---
+--- @type boolean
+vim.o.list = false
+vim.wo.list = vim.o.list
+
+--- Strings to use in 'list' mode and for the `:list` command.  It is a
+--- comma-separated list of string settings.
+---
+--- 						*lcs-eol*
+---   eol:c		Character to show at the end of each line.  When
+--- 		omitted, there is no extra character at the end of the
+--- 		line.
+--- 						*lcs-tab*
+---   tab:xy[z]	Two or three characters to be used to show a tab.
+--- 		The third character is optional.
+---
+---   tab:xy	The 'x' is always used, then 'y' as many times as will
+--- 		fit.  Thus "tab:>-" displays:
+--- ```
+---
+--- ```
+--- 			>-
+--- 			>--
+--- 			etc.
+--- ```
+---   tab:xyz	The 'z' is always used, then 'x' is prepended, and
+--- 		then 'y' is used as many times as will fit.  Thus
+--- 		"tab:<->" displays:
+--- ```
+---
+--- ```
+--- 			<>
+--- 			<->
+--- 			<-->
+--- 			etc.
+--- ```
+--- 		When "tab:" is omitted, a tab is shown as ^I.
+--- 						*lcs-space*
+---   space:c	Character to show for a space.  When omitted, spaces
+--- 		are left blank.
+--- 						*lcs-multispace*
+---   multispace:c...
+--- 		One or more characters to use cyclically to show for
+--- 		multiple consecutive spaces.  Overrides the "space"
+--- 		setting, except for single spaces.  When omitted, the
+--- 		"space" setting is used.  For example,
+--- 		`:set listchars=multispace:---+` shows ten consecutive
+--- 		spaces as:
+--- ```
+--- 			---+---+--
+--- ```
+--- 						*lcs-lead*
+---   lead:c	Character to show for leading spaces.  When omitted,
+--- 		leading spaces are blank.  Overrides the "space" and
+--- 		"multispace" settings for leading spaces.  You can
+--- 		combine it with "tab:", for example:
+--- ```
+--- 			:set listchars+=tab:>-,lead:.
+--- ```
+--- 						*lcs-leadmultispace*
+---   leadmultispace:c...
+--- 		Like the `lcs-multispace` value, but for leading
+--- 		spaces only.  Also overrides `lcs-lead` for leading
+--- 		multiple spaces.
+--- 		`:set listchars=leadmultispace:---+` shows ten
+--- 		consecutive leading spaces as:
+--- ```
+--- 			---+---+--XXX
+--- ```
+--- 		Where "XXX" denotes the first non-blank characters in
+--- 		the line.
+--- 						*lcs-trail*
+---   trail:c	Character to show for trailing spaces.  When omitted,
+--- 		trailing spaces are blank.  Overrides the "space" and
+--- 		"multispace" settings for trailing spaces.
+--- 						*lcs-extends*
+---   extends:c	Character to show in the last column, when 'wrap' is
+--- 		off and the line continues beyond the right of the
+--- 		screen.
+--- 						*lcs-precedes*
+---   precedes:c	Character to show in the first visible column of the
+--- 		physical line, when there is text preceding the
+--- 		character visible in the first column.
+--- 						*lcs-conceal*
+---   conceal:c	Character to show in place of concealed text, when
+--- 		'conceallevel' is set to 1.  A space when omitted.
+--- 						*lcs-nbsp*
+---   nbsp:c	Character to show for a non-breakable space character
+--- 		(0xA0 (160 decimal) and U+202F).  Left blank when
+--- 		omitted.
+---
+--- The characters ':' and ',' should not be used.  UTF-8 characters can
+--- be used.  All characters must be single width.
+---
+--- Each character can be specified as hex:
+--- ```
+--- 	set listchars=eol:\\x24
+--- 	set listchars=eol:\\u21b5
+--- 	set listchars=eol:\\U000021b5
+--- ```
+--- Note that a double backslash is used.  The number of hex characters
+--- must be exactly 2 for \\x, 4 for \\u and 8 for \\U.
+---
+--- Examples:
+--- ```
+---     :set lcs=tab:>-,trail:-
+---     :set lcs=tab:>-,eol:<,nbsp:%
+---     :set lcs=extends:>,precedes:<
+--- ```
+--- `hl-NonText` highlighting will be used for "eol", "extends" and
+--- "precedes". `hl-Whitespace` for "nbsp", "space", "tab", "multispace",
+--- "lead" and "trail".
+---
+--- @type string
+vim.o.listchars = "tab:> ,trail:-,nbsp:+"
+vim.o.lcs = vim.o.listchars
+vim.wo.listchars = vim.o.listchars
+vim.wo.lcs = vim.wo.listchars
+vim.go.listchars = vim.o.listchars
+vim.go.lcs = vim.go.listchars
+
+--- When on the plugin scripts are loaded when starting up `load-plugins`.
+--- This option can be reset in your `vimrc` file to disable the loading
+--- of plugins.
+--- Note that using the "-u NONE" and "--noplugin" command line arguments
+--- reset this option. `-u` `--noplugin`
+---
+--- @type boolean
+vim.o.loadplugins = true
+vim.o.lpl = vim.o.loadplugins
+vim.go.loadplugins = vim.o.loadplugins
+vim.go.lpl = vim.go.loadplugins
+
+--- Changes the special characters that can be used in search patterns.
+--- See `pattern`.
+--- WARNING: Switching this option off most likely breaks plugins!  That
+--- is because many patterns assume it's on and will fail when it's off.
+--- Only switch it off when working with old Vi scripts.  In any other
+--- situation write patterns that work when 'magic' is on.  Include "\M"
+--- when you want to `/\M`.
+---
+--- @type boolean
+vim.o.magic = true
+vim.go.magic = vim.o.magic
+
+--- Name of the errorfile for the `:make` command (see `:make_makeprg`)
+--- and the `:grep` command.
+--- When it is empty, an internally generated temp file will be used.
+--- When "##" is included, it is replaced by a number to make the name
+--- unique.  This makes sure that the ":make" command doesn't overwrite an
+--- existing file.
+--- NOT used for the ":cf" command.  See 'errorfile' for that.
+--- Environment variables are expanded `:set_env`.
+--- See `option-backslash` about including spaces and backslashes.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.makeef = ""
+vim.o.mef = vim.o.makeef
+vim.go.makeef = vim.o.makeef
+vim.go.mef = vim.go.makeef
+
+--- Encoding used for reading the output of external commands.  When empty,
+--- encoding is not converted.
+--- This is used for `:make`, `:lmake`, `:grep`, `:lgrep`, `:grepadd`,
+--- `:lgrepadd`, `:cfile`, `:cgetfile`, `:caddfile`, `:lfile`, `:lgetfile`,
+--- and `:laddfile`.
+---
+--- This would be mostly useful when you use MS-Windows.  If iconv is
+--- enabled, setting 'makeencoding' to "char" has the same effect as
+--- setting to the system locale encoding.  Example:
+--- ```
+--- 	:set makeencoding=char	" system locale is used
+--- ```
+---
+--- @type string
+vim.o.makeencoding = ""
+vim.o.menc = vim.o.makeencoding
+vim.bo.makeencoding = vim.o.makeencoding
+vim.bo.menc = vim.bo.makeencoding
+vim.go.makeencoding = vim.o.makeencoding
+vim.go.menc = vim.go.makeencoding
+
+--- Program to use for the ":make" command.  See `:make_makeprg`.
+--- This option may contain '%' and '#' characters (see  `:_%` and `:_#`),
+--- which are expanded to the current and alternate file name.  Use `::S`
+--- to escape file names in case they contain special characters.
+--- Environment variables are expanded `:set_env`.  See `option-backslash`
+--- about including spaces and backslashes.
+--- Note that a '|' must be escaped twice: once for ":set" and once for
+--- the interpretation of a command.  When you use a filter called
+--- "myfilter" do it like this:
+--- ```
+---     :set makeprg=gmake\ \\\|\ myfilter
+--- ```
+--- The placeholder "$*" can be given (even multiple times) to specify
+--- where the arguments will be included, for example:
+--- ```
+---     :set makeprg=latex\ \\\\nonstopmode\ \\\\input\\{$*}
+--- ```
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.makeprg = "make"
+vim.o.mp = vim.o.makeprg
+vim.bo.makeprg = vim.o.makeprg
+vim.bo.mp = vim.bo.makeprg
+vim.go.makeprg = vim.o.makeprg
+vim.go.mp = vim.go.makeprg
+
+--- Characters that form pairs.  The `%` command jumps from one to the
+--- other.
+--- Only character pairs are allowed that are different, thus you cannot
+--- jump between two double quotes.
+--- The characters must be separated by a colon.
+--- The pairs must be separated by a comma.  Example for including '<' and
+--- '>' (for HTML):
+--- ```
+--- 	:set mps+=<:>
+---
+--- ```
+--- A more exotic example, to jump between the '=' and ';' in an
+--- assignment, useful for languages like C and Java:
+--- ```
+--- 	:au FileType c,cpp,java set mps+==:;
+---
+--- ```
+--- For a more advanced way of using "%", see the matchit.vim plugin in
+--- the $VIMRUNTIME/plugin directory. `add-local-help`
+---
+--- @type string
+vim.o.matchpairs = "(:),{:},[:]"
+vim.o.mps = vim.o.matchpairs
+vim.bo.matchpairs = vim.o.matchpairs
+vim.bo.mps = vim.bo.matchpairs
+
+--- Tenths of a second to show the matching paren, when 'showmatch' is
+--- set.  Note that this is not in milliseconds, like other options that
+--- set a time.  This is to be compatible with Nvi.
+---
+--- @type integer
+vim.o.matchtime = 5
+vim.o.mat = vim.o.matchtime
+vim.go.matchtime = vim.o.matchtime
+vim.go.mat = vim.go.matchtime
+
+--- Maximum depth of function calls for user functions.  This normally
+--- catches endless recursion.  When using a recursive function with
+--- more depth, set 'maxfuncdepth' to a bigger number.  But this will use
+--- more memory, there is the danger of failing when memory is exhausted.
+--- Increasing this limit above 200 also changes the maximum for Ex
+--- command recursion, see `E169`.
+--- See also `:function`.
+---
+--- @type integer
+vim.o.maxfuncdepth = 100
+vim.o.mfd = vim.o.maxfuncdepth
+vim.go.maxfuncdepth = vim.o.maxfuncdepth
+vim.go.mfd = vim.go.maxfuncdepth
+
+--- Maximum number of times a mapping is done without resulting in a
+--- character to be used.  This normally catches endless mappings, like
+--- ":map x y" with ":map y x".  It still does not catch ":map g wg",
+--- because the 'w' is used before the next mapping is done.  See also
+--- `key-mapping`.
+---
+--- @type integer
+vim.o.maxmapdepth = 1000
+vim.o.mmd = vim.o.maxmapdepth
+vim.go.maxmapdepth = vim.o.maxmapdepth
+vim.go.mmd = vim.go.maxmapdepth
+
+--- Maximum amount of memory (in Kbyte) to use for pattern matching.
+--- The maximum value is about 2000000.  Use this to work without a limit.
+--- 						*E363*
+--- When Vim runs into the limit it gives an error message and mostly
+--- behaves like CTRL-C was typed.
+--- Running into the limit often means that the pattern is very
+--- inefficient or too complex.  This may already happen with the pattern
+--- "\(.\)*" on a very long line.  ".*" works much better.
+--- Might also happen on redraw, when syntax rules try to match a complex
+--- text structure.
+--- Vim may run out of memory before hitting the 'maxmempattern' limit, in
+--- which case you get an "Out of memory" error instead.
+---
+--- @type integer
+vim.o.maxmempattern = 1000
+vim.o.mmp = vim.o.maxmempattern
+vim.go.maxmempattern = vim.o.maxmempattern
+vim.go.mmp = vim.go.maxmempattern
+
+--- Maximum number of items to use in a menu.  Used for menus that are
+--- generated from a list of items, e.g., the Buffers menu.  Changing this
+--- option has no direct effect, the menu must be refreshed first.
+---
+--- @type integer
+vim.o.menuitems = 25
+vim.o.mis = vim.o.menuitems
+vim.go.menuitems = vim.o.menuitems
+vim.go.mis = vim.go.menuitems
+
+--- Parameters for `:mkspell`.  This tunes when to start compressing the
+--- word tree.  Compression can be slow when there are many words, but
+--- it's needed to avoid running out of memory.  The amount of memory used
+--- per word depends very much on how similar the words are, that's why
+--- this tuning is complicated.
+---
+--- There are three numbers, separated by commas:
+--- ```
+--- 	{start},{inc},{added}
+--- ```
+--- For most languages the uncompressed word tree fits in memory.  {start}
+--- gives the amount of memory in Kbyte that can be used before any
+--- compression is done.  It should be a bit smaller than the amount of
+--- memory that is available to Vim.
+---
+--- When going over the {start} limit the {inc} number specifies the
+--- amount of memory in Kbyte that can be allocated before another
+--- compression is done.  A low number means compression is done after
+--- less words are added, which is slow.  A high number means more memory
+--- will be allocated.
+---
+--- After doing compression, {added} times 1024 words can be added before
+--- the {inc} limit is ignored and compression is done when any extra
+--- amount of memory is needed.  A low number means there is a smaller
+--- chance of hitting the {inc} limit, less memory is used but it's
+--- slower.
+---
+--- The languages for which these numbers are important are Italian and
+--- Hungarian.  The default works for when you have about 512 Mbyte.  If
+--- you have 1 Gbyte you could use:
+--- ```
+--- 	:set mkspellmem=900000,3000,800
+--- ```
+--- If you have less than 512 Mbyte `:mkspell` may fail for some
+--- languages, no matter what you set 'mkspellmem' to.
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`.
+---
+--- @type string
+vim.o.mkspellmem = "460000,2000,500"
+vim.o.msm = vim.o.mkspellmem
+vim.go.mkspellmem = vim.o.mkspellmem
+vim.go.msm = vim.go.mkspellmem
+
+--- If 'modeline' is on 'modelines' gives the number of lines that is
+--- checked for set commands.  If 'modeline' is off or 'modelines' is zero
+--- no lines are checked.  See `modeline`.
+---
+--- @type boolean
+vim.o.modeline = true
+vim.o.ml = vim.o.modeline
+vim.bo.modeline = vim.o.modeline
+vim.bo.ml = vim.bo.modeline
+
+--- When on allow some options that are an expression to be set in the
+--- modeline.  Check the option for whether it is affected by
+--- 'modelineexpr'.  Also see `modeline`.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type boolean
+vim.o.modelineexpr = false
+vim.o.mle = vim.o.modelineexpr
+vim.go.modelineexpr = vim.o.modelineexpr
+vim.go.mle = vim.go.modelineexpr
+
+--- If 'modeline' is on 'modelines' gives the number of lines that is
+--- checked for set commands.  If 'modeline' is off or 'modelines' is zero
+--- no lines are checked.  See `modeline`.
+---
+---
+--- @type integer
+vim.o.modelines = 5
+vim.o.mls = vim.o.modelines
+vim.go.modelines = vim.o.modelines
+vim.go.mls = vim.go.modelines
+
+--- When off the buffer contents cannot be changed.  The 'fileformat' and
+--- 'fileencoding' options also can't be changed.
+--- Can be reset on startup with the `-M` command line argument.
+---
+--- @type boolean
+vim.o.modifiable = true
+vim.o.ma = vim.o.modifiable
+vim.bo.modifiable = vim.o.modifiable
+vim.bo.ma = vim.bo.modifiable
+
+--- When on, the buffer is considered to be modified.  This option is set
+--- when:
+--- 1. A change was made to the text since it was last written.  Using the
+---    `undo` command to go back to the original text will reset the
+---    option.  But undoing changes that were made before writing the
+---    buffer will set the option again, since the text is different from
+---    when it was written.
+--- 2. 'fileformat' or 'fileencoding' is different from its original
+---    value.  The original value is set when the buffer is read or
+---    written.  A ":set nomodified" command also resets the original
+---    values to the current values and the 'modified' option will be
+---    reset.
+---    Similarly for 'eol' and 'bomb'.
+--- This option is not set when a change is made to the buffer as the
+--- result of a BufNewFile, BufRead/BufReadPost, BufWritePost,
+--- FileAppendPost or VimLeave autocommand event.  See `gzip-example` for
+--- an explanation.
+--- When 'buftype' is "nowrite" or "nofile" this option may be set, but
+--- will be ignored.
+--- Note that the text may actually be the same, e.g. 'modified' is set
+--- when using "rA" on an "A".
+---
+--- @type boolean
+vim.o.modified = false
+vim.o.mod = vim.o.modified
+vim.bo.modified = vim.o.modified
+vim.bo.mod = vim.bo.modified
+
+--- When on, listings pause when the whole screen is filled.  You will get
+--- the `more-prompt`.  When this option is off there are no pauses, the
+--- listing continues until finished.
+---
+--- @type boolean
+vim.o.more = true
+vim.go.more = vim.o.more
+
+--- Enables mouse support. For example, to enable the mouse in Normal mode
+--- and Visual mode:
+--- ```
+--- 	:set mouse=nv
+--- ```
+--- To temporarily disable mouse support, hold the shift key while using
+--- the mouse.
+---
+--- Mouse support can be enabled for different modes:
+--- 	n	Normal mode
+--- 	v	Visual mode
+--- 	i	Insert mode
+--- 	c	Command-line mode
+--- 	h	all previous modes when editing a help file
+--- 	a	all previous modes
+--- 	r	for `hit-enter` and `more-prompt` prompt
+---
+--- Left-click anywhere in a text buffer to place the cursor there.  This
+--- works with operators too, e.g. type `d` then left-click to delete text
+--- from the current cursor position to the position where you clicked.
+---
+--- Drag the `status-line` or vertical separator of a window to resize it.
+---
+--- If enabled for "v" (Visual mode) then double-click selects word-wise,
+--- triple-click makes it line-wise, and quadruple-click makes it
+--- rectangular block-wise.
+---
+--- For scrolling with a mouse wheel see `scroll-mouse-wheel`.
+---
+--- Note: When enabling the mouse in a terminal, copy/paste will use the
+--- "* register if possible. See also 'clipboard'.
+---
+--- Related options:
+--- 'mousefocus'	window focus follows mouse pointer
+--- 'mousemodel'	what mouse button does which action
+--- 'mousehide'	hide mouse pointer while typing text
+--- 'selectmode'	whether to start Select mode or Visual mode
+---
+--- @type string
+vim.o.mouse = "nvi"
+vim.go.mouse = vim.o.mouse
+
+--- The window that the mouse pointer is on is automatically activated.
+--- When changing the window layout or window focus in another way, the
+--- mouse pointer is moved to the window with keyboard focus.  Off is the
+--- default because it makes using the pull down menus a little goofy, as
+--- a pointer transit may activate a window unintentionally.
+---
+--- @type boolean
+vim.o.mousefocus = false
+vim.o.mousef = vim.o.mousefocus
+vim.go.mousefocus = vim.o.mousefocus
+vim.go.mousef = vim.go.mousefocus
+
+--- 		only in the GUI
+--- When on, the mouse pointer is hidden when characters are typed.
+--- The mouse pointer is restored when the mouse is moved.
+---
+--- @type boolean
+vim.o.mousehide = true
+vim.o.mh = vim.o.mousehide
+vim.go.mousehide = vim.o.mousehide
+vim.go.mh = vim.go.mousehide
+
+--- Sets the model to use for the mouse.  The name mostly specifies what
+--- the right mouse button is used for:
+---    extend	Right mouse button extends a selection.  This works
+--- 		like in an xterm.
+---    popup	Right mouse button pops up a menu.  The shifted left
+--- 		mouse button extends a selection.  This works like
+--- 		with Microsoft Windows.
+---    popup_setpos Like "popup", but the cursor will be moved to the
+--- 		position where the mouse was clicked, and thus the
+--- 		selected operation will act upon the clicked object.
+--- 		If clicking inside a selection, that selection will
+--- 		be acted upon, i.e. no cursor move.  This implies of
+--- 		course, that right clicking outside a selection will
+--- 		end Visual mode.
+--- Overview of what button does what for each model:
+--- mouse		    extend		popup(_setpos) ~
+--- left click	    place cursor	place cursor
+--- left drag	    start selection	start selection
+--- shift-left	    search word		extend selection
+--- right click	    extend selection	popup menu (place cursor)
+--- right drag	    extend selection	-
+--- middle click	    paste		paste
+---
+--- In the "popup" model the right mouse button produces a pop-up menu.
+--- Nvim creates a default `popup-menu` but you can redefine it.
+---
+--- Note that you can further refine the meaning of buttons with mappings.
+--- See `mouse-overview`.  But mappings are NOT used for modeless selection.
+---
+--- Example:
+--- ```
+---    :map <S-LeftMouse>     <RightMouse>
+---    :map <S-LeftDrag>      <RightDrag>
+---    :map <S-LeftRelease>   <RightRelease>
+---    :map <2-S-LeftMouse>   <2-RightMouse>
+---    :map <2-S-LeftDrag>    <2-RightDrag>
+---    :map <2-S-LeftRelease> <2-RightRelease>
+---    :map <3-S-LeftMouse>   <3-RightMouse>
+---    :map <3-S-LeftDrag>    <3-RightDrag>
+---    :map <3-S-LeftRelease> <3-RightRelease>
+---    :map <4-S-LeftMouse>   <4-RightMouse>
+---    :map <4-S-LeftDrag>    <4-RightDrag>
+---    :map <4-S-LeftRelease> <4-RightRelease>
+--- ```
+--- Mouse commands requiring the CTRL modifier can be simulated by typing
+--- the "g" key before using the mouse:
+---     "g<LeftMouse>"  is "<C-LeftMouse>	(jump to tag under mouse click)
+---     "g<RightMouse>" is "<C-RightMouse>	("CTRL-T")
+---
+--- @type string
+vim.o.mousemodel = "popup_setpos"
+vim.o.mousem = vim.o.mousemodel
+vim.go.mousemodel = vim.o.mousemodel
+vim.go.mousem = vim.go.mousemodel
+
+--- When on, mouse move events are delivered to the input queue and are
+--- available for mapping. The default, off, avoids the mouse movement
+--- overhead except when needed.
+--- Warning: Setting this option can make pending mappings to be aborted
+--- when the mouse is moved.
+---
+--- @type boolean
+vim.o.mousemoveevent = false
+vim.o.mousemev = vim.o.mousemoveevent
+vim.go.mousemoveevent = vim.o.mousemoveevent
+vim.go.mousemev = vim.go.mousemoveevent
+
+--- This option controls the number of lines / columns to scroll by when
+--- scrolling with a mouse. The option is a comma separated list of parts.
+--- Each part consists of a direction and a count as follows:
+--- 	direction:count,direction:count
+--- Direction is one of either "hor" or "ver". "hor" controls horizontal
+--- scrolling and "ver" controls vertical scrolling. Count sets the amount
+--- to scroll by for the given direction, it should be a non negative
+--- integer. Each direction should be set at most once. If a direction
+--- is omitted, a default value is used (6 for horizontal scrolling and 3
+--- for vertical scrolling). You can disable mouse scrolling by using
+--- a count of 0.
+---
+--- Example:
+--- ```
+--- 	:set mousescroll=ver:5,hor:2
+--- ```
+--- Will make Nvim scroll 5 lines at a time when scrolling vertically, and
+--- scroll 2 columns at a time when scrolling horizontally.
+---
+--- @type string
+vim.o.mousescroll = "ver:3,hor:6"
+vim.go.mousescroll = vim.o.mousescroll
+
+--- This option tells Vim what the mouse pointer should look like in
+--- different modes.  The option is a comma-separated list of parts, much
+--- like used for 'guicursor'.  Each part consist of a mode/location-list
+--- and an argument-list:
+--- 	mode-list:shape,mode-list:shape,..
+--- The mode-list is a dash separated list of these modes/locations:
+--- 		In a normal window: ~
+--- 	n	Normal mode
+--- 	v	Visual mode
+--- 	ve	Visual mode with 'selection' "exclusive" (same as 'v',
+--- 		if not specified)
+--- 	o	Operator-pending mode
+--- 	i	Insert mode
+--- 	r	Replace mode
+---
+--- 		Others: ~
+--- 	c	appending to the command-line
+--- 	ci	inserting in the command-line
+--- 	cr	replacing in the command-line
+--- 	m	at the 'Hit ENTER' or 'More' prompts
+--- 	ml	idem, but cursor in the last line
+--- 	e	any mode, pointer below last window
+--- 	s	any mode, pointer on a status line
+--- 	sd	any mode, while dragging a status line
+--- 	vs	any mode, pointer on a vertical separator line
+--- 	vd	any mode, while dragging a vertical separator line
+--- 	a	everywhere
+---
+--- The shape is one of the following:
+--- avail	name		looks like ~
+--- w x	arrow		Normal mouse pointer
+--- w x	blank		no pointer at all (use with care!)
+--- w x	beam		I-beam
+--- w x	updown		up-down sizing arrows
+--- w x	leftright	left-right sizing arrows
+--- w x	busy		The system's usual busy pointer
+--- w x	no		The system's usual "no input" pointer
+---   x	udsizing	indicates up-down resizing
+---   x	lrsizing	indicates left-right resizing
+---   x	crosshair	like a big thin +
+---   x	hand1		black hand
+---   x	hand2		white hand
+---   x	pencil		what you write with
+---   x	question	big ?
+---   x	rightup-arrow	arrow pointing right-up
+--- w x	up-arrow	arrow pointing up
+---   x	<number>	any X11 pointer number (see X11/cursorfont.h)
+---
+--- The "avail" column contains a 'w' if the shape is available for Win32,
+--- x for X11.
+--- Any modes not specified or shapes not available use the normal mouse
+--- pointer.
+---
+--- Example:
+--- ```
+--- 	:set mouseshape=s:udsizing,m:no
+--- ```
+--- will make the mouse turn to a sizing arrow over the status lines and
+--- indicate no input when the hit-enter prompt is displayed (since
+--- clicking the mouse has no effect in this state.)
+---
+--- @type string
+vim.o.mouseshape = ""
+vim.o.mouses = vim.o.mouseshape
+vim.go.mouseshape = vim.o.mouseshape
+vim.go.mouses = vim.go.mouseshape
+
+--- Defines the maximum time in msec between two mouse clicks for the
+--- second click to be recognized as a multi click.
+---
+--- @type integer
+vim.o.mousetime = 500
+vim.o.mouset = vim.o.mousetime
+vim.go.mousetime = vim.o.mousetime
+vim.go.mouset = vim.go.mousetime
+
+--- This defines what bases Vim will consider for numbers when using the
+--- CTRL-A and CTRL-X commands for adding to and subtracting from a number
+--- respectively; see `CTRL-A` for more info on these commands.
+--- alpha	If included, single alphabetical characters will be
+--- 	incremented or decremented.  This is useful for a list with a
+--- 	letter index a), b), etc.		*octal-nrformats*
+--- octal	If included, numbers that start with a zero will be considered
+--- 	to be octal.  Example: Using CTRL-A on "007" results in "010".
+--- hex	If included, numbers starting with "0x" or "0X" will be
+--- 	considered to be hexadecimal.  Example: Using CTRL-X on
+--- 	"0x100" results in "0x0ff".
+--- bin	If included, numbers starting with "0b" or "0B" will be
+--- 	considered to be binary.  Example: Using CTRL-X on
+--- 	"0b1000" subtracts one, resulting in "0b0111".
+--- unsigned    If included, numbers are recognized as unsigned. Thus a
+--- 	leading dash or negative sign won't be considered as part of
+--- 	the number.  Examples:
+--- 	    Using CTRL-X on "2020" in "9-2020" results in "9-2019"
+--- 	    (without "unsigned" it would become "9-2021").
+--- 	    Using CTRL-A on "2020" in "9-2020" results in "9-2021"
+--- 	    (without "unsigned" it would become "9-2019").
+--- 	    Using CTRL-X on "0" or CTRL-A on "18446744073709551615"
+--- 	    (2^64 - 1) has no effect, overflow is prevented.
+--- Numbers which simply begin with a digit in the range 1-9 are always
+--- considered decimal.  This also happens for numbers that are not
+--- recognized as octal or hex.
+---
+--- @type string
+vim.o.nrformats = "bin,hex"
+vim.o.nf = vim.o.nrformats
+vim.bo.nrformats = vim.o.nrformats
+vim.bo.nf = vim.bo.nrformats
+
+--- Print the line number in front of each line.  When the 'n' option is
+--- excluded from 'cpoptions' a wrapped line will not use the column of
+--- line numbers.
+--- Use the 'numberwidth' option to adjust the room for the line number.
+--- When a long, wrapped line doesn't start with the first character, '-'
+--- characters are put before the number.
+--- For highlighting see `hl-LineNr`, `hl-CursorLineNr`, and the
+--- `:sign-define` "numhl" argument.
+--- 					*number_relativenumber*
+--- The 'relativenumber' option changes the displayed number to be
+--- relative to the cursor.  Together with 'number' there are these
+--- four combinations (cursor in line 3):
+---
+--- 	'nonu'          'nu'            'nonu'          'nu'
+--- 	'nornu'         'nornu'         'rnu'           'rnu'
+--- ```
+---     |apple          |  1 apple      |  2 apple      |  2 apple
+---     |pear           |  2 pear       |  1 pear       |  1 pear
+---     |nobody         |  3 nobody     |  0 nobody     |3   nobody
+---     |there          |  4 there      |  1 there      |  1 there
+--- ```
+---
+--- @type boolean
+vim.o.number = false
+vim.o.nu = vim.o.number
+vim.wo.number = vim.o.number
+vim.wo.nu = vim.wo.number
+
+--- Minimal number of columns to use for the line number.  Only relevant
+--- when the 'number' or 'relativenumber' option is set or printing lines
+--- with a line number. Since one space is always between the number and
+--- the text, there is one less character for the number itself.
+--- The value is the minimum width.  A bigger width is used when needed to
+--- fit the highest line number in the buffer respectively the number of
+--- rows in the window, depending on whether 'number' or 'relativenumber'
+--- is set. Thus with the Vim default of 4 there is room for a line number
+--- up to 999. When the buffer has 1000 lines five columns will be used.
+--- The minimum value is 1, the maximum value is 20.
+---
+--- @type integer
+vim.o.numberwidth = 4
+vim.o.nuw = vim.o.numberwidth
+vim.wo.numberwidth = vim.o.numberwidth
+vim.wo.nuw = vim.wo.numberwidth
+
+--- This option specifies a function to be used for Insert mode omni
+--- completion with CTRL-X CTRL-O. `i_CTRL-X_CTRL-O`
+--- See `complete-functions` for an explanation of how the function is
+--- invoked and what it should return.  The value can be the name of a
+--- function, a `lambda` or a `Funcref`. See `option-value-function` for
+--- more information.
+--- This option is usually set by a filetype plugin:
+--- `:filetype-plugin-on`
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.omnifunc = ""
+vim.o.ofu = vim.o.omnifunc
+vim.bo.omnifunc = vim.o.omnifunc
+vim.bo.ofu = vim.bo.omnifunc
+
+--- 		only for Windows
+--- Enable reading and writing from devices.  This may get Vim stuck on a
+--- device that can be opened but doesn't actually do the I/O.  Therefore
+--- it is off by default.
+--- Note that on Windows editing "aux.h", "lpt1.txt" and the like also
+--- result in editing a device.
+---
+--- @type boolean
+vim.o.opendevice = false
+vim.o.odev = vim.o.opendevice
+vim.go.opendevice = vim.o.opendevice
+vim.go.odev = vim.go.opendevice
+
+--- This option specifies a function to be called by the `g@` operator.
+--- See `:map-operator` for more info and an example.  The value can be
+--- the name of a function, a `lambda` or a `Funcref`. See
+--- `option-value-function` for more information.
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.operatorfunc = ""
+vim.o.opfunc = vim.o.operatorfunc
+vim.go.operatorfunc = vim.o.operatorfunc
+vim.go.opfunc = vim.go.operatorfunc
+
+--- Directories used to find packages.
+--- See `packages` and `packages-runtimepath`.
+---
+--- @type string
+vim.o.packpath = "..."
+vim.o.pp = vim.o.packpath
+vim.go.packpath = vim.o.packpath
+vim.go.pp = vim.go.packpath
+
+--- Specifies the nroff macros that separate paragraphs.  These are pairs
+--- of two letters (see `object-motions`).
+---
+--- @type string
+vim.o.paragraphs = "IPLPPPQPP TPHPLIPpLpItpplpipbp"
+vim.o.para = vim.o.paragraphs
+vim.go.paragraphs = vim.o.paragraphs
+vim.go.para = vim.go.paragraphs
+
+--- Expression which is evaluated to apply a patch to a file and generate
+--- the resulting new version of the file.  See `diff-patchexpr`.
+---
+--- @type string
+vim.o.patchexpr = ""
+vim.o.pex = vim.o.patchexpr
+vim.go.patchexpr = vim.o.patchexpr
+vim.go.pex = vim.go.patchexpr
+
+--- When non-empty the oldest version of a file is kept.  This can be used
+--- to keep the original version of a file if you are changing files in a
+--- source distribution.  Only the first time that a file is written a
+--- copy of the original file will be kept.  The name of the copy is the
+--- name of the original file with the string in the 'patchmode' option
+--- appended.  This option should start with a dot.  Use a string like
+--- ".orig" or ".org".  'backupdir' must not be empty for this to work
+--- (Detail: The backup file is renamed to the patchmode file after the
+--- new file has been successfully written, that's why it must be possible
+--- to write a backup file).  If there was no file to be backed up, an
+--- empty file is created.
+--- When the 'backupskip' pattern matches, a patchmode file is not made.
+--- Using 'patchmode' for compressed files appends the extension at the
+--- end (e.g., "file.gz.orig"), thus the resulting name isn't always
+--- recognized as a compressed file.
+--- Only normal file name characters can be used, `/\*?[|<>` are illegal.
+---
+--- @type string
+vim.o.patchmode = ""
+vim.o.pm = vim.o.patchmode
+vim.go.patchmode = vim.o.patchmode
+vim.go.pm = vim.go.patchmode
+
+--- This is a list of directories which will be searched when using the
+--- `gf`, [f, ]f, ^Wf, `:find`, `:sfind`, `:tabfind` and other commands,
+--- provided that the file being searched for has a relative path (not
+--- starting with "/", "./" or "../").  The directories in the 'path'
+--- option may be relative or absolute.
+--- - Use commas to separate directory names:
+--- ```
+--- 	:set path=.,/usr/local/include,/usr/include
+--- ```
+--- - To include a comma in a directory name precede it with an extra
+---   backslash:
+--- ```
+--- 	:set path=.,/dir/with\\,comma
+--- ```
+--- - To search relative to the directory of the current file, use:
+--- ```
+--- 	:set path=.
+--- ```
+--- - To search in the current directory use an empty string between two
+---   commas:
+--- ```
+--- 	:set path=,,
+--- ```
+--- - A directory name may end in a ':' or '/'.
+--- - Environment variables are expanded `:set_env`.
+--- - When using `netrw.vim` URLs can be used.  For example, adding
+---   "https://www.vim.org" will make ":find index.html" work.
+--- - Search upwards and downwards in a directory tree using "*", "**" and
+---   ";".  See `file-searching` for info and syntax.
+--- - Careful with '\' characters, type two to get one in the option:
+--- ```
+--- 	:set path=.,c:\\include
+--- ```
+--- Or just use '/' instead:
+--- ```
+--- 	:set path=.,c:/include
+--- ```
+--- Don't forget "." or files won't even be found in the same directory as
+--- the file!
+--- The maximum length is limited.  How much depends on the system, mostly
+--- it is something like 256 or 1024 characters.
+--- You can check if all the include files are found, using the value of
+--- 'path', see `:checkpath`.
+--- The use of `:set+=` and `:set-=` is preferred when adding or removing
+--- directories from the list.  This avoids problems when a future version
+--- uses another default.  To remove the current directory use:
+--- ```
+--- 	:set path-=
+--- ```
+--- To add the current directory use:
+--- ```
+--- 	:set path+=
+--- ```
+--- To use an environment variable, you probably need to replace the
+--- separator.  Here is an example to append $INCL, in which directory
+--- names are separated with a semi-colon:
+--- ```
+--- 	:let &path = &path .. "," .. substitute($INCL, ';', ',', 'g')
+--- ```
+--- Replace the ';' with a ':' or whatever separator is used.  Note that
+--- this doesn't work when $INCL contains a comma or white space.
+---
+--- @type string
+vim.o.path = ".,,"
+vim.o.pa = vim.o.path
+vim.bo.path = vim.o.path
+vim.bo.pa = vim.bo.path
+vim.go.path = vim.o.path
+vim.go.pa = vim.go.path
+
+--- When changing the indent of the current line, preserve as much of the
+--- indent structure as possible.  Normally the indent is replaced by a
+--- series of tabs followed by spaces as required (unless `'expandtab'` is
+--- enabled, in which case only spaces are used).  Enabling this option
+--- means the indent will preserve as many existing characters as possible
+--- for indenting, and only add additional tabs or spaces as required.
+--- 'expandtab' does not apply to the preserved white space, a Tab remains
+--- a Tab.
+--- NOTE: When using ">>" multiple times the resulting indent is a mix of
+--- tabs and spaces.  You might not like this.
+--- Also see 'copyindent'.
+--- Use `:retab` to clean up white space.
+---
+--- @type boolean
+vim.o.preserveindent = false
+vim.o.pi = vim.o.preserveindent
+vim.bo.preserveindent = vim.o.preserveindent
+vim.bo.pi = vim.bo.preserveindent
+
+--- Default height for a preview window.  Used for `:ptag` and associated
+--- commands.  Used for `CTRL-W_}` when no count is given.
+---
+--- @type integer
+vim.o.previewheight = 12
+vim.o.pvh = vim.o.previewheight
+vim.go.previewheight = vim.o.previewheight
+vim.go.pvh = vim.go.previewheight
+
+--- Identifies the preview window.  Only one window can have this option
+--- set.  It's normally not set directly, but by using one of the commands
+--- `:ptag`, `:pedit`, etc.
+---
+--- @type boolean
+vim.o.previewwindow = false
+vim.o.pvw = vim.o.previewwindow
+vim.wo.previewwindow = vim.o.previewwindow
+vim.wo.pvw = vim.wo.previewwindow
+
+--- Enables pseudo-transparency for the `popup-menu`. Valid values are in
+--- the range of 0 for fully opaque popupmenu (disabled) to 100 for fully
+--- transparent background. Values between 0-30 are typically most useful.
+---
+--- It is possible to override the level for individual highlights within
+--- the popupmenu using `highlight-blend`. For instance, to enable
+--- transparency but force the current selected element to be fully opaque:
+--- ```
+---
+--- 	:set pumblend=15
+--- 	:hi PmenuSel blend=0
+--- ```
+--- UI-dependent. Works best with RGB colors. 'termguicolors'
+---
+--- @type integer
+vim.o.pumblend = 0
+vim.o.pb = vim.o.pumblend
+vim.go.pumblend = vim.o.pumblend
+vim.go.pb = vim.go.pumblend
+
+--- Maximum number of items to show in the popup menu
+--- (`ins-completion-menu`). Zero means "use available screen space".
+---
+--- @type integer
+vim.o.pumheight = 0
+vim.o.ph = vim.o.pumheight
+vim.go.pumheight = vim.o.pumheight
+vim.go.ph = vim.go.pumheight
+
+--- Minimum width for the popup menu (`ins-completion-menu`).  If the
+--- cursor column + 'pumwidth' exceeds screen width, the popup menu is
+--- nudged to fit on the screen.
+---
+--- @type integer
+vim.o.pumwidth = 15
+vim.o.pw = vim.o.pumwidth
+vim.go.pumwidth = vim.o.pumwidth
+vim.go.pw = vim.go.pumwidth
+
+--- Specifies the python version used for pyx* functions and commands
+--- `python_x`.  As only Python 3 is supported, this always has the value
+--- `3`. Setting any other value is an error.
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type integer
+vim.o.pyxversion = 3
+vim.o.pyx = vim.o.pyxversion
+vim.go.pyxversion = vim.o.pyxversion
+vim.go.pyx = vim.go.pyxversion
+
+--- This option specifies a function to be used to get the text to display
+--- in the quickfix and location list windows.  This can be used to
+--- customize the information displayed in the quickfix or location window
+--- for each entry in the corresponding quickfix or location list.  See
+--- `quickfix-window-function` for an explanation of how to write the
+--- function and an example.  The value can be the name of a function, a
+--- `lambda` or a `Funcref`. See `option-value-function` for more
+--- information.
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.quickfixtextfunc = ""
+vim.o.qftf = vim.o.quickfixtextfunc
+vim.go.quickfixtextfunc = vim.o.quickfixtextfunc
+vim.go.qftf = vim.go.quickfixtextfunc
+
+--- The characters that are used to escape quotes in a string.  Used for
+--- objects like a', a" and a` `a'`.
+--- When one of the characters in this option is found inside a string,
+--- the following character will be skipped.  The default value makes the
+--- text "foo\"bar\\" considered to be one string.
+---
+--- @type string
+vim.o.quoteescape = "\\"
+vim.o.qe = vim.o.quoteescape
+vim.bo.quoteescape = vim.o.quoteescape
+vim.bo.qe = vim.bo.quoteescape
+
+--- If on, writes fail unless you use a '!'.  Protects you from
+--- accidentally overwriting a file.  Default on when Vim is started
+--- in read-only mode ("vim -R") or when the executable is called "view".
+--- When using ":w!" the 'readonly' option is reset for the current
+--- buffer, unless the 'Z' flag is in 'cpoptions'.
+--- When using the ":view" command the 'readonly' option is set for the
+--- newly edited buffer.
+--- See 'modifiable' for disallowing changes to the buffer.
+---
+--- @type boolean
+vim.o.readonly = false
+vim.o.ro = vim.o.readonly
+vim.bo.readonly = vim.o.readonly
+vim.bo.ro = vim.bo.readonly
+
+--- Flags to change the way redrawing works, for debugging purposes.
+--- Most useful with 'writedelay' set to some reasonable value.
+--- Supports the following flags:
+---     compositor	Indicate each redraw event handled by the compositor
+--- 		by briefly flashing the redrawn regions in colors
+--- 		indicating the redraw type. These are the highlight
+--- 		groups used (and their default colors):
+--- 	RedrawDebugNormal   gui=reverse   normal redraw passed through
+--- 	RedrawDebugClear    guibg=Yellow  clear event passed through
+--- 	RedrawDebugComposed guibg=Green   redraw event modified by the
+--- 					  compositor (due to
+--- 					  overlapping grids, etc)
+--- 	RedrawDebugRecompose guibg=Red    redraw generated by the
+--- 					  compositor itself, due to a
+--- 					  grid being moved or deleted.
+---     line	introduce a delay after each line drawn on the screen.
+--- 		When using the TUI or another single-grid UI, "compositor"
+--- 		gives more information and should be preferred (every
+--- 		line is processed as a separate event by the compositor)
+---     flush	introduce a delay after each "flush" event.
+---     nothrottle	Turn off throttling of the message grid. This is an
+--- 		optimization that joins many small scrolls to one
+--- 		larger scroll when drawing the message area (with
+--- 		'display' msgsep flag active).
+---     invalid	Enable stricter checking (abort) of inconsistencies
+--- 		of the internal screen state. This is mostly
+--- 		useful when running nvim inside a debugger (and
+--- 		the test suite).
+---     nodelta	Send all internally redrawn cells to the UI, even if
+--- 		they are unchanged from the already displayed state.
+---
+--- @type string
+vim.o.redrawdebug = ""
+vim.o.rdb = vim.o.redrawdebug
+vim.go.redrawdebug = vim.o.redrawdebug
+vim.go.rdb = vim.go.redrawdebug
+
+--- Time in milliseconds for redrawing the display.  Applies to
+--- 'hlsearch', 'inccommand', `:match` highlighting and syntax
+--- highlighting.
+--- When redrawing takes more than this many milliseconds no further
+--- matches will be highlighted.
+--- For syntax highlighting the time applies per window.  When over the
+--- limit syntax highlighting is disabled until `CTRL-L` is used.
+--- This is used to avoid that Vim hangs when using a very complicated
+--- pattern.
+---
+--- @type integer
+vim.o.redrawtime = 2000
+vim.o.rdt = vim.o.redrawtime
+vim.go.redrawtime = vim.o.redrawtime
+vim.go.rdt = vim.go.redrawtime
+
+--- This selects the default regexp engine. `two-engines`
+--- The possible values are:
+--- 	0	automatic selection
+--- 	1	old engine
+--- 	2	NFA engine
+--- Note that when using the NFA engine and the pattern contains something
+--- that is not supported the pattern will not match.  This is only useful
+--- for debugging the regexp engine.
+--- Using automatic selection enables Vim to switch the engine, if the
+--- default engine becomes too costly.  E.g., when the NFA engine uses too
+--- many states.  This should prevent Vim from hanging on a combination of
+--- a complex pattern with long text.
+---
+--- @type integer
+vim.o.regexpengine = 0
+vim.o.re = vim.o.regexpengine
+vim.go.regexpengine = vim.o.regexpengine
+vim.go.re = vim.go.regexpengine
+
+--- Show the line number relative to the line with the cursor in front of
+--- each line. Relative line numbers help you use the `count` you can
+--- precede some vertical motion commands (e.g. j k + -) with, without
+--- having to calculate it yourself. Especially useful in combination with
+--- other commands (e.g. y d c < > gq gw =).
+--- When the 'n' option is excluded from 'cpoptions' a wrapped
+--- line will not use the column of line numbers.
+--- The 'numberwidth' option can be used to set the room used for the line
+--- number.
+--- When a long, wrapped line doesn't start with the first character, '-'
+--- characters are put before the number.
+--- See `hl-LineNr`  and `hl-CursorLineNr` for the highlighting used for
+--- the number.
+---
+--- The number in front of the cursor line also depends on the value of
+--- 'number', see `number_relativenumber` for all combinations of the two
+--- options.
+---
+--- @type boolean
+vim.o.relativenumber = false
+vim.o.rnu = vim.o.relativenumber
+vim.wo.relativenumber = vim.o.relativenumber
+vim.wo.rnu = vim.wo.relativenumber
+
+--- Threshold for reporting number of lines changed.  When the number of
+--- changed lines is more than 'report' a message will be given for most
+--- ":" commands.  If you want it always, set 'report' to 0.
+--- For the ":substitute" command the number of substitutions is used
+--- instead of the number of lines.
+---
+--- @type integer
+vim.o.report = 2
+vim.go.report = vim.o.report
+
+--- Inserting characters in Insert mode will work backwards.  See "typing
+--- backwards" `ins-reverse`.  This option can be toggled with the CTRL-_
+--- command in Insert mode, when 'allowrevins' is set.
+---
+--- @type boolean
+vim.o.revins = false
+vim.o.ri = vim.o.revins
+vim.go.revins = vim.o.revins
+vim.go.ri = vim.go.revins
+
+--- When on, display orientation becomes right-to-left, i.e., characters
+--- that are stored in the file appear from the right to the left.
+--- Using this option, it is possible to edit files for languages that
+--- are written from the right to the left such as Hebrew and Arabic.
+--- This option is per window, so it is possible to edit mixed files
+--- simultaneously, or to view the same file in both ways (this is
+--- useful whenever you have a mixed text file with both right-to-left
+--- and left-to-right strings so that both sets are displayed properly
+--- in different windows).  Also see `rileft.txt`.
+---
+--- @type boolean
+vim.o.rightleft = false
+vim.o.rl = vim.o.rightleft
+vim.wo.rightleft = vim.o.rightleft
+vim.wo.rl = vim.wo.rightleft
+
+--- Each word in this option enables the command line editing to work in
+--- right-to-left mode for a group of commands:
+---
+--- 	search		"/" and "?" commands
+---
+--- This is useful for languages such as Hebrew, Arabic and Farsi.
+--- The 'rightleft' option must be set for 'rightleftcmd' to take effect.
+---
+--- @type string
+vim.o.rightleftcmd = "search"
+vim.o.rlc = vim.o.rightleftcmd
+vim.wo.rightleftcmd = vim.o.rightleftcmd
+vim.wo.rlc = vim.wo.rightleftcmd
+
+--- Show the line and column number of the cursor position, separated by a
+--- comma.  When there is room, the relative position of the displayed
+--- text in the file is shown on the far right:
+--- 	Top	first line is visible
+--- 	Bot	last line is visible
+--- 	All	first and last line are visible
+--- 	45%	relative position in the file
+--- If 'rulerformat' is set, it will determine the contents of the ruler.
+--- Each window has its own ruler.  If a window has a status line, the
+--- ruler is shown there.  If a window doesn't have a status line and
+--- 'cmdheight' is zero, the ruler is not shown.  Otherwise it is shown in
+--- the last line of the screen.  If the statusline is given by
+--- 'statusline' (i.e. not empty), this option takes precedence over
+--- 'ruler' and 'rulerformat'.
+--- If the number of characters displayed is different from the number of
+--- bytes in the text (e.g., for a TAB or a multibyte character), both
+--- the text column (byte number) and the screen column are shown,
+--- separated with a dash.
+--- For an empty line "0-1" is shown.
+--- For an empty buffer the line number will also be zero: "0,0-1".
+--- If you don't want to see the ruler all the time but want to know where
+--- you are, use "g CTRL-G" `g_CTRL-G`.
+---
+--- @type boolean
+vim.o.ruler = true
+vim.o.ru = vim.o.ruler
+vim.go.ruler = vim.o.ruler
+vim.go.ru = vim.go.ruler
+
+--- When this option is not empty, it determines the content of the ruler
+--- string, as displayed for the 'ruler' option.
+--- The format of this option is like that of 'statusline'.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- The default ruler width is 17 characters.  To make the ruler 15
+--- characters wide, put "%15(" at the start and "%)" at the end.
+--- Example:
+--- ```
+--- 	:set rulerformat=%15(%c%V\ %p%%%)
+--- ```
+---
+--- @type string
+vim.o.rulerformat = ""
+vim.o.ruf = vim.o.rulerformat
+vim.go.rulerformat = vim.o.rulerformat
+vim.go.ruf = vim.go.rulerformat
+
+--- List of directories to be searched for these runtime files:
+---   filetype.lua	filetypes `new-filetype`
+---   autoload/	automatically loaded scripts `autoload-functions`
+---   colors/	color scheme files `:colorscheme`
+---   compiler/	compiler files `:compiler`
+---   doc/		documentation `write-local-help`
+---   ftplugin/	filetype plugins `write-filetype-plugin`
+---   indent/	indent scripts `indent-expression`
+---   keymap/	key mapping files `mbyte-keymap`
+---   lang/		menu translations `:menutrans`
+---   lua/		`Lua` plugins
+---   menu.vim	GUI menus `menu.vim`
+---   pack/		packages `:packadd`
+---   parser/	`treesitter` syntax parsers
+---   plugin/	plugin scripts `write-plugin`
+---   queries/	`treesitter` queries
+---   rplugin/	`remote-plugin` scripts
+---   spell/	spell checking files `spell`
+---   syntax/	syntax files `mysyntaxfile`
+---   tutor/	tutorial files `:Tutor`
+---
+--- And any other file searched for with the `:runtime` command.
+---
+--- Defaults are setup to search these locations:
+--- 1. Your home directory, for personal preferences.
+---    Given by `stdpath("config")`.  `$XDG_CONFIG_HOME`
+--- 2. Directories which must contain configuration files according to
+---    `xdg` ($XDG_CONFIG_DIRS, defaults to /etc/xdg).  This also contains
+---    preferences from system administrator.
+--- 3. Data home directory, for plugins installed by user.
+---    Given by `stdpath("data")/site`.  `$XDG_DATA_HOME`
+--- 4. nvim/site subdirectories for each directory in $XDG_DATA_DIRS.
+---    This is for plugins which were installed by system administrator,
+---    but are not part of the Nvim distribution. XDG_DATA_DIRS defaults
+---    to /usr/local/share/:/usr/share/, so system administrators are
+---    expected to install site plugins to /usr/share/nvim/site.
+--- 5. Session state directory, for state data such as swap, backupdir,
+---    viewdir, undodir, etc.
+---    Given by `stdpath("state")`.  `$XDG_STATE_HOME`
+--- 6. $VIMRUNTIME, for files distributed with Nvim.
+--- 						*after-directory*
+--- 7, 8, 9, 10. In after/ subdirectories of 1, 2, 3 and 4, with reverse
+---    ordering.  This is for preferences to overrule or add to the
+---    distributed defaults or system-wide settings (rarely needed).
+---
+--- 						*packages-runtimepath*
+--- "start" packages will also be searched (`runtime-search-path`) for
+--- runtime files after these, though such packages are not explicitly
+--- reported in &runtimepath. But "opt" packages are explicitly added to
+--- &runtimepath by `:packadd`.
+---
+--- Note that, unlike 'path', no wildcards like "**" are allowed.  Normal
+--- wildcards are allowed, but can significantly slow down searching for
+--- runtime files.  For speed, use as few items as possible and avoid
+--- wildcards.
+--- See `:runtime`.
+--- Example:
+--- ```
+--- 	:set runtimepath=~/vimruntime,/mygroup/vim,$VIMRUNTIME
+--- ```
+--- This will use the directory "~/vimruntime" first (containing your
+--- personal Nvim runtime files), then "/mygroup/vim", and finally
+--- "$VIMRUNTIME" (the default runtime files).
+--- You can put a directory before $VIMRUNTIME to find files which replace
+--- distributed runtime files.  You can put a directory after $VIMRUNTIME
+--- to find files which add to distributed runtime files.
+---
+--- With `--clean` the home directory entries are not included.
+---
+--- @type string
+vim.o.runtimepath = "..."
+vim.o.rtp = vim.o.runtimepath
+vim.go.runtimepath = vim.o.runtimepath
+vim.go.rtp = vim.go.runtimepath
+
+--- Number of lines to scroll with CTRL-U and CTRL-D commands.  Will be
+--- set to half the number of lines in the window when the window size
+--- changes.  This may happen when enabling the `status-line` or
+--- 'tabline' option after setting the 'scroll' option.
+--- If you give a count to the CTRL-U or CTRL-D command it will
+--- be used as the new value for 'scroll'.  Reset to half the window
+--- height with ":set scroll=0".
+---
+--- @type integer
+vim.o.scroll = 0
+vim.o.scr = vim.o.scroll
+vim.wo.scroll = vim.o.scroll
+vim.wo.scr = vim.wo.scroll
+
+--- Maximum number of lines kept beyond the visible screen. Lines at the
+--- top are deleted if new lines exceed this limit.
+--- Minimum is 1, maximum is 100000.
+--- Only in `terminal` buffers.
+---
+--- Note: Lines that are not visible and kept in scrollback are not
+--- reflown when the terminal buffer is resized horizontally.
+---
+--- @type integer
+vim.o.scrollback = -1
+vim.o.scbk = vim.o.scrollback
+vim.bo.scrollback = vim.o.scrollback
+vim.bo.scbk = vim.bo.scrollback
+
+--- See also `scroll-binding`.  When this option is set, the current
+--- window scrolls as other scrollbind windows (windows that also have
+--- this option set) scroll.  This option is useful for viewing the
+--- differences between two versions of a file, see 'diff'.
+--- See `'scrollopt'` for options that determine how this option should be
+--- interpreted.
+--- This option is mostly reset when splitting a window to edit another
+--- file.  This means that ":split | edit file" results in two windows
+--- with scroll-binding, but ":split file" does not.
+---
+--- @type boolean
+vim.o.scrollbind = false
+vim.o.scb = vim.o.scrollbind
+vim.wo.scrollbind = vim.o.scrollbind
+vim.wo.scb = vim.wo.scrollbind
+
+--- Minimal number of lines to scroll when the cursor gets off the
+--- screen (e.g., with "j").  Not used for scroll commands (e.g., CTRL-E,
+--- CTRL-D).  Useful if your terminal scrolls very slowly.
+--- When set to a negative number from -1 to -100 this is used as the
+--- percentage of the window height.  Thus -50 scrolls half the window
+--- height.
+---
+--- @type integer
+vim.o.scrolljump = 1
+vim.o.sj = vim.o.scrolljump
+vim.go.scrolljump = vim.o.scrolljump
+vim.go.sj = vim.go.scrolljump
+
+--- Minimal number of screen lines to keep above and below the cursor.
+--- This will make some context visible around where you are working.  If
+--- you set it to a very large value (999) the cursor line will always be
+--- in the middle of the window (except at the start or end of the file or
+--- when long lines wrap).
+--- After using the local value, go back the global value with one of
+--- these two:
+--- ```
+--- 	setlocal scrolloff<
+--- 	setlocal scrolloff=-1
+--- ```
+--- For scrolling horizontally see 'sidescrolloff'.
+---
+--- @type integer
+vim.o.scrolloff = 0
+vim.o.so = vim.o.scrolloff
+vim.wo.scrolloff = vim.o.scrolloff
+vim.wo.so = vim.wo.scrolloff
+vim.go.scrolloff = vim.o.scrolloff
+vim.go.so = vim.go.scrolloff
+
+--- This is a comma-separated list of words that specifies how
+--- 'scrollbind' windows should behave.  'sbo' stands for ScrollBind
+--- Options.
+--- The following words are available:
+---     ver		Bind vertical scrolling for 'scrollbind' windows
+---     hor		Bind horizontal scrolling for 'scrollbind' windows
+---     jump	Applies to the offset between two windows for vertical
+--- 		scrolling.  This offset is the difference in the first
+--- 		displayed line of the bound windows.  When moving
+--- 		around in a window, another 'scrollbind' window may
+--- 		reach a position before the start or after the end of
+--- 		the buffer.  The offset is not changed though, when
+--- 		moving back the 'scrollbind' window will try to scroll
+--- 		to the desired position when possible.
+--- 		When now making that window the current one, two
+--- 		things can be done with the relative offset:
+--- 		1. When "jump" is not included, the relative offset is
+--- 		   adjusted for the scroll position in the new current
+--- 		   window.  When going back to the other window, the
+--- 		   new relative offset will be used.
+--- 		2. When "jump" is included, the other windows are
+--- 		   scrolled to keep the same relative offset.  When
+--- 		   going back to the other window, it still uses the
+--- 		   same relative offset.
+--- Also see `scroll-binding`.
+--- When 'diff' mode is active there always is vertical scroll binding,
+--- even when "ver" isn't there.
+---
+--- @type string
+vim.o.scrollopt = "ver,jump"
+vim.o.sbo = vim.o.scrollopt
+vim.go.scrollopt = vim.o.scrollopt
+vim.go.sbo = vim.go.scrollopt
+
+--- Specifies the nroff macros that separate sections.  These are pairs of
+--- two letters (See `object-motions`).  The default makes a section start
+--- at the nroff macros ".SH", ".NH", ".H", ".HU", ".nh" and ".sh".
+---
+--- @type string
+vim.o.sections = "SHNHH HUnhsh"
+vim.o.sect = vim.o.sections
+vim.go.sections = vim.o.sections
+vim.go.sect = vim.go.sections
+
+--- This option defines the behavior of the selection.  It is only used
+--- in Visual and Select mode.
+--- Possible values:
+---    value	past line     inclusive ~
+---    old		   no		yes
+---    inclusive	   yes		yes
+---    exclusive	   yes		no
+--- "past line" means that the cursor is allowed to be positioned one
+--- character past the line.
+--- "inclusive" means that the last character of the selection is included
+--- in an operation.  For example, when "x" is used to delete the
+--- selection.
+--- When "old" is used and 'virtualedit' allows the cursor to move past
+--- the end of line the line break still isn't included.
+--- Note that when "exclusive" is used and selecting from the end
+--- backwards, you cannot include the last character of a line, when
+--- starting in Normal mode and 'virtualedit' empty.
+---
+--- @type string
+vim.o.selection = "inclusive"
+vim.o.sel = vim.o.selection
+vim.go.selection = vim.o.selection
+vim.go.sel = vim.go.selection
+
+--- This is a comma-separated list of words, which specifies when to start
+--- Select mode instead of Visual mode, when a selection is started.
+--- Possible values:
+---    mouse	when using the mouse
+---    key		when using shifted special keys
+---    cmd		when using "v", "V" or CTRL-V
+--- See `Select-mode`.
+---
+--- @type string
+vim.o.selectmode = ""
+vim.o.slm = vim.o.selectmode
+vim.go.selectmode = vim.o.selectmode
+vim.go.slm = vim.go.selectmode
+
+--- Changes the effect of the `:mksession` command.  It is a comma-
+--- separated list of words.  Each word enables saving and restoring
+--- something:
+---    word		save and restore ~
+---    blank	empty windows
+---    buffers	hidden and unloaded buffers, not just those in windows
+---    curdir	the current directory
+---    folds	manually created folds, opened/closed folds and local
+--- 		fold options
+---    globals	global variables that start with an uppercase letter
+--- 		and contain at least one lowercase letter.  Only
+--- 		String and Number types are stored.
+---    help		the help window
+---    localoptions	options and mappings local to a window or buffer (not
+--- 		global values for local options)
+---    options	all options and mappings (also global values for local
+--- 		options)
+---    skiprtp	exclude 'runtimepath' and 'packpath' from the options
+---    resize	size of the Vim window: 'lines' and 'columns'
+---    sesdir	the directory in which the session file is located
+--- 		will become the current directory (useful with
+--- 		projects accessed over a network from different
+--- 		systems)
+---    tabpages	all tab pages; without this only the current tab page
+--- 		is restored, so that you can make a session for each
+--- 		tab page separately
+---    terminal	include terminal windows where the command can be
+--- 		restored
+---    winpos	position of the whole Vim window
+---    winsize	window sizes
+---    slash	`deprecated` Always enabled. Uses "/" in filenames.
+---    unix		`deprecated` Always enabled. Uses "\n" line endings.
+---
+--- Don't include both "curdir" and "sesdir". When neither is included
+--- filenames are stored as absolute paths.
+--- If you leave out "options" many things won't work well after restoring
+--- the session.
+---
+--- @type string
+vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,terminal"
+vim.o.ssop = vim.o.sessionoptions
+vim.go.sessionoptions = vim.o.sessionoptions
+vim.go.ssop = vim.go.sessionoptions
+
+--- When non-empty, the shada file is read upon startup and written
+--- when exiting Vim (see `shada-file`).  The string should be a comma-
+--- separated list of parameters, each consisting of a single character
+--- identifying the particular parameter, followed by a number or string
+--- which specifies the value of that parameter.  If a particular
+--- character is left out, then the default value is used for that
+--- parameter.  The following is a list of the identifying characters and
+--- the effect of their value.
+--- CHAR	VALUE	~
+--- 						*shada-!*
+--- !	When included, save and restore global variables that start
+--- 	with an uppercase letter, and don't contain a lowercase
+--- 	letter.  Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis"
+--- 	and "_K_L_M" are not.  Nested List and Dict items may not be
+--- 	read back correctly, you end up with an empty item.
+--- 						*shada-quote*
+--- "	Maximum number of lines saved for each register.  Old name of
+--- 	the '<' item, with the disadvantage that you need to put a
+--- 	backslash before the ", otherwise it will be recognized as the
+--- 	start of a comment!
+--- 						*shada-%*
+--- %	When included, save and restore the buffer list.  If Vim is
+--- 	started with a file name argument, the buffer list is not
+--- 	restored.  If Vim is started without a file name argument, the
+--- 	buffer list is restored from the shada file.  Quickfix
+--- 	('buftype'), unlisted ('buflisted'), unnamed and buffers on
+--- 	removable media (`shada-r`) are not saved.
+--- 	When followed by a number, the number specifies the maximum
+--- 	number of buffers that are stored.  Without a number all
+--- 	buffers are stored.
+--- 						*shada-'*
+--- '	Maximum number of previously edited files for which the marks
+--- 	are remembered.  This parameter must always be included when
+--- 	'shada' is non-empty.
+--- 	Including this item also means that the `jumplist` and the
+--- 	`changelist` are stored in the shada file.
+--- 						*shada-/*
+--- /	Maximum number of items in the search pattern history to be
+--- 	saved.  If non-zero, then the previous search and substitute
+--- 	patterns are also saved.  When not included, the value of
+--- 	'history' is used.
+--- 						*shada-:*
+--- :	Maximum number of items in the command-line history to be
+--- 	saved.  When not included, the value of 'history' is used.
+--- 						*shada-<*
+--- \<	Maximum number of lines saved for each register.  If zero then
+--- 	registers are not saved.  When not included, all lines are
+--- 	saved.  '"' is the old name for this item.
+--- 	Also see the 's' item below: limit specified in KiB.
+--- 						*shada-@*
+--- @	Maximum number of items in the input-line history to be
+--- 	saved.  When not included, the value of 'history' is used.
+--- 						*shada-c*
+--- c	Dummy option, kept for compatibility reasons.  Has no actual
+--- 	effect: ShaDa always uses UTF-8 and 'encoding' value is fixed
+--- 	to UTF-8 as well.
+--- 						*shada-f*
+--- f	Whether file marks need to be stored.  If zero, file marks ('0
+--- 	to '9, 'A to 'Z) are not stored.  When not present or when
+--- 	non-zero, they are all stored.  '0 is used for the current
+--- 	cursor position (when exiting or when doing `:wshada`).
+--- 						*shada-h*
+--- h	Disable the effect of 'hlsearch' when loading the shada
+--- 	file.  When not included, it depends on whether ":nohlsearch"
+--- 	has been used since the last search command.
+--- 						*shada-n*
+--- n	Name of the shada file.  The name must immediately follow
+--- 	the 'n'.  Must be at the end of the option!  If the
+--- 	'shadafile' option is set, that file name overrides the one
+--- 	given here with 'shada'.  Environment variables are
+--- 	expanded when opening the file, not when setting the option.
+--- 						*shada-r*
+--- r	Removable media.  The argument is a string (up to the next
+--- 	',').  This parameter can be given several times.  Each
+--- 	specifies the start of a path for which no marks will be
+--- 	stored.  This is to avoid removable media.  For Windows you
+--- 	could use "ra:,rb:".  You can also use it for temp files,
+--- 	e.g., for Unix: "r/tmp".  Case is ignored.
+--- 						*shada-s*
+--- s	Maximum size of an item contents in KiB.  If zero then nothing
+--- 	is saved.  Unlike Vim this applies to all items, except for
+--- 	the buffer list and header.  Full item size is off by three
+--- 	unsigned integers: with `s10` maximum item size may be 1 byte
+--- 	(type: 7-bit integer) + 9 bytes (timestamp: up to 64-bit
+--- 	integer) + 3 bytes (item size: up to 16-bit integer because
+--- 	2^8 < 10240 < 2^16) + 10240 bytes (requested maximum item
+--- 	contents size) = 10253 bytes.
+---
+--- Example:
+--- ```
+---     :set shada='50,<1000,s100,:0,n~/nvim/shada
+--- ```
+--- '50		Marks will be remembered for the last 50 files you
+--- 		edited.
+--- <1000		Contents of registers (up to 1000 lines each) will be
+--- 		remembered.
+--- s100		Items with contents occupying more then 100 KiB are
+--- 		skipped.
+--- :0		Command-line history will not be saved.
+--- n~/nvim/shada	The name of the file to use is "~/nvim/shada".
+--- no /		Since '/' is not specified, the default will be used,
+--- 		that is, save all of the search history, and also the
+--- 		previous search and substitute patterns.
+--- no %		The buffer list will not be saved nor read back.
+--- no h		'hlsearch' highlighting will be restored.
+---
+--- When setting 'shada' from an empty value you can use `:rshada` to
+--- load the contents of the file, this is not done automatically.
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.shada = "!,'100,<50,s10,h"
+vim.o.sd = vim.o.shada
+vim.go.shada = vim.o.shada
+vim.go.sd = vim.go.shada
+
+--- When non-empty, overrides the file name used for `shada` (viminfo).
+--- When equal to "NONE" no shada file will be read or written.
+--- This option can be set with the `-i` command line flag.  The `--clean`
+--- command line flag sets it to "NONE".
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.shadafile = ""
+vim.o.sdf = vim.o.shadafile
+vim.go.shadafile = vim.o.shadafile
+vim.go.sdf = vim.go.shadafile
+
+--- Name of the shell to use for ! and :! commands.  When changing the
+--- value also check these options: 'shellpipe', 'shellslash'
+--- 'shellredir', 'shellquote', 'shellxquote' and 'shellcmdflag'.
+--- It is allowed to give an argument to the command, e.g.  "csh -f".
+--- See `option-backslash` about including spaces and backslashes.
+--- Environment variables are expanded `:set_env`.
+---
+--- If the name of the shell contains a space, you need to enclose it in
+--- quotes.  Example with quotes:
+--- ```
+--- 	:set shell=\"c:\program\ files\unix\sh.exe\"\ -f
+--- ```
+--- Note the backslash before each quote (to avoid starting a comment) and
+--- each space (to avoid ending the option value), so better use `:let-&`
+--- like this:
+--- ```
+--- 	:let &shell='"C:\Program Files\unix\sh.exe" -f'
+--- ```
+--- Also note that the "-f" is not inside the quotes, because it is not
+--- part of the command name.
+--- 						*shell-unquoting*
+--- Rules regarding quotes:
+--- 1. Option is split on space and tab characters that are not inside
+---    quotes: "abc def" runs shell named "abc" with additional argument
+---    "def", '"abc def"' runs shell named "abc def" with no additional
+---    arguments (here and below: additional means “additional to
+---    'shellcmdflag'”).
+--- 2. Quotes in option may be present in any position and any number:
+---    '"abc"', '"a"bc', 'a"b"c', 'ab"c"' and '"a"b"c"' are all equivalent
+---    to just "abc".
+--- 3. Inside quotes backslash preceding backslash means one backslash.
+---    Backslash preceding quote means one quote. Backslash preceding
+---    anything else means backslash and next character literally:
+---    '"a\\b"' is the same as "a\b", '"a\\"b"' runs shell named literally
+---    'a"b', '"a\b"' is the same as "a\b" again.
+--- 4. Outside of quotes backslash always means itself, it cannot be used
+---    to escape quote: 'a\"b"' is the same as "a\b".
+--- Note that such processing is done after `:set` did its own round of
+--- unescaping, so to keep yourself sane use `:let-&` like shown above.
+--- 						*shell-powershell*
+--- To use PowerShell:
+--- ```
+--- 	let &shell = executable('pwsh') ? 'pwsh' : 'powershell'
+--- 	let &shellcmdflag = '-NoLogo -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.UTF8Encoding]::new();$PSDefaultParameterValues[''Out-File:Encoding'']=''utf8'';Remove-Alias -Force -ErrorAction SilentlyContinue tee;'
+--- 	let &shellredir = '2>&1 | %%{ "$_" } | Out-File %s; exit $LastExitCode'
+--- 	let &shellpipe  = '2>&1 | %%{ "$_" } | tee %s; exit $LastExitCode'
+--- 	set shellquote= shellxquote=
+---
+--- ```
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.shell = "sh"
+vim.o.sh = vim.o.shell
+vim.go.shell = vim.o.shell
+vim.go.sh = vim.go.shell
+
+--- Flag passed to the shell to execute "!" and ":!" commands; e.g.,
+--- `bash.exe -c ls` or `cmd.exe /s /c "dir"`.  For MS-Windows, the
+--- default is set according to the value of 'shell', to reduce the need
+--- to set this option by the user.
+--- On Unix it can have more than one flag.  Each white space separated
+--- part is passed as an argument to the shell command.
+--- See `option-backslash` about including spaces and backslashes.
+--- See `shell-unquoting` which talks about separating this option into
+--- multiple arguments.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.shellcmdflag = "-c"
+vim.o.shcf = vim.o.shellcmdflag
+vim.go.shellcmdflag = vim.o.shellcmdflag
+vim.go.shcf = vim.go.shellcmdflag
+
+--- String to be used to put the output of the ":make" command in the
+--- error file.  See also `:make_makeprg`.  See `option-backslash` about
+--- including spaces and backslashes.
+--- The name of the temporary file can be represented by "%s" if necessary
+--- (the file name is appended automatically if no %s appears in the value
+--- of this option).
+--- For MS-Windows the default is "2>&1| tee".  The stdout and stderr are
+--- saved in a file and echoed to the screen.
+--- For Unix the default is "| tee".  The stdout of the compiler is saved
+--- in a file and echoed to the screen.  If the 'shell' option is "csh" or
+--- "tcsh" after initializations, the default becomes "|& tee".  If the
+--- 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta",
+--- "bash", "fish", "ash" or "dash" the default becomes "2>&1| tee".  This
+--- means that stderr is also included.  Before using the 'shell' option a
+--- path is removed, thus "/bin/sh" uses "sh".
+--- The initialization of this option is done after reading the vimrc
+--- and the other initializations, so that when the 'shell' option is set
+--- there, the 'shellpipe' option changes automatically, unless it was
+--- explicitly set before.
+--- When 'shellpipe' is set to an empty string, no redirection of the
+--- ":make" output will be done.  This is useful if you use a 'makeprg'
+--- that writes to 'makeef' by itself.  If you want no piping, but do
+--- want to include the 'makeef', set 'shellpipe' to a single space.
+--- Don't forget to precede the space with a backslash: ":set sp=\ ".
+--- In the future pipes may be used for filtering and this option will
+--- become obsolete (at least for Unix).
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.shellpipe = "| tee"
+vim.o.sp = vim.o.shellpipe
+vim.go.shellpipe = vim.o.shellpipe
+vim.go.sp = vim.go.shellpipe
+
+--- Quoting character(s), put around the command passed to the shell, for
+--- the "!" and ":!" commands.  The redirection is kept outside of the
+--- quoting.  See 'shellxquote' to include the redirection.  It's
+--- probably not useful to set both options.
+--- This is an empty string by default.  Only known to be useful for
+--- third-party shells on Windows systems, such as the MKS Korn Shell
+--- or bash, where it should be "\"".  The default is adjusted according
+--- the value of 'shell', to reduce the need to set this option by the
+--- user.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.shellquote = ""
+vim.o.shq = vim.o.shellquote
+vim.go.shellquote = vim.o.shellquote
+vim.go.shq = vim.go.shellquote
+
+--- String to be used to put the output of a filter command in a temporary
+--- file.  See also `:!`.  See `option-backslash` about including spaces
+--- and backslashes.
+--- The name of the temporary file can be represented by "%s" if necessary
+--- (the file name is appended automatically if no %s appears in the value
+--- of this option).
+--- The default is ">".  For Unix, if the 'shell' option is "csh" or
+--- "tcsh" during initializations, the default becomes ">&".  If the
+--- 'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta",
+--- "bash" or "fish", the default becomes ">%s 2>&1".  This means that
+--- stderr is also included.  For Win32, the Unix checks are done and
+--- additionally "cmd" is checked for, which makes the default ">%s 2>&1".
+--- Also, the same names with ".exe" appended are checked for.
+--- The initialization of this option is done after reading the vimrc
+--- and the other initializations, so that when the 'shell' option is set
+--- there, the 'shellredir' option changes automatically unless it was
+--- explicitly set before.
+--- In the future pipes may be used for filtering and this option will
+--- become obsolete (at least for Unix).
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.shellredir = ">"
+vim.o.srr = vim.o.shellredir
+vim.go.shellredir = vim.o.shellredir
+vim.go.srr = vim.go.shellredir
+
+--- 		only for MS-Windows
+--- When set, a forward slash is used when expanding file names.  This is
+--- useful when a Unix-like shell is used instead of cmd.exe.  Backward
+--- slashes can still be typed, but they are changed to forward slashes by
+--- Vim.
+--- Note that setting or resetting this option has no effect for some
+--- existing file names, thus this option needs to be set before opening
+--- any file for best results.  This might change in the future.
+--- 'shellslash' only works when a backslash can be used as a path
+--- separator.  To test if this is so use:
+--- ```
+--- 	if exists('+shellslash')
+--- ```
+--- Also see 'completeslash'.
+---
+--- @type boolean
+vim.o.shellslash = false
+vim.o.ssl = vim.o.shellslash
+vim.go.shellslash = vim.o.shellslash
+vim.go.ssl = vim.go.shellslash
+
+--- When on, use temp files for shell commands.  When off use a pipe.
+--- When using a pipe is not possible temp files are used anyway.
+--- The advantage of using a pipe is that nobody can read the temp file
+--- and the 'shell' command does not need to support redirection.
+--- The advantage of using a temp file is that the file type and encoding
+--- can be detected.
+--- The `FilterReadPre`, `FilterReadPost` and `FilterWritePre|,
+--- |FilterWritePost` autocommands event are not triggered when
+--- 'shelltemp' is off.
+--- `system()` does not respect this option, it always uses pipes.
+---
+--- @type boolean
+vim.o.shelltemp = true
+vim.o.stmp = vim.o.shelltemp
+vim.go.shelltemp = vim.o.shelltemp
+vim.go.stmp = vim.go.shelltemp
+
+--- When 'shellxquote' is set to "(" then the characters listed in this
+--- option will be escaped with a '^' character.  This makes it possible
+--- to execute most external commands with cmd.exe.
+---
+--- @type string
+vim.o.shellxescape = ""
+vim.o.sxe = vim.o.shellxescape
+vim.go.shellxescape = vim.o.shellxescape
+vim.go.sxe = vim.go.shellxescape
+
+--- Quoting character(s), put around the command passed to the shell, for
+--- the "!" and ":!" commands.  Includes the redirection.  See
+--- 'shellquote' to exclude the redirection.  It's probably not useful
+--- to set both options.
+--- When the value is '(' then ')' is appended. When the value is '"('
+--- then ')"' is appended.
+--- When the value is '(' then also see 'shellxescape'.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.shellxquote = ""
+vim.o.sxq = vim.o.shellxquote
+vim.go.shellxquote = vim.o.shellxquote
+vim.go.sxq = vim.go.shellxquote
+
+--- Round indent to multiple of 'shiftwidth'.  Applies to > and <
+--- commands.  CTRL-T and CTRL-D in Insert mode always round the indent to
+--- a multiple of 'shiftwidth' (this is Vi compatible).
+---
+--- @type boolean
+vim.o.shiftround = false
+vim.o.sr = vim.o.shiftround
+vim.go.shiftround = vim.o.shiftround
+vim.go.sr = vim.go.shiftround
+
+--- Number of spaces to use for each step of (auto)indent.  Used for
+--- `'cindent'`, `>>`, `<<`, etc.
+--- When zero the 'tabstop' value will be used.  Use the `shiftwidth()`
+--- function to get the effective shiftwidth value.
+---
+--- @type integer
+vim.o.shiftwidth = 8
+vim.o.sw = vim.o.shiftwidth
+vim.bo.shiftwidth = vim.o.shiftwidth
+vim.bo.sw = vim.bo.shiftwidth
+
+--- This option helps to avoid all the `hit-enter` prompts caused by file
+--- messages, for example  with CTRL-G, and to avoid some other messages.
+--- It is a list of flags:
+---  flag	meaning when present	~
+---   f	use "(3 of 5)" instead of "(file 3 of 5)"		*shm-f*
+---   i	use "[noeol]" instead of "[Incomplete last line]"	*shm-i*
+---   l	use "999L, 888B" instead of "999 lines, 888 bytes"	*shm-l*
+---   m	use "[+]" instead of "[Modified]"			*shm-m*
+---   n	use "[New]" instead of "[New File]"			*shm-n*
+---   r	use "[RO]" instead of "[readonly]"			*shm-r*
+---   w	use "[w]" instead of "written" for file write message	*shm-w*
+--- 	and "[a]" instead of "appended" for ':w >> file' command
+---   x	use "[dos]" instead of "[dos format]", "[unix]"		*shm-x*
+--- 	instead of "[unix format]" and "[mac]" instead of "[mac
+--- 	format]"
+---   a	all of the above abbreviations				*shm-a*
+---
+---   o	overwrite message for writing a file with subsequent	*shm-o*
+--- 	message for reading a file (useful for ":wn" or when
+--- 	'autowrite' on)
+---   O	message for reading a file overwrites any previous	*shm-O*
+--- 	message;  also for quickfix message (e.g., ":cn")
+---   s	don't give "search hit BOTTOM, continuing at TOP" or	*shm-s*
+--- 	"search hit TOP, continuing at BOTTOM" messages; when using
+--- 	the search count do not show "W" after the count message (see
+--- 	S below)
+---   t	truncate file message at the start if it is too long	*shm-t*
+--- 	to fit on the command-line, "<" will appear in the left most
+--- 	column; ignored in Ex mode
+---   T	truncate other messages in the middle if they are too	*shm-T*
+--- 	long to fit on the command line; "..." will appear in the
+--- 	middle; ignored in Ex mode
+---   W	don't give "written" or "[w]" when writing a file	*shm-W*
+---   A	don't give the "ATTENTION" message when an existing	*shm-A*
+--- 	swap file is found
+---   I	don't give the intro message when starting Vim,		*shm-I*
+--- 	see `:intro`
+---   c	don't give `ins-completion-menu` messages; for		*shm-c*
+--- 	example, "-- XXX completion (YYY)", "match 1 of 2", "The only
+--- 	match", "Pattern not found", "Back at original", etc.
+---   C	don't give messages while scanning for ins-completion	*shm-C*
+--- 	items, for instance "scanning tags"
+---   q	use "recording" instead of "recording @a"		*shm-q*
+---   F	don't give the file info when editing a file, like	*shm-F*
+--- 	`:silent` was used for the command
+---   S	do not show search count message when searching, e.g.	*shm-S*
+--- 	"[1/5]"
+---
+--- This gives you the opportunity to avoid that a change between buffers
+--- requires you to hit <Enter>, but still gives as useful a message as
+--- possible for the space available.  To get the whole message that you
+--- would have got with 'shm' empty, use ":file!"
+--- Useful values:
+---     shm=	No abbreviation of message.
+---     shm=a	Abbreviation, but no loss of information.
+---     shm=at	Abbreviation, and truncate message when necessary.
+---
+--- @type string
+vim.o.shortmess = "filnxtToOCF"
+vim.o.shm = vim.o.shortmess
+vim.go.shortmess = vim.o.shortmess
+vim.go.shm = vim.go.shortmess
+
+--- String to put at the start of lines that have been wrapped.  Useful
+--- values are "> " or "+++ ":
+--- ```
+--- 	:let &showbreak = "> "
+--- 	:let &showbreak = '+++ '
+--- ```
+--- Only printable single-cell characters are allowed, excluding <Tab> and
+--- comma (in a future version the comma might be used to separate the
+--- part that is shown at the end and at the start of a line).
+--- The `hl-NonText` highlight group determines the highlighting.
+--- Note that tabs after the showbreak will be displayed differently.
+--- If you want the 'showbreak' to appear in between line numbers, add the
+--- "n" flag to 'cpoptions'.
+--- A window-local value overrules a global value.  If the global value is
+--- set and you want no value in the current window use NONE:
+--- ```
+--- 	:setlocal showbreak=NONE
+--- ```
+---
+--- @type string
+vim.o.showbreak = ""
+vim.o.sbr = vim.o.showbreak
+vim.wo.showbreak = vim.o.showbreak
+vim.wo.sbr = vim.wo.showbreak
+vim.go.showbreak = vim.o.showbreak
+vim.go.sbr = vim.go.showbreak
+
+--- Show (partial) command in the last line of the screen.  Set this
+--- option off if your terminal is slow.
+--- In Visual mode the size of the selected area is shown:
+--- - When selecting characters within a line, the number of characters.
+---   If the number of bytes is different it is also displayed: "2-6"
+---   means two characters and six bytes.
+--- - When selecting more than one line, the number of lines.
+--- - When selecting a block, the size in screen characters:
+---   {lines}x{columns}.
+--- This information can be displayed in an alternative location using the
+--- 'showcmdloc' option, useful when 'cmdheight' is 0.
+---
+--- @type boolean
+vim.o.showcmd = true
+vim.o.sc = vim.o.showcmd
+vim.go.showcmd = vim.o.showcmd
+vim.go.sc = vim.go.showcmd
+
+--- This option can be used to display the (partially) entered command in
+--- another location.  Possible values are:
+---   last		Last line of the screen (default).
+---   statusline	Status line of the current window.
+---   tabline	First line of the screen if 'showtabline' is enabled.
+--- Setting this option to "statusline" or "tabline" means that these will
+--- be redrawn whenever the command changes, which can be on every key
+--- pressed.
+--- The %S 'statusline' item can be used in 'statusline' or 'tabline' to
+--- place the text.  Without a custom 'statusline' or 'tabline' it will be
+--- displayed in a convenient location.
+---
+--- @type string
+vim.o.showcmdloc = "last"
+vim.o.sloc = vim.o.showcmdloc
+vim.go.showcmdloc = vim.o.showcmdloc
+vim.go.sloc = vim.go.showcmdloc
+
+--- When completing a word in insert mode (see `ins-completion`) from the
+--- tags file, show both the tag name and a tidied-up form of the search
+--- pattern (if there is one) as possible matches.  Thus, if you have
+--- matched a C function, you can see a template for what arguments are
+--- required (coding style permitting).
+--- Note that this doesn't work well together with having "longest" in
+--- 'completeopt', because the completion from the search pattern may not
+--- match the typed text.
+---
+--- @type boolean
+vim.o.showfulltag = false
+vim.o.sft = vim.o.showfulltag
+vim.go.showfulltag = vim.o.showfulltag
+vim.go.sft = vim.go.showfulltag
+
+--- When a bracket is inserted, briefly jump to the matching one.  The
+--- jump is only done if the match can be seen on the screen.  The time to
+--- show the match can be set with 'matchtime'.
+--- A Beep is given if there is no match (no matter if the match can be
+--- seen or not).
+--- When the 'm' flag is not included in 'cpoptions', typing a character
+--- will immediately move the cursor back to where it belongs.
+--- See the "sm" field in 'guicursor' for setting the cursor shape and
+--- blinking when showing the match.
+--- The 'matchpairs' option can be used to specify the characters to show
+--- matches for.  'rightleft' and 'revins' are used to look for opposite
+--- matches.
+--- Also see the matchparen plugin for highlighting the match when moving
+--- around `pi_paren.txt`.
+--- Note: Use of the short form is rated PG.
+---
+--- @type boolean
+vim.o.showmatch = false
+vim.o.sm = vim.o.showmatch
+vim.go.showmatch = vim.o.showmatch
+vim.go.sm = vim.go.showmatch
+
+--- If in Insert, Replace or Visual mode put a message on the last line.
+--- The `hl-ModeMsg` highlight group determines the highlighting.
+--- The option has no effect when 'cmdheight' is zero.
+---
+--- @type boolean
+vim.o.showmode = true
+vim.o.smd = vim.o.showmode
+vim.go.showmode = vim.o.showmode
+vim.go.smd = vim.go.showmode
+
+--- The value of this option specifies when the line with tab page labels
+--- will be displayed:
+--- 	0: never
+--- 	1: only if there are at least two tab pages
+--- 	2: always
+--- This is both for the GUI and non-GUI implementation of the tab pages
+--- line.
+--- See `tab-page` for more information about tab pages.
+---
+--- @type integer
+vim.o.showtabline = 1
+vim.o.stal = vim.o.showtabline
+vim.go.showtabline = vim.o.showtabline
+vim.go.stal = vim.go.showtabline
+
+--- The minimal number of columns to scroll horizontally.  Used only when
+--- the 'wrap' option is off and the cursor is moved off of the screen.
+--- When it is zero the cursor will be put in the middle of the screen.
+--- When using a slow terminal set it to a large number or 0.  Not used
+--- for "zh" and "zl" commands.
+---
+--- @type integer
+vim.o.sidescroll = 1
+vim.o.ss = vim.o.sidescroll
+vim.go.sidescroll = vim.o.sidescroll
+vim.go.ss = vim.go.sidescroll
+
+--- The minimal number of screen columns to keep to the left and to the
+--- right of the cursor if 'nowrap' is set.  Setting this option to a
+--- value greater than 0 while having `'sidescroll'` also at a non-zero
+--- value makes some context visible in the line you are scrolling in
+--- horizontally (except at beginning of the line).  Setting this option
+--- to a large value (like 999) has the effect of keeping the cursor
+--- horizontally centered in the window, as long as one does not come too
+--- close to the beginning of the line.
+--- After using the local value, go back the global value with one of
+--- these two:
+--- ```
+--- 	setlocal sidescrolloff<
+--- 	setlocal sidescrolloff=-1
+--- ```
+--- Example: Try this together with 'sidescroll' and 'listchars' as
+--- 	 in the following example to never allow the cursor to move
+--- 	 onto the "extends" character:
+--- ```
+---
+--- 	 :set nowrap sidescroll=1 listchars=extends:>,precedes:<
+--- 	 :set sidescrolloff=1
+--- ```
+---
+--- @type integer
+vim.o.sidescrolloff = 0
+vim.o.siso = vim.o.sidescrolloff
+vim.wo.sidescrolloff = vim.o.sidescrolloff
+vim.wo.siso = vim.wo.sidescrolloff
+vim.go.sidescrolloff = vim.o.sidescrolloff
+vim.go.siso = vim.go.sidescrolloff
+
+--- When and how to draw the signcolumn. Valid values are:
+---    "auto"	only when there is a sign to display
+---    "auto:[1-9]" resize to accommodate multiple signs up to the
+---                 given number (maximum 9), e.g. "auto:4"
+---    "auto:[1-8]-[2-9]"
+---                 resize to accommodate multiple signs up to the
+--- 		given maximum number (maximum 9) while keeping
+--- 		at least the given minimum (maximum 8) fixed
+--- 		space. The minimum number should always be less
+--- 		than the maximum number, e.g. "auto:2-5"
+---    "no"		never
+---    "yes"	always
+---    "yes:[1-9]"  always, with fixed space for signs up to the given
+---                 number (maximum 9), e.g. "yes:3"
+---    "number"	display signs in the 'number' column. If the number
+--- 		column is not present, then behaves like "auto".
+---
+--- Note regarding "orphaned signs": with signcolumn numbers higher than
+--- 1, deleting lines will also remove the associated signs automatically,
+--- in contrast to the default Vim behavior of keeping and grouping them.
+--- This is done in order for the signcolumn appearance not appear weird
+--- during line deletion.
+---
+--- @type string
+vim.o.signcolumn = "auto"
+vim.o.scl = vim.o.signcolumn
+vim.wo.signcolumn = vim.o.signcolumn
+vim.wo.scl = vim.wo.signcolumn
+
+--- Override the 'ignorecase' option if the search pattern contains upper
+--- case characters.  Only used when the search pattern is typed and
+--- 'ignorecase' option is on.  Used for the commands "/", "?", "n", "N",
+--- ":g" and ":s".  Not used for "*", "#", "gd", tag search, etc.  After
+--- "*" and "#" you can make 'smartcase' used by doing a "/" command,
+--- recalling the search pattern from history and hitting <Enter>.
+---
+--- @type boolean
+vim.o.smartcase = false
+vim.o.scs = vim.o.smartcase
+vim.go.smartcase = vim.o.smartcase
+vim.go.scs = vim.go.smartcase
+
+--- Do smart autoindenting when starting a new line.  Works for C-like
+--- programs, but can also be used for other languages.  'cindent' does
+--- something like this, works better in most cases, but is more strict,
+--- see `C-indenting`.  When 'cindent' is on or 'indentexpr' is set,
+--- setting 'si' has no effect.  'indentexpr' is a more advanced
+--- alternative.
+--- Normally 'autoindent' should also be on when using 'smartindent'.
+--- An indent is automatically inserted:
+--- - After a line ending in "{".
+--- - After a line starting with a keyword from 'cinwords'.
+--- - Before a line starting with "}" (only with the "O" command).
+--- When typing '}' as the first character in a new line, that line is
+--- given the same indent as the matching "{".
+--- When typing '#' as the first character in a new line, the indent for
+--- that line is removed, the '#' is put in the first column.  The indent
+--- is restored for the next line.  If you don't want this, use this
+--- mapping: ":inoremap # X^H#", where ^H is entered with CTRL-V CTRL-H.
+--- When using the ">>" command, lines starting with '#' are not shifted
+--- right.
+---
+--- @type boolean
+vim.o.smartindent = false
+vim.o.si = vim.o.smartindent
+vim.bo.smartindent = vim.o.smartindent
+vim.bo.si = vim.bo.smartindent
+
+--- When on, a <Tab> in front of a line inserts blanks according to
+--- 'shiftwidth'.  'tabstop' or 'softtabstop' is used in other places.  A
+--- <BS> will delete a 'shiftwidth' worth of space at the start of the
+--- line.
+--- When off, a <Tab> always inserts blanks according to 'tabstop' or
+--- 'softtabstop'.  'shiftwidth' is only used for shifting text left or
+--- right `shift-left-right`.
+--- What gets inserted (a <Tab> or spaces) depends on the 'expandtab'
+--- option.  Also see `ins-expandtab`.  When 'expandtab' is not set, the
+--- number of spaces is minimized by using <Tab>s.
+---
+--- @type boolean
+vim.o.smarttab = true
+vim.o.sta = vim.o.smarttab
+vim.go.smarttab = vim.o.smarttab
+vim.go.sta = vim.go.smarttab
+
+--- Scrolling works with screen lines.  When 'wrap' is set and the first
+--- line in the window wraps part of it may not be visible, as if it is
+--- above the window. "<<<" is displayed at the start of the first line,
+--- highlighted with `hl-NonText`.
+--- You may also want to add "lastline" to the 'display' option to show as
+--- much of the last line as possible.
+--- NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y
+--- and scrolling with the mouse.
+---
+--- @type boolean
+vim.o.smoothscroll = false
+vim.o.sms = vim.o.smoothscroll
+vim.wo.smoothscroll = vim.o.smoothscroll
+vim.wo.sms = vim.wo.smoothscroll
+
+--- Number of spaces that a <Tab> counts for while performing editing
+--- operations, like inserting a <Tab> or using <BS>.  It "feels" like
+--- <Tab>s are being inserted, while in fact a mix of spaces and <Tab>s is
+--- used.  This is useful to keep the 'ts' setting at its standard value
+--- of 8, while being able to edit like it is set to 'sts'.  However,
+--- commands like "x" still work on the actual characters.
+--- When 'sts' is zero, this feature is off.
+--- When 'sts' is negative, the value of 'shiftwidth' is used.
+--- See also `ins-expandtab`.  When 'expandtab' is not set, the number of
+--- spaces is minimized by using <Tab>s.
+--- The 'L' flag in 'cpoptions' changes how tabs are used when 'list' is
+--- set.
+---
+--- The value of 'softtabstop' will be ignored if `'varsofttabstop'` is set
+--- to anything other than an empty string.
+---
+--- @type integer
+vim.o.softtabstop = 0
+vim.o.sts = vim.o.softtabstop
+vim.bo.softtabstop = vim.o.softtabstop
+vim.bo.sts = vim.bo.softtabstop
+
+--- When on spell checking will be done.  See `spell`.
+--- The languages are specified with 'spelllang'.
+---
+--- @type boolean
+vim.o.spell = false
+vim.wo.spell = vim.o.spell
+
+--- Pattern to locate the end of a sentence.  The following word will be
+--- checked to start with a capital letter.  If not then it is highlighted
+--- with SpellCap `hl-SpellCap` (unless the word is also badly spelled).
+--- When this check is not wanted make this option empty.
+--- Only used when 'spell' is set.
+--- Be careful with special characters, see `option-backslash` about
+--- including spaces and backslashes.
+--- To set this option automatically depending on the language, see
+--- `set-spc-auto`.
+---
+--- @type string
+vim.o.spellcapcheck = "[.?!]\\_[\\])'\"\\t ]\\+"
+vim.o.spc = vim.o.spellcapcheck
+vim.bo.spellcapcheck = vim.o.spellcapcheck
+vim.bo.spc = vim.bo.spellcapcheck
+
+--- Name of the word list file where words are added for the `zg` and `zw`
+--- commands.  It must end in ".{encoding}.add".  You need to include the
+--- path, otherwise the file is placed in the current directory.
+--- The path may include characters from 'isfname', space, comma and '@'.
+--- 							*E765*
+--- It may also be a comma-separated list of names.  A count before the
+--- `zg` and `zw` commands can be used to access each.  This allows using
+--- a personal word list file and a project word list file.
+--- When a word is added while this option is empty Vim will set it for
+--- you: Using the first directory in 'runtimepath' that is writable.  If
+--- there is no "spell" directory yet it will be created.  For the file
+--- name the first language name that appears in 'spelllang' is used,
+--- ignoring the region.
+--- The resulting ".spl" file will be used for spell checking, it does not
+--- have to appear in 'spelllang'.
+--- Normally one file is used for all regions, but you can add the region
+--- name if you want to.  However, it will then only be used when
+--- 'spellfile' is set to it, for entries in 'spelllang' only files
+--- without region name will be found.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.spellfile = ""
+vim.o.spf = vim.o.spellfile
+vim.bo.spellfile = vim.o.spellfile
+vim.bo.spf = vim.bo.spellfile
+
+--- A comma-separated list of word list names.  When the 'spell' option is
+--- on spellchecking will be done for these languages.  Example:
+--- ```
+--- 	set spelllang=en_us,nl,medical
+--- ```
+--- This means US English, Dutch and medical words are recognized.  Words
+--- that are not recognized will be highlighted.
+--- The word list name must consist of alphanumeric characters, a dash or
+--- an underscore.  It should not include a comma or dot.  Using a dash is
+--- recommended to separate the two letter language name from a
+--- specification.  Thus "en-rare" is used for rare English words.
+--- A region name must come last and have the form "_xx", where "xx" is
+--- the two-letter, lower case region name.  You can use more than one
+--- region by listing them: "en_us,en_ca" supports both US and Canadian
+--- English, but not words specific for Australia, New Zealand or Great
+--- Britain. (Note: currently en_au and en_nz dictionaries are older than
+--- en_ca, en_gb and en_us).
+--- If the name "cjk" is included East Asian characters are excluded from
+--- spell checking.  This is useful when editing text that also has Asian
+--- words.
+--- Note that the "medical" dictionary does not exist, it is just an
+--- example of a longer name.
+--- 						*E757*
+--- As a special case the name of a .spl file can be given as-is.  The
+--- first "_xx" in the name is removed and used as the region name
+--- (_xx is an underscore, two letters and followed by a non-letter).
+--- This is mainly for testing purposes.  You must make sure the correct
+--- encoding is used, Vim doesn't check it.
+--- How the related spell files are found is explained here: `spell-load`.
+---
+--- If the `spellfile.vim` plugin is active and you use a language name
+--- for which Vim cannot find the .spl file in 'runtimepath' the plugin
+--- will ask you if you want to download the file.
+---
+--- After this option has been set successfully, Vim will source the files
+--- "spell/LANG.vim" in 'runtimepath'.  "LANG" is the value of 'spelllang'
+--- up to the first character that is not an ASCII letter or number and
+--- not a dash.  Also see `set-spc-auto`.
+---
+--- @type string
+vim.o.spelllang = "en"
+vim.o.spl = vim.o.spelllang
+vim.bo.spelllang = vim.o.spelllang
+vim.bo.spl = vim.bo.spelllang
+
+--- A comma-separated list of options for spell checking:
+--- camel		When a word is CamelCased, assume "Cased" is a
+--- 		separate word: every upper-case character in a word
+--- 		that comes after a lower case character indicates the
+--- 		start of a new word.
+--- noplainbuffer	Only spellcheck a buffer when 'syntax' is enabled,
+--- 		or when extmarks are set within the buffer. Only
+--- 		designated regions of the buffer are spellchecked in
+--- 		this case.
+---
+--- @type string
+vim.o.spelloptions = ""
+vim.o.spo = vim.o.spelloptions
+vim.bo.spelloptions = vim.o.spelloptions
+vim.bo.spo = vim.bo.spelloptions
+
+--- Methods used for spelling suggestions.  Both for the `z=` command and
+--- the `spellsuggest()` function.  This is a comma-separated list of
+--- items:
+---
+--- best		Internal method that works best for English.  Finds
+--- 		changes like "fast" and uses a bit of sound-a-like
+--- 		scoring to improve the ordering.
+---
+--- double		Internal method that uses two methods and mixes the
+--- 		results.  The first method is "fast", the other method
+--- 		computes how much the suggestion sounds like the bad
+--- 		word.  That only works when the language specifies
+--- 		sound folding.  Can be slow and doesn't always give
+--- 		better results.
+---
+--- fast		Internal method that only checks for simple changes:
+--- 		character inserts/deletes/swaps.  Works well for
+--- 		simple typing mistakes.
+---
+--- {number}	The maximum number of suggestions listed for `z=`.
+--- 		Not used for `spellsuggest()`.  The number of
+--- 		suggestions is never more than the value of 'lines'
+--- 		minus two.
+---
+--- timeout:{millisec}   Limit the time searching for suggestions to
+--- 		{millisec} milli seconds.  Applies to the following
+--- 		methods.  When omitted the limit is 5000. When
+--- 		negative there is no limit.
+---
+--- file:{filename} Read file {filename}, which must have two columns,
+--- 		separated by a slash.  The first column contains the
+--- 		bad word, the second column the suggested good word.
+--- 		Example:
+--- 			theribal/terrible ~
+--- 		Use this for common mistakes that do not appear at the
+--- 		top of the suggestion list with the internal methods.
+--- 		Lines without a slash are ignored, use this for
+--- 		comments.
+--- 		The word in the second column must be correct,
+--- 		otherwise it will not be used.  Add the word to an
+--- 		".add" file if it is currently flagged as a spelling
+--- 		mistake.
+--- 		The file is used for all languages.
+---
+--- expr:{expr}	Evaluate expression {expr}.  Use a function to avoid
+--- 		trouble with spaces.  `v:val` holds the badly spelled
+--- 		word.  The expression must evaluate to a List of
+--- 		Lists, each with a suggestion and a score.
+--- 		Example:
+--- 			[['the', 33], ['that', 44]] ~
+--- 		Set 'verbose' and use `z=` to see the scores that the
+--- 		internal methods use.  A lower score is better.
+--- 		This may invoke `spellsuggest()` if you temporarily
+--- 		set 'spellsuggest' to exclude the "expr:" part.
+--- 		Errors are silently ignored, unless you set the
+--- 		'verbose' option to a non-zero value.
+---
+--- Only one of "best", "double" or "fast" may be used.  The others may
+--- appear several times in any order.  Example:
+--- ```
+--- 	:set sps=file:~/.config/nvim/sugg,best,expr:MySuggest()
+--- ```
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.spellsuggest = "best"
+vim.o.sps = vim.o.spellsuggest
+vim.go.spellsuggest = vim.o.spellsuggest
+vim.go.sps = vim.go.spellsuggest
+
+--- When on, splitting a window will put the new window below the current
+--- one. `:split`
+---
+--- @type boolean
+vim.o.splitbelow = false
+vim.o.sb = vim.o.splitbelow
+vim.go.splitbelow = vim.o.splitbelow
+vim.go.sb = vim.go.splitbelow
+
+--- The value of this option determines the scroll behavior when opening,
+--- closing or resizing horizontal splits.
+---
+--- Possible values are:
+---   cursor	Keep the same relative cursor position.
+---   screen	Keep the text on the same screen line.
+---   topline	Keep the topline the same.
+---
+--- For the "screen" and "topline" values, the cursor position will be
+--- changed when necessary. In this case, the jumplist will be populated
+--- with the previous cursor position. For "screen", the text cannot always
+--- be kept on the same screen line when 'wrap' is enabled.
+---
+--- @type string
+vim.o.splitkeep = "cursor"
+vim.o.spk = vim.o.splitkeep
+vim.go.splitkeep = vim.o.splitkeep
+vim.go.spk = vim.go.splitkeep
+
+--- When on, splitting a window will put the new window right of the
+--- current one. `:vsplit`
+---
+--- @type boolean
+vim.o.splitright = false
+vim.o.spr = vim.o.splitright
+vim.go.splitright = vim.o.splitright
+vim.go.spr = vim.go.splitright
+
+--- When "on" the commands listed below move the cursor to the first
+--- non-blank of the line.  When off the cursor is kept in the same column
+--- (if possible).  This applies to the commands:
+--- - CTRL-D, CTRL-U, CTRL-B, CTRL-F, "G", "H", "M", "L", "gg"
+--- - "d", "<<" and ">>" with a linewise operator
+--- - "%" with a count
+--- - buffer changing commands (CTRL-^, :bnext, :bNext, etc.)
+--- - Ex commands that only have a line number, e.g., ":25" or ":+".
+--- In case of buffer changing commands the cursor is placed at the column
+--- where it was the last time the buffer was edited.
+---
+--- @type boolean
+vim.o.startofline = false
+vim.o.sol = vim.o.startofline
+vim.go.startofline = vim.o.startofline
+vim.go.sol = vim.go.startofline
+
+--- EXPERIMENTAL
+--- When non-empty, this option determines the content of the area to the
+--- side of a window, normally containing the fold, sign and number columns.
+--- The format of this option is like that of 'statusline'.
+---
+--- Some of the items from the 'statusline' format are different for
+--- 'statuscolumn':
+---
+--- %l	line number of currently drawn line
+--- %r	relative line number of currently drawn line
+--- %s	sign column for currently drawn line
+--- %C	fold column for currently drawn line
+---
+--- NOTE: To draw the sign and fold columns, their items must be included in
+--- 'statuscolumn'. Even when they are not included, the status column width
+--- will adapt to the 'signcolumn' and 'foldcolumn' width.
+---
+--- The `v:lnum`    variable holds the line number to be drawn.
+--- The `v:relnum`  variable holds the relative line number to be drawn.
+--- The `v:virtnum` variable is negative when drawing virtual lines, zero
+--- 	      when drawing the actual buffer line, and positive when
+--- 	      drawing the wrapped part of a buffer line.
+---
+--- NOTE: The %@ click execute function item is supported as well but the
+--- specified function will be the same for each row in the same column.
+--- It cannot be switched out through a dynamic 'statuscolumn' format, the
+--- handler should be written with this in mind.
+---
+--- Examples:
+--- ```vim
+--- 	" Relative number with bar separator and click handlers:
+--- 	:set statuscolumn=%@SignCb@%s%=%T%@NumCb@%r│%T
+---
+--- 	" Right aligned relative cursor line number:
+--- 	:let &stc='%=%{v:relnum?v:relnum:v:lnum} '
+---
+--- 	" Line numbers in hexadecimal for non wrapped part of lines:
+--- 	:let &stc='%=%{v:virtnum>0?"":printf("%x",v:lnum)} '
+---
+--- 	" Human readable line numbers with thousands separator:
+--- 	:let &stc='%{substitute(v:lnum,"\\d\\zs\\ze\\'
+--- 		   . '%(\\d\\d\\d\\)\\+$",",","g")}'
+---
+--- 	" Both relative and absolute line numbers with different
+--- 	" highlighting for odd and even relative numbers:
+--- 	:let &stc='%#NonText#%{&nu?v:lnum:""}' .
+--- 	 '%=%{&rnu&&(v:lnum%2)?"\ ".v:relnum:""}' .
+--- 	 '%#LineNr#%{&rnu&&!(v:lnum%2)?"\ ".v:relnum:""}'
+---
+--- ```
+--- WARNING: this expression is evaluated for each screen line so defining
+--- an expensive expression can negatively affect render performance.
+---
+--- @type string
+vim.o.statuscolumn = ""
+vim.o.stc = vim.o.statuscolumn
+vim.wo.statuscolumn = vim.o.statuscolumn
+vim.wo.stc = vim.wo.statuscolumn
+
+--- When non-empty, this option determines the content of the status line.
+--- Also see `status-line`.
+---
+--- The option consists of printf style '%' items interspersed with
+--- normal text.  Each status line item is of the form:
+---   %-0{minwid}.{maxwid}{item}
+--- All fields except the {item} are optional.  A single percent sign can
+--- be given as "%%".
+---
+--- When the option starts with "%!" then it is used as an expression,
+--- evaluated and the result is used as the option value.  Example:
+--- ```
+--- 	:set statusline=%!MyStatusLine()
+--- ```
+--- The *g:statusline_winid* variable will be set to the `window-ID` of the
+--- window that the status line belongs to.
+--- The result can contain %{} items that will be evaluated too.
+--- Note that the "%!" expression is evaluated in the context of the
+--- current window and buffer, while %{} items are evaluated in the
+--- context of the window that the statusline belongs to.
+---
+--- When there is error while evaluating the option then it will be made
+--- empty to avoid further errors.  Otherwise screen updating would loop.
+--- When the result contains unprintable characters the result is
+--- unpredictable.
+---
+--- Note that the only effect of 'ruler' when this option is set (and
+--- 'laststatus' is 2 or 3) is controlling the output of `CTRL-G`.
+---
+--- field	    meaning ~
+--- -	    Left justify the item.  The default is right justified
+--- 	    when minwid is larger than the length of the item.
+--- 0	    Leading zeroes in numeric items.  Overridden by "-".
+--- minwid	    Minimum width of the item, padding as set by "-" & "0".
+--- 	    Value must be 50 or less.
+--- maxwid	    Maximum width of the item.  Truncation occurs with a "<"
+--- 	    on the left for text items.  Numeric items will be
+--- 	    shifted down to maxwid-2 digits followed by ">"number
+--- 	    where number is the amount of missing digits, much like
+--- 	    an exponential notation.
+--- item	    A one letter code as described below.
+---
+--- Following is a description of the possible statusline items.  The
+--- second character in "item" is the type:
+--- 	N for number
+--- 	S for string
+--- 	F for flags as described below
+--- 	- not applicable
+---
+--- item  meaning ~
+--- f S   Path to the file in the buffer, as typed or relative to current
+---       directory.
+--- F S   Full path to the file in the buffer.
+--- t S   File name (tail) of file in the buffer.
+--- m F   Modified flag, text is "[+]"; "[-]" if 'modifiable' is off.
+--- M F   Modified flag, text is ",+" or ",-".
+--- r F   Readonly flag, text is "[RO]".
+--- R F   Readonly flag, text is ",RO".
+--- h F   Help buffer flag, text is "[help]".
+--- H F   Help buffer flag, text is ",HLP".
+--- w F   Preview window flag, text is "[Preview]".
+--- W F   Preview window flag, text is ",PRV".
+--- y F   Type of file in the buffer, e.g., "[vim]".  See 'filetype'.
+--- Y F   Type of file in the buffer, e.g., ",VIM".  See 'filetype'.
+--- q S   "[Quickfix List]", "[Location List]" or empty.
+--- k S   Value of "b:keymap_name" or 'keymap' when `:lmap` mappings are
+---       being used: "<keymap>"
+--- n N   Buffer number.
+--- b N   Value of character under cursor.
+--- B N   As above, in hexadecimal.
+--- o N   Byte number in file of byte under cursor, first byte is 1.
+---       Mnemonic: Offset from start of file (with one added)
+--- O N   As above, in hexadecimal.
+--- l N   Line number.
+--- L N   Number of lines in buffer.
+--- c N   Column number (byte index).
+--- v N   Virtual column number (screen column).
+--- V N   Virtual column number as -{num}.  Not displayed if equal to 'c'.
+--- p N   Percentage through file in lines as in `CTRL-G`.
+--- P S   Percentage through file of displayed window.  This is like the
+---       percentage described for 'ruler'.  Always 3 in length, unless
+---       translated.
+--- S S   'showcmd' content, see 'showcmdloc'.
+--- a S   Argument list status as in default title.  ({current} of {max})
+---       Empty if the argument file count is zero or one.
+--- { NF  Evaluate expression between "%{" and "}" and substitute result.
+---       Note that there is no "%" before the closing "}".  The
+---       expression cannot contain a "}" character, call a function to
+---       work around that.  See `stl-%{` below.
+--- `{%` -  This is almost same as "{" except the result of the expression is
+---       re-evaluated as a statusline format string.  Thus if the
+---       return value of expr contains "%" items they will get expanded.
+---       The expression can contain the "}" character, the end of
+---       expression is denoted by "%}".
+---       For example:
+--- ```
+--- 	func! Stl_filename() abort
+--- 	    return "%t"
+--- 	endfunc
+--- ```
+--- `stl=%{Stl_filename()}`   results in `"%t"`
+---         `stl=%{%Stl_filename()%}` results in `"Name of current file"`
+--- %} -  End of "{%" expression
+--- ( -   Start of item group.  Can be used for setting the width and
+---       alignment of a section.  Must be followed by %) somewhere.
+--- ) -   End of item group.  No width fields allowed.
+--- T N   For 'tabline': start of tab page N label.  Use %T or %X to end
+---       the label.  Clicking this label with left mouse button switches
+---       to the specified tab page.
+--- X N   For 'tabline': start of close tab N label.  Use %X or %T to end
+---       the label, e.g.: %3Xclose%X.  Use %999X for a "close current
+---       tab" label.    Clicking this label with left mouse button closes
+---       specified tab page.
+--- @ N   Start of execute function label. Use %X or %T to
+---       end the label, e.g.: %10@SwitchBuffer@foo.c%X.  Clicking this
+---       label runs specified function: in the example when clicking once
+---       using left mouse button on "foo.c" "SwitchBuffer(10, 1, 'l',
+---       '    ')" expression will be run.  Function receives the
+---       following arguments in order:
+---       1. minwid field value or zero if no N was specified
+---       2. number of mouse clicks to detect multiple clicks
+---       3. mouse button used: "l", "r" or "m" for left, right or middle
+---          button respectively; one should not rely on third argument
+---          being only "l", "r" or "m": any other non-empty string value
+---          that contains only ASCII lower case letters may be expected
+---          for other mouse buttons
+---       4. modifiers pressed: string which contains "s" if shift
+---          modifier was pressed, "c" for control, "a" for alt and "m"
+---          for meta; currently if modifier is not pressed string
+---          contains space instead, but one should not rely on presence
+---          of spaces or specific order of modifiers: use `stridx()` to
+---          test whether some modifier is present; string is guaranteed
+---          to contain only ASCII letters and spaces, one letter per
+---          modifier; "?" modifier may also be present, but its presence
+---          is a bug that denotes that new mouse button recognition was
+---          added without modifying code that reacts on mouse clicks on
+---          this label.
+---       Use `getmousepos()`.winid in the specified function to get the
+---       corresponding window id of the clicked item.
+--- \< -   Where to truncate line if too long.  Default is at the start.
+---       No width fields allowed.
+--- = -   Separation point between alignment sections.  Each section will
+---       be separated by an equal number of spaces.  With one %= what
+---       comes after it will be right-aligned.  With two %= there is a
+---       middle part, with white space left and right of it.
+---       No width fields allowed.
+--- # -   Set highlight group.  The name must follow and then a # again.
+---       Thus use %#HLname# for highlight group HLname.  The same
+---       highlighting is used, also for the statusline of non-current
+---       windows.
+--- * -   Set highlight group to User{N}, where {N} is taken from the
+---       minwid field, e.g. %1*.  Restore normal highlight with %* or %0*.
+---       The difference between User{N} and StatusLine will be applied to
+---       StatusLineNC for the statusline of non-current windows.
+---       The number N must be between 1 and 9.  See `hl-User1..9`
+---
+--- When displaying a flag, Vim removes the leading comma, if any, when
+--- that flag comes right after plaintext.  This will make a nice display
+--- when flags are used like in the examples below.
+---
+--- When all items in a group becomes an empty string (i.e. flags that are
+--- not set) and a minwid is not set for the group, the whole group will
+--- become empty.  This will make a group like the following disappear
+--- completely from the statusline when none of the flags are set.
+--- ```
+--- 	:set statusline=...%(\ [%M%R%H]%)...
+--- ```
+--- Beware that an expression is evaluated each and every time the status
+--- line is displayed.
+--- 			*stl-%{* *g:actual_curbuf* *g:actual_curwin*
+--- While evaluating %{} the current buffer and current window will be set
+--- temporarily to that of the window (and buffer) whose statusline is
+--- currently being drawn.  The expression will evaluate in this context.
+--- The variable "g:actual_curbuf" is set to the `bufnr()` number of the
+--- real current buffer and "g:actual_curwin" to the `window-ID` of the
+--- real current window.  These values are strings.
+---
+--- The 'statusline' option will be evaluated in the `sandbox` if set from
+--- a modeline, see `sandbox-option`.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- It is not allowed to change text or jump to another window while
+--- evaluating 'statusline' `textlock`.
+---
+--- If the statusline is not updated when you want it (e.g., after setting
+--- a variable that's used in an expression), you can force an update by
+--- using `:redrawstatus`.
+---
+--- A result of all digits is regarded a number for display purposes.
+--- Otherwise the result is taken as flag text and applied to the rules
+--- described above.
+---
+--- Watch out for errors in expressions.  They may render Vim unusable!
+--- If you are stuck, hold down ':' or 'Q' to get a prompt, then quit and
+--- edit your vimrc or whatever with "vim --clean" to get it right.
+---
+--- Examples:
+--- Emulate standard status line with 'ruler' set
+--- ```
+---   :set statusline=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P
+--- ```
+--- Similar, but add ASCII value of char under the cursor (like "ga")
+--- ```
+---   :set statusline=%<%f%h%m%r%=%b\ 0x%B\ \ %l,%c%V\ %P
+--- ```
+--- Display byte count and byte value, modified flag in red.
+--- ```
+---   :set statusline=%<%f%=\ [%1*%M%*%n%R%H]\ %-19(%3l,%02c%03V%)%O'%02b'
+---   :hi User1 term=inverse,bold cterm=inverse,bold ctermfg=red
+--- ```
+--- Display a ,GZ flag if a compressed file is loaded
+--- ```
+---   :set statusline=...%r%{VarExists('b:gzflag','\ [GZ]')}%h...
+--- ```
+--- In the `:autocmd`'s:
+--- ```
+---   :let b:gzflag = 1
+--- ```
+--- And:
+--- ```
+---   :unlet b:gzflag
+--- ```
+--- And define this function:
+--- ```
+---   :function VarExists(var, val)
+---   :    if exists(a:var) | return a:val | else | return '' | endif
+---   :endfunction
+--- ```
+---
+--- @type string
+vim.o.statusline = ""
+vim.o.stl = vim.o.statusline
+vim.wo.statusline = vim.o.statusline
+vim.wo.stl = vim.wo.statusline
+vim.go.statusline = vim.o.statusline
+vim.go.stl = vim.go.statusline
+
+--- Files with these suffixes get a lower priority when multiple files
+--- match a wildcard.  See `suffixes`.  Commas can be used to separate the
+--- suffixes.  Spaces after the comma are ignored.  A dot is also seen as
+--- the start of a suffix.  To avoid a dot or comma being recognized as a
+--- separator, precede it with a backslash (see `option-backslash` about
+--- including spaces and backslashes).
+--- See 'wildignore' for completely ignoring files.
+--- The use of `:set+=` and `:set-=` is preferred when adding or removing
+--- suffixes from the list.  This avoids problems when a future version
+--- uses another default.
+---
+--- @type string
+vim.o.suffixes = ".bak,~,.o,.h,.info,.swp,.obj"
+vim.o.su = vim.o.suffixes
+vim.go.suffixes = vim.o.suffixes
+vim.go.su = vim.go.suffixes
+
+--- Comma-separated list of suffixes, which are used when searching for a
+--- file for the "gf", "[I", etc. commands.  Example:
+--- ```
+--- 	:set suffixesadd=.java
+--- ```
+---
+--- @type string
+vim.o.suffixesadd = ""
+vim.o.sua = vim.o.suffixesadd
+vim.bo.suffixesadd = vim.o.suffixesadd
+vim.bo.sua = vim.bo.suffixesadd
+
+--- Use a swapfile for the buffer.  This option can be reset when a
+--- swapfile is not wanted for a specific buffer.  For example, with
+--- confidential information that even root must not be able to access.
+--- Careful: All text will be in memory:
+--- 	- Don't use this for big files.
+--- 	- Recovery will be impossible!
+--- A swapfile will only be present when `'updatecount'` is non-zero and
+--- 'swapfile' is set.
+--- When 'swapfile' is reset, the swap file for the current buffer is
+--- immediately deleted.  When 'swapfile' is set, and 'updatecount' is
+--- non-zero, a swap file is immediately created.
+--- Also see `swap-file`.
+--- If you want to open a new buffer without creating a swap file for it,
+--- use the `:noswapfile` modifier.
+--- See 'directory' for where the swap file is created.
+---
+--- This option is used together with 'bufhidden' and 'buftype' to
+--- specify special kinds of buffers.   See `special-buffers`.
+---
+--- @type boolean
+vim.o.swapfile = true
+vim.o.swf = vim.o.swapfile
+vim.bo.swapfile = vim.o.swapfile
+vim.bo.swf = vim.bo.swapfile
+
+--- This option controls the behavior when switching between buffers.
+--- This option is checked, when
+--- - jumping to errors with the `quickfix` commands (`:cc`, `:cn`, `:cp`,
+---   etc.)
+--- - jumping to a tag using the `:stag` command.
+--- - opening a file using the `CTRL-W_f` or `CTRL-W_F` command.
+--- - jumping to a buffer using a buffer split command (e.g.  `:sbuffer`,
+---   `:sbnext`, or `:sbrewind`).
+--- Possible values (comma-separated list):
+---    useopen	If included, jump to the first open window in the
+--- 		current tab page that contains the specified buffer
+--- 		(if there is one).  Otherwise: Do not examine other
+--- 		windows.
+---    usetab	Like "useopen", but also consider windows in other tab
+--- 		pages.
+---    split	If included, split the current window before loading
+--- 		a buffer for a `quickfix` command that display errors.
+--- 		Otherwise: do not split, use current window (when used
+--- 		in the quickfix window: the previously used window or
+--- 		split if there is no other window).
+---    vsplit	Just like "split" but split vertically.
+---    newtab	Like "split", but open a new tab page.  Overrules
+--- 		"split" when both are present.
+---    uselast	If included, jump to the previously used window when
+--- 		jumping to errors with `quickfix` commands.
+---
+--- @type string
+vim.o.switchbuf = "uselast"
+vim.o.swb = vim.o.switchbuf
+vim.go.switchbuf = vim.o.switchbuf
+vim.go.swb = vim.go.switchbuf
+
+--- Maximum column in which to search for syntax items.  In long lines the
+--- text after this column is not highlighted and following lines may not
+--- be highlighted correctly, because the syntax state is cleared.
+--- This helps to avoid very slow redrawing for an XML file that is one
+--- long line.
+--- Set to zero to remove the limit.
+---
+--- @type integer
+vim.o.synmaxcol = 3000
+vim.o.smc = vim.o.synmaxcol
+vim.bo.synmaxcol = vim.o.synmaxcol
+vim.bo.smc = vim.bo.synmaxcol
+
+--- When this option is set, the syntax with this name is loaded, unless
+--- syntax highlighting has been switched off with ":syntax off".
+--- Otherwise this option does not always reflect the current syntax (the
+--- b:current_syntax variable does).
+--- This option is most useful in a modeline, for a file which syntax is
+--- not automatically recognized.  Example, in an IDL file:
+--- ```
+--- 	/* vim: set syntax=idl : */
+--- ```
+--- When a dot appears in the value then this separates two filetype
+--- names.  Example:
+--- ```
+--- 	/* vim: set syntax=c.doxygen : */
+--- ```
+--- This will use the "c" syntax first, then the "doxygen" syntax.
+--- Note that the second one must be prepared to be loaded as an addition,
+--- otherwise it will be skipped.  More than one dot may appear.
+--- To switch off syntax highlighting for the current file, use:
+--- ```
+--- 	:set syntax=OFF
+--- ```
+--- To switch syntax highlighting on according to the current value of the
+--- 'filetype' option:
+--- ```
+--- 	:set syntax=ON
+--- ```
+--- What actually happens when setting the 'syntax' option is that the
+--- Syntax autocommand event is triggered with the value as argument.
+--- This option is not copied to another buffer, independent of the 's' or
+--- 'S' flag in 'cpoptions'.
+--- Only normal file name characters can be used, `/\*?[|<>` are illegal.
+---
+--- @type string
+vim.o.syntax = ""
+vim.o.syn = vim.o.syntax
+vim.bo.syntax = vim.o.syntax
+vim.bo.syn = vim.bo.syntax
+
+--- When non-empty, this option determines the content of the tab pages
+--- line at the top of the Vim window.  When empty Vim will use a default
+--- tab pages line.  See `setting-tabline` for more info.
+---
+--- The tab pages line only appears as specified with the 'showtabline'
+--- option and only when there is no GUI tab line.  When 'e' is in
+--- 'guioptions' and the GUI supports a tab line 'guitablabel' is used
+--- instead.  Note that the two tab pages lines are very different.
+---
+--- The value is evaluated like with 'statusline'.  You can use
+--- `tabpagenr()`, `tabpagewinnr()` and `tabpagebuflist()` to figure out
+--- the text to be displayed.  Use "%1T" for the first label, "%2T" for
+--- the second one, etc.  Use "%X" items for closing labels.
+---
+--- When changing something that is used in 'tabline' that does not
+--- trigger it to be updated, use `:redrawtabline`.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- Keep in mind that only one of the tab pages is the current one, others
+--- are invisible and you can't jump to their windows.
+---
+--- @type string
+vim.o.tabline = ""
+vim.o.tal = vim.o.tabline
+vim.go.tabline = vim.o.tabline
+vim.go.tal = vim.go.tabline
+
+--- Maximum number of tab pages to be opened by the `-p` command line
+--- argument or the ":tab all" command. `tabpage`
+---
+--- @type integer
+vim.o.tabpagemax = 50
+vim.o.tpm = vim.o.tabpagemax
+vim.go.tabpagemax = vim.o.tabpagemax
+vim.go.tpm = vim.go.tabpagemax
+
+--- Number of spaces that a <Tab> in the file counts for.  Also see
+--- the `:retab` command, and the 'softtabstop' option.
+---
+--- Note: Setting 'tabstop' to any other value than 8 can make your file
+--- appear wrong in many places.
+--- The value must be more than 0 and less than 10000.
+---
+--- There are four main ways to use tabs in Vim:
+--- 1. Always keep 'tabstop' at 8, set 'softtabstop' and 'shiftwidth' to 4
+---    (or 3 or whatever you prefer) and use 'noexpandtab'.  Then Vim
+---    will use a mix of tabs and spaces, but typing <Tab> and <BS> will
+---    behave like a tab appears every 4 (or 3) characters.
+---    This is the recommended way, the file will look the same with other
+---    tools and when listing it in a terminal.
+--- 2. Set 'softtabstop' and 'shiftwidth' to whatever you prefer and use
+---    'expandtab'.  This way you will always insert spaces.  The
+---    formatting will never be messed up when 'tabstop' is changed (leave
+---    it at 8 just in case).  The file will be a bit larger.
+---    You do need to check if no Tabs exist in the file.  You can get rid
+---    of them by first setting 'expandtab' and using `%retab!`, making
+---    sure the value of 'tabstop' is set correctly.
+--- 3. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use
+---    'expandtab'.  This way you will always insert spaces.  The
+---    formatting will never be messed up when 'tabstop' is changed.
+---    You do need to check if no Tabs exist in the file, just like in the
+---    item just above.
+--- 4. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use a
+---    `modeline` to set these values when editing the file again.  Only
+---    works when using Vim to edit the file, other tools assume a tabstop
+---    is worth 8 spaces.
+--- 5. Always set 'tabstop' and 'shiftwidth' to the same value, and
+---    'noexpandtab'.  This should then work (for initial indents only)
+---    for any tabstop setting that people use.  It might be nice to have
+---    tabs after the first non-blank inserted as spaces if you do this
+---    though.  Otherwise aligned comments will be wrong when 'tabstop' is
+---    changed.
+---
+--- The value of 'tabstop' will be ignored if `'vartabstop'` is set to
+--- anything other than an empty string.
+---
+--- @type integer
+vim.o.tabstop = 8
+vim.o.ts = vim.o.tabstop
+vim.bo.tabstop = vim.o.tabstop
+vim.bo.ts = vim.bo.tabstop
+
+--- When searching for a tag (e.g., for the `:ta` command), Vim can either
+--- use a binary search or a linear search in a tags file.  Binary
+--- searching makes searching for a tag a LOT faster, but a linear search
+--- will find more tags if the tags file wasn't properly sorted.
+--- Vim normally assumes that your tags files are sorted, or indicate that
+--- they are not sorted.  Only when this is not the case does the
+--- 'tagbsearch' option need to be switched off.
+---
+--- When 'tagbsearch' is on, binary searching is first used in the tags
+--- files.  In certain situations, Vim will do a linear search instead for
+--- certain files, or retry all files with a linear search.  When
+--- 'tagbsearch' is off, only a linear search is done.
+---
+--- Linear searching is done anyway, for one file, when Vim finds a line
+--- at the start of the file indicating that it's not sorted:
+--- ```
+---    !_TAG_FILE_SORTED	0	/some comment/
+--- ```
+--- [The whitespace before and after the '0' must be a single <Tab>]
+---
+--- When a binary search was done and no match was found in any of the
+--- files listed in 'tags', and case is ignored or a pattern is used
+--- instead of a normal tag name, a retry is done with a linear search.
+--- Tags in unsorted tags files, and matches with different case will only
+--- be found in the retry.
+---
+--- If a tag file indicates that it is case-fold sorted, the second,
+--- linear search can be avoided when case is ignored.  Use a value of '2'
+--- in the "!_TAG_FILE_SORTED" line for this.  A tag file can be case-fold
+--- sorted with the -f switch to "sort" in most unices, as in the command:
+--- "sort -f -o tags tags".  For Universal ctags and Exuberant ctags
+--- version 5.x or higher (at least 5.5) the --sort=foldcase switch can be
+--- used for this as well.  Note that case must be folded to uppercase for
+--- this to work.
+---
+--- By default, tag searches are case-sensitive.  Case is ignored when
+--- 'ignorecase' is set and 'tagcase' is "followic", or when 'tagcase' is
+--- "ignore".
+--- Also when 'tagcase' is "followscs" and 'smartcase' is set, or
+--- 'tagcase' is "smart", and the pattern contains only lowercase
+--- characters.
+---
+--- When 'tagbsearch' is off, tags searching is slower when a full match
+--- exists, but faster when no full match exists.  Tags in unsorted tags
+--- files may only be found with 'tagbsearch' off.
+--- When the tags file is not sorted, or sorted in a wrong way (not on
+--- ASCII byte value), 'tagbsearch' should be off, or the line given above
+--- must be included in the tags file.
+--- This option doesn't affect commands that find all matching tags (e.g.,
+--- command-line completion and ":help").
+---
+--- @type boolean
+vim.o.tagbsearch = true
+vim.o.tbs = vim.o.tagbsearch
+vim.go.tagbsearch = vim.o.tagbsearch
+vim.go.tbs = vim.go.tagbsearch
+
+--- This option specifies how case is handled when searching the tags
+--- file:
+---    followic	Follow the 'ignorecase' option
+---    followscs    Follow the 'smartcase' and 'ignorecase' options
+---    ignore	Ignore case
+---    match	Match case
+---    smart	Ignore case unless an upper case letter is used
+---
+--- @type string
+vim.o.tagcase = "followic"
+vim.o.tc = vim.o.tagcase
+vim.bo.tagcase = vim.o.tagcase
+vim.bo.tc = vim.bo.tagcase
+vim.go.tagcase = vim.o.tagcase
+vim.go.tc = vim.go.tagcase
+
+--- This option specifies a function to be used to perform tag searches.
+--- The function gets the tag pattern and should return a List of matching
+--- tags.  See `tag-function` for an explanation of how to write the
+--- function and an example.  The value can be the name of a function, a
+--- `lambda` or a `Funcref`. See `option-value-function` for more
+--- information.
+---
+--- @type string
+vim.o.tagfunc = ""
+vim.o.tfu = vim.o.tagfunc
+vim.bo.tagfunc = vim.o.tagfunc
+vim.bo.tfu = vim.bo.tagfunc
+
+--- If non-zero, tags are significant up to this number of characters.
+---
+--- @type integer
+vim.o.taglength = 0
+vim.o.tl = vim.o.taglength
+vim.go.taglength = vim.o.taglength
+vim.go.tl = vim.go.taglength
+
+--- If on and using a tags file in another directory, file names in that
+--- tags file are relative to the directory where the tags file is.
+---
+--- @type boolean
+vim.o.tagrelative = true
+vim.o.tr = vim.o.tagrelative
+vim.go.tagrelative = vim.o.tagrelative
+vim.go.tr = vim.go.tagrelative
+
+--- Filenames for the tag command, separated by spaces or commas.  To
+--- include a space or comma in a file name, precede it with a backslash
+--- (see `option-backslash` about including spaces and backslashes).
+--- When a file name starts with "./", the '.' is replaced with the path
+--- of the current file.  But only when the 'd' flag is not included in
+--- 'cpoptions'.  Environment variables are expanded `:set_env`.  Also see
+--- `tags-option`.
+--- "*", "**" and other wildcards can be used to search for tags files in
+--- a directory tree.  See `file-searching`.  E.g., "/lib/**/tags" will
+--- find all files named "tags" below "/lib".  The filename itself cannot
+--- contain wildcards, it is used as-is.  E.g., "/lib/**/tags?" will find
+--- files called "tags?".
+--- The `tagfiles()` function can be used to get a list of the file names
+--- actually used.
+--- The use of `:set+=` and `:set-=` is preferred when adding or removing
+--- file names from the list.  This avoids problems when a future version
+--- uses another default.
+---
+--- @type string
+vim.o.tags = "./tags;,tags"
+vim.o.tag = vim.o.tags
+vim.bo.tags = vim.o.tags
+vim.bo.tag = vim.bo.tags
+vim.go.tags = vim.o.tags
+vim.go.tag = vim.go.tags
+
+--- When on, the `tagstack` is used normally.  When off, a ":tag" or
+--- ":tselect" command with an argument will not push the tag onto the
+--- tagstack.  A following ":tag" without an argument, a ":pop" command or
+--- any other command that uses the tagstack will use the unmodified
+--- tagstack, but does change the pointer to the active entry.
+--- Resetting this option is useful when using a ":tag" command in a
+--- mapping which should not change the tagstack.
+---
+--- @type boolean
+vim.o.tagstack = true
+vim.o.tgst = vim.o.tagstack
+vim.go.tagstack = vim.o.tagstack
+vim.go.tgst = vim.go.tagstack
+
+--- The terminal is in charge of Bi-directionality of text (as specified
+--- by Unicode).  The terminal is also expected to do the required shaping
+--- that some languages (such as Arabic) require.
+--- Setting this option implies that 'rightleft' will not be set when
+--- 'arabic' is set and the value of 'arabicshape' will be ignored.
+--- Note that setting 'termbidi' has the immediate effect that
+--- 'arabicshape' is ignored, but 'rightleft' isn't changed automatically.
+--- For further details see `arabic.txt`.
+---
+--- @type boolean
+vim.o.termbidi = false
+vim.o.tbidi = vim.o.termbidi
+vim.go.termbidi = vim.o.termbidi
+vim.go.tbidi = vim.go.termbidi
+
+--- Enables 24-bit RGB color in the `TUI`.  Uses "gui" `:highlight`
+--- attributes instead of "cterm" attributes. `guifg`
+--- Requires an ISO-8613-3 compatible terminal.
+---
+--- @type boolean
+vim.o.termguicolors = false
+vim.o.tgc = vim.o.termguicolors
+vim.go.termguicolors = vim.o.termguicolors
+vim.go.tgc = vim.go.termguicolors
+
+--- A comma-separated list of options for specifying control characters
+--- to be removed from the text pasted into the terminal window. The
+--- supported values are:
+---
+---    BS	    Backspace
+---
+---    HT	    TAB
+---
+---    FF	    Form feed
+---
+---    ESC	    Escape
+---
+---    DEL	    DEL
+---
+---    C0	    Other control characters, excluding Line feed and
+--- 	    Carriage return < ' '
+---
+---    C1	    Control characters 0x80...0x9F
+---
+--- @type string
+vim.o.termpastefilter = "BS,HT,ESC,DEL"
+vim.o.tpf = vim.o.termpastefilter
+vim.go.termpastefilter = vim.o.termpastefilter
+vim.go.tpf = vim.go.termpastefilter
+
+--- Maximum width of text that is being inserted.  A longer line will be
+--- broken after white space to get this width.  A zero value disables
+--- this.
+--- When 'textwidth' is zero, 'wrapmargin' may be used.  See also
+--- 'formatoptions' and `ins-textwidth`.
+--- When 'formatexpr' is set it will be used to break the line.
+---
+--- @type integer
+vim.o.textwidth = 0
+vim.o.tw = vim.o.textwidth
+vim.bo.textwidth = vim.o.textwidth
+vim.bo.tw = vim.bo.textwidth
+
+--- List of file names, separated by commas, that are used to lookup words
+--- for thesaurus completion commands `i_CTRL-X_CTRL-T`.  See
+--- `compl-thesaurus`.
+---
+--- This option is not used if 'thesaurusfunc' is set, either for the
+--- buffer or globally.
+---
+--- To include a comma in a file name precede it with a backslash.  Spaces
+--- after a comma are ignored, otherwise spaces are included in the file
+--- name.  See `option-backslash` about using backslashes.  The use of
+--- `:set+=` and `:set-=` is preferred when adding or removing directories
+--- from the list.  This avoids problems when a future version uses
+--- another default.  Backticks cannot be used in this option for security
+--- reasons.
+---
+--- @type string
+vim.o.thesaurus = ""
+vim.o.tsr = vim.o.thesaurus
+vim.bo.thesaurus = vim.o.thesaurus
+vim.bo.tsr = vim.bo.thesaurus
+vim.go.thesaurus = vim.o.thesaurus
+vim.go.tsr = vim.go.thesaurus
+
+--- This option specifies a function to be used for thesaurus completion
+--- with CTRL-X CTRL-T. `i_CTRL-X_CTRL-T` See `compl-thesaurusfunc`.
+--- The value can be the name of a function, a `lambda` or a `Funcref`.
+--- See `option-value-function` for more information.
+---
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.thesaurusfunc = ""
+vim.o.tsrfu = vim.o.thesaurusfunc
+vim.bo.thesaurusfunc = vim.o.thesaurusfunc
+vim.bo.tsrfu = vim.bo.thesaurusfunc
+vim.go.thesaurusfunc = vim.o.thesaurusfunc
+vim.go.tsrfu = vim.go.thesaurusfunc
+
+--- When on: The tilde command "~" behaves like an operator.
+---
+--- @type boolean
+vim.o.tildeop = false
+vim.o.top = vim.o.tildeop
+vim.go.tildeop = vim.o.tildeop
+vim.go.top = vim.go.tildeop
+
+--- This option and 'timeoutlen' determine the behavior when part of a
+--- mapped key sequence has been received. For example, if <c-f> is
+--- pressed and 'timeout' is set, Nvim will wait 'timeoutlen' milliseconds
+--- for any key that can follow <c-f> in a mapping.
+---
+--- @type boolean
+vim.o.timeout = true
+vim.o.to = vim.o.timeout
+vim.go.timeout = vim.o.timeout
+vim.go.to = vim.go.timeout
+
+--- Time in milliseconds to wait for a mapped sequence to complete.
+---
+--- @type integer
+vim.o.timeoutlen = 1000
+vim.o.tm = vim.o.timeoutlen
+vim.go.timeoutlen = vim.o.timeoutlen
+vim.go.tm = vim.go.timeoutlen
+
+--- When on, the title of the window will be set to the value of
+--- 'titlestring' (if it is not empty), or to:
+--- 	filename [+=-] (path) - NVIM
+--- Where:
+--- 	filename	the name of the file being edited
+--- 	-		indicates the file cannot be modified, 'ma' off
+--- 	+		indicates the file was modified
+--- 	=		indicates the file is read-only
+--- 	=+		indicates the file is read-only and modified
+--- 	(path)		is the path of the file being edited
+--- 	- NVIM		the server name `v:servername` or "NVIM"
+---
+--- @type boolean
+vim.o.title = false
+vim.go.title = vim.o.title
+
+--- Gives the percentage of 'columns' to use for the length of the window
+--- title.  When the title is longer, only the end of the path name is
+--- shown.  A '<' character before the path name is used to indicate this.
+--- Using a percentage makes this adapt to the width of the window.  But
+--- it won't work perfectly, because the actual number of characters
+--- available also depends on the font used and other things in the title
+--- bar.  When 'titlelen' is zero the full path is used.  Otherwise,
+--- values from 1 to 30000 percent can be used.
+--- 'titlelen' is also used for the 'titlestring' option.
+---
+--- @type integer
+vim.o.titlelen = 85
+vim.go.titlelen = vim.o.titlelen
+
+--- If not empty, this option will be used to set the window title when
+--- exiting.  Only if 'title' is enabled.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.titleold = ""
+vim.go.titleold = vim.o.titleold
+
+--- When this option is not empty, it will be used for the title of the
+--- window.  This happens only when the 'title' option is on.
+---
+--- When this option contains printf-style '%' items, they will be
+--- expanded according to the rules used for 'statusline'.
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- Example:
+--- ```
+---     :auto BufEnter * let &titlestring = hostname() .. "/" .. expand("%:p")
+---     :set title titlestring=%<%F%=%l/%L-%P titlelen=70
+--- ```
+--- The value of 'titlelen' is used to align items in the middle or right
+--- of the available space.
+--- Some people prefer to have the file name first:
+--- ```
+---     :set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:~:.:h\")})%)%(\ %a%)
+--- ```
+--- Note the use of "%{ }" and an expression to get the path of the file,
+--- without the file name.  The "%( %)" constructs are used to add a
+--- separating space only when needed.
+--- NOTE: Use of special characters in 'titlestring' may cause the display
+--- to be garbled (e.g., when it contains a CR or NL character).
+---
+--- @type string
+vim.o.titlestring = ""
+vim.go.titlestring = vim.o.titlestring
+
+--- This option and 'ttimeoutlen' determine the behavior when part of a
+--- key code sequence has been received by the `TUI`.
+---
+--- For example if <Esc> (the \x1b byte) is received and 'ttimeout' is
+--- set, Nvim waits 'ttimeoutlen' milliseconds for the terminal to
+--- complete a key code sequence. If no input arrives before the timeout,
+--- a single <Esc> is assumed. Many TUI cursor key codes start with <Esc>.
+---
+--- On very slow systems this may fail, causing cursor keys not to work
+--- sometimes.  If you discover this problem you can ":set ttimeoutlen=9999".
+--- Nvim will wait for the next character to arrive after an <Esc>.
+---
+--- @type boolean
+vim.o.ttimeout = true
+vim.go.ttimeout = vim.o.ttimeout
+
+--- Time in milliseconds to wait for a key code sequence to complete. Also
+--- used for CTRL-\ CTRL-N and CTRL-\ CTRL-G when part of a command has
+--- been typed.
+---
+--- @type integer
+vim.o.ttimeoutlen = 50
+vim.o.ttm = vim.o.ttimeoutlen
+vim.go.ttimeoutlen = vim.o.ttimeoutlen
+vim.go.ttm = vim.go.ttimeoutlen
+
+--- List of directory names for undo files, separated with commas.
+--- See 'backupdir' for details of the format.
+--- "." means using the directory of the file.  The undo file name for
+--- "file.txt" is ".file.txt.un~".
+--- For other directories the file name is the full path of the edited
+--- file, with path separators replaced with "%".
+--- When writing: The first directory that exists is used.  "." always
+--- works, no directories after "." will be used for writing.  If none of
+--- the directories exist Nvim will attempt to create the last directory in
+--- the list.
+--- When reading all entries are tried to find an undo file.  The first
+--- undo file that exists is used.  When it cannot be read an error is
+--- given, no further entry is used.
+--- See `undo-persistence`.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- Note that unlike 'directory' and 'backupdir', 'undodir' always acts as
+--- though the trailing slashes are present (see 'backupdir' for what this
+--- means).
+---
+--- @type string
+vim.o.undodir = "$XDG_STATE_HOME/nvim/undo//"
+vim.o.udir = vim.o.undodir
+vim.go.undodir = vim.o.undodir
+vim.go.udir = vim.go.undodir
+
+--- When on, Vim automatically saves undo history to an undo file when
+--- writing a buffer to a file, and restores undo history from the same
+--- file on buffer read.
+--- The directory where the undo file is stored is specified by 'undodir'.
+--- For more information about this feature see `undo-persistence`.
+--- The undo file is not read when 'undoreload' causes the buffer from
+--- before a reload to be saved for undo.
+--- When 'undofile' is turned off the undo file is NOT deleted.
+---
+--- @type boolean
+vim.o.undofile = false
+vim.o.udf = vim.o.undofile
+vim.bo.undofile = vim.o.undofile
+vim.bo.udf = vim.bo.undofile
+
+--- Maximum number of changes that can be undone.  Since undo information
+--- is kept in memory, higher numbers will cause more memory to be used.
+--- Nevertheless, a single change can already use a large amount of memory.
+--- Set to 0 for Vi compatibility: One level of undo and "u" undoes
+--- itself:
+--- ```
+--- 	set ul=0
+--- ```
+--- But you can also get Vi compatibility by including the 'u' flag in
+--- 'cpoptions', and still be able to use CTRL-R to repeat undo.
+--- Also see `undo-two-ways`.
+--- Set to -1 for no undo at all.  You might want to do this only for the
+--- current buffer:
+--- ```
+--- 	setlocal ul=-1
+--- ```
+--- This helps when you run out of memory for a single change.
+---
+--- The local value is set to -123456 when the global value is to be used.
+---
+--- Also see `clear-undo`.
+---
+--- @type integer
+vim.o.undolevels = 1000
+vim.o.ul = vim.o.undolevels
+vim.bo.undolevels = vim.o.undolevels
+vim.bo.ul = vim.bo.undolevels
+vim.go.undolevels = vim.o.undolevels
+vim.go.ul = vim.go.undolevels
+
+--- Save the whole buffer for undo when reloading it.  This applies to the
+--- ":e!" command and reloading for when the buffer changed outside of
+--- Vim. `FileChangedShell`
+--- The save only happens when this option is negative or when the number
+--- of lines is smaller than the value of this option.
+--- Set this option to zero to disable undo for a reload.
+---
+--- When saving undo for a reload, any undo file is not read.
+---
+--- Note that this causes the whole buffer to be stored in memory.  Set
+--- this option to a lower value if you run out of memory.
+---
+--- @type integer
+vim.o.undoreload = 10000
+vim.o.ur = vim.o.undoreload
+vim.go.undoreload = vim.o.undoreload
+vim.go.ur = vim.go.undoreload
+
+--- After typing this many characters the swap file will be written to
+--- disk.  When zero, no swap file will be created at all (see chapter on
+--- recovery `crash-recovery`).  'updatecount' is set to zero by starting
+--- Vim with the "-n" option, see `startup`.  When editing in readonly
+--- mode this option will be initialized to 10000.
+--- The swapfile can be disabled per buffer with `'swapfile'`.
+--- When 'updatecount' is set from zero to non-zero, swap files are
+--- created for all buffers that have 'swapfile' set.  When 'updatecount'
+--- is set to zero, existing swap files are not deleted.
+--- This option has no meaning in buffers where `'buftype'` is "nofile"
+--- or "nowrite".
+---
+--- @type integer
+vim.o.updatecount = 200
+vim.o.uc = vim.o.updatecount
+vim.go.updatecount = vim.o.updatecount
+vim.go.uc = vim.go.updatecount
+
+--- If this many milliseconds nothing is typed the swap file will be
+--- written to disk (see `crash-recovery`).  Also used for the
+--- `CursorHold` autocommand event.
+---
+--- @type integer
+vim.o.updatetime = 4000
+vim.o.ut = vim.o.updatetime
+vim.go.updatetime = vim.o.updatetime
+vim.go.ut = vim.go.updatetime
+
+--- A list of the number of spaces that a <Tab> counts for while editing,
+--- such as inserting a <Tab> or using <BS>.  It "feels" like variable-
+--- width <Tab>s are being inserted, while in fact a mixture of spaces
+--- and <Tab>s is used.  Tab widths are separated with commas, with the
+--- final value applying to all subsequent tabs.
+---
+--- For example, when editing assembly language files where statements
+--- start in the 9th column and comments in the 41st, it may be useful
+--- to use the following:
+--- ```
+--- 	:set varsofttabstop=8,32,8
+--- ```
+--- This will set soft tabstops with 8 and 8 + 32 spaces, and 8 more
+--- for every column thereafter.
+---
+--- Note that the value of `'softtabstop'` will be ignored while
+--- 'varsofttabstop' is set.
+---
+--- @type string
+vim.o.varsofttabstop = ""
+vim.o.vsts = vim.o.varsofttabstop
+vim.bo.varsofttabstop = vim.o.varsofttabstop
+vim.bo.vsts = vim.bo.varsofttabstop
+
+--- A list of the number of spaces that a <Tab> in the file counts for,
+--- separated by commas.  Each value corresponds to one tab, with the
+--- final value applying to all subsequent tabs. For example:
+--- ```
+--- 	:set vartabstop=4,20,10,8
+--- ```
+--- This will make the first tab 4 spaces wide, the second 20 spaces,
+--- the third 10 spaces, and all following tabs 8 spaces.
+---
+--- Note that the value of `'tabstop'` will be ignored while 'vartabstop'
+--- is set.
+---
+--- @type string
+vim.o.vartabstop = ""
+vim.o.vts = vim.o.vartabstop
+vim.bo.vartabstop = vim.o.vartabstop
+vim.bo.vts = vim.bo.vartabstop
+
+--- Sets the verbosity level.  Also set by `-V` and `:verbose`.
+---
+--- Tracing of options in Lua scripts is activated at level 1; Lua scripts
+--- are not traced with verbose=0, for performance.
+---
+--- If greater than or equal to a given level, Nvim produces the following
+--- messages:
+---
+--- Level   Messages ~
+--- ----------------------------------------------------------------------
+--- 1	Lua assignments to options, mappings, etc.
+--- 2	When a file is ":source"'ed, or `shada` file is read or written.
+--- 3	UI info, terminal capabilities.
+--- 4	Shell commands.
+--- 5	Every searched tags file and include file.
+--- 8	Files for which a group of autocommands is executed.
+--- 9	Executed autocommands.
+--- 11	Finding items in a path.
+--- 12	Vimscript function calls.
+--- 13	When an exception is thrown, caught, finished, or discarded.
+--- 14	Anything pending in a ":finally" clause.
+--- 15	Ex commands from a script (truncated at 200 characters).
+--- 16	Ex commands.
+---
+--- If 'verbosefile' is set then the verbose messages are not displayed.
+---
+--- @type integer
+vim.o.verbose = 0
+vim.o.vbs = vim.o.verbose
+vim.go.verbose = vim.o.verbose
+vim.go.vbs = vim.go.verbose
+
+--- When not empty all messages are written in a file with this name.
+--- When the file exists messages are appended.
+--- Writing to the file ends when Vim exits or when 'verbosefile' is made
+--- empty.  Writes are buffered, thus may not show up for some time.
+--- Setting 'verbosefile' to a new value is like making it empty first.
+--- The difference with `:redir` is that verbose messages are not
+--- displayed when 'verbosefile' is set.
+---
+--- @type string
+vim.o.verbosefile = ""
+vim.o.vfile = vim.o.verbosefile
+vim.go.verbosefile = vim.o.verbosefile
+vim.go.vfile = vim.go.verbosefile
+
+--- Name of the directory where to store files for `:mkview`.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
+---
+--- @type string
+vim.o.viewdir = "$XDG_STATE_HOME/nvim/view//"
+vim.o.vdir = vim.o.viewdir
+vim.go.viewdir = vim.o.viewdir
+vim.go.vdir = vim.go.viewdir
+
+--- Changes the effect of the `:mkview` command.  It is a comma-separated
+--- list of words.  Each word enables saving and restoring something:
+---    word		save and restore ~
+---    cursor	cursor position in file and in window
+---    curdir	local current directory, if set with `:lcd`
+---    folds	manually created folds, opened/closed folds and local
+--- 		fold options
+---    options	options and mappings local to a window or buffer (not
+--- 		global values for local options)
+---    localoptions same as "options"
+---    slash	`deprecated` Always enabled. Uses "/" in filenames.
+---    unix		`deprecated` Always enabled. Uses "\n" line endings.
+---
+--- @type string
+vim.o.viewoptions = "folds,cursor,curdir"
+vim.o.vop = vim.o.viewoptions
+vim.go.viewoptions = vim.o.viewoptions
+vim.go.vop = vim.go.viewoptions
+
+--- A comma-separated list of these words:
+---     block	Allow virtual editing in Visual block mode.
+---     insert	Allow virtual editing in Insert mode.
+---     all		Allow virtual editing in all modes.
+---     onemore	Allow the cursor to move just past the end of the line
+---     none	When used as the local value, do not allow virtual
+--- 		editing even when the global value is set.  When used
+--- 		as the global value, "none" is the same as "".
+---     NONE	Alternative spelling of "none".
+---
+--- Virtual editing means that the cursor can be positioned where there is
+--- no actual character.  This can be halfway into a tab or beyond the end
+--- of the line.  Useful for selecting a rectangle in Visual mode and
+--- editing a table.
+--- "onemore" is not the same, it will only allow moving the cursor just
+--- after the last character of the line.  This makes some commands more
+--- consistent.  Previously the cursor was always past the end of the line
+--- if the line was empty.  But it is far from Vi compatible.  It may also
+--- break some plugins or Vim scripts.  For example because `l` can move
+--- the cursor after the last character.  Use with care!
+--- Using the `$` command will move to the last character in the line, not
+--- past it.  This may actually move the cursor to the left!
+--- The `g$` command will move to the end of the screen line.
+--- It doesn't make sense to combine "all" with "onemore", but you will
+--- not get a warning for it.
+--- When combined with other words, "none" is ignored.
+---
+--- @type string
+vim.o.virtualedit = ""
+vim.o.ve = vim.o.virtualedit
+vim.wo.virtualedit = vim.o.virtualedit
+vim.wo.ve = vim.wo.virtualedit
+vim.go.virtualedit = vim.o.virtualedit
+vim.go.ve = vim.go.virtualedit
+
+--- Use visual bell instead of beeping.  Also see 'errorbells'.
+---
+--- @type boolean
+vim.o.visualbell = false
+vim.o.vb = vim.o.visualbell
+vim.go.visualbell = vim.o.visualbell
+vim.go.vb = vim.go.visualbell
+
+--- Give a warning message when a shell command is used while the buffer
+--- has been changed.
+---
+--- @type boolean
+vim.o.warn = true
+vim.go.warn = vim.o.warn
+
+--- Allow specified keys that move the cursor left/right to move to the
+--- previous/next line when the cursor is on the first/last character in
+--- the line.  Concatenate characters to allow this for these keys:
+--- 	char   key	  mode	~
+--- 	 b    <BS>	 Normal and Visual
+--- 	 s    <Space>	 Normal and Visual
+--- 	 h    "h"	 Normal and Visual (not recommended)
+--- 	 l    "l"	 Normal and Visual (not recommended)
+--- 	 <    <Left>	 Normal and Visual
+--- 	 >    <Right>	 Normal and Visual
+--- 	 ~    "~"	 Normal
+--- 	 [    <Left>	 Insert and Replace
+--- 	 ]    <Right>	 Insert and Replace
+--- For example:
+--- ```
+--- 	:set ww=<,>,[,]
+--- ```
+--- allows wrap only when cursor keys are used.
+--- When the movement keys are used in combination with a delete or change
+--- operator, the <EOL> also counts for a character.  This makes "3h"
+--- different from "3dh" when the cursor crosses the end of a line.  This
+--- is also true for "x" and "X", because they do the same as "dl" and
+--- "dh".  If you use this, you may also want to use the mapping
+--- ":map <BS> X" to make backspace delete the character in front of the
+--- cursor.
+--- When 'l' is included and it is used after an operator at the end of a
+--- line (not an empty line) then it will not move to the next line.  This
+--- makes "dl", "cl", "yl" etc. work normally.
+---
+--- @type string
+vim.o.whichwrap = "b,s"
+vim.o.ww = vim.o.whichwrap
+vim.go.whichwrap = vim.o.whichwrap
+vim.go.ww = vim.go.whichwrap
+
+--- Character you have to type to start wildcard expansion in the
+--- command-line, as specified with 'wildmode'.
+--- More info here: `cmdline-completion`.
+--- The character is not recognized when used inside a macro.  See
+--- 'wildcharm' for that.
+--- Some keys will not work, such as CTRL-C, <CR> and Enter.
+--- Although 'wc' is a number option, you can set it to a special key:
+--- ```
+--- 	:set wc=<Tab>
+--- ```
+---
+--- @type integer
+vim.o.wildchar = 9
+vim.o.wc = vim.o.wildchar
+vim.go.wildchar = vim.o.wildchar
+vim.go.wc = vim.go.wildchar
+
+--- 'wildcharm' works exactly like 'wildchar', except that it is
+--- recognized when used inside a macro.  You can find "spare" command-line
+--- keys suitable for this option by looking at `ex-edit-index`.  Normally
+--- you'll never actually type 'wildcharm', just use it in mappings that
+--- automatically invoke completion mode, e.g.:
+--- ```
+--- 	:set wcm=<C-Z>
+--- 	:cnoremap ss so $vim/sessions/*.vim<C-Z>
+--- ```
+--- Then after typing :ss you can use CTRL-P & CTRL-N.
+---
+--- @type integer
+vim.o.wildcharm = 0
+vim.o.wcm = vim.o.wildcharm
+vim.go.wildcharm = vim.o.wildcharm
+vim.go.wcm = vim.go.wildcharm
+
+--- A list of file patterns.  A file that matches with one of these
+--- patterns is ignored when expanding `wildcards`, completing file or
+--- directory names, and influences the result of `expand()`, `glob()` and
+--- `globpath()` unless a flag is passed to disable this.
+--- The pattern is used like with `:autocmd`, see `autocmd-pattern`.
+--- Also see 'suffixes'.
+--- Example:
+--- ```
+--- 	:set wildignore=*.o,*.obj
+--- ```
+--- The use of `:set+=` and `:set-=` is preferred when adding or removing
+--- a pattern from the list.  This avoids problems when a future version
+--- uses another default.
+---
+--- @type string
+vim.o.wildignore = ""
+vim.o.wig = vim.o.wildignore
+vim.go.wildignore = vim.o.wildignore
+vim.go.wig = vim.go.wildignore
+
+--- When set case is ignored when completing file names and directories.
+--- Has no effect when 'fileignorecase' is set.
+--- Does not apply when the shell is used to expand wildcards, which
+--- happens when there are special characters.
+---
+--- @type boolean
+vim.o.wildignorecase = false
+vim.o.wic = vim.o.wildignorecase
+vim.go.wildignorecase = vim.o.wildignorecase
+vim.go.wic = vim.go.wildignorecase
+
+--- When 'wildmenu' is on, command-line completion operates in an enhanced
+--- mode.  On pressing 'wildchar' (usually <Tab>) to invoke completion,
+--- the possible matches are shown.
+--- When 'wildoptions' contains "pum", then the completion matches are
+--- shown in a popup menu.  Otherwise they are displayed just above the
+--- command line, with the first match highlighted (overwriting the status
+--- line, if there is one).
+--- Keys that show the previous/next match, such as <Tab> or
+--- CTRL-P/CTRL-N, cause the highlight to move to the appropriate match.
+--- 'wildmode' must specify "full": "longest" and "list" do not start
+--- 'wildmenu' mode. You can check the current mode with `wildmenumode()`.
+--- The menu is cancelled when a key is hit that is not used for selecting
+--- a completion.
+---
+--- While the menu is active these keys have special meanings:
+---
+--- CTRL-Y		- accept the currently selected match and stop
+--- 		  completion.
+--- CTRL-E		- end completion, go back to what was there before
+--- 		  selecting a match.
+--- <Left> <Right>	- select previous/next match (like CTRL-P/CTRL-N)
+--- <Down>		- in filename/menu name completion: move into a
+--- 		  subdirectory or submenu.
+--- <CR>		- in menu completion, when the cursor is just after a
+--- 		  dot: move into a submenu.
+--- <Up>		- in filename/menu name completion: move up into
+--- 		  parent directory or parent menu.
+---
+--- If you want <Left> and <Right> to move the cursor instead of selecting
+--- a different match, use this:
+--- ```
+--- 	:cnoremap <Left> <Space><BS><Left>
+--- 	:cnoremap <Right> <Space><BS><Right>
+--- ```
+--- `hl-WildMenu` highlights the current match.
+---
+--- @type boolean
+vim.o.wildmenu = true
+vim.o.wmnu = vim.o.wildmenu
+vim.go.wildmenu = vim.o.wildmenu
+vim.go.wmnu = vim.go.wildmenu
+
+--- Completion mode that is used for the character specified with
+--- 'wildchar'.  It is a comma-separated list of up to four parts.  Each
+--- part specifies what to do for each consecutive use of 'wildchar'.  The
+--- first part specifies the behavior for the first use of 'wildchar',
+--- The second part for the second use, etc.
+---
+--- Each part consists of a colon separated list consisting of the
+--- following possible values:
+--- ""		Complete only the first match.
+--- "full"		Complete the next full match.  After the last match,
+--- 		the original string is used and then the first match
+--- 		again.  Will also start 'wildmenu' if it is enabled.
+--- "longest"	Complete till longest common string.  If this doesn't
+--- 		result in a longer string, use the next part.
+--- "list"		When more than one match, list all matches.
+--- "lastused"	When completing buffer names and more than one buffer
+--- 		matches, sort buffers by time last used (other than
+--- 		the current buffer).
+--- When there is only a single match, it is fully completed in all cases.
+---
+--- Examples of useful colon-separated values:
+--- "longest:full"	Like "longest", but also start 'wildmenu' if it is
+--- 		enabled.  Will not complete to the next full match.
+--- "list:full"	When more than one match, list all matches and
+--- 		complete first match.
+--- "list:longest"	When more than one match, list all matches and
+--- 		complete till longest common string.
+--- "list:lastused" When more than one buffer matches, list all matches
+--- 		and sort buffers by time last used (other than the
+--- 		current buffer).
+---
+--- Examples:
+--- ```
+--- 	:set wildmode=full
+--- ```
+--- Complete first full match, next match, etc.  (the default)
+--- ```
+--- 	:set wildmode=longest,full
+--- ```
+--- Complete longest common string, then each full match
+--- ```
+--- 	:set wildmode=list:full
+--- ```
+--- List all matches and complete each full match
+--- ```
+--- 	:set wildmode=list,full
+--- ```
+--- List all matches without completing, then each full match
+--- ```
+--- 	:set wildmode=longest,list
+--- ```
+--- Complete longest common string, then list alternatives.
+--- More info here: `cmdline-completion`.
+---
+--- @type string
+vim.o.wildmode = "full"
+vim.o.wim = vim.o.wildmode
+vim.go.wildmode = vim.o.wildmode
+vim.go.wim = vim.go.wildmode
+
+--- A list of words that change how `cmdline-completion` is done.
+--- The following values are supported:
+---   fuzzy		Use `fuzzy-matching` to find completion matches. When
+--- 		this value is specified, wildcard expansion will not
+--- 		be used for completion.  The matches will be sorted by
+--- 		the "best match" rather than alphabetically sorted.
+--- 		This will find more matches than the wildcard
+--- 		expansion. Currently fuzzy matching based completion
+--- 		is not supported for file and directory names and
+--- 		instead wildcard expansion is used.
+---   pum		Display the completion matches using the popup menu
+--- 		in the same style as the `ins-completion-menu`.
+---   tagfile	When using CTRL-D to list matching tags, the kind of
+--- 		tag and the file of the tag is listed.	Only one match
+--- 		is displayed per line.  Often used tag kinds are:
+--- 			d	#define
+--- 			f	function
+---
+--- @type string
+vim.o.wildoptions = "pum,tagfile"
+vim.o.wop = vim.o.wildoptions
+vim.go.wildoptions = vim.o.wildoptions
+vim.go.wop = vim.go.wildoptions
+
+--- 		only used in Win32
+--- Some GUI versions allow the access to menu entries by using the ALT
+--- key in combination with a character that appears underlined in the
+--- menu.  This conflicts with the use of the ALT key for mappings and
+--- entering special characters.  This option tells what to do:
+---   no	Don't use ALT keys for menus.  ALT key combinations can be
+--- 	mapped, but there is no automatic handling.
+---   yes	ALT key handling is done by the windowing system.  ALT key
+--- 	combinations cannot be mapped.
+---   menu	Using ALT in combination with a character that is a menu
+--- 	shortcut key, will be handled by the windowing system.  Other
+--- 	keys can be mapped.
+--- If the menu is disabled by excluding 'm' from 'guioptions', the ALT
+--- key is never used for the menu.
+--- This option is not used for <F10>; on Win32.
+---
+--- @type string
+vim.o.winaltkeys = "menu"
+vim.o.wak = vim.o.winaltkeys
+vim.go.winaltkeys = vim.o.winaltkeys
+vim.go.wak = vim.go.winaltkeys
+
+--- When non-empty, this option enables the window bar and determines its
+--- contents. The window bar is a bar that's shown at the top of every
+--- window with it enabled. The value of 'winbar' is evaluated like with
+--- 'statusline'.
+---
+--- When changing something that is used in 'winbar' that does not trigger
+--- it to be updated, use `:redrawstatus`.
+---
+--- Floating windows do not use the global value of 'winbar'. The
+--- window-local value of 'winbar' must be set for a floating window to
+--- have a window bar.
+---
+--- This option cannot be set in a modeline when 'modelineexpr' is off.
+---
+--- @type string
+vim.o.winbar = ""
+vim.o.wbr = vim.o.winbar
+vim.wo.winbar = vim.o.winbar
+vim.wo.wbr = vim.wo.winbar
+vim.go.winbar = vim.o.winbar
+vim.go.wbr = vim.go.winbar
+
+--- Enables pseudo-transparency for a floating window. Valid values are in
+--- the range of 0 for fully opaque window (disabled) to 100 for fully
+--- transparent background. Values between 0-30 are typically most useful.
+---
+--- UI-dependent. Works best with RGB colors. 'termguicolors'
+---
+--- @type integer
+vim.o.winblend = 0
+vim.o.winbl = vim.o.winblend
+vim.wo.winblend = vim.o.winblend
+vim.wo.winbl = vim.wo.winblend
+
+--- Window height used for `CTRL-F` and `CTRL-B` when there is only one
+--- window and the value is smaller than 'lines' minus one.  The screen
+--- will scroll 'window' minus two lines, with a minimum of one.
+--- When 'window' is equal to 'lines' minus one CTRL-F and CTRL-B scroll
+--- in a much smarter way, taking care of wrapping lines.
+--- When resizing the Vim window, the value is smaller than 1 or more than
+--- or equal to 'lines' it will be set to 'lines' minus 1.
+--- Note: Do not confuse this with the height of the Vim window, use
+--- 'lines' for that.
+---
+--- @type integer
+vim.o.window = 0
+vim.o.wi = vim.o.window
+vim.go.window = vim.o.window
+vim.go.wi = vim.go.window
+
+--- Keep the window height when windows are opened or closed and
+--- 'equalalways' is set.  Also for `CTRL-W_=`.  Set by default for the
+--- `preview-window` and `quickfix-window`.
+--- The height may be changed anyway when running out of room.
+---
+--- @type boolean
+vim.o.winfixheight = false
+vim.o.wfh = vim.o.winfixheight
+vim.wo.winfixheight = vim.o.winfixheight
+vim.wo.wfh = vim.wo.winfixheight
+
+--- Keep the window width when windows are opened or closed and
+--- 'equalalways' is set.  Also for `CTRL-W_=`.
+--- The width may be changed anyway when running out of room.
+---
+--- @type boolean
+vim.o.winfixwidth = false
+vim.o.wfw = vim.o.winfixwidth
+vim.wo.winfixwidth = vim.o.winfixwidth
+vim.wo.wfw = vim.wo.winfixwidth
+
+--- Minimal number of lines for the current window.  This is not a hard
+--- minimum, Vim will use fewer lines if there is not enough room.  If the
+--- focus goes to a window that is smaller, its size is increased, at the
+--- cost of the height of other windows.
+--- Set 'winheight' to a small number for normal editing.
+--- Set it to 999 to make the current window fill most of the screen.
+--- Other windows will be only 'winminheight' high.  This has the drawback
+--- that ":all" will create only two windows.  To avoid "vim -o 1 2 3 4"
+--- to create only two windows, set the option after startup is done,
+--- using the `VimEnter` event:
+--- ```
+--- 	au VimEnter * set winheight=999
+--- ```
+--- Minimum value is 1.
+--- The height is not adjusted after one of the commands that change the
+--- height of the current window.
+--- 'winheight' applies to the current window.  Use 'winminheight' to set
+--- the minimal height for other windows.
+---
+--- @type integer
+vim.o.winheight = 1
+vim.o.wh = vim.o.winheight
+vim.go.winheight = vim.o.winheight
+vim.go.wh = vim.go.winheight
+
+--- Window-local highlights.  Comma-delimited list of highlight
+--- `group-name` pairs "{hl-from}:{hl-to},..." where each {hl-from} is
+--- a `highlight-groups` item to be overridden by {hl-to} group in
+--- the window.
+---
+--- Note: highlight namespaces take precedence over 'winhighlight'.
+--- See `nvim_win_set_hl_ns()` and `nvim_set_hl()`.
+---
+--- Highlights of vertical separators are determined by the window to the
+--- left of the separator.  The 'tabline' highlight of a tabpage is
+--- decided by the last-focused window of the tabpage.  Highlights of
+--- the popupmenu are determined by the current window.  Highlights in the
+--- message area cannot be overridden.
+---
+--- Example: show a different color for non-current windows:
+--- ```
+--- 	set winhighlight=Normal:MyNormal,NormalNC:MyNormalNC
+--- ```
+---
+--- @type string
+vim.o.winhighlight = ""
+vim.o.winhl = vim.o.winhighlight
+vim.wo.winhighlight = vim.o.winhighlight
+vim.wo.winhl = vim.wo.winhighlight
+
+--- The minimal height of a window, when it's not the current window.
+--- This is a hard minimum, windows will never become smaller.
+--- When set to zero, windows may be "squashed" to zero lines (i.e. just a
+--- status bar) if necessary.  They will return to at least one line when
+--- they become active (since the cursor has to have somewhere to go.)
+--- Use 'winheight' to set the minimal height of the current window.
+--- This option is only checked when making a window smaller.  Don't use a
+--- large number, it will cause errors when opening more than a few
+--- windows.  A value of 0 to 3 is reasonable.
+---
+--- @type integer
+vim.o.winminheight = 1
+vim.o.wmh = vim.o.winminheight
+vim.go.winminheight = vim.o.winminheight
+vim.go.wmh = vim.go.winminheight
+
+--- The minimal width of a window, when it's not the current window.
+--- This is a hard minimum, windows will never become smaller.
+--- When set to zero, windows may be "squashed" to zero columns (i.e. just
+--- a vertical separator) if necessary.  They will return to at least one
+--- line when they become active (since the cursor has to have somewhere
+--- to go.)
+--- Use 'winwidth' to set the minimal width of the current window.
+--- This option is only checked when making a window smaller.  Don't use a
+--- large number, it will cause errors when opening more than a few
+--- windows.  A value of 0 to 12 is reasonable.
+---
+--- @type integer
+vim.o.winminwidth = 1
+vim.o.wmw = vim.o.winminwidth
+vim.go.winminwidth = vim.o.winminwidth
+vim.go.wmw = vim.go.winminwidth
+
+--- Minimal number of columns for the current window.  This is not a hard
+--- minimum, Vim will use fewer columns if there is not enough room.  If
+--- the current window is smaller, its size is increased, at the cost of
+--- the width of other windows.  Set it to 999 to make the current window
+--- always fill the screen.  Set it to a small number for normal editing.
+--- The width is not adjusted after one of the commands to change the
+--- width of the current window.
+--- 'winwidth' applies to the current window.  Use 'winminwidth' to set
+--- the minimal width for other windows.
+---
+--- @type integer
+vim.o.winwidth = 20
+vim.o.wiw = vim.o.winwidth
+vim.go.winwidth = vim.o.winwidth
+vim.go.wiw = vim.go.winwidth
+
+--- This option changes how text is displayed.  It doesn't change the text
+--- in the buffer, see 'textwidth' for that.
+--- When on, lines longer than the width of the window will wrap and
+--- displaying continues on the next line.  When off lines will not wrap
+--- and only part of long lines will be displayed.  When the cursor is
+--- moved to a part that is not shown, the screen will scroll
+--- horizontally.
+--- The line will be broken in the middle of a word if necessary.  See
+--- 'linebreak' to get the break at a word boundary.
+--- To make scrolling horizontally a bit more useful, try this:
+--- ```
+--- 	:set sidescroll=5
+--- 	:set listchars+=precedes:<,extends:>
+--- ```
+--- See 'sidescroll', 'listchars' and `wrap-off`.
+--- This option can't be set from a `modeline` when the 'diff' option is
+--- on.
+---
+--- @type boolean
+vim.o.wrap = true
+vim.wo.wrap = vim.o.wrap
+
+--- Number of characters from the right window border where wrapping
+--- starts.  When typing text beyond this limit, an <EOL> will be inserted
+--- and inserting continues on the next line.
+--- Options that add a margin, such as 'number' and 'foldcolumn', cause
+--- the text width to be further reduced.
+--- When 'textwidth' is non-zero, this option is not used.
+--- See also 'formatoptions' and `ins-textwidth`.
+---
+--- @type integer
+vim.o.wrapmargin = 0
+vim.o.wm = vim.o.wrapmargin
+vim.bo.wrapmargin = vim.o.wrapmargin
+vim.bo.wm = vim.bo.wrapmargin
+
+--- Searches wrap around the end of the file.  Also applies to `]s` and
+--- `[s`, searching for spelling mistakes.
+---
+--- @type boolean
+vim.o.wrapscan = true
+vim.o.ws = vim.o.wrapscan
+vim.go.wrapscan = vim.o.wrapscan
+vim.go.ws = vim.go.wrapscan
+
+--- Allows writing files.  When not set, writing a file is not allowed.
+--- Can be used for a view-only mode, where modifications to the text are
+--- still allowed.  Can be reset with the `-m` or `-M` command line
+--- argument.  Filtering text is still possible, even though this requires
+--- writing a temporary file.
+---
+--- @type boolean
+vim.o.write = true
+vim.go.write = vim.o.write
+
+--- Allows writing to any file with no need for "!" override.
+---
+--- @type boolean
+vim.o.writeany = false
+vim.o.wa = vim.o.writeany
+vim.go.writeany = vim.o.writeany
+vim.go.wa = vim.go.writeany
+
+--- Make a backup before overwriting a file.  The backup is removed after
+--- the file was successfully written, unless the 'backup' option is
+--- also on.
+--- WARNING: Switching this option off means that when Vim fails to write
+--- your buffer correctly and then, for whatever reason, Vim exits, you
+--- lose both the original file and what you were writing.  Only reset
+--- this option if your file system is almost full and it makes the write
+--- fail (and make sure not to exit Vim until the write was successful).
+--- See `backup-table` for another explanation.
+--- When the 'backupskip' pattern matches, a backup is not made anyway.
+--- Depending on 'backupcopy' the backup is a new file or the original
+--- file renamed (and a new file is written).
+---
+--- @type boolean
+vim.o.writebackup = true
+vim.o.wb = vim.o.writebackup
+vim.go.writebackup = vim.o.writebackup
+vim.go.wb = vim.go.writebackup
+
+--- Only takes effect together with 'redrawdebug'.
+--- The number of milliseconds to wait after each line or each flush
+---
+--- @type integer
+vim.o.writedelay = 0
+vim.o.wd = vim.o.writedelay
+vim.go.writedelay = vim.o.writedelay
+vim.go.wd = vim.go.writedelay
-- 
cgit 


From 1f252a8ac0d1ca23777978fcef07bd7fab309494 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 5 Aug 2023 07:55:45 +0800
Subject: docs(options): fix mistakes (#24568)

---
 runtime/doc/options.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 70329a170a..fca73ddd1e 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -904,7 +904,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'backupskip'* *'bsk'*
 'backupskip' 'bsk'	string	(default "$TMPDIR/*,$TMP/*,$TEMP/*"
                                  Unix: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"
-                                 Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*"))
+                                 Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
 			global
 	A list of file patterns.  When one of the patterns matches with the
 	name of the file which is written, no backup file is created.  Both
@@ -3102,7 +3102,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'helpfile'* *'hf'*
 'helpfile' 'hf'		string	(default (MS-Windows) "$VIMRUNTIME\doc\help.txt"
                                          (others) "$VIMRUNTIME/doc/help.txt")
-                             )
 			global
 	Name of the main help file.  All distributed help files should be
 	placed together in one directory.  Additionally, all "doc" directories
@@ -3428,7 +3427,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 'isfname' 'isf'		string	(default for Windows:
                              "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,="
                             otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=")
-                             )
 			global
 	The characters specified by this option are included in file names and
 	path names.  Filenames are used for commands like "gf", "[i" and in
@@ -3480,7 +3478,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 'isident' 'isi'		string	(default for Windows:
                                            "@,48-57,_,128-167,224-235"
                                 otherwise: "@,48-57,_,192-255")
-                             )
 			global
 	The characters given by this option are included in identifiers.
 	Identifiers are used in recognizing environment variables and after a
@@ -6610,7 +6607,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	used for CTRL-\ CTRL-N and CTRL-\ CTRL-G when part of a command has
 	been typed.
 
-						*'undodir'* *'udir'*
+					*'undodir'* *'udir'* *E5003*
 'undodir' 'udir'	string	(default "$XDG_STATE_HOME/nvim/undo//")
 			global
 	List of directory names for undo files, separated with commas.
-- 
cgit 


From 42630923fc00633d806af97c1792b2ed4a71e1cc Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Sat, 5 Aug 2023 17:03:57 +0800
Subject: refactor(lsp): use protocol.Methods instead of strings #24570

---
 runtime/lua/vim/lsp.lua     | 6 +++---
 runtime/lua/vim/lsp/buf.lua | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index ea6b386b28..bfba275c33 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1612,7 +1612,7 @@ function lsp.start_client(config)
         data = { client_id = client_id, request_id = id, request = request },
       })
     end
-    return rpc.notify('$/cancelRequest', { id = id })
+    return rpc.notify(ms.dollar_cancelRequest, { id = id })
   end
 
   -- Track this so that we can escalate automatically if we've already tried a
@@ -1636,9 +1636,9 @@ function lsp.start_client(config)
       return
     end
     -- Sending a signal after a process has exited is acceptable.
-    rpc.request('shutdown', nil, function(err, _)
+    rpc.request(ms.shutdown, nil, function(err, _)
       if err == nil then
-        rpc.notify('exit')
+        rpc.notify(ms.exit)
       else
         -- If there was an error in the shutdown request, then term to be safe.
         rpc.terminate()
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 59afaf6fa0..3b1654d11f 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -446,14 +446,14 @@ end
 --- |quickfix| window. If the symbol can resolve to multiple
 --- items, the user can pick one in the |inputlist()|.
 function M.incoming_calls()
-  call_hierarchy('callHierarchy/incomingCalls')
+  call_hierarchy(ms.callHierarchy_incomingCalls)
 end
 
 --- Lists all the items that are called by the symbol under the
 --- cursor in the |quickfix| window. If the symbol can resolve to
 --- multiple items, the user can pick one in the |inputlist()|.
 function M.outgoing_calls()
-  call_hierarchy('callHierarchy/outgoingCalls')
+  call_hierarchy(ms.callHierarchy_outgoingCalls)
 end
 
 --- List workspace folders.
@@ -659,10 +659,10 @@ local function on_code_action_results(results, ctx, options)
     local reg = client.dynamic_capabilities:get(ms.textDocument_codeAction, { bufnr = ctx.bufnr })
 
     local supports_resolve = vim.tbl_get(reg or {}, 'registerOptions', 'resolveProvider')
-      or client.supports_method('codeAction/resolve')
+      or client.supports_method(ms.codeAction_resolve)
 
     if not action.edit and client and supports_resolve then
-      client.request('codeAction/resolve', action, function(err, resolved_action)
+      client.request(ms.codeAction_resolve, action, function(err, resolved_action)
         if err then
           vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
           return
-- 
cgit 


From 6c0812d92e0c7937b913175b8856064cb45f55c2 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Tue, 1 Aug 2023 23:35:34 +0200
Subject: feat(lua): specific error messages for type checking `opts` params

---
 runtime/doc/news.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 2d56fc4fc4..d0da35fb90 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -134,6 +134,8 @@ The following new APIs and features were added.
   • `vim.fn.*`
   • `vim.api.*`
 
+• Improved messages for type errors in `vim.api.*` calls (including `opts` params)
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
-- 
cgit 


From 51c754b62e795c49cfcf9df3ab492bdd53c61482 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Wed, 2 Aug 2023 13:15:30 +0200
Subject: feat(lua): use keyset type information

---
 runtime/lua/vim/_meta/api_keysets.lua | 302 +++++++++++++++++-----------------
 1 file changed, 151 insertions(+), 151 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index 184eb7a060..5f8cb93144 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -4,112 +4,112 @@
 error('Cannot require a meta file')
 
 --- @class vim.api.keyset.clear_autocmds
---- @field buffer any
+--- @field buffer integer
 --- @field event any
 --- @field group any
 --- @field pattern any
 
 --- @class vim.api.keyset.cmd
---- @field cmd any
---- @field range any
---- @field count any
---- @field reg any
---- @field bang any
---- @field args any
---- @field magic any
---- @field mods any
+--- @field cmd string
+--- @field range any[]
+--- @field count integer
+--- @field reg string
+--- @field bang boolean
+--- @field args any[]
+--- @field magic table<string,any>
+--- @field mods table<string,any>
 --- @field nargs any
 --- @field addr any
 --- @field nextcmd any
 
 --- @class vim.api.keyset.cmd_magic
---- @field file any
---- @field bar any
+--- @field file boolean
+--- @field bar boolean
 
 --- @class vim.api.keyset.cmd_mods
---- @field silent any
---- @field emsg_silent any
---- @field unsilent any
---- @field filter any
---- @field sandbox any
---- @field noautocmd any
---- @field browse any
---- @field confirm any
---- @field hide any
---- @field horizontal any
---- @field keepalt any
---- @field keepjumps any
---- @field keepmarks any
---- @field keeppatterns any
---- @field lockmarks any
---- @field noswapfile any
---- @field tab any
---- @field verbose any
---- @field vertical any
---- @field split any
+--- @field silent boolean
+--- @field emsg_silent boolean
+--- @field unsilent boolean
+--- @field filter table<string,any>
+--- @field sandbox boolean
+--- @field noautocmd boolean
+--- @field browse boolean
+--- @field confirm boolean
+--- @field hide boolean
+--- @field horizontal boolean
+--- @field keepalt boolean
+--- @field keepjumps boolean
+--- @field keepmarks boolean
+--- @field keeppatterns boolean
+--- @field lockmarks boolean
+--- @field noswapfile boolean
+--- @field tab integer
+--- @field verbose integer
+--- @field vertical boolean
+--- @field split string
 
 --- @class vim.api.keyset.cmd_mods_filter
---- @field pattern any
---- @field force any
+--- @field pattern string
+--- @field force boolean
 
 --- @class vim.api.keyset.cmd_opts
---- @field output any
+--- @field output boolean
 
 --- @class vim.api.keyset.context
---- @field types any
+--- @field types any[]
 
 --- @class vim.api.keyset.create_augroup
 --- @field clear any
 
 --- @class vim.api.keyset.create_autocmd
---- @field buffer any
+--- @field buffer integer
 --- @field callback any
---- @field command any
---- @field desc any
+--- @field command string
+--- @field desc string
 --- @field group any
---- @field nested any
---- @field once any
+--- @field nested boolean
+--- @field once boolean
 --- @field pattern any
 
 --- @class vim.api.keyset.echo_opts
---- @field verbose any
+--- @field verbose boolean
 
 --- @class vim.api.keyset.eval_statusline
---- @field winid any
---- @field maxwidth any
---- @field fillchar any
---- @field highlights any
---- @field use_winbar any
---- @field use_tabline any
---- @field use_statuscol_lnum any
+--- @field winid integer
+--- @field maxwidth integer
+--- @field fillchar string
+--- @field highlights boolean
+--- @field use_winbar boolean
+--- @field use_tabline boolean
+--- @field use_statuscol_lnum integer
 
 --- @class vim.api.keyset.exec_autocmds
---- @field buffer any
+--- @field buffer integer
 --- @field group any
---- @field modeline any
+--- @field modeline boolean
 --- @field pattern any
 --- @field data any
 
 --- @class vim.api.keyset.exec_opts
---- @field output any
+--- @field output boolean
 
 --- @class vim.api.keyset.float_config
---- @field row any
---- @field col any
---- @field width any
---- @field height any
---- @field anchor any
---- @field relative any
---- @field win any
---- @field bufpos any
---- @field external any
---- @field focusable any
---- @field zindex any
+--- @field row number
+--- @field col number
+--- @field width integer
+--- @field height integer
+--- @field anchor string
+--- @field relative string
+--- @field win integer
+--- @field bufpos any[]
+--- @field external boolean
+--- @field focusable boolean
+--- @field zindex integer
 --- @field border any
 --- @field title any
---- @field title_pos any
---- @field style any
---- @field noautocmd any
+--- @field title_pos string
+--- @field style string
+--- @field noautocmd boolean
 
 --- @class vim.api.keyset.get_autocmds
 --- @field event any
@@ -118,27 +118,27 @@ error('Cannot require a meta file')
 --- @field buffer any
 
 --- @class vim.api.keyset.get_commands
---- @field builtin any
+--- @field builtin boolean
 
 --- @class vim.api.keyset.get_highlight
---- @field id any
---- @field name any
---- @field link any
+--- @field id integer
+--- @field name string
+--- @field link boolean
 
 --- @class vim.api.keyset.highlight
---- @field bold any
---- @field standout any
---- @field strikethrough any
---- @field underline any
---- @field undercurl any
---- @field underdouble any
---- @field underdotted any
---- @field underdashed any
---- @field italic any
---- @field reverse any
---- @field altfont any
---- @field nocombine any
---- @field default_ any
+--- @field bold boolean
+--- @field standout boolean
+--- @field strikethrough boolean
+--- @field underline boolean
+--- @field undercurl boolean
+--- @field underdouble boolean
+--- @field underdotted boolean
+--- @field underdashed boolean
+--- @field italic boolean
+--- @field reverse boolean
+--- @field altfont boolean
+--- @field nocombine boolean
+--- @field default boolean
 --- @field cterm any
 --- @field foreground any
 --- @field fg any
@@ -150,100 +150,100 @@ error('Cannot require a meta file')
 --- @field sp any
 --- @field link any
 --- @field global_link any
---- @field fallback any
---- @field blend any
---- @field fg_indexed any
---- @field bg_indexed any
+--- @field fallback boolean
+--- @field blend integer
+--- @field fg_indexed boolean
+--- @field bg_indexed boolean
 
 --- @class vim.api.keyset.highlight_cterm
---- @field bold any
---- @field standout any
---- @field strikethrough any
---- @field underline any
---- @field undercurl any
---- @field underdouble any
---- @field underdotted any
---- @field underdashed any
---- @field italic any
---- @field reverse any
---- @field altfont any
---- @field nocombine any
+--- @field bold boolean
+--- @field standout boolean
+--- @field strikethrough boolean
+--- @field underline boolean
+--- @field undercurl boolean
+--- @field underdouble boolean
+--- @field underdotted boolean
+--- @field underdashed boolean
+--- @field italic boolean
+--- @field reverse boolean
+--- @field altfont boolean
+--- @field nocombine boolean
 
 --- @class vim.api.keyset.keymap
---- @field noremap any
---- @field nowait any
---- @field silent any
---- @field script any
---- @field expr any
---- @field unique any
---- @field callback any
---- @field desc any
---- @field replace_keycodes any
+--- @field noremap boolean
+--- @field nowait boolean
+--- @field silent boolean
+--- @field script boolean
+--- @field expr boolean
+--- @field unique boolean
+--- @field callback function
+--- @field desc string
+--- @field replace_keycodes boolean
 
 --- @class vim.api.keyset.option
---- @field scope any
---- @field win any
---- @field buf any
---- @field filetype any
+--- @field scope string
+--- @field win integer
+--- @field buf integer
+--- @field filetype string
 
 --- @class vim.api.keyset.runtime
---- @field is_lua any
---- @field do_source any
+--- @field is_lua boolean
+--- @field do_source boolean
 
 --- @class vim.api.keyset.set_decoration_provider
---- @field on_start any
---- @field on_buf any
---- @field on_win any
---- @field on_line any
---- @field on_end any
---- @field _on_hl_def any
---- @field _on_spell_nav any
+--- @field on_start function
+--- @field on_buf function
+--- @field on_win function
+--- @field on_line function
+--- @field on_end function
+--- @field _on_hl_def function
+--- @field _on_spell_nav function
 
 --- @class vim.api.keyset.set_extmark
---- @field id any
---- @field end_line any
---- @field end_row any
---- @field end_col any
+--- @field id integer
+--- @field end_line integer
+--- @field end_row integer
+--- @field end_col integer
 --- @field hl_group any
---- @field virt_text any
---- @field virt_text_pos any
---- @field virt_text_win_col any
---- @field virt_text_hide any
---- @field hl_eol any
---- @field hl_mode any
---- @field ephemeral any
---- @field priority any
---- @field right_gravity any
---- @field end_right_gravity any
---- @field virt_lines any
---- @field virt_lines_above any
---- @field virt_lines_leftcol any
---- @field strict any
---- @field sign_text any
+--- @field virt_text any[]
+--- @field virt_text_pos string
+--- @field virt_text_win_col integer
+--- @field virt_text_hide boolean
+--- @field hl_eol boolean
+--- @field hl_mode string
+--- @field ephemeral boolean
+--- @field priority integer
+--- @field right_gravity boolean
+--- @field end_right_gravity boolean
+--- @field virt_lines any[]
+--- @field virt_lines_above boolean
+--- @field virt_lines_leftcol boolean
+--- @field strict boolean
+--- @field sign_text string
 --- @field sign_hl_group any
 --- @field number_hl_group any
 --- @field line_hl_group any
 --- @field cursorline_hl_group any
---- @field conceal any
---- @field spell any
---- @field ui_watched any
+--- @field conceal string
+--- @field spell boolean
+--- @field ui_watched boolean
 
 --- @class vim.api.keyset.user_command
 --- @field addr any
---- @field bang any
---- @field bar any
+--- @field bang boolean
+--- @field bar boolean
 --- @field complete any
 --- @field count any
 --- @field desc any
---- @field force any
---- @field keepscript any
+--- @field force boolean
+--- @field keepscript boolean
 --- @field nargs any
 --- @field preview any
 --- @field range any
---- @field register_ any
+--- @field register boolean
 
 --- @class vim.api.keyset.win_text_height
---- @field start_row any
---- @field end_row any
---- @field start_vcol any
---- @field end_vcol any
+--- @field start_row integer
+--- @field end_row integer
+--- @field start_vcol integer
+--- @field end_vcol integer
-- 
cgit 


From 369f58797dbd3c0e18035d26e6f5d6634be7a2a9 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 7 Aug 2023 16:16:12 +0300
Subject: fix(treesitter): escape quotes in :InspectTree view #24582

Problem: Anonymous nodes containing double quotes break the highlighting.
Solution: Escape double quotes in anonymous nodes.
---
 runtime/lua/vim/treesitter/dev.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 1bb5a08205..e94e8f08dc 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -152,6 +152,12 @@ local function get_range_str(lnum, col, end_lnum, end_col)
   return string.format('[%d:%d - %d:%d]', lnum + 1, col + 1, end_lnum + 1, end_col)
 end
 
+---@param text string
+---@return string
+local function escape_quotes(text)
+  return string.format('"%s"', text:sub(2, #text - 1):gsub('"', '\\"'))
+end
+
 --- Write the contents of this View into {bufnr}.
 ---
 ---@param bufnr integer Buffer number to write into.
@@ -164,8 +170,9 @@ function TSTreeView:draw(bufnr)
   for _, item in self:iter() do
     local range_str = get_range_str(item.lnum, item.col, item.end_lnum, item.end_col)
     local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
+    local text = item.named and item.text or escape_quotes(item.text)
     local line =
-      string.format('%s%s ; %s%s', string.rep(' ', item.depth), item.text, range_str, lang_str)
+      string.format('%s%s ; %s%s', string.rep(' ', item.depth), text, range_str, lang_str)
 
     if self.opts.lang then
       lang_hl_marks[#lang_hl_marks + 1] = {
-- 
cgit 


From 832459219b4cbf3151e48b43187f1ab0c94ea285 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Mon, 7 Aug 2023 06:35:06 -0700
Subject: docs(lsp): fix references to protocol.constants #24578

---
 runtime/doc/lsp.txt         | 4 ++--
 runtime/lua/vim/lsp/buf.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index da624dba65..2140284503 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1154,7 +1154,7 @@ code_action({options})                             *vim.lsp.buf.code_action()*
 
     See also: ~
       • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeAction
-      • vim.lsp.protocol.constants.CodeActionTriggerKind
+      • vim.lsp.protocol.CodeActionTriggerKind
 
 completion({context})                               *vim.lsp.buf.completion()*
     Retrieves the completion items at the current cursor position. Can only be
@@ -1167,7 +1167,7 @@ completion({context})                               *vim.lsp.buf.completion()*
                    character, if applicable)
 
     See also: ~
-      • vim.lsp.protocol.constants.CompletionTriggerKind
+      • vim.lsp.protocol.CompletionTriggerKind
 
 declaration({options})                             *vim.lsp.buf.declaration()*
     Jumps to the declaration of the symbol under the cursor.
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 3b1654d11f..6cd0aa1e95 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -112,7 +112,7 @@ end
 --- about the context in which a completion was triggered (how it was triggered,
 --- and by which trigger character, if applicable)
 ---
----@see vim.lsp.protocol.constants.CompletionTriggerKind
+---@see vim.lsp.protocol.CompletionTriggerKind
 function M.completion(context)
   local params = util.make_position_params()
   params.context = context
@@ -728,7 +728,7 @@ end
 ---           using mark-like indexing. See |api-indexing|
 ---
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_codeAction
----@see vim.lsp.protocol.constants.CodeActionTriggerKind
+---@see vim.lsp.protocol.CodeActionTriggerKind
 function M.code_action(options)
   validate({ options = { options, 't', true } })
   options = options or {}
-- 
cgit 


From c0beb8173fe2f8a8f71cd5a3a6cdfed145a1d973 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 7 Aug 2023 16:27:53 +0100
Subject: feat: add .luarc.json (#24592)

---
 runtime/lua/vim/_meta.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
index 839830294e..5e4f390ca3 100644
--- a/runtime/lua/vim/_meta.lua
+++ b/runtime/lua/vim/_meta.lua
@@ -1,5 +1,8 @@
 --- @meta
 
+---@type uv
+vim.uv = ...
+
 --- The following modules are loaded specially in _init_packages.lua
 
 vim.F = require('vim.F')
@@ -15,6 +18,7 @@ vim.loader = require('vim.loader')
 vim.lsp = require('vim.lsp')
 vim.re = require('vim.re')
 vim.secure = require('vim.secure')
+vim.treesitter = require('vim.treesitter')
 vim.ui = require('vim.ui')
 vim.version = require('vim.version')
 
-- 
cgit 


From ce792db5b806b41d5d687e3b09da9ab2b6be0307 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Mon, 7 Aug 2023 19:44:52 +0300
Subject: vim-patch:9.0.1678: blade files are not recognized (#24601)

Problem:    Blade files are not recognized.
Solution:   Add a pattern for Blade files. (closes vim/vim#12650)

https://github.com/vim/vim/commit/ad34abee258322826146d597ac5b5fd2111c2b79

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 40f72a217d..66e224ce69 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1809,6 +1809,7 @@ local pattern = {
   ['.*/build/conf/.*%.conf'] = 'bitbake',
   ['.*/meta/conf/.*%.conf'] = 'bitbake',
   ['.*/meta%-.*/conf/.*%.conf'] = 'bitbake',
+  ['.*%.blade%.php'] = 'blade',
   ['bzr_log%..*'] = 'bzr',
   ['.*enlightenment/.*%.cfg'] = 'c',
   ['${HOME}/cabal%.config'] = 'cabalconfig',
-- 
cgit 


From 0211f889b9538f7df5fbcb06273d273fb071efff Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 7 Aug 2023 18:22:36 +0100
Subject: fix(treesitter): make sure injections don't return empty ranges
 (#24595)

When an injection has not set include children, make sure not to add
the injection if no ranges are determined.

This could happen when there is an injection with a child that has the
same range as itself. e.g. consider this Makefile snippet

```make
foo:
  $(VAR)
```

Line 2 has an injection for bash and a make variable reference. If
include-children isn't set (default), then there is no range on line 2
to inject since the variable reference needs to be excluded.

This caused the language tree to return an empty range, which the parser
now interprets to mean the full buffer. This caused makefiles to have
completely broken highlighting.
---
 runtime/lua/vim/treesitter/languagetree.lua | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 0d4a1a54dd..4b2628609a 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -110,6 +110,10 @@ function LanguageTree.new(source, lang, opts)
   ---@type LanguageTreeOpts
   opts = opts or {}
 
+  if source == 0 then
+    source = vim.api.nvim_get_current_buf()
+  end
+
   local injections = opts.injections or {}
   local self = setmetatable({
     _source = source,
@@ -561,11 +565,13 @@ end
 ---@param node TSNode
 ---@param source string|integer
 ---@param metadata TSMetadata
+---@param include_children boolean
 ---@return Range6[]
 local function get_node_ranges(node, source, metadata, include_children)
   local range = vim.treesitter.get_range(node, source, metadata)
+  local child_count = node:named_child_count()
 
-  if include_children then
+  if include_children or child_count == 0 then
     return { range }
   end
 
@@ -573,7 +579,8 @@ local function get_node_ranges(node, source, metadata, include_children)
 
   local srow, scol, sbyte, erow, ecol, ebyte = Range.unpack6(range)
 
-  for i = 0, node:named_child_count() - 1 do
+  -- We are excluding children so we need to mask out their ranges
+  for i = 0, child_count - 1 do
     local child = node:named_child(i)
     local c_srow, c_scol, c_sbyte, c_erow, c_ecol, c_ebyte = child:range(true)
     if c_srow > srow or c_scol > scol then
@@ -604,7 +611,10 @@ end
 ---@param combined boolean
 ---@param ranges Range6[]
 local function add_injection(t, tree_index, pattern, lang, combined, ranges)
-  assert(type(lang) == 'string')
+  if #ranges == 0 then
+    -- Make sure not to add an empty range set as this is interpreted to mean the whole buffer.
+    return
+  end
 
   -- Each tree index should be isolated from the other nodes.
   if not t[tree_index] then
-- 
cgit 


From 628763fbd82d0fab292b7e92b553c6b1ed53e556 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Tue, 8 Aug 2023 10:40:43 +0200
Subject: docs(lua): the keyset nilocalypse

This is needed to give recent LuaLS the right idea about optional fields.
---
 runtime/lua/vim/_meta/api_keysets.lua | 386 +++++++++++++++++-----------------
 1 file changed, 193 insertions(+), 193 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index 5f8cb93144..941780202e 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -4,246 +4,246 @@
 error('Cannot require a meta file')
 
 --- @class vim.api.keyset.clear_autocmds
---- @field buffer integer
---- @field event any
---- @field group any
---- @field pattern any
+--- @field buffer? integer
+--- @field event? any
+--- @field group? any
+--- @field pattern? any
 
 --- @class vim.api.keyset.cmd
---- @field cmd string
---- @field range any[]
---- @field count integer
---- @field reg string
---- @field bang boolean
---- @field args any[]
---- @field magic table<string,any>
---- @field mods table<string,any>
---- @field nargs any
---- @field addr any
---- @field nextcmd any
+--- @field cmd? string
+--- @field range? any[]
+--- @field count? integer
+--- @field reg? string
+--- @field bang? boolean
+--- @field args? any[]
+--- @field magic? table<string,any>
+--- @field mods? table<string,any>
+--- @field nargs? any
+--- @field addr? any
+--- @field nextcmd? any
 
 --- @class vim.api.keyset.cmd_magic
---- @field file boolean
---- @field bar boolean
+--- @field file? boolean
+--- @field bar? boolean
 
 --- @class vim.api.keyset.cmd_mods
---- @field silent boolean
---- @field emsg_silent boolean
---- @field unsilent boolean
---- @field filter table<string,any>
---- @field sandbox boolean
---- @field noautocmd boolean
---- @field browse boolean
---- @field confirm boolean
---- @field hide boolean
---- @field horizontal boolean
---- @field keepalt boolean
---- @field keepjumps boolean
---- @field keepmarks boolean
---- @field keeppatterns boolean
---- @field lockmarks boolean
---- @field noswapfile boolean
---- @field tab integer
---- @field verbose integer
---- @field vertical boolean
---- @field split string
+--- @field silent? boolean
+--- @field emsg_silent? boolean
+--- @field unsilent? boolean
+--- @field filter? table<string,any>
+--- @field sandbox? boolean
+--- @field noautocmd? boolean
+--- @field browse? boolean
+--- @field confirm? boolean
+--- @field hide? boolean
+--- @field horizontal? boolean
+--- @field keepalt? boolean
+--- @field keepjumps? boolean
+--- @field keepmarks? boolean
+--- @field keeppatterns? boolean
+--- @field lockmarks? boolean
+--- @field noswapfile? boolean
+--- @field tab? integer
+--- @field verbose? integer
+--- @field vertical? boolean
+--- @field split? string
 
 --- @class vim.api.keyset.cmd_mods_filter
---- @field pattern string
---- @field force boolean
+--- @field pattern? string
+--- @field force? boolean
 
 --- @class vim.api.keyset.cmd_opts
---- @field output boolean
+--- @field output? boolean
 
 --- @class vim.api.keyset.context
---- @field types any[]
+--- @field types? any[]
 
 --- @class vim.api.keyset.create_augroup
---- @field clear any
+--- @field clear? any
 
 --- @class vim.api.keyset.create_autocmd
---- @field buffer integer
---- @field callback any
---- @field command string
---- @field desc string
---- @field group any
---- @field nested boolean
---- @field once boolean
---- @field pattern any
+--- @field buffer? integer
+--- @field callback? any
+--- @field command? string
+--- @field desc? string
+--- @field group? any
+--- @field nested? boolean
+--- @field once? boolean
+--- @field pattern? any
 
 --- @class vim.api.keyset.echo_opts
---- @field verbose boolean
+--- @field verbose? boolean
 
 --- @class vim.api.keyset.eval_statusline
---- @field winid integer
---- @field maxwidth integer
---- @field fillchar string
---- @field highlights boolean
---- @field use_winbar boolean
---- @field use_tabline boolean
---- @field use_statuscol_lnum integer
+--- @field winid? integer
+--- @field maxwidth? integer
+--- @field fillchar? string
+--- @field highlights? boolean
+--- @field use_winbar? boolean
+--- @field use_tabline? boolean
+--- @field use_statuscol_lnum? integer
 
 --- @class vim.api.keyset.exec_autocmds
---- @field buffer integer
---- @field group any
---- @field modeline boolean
---- @field pattern any
---- @field data any
+--- @field buffer? integer
+--- @field group? any
+--- @field modeline? boolean
+--- @field pattern? any
+--- @field data? any
 
 --- @class vim.api.keyset.exec_opts
---- @field output boolean
+--- @field output? boolean
 
 --- @class vim.api.keyset.float_config
---- @field row number
---- @field col number
---- @field width integer
---- @field height integer
---- @field anchor string
---- @field relative string
---- @field win integer
---- @field bufpos any[]
---- @field external boolean
---- @field focusable boolean
---- @field zindex integer
---- @field border any
---- @field title any
---- @field title_pos string
---- @field style string
---- @field noautocmd boolean
+--- @field row? number
+--- @field col? number
+--- @field width? integer
+--- @field height? integer
+--- @field anchor? string
+--- @field relative? string
+--- @field win? integer
+--- @field bufpos? any[]
+--- @field external? boolean
+--- @field focusable? boolean
+--- @field zindex? integer
+--- @field border? any
+--- @field title? any
+--- @field title_pos? string
+--- @field style? string
+--- @field noautocmd? boolean
 
 --- @class vim.api.keyset.get_autocmds
---- @field event any
---- @field group any
---- @field pattern any
---- @field buffer any
+--- @field event? any
+--- @field group? any
+--- @field pattern? any
+--- @field buffer? any
 
 --- @class vim.api.keyset.get_commands
---- @field builtin boolean
+--- @field builtin? boolean
 
 --- @class vim.api.keyset.get_highlight
---- @field id integer
---- @field name string
---- @field link boolean
+--- @field id? integer
+--- @field name? string
+--- @field link? boolean
 
 --- @class vim.api.keyset.highlight
---- @field bold boolean
---- @field standout boolean
---- @field strikethrough boolean
---- @field underline boolean
---- @field undercurl boolean
---- @field underdouble boolean
---- @field underdotted boolean
---- @field underdashed boolean
---- @field italic boolean
---- @field reverse boolean
---- @field altfont boolean
---- @field nocombine boolean
---- @field default boolean
---- @field cterm any
---- @field foreground any
---- @field fg any
---- @field background any
---- @field bg any
---- @field ctermfg any
---- @field ctermbg any
---- @field special any
---- @field sp any
---- @field link any
---- @field global_link any
---- @field fallback boolean
---- @field blend integer
---- @field fg_indexed boolean
---- @field bg_indexed boolean
+--- @field bold? boolean
+--- @field standout? boolean
+--- @field strikethrough? boolean
+--- @field underline? boolean
+--- @field undercurl? boolean
+--- @field underdouble? boolean
+--- @field underdotted? boolean
+--- @field underdashed? boolean
+--- @field italic? boolean
+--- @field reverse? boolean
+--- @field altfont? boolean
+--- @field nocombine? boolean
+--- @field default? boolean
+--- @field cterm? any
+--- @field foreground? any
+--- @field fg? any
+--- @field background? any
+--- @field bg? any
+--- @field ctermfg? any
+--- @field ctermbg? any
+--- @field special? any
+--- @field sp? any
+--- @field link? any
+--- @field global_link? any
+--- @field fallback? boolean
+--- @field blend? integer
+--- @field fg_indexed? boolean
+--- @field bg_indexed? boolean
 
 --- @class vim.api.keyset.highlight_cterm
---- @field bold boolean
---- @field standout boolean
---- @field strikethrough boolean
---- @field underline boolean
---- @field undercurl boolean
---- @field underdouble boolean
---- @field underdotted boolean
---- @field underdashed boolean
---- @field italic boolean
---- @field reverse boolean
---- @field altfont boolean
---- @field nocombine boolean
+--- @field bold? boolean
+--- @field standout? boolean
+--- @field strikethrough? boolean
+--- @field underline? boolean
+--- @field undercurl? boolean
+--- @field underdouble? boolean
+--- @field underdotted? boolean
+--- @field underdashed? boolean
+--- @field italic? boolean
+--- @field reverse? boolean
+--- @field altfont? boolean
+--- @field nocombine? boolean
 
 --- @class vim.api.keyset.keymap
---- @field noremap boolean
---- @field nowait boolean
---- @field silent boolean
---- @field script boolean
---- @field expr boolean
---- @field unique boolean
---- @field callback function
---- @field desc string
---- @field replace_keycodes boolean
+--- @field noremap? boolean
+--- @field nowait? boolean
+--- @field silent? boolean
+--- @field script? boolean
+--- @field expr? boolean
+--- @field unique? boolean
+--- @field callback? function
+--- @field desc? string
+--- @field replace_keycodes? boolean
 
 --- @class vim.api.keyset.option
---- @field scope string
---- @field win integer
---- @field buf integer
---- @field filetype string
+--- @field scope? string
+--- @field win? integer
+--- @field buf? integer
+--- @field filetype? string
 
 --- @class vim.api.keyset.runtime
---- @field is_lua boolean
---- @field do_source boolean
+--- @field is_lua? boolean
+--- @field do_source? boolean
 
 --- @class vim.api.keyset.set_decoration_provider
---- @field on_start function
---- @field on_buf function
---- @field on_win function
---- @field on_line function
---- @field on_end function
---- @field _on_hl_def function
---- @field _on_spell_nav function
+--- @field on_start? function
+--- @field on_buf? function
+--- @field on_win? function
+--- @field on_line? function
+--- @field on_end? function
+--- @field _on_hl_def? function
+--- @field _on_spell_nav? function
 
 --- @class vim.api.keyset.set_extmark
---- @field id integer
---- @field end_line integer
---- @field end_row integer
---- @field end_col integer
---- @field hl_group any
---- @field virt_text any[]
---- @field virt_text_pos string
---- @field virt_text_win_col integer
---- @field virt_text_hide boolean
---- @field hl_eol boolean
---- @field hl_mode string
---- @field ephemeral boolean
---- @field priority integer
---- @field right_gravity boolean
---- @field end_right_gravity boolean
---- @field virt_lines any[]
---- @field virt_lines_above boolean
---- @field virt_lines_leftcol boolean
---- @field strict boolean
---- @field sign_text string
---- @field sign_hl_group any
---- @field number_hl_group any
---- @field line_hl_group any
---- @field cursorline_hl_group any
---- @field conceal string
---- @field spell boolean
---- @field ui_watched boolean
+--- @field id? integer
+--- @field end_line? integer
+--- @field end_row? integer
+--- @field end_col? integer
+--- @field hl_group? any
+--- @field virt_text? any[]
+--- @field virt_text_pos? string
+--- @field virt_text_win_col? integer
+--- @field virt_text_hide? boolean
+--- @field hl_eol? boolean
+--- @field hl_mode? string
+--- @field ephemeral? boolean
+--- @field priority? integer
+--- @field right_gravity? boolean
+--- @field end_right_gravity? boolean
+--- @field virt_lines? any[]
+--- @field virt_lines_above? boolean
+--- @field virt_lines_leftcol? boolean
+--- @field strict? boolean
+--- @field sign_text? string
+--- @field sign_hl_group? any
+--- @field number_hl_group? any
+--- @field line_hl_group? any
+--- @field cursorline_hl_group? any
+--- @field conceal? string
+--- @field spell? boolean
+--- @field ui_watched? boolean
 
 --- @class vim.api.keyset.user_command
---- @field addr any
---- @field bang boolean
---- @field bar boolean
---- @field complete any
---- @field count any
---- @field desc any
---- @field force boolean
---- @field keepscript boolean
---- @field nargs any
---- @field preview any
---- @field range any
---- @field register boolean
+--- @field addr? any
+--- @field bang? boolean
+--- @field bar? boolean
+--- @field complete? any
+--- @field count? any
+--- @field desc? any
+--- @field force? boolean
+--- @field keepscript? boolean
+--- @field nargs? any
+--- @field preview? any
+--- @field range? any
+--- @field register? boolean
 
 --- @class vim.api.keyset.win_text_height
---- @field start_row integer
---- @field end_row integer
---- @field start_vcol integer
---- @field end_vcol integer
+--- @field start_row? integer
+--- @field end_row? integer
+--- @field start_vcol? integer
+--- @field end_vcol? integer
-- 
cgit 


From 37c58226a8fd02afe9836f2fe43b31570fc50bb9 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 8 Aug 2023 11:58:29 +0100
Subject: fix(lua): vim.fs typing (#24608)

---
 runtime/doc/lua.txt    | 18 ++++++++++--------
 runtime/lua/vim/fs.lua | 28 ++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 16 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index bee3a761f3..efde69c8f4 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2884,11 +2884,11 @@ vim.fs.find({names}, {opts})                                   *vim.fs.find()*
 <
 
     Parameters: ~
-      • {names}  (string|table|fun(name: string, path: string): boolean) Names
-                 of the items to find. Must be base names, paths and globs are
-                 not supported when {names} is a string or a table. If {names}
-                 is a function, it is called for each traversed item with
-                 args:
+      • {names}  (string|string[]|fun(name: string, path: string): boolean)
+                 Names of the items to find. Must be base names, paths and
+                 globs are not supported when {names} is a string or a table.
+                 If {names} is a function, it is called for each traversed
+                 item with args:
                  • name: base name of the current item
                  • path: full path of the current item The function should
                    return `true` if the given item is considered a match.
@@ -2907,7 +2907,7 @@ vim.fs.find({names}, {opts})                                   *vim.fs.find()*
                    number of matches.
 
     Return: ~
-        (table) Normalized paths |vim.fs.normalize()| of all matching items
+        (string[]) Normalized paths |vim.fs.normalize()| of all matching items
 
 vim.fs.joinpath({...})                                     *vim.fs.joinpath()*
     Concatenate directories and/or file paths into a single path with
@@ -2967,8 +2967,10 @@ vim.fs.parents({start})                                     *vim.fs.parents()*
     Parameters: ~
       • {start}  (string) Initial path.
 
-    Return: ~
-        (function) Iterator
+    Return (multiple): ~
+        fun(_, dir: string): string? Iterator
+        nil
+        (string|nil)
 
 
 ==============================================================================
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 92966523c0..7cd9e3cf04 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -20,7 +20,9 @@ local iswin = vim.uv.os_uname().sysname == 'Windows_NT'
 --- </pre>
 ---
 ---@param start (string) Initial path.
----@return function Iterator
+---@return fun(_, dir: string): string? # Iterator
+---@return nil
+---@return string|nil
 function M.parents(start)
   return function(_, dir)
     local parent = M.dirname(dir)
@@ -120,6 +122,7 @@ function M.dir(path, opts)
   return coroutine.wrap(function()
     local dirs = { { path, 1 } }
     while #dirs > 0 do
+      --- @type string, integer
       local dir0, level = unpack(table.remove(dirs, 1))
       local dir = level == 1 and dir0 or M.joinpath(path, dir0)
       local fs = vim.uv.fs_scandir(M.normalize(dir))
@@ -143,6 +146,13 @@ function M.dir(path, opts)
   end)
 end
 
+--- @class vim.fs.find.opts
+--- @field path string
+--- @field upward boolean
+--- @field stop string
+--- @field type string
+--- @field limit number
+
 --- Find files or directories (or other items as specified by `opts.type`) in the given path.
 ---
 --- Finds items given in {names} starting from {path}. If {upward} is "true"
@@ -175,7 +185,7 @@ end
 --- end, {limit = math.huge, type = 'file'})
 --- </pre>
 ---
----@param names (string|table|fun(name: string, path: string): boolean) Names of the items to find.
+---@param names (string|string[]|fun(name: string, path: string): boolean) Names of the items to find.
 ---             Must be base names, paths and globs are not supported when {names} is a string or a table.
 ---             If {names} is a function, it is called for each traversed item with args:
 ---             - name: base name of the current item
@@ -196,9 +206,9 @@ end
 ---                       - limit (number, default 1): Stop the search after
 ---                               finding this many matches. Use `math.huge` to
 ---                               place no limit on the number of matches.
----@return (table) Normalized paths |vim.fs.normalize()| of all matching items
+---@return (string[]) # Normalized paths |vim.fs.normalize()| of all matching items
 function M.find(names, opts)
-  opts = opts or {}
+  opts = opts or {} --[[@as vim.fs.find.opts]]
   vim.validate({
     names = { names, { 's', 't', 'f' } },
     path = { opts.path, 's', true },
@@ -208,13 +218,15 @@ function M.find(names, opts)
     limit = { opts.limit, 'n', true },
   })
 
-  names = type(names) == 'string' and { names } or names
+  if type(names) == 'string' then
+    names = { names }
+  end
 
   local path = opts.path or vim.uv.cwd()
   local stop = opts.stop
   local limit = opts.limit or 1
 
-  local matches = {}
+  local matches = {} --- @type string[]
 
   local function add(match)
     matches[#matches + 1] = M.normalize(match)
@@ -224,7 +236,7 @@ function M.find(names, opts)
   end
 
   if opts.upward then
-    local test
+    local test --- @type fun(p: string): string[]
 
     if type(names) == 'function' then
       test = function(p)
@@ -238,7 +250,7 @@ function M.find(names, opts)
       end
     else
       test = function(p)
-        local t = {}
+        local t = {} --- @type string[]
         for _, name in ipairs(names) do
           local f = M.joinpath(p, name)
           local stat = vim.uv.fs_stat(f)
-- 
cgit 


From 61ed45486da01dca788f8a444fc2021002f0c947 Mon Sep 17 00:00:00 2001
From: Computer2340 <132418874+Computer2340@users.noreply.github.com>
Date: Tue, 8 Aug 2023 13:41:55 +0000
Subject: docs: Bram farewell #24589

ref #24579
---
 runtime/doc/intro.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index b496dc5240..afb67373fd 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -193,6 +193,16 @@ Elvis	Another Vi clone, made by Steve Kirkendall.  Very compact but isn't
 
 Vim	Nvim is based on Vim.  https://www.vim.org/
 
+==============================================================================
+Bram Moolenaar                                    *Bram* *brammool*
+
+Nvim is a fork of the Vim ("Vi IMproved") text editor, which was originally
+developed by Bram Moolenaar.  Searching his name within the source code of
+Nvim will reveal just how much of his work still remains in Nvim.
+On August 3, 2023, he passed away at the age of 62.  If Vim or Nvim have been
+of use to you in your life, please read |Uganda| and consider honoring his
+memory however you may see fit.
+
 ==============================================================================
 Notation						*notation*
 
-- 
cgit 


From c6c21db82b31ea43ce878ab3725dcd901db1e7a1 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 8 Aug 2023 16:36:06 +0100
Subject: fix(filetype): add typing and dry (#24573)

---
 runtime/doc/lua.txt                 |    6 +-
 runtime/lua/vim/_editor.lua         |    7 +
 runtime/lua/vim/filetype.lua        | 1205 +++++++++++++----------------------
 runtime/lua/vim/filetype/detect.lua |  546 ++++++++++------
 4 files changed, 818 insertions(+), 946 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index efde69c8f4..c3e540a4ae 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2654,10 +2654,10 @@ vim.filetype.add({filetypes})                             *vim.filetype.add()*
          ['.*'] = {
            priority = -math.huge,
            function(path, bufnr)
-             local content = vim.filetype.getlines(bufnr, 1)
-             if vim.filetype.matchregex(content, [[^#!.*\<mine\>]]) then
+             local content = vim.api.nvim_buf_get_lines(bufnr, 0, 1, false)[1] or ''
+             if vim.regex([[^#!.*\<mine\>]]):match_str(content) ~= nil then
                return 'mine'
-             elseif vim.filetype.matchregex(content, [[\<drawing\>]]) then
+             elseif vim.regex([[\<drawing\>]]):match_str(content) ~= nil then
                return 'drawing'
              end
            end,
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 6182270708..d81464a3ca 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -428,10 +428,17 @@ vim.cmd = setmetatable({}, {
   end,
 })
 
+--- @class vim.var_accessor
+--- @field [string] any
+--- @field [integer] vim.var_accessor
+
 -- These are the vim.env/v/g/o/bo/wo variable magic accessors.
 do
   local validate = vim.validate
 
+  --- @param scope string
+  --- @param handle? false|integer
+  --- @return vim.var_accessor
   local function make_dict_accessor(scope, handle)
     validate({
       scope = { scope, 's' },
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 66e224ce69..a53216f8ea 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1,7 +1,16 @@
 local api = vim.api
+local fn = vim.fn
 
 local M = {}
 
+--- @alias vim.filetype.mapfn fun(path:string,bufnr:integer, ...):string?, fun(b:integer)?
+--- @alias vim.filetype.maptbl {[1]:string|vim.filetype.mapfn, [2]:{priority:integer}}
+--- @alias vim.filetype.mapping.value string|vim.filetype.mapfn|vim.filetype.maptbl
+--- @alias vim.filetype.mapping table<string,vim.filetype.mapping.value>
+
+--- @param ft string|vim.filetype.mapfn
+--- @param opts? {priority:integer}
+--- @return vim.filetype.maptbl
 local function starsetf(ft, opts)
   return {
     function(path, bufnr)
@@ -23,36 +32,38 @@ local function starsetf(ft, opts)
 end
 
 ---@private
---- Get a single line or line range from the buffer.
---- If only start_lnum is specified, return a single line as a string.
---- If both start_lnum and end_lnum are omitted, return all lines from the buffer.
----
+--- Get a line range from the buffer.
 ---@param bufnr integer The buffer to get the lines from
 ---@param start_lnum integer|nil The line number of the first line (inclusive, 1-based)
 ---@param end_lnum integer|nil The line number of the last line (inclusive, 1-based)
----@return table<string>|string Array of lines, or string when end_lnum is omitted
-function M.getlines(bufnr, start_lnum, end_lnum)
-  if end_lnum then
-    -- Return a line range
-    return api.nvim_buf_get_lines(bufnr, start_lnum - 1, end_lnum, false)
-  end
+---@return string[] # Array of lines
+function M._getlines(bufnr, start_lnum, end_lnum)
   if start_lnum then
-    -- Return a single line
-    return api.nvim_buf_get_lines(bufnr, start_lnum - 1, start_lnum, false)[1] or ''
-  else
-    -- Return all lines
-    return api.nvim_buf_get_lines(bufnr, 0, -1, false)
+    return api.nvim_buf_get_lines(bufnr, start_lnum - 1, end_lnum or start_lnum, false)
   end
+
+  -- Return all lines
+  return api.nvim_buf_get_lines(bufnr, 0, -1, false)
+end
+
+---@private
+--- Get a single line from the buffer.
+---@param bufnr integer The buffer to get the lines from
+---@param start_lnum integer The line number of the first line (inclusive, 1-based)
+---@return string
+function M._getline(bufnr, start_lnum)
+  -- Return a single line
+  return api.nvim_buf_get_lines(bufnr, start_lnum - 1, start_lnum, false)[1] or ''
 end
 
 ---@private
 --- Check whether a string matches any of the given Lua patterns.
 ---
----@param s string The string to check
----@param patterns table<string> A list of Lua patterns
+---@param s string? The string to check
+---@param patterns string[] A list of Lua patterns
 ---@return boolean `true` if s matched a pattern, else `false`
-function M.findany(s, patterns)
-  if s == nil then
+function M._findany(s, patterns)
+  if not s then
     return false
   end
   for _, v in ipairs(patterns) do
@@ -69,8 +80,8 @@ end
 ---@param bufnr integer The buffer to get the line from
 ---@param start_lnum integer The line number of the first line to start from (inclusive, 1-based)
 ---@return string|nil The first non-blank line if found or `nil` otherwise
-function M.nextnonblank(bufnr, start_lnum)
-  for _, line in ipairs(M.getlines(bufnr, start_lnum, -1)) do
+function M._nextnonblank(bufnr, start_lnum)
+  for _, line in ipairs(M._getlines(bufnr, start_lnum, -1)) do
     if not line:find('^%s*$') then
       return line
     end
@@ -78,30 +89,93 @@ function M.nextnonblank(bufnr, start_lnum)
   return nil
 end
 
----@private
---- Check whether the given string matches the Vim regex pattern.
-M.matchregex = (function()
-  local cache = {}
-  return function(s, pattern)
-    if s == nil then
-      return nil
+do
+  --- @type table<string,vim.regex>
+  local regex_cache = {}
+
+  ---@private
+  --- Check whether the given string matches the Vim regex pattern.
+  --- @param s string?
+  --- @param pattern string
+  --- @return boolean
+  function M._matchregex(s, pattern)
+    if not s then
+      return false
+    end
+    if not regex_cache[pattern] then
+      regex_cache[pattern] = vim.regex(pattern)
+    end
+    return regex_cache[pattern]:match_str(s) ~= nil
+  end
+end
+
+--- @module 'vim.filetype.detect'
+local detect = setmetatable({}, {
+  --- @param k string
+  --- @param t table<string,function>
+  --- @return function
+  __index = function(t, k)
+    t[k] = function(...)
+      return require('vim.filetype.detect')[k](...)
+    end
+    return t[k]
+  end,
+})
+
+--- @param ... string|vim.filetype.mapfn
+--- @return vim.filetype.mapfn
+local function detect_seq(...)
+  local candidates = { ... }
+  return function(...)
+    for _, c in ipairs(candidates) do
+      if type(c) == 'string' then
+        return c
+      end
+      if type(c) == 'function' then
+        local r = c(...)
+        if r then
+          return r
+        end
+      end
     end
-    if not cache[pattern] then
-      cache[pattern] = vim.regex(pattern)
+  end
+end
+
+local function detect_noext(path, bufnr)
+  local root = fn.fnamemodify(path, ':r')
+  return M.match({ buf = bufnr, filename = root })
+end
+
+--- @param pat string
+--- @param a string?
+--- @param b string?
+--- @return vim.filetype.mapfn
+local function detect_line1(pat, a, b)
+  return function(_path, bufnr)
+    if M._getline(bufnr, 1):find(pat) then
+      return a
     end
-    return cache[pattern]:match_str(s)
+    return b
   end
-end)()
+end
+
+--- @type vim.filetype.mapfn
+local detect_rc = function(path, _bufnr)
+  if not path:find('/etc/Muttrc%.d/') then
+    return 'rc'
+  end
+end
 
 -- luacheck: push no unused args
 -- luacheck: push ignore 122
 
 -- Filetypes based on file extension
 ---@diagnostic disable: unused-local
+--- @type vim.filetype.mapping
 local extension = {
   -- BEGIN EXTENSION
   ['8th'] = '8th',
-  ['a65'] = 'a65',
+  a65 = 'a65',
   aap = 'aap',
   abap = 'abap',
   abc = 'abc',
@@ -127,51 +201,33 @@ local extension = {
     end
     return 'aspvbs'
   end,
-  asm = function(path, bufnr)
-    return require('vim.filetype.detect').asm(bufnr)
-  end,
-  lst = function(path, bufnr)
-    return require('vim.filetype.detect').asm(bufnr)
-  end,
-  mac = function(path, bufnr)
-    return require('vim.filetype.detect').asm(bufnr)
-  end,
-  ['asn1'] = 'asn',
+  asm = detect.asm,
+  lst = detect.asm,
+  mac = detect.asm,
+  asn1 = 'asn',
   asn = 'asn',
-  asp = function(path, bufnr)
-    return require('vim.filetype.detect').asp(bufnr)
-  end,
+  asp = detect.asp,
   astro = 'astro',
   atl = 'atlas',
   as = 'atlas',
   ahk = 'autohotkey',
-  ['au3'] = 'autoit',
+  au3 = 'autoit',
   ave = 'ave',
   gawk = 'awk',
   awk = 'awk',
   ref = 'b',
   imp = 'b',
   mch = 'b',
-  bas = function(path, bufnr)
-    return require('vim.filetype.detect').bas(bufnr)
-  end,
+  bas = detect.bas,
   bass = 'bass',
-  bi = function(path, bufnr)
-    return require('vim.filetype.detect').bas(bufnr)
-  end,
-  bm = function(path, bufnr)
-    return require('vim.filetype.detect').bas(bufnr)
-  end,
+  bi = detect.bas,
+  bm = detect.bas,
   bc = 'bc',
   bdf = 'bdf',
   beancount = 'beancount',
   bib = 'bib',
-  com = function(path, bufnr)
-    return require('vim.filetype.detect').bindzone(bufnr, 'dcl')
-  end,
-  db = function(path, bufnr)
-    return require('vim.filetype.detect').bindzone(bufnr)
-  end,
+  com = detect_seq(detect.bindzone, 'dcl'),
+  db = detect.bindzone,
   bicep = 'bicep',
   bb = 'bitbake',
   bbappend = 'bitbake',
@@ -201,9 +257,7 @@ local extension = {
   hgrc = 'cfg',
   chf = 'ch',
   chai = 'chaiscript',
-  ch = function(path, bufnr)
-    return require('vim.filetype.detect').change(bufnr)
-  end,
+  ch = detect.change,
   chs = 'chaskell',
   chatito = 'chatito',
   chopro = 'chordpro',
@@ -226,7 +280,7 @@ local extension = {
   atg = 'coco',
   recipe = 'conaryrecipe',
   hook = function(path, bufnr)
-    return M.getlines(bufnr, 1) == '[Trigger]' and 'conf'
+    return M._getline(bufnr, 1) == '[Trigger]' and 'conf' or nil
   end,
   nmconnection = 'confini',
   mklx = 'context',
@@ -234,16 +288,10 @@ local extension = {
   mkii = 'context',
   mkxl = 'context',
   mkvi = 'context',
-  control = function(path, bufnr)
-    return require('vim.filetype.detect').control(bufnr)
-  end,
-  copyright = function(path, bufnr)
-    return require('vim.filetype.detect').copyright(bufnr)
-  end,
+  control = detect.control,
+  copyright = detect.copyright,
   corn = 'corn',
-  csh = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
+  csh = detect.csh,
   cpon = 'cpon',
   moc = 'cpp',
   hh = 'cpp',
@@ -261,12 +309,8 @@ local extension = {
   cppm = 'cpp',
   cxxm = 'cpp',
   ['c++m'] = 'cpp',
-  cpp = function(path, bufnr)
-    return vim.g.cynlib_syntax_for_cpp and 'cynlib' or 'cpp'
-  end,
-  cc = function(path, bufnr)
-    return vim.g.cynlib_syntax_for_cc and 'cynlib' or 'cpp'
-  end,
+  cpp = detect.cpp,
+  cc = detect.cpp,
   cql = 'cqlang',
   crm = 'crm',
   cr = 'crystal',
@@ -291,15 +335,9 @@ local extension = {
   drt = 'dart',
   ds = 'datascript',
   dcd = 'dcd',
-  decl = function(path, bufnr)
-    return require('vim.filetype.detect').decl(bufnr)
-  end,
-  dec = function(path, bufnr)
-    return require('vim.filetype.detect').decl(bufnr)
-  end,
-  dcl = function(path, bufnr)
-    return require('vim.filetype.detect').decl(bufnr) or 'clean'
-  end,
+  decl = detect.decl,
+  dec = detect.decl,
+  dcl = detect_seq(detect.decl, 'clean'),
   def = 'def',
   desc = 'desc',
   directory = 'desktop',
@@ -317,27 +355,19 @@ local extension = {
   drac = 'dracula',
   drc = 'dracula',
   dtd = 'dtd',
-  d = function(path, bufnr)
-    return require('vim.filetype.detect').dtrace(bufnr)
-  end,
+  d = detect.dtrace,
   dts = 'dts',
   dtsi = 'dts',
   dylan = 'dylan',
   intr = 'dylanintr',
   lid = 'dylanlid',
-  e = function(path, bufnr)
-    return require('vim.filetype.detect').e(bufnr)
-  end,
-  E = function(path, bufnr)
-    return require('vim.filetype.detect').e(bufnr)
-  end,
+  e = detect.e,
+  E = detect.e,
   ecd = 'ecd',
   edf = 'edif',
   edif = 'edif',
   edo = 'edif',
-  edn = function(path, bufnr)
-    return require('vim.filetype.detect').edn(bufnr)
-  end,
+  edn = detect.edn,
   eex = 'eelixir',
   leex = 'eelixir',
   am = 'elf',
@@ -345,9 +375,7 @@ local extension = {
   elm = 'elm',
   lc = 'elsa',
   elv = 'elvish',
-  ent = function(path, bufnr)
-    return require('vim.filetype.detect').ent(bufnr)
-  end,
+  ent = detect.ent,
   epp = 'epuppet',
   erl = 'erlang',
   hrl = 'erlang',
@@ -358,43 +386,23 @@ local extension = {
   ec = 'esqlc',
   EC = 'esqlc',
   strl = 'esterel',
-  eu = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  EU = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  ew = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  EW = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  EX = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  exu = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  EXU = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  exw = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  EXW = function(path, bufnr)
-    return vim.g.filetype_euphoria or 'euphoria3'
-  end,
-  ex = function(path, bufnr)
-    return require('vim.filetype.detect').ex(bufnr)
-  end,
+  eu = detect.euphoria,
+  EU = detect.euphoria,
+  ew = detect.euphoria,
+  EW = detect.euphoria,
+  EX = detect.euphoria,
+  exu = detect.euphoria,
+  EXU = detect.euphoria,
+  exw = detect.euphoria,
+  EXW = detect.euphoria,
+  ex = detect.ex,
   exp = 'expect',
   factor = 'factor',
   fal = 'falcon',
   fan = 'fan',
   fwt = 'fan',
   fnl = 'fennel',
-  ['m4gl'] = 'fgl',
+  m4gl = 'fgl',
   ['4gl'] = 'fgl',
   ['4gh'] = 'fgl',
   fir = 'firrtl',
@@ -404,33 +412,29 @@ local extension = {
   fth = 'forth',
   ft = 'forth',
   FOR = 'fortran',
-  ['f77'] = 'fortran',
-  ['f03'] = 'fortran',
+  f77 = 'fortran',
+  f03 = 'fortran',
   fortran = 'fortran',
-  ['F95'] = 'fortran',
-  ['f90'] = 'fortran',
-  ['F03'] = 'fortran',
+  F95 = 'fortran',
+  f90 = 'fortran',
+  F03 = 'fortran',
   fpp = 'fortran',
   FTN = 'fortran',
   ftn = 'fortran',
   ['for'] = 'fortran',
-  ['F90'] = 'fortran',
-  ['F77'] = 'fortran',
-  ['f95'] = 'fortran',
+  F90 = 'fortran',
+  F77 = 'fortran',
+  f95 = 'fortran',
   FPP = 'fortran',
   f = 'fortran',
   F = 'fortran',
-  ['F08'] = 'fortran',
-  ['f08'] = 'fortran',
+  F08 = 'fortran',
+  f08 = 'fortran',
   fpc = 'fpcmake',
   fsl = 'framescript',
-  frm = function(path, bufnr)
-    return require('vim.filetype.detect').frm(bufnr)
-  end,
+  frm = detect.frm,
   fb = 'freebasic',
-  fs = function(path, bufnr)
-    return require('vim.filetype.detect').fs(bufnr)
-  end,
+  fs = detect.fs,
   fsh = 'fsh',
   fsi = 'fsharp',
   fsx = 'fsharp',
@@ -478,9 +482,7 @@ local extension = {
   ht = 'haste',
   htpp = 'hastepreproc',
   hb = 'hb',
-  h = function(path, bufnr)
-    return require('vim.filetype.detect').header(bufnr)
-  end,
+  h = detect.header,
   sum = 'hercules',
   errsum = 'hercules',
   ev = 'hercules',
@@ -495,56 +497,28 @@ local extension = {
   hog = 'hog',
   hws = 'hollywood',
   hoon = 'hoon',
-  cpt = function(path, bufnr)
-    return require('vim.filetype.detect').html(bufnr)
-  end,
-  dtml = function(path, bufnr)
-    return require('vim.filetype.detect').html(bufnr)
-  end,
-  htm = function(path, bufnr)
-    return require('vim.filetype.detect').html(bufnr)
-  end,
-  html = function(path, bufnr)
-    return require('vim.filetype.detect').html(bufnr)
-  end,
-  pt = function(path, bufnr)
-    return require('vim.filetype.detect').html(bufnr)
-  end,
-  shtml = function(path, bufnr)
-    return require('vim.filetype.detect').html(bufnr)
-  end,
-  stm = function(path, bufnr)
-    return require('vim.filetype.detect').html(bufnr)
-  end,
+  cpt = detect.html,
+  dtml = detect.html,
+  htm = detect.html,
+  html = detect.html,
+  pt = detect.html,
+  shtml = detect.html,
+  stm = detect.html,
   htt = 'httest',
   htb = 'httest',
-  hw = function(path, bufnr)
-    return require('vim.filetype.detect').hw(bufnr)
-  end,
-  module = function(path, bufnr)
-    return require('vim.filetype.detect').hw(bufnr)
-  end,
-  pkg = function(path, bufnr)
-    return require('vim.filetype.detect').hw(bufnr)
-  end,
+  hw = detect.hw,
+  module = detect.hw,
+  pkg = detect.hw,
   iba = 'ibasic',
   ibi = 'ibasic',
   icn = 'icon',
-  idl = function(path, bufnr)
-    return require('vim.filetype.detect').idl(bufnr)
-  end,
-  inc = function(path, bufnr)
-    return require('vim.filetype.detect').inc(bufnr)
-  end,
+  idl = detect.idl,
+  inc = detect.inc,
   inf = 'inform',
   INF = 'inform',
   ii = 'initng',
-  inp = function(path, bufnr)
-    return require('vim.filetype.detect').inp(bufnr)
-  end,
-  ms = function(path, bufnr)
-    return require('vim.filetype.detect').nroff(bufnr) or 'xmath'
-  end,
+  inp = detect.inp,
+  ms = detect_seq(detect.nroff, 'xmath'),
   iss = 'iss',
   mst = 'ist',
   ist = 'ist',
@@ -566,7 +540,7 @@ local extension = {
   jsx = 'javascriptreact',
   clp = 'jess',
   jgr = 'jgraph',
-  ['j73'] = 'jovial',
+  j73 = 'jovial',
   jov = 'jovial',
   jovial = 'jovial',
   properties = 'jproperties',
@@ -628,29 +602,21 @@ local extension = {
   lou = 'lout',
   ulpc = 'lpc',
   lpc = 'lpc',
-  c = function(path, bufnr)
-    return require('vim.filetype.detect').lpc(bufnr)
-  end,
-  lsl = function(path, bufnr)
-    return require('vim.filetype.detect').lsl(bufnr)
-  end,
+  c = detect.lpc,
+  lsl = detect.lsl,
   lss = 'lss',
   nse = 'lua',
   rockspec = 'lua',
   lua = 'lua',
   luau = 'luau',
   lrc = 'lyrics',
-  m = function(path, bufnr)
-    return require('vim.filetype.detect').m(bufnr)
-  end,
+  m = detect.m,
   at = 'm4',
-  mc = function(path, bufnr)
-    return require('vim.filetype.detect').mc(bufnr)
-  end,
+  mc = detect.mc,
   quake = 'm3quake',
-  ['m4'] = function(path, bufnr)
+  m4 = function(path, bufnr)
     path = path:lower()
-    return not (path:find('html%.m4$') or path:find('fvwm2rc')) and 'm4'
+    return not (path:find('html%.m4$') or path:find('fvwm2rc')) and 'm4' or nil
   end,
   eml = 'mail',
   mk = 'make',
@@ -689,16 +655,12 @@ local extension = {
   mib = 'mib',
   mix = 'mix',
   mixal = 'mix',
-  mm = function(path, bufnr)
-    return require('vim.filetype.detect').mm(bufnr)
-  end,
+  mm = detect.mm,
   nb = 'mma',
   mmp = 'mmp',
-  mms = function(path, bufnr)
-    return require('vim.filetype.detect').mms(bufnr)
-  end,
+  mms = detect.mms,
   DEF = 'modula2',
-  ['m2'] = 'modula2',
+  m2 = 'modula2',
   mi = 'modula2',
   lm3 = 'modula3',
   ssc = 'monk',
@@ -709,28 +671,16 @@ local extension = {
   moon = 'moonscript',
   move = 'move',
   mp = 'mp',
-  mpiv = function(path, bufnr)
-    return 'mp', function(b)
-      vim.b[b].mp_metafun = 1
-    end
-  end,
-  mpvi = function(path, bufnr)
-    return 'mp', function(b)
-      vim.b[b].mp_metafun = 1
-    end
-  end,
-  mpxl = function(path, bufnr)
-    return 'mp', function(b)
-      vim.b[b].mp_metafun = 1
-    end
-  end,
+  mpiv = detect.mp,
+  mpvi = detect.mp,
+  mpxl = detect.mp,
   mof = 'msidl',
   odl = 'msidl',
   msql = 'msql',
   mu = 'mupad',
   mush = 'mush',
   mysql = 'mysql',
-  ['n1ql'] = 'n1ql',
+  n1ql = 'n1ql',
   nql = 'n1ql',
   nanorc = 'nanorc',
   ncf = 'ncf',
@@ -798,12 +748,10 @@ local extension = {
   pike = 'pike',
   pmod = 'pike',
   rcp = 'pilrc',
-  PL = function(path, bufnr)
-    return require('vim.filetype.detect').pl(bufnr)
-  end,
+  PL = detect.pl,
   pli = 'pli',
-  ['pl1'] = 'pli',
-  ['p36'] = 'plm',
+  pl1 = 'pli',
+  p36 = 'plm',
   plm = 'plm',
   pac = 'plm',
   plp = 'plp',
@@ -832,11 +780,11 @@ local extension = {
   pml = 'promela',
   proto = 'proto',
   prql = 'prql',
-  ['psd1'] = 'ps1',
-  ['psm1'] = 'ps1',
-  ['ps1'] = 'ps1',
+  psd1 = 'ps1',
+  psm1 = 'ps1',
+  ps1 = 'ps1',
   pssc = 'ps1',
-  ['ps1xml'] = 'ps1xml',
+  ps1xml = 'ps1xml',
   psf = 'psf',
   psl = 'psl',
   pug = 'pug',
@@ -850,22 +798,20 @@ local extension = {
   ql = 'ql',
   qll = 'ql',
   qmd = 'quarto',
-  R = function(path, bufnr)
-    return require('vim.filetype.detect').r(bufnr)
-  end,
+  R = detect.r,
   rkt = 'racket',
   rktd = 'racket',
   rktl = 'racket',
   rad = 'radiance',
   mat = 'radiance',
-  ['pod6'] = 'raku',
+  pod6 = 'raku',
   rakudoc = 'raku',
   rakutest = 'raku',
   rakumod = 'raku',
-  ['pm6'] = 'raku',
+  pm6 = 'raku',
   raku = 'raku',
-  ['t6'] = 'raku',
-  ['p6'] = 'raku',
+  t6 = 'raku',
+  p6 = 'raku',
   raml = 'raml',
   rbs = 'rbs',
   rego = 'rego',
@@ -938,34 +884,18 @@ local extension = {
   sdl = 'sdl',
   sed = 'sed',
   sexp = 'sexplib',
-  bash = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  ebuild = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  eclass = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  env = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr))
-  end,
-  ksh = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'ksh')
-  end,
-  sh = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr))
-  end,
+  bash = detect.bash,
+  ebuild = detect.bash,
+  eclass = detect.bash,
+  env = detect.sh,
+  ksh = detect.ksh,
+  sh = detect.sh,
   sieve = 'sieve',
   siv = 'sieve',
-  sig = function(path, bufnr)
-    return require('vim.filetype.detect').sig(bufnr)
-  end,
-  sil = function(path, bufnr)
-    return require('vim.filetype.detect').sil(bufnr)
-  end,
+  sig = detect.sig,
+  sil = detect.sil,
   sim = 'simula',
-  ['s85'] = 'sinda',
+  s85 = 'sinda',
   sin = 'sinda',
   ssm = 'sisu',
   sst = 'sisu',
@@ -1002,9 +932,7 @@ local extension = {
   spi = 'spyce',
   spy = 'spyce',
   tyc = 'sql',
-  typ = function(path, bufnr)
-    return require('vim.filetype.detect').typ(bufnr)
-  end,
+  typ = detect.typ,
   pkb = 'sql',
   tyb = 'sql',
   pks = 'sql',
@@ -1012,11 +940,11 @@ local extension = {
   sqi = 'sqr',
   sqr = 'sqr',
   nut = 'squirrel',
-  ['s28'] = 'srec',
-  ['s37'] = 'srec',
+  s28 = 'srec',
+  s37 = 'srec',
   srec = 'srec',
   mot = 'srec',
-  ['s19'] = 'srec',
+  s19 = 'srec',
   srt = 'srt',
   ssa = 'ssa',
   ass = 'ssa',
@@ -1056,9 +984,7 @@ local extension = {
   bbl = 'tex',
   latex = 'tex',
   sty = 'tex',
-  cls = function(path, bufnr)
-    return require('vim.filetype.detect').cls(bufnr)
-  end,
+  cls = detect.cls,
   texi = 'texinfo',
   txi = 'texinfo',
   texinfo = 'texinfo',
@@ -1077,9 +1003,7 @@ local extension = {
   tsv = 'tsv',
   tutor = 'tutor',
   twig = 'twig',
-  ts = function(path, bufnr)
-    return M.getlines(bufnr, 1):find('<%?xml') and 'xml' or 'typescript'
-  end,
+  ts = detect_line1('<%?xml', 'xml', 'typescript'),
   mts = 'typescript',
   cts = 'typescript',
   tsx = 'typescriptreact',
@@ -1104,9 +1028,7 @@ local extension = {
   vr = 'vera',
   vri = 'vera',
   vrh = 'vera',
-  v = function(path, bufnr)
-    return require('vim.filetype.detect').v(bufnr)
-  end,
+  v = detect.v,
   va = 'verilogams',
   vams = 'verilogams',
   vhdl = 'vhdl',
@@ -1136,7 +1058,7 @@ local extension = {
   xht = 'xhtml',
   msc = 'xmath',
   msf = 'xmath',
-  ['psc1'] = 'xml',
+  psc1 = 'xml',
   tpm = 'xml',
   xliff = 'xml',
   atom = 'xml',
@@ -1152,10 +1074,8 @@ local extension = {
   csproj = 'xml',
   wpl = 'xml',
   xmi = 'xml',
-  xpm = function(path, bufnr)
-    return M.getlines(bufnr, 1):find('XPM2') and 'xpm2' or 'xpm'
-  end,
-  ['xpm2'] = 'xpm2',
+  xpm = detect_line1('XPM2', 'xpm2', 'xpm'),
+  xpm2 = 'xpm2',
   xqy = 'xquery',
   xqm = 'xquery',
   xquery = 'xquery',
@@ -1172,7 +1092,7 @@ local extension = {
   yaml = 'yaml',
   yang = 'yang',
   yuck = 'yuck',
-  ['z8a'] = 'z8a',
+  z8a = 'z8a',
   zig = 'zig',
   zir = 'zir',
   zu = 'zimbu',
@@ -1180,183 +1100,69 @@ local extension = {
   zs = 'zserio',
   zsh = 'zsh',
   vala = 'vala',
-  web = function(path, bufnr)
-    return require('vim.filetype.detect').web(bufnr)
-  end,
-  pl = function(path, bufnr)
-    return require('vim.filetype.detect').pl(bufnr)
-  end,
-  pp = function(path, bufnr)
-    return require('vim.filetype.detect').pp(bufnr)
-  end,
-  i = function(path, bufnr)
-    return require('vim.filetype.detect').progress_asm(bufnr)
-  end,
-  w = function(path, bufnr)
-    return require('vim.filetype.detect').progress_cweb(bufnr)
-  end,
-  p = function(path, bufnr)
-    return require('vim.filetype.detect').progress_pascal(bufnr)
-  end,
-  pro = function(path, bufnr)
-    return require('vim.filetype.detect').proto(bufnr, 'idlang')
-  end,
-  patch = function(path, bufnr)
-    return require('vim.filetype.detect').patch(bufnr)
-  end,
-  r = function(path, bufnr)
-    return require('vim.filetype.detect').r(bufnr)
-  end,
-  rdf = function(path, bufnr)
-    return require('vim.filetype.detect').redif(bufnr)
-  end,
-  rules = function(path, bufnr)
-    return require('vim.filetype.detect').rules(path)
-  end,
-  sc = function(path, bufnr)
-    return require('vim.filetype.detect').sc(bufnr)
-  end,
-  scd = function(path, bufnr)
-    return require('vim.filetype.detect').scd(bufnr)
-  end,
+  web = detect.web,
+  pl = detect.pl,
+  pp = detect.pp,
+  i = detect.progress_asm,
+  w = detect.progress_cweb,
+  p = detect.progress_pascal,
+  pro = detect_seq(detect.proto, 'idlang'),
+  patch = detect.patch,
+  r = detect.r,
+  rdf = detect.redif,
+  rules = detect.rules,
+  sc = detect.sc,
+  scd = detect.scd,
   tcsh = function(path, bufnr)
-    return require('vim.filetype.detect').shell(path, M.getlines(bufnr), 'tcsh')
-  end,
-  sql = function(path, bufnr)
-    return vim.g.filetype_sql and vim.g.filetype_sql or 'sql'
-  end,
-  zsql = function(path, bufnr)
-    return vim.g.filetype_sql and vim.g.filetype_sql or 'sql'
-  end,
-  tex = function(path, bufnr)
-    return require('vim.filetype.detect').tex(path, bufnr)
-  end,
-  tf = function(path, bufnr)
-    return require('vim.filetype.detect').tf(bufnr)
-  end,
-  txt = function(path, bufnr)
-    return require('vim.filetype.detect').txt(bufnr)
-  end,
-  xml = function(path, bufnr)
-    return require('vim.filetype.detect').xml(bufnr)
-  end,
-  y = function(path, bufnr)
-    return require('vim.filetype.detect').y(bufnr)
-  end,
-  cmd = function(path, bufnr)
-    return M.getlines(bufnr, 1):find('^/%*') and 'rexx' or 'dosbatch'
-  end,
-  rul = function(path, bufnr)
-    return require('vim.filetype.detect').rul(bufnr)
-  end,
-  cpy = function(path, bufnr)
-    return M.getlines(bufnr, 1):find('^##') and 'python' or 'cobol'
-  end,
-  dsl = function(path, bufnr)
-    return M.getlines(bufnr, 1):find('^%s*<!') and 'dsl' or 'structurizr'
-  end,
-  smil = function(path, bufnr)
-    return M.getlines(bufnr, 1):find('<%?%s*xml.*%?>') and 'xml' or 'smil'
-  end,
-  smi = function(path, bufnr)
-    return require('vim.filetype.detect').smi(bufnr)
-  end,
-  install = function(path, bufnr)
-    return require('vim.filetype.detect').install(path, bufnr)
-  end,
-  pm = function(path, bufnr)
-    return require('vim.filetype.detect').pm(bufnr)
-  end,
-  me = function(path, bufnr)
-    return require('vim.filetype.detect').me(path)
-  end,
-  reg = function(path, bufnr)
-    return require('vim.filetype.detect').reg(bufnr)
-  end,
-  ttl = function(path, bufnr)
-    return require('vim.filetype.detect').ttl(bufnr)
-  end,
-  rc = function(path, bufnr)
-    if not path:find('/etc/Muttrc%.d/') then
-      return 'rc'
-    end
-  end,
-  rch = function(path, bufnr)
-    if not path:find('/etc/Muttrc%.d/') then
-      return 'rc'
-    end
-  end,
-  class = function(path, bufnr)
-    require('vim.filetype.detect').class(bufnr)
-  end,
-  sgml = function(path, bufnr)
-    return require('vim.filetype.detect').sgml(bufnr)
-  end,
-  sgm = function(path, bufnr)
-    return require('vim.filetype.detect').sgml(bufnr)
-  end,
-  t = function(path, bufnr)
-    local nroff = require('vim.filetype.detect').nroff(bufnr)
-    return nroff or require('vim.filetype.detect').perl(path, bufnr) or 'tads'
-  end,
+    return require('vim.filetype.detect').shell(path, M._getlines(bufnr), 'tcsh')
+  end,
+  sql = detect.sql,
+  zsql = detect.sql,
+  tex = detect.tex,
+  tf = detect.tf,
+  txt = detect.txt,
+  xml = detect.xml,
+  y = detect.y,
+  cmd = detect_line1('^/%*', 'rexx', 'dosbatch'),
+  rul = detect.rul,
+  cpy = detect_line1('^##', 'python', 'cobol'),
+  dsl = detect_line1('^%s*<!', 'dsl', 'structurizr'),
+  smil = detect_line1('<%?%s*xml.*%?>', 'xml', 'smil'),
+  smi = detect.smi,
+  install = detect.install,
+  pm = detect.pm,
+  me = detect.me,
+  reg = detect.reg,
+  ttl = detect.ttl,
+  rc = detect_rc,
+  rch = detect_rc,
+  class = detect.class,
+  sgml = detect.sgml,
+  sgm = detect.sgml,
+  t = detect_seq(detect.nroff, detect.perl, 'tads'),
   -- Ignored extensions
-  bak = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  ['dpkg-bak'] = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  ['dpkg-dist'] = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  ['dpkg-old'] = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  ['dpkg-new'] = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
+  bak = detect_noext,
+  ['dpkg-bak'] = detect_noext,
+  ['dpkg-dist'] = detect_noext,
+  ['dpkg-old'] = detect_noext,
+  ['dpkg-new'] = detect_noext,
   ['in'] = function(path, bufnr)
     if vim.fs.basename(path) ~= 'configure.in' then
-      local root = vim.fn.fnamemodify(path, ':r')
+      local root = fn.fnamemodify(path, ':r')
       return M.match({ buf = bufnr, filename = root })
     end
   end,
-  new = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  old = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  orig = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  pacsave = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  pacnew = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  rpmsave = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
-  rmpnew = function(path, bufnr)
-    local root = vim.fn.fnamemodify(path, ':r')
-    return M.match({ buf = bufnr, filename = root })
-  end,
+  new = detect_noext,
+  old = detect_noext,
+  orig = detect_noext,
+  pacsave = detect_noext,
+  pacnew = detect_noext,
+  rpmsave = detect_noext,
+  rmpnew = detect_noext,
   -- END EXTENSION
 }
 
+--- @type vim.filetype.mapping
 local filename = {
   -- BEGIN FILENAME
   ['a2psrc'] = 'a2ps',
@@ -1387,24 +1193,12 @@ local filename = {
   ['/etc/defaults/cdrdao'] = 'cdrdaoconf',
   ['cfengine.conf'] = 'cfengine',
   ['CMakeLists.txt'] = 'cmake',
-  ['.alias'] = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
-  ['.cshrc'] = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
-  ['.login'] = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
-  ['csh.cshrc'] = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
-  ['csh.login'] = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
-  ['csh.logout'] = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
+  ['.alias'] = detect.csh,
+  ['.cshrc'] = detect.csh,
+  ['.login'] = detect.csh,
+  ['csh.cshrc'] = detect.csh,
+  ['csh.login'] = detect.csh,
+  ['csh.logout'] = detect.csh,
   ['auto.master'] = 'conf',
   ['configure.in'] = 'config',
   ['configure.ac'] = 'config',
@@ -1444,18 +1238,10 @@ local filename = {
   ['exim.conf'] = 'exim',
   exports = 'exports',
   ['.fetchmailrc'] = 'fetchmail',
-  fvSchemes = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  fvSolution = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  fvConstraints = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  fvModels = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
+  fvSchemes = detect.foam,
+  fvSolution = detect.foam,
+  fvConstraints = detect.foam,
+  fvModels = detect.foam,
   fstab = 'fstab',
   mtab = 'fstab',
   ['.gdbinit'] = 'gdb',
@@ -1463,11 +1249,11 @@ local filename = {
   ['.gdbearlyinit'] = 'gdb',
   gdbearlyinit = 'gdb',
   ['lltxxxxx.txt'] = 'gedcom',
-  ['TAG_EDITMSG'] = 'gitcommit',
-  ['MERGE_MSG'] = 'gitcommit',
-  ['COMMIT_EDITMSG'] = 'gitcommit',
-  ['NOTES_EDITMSG'] = 'gitcommit',
-  ['EDIT_DESCRIPTION'] = 'gitcommit',
+  TAG_EDITMSG = 'gitcommit',
+  MERGE_MSG = 'gitcommit',
+  COMMIT_EDITMSG = 'gitcommit',
+  NOTES_EDITMSG = 'gitcommit',
+  EDIT_DESCRIPTION = 'gitcommit',
   ['.gitconfig'] = 'gitconfig',
   ['.gitmodules'] = 'gitconfig',
   ['.gitattributes'] = 'gitattributes',
@@ -1486,7 +1272,7 @@ local filename = {
   ['.gprc'] = 'gp',
   ['/.gnupg/gpg.conf'] = 'gpg',
   ['/.gnupg/options'] = 'gpg',
-  ['Jenkinsfile'] = 'groovy',
+  Jenkinsfile = 'groovy',
   ['/var/backups/gshadow.bak'] = 'group',
   ['/etc/gshadow'] = 'group',
   ['/etc/group-'] = 'group',
@@ -1536,9 +1322,7 @@ local filename = {
   ['.sawfishrc'] = 'lisp',
   ['/etc/login.access'] = 'loginaccess',
   ['/etc/login.defs'] = 'logindefs',
-  ['.lsl'] = function(path, bufnr)
-    return require('vim.filetype.detect').lsl(bufnr)
-  end,
+  ['.lsl'] = detect.lsl,
   ['.busted'] = 'lua',
   ['.luacheckrc'] = 'lua',
   ['lynx.cfg'] = 'lynx',
@@ -1568,9 +1352,7 @@ local filename = {
   ['/etc/nanorc'] = 'nanorc',
   Neomuttrc = 'neomuttrc',
   ['.netrc'] = 'netrc',
-  NEWS = function(path, bufnr)
-    return require('vim.filetype.detect').news(bufnr)
-  end,
+  NEWS = detect.news,
   ['env.nu'] = 'nu',
   ['config.nu'] = 'nu',
   ['.ocamlinit'] = 'ocaml',
@@ -1601,34 +1383,28 @@ local filename = {
   ['/etc/pinforc'] = 'pinfo',
   ['/.pinforc'] = 'pinfo',
   ['.povrayrc'] = 'povini',
-  ['printcap'] = function(path, bufnr)
+  printcap = function(path, bufnr)
     return 'ptcap', function(b)
       vim.b[b].ptcap_type = 'print'
     end
   end,
-  ['termcap'] = function(path, bufnr)
+  termcap = function(path, bufnr)
     return 'ptcap', function(b)
       vim.b[b].ptcap_type = 'term'
     end
   end,
   ['.procmailrc'] = 'procmail',
   ['.procmail'] = 'procmail',
-  ['indent.pro'] = function(path, bufnr)
-    return require('vim.filetype.detect').proto(bufnr, 'indent')
-  end,
+  ['indent.pro'] = detect_seq(detect.proto, 'indent'),
   ['/etc/protocols'] = 'protocols',
-  ['INDEX'] = function(path, bufnr)
-    return require('vim.filetype.detect').psf(bufnr)
-  end,
-  ['INFO'] = function(path, bufnr)
-    return require('vim.filetype.detect').psf(bufnr)
-  end,
+  INDEX = detect.psf,
+  INFO = detect.psf,
   ['.pythonstartup'] = 'python',
   ['.pythonrc'] = 'python',
   SConstruct = 'python',
   qmldir = 'qmldir',
   ['.Rprofile'] = 'r',
-  ['Rprofile'] = 'r',
+  Rprofile = 'r',
   ['Rprofile.site'] = 'r',
   ratpoisonrc = 'ratpoison',
   ['.ratpoisonrc'] = 'ratpoison',
@@ -1650,42 +1426,18 @@ local filename = {
   ['/etc/services'] = 'services',
   ['/etc/serial.conf'] = 'setserial',
   ['/etc/udev/cdsymlinks.conf'] = 'sh',
-  ['bash.bashrc'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  bashrc = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  ['.bashrc'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  ['.env'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr))
-  end,
-  ['.kshrc'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'ksh')
-  end,
-  ['.profile'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr))
-  end,
-  ['/etc/profile'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr))
-  end,
-  APKBUILD = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  PKGBUILD = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  ['.tcshrc'] = function(path, bufnr)
-    return require('vim.filetype.detect').shell(path, M.getlines(bufnr), 'tcsh')
-  end,
-  ['tcsh.login'] = function(path, bufnr)
-    return require('vim.filetype.detect').shell(path, M.getlines(bufnr), 'tcsh')
-  end,
-  ['tcsh.tcshrc'] = function(path, bufnr)
-    return require('vim.filetype.detect').shell(path, M.getlines(bufnr), 'tcsh')
-  end,
+  ['bash.bashrc'] = detect.bash,
+  bashrc = detect.bash,
+  ['.bashrc'] = detect.bash,
+  ['.env'] = detect.sh,
+  ['.kshrc'] = detect.ksh,
+  ['.profile'] = detect.sh,
+  ['/etc/profile'] = detect.sh,
+  APKBUILD = detect.bash,
+  PKGBUILD = detect.bash,
+  ['.tcshrc'] = detect.tcsh,
+  ['tcsh.login'] = detect.tcsh,
+  ['tcsh.tcshrc'] = detect.tcsh,
   ['/etc/slp.conf'] = 'slpconf',
   ['/etc/slp.reg'] = 'slpreg',
   ['/etc/slp.spi'] = 'slpspi',
@@ -1739,19 +1491,9 @@ local filename = {
   ['.Xpdefaults'] = 'xdefaults',
   ['xdm-config'] = 'xdefaults',
   ['.Xdefaults'] = 'xdefaults',
-  ['xorg.conf'] = function(path, bufnr)
-    return 'xf86conf', function(b)
-      vim.b[b].xf86conf_xfree86_version = 4
-    end
-  end,
-  ['xorg.conf-4'] = function(path, bufnr)
-    return 'xf86conf', function(b)
-      vim.b[b].xf86conf_xfree86_version = 4
-    end
-  end,
-  ['XF86Config'] = function(path, bufnr)
-    return require('vim.filetype.detect').xfree86()
-  end,
+  ['xorg.conf'] = detect.xfree86_v4,
+  ['xorg.conf-4'] = detect.xfree86_v4,
+  ['XF86Config'] = detect.xfree86_v3,
   ['/etc/xinetd.conf'] = 'xinetd',
   fglrxrc = 'xml',
   ['/etc/blkid.tab'] = 'xml',
@@ -1770,6 +1512,12 @@ local filename = {
   -- END FILENAME
 }
 
+-- Re-use closures as much as possible
+local detect_apache = starsetf('apache')
+local detect_muttrc = starsetf('muttrc')
+local detect_neomuttrc = starsetf('neomuttrc')
+
+--- @type vim.filetype.mapping
 local pattern = {
   -- BEGIN PATTERN
   ['.*/etc/a2ps/.*%.cfg'] = 'a2ps',
@@ -1778,31 +1526,27 @@ local pattern = {
   ['.*/etc/asound%.conf'] = 'alsaconf',
   ['.*/etc/apache2/sites%-.*/.*%.com'] = 'apache',
   ['.*/etc/httpd/.*%.conf'] = 'apache',
-  ['.*/etc/apache2/.*%.conf.*'] = starsetf('apache'),
-  ['.*/etc/apache2/conf%..*/.*'] = starsetf('apache'),
-  ['.*/etc/apache2/mods%-.*/.*'] = starsetf('apache'),
-  ['.*/etc/apache2/sites%-.*/.*'] = starsetf('apache'),
-  ['access%.conf.*'] = starsetf('apache'),
-  ['apache%.conf.*'] = starsetf('apache'),
-  ['apache2%.conf.*'] = starsetf('apache'),
-  ['httpd%.conf.*'] = starsetf('apache'),
-  ['srm%.conf.*'] = starsetf('apache'),
-  ['.*/etc/httpd/conf%..*/.*'] = starsetf('apache'),
-  ['.*/etc/httpd/conf%.d/.*%.conf.*'] = starsetf('apache'),
-  ['.*/etc/httpd/mods%-.*/.*'] = starsetf('apache'),
-  ['.*/etc/httpd/sites%-.*/.*'] = starsetf('apache'),
+  ['.*/etc/apache2/.*%.conf.*'] = detect_apache,
+  ['.*/etc/apache2/conf%..*/.*'] = detect_apache,
+  ['.*/etc/apache2/mods%-.*/.*'] = detect_apache,
+  ['.*/etc/apache2/sites%-.*/.*'] = detect_apache,
+  ['access%.conf.*'] = detect_apache,
+  ['apache%.conf.*'] = detect_apache,
+  ['apache2%.conf.*'] = detect_apache,
+  ['httpd%.conf.*'] = detect_apache,
+  ['srm%.conf.*'] = detect_apache,
+  ['.*/etc/httpd/conf%..*/.*'] = detect_apache,
+  ['.*/etc/httpd/conf%.d/.*%.conf.*'] = detect_apache,
+  ['.*/etc/httpd/mods%-.*/.*'] = detect_apache,
+  ['.*/etc/httpd/sites%-.*/.*'] = detect_apache,
   ['.*/etc/proftpd/.*%.conf.*'] = starsetf('apachestyle'),
   ['.*/etc/proftpd/conf%..*/.*'] = starsetf('apachestyle'),
   ['proftpd%.conf.*'] = starsetf('apachestyle'),
   ['.*asterisk/.*%.conf.*'] = starsetf('asterisk'),
   ['.*asterisk.*/.*voicemail%.conf.*'] = starsetf('asteriskvm'),
   ['.*/%.aptitude/config'] = 'aptconf',
-  ['.*%.[aA]'] = function(path, bufnr)
-    return require('vim.filetype.detect').asm(bufnr)
-  end,
-  ['.*%.[sS]'] = function(path, bufnr)
-    return require('vim.filetype.detect').asm(bufnr)
-  end,
+  ['.*%.[aA]'] = detect.asm,
+  ['.*%.[sS]'] = detect.asm,
   ['[mM]akefile%.am'] = 'automake',
   ['.*/bind/db%..*'] = starsetf('bindzone'),
   ['.*/named/db%..*'] = starsetf('bindzone'),
@@ -1825,16 +1569,12 @@ local pattern = {
   ['.*/etc/default/cdrdao'] = 'cdrdaoconf',
   ['.*hgrc'] = 'cfg',
   ['.*%.[Cc][Ff][Gg]'] = {
-    function(path, bufnr)
-      return require('vim.filetype.detect').cfg(bufnr)
-    end,
+    detect.cfg,
     -- Decrease priority to avoid conflicts with more specific patterns
     -- such as '.*/etc/a2ps/.*%.cfg', '.*enlightenment/.*%.cfg', etc.
     { priority = -1 },
   },
-  ['[cC]hange[lL]og.*'] = starsetf(function(path, bufnr)
-    return require('vim.filetype.detect').changelog(bufnr)
-  end),
+  ['[cC]hange[lL]og.*'] = starsetf(detect.changelog),
   ['.*%.%.ch'] = 'chill',
   ['.*%.cmake%.in'] = 'cmake',
   -- */cmus/rc and */.cmus/rc
@@ -1846,19 +1586,11 @@ local pattern = {
   ['.*/etc/hostname%..*'] = starsetf('config'),
   ['crontab%..*'] = starsetf('crontab'),
   ['.*/etc/cron%.d/.*'] = starsetf('crontab'),
-  ['%.cshrc.*'] = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
-  ['%.login.*'] = function(path, bufnr)
-    return require('vim.filetype.detect').csh(path, bufnr)
-  end,
+  ['%.cshrc.*'] = detect.csh,
+  ['%.login.*'] = detect.csh,
   ['cvs%d+'] = 'cvs',
-  ['.*%.[Dd][Aa][Tt]'] = function(path, bufnr)
-    return require('vim.filetype.detect').dat(path, bufnr)
-  end,
-  ['.*/debian/patches/.*'] = function(path, bufnr)
-    return require('vim.filetype.detect').dep3patch(path, bufnr)
-  end,
+  ['.*%.[Dd][Aa][Tt]'] = detect.dat,
+  ['.*/debian/patches/.*'] = detect.dep3patch,
   ['.*/etc/dnsmasq%.d/.*'] = starsetf('dnsmasq'),
   ['Containerfile%..*'] = starsetf('dockerfile'),
   ['Dockerfile%..*'] = starsetf('dockerfile'),
@@ -1884,53 +1616,25 @@ local pattern = {
   ['.*/dtrace/.*%.d'] = 'dtrace',
   ['.*esmtprc'] = 'esmtprc',
   ['.*Eterm/.*%.cfg'] = 'eterm',
-  ['[a-zA-Z0-9].*Dict'] = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  ['[a-zA-Z0-9].*Dict%..*'] = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  ['[a-zA-Z].*Properties'] = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  ['[a-zA-Z].*Properties%..*'] = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  ['.*Transport%..*'] = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  ['.*/constant/g'] = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  ['.*/0/.*'] = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
-  ['.*/0%.orig/.*'] = function(path, bufnr)
-    return require('vim.filetype.detect').foam(bufnr)
-  end,
+  ['[a-zA-Z0-9].*Dict'] = detect.foam,
+  ['[a-zA-Z0-9].*Dict%..*'] = detect.foam,
+  ['[a-zA-Z].*Properties'] = detect.foam,
+  ['[a-zA-Z].*Properties%..*'] = detect.foam,
+  ['.*Transport%..*'] = detect.foam,
+  ['.*/constant/g'] = detect.foam,
+  ['.*/0/.*'] = detect.foam,
+  ['.*/0%.orig/.*'] = detect.foam,
   ['.*/%.fvwm/.*'] = starsetf('fvwm'),
-  ['.*fvwmrc.*'] = starsetf(function(path, bufnr)
-    return 'fvwm', function(b)
-      vim.b[b].fvwm_version = 1
-    end
-  end),
-  ['.*fvwm95.*%.hook'] = starsetf(function(path, bufnr)
-    return 'fvwm', function(b)
-      vim.b[b].fvwm_version = 1
-    end
-  end),
-  ['.*fvwm2rc.*'] = starsetf(function(path, bufnr)
-    return require('vim.filetype.detect').fvwm(path)
-  end),
+  ['.*fvwmrc.*'] = starsetf(detect.fvwm_v1),
+  ['.*fvwm95.*%.hook'] = starsetf(detect.fvwm_v1),
+  ['.*fvwm2rc.*'] = starsetf(detect.fvwm_v2),
   ['.*/tmp/lltmp.*'] = starsetf('gedcom'),
   ['.*/etc/gitconfig%.d/.*'] = starsetf('gitconfig'),
   ['.*/gitolite%-admin/conf/.*'] = starsetf('gitolite'),
   ['tmac%..*'] = starsetf('nroff'),
   ['.*/%.gitconfig%.d/.*'] = starsetf('gitconfig'),
   ['.*%.git/.*'] = {
-    function(path, bufnr)
-      return require('vim.filetype.detect').git(bufnr)
-    end,
+    detect.git,
     -- Decrease priority to run after simple pattern checks
     { priority = -1 },
   },
@@ -2093,15 +1797,13 @@ local pattern = {
   ['.*/log/news/news%.notice'] = 'messages',
   ['.*/log/syslog%.notice'] = 'messages',
   ['.*/log/user%.notice'] = 'messages',
-  ['.*%.[Mm][Oo][Dd]'] = function(path, bufnr)
-    return require('vim.filetype.detect').mod(path, bufnr)
-  end,
+  ['.*%.[Mm][Oo][Dd]'] = detect.mod,
   ['.*/etc/modules%.conf'] = 'modconf',
   ['.*/etc/conf%.modules'] = 'modconf',
   ['.*/etc/modules'] = 'modconf',
   ['.*/etc/modprobe%..*'] = starsetf('modconf'),
   ['.*/etc/modutils/.*'] = starsetf(function(path, bufnr)
-    if vim.fn.executable(vim.fn.expand(path)) ~= 1 then
+    if fn.executable(fn.expand(path)) ~= 1 then
       return 'modconf'
     end
   end),
@@ -2110,32 +1812,30 @@ local pattern = {
   ['Muttngrc'] = 'muttrc',
   ['.*/etc/Muttrc%.d/.*'] = starsetf('muttrc'),
   ['.*/%.mplayer/config'] = 'mplayerconf',
-  ['Muttrc.*'] = starsetf('muttrc'),
-  ['Muttngrc.*'] = starsetf('muttrc'),
+  ['Muttrc.*'] = detect_muttrc,
+  ['Muttngrc.*'] = detect_muttrc,
   -- muttrc* and .muttrc*
-  ['%.?muttrc.*'] = starsetf('muttrc'),
+  ['%.?muttrc.*'] = detect_muttrc,
   -- muttngrc* and .muttngrc*
-  ['%.?muttngrc.*'] = starsetf('muttrc'),
-  ['.*/%.mutt/muttrc.*'] = starsetf('muttrc'),
-  ['.*/%.muttng/muttrc.*'] = starsetf('muttrc'),
-  ['.*/%.muttng/muttngrc.*'] = starsetf('muttrc'),
+  ['%.?muttngrc.*'] = detect_muttrc,
+  ['.*/%.mutt/muttrc.*'] = detect_muttrc,
+  ['.*/%.muttng/muttrc.*'] = detect_muttrc,
+  ['.*/%.muttng/muttngrc.*'] = detect_muttrc,
   ['rndc.*%.conf'] = 'named',
   ['rndc.*%.key'] = 'named',
   ['named.*%.conf'] = 'named',
   ['.*/etc/nanorc'] = 'nanorc',
   ['.*%.NS[ACGLMNPS]'] = 'natural',
-  ['Neomuttrc.*'] = starsetf('neomuttrc'),
+  ['Neomuttrc.*'] = detect_neomuttrc,
   -- neomuttrc* and .neomuttrc*
-  ['%.?neomuttrc.*'] = starsetf('neomuttrc'),
-  ['.*/%.neomutt/neomuttrc.*'] = starsetf('neomuttrc'),
+  ['%.?neomuttrc.*'] = detect_neomuttrc,
+  ['.*/%.neomutt/neomuttrc.*'] = detect_neomuttrc,
   ['nginx.*%.conf'] = 'nginx',
   ['.*/etc/nginx/.*'] = 'nginx',
   ['.*nginx%.conf'] = 'nginx',
   ['.*/nginx/.*%.conf'] = 'nginx',
   ['.*/usr/local/nginx/conf/.*'] = 'nginx',
-  ['.*%.[1-9]'] = function(path, bufnr)
-    return require('vim.filetype.detect').nroff(bufnr)
-  end,
+  ['.*%.[1-9]'] = detect.nroff,
   ['.*%.ml%.cppo'] = 'ocaml',
   ['.*%.mli%.cppo'] = 'ocaml',
   ['.*%.opam%.template'] = 'opam',
@@ -2156,9 +1856,7 @@ local pattern = {
   ['.*%.php%d'] = 'php',
   ['.*/%.pinforc'] = 'pinfo',
   ['.*/etc/pinforc'] = 'pinfo',
-  ['.*%.[Pp][Rr][Gg]'] = function(path, bufnr)
-    return require('vim.filetype.detect').prg(bufnr)
-  end,
+  ['.*%.[Pp][Rr][Gg]'] = detect.prg,
   ['.*/etc/protocols'] = 'protocols',
   ['.*printcap.*'] = starsetf(function(path, bufnr)
     return require('vim.filetype.detect').printcap('print')
@@ -2178,30 +1876,14 @@ local pattern = {
   ['.*/etc/services'] = 'services',
   ['.*/etc/serial%.conf'] = 'setserial',
   ['.*/etc/udev/cdsymlinks%.conf'] = 'sh',
-  ['%.bash[_%-]aliases'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  ['%.bash[_%-]logout'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  ['%.bash[_%-]profile'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  ['%.kshrc.*'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'ksh')
-  end,
-  ['%.profile.*'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr))
-  end,
-  ['.*/etc/profile'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr))
-  end,
-  ['bash%-fc[%-%.].*'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'bash')
-  end,
-  ['%.tcshrc.*'] = function(path, bufnr)
-    return require('vim.filetype.detect').sh(path, M.getlines(bufnr), 'tcsh')
-  end,
+  ['%.bash[_%-]aliases'] = detect.bash,
+  ['%.bash[_%-]logout'] = detect.bash,
+  ['%.bash[_%-]profile'] = detect.bash,
+  ['%.kshrc.*'] = detect.ksh,
+  ['%.profile.*'] = detect.sh,
+  ['.*/etc/profile'] = detect.sh,
+  ['bash%-fc[%-%.].*'] = detect.bash,
+  ['%.tcshrc.*'] = detect.tcsh,
   ['.*/etc/sudoers%.d/.*'] = starsetf('sudoers'),
   ['.*%._sst%.meta'] = 'sisu',
   ['.*%.%-sst%.meta'] = 'sisu',
@@ -2213,17 +1895,13 @@ local pattern = {
   ['.*/%.ssh/config'] = 'sshconfig',
   ['.*/%.ssh/.*%.conf'] = 'sshconfig',
   ['.*/etc/ssh/sshd_config%.d/.*%.conf'] = 'sshdconfig',
-  ['.*%.[Ss][Rr][Cc]'] = function(path, bufnr)
-    return require('vim.filetype.detect').src(bufnr)
-  end,
+  ['.*%.[Ss][Rr][Cc]'] = detect.src,
   ['.*/etc/sudoers'] = 'sudoers',
   ['svn%-commit.*%.tmp'] = 'svn',
   ['.*/sway/config'] = 'swayconfig',
   ['.*/%.sway/config'] = 'swayconfig',
   ['.*%.swift%.gyb'] = 'swiftgyb',
-  ['.*%.[Ss][Yy][Ss]'] = function(path, bufnr)
-    return require('vim.filetype.detect').sys(bufnr)
-  end,
+  ['.*%.[Ss][Yy][Ss]'] = detect.sys,
   ['.*/etc/sysctl%.conf'] = 'sysctl',
   ['.*/etc/sysctl%.d/.*%.conf'] = 'sysctl',
   ['.*/systemd/.*%.automount'] = 'systemd',
@@ -2266,9 +1944,7 @@ local pattern = {
   ['.*/%.config/upstart/.*%.conf'] = 'upstart',
   ['.*/%.init/.*%.conf'] = 'upstart',
   ['.*/usr/share/upstart/.*%.override'] = 'upstart',
-  ['.*%.[Ll][Oo][Gg]'] = function(path, bufnr)
-    return require('vim.filetype.detect').log(path)
-  end,
+  ['.*%.[Ll][Oo][Gg]'] = detect.log,
   ['.*%.vhdl_[0-9].*'] = starsetf('vhdl'),
   ['.*%.ws[fc]'] = 'wsh',
   ['.*/Xresources/.*'] = starsetf('xdefaults'),
@@ -2286,20 +1962,10 @@ local pattern = {
   ['Xresources.*'] = starsetf('xdefaults'),
   ['.*/etc/xinetd%.d/.*'] = starsetf('xinetd'),
   ['.*xmodmap.*'] = starsetf('xmodmap'),
-  ['.*/xorg%.conf%.d/.*%.conf'] = function(path, bufnr)
-    return 'xf86config', function(b)
-      vim.b[b].xf86conf_xfree86_version = 4
-    end
-  end,
+  ['.*/xorg%.conf%.d/.*%.conf'] = detect.xfree86_v4,
   -- Increase priority to run before the pattern below
-  ['XF86Config%-4.*'] = starsetf(function(path, bufnr)
-    return 'xf86conf', function(b)
-      vim.b[b].xf86conf_xfree86_version = 4
-    end
-  end, { priority = -math.huge + 1 }),
-  ['XF86Config.*'] = starsetf(function(path, bufnr)
-    return require('vim.filetype.detect').xfree86()
-  end),
+  ['XF86Config%-4.*'] = starsetf(detect.xfree86_v4, { priority = -math.huge + 1 }),
+  ['XF86Config.*'] = starsetf(detect.xfree86_v3),
   ['%.zcompdump.*'] = starsetf('zsh'),
   -- .zlog* and zlog*
   ['%.?zlog.*'] = starsetf('zsh'),
@@ -2309,7 +1975,7 @@ local pattern = {
   ['.*~'] = function(path, bufnr)
     local short = path:gsub('~$', '', 1)
     if path ~= short and short ~= '' then
-      return M.match({ buf = bufnr, filename = vim.fn.fnameescape(short) })
+      return M.match({ buf = bufnr, filename = fn.fnameescape(short) })
     end
   end,
   -- END PATTERN
@@ -2317,8 +1983,10 @@ local pattern = {
 -- luacheck: pop
 -- luacheck: pop
 
+--- @param t vim.filetype.mapping
+--- @return vim.filetype.mapping[]
 local function sort_by_priority(t)
-  local sorted = {}
+  local sorted = {} --- @type vim.filetype.mapping[]
   for k, v in pairs(t) do
     local ft = type(v) == 'table' and v[1] or v
     assert(
@@ -2340,6 +2008,9 @@ end
 
 local pattern_sorted = sort_by_priority(pattern)
 
+--- @param path string
+--- @param as_pattern? true
+--- @return string
 local function normalize_path(path, as_pattern)
   local normal = path:gsub('\\', '/')
   if normal:find('^~') then
@@ -2348,12 +2019,17 @@ local function normalize_path(path, as_pattern)
       -- The rest of path should already be properly escaped.
       normal = vim.pesc(vim.env.HOME) .. normal:sub(2)
     else
-      normal = vim.env.HOME .. normal:sub(2)
+      normal = vim.env.HOME .. normal:sub(2) --- @type string
     end
   end
   return normal
 end
 
+--- @class vim.filetype.add.filetypes
+--- @field pattern vim.filetype.mapping
+--- @field extension vim.filetype.mapping
+--- @field filename vim.filetype.mapping
+
 --- Add new filetype mappings.
 ---
 --- Filetype mappings can be added either by extension or by filename (either
@@ -2423,10 +2099,10 @@ end
 ---     ['.*'] = {
 ---       priority = -math.huge,
 ---       function(path, bufnr)
----         local content = vim.filetype.getlines(bufnr, 1)
----         if vim.filetype.matchregex(content, [[^#!.*\\<mine\\>]]) then
+---         local content = vim.api.nvim_buf_get_lines(bufnr, 0, 1, false)[1] or ''
+---         if vim.regex([[^#!.*\\<mine\\>]]):match_str(content) ~= nil then
 ---           return 'mine'
----         elseif vim.filetype.matchregex(content, [[\\<drawing\\>]]) then
+---         elseif vim.regex([[\\<drawing\\>]]):match_str(content) ~= nil then
 ---           return 'drawing'
 ---         end
 ---       end,
@@ -2435,7 +2111,7 @@ end
 --- }
 --- </pre>
 ---
----@param filetypes table A table containing new filetype maps (see example).
+---@param filetypes vim.filetype.add.filetypes A table containing new filetype maps (see example).
 function M.add(filetypes)
   for k, v in pairs(filetypes.extension or {}) do
     extension[k] = v
@@ -2454,38 +2130,62 @@ function M.add(filetypes)
   end
 end
 
+--- @param ft vim.filetype.mapping.value
+--- @param path? string
+--- @param bufnr? integer
+--- @param ... any
+--- @return string?
+--- @return fun(b: integer)?
 local function dispatch(ft, path, bufnr, ...)
-  local on_detect
-  if type(ft) == 'function' then
-    if bufnr then
-      ft, on_detect = ft(path, bufnr, ...)
-    else
-      -- If bufnr is nil (meaning we are matching only against the filename), set it to an invalid
-      -- value (-1) and catch any errors from the filetype detection function. If the function tries
-      -- to use the buffer then it will fail, but this enables functions which do not need a buffer
-      -- to still work.
-      local ok
-      ok, ft, on_detect = pcall(ft, path, -1, ...)
-      if not ok then
-        return
-      end
+  if type(ft) == 'string' then
+    return ft
+  end
+
+  if type(ft) ~= 'function' then
+    return
+  end
+
+  assert(path)
+
+  ---@type string|false?, fun(b: integer)?
+  local ft0, on_detect
+  if bufnr then
+    ft0, on_detect = ft(path, bufnr, ...)
+  else
+    -- If bufnr is nil (meaning we are matching only against the filename), set it to an invalid
+    -- value (-1) and catch any errors from the filetype detection function. If the function tries
+    -- to use the buffer then it will fail, but this enables functions which do not need a buffer
+    -- to still work.
+    local ok
+    ok, ft0, on_detect = pcall(ft, path, -1, ...)
+    if not ok then
+      return
     end
   end
 
-  if type(ft) == 'string' then
-    return ft, on_detect
+  if not ft0 then
+    return
   end
+
+  return ft0, on_detect
 end
 
--- Lookup table/cache for patterns that contain an environment variable pattern, e.g. ${SOME_VAR}.
+--- Lookup table/cache for patterns that contain an environment variable pattern, e.g. ${SOME_VAR}.
+--- @type table<string,boolean>
 local expand_env_lookup = {}
 
+--- @param name string
+--- @param path string
+--- @param tail string
+--- @param pat string
+--- @return string|false?
 local function match_pattern(name, path, tail, pat)
   if expand_env_lookup[pat] == nil then
     expand_env_lookup[pat] = pat:find('%${') ~= nil
   end
   if expand_env_lookup[pat] then
-    local return_early
+    local return_early --- @type true?
+    --- @type string
     pat = pat:gsub('%${(%S-)}', function(env)
       -- If an environment variable is present in the pattern but not set, there is no match
       if not vim.env[env] then
@@ -2501,18 +2201,22 @@ local function match_pattern(name, path, tail, pat)
 
   -- If the pattern contains a / match against the full path, otherwise just the tail
   local fullpat = '^' .. pat .. '$'
-  local matches
+
   if pat:find('/') then
     -- Similar to |autocmd-pattern|, if the pattern contains a '/' then check for a match against
     -- both the short file name (as typed) and the full file name (after expanding to full path
     -- and resolving symlinks)
-    matches = name:match(fullpat) or path:match(fullpat)
-  else
-    matches = tail:match(fullpat)
+    return (name:match(fullpat) or path:match(fullpat))
   end
-  return matches
+
+  return (tail:match(fullpat))
 end
 
+--- @class vim.filetype.match.args
+--- @field buf? integer
+--- @field filename? string
+--- @field contents? string[]
+
 --- Perform filetype detection.
 ---
 --- The filetype can be detected using one of three methods:
@@ -2542,7 +2246,8 @@ end
 ---   vim.filetype.match({ contents = {'#!/usr/bin/env bash'} })
 --- </pre>
 ---
----@param args table Table specifying which matching strategy to use. Accepted keys are:
+---@param args vim.filetype.match.args Table specifying which matching strategy to use.
+---                 Accepted keys are:
 ---                   * buf (number): Buffer number to use for matching. Mutually exclusive with
 ---                                   {contents}
 ---                   * filename (string): Filename to use for matching. When {buf} is given,
@@ -2555,8 +2260,8 @@ end
 ---                   * contents (table): An array of lines representing file contents to use for
 ---                                       matching. Can be used with {filename}. Mutually exclusive
 ---                                       with {buf}.
----@return string|nil If a match was found, the matched filetype.
----@return function|nil A function that modifies buffer state when called (for example, to set some
+---@return string|nil # If a match was found, the matched filetype.
+---@return function|nil # A function that modifies buffer state when called (for example, to set some
 ---                     filetype specific buffer variables). The function accepts a buffer number as
 ---                     its only argument.
 function M.match(args)
@@ -2576,20 +2281,21 @@ function M.match(args)
     name = api.nvim_buf_get_name(bufnr)
   end
 
+  --- @type string?, fun(b: integer)?
   local ft, on_detect
 
   if name then
     name = normalize_path(name)
 
     -- First check for the simple case where the full path exists as a key
-    local path = vim.fn.fnamemodify(name, ':p')
+    local path = fn.fnamemodify(name, ':p')
     ft, on_detect = dispatch(filename[path], path, bufnr)
     if ft then
       return ft, on_detect
     end
 
     -- Next check against just the file name
-    local tail = vim.fn.fnamemodify(name, ':t')
+    local tail = fn.fnamemodify(name, ':t')
     ft, on_detect = dispatch(filename[tail], path, bufnr)
     if ft then
       return ft, on_detect
@@ -2616,7 +2322,7 @@ function M.match(args)
     end
 
     -- Next, check file extension
-    local ext = vim.fn.fnamemodify(name, ':e')
+    local ext = fn.fnamemodify(name, ':e')
     ft, on_detect = dispatch(extension[ext], path, bufnr)
     if ft then
       return ft, on_detect
@@ -2641,12 +2347,13 @@ function M.match(args)
   -- Finally, check file contents
   if contents or bufnr then
     if contents == nil then
+      assert(bufnr)
       if api.nvim_buf_line_count(bufnr) > 101 then
         -- only need first 100 and last line for current checks
-        contents = M.getlines(bufnr, 1, 100)
-        contents[#contents + 1] = M.getlines(bufnr, -1)
+        contents = M._getlines(bufnr, 1, 100)
+        contents[#contents + 1] = M._getline(bufnr, -1)
       else
-        contents = M.getlines(bufnr)
+        contents = M._getlines(bufnr)
       end
     end
     -- If name is nil, catch any errors from the contents filetype detection function.
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 4e18ed190a..59b50f2288 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -17,22 +17,26 @@
 --     Example:
 --     `if line =~ '^\s*unwind_protect\>'` => `if matchregex(line, [[\c^\s*unwind_protect\>]])`
 
+local fn = vim.fn
+
 local M = {}
 
-local getlines = vim.filetype.getlines
-local findany = vim.filetype.findany
-local nextnonblank = vim.filetype.nextnonblank
-local matchregex = vim.filetype.matchregex
+local getlines = vim.filetype._getlines
+local getline = vim.filetype._getline
+local findany = vim.filetype._findany
+local nextnonblank = vim.filetype._nextnonblank
+local matchregex = vim.filetype._matchregex
 
 -- luacheck: push no unused args
 -- luacheck: push ignore 122
 
 -- This function checks for the kind of assembly that is wanted by the user, or
 -- can be detected from the first five lines of the file.
-function M.asm(bufnr)
+--- @type vim.filetype.mapfn
+function M.asm(path, bufnr)
   local syntax = vim.b[bufnr].asmsyntax
   if not syntax or syntax == '' then
-    syntax = M.asm_syntax(bufnr)
+    syntax = M.asm_syntax(path, bufnr)
   end
 
   -- If b:asmsyntax still isn't set, default to asmsyntax or GNU
@@ -48,20 +52,21 @@ function M.asm(bufnr)
   end
 end
 
--- Active Server Pages (with Perl or Visual Basic Script)
-function M.asp(bufnr)
+--- Active Server Pages (with Perl or Visual Basic Script)
+--- @type vim.filetype.mapfn
+function M.asp(_, bufnr)
   if vim.g.filetype_asp then
     return vim.g.filetype_asp
   elseif table.concat(getlines(bufnr, 1, 3)):lower():find('perlscript') then
     return 'aspperl'
-  else
-    return 'aspvbs'
   end
+  return 'aspvbs'
 end
 
 -- Checks the first 5 lines for a asmsyntax=foo override.
 -- Only whitespace characters can be present immediately before or after this statement.
-function M.asm_syntax(bufnr)
+--- @type vim.filetype.mapfn
+function M.asm_syntax(_, bufnr)
   local lines = ' ' .. table.concat(getlines(bufnr, 1, 5), ' '):lower() .. ' '
   local match = lines:match('%sasmsyntax=([a-zA-Z0-9]+)%s')
   if match then
@@ -75,7 +80,8 @@ local visual_basic_content =
   { 'vb_name', 'begin vb%.form', 'begin vb%.mdiform', 'begin vb%.usercontrol' }
 
 -- See frm() for Visual Basic form file detection
-function M.bas(bufnr)
+--- @type vim.filetype.mapfn
+function M.bas(_, bufnr)
   if vim.g.filetype_bas then
     return vim.g.filetype_bas
   end
@@ -106,18 +112,21 @@ function M.bas(bufnr)
   return 'basic'
 end
 
-function M.bindzone(bufnr, default)
+--- @type vim.filetype.mapfn
+function M.bindzone(_, bufnr)
   local lines = table.concat(getlines(bufnr, 1, 4))
   if findany(lines, { '^; <<>> DiG [0-9%.]+.* <<>>', '%$ORIGIN', '%$TTL', 'IN%s+SOA' }) then
     return 'bindzone'
   end
-  return default
 end
 
 -- Returns true if file content looks like RAPID
+--- @param bufnr integer
+--- @param extension? string
+--- @return string|boolean?
 local function is_rapid(bufnr, extension)
   if extension == 'cfg' then
-    local line = getlines(bufnr, 1):lower()
+    local line = getline(bufnr, 1):lower()
     return findany(line, { 'eio:cfg', 'mmc:cfg', 'moc:cfg', 'proc:cfg', 'sio:cfg', 'sys:cfg' })
   end
   local line = nextnonblank(bufnr, 1)
@@ -128,23 +137,24 @@ local function is_rapid(bufnr, extension)
   return false
 end
 
-function M.cfg(bufnr)
+--- @type vim.filetype.mapfn
+function M.cfg(_, bufnr)
   if vim.g.filetype_cfg then
-    return vim.g.filetype_cfg
+    return vim.g.filetype_cfg --[[@as string]]
   elseif is_rapid(bufnr, 'cfg') then
     return 'rapid'
-  else
-    return 'cfg'
   end
+  return 'cfg'
 end
 
--- This function checks if one of the first ten lines start with a '@'.  In
--- that case it is probably a change file.
--- If the first line starts with # or ! it's probably a ch file.
--- If a line has "main", "include", "//" or "/*" it's probably ch.
--- Otherwise CHILL is assumed.
-function M.change(bufnr)
-  local first_line = getlines(bufnr, 1)
+--- This function checks if one of the first ten lines start with a '@'.  In
+--- that case it is probably a change file.
+--- If the first line starts with # or ! it's probably a ch file.
+--- If a line has "main", "include", "//" or "/*" it's probably ch.
+--- Otherwise CHILL is assumed.
+--- @type vim.filetype.mapfn
+function M.change(_, bufnr)
+  local first_line = getline(bufnr, 1)
   if findany(first_line, { '^#', '^!' }) then
     return 'ch'
   end
@@ -161,39 +171,42 @@ function M.change(bufnr)
   return 'chill'
 end
 
-function M.changelog(bufnr)
-  local line = getlines(bufnr, 1):lower()
+--- @type vim.filetype.mapfn
+function M.changelog(_, bufnr)
+  local line = getline(bufnr, 1):lower()
   if line:find('; urgency=') then
     return 'debchangelog'
   end
   return 'changelog'
 end
 
-function M.class(bufnr)
+--- @type vim.filetype.mapfn
+function M.class(_, bufnr)
   -- Check if not a Java class (starts with '\xca\xfe\xba\xbe')
-  if not getlines(bufnr, 1):find('^\202\254\186\190') then
+  if not getline(bufnr, 1):find('^\202\254\186\190') then
     return 'stata'
   end
 end
 
-function M.cls(bufnr)
+--- @type vim.filetype.mapfn
+function M.cls(_, bufnr)
   if vim.g.filetype_cls then
     return vim.g.filetype_cls
   end
-  local line = getlines(bufnr, 1)
+  local line = getline(bufnr, 1)
   if line:find('^[%%\\]') then
     return 'tex'
   elseif line:find('^#') and line:lower():find('rexx') then
     return 'rexx'
   elseif line == 'VERSION 1.0 CLASS' then
     return 'vb'
-  else
-    return 'st'
   end
+  return 'st'
 end
 
+--- @type vim.filetype.mapfn
 function M.conf(path, bufnr)
-  if vim.fn.did_filetype() ~= 0 or path:find(vim.g.ft_ignore_pat) then
+  if fn.did_filetype() ~= 0 or path:find(vim.g.ft_ignore_pat) then
     return
   end
   if path:find('%.conf$') then
@@ -206,22 +219,30 @@ function M.conf(path, bufnr)
   end
 end
 
--- Debian Control
-function M.control(bufnr)
-  if getlines(bufnr, 1):find('^Source:') then
+--- Debian Control
+--- @type vim.filetype.mapfn
+function M.control(_, bufnr)
+  if getline(bufnr, 1):find('^Source:') then
     return 'debcontrol'
   end
 end
 
--- Debian Copyright
-function M.copyright(bufnr)
-  if getlines(bufnr, 1):find('^Format:') then
+--- Debian Copyright
+--- @type vim.filetype.mapfn
+function M.copyright(_, bufnr)
+  if getline(bufnr, 1):find('^Format:') then
     return 'debcopyright'
   end
 end
 
+--- @type vim.filetype.mapfn
+function M.cpp(_, _)
+  return vim.g.cynlib_syntax_for_cpp and 'cynlib' or 'cpp'
+end
+
+--- @type vim.filetype.mapfn
 function M.csh(path, bufnr)
-  if vim.fn.did_filetype() ~= 0 then
+  if fn.did_filetype() ~= 0 then
     -- Filetype was already detected
     return
   end
@@ -235,6 +256,9 @@ function M.csh(path, bufnr)
   end
 end
 
+--- @param path string
+--- @param contents string[]
+--- @return string?
 local function cvs_diff(path, contents)
   for _, line in ipairs(contents) do
     if not line:find('^%? ') then
@@ -280,8 +304,9 @@ local function cvs_diff(path, contents)
   end
 end
 
+--- @type vim.filetype.mapfn
 function M.dat(path, bufnr)
-  local file_name = vim.fn.fnamemodify(path, ':t'):lower()
+  local file_name = fn.fnamemodify(path, ':t'):lower()
   -- Innovation data processing
   if findany(file_name, { '^upstream%.dat$', '^upstream%..*%.dat$', '^.*%.upstream%.dat$' }) then
     return 'upstreamdat'
@@ -296,7 +321,8 @@ function M.dat(path, bufnr)
   end
 end
 
-function M.decl(bufnr)
+--- @type vim.filetype.mapfn
+function M.decl(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 3)) do
     if line:lower():find('^<!sgml') then
       return 'sgmldecl'
@@ -306,8 +332,9 @@ end
 
 -- This function is called for all files under */debian/patches/*, make sure not
 -- to non-dep3patch files, such as README and other text files.
+--- @type vim.filetype.mapfn
 function M.dep3patch(path, bufnr)
-  local file_name = vim.fn.fnamemodify(path, ':t')
+  local file_name = fn.fnamemodify(path, ':t')
   if file_name == 'series' then
     return
   end
@@ -352,7 +379,7 @@ local function diff(contents)
   end
 end
 
-function M.dns_zone(contents)
+local function dns_zone(contents)
   if
     findany(
       contents[1] .. contents[2] .. contents[3] .. contents[4],
@@ -370,8 +397,9 @@ function M.dns_zone(contents)
   end
 end
 
-function M.dtrace(bufnr)
-  if vim.fn.did_filetype() ~= 0 then
+--- @type vim.filetype.mapfn
+function M.dtrace(_, bufnr)
+  if fn.did_filetype() ~= 0 then
     -- Filetype was already detected
     return
   end
@@ -386,7 +414,8 @@ function M.dtrace(bufnr)
   return 'd'
 end
 
-function M.e(bufnr)
+--- @type vim.filetype.mapfn
+function M.e(_, bufnr)
   if vim.g.filetype_euphoria then
     return vim.g.filetype_euphoria
   end
@@ -398,8 +427,9 @@ function M.e(bufnr)
   return 'eiffel'
 end
 
-function M.edn(bufnr)
-  local line = getlines(bufnr, 1)
+--- @type vim.filetype.mapfn
+function M.edn(_, bufnr)
+  local line = getline(bufnr, 1)
   if matchregex(line, [[\c^\s*(\s*edif\>]]) then
     return 'edif'
   else
@@ -410,7 +440,8 @@ end
 -- This function checks for valid cl syntax in the first five lines.
 -- Look for either an opening comment, '#', or a block start, '{'.
 -- If not found, assume SGML.
-function M.ent(bufnr)
+--- @type vim.filetype.mapfn
+function M.ent(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 5)) do
     if line:find('^%s*[#{]') then
       return 'cl'
@@ -423,7 +454,13 @@ function M.ent(bufnr)
   return 'dtd'
 end
 
-function M.ex(bufnr)
+--- @type vim.filetype.mapfn
+function M.euphoria(_, _)
+  return vim.g.filetype_euphoria or 'euphoria3'
+end
+
+--- @type vim.filetype.mapfn
+function M.ex(_, bufnr)
   if vim.g.filetype_euphoria then
     return vim.g.filetype_euphoria
   else
@@ -439,7 +476,8 @@ end
 -- This function checks the first 15 lines for appearance of 'FoamFile'
 -- and then 'object' in a following line.
 -- In that case, it's probably an OpenFOAM file
-function M.foam(bufnr)
+--- @type vim.filetype.mapfn
+function M.foam(_, bufnr)
   local foam_file = false
   for _, line in ipairs(getlines(bufnr, 1, 15)) do
     if line:find('^FoamFile') then
@@ -450,7 +488,8 @@ function M.foam(bufnr)
   end
 end
 
-function M.frm(bufnr)
+--- @type vim.filetype.mapfn
+function M.frm(_, bufnr)
   if vim.g.filetype_frm then
     return vim.g.filetype_frm
   end
@@ -462,8 +501,16 @@ function M.frm(bufnr)
   end
 end
 
-function M.fvwm(path)
-  if vim.fn.fnamemodify(path, ':e') == 'm4' then
+--- @type vim.filetype.mapfn
+function M.fvwm_1(_, _)
+  return 'fvwm', function(bufnr)
+    vim.b[bufnr].fvwm_version = 1
+  end
+end
+
+--- @type vim.filetype.mapfn
+function M.fvwm_v2(path, _)
+  if fn.fnamemodify(path, ':e') == 'm4' then
     return 'fvwm2m4'
   end
   return 'fvwm', function(bufnr)
@@ -472,7 +519,8 @@ function M.fvwm(path)
 end
 
 -- Distinguish between Forth and F#.
-function M.fs(bufnr)
+--- @type vim.filetype.mapfn
+function M.fs(_, bufnr)
   if vim.g.filetype_fs then
     return vim.g.filetype_fs
   end
@@ -484,14 +532,16 @@ function M.fs(bufnr)
   return 'fsharp'
 end
 
-function M.git(bufnr)
-  local line = getlines(bufnr, 1)
+--- @type vim.filetype.mapfn
+function M.git(_, bufnr)
+  local line = getline(bufnr, 1)
   if matchregex(line, [[^\x\{40,\}\>\|^ref: ]]) then
     return 'git'
   end
 end
 
-function M.header(bufnr)
+--- @type vim.filetype.mapfn
+function M.header(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 200)) do
     if findany(line:lower(), { '^@interface', '^@end', '^@class' }) then
       if vim.g.c_syntax_for_h then
@@ -510,7 +560,8 @@ function M.header(bufnr)
   end
 end
 
-function M.html(bufnr)
+--- @type vim.filetype.mapfn
+function M.html(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 10)) do
     if matchregex(line, [[\<DTD\s\+XHTML\s]]) then
       return 'xhtml'
@@ -522,14 +573,16 @@ function M.html(bufnr)
 end
 
 -- Virata Config Script File or Drupal module
-function M.hw(bufnr)
-  if getlines(bufnr, 1):lower():find('<%?php') then
+--- @type vim.filetype.mapfn
+function M.hw(_, bufnr)
+  if getline(bufnr, 1):lower():find('<%?php') then
     return 'php'
   end
   return 'virata'
 end
 
-function M.idl(bufnr)
+--- @type vim.filetype.mapfn
+function M.idl(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 50)) do
     if findany(line:lower(), { '^%s*import%s+"unknwn"%.idl', '^%s*import%s+"objidl"%.idl' }) then
       return 'msidl'
@@ -542,7 +595,8 @@ local pascal_comments = { '^%s*{', '^%s*%(%*', '^%s*//' }
 local pascal_keywords =
   [[\c^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>]]
 
-function M.inc(bufnr)
+--- @type vim.filetype.mapfn
+function M.inc(path, bufnr)
   if vim.g.filetype_inc then
     return vim.g.filetype_inc
   end
@@ -560,7 +614,7 @@ function M.inc(bufnr)
   elseif findany(lines, { '^%s*inherit ', '^%s*require ', '^%s*%u[%w_:${}]*%s+%??[?:+]?= ' }) then
     return 'bitbake'
   else
-    local syntax = M.asm_syntax(bufnr)
+    local syntax = M.asm_syntax(path, bufnr)
     if not syntax or syntax == '' then
       return 'pov'
     end
@@ -570,8 +624,9 @@ function M.inc(bufnr)
   end
 end
 
-function M.inp(bufnr)
-  if getlines(bufnr, 1):find('^%*') then
+--- @type vim.filetype.mapfn
+function M.inp(_, bufnr)
+  if getline(bufnr, 1):find('^%*') then
     return 'abaqus'
   else
     for _, line in ipairs(getlines(bufnr, 1, 500)) do
@@ -582,16 +637,18 @@ function M.inp(bufnr)
   end
 end
 
+--- @type vim.filetype.mapfn
 function M.install(path, bufnr)
-  if getlines(bufnr, 1):lower():find('<%?php') then
+  if getline(bufnr, 1):lower():find('<%?php') then
     return 'php'
   end
-  return M.sh(path, getlines(bufnr), 'bash')
+  return M.bash(path, bufnr)
 end
 
--- Innovation Data Processing
--- (refactor of filetype.vim since the patterns are case-insensitive)
-function M.log(path)
+--- Innovation Data Processing
+--- (refactor of filetype.vim since the patterns are case-insensitive)
+--- @type vim.filetype.mapfn
+function M.log(path, _)
   path = path:lower()
   if
     findany(
@@ -614,7 +671,8 @@ function M.log(path)
   end
 end
 
-function M.lpc(bufnr)
+--- @type vim.filetype.mapfn
+function M.lpc(_, bufnr)
   if vim.g.lpc_syntax_for_c then
     for _, line in ipairs(getlines(bufnr, 1, 12)) do
       if
@@ -637,7 +695,8 @@ function M.lpc(bufnr)
   return 'c'
 end
 
-function M.lsl(bufnr)
+--- @type vim.filetype.mapfn
+function M.lsl(_, bufnr)
   if vim.g.filetype_lsl then
     return vim.g.filetype_lsl
   end
@@ -650,7 +709,8 @@ function M.lsl(bufnr)
   end
 end
 
-function M.m(bufnr)
+--- @type vim.filetype.mapfn
+function M.m(_, bufnr)
   if vim.g.filetype_m then
     return vim.g.filetype_m
   end
@@ -703,6 +763,8 @@ function M.m(bufnr)
   end
 end
 
+--- @param contents string[]
+--- @return string?
 local function m4(contents)
   for _, line in ipairs(contents) do
     if matchregex(line, [[^\s*dnl\>]]) then
@@ -715,9 +777,10 @@ local function m4(contents)
   end
 end
 
--- Rely on the file to start with a comment.
--- MS message text files use ';', Sendmail files use '#' or 'dnl'
-function M.mc(bufnr)
+--- Rely on the file to start with a comment.
+--- MS message text files use ';', Sendmail files use '#' or 'dnl'
+--- @type vim.filetype.mapfn
+function M.mc(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 20)) do
     if findany(line:lower(), { '^%s*#', '^%s*dnl' }) then
       -- Sendmail .mc file
@@ -730,14 +793,17 @@ function M.mc(bufnr)
   return 'm4'
 end
 
+--- @param path string
+--- @return string?
 function M.me(path)
-  local filename = vim.fn.fnamemodify(path, ':t'):lower()
+  local filename = fn.fnamemodify(path, ':t'):lower()
   if filename ~= 'read.me' and filename ~= 'click.me' then
     return 'nroff'
   end
 end
 
-function M.mm(bufnr)
+--- @type vim.filetype.mapfn
+function M.mm(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 20)) do
     if matchregex(line, [[\c^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)]]) then
       return 'objcpp'
@@ -746,7 +812,8 @@ function M.mm(bufnr)
   return 'nroff'
 end
 
-function M.mms(bufnr)
+--- @type vim.filetype.mapfn
+function M.mms(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 20)) do
     if findany(line, { '^%s*%%', '^%s*//', '^%*' }) then
       return 'mmix'
@@ -757,7 +824,9 @@ function M.mms(bufnr)
   return 'mmix'
 end
 
--- Returns true if file content looks like LambdaProlog
+--- Returns true if file content looks like LambdaProlog
+--- @param bufnr integer
+--- @return boolean
 local function is_lprolog(bufnr)
   -- Skip apparent comments and blank lines, what looks like
   -- LambdaProlog comment may be RAPID header
@@ -765,12 +834,14 @@ local function is_lprolog(bufnr)
     -- The second pattern matches a LambdaProlog comment
     if not findany(line, { '^%s*$', '^%s*%%' }) then
       -- The pattern must not catch a go.mod file
-      return matchregex(line, [[\c\<module\s\+\w\+\s*\.\s*\(%\|$\)]]) ~= nil
+      return matchregex(line, [[\c\<module\s\+\w\+\s*\.\s*\(%\|$\)]])
     end
   end
+  return false
 end
 
--- Determine if *.mod is ABB RAPID, LambdaProlog, Modula-2, Modsim III or go.mod
+--- Determine if *.mod is ABB RAPID, LambdaProlog, Modula-2, Modsim III or go.mod
+--- @type vim.filetype.mapfn
 function M.mod(path, bufnr)
   if vim.g.filetype_mod then
     return vim.g.filetype_mod
@@ -782,21 +853,30 @@ function M.mod(path, bufnr)
     return 'modula2'
   elseif is_rapid(bufnr) then
     return 'rapid'
-  else
-    -- Nothing recognized, assume modsim3
-    return 'modsim3'
+  end
+  -- Nothing recognized, assume modsim3
+  return 'modsim3'
+end
+
+--- Determine if *.mod is ABB RAPID, LambdaProlog, Modula-2, Modsim III or go.mod
+--- @type vim.filetype.mapfn
+function M.mp(_, _)
+  return 'mp', function(b)
+    vim.b[b].mp_metafun = 1
   end
 end
 
-function M.news(bufnr)
-  if getlines(bufnr, 1):lower():find('; urgency=') then
+--- @type vim.filetype.mapfn
+function M.news(_, bufnr)
+  if getline(bufnr, 1):lower():find('; urgency=') then
     return 'debchangelog'
   end
 end
 
--- This function checks if one of the first five lines start with a dot. In
--- that case it is probably an nroff file.
-function M.nroff(bufnr)
+--- This function checks if one of the first five lines start with a dot. In
+--- that case it is probably an nroff file.
+--- @type vim.filetype.mapfn
+function M.nroff(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 5)) do
     if line:find('^%.') then
       return 'nroff'
@@ -804,25 +884,26 @@ function M.nroff(bufnr)
   end
 end
 
-function M.patch(bufnr)
-  local firstline = getlines(bufnr, 1)
+--- @type vim.filetype.mapfn
+function M.patch(_, bufnr)
+  local firstline = getline(bufnr, 1)
   if string.find(firstline, '^From ' .. string.rep('%x', 40) .. '+ Mon Sep 17 00:00:00 2001$') then
     return 'gitsendemail'
-  else
-    return 'diff'
   end
+  return 'diff'
 end
 
--- If the file has an extension of 't' and is in a directory 't' or 'xt' then
--- it is almost certainly a Perl test file.
--- If the first line starts with '#' and contains 'perl' it's probably a Perl file.
--- (Slow test) If a file contains a 'use' statement then it is almost certainly a Perl file.
+--- If the file has an extension of 't' and is in a directory 't' or 'xt' then
+--- it is almost certainly a Perl test file.
+--- If the first line starts with '#' and contains 'perl' it's probably a Perl file.
+--- (Slow test) If a file contains a 'use' statement then it is almost certainly a Perl file.
+--- @type vim.filetype.mapfn
 function M.perl(path, bufnr)
   local dir_name = vim.fs.dirname(path)
-  if vim.fn.expand(path, '%:e') == 't' and (dir_name == 't' or dir_name == 'xt') then
+  if fn.expand(path, '%:e') == 't' and (dir_name == 't' or dir_name == 'xt') then
     return 'perl'
   end
-  local first_line = getlines(bufnr, 1)
+  local first_line = getline(bufnr, 1)
   if first_line:find('^#') and first_line:lower():find('perl') then
     return 'perl'
   end
@@ -833,7 +914,8 @@ function M.perl(path, bufnr)
   end
 end
 
-function M.pl(bufnr)
+--- @type vim.filetype.mapfn
+function M.pl(_, bufnr)
   if vim.g.filetype_pl then
     return vim.g.filetype_pl
   end
@@ -851,8 +933,9 @@ function M.pl(bufnr)
   end
 end
 
-function M.pm(bufnr)
-  local line = getlines(bufnr, 1)
+--- @type vim.filetype.mapfn
+function M.pm(_, bufnr)
+  local line = getline(bufnr, 1)
   if line:find('XPM2') then
     return 'xpm2'
   elseif line:find('XPM') then
@@ -862,7 +945,8 @@ function M.pm(bufnr)
   end
 end
 
-function M.pp(bufnr)
+--- @type vim.filetype.mapfn
+function M.pp(_, bufnr)
   if vim.g.filetype_pp then
     return vim.g.filetype_pp
   end
@@ -874,7 +958,8 @@ function M.pp(bufnr)
   end
 end
 
-function M.prg(bufnr)
+--- @type vim.filetype.mapfn
+function M.prg(_, bufnr)
   if vim.g.filetype_prg then
     return vim.g.filetype_prg
   elseif is_rapid(bufnr) then
@@ -886,7 +971,7 @@ function M.prg(bufnr)
 end
 
 function M.printcap(ptcap_type)
-  if vim.fn.did_filetype() == 0 then
+  if fn.did_filetype() == 0 then
     return 'ptcap', function(bufnr)
       vim.b[bufnr].ptcap_type = ptcap_type
     end
@@ -895,14 +980,15 @@ end
 
 -- This function checks for an assembly comment in the first ten lines.
 -- If not found, assume Progress.
-function M.progress_asm(bufnr)
+--- @type vim.filetype.mapfn
+function M.progress_asm(path, bufnr)
   if vim.g.filetype_i then
     return vim.g.filetype_i
   end
 
   for _, line in ipairs(getlines(bufnr, 1, 10)) do
     if line:find('^%s*;') or line:find('^/%*') then
-      return M.asm(bufnr)
+      return M.asm(path, bufnr)
     elseif not line:find('^%s*$') or line:find('^/%*') then
       -- Not an empty line: doesn't look like valid assembly code
       -- or it looks like a Progress /* comment.
@@ -912,13 +998,14 @@ function M.progress_asm(bufnr)
   return 'progress'
 end
 
-function M.progress_cweb(bufnr)
+--- @type vim.filetype.mapfn
+function M.progress_cweb(_, bufnr)
   if vim.g.filetype_w then
     return vim.g.filetype_w
   else
     if
-      getlines(bufnr, 1):lower():find('^&analyze')
-      or getlines(bufnr, 3):lower():find('^&global%-define')
+      getline(bufnr, 1):lower():find('^&analyze')
+      or getline(bufnr, 3):lower():find('^&global%-define')
     then
       return 'progress'
     else
@@ -930,7 +1017,8 @@ end
 -- This function checks for valid Pascal syntax in the first 10 lines.
 -- Look for either an opening comment or a program start.
 -- If not found, assume Progress.
-function M.progress_pascal(bufnr)
+--- @type vim.filetype.mapfn
+function M.progress_pascal(_, bufnr)
   if vim.g.filetype_p then
     return vim.g.filetype_p
   end
@@ -946,34 +1034,33 @@ function M.progress_pascal(bufnr)
   return 'progress'
 end
 
--- Distinguish between "default", Prolog and Cproto prototype file.
-function M.proto(bufnr, default)
+--- Distinguish between "default", Prolog and Cproto prototype file.
+--- @type vim.filetype.mapfn
+function M.proto(_, bufnr)
   -- Cproto files have a comment in the first line and a function prototype in
   -- the second line, it always ends in ";".  Indent files may also have
   -- comments, thus we can't match comments to see the difference.
   -- IDL files can have a single ';' in the second line, require at least one
   -- character before the ';'.
-  if getlines(bufnr, 2):find('.;$') then
+  if getline(bufnr, 2):find('.;$') then
     return 'cpp'
-  else
-    -- Recognize Prolog by specific text in the first non-empty line;
-    -- require a blank after the '%' because Perl uses "%list" and "%translate"
-    local line = nextnonblank(bufnr, 1)
-    if
-      line and line:find(':%-')
-      or matchregex(line, [[\c\<prolog\>]])
-      or findany(line, { '^%s*%%+%s', '^%s*%%+$', '^%s*/%*' })
-    then
-      return 'prolog'
-    else
-      return default
-    end
+  end
+  -- Recognize Prolog by specific text in the first non-empty line;
+  -- require a blank after the '%' because Perl uses "%list" and "%translate"
+  local line = nextnonblank(bufnr, 1)
+  if
+    line and line:find(':%-')
+    or matchregex(line, [[\c\<prolog\>]])
+    or findany(line, { '^%s*%%+%s', '^%s*%%+$', '^%s*/%*' })
+  then
+    return 'prolog'
   end
 end
 
 -- Software Distributor Product Specification File (POSIX 1387.2-1995)
-function M.psf(bufnr)
-  local line = getlines(bufnr, 1):lower()
+--- @type vim.filetype.mapfn
+function M.psf(_, bufnr)
+  local line = getline(bufnr, 1):lower()
   if
     findany(line, {
       '^%s*distribution%s*$',
@@ -987,7 +1074,8 @@ function M.psf(bufnr)
   end
 end
 
-function M.r(bufnr)
+--- @type vim.filetype.mapfn
+function M.r(_, bufnr)
   local lines = getlines(bufnr, 1, 50)
   -- Rebol is easy to recognize, check for that first
   if matchregex(table.concat(lines), [[\c\<rebol\>]]) then
@@ -1008,13 +1096,13 @@ function M.r(bufnr)
   -- Nothing recognized, use user default or assume R
   if vim.g.filetype_r then
     return vim.g.filetype_r
-  else
-    -- Rexx used to be the default, but R appears to be much more popular.
-    return 'r'
   end
+  -- Rexx used to be the default, but R appears to be much more popular.
+  return 'r'
 end
 
-function M.redif(bufnr)
+--- @type vim.filetype.mapfn
+function M.redif(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 5)) do
     if line:lower():find('^template%-type:') then
       return 'redif'
@@ -1022,8 +1110,9 @@ function M.redif(bufnr)
   end
 end
 
-function M.reg(bufnr)
-  local line = getlines(bufnr, 1):lower()
+--- @type vim.filetype.mapfn
+function M.reg(_, bufnr)
+  local line = getline(bufnr, 1):lower()
   if
     line:find('^regedit[0-9]*%s*$') or line:find('^windows registry editor version %d*%.%d*%s*$')
   then
@@ -1032,7 +1121,8 @@ function M.reg(bufnr)
 end
 
 -- Diva (with Skill) or InstallShield
-function M.rul(bufnr)
+--- @type vim.filetype.mapfn
+function M.rul(_, bufnr)
   if table.concat(getlines(bufnr, 1, 6)):lower():find('installshield') then
     return 'ishd'
   end
@@ -1040,6 +1130,7 @@ function M.rul(bufnr)
 end
 
 local udev_rules_pattern = '^%s*udev_rules%s*=%s*"([%^"]+)/*".*'
+--- @type vim.filetype.mapfn
 function M.rules(path)
   path = path:lower()
   if
@@ -1059,11 +1150,12 @@ function M.rules(path)
   elseif findany(path, { '^/etc/polkit%-1/rules%.d', '/usr/share/polkit%-1/rules%.d' }) then
     return 'javascript'
   else
-    local ok, config_lines = pcall(vim.fn.readfile, '/etc/udev/udev.conf')
+    local ok, config_lines = pcall(fn.readfile, '/etc/udev/udev.conf')
+    --- @cast config_lines +string[]
     if not ok then
       return 'hog'
     end
-    local dir = vim.fn.expand(path, ':h')
+    local dir = fn.expand(path, ':h')
     for _, line in ipairs(config_lines) do
       local match = line:match(udev_rules_pattern)
       if match then
@@ -1078,7 +1170,8 @@ function M.rules(path)
 end
 
 -- LambdaProlog and Standard ML signature files
-function M.sig(bufnr)
+--- @type vim.filetype.mapfn
+function M.sig(_, bufnr)
   if vim.g.filetype_sig then
     return vim.g.filetype_sig
   end
@@ -1096,7 +1189,8 @@ end
 
 -- This function checks the first 25 lines of file extension "sc" to resolve
 -- detection between scala and SuperCollider
-function M.sc(bufnr)
+--- @type vim.filetype.mapfn
+function M.sc(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 25)) do
     if
       findany(line, {
@@ -1116,18 +1210,19 @@ end
 
 -- This function checks the first line of file extension "scd" to resolve
 -- detection between scdoc and SuperCollider
-function M.scd(bufnr)
+--- @type vim.filetype.mapfn
+function M.scd(_, bufnr)
   local first = '^%S+%(%d[0-9A-Za-z]*%)'
   local opt = [[%s+"[^"]*"]]
-  local line = getlines(bufnr, 1)
+  local line = getline(bufnr, 1)
   if findany(line, { first .. '$', first .. opt .. '$', first .. opt .. opt .. '$' }) then
     return 'scdoc'
-  else
-    return 'supercollider'
   end
+  return 'supercollider'
 end
 
-function M.sgml(bufnr)
+--- @type vim.filetype.mapfn
+function M.sgml(_, bufnr)
   local lines = table.concat(getlines(bufnr, 1, 5))
   if lines:find('linuxdoc') then
     return 'smgllnx'
@@ -1142,15 +1237,17 @@ function M.sgml(bufnr)
   end
 end
 
-function M.sh(path, contents, name)
+--- @param path string
+--- @param contents string[]
+--- @param name? string
+--- @return string?, fun(b: integer)?
+local function sh(path, contents, name)
   -- Path may be nil, do not fail in that case
-  if vim.fn.did_filetype() ~= 0 or (path or ''):find(vim.g.ft_ignore_pat) then
+  if fn.did_filetype() ~= 0 or (path or ''):find(vim.g.ft_ignore_pat) then
     -- Filetype was already detected or detection should be skipped
     return
   end
 
-  local on_detect
-
   -- Get the name from the first line if not specified
   name = name or contents[1]
   if matchregex(name, [[\<csh\>]]) then
@@ -1162,7 +1259,11 @@ function M.sh(path, contents, name)
     -- Some .sh scripts contain #!/bin/zsh.
   elseif matchregex(name, [[\<zsh\>]]) then
     return M.shell(path, contents, 'zsh')
-  elseif matchregex(name, [[\<ksh\>]]) then
+  end
+
+  local on_detect --- @type fun(b: integer)?
+
+  if matchregex(name, [[\<ksh\>]]) then
     on_detect = function(b)
       vim.b[b].is_kornshell = 1
       vim.b[b].is_bash = nil
@@ -1185,9 +1286,26 @@ function M.sh(path, contents, name)
   return M.shell(path, contents, 'sh'), on_detect
 end
 
--- For shell-like file types, check for an "exec" command hidden in a comment, as used for Tcl.
+--- @param name? string
+--- @return vim.filetype.mapfn
+local function sh_with(name)
+  return function(path, bufnr)
+    return sh(path, getlines(bufnr), name)
+  end
+end
+
+M.sh = sh_with()
+M.bash = sh_with('bash')
+M.ksh = sh_with('ksh')
+M.tcsh = sh_with('tcsh')
+
+--- For shell-like file types, check for an "exec" command hidden in a comment, as used for Tcl.
+--- @param path string
+--- @param contents string[]
+--- @param name? string
+--- @return string?
 function M.shell(path, contents, name)
-  if vim.fn.did_filetype() ~= 0 or matchregex(path, vim.g.ft_ignore_pat) then
+  if fn.did_filetype() ~= 0 or matchregex(path, vim.g.ft_ignore_pat) then
     -- Filetype was already detected or detection should be skipped
     return
   end
@@ -1196,6 +1314,7 @@ function M.shell(path, contents, name)
   for line_nr, line in ipairs(contents) do
     -- Skip the first line
     if line_nr ~= 1 then
+      --- @type string
       line = line:lower()
       if line:find('%s*exec%s') and not prev_line:find('^%s*#.*\\$') then
         -- Found an "exec" line after a comment with continuation
@@ -1211,7 +1330,8 @@ function M.shell(path, contents, name)
 end
 
 -- Swift Intermediate Language or SILE
-function M.sil(bufnr)
+--- @type vim.filetype.mapfn
+function M.sil(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 100)) do
     if line:find('^%s*[\\%%]') then
       return 'sile'
@@ -1224,8 +1344,9 @@ function M.sil(bufnr)
 end
 
 -- SMIL or SNMP MIB file
-function M.smi(bufnr)
-  local line = getlines(bufnr, 1)
+--- @type vim.filetype.mapfn
+function M.smi(_, bufnr)
+  local line = getline(bufnr, 1)
   if matchregex(line, [[\c\<smil\>]]) then
     return 'smil'
   else
@@ -1233,8 +1354,14 @@ function M.smi(bufnr)
   end
 end
 
+--- @type vim.filetype.mapfn
+function M.sql(_, _)
+  return vim.g.filetype_sql and vim.g.filetype_sql or 'sql'
+end
+
 -- Determine if a *.src file is Kuka Robot Language
-function M.src(bufnr)
+--- @type vim.filetype.mapfn
+function M.src(_, bufnr)
   if vim.g.filetype_src then
     return vim.g.filetype_src
   end
@@ -1244,23 +1371,25 @@ function M.src(bufnr)
   end
 end
 
-function M.sys(bufnr)
+--- @type vim.filetype.mapfn
+function M.sys(_, bufnr)
   if vim.g.filetype_sys then
     return vim.g.filetype_sys
   elseif is_rapid(bufnr) then
     return 'rapid'
-  else
-    return 'bat'
   end
+  return 'bat'
 end
 
 -- Choose context, plaintex, or tex (LaTeX) based on these rules:
 -- 1. Check the first line of the file for "%&<format>".
 -- 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
 -- 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
+--- @type vim.filetype.mapfn
 function M.tex(path, bufnr)
-  local matched, _, format = getlines(bufnr, 1):find('^%%&%s*(%a+)')
+  local matched, _, format = getline(bufnr, 1):find('^%%&%s*(%a+)')
   if matched then
+    --- @type string
     format = format:lower():gsub('pdf', '', 1)
   elseif path:lower():find('tex/context/.*/.*%.tex') then
     return 'context'
@@ -1299,7 +1428,8 @@ function M.tex(path, bufnr)
 end
 
 -- Determine if a *.tf file is TF mud client or terraform
-function M.tf(bufnr)
+--- @type vim.filetype.mapfn
+function M.tf(_, bufnr)
   for _, line in ipairs(getlines(bufnr)) do
     -- Assume terraform file on a non-empty line (not whitespace-only)
     -- and when the first non-whitespace character is not a ; or /
@@ -1310,22 +1440,25 @@ function M.tf(bufnr)
   return 'tf'
 end
 
-function M.ttl(bufnr)
-  local line = getlines(bufnr, 1):lower()
+--- @type vim.filetype.mapfn
+function M.ttl(_, bufnr)
+  local line = getline(bufnr, 1):lower()
   if line:find('^@?prefix') or line:find('^@?base') then
     return 'turtle'
   end
   return 'teraterm'
 end
 
-function M.txt(bufnr)
+--- @type vim.filetype.mapfn
+function M.txt(_, bufnr)
   -- helpfiles match *.txt, but should have a modeline as last line
-  if not getlines(bufnr, -1):find('vim:.*ft=help') then
+  if not getline(bufnr, -1):find('vim:.*ft=help') then
     return 'text'
   end
 end
 
-function M.typ(bufnr)
+--- @type vim.filetype.mapfn
+function M.typ(_, bufnr)
   if vim.g.filetype_typ then
     return vim.g.filetype_typ
   end
@@ -1348,8 +1481,9 @@ function M.typ(bufnr)
 end
 
 -- Determine if a .v file is Verilog, V, or Coq
-function M.v(bufnr)
-  if vim.fn.did_filetype() ~= 0 then
+--- @type vim.filetype.mapfn
+function M.v(_, bufnr)
+  if fn.did_filetype() ~= 0 then
     -- Filetype was already detected
     return
   end
@@ -1367,7 +1501,8 @@ end
 
 -- WEB (*.web is also used for Winbatch: Guess, based on expecting "%" comment
 -- lines in a WEB file).
-function M.web(bufnr)
+--- @type vim.filetype.mapfn
+function M.web(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 5)) do
     if line:find('^%%') then
       return 'web'
@@ -1377,17 +1512,27 @@ function M.web(bufnr)
 end
 
 -- XFree86 config
-function M.xfree86()
+--- @type vim.filetype.mapfn
+function M.xfree86_v3(_, _)
   return 'xf86conf',
     function(bufnr)
-      local line = getlines(bufnr, 1)
+      local line = getline(bufnr, 1)
       if matchregex(line, [[\<XConfigurator\>]]) then
         vim.b[bufnr].xf86conf_xfree86_version = 3
       end
     end
 end
 
-function M.xml(bufnr)
+-- XFree86 config
+--- @type vim.filetype.mapfn
+function M.xfree86_v4(_, _)
+  return 'xf86conf', function(b)
+    vim.b[b].xf86conf_xfree86_version = 4
+  end
+end
+
+--- @type vim.filetype.mapfn
+function M.xml(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 100)) do
     local is_docbook4 = line:find('<!DOCTYPE.*DocBook')
     line = line:lower()
@@ -1406,7 +1551,8 @@ function M.xml(bufnr)
   return 'xml'
 end
 
-function M.y(bufnr)
+--- @type vim.filetype.mapfn
+function M.y(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 100)) do
     if line:find('^%s*%%') then
       return 'yacc'
@@ -1463,7 +1609,12 @@ local patterns_hashbang = {
 }
 
 ---@private
--- File starts with "#!".
+--- File starts with "#!".
+--- @param contents string[]
+--- @param path string
+--- @param dispatch_extension fun(name: string): string?, fun(b: integer)?
+--- @return string?
+--- @return fun(b: integer)?
 local function match_from_hashbang(contents, path, dispatch_extension)
   local first_line = contents[1]
   -- Check for a line like "#!/usr/bin/env {options} bash".  Turn it into
@@ -1475,7 +1626,7 @@ local function match_from_hashbang(contents, path, dispatch_extension)
       :gsub('%-%-ignore%-environment', '', 1)
       :gsub('%-%-split%-string', '', 1)
       :gsub('%-[iS]', '', 1)
-    first_line = vim.fn.substitute(first_line, [[\<env\s\+]], '', '')
+    first_line = fn.substitute(first_line, [[\<env\s\+]], '', '')
   end
 
   -- Get the program name.
@@ -1484,15 +1635,15 @@ local function match_from_hashbang(contents, path, dispatch_extension)
   -- "#!/usr/bin/env perl [path/args]"
   -- If there is no path use the first word: "#!perl [path/args]".
   -- Otherwise get the last word after a slash: "#!/usr/bin/perl [path/args]".
-  local name
+  local name --- @type string
   if first_line:find('^#!%s*%a:[/\\]') then
-    name = vim.fn.substitute(first_line, [[^#!.*[/\\]\(\i\+\).*]], '\\1', '')
+    name = fn.substitute(first_line, [[^#!.*[/\\]\(\i\+\).*]], '\\1', '')
   elseif matchregex(first_line, [[^#!.*\<env\>]]) then
-    name = vim.fn.substitute(first_line, [[^#!.*\<env\>\s\+\(\i\+\).*]], '\\1', '')
+    name = fn.substitute(first_line, [[^#!.*\<env\>\s\+\(\i\+\).*]], '\\1', '')
   elseif matchregex(first_line, [[^#!\s*[^/\\ ]*\>\([^/\\]\|$\)]]) then
-    name = vim.fn.substitute(first_line, [[^#!\s*\([^/\\ ]*\>\).*]], '\\1', '')
+    name = fn.substitute(first_line, [[^#!\s*\([^/\\ ]*\>\).*]], '\\1', '')
   else
-    name = vim.fn.substitute(first_line, [[^#!\s*\S*[/\\]\(\f\+\).*]], '\\1', '')
+    name = fn.substitute(first_line, [[^#!\s*\S*[/\\]\(\f\+\).*]], '\\1', '')
   end
 
   -- tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
@@ -1503,11 +1654,11 @@ local function match_from_hashbang(contents, path, dispatch_extension)
 
   if matchregex(name, [[^\(bash\d*\|dash\|ksh\d*\|sh\)\>]]) then
     -- Bourne-like shell scripts: bash bash2 dash ksh ksh93 sh
-    return require('vim.filetype.detect').sh(path, contents, first_line)
+    return sh(path, contents, first_line)
   elseif matchregex(name, [[^csh\>]]) then
-    return require('vim.filetype.detect').shell(path, contents, vim.g.filetype_csh or 'csh')
+    return M.shell(path, contents, vim.g.filetype_csh or 'csh')
   elseif matchregex(name, [[^tcsh\>]]) then
-    return require('vim.filetype.detect').shell(path, contents, 'tcsh')
+    return M.shell(path, contents, 'tcsh')
   end
 
   for k, v in pairs(patterns_hashbang) do
@@ -1612,9 +1763,7 @@ local patterns_text = {
   ['S Y S T E M S   I M P R O V E D '] = { 'syndaout', { start_lnum = 3 } },
   ['Run Date: '] = { 'takcmp', { start_lnum = 6 } },
   ['Node    File  1'] = { 'sindacmp', { start_lnum = 9 } },
-  function(contents)
-    require('vim.filetype.detect').dns_zone(contents)
-  end,
+  dns_zone,
   -- Valgrind
   ['^==%d+== valgrind'] = 'valgrind',
   ['^==%d+== Using valgrind'] = { 'valgrind', { start_lnum = 3 } },
@@ -1653,11 +1802,15 @@ local patterns_text = {
 }
 
 ---@private
--- File does not start with "#!".
+--- File does not start with "#!".
+--- @param contents string[]
+--- @param path string
+--- @return string?
+--- @return fun(b: integer)?
 local function match_from_text(contents, path)
   if contents[1]:find('^:$') then
     -- Bourne-like shell scripts: sh ksh bash bash2
-    return M.sh(path, contents)
+    return sh(path, contents)
   elseif
     matchregex(
       '\n' .. table.concat(contents, '\n'),
@@ -1708,6 +1861,11 @@ local function match_from_text(contents, path)
   return cvs_diff(path, contents)
 end
 
+--- @param contents string[]
+--- @param path string
+--- @param dispatch_extension fun(name: string): string?, fun(b: integer)?
+--- @return string?
+--- @return fun(b: integer)?
 function M.match_contents(contents, path, dispatch_extension)
   local first_line = contents[1]
   if first_line:find('^#!') then
-- 
cgit 


From 4134cebb17dd0bfd2024f1816d6884e8213a620a Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Tue, 8 Aug 2023 21:25:22 +0100
Subject: docs(builtin): fix some missing lines (#24615)

These two functions seem to have previously had their docs start on the same
line as the signature, which I guess contributed to the lines being lost (though
I checked all other such functions from before again and these were the only
two).
---
 runtime/doc/builtin.txt         | 2 ++
 runtime/lua/vim/_meta/vimfn.lua | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index dc4f9610e0..99ea2920f7 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -3411,6 +3411,7 @@ id({expr})                                                                *id()*
 		reuse identifiers of the garbage-collected ones.
 
 indent({lnum})                                                        *indent()*
+		The result is a Number, which is indent of line {lnum} in the
 		current buffer.  The indent is counted in spaces, the value
 		of 'tabstop' is relevant.  {lnum} is used just like in
 		|getline()|.
@@ -3888,6 +3889,7 @@ keytrans({string})                                                  *keytrans()*
 <			<C-Home>
 
 len({expr})                                                         *len()* *E701*
+		The result is a Number, which is the length of the argument.
 		When {expr} is a String or a Number the length in bytes is
 		used, as with |strlen()|.
 		When {expr} is a |List| the number of items in the |List| is
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index bb11e34a57..7c98ed8849 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -4115,6 +4115,7 @@ function vim.fn.iconv(string, from, to) end
 --- @return any
 function vim.fn.id(expr) end
 
+--- The result is a Number, which is indent of line {lnum} in the
 --- current buffer.  The indent is counted in spaces, the value
 --- of 'tabstop' is relevant.  {lnum} is used just like in
 --- |getline()|.
@@ -4712,6 +4713,7 @@ function vim.fn.keytrans(string) end
 --- @return any
 function vim.fn.last_buffer_nr() end
 
+--- The result is a Number, which is the length of the argument.
 --- When {expr} is a String or a Number the length in bytes is
 --- used, as with |strlen()|.
 --- When {expr} is a |List| the number of items in the |List| is
-- 
cgit 


From c43c745a14dced87a23227d7be4f1c33d4455193 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 11:06:13 +0200
Subject: fix(lua): improve annotations for stricter luals diagnostics (#24609)

Problem: luals returns stricter diagnostics with bundled luarc.json
Solution: Improve some function and type annotations:

* use recognized uv.* types
* disable diagnostic for global `vim` in shared.lua
* docs: don't start comment lines with taglink (otherwise LuaLS will interpret it as a type)
* add type alias for lpeg pattern
* fix return annotation for `vim.secure.trust`
* rename local Range object in vim.version (shadows `Range` in vim.treesitter)
* fix some "missing fields" warnings
* add missing required fields for test functions in eval.lua
* rename lsp meta files for consistency
---
 runtime/doc/builtin.txt                 |    8 +
 runtime/doc/diagnostic.txt              |    2 +-
 runtime/doc/lsp.txt                     |    3 +-
 runtime/doc/lua.txt                     |    9 +-
 runtime/doc/testing.txt                 |    6 +-
 runtime/lua/vim/_editor.lua             |    4 +-
 runtime/lua/vim/_system.lua             |   32 +-
 runtime/lua/vim/_watch.lua              |    4 +-
 runtime/lua/vim/diagnostic.lua          |   46 +-
 runtime/lua/vim/loader.lua              |    2 +-
 runtime/lua/vim/lsp.lua                 |    2 +-
 runtime/lua/vim/lsp/_meta.lua           |   22 +
 runtime/lua/vim/lsp/_meta/protocol.lua  | 4396 +++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/_watchfiles.lua     |    8 +-
 runtime/lua/vim/lsp/inlay_hint.lua      |    4 +-
 runtime/lua/vim/lsp/semantic_tokens.lua |   13 +-
 runtime/lua/vim/lsp/types.lua           |   21 -
 runtime/lua/vim/lsp/types/protocol.lua  | 4393 ------------------------------
 runtime/lua/vim/lsp/util.lua            |    4 +-
 runtime/lua/vim/secure.lua              |    5 +-
 runtime/lua/vim/shared.lua              |    3 +-
 runtime/lua/vim/treesitter/query.lua    |    2 +-
 runtime/lua/vim/version.lua             |   12 +-
 23 files changed, 4503 insertions(+), 4498 deletions(-)
 create mode 100644 runtime/lua/vim/lsp/_meta.lua
 create mode 100644 runtime/lua/vim/lsp/_meta/protocol.lua
 delete mode 100644 runtime/lua/vim/lsp/types.lua
 delete mode 100644 runtime/lua/vim/lsp/types/protocol.lua

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 99ea2920f7..0c239b223d 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1857,6 +1857,7 @@ foldtextresult({lnum})                                        *foldtextresult()*
 		line, "'m" mark m, etc.
 		Useful when exporting folded text, e.g., to HTML.
 
+
 fullcommand({name})                                              *fullcommand()*
 		Get the full command name from a short abbreviated command
 		name; see |20.2| for details on command abbreviations.
@@ -7993,6 +7994,13 @@ termopen({cmd} [, {opts}])                                          *termopen()*
 		except $TERM is set to "xterm-256color". Full behavior is
 		described in |terminal|.
 
+test_garbagecollect_now()                            *test_garbagecollect_now()*
+		Like |garbagecollect()|, but executed right away.  This must
+		only be called directly to avoid any structure to exist
+		internally, and |v:testing| must have been set before calling
+		any function.
+
+
 timer_info([{id}])                                                *timer_info()*
 		Return a list with information about timers.
 		When {id} is given only information about this timer is
diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index 4b2b5e5f9a..d95e0d8333 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -459,7 +459,7 @@ fromqflist({list})                               *vim.diagnostic.fromqflist()*
     Convert a list of quickfix items to a list of diagnostics.
 
     Parameters: ~
-      • {list}  (table) A list of quickfix items from |getqflist()| or
+      • {list}  table[] List of quickfix items from |getqflist()| or
                 |getloclist()|.
 
     Return: ~
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 2140284503..4c0ad1e035 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -2127,7 +2127,8 @@ request({method}, {params}, {callback}, {notify_reply_callback})
       • {method}                 (string) The invoked LSP method
       • {params}                 (table|nil) Parameters for the invoked LSP
                                  method
-      • {callback}               fun(err: lsp.ResponseError | nil, result: any) Callback to invoke
+      • {callback}               fun(err: lsp.ResponseError | nil, result:
+                                 any) Callback to invoke
       • {notify_reply_callback}  (function|nil) Callback to invoke as soon as
                                  a request is no longer pending
 
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index c3e540a4ae..fb92ad411e 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2073,7 +2073,7 @@ vim.spairs({t})                                                 *vim.spairs()*
       • {t}  (table) Dict-like table
 
     Return: ~
-        iterator over sorted keys and their values
+        (function) iterator over sorted keys and their values
 
     See also: ~
       • Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
@@ -3007,10 +3007,9 @@ vim.secure.trust({opts})                                  *vim.secure.trust()*
                 • bufnr (number|nil): Buffer number to update. Mutually
                   exclusive with {path}.
 
-    Return: ~
-        (boolean, string) success, msg:
-        • true and full path of target file if operation was successful
-        • false and error message on failure
+    Return (multiple): ~
+        (boolean) success true if operation was successful
+        (string) msg full path if operation was successful, else error message
 
 
 ==============================================================================
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index cce96132a1..941c440b6c 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -31,11 +31,7 @@ Find more information in the file src/testdir/README.txt.
 ==============================================================================
 2. Test functions				*test-functions-details*
 
-test_garbagecollect_now()			 *test_garbagecollect_now()*
-		Like garbagecollect(), but executed right away.  This must
-		only be called directly to avoid any structure to exist
-		internally, and |v:testing| must have been set before calling
-		any function.
+See |test_garbagecollect_now()|.
 
 ==============================================================================
 3. Assert functions				*assert-functions-details*
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index d81464a3ca..58fbc923e1 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -620,8 +620,8 @@ local on_key_cbs = {}
 ---
 ---@param fn fun(key: string) Function invoked on every key press. |i_CTRL-V|
 ---                   Returning nil removes the callback associated with namespace {ns_id}.
----@param ns_id integer? Namespace ID. If nil or 0, generates and returns a new
----                    |nvim_create_namespace()| id.
+---@param ns_id integer? Namespace ID. If nil or 0, generates and returns a
+---                     new |nvim_create_namespace()| id.
 ---
 ---@return integer Namespace id associated with {fn}. Or count of all callbacks
 ---if on_key() is called without arguments.
diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua
index e6dab90425..6f5e95eb24 100644
--- a/runtime/lua/vim/_system.lua
+++ b/runtime/lua/vim/_system.lua
@@ -1,14 +1,13 @@
 local uv = vim.uv
 
 --- @class SystemOpts
---- @field cmd string[]
---- @field stdin string|string[]|true
---- @field stdout fun(err:string, data: string)|false
---- @field stderr fun(err:string, data: string)|false
+--- @field stdin? string|string[]|true
+--- @field stdout? fun(err:string, data: string)|false
+--- @field stderr? fun(err:string, data: string)|false
 --- @field cwd? string
 --- @field env? table<string,string|number>
 --- @field clear_env? boolean
---- @field text boolean?
+--- @field text? boolean
 --- @field timeout? integer Timeout in ms
 --- @field detach? boolean
 
@@ -19,15 +18,14 @@ local uv = vim.uv
 --- @field stderr? string
 
 --- @class SystemState
---- @field handle uv_process_t
---- @field timer uv_timer_t
---- @field pid integer
+--- @field handle? uv.uv_process_t
+--- @field timer?  uv.uv_timer_t
+--- @field pid? integer
 --- @field timeout? integer
---- @field done boolean
---- @field stdin uv_stream_t?
---- @field stdout uv_stream_t?
---- @field stderr uv_stream_t?
---- @field cmd string[]
+--- @field done? boolean
+--- @field stdin? uv.uv_stream_t
+--- @field stdout? uv.uv_stream_t
+--- @field stderr? uv.uv_stream_t
 --- @field result? SystemCompleted
 
 ---@param state SystemState
@@ -128,7 +126,7 @@ function SystemObj:is_closing()
 end
 
 ---@param output function|'false'
----@return uv_stream_t?
+---@return uv.uv_stream_t?
 ---@return function? Handler
 local function setup_output(output)
   if output == nil then
@@ -144,7 +142,7 @@ local function setup_output(output)
 end
 
 ---@param input string|string[]|true|nil
----@return uv_stream_t?
+---@return uv.uv_stream_t?
 ---@return string|string[]?
 local function setup_input(input)
   if not input then
@@ -189,7 +187,7 @@ local function setup_env(env, clear_env)
   return renv
 end
 
---- @param stream uv_stream_t
+--- @param stream uv.uv_stream_t
 --- @param text? boolean
 --- @param bucket string[]
 --- @return fun(err: string?, data: string?)
@@ -217,7 +215,7 @@ local M = {}
 --- @param opts uv.aliases.spawn_options
 --- @param on_exit fun(code: integer, signal: integer)
 --- @param on_error fun()
---- @return uv_process_t, integer
+--- @return uv.uv_process_t, integer
 local function spawn(cmd, opts, on_exit, on_error)
   local handle, pid_or_err = uv.spawn(cmd, opts, on_exit)
   if not handle then
diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
index dc5f59f38b..7230b31f6f 100644
--- a/runtime/lua/vim/_watch.lua
+++ b/runtime/lua/vim/_watch.lua
@@ -17,7 +17,7 @@ end
 
 --- Stops and closes a libuv |uv_fs_event_t| or |uv_fs_poll_t| handle
 ---
----@param handle (uv_fs_event_t|uv_fs_poll_t) The handle to stop
+---@param handle (uv.uv_fs_event_t|uv.uv_fs_poll_t) The handle to stop
 local function stop(handle)
   local _, stop_err = handle:stop()
   assert(not stop_err, stop_err)
@@ -79,7 +79,7 @@ local default_poll_interval_ms = 2000
 --- @field children? table<string,watch.Watches>
 --- @field cancel? fun()
 --- @field started? boolean
---- @field handle? uv_fs_poll_t
+--- @field handle? uv.uv_fs_poll_t
 
 --- @class watch.PollOpts
 --- @field interval? integer
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index f0adc4104e..180b9ad3df 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -562,8 +562,8 @@ end
 ---@param opts table|nil When omitted or "nil", retrieve the current configuration. Otherwise, a
 ---                      configuration table with the following keys:
 ---       - underline: (default true) Use underline for diagnostics. Options:
----                    * severity: Only underline diagnostics matching the given severity
----                    |diagnostic-severity|
+---                    * severity: Only underline diagnostics matching the given
+---                    severity |diagnostic-severity|
 ---       - virtual_text: (default true) Use virtual text for diagnostics. If multiple diagnostics
 ---                       are set for a namespace, one prefix per diagnostic + the last diagnostic
 ---                       message are shown.
@@ -596,8 +596,8 @@ end
 ---                         end
 ---                       </pre>
 ---       - signs: (default true) Use signs for diagnostics. Options:
----                * severity: Only show signs for diagnostics matching the given severity
----                |diagnostic-severity|
+---                * severity: Only show signs for diagnostics matching the given
+---                severity |diagnostic-severity|
 ---                * priority: (number, default 10) Base priority to use for signs. When
 ---                {severity_sort} is used, the priority of a sign is adjusted based on
 ---                its severity. Otherwise, all signs use the same priority.
@@ -723,17 +723,17 @@ function M.get_namespaces()
 end
 
 ---@class Diagnostic
----@field bufnr integer
+---@field bufnr? integer
 ---@field lnum integer 0-indexed
----@field end_lnum nil|integer 0-indexed
+---@field end_lnum? integer 0-indexed
 ---@field col integer 0-indexed
----@field end_col nil|integer 0-indexed
----@field severity DiagnosticSeverity
+---@field end_col? integer 0-indexed
+---@field severity? DiagnosticSeverity
 ---@field message string
----@field source nil|string
----@field code nil|string
----@field _tags { deprecated: boolean, unnecessary: boolean}
----@field user_data nil|any arbitrary data plugins can add
+---@field source? string
+---@field code? string
+---@field _tags? { deprecated: boolean, unnecessary: boolean}
+---@field user_data? any arbitrary data plugins can add
 
 --- Get current diagnostics.
 ---
@@ -819,13 +819,13 @@ end
 ---
 ---@param opts table|nil Configuration table with the following keys:
 ---         - namespace: (number) Only consider diagnostics from the given namespace.
----         - cursor_position: (cursor position) Cursor position as a (row, col) tuple. See
----                          |nvim_win_get_cursor()|. Defaults to the current cursor position.
+---         - cursor_position: (cursor position) Cursor position as a (row, col) tuple.
+---                          See |nvim_win_get_cursor()|. Defaults to the current cursor position.
 ---         - wrap: (boolean, default true) Whether to loop around file or not. Similar to 'wrapscan'.
 ---         - severity: See |diagnostic-severity|.
 ---         - float: (boolean or table, default true) If "true", call |vim.diagnostic.open_float()|
----                    after moving. If a table, pass the table as the {opts} parameter to
----                    |vim.diagnostic.open_float()|. Unless overridden, the float will show
+---                    after moving. If a table, pass the table as the {opts} parameter
+---                    to |vim.diagnostic.open_float()|. Unless overridden, the float will show
 ---                    diagnostics at the new cursor position (as if "cursor" were passed to
 ---                    the "scope" option).
 ---         - win_id: (number, default 0) Window ID
@@ -1213,8 +1213,8 @@ end
 
 --- Show diagnostics in a floating window.
 ---
----@param opts table|nil Configuration table with the same keys as
----            |vim.lsp.util.open_floating_preview()| in addition to the following:
+---@param opts table|nil Configuration table with the same keys
+---            as |vim.lsp.util.open_floating_preview()| in addition to the following:
 ---            - bufnr: (number) Buffer number to show diagnostics from.
 ---                     Defaults to the current buffer.
 ---            - namespace: (number) Limit diagnostics to the given namespace
@@ -1227,16 +1227,15 @@ end
 ---                   otherwise, a (row, col) tuple.
 ---            - severity_sort: (default false) Sort diagnostics by severity. Overrides the setting
 ---                             from |vim.diagnostic.config()|.
----            - severity: See |diagnostic-severity|. Overrides the setting from
----                        |vim.diagnostic.config()|.
+---            - severity: See |diagnostic-severity|. Overrides the setting
+---                        from |vim.diagnostic.config()|.
 ---            - header: (string or table) String to use as the header for the floating window. If a
 ---                      table, it is interpreted as a [text, hl_group] tuple. Overrides the setting
 ---                      from |vim.diagnostic.config()|.
 ---            - source: (boolean or string) Include the diagnostic source in the message.
 ---                      Use "if_many" to only show sources if there is more than one source of
 ---                      diagnostics in the buffer. Otherwise, any truthy value means to always show
----                      the diagnostic source. Overrides the setting from
----                      |vim.diagnostic.config()|.
+---                      the diagnostic source. Overrides the setting from |vim.diagnostic.config()|.
 ---            - format: (function) A function that takes a diagnostic as input and returns a
 ---                      string. The return value is the text used to display the diagnostic.
 ---                      Overrides the setting from |vim.diagnostic.config()|.
@@ -1692,8 +1691,7 @@ end
 
 --- Convert a list of quickfix items to a list of diagnostics.
 ---
----@param list table A list of quickfix items from |getqflist()| or
----            |getloclist()|.
+---@param list table[] List of quickfix items from |getqflist()| or |getloclist()|.
 ---@return Diagnostic[] array of |diagnostic-structure|
 function M.fromqflist(list)
   vim.validate({
diff --git a/runtime/lua/vim/loader.lua b/runtime/lua/vim/loader.lua
index e08ccba701..ee01111337 100644
--- a/runtime/lua/vim/loader.lua
+++ b/runtime/lua/vim/loader.lua
@@ -18,7 +18,7 @@ local M = {}
 ---@class ModuleInfo
 ---@field modpath string Path of the module
 ---@field modname string Name of the module
----@field stat? uv_fs_t File stat of the module path
+---@field stat? uv.uv_fs_t File stat of the module path
 
 ---@alias LoaderStats table<string, {total:number, time:number, [string]:number?}?>
 
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index bfba275c33..0c4290d067 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -364,7 +364,7 @@ do
   --- @field lines string[] snapshot of buffer lines from last didChange
   --- @field lines_tmp string[]
   --- @field pending_changes table[] List of debounced changes in incremental sync mode
-  --- @field timer nil|uv_timer_t uv_timer
+  --- @field timer nil|uv.uv_timer_t uv_timer
   --- @field last_flush nil|number uv.hrtime of the last flush/didChange-notification
   --- @field needs_flush boolean true if buffer updates haven't been sent to clients/servers yet
   --- @field refs integer how many clients are using this group
diff --git a/runtime/lua/vim/lsp/_meta.lua b/runtime/lua/vim/lsp/_meta.lua
new file mode 100644
index 0000000000..acf799264e
--- /dev/null
+++ b/runtime/lua/vim/lsp/_meta.lua
@@ -0,0 +1,22 @@
+---@meta
+error('Cannot require a meta file')
+
+---@alias lsp-handler fun(err: lsp.ResponseError|nil, result: any, context: lsp.HandlerContext, config: table|nil): any?
+
+---@class lsp.HandlerContext
+---@field method string
+---@field client_id integer
+---@field bufnr? integer
+---@field params? any
+
+---@class lsp.ResponseError
+---@field code integer
+---@field message string
+---@field data string|number|boolean|table[]|table|nil
+
+--- @class lsp.DocumentFilter
+--- @field language? string
+--- @field scheme? string
+--- @field pattern? string
+
+--- @alias lsp.RegisterOptions any | lsp.StaticRegistrationOptions | lsp.TextDocumentRegistrationOptions
diff --git a/runtime/lua/vim/lsp/_meta/protocol.lua b/runtime/lua/vim/lsp/_meta/protocol.lua
new file mode 100644
index 0000000000..72b0f00f65
--- /dev/null
+++ b/runtime/lua/vim/lsp/_meta/protocol.lua
@@ -0,0 +1,4396 @@
+--[[
+This file is autogenerated from scripts/gen_lsp.lua
+Regenerate:
+nvim -l scripts/gen_lsp.lua gen --version 3.18 --runtime/lua/vim/lsp/_meta/protocol.lua
+--]]
+
+---@meta
+error('Cannot require a meta file')
+
+---@alias lsp.null nil
+---@alias uinteger integer
+---@alias lsp.decimal number
+---@alias lsp.DocumentUri string
+---@alias lsp.URI string
+---@alias lsp.LSPObject table<string, lsp.LSPAny>
+---@alias lsp.LSPArray lsp.LSPAny[]
+---@alias lsp.LSPAny lsp.LSPObject|lsp.LSPArray|string|number|boolean|nil
+
+---@class lsp.ImplementationParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---Represents a location inside a resource, such as a line
+---inside a text file.
+---@class lsp.Location
+---@field uri lsp.DocumentUri
+---@field range lsp.Range
+
+---@class lsp.ImplementationRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.TypeDefinitionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---@class lsp.TypeDefinitionRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---A workspace folder inside a client.
+---@class lsp.WorkspaceFolder
+---The associated URI for this workspace folder.
+---@field uri lsp.URI
+---The name of the workspace folder. Used to refer to this
+---workspace folder in the user interface.
+---@field name string
+
+---The parameters of a `workspace/didChangeWorkspaceFolders` notification.
+---@class lsp.DidChangeWorkspaceFoldersParams
+---The actual workspace folder change event.
+---@field event lsp.WorkspaceFoldersChangeEvent
+
+---The parameters of a configuration request.
+---@class lsp.ConfigurationParams
+---@field items lsp.ConfigurationItem[]
+
+---Parameters for a {@link DocumentColorRequest}.
+---@class lsp.DocumentColorParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---Represents a color range from a document.
+---@class lsp.ColorInformation
+---The range in the document where this color appears.
+---@field range lsp.Range
+---The actual color value for this color range.
+---@field color lsp.Color
+
+---@class lsp.DocumentColorRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---Parameters for a {@link ColorPresentationRequest}.
+---@class lsp.ColorPresentationParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The color to request presentations for.
+---@field color lsp.Color
+---The range where the color would be inserted. Serves as a context.
+---@field range lsp.Range
+
+---@class lsp.ColorPresentation
+---The label of this color presentation. It will be shown on the color
+---picker header. By default this is also the text that is inserted when selecting
+---this color presentation.
+---@field label string
+---An {@link TextEdit edit} which is applied to a document when selecting
+---this presentation for the color.  When `falsy` the {@link ColorPresentation.label label}
+---is used.
+---@field textEdit? lsp.TextEdit
+---An optional array of additional {@link TextEdit text edits} that are applied when
+---selecting this color presentation. Edits must not overlap with the main {@link ColorPresentation.textEdit edit} nor with themselves.
+---@field additionalTextEdits? lsp.TextEdit[]
+
+---@class lsp.WorkDoneProgressOptions
+---@field workDoneProgress? boolean
+
+---General text document registration options.
+---@class lsp.TextDocumentRegistrationOptions
+---A document selector to identify the scope of the registration. If set to null
+---the document selector provided on the client side will be used.
+---@field documentSelector lsp.DocumentSelector|lsp.null
+
+---Parameters for a {@link FoldingRangeRequest}.
+---@class lsp.FoldingRangeParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---Represents a folding range. To be valid, start and end line must be bigger than zero and smaller
+---than the number of lines in the document. Clients are free to ignore invalid ranges.
+---@class lsp.FoldingRange
+---The zero-based start line of the range to fold. The folded area starts after the line's last character.
+---To be valid, the end must be zero or larger and smaller than the number of lines in the document.
+---@field startLine uinteger
+---The zero-based character offset from where the folded range starts. If not defined, defaults to the length of the start line.
+---@field startCharacter? uinteger
+---The zero-based end line of the range to fold. The folded area ends with the line's last character.
+---To be valid, the end must be zero or larger and smaller than the number of lines in the document.
+---@field endLine uinteger
+---The zero-based character offset before the folded range ends. If not defined, defaults to the length of the end line.
+---@field endCharacter? uinteger
+---Describes the kind of the folding range such as `comment' or 'region'. The kind
+---is used to categorize folding ranges and used by commands like 'Fold all comments'.
+---See {@link FoldingRangeKind} for an enumeration of standardized kinds.
+---@field kind? lsp.FoldingRangeKind
+---The text that the client should show when the specified range is
+---collapsed. If not defined or not supported by the client, a default
+---will be chosen by the client.
+---
+---@since 3.17.0
+---@field collapsedText? string
+
+---@class lsp.FoldingRangeRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.DeclarationParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---@class lsp.DeclarationRegistrationOptions: lsp.DeclarationOptions, lsp.StaticRegistrationOptions
+
+---A parameter literal used in selection range requests.
+---@class lsp.SelectionRangeParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The positions inside the text document.
+---@field positions lsp.Position[]
+
+---A selection range represents a part of a selection hierarchy. A selection range
+---may have a parent selection range that contains it.
+---@class lsp.SelectionRange
+---The {@link Range range} of this selection range.
+---@field range lsp.Range
+---The parent selection range containing this range. Therefore `parent.range` must contain `this.range`.
+---@field parent? lsp.SelectionRange
+
+---@class lsp.SelectionRangeRegistrationOptions: lsp.SelectionRangeOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.WorkDoneProgressCreateParams
+---The token to be used to report progress.
+---@field token lsp.ProgressToken
+
+---@class lsp.WorkDoneProgressCancelParams
+---The token to be used to report progress.
+---@field token lsp.ProgressToken
+
+---The parameter of a `textDocument/prepareCallHierarchy` request.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyPrepareParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---Represents programming constructs like functions or constructors in the context
+---of call hierarchy.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyItem
+---The name of this item.
+---@field name string
+---The kind of this item.
+---@field kind lsp.SymbolKind
+---Tags for this item.
+---@field tags? lsp.SymbolTag[]
+---More detail for this item, e.g. the signature of a function.
+---@field detail? string
+---The resource identifier of this item.
+---@field uri lsp.DocumentUri
+---The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g. comments and code.
+---@field range lsp.Range
+---The range that should be selected and revealed when this symbol is being picked, e.g. the name of a function.
+---Must be contained by the {@link CallHierarchyItem.range `range`}.
+---@field selectionRange lsp.Range
+---A data entry field that is preserved between a call hierarchy prepare and
+---incoming calls or outgoing calls requests.
+---@field data? lsp.LSPAny
+
+---Call hierarchy options used during static or dynamic registration.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---The parameter of a `callHierarchy/incomingCalls` request.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyIncomingCallsParams
+---@field item lsp.CallHierarchyItem
+
+---Represents an incoming call, e.g. a caller of a method or constructor.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyIncomingCall
+---The item that makes the call.
+---@field from lsp.CallHierarchyItem
+---The ranges at which the calls appear. This is relative to the caller
+---denoted by {@link CallHierarchyIncomingCall.from `this.from`}.
+---@field fromRanges lsp.Range[]
+
+---The parameter of a `callHierarchy/outgoingCalls` request.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyOutgoingCallsParams
+---@field item lsp.CallHierarchyItem
+
+---Represents an outgoing call, e.g. calling a getter from a method or a method from a constructor etc.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyOutgoingCall
+---The item that is called.
+---@field to lsp.CallHierarchyItem
+---The range at which this item is called. This is the range relative to the caller, e.g the item
+---passed to {@link CallHierarchyItemProvider.provideCallHierarchyOutgoingCalls `provideCallHierarchyOutgoingCalls`}
+---and not {@link CallHierarchyOutgoingCall.to `this.to`}.
+---@field fromRanges lsp.Range[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---@since 3.16.0
+---@class lsp.SemanticTokens
+---An optional result id. If provided and clients support delta updating
+---the client will include the result id in the next semantic token request.
+---A server can then instead of computing all semantic tokens again simply
+---send a delta.
+---@field resultId? string
+---The actual tokens.
+---@field data uinteger[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensPartialResult
+---@field data uinteger[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---@since 3.16.0
+---@class lsp.SemanticTokensDeltaParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The result id of a previous response. The result Id can either point to a full response
+---or a delta response depending on what was received last.
+---@field previousResultId string
+
+---@since 3.16.0
+---@class lsp.SemanticTokensDelta
+---@field resultId? string
+---The semantic token edits to transform a previous result into a new result.
+---@field edits lsp.SemanticTokensEdit[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensDeltaPartialResult
+---@field edits lsp.SemanticTokensEdit[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensRangeParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The range the semantic tokens are requested for.
+---@field range lsp.Range
+
+---Params to show a resource in the UI.
+---
+---@since 3.16.0
+---@class lsp.ShowDocumentParams
+---The uri to show.
+---@field uri lsp.URI
+---Indicates to show the resource in an external program.
+---To show, for example, `https://code.visualstudio.com/`
+---in the default WEB browser set `external` to `true`.
+---@field external? boolean
+---An optional property to indicate whether the editor
+---showing the document should take focus or not.
+---Clients might ignore this property if an external
+---program is started.
+---@field takeFocus? boolean
+---An optional selection range if the document is a text
+---document. Clients might ignore the property if an
+---external program is started or the file is not a text
+---file.
+---@field selection? lsp.Range
+
+---The result of a showDocument request.
+---
+---@since 3.16.0
+---@class lsp.ShowDocumentResult
+---A boolean indicating if the show was successful.
+---@field success boolean
+
+---@class lsp.LinkedEditingRangeParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---The result of a linked editing range request.
+---
+---@since 3.16.0
+---@class lsp.LinkedEditingRanges
+---A list of ranges that can be edited together. The ranges must have
+---identical length and contain identical text content. The ranges cannot overlap.
+---@field ranges lsp.Range[]
+---An optional word pattern (regular expression) that describes valid contents for
+---the given ranges. If no pattern is provided, the client configuration's word
+---pattern will be used.
+---@field wordPattern? string
+
+---@class lsp.LinkedEditingRangeRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---The parameters sent in notifications/requests for user-initiated creation of
+---files.
+---
+---@since 3.16.0
+---@class lsp.CreateFilesParams
+---An array of all files/folders created in this operation.
+---@field files lsp.FileCreate[]
+
+---A workspace edit represents changes to many resources managed in the workspace. The edit
+---should either provide `changes` or `documentChanges`. If documentChanges are present
+---they are preferred over `changes` if the client can handle versioned document edits.
+---
+---Since version 3.13.0 a workspace edit can contain resource operations as well. If resource
+---operations are present clients need to execute the operations in the order in which they
+---are provided. So a workspace edit for example can consist of the following two changes:
+---(1) a create file a.txt and (2) a text document edit which insert text into file a.txt.
+---
+---An invalid sequence (e.g. (1) delete file a.txt and (2) insert text into file a.txt) will
+---cause failure of the operation. How the client recovers from the failure is described by
+---the client capability: `workspace.workspaceEdit.failureHandling`
+---@class lsp.WorkspaceEdit
+---Holds changes to existing resources.
+---@field changes? table<lsp.DocumentUri, lsp.TextEdit[]>
+---Depending on the client capability `workspace.workspaceEdit.resourceOperations` document changes
+---are either an array of `TextDocumentEdit`s to express changes to n different text documents
+---where each text document edit addresses a specific version of a text document. Or it can contain
+---above `TextDocumentEdit`s mixed with create, rename and delete file / folder operations.
+---
+---Whether a client supports versioned document edits is expressed via
+---`workspace.workspaceEdit.documentChanges` client capability.
+---
+---If a client neither supports `documentChanges` nor `workspace.workspaceEdit.resourceOperations` then
+---only plain `TextEdit`s using the `changes` property are supported.
+---@field documentChanges? lsp.TextDocumentEdit|lsp.CreateFile|lsp.RenameFile|lsp.DeleteFile[]
+---A map of change annotations that can be referenced in `AnnotatedTextEdit`s or create, rename and
+---delete file / folder operations.
+---
+---Whether clients honor this property depends on the client capability `workspace.changeAnnotationSupport`.
+---
+---@since 3.16.0
+---@field changeAnnotations? table<lsp.ChangeAnnotationIdentifier, lsp.ChangeAnnotation>
+
+---The options to register for file operations.
+---
+---@since 3.16.0
+---@class lsp.FileOperationRegistrationOptions
+---The actual filters.
+---@field filters lsp.FileOperationFilter[]
+
+---The parameters sent in notifications/requests for user-initiated renames of
+---files.
+---
+---@since 3.16.0
+---@class lsp.RenameFilesParams
+---An array of all files/folders renamed in this operation. When a folder is renamed, only
+---the folder will be included, and not its children.
+---@field files lsp.FileRename[]
+
+---The parameters sent in notifications/requests for user-initiated deletes of
+---files.
+---
+---@since 3.16.0
+---@class lsp.DeleteFilesParams
+---An array of all files/folders deleted in this operation.
+---@field files lsp.FileDelete[]
+
+---@class lsp.MonikerParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---Moniker definition to match LSIF 0.5 moniker definition.
+---
+---@since 3.16.0
+---@class lsp.Moniker
+---The scheme of the moniker. For example tsc or .Net
+---@field scheme string
+---The identifier of the moniker. The value is opaque in LSIF however
+---schema owners are allowed to define the structure if they want.
+---@field identifier string
+---The scope in which the moniker is unique
+---@field unique lsp.UniquenessLevel
+---The moniker kind if known.
+---@field kind? lsp.MonikerKind
+
+---@class lsp.MonikerRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameter of a `textDocument/prepareTypeHierarchy` request.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchyPrepareParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---@since 3.17.0
+---@class lsp.TypeHierarchyItem
+---The name of this item.
+---@field name string
+---The kind of this item.
+---@field kind lsp.SymbolKind
+---Tags for this item.
+---@field tags? lsp.SymbolTag[]
+---More detail for this item, e.g. the signature of a function.
+---@field detail? string
+---The resource identifier of this item.
+---@field uri lsp.DocumentUri
+---The range enclosing this symbol not including leading/trailing whitespace
+---but everything else, e.g. comments and code.
+---@field range lsp.Range
+---The range that should be selected and revealed when this symbol is being
+---picked, e.g. the name of a function. Must be contained by the
+---{@link TypeHierarchyItem.range `range`}.
+---@field selectionRange lsp.Range
+---A data entry field that is preserved between a type hierarchy prepare and
+---supertypes or subtypes requests. It could also be used to identify the
+---type hierarchy in the server, helping improve the performance on
+---resolving supertypes and subtypes.
+---@field data? lsp.LSPAny
+
+---Type hierarchy options used during static or dynamic registration.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchyRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---The parameter of a `typeHierarchy/supertypes` request.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchySupertypesParams
+---@field item lsp.TypeHierarchyItem
+
+---The parameter of a `typeHierarchy/subtypes` request.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchySubtypesParams
+---@field item lsp.TypeHierarchyItem
+
+---A parameter literal used in inline value requests.
+---
+---@since 3.17.0
+---@class lsp.InlineValueParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The document range for which inline values should be computed.
+---@field range lsp.Range
+---Additional information about the context in which inline values were
+---requested.
+---@field context lsp.InlineValueContext
+
+---Inline value options used during static or dynamic registration.
+---
+---@since 3.17.0
+---@class lsp.InlineValueRegistrationOptions: lsp.InlineValueOptions, lsp.StaticRegistrationOptions
+
+---A parameter literal used in inlay hint requests.
+---
+---@since 3.17.0
+---@class lsp.InlayHintParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The document range for which inlay hints should be computed.
+---@field range lsp.Range
+
+---Inlay hint information.
+---
+---@since 3.17.0
+---@class lsp.InlayHint
+---The position of this hint.
+---@field position lsp.Position
+---The label of this hint. A human readable string or an array of
+---InlayHintLabelPart label parts.
+---
+---*Note* that neither the string nor the label part can be empty.
+---@field label string|lsp.InlayHintLabelPart[]
+---The kind of this hint. Can be omitted in which case the client
+---should fall back to a reasonable default.
+---@field kind? lsp.InlayHintKind
+---Optional text edits that are performed when accepting this inlay hint.
+---
+---*Note* that edits are expected to change the document so that the inlay
+---hint (or its nearest variant) is now part of the document and the inlay
+---hint itself is now obsolete.
+---@field textEdits? lsp.TextEdit[]
+---The tooltip text when you hover over this item.
+---@field tooltip? string|lsp.MarkupContent
+---Render padding before the hint.
+---
+---Note: Padding should use the editor's background color, not the
+---background color of the hint itself. That means padding can be used
+---to visually align/separate an inlay hint.
+---@field paddingLeft? boolean
+---Render padding after the hint.
+---
+---Note: Padding should use the editor's background color, not the
+---background color of the hint itself. That means padding can be used
+---to visually align/separate an inlay hint.
+---@field paddingRight? boolean
+---A data entry field that is preserved on an inlay hint between
+---a `textDocument/inlayHint` and a `inlayHint/resolve` request.
+---@field data? lsp.LSPAny
+
+---Inlay hint options used during static or dynamic registration.
+---
+---@since 3.17.0
+---@class lsp.InlayHintRegistrationOptions: lsp.InlayHintOptions, lsp.StaticRegistrationOptions
+
+---Parameters of the document diagnostic request.
+---
+---@since 3.17.0
+---@class lsp.DocumentDiagnosticParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The additional identifier  provided during registration.
+---@field identifier? string
+---The result id of a previous response if provided.
+---@field previousResultId? string
+
+---A partial result for a document diagnostic report.
+---
+---@since 3.17.0
+---@class lsp.DocumentDiagnosticReportPartialResult
+---@field relatedDocuments table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
+
+---Cancellation data returned from a diagnostic request.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticServerCancellationData
+---@field retriggerRequest boolean
+
+---Diagnostic registration options.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
+
+---Parameters of the workspace diagnostic request.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceDiagnosticParams
+---The additional identifier provided during registration.
+---@field identifier? string
+---The currently known diagnostic reports with their
+---previous result ids.
+---@field previousResultIds lsp.PreviousResultId[]
+
+---A workspace diagnostic report.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceDiagnosticReport
+---@field items lsp.WorkspaceDocumentDiagnosticReport[]
+
+---A partial result for a workspace diagnostic report.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceDiagnosticReportPartialResult
+---@field items lsp.WorkspaceDocumentDiagnosticReport[]
+
+---The params sent in an open notebook document notification.
+---
+---@since 3.17.0
+---@class lsp.DidOpenNotebookDocumentParams
+---The notebook document that got opened.
+---@field notebookDocument lsp.NotebookDocument
+---The text documents that represent the content
+---of a notebook cell.
+---@field cellTextDocuments lsp.TextDocumentItem[]
+
+---The params sent in a change notebook document notification.
+---
+---@since 3.17.0
+---@class lsp.DidChangeNotebookDocumentParams
+---The notebook document that did change. The version number points
+---to the version after all provided changes have been applied. If
+---only the text document content of a cell changes the notebook version
+---doesn't necessarily have to change.
+---@field notebookDocument lsp.VersionedNotebookDocumentIdentifier
+---The actual changes to the notebook document.
+---
+---The changes describe single state changes to the notebook document.
+---So if there are two changes c1 (at array index 0) and c2 (at array
+---index 1) for a notebook in state S then c1 moves the notebook from
+---S to S' and c2 from S' to S''. So c1 is computed on the state S and
+---c2 is computed on the state S'.
+---
+---To mirror the content of a notebook using change events use the following approach:
+---- start with the same initial content
+---- apply the 'notebookDocument/didChange' notifications in the order you receive them.
+---- apply the `NotebookChangeEvent`s in a single notification in the order
+---  you receive them.
+---@field change lsp.NotebookDocumentChangeEvent
+
+---The params sent in a save notebook document notification.
+---
+---@since 3.17.0
+---@class lsp.DidSaveNotebookDocumentParams
+---The notebook document that got saved.
+---@field notebookDocument lsp.NotebookDocumentIdentifier
+
+---The params sent in a close notebook document notification.
+---
+---@since 3.17.0
+---@class lsp.DidCloseNotebookDocumentParams
+---The notebook document that got closed.
+---@field notebookDocument lsp.NotebookDocumentIdentifier
+---The text documents that represent the content
+---of a notebook cell that got closed.
+---@field cellTextDocuments lsp.TextDocumentIdentifier[]
+
+---A parameter literal used in inline completion requests.
+---
+---@since 3.18.0
+---@class lsp.InlineCompletionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+---Additional information about the context in which inline completions were
+---requested.
+---@field context lsp.InlineCompletionContext
+
+---Represents a collection of {@link InlineCompletionItem inline completion items} to be presented in the editor.
+---@class lsp.InlineCompletionList
+---The inline completion items
+---@field items lsp.InlineCompletionItem[]
+
+---An inline completion item represents a text snippet that is proposed inline to complete text that is being typed.
+---
+---@since 3.18.0
+---@class lsp.InlineCompletionItem
+---The text to replace the range with. Must be set.
+---@field insertText string
+---The format of the insert text. The format applies to the `insertText`. If omitted defaults to `InsertTextFormat.PlainText`.
+---@field insertTextFormat? lsp.InsertTextFormat
+---A text that is used to decide if this inline completion should be shown. When `falsy` the {@link InlineCompletionItem.insertText} is used.
+---@field filterText? string
+---The range to replace. Must begin and end on the same line.
+---@field range? lsp.Range
+---An optional {@link Command} that is executed *after* inserting this completion.
+---@field command? lsp.Command
+
+---Inline completion options used during static or dynamic registration.
+---
+---@since 3.18.0
+---@class lsp.InlineCompletionRegistrationOptions: lsp.InlineCompletionOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.RegistrationParams
+---@field registrations lsp.Registration[]
+
+---@class lsp.UnregistrationParams
+---@field unregisterations lsp.Unregistration[]
+
+---@class lsp.InitializeParams: lsp._InitializeParams
+
+---The result returned from an initialize request.
+---@class lsp.InitializeResult
+---The capabilities the language server provides.
+---@field capabilities lsp.ServerCapabilities
+---Information about the server.
+---
+---@since 3.15.0
+---@field serverInfo? anonym1
+
+---The data type of the ResponseError if the
+---initialize request fails.
+---@class lsp.InitializeError
+---Indicates whether the client execute the following retry logic:
+---(1) show the message provided by the ResponseError to the user
+---(2) user selects retry or cancel
+---(3) if user selected retry the initialize method is sent again.
+---@field retry boolean
+
+---@class lsp.InitializedParams
+
+---The parameters of a change configuration notification.
+---@class lsp.DidChangeConfigurationParams
+---The actual changed settings
+---@field settings lsp.LSPAny
+
+---@class lsp.DidChangeConfigurationRegistrationOptions
+---@field section? string|string[]
+
+---The parameters of a notification message.
+---@class lsp.ShowMessageParams
+---The message type. See {@link MessageType}
+---@field type lsp.MessageType
+---The actual message.
+---@field message string
+
+---@class lsp.ShowMessageRequestParams
+---The message type. See {@link MessageType}
+---@field type lsp.MessageType
+---The actual message.
+---@field message string
+---The message action items to present.
+---@field actions? lsp.MessageActionItem[]
+
+---@class lsp.MessageActionItem
+---A short title like 'Retry', 'Open Log' etc.
+---@field title string
+
+---The log message parameters.
+---@class lsp.LogMessageParams
+---The message type. See {@link MessageType}
+---@field type lsp.MessageType
+---The actual message.
+---@field message string
+
+---The parameters sent in an open text document notification
+---@class lsp.DidOpenTextDocumentParams
+---The document that was opened.
+---@field textDocument lsp.TextDocumentItem
+
+---The change text document notification's parameters.
+---@class lsp.DidChangeTextDocumentParams
+---The document that did change. The version number points
+---to the version after all provided content changes have
+---been applied.
+---@field textDocument lsp.VersionedTextDocumentIdentifier
+---The actual content changes. The content changes describe single state changes
+---to the document. So if there are two content changes c1 (at array index 0) and
+---c2 (at array index 1) for a document in state S then c1 moves the document from
+---S to S' and c2 from S' to S''. So c1 is computed on the state S and c2 is computed
+---on the state S'.
+---
+---To mirror the content of a document using change events use the following approach:
+---- start with the same initial content
+---- apply the 'textDocument/didChange' notifications in the order you receive them.
+---- apply the `TextDocumentContentChangeEvent`s in a single notification in the order
+---  you receive them.
+---@field contentChanges lsp.TextDocumentContentChangeEvent[]
+
+---Describe options to be used when registered for text document change events.
+---@class lsp.TextDocumentChangeRegistrationOptions: lsp.TextDocumentRegistrationOptions
+---How documents are synced to the server.
+---@field syncKind lsp.TextDocumentSyncKind
+
+---The parameters sent in a close text document notification
+---@class lsp.DidCloseTextDocumentParams
+---The document that was closed.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---The parameters sent in a save text document notification
+---@class lsp.DidSaveTextDocumentParams
+---The document that was saved.
+---@field textDocument lsp.TextDocumentIdentifier
+---Optional the content when saved. Depends on the includeText value
+---when the save notification was requested.
+---@field text? string
+
+---Save registration options.
+---@class lsp.TextDocumentSaveRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters sent in a will save text document notification.
+---@class lsp.WillSaveTextDocumentParams
+---The document that will be saved.
+---@field textDocument lsp.TextDocumentIdentifier
+---The 'TextDocumentSaveReason'.
+---@field reason lsp.TextDocumentSaveReason
+
+---A text edit applicable to a text document.
+---@class lsp.TextEdit
+---The range of the text document to be manipulated. To insert
+---text into a document create a range where start === end.
+---@field range lsp.Range
+---The string to be inserted. For delete operations use an
+---empty string.
+---@field newText string
+
+---The watched files change notification's parameters.
+---@class lsp.DidChangeWatchedFilesParams
+---The actual file events.
+---@field changes lsp.FileEvent[]
+
+---Describe options to be used when registered for text document change events.
+---@class lsp.DidChangeWatchedFilesRegistrationOptions
+---The watchers to register.
+---@field watchers lsp.FileSystemWatcher[]
+
+---The publish diagnostic notification's parameters.
+---@class lsp.PublishDiagnosticsParams
+---The URI for which diagnostic information is reported.
+---@field uri lsp.DocumentUri
+---Optional the version number of the document the diagnostics are published for.
+---
+---@since 3.15.0
+---@field version? integer
+---An array of diagnostic information items.
+---@field diagnostics lsp.Diagnostic[]
+
+---Completion parameters
+---@class lsp.CompletionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+---The completion context. This is only available it the client specifies
+---to send this using the client capability `textDocument.completion.contextSupport === true`
+---@field context? lsp.CompletionContext
+
+---A completion item represents a text snippet that is
+---proposed to complete text that is being typed.
+---@class lsp.CompletionItem
+---The label of this completion item.
+---
+---The label property is also by default the text that
+---is inserted when selecting this completion.
+---
+---If label details are provided the label itself should
+---be an unqualified name of the completion item.
+---@field label string
+---Additional details for the label
+---
+---@since 3.17.0
+---@field labelDetails? lsp.CompletionItemLabelDetails
+---The kind of this completion item. Based of the kind
+---an icon is chosen by the editor.
+---@field kind? lsp.CompletionItemKind
+---Tags for this completion item.
+---
+---@since 3.15.0
+---@field tags? lsp.CompletionItemTag[]
+---A human-readable string with additional information
+---about this item, like type or symbol information.
+---@field detail? string
+---A human-readable string that represents a doc-comment.
+---@field documentation? string|lsp.MarkupContent
+---Indicates if this item is deprecated.
+---@deprecated Use `tags` instead.
+---@field deprecated? boolean
+---Select this item when showing.
+---
+---*Note* that only one completion item can be selected and that the
+---tool / client decides which item that is. The rule is that the *first*
+---item of those that match best is selected.
+---@field preselect? boolean
+---A string that should be used when comparing this item
+---with other items. When `falsy` the {@link CompletionItem.label label}
+---is used.
+---@field sortText? string
+---A string that should be used when filtering a set of
+---completion items. When `falsy` the {@link CompletionItem.label label}
+---is used.
+---@field filterText? string
+---A string that should be inserted into a document when selecting
+---this completion. When `falsy` the {@link CompletionItem.label label}
+---is used.
+---
+---The `insertText` is subject to interpretation by the client side.
+---Some tools might not take the string literally. For example
+---VS Code when code complete is requested in this example
+---`con<cursor position>` and a completion item with an `insertText` of
+---`console` is provided it will only insert `sole`. Therefore it is
+---recommended to use `textEdit` instead since it avoids additional client
+---side interpretation.
+---@field insertText? string
+---The format of the insert text. The format applies to both the
+---`insertText` property and the `newText` property of a provided
+---`textEdit`. If omitted defaults to `InsertTextFormat.PlainText`.
+---
+---Please note that the insertTextFormat doesn't apply to
+---`additionalTextEdits`.
+---@field insertTextFormat? lsp.InsertTextFormat
+---How whitespace and indentation is handled during completion
+---item insertion. If not provided the clients default value depends on
+---the `textDocument.completion.insertTextMode` client capability.
+---
+---@since 3.16.0
+---@field insertTextMode? lsp.InsertTextMode
+---An {@link TextEdit edit} which is applied to a document when selecting
+---this completion. When an edit is provided the value of
+---{@link CompletionItem.insertText insertText} is ignored.
+---
+---Most editors support two different operations when accepting a completion
+---item. One is to insert a completion text and the other is to replace an
+---existing text with a completion text. Since this can usually not be
+---predetermined by a server it can report both ranges. Clients need to
+---signal support for `InsertReplaceEdits` via the
+---`textDocument.completion.insertReplaceSupport` client capability
+---property.
+---
+---*Note 1:* The text edit's range as well as both ranges from an insert
+---replace edit must be a [single line] and they must contain the position
+---at which completion has been requested.
+---*Note 2:* If an `InsertReplaceEdit` is returned the edit's insert range
+---must be a prefix of the edit's replace range, that means it must be
+---contained and starting at the same position.
+---
+---@since 3.16.0 additional type `InsertReplaceEdit`
+---@field textEdit? lsp.TextEdit|lsp.InsertReplaceEdit
+---The edit text used if the completion item is part of a CompletionList and
+---CompletionList defines an item default for the text edit range.
+---
+---Clients will only honor this property if they opt into completion list
+---item defaults using the capability `completionList.itemDefaults`.
+---
+---If not provided and a list's default range is provided the label
+---property is used as a text.
+---
+---@since 3.17.0
+---@field textEditText? string
+---An optional array of additional {@link TextEdit text edits} that are applied when
+---selecting this completion. Edits must not overlap (including the same insert position)
+---with the main {@link CompletionItem.textEdit edit} nor with themselves.
+---
+---Additional text edits should be used to change text unrelated to the current cursor position
+---(for example adding an import statement at the top of the file if the completion item will
+---insert an unqualified type).
+---@field additionalTextEdits? lsp.TextEdit[]
+---An optional set of characters that when pressed while this completion is active will accept it first and
+---then type that character. *Note* that all commit characters should have `length=1` and that superfluous
+---characters will be ignored.
+---@field commitCharacters? string[]
+---An optional {@link Command command} that is executed *after* inserting this completion. *Note* that
+---additional modifications to the current document should be described with the
+---{@link CompletionItem.additionalTextEdits additionalTextEdits}-property.
+---@field command? lsp.Command
+---A data entry field that is preserved on a completion item between a
+---{@link CompletionRequest} and a {@link CompletionResolveRequest}.
+---@field data? lsp.LSPAny
+
+---Represents a collection of {@link CompletionItem completion items} to be presented
+---in the editor.
+---@class lsp.CompletionList
+---This list it not complete. Further typing results in recomputing this list.
+---
+---Recomputed lists have all their items replaced (not appended) in the
+---incomplete completion sessions.
+---@field isIncomplete boolean
+---In many cases the items of an actual completion result share the same
+---value for properties like `commitCharacters` or the range of a text
+---edit. A completion list can therefore define item defaults which will
+---be used if a completion item itself doesn't specify the value.
+---
+---If a completion list specifies a default value and a completion item
+---also specifies a corresponding value the one from the item is used.
+---
+---Servers are only allowed to return default values if the client
+---signals support for this via the `completionList.itemDefaults`
+---capability.
+---
+---@since 3.17.0
+---@field itemDefaults? anonym3
+---The completion items.
+---@field items lsp.CompletionItem[]
+
+---Registration options for a {@link CompletionRequest}.
+---@class lsp.CompletionRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link HoverRequest}.
+---@class lsp.HoverParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---The result of a hover request.
+---@class lsp.Hover
+---The hover's content
+---@field contents lsp.MarkupContent|lsp.MarkedString|lsp.MarkedString[]
+---An optional range inside the text document that is used to
+---visualize the hover, e.g. by changing the background color.
+---@field range? lsp.Range
+
+---Registration options for a {@link HoverRequest}.
+---@class lsp.HoverRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link SignatureHelpRequest}.
+---@class lsp.SignatureHelpParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+---The signature help context. This is only available if the client specifies
+---to send this using the client capability `textDocument.signatureHelp.contextSupport === true`
+---
+---@since 3.15.0
+---@field context? lsp.SignatureHelpContext
+
+---Signature help represents the signature of something
+---callable. There can be multiple signature but only one
+---active and only one active parameter.
+---@class lsp.SignatureHelp
+---One or more signatures.
+---@field signatures lsp.SignatureInformation[]
+---The active signature. If omitted or the value lies outside the
+---range of `signatures` the value defaults to zero or is ignored if
+---the `SignatureHelp` has no signatures.
+---
+---Whenever possible implementors should make an active decision about
+---the active signature and shouldn't rely on a default value.
+---
+---In future version of the protocol this property might become
+---mandatory to better express this.
+---@field activeSignature? uinteger
+---The active parameter of the active signature. If omitted or the value
+---lies outside the range of `signatures[activeSignature].parameters`
+---defaults to 0 if the active signature has parameters. If
+---the active signature has no parameters it is ignored.
+---In future version of the protocol this property might become
+---mandatory to better express the active parameter if the
+---active signature does have any.
+---@field activeParameter? uinteger
+
+---Registration options for a {@link SignatureHelpRequest}.
+---@class lsp.SignatureHelpRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link DefinitionRequest}.
+---@class lsp.DefinitionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---Registration options for a {@link DefinitionRequest}.
+---@class lsp.DefinitionRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link ReferencesRequest}.
+---@class lsp.ReferenceParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+---@field context lsp.ReferenceContext
+
+---Registration options for a {@link ReferencesRequest}.
+---@class lsp.ReferenceRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link DocumentHighlightRequest}.
+---@class lsp.DocumentHighlightParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
+
+---A document highlight is a range inside a text document which deserves
+---special attention. Usually a document highlight is visualized by changing
+---the background color of its range.
+---@class lsp.DocumentHighlight
+---The range this highlight applies to.
+---@field range lsp.Range
+---The highlight kind, default is {@link DocumentHighlightKind.Text text}.
+---@field kind? lsp.DocumentHighlightKind
+
+---Registration options for a {@link DocumentHighlightRequest}.
+---@class lsp.DocumentHighlightRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---Parameters for a {@link DocumentSymbolRequest}.
+---@class lsp.DocumentSymbolParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---Represents information about programming constructs like variables, classes,
+---interfaces etc.
+---@class lsp.SymbolInformation: lsp.BaseSymbolInformation
+---Indicates if this symbol is deprecated.
+---
+---@deprecated Use tags instead
+---@field deprecated? boolean
+---The location of this symbol. The location's range is used by a tool
+---to reveal the location in the editor. If the symbol is selected in the
+---tool the range's start information is used to position the cursor. So
+---the range usually spans more than the actual symbol's name and does
+---normally include things like visibility modifiers.
+---
+---The range doesn't have to denote a node range in the sense of an abstract
+---syntax tree. It can therefore not be used to re-construct a hierarchy of
+---the symbols.
+---@field location lsp.Location
+
+---Represents programming constructs like variables, classes, interfaces etc.
+---that appear in a document. Document symbols can be hierarchical and they
+---have two ranges: one that encloses its definition and one that points to
+---its most interesting range, e.g. the range of an identifier.
+---@class lsp.DocumentSymbol
+---The name of this symbol. Will be displayed in the user interface and therefore must not be
+---an empty string or a string only consisting of white spaces.
+---@field name string
+---More detail for this symbol, e.g the signature of a function.
+---@field detail? string
+---The kind of this symbol.
+---@field kind lsp.SymbolKind
+---Tags for this document symbol.
+---
+---@since 3.16.0
+---@field tags? lsp.SymbolTag[]
+---Indicates if this symbol is deprecated.
+---
+---@deprecated Use tags instead
+---@field deprecated? boolean
+---The range enclosing this symbol not including leading/trailing whitespace but everything else
+---like comments. This information is typically used to determine if the clients cursor is
+---inside the symbol to reveal in the symbol in the UI.
+---@field range lsp.Range
+---The range that should be selected and revealed when this symbol is being picked, e.g the name of a function.
+---Must be contained by the `range`.
+---@field selectionRange lsp.Range
+---Children of this symbol, e.g. properties of a class.
+---@field children? lsp.DocumentSymbol[]
+
+---Registration options for a {@link DocumentSymbolRequest}.
+---@class lsp.DocumentSymbolRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link CodeActionRequest}.
+---@class lsp.CodeActionParams
+---The document in which the command was invoked.
+---@field textDocument lsp.TextDocumentIdentifier
+---The range for which the command was invoked.
+---@field range lsp.Range
+---Context carrying additional information.
+---@field context lsp.CodeActionContext
+
+---Represents a reference to a command. Provides a title which
+---will be used to represent a command in the UI and, optionally,
+---an array of arguments which will be passed to the command handler
+---function when invoked.
+---@class lsp.Command
+---Title of the command, like `save`.
+---@field title string
+---The identifier of the actual command handler.
+---@field command string
+---Arguments that the command handler should be
+---invoked with.
+---@field arguments? lsp.LSPAny[]
+
+---A code action represents a change that can be performed in code, e.g. to fix a problem or
+---to refactor code.
+---
+---A CodeAction must set either `edit` and/or a `command`. If both are supplied, the `edit` is applied first, then the `command` is executed.
+---@class lsp.CodeAction
+---A short, human-readable, title for this code action.
+---@field title string
+---The kind of the code action.
+---
+---Used to filter code actions.
+---@field kind? lsp.CodeActionKind
+---The diagnostics that this code action resolves.
+---@field diagnostics? lsp.Diagnostic[]
+---Marks this as a preferred action. Preferred actions are used by the `auto fix` command and can be targeted
+---by keybindings.
+---
+---A quick fix should be marked preferred if it properly addresses the underlying error.
+---A refactoring should be marked preferred if it is the most reasonable choice of actions to take.
+---
+---@since 3.15.0
+---@field isPreferred? boolean
+---Marks that the code action cannot currently be applied.
+---
+---Clients should follow the following guidelines regarding disabled code actions:
+---
+---  - Disabled code actions are not shown in automatic [lightbulbs](https://code.visualstudio.com/docs/editor/editingevolved#_code-action)
+---    code action menus.
+---
+---  - Disabled actions are shown as faded out in the code action menu when the user requests a more specific type
+---    of code action, such as refactorings.
+---
+---  - If the user has a [keybinding](https://code.visualstudio.com/docs/editor/refactoring#_keybindings-for-code-actions)
+---    that auto applies a code action and only disabled code actions are returned, the client should show the user an
+---    error message with `reason` in the editor.
+---
+---@since 3.16.0
+---@field disabled? anonym4
+---The workspace edit this code action performs.
+---@field edit? lsp.WorkspaceEdit
+---A command this code action executes. If a code action
+---provides an edit and a command, first the edit is
+---executed and then the command.
+---@field command? lsp.Command
+---A data entry field that is preserved on a code action between
+---a `textDocument/codeAction` and a `codeAction/resolve` request.
+---
+---@since 3.16.0
+---@field data? lsp.LSPAny
+
+---Registration options for a {@link CodeActionRequest}.
+---@class lsp.CodeActionRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link WorkspaceSymbolRequest}.
+---@class lsp.WorkspaceSymbolParams
+---A query string to filter symbols by. Clients may send an empty
+---string here to request all symbols.
+---@field query string
+
+---A special workspace symbol that supports locations without a range.
+---
+---See also SymbolInformation.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceSymbol: lsp.BaseSymbolInformation
+---The location of the symbol. Whether a server is allowed to
+---return a location without a range depends on the client
+---capability `workspace.symbol.resolveSupport`.
+---
+---See SymbolInformation#location for more details.
+---@field location lsp.Location|anonym5
+---A data entry field that is preserved on a workspace symbol between a
+---workspace symbol request and a workspace symbol resolve request.
+---@field data? lsp.LSPAny
+
+---Registration options for a {@link WorkspaceSymbolRequest}.
+---@class lsp.WorkspaceSymbolRegistrationOptions: lsp.WorkspaceSymbolOptions
+
+---The parameters of a {@link CodeLensRequest}.
+---@class lsp.CodeLensParams
+---The document to request code lens for.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---A code lens represents a {@link Command command} that should be shown along with
+---source text, like the number of references, a way to run tests, etc.
+---
+---A code lens is _unresolved_ when no command is associated to it. For performance
+---reasons the creation of a code lens and resolving should be done in two stages.
+---@class lsp.CodeLens
+---The range in which this code lens is valid. Should only span a single line.
+---@field range lsp.Range
+---The command this code lens represents.
+---@field command? lsp.Command
+---A data entry field that is preserved on a code lens item between
+---a {@link CodeLensRequest} and a [CodeLensResolveRequest]
+---(#CodeLensResolveRequest)
+---@field data? lsp.LSPAny
+
+---Registration options for a {@link CodeLensRequest}.
+---@class lsp.CodeLensRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link DocumentLinkRequest}.
+---@class lsp.DocumentLinkParams
+---The document to provide document links for.
+---@field textDocument lsp.TextDocumentIdentifier
+
+---A document link is a range in a text document that links to an internal or external resource, like another
+---text document or a web site.
+---@class lsp.DocumentLink
+---The range this link applies to.
+---@field range lsp.Range
+---The uri this link points to. If missing a resolve request is sent later.
+---@field target? lsp.URI
+---The tooltip text when you hover over this link.
+---
+---If a tooltip is provided, is will be displayed in a string that includes instructions on how to
+---trigger the link, such as `{0} (ctrl + click)`. The specific instructions vary depending on OS,
+---user settings, and localization.
+---
+---@since 3.15.0
+---@field tooltip? string
+---A data entry field that is preserved on a document link between a
+---DocumentLinkRequest and a DocumentLinkResolveRequest.
+---@field data? lsp.LSPAny
+
+---Registration options for a {@link DocumentLinkRequest}.
+---@class lsp.DocumentLinkRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link DocumentFormattingRequest}.
+---@class lsp.DocumentFormattingParams
+---The document to format.
+---@field textDocument lsp.TextDocumentIdentifier
+---The format options.
+---@field options lsp.FormattingOptions
+
+---Registration options for a {@link DocumentFormattingRequest}.
+---@class lsp.DocumentFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link DocumentRangeFormattingRequest}.
+---@class lsp.DocumentRangeFormattingParams
+---The document to format.
+---@field textDocument lsp.TextDocumentIdentifier
+---The range to format
+---@field range lsp.Range
+---The format options
+---@field options lsp.FormattingOptions
+
+---Registration options for a {@link DocumentRangeFormattingRequest}.
+---@class lsp.DocumentRangeFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link DocumentRangesFormattingRequest}.
+---
+---@since 3.18.0
+---@proposed
+---@class lsp.DocumentRangesFormattingParams
+---The document to format.
+---@field textDocument lsp.TextDocumentIdentifier
+---The ranges to format
+---@field ranges lsp.Range[]
+---The format options
+---@field options lsp.FormattingOptions
+
+---The parameters of a {@link DocumentOnTypeFormattingRequest}.
+---@class lsp.DocumentOnTypeFormattingParams
+---The document to format.
+---@field textDocument lsp.TextDocumentIdentifier
+---The position around which the on type formatting should happen.
+---This is not necessarily the exact position where the character denoted
+---by the property `ch` got typed.
+---@field position lsp.Position
+---The character that has been typed that triggered the formatting
+---on type request. That is not necessarily the last character that
+---got inserted into the document since the client could auto insert
+---characters as well (e.g. like automatic brace completion).
+---@field ch string
+---The formatting options.
+---@field options lsp.FormattingOptions
+
+---Registration options for a {@link DocumentOnTypeFormattingRequest}.
+---@class lsp.DocumentOnTypeFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---The parameters of a {@link RenameRequest}.
+---@class lsp.RenameParams
+---The document to rename.
+---@field textDocument lsp.TextDocumentIdentifier
+---The position at which this request was sent.
+---@field position lsp.Position
+---The new name of the symbol. If the given name is not valid the
+---request must return a {@link ResponseError} with an
+---appropriate message set.
+---@field newName string
+
+---Registration options for a {@link RenameRequest}.
+---@class lsp.RenameRegistrationOptions: lsp.TextDocumentRegistrationOptions
+
+---@class lsp.PrepareRenameParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
+
+---The parameters of a {@link ExecuteCommandRequest}.
+---@class lsp.ExecuteCommandParams
+---The identifier of the actual command handler.
+---@field command string
+---Arguments that the command should be invoked with.
+---@field arguments? lsp.LSPAny[]
+
+---Registration options for a {@link ExecuteCommandRequest}.
+---@class lsp.ExecuteCommandRegistrationOptions: lsp.ExecuteCommandOptions
+
+---The parameters passed via an apply workspace edit request.
+---@class lsp.ApplyWorkspaceEditParams
+---An optional label of the workspace edit. This label is
+---presented in the user interface for example on an undo
+---stack to undo the workspace edit.
+---@field label? string
+---The edits to apply.
+---@field edit lsp.WorkspaceEdit
+
+---The result returned from the apply workspace edit request.
+---
+---@since 3.17 renamed from ApplyWorkspaceEditResponse
+---@class lsp.ApplyWorkspaceEditResult
+---Indicates whether the edit was applied or not.
+---@field applied boolean
+---An optional textual description for why the edit was not applied.
+---This may be used by the server for diagnostic logging or to provide
+---a suitable error for a request that triggered the edit.
+---@field failureReason? string
+---Depending on the client's failure handling strategy `failedChange` might
+---contain the index of the change that failed. This property is only available
+---if the client signals a `failureHandlingStrategy` in its client capabilities.
+---@field failedChange? uinteger
+
+---@class lsp.WorkDoneProgressBegin
+---@field kind "begin"
+---Mandatory title of the progress operation. Used to briefly inform about
+---the kind of operation being performed.
+---
+---Examples: "Indexing" or "Linking dependencies".
+---@field title string
+---Controls if a cancel button should show to allow the user to cancel the
+---long running operation. Clients that don't support cancellation are allowed
+---to ignore the setting.
+---@field cancellable? boolean
+---Optional, more detailed associated progress message. Contains
+---complementary information to the `title`.
+---
+---Examples: "3/25 files", "project/src/module2", "node_modules/some_dep".
+---If unset, the previous progress message (if any) is still valid.
+---@field message? string
+---Optional progress percentage to display (value 100 is considered 100%).
+---If not provided infinite progress is assumed and clients are allowed
+---to ignore the `percentage` value in subsequent in report notifications.
+---
+---The value should be steadily rising. Clients are free to ignore values
+---that are not following this rule. The value range is [0, 100].
+---@field percentage? uinteger
+
+---@class lsp.WorkDoneProgressReport
+---@field kind "report"
+---Controls enablement state of a cancel button.
+---
+---Clients that don't support cancellation or don't support controlling the button's
+---enablement state are allowed to ignore the property.
+---@field cancellable? boolean
+---Optional, more detailed associated progress message. Contains
+---complementary information to the `title`.
+---
+---Examples: "3/25 files", "project/src/module2", "node_modules/some_dep".
+---If unset, the previous progress message (if any) is still valid.
+---@field message? string
+---Optional progress percentage to display (value 100 is considered 100%).
+---If not provided infinite progress is assumed and clients are allowed
+---to ignore the `percentage` value in subsequent in report notifications.
+---
+---The value should be steadily rising. Clients are free to ignore values
+---that are not following this rule. The value range is [0, 100]
+---@field percentage? uinteger
+
+---@class lsp.WorkDoneProgressEnd
+---@field kind "end"
+---Optional, a final message indicating to for example indicate the outcome
+---of the operation.
+---@field message? string
+
+---@class lsp.SetTraceParams
+---@field value lsp.TraceValues
+
+---@class lsp.LogTraceParams
+---@field message string
+---@field verbose? string
+
+---@class lsp.CancelParams
+---The request id to cancel.
+---@field id integer|string
+
+---@class lsp.ProgressParams
+---The progress token provided by the client or server.
+---@field token lsp.ProgressToken
+---The progress data.
+---@field value lsp.LSPAny
+
+---A parameter literal used in requests to pass a text document and a position inside that
+---document.
+---@class lsp.TextDocumentPositionParams
+---The text document.
+---@field textDocument lsp.TextDocumentIdentifier
+---The position inside the text document.
+---@field position lsp.Position
+
+---@class lsp.WorkDoneProgressParams
+---An optional token that a server can use to report work done progress.
+---@field workDoneToken? lsp.ProgressToken
+
+---@class lsp.PartialResultParams
+---An optional token that a server can use to report partial results (e.g. streaming) to
+---the client.
+---@field partialResultToken? lsp.ProgressToken
+
+---Represents the connection of two locations. Provides additional metadata over normal {@link Location locations},
+---including an origin range.
+---@class lsp.LocationLink
+---Span of the origin of this link.
+---
+---Used as the underlined span for mouse interaction. Defaults to the word range at
+---the definition position.
+---@field originSelectionRange? lsp.Range
+---The target resource identifier of this link.
+---@field targetUri lsp.DocumentUri
+---The full target range of this link. If the target for example is a symbol then target range is the
+---range enclosing this symbol not including leading/trailing whitespace but everything else
+---like comments. This information is typically used to highlight the range in the editor.
+---@field targetRange lsp.Range
+---The range that should be selected and revealed when this link is being followed, e.g the name of a function.
+---Must be contained by the `targetRange`. See also `DocumentSymbol#range`
+---@field targetSelectionRange lsp.Range
+
+---A range in a text document expressed as (zero-based) start and end positions.
+---
+---If you want to specify a range that contains a line including the line ending
+---character(s) then use an end position denoting the start of the next line.
+---For example:
+---```ts
+---{
+---    start: { line: 5, character: 23 }
+---    end : { line 6, character : 0 }
+---}
+---```
+---@class lsp.Range
+---The range's start position.
+---@field start lsp.Position
+---The range's end position.
+---@field end lsp.Position
+
+---@class lsp.ImplementationOptions
+
+---Static registration options to be returned in the initialize
+---request.
+---@class lsp.StaticRegistrationOptions
+---The id used to register the request. The id can be used to deregister
+---the request again. See also Registration#id.
+---@field id? string
+
+---@class lsp.TypeDefinitionOptions
+
+---The workspace folder change event.
+---@class lsp.WorkspaceFoldersChangeEvent
+---The array of added workspace folders
+---@field added lsp.WorkspaceFolder[]
+---The array of the removed workspace folders
+---@field removed lsp.WorkspaceFolder[]
+
+---@class lsp.ConfigurationItem
+---The scope to get the configuration section for.
+---@field scopeUri? string
+---The configuration section asked for.
+---@field section? string
+
+---A literal to identify a text document in the client.
+---@class lsp.TextDocumentIdentifier
+---The text document's uri.
+---@field uri lsp.DocumentUri
+
+---Represents a color in RGBA space.
+---@class lsp.Color
+---The red component of this color in the range [0-1].
+---@field red decimal
+---The green component of this color in the range [0-1].
+---@field green decimal
+---The blue component of this color in the range [0-1].
+---@field blue decimal
+---The alpha component of this color in the range [0-1].
+---@field alpha decimal
+
+---@class lsp.DocumentColorOptions
+
+---@class lsp.FoldingRangeOptions
+
+---@class lsp.DeclarationOptions
+
+---Position in a text document expressed as zero-based line and character
+---offset. Prior to 3.17 the offsets were always based on a UTF-16 string
+---representation. So a string of the form `a𐐀b` the character offset of the
+---character `a` is 0, the character offset of `𐐀` is 1 and the character
+---offset of b is 3 since `𐐀` is represented using two code units in UTF-16.
+---Since 3.17 clients and servers can agree on a different string encoding
+---representation (e.g. UTF-8). The client announces it's supported encoding
+---via the client capability [`general.positionEncodings`](#clientCapabilities).
+---The value is an array of position encodings the client supports, with
+---decreasing preference (e.g. the encoding at index `0` is the most preferred
+---one). To stay backwards compatible the only mandatory encoding is UTF-16
+---represented via the string `utf-16`. The server can pick one of the
+---encodings offered by the client and signals that encoding back to the
+---client via the initialize result's property
+---[`capabilities.positionEncoding`](#serverCapabilities). If the string value
+---`utf-16` is missing from the client's capability `general.positionEncodings`
+---servers can safely assume that the client supports UTF-16. If the server
+---omits the position encoding in its initialize result the encoding defaults
+---to the string value `utf-16`. Implementation considerations: since the
+---conversion from one encoding into another requires the content of the
+---file / line the conversion is best done where the file is read which is
+---usually on the server side.
+---
+---Positions are line end character agnostic. So you can not specify a position
+---that denotes `\r|\n` or `\n|` where `|` represents the character offset.
+---
+---@since 3.17.0 - support for negotiated position encoding.
+---@class lsp.Position
+---Line position in a document (zero-based).
+---
+---If a line number is greater than the number of lines in a document, it defaults back to the number of lines in the document.
+---If a line number is negative, it defaults to 0.
+---@field line uinteger
+---Character offset on a line in a document (zero-based).
+---
+---The meaning of this offset is determined by the negotiated
+---`PositionEncodingKind`.
+---
+---If the character value is greater than the line length it defaults back to the
+---line length.
+---@field character uinteger
+
+---@class lsp.SelectionRangeOptions
+
+---Call hierarchy options used during static registration.
+---
+---@since 3.16.0
+---@class lsp.CallHierarchyOptions
+
+---@since 3.16.0
+---@class lsp.SemanticTokensOptions
+---The legend used by the server
+---@field legend lsp.SemanticTokensLegend
+---Server supports providing semantic tokens for a specific range
+---of a document.
+---@field range? boolean|anonym6
+---Server supports providing semantic tokens for a full document.
+---@field full? boolean|anonym7
+
+---@since 3.16.0
+---@class lsp.SemanticTokensEdit
+---The start offset of the edit.
+---@field start uinteger
+---The count of elements to remove.
+---@field deleteCount uinteger
+---The elements to insert.
+---@field data? uinteger[]
+
+---@class lsp.LinkedEditingRangeOptions
+
+---Represents information on a file/folder create.
+---
+---@since 3.16.0
+---@class lsp.FileCreate
+---A file:// URI for the location of the file/folder being created.
+---@field uri string
+
+---Describes textual changes on a text document. A TextDocumentEdit describes all changes
+---on a document version Si and after they are applied move the document to version Si+1.
+---So the creator of a TextDocumentEdit doesn't need to sort the array of edits or do any
+---kind of ordering. However the edits must be non overlapping.
+---@class lsp.TextDocumentEdit
+---The text document to change.
+---@field textDocument lsp.OptionalVersionedTextDocumentIdentifier
+---The edits to be applied.
+---
+---@since 3.16.0 - support for AnnotatedTextEdit. This is guarded using a
+---client capability.
+---@field edits lsp.TextEdit|lsp.AnnotatedTextEdit[]
+
+---Create file operation.
+---@class lsp.CreateFile: lsp.ResourceOperation
+---A create
+---@field kind "create"
+---The resource to create.
+---@field uri lsp.DocumentUri
+---Additional options
+---@field options? lsp.CreateFileOptions
+
+---Rename file operation
+---@class lsp.RenameFile: lsp.ResourceOperation
+---A rename
+---@field kind "rename"
+---The old (existing) location.
+---@field oldUri lsp.DocumentUri
+---The new location.
+---@field newUri lsp.DocumentUri
+---Rename options.
+---@field options? lsp.RenameFileOptions
+
+---Delete file operation
+---@class lsp.DeleteFile: lsp.ResourceOperation
+---A delete
+---@field kind "delete"
+---The file to delete.
+---@field uri lsp.DocumentUri
+---Delete options.
+---@field options? lsp.DeleteFileOptions
+
+---Additional information that describes document changes.
+---
+---@since 3.16.0
+---@class lsp.ChangeAnnotation
+---A human-readable string describing the actual change. The string
+---is rendered prominent in the user interface.
+---@field label string
+---A flag which indicates that user confirmation is needed
+---before applying the change.
+---@field needsConfirmation? boolean
+---A human-readable string which is rendered less prominent in
+---the user interface.
+---@field description? string
+
+---A filter to describe in which file operation requests or notifications
+---the server is interested in receiving.
+---
+---@since 3.16.0
+---@class lsp.FileOperationFilter
+---A Uri scheme like `file` or `untitled`.
+---@field scheme? string
+---The actual file operation pattern.
+---@field pattern lsp.FileOperationPattern
+
+---Represents information on a file/folder rename.
+---
+---@since 3.16.0
+---@class lsp.FileRename
+---A file:// URI for the original location of the file/folder being renamed.
+---@field oldUri string
+---A file:// URI for the new location of the file/folder being renamed.
+---@field newUri string
+
+---Represents information on a file/folder delete.
+---
+---@since 3.16.0
+---@class lsp.FileDelete
+---A file:// URI for the location of the file/folder being deleted.
+---@field uri string
+
+---@class lsp.MonikerOptions
+
+---Type hierarchy options used during static registration.
+---
+---@since 3.17.0
+---@class lsp.TypeHierarchyOptions
+
+---@since 3.17.0
+---@class lsp.InlineValueContext
+---The stack frame (as a DAP Id) where the execution has stopped.
+---@field frameId integer
+---The document range where execution has stopped.
+---Typically the end position of the range denotes the line where the inline values are shown.
+---@field stoppedLocation lsp.Range
+
+---Provide inline value as text.
+---
+---@since 3.17.0
+---@class lsp.InlineValueText
+---The document range for which the inline value applies.
+---@field range lsp.Range
+---The text of the inline value.
+---@field text string
+
+---Provide inline value through a variable lookup.
+---If only a range is specified, the variable name will be extracted from the underlying document.
+---An optional variable name can be used to override the extracted name.
+---
+---@since 3.17.0
+---@class lsp.InlineValueVariableLookup
+---The document range for which the inline value applies.
+---The range is used to extract the variable name from the underlying document.
+---@field range lsp.Range
+---If specified the name of the variable to look up.
+---@field variableName? string
+---How to perform the lookup.
+---@field caseSensitiveLookup boolean
+
+---Provide an inline value through an expression evaluation.
+---If only a range is specified, the expression will be extracted from the underlying document.
+---An optional expression can be used to override the extracted expression.
+---
+---@since 3.17.0
+---@class lsp.InlineValueEvaluatableExpression
+---The document range for which the inline value applies.
+---The range is used to extract the evaluatable expression from the underlying document.
+---@field range lsp.Range
+---If specified the expression overrides the extracted expression.
+---@field expression? string
+
+---Inline value options used during static registration.
+---
+---@since 3.17.0
+---@class lsp.InlineValueOptions
+
+---An inlay hint label part allows for interactive and composite labels
+---of inlay hints.
+---
+---@since 3.17.0
+---@class lsp.InlayHintLabelPart
+---The value of this label part.
+---@field value string
+---The tooltip text when you hover over this label part. Depending on
+---the client capability `inlayHint.resolveSupport` clients might resolve
+---this property late using the resolve request.
+---@field tooltip? string|lsp.MarkupContent
+---An optional source code location that represents this
+---label part.
+---
+---The editor will use this location for the hover and for code navigation
+---features: This part will become a clickable link that resolves to the
+---definition of the symbol at the given location (not necessarily the
+---location itself), it shows the hover that shows at the given location,
+---and it shows a context menu with further code navigation commands.
+---
+---Depending on the client capability `inlayHint.resolveSupport` clients
+---might resolve this property late using the resolve request.
+---@field location? lsp.Location
+---An optional command for this label part.
+---
+---Depending on the client capability `inlayHint.resolveSupport` clients
+---might resolve this property late using the resolve request.
+---@field command? lsp.Command
+
+---A `MarkupContent` literal represents a string value which content is interpreted base on its
+---kind flag. Currently the protocol supports `plaintext` and `markdown` as markup kinds.
+---
+---If the kind is `markdown` then the value can contain fenced code blocks like in GitHub issues.
+---See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+---
+---Here is an example how such a string can be constructed using JavaScript / TypeScript:
+---```ts
+---let markdown: MarkdownContent = {
+--- kind: MarkupKind.Markdown,
+--- value: [
+---   '# Header',
+---   'Some text',
+---   '```typescript',
+---   'someCode();',
+---   '```'
+--- ].join('\n')
+---};
+---```
+---
+---*Please Note* that clients might sanitize the return markdown. A client could decide to
+---remove HTML from the markdown to avoid script execution.
+---@class lsp.MarkupContent
+---The type of the Markup
+---@field kind lsp.MarkupKind
+---The content itself
+---@field value string
+
+---Inlay hint options used during static registration.
+---
+---@since 3.17.0
+---@class lsp.InlayHintOptions
+---The server provides support to resolve additional
+---information for an inlay hint item.
+---@field resolveProvider? boolean
+
+---A full diagnostic report with a set of related documents.
+---
+---@since 3.17.0
+---@class lsp.RelatedFullDocumentDiagnosticReport: lsp.FullDocumentDiagnosticReport
+---Diagnostics of related documents. This information is useful
+---in programming languages where code in a file A can generate
+---diagnostics in a file B which A depends on. An example of
+---such a language is C/C++ where marco definitions in a file
+---a.cpp and result in errors in a header file b.hpp.
+---
+---@since 3.17.0
+---@field relatedDocuments? table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
+
+---An unchanged diagnostic report with a set of related documents.
+---
+---@since 3.17.0
+---@class lsp.RelatedUnchangedDocumentDiagnosticReport: lsp.UnchangedDocumentDiagnosticReport
+---Diagnostics of related documents. This information is useful
+---in programming languages where code in a file A can generate
+---diagnostics in a file B which A depends on. An example of
+---such a language is C/C++ where marco definitions in a file
+---a.cpp and result in errors in a header file b.hpp.
+---
+---@since 3.17.0
+---@field relatedDocuments? table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
+
+---A diagnostic report with a full set of problems.
+---
+---@since 3.17.0
+---@class lsp.FullDocumentDiagnosticReport
+---A full document diagnostic report.
+---@field kind "full"
+---An optional result id. If provided it will
+---be sent on the next diagnostic request for the
+---same document.
+---@field resultId? string
+---The actual items.
+---@field items lsp.Diagnostic[]
+
+---A diagnostic report indicating that the last returned
+---report is still accurate.
+---
+---@since 3.17.0
+---@class lsp.UnchangedDocumentDiagnosticReport
+---A document diagnostic report indicating
+---no changes to the last result. A server can
+---only return `unchanged` if result ids are
+---provided.
+---@field kind "unchanged"
+---A result id which will be sent on the next
+---diagnostic request for the same document.
+---@field resultId string
+
+---Diagnostic options.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticOptions
+---An optional identifier under which the diagnostics are
+---managed by the client.
+---@field identifier? string
+---Whether the language has inter file dependencies meaning that
+---editing code in one file can result in a different diagnostic
+---set in another file. Inter file dependencies are common for
+---most programming languages and typically uncommon for linters.
+---@field interFileDependencies boolean
+---The server provides support for workspace diagnostics as well.
+---@field workspaceDiagnostics boolean
+
+---A previous result id in a workspace pull request.
+---
+---@since 3.17.0
+---@class lsp.PreviousResultId
+---The URI for which the client knowns a
+---result id.
+---@field uri lsp.DocumentUri
+---The value of the previous result id.
+---@field value string
+
+---A notebook document.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocument
+---The notebook document's uri.
+---@field uri lsp.URI
+---The type of the notebook.
+---@field notebookType string
+---The version number of this document (it will increase after each
+---change, including undo/redo).
+---@field version integer
+---Additional metadata stored with the notebook
+---document.
+---
+---Note: should always be an object literal (e.g. LSPObject)
+---@field metadata? lsp.LSPObject
+---The cells of a notebook.
+---@field cells lsp.NotebookCell[]
+
+---An item to transfer a text document from the client to the
+---server.
+---@class lsp.TextDocumentItem
+---The text document's uri.
+---@field uri lsp.DocumentUri
+---The text document's language identifier.
+---@field languageId string
+---The version number of this document (it will increase after each
+---change, including undo/redo).
+---@field version integer
+---The content of the opened text document.
+---@field text string
+
+---A versioned notebook document identifier.
+---
+---@since 3.17.0
+---@class lsp.VersionedNotebookDocumentIdentifier
+---The version number of this notebook document.
+---@field version integer
+---The notebook document's uri.
+---@field uri lsp.URI
+
+---A change event for a notebook document.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentChangeEvent
+---The changed meta data if any.
+---
+---Note: should always be an object literal (e.g. LSPObject)
+---@field metadata? lsp.LSPObject
+---Changes to cells
+---@field cells? anonym10
+
+---A literal to identify a notebook document in the client.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentIdentifier
+---The notebook document's uri.
+---@field uri lsp.URI
+
+---Provides information about the context in which an inline completion was requested.
+---
+---@since 3.18.0
+---@class lsp.InlineCompletionContext
+---Describes how the inline completion was triggered.
+---@field triggerKind lsp.InlineCompletionTriggerKind
+---Provides information about the currently selected item in the autocomplete widget if it is visible.
+---@field selectedCompletionInfo? lsp.SelectedCompletionInfo
+
+---Inline completion options used during static registration.
+---
+---@since 3.18.0
+---@class lsp.InlineCompletionOptions
+
+---General parameters to to register for an notification or to register a provider.
+---@class lsp.Registration
+---The id used to register the request. The id can be used to deregister
+---the request again.
+---@field id string
+---The method / capability to register for.
+---@field method string
+---Options necessary for the registration.
+---@field registerOptions? lsp.LSPAny
+
+---General parameters to unregister a request or notification.
+---@class lsp.Unregistration
+---The id used to unregister the request or notification. Usually an id
+---provided during the register request.
+---@field id string
+---The method to unregister for.
+---@field method string
+
+---The initialize parameters
+---@class lsp._InitializeParams
+---The process Id of the parent process that started
+---the server.
+---
+---Is `null` if the process has not been started by another process.
+---If the parent process is not alive then the server should exit.
+---@field processId integer|lsp.null
+---Information about the client
+---
+---@since 3.15.0
+---@field clientInfo? anonym11
+---The locale the client is currently showing the user interface
+---in. This must not necessarily be the locale of the operating
+---system.
+---
+---Uses IETF language tags as the value's syntax
+---(See https://en.wikipedia.org/wiki/IETF_language_tag)
+---
+---@since 3.16.0
+---@field locale? string
+---The rootPath of the workspace. Is null
+---if no folder is open.
+---
+---@deprecated in favour of rootUri.
+---@field rootPath? string|lsp.null
+---The rootUri of the workspace. Is null if no
+---folder is open. If both `rootPath` and `rootUri` are set
+---`rootUri` wins.
+---
+---@deprecated in favour of workspaceFolders.
+---@field rootUri lsp.DocumentUri|lsp.null
+---The capabilities provided by the client (editor or tool)
+---@field capabilities lsp.ClientCapabilities
+---User provided initialization options.
+---@field initializationOptions? lsp.LSPAny
+---The initial trace setting. If omitted trace is disabled ('off').
+---@field trace? lsp.TraceValues
+
+---@class lsp.WorkspaceFoldersInitializeParams
+---The workspace folders configured in the client when the server starts.
+---
+---This property is only available if the client supports workspace folders.
+---It can be `null` if the client supports workspace folders but none are
+---configured.
+---
+---@since 3.6.0
+---@field workspaceFolders? lsp.WorkspaceFolder[]|lsp.null
+
+---Defines the capabilities provided by a language
+---server.
+---@class lsp.ServerCapabilities
+---The position encoding the server picked from the encodings offered
+---by the client via the client capability `general.positionEncodings`.
+---
+---If the client didn't provide any position encodings the only valid
+---value that a server can return is 'utf-16'.
+---
+---If omitted it defaults to 'utf-16'.
+---
+---@since 3.17.0
+---@field positionEncoding? lsp.PositionEncodingKind
+---Defines how text documents are synced. Is either a detailed structure
+---defining each notification or for backwards compatibility the
+---TextDocumentSyncKind number.
+---@field textDocumentSync? lsp.TextDocumentSyncOptions|lsp.TextDocumentSyncKind
+---Defines how notebook documents are synced.
+---
+---@since 3.17.0
+---@field notebookDocumentSync? lsp.NotebookDocumentSyncOptions|lsp.NotebookDocumentSyncRegistrationOptions
+---The server provides completion support.
+---@field completionProvider? lsp.CompletionOptions
+---The server provides hover support.
+---@field hoverProvider? boolean|lsp.HoverOptions
+---The server provides signature help support.
+---@field signatureHelpProvider? lsp.SignatureHelpOptions
+---The server provides Goto Declaration support.
+---@field declarationProvider? boolean|lsp.DeclarationOptions|lsp.DeclarationRegistrationOptions
+---The server provides goto definition support.
+---@field definitionProvider? boolean|lsp.DefinitionOptions
+---The server provides Goto Type Definition support.
+---@field typeDefinitionProvider? boolean|lsp.TypeDefinitionOptions|lsp.TypeDefinitionRegistrationOptions
+---The server provides Goto Implementation support.
+---@field implementationProvider? boolean|lsp.ImplementationOptions|lsp.ImplementationRegistrationOptions
+---The server provides find references support.
+---@field referencesProvider? boolean|lsp.ReferenceOptions
+---The server provides document highlight support.
+---@field documentHighlightProvider? boolean|lsp.DocumentHighlightOptions
+---The server provides document symbol support.
+---@field documentSymbolProvider? boolean|lsp.DocumentSymbolOptions
+---The server provides code actions. CodeActionOptions may only be
+---specified if the client states that it supports
+---`codeActionLiteralSupport` in its initial `initialize` request.
+---@field codeActionProvider? boolean|lsp.CodeActionOptions
+---The server provides code lens.
+---@field codeLensProvider? lsp.CodeLensOptions
+---The server provides document link support.
+---@field documentLinkProvider? lsp.DocumentLinkOptions
+---The server provides color provider support.
+---@field colorProvider? boolean|lsp.DocumentColorOptions|lsp.DocumentColorRegistrationOptions
+---The server provides workspace symbol support.
+---@field workspaceSymbolProvider? boolean|lsp.WorkspaceSymbolOptions
+---The server provides document formatting.
+---@field documentFormattingProvider? boolean|lsp.DocumentFormattingOptions
+---The server provides document range formatting.
+---@field documentRangeFormattingProvider? boolean|lsp.DocumentRangeFormattingOptions
+---The server provides document formatting on typing.
+---@field documentOnTypeFormattingProvider? lsp.DocumentOnTypeFormattingOptions
+---The server provides rename support. RenameOptions may only be
+---specified if the client states that it supports
+---`prepareSupport` in its initial `initialize` request.
+---@field renameProvider? boolean|lsp.RenameOptions
+---The server provides folding provider support.
+---@field foldingRangeProvider? boolean|lsp.FoldingRangeOptions|lsp.FoldingRangeRegistrationOptions
+---The server provides selection range support.
+---@field selectionRangeProvider? boolean|lsp.SelectionRangeOptions|lsp.SelectionRangeRegistrationOptions
+---The server provides execute command support.
+---@field executeCommandProvider? lsp.ExecuteCommandOptions
+---The server provides call hierarchy support.
+---
+---@since 3.16.0
+---@field callHierarchyProvider? boolean|lsp.CallHierarchyOptions|lsp.CallHierarchyRegistrationOptions
+---The server provides linked editing range support.
+---
+---@since 3.16.0
+---@field linkedEditingRangeProvider? boolean|lsp.LinkedEditingRangeOptions|lsp.LinkedEditingRangeRegistrationOptions
+---The server provides semantic tokens support.
+---
+---@since 3.16.0
+---@field semanticTokensProvider? lsp.SemanticTokensOptions|lsp.SemanticTokensRegistrationOptions
+---The server provides moniker support.
+---
+---@since 3.16.0
+---@field monikerProvider? boolean|lsp.MonikerOptions|lsp.MonikerRegistrationOptions
+---The server provides type hierarchy support.
+---
+---@since 3.17.0
+---@field typeHierarchyProvider? boolean|lsp.TypeHierarchyOptions|lsp.TypeHierarchyRegistrationOptions
+---The server provides inline values.
+---
+---@since 3.17.0
+---@field inlineValueProvider? boolean|lsp.InlineValueOptions|lsp.InlineValueRegistrationOptions
+---The server provides inlay hints.
+---
+---@since 3.17.0
+---@field inlayHintProvider? boolean|lsp.InlayHintOptions|lsp.InlayHintRegistrationOptions
+---The server has support for pull model diagnostics.
+---
+---@since 3.17.0
+---@field diagnosticProvider? lsp.DiagnosticOptions|lsp.DiagnosticRegistrationOptions
+---Inline completion options used during static registration.
+---
+---@since 3.18.0
+---@field inlineCompletionProvider? boolean|lsp.InlineCompletionOptions
+---Workspace specific server capabilities.
+---@field workspace? anonym12
+---Experimental server capabilities.
+---@field experimental? lsp.LSPAny
+
+---A text document identifier to denote a specific version of a text document.
+---@class lsp.VersionedTextDocumentIdentifier: lsp.TextDocumentIdentifier
+---The version number of this document.
+---@field version integer
+
+---Save options.
+---@class lsp.SaveOptions
+---The client is supposed to include the content on save.
+---@field includeText? boolean
+
+---An event describing a file change.
+---@class lsp.FileEvent
+---The file's uri.
+---@field uri lsp.DocumentUri
+---The change type.
+---@field type lsp.FileChangeType
+
+---@class lsp.FileSystemWatcher
+---The glob pattern to watch. See {@link GlobPattern glob pattern} for more detail.
+---
+---@since 3.17.0 support for relative patterns.
+---@field globPattern lsp.GlobPattern
+---The kind of events of interest. If omitted it defaults
+---to WatchKind.Create | WatchKind.Change | WatchKind.Delete
+---which is 7.
+---@field kind? lsp.WatchKind
+
+---Represents a diagnostic, such as a compiler error or warning. Diagnostic objects
+---are only valid in the scope of a resource.
+---@class lsp.Diagnostic
+---The range at which the message applies
+---@field range lsp.Range
+---The diagnostic's severity. Can be omitted. If omitted it is up to the
+---client to interpret diagnostics as error, warning, info or hint.
+---@field severity? lsp.DiagnosticSeverity
+---The diagnostic's code, which usually appear in the user interface.
+---@field code? integer|string
+---An optional property to describe the error code.
+---Requires the code field (above) to be present/not null.
+---
+---@since 3.16.0
+---@field codeDescription? lsp.CodeDescription
+---A human-readable string describing the source of this
+---diagnostic, e.g. 'typescript' or 'super lint'. It usually
+---appears in the user interface.
+---@field source? string
+---The diagnostic's message. It usually appears in the user interface
+---@field message string
+---Additional metadata about the diagnostic.
+---
+---@since 3.15.0
+---@field tags? lsp.DiagnosticTag[]
+---An array of related diagnostic information, e.g. when symbol-names within
+---a scope collide all definitions can be marked via this property.
+---@field relatedInformation? lsp.DiagnosticRelatedInformation[]
+---A data entry field that is preserved between a `textDocument/publishDiagnostics`
+---notification and `textDocument/codeAction` request.
+---
+---@since 3.16.0
+---@field data? lsp.LSPAny
+
+---Contains additional information about the context in which a completion request is triggered.
+---@class lsp.CompletionContext
+---How the completion was triggered.
+---@field triggerKind lsp.CompletionTriggerKind
+---The trigger character (a single character) that has trigger code complete.
+---Is undefined if `triggerKind !== CompletionTriggerKind.TriggerCharacter`
+---@field triggerCharacter? string
+
+---Additional details for a completion item label.
+---
+---@since 3.17.0
+---@class lsp.CompletionItemLabelDetails
+---An optional string which is rendered less prominently directly after {@link CompletionItem.label label},
+---without any spacing. Should be used for function signatures and type annotations.
+---@field detail? string
+---An optional string which is rendered less prominently after {@link CompletionItem.detail}. Should be used
+---for fully qualified names and file paths.
+---@field description? string
+
+---A special text edit to provide an insert and a replace operation.
+---
+---@since 3.16.0
+---@class lsp.InsertReplaceEdit
+---The string to be inserted.
+---@field newText string
+---The range if the insert is requested
+---@field insert lsp.Range
+---The range if the replace is requested.
+---@field replace lsp.Range
+
+---Completion options.
+---@class lsp.CompletionOptions
+---Most tools trigger completion request automatically without explicitly requesting
+---it using a keyboard shortcut (e.g. Ctrl+Space). Typically they do so when the user
+---starts to type an identifier. For example if the user types `c` in a JavaScript file
+---code complete will automatically pop up present `console` besides others as a
+---completion item. Characters that make up identifiers don't need to be listed here.
+---
+---If code complete should automatically be trigger on characters not being valid inside
+---an identifier (for example `.` in JavaScript) list them in `triggerCharacters`.
+---@field triggerCharacters? string[]
+---The list of all possible characters that commit a completion. This field can be used
+---if clients don't support individual commit characters per completion item. See
+---`ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`
+---
+---If a server provides both `allCommitCharacters` and commit characters on an individual
+---completion item the ones on the completion item win.
+---
+---@since 3.2.0
+---@field allCommitCharacters? string[]
+---The server provides support to resolve additional
+---information for a completion item.
+---@field resolveProvider? boolean
+---The server supports the following `CompletionItem` specific
+---capabilities.
+---
+---@since 3.17.0
+---@field completionItem? anonym13
+
+---Hover options.
+---@class lsp.HoverOptions
+
+---Additional information about the context in which a signature help request was triggered.
+---
+---@since 3.15.0
+---@class lsp.SignatureHelpContext
+---Action that caused signature help to be triggered.
+---@field triggerKind lsp.SignatureHelpTriggerKind
+---Character that caused signature help to be triggered.
+---
+---This is undefined when `triggerKind !== SignatureHelpTriggerKind.TriggerCharacter`
+---@field triggerCharacter? string
+---`true` if signature help was already showing when it was triggered.
+---
+---Retriggers occurs when the signature help is already active and can be caused by actions such as
+---typing a trigger character, a cursor move, or document content changes.
+---@field isRetrigger boolean
+---The currently active `SignatureHelp`.
+---
+---The `activeSignatureHelp` has its `SignatureHelp.activeSignature` field updated based on
+---the user navigating through available signatures.
+---@field activeSignatureHelp? lsp.SignatureHelp
+
+---Represents the signature of something callable. A signature
+---can have a label, like a function-name, a doc-comment, and
+---a set of parameters.
+---@class lsp.SignatureInformation
+---The label of this signature. Will be shown in
+---the UI.
+---@field label string
+---The human-readable doc-comment of this signature. Will be shown
+---in the UI but can be omitted.
+---@field documentation? string|lsp.MarkupContent
+---The parameters of this signature.
+---@field parameters? lsp.ParameterInformation[]
+---The index of the active parameter.
+---
+---If provided, this is used in place of `SignatureHelp.activeParameter`.
+---
+---@since 3.16.0
+---@field activeParameter? uinteger
+
+---Server Capabilities for a {@link SignatureHelpRequest}.
+---@class lsp.SignatureHelpOptions
+---List of characters that trigger signature help automatically.
+---@field triggerCharacters? string[]
+---List of characters that re-trigger signature help.
+---
+---These trigger characters are only active when signature help is already showing. All trigger characters
+---are also counted as re-trigger characters.
+---
+---@since 3.15.0
+---@field retriggerCharacters? string[]
+
+---Server Capabilities for a {@link DefinitionRequest}.
+---@class lsp.DefinitionOptions
+
+---Value-object that contains additional information when
+---requesting references.
+---@class lsp.ReferenceContext
+---Include the declaration of the current symbol.
+---@field includeDeclaration boolean
+
+---Reference options.
+---@class lsp.ReferenceOptions
+
+---Provider options for a {@link DocumentHighlightRequest}.
+---@class lsp.DocumentHighlightOptions
+
+---A base for all symbol information.
+---@class lsp.BaseSymbolInformation
+---The name of this symbol.
+---@field name string
+---The kind of this symbol.
+---@field kind lsp.SymbolKind
+---Tags for this symbol.
+---
+---@since 3.16.0
+---@field tags? lsp.SymbolTag[]
+---The name of the symbol containing this symbol. This information is for
+---user interface purposes (e.g. to render a qualifier in the user interface
+---if necessary). It can't be used to re-infer a hierarchy for the document
+---symbols.
+---@field containerName? string
+
+---Provider options for a {@link DocumentSymbolRequest}.
+---@class lsp.DocumentSymbolOptions
+---A human-readable string that is shown when multiple outlines trees
+---are shown for the same document.
+---
+---@since 3.16.0
+---@field label? string
+
+---Contains additional diagnostic information about the context in which
+---a {@link CodeActionProvider.provideCodeActions code action} is run.
+---@class lsp.CodeActionContext
+---An array of diagnostics known on the client side overlapping the range provided to the
+---`textDocument/codeAction` request. They are provided so that the server knows which
+---errors are currently presented to the user for the given range. There is no guarantee
+---that these accurately reflect the error state of the resource. The primary parameter
+---to compute code actions is the provided range.
+---@field diagnostics lsp.Diagnostic[]
+---Requested kind of actions to return.
+---
+---Actions not of this kind are filtered out by the client before being shown. So servers
+---can omit computing them.
+---@field only? lsp.CodeActionKind[]
+---The reason why code actions were requested.
+---
+---@since 3.17.0
+---@field triggerKind? lsp.CodeActionTriggerKind
+
+---Provider options for a {@link CodeActionRequest}.
+---@class lsp.CodeActionOptions
+---CodeActionKinds that this server may return.
+---
+---The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the server
+---may list out every specific kind they provide.
+---@field codeActionKinds? lsp.CodeActionKind[]
+---The server provides support to resolve additional
+---information for a code action.
+---
+---@since 3.16.0
+---@field resolveProvider? boolean
+
+---Server capabilities for a {@link WorkspaceSymbolRequest}.
+---@class lsp.WorkspaceSymbolOptions
+---The server provides support to resolve additional
+---information for a workspace symbol.
+---
+---@since 3.17.0
+---@field resolveProvider? boolean
+
+---Code Lens provider options of a {@link CodeLensRequest}.
+---@class lsp.CodeLensOptions
+---Code lens has a resolve provider as well.
+---@field resolveProvider? boolean
+
+---Provider options for a {@link DocumentLinkRequest}.
+---@class lsp.DocumentLinkOptions
+---Document links have a resolve provider as well.
+---@field resolveProvider? boolean
+
+---Value-object describing what options formatting should use.
+---@class lsp.FormattingOptions
+---Size of a tab in spaces.
+---@field tabSize uinteger
+---Prefer spaces over tabs.
+---@field insertSpaces boolean
+---Trim trailing whitespace on a line.
+---
+---@since 3.15.0
+---@field trimTrailingWhitespace? boolean
+---Insert a newline character at the end of the file if one does not exist.
+---
+---@since 3.15.0
+---@field insertFinalNewline? boolean
+---Trim all newlines after the final newline at the end of the file.
+---
+---@since 3.15.0
+---@field trimFinalNewlines? boolean
+
+---Provider options for a {@link DocumentFormattingRequest}.
+---@class lsp.DocumentFormattingOptions
+
+---Provider options for a {@link DocumentRangeFormattingRequest}.
+---@class lsp.DocumentRangeFormattingOptions
+---Whether the server supports formatting multiple ranges at once.
+---
+---@since 3.18.0
+---@proposed
+---@field rangesSupport? boolean
+
+---Provider options for a {@link DocumentOnTypeFormattingRequest}.
+---@class lsp.DocumentOnTypeFormattingOptions
+---A character on which formatting should be triggered, like `{`.
+---@field firstTriggerCharacter string
+---More trigger characters.
+---@field moreTriggerCharacter? string[]
+
+---Provider options for a {@link RenameRequest}.
+---@class lsp.RenameOptions
+---Renames should be checked and tested before being executed.
+---
+---@since version 3.12.0
+---@field prepareProvider? boolean
+
+---The server capabilities of a {@link ExecuteCommandRequest}.
+---@class lsp.ExecuteCommandOptions
+---The commands to be executed on the server
+---@field commands string[]
+
+---@since 3.16.0
+---@class lsp.SemanticTokensLegend
+---The token types a server uses.
+---@field tokenTypes string[]
+---The token modifiers a server uses.
+---@field tokenModifiers string[]
+
+---A text document identifier to optionally denote a specific version of a text document.
+---@class lsp.OptionalVersionedTextDocumentIdentifier: lsp.TextDocumentIdentifier
+---The version number of this document. If a versioned text document identifier
+---is sent from the server to the client and the file is not open in the editor
+---(the server has not received an open notification before) the server can send
+---`null` to indicate that the version is unknown and the content on disk is the
+---truth (as specified with document content ownership).
+---@field version integer|lsp.null
+
+---A special text edit with an additional change annotation.
+---
+---@since 3.16.0.
+---@class lsp.AnnotatedTextEdit: lsp.TextEdit
+---The actual identifier of the change annotation
+---@field annotationId lsp.ChangeAnnotationIdentifier
+
+---A generic resource operation.
+---@class lsp.ResourceOperation
+---The resource operation kind.
+---@field kind string
+---An optional annotation identifier describing the operation.
+---
+---@since 3.16.0
+---@field annotationId? lsp.ChangeAnnotationIdentifier
+
+---Options to create a file.
+---@class lsp.CreateFileOptions
+---Overwrite existing file. Overwrite wins over `ignoreIfExists`
+---@field overwrite? boolean
+---Ignore if exists.
+---@field ignoreIfExists? boolean
+
+---Rename file options
+---@class lsp.RenameFileOptions
+---Overwrite target if existing. Overwrite wins over `ignoreIfExists`
+---@field overwrite? boolean
+---Ignores if target exists.
+---@field ignoreIfExists? boolean
+
+---Delete file options
+---@class lsp.DeleteFileOptions
+---Delete the content recursively if a folder is denoted.
+---@field recursive? boolean
+---Ignore the operation if the file doesn't exist.
+---@field ignoreIfNotExists? boolean
+
+---A pattern to describe in which file operation requests or notifications
+---the server is interested in receiving.
+---
+---@since 3.16.0
+---@class lsp.FileOperationPattern
+---The glob pattern to match. Glob patterns can have the following syntax:
+---- `*` to match one or more characters in a path segment
+---- `?` to match on one character in a path segment
+---- `**` to match any number of path segments, including none
+---- `{}` to group sub patterns into an OR expression. (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+---- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+---- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+---@field glob string
+---Whether to match files or folders with this pattern.
+---
+---Matches both if undefined.
+---@field matches? lsp.FileOperationPatternKind
+---Additional options used during matching.
+---@field options? lsp.FileOperationPatternOptions
+
+---A full document diagnostic report for a workspace diagnostic result.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceFullDocumentDiagnosticReport: lsp.FullDocumentDiagnosticReport
+---The URI for which diagnostic information is reported.
+---@field uri lsp.DocumentUri
+---The version number for which the diagnostics are reported.
+---If the document is not marked as open `null` can be provided.
+---@field version integer|lsp.null
+
+---An unchanged document diagnostic report for a workspace diagnostic result.
+---
+---@since 3.17.0
+---@class lsp.WorkspaceUnchangedDocumentDiagnosticReport: lsp.UnchangedDocumentDiagnosticReport
+---The URI for which diagnostic information is reported.
+---@field uri lsp.DocumentUri
+---The version number for which the diagnostics are reported.
+---If the document is not marked as open `null` can be provided.
+---@field version integer|lsp.null
+
+---A notebook cell.
+---
+---A cell's document URI must be unique across ALL notebook
+---cells and can therefore be used to uniquely identify a
+---notebook cell or the cell's text document.
+---
+---@since 3.17.0
+---@class lsp.NotebookCell
+---The cell's kind
+---@field kind lsp.NotebookCellKind
+---The URI of the cell's text document
+---content.
+---@field document lsp.DocumentUri
+---Additional metadata stored with the cell.
+---
+---Note: should always be an object literal (e.g. LSPObject)
+---@field metadata? lsp.LSPObject
+---Additional execution summary information
+---if supported by the client.
+---@field executionSummary? lsp.ExecutionSummary
+
+---A change describing how to move a `NotebookCell`
+---array from state S to S'.
+---
+---@since 3.17.0
+---@class lsp.NotebookCellArrayChange
+---The start oftest of the cell that changed.
+---@field start uinteger
+---The deleted cells
+---@field deleteCount uinteger
+---The new cells, if any
+---@field cells? lsp.NotebookCell[]
+
+---Describes the currently selected completion item.
+---
+---@since 3.18.0
+---@class lsp.SelectedCompletionInfo
+---The range that will be replaced if this completion item is accepted.
+---@field range lsp.Range
+---The text the range will be replaced with if this completion is accepted.
+---@field text string
+
+---Defines the capabilities provided by the client.
+---@class lsp.ClientCapabilities
+---Workspace specific client capabilities.
+---@field workspace? lsp.WorkspaceClientCapabilities
+---Text document specific client capabilities.
+---@field textDocument? lsp.TextDocumentClientCapabilities
+---Capabilities specific to the notebook document support.
+---
+---@since 3.17.0
+---@field notebookDocument? lsp.NotebookDocumentClientCapabilities
+---Window specific client capabilities.
+---@field window? lsp.WindowClientCapabilities
+---General client capabilities.
+---
+---@since 3.16.0
+---@field general? lsp.GeneralClientCapabilities
+---Experimental client capabilities.
+---@field experimental? lsp.LSPAny
+
+---@class lsp.TextDocumentSyncOptions
+---Open and close notifications are sent to the server. If omitted open close notification should not
+---be sent.
+---@field openClose? boolean
+---Change notifications are sent to the server. See TextDocumentSyncKind.None, TextDocumentSyncKind.Full
+---and TextDocumentSyncKind.Incremental. If omitted it defaults to TextDocumentSyncKind.None.
+---@field change? lsp.TextDocumentSyncKind
+---If present will save notifications are sent to the server. If omitted the notification should not be
+---sent.
+---@field willSave? boolean
+---If present will save wait until requests are sent to the server. If omitted the request should not be
+---sent.
+---@field willSaveWaitUntil? boolean
+---If present save notifications are sent to the server. If omitted the notification should not be
+---sent.
+---@field save? boolean|lsp.SaveOptions
+
+---Options specific to a notebook plus its cells
+---to be synced to the server.
+---
+---If a selector provides a notebook document
+---filter but no cell selector all cells of a
+---matching notebook document will be synced.
+---
+---If a selector provides no notebook document
+---filter but only a cell selector all notebook
+---document that contain at least one matching
+---cell will be synced.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentSyncOptions
+---The notebooks to be synced
+---@field notebookSelector anonym15|anonym17[]
+---Whether save notification should be forwarded to
+---the server. Will only be honored if mode === `notebook`.
+---@field save? boolean
+
+---Registration options specific to a notebook.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentSyncRegistrationOptions: lsp.NotebookDocumentSyncOptions, lsp.StaticRegistrationOptions
+
+---@class lsp.WorkspaceFoldersServerCapabilities
+---The server has support for workspace folders
+---@field supported? boolean
+---Whether the server wants to receive workspace folder
+---change notifications.
+---
+---If a string is provided the string is treated as an ID
+---under which the notification is registered on the client
+---side. The ID can be used to unregister for these events
+---using the `client/unregisterCapability` request.
+---@field changeNotifications? string|boolean
+
+---Options for notifications/requests for user operations on files.
+---
+---@since 3.16.0
+---@class lsp.FileOperationOptions
+---The server is interested in receiving didCreateFiles notifications.
+---@field didCreate? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving willCreateFiles requests.
+---@field willCreate? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving didRenameFiles notifications.
+---@field didRename? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving willRenameFiles requests.
+---@field willRename? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving didDeleteFiles file notifications.
+---@field didDelete? lsp.FileOperationRegistrationOptions
+---The server is interested in receiving willDeleteFiles file requests.
+---@field willDelete? lsp.FileOperationRegistrationOptions
+
+---Structure to capture a description for an error code.
+---
+---@since 3.16.0
+---@class lsp.CodeDescription
+---An URI to open with more information about the diagnostic error.
+---@field href lsp.URI
+
+---Represents a related message and source code location for a diagnostic. This should be
+---used to point to code locations that cause or related to a diagnostics, e.g when duplicating
+---a symbol in a scope.
+---@class lsp.DiagnosticRelatedInformation
+---The location of this related diagnostic information.
+---@field location lsp.Location
+---The message of this related diagnostic information.
+---@field message string
+
+---Represents a parameter of a callable-signature. A parameter can
+---have a label and a doc-comment.
+---@class lsp.ParameterInformation
+---The label of this parameter information.
+---
+---Either a string or an inclusive start and exclusive end offsets within its containing
+---signature label. (see SignatureInformation.label). The offsets are based on a UTF-16
+---string representation as `Position` and `Range` does.
+---
+---*Note*: a label of type string should be a substring of its containing signature label.
+---Its intended use case is to highlight the parameter label part in the `SignatureInformation.label`.
+---@field label string|{ [1]: uinteger, [2]: uinteger }
+---The human-readable doc-comment of this parameter. Will be shown
+---in the UI but can be omitted.
+---@field documentation? string|lsp.MarkupContent
+
+---A notebook cell text document filter denotes a cell text
+---document by different properties.
+---
+---@since 3.17.0
+---@class lsp.NotebookCellTextDocumentFilter
+---A filter that matches against the notebook
+---containing the notebook cell. If a string
+---value is provided it matches against the
+---notebook type. '*' matches every notebook.
+---@field notebook string|lsp.NotebookDocumentFilter
+---A language id like `python`.
+---
+---Will be matched against the language id of the
+---notebook cell document. '*' matches every language.
+---@field language? string
+
+---Matching options for the file operation pattern.
+---
+---@since 3.16.0
+---@class lsp.FileOperationPatternOptions
+---The pattern should be matched ignoring casing.
+---@field ignoreCase? boolean
+
+---@class lsp.ExecutionSummary
+---A strict monotonically increasing value
+---indicating the execution order of a cell
+---inside a notebook.
+---@field executionOrder uinteger
+---Whether the execution was successful or
+---not if known by the client.
+---@field success? boolean
+
+---Workspace specific client capabilities.
+---@class lsp.WorkspaceClientCapabilities
+---The client supports applying batch edits
+---to the workspace by supporting the request
+---'workspace/applyEdit'
+---@field applyEdit? boolean
+---Capabilities specific to `WorkspaceEdit`s.
+---@field workspaceEdit? lsp.WorkspaceEditClientCapabilities
+---Capabilities specific to the `workspace/didChangeConfiguration` notification.
+---@field didChangeConfiguration? lsp.DidChangeConfigurationClientCapabilities
+---Capabilities specific to the `workspace/didChangeWatchedFiles` notification.
+---@field didChangeWatchedFiles? lsp.DidChangeWatchedFilesClientCapabilities
+---Capabilities specific to the `workspace/symbol` request.
+---@field symbol? lsp.WorkspaceSymbolClientCapabilities
+---Capabilities specific to the `workspace/executeCommand` request.
+---@field executeCommand? lsp.ExecuteCommandClientCapabilities
+---The client has support for workspace folders.
+---
+---@since 3.6.0
+---@field workspaceFolders? boolean
+---The client supports `workspace/configuration` requests.
+---
+---@since 3.6.0
+---@field configuration? boolean
+---Capabilities specific to the semantic token requests scoped to the
+---workspace.
+---
+---@since 3.16.0.
+---@field semanticTokens? lsp.SemanticTokensWorkspaceClientCapabilities
+---Capabilities specific to the code lens requests scoped to the
+---workspace.
+---
+---@since 3.16.0.
+---@field codeLens? lsp.CodeLensWorkspaceClientCapabilities
+---The client has support for file notifications/requests for user operations on files.
+---
+---Since 3.16.0
+---@field fileOperations? lsp.FileOperationClientCapabilities
+---Capabilities specific to the inline values requests scoped to the
+---workspace.
+---
+---@since 3.17.0.
+---@field inlineValue? lsp.InlineValueWorkspaceClientCapabilities
+---Capabilities specific to the inlay hint requests scoped to the
+---workspace.
+---
+---@since 3.17.0.
+---@field inlayHint? lsp.InlayHintWorkspaceClientCapabilities
+---Capabilities specific to the diagnostic requests scoped to the
+---workspace.
+---
+---@since 3.17.0.
+---@field diagnostics? lsp.DiagnosticWorkspaceClientCapabilities
+
+---Text document specific client capabilities.
+---@class lsp.TextDocumentClientCapabilities
+---Defines which synchronization capabilities the client supports.
+---@field synchronization? lsp.TextDocumentSyncClientCapabilities
+---Capabilities specific to the `textDocument/completion` request.
+---@field completion? lsp.CompletionClientCapabilities
+---Capabilities specific to the `textDocument/hover` request.
+---@field hover? lsp.HoverClientCapabilities
+---Capabilities specific to the `textDocument/signatureHelp` request.
+---@field signatureHelp? lsp.SignatureHelpClientCapabilities
+---Capabilities specific to the `textDocument/declaration` request.
+---
+---@since 3.14.0
+---@field declaration? lsp.DeclarationClientCapabilities
+---Capabilities specific to the `textDocument/definition` request.
+---@field definition? lsp.DefinitionClientCapabilities
+---Capabilities specific to the `textDocument/typeDefinition` request.
+---
+---@since 3.6.0
+---@field typeDefinition? lsp.TypeDefinitionClientCapabilities
+---Capabilities specific to the `textDocument/implementation` request.
+---
+---@since 3.6.0
+---@field implementation? lsp.ImplementationClientCapabilities
+---Capabilities specific to the `textDocument/references` request.
+---@field references? lsp.ReferenceClientCapabilities
+---Capabilities specific to the `textDocument/documentHighlight` request.
+---@field documentHighlight? lsp.DocumentHighlightClientCapabilities
+---Capabilities specific to the `textDocument/documentSymbol` request.
+---@field documentSymbol? lsp.DocumentSymbolClientCapabilities
+---Capabilities specific to the `textDocument/codeAction` request.
+---@field codeAction? lsp.CodeActionClientCapabilities
+---Capabilities specific to the `textDocument/codeLens` request.
+---@field codeLens? lsp.CodeLensClientCapabilities
+---Capabilities specific to the `textDocument/documentLink` request.
+---@field documentLink? lsp.DocumentLinkClientCapabilities
+---Capabilities specific to the `textDocument/documentColor` and the
+---`textDocument/colorPresentation` request.
+---
+---@since 3.6.0
+---@field colorProvider? lsp.DocumentColorClientCapabilities
+---Capabilities specific to the `textDocument/formatting` request.
+---@field formatting? lsp.DocumentFormattingClientCapabilities
+---Capabilities specific to the `textDocument/rangeFormatting` request.
+---@field rangeFormatting? lsp.DocumentRangeFormattingClientCapabilities
+---Capabilities specific to the `textDocument/onTypeFormatting` request.
+---@field onTypeFormatting? lsp.DocumentOnTypeFormattingClientCapabilities
+---Capabilities specific to the `textDocument/rename` request.
+---@field rename? lsp.RenameClientCapabilities
+---Capabilities specific to the `textDocument/foldingRange` request.
+---
+---@since 3.10.0
+---@field foldingRange? lsp.FoldingRangeClientCapabilities
+---Capabilities specific to the `textDocument/selectionRange` request.
+---
+---@since 3.15.0
+---@field selectionRange? lsp.SelectionRangeClientCapabilities
+---Capabilities specific to the `textDocument/publishDiagnostics` notification.
+---@field publishDiagnostics? lsp.PublishDiagnosticsClientCapabilities
+---Capabilities specific to the various call hierarchy requests.
+---
+---@since 3.16.0
+---@field callHierarchy? lsp.CallHierarchyClientCapabilities
+---Capabilities specific to the various semantic token request.
+---
+---@since 3.16.0
+---@field semanticTokens? lsp.SemanticTokensClientCapabilities
+---Capabilities specific to the `textDocument/linkedEditingRange` request.
+---
+---@since 3.16.0
+---@field linkedEditingRange? lsp.LinkedEditingRangeClientCapabilities
+---Client capabilities specific to the `textDocument/moniker` request.
+---
+---@since 3.16.0
+---@field moniker? lsp.MonikerClientCapabilities
+---Capabilities specific to the various type hierarchy requests.
+---
+---@since 3.17.0
+---@field typeHierarchy? lsp.TypeHierarchyClientCapabilities
+---Capabilities specific to the `textDocument/inlineValue` request.
+---
+---@since 3.17.0
+---@field inlineValue? lsp.InlineValueClientCapabilities
+---Capabilities specific to the `textDocument/inlayHint` request.
+---
+---@since 3.17.0
+---@field inlayHint? lsp.InlayHintClientCapabilities
+---Capabilities specific to the diagnostic pull model.
+---
+---@since 3.17.0
+---@field diagnostic? lsp.DiagnosticClientCapabilities
+---Client capabilities specific to inline completions.
+---
+---@since 3.18.0
+---@field inlineCompletion? lsp.InlineCompletionClientCapabilities
+
+---Capabilities specific to the notebook document support.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentClientCapabilities
+---Capabilities specific to notebook document synchronization
+---
+---@since 3.17.0
+---@field synchronization lsp.NotebookDocumentSyncClientCapabilities
+
+---@class lsp.WindowClientCapabilities
+---It indicates whether the client supports server initiated
+---progress using the `window/workDoneProgress/create` request.
+---
+---The capability also controls Whether client supports handling
+---of progress notifications. If set servers are allowed to report a
+---`workDoneProgress` property in the request specific server
+---capabilities.
+---
+---@since 3.15.0
+---@field workDoneProgress? boolean
+---Capabilities specific to the showMessage request.
+---
+---@since 3.16.0
+---@field showMessage? lsp.ShowMessageRequestClientCapabilities
+---Capabilities specific to the showDocument request.
+---
+---@since 3.16.0
+---@field showDocument? lsp.ShowDocumentClientCapabilities
+
+---General client capabilities.
+---
+---@since 3.16.0
+---@class lsp.GeneralClientCapabilities
+---Client capability that signals how the client
+---handles stale requests (e.g. a request
+---for which the client will not process the response
+---anymore since the information is outdated).
+---
+---@since 3.17.0
+---@field staleRequestSupport? anonym18
+---Client capabilities specific to regular expressions.
+---
+---@since 3.16.0
+---@field regularExpressions? lsp.RegularExpressionsClientCapabilities
+---Client capabilities specific to the client's markdown parser.
+---
+---@since 3.16.0
+---@field markdown? lsp.MarkdownClientCapabilities
+---The position encodings supported by the client. Client and server
+---have to agree on the same position encoding to ensure that offsets
+---(e.g. character position in a line) are interpreted the same on both
+---sides.
+---
+---To keep the protocol backwards compatible the following applies: if
+---the value 'utf-16' is missing from the array of position encodings
+---servers can assume that the client supports UTF-16. UTF-16 is
+---therefore a mandatory encoding.
+---
+---If omitted it defaults to ['utf-16'].
+---
+---Implementation considerations: since the conversion from one encoding
+---into another requires the content of the file / line the conversion
+---is best done where the file is read which is usually on the server
+---side.
+---
+---@since 3.17.0
+---@field positionEncodings? lsp.PositionEncodingKind[]
+
+---A relative pattern is a helper to construct glob patterns that are matched
+---relatively to a base URI. The common value for a `baseUri` is a workspace
+---folder root, but it can be another absolute URI as well.
+---
+---@since 3.17.0
+---@class lsp.RelativePattern
+---A workspace folder or a base URI to which this pattern will be matched
+---against relatively.
+---@field baseUri lsp.WorkspaceFolder|lsp.URI
+---The actual glob pattern;
+---@field pattern lsp.Pattern
+
+---@class lsp.WorkspaceEditClientCapabilities
+---The client supports versioned document changes in `WorkspaceEdit`s
+---@field documentChanges? boolean
+---The resource operations the client supports. Clients should at least
+---support 'create', 'rename' and 'delete' files and folders.
+---
+---@since 3.13.0
+---@field resourceOperations? lsp.ResourceOperationKind[]
+---The failure handling strategy of a client if applying the workspace edit
+---fails.
+---
+---@since 3.13.0
+---@field failureHandling? lsp.FailureHandlingKind
+---Whether the client normalizes line endings to the client specific
+---setting.
+---If set to `true` the client will normalize line ending characters
+---in a workspace edit to the client-specified new line
+---character.
+---
+---@since 3.16.0
+---@field normalizesLineEndings? boolean
+---Whether the client in general supports change annotations on text edits,
+---create file, rename file and delete file changes.
+---
+---@since 3.16.0
+---@field changeAnnotationSupport? anonym19
+
+---@class lsp.DidChangeConfigurationClientCapabilities
+---Did change configuration notification supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---@class lsp.DidChangeWatchedFilesClientCapabilities
+---Did change watched files notification supports dynamic registration. Please note
+---that the current protocol doesn't support static configuration for file changes
+---from the server side.
+---@field dynamicRegistration? boolean
+---Whether the client has support for {@link  RelativePattern relative pattern}
+---or not.
+---
+---@since 3.17.0
+---@field relativePatternSupport? boolean
+
+---Client capabilities for a {@link WorkspaceSymbolRequest}.
+---@class lsp.WorkspaceSymbolClientCapabilities
+---Symbol request supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
+---@field symbolKind? anonym20
+---The client supports tags on `SymbolInformation`.
+---Clients supporting tags have to handle unknown tags gracefully.
+---
+---@since 3.16.0
+---@field tagSupport? anonym21
+---The client support partial workspace symbols. The client will send the
+---request `workspaceSymbol/resolve` to the server to resolve additional
+---properties.
+---
+---@since 3.17.0
+---@field resolveSupport? anonym22
+
+---The client capabilities of a {@link ExecuteCommandRequest}.
+---@class lsp.ExecuteCommandClientCapabilities
+---Execute command supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---@since 3.16.0
+---@class lsp.SemanticTokensWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from
+---the server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---semantic tokens currently shown. It should be used with absolute care
+---and is useful for situation where a server for example detects a project
+---wide change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---@since 3.16.0
+---@class lsp.CodeLensWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from the
+---server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---code lenses currently shown. It should be used with absolute care and is
+---useful for situation where a server for example detect a project wide
+---change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---Capabilities relating to events from file operations by the user in the client.
+---
+---These events do not come from the file system, they come from user operations
+---like renaming a file in the UI.
+---
+---@since 3.16.0
+---@class lsp.FileOperationClientCapabilities
+---Whether the client supports dynamic registration for file requests/notifications.
+---@field dynamicRegistration? boolean
+---The client has support for sending didCreateFiles notifications.
+---@field didCreate? boolean
+---The client has support for sending willCreateFiles requests.
+---@field willCreate? boolean
+---The client has support for sending didRenameFiles notifications.
+---@field didRename? boolean
+---The client has support for sending willRenameFiles requests.
+---@field willRename? boolean
+---The client has support for sending didDeleteFiles notifications.
+---@field didDelete? boolean
+---The client has support for sending willDeleteFiles requests.
+---@field willDelete? boolean
+
+---Client workspace capabilities specific to inline values.
+---
+---@since 3.17.0
+---@class lsp.InlineValueWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from the
+---server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---inline values currently shown. It should be used with absolute care and is
+---useful for situation where a server for example detects a project wide
+---change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---Client workspace capabilities specific to inlay hints.
+---
+---@since 3.17.0
+---@class lsp.InlayHintWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from
+---the server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---inlay hints currently shown. It should be used with absolute care and
+---is useful for situation where a server for example detects a project wide
+---change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---Workspace client capabilities specific to diagnostic pull requests.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticWorkspaceClientCapabilities
+---Whether the client implementation supports a refresh request sent from
+---the server to the client.
+---
+---Note that this event is global and will force the client to refresh all
+---pulled diagnostics currently shown. It should be used with absolute care and
+---is useful for situation where a server for example detects a project wide
+---change that requires such a calculation.
+---@field refreshSupport? boolean
+
+---@class lsp.TextDocumentSyncClientCapabilities
+---Whether text document synchronization supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client supports sending will save notifications.
+---@field willSave? boolean
+---The client supports sending a will save request and
+---waits for a response providing text edits which will
+---be applied to the document before it is saved.
+---@field willSaveWaitUntil? boolean
+---The client supports did save notifications.
+---@field didSave? boolean
+
+---Completion client capabilities
+---@class lsp.CompletionClientCapabilities
+---Whether completion supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client supports the following `CompletionItem` specific
+---capabilities.
+---@field completionItem? anonym26
+---@field completionItemKind? anonym27
+---Defines how the client handles whitespace and indentation
+---when accepting a completion item that uses multi line
+---text in either `insertText` or `textEdit`.
+---
+---@since 3.17.0
+---@field insertTextMode? lsp.InsertTextMode
+---The client supports to send additional context information for a
+---`textDocument/completion` request.
+---@field contextSupport? boolean
+---The client supports the following `CompletionList` specific
+---capabilities.
+---
+---@since 3.17.0
+---@field completionList? anonym28
+
+---@class lsp.HoverClientCapabilities
+---Whether hover supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Client supports the following content formats for the content
+---property. The order describes the preferred format of the client.
+---@field contentFormat? lsp.MarkupKind[]
+
+---Client Capabilities for a {@link SignatureHelpRequest}.
+---@class lsp.SignatureHelpClientCapabilities
+---Whether signature help supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client supports the following `SignatureInformation`
+---specific properties.
+---@field signatureInformation? anonym30
+---The client supports to send additional context information for a
+---`textDocument/signatureHelp` request. A client that opts into
+---contextSupport will also support the `retriggerCharacters` on
+---`SignatureHelpOptions`.
+---
+---@since 3.15.0
+---@field contextSupport? boolean
+
+---@since 3.14.0
+---@class lsp.DeclarationClientCapabilities
+---Whether declaration supports dynamic registration. If this is set to `true`
+---the client supports the new `DeclarationRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---The client supports additional metadata in the form of declaration links.
+---@field linkSupport? boolean
+
+---Client Capabilities for a {@link DefinitionRequest}.
+---@class lsp.DefinitionClientCapabilities
+---Whether definition supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client supports additional metadata in the form of definition links.
+---
+---@since 3.14.0
+---@field linkSupport? boolean
+
+---Since 3.6.0
+---@class lsp.TypeDefinitionClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `TypeDefinitionRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---The client supports additional metadata in the form of definition links.
+---
+---Since 3.14.0
+---@field linkSupport? boolean
+
+---@since 3.6.0
+---@class lsp.ImplementationClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `ImplementationRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---The client supports additional metadata in the form of definition links.
+---
+---@since 3.14.0
+---@field linkSupport? boolean
+
+---Client Capabilities for a {@link ReferencesRequest}.
+---@class lsp.ReferenceClientCapabilities
+---Whether references supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---Client Capabilities for a {@link DocumentHighlightRequest}.
+---@class lsp.DocumentHighlightClientCapabilities
+---Whether document highlight supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---Client Capabilities for a {@link DocumentSymbolRequest}.
+---@class lsp.DocumentSymbolClientCapabilities
+---Whether document symbol supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Specific capabilities for the `SymbolKind` in the
+---`textDocument/documentSymbol` request.
+---@field symbolKind? anonym31
+---The client supports hierarchical document symbols.
+---@field hierarchicalDocumentSymbolSupport? boolean
+---The client supports tags on `SymbolInformation`. Tags are supported on
+---`DocumentSymbol` if `hierarchicalDocumentSymbolSupport` is set to true.
+---Clients supporting tags have to handle unknown tags gracefully.
+---
+---@since 3.16.0
+---@field tagSupport? anonym32
+---The client supports an additional label presented in the UI when
+---registering a document symbol provider.
+---
+---@since 3.16.0
+---@field labelSupport? boolean
+
+---The Client Capabilities of a {@link CodeActionRequest}.
+---@class lsp.CodeActionClientCapabilities
+---Whether code action supports dynamic registration.
+---@field dynamicRegistration? boolean
+---The client support code action literals of type `CodeAction` as a valid
+---response of the `textDocument/codeAction` request. If the property is not
+---set the request can only return `Command` literals.
+---
+---@since 3.8.0
+---@field codeActionLiteralSupport? anonym34
+---Whether code action supports the `isPreferred` property.
+---
+---@since 3.15.0
+---@field isPreferredSupport? boolean
+---Whether code action supports the `disabled` property.
+---
+---@since 3.16.0
+---@field disabledSupport? boolean
+---Whether code action supports the `data` property which is
+---preserved between a `textDocument/codeAction` and a
+---`codeAction/resolve` request.
+---
+---@since 3.16.0
+---@field dataSupport? boolean
+---Whether the client supports resolving additional code action
+---properties via a separate `codeAction/resolve` request.
+---
+---@since 3.16.0
+---@field resolveSupport? anonym35
+---Whether the client honors the change annotations in
+---text edits and resource operations returned via the
+---`CodeAction#edit` property by for example presenting
+---the workspace edit in the user interface and asking
+---for confirmation.
+---
+---@since 3.16.0
+---@field honorsChangeAnnotations? boolean
+
+---The client capabilities  of a {@link CodeLensRequest}.
+---@class lsp.CodeLensClientCapabilities
+---Whether code lens supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---The client capabilities of a {@link DocumentLinkRequest}.
+---@class lsp.DocumentLinkClientCapabilities
+---Whether document link supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Whether the client supports the `tooltip` property on `DocumentLink`.
+---
+---@since 3.15.0
+---@field tooltipSupport? boolean
+
+---@class lsp.DocumentColorClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `DocumentColorRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---Client capabilities of a {@link DocumentFormattingRequest}.
+---@class lsp.DocumentFormattingClientCapabilities
+---Whether formatting supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---Client capabilities of a {@link DocumentRangeFormattingRequest}.
+---@class lsp.DocumentRangeFormattingClientCapabilities
+---Whether range formatting supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Whether the client supports formatting multiple ranges at once.
+---
+---@since 3.18.0
+---@proposed
+---@field rangesSupport? boolean
+
+---Client capabilities of a {@link DocumentOnTypeFormattingRequest}.
+---@class lsp.DocumentOnTypeFormattingClientCapabilities
+---Whether on type formatting supports dynamic registration.
+---@field dynamicRegistration? boolean
+
+---@class lsp.RenameClientCapabilities
+---Whether rename supports dynamic registration.
+---@field dynamicRegistration? boolean
+---Client supports testing for validity of rename operations
+---before execution.
+---
+---@since 3.12.0
+---@field prepareSupport? boolean
+---Client supports the default behavior result.
+---
+---The value indicates the default behavior used by the
+---client.
+---
+---@since 3.16.0
+---@field prepareSupportDefaultBehavior? lsp.PrepareSupportDefaultBehavior
+---Whether the client honors the change annotations in
+---text edits and resource operations returned via the
+---rename request's workspace edit by for example presenting
+---the workspace edit in the user interface and asking
+---for confirmation.
+---
+---@since 3.16.0
+---@field honorsChangeAnnotations? boolean
+
+---@class lsp.FoldingRangeClientCapabilities
+---Whether implementation supports dynamic registration for folding range
+---providers. If this is set to `true` the client supports the new
+---`FoldingRangeRegistrationOptions` return value for the corresponding
+---server capability as well.
+---@field dynamicRegistration? boolean
+---The maximum number of folding ranges that the client prefers to receive
+---per document. The value serves as a hint, servers are free to follow the
+---limit.
+---@field rangeLimit? uinteger
+---If set, the client signals that it only supports folding complete lines.
+---If set, client will ignore specified `startCharacter` and `endCharacter`
+---properties in a FoldingRange.
+---@field lineFoldingOnly? boolean
+---Specific options for the folding range kind.
+---
+---@since 3.17.0
+---@field foldingRangeKind? anonym36
+---Specific options for the folding range.
+---
+---@since 3.17.0
+---@field foldingRange? anonym37
+
+---@class lsp.SelectionRangeClientCapabilities
+---Whether implementation supports dynamic registration for selection range providers. If this is set to `true`
+---the client supports the new `SelectionRangeRegistrationOptions` return value for the corresponding server
+---capability as well.
+---@field dynamicRegistration? boolean
+
+---The publish diagnostic client capabilities.
+---@class lsp.PublishDiagnosticsClientCapabilities
+---Whether the clients accepts diagnostics with related information.
+---@field relatedInformation? boolean
+---Client supports the tag property to provide meta data about a diagnostic.
+---Clients supporting tags have to handle unknown tags gracefully.
+---
+---@since 3.15.0
+---@field tagSupport? anonym38
+---Whether the client interprets the version property of the
+---`textDocument/publishDiagnostics` notification's parameter.
+---
+---@since 3.15.0
+---@field versionSupport? boolean
+---Client supports a codeDescription property
+---
+---@since 3.16.0
+---@field codeDescriptionSupport? boolean
+---Whether code action supports the `data` property which is
+---preserved between a `textDocument/publishDiagnostics` and
+---`textDocument/codeAction` request.
+---
+---@since 3.16.0
+---@field dataSupport? boolean
+
+---@since 3.16.0
+---@class lsp.CallHierarchyClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---@since 3.16.0
+---@class lsp.SemanticTokensClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---Which requests the client supports and might send to the server
+---depending on the server's capability. Please note that clients might not
+---show semantic tokens or degrade some of the user experience if a range
+---or full request is advertised by the client but not provided by the
+---server. If for example the client capability `requests.full` and
+---`request.range` are both set to true but the server only provides a
+---range provider the client might not render a minimap correctly or might
+---even decide to not show any semantic tokens at all.
+---@field requests anonym41
+---The token types that the client supports.
+---@field tokenTypes string[]
+---The token modifiers that the client supports.
+---@field tokenModifiers string[]
+---The token formats the clients supports.
+---@field formats lsp.TokenFormat[]
+---Whether the client supports tokens that can overlap each other.
+---@field overlappingTokenSupport? boolean
+---Whether the client supports tokens that can span multiple lines.
+---@field multilineTokenSupport? boolean
+---Whether the client allows the server to actively cancel a
+---semantic token request, e.g. supports returning
+---LSPErrorCodes.ServerCancelled. If a server does the client
+---needs to retrigger the request.
+---
+---@since 3.17.0
+---@field serverCancelSupport? boolean
+---Whether the client uses semantic tokens to augment existing
+---syntax tokens. If set to `true` client side created syntax
+---tokens and semantic tokens are both used for colorization. If
+---set to `false` the client only uses the returned semantic tokens
+---for colorization.
+---
+---If the value is `undefined` then the client behavior is not
+---specified.
+---
+---@since 3.17.0
+---@field augmentsSyntaxTokens? boolean
+
+---Client capabilities for the linked editing range request.
+---
+---@since 3.16.0
+---@class lsp.LinkedEditingRangeClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---Client capabilities specific to the moniker request.
+---
+---@since 3.16.0
+---@class lsp.MonikerClientCapabilities
+---Whether moniker supports dynamic registration. If this is set to `true`
+---the client supports the new `MonikerRegistrationOptions` return value
+---for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---@since 3.17.0
+---@class lsp.TypeHierarchyClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+
+---Client capabilities specific to inline values.
+---
+---@since 3.17.0
+---@class lsp.InlineValueClientCapabilities
+---Whether implementation supports dynamic registration for inline value providers.
+---@field dynamicRegistration? boolean
+
+---Inlay hint client capabilities.
+---
+---@since 3.17.0
+---@class lsp.InlayHintClientCapabilities
+---Whether inlay hints support dynamic registration.
+---@field dynamicRegistration? boolean
+---Indicates which properties a client can resolve lazily on an inlay
+---hint.
+---@field resolveSupport? anonym42
+
+---Client capabilities specific to diagnostic pull requests.
+---
+---@since 3.17.0
+---@class lsp.DiagnosticClientCapabilities
+---Whether implementation supports dynamic registration. If this is set to `true`
+---the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---Whether the clients supports related documents for document diagnostic pulls.
+---@field relatedDocumentSupport? boolean
+
+---Client capabilities specific to inline completions.
+---
+---@since 3.18.0
+---@class lsp.InlineCompletionClientCapabilities
+---Whether implementation supports dynamic registration for inline completion providers.
+---@field dynamicRegistration? boolean
+
+---Notebook specific client capabilities.
+---
+---@since 3.17.0
+---@class lsp.NotebookDocumentSyncClientCapabilities
+---Whether implementation supports dynamic registration. If this is
+---set to `true` the client supports the new
+---`(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
+---return value for the corresponding server capability as well.
+---@field dynamicRegistration? boolean
+---The client supports sending execution summary data per cell.
+---@field executionSummarySupport? boolean
+
+---Show message request client capabilities
+---@class lsp.ShowMessageRequestClientCapabilities
+---Capabilities specific to the `MessageActionItem` type.
+---@field messageActionItem? anonym43
+
+---Client capabilities for the showDocument request.
+---
+---@since 3.16.0
+---@class lsp.ShowDocumentClientCapabilities
+---The client has support for the showDocument
+---request.
+---@field support boolean
+
+---Client capabilities specific to regular expressions.
+---
+---@since 3.16.0
+---@class lsp.RegularExpressionsClientCapabilities
+---The engine's name.
+---@field engine string
+---The engine's version.
+---@field version? string
+
+---Client capabilities specific to the used markdown parser.
+---
+---@since 3.16.0
+---@class lsp.MarkdownClientCapabilities
+---The name of the parser.
+---@field parser string
+---The version of the parser.
+---@field version? string
+---A list of HTML tags that the client allows / supports in
+---Markdown.
+---
+---@since 3.17.0
+---@field allowedTags? string[]
+
+---A set of predefined token types. This set is not fixed
+---an clients can specify additional token types via the
+---corresponding client capabilities.
+---
+---@since 3.16.0
+---@alias lsp.SemanticTokenTypes
+---| "namespace" # namespace
+---| "type" # type
+---| "class" # class
+---| "enum" # enum
+---| "interface" # interface
+---| "struct" # struct
+---| "typeParameter" # typeParameter
+---| "parameter" # parameter
+---| "variable" # variable
+---| "property" # property
+---| "enumMember" # enumMember
+---| "event" # event
+---| "function" # function
+---| "method" # method
+---| "macro" # macro
+---| "keyword" # keyword
+---| "modifier" # modifier
+---| "comment" # comment
+---| "string" # string
+---| "number" # number
+---| "regexp" # regexp
+---| "operator" # operator
+---| "decorator" # decorator
+
+---A set of predefined token modifiers. This set is not fixed
+---an clients can specify additional token types via the
+---corresponding client capabilities.
+---
+---@since 3.16.0
+---@alias lsp.SemanticTokenModifiers
+---| "declaration" # declaration
+---| "definition" # definition
+---| "readonly" # readonly
+---| "static" # static
+---| "deprecated" # deprecated
+---| "abstract" # abstract
+---| "async" # async
+---| "modification" # modification
+---| "documentation" # documentation
+---| "defaultLibrary" # defaultLibrary
+
+---The document diagnostic report kinds.
+---
+---@since 3.17.0
+---@alias lsp.DocumentDiagnosticReportKind
+---| "full" # Full
+---| "unchanged" # Unchanged
+
+---Predefined error codes.
+---@alias lsp.ErrorCodes
+---| -32700 # ParseError
+---| -32600 # InvalidRequest
+---| -32601 # MethodNotFound
+---| -32602 # InvalidParams
+---| -32603 # InternalError
+---| -32002 # ServerNotInitialized
+---| -32001 # UnknownErrorCode
+
+---@alias lsp.LSPErrorCodes
+---| -32803 # RequestFailed
+---| -32802 # ServerCancelled
+---| -32801 # ContentModified
+---| -32800 # RequestCancelled
+
+---A set of predefined range kinds.
+---@alias lsp.FoldingRangeKind
+---| "comment" # Comment
+---| "imports" # Imports
+---| "region" # Region
+
+---A symbol kind.
+---@alias lsp.SymbolKind
+---| 1 # File
+---| 2 # Module
+---| 3 # Namespace
+---| 4 # Package
+---| 5 # Class
+---| 6 # Method
+---| 7 # Property
+---| 8 # Field
+---| 9 # Constructor
+---| 10 # Enum
+---| 11 # Interface
+---| 12 # Function
+---| 13 # Variable
+---| 14 # Constant
+---| 15 # String
+---| 16 # Number
+---| 17 # Boolean
+---| 18 # Array
+---| 19 # Object
+---| 20 # Key
+---| 21 # Null
+---| 22 # EnumMember
+---| 23 # Struct
+---| 24 # Event
+---| 25 # Operator
+---| 26 # TypeParameter
+
+---Symbol tags are extra annotations that tweak the rendering of a symbol.
+---
+---@since 3.16
+---@alias lsp.SymbolTag
+---| 1 # Deprecated
+
+---Moniker uniqueness level to define scope of the moniker.
+---
+---@since 3.16.0
+---@alias lsp.UniquenessLevel
+---| "document" # document
+---| "project" # project
+---| "group" # group
+---| "scheme" # scheme
+---| "global" # global
+
+---The moniker kind.
+---
+---@since 3.16.0
+---@alias lsp.MonikerKind
+---| "import" # import
+---| "export" # export
+---| "local" # local
+
+---Inlay hint kinds.
+---
+---@since 3.17.0
+---@alias lsp.InlayHintKind
+---| 1 # Type
+---| 2 # Parameter
+
+---Defines whether the insert text in a completion item should be interpreted as
+---plain text or a snippet.
+---@alias lsp.InsertTextFormat
+---| 1 # PlainText
+---| 2 # Snippet
+
+---The message type
+---@alias lsp.MessageType
+---| 1 # Error
+---| 2 # Warning
+---| 3 # Info
+---| 4 # Log
+
+---Defines how the host (editor) should sync
+---document changes to the language server.
+---@alias lsp.TextDocumentSyncKind
+---| 0 # None
+---| 1 # Full
+---| 2 # Incremental
+
+---Represents reasons why a text document is saved.
+---@alias lsp.TextDocumentSaveReason
+---| 1 # Manual
+---| 2 # AfterDelay
+---| 3 # FocusOut
+
+---The kind of a completion entry.
+---@alias lsp.CompletionItemKind
+---| 1 # Text
+---| 2 # Method
+---| 3 # Function
+---| 4 # Constructor
+---| 5 # Field
+---| 6 # Variable
+---| 7 # Class
+---| 8 # Interface
+---| 9 # Module
+---| 10 # Property
+---| 11 # Unit
+---| 12 # Value
+---| 13 # Enum
+---| 14 # Keyword
+---| 15 # Snippet
+---| 16 # Color
+---| 17 # File
+---| 18 # Reference
+---| 19 # Folder
+---| 20 # EnumMember
+---| 21 # Constant
+---| 22 # Struct
+---| 23 # Event
+---| 24 # Operator
+---| 25 # TypeParameter
+
+---Completion item tags are extra annotations that tweak the rendering of a completion
+---item.
+---
+---@since 3.15.0
+---@alias lsp.CompletionItemTag
+---| 1 # Deprecated
+
+---How whitespace and indentation is handled during completion
+---item insertion.
+---
+---@since 3.16.0
+---@alias lsp.InsertTextMode
+---| 1 # asIs
+---| 2 # adjustIndentation
+
+---A document highlight kind.
+---@alias lsp.DocumentHighlightKind
+---| 1 # Text
+---| 2 # Read
+---| 3 # Write
+
+---A set of predefined code action kinds
+---@alias lsp.CodeActionKind
+---| "" # Empty
+---| "quickfix" # QuickFix
+---| "refactor" # Refactor
+---| "refactor.extract" # RefactorExtract
+---| "refactor.inline" # RefactorInline
+---| "refactor.rewrite" # RefactorRewrite
+---| "source" # Source
+---| "source.organizeImports" # SourceOrganizeImports
+---| "source.fixAll" # SourceFixAll
+
+---@alias lsp.TraceValues
+---| "off" # Off
+---| "messages" # Messages
+---| "verbose" # Verbose
+
+---Describes the content type that a client supports in various
+---result literals like `Hover`, `ParameterInfo` or `CompletionItem`.
+---
+---Please note that `MarkupKinds` must not start with a `$`. This kinds
+---are reserved for internal usage.
+---@alias lsp.MarkupKind
+---| "plaintext" # PlainText
+---| "markdown" # Markdown
+
+---Describes how an {@link InlineCompletionItemProvider inline completion provider} was triggered.
+---
+---@since 3.18.0
+---@alias lsp.InlineCompletionTriggerKind
+---| 0 # Invoked
+---| 1 # Automatic
+
+---A set of predefined position encoding kinds.
+---
+---@since 3.17.0
+---@alias lsp.PositionEncodingKind
+---| "utf-8" # UTF8
+---| "utf-16" # UTF16
+---| "utf-32" # UTF32
+
+---The file event type
+---@alias lsp.FileChangeType
+---| 1 # Created
+---| 2 # Changed
+---| 3 # Deleted
+
+---@alias lsp.WatchKind
+---| 1 # Create
+---| 2 # Change
+---| 4 # Delete
+
+---The diagnostic's severity.
+---@alias lsp.DiagnosticSeverity
+---| 1 # Error
+---| 2 # Warning
+---| 3 # Information
+---| 4 # Hint
+
+---The diagnostic tags.
+---
+---@since 3.15.0
+---@alias lsp.DiagnosticTag
+---| 1 # Unnecessary
+---| 2 # Deprecated
+
+---How a completion was triggered
+---@alias lsp.CompletionTriggerKind
+---| 1 # Invoked
+---| 2 # TriggerCharacter
+---| 3 # TriggerForIncompleteCompletions
+
+---How a signature help was triggered.
+---
+---@since 3.15.0
+---@alias lsp.SignatureHelpTriggerKind
+---| 1 # Invoked
+---| 2 # TriggerCharacter
+---| 3 # ContentChange
+
+---The reason why code actions were requested.
+---
+---@since 3.17.0
+---@alias lsp.CodeActionTriggerKind
+---| 1 # Invoked
+---| 2 # Automatic
+
+---A pattern kind describing if a glob pattern matches a file a folder or
+---both.
+---
+---@since 3.16.0
+---@alias lsp.FileOperationPatternKind
+---| "file" # file
+---| "folder" # folder
+
+---A notebook cell kind.
+---
+---@since 3.17.0
+---@alias lsp.NotebookCellKind
+---| 1 # Markup
+---| 2 # Code
+
+---@alias lsp.ResourceOperationKind
+---| "create" # Create
+---| "rename" # Rename
+---| "delete" # Delete
+
+---@alias lsp.FailureHandlingKind
+---| "abort" # Abort
+---| "transactional" # Transactional
+---| "textOnlyTransactional" # TextOnlyTransactional
+---| "undo" # Undo
+
+---@alias lsp.PrepareSupportDefaultBehavior
+---| 1 # Identifier
+
+---@alias lsp.TokenFormat
+---| "relative" # Relative
+
+---The definition of a symbol represented as one or many {@link Location locations}.
+---For most programming languages there is only one location at which a symbol is
+---defined.
+---
+---Servers should prefer returning `DefinitionLink` over `Definition` if supported
+---by the client.
+---@alias lsp.Definition lsp.Location|lsp.Location[]
+
+---Information about where a symbol is defined.
+---
+---Provides additional metadata over normal {@link Location location} definitions, including the range of
+---the defining symbol
+---@alias lsp.DefinitionLink lsp.LocationLink
+
+---LSP arrays.
+---@since 3.17.0
+---@alias lsp.LSPArray lsp.LSPAny[]
+
+---The LSP any type.
+---Please note that strictly speaking a property with the value `undefined`
+---can't be converted into JSON preserving the property name. However for
+---convenience it is allowed and assumed that all these properties are
+---optional as well.
+---@since 3.17.0
+---@alias lsp.LSPAny lsp.LSPObject|lsp.LSPArray|string|integer|uinteger|decimal|boolean|lsp.null
+
+---The declaration of a symbol representation as one or many {@link Location locations}.
+---@alias lsp.Declaration lsp.Location|lsp.Location[]
+
+---Information about where a symbol is declared.
+---
+---Provides additional metadata over normal {@link Location location} declarations, including the range of
+---the declaring symbol.
+---
+---Servers should prefer returning `DeclarationLink` over `Declaration` if supported
+---by the client.
+---@alias lsp.DeclarationLink lsp.LocationLink
+
+---Inline value information can be provided by different means:
+---- directly as a text value (class InlineValueText).
+---- as a name to use for a variable lookup (class InlineValueVariableLookup)
+---- as an evaluatable expression (class InlineValueEvaluatableExpression)
+---The InlineValue types combines all inline value types into one type.
+---
+---@since 3.17.0
+---@alias lsp.InlineValue lsp.InlineValueText|lsp.InlineValueVariableLookup|lsp.InlineValueEvaluatableExpression
+
+---The result of a document diagnostic pull request. A report can
+---either be a full report containing all diagnostics for the
+---requested document or an unchanged report indicating that nothing
+---has changed in terms of diagnostics in comparison to the last
+---pull request.
+---
+---@since 3.17.0
+---@alias lsp.DocumentDiagnosticReport lsp.RelatedFullDocumentDiagnosticReport|lsp.RelatedUnchangedDocumentDiagnosticReport
+
+---@alias lsp.PrepareRenameResult lsp.Range|anonym44|anonym45
+
+---A document selector is the combination of one or many document filters.
+---
+---@sample `let sel:DocumentSelector = [{ language: 'typescript' }, { language: 'json', pattern: '**∕tsconfig.json' }]`;
+---
+---The use of a string as a document filter is deprecated @since 3.16.0.
+---@alias lsp.DocumentSelector lsp.DocumentFilter[]
+
+---@alias lsp.ProgressToken integer|string
+
+---An identifier to refer to a change annotation stored with a workspace edit.
+---@alias lsp.ChangeAnnotationIdentifier string
+
+---A workspace diagnostic document report.
+---
+---@since 3.17.0
+---@alias lsp.WorkspaceDocumentDiagnosticReport lsp.WorkspaceFullDocumentDiagnosticReport|lsp.WorkspaceUnchangedDocumentDiagnosticReport
+
+---An event describing a change to a text document. If only a text is provided
+---it is considered to be the full content of the document.
+---@alias lsp.TextDocumentContentChangeEvent anonym46|anonym47
+
+---MarkedString can be used to render human readable text. It is either a markdown string
+---or a code-block that provides a language and a code snippet. The language identifier
+---is semantically equal to the optional language identifier in fenced code blocks in GitHub
+---issues. See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
+---
+---The pair of a language and a value is an equivalent to markdown:
+---```${language}
+---${value}
+---```
+---
+---Note that markdown strings will be sanitized - that means html will be escaped.
+---@deprecated use MarkupContent instead.
+---@alias lsp.MarkedString string|anonym48
+
+---A document filter describes a top level text document or
+---a notebook cell document.
+---
+---@since 3.17.0 - proposed support for NotebookCellTextDocumentFilter.
+---@alias lsp.DocumentFilter lsp.TextDocumentFilter|lsp.NotebookCellTextDocumentFilter
+
+---LSP object definition.
+---@since 3.17.0
+---@alias lsp.LSPObject table<string, lsp.LSPAny>
+
+---The glob pattern. Either a string pattern or a relative pattern.
+---
+---@since 3.17.0
+---@alias lsp.GlobPattern lsp.Pattern|lsp.RelativePattern
+
+---A document filter denotes a document by different properties like
+---the {@link TextDocument.languageId language}, the {@link Uri.scheme scheme} of
+---its resource, or a glob-pattern that is applied to the {@link TextDocument.fileName path}.
+---
+---Glob patterns can have the following syntax:
+---- `*` to match one or more characters in a path segment
+---- `?` to match on one character in a path segment
+---- `**` to match any number of path segments, including none
+---- `{}` to group sub patterns into an OR expression. (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+---- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+---- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+---
+---@sample A language filter that applies to typescript files on disk: `{ language: 'typescript', scheme: 'file' }`
+---@sample A language filter that applies to all package.json paths: `{ language: 'json', pattern: '**package.json' }`
+---
+---@since 3.17.0
+---@alias lsp.TextDocumentFilter anonym49|anonym50|anonym51
+
+---A notebook document filter denotes a notebook document by
+---different properties. The properties will be match
+---against the notebook's URI (same as with documents)
+---
+---@since 3.17.0
+---@alias lsp.NotebookDocumentFilter anonym52|anonym53|anonym54
+
+---The glob pattern to watch relative to the base path. Glob patterns can have the following syntax:
+---- `*` to match one or more characters in a path segment
+---- `?` to match on one character in a path segment
+---- `**` to match any number of path segments, including none
+---- `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+---- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+---- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+---
+---@since 3.17.0
+---@alias lsp.Pattern string
+
+---@class anonym1
+---The name of the server as defined by the server.
+---@field name string
+---The server's version as defined by the server.
+---@field version? string
+
+---@class anonym3
+---@field insert lsp.Range
+---@field replace lsp.Range
+
+---@class anonym2
+---A default commit character set.
+---
+---@since 3.17.0
+---@field commitCharacters? string[]
+---A default edit range.
+---
+---@since 3.17.0
+---@field editRange? lsp.Range|anonym3
+---A default insert text format.
+---
+---@since 3.17.0
+---@field insertTextFormat? lsp.InsertTextFormat
+---A default insert text mode.
+---
+---@since 3.17.0
+---@field insertTextMode? lsp.InsertTextMode
+---A default data value.
+---
+---@since 3.17.0
+---@field data? lsp.LSPAny
+
+---@class anonym4
+---Human readable description of why the code action is currently disabled.
+---
+---This is displayed in the code actions UI.
+---@field reason string
+
+---@class anonym5
+---@field uri lsp.DocumentUri
+
+---@class anonym6
+
+---@class anonym7
+---The server supports deltas for full documents.
+---@field delta? boolean
+
+---@class anonym9
+---The change to the cell array.
+---@field array lsp.NotebookCellArrayChange
+---Additional opened cell text documents.
+---@field didOpen? lsp.TextDocumentItem[]
+---Additional closed cell text documents.
+---@field didClose? lsp.TextDocumentIdentifier[]
+
+---@class anonym10
+---@field document lsp.VersionedTextDocumentIdentifier
+---@field changes lsp.TextDocumentContentChangeEvent[]
+
+---@class anonym8
+---Changes to the cell structure to add or
+---remove cells.
+---@field structure? anonym9
+---Changes to notebook cells properties like its
+---kind, execution summary or metadata.
+---@field data? lsp.NotebookCell[]
+---Changes to the text content of notebook cells.
+---@field textContent? anonym10[]
+
+---@class anonym11
+---The name of the client as defined by the client.
+---@field name string
+---The client's version as defined by the client.
+---@field version? string
+
+---@class anonym12
+---The server supports workspace folder.
+---
+---@since 3.6.0
+---@field workspaceFolders? lsp.WorkspaceFoldersServerCapabilities
+---The server is interested in notifications/requests for operations on files.
+---
+---@since 3.16.0
+---@field fileOperations? lsp.FileOperationOptions
+
+---@class anonym13
+---The server has support for completion item label
+---details (see also `CompletionItemLabelDetails`) when
+---receiving a completion item in a resolve call.
+---
+---@since 3.17.0
+---@field labelDetailsSupport? boolean
+
+---@class anonym15
+---@field language string
+
+---@class anonym14
+---The notebook to be synced If a string
+---value is provided it matches against the
+---notebook type. '*' matches every notebook.
+---@field notebook string|lsp.NotebookDocumentFilter
+---The cells of the matching notebook to be synced.
+---@field cells? anonym15[]
+
+---@class anonym17
+---@field language string
+
+---@class anonym16
+---The notebook to be synced If a string
+---value is provided it matches against the
+---notebook type. '*' matches every notebook.
+---@field notebook? string|lsp.NotebookDocumentFilter
+---The cells of the matching notebook to be synced.
+---@field cells anonym17[]
+
+---@class anonym18
+---The client will actively cancel the request.
+---@field cancel boolean
+---The list of requests for which the client
+---will retry the request if it receives a
+---response with error code `ContentModified`
+---@field retryOnContentModified string[]
+
+---@class anonym19
+---Whether the client groups edits with equal labels into tree nodes,
+---for instance all edits labelled with "Changes in Strings" would
+---be a tree node.
+---@field groupsOnLabel? boolean
+
+---@class anonym20
+---The symbol kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---
+---If this property is not present the client only supports
+---the symbol kinds from `File` to `Array` as defined in
+---the initial version of the protocol.
+---@field valueSet? lsp.SymbolKind[]
+
+---@class anonym21
+---The tags supported by the client.
+---@field valueSet lsp.SymbolTag[]
+
+---@class anonym22
+---The properties that a client can resolve lazily. Usually
+---`location.range`
+---@field properties string[]
+
+---@class anonym24
+---The tags supported by the client.
+---@field valueSet lsp.CompletionItemTag[]
+
+---@class anonym25
+---The properties that a client can resolve lazily.
+---@field properties string[]
+
+---@class anonym26
+---@field valueSet lsp.InsertTextMode[]
+
+---@class anonym23
+---Client supports snippets as insert text.
+---
+---A snippet can define tab stops and placeholders with `$1`, `$2`
+---and `${3:foo}`. `$0` defines the final tab stop, it defaults to
+---the end of the snippet. Placeholders with equal identifiers are linked,
+---that is typing in one will update others too.
+---@field snippetSupport? boolean
+---Client supports commit characters on a completion item.
+---@field commitCharactersSupport? boolean
+---Client supports the following content formats for the documentation
+---property. The order describes the preferred format of the client.
+---@field documentationFormat? lsp.MarkupKind[]
+---Client supports the deprecated property on a completion item.
+---@field deprecatedSupport? boolean
+---Client supports the preselect property on a completion item.
+---@field preselectSupport? boolean
+---Client supports the tag property on a completion item. Clients supporting
+---tags have to handle unknown tags gracefully. Clients especially need to
+---preserve unknown tags when sending a completion item back to the server in
+---a resolve call.
+---
+---@since 3.15.0
+---@field tagSupport? anonym24
+---Client support insert replace edit to control different behavior if a
+---completion item is inserted in the text or should replace text.
+---
+---@since 3.16.0
+---@field insertReplaceSupport? boolean
+---Indicates which properties a client can resolve lazily on a completion
+---item. Before version 3.16.0 only the predefined properties `documentation`
+---and `details` could be resolved lazily.
+---
+---@since 3.16.0
+---@field resolveSupport? anonym25
+---The client supports the `insertTextMode` property on
+---a completion item to override the whitespace handling mode
+---as defined by the client (see `insertTextMode`).
+---
+---@since 3.16.0
+---@field insertTextModeSupport? anonym26
+---The client has support for completion item label
+---details (see also `CompletionItemLabelDetails`).
+---
+---@since 3.17.0
+---@field labelDetailsSupport? boolean
+
+---@class anonym27
+---The completion item kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---
+---If this property is not present the client only supports
+---the completion items kinds from `Text` to `Reference` as defined in
+---the initial version of the protocol.
+---@field valueSet? lsp.CompletionItemKind[]
+
+---@class anonym28
+---The client supports the following itemDefaults on
+---a completion list.
+---
+---The value lists the supported property names of the
+---`CompletionList.itemDefaults` object. If omitted
+---no properties are supported.
+---
+---@since 3.17.0
+---@field itemDefaults? string[]
+
+---@class anonym30
+---The client supports processing label offsets instead of a
+---simple label string.
+---
+---@since 3.14.0
+---@field labelOffsetSupport? boolean
+
+---@class anonym29
+---Client supports the following content formats for the documentation
+---property. The order describes the preferred format of the client.
+---@field documentationFormat? lsp.MarkupKind[]
+---Client capabilities specific to parameter information.
+---@field parameterInformation? anonym30
+---The client supports the `activeParameter` property on `SignatureInformation`
+---literal.
+---
+---@since 3.16.0
+---@field activeParameterSupport? boolean
+
+---@class anonym31
+---The symbol kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---
+---If this property is not present the client only supports
+---the symbol kinds from `File` to `Array` as defined in
+---the initial version of the protocol.
+---@field valueSet? lsp.SymbolKind[]
+
+---@class anonym32
+---The tags supported by the client.
+---@field valueSet lsp.SymbolTag[]
+
+---@class anonym34
+---The code action kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---@field valueSet lsp.CodeActionKind[]
+
+---@class anonym33
+---The code action kind is support with the following value
+---set.
+---@field codeActionKind anonym34
+
+---@class anonym35
+---The properties that a client can resolve lazily.
+---@field properties string[]
+
+---@class anonym36
+---The folding range kind values the client supports. When this
+---property exists the client also guarantees that it will
+---handle values outside its set gracefully and falls back
+---to a default value when unknown.
+---@field valueSet? lsp.FoldingRangeKind[]
+
+---@class anonym37
+---If set, the client signals that it supports setting collapsedText on
+---folding ranges to display custom labels instead of the default text.
+---
+---@since 3.17.0
+---@field collapsedText? boolean
+
+---@class anonym38
+---The tags supported by the client.
+---@field valueSet lsp.DiagnosticTag[]
+
+---@class anonym40
+
+---@class anonym41
+---The client will send the `textDocument/semanticTokens/full/delta` request if
+---the server provides a corresponding handler.
+---@field delta? boolean
+
+---@class anonym39
+---The client will send the `textDocument/semanticTokens/range` request if
+---the server provides a corresponding handler.
+---@field range? boolean|anonym40
+---The client will send the `textDocument/semanticTokens/full` request if
+---the server provides a corresponding handler.
+---@field full? boolean|anonym41
+
+---@class anonym42
+---The properties that a client can resolve lazily.
+---@field properties string[]
+
+---@class anonym43
+---Whether the client supports additional attributes which
+---are preserved and send back to the server in the
+---request's response.
+---@field additionalPropertiesSupport? boolean
+
+---@class anonym44
+---@field range lsp.Range
+---@field placeholder string
+
+---@class anonym45
+---@field defaultBehavior boolean
+
+---@class anonym46
+---The range of the document that changed.
+---@field range lsp.Range
+---The optional length of the range that got replaced.
+---
+---@deprecated use range instead.
+---@field rangeLength? uinteger
+---The new text for the provided range.
+---@field text string
+
+---@class anonym47
+---The new text of the whole document.
+---@field text string
+
+---@class anonym48
+---@field language string
+---@field value string
+
+---@class anonym49
+---A language id, like `typescript`.
+---@field language string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme? string
+---A glob pattern, like `*.{ts,js}`.
+---@field pattern? string
+
+---@class anonym50
+---A language id, like `typescript`.
+---@field language? string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme string
+---A glob pattern, like `*.{ts,js}`.
+---@field pattern? string
+
+---@class anonym51
+---A language id, like `typescript`.
+---@field language? string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme? string
+---A glob pattern, like `*.{ts,js}`.
+---@field pattern string
+
+---@class anonym52
+---The type of the enclosing notebook.
+---@field notebookType string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme? string
+---A glob pattern.
+---@field pattern? string
+
+---@class anonym53
+---The type of the enclosing notebook.
+---@field notebookType? string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme string
+---A glob pattern.
+---@field pattern? string
+
+---@class anonym54
+---The type of the enclosing notebook.
+---@field notebookType? string
+---A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
+---@field scheme? string
+---A glob pattern.
+---@field pattern string
diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index 5dbd4a7199..1a4909b3f3 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -6,11 +6,13 @@ local lpeg = vim.lpeg
 
 local M = {}
 
+---@alias lpeg userdata
+
 --- Parses the raw pattern into an |lpeg| pattern. LPeg patterns natively support the "this" or "that"
 --- alternative constructions described in the LSP spec that cannot be expressed in a standard Lua pattern.
 ---
 ---@param pattern string The raw glob pattern
----@return userdata An |lpeg| representation of the pattern, or nil if the pattern is invalid.
+---@return lpeg An |lpeg| representation of the pattern, or nil if the pattern is invalid.
 local function parse(pattern)
   local l = lpeg
 
@@ -109,7 +111,7 @@ local to_lsp_change_type = {
 
 --- Default excludes the same as VSCode's `files.watcherExclude` setting.
 --- https://github.com/microsoft/vscode/blob/eef30e7165e19b33daa1e15e92fa34ff4a5df0d3/src/vs/workbench/contrib/files/browser/files.contribution.ts#L261
----@type Lpeg pattern
+---@type lpeg parsed Lpeg pattern
 M._poll_exclude_pattern = parse('**/.git/{objects,subtree-cache}/**')
   + parse('**/node_modules/*/**')
   + parse('**/.hg/store/**')
@@ -132,7 +134,7 @@ function M.register(reg, ctx)
   if not has_capability or not client.workspace_folders then
     return
   end
-  local watch_regs = {} --- @type table<string,{pattern:userdata,kind:integer}>
+  local watch_regs = {} --- @type table<string,{pattern:lpeg,kind:integer}>
   for _, w in ipairs(reg.registerOptions.watchers) do
     local relative_pattern = false
     local glob_patterns = {} --- @type {baseUri:string, pattern: string}[]
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index eb2f59b312..8407105d47 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -5,8 +5,8 @@ local api = vim.api
 local M = {}
 
 ---@class lsp.inlay_hint.bufstate
----@field version integer
----@field client_hint table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
+---@field version? integer
+---@field client_hint? table<integer, table<integer, lsp.InlayHint[]>> client_id -> (lnum -> hints)
 ---@field applied table<integer, integer> Last version of hints applied to this line
 ---@field enabled boolean Whether inlay hints are enabled for this buffer
 ---@type table<integer, lsp.inlay_hint.bufstate>
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index bab1b23ee4..5b20344bd3 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -14,11 +14,11 @@ local uv = vim.uv
 --- @field marked boolean whether this token has had extmarks applied
 ---
 --- @class STCurrentResult
---- @field version integer document version associated with this result
---- @field result_id string resultId from the server; used with delta requests
---- @field highlights STTokenRange[] cache of highlight ranges for this document version
---- @field tokens integer[] raw token array as received by the server. used for calculating delta responses
---- @field namespace_cleared boolean whether the namespace was cleared for this result yet
+--- @field version? integer document version associated with this result
+--- @field result_id? string resultId from the server; used with delta requests
+--- @field highlights? STTokenRange[] cache of highlight ranges for this document version
+--- @field tokens? integer[] raw token array as received by the server. used for calculating delta responses
+--- @field namespace_cleared? boolean whether the namespace was cleared for this result yet
 ---
 --- @class STActiveRequest
 --- @field request_id integer the LSP request ID of the most recent request sent to the server
@@ -717,8 +717,7 @@ end
 --- mark will be deleted by the semantic token engine when appropriate; for
 --- example, when the LSP sends updated tokens. This function is intended for
 --- use inside |LspTokenUpdate| callbacks.
----@param token (table) a semantic token, found as `args.data.token` in
----       |LspTokenUpdate|.
+---@param token (table) a semantic token, found as `args.data.token` in |LspTokenUpdate|.
 ---@param bufnr (integer) the buffer to highlight
 ---@param client_id (integer) The ID of the |vim.lsp.client|
 ---@param hl_group (string) Highlight group name
diff --git a/runtime/lua/vim/lsp/types.lua b/runtime/lua/vim/lsp/types.lua
deleted file mode 100644
index 98e948c945..0000000000
--- a/runtime/lua/vim/lsp/types.lua
+++ /dev/null
@@ -1,21 +0,0 @@
----@meta
-
----@alias lsp-handler fun(err: lsp.ResponseError|nil, result: any, context: lsp.HandlerContext, config: table|nil): any?
-
----@class lsp.HandlerContext
----@field method string
----@field client_id integer
----@field bufnr? integer
----@field params? any
-
----@class lsp.ResponseError
----@field code integer
----@field message string
----@field data string|number|boolean|table[]|table|nil
-
---- @class lsp.DocumentFilter
---- @field language? string
---- @field scheme? string
---- @field pattern? string
-
---- @alias lsp.RegisterOptions any | lsp.StaticRegistrationOptions | lsp.TextDocumentRegistrationOptions
diff --git a/runtime/lua/vim/lsp/types/protocol.lua b/runtime/lua/vim/lsp/types/protocol.lua
deleted file mode 100644
index e1ed8dbcc3..0000000000
--- a/runtime/lua/vim/lsp/types/protocol.lua
+++ /dev/null
@@ -1,4393 +0,0 @@
---[[
-This file is autogenerated from scripts/gen_lsp.lua
-Regenerate:
-nvim -l scripts/gen_lsp.lua gen --version 3.18 --runtime/lua/vim/lsp/types/protocol.lua
---]]
-
----@alias lsp.null nil
----@alias uinteger integer
----@alias lsp.decimal number
----@alias lsp.DocumentUri string
----@alias lsp.URI string
----@alias lsp.LSPObject table<string, lsp.LSPAny>
----@alias lsp.LSPArray lsp.LSPAny[]
----@alias lsp.LSPAny lsp.LSPObject|lsp.LSPArray|string|number|boolean|nil
-
----@class lsp.ImplementationParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
-
----Represents a location inside a resource, such as a line
----inside a text file.
----@class lsp.Location
----@field uri lsp.DocumentUri
----@field range lsp.Range
-
----@class lsp.ImplementationRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----@class lsp.TypeDefinitionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
-
----@class lsp.TypeDefinitionRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----A workspace folder inside a client.
----@class lsp.WorkspaceFolder
----The associated URI for this workspace folder.
----@field uri lsp.URI
----The name of the workspace folder. Used to refer to this
----workspace folder in the user interface.
----@field name string
-
----The parameters of a `workspace/didChangeWorkspaceFolders` notification.
----@class lsp.DidChangeWorkspaceFoldersParams
----The actual workspace folder change event.
----@field event lsp.WorkspaceFoldersChangeEvent
-
----The parameters of a configuration request.
----@class lsp.ConfigurationParams
----@field items lsp.ConfigurationItem[]
-
----Parameters for a {@link DocumentColorRequest}.
----@class lsp.DocumentColorParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
-
----Represents a color range from a document.
----@class lsp.ColorInformation
----The range in the document where this color appears.
----@field range lsp.Range
----The actual color value for this color range.
----@field color lsp.Color
-
----@class lsp.DocumentColorRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----Parameters for a {@link ColorPresentationRequest}.
----@class lsp.ColorPresentationParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
----The color to request presentations for.
----@field color lsp.Color
----The range where the color would be inserted. Serves as a context.
----@field range lsp.Range
-
----@class lsp.ColorPresentation
----The label of this color presentation. It will be shown on the color
----picker header. By default this is also the text that is inserted when selecting
----this color presentation.
----@field label string
----An {@link TextEdit edit} which is applied to a document when selecting
----this presentation for the color.  When `falsy` the {@link ColorPresentation.label label}
----is used.
----@field textEdit? lsp.TextEdit
----An optional array of additional {@link TextEdit text edits} that are applied when
----selecting this color presentation. Edits must not overlap with the main {@link ColorPresentation.textEdit edit} nor with themselves.
----@field additionalTextEdits? lsp.TextEdit[]
-
----@class lsp.WorkDoneProgressOptions
----@field workDoneProgress? boolean
-
----General text document registration options.
----@class lsp.TextDocumentRegistrationOptions
----A document selector to identify the scope of the registration. If set to null
----the document selector provided on the client side will be used.
----@field documentSelector lsp.DocumentSelector|lsp.null
-
----Parameters for a {@link FoldingRangeRequest}.
----@class lsp.FoldingRangeParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
-
----Represents a folding range. To be valid, start and end line must be bigger than zero and smaller
----than the number of lines in the document. Clients are free to ignore invalid ranges.
----@class lsp.FoldingRange
----The zero-based start line of the range to fold. The folded area starts after the line's last character.
----To be valid, the end must be zero or larger and smaller than the number of lines in the document.
----@field startLine uinteger
----The zero-based character offset from where the folded range starts. If not defined, defaults to the length of the start line.
----@field startCharacter? uinteger
----The zero-based end line of the range to fold. The folded area ends with the line's last character.
----To be valid, the end must be zero or larger and smaller than the number of lines in the document.
----@field endLine uinteger
----The zero-based character offset before the folded range ends. If not defined, defaults to the length of the end line.
----@field endCharacter? uinteger
----Describes the kind of the folding range such as `comment' or 'region'. The kind
----is used to categorize folding ranges and used by commands like 'Fold all comments'.
----See {@link FoldingRangeKind} for an enumeration of standardized kinds.
----@field kind? lsp.FoldingRangeKind
----The text that the client should show when the specified range is
----collapsed. If not defined or not supported by the client, a default
----will be chosen by the client.
----
----@since 3.17.0
----@field collapsedText? string
-
----@class lsp.FoldingRangeRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----@class lsp.DeclarationParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
-
----@class lsp.DeclarationRegistrationOptions: lsp.DeclarationOptions, lsp.StaticRegistrationOptions
-
----A parameter literal used in selection range requests.
----@class lsp.SelectionRangeParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
----The positions inside the text document.
----@field positions lsp.Position[]
-
----A selection range represents a part of a selection hierarchy. A selection range
----may have a parent selection range that contains it.
----@class lsp.SelectionRange
----The {@link Range range} of this selection range.
----@field range lsp.Range
----The parent selection range containing this range. Therefore `parent.range` must contain `this.range`.
----@field parent? lsp.SelectionRange
-
----@class lsp.SelectionRangeRegistrationOptions: lsp.SelectionRangeOptions, lsp.StaticRegistrationOptions
-
----@class lsp.WorkDoneProgressCreateParams
----The token to be used to report progress.
----@field token lsp.ProgressToken
-
----@class lsp.WorkDoneProgressCancelParams
----The token to be used to report progress.
----@field token lsp.ProgressToken
-
----The parameter of a `textDocument/prepareCallHierarchy` request.
----
----@since 3.16.0
----@class lsp.CallHierarchyPrepareParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
-
----Represents programming constructs like functions or constructors in the context
----of call hierarchy.
----
----@since 3.16.0
----@class lsp.CallHierarchyItem
----The name of this item.
----@field name string
----The kind of this item.
----@field kind lsp.SymbolKind
----Tags for this item.
----@field tags? lsp.SymbolTag[]
----More detail for this item, e.g. the signature of a function.
----@field detail? string
----The resource identifier of this item.
----@field uri lsp.DocumentUri
----The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g. comments and code.
----@field range lsp.Range
----The range that should be selected and revealed when this symbol is being picked, e.g. the name of a function.
----Must be contained by the {@link CallHierarchyItem.range `range`}.
----@field selectionRange lsp.Range
----A data entry field that is preserved between a call hierarchy prepare and
----incoming calls or outgoing calls requests.
----@field data? lsp.LSPAny
-
----Call hierarchy options used during static or dynamic registration.
----
----@since 3.16.0
----@class lsp.CallHierarchyRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----The parameter of a `callHierarchy/incomingCalls` request.
----
----@since 3.16.0
----@class lsp.CallHierarchyIncomingCallsParams
----@field item lsp.CallHierarchyItem
-
----Represents an incoming call, e.g. a caller of a method or constructor.
----
----@since 3.16.0
----@class lsp.CallHierarchyIncomingCall
----The item that makes the call.
----@field from lsp.CallHierarchyItem
----The ranges at which the calls appear. This is relative to the caller
----denoted by {@link CallHierarchyIncomingCall.from `this.from`}.
----@field fromRanges lsp.Range[]
-
----The parameter of a `callHierarchy/outgoingCalls` request.
----
----@since 3.16.0
----@class lsp.CallHierarchyOutgoingCallsParams
----@field item lsp.CallHierarchyItem
-
----Represents an outgoing call, e.g. calling a getter from a method or a method from a constructor etc.
----
----@since 3.16.0
----@class lsp.CallHierarchyOutgoingCall
----The item that is called.
----@field to lsp.CallHierarchyItem
----The range at which this item is called. This is the range relative to the caller, e.g the item
----passed to {@link CallHierarchyItemProvider.provideCallHierarchyOutgoingCalls `provideCallHierarchyOutgoingCalls`}
----and not {@link CallHierarchyOutgoingCall.to `this.to`}.
----@field fromRanges lsp.Range[]
-
----@since 3.16.0
----@class lsp.SemanticTokensParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
-
----@since 3.16.0
----@class lsp.SemanticTokens
----An optional result id. If provided and clients support delta updating
----the client will include the result id in the next semantic token request.
----A server can then instead of computing all semantic tokens again simply
----send a delta.
----@field resultId? string
----The actual tokens.
----@field data uinteger[]
-
----@since 3.16.0
----@class lsp.SemanticTokensPartialResult
----@field data uinteger[]
-
----@since 3.16.0
----@class lsp.SemanticTokensRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----@since 3.16.0
----@class lsp.SemanticTokensDeltaParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
----The result id of a previous response. The result Id can either point to a full response
----or a delta response depending on what was received last.
----@field previousResultId string
-
----@since 3.16.0
----@class lsp.SemanticTokensDelta
----@field resultId? string
----The semantic token edits to transform a previous result into a new result.
----@field edits lsp.SemanticTokensEdit[]
-
----@since 3.16.0
----@class lsp.SemanticTokensDeltaPartialResult
----@field edits lsp.SemanticTokensEdit[]
-
----@since 3.16.0
----@class lsp.SemanticTokensRangeParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
----The range the semantic tokens are requested for.
----@field range lsp.Range
-
----Params to show a resource in the UI.
----
----@since 3.16.0
----@class lsp.ShowDocumentParams
----The uri to show.
----@field uri lsp.URI
----Indicates to show the resource in an external program.
----To show, for example, `https://code.visualstudio.com/`
----in the default WEB browser set `external` to `true`.
----@field external? boolean
----An optional property to indicate whether the editor
----showing the document should take focus or not.
----Clients might ignore this property if an external
----program is started.
----@field takeFocus? boolean
----An optional selection range if the document is a text
----document. Clients might ignore the property if an
----external program is started or the file is not a text
----file.
----@field selection? lsp.Range
-
----The result of a showDocument request.
----
----@since 3.16.0
----@class lsp.ShowDocumentResult
----A boolean indicating if the show was successful.
----@field success boolean
-
----@class lsp.LinkedEditingRangeParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
-
----The result of a linked editing range request.
----
----@since 3.16.0
----@class lsp.LinkedEditingRanges
----A list of ranges that can be edited together. The ranges must have
----identical length and contain identical text content. The ranges cannot overlap.
----@field ranges lsp.Range[]
----An optional word pattern (regular expression) that describes valid contents for
----the given ranges. If no pattern is provided, the client configuration's word
----pattern will be used.
----@field wordPattern? string
-
----@class lsp.LinkedEditingRangeRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----The parameters sent in notifications/requests for user-initiated creation of
----files.
----
----@since 3.16.0
----@class lsp.CreateFilesParams
----An array of all files/folders created in this operation.
----@field files lsp.FileCreate[]
-
----A workspace edit represents changes to many resources managed in the workspace. The edit
----should either provide `changes` or `documentChanges`. If documentChanges are present
----they are preferred over `changes` if the client can handle versioned document edits.
----
----Since version 3.13.0 a workspace edit can contain resource operations as well. If resource
----operations are present clients need to execute the operations in the order in which they
----are provided. So a workspace edit for example can consist of the following two changes:
----(1) a create file a.txt and (2) a text document edit which insert text into file a.txt.
----
----An invalid sequence (e.g. (1) delete file a.txt and (2) insert text into file a.txt) will
----cause failure of the operation. How the client recovers from the failure is described by
----the client capability: `workspace.workspaceEdit.failureHandling`
----@class lsp.WorkspaceEdit
----Holds changes to existing resources.
----@field changes? table<lsp.DocumentUri, lsp.TextEdit[]>
----Depending on the client capability `workspace.workspaceEdit.resourceOperations` document changes
----are either an array of `TextDocumentEdit`s to express changes to n different text documents
----where each text document edit addresses a specific version of a text document. Or it can contain
----above `TextDocumentEdit`s mixed with create, rename and delete file / folder operations.
----
----Whether a client supports versioned document edits is expressed via
----`workspace.workspaceEdit.documentChanges` client capability.
----
----If a client neither supports `documentChanges` nor `workspace.workspaceEdit.resourceOperations` then
----only plain `TextEdit`s using the `changes` property are supported.
----@field documentChanges? lsp.TextDocumentEdit|lsp.CreateFile|lsp.RenameFile|lsp.DeleteFile[]
----A map of change annotations that can be referenced in `AnnotatedTextEdit`s or create, rename and
----delete file / folder operations.
----
----Whether clients honor this property depends on the client capability `workspace.changeAnnotationSupport`.
----
----@since 3.16.0
----@field changeAnnotations? table<lsp.ChangeAnnotationIdentifier, lsp.ChangeAnnotation>
-
----The options to register for file operations.
----
----@since 3.16.0
----@class lsp.FileOperationRegistrationOptions
----The actual filters.
----@field filters lsp.FileOperationFilter[]
-
----The parameters sent in notifications/requests for user-initiated renames of
----files.
----
----@since 3.16.0
----@class lsp.RenameFilesParams
----An array of all files/folders renamed in this operation. When a folder is renamed, only
----the folder will be included, and not its children.
----@field files lsp.FileRename[]
-
----The parameters sent in notifications/requests for user-initiated deletes of
----files.
----
----@since 3.16.0
----@class lsp.DeleteFilesParams
----An array of all files/folders deleted in this operation.
----@field files lsp.FileDelete[]
-
----@class lsp.MonikerParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
-
----Moniker definition to match LSIF 0.5 moniker definition.
----
----@since 3.16.0
----@class lsp.Moniker
----The scheme of the moniker. For example tsc or .Net
----@field scheme string
----The identifier of the moniker. The value is opaque in LSIF however
----schema owners are allowed to define the structure if they want.
----@field identifier string
----The scope in which the moniker is unique
----@field unique lsp.UniquenessLevel
----The moniker kind if known.
----@field kind? lsp.MonikerKind
-
----@class lsp.MonikerRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameter of a `textDocument/prepareTypeHierarchy` request.
----
----@since 3.17.0
----@class lsp.TypeHierarchyPrepareParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
-
----@since 3.17.0
----@class lsp.TypeHierarchyItem
----The name of this item.
----@field name string
----The kind of this item.
----@field kind lsp.SymbolKind
----Tags for this item.
----@field tags? lsp.SymbolTag[]
----More detail for this item, e.g. the signature of a function.
----@field detail? string
----The resource identifier of this item.
----@field uri lsp.DocumentUri
----The range enclosing this symbol not including leading/trailing whitespace
----but everything else, e.g. comments and code.
----@field range lsp.Range
----The range that should be selected and revealed when this symbol is being
----picked, e.g. the name of a function. Must be contained by the
----{@link TypeHierarchyItem.range `range`}.
----@field selectionRange lsp.Range
----A data entry field that is preserved between a type hierarchy prepare and
----supertypes or subtypes requests. It could also be used to identify the
----type hierarchy in the server, helping improve the performance on
----resolving supertypes and subtypes.
----@field data? lsp.LSPAny
-
----Type hierarchy options used during static or dynamic registration.
----
----@since 3.17.0
----@class lsp.TypeHierarchyRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----The parameter of a `typeHierarchy/supertypes` request.
----
----@since 3.17.0
----@class lsp.TypeHierarchySupertypesParams
----@field item lsp.TypeHierarchyItem
-
----The parameter of a `typeHierarchy/subtypes` request.
----
----@since 3.17.0
----@class lsp.TypeHierarchySubtypesParams
----@field item lsp.TypeHierarchyItem
-
----A parameter literal used in inline value requests.
----
----@since 3.17.0
----@class lsp.InlineValueParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
----The document range for which inline values should be computed.
----@field range lsp.Range
----Additional information about the context in which inline values were
----requested.
----@field context lsp.InlineValueContext
-
----Inline value options used during static or dynamic registration.
----
----@since 3.17.0
----@class lsp.InlineValueRegistrationOptions: lsp.InlineValueOptions, lsp.StaticRegistrationOptions
-
----A parameter literal used in inlay hint requests.
----
----@since 3.17.0
----@class lsp.InlayHintParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
----The document range for which inlay hints should be computed.
----@field range lsp.Range
-
----Inlay hint information.
----
----@since 3.17.0
----@class lsp.InlayHint
----The position of this hint.
----@field position lsp.Position
----The label of this hint. A human readable string or an array of
----InlayHintLabelPart label parts.
----
----*Note* that neither the string nor the label part can be empty.
----@field label string|lsp.InlayHintLabelPart[]
----The kind of this hint. Can be omitted in which case the client
----should fall back to a reasonable default.
----@field kind? lsp.InlayHintKind
----Optional text edits that are performed when accepting this inlay hint.
----
----*Note* that edits are expected to change the document so that the inlay
----hint (or its nearest variant) is now part of the document and the inlay
----hint itself is now obsolete.
----@field textEdits? lsp.TextEdit[]
----The tooltip text when you hover over this item.
----@field tooltip? string|lsp.MarkupContent
----Render padding before the hint.
----
----Note: Padding should use the editor's background color, not the
----background color of the hint itself. That means padding can be used
----to visually align/separate an inlay hint.
----@field paddingLeft? boolean
----Render padding after the hint.
----
----Note: Padding should use the editor's background color, not the
----background color of the hint itself. That means padding can be used
----to visually align/separate an inlay hint.
----@field paddingRight? boolean
----A data entry field that is preserved on an inlay hint between
----a `textDocument/inlayHint` and a `inlayHint/resolve` request.
----@field data? lsp.LSPAny
-
----Inlay hint options used during static or dynamic registration.
----
----@since 3.17.0
----@class lsp.InlayHintRegistrationOptions: lsp.InlayHintOptions, lsp.StaticRegistrationOptions
-
----Parameters of the document diagnostic request.
----
----@since 3.17.0
----@class lsp.DocumentDiagnosticParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
----The additional identifier  provided during registration.
----@field identifier? string
----The result id of a previous response if provided.
----@field previousResultId? string
-
----A partial result for a document diagnostic report.
----
----@since 3.17.0
----@class lsp.DocumentDiagnosticReportPartialResult
----@field relatedDocuments table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
-
----Cancellation data returned from a diagnostic request.
----
----@since 3.17.0
----@class lsp.DiagnosticServerCancellationData
----@field retriggerRequest boolean
-
----Diagnostic registration options.
----
----@since 3.17.0
----@class lsp.DiagnosticRegistrationOptions: lsp.TextDocumentRegistrationOptions, lsp.StaticRegistrationOptions
-
----Parameters of the workspace diagnostic request.
----
----@since 3.17.0
----@class lsp.WorkspaceDiagnosticParams
----The additional identifier provided during registration.
----@field identifier? string
----The currently known diagnostic reports with their
----previous result ids.
----@field previousResultIds lsp.PreviousResultId[]
-
----A workspace diagnostic report.
----
----@since 3.17.0
----@class lsp.WorkspaceDiagnosticReport
----@field items lsp.WorkspaceDocumentDiagnosticReport[]
-
----A partial result for a workspace diagnostic report.
----
----@since 3.17.0
----@class lsp.WorkspaceDiagnosticReportPartialResult
----@field items lsp.WorkspaceDocumentDiagnosticReport[]
-
----The params sent in an open notebook document notification.
----
----@since 3.17.0
----@class lsp.DidOpenNotebookDocumentParams
----The notebook document that got opened.
----@field notebookDocument lsp.NotebookDocument
----The text documents that represent the content
----of a notebook cell.
----@field cellTextDocuments lsp.TextDocumentItem[]
-
----The params sent in a change notebook document notification.
----
----@since 3.17.0
----@class lsp.DidChangeNotebookDocumentParams
----The notebook document that did change. The version number points
----to the version after all provided changes have been applied. If
----only the text document content of a cell changes the notebook version
----doesn't necessarily have to change.
----@field notebookDocument lsp.VersionedNotebookDocumentIdentifier
----The actual changes to the notebook document.
----
----The changes describe single state changes to the notebook document.
----So if there are two changes c1 (at array index 0) and c2 (at array
----index 1) for a notebook in state S then c1 moves the notebook from
----S to S' and c2 from S' to S''. So c1 is computed on the state S and
----c2 is computed on the state S'.
----
----To mirror the content of a notebook using change events use the following approach:
----- start with the same initial content
----- apply the 'notebookDocument/didChange' notifications in the order you receive them.
----- apply the `NotebookChangeEvent`s in a single notification in the order
----  you receive them.
----@field change lsp.NotebookDocumentChangeEvent
-
----The params sent in a save notebook document notification.
----
----@since 3.17.0
----@class lsp.DidSaveNotebookDocumentParams
----The notebook document that got saved.
----@field notebookDocument lsp.NotebookDocumentIdentifier
-
----The params sent in a close notebook document notification.
----
----@since 3.17.0
----@class lsp.DidCloseNotebookDocumentParams
----The notebook document that got closed.
----@field notebookDocument lsp.NotebookDocumentIdentifier
----The text documents that represent the content
----of a notebook cell that got closed.
----@field cellTextDocuments lsp.TextDocumentIdentifier[]
-
----A parameter literal used in inline completion requests.
----
----@since 3.18.0
----@class lsp.InlineCompletionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
----Additional information about the context in which inline completions were
----requested.
----@field context lsp.InlineCompletionContext
-
----Represents a collection of {@link InlineCompletionItem inline completion items} to be presented in the editor.
----@class lsp.InlineCompletionList
----The inline completion items
----@field items lsp.InlineCompletionItem[]
-
----An inline completion item represents a text snippet that is proposed inline to complete text that is being typed.
----
----@since 3.18.0
----@class lsp.InlineCompletionItem
----The text to replace the range with. Must be set.
----@field insertText string
----The format of the insert text. The format applies to the `insertText`. If omitted defaults to `InsertTextFormat.PlainText`.
----@field insertTextFormat? lsp.InsertTextFormat
----A text that is used to decide if this inline completion should be shown. When `falsy` the {@link InlineCompletionItem.insertText} is used.
----@field filterText? string
----The range to replace. Must begin and end on the same line.
----@field range? lsp.Range
----An optional {@link Command} that is executed *after* inserting this completion.
----@field command? lsp.Command
-
----Inline completion options used during static or dynamic registration.
----
----@since 3.18.0
----@class lsp.InlineCompletionRegistrationOptions: lsp.InlineCompletionOptions, lsp.StaticRegistrationOptions
-
----@class lsp.RegistrationParams
----@field registrations lsp.Registration[]
-
----@class lsp.UnregistrationParams
----@field unregisterations lsp.Unregistration[]
-
----@class lsp.InitializeParams: lsp._InitializeParams
-
----The result returned from an initialize request.
----@class lsp.InitializeResult
----The capabilities the language server provides.
----@field capabilities lsp.ServerCapabilities
----Information about the server.
----
----@since 3.15.0
----@field serverInfo? anonym1
-
----The data type of the ResponseError if the
----initialize request fails.
----@class lsp.InitializeError
----Indicates whether the client execute the following retry logic:
----(1) show the message provided by the ResponseError to the user
----(2) user selects retry or cancel
----(3) if user selected retry the initialize method is sent again.
----@field retry boolean
-
----@class lsp.InitializedParams
-
----The parameters of a change configuration notification.
----@class lsp.DidChangeConfigurationParams
----The actual changed settings
----@field settings lsp.LSPAny
-
----@class lsp.DidChangeConfigurationRegistrationOptions
----@field section? string|string[]
-
----The parameters of a notification message.
----@class lsp.ShowMessageParams
----The message type. See {@link MessageType}
----@field type lsp.MessageType
----The actual message.
----@field message string
-
----@class lsp.ShowMessageRequestParams
----The message type. See {@link MessageType}
----@field type lsp.MessageType
----The actual message.
----@field message string
----The message action items to present.
----@field actions? lsp.MessageActionItem[]
-
----@class lsp.MessageActionItem
----A short title like 'Retry', 'Open Log' etc.
----@field title string
-
----The log message parameters.
----@class lsp.LogMessageParams
----The message type. See {@link MessageType}
----@field type lsp.MessageType
----The actual message.
----@field message string
-
----The parameters sent in an open text document notification
----@class lsp.DidOpenTextDocumentParams
----The document that was opened.
----@field textDocument lsp.TextDocumentItem
-
----The change text document notification's parameters.
----@class lsp.DidChangeTextDocumentParams
----The document that did change. The version number points
----to the version after all provided content changes have
----been applied.
----@field textDocument lsp.VersionedTextDocumentIdentifier
----The actual content changes. The content changes describe single state changes
----to the document. So if there are two content changes c1 (at array index 0) and
----c2 (at array index 1) for a document in state S then c1 moves the document from
----S to S' and c2 from S' to S''. So c1 is computed on the state S and c2 is computed
----on the state S'.
----
----To mirror the content of a document using change events use the following approach:
----- start with the same initial content
----- apply the 'textDocument/didChange' notifications in the order you receive them.
----- apply the `TextDocumentContentChangeEvent`s in a single notification in the order
----  you receive them.
----@field contentChanges lsp.TextDocumentContentChangeEvent[]
-
----Describe options to be used when registered for text document change events.
----@class lsp.TextDocumentChangeRegistrationOptions: lsp.TextDocumentRegistrationOptions
----How documents are synced to the server.
----@field syncKind lsp.TextDocumentSyncKind
-
----The parameters sent in a close text document notification
----@class lsp.DidCloseTextDocumentParams
----The document that was closed.
----@field textDocument lsp.TextDocumentIdentifier
-
----The parameters sent in a save text document notification
----@class lsp.DidSaveTextDocumentParams
----The document that was saved.
----@field textDocument lsp.TextDocumentIdentifier
----Optional the content when saved. Depends on the includeText value
----when the save notification was requested.
----@field text? string
-
----Save registration options.
----@class lsp.TextDocumentSaveRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameters sent in a will save text document notification.
----@class lsp.WillSaveTextDocumentParams
----The document that will be saved.
----@field textDocument lsp.TextDocumentIdentifier
----The 'TextDocumentSaveReason'.
----@field reason lsp.TextDocumentSaveReason
-
----A text edit applicable to a text document.
----@class lsp.TextEdit
----The range of the text document to be manipulated. To insert
----text into a document create a range where start === end.
----@field range lsp.Range
----The string to be inserted. For delete operations use an
----empty string.
----@field newText string
-
----The watched files change notification's parameters.
----@class lsp.DidChangeWatchedFilesParams
----The actual file events.
----@field changes lsp.FileEvent[]
-
----Describe options to be used when registered for text document change events.
----@class lsp.DidChangeWatchedFilesRegistrationOptions
----The watchers to register.
----@field watchers lsp.FileSystemWatcher[]
-
----The publish diagnostic notification's parameters.
----@class lsp.PublishDiagnosticsParams
----The URI for which diagnostic information is reported.
----@field uri lsp.DocumentUri
----Optional the version number of the document the diagnostics are published for.
----
----@since 3.15.0
----@field version? integer
----An array of diagnostic information items.
----@field diagnostics lsp.Diagnostic[]
-
----Completion parameters
----@class lsp.CompletionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
----The completion context. This is only available it the client specifies
----to send this using the client capability `textDocument.completion.contextSupport === true`
----@field context? lsp.CompletionContext
-
----A completion item represents a text snippet that is
----proposed to complete text that is being typed.
----@class lsp.CompletionItem
----The label of this completion item.
----
----The label property is also by default the text that
----is inserted when selecting this completion.
----
----If label details are provided the label itself should
----be an unqualified name of the completion item.
----@field label string
----Additional details for the label
----
----@since 3.17.0
----@field labelDetails? lsp.CompletionItemLabelDetails
----The kind of this completion item. Based of the kind
----an icon is chosen by the editor.
----@field kind? lsp.CompletionItemKind
----Tags for this completion item.
----
----@since 3.15.0
----@field tags? lsp.CompletionItemTag[]
----A human-readable string with additional information
----about this item, like type or symbol information.
----@field detail? string
----A human-readable string that represents a doc-comment.
----@field documentation? string|lsp.MarkupContent
----Indicates if this item is deprecated.
----@deprecated Use `tags` instead.
----@field deprecated? boolean
----Select this item when showing.
----
----*Note* that only one completion item can be selected and that the
----tool / client decides which item that is. The rule is that the *first*
----item of those that match best is selected.
----@field preselect? boolean
----A string that should be used when comparing this item
----with other items. When `falsy` the {@link CompletionItem.label label}
----is used.
----@field sortText? string
----A string that should be used when filtering a set of
----completion items. When `falsy` the {@link CompletionItem.label label}
----is used.
----@field filterText? string
----A string that should be inserted into a document when selecting
----this completion. When `falsy` the {@link CompletionItem.label label}
----is used.
----
----The `insertText` is subject to interpretation by the client side.
----Some tools might not take the string literally. For example
----VS Code when code complete is requested in this example
----`con<cursor position>` and a completion item with an `insertText` of
----`console` is provided it will only insert `sole`. Therefore it is
----recommended to use `textEdit` instead since it avoids additional client
----side interpretation.
----@field insertText? string
----The format of the insert text. The format applies to both the
----`insertText` property and the `newText` property of a provided
----`textEdit`. If omitted defaults to `InsertTextFormat.PlainText`.
----
----Please note that the insertTextFormat doesn't apply to
----`additionalTextEdits`.
----@field insertTextFormat? lsp.InsertTextFormat
----How whitespace and indentation is handled during completion
----item insertion. If not provided the clients default value depends on
----the `textDocument.completion.insertTextMode` client capability.
----
----@since 3.16.0
----@field insertTextMode? lsp.InsertTextMode
----An {@link TextEdit edit} which is applied to a document when selecting
----this completion. When an edit is provided the value of
----{@link CompletionItem.insertText insertText} is ignored.
----
----Most editors support two different operations when accepting a completion
----item. One is to insert a completion text and the other is to replace an
----existing text with a completion text. Since this can usually not be
----predetermined by a server it can report both ranges. Clients need to
----signal support for `InsertReplaceEdits` via the
----`textDocument.completion.insertReplaceSupport` client capability
----property.
----
----*Note 1:* The text edit's range as well as both ranges from an insert
----replace edit must be a [single line] and they must contain the position
----at which completion has been requested.
----*Note 2:* If an `InsertReplaceEdit` is returned the edit's insert range
----must be a prefix of the edit's replace range, that means it must be
----contained and starting at the same position.
----
----@since 3.16.0 additional type `InsertReplaceEdit`
----@field textEdit? lsp.TextEdit|lsp.InsertReplaceEdit
----The edit text used if the completion item is part of a CompletionList and
----CompletionList defines an item default for the text edit range.
----
----Clients will only honor this property if they opt into completion list
----item defaults using the capability `completionList.itemDefaults`.
----
----If not provided and a list's default range is provided the label
----property is used as a text.
----
----@since 3.17.0
----@field textEditText? string
----An optional array of additional {@link TextEdit text edits} that are applied when
----selecting this completion. Edits must not overlap (including the same insert position)
----with the main {@link CompletionItem.textEdit edit} nor with themselves.
----
----Additional text edits should be used to change text unrelated to the current cursor position
----(for example adding an import statement at the top of the file if the completion item will
----insert an unqualified type).
----@field additionalTextEdits? lsp.TextEdit[]
----An optional set of characters that when pressed while this completion is active will accept it first and
----then type that character. *Note* that all commit characters should have `length=1` and that superfluous
----characters will be ignored.
----@field commitCharacters? string[]
----An optional {@link Command command} that is executed *after* inserting this completion. *Note* that
----additional modifications to the current document should be described with the
----{@link CompletionItem.additionalTextEdits additionalTextEdits}-property.
----@field command? lsp.Command
----A data entry field that is preserved on a completion item between a
----{@link CompletionRequest} and a {@link CompletionResolveRequest}.
----@field data? lsp.LSPAny
-
----Represents a collection of {@link CompletionItem completion items} to be presented
----in the editor.
----@class lsp.CompletionList
----This list it not complete. Further typing results in recomputing this list.
----
----Recomputed lists have all their items replaced (not appended) in the
----incomplete completion sessions.
----@field isIncomplete boolean
----In many cases the items of an actual completion result share the same
----value for properties like `commitCharacters` or the range of a text
----edit. A completion list can therefore define item defaults which will
----be used if a completion item itself doesn't specify the value.
----
----If a completion list specifies a default value and a completion item
----also specifies a corresponding value the one from the item is used.
----
----Servers are only allowed to return default values if the client
----signals support for this via the `completionList.itemDefaults`
----capability.
----
----@since 3.17.0
----@field itemDefaults? anonym3
----The completion items.
----@field items lsp.CompletionItem[]
-
----Registration options for a {@link CompletionRequest}.
----@class lsp.CompletionRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----Parameters for a {@link HoverRequest}.
----@class lsp.HoverParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
-
----The result of a hover request.
----@class lsp.Hover
----The hover's content
----@field contents lsp.MarkupContent|lsp.MarkedString|lsp.MarkedString[]
----An optional range inside the text document that is used to
----visualize the hover, e.g. by changing the background color.
----@field range? lsp.Range
-
----Registration options for a {@link HoverRequest}.
----@class lsp.HoverRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----Parameters for a {@link SignatureHelpRequest}.
----@class lsp.SignatureHelpParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
----The signature help context. This is only available if the client specifies
----to send this using the client capability `textDocument.signatureHelp.contextSupport === true`
----
----@since 3.15.0
----@field context? lsp.SignatureHelpContext
-
----Signature help represents the signature of something
----callable. There can be multiple signature but only one
----active and only one active parameter.
----@class lsp.SignatureHelp
----One or more signatures.
----@field signatures lsp.SignatureInformation[]
----The active signature. If omitted or the value lies outside the
----range of `signatures` the value defaults to zero or is ignored if
----the `SignatureHelp` has no signatures.
----
----Whenever possible implementors should make an active decision about
----the active signature and shouldn't rely on a default value.
----
----In future version of the protocol this property might become
----mandatory to better express this.
----@field activeSignature? uinteger
----The active parameter of the active signature. If omitted or the value
----lies outside the range of `signatures[activeSignature].parameters`
----defaults to 0 if the active signature has parameters. If
----the active signature has no parameters it is ignored.
----In future version of the protocol this property might become
----mandatory to better express the active parameter if the
----active signature does have any.
----@field activeParameter? uinteger
-
----Registration options for a {@link SignatureHelpRequest}.
----@class lsp.SignatureHelpRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----Parameters for a {@link DefinitionRequest}.
----@class lsp.DefinitionParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
-
----Registration options for a {@link DefinitionRequest}.
----@class lsp.DefinitionRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----Parameters for a {@link ReferencesRequest}.
----@class lsp.ReferenceParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
----@field context lsp.ReferenceContext
-
----Registration options for a {@link ReferencesRequest}.
----@class lsp.ReferenceRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----Parameters for a {@link DocumentHighlightRequest}.
----@class lsp.DocumentHighlightParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams, lsp.PartialResultParams
-
----A document highlight is a range inside a text document which deserves
----special attention. Usually a document highlight is visualized by changing
----the background color of its range.
----@class lsp.DocumentHighlight
----The range this highlight applies to.
----@field range lsp.Range
----The highlight kind, default is {@link DocumentHighlightKind.Text text}.
----@field kind? lsp.DocumentHighlightKind
-
----Registration options for a {@link DocumentHighlightRequest}.
----@class lsp.DocumentHighlightRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----Parameters for a {@link DocumentSymbolRequest}.
----@class lsp.DocumentSymbolParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
-
----Represents information about programming constructs like variables, classes,
----interfaces etc.
----@class lsp.SymbolInformation: lsp.BaseSymbolInformation
----Indicates if this symbol is deprecated.
----
----@deprecated Use tags instead
----@field deprecated? boolean
----The location of this symbol. The location's range is used by a tool
----to reveal the location in the editor. If the symbol is selected in the
----tool the range's start information is used to position the cursor. So
----the range usually spans more than the actual symbol's name and does
----normally include things like visibility modifiers.
----
----The range doesn't have to denote a node range in the sense of an abstract
----syntax tree. It can therefore not be used to re-construct a hierarchy of
----the symbols.
----@field location lsp.Location
-
----Represents programming constructs like variables, classes, interfaces etc.
----that appear in a document. Document symbols can be hierarchical and they
----have two ranges: one that encloses its definition and one that points to
----its most interesting range, e.g. the range of an identifier.
----@class lsp.DocumentSymbol
----The name of this symbol. Will be displayed in the user interface and therefore must not be
----an empty string or a string only consisting of white spaces.
----@field name string
----More detail for this symbol, e.g the signature of a function.
----@field detail? string
----The kind of this symbol.
----@field kind lsp.SymbolKind
----Tags for this document symbol.
----
----@since 3.16.0
----@field tags? lsp.SymbolTag[]
----Indicates if this symbol is deprecated.
----
----@deprecated Use tags instead
----@field deprecated? boolean
----The range enclosing this symbol not including leading/trailing whitespace but everything else
----like comments. This information is typically used to determine if the clients cursor is
----inside the symbol to reveal in the symbol in the UI.
----@field range lsp.Range
----The range that should be selected and revealed when this symbol is being picked, e.g the name of a function.
----Must be contained by the `range`.
----@field selectionRange lsp.Range
----Children of this symbol, e.g. properties of a class.
----@field children? lsp.DocumentSymbol[]
-
----Registration options for a {@link DocumentSymbolRequest}.
----@class lsp.DocumentSymbolRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameters of a {@link CodeActionRequest}.
----@class lsp.CodeActionParams
----The document in which the command was invoked.
----@field textDocument lsp.TextDocumentIdentifier
----The range for which the command was invoked.
----@field range lsp.Range
----Context carrying additional information.
----@field context lsp.CodeActionContext
-
----Represents a reference to a command. Provides a title which
----will be used to represent a command in the UI and, optionally,
----an array of arguments which will be passed to the command handler
----function when invoked.
----@class lsp.Command
----Title of the command, like `save`.
----@field title string
----The identifier of the actual command handler.
----@field command string
----Arguments that the command handler should be
----invoked with.
----@field arguments? lsp.LSPAny[]
-
----A code action represents a change that can be performed in code, e.g. to fix a problem or
----to refactor code.
----
----A CodeAction must set either `edit` and/or a `command`. If both are supplied, the `edit` is applied first, then the `command` is executed.
----@class lsp.CodeAction
----A short, human-readable, title for this code action.
----@field title string
----The kind of the code action.
----
----Used to filter code actions.
----@field kind? lsp.CodeActionKind
----The diagnostics that this code action resolves.
----@field diagnostics? lsp.Diagnostic[]
----Marks this as a preferred action. Preferred actions are used by the `auto fix` command and can be targeted
----by keybindings.
----
----A quick fix should be marked preferred if it properly addresses the underlying error.
----A refactoring should be marked preferred if it is the most reasonable choice of actions to take.
----
----@since 3.15.0
----@field isPreferred? boolean
----Marks that the code action cannot currently be applied.
----
----Clients should follow the following guidelines regarding disabled code actions:
----
----  - Disabled code actions are not shown in automatic [lightbulbs](https://code.visualstudio.com/docs/editor/editingevolved#_code-action)
----    code action menus.
----
----  - Disabled actions are shown as faded out in the code action menu when the user requests a more specific type
----    of code action, such as refactorings.
----
----  - If the user has a [keybinding](https://code.visualstudio.com/docs/editor/refactoring#_keybindings-for-code-actions)
----    that auto applies a code action and only disabled code actions are returned, the client should show the user an
----    error message with `reason` in the editor.
----
----@since 3.16.0
----@field disabled? anonym4
----The workspace edit this code action performs.
----@field edit? lsp.WorkspaceEdit
----A command this code action executes. If a code action
----provides an edit and a command, first the edit is
----executed and then the command.
----@field command? lsp.Command
----A data entry field that is preserved on a code action between
----a `textDocument/codeAction` and a `codeAction/resolve` request.
----
----@since 3.16.0
----@field data? lsp.LSPAny
-
----Registration options for a {@link CodeActionRequest}.
----@class lsp.CodeActionRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameters of a {@link WorkspaceSymbolRequest}.
----@class lsp.WorkspaceSymbolParams
----A query string to filter symbols by. Clients may send an empty
----string here to request all symbols.
----@field query string
-
----A special workspace symbol that supports locations without a range.
----
----See also SymbolInformation.
----
----@since 3.17.0
----@class lsp.WorkspaceSymbol: lsp.BaseSymbolInformation
----The location of the symbol. Whether a server is allowed to
----return a location without a range depends on the client
----capability `workspace.symbol.resolveSupport`.
----
----See SymbolInformation#location for more details.
----@field location lsp.Location|anonym5
----A data entry field that is preserved on a workspace symbol between a
----workspace symbol request and a workspace symbol resolve request.
----@field data? lsp.LSPAny
-
----Registration options for a {@link WorkspaceSymbolRequest}.
----@class lsp.WorkspaceSymbolRegistrationOptions: lsp.WorkspaceSymbolOptions
-
----The parameters of a {@link CodeLensRequest}.
----@class lsp.CodeLensParams
----The document to request code lens for.
----@field textDocument lsp.TextDocumentIdentifier
-
----A code lens represents a {@link Command command} that should be shown along with
----source text, like the number of references, a way to run tests, etc.
----
----A code lens is _unresolved_ when no command is associated to it. For performance
----reasons the creation of a code lens and resolving should be done in two stages.
----@class lsp.CodeLens
----The range in which this code lens is valid. Should only span a single line.
----@field range lsp.Range
----The command this code lens represents.
----@field command? lsp.Command
----A data entry field that is preserved on a code lens item between
----a {@link CodeLensRequest} and a [CodeLensResolveRequest]
----(#CodeLensResolveRequest)
----@field data? lsp.LSPAny
-
----Registration options for a {@link CodeLensRequest}.
----@class lsp.CodeLensRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameters of a {@link DocumentLinkRequest}.
----@class lsp.DocumentLinkParams
----The document to provide document links for.
----@field textDocument lsp.TextDocumentIdentifier
-
----A document link is a range in a text document that links to an internal or external resource, like another
----text document or a web site.
----@class lsp.DocumentLink
----The range this link applies to.
----@field range lsp.Range
----The uri this link points to. If missing a resolve request is sent later.
----@field target? lsp.URI
----The tooltip text when you hover over this link.
----
----If a tooltip is provided, is will be displayed in a string that includes instructions on how to
----trigger the link, such as `{0} (ctrl + click)`. The specific instructions vary depending on OS,
----user settings, and localization.
----
----@since 3.15.0
----@field tooltip? string
----A data entry field that is preserved on a document link between a
----DocumentLinkRequest and a DocumentLinkResolveRequest.
----@field data? lsp.LSPAny
-
----Registration options for a {@link DocumentLinkRequest}.
----@class lsp.DocumentLinkRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameters of a {@link DocumentFormattingRequest}.
----@class lsp.DocumentFormattingParams
----The document to format.
----@field textDocument lsp.TextDocumentIdentifier
----The format options.
----@field options lsp.FormattingOptions
-
----Registration options for a {@link DocumentFormattingRequest}.
----@class lsp.DocumentFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameters of a {@link DocumentRangeFormattingRequest}.
----@class lsp.DocumentRangeFormattingParams
----The document to format.
----@field textDocument lsp.TextDocumentIdentifier
----The range to format
----@field range lsp.Range
----The format options
----@field options lsp.FormattingOptions
-
----Registration options for a {@link DocumentRangeFormattingRequest}.
----@class lsp.DocumentRangeFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameters of a {@link DocumentRangesFormattingRequest}.
----
----@since 3.18.0
----@proposed
----@class lsp.DocumentRangesFormattingParams
----The document to format.
----@field textDocument lsp.TextDocumentIdentifier
----The ranges to format
----@field ranges lsp.Range[]
----The format options
----@field options lsp.FormattingOptions
-
----The parameters of a {@link DocumentOnTypeFormattingRequest}.
----@class lsp.DocumentOnTypeFormattingParams
----The document to format.
----@field textDocument lsp.TextDocumentIdentifier
----The position around which the on type formatting should happen.
----This is not necessarily the exact position where the character denoted
----by the property `ch` got typed.
----@field position lsp.Position
----The character that has been typed that triggered the formatting
----on type request. That is not necessarily the last character that
----got inserted into the document since the client could auto insert
----characters as well (e.g. like automatic brace completion).
----@field ch string
----The formatting options.
----@field options lsp.FormattingOptions
-
----Registration options for a {@link DocumentOnTypeFormattingRequest}.
----@class lsp.DocumentOnTypeFormattingRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----The parameters of a {@link RenameRequest}.
----@class lsp.RenameParams
----The document to rename.
----@field textDocument lsp.TextDocumentIdentifier
----The position at which this request was sent.
----@field position lsp.Position
----The new name of the symbol. If the given name is not valid the
----request must return a {@link ResponseError} with an
----appropriate message set.
----@field newName string
-
----Registration options for a {@link RenameRequest}.
----@class lsp.RenameRegistrationOptions: lsp.TextDocumentRegistrationOptions
-
----@class lsp.PrepareRenameParams: lsp.TextDocumentPositionParams, lsp.WorkDoneProgressParams
-
----The parameters of a {@link ExecuteCommandRequest}.
----@class lsp.ExecuteCommandParams
----The identifier of the actual command handler.
----@field command string
----Arguments that the command should be invoked with.
----@field arguments? lsp.LSPAny[]
-
----Registration options for a {@link ExecuteCommandRequest}.
----@class lsp.ExecuteCommandRegistrationOptions: lsp.ExecuteCommandOptions
-
----The parameters passed via an apply workspace edit request.
----@class lsp.ApplyWorkspaceEditParams
----An optional label of the workspace edit. This label is
----presented in the user interface for example on an undo
----stack to undo the workspace edit.
----@field label? string
----The edits to apply.
----@field edit lsp.WorkspaceEdit
-
----The result returned from the apply workspace edit request.
----
----@since 3.17 renamed from ApplyWorkspaceEditResponse
----@class lsp.ApplyWorkspaceEditResult
----Indicates whether the edit was applied or not.
----@field applied boolean
----An optional textual description for why the edit was not applied.
----This may be used by the server for diagnostic logging or to provide
----a suitable error for a request that triggered the edit.
----@field failureReason? string
----Depending on the client's failure handling strategy `failedChange` might
----contain the index of the change that failed. This property is only available
----if the client signals a `failureHandlingStrategy` in its client capabilities.
----@field failedChange? uinteger
-
----@class lsp.WorkDoneProgressBegin
----@field kind "begin"
----Mandatory title of the progress operation. Used to briefly inform about
----the kind of operation being performed.
----
----Examples: "Indexing" or "Linking dependencies".
----@field title string
----Controls if a cancel button should show to allow the user to cancel the
----long running operation. Clients that don't support cancellation are allowed
----to ignore the setting.
----@field cancellable? boolean
----Optional, more detailed associated progress message. Contains
----complementary information to the `title`.
----
----Examples: "3/25 files", "project/src/module2", "node_modules/some_dep".
----If unset, the previous progress message (if any) is still valid.
----@field message? string
----Optional progress percentage to display (value 100 is considered 100%).
----If not provided infinite progress is assumed and clients are allowed
----to ignore the `percentage` value in subsequent in report notifications.
----
----The value should be steadily rising. Clients are free to ignore values
----that are not following this rule. The value range is [0, 100].
----@field percentage? uinteger
-
----@class lsp.WorkDoneProgressReport
----@field kind "report"
----Controls enablement state of a cancel button.
----
----Clients that don't support cancellation or don't support controlling the button's
----enablement state are allowed to ignore the property.
----@field cancellable? boolean
----Optional, more detailed associated progress message. Contains
----complementary information to the `title`.
----
----Examples: "3/25 files", "project/src/module2", "node_modules/some_dep".
----If unset, the previous progress message (if any) is still valid.
----@field message? string
----Optional progress percentage to display (value 100 is considered 100%).
----If not provided infinite progress is assumed and clients are allowed
----to ignore the `percentage` value in subsequent in report notifications.
----
----The value should be steadily rising. Clients are free to ignore values
----that are not following this rule. The value range is [0, 100]
----@field percentage? uinteger
-
----@class lsp.WorkDoneProgressEnd
----@field kind "end"
----Optional, a final message indicating to for example indicate the outcome
----of the operation.
----@field message? string
-
----@class lsp.SetTraceParams
----@field value lsp.TraceValues
-
----@class lsp.LogTraceParams
----@field message string
----@field verbose? string
-
----@class lsp.CancelParams
----The request id to cancel.
----@field id integer|string
-
----@class lsp.ProgressParams
----The progress token provided by the client or server.
----@field token lsp.ProgressToken
----The progress data.
----@field value lsp.LSPAny
-
----A parameter literal used in requests to pass a text document and a position inside that
----document.
----@class lsp.TextDocumentPositionParams
----The text document.
----@field textDocument lsp.TextDocumentIdentifier
----The position inside the text document.
----@field position lsp.Position
-
----@class lsp.WorkDoneProgressParams
----An optional token that a server can use to report work done progress.
----@field workDoneToken? lsp.ProgressToken
-
----@class lsp.PartialResultParams
----An optional token that a server can use to report partial results (e.g. streaming) to
----the client.
----@field partialResultToken? lsp.ProgressToken
-
----Represents the connection of two locations. Provides additional metadata over normal {@link Location locations},
----including an origin range.
----@class lsp.LocationLink
----Span of the origin of this link.
----
----Used as the underlined span for mouse interaction. Defaults to the word range at
----the definition position.
----@field originSelectionRange? lsp.Range
----The target resource identifier of this link.
----@field targetUri lsp.DocumentUri
----The full target range of this link. If the target for example is a symbol then target range is the
----range enclosing this symbol not including leading/trailing whitespace but everything else
----like comments. This information is typically used to highlight the range in the editor.
----@field targetRange lsp.Range
----The range that should be selected and revealed when this link is being followed, e.g the name of a function.
----Must be contained by the `targetRange`. See also `DocumentSymbol#range`
----@field targetSelectionRange lsp.Range
-
----A range in a text document expressed as (zero-based) start and end positions.
----
----If you want to specify a range that contains a line including the line ending
----character(s) then use an end position denoting the start of the next line.
----For example:
----```ts
----{
----    start: { line: 5, character: 23 }
----    end : { line 6, character : 0 }
----}
----```
----@class lsp.Range
----The range's start position.
----@field start lsp.Position
----The range's end position.
----@field end lsp.Position
-
----@class lsp.ImplementationOptions
-
----Static registration options to be returned in the initialize
----request.
----@class lsp.StaticRegistrationOptions
----The id used to register the request. The id can be used to deregister
----the request again. See also Registration#id.
----@field id? string
-
----@class lsp.TypeDefinitionOptions
-
----The workspace folder change event.
----@class lsp.WorkspaceFoldersChangeEvent
----The array of added workspace folders
----@field added lsp.WorkspaceFolder[]
----The array of the removed workspace folders
----@field removed lsp.WorkspaceFolder[]
-
----@class lsp.ConfigurationItem
----The scope to get the configuration section for.
----@field scopeUri? string
----The configuration section asked for.
----@field section? string
-
----A literal to identify a text document in the client.
----@class lsp.TextDocumentIdentifier
----The text document's uri.
----@field uri lsp.DocumentUri
-
----Represents a color in RGBA space.
----@class lsp.Color
----The red component of this color in the range [0-1].
----@field red decimal
----The green component of this color in the range [0-1].
----@field green decimal
----The blue component of this color in the range [0-1].
----@field blue decimal
----The alpha component of this color in the range [0-1].
----@field alpha decimal
-
----@class lsp.DocumentColorOptions
-
----@class lsp.FoldingRangeOptions
-
----@class lsp.DeclarationOptions
-
----Position in a text document expressed as zero-based line and character
----offset. Prior to 3.17 the offsets were always based on a UTF-16 string
----representation. So a string of the form `a𐐀b` the character offset of the
----character `a` is 0, the character offset of `𐐀` is 1 and the character
----offset of b is 3 since `𐐀` is represented using two code units in UTF-16.
----Since 3.17 clients and servers can agree on a different string encoding
----representation (e.g. UTF-8). The client announces it's supported encoding
----via the client capability [`general.positionEncodings`](#clientCapabilities).
----The value is an array of position encodings the client supports, with
----decreasing preference (e.g. the encoding at index `0` is the most preferred
----one). To stay backwards compatible the only mandatory encoding is UTF-16
----represented via the string `utf-16`. The server can pick one of the
----encodings offered by the client and signals that encoding back to the
----client via the initialize result's property
----[`capabilities.positionEncoding`](#serverCapabilities). If the string value
----`utf-16` is missing from the client's capability `general.positionEncodings`
----servers can safely assume that the client supports UTF-16. If the server
----omits the position encoding in its initialize result the encoding defaults
----to the string value `utf-16`. Implementation considerations: since the
----conversion from one encoding into another requires the content of the
----file / line the conversion is best done where the file is read which is
----usually on the server side.
----
----Positions are line end character agnostic. So you can not specify a position
----that denotes `\r|\n` or `\n|` where `|` represents the character offset.
----
----@since 3.17.0 - support for negotiated position encoding.
----@class lsp.Position
----Line position in a document (zero-based).
----
----If a line number is greater than the number of lines in a document, it defaults back to the number of lines in the document.
----If a line number is negative, it defaults to 0.
----@field line uinteger
----Character offset on a line in a document (zero-based).
----
----The meaning of this offset is determined by the negotiated
----`PositionEncodingKind`.
----
----If the character value is greater than the line length it defaults back to the
----line length.
----@field character uinteger
-
----@class lsp.SelectionRangeOptions
-
----Call hierarchy options used during static registration.
----
----@since 3.16.0
----@class lsp.CallHierarchyOptions
-
----@since 3.16.0
----@class lsp.SemanticTokensOptions
----The legend used by the server
----@field legend lsp.SemanticTokensLegend
----Server supports providing semantic tokens for a specific range
----of a document.
----@field range? boolean|anonym6
----Server supports providing semantic tokens for a full document.
----@field full? boolean|anonym7
-
----@since 3.16.0
----@class lsp.SemanticTokensEdit
----The start offset of the edit.
----@field start uinteger
----The count of elements to remove.
----@field deleteCount uinteger
----The elements to insert.
----@field data? uinteger[]
-
----@class lsp.LinkedEditingRangeOptions
-
----Represents information on a file/folder create.
----
----@since 3.16.0
----@class lsp.FileCreate
----A file:// URI for the location of the file/folder being created.
----@field uri string
-
----Describes textual changes on a text document. A TextDocumentEdit describes all changes
----on a document version Si and after they are applied move the document to version Si+1.
----So the creator of a TextDocumentEdit doesn't need to sort the array of edits or do any
----kind of ordering. However the edits must be non overlapping.
----@class lsp.TextDocumentEdit
----The text document to change.
----@field textDocument lsp.OptionalVersionedTextDocumentIdentifier
----The edits to be applied.
----
----@since 3.16.0 - support for AnnotatedTextEdit. This is guarded using a
----client capability.
----@field edits lsp.TextEdit|lsp.AnnotatedTextEdit[]
-
----Create file operation.
----@class lsp.CreateFile: lsp.ResourceOperation
----A create
----@field kind "create"
----The resource to create.
----@field uri lsp.DocumentUri
----Additional options
----@field options? lsp.CreateFileOptions
-
----Rename file operation
----@class lsp.RenameFile: lsp.ResourceOperation
----A rename
----@field kind "rename"
----The old (existing) location.
----@field oldUri lsp.DocumentUri
----The new location.
----@field newUri lsp.DocumentUri
----Rename options.
----@field options? lsp.RenameFileOptions
-
----Delete file operation
----@class lsp.DeleteFile: lsp.ResourceOperation
----A delete
----@field kind "delete"
----The file to delete.
----@field uri lsp.DocumentUri
----Delete options.
----@field options? lsp.DeleteFileOptions
-
----Additional information that describes document changes.
----
----@since 3.16.0
----@class lsp.ChangeAnnotation
----A human-readable string describing the actual change. The string
----is rendered prominent in the user interface.
----@field label string
----A flag which indicates that user confirmation is needed
----before applying the change.
----@field needsConfirmation? boolean
----A human-readable string which is rendered less prominent in
----the user interface.
----@field description? string
-
----A filter to describe in which file operation requests or notifications
----the server is interested in receiving.
----
----@since 3.16.0
----@class lsp.FileOperationFilter
----A Uri scheme like `file` or `untitled`.
----@field scheme? string
----The actual file operation pattern.
----@field pattern lsp.FileOperationPattern
-
----Represents information on a file/folder rename.
----
----@since 3.16.0
----@class lsp.FileRename
----A file:// URI for the original location of the file/folder being renamed.
----@field oldUri string
----A file:// URI for the new location of the file/folder being renamed.
----@field newUri string
-
----Represents information on a file/folder delete.
----
----@since 3.16.0
----@class lsp.FileDelete
----A file:// URI for the location of the file/folder being deleted.
----@field uri string
-
----@class lsp.MonikerOptions
-
----Type hierarchy options used during static registration.
----
----@since 3.17.0
----@class lsp.TypeHierarchyOptions
-
----@since 3.17.0
----@class lsp.InlineValueContext
----The stack frame (as a DAP Id) where the execution has stopped.
----@field frameId integer
----The document range where execution has stopped.
----Typically the end position of the range denotes the line where the inline values are shown.
----@field stoppedLocation lsp.Range
-
----Provide inline value as text.
----
----@since 3.17.0
----@class lsp.InlineValueText
----The document range for which the inline value applies.
----@field range lsp.Range
----The text of the inline value.
----@field text string
-
----Provide inline value through a variable lookup.
----If only a range is specified, the variable name will be extracted from the underlying document.
----An optional variable name can be used to override the extracted name.
----
----@since 3.17.0
----@class lsp.InlineValueVariableLookup
----The document range for which the inline value applies.
----The range is used to extract the variable name from the underlying document.
----@field range lsp.Range
----If specified the name of the variable to look up.
----@field variableName? string
----How to perform the lookup.
----@field caseSensitiveLookup boolean
-
----Provide an inline value through an expression evaluation.
----If only a range is specified, the expression will be extracted from the underlying document.
----An optional expression can be used to override the extracted expression.
----
----@since 3.17.0
----@class lsp.InlineValueEvaluatableExpression
----The document range for which the inline value applies.
----The range is used to extract the evaluatable expression from the underlying document.
----@field range lsp.Range
----If specified the expression overrides the extracted expression.
----@field expression? string
-
----Inline value options used during static registration.
----
----@since 3.17.0
----@class lsp.InlineValueOptions
-
----An inlay hint label part allows for interactive and composite labels
----of inlay hints.
----
----@since 3.17.0
----@class lsp.InlayHintLabelPart
----The value of this label part.
----@field value string
----The tooltip text when you hover over this label part. Depending on
----the client capability `inlayHint.resolveSupport` clients might resolve
----this property late using the resolve request.
----@field tooltip? string|lsp.MarkupContent
----An optional source code location that represents this
----label part.
----
----The editor will use this location for the hover and for code navigation
----features: This part will become a clickable link that resolves to the
----definition of the symbol at the given location (not necessarily the
----location itself), it shows the hover that shows at the given location,
----and it shows a context menu with further code navigation commands.
----
----Depending on the client capability `inlayHint.resolveSupport` clients
----might resolve this property late using the resolve request.
----@field location? lsp.Location
----An optional command for this label part.
----
----Depending on the client capability `inlayHint.resolveSupport` clients
----might resolve this property late using the resolve request.
----@field command? lsp.Command
-
----A `MarkupContent` literal represents a string value which content is interpreted base on its
----kind flag. Currently the protocol supports `plaintext` and `markdown` as markup kinds.
----
----If the kind is `markdown` then the value can contain fenced code blocks like in GitHub issues.
----See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
----
----Here is an example how such a string can be constructed using JavaScript / TypeScript:
----```ts
----let markdown: MarkdownContent = {
---- kind: MarkupKind.Markdown,
---- value: [
----   '# Header',
----   'Some text',
----   '```typescript',
----   'someCode();',
----   '```'
---- ].join('\n')
----};
----```
----
----*Please Note* that clients might sanitize the return markdown. A client could decide to
----remove HTML from the markdown to avoid script execution.
----@class lsp.MarkupContent
----The type of the Markup
----@field kind lsp.MarkupKind
----The content itself
----@field value string
-
----Inlay hint options used during static registration.
----
----@since 3.17.0
----@class lsp.InlayHintOptions
----The server provides support to resolve additional
----information for an inlay hint item.
----@field resolveProvider? boolean
-
----A full diagnostic report with a set of related documents.
----
----@since 3.17.0
----@class lsp.RelatedFullDocumentDiagnosticReport: lsp.FullDocumentDiagnosticReport
----Diagnostics of related documents. This information is useful
----in programming languages where code in a file A can generate
----diagnostics in a file B which A depends on. An example of
----such a language is C/C++ where marco definitions in a file
----a.cpp and result in errors in a header file b.hpp.
----
----@since 3.17.0
----@field relatedDocuments? table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
-
----An unchanged diagnostic report with a set of related documents.
----
----@since 3.17.0
----@class lsp.RelatedUnchangedDocumentDiagnosticReport: lsp.UnchangedDocumentDiagnosticReport
----Diagnostics of related documents. This information is useful
----in programming languages where code in a file A can generate
----diagnostics in a file B which A depends on. An example of
----such a language is C/C++ where marco definitions in a file
----a.cpp and result in errors in a header file b.hpp.
----
----@since 3.17.0
----@field relatedDocuments? table<lsp.DocumentUri, lsp.FullDocumentDiagnosticReport|lsp.UnchangedDocumentDiagnosticReport>
-
----A diagnostic report with a full set of problems.
----
----@since 3.17.0
----@class lsp.FullDocumentDiagnosticReport
----A full document diagnostic report.
----@field kind "full"
----An optional result id. If provided it will
----be sent on the next diagnostic request for the
----same document.
----@field resultId? string
----The actual items.
----@field items lsp.Diagnostic[]
-
----A diagnostic report indicating that the last returned
----report is still accurate.
----
----@since 3.17.0
----@class lsp.UnchangedDocumentDiagnosticReport
----A document diagnostic report indicating
----no changes to the last result. A server can
----only return `unchanged` if result ids are
----provided.
----@field kind "unchanged"
----A result id which will be sent on the next
----diagnostic request for the same document.
----@field resultId string
-
----Diagnostic options.
----
----@since 3.17.0
----@class lsp.DiagnosticOptions
----An optional identifier under which the diagnostics are
----managed by the client.
----@field identifier? string
----Whether the language has inter file dependencies meaning that
----editing code in one file can result in a different diagnostic
----set in another file. Inter file dependencies are common for
----most programming languages and typically uncommon for linters.
----@field interFileDependencies boolean
----The server provides support for workspace diagnostics as well.
----@field workspaceDiagnostics boolean
-
----A previous result id in a workspace pull request.
----
----@since 3.17.0
----@class lsp.PreviousResultId
----The URI for which the client knowns a
----result id.
----@field uri lsp.DocumentUri
----The value of the previous result id.
----@field value string
-
----A notebook document.
----
----@since 3.17.0
----@class lsp.NotebookDocument
----The notebook document's uri.
----@field uri lsp.URI
----The type of the notebook.
----@field notebookType string
----The version number of this document (it will increase after each
----change, including undo/redo).
----@field version integer
----Additional metadata stored with the notebook
----document.
----
----Note: should always be an object literal (e.g. LSPObject)
----@field metadata? lsp.LSPObject
----The cells of a notebook.
----@field cells lsp.NotebookCell[]
-
----An item to transfer a text document from the client to the
----server.
----@class lsp.TextDocumentItem
----The text document's uri.
----@field uri lsp.DocumentUri
----The text document's language identifier.
----@field languageId string
----The version number of this document (it will increase after each
----change, including undo/redo).
----@field version integer
----The content of the opened text document.
----@field text string
-
----A versioned notebook document identifier.
----
----@since 3.17.0
----@class lsp.VersionedNotebookDocumentIdentifier
----The version number of this notebook document.
----@field version integer
----The notebook document's uri.
----@field uri lsp.URI
-
----A change event for a notebook document.
----
----@since 3.17.0
----@class lsp.NotebookDocumentChangeEvent
----The changed meta data if any.
----
----Note: should always be an object literal (e.g. LSPObject)
----@field metadata? lsp.LSPObject
----Changes to cells
----@field cells? anonym10
-
----A literal to identify a notebook document in the client.
----
----@since 3.17.0
----@class lsp.NotebookDocumentIdentifier
----The notebook document's uri.
----@field uri lsp.URI
-
----Provides information about the context in which an inline completion was requested.
----
----@since 3.18.0
----@class lsp.InlineCompletionContext
----Describes how the inline completion was triggered.
----@field triggerKind lsp.InlineCompletionTriggerKind
----Provides information about the currently selected item in the autocomplete widget if it is visible.
----@field selectedCompletionInfo? lsp.SelectedCompletionInfo
-
----Inline completion options used during static registration.
----
----@since 3.18.0
----@class lsp.InlineCompletionOptions
-
----General parameters to to register for an notification or to register a provider.
----@class lsp.Registration
----The id used to register the request. The id can be used to deregister
----the request again.
----@field id string
----The method / capability to register for.
----@field method string
----Options necessary for the registration.
----@field registerOptions? lsp.LSPAny
-
----General parameters to unregister a request or notification.
----@class lsp.Unregistration
----The id used to unregister the request or notification. Usually an id
----provided during the register request.
----@field id string
----The method to unregister for.
----@field method string
-
----The initialize parameters
----@class lsp._InitializeParams
----The process Id of the parent process that started
----the server.
----
----Is `null` if the process has not been started by another process.
----If the parent process is not alive then the server should exit.
----@field processId integer|lsp.null
----Information about the client
----
----@since 3.15.0
----@field clientInfo? anonym11
----The locale the client is currently showing the user interface
----in. This must not necessarily be the locale of the operating
----system.
----
----Uses IETF language tags as the value's syntax
----(See https://en.wikipedia.org/wiki/IETF_language_tag)
----
----@since 3.16.0
----@field locale? string
----The rootPath of the workspace. Is null
----if no folder is open.
----
----@deprecated in favour of rootUri.
----@field rootPath? string|lsp.null
----The rootUri of the workspace. Is null if no
----folder is open. If both `rootPath` and `rootUri` are set
----`rootUri` wins.
----
----@deprecated in favour of workspaceFolders.
----@field rootUri lsp.DocumentUri|lsp.null
----The capabilities provided by the client (editor or tool)
----@field capabilities lsp.ClientCapabilities
----User provided initialization options.
----@field initializationOptions? lsp.LSPAny
----The initial trace setting. If omitted trace is disabled ('off').
----@field trace? lsp.TraceValues
-
----@class lsp.WorkspaceFoldersInitializeParams
----The workspace folders configured in the client when the server starts.
----
----This property is only available if the client supports workspace folders.
----It can be `null` if the client supports workspace folders but none are
----configured.
----
----@since 3.6.0
----@field workspaceFolders? lsp.WorkspaceFolder[]|lsp.null
-
----Defines the capabilities provided by a language
----server.
----@class lsp.ServerCapabilities
----The position encoding the server picked from the encodings offered
----by the client via the client capability `general.positionEncodings`.
----
----If the client didn't provide any position encodings the only valid
----value that a server can return is 'utf-16'.
----
----If omitted it defaults to 'utf-16'.
----
----@since 3.17.0
----@field positionEncoding? lsp.PositionEncodingKind
----Defines how text documents are synced. Is either a detailed structure
----defining each notification or for backwards compatibility the
----TextDocumentSyncKind number.
----@field textDocumentSync? lsp.TextDocumentSyncOptions|lsp.TextDocumentSyncKind
----Defines how notebook documents are synced.
----
----@since 3.17.0
----@field notebookDocumentSync? lsp.NotebookDocumentSyncOptions|lsp.NotebookDocumentSyncRegistrationOptions
----The server provides completion support.
----@field completionProvider? lsp.CompletionOptions
----The server provides hover support.
----@field hoverProvider? boolean|lsp.HoverOptions
----The server provides signature help support.
----@field signatureHelpProvider? lsp.SignatureHelpOptions
----The server provides Goto Declaration support.
----@field declarationProvider? boolean|lsp.DeclarationOptions|lsp.DeclarationRegistrationOptions
----The server provides goto definition support.
----@field definitionProvider? boolean|lsp.DefinitionOptions
----The server provides Goto Type Definition support.
----@field typeDefinitionProvider? boolean|lsp.TypeDefinitionOptions|lsp.TypeDefinitionRegistrationOptions
----The server provides Goto Implementation support.
----@field implementationProvider? boolean|lsp.ImplementationOptions|lsp.ImplementationRegistrationOptions
----The server provides find references support.
----@field referencesProvider? boolean|lsp.ReferenceOptions
----The server provides document highlight support.
----@field documentHighlightProvider? boolean|lsp.DocumentHighlightOptions
----The server provides document symbol support.
----@field documentSymbolProvider? boolean|lsp.DocumentSymbolOptions
----The server provides code actions. CodeActionOptions may only be
----specified if the client states that it supports
----`codeActionLiteralSupport` in its initial `initialize` request.
----@field codeActionProvider? boolean|lsp.CodeActionOptions
----The server provides code lens.
----@field codeLensProvider? lsp.CodeLensOptions
----The server provides document link support.
----@field documentLinkProvider? lsp.DocumentLinkOptions
----The server provides color provider support.
----@field colorProvider? boolean|lsp.DocumentColorOptions|lsp.DocumentColorRegistrationOptions
----The server provides workspace symbol support.
----@field workspaceSymbolProvider? boolean|lsp.WorkspaceSymbolOptions
----The server provides document formatting.
----@field documentFormattingProvider? boolean|lsp.DocumentFormattingOptions
----The server provides document range formatting.
----@field documentRangeFormattingProvider? boolean|lsp.DocumentRangeFormattingOptions
----The server provides document formatting on typing.
----@field documentOnTypeFormattingProvider? lsp.DocumentOnTypeFormattingOptions
----The server provides rename support. RenameOptions may only be
----specified if the client states that it supports
----`prepareSupport` in its initial `initialize` request.
----@field renameProvider? boolean|lsp.RenameOptions
----The server provides folding provider support.
----@field foldingRangeProvider? boolean|lsp.FoldingRangeOptions|lsp.FoldingRangeRegistrationOptions
----The server provides selection range support.
----@field selectionRangeProvider? boolean|lsp.SelectionRangeOptions|lsp.SelectionRangeRegistrationOptions
----The server provides execute command support.
----@field executeCommandProvider? lsp.ExecuteCommandOptions
----The server provides call hierarchy support.
----
----@since 3.16.0
----@field callHierarchyProvider? boolean|lsp.CallHierarchyOptions|lsp.CallHierarchyRegistrationOptions
----The server provides linked editing range support.
----
----@since 3.16.0
----@field linkedEditingRangeProvider? boolean|lsp.LinkedEditingRangeOptions|lsp.LinkedEditingRangeRegistrationOptions
----The server provides semantic tokens support.
----
----@since 3.16.0
----@field semanticTokensProvider? lsp.SemanticTokensOptions|lsp.SemanticTokensRegistrationOptions
----The server provides moniker support.
----
----@since 3.16.0
----@field monikerProvider? boolean|lsp.MonikerOptions|lsp.MonikerRegistrationOptions
----The server provides type hierarchy support.
----
----@since 3.17.0
----@field typeHierarchyProvider? boolean|lsp.TypeHierarchyOptions|lsp.TypeHierarchyRegistrationOptions
----The server provides inline values.
----
----@since 3.17.0
----@field inlineValueProvider? boolean|lsp.InlineValueOptions|lsp.InlineValueRegistrationOptions
----The server provides inlay hints.
----
----@since 3.17.0
----@field inlayHintProvider? boolean|lsp.InlayHintOptions|lsp.InlayHintRegistrationOptions
----The server has support for pull model diagnostics.
----
----@since 3.17.0
----@field diagnosticProvider? lsp.DiagnosticOptions|lsp.DiagnosticRegistrationOptions
----Inline completion options used during static registration.
----
----@since 3.18.0
----@field inlineCompletionProvider? boolean|lsp.InlineCompletionOptions
----Workspace specific server capabilities.
----@field workspace? anonym12
----Experimental server capabilities.
----@field experimental? lsp.LSPAny
-
----A text document identifier to denote a specific version of a text document.
----@class lsp.VersionedTextDocumentIdentifier: lsp.TextDocumentIdentifier
----The version number of this document.
----@field version integer
-
----Save options.
----@class lsp.SaveOptions
----The client is supposed to include the content on save.
----@field includeText? boolean
-
----An event describing a file change.
----@class lsp.FileEvent
----The file's uri.
----@field uri lsp.DocumentUri
----The change type.
----@field type lsp.FileChangeType
-
----@class lsp.FileSystemWatcher
----The glob pattern to watch. See {@link GlobPattern glob pattern} for more detail.
----
----@since 3.17.0 support for relative patterns.
----@field globPattern lsp.GlobPattern
----The kind of events of interest. If omitted it defaults
----to WatchKind.Create | WatchKind.Change | WatchKind.Delete
----which is 7.
----@field kind? lsp.WatchKind
-
----Represents a diagnostic, such as a compiler error or warning. Diagnostic objects
----are only valid in the scope of a resource.
----@class lsp.Diagnostic
----The range at which the message applies
----@field range lsp.Range
----The diagnostic's severity. Can be omitted. If omitted it is up to the
----client to interpret diagnostics as error, warning, info or hint.
----@field severity? lsp.DiagnosticSeverity
----The diagnostic's code, which usually appear in the user interface.
----@field code? integer|string
----An optional property to describe the error code.
----Requires the code field (above) to be present/not null.
----
----@since 3.16.0
----@field codeDescription? lsp.CodeDescription
----A human-readable string describing the source of this
----diagnostic, e.g. 'typescript' or 'super lint'. It usually
----appears in the user interface.
----@field source? string
----The diagnostic's message. It usually appears in the user interface
----@field message string
----Additional metadata about the diagnostic.
----
----@since 3.15.0
----@field tags? lsp.DiagnosticTag[]
----An array of related diagnostic information, e.g. when symbol-names within
----a scope collide all definitions can be marked via this property.
----@field relatedInformation? lsp.DiagnosticRelatedInformation[]
----A data entry field that is preserved between a `textDocument/publishDiagnostics`
----notification and `textDocument/codeAction` request.
----
----@since 3.16.0
----@field data? lsp.LSPAny
-
----Contains additional information about the context in which a completion request is triggered.
----@class lsp.CompletionContext
----How the completion was triggered.
----@field triggerKind lsp.CompletionTriggerKind
----The trigger character (a single character) that has trigger code complete.
----Is undefined if `triggerKind !== CompletionTriggerKind.TriggerCharacter`
----@field triggerCharacter? string
-
----Additional details for a completion item label.
----
----@since 3.17.0
----@class lsp.CompletionItemLabelDetails
----An optional string which is rendered less prominently directly after {@link CompletionItem.label label},
----without any spacing. Should be used for function signatures and type annotations.
----@field detail? string
----An optional string which is rendered less prominently after {@link CompletionItem.detail}. Should be used
----for fully qualified names and file paths.
----@field description? string
-
----A special text edit to provide an insert and a replace operation.
----
----@since 3.16.0
----@class lsp.InsertReplaceEdit
----The string to be inserted.
----@field newText string
----The range if the insert is requested
----@field insert lsp.Range
----The range if the replace is requested.
----@field replace lsp.Range
-
----Completion options.
----@class lsp.CompletionOptions
----Most tools trigger completion request automatically without explicitly requesting
----it using a keyboard shortcut (e.g. Ctrl+Space). Typically they do so when the user
----starts to type an identifier. For example if the user types `c` in a JavaScript file
----code complete will automatically pop up present `console` besides others as a
----completion item. Characters that make up identifiers don't need to be listed here.
----
----If code complete should automatically be trigger on characters not being valid inside
----an identifier (for example `.` in JavaScript) list them in `triggerCharacters`.
----@field triggerCharacters? string[]
----The list of all possible characters that commit a completion. This field can be used
----if clients don't support individual commit characters per completion item. See
----`ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`
----
----If a server provides both `allCommitCharacters` and commit characters on an individual
----completion item the ones on the completion item win.
----
----@since 3.2.0
----@field allCommitCharacters? string[]
----The server provides support to resolve additional
----information for a completion item.
----@field resolveProvider? boolean
----The server supports the following `CompletionItem` specific
----capabilities.
----
----@since 3.17.0
----@field completionItem? anonym13
-
----Hover options.
----@class lsp.HoverOptions
-
----Additional information about the context in which a signature help request was triggered.
----
----@since 3.15.0
----@class lsp.SignatureHelpContext
----Action that caused signature help to be triggered.
----@field triggerKind lsp.SignatureHelpTriggerKind
----Character that caused signature help to be triggered.
----
----This is undefined when `triggerKind !== SignatureHelpTriggerKind.TriggerCharacter`
----@field triggerCharacter? string
----`true` if signature help was already showing when it was triggered.
----
----Retriggers occurs when the signature help is already active and can be caused by actions such as
----typing a trigger character, a cursor move, or document content changes.
----@field isRetrigger boolean
----The currently active `SignatureHelp`.
----
----The `activeSignatureHelp` has its `SignatureHelp.activeSignature` field updated based on
----the user navigating through available signatures.
----@field activeSignatureHelp? lsp.SignatureHelp
-
----Represents the signature of something callable. A signature
----can have a label, like a function-name, a doc-comment, and
----a set of parameters.
----@class lsp.SignatureInformation
----The label of this signature. Will be shown in
----the UI.
----@field label string
----The human-readable doc-comment of this signature. Will be shown
----in the UI but can be omitted.
----@field documentation? string|lsp.MarkupContent
----The parameters of this signature.
----@field parameters? lsp.ParameterInformation[]
----The index of the active parameter.
----
----If provided, this is used in place of `SignatureHelp.activeParameter`.
----
----@since 3.16.0
----@field activeParameter? uinteger
-
----Server Capabilities for a {@link SignatureHelpRequest}.
----@class lsp.SignatureHelpOptions
----List of characters that trigger signature help automatically.
----@field triggerCharacters? string[]
----List of characters that re-trigger signature help.
----
----These trigger characters are only active when signature help is already showing. All trigger characters
----are also counted as re-trigger characters.
----
----@since 3.15.0
----@field retriggerCharacters? string[]
-
----Server Capabilities for a {@link DefinitionRequest}.
----@class lsp.DefinitionOptions
-
----Value-object that contains additional information when
----requesting references.
----@class lsp.ReferenceContext
----Include the declaration of the current symbol.
----@field includeDeclaration boolean
-
----Reference options.
----@class lsp.ReferenceOptions
-
----Provider options for a {@link DocumentHighlightRequest}.
----@class lsp.DocumentHighlightOptions
-
----A base for all symbol information.
----@class lsp.BaseSymbolInformation
----The name of this symbol.
----@field name string
----The kind of this symbol.
----@field kind lsp.SymbolKind
----Tags for this symbol.
----
----@since 3.16.0
----@field tags? lsp.SymbolTag[]
----The name of the symbol containing this symbol. This information is for
----user interface purposes (e.g. to render a qualifier in the user interface
----if necessary). It can't be used to re-infer a hierarchy for the document
----symbols.
----@field containerName? string
-
----Provider options for a {@link DocumentSymbolRequest}.
----@class lsp.DocumentSymbolOptions
----A human-readable string that is shown when multiple outlines trees
----are shown for the same document.
----
----@since 3.16.0
----@field label? string
-
----Contains additional diagnostic information about the context in which
----a {@link CodeActionProvider.provideCodeActions code action} is run.
----@class lsp.CodeActionContext
----An array of diagnostics known on the client side overlapping the range provided to the
----`textDocument/codeAction` request. They are provided so that the server knows which
----errors are currently presented to the user for the given range. There is no guarantee
----that these accurately reflect the error state of the resource. The primary parameter
----to compute code actions is the provided range.
----@field diagnostics lsp.Diagnostic[]
----Requested kind of actions to return.
----
----Actions not of this kind are filtered out by the client before being shown. So servers
----can omit computing them.
----@field only? lsp.CodeActionKind[]
----The reason why code actions were requested.
----
----@since 3.17.0
----@field triggerKind? lsp.CodeActionTriggerKind
-
----Provider options for a {@link CodeActionRequest}.
----@class lsp.CodeActionOptions
----CodeActionKinds that this server may return.
----
----The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the server
----may list out every specific kind they provide.
----@field codeActionKinds? lsp.CodeActionKind[]
----The server provides support to resolve additional
----information for a code action.
----
----@since 3.16.0
----@field resolveProvider? boolean
-
----Server capabilities for a {@link WorkspaceSymbolRequest}.
----@class lsp.WorkspaceSymbolOptions
----The server provides support to resolve additional
----information for a workspace symbol.
----
----@since 3.17.0
----@field resolveProvider? boolean
-
----Code Lens provider options of a {@link CodeLensRequest}.
----@class lsp.CodeLensOptions
----Code lens has a resolve provider as well.
----@field resolveProvider? boolean
-
----Provider options for a {@link DocumentLinkRequest}.
----@class lsp.DocumentLinkOptions
----Document links have a resolve provider as well.
----@field resolveProvider? boolean
-
----Value-object describing what options formatting should use.
----@class lsp.FormattingOptions
----Size of a tab in spaces.
----@field tabSize uinteger
----Prefer spaces over tabs.
----@field insertSpaces boolean
----Trim trailing whitespace on a line.
----
----@since 3.15.0
----@field trimTrailingWhitespace? boolean
----Insert a newline character at the end of the file if one does not exist.
----
----@since 3.15.0
----@field insertFinalNewline? boolean
----Trim all newlines after the final newline at the end of the file.
----
----@since 3.15.0
----@field trimFinalNewlines? boolean
-
----Provider options for a {@link DocumentFormattingRequest}.
----@class lsp.DocumentFormattingOptions
-
----Provider options for a {@link DocumentRangeFormattingRequest}.
----@class lsp.DocumentRangeFormattingOptions
----Whether the server supports formatting multiple ranges at once.
----
----@since 3.18.0
----@proposed
----@field rangesSupport? boolean
-
----Provider options for a {@link DocumentOnTypeFormattingRequest}.
----@class lsp.DocumentOnTypeFormattingOptions
----A character on which formatting should be triggered, like `{`.
----@field firstTriggerCharacter string
----More trigger characters.
----@field moreTriggerCharacter? string[]
-
----Provider options for a {@link RenameRequest}.
----@class lsp.RenameOptions
----Renames should be checked and tested before being executed.
----
----@since version 3.12.0
----@field prepareProvider? boolean
-
----The server capabilities of a {@link ExecuteCommandRequest}.
----@class lsp.ExecuteCommandOptions
----The commands to be executed on the server
----@field commands string[]
-
----@since 3.16.0
----@class lsp.SemanticTokensLegend
----The token types a server uses.
----@field tokenTypes string[]
----The token modifiers a server uses.
----@field tokenModifiers string[]
-
----A text document identifier to optionally denote a specific version of a text document.
----@class lsp.OptionalVersionedTextDocumentIdentifier: lsp.TextDocumentIdentifier
----The version number of this document. If a versioned text document identifier
----is sent from the server to the client and the file is not open in the editor
----(the server has not received an open notification before) the server can send
----`null` to indicate that the version is unknown and the content on disk is the
----truth (as specified with document content ownership).
----@field version integer|lsp.null
-
----A special text edit with an additional change annotation.
----
----@since 3.16.0.
----@class lsp.AnnotatedTextEdit: lsp.TextEdit
----The actual identifier of the change annotation
----@field annotationId lsp.ChangeAnnotationIdentifier
-
----A generic resource operation.
----@class lsp.ResourceOperation
----The resource operation kind.
----@field kind string
----An optional annotation identifier describing the operation.
----
----@since 3.16.0
----@field annotationId? lsp.ChangeAnnotationIdentifier
-
----Options to create a file.
----@class lsp.CreateFileOptions
----Overwrite existing file. Overwrite wins over `ignoreIfExists`
----@field overwrite? boolean
----Ignore if exists.
----@field ignoreIfExists? boolean
-
----Rename file options
----@class lsp.RenameFileOptions
----Overwrite target if existing. Overwrite wins over `ignoreIfExists`
----@field overwrite? boolean
----Ignores if target exists.
----@field ignoreIfExists? boolean
-
----Delete file options
----@class lsp.DeleteFileOptions
----Delete the content recursively if a folder is denoted.
----@field recursive? boolean
----Ignore the operation if the file doesn't exist.
----@field ignoreIfNotExists? boolean
-
----A pattern to describe in which file operation requests or notifications
----the server is interested in receiving.
----
----@since 3.16.0
----@class lsp.FileOperationPattern
----The glob pattern to match. Glob patterns can have the following syntax:
----- `*` to match one or more characters in a path segment
----- `?` to match on one character in a path segment
----- `**` to match any number of path segments, including none
----- `{}` to group sub patterns into an OR expression. (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
----- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
----- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
----@field glob string
----Whether to match files or folders with this pattern.
----
----Matches both if undefined.
----@field matches? lsp.FileOperationPatternKind
----Additional options used during matching.
----@field options? lsp.FileOperationPatternOptions
-
----A full document diagnostic report for a workspace diagnostic result.
----
----@since 3.17.0
----@class lsp.WorkspaceFullDocumentDiagnosticReport: lsp.FullDocumentDiagnosticReport
----The URI for which diagnostic information is reported.
----@field uri lsp.DocumentUri
----The version number for which the diagnostics are reported.
----If the document is not marked as open `null` can be provided.
----@field version integer|lsp.null
-
----An unchanged document diagnostic report for a workspace diagnostic result.
----
----@since 3.17.0
----@class lsp.WorkspaceUnchangedDocumentDiagnosticReport: lsp.UnchangedDocumentDiagnosticReport
----The URI for which diagnostic information is reported.
----@field uri lsp.DocumentUri
----The version number for which the diagnostics are reported.
----If the document is not marked as open `null` can be provided.
----@field version integer|lsp.null
-
----A notebook cell.
----
----A cell's document URI must be unique across ALL notebook
----cells and can therefore be used to uniquely identify a
----notebook cell or the cell's text document.
----
----@since 3.17.0
----@class lsp.NotebookCell
----The cell's kind
----@field kind lsp.NotebookCellKind
----The URI of the cell's text document
----content.
----@field document lsp.DocumentUri
----Additional metadata stored with the cell.
----
----Note: should always be an object literal (e.g. LSPObject)
----@field metadata? lsp.LSPObject
----Additional execution summary information
----if supported by the client.
----@field executionSummary? lsp.ExecutionSummary
-
----A change describing how to move a `NotebookCell`
----array from state S to S'.
----
----@since 3.17.0
----@class lsp.NotebookCellArrayChange
----The start oftest of the cell that changed.
----@field start uinteger
----The deleted cells
----@field deleteCount uinteger
----The new cells, if any
----@field cells? lsp.NotebookCell[]
-
----Describes the currently selected completion item.
----
----@since 3.18.0
----@class lsp.SelectedCompletionInfo
----The range that will be replaced if this completion item is accepted.
----@field range lsp.Range
----The text the range will be replaced with if this completion is accepted.
----@field text string
-
----Defines the capabilities provided by the client.
----@class lsp.ClientCapabilities
----Workspace specific client capabilities.
----@field workspace? lsp.WorkspaceClientCapabilities
----Text document specific client capabilities.
----@field textDocument? lsp.TextDocumentClientCapabilities
----Capabilities specific to the notebook document support.
----
----@since 3.17.0
----@field notebookDocument? lsp.NotebookDocumentClientCapabilities
----Window specific client capabilities.
----@field window? lsp.WindowClientCapabilities
----General client capabilities.
----
----@since 3.16.0
----@field general? lsp.GeneralClientCapabilities
----Experimental client capabilities.
----@field experimental? lsp.LSPAny
-
----@class lsp.TextDocumentSyncOptions
----Open and close notifications are sent to the server. If omitted open close notification should not
----be sent.
----@field openClose? boolean
----Change notifications are sent to the server. See TextDocumentSyncKind.None, TextDocumentSyncKind.Full
----and TextDocumentSyncKind.Incremental. If omitted it defaults to TextDocumentSyncKind.None.
----@field change? lsp.TextDocumentSyncKind
----If present will save notifications are sent to the server. If omitted the notification should not be
----sent.
----@field willSave? boolean
----If present will save wait until requests are sent to the server. If omitted the request should not be
----sent.
----@field willSaveWaitUntil? boolean
----If present save notifications are sent to the server. If omitted the notification should not be
----sent.
----@field save? boolean|lsp.SaveOptions
-
----Options specific to a notebook plus its cells
----to be synced to the server.
----
----If a selector provides a notebook document
----filter but no cell selector all cells of a
----matching notebook document will be synced.
----
----If a selector provides no notebook document
----filter but only a cell selector all notebook
----document that contain at least one matching
----cell will be synced.
----
----@since 3.17.0
----@class lsp.NotebookDocumentSyncOptions
----The notebooks to be synced
----@field notebookSelector anonym15|anonym17[]
----Whether save notification should be forwarded to
----the server. Will only be honored if mode === `notebook`.
----@field save? boolean
-
----Registration options specific to a notebook.
----
----@since 3.17.0
----@class lsp.NotebookDocumentSyncRegistrationOptions: lsp.NotebookDocumentSyncOptions, lsp.StaticRegistrationOptions
-
----@class lsp.WorkspaceFoldersServerCapabilities
----The server has support for workspace folders
----@field supported? boolean
----Whether the server wants to receive workspace folder
----change notifications.
----
----If a string is provided the string is treated as an ID
----under which the notification is registered on the client
----side. The ID can be used to unregister for these events
----using the `client/unregisterCapability` request.
----@field changeNotifications? string|boolean
-
----Options for notifications/requests for user operations on files.
----
----@since 3.16.0
----@class lsp.FileOperationOptions
----The server is interested in receiving didCreateFiles notifications.
----@field didCreate? lsp.FileOperationRegistrationOptions
----The server is interested in receiving willCreateFiles requests.
----@field willCreate? lsp.FileOperationRegistrationOptions
----The server is interested in receiving didRenameFiles notifications.
----@field didRename? lsp.FileOperationRegistrationOptions
----The server is interested in receiving willRenameFiles requests.
----@field willRename? lsp.FileOperationRegistrationOptions
----The server is interested in receiving didDeleteFiles file notifications.
----@field didDelete? lsp.FileOperationRegistrationOptions
----The server is interested in receiving willDeleteFiles file requests.
----@field willDelete? lsp.FileOperationRegistrationOptions
-
----Structure to capture a description for an error code.
----
----@since 3.16.0
----@class lsp.CodeDescription
----An URI to open with more information about the diagnostic error.
----@field href lsp.URI
-
----Represents a related message and source code location for a diagnostic. This should be
----used to point to code locations that cause or related to a diagnostics, e.g when duplicating
----a symbol in a scope.
----@class lsp.DiagnosticRelatedInformation
----The location of this related diagnostic information.
----@field location lsp.Location
----The message of this related diagnostic information.
----@field message string
-
----Represents a parameter of a callable-signature. A parameter can
----have a label and a doc-comment.
----@class lsp.ParameterInformation
----The label of this parameter information.
----
----Either a string or an inclusive start and exclusive end offsets within its containing
----signature label. (see SignatureInformation.label). The offsets are based on a UTF-16
----string representation as `Position` and `Range` does.
----
----*Note*: a label of type string should be a substring of its containing signature label.
----Its intended use case is to highlight the parameter label part in the `SignatureInformation.label`.
----@field label string|{ [1]: uinteger, [2]: uinteger }
----The human-readable doc-comment of this parameter. Will be shown
----in the UI but can be omitted.
----@field documentation? string|lsp.MarkupContent
-
----A notebook cell text document filter denotes a cell text
----document by different properties.
----
----@since 3.17.0
----@class lsp.NotebookCellTextDocumentFilter
----A filter that matches against the notebook
----containing the notebook cell. If a string
----value is provided it matches against the
----notebook type. '*' matches every notebook.
----@field notebook string|lsp.NotebookDocumentFilter
----A language id like `python`.
----
----Will be matched against the language id of the
----notebook cell document. '*' matches every language.
----@field language? string
-
----Matching options for the file operation pattern.
----
----@since 3.16.0
----@class lsp.FileOperationPatternOptions
----The pattern should be matched ignoring casing.
----@field ignoreCase? boolean
-
----@class lsp.ExecutionSummary
----A strict monotonically increasing value
----indicating the execution order of a cell
----inside a notebook.
----@field executionOrder uinteger
----Whether the execution was successful or
----not if known by the client.
----@field success? boolean
-
----Workspace specific client capabilities.
----@class lsp.WorkspaceClientCapabilities
----The client supports applying batch edits
----to the workspace by supporting the request
----'workspace/applyEdit'
----@field applyEdit? boolean
----Capabilities specific to `WorkspaceEdit`s.
----@field workspaceEdit? lsp.WorkspaceEditClientCapabilities
----Capabilities specific to the `workspace/didChangeConfiguration` notification.
----@field didChangeConfiguration? lsp.DidChangeConfigurationClientCapabilities
----Capabilities specific to the `workspace/didChangeWatchedFiles` notification.
----@field didChangeWatchedFiles? lsp.DidChangeWatchedFilesClientCapabilities
----Capabilities specific to the `workspace/symbol` request.
----@field symbol? lsp.WorkspaceSymbolClientCapabilities
----Capabilities specific to the `workspace/executeCommand` request.
----@field executeCommand? lsp.ExecuteCommandClientCapabilities
----The client has support for workspace folders.
----
----@since 3.6.0
----@field workspaceFolders? boolean
----The client supports `workspace/configuration` requests.
----
----@since 3.6.0
----@field configuration? boolean
----Capabilities specific to the semantic token requests scoped to the
----workspace.
----
----@since 3.16.0.
----@field semanticTokens? lsp.SemanticTokensWorkspaceClientCapabilities
----Capabilities specific to the code lens requests scoped to the
----workspace.
----
----@since 3.16.0.
----@field codeLens? lsp.CodeLensWorkspaceClientCapabilities
----The client has support for file notifications/requests for user operations on files.
----
----Since 3.16.0
----@field fileOperations? lsp.FileOperationClientCapabilities
----Capabilities specific to the inline values requests scoped to the
----workspace.
----
----@since 3.17.0.
----@field inlineValue? lsp.InlineValueWorkspaceClientCapabilities
----Capabilities specific to the inlay hint requests scoped to the
----workspace.
----
----@since 3.17.0.
----@field inlayHint? lsp.InlayHintWorkspaceClientCapabilities
----Capabilities specific to the diagnostic requests scoped to the
----workspace.
----
----@since 3.17.0.
----@field diagnostics? lsp.DiagnosticWorkspaceClientCapabilities
-
----Text document specific client capabilities.
----@class lsp.TextDocumentClientCapabilities
----Defines which synchronization capabilities the client supports.
----@field synchronization? lsp.TextDocumentSyncClientCapabilities
----Capabilities specific to the `textDocument/completion` request.
----@field completion? lsp.CompletionClientCapabilities
----Capabilities specific to the `textDocument/hover` request.
----@field hover? lsp.HoverClientCapabilities
----Capabilities specific to the `textDocument/signatureHelp` request.
----@field signatureHelp? lsp.SignatureHelpClientCapabilities
----Capabilities specific to the `textDocument/declaration` request.
----
----@since 3.14.0
----@field declaration? lsp.DeclarationClientCapabilities
----Capabilities specific to the `textDocument/definition` request.
----@field definition? lsp.DefinitionClientCapabilities
----Capabilities specific to the `textDocument/typeDefinition` request.
----
----@since 3.6.0
----@field typeDefinition? lsp.TypeDefinitionClientCapabilities
----Capabilities specific to the `textDocument/implementation` request.
----
----@since 3.6.0
----@field implementation? lsp.ImplementationClientCapabilities
----Capabilities specific to the `textDocument/references` request.
----@field references? lsp.ReferenceClientCapabilities
----Capabilities specific to the `textDocument/documentHighlight` request.
----@field documentHighlight? lsp.DocumentHighlightClientCapabilities
----Capabilities specific to the `textDocument/documentSymbol` request.
----@field documentSymbol? lsp.DocumentSymbolClientCapabilities
----Capabilities specific to the `textDocument/codeAction` request.
----@field codeAction? lsp.CodeActionClientCapabilities
----Capabilities specific to the `textDocument/codeLens` request.
----@field codeLens? lsp.CodeLensClientCapabilities
----Capabilities specific to the `textDocument/documentLink` request.
----@field documentLink? lsp.DocumentLinkClientCapabilities
----Capabilities specific to the `textDocument/documentColor` and the
----`textDocument/colorPresentation` request.
----
----@since 3.6.0
----@field colorProvider? lsp.DocumentColorClientCapabilities
----Capabilities specific to the `textDocument/formatting` request.
----@field formatting? lsp.DocumentFormattingClientCapabilities
----Capabilities specific to the `textDocument/rangeFormatting` request.
----@field rangeFormatting? lsp.DocumentRangeFormattingClientCapabilities
----Capabilities specific to the `textDocument/onTypeFormatting` request.
----@field onTypeFormatting? lsp.DocumentOnTypeFormattingClientCapabilities
----Capabilities specific to the `textDocument/rename` request.
----@field rename? lsp.RenameClientCapabilities
----Capabilities specific to the `textDocument/foldingRange` request.
----
----@since 3.10.0
----@field foldingRange? lsp.FoldingRangeClientCapabilities
----Capabilities specific to the `textDocument/selectionRange` request.
----
----@since 3.15.0
----@field selectionRange? lsp.SelectionRangeClientCapabilities
----Capabilities specific to the `textDocument/publishDiagnostics` notification.
----@field publishDiagnostics? lsp.PublishDiagnosticsClientCapabilities
----Capabilities specific to the various call hierarchy requests.
----
----@since 3.16.0
----@field callHierarchy? lsp.CallHierarchyClientCapabilities
----Capabilities specific to the various semantic token request.
----
----@since 3.16.0
----@field semanticTokens? lsp.SemanticTokensClientCapabilities
----Capabilities specific to the `textDocument/linkedEditingRange` request.
----
----@since 3.16.0
----@field linkedEditingRange? lsp.LinkedEditingRangeClientCapabilities
----Client capabilities specific to the `textDocument/moniker` request.
----
----@since 3.16.0
----@field moniker? lsp.MonikerClientCapabilities
----Capabilities specific to the various type hierarchy requests.
----
----@since 3.17.0
----@field typeHierarchy? lsp.TypeHierarchyClientCapabilities
----Capabilities specific to the `textDocument/inlineValue` request.
----
----@since 3.17.0
----@field inlineValue? lsp.InlineValueClientCapabilities
----Capabilities specific to the `textDocument/inlayHint` request.
----
----@since 3.17.0
----@field inlayHint? lsp.InlayHintClientCapabilities
----Capabilities specific to the diagnostic pull model.
----
----@since 3.17.0
----@field diagnostic? lsp.DiagnosticClientCapabilities
----Client capabilities specific to inline completions.
----
----@since 3.18.0
----@field inlineCompletion? lsp.InlineCompletionClientCapabilities
-
----Capabilities specific to the notebook document support.
----
----@since 3.17.0
----@class lsp.NotebookDocumentClientCapabilities
----Capabilities specific to notebook document synchronization
----
----@since 3.17.0
----@field synchronization lsp.NotebookDocumentSyncClientCapabilities
-
----@class lsp.WindowClientCapabilities
----It indicates whether the client supports server initiated
----progress using the `window/workDoneProgress/create` request.
----
----The capability also controls Whether client supports handling
----of progress notifications. If set servers are allowed to report a
----`workDoneProgress` property in the request specific server
----capabilities.
----
----@since 3.15.0
----@field workDoneProgress? boolean
----Capabilities specific to the showMessage request.
----
----@since 3.16.0
----@field showMessage? lsp.ShowMessageRequestClientCapabilities
----Capabilities specific to the showDocument request.
----
----@since 3.16.0
----@field showDocument? lsp.ShowDocumentClientCapabilities
-
----General client capabilities.
----
----@since 3.16.0
----@class lsp.GeneralClientCapabilities
----Client capability that signals how the client
----handles stale requests (e.g. a request
----for which the client will not process the response
----anymore since the information is outdated).
----
----@since 3.17.0
----@field staleRequestSupport? anonym18
----Client capabilities specific to regular expressions.
----
----@since 3.16.0
----@field regularExpressions? lsp.RegularExpressionsClientCapabilities
----Client capabilities specific to the client's markdown parser.
----
----@since 3.16.0
----@field markdown? lsp.MarkdownClientCapabilities
----The position encodings supported by the client. Client and server
----have to agree on the same position encoding to ensure that offsets
----(e.g. character position in a line) are interpreted the same on both
----sides.
----
----To keep the protocol backwards compatible the following applies: if
----the value 'utf-16' is missing from the array of position encodings
----servers can assume that the client supports UTF-16. UTF-16 is
----therefore a mandatory encoding.
----
----If omitted it defaults to ['utf-16'].
----
----Implementation considerations: since the conversion from one encoding
----into another requires the content of the file / line the conversion
----is best done where the file is read which is usually on the server
----side.
----
----@since 3.17.0
----@field positionEncodings? lsp.PositionEncodingKind[]
-
----A relative pattern is a helper to construct glob patterns that are matched
----relatively to a base URI. The common value for a `baseUri` is a workspace
----folder root, but it can be another absolute URI as well.
----
----@since 3.17.0
----@class lsp.RelativePattern
----A workspace folder or a base URI to which this pattern will be matched
----against relatively.
----@field baseUri lsp.WorkspaceFolder|lsp.URI
----The actual glob pattern;
----@field pattern lsp.Pattern
-
----@class lsp.WorkspaceEditClientCapabilities
----The client supports versioned document changes in `WorkspaceEdit`s
----@field documentChanges? boolean
----The resource operations the client supports. Clients should at least
----support 'create', 'rename' and 'delete' files and folders.
----
----@since 3.13.0
----@field resourceOperations? lsp.ResourceOperationKind[]
----The failure handling strategy of a client if applying the workspace edit
----fails.
----
----@since 3.13.0
----@field failureHandling? lsp.FailureHandlingKind
----Whether the client normalizes line endings to the client specific
----setting.
----If set to `true` the client will normalize line ending characters
----in a workspace edit to the client-specified new line
----character.
----
----@since 3.16.0
----@field normalizesLineEndings? boolean
----Whether the client in general supports change annotations on text edits,
----create file, rename file and delete file changes.
----
----@since 3.16.0
----@field changeAnnotationSupport? anonym19
-
----@class lsp.DidChangeConfigurationClientCapabilities
----Did change configuration notification supports dynamic registration.
----@field dynamicRegistration? boolean
-
----@class lsp.DidChangeWatchedFilesClientCapabilities
----Did change watched files notification supports dynamic registration. Please note
----that the current protocol doesn't support static configuration for file changes
----from the server side.
----@field dynamicRegistration? boolean
----Whether the client has support for {@link  RelativePattern relative pattern}
----or not.
----
----@since 3.17.0
----@field relativePatternSupport? boolean
-
----Client capabilities for a {@link WorkspaceSymbolRequest}.
----@class lsp.WorkspaceSymbolClientCapabilities
----Symbol request supports dynamic registration.
----@field dynamicRegistration? boolean
----Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
----@field symbolKind? anonym20
----The client supports tags on `SymbolInformation`.
----Clients supporting tags have to handle unknown tags gracefully.
----
----@since 3.16.0
----@field tagSupport? anonym21
----The client support partial workspace symbols. The client will send the
----request `workspaceSymbol/resolve` to the server to resolve additional
----properties.
----
----@since 3.17.0
----@field resolveSupport? anonym22
-
----The client capabilities of a {@link ExecuteCommandRequest}.
----@class lsp.ExecuteCommandClientCapabilities
----Execute command supports dynamic registration.
----@field dynamicRegistration? boolean
-
----@since 3.16.0
----@class lsp.SemanticTokensWorkspaceClientCapabilities
----Whether the client implementation supports a refresh request sent from
----the server to the client.
----
----Note that this event is global and will force the client to refresh all
----semantic tokens currently shown. It should be used with absolute care
----and is useful for situation where a server for example detects a project
----wide change that requires such a calculation.
----@field refreshSupport? boolean
-
----@since 3.16.0
----@class lsp.CodeLensWorkspaceClientCapabilities
----Whether the client implementation supports a refresh request sent from the
----server to the client.
----
----Note that this event is global and will force the client to refresh all
----code lenses currently shown. It should be used with absolute care and is
----useful for situation where a server for example detect a project wide
----change that requires such a calculation.
----@field refreshSupport? boolean
-
----Capabilities relating to events from file operations by the user in the client.
----
----These events do not come from the file system, they come from user operations
----like renaming a file in the UI.
----
----@since 3.16.0
----@class lsp.FileOperationClientCapabilities
----Whether the client supports dynamic registration for file requests/notifications.
----@field dynamicRegistration? boolean
----The client has support for sending didCreateFiles notifications.
----@field didCreate? boolean
----The client has support for sending willCreateFiles requests.
----@field willCreate? boolean
----The client has support for sending didRenameFiles notifications.
----@field didRename? boolean
----The client has support for sending willRenameFiles requests.
----@field willRename? boolean
----The client has support for sending didDeleteFiles notifications.
----@field didDelete? boolean
----The client has support for sending willDeleteFiles requests.
----@field willDelete? boolean
-
----Client workspace capabilities specific to inline values.
----
----@since 3.17.0
----@class lsp.InlineValueWorkspaceClientCapabilities
----Whether the client implementation supports a refresh request sent from the
----server to the client.
----
----Note that this event is global and will force the client to refresh all
----inline values currently shown. It should be used with absolute care and is
----useful for situation where a server for example detects a project wide
----change that requires such a calculation.
----@field refreshSupport? boolean
-
----Client workspace capabilities specific to inlay hints.
----
----@since 3.17.0
----@class lsp.InlayHintWorkspaceClientCapabilities
----Whether the client implementation supports a refresh request sent from
----the server to the client.
----
----Note that this event is global and will force the client to refresh all
----inlay hints currently shown. It should be used with absolute care and
----is useful for situation where a server for example detects a project wide
----change that requires such a calculation.
----@field refreshSupport? boolean
-
----Workspace client capabilities specific to diagnostic pull requests.
----
----@since 3.17.0
----@class lsp.DiagnosticWorkspaceClientCapabilities
----Whether the client implementation supports a refresh request sent from
----the server to the client.
----
----Note that this event is global and will force the client to refresh all
----pulled diagnostics currently shown. It should be used with absolute care and
----is useful for situation where a server for example detects a project wide
----change that requires such a calculation.
----@field refreshSupport? boolean
-
----@class lsp.TextDocumentSyncClientCapabilities
----Whether text document synchronization supports dynamic registration.
----@field dynamicRegistration? boolean
----The client supports sending will save notifications.
----@field willSave? boolean
----The client supports sending a will save request and
----waits for a response providing text edits which will
----be applied to the document before it is saved.
----@field willSaveWaitUntil? boolean
----The client supports did save notifications.
----@field didSave? boolean
-
----Completion client capabilities
----@class lsp.CompletionClientCapabilities
----Whether completion supports dynamic registration.
----@field dynamicRegistration? boolean
----The client supports the following `CompletionItem` specific
----capabilities.
----@field completionItem? anonym26
----@field completionItemKind? anonym27
----Defines how the client handles whitespace and indentation
----when accepting a completion item that uses multi line
----text in either `insertText` or `textEdit`.
----
----@since 3.17.0
----@field insertTextMode? lsp.InsertTextMode
----The client supports to send additional context information for a
----`textDocument/completion` request.
----@field contextSupport? boolean
----The client supports the following `CompletionList` specific
----capabilities.
----
----@since 3.17.0
----@field completionList? anonym28
-
----@class lsp.HoverClientCapabilities
----Whether hover supports dynamic registration.
----@field dynamicRegistration? boolean
----Client supports the following content formats for the content
----property. The order describes the preferred format of the client.
----@field contentFormat? lsp.MarkupKind[]
-
----Client Capabilities for a {@link SignatureHelpRequest}.
----@class lsp.SignatureHelpClientCapabilities
----Whether signature help supports dynamic registration.
----@field dynamicRegistration? boolean
----The client supports the following `SignatureInformation`
----specific properties.
----@field signatureInformation? anonym30
----The client supports to send additional context information for a
----`textDocument/signatureHelp` request. A client that opts into
----contextSupport will also support the `retriggerCharacters` on
----`SignatureHelpOptions`.
----
----@since 3.15.0
----@field contextSupport? boolean
-
----@since 3.14.0
----@class lsp.DeclarationClientCapabilities
----Whether declaration supports dynamic registration. If this is set to `true`
----the client supports the new `DeclarationRegistrationOptions` return value
----for the corresponding server capability as well.
----@field dynamicRegistration? boolean
----The client supports additional metadata in the form of declaration links.
----@field linkSupport? boolean
-
----Client Capabilities for a {@link DefinitionRequest}.
----@class lsp.DefinitionClientCapabilities
----Whether definition supports dynamic registration.
----@field dynamicRegistration? boolean
----The client supports additional metadata in the form of definition links.
----
----@since 3.14.0
----@field linkSupport? boolean
-
----Since 3.6.0
----@class lsp.TypeDefinitionClientCapabilities
----Whether implementation supports dynamic registration. If this is set to `true`
----the client supports the new `TypeDefinitionRegistrationOptions` return value
----for the corresponding server capability as well.
----@field dynamicRegistration? boolean
----The client supports additional metadata in the form of definition links.
----
----Since 3.14.0
----@field linkSupport? boolean
-
----@since 3.6.0
----@class lsp.ImplementationClientCapabilities
----Whether implementation supports dynamic registration. If this is set to `true`
----the client supports the new `ImplementationRegistrationOptions` return value
----for the corresponding server capability as well.
----@field dynamicRegistration? boolean
----The client supports additional metadata in the form of definition links.
----
----@since 3.14.0
----@field linkSupport? boolean
-
----Client Capabilities for a {@link ReferencesRequest}.
----@class lsp.ReferenceClientCapabilities
----Whether references supports dynamic registration.
----@field dynamicRegistration? boolean
-
----Client Capabilities for a {@link DocumentHighlightRequest}.
----@class lsp.DocumentHighlightClientCapabilities
----Whether document highlight supports dynamic registration.
----@field dynamicRegistration? boolean
-
----Client Capabilities for a {@link DocumentSymbolRequest}.
----@class lsp.DocumentSymbolClientCapabilities
----Whether document symbol supports dynamic registration.
----@field dynamicRegistration? boolean
----Specific capabilities for the `SymbolKind` in the
----`textDocument/documentSymbol` request.
----@field symbolKind? anonym31
----The client supports hierarchical document symbols.
----@field hierarchicalDocumentSymbolSupport? boolean
----The client supports tags on `SymbolInformation`. Tags are supported on
----`DocumentSymbol` if `hierarchicalDocumentSymbolSupport` is set to true.
----Clients supporting tags have to handle unknown tags gracefully.
----
----@since 3.16.0
----@field tagSupport? anonym32
----The client supports an additional label presented in the UI when
----registering a document symbol provider.
----
----@since 3.16.0
----@field labelSupport? boolean
-
----The Client Capabilities of a {@link CodeActionRequest}.
----@class lsp.CodeActionClientCapabilities
----Whether code action supports dynamic registration.
----@field dynamicRegistration? boolean
----The client support code action literals of type `CodeAction` as a valid
----response of the `textDocument/codeAction` request. If the property is not
----set the request can only return `Command` literals.
----
----@since 3.8.0
----@field codeActionLiteralSupport? anonym34
----Whether code action supports the `isPreferred` property.
----
----@since 3.15.0
----@field isPreferredSupport? boolean
----Whether code action supports the `disabled` property.
----
----@since 3.16.0
----@field disabledSupport? boolean
----Whether code action supports the `data` property which is
----preserved between a `textDocument/codeAction` and a
----`codeAction/resolve` request.
----
----@since 3.16.0
----@field dataSupport? boolean
----Whether the client supports resolving additional code action
----properties via a separate `codeAction/resolve` request.
----
----@since 3.16.0
----@field resolveSupport? anonym35
----Whether the client honors the change annotations in
----text edits and resource operations returned via the
----`CodeAction#edit` property by for example presenting
----the workspace edit in the user interface and asking
----for confirmation.
----
----@since 3.16.0
----@field honorsChangeAnnotations? boolean
-
----The client capabilities  of a {@link CodeLensRequest}.
----@class lsp.CodeLensClientCapabilities
----Whether code lens supports dynamic registration.
----@field dynamicRegistration? boolean
-
----The client capabilities of a {@link DocumentLinkRequest}.
----@class lsp.DocumentLinkClientCapabilities
----Whether document link supports dynamic registration.
----@field dynamicRegistration? boolean
----Whether the client supports the `tooltip` property on `DocumentLink`.
----
----@since 3.15.0
----@field tooltipSupport? boolean
-
----@class lsp.DocumentColorClientCapabilities
----Whether implementation supports dynamic registration. If this is set to `true`
----the client supports the new `DocumentColorRegistrationOptions` return value
----for the corresponding server capability as well.
----@field dynamicRegistration? boolean
-
----Client capabilities of a {@link DocumentFormattingRequest}.
----@class lsp.DocumentFormattingClientCapabilities
----Whether formatting supports dynamic registration.
----@field dynamicRegistration? boolean
-
----Client capabilities of a {@link DocumentRangeFormattingRequest}.
----@class lsp.DocumentRangeFormattingClientCapabilities
----Whether range formatting supports dynamic registration.
----@field dynamicRegistration? boolean
----Whether the client supports formatting multiple ranges at once.
----
----@since 3.18.0
----@proposed
----@field rangesSupport? boolean
-
----Client capabilities of a {@link DocumentOnTypeFormattingRequest}.
----@class lsp.DocumentOnTypeFormattingClientCapabilities
----Whether on type formatting supports dynamic registration.
----@field dynamicRegistration? boolean
-
----@class lsp.RenameClientCapabilities
----Whether rename supports dynamic registration.
----@field dynamicRegistration? boolean
----Client supports testing for validity of rename operations
----before execution.
----
----@since 3.12.0
----@field prepareSupport? boolean
----Client supports the default behavior result.
----
----The value indicates the default behavior used by the
----client.
----
----@since 3.16.0
----@field prepareSupportDefaultBehavior? lsp.PrepareSupportDefaultBehavior
----Whether the client honors the change annotations in
----text edits and resource operations returned via the
----rename request's workspace edit by for example presenting
----the workspace edit in the user interface and asking
----for confirmation.
----
----@since 3.16.0
----@field honorsChangeAnnotations? boolean
-
----@class lsp.FoldingRangeClientCapabilities
----Whether implementation supports dynamic registration for folding range
----providers. If this is set to `true` the client supports the new
----`FoldingRangeRegistrationOptions` return value for the corresponding
----server capability as well.
----@field dynamicRegistration? boolean
----The maximum number of folding ranges that the client prefers to receive
----per document. The value serves as a hint, servers are free to follow the
----limit.
----@field rangeLimit? uinteger
----If set, the client signals that it only supports folding complete lines.
----If set, client will ignore specified `startCharacter` and `endCharacter`
----properties in a FoldingRange.
----@field lineFoldingOnly? boolean
----Specific options for the folding range kind.
----
----@since 3.17.0
----@field foldingRangeKind? anonym36
----Specific options for the folding range.
----
----@since 3.17.0
----@field foldingRange? anonym37
-
----@class lsp.SelectionRangeClientCapabilities
----Whether implementation supports dynamic registration for selection range providers. If this is set to `true`
----the client supports the new `SelectionRangeRegistrationOptions` return value for the corresponding server
----capability as well.
----@field dynamicRegistration? boolean
-
----The publish diagnostic client capabilities.
----@class lsp.PublishDiagnosticsClientCapabilities
----Whether the clients accepts diagnostics with related information.
----@field relatedInformation? boolean
----Client supports the tag property to provide meta data about a diagnostic.
----Clients supporting tags have to handle unknown tags gracefully.
----
----@since 3.15.0
----@field tagSupport? anonym38
----Whether the client interprets the version property of the
----`textDocument/publishDiagnostics` notification's parameter.
----
----@since 3.15.0
----@field versionSupport? boolean
----Client supports a codeDescription property
----
----@since 3.16.0
----@field codeDescriptionSupport? boolean
----Whether code action supports the `data` property which is
----preserved between a `textDocument/publishDiagnostics` and
----`textDocument/codeAction` request.
----
----@since 3.16.0
----@field dataSupport? boolean
-
----@since 3.16.0
----@class lsp.CallHierarchyClientCapabilities
----Whether implementation supports dynamic registration. If this is set to `true`
----the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
----return value for the corresponding server capability as well.
----@field dynamicRegistration? boolean
-
----@since 3.16.0
----@class lsp.SemanticTokensClientCapabilities
----Whether implementation supports dynamic registration. If this is set to `true`
----the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
----return value for the corresponding server capability as well.
----@field dynamicRegistration? boolean
----Which requests the client supports and might send to the server
----depending on the server's capability. Please note that clients might not
----show semantic tokens or degrade some of the user experience if a range
----or full request is advertised by the client but not provided by the
----server. If for example the client capability `requests.full` and
----`request.range` are both set to true but the server only provides a
----range provider the client might not render a minimap correctly or might
----even decide to not show any semantic tokens at all.
----@field requests anonym41
----The token types that the client supports.
----@field tokenTypes string[]
----The token modifiers that the client supports.
----@field tokenModifiers string[]
----The token formats the clients supports.
----@field formats lsp.TokenFormat[]
----Whether the client supports tokens that can overlap each other.
----@field overlappingTokenSupport? boolean
----Whether the client supports tokens that can span multiple lines.
----@field multilineTokenSupport? boolean
----Whether the client allows the server to actively cancel a
----semantic token request, e.g. supports returning
----LSPErrorCodes.ServerCancelled. If a server does the client
----needs to retrigger the request.
----
----@since 3.17.0
----@field serverCancelSupport? boolean
----Whether the client uses semantic tokens to augment existing
----syntax tokens. If set to `true` client side created syntax
----tokens and semantic tokens are both used for colorization. If
----set to `false` the client only uses the returned semantic tokens
----for colorization.
----
----If the value is `undefined` then the client behavior is not
----specified.
----
----@since 3.17.0
----@field augmentsSyntaxTokens? boolean
-
----Client capabilities for the linked editing range request.
----
----@since 3.16.0
----@class lsp.LinkedEditingRangeClientCapabilities
----Whether implementation supports dynamic registration. If this is set to `true`
----the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
----return value for the corresponding server capability as well.
----@field dynamicRegistration? boolean
-
----Client capabilities specific to the moniker request.
----
----@since 3.16.0
----@class lsp.MonikerClientCapabilities
----Whether moniker supports dynamic registration. If this is set to `true`
----the client supports the new `MonikerRegistrationOptions` return value
----for the corresponding server capability as well.
----@field dynamicRegistration? boolean
-
----@since 3.17.0
----@class lsp.TypeHierarchyClientCapabilities
----Whether implementation supports dynamic registration. If this is set to `true`
----the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
----return value for the corresponding server capability as well.
----@field dynamicRegistration? boolean
-
----Client capabilities specific to inline values.
----
----@since 3.17.0
----@class lsp.InlineValueClientCapabilities
----Whether implementation supports dynamic registration for inline value providers.
----@field dynamicRegistration? boolean
-
----Inlay hint client capabilities.
----
----@since 3.17.0
----@class lsp.InlayHintClientCapabilities
----Whether inlay hints support dynamic registration.
----@field dynamicRegistration? boolean
----Indicates which properties a client can resolve lazily on an inlay
----hint.
----@field resolveSupport? anonym42
-
----Client capabilities specific to diagnostic pull requests.
----
----@since 3.17.0
----@class lsp.DiagnosticClientCapabilities
----Whether implementation supports dynamic registration. If this is set to `true`
----the client supports the new `(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
----return value for the corresponding server capability as well.
----@field dynamicRegistration? boolean
----Whether the clients supports related documents for document diagnostic pulls.
----@field relatedDocumentSupport? boolean
-
----Client capabilities specific to inline completions.
----
----@since 3.18.0
----@class lsp.InlineCompletionClientCapabilities
----Whether implementation supports dynamic registration for inline completion providers.
----@field dynamicRegistration? boolean
-
----Notebook specific client capabilities.
----
----@since 3.17.0
----@class lsp.NotebookDocumentSyncClientCapabilities
----Whether implementation supports dynamic registration. If this is
----set to `true` the client supports the new
----`(TextDocumentRegistrationOptions & StaticRegistrationOptions)`
----return value for the corresponding server capability as well.
----@field dynamicRegistration? boolean
----The client supports sending execution summary data per cell.
----@field executionSummarySupport? boolean
-
----Show message request client capabilities
----@class lsp.ShowMessageRequestClientCapabilities
----Capabilities specific to the `MessageActionItem` type.
----@field messageActionItem? anonym43
-
----Client capabilities for the showDocument request.
----
----@since 3.16.0
----@class lsp.ShowDocumentClientCapabilities
----The client has support for the showDocument
----request.
----@field support boolean
-
----Client capabilities specific to regular expressions.
----
----@since 3.16.0
----@class lsp.RegularExpressionsClientCapabilities
----The engine's name.
----@field engine string
----The engine's version.
----@field version? string
-
----Client capabilities specific to the used markdown parser.
----
----@since 3.16.0
----@class lsp.MarkdownClientCapabilities
----The name of the parser.
----@field parser string
----The version of the parser.
----@field version? string
----A list of HTML tags that the client allows / supports in
----Markdown.
----
----@since 3.17.0
----@field allowedTags? string[]
-
----A set of predefined token types. This set is not fixed
----an clients can specify additional token types via the
----corresponding client capabilities.
----
----@since 3.16.0
----@alias lsp.SemanticTokenTypes
----| "namespace" # namespace
----| "type" # type
----| "class" # class
----| "enum" # enum
----| "interface" # interface
----| "struct" # struct
----| "typeParameter" # typeParameter
----| "parameter" # parameter
----| "variable" # variable
----| "property" # property
----| "enumMember" # enumMember
----| "event" # event
----| "function" # function
----| "method" # method
----| "macro" # macro
----| "keyword" # keyword
----| "modifier" # modifier
----| "comment" # comment
----| "string" # string
----| "number" # number
----| "regexp" # regexp
----| "operator" # operator
----| "decorator" # decorator
-
----A set of predefined token modifiers. This set is not fixed
----an clients can specify additional token types via the
----corresponding client capabilities.
----
----@since 3.16.0
----@alias lsp.SemanticTokenModifiers
----| "declaration" # declaration
----| "definition" # definition
----| "readonly" # readonly
----| "static" # static
----| "deprecated" # deprecated
----| "abstract" # abstract
----| "async" # async
----| "modification" # modification
----| "documentation" # documentation
----| "defaultLibrary" # defaultLibrary
-
----The document diagnostic report kinds.
----
----@since 3.17.0
----@alias lsp.DocumentDiagnosticReportKind
----| "full" # Full
----| "unchanged" # Unchanged
-
----Predefined error codes.
----@alias lsp.ErrorCodes
----| -32700 # ParseError
----| -32600 # InvalidRequest
----| -32601 # MethodNotFound
----| -32602 # InvalidParams
----| -32603 # InternalError
----| -32002 # ServerNotInitialized
----| -32001 # UnknownErrorCode
-
----@alias lsp.LSPErrorCodes
----| -32803 # RequestFailed
----| -32802 # ServerCancelled
----| -32801 # ContentModified
----| -32800 # RequestCancelled
-
----A set of predefined range kinds.
----@alias lsp.FoldingRangeKind
----| "comment" # Comment
----| "imports" # Imports
----| "region" # Region
-
----A symbol kind.
----@alias lsp.SymbolKind
----| 1 # File
----| 2 # Module
----| 3 # Namespace
----| 4 # Package
----| 5 # Class
----| 6 # Method
----| 7 # Property
----| 8 # Field
----| 9 # Constructor
----| 10 # Enum
----| 11 # Interface
----| 12 # Function
----| 13 # Variable
----| 14 # Constant
----| 15 # String
----| 16 # Number
----| 17 # Boolean
----| 18 # Array
----| 19 # Object
----| 20 # Key
----| 21 # Null
----| 22 # EnumMember
----| 23 # Struct
----| 24 # Event
----| 25 # Operator
----| 26 # TypeParameter
-
----Symbol tags are extra annotations that tweak the rendering of a symbol.
----
----@since 3.16
----@alias lsp.SymbolTag
----| 1 # Deprecated
-
----Moniker uniqueness level to define scope of the moniker.
----
----@since 3.16.0
----@alias lsp.UniquenessLevel
----| "document" # document
----| "project" # project
----| "group" # group
----| "scheme" # scheme
----| "global" # global
-
----The moniker kind.
----
----@since 3.16.0
----@alias lsp.MonikerKind
----| "import" # import
----| "export" # export
----| "local" # local
-
----Inlay hint kinds.
----
----@since 3.17.0
----@alias lsp.InlayHintKind
----| 1 # Type
----| 2 # Parameter
-
----Defines whether the insert text in a completion item should be interpreted as
----plain text or a snippet.
----@alias lsp.InsertTextFormat
----| 1 # PlainText
----| 2 # Snippet
-
----The message type
----@alias lsp.MessageType
----| 1 # Error
----| 2 # Warning
----| 3 # Info
----| 4 # Log
-
----Defines how the host (editor) should sync
----document changes to the language server.
----@alias lsp.TextDocumentSyncKind
----| 0 # None
----| 1 # Full
----| 2 # Incremental
-
----Represents reasons why a text document is saved.
----@alias lsp.TextDocumentSaveReason
----| 1 # Manual
----| 2 # AfterDelay
----| 3 # FocusOut
-
----The kind of a completion entry.
----@alias lsp.CompletionItemKind
----| 1 # Text
----| 2 # Method
----| 3 # Function
----| 4 # Constructor
----| 5 # Field
----| 6 # Variable
----| 7 # Class
----| 8 # Interface
----| 9 # Module
----| 10 # Property
----| 11 # Unit
----| 12 # Value
----| 13 # Enum
----| 14 # Keyword
----| 15 # Snippet
----| 16 # Color
----| 17 # File
----| 18 # Reference
----| 19 # Folder
----| 20 # EnumMember
----| 21 # Constant
----| 22 # Struct
----| 23 # Event
----| 24 # Operator
----| 25 # TypeParameter
-
----Completion item tags are extra annotations that tweak the rendering of a completion
----item.
----
----@since 3.15.0
----@alias lsp.CompletionItemTag
----| 1 # Deprecated
-
----How whitespace and indentation is handled during completion
----item insertion.
----
----@since 3.16.0
----@alias lsp.InsertTextMode
----| 1 # asIs
----| 2 # adjustIndentation
-
----A document highlight kind.
----@alias lsp.DocumentHighlightKind
----| 1 # Text
----| 2 # Read
----| 3 # Write
-
----A set of predefined code action kinds
----@alias lsp.CodeActionKind
----| "" # Empty
----| "quickfix" # QuickFix
----| "refactor" # Refactor
----| "refactor.extract" # RefactorExtract
----| "refactor.inline" # RefactorInline
----| "refactor.rewrite" # RefactorRewrite
----| "source" # Source
----| "source.organizeImports" # SourceOrganizeImports
----| "source.fixAll" # SourceFixAll
-
----@alias lsp.TraceValues
----| "off" # Off
----| "messages" # Messages
----| "verbose" # Verbose
-
----Describes the content type that a client supports in various
----result literals like `Hover`, `ParameterInfo` or `CompletionItem`.
----
----Please note that `MarkupKinds` must not start with a `$`. This kinds
----are reserved for internal usage.
----@alias lsp.MarkupKind
----| "plaintext" # PlainText
----| "markdown" # Markdown
-
----Describes how an {@link InlineCompletionItemProvider inline completion provider} was triggered.
----
----@since 3.18.0
----@alias lsp.InlineCompletionTriggerKind
----| 0 # Invoked
----| 1 # Automatic
-
----A set of predefined position encoding kinds.
----
----@since 3.17.0
----@alias lsp.PositionEncodingKind
----| "utf-8" # UTF8
----| "utf-16" # UTF16
----| "utf-32" # UTF32
-
----The file event type
----@alias lsp.FileChangeType
----| 1 # Created
----| 2 # Changed
----| 3 # Deleted
-
----@alias lsp.WatchKind
----| 1 # Create
----| 2 # Change
----| 4 # Delete
-
----The diagnostic's severity.
----@alias lsp.DiagnosticSeverity
----| 1 # Error
----| 2 # Warning
----| 3 # Information
----| 4 # Hint
-
----The diagnostic tags.
----
----@since 3.15.0
----@alias lsp.DiagnosticTag
----| 1 # Unnecessary
----| 2 # Deprecated
-
----How a completion was triggered
----@alias lsp.CompletionTriggerKind
----| 1 # Invoked
----| 2 # TriggerCharacter
----| 3 # TriggerForIncompleteCompletions
-
----How a signature help was triggered.
----
----@since 3.15.0
----@alias lsp.SignatureHelpTriggerKind
----| 1 # Invoked
----| 2 # TriggerCharacter
----| 3 # ContentChange
-
----The reason why code actions were requested.
----
----@since 3.17.0
----@alias lsp.CodeActionTriggerKind
----| 1 # Invoked
----| 2 # Automatic
-
----A pattern kind describing if a glob pattern matches a file a folder or
----both.
----
----@since 3.16.0
----@alias lsp.FileOperationPatternKind
----| "file" # file
----| "folder" # folder
-
----A notebook cell kind.
----
----@since 3.17.0
----@alias lsp.NotebookCellKind
----| 1 # Markup
----| 2 # Code
-
----@alias lsp.ResourceOperationKind
----| "create" # Create
----| "rename" # Rename
----| "delete" # Delete
-
----@alias lsp.FailureHandlingKind
----| "abort" # Abort
----| "transactional" # Transactional
----| "textOnlyTransactional" # TextOnlyTransactional
----| "undo" # Undo
-
----@alias lsp.PrepareSupportDefaultBehavior
----| 1 # Identifier
-
----@alias lsp.TokenFormat
----| "relative" # Relative
-
----The definition of a symbol represented as one or many {@link Location locations}.
----For most programming languages there is only one location at which a symbol is
----defined.
----
----Servers should prefer returning `DefinitionLink` over `Definition` if supported
----by the client.
----@alias lsp.Definition lsp.Location|lsp.Location[]
-
----Information about where a symbol is defined.
----
----Provides additional metadata over normal {@link Location location} definitions, including the range of
----the defining symbol
----@alias lsp.DefinitionLink lsp.LocationLink
-
----LSP arrays.
----@since 3.17.0
----@alias lsp.LSPArray lsp.LSPAny[]
-
----The LSP any type.
----Please note that strictly speaking a property with the value `undefined`
----can't be converted into JSON preserving the property name. However for
----convenience it is allowed and assumed that all these properties are
----optional as well.
----@since 3.17.0
----@alias lsp.LSPAny lsp.LSPObject|lsp.LSPArray|string|integer|uinteger|decimal|boolean|lsp.null
-
----The declaration of a symbol representation as one or many {@link Location locations}.
----@alias lsp.Declaration lsp.Location|lsp.Location[]
-
----Information about where a symbol is declared.
----
----Provides additional metadata over normal {@link Location location} declarations, including the range of
----the declaring symbol.
----
----Servers should prefer returning `DeclarationLink` over `Declaration` if supported
----by the client.
----@alias lsp.DeclarationLink lsp.LocationLink
-
----Inline value information can be provided by different means:
----- directly as a text value (class InlineValueText).
----- as a name to use for a variable lookup (class InlineValueVariableLookup)
----- as an evaluatable expression (class InlineValueEvaluatableExpression)
----The InlineValue types combines all inline value types into one type.
----
----@since 3.17.0
----@alias lsp.InlineValue lsp.InlineValueText|lsp.InlineValueVariableLookup|lsp.InlineValueEvaluatableExpression
-
----The result of a document diagnostic pull request. A report can
----either be a full report containing all diagnostics for the
----requested document or an unchanged report indicating that nothing
----has changed in terms of diagnostics in comparison to the last
----pull request.
----
----@since 3.17.0
----@alias lsp.DocumentDiagnosticReport lsp.RelatedFullDocumentDiagnosticReport|lsp.RelatedUnchangedDocumentDiagnosticReport
-
----@alias lsp.PrepareRenameResult lsp.Range|anonym44|anonym45
-
----A document selector is the combination of one or many document filters.
----
----@sample `let sel:DocumentSelector = [{ language: 'typescript' }, { language: 'json', pattern: '**∕tsconfig.json' }]`;
----
----The use of a string as a document filter is deprecated @since 3.16.0.
----@alias lsp.DocumentSelector lsp.DocumentFilter[]
-
----@alias lsp.ProgressToken integer|string
-
----An identifier to refer to a change annotation stored with a workspace edit.
----@alias lsp.ChangeAnnotationIdentifier string
-
----A workspace diagnostic document report.
----
----@since 3.17.0
----@alias lsp.WorkspaceDocumentDiagnosticReport lsp.WorkspaceFullDocumentDiagnosticReport|lsp.WorkspaceUnchangedDocumentDiagnosticReport
-
----An event describing a change to a text document. If only a text is provided
----it is considered to be the full content of the document.
----@alias lsp.TextDocumentContentChangeEvent anonym46|anonym47
-
----MarkedString can be used to render human readable text. It is either a markdown string
----or a code-block that provides a language and a code snippet. The language identifier
----is semantically equal to the optional language identifier in fenced code blocks in GitHub
----issues. See https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
----
----The pair of a language and a value is an equivalent to markdown:
----```${language}
----${value}
----```
----
----Note that markdown strings will be sanitized - that means html will be escaped.
----@deprecated use MarkupContent instead.
----@alias lsp.MarkedString string|anonym48
-
----A document filter describes a top level text document or
----a notebook cell document.
----
----@since 3.17.0 - proposed support for NotebookCellTextDocumentFilter.
----@alias lsp.DocumentFilter lsp.TextDocumentFilter|lsp.NotebookCellTextDocumentFilter
-
----LSP object definition.
----@since 3.17.0
----@alias lsp.LSPObject table<string, lsp.LSPAny>
-
----The glob pattern. Either a string pattern or a relative pattern.
----
----@since 3.17.0
----@alias lsp.GlobPattern lsp.Pattern|lsp.RelativePattern
-
----A document filter denotes a document by different properties like
----the {@link TextDocument.languageId language}, the {@link Uri.scheme scheme} of
----its resource, or a glob-pattern that is applied to the {@link TextDocument.fileName path}.
----
----Glob patterns can have the following syntax:
----- `*` to match one or more characters in a path segment
----- `?` to match on one character in a path segment
----- `**` to match any number of path segments, including none
----- `{}` to group sub patterns into an OR expression. (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
----- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
----- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
----
----@sample A language filter that applies to typescript files on disk: `{ language: 'typescript', scheme: 'file' }`
----@sample A language filter that applies to all package.json paths: `{ language: 'json', pattern: '**package.json' }`
----
----@since 3.17.0
----@alias lsp.TextDocumentFilter anonym49|anonym50|anonym51
-
----A notebook document filter denotes a notebook document by
----different properties. The properties will be match
----against the notebook's URI (same as with documents)
----
----@since 3.17.0
----@alias lsp.NotebookDocumentFilter anonym52|anonym53|anonym54
-
----The glob pattern to watch relative to the base path. Glob patterns can have the following syntax:
----- `*` to match one or more characters in a path segment
----- `?` to match on one character in a path segment
----- `**` to match any number of path segments, including none
----- `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
----- `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
----- `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
----
----@since 3.17.0
----@alias lsp.Pattern string
-
----@class anonym1
----The name of the server as defined by the server.
----@field name string
----The server's version as defined by the server.
----@field version? string
-
----@class anonym3
----@field insert lsp.Range
----@field replace lsp.Range
-
----@class anonym2
----A default commit character set.
----
----@since 3.17.0
----@field commitCharacters? string[]
----A default edit range.
----
----@since 3.17.0
----@field editRange? lsp.Range|anonym3
----A default insert text format.
----
----@since 3.17.0
----@field insertTextFormat? lsp.InsertTextFormat
----A default insert text mode.
----
----@since 3.17.0
----@field insertTextMode? lsp.InsertTextMode
----A default data value.
----
----@since 3.17.0
----@field data? lsp.LSPAny
-
----@class anonym4
----Human readable description of why the code action is currently disabled.
----
----This is displayed in the code actions UI.
----@field reason string
-
----@class anonym5
----@field uri lsp.DocumentUri
-
----@class anonym6
-
----@class anonym7
----The server supports deltas for full documents.
----@field delta? boolean
-
----@class anonym9
----The change to the cell array.
----@field array lsp.NotebookCellArrayChange
----Additional opened cell text documents.
----@field didOpen? lsp.TextDocumentItem[]
----Additional closed cell text documents.
----@field didClose? lsp.TextDocumentIdentifier[]
-
----@class anonym10
----@field document lsp.VersionedTextDocumentIdentifier
----@field changes lsp.TextDocumentContentChangeEvent[]
-
----@class anonym8
----Changes to the cell structure to add or
----remove cells.
----@field structure? anonym9
----Changes to notebook cells properties like its
----kind, execution summary or metadata.
----@field data? lsp.NotebookCell[]
----Changes to the text content of notebook cells.
----@field textContent? anonym10[]
-
----@class anonym11
----The name of the client as defined by the client.
----@field name string
----The client's version as defined by the client.
----@field version? string
-
----@class anonym12
----The server supports workspace folder.
----
----@since 3.6.0
----@field workspaceFolders? lsp.WorkspaceFoldersServerCapabilities
----The server is interested in notifications/requests for operations on files.
----
----@since 3.16.0
----@field fileOperations? lsp.FileOperationOptions
-
----@class anonym13
----The server has support for completion item label
----details (see also `CompletionItemLabelDetails`) when
----receiving a completion item in a resolve call.
----
----@since 3.17.0
----@field labelDetailsSupport? boolean
-
----@class anonym15
----@field language string
-
----@class anonym14
----The notebook to be synced If a string
----value is provided it matches against the
----notebook type. '*' matches every notebook.
----@field notebook string|lsp.NotebookDocumentFilter
----The cells of the matching notebook to be synced.
----@field cells? anonym15[]
-
----@class anonym17
----@field language string
-
----@class anonym16
----The notebook to be synced If a string
----value is provided it matches against the
----notebook type. '*' matches every notebook.
----@field notebook? string|lsp.NotebookDocumentFilter
----The cells of the matching notebook to be synced.
----@field cells anonym17[]
-
----@class anonym18
----The client will actively cancel the request.
----@field cancel boolean
----The list of requests for which the client
----will retry the request if it receives a
----response with error code `ContentModified`
----@field retryOnContentModified string[]
-
----@class anonym19
----Whether the client groups edits with equal labels into tree nodes,
----for instance all edits labelled with "Changes in Strings" would
----be a tree node.
----@field groupsOnLabel? boolean
-
----@class anonym20
----The symbol kind values the client supports. When this
----property exists the client also guarantees that it will
----handle values outside its set gracefully and falls back
----to a default value when unknown.
----
----If this property is not present the client only supports
----the symbol kinds from `File` to `Array` as defined in
----the initial version of the protocol.
----@field valueSet? lsp.SymbolKind[]
-
----@class anonym21
----The tags supported by the client.
----@field valueSet lsp.SymbolTag[]
-
----@class anonym22
----The properties that a client can resolve lazily. Usually
----`location.range`
----@field properties string[]
-
----@class anonym24
----The tags supported by the client.
----@field valueSet lsp.CompletionItemTag[]
-
----@class anonym25
----The properties that a client can resolve lazily.
----@field properties string[]
-
----@class anonym26
----@field valueSet lsp.InsertTextMode[]
-
----@class anonym23
----Client supports snippets as insert text.
----
----A snippet can define tab stops and placeholders with `$1`, `$2`
----and `${3:foo}`. `$0` defines the final tab stop, it defaults to
----the end of the snippet. Placeholders with equal identifiers are linked,
----that is typing in one will update others too.
----@field snippetSupport? boolean
----Client supports commit characters on a completion item.
----@field commitCharactersSupport? boolean
----Client supports the following content formats for the documentation
----property. The order describes the preferred format of the client.
----@field documentationFormat? lsp.MarkupKind[]
----Client supports the deprecated property on a completion item.
----@field deprecatedSupport? boolean
----Client supports the preselect property on a completion item.
----@field preselectSupport? boolean
----Client supports the tag property on a completion item. Clients supporting
----tags have to handle unknown tags gracefully. Clients especially need to
----preserve unknown tags when sending a completion item back to the server in
----a resolve call.
----
----@since 3.15.0
----@field tagSupport? anonym24
----Client support insert replace edit to control different behavior if a
----completion item is inserted in the text or should replace text.
----
----@since 3.16.0
----@field insertReplaceSupport? boolean
----Indicates which properties a client can resolve lazily on a completion
----item. Before version 3.16.0 only the predefined properties `documentation`
----and `details` could be resolved lazily.
----
----@since 3.16.0
----@field resolveSupport? anonym25
----The client supports the `insertTextMode` property on
----a completion item to override the whitespace handling mode
----as defined by the client (see `insertTextMode`).
----
----@since 3.16.0
----@field insertTextModeSupport? anonym26
----The client has support for completion item label
----details (see also `CompletionItemLabelDetails`).
----
----@since 3.17.0
----@field labelDetailsSupport? boolean
-
----@class anonym27
----The completion item kind values the client supports. When this
----property exists the client also guarantees that it will
----handle values outside its set gracefully and falls back
----to a default value when unknown.
----
----If this property is not present the client only supports
----the completion items kinds from `Text` to `Reference` as defined in
----the initial version of the protocol.
----@field valueSet? lsp.CompletionItemKind[]
-
----@class anonym28
----The client supports the following itemDefaults on
----a completion list.
----
----The value lists the supported property names of the
----`CompletionList.itemDefaults` object. If omitted
----no properties are supported.
----
----@since 3.17.0
----@field itemDefaults? string[]
-
----@class anonym30
----The client supports processing label offsets instead of a
----simple label string.
----
----@since 3.14.0
----@field labelOffsetSupport? boolean
-
----@class anonym29
----Client supports the following content formats for the documentation
----property. The order describes the preferred format of the client.
----@field documentationFormat? lsp.MarkupKind[]
----Client capabilities specific to parameter information.
----@field parameterInformation? anonym30
----The client supports the `activeParameter` property on `SignatureInformation`
----literal.
----
----@since 3.16.0
----@field activeParameterSupport? boolean
-
----@class anonym31
----The symbol kind values the client supports. When this
----property exists the client also guarantees that it will
----handle values outside its set gracefully and falls back
----to a default value when unknown.
----
----If this property is not present the client only supports
----the symbol kinds from `File` to `Array` as defined in
----the initial version of the protocol.
----@field valueSet? lsp.SymbolKind[]
-
----@class anonym32
----The tags supported by the client.
----@field valueSet lsp.SymbolTag[]
-
----@class anonym34
----The code action kind values the client supports. When this
----property exists the client also guarantees that it will
----handle values outside its set gracefully and falls back
----to a default value when unknown.
----@field valueSet lsp.CodeActionKind[]
-
----@class anonym33
----The code action kind is support with the following value
----set.
----@field codeActionKind anonym34
-
----@class anonym35
----The properties that a client can resolve lazily.
----@field properties string[]
-
----@class anonym36
----The folding range kind values the client supports. When this
----property exists the client also guarantees that it will
----handle values outside its set gracefully and falls back
----to a default value when unknown.
----@field valueSet? lsp.FoldingRangeKind[]
-
----@class anonym37
----If set, the client signals that it supports setting collapsedText on
----folding ranges to display custom labels instead of the default text.
----
----@since 3.17.0
----@field collapsedText? boolean
-
----@class anonym38
----The tags supported by the client.
----@field valueSet lsp.DiagnosticTag[]
-
----@class anonym40
-
----@class anonym41
----The client will send the `textDocument/semanticTokens/full/delta` request if
----the server provides a corresponding handler.
----@field delta? boolean
-
----@class anonym39
----The client will send the `textDocument/semanticTokens/range` request if
----the server provides a corresponding handler.
----@field range? boolean|anonym40
----The client will send the `textDocument/semanticTokens/full` request if
----the server provides a corresponding handler.
----@field full? boolean|anonym41
-
----@class anonym42
----The properties that a client can resolve lazily.
----@field properties string[]
-
----@class anonym43
----Whether the client supports additional attributes which
----are preserved and send back to the server in the
----request's response.
----@field additionalPropertiesSupport? boolean
-
----@class anonym44
----@field range lsp.Range
----@field placeholder string
-
----@class anonym45
----@field defaultBehavior boolean
-
----@class anonym46
----The range of the document that changed.
----@field range lsp.Range
----The optional length of the range that got replaced.
----
----@deprecated use range instead.
----@field rangeLength? uinteger
----The new text for the provided range.
----@field text string
-
----@class anonym47
----The new text of the whole document.
----@field text string
-
----@class anonym48
----@field language string
----@field value string
-
----@class anonym49
----A language id, like `typescript`.
----@field language string
----A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
----@field scheme? string
----A glob pattern, like `*.{ts,js}`.
----@field pattern? string
-
----@class anonym50
----A language id, like `typescript`.
----@field language? string
----A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
----@field scheme string
----A glob pattern, like `*.{ts,js}`.
----@field pattern? string
-
----@class anonym51
----A language id, like `typescript`.
----@field language? string
----A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
----@field scheme? string
----A glob pattern, like `*.{ts,js}`.
----@field pattern string
-
----@class anonym52
----The type of the enclosing notebook.
----@field notebookType string
----A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
----@field scheme? string
----A glob pattern.
----@field pattern? string
-
----@class anonym53
----The type of the enclosing notebook.
----@field notebookType? string
----A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
----@field scheme string
----A glob pattern.
----@field pattern? string
-
----@class anonym54
----The type of the enclosing notebook.
----@field notebookType? string
----A Uri {@link Uri.scheme scheme}, like `file` or `untitled`.
----@field scheme? string
----A glob pattern.
----@field pattern string
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 738e23ff28..633cddca2d 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -715,8 +715,8 @@ end
 --- Turns the result of a `textDocument/completion` request into vim-compatible
 --- |complete-items|.
 ---
----@param result table The result of a `textDocument/completion` call, e.g. from
----|vim.lsp.buf.completion()|, which may be one of `CompletionItem[]`,
+---@param result table The result of a `textDocument/completion` call, e.g.
+--- from |vim.lsp.buf.completion()|, which may be one of `CompletionItem[]`,
 --- `CompletionList` or `null`
 ---@param prefix (string) the prefix to filter the completion items
 ---@return table { matches = complete-items table, incomplete = bool }
diff --git a/runtime/lua/vim/secure.lua b/runtime/lua/vim/secure.lua
index 837738c041..893b3e1877 100644
--- a/runtime/lua/vim/secure.lua
+++ b/runtime/lua/vim/secure.lua
@@ -119,9 +119,8 @@ end
 ---    - path (string|nil): Path to a file to update. Mutually exclusive with {bufnr}.
 ---      Cannot be used when {action} is "allow".
 ---    - bufnr (number|nil): Buffer number to update. Mutually exclusive with {path}.
----@return (boolean, string) success, msg:
----    - true and full path of target file if operation was successful
----    - false and error message on failure
+---@return boolean success true if operation was successful
+---@return string msg full path if operation was successful, else error message
 function M.trust(opts)
   vim.validate({
     path = { opts.path, 's', true },
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 32575a1cc9..422d49d746 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -6,6 +6,7 @@
 -- or the test suite. (Eventually the test suite will be run in a worker process,
 -- so this wouldn't be a separate case to consider)
 
+---@diagnostic disable-next-line: lowercase-global
 vim = vim or {}
 
 local function _id(v)
@@ -533,7 +534,7 @@ end
 ---@see Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
 ---
 ---@param t table Dict-like table
----@return # iterator over sorted keys and their values
+---@return function iterator over sorted keys and their values
 function vim.spairs(t)
   assert(type(t) == 'table', string.format('Expected table, got %s', type(t)))
 
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 08186468a5..3b7e74c0cf 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -434,7 +434,7 @@ local predicate_handlers = {
 predicate_handlers['vim-match?'] = predicate_handlers['match?']
 
 ---@class TSMetadata
----@field range Range
+---@field range? Range
 ---@field [integer] TSMetadata
 ---@field [string] integer|string
 
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 96889438eb..056e1678ff 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -212,15 +212,15 @@ function M.last(versions)
   return last
 end
 
----@class Range
+---@class VersionRange
 ---@field from Version
 ---@field to? Version
-local Range = {}
+local VersionRange = {}
 
 --- @private
 ---
 ---@param version string|Version
-function Range:has(version)
+function VersionRange:has(version)
   if type(version) == 'string' then
     ---@diagnostic disable-next-line: cast-local-type
     version = M.parse(version)
@@ -266,7 +266,7 @@ end
 --- @param spec string Version range "spec"
 function M.range(spec) -- Adapted from https://github.com/folke/lazy.nvim
   if spec == '*' or spec == '' then
-    return setmetatable({ from = M.parse('0.0.0') }, { __index = Range })
+    return setmetatable({ from = M.parse('0.0.0') }, { __index = VersionRange })
   end
 
   ---@type number?
@@ -280,7 +280,7 @@ function M.range(spec) -- Adapted from https://github.com/folke/lazy.nvim
     return setmetatable({
       from = ra and ra.from,
       to = rb and (#parts == 3 and rb.from or rb.to),
-    }, { __index = Range })
+    }, { __index = VersionRange })
   end
   ---@type string, string
   local mods, version = spec:lower():match('^([%^=<>~]*)(.*)$')
@@ -326,7 +326,7 @@ function M.range(spec) -- Adapted from https://github.com/folke/lazy.nvim
         end
       end
     end
-    return setmetatable({ from = from, to = to }, { __index = Range })
+    return setmetatable({ from = from, to = to }, { __index = VersionRange })
   end
 end
 
-- 
cgit 


From 68f12e7fcb1fb8b95ca0b1207683d929574c0555 Mon Sep 17 00:00:00 2001
From: Kyuuhachi <1547062+Kyuuhachi@users.noreply.github.com>
Date: Wed, 9 Aug 2023 19:06:42 +0200
Subject: fix(lua): annotate that TSNode functions can return nil (#24621)

---
 runtime/lua/vim/treesitter/_meta.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index 9ca4b560c6..36b1a9bbf8 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -14,15 +14,15 @@
 ---@field extra fun(self: TSNode): boolean
 ---@field child_count fun(self: TSNode): integer
 ---@field named_child_count fun(self: TSNode): integer
----@field child fun(self: TSNode, integer): TSNode
----@field named_child fun(self: TSNode, integer): TSNode
----@field descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode
----@field named_descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode
----@field parent fun(self: TSNode): TSNode
----@field next_sibling fun(self: TSNode): TSNode
----@field prev_sibling fun(self: TSNode): TSNode
----@field next_named_sibling fun(self: TSNode): TSNode
----@field prev_named_sibling fun(self: TSNode): TSNode
+---@field child fun(self: TSNode, integer): TSNode?
+---@field named_child fun(self: TSNode, integer): TSNode?
+---@field descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode?
+---@field named_descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode?
+---@field parent fun(self: TSNode): TSNode?
+---@field next_sibling fun(self: TSNode): TSNode?
+---@field prev_sibling fun(self: TSNode): TSNode?
+---@field next_named_sibling fun(self: TSNode): TSNode?
+---@field prev_named_sibling fun(self: TSNode): TSNode?
 ---@field named_children fun(self: TSNode): TSNode[]
 ---@field has_changes fun(self: TSNode): boolean
 ---@field equal fun(self: TSNode, other: TSNode): boolean
-- 
cgit 


From 164370a4cb92f5063280d4748e1e67fafc79df34 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 19:13:59 +0200
Subject: vim-patch:c2bd205254c8

Change "the" to "then" under ':help bufload()' (vim/vim#12662)

https://github.com/vim/vim/commit/c2bd205254c89ecf46e08965f53d7991315d9c98

N/A commits:
vim-patch:64dea84bb05a (we have our own manpager at home)
vim-patch:958e15bb1c7d (we have our own editorconfig syntax file)
vim-patch:c41b3c9f95ac (we don't have defaults.vim)

Co-authored-by: Daniel Steinberg <dstein64@users.noreply.github.com>
---
 runtime/doc/builtin.txt         | 2 +-
 runtime/lua/vim/_meta/vimfn.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 0c239b223d..e678a8d804 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -398,7 +398,7 @@ bufload({buf})                                                       *bufload()*
 		refers to an existing file then the file is read.  Otherwise
 		the buffer will be empty.  If the buffer was already loaded
 		then there is no change.  If the buffer is not related to a
-		file the no file is read (e.g., when 'buftype' is "nofile").
+		file then no file is read (e.g., when 'buftype' is "nofile").
 		If there is an existing swap file for the file of the buffer,
 		there will be no dialog, the buffer will be loaded anyway.
 		The {buf} argument is used like with |bufexists()|.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 7c98ed8849..14aae99971 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -534,7 +534,7 @@ function vim.fn.buflisted(buf) end
 --- refers to an existing file then the file is read.  Otherwise
 --- the buffer will be empty.  If the buffer was already loaded
 --- then there is no change.  If the buffer is not related to a
---- file the no file is read (e.g., when 'buftype' is "nofile").
+--- file then no file is read (e.g., when 'buftype' is "nofile").
 --- If there is an existing swap file for the file of the buffer,
 --- there will be no dialog, the buffer will be loaded anyway.
 --- The {buf} argument is used like with |bufexists()|.
-- 
cgit 


From f81645abd2e54b3b70ac5d420594430f27639510 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 19:20:18 +0200
Subject: vim-patch:0401933a5be3

Fix alignment in filetype.txt (vim/vim#12618)

There are three spaces because the "<" is concealed.

https://github.com/vim/vim/commit/0401933a5be3b72e12427cdaf8b7ff2694690d02

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 runtime/doc/filetype.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 1dad3cd433..9ebdc71eb2 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -357,7 +357,7 @@ ways to change this:
    You must create a new filetype plugin in a directory early in
    'runtimepath'.  For Unix, for example you could use this file: >
 	vim ~/.config/nvim/ftplugin/fortran.vim
-<  You can set those settings and mappings that you would like to add.  Note
+<   You can set those settings and mappings that you would like to add.  Note
    that the global plugin will be loaded after this, it may overrule the
    settings that you do here.  If this is the case, you need to use one of the
    following two methods.
@@ -366,7 +366,7 @@ ways to change this:
    You must put the copy in a directory early in 'runtimepath'.  For Unix, for
    example, you could do this: >
 	cp $VIMRUNTIME/ftplugin/fortran.vim ~/.config/nvim/ftplugin/fortran.vim
-<  Then you can edit the copied file to your liking.  Since the b:did_ftplugin
+<   Then you can edit the copied file to your liking.  Since the b:did_ftplugin
    variable will be set, the global plugin will not be loaded.
    A disadvantage of this method is that when the distributed plugin gets
    improved, you will have to copy and modify it again.
@@ -375,7 +375,7 @@ ways to change this:
    You must create a new filetype plugin in a directory from the end of
    'runtimepath'.  For Unix, for example, you could use this file: >
 	vim ~/.config/nvim/after/ftplugin/fortran.vim
-<  In this file you can change just those settings that you want to change.
+<   In this file you can change just those settings that you want to change.
 
 ==============================================================================
 3.  Docs for the default filetype plugins.		*ftplugin-docs*
-- 
cgit 


From ceb501c1c664953392fff4c14bb106efa2bf049e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 22:33:41 +0200
Subject: vim-patch:a13eb2b14791 (#24622)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add WebGPU Shading Language (WGSL) filetype (vim/vim#12723)

The current W3C Working Draft for the WebGPU Shading Language (WGSL) specifies
'text/wgsl' media type for WGSL modules with the '.wgsl' file extension:
https://www.w3.org/TR/WGSL/#text-wgsl-media-type

It has also been registered at the Internet Assigned Numbers Authority (IANA):
https://www.iana.org/assignments/media-types/text/wgsl

Neovim's nvim-lspconfig already associates wgsl language servers
with 'filetype wgsl':
https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#wgsl_analyzer

However currenly setting 'filetype wgsl' for *.wgsl files by defalut in Neovim
is blocked by adding this filetype to the vim project first:
https://github.com/neovim/neovim/pull/23331

This commit adds this missing wgsl filetype.

https://github.com/vim/vim/commit/a13eb2b147915e7e92a6de6c19ce448c7def4057

Co-authored-by: Gergő Sályi <87373293+gergo-salyi@users.noreply.github.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index a53216f8ea..634f5c6a58 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1049,6 +1049,7 @@ local extension = {
   wat = 'wat',
   wdl = 'wdl',
   wm = 'webmacro',
+  wgsl = 'wgsl',
   wbt = 'winbatch',
   wit = 'wit',
   wml = 'wml',
-- 
cgit 


From aaeb1a8cd18741ff17fd030eb05a132bb9f99430 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 22:34:02 +0200
Subject: vim-patch:7159ac7fec28 (#24624)

Unison support (vim/vim#12715)

https://github.com/vim/vim/commit/7159ac7fec282ad7427795b4bcd5b769268c083d

Co-authored-by: Anton Parkhomenko <chuwy@users.noreply.github.com>
---
 runtime/ftplugin/unison.vim  |  14 ++++++
 runtime/lua/vim/filetype.lua |   2 +
 runtime/syntax/unison.vim    | 103 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 119 insertions(+)
 create mode 100644 runtime/ftplugin/unison.vim
 create mode 100644 runtime/syntax/unison.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/unison.vim b/runtime/ftplugin/unison.vim
new file mode 100644
index 0000000000..76dbaef6aa
--- /dev/null
+++ b/runtime/ftplugin/unison.vim
@@ -0,0 +1,14 @@
+" Vim filetype plugin file
+" Language:             unison
+" Maintainer:           Anton Parkhomenko <anton@chuwy.me>
+" Latest Revision:      2023-08-07
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl cms< isk<"
+
+setlocal commentstring=--\ %s
+setlocal iskeyword+=!,'
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 634f5c6a58..6359f4a7c2 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1011,6 +1011,8 @@ local extension = {
   uit = 'uil',
   uil = 'uil',
   ungram = 'ungrammar',
+  u = 'unison',
+  uu = 'unison',
   url = 'urlshortcut',
   usd = 'usd',
   usda = 'usd',
diff --git a/runtime/syntax/unison.vim b/runtime/syntax/unison.vim
new file mode 100644
index 0000000000..fed7551043
--- /dev/null
+++ b/runtime/syntax/unison.vim
@@ -0,0 +1,103 @@
+" Vim syntax file
+"
+" Language:        unison
+" Maintainer:      Anton Parkhomenko <anton@chuwy.me>
+" Last Change:     Aug 7, 2023
+" Original Author: John Williams, Paul Chiusano and Rúnar Bjarnason
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax include @markdown $VIMRUNTIME/syntax/markdown.vim
+
+syn cluster markdownLikeDocs contains=markdownBold,markdownItalic,markdownLinkText,markdownListMarker,markdownOrderedListMarker,markdownH1,markdownH2,markdownH3,markdownH4,markdownH5,markdownH6
+
+syn match unisonOperator "[-!#$%&\*\+/<=>\?@\\^|~]"
+syn match unisonDelimiter "[\[\](){},.]"
+
+" Strings and constants
+syn match   unisonSpecialChar	contained "\\\([0-9]\+\|o[0-7]\+\|x[0-9a-fA-F]\+\|[\"\\'&\\abfnrtv]\|^[A-Z^_\[\\\]]\)"
+syn match   unisonSpecialChar	contained "\\\(NUL\|SOH\|STX\|ETX\|EOT\|ENQ\|ACK\|BEL\|BS\|HT\|LF\|VT\|FF\|CR\|SO\|SI\|DLE\|DC1\|DC2\|DC3\|DC4\|NAK\|SYN\|ETB\|CAN\|EM\|SUB\|ESC\|FS\|GS\|RS\|US\|SP\|DEL\)"
+syn match   unisonSpecialCharError	contained "\\&\|'''\+"
+syn region  unisonString		start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=unisonSpecialChar
+syn match   unisonCharacter		"[^a-zA-Z0-9_']'\([^\\]\|\\[^']\+\|\\'\)'"lc=1 contains=unisonSpecialChar,unisonSpecialCharError
+syn match   unisonCharacter		"^'\([^\\]\|\\[^']\+\|\\'\)'" contains=unisonSpecialChar,unisonSpecialCharError
+syn match   unisonNumber		"\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>"
+syn match   unisonFloat		"\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
+
+" Keyword definitions. These must be patterns instead of keywords
+" because otherwise they would match as keywords at the start of a
+" "literate" comment (see lu.vim).
+syn match unisonModule		"\<namespace\>"
+syn match unisonImport		"\<use\>"
+syn match unisonTypedef		"\<\(unique\|structural\|∀\|forall\)\>"
+syn match unisonStatement		"\<\(ability\|do\|type\|where\|match\|cases\|;\|let\|with\|handle\)\>"
+syn match unisonConditional		"\<\(if\|else\|then\)\>"
+
+syn match unisonBoolean "\<\(true\|false\)\>"
+
+syn match unisonType "\<\C[A-Z][0-9A-Za-z_'!]*\>"
+syn match unisonName "\<\C[a-z_][0-9A-Za-z_'!]*\>"
+
+" Comments
+syn match   unisonLineComment      "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$"
+syn region  unisonBlockComment     start="{-"  end="-}" contains=unisonBlockComment
+syn region  unisonBelowFold	   start="^---" skip="." end="." contains=unisonBelowFold
+
+" Docs
+syn region  unisonDocBlock         matchgroup=unisonDoc start="{{" end="}}" contains=unisonDocTypecheck,unisonDocQuasiquote,unisonDocDirective,unisonDocCode,unisonDocCodeInline,unisonDocCodeRaw,unisonDocMono,@markdownLikeDocs
+syn region  unisonDocQuasiquote    contained matchgroup=unisonDocQuote start="{{" end= "}}" contains=TOP
+syn region  unisonDocCode          contained matchgroup=unisonDocCode start="^\s*```\s*$" end="^\s*```\s*$" contains=TOP
+syn region  unisonDocTypecheck     contained matchgroup=unisonDocCode start="^\s*@typecheck\s*```\s*$" end="^\s*```\s*$" contains=TOP
+syn region  unisonDocCodeRaw       contained matchgroup=unisonDocCode start="^\s*```\s*raw\s*$" end="^\s*```\s*$" contains=NoSyntax
+syn region  unisonDocCodeInline    contained matchgroup=unisonDocCode start="`\@<!``" end="`\@<!``" contains=TOP
+syn match   unisonDocMono          "''[^']*''"
+syn region  unisonDocDirective     contained matchgroup=unisonDocDirective start="\(@\([a-zA-Z0-9_']*\)\)\?{{\@!" end="}" contains=TOP
+
+syn match unisonDebug "\<\(todo\|bug\|Debug.trace\|Debug.evalToText\)\>"
+
+" things like 
+"    > my_func 1 3
+"    test> Function.tap.tests.t1 = check let
+"      use Nat == +
+"      ( 99, 100 ) === (withInitialValue 0 do
+"          :      :      :
+syn match unisonWatch "^[A-Za-z]*>"
+
+hi def link       unisonWatch                           Debug
+hi def link       unisonDocMono                         Delimiter
+hi def link       unisonDocDirective                    Import
+hi def link       unisonDocQuote                        Delimiter
+hi def link       unisonDocCode                         Delimiter
+hi def link       unisonDoc                             String
+hi def link       unisonBelowFold                       Comment
+hi def link       unisonBlockComment                    Comment
+hi def link       unisonBoolean                         Boolean
+hi def link       unisonCharacter                       Character
+hi def link       unisonComment                         Comment
+hi def link       unisonConditional                     Conditional
+hi def link       unisonConditional                     Conditional
+hi def link       unisonDebug                           Debug
+hi def link       unisonDelimiter                       Delimiter
+hi def link       unisonDocBlock                        String
+hi def link       unisonDocDirective                    Import
+hi def link       unisonDocIncluded                     Import
+hi def link       unisonFloat                           Float
+hi def link       unisonImport                          Include
+hi def link       unisonLineComment                     Comment
+hi def link       unisonLink                            Type
+hi def link       unisonName                            Identifier
+hi def link       unisonNumber                          Number
+hi def link       unisonOperator                        Operator
+hi def link       unisonSpecialChar                     SpecialChar
+hi def link       unisonSpecialCharError                Error
+hi def link       unisonStatement                       Statement
+hi def link       unisonString                          String
+hi def link       unisonType                            Type
+hi def link       unisonTypedef                         Typedef
+
+
+let b:current_syntax = "unison"
+
+" Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
-- 
cgit 


From 90ed7ee1123d128b817de5ff154dcd963ca1af3f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 22:34:39 +0200
Subject: vim-patch:44ff25d5243b (#24625)

* vim-patch:44ff25d5243b

PyPA manifest files are not recognized (vim/vim#12707)

Problem:    PyPA manifest files are not recognized.
Solution:   Add a pattern to match PyPA manifest files.

https://github.com/vim/vim/commit/44ff25d5243b6d4f7ee88b46d1254aec0b27f4eb

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 6359f4a7c2..b415247293 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1402,6 +1402,7 @@ local filename = {
   ['/etc/protocols'] = 'protocols',
   INDEX = detect.psf,
   INFO = detect.psf,
+  ['MANIFEST.in'] = 'pymanifest',
   ['.pythonstartup'] = 'python',
   ['.pythonrc'] = 'python',
   SConstruct = 'python',
-- 
cgit 


From 1904e5060edca066aa7ea0a9c470f5842a38d541 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 22:34:54 +0200
Subject: vim-patch:8967f6c4b9e2 (#24626)

feat(heex): borrow matchit support from html (vim/vim#12717)

* feat(heex): borrow matchit support from html

Makes % support behave the same in heex as in html. For example, quickly moving the cursor between opening and closing tags.

* Remove unnecessary line; define b:undo_ftplugin first

* Remove b:html_set_match_words

https://github.com/vim/vim/commit/8967f6c4b9e2071dea9a63dbbbb93f6b9119ae99

Co-authored-by: Chris Vincent <chris.vincent@hey.com>
---
 runtime/ftplugin/heex.vim | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'runtime')

diff --git a/runtime/ftplugin/heex.vim b/runtime/ftplugin/heex.vim
index 5274d59fbf..f79c69d2aa 100644
--- a/runtime/ftplugin/heex.vim
+++ b/runtime/ftplugin/heex.vim
@@ -14,3 +14,14 @@ setlocal comments=:<%!--
 setlocal commentstring=<%!--\ %s\ --%>
 
 let b:undo_ftplugin = 'set sw< sts< et< com< cms<'
+
+" HTML: thanks to Johannes Zellner and Benji Fisher.
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 1
+  let b:match_words = '<!--:-->,' ..
+	\	      '<:>,' ..
+	\	      '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' ..
+	\	      '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' ..
+	\	      '<\@<=\([^/!][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+  let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words"
+endif
-- 
cgit 


From 2e8f38690faf3b031138371066a5376f681549b8 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 22:35:43 +0200
Subject: vim-patch:b69b9d5e1753 (#24628)

Add filetype detection for eyaml files (vim/vim#12659)

https://github.com/voxpupuli/hiera-eyaml/ uses and produces the eyaml
format, which is simply yaml with some encrypted values.

It's convenient to edit the file without decrypting when not touching
encrypted values (or when you don't have access to the decryption key),
which is why vim should treat those files as yaml files.

https://github.com/vim/vim/commit/b69b9d5e175351c9a25507139954f6211f37fdd9

Co-authored-by: Max Gautier <mg@max.gautier.name>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index b415247293..98938ddbf3 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1093,6 +1093,7 @@ local extension = {
   yxx = 'yacc',
   yml = 'yaml',
   yaml = 'yaml',
+  eyaml = 'yaml',
   yang = 'yang',
   yuck = 'yuck',
   z8a = 'z8a',
-- 
cgit 


From 3c929fd1c2e0fd0f385f2cb82bd33145a7dd6a72 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 22:35:57 +0200
Subject: vim-patch:077ade4f6703 (#24629)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat: recognize geojson extension as json filetype (vim/vim#12636)

https://github.com/vim/vim/commit/077ade4f67036e652b99f8f858c9ca1c1dd22245

Co-authored-by: Dominique Pellé <dominique.pelle@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 98938ddbf3..dd730c0744 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -548,6 +548,7 @@ local extension = {
   slnf = 'json',
   json = 'json',
   jsonp = 'json',
+  geojson = 'json',
   webmanifest = 'json',
   ipynb = 'json',
   ['json-patch'] = 'json',
-- 
cgit 


From cc4540ebce6b719e735ef314b4acc5460aa1aeae Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 22:37:49 +0200
Subject: vim-patch:92f076e53e22 (#24634)

Update krl and add rapid syntax files (vim/vim#12750)

https://github.com/vim/vim/commit/92f076e53e22b467fb6d12051fec2d4bdbda88fe

Co-authored-by: Patrick Meiser-Knosowski <31903021+KnoP-01@users.noreply.github.com>
---
 runtime/syntax/krl.vim   |  21 +-
 runtime/syntax/rapid.vim | 687 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 699 insertions(+), 9 deletions(-)
 create mode 100644 runtime/syntax/rapid.vim

(limited to 'runtime')

diff --git a/runtime/syntax/krl.vim b/runtime/syntax/krl.vim
index a50790841e..6808a48fc4 100644
--- a/runtime/syntax/krl.vim
+++ b/runtime/syntax/krl.vim
@@ -2,7 +2,7 @@
 " Language: Kuka Robot Language
 " Maintainer: Patrick Meiser-Knosowski <knosowski@graeffrobotics.de>
 " Version: 3.0.0
-" Last Change: 18. Apr 2022
+" Last Change: 22. Jun 2023
 " Credits: Thanks for contributions to this to Michael Jagusch
 "          Thanks for beta testing to Thomas Baginski
 "
@@ -109,11 +109,11 @@ highlight default link krlGeomOperator Operator
 
 " Type, StorageClass and Typedef {{{
 " Simple data types
-syn keyword krlType bool char real int containedin=krlAnyType
+syn keyword krlType bool char real int
 " External program and function
-syn keyword krlType ext extfct extfctp extp containedin=krlAnyType
+syn keyword krlType ext extfct extfctp extp
 " Communication
-syn keyword krlType signal channel containedin=krlAnyType
+syn keyword krlType signal channel
 highlight default link krlType Type
 " StorageClass
 syn keyword krlStorageClass decl global const struc enum
@@ -200,19 +200,20 @@ syn keyword krlEnum adap_acc model_type control_parameter eko_mode
 "
 " Predefined structures and enums found in /steu/mada/$custom.dat
 syn keyword krlStructure pro_io_t ser ext_mod_t coop_krc ws_config bin_type coop_update_t ldc_reaction
-syn keyword krlEnum axis_of_coordinates spline_para_variant target_status cp_vel_type cp_statmon
+syn keyword krlEnum axis_of_coordinates motion_mode spline_para_variant spreadstartpolicy target_status cp_vel_type cp_statmon
 "
 " Predefined structures and enums found in /steu/mada/$machine.dat
 syn keyword krlStructure emstop_path boxstatesafein boxstatesafeout
 syn keyword krlEnum digincode
 "
 " Predefined structures and enums found in /steu/mada/$option.dat
-syn keyword krlStructure msg_t
+syn keyword krlStructure installed_motion_modes msg_t 
+syn keyword krlEnum step_enum
 " syn keyword krlEnum
 "
 " Predefined structures and enums found in /r1/system/$config.dat
 " BasisTech
-syn keyword krlStructure dig_out_type ctrl_in_t ctrl_out_t fct_out_t fct_in_t odat basis_sugg_t out_sugg_t md_state machine_def_t machine_tool_t machine_frame_t trigger_para constvel_para condstop_para adat tm_sugg_t tqm_tqdat_t sps_prog_type
+syn keyword krlStructure dig_out_type ctrl_in_t ctrl_out_t fct_out_t fct_in_t odat hdat basis_sugg_t out_sugg_t md_state machine_def_t machine_tool_t machine_frame_t trigger_para constvel_para condstop_para adat tm_sugg_t tqm_tqdat_t sps_prog_type
 syn keyword krlEnum bas_command out_modetype ipo_m_t apo_mode_t funct_type p00_command timer_actiontype
 "
 " GripperTech
@@ -271,7 +272,9 @@ highlight default link krlStatement Statement
 syn keyword krlConditional if then else endif switch case default endswitch skip endskip
 highlight default link krlConditional Conditional
 " Repeat
-syn keyword krlRepeat for to step endfor while endwhile repeat until loop endloop exit
+syn keyword krlRepeat for to endfor while endwhile repeat until loop endloop exit
+" STEP is used as variable in VKRC, this pattern should match STEP -, 5(constant number) or VAR
+syn match krlRepeat /\v\cstep\s+%(-|\w)/me=e-1
 highlight default link krlRepeat Repeat
 " Label
 syn keyword krlLabel goto
@@ -390,7 +393,7 @@ if get(g:, 'krlShowError', 1)
   " some more or less common typos
   "
   " vars or funcs >24 chars are not possible in krl. a234567890123456789012345
-  syn match krlError0 /\w\{25,}/ containedin=krlFunction,krlNames,krlLabel,krlAnyType,krlEnumVal,krlSysvars
+  syn match krlError0 /\w\{25,}/ containedin=krlFunction,krlNames,krlLabel,krlEnumVal,krlSysvars
   "
   " should be interrupt (on|off) \w+
   syn match krlError1 /\vinterrupt[ \t(]+[_$a-zA-Z0-9]+[_$a-zA-Z0-9.\[\]()+\-*/]*[ \t)]+o%(n|ff)>/
diff --git a/runtime/syntax/rapid.vim b/runtime/syntax/rapid.vim
new file mode 100644
index 0000000000..ed0da095c0
--- /dev/null
+++ b/runtime/syntax/rapid.vim
@@ -0,0 +1,687 @@
+" ABB Rapid Command syntax file for Vim
+" Language: ABB Rapid Command
+" Maintainer: Patrick Meiser-Knosowski <knosowski@graeffrobotics.de>
+" Version: 2.3.0
+" Last Change: 21. Jul 2023
+" Credits: Thanks for beta testing to Thomas Baginski
+"
+" Suggestions of improvement are very welcome. Please email me!
+"
+"
+"
+" Note to self:
+" for testing perfomance
+"     open a 1000 lines file.
+"     :syntime on
+"     G
+"     hold down CTRL-U until reaching top
+"     :syntime report
+"
+"
+" TODO:   - highlight rapid constants and maybe constants from common
+"           technology packages
+"         - optimize rapidErrorStringTooLong 
+"         - error highlight for missing 2nd point in MoveCirc et al
+
+" Init {{{
+" Remove any old syntax stuff that was loaded (5.x) or quit when a syntax file
+" was already loaded (6.x).
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+" if colorscheme is tortus rapidNoHighLink defaults to 1
+if (get(g:,'colors_name'," ")=="tortus" || get(g:,'colors_name'," ")=="tortusless") 
+      \&& !exists("g:rapidGroupName")
+  let g:rapidGroupName=1 
+endif
+" rapidGroupName defaults to 0 if it's not initialized yet or 0
+if !get(g:,"rapidGroupName",0)
+  let g:rapidGroupName=0 
+endif
+
+" Rapid does ignore case
+syn case ignore
+" spell checking
+syn spell notoplevel
+" }}} init
+
+" common highlighting {{{
+
+" Error {{{
+if get(g:,'rapidShowError',1)
+  "
+  " This error must be defined befor rapidCharCode and rapidEscapedBackSlash
+  " a string containing a single \ which is not a char code
+  syn match rapidErrorSingleBackslash /\\/ contained
+  highlight default link rapidErrorSingleBackslash Error
+  "
+endif
+" }}} Error
+
+" Constant values {{{
+" Boolean
+syn keyword rapidBoolean TRUE FALSE Edge High Low
+highlight default link rapidBoolean Boolean
+" Float (num)
+" syn match rapidFloat /\v%(\W|_)@1<=[+-]?\d+\.?\d*%(\s*[eE][+-]?\d+)?/
+syn match rapidFloat /\v\c%(<\d+\.|\.?<\d)\d*%(E[+-]?\d+)?>/ contains=rapidOperator
+highlight default link rapidFloat Float
+" integer in decimal, hexadecimal, octal and binary
+syn match rapidDec /\<[0-9]\+\>/
+highlight default link rapidDec Number
+syn match rapidHex /\<0x[0-9a-fA-F]\+\>/
+highlight default link rapidHex Number
+syn match rapidOct /\<0o[0-7]\+\>/
+highlight default link rapidOct Number
+syn match rapidBin /\<0b[01]\+\>/
+highlight default link rapidBin Number
+" String. Note: Don't rename group rapidString. Indent depend on this
+syn region rapidString matchgroup=rapidString start=/"/ skip=/""/ end=/"/ oneline contains=rapidStringDoubleQuote,rapidEscapedBackSlash,rapidCharCode,rapidErrorSingleBackslash,rapidErrorStringTooLong,@Spell
+highlight default link rapidString String
+" two adjacent "" in string for one double quote
+syn match rapidStringDoubleQuote /""/ contained
+highlight default link rapidStringDoubleQuote SpecialChar
+" character code in string
+syn match rapidCharCode /\\\x\x/ contained
+highlight default link rapidCharCode SpecialChar
+" escaped \ in string
+syn match rapidEscapedBackSlash /\\\\/ contained
+highlight default link rapidEscapedBackSlash SpecialChar
+" }}} Constant values
+
+" }}} common highlighting
+
+if bufname("%") =~ '\c\.cfg$'
+" {{{ highlighting for *.cfg
+
+  " special chars {{{
+  " syn match rapidOperator /:\|[+-]\|\*\|\/\|\\/
+  syn match rapidOperator /[-+*/:\\]/
+  syn match rapidOperator /^#/
+  highlight default link rapidOperator Operator
+  " }}} special chars
+
+  " sections {{{
+  syn match rapidException /^\w\+/
+  syn match rapidException /CFG_\d\+/
+  highlight default link rapidException Exception
+  " }}} sections
+
+  " Error {{{
+  if get(g:,'rapidShowError',1)
+    "
+    " This error must be defined after rapidString
+    " Any Name longer than 32 chars
+    syn match rapidErrorNameTooLong /-Name "[^"]\{33,}"/
+    highlight default link rapidErrorNameTooLong Error
+    "
+  endif
+  " }}} Error
+
+  " }}} highlighting for *.cfg
+else
+  " highlighting for *.mod, *.sys and *.prg {{{
+
+  " sync for regions from a line comment or the start of a function
+  syn sync match rapidSync grouphere NONE /\v\c^\s*%(!|%(task\s+|local\s+)?%(module|proc|func|trap|record)>)/
+
+  " Comment {{{ 
+  " TODO Comment
+  syn match rapidTodoComment contained /\<TODO\>\|\<FIXME\>\|\<XXX\>/
+  highlight default link rapidTodoComment Todo
+  " Debug comment
+  syn match rapidDebugComment contained /\<DEBUG\>/
+  highlight default link rapidDebugComment Debug
+  " Line comment
+  syn match rapidComment /!.*$/ contains=rapidTodoComment,rapidDebugComment,@Spell
+  highlight default link rapidComment Comment
+  " }}} Comment 
+
+  " Header {{{
+  syn match rapidHeader /^%%%/
+  highlight default link rapidHeader PreProc
+  " }}} Header
+
+  " Operator {{{
+  " Boolean operator
+  syn keyword rapidOperator and or xor not div mod
+  " Arithmetic and compare operator
+  syn match rapidOperator /[-+*/<>:=]/
+  " conditional argument
+  syn match rapidOperator /?/
+  highlight default link rapidOperator Operator
+  " }}} Operator
+
+  " Type, StorageClass and Typedef {{{
+  " anytype (preceded by 'alias|pers|var|const|func'
+  " TODO: still missing are userdefined types which are part of a parameter:
+  " PROC message( mystring msMessagePart1{},
+  "               \ myvar msMsg4{})
+  " TODO testing. Problem: does not highlight any type if it's part of an argument list
+  " syn match rapidAnyType /\v^\s*(global\s+|task\s+|local\s+)?(alias|pers|var|const|func)\s+\w+>/ contains=rapidStorageClass,rapidType,rapidTypeDef
+  " highlight default link rapidAnyType Type
+  syn keyword rapidType accdata aiotrigg bool btnres busstate buttondata byte
+  syn keyword rapidType cfgdomain clock cnvcmd confdata confsupdata corrdescr datapos deflectiondata dionum dir dnum
+  syn keyword rapidType egmframetype egmident egm_minmax egmstate egmstopmode errdomain errnum ErrorInfo errstr errtype event_type exec_level extjoint handler_type
+  syn keyword rapidType icondata identno inposdata intnum inttypes iodev iounit_state jointtarget
+  syn keyword rapidType listitem loaddata loadidnum loadsession mecunit motionprocessmode motsetdata
+  " syn keyword rapidType num
+  syn keyword rapidType opcalc opnum orient paridnum paridvalidnum pathrecid pnpdata pos pose proc_times progdisp o_jointtarget o_robtarget
+  syn keyword rapidType rawbytes restartdata rmqheader rmqmessage rmqslot robjoint robtarget
+  syn keyword rapidType searchdata sensor sensorstate sensorvardata shapedata signalai signalao signaldi signaldo signalgi signalgo signalorigin singdata socketdev socketstatus speeddata stopmovestartmove_mem stoppoint stoppointdata string stringdig sup_timeouts supervtype switch symnum syncident 
+  syn keyword rapidType taskid tasks tasksatstart testsignal tooldata tpnum trapdata triggdata triggflag triggios triggiosdnum triggmode triggstrgo tsp_status tunegtype tunetype
+  syn keyword rapidType uishownum veldata visiondata wobjdata wzstationary wztemporary zonedata
+  " SoftMove data types
+  syn keyword rapidType css_offset_dir css_soft_dir cssframe
+  " arc data types
+  syn keyword rapidType advSeamData arcdata flystartdata seamdata arctrackdata opttrackdata weavedata welddata 
+  " conveyor tracking data types
+  syn keyword rapidType indcnvdata
+  " Integrated Vision data types
+  syn keyword rapidType cameradev cameratarget 
+  " arc Weldguide and MultiPass data types
+  syn keyword rapidType adaptdata trackdata multidata 
+  " dispense data types
+  syn keyword rapidType beaddata equipdata
+  " Spot data types
+  syn keyword rapidType gundata gunnum spotdata forcedata simdata smeqdata smeqtype
+  " Tool change data types
+  syn keyword rapidType standno ToolInfo toolno
+  " Continuous Application Platform data types
+  syn keyword rapidType capaptrreferencedata capdata capevent caplatrackdata capmvsttim capspeeddata capspeeddata capstopmode captestno captrackdata capweavedata flypointdata processtimes restartblkdata supervtimeouts weavestartdata 
+  " Bulls Eye data types
+  syn keyword rapidType be_device be_scan be_tooldesign
+  " Force Control data types
+  syn keyword rapidType fcboxvol fccondstatus fccylindervol fcdamping fcforcevector fcframe fclindir fcprocessdata fcplane fcrotdir fcspeedvector fcspherevol fcspdchgtunetype fcxyznum
+  " Discrete application platform data types
+  syn keyword rapidType dadescapp dadescprc daintdata
+  " VW Konzernstandard VWKS_1.07.02
+  syn keyword rapidType merker 
+  syn keyword rapidType frgnum frgwert robnum 
+  syn keyword rapidType fmnum applid calibdatavorr stepdata 
+  syn keyword rapidType tsmethode tsdaten teilspeicherdaten
+  syn keyword rapidType greiferdaten greiferposition bauteildaten bauteilkontrolle g_datenident g_sensor g_signal g_teilident g_ventil 
+  syn keyword rapidType strgnum typnum 
+  syn keyword rapidType hubnum kopfnum 
+  syn keyword rapidType applservicetype 
+  syn keyword rapidType applfraesdaten kwdionum 
+  syn keyword rapidType butechnum
+  syn keyword rapidType toolnum dbnum 
+  " das folgende sind datentypen aber das kann man doch nicht machen...
+  " syn keyword rapidType position wert
+  syn keyword rapidType camdata camlimitdata cammode camprotocoldata camstatus camsequence campositionstatus
+  syn keyword rapidType saposnum sabereichnum autofocusnum focusposnum lascaledata laleistungnum larobnum laprognum uebwnum dgbanum dgjobnum gasspuelnum davalve gasuebwnum 
+  syn keyword rapidType lsfigurnum lsstarttype 
+  syn keyword rapidType lwprognum lwdiodnum lsstarttype 
+  syn keyword rapidType lztype diskrethubnum lztipnum 
+  syn keyword rapidType gblmethod
+  syn keyword rapidType buatypenum buatechnum buadirnum 
+  highlight default link rapidType Type
+  " Storage class
+  syn keyword rapidStorageClass LOCAL TASK VAR PERS CONST ALIAS NOVIEW NOSTEPIN VIEWONLY READONLY SYSMODULE INOUT
+  highlight default link rapidStorageClass StorageClass
+  " Not a typedef but I like to have those highlighted different then types,
+  " structures or strorage classes
+  syn keyword rapidTypeDef MODULE ENDMODULE PROC ERROR UNDO BACKWARD ENDPROC RECORD ENDRECORD TRAP ENDTRAP FUNC ENDFUNC
+  highlight default link rapidTypeDef TypeDef
+  " }}} Type, StorageClass and Typedef
+
+  " Statements, keywords et al {{{
+  " syn keyword rapidStatement
+  " highlight default link rapidStatement Statement
+  " Conditional
+  syn keyword rapidConditional if then elseif else endif test case default endtest
+  highlight default link rapidConditional Conditional
+  " Repeat
+  syn keyword rapidRepeat do
+  syn match rapidRepeat /\c\v^\s*%(<while>|<for>)%([^!]+<do>)@=/
+  syn keyword rapidRepeat from to step endfor endwhile
+  highlight default link rapidRepeat Repeat
+  " Label
+  syn keyword rapidLabel goto
+  syn match rapidLabel /\c\v^\s*[[:upper:][:lower:]]\k*\:\ze%([^=]|$)/ contains=rapidConditional,rapidOperator
+  highlight default link rapidLabel Label
+  " Keyword
+  syn keyword rapidKeyword AccSet ActEventBuffer ActUnit Add AliasCamera AliasIO AliasIOReset BitClear BitSet BookErrNo BrakeCheck
+  syn keyword rapidKeyword CallByVar CancelLoad CheckProgRef CirPathMode Clear ClearIOBuff ClearPath ClearRawBytes ClkReset ClkStart ClkStop Close CloseDir ConfJ ConfL CONNECT CopyFile CopyRawBytes CornerPathWarning CorrClear CorrCon CorrDiscon CorrWrite
+  syn keyword rapidKeyword CSSAct CSSDeact CSSForceOffsetAct CSSForceOffsetDeact CSSOffsetTune CyclicBrakeCheck
+  syn keyword rapidKeyword DeactEventBuffer DeactUnit Decr DitherAct DitherDeact DropSensor 
+  syn keyword rapidKeyword EGMActJoint EGMActMove EGMActPose EGMGetId EGMReset EGMSetupAI EGMSetupAO EGMSetupGI EGMSetupLTAPP EGMSetupUC EOffsOff EOffsOn EOffsSet EraseModule ErrLog ErrWrite
+  syn keyword rapidKeyword FitCircle FricIdInit FricIdEvaluate FricIdSetFricLevels 
+  syn keyword rapidKeyword GetDataVal GetGroupSignalInfo GetJointData GetSysData GetTorqueMargin GetTrapData GripLoad HollowWristReset 
+  syn keyword rapidKeyword IDelete IDisable IEnable IError Incr IndReset InvertDO IOBusStart IOBusState IoCtrlAxis_RefSync IoCtrlAxis_RefSyncOff IoCtrlAxis_RefSyncOn IODisable IOEnable IPers IRMQMessage ISignalAI ISignalAO ISignalDI ISignalDO ISignalGI ISignalGO ISleep ITimer IVarValue IWatch
+  syn keyword rapidKeyword Load LoadId MakeDir ManLoadIdProc MatrixSolve MatrixSolveQR MatrixSVD MechUnitLoad MotionProcessModeSet MotionSup MToolRotCalib MToolTCPCalib Open OpenDir
+  syn keyword rapidKeyword PackDNHeader PackRawBytes PathAccLim PathLengthReset PathLengthStart PathLengthStop PathRecStart PathRecStop PathResol PDispOff PDispOn PDispSet ProcerrRecovery PrxActivAndStoreRecord PrxActivRecord PrxDbgStoreRecord PrxDeactRecord PrxResetPos PrxResetRecords PrxSetPosOffset PrxSetRecordSampleTime PrxSetSyncalarm PrxStartRecord PrxStopRecord PrxStoreRecord PrxUseFileRecord PulseDO
+  syn keyword rapidKeyword ReadAnyBin ReadBlock ReadCfgData ReadErrData ReadRawBytes ReadVarArr RemoveAllCyclicBool RemoveCyclicBool RemoveDir RemoveFile RenameFile Reset ResetAxisDistance ResetAxisMoveTime ResetPPMoved ResetRetryCount ResetTorqueMargin RestoPath Rewind RMQEmptyQueue RMQFindSlot RMQGetMessage RMQGetMsgData RMQGetMsgHeader RMQReadWait RMQSendMessage RMQSendWait
+  syn keyword rapidKeyword SafetyControllerSyncRequest Save SaveCfgData SCWrite SenDevice Set SetAllDataVal SetAO SetDataSearch SetDataVal SetDO SetGO SetLeadThrough SetSysData SetupCyclicBool SiConnect SiClose SiGetCyclic SingArea SiSetCyclic SkipWarn SocketAccept SocketBind SocketClose SocketConnect SocketCreate SocketListen SocketReceive SocketReceiveFrom SocketSend SocketSendTo SoftAct SoftDeact SoftElbow SpeedLimAxis SpeedLimCheckPoint SpeedRefresh SpyStart SpyStop StartLoad STCalib STClose STIndGun STIndGunReset SToolRotCalib SToolTCPCalib STOpen StorePath STTune STTuneReset SupSyncSensorOff SupSyncSensorOn SyncMoveOff SyncMoveOn SyncMoveResume SyncMoveSuspend SyncMoveUndo SyncToSensor SystemStopAction
+  syn keyword rapidKeyword TestSignDefine TestSignReset TextTabInstall TPErase TPReadDnum TPReadFK TPReadNum TPShow TPWrite TriggCheckIO TriggDataCopy TriggDataReset TriggEquip TriggInt TriggIO TriggRampAO TriggSpeed TriggStopProc TryInt TuneReset TuneServo
+  syn keyword rapidKeyword UIMsgBox UIMsgWrite UIMsgWriteAbort UIShow UnLoad UnpackRawBytes VelSet WaitAI WaitAO WaitDI WaitDO WaitGI WaitGO WaitLoad WaitRob WaitSensor WaitSyncTask WaitTestAndSet WaitTime WaitUntil WarmStart WITH WorldAccLim Write WriteAnyBin WriteBin WriteBlock WriteCfgData WriteRawBytes WriteStrBin WriteVar WriteVarArr WZBoxDef WZCylDef WZDisable WZDOSet WZEnable WZFree WZHomeJointDef WZLimJointDef WZLimSup WZSphDef
+  " arc instructions
+  syn keyword rapidKeyword ArcRefresh RecoveryMenu RecoveryMenuWR RecoveryPosSet RecoveryPosReset SetWRProcName 
+  " conveyor tracking instructions
+  syn keyword rapidKeyword UseACCProfile WaitWObj DropWObj RecordProfile WaitAndRecProf StoreProfile LoadProfile ActivateProfile DeactProfile CnvGenInstr CnvSync CnvGenInstr IndCnvInit IndCnvEnable IndCnvDisable IndCnvReset IndCnvAddObject 
+  syn keyword rapidKeyword UseReachableTargets GetMaxUsageTime ResetMaxUsageTime CnvPredictReach
+  " Integrated Vision instructions
+  syn keyword rapidKeyword CamFlush CamGetParameter CamGetResult CamLoadJob CamReqImage CamSetExposure CamSetParameter CamSetProgramMode CamSetRunMode CamStartLoadJob CamWaitLoadJob 
+  " arc Weldguide and MultiPass instructions
+  syn keyword rapidKeyword MPSavePath MPLoadPath MPReadInPath MPOffsEaxOnPath
+  " Paint instructions
+  syn keyword rapidKeyword ConsoleWrite IpsSetParam PntProdUserLog SetBrush SetBrushFac
+  " Spot instructions
+  syn keyword rapidKeyword SetForce Calibrate ReCalcTCP IndGunMove IndGunMoveReset OpenHighLift CloseHighLift SwSetIntSpotData SwSetIntForceData SwSetIntGunData SwSetIntSimData SwGetCalibData SwGetFixTipData 
+  " Tool change instructions
+  syn keyword rapidKeyword TcCloseCover TcDropOffTool TcLockTool TcOpenCover TcPickupTool TcUnlockTool
+  " dispense instructions
+  syn keyword rapidKeyword SetTmSignal SyncWWObj
+  " Continuous Application Platform instructions
+  syn keyword rapidKeyword CapAPTrSetup CapAPTrSetupAI CapAPTrSetupAO  CapAPTrSetupPERS CapCondSetDO CapEquiDist CapNoProcess CapRefresh CAPSetStopMode CapWeaveSync ICap InitSuperv IPathPos RemoveSuperv SetupSuperv 
+  " Bulls Eye instructions
+  syn keyword rapidKeyword BECheckTcp BEDebugState BERefPointer BESetupToolJ BETcpExtend BEUpdateTcp
+  " Force Control instructions
+  syn keyword rapidKeyword FCAct FCCalib FCCondForce FCCondOrient FCCondPos FCCondReoriSpeed FCCondTCPSpeed FCCondTorque FCCondWaitWhile FCDeact FCPress1LStart FCPressC FCPressEnd FCPressL FCRefCircle FCRefForce FCRefLine FCRefMoveFrame FCRefRot FCRefSpiral FCRefSprForceCart FCRefStart FCRefStop FCRefTorque FCResetDampingTune FCResetLPFilterTune FCSpdChgAct FCSpdChgDeact FCSpdChgTunSet FCSpdChgTunReset FCSetDampingTune FCSetLPFilterTune FCSupvForce FCSupvOrient FCSupvPos FCSupvReoriSpeed FCSupvTCPSpeed FCSupvTorque 
+  " Discrete application platform instructions
+  syn keyword rapidKeyword DaActProc DaDeactAllProc DaDeactProc DaDefExtSig DaDefProcData DaDefProcSig DaDefUserData DaGetCurrData DaSetCurrData DaSetupAppBehav DaStartManAction DaGetAppDescr DaGetAppIndex DaGetNumOfProcs DaGetNumOfRob DaGetPrcDescr 
+  " Production Manager instructions
+  syn keyword rapidKeyword ExecEngine PMgrGetNextPart PMgrSetNextPart PMgrRunMenu
+  " Homepos-Running instructions
+  syn keyword rapidKeyword HR_Exit HR_ExitCycle HR_SavePos HR_SetMoveToStartPos HR_SetTypeDIndex HR_SetTypeIndex 
+  highlight default link rapidKeyword Keyword
+  " Exception
+  syn keyword rapidException Exit ErrRaise ExitCycle Raise RaiseToUser Retry Return TryNext
+  syn match rapidException /\s\+Stop\s*[\\;]/me=e-1
+  highlight default link rapidException Exception
+  " }}} Statements, keywords et al
+
+  " Special keyword for move command {{{
+  " uncategorized yet
+  syn keyword rapidMovement MovePnP
+  syn keyword rapidMovement EGMMoveC EGMMoveL EGMRunJoint EGMRunPose EGMStop
+  syn keyword rapidMovement IndAMove IndCMove IndDMove IndRMove 
+  " common instructions
+  syn keyword rapidMovement MoveAbsJ MoveC MoveExtJ MoveJ MoveL 
+  syn keyword rapidMovement MoveCAO MoveCDO MoveCGO MoveCSync MoveJAO MoveJDO MoveJGO MoveJSync MoveLAO MoveLDO MoveLGO MoveLSync 
+  syn keyword rapidMovement SearchC SearchExtJ SearchL
+  syn keyword rapidMovement TriggC TriggJ TriggL TriggJIOs TriggLIOs
+  " Arc instructions
+  syn keyword rapidMovement ArcC ArcC1 ArcC2 ArcCEnd ArcC1End ArcC2End ArcCStart ArcC1Start ArcC2Start 
+  syn keyword rapidMovement ArcL ArcL1 ArcL2 ArcLEnd ArcL1End ArcL2End ArcLStart ArcL1Start ArcL2Start ArcMoveExtJ 
+  " Arc Weldguide and MultiPass instructions
+  syn keyword rapidMovement ArcRepL ArcAdaptLStart ArcAdaptL ArcAdaptC ArcAdaptLEnd ArcAdaptCEnd ArcCalcLStart ArcCalcL ArcCalcC ArcCalcLEnd ArcCalcCEnd ArcAdaptRepL 
+  syn keyword rapidMovement Break 
+  " Continuous Application Platform instructions
+  syn keyword rapidMovement CapC CapL CapLATrSetup CSSDeactMoveL ContactL
+  " Dispense instructions
+  syn keyword rapidMovement DispL DispC
+  " Nut instructions"
+  syn keyword rapidMovement NutL NutJ
+  syn keyword rapidMovement PathRecMoveBwd PathRecMoveFwd 
+  " Paint instructions"
+  syn keyword rapidMovement PaintL PaintLSig PaintLDO PaintC
+  syn keyword rapidMovement StartMove StartMoveRetry StepBwdPath StopMove StopMoveReset
+  " Spot instructions
+  syn keyword rapidMovement SpotL SpotJ SpotML SpotMJ CalibL CalibJ MeasureWearL 
+  " Homepos-Running instructions
+  syn keyword rapidMovement SMoveJ SMoveJDO SMoveJGO SMoveJSync SMoveL SMoveLDO SMoveLGO SMoveLSync SSearchL STriggJ STriggL
+  syn keyword rapidMovement HR_ContMove HR_MoveBack HR_MoveRoutine HR_MoveTo HR_MoveToHome SCSSDeactMoveL 
+  " Discrete application platform instructions
+  syn keyword rapidMovement DaProcML DaProcMJ
+  " VW Konzernstandard VWKS_1.07.02
+  syn keyword rapidMovement MoveABS  MoveABS_FB  MoveABS_FRG  MoveABS_ROB
+  syn keyword rapidMovement MoveCIRC MoveCIRC_FB MoveCIRC_FRG MoveCIRC_ROB
+  syn keyword rapidMovement MoveLIN  MoveLIN_FB  MoveLIN_FRG  MoveLIN_ROB 
+  syn keyword rapidMovement MovePTP  MovePTP_FB  MovePTP_FRG  MovePTP_ROB 
+  syn keyword rapidMovement SearchCIRC SearchCIRC_M 
+  syn keyword rapidMovement SearchLIN  SearchLIN_M 
+  syn keyword rapidMovement MoveABS_AO  MoveABS_DO  MoveABS_GO
+  syn keyword rapidMovement MoveCIRC_AO MoveCIRC_DO MoveCIRC_GO
+  syn keyword rapidMovement MoveLIN_AO  MoveLIN_DO  MoveLIN_GO
+  syn keyword rapidMovement KW_LoesenLIN
+  syn keyword rapidMovement SPZ_FraesenLIN SPZ_FraesenPTP SPZ_MessenLIN SPZ_MessenPTP SPZ_LIN SPZ_PTP 
+  syn keyword rapidMovement BZ_LIN BZ_PTP
+  syn keyword rapidMovement KL_LIN KL_CIRC
+  syn keyword rapidMovement BP_LIN BP_PTP
+  syn keyword rapidMovement BU_CIRC BU_LIN
+  syn keyword rapidMovement CZ_LIN CZ_LIN_V CZ_PTP CZ_PTP_V
+  syn keyword rapidMovement FD_LIN FD_PTP
+  syn keyword rapidMovement KG_LIN KG_PTP
+  syn keyword rapidMovement DA_LIN 
+  syn keyword rapidMovement LK_CIRC LK_LIN 
+  syn keyword rapidMovement LL_CIRC LL_LIN
+  syn keyword rapidMovement LS_CIRC LS_LIN LS_LIN_F LS_PTP_F
+  syn keyword rapidMovement LW_CIRC LW_LIN
+  syn keyword rapidMovement LZ_LIN LZ_PTP LZ_ReinigenLIN LZ_ReinigenPTP
+  syn keyword rapidMovement MS_CIRC MS_LIN MS_ReinigenLIN MS_SearchLIN MS_PTP_CS MS_LIN_CS GBL_LIN GBL_PTP GBL_RefPointLIN
+  syn keyword rapidMovement NK_LIN
+  syn keyword rapidMovement NZ_LIN NZ_LIN_V NZ_PTP NZ_PTP_V 
+  syn keyword rapidMovement PR_LIN PR_PTP
+  syn keyword rapidMovement RF_CIRC RF_LIN
+  syn keyword rapidMovement STP_FraesenLIN STP_FraesenPTP STP_LIN STP_PTP 
+  syn keyword rapidMovement SM_LIN SM_PTP
+  syn keyword rapidMovement BUA_CIRC BUA_LIN BUA_MessenLIN BUA_MessenPTP
+  syn keyword rapidMovement KE_LIN 
+  if g:rapidGroupName
+    highlight default link rapidMovement Movement
+  else
+    highlight default link rapidMovement Special
+  endif
+  " }}} special keyword for move command 
+
+  " Any name {{{
+  syn match rapidNames /\v[[:upper:][:lower:]](\k|\.)*/
+  " }}} Any name
+
+  " Attempt to avoid false highlight of num in case of parameter name:
+  "   TPWrite "goPosNo="\num:=GOutput(goPosNo);
+  " Must follow after rapidNames in this file
+  syn match rapidType /\c\v<num>\s*\ze[^ :]/
+
+  " Structure value {{{
+  " rapid structrure values. added to be able to conceal them
+  syn region rapidConcealableString matchgroup=rapidConcealableString start=/"/ skip=/""/ end=/"/ oneline keepend extend contained contains=rapidStringDoubleQuote,rapidEscapedBackSlash,rapidCharCode,rapidErrorSingleBackslash,rapidErrorStringTooLong,@Spell conceal 
+  highlight default link rapidConcealableString String
+  syn region rapidStructVal matchgroup=rapidStructDelimiter start=/\[/ end=/\]/ contains=rapidStructVal,rapidBoolean,rapidDec,rapidHex,rapidOct,rapidBin,rapidFloat,rapidConcealableString,rapidDelimiter,rapidConstant,rapidErrNo,rapidIntNo,rapidOperator keepend extend conceal cchar=* 
+  highlight default link rapidStructDelimiter Delimiter
+  " check edge cases like this one:
+  "  LOCAL CONST listitem lstAuswService{18}:=[["","Service Position"],["","Bremsentest"],["","Referenzfahrt"],["","Manuelles Abfahren"],["","Justagestellung"],["","Transportposition"],
+  "      ["","Spitze-Spitze Greifer 1, [RT]"],["","Spitze-Spitze Greifer 2, [FT]"],["","Spitze-Spitze Pruefspitze"],["","Werkobjekt Ablage"],["","Werkobjekt Modul 1"],
+  "      ["","Werkobjekt Modul 2"],["","TCP von Greifer 1 vermessen, [RT]"],["","TCP von Greifer 2 vermessen, [FT]"],["","TCP von Basisdorn vermessen"],
+  "      ["","Greifer abdocken"],["","Greifer andocken"],["","Kollision Check (Ohne Greifer)"]];
+  " }}} Structure value
+
+  " Delimiter {{{
+  syn match rapidDelimiter /[\\(){},;|]/
+  highlight default link rapidDelimiter Delimiter
+  " }}} Delimiter
+
+  " BuildInFunction {{{
+  " dispense functions
+  syn keyword rapidBuildInFunction contained GetSignal GetSignalDnum
+  " Integrated Vision Platform functions
+  syn keyword rapidBuildInFunction contained CamGetExposure CamGetLoadedJob CamGetName CamNumberOfResults 
+  " Continuous Application Platform functions
+  syn keyword rapidBuildInFunction contained CapGetFailSigs 
+  syn keyword rapidBuildInFunction contained Abs AbsDnum ACos ACosDnum AInput AOutput ArgName ASin ASinDnum ATan ATanDnum ATan2 ATan2Dnum
+  syn keyword rapidBuildInFunction contained BitAnd BitAndDnum BitCheck BitCheckDnum BitLSh BitLShDnum BitNeg BitNegDnum BitOr BitOrDnum BitRSh BitRShDnum BitXOr BitXOrDnum ByteToStr
+  syn keyword rapidBuildInFunction contained CalcJointT CalcRobT CalcRotAxFrameZ CalcRotAxisFrame CDate CJointT ClkRead CorrRead Cos CosDnum CPos CRobT CrossProd CSpeedOverride CTime CTool CWObj
+  syn keyword rapidBuildInFunction contained DecToHex DefAccFrame DefDFrame DefFrame Dim DInput Distance DnumToNum DnumToStr DotProd DOutput 
+  syn keyword rapidBuildInFunction contained EGMGetState EulerZYX EventType ExecHandler ExecLevel Exp
+  syn keyword rapidBuildInFunction contained FileSize FileTime FileTimeDnum FSSize
+  syn keyword rapidBuildInFunction contained GetAxisDistance GetAxisMoveTime GetMaxNumberOfCyclicBool GetMecUnitName GetModalPayLoadMode GetMotorTorque GetNextCyclicBool GetNextMechUnit GetNextSym GetNumberOfCyclicBool GetServiceInfo GetSignalOrigin GetSysInfo GetTaskName GetTime GetTSPStatus GetUASUserName GInput GInputDnum GOutput GOutputDnum
+  syn keyword rapidBuildInFunction contained HexToDec
+  syn keyword rapidBuildInFunction contained IndInpos IndSpeed IOUnitState IsBrakeCheckActive IsCyclicBool IsFile IsLeadThrough IsMechUnitActive IsPers IsStopMoveAct IsStopStateEvent IsSyncMoveOn IsSysId IsVar
+  syn keyword rapidBuildInFunction contained Max MaxExtLinearSpeed MaxExtReorientSpeed MaxRobReorientSpeed MaxRobSpeed Min MirPos ModExist ModTime ModTimeDnum MotionPlannerNo
+  syn keyword rapidBuildInFunction contained NonMotionMode NOrient NumToDnum NumToStr
+  syn keyword rapidBuildInFunction contained Offs OpMode OrientZYX ORobT
+  syn keyword rapidBuildInFunction contained ParIdPosValid ParIdRobValid PathLengthGet PathLevel PathRecValidBwd PathRecValidFwd PFRestart PoseInv PoseMult PoseVect Pow PowDnum PPMovedInManMode Present ProgMemFree PrxGetMaxRecordpos
+  syn keyword rapidBuildInFunction contained RawBytesLen ReadBin ReadDir ReadMotor ReadNum ReadStr ReadStrBin ReadVar RelTool RemainingRetries RMQGetSlotName RobName RobOS Round RoundDnum RunMode
+  syn keyword rapidBuildInFunction contained SafetyControllerGetChecksum SafetyControllerGetOpModePinCode SafetyControllerGetSWVersion SafetyControllerGetUserChecksum Sin SinDnum SocketGetStatus SocketPeek Sqrt SqrtDnum STCalcForce STCalcTorque STIsCalib STIsClosed STIsIndGun STIsOpen StrDigCalc StrDigCmp StrFind StrLen StrMap StrMatch StrMemb StrOrder StrPart StrToByte StrToVal
+  syn keyword rapidBuildInFunction contained Tan TanDnum TaskRunMec TaskRunRob TasksInSync TaskIsActive TaskIsExecuting TestAndSet TestDI TestSignRead TextGet TextTabFreeToUse TextTabGet TriggDataValid Trunc TruncDnum Type
+  syn keyword rapidBuildInFunction contained UIAlphaEntry UIClientExist UIDnumEntry UIDnumTune UIListView UIMessageBox UINumEntry UINumTune
+  syn keyword rapidBuildInFunction contained ValidIO ValToStr Vectmagn
+  " Bulls Eye functions
+  syn keyword rapidBuildInFunction contained OffsToolXYZ OffsToolPolar
+  " Force Control functions
+  syn keyword rapidBuildInFunction contained FCGetForce FCGetProcessData FCIsForceMode FCLoadID
+  " Discrete application platform functions
+  syn keyword rapidBuildInFunction contained DaGetFstTimeEvt DaCheckMMSOpt DaGetMP DaGetRobotName DaGetTaskName
+  " Production Manager functions
+  syn keyword rapidBuildInFunction contained PMgrAtSafe PMgrAtService PMgrAtState PMgrAtStation PMgrNextStation PMgrTaskNumber PMgrTaskName
+  " Spot functions
+  syn keyword rapidBuildInFunction contained SwGetCurrTargetName SwGetCurrSpotName 
+  " Homepos-Running functions
+  syn keyword rapidBuildInFunction contained HR_RobotInHome HR_GetTypeDIndex HR_GetTypeIndex
+  " Paint functions
+  syn keyword rapidBuildInFunction contained IndexLookup IpsCommand IpsGetParam PaintCommand PntQueueExtraGet PntQueueExtraSet PntQueuePeek 
+  if g:rapidGroupName
+    highlight default link rapidBuildInFunction BuildInFunction
+  else
+    highlight default link rapidBuildInFunction Function
+  endif
+  " }}}
+
+  " Function {{{
+  syn match rapidFunction contains=rapidBuildInFunction /\v\c%(<%(PROC|MODULE)\s+)@10<!<[[:upper:][:lower:]]\k+ *\(/me=e-1
+  highlight default link rapidFunction Function
+  syn match rapidCallByVar /%\ze[^%]/
+  highlight default link rapidCallByVar Function
+  " }}} Function
+
+  " Constants {{{
+  " standard rapid constants
+  syn keyword rapidConstant pi stEmpty
+  syn keyword rapidConstant STR_DIGIT STR_LOWER STR_UPPER STR_WHITE
+  syn keyword rapidConstant flp1 diskhome diskram disktemp usbdisk1 usbdisk2 usbdisk3 usbdisk4 usbdisk5 usbdisk6 usbdisk7 usbdisk8 usbdisk9 usbdisk10
+  " stoppoint
+  syn keyword rapidConstant inpos stoptime fllwtime
+  " stoppointdata
+  syn keyword rapidConstant inpos20 inpos50 inpos100
+  syn keyword rapidConstant stoptime0_5 stoptime1_0 stoptime1_5
+  syn keyword rapidConstant fllwtime0_5 fllwtime1_0 fllwtime1_5
+  " default tool/wobj/load
+  syn keyword rapidConstant tool0 wobj0 load0
+  " zonedata
+  syn keyword rapidConstant fine z0 z1 z5 z10 z15 z20 z30 z40 z50 z60 z80 z100 z150 z200
+  " speeddata
+  syn keyword rapidConstant v5 v10 v20 v30 v40 v50 v60 v80 v100 v150 v200 v300 v400 v500 v600 v800 v1000 v1500 v2000 v2500 v3000 v4000 v5000 v6000 v7000 vmax
+  syn keyword rapidConstant vrot1 vrot2 vrot5 vrot10 vrot20 vrot50 vrot100 vlin10 vlin20 vlin50 vlin100 vlin200 vlin500 vlin1000
+  " error code starting with ERR_
+  syn keyword rapidConstant ERR_ACC_TOO_LOW ERR_ACTIV_PROF ERR_ADDR_INUSE ERR_ALIASIO_DEF ERR_ALIASIO_TYPE ERR_ALRDYCNT ERR_ALRDY_MOVING ERR_AO_LIM ERR_ARGDUPCND ERR_ARGNAME ERR_ARGNOTPER ERR_ARGNOTVAR ERR_ARGVALERR ERR_ARRAY_SIZE ERR_AXIS_ACT ERR_AXIS_IND ERR_AXIS_MOVING ERR_AXIS_PAR
+  syn keyword rapidConstant ERR_BUSSTATE ERR_BWDLIMIT
+  syn keyword rapidConstant ERR_CALC_DIVZERO ERR_CALC_NEG ERR_CALC_OVERFLOW ERR_CALLIO_INTER ERR_CALLPROC ERR_CAM_BUSY ERR_CAM_COM_TIMEOUT ERR_CAM_GET_MISMATCH ERR_CAM_MAXTIME ERR_CAM_NO_MORE_DATA ERR_CAM_NO_PROGMODE ERR_CAM_NO_RUNMODE ERR_CAM_SET_MISMATCH
+  syn keyword rapidConstant ERR_CFG_ILLTYPE ERR_CFG_ILL_DOMAIN ERR_CFG_INTERNAL ERR_CFG_LIMIT ERR_CFG_NOTFND ERR_CFG_OUTOFBOUNDS ERR_CFG_WRITEFILE
+  syn keyword rapidConstant ERR_CNTNOTVAR
+  syn keyword rapidConstant ERR_CNV_CONNECT ERR_CNV_DROPPED ERR_CNV_NOT_ACT
+  syn keyword rapidConstant ERR_COLL_STOP
+  syn keyword rapidConstant ERR_COMM_EXT ERR_COMM_INIT ERR_COMM_INIT_FAILED
+  syn keyword rapidConstant ERR_CONC_MAX ERR_CONTACTL ERR_CSV_INDEX
+  syn keyword rapidConstant ERR_DA_UNKPROC ERR_DATA_RECV ERR_DEV_MAXTIME ERR_DIPLAG_LIM ERR_DIVZERO ERR_DROP_LOAD ERR_EXCRTYMAX ERR_EXECPHR
+  syn keyword rapidConstant ERR_FILEACC ERR_FILEEXIST ERR_FILEOPEN ERR_FILESIZE ERR_FILNOTFND
+  syn keyword rapidConstant ERR_FNCNORET ERR_FRAME ERR_FRICTUNE_FATAL ERR_GLUEFLOW ERR_GO_LIM
+  syn keyword rapidConstant ERR_HAND_FAILEDGRIPPOS ERR_HAND_FAILEDMOVEPOS ERR_HAND_FAILEDVACUUM ERR_HAND_NOTCALIBRATED
+  syn keyword rapidConstant ERR_ILLDIM ERR_ILLQUAT ERR_ILLRAISE
+  syn keyword rapidConstant ERR_INDCNV_ORDER ERR_INOISSAFE ERR_INOMAX ERR_INPAR_RDONLY ERR_INT_MAXVAL ERR_INT_NOTVAL ERR_INVDIM
+  syn keyword rapidConstant ERR_IODISABLE ERR_IODN_TIMEOUT ERR_IOENABLE ERR_IOERROR ERR_IPSDEVICE_UNKNOWN ERR_IPSILLEGAL_CH_OR_FAC ERR_IPS_PARAM
+  syn keyword rapidConstant ERR_ITMSRC_UNDEF ERR_LINKREF ERR_LOADED ERR_LOADID_FATAL ERR_LOADID_RETRY ERR_LOADNO_INUSE ERR_LOADNO_NOUSE
+  syn keyword rapidConstant ERR_MSG_PENDING ERR_MAXINTVAL ERR_MOC_CNV_REC_FILE_UNKNOWN ERR_MODULE ERR_MOD_NOT_LOADED ERR_MOD_NOTLOADED
+  syn keyword rapidConstant ERR_MT_ABORT ERR_MT_HOME ERR_MT_HOMERUN
+  syn keyword rapidConstant ERR_NEGARG ERR_NAME_INVALID ERR_NORUNUNIT ERR_NOTARR ERR_NOTEQDIM ERR_NOTINTVAL ERR_NOTPRES ERR_NOTSAVED ERR_NOT_MOVETASK ERR_NO_ALIASIO_DEF ERR_NO_SGUN ERR_NUM_LIMIT
+  syn keyword rapidConstant ERR_OUTOFBND ERR_OUTSIDE_REACH ERR_OVERFLOW ERR_PATH ERR_PATHDIST ERR_PATH_STOP ERR_PERSSUPSEARCH ERR_PID_MOVESTOP ERR_PID_RAISE_PP ERR_PPA_TIMEOUT ERR_PRGMEMFULL ERR_PROCSIGNAL_OFF ERR_PROGSTOP
+  syn keyword rapidConstant ERR_RANYBIN_CHK ERR_RANYBIN_EOF ERR_RCVDATA ERR_REFUNKDAT ERR_REFUNKFUN ERR_REFUNKPRC ERR_REFUNKTRP
+  syn keyword rapidConstant ERR_RMQ_DIM ERR_RMQ_FULL ERR_RMQ_INVALID ERR_RMQ_INVMSG ERR_RMQ_MSGSIZE ERR_RMQ_NAME ERR_RMQ_NOMSG ERR_RMQ_TIMEOUT ERR_RMQ_VALUE
+  syn keyword rapidConstant ERR_ROBLIMIT ERR_SC_WRITE
+  syn keyword rapidConstant ERR_SGUN_ESTOP ERR_SGUN_MOTOFF ERR_SGUN_NEGVAL ERR_SGUN_NOTACT ERR_SGUN_NOTINIT ERR_SGUN_NOTOPEN ERR_SGUN_NOTSYNC
+  syn keyword rapidConstant ERR_SIG_NAME ERR_SIGSUPSEARCH ERR_SIG_NOT_VALID
+  syn keyword rapidConstant ERR_SOCK_ADDR_INVALID ERR_SOCK_ADDR_INUSE ERR_SOCK_CLOSED ERR_SOCK_IS_BOUND ERR_SOCK_IS_CONN ERR_SOCK_NET_UNREACH ERR_SOCK_NOT_BOUND ERR_SOCK_NOT_CONN ERR_SOCK_TIMEOUT ERR_SOCK_UNSPEC
+  syn keyword rapidConstant ERR_SPEEDLIM_VALUE ERR_SPEED_REFRESH_LIM
+  syn keyword rapidConstant ERR_STARTMOVE ERR_STORE_PROF ERR_STRTOOLNG ERR_SYMBOL_TYPE ERR_SYM_ACCESS ERR_SYNCMOVEOFF ERR_SYNCMOVEON ERR_SYNTAX
+  syn keyword rapidConstant ERR_TASKNAME
+  syn keyword rapidConstant ERR_TP_DIBREAK ERR_TP_DOBREAK ERR_TP_MAXTIME ERR_TP_NO_CLIENT ERR_TP_PERSBOOLBREAK
+  syn keyword rapidConstant ERR_TRUSTLEVEL ERR_TXTNOEXIST ERR_UDPUC_COMM
+  syn keyword rapidConstant ERR_UISHOW_FATAL ERR_UISHOW_FULL ERR_UI_INITVALUE ERR_UI_MAXMIN ERR_UI_NOTINT
+  syn keyword rapidConstant ERR_UNIT_PAR ERR_UNKINO ERR_UNKPROC ERR_UNLOAD ERR_USE_PROF
+  syn keyword rapidConstant ERR_WAITSYNCTASK ERR_WAIT_MAX ERR_WAIT_MAXTIME ERR_WHL_SEARCH ERR_WHLSEARCH ERR_WOBJ_MOVING
+  " error codes starting with CORR_
+  syn keyword rapidConstant CORR_NOFREE CORR_NOOBJECT CORR_NOTCONN
+  " error codes starting with SEN_
+  syn keyword rapidConstant SEN_BUSY SEN_CAALARM SEN_CAMCHECK SEN_EXALARM SEN_GENERRO SEN_NO_MEAS SEN_NOREADY SEN_TEMP SEN_TIMEOUT SEN_UNKNOWN SEN_VALUE
+  " error codes starting with SYS_
+  syn keyword rapidConstant SYS_ERR_ARL_INPAR_RDONLY SYS_ERR_HW_SMB_WARNING_BATTERY_LOW SYS_ERR_MOC_CNV_REC_FILE_UNKNOWN SYS_ERR_MOC_CNV_REC_NOT_READY
+  " error codes starting with TC_
+  syn keyword rapidConstant TC_ERR_AIR TC_ERR_CLOSE_COV TC_ERR_DOUNLOCK TC_ERR_IO TC_ERR_IOCFG TC_ERR_LOCK TC_ERR_NOTOOL TC_ERR_OPEN_COV TC_ERR_POWER TC_ERR_PULOCK TC_ERR_ROBPOS TC_ERR_ROBPOS_DROP TC_ERR_ROBPOS_PICK TC_ERR_SERVO_TOOL TC_ERR_STANDNUM TC_ERR_TOOL TC_ERR_TOOLCFG TC_ERR_TOOLNUM  TC_ERR_UNLOCK
+  " long jump error
+  syn keyword rapidConstant LONG_JMP_ALL_ERR
+  " Arc and Arc sensor
+  syn keyword rapidConstant AW_IGNI_ERR AW_EQIP_ERR AW_START_ERR AW_STOP_ERR AW_TRACK_ERR AW_TRACKCORR_ERR AW_TRACKSTA_ERR AW_USERSIG_ERR AW_WELD_ERR AW_WIRE_ERR
+  " EGM egmframetype
+  syn keyword rapidConstant EGM_FRAME_BASE EGM_FRAME_TOOL EGM_FRAME_WOBJ EGM_FRAME_WORLD EGM_FRAME_JOINT
+  " Events
+  syn keyword rapidConstant EE_START EE_CYCLE_START EE_PROC_START EE_PRE_PROD EE_CLOSE_JIG EE_INDEX EE_PRE_PART EE_POST_PART EE_OPEN_JIG EE_SERVICE EE_POST_PROD EE_ABORT EE_WAIT_ORDER EE_POST_PROC
+  syn keyword rapidConstant EE_POWERON EE_POWERON_OR_START EE_RESTART EE_START_OR_RESTART EE_STOP EE_QSTOP EE_STOP_OR_QSTOP EE_RESET EE_STEP EE_STEP_FWD EE_STEP_BCK EE_BEFORE_INIT EE_AFTER_INIT EE_BEFORE_PROD EE_AFTER_PROD EE_BEFORE_MENU EE_AFTER_MENU
+  syn keyword rapidConstant EE_ERROR EE_HOMERUN EE_PROG_END EE_AFTER_PROG_NUMBER EE_PROGNO_UNKNOWN EE_PROD_UNKNOWN EE_MSG_WRITTEN EE_MSG_ACKNOWLEDGED EE_AFTER_PART EE_BEFORE_HOMERUN EE_AFTER_HOMERUN EE_BLOCKED
+  " motion process mode
+  syn keyword rapidConstant OPTIMAL_CYCLE_TIME_MODE LOW_SPEED_ACCURACY_MODE LOW_SPEED_STIFF_MODE ACCURACY_MODE MPM_USER_MODE_1 MPM_USER_MODE_2 MPM_USER_MODE_3 MPM_USER_MODE_4
+  " inttypes
+  syn keyword rapidConstant USINT UINT UDINT ULINT SINT INT DINT LINT
+  " opcalc
+  syn keyword rapidConstant OpAdd OpSub OpMult OpDiv OpMod
+  " triggmode
+  syn keyword rapidConstant TRIGG_MODE1 TRIGG_MODE2 TRIGG_MODE3
+  " tunetype
+  syn keyword rapidConstant TUNE_DF TUNE_KP TUNE_KV TUNE_TI TUNE_FRIC_LEV TUNE_FRIC_RAMP TUNE_DG TUNE_DH TUNE_DI TUNE_DK TUNE_DL
+  " cellopmode
+  syn keyword rapidConstant OP_NO_ROBOT OP_SERVICE OP_PRODUCTION
+  " execution mode
+  syn keyword rapidConstant CT_CONTINUOUS CT_COUNT_CYCLES CT_COUNT_CYC_ACTION CT_PERIODICAL
+  " Force Control
+  syn keyword rapidConstant FC_REFFRAME_TOOL FC_REFFRAME_WOBJ FC_LIN_X FC_LIN_Y FC_LIN_Z FC_ROT_X FC_ROT_Y FC_ROT_Z FC_SPEED_RATIO_MIN FC_NO_OF_SPEED_LEVELS
+  " tpnum
+  syn keyword rapidConstant TP_LATEST TP_PROGRAM TP_SCREENVIEWER
+  " paridvalidnum
+  syn keyword rapidConstant ROB_LOAD_VAL ROB_NOT_LOAD_VAL ROB_LM1_LOAD_VAL 
+  " paridnum
+  syn keyword rapidConstant TOOL_LOAD_ID PAY_LOAD_ID IRBP_K IRBP_L IRBP_C IRBP_C_INDEX IRBP_T IRBP_R IRBP_A IRBP_B IRBP_D
+  " loadidnum
+  syn keyword rapidConstant MASS_KNOWN MASS_WITH_AX3
+  " sensorstate
+  syn keyword rapidConstant STATE_ERROR STATE_UNDEFINED STATE_CONNECTED STATE_OPERATING STATE_CLOSED 
+  " signalorigin
+  syn keyword rapidConstant SIGORIG_NONE SIGORIG_CFG SIGORIG_ALIAS 
+  " aiotrigg
+  syn keyword rapidConstant AIO_ABOVE_HIGH AIO_BELOW_HIGH AIO_ABOVE_LOW AIO_BELOW_LOW AIO_BETWEEN AIO_OUTSIDE AIO_ALWAYS
+  " socketstatus
+  syn keyword rapidConstant SOCKET_CREATED SOCKET_CONNECTED SOCKET_BOUND SOCKET_LISTENING SOCKET_CLOSED
+  " symnum of OpMode()
+  syn keyword rapidConstant OP_UNDEF OP_AUTO OP_MAN_PROG OP_MAN_TEST
+  " symnum of RunMode()
+  syn keyword rapidConstant RUN_UNDEF RUN_CONT_CYCLE RUN_INSTR_FWD RUN_INSTR_BWD RUN_SIM RUN_STEP_MOVE
+  " event_type of EventType()
+  syn keyword rapidConstant EVENT_NONE EVENT_POWERON EVENT_START EVENT_STOP EVENT_QSTOP EVENT_RESTART EVENT_RESET EVENT_STEP
+  " handler_type of ExecHandler()
+  syn keyword rapidConstant HANDLER_NONE HANDLER_BWD HANDLER_ERR HANDLER_UNDO
+  " event_level of ExecLevel()
+  syn keyword rapidConstant LEVEL_NORMAL LEVEL_TRAP LEVEL_SERVICE
+  " signalorigin of GetSignalOrigin()
+  syn keyword rapidConstant SIGORIG_NONE SIGORIG_CFG SIGORIG_ALIAS
+  " opnum
+  syn keyword rapidConstant LT LTEQ EQ NOTEQ GT GTEQ
+  " icondata
+  syn keyword rapidConstant iconNone iconInfo iconWarning iconError
+  " buttondata
+  syn keyword rapidConstant btnNone btnOK btnAbrtRtryIgn btnOKCancel btnRetryCancel btnYesNo btnYesNoCancel
+  " btnres
+  syn keyword rapidConstant resUnkwn resOK resAbort resRetry resIgnore resCancel resYes resNo
+  " cfgdomain
+  syn keyword rapidConstant ALL_DOMAINS EIO_DOMAIN MMC_DOMAIN MOC_DOMAIN PROC_DOMAIN SIO_DOMAIN SYS_DOMAIN
+  " errdomain
+  syn keyword rapidConstant COMMON_ERR OP_STATE SYSTEM_ERR HARDWARE_ERR PROGRAM_ERR MOTION_ERR OPERATOR_ERR IO_COM_ERR USER_DEF_ERR SAFETY_ERR PROCESS_ERR CFG_ERR OPTION_PROD_ERR ARCWELD_ERR SPOTWELD_ERR PAINT_ERR PICKWARE_ERR
+  " errtype
+  syn keyword rapidConstant TYPE_ALL TYPE_ERR TYPE_STATE TYPE_WARN
+  " Sensor Interface
+  syn keyword rapidConstant LTAPP__AGE LTAPP__ANGLE LTAPP__AREA LTAPP__CAMCHECK LTAPP__GAP LTAPP__JOINT_NO LTAPP__LASER_OFF LTAPP__MISMATCH LTAPP__PING LTAPP__POWER_UP LTAPP__RESET LTAPP__STEPDIR LTAPP__THICKNESS LTAPP__UNIT
+  syn keyword rapidConstant LTAPP__X LTAPP__Y LTAPP__Z LTAPP__APM_P1 LTAPP__APM_P2 LTAPP__APM_P3 LTAPP__APM_P4 LTAPP__APM_P5 LTAPP__APM_P6 LTAPP__ROT_Y LTAPP__ROT_Z LTAPP__X0 LTAPP__Y0 LTAPP__Z0 LTAPP__X1 LTAPP__Y1 LTAPP__Z1 LTAPP__X2 LTAPP__Y2 LTAPP__Z2
+  " iounit_state
+  syn keyword rapidConstant IOUNIT_LOG_STATE_DISABLED IOUNIT_LOG_STATE_ENABLED IOUNIT_PHYS_STATE_DEACTIVATED IOUNIT_PHYS_STATE_RUNNING IOUNIT_PHYS_STATE_ERROR IOUNIT_PHYS_STATE_UNCONNECTED IOUNIT_PHYS_STATE_UNCONFIGURED IOUNIT_PHYS_STATE_STARTUP IOUNIT_PHYS_STATE_INIT IOUNIT_RUNNING IOUNIT_RUNERROR IOUNIT_DISABLE IOUNIT_OTHERERR
+  " busstate
+  syn keyword rapidConstant IOBUS_LOG_STATE_STARTED IOBUS_LOG_STATE_STOPPED IOBUS_PHYS_STATE_ERROR IOBUS_PHYS_STATE_HALTED IOBUS_PHYS_STATE_INIT IOBUS_PHYS_STATE_RUNNING IOBUS_PHYS_STATE_STARTUP
+  syn keyword rapidConstant BUSSTATE_ERROR BUSSTATE_HALTED BUSSTATE_INIT BUSSTATE_RUN BUSSTATE_STARTUP
+  " SoftMove
+  syn keyword rapidConstant CSS_POSX CSS_NEGX CSS_POSY CSS_NEGY CSS_POSZ CSS_NEGZ CSS_X CSS_Y CSS_Z CSS_XY CSS_XZ CSS_YZ CSS_XYZ CSS_XYRZ CSS_ARM_ANGLE CSS_REFFRAME_TOOL CSS_REFFRAME_WOBJ
+  " tsp_status
+  syn keyword rapidConstant TSP_STATUS_NOT_NORMAL_TASK TSP_STATUS_DEACT TSP_STATUS_DEACT_SERV_ROUT TSP_STATUS_ACT TSP_UNCHECKED_RUN_SERV_ROUT TSP_NORMAL_UNCHECKED TSP_STATIC_UNCHECKED TSP_SEMISTATIC_UNCHECKED TSP_NORMAL_CHECKED TSP_STATIC_CHECKED TSP_SEMISTATIC_CHECKED
+  " IRC5P (paint controller)
+  syn keyword rapidConstant PW_EQUIP_ERR
+  " Bulls Eye
+  syn keyword rapidConstant BESuccess BENoOverwrite BENoNameMatch BENoBEDataMod BEArrayFull BEToolNotFound BEInvalidSignal BEAliasSet BERangeLimFail BERangeSingFail BERangeTiltFail BEScanPlaneErr BEBFrameNotRead BEScanRadZero BEHeightSrchErr BEBeamNotFound BEBeamSpinErr BESrchErrInBeam BESrchErrNoDet BENumOfScansErr BEDiaZeroOrLess BESliceCountErr BEGetNewTcpMax BEBeamOriFail BEGetTcpDelErr BERefPosSetErr BERefToolSetErr BERefBeamSetErr BEBFrameDefErr BESetupAlready BERefResetErr BESetupFailed BEToolNotSet BEStartChanged BEBeamMoveErr BECheckTcp BECheckErr BESkipUpdate BEStrtningErr BEAllNotSet BEQuikRefNotDef BEConvergErr BEInstFwdErr BEGetGantryErr BEUnknownErr
+  " Continuous Application Platform constants
+  syn keyword rapidConstant CAP_START START_PRE PRE_STARTED START_MAIN MAIN_STARTED STOP_WEAVESTART WEAVESTART_REGAIN MOTION_DELAY STARTSPEED_TIME MAIN_MOTION MOVE_STARTED RESTART NEW_INSTR AT_POINT AT_RESTARTPOINT LAST_SEGMENT PROCESS_END_POINT END_MAIN MAIN_ENDED PATH_END_POINT PROCESS_ENDED END_POST1 POST1_ENDED END_POST2 POST2_ENDED CAP_STOP CAP_PF_RESTART EQUIDIST AT_ERRORPOINT FLY_START FLY_END LAST_INSTR_ENDED END_PRE PRE_ENDED START_POST1 POST1_STARTED START_POST2 POST2_STARTED 
+  syn keyword rapidConstant CAP_PRE_ERR CAP_PRESTART_ERR CAP_END_PRE_ERR CAP_START_ERR CAP_MAIN_ERR CAP_ENDMAIN_ERR CAP_START_POST1_ERR CAP_POST1_ERR CAP_POST1END_ERR CAP_START_POST2_ERR CAP_POST2_ERR CAP_POST2END_ERR CAP_TRACK_ERR CAP_TRACKSTA_ERR CAP_TRACKCOR_ERR CAP_TRACKCOM_ERR CAP_TRACKPFR_ERR CAP_SEN_NO_MEAS CAP_SEN_NOREADY CAP_SEN_GENERRO CAP_SEN_BUSY CAP_SEN_UNKNOWN CAP_SEN_ILLEGAL CAP_SEN_EXALARM CAP_SEN_CAALARM CAP_SEN_TEMP CAP_SEN_VALUE CAP_SEN_CAMCHECK CAP_SEN_TIMEOUT 
+  " Machine Tending grppos 
+  syn keyword rapidConstant gsOpen gsVacuumOff gsBackward gsClose gsVacuumOn gsForward gsReset
+  " Machine Tending grpaction
+  syn keyword rapidConstant gaSetAndCheck gaSet gaCheck gaCheckClose gaCheckClose
+  " Palletizing PowerPac
+  syn keyword rapidConstant PM_ERR_AXLIM PM_ERR_CALCCONF PM_ERR_FLOW_NOT_FOUND PM_ERR_INVALID_FLOW_STOP_OPTION PM_ERR_JOB_EMPTY PM_ERR_LIM_VALUE PM_ERR_NO_RUNNING_PROJECT PM_ERR_NO_TASK PM_ERR_NOT_VALID_RECOVER_ACTION PM_ERR_OPERATION_LOST PM_ERR_PALLET_EMPTY PM_ERR_PALLET_REDUCED PM_ERR_PART_VAL PM_ERR_PROJ_NOT_FOUND PM_ERR_REDO_LAST_PICK_REJECTED PM_ERR_TIMEOUT PM_ERR_WA_NOT_FOUND PM_ERR_WOBJ PM_ERR_WORKAREA_EXPECTED PM_ERR_WRONG_FLOW_STATE
+  syn keyword rapidConstant PM_ACK PM_NACK PM_LOST PM_RECOVER_CONTINUE_OPERATION PM_RECOVER_REDO_LAYER PM_RECOVER_NEXT_PALLET PM_RECOVER_REDO_LAST_PICK PM_FLOW_ERROR PM_FLOW_FINISH_CYCLE PM_FLOW_FINISH_LAYER PM_FLOW_FINISH_PALLET PM_FLOW_RUNNING PM_FLOW_STOP_IMMEDIATELY PM_FLOW_STOPPED PM_FLOW_STOPPING_AFTER_CYCLE PM_FLOW_STOPPING_AFTER_LAYER PM_FLOW_STOPPING_AFTER_PALLET PM_APPROACH_POS PM_DEPART_POS PM_TARGET_POS PM_EVENT_PROC PM_EVENT_DO PM_EVENT_GO PM_MOVE_JOINT PM_MOVE_LIN PM_SEARCH_X PM_SEARCH_Y PM_SEARCH_Z PM_SING_AREA_OFF PM_SING_AREA_WRI PM_STOP_NOT_USED PM_STOP PM_PSTOP PM_SSTOP PM_PROJECT_STOPPED PM_PROJECT_STOPPING PM_PROJECT_STARTING PM_PROJECT_RUNNING PM_PROJECT_ERROR 
+  syn keyword rapidConstant MaxToolAngle MinToolAngle
+  " other constants
+  syn keyword rapidConstant GAP_SERVICE_TYPE GAP_SETUP_TYPE GAP_STATE_IDLE GAP_STATE_PART GAP_STATE_SERV GAP_STATE_SETUP GAP_STATE_UNKN GAP_TASK_NAME GAP_TASK_NO GAP_SHOW_ALWAYS GAP_SHOW_NEVER GAP_SHOW_SAFE GAP_SHOW_SERVICE
+  syn keyword rapidConstant EOF EOF_BIN EOF_NUM
+  syn keyword rapidConstant END_OF_LIST WAIT_MAX
+  syn keyword rapidErrNo ERRNO
+  syn keyword rapidIntNo INTNO
+  " VW Konzernstandard VWKS_1.07.02
+  syn keyword rapidIntNo KG_UNDEFINIERT KG_LETZTEPOS KG_GREIFPOS KG_ZWISCHENPOS KG_TOOLINFO KG_GREIFPOSKORR
+  syn keyword rapidIntNo BA1 BA2
+  syn keyword rapidIntNo SetupXY SetupZ KorrekturXY KorrekturZ
+  if g:rapidGroupName
+    highlight default link rapidConstant Sysvars
+    highlight default link rapidErrNo Sysvars
+    highlight default link rapidIntNo Sysvars
+  endif
+  " }}} ERRNO Constants
+
+  " Error {{{
+  if get(g:,'rapidShowError',1)
+    "
+    " vars or funcs >32 chars are not possible in rapid. a234567890123456789012345
+    syn match rapidErrorIdentifierNameTooLong /\k\{33,}/ containedin=rapidFunction,rapidNames,rapidLabel
+    highlight default link rapidErrorIdentifierNameTooLong Error
+    "
+    " a == b + 1
+    syn match rapidErrorShouldBeColonEqual /\c\v%(^\s*%(%(TASK\s+|LOCAL\s+)?%(VAR|PERS|CONST)\s+\k+\s+)?\k+%(\k|[.{},*/+-])*\s*)@<=\=/
+    highlight default link rapidErrorShouldBeColonEqual Error
+    "
+    " WaitUntil a==b
+    syn match rapidErrorShouldBeEqual    /\c\v%(^\s*%(Return|WaitUntil|while)>[^!\\]+[^!<>])@<=%(\=|:)\=/
+    syn match rapidErrorShouldBeEqual    /\c\v%(^\s*%(if|elseif)>[^!\\]+[^!<>])@<=%(\=|:)\=\ze[^!\\]+<then>/
+    highlight default link rapidErrorShouldBeEqual Error
+    "
+    " WaitUntil a=>b
+    syn match rapidErrorShoudBeLessOrGreaterEqual /\c\v%(^\s*%(Return|WaitUntil|if|elseif|while)>[^!]+[^!<>])@<=\=[><]/
+    highlight default link rapidErrorShoudBeLessOrGreaterEqual Error
+    "
+    " WaitUntil a><b
+    syn match rapidErrorShouldBeLessGreater /\c\v%(^\s*%(Return|WaitUntil|if|elseif|while)[^!]+)@<=\>\s*\</
+    highlight default link rapidErrorShouldBeLessGreater Error
+    "
+    " if (a==5) (b==6)
+    syn match rapidErrorMissingOperator /\c\v%(^\s*%(Return|WaitUntil|if|elseif|while)[^!]+[^!])@<=\)\s*\(/
+    highlight default link rapidErrorMissingOperator Error
+    "
+    " "for" missing "from"
+    syn match rapidErrorMissingFrom /\c\v^\s*for\s+%([[:upper:][:lower:]]%(\k|[.{},*/+-])*\s+from)@!\S+\s+\S+/
+    highlight default link rapidErrorMissingFrom Error
+    "
+    "
+  endif
+  " }}} Error
+
+" }}}
+endif
+
+" common Error {{{
+if get(g:,'rapidShowError',1)
+  "
+  " This error must be defined after rapidString
+  " string too long
+  " syn match rapidErrorStringTooLong /\v%("%(""|\\\\|\\\x\x|[^"\\]){80})@240<=%([^"]|"{2})+/ contained contains=rapidStringDoubleQuote,rapidEscapedBackSlash,rapidCharCode,rapidErrorSingleBackslash
+  highlight default link rapidErrorStringTooLong Error
+  "
+endif
+
+" }}} Error
+
+" Finish {{{
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+let b:current_syntax = "rapid"
+" }}} Finish
+
+" vim:sw=2 sts=2 et fdm=marker
-- 
cgit 


From 2ee8ace217b8e4405822d3ab1bed5a20bedc4b04 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 9 Aug 2023 15:41:45 -0500
Subject: fix(iter): make pipeline termination conditions consistent (#24614)

If an iterator pipeline stage returns nil as its first return value, the
other return values are ignored and it is treated as if that stage
returned only nil (the semantics of returning nil are different between
different stages). This is consistent with how for loops work in Lua
more generally, where the for loop breaks when the first return value
from the function iterator is nil (see :h for-in for details).
---
 runtime/doc/lua.txt      | 10 ++++++++--
 runtime/lua/vim/iter.lua | 22 +++++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index fb92ad411e..08022c3ed6 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3207,13 +3207,18 @@ receives as input the output values from the prior stage. The values used
 in the first stage of the pipeline depend on the type passed to this
 function:
 
-• List tables pass only the value of each element
-• Non-list (dict) tables pass both the key and value of each element
+• List tables (arrays) pass only the value of each element
+• Non-list tables (dictionaries) pass both the key and value of each
+  element
 • Function |iterator|s pass all of the values returned by their respective
   function
 • Tables with a metatable implementing |__call()| are treated as function
   iterators
 
+The iterator pipeline terminates when the original table or function
+iterator runs out of values (for function iterators, this means that the
+first value returned by the function is nil).
+
 Examples: >lua
 
    local it = vim.iter({ 1, 2, 3, 4, 5 })
@@ -3225,6 +3230,7 @@ Examples: >lua
    it:totable()
    -- { 9, 6, 3 }
 
+   -- ipairs() is a function iterator which returns both the index (i) and the value (v)
    vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
      if i > 2 then return v end
    end):totable()
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index a278e96a5f..56c130dd0c 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -6,11 +6,14 @@
 --- Each pipeline stage receives as input the output values from the prior stage. The values used in
 --- the first stage of the pipeline depend on the type passed to this function:
 ---
---- - List tables pass only the value of each element
---- - Non-list (dict) tables pass both the key and value of each element
+--- - List tables (arrays) pass only the value of each element
+--- - Non-list tables (dictionaries) pass both the key and value of each element
 --- - Function |iterator|s pass all of the values returned by their respective function
 --- - Tables with a metatable implementing |__call()| are treated as function iterators
 ---
+--- The iterator pipeline terminates when the original table or function iterator runs out of values
+--- (for function iterators, this means that the first value returned by the function is nil).
+---
 --- Examples:
 --- <pre>lua
 ---   local it = vim.iter({ 1, 2, 3, 4, 5 })
@@ -22,6 +25,7 @@
 ---   it:totable()
 ---   -- { 9, 6, 3 }
 ---
+---   -- ipairs() is a function iterator which returns both the index (i) and the value (v)
 ---   vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
 ---     if i > 2 then return v end
 ---   end):totable()
@@ -111,7 +115,7 @@ end
 ---@return boolean True if the iterator stage should continue, false otherwise
 ---@return any Function arguments.
 local function continue(...)
-  if select('#', ...) > 0 then
+  if select(1, ...) ~= nil then
     return false, ...
   end
   return true
@@ -127,7 +131,7 @@ end
 ---@return boolean True if the iterator pipeline should continue, false otherwise
 ---@return any Return values of f
 local function apply(f, ...)
-  if select('#', ...) > 0 then
+  if select(1, ...) ~= nil then
     return continue(f(...))
   end
   return false
@@ -258,7 +262,7 @@ end
 ---                       in the pipeline as arguments.
 function Iter.each(self, f)
   local function fn(...)
-    if select('#', ...) > 0 then
+    if select(1, ...) ~= nil then
       f(...)
       return true
     end
@@ -740,6 +744,12 @@ end
 ---@param last number
 ---@return Iter
 function Iter.slice(self, first, last) -- luacheck: no unused args
+  error('slice() requires a list-like table')
+  return self
+end
+
+---@private
+function ListIter.slice(self, first, last)
   return self:skip(math.max(0, first - 1)):skipback(math.max(0, self._tail - last - 1))
 end
 
@@ -912,6 +922,8 @@ function Iter.new(src, ...)
 
     --- Use a closure to handle var args returned from iterator
     local function fn(...)
+      -- Per the Lua 5.1 reference manual, an iterator is complete when the first returned value is
+      -- nil (even if there are other, non-nil return values). See |for-in|.
       if select(1, ...) ~= nil then
         var = select(1, ...)
         return ...
-- 
cgit 


From f060f03304ca5f3b8adf5d5b46bdd01dc413d985 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 23:35:10 +0200
Subject: vim-patch:2eb413f89b97 (#24627)

* vim-patch:2eb413f89b97

detect filetype for `*.vsh` and `*.vv` files (vim/vim#12692)

Co-authored-by: Turiiya <34311583+tobealive@users.noreply.github.com>

https://github.com/vim/vim/commit/2eb413f89b97a498679fbe68c7564b9e41c5af7f

Co-authored-by: Turiiya <34311583+ttytm@users.noreply.github.com>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
---
 runtime/lua/vim/filetype.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index dd730c0744..bee210aacb 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1017,6 +1017,8 @@ local extension = {
   url = 'urlshortcut',
   usd = 'usd',
   usda = 'usd',
+  vsh = 'v',
+  vv = 'v',
   sba = 'vb',
   vb = 'vb',
   dsm = 'vb',
-- 
cgit 


From 1cf942204f98395d8909e5499dda462af0cc12f7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 9 Aug 2023 23:44:16 +0200
Subject: vim-patch:bd76c89e31ac (#24630)

update matchit (vim/vim#12611)

https://github.com/vim/vim/commit/bd76c89e31ac9d9efd00ec8dda9c32436415dbbb

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/pack/dist/opt/matchit/autoload/matchit.vim |  17 ++--
 runtime/pack/dist/opt/matchit/doc/matchit.txt      |  26 ++++-
 runtime/pack/dist/opt/matchit/plugin/matchit.vim   | 105 +++++++++++++--------
 3 files changed, 98 insertions(+), 50 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/matchit/autoload/matchit.vim b/runtime/pack/dist/opt/matchit/autoload/matchit.vim
index eafb7c0551..dc2aba696d 100644
--- a/runtime/pack/dist/opt/matchit/autoload/matchit.vim
+++ b/runtime/pack/dist/opt/matchit/autoload/matchit.vim
@@ -1,6 +1,6 @@
 "  matchit.vim: (global plugin) Extended "%" matching
 "  autload script of matchit plugin, see ../plugin/matchit.vim
-"  Last Change: Jun 10, 2021
+"  Last Change: Jan 24, 2022
 
 " Neovim does not support scriptversion
 if has("vimscript-4")
@@ -42,6 +42,10 @@ function s:RestoreOptions()
     let restore_options = " ve=" .. &ve .. restore_options
     set ve=
   endif
+  if &smartcase
+    let restore_options = " smartcase " .. restore_options
+    set nosmartcase
+  endif
   return restore_options
 endfunction
 
@@ -134,9 +138,6 @@ function matchit#Match_wrapper(word, forward, mode) range
     let curcol = match(matchline, regexp)
     " If there is no match, give up.
     if curcol == -1
-      " Make sure macros abort properly
-      "exe "norm! \<esc>"
-      call feedkeys("\e", 'tni')
       return s:CleanUp(restore_options, a:mode, startpos)
     endif
     let endcol = matchend(matchline, regexp)
@@ -756,15 +757,15 @@ endfun
 fun! s:ParseSkip(str)
   let skip = a:str
   if skip[1] == ":"
-    if skip[0] == "s"
+    if skip[0] ==# "s"
       let skip = "synIDattr(synID(line('.'),col('.'),1),'name') =~? '" ..
         \ strpart(skip,2) .. "'"
-    elseif skip[0] == "S"
+    elseif skip[0] ==# "S"
       let skip = "synIDattr(synID(line('.'),col('.'),1),'name') !~? '" ..
         \ strpart(skip,2) .. "'"
-    elseif skip[0] == "r"
+    elseif skip[0] ==# "r"
       let skip = "strpart(getline('.'),0,col('.'))=~'" .. strpart(skip,2) .. "'"
-    elseif skip[0] == "R"
+    elseif skip[0] ==# "R"
       let skip = "strpart(getline('.'),0,col('.'))!~'" .. strpart(skip,2) .. "'"
     endif
   endif
diff --git a/runtime/pack/dist/opt/matchit/doc/matchit.txt b/runtime/pack/dist/opt/matchit/doc/matchit.txt
index 45033ce3f1..5daf9788d6 100644
--- a/runtime/pack/dist/opt/matchit/doc/matchit.txt
+++ b/runtime/pack/dist/opt/matchit/doc/matchit.txt
@@ -1,10 +1,10 @@
-*matchit.txt*	Extended "%" matching
+*matchit.txt*   Extended "%" matching
 
 For instructions on installing this file, type
 	`:help matchit-install`
 inside Vim.
 
-For Vim version 8.2.  Last change:  2021 Dec 24
+For Vim version 9.0.  Last change:  2023 June 28
 
 
 		  VIM REFERENCE MANUAL    by Benji Fisher et al
@@ -150,8 +150,7 @@ To use the matchit plugin add this line to your |vimrc|: >
 
 The script should start working the next time you start Vim.
 
-To use the matchit plugin after startup, you can use this command (note the
-omitted '!'): >
+To use the matchit plugin after Vim has started, execute this command: >
 	packadd matchit
 
 (Earlier versions of the script did nothing unless a |buffer-variable| named
@@ -175,6 +174,22 @@ fail to skip matching groups in comments and strings.  If the |filetype|
 mechanism is turned off, the |b:match_words| variable will probably not be
 defined automatically.
 
+2.1 Temporarily disable the matchit plugin	*matchit-disable* *:MatchDisable*
+
+To temporarily reset the plugins, that are setup you can run the following
+command: >
+	:MatchDisable
+
+This will delete all the defined key mappings to the Vim default.
+Now the "%" command will work like before loading the plugin |%|
+
+2.2 Re-enable the matchit plugin		*:MatchEnable*
+
+To re-enable the plugin, after it was disabled, use the following command: >
+	:MatchEnable
+
+This will resetup the key mappings.
+
 ==============================================================================
 3. Configuration					*matchit-configure*
 
@@ -243,6 +258,9 @@ Examples:
 	comment character) you can >
 		:let b:match_skip = 'r:\(^\|[^\\]\)\(\\\\\)*%'
 <
+	See the $VIMRUNTIME/ftplugin/vim.vim for an example that uses both
+	syntax and a regular expression.
+
 ==============================================================================
 4. Supporting a New Language				*matchit-newlang*
 							*b:match_words*
diff --git a/runtime/pack/dist/opt/matchit/plugin/matchit.vim b/runtime/pack/dist/opt/matchit/plugin/matchit.vim
index 51ba3a7f51..d6c735d7b4 100644
--- a/runtime/pack/dist/opt/matchit/plugin/matchit.vim
+++ b/runtime/pack/dist/opt/matchit/plugin/matchit.vim
@@ -1,7 +1,7 @@
 "  matchit.vim: (global plugin) Extended "%" matching
 "  Maintainer:  Christian Brabandt
-"  Version:     1.18
-"  Last Change: 2020 Dec 23
+"  Version:     1.19
+"  Last Change: 2023, June 28th
 "  Repository:  https://github.com/chrisbra/matchit
 "  Previous URL:http://www.vim.org/script.php?script_id=39
 "  Previous Maintainer:  Benji Fisher PhD   <benji@member.AMS.org>
@@ -46,44 +46,65 @@ let g:loaded_matchit = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-nnoremap <silent> <Plug>(MatchitNormalForward)     :<C-U>call matchit#Match_wrapper('',1,'n')<CR>
-nnoremap <silent> <Plug>(MatchitNormalBackward)    :<C-U>call matchit#Match_wrapper('',0,'n')<CR>
-xnoremap <silent> <Plug>(MatchitVisualForward)     :<C-U>call matchit#Match_wrapper('',1,'v')<CR>
-      \:if col("''") != col("$") \| exe ":normal! m'" \| endif<cr>gv``
-xnoremap <silent> <Plug>(MatchitVisualBackward)    :<C-U>call matchit#Match_wrapper('',0,'v')<CR>m'gv``
-onoremap <silent> <Plug>(MatchitOperationForward)  :<C-U>call matchit#Match_wrapper('',1,'o')<CR>
-onoremap <silent> <Plug>(MatchitOperationBackward) :<C-U>call matchit#Match_wrapper('',0,'o')<CR>
-
-" Analogues of [{ and ]} using matching patterns:
-nnoremap <silent> <Plug>(MatchitNormalMultiBackward)    :<C-U>call matchit#MultiMatch("bW", "n")<CR>
-nnoremap <silent> <Plug>(MatchitNormalMultiForward)     :<C-U>call matchit#MultiMatch("W",  "n")<CR>
-xnoremap <silent> <Plug>(MatchitVisualMultiBackward)    :<C-U>call matchit#MultiMatch("bW", "n")<CR>m'gv``
-xnoremap <silent> <Plug>(MatchitVisualMultiForward)     :<C-U>call matchit#MultiMatch("W",  "n")<CR>m'gv``
-onoremap <silent> <Plug>(MatchitOperationMultiBackward) :<C-U>call matchit#MultiMatch("bW", "o")<CR>
-onoremap <silent> <Plug>(MatchitOperationMultiForward)  :<C-U>call matchit#MultiMatch("W",  "o")<CR>
-
-" text object:
-xmap <silent> <Plug>(MatchitVisualTextObject) <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward)
-
-if !exists("g:no_plugin_maps")
-  nmap <silent> %  <Plug>(MatchitNormalForward)
-  nmap <silent> g% <Plug>(MatchitNormalBackward)
-  xmap <silent> %  <Plug>(MatchitVisualForward)
-  xmap <silent> g% <Plug>(MatchitVisualBackward)
-  omap <silent> %  <Plug>(MatchitOperationForward)
-  omap <silent> g% <Plug>(MatchitOperationBackward)
+fun MatchEnable()
+  nnoremap <silent> <Plug>(MatchitNormalForward)     :<C-U>call matchit#Match_wrapper('',1,'n')<CR>
+  nnoremap <silent> <Plug>(MatchitNormalBackward)    :<C-U>call matchit#Match_wrapper('',0,'n')<CR>
+  xnoremap <silent> <Plug>(MatchitVisualForward)     :<C-U>call matchit#Match_wrapper('',1,'v')<CR>
+        \:if col("''") != col("$") \| exe ":normal! m'" \| endif<cr>gv``
+  xnoremap <silent> <Plug>(MatchitVisualBackward)    :<C-U>call matchit#Match_wrapper('',0,'v')<CR>m'gv``
+  onoremap <silent> <Plug>(MatchitOperationForward)  :<C-U>call matchit#Match_wrapper('',1,'o')<CR>
+  onoremap <silent> <Plug>(MatchitOperationBackward) :<C-U>call matchit#Match_wrapper('',0,'o')<CR>
 
   " Analogues of [{ and ]} using matching patterns:
-  nmap <silent> [% <Plug>(MatchitNormalMultiBackward)
-  nmap <silent> ]% <Plug>(MatchitNormalMultiForward)
-  xmap <silent> [% <Plug>(MatchitVisualMultiBackward)
-  xmap <silent> ]% <Plug>(MatchitVisualMultiForward)
-  omap <silent> [% <Plug>(MatchitOperationMultiBackward)
-  omap <silent> ]% <Plug>(MatchitOperationMultiForward)
-
-  " Text object
-  xmap a% <Plug>(MatchitVisualTextObject)
-endif
+  nnoremap <silent> <Plug>(MatchitNormalMultiBackward)    :<C-U>call matchit#MultiMatch("bW", "n")<CR>
+  nnoremap <silent> <Plug>(MatchitNormalMultiForward)     :<C-U>call matchit#MultiMatch("W",  "n")<CR>
+  xnoremap <silent> <Plug>(MatchitVisualMultiBackward)    :<C-U>call matchit#MultiMatch("bW", "n")<CR>m'gv``
+  xnoremap <silent> <Plug>(MatchitVisualMultiForward)     :<C-U>call matchit#MultiMatch("W",  "n")<CR>m'gv``
+  onoremap <silent> <Plug>(MatchitOperationMultiBackward) :<C-U>call matchit#MultiMatch("bW", "o")<CR>
+  onoremap <silent> <Plug>(MatchitOperationMultiForward)  :<C-U>call matchit#MultiMatch("W",  "o")<CR>
+
+  " text object:
+  xmap <silent> <Plug>(MatchitVisualTextObject) <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward)
+
+  if !exists("g:no_plugin_maps")
+    nmap <silent> %  <Plug>(MatchitNormalForward)
+    nmap <silent> g% <Plug>(MatchitNormalBackward)
+    xmap <silent> %  <Plug>(MatchitVisualForward)
+    xmap <silent> g% <Plug>(MatchitVisualBackward)
+    omap <silent> %  <Plug>(MatchitOperationForward)
+    omap <silent> g% <Plug>(MatchitOperationBackward)
+
+    " Analogues of [{ and ]} using matching patterns:
+    nmap <silent> [% <Plug>(MatchitNormalMultiBackward)
+    nmap <silent> ]% <Plug>(MatchitNormalMultiForward)
+    xmap <silent> [% <Plug>(MatchitVisualMultiBackward)
+    xmap <silent> ]% <Plug>(MatchitVisualMultiForward)
+    omap <silent> [% <Plug>(MatchitOperationMultiBackward)
+    omap <silent> ]% <Plug>(MatchitOperationMultiForward)
+
+    " Text object
+    xmap a% <Plug>(MatchitVisualTextObject)
+  endif
+endfun
+
+fun MatchDisable()
+  " remove all the setup keymappings
+  nunmap %
+  nunmap g%
+  xunmap %
+  xunmap g%
+  ounmap %
+  ounmap g%
+
+  nunmap [%
+  nunmap ]%
+  xunmap [%
+  xunmap ]%
+  ounmap [%
+  ounmap ]%
+
+  xunmap a%
+endfun
 
 " Call this function to turn on debugging information.  Every time the main
 " script is run, buffer variables will be saved.  These can be used directly
@@ -91,6 +112,14 @@ endif
 if !exists(":MatchDebug")
   command! -nargs=0 MatchDebug call matchit#Match_debug()
 endif
+if !exists(":MatchDisable")
+  command! -nargs=0 MatchDisable :call MatchDisable()
+endif
+if !exists(":MatchEnable")
+  command! -nargs=0 MatchEnable :call MatchEnable()
+endif
+
+call MatchEnable()
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-- 
cgit 


From e6947bb1e80aa61ec43446f43dcc7c8a022f5b78 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Wed, 9 Aug 2023 14:50:52 -0700
Subject: fix(types): make filetype.add parameters optional

---
 runtime/lua/vim/filetype.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index bee210aacb..1bbe88f06d 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2034,9 +2034,9 @@ local function normalize_path(path, as_pattern)
 end
 
 --- @class vim.filetype.add.filetypes
---- @field pattern vim.filetype.mapping
---- @field extension vim.filetype.mapping
---- @field filename vim.filetype.mapping
+--- @field pattern? vim.filetype.mapping
+--- @field extension? vim.filetype.mapping
+--- @field filename? vim.filetype.mapping
 
 --- Add new filetype mappings.
 ---
-- 
cgit 


From 1d81d7a268f5805bedc077f80582a89afe1bfe84 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 9 Aug 2023 15:33:53 -0700
Subject: feat(defaults): treat "•" as a list item prefix #24623
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
Nvim docs use "•" as a list item prefix but `gw{motion}` doesn't format
such lists by default.

Solution:
Change the 'comments' option to include "fb:•" by default.
---
 runtime/doc/news.txt              | 1 +
 runtime/doc/options.txt           | 2 +-
 runtime/doc/vim_diff.txt          | 1 +
 runtime/lua/vim/_meta/options.lua | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index d0da35fb90..713569e1ad 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -151,6 +151,7 @@ The following changes to existing APIs or features add new behavior.
   option, which allows for rendering e.g., diagnostic severities differently.
 
 • Defaults:
+  • 'comments' includes "fb:•".
   • 'shortmess' includes the "C" flag.
   • Automatic linting of treesitter query files (see |ft-query-plugin|).
     Can be disabled via: >lua
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index fca73ddd1e..f04fb2fb51 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1374,7 +1374,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Minimum value is 12, maximum value is 10000.
 
 					*'comments'* *'com'* *E524* *E525*
-'comments' 'com'	string	(default "s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-")
+'comments' 'com'	string	(default "s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,fb:•")
 			local to buffer
 	A comma-separated list of strings that can start a comment line.  See
 	|format-comments|.  See |option-backslash| about using backslashes to
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index f9926bfb53..15bb13d5a9 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -37,6 +37,7 @@ Defaults					            *nvim-defaults*
 - 'backspace' defaults to "indent,eol,start"
 - 'backupdir' defaults to .,~/.local/state/nvim/backup// (|xdg|), auto-created
 - 'belloff' defaults to "all"
+- 'comments' includes "fb:•"
 - 'commentstring' defaults to ""
 - 'compatible' is always disabled
 - 'complete' excludes "i"
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 94e26742e6..8edb87df91 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -956,7 +956,7 @@ vim.go.co = vim.go.columns
 --- insert a space.
 ---
 --- @type string
-vim.o.comments = "s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-"
+vim.o.comments = "s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,fb:•"
 vim.o.com = vim.o.comments
 vim.bo.comments = vim.o.comments
 vim.bo.com = vim.bo.comments
-- 
cgit 


From 72e619ca92b527140e1323f4e281b7f3ad35f380 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 10 Aug 2023 07:13:23 +0800
Subject: vim-patch:8f566fdb1e34 (#24636)

update .wast files syntax highlighting (vim/vim#12741)

https://github.com/vim/vim/commit/8f566fdb1e3452c9104d9e7af402adbfbcb463c7

Co-authored-by: Linda_pp <rhysd@users.noreply.github.com>
---
 runtime/syntax/wast.vim | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/wast.vim b/runtime/syntax/wast.vim
index 245d5f6f19..113d65c5a1 100644
--- a/runtime/syntax/wast.vim
+++ b/runtime/syntax/wast.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     WebAssembly
 " Maintainer:   rhysd <lin90162@yahoo.co.jp>
-" Last Change:  Jul 29, 2018
+" Last Change:  Aug 7, 2023
 " For bugs, patches and license go to https://github.com/rhysd/vim-wasm
 
 if exists("b:current_syntax")
@@ -11,33 +11,42 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn cluster wastCluster       contains=wastModule,wastInstWithType,wastInstGeneral,wastParamInst,wastControlInst,wastString,wastNamedVar,wastUnnamedVar,wastFloat,wastNumber,wastComment,wastList,wastType
+syn cluster wastNotTop contains=wastModule,wastInstWithType,wastInstGetSet,wastInstGeneral,wastParamInst,wastControlInst,wastSimdInst,wastString,wastNamedVar,wastUnnamedVar,wastFloat,wastNumber,wastComment,wastList,wastType
 
 " Instructions
 " https://webassembly.github.io/spec/core/text/instructions.html
 " Note: memarg (align=,offset=) can be added to memory instructions
 syn match   wastInstWithType  "\%((\s*\)\@<=\<\%(i32\|i64\|f32\|f64\|memory\)\.[[:alnum:]_]\+\%(/\%(i32\|i64\|f32\|f64\)\)\=\>\%(\s\+\%(align\|offset\)=\)\=" contained display
 syn match   wastInstGeneral   "\%((\s*\)\@<=\<[[:alnum:]_]\+\>" contained display
+syn match   wastInstGetSet    "\%((\s*\)\@<=\<\%(local\|global\)\.\%(get\|set\)\>" contained display
 " https://webassembly.github.io/spec/core/text/instructions.html#control-instructions
-syn match   wastControlInst   "\%((\s*\)\@<=\<\%(block\|end\|loop\|if\|else\|unreachable\|nop\|br\|br_if\|br_table\|return\|call\|call_indirect\)\>" contained display
+syn match   wastControlInst   "\%((\s*\)\@<=\<\%(block\|end\|loop\|if\|then\|else\|unreachable\|nop\|br\|br_if\|br_table\|return\|call\|call_indirect\)\>" contained display
 " https://webassembly.github.io/spec/core/text/instructions.html#parametric-instructions
 syn match   wastParamInst     "\%((\s*\)\@<=\<\%(drop\|select\)\>" contained display
+" SIMD instructions
+" https://webassembly.github.io/simd/core/text/instructions.html#simd-instructions
+syn match   wastSimdInst      "\<\%(v128\|i8x16\|i16x8\|i32x4\|i64x2\|f32x4\|f64x2)\)\.[[:alnum:]_]\+\%(\s\+\%(i8x16\|i16x8\|i32x4\|i64x2\|f32x4\|f64x2\)\)\=\>" contained display
 
 " Identifiers
 " https://webassembly.github.io/spec/core/text/values.html#text-id
-syn match   wastNamedVar      "$\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]*" contained display
+syn match   wastNamedVar      "$\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]*" contained contains=wastEscapeUtf8
 syn match   wastUnnamedVar    "$\+\d\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]\@!" contained display
+" Presuming the source text is itself encoded correctly, strings that do not
+" contain any uses of hexadecimal byte escapes are always valid names.
+" https://webassembly.github.io/spec/core/text/values.html#names
+syn match   wastEscapedUtf8   "\\\x\{1,6}" contained containedin=wastNamedVar display
 
 " String literals
 " https://webassembly.github.io/spec/core/text/values.html#strings
 syn region  wastString        start=+"+ skip=+\\\\\|\\"+ end=+"+ contained contains=wastStringSpecial
-syn match   wastStringSpecial "\\\x\x\|\\[tnr'\\\"]\|\\u\x\+" contained containedin=wastString
+syn match   wastStringSpecial "\\\x\x\|\\[tnr'\\\"]\|\\u\x\+" contained containedin=wastString display
 
 " Float literals
 " https://webassembly.github.io/spec/core/text/values.html#floating-point
 syn match   wastFloat         "\<-\=\d\%(_\=\d\)*\%(\.\d\%(_\=\d\)*\)\=\%([eE][-+]\=\d\%(_\=\d\)*\)\=" display contained
-syn match   wastFloat         "\<-\=0x\x\%(_\=\d\)*\%(\.\x\%(_\=\x\)*\)\=\%([pP][-+]\=\d\%(_\=\d\)*\)\=" display contained
+syn match   wastFloat         "\<-\=0x\x\%(_\=\x\)*\%(\.\x\%(_\=\x\)*\)\=\%([pP][-+]\=\d\%(_\=\d\)*\)\=" display contained
 syn keyword wastFloat         inf nan contained
+syn match   wastFloat         "nan:0x\x\%(_\=\x\)*" display contained
 
 " Integer literals
 " https://webassembly.github.io/spec/core/text/values.html#integers
@@ -46,14 +55,15 @@ syn match   wastNumber        "\<-\=0x\x\%(_\=\x\)*\>" display contained
 
 " Comments
 " https://webassembly.github.io/spec/core/text/lexical.html#comments
-syn region  wastComment       start=";;" end="$" display
+syn region  wastComment       start=";;" end="$"
 syn region  wastComment       start="(;;\@!" end=";)"
 
-syn region  wastList          matchgroup=wastListDelimiter start="(;\@!" matchgroup=wastListDelimiter end=";\@<!)" contains=@wastCluster
+syn region  wastList          matchgroup=wastListDelimiter start="(;\@!" matchgroup=wastListDelimiter end=";\@<!)" contains=@wastNotTop
 
 " Types
 " https://webassembly.github.io/spec/core/text/types.html
-syn keyword wastType          i64 i32 f64 f32 param result anyfunc mut contained
+" Note: `mut` was changed to `const`/`var` at Wasm 2.0
+syn keyword wastType          i64 i32 f64 f32 param result funcref func externref extern mut v128 const var contained
 syn match   wastType          "\%((\_s*\)\@<=func\%(\_s*[()]\)\@=" display contained
 
 " Modules
@@ -61,13 +71,15 @@ syn match   wastType          "\%((\_s*\)\@<=func\%(\_s*[()]\)\@=" display conta
 syn keyword wastModule        module type export import table memory global data elem contained
 syn match   wastModule        "\%((\_s*\)\@<=func\%(\_s\+\$\)\@=" display contained
 
-syn sync lines=100
+syn sync maxlines=100
 
 hi def link wastModule        PreProc
 hi def link wastListDelimiter Delimiter
 hi def link wastInstWithType  Operator
+hi def link wastInstGetSet    Operator
 hi def link wastInstGeneral   Operator
 hi def link wastControlInst   Statement
+hi def link wastSimdInst      Operator
 hi def link wastParamInst     Conditional
 hi def link wastString        String
 hi def link wastStringSpecial Special
@@ -77,6 +89,7 @@ hi def link wastFloat         Float
 hi def link wastNumber        Number
 hi def link wastComment       Comment
 hi def link wastType          Type
+hi def link wastEscapedUtf8   Special
 
 let b:current_syntax = "wast"
 
-- 
cgit 


From 5684c415b4857cce954d58b5a334b5abb70be9d2 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 10 Aug 2023 13:02:12 +0800
Subject: vim-patch:6a500661a9cb

Improve the vimscript code in ":h hex-editing"

Save and restore the view position before and after saving the buffer,
respectively, to keep the current view of the xxd(1)'s hex dump
unchanged after doing ":w", which previously caused the window to
scroll back to the very beginning of the buffer.  I believe it's
needless to say how annoying and counterproductive that was.

Get rid of the "Press ENTER or type command to continue" message, which
was previously displayed after opening larger binary files.  The use
of "silent" and "redraw" commands is tailored specifically to avoid
screen flickering, e.g. when doing ":w", which is caused by the buffer
being filtered by an external command.

Increase the number of octets per line, produced by xxd(1), from the
default value of 16 to 32.  This puts bigger chunks of the hex dump
on the screen and makes the whole thing much more usable.

While there, reformat the code to make it more readable, and use the
long form of the commands and variables to make the code slightly more
consistent and more understandable to newcomers.

https://github.com/vim/vim/commit/6a500661a9cb7b57093cf1095aa67e9c4aabc709

Co-authored-by: Dragan Simic' via vim_dev <vim_dev@googlegroups.com>
---
 runtime/doc/tips.txt | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index 7d38b1e0f7..88528b0e4e 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -346,14 +346,26 @@ comma-separated list of extension(s) you find yourself wanting to edit: >
 
 	" vim -b : edit binary using xxd-format!
 	augroup Binary
-	  au!
-	  au BufReadPre  *.bin let &bin=1
-	  au BufReadPost *.bin if &bin | %!xxd
-	  au BufReadPost *.bin set ft=xxd | endif
-	  au BufWritePre *.bin if &bin | %!xxd -r
-	  au BufWritePre *.bin endif
-	  au BufWritePost *.bin if &bin | %!xxd
-	  au BufWritePost *.bin set nomod | endif
+	  autocmd!
+	  autocmd BufReadPre  *.bin set binary
+	  autocmd BufReadPost *.bin
+	    \ if &binary
+	    \ |   execute "silent %!xxd -c 32"
+	    \ |   set filetype=xxd
+	    \ |   redraw
+	    \ | endif
+	  autocmd BufWritePre *.bin
+	    \ if &binary
+	    \ |   let s:view = winsaveview()
+	    \ |   execute "silent %!xxd -r -c 32"
+	    \ | endif
+	  autocmd BufWritePost *.bin
+	    \ if &binary
+	    \ |   execute "silent %!xxd -c 32"
+	    \ |   set nomodified
+	    \ |   call winrestview(s:view)
+	    \ |   redraw
+	    \ | endif
 	augroup END
 
 ==============================================================================
-- 
cgit 


From a51ab112a6fb96aef9d6e05354cfe7d2df7d8ae8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 10 Aug 2023 13:04:25 +0800
Subject: vim-patch:81b8bf5b4a33

Update the vimscript code for restoring cursor position

Using xxd(1) to filter and edit binary files causes the input files
to have dual nature, so to speak, which effectively makes restoring
the cursor position broken.  Fix that by ignoring the "xxd" file type
in the code that restores the cursor position.

Interactive rebasing in git causes files to be edited in vim, which,
similarly to commit messages, are rarely the same as the last one
edited.  Thus, also add "gitrebase" to the list of file types for
which the cursor position isn't restored.

While there, refactor the code a bit to possibly save a few CPU cycles
and to keep the line lengths in check, and use the long form of the
commands and variables, to make the code slightly more consistent and
more understandable to newcomers.

Update the relevant comments in the code and the associated parts of
the documentation, to keep them in sync with the updated code.

Remove some redundant trailing whitespace as well, as spotted.

https://github.com/vim/vim/commit/81b8bf5b4a33552c610dc2ea743ac2698a16aef7

Co-authored-by: Dragan Simic' via vim_dev <vim_dev@googlegroups.com>
---
 runtime/doc/usr_05.txt | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index 8f7e393c02..076a50c582 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -118,15 +118,27 @@ This switches on three very clever mechanisms:
 
 
 				*restore-cursor* *last-position-jump*  >
-    autocmd BufRead * autocmd FileType <buffer> ++once
-      \ if &ft !~# 'commit\|rebase' && line("'\"") > 1 && line("'\"") <= line("$") | exe 'normal! g`"' | endif
+    augroup RestoreCursor
+      autocmd!
+      autocmd BufRead * autocmd FileType <buffer> ++once
+        \ let s:line = line("'\"")
+        \ | if s:line >= 1 && s:line <= line("$") && &filetype !~# 'commit'
+        \      && index(['xxd', 'gitrebase'], &filetype) == -1
+        \ |   execute "normal! g`\""
+        \ | endif
+    augroup END
 
 Another autocommand.  This time it is used after reading any file.  The
 complicated stuff after it checks if the '" mark is defined, and jumps to it
-if so.  The backslash at the start of a line is used to continue the command
-from the previous line.  That avoids a line getting very long.
-See |line-continuation|.  This only works in a Vim script file, not when
-typing commands at the command-line.
+if so.  It doesn't do that for a commit or rebase message, which are likely
+a different one than last time, and when using xxd(1) to filter and edit
+binary files, which transforms input files back and forth, causing them to
+have dual nature, so to speak.  See also |using-xxd|.
+
+The backslash at the start of a line is used to continue the command from the
+previous line.  That avoids a line getting very long.  See |line-continuation|.
+This only works in a Vim script file, not when typing commands at the
+command line.
 
 >
 	command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
-- 
cgit 


From 3d948a4dc4b2cd3c8d3ac497caf3dfe25adfb90d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 10 Aug 2023 17:45:36 +0800
Subject: vim-patch:9.0.1683: Updated runtime files (#24638)

This is a collection of various PRs from github that all require a minor
patch number:

1) https://github.com/vim/vim/pull/12612

    Do not conflate dictionary key with end of block

2) https://github.com/vim/vim/pull/12729:

    When saving and restoring 'undolevels', the constructs `&undolevels` and
    `:set undolevels` are problematic.

    The construct `&undolevels` reads an unpredictable value; it will be the
    local option value (if one has been set), or the global option value
    (otherwise), making it unsuitable for saving a value for later
    restoration.

    Similarly, if a local option value has been set for 'undolevels',
    temporarily modifying the option via `:set undolevels` changes the local
    value as well as the global value, requiring extra work to restore both
    values.

    Saving and restoring the option value in one step via the construct
    `:let &undolevels = &undolevels` appears to make no changes to the
    'undolevels' option, but if a local option has been set to a different
    value than the global option, it has the unintended effect of changing
    the global 'undolevels' value to the local value.

    Update the documentation to explain these issues and recommend explicit
    use of global and local option values when saving and restoring.  Update
    some unit tests to use `g:undolevels`.

3) https://github.com/vim/vim/pull/12702:

    Problem:    Pip requirements files are not recognized.
    Solution:   Add a pattern to match pip requirements files.

4) https://github.com/vim/vim/pull/12688:

    Add indent file and tests for ABB Rapid

5) https://github.com/vim/vim/pull/12668:

    Use Lua 5.1 numeric escapes in tests and add to CI

    Only Lua 5.2+ and LuaJIT understand hexadecimal escapes in strings.  Lua
    5.1 only supports decimal escapes:

    > A character in a string can also be specified by its numerical value
    > using the escape sequence \ddd, where ddd is a sequence of up to three
    > decimal digits. (Note that if a numerical escape is to be followed by a
    > digit, it must be expressed using exactly three digits.) Strings in Lua
    > can contain any 8-bit value, including embedded zeros, which can be
    > specified as '\0'.

    To make sure this works with Lua 5.4 and Lua 5.1 change the Vim CI to
    run with Lua 5.1 as well as Lua 5.4

6) https://github.com/vim/vim/pull/12631:

    Add hurl filetype detection

7) https://github.com/vim/vim/pull/12573:

    Problem:   Files for haskell persistent library are not recognized
    Solution:  Add pattern persistentmodels for haskell persistent library

closes: vim/vim#12612
closes: vim/vim#12729
closes: vim/vim#12702
closes: vim/vim#12688
closes: vim/vim#12668
closes: vim/vim#12631
closes: vim/vim#12573

Already ported but wasn't marked: vim-patch:ad34abee2583

https://github.com/vim/vim/commit/6efb1980336ff324e9c57a4e282530b952fca816

Co-authored-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: lacygoill <lacygoill@lacygoill.me>
Co-authored-by: Michael Henry <drmikehenry@drmikehenry.com>
Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
Co-authored-by: KnoP-01 <knosowski@graeffrobotics.de>
Co-authored-by: James McCoy <jamessan@jamessan.com>
Co-authored-by: Jacob Pfeifer <jacob@pfeifer.dev>
Co-authored-by: Borys Lykah <lykahb@fastmail.com>
---
 runtime/doc/undo.txt            |  26 +++-
 runtime/indent/rapid.vim        | 255 ++++++++++++++++++++++++++++++++++++++
 runtime/indent/testdir/rapid.in | 266 ++++++++++++++++++++++++++++++++++++++++
 runtime/indent/testdir/rapid.ok | 266 ++++++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/filetype.lua    |   6 +-
 5 files changed, 814 insertions(+), 5 deletions(-)
 create mode 100644 runtime/indent/rapid.vim
 create mode 100644 runtime/indent/testdir/rapid.in
 create mode 100644 runtime/indent/testdir/rapid.ok

(limited to 'runtime')

diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 36b2ff9e4e..3fcc196250 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -114,7 +114,17 @@ use CTRL-G u.  This is useful if you want an insert command to be undoable in
 parts.  E.g., for each sentence.  |i_CTRL-G_u|
 
 Setting the value of 'undolevels' also closes the undo block.  Even when the
-new value is equal to the old value: >
+new value is equal to the old value.  Use `g:undolevels` to explicitly read
+and write only the global value of 'undolevels'. >
+	let &g:undolevels = &g:undolevels
+
+Note that the similar-looking assignment `let &undolevels=&undolevels` does not
+preserve the global option value of 'undolevels' in the event that the local
+option has been set to a different value.  For example: >
+	" Start with different global and local values for 'undolevels'.
+	let &g:undolevels = 1000
+	let &l:undolevels = 2000
+	" This assignment changes the global option to 2000:
 	let &undolevels = &undolevels
 
 ==============================================================================
@@ -351,12 +361,20 @@ undo is possible.  Use this if you are running out of memory.
 When you set 'undolevels' to -1 the undo information is not immediately
 cleared, this happens at the next change.  To force clearing the undo
 information you can use these commands: >
-	:let old_undolevels = &undolevels
-	:set undolevels=-1
+	:let old_undolevels = &l:undolevels
+	:setlocal undolevels=-1
 	:exe "normal a \<BS>\<Esc>"
-	:let &undolevels = old_undolevels
+	:let &l:undolevels = old_undolevels
 	:unlet old_undolevels
 
+Note use of `&l:undolevels` to explicitly read the local value of 'undolevels'
+and the use of `:setlocal` to change only the local option (which takes
+precedence over the corresponding global option value).  Saving the option value
+via the use of `&undolevels` is unpredictable; it reads either the local value
+(if one has been set) or the global value (otherwise).  Also, if a local value
+has been set, changing the option via `:set undolevels` will change both the
+global and local values, requiring extra work to save and restore both values.
+
 Marks for the buffer ('a to 'z) are also saved and restored, together with the
 text.
 
diff --git a/runtime/indent/rapid.vim b/runtime/indent/rapid.vim
new file mode 100644
index 0000000000..f97ebf84db
--- /dev/null
+++ b/runtime/indent/rapid.vim
@@ -0,0 +1,255 @@
+" ABB Rapid Command indent file for Vim
+" Language: ABB Rapid Command
+" Maintainer: Patrick Meiser-Knosowski <knosowski@graeffrobotics.de>
+" Version: 2.2.7
+" Last Change: 12. May 2023
+" Credits: Based on indent/vim.vim
+"
+" Suggestions of improvement are very welcome. Please email me!
+"
+" Known bugs: ../doc/rapid.txt
+"
+" TODO
+" * indent wrapped lines which do not end with an ; or special key word,
+"     maybe this is a better idea, but then () and [] has to be changed as
+"     well
+"
+
+if exists("g:rapidNoSpaceIndent")
+  if !exists("g:rapidSpaceIndent")
+    let g:rapidSpaceIndent = !g:rapidNoSpaceIndent
+  endif
+  unlet g:rapidNoSpaceIndent
+endif
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent") || get(g:,'rapidNoIndent',0)
+  finish
+endif
+let b:did_indent = 1
+
+setlocal nolisp
+setlocal nosmartindent
+setlocal autoindent
+setlocal indentexpr=GetRapidIndent()
+if get(g:,'rapidNewStyleIndent',0)
+  setlocal indentkeys=!^F,o,O,0=~endmodule,0=~error,0=~undo,0=~backward,0=~endproc,0=~endrecord,0=~endtrap,0=~endfunc,0=~else,0=~endif,0=~endtest,0=~endfor,0=~endwhile,:,<[>,<]>,<(>,<)>
+else
+  setlocal indentkeys=!^F,o,O,0=~endmodule,0=~error,0=~undo,0=~backward,0=~endproc,0=~endrecord,0=~endtrap,0=~endfunc,0=~else,0=~endif,0=~endtest,0=~endfor,0=~endwhile,:
+endif
+let b:undo_indent="setlocal lisp< si< ai< inde< indk<"
+
+if get(g:,'rapidSpaceIndent',1)
+  " Use spaces for indention, 2 is enough. 
+  " More or even tabs wastes space on the teach pendant.
+  setlocal softtabstop=2
+  setlocal shiftwidth=2
+  setlocal expandtab
+  setlocal shiftround
+  let b:undo_indent = b:undo_indent." sts< sw< et< sr<"
+endif
+
+" Only define the function once.
+if exists("*GetRapidIndent")
+  finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+function GetRapidIndent()
+  let ignorecase_save = &ignorecase
+  try
+    let &ignorecase = 0
+    return s:GetRapidIndentIntern()
+  finally
+    let &ignorecase = ignorecase_save
+  endtry
+endfunction
+
+function s:GetRapidIndentIntern() abort
+
+  let l:currentLineNum = v:lnum
+  let l:currentLine = getline(l:currentLineNum)
+
+  if  l:currentLine =~ '^!' && !get(g:,'rapidCommentIndent',0)
+    " If current line is ! line comment, do not change indent
+    " This may be usefull if code is commented out at the first column.
+    return 0
+  endif
+
+  " Find a non-blank line above the current line.
+  let l:preNoneBlankLineNum = s:RapidPreNoneBlank(v:lnum - 1)
+  if  l:preNoneBlankLineNum == 0
+    " At the start of the file use zero indent.
+    return 0
+  endif
+
+  let l:preNoneBlankLine = getline(l:preNoneBlankLineNum)
+  let l:ind = indent(l:preNoneBlankLineNum)
+
+  " Define add a 'shiftwidth' pattern
+  let l:addShiftwidthPattern  = '\c\v^\s*('
+  let l:addShiftwidthPattern .=           '((local|task)\s+)?(module|record|proc|func|trap)\s+\k'
+  let l:addShiftwidthPattern .=           '|(backward|error|undo)>'
+  let l:addShiftwidthPattern .=         ')'
+  "
+  " Define Subtract 'shiftwidth' pattern
+  let l:subtractShiftwidthPattern  = '\c\v^\s*('
+  let l:subtractShiftwidthPattern .=           'end(module|record|proc|func|trap)>'
+  let l:subtractShiftwidthPattern .=           '|(backward|error|undo)>'
+  let l:subtractShiftwidthPattern .=         ')'
+
+  " Add shiftwidth
+  if l:preNoneBlankLine =~ l:addShiftwidthPattern
+        \|| s:RapidLenTilStr(l:preNoneBlankLineNum, "then",     0)>=0
+        \|| s:RapidLenTilStr(l:preNoneBlankLineNum, "else",     0)>=0
+        \|| s:RapidLenTilStr(l:preNoneBlankLineNum, "do",       0)>=0
+        \|| s:RapidLenTilStr(l:preNoneBlankLineNum, "case",     0)>=0
+        \|| s:RapidLenTilStr(l:preNoneBlankLineNum, "default",  0)>=0
+    let l:ind += &sw
+  endif
+
+  " Subtract shiftwidth
+  if l:currentLine =~ l:subtractShiftwidthPattern
+        \|| s:RapidLenTilStr(l:currentLineNum, "endif",     0)>=0
+        \|| s:RapidLenTilStr(l:currentLineNum, "endfor",    0)>=0
+        \|| s:RapidLenTilStr(l:currentLineNum, "endwhile",  0)>=0
+        \|| s:RapidLenTilStr(l:currentLineNum, "endtest",   0)>=0
+        \|| s:RapidLenTilStr(l:currentLineNum, "else",      0)>=0
+        \|| s:RapidLenTilStr(l:currentLineNum, "elseif",    0)>=0
+        \|| s:RapidLenTilStr(l:currentLineNum, "case",      0)>=0
+        \|| s:RapidLenTilStr(l:currentLineNum, "default",   0)>=0
+    let l:ind = l:ind - &sw
+  endif
+
+  " First case (or default) after a test gets the indent of the test.
+  if (s:RapidLenTilStr(l:currentLineNum, "case", 0)>=0 || s:RapidLenTilStr(l:currentLineNum, "default", 0)>=0) && s:RapidLenTilStr(l:preNoneBlankLineNum, "test", 0)>=0
+    let l:ind += &sw
+  endif
+
+  " continued lines with () or []
+  let l:OpenSum  = s:RapidLoneParen(l:preNoneBlankLineNum,"(") + s:RapidLoneParen(l:preNoneBlankLineNum,"[")
+  if get(g:,'rapidNewStyleIndent',0)
+    let l:CloseSum = s:RapidLoneParen(l:preNoneBlankLineNum,")") + s:RapidLoneParen(l:currentLineNum,"]")
+  else
+    let l:CloseSum = s:RapidLoneParen(l:preNoneBlankLineNum,")") + s:RapidLoneParen(l:preNoneBlankLineNum,"]")
+  endif
+  if l:OpenSum > l:CloseSum
+    let l:ind += (l:OpenSum * 4 * &sw)
+  elseif l:OpenSum < l:CloseSum
+    let l:ind -= (l:CloseSum * 4 * &sw)
+  endif
+
+  return l:ind
+endfunction
+
+" Returns the length of the line until a:str occur outside a string or
+" comment. Search starts at string index a:startIdx.
+" If a:str is a word also add word bounderies and case insesitivity.
+" Note: rapidTodoComment and rapidDebugComment are not taken into account.
+function s:RapidLenTilStr(lnum, str, startIdx) abort
+
+  let l:line = getline(a:lnum)
+  let l:len  = strlen(l:line)
+  let l:idx  = a:startIdx
+  let l:str  = a:str
+  if l:str =~ '^\k\+$'
+    let l:str = '\c\<' . l:str . '\>'
+  endif
+
+  while l:len > l:idx
+    let l:idx = match(l:line, l:str, l:idx)
+    if l:idx < 0
+      " a:str not found
+      return -1
+    endif
+    let l:synName = synIDattr(synID(a:lnum,l:idx+1,0),"name")
+    if         l:synName != "rapidString"
+          \&&  l:synName != "rapidConcealableString"
+          \&& (l:synName != "rapidComment" || l:str =~ '^!')
+      " a:str found outside string or line comment
+      return l:idx
+    endif
+    " a:str is part of string or line comment
+    let l:idx += 1 " continue search for a:str
+  endwhile
+  
+  " a:str not found or l:len <= a:startIdx
+  return -1
+endfunction
+
+" a:lchar shoud be one of (, ), [, ], { or }
+" returns the number of opening/closing parenthesise which have no
+" closing/opening match in getline(a:lnum)
+function s:RapidLoneParen(lnum,lchar) abort
+  if a:lchar == "(" || a:lchar == ")"
+    let l:opnParChar = "("
+    let l:clsParChar = ")"
+  elseif a:lchar == "[" || a:lchar == "]"
+    let l:opnParChar = "["
+    let l:clsParChar = "]"
+  elseif a:lchar == "{" || a:lchar == "}"
+    let l:opnParChar = "{"
+    let l:clsParChar = "}"
+  else
+    return 0
+  endif
+
+  let l:line = getline(a:lnum)
+
+  " look for the first ! which is not part of a string 
+  let l:len = s:RapidLenTilStr(a:lnum,"!",0)
+  if l:len == 0
+    return 0 " first char is !; ignored
+  endif
+
+  let l:opnParen = 0
+  " count opening brakets
+  let l:i = 0
+  while l:i >= 0
+    let l:i = s:RapidLenTilStr(a:lnum, l:opnParChar, l:i)
+    if l:i >= 0
+      let l:opnParen += 1
+      let l:i += 1
+    endif
+  endwhile
+
+  let l:clsParen = 0
+  " count closing brakets
+  let l:i = 0
+  while l:i >= 0
+    let l:i = s:RapidLenTilStr(a:lnum, l:clsParChar, l:i)
+    if l:i >= 0
+      let l:clsParen += 1
+      let l:i += 1
+    endif
+  endwhile
+
+  if (a:lchar == "(" || a:lchar == "[" || a:lchar == "{") && l:opnParen>l:clsParen
+    return (l:opnParen-l:clsParen)
+  elseif (a:lchar == ")" || a:lchar == "]" || a:lchar == "}") && l:clsParen>l:opnParen
+    return (l:clsParen-l:opnParen)
+  endif
+
+  return 0
+endfunction
+
+" This function works almost like prevnonblank() but handles %%%-headers and
+" comments like blank lines
+function s:RapidPreNoneBlank(lnum) abort
+
+  let nPreNoneBlank = prevnonblank(a:lnum)
+
+  while nPreNoneBlank>0 && getline(nPreNoneBlank) =~ '\v\c^\s*(\%\%\%|!)'
+    " Previouse none blank line irrelevant. Look further aback.
+    let nPreNoneBlank = prevnonblank(nPreNoneBlank - 1)
+  endwhile
+
+  return nPreNoneBlank
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:sw=2 sts=2 et
diff --git a/runtime/indent/testdir/rapid.in b/runtime/indent/testdir/rapid.in
new file mode 100644
index 0000000000..515912ed89
--- /dev/null
+++ b/runtime/indent/testdir/rapid.in
@@ -0,0 +1,266 @@
+! vim: set ft=rapid :
+
+! START_INDENT
+
+%%%
+  VERSION:1
+  LANGUAGE:ENGLISH
+%%%
+  
+module LowerCaseModule
+
+task pers num n1 := 0;
+local pers num n2 := 1;
+var bool b1 := false;
+var intnum i1;
+
+! put some stuff in those strings that may confuse indentation
+const string st1 := "endmodule ("; 
+pers string st_Appl_Info{3,3}:=[
+[
+"["
+,
+"default"
+,
+"case"
+],
+[
+"else"
+,
+"then"
+,
+"endif"
+],
+[
+"do"
+,
+"}"
+,
+")"
+],
+];
+
+pers tooldata tTool1:=[TRUE, 
+[
+[97.4, 0, 223.1], 
+[0.924, 0, 0.383 ,0]
+], 
+[5, 
+[23, 0, 75], 
+[1, 0, 0, 0], 0, 0, 0
+]
+];
+const robtarget p1:=[ 
+[600, 500, 225.3], 
+[1, 0, 0, 0], 
+[1, 1, 0, 0], 
+[ 11, 12.3, 9E9, 9E9, 9E9, 9E9]
+];
+
+record myRec
+num nRecNum1
+bool bRecBool1
+endrecord
+
+proc proc1(num n1,
+num n2)
+var string st1;
+n1 := n1+1;
+MoveJSync p1, vmax, z30, tool1, "proc2";
+backward
+MoveJSync p1, v100, fine, tool1, "proc2";
+undo
+n1 := n1-1;
+error
+trynext;
+endproc
+
+func num nFunc1(
+switch s1
+|switch s2
+,num n1
+,bool b1)
+var num nVar;
+if not Present(s1) return;
+if Present(s1) then
+Incr n1;'
+elseif Present(s2) then
+b1:=false;
+else
+while n1>0 do
+Decr n1;
+test n1
+
+case 1:
+test1;
+case 2:
+test2;
+default:
+WaitUntil false;
+endtest
+endwhile
+endif
+for i from 1 to 10 step 2 do
+for j from 1 to 10 do
+st_Appl_Info{i,j} := "";
+endfor
+endfor
+!     return 1;
+return 0;
+error
+return -1;
+endfunc
+
+trap Trap1
+Reset do1;
+endtrap
+
+endmodule
+
+MODULE UpperCaseModule(SYSMODULE,NOSTEPIN)
+TASK pers num n1 := 0;
+LOCAL pers num n2 := 1;
+VAR bool b1 := false;
+VAR intnum i1;
+
+LOCAL FUNC num nFunc1(
+switch s1
+|switch s2
+,num n1
+,bool b1)
+VAR num nVar;
+IF NOT PRESENT(s1) RETURN;
+IF PRESENT(s1) THEN
+INCR n1;'
+ELSEIF PRESENT(s2) THEN
+b1:=FALSE;
+ELSE
+WHILE n1>0 DO
+DECR n1;
+TEST n1
+
+CASE 1:
+test1;
+CASE 2:
+test2;
+DEFAULT:
+WAITUNTIL FALSE;
+ENDTEST
+ENDWHILE
+ENDIF
+FOR i FROM 1 TO 10 STEP 2 DO
+FOR j FROM 1 TO 10 DO
+st_Appl_Info{i,j} := "";
+ENDFOR
+ENDFOR
+!     RETURN 1;
+RETURN 0;
+ERROR
+RETURN -1;
+ENDFUNC
+
+TRAP Trap1
+Reset do1;
+ENDTRAP
+
+ENDMODULE
+
+Module MixedCaseModule(SysModule)
+Task pers num n1 := 0;
+Local pers num n2 := 1;
+Var bool b1 := false;
+Var intnum i1;
+
+Task Func num nFunc1(
+switch s1
+|switch s2
+,num n1
+,bool b1)
+Var num nVar;
+If Not Present(s1) Return;
+If Present(s1) Then
+Incr n1;'
+ElseIf Present(s2) Then
+b1:=false;
+Else
+While n1>0 Do
+Decr n1;
+Test n1
+
+Case 1:
+test1;
+Case 2:
+test2;
+Default:
+WaitUntil false;
+EndTest
+EndWhile
+EndIf
+For i From 1 To 10 Step 2 Do
+For j From 1 To 10 Do
+st_Appl_Info{i,j} := "";
+EndFor
+EndFor
+!     Return 1;
+Return 0;
+Error
+Return -1;
+EndFunc
+
+Trap Trap1
+Reset do1;
+EndTrap
+
+EndModule
+
+! END_INDENT
+
+! START_INDENT
+! INDENT_EXE let g:rapidSpaceIndent = 0
+! INDENT_EXE set shiftwidth=4
+
+proc bla()
+var num i;
+Incr i;
+endproc
+
+! END_INDENT
+
+! START_INDENT
+! INDENT_EXE let g:rapidCommentIndent = 1
+!
+proc bla()
+! indent this first column comment because of g:rapidCommentIndent=1
+endproc
+! END_INDENT
+
+! START_INDENT
+! INDENT_EXE let g:rapidNewStyleIndent = 1
+pers string st_Appl_Info{3,3}:=
+[
+[
+"["
+,
+"default"
+,
+"case"
+]
+,
+[
+"else"
+,
+"then"
+,
+"endif"
+]
+,
+[
+"do"
+,
+"}"
+,
+")"
+]
+,
+];
+! END_INDENT
diff --git a/runtime/indent/testdir/rapid.ok b/runtime/indent/testdir/rapid.ok
new file mode 100644
index 0000000000..ce336821c4
--- /dev/null
+++ b/runtime/indent/testdir/rapid.ok
@@ -0,0 +1,266 @@
+! vim: set ft=rapid :
+
+! START_INDENT
+
+%%%
+VERSION:1
+LANGUAGE:ENGLISH
+%%%
+
+module LowerCaseModule
+
+  task pers num n1 := 0;
+  local pers num n2 := 1;
+  var bool b1 := false;
+  var intnum i1;
+
+! put some stuff in those strings that may confuse indentation
+  const string st1 := "endmodule ("; 
+  pers string st_Appl_Info{3,3}:=[
+          [
+                  "["
+                  ,
+                  "default"
+                  ,
+                  "case"
+                  ],
+          [
+                  "else"
+                  ,
+                  "then"
+                  ,
+                  "endif"
+                  ],
+          [
+                  "do"
+                  ,
+                  "}"
+                  ,
+                  ")"
+                  ],
+          ];
+
+  pers tooldata tTool1:=[TRUE, 
+          [
+                  [97.4, 0, 223.1], 
+                  [0.924, 0, 0.383 ,0]
+                  ], 
+          [5, 
+                  [23, 0, 75], 
+                  [1, 0, 0, 0], 0, 0, 0
+                  ]
+          ];
+  const robtarget p1:=[ 
+          [600, 500, 225.3], 
+          [1, 0, 0, 0], 
+          [1, 1, 0, 0], 
+          [ 11, 12.3, 9E9, 9E9, 9E9, 9E9]
+          ];
+
+  record myRec
+    num nRecNum1
+    bool bRecBool1
+  endrecord
+
+  proc proc1(num n1,
+            num n2)
+    var string st1;
+    n1 := n1+1;
+    MoveJSync p1, vmax, z30, tool1, "proc2";
+  backward
+    MoveJSync p1, v100, fine, tool1, "proc2";
+  undo
+    n1 := n1-1;
+  error
+    trynext;
+  endproc
+
+  func num nFunc1(
+            switch s1
+            |switch s2
+            ,num n1
+            ,bool b1)
+    var num nVar;
+    if not Present(s1) return;
+    if Present(s1) then
+      Incr n1;'
+    elseif Present(s2) then
+      b1:=false;
+    else
+      while n1>0 do
+        Decr n1;
+        test n1
+
+        case 1:
+          test1;
+        case 2:
+          test2;
+        default:
+          WaitUntil false;
+        endtest
+      endwhile
+    endif
+    for i from 1 to 10 step 2 do
+      for j from 1 to 10 do
+        st_Appl_Info{i,j} := "";
+      endfor
+    endfor
+!     return 1;
+    return 0;
+  error
+    return -1;
+  endfunc
+
+  trap Trap1
+    Reset do1;
+  endtrap
+
+endmodule
+
+MODULE UpperCaseModule(SYSMODULE,NOSTEPIN)
+  TASK pers num n1 := 0;
+  LOCAL pers num n2 := 1;
+  VAR bool b1 := false;
+  VAR intnum i1;
+
+  LOCAL FUNC num nFunc1(
+            switch s1
+            |switch s2
+            ,num n1
+            ,bool b1)
+    VAR num nVar;
+    IF NOT PRESENT(s1) RETURN;
+    IF PRESENT(s1) THEN
+      INCR n1;'
+    ELSEIF PRESENT(s2) THEN
+      b1:=FALSE;
+    ELSE
+      WHILE n1>0 DO
+        DECR n1;
+        TEST n1
+
+        CASE 1:
+          test1;
+        CASE 2:
+          test2;
+        DEFAULT:
+          WAITUNTIL FALSE;
+        ENDTEST
+      ENDWHILE
+    ENDIF
+    FOR i FROM 1 TO 10 STEP 2 DO
+      FOR j FROM 1 TO 10 DO
+        st_Appl_Info{i,j} := "";
+      ENDFOR
+    ENDFOR
+!     RETURN 1;
+    RETURN 0;
+  ERROR
+    RETURN -1;
+  ENDFUNC
+
+  TRAP Trap1
+    Reset do1;
+  ENDTRAP
+
+ENDMODULE
+
+Module MixedCaseModule(SysModule)
+  Task pers num n1 := 0;
+  Local pers num n2 := 1;
+  Var bool b1 := false;
+  Var intnum i1;
+
+  Task Func num nFunc1(
+            switch s1
+            |switch s2
+            ,num n1
+            ,bool b1)
+    Var num nVar;
+    If Not Present(s1) Return;
+    If Present(s1) Then
+      Incr n1;'
+    ElseIf Present(s2) Then
+      b1:=false;
+    Else
+      While n1>0 Do
+        Decr n1;
+        Test n1
+
+        Case 1:
+          test1;
+        Case 2:
+          test2;
+        Default:
+          WaitUntil false;
+        EndTest
+      EndWhile
+    EndIf
+    For i From 1 To 10 Step 2 Do
+      For j From 1 To 10 Do
+        st_Appl_Info{i,j} := "";
+      EndFor
+    EndFor
+!     Return 1;
+    Return 0;
+  Error
+    Return -1;
+  EndFunc
+
+  Trap Trap1
+    Reset do1;
+  EndTrap
+
+EndModule
+
+! END_INDENT
+
+! START_INDENT
+! INDENT_EXE let g:rapidSpaceIndent = 0
+! INDENT_EXE set shiftwidth=4
+
+proc bla()
+    var num i;
+    Incr i;
+endproc
+
+! END_INDENT
+
+! START_INDENT
+! INDENT_EXE let g:rapidCommentIndent = 1
+!
+proc bla()
+    ! indent this first column comment because of g:rapidCommentIndent=1
+endproc
+! END_INDENT
+
+! START_INDENT
+! INDENT_EXE let g:rapidNewStyleIndent = 1
+pers string st_Appl_Info{3,3}:=
+[
+                [
+                                "["
+                                ,
+                                "default"
+                                ,
+                                "case"
+                ]
+                ,
+                [
+                                "else"
+                                ,
+                                "then"
+                                ,
+                                "endif"
+                ]
+                ,
+                [
+                                "do"
+                                ,
+                                "}"
+                                ,
+                                ")"
+                ]
+                ,
+];
+! END_INDENT
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 1bbe88f06d..1ea88ebc06 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -479,15 +479,16 @@ local extension = {
   hsig = 'haskell',
   hsc = 'haskell',
   hs = 'haskell',
+  persistentmodels = 'haskellpersistent',
   ht = 'haste',
   htpp = 'hastepreproc',
+  hcl = 'hcl',
   hb = 'hb',
   h = detect.header,
   sum = 'hercules',
   errsum = 'hercules',
   ev = 'hercules',
   vc = 'hercules',
-  hcl = 'hcl',
   heex = 'heex',
   hex = 'hex',
   ['h32'] = 'hex',
@@ -506,6 +507,7 @@ local extension = {
   stm = detect.html,
   htt = 'httest',
   htb = 'httest',
+  hurl = 'hurl',
   hw = detect.hw,
   module = detect.hw,
   pkg = detect.hw,
@@ -818,6 +820,7 @@ local extension = {
   rego = 'rego',
   rem = 'remind',
   remind = 'remind',
+  pip = 'requirements',
   res = 'rescript',
   resi = 'rescript',
   frt = 'reva',
@@ -1419,6 +1422,7 @@ local filename = {
   inputrc = 'readline',
   ['.inputrc'] = 'readline',
   ['.reminders'] = 'remind',
+  ['requirements.txt'] = 'requirements',
   ['resolv.conf'] = 'resolv',
   ['robots.txt'] = 'robots',
   Gemfile = 'ruby',
-- 
cgit 


From 3fb372eba48796b5d0a7758f91e168be8e70e183 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 10 Aug 2023 09:53:56 -0500
Subject: Use Lua autocommand and make TermClose autocommand global

---
 runtime/doc/news.txt        |  4 ++++
 runtime/doc/various.txt     |  4 ++++
 runtime/doc/vim_diff.txt    |  2 ++
 runtime/lua/vim/_editor.lua | 17 +++++++++++++++--
 4 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 713569e1ad..179cdfef25 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -181,6 +181,10 @@ The following changes to existing APIs or features add new behavior.
   supports it, unless |'keywordprg'| was customized before calling
   |vim.lsp.start()|.
 
+• Terminal buffers started with no arguments (and use 'shell') close
+  automatically if the job exited without error, eliminating the (often
+  unwanted) "[Process exited 0]" message.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 52e8f4d86c..33f57580c7 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -249,6 +249,10 @@ gx			Opens the current filepath or URL (decided by
 			Fails if changes have been made to the current buffer,
 			unless 'hidden' is set.
 
+			If {cmd} is omitted, and the 'shell' job exits with no
+			error, the buffer is closed automatically
+			|default-autocmds|.
+
 			To enter |Terminal-mode| automatically: >
 			      autocmd TermOpen * startinsert
 <
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 15bb13d5a9..07b4572a27 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -133,6 +133,8 @@ remove them and ":autocmd {group}" to see how they're defined.
 
 nvim_terminal:
 - BufReadCmd: Treats "term://" buffers as |terminal| buffers. |terminal-start|
+- TermClose: A |terminal| buffer started with no arguments (which thus uses
+  'shell') and which exits with no error is closed automatically.
 
 nvim_cmdwin:
 - CmdwinEnter: Limits syntax sync to maxlines=1 in the |cmdwin|.
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 58fbc923e1..8c10cc7da3 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -1107,13 +1107,26 @@ end
 
 function vim._init_default_autocmds()
   local nvim_terminal_augroup = vim.api.nvim_create_augroup('nvim_terminal', {})
-  vim.api.nvim_create_autocmd({ 'bufreadcmd' }, {
+  vim.api.nvim_create_autocmd({ 'BufReadCmd' }, {
     pattern = 'term://*',
     group = nvim_terminal_augroup,
     nested = true,
     command = "if !exists('b:term_title')|call termopen(matchstr(expand(\"<amatch>\"), '\\c\\mterm://\\%(.\\{-}//\\%(\\d\\+:\\)\\?\\)\\?\\zs.*'), {'cwd': expand(get(matchlist(expand(\"<amatch>\"), '\\c\\mterm://\\(.\\{-}\\)//'), 1, ''))})",
   })
-  vim.api.nvim_create_autocmd({ 'cmdwinenter' }, {
+  vim.api.nvim_create_autocmd({ 'TermClose' }, {
+    group = nvim_terminal_augroup,
+    desc = 'Automatically close terminal buffers when started with no arguments and exiting without an error',
+    callback = function(args)
+      if vim.v.event.status == 0 then
+        local info = vim.api.nvim_get_chan_info(vim.bo[args.buf].channel)
+        local argv = info.argv or {}
+        if #argv == 1 and argv[1] == vim.o.shell then
+          vim.cmd({ cmd = 'bdelete', args = { args.buf }, bang = true })
+        end
+      end
+    end,
+  })
+  vim.api.nvim_create_autocmd({ 'CmdwinEnter' }, {
     pattern = '[:>]',
     group = vim.api.nvim_create_augroup('nvim_cmdwin', {}),
     command = 'syntax sync minlines=1 maxlines=1',
-- 
cgit 


From 72e64a1afef0df1bd244bfb31dfc8619d91ff709 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Fri, 11 Aug 2023 20:20:05 +0800
Subject: fix(lsp): extra "." when completing with tsserver #24646

Problem:
With tsserver LSP, omni completion after "." inserts an extra "."

Solution:
Apply adjust_start_col() regardless of `filterText`.
adjust_start_col() is explained here:
https://github.com/neovim/neovim/blob/0ea8dfeb3dc347579753169d9e3588f6306ab703/runtime/lua/vim/lsp.lua#L2334-L2351

The `filterText` field is used in the following situations rather than as
a condition for obtaining column values:
1. Real-time filtering: When the user types characters in the editor, the
   language server can use the filterText field to filter the list of
   suggestions and only return suggestions that match the typed characters. This
   helps to provide more precise recommendations.
2. Fuzzy matching: The filterText field can be used to perform fuzzy matching,
   allowing matching in the middle or beginning of input characters, not limited
   to prefix matching. This can provide a more flexible code completion
   experience.

Inspecting usage of `filtertext` in vim-lsp and coc and lsp-mode:
- vim-lsp uses a `refresh_pattern` to judge filterText as completionitem word
  (although I think this is not the correct usage).
- coc uses it for filtering.

Fix #22803
---
 runtime/lua/vim/lsp.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 0c4290d067..2a16bafbfc 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -2262,7 +2262,7 @@ end
 local function adjust_start_col(lnum, line, items, encoding)
   local min_start_char = nil
   for _, item in pairs(items) do
-    if item.filterText == nil and item.textEdit and item.textEdit.range.start.line == lnum - 1 then
+    if item.textEdit and item.textEdit.range.start.line == lnum - 1 then
       if min_start_char and min_start_char ~= item.textEdit.range.start.character then
         return nil
       end
-- 
cgit 


From 31c4ed26bc278282898123ad21bb6fead401fd6f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 11 Aug 2023 17:05:17 +0200
Subject: feat(treesitter): add injection language fallback (#24659)

* feat(treesitter): add injection language fallback

Problem: injection languages are often specified via aliases (e.g.,
filetype or in upper case), requiring custom directives.

Solution: include lookup logic (try as parser name, then filetype, then
lowercase) in LanguageTree itself and remove `#inject-language`
directive.

Co-authored-by: Lewis Russell <me@lewisr.dev>
---
 runtime/doc/news.txt                        | 18 ++++++++++--------
 runtime/doc/treesitter.txt                  | 14 +-------------
 runtime/lua/vim/treesitter/languagetree.lua | 27 +++++++++++++++++++++++++--
 runtime/lua/vim/treesitter/query.lua        | 27 ---------------------------
 runtime/queries/markdown/injections.scm     |  5 ++---
 5 files changed, 38 insertions(+), 53 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 713569e1ad..a1981d5b7f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -77,15 +77,9 @@ The following new APIs and features were added.
 
 • Added |vim.keycode()| for translating keycodes in a string.
 
-• Added |vim.treesitter.query.omnifunc()| for treesitter query files (set by
-  default).
-
 • |'smoothscroll'| option to scroll by screen line rather than by text line
   when |'wrap'| is set.
 
-• |Query:iter_matches()| now has the ability to set the maximum start depth
-  for matches.
-
 • Added inline virtual text support to |nvim_buf_set_extmark()|.
 
 • The terminal buffer now supports reflow (wrapped lines adapt when the buffer
@@ -120,8 +114,16 @@ The following new APIs and features were added.
     `client.supports_method(<method>)`. It considers both the dynamic
     capabilities and static `server_capabilities`.
 
-• Bundled treesitter parser and queries (highlight, folds) for Markdown,
-  Python, and Bash.
+• Treesitter
+  • Bundled parsers and queries (highlight, folds) for Markdown, Python, and
+    Bash.
+  • Added |vim.treesitter.query.omnifunc()| for treesitter query files (set by
+    default).
+  • |Query:iter_matches()| now has the ability to set the maximum start depth
+    for matches.
+  • `@injection.language` now has smarter resolution and will now fallback to language aliases and/or attempt lower case variants of the text.
+    language via aliases (e.g., filetype) registered via
+    `vim.treesitter.language.register`.
 
 • |vim.ui.open()| opens URIs using the system default handler (macOS `open`,
   Windows `explorer`, Linux `xdg-open`, etc.)
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 7c7be5f214..13c0bd024a 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -311,19 +311,7 @@ The following directives are built in:
             {capture_id}
 
         Example: >query
-            (#inject-language! @_lang)
-<
-    `inject-language!`                    *treesitter-directive-inject-language!*
-        Set the injection language from the node text, interpreted first as a
-        language name, then (if a parser is not found) a filetype. Custom
-        aliases can be added via |vim.treesitter.language.register()|. This
-        will set a new `metadata[capture_id]['injection.language']`.
-
-        Parameters: ~
-            {capture_id}
-
-        Example: >query
-            (#inject-language! @_lang)
+            (#trim! @fold)
 <
 Further directives can be added via |vim.treesitter.query.add_directive()|.
 Use |vim.treesitter.query.list_directives()| to list all available directives.
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 4b2628609a..7f1d6d1111 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -635,6 +635,29 @@ local function add_injection(t, tree_index, pattern, lang, combined, ranges)
   table.insert(t[tree_index][lang][pattern].regions, ranges)
 end
 
+-- TODO(clason): replace by refactored `ts.has_parser` API (without registering)
+---@param lang string parser name
+---@return boolean # true if parser for {lang} exists on rtp
+local has_parser = function(lang)
+  return vim._ts_has_language(lang)
+    or #vim.api.nvim_get_runtime_file('parser/' .. lang .. '.*', false) > 0
+end
+
+--- Return parser name for language (if exists) or filetype (if registered and exists)
+---
+---@param alias string language or filetype name
+---@return string? # resolved parser name
+local function resolve_lang(alias)
+  if has_parser(alias) then
+    return alias
+  end
+
+  local lang = vim.treesitter.language.get_lang(alias)
+  if lang and has_parser(lang) then
+    return lang
+  end
+end
+
 ---@private
 --- Extract injections according to:
 --- https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection
@@ -649,10 +672,10 @@ function LanguageTree:_get_injection(match, metadata)
 
   for id, node in pairs(match) do
     local name = self._injection_query.captures[id]
-
     -- Lang should override any other language tag
     if name == 'injection.language' then
-      lang = vim.treesitter.get_node_text(node, self._source, { metadata = metadata[id] })
+      local text = vim.treesitter.get_node_text(node, self._source, { metadata = metadata[id] })
+      lang = resolve_lang(text) or resolve_lang(text:lower())
     elseif name == 'injection.content' then
       ranges = get_node_ranges(node, self._source, metadata[id], include_children)
     end
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 3b7e74c0cf..c3213e0192 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -541,33 +541,6 @@ local directive_handlers = {
       metadata.range = { start_row, start_col, end_row, end_col }
     end
   end,
-  -- Set injection language from node text, interpreted first as language and then as filetype
-  -- Example: (#inject-language! @_lang)
-  ['inject-language!'] = function(match, _, bufnr, pred, metadata)
-    local id = pred[2]
-    local node = match[id]
-    if not node then
-      return
-    end
-
-    -- TODO(clason): replace by refactored `ts.has_parser` API
-    local has_parser = function(lang)
-      return vim._ts_has_language(lang)
-        or #vim.api.nvim_get_runtime_file('parser/' .. lang .. '.*', false) > 0
-    end
-
-    local alias = vim.treesitter.get_node_text(node, bufnr, { metadata = metadata[id] })
-    if not alias then
-      return
-    elseif has_parser(alias) then
-      metadata['injection.language'] = alias
-    else
-      local lang = vim.treesitter.language.get_lang(alias)
-      if lang and has_parser(lang) then
-        metadata['injection.language'] = lang
-      end
-    end
-  end,
 }
 
 --- Adds a new predicate to be used in queries
diff --git a/runtime/queries/markdown/injections.scm b/runtime/queries/markdown/injections.scm
index 0bead6f4ac..fda7036830 100644
--- a/runtime/queries/markdown/injections.scm
+++ b/runtime/queries/markdown/injections.scm
@@ -1,8 +1,7 @@
 (fenced_code_block
   (info_string
-    (language) @_lang)
-  (code_fence_content) @injection.content
-  (#inject-language! @_lang))
+    (language) @injection.language)
+  (code_fence_content) @injection.content)
 
 ((html_block) @injection.content 
  (#set! injection.language "html")
-- 
cgit 


From 35c8ad1c801ae4c106fe7d727dc027e1bfad49e7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 11 Aug 2023 19:54:22 +0200
Subject: vim-patch:dd0ad2598898

Update syntax/dosini.vim to the latest version (vim/vim#12764)

The latest version is in https://github.com/xuhdev/syntax-dosini.vim/blob/master/syntax/dosini.vim. I've sent the file to Bram at the end of June, unfortunately it wasn't able to make into the Vim repository. RIP!

https://github.com/vim/vim/commit/dd0ad2598898c2b4641c4acd5b70b6184fa698ed

Co-authored-by: Hong Xu <hong@topbug.net>
---
 runtime/syntax/dosini.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/dosini.vim b/runtime/syntax/dosini.vim
index cf42819bcd..751a12f4b2 100644
--- a/runtime/syntax/dosini.vim
+++ b/runtime/syntax/dosini.vim
@@ -1,12 +1,12 @@
 " Vim syntax file
 " Language:               Configuration File (ini file) for MSDOS/MS Windows
-" Version:                2.2
+" Version:                2.3
 " Original Author:        Sean M. McKee <mckee@misslink.net>
 " Previous Maintainer:    Nima Talebi <nima@it.net.au>
 " Current Maintainer:     Hong Xu <hong@topbug.net>
 " Homepage:               http://www.vim.org/scripts/script.php?script_id=3747
 " Repository:             https://github.com/xuhdev/syntax-dosini.vim
-" Last Change:            2018 Sep 11
+" Last Change:            2023 Jun 27
 
 
 " quit when a syntax file was already loaded
@@ -24,6 +24,8 @@ syn match  dosiniNumber   "=\zs\s*\d*\.\d\+\s*$"
 syn match  dosiniNumber   "=\zs\s*\d\+e[+-]\=\d\+\s*$"
 syn region dosiniHeader   start="^\s*\[" end="\]"
 syn match  dosiniComment  "^[#;].*$"
+syn region dosiniSection  start="\s*\[.*\]" end="\ze\s*\[.*\]" fold
+      \ contains=dosiniLabel,dosiniValue,dosiniNumber,dosiniHeader,dosiniComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-- 
cgit 


From 278805dfacc865c594c383f6f1fb7eeaf307aa15 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 11 Aug 2023 19:55:10 +0200
Subject: vim-patch:21aaff3faa82

Update my name and email in runtime files (vim/vim#12763)

https://github.com/vim/vim/commit/21aaff3faa828c5c2677a0a9f1b90a0b780d57f6

Co-authored-by: Lily Ballard <lily@ballards.net>
---
 runtime/autoload/rust.vim | 2 +-
 runtime/ftplugin/rust.vim | 2 +-
 runtime/ftplugin/toml.vim | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/rust.vim b/runtime/autoload/rust.vim
index 34a3b41773..4230332fa7 100644
--- a/runtime/autoload/rust.vim
+++ b/runtime/autoload/rust.vim
@@ -1,4 +1,4 @@
-" Author: Kevin Ballard
+" Author: Lily Ballard
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
diff --git a/runtime/ftplugin/rust.vim b/runtime/ftplugin/rust.vim
index 7efca5985b..ececcced22 100644
--- a/runtime/ftplugin/rust.vim
+++ b/runtime/ftplugin/rust.vim
@@ -1,7 +1,7 @@
 " Language:     Rust
 " Description:  Vim ftplugin for Rust
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
-" Maintainer:   Kevin Ballard <kevin@sb.org>
+" Maintainer:   Lily Ballard <lily@ballards.net>
 " Last Change:  June 08, 2016
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim 
 
diff --git a/runtime/ftplugin/toml.vim b/runtime/ftplugin/toml.vim
index 1ef09a16e3..6bd79b1c0a 100644
--- a/runtime/ftplugin/toml.vim
+++ b/runtime/ftplugin/toml.vim
@@ -2,7 +2,7 @@
 " Language:    TOML
 " Homepage:    https://github.com/cespare/vim-toml
 " Maintainer:  Aman Verma
-" Author:      Kevin Ballard <kevin@sb.org>
+" Author:      Lily Ballard <lily@ballards.net>
 " Last Change: Sep 21, 2021
 
 if exists('b:did_ftplugin')
-- 
cgit 


From 6e0c36ba0e6691401726fd4215f89729138ba82f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 12 Aug 2023 05:51:49 +0800
Subject: vim-patch:9.0.1686: undotree() only works for the current buffer
 (#24665)

Problem:    undotree() only works for the current buffer
Solution:   Add an optional "buffer number" parameter to undotree().  If
            omitted, use the current buffer for backwards compatibility.

closes: vim/vim#4001
closes: vim/vim#12292

https://github.com/vim/vim/commit/5fee11114975b7405b7ccd3ee8758e54bf559760

Co-authored-by: Devin J. Pohly <djpohly@gmail.com>
---
 runtime/doc/builtin.txt         | 7 ++++---
 runtime/doc/usr_41.txt          | 2 +-
 runtime/lua/vim/_meta/vimfn.lua | 8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index e678a8d804..1cb995fd6e 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -8171,9 +8171,10 @@ undofile({name})                                                    *undofile()*
 		buffer without a file name will not write an undo file.
 		Useful in combination with |:wundo| and |:rundo|.
 
-undotree()                                                          *undotree()*
-		Return the current state of the undo tree in a dictionary with
-		the following items:
+undotree([{buf}])                                                   *undotree()*
+		Return the current state of the undo tree for the current
+		buffer, or for a specific buffer if {buf} is given.  The
+		result is a dictionary with the following items:
 		  "seq_last"	The highest undo sequence number used.
 		  "seq_cur"	The sequence number of the current position in
 				the undo tree.  This differs from "seq_last"
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index e1bb6c4af1..e6fcfa2fc6 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1092,7 +1092,7 @@ Various:					*various-functions*
 	libcallnr()		idem, returning a number
 
 	undofile()		get the name of the undo file
-	undotree()		return the state of the undo tree
+	undotree()		return the state of the undo tree for a buffer
 
 	shiftwidth()		effective value of 'shiftwidth'
 
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 14aae99971..bf80ccab45 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -9733,8 +9733,9 @@ function vim.fn.type(expr) end
 --- @return string
 function vim.fn.undofile(name) end
 
---- Return the current state of the undo tree in a dictionary with
---- the following items:
+--- Return the current state of the undo tree for the current
+--- buffer, or for a specific buffer if {buf} is given.  The
+--- result is a dictionary with the following items:
 ---   "seq_last"  The highest undo sequence number used.
 ---   "seq_cur"  The sequence number of the current position in
 ---     the undo tree.  This differs from "seq_last"
@@ -9775,8 +9776,9 @@ function vim.fn.undofile(name) end
 ---     blocks.  Each item may again have an "alt"
 ---     item.
 ---
+--- @param buf? any
 --- @return any
-function vim.fn.undotree() end
+function vim.fn.undotree(buf) end
 
 --- Remove second and succeeding copies of repeated adjacent
 --- {list} items in-place.  Returns {list}.  If you want a list
-- 
cgit 


From 6c07a189f2d10a533af8a51819ea96c45e0c567e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 12 Aug 2023 08:19:06 +0800
Subject: vim-patch:9.0.1688: cannot store custom data in quickfix list
 (#24673)

Problem: cannot store custom data in quickfix list
Solution: add `user_data` field for the quickfix list

closes: vim/vim#11818

https://github.com/vim/vim/commit/ca6ac99077d2e6d020a34267aa5e0fbc4d23dc38

Co-authored-by: Tom Praschan <13141438+tom-anders@users.noreply.github.com>
---
 runtime/doc/builtin.txt         | 6 ++++++
 runtime/lua/vim/_meta/vimfn.lua | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 1cb995fd6e..d05f488ed5 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2734,6 +2734,9 @@ getqflist([{what}])                                                *getqflist()*
 			text	description of the error
 			type	type of the error, 'E', '1', etc.
 			valid	|TRUE|: recognized error message
+			user_data
+				custom data associated with the item, can be
+				any type.
 
 		When there is no error list or it's empty, an empty list is
 		returned. Quickfix list entries with a non-existing buffer
@@ -6353,6 +6356,9 @@ setqflist({list} [, {action} [, {what}]])                          *setqflist()*
 		    text	description of the error
 		    type	single-character error type, 'E', 'W', etc.
 		    valid	recognized error message
+		    user_data
+				custom data associated with the item, can be
+				any type.
 
 		The "col", "vcol", "nr", "type" and "text" entries are
 		optional.  Either "lnum" or "pattern" entry can be used to
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index bf80ccab45..d5d9229ffb 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3309,6 +3309,9 @@ function vim.fn.getpos(expr) end
 ---   text  description of the error
 ---   type  type of the error, 'E', '1', etc.
 ---   valid  |TRUE|: recognized error message
+---   user_data
+---     custom data associated with the item, can be
+---     any type.
 ---
 --- When there is no error list or it's empty, an empty list is
 --- returned. Quickfix list entries with a non-existing buffer
@@ -7595,6 +7598,9 @@ function vim.fn.setpos(expr, list) end
 ---     text  description of the error
 ---     type  single-character error type, 'E', 'W', etc.
 ---     valid  recognized error message
+---     user_data
+---     custom data associated with the item, can be
+---     any type.
 ---
 --- The "col", "vcol", "nr", "type" and "text" entries are
 --- optional.  Either "lnum" or "pattern" entry can be used to
-- 
cgit 


From 58a1ef8e6a93c615379f6fbe7234697bcdc42b3e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 12 Aug 2023 09:50:17 +0800
Subject: fix(events): avoid unnecessary CursorMoved (#24675)

Problem:    Temporarily changing current window in a script causes
            CursorMoved to be triggerd.
Solution:   Don't trigger CursorMoved if neither curwin nor cursor
            changed between two checks.
---
 runtime/doc/vim_diff.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 15bb13d5a9..9569c38b85 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -455,7 +455,7 @@ coerced to strings. See |id()| for more details, currently it uses
 
 |c_CTRL-R| pasting a non-special register into |cmdline| omits the last <CR>.
 
-|CursorMoved| always triggers when moving between windows.
+|CursorMoved| triggers when moving between windows.
 
 Lua interface (|lua.txt|):
 
-- 
cgit 


From 04aed08157e324669f70fb0e90be38722332b3e1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 11 Aug 2023 23:13:39 +0200
Subject: vim-patch:d8f981138aa0

Add commentstring for nix file format (vim/vim#12696)

https://github.com/vim/vim/commit/d8f981138aa04c15ff87b306e9003df8d4b09d17

Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
---
 runtime/ftplugin/nix.vim | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 runtime/ftplugin/nix.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/nix.vim b/runtime/ftplugin/nix.vim
new file mode 100644
index 0000000000..d417cc7805
--- /dev/null
+++ b/runtime/ftplugin/nix.vim
@@ -0,0 +1,17 @@
+" Vim filetype plugin
+" Language:    nix
+" Maintainer:  Keith Smiley <keithbsmiley@gmail.com>
+" Last Change: 2023 Jul 22
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl commentstring< comments<"
+
+setlocal comments=:#
+setlocal commentstring=#\ %s
-- 
cgit 


From 2ca076e45fb3f1c08f6a1a374834df0701b8d778 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 10 Aug 2023 14:21:56 +0100
Subject: feat(treesitter)!: incremental injection parsing

Problem:

Treesitter highlighting is slow for large files with lots of injections.

Solution:

Only parse injections we are going to render during a redraw cycle.

---

- `LanguageTree:parse()` will no longer parse injections by default and
  now requires an explicit range argument to be passed.

- `TSHighlighter` now parses injections incrementally during on_win
  callbacks for the line range being rendered.

- Plugins which require certain injections to be parsed must run
  `parser:parse({ start_row, end_row })` before using the tree.
---
 runtime/doc/news.txt                        |   7 +
 runtime/doc/treesitter.txt                  |  31 +++--
 runtime/lua/vim/treesitter/_fold.lua        |   7 +-
 runtime/lua/vim/treesitter/_meta.lua        |   7 +-
 runtime/lua/vim/treesitter/_range.lua       |   9 +-
 runtime/lua/vim/treesitter/dev.lua          |   2 +-
 runtime/lua/vim/treesitter/highlighter.lua  |  24 ++--
 runtime/lua/vim/treesitter/languagetree.lua | 207 +++++++++++++++++++---------
 runtime/lua/vim/treesitter/query.lua        |   1 +
 9 files changed, 198 insertions(+), 97 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index a1981d5b7f..3aacf1e8ee 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -61,6 +61,10 @@ The following changes may require adaptations in user config or plugins.
     spaces (but paths themselves may contain spaces now).
   • |'directory'| will no longer remove a `>` at the start of the option.
 
+• |LanguageTree:parse()| will no longer parse injections by default and
+  now requires an explicit range argument to be passed. If injections are
+  required, provide an explicit range via `parser:parse({ start_row, end_row })`.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
@@ -69,6 +73,9 @@ The following new APIs and features were added.
 • Performance:
   • 'diffopt' "linematch" scoring algorithm now favours larger and less groups
     https://github.com/neovim/neovim/pull/23611
+  • Treesitter highlighting now parses injections incrementally during
+    screen redraws only for the line range being rendered. This significantly
+    improves performance in large files with many injections.
 
 • |vim.iter()| provides a generic iterator interface for tables and Lua
   iterators |for-in|.
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 13c0bd024a..f3e697807f 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1019,13 +1019,6 @@ set({lang}, {query_name}, {text})                 *vim.treesitter.query.set()*
       • {text}        (string) Query text (unparsed).
 
 
-==============================================================================
-Lua module: vim.treesitter.highlighter            *lua-treesitter-highlighter*
-
-TSHighlighter:destroy()                              *TSHighlighter:destroy()*
-    Removes all internal references to the highlighter.
-
-
 ==============================================================================
 Lua module: vim.treesitter.languagetree          *lua-treesitter-languagetree*
 
@@ -1053,7 +1046,7 @@ Whenever you need to access the current syntax tree, parse the buffer:
 
 >lua
 
-     local tree = parser:parse()
+     local tree = parser:parse({ start_row, end_row })
 
 <
 
@@ -1112,7 +1105,7 @@ LanguageTree:included_regions()              *LanguageTree:included_regions()*
     Gets the set of included regions
 
     Return: ~
-        integer[][]
+        Range6[][]
 
 LanguageTree:invalidate({reload})                  *LanguageTree:invalidate()*
     Invalidates this parser and all its children
@@ -1155,10 +1148,22 @@ LanguageTree:named_node_for_range({range}, {opts})
     Return: ~
         |TSNode| | nil Found node
 
-LanguageTree:parse()                                    *LanguageTree:parse()*
-    Parses all defined regions using a treesitter parser for the language this
-    tree represents. This will run the injection query for this language to
-    determine if any child languages should be created.
+LanguageTree:parse({range})                             *LanguageTree:parse()*
+    Recursively parse all regions in the language tree using
+    |treesitter-parsers| for the corresponding languages and run injection
+    queries on the parsed trees to determine whether child trees should be
+    created and parsed.
+
+    Any region with empty range (`{}`, typically only the root tree) is always
+    parsed; otherwise (typically injections) only if it intersects {range} (or
+    if {range} is `true`).
+
+    Parameters: ~
+      • {range}  boolean|Range|nil: Parse this range in the parser's source.
+                 Set to `true` to run a complete parse of the source (Note:
+                 Can be slow!) Set to `false|nil` to only parse regions with
+                 empty ranges (typically only the root tree without
+                 injections).
 
     Return: ~
         TSTree[]
diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index a02d0a584d..912a6e8a9f 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -147,11 +147,14 @@ local function normalise_erow(bufnr, erow)
   return math.min(erow or max_erow, max_erow)
 end
 
+-- TODO(lewis6991): Setup a decor provider so injections folds can be parsed
+-- as the window is redrawn
 ---@param bufnr integer
 ---@param info TS.FoldInfo
 ---@param srow integer?
 ---@param erow integer?
-local function get_folds_levels(bufnr, info, srow, erow)
+---@param parse_injections? boolean
+local function get_folds_levels(bufnr, info, srow, erow, parse_injections)
   srow = srow or 0
   erow = normalise_erow(bufnr, erow)
 
@@ -162,7 +165,7 @@ local function get_folds_levels(bufnr, info, srow, erow)
 
   local parser = ts.get_parser(bufnr)
 
-  parser:parse()
+  parser:parse(parse_injections and { srow, erow } or nil)
 
   parser:for_each_tree(function(tree, ltree)
     local query = ts.query.get(ltree:lang(), 'folds')
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index 36b1a9bbf8..d8babc9402 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -1,6 +1,6 @@
 ---@meta
 
----@class TSNode
+---@class TSNode: userdata
 ---@field id fun(self: TSNode): integer
 ---@field tree fun(self: TSNode): TSTree
 ---@field range fun(self: TSNode, include_bytes: false?): integer, integer, integer, integer
@@ -51,7 +51,7 @@ function TSNode:_rawquery(query, captures, start, end_, opts) end
 ---@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: boolean?): TSTree, integer[]
 ---@field reset fun(self: TSParser)
 ---@field included_ranges fun(self: TSParser, include_bytes: boolean?): integer[]
----@field set_included_ranges fun(self: TSParser, ranges: Range6[])
+---@field set_included_ranges fun(self: TSParser, ranges: (Range6|TSNode)[])
 ---@field set_timeout fun(self: TSParser, timeout: integer)
 ---@field timeout fun(self: TSParser): integer
 ---@field _set_logger fun(self: TSParser, lex: boolean, parse: boolean, cb: TSLoggerCallback)
@@ -61,7 +61,8 @@ function TSNode:_rawquery(query, captures, start, end_, opts) end
 ---@field root fun(self: TSTree): TSNode
 ---@field edit fun(self: TSTree, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _: integer, _:integer)
 ---@field copy fun(self: TSTree): TSTree
----@field included_ranges fun(self: TSTree, include_bytes: boolean?): integer[]
+---@field included_ranges fun(self: TSTree, include_bytes: true): Range6[]
+---@field included_ranges fun(self: TSTree, include_bytes: false): Range4[]
 
 ---@return integer
 vim._ts_get_language_version = function() end
diff --git a/runtime/lua/vim/treesitter/_range.lua b/runtime/lua/vim/treesitter/_range.lua
index 35081c6400..8d727c3c52 100644
--- a/runtime/lua/vim/treesitter/_range.lua
+++ b/runtime/lua/vim/treesitter/_range.lua
@@ -2,6 +2,10 @@ local api = vim.api
 
 local M = {}
 
+---@class Range2
+---@field [1] integer start row
+---@field [2] integer end row
+
 ---@class Range4
 ---@field [1] integer start row
 ---@field [2] integer start column
@@ -16,7 +20,7 @@ local M = {}
 ---@field [5] integer end column
 ---@field [6] integer end bytes
 
----@alias Range Range4|Range6
+---@alias Range Range2|Range4|Range6
 
 ---@private
 ---@param a_row integer
@@ -111,6 +115,9 @@ end
 ---@param r Range
 ---@return integer, integer, integer, integer
 function M.unpack4(r)
+  if #r == 2 then
+    return r[1], 0, r[2], 0
+  end
   local off_1 = #r == 6 and 1 or 0
   return r[1], r[2], r[3 + off_1], r[4 + off_1]
 end
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index e94e8f08dc..f7625eb94b 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -99,7 +99,7 @@ function TSTreeView:new(bufnr, lang)
   -- For each child tree (injected language), find the root of the tree and locate the node within
   -- the primary tree that contains that root. Add a mapping from the node in the primary tree to
   -- the root in the child tree to the {injections} table.
-  local root = parser:parse()[1]:root()
+  local root = parser:parse(true)[1]:root()
   local injections = {} ---@type table<integer,table>
   parser:for_each_child(function(child, lang_)
     child:for_each_tree(function(tree)
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index f8ec5b175d..56b075b723 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -1,5 +1,6 @@
 local api = vim.api
 local query = vim.treesitter.query
+local Range = require('vim.treesitter._range')
 
 ---@alias TSHlIter fun(): integer, TSNode, TSMetadata
 
@@ -14,6 +15,7 @@ local query = vim.treesitter.query
 ---@field _highlight_states table<TSTree,TSHighlightState>
 ---@field _queries table<string,TSHighlighterQuery>
 ---@field tree LanguageTree
+---@field redraw_count integer
 local TSHighlighter = rawget(vim.treesitter, 'TSHighlighter') or {}
 TSHighlighter.__index = TSHighlighter
 
@@ -139,6 +141,7 @@ function TSHighlighter.new(tree, opts)
   return self
 end
 
+--- @nodoc
 --- Removes all internal references to the highlighter
 function TSHighlighter:destroy()
   if TSHighlighter.active[self.bufnr] then
@@ -186,7 +189,7 @@ function TSHighlighter:on_detach()
 end
 
 ---@package
----@param changes Range6[][]
+---@param changes Range6[]
 function TSHighlighter:on_changedtree(changes)
   for _, ch in ipairs(changes) do
     api.nvim__buf_redraw_range(self.bufnr, ch[1], ch[4] + 1)
@@ -245,7 +248,7 @@ local function on_line_impl(self, buf, line, is_spell_nav)
       end
 
       local range = vim.treesitter.get_range(node, buf, metadata[capture])
-      local start_row, start_col, _, end_row, end_col, _ = unpack(range)
+      local start_row, start_col, end_row, end_col = Range.unpack4(range)
       local hl = highlighter_query.hl_cache[capture]
 
       local capture_name = highlighter_query:query().captures[capture]
@@ -309,32 +312,23 @@ function TSHighlighter._on_spell_nav(_, _, buf, srow, _, erow, _)
   end
 end
 
----@private
----@param buf integer
-function TSHighlighter._on_buf(_, buf)
-  local self = TSHighlighter.active[buf]
-  if self then
-    self.tree:parse()
-  end
-end
-
 ---@private
 ---@param _win integer
 ---@param buf integer
----@param _topline integer
-function TSHighlighter._on_win(_, _win, buf, _topline)
+---@param topline integer
+---@param botline integer
+function TSHighlighter._on_win(_, _win, buf, topline, botline)
   local self = TSHighlighter.active[buf]
   if not self then
     return false
   end
-
+  self.tree:parse({ topline, botline })
   self:reset_highlight_state()
   self.redraw_count = self.redraw_count + 1
   return true
 end
 
 api.nvim_set_decoration_provider(ns, {
-  on_buf = TSHighlighter._on_buf,
   on_win = TSHighlighter._on_win,
   on_line = TSHighlighter._on_line,
   _on_spell_nav = TSHighlighter._on_spell_nav,
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 7f1d6d1111..f274edf961 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -18,7 +18,7 @@
 --- Whenever you need to access the current syntax tree, parse the buffer:
 ---
 --- <pre>lua
----     local tree = parser:parse()
+---     local tree = parser:parse({ start_row, end_row })
 --- </pre>
 ---
 --- This returns a table of immutable |treesitter-tree| objects representing the current state of
@@ -74,6 +74,7 @@ local TSCallbackNames = {
 ---@field package _callbacks_rec table<TSCallbackName,function[]> Callback handlers (recursive)
 ---@field private _children table<string,LanguageTree> Injected languages
 ---@field private _injection_query Query Queries defining injected languages
+---@field private _injections_processed boolean
 ---@field private _opts table Options
 ---@field private _parser TSParser Parser for language
 ---@field private _has_regions boolean
@@ -115,7 +116,9 @@ function LanguageTree.new(source, lang, opts)
   end
 
   local injections = opts.injections or {}
-  local self = setmetatable({
+
+  --- @type LanguageTree
+  local self = {
     _source = source,
     _lang = lang,
     _children = {},
@@ -123,14 +126,19 @@ function LanguageTree.new(source, lang, opts)
     _opts = opts,
     _injection_query = injections[lang] and query.parse(lang, injections[lang])
       or query.get(lang, 'injections'),
+    _has_regions = false,
+    _injections_processed = false,
     _valid = false,
     _parser = vim._create_ts_parser(lang),
     _callbacks = {},
     _callbacks_rec = {},
-  }, LanguageTree)
+  }
+
+  setmetatable(self, LanguageTree)
 
   if vim.g.__ts_debug and type(vim.g.__ts_debug) == 'number' then
     self:_set_logger()
+    self:_log('START')
   end
 
   for _, name in pairs(TSCallbackNames) do
@@ -141,6 +149,7 @@ function LanguageTree.new(source, lang, opts)
   return self
 end
 
+--- @private
 function LanguageTree:_set_logger()
   local source = self:source()
   source = type(source) == 'string' and 'text' or tostring(source)
@@ -171,7 +180,7 @@ end
 ---Measure execution time of a function
 ---@generic R1, R2, R3
 ---@param f fun(): R1, R2, R2
----@return integer, R1, R2, R3
+---@return number, R1, R2, R3
 local function tcall(f, ...)
   local start = vim.uv.hrtime()
   ---@diagnostic disable-next-line
@@ -219,7 +228,7 @@ function LanguageTree:invalidate(reload)
 
   -- buffer was reloaded, reparse all trees
   if reload then
-    for _, t in ipairs(self._trees) do
+    for _, t in pairs(self._trees) do
       self:_do_callback('changedtree', t:included_ranges(true), t)
     end
     self._trees = {}
@@ -250,14 +259,18 @@ function LanguageTree:is_valid(exclude_children)
   local valid = self._valid
 
   if type(valid) == 'table' then
-    for _, v in ipairs(valid) do
-      if not v then
+    for i = 1, #self:included_regions() do
+      if not valid[i] then
         return false
       end
     end
   end
 
   if not exclude_children then
+    if not self._injections_processed then
+      return false
+    end
+
     for _, child in pairs(self._children) do
       if not child:is_valid(exclude_children) then
         return false
@@ -265,9 +278,12 @@ function LanguageTree:is_valid(exclude_children)
     end
   end
 
-  assert(type(valid) == 'boolean')
+  if type(valid) == 'boolean' then
+    return valid
+  end
 
-  return valid
+  self._valid = true
+  return true
 end
 
 --- Returns a map of language to child tree.
@@ -280,47 +296,72 @@ function LanguageTree:source()
   return self._source
 end
 
---- Parses all defined regions using a treesitter parser
---- for the language this tree represents.
---- This will run the injection query for this language to
---- determine if any child languages should be created.
----
----@return TSTree[]
-function LanguageTree:parse()
-  if self:is_valid() then
-    self:_log('valid')
-    return self._trees
+--- @param region Range6[]
+--- @param range? boolean|Range
+--- @return boolean
+local function intercepts_region(region, range)
+  if #region == 0 then
+    return true
   end
 
-  local changes = {}
+  if range == nil then
+    return false
+  end
 
-  -- Collect some stats
-  local regions_parsed = 0
+  if type(range) == 'boolean' then
+    return range
+  end
+
+  for _, r in ipairs(region) do
+    if Range.intercepts(r, range) then
+      return true
+    end
+  end
+
+  return false
+end
+
+--- @private
+--- @param range boolean|Range?
+--- @return integer[] changes
+--- @return integer no_regions_parsed
+--- @return number total_parse_time
+function LanguageTree:_parse_regions(range)
+  local changes = {}
+  local no_regions_parsed = 0
   local total_parse_time = 0
 
-  --- At least 1 region is invalid
-  if not self:is_valid(true) then
-    -- If there are no ranges, set to an empty list
-    -- so the included ranges in the parser are cleared.
-    for i, ranges in ipairs(self:included_regions()) do
-      if not self._valid or not self._valid[i] then
-        self._parser:set_included_ranges(ranges)
-        local parse_time, tree, tree_changes =
-          tcall(self._parser.parse, self._parser, self._trees[i], self._source, true)
-
-        -- Pass ranges if this is an initial parse
-        local cb_changes = self._trees[i] and tree_changes or tree:included_ranges(true)
-
-        self:_do_callback('changedtree', cb_changes, tree)
-        self._trees[i] = tree
-        vim.list_extend(changes, tree_changes)
-
-        total_parse_time = total_parse_time + parse_time
-        regions_parsed = regions_parsed + 1
-      end
+  if type(self._valid) ~= 'table' then
+    self._valid = {}
+  end
+
+  -- If there are no ranges, set to an empty list
+  -- so the included ranges in the parser are cleared.
+  for i, ranges in pairs(self:included_regions()) do
+    if not self._valid[i] and intercepts_region(ranges, range) then
+      self._parser:set_included_ranges(ranges)
+      local parse_time, tree, tree_changes =
+        tcall(self._parser.parse, self._parser, self._trees[i], self._source, true)
+
+      -- Pass ranges if this is an initial parse
+      local cb_changes = self._trees[i] and tree_changes or tree:included_ranges(true)
+
+      self:_do_callback('changedtree', cb_changes, tree)
+      self._trees[i] = tree
+      vim.list_extend(changes, tree_changes)
+
+      total_parse_time = total_parse_time + parse_time
+      no_regions_parsed = no_regions_parsed + 1
+      self._valid[i] = true
     end
   end
 
+  return changes, no_regions_parsed, total_parse_time
+end
+
+--- @private
+--- @return number
+function LanguageTree:_add_injections()
   local seen_langs = {} ---@type table<string,boolean>
 
   local query_time, injections_by_lang = tcall(self._get_injections, self)
@@ -348,19 +389,60 @@ function LanguageTree:parse()
     end
   end
 
+  return query_time
+end
+
+--- Recursively parse all regions in the language tree using |treesitter-parsers|
+--- for the corresponding languages and run injection queries on the parsed trees
+--- to determine whether child trees should be created and parsed.
+---
+--- Any region with empty range (`{}`, typically only the root tree) is always parsed;
+--- otherwise (typically injections) only if it intersects {range} (or if {range} is `true`).
+---
+--- @param range boolean|Range|nil: Parse this range in the parser's source.
+---     Set to `true` to run a complete parse of the source (Note: Can be slow!)
+---     Set to `false|nil` to only parse regions with empty ranges (typically
+---     only the root tree without injections).
+--- @return TSTree[]
+function LanguageTree:parse(range)
+  if self:is_valid() then
+    self:_log('valid')
+    return self._trees
+  end
+
+  local changes --- @type Range6?
+
+  -- Collect some stats
+  local no_regions_parsed = 0
+  local query_time = 0
+  local total_parse_time = 0
+
+  --- At least 1 region is invalid
+  if not self:is_valid(true) then
+    changes, no_regions_parsed, total_parse_time = self:_parse_regions(range)
+    -- Need to run injections when we parsed something
+    if no_regions_parsed > 0 then
+      self._injections_processed = false
+    end
+  end
+
+  if not self._injections_processed and range ~= false and range ~= nil then
+    query_time = self:_add_injections()
+    self._injections_processed = true
+  end
+
   self:_log({
-    changes = changes,
-    regions_parsed = regions_parsed,
+    changes = changes and #changes > 0 and changes or nil,
+    regions_parsed = no_regions_parsed,
     parse_time = total_parse_time,
     query_time = query_time,
+    range = range,
   })
 
   self:for_each_child(function(child)
-    child:parse()
+    child:parse(range)
   end)
 
-  self._valid = true
-
   return self._trees
 end
 
@@ -384,7 +466,7 @@ end
 ---
 ---@param fn fun(tree: TSTree, ltree: LanguageTree)
 function LanguageTree:for_each_tree(fn)
-  for _, tree in ipairs(self._trees) do
+  for _, tree in pairs(self._trees) do
     fn(tree, self)
   end
 
@@ -466,18 +548,17 @@ function LanguageTree:_iter_regions(fn)
     return
   end
 
-  if type(self._valid) ~= 'table' then
+  local was_valid = type(self._valid) ~= 'table'
+
+  if was_valid then
+    self:_log('was valid', self._valid)
     self._valid = {}
   end
 
   local all_valid = true
 
   for i, region in ipairs(self:included_regions()) do
-    if self._valid[i] == nil then
-      self._valid[i] = true
-    end
-
-    if self._valid[i] then
+    if was_valid or self._valid[i] then
       self._valid[i] = fn(i, region)
       if not self._valid[i] then
         self:_log(function()
@@ -521,6 +602,8 @@ function LanguageTree:set_included_regions(new_regions)
     for i, range in ipairs(region) do
       if type(range) == 'table' and #range == 4 then
         region[i] = Range.add_bytes(self._source, range)
+      elseif type(range) == 'userdata' then
+        region[i] = { range:range(true) }
       end
     end
   end
@@ -542,7 +625,7 @@ function LanguageTree:set_included_regions(new_regions)
 end
 
 ---Gets the set of included regions
----@return integer[][]
+---@return Range6[][]
 function LanguageTree:included_regions()
   if self._regions then
     return self._regions
@@ -581,7 +664,7 @@ local function get_node_ranges(node, source, metadata, include_children)
 
   -- We are excluding children so we need to mask out their ranges
   for i = 0, child_count - 1 do
-    local child = node:named_child(i)
+    local child = assert(node:named_child(i))
     local c_srow, c_scol, c_sbyte, c_erow, c_ecol, c_ebyte = child:range(true)
     if c_srow > srow or c_scol > scol then
       ranges[#ranges + 1] = { srow, scol, sbyte, c_srow, c_scol, c_sbyte }
@@ -749,8 +832,8 @@ end
 ---
 --- TODO: Allow for an offset predicate to tailor the injection range
 ---       instead of using the entire nodes range.
----@private
----@return table<string, Range6[][]>
+--- @private
+--- @return table<string, Range6[][]>
 function LanguageTree:_get_injections()
   if not self._injection_query then
     return {}
@@ -759,7 +842,7 @@ function LanguageTree:_get_injections()
   ---@type table<integer,TSInjection>
   local injections = {}
 
-  for tree_index, tree in ipairs(self._trees) do
+  for index, tree in pairs(self._trees) do
     local root_node = tree:root()
     local start_line, _, end_line, _ = root_node:range()
 
@@ -771,7 +854,7 @@ function LanguageTree:_get_injections()
         -- TODO(lewis6991): remove after 0.9 (#20434)
         lang, combined, ranges = self:_get_injection_deprecated(match, metadata)
       end
-      add_injection(injections, tree_index, pattern, lang, combined, ranges)
+      add_injection(injections, index, pattern, lang, combined, ranges)
     end
   end
 
@@ -794,7 +877,7 @@ function LanguageTree:_get_injections()
           end, entry.regions)
           table.insert(result[lang], regions)
         else
-          for _, ranges in ipairs(entry.regions) do
+          for _, ranges in pairs(entry.regions) do
             table.insert(result[lang], ranges)
           end
         end
@@ -828,7 +911,7 @@ function LanguageTree:_edit(
   end_row_new,
   end_col_new
 )
-  for _, tree in ipairs(self._trees) do
+  for _, tree in pairs(self._trees) do
     tree:edit(
       start_byte,
       end_byte_old,
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index c3213e0192..3093657313 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -435,6 +435,7 @@ predicate_handlers['vim-match?'] = predicate_handlers['match?']
 
 ---@class TSMetadata
 ---@field range? Range
+---@field conceal? string
 ---@field [integer] TSMetadata
 ---@field [string] integer|string
 
-- 
cgit 


From 4a936ad2dcb3fbf90cedfe8ee2d82b5edacea6fe Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 13 Aug 2023 11:15:41 +0200
Subject: vim-patch:f9c4c2f97db9

Update iss syntax file (vim/vim#11890)

- Add 'ExternalSize:' parameter
- Add 'setntfscompression' files flag
- Fix escaped left brace highlight
- Fix 'String:' parameter highlight
- Remove trailing whitespace

https://github.com/vim/vim/commit/f9c4c2f97db94f513b86d86b86bf981060c7c8bf

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 runtime/syntax/iss.vim | 56 ++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/iss.vim b/runtime/syntax/iss.vim
index 34bb698368..212c0f6dbe 100644
--- a/runtime/syntax/iss.vim
+++ b/runtime/syntax/iss.vim
@@ -2,10 +2,9 @@
 " Language:             Inno Setup File (iss file) and My InnoSetup extension
 " Maintainer:           Jason Mills (jmills@cs.mun.ca)
 " Previous Maintainer:  Dominique Stéphan (dominique@mggen.com)
-" Last Change:          2021 Aug 30
+" Last Change:          2023 Jan 26
 "
 " Todo:
-"  - The parameter String: is matched as flag string (because of case ignore).
 "  - Pascal scripting syntax is not recognized.
 "  - Embedded double quotes confuse string matches. e.g. "asfd""asfa"
 
@@ -17,6 +16,9 @@ endif
 " shut case off
 syn case ignore
 
+" match keywords with colon
+syn iskeyword @,48-57,_,192-255,:
+
 " Preprocessor
 syn region issPreProc start="^\s*#" end="$"
 
@@ -30,25 +32,25 @@ syn match  issDirective	"^[^=]\+="
 syn match  issURL	"http[s]\=:\/\/.*$"
 
 " Parameters used for any section.
-" syn match  issParam"[^: ]\+:"
-syn match  issParam	"Name:"
-syn match  issParam	"MinVersion:\|OnlyBelowVersion:\|Languages:"
-syn match  issParam	"Source:\|DestDir:\|DestName:\|CopyMode:"
-syn match  issParam	"Attribs:\|Permissions:\|FontInstall:\|Flags:"
-syn match  issParam	"FileName:\|Parameters:\|WorkingDir:\|HotKey:\|Comment:"
-syn match  issParam	"IconFilename:\|IconIndex:"
-syn match  issParam	"Section:\|Key:\|String:"
-syn match  issParam	"Root:\|SubKey:\|ValueType:\|ValueName:\|ValueData:"
-syn match  issParam	"RunOnceId:"
-syn match  issParam	"Type:\|Excludes:"
-syn match  issParam	"Components:\|Description:\|GroupDescription:\|Types:\|ExtraDiskSpaceRequired:"
-syn match  issParam	"StatusMsg:\|RunOnceId:\|Tasks:"
-syn match  issParam	"MessagesFile:\|LicenseFile:\|InfoBeforeFile:\|InfoAfterFile:"
+" syn match  issParam "[^: ]\+:"
+syn keyword issParam	Name:
+syn keyword issParam	MinVersion: OnlyBelowVersion: Languages:
+syn keyword issParam	Source: DestDir: DestName: CopyMode: ExternalSize:
+syn keyword issParam	Attribs: Permissions: FontInstall: Flags:
+syn keyword issParam	FileName: Parameters: WorkingDir: HotKey: Comment:
+syn keyword issParam	IconFilename: IconIndex:
+syn keyword issParam	Section: Key: String:
+syn keyword issParam	Root: SubKey: ValueType: ValueName: ValueData:
+syn keyword issParam	RunOnceId:
+syn keyword issParam	Type: Excludes:
+syn keyword issParam	Components: Description: GroupDescription: Types: ExtraDiskSpaceRequired:
+syn keyword issParam	StatusMsg: RunOnceId: Tasks:
+syn keyword issParam	MessagesFile: LicenseFile: InfoBeforeFile: InfoAfterFile:
 
 syn match  issComment	"^\s*;.*$" contains=@Spell
 
 " folder constant
-syn match  issFolder	"{[^{]*}" contains=@NoSpell
+syn match  issFolder	"{\@1<!{[^{]*}" contains=@NoSpell
 
 " string
 syn region issString	start=+"+ end=+"+ contains=issFolder,@Spell
@@ -61,16 +63,16 @@ syn keyword issFilesCopyMode normal onlyifdoesntexist alwaysoverwrite alwaysskip
 syn keyword issFilesAttribs readonly hidden system
 syn keyword issFilesPermissions full modify readexec
 syn keyword issFilesFlags allowunsafefiles comparetimestampalso confirmoverwrite deleteafterinstall
-syn keyword issFilesFlags dontcopy dontverifychecksum external fontisnttruetype ignoreversion 
-syn keyword issFilesFlags isreadme onlyifdestfileexists onlyifdoesntexist overwritereadonly 
+syn keyword issFilesFlags dontcopy dontverifychecksum external fontisnttruetype ignoreversion
+syn keyword issFilesFlags isreadme onlyifdestfileexists onlyifdoesntexist overwritereadonly
 syn keyword issFilesFlags promptifolder recursesubdirs regserver regtypelib restartreplace
-syn keyword issFilesFlags sharedfile skipifsourcedoesntexist sortfilesbyextension touch 
+syn keyword issFilesFlags sharedfile skipifsourcedoesntexist sortfilesbyextension touch
 syn keyword issFilesFlags uninsremovereadonly uninsrestartdelete uninsneveruninstall
-syn keyword issFilesFlags replacesameversion nocompression noencryption noregerror
+syn keyword issFilesFlags replacesameversion setntfscompression nocompression noencryption noregerror
 
 
 " [Icons]
-syn keyword issIconsFlags closeonexit createonlyiffileexists dontcloseonexit 
+syn keyword issIconsFlags closeonexit createonlyiffileexists dontcloseonexit
 syn keyword issIconsFlags runmaximized runminimized uninsneveruninstall useapppaths
 
 " [INI]
@@ -79,13 +81,13 @@ syn keyword issINIFlags createkeyifdoesntexist uninsdeleteentry uninsdeletesecti
 " [Registry]
 syn keyword issRegRootKey   HKCR HKCU HKLM HKU HKCC
 syn keyword issRegValueType none string expandsz multisz dword binary
-syn keyword issRegFlags createvalueifdoesntexist deletekey deletevalue dontcreatekey 
-syn keyword issRegFlags preservestringtype noerror uninsclearvalue 
+syn keyword issRegFlags createvalueifdoesntexist deletekey deletevalue dontcreatekey
+syn keyword issRegFlags preservestringtype noerror uninsclearvalue
 syn keyword issRegFlags uninsdeletekey uninsdeletekeyifempty uninsdeletevalue
 
 " [Run] and [UninstallRun]
 syn keyword issRunFlags hidewizard nowait postinstall runhidden runmaximized
-syn keyword issRunFlags runminimized shellexec skipifdoesntexist skipifnotsilent 
+syn keyword issRunFlags runminimized shellexec skipifdoesntexist skipifnotsilent
 syn keyword issRunFlags skipifsilent unchecked waituntilidle
 
 " [Types]
@@ -98,7 +100,7 @@ syn keyword issComponentsFlags dontinheritcheck exclusive fixed restart disablen
 syn keyword issInstallDeleteType files filesandordirs dirifempty
 
 " [Tasks]
-syn keyword issTasksFlags checkedonce dontinheritcheck exclusive restart unchecked 
+syn keyword issTasksFlags checkedonce dontinheritcheck exclusive restart unchecked
 
 
 " Define the default highlighting.
@@ -112,7 +114,7 @@ hi def link issParam	Type
 hi def link issFolder	Special
 hi def link issString	String
 hi def link issURL	Include
-hi def link issPreProc	PreProc 
+hi def link issPreProc	PreProc
 
 hi def link issDirsFlags		Keyword
 hi def link issFilesCopyMode	Keyword
-- 
cgit 


From a600ac5263b202f6883ef1e7406b4475bd1e136d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 13 Aug 2023 11:16:10 +0200
Subject: vim-patch:2f339aad6c80

Add syntax & ftplugin for pymanifest (vim/vim#12773)

https://github.com/vim/vim/commit/2f339aad6c80e82d7c1237b402392065857174d4

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 runtime/ftplugin/pymanifest.vim | 13 ++++++++++++
 runtime/syntax/pymanifest.vim   | 44 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 runtime/ftplugin/pymanifest.vim
 create mode 100644 runtime/syntax/pymanifest.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/pymanifest.vim b/runtime/ftplugin/pymanifest.vim
new file mode 100644
index 0000000000..a77e956ae5
--- /dev/null
+++ b/runtime/ftplugin/pymanifest.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	PyPA manifest
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Last Change:	2023 Aug 08
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:# commentstring=#\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'
diff --git a/runtime/syntax/pymanifest.vim b/runtime/syntax/pymanifest.vim
new file mode 100644
index 0000000000..5f7d22cf2d
--- /dev/null
+++ b/runtime/syntax/pymanifest.vim
@@ -0,0 +1,44 @@
+" Vim syntax file
+" Language:	PyPA manifest
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Filenames:	MANIFEST.in
+" Last Change:	2023 Aug 12
+
+if exists('b:current_syntax')
+    finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+syn iskeyword @,-
+
+" Comments
+syn keyword pymanifestTodo contained TODO FIXME XXX
+syn match pymanifestComment /\\\@1<!#.*/ contains=pymanifestTodo
+
+" Commands
+syn keyword pymanifestCommand
+            \ include exclude
+            \ recursive-include global-include
+            \ global-include global-exclude
+            \ graft prune
+
+" Globs & character ranges
+syn match pymanifestGlob /\*\|\*\*\|?/
+syn match pymanifestRange /\\\@1<!\[.\{-}\]/
+
+" Line break
+syn match pymanifestLinebreak /\\$\|\\\ze\s\+#/
+
+hi def link pymanifestCommand Keyword
+hi def link pymanifestComment Comment
+hi def link pymanifestGlob SpecialChar
+hi def link pymanifestLinebreak SpecialKey
+hi def link pymanifestRange Special
+hi def link pymanifestTodo Todo
+
+let b:current_syntax = 'pymanifest'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
-- 
cgit 


From 380ffd6b7cc6da132e32a97eda3cc7d4197d7424 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 13 Aug 2023 11:16:55 +0200
Subject: vim-patch:9ad1bf7afd5c

runtime(pymanifest): fix mistake in syntax definition

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: ObserverOfTime <chronobserver@disroot.org>

https://github.com/vim/vim/commit/9ad1bf7afd5c4f26e5154eca2697c9a6773e0bf4

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 runtime/syntax/pymanifest.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/pymanifest.vim b/runtime/syntax/pymanifest.vim
index 5f7d22cf2d..54295c45dc 100644
--- a/runtime/syntax/pymanifest.vim
+++ b/runtime/syntax/pymanifest.vim
@@ -20,7 +20,7 @@ syn match pymanifestComment /\\\@1<!#.*/ contains=pymanifestTodo
 " Commands
 syn keyword pymanifestCommand
             \ include exclude
-            \ recursive-include global-include
+            \ recursive-include resursive-exclude
             \ global-include global-exclude
             \ graft prune
 
-- 
cgit 


From 8179d68dc1a90f47bfb307d73e71adc98883ae00 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 13 Aug 2023 08:03:56 +0100
Subject: fix(treesitter): logger memory leak

---
 runtime/lua/vim/treesitter/languagetree.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index f274edf961..b4c9027794 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -156,6 +156,7 @@ function LanguageTree:_set_logger()
 
   local lang = self:lang()
 
+  vim.fn.mkdir(vim.fn.stdpath('log'), 'p')
   local logfilename = vim.fs.joinpath(vim.fn.stdpath('log'), 'treesitter.log')
 
   local logfile, openerr = io.open(logfilename, 'a+')
@@ -208,7 +209,8 @@ function LanguageTree:_log(...)
 
   local info = debug.getinfo(2, 'nl')
   local nregions = #self:included_regions()
-  local prefix = string.format('%s:%d: (#regions=%d) ', info.name, info.currentline, nregions)
+  local prefix =
+    string.format('%s:%d: (#regions=%d) ', info.name or '???', info.currentline or 0, nregions)
 
   local msg = { prefix }
   for _, x in ipairs(args) do
-- 
cgit 


From 3836eeb90182cc610ea15bf6bd83cbc720bb7c64 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 12 Aug 2023 18:12:49 +0200
Subject: feat(treesitter): update C queries from upstream

---
 runtime/queries/c/highlights.scm | 49 ++++++++++++++++++++++++++++++++++++++--
 runtime/queries/c/injections.scm | 20 ++++++++++++++--
 2 files changed, 65 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index ef70a7103c..29fb5747ca 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -1,5 +1,6 @@
 ; Lower priority to prefer @parameter when identifier appears in parameter_declaration.
 ((identifier) @variable (#set! "priority" 95))
+(preproc_def (preproc_arg) @variable)
 
 [
   "default"
@@ -16,6 +17,7 @@
   "sizeof"
   "offsetof"
 ] @keyword.operator
+(alignof_expression . _ @keyword.operator)
 
 "return" @keyword.return
 
@@ -141,8 +143,9 @@
 (storage_class_specifier) @storageclass
 
 [
-  (type_qualifier) 
+  (type_qualifier)
   (gnu_asm_qualifier)
+  "__extension__"
 ] @type.qualifier
 
 (linkage_specification
@@ -157,13 +160,52 @@
 
 ((identifier) @constant
  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
+(preproc_def (preproc_arg) @constant
+  (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
 (enumerator
   name: (identifier) @constant)
 (case_statement
   value: (identifier) @constant)
 
 ((identifier) @constant.builtin
-    (#any-of? @constant.builtin "stderr" "stdin" "stdout"))
+  (#any-of? @constant.builtin
+    "stderr" "stdin" "stdout"
+    "__FILE__" "__LINE__" "__DATE__" "__TIME__"
+    "__STDC__" "__STDC_VERSION__" "__STDC_HOSTED__"
+    "__cplusplus" "__OBJC__" "__ASSEMBLER__"
+    "__BASE_FILE__" "__FILE_NAME__" "__INCLUDE_LEVEL__"
+    "__TIMESTAMP__" "__clang__" "__clang_major__"
+    "__clang_minor__" "__clang_patchlevel__"
+    "__clang_version__" "__clang_literal_encoding__"
+    "__clang_wide_literal_encoding__"
+    "__FUNCTION__" "__func__" "__PRETTY_FUNCTION__"
+    "__VA_ARGS__" "__VA_OPT__"))
+(preproc_def (preproc_arg) @constant.builtin
+  (#any-of? @constant.builtin
+    "stderr" "stdin" "stdout"
+    "__FILE__" "__LINE__" "__DATE__" "__TIME__"
+    "__STDC__" "__STDC_VERSION__" "__STDC_HOSTED__"
+    "__cplusplus" "__OBJC__" "__ASSEMBLER__"
+    "__BASE_FILE__" "__FILE_NAME__" "__INCLUDE_LEVEL__"
+    "__TIMESTAMP__" "__clang__" "__clang_major__"
+    "__clang_minor__" "__clang_patchlevel__"
+    "__clang_version__" "__clang_literal_encoding__"
+    "__clang_wide_literal_encoding__"
+    "__FUNCTION__" "__func__" "__PRETTY_FUNCTION__"
+    "__VA_ARGS__" "__VA_OPT__"))
+
+(attribute_specifier
+  (argument_list (identifier) @variable.builtin))
+((attribute_specifier
+  (argument_list (call_expression
+                   function: (identifier) @variable.builtin))))
+
+((call_expression
+  function: (identifier) @function.builtin)
+  (#lua-match? @function.builtin "^__builtin_"))
+((call_expression
+   function: (identifier) @function.builtin)
+  (#has-ancestor? @function.builtin attribute_specifier))
 
 ;; Preproc def / undef
 (preproc_def
@@ -196,6 +238,9 @@
 (parameter_declaration
   declarator: (identifier) @parameter)
 
+(parameter_declaration
+  declarator: (array_declarator) @parameter)
+
 (parameter_declaration
   declarator: (pointer_declarator) @parameter)
 
diff --git a/runtime/queries/c/injections.scm b/runtime/queries/c/injections.scm
index 3b99c7a444..5a49e20df5 100644
--- a/runtime/queries/c/injections.scm
+++ b/runtime/queries/c/injections.scm
@@ -1,5 +1,21 @@
-; ((preproc_arg) @injection.content
-;  (#set! injection.language "c"))
+((preproc_def
+ (preproc_arg) @injection.content)
+ (#lua-match? @injection.content "\n")
+ (#set! injection.language "c"))
+
+(preproc_function_def
+ (preproc_arg) @injection.content
+ (#set! injection.language "c"))
+
+(preproc_call
+ (preproc_arg) @injection.content
+ (#set! injection.language "c"))
 
 ; ((comment) @injection.content
 ;  (#set! injection.language "comment"))
+
+; TODO: add when asm is added
+; (gnu_asm_expression assembly_code: (string_literal) @injection.content
+; (#set! injection.language "asm"))
+; (gnu_asm_expression assembly_code: (concatenated_string (string_literal) @injection.content)
+; (#set! injection.language "asm"))
-- 
cgit 


From cbf54ec2a5aaa1a00ff89e26bab44a30d09d4631 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:25:10 +0100
Subject: vim-patch:e978b4534a5e (#24697)

Farewell to Bram and dedicate upcoming Vim 9.1 to him (vim/vim#12749)

https://github.com/vim/vim/commit/e978b4534a5e10471108259118c0ef791106fd92

Also update the header for the following files that were converted to Vim9
script upstream:

- autoload/ccomplete.lua (vim9jitted)
- ftplugin.vim
- ftplugof.vim
- indent.vim
- indent/vim.vim
- makemenu.vim

This also updates the "Last Change" dates, even if some changes (due to rewrites
to Vim9 script) were not ported.

There's still a few other places where Bram is still mentioned as a maintainer
in the files we and Vim have:

- ftplugin/bash.vim
- indent/bash.vim
- indent/html.vim
- indent/mail.vim
- macros/accents.vim
- macros/editexisting.vim
- syntax/bash.vim
- syntax/shared/typescriptcommon.vim
- syntax/tar.vim
- syntax/typescript.vim
- syntax/typescriptreact.vim
- syntax/zimbu.vim

Maybe future patches will address that.

Also exclude changes to .po files that didn't apply automatically (the
`:messages` maintainer string isn't used in Nvim anyway).

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/autoload/ccomplete.lua | 7 ++++---
 runtime/autoload/gzip.vim      | 5 +++--
 runtime/autoload/paste.vim     | 5 +++--
 runtime/colors/default.vim     | 5 +++--
 runtime/compiler/README.txt    | 2 +-
 runtime/compiler/msvc.vim      | 5 +++--
 runtime/delmenu.vim            | 5 +++--
 runtime/doc/intro.txt          | 9 ++++++---
 runtime/doc/uganda.txt         | 4 ++--
 runtime/ftoff.vim              | 5 +++--
 runtime/ftplugin.vim           | 5 +++--
 runtime/ftplugin/aap.vim       | 5 +++--
 runtime/ftplugin/btm.vim       | 5 +++--
 runtime/ftplugin/c.vim         | 5 +++--
 runtime/ftplugin/cpp.vim       | 5 +++--
 runtime/ftplugin/diff.vim      | 5 +++--
 runtime/ftplugin/mail.vim      | 5 +++--
 runtime/ftplugin/make.vim      | 5 +++--
 runtime/ftplugin/objc.vim      | 5 +++--
 runtime/ftplugin/vim.vim       | 5 +++--
 runtime/ftplugin/zimbu.vim     | 5 +++--
 runtime/ftplugof.vim           | 5 +++--
 runtime/indent.vim             | 5 +++--
 runtime/indent/README.txt      | 6 +++---
 runtime/indent/aap.vim         | 5 +++--
 runtime/indent/c.vim           | 5 +++--
 runtime/indent/cpp.vim         | 5 +++--
 runtime/indent/cuda.vim        | 5 +++--
 runtime/indent/python.vim      | 7 ++++---
 runtime/indent/vim.vim         | 5 +++--
 runtime/indent/xhtml.vim       | 5 +++--
 runtime/indent/zimbu.vim       | 5 +++--
 runtime/indoff.vim             | 5 +++--
 runtime/macros/less.vim        | 5 +++--
 runtime/makemenu.vim           | 5 +++--
 runtime/menu.vim               | 5 +++--
 runtime/mswin.vim              | 5 +++--
 runtime/optwin.vim             | 5 +++--
 runtime/plugin/gzip.vim        | 5 +++--
 runtime/plugin/matchparen.vim  | 5 +++--
 runtime/synmenu.vim            | 5 +++--
 runtime/syntax/README.txt      | 7 ++++---
 runtime/syntax/aap.vim         | 5 +++--
 runtime/syntax/c.vim           | 5 +++--
 runtime/syntax/colortest.vim   | 5 +++--
 runtime/syntax/conf.vim        | 5 +++--
 runtime/syntax/ctrlh.vim       | 5 +++--
 runtime/syntax/diff.vim        | 7 ++++---
 runtime/syntax/help.vim        | 5 +++--
 runtime/syntax/manual.vim      | 5 +++--
 runtime/syntax/model.vim       | 5 +++--
 runtime/syntax/nosyntax.vim    | 5 +++--
 runtime/syntax/qf.vim          | 5 +++--
 runtime/syntax/synload.vim     | 5 +++--
 runtime/syntax/syntax.vim      | 5 +++--
 runtime/syntax/template.vim    | 5 +++--
 runtime/syntax/vgrindefs.vim   | 5 +++--
 runtime/syntax/viminfo.vim     | 5 +++--
 58 files changed, 178 insertions(+), 121 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/ccomplete.lua b/runtime/autoload/ccomplete.lua
index f4a3eabd9a..ce85e84f7a 100644
--- a/runtime/autoload/ccomplete.lua
+++ b/runtime/autoload/ccomplete.lua
@@ -24,10 +24,11 @@ local SearchMembers = nil
 -- vim9script
 
 -- # Vim completion script
--- # Language:     C
--- # Maintainer:   Bram Moolenaar <Bram@vim.org>
+-- # Language:	C
+-- # Maintainer:	The Vim Project <https://github.com/vim/vim>
+-- # Last Change:	2023 Aug 10
 -- #		Rewritten in Vim9 script by github user lacygoill
--- # Last Change:  2022 Jan 31
+-- # Former Maintainer:   Bram Moolenaar <Bram@vim.org>
 
 prepended = ''
 grepCache = vim.empty_dict()
diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim
index e4adec0947..95dd906794 100644
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -1,6 +1,7 @@
 " Vim autoload file for editing compressed files.
-" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Sep 28
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer: Bram Moolenaar <Bram@vim.org>
 
 " These functions are used by the gzip plugin.
 
diff --git a/runtime/autoload/paste.vim b/runtime/autoload/paste.vim
index 2d787e7a1d..1ba336c2b3 100644
--- a/runtime/autoload/paste.vim
+++ b/runtime/autoload/paste.vim
@@ -1,6 +1,7 @@
 " Vim support file to help with paste mappings and menus
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Jan 27
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Define the string to use for items that are present both in Edit, Popup and
 " Toolbar menu.  Also used in mswin.vim and macmap.vim.
diff --git a/runtime/colors/default.vim b/runtime/colors/default.vim
index 70311571db..d2960fa78b 100644
--- a/runtime/colors/default.vim
+++ b/runtime/colors/default.vim
@@ -1,6 +1,7 @@
 " Vim color file
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2001 Jul 23
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " This is the default color scheme.  It doesn't define the Normal
 " highlighting, it uses whatever the colors used to be.
diff --git a/runtime/compiler/README.txt b/runtime/compiler/README.txt
index 3f0b97b83e..dccf4a9762 100644
--- a/runtime/compiler/README.txt
+++ b/runtime/compiler/README.txt
@@ -8,4 +8,4 @@ If you want to write your own compiler plugin, have a look at the other files
 for how to do it, the format is simple.
 
 If you think a compiler plugin you have written is useful for others, please
-send it to Bram@vim.org.
+send it to the vim-dev mailing list: <vim-dev@vim.org>
diff --git a/runtime/compiler/msvc.vim b/runtime/compiler/msvc.vim
index efe36c4da2..0d5660c103 100644
--- a/runtime/compiler/msvc.vim
+++ b/runtime/compiler/msvc.vim
@@ -1,7 +1,8 @@
 " Vim compiler file
 " Compiler:	Microsoft Visual C
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 Sep 20
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 if exists("current_compiler")
   finish
diff --git a/runtime/delmenu.vim b/runtime/delmenu.vim
index ef663c73b4..b614851d89 100644
--- a/runtime/delmenu.vim
+++ b/runtime/delmenu.vim
@@ -1,8 +1,9 @@
 " This Vim script deletes all the menus, so that they can be redefined.
 " Warning: This also deletes all menus defined by the user!
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Dec 10
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 aunmenu *
 tlunmenu *
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index afb67373fd..a39d07e3f2 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -88,9 +88,9 @@ Nvim development is funded separately from Vim:
 	https://neovim.io/#sponsor
 
 ==============================================================================
-Credits				*credits*
+Credits							*credits*
 
-Most of Vim was written by Bram Moolenaar <Bram@vim.org>.
+Most of Vim was written by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|
 
 Parts of the documentation come from several Vi manuals, written by:
 	W.N. Joy
@@ -194,7 +194,7 @@ Elvis	Another Vi clone, made by Steve Kirkendall.  Very compact but isn't
 Vim	Nvim is based on Vim.  https://www.vim.org/
 
 ==============================================================================
-Bram Moolenaar                                    *Bram* *brammool*
+Bram Moolenaar			*Bram* *Moolenaar* *Bram-Moolenaar* *brammool*
 
 Nvim is a fork of the Vim ("Vi IMproved") text editor, which was originally
 developed by Bram Moolenaar.  Searching his name within the source code of
@@ -203,6 +203,9 @@ On August 3, 2023, he passed away at the age of 62.  If Vim or Nvim have been
 of use to you in your life, please read |Uganda| and consider honoring his
 memory however you may see fit.
 
+Obituary Articles: https://github.com/vim/vim/discussions/12742
+Say Farewell: https://github.com/vim/vim/discussions/12737
+
 ==============================================================================
 Notation						*notation*
 
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index fc38f5b73c..42e275c230 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -46,8 +46,8 @@ II) It is allowed to distribute a modified (or extended) version of Vim,
 	  maintainer will do with your changes and under what license they
 	  will be distributed is negotiable.  If there has been no negotiation
 	  then this license, or a later version, also applies to your changes.
-	  The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
-	  changes it will be announced in appropriate places (most likely
+	  The current maintainers are listed here: https://github.com/orgs/vim/people.
+	  If this changes it will be announced in appropriate places (most likely
 	  vim.sf.net, www.vim.org and/or comp.editors).  When it is completely
 	  impossible to contact the maintainer, the obligation to send him
 	  your changes ceases.  Once the maintainer has confirmed that he has
diff --git a/runtime/ftoff.vim b/runtime/ftoff.vim
index 377c6ef829..a33b0962d0 100644
--- a/runtime/ftoff.vim
+++ b/runtime/ftoff.vim
@@ -1,7 +1,8 @@
 " Vim support file to switch off detection of file types
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2001 Jun 11
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 if exists("did_load_filetypes")
   unlet did_load_filetypes
diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim
index 7b55134a4b..2c56241398 100644
--- a/runtime/ftplugin.vim
+++ b/runtime/ftplugin.vim
@@ -1,7 +1,8 @@
 " Vim support file to switch on loading plugins for file types
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2006 Apr 30
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 if exists("did_load_ftplugin")
   finish
diff --git a/runtime/ftplugin/aap.vim b/runtime/ftplugin/aap.vim
index b5065e5157..df839c99ae 100644
--- a/runtime/ftplugin/aap.vim
+++ b/runtime/ftplugin/aap.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	Aap recipe
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Nov 14
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/btm.vim b/runtime/ftplugin/btm.vim
index d3dc5b75f5..1c2c68599d 100644
--- a/runtime/ftplugin/btm.vim
+++ b/runtime/ftplugin/btm.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	BTM
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2004 Jul 06
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/c.vim b/runtime/ftplugin/c.vim
index cfaf26f66c..83fb9ead68 100644
--- a/runtime/ftplugin/c.vim
+++ b/runtime/ftplugin/c.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	C
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Apr 08
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/cpp.vim b/runtime/ftplugin/cpp.vim
index 58c4e4b24a..cb425aa8e7 100644
--- a/runtime/ftplugin/cpp.vim
+++ b/runtime/ftplugin/cpp.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	C++
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Jul 26
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/diff.vim b/runtime/ftplugin/diff.vim
index bf37d464c0..f2a0820be9 100644
--- a/runtime/ftplugin/diff.vim
+++ b/runtime/ftplugin/diff.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	Diff
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Nov 14
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/mail.vim b/runtime/ftplugin/mail.vim
index f12022305f..3cef84f528 100644
--- a/runtime/ftplugin/mail.vim
+++ b/runtime/ftplugin/mail.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	Mail
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Oct 23
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/make.vim b/runtime/ftplugin/make.vim
index 168bc38eb3..7227bb3739 100644
--- a/runtime/ftplugin/make.vim
+++ b/runtime/ftplugin/make.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	Make
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Oct 16
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/objc.vim b/runtime/ftplugin/objc.vim
index e41beb5dad..d129b33c1c 100644
--- a/runtime/ftplugin/objc.vim
+++ b/runtime/ftplugin/objc.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	Objective C
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2003 Jan 15
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim
index a2cbc28971..3b10c95c80 100644
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin
 " Language:	Vim
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2023 Feb 07
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/zimbu.vim b/runtime/ftplugin/zimbu.vim
index cbe2f55572..94d6be758d 100644
--- a/runtime/ftplugin/zimbu.vim
+++ b/runtime/ftplugin/zimbu.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language:	Zimbu
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Sep 07
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugof.vim b/runtime/ftplugof.vim
index 7828ff2c15..593786a860 100644
--- a/runtime/ftplugof.vim
+++ b/runtime/ftplugof.vim
@@ -1,7 +1,8 @@
 " Vim support file to switch off loading plugins for file types
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2011 Oct 20
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 if exists("did_load_ftplugin")
   unlet did_load_ftplugin
diff --git a/runtime/indent.vim b/runtime/indent.vim
index e4ddc09401..3f38ff28b6 100644
--- a/runtime/indent.vim
+++ b/runtime/indent.vim
@@ -1,7 +1,8 @@
 " Vim support file to switch on loading indent files for file types
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2008 Feb 22
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 if exists("did_indent_on")
   finish
diff --git a/runtime/indent/README.txt b/runtime/indent/README.txt
index 649870636e..8628ecccb7 100644
--- a/runtime/indent/README.txt
+++ b/runtime/indent/README.txt
@@ -6,9 +6,9 @@ at ":help indent-expression".  Looking at the existing files should give you
 inspiration.
 
 If you make a new indent file which would be useful for others, please send it
-to Bram@vim.org.  Include instructions for detecting the file type for this
-language, by file name extension or by checking a few lines in the file.
-And please stick to the rules below.
+to the vim-dev mailing list <vim-dev@vim.org>.  Include instructions for
+detecting the file type for this language, by file name extension or by
+checking a few lines in the file. And please stick to the rules below.
 
 If you have remarks about an existing file, send them to the maintainer of
 that file.  Only when you get no response send a message to Bram@vim.org.
diff --git a/runtime/indent/aap.vim b/runtime/indent/aap.vim
index 35828b4c1a..23c104985e 100644
--- a/runtime/indent/aap.vim
+++ b/runtime/indent/aap.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	Aap recipe
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 24
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indent/c.vim b/runtime/indent/c.vim
index e224382f63..7f285e1b98 100644
--- a/runtime/indent/c.vim
+++ b/runtime/indent/c.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	C
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Mar 27
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indent/cpp.vim b/runtime/indent/cpp.vim
index ffa37d7208..bb4dfd185e 100644
--- a/runtime/indent/cpp.vim
+++ b/runtime/indent/cpp.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	C++
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2008 Nov 29
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indent/cuda.vim b/runtime/indent/cuda.vim
index 68ee9cec0c..5980ddda44 100644
--- a/runtime/indent/cuda.vim
+++ b/runtime/indent/cuda.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	CUDA
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2008 Nov 29
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim
index 8c3d0b0670..42ab4f3778 100644
--- a/runtime/indent/python.vim
+++ b/runtime/indent/python.vim
@@ -1,8 +1,9 @@
 " Vim indent file
-" Language:		Python
-" Maintainer:		Bram Moolenaar <Bram@vim.org>
+" Language:	Python
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 " Original Author:	David Bustos <bustos@caltech.edu>
-" Last Change:		2021 Sep 26
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index 3beb70d255..b2fb57f51f 100644
--- a/runtime/indent/vim.vim
+++ b/runtime/indent/vim.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	Vim script
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Jun 24
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indent/xhtml.vim b/runtime/indent/xhtml.vim
index 2197b7901c..e5c9cc307f 100644
--- a/runtime/indent/xhtml.vim
+++ b/runtime/indent/xhtml.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	XHTML
-" Maintainer:	Bram Moolenaar <Bram@vim.org> (for now)
-" Last Change:	2005 Jun 24
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indent/zimbu.vim b/runtime/indent/zimbu.vim
index 0e6e2ab1d1..08369e42e5 100644
--- a/runtime/indent/zimbu.vim
+++ b/runtime/indent/zimbu.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	Zimbu
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Sep 26
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indoff.vim b/runtime/indoff.vim
index 0d930352bb..57d5e5400e 100644
--- a/runtime/indoff.vim
+++ b/runtime/indoff.vim
@@ -1,7 +1,8 @@
 " Vim support file to switch off loading indent files for file types
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2001 Jun 11
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 if exists("did_indent_on")
   unlet did_indent_on
diff --git a/runtime/macros/less.vim b/runtime/macros/less.vim
index a4f96f340e..c99c636e59 100644
--- a/runtime/macros/less.vim
+++ b/runtime/macros/less.vim
@@ -1,6 +1,7 @@
 " Vim script to work like "less"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Dec 17
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Avoid loading this file twice, allow the user to define his own script.
 if exists("loaded_less")
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 6173d8b691..8da7c0b68c 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -1,6 +1,7 @@
 " Script to define the syntax menu in synmenu.vim
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Dec 07
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " This is used by "make menu" in the src directory.
 edit <sfile>:p:h/synmenu.vim
diff --git a/runtime/menu.vim b/runtime/menu.vim
index d6f22b314c..20a2611aa5 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -1,8 +1,9 @@
 " Vim support file to define the default menus
 " You can also use this as a start for your own set of menus.
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2023 May 03
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
diff --git a/runtime/mswin.vim b/runtime/mswin.vim
index 482b720c53..815667ead9 100644
--- a/runtime/mswin.vim
+++ b/runtime/mswin.vim
@@ -1,7 +1,8 @@
 " Set options and add mapping such that Vim behaves a lot like MS-Windows
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2018 Dec 07
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Bail out if this isn't wanted.
 if exists("g:skip_loading_mswin") && g:skip_loading_mswin
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index b7b9c61123..647859e359 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,8 @@
 " These commands create the option window.
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Dec 16
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " If there already is an option window, jump to that one.
 let buf = bufnr('option-window')
diff --git a/runtime/plugin/gzip.vim b/runtime/plugin/gzip.vim
index 7214488579..c02bd99567 100644
--- a/runtime/plugin/gzip.vim
+++ b/runtime/plugin/gzip.vim
@@ -1,6 +1,7 @@
 " Vim plugin for editing compressed files.
-" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Oct 30
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Exit quickly when:
 " - this plugin was already loaded
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index e19b283228..b33ecd557c 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,7 @@
 " Vim plugin for showing matching parens
-" Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2022 Dec 01
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index a664e7689d..8a8c6a2b90 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -1,8 +1,9 @@
 " Vim support file to define the syntax selection menu
 " This file is normally sourced from menu.vim.
 "
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Oct 04
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Define the SetSyn function, used for the Syntax menu entries.
 " Set 'filetype' and also 'syntax' if it is manually selected.
diff --git a/runtime/syntax/README.txt b/runtime/syntax/README.txt
index d6a86e5ca9..8eee0ea20a 100644
--- a/runtime/syntax/README.txt
+++ b/runtime/syntax/README.txt
@@ -28,9 +28,10 @@ whitespace.vim  View Tabs and Spaces.
 If you want to write a syntax file, read the docs at ":help usr_44.txt".
 
 If you make a new syntax file which would be useful for others, please send it
-to Bram@vim.org.  Include instructions for detecting the file type for this
-language, by file name extension or by checking a few lines in the file.
-And please write the file in a portable way, see ":help 44.12".
+to the vim-dev mailing list <vim-dev@vim.org>.  Include instructions for
+detecting the file type for this language, by file name extension or by
+checking a few lines in the file. And please write the file in a portable way,
+see ":help 44.12".
 
 If you have remarks about an existing file, send them to the maintainer of
 that file.  Only when you get no response send a message to Bram@vim.org.
diff --git a/runtime/syntax/aap.vim b/runtime/syntax/aap.vim
index 8399a4d224..87cedab30f 100644
--- a/runtime/syntax/aap.vim
+++ b/runtime/syntax/aap.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	A-A-P recipe
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2004 Jun 13
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 04b132d3ff..5ed8fdc847 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	C
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2023 Mar 08
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/colortest.vim b/runtime/syntax/colortest.vim
index 58de7aaf13..1dd860c1d3 100644
--- a/runtime/syntax/colortest.vim
+++ b/runtime/syntax/colortest.vim
@@ -1,7 +1,8 @@
 " Vim script for testing colors
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
 " Contributors:	Rafael Garcia-Suarez, Charles Campbell
-" Last Change:	2008 Jun 04
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " edit this file, then do ":source %", and check if the colors match
 
diff --git a/runtime/syntax/conf.vim b/runtime/syntax/conf.vim
index 6a78ef8c6e..15a1fffab3 100644
--- a/runtime/syntax/conf.vim
+++ b/runtime/syntax/conf.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	generic configure file
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 May 01
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/ctrlh.vim b/runtime/syntax/ctrlh.vim
index b4bf3477e6..b34f335785 100644
--- a/runtime/syntax/ctrlh.vim
+++ b/runtime/syntax/ctrlh.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	CTRL-H (e.g., ASCII manpages)
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 20
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Existing syntax is kept, this file can be used as an addition
 
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index 408556ac13..4cadf5dae8 100644
--- a/runtime/syntax/diff.vim
+++ b/runtime/syntax/diff.vim
@@ -1,8 +1,9 @@
 " Vim syntax file
 " Language:	Diff (context or unified)
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-"               Translations by Jakson Alves de Aquino.
-" Last Change:	2020 Dec 30
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+"		Translations by Jakson Alves de Aquino.
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index 8b469d7242..f1e650b2fb 100644
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Vim help file
-" Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2022 Nov 13
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/manual.vim b/runtime/syntax/manual.vim
index c0e53fa7b4..8388336f25 100644
--- a/runtime/syntax/manual.vim
+++ b/runtime/syntax/manual.vim
@@ -1,6 +1,7 @@
 " Vim syntax support file
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Feb 01
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " This file is used for ":syntax manual".
 " It installs the Syntax autocommands, but no the FileType autocommands.
diff --git a/runtime/syntax/model.vim b/runtime/syntax/model.vim
index 5f3b7f8721..ea661eb5b5 100644
--- a/runtime/syntax/model.vim
+++ b/runtime/syntax/model.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Model
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 20
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " very basic things only (based on the vgrindefs file).
 " If you use this language, please improve it, and send me the patches!
diff --git a/runtime/syntax/nosyntax.vim b/runtime/syntax/nosyntax.vim
index 0ab3412373..a761d712b7 100644
--- a/runtime/syntax/nosyntax.vim
+++ b/runtime/syntax/nosyntax.vim
@@ -1,6 +1,7 @@
 " Vim syntax support file
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Apr 16
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " This file is used for ":syntax off".
 " It removes the autocommands and stops highlighting for all buffers.
diff --git a/runtime/syntax/qf.vim b/runtime/syntax/qf.vim
index 5c987a97b6..6f2ea6a92e 100644
--- a/runtime/syntax/qf.vim
+++ b/runtime/syntax/qf.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Quickfix window
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2001 Jan 15
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index 80685a5213..3182c590b7 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -1,6 +1,7 @@
 " Vim syntax support file
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Apr 12
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " This file sets up for syntax highlighting.
 " It is loaded from "syntax.vim" and "manual.vim".
diff --git a/runtime/syntax/syntax.vim b/runtime/syntax/syntax.vim
index 5ec99c7e05..887da05bfe 100644
--- a/runtime/syntax/syntax.vim
+++ b/runtime/syntax/syntax.vim
@@ -1,6 +1,7 @@
 " Vim syntax support file
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Apr 12
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " This file is used for ":syntax on".
 " It installs the autocommands and starts highlighting for all buffers.
diff --git a/runtime/syntax/template.vim b/runtime/syntax/template.vim
index 5bf580fc11..a59b7b0af9 100644
--- a/runtime/syntax/template.vim
+++ b/runtime/syntax/template.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Generic template
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 May 06
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/vgrindefs.vim b/runtime/syntax/vgrindefs.vim
index 3de31b1437..a194c108cb 100644
--- a/runtime/syntax/vgrindefs.vim
+++ b/runtime/syntax/vgrindefs.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Vgrindefs
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 20
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " The Vgrindefs file is used to specify a language for vgrind
 
diff --git a/runtime/syntax/viminfo.vim b/runtime/syntax/viminfo.vim
index 667e1bab2a..06c59766d7 100644
--- a/runtime/syntax/viminfo.vim
+++ b/runtime/syntax/viminfo.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Vim .viminfo file
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Jun 05
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
-- 
cgit 


From fc0ee871de2f56dbb80879c912203a6372c54e1c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 12 Aug 2023 17:54:04 +0200
Subject: fix(treesitter)!: remove deprecated legacy injection format

---
 runtime/doc/news.txt                        |  2 +
 runtime/lua/vim/treesitter/languagetree.lua | 67 ++---------------------------
 2 files changed, 6 insertions(+), 63 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index e9c493479c..2396f4f5a2 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -202,6 +202,8 @@ The following deprecated functions or APIs were removed.
 • Vimball support is removed.
   - :Vimuntar command removed.
 
+• Support for legacy treesitter injection queries is removed.
+
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
 
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index b4c9027794..4b419c4744 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -769,65 +769,6 @@ function LanguageTree:_get_injection(match, metadata)
   return lang, combined, ranges
 end
 
----@private
----@param match table<integer,TSNode>
----@param metadata TSMetadata
----@return string, boolean, Range6[]
-function LanguageTree:_get_injection_deprecated(match, metadata)
-  local lang = nil ---@type string
-  local ranges = {} ---@type Range6[]
-  local combined = metadata.combined ~= nil
-
-  -- Directives can configure how injections are captured as well as actual node captures.
-  -- This allows more advanced processing for determining ranges and language resolution.
-  if metadata.content then
-    local content = metadata.content ---@type any
-
-    -- Allow for captured nodes to be used
-    if type(content) == 'number' then
-      content = { match[content]:range() }
-    end
-
-    if type(content) == 'table' and #content >= 4 then
-      vim.list_extend(ranges, content)
-    end
-  end
-
-  local mlang = metadata.language
-  if mlang ~= nil then
-    assert(type(mlang) == 'string')
-    lang = mlang
-  end
-
-  -- You can specify the content and language together
-  -- using a tag with the language, for example
-  -- @javascript
-  for id, node in pairs(match) do
-    local name = self._injection_query.captures[id]
-
-    -- Lang should override any other language tag
-    if name == 'language' and not lang then
-      lang = vim.treesitter.get_node_text(node, self._source, { metadata = metadata[id] })
-    elseif name == 'combined' then
-      combined = true
-    elseif name == 'content' and #ranges == 0 then
-      ranges[#ranges + 1] = vim.treesitter.get_range(node, self._source, metadata[id])
-      -- Ignore any tags that start with "_"
-      -- Allows for other tags to be used in matches
-    elseif string.sub(name, 1, 1) ~= '_' then
-      if not lang then
-        lang = name
-      end
-
-      if #ranges == 0 then
-        ranges[#ranges + 1] = vim.treesitter.get_range(node, self._source, metadata[id])
-      end
-    end
-  end
-
-  return lang, combined, ranges
-end
-
 --- Gets language injection points by language.
 ---
 --- This is where most of the injection processing occurs.
@@ -852,11 +793,11 @@ function LanguageTree:_get_injections()
       self._injection_query:iter_matches(root_node, self._source, start_line, end_line + 1)
     do
       local lang, combined, ranges = self:_get_injection(match, metadata)
-      if not lang then
-        -- TODO(lewis6991): remove after 0.9 (#20434)
-        lang, combined, ranges = self:_get_injection_deprecated(match, metadata)
+      if lang then
+        add_injection(injections, index, pattern, lang, combined, ranges)
+      else
+        self:_log('match from injection query failed for pattern', pattern)
       end
-      add_injection(injections, index, pattern, lang, combined, ranges)
     end
   end
 
-- 
cgit 


From 842a47d6a4103a75e33c2c0023dbae5ad2c0f534 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 15 Aug 2023 19:16:19 +0800
Subject: vim-patch:9.0.1704: Cannot use positional arguments for printf()
 (#24719)

Problem: Cannot use positional arguments for printf()
Solution: Support positional arguments in string formatting

closes: vim/vim#12140

https://github.com/vim/vim/commit/0c6181fec4c362eb9682d5af583341eb20cb1af5

Co-authored-by: Christ van Willegen <cvwillegen@gmail.com>
---
 runtime/doc/builtin.txt         | 111 +++++++++++++++++++++++++++++++++++++++-
 runtime/lua/vim/_meta/vimfn.lua | 111 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 220 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index d05f488ed5..7356f644a1 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5010,7 +5010,11 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 		The "%" starts a conversion specification.  The following
 		arguments appear in sequence:
 
-			%  [flags]  [field-width]  [.precision]  type
+			% [pos-argument] [flags] [field-width] [.precision] type
+
+		pos-argument
+			At most one positional argument specifier. These
+			take the form {n$}, where n is >= 1.
 
 		flags
 			Zero or more of the following flags:
@@ -5079,6 +5083,13 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 <		This limits the length of the text used from "line" to
 		"width" bytes.
 
+		If the argument to be formatted is specified using a posional
+		argument specifier, and a '*' is used to indicate that a
+		number argument is to be used to specify the width or
+		precision, the argument(s) to be used must also be specified
+		using a {n$} positional argument specifier. See |printf-$|.
+
+
 		The conversion specifiers and their meanings are:
 
 				*printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X*
@@ -5166,6 +5177,104 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 		of "%" items.  If there are not sufficient or too many
 		arguments an error is given.  Up to 18 arguments can be used.
 
+							*printf-$*
+		In certain languages, error and informative messages are
+		more readable when the order of words is different from the
+		corresponding message in English. To accomodate translations
+		having a different word order, positional arguments may be
+		used to indicate this. For instance: >vim
+
+			#, c-format
+			msgid "%s returning %s"
+			msgstr "waarde %2$s komt terug van %1$s"
+<
+		In this example, the sentence has its 2 string arguments reversed
+		in the output. >vim
+
+			echo printf(
+				"In The Netherlands, vim's creator's name is: %1$s %2$s",
+				"Bram", "Moolenaar")
+<			In The Netherlands, vim's creator's name is: Bram Moolenaar >vim
+
+			echo printf(
+				"In Belgium, vim's creator's name is: %2$s %1$s",
+				"Bram", "Moolenaar")
+<			In Belgium, vim's creator's name is: Moolenaar Bram
+
+		Width (and precision) can be specified using the '*' specifier.
+		In this case, you must specify the field width position in the
+		argument list. >vim
+
+			echo printf("%1$*2$.*3$d", 1, 2, 3)
+<			001 >vim
+			echo printf("%2$*3$.*1$d", 1, 2, 3)
+<			  2 >vim
+			echo printf("%3$*1$.*2$d", 1, 2, 3)
+<			03 >vim
+			echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
+<			1.414
+
+		You can mix specifying the width and/or precision directly
+		and via positional arguments: >vim
+
+			echo printf("%1$4.*2$f", 1.4142135, 6)
+<			1.414214 >vim
+			echo printf("%1$*2$.4f", 1.4142135, 6)
+<			1.4142 >vim
+			echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
+<			  1.41
+
+							*E1400*
+		You cannot mix positional and non-positional arguments: >vim
+			echo printf("%s%1$s", "One", "Two")
+<			E1400: Cannot mix positional and non-positional
+			arguments: %s%1$s
+
+							*E1401*
+		You cannot skip a positional argument in a format string: >vim
+			echo printf("%3$s%1$s", "One", "Two", "Three")
+<			E1401: format argument 2 unused in $-style
+			format: %3$s%1$s
+
+							*E1402*
+		You can re-use a [field-width] (or [precision]) argument: >vim
+			echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
+<			1 at width 2 is: 01
+
+		However, you can't use it as a different type: >vim
+			echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
+<			E1402: Positional argument 2 used as field
+			width reused as different type: long int/int
+
+							*E1403*
+		When a positional argument is used, but not the correct number
+		or arguments is given, an error is raised: >vim
+			echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
+<			E1403: Positional argument 3 out of bounds:
+			%1$d at width %2$d is: %01$*2$.*3$d
+
+		Only the first error is reported: >vim
+			echo printf("%01$*2$.*3$d %4$d", 1, 2)
+<			E1403: Positional argument 3 out of bounds:
+			%01$*2$.*3$d %4$d
+
+							*E1404*
+		A positional argument can be used more than once: >vim
+			echo printf("%1$s %2$s %1$s", "One", "Two")
+<			One Two One
+
+		However, you can't use a different type the second time: >vim
+			echo printf("%1$s %2$s %1$d", "One", "Two")
+<			E1404: Positional argument 1 type used
+			inconsistently: int/string
+
+							*E1405*
+		Various other errors that lead to a format string being
+		wrongly formatted lead to: >vim
+			echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
+<			E1405: Invalid format specifier:
+			%1$d at width %2$d is: %01$*2$.3$d
+
 prompt_getprompt({buf})                                     *prompt_getprompt()*
 		Returns the effective prompt text for buffer {buf}.  {buf} can
 		be a buffer name or number.  See |prompt-buffer|.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index d5d9229ffb..acf1b3a0f5 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5989,7 +5989,11 @@ function vim.fn.prevnonblank(lnum) end
 --- The "%" starts a conversion specification.  The following
 --- arguments appear in sequence:
 ---
----   %  [flags]  [field-width]  [.precision]  type
+---   % [pos-argument] [flags] [field-width] [.precision] type
+---
+--- pos-argument
+---   At most one positional argument specifier. These
+---   take the form {n$}, where n is >= 1.
 ---
 --- flags
 ---   Zero or more of the following flags:
@@ -6058,6 +6062,13 @@ function vim.fn.prevnonblank(lnum) end
 --- <This limits the length of the text used from "line" to
 --- "width" bytes.
 ---
+--- If the argument to be formatted is specified using a posional
+--- argument specifier, and a '*' is used to indicate that a
+--- number argument is to be used to specify the width or
+--- precision, the argument(s) to be used must also be specified
+--- using a {n$} positional argument specifier. See |printf-$|.
+---
+---
 --- The conversion specifiers and their meanings are:
 ---
 ---     *printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X*
@@ -6145,6 +6156,104 @@ function vim.fn.prevnonblank(lnum) end
 --- of "%" items.  If there are not sufficient or too many
 --- arguments an error is given.  Up to 18 arguments can be used.
 ---
+---           *printf-$*
+--- In certain languages, error and informative messages are
+--- more readable when the order of words is different from the
+--- corresponding message in English. To accomodate translations
+--- having a different word order, positional arguments may be
+--- used to indicate this. For instance: >vim
+---
+---   #, c-format
+---   msgid "%s returning %s"
+---   msgstr "waarde %2$s komt terug van %1$s"
+--- <
+--- In this example, the sentence has its 2 string arguments reversed
+--- in the output. >vim
+---
+---   echo printf(
+---     "In The Netherlands, vim's creator's name is: %1$s %2$s",
+---     "Bram", "Moolenaar")
+--- <  In The Netherlands, vim's creator's name is: Bram Moolenaar >vim
+---
+---   echo printf(
+---     "In Belgium, vim's creator's name is: %2$s %1$s",
+---     "Bram", "Moolenaar")
+--- <  In Belgium, vim's creator's name is: Moolenaar Bram
+---
+--- Width (and precision) can be specified using the '*' specifier.
+--- In this case, you must specify the field width position in the
+--- argument list. >vim
+---
+---   echo printf("%1$*2$.*3$d", 1, 2, 3)
+--- <  001 >vim
+---   echo printf("%2$*3$.*1$d", 1, 2, 3)
+--- <    2 >vim
+---   echo printf("%3$*1$.*2$d", 1, 2, 3)
+--- <  03 >vim
+---   echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
+--- <  1.414
+---
+--- You can mix specifying the width and/or precision directly
+--- and via positional arguments: >vim
+---
+---   echo printf("%1$4.*2$f", 1.4142135, 6)
+--- <  1.414214 >vim
+---   echo printf("%1$*2$.4f", 1.4142135, 6)
+--- <  1.4142 >vim
+---   echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
+--- <    1.41
+---
+---           *E1400*
+--- You cannot mix positional and non-positional arguments: >vim
+---   echo printf("%s%1$s", "One", "Two")
+--- <  E1400: Cannot mix positional and non-positional
+---   arguments: %s%1$s
+---
+---           *E1401*
+--- You cannot skip a positional argument in a format string: >vim
+---   echo printf("%3$s%1$s", "One", "Two", "Three")
+--- <  E1401: format argument 2 unused in $-style
+---   format: %3$s%1$s
+---
+---           *E1402*
+--- You can re-use a [field-width] (or [precision]) argument: >vim
+---   echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
+--- <  1 at width 2 is: 01
+---
+--- However, you can't use it as a different type: >vim
+---   echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
+--- <  E1402: Positional argument 2 used as field
+---   width reused as different type: long int/int
+---
+---           *E1403*
+--- When a positional argument is used, but not the correct number
+--- or arguments is given, an error is raised: >vim
+---   echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
+--- <  E1403: Positional argument 3 out of bounds:
+---   %1$d at width %2$d is: %01$*2$.*3$d
+---
+--- Only the first error is reported: >vim
+---   echo printf("%01$*2$.*3$d %4$d", 1, 2)
+--- <  E1403: Positional argument 3 out of bounds:
+---   %01$*2$.*3$d %4$d
+---
+---           *E1404*
+--- A positional argument can be used more than once: >vim
+---   echo printf("%1$s %2$s %1$s", "One", "Two")
+--- <  One Two One
+---
+--- However, you can't use a different type the second time: >vim
+---   echo printf("%1$s %2$s %1$d", "One", "Two")
+--- <  E1404: Positional argument 1 type used
+---   inconsistently: int/string
+---
+---           *E1405*
+--- Various other errors that lead to a format string being
+--- wrongly formatted lead to: >vim
+---   echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
+--- <  E1405: Invalid format specifier:
+---   %1$d at width %2$d is: %01$*2$.3$d
+---
 --- @param fmt any
 --- @param expr1? any
 --- @return any
-- 
cgit 


From e72c0cd92090c1fc1e5665a060b3e1d0094d7f30 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Tue, 15 Aug 2023 09:25:51 -0500
Subject: feat(highlight): Allow hyphens (-) in highlight group names (#24714)

Fixes: https://github.com/neovim/neovim/issues/23184
---
 runtime/doc/syntax.txt   | 4 ++--
 runtime/doc/vim_diff.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 703ccd2e01..a89884efba 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -188,8 +188,8 @@ thing.  These are then linked to a highlight group that specifies the color.
 A syntax group name doesn't specify any color or attributes itself.
 
 The name for a highlight or syntax group must consist of ASCII letters,
-digits, underscores, periods and `@` characters.  As a regexp it is
-`[a-zA-Z0-9_.@]*`. The maximum length of a group name is about 200 bytes.
+digits, underscores, periods, hyphens, and `@` characters.  As a regexp it is
+`[a-zA-Z0-9_.@-]*`. The maximum length of a group name is about 200 bytes.
 *E1249*
 
 To be able to allow each user to pick their favorite set of colors, there must
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index d288f31828..64ce466c73 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -494,9 +494,9 @@ Highlight groups:
   using |n| or |N|
   |hl-CursorLine| is low-priority unless foreground color is set
   |hl-VertSplit| superseded by |hl-WinSeparator|
-  Highlight groups names are allowed to contain the characters `.` and `@`.
+  Highlight groups names are allowed to contain the characters `.`, `@`, and `-`.
   It is an error to define a highlight group with a name that doesn't match
-  the regexp `[a-zA-Z0-9_.@]*` (see |group-name|).
+  the regexp `[a-zA-Z0-9_.@-]*` (see |group-name|).
 
 Macro/|recording| behavior
   Replay of a macro recorded during :lmap produces the same actions as when it
-- 
cgit 


From a245dd79a267c8b56866023e84b49d0ecffca65b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 16 Aug 2023 06:28:52 +0800
Subject: vim-patch:9.0.1717: virtcol2col returns last byte of a multi-byte
 char (#24729)

Problem: virtcol2col returns last byte of a multi-byte char
Solution: Make it return the first byte for a multi-byte char

closes: vim/vim#12786
closes: vim/vim#12799

https://github.com/vim/vim/commit/b209b86e6636a16088ccacdac98213416c065bf2

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt         | 3 +++
 runtime/lua/vim/_meta/vimfn.lua | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 7356f644a1..bc5f0948e2 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -8434,6 +8434,9 @@ virtcol2col({winid}, {lnum}, {col})                              *virtcol2col()*
 		{lnum}, then the byte index of the character at the last
 		virtual column is returned.
 
+		For a multi-byte character, the column number of the first
+		byte in the character is returned.
+
 		The {winid} argument can be the window number or the
 		|window-ID|. If this is zero, then the current window is used.
 
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index acf1b3a0f5..d1173e8a42 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -10016,6 +10016,9 @@ function vim.fn.virtcol(expr, list) end
 --- {lnum}, then the byte index of the character at the last
 --- virtual column is returned.
 ---
+--- For a multi-byte character, the column number of the first
+--- byte in the character is returned.
+---
 --- The {winid} argument can be the window number or the
 --- |window-ID|. If this is zero, then the current window is used.
 ---
-- 
cgit 


From 36288578eeab077132f0d84cb6830a97f279f4f3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 16 Aug 2023 00:28:29 +0200
Subject: vim-patch:4868f637b84a

Update syntax/fortran.vim (vim/vim#12798)

Several small improvements including better discrimination of "real" used as a type and as an intrinsic

https://github.com/vim/vim/commit/4868f637b84a18fd162db6eff6d716bf22595fd0

Co-authored-by: Ajit-Thakkar <142174202+Ajit-Thakkar@users.noreply.github.com>
---
 runtime/syntax/fortran.vim | 53 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim
index b5c9b1ef8d..fc6c82b480 100644
--- a/runtime/syntax/fortran.vim
+++ b/runtime/syntax/fortran.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	(v104) 2021 April 06
+" Version:	(v105) 2023 August 14
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
 " Credits:
@@ -11,7 +11,7 @@
 "  Walter Dieudonne, Alexander Wagner, Roman Bertle, Charles Rendleman,
 "  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann,
 "  Stefano Zaghi, Vishnu V. Krishnan, Judicael Grasset, Takuma Yoshida,
-"  Eisuke Kawashima, Andre Chalella, and Fritz Reese.
+"  Eisuke Kawashima, Andre Chalella, Fritz Reese, and Karl D. Hammond.
 
 if exists("b:current_syntax")
   finish
@@ -95,16 +95,14 @@ if exists("fortran_more_precise")
   syn match fortranConstructName "\(\<end\s*do\s\+\)\@11<=\a\w*"
   syn match fortranConstructName "\(\<end\s*if\s\+\)\@11<=\a\w*"
   syn match fortranConstructName "\(\<end\s*select\s\+\)\@15<=\a\w*"
+  syn match fortranConstructName "\(\<\%(exit\|cycle\)\s\+\)\@11<=\a\w*"
 endif
 
 syn match fortranUnitHeader	"\<end\>"
-syn match fortranType		"\<character\>"
-syn match fortranType		"\<complex\>"
-syn match fortranType		"\<integer\>"
-syn match fortranType		"\<real\>"
-syn match fortranType		"\<logical\>"
+syn match fortranType		"\<character\((\s*kind\s*=\w\+)\)\?\>"
+syn match fortranType		"\<complex\((\s*kind\s*=\w\+)\)\?\>"
 syn keyword fortranType		intrinsic
-syn match fortranType		"\<implicit\>"
+syn match fortranType		"\<implicit\>\s\+\(none\)\?"
 syn keyword fortranStructure	dimension
 syn keyword fortranStorageClass	parameter save
 syn match fortranUnitHeader	"\<subroutine\>"
@@ -131,7 +129,8 @@ syn match fortranTypeOb		"\<character\s*\*"
 
 syn match fortranBoolean	"\.\s*\(true\|false\)\s*\."
 
-syn keyword fortranReadWrite	backspace close endfile inquire open print read rewind write
+syn keyword fortranReadWrite	print
+syn match fortranReadWrite	'\<\(backspace\|close\|endfile\|inquire\|open\|read\|rewind\|write\)\ze\s*('
 
 "If tabs are allowed then the left margin checks do not work
 if exists("fortran_have_tabs")
@@ -140,7 +139,7 @@ else
   syn match fortranTab		"\t"
 endif
 
-syn keyword fortranIO		access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit
+syn match fortranIO		'\%(\((\|,\|, *&\n\)\s*\)\@<=\(access\|blank\|direct\|exist\|file\|fmt\|form\|formatted\|iostat\|name\|named\|nextrec\|number\|opened\|rec\|recl\|sequential\|status\|unformatted\|unit\)\ze\s*='
 
 syn keyword fortranIntrinsicR		alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl
 
@@ -151,8 +150,9 @@ syn keyword fortranIntrinsic	abs acos aimag aint anint asin atan atan2 char cmpl
 syn match fortranIntrinsic	"\<len\s*[(,]"me=s+3
 syn match fortranIntrinsic	"\<real\s*("me=s+4
 syn match fortranIntrinsic	"\<logical\s*("me=s+7
-syn match fortranType           "\<implicit\s\+real\>"
-syn match fortranType           "\<implicit\s\+logical\>"
+syn match fortranType           "\<type\>\(\s\+is\>\)\?"
+syn match fortranType		"^\s*\(type\s\+\(is\)\? \)\?\s*\(real\|integer\|logical\|complex\|character\)\>"
+syn match fortranType           "^\s*\(implicit \)\?\s*\(real\|integer\|logical\|complex\|character\)\>"
 
 "Numbers of various sorts
 " Integers
@@ -206,9 +206,6 @@ syn region fortranStringR	start=+'+ end=+'+ contains=fortranContinueMark,fortran
 syn keyword fortranIntrinsicR	dim lge lgt lle llt mod
 syn keyword fortranKeywordDel	assign pause
 
-syn match fortranType           "\<type\>"
-syn keyword fortranType	        none
-
 syn keyword fortranStructure	private public intent optional
 syn keyword fortranStructure	pointer target allocatable
 syn keyword fortranStorageClass	in out
@@ -222,7 +219,8 @@ syn keyword fortranUnitHeader	result operator assignment
 syn match fortranUnitHeader	"\<interface\>"
 syn keyword fortranKeyword	allocate deallocate nullify cycle exit
 syn match fortranConditional	"\<select\>"
-syn keyword fortranConditional	case default where elsewhere
+syn match fortranConditional	"\<case\s\+default\>"
+syn keyword fortranConditional	where elsewhere
 
 syn match fortranOperator	"\(\(>\|<\)=\=\|==\|/=\|=\)"
 syn match fortranOperator	"=>"
@@ -231,8 +229,7 @@ syn region fortranString	start=+"+ end=+"+	contains=fortranLeftMargin,fortranCon
 syn keyword fortranIO		pad position action delim readwrite
 syn keyword fortranIO		eor advance nml
 
-syn keyword fortranIntrinsic	adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack precision present product radix random_number random_seed range repeat reshape rrspacing
-syn keyword fortranIntrinsic	scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify
+syn match fortranIntrinsic '\<\(adjustl\|adjustr\|all\|allocated\|any\|associated\|bit_size\|btest\|ceiling\|count\|cshift\|date_and_time\|digits\|dot_product\|eoshift\|epsilon\|exponent\|floor\|fraction\|huge\|iand\|ibclr\|ibits\|ibset\|ieor\|ior\|ishft\|ishftc\|lbound\|len_trim\|matmul\|maxexponent\|maxloc\|maxval\|merge\|minexponent\|minloc\|minval\|modulo\|mvbits\|nearest\|pack\|precision\|present\|product\|radix\|random_number\|random_seed\|range\|repeat\|reshape\|rrspacing\|scale\|scan\|selected_int_kind\|selected_real_kind\|set_exponent\|shape\|size\|spacing\|spread\|sum\|system_clock\|tiny\|transpose\|trim\|ubound\|unpack\|verify\)\>\ze\s*('
 syn match fortranIntrinsic		"\<not\>\(\s*\.\)\@!"me=s+3
 syn match fortranIntrinsic	"\<kind\>\s*[(,]"me=s+4
 
@@ -306,9 +303,9 @@ if b:fortran_dialect == "f08"
   syn match fortranType               "\<end\s*associate"
   syn match fortranType               "\<enum\s*,\s*bind\s*(\s*c\s*)"
   syn match fortranType               "\<end\s*enum"
-  syn match fortranConditional	"\<select\s*type"
-  syn match fortranConditional        "\<type\s*is\>"
+  syn match fortranConditional	      "\<select\s*type"
   syn match fortranConditional        "\<class\s*is\>"
+  syn match fortranConditional        "\<class\s*default\>"
   syn match fortranUnitHeader         "\<abstract\s*interface\>"
   syn match fortranOperator           "\([\|]\)"
 
@@ -525,11 +522,6 @@ else
   hi! def link fortranConditionalR	fortranConditional
 endif
 
-" CUDA
-hi def link fortranIntrinsicCUDA        fortranIntrinsic
-hi def link fortranTypeCUDA             fortranType
-hi def link fortranStringCUDA           fortranString
-
 hi def link fortranFormatSpec	Identifier
 hi def link fortranFloat	Float
 hi def link fortranPreCondit	PreCondit
@@ -543,8 +535,15 @@ hi def link fortranComment	Comment
 hi def link fortranSerialNumber	Todo
 hi def link fortranTab		Error
 
-" Uncomment the next line if you use extra intrinsics provided by vendors
-"hi def link fortranExtraIntrinsic	Function
+if exists("fortran_CUDA")
+  hi def link fortranIntrinsicCUDA        fortranIntrinsic
+  hi def link fortranTypeCUDA             fortranType
+  hi def link fortranStringCUDA           fortranString
+endif
+
+if exists("fortran_vendor_intrinsics")
+  hi def link fortranExtraIntrinsic	Function
+endif
 
 let b:current_syntax = "fortran"
 
-- 
cgit 


From 93f9bb59247f1f606345ea0863152f2d2d22284c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 16 Aug 2023 00:28:52 +0200
Subject: vim-patch:10f23e10a9f0

Update syntax/muttrc.vim to latest mutt (vim/vim#12797)

Nothing complicated, just lots of tedium keeping the lines wrapped at
reasonable lengths.

https://github.com/vim/vim/commit/10f23e10a9f0ea2a48f9e15f7ee53a20e5e09e91

Co-authored-by: lunasophia <104850249+lunasophia@users.noreply.github.com>
---
 runtime/syntax/muttrc.vim | 291 +++++++++++++++++++++++++---------------------
 1 file changed, 158 insertions(+), 133 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/muttrc.vim b/runtime/syntax/muttrc.vim
index 830664e0eb..bf53a42f94 100644
--- a/runtime/syntax/muttrc.vim
+++ b/runtime/syntax/muttrc.vim
@@ -1,10 +1,10 @@
 " Vim syntax file
 " Language:	Mutt setup files
 " Original:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
-" Maintainer:	Kyle Wheeler <kyle-muttrc.vim@memoryhole.net>
-" Last Change:	21 May 2018
+" Maintainer:	Luna Celeste <luna@unixpoet.dev>
+" Last Change:	14 Aug 2023
 
-" This file covers mutt version 1.10.0
+" This file covers mutt version 2.2.10
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -103,88 +103,96 @@ syn match   muttrcKeyName	contained "<F[0-9]\+>"
 
 syn keyword muttrcVarBool	skipwhite contained 
 			\ allow_8bit allow_ansi arrow_cursor ascii_chars askbcc askcc attach_split
-			\ auto_tag autoedit beep beep_new bounce_delivered braille_friendly
-			\ browser_abbreviate_mailboxes change_folder_next check_mbox_size check_new
-			\ collapse_unread confirmappend confirmcreate crypt_autoencrypt crypt_autopgp
-			\ crypt_autosign crypt_autosmime crypt_confirmhook crypt_opportunistic_encrypt
-			\ crypt_replyencrypt crypt_replysign crypt_replysignencrypted crypt_timestamp
-			\ crypt_use_gpgme crypt_use_pka delete_untag digest_collapse duplicate_threads
-			\ edit_hdrs edit_headers encode_from envelope_from fast_reply fcc_clear
-			\ flag_safe followup_to force_name forw_decode forw_decrypt forw_quote
-			\ forward_decode forward_decrypt forward_quote hdrs header
-			\ header_color_partial help hidden_host hide_limited hide_missing
-			\ hide_thread_subject hide_top_limited hide_top_missing history_remove_dups
-			\ honor_disposition idn_decode idn_encode ignore_linear_white_space
-			\ ignore_list_reply_to imap_check_subscribed imap_list_subscribed imap_passive
-			\ imap_peek imap_servernoise implicit_autoview include_onlyfirst keep_flagged
+			\ auto_tag autoedit auto_subscribe background_edit background_confirm_quit beep beep_new
+			\ bounce_delivered braille_friendly browser_abbreviate_mailboxes browser_sticky_cursor
+			\ change_folder_next check_mbox_size check_new collapse_unread compose_confirm_detach_first
+			\ confirmappend confirmcreate copy_decode_weed count_alternatives crypt_autoencrypt crypt_autopgp
+			\ crypt_autosign crypt_autosmime crypt_confirmhook crypt_protected_headers_read
+			\ crypt_protected_headers_save crypt_protected_headers_write crypt_opportunistic_encrypt
+			\ crypt_opportunistic_encrypt_strong_keys crypt_replyencrypt crypt_replysign
+			\ crypt_replysignencrypted crypt_timestamp crypt_use_gpgme crypt_use_pka cursor_overlay
+			\ delete_untag digest_collapse duplicate_threads edit_hdrs edit_headers encode_from
+			\ envelope_from fast_reply fcc_before_send fcc_clear flag_safe followup_to force_name forw_decode
+			\ forw_decrypt forw_quote forward_decode forward_quote hdrs header
+			\ header_color_partial help hidden_host hide_limited hide_missing hide_thread_subject
+			\ hide_top_limited hide_top_missing history_remove_dups honor_disposition idn_decode idn_encode
+			\ ignore_linear_white_space ignore_list_reply_to imap_check_subscribed imap_condstore imap_deflate
+			\ imap_list_subscribed imap_passive imap_peek imap_qresync imap_servernoise
+			\ implicit_autoview include_encrypted include_onlyfirst keep_flagged local_date_header
 			\ mail_check_recent mail_check_stats mailcap_sanitize maildir_check_cur
 			\ maildir_header_cache_verify maildir_trash mark_old markers menu_move_off
 			\ menu_scroll message_cache_clean meta_key metoo mh_purge mime_forward_decode
-			\ mime_type_query_first narrow_tree pager_stop pgp_auto_decode
+			\ mime_type_query_first muttlisp_inline_eval narrow_tree pager_stop pgp_auto_decode
 			\ pgp_auto_traditional pgp_autoencrypt pgp_autoinline pgp_autosign
-			\ pgp_check_exit pgp_create_traditional pgp_ignore_subkeys pgp_long_ids
-			\ pgp_replyencrypt pgp_replyinline pgp_replysign pgp_replysignencrypted
-			\ pgp_retainable_sigs pgp_self_encrypt pgp_self_encrypt_as pgp_show_unusable
-			\ pgp_strict_enc pgp_use_gpg_agent pipe_decode pipe_split pop_auth_try_all
-			\ pop_last postpone_encrypt postpone_encrypt_as print_decode print_split
-			\ prompt_after read_only reflow_space_quotes reflow_text reflow_wrap
-			\ reply_self resolve resume_draft_files resume_edited_draft_files
-			\ reverse_alias reverse_name reverse_realname rfc2047_parameters save_address
-			\ save_empty save_name score sidebar_folder_indent sidebar_new_mail_only
-			\ sidebar_next_new_wrap sidebar_short_path sidebar_sort sidebar_visible
-			\ sig_dashes sig_on_top smart_wrap smime_ask_cert_label
-			\ smime_decrypt_use_default_key smime_is_default smime_self_encrypt
-			\ smime_self_encrypt_as sort_re ssl_force_tls ssl_use_sslv2 ssl_use_sslv3
-			\ ssl_use_tlsv1 ssl_usesystemcerts ssl_verify_dates ssl_verify_host
-			\ ssl_verify_partial_chains status_on_top strict_mime strict_threads suspend
-			\ text_flowed thorough_search thread_received tilde ts_enabled uncollapse_jump
-			\ use_8bitmime use_domain use_envelope_from use_from use_idn use_ipv6
-			\ uncollapse_new user_agent wait_key weed wrap_search write_bcc
+			\ pgp_check_exit pgp_check_gpg_decrypt_status_fd pgp_create_traditional
+			\ pgp_ignore_subkeys pgp_long_ids pgp_replyencrypt pgp_replyinline
+			\ pgp_replysign pgp_replysignencrypted pgp_retainable_sigs pgp_self_encrypt
+			\ pgp_self_encrypt_as pgp_show_unusable pgp_strict_enc pgp_use_gpg_agent
+			\ pipe_decode pipe_decode_weed pipe_split pop_auth_try_all pop_last postpone_encrypt
+			\ postpone_encrypt_as print_decode print_decode_weed print_split prompt_after read_only
+			\ reflow_space_quotes reflow_text reflow_wrap reply_self resolve
+			\ resume_draft_files resume_edited_draft_files reverse_alias reverse_name
+			\ reverse_realname rfc2047_parameters save_address save_empty save_name score
+			\ sidebar_folder_indent sidebar_new_mail_only sidebar_next_new_wrap
+			\ sidebar_relative_shortpath_indent sidebar_short_path sidebar_sort sidebar_use_mailbox_shortcuts
+			\ sidebar_visible sig_on_top sig_dashes size_show_bytes size_show_fraction size_show_mb
+			\ size_units_on_left smart_wrap smime_ask_cert_label smime_decrypt_use_default_key
+			\ smime_is_default smime_self_encrypt smime_self_encrypt_as sort_re
+			\ ssl_force_tls ssl_use_sslv2 ssl_use_sslv3 ssl_use_tlsv1 ssl_use_tlsv1_3 ssl_usesystemcerts
+			\ ssl_verify_dates ssl_verify_host ssl_verify_partial_chains status_on_top
+			\ strict_mime strict_threads suspend text_flowed thorough_search
+			\ thread_received tilde ts_enabled tunnel_is_secure uncollapse_jump use_8bitmime use_domain
+			\ use_envelope_from use_from use_idn use_ipv6 uncollapse_new user_agent
+			\ wait_key weed wrap_search write_bcc
 			\ nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 syn keyword muttrcVarBool	skipwhite contained 
 			\ noallow_8bit noallow_ansi noarrow_cursor noascii_chars noaskbcc noaskcc
-			\ noattach_split noauto_tag noautoedit nobeep nobeep_new nobounce_delivered
-			\ nobraille_friendly nobrowser_abbreviate_mailboxes nochange_folder_next
-			\ nocheck_mbox_size nocheck_new nocollapse_unread noconfirmappend
-			\ noconfirmcreate nocrypt_autoencrypt nocrypt_autopgp nocrypt_autosign
-			\ nocrypt_autosmime nocrypt_confirmhook nocrypt_opportunistic_encrypt
-			\ nocrypt_replyencrypt nocrypt_replysign nocrypt_replysignencrypted
-			\ nocrypt_timestamp nocrypt_use_gpgme nocrypt_use_pka nodelete_untag
-			\ nodigest_collapse noduplicate_threads noedit_hdrs noedit_headers
-			\ noencode_from noenvelope_from nofast_reply nofcc_clear noflag_safe
+			\ noattach_split noauto_tag noautoedit noauto_subscribe nobackground_edit
+			\ nobackground_confirm_quit nobeep nobeep_new nobounce_delivered
+			\ nobraille_friendly nobrowser_abbreviate_mailboxes nobrowser_sticky_cursor nochange_folder_next
+			\ nocheck_mbox_size nocheck_new nocompose_confirm_detach_first nocollapse_unread noconfirmappend
+			\ noconfirmcreate nocopy_decode_weed nocount_alternatives nocrypt_autoencrypt nocrypt_autopgp
+			\ nocrypt_autosign nocrypt_autosmime nocrypt_confirmhook nocrypt_protected_headers_read
+			\ nocrypt_protected_headers_save nocrypt_protected_headers_write nocrypt_opportunistic_encrypt
+			\ nocrypt_opportunistic_encrypt_strong_keys nocrypt_replyencrypt nocrypt_replysign
+			\ nocrypt_replysignencrypted nocrypt_timestamp nocrypt_use_gpgme nocrypt_use_pka nocursor_overlay
+			\ nodelete_untag nodigest_collapse noduplicate_threads noedit_hdrs noedit_headers
+			\ noencode_from noenvelope_from nofast_reply nofcc_before_send nofcc_clear noflag_safe
 			\ nofollowup_to noforce_name noforw_decode noforw_decrypt noforw_quote
-			\ noforward_decode noforward_decrypt noforward_quote nohdrs noheader
+			\ noforward_decode noforward_quote nohdrs noheader
 			\ noheader_color_partial nohelp nohidden_host nohide_limited nohide_missing
 			\ nohide_thread_subject nohide_top_limited nohide_top_missing
 			\ nohistory_remove_dups nohonor_disposition noidn_decode noidn_encode
 			\ noignore_linear_white_space noignore_list_reply_to noimap_check_subscribed
-			\ noimap_list_subscribed noimap_passive noimap_peek noimap_servernoise
-			\ noimplicit_autoview noinclude_onlyfirst nokeep_flagged nomail_check_recent
-			\ nomail_check_stats nomailcap_sanitize nomaildir_check_cur
-			\ nomaildir_header_cache_verify nomaildir_trash nomark_old nomarkers
-			\ nomenu_move_off nomenu_scroll nomessage_cache_clean nometa_key nometoo
-			\ nomh_purge nomime_forward_decode nomime_type_query_first nonarrow_tree
-			\ nopager_stop nopgp_auto_decode nopgp_auto_traditional nopgp_autoencrypt
-			\ nopgp_autoinline nopgp_autosign nopgp_check_exit nopgp_create_traditional
+			\ noimap_condstore noimap_deflate noimap_list_subscribed noimap_passive noimap_peek
+			\ noimap_qresync noimap_servernoise noimplicit_autoview noinclude_encrypted noinclude_onlyfirst
+			\ nokeep_flagged nolocal_date_header nomail_check_recent nomail_check_stats nomailcap_sanitize
+			\ nomaildir_check_cur nomaildir_header_cache_verify nomaildir_trash nomark_old
+			\ nomarkers nomenu_move_off nomenu_scroll nomessage_cache_clean nometa_key
+			\ nometoo nomh_purge nomime_forward_decode nomime_type_query_first nomuttlisp_inline_eval
+			\ nonarrow_tree nopager_stop nopgp_auto_decode nopgp_auto_traditional nopgp_autoencrypt
+			\ nopgp_autoinline nopgp_autosign nopgp_check_exit
+			\ nopgp_check_gpg_decrypt_status_fd nopgp_create_traditional
 			\ nopgp_ignore_subkeys nopgp_long_ids nopgp_replyencrypt nopgp_replyinline
 			\ nopgp_replysign nopgp_replysignencrypted nopgp_retainable_sigs
 			\ nopgp_self_encrypt nopgp_self_encrypt_as nopgp_show_unusable
-			\ nopgp_strict_enc nopgp_use_gpg_agent nopipe_decode nopipe_split
+			\ nopgp_strict_enc nopgp_use_gpg_agent nopipe_decode nopipe_decode_weed nopipe_split
 			\ nopop_auth_try_all nopop_last nopostpone_encrypt nopostpone_encrypt_as
-			\ noprint_decode noprint_split noprompt_after noread_only
+			\ noprint_decode noprint_decode_weed noprint_split noprompt_after noread_only
 			\ noreflow_space_quotes noreflow_text noreflow_wrap noreply_self noresolve
 			\ noresume_draft_files noresume_edited_draft_files noreverse_alias
 			\ noreverse_name noreverse_realname norfc2047_parameters nosave_address
 			\ nosave_empty nosave_name noscore nosidebar_folder_indent
-			\ nosidebar_new_mail_only nosidebar_next_new_wrap nosidebar_short_path
-			\ nosidebar_sort nosidebar_visible nosig_dashes nosig_on_top nosmart_wrap
-			\ nosmime_ask_cert_label nosmime_decrypt_use_default_key nosmime_is_default
-			\ nosmime_self_encrypt nosmime_self_encrypt_as nosort_re nossl_force_tls
-			\ nossl_use_sslv2 nossl_use_sslv3 nossl_use_tlsv1 nossl_usesystemcerts
+			\ nosidebar_new_mail_only nosidebar_next_new_wrap nosidebar_relative_shortpath_indent
+			\ nosidebar_short_path nosidebar_sort nosidebar_visible nosidebar_use_mailbox_shortcuts
+			\ nosig_dashes nosig_on_top nosize_show_bytes nosize_show_fraction nosize_show_mb
+			\ nosize_units_on_left nosmart_wrap nosmime_ask_cert_label nosmime_decrypt_use_default_key
+			\ nosmime_is_default nosmime_self_encrypt nosmime_self_encrypt_as nosort_re nossl_force_tls
+			\ nossl_use_sslv2 nossl_use_sslv3 nossl_use_tlsv1 nossl_use_tlsv1_3 nossl_usesystemcerts
 			\ nossl_verify_dates nossl_verify_host nossl_verify_partial_chains
 			\ nostatus_on_top nostrict_mime nostrict_threads nosuspend notext_flowed
-			\ nothorough_search nothread_received notilde nots_enabled nouncollapse_jump
+			\ nothorough_search nothread_received notilde nots_enabled notunnel_is_secure nouncollapse_jump
 			\ nouse_8bitmime nouse_domain nouse_envelope_from nouse_from nouse_idn
 			\ nouse_ipv6 nouncollapse_new nouser_agent nowait_key noweed nowrap_search
 			\ nowrite_bcc
@@ -192,50 +200,53 @@ syn keyword muttrcVarBool	skipwhite contained
 
 syn keyword muttrcVarBool	skipwhite contained
 			\ invallow_8bit invallow_ansi invarrow_cursor invascii_chars invaskbcc
-			\ invaskcc invattach_split invauto_tag invautoedit invbeep invbeep_new
-			\ invbounce_delivered invbraille_friendly invbrowser_abbreviate_mailboxes
-			\ invchange_folder_next invcheck_mbox_size invcheck_new invcollapse_unread
-			\ invconfirmappend invconfirmcreate invcrypt_autoencrypt invcrypt_autopgp
-			\ invcrypt_autosign invcrypt_autosmime invcrypt_confirmhook
-			\ invcrypt_opportunistic_encrypt invcrypt_replyencrypt invcrypt_replysign
-			\ invcrypt_replysignencrypted invcrypt_timestamp invcrypt_use_gpgme
-			\ invcrypt_use_pka invdelete_untag invdigest_collapse invduplicate_threads
+			\ invaskcc invattach_split invauto_tag invautoedit invauto_subscribe nobackground_edit
+			\ nobackground_confirm_quit invbeep invbeep_new invbounce_delivered invbraille_friendly
+			\ invbrowser_abbreviate_mailboxes invbrowser_sticky_cursor invchange_folder_next
+			\ invcheck_mbox_size invcheck_new invcollapse_unread invcompose_confirm_detach_first
+			\ invconfirmappend invcopy_decode_weed invconfirmcreate invcount_alternatives invcrypt_autopgp
+			\ invcrypt_autoencrypt invcrypt_autosign invcrypt_autosmime invcrypt_confirmhook
+			\ invcrypt_protected_headers_read invcrypt_protected_headers_save invcrypt_protected_headers_write
+			\ invcrypt_opportunistic_encrypt invcrypt_opportunistic_encrypt_strong_keys invcrypt_replysign
+			\ invcrypt_replyencrypt invcrypt_replysignencrypted invcrypt_timestamp invcrypt_use_gpgme
+			\ invcrypt_use_pka invcursor_overlay invdelete_untag invdigest_collapse invduplicate_threads
 			\ invedit_hdrs invedit_headers invencode_from invenvelope_from invfast_reply
-			\ invfcc_clear invflag_safe invfollowup_to invforce_name invforw_decode
-			\ invforw_decrypt invforw_quote invforward_decode invforward_decrypt
+			\ invfcc_before_send invfcc_clear invflag_safe invfollowup_to invforce_name invforw_decode
+			\ invforw_decrypt invforw_quote invforward_decode
 			\ invforward_quote invhdrs invheader invheader_color_partial invhelp
 			\ invhidden_host invhide_limited invhide_missing invhide_thread_subject
 			\ invhide_top_limited invhide_top_missing invhistory_remove_dups
 			\ invhonor_disposition invidn_decode invidn_encode
 			\ invignore_linear_white_space invignore_list_reply_to
-			\ invimap_check_subscribed invimap_list_subscribed invimap_passive
-			\ invimap_peek invimap_servernoise invimplicit_autoview invinclude_onlyfirst
-			\ invkeep_flagged invmail_check_recent invmail_check_stats invmailcap_sanitize
-			\ invmaildir_check_cur invmaildir_header_cache_verify invmaildir_trash
-			\ invmark_old invmarkers invmenu_move_off invmenu_scroll
-			\ invmessage_cache_clean invmeta_key invmetoo invmh_purge
-			\ invmime_forward_decode invmime_type_query_first invnarrow_tree invpager_stop
-			\ invpgp_auto_decode invpgp_auto_traditional invpgp_autoencrypt
+			\ invimap_check_subscribed invimap_condstore invimap_deflate invimap_list_subscribed
+			\ invimap_passive invimap_peek invimap_qresync invimap_servernoise invimplicit_autoview
+			\ invinclude_encrypted invinclude_onlyfirst invkeep_flagged invlocal_date_header
+			\ invmail_check_recent invmail_check_stats invmailcap_sanitize invmaildir_check_cur
+			\ invmaildir_header_cache_verify invmaildir_trash invmark_old invmarkers invmenu_move_off
+			\ invmenu_scroll invmessage_cache_clean invmeta_key invmetoo invmh_purge
+			\ invmime_forward_decode invmime_type_query_first invmuttlisp_inline_eval invnarrow_tree
+			\ invpager_stop invpgp_auto_decode invpgp_auto_traditional invpgp_autoencrypt
 			\ invpgp_autoinline invpgp_autosign invpgp_check_exit
-			\ invpgp_create_traditional invpgp_ignore_subkeys invpgp_long_ids
-			\ invpgp_replyencrypt invpgp_replyinline invpgp_replysign
-			\ invpgp_replysignencrypted invpgp_retainable_sigs invpgp_self_encrypt
-			\ invpgp_self_encrypt_as invpgp_show_unusable invpgp_strict_enc
-			\ invpgp_use_gpg_agent invpipe_decode invpipe_split invpop_auth_try_all
-			\ invpop_last invpostpone_encrypt invpostpone_encrypt_as invprint_decode
-			\ invprint_split invprompt_after invread_only invreflow_space_quotes
-			\ invreflow_text invreflow_wrap invreply_self invresolve invresume_draft_files
-			\ invresume_edited_draft_files invreverse_alias invreverse_name
-			\ invreverse_realname invrfc2047_parameters invsave_address invsave_empty
-			\ invsave_name invscore invsidebar_folder_indent invsidebar_new_mail_only
-			\ invsidebar_next_new_wrap invsidebar_short_path invsidebar_sort
-			\ invsidebar_visible invsig_dashes invsig_on_top invsmart_wrap
-			\ invsmime_ask_cert_label invsmime_decrypt_use_default_key invsmime_is_default
-			\ invsmime_self_encrypt invsmime_self_encrypt_as invsort_re invssl_force_tls
-			\ invssl_use_sslv2 invssl_use_sslv3 invssl_use_tlsv1 invssl_usesystemcerts
+			\ invpgp_check_gpg_decrypt_status_fd invpgp_create_traditional
+			\ invpgp_ignore_subkeys invpgp_long_ids invpgp_replyencrypt invpgp_replyinline
+			\ invpgp_replysign invpgp_replysignencrypted invpgp_retainable_sigs
+			\ invpgp_self_encrypt invpgp_self_encrypt_as invpgp_show_unusable
+			\ invpgp_strict_enc invpgp_use_gpg_agent invpipe_decode invpipe_decode_weed invpipe_split
+			\ invpop_auth_try_all invpop_last invpostpone_encrypt invpostpone_encrypt_as
+			\ invprint_decode invprint_decode_weed invprint_split invprompt_after invread_only
+			\ invreflow_space_quotes invreflow_text invreflow_wrap invreply_self invresolve
+			\ invresume_draft_file sinvresume_edited_draft_files invreverse_alias
+			\ invreverse_name invreverse_realname invrfc2047_parameters invsave_address
+			\ invsave_empty invsave_name invscore invsidebar_folder_indent
+			\ invsidebar_new_mail_only invsidebar_next_new_wrap invsidebar_relative_shortpath_indent
+			\ invsidebar_short_path invsidebar_sort sidebar_use_mailbox_shortcuts invsidebar_visible
+			\ invsig_dashes invsig_on_top invsize_show_bytes invsize_show_fraction invsize_show_mb
+			\ invsize_units_on_left invsmart_wrap invsmime_ask_cert_label invsmime_decrypt_use_default_key
+			\ invsmime_is_default invsmime_self_encrypt invsmime_self_encrypt_as invsort_re invssl_force_tls
+			\ invssl_use_sslv2 invssl_use_sslv3 invssl_use_tlsv1 invssl_use_tlsv1_3 invssl_usesystemcerts
 			\ invssl_verify_dates invssl_verify_host invssl_verify_partial_chains
 			\ invstatus_on_top invstrict_mime invstrict_threads invsuspend invtext_flowed
-			\ invthorough_search invthread_received invtilde invts_enabled
+			\ invthorough_search invthread_received invtilde invts_enabled invtunnel_is_secure
 			\ invuncollapse_jump invuse_8bitmime invuse_domain invuse_envelope_from
 			\ invuse_from invuse_idn invuse_ipv6 invuncollapse_new invuser_agent
 			\ invwait_key invweed invwrap_search invwrite_bcc
@@ -243,32 +254,32 @@ syn keyword muttrcVarBool	skipwhite contained
 
 syn keyword muttrcVarQuad	skipwhite contained
 			\ abort_nosubject abort_unmodified abort_noattach bounce copy crypt_verify_sig
-			\ delete fcc_attach forward_edit honor_followup_to include mime_forward
-			\ mime_forward_rest mime_fwd move pgp_mime_auto pgp_verify_sig pop_delete
-			\ pop_reconnect postpone print quit recall reply_to ssl_starttls
+			\ delete fcc_attach forward_attachments forward_decrypt forward_edit honor_followup_to include
+			\ mime_forward mime_forward_rest mime_fwd move pgp_mime_auto pgp_verify_sig pop_delete
+			\ pop_reconnect postpone print quit recall reply_to send_multipart_alternative ssl_starttls
 			\ nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 syn keyword muttrcVarQuad	skipwhite contained
 			\ noabort_nosubject noabort_unmodified noabort_noattach nobounce nocopy
-			\ nocrypt_verify_sig nodelete nofcc_attach noforward_edit nohonor_followup_to
-			\ noinclude nomime_forward nomime_forward_rest nomime_fwd nomove
+			\ nocrypt_verify_sig nodelete nofcc_attach noforward_attachments noforward_decrypt noforward_edit
+			\ nohonor_followup_to noinclude nomime_forward nomime_forward_rest nomime_fwd nomove
 			\ nopgp_mime_auto nopgp_verify_sig nopop_delete nopop_reconnect nopostpone
-			\ noprint noquit norecall noreply_to nossl_starttls
+			\ noprint noquit norecall noreply_to nosend_multipart_alternative nossl_starttls
 			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 syn keyword muttrcVarQuad	skipwhite contained
 			\ invabort_nosubject invabort_unmodified invabort_noattach invbounce invcopy
-			\ invcrypt_verify_sig invdelete invfcc_attach invforward_edit
-			\ invhonor_followup_to invinclude invmime_forward invmime_forward_rest
+			\ invcrypt_verify_sig invdelete invfcc_attach invforward_attachments invforward_decrypt
+			\ invforward_edit invhonor_followup_to invinclude invmime_forward invmime_forward_rest
 			\ invmime_fwd invmove invpgp_mime_auto invpgp_verify_sig invpop_delete
 			\ invpop_reconnect invpostpone invprint invquit invrecall invreply_to
-			\ invssl_starttls
+			\ invsend_multipart_alternative invssl_starttls
 			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 syn keyword muttrcVarNum	skipwhite contained
-			\ connect_timeout error_history history imap_keepalive imap_pipeline_depth
+			\ connect_timeout error_history history imap_fetch_chunk_size imap_keepalive imap_pipeline_depth
 			\ imap_poll_timeout mail_check mail_check_stats_interval menu_context net_inc
-			\ pager_context pager_index_lines pgp_timeout pop_checkinterval read_inc
+			\ pager_context pager_index_lines pager_skip_quoted_context pgp_timeout pop_checkinterval read_inc
 			\ save_history score_threshold_delete score_threshold_flag
 			\ score_threshold_read search_context sendmail_wait sidebar_width sleep_time
 			\ smime_timeout ssl_min_dh_prime_bits time_inc timeout wrap wrap_headers
@@ -365,10 +376,14 @@ syn keyword muttrcVarStr	contained skipwhite alias_format nextgroup=muttrcVarEqu
 syn match muttrcVarEqualsAliasFmt contained skipwhite "=" nextgroup=muttrcAliasFormatStr
 syn keyword muttrcVarStr	contained skipwhite attach_format nextgroup=muttrcVarEqualsAttachFmt
 syn match muttrcVarEqualsAttachFmt contained skipwhite "=" nextgroup=muttrcAttachFormatStr
+syn keyword muttrcVarStr	contained skipwhite background_format nextgroup=muttrcVarEqualsBackgroundFormatFmt
+syn match muttrcVarEqualsBackgroundFormatFmt contained skipwhite "=" nextgroup=muttrcBackgroundFormatStr
 syn keyword muttrcVarStr	contained skipwhite compose_format nextgroup=muttrcVarEqualsComposeFmt
 syn match muttrcVarEqualsComposeFmt contained skipwhite "=" nextgroup=muttrcComposeFormatStr
 syn keyword muttrcVarStr	contained skipwhite folder_format nextgroup=muttrcVarEqualsFolderFmt
 syn match muttrcVarEqualsFolderFmt contained skipwhite "=" nextgroup=muttrcFolderFormatStr
+syn keyword muttrcVarStr	contained skipwhite message_id_format nextgroup=muttrcVarEqualsMessageIdFmt
+syn match muttrcVarEqualsMessageIdFmt contained skipwhite "=" nextgroup=muttrcMessageIdFormatStr
 syn keyword muttrcVarStr	contained skipwhite mix_entry_format nextgroup=muttrcVarEqualsMixFmt
 syn match muttrcVarEqualsMixFmt contained skipwhite "=" nextgroup=muttrcMixFormatStr
 syn keyword muttrcVarStr	contained skipwhite pgp_entry_format nextgroup=muttrcVarEqualsPGPFmt
@@ -390,27 +405,29 @@ syn match muttrcVPrefix		contained /[?&]/ nextgroup=muttrcVarBool,muttrcVarQuad,
 
 syn match muttrcVarStr		contained skipwhite 'my_[a-zA-Z0-9_]\+' nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 syn keyword muttrcVarStr	contained skipwhite
-			\ abort_noattach_regexp alias_file assumed_charset attach_charset attach_sep
+			\ abort_noattach_regexp alias_file assumed_charset attach_charset attach_save_dir attach_sep
 			\ attribution_locale certificate_file charset config_charset content_type
-			\ default_hook display_filter dotlock_program dsn_notify dsn_return editor
-		        \ entropy_file envelope_from_address escape folder forw_format
+			\ crypt_protected_headers_subject default_hook display_filter dotlock_program dsn_notify
+		        \ dsn_return editor entropy_file envelope_from_address escape fcc_delimiter folder forw_format
 		        \ forward_attribution_intro forward_attribution_trailer forward_format from gecos_mask
 		        \ hdr_format header_cache header_cache_compress header_cache_pagesize history_file
 		        \ hostname imap_authenticators imap_delim_chars imap_headers imap_idle imap_login
-		        \ imap_pass imap_user indent_str indent_string ispell locale mailcap_path
-		        \ mark_macro_prefix mask mbox mbox_type message_cachedir mh_seq_flagged mh_seq_replied
-		        \ mh_seq_unseen mime_type_query_command mixmaster msg_format new_mail_command pager
-		        \ pgp_default_key pgp_decryption_okay pgp_good_sign pgp_mime_signature_description
+		        \ imap_oauth_refresh_command imap_pass imap_user indent_str indent_string ispell locale
+		        \ mailcap_pat hmark_macro_prefix mask mbox mbox_type message_cachedir mh_seq_flagged
+		        \ mh_seq_replied mh_seq_unseen mime_type_query_command mixmaster msg_format new_mail_command
+		        \ pager pgp_default_key pgp_decryption_okay pgp_good_sign pgp_mime_signature_description
 		        \ pgp_mime_signature_filename pgp_sign_as pgp_sort_keys pipe_sep pop_authenticators
-		        \ pop_host pop_pass pop_user post_indent_str post_indent_string postpone_encrypt_as
-		        \ postponed preconnect print_cmd print_command query_command quote_regexp realname
-		        \ record reply_regexp send_charset sendmail shell sidebar_delim sidebar_delim_chars
-		        \ sidebar_divider_char sidebar_format sidebar_indent_string sidebar_sort_method
-		        \ signature simple_search smileys smime_ca_location smime_certificates
+		        \ pop_host pop_oauth_refresh_command pop_pass pop_user post_indent_str post_indent_string
+		        \ postpone_encrypt_as postponed preconnect print_cmd print_command query_command
+		        \ quote_regexp realname record reply_regexp send_charset send_multipart_alternative_filter
+		        \ sendmail shell sidebar_delim
+		        \ sidebar_delim_chars sidebar_divider_char sidebar_format sidebar_indent_string
+		        \ sidebar_sort_method signature simple_search smileys smime_ca_location smime_certificates
 		        \ smime_default_key smime_encrypt_with smime_keys smime_sign_as smime_sign_digest_alg
-		        \ smtp_authenticators smtp_pass smtp_url sort sort_alias sort_aux sort_browser
-		        \ spam_separator spoolfile ssl_ca_certificates_file ssl_ciphers ssl_client_cert
-		        \ status_chars tmpdir to_chars trash ts_icon_format ts_status_format tunnel visual
+		        \ smtp_authenticators smtp_oauth_refresh_command smtp_pass smtp_url sort sort_alias
+		        \ sort_aux sort_browser sort_thread_groups spam_separator spoolfile ssl_ca_certificates_file
+		        \ ssl_ciphers ssl_client_cert ssl_verify_host_override status_chars tmpdir to_chars trash
+		        \ ts_icon_format ts_status_format tunnel visual
 			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 " Present in 1.4.2.1 (pgp_create_traditional was a bool then)
@@ -422,11 +439,11 @@ syn keyword muttrcMenu		contained alias attach browser compose editor index page
 syn match muttrcMenuList "\S\+" contained contains=muttrcMenu
 syn match muttrcMenuCommas /,/ contained
 
-syn keyword muttrcHooks		contained skipwhite account-hook charset-hook iconv-hook message-hook folder-hook mbox-hook save-hook fcc-hook fcc-save-hook send-hook send2-hook reply-hook crypt-hook
+syn keyword muttrcHooks		contained skipwhite account-hook charset-hook iconv-hook index-format-hook message-hook folder-hook mbox-hook save-hook fcc-hook fcc-save-hook send-hook send2-hook reply-hook crypt-hook
 
 syn keyword muttrcCommand	skipwhite
-			\ alternative_order auto_view exec hdr_order iconv-hook ignore mailboxes
-			\ mailto_allow mime_lookup my_hdr pgp-hook push score sidebar_whitelist source
+			\ alternative_order auto_view cd exec hdr_order iconv-hook ignore index-format-hook mailboxes
+			\ mailto_allow mime_lookup my_hdr pgp-hook push run score sidebar_whitelist source
 			\ unalternative_order unalternative_order unauto_view ungroup unhdr_order
 			\ unignore unmailboxes unmailto_allow unmime_lookup unmono unmy_hdr unscore
 			\ unsidebar_whitelist
@@ -470,19 +487,24 @@ syn match muttrcFunction	contained "\<link-threads\>"
 syn match muttrcFunction	contained "\<\%(backward\|capitalize\|downcase\|forward\|kill\|upcase\)-word\>"
 syn match muttrcFunction	contained "\<\%(delete\|filter\|first\|last\|next\|pipe\|previous\|print\|save\|select\|tag\|undelete\)-entry\>"
 syn match muttrcFunction	contained "\<attach-\%(file\|key\)\>"
+syn match muttrcFunction	contained "\<background-compose-menu\>"
+syn match muttrcFunction	contained "\<browse-mailbox\>"
 syn match muttrcFunction	contained "\<change-\%(dir\|folder\|folder-readonly\)\>"
 syn match muttrcFunction	contained "\<check-\%(new\|traditional-pgp\)\>"
 syn match muttrcFunction	contained "\<current-\%(bottom\|middle\|top\)\>"
 syn match muttrcFunction	contained "\<decode-\%(copy\|save\)\>"
 syn match muttrcFunction	contained "\<delete-\%(char\|pattern\|subthread\)\>"
+syn match muttrcFunction	contained "\<descend-directory\>"
 syn match muttrcFunction	contained "\<display-\%(address\|toggle-weed\)\>"
 syn match muttrcFunction	contained "\<echo\>"
 syn match muttrcFunction	contained "\<edit\%(-\%(bcc\|cc\|description\|encoding\|fcc\|file\|from\|headers\|label\|mime\|reply-to\|subject\|to\|type\)\)\?\>"
 syn match muttrcFunction	contained "\<enter-\%(command\|mask\)\>"
 syn match muttrcFunction	contained "\<error-history\>"
+syn match muttrcFunction	contained "\<group-chat-reply\>"
 syn match muttrcFunction	contained "\<half-\%(up\|down\)\>"
 syn match muttrcFunction	contained "\<history-\%(up\|down\|search\)\>"
 syn match muttrcFunction	contained "\<kill-\%(eol\|eow\|line\)\>"
+syn match muttrcFunction	contained "\<move-\%(down\|up\)\>"
 syn match muttrcFunction	contained "\<next-\%(line\|new\%(-then-unread\)\?\|page\|subthread\|undeleted\|unread\|unread-mailbox\)\>"
 syn match muttrcFunction	contained "\<previous-\%(line\|new\%(-then-unread\)\?\|page\|subthread\|undeleted\|unread\)\>"
 syn match muttrcFunction	contained "\<search\%(-\%(next\|opposite\|reverse\|toggle\)\)\?\>"
@@ -490,15 +512,15 @@ syn match muttrcFunction	contained "\<show-\%(limit\|version\)\>"
 syn match muttrcFunction	contained "\<sort-\%(mailbox\|reverse\)\>"
 syn match muttrcFunction	contained "\<tag-\%(pattern\|\%(sub\)\?thread\|prefix\%(-cond\)\?\)\>"
 syn match muttrcFunction	contained "\<end-cond\>"
-syn match muttrcFunction	contained "\<sidebar-\%(next\|next-new\|open\|page-down\|page-up\|prev\|prev-new\|toggle-visible\)\>"
+syn match muttrcFunction	contained "\<sidebar-\%(first\|last\|next\|next-new\|open\|page-down\|page-up\|prev\|prev-new\|toggle-visible\)\>"
 syn match muttrcFunction	contained "\<toggle-\%(mailboxes\|new\|quoted\|subscribed\|unlink\|write\)\>"
 syn match muttrcFunction	contained "\<undelete-\%(pattern\|subthread\)\>"
 syn match muttrcFunction	contained "\<collapse-\%(parts\|thread\|all\)\>"
 syn match muttrcFunction	contained "\<rename-attachment\>"
 syn match muttrcFunction	contained "\<subjectrx\>"
 syn match muttrcFunction	contained "\<\%(un\)\?setenv\>"
-syn match muttrcFunction	contained "\<view-\%(attach\|attachments\|file\|mailcap\|name\|text\)\>"
-syn match muttrcFunction	contained "\<\%(backspace\|backward-char\|bol\|bottom\|bottom-page\|buffy-cycle\|clear-flag\|complete\%(-query\)\?\|copy-file\|create-alias\|detach-file\|eol\|exit\|extract-keys\|\%(imap-\)\?fetch-mail\|forget-passphrase\|forward-char\|group-reply\|help\|ispell\|jump\|limit\|list-reply\|mail\|mail-key\|mark-as-new\|middle-page\|new-mime\|noop\|pgp-menu\|query\|query-append\|quit\|quote-char\|read-subthread\|redraw-screen\|refresh\|rename-file\|reply\|select-new\|set-flag\|shell-escape\|skip-quoted\|sort\|subscribe\|sync-mailbox\|top\|top-page\|transpose-chars\|unsubscribe\|untag-pattern\|verify-key\|what-key\|write-fcc\)\>"
+syn match muttrcFunction	contained "\<view-\%(alt\|alt-text\|alt-mailcap\|alt-pager\|attach\|attachments\|file\|mailcap\|name\|pager\|text\)\>"
+syn match muttrcFunction	contained "\<\%(backspace\|backward-char\|bol\|bottom\|bottom-page\|buffy-cycle\|check-stats\|clear-flag\|complete\%(-query\)\?\|compose-to-sender\|copy-file\|create-alias\|detach-file\|eol\|exit\|extract-keys\|\%(imap-\)\?fetch-mail\|forget-passphrase\|forward-char\|group-reply\|help\|ispell\|jump\|limit\|list-action\|list-reply\|mail\|mail-key\|mark-as-new\|middle-page\|new-mime\|noop\|pgp-menu\|query\|query-append\|quit\|quote-char\|read-subthread\|redraw-screen\|refresh\|rename-file\|reply\|select-new\|set-flag\|shell-escape\|skip-headers\|skip-quoted\|sort\|subscribe\|sync-mailbox\|top\|top-page\|transpose-chars\|unsubscribe\|untag-pattern\|verify-key\|what-key\|write-fcc\)\>"
 syn keyword muttrcFunction	contained imap-logout-all
 if use_mutt_sidebar == 1
     syn match muttrcFunction    contained "\<sidebar-\%(prev\|next\|open\|scroll-up\|scroll-down\)"
@@ -519,6 +541,9 @@ syn match muttrcPatHookNot	contained /!\s*/ skipwhite nextgroup=muttrcPattern
 syn match muttrcPatHooks	/\<\%(mbox\|crypt\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcPattern
 syn match muttrcPatHooks	/\<\%(message\|reply\|send\|send2\|save\|\|fcc\%(-save\)\?\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcOptPattern
 
+syn match muttrcIndexFormatHookName contained /\S\+/ skipwhite nextgroup=muttrcPattern,muttrcString
+syn match muttrcIndexFormatHook /index-format-hook/ skipwhite nextgroup=muttrcIndexFormatHookName,muttrcString
+
 syn match muttrcBindFunction	contained /\S\+\>/ skipwhite contains=muttrcFunction
 syn match muttrcBindFunctionNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcBindFunction,muttrcBindFunctionNL
 syn match muttrcBindKey		contained /\S\+/ skipwhite contains=muttrcKey nextgroup=muttrcBindFunction,muttrcBindFunctionNL
@@ -751,6 +776,8 @@ hi def link muttrcShellString	muttrcEscape
 hi def link muttrcRXHooks		muttrcCommand
 hi def link muttrcRXHookNot	Type
 hi def link muttrcPatHooks		muttrcCommand
+hi def link muttrcIndexFormatHookName	muttrcCommand
+hi def link muttrcIndexFormatHook	 muttrcCommand
 hi def link muttrcPatHookNot	Type
 hi def link muttrcFormatConditionals2 Type
 hi def link muttrcIndexFormatStr	muttrcString
@@ -761,11 +788,13 @@ hi def link muttrcAliasFormatEscapes muttrcEscape
 hi def link muttrcAttachFormatStr	muttrcString
 hi def link muttrcAttachFormatEscapes muttrcEscape
 hi def link muttrcAttachFormatConditionals muttrcFormatConditionals2
+hi def link muttrcBackgroundFormatStr	muttrcString
 hi def link muttrcComposeFormatStr	muttrcString
 hi def link muttrcComposeFormatEscapes muttrcEscape
 hi def link muttrcFolderFormatStr	muttrcString
 hi def link muttrcFolderFormatEscapes muttrcEscape
 hi def link muttrcFolderFormatConditionals muttrcFormatConditionals2
+hi def link muttrcMessageIdFormatStr	muttrcString
 hi def link muttrcMixFormatStr	muttrcString
 hi def link muttrcMixFormatEscapes muttrcEscape
 hi def link muttrcMixFormatConditionals muttrcFormatConditionals2
@@ -787,10 +816,6 @@ hi def link muttrcTimeEscapes	muttrcEscape
 hi def link muttrcPGPTimeEscapes	muttrcEscape
 hi def link muttrcStrftimeEscapes	Type
 hi def link muttrcStrftimeFormatStr muttrcString
-hi def link muttrcFormatErrors Error
-
-hi def link muttrcBindFunctionNL	SpecialChar
-hi def link muttrcBindKeyNL	SpecialChar
 hi def link muttrcBindMenuListNL	SpecialChar
 hi def link muttrcMacroDescrNL	SpecialChar
 hi def link muttrcMacroBodyNL	SpecialChar
-- 
cgit 


From f685303e6dd2dc268d716ae2caf78e2bdc6cd7ff Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 16 Aug 2023 00:29:19 +0200
Subject: vim-patch:636d32b32730

The keyboard layout "russian-typograph" has been updated to version 3.3 (vim/vim#12796)

Co-authored-by: RestorerZ <restorer@mail2k.ru>

https://github.com/vim/vim/commit/636d32b327309f453e5cdfe75bbe7ad14550093a

Co-authored-by: Restorer <69863286+RestorerZ@users.noreply.github.com>
Co-authored-by: RestorerZ <restorer@mail2k.ru>
---
 runtime/keymap/russian-typograph.vim | 369 +++++++++++++++++++++++++----------
 1 file changed, 265 insertions(+), 104 deletions(-)

(limited to 'runtime')

diff --git a/runtime/keymap/russian-typograph.vim b/runtime/keymap/russian-typograph.vim
index e0fbf22884..7c5aed6089 100644
--- a/runtime/keymap/russian-typograph.vim
+++ b/runtime/keymap/russian-typograph.vim
@@ -1,54 +1,140 @@
 " Vim Keymap file for Russian characters
-" layout English-US standard 104 key 'QWERTY', 'JCUKEN'
+" layout English-US 104 key 'QWERTY'
 "
-" Maintainer:	Restorer <restorers@users.sourceforge.net>
-" Last Changed: 20 Jan 2019
-" Description:  Раскладка сделана на основе раскладки «русская машинопись»
-" (KBDRU1.DLL), поставляемой в составе ОС MS Windows. Эта раскладка позволяет
-" печать практически все знаки препинания используя цифровой ряд и не требуя при
-" этом нажатия дополнительных клавиш, ну и также удобное расположение буквы «Ё».
-" Однако были внесены некоторые дополнения (улучшения?), в частности:
-" ‐ раздельные символы круглых скобок (), расположены на тех же позициях, что и
-" в US-International;
-" ‐ раздельные символы типографских кавычек «», расположены на клавишах «3» и
-" «4» соответственно;
-" ‐ на этих же клавишах находятся внутренние кавычки “лапки”, набираемые при
-" нажатой клавише «ALT»;
-" ‐ возможность набирать символы, отсутствующие в русской раскладке клавиатуры,
-" а именно @#$^&*{}[]"'`~<>, которые расположены на тех же местах, что и раньше.
-" Для этого не требуется переключаться в латинскую раскладку клавиатуры, а
-" оставаясь в русской, использовать для этого дополнительные клавиши «SHIFT» и
-" «ALT»;
-" ‐ и ещё несколько удобств, которые позволяют быстро и с минимальными усилиями
-" набирать текст.
-
-scriptencoding utf-8
-
-" Переключение языка ввода со стандартного сочетания <CTRL+^> на указанные ниже
-" Для режимов вставки и замены
-""или SHIFT+SPACE
-"        inoremap <S-Space> <C-^>
-""или CTRL+SPACE"
-"        inoremap <C-Space> <C-^>
-" Для режима командной строки
-""или SHIFT+SPACE
-"        cnoremap <S-Space> <C-^>
-""или CTRL+SPACE"
-"        cnoremap <C-Space> <C-^>
-" Одной командой для режимов вставки, замены и командной строки
-"        noremap! <S-Space> <C-^>
-"        noremap! <C-Space> <C-^>
+" Maintainer:	 Restorer <restorer@mail2k.ru>
+" Last Changed:	 25 Apr 2023
+" Version:	 3.3
+" Description:	 описание дано после изображений клавиатуры
+
+" Расположение символов для русского языка при подключенном файле с раскладкой
+" клавиатуры «русская типографская» (russian-typograph.vim). Версия 3.3
+
+
+"		  Ни одна из клавиш модификаторов не нажата
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  | % | ! | — | « | » | : | , | . | ? | ( | ) | ‐ | ; | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| | й | ц | у | к | е | н | г | ш | щ | з | х | ъ |  /  |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps | ф | ы | в | а | п | р | о | л | д | ж | э |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | Shift  | я | ч | с | м | и | т | ь | б | ю | ё |  Shift   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | Ctrl |  | Alt |                          | Alt  |  | Ctrl |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			    Нажата клавиша SHIFT
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  | = | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| | Й | Ц | У | К | Е | Н | Г | Ш | Щ | З | Х | Ъ |  §  |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps | Ф | Ы | В | А | П | Р | О | Л | Д | Ж | Э |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | SHIFT  | Я | Ч | С | М | И | Т | Ь | Б | Ю | Ё |   SHIFT  |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | Ctrl |  | Alt |                          | Alt  |  | Ctrl |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			     Нажата клавиша ALT
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  | ` | № | – | „ | “ |   |   | … |   |   |   | ‑ | ± | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   |   |   |   |   |   |   |   |   | [ | ] |  \  |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   |   |   |   |   | ₽ |   |   |   |   | ' |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | Shift  |   |   |   |   |   |   |   |   |   |   |  Shift   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | Ctrl |  | ALT |          NNBSP           | ALT  |  | Ctrl |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			 Нажаты клавиши SHIFT и ALT
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  | ~ |   | @ | # | $ |   | ^ | & | * |   |   | _ |   | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   |   |   |   |   |   |   |   |   | { | } |  |  |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   |   |   |   |   |   |   |   |   |   | " |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | SHIFT  |   |   |   |   |   |   |   | < | > |   |  SHIFT   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | Ctrl |  | ALT |                          | ALT  |  | Ctrl |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			 Нажаты клавиши SHIFT и CTRL
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  |   |   |   |   |   |   |   |   |   |   |   |   |   | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   |   |   |   |   |   |   |   |   |   |   |     |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   |   |   |   |   |   |   |   |   |   |   |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | SHIFT  |   |   |   |   |   |   |   |   |   |   |  SHIFT   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | CTRL |  | Alt |          NBSP            | Alt  |  | CTRL |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			 Нажаты клавиши ALT и CTRL
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  |   |   |   |   |   |   |   |   |   |   |   |   |   | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   | у́ |   | е́ |   |   |   |   |   |   |   |     |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   | ы́ |   | а́ |   |   | о́ |   |   |   | э́ |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | Shift  | я́ |   |   |   | и́ |   |   |   | ю́ |   |  Shift   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | CTRL |  | ALT |                          | ALT  |  | CTRL |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+"			 Нажаты клавиши SHIFT, ALT и CTRL
+
+"	  ,---,---,---,---,---,---,---,---,---,---,---,---,---,-------,
+"	  |   |   |   |   |   |   |   |   |   |   |   |   |   | <---  |
+"	  |---'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-----|
+"	  | ->| |   |   | У́ |   | Е́ |   |   |   |   |   |   |   |     |
+"	  |-----',--',--',--',--',--',--',--',--',--',--',--',--'-----|
+"	  | Caps |   | Ы́ |   | А́ |   |   | О́ |   |   |   | Э́ |  Enter |
+"	  |------'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'-,-'--------|
+"	  | SHIFT  | Я́ |   |   |   | И́ |   |   |   | Ю́ |   |  SHIFT   |
+"	  |------,-',--'--,'---'---'---'---'---'---'-,-'---',--,------|
+"	  | CTRL |  | ALT |                          | ALT  |  | CTRL |
+"	  '------'  '-----'--------------------------'------'  '------'
+
+
+" Раскладка сделана на основе раскладки «русская машинопись» (KBDRU1.DLL),
+" поставляемой в составе ОС MS Windows.
 "
-" Стандартное переключение по CTRL+^ после этих переназначений также сохраняется
+" Как видите, принцип достаточно простой, — при наборе русского текста все
+" буквы, знаки пунктуации и большинство специальных символов находятся под
+" пальцами и их набор не требует нажатия каких-то дополнительных клавиш.  При
+" наборе символов, которые отсутствуют в русской раскладке, но есть в раскладке
+" US-International, требуется нажать или клавишу <ALT>, если в английской
+" раскладке они набираются без модификаторов, или нажать <ALT>+<SHIFT>, если они
+" набираются с модификатором <SHIFT>.
+
+" scriptencoding utf-8
 
 let b:keymap_name ="RUS"
 
 loadkeymap
 
-"	    DIGITAL ROW
+"		DIGITAL ROW
 
-"	The Shift key is not pressed
-"
+"	None of the modifier keys are pressed
 <char-0x0060>	    <char-0x0025>	" PERCENT SIGN
 <char-0x0031>	    <char-0x0021>	" EXCLAMATION MARK
 <char-0x0032>	    <char-0x2014>	" EM DASH
@@ -63,8 +149,7 @@ loadkeymap
 <char-0x002d>	    <char-0x2010>	" HYPHEN
 <char-0x003d>	    <char-0x003b>	" SEMICOLON
 
-"	The Shift key is pressed
-
+"	The SHIFT key is pressed
 <char-0x007e>	    <char-0x003d>	" EQUALS SIGN
 <char-0x0021>	    <char-0x0031>	" DIGIT ONE
 <char-0x0040>	    <char-0x0032>	" DIGIT TWO
@@ -79,112 +164,188 @@ loadkeymap
 <char-0x005f>	    <char-0x002d>	" HYPHEN-MINUS
 <char-0x002b>	    <char-0x002b>	" PLUS SIGN
 
-"	    ALPHABETICAL 1st ROW
+"	The ALT key pressed
+<A-char-0x0060>	    <char-0x0060>	" GRAVE ACCENT 
+<A-char-0x0031>	    <char-0x2116>       " NUMERO SIGN
+<A-char-0x0032>	    <char-0x2013>	" EN DASH
+<A-char-0x0033>	    <char-0x201e>	" DOUBLE LOW-9 QUOTATION MARK
+<A-char-0x0034>	    <char-0x201c>	" LEFT DOUBLE QUOTATION MARK
+<A-char-0x0037>	    <char-0x2026>	" HORIZONTAL ELLIPSIS
+<A-char-0x002d>	    <char-0x2011>	" NON-BREAKING HYPHEN
+<A-char-0x003d>	    <char-0x00b1>	" PLUS-MINUS SIGN
+
+"	The SHIFT and ALT keys pressed
+<A-char-0x007e>	    <char-0x007e>	" TILDE
+<A-char-0x0040>	    <char-0x0040>	" COMMERCIAL AT
+<A-char-0x0023>	    <char-0x0023>	" NUMBER SIGN
+<A-char-0x0024>	    <char-0x0024>	" DOLLAR SIGN
+<A-char-0x005e>	    <char-0x005e>	" CIRCUMFLEX ACCENT
+<A-char-0x0026>	    <char-0x0026>	" AMPERSAND
+<A-char-0x002a>	    <char-0x002a>	" ASTERISK
+<A-char-0x005f>	    <char-0x005f>	" LOW LINE
 
+
+"		ALPHABETICAL 1st ROW
+
+"	None of the modifier keys are pressed
 <char-0x0071>	    <char-0x0439>	" CYRILLIC SMALL LETTER SHORT I
-<char-0x0051>	    <char-0x0419>	" CYRILLIC CAPITAL LETTER SHORT I
 <char-0x0077>	    <char-0x0446>	" CYRILLIC SMALL LETTER TSE
-<char-0x0057>	    <char-0x0426>	" CYRILLIC CAPITAL LETTER TSE
 <char-0x0065>	    <char-0x0443>	" CYRILLIC SMALL LETTER U
-<char-0x0045>	    <char-0x0423>	" CYRILLIC CAPITAL LETTER U
 <char-0x0072>	    <char-0x043a>	" CYRILLIC SMALL LETTER KA
-<char-0x0052>	    <char-0x041a>	" CYRILLIC CAPITAL LETTER KA
 <char-0x0074>	    <char-0x0435>	" CYRILLIC SMALL LETTER IE
-<char-0x0054>	    <char-0x0415>	" CYRILLIC CAPITAL LETTER IE
 <char-0x0079>	    <char-0x043d>	" CYRILLIC SMALL LETTER EN
-<char-0x0059>	    <char-0x041d>	" CYRILLIC CAPITAL LETTER EN
 <char-0x0075>	    <char-0x0433>	" CYRILLIC SMALL LETTER GHE
-<char-0x0055>	    <char-0x0413>	" CYRILLIC CAPITAL LETTER GHE
 <char-0x0069>	    <char-0x0448>	" CYRILLIC SMALL LETTER SHA
-<char-0x0049>	    <char-0x0428>	" CYRILLIC CAPITAL LETTER SHA
 <char-0x006f>	    <char-0x0449>	" CYRILLIC SMALL LETTER SHCHA
-<char-0x004f>	    <char-0x0429>	" CYRILLIC CAPITAL LETTER SHCHA
 <char-0x0070>	    <char-0x0437>	" CYRILLIC SMALL LETTER ZE
-<char-0x0050>	    <char-0x0417>	" CYRILLIC CAPITAL LETTER ZE
 <char-0x005b>	    <char-0x0445>	" CYRILLIC SMALL LETTER HA
-<char-0x007b>	    <char-0x0425>	" CYRILLIC CAPITAL LETTER HA
 <char-0x005d>	    <char-0x044a>	" CYRILLIC SMALL LETTER HARD SIGN
+
+"	The SHIFT key is pressed
+<char-0x0051>	    <char-0x0419>	" CYRILLIC CAPITAL LETTER SHORT I
+<char-0x0057>	    <char-0x0426>	" CYRILLIC CAPITAL LETTER TSE
+<char-0x0045>	    <char-0x0423>	" CYRILLIC CAPITAL LETTER U
+<char-0x0052>	    <char-0x041a>	" CYRILLIC CAPITAL LETTER KA
+<char-0x0054>	    <char-0x0415>	" CYRILLIC CAPITAL LETTER IE
+<char-0x0059>	    <char-0x041d>	" CYRILLIC CAPITAL LETTER EN
+<char-0x0055>	    <char-0x0413>	" CYRILLIC CAPITAL LETTER GHE
+<char-0x0049>	    <char-0x0428>	" CYRILLIC CAPITAL LETTER SHA
+<char-0x004f>	    <char-0x0429>	" CYRILLIC CAPITAL LETTER SHCHA
+<char-0x0050>	    <char-0x0417>	" CYRILLIC CAPITAL LETTER ZE
+<char-0x007b>	    <char-0x0425>	" CYRILLIC CAPITAL LETTER HA
 <char-0x007d>	    <char-0x042a>	" CYRILLIC CAPITAL LETTER HARD SIGN
 
-"	    ALPHABETIC 2nd ROW
+"	The ALT key pressed
+<A-char-0x005b>	    <char-0x005b>       " LEFT SQUARE BRACKET
+<A-char-0x005d>	    <char-0x005d>       " RIGHT SQUARE BRACKET
+
+"	The SHIFT and ALT keys pressed
+<A-char-0x007b>	    <char-0x007b>       " LEFT CURLY BRACKET
+<A-char-0x007d>	    <char-0x007d>       " RIGHT CURLY BRACKET
 
+"	The ALT and CTRL key pressed
+<A-C-char-0x0065>    <char-0x0443><char-0x0301>	" CYRILLIC SMALL LETTER U with COMBINING ACUTE ACCENT
+<A-C-char-0x0074>    <char-0x0435><char-0x0301>	" CYRILLIC SMALL LETTER IE with COMBINING ACUTE ACCENT
+
+"	The SHIFT and ALT and CTRL keys pressed
+<S-A-C-char-0x0045>    <char-0x0423><char-0x0301>   " CYRILLIC CAPITAL LETTER U with COMBINING ACUTE ACCENT
+<S-A-C-char-0x0054>    <char-0x0415><char-0x0301>   " CYRILLIC CAPITAL LETTER IE with COMBINING ACUTE ACCENT
+
+
+"		ALPHABETIC 2st ROW
+
+"	None of the modifier keys are pressed
 <char-0x0061>	    <char-0x0444>	" CYRILLIC SMALL LETTER EF
-<char-0x0041>	    <char-0x0424>	" CYRILLIC CAPITAL LETTER EF
 <char-0x0073>	    <char-0x044b>	" CYRILLIC SMALL LETTER YERU
-<char-0x0053>	    <char-0x042b>	" CYRILLIC CAPITAL LETTER YERU
 <char-0x0064>	    <char-0x0432>	" CYRILLIC SMALL LETTER VE
-<char-0x0044>	    <char-0x0412>	" CYRILLIC CAPITAL LETTER VE
 <char-0x0066>	    <char-0x0430>	" CYRILLIC SMALL LETTER A
-<char-0x0046>	    <char-0x0410>	" CYRILLIC CAPITAL LETTER A
 <char-0x0067>	    <char-0x043f>	" CYRILLIC SMALL LETTER PE
-<char-0x0047>	    <char-0x041f>	" CYRILLIC CAPITAL LETTER PE
 <char-0x0068>	    <char-0x0440>	" CYRILLIC SMALL LETTER ER
-<char-0x0048>	    <char-0x0420>	" CYRILLIC CAPITAL LETTER ER
 <char-0x006a>	    <char-0x043e>	" CYRILLIC SMALL LETTER O
-<char-0x004a>	    <char-0x041e>	" CYRILLIC CAPITAL LETTER O
 <char-0x006b>	    <char-0x043b>	" CYRILLIC SMALL LETTER EL
-<char-0x004b>	    <char-0x041b>	" CYRILLIC CAPITAL LETTER EL
 <char-0x006c>	    <char-0x0434>	" CYRILLIC SMALL LETTER DE
-<char-0x004c>	    <char-0x0414>	" CYRILLIC CAPITAL LETTER DE
 <char-0x003b>	    <char-0x0436>	" CYRILLIC SMALL LETTER ZHE
-<char-0x003a>	    <char-0x0416>	" CYRILLIC CAPITAL LETTER ZHE
 <char-0x0027>	    <char-0x044d>	" CYRILLIC SMALL LETTER E
+
+"	The SHIFT key is pressed
+<char-0x0041>	    <char-0x0424>	" CYRILLIC CAPITAL LETTER EF
+<char-0x0053>	    <char-0x042b>	" CYRILLIC CAPITAL LETTER YERU
+<char-0x0044>	    <char-0x0412>	" CYRILLIC CAPITAL LETTER VE
+<char-0x0046>	    <char-0x0410>	" CYRILLIC CAPITAL LETTER A
+<char-0x0047>	    <char-0x041f>	" CYRILLIC CAPITAL LETTER PE
+<char-0x0048>	    <char-0x0420>	" CYRILLIC CAPITAL LETTER ER
+<char-0x004a>	    <char-0x041e>	" CYRILLIC CAPITAL LETTER O
+<char-0x004b>	    <char-0x041b>	" CYRILLIC CAPITAL LETTER EL
+<char-0x004c>	    <char-0x0414>	" CYRILLIC CAPITAL LETTER DE
+<char-0x003a>	    <char-0x0416>	" CYRILLIC CAPITAL LETTER ZHE
 <char-0x0022>	    <char-0x042d>	" CYRILLIC CAPITAL LETTER E
 
-"	    ALPHABETIC 3rd ROW
+"	The ALT key pressed
+<A-char-0x0027>	    <char-0x0027>       " APOSTROPHE
+<A-char-0x0068>	    <char-0x20bd>	" RUBLE SIGN
+
+"	The SHIFT and ALT keys pressed
+<A-char-0x0022>	    <char-0x0022>       " QUOTATION MARK
+
+"	The ALT and CTRL key pressed
+<A-C-char-0x0073>    <char-0x044b><char-0x0301>	" CYRILLIC SMALL LETTER YERU with COMBINING ACUTE ACCENT
+<A-C-char-0x0066>    <char-0x0430><char-0x0301>	" CYRILLIC SMALL LETTER A with COMBINING ACUTE ACCENT
+<A-C-char-0x006a>    <char-0x043e><char-0x0301>	" CYRILLIC SMALL LETTER O with COMBINING ACUTE ACCENT
+<A-C-char-0x0027>    <char-0x044d><char-0x0301>	" CYRILLIC SMALL LETTER E with COMBINING ACUTE ACCENT
+
+"	The SHIFT and ALT and CTRL keys pressed
+<S-A-C-char-0x0053>    <char-0x042b><char-0x0301>   " CYRILLIC CAPITAL LETTER YERU with COMBINING ACUTE ACCENT
+<S-A-C-char-0x0046>    <char-0x0410><char-0x0301>   " CYRILLIC CAPITAL LETTER A with COMBINING ACUTE ACCENT
+<S-A-C-char-0x004a>    <char-0x041e><char-0x0301>   " CYRILLIC CAPITAL LETTER O with COMBINING ACUTE ACCENT
+<S-A-C-char-0x0022>    <char-0x042d><char-0x0301>   " CYRILLIC CAPITAL LETTER E with COMBINING ACUTE ACCENT
 
+
+"		ALPHABETIC 3st ROW
+
+"	None of the modifier keys are pressed
 <char-0x007a>	    <char-0x044f>	" CYRILLIC SMALL LETTER YA
-<char-0x005a>	    <char-0x042f>	" CYRILLIC CAPITAL LETTER YA
 <char-0x0078>	    <char-0x0447>	" CYRILLIC SMALL LETTER CHE
-<char-0x0058>	    <char-0x0427>	" CYRILLIC CAPITAL LETTER CHE
 <char-0x0063>	    <char-0x0441>	" CYRILLIC SMALL LETTER ES
-<char-0x0043>	    <char-0x0421>	" CYRILLIC CAPITAL LETTER ES
 <char-0x0076>	    <char-0x043c>	" CYRILLIC SMALL LETTER EM
-<char-0x0056>	    <char-0x041c>	" CYRILLIC CAPITAL LETTER EM
 <char-0x0062>	    <char-0x0438>	" CYRILLIC SMALL LETTER I
-<char-0x0042>	    <char-0x0418>	" CYRILLIC CAPITAL LETTER I
 <char-0x006e>	    <char-0x0442>	" CYRILLIC SMALL LETTER TE
-<char-0x004e>	    <char-0x0422>	" CYRILLIC CAPITAL LETTER TE
 <char-0x006d>	    <char-0x044c>	" CYRILLIC SMALL LETTER SOFT SIGN
-<char-0x004d>	    <char-0x042c>	" CYRILLIC CAPITAL LETTER SOFT SIGN
 <char-0x002c>	    <char-0x0431>	" CYRILLIC SMALL LETTER BE
-<char-0x003c>	    <char-0x0411>	" CYRILLIC CAPITAL LETTER BE
 <char-0x002e>	    <char-0x044e>	" CYRILLIC SMALL LETTER YU
-<char-0x003e>	    <char-0x042e>	" CYRILLIC CAPITAL LETTER YU
 <char-0x002f>	    <char-0x0451>	" CYRILLIC SMALL LETTER IO
+
+"	The SHIFT key is pressed
+<char-0x005a>	    <char-0x042f>	" CYRILLIC CAPITAL LETTER YA
+<char-0x0058>	    <char-0x0427>	" CYRILLIC CAPITAL LETTER CHE
+<char-0x0043>	    <char-0x0421>	" CYRILLIC CAPITAL LETTER ES
+<char-0x0056>	    <char-0x041c>	" CYRILLIC CAPITAL LETTER EM
+<char-0x0042>	    <char-0x0418>	" CYRILLIC CAPITAL LETTER I
+<char-0x004e>	    <char-0x0422>	" CYRILLIC CAPITAL LETTER TE
+<char-0x004d>	    <char-0x042c>	" CYRILLIC CAPITAL LETTER SOFT SIGN
+<char-0x003c>	    <char-0x0411>	" CYRILLIC CAPITAL LETTER BE
+<char-0x003e>	    <char-0x042e>	" CYRILLIC CAPITAL LETTER YU
 <char-0x003f>	    <char-0x0401>	" CYRILLIC CAPITAL LETTER IO
 
-"	    VK_OEM_5 key (scan code 2b)
+"	The ALT key pressed
 
-"	The Shift key is not pressed
-<char-0x005c>	    <char-0x002f>	" SOLIDUS
-"	The Shift key is pressed
-<char-0x007c>	    <char-0x005c>	" REVERSE SOLIDUS
 
-"	    Alt key pressed
+"	The SHIFT and ALT keys pressed
+<A-char-0x003c>	    <char-0x003c>       " LESS-THAN SIGN
+<A-char-0x003e>	    <char-0x003e>       " GREATER-THAN SIGN
 
-<A-char-0x0060>	    <char-0x0060>	" GRAVE ACCENT 
-<A-char-0x0031>	    <char-0x2116>       " NUMERO SIGN
-<A-char-0x0033>	    <char-0x201c>	" LEFT DOUBLE QUOTATION MARK
-<A-char-0x0034>	    <char-0x201d>	" RIGHT DOUBLE QUOTATION MARK
-<A-char-0x005b>	    <char-0x005b>       " LEFT SQUARE BRACKET
-<A-char-0x005d>	    <char-0x005d>       " RIGHT SQUARE BRACKET
-<A-char-0x0027>	    <char-0x0027>       " APOSTROPHE
+"	The ALT and CTRL key pressed
+<A-C-char-0x007a>    <char-0x044f><char-0x0301>	" CYRILLIC SMALL LETTER YA with COMBINING ACUTE ACCENT
+<A-C-char-0x0062>    <char-0x0438><char-0x0301>	" CYRILLIC SMALL LETTER I with COMBINING ACUTE ACCENT
+<A-C-char-0x002e>    <char-0x044e><char-0x0301>	" CYRILLIC SMALL LETTER YU with COMBINING ACUTE ACCENT
 
-"	    Alt and Shift keys pressed
+"	The SHIFT and ALT and CTRL keys pressed
+<S-A-C-char-0x005a>    <char-0x042f><char-0x0301>   " CYRILLIC CAPITAL LETTER YA with COMBINING ACUTE ACCENT
+<S-A-C-char-0x0042>    <char-0x0418><char-0x0301>   " CYRILLIC CAPITAL LETTER I with COMBINING ACUTE ACCENT
+<S-A-C-char-0x003e>    <char-0x042e><char-0x0301>   " CYRILLIC CAPITAL LETTER Y with COMBINING ACUTE ACCENT
 
-<A-char-0x007e>	    <char-0x007e>	" TILDE
-<A-char-0x0040>	    <char-0x0040>       " COMMERCIAL AT
-<A-char-0x0023>	    <char-0x0023>       " NUMBER SIGN
-<A-char-0x0024>	    <char-0x0024>       " DOLLAR SIGN
-<A-char-0x005e>	    <char-0x005e>       " CIRCUMFLEX ACCENT
-<A-char-0x0026>	    <char-0x0026>       " AMPERSAND
-<A-char-0x002a>	    <char-0x002a>       " ASTERISK
-<A-char-0x005f>	    <char-0x005f>       " LOW LINE
-<A-char-0x007b>	    <char-0x007b>       " LEFT CURLY BRACKET
-<A-char-0x007d>	    <char-0x007d>       " RIGHT CURLY BRACKET
-<A-char-0x0022>	    <char-0x0022>       " QUOTATION MARK
-<A-char-0x003c>	    <char-0x003c>       " LESS-THAN SIGN
-<A-char-0x003e>	    <char-0x003e>       " GREATER-THAN SIGN
+
+"		VK_OEM_5 key (scan code 2b)
+
+"	None of the modifier keys are pressed
+<char-0x005c>	    <char-0x002f>	" SOLIDUS
+
+"	The SHIFT key is pressed
+<char-0x007c>	    <char-0x00a7>	" SECTION SIGN
+
+"	The ALT key is pressed
+<A-char-0x005c>	    <char-0x005c>	" REVERSE SOLIDUS
+
+"	The SHIFT and ALT keys pressed
 <A-char-0x007c>	    <char-0x007c>       " VERTICAL LINE
 
+
+"		SPACE BAR key
+
+"	The ALT key pressed
+<A-char-0x0020>	    <char-0x202f>	" NARROW NO-BREAK SPACE
+
+"	The SHIFT and CTRL keys pressed
+<S-C-char-0x0020>   <char-0x00A0>	" NO-BREAK SPACE
+
+"	    \///\\
+
-- 
cgit 


From 0c23525b59d259b29c0026ecfa14109d05857254 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 16 Aug 2023 00:29:31 +0200
Subject: vim-patch:20b33b56ad5d

Update FreeBASIC syntax file (vim/vim#12781)

https://github.com/vim/vim/commit/20b33b56ad5d92c1c11e0859dc9333166625e0ad

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/syntax/freebasic.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/freebasic.vim b/runtime/syntax/freebasic.vim
index 7549d02555..5c43289c16 100644
--- a/runtime/syntax/freebasic.vim
+++ b/runtime/syntax/freebasic.vim
@@ -2,7 +2,7 @@
 " Language:		FreeBASIC
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Mark Manning <markem@sim1.us>
-" Last Change:		2022 Jun 26
+" Last Change:		2023 Aug 14
 "
 " Description:
 "
@@ -338,13 +338,13 @@ syn keyword	freebasicPredefined		__FB_64BIT__ __FB_ARGC__ __FB_ARG_COUNT__ __FB_
 syn keyword	freebasicPredefined		__FB_ARG_RIGHTOF__ __FB_ARGV__ __FB_ARM__ __FB_ASM__ __FB_BACKEND__
 syn keyword	freebasicPredefined		__FB_BIGENDIAN__ __FB_BUILD_DATE__ __FB_BUILD_DATE_ISO__ __FB_BUILD_SHA1__
 syn keyword	freebasicPredefined		__FB_CYGWIN__ __FB_DARWIN__ __FB_DEBUG__ __FB_DOS__ __FB_ERR__ __FB_EVAL__
-syn keyword	freebasicPredefined		__FB_FPMODE__ __FB_FPU__ __FB_FREEBSD__ __FB_GCC__ __FB_GUI__ __FB_JOIN__
+syn keyword	freebasicPredefined		__FB_FPMODE__ __FB_FPU__ __FB_FREEBSD__ __FB_GCC__ __FB_GUI__ __FB_IIF__ __FB_JOIN__
 syn keyword	freebasicPredefined		__FB_LANG__ __FB_LINUX__ __FB_MAIN__ __FB_MIN_VERSION__ __FB_MT__ __FB_NETBSD__
 syn keyword	freebasicPredefined		__FB_OPENBSD__ __FB_OPTIMIZE__ __FB_OPTION_BYVAL__ __FB_OPTION_DYNAMIC__
 syn keyword	freebasicPredefined		__FB_OPTION_ESCAPE__ __FB_OPTION_EXPLICIT__ __FB_OPTION_GOSUB__
 syn keyword	freebasicPredefined		__FB_OPTION_PRIVATE__ __FB_OUT_DLL__ __FB_OUT_EXE__ __FB_OUT_LIB__ __FB_OUT_OBJ__
-syn keyword	freebasicPredefined		__FB_PCOS__ __FB_PPC__ __FB_QUOTE__ __FB_SIGNATURE__ __FB_SSE__ __FB_UNIQUEID__
-syn keyword	freebasicPredefined		__FB_UNIQUEID_POP__ __FB_UNIQUEID_PUSH__ __FB_UNIX__ __FB_UNQUOTE__
+syn keyword	freebasicPredefined		__FB_PCOS__ __FB_PPC__ __FB_QUERY_SYMBOL__ __FB_QUOTE__ __FB_SIGNATURE__ __FB_SSE__
+syn keyword	freebasicPredefined		__FB_UNIQUEID__ __FB_UNIQUEID_POP__ __FB_UNIQUEID_PUSH__ __FB_UNIX__ __FB_UNQUOTE__
 syn keyword	freebasicPredefined		__FB_VECTORIZE__ __FB_VER_MAJOR__ __FB_VER_MINOR__ __FB_VER_PATCH__ __FB_VERSION__
 syn keyword	freebasicPredefined		__FB_WIN32__ __FB_X86__ __FB_XBOX__
 syn keyword	freebasicPredefined		__FILE__ __FILE_NQ__ __FUNCTION__ __FUNCTION_NQ__
-- 
cgit 


From 54be7d6b45a9ae51c218c0e5c1c20dd608b97297 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 16 Aug 2023 15:02:15 +0900
Subject: docs(lua): add missing fields to treesitter/_meta

According to `:h TSNode` docs, there's also `TSNode:sexpr()` and
`TSNode:has_error()` that is part of `TSNode` class, but this wasn't
documented in `treesitter/_meta.lua`.

Adding missing fields in so the types is similar to `:h TSNode`
---
 runtime/lua/vim/treesitter/_meta.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index d8babc9402..9a94f12c16 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -25,6 +25,8 @@
 ---@field prev_named_sibling fun(self: TSNode): TSNode?
 ---@field named_children fun(self: TSNode): TSNode[]
 ---@field has_changes fun(self: TSNode): boolean
+---@field has_error fun(self: TSNode): boolean
+---@field sexpr fun(self: TSNode): string
 ---@field equal fun(self: TSNode, other: TSNode): boolean
 ---@field iter_children fun(self: TSNode): fun(): TSNode, string
 local TSNode = {}
-- 
cgit 


From 9cb7e00b9748b08fce661f8cbeb06c5994c749ae Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 16 Aug 2023 08:21:32 -0500
Subject: feat(diagnostic): provide more control over virtual text display
 (#24724)

Allow users to pass virtual text options to nvim_buf_set_extmark through
the "virtual_text" table in vim.diagnostic.config().

Fixes: https://github.com/neovim/neovim/issues/16545
---
 runtime/doc/diagnostic.txt     | 5 ++++-
 runtime/doc/news.txt           | 5 +++++
 runtime/lua/vim/diagnostic.lua | 9 +++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index d95e0d8333..edbba6ac41 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -382,7 +382,10 @@ config({opts}, {namespace})                          *vim.diagnostic.config()*
                      • virtual_text: (default true) Use virtual text for
                        diagnostics. If multiple diagnostics are set for a
                        namespace, one prefix per diagnostic + the last
-                       diagnostic message are shown. Options:
+                       diagnostic message are shown. In addition to the
+                       options listed below, the "virt_text" options of
+                       |nvim_buf_set_extmark()| may also be used here (e.g.
+                       "virt_text_pos" and "hl_mode"). Options:
                        • severity: Only show virtual text for diagnostics
                          matching the given severity |diagnostic-severity|
                        • source: (boolean or string) Include the diagnostic
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 2396f4f5a2..576c56f408 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -194,6 +194,11 @@ The following changes to existing APIs or features add new behavior.
   automatically if the job exited without error, eliminating the (often
   unwanted) "[Process exited 0]" message.
 
+• |vim.diagnostic.config()| now accepts virtual text relevant options to
+  |nvim_buf_set_extmark()| (e.g. "virt_text_pos" and "hl_mode") in its
+  "virtual_text" table, which gives users more control over how diagnostic
+  virtual text is displayed.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 180b9ad3df..1391dafd75 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -566,7 +566,9 @@ end
 ---                    severity |diagnostic-severity|
 ---       - virtual_text: (default true) Use virtual text for diagnostics. If multiple diagnostics
 ---                       are set for a namespace, one prefix per diagnostic + the last diagnostic
----                       message are shown.
+---                       message are shown. In addition to the options listed below, the
+---                       "virt_text" options of |nvim_buf_set_extmark()| may also be used here
+---                       (e.g. "virt_text_pos" and "hl_mode").
 ---                       Options:
 ---                       * severity: Only show virtual text for diagnostics matching the given
 ---                       severity |diagnostic-severity|
@@ -1008,8 +1010,11 @@ M.handlers.virtual_text = {
 
       if virt_texts then
         api.nvim_buf_set_extmark(bufnr, virt_text_ns, line, 0, {
-          hl_mode = 'combine',
+          hl_mode = opts.virtual_text.hl_mode or 'combine',
           virt_text = virt_texts,
+          virt_text_pos = opts.virtual_text.virt_text_pos,
+          virt_text_hide = opts.virtual_text.virt_text_hide,
+          virt_text_win_col = opts.virtual_text.virt_text_win_col,
         })
       end
     end
-- 
cgit 


From e7801775060e2d8f9f20572fac687f438e81caa0 Mon Sep 17 00:00:00 2001
From: Michael Strobel <71396679+Kibadda@users.noreply.github.com>
Date: Wed, 16 Aug 2023 15:49:14 +0200
Subject: feat(diagnostic): filter diagnostics by specific severities (#24736)

Allow users to filter diagnostics by specifying severities
---
 runtime/doc/diagnostic.txt     | 13 +++++++++++--
 runtime/doc/news.txt           |  3 +++
 runtime/lua/vim/diagnostic.lua | 17 ++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index edbba6ac41..d0aa538011 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -66,7 +66,7 @@ The "severity" key in a diagnostic is one of the values defined in
     vim.diagnostic.severity.HINT
 
 Functions that take a severity as an optional parameter (e.g.
-|vim.diagnostic.get()|) accept one of two forms:
+|vim.diagnostic.get()|) accept one of three forms:
 
 1. A single |vim.diagnostic.severity| value: >lua
 
@@ -75,8 +75,17 @@ Functions that take a severity as an optional parameter (e.g.
 2. A table with a "min" or "max" key (or both): >lua
 
     vim.diagnostic.get(0, { severity = { min = vim.diagnostic.severity.WARN } })
+<
+    This form allows users to specify a range of severities.
+
+3. A list-like table: >lua
 
-The latter form allows users to specify a range of severities.
+    vim.diagnostic.get(0, { severity = {
+        vim.diagnostic.severity.WARN,
+        vim.diagnostic.severity.INFO,
+    } })
+<
+    This form allows users to filter for specific severities
 
 ==============================================================================
 HANDLERS                                                *diagnostic-handlers*
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 576c56f408..483e829770 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -145,6 +145,9 @@ The following new APIs and features were added.
 
 • Improved messages for type errors in `vim.api.*` calls (including `opts` params)
 
+• Functions that take a severity as an optional parameter (e.g.
+  |vim.diagnostic.get()|) now also accept a list of severities |vim.diagnostic.severity|
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 1391dafd75..96d1cb7629 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -94,11 +94,22 @@ local function filter_by_severity(severity, diagnostics)
     end, diagnostics)
   end
 
-  local min_severity = to_severity(severity.min) or M.severity.HINT
-  local max_severity = to_severity(severity.max) or M.severity.ERROR
+  if severity.min or severity.max then
+    local min_severity = to_severity(severity.min) or M.severity.HINT
+    local max_severity = to_severity(severity.max) or M.severity.ERROR
+
+    return vim.tbl_filter(function(t)
+      return t.severity <= min_severity and t.severity >= max_severity
+    end, diagnostics)
+  end
+
+  local severities = {}
+  for _, s in ipairs(severity) do
+    severities[to_severity(s)] = true
+  end
 
   return vim.tbl_filter(function(t)
-    return t.severity <= min_severity and t.severity >= max_severity
+    return severities[t.severity]
   end, diagnostics)
 end
 
-- 
cgit 


From 8cbb2477cf70ea29105e3df17308e6d6a067c8e6 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 17 Aug 2023 09:43:00 +0800
Subject: vim-patch:8.2.1969: Vim9: map() may change the list or dict item type

Problem:    Vim9: map() may change the list or dict item type.
Solution:   Add mapnew().

https://github.com/vim/vim/commit/ea696852e7abcdebaf7f17a7f23dc90df1f5e2ed

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         |  7 +++++++
 runtime/doc/usr_41.txt          |  2 ++
 runtime/lua/vim/_meta/vimfn.lua | 11 +++++++++++
 3 files changed, 20 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index bc5f0948e2..04c4ce60c3 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4065,6 +4065,8 @@ map({expr1}, {expr2})                                                    *map()*
 		{expr1} must be a |List|, |Blob| or |Dictionary|.
 		Replace each item in {expr1} with the result of evaluating
 		{expr2}.  For a |Blob| each byte is replaced.
+		If the item type changes you may want to use |mapnew()| to
+		create a new List or Dictionary.
 
 		{expr2} must be a |string| or |Funcref|.
 
@@ -4205,6 +4207,11 @@ mapcheck({name} [, {mode} [, {abbr}]])                              *mapcheck()*
 <		This avoids adding the "_vv" mapping when there already is a
 		mapping for "_v" or for "_vvv".
 
+mapnew({expr1}, {expr2})                                              *mapnew()*
+		Like |map()| but instead of replacing items in {expr1} a new
+		List or Dictionary is created and returned.  {expr1} remains
+		unchanged.
+
 mapset({mode}, {abbr}, {dict})                                        *mapset()*
 		Restore a mapping from a dictionary returned by |maparg()|.
 		{mode} and {abbr} should be the same as for the call to
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index e6fcfa2fc6..ac371cf0e3 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -660,6 +660,7 @@ List manipulation:					*list-functions*
 	deepcopy()		make a full copy of a List
 	filter()		remove selected items from a List
 	map()			change each List item
+	mapnew()		make a new List with changed items
 	reduce()		reduce a List to a value
 	slice()			take a slice of a List
 	sort()			sort a List
@@ -690,6 +691,7 @@ Dictionary manipulation:				*dict-functions*
 	extendnew()		make a new Dictionary and append items
 	filter()		remove selected entries from a Dictionary
 	map()			change each Dictionary entry
+	mapnew()		make a new Dictionary with changed items
 	keys()			get List of Dictionary keys
 	values()		get List of Dictionary values
 	items()			get List of Dictionary key-value pairs
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index d1173e8a42..3782f4bf2f 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -4922,6 +4922,8 @@ function vim.fn.log10(expr) end
 --- {expr1} must be a |List|, |Blob| or |Dictionary|.
 --- Replace each item in {expr1} with the result of evaluating
 --- {expr2}.  For a |Blob| each byte is replaced.
+--- If the item type changes you may want to use |mapnew()| to
+--- create a new List or Dictionary.
 ---
 --- {expr2} must be a |string| or |Funcref|.
 ---
@@ -5078,6 +5080,15 @@ function vim.fn.maparg(name, mode, abbr, dict) end
 --- @return any
 function vim.fn.mapcheck(name, mode, abbr) end
 
+--- Like |map()| but instead of replacing items in {expr1} a new
+--- List or Dictionary is created and returned.  {expr1} remains
+--- unchanged.
+---
+--- @param expr1 any
+--- @param expr2 any
+--- @return any
+function vim.fn.mapnew(expr1, expr2) end
+
 --- Restore a mapping from a dictionary returned by |maparg()|.
 --- {mode} and {abbr} should be the same as for the call to
 --- |maparg()|. *E460*
-- 
cgit 


From 3117dc70f1e60569f5c3cc0eee5f5005081722b5 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 17 Aug 2023 11:08:21 +0800
Subject: vim-patch:1b884a005398

Update runtime files.

https://github.com/vim/vim/commit/1b884a0053982335f644eec6c71027706bf3c522

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         | 3 ++-
 runtime/lua/vim/_meta/vimfn.lua | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 04c4ce60c3..a51f14aab0 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4210,7 +4210,8 @@ mapcheck({name} [, {mode} [, {abbr}]])                              *mapcheck()*
 mapnew({expr1}, {expr2})                                              *mapnew()*
 		Like |map()| but instead of replacing items in {expr1} a new
 		List or Dictionary is created and returned.  {expr1} remains
-		unchanged.
+		unchanged.  Items can still be changed by {expr2}, if you
+		don't want that use |deepcopy()| first.
 
 mapset({mode}, {abbr}, {dict})                                        *mapset()*
 		Restore a mapping from a dictionary returned by |maparg()|.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 3782f4bf2f..b48e2beb8d 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5082,7 +5082,8 @@ function vim.fn.mapcheck(name, mode, abbr) end
 
 --- Like |map()| but instead of replacing items in {expr1} a new
 --- List or Dictionary is created and returned.  {expr1} remains
---- unchanged.
+--- unchanged.  Items can still be changed by {expr2}, if you
+--- don't want that use |deepcopy()| first.
 ---
 --- @param expr1 any
 --- @param expr2 any
-- 
cgit 


From d9e7dad13945ce1f4110c37d5388b5c532dec0d3 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 17 Aug 2023 12:37:52 +0800
Subject: vim-patch:8.2.3818: cannot filter or map characters in a string

Problem:    Cannot filter or map characters in a string.
Solution:   Make filter() and map() work on a string. (Naruhiko Nishino,
            closes vim/vim#9327)

https://github.com/vim/vim/commit/c479ce032f5d4d14bab9e479acbf42d758879893

Co-authored-by: rbtnn <naru123456789@gmail.com>
---
 runtime/doc/builtin.txt         | 47 +++++++++++++++++++++++------------------
 runtime/lua/vim/_meta/vimfn.lua | 47 +++++++++++++++++++++++------------------
 2 files changed, 54 insertions(+), 40 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index a51f14aab0..0b24ed8d85 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1623,10 +1623,11 @@ filewritable({file})                                            *filewritable()*
 		directory, and we can write to it, the result is 2.
 
 filter({expr1}, {expr2})                                              *filter()*
-		{expr1} must be a |List|, |Blob|, or a |Dictionary|.
+		{expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
 		For each item in {expr1} evaluate {expr2} and when the result
-		is zero remove the item from the |List| or |Dictionary|. For a
-		|Blob| each byte is removed.
+		is zero or false remove the item from the |List| or
+		|Dictionary|.  Similarly for each byte in a |Blob| and each
+		character in a |String|.
 
 		{expr2} must be a |string| or |Funcref|.
 
@@ -1662,14 +1663,16 @@ filter({expr1}, {expr2})                                              *filter()*
 <		If you do not use "val" you can leave it out: >vim
 			call filter(myList, {idx -> idx % 2 == 1})
 <
-		The operation is done in-place.  If you want a |List| or
-		|Dictionary| to remain unmodified make a copy first: >vim
+		For a |List| and a |Dictionary| the operation is done
+		in-place.  If you want it to remain unmodified make a copy
+		first: >vim
 			let l = filter(copy(mylist), 'v:val =~ "KEEP"')
 
-<		Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
-		filtered.  When an error is encountered while evaluating
-		{expr2} no further items in {expr1} are processed.  When
-		{expr2} is a Funcref errors inside a function are ignored,
+<		Returns {expr1}, the |List| or |Dictionary| that was filtered,
+		or a new |Blob| or |String|.
+		When an error is encountered while evaluating {expr2} no
+		further items in {expr1} are processed.
+		When {expr2} is a Funcref errors inside a function are ignored,
 		unless it was defined with the "abort" flag.
 
 finddir({name} [, {path} [, {count}]])                               *finddir()*
@@ -4062,15 +4065,18 @@ luaeval({expr} [, {expr}])                                           *luaeval()*
 		to Vim data structures. See |lua-eval| for more details.
 
 map({expr1}, {expr2})                                                    *map()*
-		{expr1} must be a |List|, |Blob| or |Dictionary|.
-		Replace each item in {expr1} with the result of evaluating
-		{expr2}.  For a |Blob| each byte is replaced.
+		{expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
+		When {expr1} is a |List|| or |Dictionary|, replace each
+		item in {expr1} with the result of evaluating {expr2}.
+		For a |Blob| each byte is replaced.
+		For a |String|, each character, including composing
+		characters, is replaced.
 		If the item type changes you may want to use |mapnew()| to
 		create a new List or Dictionary.
 
-		{expr2} must be a |string| or |Funcref|.
+		{expr2} must be a |String| or |Funcref|.
 
-		If {expr2} is a |string|, inside {expr2} |v:val| has the value
+		If {expr2} is a |String|, inside {expr2} |v:val| has the value
 		of the current item.  For a |Dictionary| |v:key| has the key
 		of the current item and for a |List| |v:key| has the index of
 		the current item.  For a |Blob| |v:key| has the index of the
@@ -4100,14 +4106,15 @@ map({expr1}, {expr2})                                                    *map()*
 <		If you do not use "key" you can use a short name: >vim
 			call map(myDict, {_, val -> 'item: ' .. val})
 <
-		The operation is done in-place.  If you want a |List| or
-		|Dictionary| to remain unmodified make a copy first: >vim
+		The operation is done in-place for a |List| and |Dictionary|.
+		If you want it to remain unmodified make a copy first: >vim
 			let tlist = map(copy(mylist), ' v:val .. "\t"')
 
-<		Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
-		filtered.  When an error is encountered while evaluating
-		{expr2} no further items in {expr1} are processed.  When
-		{expr2} is a Funcref errors inside a function are ignored,
+<		Returns {expr1}, the |List| or |Dictionary| that was filtered,
+		or a new |Blob| or |String|.
+		When an error is encountered while evaluating {expr2} no
+		further items in {expr1} are processed.
+		When {expr2} is a Funcref errors inside a function are ignored,
 		unless it was defined with the "abort" flag.
 
 maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index b48e2beb8d..4b90a9e3c0 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -2005,10 +2005,11 @@ function vim.fn.filereadable(file) end
 --- @return 0|1
 function vim.fn.filewritable(file) end
 
---- {expr1} must be a |List|, |Blob|, or a |Dictionary|.
+--- {expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
 --- For each item in {expr1} evaluate {expr2} and when the result
---- is zero remove the item from the |List| or |Dictionary|. For a
---- |Blob| each byte is removed.
+--- is zero or false remove the item from the |List| or
+--- |Dictionary|.  Similarly for each byte in a |Blob| and each
+--- character in a |String|.
 ---
 --- {expr2} must be a |string| or |Funcref|.
 ---
@@ -2044,14 +2045,16 @@ function vim.fn.filewritable(file) end
 --- <If you do not use "val" you can leave it out: >vim
 ---   call filter(myList, {idx -> idx % 2 == 1})
 --- <
---- The operation is done in-place.  If you want a |List| or
---- |Dictionary| to remain unmodified make a copy first: >vim
+--- For a |List| and a |Dictionary| the operation is done
+--- in-place.  If you want it to remain unmodified make a copy
+--- first: >vim
 ---   let l = filter(copy(mylist), 'v:val =~ "KEEP"')
 ---
---- <Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
---- filtered.  When an error is encountered while evaluating
---- {expr2} no further items in {expr1} are processed.  When
---- {expr2} is a Funcref errors inside a function are ignored,
+--- <Returns {expr1}, the |List| or |Dictionary| that was filtered,
+--- or a new |Blob| or |String|.
+--- When an error is encountered while evaluating {expr2} no
+--- further items in {expr1} are processed.
+--- When {expr2} is a Funcref errors inside a function are ignored,
 --- unless it was defined with the "abort" flag.
 ---
 --- @param expr1 any
@@ -4919,15 +4922,18 @@ function vim.fn.log(expr) end
 --- @return any
 function vim.fn.log10(expr) end
 
---- {expr1} must be a |List|, |Blob| or |Dictionary|.
---- Replace each item in {expr1} with the result of evaluating
---- {expr2}.  For a |Blob| each byte is replaced.
+--- {expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
+--- When {expr1} is a |List|| or |Dictionary|, replace each
+--- item in {expr1} with the result of evaluating {expr2}.
+--- For a |Blob| each byte is replaced.
+--- For a |String|, each character, including composing
+--- characters, is replaced.
 --- If the item type changes you may want to use |mapnew()| to
 --- create a new List or Dictionary.
 ---
---- {expr2} must be a |string| or |Funcref|.
+--- {expr2} must be a |String| or |Funcref|.
 ---
---- If {expr2} is a |string|, inside {expr2} |v:val| has the value
+--- If {expr2} is a |String|, inside {expr2} |v:val| has the value
 --- of the current item.  For a |Dictionary| |v:key| has the key
 --- of the current item and for a |List| |v:key| has the index of
 --- the current item.  For a |Blob| |v:key| has the index of the
@@ -4957,14 +4963,15 @@ function vim.fn.log10(expr) end
 --- <If you do not use "key" you can use a short name: >vim
 ---   call map(myDict, {_, val -> 'item: ' .. val})
 --- <
---- The operation is done in-place.  If you want a |List| or
---- |Dictionary| to remain unmodified make a copy first: >vim
+--- The operation is done in-place for a |List| and |Dictionary|.
+--- If you want it to remain unmodified make a copy first: >vim
 ---   let tlist = map(copy(mylist), ' v:val .. "\t"')
 ---
---- <Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
---- filtered.  When an error is encountered while evaluating
---- {expr2} no further items in {expr1} are processed.  When
---- {expr2} is a Funcref errors inside a function are ignored,
+--- <Returns {expr1}, the |List| or |Dictionary| that was filtered,
+--- or a new |Blob| or |String|.
+--- When an error is encountered while evaluating {expr2} no
+--- further items in {expr1} are processed.
+--- When {expr2} is a Funcref errors inside a function are ignored,
 --- unless it was defined with the "abort" flag.
 ---
 --- @param expr1 any
-- 
cgit 


From c5576fcc8003280489c0aa0323a966e6de33e31f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 17 Aug 2023 13:41:43 +0800
Subject: vim-patch:8.2.3848: cannot use reduce() for a string

Problem:    Cannot use reduce() for a string.
Solution:   Make reduce() work with a string. (Naruhiko Nishino, closes vim/vim#9366)

https://github.com/vim/vim/commit/0ccb5842f5fb103763d106c7aa364d758343c35a

Omit tv_get_first_char() as it doesn't really save much code.

Co-authored-by: rbtnn <naru123456789@gmail.com>
---
 runtime/doc/builtin.txt         | 7 ++++---
 runtime/lua/vim/_meta/vimfn.lua | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 0b24ed8d85..6303d73db5 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5514,9 +5514,9 @@ readfile({fname} [, {type} [, {max}]])                              *readfile()*
 
 reduce({object}, {func} [, {initial}])                           *reduce()* *E998*
 		{func} is called for every item in {object}, which can be a
-		|List| or a |Blob|.  {func} is called with two arguments: the
-		result so far and current item.  After processing all items
-		the result is returned.
+		|String|, |List| or a |Blob|.  {func} is called with two arguments:
+		the result so far and current item.  After processing all
+		items the result is returned.
 
 		{initial} is the initial result.  When omitted, the first item
 		in {object} is used and {func} is first called for the second
@@ -5527,6 +5527,7 @@ reduce({object}, {func} [, {initial}])                           *reduce()* *E99
 			echo reduce([1, 3, 5], { acc, val -> acc + val })
 			echo reduce(['x', 'y'], { acc, val -> acc .. val }, 'a')
 			echo reduce(0z1122, { acc, val -> 2 * acc + val })
+			echo reduce('xyz', { acc, val -> acc .. ',' .. val })
 <
 
 reg_executing()                                                *reg_executing()*
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 4b90a9e3c0..4fe9093666 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6551,9 +6551,9 @@ function vim.fn.readdir(directory, expr) end
 function vim.fn.readfile(fname, type, max) end
 
 --- {func} is called for every item in {object}, which can be a
---- |List| or a |Blob|.  {func} is called with two arguments: the
---- result so far and current item.  After processing all items
---- the result is returned.
+--- |String|, |List| or a |Blob|.  {func} is called with two arguments:
+--- the result so far and current item.  After processing all
+--- items the result is returned.
 ---
 --- {initial} is the initial result.  When omitted, the first item
 --- in {object} is used and {func} is first called for the second
@@ -6564,6 +6564,7 @@ function vim.fn.readfile(fname, type, max) end
 ---   echo reduce([1, 3, 5], { acc, val -> acc + val })
 ---   echo reduce(['x', 'y'], { acc, val -> acc .. val }, 'a')
 ---   echo reduce(0z1122, { acc, val -> 2 * acc + val })
+---   echo reduce('xyz', { acc, val -> acc .. ',' .. val })
 --- <
 ---
 --- @param object any
-- 
cgit 


From b193674b4a1dce1b348489fa13dd42254b9a3ebb Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 17 Aug 2023 14:12:24 +0800
Subject: vim-patch:partial:8.2.3849: functions implementing reduce and map are
 too long

Problem:    Functions implementing reduce and map are too long.
Solution:   Use a function for each type of value.  Add a few more test cases
            and add to the help. (Yegappan Lakshmanan, closes vim/vim#9370)

https://github.com/vim/vim/commit/389b72196e6aaeafe3f907c73d271f2c6b931140

Partial port as this doesn't include handling for non-materialized List.

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt         | 13 +++++++------
 runtime/lua/vim/_meta/vimfn.lua | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 6303d73db5..4b617763da 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1635,8 +1635,8 @@ filter({expr1}, {expr2})                                              *filter()*
 		of the current item.  For a |Dictionary| |v:key| has the key
 		of the current item and for a |List| |v:key| has the index of
 		the current item.  For a |Blob| |v:key| has the index of the
-		current byte.
-
+		current byte. For a |String| |v:key| has the index of the
+		current character.
 		Examples: >vim
 			call filter(mylist, 'v:val !~ "OLD"')
 <		Removes the items where "OLD" appears. >vim
@@ -4080,7 +4080,8 @@ map({expr1}, {expr2})                                                    *map()*
 		of the current item.  For a |Dictionary| |v:key| has the key
 		of the current item and for a |List| |v:key| has the index of
 		the current item.  For a |Blob| |v:key| has the index of the
-		current byte.
+		current byte. For a |String| |v:key| has the index of the
+		current character.
 		Example: >vim
 			call map(mylist, '"> " .. v:val .. " <"')
 <		This puts "> " before and " <" after each item in "mylist".
@@ -5514,9 +5515,9 @@ readfile({fname} [, {type} [, {max}]])                              *readfile()*
 
 reduce({object}, {func} [, {initial}])                           *reduce()* *E998*
 		{func} is called for every item in {object}, which can be a
-		|String|, |List| or a |Blob|.  {func} is called with two arguments:
-		the result so far and current item.  After processing all
-		items the result is returned.
+		|String|, |List| or a |Blob|.  {func} is called with two
+		arguments: the result so far and current item.  After
+		processing all items the result is returned.
 
 		{initial} is the initial result.  When omitted, the first item
 		in {object} is used and {func} is first called for the second
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 4fe9093666..17eda634e0 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -2017,8 +2017,8 @@ function vim.fn.filewritable(file) end
 --- of the current item.  For a |Dictionary| |v:key| has the key
 --- of the current item and for a |List| |v:key| has the index of
 --- the current item.  For a |Blob| |v:key| has the index of the
---- current byte.
----
+--- current byte. For a |String| |v:key| has the index of the
+--- current character.
 --- Examples: >vim
 ---   call filter(mylist, 'v:val !~ "OLD"')
 --- <Removes the items where "OLD" appears. >vim
@@ -4937,7 +4937,8 @@ function vim.fn.log10(expr) end
 --- of the current item.  For a |Dictionary| |v:key| has the key
 --- of the current item and for a |List| |v:key| has the index of
 --- the current item.  For a |Blob| |v:key| has the index of the
---- current byte.
+--- current byte. For a |String| |v:key| has the index of the
+--- current character.
 --- Example: >vim
 ---   call map(mylist, '"> " .. v:val .. " <"')
 --- <This puts "> " before and " <" after each item in "mylist".
@@ -6551,9 +6552,9 @@ function vim.fn.readdir(directory, expr) end
 function vim.fn.readfile(fname, type, max) end
 
 --- {func} is called for every item in {object}, which can be a
---- |String|, |List| or a |Blob|.  {func} is called with two arguments:
---- the result so far and current item.  After processing all
---- items the result is returned.
+--- |String|, |List| or a |Blob|.  {func} is called with two
+--- arguments: the result so far and current item.  After
+--- processing all items the result is returned.
 ---
 --- {initial} is the initial result.  When omitted, the first item
 --- in {object} is used and {func} is first called for the second
-- 
cgit 


From 6267996f13c5fd2ae8023b85c48e0e207e278cd9 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 17 Aug 2023 15:42:36 +0800
Subject: vim-patch:8.2.4455: accepting one and zero for second sort() argument
 is strange

Problem:    Accepting one and zero for the second sort() argument is strange.
Solution:   Disallow using one and zero in Vim9 script.

https://github.com/vim/vim/commit/2007dd49f5cb36f944cab1cfbceb0f864e625f74

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         | 19 ++++++++++---------
 runtime/lua/vim/_meta/vimfn.lua | 21 +++++++++++----------
 2 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 4b617763da..8e92ca4e1c 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -7177,21 +7177,22 @@ sockconnect({mode}, {address} [, {opts}])                        *sockconnect()*
 		  - The channel ID on success (greater than zero)
 		  - 0 on invalid arguments or connection failure.
 
-sort({list} [, {func} [, {dict}]])                                 *sort()* *E702*
+sort({list} [, {how} [, {dict}]])                                  *sort()* *E702*
 		Sort the items in {list} in-place.  Returns {list}.
 
 		If you want a list to remain unmodified make a copy first: >vim
 			let sortedlist = sort(copy(mylist))
 
-<		When {func} is omitted, is empty or zero, then sort() uses the
+<		When {how} is omitted or is a string, then sort() uses the
 		string representation of each item to sort on.  Numbers sort
 		after Strings, |Lists| after Numbers.  For sorting text in the
 		current buffer use |:sort|.
 
-		When {func} is given and it is '1' or 'i' then case is
-		ignored.
+		When {how} is given and it is 'i' then case is ignored.
+		For backwards compatibility, the value one can be used to
+		ignore case.  Zero means to not ignore case.
 
-		When {func} is given and it is 'l' then the current collation
+		When {how} is given and it is 'l' then the current collation
 		locale is used for ordering. Implementation details: strcoll()
 		is used to compare strings. See |:language| check or set the
 		collation locale. |v:collate| can also be used to check the
@@ -7208,19 +7209,19 @@ sort({list} [, {func} [, {dict}]])                                 *sort()* *E70
 <			['n', 'o', 'O', 'p', 'z', 'ö'] ~
 		This does not work properly on Mac.
 
-		When {func} is given and it is 'n' then all items will be
+		When {how} is given and it is 'n' then all items will be
 		sorted numerical (Implementation detail: this uses the
 		strtod() function to parse numbers, Strings, Lists, Dicts and
 		Funcrefs will be considered as being 0).
 
-		When {func} is given and it is 'N' then all items will be
+		When {how} is given and it is 'N' then all items will be
 		sorted numerical. This is like 'n' but a string containing
 		digits will be used as the number they represent.
 
-		When {func} is given and it is 'f' then all items will be
+		When {how} is given and it is 'f' then all items will be
 		sorted numerical. All values must be a Number or a Float.
 
-		When {func} is a |Funcref| or a function name, this function
+		When {how} is a |Funcref| or a function name, this function
 		is called to compare items.  The function is invoked with two
 		items as argument and must return zero if they are equal, 1 or
 		bigger if the first one sorts after the second one, -1 or
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 17eda634e0..d1c90249ed 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -8531,15 +8531,16 @@ function vim.fn.sockconnect(mode, address, opts) end
 --- If you want a list to remain unmodified make a copy first: >vim
 ---   let sortedlist = sort(copy(mylist))
 ---
---- <When {func} is omitted, is empty or zero, then sort() uses the
+--- <When {how} is omitted or is a string, then sort() uses the
 --- string representation of each item to sort on.  Numbers sort
 --- after Strings, |Lists| after Numbers.  For sorting text in the
 --- current buffer use |:sort|.
 ---
---- When {func} is given and it is '1' or 'i' then case is
---- ignored.
+--- When {how} is given and it is 'i' then case is ignored.
+--- For backwards compatibility, the value one can be used to
+--- ignore case.  Zero means to not ignore case.
 ---
---- When {func} is given and it is 'l' then the current collation
+--- When {how} is given and it is 'l' then the current collation
 --- locale is used for ordering. Implementation details: strcoll()
 --- is used to compare strings. See |:language| check or set the
 --- collation locale. |v:collate| can also be used to check the
@@ -8556,19 +8557,19 @@ function vim.fn.sockconnect(mode, address, opts) end
 --- <  ['n', 'o', 'O', 'p', 'z', 'ö'] ~
 --- This does not work properly on Mac.
 ---
---- When {func} is given and it is 'n' then all items will be
+--- When {how} is given and it is 'n' then all items will be
 --- sorted numerical (Implementation detail: this uses the
 --- strtod() function to parse numbers, Strings, Lists, Dicts and
 --- Funcrefs will be considered as being 0).
 ---
---- When {func} is given and it is 'N' then all items will be
+--- When {how} is given and it is 'N' then all items will be
 --- sorted numerical. This is like 'n' but a string containing
 --- digits will be used as the number they represent.
 ---
---- When {func} is given and it is 'f' then all items will be
+--- When {how} is given and it is 'f' then all items will be
 --- sorted numerical. All values must be a Number or a Float.
 ---
---- When {func} is a |Funcref| or a function name, this function
+--- When {how} is a |Funcref| or a function name, this function
 --- is called to compare items.  The function is invoked with two
 --- items as argument and must return zero if they are equal, 1 or
 --- bigger if the first one sorts after the second one, -1 or
@@ -8598,10 +8599,10 @@ function vim.fn.sockconnect(mode, address, opts) end
 --- <
 ---
 --- @param list any
---- @param func? any
+--- @param how? any
 --- @param dict? any
 --- @return any
-function vim.fn.sort(list, func, dict) end
+function vim.fn.sort(list, how, dict) end
 
 --- Return the sound-folded equivalent of {word}.  Uses the first
 --- language in 'spelllang' for the current window that supports
-- 
cgit 


From 88887a7be707773f908dd6e597f0293d3c1a0faa Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Thu, 17 Aug 2023 16:38:56 +0100
Subject: docs(builtin): fix some missing lines (#24759)

Some things got chopped off in the PR that removed method syntax examples.
These were all that I found.
---
 runtime/doc/builtin.txt         | 8 ++++++++
 runtime/lua/vim/_meta/vimfn.lua | 8 ++++++++
 2 files changed, 16 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 8e92ca4e1c..94e9223ee9 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -429,6 +429,8 @@ bufname([{buf}])                                                     *bufname()*
 		with a listed buffer, that one is returned.  Next unlisted
 		buffers are searched for.
 		If the {buf} is a String, but you want to use it as a buffer
+		number, force it to be a Number by adding zero to it: >vim
+			echo bufname("3" + 0)
 <		If the buffer doesn't exist, or doesn't have a name, an empty
 		string is returned. >vim
 			echo bufname("#")	" alternate buffer name
@@ -3676,6 +3678,9 @@ interrupt()                                                        *interrupt()*
 
 invert({expr})                                                        *invert()*
 		Bitwise invert.  The argument is converted to a number.  A
+		List, Dict or Float argument causes an error.  Example: >vim
+			let bits = invert(bits)
+<
 
 isdirectory({directory})                                         *isdirectory()*
 		The result is a Number, which is |TRUE| when a directory
@@ -5665,6 +5670,9 @@ reverse({object})                                                    *reverse()*
 		{object} can be a |List| or a |Blob|.
 		Returns {object}.
 		Returns zero if {object} is not a List or a Blob.
+		If you want an object to remain unmodified make a copy first: >vim
+			let revlist = reverse(copy(mylist))
+<
 
 round({expr})                                                          *round()*
 		Round off {expr} to the nearest integral value and return it
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index d1c90249ed..ce325ce1f8 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -570,6 +570,8 @@ function vim.fn.bufloaded(buf) end
 --- with a listed buffer, that one is returned.  Next unlisted
 --- buffers are searched for.
 --- If the {buf} is a String, but you want to use it as a buffer
+--- number, force it to be a Number by adding zero to it: >vim
+---   echo bufname("3" + 0)
 --- <If the buffer doesn't exist, or doesn't have a name, an empty
 --- string is returned. >vim
 ---   echo bufname("#")  " alternate buffer name
@@ -4426,6 +4428,9 @@ function vim.fn.insert(object, item, idx) end
 function vim.fn.interrupt() end
 
 --- Bitwise invert.  The argument is converted to a number.  A
+--- List, Dict or Float argument causes an error.  Example: >vim
+---   let bits = invert(bits)
+--- <
 ---
 --- @param expr any
 --- @return any
@@ -6761,6 +6766,9 @@ function vim.fn.resolve(filename) end
 --- {object} can be a |List| or a |Blob|.
 --- Returns {object}.
 --- Returns zero if {object} is not a List or a Blob.
+--- If you want an object to remain unmodified make a copy first: >vim
+---   let revlist = reverse(copy(mylist))
+--- <
 ---
 --- @param object any
 --- @return any
-- 
cgit 


From f8afa8023ee032dfb2aa9a6489f51484fb276732 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 18 Aug 2023 08:42:45 +0800
Subject: vim-patch:9.0.1728: missing winid argument for virtcol() (#24770)

Problem: missing winid argument for virtcol()
Solution: Add a {winid} argument to virtcol()

Other functions col(), charcol() and virtcol2col() support a {winid}
argument, so it makes sense for virtcol() to also support than.

Also add test for virtcol2col() with 'showbreak' and {winid}.

closes: vim/vim#12633

https://github.com/vim/vim/commit/825cf813fa0fddf085fcbd3194781e875320ff63
---
 runtime/doc/builtin.txt         | 13 ++++++++-----
 runtime/lua/vim/_meta/vimfn.lua | 14 +++++++++-----
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 94e9223ee9..9a662761c4 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -8399,7 +8399,7 @@ values({dict})                                                        *values()*
 		in arbitrary order.  Also see |items()| and |keys()|.
 		Returns zero if {dict} is not a |Dict|.
 
-virtcol({expr} [, {list}])                                           *virtcol()*
+virtcol({expr} [, {list} [, {winid}]])                               *virtcol()*
 		The result is a Number, which is the screen column of the file
 		position given with {expr}.  That is, the last screen position
 		occupied by the character at that position, when the screen
@@ -8431,10 +8431,13 @@ virtcol({expr} [, {list}])                                           *virtcol()*
 			    returns the cursor position.  Differs from |'<| in
 			    that it's updated right away.
 
-		If {list} is present and non-zero then virtcol() returns a List
-		with the first and last screen position occupied by the
+		If {list} is present and non-zero then virtcol() returns a
+		List with the first and last screen position occupied by the
 		character.
 
+		With the optional {winid} argument the values are obtained for
+		that window instead of the current window.
+
 		Note that only marks in the current file can be used.
 		Examples: >vim
 			" With text "foo^Lbar" and cursor on the "^L":
@@ -8446,8 +8449,8 @@ virtcol({expr} [, {list}])                                           *virtcol()*
 			" With text "	  there", with 't at 'h':
 
 			echo virtcol("'t")	" returns 6
-<		Techo he first column is 1.  0 is returned for an error.
-		A echo more advanced example that echoes the maximum length of
+<		The first column is 1.  0 or [0, 0] is returned for an error.
+		A more advanced example that echoes the maximum length of
 		all lines: >vim
 		    echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
 
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index ce325ce1f8..8ae6dd5f10 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -10013,10 +10013,13 @@ function vim.fn.values(dict) end
 ---       returns the cursor position.  Differs from |'<| in
 ---       that it's updated right away.
 ---
---- If {list} is present and non-zero then virtcol() returns a List
---- with the first and last screen position occupied by the
+--- If {list} is present and non-zero then virtcol() returns a
+--- List with the first and last screen position occupied by the
 --- character.
 ---
+--- With the optional {winid} argument the values are obtained for
+--- that window instead of the current window.
+---
 --- Note that only marks in the current file can be used.
 --- Examples: >vim
 ---   " With text "foo^Lbar" and cursor on the "^L":
@@ -10028,15 +10031,16 @@ function vim.fn.values(dict) end
 ---   " With text "    there", with 't at 'h':
 ---
 ---   echo virtcol("'t")  " returns 6
---- <Techo he first column is 1.  0 is returned for an error.
---- A echo more advanced example that echoes the maximum length of
+--- <The first column is 1.  0 or [0, 0] is returned for an error.
+--- A more advanced example that echoes the maximum length of
 --- all lines: >vim
 ---     echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
 ---
 --- @param expr any
 --- @param list? any
+--- @param winid? integer
 --- @return any
-function vim.fn.virtcol(expr, list) end
+function vim.fn.virtcol(expr, list, winid) end
 
 --- The result is a Number, which is the byte index of the
 --- character in window {winid} at buffer line {lnum} and virtual
-- 
cgit 


From f0b3defecb4eb1c33bed1c5b2761fc3f7ff5f99b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 18 Aug 2023 13:44:04 +0900
Subject: vim-patch:a5988f582e48

Keywords 'of' and 'yield' for Javascript. (vim/vim#7873)

* Keyword 'of' in for...of statement.

* Keyword 'yield' for generator function.

https://github.com/vim/vim/commit/a5988f582e482150023862052d41e5215253a3de

Co-authored-by: Yuri Klimov <yuri@klimov.net>
---
 runtime/syntax/javascript.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index e513137984..cb2d16e2a7 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -52,11 +52,11 @@ syn match   javaScriptNumber           "\<\d\+\(_\d\+\)*\.\(\d\+\(_\d\+\)*\([eE]
 syn region  javaScriptRegexpString     start=+[,(=+]\s*/[^/*]+ms=e-1,me=e-1 skip=+\\\\\|\\/+ end=+/[gimuys]\{0,2\}\s*$+ end=+/[gimuys]\{0,2\}\s*[+;.,)\]}]+me=e-1 end=+/[gimuys]\{0,2\}\s\+\/+me=e-1 contains=@htmlPreproc,javaScriptComment oneline
 
 syn keyword javaScriptConditional	if else switch
-syn keyword javaScriptRepeat		while for do in
+syn keyword javaScriptRepeat		while for do in of
 syn keyword javaScriptBranch		break continue
 syn keyword javaScriptOperator		new delete instanceof typeof
 syn keyword javaScriptType		Array Boolean Date Function Number Object String RegExp
-syn keyword javaScriptStatement		return with await
+syn keyword javaScriptStatement		return with await yield
 syn keyword javaScriptBoolean		true false
 syn keyword javaScriptNull		null undefined
 syn keyword javaScriptIdentifier	arguments this var let
-- 
cgit 


From f65be8c5f5171883815c953719e66f637893fcc2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 18 Aug 2023 13:44:43 +0900
Subject: vim-patch:817db406bb12

Add TODO, FIXME to Haskell syntax file (vim/vim#8055)

Adding TODO, XXX, FIXME to Haskell syntax file vim/vim#8054

https://github.com/vim/vim/commit/817db406bb12b9fd5df25d4cda392b515d44ee05

Co-authored-by: Bruno-366 <81762173+Bruno-366@users.noreply.github.com>
---
 runtime/syntax/haskell.vim | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/syntax/haskell.vim b/runtime/syntax/haskell.vim
index 1b70b9344a..b48b278084 100644
--- a/runtime/syntax/haskell.vim
+++ b/runtime/syntax/haskell.vim
@@ -108,6 +108,8 @@ syn match   hsLineComment      "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contain
 syn region  hsBlockComment     start="{-"  end="-}" contains=hsBlockComment,@Spell
 syn region  hsPragma	       start="{-#" end="#-}"
 
+syn keyword hsTodo	        contained FIXME TODO XXX NOTE
+
 " C Preprocessor directives. Shamelessly ripped from c.vim and trimmed
 " First, see whether to flag directive-like lines or not
 if (!exists("hs_allow_hash_operator"))
-- 
cgit 


From 8d7a2a1aea4a6954e2d550c887f2c7112459eec4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 18 Aug 2023 13:45:03 +0900
Subject: vim-patch:442d1746f4c6

bindzone runtime: add new DNS record types (vim/vim#7351)

Recognize some newer DNS record types - CAA (RFC8659, certificate authority authorization), OPENPGPKEY (RFC7929), SMIMEA (RFC8162). Sort SSHFP alphabetically while there.

https://github.com/vim/vim/commit/442d1746f4c650e2e41246fd5679f635a4a30232

Co-authored-by: Stuart Henderson <sthen@users.noreply.github.com>
---
 runtime/syntax/bindzone.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/bindzone.vim b/runtime/syntax/bindzone.vim
index bb790bb75c..fede3d97d5 100644
--- a/runtime/syntax/bindzone.vim
+++ b/runtime/syntax/bindzone.vim
@@ -33,7 +33,7 @@ syn match       zoneDomain      contained  /[^[:space:]!"#$%&'()*+,\/:;<=>?@[\]\
 syn match       zoneSpecial     contained /^[@*.]\s/
 syn match       zoneTTL         contained /\s\@<=\d[0-9WwDdHhMmSs]*\(\s\|$\)\@=/ nextgroup=zoneClass,zoneRRType skipwhite
 syn keyword     zoneClass       contained IN CHAOS CH HS HESIOD nextgroup=zoneRRType,zoneTTL skipwhite
-syn keyword     zoneRRType      contained A AAAA CERT CNAME DNAME DNSKEY DS HINFO LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RP RRSIG SSHFP SOA SPF SRV TLSA TXT nextgroup=zoneRData skipwhite
+syn keyword     zoneRRType      contained A AAAA CAA CERT CNAME DNAME DNSKEY DS HINFO LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM OPENPGPKEY PTR RP RRSIG SMIMEA SOA SPF SRV SSHFP TLSA TXT nextgroup=zoneRData skipwhite
 syn match       zoneRData       contained /[^;]*/ contains=zoneDomain,zoneIPAddr,zoneIP6Addr,zoneText,zoneNumber,zoneParen,zoneUnknown
 
 syn match       zoneIPAddr      contained /\<[0-9]\{1,3}\(\.[0-9]\{1,3}\)\{,3}\>/
-- 
cgit 


From 4c7df98e4eeed20f8a9c461729935b79743d7752 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 19 Aug 2023 17:44:19 +0800
Subject: vim-patch:9.0.1515: reverse() does not work for a String

Problem:    reverse() does not work for a String.
Solution:   Implement reverse() for a String. (Yegappan Lakshmanan,
            closes vim/vim#12179)

https://github.com/vim/vim/commit/03ff1c2dde7f15eca5c9baa6dafbda9b49bedc3b

vim-patch:9.0.1738: Duplicate code to reverse a string

Problem:  Duplicate code to reverse a string
Solution: Move reverse_text() to strings.c and remove string_reverse().

closes: vim/vim#12847

https://github.com/vim/vim/commit/4dd266cb66d901cf5324f09405cfea3f004bd29f

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt         | 12 +++++++-----
 runtime/doc/usr_41.txt          |  4 +++-
 runtime/lua/vim/_meta/vimfn.lua | 12 +++++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 9a662761c4..0ae615ac3f 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5666,11 +5666,13 @@ resolve({filename})                                             *resolve()* *E65
 		path name) and also keeps a trailing path separator.
 
 reverse({object})                                                    *reverse()*
-		Reverse the order of items in {object} in-place.
-		{object} can be a |List| or a |Blob|.
-		Returns {object}.
-		Returns zero if {object} is not a List or a Blob.
-		If you want an object to remain unmodified make a copy first: >vim
+		Reverse the order of items in {object}.  {object} can be a
+		|List|, a |Blob| or a |String|.  For a List and a Blob the
+		items are reversed in-place and {object} is returned.
+		For a String a new String is returned.
+		Returns zero if {object} is not a List, Blob or a String.
+		If you want a List or Blob to remain unmodified make a copy
+		first: >vim
 			let revlist = reverse(copy(mylist))
 <
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index ac371cf0e3..c8b31b2d5b 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -626,6 +626,7 @@ String manipulation:					*string-functions*
 	strdisplaywidth()	size of string when displayed, deals with tabs
 	setcellwidths()		set character cell width overrides
 	getcellwidths()		get character cell width overrides
+	reverse()		reverse the order of characters in a string
 	substitute()		substitute a pattern match with a string
 	submatch()		get a specific match in ":s" and substitute()
 	strpart()		get part of a string using byte index
@@ -664,7 +665,7 @@ List manipulation:					*list-functions*
 	reduce()		reduce a List to a value
 	slice()			take a slice of a List
 	sort()			sort a List
-	reverse()		reverse the order of a List or Blob
+	reverse()		reverse the order of items in a List
 	uniq()			remove copies of repeated adjacent items
 	split()			split a String into a List
 	join()			join List items into a String
@@ -731,6 +732,7 @@ Floating point computation:				*float-functions*
 Blob manipulation:					*blob-functions*
 	blob2list()		get a list of numbers from a blob
 	list2blob()		get a blob from a list of numbers
+	reverse()		reverse the order of numbers in a blob
 
 Other computation:					*bitwise-function*
 	and()			bitwise AND
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 8ae6dd5f10..030f268f81 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6762,11 +6762,13 @@ vim.fn['repeat'] = function(expr, count) end
 --- @return any
 function vim.fn.resolve(filename) end
 
---- Reverse the order of items in {object} in-place.
---- {object} can be a |List| or a |Blob|.
---- Returns {object}.
---- Returns zero if {object} is not a List or a Blob.
---- If you want an object to remain unmodified make a copy first: >vim
+--- Reverse the order of items in {object}.  {object} can be a
+--- |List|, a |Blob| or a |String|.  For a List and a Blob the
+--- items are reversed in-place and {object} is returned.
+--- For a String a new String is returned.
+--- Returns zero if {object} is not a List, Blob or a String.
+--- If you want a List or Blob to remain unmodified make a copy
+--- first: >vim
 ---   let revlist = reverse(copy(mylist))
 --- <
 ---
-- 
cgit 


From 18062f70d81ee8d3d9dcad2fe3afe8e2431cbbdf Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 20 Aug 2023 10:48:07 +0900
Subject: vim-patch:56bafd7a6a79

Runtime: add new sed ftplugin (vim/vim#12843)

https://github.com/vim/vim/commit/56bafd7a6a79203b86f7165a7bbac5730c170f64

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/sed.vim | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 runtime/ftplugin/sed.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/sed.vim b/runtime/ftplugin/sed.vim
new file mode 100644
index 0000000000..0073872877
--- /dev/null
+++ b/runtime/ftplugin/sed.vim
@@ -0,0 +1,29 @@
+" Vim filetype plugin file
+" Language:	sed
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Apr 1
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=:#
+setlocal commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "sed Script Files (*.sed)\t*.sed\n" ..
+	\	       "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8
-- 
cgit 


From 7485fd0518557f7f49f9b636a80e4e3b523dd9dd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 06:08:28 +0800
Subject: vim-patch:9.0.1753: can't move to last non-blank char

Problem: can't move to last non-blank char
Solution: Make g<end> behave like that

Make it possible to move to last non-blank char on a line

We can distinguish between g0 and g^ to move to the very first character
and the first non-blank char.

And while we can move to the last screen char, we cannot go to the last
non-blank screen char.

Since I think g$ is the more widely used and known movement command (and
g<end> is synonymous to it) change the behaviour of g<end> to move to
last non-screen char instead and don't have this be the same command as
the g$ command anymore.

If you want to keep the old behaviour, you can use:

```
nnoremap g<end> g$
```

Add a test to verify the behaviour.

closes: vim/vim#12593

https://github.com/vim/vim/commit/b5f6fe9ca2661d06bc0be839447ce1995450b9de

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/motion.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 9e5913a900..a2f11d27ef 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -233,8 +233,8 @@ gM			Like "g0", but to halfway the text of the line.
 			Thus "10gM" is near the start of the text and "90gM"
 			is near the end of the text.
 
-							*g$* *g<End>*
-g$ or g<End>		When lines wrap ('wrap' on): To the last character of
+							*g$*
+g$			When lines wrap ('wrap' on): To the last character of
 			the screen line and [count - 1] screen lines downward
 			|inclusive|.  Differs from "$" when a line is wider
 			than the screen.
@@ -246,6 +246,9 @@ g$ or g<End>		When lines wrap ('wrap' on): To the last character of
 			instead of going to the end of the line.
 			When 'virtualedit' is enabled moves to the end of the
 			screen line.
+							*g<End>*
+g<End>			Like |g$| but to the last non-blank character
+			instead of the last character.
 
 							*bar*
 |			To screen column [count] in the current line.
-- 
cgit 


From 0c91cb4f03814bfdfe262c6d2693c6883c38719b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 06:11:23 +0800
Subject: vim-patch:9.0.1761: g<kEnd> behaves different from g<end>

Problem:  g<kEnd> behaves different from g<end>
Solution: Make g<kEnd> behave like g<End>

closes: vim/vim#12861

https://github.com/vim/vim/commit/654bdbbd329e7267051cc2eb496bc52b66053081
---
 runtime/doc/motion.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index a2f11d27ef..05244cde91 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -246,7 +246,8 @@ g$			When lines wrap ('wrap' on): To the last character of
 			instead of going to the end of the line.
 			When 'virtualedit' is enabled moves to the end of the
 			screen line.
-							*g<End>*
+
+							*g<End>* *g<kEnd>*
 g<End>			Like |g$| but to the last non-blank character
 			instead of the last character.
 
-- 
cgit 


From 694814cdd54ac245d1f4d2c28dce7e9132fcb616 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 07:29:49 +0800
Subject: vim-patch:9.0.1774: no support for custom cmdline completion (#24808)

Problem:  no support for custom cmdline completion
Solution: Add new vimscript functions

Add the following two functions:
- getcmdcompltype() returns custom and customlist functions

- getcompletion() supports both custom and customlist

closes: vim/vim#12228

https://github.com/vim/vim/commit/92997dda789ad8061841128cbc99b15ec0374411

Co-authored-by: Shougo Matsushita <Shougo.Matsu@gmail.com>
---
 runtime/doc/builtin.txt         | 4 +++-
 runtime/lua/vim/_meta/vimfn.lua | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 0ae615ac3f..92cedbdc80 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2354,7 +2354,9 @@ getcompletion({pat}, {type} [, {filtered}])                    *getcompletion()*
 		color		color schemes
 		command		Ex command
 		compiler	compilers
-		diff_buffer     |:diffget| and |:diffput| completion
+		custom,{func}	custom completion, defined via {func}
+		customlist,{func} custom completion, defined via {func}
+		diff_buffer	|:diffget| and |:diffput| completion
 		dir		directory names
 		environment	environment variable names
 		event		autocommand events
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 030f268f81..300210b296 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -2871,7 +2871,9 @@ function vim.fn.getcmdwintype() end
 --- color    color schemes
 --- command    Ex command
 --- compiler  compilers
---- diff_buffer     |:diffget| and |:diffput| completion
+--- custom,{func}  custom completion, defined via {func}
+--- customlist,{func} custom completion, defined via {func}
+--- diff_buffer  |:diffget| and |:diffput| completion
 --- dir    directory names
 --- environment  environment variable names
 --- event    autocommand events
-- 
cgit 


From a5b6468e9bc19d3e01846c9a6a47a766b8b81a5a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:46:44 +0900
Subject: vim-patch:9.0.1766: Runtime: Missing QML support

Problem:  Runtime: Missing QML support
Solution: Add QML support to Vim

closes: vim/vim#12810

https://github.com/vim/vim/commit/bedc69f9d67b117ab05aa735c701cd3899d1ae2d

Co-authored-by: ChaseKnowlden <haroldknowlden@gmail.com>
---
 runtime/ftplugin/qml.vim     |   31 ++
 runtime/indent/qml.vim       |   59 +++
 runtime/lua/vim/filetype.lua |    2 +
 runtime/syntax/qml.vim       | 1130 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 1222 insertions(+)
 create mode 100644 runtime/ftplugin/qml.vim
 create mode 100644 runtime/indent/qml.vim
 create mode 100644 runtime/syntax/qml.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/qml.vim b/runtime/ftplugin/qml.vim
new file mode 100644
index 0000000000..fd5ddbb4bc
--- /dev/null
+++ b/runtime/ftplugin/qml.vim
@@ -0,0 +1,31 @@
+" Vim filetype plugin file
+" Language: QML
+" Maintainer: Chase Knowlden <haroldknowlden@gmail.com>
+" Last Change: 2023 Aug 16
+
+if exists( 'b:did_ftplugin' )
+   finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpoptions_save = &cpoptions
+set cpoptions&vim
+
+" command for undo
+let b:undo_ftplugin = "setlocal formatoptions< comments< commentstring<"
+
+if (has("gui_win32") || has("gui_gtk")) && !exists( 'b:browsefilter' )
+   let b:browsefilter =
+      \ 'QML Files (*.qml,*.qbs)\t*.qml;*.qbs\n' .
+      \ 'All Files\t*\n'
+endif
+
+" Set 'comments' to format dashed lists in comments.
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//%s
+
+setlocal formatoptions-=t
+setlocal formatoptions+=croql
+
+let &cpoptions = s:cpoptions_save
+unlet s:cpoptions_save
diff --git a/runtime/indent/qml.vim b/runtime/indent/qml.vim
new file mode 100644
index 0000000000..8c9fa91250
--- /dev/null
+++ b/runtime/indent/qml.vim
@@ -0,0 +1,59 @@
+" Vim indent file
+" Language:     QML
+" Maintainer:   Chase Knowlden <haroldknowlden@gmail.com>
+" Last Change:  2023 Aug 16
+"
+" Improved JavaScript indent script.
+
+" Indent script in place for this already?
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+let b:undo_indent = "setlocal indentexpr< indentkeys<"
+
+setlocal indentexpr=s:GetQmlIndent()
+setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e,*<Return>,=*/
+
+" Only define functions once per session
+if exists("*s:GetQmlIndent")
+  finish
+endif
+
+" Clean up a line of code by removing trailing '//' and '/* */' comments, and trimming
+" whitespace
+function! s:Trim(line)
+  return substitute(substitute(substitute(a:line, '// .*', '', ''), '/\* .* \*/', '', ''), '^\s*\|\s*$', '', 'g')
+endfunction
+
+function! s:GetQmlIndent()
+  let num = v:lnum
+  let line = s:Trim(getline(num))
+
+  let pnum = prevnonblank(num - 1)
+  if pnum == 0
+    return 0
+  endif
+  let pline = s:Trim(getline(pnum))
+
+  let ind = indent(pnum)
+
+  " bracket/brace/paren blocks
+  if pline =~ '[{[(]$'
+    let ind += &sw
+  endif
+  if line =~ '^[}\])]'
+    let ind -= &sw
+  endif
+
+  " '/*' comments
+  if pline =~ '^/\*.*\*/'
+    " no indent for single-line form
+  elseif pline =~ '^/\*'
+    let ind += 1
+  elseif pline =~ '^\*/'
+    let ind -= 1
+  endif
+
+  return ind
+endfunction
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 1ea88ebc06..bb7d9f174a 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -800,6 +800,8 @@ local extension = {
   ptl = 'python',
   ql = 'ql',
   qll = 'ql',
+  qml = 'qml',
+  qbs = 'qml',
   qmd = 'quarto',
   R = detect.r,
   rkt = 'racket',
diff --git a/runtime/syntax/qml.vim b/runtime/syntax/qml.vim
new file mode 100644
index 0000000000..d6f2abec37
--- /dev/null
+++ b/runtime/syntax/qml.vim
@@ -0,0 +1,1130 @@
+" Vim syntax file
+" Language:     QML
+" Previous Maintainer: Peter Hoeg <peter@hoeg.com>
+" Maintainer:   Chase Knowlden <haroldknowlden@gmail.com>
+" Changes:      `git log` is your friend
+" Last Change:  2023 Aug 16
+"
+" This file is bassed on the original work done by Warwick Allison
+" <warwick.allison@nokia.com> whose did about 99% of the work here.
+
+" Based on javascript syntax (as is QML)
+
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'qml'
+endif
+
+" Drop fold if it set but vim doesn't support it.
+if !has("folding")
+  unlet! qml_fold
+endif
+
+syn case ignore
+
+syn cluster qmlExpr              contains=qmlStringD,qmlStringS,qmlStringT,SqmlCharacter,qmlNumber,qmlObjectLiteralType,qmlBoolean,qmlType,qmlJsType,qmlNull,qmlGlobal,qmlFunction,qmlArrowFunction,qmlNullishCoalescing
+syn keyword qmlCommentTodo       TODO FIXME XXX TBD contained
+syn match   qmlLineComment       "\/\/.*" contains=@Spell,qmlCommentTodo
+syn match   qmlCommentSkip       "^[ \t]*\*\($\|[ \t]\+\)"
+syn region  qmlComment           start="/\*"  end="\*/" contains=@Spell,qmlCommentTodo fold
+syn match   qmlSpecial           "\\\d\d\d\|\\."
+syn region  qmlStringD           start=+"+  skip=+\\\\\|\\"\|\\$+  end=+"+  keepend  contains=qmlSpecial,@htmlPreproc,@Spell
+syn region  qmlStringS           start=+'+  skip=+\\\\\|\\'\|\\$+  end=+'+  keepend  contains=qmlSpecial,@htmlPreproc,@Spell
+syn region  qmlStringT           start=+`+  skip=+\\\\\|\\`\|\\$+  end=+`+  keepend  contains=qmlTemplateExpr,qmlSpecial,@htmlPreproc,@Spell
+
+syntax region  qmlTemplateExpr contained  matchgroup=qmlBraces start=+${+ end=+}+  keepend  contains=@qmlExpr
+
+syn match   qmlCharacter         "'\\.'"
+syn match   qmlNumber            "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
+syn region  qmlRegexpString      start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi]\{0,2\}\s*$+ end=+/[gi]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline
+syn match   qmlObjectLiteralType "[A-Za-z][_A-Za-z0-9]*\s*\({\)\@="
+syn region  qmlTernaryColon   start="?" end=":" contains=@qmlExpr,qmlBraces,qmlParens,qmlLineComment
+syn match   qmlBindingProperty   "\<[A-Za-z][_A-Za-z.0-9]*\s*:"
+syn match  qmlNullishCoalescing    "??"
+
+syn keyword qmlConditional       if else switch
+syn keyword qmlRepeat            while for do in
+syn keyword qmlBranch            break continue
+syn keyword qmlOperator          new delete instanceof typeof
+syn keyword qmlJsType            Array Boolean Date Function Number Object String RegExp
+syn keyword qmlType              action alias bool color date double enumeration font int list point real rect size string time url variant vector2d vector3d vector4d coordinate geocircle geopath geopolygon georectangle geoshape matrix4x4 palette quaternion
+syn keyword qmlStatement         return with
+syn keyword qmlBoolean           true false
+syn keyword qmlNull              null undefined
+syn keyword qmlIdentifier        arguments this var let const
+syn keyword qmlLabel             case default
+syn keyword qmlException         try catch finally throw
+syn keyword qmlMessage           alert confirm prompt status
+syn keyword qmlGlobal            self
+syn keyword qmlDeclaration       property signal component readonly required
+syn keyword qmlReserved          abstract boolean byte char class debugger enum export extends final float goto implements import interface long native package pragma private protected public short static super synchronized throws transient volatile
+
+syn case match
+
+" List extracted in alphabatical order from: https://doc.qt.io/qt-5/qmltypes.html
+" Qt v5.15.1
+
+" Begin Literal Types {{{
+
+syntax keyword qmlObjectLiteralType Abstract3DSeries
+syntax keyword qmlObjectLiteralType AbstractActionInput
+syntax keyword qmlObjectLiteralType AbstractAnimation
+syntax keyword qmlObjectLiteralType AbstractAxis
+syntax keyword qmlObjectLiteralType AbstractAxis3D
+syntax keyword qmlObjectLiteralType AbstractAxisInput
+syntax keyword qmlObjectLiteralType AbstractBarSeries
+syntax keyword qmlObjectLiteralType AbstractButton
+syntax keyword qmlObjectLiteralType AbstractClipAnimator
+syntax keyword qmlObjectLiteralType AbstractClipBlendNode
+syntax keyword qmlObjectLiteralType AbstractDataProxy
+syntax keyword qmlObjectLiteralType AbstractGraph3D
+syntax keyword qmlObjectLiteralType AbstractInputHandler3D
+syntax keyword qmlObjectLiteralType AbstractPhysicalDevice
+syntax keyword qmlObjectLiteralType AbstractRayCaster
+syntax keyword qmlObjectLiteralType AbstractSeries
+syntax keyword qmlObjectLiteralType AbstractSkeleton
+syntax keyword qmlObjectLiteralType AbstractTexture
+syntax keyword qmlObjectLiteralType AbstractTextureImage
+syntax keyword qmlObjectLiteralType Accelerometer
+syntax keyword qmlObjectLiteralType AccelerometerReading
+syntax keyword qmlObjectLiteralType Accessible
+syntax keyword qmlObjectLiteralType Action
+syntax keyword qmlObjectLiteralType ActionGroup
+syntax keyword qmlObjectLiteralType ActionInput
+syntax keyword qmlObjectLiteralType AdditiveClipBlend
+syntax keyword qmlObjectLiteralType AdditiveColorGradient
+syntax keyword qmlObjectLiteralType Address
+syntax keyword qmlObjectLiteralType Affector
+syntax keyword qmlObjectLiteralType Age
+syntax keyword qmlObjectLiteralType AlphaCoverage
+syntax keyword qmlObjectLiteralType AlphaTest
+syntax keyword qmlObjectLiteralType Altimeter
+syntax keyword qmlObjectLiteralType AltimeterReading
+syntax keyword qmlObjectLiteralType AluminumAnodizedEmissiveMaterial
+syntax keyword qmlObjectLiteralType AluminumAnodizedMaterial
+syntax keyword qmlObjectLiteralType AluminumBrushedMaterial
+syntax keyword qmlObjectLiteralType AluminumEmissiveMaterial
+syntax keyword qmlObjectLiteralType AluminumMaterial
+syntax keyword qmlObjectLiteralType AmbientLightReading
+syntax keyword qmlObjectLiteralType AmbientLightSensor
+syntax keyword qmlObjectLiteralType AmbientTemperatureReading
+syntax keyword qmlObjectLiteralType AmbientTemperatureSensor
+syntax keyword qmlObjectLiteralType AnalogAxisInput
+syntax keyword qmlObjectLiteralType AnchorAnimation
+syntax keyword qmlObjectLiteralType AnchorChanges
+syntax keyword qmlObjectLiteralType AngleDirection
+syntax keyword qmlObjectLiteralType AnimatedImage
+syntax keyword qmlObjectLiteralType AnimatedSprite
+syntax keyword qmlObjectLiteralType Animation
+syntax keyword qmlObjectLiteralType AnimationController
+syntax keyword qmlObjectLiteralType AnimationGroup
+syntax keyword qmlObjectLiteralType Animator
+syntax keyword qmlObjectLiteralType ApplicationWindow
+syntax keyword qmlObjectLiteralType ApplicationWindowStyle
+syntax keyword qmlObjectLiteralType AreaLight
+syntax keyword qmlObjectLiteralType AreaSeries
+syntax keyword qmlObjectLiteralType Armature
+syntax keyword qmlObjectLiteralType AttenuationModelInverse
+syntax keyword qmlObjectLiteralType AttenuationModelLinear
+syntax keyword qmlObjectLiteralType Attractor
+syntax keyword qmlObjectLiteralType Attribute
+syntax keyword qmlObjectLiteralType Audio
+syntax keyword qmlObjectLiteralType AudioCategory
+syntax keyword qmlObjectLiteralType AudioEngine
+syntax keyword qmlObjectLiteralType AudioListener
+syntax keyword qmlObjectLiteralType AudioSample
+syntax keyword qmlObjectLiteralType AuthenticationDialogRequest
+syntax keyword qmlObjectLiteralType Axis
+syntax keyword qmlObjectLiteralType AxisAccumulator
+syntax keyword qmlObjectLiteralType AxisHelper
+syntax keyword qmlObjectLiteralType AxisSetting
+
+syntax keyword qmlObjectLiteralType BackspaceKey
+syntax keyword qmlObjectLiteralType Bar3DSeries
+syntax keyword qmlObjectLiteralType BarCategoryAxis
+syntax keyword qmlObjectLiteralType BarDataProxy
+syntax keyword qmlObjectLiteralType Bars3D
+syntax keyword qmlObjectLiteralType BarSeries
+syntax keyword qmlObjectLiteralType BarSet
+syntax keyword qmlObjectLiteralType BaseKey
+syntax keyword qmlObjectLiteralType BasicTableView
+syntax keyword qmlObjectLiteralType Behavior
+syntax keyword qmlObjectLiteralType Binding
+syntax keyword qmlObjectLiteralType Blend
+syntax keyword qmlObjectLiteralType BlendedClipAnimator
+syntax keyword qmlObjectLiteralType BlendEquation
+syntax keyword qmlObjectLiteralType BlendEquationArguments
+syntax keyword qmlObjectLiteralType Blending
+syntax keyword qmlObjectLiteralType BlitFramebuffer
+syntax keyword qmlObjectLiteralType BluetoothDiscoveryModel
+syntax keyword qmlObjectLiteralType BluetoothService
+syntax keyword qmlObjectLiteralType BluetoothSocket
+syntax keyword qmlObjectLiteralType Blur
+syntax keyword qmlObjectLiteralType bool
+syntax keyword qmlObjectLiteralType BorderImage
+syntax keyword qmlObjectLiteralType BorderImageMesh
+syntax keyword qmlObjectLiteralType BoundaryRule
+syntax keyword qmlObjectLiteralType Bounds
+syntax keyword qmlObjectLiteralType BoxPlotSeries
+syntax keyword qmlObjectLiteralType BoxSet
+syntax keyword qmlObjectLiteralType BrightnessContrast
+syntax keyword qmlObjectLiteralType BrushStrokes
+syntax keyword qmlObjectLiteralType Buffer
+syntax keyword qmlObjectLiteralType BufferBlit
+syntax keyword qmlObjectLiteralType BufferCapture
+syntax keyword qmlObjectLiteralType BufferInput
+syntax keyword qmlObjectLiteralType BusyIndicator
+syntax keyword qmlObjectLiteralType BusyIndicatorStyle
+syntax keyword qmlObjectLiteralType Button
+syntax keyword qmlObjectLiteralType ButtonAxisInput
+syntax keyword qmlObjectLiteralType ButtonGroup
+syntax keyword qmlObjectLiteralType ButtonStyle
+
+syntax keyword qmlObjectLiteralType Calendar
+syntax keyword qmlObjectLiteralType CalendarModel
+syntax keyword qmlObjectLiteralType CalendarStyle
+syntax keyword qmlObjectLiteralType Camera
+syntax keyword qmlObjectLiteralType Camera3D
+syntax keyword qmlObjectLiteralType CameraCapabilities
+syntax keyword qmlObjectLiteralType CameraCapture
+syntax keyword qmlObjectLiteralType CameraExposure
+syntax keyword qmlObjectLiteralType CameraFlash
+syntax keyword qmlObjectLiteralType CameraFocus
+syntax keyword qmlObjectLiteralType CameraImageProcessing
+syntax keyword qmlObjectLiteralType CameraLens
+syntax keyword qmlObjectLiteralType CameraRecorder
+syntax keyword qmlObjectLiteralType CameraSelector
+syntax keyword qmlObjectLiteralType CandlestickSeries
+syntax keyword qmlObjectLiteralType CandlestickSet
+syntax keyword qmlObjectLiteralType Canvas
+syntax keyword qmlObjectLiteralType CanvasGradient
+syntax keyword qmlObjectLiteralType CanvasImageData
+syntax keyword qmlObjectLiteralType CanvasPixelArray
+syntax keyword qmlObjectLiteralType Category
+syntax keyword qmlObjectLiteralType CategoryAxis
+syntax keyword qmlObjectLiteralType CategoryAxis3D
+syntax keyword qmlObjectLiteralType CategoryModel
+syntax keyword qmlObjectLiteralType CategoryRange
+syntax keyword qmlObjectLiteralType ChangeLanguageKey
+syntax keyword qmlObjectLiteralType ChartView
+syntax keyword qmlObjectLiteralType CheckBox
+syntax keyword qmlObjectLiteralType CheckBoxStyle
+syntax keyword qmlObjectLiteralType CheckDelegate
+syntax keyword qmlObjectLiteralType ChromaticAberration
+syntax keyword qmlObjectLiteralType CircularGauge
+syntax keyword qmlObjectLiteralType CircularGaugeStyle
+syntax keyword qmlObjectLiteralType ClearBuffers
+syntax keyword qmlObjectLiteralType ClipAnimator
+syntax keyword qmlObjectLiteralType ClipBlendValue
+syntax keyword qmlObjectLiteralType ClipPlane
+syntax keyword qmlObjectLiteralType CloseEvent
+syntax keyword qmlObjectLiteralType color
+syntax keyword qmlObjectLiteralType ColorAnimation
+syntax keyword qmlObjectLiteralType ColorDialog
+syntax keyword qmlObjectLiteralType ColorDialogRequest
+syntax keyword qmlObjectLiteralType ColorGradient
+syntax keyword qmlObjectLiteralType ColorGradientStop
+syntax keyword qmlObjectLiteralType Colorize
+syntax keyword qmlObjectLiteralType ColorMask
+syntax keyword qmlObjectLiteralType ColorMaster
+syntax keyword qmlObjectLiteralType ColorOverlay
+syntax keyword qmlObjectLiteralType Column
+syntax keyword qmlObjectLiteralType ColumnLayout
+syntax keyword qmlObjectLiteralType ComboBox
+syntax keyword qmlObjectLiteralType ComboBoxStyle
+syntax keyword qmlObjectLiteralType Command
+syntax keyword qmlObjectLiteralType Compass
+syntax keyword qmlObjectLiteralType CompassReading
+syntax keyword qmlObjectLiteralType Component
+syntax keyword qmlObjectLiteralType Component3D
+syntax keyword qmlObjectLiteralType ComputeCommand
+syntax keyword qmlObjectLiteralType ConeGeometry
+syntax keyword qmlObjectLiteralType ConeMesh
+syntax keyword qmlObjectLiteralType ConicalGradient
+syntax keyword qmlObjectLiteralType Connections
+syntax keyword qmlObjectLiteralType ContactDetail
+syntax keyword qmlObjectLiteralType ContactDetails
+syntax keyword qmlObjectLiteralType Container
+syntax keyword qmlObjectLiteralType Context2D
+syntax keyword qmlObjectLiteralType ContextMenuRequest
+syntax keyword qmlObjectLiteralType Control
+syntax keyword qmlObjectLiteralType coordinate
+syntax keyword qmlObjectLiteralType CoordinateAnimation
+syntax keyword qmlObjectLiteralType CopperMaterial
+syntax keyword qmlObjectLiteralType CuboidGeometry
+syntax keyword qmlObjectLiteralType CuboidMesh
+syntax keyword qmlObjectLiteralType CullFace
+syntax keyword qmlObjectLiteralType CullMode
+syntax keyword qmlObjectLiteralType CumulativeDirection
+syntax keyword qmlObjectLiteralType Custom3DItem
+syntax keyword qmlObjectLiteralType Custom3DLabel
+syntax keyword qmlObjectLiteralType Custom3DVolume
+syntax keyword qmlObjectLiteralType CustomCamera
+syntax keyword qmlObjectLiteralType CustomMaterial
+syntax keyword qmlObjectLiteralType CustomParticle
+syntax keyword qmlObjectLiteralType CylinderGeometry
+syntax keyword qmlObjectLiteralType CylinderMesh
+
+syntax keyword qmlObjectLiteralType Date
+syntax keyword qmlObjectLiteralType date
+syntax keyword qmlObjectLiteralType DateTimeAxis
+syntax keyword qmlObjectLiteralType DayOfWeekRow
+syntax keyword qmlObjectLiteralType DebugView
+syntax keyword qmlObjectLiteralType DefaultMaterial
+syntax keyword qmlObjectLiteralType DelayButton
+syntax keyword qmlObjectLiteralType DelayButtonStyle
+syntax keyword qmlObjectLiteralType DelegateChoice
+syntax keyword qmlObjectLiteralType DelegateChooser
+syntax keyword qmlObjectLiteralType DelegateModel
+syntax keyword qmlObjectLiteralType DelegateModelGroup
+syntax keyword qmlObjectLiteralType DepthInput
+syntax keyword qmlObjectLiteralType DepthOfFieldHQBlur
+syntax keyword qmlObjectLiteralType DepthRange
+syntax keyword qmlObjectLiteralType DepthTest
+syntax keyword qmlObjectLiteralType Desaturate
+syntax keyword qmlObjectLiteralType Dial
+syntax keyword qmlObjectLiteralType Dialog
+syntax keyword qmlObjectLiteralType DialogButtonBox
+syntax keyword qmlObjectLiteralType DialStyle
+syntax keyword qmlObjectLiteralType DiffuseMapMaterial
+syntax keyword qmlObjectLiteralType DiffuseSpecularMapMaterial
+syntax keyword qmlObjectLiteralType DiffuseSpecularMaterial
+syntax keyword qmlObjectLiteralType Direction
+syntax keyword qmlObjectLiteralType DirectionalBlur
+syntax keyword qmlObjectLiteralType DirectionalLight
+syntax keyword qmlObjectLiteralType DispatchCompute
+syntax keyword qmlObjectLiteralType Displace
+syntax keyword qmlObjectLiteralType DistanceReading
+syntax keyword qmlObjectLiteralType DistanceSensor
+syntax keyword qmlObjectLiteralType DistortionRipple
+syntax keyword qmlObjectLiteralType DistortionSphere
+syntax keyword qmlObjectLiteralType DistortionSpiral
+syntax keyword qmlObjectLiteralType Dithering
+syntax keyword qmlObjectLiteralType double
+syntax keyword qmlObjectLiteralType DoubleValidator
+syntax keyword qmlObjectLiteralType Drag
+syntax keyword qmlObjectLiteralType DragEvent
+syntax keyword qmlObjectLiteralType DragHandler
+syntax keyword qmlObjectLiteralType Drawer
+syntax keyword qmlObjectLiteralType DropArea
+syntax keyword qmlObjectLiteralType DropShadow
+syntax keyword qmlObjectLiteralType DwmFeatures
+syntax keyword qmlObjectLiteralType DynamicParameter
+
+syntax keyword qmlObjectLiteralType EdgeDetect
+syntax keyword qmlObjectLiteralType EditorialModel
+syntax keyword qmlObjectLiteralType Effect
+syntax keyword qmlObjectLiteralType EllipseShape
+syntax keyword qmlObjectLiteralType Emboss
+syntax keyword qmlObjectLiteralType Emitter
+syntax keyword qmlObjectLiteralType EnterKey
+syntax keyword qmlObjectLiteralType EnterKeyAction
+syntax keyword qmlObjectLiteralType Entity
+syntax keyword qmlObjectLiteralType EntityLoader
+syntax keyword qmlObjectLiteralType enumeration
+syntax keyword qmlObjectLiteralType EnvironmentLight
+syntax keyword qmlObjectLiteralType EventConnection
+syntax keyword qmlObjectLiteralType EventPoint
+syntax keyword qmlObjectLiteralType EventTouchPoint
+syntax keyword qmlObjectLiteralType ExclusiveGroup
+syntax keyword qmlObjectLiteralType ExtendedAttributes
+syntax keyword qmlObjectLiteralType ExtrudedTextGeometry
+syntax keyword qmlObjectLiteralType ExtrudedTextMesh
+
+syntax keyword qmlObjectLiteralType FastBlur
+syntax keyword qmlObjectLiteralType FileDialog
+syntax keyword qmlObjectLiteralType FileDialogRequest
+syntax keyword qmlObjectLiteralType FillerKey
+syntax keyword qmlObjectLiteralType FilterKey
+syntax keyword qmlObjectLiteralType FinalState
+syntax keyword qmlObjectLiteralType FindTextResult
+syntax keyword qmlObjectLiteralType FirstPersonCameraController
+syntax keyword qmlObjectLiteralType Flickable
+syntax keyword qmlObjectLiteralType Flip
+syntax keyword qmlObjectLiteralType Flipable
+syntax keyword qmlObjectLiteralType Flow
+syntax keyword qmlObjectLiteralType FocusScope
+syntax keyword qmlObjectLiteralType FolderDialog
+syntax keyword qmlObjectLiteralType FolderListModel
+syntax keyword qmlObjectLiteralType font
+syntax keyword qmlObjectLiteralType FontDialog
+syntax keyword qmlObjectLiteralType FontLoader
+syntax keyword qmlObjectLiteralType FontMetrics
+syntax keyword qmlObjectLiteralType FormValidationMessageRequest
+syntax keyword qmlObjectLiteralType ForwardRenderer
+syntax keyword qmlObjectLiteralType Frame
+syntax keyword qmlObjectLiteralType FrameAction
+syntax keyword qmlObjectLiteralType FrameGraphNode
+syntax keyword qmlObjectLiteralType Friction
+syntax keyword qmlObjectLiteralType FrontFace
+syntax keyword qmlObjectLiteralType FrostedGlassMaterial
+syntax keyword qmlObjectLiteralType FrostedGlassSinglePassMaterial
+syntax keyword qmlObjectLiteralType FrustumCamera
+syntax keyword qmlObjectLiteralType FrustumCulling
+syntax keyword qmlObjectLiteralType FullScreenRequest
+syntax keyword qmlObjectLiteralType Fxaa
+
+syntax keyword qmlObjectLiteralType Gamepad
+syntax keyword qmlObjectLiteralType GamepadManager
+syntax keyword qmlObjectLiteralType GammaAdjust
+syntax keyword qmlObjectLiteralType Gauge
+syntax keyword qmlObjectLiteralType GaugeStyle
+syntax keyword qmlObjectLiteralType GaussianBlur
+syntax keyword qmlObjectLiteralType geocircle
+syntax keyword qmlObjectLiteralType GeocodeModel
+syntax keyword qmlObjectLiteralType Geometry
+syntax keyword qmlObjectLiteralType GeometryRenderer
+syntax keyword qmlObjectLiteralType geopath
+syntax keyword qmlObjectLiteralType geopolygon
+syntax keyword qmlObjectLiteralType georectangle
+syntax keyword qmlObjectLiteralType geoshape
+syntax keyword qmlObjectLiteralType GestureEvent
+syntax keyword qmlObjectLiteralType GlassMaterial
+syntax keyword qmlObjectLiteralType GlassRefractiveMaterial
+syntax keyword qmlObjectLiteralType Glow
+syntax keyword qmlObjectLiteralType GoochMaterial
+syntax keyword qmlObjectLiteralType Gradient
+syntax keyword qmlObjectLiteralType GradientStop
+syntax keyword qmlObjectLiteralType GraphicsApiFilter
+syntax keyword qmlObjectLiteralType GraphicsInfo
+syntax keyword qmlObjectLiteralType Gravity
+syntax keyword qmlObjectLiteralType Grid
+syntax keyword qmlObjectLiteralType GridGeometry
+syntax keyword qmlObjectLiteralType GridLayout
+syntax keyword qmlObjectLiteralType GridMesh
+syntax keyword qmlObjectLiteralType GridView
+syntax keyword qmlObjectLiteralType GroupBox
+syntax keyword qmlObjectLiteralType GroupGoal
+syntax keyword qmlObjectLiteralType Gyroscope
+syntax keyword qmlObjectLiteralType GyroscopeReading
+
+syntax keyword qmlObjectLiteralType HandlerPoint
+syntax keyword qmlObjectLiteralType HandwritingInputPanel
+syntax keyword qmlObjectLiteralType HandwritingModeKey
+syntax keyword qmlObjectLiteralType HBarModelMapper
+syntax keyword qmlObjectLiteralType HBoxPlotModelMapper
+syntax keyword qmlObjectLiteralType HCandlestickModelMapper
+syntax keyword qmlObjectLiteralType HDRBloomTonemap
+syntax keyword qmlObjectLiteralType HeightMapSurfaceDataProxy
+syntax keyword qmlObjectLiteralType HideKeyboardKey
+syntax keyword qmlObjectLiteralType HistoryState
+syntax keyword qmlObjectLiteralType HolsterReading
+syntax keyword qmlObjectLiteralType HolsterSensor
+syntax keyword qmlObjectLiteralType HorizontalBarSeries
+syntax keyword qmlObjectLiteralType HorizontalHeaderView
+syntax keyword qmlObjectLiteralType HorizontalPercentBarSeries
+syntax keyword qmlObjectLiteralType HorizontalStackedBarSeries
+syntax keyword qmlObjectLiteralType Host
+syntax keyword qmlObjectLiteralType HoverHandler
+syntax keyword qmlObjectLiteralType HPieModelMapper
+syntax keyword qmlObjectLiteralType HueSaturation
+syntax keyword qmlObjectLiteralType HumidityReading
+syntax keyword qmlObjectLiteralType HumiditySensor
+syntax keyword qmlObjectLiteralType HXYModelMapper
+
+syntax keyword qmlObjectLiteralType Icon
+syntax keyword qmlObjectLiteralType IdleInhibitManagerV1
+syntax keyword qmlObjectLiteralType Image
+syntax keyword qmlObjectLiteralType ImageModel
+syntax keyword qmlObjectLiteralType ImageParticle
+syntax keyword qmlObjectLiteralType InnerShadow
+syntax keyword qmlObjectLiteralType InputChord
+syntax keyword qmlObjectLiteralType InputContext
+syntax keyword qmlObjectLiteralType InputEngine
+syntax keyword qmlObjectLiteralType InputHandler3D
+syntax keyword qmlObjectLiteralType InputMethod
+syntax keyword qmlObjectLiteralType InputModeKey
+syntax keyword qmlObjectLiteralType InputPanel
+syntax keyword qmlObjectLiteralType InputSequence
+syntax keyword qmlObjectLiteralType InputSettings
+syntax keyword qmlObjectLiteralType Instantiator
+syntax keyword qmlObjectLiteralType int
+syntax keyword qmlObjectLiteralType IntValidator
+syntax keyword qmlObjectLiteralType InvokedServices
+syntax keyword qmlObjectLiteralType IRProximityReading
+syntax keyword qmlObjectLiteralType IRProximitySensor
+syntax keyword qmlObjectLiteralType Item
+syntax keyword qmlObjectLiteralType ItemDelegate
+syntax keyword qmlObjectLiteralType ItemGrabResult
+syntax keyword qmlObjectLiteralType ItemModelBarDataProxy
+syntax keyword qmlObjectLiteralType ItemModelScatterDataProxy
+syntax keyword qmlObjectLiteralType ItemModelSurfaceDataProxy
+syntax keyword qmlObjectLiteralType ItemParticle
+syntax keyword qmlObjectLiteralType ItemSelectionModel
+syntax keyword qmlObjectLiteralType IviApplication
+syntax keyword qmlObjectLiteralType IviSurface
+
+syntax keyword qmlObjectLiteralType JavaScriptDialogRequest
+syntax keyword qmlObjectLiteralType Joint
+syntax keyword qmlObjectLiteralType JumpList
+syntax keyword qmlObjectLiteralType JumpListCategory
+syntax keyword qmlObjectLiteralType JumpListDestination
+syntax keyword qmlObjectLiteralType JumpListLink
+syntax keyword qmlObjectLiteralType JumpListSeparator
+
+syntax keyword qmlObjectLiteralType Key
+syntax keyword qmlObjectLiteralType KeyboardColumn
+syntax keyword qmlObjectLiteralType KeyboardDevice
+syntax keyword qmlObjectLiteralType KeyboardHandler
+syntax keyword qmlObjectLiteralType KeyboardLayout
+syntax keyword qmlObjectLiteralType KeyboardLayoutLoader
+syntax keyword qmlObjectLiteralType KeyboardRow
+syntax keyword qmlObjectLiteralType KeyboardStyle
+syntax keyword qmlObjectLiteralType KeyEvent
+syntax keyword qmlObjectLiteralType Keyframe
+syntax keyword qmlObjectLiteralType KeyframeAnimation
+syntax keyword qmlObjectLiteralType KeyframeGroup
+syntax keyword qmlObjectLiteralType KeyIcon
+syntax keyword qmlObjectLiteralType KeyNavigation
+syntax keyword qmlObjectLiteralType KeyPanel
+syntax keyword qmlObjectLiteralType Keys
+
+syntax keyword qmlObjectLiteralType Label
+syntax keyword qmlObjectLiteralType Layer
+syntax keyword qmlObjectLiteralType LayerFilter
+syntax keyword qmlObjectLiteralType Layout
+syntax keyword qmlObjectLiteralType LayoutMirroring
+syntax keyword qmlObjectLiteralType Legend
+syntax keyword qmlObjectLiteralType LerpClipBlend
+syntax keyword qmlObjectLiteralType LevelAdjust
+syntax keyword qmlObjectLiteralType LevelOfDetail
+syntax keyword qmlObjectLiteralType LevelOfDetailBoundingSphere
+syntax keyword qmlObjectLiteralType LevelOfDetailLoader
+syntax keyword qmlObjectLiteralType LevelOfDetailSwitch
+syntax keyword qmlObjectLiteralType LidReading
+syntax keyword qmlObjectLiteralType LidSensor
+syntax keyword qmlObjectLiteralType Light
+syntax keyword qmlObjectLiteralType Light3D
+syntax keyword qmlObjectLiteralType LightReading
+syntax keyword qmlObjectLiteralType LightSensor
+syntax keyword qmlObjectLiteralType LinearGradient
+syntax keyword qmlObjectLiteralType LineSeries
+syntax keyword qmlObjectLiteralType LineShape
+syntax keyword qmlObjectLiteralType LineWidth
+syntax keyword qmlObjectLiteralType list
+syntax keyword qmlObjectLiteralType ListElement
+syntax keyword qmlObjectLiteralType ListModel
+syntax keyword qmlObjectLiteralType ListView
+syntax keyword qmlObjectLiteralType Loader
+syntax keyword qmlObjectLiteralType Loader3D
+syntax keyword qmlObjectLiteralType Locale
+syntax keyword qmlObjectLiteralType Location
+syntax keyword qmlObjectLiteralType LoggingCategory
+syntax keyword qmlObjectLiteralType LogicalDevice
+syntax keyword qmlObjectLiteralType LogValueAxis
+syntax keyword qmlObjectLiteralType LogValueAxis3DFormatter
+syntax keyword qmlObjectLiteralType LottieAnimation
+
+syntax keyword qmlObjectLiteralType Magnetometer
+syntax keyword qmlObjectLiteralType MagnetometerReading
+syntax keyword qmlObjectLiteralType Map
+syntax keyword qmlObjectLiteralType MapCircle
+syntax keyword qmlObjectLiteralType MapCircleObject
+syntax keyword qmlObjectLiteralType MapCopyrightNotice
+syntax keyword qmlObjectLiteralType MapGestureArea
+syntax keyword qmlObjectLiteralType MapIconObject
+syntax keyword qmlObjectLiteralType MapItemGroup
+syntax keyword qmlObjectLiteralType MapItemView
+syntax keyword qmlObjectLiteralType MapObjectView
+syntax keyword qmlObjectLiteralType MapParameter
+syntax keyword qmlObjectLiteralType MapPinchEvent
+syntax keyword qmlObjectLiteralType MapPolygon
+syntax keyword qmlObjectLiteralType MapPolygonObject
+syntax keyword qmlObjectLiteralType MapPolyline
+syntax keyword qmlObjectLiteralType MapPolylineObject
+syntax keyword qmlObjectLiteralType MapQuickItem
+syntax keyword qmlObjectLiteralType MapRectangle
+syntax keyword qmlObjectLiteralType MapRoute
+syntax keyword qmlObjectLiteralType MapRouteObject
+syntax keyword qmlObjectLiteralType MapType
+syntax keyword qmlObjectLiteralType Margins
+syntax keyword qmlObjectLiteralType MaskedBlur
+syntax keyword qmlObjectLiteralType MaskShape
+syntax keyword qmlObjectLiteralType Material
+syntax keyword qmlObjectLiteralType Matrix4x4
+syntax keyword qmlObjectLiteralType matrix4x4
+syntax keyword qmlObjectLiteralType MediaPlayer
+syntax keyword qmlObjectLiteralType mediaplayer-qml-dynamic
+syntax keyword qmlObjectLiteralType MemoryBarrier
+syntax keyword qmlObjectLiteralType Menu
+syntax keyword qmlObjectLiteralType MenuBar
+syntax keyword qmlObjectLiteralType MenuBarItem
+syntax keyword qmlObjectLiteralType MenuBarStyle
+syntax keyword qmlObjectLiteralType MenuItem
+syntax keyword qmlObjectLiteralType MenuItemGroup
+syntax keyword qmlObjectLiteralType MenuSeparator
+syntax keyword qmlObjectLiteralType MenuStyle
+syntax keyword qmlObjectLiteralType Mesh
+syntax keyword qmlObjectLiteralType MessageDialog
+syntax keyword qmlObjectLiteralType MetalRoughMaterial
+syntax keyword qmlObjectLiteralType ModeKey
+syntax keyword qmlObjectLiteralType Model
+syntax keyword qmlObjectLiteralType MonthGrid
+syntax keyword qmlObjectLiteralType MorphingAnimation
+syntax keyword qmlObjectLiteralType MorphTarget
+syntax keyword qmlObjectLiteralType MotionBlur
+syntax keyword qmlObjectLiteralType MouseArea
+syntax keyword qmlObjectLiteralType MouseDevice
+syntax keyword qmlObjectLiteralType MouseEvent
+syntax keyword qmlObjectLiteralType MouseHandler
+syntax keyword qmlObjectLiteralType MultiPointHandler
+syntax keyword qmlObjectLiteralType MultiPointTouchArea
+syntax keyword qmlObjectLiteralType MultiSampleAntiAliasing
+
+syntax keyword qmlObjectLiteralType Navigator
+syntax keyword qmlObjectLiteralType NdefFilter
+syntax keyword qmlObjectLiteralType NdefMimeRecord
+syntax keyword qmlObjectLiteralType NdefRecord
+syntax keyword qmlObjectLiteralType NdefTextRecord
+syntax keyword qmlObjectLiteralType NdefUriRecord
+syntax keyword qmlObjectLiteralType NearField
+syntax keyword qmlObjectLiteralType Node
+syntax keyword qmlObjectLiteralType NodeInstantiator
+syntax keyword qmlObjectLiteralType NoDepthMask
+syntax keyword qmlObjectLiteralType NoDraw
+syntax keyword qmlObjectLiteralType NoPicking
+syntax keyword qmlObjectLiteralType NormalDiffuseMapAlphaMaterial
+syntax keyword qmlObjectLiteralType NormalDiffuseMapMaterial
+syntax keyword qmlObjectLiteralType NormalDiffuseSpecularMapMaterial
+syntax keyword qmlObjectLiteralType Number
+syntax keyword qmlObjectLiteralType NumberAnimation
+syntax keyword qmlObjectLiteralType NumberKey
+
+syntax keyword qmlObjectLiteralType Object3D
+syntax keyword qmlObjectLiteralType ObjectModel
+syntax keyword qmlObjectLiteralType ObjectPicker
+syntax keyword qmlObjectLiteralType OpacityAnimator
+syntax keyword qmlObjectLiteralType OpacityMask
+syntax keyword qmlObjectLiteralType OpenGLInfo
+syntax keyword qmlObjectLiteralType OrbitCameraController
+syntax keyword qmlObjectLiteralType OrientationReading
+syntax keyword qmlObjectLiteralType OrientationSensor
+syntax keyword qmlObjectLiteralType OrthographicCamera
+syntax keyword qmlObjectLiteralType Overlay
+
+syntax keyword qmlObjectLiteralType Package
+syntax keyword qmlObjectLiteralType Page
+syntax keyword qmlObjectLiteralType PageIndicator
+syntax keyword qmlObjectLiteralType palette
+syntax keyword qmlObjectLiteralType Pane
+syntax keyword qmlObjectLiteralType PaperArtisticMaterial
+syntax keyword qmlObjectLiteralType PaperOfficeMaterial
+syntax keyword qmlObjectLiteralType ParallelAnimation
+syntax keyword qmlObjectLiteralType Parameter
+syntax keyword qmlObjectLiteralType ParentAnimation
+syntax keyword qmlObjectLiteralType ParentChange
+syntax keyword qmlObjectLiteralType Particle
+syntax keyword qmlObjectLiteralType ParticleExtruder
+syntax keyword qmlObjectLiteralType ParticleGroup
+syntax keyword qmlObjectLiteralType ParticlePainter
+syntax keyword qmlObjectLiteralType ParticleSystem
+syntax keyword qmlObjectLiteralType Pass
+syntax keyword qmlObjectLiteralType Path
+syntax keyword qmlObjectLiteralType PathAngleArc
+syntax keyword qmlObjectLiteralType PathAnimation
+syntax keyword qmlObjectLiteralType PathArc
+syntax keyword qmlObjectLiteralType PathAttribute
+syntax keyword qmlObjectLiteralType PathCubic
+syntax keyword qmlObjectLiteralType PathCurve
+syntax keyword qmlObjectLiteralType PathElement
+syntax keyword qmlObjectLiteralType PathInterpolator
+syntax keyword qmlObjectLiteralType PathLine
+syntax keyword qmlObjectLiteralType PathMove
+syntax keyword qmlObjectLiteralType PathMultiline
+syntax keyword qmlObjectLiteralType PathPercent
+syntax keyword qmlObjectLiteralType PathPolyline
+syntax keyword qmlObjectLiteralType PathQuad
+syntax keyword qmlObjectLiteralType PathSvg
+syntax keyword qmlObjectLiteralType PathText
+syntax keyword qmlObjectLiteralType PathView
+syntax keyword qmlObjectLiteralType PauseAnimation
+syntax keyword qmlObjectLiteralType PdfDocument
+syntax keyword qmlObjectLiteralType PdfLinkModel
+syntax keyword qmlObjectLiteralType PdfNavigationStack
+syntax keyword qmlObjectLiteralType PdfSearchModel
+syntax keyword qmlObjectLiteralType PdfSelection
+syntax keyword qmlObjectLiteralType PercentBarSeries
+syntax keyword qmlObjectLiteralType PerspectiveCamera
+syntax keyword qmlObjectLiteralType PerVertexColorMaterial
+syntax keyword qmlObjectLiteralType PhongAlphaMaterial
+syntax keyword qmlObjectLiteralType PhongMaterial
+syntax keyword qmlObjectLiteralType PickEvent
+syntax keyword qmlObjectLiteralType PickingSettings
+syntax keyword qmlObjectLiteralType PickLineEvent
+syntax keyword qmlObjectLiteralType PickPointEvent
+syntax keyword qmlObjectLiteralType PickResult
+syntax keyword qmlObjectLiteralType PickTriangleEvent
+syntax keyword qmlObjectLiteralType Picture
+syntax keyword qmlObjectLiteralType PieMenu
+syntax keyword qmlObjectLiteralType PieMenuStyle
+syntax keyword qmlObjectLiteralType PieSeries
+syntax keyword qmlObjectLiteralType PieSlice
+syntax keyword qmlObjectLiteralType PinchArea
+syntax keyword qmlObjectLiteralType PinchEvent
+syntax keyword qmlObjectLiteralType PinchHandler
+syntax keyword qmlObjectLiteralType Place
+syntax keyword qmlObjectLiteralType PlaceAttribute
+syntax keyword qmlObjectLiteralType PlaceSearchModel
+syntax keyword qmlObjectLiteralType PlaceSearchSuggestionModel
+syntax keyword qmlObjectLiteralType PlaneGeometry
+syntax keyword qmlObjectLiteralType PlaneMesh
+syntax keyword qmlObjectLiteralType PlasticStructuredRedEmissiveMaterial
+syntax keyword qmlObjectLiteralType PlasticStructuredRedMaterial
+syntax keyword qmlObjectLiteralType Playlist
+syntax keyword qmlObjectLiteralType PlaylistItem
+syntax keyword qmlObjectLiteralType PlayVariation
+syntax keyword qmlObjectLiteralType Plugin
+syntax keyword qmlObjectLiteralType PluginParameter
+syntax keyword qmlObjectLiteralType point
+syntax keyword qmlObjectLiteralType PointDirection
+syntax keyword qmlObjectLiteralType PointerDevice
+syntax keyword qmlObjectLiteralType PointerDeviceHandler
+syntax keyword qmlObjectLiteralType PointerEvent
+syntax keyword qmlObjectLiteralType PointerHandler
+syntax keyword qmlObjectLiteralType PointerScrollEvent
+syntax keyword qmlObjectLiteralType PointHandler
+syntax keyword qmlObjectLiteralType PointLight
+syntax keyword qmlObjectLiteralType PointSize
+syntax keyword qmlObjectLiteralType PolarChartView
+syntax keyword qmlObjectLiteralType PolygonOffset
+syntax keyword qmlObjectLiteralType Popup
+syntax keyword qmlObjectLiteralType Position
+syntax keyword qmlObjectLiteralType Positioner
+syntax keyword qmlObjectLiteralType PositionSource
+syntax keyword qmlObjectLiteralType PressureReading
+syntax keyword qmlObjectLiteralType PressureSensor
+syntax keyword qmlObjectLiteralType PrincipledMaterial
+syntax keyword qmlObjectLiteralType Product
+syntax keyword qmlObjectLiteralType ProgressBar
+syntax keyword qmlObjectLiteralType ProgressBarStyle
+syntax keyword qmlObjectLiteralType PropertyAction
+syntax keyword qmlObjectLiteralType PropertyAnimation
+syntax keyword qmlObjectLiteralType PropertyChanges
+syntax keyword qmlObjectLiteralType ProximityFilter
+syntax keyword qmlObjectLiteralType ProximityReading
+syntax keyword qmlObjectLiteralType ProximitySensor
+
+syntax keyword qmlObjectLiteralType QAbstractState
+syntax keyword qmlObjectLiteralType QAbstractTransition
+syntax keyword qmlObjectLiteralType QmlSensors
+syntax keyword qmlObjectLiteralType QSignalTransition
+syntax keyword qmlObjectLiteralType Qt
+syntax keyword qmlObjectLiteralType QtMultimedia
+syntax keyword qmlObjectLiteralType QtObject
+syntax keyword qmlObjectLiteralType QtPositioning
+syntax keyword qmlObjectLiteralType QtRemoteObjects
+syntax keyword qmlObjectLiteralType quaternion
+syntax keyword qmlObjectLiteralType QuaternionAnimation
+syntax keyword qmlObjectLiteralType QuotaRequest
+
+syntax keyword qmlObjectLiteralType RadialBlur
+syntax keyword qmlObjectLiteralType RadialGradient
+syntax keyword qmlObjectLiteralType Radio
+syntax keyword qmlObjectLiteralType RadioButton
+syntax keyword qmlObjectLiteralType RadioButtonStyle
+syntax keyword qmlObjectLiteralType RadioData
+syntax keyword qmlObjectLiteralType RadioDelegate
+syntax keyword qmlObjectLiteralType RangeSlider
+syntax keyword qmlObjectLiteralType RasterMode
+syntax keyword qmlObjectLiteralType Ratings
+syntax keyword qmlObjectLiteralType RayCaster
+syntax keyword qmlObjectLiteralType real
+syntax keyword qmlObjectLiteralType rect
+syntax keyword qmlObjectLiteralType Rectangle
+syntax keyword qmlObjectLiteralType RectangleShape
+syntax keyword qmlObjectLiteralType RectangularGlow
+syntax keyword qmlObjectLiteralType RecursiveBlur
+syntax keyword qmlObjectLiteralType RegExpValidator
+syntax keyword qmlObjectLiteralType RegisterProtocolHandlerRequest
+syntax keyword qmlObjectLiteralType RegularExpressionValidator
+syntax keyword qmlObjectLiteralType RenderCapabilities
+syntax keyword qmlObjectLiteralType RenderCapture
+syntax keyword qmlObjectLiteralType RenderCaptureReply
+syntax keyword qmlObjectLiteralType RenderPass
+syntax keyword qmlObjectLiteralType RenderPassFilter
+syntax keyword qmlObjectLiteralType RenderSettings
+syntax keyword qmlObjectLiteralType RenderState
+syntax keyword qmlObjectLiteralType RenderStateSet
+syntax keyword qmlObjectLiteralType RenderStats
+syntax keyword qmlObjectLiteralType RenderSurfaceSelector
+syntax keyword qmlObjectLiteralType RenderTarget
+syntax keyword qmlObjectLiteralType RenderTargetOutput
+syntax keyword qmlObjectLiteralType RenderTargetSelector
+syntax keyword qmlObjectLiteralType Repeater
+syntax keyword qmlObjectLiteralType Repeater3D
+syntax keyword qmlObjectLiteralType ReviewModel
+syntax keyword qmlObjectLiteralType Rotation
+syntax keyword qmlObjectLiteralType RotationAnimation
+syntax keyword qmlObjectLiteralType RotationAnimator
+syntax keyword qmlObjectLiteralType RotationReading
+syntax keyword qmlObjectLiteralType RotationSensor
+syntax keyword qmlObjectLiteralType RoundButton
+syntax keyword qmlObjectLiteralType Route
+syntax keyword qmlObjectLiteralType RouteLeg
+syntax keyword qmlObjectLiteralType RouteManeuver
+syntax keyword qmlObjectLiteralType RouteModel
+syntax keyword qmlObjectLiteralType RouteQuery
+syntax keyword qmlObjectLiteralType RouteSegment
+syntax keyword qmlObjectLiteralType Row
+syntax keyword qmlObjectLiteralType RowLayout
+
+syntax keyword qmlObjectLiteralType Scale
+syntax keyword qmlObjectLiteralType ScaleAnimator
+syntax keyword qmlObjectLiteralType Scatter
+syntax keyword qmlObjectLiteralType Scatter3D
+syntax keyword qmlObjectLiteralType Scatter3DSeries
+syntax keyword qmlObjectLiteralType ScatterDataProxy
+syntax keyword qmlObjectLiteralType ScatterSeries
+syntax keyword qmlObjectLiteralType Scene2D
+syntax keyword qmlObjectLiteralType Scene3D
+syntax keyword qmlObjectLiteralType Scene3DView
+syntax keyword qmlObjectLiteralType SceneEnvironment
+syntax keyword qmlObjectLiteralType SceneLoader
+syntax keyword qmlObjectLiteralType ScissorTest
+syntax keyword qmlObjectLiteralType Screen
+syntax keyword qmlObjectLiteralType ScreenRayCaster
+syntax keyword qmlObjectLiteralType ScriptAction
+syntax keyword qmlObjectLiteralType ScrollBar
+syntax keyword qmlObjectLiteralType ScrollIndicator
+syntax keyword qmlObjectLiteralType ScrollView
+syntax keyword qmlObjectLiteralType ScrollViewStyle
+syntax keyword qmlObjectLiteralType SCurveTonemap
+syntax keyword qmlObjectLiteralType ScxmlStateMachine
+syntax keyword qmlObjectLiteralType SeamlessCubemap
+syntax keyword qmlObjectLiteralType SelectionListItem
+syntax keyword qmlObjectLiteralType SelectionListModel
+syntax keyword qmlObjectLiteralType Sensor
+syntax keyword qmlObjectLiteralType SensorGesture
+syntax keyword qmlObjectLiteralType SensorReading
+syntax keyword qmlObjectLiteralType SequentialAnimation
+syntax keyword qmlObjectLiteralType Settings
+syntax keyword qmlObjectLiteralType SettingsStore
+syntax keyword qmlObjectLiteralType SetUniformValue
+syntax keyword qmlObjectLiteralType Shader
+syntax keyword qmlObjectLiteralType ShaderEffect
+syntax keyword qmlObjectLiteralType ShaderEffectSource
+syntax keyword qmlObjectLiteralType ShaderImage
+syntax keyword qmlObjectLiteralType ShaderInfo
+syntax keyword qmlObjectLiteralType ShaderProgram
+syntax keyword qmlObjectLiteralType ShaderProgramBuilder
+syntax keyword qmlObjectLiteralType Shape
+syntax keyword qmlObjectLiteralType ShapeGradient
+syntax keyword qmlObjectLiteralType ShapePath
+syntax keyword qmlObjectLiteralType SharedGLTexture
+syntax keyword qmlObjectLiteralType ShellSurface
+syntax keyword qmlObjectLiteralType ShellSurfaceItem
+syntax keyword qmlObjectLiteralType ShiftHandler
+syntax keyword qmlObjectLiteralType ShiftKey
+syntax keyword qmlObjectLiteralType Shortcut
+syntax keyword qmlObjectLiteralType SignalSpy
+syntax keyword qmlObjectLiteralType SignalTransition
+syntax keyword qmlObjectLiteralType SinglePointHandler
+syntax keyword qmlObjectLiteralType size
+syntax keyword qmlObjectLiteralType Skeleton
+syntax keyword qmlObjectLiteralType SkeletonLoader
+syntax keyword qmlObjectLiteralType SkyboxEntity
+syntax keyword qmlObjectLiteralType Slider
+syntax keyword qmlObjectLiteralType SliderStyle
+syntax keyword qmlObjectLiteralType SmoothedAnimation
+syntax keyword qmlObjectLiteralType SortPolicy
+syntax keyword qmlObjectLiteralType Sound
+syntax keyword qmlObjectLiteralType SoundEffect
+syntax keyword qmlObjectLiteralType SoundInstance
+syntax keyword qmlObjectLiteralType SpaceKey
+syntax keyword qmlObjectLiteralType SphereGeometry
+syntax keyword qmlObjectLiteralType SphereMesh
+syntax keyword qmlObjectLiteralType SpinBox
+syntax keyword qmlObjectLiteralType SpinBoxStyle
+syntax keyword qmlObjectLiteralType SplineSeries
+syntax keyword qmlObjectLiteralType SplitHandle
+syntax keyword qmlObjectLiteralType SplitView
+syntax keyword qmlObjectLiteralType SpotLight
+syntax keyword qmlObjectLiteralType SpringAnimation
+syntax keyword qmlObjectLiteralType Sprite
+syntax keyword qmlObjectLiteralType SpriteGoal
+syntax keyword qmlObjectLiteralType SpriteSequence
+syntax keyword qmlObjectLiteralType Stack
+syntax keyword qmlObjectLiteralType StackedBarSeries
+syntax keyword qmlObjectLiteralType StackLayout
+syntax keyword qmlObjectLiteralType StackView
+syntax keyword qmlObjectLiteralType StackViewDelegate
+syntax keyword qmlObjectLiteralType StandardPaths
+syntax keyword qmlObjectLiteralType State
+syntax keyword qmlObjectLiteralType StateChangeScript
+syntax keyword qmlObjectLiteralType StateGroup
+syntax keyword qmlObjectLiteralType StateMachine
+syntax keyword qmlObjectLiteralType StateMachineLoader
+syntax keyword qmlObjectLiteralType StatusBar
+syntax keyword qmlObjectLiteralType StatusBarStyle
+syntax keyword qmlObjectLiteralType StatusIndicator
+syntax keyword qmlObjectLiteralType StatusIndicatorStyle
+syntax keyword qmlObjectLiteralType SteelMilledConcentricMaterial
+syntax keyword qmlObjectLiteralType StencilMask
+syntax keyword qmlObjectLiteralType StencilOperation
+syntax keyword qmlObjectLiteralType StencilOperationArguments
+syntax keyword qmlObjectLiteralType StencilTest
+syntax keyword qmlObjectLiteralType StencilTestArguments
+syntax keyword qmlObjectLiteralType Store
+syntax keyword qmlObjectLiteralType String
+syntax keyword qmlObjectLiteralType string
+syntax keyword qmlObjectLiteralType SubtreeEnabler
+syntax keyword qmlObjectLiteralType Supplier
+syntax keyword qmlObjectLiteralType Surface3D
+syntax keyword qmlObjectLiteralType Surface3DSeries
+syntax keyword qmlObjectLiteralType SurfaceDataProxy
+syntax keyword qmlObjectLiteralType SwipeDelegate
+syntax keyword qmlObjectLiteralType SwipeView
+syntax keyword qmlObjectLiteralType Switch
+syntax keyword qmlObjectLiteralType SwitchDelegate
+syntax keyword qmlObjectLiteralType SwitchStyle
+syntax keyword qmlObjectLiteralType SymbolModeKey
+syntax keyword qmlObjectLiteralType SystemPalette
+syntax keyword qmlObjectLiteralType SystemTrayIcon
+
+syntax keyword qmlObjectLiteralType Tab
+syntax keyword qmlObjectLiteralType TabBar
+syntax keyword qmlObjectLiteralType TabButton
+syntax keyword qmlObjectLiteralType TableModel
+syntax keyword qmlObjectLiteralType TableModelColumn
+syntax keyword qmlObjectLiteralType TableView
+syntax keyword qmlObjectLiteralType TableViewColumn
+syntax keyword qmlObjectLiteralType TableViewStyle
+syntax keyword qmlObjectLiteralType TabView
+syntax keyword qmlObjectLiteralType TabViewStyle
+syntax keyword qmlObjectLiteralType TapHandler
+syntax keyword qmlObjectLiteralType TapReading
+syntax keyword qmlObjectLiteralType TapSensor
+syntax keyword qmlObjectLiteralType TargetDirection
+syntax keyword qmlObjectLiteralType TaskbarButton
+syntax keyword qmlObjectLiteralType Technique
+syntax keyword qmlObjectLiteralType TechniqueFilter
+syntax keyword qmlObjectLiteralType TestCase
+syntax keyword qmlObjectLiteralType Text
+syntax keyword qmlObjectLiteralType Text2DEntity
+syntax keyword qmlObjectLiteralType TextArea
+syntax keyword qmlObjectLiteralType TextAreaStyle
+syntax keyword qmlObjectLiteralType TextEdit
+syntax keyword qmlObjectLiteralType TextField
+syntax keyword qmlObjectLiteralType TextFieldStyle
+syntax keyword qmlObjectLiteralType TextInput
+syntax keyword qmlObjectLiteralType TextMetrics
+syntax keyword qmlObjectLiteralType Texture
+syntax keyword qmlObjectLiteralType Texture1D
+syntax keyword qmlObjectLiteralType Texture1DArray
+syntax keyword qmlObjectLiteralType Texture2D
+syntax keyword qmlObjectLiteralType Texture2DArray
+syntax keyword qmlObjectLiteralType Texture2DMultisample
+syntax keyword qmlObjectLiteralType Texture2DMultisampleArray
+syntax keyword qmlObjectLiteralType Texture3D
+syntax keyword qmlObjectLiteralType TextureBuffer
+syntax keyword qmlObjectLiteralType TextureCubeMap
+syntax keyword qmlObjectLiteralType TextureCubeMapArray
+syntax keyword qmlObjectLiteralType TextureImage
+syntax keyword qmlObjectLiteralType TextureInput
+syntax keyword qmlObjectLiteralType TextureLoader
+syntax keyword qmlObjectLiteralType TextureRectangle
+syntax keyword qmlObjectLiteralType Theme3D
+syntax keyword qmlObjectLiteralType ThemeColor
+syntax keyword qmlObjectLiteralType ThresholdMask
+syntax keyword qmlObjectLiteralType ThumbnailToolBar
+syntax keyword qmlObjectLiteralType ThumbnailToolButton
+syntax keyword qmlObjectLiteralType TiltReading
+syntax keyword qmlObjectLiteralType TiltSensor
+syntax keyword qmlObjectLiteralType TiltShift
+syntax keyword qmlObjectLiteralType Timeline
+syntax keyword qmlObjectLiteralType TimelineAnimation
+syntax keyword qmlObjectLiteralType TimeoutTransition
+syntax keyword qmlObjectLiteralType Timer
+syntax keyword qmlObjectLiteralType ToggleButton
+syntax keyword qmlObjectLiteralType ToggleButtonStyle
+syntax keyword qmlObjectLiteralType ToolBar
+syntax keyword qmlObjectLiteralType ToolBarStyle
+syntax keyword qmlObjectLiteralType ToolButton
+syntax keyword qmlObjectLiteralType ToolSeparator
+syntax keyword qmlObjectLiteralType ToolTip
+syntax keyword qmlObjectLiteralType TooltipRequest
+syntax keyword qmlObjectLiteralType Torch
+syntax keyword qmlObjectLiteralType TorusGeometry
+syntax keyword qmlObjectLiteralType TorusMesh
+syntax keyword qmlObjectLiteralType TouchEventSequence
+syntax keyword qmlObjectLiteralType TouchInputHandler3D
+syntax keyword qmlObjectLiteralType TouchPoint
+syntax keyword qmlObjectLiteralType Trace
+syntax keyword qmlObjectLiteralType TraceCanvas
+syntax keyword qmlObjectLiteralType TraceInputArea
+syntax keyword qmlObjectLiteralType TraceInputKey
+syntax keyword qmlObjectLiteralType TraceInputKeyPanel
+syntax keyword qmlObjectLiteralType TrailEmitter
+syntax keyword qmlObjectLiteralType Transaction
+syntax keyword qmlObjectLiteralType Transform
+syntax keyword qmlObjectLiteralType Transition
+syntax keyword qmlObjectLiteralType Translate
+syntax keyword qmlObjectLiteralType TreeView
+syntax keyword qmlObjectLiteralType TreeViewStyle
+syntax keyword qmlObjectLiteralType Tumbler
+syntax keyword qmlObjectLiteralType TumblerColumn
+syntax keyword qmlObjectLiteralType TumblerStyle
+syntax keyword qmlObjectLiteralType Turbulence
+
+syntax keyword qmlObjectLiteralType UniformAnimator
+syntax keyword qmlObjectLiteralType url
+syntax keyword qmlObjectLiteralType User
+
+syntax keyword qmlObjectLiteralType ValueAxis
+syntax keyword qmlObjectLiteralType ValueAxis3D
+syntax keyword qmlObjectLiteralType ValueAxis3DFormatter
+syntax keyword qmlObjectLiteralType var
+syntax keyword qmlObjectLiteralType variant
+syntax keyword qmlObjectLiteralType VBarModelMapper
+syntax keyword qmlObjectLiteralType VBoxPlotModelMapper
+syntax keyword qmlObjectLiteralType VCandlestickModelMapper
+syntax keyword qmlObjectLiteralType vector2d
+syntax keyword qmlObjectLiteralType vector3d
+syntax keyword qmlObjectLiteralType Vector3dAnimation
+syntax keyword qmlObjectLiteralType vector4d
+syntax keyword qmlObjectLiteralType VertexBlendAnimation
+syntax keyword qmlObjectLiteralType VerticalHeaderView
+syntax keyword qmlObjectLiteralType Video
+syntax keyword qmlObjectLiteralType VideoOutput
+syntax keyword qmlObjectLiteralType View3D
+syntax keyword qmlObjectLiteralType Viewport
+syntax keyword qmlObjectLiteralType ViewTransition
+syntax keyword qmlObjectLiteralType Vignette
+syntax keyword qmlObjectLiteralType VirtualKeyboardSettings
+syntax keyword qmlObjectLiteralType VPieModelMapper
+syntax keyword qmlObjectLiteralType VXYModelMapper
+
+syntax keyword qmlObjectLiteralType Wander
+syntax keyword qmlObjectLiteralType WasdController
+syntax keyword qmlObjectLiteralType WavefrontMesh
+syntax keyword qmlObjectLiteralType WaylandClient
+syntax keyword qmlObjectLiteralType WaylandCompositor
+syntax keyword qmlObjectLiteralType WaylandHardwareLayer
+syntax keyword qmlObjectLiteralType WaylandOutput
+syntax keyword qmlObjectLiteralType WaylandQuickItem
+syntax keyword qmlObjectLiteralType WaylandSeat
+syntax keyword qmlObjectLiteralType WaylandSurface
+syntax keyword qmlObjectLiteralType WaylandView
+syntax keyword qmlObjectLiteralType Waypoint
+syntax keyword qmlObjectLiteralType WebChannel
+syntax keyword qmlObjectLiteralType WebEngine
+syntax keyword qmlObjectLiteralType WebEngineAction
+syntax keyword qmlObjectLiteralType WebEngineCertificateError
+syntax keyword qmlObjectLiteralType WebEngineClientCertificateOption
+syntax keyword qmlObjectLiteralType WebEngineClientCertificateSelection
+syntax keyword qmlObjectLiteralType WebEngineDownloadItem
+syntax keyword qmlObjectLiteralType WebEngineHistory
+syntax keyword qmlObjectLiteralType WebEngineHistoryListModel
+syntax keyword qmlObjectLiteralType WebEngineLoadRequest
+syntax keyword qmlObjectLiteralType WebEngineNavigationRequest
+syntax keyword qmlObjectLiteralType WebEngineNewViewRequest
+syntax keyword qmlObjectLiteralType WebEngineNotification
+syntax keyword qmlObjectLiteralType WebEngineProfile
+syntax keyword qmlObjectLiteralType WebEngineScript
+syntax keyword qmlObjectLiteralType WebEngineSettings
+syntax keyword qmlObjectLiteralType WebEngineView
+syntax keyword qmlObjectLiteralType WebSocket
+syntax keyword qmlObjectLiteralType WebSocketServer
+syntax keyword qmlObjectLiteralType WebView
+syntax keyword qmlObjectLiteralType WebViewLoadRequest
+syntax keyword qmlObjectLiteralType WeekNumberColumn
+syntax keyword qmlObjectLiteralType WheelEvent
+syntax keyword qmlObjectLiteralType WheelHandler
+syntax keyword qmlObjectLiteralType Window
+syntax keyword qmlObjectLiteralType WlScaler
+syntax keyword qmlObjectLiteralType WlShell
+syntax keyword qmlObjectLiteralType WlShellSurface
+syntax keyword qmlObjectLiteralType WorkerScript
+
+syntax keyword qmlObjectLiteralType XAnimator
+syntax keyword qmlObjectLiteralType XdgDecorationManagerV1
+syntax keyword qmlObjectLiteralType XdgOutputManagerV1
+syntax keyword qmlObjectLiteralType XdgPopup
+syntax keyword qmlObjectLiteralType XdgPopupV5
+syntax keyword qmlObjectLiteralType XdgPopupV6
+syntax keyword qmlObjectLiteralType XdgShell
+syntax keyword qmlObjectLiteralType XdgShellV5
+syntax keyword qmlObjectLiteralType XdgShellV6
+syntax keyword qmlObjectLiteralType XdgSurface
+syntax keyword qmlObjectLiteralType XdgSurfaceV5
+syntax keyword qmlObjectLiteralType XdgSurfaceV6
+syntax keyword qmlObjectLiteralType XdgToplevel
+syntax keyword qmlObjectLiteralType XdgToplevelV6
+syntax keyword qmlObjectLiteralType XmlListModel
+syntax keyword qmlObjectLiteralType XmlRole
+syntax keyword qmlObjectLiteralType XYPoint
+syntax keyword qmlObjectLiteralType XYSeries
+
+syntax keyword qmlObjectLiteralType YAnimator
+
+syntax keyword qmlObjectLiteralType ZoomBlur
+
+" }}}
+
+if get(g:, 'qml_fold', 0)
+  syn match   qmlFunction      "\<function\>"
+  syn region  qmlFunctionFold  start="^\z(\s*\)\<function\>.*[^};]$" end="^\z1}.*$" transparent fold keepend
+
+  syn sync match qmlSync  grouphere qmlFunctionFold "\<function\>"
+  syn sync match qmlSync  grouphere NONE "^}"
+
+  setlocal foldmethod=syntax
+  setlocal foldtext=getline(v:foldstart)
+else
+  syn keyword qmlFunction         function
+  syn match   qmlArrowFunction    "=>"
+  syn match   qmlBraces           "[{}\[\]]"
+  syn match   qmlParens           "[()]"
+endif
+
+syn sync fromstart
+syn sync maxlines=100
+
+if main_syntax == "qml"
+  syn sync ccomment qmlComment
+endif
+
+hi def link qmlComment           Comment
+hi def link qmlLineComment       Comment
+hi def link qmlCommentTodo       Todo
+hi def link qmlSpecial           Special
+hi def link qmlStringS           String
+hi def link qmlStringD           String
+hi def link qmlStringT           String
+hi def link qmlCharacter         Character
+hi def link qmlNumber            Number
+hi def link qmlConditional       Conditional
+hi def link qmlRepeat            Repeat
+hi def link qmlBranch            Conditional
+hi def link qmlOperator          Operator
+hi def link qmlJsType            Type
+hi def link qmlType              Type
+hi def link qmlObjectLiteralType Type
+hi def link qmlStatement         Statement
+hi def link qmlFunction          Function
+hi def link qmlArrowFunction     Function
+hi def link qmlBraces            Function
+hi def link qmlError             Error
+hi def link qmlNull              Keyword
+hi def link qmlBoolean           Boolean
+hi def link qmlRegexpString      String
+hi def link qmlNullishCoalescing Operator
+
+hi def link qmlIdentifier        Identifier
+hi def link qmlLabel             Label
+hi def link qmlException         Exception
+hi def link qmlMessage           Keyword
+hi def link qmlGlobal            Keyword
+hi def link qmlReserved          Keyword
+hi def link qmlDebug             Debug
+hi def link qmlConstant          Label
+hi def link qmlBindingProperty   Label
+hi def link qmlDeclaration       Function
+
+let b:current_syntax = "qml"
+if main_syntax == 'qml'
+  unlet main_syntax
+endif
-- 
cgit 


From eaad2f7806a3f2ff29997e0533a09cf78397cf1c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:49:04 +0900
Subject: vim-patch:9.0.1768: Runtime: no support for bicep files

Problem:  Runtime: no support for bicep files
Solution: Add filetype support for bicepparam

closes: vim/vim#12784

https://github.com/vim/vim/commit/2d0988ef93c6e8e59381c9cd123efbc2cd1faf92

Co-authored-by: Scott McKendry <scott.c.mckendry@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index bb7d9f174a..ffb284cca7 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -229,6 +229,7 @@ local extension = {
   com = detect_seq(detect.bindzone, 'dcl'),
   db = detect.bindzone,
   bicep = 'bicep',
+  bicepparam = 'bicep',
   bb = 'bitbake',
   bbappend = 'bitbake',
   bbclass = 'bitbake',
-- 
cgit 


From 91d8f2ac534a51859c0e3c6562d07c94b27f4478 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 10:25:41 +0800
Subject: vim-patch:9.0.1767: '.-' no allowed in highlight group names (#24814)

Problem:  '.-' no allowed in highlight group names
Solution: Allow dot and hyphen characters in highlight group names

Allow dots and hyphens in group names. There does not seem
to be any reason for these to be disallowed.

closes: vim/vim#12807

https://github.com/vim/vim/commit/d4376dc3ebea91abcb4d9ef9963ef5b968048b78

Co-authored-by: Gregory Anders <greg@gpanders.com>
Co-authored-by: Sean Dewar <seandewar@users.noreply.github.com>
---
 runtime/doc/syntax.txt   | 5 ++---
 runtime/doc/vim_diff.txt | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index a89884efba..498c55389a 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -188,9 +188,8 @@ thing.  These are then linked to a highlight group that specifies the color.
 A syntax group name doesn't specify any color or attributes itself.
 
 The name for a highlight or syntax group must consist of ASCII letters,
-digits, underscores, periods, hyphens, and `@` characters.  As a regexp it is
-`[a-zA-Z0-9_.@-]*`. The maximum length of a group name is about 200 bytes.
-*E1249*
+digits, underscores, dots, hyphens, or `@`.  As a regexp: `[a-zA-Z0-9_.@-]*`.
+The maximum length of a group name is about 200 bytes.  *E1249*
 
 To be able to allow each user to pick their favorite set of colors, there must
 be preferred names for highlight groups that are common for many languages.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 64ce466c73..b7bb52333d 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -494,7 +494,7 @@ Highlight groups:
   using |n| or |N|
   |hl-CursorLine| is low-priority unless foreground color is set
   |hl-VertSplit| superseded by |hl-WinSeparator|
-  Highlight groups names are allowed to contain the characters `.`, `@`, and `-`.
+  Highlight groups names are allowed to contain `@` characters.
   It is an error to define a highlight group with a name that doesn't match
   the regexp `[a-zA-Z0-9_.@-]*` (see |group-name|).
 
-- 
cgit 


From ab45d5bf6d46abd9b29389dee6689044fd63e225 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 10:45:25 +0800
Subject: vim-patch:8.1.2044: no easy way to process postponed work

Problem:    No easy way to process postponed work. (Paul Jolly)
Solution:   Add the SafeState autocommand event.

https://github.com/vim/vim/commit/8aeec40207b5adcd3a155277dc4f29189343b963

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/autocmd.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index a7c28e25d0..90211fc5db 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -862,6 +862,27 @@ RecordingLeave			When a macro stops recording.
 				Sets these |v:event| keys:
 				    regcontents
 				    regname
+							*SafeState*
+SafeState			When nothing is pending, going to wait for the
+				user to type a character.
+				This will not be triggered when:
+				- an operator is pending
+				- a register was entered with "r
+				- halfway executing a command
+				- executing a mapping
+				- there is typeahead
+				- Insert mode completion is active
+				- Command line completion is active
+				You can use `mode()` to find out what state
+				Vim is in.  That may be:
+				- VIsual mode
+				- Normal mode
+				- Insert mode
+				- Command-line mode
+				Depending on what you want to do, you may also
+				check more with `state()`, e.g. whether the
+				screen was scrolled for messages.
+
 							*SessionLoadPost*
 SessionLoadPost			After loading the session file created using
 				the |:mksession| command.
-- 
cgit 


From 4956f267449ca7526145c63ef095bfd731174635 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 11:11:02 +0800
Subject: vim-patch:8.1.2046: SafeState may be triggered at the wrong moment

Problem:    SafeState may be triggered at the wrong moment.
Solution:   Move it up higher to after where messages are processed.  Add a
            SafeStateAgain event to tigger there.

https://github.com/vim/vim/commit/69198cb8c08f124729c41a4681f2d142228a9139

SafeStateAgain is N/A.
Move SafeState functions to state.c.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/vim_diff.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index b7bb52333d..29a7c50585 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -619,6 +619,7 @@ Eval:
   *v:sizeofpointer*
 
 Events:
+  *SafeStateAgain*
   *SigUSR1* Use |Signal| to detect `SIGUSR1` signal instead.
 
 Highlight groups:
-- 
cgit 


From 64ccfdaafef56b451e3a5eed94367fad93978ec8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 11:22:25 +0800
Subject: vim-patch:8.1.2047: cannot check the current state

Problem:    Cannot check the current state.
Solution:   Add the state() function.

https://github.com/vim/vim/commit/0e57dd859ecb1e8a3b91509d2f4343e839340eb8

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         | 26 ++++++++++++++++++++++++++
 runtime/lua/vim/_meta/vimfn.lua | 29 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 92cedbdc80..c57b8637e0 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4753,6 +4753,7 @@ mode([expr])                                                            *mode()*
 		If [expr] is supplied and it evaluates to a non-zero Number or
 		a non-empty String (|non-zero-arg|), then the full mode is
 		returned, otherwise only the first letter is returned.
+		Also see |state()|.
 
 		   n	    Normal
 		   no	    Operator-pending
@@ -7368,6 +7369,31 @@ srand([{expr}])                                                        *srand()*
 			echo rand(seed)
 <
 
+state([{what}])                                                        *state()*
+		Return a string which contains characters indicating the
+		current state.  Mostly useful in callbacks that want to do
+		work that may not always be safe.  Roughly this works like:
+		- callback uses state() to check if work is safe to do.
+		  If yes, then do it right away.
+		  Otherwise add to work queue and add SafeState autocommand.
+		- When SafeState is triggered, check with state() if the work
+		  can be done now, and if yes remove it from the queue and
+		  execute.
+		Also see |mode()|.
+
+		When {what} is given only characters in this string will be
+		added.  E.g, this checks if the screen has scrolled: >vim
+			if state('s') != ''
+
+		These characters indicate the state:
+		    m  halfway a mapping, :normal command, feedkeys() or
+		       stuffed command
+		    o  operator pending or waiting for a command argument
+		    a  Insert mode autocomplete active
+		    x  executing an autocommand
+		    c  callback invoked (repeats for recursiveness up to "ccc")
+		    s  screen has scrolled for messages
+
 stdioopen({opts})                                                  *stdioopen()*
 		With |--headless| this opens stdin and stdout as a |channel|.
 		May be called only once. See |channel-stdio|. stderr is not
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 300210b296..4665f71052 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5713,6 +5713,7 @@ function vim.fn.mkdir(name, flags, prot) end
 --- If [expr] is supplied and it evaluates to a non-zero Number or
 --- a non-empty String (|non-zero-arg|), then the full mode is
 --- returned, otherwise only the first letter is returned.
+--- Also see |state()|.
 ---
 ---    n      Normal
 ---    no      Operator-pending
@@ -8744,6 +8745,34 @@ function vim.fn.sqrt(expr) end
 --- @return any
 function vim.fn.srand(expr) end
 
+--- Return a string which contains characters indicating the
+--- current state.  Mostly useful in callbacks that want to do
+--- work that may not always be safe.  Roughly this works like:
+--- - callback uses state() to check if work is safe to do.
+---   If yes, then do it right away.
+---   Otherwise add to work queue and add SafeState autocommand.
+--- - When SafeState is triggered, check with state() if the work
+---   can be done now, and if yes remove it from the queue and
+---   execute.
+--- Also see |mode()|.
+---
+--- When {what} is given only characters in this string will be
+--- added.  E.g, this checks if the screen has scrolled: >vim
+---   if state('s') != ''
+---
+--- These characters indicate the state:
+---     m  halfway a mapping, :normal command, feedkeys() or
+---        stuffed command
+---     o  operator pending or waiting for a command argument
+---     a  Insert mode autocomplete active
+---     x  executing an autocommand
+---     c  callback invoked (repeats for recursiveness up to "ccc")
+---     s  screen has scrolled for messages
+---
+--- @param what? string
+--- @return any
+function vim.fn.state(what) end
+
 --- With |--headless| this opens stdin and stdout as a |channel|.
 --- May be called only once. See |channel-stdio|. stderr is not
 --- handled by this function, see |v:stderr|.
-- 
cgit 


From 7ce2acd59be89e5e6d2ac778ad074a9ae42951cd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 12:16:33 +0800
Subject: vim-patch:8.1.2053: SafeStateAgain not triggered if callback uses
 feedkeys()

Problem:    SafeStateAgain not triggered if callback uses feedkeys().
Solution:   Check for safe state in the input loop.  Make log messages easier
            to find. Add 'S' flag to state().

https://github.com/vim/vim/commit/d103ee78432f9036d243b18dd5aac1263d3b7dc9

Include misc1.c change from patch 8.1.2062.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         | 7 +++++--
 runtime/lua/vim/_meta/vimfn.lua | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index c57b8637e0..2ce66d8cc2 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -7385,13 +7385,16 @@ state([{what}])                                                        *state()*
 		added.  E.g, this checks if the screen has scrolled: >vim
 			if state('s') != ''
 
-		These characters indicate the state:
+		These characters indicate the state, generally indicating that
+		something is busy:
 		    m  halfway a mapping, :normal command, feedkeys() or
 		       stuffed command
 		    o  operator pending or waiting for a command argument
 		    a  Insert mode autocomplete active
 		    x  executing an autocommand
-		    c  callback invoked (repeats for recursiveness up to "ccc")
+		    S  not triggering SafeState
+		    c  callback invoked, including timer (repeats for
+		       recursiveness up to "ccc")
 		    s  screen has scrolled for messages
 
 stdioopen({opts})                                                  *stdioopen()*
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 4665f71052..70d1aa4a79 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -8760,13 +8760,16 @@ function vim.fn.srand(expr) end
 --- added.  E.g, this checks if the screen has scrolled: >vim
 ---   if state('s') != ''
 ---
---- These characters indicate the state:
+--- These characters indicate the state, generally indicating that
+--- something is busy:
 ---     m  halfway a mapping, :normal command, feedkeys() or
 ---        stuffed command
 ---     o  operator pending or waiting for a command argument
 ---     a  Insert mode autocomplete active
 ---     x  executing an autocommand
----     c  callback invoked (repeats for recursiveness up to "ccc")
+---     S  not triggering SafeState
+---     c  callback invoked, including timer (repeats for
+---        recursiveness up to "ccc")
 ---     s  screen has scrolled for messages
 ---
 --- @param what? string
-- 
cgit 


From 0f48173ab531a9012321714bbc29ae4cd57b7ac7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 17:09:31 +0800
Subject: vim-patch:589edb340454

Updte runtime files

https://github.com/vim/vim/commit/589edb340454e7f1b19358f129287a636d53d0e1

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         | 33 ++++++++++++++++++---------------
 runtime/lua/vim/_meta/vimfn.lua | 21 ++++++++++++---------
 2 files changed, 30 insertions(+), 24 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 2ce66d8cc2..af7bcf4392 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -7374,28 +7374,31 @@ state([{what}])                                                        *state()*
 		current state.  Mostly useful in callbacks that want to do
 		work that may not always be safe.  Roughly this works like:
 		- callback uses state() to check if work is safe to do.
-		  If yes, then do it right away.
-		  Otherwise add to work queue and add SafeState autocommand.
-		- When SafeState is triggered, check with state() if the work
-		  can be done now, and if yes remove it from the queue and
-		  execute.
+		  Yes: then do it right away.
+		  No:  add to work queue and add a |SafeState| autocommand.
+		- When SafeState is triggered and executes your autocommand,
+		  check with `state()` if the work can be done now, and if yes
+		  remove it from the queue and execute.
+		  Remove the autocommand if the queue is now empty.
 		Also see |mode()|.
 
 		When {what} is given only characters in this string will be
 		added.  E.g, this checks if the screen has scrolled: >vim
-			if state('s') != ''
+			if state('s') == ''
+			   " screen has not scrolled
 
 		These characters indicate the state, generally indicating that
 		something is busy:
-		    m  halfway a mapping, :normal command, feedkeys() or
-		       stuffed command
-		    o  operator pending or waiting for a command argument
-		    a  Insert mode autocomplete active
-		    x  executing an autocommand
-		    S  not triggering SafeState
-		    c  callback invoked, including timer (repeats for
-		       recursiveness up to "ccc")
-		    s  screen has scrolled for messages
+		    m	halfway a mapping, :normal command, feedkeys() or
+			stuffed command
+		    o	operator pending or waiting for a command argument,
+			e.g. after |f|
+		    a	Insert mode autocomplete active
+		    x	executing an autocommand
+		    S	not triggering SafeState
+		    c	callback invoked, including timer (repeats for
+			recursiveness up to "ccc")
+		    s	screen has scrolled for messages
 
 stdioopen({opts})                                                  *stdioopen()*
 		With |--headless| this opens stdin and stdout as a |channel|.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 70d1aa4a79..86d3dd21a1 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -8749,27 +8749,30 @@ function vim.fn.srand(expr) end
 --- current state.  Mostly useful in callbacks that want to do
 --- work that may not always be safe.  Roughly this works like:
 --- - callback uses state() to check if work is safe to do.
----   If yes, then do it right away.
----   Otherwise add to work queue and add SafeState autocommand.
---- - When SafeState is triggered, check with state() if the work
----   can be done now, and if yes remove it from the queue and
----   execute.
+---   Yes: then do it right away.
+---   No:  add to work queue and add a |SafeState| autocommand.
+--- - When SafeState is triggered and executes your autocommand,
+---   check with `state()` if the work can be done now, and if yes
+---   remove it from the queue and execute.
+---   Remove the autocommand if the queue is now empty.
 --- Also see |mode()|.
 ---
 --- When {what} is given only characters in this string will be
 --- added.  E.g, this checks if the screen has scrolled: >vim
----   if state('s') != ''
+---   if state('s') == ''
+---      " screen has not scrolled
 ---
 --- These characters indicate the state, generally indicating that
 --- something is busy:
 ---     m  halfway a mapping, :normal command, feedkeys() or
----        stuffed command
----     o  operator pending or waiting for a command argument
+---   stuffed command
+---     o  operator pending or waiting for a command argument,
+---   e.g. after |f|
 ---     a  Insert mode autocomplete active
 ---     x  executing an autocommand
 ---     S  not triggering SafeState
 ---     c  callback invoked, including timer (repeats for
----        recursiveness up to "ccc")
+---   recursiveness up to "ccc")
 ---     s  screen has scrolled for messages
 ---
 --- @param what? string
-- 
cgit 


From 6bdfb890fd26408408e85b5e0ea4a1fbeb8b048d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 21 Aug 2023 17:18:10 +0800
Subject: vim-patch:e46a44050562

Runtime file updates

https://github.com/vim/vim/commit/e46a4405056276b4cbdacee76b11f85c8ea1830b

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         | 13 ++++++-------
 runtime/lua/vim/_meta/vimfn.lua | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index af7bcf4392..079052b658 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2662,7 +2662,7 @@ getmatches([{win}])                                               *getmatches()*
 <
 
 getmousepos()                                                    *getmousepos()*
-		Returns a Dictionary with the last known position of the
+		Returns a |Dictionary| with the last known position of the
 		mouse.  This can be used in a mapping for a mouse click.  The
 		items are:
 			screenrow	screen row
@@ -5741,7 +5741,7 @@ screenchar({row}, {col})                                          *screenchar()*
 		Returns -1 when row or col is out of range.
 
 screenchars({row}, {col})                                        *screenchars()*
-		The result is a List of Numbers.  The first number is the same
+		The result is a |List| of Numbers.  The first number is the same
 		as what |screenchar()| returns.  Further numbers are
 		composing characters on top of the base character.
 		This is mainly to be used for testing.
@@ -5908,7 +5908,7 @@ searchcount([{options}])                                         *searchcount()*
 		without the "S" flag in 'shortmess'.  This works even if
 		'shortmess' does contain the "S" flag.
 
-		This returns a Dictionary. The dictionary is empty if the
+		This returns a |Dictionary|. The dictionary is empty if the
 		previous pattern was not set and "pattern" was not specified.
 
 		  key		type		meaning ~
@@ -5990,7 +5990,7 @@ searchcount([{options}])                                         *searchcount()*
 			" search again
 			call searchcount()
 <
-		{options} must be a Dictionary. It can contain:
+		{options} must be a |Dictionary|. It can contain:
 		  key		type		meaning ~
 		  recompute	|Boolean|	if |TRUE|, recompute the count
 						like |n| or |N| was executed.
@@ -7391,11 +7391,10 @@ state([{what}])                                                        *state()*
 		something is busy:
 		    m	halfway a mapping, :normal command, feedkeys() or
 			stuffed command
-		    o	operator pending or waiting for a command argument,
-			e.g. after |f|
+		    o	operator pending, e.g. after |d|
 		    a	Insert mode autocomplete active
 		    x	executing an autocommand
-		    S	not triggering SafeState
+		    S	not triggering SafeState, e.g. after |f| or a count
 		    c	callback invoked, including timer (repeats for
 			recursiveness up to "ccc")
 		    s	screen has scrolled for messages
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 86d3dd21a1..e393844724 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3230,7 +3230,7 @@ function vim.fn.getmarklist(buf) end
 --- @return any
 function vim.fn.getmatches(win) end
 
---- Returns a Dictionary with the last known position of the
+--- Returns a |Dictionary| with the last known position of the
 --- mouse.  This can be used in a mapping for a mouse click.  The
 --- items are:
 ---   screenrow  screen row
@@ -6878,7 +6878,7 @@ function vim.fn.screenattr(row, col) end
 --- @return any
 function vim.fn.screenchar(row, col) end
 
---- The result is a List of Numbers.  The first number is the same
+--- The result is a |List| of Numbers.  The first number is the same
 --- as what |screenchar()| returns.  Further numbers are
 --- composing characters on top of the base character.
 --- This is mainly to be used for testing.
@@ -7069,7 +7069,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 --- without the "S" flag in 'shortmess'.  This works even if
 --- 'shortmess' does contain the "S" flag.
 ---
---- This returns a Dictionary. The dictionary is empty if the
+--- This returns a |Dictionary|. The dictionary is empty if the
 --- previous pattern was not set and "pattern" was not specified.
 ---
 ---   key    type    meaning ~
@@ -7151,7 +7151,7 @@ function vim.fn.search(pattern, flags, stopline, timeout, skip) end
 ---   " search again
 ---   call searchcount()
 --- <
---- {options} must be a Dictionary. It can contain:
+--- {options} must be a |Dictionary|. It can contain:
 ---   key    type    meaning ~
 ---   recompute  |Boolean|  if |TRUE|, recompute the count
 ---         like |n| or |N| was executed.
@@ -8766,11 +8766,10 @@ function vim.fn.srand(expr) end
 --- something is busy:
 ---     m  halfway a mapping, :normal command, feedkeys() or
 ---   stuffed command
----     o  operator pending or waiting for a command argument,
----   e.g. after |f|
+---     o  operator pending, e.g. after |d|
 ---     a  Insert mode autocomplete active
 ---     x  executing an autocommand
----     S  not triggering SafeState
+---     S  not triggering SafeState, e.g. after |f| or a count
 ---     c  callback invoked, including timer (repeats for
 ---   recursiveness up to "ccc")
 ---     s  screen has scrolled for messages
-- 
cgit 


From 4a36ecd23898e8b4ccbe8fce9bd9300aa69aa834 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:51:38 +0900
Subject: vim-patch:72904d5fda0a

Runtime: Add nixInherit matcher in nix.vim syntax

Perform the lookahead in `nixInheritAttributeScope`, then hand over to a
new region called `nixInheritAttributeSubExpr`, which sets the match
start to one char after the opening bracket to avoid a double-match.

Finally, only do a lookahead to `)` in `nixInheritAttributeSubExpr` (and
thus make sure the region is closed to not get a match of `nixParen`
here) and let `nixInheritAttributeScope` close the bracket.

https://github.com/vim/vim/commit/72904d5fda0a1bc78f4bc9080c158226e6e90d5c

Co-authored-by: James Fleming <james@electronic-quill.net>
---
 runtime/syntax/nix.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/nix.vim b/runtime/syntax/nix.vim
index c07676a4a8..671b269c04 100644
--- a/runtime/syntax/nix.vim
+++ b/runtime/syntax/nix.vim
@@ -1,11 +1,12 @@
 " Vim syntax file
 " Language:        Nix
-" Maintainer:	   James Fleming <james@electronic-quill.net>
+" Maintainer:      James Fleming <james@electronic-quill.net>
+"                  (Github username: equill)
 " Original Author: Daiderd Jordan <daiderd@gmail.com>
 " Acknowledgement: Based on vim-nix maintained by Daiderd Jordan <daiderd@gmail.com>
 "                  https://github.com/LnL7/vim-nix
 " License:         MIT
-" Last Change:     2022 Dec 06
+" Last Change:     2023 Aug 19
 
 if exists("b:current_syntax")
   finish
@@ -68,7 +69,8 @@ syn match nixAttribute "[a-zA-Z_][a-zA-Z0-9_'-]*\ze\%([^a-zA-Z0-9_'.-]\|$\)" con
 syn region nixAttributeAssignment start="=" end="\ze;" contained contains=@nixExpr
 syn region nixAttributeDefinition start=/\ze[a-zA-Z_"$]/ end=";" contained contains=nixComment,nixAttribute,nixInterpolation,nixSimpleString,nixAttributeDot,nixAttributeAssignment
 
-syn region nixInheritAttributeScope start="(" end="\ze)" contained contains=@nixExpr
+syn region nixInheritAttributeSubExpr start="("ms=e+1 end="\ze)" contained contains=nixAttributeDot,@nixExpr
+syn region nixInheritAttributeScope start="\ze(" end=")" contained contains=nixInheritAttributeSubExpr
 syn region nixAttributeDefinition matchgroup=nixInherit start="\<inherit\>" end=";" contained contains=nixComment,nixInheritAttributeScope,nixAttribute
 
 syn region nixAttributeSet start="{" end="}" contains=nixComment,nixAttributeDefinition
-- 
cgit 


From abc3721e4fce2ddacc7fc51f729637f87819efbd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:51:47 +0900
Subject: vim-patch:478668013f06

runtime(rust): fix rust indent (vim/vim#12542)

https://github.com/vim/vim/commit/478668013f060a75b8cd8cc6ca2cf2abb3bcc4a5

Co-authored-by: Raphael <glephunter@gmail.com>
---
 runtime/indent/rust.vim | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'runtime')

diff --git a/runtime/indent/rust.vim b/runtime/indent/rust.vim
index d30629b64e..2b544f4a67 100644
--- a/runtime/indent/rust.vim
+++ b/runtime/indent/rust.vim
@@ -132,6 +132,22 @@ function GetRustIndent(lnum)
 		return indent(prevlinenum) + 6
 	endif
 
+	"match newline after struct with generic bound like
+	"struct SomeThing<T>
+	"| <-- newline indent should same as prevline
+	if prevline[len(prevline) - 1] == ">"
+				\ && prevline =~# "\s*struct.*>$"
+		return indent(prevlinenum)
+	endif
+
+	"match newline after where like:
+	"struct SomeThing<T>
+	"where
+	"     T: Display,
+	if prevline =~# '^\s*where$'
+		return indent(prevlinenum) + 4
+	endif
+
 	if prevline[len(prevline) - 1] == ","
 				\ && s:get_line_trimmed(a:lnum) !~ '^\s*[\[\]{}]'
 				\ && prevline !~ '^\s*fn\s'
-- 
cgit 


From 3f877657dd1be891bdf6b5fa79d92319b720426d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:51:59 +0900
Subject: vim-patch:6633611f4280

runtime(lua): indent curly bracket followed by line comment (vim/vim#12306)

fixes vim/vim#12305

https://github.com/vim/vim/commit/6633611f4280f33934c2ab9b6a3e84c04f054ad3

Co-authored-by: champignoom <66909116+champignoom@users.noreply.github.com>
---
 runtime/indent/lua.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/indent/lua.vim b/runtime/indent/lua.vim
index 0d1f934a03..ff0f64be29 100644
--- a/runtime/indent/lua.vim
+++ b/runtime/indent/lua.vim
@@ -41,7 +41,7 @@ function! GetLuaIndent()
   let prevline = getline(prevlnum)
   let midx = match(prevline, '^\s*\%(if\>\|for\>\|while\>\|repeat\>\|else\>\|elseif\>\|do\>\|then\>\)')
   if midx == -1
-    let midx = match(prevline, '{\s*$')
+    let midx = match(prevline, '{\s*\%(--\%([^[].*\)\?\)\?$')
     if midx == -1
       let midx = match(prevline, '\<function\>\s*\%(\k\|[.:]\)\{-}\s*(')
     endif
-- 
cgit 


From 60037feb56c6f03443b93890a2506e290425805a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:52:33 +0900
Subject: vim-patch:e71e9d9ad368

runtime(javascript): fix default link of javaScriptNumber in syntax file (vim/vim#11788)

cool unused matching

https://github.com/vim/vim/commit/e71e9d9ad368f83162a9c08217a9faf9bda909a7

Co-authored-by: Meqa <106783764+Meqativ@users.noreply.github.com>
---
 runtime/syntax/javascript.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index cb2d16e2a7..e3b4cdf703 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -103,7 +103,7 @@ hi def link javaScriptStringD		String
 hi def link javaScriptStringT		String
 hi def link javaScriptCharacter		Character
 hi def link javaScriptSpecialCharacter	javaScriptSpecial
-hi def link javaScriptNumber		javaScriptValue
+hi def link javaScriptNumber		Number
 hi def link javaScriptConditional		Conditional
 hi def link javaScriptRepeat		Repeat
 hi def link javaScriptBranch		Conditional
-- 
cgit 


From c9764bf331b4238ea60af382b013e0d058318d58 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:52:42 +0900
Subject: vim-patch:9fa35b1c38b8

runtime(lua): fix lua indentation of non-lowercase "keywords" (vim/vim#11759)

https://github.com/vim/vim/commit/9fa35b1c38b84d95b5c8e083aa742e0e0490fa1f

Co-authored-by: beardedsakimonkey <54521218+beardedsakimonkey@users.noreply.github.com>
---
 runtime/indent/lua.vim | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'runtime')

diff --git a/runtime/indent/lua.vim b/runtime/indent/lua.vim
index ff0f64be29..35b08d4037 100644
--- a/runtime/indent/lua.vim
+++ b/runtime/indent/lua.vim
@@ -27,6 +27,16 @@ if exists("*GetLuaIndent")
 endif
 
 function! GetLuaIndent()
+    let ignorecase_save = &ignorecase
+  try
+    let &ignorecase = 0
+    return GetLuaIndentIntern()
+  finally
+    let &ignorecase = ignorecase_save
+  endtry
+endfunction
+
+function! GetLuaIndentIntern()
   " Find a non-blank line above the current line.
   let prevlnum = prevnonblank(v:lnum - 1)
 
-- 
cgit 


From 5b78a5c72a1ae8999646ecb268ab47b767c3e709 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:52:53 +0900
Subject: vim-patch:309ded19543c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(css): Update pseudo-classes in syntax script (vim/vim#11595)

https://github.com/vim/vim/commit/309ded19543c140375b28ef562257e9f22c918c6

Co-authored-by: Adrian Heine né Lang <mail@adrianheine.de>
---
 runtime/syntax/css.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index 564dc151bc..f8104ea2c5 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -452,12 +452,12 @@ syn match cssAttrComma ","
 " Pseudo class
 " https://www.w3.org/TR/selectors-4/
 syn match cssPseudoClass ":[A-Za-z0-9_-]*" contains=cssNoise,cssPseudoClassId,cssUnicodeEscape,cssVendor,cssPseudoClassFn
-syn keyword cssPseudoClassId contained link visited active hover before after left right
-syn keyword cssPseudoClassId contained root empty target enabled disabled checked invalid
+syn keyword cssPseudoClassId contained link visited active hover before after left right any-link
+syn keyword cssPseudoClassId contained root empty target enabled disabled checked invalid default defined autofill fullscreen host indeterminate in-range modal optional out-of-range picture-in-picture placeholder-shown paused playing read-only read-write required scope
 syn match cssPseudoClassId contained "\<first-\(line\|letter\)\>"
 syn match cssPseudoClassId contained "\<\(first\|last\|only\)-\(of-type\|child\)\>"
 syn match cssPseudoClassId contained  "\<focus\(-within\|-visible\)\=\>"
-syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|is\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ,cssTagName,cssAttributeSelector,cssClassName,cssIdentifier
+syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(where\|has\|host\|not\|is\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ,cssTagName,cssAttributeSelector,cssClassName,cssIdentifier
 " ------------------------------------
 " Vendor specific properties
 syn match cssPseudoClassId contained  "\<selection\>"
-- 
cgit 


From 36404fea4a3cb87d816359564bde774b9e60a899 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:55:12 +0900
Subject: vim-patch:5e6e4042b1c9

runtime(haskell): Add single quote to `iskeyword` in ftplugin (vim/vim#8191)

The single quote `'` is a valid character in variable names, so it should be included in `iskeyword`; this, for instance, makes the <kbd>*</kbd> command behave predictably

https://github.com/vim/vim/commit/5e6e4042b1c9685bce86493e3ee6fe916a7f221c

Co-authored-by: Enrico Maria De Angelis <enricomaria.dean6elis@gmail.com>
---
 runtime/ftplugin/haskell.vim | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/ftplugin/haskell.vim b/runtime/ftplugin/haskell.vim
index 84f4d0563b..2a864bf916 100644
--- a/runtime/ftplugin/haskell.vim
+++ b/runtime/ftplugin/haskell.vim
@@ -17,6 +17,7 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 setlocal comments=s1fl:{-,mb:-,ex:-},:-- commentstring=--\ %s
 setlocal formatoptions-=t formatoptions+=croql
 setlocal omnifunc=haskellcomplete#Complete
+setlocal iskeyword+='
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-- 
cgit 


From e2d3c1260ee0a6bc47e457f77638db695d00e972 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:55:21 +0900
Subject: vim-patch:a0fddaa2f4b7

Runtime(javascript): add new document properties to completion file

closes: vim/vim#6536

https://github.com/vim/vim/commit/a0fddaa2f4b7358484eb54ccdd1b7433d18a9039

Co-authored-by: Jay Sitter <jay@diameterstudios.com>
---
 runtime/autoload/javascriptcomplete.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/javascriptcomplete.vim b/runtime/autoload/javascriptcomplete.vim
index 29b6b16254..3ec3b50490 100644
--- a/runtime/autoload/javascriptcomplete.vim
+++ b/runtime/autoload/javascriptcomplete.vim
@@ -156,8 +156,8 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 					\ 'text', 'vLink']
 		let bodys = bodyprop
 		" Document - document.
-		let docuprop = ['anchors', 'body', 'characterSet', 'doctype',
-					\ 'documentElement', 'documentURI', 'embeds', 'fonts', 'forms',
+		let docuprop = ['anchors', 'applets', 'body', 'characterSet', 'childNodes',
+					\ 'doctype', 'documentElement', 'documentURI', 'embeds', 'fonts', 'forms',
 					\ 'head', 'hidden', 'images', 'implementation', 'lastStyleSheetSet',
 					\ 'links', 'plugins', 'preferredStyleSheetSet', 'scripts',
 					\ 'scrollingElement', 'selectedStyleSheetSet', 'styleSheetSets',
@@ -171,7 +171,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 					\ 'createEvent', 'createExpression', 'createNSResolver',
 					\ 'createNodeIterator', 'createProcessingInstruction', 'createRange',
 					\ 'createTextNode', 'createTouchList', 'createTreeWalker',
-					\ 'enableStyleSheetsForSet', 'evaluate', 'focus', 'getElementById',
+					\ 'enableStyleSheetsForSet', 'evaluate', 'focus', 
 					\ 'getElementById', 'getElementsByClassName', 'getElementsByName',
 					\ 'getElementsByTagName', 'getElementsByTagNameNS',
 					\ 'hasStorageAccess', 'importNode', 'onClick', 'onDblClick',
-- 
cgit 


From 54ddf56589bfe3941987d3fc9242104486aa6a15 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 09:55:35 +0900
Subject: vim-patch:6d626c41842e
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(sdc): Add underscore to sdc flags in syntax file (vim/vim#6201)

https://github.com/vim/vim/commit/6d626c41842e2c3ab698338bbe5fcfcf0557ecd8

Co-authored-by: Jordi Altayó <jordialtayo@gmail.com>
---
 runtime/syntax/sdc.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/sdc.vim b/runtime/syntax/sdc.vim
index 0ca9becf73..dbfa35eeb6 100644
--- a/runtime/syntax/sdc.vim
+++ b/runtime/syntax/sdc.vim
@@ -25,7 +25,7 @@ syn keyword sdcNonIdealities	set_load set_min_capacitance set_max_capacitance
 syn keyword sdcCreateOperations	create_clock create_timing_netlist update_timing_netlist
 
 " command flags highlighting
-syn match sdcFlags		"[[:space:]]-[[:alpha:]]*\>"
+syn match sdcFlags		"[[:space:]]-[[:alpha:]_]*\>"
 
 " Define the default highlighting.
 hi def link sdcCollections      Repeat
-- 
cgit 


From b75659c8fbfa2599a7d15d493b47707a0c4fbdcc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 21 Aug 2023 20:58:13 +0900
Subject: vim-patch:690963924956

runtime(dosini): save and restore cpo value in syntax script

Commit dd0ad2598898c2b4641c4acd5b70b6184fa698ed  introduced
line-continuation. However, to make sure this does not cause an error
when Vim is run in compatible mode, we need to set compatibility mode
temporarily and reset it back when finished reading the file.

This fixes: https://groups.google.com/g/vim_use/c/9zccgo_RIqM/m/xlUmhBktBgAJ

https://github.com/vim/vim/commit/690963924956d800b94bb86076aa9d25f04565ac

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/syntax/dosini.vim | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/dosini.vim b/runtime/syntax/dosini.vim
index 751a12f4b2..66e17ec9af 100644
--- a/runtime/syntax/dosini.vim
+++ b/runtime/syntax/dosini.vim
@@ -6,7 +6,7 @@
 " Current Maintainer:     Hong Xu <hong@topbug.net>
 " Homepage:               http://www.vim.org/scripts/script.php?script_id=3747
 " Repository:             https://github.com/xuhdev/syntax-dosini.vim
-" Last Change:            2023 Jun 27
+" Last Change:            2023 Aug 20
 
 
 " quit when a syntax file was already loaded
@@ -14,6 +14,10 @@ if exists("b:current_syntax")
   finish
 endif
 
+" using of line-continuation requires cpo&vim
+let s:cpo_save = &cpo
+set cpo&vim
+
 " shut case off
 syn case ignore
 
@@ -39,4 +43,7 @@ hi def link dosiniValue    String
 
 let b:current_syntax = "dosini"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 " vim: sts=2 sw=2 et
-- 
cgit 


From 09910d5b35f2432a22374e59560a1bbd08907d57 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 22 Aug 2023 18:21:15 +0800
Subject: vim-patch:9.0.0837: append() reports failure when not appending
 anything

Problem:    append() reports failure when not appending anything.
Solution:   Only report failure when appending something. (closes vim/vim#11498)

https://github.com/vim/vim/commit/cd9c8d400c1eb9cbb4ff6a33be02f91a30ab13b2

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         | 16 ++++++++++------
 runtime/lua/vim/_meta/vimfn.lua | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 079052b658..75f6cd4313 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -73,7 +73,8 @@ append({lnum}, {text})                                                *append()*
 		{lnum} can be zero to insert a line before the first one.
 		{lnum} is used like with |getline()|.
 		Returns 1 for failure ({lnum} out of range or out of memory),
-		0 for success.  Example: >vim
+		0 for success.  When {text} is an empty list zero is returned,
+		no matter the value of {lnum}.  Example: >vim
 			let failed = append(line('$'), "# THE END")
 			let failed = append(0, ["Chapter 1", "the beginning"])
 <
@@ -96,7 +97,8 @@ appendbufline({buf}, {lnum}, {text})                           *appendbufline()*
 		If {buf} is not a valid buffer or {lnum} is not valid, an
 		error message is given. Example: >vim
 			let failed = appendbufline(13, 0, "# THE START")
-<
+<		However, when {text} is an empty list then no error is given
+		for an invalid {lnum}, since {lnum} isn't actually used.
 
 argc([{winid}])                                                         *argc()*
 		The result is the number of files in the argument list.  See
@@ -6213,9 +6215,10 @@ setbufline({buf}, {lnum}, {text})                                 *setbufline()*
 
 		To insert lines use |appendbufline()|.
 
-		{text} can be a string to set one line, or a list of strings
-		to set multiple lines.  If the list extends below the last
-		line then those lines are added.
+		{text} can be a string to set one line, or a List of strings
+		to set multiple lines.  If the List extends below the last
+		line then those lines are added.  If the List is empty then
+		nothing is changed and zero is returned.
 
 		For the use of {buf}, see |bufname()| above.
 
@@ -6374,7 +6377,8 @@ setline({lnum}, {text})                                              *setline()*
 		When {lnum} is just below the last line the {text} will be
 		added below the last line.
 		{text} can be any type or a List of any type, each item is
-		converted to a String.
+		converted to a String.  When {text} is an empty List then
+		nothing is changed and FALSE is returned.
 
 		If this succeeds, FALSE is returned.  If this fails (most likely
 		because {lnum} is invalid) TRUE is returned.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index e393844724..126abb29ac 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -79,7 +79,8 @@ function vim.fn.api_info() end
 --- {lnum} can be zero to insert a line before the first one.
 --- {lnum} is used like with |getline()|.
 --- Returns 1 for failure ({lnum} out of range or out of memory),
---- 0 for success.  Example: >vim
+--- 0 for success.  When {text} is an empty list zero is returned,
+--- no matter the value of {lnum}.  Example: >vim
 ---   let failed = append(line('$'), "# THE END")
 ---   let failed = append(0, ["Chapter 1", "the beginning"])
 --- <
@@ -106,7 +107,8 @@ function vim.fn.append(lnum, text) end
 --- If {buf} is not a valid buffer or {lnum} is not valid, an
 --- error message is given. Example: >vim
 ---   let failed = appendbufline(13, 0, "# THE START")
---- <
+--- <However, when {text} is an empty list then no error is given
+--- for an invalid {lnum}, since {lnum} isn't actually used.
 ---
 --- @param buf any
 --- @param lnum integer
@@ -7398,9 +7400,10 @@ function vim.fn.serverstop(address) end
 ---
 --- To insert lines use |appendbufline()|.
 ---
---- {text} can be a string to set one line, or a list of strings
---- to set multiple lines.  If the list extends below the last
---- line then those lines are added.
+--- {text} can be a string to set one line, or a List of strings
+--- to set multiple lines.  If the List extends below the last
+--- line then those lines are added.  If the List is empty then
+--- nothing is changed and zero is returned.
 ---
 --- For the use of {buf}, see |bufname()| above.
 ---
@@ -7602,7 +7605,8 @@ function vim.fn.setfperm(fname, mode) end
 --- When {lnum} is just below the last line the {text} will be
 --- added below the last line.
 --- {text} can be any type or a List of any type, each item is
---- converted to a String.
+--- converted to a String.  When {text} is an empty List then
+--- nothing is changed and FALSE is returned.
 ---
 --- If this succeeds, FALSE is returned.  If this fails (most likely
 --- because {lnum} is invalid) TRUE is returned.
-- 
cgit 


From 0ba27bb51d3297aec43e78050cc3adcf6879db22 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 23 Aug 2023 16:32:15 +0800
Subject: vim-patch:9.0.1710: scrolloff options work slightly different

Problem: sidescrolloff and scrolloff options work slightly
         different than other global-local options
Solution: Make it behave consistent for all global-local options

It was noticed, that sidescrolloff and scrolloff options behave
differently in comparison to other global-local window options like
'listchars'

So make those two behave like other global-local options. Also add some
extra documentation for a few special local-window options.

Add a few tests to make sure all global-local window options behave
similar

closes: vim/vim#12956
closes: vim/vim#12643

https://github.com/vim/vim/commit/4a8eb6e7a9df10f79bf95301ced012f0d6a13088

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/options.txt | 47 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f04fb2fb51..eea9f2cf4b 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -189,6 +189,8 @@ opt+=val" the expansion is done before the adding or removing.
 
 Handling of local options			*local-options*
 
+Note: The following also applies to |global-local| options.
+
 Some of the options only apply to a window or buffer.  Each window or buffer
 has its own copy of this option, thus each can have its own value.  This
 allows you to set 'list' in one window but not in another.  And set
@@ -238,6 +240,30 @@ The options local to a window are remembered for each buffer.  This also
 happens when the buffer is not loaded, but they are lost when the buffer is
 wiped out |:bwipe|.
 
+Special local window options			*special-local-window-option*
+
+The following local window options won't be copied over when new windows are
+created, thus they behave slightly differently:
+
+	Option		Reason	~
+	'previewwindow'	there can only be a single one
+	'scroll'	specific to existing window
+	'winfixheight'	specific to existing window
+	'winfixwidth'	specific to existing window
+
+Special local buffer options			*special-local-buffer-option*
+
+The following local buffer options won't be copied over when new buffers are
+created, thus they behave slightly differently:
+
+	Option		Reason	~
+	'filetype'	explicitly set by autocommands
+	'syntax'	explicitly set by autocommands
+	'bufhidden'	denote |special-buffers|
+	'buftype'	denote |special-buffers|
+	'readonly'	will be detected automatically
+	'modified'	will be detected automatically
+
 							*:setl* *:setlocal*
 :setl[ocal][!] ...	Like ":set" but set only the value local to the
 			current buffer or window.  Not all options have a
@@ -311,7 +337,6 @@ used.  Thus it does the same as: >
 Note: In the future more global options can be made |global-local|.  Using
 ":setlocal" on a global option might work differently then.
 
-
 						*option-value-function*
 Some options ('completefunc', 'omnifunc', 'operatorfunc', 'quickfixtextfunc',
 'tagfunc' and 'thesaurusfunc') are set to a function name or a function
@@ -1070,7 +1095,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'bufhidden'* *'bh'*
 'bufhidden' 'bh'	string	(default "")
-			local to buffer
+			local to buffer  |special-local-buffer-option|
 	This option specifies what happens when a buffer is no longer
 	displayed in a window:
 	  <empty>	follow the global 'hidden' option
@@ -1102,7 +1127,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'buftype'* *'bt'* *E382*
 'buftype' 'bt'		string	(default "")
-			local to buffer
+			local to buffer  |special-local-buffer-option|
 	The value of this option specifies the type of a buffer:
 	  <empty>	normal buffer
 	  acwrite	buffer will always be written with |BufWriteCmd|s
@@ -2408,7 +2433,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'filetype'* *'ft'*
 'filetype' 'ft'		string	(default "")
-			local to buffer
+			local to buffer  |special-local-buffer-option|
 	When this option is set, the FileType autocommand event is triggered.
 	All autocommands that match with the value of this option will be
 	executed.  Thus the value of 'filetype' is used in place of the file
@@ -4084,7 +4109,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 				*'modified'* *'mod'* *'nomodified'* *'nomod'*
 'modified' 'mod'	boolean	(default off)
-			local to buffer
+			local to buffer  |special-local-buffer-option|
 	When on, the buffer is considered to be modified.  This option is set
 	when:
 	1. A change was made to the text since it was last written.  Using the
@@ -4532,7 +4557,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 		*'previewwindow'* *'pvw'* *'nopreviewwindow'* *'nopvw'* *E590*
 'previewwindow' 'pvw'	boolean	(default off)
-			local to window
+			local to window  |special-local-window-option|
 	Identifies the preview window.  Only one window can have this option
 	set.  It's normally not set directly, but by using one of the commands
 	|:ptag|, |:pedit|, etc.
@@ -4602,7 +4627,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 				*'readonly'* *'ro'* *'noreadonly'* *'noro'*
 'readonly' 'ro'		boolean	(default off)
-			local to buffer
+			local to buffer  |special-local-buffer-option|
 	If on, writes fail unless you use a '!'.  Protects you from
 	accidentally overwriting a file.  Default on when Vim is started
 	in read-only mode ("vim -R") or when the executable is called "view".
@@ -4864,7 +4889,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'scroll'* *'scr'*
 'scroll' 'scr'		number	(default half the window height)
-			local to window
+			local to window  |special-local-window-option|
 	Number of lines to scroll with CTRL-U and CTRL-D commands.  Will be
 	set to half the number of lines in the window when the window size
 	changes.  This may happen when enabling the |status-line| or
@@ -6214,7 +6239,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'syntax'* *'syn'*
 'syntax' 'syn'		string	(default "")
-			local to buffer
+			local to buffer  |special-local-buffer-option|
 	When this option is set, the syntax with this name is loaded, unless
 	syntax highlighting has been switched off with ":syntax off".
 	Otherwise this option does not always reflect the current syntax (the
@@ -7081,7 +7106,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 			*'winfixheight'* *'wfh'* *'nowinfixheight'* *'nowfh'*
 'winfixheight' 'wfh'	boolean	(default off)
-			local to window
+			local to window  |special-local-window-option|
 	Keep the window height when windows are opened or closed and
 	'equalalways' is set.  Also for |CTRL-W_=|.  Set by default for the
 	|preview-window| and |quickfix-window|.
@@ -7089,7 +7114,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 			*'winfixwidth'* *'wfw'* *'nowinfixwidth'* *'nowfw'*
 'winfixwidth' 'wfw'	boolean	(default off)
-			local to window
+			local to window  |special-local-window-option|
 	Keep the window width when windows are opened or closed and
 	'equalalways' is set.  Also for |CTRL-W_=|.
 	The width may be changed anyway when running out of room.
-- 
cgit 


From 21152f7905b5e2f472b1a745109f6316a7e5994d Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Thu, 17 Aug 2023 11:10:06 +0100
Subject: fix(types): add more annotations to eval.lua

---
 runtime/lua/vim/_meta/vimfn.lua | 146 ++++++++++++++++++++--------------------
 1 file changed, 73 insertions(+), 73 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 126abb29ac..255f49ba3f 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -1600,7 +1600,7 @@ function vim.fn.eventhandler() end
 --- |exepath()| can be used to get the full path of an executable.
 ---
 --- @param expr any
---- @return any
+--- @return 0|1|-1
 function vim.fn.executable(expr) end
 
 --- Execute {command} and capture its output.
@@ -8957,7 +8957,7 @@ function vim.fn.strcharpart(src, start, len, skipcc) end
 ---
 --- @param string string
 --- @param skipcc? any
---- @return any
+--- @return integer
 function vim.fn.strchars(string, skipcc) end
 
 --- The result is a Number, which is the number of display cells
@@ -8975,7 +8975,7 @@ function vim.fn.strchars(string, skipcc) end
 ---
 --- @param string string
 --- @param col? integer
---- @return any
+--- @return integer
 function vim.fn.strdisplaywidth(string, col) end
 
 --- The result is a String, which is a formatted date and time, as
@@ -8996,7 +8996,7 @@ function vim.fn.strdisplaywidth(string, col) end
 ---
 --- @param format any
 --- @param time? any
---- @return any
+--- @return string
 function vim.fn.strftime(format, time) end
 
 --- Get a Number corresponding to the character at {index} in
@@ -9007,9 +9007,9 @@ function vim.fn.strftime(format, time) end
 --- Returns -1 if {index} is invalid.
 --- Also see |strcharpart()| and |strchars()|.
 ---
---- @param str any
---- @param index any
---- @return any
+--- @param str string
+--- @param index integer
+--- @return integer
 function vim.fn.strgetchar(str, index) end
 
 --- The result is a Number, which gives the byte index in
@@ -9030,10 +9030,10 @@ function vim.fn.strgetchar(str, index) end
 --- stridx() works similar to the C function strstr().  When used
 --- with a single character it works similar to strchr().
 ---
---- @param haystack any
---- @param needle any
---- @param start? any
---- @return any
+--- @param haystack string
+--- @param needle string
+--- @param start? integer
+--- @return integer
 function vim.fn.stridx(haystack, needle, start) end
 
 --- Return {expr} converted to a String.  If {expr} is a Number,
@@ -9060,7 +9060,7 @@ function vim.fn.stridx(haystack, needle, start) end
 --- share data with other application.
 ---
 --- @param expr any
---- @return any
+--- @return string
 function vim.fn.string(expr) end
 
 --- The result is a Number, which is the length of the String
@@ -9072,7 +9072,7 @@ function vim.fn.string(expr) end
 --- Also see |len()|, |strdisplaywidth()| and |strwidth()|.
 ---
 --- @param string string
---- @return any
+--- @return integer
 function vim.fn.strlen(string) end
 
 --- The result is a String, which is part of {src}, starting from
@@ -9099,11 +9099,11 @@ function vim.fn.strlen(string) end
 --- <
 --- Returns an empty string on error.
 ---
---- @param src any
---- @param start any
---- @param len? any
---- @param chars? any
---- @return any
+--- @param src string
+--- @param start integer
+--- @param len? integer
+--- @param chars? 0|1
+--- @return string
 function vim.fn.strpart(src, start, len, chars) end
 
 --- The result is a Number, which is a unix timestamp representing
@@ -9129,9 +9129,9 @@ function vim.fn.strpart(src, start, len, chars) end
 ---   echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
 --- <  Sun Apr 27 12:53:55 1997
 ---
---- @param format any
---- @param timestring any
---- @return any
+--- @param format string
+--- @param timestring string
+--- @return integer
 function vim.fn.strptime(format, timestring) end
 
 --- The result is a Number, which gives the byte index in
@@ -9151,10 +9151,10 @@ function vim.fn.strptime(format, timestring) end
 --- When used with a single character it works similar to the C
 --- function strrchr().
 ---
---- @param haystack any
---- @param needle any
---- @param start? any
---- @return any
+--- @param haystack string
+--- @param needle string
+--- @param start? integer
+--- @return integer
 function vim.fn.strridx(haystack, needle, start) end
 
 --- The result is a String, which is {string} with all unprintable
@@ -9167,7 +9167,7 @@ function vim.fn.strridx(haystack, needle, start) end
 --- Returns an empty string on error.
 ---
 --- @param string string
---- @return any
+--- @return string
 function vim.fn.strtrans(string) end
 
 --- The result is a Number, which is the number of UTF-16 code
@@ -9189,8 +9189,8 @@ function vim.fn.strtrans(string) end
 ---     echo strutf16len('ą́', v:true)  " returns 3
 ---
 --- @param string string
---- @param countcc? any
---- @return any
+--- @param countcc? 0|1
+--- @return integer
 function vim.fn.strutf16len(string, countcc) end
 
 --- The result is a Number, which is the number of display cells
@@ -9202,7 +9202,7 @@ function vim.fn.strutf16len(string, countcc) end
 --- Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
 ---
 --- @param string string
---- @return any
+--- @return integer
 function vim.fn.strwidth(string) end
 
 --- Only for an expression in a |:substitute| command or
@@ -9233,8 +9233,8 @@ function vim.fn.strwidth(string) end
 --- A line break is included as a newline character.
 ---
 --- @param nr integer
---- @param list? any
---- @return any
+--- @param list? integer
+--- @return string|string[]
 function vim.fn.submatch(nr, list) end
 
 --- The result is a String, which is a copy of {string}, in which
@@ -9280,10 +9280,10 @@ function vim.fn.submatch(nr, list) end
 --- <Returns an empty string on error.
 ---
 --- @param string string
---- @param pat any
---- @param sub any
+--- @param pat string
+--- @param sub string
 --- @param flags string
---- @return any
+--- @return string
 function vim.fn.substitute(string, pat, sub, flags) end
 
 --- Returns a list of swap file names, like what "vim -r" shows.
@@ -9296,7 +9296,7 @@ function vim.fn.substitute(string, pat, sub, flags) end
 ---   let swapfiles = swapfilelist()
 ---   let &directory = save_dir
 ---
---- @return any
+--- @return string[]
 function vim.fn.swapfilelist() end
 
 --- The result is a dictionary, which holds information about the
@@ -9326,8 +9326,8 @@ function vim.fn.swapinfo(fname) end
 --- |:swapname| (unless there is no swap file).
 --- If buffer {buf} has no swap file, returns an empty string.
 ---
---- @param buf any
---- @return any
+--- @param buf integer|string
+--- @return string
 function vim.fn.swapname(buf) end
 
 --- The result is a Number, which is the syntax ID at the position
@@ -9357,8 +9357,8 @@ function vim.fn.swapname(buf) end
 ---
 --- @param lnum integer
 --- @param col integer
---- @param trans any
---- @return any
+--- @param trans 0|1
+--- @return integer
 function vim.fn.synID(lnum, col, trans) end
 
 --- The result is a String, which is the {what} attribute of
@@ -9406,10 +9406,10 @@ function vim.fn.synID(lnum, col, trans) end
 ---   echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 --- <
 ---
---- @param synID any
---- @param what any
+--- @param synID integer
+--- @param what string
 --- @param mode? string
---- @return any
+--- @return string
 function vim.fn.synIDattr(synID, what, mode) end
 
 --- The result is a Number, which is the translated syntax ID of
@@ -9419,8 +9419,8 @@ function vim.fn.synIDattr(synID, what, mode) end
 ---
 --- Returns zero on error.
 ---
---- @param synID any
---- @return any
+--- @param synID integer
+--- @return integer
 function vim.fn.synIDtrans(synID) end
 
 --- The result is a |List| with currently three items:
@@ -9450,7 +9450,7 @@ function vim.fn.synIDtrans(synID) end
 ---
 --- @param lnum integer
 --- @param col integer
---- @return any
+--- @return {[1]: integer, [2]: string, [3]: integer}[]
 function vim.fn.synconcealed(lnum, col) end
 
 --- Return a |List|, which is the stack of syntax items at the
@@ -9473,7 +9473,7 @@ function vim.fn.synconcealed(lnum, col) end
 ---
 --- @param lnum integer
 --- @param col integer
---- @return any
+--- @return integer[]
 function vim.fn.synstack(lnum, col) end
 
 --- Note: Prefer |vim.system()| in Lua.
@@ -9524,9 +9524,9 @@ function vim.fn.synstack(lnum, col) end
 --- <Unlike ":!cmd" there is no automatic check for changed files.
 --- Use |:checktime| to force a check.
 ---
---- @param cmd any
---- @param input? any
---- @return any
+--- @param cmd string|string[]
+--- @param input? string|string[]|integer
+--- @return string
 function vim.fn.system(cmd, input) end
 
 --- Same as |system()|, but returns a |List| with lines (parts of
@@ -9542,10 +9542,10 @@ function vim.fn.system(cmd, input) end
 --- <
 --- Returns an empty string on error.
 ---
---- @param cmd any
---- @param input? any
---- @param keepempty? any
---- @return any
+--- @param cmd string|string[]
+--- @param input? string|string[]|integer
+--- @param keepempty? integer
+--- @return string[]
 function vim.fn.systemlist(cmd, input, keepempty) end
 
 --- The result is a |List|, where each item is the number of the
@@ -9577,8 +9577,8 @@ function vim.fn.tabpagebuflist(arg) end
 ---
 --- Returns zero on error.
 ---
---- @param arg? any
---- @return any
+--- @param arg? '$'|'#'
+--- @return integer
 function vim.fn.tabpagenr(arg) end
 
 --- Like |winnr()| but for tab page {tabarg}.
@@ -9593,15 +9593,15 @@ function vim.fn.tabpagenr(arg) end
 ---     tabpagewinnr(4, '$')    " number of windows in tab page 4
 --- <When {tabarg} is invalid zero is returned.
 ---
---- @param tabarg any
---- @param arg? any
---- @return any
+--- @param tabarg integer
+--- @param arg? '$'|'#'
+--- @return integer
 function vim.fn.tabpagewinnr(tabarg, arg) end
 
 --- Returns a |List| with the file names used to search for tags
 --- for the current buffer.  This is the 'tags' option expanded.
 ---
---- @return any
+--- @return string[]
 function vim.fn.tagfiles() end
 
 --- Returns a |List| of tags matching the regular expression {expr}.
@@ -9647,7 +9647,7 @@ function vim.fn.tagfiles() end
 --- the tags file generated by the different ctags tools.
 ---
 --- @param expr any
---- @param filename? any
+--- @param filename? string
 --- @return any
 function vim.fn.taglist(expr, filename) end
 
@@ -9661,8 +9661,8 @@ function vim.fn.taglist(expr, filename) end
 ---   echo tan(-4.01)
 --- <  -1.181502
 ---
---- @param expr any
---- @return any
+--- @param expr number
+--- @return number
 function vim.fn.tan(expr) end
 
 --- Return the hyperbolic tangent of {expr} as a |Float| in the
@@ -9675,8 +9675,8 @@ function vim.fn.tan(expr) end
 ---   echo tanh(-1)
 --- <  -0.761594
 ---
---- @param expr any
---- @return any
+--- @param expr number
+--- @return number
 function vim.fn.tanh(expr) end
 
 --- Generates a (non-existent) filename located in the Nvim root
@@ -9824,10 +9824,10 @@ function vim.fn.toupper(expr) end
 ---   echo tr("<blob>", "<>", "{}")
 --- <returns "{blob}"
 ---
---- @param src any
---- @param fromstr any
---- @param tostr any
---- @return any
+--- @param src string
+--- @param fromstr string
+--- @param tostr string
+--- @return string
 function vim.fn.tr(src, fromstr, tostr) end
 
 --- Return {text} as a String where any character in {mask} is
@@ -9855,8 +9855,8 @@ function vim.fn.tr(src, fromstr, tostr) end
 --- <returns "  vim"
 ---
 --- @param text any
---- @param mask? any
---- @param dir? string
+--- @param mask? string
+--- @param dir? 0|1|2
 --- @return string
 function vim.fn.trim(text, mask, dir) end
 
@@ -9873,7 +9873,7 @@ function vim.fn.trim(text, mask, dir) end
 --- <  4.0
 ---
 --- @param expr any
---- @return any
+--- @return integer
 function vim.fn.trunc(expr) end
 
 --- The result is a Number representing the type of {expr}.
@@ -9903,7 +9903,7 @@ function vim.fn.trunc(expr) end
 ---   if exists('v:t_number') | endif
 ---
 --- @param expr any
---- @return any
+--- @return integer
 function vim.fn.type(expr) end
 
 --- Return the name of the undo file that would be used for a file
@@ -9963,7 +9963,7 @@ function vim.fn.undofile(name) end
 ---     blocks.  Each item may again have an "alt"
 ---     item.
 ---
---- @param buf? any
+--- @param buf? integer|string
 --- @return any
 function vim.fn.undotree(buf) end
 
-- 
cgit 


From 08fa71fd274530be23b6ae6b10222afee0b57522 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 23 Aug 2023 19:32:11 +0800
Subject: vim-patch:9.0.1773: cannot distinguish Forth and Fortran *.f files
 (#24841)

Problem:  cannot distinguish Forth and Fortran *.f files
Solution: Add Filetype detection Code

Also add *.4th as a Forth filetype

closes: vim/vim#12251

https://github.com/vim/vim/commit/19a3bc3addf9b4aa8150a01b11b4249c67d15d3b

Don't remove filetype files from Vim patches:
- filetype.vim, script.vim, ft.vim usually contain useful changes
- script.vim and ft.vim don't even have their paths spelled correctly

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
---
 runtime/doc/filetype.txt            |  1 +
 runtime/doc/syntax.txt              |  7 ++++---
 runtime/lua/vim/filetype.lua        |  5 +++--
 runtime/lua/vim/filetype/detect.lua | 40 ++++++++++++++++++++++++++++++++-----
 4 files changed, 43 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 9ebdc71eb2..cf60ecdb6b 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -144,6 +144,7 @@ variables can be used to overrule the filetype used for certain extensions:
 	`*.cls`		g:filetype_cls
 	`*.csh`		g:filetype_csh	|ft-csh-syntax|
 	`*.dat`		g:filetype_dat
+	`*.f`		g:filetype_f	|ft-forth-syntax|
 	`*.frm`		g:filetype_frm	|ft-form-syntax|
 	`*.fs`		g:filetype_fs	|ft-forth-syntax|
 	`*.i`		g:filetype_i	|ft-progress-syntax|
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 498c55389a..59f8235ad2 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1542,9 +1542,10 @@ example, FORM files, use this in your startup vimrc: >
 
 FORTH						*forth.vim* *ft-forth-syntax*
 
-Files matching "*.fs" could be F# or Forth.  If the automatic detection
-doesn't work for you, or you don't edit F# at all, use this in your
-startup vimrc: >
+Files matching "*.f" could be Fortran or Forth and those matching "*.fs" could
+be F# or Forth.  If the automatic detection doesn't work for you, or you don't
+edit F# or Fortran at all, use this in your startup vimrc: >
+   :let filetype_f  = "forth"
    :let filetype_fs = "forth"
 
 
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index ffb284cca7..c310eb3e42 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -398,6 +398,7 @@ local extension = {
   EXW = detect.euphoria,
   ex = detect.ex,
   exp = 'expect',
+  f = detect.f,
   factor = 'factor',
   fal = 'falcon',
   fan = 'fan',
@@ -410,8 +411,9 @@ local extension = {
   fish = 'fish',
   focexec = 'focexec',
   fex = 'focexec',
-  fth = 'forth',
   ft = 'forth',
+  fth = 'forth',
+  ['4th'] = 'forth',
   FOR = 'fortran',
   f77 = 'fortran',
   f03 = 'fortran',
@@ -427,7 +429,6 @@ local extension = {
   F77 = 'fortran',
   f95 = 'fortran',
   FPP = 'fortran',
-  f = 'fortran',
   F = 'fortran',
   F08 = 'fortran',
   f08 = 'fortran',
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 59b50f2288..4a7a1cbefe 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -473,6 +473,38 @@ function M.ex(_, bufnr)
   end
 end
 
+--- @param bufnr integer
+--- @return boolean
+local function is_forth(bufnr)
+  local first_line = nextnonblank(bufnr, 1)
+
+  -- SwiftForth block comment (line is usually filled with '-' or '=') or
+  -- OPTIONAL (sometimes precedes the header comment)
+  if first_line and findany(first_line:lower(), { '^%{%s', '^%{$', '^optional%s' }) then
+    return true
+  end
+
+  for _, line in ipairs(getlines(bufnr, 1, 100)) do
+    -- Forth comments and colon definitions
+    if line:find('^[:(\\] ') then
+      return true
+    end
+  end
+  return false
+end
+
+-- Distinguish between Forth and Fortran
+--- @type vim.filetype.mapfn
+function M.f(_, bufnr)
+  if vim.g.filetype_f then
+    return vim.g.filetype_f
+  end
+  if is_forth(bufnr) then
+    return 'forth'
+  end
+  return 'fortran'
+end
+
 -- This function checks the first 15 lines for appearance of 'FoamFile'
 -- and then 'object' in a following line.
 -- In that case, it's probably an OpenFOAM file
@@ -518,16 +550,14 @@ function M.fvwm_v2(path, _)
   end
 end
 
--- Distinguish between Forth and F#.
+-- Distinguish between Forth and F#
 --- @type vim.filetype.mapfn
 function M.fs(_, bufnr)
   if vim.g.filetype_fs then
     return vim.g.filetype_fs
   end
-  for _, line in ipairs(getlines(bufnr, 1, 100)) do
-    if line:find('^[:(\\] ') then
-      return 'forth'
-    end
+  if is_forth(bufnr) then
+    return 'forth'
   end
   return 'fsharp'
 end
-- 
cgit 


From dc45fb4655f5ce56c0bbcb179ef1c38149491d9f Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 23 Aug 2023 11:22:10 +0100
Subject: fix(editorconfig): only warn once on errors

---
 runtime/lua/editorconfig.lua | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/editorconfig.lua b/runtime/lua/editorconfig.lua
index 7311cccbe7..48faa54d97 100644
--- a/runtime/lua/editorconfig.lua
+++ b/runtime/lua/editorconfig.lua
@@ -1,5 +1,6 @@
 local M = {}
 
+--- @type table<string,fun(bufnr: integer, val: string, opts?: table)>
 M.properties = {}
 
 --- Modified version of the builtin assert that does not include error position information
@@ -19,7 +20,7 @@ end
 ---
 ---@private
 local function warn(msg, ...)
-  vim.notify(string.format(msg, ...), vim.log.levels.WARN, {
+  vim.notify_once(string.format(msg, ...), vim.log.levels.WARN, {
     title = 'editorconfig',
   })
 end
@@ -168,12 +169,12 @@ end
 ---
 ---@param filepath string File path of the file to apply EditorConfig settings to
 ---@param dir string Current directory
----@return table Table of options to apply to the given file
+---@return table<string,string|boolean> Table of options to apply to the given file
 ---
 ---@private
 local function parse(filepath, dir)
-  local pat = nil
-  local opts = {}
+  local pat --- @type vim.regex?
+  local opts = {} --- @type table<string,string|boolean>
   local f = io.open(dir .. '/.editorconfig')
   if f then
     for line in f:lines() do
@@ -217,7 +218,7 @@ function M.config(bufnr)
     return
   end
 
-  local opts = {}
+  local opts = {} --- @type table<string,string|boolean>
   for parent in vim.fs.parents(path) do
     for k, v in pairs(parse(path, parent)) do
       if opts[k] == nil then
@@ -230,7 +231,7 @@ function M.config(bufnr)
     end
   end
 
-  local applied = {}
+  local applied = {} --- @type table<string,string|boolean>
   for opt, val in pairs(opts) do
     if val ~= 'unset' then
       local func = M.properties[opt]
-- 
cgit 


From a5565499c8ff49a13ea9aee3ccda62a9e19af97e Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Sun, 13 Aug 2023 17:00:03 +0100
Subject: vim-patch:1688938dd5ac

runtime: Add a few more remarks about Bram and new runtime files

https://github.com/vim/vim/commit/1688938dd5ac78ab67e54299b9d5b93499dba762

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/indent/README.txt | 2 +-
 runtime/syntax/README.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/indent/README.txt b/runtime/indent/README.txt
index 8628ecccb7..5f56d56690 100644
--- a/runtime/indent/README.txt
+++ b/runtime/indent/README.txt
@@ -14,7 +14,7 @@ If you have remarks about an existing file, send them to the maintainer of
 that file.  Only when you get no response send a message to Bram@vim.org.
 
 If you are the maintainer of an indent file and make improvements, e-mail the
-new version to Bram@vim.org.
+new version to the vim-dev mailing list: <vim-dev@vim.org>.
 
 
 Rules for making an indent file:
diff --git a/runtime/syntax/README.txt b/runtime/syntax/README.txt
index 8eee0ea20a..756ae41587 100644
--- a/runtime/syntax/README.txt
+++ b/runtime/syntax/README.txt
@@ -34,9 +34,10 @@ checking a few lines in the file. And please write the file in a portable way,
 see ":help 44.12".
 
 If you have remarks about an existing file, send them to the maintainer of
-that file.  Only when you get no response send a message to Bram@vim.org.
+that file.  Only when you get no response send a message to the vim-dev
+mailing list: <vim-dev@vim.org>.
 
 If you are the maintainer of a syntax file and make improvements, send the new
-version to Bram@vim.org.
+version to the vim-dev mailing list: <vim-dev@vim.org>
 
 For further info see ":help syntax" in Vim.
-- 
cgit 


From 947e6d9346352096e04a419f603361d250a51149 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Sun, 13 Aug 2023 17:38:34 +0100
Subject: vim-patch:96d6c4aabed1

runtime: Remove Brams email in indent/README.txt

https://github.com/vim/vim/commit/96d6c4aabed15266bc4acfa66f9b35c2820dfa59

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/indent/README.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/indent/README.txt b/runtime/indent/README.txt
index 5f56d56690..05ab126c8c 100644
--- a/runtime/indent/README.txt
+++ b/runtime/indent/README.txt
@@ -11,7 +11,8 @@ detecting the file type for this language, by file name extension or by
 checking a few lines in the file. And please stick to the rules below.
 
 If you have remarks about an existing file, send them to the maintainer of
-that file.  Only when you get no response send a message to Bram@vim.org.
+that file.  Only when you get no response send a message to the vim-dev
+mailing list: <vim-dev@vim.org>.
 
 If you are the maintainer of an indent file and make improvements, e-mail the
 new version to the vim-dev mailing list: <vim-dev@vim.org>.
-- 
cgit 


From 23cc36bd99a4e16a0d9d24c7fca62554211a5b1d Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Wed, 23 Aug 2023 20:31:48 +0100
Subject: vim-patch:e8d6f03f6a61

runtime: Remove Brams name from a few more runtime files (vim/vim#12780)

syntax/model.vim: minor wording improvement

https://github.com/vim/vim/commit/e8d6f03f6a61f60de6893253621d057f63dd6a23

Use the updated "Last Change" date for all.

Co-authored-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Adri Verhoef <a3@a3.xs4all.nl>
---
 runtime/ftplugin/bash.vim                  | 4 ++--
 runtime/indent/bash.vim                    | 4 ++--
 runtime/indent/html.vim                    | 4 ++--
 runtime/indent/mail.vim                    | 4 ++--
 runtime/keymap/accents.vim                 | 4 ++--
 runtime/macros/editexisting.vim            | 4 ++--
 runtime/syntax/bash.vim                    | 4 ++--
 runtime/syntax/model.vim                   | 2 +-
 runtime/syntax/shared/typescriptcommon.vim | 6 +++---
 runtime/syntax/typescript.vim              | 6 +++---
 runtime/syntax/typescriptreact.vim         | 6 +++---
 runtime/syntax/zimbu.vim                   | 5 +++--
 12 files changed, 27 insertions(+), 26 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/bash.vim b/runtime/ftplugin/bash.vim
index 7bd9787b6c..7be1eca2a9 100644
--- a/runtime/ftplugin/bash.vim
+++ b/runtime/ftplugin/bash.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	bash
-" Maintainer:	Bram Moolenaar
-" Last Changed: 2019 Jan 12
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Changed: 2023 Aug 13
 "
 " This is not a real filetype plugin.  It allows for someone to set 'filetype'
 " to "bash" in the modeline, and gets the effect of filetype "sh" with
diff --git a/runtime/indent/bash.vim b/runtime/indent/bash.vim
index b91640687c..407081232c 100644
--- a/runtime/indent/bash.vim
+++ b/runtime/indent/bash.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	bash
-" Maintainer:	Bram
-" Last Change:	2019 Sep 27
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 13
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim
index 65e0ffc40c..2fa10cc91e 100644
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -1,7 +1,7 @@
 " Vim indent script for HTML
-" Maintainer:	Bram Moolenaar
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2022 Jan 31
+" Last Change:	2023 Aug 13
 " Version:	1.0 "{{{
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
diff --git a/runtime/indent/mail.vim b/runtime/indent/mail.vim
index 22bb0f7e12..eec9b4e43d 100644
--- a/runtime/indent/mail.vim
+++ b/runtime/indent/mail.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Mail
-" Maintainer:	Bram Moolenaar
-" Last Change:	2021 Sep 26
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 13
 
 if exists("b:did_indent")
   finish
diff --git a/runtime/keymap/accents.vim b/runtime/keymap/accents.vim
index fed94c5656..a97a280881 100644
--- a/runtime/keymap/accents.vim
+++ b/runtime/keymap/accents.vim
@@ -1,6 +1,6 @@
 " Vim Keymap file for latin1 accents through dead characters
-" Maintainer: Bram Moolenaar
-" Last Change: 2006 Mar 29
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 13
 
 " All characters are given literally, conversion to another encoding (e.g.,
 " UTF-8) should work.
diff --git a/runtime/macros/editexisting.vim b/runtime/macros/editexisting.vim
index 3530e29dc4..b21777d861 100644
--- a/runtime/macros/editexisting.vim
+++ b/runtime/macros/editexisting.vim
@@ -1,6 +1,6 @@
 " Vim Plugin:	Edit the file with an existing Vim if possible
-" Maintainer:	Bram Moolenaar
-" Last Change:	2014 Dec 06
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 13
 
 " This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32)
 " $VIM/vimfiles/plugin directory.  Or make a symbolic link, so that you
diff --git a/runtime/syntax/bash.vim b/runtime/syntax/bash.vim
index 75ab99938e..1e565c3022 100644
--- a/runtime/syntax/bash.vim
+++ b/runtime/syntax/bash.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	bash
-" Maintainer:	Bram
-" Last Change:	2019 Sep 27
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 13
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/model.vim b/runtime/syntax/model.vim
index ea661eb5b5..2df380c629 100644
--- a/runtime/syntax/model.vim
+++ b/runtime/syntax/model.vim
@@ -5,7 +5,7 @@
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " very basic things only (based on the vgrindefs file).
-" If you use this language, please improve it, and send me the patches!
+" If you use this language, please improve it, and send patches!
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/runtime/syntax/shared/typescriptcommon.vim b/runtime/syntax/shared/typescriptcommon.vim
index ef362fc721..cfa4e1433b 100644
--- a/runtime/syntax/shared/typescriptcommon.vim
+++ b/runtime/syntax/shared/typescriptcommon.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:     TypeScript and TypeScriptReact
-" Maintainer:   Bram Moolenaar, Herrington Darkholme
-" Last Change:	2021 Sep 22
+" Maintainer:   Herrington Darkholme
+" Last Change:	2023 Aug 13
 " Based On:     Herrington Darkholme's yats.vim
-" Changes:      See https:github.com/HerringtonDarkholme/yats.vim
+" Changes:      See https://github.com/HerringtonDarkholme/yats.vim
 " Credits:      See yats.vim on github
 
 if &cpo =~ 'C'
diff --git a/runtime/syntax/typescript.vim b/runtime/syntax/typescript.vim
index af71938a8e..5389c21497 100644
--- a/runtime/syntax/typescript.vim
+++ b/runtime/syntax/typescript.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:     TypeScript
-" Maintainer:   Bram Moolenaar, Herrington Darkholme
-" Last Change:	2019 Nov 30
+" Maintainer:   Herrington Darkholme
+" Last Change:  2023 Aug 13
 " Based On:     Herrington Darkholme's yats.vim
-" Changes:      Go to https:github.com/HerringtonDarkholme/yats.vim for recent changes.
+" Changes:      Go to https://github.com/HerringtonDarkholme/yats.vim for recent changes.
 " Origin:       https://github.com/othree/yajs
 " Credits:      Kao Wei-Ko(othree), Jose Elera Campana, Zhao Yi, Claudio Fleiner, Scott Shattuck
 "               (This file is based on their hard work), gumnos (From the #vim
diff --git a/runtime/syntax/typescriptreact.vim b/runtime/syntax/typescriptreact.vim
index c4c2d45745..1c510459f5 100644
--- a/runtime/syntax/typescriptreact.vim
+++ b/runtime/syntax/typescriptreact.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:     TypeScript with React (JSX)
-" Maintainer:   Bram Moolenaar
-" Last Change:	2019 Nov 30
+" Maintainer:   The Vim Project <https://github.com/vim/vim>
+" Last Change:  2023 Aug 13
 " Based On:     Herrington Darkholme's yats.vim
-" Changes:      See https:github.com/HerringtonDarkholme/yats.vim
+" Changes:      See https://github.com/HerringtonDarkholme/yats.vim
 " Credits:      See yats.vim on github
 
 if !exists("main_syntax")
diff --git a/runtime/syntax/zimbu.vim b/runtime/syntax/zimbu.vim
index 1a7a485e6f..472559520e 100644
--- a/runtime/syntax/zimbu.vim
+++ b/runtime/syntax/zimbu.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
 " Language:	Zimbu
-" Maintainer:	Bram Moolenaar
-" Last Change:	2014 Nov 23
+" Maintainer:	The·Vim·Project·<https://github.com/vim/vim>
+" Last Change:	2023 Aug 13
+" Note: 	Zimbu seems to be dead :(
 
 if exists("b:current_syntax")
   finish
-- 
cgit 


From c6ec7fa8d741d6301701067ecd095bf02e7a741a Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Tue, 22 Aug 2023 00:51:38 -0400
Subject: feat(treesitter): add 'injection.self' and 'injection.parent'

Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
---
 runtime/doc/news.txt                        |  2 ++
 runtime/doc/treesitter.txt                  |  4 ++++
 runtime/lua/vim/treesitter/languagetree.lua | 11 ++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 483e829770..82b390853c 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -131,6 +131,8 @@ The following new APIs and features were added.
   • `@injection.language` now has smarter resolution and will now fallback to language aliases and/or attempt lower case variants of the text.
     language via aliases (e.g., filetype) registered via
     `vim.treesitter.language.register`.
+  • The `#set!` directive now supports `injection.self` and `injection.parent` for injecting either the current node's language
+    or the parent LanguageTree's language, respectively.
 
 • |vim.ui.open()| opens URIs using the system default handler (macOS `open`,
   Windows `explorer`, Linux `xdg-open`, etc.)
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index f3e697807f..139b986786 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -523,6 +523,10 @@ associated with patterns:
     node's entire text should be re-parsed, including the text of its child
     nodes. By default, child nodes' text will be excluded from the injected
     document.
+    • `injection.self` - indicates that the node's text should be parsed with
+      the same language as the node's LanguageTree.
+    • `injection.parent` - indicates that the captured node’s text should
+      be parsed with the same language as the node's parent LanguageTree.
 
 ==============================================================================
 VIM.TREESITTER                                                *lua-treesitter*
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 4b419c4744..e81778b269 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -82,6 +82,7 @@ local TSCallbackNames = {
 ---List of regions this tree should manage and parse. If nil then regions are
 ---taken from _trees. This is mostly a short-lived cache for included_regions()
 ---@field private _lang string Language name
+---@field private _parent_lang? string Parent language name
 ---@field private _source (integer|string) Buffer or string to parse
 ---@field private _trees TSTree[] Reference to parsed tree (one for each language)
 ---@field private _valid boolean|table<integer,boolean> If the parsed tree is valid
@@ -105,8 +106,9 @@ LanguageTree.__index = LanguageTree
 ---@param opts (table|nil) Optional arguments:
 ---             - injections table Map of language to injection query strings. Overrides the
 ---                                built-in runtime file searching for language injections.
+---@param parent_lang? string Parent language name of this tree
 ---@return LanguageTree parser object
-function LanguageTree.new(source, lang, opts)
+function LanguageTree.new(source, lang, opts, parent_lang)
   language.add(lang)
   ---@type LanguageTreeOpts
   opts = opts or {}
@@ -121,6 +123,7 @@ function LanguageTree.new(source, lang, opts)
   local self = {
     _source = source,
     _lang = lang,
+    _parent_lang = parent_lang,
     _children = {},
     _trees = {},
     _opts = opts,
@@ -489,7 +492,7 @@ function LanguageTree:add_child(lang)
     self:remove_child(lang)
   end
 
-  local child = LanguageTree.new(self._source, lang, self._opts)
+  local child = LanguageTree.new(self._source, lang, self._opts, self:lang())
 
   -- Inherit recursive callbacks
   for nm, cb in pairs(self._callbacks_rec) do
@@ -752,7 +755,9 @@ end
 function LanguageTree:_get_injection(match, metadata)
   local ranges = {} ---@type Range6[]
   local combined = metadata['injection.combined'] ~= nil
-  local lang = metadata['injection.language'] --[[@as string?]]
+  local lang = metadata['injection.self'] ~= nil and self:lang()
+    or metadata['injection.parent'] ~= nil and self._parent_lang
+    or metadata['injection.language'] --[[@as string?]]
   local include_children = metadata['injection.include-children'] ~= nil
 
   for id, node in pairs(match) do
-- 
cgit 


From 810428c4d5162c8971151a37421d4ae0586e321e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 23 Aug 2023 10:09:08 +0900
Subject: vim-patch:c6d533b0ad56

runtime(gp): update gp.vim syntax file for the GP language (version 2.15) (vim/vim#12884)

- add missing defaults
- add missing control structures (incl. parallelism)
- add missing scope declarations
- whitespace edits (remove extra tabs)

https://github.com/vim/vim/commit/c6d533b0ad565a610a48386b0ad72cc591010fcb

Co-authored-by: Karim Belabas <Karim.belabas@math.u-bordeaux.fr>
---
 runtime/syntax/gp.vim | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/gp.vim b/runtime/syntax/gp.vim
index aecf7df48b..89f2d3f0ff 100644
--- a/runtime/syntax/gp.vim
+++ b/runtime/syntax/gp.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
-" Language:	gp (version 2.5)
+" Language:	gp (version 2.15)
 " Maintainer:	Karim Belabas <Karim.Belabas@math.u-bordeaux.fr>
-" Last change:	2012 Jan 08
+" Last change:	2023 Aug 22
 " URL:		http://pari.math.u-bordeaux.fr
 
 " quit when a syntax file was already loaded
@@ -14,23 +14,29 @@ set cpo&vim
 
 " control statements
 syntax keyword gpStatement	break return next
-syntax keyword gpConditional	if
-syntax keyword gpRepeat		until while for fordiv forell forprime 
-syntax keyword gpRepeat		forsubgroup forstep forvec
+syntax keyword gpConditional	if iferr
+syntax keyword gpRepeat		until while for forcomposite fordiv
+syntax keyword gpRepeat		fordivfactored foreach forell forfactored
+syntax keyword gpRepeat		forpart forperm forprime forprimestep forqfvec
+syntax keyword gpRepeat		forsquarefree forstep forsubgroup forsubset
+syntax keyword gpRepeat		forvec
+syntax keyword gpRepeat		parfor parforeach parforprime parforprimestep
+syntax keyword gpRepeat		parforvec
 " storage class
-syntax keyword gpScope		my local global
+syntax keyword gpScope		my local global export exportall
 " defaults
 syntax keyword gpInterfaceKey	breakloop colors compatible
-syntax keyword gpInterfaceKey	datadir debug debugfiles debugmem 
-syntax keyword gpInterfaceKey	echo factor_add_primes factor_proven format 
+syntax keyword gpInterfaceKey	datadir debug debugfiles debugmem
+syntax keyword gpInterfaceKey	echo factor_add_primes factor_proven format
 syntax keyword gpInterfaceKey	graphcolormap graphcolors
-syntax keyword gpInterfaceKey	help histfile histsize 
-syntax keyword gpInterfaceKey	lines linewrap log logfile new_galois_format
-syntax keyword gpInterfaceKey	output parisize path prettyprinter primelimit
-syntax keyword gpInterfaceKey	prompt prompt_cont psfile 
-syntax keyword gpInterfaceKey	readline realprecision recover 
-syntax keyword gpInterfaceKey	secure seriesprecision simplify strictmatch
-syntax keyword gpInterfaceKey	TeXstyle timer
+syntax keyword gpInterfaceKey	help histfile histsize
+syntax keyword gpInterfaceKey	lines linewrap log logfile nbthreads
+syntax keyword gpInterfaceKey	new_galois_format output parisize parisizemax
+syntax keyword gpInterfaceKey	path plothsizes prettyprinter primelimit prompt
+syntax keyword gpInterfaceKey	prompt_cont psfile readline realbitprecision
+syntax keyword gpInterfaceKey	realprecision recover secure seriesprecision
+syntax keyword gpInterfaceKey	simplify sopath strictmatch TeXstyle
+syntax keyword gpInterfaceKey	threadsize threadsizemax timer
 
 syntax match gpInterface	"^\s*\\[a-z].*"
 syntax keyword gpInterface	default
@@ -58,24 +64,23 @@ syntax region gpParen		transparent start='(' end=')' contains=ALLBUT,gpParenErro
 syntax match gpParenError	")"
 syntax match gpInParen contained "[{}]"
 
-
-hi def link gpConditional		Conditional
+hi def link gpConditional	Conditional
 hi def link gpRepeat		Repeat
 hi def link gpError		Error
-hi def link gpParenError		gpError
+hi def link gpParenError	gpError
 hi def link gpInParen		gpError
 hi def link gpStatement		Statement
 hi def link gpString		String
 hi def link gpComment		Comment
 hi def link gpInterface		Type
 hi def link gpInput		Type
-hi def link gpInterfaceKey		Statement
+hi def link gpInterfaceKey	Statement
 hi def link gpFunction		Function
 hi def link gpScope		Type
 " contained ones
 hi def link gpSpecial		Special
-hi def link gpTodo			Todo
-hi def link gpArgs			Type
+hi def link gpTodo		Todo
+hi def link gpArgs		Type
 
 let b:current_syntax = "gp"
 let &cpo = s:cpo_save
-- 
cgit 


From 0b7e1730bcd4c6ec1b55d541bc612445a4ff0c65 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 23 Aug 2023 10:09:32 +0900
Subject: vim-patch:e34b51e95fd0

runtime(solidity): add new ftplugin (vim/vim#12877)

Set undo_{ftplugin,indent}

closes vim/vim#11240

https://github.com/vim/vim/commit/e34b51e95fd0ea7b0e34a625db0f9ed7e051e0dd

Co-authored-by: dkearns <dougkearns@gmail.com>
Co-authored-by: cothi <jiungdev@gmail.com>
---
 runtime/ftplugin/solidity.vim | 15 +++++++++++++++
 runtime/indent/solidity.vim   | 14 +++++++++-----
 runtime/syntax/solidity.vim   | 10 +++++-----
 3 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 runtime/ftplugin/solidity.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/solidity.vim b/runtime/ftplugin/solidity.vim
new file mode 100644
index 0000000000..abe9f2ff26
--- /dev/null
+++ b/runtime/ftplugin/solidity.vim
@@ -0,0 +1,15 @@
+" Vim filetype plugin file
+" Language:		Solidity
+" Maintainer:		Cothi (jiungdev@gmail.com)
+" Original Author:	tomlion (https://github.com/tomlion/vim-solidity)
+" Last Change:		2022 Sep 27
+" 			2023 Aug 22 Vim Project (did_ftplugin, undo_ftplugin)
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = "setlocal commentstring<"
diff --git a/runtime/indent/solidity.vim b/runtime/indent/solidity.vim
index caed726c0a..55a07c015a 100644
--- a/runtime/indent/solidity.vim
+++ b/runtime/indent/solidity.vim
@@ -1,9 +1,11 @@
 " Vim indent file
-" Language: 		Solidity
-" Acknowledgement: 	Based off of vim-javascript
-" Maintainer: 		Cothi (jiungdev@gmail.com)
-" Original Author: 	tomlion (https://github.com/tomlion/vim-solidity)
-" Last Changed: 	2022 Sep 27
+" Language:		Solidity
+" Maintainer:		Cothi (jiungdev@gmail.com)
+" Original Author:	tomlion (https://github.com/tomlion/vim-solidity)
+" Last Change:		2022 Sep 27
+" 			2023 Aug 22 Vim Project (undo_indent)
+"
+" Acknowledgement: Based off of vim-javascript
 "
 " 0. Initialization {{{1
 " =================
@@ -20,6 +22,8 @@ setlocal nosmartindent
 setlocal indentexpr=GetSolidityIndent()
 setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
 
+let b:undo_indent = "setlocal indentexpr< indentkeys< smartindent<"
+
 " Only define the function once.
 if exists("*GetSolidityIndent")
   finish
diff --git a/runtime/syntax/solidity.vim b/runtime/syntax/solidity.vim
index e552446e10..a46d041a10 100644
--- a/runtime/syntax/solidity.vim
+++ b/runtime/syntax/solidity.vim
@@ -1,10 +1,10 @@
 " Vim syntax file
-" Language: 		Solidity
-" Maintainer: 		Cothi (jiungdev@gmail.com)
-" Original Author: 	tomlion (https://github.com/tomlion/vim-solidity/blob/master/syntax/solidity.vim)
-" Last Changed: 	2022 Sep 27
+" Language:		Solidity
+" Maintainer:		Cothi (jiungdev@gmail.com)
+" Original Author:	tomlion (https://github.com/tomlion/vim-solidity/blob/master/syntax/solidity.vim)
+" Last Change:		2022 Sep 27
 "
-" Additional contributors:
+" Contributors:
 "       Modified by thesis (https://github.com/thesis/vim-solidity/blob/main/indent/solidity.vim)
 
 if exists("b:current_syntax")
-- 
cgit 


From 4ca8b90b14b653e30db91d745f8145eab6a9e6f1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 23 Aug 2023 10:10:07 +0900
Subject: vim-patch:b0d584d97ab6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(go): Update Go syntax file with 1.21 builtins (vim/vim#12876)

* Update Go syntax file with 1.21 builtins

https://github.com/vim/vim/commit/b0d584d97ab6f5cb070caba3882ba387b81448c1

Co-authored-by: José-Paul D <fixed.combinator@gmail.com>
---
 runtime/syntax/go.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/go.vim b/runtime/syntax/go.vim
index bf967fdcd9..4272e807f3 100644
--- a/runtime/syntax/go.vim
+++ b/runtime/syntax/go.vim
@@ -5,7 +5,7 @@
 " go.vim: Vim syntax file for Go.
 " Language:             Go
 " Maintainer:           Billie Cleek <bhcleek@gmail.com>
-" Latest Revision:      2023-02-19
+" Latest Revision:      2023-08-21
 " License:              BSD-style. See LICENSE file in source repository.
 " Repository:           https://github.com/fatih/vim-go
 
@@ -130,8 +130,8 @@ hi def link     goFloats            Type
 hi def link     goComplexes         Type
 
 " Predefined functions and values
-syn keyword     goBuiltins                 append cap close complex copy delete imag len
-syn keyword     goBuiltins                 make new panic print println real recover
+syn keyword     goBuiltins                 append cap clear close complex copy delete imag len
+syn keyword     goBuiltins                 make max min new panic print println real recover
 syn keyword     goBoolean                  true false
 syn keyword     goPredefinedIdentifiers    nil iota
 
-- 
cgit 


From 9ab5fda99eb5a0862e8a213359b17654e99de554 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 23 Aug 2023 10:10:25 +0900
Subject: vim-patch:cdd934439d08

runtime(crontab): add support for BSD specifics in syntax script (vim/vim#11196)

* OpenBSD supports the use of `~` as alias for "random valid value"
* FreeBSD supports `@every_{minute,second}`

See:

* https://man.openbsd.org/crontab.5
* https://www.freebsd.org/cgi/man.cgi?query=crontab&sektion=5

https://github.com/vim/vim/commit/cdd934439d08768235be04817ee214f067e8cf56

Co-authored-by: Moviuro <moviuro@users.noreply.github.com>
---
 runtime/syntax/crontab.vim | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/crontab.vim b/runtime/syntax/crontab.vim
index 5e38ffaafe..12daa9b7b8 100644
--- a/runtime/syntax/crontab.vim
+++ b/runtime/syntax/crontab.vim
@@ -5,7 +5,7 @@
 " License: This file can be redistribued and/or modified under the same terms
 "   as Vim itself.
 " Filenames: /tmp/crontab.* used by "crontab -e"
-" Last Change: 2015-01-20
+" Last Change: 2022-09-22
 "
 " crontab line format:
 " Minutes   Hours   Days   Months   Days_of_Week   Commands # comments
@@ -15,20 +15,20 @@ if exists("b:current_syntax")
 	finish
 endif
 
-syntax match crontabNick "^\s*@\(reboot\|yearly\|annually\|monthly\|weekly\|daily\|midnight\|hourly\)\>" nextgroup=crontabCmd skipwhite
+syntax match crontabNick "^\s*@\(reboot\|yearly\|annually\|monthly\|weekly\|daily\|midnight\|hourly\|every_minute\|every_second\)\>" nextgroup=crontabCmd skipwhite
 
 syntax match crontabVar "^\s*\k\w*\s*="me=e-1
 
 syntax case ignore
 
-syntax match crontabMin "^\s*[-0-9/,.*]\+" nextgroup=crontabHr skipwhite
-syntax match crontabHr "\s[-0-9/,.*]\+" nextgroup=crontabDay skipwhite contained
-syntax match crontabDay "\s[-0-9/,.*]\+" nextgroup=crontabMnth skipwhite contained
+syntax match crontabMin "^\s*[-~0-9/,.*]\+" nextgroup=crontabHr skipwhite
+syntax match crontabHr "\s[-~0-9/,.*]\+" nextgroup=crontabDay skipwhite contained
+syntax match crontabDay "\s[-~0-9/,.*]\+" nextgroup=crontabMnth skipwhite contained
 
-syntax match crontabMnth "\s[-a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite contained
+syntax match crontabMnth "\s[-~a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite contained
 syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep oct nov dec
 
-syntax match crontabDow "\s[-a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite contained
+syntax match crontabDow "\s[-~a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite contained
 syntax keyword crontabDow7 contained sun mon tue wed thu fri sat
 
 syntax region crontabCmd start="\S" end="$" skipwhite contained keepend contains=crontabPercent
-- 
cgit 


From 660f9e6857891b24a8358887be2d9373a7188713 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 23 Aug 2023 10:10:48 +0900
Subject: vim-patch:118f8e9da39e

runtime(cmake) Recognize add_compile_definitions in syntax script (vim/vim#10416)

https://github.com/vim/vim/commit/118f8e9da39e6cec5ffe644d5b87a7772418ed0c

Co-authored-by: MichaWiedenmann <mw-r1@gmx.de>
---
 runtime/syntax/cmake.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
index f7616e4c6d..7340ac238e 100644
--- a/runtime/syntax/cmake.vim
+++ b/runtime/syntax/cmake.vim
@@ -335,7 +335,7 @@ syn keyword cmakeGeneratorExpressions contained
 syn case ignore
 
 syn keyword cmakeCommand
-            \ add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_subdirectory add_test aux_source_directory break build_command cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue create_test_sourcelist ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload define_property enable_language enable_testing endfunction endmacro execute_process export file find_file find_library find_package find_path find_program fltk_wrap_ui function get_cmake_property get_directory_property get_filename_component get_property get_source_file_property get_target_property get_test_property include include_directories include_external_msproject include_guard include_regular_expression install link_directories list load_cache load_command macro mark_as_advanced math message option project qt_wrap_cpp qt_wrap_ui remove_definitions return separate_arguments set set_directory_properties set_property set_source_files_properties set_target_properties set_tests_properties site_name source_group string target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_libraries target_sources try_compile try_run unset variable_watch
+            \ add_compile_options add_compile_definitions add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_subdirectory add_test aux_source_directory break build_command cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue create_test_sourcelist ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload define_property enable_language enable_testing endfunction endmacro execute_process export file find_file find_library find_package find_path find_program fltk_wrap_ui function get_cmake_property get_directory_property get_filename_component get_property get_source_file_property get_target_property get_test_property include include_directories include_external_msproject include_guard include_regular_expression install link_directories list load_cache load_command macro mark_as_advanced math message option project qt_wrap_cpp qt_wrap_ui remove_definitions return separate_arguments set set_directory_properties set_property set_source_files_properties set_target_properties set_tests_properties site_name source_group string target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_libraries target_sources try_compile try_run unset variable_watch
             \ nextgroup=cmakeArguments
 
 syn keyword cmakeCommandConditional
-- 
cgit 


From 1c709f5a61f4a691562597004371174dd9957d9f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 23 Aug 2023 11:21:22 +0900
Subject: vim-patch:6e93689bde73

runtime(bindzone): updated syntax file

- Add support for APL type in runtime/syntax/bindzone.vim
- all values between 0- 4294967295 are valid serials

closes: vim/vim#9743
closes: vim/vim#8382

https://github.com/vim/vim/commit/6e93689bde7321ce974ae99ec6c74efb08d78842

vim-patch:544b209a2d4b

runtime(scala): Link Scala highlighting groups using 'hi def link' in syntax script (vim/vim#9594)

They were linked using 'hi link' which made it impossible for color
schemes to override highlight groups.

https://github.com/vim/vim/commit/544b209a2d4b10e0a4874c925036def30d33d708

Co-authored-by: Oskar Stenman <oskar@cetex.se>
Co-authored-by: Job Noorman <job@noorman.info>
---
 runtime/syntax/bindzone.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/bindzone.vim b/runtime/syntax/bindzone.vim
index fede3d97d5..dce9974903 100644
--- a/runtime/syntax/bindzone.vim
+++ b/runtime/syntax/bindzone.vim
@@ -33,7 +33,7 @@ syn match       zoneDomain      contained  /[^[:space:]!"#$%&'()*+,\/:;<=>?@[\]\
 syn match       zoneSpecial     contained /^[@*.]\s/
 syn match       zoneTTL         contained /\s\@<=\d[0-9WwDdHhMmSs]*\(\s\|$\)\@=/ nextgroup=zoneClass,zoneRRType skipwhite
 syn keyword     zoneClass       contained IN CHAOS CH HS HESIOD nextgroup=zoneRRType,zoneTTL skipwhite
-syn keyword     zoneRRType      contained A AAAA CAA CERT CNAME DNAME DNSKEY DS HINFO LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM OPENPGPKEY PTR RP RRSIG SMIMEA SOA SPF SRV SSHFP TLSA TXT nextgroup=zoneRData skipwhite
+syn keyword     zoneRRType      contained A AAAA APL CAA CERT CNAME DNAME DNSKEY DS HINFO LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM OPENPGPKEY PTR RP RRSIG SMIMEA SOA SPF SRV SSHFP TLSA TXT nextgroup=zoneRData skipwhite
 syn match       zoneRData       contained /[^;]*/ contains=zoneDomain,zoneIPAddr,zoneIP6Addr,zoneText,zoneNumber,zoneParen,zoneUnknown
 
 syn match       zoneIPAddr      contained /\<[0-9]\{1,3}\(\.[0-9]\{1,3}\)\{,3}\>/
@@ -60,7 +60,7 @@ syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{1,7}:\(\s\|;\|$\)\@=
 
 syn match       zoneText        contained /"\([^"\\]\|\\.\)*"\(\s\|;\|$\)\@=/
 syn match       zoneNumber      contained /\<[0-9]\+\(\s\|;\|$\)\@=/
-syn match       zoneSerial      contained /\<[0-9]\{9,10}\(\s\|;\|$\)\@=/
+syn match       zoneSerial      contained /\<[0-9]\{1,10}\(\s\|;\|$\)\@=/
 
 syn match       zoneErrParen    /)/
 syn region      zoneParen       contained start="(" end=")" contains=zoneSerial,zoneTTL,zoneNumber,zoneComment
-- 
cgit 


From 1c961a9d620f8e5efa324f0b35f42c06cba8b262 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 24 Aug 2023 09:07:18 +0900
Subject: vim-patch:e059fae10044

runtime(menu): define shortcut for File->Open Tab (vim/vim#12895)

Seems missing as noted by Antonio Giovanni Colombo. So add it and use
the 'T' as shortcut, which does not seem to be used in the File dialog.

Verified on Windows.

https://github.com/vim/vim/commit/e059fae100448fee4b581dd5d90ee853ea18de7e

Co-authored-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Antonio Giovanni Colombo <azc100@gmail.com>
---
 runtime/menu.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/menu.vim b/runtime/menu.vim
index 20a2611aa5..4576ca0ab7 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -122,7 +122,7 @@ endfun
 " File menu
 an 10.310 &File.&Open\.\.\.<Tab>:e		:browse confirm e<CR>
 an 10.320 &File.Sp&lit-Open\.\.\.<Tab>:sp	:browse sp<CR>
-an 10.320 &File.Open\ Tab\.\.\.<Tab>:tabnew	:browse tabnew<CR>
+an 10.320 &File.Open\ &Tab\.\.\.<Tab>:tabnew	:browse tabnew<CR>
 an 10.325 &File.&New<Tab>:enew			:confirm enew<CR>
 an <silent> 10.330 &File.&Close<Tab>:close
 	\ :if winheight(2) < 0 && tabpagewinnr(2) == 0 <Bar>
-- 
cgit 


From 327e3fab9e66701334a55dd7893283acb85899a2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 24 Aug 2023 09:07:35 +0900
Subject: vim-patch:3fc7a7e44abd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime: Fix typos in various files

closes: vim/vim#12836

https://github.com/vim/vim/commit/3fc7a7e44abda6505ccd39a6d067db6e5173cbf6

Co-authored-by: Viktor Szépe <viktor@szepe.net>
---
 runtime/ftplugin/debchangelog.vim |  2 +-
 runtime/ftplugin/readline.vim     |  2 +-
 runtime/ftplugin/rst.vim          |  2 +-
 runtime/ftplugin/sql.vim          |  4 ++--
 runtime/ftplugin/tidy.vim         |  2 +-
 runtime/ftplugin/zig.vim          |  2 +-
 runtime/indent/nsis.vim           |  2 +-
 runtime/indent/php.vim            | 16 ++++++++--------
 runtime/indent/rapid.vim          | 12 ++++++------
 runtime/syntax/8th.vim            |  2 +-
 runtime/syntax/a65.vim            |  2 +-
 runtime/syntax/chaiscript.vim     |  2 +-
 runtime/syntax/euphoria4.vim      |  2 +-
 runtime/syntax/flexwiki.vim       |  4 ++--
 runtime/syntax/gdb.vim            |  2 +-
 runtime/syntax/groovy.vim         |  2 +-
 runtime/syntax/lite.vim           |  2 +-
 runtime/syntax/logtalk.vim        |  2 +-
 runtime/syntax/lss.vim            |  2 +-
 runtime/syntax/pymanifest.vim     |  2 +-
 runtime/syntax/rmd.vim            |  2 +-
 runtime/syntax/sgml.vim           |  2 +-
 runtime/syntax/slrnrc.vim         |  2 +-
 runtime/syntax/spec.vim           |  4 ++--
 runtime/syntax/sqlinformix.vim    |  2 +-
 runtime/syntax/sqlj.vim           |  2 +-
 runtime/syntax/squid.vim          |  2 +-
 runtime/syntax/tasm.vim           |  2 +-
 runtime/syntax/tf.vim             |  2 +-
 runtime/syntax/tsalt.vim          |  6 +++---
 30 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/debchangelog.vim b/runtime/ftplugin/debchangelog.vim
index 062fc054c8..dca7f7355a 100644
--- a/runtime/ftplugin/debchangelog.vim
+++ b/runtime/ftplugin/debchangelog.vim
@@ -122,7 +122,7 @@ function NewVersion()
     normal! 1G0
     call search(')')
     normal! h
-    " ':normal' doens't support key annotation (<c-a>) directly.
+    " ':normal' doesn't support key annotation (<c-a>) directly.
     " Vim's manual recommends using ':exe' to use key annotation indirectly (backslash-escaping needed though).
     exe "normal! \<c-a>"
     call setline(1, substitute(getline(1), '-\$\$', '-', ''))
diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim
index eba7122347..524eeb736a 100644
--- a/runtime/ftplugin/readline.vim
+++ b/runtime/ftplugin/readline.vim
@@ -25,7 +25,7 @@ if exists("loaded_matchit") && !exists("b:match_words")
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Readline Intialization Files (inputrc .inputrc)\tinputrc;*.inputrc\n" ..
+  let b:browsefilter = "Readline Initialization Files (inputrc .inputrc)\tinputrc;*.inputrc\n" ..
 	\	       "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
diff --git a/runtime/ftplugin/rst.vim b/runtime/ftplugin/rst.vim
index ff7a402d10..c88e8f2580 100644
--- a/runtime/ftplugin/rst.vim
+++ b/runtime/ftplugin/rst.vim
@@ -28,7 +28,7 @@ setlocal formatoptions+=tcroql
 " directives (..) and ordered lists (1.), although it can cause problems for
 " many other cases.
 "
-" More sophisticated indentation rules should be revisted in the future.
+" More sophisticated indentation rules should be revisited in the future.
 
 if exists("g:rst_style") && g:rst_style != 0
     setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8
diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim
index 1c02a98c7c..7a29d39f8e 100644
--- a/runtime/ftplugin/sql.vim
+++ b/runtime/ftplugin/sql.vim
@@ -140,7 +140,7 @@ if !exists("*SQL_SetType")
                         \ )
 
             " Remove duplicates, since sqlanywhere.vim can exist in the
-            " sytax, indent and ftplugin directory, yet we only want
+            " syntax, indent and ftplugin directory, yet we only want
             " to display the option once
             let index = match(sqls, '.\{-}\ze\n')
             while index > -1
@@ -204,7 +204,7 @@ if !exists("*SQL_SetType")
         endif
         let b:sql_type_override = new_sql_type
 
-        " Remove any cached SQL since a new sytax will have different
+        " Remove any cached SQL since a new syntax will have different
         " items and groups
         if !exists('g:loaded_sql_completion') || g:loaded_sql_completion >= 100
             call sqlcomplete#ResetCacheSyntax()
diff --git a/runtime/ftplugin/tidy.vim b/runtime/ftplugin/tidy.vim
index 470548d83a..b81b66db4a 100644
--- a/runtime/ftplugin/tidy.vim
+++ b/runtime/ftplugin/tidy.vim
@@ -1,5 +1,5 @@
 " Vim filetype plugin file
-" Language:	HMTL Tidy Configuration
+" Language:	HTML Tidy Configuration
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2020 Sep 4
 
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index e740a52849..5f453fc8d1 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -17,7 +17,7 @@ compiler zig_build
 " Match Zig builtin fns
 setlocal iskeyword+=@-@
 
-" Recomended code style, no tabs and 4-space indentation
+" Recommended code style, no tabs and 4-space indentation
 setlocal expandtab
 setlocal tabstop=8
 setlocal softtabstop=4
diff --git a/runtime/indent/nsis.vim b/runtime/indent/nsis.vim
index 5d3decca37..3731781201 100644
--- a/runtime/indent/nsis.vim
+++ b/runtime/indent/nsis.vim
@@ -15,7 +15,7 @@ setlocal nosmartindent
 setlocal noautoindent
 setlocal indentexpr=GetNsisIndent(v:lnum)
 setlocal indentkeys=!^F,o,O
-setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwith,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif
+setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwitch,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif
 
 let b:undo_indent = "setl ai< inde< indk< si<"
 
diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim
index 0e623689d5..6b3d700059 100644
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -327,13 +327,13 @@ endfun
 
 function! FindArrowIndent (lnum)  " {{{
 
-    let parrentArrowPos = -1
+    let parentArrowPos = -1
     let cursorPos = -1
     let lnum = a:lnum
     while lnum > 1
 	let last_line = getline(lnum)
 	if last_line =~ '^\s*->'
-	    let parrentArrowPos = indent(a:lnum)
+	    let parentArrowPos = indent(a:lnum)
 	    break
 	else
 
@@ -355,28 +355,28 @@ function! FindArrowIndent (lnum)  " {{{
 		    else
 		    endif
 		else
-		    let parrentArrowPos = -1
+		    let parentArrowPos = -1
 		    break
 		end
 	    endif
 
 	    if cleanedLnum =~ '->'
 		call cursor(lnum, cursorPos == -1 ? strwidth(cleanedLnum) : cursorPos)
-		let parrentArrowPos = searchpos('->', 'cWb', lnum)[1] - 1
+		let parentArrowPos = searchpos('->', 'cWb', lnum)[1] - 1
 
 		break
 	    else
-		let parrentArrowPos = -1
+		let parentArrowPos = -1
 		break
 	    endif
 	endif
     endwhile
 
-    if parrentArrowPos == -1
-	let parrentArrowPos = indent(lnum) + shiftwidth()
+    if parentArrowPos == -1
+	let parentArrowPos = indent(lnum) + shiftwidth()
     end
 
-    return parrentArrowPos
+    return parentArrowPos
 endfun "}}}
 
 function! FindTheIfOfAnElse (lnum, StopAfterFirstPrevElse) " {{{
diff --git a/runtime/indent/rapid.vim b/runtime/indent/rapid.vim
index f97ebf84db..2c99bb2491 100644
--- a/runtime/indent/rapid.vim
+++ b/runtime/indent/rapid.vim
@@ -146,7 +146,7 @@ endfunction
 
 " Returns the length of the line until a:str occur outside a string or
 " comment. Search starts at string index a:startIdx.
-" If a:str is a word also add word bounderies and case insesitivity.
+" If a:str is a word also add word boundaries and case insensitivity.
 " Note: rapidTodoComment and rapidDebugComment are not taken into account.
 function s:RapidLenTilStr(lnum, str, startIdx) abort
 
@@ -179,8 +179,8 @@ function s:RapidLenTilStr(lnum, str, startIdx) abort
   return -1
 endfunction
 
-" a:lchar shoud be one of (, ), [, ], { or }
-" returns the number of opening/closing parenthesise which have no
+" a:lchar should be one of (, ), [, ], { or }
+" returns the number of opening/closing parentheses which have no
 " closing/opening match in getline(a:lnum)
 function s:RapidLoneParen(lnum,lchar) abort
   if a:lchar == "(" || a:lchar == ")"
@@ -205,7 +205,7 @@ function s:RapidLoneParen(lnum,lchar) abort
   endif
 
   let l:opnParen = 0
-  " count opening brakets
+  " count opening brackets
   let l:i = 0
   while l:i >= 0
     let l:i = s:RapidLenTilStr(a:lnum, l:opnParChar, l:i)
@@ -216,7 +216,7 @@ function s:RapidLoneParen(lnum,lchar) abort
   endwhile
 
   let l:clsParen = 0
-  " count closing brakets
+  " count closing brackets
   let l:i = 0
   while l:i >= 0
     let l:i = s:RapidLenTilStr(a:lnum, l:clsParChar, l:i)
@@ -242,7 +242,7 @@ function s:RapidPreNoneBlank(lnum) abort
   let nPreNoneBlank = prevnonblank(a:lnum)
 
   while nPreNoneBlank>0 && getline(nPreNoneBlank) =~ '\v\c^\s*(\%\%\%|!)'
-    " Previouse none blank line irrelevant. Look further aback.
+    " Previous none blank line irrelevant. Look further aback.
     let nPreNoneBlank = prevnonblank(nPreNoneBlank - 1)
   endwhile
 
diff --git a/runtime/syntax/8th.vim b/runtime/syntax/8th.vim
index ce27d10a44..643c9cb095 100644
--- a/runtime/syntax/8th.vim
+++ b/runtime/syntax/8th.vim
@@ -363,7 +363,7 @@ syn region eighthComment start="\zs\\" end="$" contains=eighthTodo
 if !exists("did_eighth_syntax_inits")
     let did_eighth_syntax_inits=1
 
-    " The default methods for highlighting. Can be overriden later.
+    " The default methods for highlighting. Can be overridden later.
     hi def link eighthTodo Todo
     hi def link eighthOperators Operator
     hi def link eighthMath Number
diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim
index b232e826cd..6445b9438b 100644
--- a/runtime/syntax/a65.vim
+++ b/runtime/syntax/a65.vim
@@ -118,7 +118,7 @@ syn match a65Section	"\(^\|\s\)\.)\($\|\s\)"
 " Strings
 syn match a65String	"\".*\""
 
-" Programm Counter
+" Program Counter
 syn region a65PC	start="\*=" end="\>" keepend
 
 " HI/LO Byte
diff --git a/runtime/syntax/chaiscript.vim b/runtime/syntax/chaiscript.vim
index 5a64bdb556..9925ba5138 100644
--- a/runtime/syntax/chaiscript.vim
+++ b/runtime/syntax/chaiscript.vim
@@ -61,7 +61,7 @@ syn region  chaiscriptFunc         matchgroup=chaiscriptFunc start="`" end="`"
 " Intentionally leaving out all of the normal, well known operators
 syn match   chaiscriptOperator     "\.\."
 
-" Guard seperator as an operator
+" Guard separator as an operator
 syn match   chaiscriptOperator     ":"
 
 " Comments
diff --git a/runtime/syntax/euphoria4.vim b/runtime/syntax/euphoria4.vim
index 5e668a7d67..baa0e8e7b9 100644
--- a/runtime/syntax/euphoria4.vim
+++ b/runtime/syntax/euphoria4.vim
@@ -27,7 +27,7 @@ syn keyword euphoria4Debug	includes inline warning define
 " Keywords for conditional compilation - from $EUDIR/include/euphoria/keywords.e:
 syn keyword euphoria4PreProc	elsedef elsifdef ifdef 
 
-" Keywords (Statments) - from $EUDIR/include/euphoria/keywords.e:
+" Keywords (Statements) - from $EUDIR/include/euphoria/keywords.e:
 syn keyword euphoria4Keyword	and as break by case constant continue do else     
 syn keyword euphoria4Keyword	elsif end entry enum exit export
 syn keyword euphoria4Keyword	fallthru for function global goto if include
diff --git a/runtime/syntax/flexwiki.vim b/runtime/syntax/flexwiki.vim
index 6b15ab2d90..3b5f7ff573 100644
--- a/runtime/syntax/flexwiki.vim
+++ b/runtime/syntax/flexwiki.vim
@@ -67,10 +67,10 @@ syntax match flexwikiEmoticons      /\((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)
 " Aggregate all the regular text highlighting into flexwikiText
 syntax cluster flexwikiText contains=flexwikiItalic,flexwikiBold,flexwikiCode,flexwikiDeEmphasis,flexwikiDelText,flexwikiInsText,flexwikiSuperScript,flexwikiSubScript,flexwikiCitation,flexwikiLink,flexwikiWord,flexwikiEmoticons
 
-" single-line WikiPropertys
+" single-line WikiProperties
 syntax match flexwikiSingleLineProperty /^:\?[A-Z_][_a-zA-Z0-9]\+:/
 
-" TODO: multi-line WikiPropertys
+" TODO: multi-line WikiProperties
 
 " Header levels, 1-6
 syntax match flexwikiH1             /^!.*$/
diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim
index c820ba40a9..c15b96de6f 100644
--- a/runtime/syntax/gdb.vim
+++ b/runtime/syntax/gdb.vim
@@ -30,7 +30,7 @@ syn keyword gdbStatement contained search section set sharedlibrary shell show s
 syn keyword gdbStatement contained stop target tbreak tdump tfind thbreak thread tp trace tstart tstatus tstop
 syn keyword gdbStatement contained tty und[isplay] unset until up watch whatis where while ws x
 syn match gdbFuncDef "\<define\>.*"
-syn match gdbStatmentContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef
+syn match gdbStatementContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef
 syn match gdbStatement "^\s*info" nextgroup=gdbInfo skipwhite skipempty
 
 " some commonly used abbreviations
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 41495e6682..e48279bd1a 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -362,7 +362,7 @@ exec "syn sync ccomment groovyComment minlines=" . groovy_minlines
 
 " Mark these as operators
 
-" Hightlight brackets
+" Highlight brackets
 " syn match  groovyBraces		"[{}]"
 " syn match  groovyBraces		"[\[\]]"
 " syn match  groovyBraces		"[\|]"
diff --git a/runtime/syntax/lite.vim b/runtime/syntax/lite.vim
index a8d26892d4..f6e41e7e18 100644
--- a/runtime/syntax/lite.vim
+++ b/runtime/syntax/lite.vim
@@ -5,7 +5,7 @@
 " Email:	Subject: send syntax_vim.tgz
 " Last Change:	2001 Mai 01
 "
-" Options	lite_sql_query = 1 for SQL syntax highligthing inside strings
+" Options	lite_sql_query = 1 for SQL syntax highlighting inside strings
 "		lite_minlines = x     to sync at least x lines backwards
 
 " quit when a syntax file was already loaded
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
index a7fe9ce925..bc70ef41b4 100644
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -330,7 +330,7 @@ syn match	logtalkKeyword		"\<t\(an\|runcate\)\ze("
 syn match	logtalkKeyword		"\<ceiling\ze("
 
 
-" Other arithemtic functors
+" Other arithmetic functors
 
 syn match	logtalkOperator		"\*\*"
 syn match	logtalkKeyword		"\<s\(in\|qrt\)\ze("
diff --git a/runtime/syntax/lss.vim b/runtime/syntax/lss.vim
index 6ee717bcb4..eceaf75674 100644
--- a/runtime/syntax/lss.vim
+++ b/runtime/syntax/lss.vim
@@ -9,7 +9,7 @@ if exists("b:current_syntax")
 endif
 
 " This setup is probably atypical for a syntax highlighting file, because
-" most of it is not really intended to be overrideable.  Instead, the
+" most of it is not really intended to be overridable.  Instead, the
 " highlighting is supposed to correspond to the highlighting specified by
 " the .lss file entries themselves; ie. the "bold" keyword should be bold,
 " the "red" keyword should be red, and so forth.  The exceptions to this
diff --git a/runtime/syntax/pymanifest.vim b/runtime/syntax/pymanifest.vim
index 54295c45dc..26bdf797e0 100644
--- a/runtime/syntax/pymanifest.vim
+++ b/runtime/syntax/pymanifest.vim
@@ -20,7 +20,7 @@ syn match pymanifestComment /\\\@1<!#.*/ contains=pymanifestTodo
 " Commands
 syn keyword pymanifestCommand
             \ include exclude
-            \ recursive-include resursive-exclude
+            \ recursive-include recursive-exclude
             \ global-include global-exclude
             \ graft prune
 
diff --git a/runtime/syntax/rmd.vim b/runtime/syntax/rmd.vim
index f849af97d2..0eab0e6fab 100644
--- a/runtime/syntax/rmd.vim
+++ b/runtime/syntax/rmd.vim
@@ -81,7 +81,7 @@ else
     syn match  yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
     syn match  yamlSingleEscape contained "''"
     syn match yamlComment /#.*/ contained
-    " A second colon is a syntax error, unles within a string or following !expr
+    " A second colon is a syntax error, unless within a string or following !expr
     syn match yamlColonError /:\s*[^'^"^!]*:/ contained
     if &filetype == 'quarto'
       syn region pandocYAMLHeader matchgroup=rmdYamlBlockDelim start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/^---$/ keepend contains=rmdYamlFieldTtl,yamlFlowString,yamlComment,yamlColonError
diff --git a/runtime/syntax/sgml.vim b/runtime/syntax/sgml.vim
index 00d58d11f2..ed8fa8cf12 100644
--- a/runtime/syntax/sgml.vim
+++ b/runtime/syntax/sgml.vim
@@ -294,7 +294,7 @@ syn sync minlines=100
 hi def link sgmlTodo			Todo
 hi def link sgmlTag			Function
 hi def link sgmlEndTag			Identifier
-" SGML specifig
+" SGML specific
 hi def link sgmlAbbrEndTag		Identifier
 hi def link sgmlEmptyTag		Function
 hi def link sgmlEntity			Statement
diff --git a/runtime/syntax/slrnrc.vim b/runtime/syntax/slrnrc.vim
index cf0734ae85..004bdd1bb1 100644
--- a/runtime/syntax/slrnrc.vim
+++ b/runtime/syntax/slrnrc.vim
@@ -94,7 +94,7 @@ syn region  slrnrcColorObjStr	contained matchgroup=slrnrcColorObj start=+"+ end=
 syn keyword slrnrcColorVal	contained default
 syn keyword slrnrcColorVal	contained black blue brightblue brightcyan brightgreen brightmagenta brightred brown cyan gray green lightgray magenta red white yellow
 syn region  slrnrcColorValStr	contained matchgroup=slrnrcColorVal start=+"+ end=+"+ oneline contains=slrnrcColorVal,slrnrcSpaceError
-" Mathcing a function with three arguments
+" Matching a function with three arguments
 syn keyword slrnrcColor		contained color
 syn match   slrnrcColorInit	contained "^\s*color\s\+\S\+" skipwhite nextgroup=slrnrcColorVal\(Str\)\= contains=slrnrcColor\(Obj\|ObjStr\)\=
 syn match   slrnrcColorLine	"^\s*color\s\+\S\+\s\+\S\+" skipwhite nextgroup=slrnrcColorVal\(Str\)\= contains=slrnrcColor\(Init\|Val\|ValStr\)
diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
index d7d5877943..aed04bc900 100644
--- a/runtime/syntax/spec.vim
+++ b/runtime/syntax/spec.vim
@@ -56,7 +56,7 @@ syn match specListedFilesEtc    contained '/etc/'me=e-1
 syn match specListedFilesShare  contained '/share/'me=e-1
 syn cluster specListedFiles contains=specListedFilesBin,specListedFilesLib,specListedFilesDoc,specListedFilesEtc,specListedFilesShare,specListedFilesPrefix,specVariables,specSpecialChar
 
-"specComands
+"specCommands
 syn match   specConfigure  contained '\./configure'
 syn match   specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
 syn keyword specCommandSpecial contained root
@@ -87,7 +87,7 @@ syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start
 "TODO %config valid parameters: missingok\|noreplace
 "TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
 syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|license\|verify\|ghost\|exclude\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
-"tip: remember to include new itens in specFilesArea above
+"tip: remember to include new items in specFilesArea above
 syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|license\|verify\|ghost\|exclude\)\>'
 
 "valid options for certain section headers
diff --git a/runtime/syntax/sqlinformix.vim b/runtime/syntax/sqlinformix.vim
index e01912bc40..71418c556f 100644
--- a/runtime/syntax/sqlinformix.vim
+++ b/runtime/syntax/sqlinformix.vim
@@ -162,7 +162,7 @@ hi def link sqlNumber	Number
 hi def link sqlBoolean	Boolean
 hi def link sqlString	String
 
-" === Statment syntax group ===
+" === Statement syntax group ===
 hi def link sqlStatement	Statement
 hi def link sqlConditional	Conditional
 hi def link sqlRepeat		Repeat
diff --git a/runtime/syntax/sqlj.vim b/runtime/syntax/sqlj.vim
index c901145c3c..fd0f8f3d76 100644
--- a/runtime/syntax/sqlj.vim
+++ b/runtime/syntax/sqlj.vim
@@ -16,7 +16,7 @@ endif
 " Read the Java syntax to start with
 source <sfile>:p:h/java.vim
 
-" SQLJ extentions
+" SQLJ extensions
 " The SQL reserved words, defined as keywords.
 
 syn case ignore
diff --git a/runtime/syntax/squid.vim b/runtime/syntax/squid.vim
index a8abd180a0..186be91e61 100644
--- a/runtime/syntax/squid.vim
+++ b/runtime/syntax/squid.vim
@@ -31,7 +31,7 @@ syn keyword	squidConf	cache_effective_user cache_host cache_host_acl
 syn keyword	squidConf	cache_host_domain cache_log cache_mem
 syn keyword	squidConf	cache_mem_high cache_mem_low cache_mgr
 syn keyword	squidConf	cachemgr_passwd cache_peer cache_peer_access
-syn keyword	squidConf	cahce_replacement_policy cache_stoplist
+syn keyword	squidConf	cache_replacement_policy cache_stoplist
 syn keyword	squidConf	cache_stoplist_pattern cache_store_log cache_swap
 syn keyword	squidConf	cache_swap_high cache_swap_log cache_swap_low
 syn keyword	squidConf	client_db client_lifetime client_netmask
diff --git a/runtime/syntax/tasm.vim b/runtime/syntax/tasm.vim
index 1d6e570752..b8b5e6992b 100644
--- a/runtime/syntax/tasm.vim
+++ b/runtime/syntax/tasm.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 " Language: TASM: turbo assembler by Borland
-" Maintaner: FooLman of United Force <foolman@bigfoot.com>
+" Maintainer: FooLman of United Force <foolman@bigfoot.com>
 " Last Change: 2012 Feb 03 by Thilo Six, and 2018 Nov 27.
 
 " quit when a syntax file was already loaded
diff --git a/runtime/syntax/tf.vim b/runtime/syntax/tf.vim
index 47775b8637..df6adcf819 100644
--- a/runtime/syntax/tf.vim
+++ b/runtime/syntax/tf.vim
@@ -27,7 +27,7 @@ syn keyword tfVar  bamf bg_output borg clearfull cleardone clock connect  contai
 syn keyword tfVar  emulation end_color gag gethostbyname gpri hook hilite  contained
 syn keyword tfVar  hiliteattr histsize hpri insert isize istrip kecho  contained
 syn keyword tfVar  kprefix login lp lpquote maildelay matching max_iter  contained
-syn keyword tfVar  max_recur mecho more mprefix oldslash promt_sec  contained
+syn keyword tfVar  max_recur mecho more mprefix oldslash prompt_sec  contained
 syn keyword tfVar  prompt_usec proxy_host proxy_port ptime qecho qprefix  contained
 syn keyword tfVar  quite quitdone redef refreshtime scroll shpause snarf sockmload  contained
 syn keyword tfVar  start_color tabsize telopt sub time_format visual  contained
diff --git a/runtime/syntax/tsalt.vim b/runtime/syntax/tsalt.vim
index 8dd2a24df9..6f74ad2eb3 100644
--- a/runtime/syntax/tsalt.vim
+++ b/runtime/syntax/tsalt.vim
@@ -83,11 +83,11 @@ syn keyword tsaltFunction	vGetChrs vGetChrsA  vPutChr vPutChrs
 syn keyword tsaltFunction	vPutChrsA vRstrArea vSaveArea
 
 " Dynamic Data Exchange (DDE) Operations
-syn keyword tsaltFunction	DDEExecute DDEInitate DDEPoke DDERequest
+syn keyword tsaltFunction	DDEExecute DDEInitiate DDEPoke DDERequest
 syn keyword tsaltFunction	DDETerminate DDETerminateAll
 "END FUNCTIONS
 
-"PREDEFINED VARAIABLES
+"PREDEFINED VARIABLES
 syn keyword tsaltSysVar	_add_lf _alarm_on _answerback_str _asc_rcrtrans
 syn keyword tsaltSysVar	_asc_remabort _asc_rlftrans _asc_scpacing
 syn keyword tsaltSysVar	_asc_scrtrans _asc_secho _asc_slpacing
@@ -106,7 +106,7 @@ syn keyword tsaltSysVar	_scr_chk_key _script_dir _sound_on
 syn keyword tsaltSysVar	_strip_high _swap_bs _telix_dir _up_dir
 syn keyword tsaltSysVar	_usage_fname _zmodauto _zmod_rcrash
 syn keyword tsaltSysVar	_zmod_scrash
-"END PREDEFINED VARAIABLES
+"END PREDEFINED VARIABLES
 
 "TYPE
 syn keyword tsaltType	str int
-- 
cgit 


From e2c10dea19a329f7913eb1d6110f10ec4bc525f9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 24 Aug 2023 09:08:24 +0900
Subject: vim-patch:2f25e40b1f54

runtime: configure keywordpg for some file types (vim/vim#5566)

https://github.com/vim/vim/commit/2f25e40b1f545f4aa38377f0c25effb112b5d1ef

Co-authored-by: Enno <Konfekt@users.noreply.github.com>
---
 runtime/ftplugin/gpg.vim       | 17 ++++++++++++++
 runtime/ftplugin/modconf.vim   | 16 +++++++++++++
 runtime/ftplugin/muttrc.vim    | 16 +++++++++++++
 runtime/ftplugin/readline.vim  | 16 +++++++++++++
 runtime/ftplugin/sh.vim        | 13 +++++++++++
 runtime/ftplugin/sshconfig.vim | 25 ++++++++++++++++----
 runtime/ftplugin/sudoers.vim   | 16 +++++++++++++
 runtime/ftplugin/systemd.vim   | 53 +++++++++++++++++++-----------------------
 runtime/ftplugin/udevrules.vim | 16 +++++++++++++
 9 files changed, 154 insertions(+), 34 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/gpg.vim b/runtime/ftplugin/gpg.vim
index 3f890e58f6..9e00daed6a 100644
--- a/runtime/ftplugin/gpg.vim
+++ b/runtime/ftplugin/gpg.vim
@@ -15,5 +15,22 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
+if has('unix') && executable('less')
+  if !has('gui_running')
+    command -buffer -nargs=1 Sman
+          \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+--' . <q-args> . '\b'' --hilite-search" man ' . 'gpg' |
+          \ redraw!
+  elseif has('terminal')
+    command -buffer -nargs=1 Sman
+          \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+--' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'gpg'
+  endif
+  if exists(':Sman') == 2
+    setlocal iskeyword+=-
+    setlocal keywordprg=:Sman
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+  endif
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
diff --git a/runtime/ftplugin/modconf.vim b/runtime/ftplugin/modconf.vim
index c8e76b538b..09ad54b64a 100644
--- a/runtime/ftplugin/modconf.vim
+++ b/runtime/ftplugin/modconf.vim
@@ -16,5 +16,21 @@ let b:undo_ftplugin = "setl com< cms< inc< fo<"
 setlocal comments=:# commentstring=#\ %s include=^\\s*include
 setlocal formatoptions-=t formatoptions+=croql
 
+if has('unix') && executable('less')
+  if !has('gui_running')
+    command -buffer -nargs=1 Sman
+          \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s{,8}' . <q-args> . '\b'' --hilite-search" man ' . 'modprobe.d' |
+          \ redraw!
+  elseif has('terminal')
+    command -buffer -nargs=1 Sman
+          \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'modprobe.d'
+  endif
+  if exists(':Sman') == 2
+    setlocal iskeyword+=-
+    setlocal keywordprg=:Sman
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+  endif
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/muttrc.vim b/runtime/ftplugin/muttrc.vim
index c8ad0f2ec5..bd01367158 100644
--- a/runtime/ftplugin/muttrc.vim
+++ b/runtime/ftplugin/muttrc.vim
@@ -18,5 +18,21 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &l:include = '^\s*source\>'
 
+if has('unix') && executable('less')
+  if !has('gui_running')
+    command -buffer -nargs=1 Sman
+          \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . <q-args> . '\b'' --hilite-search" man ' . 'muttrc' |
+          \ redraw!
+  elseif has('terminal')
+    command -buffer -nargs=1 Sman
+          \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'muttrc'
+  endif
+  if exists(':Sman') == 2
+    setlocal iskeyword+=-
+    setlocal keywordprg=:Sman
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+  endif
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim
index 524eeb736a..c81d0f2f65 100644
--- a/runtime/ftplugin/readline.vim
+++ b/runtime/ftplugin/readline.vim
@@ -30,6 +30,22 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
+if has('unix') && executable('less')
+  if !has('gui_running')
+    command -buffer -nargs=1 Sman
+          \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . <q-args> . '\b'' --hilite-search" man ' . '3 readline' |
+          \ redraw!
+  elseif has('terminal')
+    command -buffer -nargs=1 Sman
+          \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . '3 readline'
+  endif
+  if exists(':Sman') == 2
+    setlocal iskeyword+=-
+    setlocal keywordprg=:Sman
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+  endif
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim
index b6fdb8f3e2..7106bf9155 100644
--- a/runtime/ftplugin/sh.vim
+++ b/runtime/ftplugin/sh.vim
@@ -41,6 +41,19 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
+if (exists('b:is_bash') && (b:is_bash == 1)) ||
+      \ (exists('b:is_sh') && (b:is_sh == 1))
+  if !has('gui_running') && executable('less')
+    command! -buffer -nargs=1 Help silent exe '!bash -c "{ help "<args>" 2>/dev/null || man "<args>"; } | LESS= less"' | redraw!
+  elseif has('terminal')
+    command! -buffer -nargs=1 Help silent exe ':term bash -c "help "<args>" 2>/dev/null || man "<args>""'
+  else
+    command! -buffer -nargs=1 Help echo system('bash -c "help <args>" 2>/dev/null || man "<args>"')
+  endif
+  setlocal keywordprg=:Help
+  let b:undo_ftplugin .= '| setlocal keywordprg<'
+endif
+
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/runtime/ftplugin/sshconfig.vim b/runtime/ftplugin/sshconfig.vim
index d933ce0527..214e4928a0 100644
--- a/runtime/ftplugin/sshconfig.vim
+++ b/runtime/ftplugin/sshconfig.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
-" Language:             OpenSSH client configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:         OpenSSH client configuration file
+" Previous Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2008-07-09
 
 if exists("b:did_ftplugin")
   finish
@@ -11,9 +11,24 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-let b:undo_ftplugin = "setl com< cms< fo<"
-
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+let b:undo_ftplugin = 'setlocal com< cms< fo<'
+
+if has('unix') && executable('less')
+  if !has('gui_running')
+    command -buffer -nargs=1 Sman
+          \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . <q-args> . '$'' --hilite-search" man ' . 'ssh_config' |
+          \ redraw!
+  elseif has('terminal')
+    command -buffer -nargs=1 Sman
+          \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . '$', '\') . ''' --hilite-search" man ' . 'ssh_config'
+  endif
+  if exists(':Sman') == 2
+    setlocal iskeyword+=-
+    setlocal keywordprg=:Sman
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+  endif
+endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/sudoers.vim b/runtime/ftplugin/sudoers.vim
index 38dbf559ee..65cf2d8203 100644
--- a/runtime/ftplugin/sudoers.vim
+++ b/runtime/ftplugin/sudoers.vim
@@ -15,5 +15,21 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
+if has('unix') && executable('less')
+  if !has('gui_running')
+    command -buffer -nargs=1 Sman
+          \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''\b' . <q-args> . '\b'' --hilite-search" man ' . 'sudoers' |
+          \ redraw!
+  elseif has('terminal')
+    command -buffer -nargs=1 Sman
+          \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('\b' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'sudoers'
+  endif
+  if exists(':Sman') == 2
+    setlocal iskeyword+=-
+    setlocal keywordprg=:Sman
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+  endif
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/systemd.vim b/runtime/ftplugin/systemd.vim
index 4c5c9a1dc1..c0bc6302f2 100644
--- a/runtime/ftplugin/systemd.vim
+++ b/runtime/ftplugin/systemd.vim
@@ -7,35 +7,30 @@ if !exists('b:did_ftplugin')
   runtime! ftplugin/dosini.vim
 endif
 
-if !has('unix')
-  finish
-endif
-
-if !has('gui_running')
-  command! -buffer -nargs=1 Sman silent exe '!' . KeywordLookup_systemd(<q-args>) | redraw!
-elseif has('terminal')
-  command! -buffer -nargs=1 Sman silent exe 'term ' . KeywordLookup_systemd(<q-args>)
-else
-  finish
-endif
-
-if !exists('*KeywordLookup_systemd')
-  function KeywordLookup_systemd(keyword) abort
-    let matches = matchlist(getline(search('\v^\s*\[\s*.+\s*\]\s*$', 'nbWz')), '\v^\s*\[\s*(\k+).*\]\s*$')
-    if len(matches) > 1
-      let section = matches[1]
-      return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd.' . section
+if has('unix') && executable('less')
+  if !has('gui_running')
+    command -buffer -nargs=1 Sman silent exe '!' . KeywordLookup_systemd(<q-args>) | redraw!
+  elseif has('terminal')
+    command -buffer -nargs=1 Sman silent exe 'term ' . KeywordLookup_systemd(<q-args>)
+  endif
+  if exists(':Sman') == 2
+    if !exists('*KeywordLookup_systemd')
+      function KeywordLookup_systemd(keyword) abort
+        let matches = matchlist(getline(search('\v^\s*\[\s*.+\s*\]\s*$', 'nbWz')), '\v^\s*\[\s*(\k+).*\]\s*$')
+        if len(matches) > 1
+          let section = matches[1]
+          return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd.' . section
+        else
+          return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd'
+        endif
+      endfunction
+    endif
+    setlocal iskeyword+=-
+    setlocal keywordprg=:Sman
+    if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin)
+      let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<'
     else
-      return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd'
+      let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
     endif
-  endfunction
-endif
-
-setlocal iskeyword+=-
-setlocal keywordprg=:Sman
-
-if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin)
-  let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<'
-else
-  let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+  endif
 endif
diff --git a/runtime/ftplugin/udevrules.vim b/runtime/ftplugin/udevrules.vim
index 6404f6c85e..bde9c5dfa0 100644
--- a/runtime/ftplugin/udevrules.vim
+++ b/runtime/ftplugin/udevrules.vim
@@ -15,5 +15,21 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
+if has('unix') && executable('less')
+  if !has('gui_running')
+    command -buffer -nargs=1 Sman
+          \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s{,8}' . <q-args> . '\b'' --hilite-search" man ' . 'udev' |
+          \ redraw!
+  elseif has('terminal')
+    command -buffer -nargs=1 Sman
+          \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'udev'
+  endif
+  if exists(':Sman') == 2
+    setlocal iskeyword+=-
+    setlocal keywordprg=:Sman
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+  endif
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
-- 
cgit 


From daf7abbc4238dc269e22dd431bc4b1627ef9b6a1 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Thu, 24 Aug 2023 13:29:40 +0100
Subject: docs(builtin): small fixes (#24861)

Also make gen_eval_files.lua render vimdoc helpExamples properly if the line
begins with the `>` marker.
---
 runtime/doc/builtin.txt         | 9 ++++-----
 runtime/lua/vim/_meta/vimfn.lua | 5 ++---
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 75f6cd4313..67a6b8df9c 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -3211,7 +3211,7 @@ has({feature})                                                           *has()*
 			clipboard	|clipboard| provider is available.
 			fname_case	Case in file names matters (for Darwin and MS-Windows
 					this is not present).
-		                        gui_running	Nvim has a GUI.
+			gui_running	Nvim has a GUI.
 			iconv		Can use |iconv()| for conversion.
 			linux		Linux system.
 			mac		MacOS system.
@@ -4950,7 +4950,7 @@ pathshorten({path} [, {len}])                                    *pathshorten()*
 		letters).  Leading '~' and '.' characters are kept.  Examples: >vim
 			echo pathshorten('~/.config/nvim/autoload/file1.vim')
 <			~/.c/n/a/file1.vim ~
-		>vim
+>vim
 			echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
 <			~/.co/nv/au/file2.vim ~
 		It doesn't matter if the path exists or not.
@@ -7219,7 +7219,7 @@ sort({list} [, {how} [, {dict}]])                                  *sort()* *E70
 			language collate en_US.UTF8
 			echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
 <			['n', 'o', 'O', 'ö', 'p', 'z'] ~
-		>vim
+>vim
 			" ö is sorted after z with Swedish locale.
 			language collate sv_SE.UTF8
 			echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
@@ -7390,7 +7390,7 @@ state([{what}])                                                        *state()*
 		added.  E.g, this checks if the screen has scrolled: >vim
 			if state('s') == ''
 			   " screen has not scrolled
-
+<
 		These characters indicate the state, generally indicating that
 		something is busy:
 		    m	halfway a mapping, :normal command, feedkeys() or
@@ -7958,7 +7958,6 @@ synconcealed({lnum}, {col})                                     *synconcealed()*
 			synconcealed(lnum, 4)   [1, 'X', 2]
 			synconcealed(lnum, 5)   [1, 'X', 2]
 			synconcealed(lnum, 6)   [0, '', 0]
-<
 
 synstack({lnum}, {col})                                             *synstack()*
 		Return a |List|, which is the stack of syntax items at the
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 255f49ba3f..0ac8985274 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3853,7 +3853,7 @@ function vim.fn.globpath(path, expr, nosuf, list, allinks) end
 ---   clipboard  |clipboard| provider is available.
 ---   fname_case  Case in file names matters (for Darwin and MS-Windows
 ---       this is not present).
----                         gui_running  Nvim has a GUI.
+---   gui_running  Nvim has a GUI.
 ---   iconv    Can use |iconv()| for conversion.
 ---   linux    Linux system.
 ---   mac    MacOS system.
@@ -8765,7 +8765,7 @@ function vim.fn.srand(expr) end
 --- added.  E.g, this checks if the screen has scrolled: >vim
 ---   if state('s') == ''
 ---      " screen has not scrolled
----
+--- <
 --- These characters indicate the state, generally indicating that
 --- something is busy:
 ---     m  halfway a mapping, :normal command, feedkeys() or
@@ -9446,7 +9446,6 @@ function vim.fn.synIDtrans(synID) end
 ---   synconcealed(lnum, 4)   [1, 'X', 2]
 ---   synconcealed(lnum, 5)   [1, 'X', 2]
 ---   synconcealed(lnum, 6)   [0, '', 0]
---- <
 ---
 --- @param lnum integer
 --- @param col integer
-- 
cgit 


From 020d1f626a3fbda84b84b2f57e8a85662a792a1a Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 24 Aug 2023 12:48:21 -0500
Subject: fix(filetype): call on_detect before setting buffer filetype

The on_detect functions returned by filetype.lua set buffer local
variables which are often used by filetype plugins. For example, the
on_detect function for shell buffers sets variables such as b:is_bash or
b:is_sh, which are used by the sh ftplugin.

When called after setting the buffer's filetype, these variables cannot
be used by the ftplugin (because they are not yet defined). Instead,
call on_detect before setting the buffer filetype so that any buffer
variables set by on_detect can be used in the ftplugin.
---
 runtime/doc/lua.txt          | 3 ++-
 runtime/filetype.lua         | 9 ++++++---
 runtime/lua/vim/filetype.lua | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 08022c3ed6..b4ca88251e 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2600,7 +2600,8 @@ vim.filetype.add({filetypes})                             *vim.filetype.add()*
     matched pattern, if any) and should return a string that will be used as
     the buffer's filetype. Optionally, the function can return a second
     function value which, when called, modifies the state of the buffer. This
-    can be used to, for example, set filetype-specific buffer variables.
+    can be used to, for example, set filetype-specific buffer variables. This
+    function will be called by Nvim before setting the buffer's filetype.
 
     Filename patterns can specify an optional priority to resolve cases when a
     file path matches multiple patterns. Higher priorities are matched first.
diff --git a/runtime/filetype.lua b/runtime/filetype.lua
index cf5fe39656..4a4f37a1c4 100644
--- a/runtime/filetype.lua
+++ b/runtime/filetype.lua
@@ -18,12 +18,15 @@ vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile', 'StdinReadPost' }, {
         end)
       end
     else
-      vim.api.nvim_buf_call(args.buf, function()
-        vim.api.nvim_cmd({ cmd = 'setf', args = { ft } }, {})
-      end)
+      -- on_detect is called before setting the filetype so that it can set any buffer local
+      -- variables that may be used the filetype's ftplugin
       if on_detect then
         on_detect(args.buf)
       end
+
+      vim.api.nvim_buf_call(args.buf, function()
+        vim.api.nvim_cmd({ cmd = 'setf', args = { ft } }, {})
+      end)
     end
   end,
 })
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index c310eb3e42..a05c1075eb 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2061,7 +2061,8 @@ end
 --- pattern, if any) and should return a string that will be used as the
 --- buffer's filetype. Optionally, the function can return a second function
 --- value which, when called, modifies the state of the buffer. This can be used
---- to, for example, set filetype-specific buffer variables.
+--- to, for example, set filetype-specific buffer variables. This function will
+--- be called by Nvim before setting the buffer's filetype.
 ---
 --- Filename patterns can specify an optional priority to resolve cases when a
 --- file path matches multiple patterns. Higher priorities are matched first.
-- 
cgit 


From af38b46a2574f59358bc3bf54dd7c34b5c0f396d Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 24 Aug 2023 12:56:24 -0500
Subject: fix(filetype): return on_detect function when matching by file
 contents

---
 runtime/lua/vim/filetype.lua | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index a05c1075eb..193c9b0199 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2377,11 +2377,16 @@ function M.match(args)
     -- If the function tries to use the filename that is nil then it will fail,
     -- but this enables checks which do not need a filename to still work.
     local ok
-    ok, ft = pcall(require('vim.filetype.detect').match_contents, contents, name, function(ext)
-      return dispatch(extension[ext], name, bufnr)
-    end)
-    if ok and ft then
-      return ft
+    ok, ft, on_detect = pcall(
+      require('vim.filetype.detect').match_contents,
+      contents,
+      name,
+      function(ext)
+        return dispatch(extension[ext], name, bufnr)
+      end
+    )
+    if ok then
+      return ft, on_detect
     end
   end
 end
-- 
cgit 


From 949dd14d8b2acfc8feda7410ed35e28a2d895992 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Mon, 21 Aug 2023 09:28:58 +0100
Subject: vim-patch:9f2962141514

Runtime(termdebug): Add support to view local and argument variables

closes: 12403

https://github.com/vim/vim/commit/9f29621415146abc046471440515e9e34f3e57a1

Rename the existing "s:running" (#16790) to "s:gdb_running" to not clash with
the "s:running" introduced in this patch (which instead relates to whether the
debugged program is currently running in gdb).

Keep the file `:retab`bed as before.

Co-authored-by: laburnumT <flo.striker@gmail.com>
---
 runtime/doc/nvim_terminal_emulator.txt             |  13 +-
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 195 +++++++++++++++++----
 2 files changed, 177 insertions(+), 31 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index bbcc686207..482b608ef9 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -325,7 +325,9 @@ Other commands ~
 	     isn't one
  *:Asm*	     jump to the window with the disassembly, create it if there
 	     isn't one
-
+ *:Var*	     jump to the window with the local and argument variables,
+             create it if there isn't one. This window updates whenever the
+             program is stopped
 
 Events ~
 							*termdebug-events*
@@ -400,6 +402,15 @@ If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_disasm_window = 15
 Any value greater than 1 will set the Asm window height to that value.
 
+						*termdebug_variables_window*
+If you want the Var window shown by default, set the flag to 1.
+the "variables_window_height" entry can be used to set the window height: >vim
+	let g:termdebug_config['variables_window'] = 1
+	let g:termdebug_config['variables_window_height'] = 15
+If there is no g:termdebug_config you can use: >vim
+	let g:termdebug_variables_window = 15
+Any value greater than 1 will set the Var window height to that value.
+
 Communication ~
 						*termdebug-communication*
 There is another, hidden, buffer, which is used for Vim to communicate with
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index e8b78b3f5f..a8480fcc43 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -75,6 +75,7 @@ let s:pc_id = 12
 let s:asm_id = 13
 let s:break_id = 14  " breakpoint number is added to this
 let s:stopped = 1
+let s:running = 0
 
 let s:parsing_disasm_msg = 0
 let s:asm_lines = []
@@ -151,6 +152,9 @@ func s:StartDebug_internal(dict)
   let s:ptywin = 0
   let s:pid = 0
   let s:asmwin = 0
+  let s:asmbuf = 0
+  let s:varwin = 0
+  let s:varbuf = 0
 
   if exists('#User#TermdebugStartPre')
     doauto <nomodeline> User TermdebugStartPre
@@ -159,7 +163,7 @@ func s:StartDebug_internal(dict)
   " Uncomment this line to write logging in "debuglog".
   " call ch_logfile('debuglog', 'w')
 
-  let s:sourcewin = win_getid(winnr())
+  let s:sourcewin = win_getid()
 
   " Remember the old value of 'signcolumn' for each buffer that it's set in, so
   " that we can restore the value for all buffers.
@@ -207,11 +211,17 @@ func s:StartDebug_internal(dict)
   endif
 
   if s:GetDisasmWindow()
-    let curwinid = win_getid(winnr())
+    let curwinid = win_getid()
     call s:GotoAsmwinOrCreateIt()
     call win_gotoid(curwinid)
   endif
 
+  if s:GetVariablesWindow()
+    let curwinid = win_getid()
+    call s:GotoVariableswinOrCreateIt()
+    call win_gotoid(curwinid)
+  endif
+
   if exists('#User#TermdebugStartPost')
     doauto <nomodeline> User TermdebugStartPost
   endif
@@ -220,11 +230,18 @@ endfunc
 " Use when debugger didn't start or ended.
 func s:CloseBuffers()
   exe 'bwipe! ' . s:ptybuf
+  if s:asmbuf > 0
+    exe 'bwipe! ' . s:asmbuf
+  endif
+  if s:varbuf > 0
+    exe 'bwipe! ' . s:varbuf
+  endif
+  s:running = 0
   unlet! s:gdbwin
 endfunc
 
 func s:CheckGdbRunning()
-  if !s:running
+  if !s:gdb_running
       echoerr string(s:GetCommand()[0]) . ' exited unexpectedly'
       call s:CloseBuffers()
       return ''
@@ -246,7 +263,7 @@ func s:StartDebug_term(dict)
   let pty_job_info = nvim_get_chan_info(s:pty_job_id)
   let s:ptybuf = pty_job_info['buffer']
   let pty = pty_job_info['pty']
-  let s:ptywin = win_getid(winnr())
+  let s:ptywin = win_getid()
   if s:vertical
     " Assuming the source code window will get a signcolumn, use two more
     " columns for that, thus one less for the terminal window.
@@ -317,11 +334,11 @@ func s:StartDebug_term(dict)
     call s:CloseBuffers()
     return
   endif
-  let s:running = v:true
+  let s:gdb_running = v:true
   let s:starting = v:true
   let gdb_job_info = nvim_get_chan_info(s:gdb_job_id)
   let s:gdbbuf = gdb_job_info['buffer']
-  let s:gdbwin = win_getid(winnr())
+  let s:gdbwin = win_getid()
 
   " Wait for the "startupdone" message before sending any commands.
   let try_count = 0
@@ -409,7 +426,7 @@ func s:StartDebug_prompt(dict)
   else
     new
   endif
-  let s:gdbwin = win_getid(winnr())
+  let s:gdbwin = win_getid()
   let s:promptbuf = bufnr('')
   call prompt_setprompt(s:promptbuf, 'gdb> ')
   set buftype=prompt
@@ -476,7 +493,7 @@ func s:StartDebug_prompt(dict)
     let pty_job_info = nvim_get_chan_info(s:pty_job_id)
     let s:ptybuf = pty_job_info['buffer']
     let pty = pty_job_info['pty']
-    let s:ptywin = win_getid(winnr())
+    let s:ptywin = win_getid()
     call s:SendCommand('tty ' . pty)
 
     " Since GDB runs in a prompt window, the environment has not been set to
@@ -655,7 +672,7 @@ func s:GdbOutCallback(job_id, msgs, event)
     let index += 1
   endfor
 
-  let curwinid = win_getid(winnr())
+  let curwinid = win_getid()
   call win_gotoid(s:gdbwin)
 
   " Add the output above the current prompt.
@@ -728,7 +745,7 @@ func s:GetAsmAddr(msg)
 endfunc
 
 func s:EndTermDebug(job_id, exit_code, event)
-  let s:running = v:false
+  let s:gdb_running = v:false
   if s:starting
     return
   endif
@@ -737,13 +754,20 @@ func s:EndTermDebug(job_id, exit_code, event)
     doauto <nomodeline> User TermdebugStopPre
   endif
 
+  if s:asmbuf > 0
+    exe 'bwipe! ' . s:asmbuf
+  endif
+  if s:varbuf > 0
+    exe 'bwipe! ' . s:varbuf
+  endif
+  let s:running = 0
   unlet s:gdbwin
 
   call s:EndDebugCommon()
 endfunc
 
 func s:EndDebugCommon()
-  let curwinid = win_getid(winnr())
+  let curwinid = win_getid()
 
   if exists('s:ptybuf') && s:ptybuf
     exe 'bwipe! ' . s:ptybuf
@@ -785,7 +809,7 @@ func s:EndPromptDebug(job_id, exit_code, event)
     doauto <nomodeline> User TermdebugStopPre
   endif
 
-  let curwinid = win_getid(winnr())
+  let curwinid = win_getid()
   call win_gotoid(s:gdbwin)
   close
   if curwinid != s:gdbwin
@@ -813,9 +837,9 @@ endfunc
 " - CommOutput: ^error,msg="No function contains specified address."
 func s:HandleDisasmMsg(msg)
   if a:msg =~ '^\^done'
-    let curwinid = win_getid(winnr())
+    let curwinid = win_getid()
     if win_gotoid(s:asmwin)
-      silent normal! gg0"_dG
+      silent! %delete _
       call setline(1, s:asm_lines)
       set nomodified
       set filetype=asm
@@ -857,6 +881,49 @@ func s:HandleDisasmMsg(msg)
   endif
 endfunc
 
+func s:ParseVarinfo(varinfo)
+  let dict = {}
+  let nameIdx = matchstrpos(a:varinfo, '{name="\([^"]*\)"')
+  let dict['name'] = a:varinfo[nameIdx[1] + 7 : nameIdx[2] - 2]
+  let typeIdx = matchstrpos(a:varinfo, ',type="\([^"]*\)"')
+  let dict['type'] = a:varinfo[typeIdx[1] + 7 : typeIdx[2] - 2]
+  let valueIdx = matchstrpos(a:varinfo, ',value="\(.*\)"}')
+  if valueIdx[1] == -1
+    let dict['value'] = 'Complex value'
+  else
+    let dict['value'] = a:varinfo[valueIdx[1] + 8 : valueIdx[2] - 3]
+  endif
+  return dict
+endfunc
+
+func s:HandleVariablesMsg(msg)
+  let curwinid = win_getid()
+  if win_gotoid(s:varwin)
+
+    silent! %delete _
+    let spaceBuffer = 20
+    call setline(1, 'Type' .
+          \ repeat(' ', 16) .
+          \ 'Name' .
+          \ repeat(' ', 16) .
+          \ 'Value')
+    let cnt = 1
+    let capture = '{name=".\{-}",\%(arg=".\{-}",\)\{0,1\}type=".\{-}"\%(,value=".\{-}"\)\{0,1\}}'
+    let varinfo = matchstr(a:msg, capture, 0, cnt)
+    while varinfo != ''
+      let vardict = s:ParseVarinfo(varinfo)
+      call setline(cnt + 1, vardict['type'] .
+            \ repeat(' ', max([20 - len(vardict['type']), 1])) .
+            \ vardict['name'] .
+            \ repeat(' ', max([20 - len(vardict['name']), 1])) .
+            \ vardict['value'])
+      let cnt += 1
+      let varinfo = matchstr(a:msg, capture, 0, cnt)
+    endwhile
+  endif
+  call win_gotoid(curwinid)
+endfunc
+
 func s:CommOutput(job_id, msgs, event)
 
   for msg in a:msgs
@@ -885,6 +952,8 @@ func s:CommOutput(job_id, msgs, event)
       elseif msg =~ '^disassemble'
         let s:parsing_disasm_msg = 1
         let s:asm_lines = []
+      elseif msg =~ '^\^done,variables='
+        call s:HandleVariablesMsg(msg)
       endif
     endif
   endfor
@@ -930,6 +999,7 @@ func s:InstallCommands()
   command Program call s:GotoProgram()
   command Source call s:GotoSourcewinOrCreateIt()
   command Asm call s:GotoAsmwinOrCreateIt()
+  command Var call s:GotoVariableswinOrCreateIt()
   command Winbar call s:InstallWinbar(1)
 
   let map = 1
@@ -962,11 +1032,11 @@ func s:InstallCommands()
     if popup
       let s:saved_mousemodel = &mousemodel
       let &mousemodel = 'popup_setpos'
-      an 1.200 PopUp.-SEP3-	<Nop>
-      an 1.210 PopUp.Set\ breakpoint	:Break<CR>
-      an 1.220 PopUp.Clear\ breakpoint	:Clear<CR>
-      an 1.230 PopUp.Run\ until		:Until<CR>
-      an 1.240 PopUp.Evaluate		:Evaluate<CR>
+      an 1.200 PopUp.-SEP3-     <Nop>
+      an 1.210 PopUp.Set\ breakpoint    :Break<CR>
+      an 1.220 PopUp.Clear\ breakpoint  :Clear<CR>
+      an 1.230 PopUp.Run\ until         :Until<CR>
+      an 1.240 PopUp.Evaluate           :Evaluate<CR>
     endif
   endif
 
@@ -984,7 +1054,7 @@ func s:InstallWinbar(force)
   "   nnoremenu WinBar.Cont   :Continue<CR>
   "   nnoremenu WinBar.Stop   :Stop<CR>
   "   nnoremenu WinBar.Eval   :Evaluate<CR>
-  "   call add(s:winbar_winids, win_getid(winnr()))
+  "   call add(s:winbar_winids, win_getid())
   " endif
 endfunc
 
@@ -1005,6 +1075,7 @@ func s:DeleteCommands()
   delcommand Program
   delcommand Source
   delcommand Asm
+  delcommand Var
   delcommand Winbar
 
   if exists('s:k_map_saved')
@@ -1019,7 +1090,7 @@ func s:DeleteCommands()
 
   if has('menu')
     " Remove the WinBar entries from all windows where it was added.
-    " let curwinid = win_getid(winnr())
+    " let curwinid = win_getid()
     " for winid in s:winbar_winids
     "   if win_gotoid(winid)
     "     aunmenu WinBar.Step
@@ -1382,7 +1453,7 @@ endfunc
 func s:GotoSourcewinOrCreateIt()
   if !win_gotoid(s:sourcewin)
     new
-    let s:sourcewin = win_getid(winnr())
+    let s:sourcewin = win_getid()
     call s:InstallWinbar(0)
   endif
 endfunc
@@ -1415,19 +1486,21 @@ func s:GotoAsmwinOrCreateIt()
       exe 'new'
     endif
 
-    let s:asmwin = win_getid(winnr())
+    let s:asmwin = win_getid()
 
     setlocal nowrap
     setlocal number
     setlocal noswapfile
     setlocal buftype=nofile
+    setlocal bufhidden=wipe
+    setlocal signcolumn=no
     setlocal modifiable
 
-    let asmbuf = bufnr('Termdebug-asm-listing')
-    if asmbuf > 0
-      exe 'buffer' . asmbuf
+    if s:asmbuf > 0
+      exe 'buffer' . s:asmbuf
     else
-      exe 'file Termdebug-asm-listing'
+      silent file Termdebug-asm-listing
+      let s:asmbuf = bufnr('Termdebug-asm-listing')
     endif
 
     if s:GetDisasmWindowHeight() > 0
@@ -1448,17 +1521,75 @@ func s:GotoAsmwinOrCreateIt()
   endif
 endfunc
 
+func s:GetVariablesWindow()
+  if exists('g:termdebug_config')
+    return get(g:termdebug_config, 'variables_window', 0)
+  endif
+  if exists('g:termdebug_disasm_window')
+    return g:termdebug_variables_window
+  endif
+  return 0
+endfunc
+
+func s:GetVariablesWindowHeight()
+  if exists('g:termdebug_config')
+    return get(g:termdebug_config, 'variables_window_height', 0)
+  endif
+  if exists('g:termdebug_variables_window') && g:termdebug_variables_window > 1
+    return g:termdebug_variables_window
+  endif
+  return 0
+endfunc
+
+func s:GotoVariableswinOrCreateIt()
+  if !win_gotoid(s:varwin)
+    if win_gotoid(s:sourcewin)
+      exe 'rightbelow new'
+    else
+      exe 'new'
+    endif
+
+    let s:varwin = win_getid()
+
+    setlocal nowrap
+    setlocal noswapfile
+    setlocal buftype=nofile
+    setlocal bufhidden=wipe
+    setlocal signcolumn=no
+    setlocal modifiable
+
+    if s:varbuf > 0
+      exe 'buffer' . s:varbuf
+    else
+      silent file Termdebug-variables-listing
+      let s:varbuf = bufnr('Termdebug-variables-listing')
+    endif
+
+    if s:GetVariablesWindowHeight() > 0
+      exe 'resize ' .. s:GetVariablesWindowHeight()
+    endif
+  endif
+
+  if s:running
+    call s:SendCommand('-stack-list-variables 2')
+  endif
+endfunc
+
 " Handle stopping and running message from gdb.
 " Will update the sign that shows the current position.
 func s:HandleCursor(msg)
-  let wid = win_getid(winnr())
+  let wid = win_getid()
 
   if a:msg =~ '^\*stopped'
     "call ch_log('program stopped')
     let s:stopped = 1
+    if a:msg =~ '^\*stopped,reason="exited-normally"'
+      let s:running = 0
+    endif
   elseif a:msg =~ '^\*running'
     "call ch_log('program running')
     let s:stopped = 0
+    let s:running = 1
   endif
 
   if a:msg =~ 'fullname='
@@ -1472,7 +1603,7 @@ func s:HandleCursor(msg)
     if asm_addr != ''
       let s:asm_addr = asm_addr
 
-      let curwinid = win_getid(winnr())
+      let curwinid = win_getid()
       if win_gotoid(s:asmwin)
       let lnum = search('^' . s:asm_addr)
       if lnum == 0
@@ -1487,6 +1618,10 @@ func s:HandleCursor(msg)
     endif
   endif
 
+  if s:running && s:stopped && bufwinnr('Termdebug-variables-listing') != -1
+    call s:SendCommand('-stack-list-variables 2')
+  endif
+
   if a:msg =~ '^\(\*stopped\|=thread-selected\)' && filereadable(fname)
     let lnum = substitute(a:msg, '.*line="\([^"]*\)".*', '\1', '')
     if lnum =~ '^[0-9]*$'
@@ -1505,7 +1640,7 @@ func s:HandleCursor(msg)
         if &modified
           " TODO: find existing window
           exe 'split ' . fnameescape(fname)
-          let s:sourcewin = win_getid(winnr())
+          let s:sourcewin = win_getid()
           call s:InstallWinbar(0)
         else
           exe 'edit ' . fnameescape(fname)
-- 
cgit 


From 464472b4f75c91f36fa224600377ab1d1a467e14 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Mon, 21 Aug 2023 10:34:50 +0100
Subject: vim-patch:f6fb52b667ee

runtime(termdebug): refactor error printing (vim/vim#12856)

// vs not act like exception from vim or termdebug

https://github.com/vim/vim/commit/f6fb52b667eecb58bdd9b26bd462d5da61697cf7

Co-authored-by: Shane-XB-Qian <shane.qian@foxmail.com>
---
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 42 ++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index a8480fcc43..10e17bd5e0 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -128,6 +128,10 @@ func s:GetCommand()
   return type(cmd) == v:t_list ? copy(cmd) : [cmd]
 endfunc
 
+func s:Echoerr(msg)
+  echohl ErrorMsg | echom '[termdebug] ' .. a:msg | echohl None
+endfunc
+
 func s:StartDebug(bang, ...)
   " First argument is the command to debug, second core file or process ID.
   call s:StartDebug_internal({'gdb_args': a:000, 'bang': a:bang})
@@ -140,12 +144,12 @@ endfunc
 
 func s:StartDebug_internal(dict)
   if exists('s:gdbwin')
-    echoerr 'Terminal debugger already running, cannot run two'
+    call s:Echoerr('Terminal debugger already running, cannot run two')
     return
   endif
   let gdbcmd = s:GetCommand()
   if !executable(gdbcmd[0])
-    echoerr 'Cannot execute debugger program "' .. gdbcmd[0] .. '"'
+    call s:Echoerr('Cannot execute debugger program "' .. gdbcmd[0] .. '"')
     return
   endif
 
@@ -242,7 +246,7 @@ endfunc
 
 func s:CheckGdbRunning()
   if !s:gdb_running
-      echoerr string(s:GetCommand()[0]) . ' exited unexpectedly'
+      call s:Echoerr(string(s:GetCommand()[0]) . ' exited unexpectedly')
       call s:CloseBuffers()
       return ''
   endif
@@ -254,10 +258,10 @@ func s:StartDebug_term(dict)
   execute s:vertical ? 'vnew' : 'new'
   let s:pty_job_id = termopen('tail -f /dev/null;#gdb program')
   if s:pty_job_id == 0
-    echoerr 'invalid argument (or job table is full) while opening terminal window'
+    call s:Echoerr('Invalid argument (or job table is full) while opening terminal window')
     return
   elseif s:pty_job_id == -1
-    echoerr 'Failed to open the program terminal window'
+    call s:Echoerr('Failed to open the program terminal window')
     return
   endif
   let pty_job_info = nvim_get_chan_info(s:pty_job_id)
@@ -281,11 +285,11 @@ func s:StartDebug_term(dict)
         \ })
   " hide terminal buffer
   if s:comm_job_id == 0
-    echoerr 'invalid argument (or job table is full) while opening communication terminal window'
+    call s:Echoerr('Invalid argument (or job table is full) while opening communication terminal window')
     exe 'bwipe! ' . s:ptybuf
     return
   elseif s:comm_job_id == -1
-    echoerr 'Failed to open the communication terminal window'
+    call s:Echoerr('Failed to open the communication terminal window')
     exe 'bwipe! ' . s:ptybuf
     return
   endif
@@ -326,11 +330,11 @@ func s:StartDebug_term(dict)
   " call ch_log('executing "' . join(gdb_cmd) . '"')
   let s:gdb_job_id = termopen(gdb_cmd, {'on_exit': function('s:EndTermDebug')})
   if s:gdb_job_id == 0
-    echoerr 'invalid argument (or job table is full) while opening gdb terminal window'
+    call s:Echoerr('Invalid argument (or job table is full) while opening gdb terminal window')
     exe 'bwipe! ' . s:ptybuf
     return
   elseif s:gdb_job_id == -1
-    echoerr 'Failed to open the gdb terminal window'
+    call s:Echoerr('Failed to open the gdb terminal window')
     call s:CloseBuffers()
     return
   endif
@@ -386,7 +390,7 @@ func s:StartDebug_term(dict)
         " response can be in the same line or the next line
         let response = line1 . line2
         if response =~ 'Undefined command'
-          echoerr 'Sorry, your gdb is too old, gdb 7.12 is required'
+          call s:Echoerr('Sorry, your gdb is too old, gdb 7.12 is required')
           " CHECKME: possibly send a "server show version" here
           call s:CloseBuffers()
           return
@@ -405,7 +409,7 @@ func s:StartDebug_term(dict)
     endif
     let try_count += 1
     if try_count > 100
-      echoerr 'Cannot check if your gdb works, continuing anyway'
+      call s:Echoerr('Cannot check if your gdb works, continuing anyway')
       break
     endif
     sleep 10m
@@ -464,11 +468,11 @@ func s:StartDebug_prompt(dict)
     \ 'on_stdout': function('s:JobOutCallback', {'last_line': '', 'real_cb': function('s:GdbOutCallback')}),
     \ })
   if s:gdbjob == 0
-    echoerr 'invalid argument (or job table is full) while starting gdb job'
+    call s:Echoerr('Invalid argument (or job table is full) while starting gdb job')
     exe 'bwipe! ' . s:ptybuf
     return
   elseif s:gdbjob == -1
-    echoerr 'Failed to start the gdb job'
+    call s:Echoerr('Failed to start the gdb job')
     call s:CloseBuffers()
     return
   endif
@@ -484,10 +488,10 @@ func s:StartDebug_prompt(dict)
     wincmd x | wincmd j
     belowright let s:pty_job_id = termopen('tail -f /dev/null;#gdb program')
     if s:pty_job_id == 0
-      echoerr 'invalid argument (or job table is full) while opening terminal window'
+      call s:Echoerr('Invalid argument (or job table is full) while opening terminal window')
       return
     elseif s:pty_job_id == -1
-      echoerr 'Failed to open the program terminal window'
+      call s:Echoerr('Failed to open the program terminal window')
       return
     endif
     let pty_job_info = nvim_get_chan_info(s:pty_job_id)
@@ -616,7 +620,7 @@ func s:PromptInterrupt()
     " Using job_stop() does not work on MS-Windows, need to send SIGTRAP to
     " the debugger program so that gdb responds again.
     if s:pid == 0
-      echoerr 'Cannot interrupt gdb, did not find a process ID'
+      call s:Echoerr('Cannot interrupt gdb, did not find a process ID')
     else
       call debugbreak(s:pid)
     endif
@@ -696,7 +700,7 @@ endfunc
 " - change \\ to \
 func s:DecodeMessage(quotedText, literal)
   if a:quotedText[0] != '"'
-    echoerr 'DecodeMessage(): missing quote in ' . a:quotedText
+    call s:Echoerr('DecodeMessage(): missing quote in ' . a:quotedText)
     return
   endif
   let msg = a:quotedText
@@ -1189,7 +1193,7 @@ func s:ClearBreakpoint()
       endif
       echomsg 'Breakpoint ' . id . ' cleared from line ' . lnum . '.'
     else
-      echoerr 'Internal error trying to remove breakpoint at line ' . lnum . '!'
+      call s:Echoerr('Internal error trying to remove breakpoint at line ' . lnum . '!')
     endif
   else
     echomsg 'No breakpoint to remove at line ' . lnum . '.'
@@ -1447,7 +1451,7 @@ func s:HandleError(msg)
     return
   endif
   let msgVal = substitute(a:msg, '.*msg="\(.*\)"', '\1', '')
-  echoerr substitute(msgVal, '\\"', '"', 'g')
+  call s:Echoerr(substitute(msgVal, '\\"', '"', 'g'))
 endfunc
 
 func s:GotoSourcewinOrCreateIt()
-- 
cgit 


From ec971288267dece8f1bc492847b3ae6e5271acd0 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Mon, 21 Aug 2023 10:46:06 +0100
Subject: vim-patch:19968fc4ec2c

runtime(termdebug): re-indent lines (vim/vim#12857)

https://github.com/vim/vim/commit/19968fc4ec2c36c7d528c7326acf43e5d663ba39

Co-authored-by: Shane-XB-Qian <shane.qian@foxmail.com>
---
 runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 10e17bd5e0..83857221de 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -1637,9 +1637,9 @@ func s:HandleCursor(msg)
           " prompt, since it is unlikely we want to edit the file.
           " The file may be changed but not saved, warn for that.
           au SwapExists * echohl WarningMsg
-                \ | echo 'Warning: file is being edited elsewhere'
-                \ | echohl None
-                \ | let v:swapchoice = 'o'
+          \ | echo 'Warning: file is being edited elsewhere'
+          \ | echohl None
+          \ | let v:swapchoice = 'o'
         augroup END
         if &modified
           " TODO: find existing window
-- 
cgit 


From af78060b188236cca9ef3479cbab94df56c89721 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Mon, 21 Aug 2023 11:06:44 +0100
Subject: fix(termdebug): trim suffixed "\r" in CommOutput

Vim splits lines on "\r", then trims any prefixed "\n".

But in Nvim, job output lines are split on "\n" (like readfile() in binary
mode), so trim any suffixed "\r" instead.

This gets rid of the trailing "^M" character in messages parsed from the jobs.
---
 runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 83857221de..c490fbf441 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -875,7 +875,9 @@ func s:HandleDisasmMsg(msg)
   else
     let value = substitute(a:msg, '^\~\"[ ]*', '', '')
     let value = substitute(value, '^=>[ ]*', '', '')
-    let value = substitute(value, '\\n\"\r$', '', '')
+    " Nvim already trims the final "\r" in s:CommOutput()
+    " let value = substitute(value, '\\n\"\r$', '', '')
+    let value = substitute(value, '\\n\"$', '', '')
     let value = substitute(value, '\r', '', '')
     let value = substitute(value, '\\t', ' ', 'g')
 
@@ -929,11 +931,10 @@ func s:HandleVariablesMsg(msg)
 endfunc
 
 func s:CommOutput(job_id, msgs, event)
-
   for msg in a:msgs
-    " remove prefixed NL
-    if msg[0] == "\n"
-      let msg = msg[1:]
+    " Nvim job lines are split on "\n", so trim a suffixed CR.
+    if msg[-1:] == "\r"
+      let msg = msg[:-2]
     endif
 
     if s:parsing_disasm_msg
-- 
cgit 


From c413b42c456bc48ef58d4e2ac9b3862787819282 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Tue, 22 Aug 2023 20:54:41 +0100
Subject: fix(termdebug): prompt mode breaks with &splitbelow set

Unlike Vim, termopen() doesn't split, so you can't use the modifier like that.
Remove the fragile :wincmd shenanigans.
---
 runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index c490fbf441..4108a6a19f 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -204,9 +204,9 @@ func s:StartDebug_internal(dict)
   endif
   if !has('win32') && !use_prompt
     let s:way = 'terminal'
-   else
+  else
     let s:way = 'prompt'
-   endif
+  endif
 
   if s:way == 'prompt'
     call s:StartDebug_prompt(a:dict)
@@ -484,9 +484,8 @@ func s:StartDebug_prompt(dict)
   else
     " Unix: Run the debugged program in a terminal window.  Open it below the
     " gdb window.
-    execute 'new'
-    wincmd x | wincmd j
-    belowright let s:pty_job_id = termopen('tail -f /dev/null;#gdb program')
+    belowright new
+    let s:pty_job_id = termopen('tail -f /dev/null;#gdb program')
     if s:pty_job_id == 0
       call s:Echoerr('Invalid argument (or job table is full) while opening terminal window')
       return
-- 
cgit 


From 21477bdb27571b6d7c51038192b74a3ec53e8110 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Tue, 22 Aug 2023 19:52:49 +0100
Subject: vim-patch:a76f3221cdcf

runtime(termdebug): Fix various Termdebug issues (vim/vim#12875)

* Fix some Termdebug issues after vim/vim#12403
* Fix :Asm in Termdebug prompt mode
* Fix Termdebug s:DecodeMessage escaping logic

https://github.com/vim/vim/commit/a76f3221cdcfff6880213839de4d04cf0c7c60f8

Adjust disassembly message forwarding for Nvim, as its callback can receive
many lines at once.

Currently, just forward each disassembly line individually to s:CommOutput();
it's possible to do this in batch instead, but this is simpler.

I suggested moving to a GDB MI-based approach for the disassemble stuff
upstream, which should simplify the logic a lot if implemented (and possibly
allow for getting rid of the `&"disassemble ...` special-casing).

Also, correct "(gdb)" to include a trailing space; the stray GDB prompts were
being ignored by s:CommOutput() anyway, so this had caused no ill effects.
---
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 82 ++++++++++++----------
 1 file changed, 44 insertions(+), 38 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 4108a6a19f..a2c5ba0867 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -234,10 +234,10 @@ endfunc
 " Use when debugger didn't start or ended.
 func s:CloseBuffers()
   exe 'bwipe! ' . s:ptybuf
-  if s:asmbuf > 0
+  if s:asmbuf > 0 && bufexists(s:asmbuf)
     exe 'bwipe! ' . s:asmbuf
   endif
-  if s:varbuf > 0
+  if s:varbuf > 0 && bufexists(s:varbuf)
     exe 'bwipe! ' . s:varbuf
   endif
   s:running = 0
@@ -649,30 +649,36 @@ endfunc
 func s:GdbOutCallback(job_id, msgs, event)
   "call ch_log('received from gdb: ' . a:text)
 
-  " Drop the gdb prompt, we have our own.
-  " Drop status and echo'd commands.
-  call filter(a:msgs, { index, val ->
-        \ val !=# '(gdb)' && val !=# '^done' && val[0] !=# '&'})
-
+  let comm_msgs = []
   let lines = []
-  let index = 0
 
   for msg in a:msgs
+    " Disassembly messages need to be forwarded as-is.
+    if s:parsing_disasm_msg || msg =~ '^&"disassemble'
+      call s:CommOutput(a:job_id, [msg], a:event)
+      continue
+    endif
+
+    " Drop the gdb prompt, we have our own.
+    " Drop status and echo'd commands.
+    if msg == '(gdb) ' || msg == '^done' || msg[0] == '&'
+      continue
+    endif
+
     if msg =~ '^\^error,msg='
       if exists('s:evalexpr')
             \ && s:DecodeMessage(msg[11:], v:false)
             \    =~ 'A syntax error in expression, near\|No symbol .* in current context'
         " Silently drop evaluation errors.
-        call remove(a:msgs, index)
         unlet s:evalexpr
         continue
       endif
     elseif msg[0] == '~'
       call add(lines, s:DecodeMessage(msg[1:], v:false))
-      call remove(a:msgs, index)
       continue
     endif
-    let index += 1
+
+    call add(comm_msgs, msg)
   endfor
 
   let curwinid = win_getid()
@@ -687,12 +693,13 @@ func s:GdbOutCallback(job_id, msgs, event)
   endif
 
   call win_gotoid(curwinid)
-  call s:CommOutput(a:job_id, a:msgs, a:event)
+  call s:CommOutput(a:job_id, comm_msgs, a:event)
 endfunc
 
 " Decode a message from gdb.  "quotedText" starts with a ", return the text up
-" to the next ", unescaping characters:
+" to the next unescaped ", unescaping characters:
 " - remove line breaks (unless "literal" is v:true)
+" - change \" to "
 " - change \\t to \t (unless "literal" is v:true)
 " - change \0xhh to \xhh (disabled for now)
 " - change \ooo to octal
@@ -703,24 +710,25 @@ func s:DecodeMessage(quotedText, literal)
     return
   endif
   let msg = a:quotedText
-        \ ->substitute('^"\|".*', '', 'g')
-        " multi-byte characters arrive in octal form
-        " NULL-values must be kept encoded as those break the string otherwise
+        \ ->substitute('^"\|[^\\]\zs".*', '', 'g')
+        \ ->substitute('\\"', '"', 'g')
+        "\ multi-byte characters arrive in octal form
+        "\ NULL-values must be kept encoded as those break the string otherwise
         \ ->substitute('\\000', s:NullRepl, 'g')
         \ ->substitute('\\\o\o\o', {-> eval('"' .. submatch(0) .. '"')}, 'g')
-        " Note: GDB docs also mention hex encodings - the translations below work
-        "       but we keep them out for performance-reasons until we actually see
-        "       those in mi-returns
-        " \ ->substitute('\\0x\(\x\x\)', {-> eval('"\x' .. submatch(1) .. '"')}, 'g')
-        " \ ->substitute('\\0x00', s:NullRepl, 'g')
+        "\ Note: GDB docs also mention hex encodings - the translations below work
+        "\       but we keep them out for performance-reasons until we actually see
+        "\       those in mi-returns
+        "\ \ ->substitute('\\0x\(\x\x\)', {-> eval('"\x' .. submatch(1) .. '"')}, 'g')
+        "\ \ ->substitute('\\0x00', s:NullRepl, 'g')
         \ ->substitute('\\\\', '\', 'g')
         \ ->substitute(s:NullRepl, '\\000', 'g')
   if !a:literal
-          return msg
+    return msg
         \ ->substitute('\\t', "\t", 'g')
         \ ->substitute('\\n', '', 'g')
   else
-          return msg
+    return msg
   endif
 endfunc
 const s:NullRepl = 'XXXNULLXXX'
@@ -757,15 +765,7 @@ func s:EndTermDebug(job_id, exit_code, event)
     doauto <nomodeline> User TermdebugStopPre
   endif
 
-  if s:asmbuf > 0
-    exe 'bwipe! ' . s:asmbuf
-  endif
-  if s:varbuf > 0
-    exe 'bwipe! ' . s:varbuf
-  endif
-  let s:running = 0
   unlet s:gdbwin
-
   call s:EndDebugCommon()
 endfunc
 
@@ -775,6 +775,13 @@ func s:EndDebugCommon()
   if exists('s:ptybuf') && s:ptybuf
     exe 'bwipe! ' . s:ptybuf
   endif
+  if s:asmbuf > 0 && bufexists(s:asmbuf)
+    exe 'bwipe! ' . s:asmbuf
+  endif
+  if s:varbuf > 0 && bufexists(s:varbuf)
+    exe 'bwipe! ' . s:varbuf
+  endif
+  let s:running = 0
 
   " Restore 'signcolumn' in all buffers for which it was set.
   call win_gotoid(s:sourcewin)
@@ -824,7 +831,6 @@ func s:EndPromptDebug(job_id, exit_code, event)
   "call ch_log("Returning from EndPromptDebug()")
 endfunc
 
-" - CommOutput: disassemble $pc
 " - CommOutput: &"disassemble $pc\n"
 " - CommOutput: ~"Dump of assembler code for function main(int, char**):\n"
 " - CommOutput: ~"   0x0000555556466f69 <+0>:\tpush   rbp\n"
@@ -834,7 +840,6 @@ endfunc
 " - CommOutput: ~"End of assembler dump.\n"
 " - CommOutput: ^done
 
-" - CommOutput: disassemble $pc
 " - CommOutput: &"disassemble $pc\n"
 " - CommOutput: &"No function contains specified address.\n"
 " - CommOutput: ^error,msg="No function contains specified address."
@@ -866,12 +871,12 @@ func s:HandleDisasmMsg(msg)
       call s:SendCommand('disassemble $pc,+100')
     endif
     let s:parsing_disasm_msg = 0
-  elseif a:msg =~ '\&\"disassemble \$pc'
+  elseif a:msg =~ '^&"disassemble \$pc'
     if a:msg =~ '+100'
       " This is our second disasm attempt
       let s:parsing_disasm_msg = 2
     endif
-  else
+  elseif a:msg !~ '^&"disassemble'
     let value = substitute(a:msg, '^\~\"[ ]*', '', '')
     let value = substitute(value, '^=>[ ]*', '', '')
     " Nvim already trims the final "\r" in s:CommOutput()
@@ -953,9 +958,10 @@ func s:CommOutput(job_id, msgs, event)
         call s:HandleEvaluate(msg)
       elseif msg =~ '^\^error,msg='
         call s:HandleError(msg)
-      elseif msg =~ '^disassemble'
+      elseif msg =~ '^&"disassemble'
         let s:parsing_disasm_msg = 1
         let s:asm_lines = []
+        call s:HandleDisasmMsg(msg)
       elseif msg =~ '^\^done,variables='
         call s:HandleVariablesMsg(msg)
       endif
@@ -1500,7 +1506,7 @@ func s:GotoAsmwinOrCreateIt()
     setlocal signcolumn=no
     setlocal modifiable
 
-    if s:asmbuf > 0
+    if s:asmbuf > 0 && bufexists(s:asmbuf)
       exe 'buffer' . s:asmbuf
     else
       silent file Termdebug-asm-listing
@@ -1562,7 +1568,7 @@ func s:GotoVariableswinOrCreateIt()
     setlocal signcolumn=no
     setlocal modifiable
 
-    if s:varbuf > 0
+    if s:varbuf > 0 && bufexists(s:varbuf)
       exe 'buffer' . s:varbuf
     else
       silent file Termdebug-variables-listing
-- 
cgit 


From 8aad4b84250a6e4d667bd7d15622164cd95fa1af Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Tue, 22 Aug 2023 22:39:29 +0100
Subject: fix(termdebug): send SIGINT when interrupting prompt mode

Unlike Vim's job_stop(), Nvim's jobstop() does not take a signal argument, and
always sends SIGTERM/KILL.

:Stop and Ctrl-C in prompt mode is supposed to interrupt the program like in
terminal mode, not kill GDB.

Also, maybe libuv's kill() works on Windows? If so, the logic above could be
removed, but I don't have a Windows machine available to test that.

Also "set nomodified" when ending prompt mode, like Vim (avoids E37).
---
 runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index a2c5ba0867..ab569772f5 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -624,7 +624,7 @@ func s:PromptInterrupt()
       call debugbreak(s:pid)
     endif
   else
-    call jobstop(s:gdbjob)
+    call v:lua.vim.uv.kill(jobpid(s:gdbjob), 'sigint')
   endif
 endfunc
 
@@ -821,6 +821,7 @@ func s:EndPromptDebug(job_id, exit_code, event)
 
   let curwinid = win_getid()
   call win_gotoid(s:gdbwin)
+  set nomodified
   close
   if curwinid != s:gdbwin
     call win_gotoid(curwinid)
-- 
cgit 


From 92ef2b2bcd4f8082e1b05af0663ffef422461e6a Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:18:17 +0100
Subject: vim-patch:2ae7ffe0bc3c

runtime(termdebug): add frame related commands (vim/vim#12511)

implementing `:Frame`, `:Up` and `:Down'

https://github.com/vim/vim/commit/2ae7ffe0bc3c3ed9fcae35ef23a2b78908580201

Use maparg() for saving K as it's since been ported (and supports Lua callbacks
and the other API fields).

Use the 3 argument variant of mapset(), as the single argument one isn't ported
yet (v8.2.4861).

Co-authored-by: Simon Sobisch <simonsobisch@web.de>
---
 runtime/doc/nvim_terminal_emulator.txt             | 23 ++++++
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 94 ++++++++++++++++++++--
 2 files changed, 109 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 482b608ef9..ff3a5791ca 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -317,6 +317,21 @@ This is similar to using "print" in the gdb window.
 You can usually shorten `:Evaluate` to `:Ev`.
 
 
+Navigation in the Stack ~
+					*termdebug-variables* *:Frame*
+ `:Frame`	Select the given frame, using  either the frame's
+                stack number, address, or function name.
+ `:Up`	        Select the frame that called the current one with an
+                optional argument to say how many frames to go up.
+ `+`		same (see |termdebug_map_plus| to disable)
+ `:Down`	        Select the frame called by the current one with
+                an optional argument to say how many frames to go down.
+ `-`		same (see |termdebug_map_minus| to disable)
+
+This is similar to using "print" in the gdb window.
+You can usually shorten `:Evaluate` to `:Ev`.
+
+
 Other commands ~
 							*termdebug-commands*
  *:Gdb*	     jump to the gdb window
@@ -392,6 +407,14 @@ The K key is normally mapped to :Evaluate. If you do not want this use: >vim
 	let g:termdebug_config['map_K'] = 0
 If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_map_K = 0
+<
+						*termdebug_map_minus*
+The - key is normally mapped to :Down. If you do not want this use: >vim
+	let g:termdebug_config['map_minus'] = 0
+<
+						*termdebug_map_plus*
+The + key is normally mapped to :Up. If you do not want this use: >vim
+	let g:termdebug_config['map_plus'] = 0
 <
 						*termdebug_disasm_window*
 If you want the Asm window shown by default, set the "disasm_window" flag to
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index ab569772f5..781c34396d 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -1005,6 +1005,10 @@ func s:InstallCommands()
     command Continue call chansend(s:gdb_job_id, "continue\r")
   endif
 
+  command -nargs=* Frame call s:Frame(<q-args>)
+  command -nargs=* Up call s:Up(<q-args>)
+  command -nargs=* Down call s:Down(<q-args>)
+
   command -range -nargs=* Evaluate call s:Evaluate(<range>, <q-args>)
   command Gdb call win_gotoid(s:gdbwin)
   command Program call s:GotoProgram()
@@ -1020,17 +1024,29 @@ func s:InstallCommands()
     let map = g:termdebug_map_K
   endif
   if map
-    " let s:k_map_saved = maparg('K', 'n', 0, 1)
-    let s:k_map_saved = {}
-    for map in nvim_get_keymap('n')
-      if map.lhs ==# 'K'
-        let s:k_map_saved = map
-        break
-      endif
-    endfor
+    let s:k_map_saved = maparg('K', 'n', 0, 1)
     nnoremap K :Evaluate<CR>
   endif
 
+  let map = 1
+  if exists('g:termdebug_config')
+    let map = get(g:termdebug_config, 'map_plus', 1)
+  endif
+  if map
+    let s:plus_map_saved = maparg('+', 'n', 0, 1)
+    nnoremap + :Up<CR>
+  endif
+
+  let map = 1
+  if exists('g:termdebug_config')
+    let map = get(g:termdebug_config, 'map_minus', 1)
+  endif
+  if map
+    let s:minus_map_saved = maparg('-', 'n', 0, 1)
+    nnoremap - :Down<CR>
+  endif
+
+
   if has('menu') && &mouse != ''
     call s:InstallWinbar(0)
 
@@ -1081,6 +1097,9 @@ func s:DeleteCommands()
   delcommand Arguments
   delcommand Stop
   delcommand Continue
+  delcommand Frame
+  delcommand Up
+  delcommand Down
   delcommand Evaluate
   delcommand Gdb
   delcommand Program
@@ -1098,6 +1117,24 @@ func s:DeleteCommands()
     endif
     unlet s:k_map_saved
   endif
+  if exists('s:plus_map_saved')
+    if empty(s:plus_map_saved)
+      nunmap +
+    else
+      " call mapset(s:plus_map_saved)
+      call mapset('n', 0, s:plus_map_saved)
+    endif
+    unlet s:plus_map_saved
+  endif
+  if exists('s:minus_map_saved')
+    if empty(s:minus_map_saved)
+      nunmap -
+    else
+      " call mapset(s:minus_map_saved)
+      call mapset('n', 0, s:minus_map_saved)
+    endif
+    unlet s:minus_map_saved
+  endif
 
   if has('menu')
     " Remove the WinBar entries from all windows where it was added.
@@ -1214,6 +1251,47 @@ func s:Run(args)
   call s:SendResumingCommand('-exec-run')
 endfunc
 
+" :Frame - go to a specfic frame in the stack
+func s:Frame(arg)
+  " Note: we explicit do not use mi's command
+  " call s:SendCommand('-stack-select-frame "' . a:arg .'"')
+  " as we only get a "done" mi response and would have to open the file
+  " 'manually' - using cli command "frame" provides us with the mi response
+  " already parsed and allows for more formats
+  if a:arg =~ '^\d\+$' || a:arg == ''
+    " specify frame by number
+    call s:SendCommand('-interpreter-exec mi "frame ' . a:arg .'"')
+  elseif a:arg =~ '^0x[0-9a-fA-F]\+$'
+    " specify frame by stack address
+    call s:SendCommand('-interpreter-exec mi "frame address ' . a:arg .'"')
+  else
+    " specify frame by function name
+    call s:SendCommand('-interpreter-exec mi "frame function ' . a:arg .'"')
+  endif
+endfunc
+
+" :Up - go one frame in the stack "higher"
+func s:Up(arg)
+  if a:arg != ''
+    let s:cmd = '"up ' . a:arg . '"'
+  else
+    let s:cmd = '"up"'
+  endif
+  " the 'correct' one would be -stack-select-frame N, but we don't know N
+  call s:SendCommand('-interpreter-exec console ' . s:cmd)
+endfunc
+
+" :Down - go one frame in the stack "below"
+func s:Down(arg)
+  if a:arg != ''
+    let s:cmd = '"down ' . a:arg . '"'
+  else
+    let s:cmd = '"down"'
+  endif
+  " the 'correct' one would be -stack-select-frame N, but we don't know N
+  call s:SendCommand('-interpreter-exec console ' . s:cmd)
+endfunc
+
 func s:SendEval(expr)
   " check for "likely" boolean expressions, in which case we take it as lhs
   if a:expr =~ "[=!<>]="
-- 
cgit 


From e3b385bed5d27a3c50687526737e8e146c3abddc Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Wed, 23 Aug 2023 17:41:21 +0100
Subject: vim-patch:3d3a9152fa6d

runtime(termdebug): more termdebug fixes and improvements (vim/vim#12892)

- Fix and attempt to simplify :Frame/:Up/:Down documentation.

- Accept a count instead for :Up/:Down/+/-.

- Update the "Last Change" dates.

- Fix a missing :let (caused an error if gdb fails to start).

- Wipe the prompt buffer when ending prompt mode (if it exists and wasn't wiped
  by the user first). Avoids issues with stale prompt buffers (such as E95 when
  starting a new prompt mode session).

- Kill the gdb job if the prompt buffer is unloaded (similar to what's done for
  a terminal buffer). Fixes not being able to start a new termdebug session if
  the buffer was wiped by the user, for example.

https://github.com/vim/vim/commit/3d3a9152fa6de7038fdfd6d6de25230ed825552a
---
 runtime/doc/nvim_terminal_emulator.txt             | 29 +++++++--------
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 43 ++++++++--------------
 2 files changed, 28 insertions(+), 44 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index ff3a5791ca..d0d535566d 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -317,19 +317,16 @@ This is similar to using "print" in the gdb window.
 You can usually shorten `:Evaluate` to `:Ev`.
 
 
-Navigation in the Stack ~
-					*termdebug-variables* *:Frame*
- `:Frame`	Select the given frame, using  either the frame's
-                stack number, address, or function name.
- `:Up`	        Select the frame that called the current one with an
-                optional argument to say how many frames to go up.
- `+`		same (see |termdebug_map_plus| to disable)
- `:Down`	        Select the frame called by the current one with
-                an optional argument to say how many frames to go down.
- `-`		same (see |termdebug_map_minus| to disable)
-
-This is similar to using "print" in the gdb window.
-You can usually shorten `:Evaluate` to `:Ev`.
+Navigating stack frames ~
+				*termdebug-frames* *:Frame* *:Up* *:Down*
+ `:Frame` [frame]	select frame [frame], which is a frame number,
+			address, or function name (default: current frame)
+ `:Up` [count]		go up [count] frames (default: 1; the frame that
+			called the current)
+ `+`			same (see |termdebug_map_plus| to disable)
+ `:Down` [count]	go down [count] frames (default: 1; the frame called
+			by the current)
+ `-`			same (see |termdebug_map_minus| to disable)
 
 
 Other commands ~
@@ -403,17 +400,17 @@ If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_use_prompt = 1
 <
 						*termdebug_map_K*
-The K key is normally mapped to :Evaluate. If you do not want this use: >vim
+The K key is normally mapped to |:Evaluate|. If you do not want this use: >vim
 	let g:termdebug_config['map_K'] = 0
 If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_map_K = 0
 <
 						*termdebug_map_minus*
-The - key is normally mapped to :Down. If you do not want this use: >vim
+The - key is normally mapped to |:Down|. If you do not want this use: >vim
 	let g:termdebug_config['map_minus'] = 0
 <
 						*termdebug_map_plus*
-The + key is normally mapped to :Up. If you do not want this use: >vim
+The + key is normally mapped to |:Up|. If you do not want this use: >vim
 	let g:termdebug_config['map_plus'] = 0
 <
 						*termdebug_disasm_window*
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 781c34396d..e0f2c84f2d 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -2,7 +2,7 @@
 "
 " Author: Bram Moolenaar
 " Copyright: Vim license applies, see ":help license"
-" Last Change: 2023 Jun 24
+" Last Change: 2023 Aug 23
 "
 " WORK IN PROGRESS - The basics works stable, more to come
 " Note: In general you need at least GDB 7.12 because this provides the
@@ -240,7 +240,7 @@ func s:CloseBuffers()
   if s:varbuf > 0 && bufexists(s:varbuf)
     exe 'bwipe! ' . s:varbuf
   endif
-  s:running = 0
+  let s:running = 0
   unlet! s:gdbwin
 endfunc
 
@@ -476,6 +476,7 @@ func s:StartDebug_prompt(dict)
     call s:CloseBuffers()
     return
   endif
+  exe $'au BufUnload <buffer={s:promptbuf}> ++once call jobstop(s:gdbjob)'
 
   let s:ptybuf = 0
   if has('win32')
@@ -819,12 +820,8 @@ func s:EndPromptDebug(job_id, exit_code, event)
     doauto <nomodeline> User TermdebugStopPre
   endif
 
-  let curwinid = win_getid()
-  call win_gotoid(s:gdbwin)
-  set nomodified
-  close
-  if curwinid != s:gdbwin
-    call win_gotoid(curwinid)
+  if bufexists(s:promptbuf)
+    exe 'bwipe! ' . s:promptbuf
   endif
 
   call s:EndDebugCommon()
@@ -1006,8 +1003,8 @@ func s:InstallCommands()
   endif
 
   command -nargs=* Frame call s:Frame(<q-args>)
-  command -nargs=* Up call s:Up(<q-args>)
-  command -nargs=* Down call s:Down(<q-args>)
+  command -count=1 Up call s:Up(<count>)
+  command -count=1 Down call s:Down(<count>)
 
   command -range -nargs=* Evaluate call s:Evaluate(<range>, <q-args>)
   command Gdb call win_gotoid(s:gdbwin)
@@ -1034,7 +1031,7 @@ func s:InstallCommands()
   endif
   if map
     let s:plus_map_saved = maparg('+', 'n', 0, 1)
-    nnoremap + :Up<CR>
+    nnoremap <expr> + $'<Cmd>{v:count1}Up<CR>'
   endif
 
   let map = 1
@@ -1043,7 +1040,7 @@ func s:InstallCommands()
   endif
   if map
     let s:minus_map_saved = maparg('-', 'n', 0, 1)
-    nnoremap - :Down<CR>
+    nnoremap <expr> - $'<Cmd>{v:count1}Down<CR>'
   endif
 
 
@@ -1270,26 +1267,16 @@ func s:Frame(arg)
   endif
 endfunc
 
-" :Up - go one frame in the stack "higher"
-func s:Up(arg)
-  if a:arg != ''
-    let s:cmd = '"up ' . a:arg . '"'
-  else
-    let s:cmd = '"up"'
-  endif
+" :Up - go a:count frames in the stack "higher"
+func s:Up(count)
   " the 'correct' one would be -stack-select-frame N, but we don't know N
-  call s:SendCommand('-interpreter-exec console ' . s:cmd)
+  call s:SendCommand($'-interpreter-exec console "up {a:count}"')
 endfunc
 
-" :Down - go one frame in the stack "below"
-func s:Down(arg)
-  if a:arg != ''
-    let s:cmd = '"down ' . a:arg . '"'
-  else
-    let s:cmd = '"down"'
-  endif
+" :Down - go a:count frames in the stack "below"
+func s:Down(count)
   " the 'correct' one would be -stack-select-frame N, but we don't know N
-  call s:SendCommand('-interpreter-exec console ' . s:cmd)
+  call s:SendCommand($'-interpreter-exec console "down {a:count}"')
 endfunc
 
 func s:SendEval(expr)
-- 
cgit 


From 0bd82b540eb492c2c41f8b18be9ac749008ee340 Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:22:50 +0100
Subject: refactor(termdebug): reindent some things

Mostly to make it more consistent and to match Vim more where applicable.
---
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 196 ++++++++++-----------
 1 file changed, 98 insertions(+), 98 deletions(-)

(limited to 'runtime')

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index e0f2c84f2d..c436e015cc 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -246,9 +246,9 @@ endfunc
 
 func s:CheckGdbRunning()
   if !s:gdb_running
-      call s:Echoerr(string(s:GetCommand()[0]) . ' exited unexpectedly')
-      call s:CloseBuffers()
-      return ''
+    call s:Echoerr(string(s:GetCommand()[0]) . ' exited unexpectedly')
+    call s:CloseBuffers()
+    return ''
   endif
   return 'ok'
 endfunc
@@ -464,9 +464,9 @@ func s:StartDebug_prompt(dict)
 
   " call ch_log('executing "' . join(gdb_cmd) . '"')
   let s:gdbjob = jobstart(gdb_cmd, {
-    \ 'on_exit': function('s:EndPromptDebug'),
-    \ 'on_stdout': function('s:JobOutCallback', {'last_line': '', 'real_cb': function('s:GdbOutCallback')}),
-    \ })
+        \ 'on_exit': function('s:EndPromptDebug'),
+        \ 'on_stdout': function('s:JobOutCallback', {'last_line': '', 'real_cb': function('s:GdbOutCallback')}),
+        \ })
   if s:gdbjob == 0
     call s:Echoerr('Invalid argument (or job table is full) while starting gdb job')
     exe 'bwipe! ' . s:ptybuf
@@ -1197,7 +1197,7 @@ func s:SetBreakpoint(at)
 
   " Use the fname:lnum format, older gdb can't handle --source.
   let at = empty(a:at) ?
-  \ fnameescape(expand('%:p')) . ':' . line('.') : a:at
+        \ fnameescape(expand('%:p')) . ':' . line('.') : a:at
   call s:SendCommand('-break-insert ' . at)
   if do_continue
     Continue
@@ -1417,101 +1417,101 @@ function! s:CloseFloatingHoverOnCursorMove(win_id, opened) abort
 endfunction
 
 function! s:CloseFloatingHoverOnBufEnter(win_id, bufnr) abort
-    let winnr = win_id2win(a:win_id)
-    if winnr == 0
-        " Float window was already closed
-        autocmd! nvim_termdebug_close_hover
-        return
-    endif
-    if winnr == winnr()
-        " Cursor is moving into floating window. Do not close it
-        return
-    endif
-    if bufnr('%') == a:bufnr
-        " When current buffer opened hover window, it's not another buffer. Skipped
-        return
-    endif
+  let winnr = win_id2win(a:win_id)
+  if winnr == 0
+    " Float window was already closed
     autocmd! nvim_termdebug_close_hover
-    call nvim_win_close(a:win_id, v:true)
-  endfunction
+    return
+  endif
+  if winnr == winnr()
+    " Cursor is moving into floating window. Do not close it
+    return
+  endif
+  if bufnr('%') == a:bufnr
+    " When current buffer opened hover window, it's not another buffer. Skipped
+    return
+  endif
+  autocmd! nvim_termdebug_close_hover
+  call nvim_win_close(a:win_id, v:true)
+endfunction
 
 " Open preview window. Window is open in:
 "   - Floating window on Neovim (0.4.0 or later)
 "   - Preview window on Neovim (0.3.0 or earlier) or Vim
 function! s:OpenHoverPreview(lines, filetype) abort
-    " Use local variable since parameter is not modifiable
-    let lines = a:lines
-    let bufnr = bufnr('%')
-
-    let use_float_win = s:ShouldUseFloatWindow()
-    if use_float_win
-      let pos = getpos('.')
-
-      " Calculate width and height
-      let width = 0
-      for index in range(len(lines))
-        let line = lines[index]
-        let lw = strdisplaywidth(line)
-        if lw > width
-          let width = lw
-        endif
-        let lines[index] = line
-      endfor
-
-      let height = len(lines)
-
-      " Calculate anchor
-      " Prefer North, but if there is no space, fallback into South
-      let bottom_line = line('w0') + winheight(0) - 1
-      if pos[1] + height <= bottom_line
-        let vert = 'N'
-        let row = 1
-      else
-        let vert = 'S'
-        let row = 0
+  " Use local variable since parameter is not modifiable
+  let lines = a:lines
+  let bufnr = bufnr('%')
+
+  let use_float_win = s:ShouldUseFloatWindow()
+  if use_float_win
+    let pos = getpos('.')
+
+    " Calculate width and height
+    let width = 0
+    for index in range(len(lines))
+      let line = lines[index]
+      let lw = strdisplaywidth(line)
+      if lw > width
+        let width = lw
       endif
+      let lines[index] = line
+    endfor
 
-      " Prefer West, but if there is no space, fallback into East
-      if pos[2] + width <= &columns
-        let hor = 'W'
-        let col = 0
-      else
-        let hor = 'E'
-        let col = 1
-      endif
+    let height = len(lines)
 
-      let buf = nvim_create_buf(v:false, v:true)
-      call nvim_buf_set_lines(buf, 0, -1, v:true, lines)
-      " using v:true for second argument of nvim_open_win make the floating
-      " window disappear
-      let float_win_id = nvim_open_win(buf, v:false, {
-            \   'relative': 'cursor',
-            \   'anchor': vert . hor,
-            \   'row': row,
-            \   'col': col,
-            \   'width': width,
-            \   'height': height,
-            \   'style': 'minimal',
-            \ })
-
-      if a:filetype isnot v:null
-        call nvim_set_option_value('filetype', a:filetype, { 'win' : float_win_id })
-      endif
+    " Calculate anchor
+    " Prefer North, but if there is no space, fallback into South
+    let bottom_line = line('w0') + winheight(0) - 1
+    if pos[1] + height <= bottom_line
+      let vert = 'N'
+      let row = 1
+    else
+      let vert = 'S'
+      let row = 0
+    endif
 
-      call nvim_set_option_value('modified', v:false, { 'buf' : buf })
-      call nvim_set_option_value('modifiable', v:false, { 'buf' : buf })
-
-      " Unlike preview window, :pclose does not close window. Instead, close
-      " hover window automatically when cursor is moved.
-      let call_after_move = printf('<SID>CloseFloatingHoverOnCursorMove(%d, %s)', float_win_id, string(pos))
-      let call_on_bufenter = printf('<SID>CloseFloatingHoverOnBufEnter(%d, %d)', float_win_id, bufnr)
-      augroup nvim_termdebug_close_hover
-        execute 'autocmd CursorMoved,CursorMovedI,InsertEnter <buffer> call ' . call_after_move
-        execute 'autocmd BufEnter * call ' . call_on_bufenter
-      augroup END
+    " Prefer West, but if there is no space, fallback into East
+    if pos[2] + width <= &columns
+      let hor = 'W'
+      let col = 0
     else
-      echomsg a:lines[0]
+      let hor = 'E'
+      let col = 1
+    endif
+
+    let buf = nvim_create_buf(v:false, v:true)
+    call nvim_buf_set_lines(buf, 0, -1, v:true, lines)
+    " using v:true for second argument of nvim_open_win make the floating
+    " window disappear
+    let float_win_id = nvim_open_win(buf, v:false, {
+          \   'relative': 'cursor',
+          \   'anchor': vert . hor,
+          \   'row': row,
+          \   'col': col,
+          \   'width': width,
+          \   'height': height,
+          \   'style': 'minimal',
+          \ })
+
+    if a:filetype isnot v:null
+      call nvim_set_option_value('filetype', a:filetype, { 'win' : float_win_id })
     endif
+
+    call nvim_set_option_value('modified', v:false, { 'buf' : buf })
+    call nvim_set_option_value('modifiable', v:false, { 'buf' : buf })
+
+    " Unlike preview window, :pclose does not close window. Instead, close
+    " hover window automatically when cursor is moved.
+    let call_after_move = printf('<SID>CloseFloatingHoverOnCursorMove(%d, %s)', float_win_id, string(pos))
+    let call_on_bufenter = printf('<SID>CloseFloatingHoverOnBufEnter(%d, %d)', float_win_id, bufnr)
+    augroup nvim_termdebug_close_hover
+      execute 'autocmd CursorMoved,CursorMovedI,InsertEnter <buffer> call ' . call_after_move
+      execute 'autocmd BufEnter * call ' . call_on_bufenter
+    augroup END
+  else
+    echomsg a:lines[0]
+  endif
 endfunction
 
 " Handle an error.
@@ -1681,15 +1681,15 @@ func s:HandleCursor(msg)
 
       let curwinid = win_getid()
       if win_gotoid(s:asmwin)
-      let lnum = search('^' . s:asm_addr)
-      if lnum == 0
-        call s:SendCommand('disassemble $pc')
-      else
-        call sign_unplace('TermDebug', #{id: s:asm_id})
-        call sign_place(s:asm_id, 'TermDebug', 'debugPC', '%', #{lnum: lnum})
-      endif
+        let lnum = search('^' . s:asm_addr)
+        if lnum == 0
+          call s:SendCommand('disassemble $pc')
+        else
+          call sign_unplace('TermDebug', #{id: s:asm_id})
+          call sign_place(s:asm_id, 'TermDebug', 'debugPC', '%', #{lnum: lnum})
+        endif
 
-      call win_gotoid(curwinid)
+        call win_gotoid(curwinid)
       endif
     endif
   endif
-- 
cgit 


From 5d8ab32f3871b0232972cac1116ac7cba98389e5 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Fri, 25 Aug 2023 11:17:36 -0700
Subject: feat(treesitter): add a query editor (#24703)

---
 runtime/doc/news.txt               |   2 +
 runtime/doc/treesitter.txt         |  10 +-
 runtime/ftplugin/query.lua         |   4 +-
 runtime/lua/vim/treesitter.lua     |  11 ++-
 runtime/lua/vim/treesitter/dev.lua | 198 +++++++++++++++++++++++++++++++++----
 runtime/plugin/nvim.lua            |   4 +
 6 files changed, 205 insertions(+), 24 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 82b390853c..637a33b555 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -133,6 +133,8 @@ The following new APIs and features were added.
     `vim.treesitter.language.register`.
   • The `#set!` directive now supports `injection.self` and `injection.parent` for injecting either the current node's language
     or the parent LanguageTree's language, respectively.
+  • Added `vim.treesitter.preview_query()`, for live editing of treesitter
+    queries.
 
 • |vim.ui.open()| opens URIs using the system default handler (macOS `open`,
   Windows `explorer`, Linux `xdg-open`, etc.)
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 139b986786..287985f75b 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -676,8 +676,9 @@ inspect_tree({opts})                           *vim.treesitter.inspect_tree()*
     language tree.
 
     While in the window, press "a" to toggle display of anonymous nodes, "I"
-    to toggle the display of the source language of each node, and press
-    <Enter> to jump to the node under the cursor in the source buffer.
+    to toggle the display of the source language of each node, "o" to toggle
+    the query previewer, and press <Enter> to jump to the node under the
+    cursor in the source buffer.
 
     Can also be shown with `:InspectTree`.                      *:InspectTree*
 
@@ -730,6 +731,11 @@ node_contains({node}, {range})                *vim.treesitter.node_contains()*
     Return: ~
         (boolean) True if the {node} contains the {range}
 
+preview_query()                               *vim.treesitter.preview_query()*
+    Open a window for live editing of a treesitter query.
+
+    Can also be shown with `:PreviewQuery`.                    *:PreviewQuery*
+
 start({bufnr}, {lang})                                *vim.treesitter.start()*
     Starts treesitter highlighting for a buffer
 
diff --git a/runtime/ftplugin/query.lua b/runtime/ftplugin/query.lua
index accf38c199..964c221ad4 100644
--- a/runtime/ftplugin/query.lua
+++ b/runtime/ftplugin/query.lua
@@ -1,6 +1,6 @@
 -- Neovim filetype plugin file
 -- Language:	Tree-sitter query
--- Last Change:	2022 Apr 25
+-- Last Change:	2023 Aug 23
 
 if vim.b.did_ftplugin == 1 then
   return
@@ -14,6 +14,8 @@ vim.treesitter.start()
 -- set omnifunc
 vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
 
+vim.opt_local.iskeyword:append('.')
+
 -- query linter
 local buf = vim.api.nvim_get_current_buf()
 local query_lint_on = vim.g.query_lint_on or { 'BufEnter', 'BufWrite' }
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 04420c81e3..4f84fc2e0f 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -472,8 +472,8 @@ end
 --- Open a window that displays a textual representation of the nodes in the language tree.
 ---
 --- While in the window, press "a" to toggle display of anonymous nodes, "I" to toggle the
---- display of the source language of each node, and press <Enter> to jump to the node under the
---- cursor in the source buffer.
+--- display of the source language of each node, "o" to toggle the query previewer, and press
+--- <Enter> to jump to the node under the cursor in the source buffer.
 ---
 --- Can also be shown with `:InspectTree`. *:InspectTree*
 ---
@@ -494,6 +494,13 @@ function M.inspect_tree(opts)
   require('vim.treesitter.dev').inspect_tree(opts)
 end
 
+--- Open a window for live editing of a treesitter query.
+---
+--- Can also be shown with `:PreviewQuery`. *:PreviewQuery*
+function M.preview_query()
+  require('vim.treesitter.dev').preview_query()
+end
+
 --- Returns the fold level for {lnum} in the current buffer. Can be set directly to 'foldexpr':
 --- <pre>lua
 --- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index f7625eb94b..b7f2c0e473 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -124,7 +124,7 @@ function TSTreeView:new(bufnr, lang)
   end
 
   local t = {
-    ns = api.nvim_create_namespace(''),
+    ns = api.nvim_create_namespace('treesitter/dev-inspect'),
     nodes = nodes,
     named = named,
     opts = {
@@ -158,6 +158,29 @@ local function escape_quotes(text)
   return string.format('"%s"', text:sub(2, #text - 1):gsub('"', '\\"'))
 end
 
+---@param w integer
+---@return boolean closed Whether the window was closed.
+local function close_win(w)
+  if api.nvim_win_is_valid(w) then
+    api.nvim_win_close(w, true)
+    return true
+  end
+
+  return false
+end
+
+---@param w integer
+---@param b integer
+local function set_dev_properties(w, b)
+  vim.wo[w].scrolloff = 5
+  vim.wo[w].wrap = false
+  vim.wo[w].foldmethod = 'manual' -- disable folding
+  vim.bo[b].buflisted = false
+  vim.bo[b].buftype = 'nofile'
+  vim.bo[b].bufhidden = 'wipe'
+  vim.bo[b].filetype = 'query'
+end
+
 --- Write the contents of this View into {bufnr}.
 ---
 ---@param bufnr integer Buffer number to write into.
@@ -247,12 +270,9 @@ function M.inspect_tree(opts)
   local win = api.nvim_get_current_win()
   local pg = assert(TSTreeView:new(buf, opts.lang))
 
-  -- Close any existing dev window
-  if vim.b[buf].dev then
-    local w = vim.b[buf].dev
-    if api.nvim_win_is_valid(w) then
-      api.nvim_win_close(w, true)
-    end
+  -- Close any existing inspector window
+  if vim.b[buf].dev_inspect then
+    close_win(vim.b[buf].dev_inspect)
   end
 
   local w = opts.winid
@@ -268,16 +288,10 @@ function M.inspect_tree(opts)
     b = api.nvim_win_get_buf(w)
   end
 
-  vim.b[buf].dev = w
-
-  vim.wo[w].scrolloff = 5
-  vim.wo[w].wrap = false
-  vim.wo[w].foldmethod = 'manual' -- disable folding
-  vim.bo[b].buflisted = false
-  vim.bo[b].buftype = 'nofile'
-  vim.bo[b].bufhidden = 'wipe'
+  vim.b[buf].dev_inspect = w
+  vim.b[b].dev_base = win -- base window handle
   vim.b[b].disable_query_linter = true
-  vim.bo[b].filetype = 'query'
+  set_dev_properties(w, b)
 
   local title --- @type string?
   local opts_title = opts.title
@@ -306,7 +320,7 @@ function M.inspect_tree(opts)
   api.nvim_buf_set_keymap(b, 'n', 'a', '', {
     desc = 'Toggle anonymous nodes',
     callback = function()
-      local row, col = unpack(api.nvim_win_get_cursor(w))
+      local row, col = unpack(api.nvim_win_get_cursor(w)) ---@type integer, integer
       local curnode = pg:get(row)
       while curnode and not curnode.named do
         row = row - 1
@@ -336,6 +350,15 @@ function M.inspect_tree(opts)
       pg:draw(b)
     end,
   })
+  api.nvim_buf_set_keymap(b, 'n', 'o', '', {
+    desc = 'Toggle query previewer',
+    callback = function()
+      local preview_w = vim.b[buf].dev_preview
+      if not preview_w or not close_win(preview_w) then
+        M.preview_query()
+      end
+    end,
+  })
 
   local group = api.nvim_create_augroup('treesitter/dev', {})
 
@@ -436,11 +459,148 @@ function M.inspect_tree(opts)
     buffer = buf,
     once = true,
     callback = function()
-      if api.nvim_win_is_valid(w) then
-        api.nvim_win_close(w, true)
+      close_win(w)
+    end,
+  })
+end
+
+local preview_ns = api.nvim_create_namespace('treesitter/dev-preview')
+
+---@param query_win integer
+---@param base_win integer
+local function update_preview_highlights(query_win, base_win)
+  local base_buf = api.nvim_win_get_buf(base_win)
+  local query_buf = api.nvim_win_get_buf(query_win)
+  local parser = vim.treesitter.get_parser(base_buf)
+  local lang = parser:lang()
+  api.nvim_buf_clear_namespace(base_buf, preview_ns, 0, -1)
+  local query_content = table.concat(api.nvim_buf_get_lines(query_buf, 0, -1, false), '\n')
+
+  local ok_query, query = pcall(vim.treesitter.query.parse, lang, query_content)
+  if not ok_query then
+    return
+  end
+
+  local cursor_word = vim.fn.expand('<cword>') --[[@as string]]
+  -- Only highlight captures if the cursor is on a capture name
+  if cursor_word:find('^@') == nil then
+    return
+  end
+  -- Remove the '@' from the cursor word
+  cursor_word = cursor_word:sub(2)
+  local topline, botline = vim.fn.line('w0', base_win), vim.fn.line('w$', base_win)
+  for id, node in query:iter_captures(parser:trees()[1]:root(), base_buf, topline - 1, botline) do
+    local capture_name = query.captures[id]
+    if capture_name == cursor_word then
+      local lnum, col, end_lnum, end_col = node:range()
+      api.nvim_buf_set_extmark(base_buf, preview_ns, lnum, col, {
+        end_row = end_lnum,
+        end_col = end_col,
+        hl_group = 'Visual',
+        virt_text = {
+          { capture_name, 'Title' },
+        },
+      })
+    end
+  end
+end
+
+--- @private
+function M.preview_query()
+  local buf = api.nvim_get_current_buf()
+  local win = api.nvim_get_current_win()
+
+  -- Close any existing previewer window
+  if vim.b[buf].dev_preview then
+    close_win(vim.b[buf].dev_preview)
+  end
+
+  local cmd = '60vnew'
+  -- If the inspector is open, place the previewer above it.
+  local base_win = vim.b[buf].dev_base ---@type integer?
+  local base_buf = base_win and api.nvim_win_get_buf(base_win)
+  local inspect_win = base_buf and vim.b[base_buf].dev_inspect
+  if base_win and base_buf and api.nvim_win_is_valid(inspect_win) then
+    vim.api.nvim_set_current_win(inspect_win)
+    buf = base_buf
+    win = base_win
+    cmd = 'new'
+  end
+  vim.cmd(cmd)
+
+  local ok, parser = pcall(vim.treesitter.get_parser, buf)
+  if not ok then
+    return nil, 'No parser available for the given buffer'
+  end
+  local lang = parser:lang()
+
+  local query_win = api.nvim_get_current_win()
+  local query_buf = api.nvim_win_get_buf(query_win)
+
+  vim.b[buf].dev_preview = query_win
+  vim.bo[query_buf].omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
+  set_dev_properties(query_win, query_buf)
+
+  -- Note that omnifunc guesses the language based on the containing folder,
+  -- so we add the parser's language to the buffer's name so that omnifunc
+  -- can infer the language later.
+  api.nvim_buf_set_name(query_buf, string.format('%s/query_previewer.scm', lang))
+
+  local group = api.nvim_create_augroup('treesitter/dev-preview', {})
+  api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave' }, {
+    group = group,
+    buffer = query_buf,
+    desc = 'Update query previewer diagnostics when the query changes',
+    callback = function()
+      vim.treesitter.query.lint(query_buf, { langs = lang, clear = false })
+    end,
+  })
+  api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave', 'CursorMoved', 'BufEnter' }, {
+    group = group,
+    buffer = query_buf,
+    desc = 'Update query previewer highlights when the cursor moves',
+    callback = function()
+      update_preview_highlights(query_win, win)
+    end,
+  })
+  api.nvim_create_autocmd('BufLeave', {
+    group = group,
+    buffer = query_buf,
+    desc = 'Clear the query previewer highlights when leaving the previewer',
+    callback = function()
+      api.nvim_buf_clear_namespace(buf, preview_ns, 0, -1)
+    end,
+  })
+  api.nvim_create_autocmd('BufLeave', {
+    group = group,
+    buffer = buf,
+    desc = 'Clear the query previewer highlights when leaving the source buffer',
+    callback = function()
+      if not api.nvim_buf_is_loaded(query_buf) then
+        return true
       end
+
+      api.nvim_buf_clear_namespace(query_buf, preview_ns, 0, -1)
+    end,
+  })
+  api.nvim_create_autocmd('BufHidden', {
+    group = group,
+    buffer = buf,
+    desc = 'Close the previewer window when the source buffer is hidden',
+    once = true,
+    callback = function()
+      close_win(query_win)
     end,
   })
+
+  api.nvim_buf_set_lines(query_buf, 0, -1, false, {
+    ';; Write your query here. Use @captures to highlight matches in the source buffer.',
+    ';; Completion for grammar nodes is available (see :h compl-omni)',
+    '',
+    '',
+  })
+  vim.cmd('normal! G')
+  vim.cmd.startinsert()
 end
 
 return M
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index 0a33826b82..2ddccfcff6 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -18,3 +18,7 @@ vim.api.nvim_create_user_command('InspectTree', function(cmd)
     vim.treesitter.inspect_tree()
   end
 end, { desc = 'Inspect treesitter language tree for buffer', count = true })
+
+vim.api.nvim_create_user_command('PreviewQuery', function()
+  vim.treesitter.preview_query()
+end, { desc = 'Preview treesitter query' })
-- 
cgit 


From b1cfb299df2ef412339f594173ed23c75c090c8a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 26 Aug 2023 08:35:05 +0800
Subject: docs: various clarifications (#24876)

---
 runtime/doc/builtin.txt           | 18 +++++++++---------
 runtime/doc/lua.txt               |  6 +++---
 runtime/doc/options.txt           |  5 +++--
 runtime/lua/vim/_meta/builtin.lua |  6 +++---
 runtime/lua/vim/_meta/options.lua |  5 +++--
 runtime/lua/vim/_meta/vimfn.lua   | 18 +++++++++---------
 6 files changed, 30 insertions(+), 28 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 67a6b8df9c..9510f12045 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -8316,15 +8316,15 @@ type({expr})                                                            *type()*
 		The result is a Number representing the type of {expr}.
 		Instead of using the number directly, it is better to use the
 		v:t_ variable that has the value:
-		        Number:     0 (|v:t_number|)
-			String:     1 (|v:t_string|)
-			Funcref:    2 (|v:t_func|)
-			List:       3 (|v:t_list|)
-			Dictionary: 4 (|v:t_dict|)
-			Float:      5 (|v:t_float|)
-			Boolean:    6 (|v:true| and |v:false|)
-			Null:       7 (|v:null|)
-			Blob:      10 (|v:t_blob|)
+			Number:	    0  |v:t_number|
+			String:	    1  |v:t_string|
+			Funcref:    2  |v:t_func|
+			List:	    3  |v:t_list|
+			Dictionary: 4  |v:t_dict|
+			Float:	    5  |v:t_float|
+			Boolean:    6  |v:t_bool| (|v:false| and |v:true|)
+			Null:	    7  (|v:null|)
+			Blob:	   10  |v:t_blob|
 		For backward compatibility, this method can be used: >vim
 			if type(myvar) == type(0) | endif
 			if type(myvar) == type("") | endif
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index b4ca88251e..39eb530c24 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -979,12 +979,12 @@ vim.str_utf_end({str}, {index})                            *vim.str_utf_end()*
 
     Examples: >lua
 
-     -- The character 'æ' are equal to the bytes '\xc3\xa6' (using UTF-8)
+     -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
 
      -- Returns 0 because the index is pointing at the last byte of a character
      vim.str_utf_end('æ', 2)
 
-     -- Returns 1 because the index is pointing at the second last byte of a character
+     -- Returns 1 because the index is pointing at the penultimate byte of a character
      vim.str_utf_end('æ', 1)
 <
 
@@ -1016,7 +1016,7 @@ vim.str_utf_start({str}, {index})                        *vim.str_utf_start()*
 
     Examples: >lua
 
-     -- The character 'æ' are equal to the bytes '\xc3\xa6' (using UTF-8)
+     -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
 
      -- Returns 0 because the index is pointing at the first byte of a character
      vim.str_utf_start('æ', 1)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index eea9f2cf4b..e2ca9c1992 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4259,8 +4259,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 'mousescroll'		string	(default "ver:3,hor:6")
 			global
 	This option controls the number of lines / columns to scroll by when
-	scrolling with a mouse. The option is a comma separated list of parts.
-	Each part consists of a direction and a count as follows:
+	scrolling with a mouse wheel (|scroll-mouse-wheel|). The option is
+	a comma-separated list. Each part consists of a direction and a count
+	as follows:
 		direction:count,direction:count
 	Direction is one of either "hor" or "ver". "hor" controls horizontal
 	scrolling and "ver" controls vertical scrolling. Count sets the amount
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index a5508bdc04..d7b76a803c 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -132,7 +132,7 @@ function vim.str_utf_pos(str) end
 ---
 --- Examples:
 --- <pre>lua
---- -- The character 'æ' are equal to the bytes '\xc3\xa6' (using UTF-8)
+--- -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
 ---
 --- -- Returns 0 because the index is pointing at the first byte of a character
 --- vim.str_utf_start('æ', 1)
@@ -151,12 +151,12 @@ function vim.str_utf_start(str, index) end
 ---
 --- Examples:
 --- <pre>lua
---- -- The character 'æ' are equal to the bytes '\xc3\xa6' (using UTF-8)
+--- -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
 ---
 --- -- Returns 0 because the index is pointing at the last byte of a character
 --- vim.str_utf_end('æ', 2)
 ---
---- -- Returns 1 because the index is pointing at the second last byte of a character
+--- -- Returns 1 because the index is pointing at the penultimate byte of a character
 --- vim.str_utf_end('æ', 1)
 --- </pre>
 ---
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 8edb87df91..4fb3141df0 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -4323,8 +4323,9 @@ vim.go.mousemoveevent = vim.o.mousemoveevent
 vim.go.mousemev = vim.go.mousemoveevent
 
 --- This option controls the number of lines / columns to scroll by when
---- scrolling with a mouse. The option is a comma separated list of parts.
---- Each part consists of a direction and a count as follows:
+--- scrolling with a mouse wheel (`scroll-mouse-wheel`). The option is
+--- a comma-separated list. Each part consists of a direction and a count
+--- as follows:
 --- 	direction:count,direction:count
 --- Direction is one of either "hor" or "ver". "hor" controls horizontal
 --- scrolling and "ver" controls vertical scrolling. Count sets the amount
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 0ac8985274..ebd74046ce 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -9878,15 +9878,15 @@ function vim.fn.trunc(expr) end
 --- The result is a Number representing the type of {expr}.
 --- Instead of using the number directly, it is better to use the
 --- v:t_ variable that has the value:
----         Number:     0 (|v:t_number|)
----   String:     1 (|v:t_string|)
----   Funcref:    2 (|v:t_func|)
----   List:       3 (|v:t_list|)
----   Dictionary: 4 (|v:t_dict|)
----   Float:      5 (|v:t_float|)
----   Boolean:    6 (|v:true| and |v:false|)
----   Null:       7 (|v:null|)
----   Blob:      10 (|v:t_blob|)
+---   Number:      0  |v:t_number|
+---   String:      1  |v:t_string|
+---   Funcref:    2  |v:t_func|
+---   List:      3  |v:t_list|
+---   Dictionary: 4  |v:t_dict|
+---   Float:      5  |v:t_float|
+---   Boolean:    6  |v:t_bool| (|v:false| and |v:true|)
+---   Null:      7  (|v:null|)
+---   Blob:     10  |v:t_blob|
 --- For backward compatibility, this method can be used: >vim
 ---   if type(myvar) == type(0) | endif
 ---   if type(myvar) == type("") | endif
-- 
cgit 


From b46e93c5fd2c73b99b618d4954ab8d1c71ad3fb0 Mon Sep 17 00:00:00 2001
From: Alisue <lambdalisue@gmail.com>
Date: Mon, 7 Aug 2023 00:19:51 +0900
Subject: docs(msgpack_rpc): add "msgpack-rpc" client type

---
 runtime/doc/api.txt           | 6 +++++-
 runtime/lua/vim/_meta/api.lua | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 793fcd703b..343c63f4b0 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1336,7 +1336,11 @@ nvim_set_client_info({name}, {version}, {type}, {methods}, {attributes})
       • {type}        Must be one of the following values. Client libraries
                       should default to "remote" unless overridden by the
                       user.
-                      • "remote" remote client connected to Nvim.
+                      • "remote" remote client connected "Nvim flavored"
+                        MessagePack-RPC (responses must be in reverse order of
+                        requests). |msgpack-rpc|
+                      • "msgpack-rpc" remote client connected to Nvim via
+                        fully MessagePack-RPC compliant protocol.
                       • "ui" gui frontend
                       • "embedder" application using Nvim as a component (for
                         example, IDE/editor implementing a vim mode).
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index c0e4e35e7d..fdf5016b68 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1679,7 +1679,11 @@ function vim.api.nvim_select_popupmenu_item(item, insert, finish, opts) end
 --- @param type string Must be one of the following values. Client libraries
 ---                   should default to "remote" unless overridden by the
 ---                   user.
----                   • "remote" remote client connected to Nvim.
+---                   • "remote" remote client connected "Nvim flavored"
+---                     MessagePack-RPC (responses must be in reverse order of
+---                     requests). `msgpack-rpc`
+---                   • "msgpack-rpc" remote client connected to Nvim via
+---                     fully MessagePack-RPC compliant protocol.
 ---                   • "ui" gui frontend
 ---                   • "embedder" application using Nvim as a component (for
 ---                     example, IDE/editor implementing a vim mode).
-- 
cgit 


From b641fc38749a2a52e40fa7eca6c7c41b1d9b031c Mon Sep 17 00:00:00 2001
From: Alisue <lambdalisue@gmail.com>
Date: Mon, 7 Aug 2023 04:10:32 +0900
Subject: docs(megpack_rpc): add news entry for msgpack-rpc client type

---
 runtime/doc/news.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 637a33b555..56bdd07171 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -152,6 +152,9 @@ The following new APIs and features were added.
 • Functions that take a severity as an optional parameter (e.g.
   |vim.diagnostic.get()|) now also accept a list of severities |vim.diagnostic.severity|
 
+• New RPC client type `msgpack-rpc` is added for `nvim_set_client_info` to
+  support fully MessagePack-RPC compliant clients.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
-- 
cgit 


From 35570e4a11bef061777d741929f74fa66ba3f45a Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Fri, 25 Aug 2023 10:53:35 +0300
Subject: feat(float): implement footer

Problem: Now way to show text at the bottom part of floating window
  border (a.k.a. "footer").

Solution: Allows `footer` and `footer_pos` config fields similar to
  `title` and `title_pos`.
---
 runtime/doc/api.txt                   | 17 ++++++++++++-----
 runtime/doc/news.txt                  |  3 +++
 runtime/lua/vim/_meta/api.lua         | 17 ++++++++++++-----
 runtime/lua/vim/_meta/api_keysets.lua |  2 ++
 4 files changed, 29 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 343c63f4b0..53d4282ec5 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3138,11 +3138,18 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
                       specified by character: [ ["+", "MyCorner"], ["x",
                       "MyBorder"] ].
 
-                  • title: Title (optional) in window border, String or list.
-                    List is [text, highlight] tuples. if is string the default
-                    highlight group is `FloatTitle`.
-                  • title_pos: Title position must set with title option.
-                    value can be of `left` `center` `right` default is left.
+                  • title: Title (optional) in window border, string or list.
+                    List should consist of `[text, highlight]` tuples. If
+                    string, the default highlight group is `FloatTitle`.
+                  • title_pos: Title position. Must be set with `title`
+                    option. Value can be one of "left", "center", or "right".
+                    Default is `"left"`.
+                  • footer: Footer (optional) in window border, string or
+                    list. List should consist of `[text, highlight]` tuples.
+                    If string, the default highlight group is `FloatTitle`.
+                  • footer_pos: Footer position. Must be set with `footer`
+                    option. Value can be one of "left", "center", or "right".
+                    Default is `"left"`.
                   • noautocmd: If true then no buffer-related autocommand
                     events such as |BufEnter|, |BufLeave| or |BufWinEnter| may
                     fire from calling this function.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 56bdd07171..c28ccb191e 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -155,6 +155,9 @@ The following new APIs and features were added.
 • New RPC client type `msgpack-rpc` is added for `nvim_set_client_info` to
   support fully MessagePack-RPC compliant clients.
 
+• Floating windows can now show footer with new `footer` and `footer_pos`
+  config fields.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index fdf5016b68..7704a60cf8 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1551,11 +1551,18 @@ function vim.api.nvim_open_term(buffer, opts) end
 ---                   specified by character: [ ["+", "MyCorner"], ["x",
 ---                   "MyBorder"] ].
 ---
----               • title: Title (optional) in window border, String or list.
----                 List is [text, highlight] tuples. if is string the default
----                 highlight group is `FloatTitle`.
----               • title_pos: Title position must set with title option.
----                 value can be of `left` `center` `right` default is left.
+---               • title: Title (optional) in window border, string or list.
+---                 List should consist of `[text, highlight]` tuples. If
+---                 string, the default highlight group is `FloatTitle`.
+---               • title_pos: Title position. Must be set with `title`
+---                 option. Value can be one of "left", "center", or "right".
+---                 Default is `"left"`.
+---               • footer: Footer (optional) in window border, string or
+---                 list. List should consist of `[text, highlight]` tuples.
+---                 If string, the default highlight group is `FloatTitle`.
+---               • footer_pos: Footer position. Must be set with `footer`
+---                 option. Value can be one of "left", "center", or "right".
+---                 Default is `"left"`.
 ---               • noautocmd: If true then no buffer-related autocommand
 ---                 events such as `BufEnter`, `BufLeave` or `BufWinEnter` may
 ---                 fire from calling this function.
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index 941780202e..08c29ebe7a 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -108,6 +108,8 @@ error('Cannot require a meta file')
 --- @field border? any
 --- @field title? any
 --- @field title_pos? string
+--- @field footer? any
+--- @field footer_pos? string
 --- @field style? string
 --- @field noautocmd? boolean
 
-- 
cgit 


From 986bf7e78d09286e198b696630254eb097ad0875 Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Fri, 25 Aug 2023 10:53:39 +0300
Subject: feat(highlight): add `FloatFooter` highlight group

Problem: No clear separation of floating title and footer highlighting.

Solution: Add new `FloatFooter` highlight group.
---
 runtime/doc/api.txt           | 3 ++-
 runtime/doc/news.txt          | 2 +-
 runtime/doc/syntax.txt        | 2 ++
 runtime/doc/vim_diff.txt      | 1 +
 runtime/lua/vim/_meta/api.lua | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 53d4282ec5..e68aafe051 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -479,6 +479,7 @@ to disable various visual features such as the 'number' column.
 Other highlight groups specific to floating windows:
 - |hl-FloatBorder| for window's border
 - |hl-FloatTitle| for window's title
+- |hl-FloatFooter| for window's footer
 
 Currently, floating windows don't support some widgets like scrollbar.
 
@@ -3146,7 +3147,7 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
                     Default is `"left"`.
                   • footer: Footer (optional) in window border, string or
                     list. List should consist of `[text, highlight]` tuples.
-                    If string, the default highlight group is `FloatTitle`.
+                    If string, the default highlight group is `FloatFooter`.
                   • footer_pos: Footer position. Must be set with `footer`
                     option. Value can be one of "left", "center", or "right".
                     Default is `"left"`.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c28ccb191e..4f9f362b1e 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -156,7 +156,7 @@ The following new APIs and features were added.
   support fully MessagePack-RPC compliant clients.
 
 • Floating windows can now show footer with new `footer` and `footer_pos`
-  config fields.
+  config fields. Uses |hl-FloatFooter| by default.
 
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 59f8235ad2..6c0c542737 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -5273,6 +5273,8 @@ NormalFloat	Normal text in floating windows.
 FloatBorder	Border of floating windows.
 							*hl-FloatTitle*
 FloatTitle	Title of floating windows.
+							*hl-FloatFooter*
+FloatFooter	Footer of floating windows.
 							*hl-NormalNC*
 NormalNC	Normal text in non-current windows.
 							*hl-Pmenu*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 29a7c50585..ab5e795c16 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -258,6 +258,7 @@ Highlight groups:
   |hl-NormalFloat| highlights floating window
   |hl-FloatBorder| highlights border of a floating window
   |hl-FloatTitle| highlights title of a floating window
+  |hl-FloatFooter| highlights footer of a floating window
   |hl-NormalNC| highlights non-current windows
   |hl-MsgArea| highlights messages/cmdline area
   |hl-MsgSeparator| highlights separator for scrolled messages
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 7704a60cf8..dd67fdb38b 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1559,7 +1559,7 @@ function vim.api.nvim_open_term(buffer, opts) end
 ---                 Default is `"left"`.
 ---               • footer: Footer (optional) in window border, string or
 ---                 list. List should consist of `[text, highlight]` tuples.
----                 If string, the default highlight group is `FloatTitle`.
+---                 If string, the default highlight group is `FloatFooter`.
 ---               • footer_pos: Footer position. Must be set with `footer`
 ---                 option. Value can be one of "left", "center", or "right".
 ---                 Default is `"left"`.
-- 
cgit 


From c4728a5c4619a87b67720ca35225e2e45aaafccd Mon Sep 17 00:00:00 2001
From: zhaozg <zhaozg@gmail.com>
Date: Fri, 25 Aug 2023 21:52:13 +0800
Subject: build(deps): bump luv to HEAD dcd1a1c

---
 runtime/doc/luvref.txt | 76 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 8c842de97a..226e79b68b 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -3,7 +3,7 @@
 
                     LUV REFERENCE MANUAL
 
-								      *luvref*
+                                                                        *luvref*
 This file documents the Lua bindings for the LibUV library which is used for
 Nvim's event-loop and is accessible from Lua via |vim.uv| (e.g., |uv.version()|
 is exposed as `vim.uv.version()`).
@@ -1355,7 +1355,7 @@ uv.process_kill({process}, {signum})                         *uv.process_kill()*
 
                 Parameters:
                 - `process`: `uv_process_t userdata`
-                - `signum`: `integer` or `string`
+                - `signum`: `integer` or `string` or `nil` (default: `sigterm`)
 
                 Sends the specified signal to the given process handle. Check
                 the documentation on |uv_signal_t| for signal support,
@@ -1367,7 +1367,7 @@ uv.kill({pid}, {signum})                                             *uv.kill()*
 
                 Parameters:
                 - `pid`: `integer`
-                - `signum`: `integer` or `string`
+                - `signum`: `integer` or `string` or `nil` (default: `sigterm`)
 
                 Sends the specified signal to the given PID. Check the
                 documentation on |uv_signal_t| for signal support, specially
@@ -2064,6 +2064,69 @@ uv.pipe({read_flags}, {write_flags})                                 *uv.pipe()*
                     end)
 <
 
+uv.pipe_bind2({pipe}, {name}, {flags})                         *uv.pipe_bind2()*
+
+                > method form `pipe:pipe_bind(name, flags)`
+	
+                Parameters:
+                - `pipe`: `uv_pipe_t userdata`
+                - `name`: `string`
+                - `flags`: `integer` or `table` or `nil`(default: 0)
+
+                Flags:
+                 - If `type(flags)` is `number`, it must be `0` or
+                   `uv.constants.PIPE_NO_TRUNCATE`.
+                 - If `type(flags)` is `table`, it must be `{}` or
+                   `{ no_trunate = true|false }`.
+                 - If `type(flags)` is `nil`, it use default value `0`.
+                 - Returns `EINVAL` for unsupported flags without performing the
+                   bind.
+
+                Bind the pipe to a file path (Unix) or a name (Windows).
+
+                Supports Linux abstract namespace sockets. namelen must include
+                the leading '\0' byte but not the trailing nul byte.
+
+                Returns: `0` or `fail`
+
+                *Note*:
+                1. Paths on Unix get truncated to sizeof(sockaddr_un.sun_path)
+                   bytes, typically between 92 and 108 bytes.
+                2. New in version 1.46.0.
+
+uv.pipe_connect2(pipe, name, [flags], [callback])           *uv.pipe_connect2()*
+
+                > method form `pipe:connect2(name, [flags], [callback])`
+
+                Parameters:
+                - `pipe`: `uv_pipe_t userdata`
+                - `name`: `string`
+                - `flags`: `integer` or `table` or `nil`(default: 0)
+                - `callback`: `callable` or `nil`
+                  - `err`: `nil` or `string`
+
+                `Flags`:
+
+                - If `type(flags)` is `number`, it must be `0` or
+                  `uv.constants.PIPE_NO_TRUNCATE`.
+                - If `type(flags)` is `table`, it must be `{}` or
+                  `{ no_trunate = true|false }`.
+                - If `type(flags)` is `nil`, it use default value `0`.
+                - Returns `EINVAL` for unsupported flags without performing the
+                  bind operation.
+
+                Connect to the Unix domain socket or the named pipe.
+
+                Supports Linux abstract namespace sockets. namelen must include
+                the leading nul byte but not the trailing nul byte.
+
+                Returns: `uv_connect_t userdata` or `fail`
+
+                *Note*:
+                1. Paths on Unix get truncated to sizeof(sockaddr_un.sun_path)
+                   bytes, typically between 92 and 108 bytes.
+                2. New in version 1.46.0.
+
 ==============================================================================
 `uv_tty_t` — TTY handle                                  *luv-tty-handle* *uv_tty_t*
 
@@ -3950,7 +4013,12 @@ uv.os_setenv({name}, {value})                                   *uv.os_setenv()*
 
                 WARNING: This function is not thread safe.
 
-uv.os_unsetenv()                                              *uv.os_unsetenv()*
+uv.os_unsetenv({name})                                        *uv.os_unsetenv()*
+
+                Parameters:
+                - `name`: `string`
+
+                Unsets the environmental variable specified by `name`.
 
                 Returns: `boolean` or `fail`
 
-- 
cgit 


From 874b8172a69a0a5b0973f32410036823edc0dba7 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Thu, 24 Aug 2023 10:45:20 +0530
Subject: build(deps): bump tree-sitter-python to v0.20.4

---
 runtime/queries/python/highlights.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/queries/python/highlights.scm b/runtime/queries/python/highlights.scm
index c18b748674..04398668e9 100644
--- a/runtime/queries/python/highlights.scm
+++ b/runtime/queries/python/highlights.scm
@@ -27,6 +27,8 @@
            "credits"
            "license"))
 
+"_" @constant.builtin ; match wildcard
+
 ((attribute
     attribute: (identifier) @field)
  (#lua-match? @field "^[%l_].*$"))
@@ -155,7 +157,10 @@
   (#lua-match? @preproc "^#!/"))
 
 (string) @string
-(escape_sequence) @string.escape
+[
+  (escape_sequence)
+  (escape_interpolation)
+] @string.escape
 
 ; doc-strings
 
@@ -241,6 +246,7 @@
   "print"
   "with"
   "as"
+  "type"
 ] @keyword
 
 [
-- 
cgit 


From 2bf3e82676d5caf674cf5ed1eb9677376d9cfa35 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sat, 26 Aug 2023 13:24:29 -0700
Subject: fix(treesitter): validate window before updating preview highlights

---
 runtime/lua/vim/treesitter/dev.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index b7f2c0e473..72b6e3db4a 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -560,7 +560,9 @@ function M.preview_query()
     buffer = query_buf,
     desc = 'Update query previewer highlights when the cursor moves',
     callback = function()
-      update_preview_highlights(query_win, win)
+      if api.nvim_win_is_valid(win) then
+        update_preview_highlights(query_win, win)
+      end
     end,
   })
   api.nvim_create_autocmd('BufLeave', {
-- 
cgit 


From b7d5b55f74fd589dee27d8356d45b31c552705c3 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sun, 27 Aug 2023 01:41:32 -0700
Subject: fix(types): add some return/parameter type annotations (#24867)

* fix(types): add some return/parameter type annotations

* fix(types): narrow stdpath parameter further
---
 runtime/doc/lua.txt             | 3 +++
 runtime/lua/vim/_editor.lua     | 1 +
 runtime/lua/vim/_meta/vimfn.lua | 8 ++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 39eb530c24..f5b3e56f61 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1567,6 +1567,9 @@ vim.deprecate({name}, {alternative}, {version}, {plugin}, {backtrace})
 vim.inspect                                                    *vim.inspect()*
     Gets a human-readable representation of the given object.
 
+    Return: ~
+        (string)
+
     See also: ~
       • |vim.print()|
       • https://github.com/kikito/inspect.lua
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 8c10cc7da3..96ac379368 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -188,6 +188,7 @@ end
 ---@see |vim.print()|
 ---@see https://github.com/kikito/inspect.lua
 ---@see https://github.com/mpeterv/vinspect
+---@return string
 vim.inspect = vim.inspect
 
 do
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index ebd74046ce..d9d3c92a44 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3297,8 +3297,8 @@ function vim.fn.getpid() end
 ---   call setpos("'a", save_a_mark)
 --- <Also see |getcharpos()|, |getcurpos()| and |setpos()|.
 ---
---- @param expr any
---- @return any
+--- @param expr string
+--- @return integer[]
 function vim.fn.getpos(expr) end
 
 --- Returns a |List| with all the current quickfix errors.  Each
@@ -8827,8 +8827,8 @@ function vim.fn.stdioopen(opts) end
 ---   echo stdpath("config")
 --- <
 ---
---- @param what any
---- @return any
+--- @param what 'cache'|'config'|'config_dirs'|'data'|'data_dirs'|'log'|'run'|'state'
+--- @return string|string[]
 function vim.fn.stdpath(what) end
 
 --- Convert String {string} to a Float.  This mostly works the
-- 
cgit 


From d3d7d763f3e12211fe40192696b29b209a6c7b85 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 27 Aug 2023 10:57:33 +0100
Subject: feat(builtin): improve types

---
 runtime/lua/vim/_meta/builtin_types.lua | 129 ++++++++++++++++++++++++++++++++
 runtime/lua/vim/_meta/vimfn.lua         |  66 ++++++++--------
 2 files changed, 162 insertions(+), 33 deletions(-)
 create mode 100644 runtime/lua/vim/_meta/builtin_types.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/builtin_types.lua b/runtime/lua/vim/_meta/builtin_types.lua
new file mode 100644
index 0000000000..6beaee90cc
--- /dev/null
+++ b/runtime/lua/vim/_meta/builtin_types.lua
@@ -0,0 +1,129 @@
+--- @class vim.fn.sign
+--- @field group string
+--- @field id integer
+--- @field lnum integer
+--- @field name string
+--- @field priority integer
+
+--- @class vim.fn.getbufinfo.dict
+--- @field buflisted? 0|1
+--- @field bufloaded? 0|1
+--- @field bufmodified? 0|1
+
+--- @class vim.fn.getbufinfo.ret.item
+--- @field bufnr integer
+--- @field changed 0|1
+--- @field changedtick integer
+--- @field hidden 0|1
+--- @field lastused integer
+--- @field linecount integer
+--- @field listed 0|1
+--- @field lnum integer
+--- @field loaded 0|1
+--- @field name string
+--- @field signs vim.fn.sign[]
+--- @field variables table<string,any>
+--- @field windows integer[]
+
+--- @alias vim.fn.getjumplist.ret {[1]: vim.fn.getjumplist.ret.item[], [2]: integer}
+
+--- @class vim.fn.getjumplist.ret.item
+--- @field bufnr integer
+--- @field col integer
+--- @field coladd integer
+--- @field filename? string
+--- @field lnum integer
+
+--- @class vim.fn.getmousepos.ret
+--- @field screenrow integer
+--- @field screencol integer
+--- @field winid integer
+--- @field winrow integer
+--- @field wincol integer
+--- @field line integer
+--- @field column integer
+
+--- @class vim.fn.getwininfo.ret.item
+--- @field botline integer
+--- @field bufnr integer
+--- @field height integer
+--- @field loclist integer
+--- @field quickfix integer
+--- @field tabnr integer
+--- @field terminal integer
+--- @field textoff integer
+--- @field topline integer
+--- @field variables table<string,any>
+--- @field width integer
+--- @field winbar integer
+--- @field wincol integer
+--- @field winid integer
+--- @field winnr integer
+--- @field winrow integer
+
+--- @class vim.fn.sign_define.dict
+--- @field icon string
+--- @field linehl? string
+--- @field numhl? string
+--- @field text? string
+--- @field texthl? string
+--- @field culhl? string
+
+--- @class vim.fn.sign_getdefined.ret.item
+--- @field name string
+--- @field text string
+--- @field icon? string
+--- @field texthl? string
+--- @field culhl? string
+--- @field numhl? string
+--- @field linehl? string
+
+--- @class vim.fn.sign_getplaced.dict
+--- @field group? string
+--- @field id? integer
+--- @field lnum? string
+
+--- @class vim.fn.sign_getplaced.ret.item
+--- @field buf integer
+--- @field signs vim.fn.sign[]
+
+--- @class vim.fn.sign_place.dict
+--- @field lnum? integer
+--- @field priority? integer
+
+--- @class vim.fn.sign_placelist.list.item
+--- @field buffer integer|string
+--- @field group? string
+--- @field id? integer
+--- @field lnum integer
+--- @field name string
+--- @field priority? integer
+
+--- @class vim.fn.sign_unplace.dict
+--- @field buffer? integer|string
+--- @field id? integer
+
+--- @class vim.fn.sign_unplacelist.list.item
+--- @field buffer? integer|string
+--- @field group? string
+--- @field id? integer
+
+--- @class vim.fn.winrestview.dict
+--- @field col? integer
+--- @field coladd? integer
+--- @field curswant? integer
+--- @field leftcol? integer
+--- @field lnum? integer
+--- @field skipcol? integer
+--- @field topfill? integer
+--- @field topline? integer
+
+--- @class vim.fn.winsaveview.ret
+--- @field col integer
+--- @field coladd integer
+--- @field curswant integer
+--- @field leftcol integer
+--- @field lnum integer
+--- @field skipcol integer
+--- @field topfill integer
+--- @field topline integer
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index d9d3c92a44..3f891bdb45 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -2489,7 +2489,7 @@ function vim.fn.get(dict, key, default) end
 function vim.fn.get(func, what) end
 
 --- @param buf? integer|string
---- @return any
+--- @return vim.fn.getbufinfo.ret.item[]
 function vim.fn.getbufinfo(buf) end
 
 --- Get information about buffers as a List of Dictionaries.
@@ -2557,8 +2557,8 @@ function vim.fn.getbufinfo(buf) end
 ---   getbufvar({bufnr}, '&option_name')
 --- <
 ---
---- @param dict? table<string,any>
---- @return any
+--- @param dict? vim.fn.getbufinfo.dict
+--- @return vim.fn.getbufinfo.ret.item[]
 function vim.fn.getbufinfo(dict) end
 
 --- Return a |List| with the lines starting from {lnum} to {end}
@@ -2594,9 +2594,9 @@ function vim.fn.getbufline(buf, lnum, end_) end
 --- Just like `getbufline()` but only get one line and return it
 --- as a string.
 ---
---- @param buf any
+--- @param buf integer|string
 --- @param lnum integer
---- @return any
+--- @return string
 function vim.fn.getbufoneline(buf, lnum) end
 
 --- The result is the value of option or local buffer variable
@@ -3107,7 +3107,7 @@ function vim.fn.getftype(fname) end
 ---
 --- @param winnr? integer
 --- @param tabnr? integer
---- @return any
+--- @return vim.fn.getjumplist.ret
 function vim.fn.getjumplist(winnr, tabnr) end
 
 --- Without {end} the result is a String, which is line {lnum}
@@ -3260,7 +3260,7 @@ function vim.fn.getmatches(win) end
 --- When using |getchar()| the Vim variables |v:mouse_lnum|,
 --- |v:mouse_col| and |v:mouse_winid| also provide these values.
 ---
---- @return any
+--- @return vim.fn.getmousepos.ret
 function vim.fn.getmousepos() end
 
 --- Return a Number which is the process ID of the Vim process.
@@ -3659,7 +3659,7 @@ function vim.fn.gettext(text) end
 ---       "row" from |win_screenpos()|
 ---
 --- @param winid? integer
---- @return any
+--- @return vim.fn.getwininfo.ret.item[]
 function vim.fn.getwininfo(winid) end
 
 --- The result is a |List| with two numbers, the result of
@@ -8048,8 +8048,8 @@ function vim.fn.shellescape(string, special) end
 function vim.fn.shiftwidth(col) end
 
 --- @param name string
---- @param dict? any
---- @return any
+--- @param dict? vim.fn.sign_define.dict
+--- @return 0|-1
 function vim.fn.sign_define(name, dict) end
 
 --- Define a new sign named {name} or modify the attributes of an
@@ -8097,8 +8097,8 @@ function vim.fn.sign_define(name, dict) end
 ---     \ ])
 --- <
 ---
---- @param list any
---- @return any
+--- @param list vim.fn.sign_define.dict[]
+--- @return (0|-1)[]
 function vim.fn.sign_define(list) end
 
 --- Get a list of defined signs and their attributes.
@@ -8137,7 +8137,7 @@ function vim.fn.sign_define(list) end
 --- <
 ---
 --- @param name? string
---- @return any
+--- @return vim.fn.sign_getdefined.ret.item[]
 function vim.fn.sign_getdefined(name) end
 
 --- Return a list of signs placed in a buffer or all the buffers.
@@ -8201,8 +8201,8 @@ function vim.fn.sign_getdefined(name) end
 --- <
 ---
 --- @param buf? any
---- @param dict? any
---- @return any
+--- @param dict? vim.fn.sign_getplaced.dict
+--- @return vim.fn.sign_getplaced.ret.item[]
 function vim.fn.sign_getplaced(buf, dict) end
 
 --- Open the buffer {buf} or jump to the window that contains
@@ -8220,10 +8220,10 @@ function vim.fn.sign_getplaced(buf, dict) end
 ---   call sign_jump(10, '', '')
 --- <
 ---
---- @param id any
---- @param group any
---- @param buf any
---- @return any
+--- @param id integer
+--- @param group string
+--- @param buf integer|string
+--- @return integer
 function vim.fn.sign_jump(id, group, buf) end
 
 --- Place the sign defined as {name} at line {lnum} in file or
@@ -8278,8 +8278,8 @@ function vim.fn.sign_jump(id, group, buf) end
 --- @param group any
 --- @param name string
 --- @param buf any
---- @param dict? any
---- @return any
+--- @param dict? vim.fn.sign_place.dict
+--- @return integer
 function vim.fn.sign_place(id, group, name, buf, dict) end
 
 --- Place one or more signs.  This is similar to the
@@ -8340,12 +8340,12 @@ function vim.fn.sign_place(id, group, name, buf, dict) end
 ---     \ ])
 --- <
 ---
---- @param list any
---- @return any
+--- @param list vim.fn.sign_placelist.list.item[]
+--- @return integer[]
 function vim.fn.sign_placelist(list) end
 
 --- @param name? string
---- @return any
+--- @return 0|-1
 function vim.fn.sign_undefine(name) end
 
 --- Deletes a previously defined sign {name}. This is similar to
@@ -8370,8 +8370,8 @@ function vim.fn.sign_undefine(name) end
 ---   call sign_undefine()
 --- <
 ---
---- @param list? any
---- @return any
+--- @param list? string[]
+--- @return integer[]
 function vim.fn.sign_undefine(list) end
 
 --- Remove a previously placed sign in one or more buffers.  This
@@ -8415,9 +8415,9 @@ function vim.fn.sign_undefine(list) end
 ---   " Remove all the placed signs from all the buffers
 ---   call sign_unplace('*')
 ---
---- @param group any
---- @param dict? any
---- @return any
+--- @param group string
+--- @param dict? vim.fn.sign_unplace.dict
+--- @return 0|-1
 function vim.fn.sign_unplace(group, dict) end
 
 --- Remove previously placed signs from one or more buffers.  This
@@ -8448,8 +8448,8 @@ function vim.fn.sign_unplace(group, dict) end
 ---     \ ])
 --- <
 ---
---- @param list any
---- @return any
+--- @param list vim.fn.sign_unplacelist.list.item
+--- @return (0|-1)[]
 function vim.fn.sign_unplacelist(list) end
 
 --- Simplify the file name as much as possible without changing
@@ -10469,7 +10469,7 @@ function vim.fn.winrestcmd() end
 --- If you have changed the values the result is unpredictable.
 --- If the window size changed the result won't be the same.
 ---
---- @param dict any
+--- @param dict vim.fn.winrestview.dict
 --- @return any
 function vim.fn.winrestview(dict) end
 
@@ -10499,7 +10499,7 @@ function vim.fn.winrestview(dict) end
 ---   skipcol    columns skipped
 --- Note that no option values are saved.
 ---
---- @return any
+--- @return vim.fn.winsaveview.ret
 function vim.fn.winsaveview() end
 
 --- The result is a Number, which is the width of window {nr}.
-- 
cgit 


From 63802a1dbf0e698b5a8a48bfcb247698a7e07293 Mon Sep 17 00:00:00 2001
From: zhaozg <zhaozg@gmail.com>
Date: Sun, 27 Aug 2023 20:19:09 +0800
Subject: docs: update luvref.txt for version info

fixup: #24874
---
 runtime/doc/luvref.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 226e79b68b..9fd69d86eb 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -4169,8 +4169,8 @@ uv.metrics_info()                                            *uv.metrics_info()*
 CREDITS                                                            *luv-credits*
 
 This document is a reformatted version of the LUV documentation, up-to-date
-with commit e8e7b7e (3 Feb 2023) of the luv repository
-https://github.com/luvit/luv/commit/e8e7b7e13225348a8806118a3ea9e021383a9536.
+with commit dcd1a1c (23 Aug 2023) of the luv repository
+https://github.com/luvit/luv/commit/dcd1a1cad5b05634a7691402d6ca2f214fb4ae76.
 
 Based on https://github.com/nanotee/luv-vimdocs with kind permission.
 
-- 
cgit 


From abb8c2c453d1e084f8ab3e9bbaa8b27515c81a9f Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Fri, 25 Aug 2023 12:23:05 +0100
Subject: fix(editorconfig): do not set 'endofline'

Problem:
  'endofline' can be used to detect if a file ends of <EOL>, however
  editorconfig can break this.

Solution:
  Set 'endofline' during BufWritePre

Fixes: #24869
---
 runtime/lua/editorconfig.lua | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/editorconfig.lua b/runtime/lua/editorconfig.lua
index 48faa54d97..49d63807a6 100644
--- a/runtime/lua/editorconfig.lua
+++ b/runtime/lua/editorconfig.lua
@@ -112,7 +112,20 @@ end
 function M.properties.insert_final_newline(bufnr, val)
   assert(val == 'true' or val == 'false', 'insert_final_newline must be either "true" or "false"')
   vim.bo[bufnr].fixendofline = val == 'true'
-  vim.bo[bufnr].endofline = val == 'true'
+
+  -- 'endofline' can be read to detect if the file contains a final newline,
+  -- so only change 'endofline' right before writing the file
+  local endofline = val == 'true'
+  if vim.bo[bufnr].endofline ~= endofline then
+    vim.api.nvim_create_autocmd('BufWritePre', {
+      group = 'editorconfig',
+      buffer = bufnr,
+      once = true,
+      callback = function()
+        vim.bo[bufnr].endofline = endofline
+      end,
+    })
+  end
 end
 
 --- Modified version of |glob2regpat()| that does not match path separators on *.
-- 
cgit 


From 3a876bd41b235065663c38b0d9f3bdc8868eebc4 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 27 Aug 2023 10:00:48 +0900
Subject: vim-patch:535b9e12d02f

runtime(typescript): Fix highlighting symbols after number literal (vim/vim#12911)

fixes vim/vim#12831

https://github.com/vim/vim/commit/535b9e12d02f5fef969fb680d579c586bd5f40db

Co-authored-by: Herrington Darkholme <2883231+HerringtonDarkholme@users.noreply.github.com>
---
 runtime/syntax/shared/typescriptcommon.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/shared/typescriptcommon.vim b/runtime/syntax/shared/typescriptcommon.vim
index cfa4e1433b..d06525115e 100644
--- a/runtime/syntax/shared/typescriptcommon.vim
+++ b/runtime/syntax/shared/typescriptcommon.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TypeScript and TypeScriptReact
 " Maintainer:   Herrington Darkholme
-" Last Change:	2023 Aug 13
+" Last Change:	2023 Aug 24
 " Based On:     Herrington Darkholme's yats.vim
 " Changes:      See https://github.com/HerringtonDarkholme/yats.vim
 " Credits:      See yats.vim on github
@@ -149,7 +149,7 @@ syntax match typescriptNumber /\<0[bB][01][01_]*\>/        nextgroup=@typescript
 syntax match typescriptNumber /\<0[oO][0-7][0-7_]*\>/       nextgroup=@typescriptSymbols skipwhite skipempty
 syntax match typescriptNumber /\<0[xX][0-9a-fA-F][0-9a-fA-F_]*\>/ nextgroup=@typescriptSymbols skipwhite skipempty
 syntax match typescriptNumber /\<\%(\d[0-9_]*\%(\.\d[0-9_]*\)\=\|\.\d[0-9_]*\)\%([eE][+-]\=\d[0-9_]*\)\=\>/
-  \ nextgroup=typescriptSymbols skipwhite skipempty
+  \ nextgroup=@typescriptSymbols skipwhite skipempty
 
 syntax region  typescriptObjectLiteral         matchgroup=typescriptBraces
   \ start=/{/ end=/}/
-- 
cgit 


From cffdf102d4f01fe5675c389eb80bf55daa62697a Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Mon, 28 Aug 2023 07:22:19 -0500
Subject: feat(terminal): allow :terminal to take modifiers (#15427)

The following modifiers are all now supported:

    :tab term
    :vertical term
    :horizontal term
    :botright term
    :topleft term

Fixes: https://github.com/neovim/neovim/issues/11385
---
 runtime/doc/news.txt    | 3 +++
 runtime/doc/windows.txt | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 4f9f362b1e..a233b66d1f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -158,6 +158,9 @@ The following new APIs and features were added.
 • Floating windows can now show footer with new `footer` and `footer_pos`
   config fields. Uses |hl-FloatFooter| by default.
 
+• The |:terminal| command now accepts some |:command-modifiers| (specifically
+  |:horizontal| and those that affect splitting a window).
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index b78c1eeae5..842542bdc3 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -243,7 +243,8 @@ and 'winminwidth' are relevant.
 :hor[izontal] {cmd}
 		Execute {cmd}.  Currently only makes a difference for
 		`horizontal wincmd =`, which will equalize windows only
-		horizontally.
+		horizontally, and |:terminal|, which will open a |terminal|
+		buffer in a split window.
 
 :lefta[bove] {cmd}				*:lefta* *:leftabove*
 :abo[veleft] {cmd}				*:abo* *:aboveleft*
-- 
cgit 


From ffb340bf63af42ac347e23e0488898adc4391328 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Thu, 24 Aug 2023 17:32:43 +0900
Subject: fix(treesitter): update folds only once on InsertLeave

Problem:
With treesitter fold, InsertLeave can be slow, because a single session
of insert mode may schedule multiple fold updates in on_bytes and
on_changedtree.

Solution:
Don't create duplicate autocmds.
---
 runtime/lua/vim/treesitter/_fold.lua | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index 912a6e8a9f..d82e04a5a8 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -235,6 +235,8 @@ local M = {}
 ---@type table<integer,TS.FoldInfo>
 local foldinfos = {}
 
+local group = api.nvim_create_augroup('treesitter/fold', {})
+
 --- Update the folds in the windows that contain the buffer and use expr foldmethod (assuming that
 --- the user doesn't use different foldexpr for the same buffer).
 ---
@@ -253,7 +255,15 @@ local function foldupdate(bufnr)
 
   if api.nvim_get_mode().mode == 'i' then
     -- foldUpdate() is guarded in insert mode. So update folds on InsertLeave
+    if #(api.nvim_get_autocmds({
+      group = group,
+      buffer = bufnr,
+    })) > 0 then
+      return
+    end
     api.nvim_create_autocmd('InsertLeave', {
+      group = group,
+      buffer = bufnr,
       once = true,
       callback = do_update,
     })
-- 
cgit 


From 0e3ea0a262329ba21bb10c74ea5d689f0597aabd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 29 Aug 2023 11:03:04 +0200
Subject: vim-patch:f937ab32a1ac

runtime: Set b:undo_ftplugin where missing (vim/vim#12943)

https://github.com/vim/vim/commit/f937ab32a1ac3a560f217ca4ce8305ab2d5b0b74

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/abap.vim    |  4 +++
 runtime/ftplugin/art.vim     |  3 ++
 runtime/ftplugin/asm.vim     |  6 ++--
 runtime/ftplugin/bzl.vim     |  5 +++
 runtime/ftplugin/dune.vim    |  7 ++--
 runtime/ftplugin/fish.vim    |  3 ++
 runtime/ftplugin/hare.vim    | 34 ++++++++++++--------
 runtime/ftplugin/ishd.vim    | 23 ++++++++------
 runtime/ftplugin/lprolog.vim | 12 +++++--
 runtime/ftplugin/nginx.vim   |  3 ++
 runtime/ftplugin/pbtxt.vim   |  8 ++---
 runtime/ftplugin/scala.vim   |  3 ++
 runtime/ftplugin/sexplib.vim |  3 ++
 runtime/ftplugin/usd.vim     |  8 ++---
 runtime/ftplugin/vhdl.vim    | 76 ++++++++++++++++++++++++++++----------------
 15 files changed, 130 insertions(+), 68 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/abap.vim b/runtime/ftplugin/abap.vim
index 956b002ecd..61db8093fb 100644
--- a/runtime/ftplugin/abap.vim
+++ b/runtime/ftplugin/abap.vim
@@ -3,6 +3,7 @@
 " Author:	Steven Oliver <oliver.steven@gmail.com>
 " Copyright:	Copyright (c) 2013 Steven Oliver
 " License:	You may redistribute this under the same terms as Vim itself
+" Last Change:  2023 Aug 28 by Vim Project (undo_ftplugin)
 " --------------------------------------------------------------------------
 
 " Only do this when not done yet for this buffer
@@ -17,10 +18,13 @@ set cpo&vim
 setlocal softtabstop=2 shiftwidth=2
 setlocal suffixesadd=.abap
 
+let b:undo_ftplugin = "setl sts< sua< sw<"
+
 " Windows allows you to filter the open file dialog
 if has("gui_win32") && !exists("b:browsefilter")
   let b:browsefilter = "ABAP Source Files (*.abap)\t*.abap\n" .
                      \ "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
 endif
 
 let &cpo = s:cpo_save
diff --git a/runtime/ftplugin/art.vim b/runtime/ftplugin/art.vim
index c501a992d8..41b02a94e5 100644
--- a/runtime/ftplugin/art.vim
+++ b/runtime/ftplugin/art.vim
@@ -3,6 +3,7 @@
 " Maintainer:    Dorai Sitaram <ds26@gte.com>
 " URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
 " Last Change:   Apr 2, 2003
+"                2023 Aug 28 by Vim Project (undo_ftplugin)
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -13,3 +14,5 @@ run ftplugin/lisp.vim
 
 setl lw-=if
 setl lw+=def-art-fun,deffacts,defglobal,defrule,defschema,for,schema,while
+
+let b:undo_ftplugin ..= " | setl lw<"
diff --git a/runtime/ftplugin/asm.vim b/runtime/ftplugin/asm.vim
index 0914bf634a..f6a92d57d7 100644
--- a/runtime/ftplugin/asm.vim
+++ b/runtime/ftplugin/asm.vim
@@ -1,11 +1,13 @@
 " Vim filetype plugin file
 " Language:	asm
 " Maintainer:	Colin Caine <cmcaine at the common googlemail domain>
-" Last Changed: 23 May 2020
+" Last Change:  23 May 2020
+" 		2023 Aug 28 by Vim Project (undo_ftplugin)
 
 if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
 
 setl comments=:;,s1:/*,mb:*,ex:*/,://
 setl commentstring=;%s
 
-let b:did_ftplugin = 1
+let b:undo_ftplugin = "setl commentstring< comments<"
diff --git a/runtime/ftplugin/bzl.vim b/runtime/ftplugin/bzl.vim
index 8ab876e9d6..716b3890b1 100644
--- a/runtime/ftplugin/bzl.vim
+++ b/runtime/ftplugin/bzl.vim
@@ -2,6 +2,7 @@
 " Language:	Bazel (http://bazel.io)
 " Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
 " Last Change:	2021 Jan 19
+" 		2023 Aug 28 by Vim Project (undo_ftplugin)
 
 ""
 " @section Introduction, intro
@@ -41,6 +42,9 @@ let &l:tabstop = s:save_tabstop
 
 setlocal formatoptions-=t
 
+" Initially defined in the python ftplugin sourced above
+let b:undo_ftplugin .= " | setlocal fo<"
+
 " Make gf work with imports in BUILD files.
 setlocal includeexpr=substitute(v:fname,'//','','')
 
@@ -48,6 +52,7 @@ setlocal includeexpr=substitute(v:fname,'//','','')
 if get(g:, 'ft_bzl_fold', 0)
   setlocal foldmethod=syntax
   setlocal foldtext=BzlFoldText()
+  let b:undo_ftplugin .= " | setlocal fdm< fdt<"
 endif
 
 if exists('*BzlFoldText')
diff --git a/runtime/ftplugin/dune.vim b/runtime/ftplugin/dune.vim
index 86c99c097f..6e20a8fabb 100644
--- a/runtime/ftplugin/dune.vim
+++ b/runtime/ftplugin/dune.vim
@@ -3,8 +3,9 @@
 "              Anton Kochkov       <anton.kochkov@gmail.com>
 " URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
-"              2018 Nov 3 - Added commentstring (Markus Mottl)
-"              2017 Sep 6 - Initial version (Etienne Millon)
+"              2023 Aug 28 - Added undo_ftplugin (Vim Project)
+"              2018 Nov 03 - Added commentstring (Markus Mottl)
+"              2017 Sep 06 - Initial version (Etienne Millon)
 
 if exists("b:did_ftplugin")
   finish
@@ -18,3 +19,5 @@ setl commentstring=;\ %s
 setl comments=:;
 
 setl iskeyword+=#,?,.,/
+
+let b:undo_ftplugin = "setl lisp< cms< com< isk<"
diff --git a/runtime/ftplugin/fish.vim b/runtime/ftplugin/fish.vim
index 7acbf44210..f06ad3a0bf 100644
--- a/runtime/ftplugin/fish.vim
+++ b/runtime/ftplugin/fish.vim
@@ -3,6 +3,7 @@
 " Maintainer:   Nicholas Boyle (github.com/nickeb96)
 " Repository:   https://github.com/nickeb96/fish.vim
 " Last Change:  February 1, 2023
+"               2023 Aug 28 by Vim Project (undo_ftplugin)
 
 if exists("b:did_ftplugin")
     finish
@@ -13,3 +14,5 @@ setlocal iskeyword=@,48-57,_,192-255,-,.
 setlocal comments=:#
 setlocal commentstring=#%s
 setlocal formatoptions+=crjq
+
+let b:undo_ftplugin = "setl cms< com< fo< isk<"
diff --git a/runtime/ftplugin/hare.vim b/runtime/ftplugin/hare.vim
index bb10daf38c..0200ba5913 100644
--- a/runtime/ftplugin/hare.vim
+++ b/runtime/ftplugin/hare.vim
@@ -2,26 +2,34 @@
 " Language: Hare
 " Maintainer: Amelia Clarke <me@rsaihe.dev>
 " Previous Maintainer: Drew DeVault <sir@cmpwn.com>
-" Last Updated: 2022-09-21
+" Last Updated: 2022-09-28
+"               2023 Aug 28 by Vim Project (undo_ftplugin)
 
-" Only do this when not done yet for this buffer
 if exists('b:did_ftplugin')
   finish
 endif
-
-" Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-setlocal noexpandtab
-setlocal tabstop=8
-setlocal shiftwidth=0
-setlocal softtabstop=0
-setlocal textwidth=80
+" Formatting settings.
+setlocal formatoptions-=t formatoptions+=croql/
+
+" Miscellaneous.
+setlocal comments=://
 setlocal commentstring=//\ %s
+setlocal suffixesadd=.ha
 
-" Set 'formatoptions' to break comment lines but not other lines,
-" and insert the comment leader when hitting <CR> or using "o".
-setlocal fo-=t fo+=croql
+let b:undo_ftplugin = "setl cms< com< fo< sua<"
+
+" Hare recommended style.
+if get(g:, "hare_recommended_style", 1)
+  setlocal noexpandtab
+  setlocal shiftwidth=8
+  setlocal softtabstop=0
+  setlocal tabstop=8
+  setlocal textwidth=80
+  let b:undo_ftplugin ..= " | setl et< sts< sw< ts< tw<"
+endif
 
 compiler hare
-" vim: tabstop=2 shiftwidth=2 expandtab
+
+" vim: et sw=2 sts=2 ts=8
diff --git a/runtime/ftplugin/ishd.vim b/runtime/ftplugin/ishd.vim
index 33ef1510b5..b160349033 100644
--- a/runtime/ftplugin/ishd.vim
+++ b/runtime/ftplugin/ishd.vim
@@ -1,32 +1,37 @@
 " Vim filetype plugin file
-" Language:	InstallShield (ft=ishd)
-" Maintainer:	Johannes Zellner <johannes@zellner.org>
-" Last Change:	Sat, 24 May 2003 11:55:36 CEST
+" Language:		InstallShield (ft=ishd)
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:		2023 Aug 28
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
-setlocal foldmethod=syntax
-
 " Using line continuation here.
 let s:cpo_save = &cpo
 set cpo-=C
 
+setlocal foldmethod=syntax
+
+let b:undo_ftplugin = "setl fdm<"
+
 " matchit support
 if exists("loaded_matchit")
-    let b:match_ignorecase=0
-    let b:match_words=
+    let b:match_ignorecase = 0
+    let b:match_words =
     \ '\%(^\s*\)\@<=\<function\>\s\+[^()]\+\s*(:\%(^\s*\)\@<=\<begin\>\s*$:\%(^\s*\)\@<=\<return\>:\%(^\s*\)\@<=\<end\>\s*;\s*$,' .
     \ '\%(^\s*\)\@<=\<repeat\>\s*$:\%(^\s*\)\@<=\<until\>\s\+.\{-}\s*;\s*$,' .
     \ '\%(^\s*\)\@<=\<switch\>\s*(.\{-}):\%(^\s*\)\@<=\<\%(case\|default\)\>:\%(^\s*\)\@<=\<endswitch\>\s*;\s*$,' .
     \ '\%(^\s*\)\@<=\<while\>\s*(.\{-}):\%(^\s*\)\@<=\<endwhile\>\s*;\s*$,' .
     \ '\%(^\s*\)\@<=\<for\>.\{-}\<\%(to\|downto\)\>:\%(^\s*\)\@<=\<endfor\>\s*;\s*$,' .
     \ '\%(^\s*\)\@<=\<if\>\s*(.\{-})\s*then:\%(^\s*\)\@<=\<else\s*if\>\s*([^)]*)\s*then:\%(^\s*\)\@<=\<else\>:\%(^\s*\)\@<=\<endif\>\s*;\s*$'
+    let b:undo_ftplugin .= " | unlet! b:match_ignorecase b:match_words"
 endif
 
-if has("gui_win32") && !exists("b:browsefilter")
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
     let b:browsefilter = "InstallShield Files (*.rul)\t*.rul\n" .
-		       \ "All Files (*.*)\t*.*\n"
+          \              "All Files (*.*)\t*\n"
+    let b:undo_ftplugin .= " | unlet! b:browsefilter"
 endif
 
 let &cpo = s:cpo_save
diff --git a/runtime/ftplugin/lprolog.vim b/runtime/ftplugin/lprolog.vim
index a8a3c612c1..1075a9c813 100644
--- a/runtime/ftplugin/lprolog.vim
+++ b/runtime/ftplugin/lprolog.vim
@@ -2,7 +2,8 @@
 " Language:     LambdaProlog (Teyjus)
 " Maintainer:   Markus Mottl  <markus.mottl@gmail.com>
 " URL:          http://www.ocaml.info/vim/ftplugin/lprolog.vim
-" Last Change:  2006 Feb 05
+" Last Change:  2023 Aug 28 - added undo_ftplugin (Vim Project)
+"               2006 Feb 05
 "               2001 Sep 16 - fixed 'no_mail_maps'-bug (MM)
 "               2001 Sep 02 - initial release  (MM)
 
@@ -15,11 +16,13 @@ endif
 let b:did_ftplugin = 1
 
 " Error format
-setlocal efm=%+A./%f:%l.%c:\ %m formatprg=fmt\ -w75\ -p\\%
+setlocal efm=%+A./%f:%l.%c:\ %m
 
 " Formatting of comments
 setlocal formatprg=fmt\ -w75\ -p\\%
 
+let b:undo_ftplugin = "setlocal efm< fp<"
+
 " Add mappings, unless the user didn't want this.
 if !exists("no_plugin_maps") && !exists("no_lprolog_maps")
   " Uncommenting
@@ -28,6 +31,11 @@ if !exists("no_plugin_maps") && !exists("no_lprolog_maps")
     vmap <buffer> <LocalLeader>c <Plug>BUncomOn
     nmap <buffer> <LocalLeader>C <Plug>LUncomOff
     vmap <buffer> <LocalLeader>C <Plug>BUncomOff
+    let b:undo_ftplugin ..=
+          \ " | silent! execute 'nunmap <buffer> <LocalLeader>c'" ..
+          \ " | silent! execute 'vunmap <buffer> <LocalLeader>c'" ..
+          \ " | silent! execute 'nunmap <buffer> <LocalLeader>C'" ..
+          \ " | silent! execute 'vunmap <buffer> <LocalLeader>C'"
   endif
 
   nnoremap <buffer> <Plug>LUncomOn mz0i/* <ESC>$A */<ESC>`z
diff --git a/runtime/ftplugin/nginx.vim b/runtime/ftplugin/nginx.vim
index e808db1277..525d0fdccf 100644
--- a/runtime/ftplugin/nginx.vim
+++ b/runtime/ftplugin/nginx.vim
@@ -2,5 +2,8 @@
 " Language: nginx.conf
 " Maintainer: Chris Aumann <me@chr4.org>
 " Last Change: Apr 15, 2017
+"              2023 Aug 28 by Vim Project (undo_ftplugin)
 
 setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = "setlocal commentstring<"
diff --git a/runtime/ftplugin/pbtxt.vim b/runtime/ftplugin/pbtxt.vim
index e3c1bf7650..56c2553ca8 100644
--- a/runtime/ftplugin/pbtxt.vim
+++ b/runtime/ftplugin/pbtxt.vim
@@ -2,20 +2,16 @@
 " Language:             Protobuf Text Format
 " Maintainer:           Lakshay Garg <lakshayg@outlook.in>
 " Last Change:          2020 Nov 17
+"                       2023 Aug 28 by Vim Project (undo_ftplugin)
 " Homepage:             https://github.com/lakshayg/vim-pbtxt
 
 if exists("b:did_ftplugin")
   finish
 endif
-
 let b:did_ftplugin = 1
 
-let s:cpo_save = &cpo
-set cpo&vim
-
 setlocal commentstring=#\ %s
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
+let b:undo_ftplugin = "setlocal commentstring<"
 
 " vim: nowrap sw=2 sts=2 ts=8 noet
diff --git a/runtime/ftplugin/scala.vim b/runtime/ftplugin/scala.vim
index b484df99f3..769499cfc1 100644
--- a/runtime/ftplugin/scala.vim
+++ b/runtime/ftplugin/scala.vim
@@ -4,6 +4,7 @@
 " URL:                  https://github.com/derekwyatt/vim-scala
 " License:              Same as Vim
 " Last Change:          11 August 2021
+"                       2023 Aug 28 by Vim Project (undo_ftplugin)
 " ----------------------------------------------------------------------------
 
 if exists('b:did_ftplugin') || &cp
@@ -32,4 +33,6 @@ setlocal includeexpr=substitute(v:fname,'\\.','/','g')
 setlocal path+=src/main/scala,src/test/scala
 setlocal suffixesadd=.scala
 
+let b:undo_ftplugin = "setlocal cms< com< et< fo< inc< inex< pa< sts< sua< sw<"
+
 " vim:set sw=2 sts=2 ts=8 et:
diff --git a/runtime/ftplugin/sexplib.vim b/runtime/ftplugin/sexplib.vim
index 27e1b28370..b0767ef559 100644
--- a/runtime/ftplugin/sexplib.vim
+++ b/runtime/ftplugin/sexplib.vim
@@ -3,6 +3,7 @@
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
 " URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
+"              2023 Aug 28 - Added undo_ftplugin (Vim Project)
 "              2017 Apr 12 - First version (MM)
 
 if exists("b:did_ftplugin")
@@ -13,3 +14,5 @@ let b:did_ftplugin=1
 " Comment string
 setl commentstring=;\ %s
 setl comments=:;
+
+let b:undo_ftplugin = "setl cms< com<"
diff --git a/runtime/ftplugin/usd.vim b/runtime/ftplugin/usd.vim
index c795ba591b..cd5013f960 100644
--- a/runtime/ftplugin/usd.vim
+++ b/runtime/ftplugin/usd.vim
@@ -2,17 +2,13 @@
 " Language:     Pixar Animation's Universal Scene Description format
 " Maintainer:   Colin Kennedy <colinvfx@gmail.com>
 " Last Change:  2023 May 9
+"               2023 Aug 28 by Vim Project (undo_ftplugin)
 
 if exists("b:did_ftplugin")
   finish
 endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
 let b:did_ftplugin = 1
 
 setlocal commentstring=#\ %s
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
+let b:undo_ftplugin = "setlocal commentstring<"
diff --git a/runtime/ftplugin/vhdl.vim b/runtime/ftplugin/vhdl.vim
index 0249b542be..ff56166ebe 100644
--- a/runtime/ftplugin/vhdl.vim
+++ b/runtime/ftplugin/vhdl.vim
@@ -3,6 +3,7 @@
 " Maintainer:  R.Shankar <shankar.pec?gmail.com>
 " Modified By: Gerald Lai <laigera+vim?gmail.com>
 " Last Change: 2011 Dec 11
+"              2023 Aug 28 by Vim Project (undo_ftplugin, commentstring)
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -22,13 +23,20 @@ set cpo&vim
 " Set 'comments' to format dashed lists in comments.
 "setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 
+setlocal commentstring=--\ %s
+
 " Format comments to be up to 78 characters long
 "setlocal tw=75
 
+" let b:undo_ftplugin = "setl cms< com< fo< tw<"
+
+let b:undo_ftplugin = "setl cms< "
+
 " Win32 can filter files in the browse dialog
 "if has("gui_win32") && !exists("b:browsefilter")
 "  let b:browsefilter = "Verilog Source Files (*.v)\t*.v\n" .
 "   \ "All Files (*.*)\t*.*\n"
+"  let b:undo_ftplugin .= " | unlet! b:browsefilter"
 "endif
 
 " Let the matchit plugin know what items can be matched.
@@ -52,37 +60,49 @@ if ! exists("b:match_words")  &&  exists("loaded_matchit")
     \ s:notend.'\<package\>:\<end\s\+package\>,'.
     \ s:notend.'\<procedure\>:\<end\s\+procedure\>,'.
     \ s:notend.'\<configuration\>:\<end\s\+configuration\>'
+  let b:undo_ftplugin .= " | unlet! b:match_ignorecase b:match_words"
 endif
 
-" count repeat
-function! <SID>CountWrapper(cmd)
-  let i = v:count1
-  if a:cmd[0] == ":"
-    while i > 0
-      execute a:cmd
-      let i = i - 1
-    endwhile
-  else
-    execute "normal! gv\<Esc>"
-    execute "normal ".i.a:cmd
-    let curcol = col(".")
-    let curline = line(".")
-    normal! gv
-    call cursor(curline, curcol)
-  endif
-endfunction
+if !exists("no_plugin_maps") && !exists("no_vhdl_maps")
+  " count repeat
+  function! <SID>CountWrapper(cmd)
+    let i = v:count1
+    if a:cmd[0] == ":"
+      while i > 0
+	execute a:cmd
+	let i = i - 1
+      endwhile
+    else
+      execute "normal! gv\<Esc>"
+      execute "normal ".i.a:cmd
+      let curcol = col(".")
+      let curline = line(".")
+      normal! gv
+      call cursor(curline, curcol)
+    endif
+  endfunction
 
-" explore motion
-" keywords: "architecture", "block", "configuration", "component", "entity", "function", "package", "procedure", "process", "record", "units"
-let b:vhdl_explore = '\%(architecture\|block\|configuration\|component\|entity\|function\|package\|procedure\|process\|record\|units\)'
-noremap  <buffer><silent>[[ :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\%(\\<end\\s\\+\\)\\@<!\\<".b:vhdl_explore."\\>\\c\\<Bar>\\%^","bW")')<CR>
-noremap  <buffer><silent>]] :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\%(\\<end\\s\\+\\)\\@<!\\<".b:vhdl_explore."\\>\\c\\<Bar>\\%$","W")')<CR>
-noremap  <buffer><silent>[] :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\<end\\s\\+".b:vhdl_explore."\\>\\c\\<Bar>\\%^","bW")')<CR>
-noremap  <buffer><silent>][ :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\<end\\s\\+".b:vhdl_explore."\\>\\c\\<Bar>\\%$","W")')<CR>
-vnoremap <buffer><silent>[[ :<C-u>cal <SID>CountWrapper('[[')<CR>
-vnoremap <buffer><silent>]] :<C-u>cal <SID>CountWrapper(']]')<CR>
-vnoremap <buffer><silent>[] :<C-u>cal <SID>CountWrapper('[]')<CR>
-vnoremap <buffer><silent>][ :<C-u>cal <SID>CountWrapper('][')<CR>
+  " explore motion
+  " keywords: "architecture", "block", "configuration", "component", "entity", "function", "package", "procedure", "process", "record", "units"
+  let b:vhdl_explore = '\%(architecture\|block\|configuration\|component\|entity\|function\|package\|procedure\|process\|record\|units\)'
+  noremap  <buffer><silent>[[ :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\%(\\<end\\s\\+\\)\\@<!\\<".b:vhdl_explore."\\>\\c\\<Bar>\\%^","bW")')<CR>
+  noremap  <buffer><silent>]] :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\%(\\<end\\s\\+\\)\\@<!\\<".b:vhdl_explore."\\>\\c\\<Bar>\\%$","W")')<CR>
+  noremap  <buffer><silent>[] :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\<end\\s\\+".b:vhdl_explore."\\>\\c\\<Bar>\\%^","bW")')<CR>
+  noremap  <buffer><silent>][ :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\<end\\s\\+".b:vhdl_explore."\\>\\c\\<Bar>\\%$","W")')<CR>
+  vnoremap <buffer><silent>[[ :<C-u>cal <SID>CountWrapper('[[')<CR>
+  vnoremap <buffer><silent>]] :<C-u>cal <SID>CountWrapper(']]')<CR>
+  vnoremap <buffer><silent>[] :<C-u>cal <SID>CountWrapper('[]')<CR>
+  vnoremap <buffer><silent>][ :<C-u>cal <SID>CountWrapper('][')<CR>
+  let b:undo_ftplugin .=
+	\ " | silent! execute 'nunmap <buffer> [['" .
+	\ " | silent! execute 'nunmap <buffer> ]]'" .
+	\ " | silent! execute 'nunmap <buffer> []'" .
+	\ " | silent! execute 'nunmap <buffer> ]['" .
+	\ " | silent! execute 'vunmap <buffer> [['" .
+	\ " | silent! execute 'vunmap <buffer> ]]'" .
+	\ " | silent! execute 'vunmap <buffer> []'" .
+	\ " | silent! execute 'vunmap <buffer> ]['"
+endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-- 
cgit 


From ae7ab9015999ba417642a5e0c785709f104d75cf Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 29 Aug 2023 11:03:29 +0200
Subject: vim-patch:0382f05dbd65

runtime: Set b:undo_indent where missing (vim/vim#12944)

https://github.com/vim/vim/commit/0382f05dbd659d8e39ee4e71c1e5062ac5c0a8fd

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/indent/ch.vim         | 3 +++
 runtime/indent/dune.vim       | 3 +++
 runtime/indent/fish.vim       | 3 +++
 runtime/indent/go.vim         | 3 +++
 runtime/indent/hare.vim       | 3 +++
 runtime/indent/jsonc.vim      | 3 +++
 runtime/indent/julia.vim      | 5 ++++-
 runtime/indent/logtalk.vim    | 3 +++
 runtime/indent/ocaml.vim      | 5 ++++-
 runtime/indent/php.vim        | 3 ++-
 runtime/indent/raku.vim       | 3 +++
 runtime/indent/rst.vim        | 3 +++
 runtime/indent/rust.vim       | 3 +++
 runtime/indent/scala.vim      | 3 +++
 runtime/indent/tex.vim        | 4 +++-
 runtime/indent/typescript.vim | 3 +++
 runtime/indent/verilog.vim    | 3 +++
 runtime/indent/vhdl.vim       | 3 +++
 18 files changed, 55 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/indent/ch.vim b/runtime/indent/ch.vim
index e1bd8a356c..11b1f67790 100644
--- a/runtime/indent/ch.vim
+++ b/runtime/indent/ch.vim
@@ -3,6 +3,7 @@
 " Maintainer:	SoftIntegration, Inc. <info@softintegration.com>
 " URL:		http://www.softintegration.com/download/vim/indent/ch.vim
 " Last change:	2006 Apr 30
+" 		2023 Aug 28 by Vim Project (undo_indent)
 "		Created based on cpp.vim
 "
 " Ch is a C/C++ interpreter with many high level extensions
@@ -16,3 +17,5 @@ let b:did_indent = 1
 
 " Ch indenting is built-in, thus this is very simple
 setlocal cindent
+
+let b:undo_indent = "setlocal cindent<"
diff --git a/runtime/indent/dune.vim b/runtime/indent/dune.vim
index 0590d66d13..a9349e4e04 100644
--- a/runtime/indent/dune.vim
+++ b/runtime/indent/dune.vim
@@ -3,6 +3,7 @@
 " Maintainers:  Markus Mottl         <markus.mottl@gmail.com>
 " URL:          https://github.com/ocaml/vim-ocaml
 " Last Change:  2021 Jan 01
+"               2023 Aug 28 by Vim Project (undo_indent)
 
 if exists("b:did_indent")
  finish
@@ -11,3 +12,5 @@ let b:did_indent = 1
 
 " dune format-dune-file uses 1 space to indent
 setlocal softtabstop=1 shiftwidth=1 expandtab
+
+let b:undo_indent = "setl et< sts< sw<"
diff --git a/runtime/indent/fish.vim b/runtime/indent/fish.vim
index 7455287ec0..e7678cb7c8 100644
--- a/runtime/indent/fish.vim
+++ b/runtime/indent/fish.vim
@@ -3,6 +3,7 @@
 " Maintainer:   Nicholas Boyle (github.com/nickeb96)
 " Repository:   https://github.com/nickeb96/fish.vim
 " Last Change:  February 4, 2023
+"               2023 Aug 28 by Vim Project (undo_indent)
 
 if exists("b:did_indent")
     finish
@@ -12,6 +13,8 @@ let b:did_indent = 1
 setlocal indentexpr=GetFishIndent(v:lnum)
 setlocal indentkeys+==end,=else,=case
 
+let b:undo_indent = "setlocal indentexpr< indentkeys<"
+
 function s:PrevCmdStart(linenum)
     let l:linenum = a:linenum
     " look for the first line that isn't a line continuation
diff --git a/runtime/indent/go.vim b/runtime/indent/go.vim
index bf9ff75e6c..a9b1d8d19b 100644
--- a/runtime/indent/go.vim
+++ b/runtime/indent/go.vim
@@ -2,6 +2,7 @@
 " Language:	Go
 " Maintainer:	David Barnett (https://github.com/google/vim-ft-go)
 " Last Change:	2017 Jun 13
+"		2023 Aug 28 by Vim Project (undo_indent)
 "
 " TODO:
 " - function invocations split across lines
@@ -19,6 +20,8 @@ setlocal autoindent
 setlocal indentexpr=GoIndent(v:lnum)
 setlocal indentkeys+=<:>,0=},0=)
 
+let b:undo_indent = "setl ai< inde< indk< lisp<"
+
 if exists('*GoIndent')
   finish
 endif
diff --git a/runtime/indent/hare.vim b/runtime/indent/hare.vim
index bc4fea4e61..0a9d8dafd8 100644
--- a/runtime/indent/hare.vim
+++ b/runtime/indent/hare.vim
@@ -2,6 +2,7 @@
 " Language: Hare
 " Maintainer: Amelia Clarke <me@rsaihe.dev>
 " Last Change: 2022 Sep 22
+"              2023 Aug 28 by Vim Project (undo_indent)
 
 if exists("b:did_indent")
   finish
@@ -40,6 +41,8 @@ setlocal cinwords=if,else,for,switch,match
 
 setlocal indentexpr=GetHareIndent()
 
+let b:undo_indent = "setl cin< cino< cinw< inde< indk<"
+
 function! FloorCindent(lnum)
   return cindent(a:lnum) / shiftwidth() * shiftwidth()
 endfunction
diff --git a/runtime/indent/jsonc.vim b/runtime/indent/jsonc.vim
index bf8e501dd5..058634a6d2 100644
--- a/runtime/indent/jsonc.vim
+++ b/runtime/indent/jsonc.vim
@@ -4,6 +4,7 @@
 " Acknowledgement:  Based off of vim-json maintained by Eli Parra <eli@elzr.com>
 "                   https://github.com/elzr/vim-json
 " Last Change:      2021-07-01
+"                   2023 Aug 28 by Vim Project (undo_indent)
 
 " 0. Initialization {{{1
 " =================
@@ -20,6 +21,8 @@ setlocal nosmartindent
 setlocal indentexpr=GetJSONCIndent()
 setlocal indentkeys=0{,0},0),0[,0],!^F,o,O,e
 
+let b:undo_indent = "setlocal indentexpr< indentkeys< smartindent<"
+
 " Only define the function once.
 if exists("*GetJSONCIndent")
   finish
diff --git a/runtime/indent/julia.vim b/runtime/indent/julia.vim
index 8e4c60322e..36f39f6652 100644
--- a/runtime/indent/julia.vim
+++ b/runtime/indent/julia.vim
@@ -3,7 +3,8 @@
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
 " Homepage:	https://github.com/JuliaEditorSupport/julia-vim
 " Last Change:	2022 Jun 14
-" Notes:        originally based on Bram Molenaar's indent file for vim
+"		2023 Aug 28 by Vim Project (undo_indent)
+" Notes:        originally based on Bram Moolenaar's indent file for vim
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -21,6 +22,8 @@ setlocal indentkeys-=0{
 setlocal indentkeys-=0}
 setlocal nosmartindent
 
+let b:undo_indent = "setl ai< inde< indk< si<"
+
 " Only define the function once.
 if exists("*GetJuliaIndent")
   finish
diff --git a/runtime/indent/logtalk.vim b/runtime/indent/logtalk.vim
index 8e36f86115..f7a8b0387c 100644
--- a/runtime/indent/logtalk.vim
+++ b/runtime/indent/logtalk.vim
@@ -1,5 +1,6 @@
 "  Maintainer:	Paulo Moura <pmoura@logtalk.org>
 "  Revised on:	2018.08.04
+"		2023 Aug 28 by Vim Project (undo_indent)
 "  Language:	Logtalk
 
 " This Logtalk indent file is a modified version of the Prolog
@@ -16,6 +17,8 @@ setlocal indentexpr=GetLogtalkIndent()
 setlocal indentkeys-=:,0#
 setlocal indentkeys+=0%,-,0;,>,0)
 
+let b:undo_indent = "setlocal indentexpr< indentkeys<"
+
 " Only define the function once.
 if exists("*GetLogtalkIndent")
 	finish
diff --git a/runtime/indent/ocaml.vim b/runtime/indent/ocaml.vim
index 19c81f49c4..c9beb8be0b 100644
--- a/runtime/indent/ocaml.vim
+++ b/runtime/indent/ocaml.vim
@@ -4,7 +4,8 @@
 "               Mike Leary           <leary@nwlink.com>
 "               Markus Mottl         <markus.mottl@gmail.com>
 " URL:          https://github.com/ocaml/vim-ocaml
-" Last Change:  2017 Jun 13
+" Last Change:  2023 Aug 28 - Add undo_indent (Vim Project)
+"               2017 Jun 13
 "               2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working
 "               2005 May 09 - Added an option to not indent OCaml-indents specially (MM)
 "               2013 June   - commented textwidth (Marc Weber)
@@ -24,6 +25,8 @@ setlocal indentkeys+=0=and,0=class,0=constraint,0=done,0=else,0=end,0=exception,
 setlocal nolisp
 setlocal nosmartindent
 
+let b:undo_indent = "setl et< inde< indk< lisp< si<"
+
 " At least Marc Weber and Markus Mottl do not like this:
 " setlocal textwidth=80
 
diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim
index 6b3d700059..350accaa11 100644
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -4,6 +4,7 @@
 " URL:		https://www.2072productions.com/vim/indent/php.vim
 " Home:		https://github.com/2072/PHP-Indenting-for-VIm
 " Last Change:	2020 Mar 05
+"		2023 Aug 28 by Vim Project (undo_indent)
 " Version:	1.70
 "
 "
@@ -128,7 +129,7 @@ setlocal nolisp
 setlocal indentexpr=GetPhpIndent()
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e,*<Return>,=?>,=<?,=*/
 
-
+let b:undo_indent = "setl ai< cin< inde< indk< lisp< si<"
 
 let s:searchpairflags = 'bWr'
 
diff --git a/runtime/indent/raku.vim b/runtime/indent/raku.vim
index 3f9b49ec77..753a2b04be 100644
--- a/runtime/indent/raku.vim
+++ b/runtime/indent/raku.vim
@@ -4,6 +4,7 @@
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " Last Change:   2020 Apr 15
+"                2023 Aug 28 by Vim Project (undo_indent)
 " Contributors:  Andy Lester <andy@petdance.com>
 "                Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
 "
@@ -47,6 +48,8 @@ if !b:indent_use_syntax
     setlocal indentkeys+=0=EO
 endif
 
+let b:undo_indent = "setlocal indentexpr< indentkeys<"
+
 let s:cpo_save = &cpo
 set cpo-=C
 
diff --git a/runtime/indent/rst.vim b/runtime/indent/rst.vim
index a31ad8e080..e3c10865a6 100644
--- a/runtime/indent/rst.vim
+++ b/runtime/indent/rst.vim
@@ -4,6 +4,7 @@
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
 " Latest Revision: 2020-03-31
+"                  2023 Aug 28 by Vim Project (undo_indent)
 
 if exists("b:did_indent")
   finish
@@ -14,6 +15,8 @@ setlocal indentexpr=GetRSTIndent()
 setlocal indentkeys=!^F,o,O
 setlocal nosmartindent
 
+let b:undo_indent = "setlocal indentexpr< indentkeys< smartindent<"
+
 if exists("*GetRSTIndent")
   finish
 endif
diff --git a/runtime/indent/rust.vim b/runtime/indent/rust.vim
index 2b544f4a67..b27d93c3a2 100644
--- a/runtime/indent/rust.vim
+++ b/runtime/indent/rust.vim
@@ -2,6 +2,7 @@
 " Language:         Rust
 " Author:           Chris Morgan <me@chrismorgan.info>
 " Last Change:      2017 Jun 13
+"                   2023 Aug 28 by Vim Project (undo_indent)
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 " Only load this indent file when no other was loaded.
@@ -24,6 +25,8 @@ setlocal indentkeys=0{,0},!^F,o,O,0[,0]
 
 setlocal indentexpr=GetRustIndent(v:lnum)
 
+let b:undo_indent = "setlocal cindent< cinoptions< cinkeys< cinwords< lisp< autoindent< indentkeys< indentexpr<"
+
 " Only define the function once.
 if exists("*GetRustIndent")
 	finish
diff --git a/runtime/indent/scala.vim b/runtime/indent/scala.vim
index b5eba29543..c6aba4e388 100644
--- a/runtime/indent/scala.vim
+++ b/runtime/indent/scala.vim
@@ -4,6 +4,7 @@
 " Modifications By:     Derek Wyatt
 " URL:                  https://github.com/derekwyatt/vim-scala
 " Last Change:          2016 Aug 26
+"                       2023 Aug 28 by Vim Project (undo_indent)
 
 if exists("b:did_indent")
   finish
@@ -14,6 +15,8 @@ setlocal autoindent
 setlocal indentexpr=GetScalaIndent()
 setlocal indentkeys=0{,0},0),!^F,<>>,o,O,e,=case,<CR>
 
+let b:undo_indent = "setl ai< inde< indk<"
+
 if exists("*GetScalaIndent")
   finish
 endif
diff --git a/runtime/indent/tex.vim b/runtime/indent/tex.vim
index d356ba905b..68d13fb116 100644
--- a/runtime/indent/tex.vim
+++ b/runtime/indent/tex.vim
@@ -67,7 +67,8 @@
 "               2020/04/26 by Yichao Zhou <broken.zhou AT gmail.com>
 "               (*) Fix a bug related to \[ & \].  Thanks Manuel Boni for
 "               reporting.
-"
+"               2023/08/28 by Vim Project
+"               (*) Set b:undo_indent.
 " }}}
 
 " Document: {{{
@@ -167,6 +168,7 @@ setlocal indentexpr=GetTeXIndent()
 setlocal indentkeys&
 exec 'setlocal indentkeys+=[,(,{,),},],\&' . substitute(g:tex_items, '^\|\(\\|\)', ',=', 'g')
 let g:tex_items = '^\s*' . substitute(g:tex_items, '^\(\^\\s\*\)*', '', '')
+let b:undo_indent = "setlocal autoindent< indentexpr< indentkeys< smartindent<"
 " }}}
 
 function! GetTeXIndent() " {{{
diff --git a/runtime/indent/typescript.vim b/runtime/indent/typescript.vim
index e899f83d0f..e26750b8aa 100644
--- a/runtime/indent/typescript.vim
+++ b/runtime/indent/typescript.vim
@@ -2,6 +2,7 @@
 " Language: TypeScript
 " Maintainer: See https://github.com/HerringtonDarkholme/yats.vim
 " Last Change: 2019 Oct 18
+"              2023 Aug 28 by Vim Project (undo_indent)
 " Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
 
 " 0. Initialization {{{1
@@ -20,6 +21,8 @@ setlocal indentexpr=GetTypescriptIndent()
 setlocal formatexpr=Fixedgq(v:lnum,v:count)
 setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
 
+let b:undo_indent = "setlocal formatexpr< indentexpr< indentkeys< smartindent<"
+
 " Only define the function once.
 if exists("*GetTypescriptIndent")
   finish
diff --git a/runtime/indent/verilog.vim b/runtime/indent/verilog.vim
index e81197c3b4..377615c348 100644
--- a/runtime/indent/verilog.vim
+++ b/runtime/indent/verilog.vim
@@ -1,6 +1,7 @@
 " Language:     Verilog HDL
 " Maintainer:	Chih-Tsun Huang <cthuang@cs.nthu.edu.tw>
 " Last Change:	2017 Aug 25 by Chih-Tsun Huang
+" 		2023 Aug 28 by Vim Project (undo_indent)
 " URL:		    http://www.cs.nthu.edu.tw/~cthuang/vim/indent/verilog.vim
 "
 " Credits:
@@ -28,6 +29,8 @@ setlocal indentkeys+==endmodule,=endfunction,=endtask,=endspecify
 setlocal indentkeys+==endconfig,=endgenerate,=endprimitive,=endtable
 setlocal indentkeys+==`else,=`elsif,=`endif
 
+let b:undo_indent = "setlocal indentexpr< indentkeys<"
+
 " Only define the function once.
 if exists("*GetVerilogIndent")
   finish
diff --git a/runtime/indent/vhdl.vim b/runtime/indent/vhdl.vim
index ad318066f4..b01d1156e9 100644
--- a/runtime/indent/vhdl.vim
+++ b/runtime/indent/vhdl.vim
@@ -3,6 +3,7 @@
 " Maintainer:  Gerald Lai <laigera+vim?gmail.com>
 " Version:     1.62
 " Last Change: 2017 Oct 17
+"              2023 Aug 28 by Vim Project (undo_indent)
 " URL:         http://www.vim.org/scripts/script.php?script_id=1450
 
 " only load this indent file when no other was loaded
@@ -19,6 +20,8 @@ setlocal indentkeys+==~if,=~then,=~elsif,=~else
 setlocal indentkeys+==~case,=~loop,=~for,=~generate,=~record,=~units,=~process,=~block,=~function,=~component,=~procedure
 setlocal indentkeys+==~architecture,=~configuration,=~entity,=~package
 
+let b:undo_indent = "setlocal indentexpr< indentkeys<"
+
 " constants
 " not a comment
 let s:NC = '\%(--.*\)\@<!'
-- 
cgit 


From da7178cbbf4ea87e0759a5f46c2be93732d901af Mon Sep 17 00:00:00 2001
From: Jongwook Choi <wookayin@gmail.com>
Date: Wed, 30 Aug 2023 00:10:41 -0400
Subject: fix(builtin): fix incorrect optional fields for fn.sign_define

The field `icon` is not a mandatory field.
---
 runtime/lua/vim/_meta/builtin_types.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/builtin_types.lua b/runtime/lua/vim/_meta/builtin_types.lua
index 6beaee90cc..ef0452c649 100644
--- a/runtime/lua/vim/_meta/builtin_types.lua
+++ b/runtime/lua/vim/_meta/builtin_types.lua
@@ -62,10 +62,10 @@
 --- @field winrow integer
 
 --- @class vim.fn.sign_define.dict
---- @field icon string
+--- @field text string
+--- @field icon? string
 --- @field linehl? string
 --- @field numhl? string
---- @field text? string
 --- @field texthl? string
 --- @field culhl? string
 
-- 
cgit 


From 88bf4204ef33a842f2cbdc66590dadda8bf4e1ef Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 29 Aug 2023 22:19:06 +0200
Subject: vim-patch:3ac2d3da5fdf

runtime(heex): Add HEEX comments to match_words in ftplugin (vim/vim#12957)

https://github.com/vim/vim/commit/3ac2d3da5fdf20dfddb450a49502ef47b1f581d4

Co-authored-by: Jason King <jk@handle.it>
---
 runtime/ftplugin/heex.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/heex.vim b/runtime/ftplugin/heex.vim
index f79c69d2aa..becc071c37 100644
--- a/runtime/ftplugin/heex.vim
+++ b/runtime/ftplugin/heex.vim
@@ -18,7 +18,7 @@ let b:undo_ftplugin = 'set sw< sts< et< com< cms<'
 " HTML: thanks to Johannes Zellner and Benji Fisher.
 if exists("loaded_matchit") && !exists("b:match_words")
   let b:match_ignorecase = 1
-  let b:match_words = '<!--:-->,' ..
+  let b:match_words = '<%\{-}!--:--%\{-}>,' ..
 	\	      '<:>,' ..
 	\	      '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' ..
 	\	      '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' ..
-- 
cgit 


From c4c5178b8e1a6335245f7b862e8db13087737e4b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 29 Aug 2023 22:19:46 +0200
Subject: vim-patch:a5eb6785efcc

runtime(doc): mention special case of i_CTRL-R_-

closes: vim/vim#12947

https://github.com/vim/vim/commit/a5eb6785efcc36a97e071722408acc20d6c6e606

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/insert.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index a1e0675b36..7571551130 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -119,7 +119,11 @@ CTRL-R {register}				*i_CTRL-R*
 			'/'	the last search pattern
 			':'	the last command-line
 			'.'	the last inserted text
+                                                       *i_CTRL-R_-*
 			'-'	the last small (less than a line) delete
+				register. This is repeatable using |.| since
+				it remembers the register to put instead of
+				the literal text to insert.
 							*i_CTRL-R_=*
 			'='	the expression register: you are prompted to
 				enter an expression (see |expression|)
-- 
cgit 


From 3fcd6da5b0bf6016be24b2574cfe3cdf1071237b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 30 Aug 2023 09:25:39 +0200
Subject: vim-patch:2ac708b54866

runtime(sh): Update ftplugin (vim/vim#12950)

Remove :Help command via the undo_ftplugin mechanism.

https://github.com/vim/vim/commit/2ac708b548660b232a32c52d89bde3d8596646c0

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/sh.vim | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim
index 7106bf9155..4409f3f90c 100644
--- a/runtime/ftplugin/sh.vim
+++ b/runtime/ftplugin/sh.vim
@@ -2,15 +2,14 @@
 " Language:		sh
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Dan Sharp
-" Last Change:		2022 Sep 07
+" Contributor:		Enno Nagel <ennonagel+vim@gmail.com>
+" Last Change:		2023 Aug 29
 
 if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin = 1
 
-" Make sure the continuation lines below do not cause problems in
-" compatibility mode.
 let s:save_cpo = &cpo
 set cpo-=C
 
@@ -32,18 +31,17 @@ if exists("loaded_matchit") && !exists("b:match_words")
   let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words"
 endif
 
-" Change the :browse e filter to primarily show shell-related files.
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-    let  b:browsefilter = "Bourne Shell Scripts (*.sh)\t*.sh\n" ..
-		\	  "Korn Shell Scripts (*.ksh)\t*.ksh\n" ..
-		\	  "Bash Shell Scripts (*.bash)\t*.bash\n" ..
-		\	  "All Files (*.*)\t*.*\n"
+  let b:browsefilter = "Bourne Shell Scripts (*.sh)\t*.sh\n" ..
+	\	       "Korn Shell Scripts (*.ksh)\t*.ksh\n" ..
+	\	       "Bash Shell Scripts (*.bash)\t*.bash\n" ..
+	\	       "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
-if (exists('b:is_bash') && (b:is_bash == 1)) ||
-      \ (exists('b:is_sh') && (b:is_sh == 1))
-  if !has('gui_running') && executable('less')
+if (exists("b:is_bash") && (b:is_bash == 1)) ||
+      \ (exists("b:is_sh") && (b:is_sh == 1))
+  if !has("gui_running") && executable("less")
     command! -buffer -nargs=1 Help silent exe '!bash -c "{ help "<args>" 2>/dev/null || man "<args>"; } | LESS= less"' | redraw!
   elseif has('terminal')
     command! -buffer -nargs=1 Help silent exe ':term bash -c "help "<args>" 2>/dev/null || man "<args>""'
@@ -51,10 +49,9 @@ if (exists('b:is_bash') && (b:is_bash == 1)) ||
     command! -buffer -nargs=1 Help echo system('bash -c "help <args>" 2>/dev/null || man "<args>"')
   endif
   setlocal keywordprg=:Help
-  let b:undo_ftplugin .= '| setlocal keywordprg<'
+  let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer Help"
 endif
 
-" Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-- 
cgit 


From 670c7609c85547ef041af8cf17139a396d6af050 Mon Sep 17 00:00:00 2001
From: Hongbo Liu <hongboliu@tencent.com>
Date: Wed, 30 Aug 2023 11:14:58 -0400
Subject: fix(filetype): make sure buffer is valid before call nvim_buf_call
 (#24922)

---
 runtime/filetype.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/filetype.lua b/runtime/filetype.lua
index 4a4f37a1c4..3f2a7c2960 100644
--- a/runtime/filetype.lua
+++ b/runtime/filetype.lua
@@ -8,6 +8,9 @@ vim.api.nvim_create_augroup('filetypedetect', { clear = false })
 vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile', 'StdinReadPost' }, {
   group = 'filetypedetect',
   callback = function(args)
+    if not vim.api.nvim_buf_is_valid(args.buf) then
+      return
+    end
     local ft, on_detect = vim.filetype.match({ filename = args.match, buf = args.buf })
     if not ft then
       -- Generic configuration file used as fallback
-- 
cgit 


From b2c3e9c72ef12a5bc276dec78cdc8dfbd2f5a24b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 30 Aug 2023 18:16:30 +0200
Subject: vim-patch:9d8ef7cc4340

runtime: cleanup :Sman command via the undo_ftplugin mechanism (vim/vim#12967)

Regards to @dkearns as noticed in
https://github.com/vim/vim/commit/2ac708b548660b232a32c52d89bde3d8596646c0

https://github.com/vim/vim/commit/9d8ef7cc434076dfda62ca3d3101eaae52e316cd

Co-authored-by: Enno <Konfekt@users.noreply.github.com>
---
 runtime/ftplugin/gpg.vim       | 2 +-
 runtime/ftplugin/modconf.vim   | 2 +-
 runtime/ftplugin/muttrc.vim    | 2 +-
 runtime/ftplugin/readline.vim  | 2 +-
 runtime/ftplugin/sshconfig.vim | 2 +-
 runtime/ftplugin/sudoers.vim   | 2 +-
 runtime/ftplugin/systemd.vim   | 2 +-
 runtime/ftplugin/udevrules.vim | 2 +-
 runtime/ftplugin/zsh.vim       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/gpg.vim b/runtime/ftplugin/gpg.vim
index 9e00daed6a..2415555e09 100644
--- a/runtime/ftplugin/gpg.vim
+++ b/runtime/ftplugin/gpg.vim
@@ -27,7 +27,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/modconf.vim b/runtime/ftplugin/modconf.vim
index 09ad54b64a..d5eda5af21 100644
--- a/runtime/ftplugin/modconf.vim
+++ b/runtime/ftplugin/modconf.vim
@@ -28,7 +28,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/muttrc.vim b/runtime/ftplugin/muttrc.vim
index bd01367158..7a4eb7a8bb 100644
--- a/runtime/ftplugin/muttrc.vim
+++ b/runtime/ftplugin/muttrc.vim
@@ -30,7 +30,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim
index c81d0f2f65..a696da2701 100644
--- a/runtime/ftplugin/readline.vim
+++ b/runtime/ftplugin/readline.vim
@@ -42,7 +42,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/sshconfig.vim b/runtime/ftplugin/sshconfig.vim
index 214e4928a0..c9a5cfaa68 100644
--- a/runtime/ftplugin/sshconfig.vim
+++ b/runtime/ftplugin/sshconfig.vim
@@ -26,7 +26,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/sudoers.vim b/runtime/ftplugin/sudoers.vim
index 65cf2d8203..b4123620af 100644
--- a/runtime/ftplugin/sudoers.vim
+++ b/runtime/ftplugin/sudoers.vim
@@ -27,7 +27,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/systemd.vim b/runtime/ftplugin/systemd.vim
index c0bc6302f2..e60a5e4960 100644
--- a/runtime/ftplugin/systemd.vim
+++ b/runtime/ftplugin/systemd.vim
@@ -30,7 +30,7 @@ if has('unix') && executable('less')
     if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin)
       let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<'
     else
-      let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+      let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
     endif
   endif
 endif
diff --git a/runtime/ftplugin/udevrules.vim b/runtime/ftplugin/udevrules.vim
index bde9c5dfa0..83fb728a54 100644
--- a/runtime/ftplugin/udevrules.vim
+++ b/runtime/ftplugin/udevrules.vim
@@ -27,7 +27,7 @@ if has('unix') && executable('less')
   if exists(':Sman') == 2
     setlocal iskeyword+=-
     setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<'
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
   endif
 endif
 
diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim
index 0ca8077305..ed75d04003 100644
--- a/runtime/ftplugin/zsh.vim
+++ b/runtime/ftplugin/zsh.vim
@@ -30,7 +30,7 @@ if executable('zsh') && &shell !~# '/\%(nologin\|false\)$'
     compiler zsh
   endif
   setlocal keywordprg=:RunHelp
-  let b:undo_ftplugin .= 'keywordprg<'
+  let b:undo_ftplugin .= 'keywordprg< | sil! delc -buffer RunHelp'
 endif
 
 let b:match_words = '\<if\>:\<elif\>:\<else\>:\<fi\>'
-- 
cgit 


From 497cf996eb1cef54f049e1cca3661c063949be09 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 31 Aug 2023 04:38:01 +0800
Subject: vim-patch:9.0.1803: runtime(filetype): Add norg language detection
 (#24948)

runtime(filetype): Add norg markup language detection

closes: vim/vim#12913

https://github.com/vim/vim/commit/03e44a1d70e914504e6151fe88ad1e574cbf0a59

Co-authored-by: NTBBloodbath <bloodbathalchemist@protonmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 193c9b0199..35a10b6bdc 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -695,6 +695,7 @@ local extension = {
   nimble = 'nim',
   ninja = 'ninja',
   nix = 'nix',
+  norg = 'norg',
   nqc = 'nqc',
   roff = 'nroff',
   tmac = 'nroff',
-- 
cgit 


From 64631168188b76bfb5b57fb36e57cfd1114cf7f7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 31 Aug 2023 04:38:28 +0800
Subject: vim-patch:9.0.1807: runtime: crystal scripts not recognised (#24949)

Problem:  runtime: crystal scripts not recognised
Solution: Filetype detect Crystal scripts by shebang line

closes: vim/vim#12935

https://github.com/vim/vim/commit/9b73902dbe6f7940326bcd8dbc89d010d85d69c5

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
---
 runtime/lua/vim/filetype/detect.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 4a7a1cbefe..af6d77ecbf 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1636,6 +1636,7 @@ local patterns_hashbang = {
   ['icon\\>'] = { 'icon', { vim_regex = true } },
   guile = 'scheme',
   ['nix%-shell'] = 'nix',
+  ['crystal\\>'] = { 'crystal', { vim_regex = true } },
 }
 
 ---@private
-- 
cgit 


From 79148813567909aae8bc733e585d7713f6069401 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 31 Aug 2023 07:44:33 +0800
Subject: vim-patch:9.0.1797: Vimball/Visual Basic filetype detection conflict
 (#24947)

Problem:  Vimball/Visual Basic filetype detection conflict
Solution: runtime(vb): Improve Vimball and Visual Basic detection logic

Only run Vimball Archiver's BufEnter autocommand on Vimball archives.
Fixes vim/vim#2694.

closes: vim/vim#12899

https://github.com/vim/vim/commit/f97f6bbf56408c0c97b4ddbe81fba858d7455b0d

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
---
 runtime/lua/vim/filetype.lua        | 12 ++++++++----
 runtime/lua/vim/filetype/detect.lua | 31 +++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 35a10b6bdc..0e8ecf1b07 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -351,6 +351,7 @@ local extension = {
   bat = 'dosbatch',
   wrap = 'dosini',
   ini = 'dosini',
+  vbp = 'dosini',
   dot = 'dot',
   gv = 'dot',
   drac = 'dracula',
@@ -1025,13 +1026,18 @@ local extension = {
   url = 'urlshortcut',
   usd = 'usd',
   usda = 'usd',
+  v = detect.v,
   vsh = 'v',
   vv = 'v',
+  ctl = 'vb',
+  dob = 'vb',
+  dsm = 'vb',
+  dsr = 'vb',
+  pag = 'vb',
   sba = 'vb',
   vb = 'vb',
-  dsm = 'vb',
-  ctl = 'vb',
   vbs = 'vb',
+  vba = detect.vba,
   vdf = 'vdf',
   vdmpp = 'vdmpp',
   vpp = 'vdmpp',
@@ -1041,7 +1047,6 @@ local extension = {
   vr = 'vera',
   vri = 'vera',
   vrh = 'vera',
-  v = detect.v,
   va = 'verilogams',
   vams = 'verilogams',
   vhdl = 'vhdl',
@@ -1052,7 +1057,6 @@ local extension = {
   vbe = 'vhdl',
   tape = 'vhs',
   vim = 'vim',
-  vba = 'vim',
   mar = 'vmasm',
   cm = 'voscm',
   wrl = 'vrml',
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index af6d77ecbf..0609ac5513 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -77,7 +77,7 @@ function M.asm_syntax(_, bufnr)
 end
 
 local visual_basic_content =
-  { 'vb_name', 'begin vb%.form', 'begin vb%.mdiform', 'begin vb%.usercontrol' }
+  [[\c^\s*\%(Attribute\s\+VB_Name\|Begin\s\+\%(VB\.\|{\%(\x\+-\)\+\x\+}\)\)]]
 
 -- See frm() for Visual Basic form file detection
 --- @type vim.filetype.mapfn
@@ -97,7 +97,7 @@ function M.bas(_, bufnr)
   local qb64_preproc = [[\c^\s*\%($\a\+\|option\s\+\%(_explicit\|_\=explicitarray\)\>\)]]
 
   for _, line in ipairs(getlines(bufnr, 1, 100)) do
-    if findany(line:lower(), visual_basic_content) then
+    if matchregex(line, visual_basic_content) then
       return 'vb'
     elseif
       line:find(fb_comment)
@@ -193,12 +193,12 @@ function M.cls(_, bufnr)
   if vim.g.filetype_cls then
     return vim.g.filetype_cls
   end
-  local line = getline(bufnr, 1)
-  if line:find('^[%%\\]') then
+  local line1 = getline(bufnr, 1)
+  if line1:find('^[%%\\]') then
     return 'tex'
-  elseif line:find('^#') and line:lower():find('rexx') then
+  elseif line1:find('^#') and line1:lower():find('rexx') then
     return 'rexx'
-  elseif line == 'VERSION 1.0 CLASS' then
+  elseif line1 == 'VERSION 1.0 CLASS' then
     return 'vb'
   end
   return 'st'
@@ -525,12 +525,15 @@ function M.frm(_, bufnr)
   if vim.g.filetype_frm then
     return vim.g.filetype_frm
   end
-  local lines = table.concat(getlines(bufnr, 1, 5)):lower()
-  if findany(lines, visual_basic_content) then
+  if getline(bufnr, 1) == 'VERSION 5.00' then
     return 'vb'
-  else
-    return 'form'
   end
+  for _, line in ipairs(getlines(bufnr, 1, 5)) do
+    if matchregex(line, visual_basic_content) then
+      return 'vb'
+    end
+  end
+  return 'form'
 end
 
 --- @type vim.filetype.mapfn
@@ -1529,6 +1532,14 @@ function M.v(_, bufnr)
   return 'v'
 end
 
+--- @type vim.filetype.mapfn
+function M.vba(_, bufnr)
+  if getline(bufnr, 1):find('^["#] Vimball Archiver') then
+    return 'vim'
+  end
+  return 'vb'
+end
+
 -- WEB (*.web is also used for Winbatch: Guess, based on expecting "%" comment
 -- lines in a WEB file).
 --- @type vim.filetype.mapfn
-- 
cgit 


From 5d49542b561e7f4826e28f7a0aeca94d47b3e0b7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 31 Aug 2023 08:20:00 +0800
Subject: vim-patch:9.0.1820: Rexx files may not be recognised (#24956)

Problem:  Rexx files may not be recognised
Solution: Add shebang detection and improve disambiguation of *.cls
	  files

closes: vim/vim#12951

https://github.com/vim/vim/commit/e06afb7860805537ccd69966bc03169852c9b378

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
---
 runtime/lua/vim/filetype/detect.lua | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 0609ac5513..934b02dcdd 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -194,13 +194,18 @@ function M.cls(_, bufnr)
     return vim.g.filetype_cls
   end
   local line1 = getline(bufnr, 1)
-  if line1:find('^[%%\\]') then
-    return 'tex'
-  elseif line1:find('^#') and line1:lower():find('rexx') then
+  if matchregex(line1, [[^#!.*\<\%(rexx\|regina\)\>]]) then
     return 'rexx'
   elseif line1 == 'VERSION 1.0 CLASS' then
     return 'vb'
   end
+
+  local nonblank1 = nextnonblank(bufnr, 1)
+  if nonblank1 and nonblank1:find('^[%%\\]') then
+    return 'tex'
+  elseif nonblank1 and findany(nonblank1, { '^%s*/%*', '^%s*::%w' }) then
+    return 'rexx'
+  end
   return 'st'
 end
 
@@ -1648,6 +1653,7 @@ local patterns_hashbang = {
   guile = 'scheme',
   ['nix%-shell'] = 'nix',
   ['crystal\\>'] = { 'crystal', { vim_regex = true } },
+  ['^\\%(rexx\\|regina\\)\\>'] = { 'rexx', { vim_regex = true } },
 }
 
 ---@private
-- 
cgit 


From 67fba9affa14f2f3cd30371568c01d39f3e5f4d4 Mon Sep 17 00:00:00 2001
From: David Moberg <kaddkaka@gmail.com>
Date: Thu, 31 Aug 2023 03:18:39 +0200
Subject: fix(runtime/tutor): don't try to close fold when there is none
 (#24953)

Problem: When double clicking a line starting with a #, the code assumes
there is a fold there and tries to close it, resulting in an error if
there isn't a fold.
Solution: Check foldlevel before performing "zc".
---
 runtime/autoload/tutor.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/autoload/tutor.vim b/runtime/autoload/tutor.vim
index 4da4213826..80c09488d5 100644
--- a/runtime/autoload/tutor.vim
+++ b/runtime/autoload/tutor.vim
@@ -29,7 +29,7 @@ function! tutor#MouseDoubleClick()
     if foldclosed(line('.')) > -1
         normal! zo
     else
-        if match(getline('.'), '^#\{1,} ') > -1
+        if match(getline('.'), '^#\{1,} ') > -1 && foldlevel(line('.')) > 0
             silent normal! zc
         else
             call tutor#FollowLink(0)
-- 
cgit 


From c235959fd909d75248c066a781475e207606c5aa Mon Sep 17 00:00:00 2001
From: Chris AtLee <chris.atlee@shopify.com>
Date: Thu, 31 Aug 2023 04:00:24 -0400
Subject: fix(lsp): only disable inlay hints / diagnostics if no other clients
 are connected (#24535)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes the issue where the LspNotify handlers for inlay_hint /
diagnostics would end up refreshing all attached clients.

The handler would call util._refresh, which called
vim.lsp.buf_request, which calls the method on all attached clients.

Now util._refresh takes an optional client_id parameter, which is used
to specify a specific client to update.

This commit also fixes util._refresh's handling of the `only_visible`
flag. Previously if `only_visible` was false, two requests would be made
to the server: one for the visible region, and one for the entire file.

Co-authored-by: Stanislav Asunkin <1353637+stasjok@users.noreply.github.com>
Co-authored-by: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
---
 runtime/lua/vim/lsp.lua            |  2 +-
 runtime/lua/vim/lsp/diagnostic.lua | 26 ++++++++++++++++---
 runtime/lua/vim/lsp/inlay_hint.lua | 30 ++++++++++++++++-----
 runtime/lua/vim/lsp/util.lua       | 53 +++++++++++++++++++++++++-------------
 4 files changed, 82 insertions(+), 29 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 2a16bafbfc..1990c09561 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -2118,7 +2118,7 @@ api.nvim_create_autocmd('VimLeavePre', {
 ---@param bufnr (integer) Buffer handle, or 0 for current.
 ---@param method (string) LSP method name
 ---@param params table|nil Parameters to send to the server
----@param handler lsp-handler See |lsp-handler|
+---@param handler? lsp-handler See |lsp-handler|
 ---       If nil, follows resolution strategy defined in |lsp-handler-configuration|
 ---
 ---@return table<integer, integer> client_request_ids Map of client-id:request-id pairs
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index a0568bc09c..2a77992c4d 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -408,6 +408,16 @@ local function disable(bufnr)
   clear(bufnr)
 end
 
+--- Refresh diagnostics, only if we have attached clients that support it
+---@param bufnr (integer) buffer number
+---@param opts? table Additional options to pass to util._refresh
+---@private
+local function _refresh(bufnr, opts)
+  opts = opts or {}
+  opts['bufnr'] = bufnr
+  util._refresh(ms.textDocument_diagnostic, opts)
+end
+
 --- Enable pull diagnostics for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
 ---@private
@@ -429,7 +439,7 @@ function M._enable(bufnr)
           return
         end
         if bufstates[bufnr] and bufstates[bufnr].enabled then
-          util._refresh(ms.textDocument_diagnostic, { bufnr = bufnr, only_visible = true })
+          _refresh(bufnr, { only_visible = true, client_id = opts.data.client_id })
         end
       end,
       group = augroup,
@@ -438,7 +448,7 @@ function M._enable(bufnr)
     api.nvim_buf_attach(bufnr, false, {
       on_reload = function()
         if bufstates[bufnr] and bufstates[bufnr].enabled then
-          util._refresh(ms.textDocument_diagnostic, { bufnr = bufnr })
+          _refresh(bufnr)
         end
       end,
       on_detach = function()
@@ -448,8 +458,16 @@ function M._enable(bufnr)
 
     api.nvim_create_autocmd('LspDetach', {
       buffer = bufnr,
-      callback = function()
-        disable(bufnr)
+      callback = function(args)
+        local clients = vim.lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_diagnostic })
+
+        if
+          not vim.iter(clients):any(function(c)
+            return c.id ~= args.data.client_id
+          end)
+        then
+          disable(bufnr)
+        end
       end,
       group = augroup,
     })
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index 8407105d47..7b58188c53 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -131,6 +131,16 @@ local function disable(bufnr)
   end
 end
 
+--- Refresh inlay hints, only if we have attached clients that support it
+---@param bufnr (integer) Buffer handle, or 0 for current
+---@param opts? table Additional options to pass to util._refresh
+---@private
+local function _refresh(bufnr, opts)
+  opts = opts or {}
+  opts['bufnr'] = bufnr
+  util._refresh(ms.textDocument_inlayHint, opts)
+end
+
 --- Enable inlay hints for a buffer
 ---@param bufnr (integer) Buffer handle, or 0 for current
 local function enable(bufnr)
@@ -150,18 +160,18 @@ local function enable(bufnr)
           return
         end
         if bufstates[bufnr] and bufstates[bufnr].enabled then
-          util._refresh(ms.textDocument_inlayHint, { bufnr = bufnr })
+          _refresh(bufnr, { client_id = opts.data.client_id })
         end
       end,
       group = augroup,
     })
-    util._refresh(ms.textDocument_inlayHint, { bufnr = bufnr })
+    _refresh(bufnr)
     api.nvim_buf_attach(bufnr, false, {
       on_reload = function(_, cb_bufnr)
         clear(cb_bufnr)
         if bufstates[cb_bufnr] and bufstates[cb_bufnr].enabled then
           bufstates[cb_bufnr].applied = {}
-          util._refresh(ms.textDocument_inlayHint, { bufnr = cb_bufnr })
+          _refresh(cb_bufnr)
         end
       end,
       on_detach = function(_, cb_bufnr)
@@ -170,14 +180,22 @@ local function enable(bufnr)
     })
     api.nvim_create_autocmd('LspDetach', {
       buffer = bufnr,
-      callback = function()
-        disable(bufnr)
+      callback = function(args)
+        local clients = vim.lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_inlayHint })
+
+        if
+          not vim.iter(clients):any(function(c)
+            return c.id ~= args.data.client_id
+          end)
+        then
+          disable(bufnr)
+        end
       end,
       group = augroup,
     })
   else
     bufstate.enabled = true
-    util._refresh(ms.textDocument_inlayHint, { bufnr = bufnr })
+    _refresh(bufnr)
   end
 end
 
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 633cddca2d..2e376f9093 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -2122,6 +2122,7 @@ end
 function M.make_workspace_params(added, removed)
   return { event = { added = added, removed = removed } }
 end
+
 --- Returns indentation size.
 ---
 ---@see 'shiftwidth'
@@ -2192,32 +2193,46 @@ end
 ---@private
 --- Request updated LSP information for a buffer.
 ---
+---@class lsp.util.RefreshOptions
+---@field bufnr integer? Buffer to refresh (default: 0)
+---@field only_visible? boolean Whether to only refresh for the visible regions of the buffer (default: false)
+---@field client_id? integer Client ID to refresh (default: all clients)
+--
 ---@param method string LSP method to call
----@param opts (nil|table) Optional arguments
----  - bufnr (integer, default: 0): Buffer to refresh
----  - only_visible (boolean, default: false): Whether to only refresh for the visible regions of the buffer
+---@param opts? lsp.util.RefreshOptions Options table
 function M._refresh(method, opts)
   opts = opts or {}
   local bufnr = opts.bufnr
   if bufnr == nil or bufnr == 0 then
     bufnr = api.nvim_get_current_buf()
   end
+
+  local clients = vim.lsp.get_clients({ bufnr = bufnr, method = method, id = opts.client_id })
+
+  if #clients == 0 then
+    return
+  end
+
   local only_visible = opts.only_visible or false
-  for _, window in ipairs(api.nvim_list_wins()) do
-    if api.nvim_win_get_buf(window) == bufnr then
-      local first = vim.fn.line('w0', window)
-      local last = vim.fn.line('w$', window)
-      local params = {
-        textDocument = M.make_text_document_params(bufnr),
-        range = {
-          start = { line = first - 1, character = 0 },
-          ['end'] = { line = last, character = 0 },
-        },
-      }
-      vim.lsp.buf_request(bufnr, method, params)
+
+  if only_visible then
+    for _, window in ipairs(api.nvim_list_wins()) do
+      if api.nvim_win_get_buf(window) == bufnr then
+        local first = vim.fn.line('w0', window)
+        local last = vim.fn.line('w$', window)
+        local params = {
+          textDocument = M.make_text_document_params(bufnr),
+          range = {
+            start = { line = first - 1, character = 0 },
+            ['end'] = { line = last, character = 0 },
+          },
+        }
+        for _, client in ipairs(clients) do
+          client.request(method, params, nil, bufnr)
+        end
+      end
     end
-  end
-  if not only_visible then
+  else
     local params = {
       textDocument = M.make_text_document_params(bufnr),
       range = {
@@ -2225,7 +2240,9 @@ function M._refresh(method, opts)
         ['end'] = { line = api.nvim_buf_line_count(bufnr), character = 0 },
       },
     }
-    vim.lsp.buf_request(bufnr, method, params)
+    for _, client in ipairs(clients) do
+      client.request(method, params, nil, bufnr)
+    end
   end
 end
 
-- 
cgit 


From 0e7e25af20cf98a19f4f50ee80774fce07cef12e Mon Sep 17 00:00:00 2001
From: Jongwook Choi <wookayin@gmail.com>
Date: Thu, 31 Aug 2023 04:14:20 -0400
Subject: refactor(lsp): add type annotation for lsp.Client.server_capabilities
 (#24925)

The class `lsp.Client` has a public member `server_capabilities`,
which is assumed to be non-nil once initialized, as documented in
`:help vim.lsp.client`. Due to the possibility that it may be nil
before initialization, `lsp.Client` was not having a proper lua type
annotations on the field `server_capabilities`.

Instead of having a nil `server_capabilities` until initialized in
the RPC response callback, we can have an initial value of empty table.
This CHANGES the behavior of the `server_capabilities` field in a way
that it is no longer `nil` until initialization. Note that, as
already documented, `server_capabilities` should never be nil when
it is once initialized and thus ready to be used in user configs.
---
 runtime/lua/vim/lsp.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 1990c09561..b0caf5af35 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -397,8 +397,7 @@ do
   ---@return CTGroup
   local function get_group(client)
     local allow_inc_sync = if_nil(client.config.flags.allow_incremental_sync, true)
-    local change_capability =
-      vim.tbl_get(client.server_capabilities or {}, 'textDocumentSync', 'change')
+    local change_capability = vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'change')
     local sync_kind = change_capability or protocol.TextDocumentSyncKind.None
     if not allow_inc_sync and change_capability == protocol.TextDocumentSyncKind.Incremental then
       sync_kind = protocol.TextDocumentSyncKind.Full
@@ -1312,6 +1311,9 @@ function lsp.start_client(config)
     --- - lsp.WorkDoneProgressEnd    (extended with title from Begin)
     progress = vim.ringbuf(50),
 
+    --- @type lsp.ServerCapabilities
+    server_capabilities = {},
+
     ---@deprecated use client.progress instead
     messages = { name = name, messages = {}, progress = {}, status = {} },
     dynamic_capabilities = require('vim.lsp._dynamic').new(client_id),
@@ -1401,7 +1403,7 @@ function lsp.start_client(config)
       if not required_capability then
         return true
       end
-      if vim.tbl_get(client.server_capabilities or {}, unpack(required_capability)) then
+      if vim.tbl_get(client.server_capabilities, unpack(required_capability)) then
         return true
       else
         if client.dynamic_capabilities:supports_registration(method) then
-- 
cgit 


From 2fad4c0b392bb9d7fbb742be1fd5d214683b8ebb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 31 Aug 2023 08:21:25 +0200
Subject: vim-patch:1610528cc305

runtime(forth): Update syntax and ftplugin files (vim/vim#12976)

https://github.com/vim/vim/commit/1610528cc3052103e368c4175b09db6f9a6c150c

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/forth.vim |  71 ++++++
 runtime/syntax/forth.vim   | 571 ++++++++++++++++++++++++++++++---------------
 2 files changed, 451 insertions(+), 191 deletions(-)
 create mode 100644 runtime/ftplugin/forth.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/forth.vim b/runtime/ftplugin/forth.vim
new file mode 100644
index 0000000000..5343784a21
--- /dev/null
+++ b/runtime/ftplugin/forth.vim
@@ -0,0 +1,71 @@
+" Vim filetype plugin
+" Language:	Forth
+" Maintainer:	Johan Kotlinski <kotlinski@gmail.com>
+" Last Change:	2023 Aug 08
+" URL:		https://github.com/jkotlinski/forth.vim
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal commentstring=\\\ %s
+setlocal comments=s:(,mb:\ ,e:),b:\\
+setlocal iskeyword=33-126,128-255
+
+let s:include_patterns =<< trim EOL
+
+  \<\%(INCLUDE\|REQUIRE\)\>\s\+\zs\k\+\ze
+  \<S"\s\+\zs[^"]*\ze"\s\+\%(INCLUDED\|REQUIRED\)\>
+EOL
+let &l:include = $'\c{ s:include_patterns[1:]->join('\|') }'
+
+let s:define_patterns =<< trim EOL
+  :
+  [2F]\=CONSTANT
+  [2F]\=VALUE
+  [2F]\=VARIABLE
+  BEGIN-STRUCTURE
+  BUFFER:
+  CODE
+  CREATE
+  MARKER
+  SYNONYM
+EOL
+let &l:define = $'\c\<\%({ s:define_patterns->join('\|') }\)'
+
+" assume consistent intra-project file extensions
+let &l:suffixesadd = "." .. expand("%:e")
+
+let b:undo_ftplugin = "setl cms< com< def< inc< isk< sua<"
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  let s:matchit_patterns =<< trim EOL
+
+    \<\:\%(NONAME\)\=\>:\<EXIT\>:\<;\>
+    \<IF\>:\<ELSE\>:\<THEN\>
+    \<\[IF]\>:\<\[ELSE]\>:\<\[THEN]\>
+    \<?\=DO\>:\<LEAVE\>:\<+\=LOOP\>
+    \<CASE\>:\<ENDCASE\>
+    \<OF\>:\<ENDOF\>
+    \<BEGIN\>:\<WHILE\>:\<\%(AGAIN\|REPEAT\|UNTIL\)\>
+    \<CODE\>:\<END-CODE\>
+    \<BEGIN-STRUCTURE\>:\<END-STRUCTURE\>
+  EOL
+  let b:match_ignorecase = 1
+  let b:match_words = s:matchit_patterns[1:]->join(',')
+  let b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words"
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Forth Source Files (*.f *.fs *.ft *.fth *.4th)\t*.f;*.fs;*.ft;*.fth;*.4th\n" ..
+	\	       "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+unlet s:define_patterns s:include_patterns s:matchit_patterns
diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim
index fe98634079..252116a187 100644
--- a/runtime/syntax/forth.vim
+++ b/runtime/syntax/forth.vim
@@ -1,10 +1,20 @@
 " Vim syntax file
-" Language:    FORTH
-" Current Maintainer:  Johan Kotlinski <kotlinski@gmail.com>
-" Previous Maintainer:  Christian V. J. Br�ssow <cvjb@cvjb.de>
-" Last Change: 2023-01-12
-" Filenames:   *.fs,*.ft
-" URL:	       https://github.com/jkotlinski/forth.vim
+" Language:		Forth
+" Maintainer:		Johan Kotlinski <kotlinski@gmail.com>
+" Previous Maintainer:	Christian V. J. Brüssow <cvjb@cvjb.de>
+" Last Change:		2023 Aug 13
+" Filenames:		*.f,*.fs,*.ft,*.fth,*.4th
+" URL:			https://github.com/jkotlinski/forth.vim
+
+" Supports the Forth-2012 Standard.
+"
+" Removed words from the earlier Forth-79, Forth-83 and Forth-94 standards are
+" also included.
+"
+" These have been organised according to the version in which they were
+" initially included and the version in which they were removed (obsolescent
+" status is ignored).  Words with "experimental" or "uncontrolled" status are
+" not included unless they were later standardised.
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -15,19 +25,15 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 " Synchronization method
-syn sync ccomment
-syn sync maxlines=200
+exe "syn sync minlines=" .. get(g:, "forth_minlines", 50)
 
-" I use gforth, so I set this to case ignore
 syn case ignore
 
-" Some special, non-FORTH keywords
-syn keyword forthTodo contained TODO FIXME XXX
-
 " Characters allowed in keywords
 " I don't know if 128-255 are allowed in ANS-FORTH
-setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
+syn iskeyword 33-126,128-255
 
+" Space errors {{{1
 " when wanted, highlight trailing white space
 if exists("forth_space_errors")
     if !exists("forth_no_trail_space_error")
@@ -38,188 +44,369 @@ if exists("forth_space_errors")
     endif
 endif
 
-" Keywords
-
-" basic mathematical and logical operators
-syn keyword forthOperators + - * / MOD /MOD NEGATE ABS MIN MAX
-syn keyword forthOperators AND OR XOR NOT LSHIFT RSHIFT INVERT 2* 2/ 1+
-syn keyword forthOperators 1- 2+ 2- 8* UNDER+
-syn keyword forthOperators M+ */ */MOD M* UM* M*/ UM/MOD FM/MOD SM/REM
-syn keyword forthOperators D+ D- DNEGATE DABS DMIN DMAX D2* D2/
-syn keyword forthOperators F+ F- F* F/ FNEGATE FABS FMAX FMIN FLOOR FROUND
-syn keyword forthOperators F** FSQRT FEXP FEXPM1 FLN FLNP1 FLOG FALOG FSIN
-syn keyword forthOperators FCOS FSINCOS FTAN FASIN FACOS FATAN FATAN2 FSINH
-syn keyword forthOperators FCOSH FTANH FASINH FACOSH FATANH F2* F2/ 1/F
-syn keyword forthOperators F~REL F~ABS F~
-syn keyword forthOperators 0< 0<= 0<> 0= 0> 0>= < <= <> = > >= U< U<=
-syn keyword forthOperators U> U>= D0< D0<= D0<> D0= D0> D0>= D< D<= D<>
-syn keyword forthOperators D= D> D>= DU< DU<= DU> DU>= WITHIN ?NEGATE
-syn keyword forthOperators ?DNEGATE TRUE FALSE
-
-" various words that take an input and do something with it
-syn keyword forthFunction . U. .R U.R
-
-" stack manipulations
-syn keyword forthStack DROP NIP DUP OVER TUCK SWAP ROT -ROT ?DUP PICK ROLL
-syn keyword forthStack 2DROP 2NIP 2DUP 2OVER 2TUCK 2SWAP 2ROT 2-ROT
-syn keyword forthStack 3DUP 4DUP 5DUP 3DROP 4DROP 5DROP 8DROP 4SWAP 4ROT
-syn keyword forthStack 4-ROT 4TUCK 8SWAP 8DUP
-syn keyword forthRStack >R R> R@ RDROP 2>R 2R> 2R@ 2RDROP
-syn keyword forthRstack 4>R 4R> 4R@ 4RDROP
-syn keyword forthFStack FDROP FNIP FDUP FOVER FTUCK FSWAP FROT
-
-" stack pointer manipulations
-syn keyword forthSP SP@ SP! FP@ FP! RP@ RP! LP@ LP! DEPTH
-
-" address operations
-syn keyword forthMemory @ ! +! C@ C! 2@ 2! F@ F! SF@ SF! DF@ DF!
-syn keyword forthAdrArith CHARS CHAR+ CELLS CELL+ CELL ALIGN ALIGNED FLOATS
-syn keyword forthAdrArith FLOAT+ FLOAT FALIGN FALIGNED SFLOATS SFLOAT+
-syn keyword forthAdrArith SFALIGN SFALIGNED DFLOATS DFLOAT+ DFALIGN DFALIGNED
-syn keyword forthAdrArith MAXALIGN MAXALIGNED CFALIGN CFALIGNED
-syn keyword forthAdrArith ADDRESS-UNIT-BITS ALLOT ALLOCATE HERE
-syn keyword forthMemBlks MOVE ERASE CMOVE CMOVE> FILL BLANK UNUSED
-
-" conditionals
-syn keyword forthCond IF ELSE ENDIF THEN CASE OF ENDOF ENDCASE ?DUP-IF
-syn keyword forthCond ?DUP-0=-IF AHEAD CS-PICK CS-ROLL CATCH THROW WITHIN
-
-" iterations
-syn keyword forthLoop BEGIN WHILE REPEAT UNTIL AGAIN
-syn keyword forthLoop ?DO LOOP I J K +DO U+DO -DO U-DO DO +LOOP -LOOP
-syn keyword forthLoop UNLOOP LEAVE ?LEAVE EXIT DONE FOR NEXT RECURSE
-
-" new words
-syn match forthClassDef '\<:class\s*[^ \t]\+\>'
-syn match forthObjectDef '\<:object\s*[^ \t]\+\>'
-syn match forthColonDef '\<:m\?\s*[^ \t]\+\>'
-syn keyword forthEndOfColonDef ; ;M ;m
-syn keyword forthEndOfClassDef ;class
-syn keyword forthEndOfObjectDef ;object
-syn keyword forthDefine CONSTANT 2CONSTANT FCONSTANT VARIABLE 2VARIABLE
-syn keyword forthDefine FVARIABLE CREATE USER VALUE TO DEFER IS <BUILDS DOES> IMMEDIATE
-syn keyword forthDefine COMPILE-ONLY COMPILE RESTRICT INTERPRET POSTPONE EXECUTE
-syn keyword forthDefine LITERAL CREATE-INTERPRET/COMPILE INTERPRETATION>
-syn keyword forthDefine <INTERPRETATION COMPILATION> <COMPILATION ] LASTXT
-syn keyword forthDefine COMP' POSTPONE, FIND-NAME NAME>INT NAME?INT NAME>COMP
-syn keyword forthDefine NAME>STRING STATE C; CVARIABLE BUFFER: MARKER
-syn keyword forthDefine , 2, F, C, COMPILE,
-syn match forthDefine "\[DEFINED]"
-syn match forthDefine "\[UNDEFINED]"
-syn match forthDefine "\[IF]"
-syn match forthDefine "\[IFDEF]"
-syn match forthDefine "\[IFUNDEF]"
-syn match forthDefine "\[THEN]"
-syn match forthDefine "\[ENDIF]"
-syn match forthDefine "\[ELSE]"
-syn match forthDefine "\[?DO]"
-syn match forthDefine "\[DO]"
-syn match forthDefine "\[LOOP]"
-syn match forthDefine "\[+LOOP]"
-syn match forthDefine "\[NEXT]"
-syn match forthDefine "\[BEGIN]"
-syn match forthDefine "\[UNTIL]"
-syn match forthDefine "\[AGAIN]"
-syn match forthDefine "\[WHILE]"
-syn match forthDefine "\[REPEAT]"
-syn match forthDefine "\[COMP']"
-syn match forthDefine "'"
-syn match forthDefine '\<\[\>'
-syn match forthDefine "\[']"
-syn match forthDefine '\[COMPILE]'
-syn match forthDefine '\[CHAR]'
-
-" debugging
-syn keyword forthDebug PRINTDEBUGDATA PRINTDEBUGLINE
-syn match forthDebug "\<\~\~\>"
-
-" Assembler
-syn keyword forthAssembler ASSEMBLER CODE END-CODE ;CODE FLUSH-ICACHE C,
-
-" basic character operations
-syn keyword forthCharOps (.) CHAR EXPECT FIND WORD TYPE -TRAILING EMIT KEY
-syn keyword forthCharOps KEY? TIB CR BL COUNT SPACE SPACES
-" recognize 'char (' or '[char] (' correctly, so it doesn't
+" Core words {{{1
+
+" basic mathematical and logical operators {{{2
+syn keyword forthOperators * */ */MOD + - / /MOD 0< 0= 1+ 1- 2* 2/ < = > ABS
+syn keyword forthOperators AND FM/MOD INVERT LSHIFT M* MAX MIN MOD NEGATE OR
+syn keyword forthOperators RSHIFT SM/REM U< UM* UM/MOD XOR
+  " extension words
+syn keyword forthOperators 0<> 0> <> U> WITHIN
+  " Forth-79
+syn keyword forthOperators U* U/ U/MOD
+  " Forth-79, Forth-83
+syn keyword forthOperators NOT
+  " Forth-83
+syn keyword forthOperators 2+ 2-
+
+" non-standard basic mathematical and logical operators
+syn keyword forthOperators 0<= 0>= 8* <= >= ?DNEGATE ?NEGATE U<= U>= UNDER+
+
+" various words that take an input and do something with it {{{2
+syn keyword forthFunction . U.
+  " extension words
+syn keyword forthFunction .R U.R
+
+" stack manipulations {{{2
+syn keyword forthStack 2DROP 2DUP 2OVER 2SWAP >R ?DUP DROP DUP OVER R> R@ ROT
+syn keyword forthStack SWAP
+  " extension words
+syn keyword forthStack  NIP PICK ROLL TUCK
+syn keyword forthRStack 2>R 2R> 2R@
+
+" non-standard stack manipulations
+syn keyword forthStack  -ROT 3DROP 3DUP 4-ROT 4DROP 4DUP 4ROT 4SWAP 4TUCK
+syn keyword forthStack  5DROP 5DUP 8DROP 8DUP 8SWAP
+syn keyword forthRStack 4>R 4R> 4R@ 4RDROP RDROP
+
+" stack pointer manipulations {{{2
+syn keyword forthSP DEPTH
+
+" non-standard stack pointer manipulations
+syn keyword forthSP FP!  FP@ LP!  LP@ RP!  RP@ SP!  SP@
+
+" address operations {{{2
+syn keyword forthMemory !  +!  2!  2@ @ C!  C@
+syn keyword forthAdrArith ALIGN ALIGNED ALLOT CELL+ CELLS CHAR+ CHARS
+syn keyword forthMemBlks  FILL MOVE
+  " extension words
+syn keyword forthMemBlks  ERASE UNUSED
+
+" non-standard address operations
+syn keyword forthAdrArith ADDRESS-UNIT-BITS CELL CFALIGN CFALIGNED FLOAT
+syn keyword forthAdrArith MAXALIGN MAXALIGNED
+
+" conditionals {{{2
+syn keyword forthCond ELSE IF THEN
+  " extension words
+syn keyword forthCond CASE ENDCASE ENDOF OF
+
+" non-standard conditionals
+syn keyword forthCond ?DUP-0=-IF ?DUP-IF ENDIF
+
+" iterations {{{2
+syn keyword forthLoop +LOOP BEGIN DO EXIT I J LEAVE LOOP RECURSE REPEAT UNLOOP
+syn keyword forthLoop UNTIL WHILE
+  " extension words
+syn keyword forthLoop ?DO AGAIN
+
+" non-standard iterations
+syn keyword forthLoop +DO -DO -LOOP ?LEAVE DONE FOR K NEXT U+DO U-DO
+
+" new words {{{2
+syn match   forthColonDef      "\<:\s*[^ \t]\+\>"
+syn keyword forthEndOfColonDef ;
+syn keyword forthDefine ' , C, CONSTANT CREATE DOES> EXECUTE IMMEDIATE LITERAL
+syn keyword forthDefine POSTPONE STATE VARIABLE ]
+syn match   forthDefine "\<\[']\>"
+syn match   forthDefine "\<\[\>"
+  " extension words
+syn keyword forthColonDef :NONAME
+syn keyword forthDefine   BUFFER: COMPILE, DEFER IS MARKER TO VALUE
+syn match   forthDefine   "\<\[COMPILE]\>"
+  " Forth-79, Forth-83
+syn keyword forthDefine COMPILE
+
+" non-standard new words
+syn match   forthClassDef       "\<:CLASS\s*[^ \t]\+\>"
+syn keyword forthEndOfClassDef  ;CLASS
+syn match   forthObjectDef      "\<:OBJECT\s*[^ \t]\+\>"
+syn keyword forthEndOfObjectDef ;OBJECT
+syn match   forthColonDef       "\<:M\s*[^ \t]\+\>"
+syn keyword forthEndOfColonDef  ;M
+syn keyword forthDefine 2, <BUILDS <COMPILATION <INTERPRETATION C; COMP'
+syn keyword forthDefine COMPILATION> COMPILE-ONLY CREATE-INTERPRET/COMPILE
+syn keyword forthDefine CVARIABLE F, FIND-NAME INTERPRET INTERPRETATION>
+syn keyword forthDefine LASTXT NAME>COMP NAME>INT NAME?INT POSTPONE, RESTRICT
+syn keyword forthDefine USER
+syn match   forthDefine "\<\[COMP']\>"
+
+" basic character operations {{{2
+syn keyword forthCharOps BL COUNT CR EMIT FIND KEY SPACE SPACES TYPE WORD
+" recognize 'char (' or '[CHAR] (' correctly, so it doesn't
 " highlight everything after the paren as a comment till a closing ')'
-syn match forthCharOps '\<char\s\S\s'
-syn match forthCharOps '\<\[char\]\s\S\s'
-syn region forthCharOps start=+."\s+ skip=+\\"+ end=+"+
-
-" char-number conversion
-syn keyword forthConversion <<# <# # #> #>> #S (NUMBER) (NUMBER?) CONVERT D>F
-syn keyword forthConversion D>S DIGIT DPL F>D HLD HOLD NUMBER S>D SIGN >NUMBER
-syn keyword forthConversion F>S S>F HOLDS
-
-" interpreter, wordbook, compiler
-syn keyword forthForth (LOCAL) BYE COLD ABORT >BODY >NEXT >LINK CFA >VIEW HERE
-syn keyword forthForth PAD WORDS VIEW VIEW> N>LINK NAME> LINK> L>NAME FORGET
-syn keyword forthForth BODY> ASSERT( ASSERT0( ASSERT1( ASSERT2( ASSERT3( )
-syn keyword forthForth >IN ACCEPT ENVIRONMENT? EVALUATE QUIT SOURCE ACTION-OF
-syn keyword forthForth DEFER! DEFER@ PARSE PARSE-NAME REFILL RESTORE-INPUT
-syn keyword forthForth SAVE-INPUT SOURCE-ID
-syn region forthForth start=+ABORT"\s+ skip=+\\"+ end=+"+
-
-" vocabularies
-syn keyword forthVocs ONLY FORTH ALSO ROOT SEAL VOCS ORDER CONTEXT #VOCS
-syn keyword forthVocs VOCABULARY DEFINITIONS
-
-" File keywords
-syn keyword forthFileMode R/O R/W W/O BIN
-syn keyword forthFileWords OPEN-FILE CREATE-FILE CLOSE-FILE DELETE-FILE
-syn keyword forthFileWords RENAME-FILE READ-FILE READ-LINE KEY-FILE
-syn keyword forthFileWords KEY?-FILE WRITE-FILE WRITE-LINE EMIT-FILE
-syn keyword forthFileWords FLUSH-FILE FILE-STATUS FILE-POSITION
-syn keyword forthFileWords REPOSITION-FILE FILE-SIZE RESIZE-FILE
-syn keyword forthFileWords SLURP-FILE SLURP-FID STDIN STDOUT STDERR
-syn keyword forthFileWords INCLUDE-FILE INCLUDED REQUIRED
-syn keyword forthBlocks OPEN-BLOCKS USE LOAD --> BLOCK-OFFSET
-syn keyword forthBlocks GET-BLOCK-FID BLOCK-POSITION LIST SCR BLOCK
-syn keyword forthBlocks BUFER EMPTY-BUFFERS EMPTY-BUFFER UPDATE UPDATED?
-syn keyword forthBlocks SAVE-BUFFERS SAVE-BUFFER FLUSH THRU +LOAD +THRU
-syn keyword forthBlocks BLOCK-INCLUDED BLK
+syn match forthCharOps '\<CHAR\s\S\s'
+syn match forthCharOps '\<\[CHAR]\s\S\s'
+  " Forth-83, Forth-94
+syn keyword forthCharOps EXPECT #TIB TIB
+
+" non-standard basic character operations
+syn keyword forthCharOps (.)
+
+" char-number conversion {{{2
+syn keyword forthConversion # #> #S <# >NUMBER HOLD S>D SIGN
+  " extension words
+syn keyword forthConversion HOLDS
+  " Forth-79, Forth-83, Forth-93
+syn keyword forthConversion CONVERT
+
+" non-standard char-number conversion
+syn keyword forthConversion #>> (NUMBER) (NUMBER?) <<# DIGIT DPL HLD NUMBER
+
+" interpreter, wordbook, compiler {{{2
+syn keyword forthForth >BODY >IN ACCEPT ENVIRONMENT?  EVALUATE HERE QUIT SOURCE
+  " extension words
+syn keyword forthForth ACTION-OF DEFER!  DEFER@ PAD PARSE PARSE-NAME REFILL
+syn keyword forthForth RESTORE-INPUT SAVE-INPUT SOURCE-ID
+  " Forth-79
+syn keyword forthForth 79-STANDARD
+  " Forth-83
+syn keyword forthForth <MARK <RESOLVE >MARK >RESOLVE ?BRANCH BRANCH FORTH-83
+  " Forth-79, Forth-83, Forth-94
+syn keyword forthForth QUERY
+  " Forth-83, Forth-94
+syn keyword forthForth SPAN
+
+" non-standard interpreter, wordbook, compiler
+syn keyword forthForth ) >LINK >NEXT >VIEW ASSERT( ASSERT0( ASSERT1( ASSERT2(
+syn keyword forthForth ASSERT3( BODY> CFA COLD L>NAME LINK> N>LINK NAME> VIEW
+syn keyword forthForth VIEW>
+
+" booleans {{{2
+  " extension words
+syn match forthBoolean "\<\%(TRUE\|FALSE\)\>"
+
+" numbers {{{2
+syn keyword forthMath  BASE DECIMAL
+  " extension words
+syn keyword forthMath  HEX
+syn match forthInteger '\<-\=\d\+\.\=\>'
+syn match forthInteger '\<#-\=\d\+\.\=\>'
+syn match forthInteger '\<\$-\=\x\+\.\=\>'
+syn match forthInteger '\<%-\=[01]\+\.\=\>'
+
+" characters {{{2
+syn match forthCharacter "'\k'"
+
+" strings {{{2
+
+" Words that end with " are assumed to start string parsing.
+" This includes standard words: S" ."
+syn region forthString matchgroup=forthString start=+\<\S\+"\s+ end=+"+ end=+$+ contains=@Spell
+  " extension words
+syn region forthString matchgroup=forthString start=+\<C"\s+ end=+"+ end=+$+ contains=@Spell
+" Matches S\"
+syn region forthString matchgroup=forthString start=+\<S\\"\s+ end=+"+ end=+$+ contains=@Spell,forthEscape
+
+syn match forthEscape +\C\\[abeflmnqrtvz"\\]+ contained
+syn match forthEscape "\C\\x\x\x" contained
+
+" comments {{{2
 
-" numbers
-syn keyword forthMath DECIMAL HEX BASE
-syn match forthInteger '\<-\=[0-9]\+.\=\>'
-syn match forthInteger '\<&-\=[0-9]\+.\=\>'
-syn match forthInteger '\<#-\=[0-9]\+.\=\>'
-" recognize hex and binary numbers, the '$' and '%' notation is for gforth
-syn match forthInteger '\<\$\x*\x\+\>' " *1* --- don't mess
-syn match forthInteger '\<\x*\d\x*\>'  " *2* --- this order!
-syn match forthInteger '\<%[0-1]*[0-1]\+\>'
-syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe]\d\+\>'
-syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe][-+]\d\+\>'
-
-" XXX If you find this overkill you can remove it. this has to come after the
-" highlighting for numbers otherwise it has no effect.
-syn region forthComment start='0 \[if\]' end='\[endif\]' end='\[then\]' contains=forthTodo
-
-" Strings
-syn region forthString start=+\.*\"+ end=+"+ end=+$+ contains=@Spell
-" XXX
-syn region forthString start=+s\"+ end=+"+ end=+$+ contains=@Spell
-syn region forthString start=+s\\\"+ end=+"+ end=+$+ contains=@Spell
-syn region forthString start=+c\"+ end=+"+ end=+$+ contains=@Spell
-
-" Comments
-syn match forthComment '\\\%(\s.*\)\=$' contains=@Spell,forthTodo,forthSpaceError
-syn region forthComment start='\\S\s' end='.*' contains=@Spell,forthTodo,forthSpaceError
-syn match forthComment '\.(\s[^)]*)' contains=@Spell,forthTodo,forthSpaceError
-syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=@Spell,forthTodo,forthSpaceError
-syn region forthComment start='/\*' end='\*/' contains=@Spell,forthTodo,forthSpaceError
-
-" Include files
-syn match forthInclude '^INCLUDE\s\+\k\+'
-syn match forthInclude '^REQUIRE\s\+\k\+'
+syn keyword forthTodo contained TODO FIXME XXX
+
+" Some special, non-FORTH keywords
+syn match forthTodo contained "\<\%(TODO\|FIXME\|XXX\)\%(\>\|:\@=\)"
+
+" XXX If you find this overkill you can remove it. This has to come after the
+" highlighting for numbers and booleans otherwise it has no effect.
+syn region forthComment start='\<\%(0\|FALSE\)\s\+\[IF]' end='\<\[ENDIF]' end='\<\[THEN]' contains=forthTodo
+
+if get(g:, "forth_no_comment_fold", 0)
+    syn region forthComment start='\<(\>' end=')' contains=@Spell,forthTodo,forthSpaceError
+      " extension words
+    syn match  forthComment '\<\\\>.*$' contains=@Spell,forthTodo,forthSpaceError
+else
+    syn region forthComment start='\<(\>' end=')' contains=@Spell,forthTodo,forthSpaceError fold
+      " extension words
+    syn match  forthComment '\<\\\>.*$' contains=@Spell,forthTodo,forthSpaceError
+    syn region forthMultilineComment start="^\s*\\\>" end="\n\%(\s*\\\>\)\@!" contains=forthComment transparent fold
+endif
+
+  " extension words
+syn region forthComment start='\<\.(\>' end=')' end='$' contains=@Spell,forthTodo,forthSpaceError
+
+" ABORT {{{2
+syn keyword forthForth ABORT
+syn region forthForth start=+\<ABORT"\s+ end=+"\>+ end=+$+
+
+" The optional Block word set {{{1
+" Handled as Core words - REFILL
+syn keyword forthBlocks BLK BLOCK BUFFER FLUSH LOAD SAVE-BUFFERS UPDATE
+  " extension words
+syn keyword forthBlocks EMPTY-BUFFERS LIST SCR THRU
+
+" Non-standard Block words
+syn keyword forthBlocks +LOAD +THRU --> BLOCK-INCLUDED BLOCK-OFFSET
+syn keyword forthBlocks BLOCK-POSITION EMPTY-BUFFER GET-BLOCK-FID OPEN-BLOCKS
+syn keyword forthBlocks SAVE-BUFFER UPDATED? USE
+
+" The optional Double-Number word set {{{1
+syn keyword forthConversion D>S
+syn keyword forthDefine     2CONSTANT 2LITERAL 2VARIABLE
+syn keyword forthFunction   D. D.R
+syn keyword forthOperators  D+ D- D0= D2* D2/ D= DABS DMAX DMIN DNEGATE
+syn keyword forthOperators  D0< D< M+ M*/
+  " extension words
+syn keyword forthDefine    2VALUE
+syn keyword forthOperators DU<
+syn keyword forthStack     2ROT
+
+" Non-standard Double-Number words
+syn keyword forthOperators D0<= D0<> D0> D0>= D<= D<> D> D>= DU<= DU> DU>=
+syn keyword forthStack     2-ROT 2NIP 2RDROP 2TUCK
+
+" The optional Exception word set {{{1
+" Handled as Core words - ABORT ABORT"
+syn keyword forthCond CATCH THROW
+
+" The optional Facility word set {{{1
+syn keyword forthCharOps AT-XY KEY?  PAGE
+  " extension words
+syn keyword forthCharOps EKEY EKEY>CHAR EKEY>FKEY EKEY?  EMIT?  K-ALT-MASK
+syn keyword forthCharOps K-CTRL-MASK K-DELETE K-DOWN K-END K-F1 K-F10 K-F11
+syn keyword forthCharOps K-F12 K-F2 K-F3 K-F4 K-F5 K-F6 K-F7 K-F8 K-F9 K-HOME
+syn keyword forthCharOps K-INSERT K-LEFT K-NEXT K-PRIOR K-RIGHT K-SHIFT-MASK
+syn keyword forthCharOps K-UP
+syn keyword forthDefine  +FIELD BEGIN-STRUCTURE CFIELD: END-STRUCTURE FIELD:
+syn keyword forthForth   MS TIME&DATE
+
+" The optional File-Access word set {{{1
+" Handled as Core words - REFILL SOURCE-ID S\" S" (
+syn keyword forthFileMode  BIN R/O R/W W/O
+syn keyword forthFileWords CLOSE-FILE CREATE-FILE DELETE-FILE FILE-POSITION
+syn keyword forthFileWords FILE-SIZE INCLUDE-FILE INCLUDED OPEN-FILE READ-FILE
+syn keyword forthFileWords READ-LINE REPOSITION-FILE RESIZE-FILE WRITE-FILE
+syn keyword forthFileWords WRITE-LINE
+  " extension words
+syn keyword forthFileWords FILE-STATUS FLUSH-FILE RENAME-FILE REQUIRED
+syn match forthInclude '\<INCLUDE\s\+\k\+'
+syn match forthInclude '\<REQUIRE\s\+\k\+'
+
+" Non-standard File-Access words
+syn keyword forthFileWords EMIT-FILE KEY-FILE KEY?-FILE SLURP-FID SLURP-FILE
+syn keyword forthFileWords STDERR STDIN STDOUT
 syn match forthInclude '^FLOAD\s\+'
 syn match forthInclude '^NEEDS\s\+'
 
-" Locals definitions
-syn region forthLocals start='{\s' start='{$' end='\s}' end='^}'
-syn match forthLocals '{ }' " otherwise, at least two spaces between
-syn region forthDeprecated start='locals|' end='|'
+" The optional Floating-Point word set {{{1
 
-" Define the default highlighting.
+" numbers
+syn match   forthFloat      '\<[+-]\=\d\+\.\=\d*[DdEe][+-]\=\d*\>'
+
+syn keyword forthConversion >FLOAT D>F F>D
+syn keyword forthAdrArith   FALIGN FALIGNED FLOAT+ FLOATS
+syn keyword forthDefine     FCONSTANT FLITERAL FVARIABLE
+syn keyword forthFStack     FDROP FDUP FOVER FROT FSWAP
+syn keyword forthFunction   REPRESENT
+syn keyword forthMemory     F! F@
+syn keyword forthOperators  F* F+ F- F/ F0< F0= F< FLOOR FMAX FMIN FNEGATE
+syn keyword forthOperators  FROUND
+syn keyword forthSP         FDEPTH
+  " extension words
+syn keyword forthConversion F>S S>F
+syn keyword forthAdrArith   DFALIGN DFALIGNED DFLOAT+ DFLOATS SFALIGN
+syn keyword forthAdrArith   SFALIGNED SFLOAT+ SFLOATS
+syn keyword forthDefine     DFFIELD: FFIELD: FVALUE SFFIELD:
+syn keyword forthFunction   F. FE. FS. PRECISION SET-PRECISION
+syn keyword forthMemory     DF! DF@ SF! SF@
+syn keyword forthOperators  F** FABS FACOS FACOSH FALOG FASIN FASINH FATAN
+syn keyword forthOperators  FATAN2 FATANH FCOS FCOSH FEXP FEXPM1 FLN FLNP1
+syn keyword forthOperators  FLOG FSIN FSINCOS FSINH FSQRT FTAN FTANH FTRUNC F~
+
+" Non-standard Floating-Point words
+syn keyword forthOperators 1/F F2* F2/ F~ABS F~REL
+syn keyword forthFStack    FNIP FTUCK
+
+" The optional Locals word set {{{1
+syn keyword forthForth (LOCAL)
+  " extension words
+syn region forthLocals start="\<{:\>" end="\<:}\>"
+syn region forthLocals start="\<LOCALS|\>" end="\<|\>"
+
+" Non-standard Locals words
+syn region forthLocals start="\<{\>" end="\<}\>"
+
+" The optional Memory-Allocation word set {{{1
+syn keyword forthMemory ALLOCATE FREE RESIZE
+
+" The optional Programming-Tools wordset {{{1
+syn keyword forthDebug .S ? DUMP SEE WORDS
+  " extension words
+syn keyword forthAssembler ;CODE ASSEMBLER CODE END-CODE
+syn keyword forthCond      AHEAD CS-PICK CS-ROLL
+syn keyword forthDefine    NAME>COMPILE NAME>INTERPRET NAME>STRING SYNONYM
+syn keyword forthDefine    TRAVERSE-WORDLIST
+syn match   forthDefine    "\<\[DEFINED]\>"
+syn match   forthDefine    "\<\[ELSE]\>"
+syn match   forthDefine    "\<\[IF]\>"
+syn match   forthDefine    "\<\[THEN]\>"
+syn match   forthDefine    "\<\[UNDEFINED]\>"
+syn keyword forthForth     BYE FORGET
+syn keyword forthStack     N>R NR>
+syn keyword forthVocs      EDITOR
+
+" Non-standard Programming-Tools words
+syn keyword forthAssembler FLUSH-ICACHE
+syn keyword forthDebug     PRINTDEBUGDATA PRINTDEBUGLINE
+syn match   forthDebug     "\<\~\~\>"
+syn match   forthDefine    "\<\[+LOOP]\>"
+syn match   forthDefine    "\<\[?DO]\>"
+syn match   forthDefine    "\<\[AGAIN]\>"
+syn match   forthDefine    "\<\[BEGIN]\>"
+syn match   forthDefine    "\<\[DO]\>"
+syn match   forthDefine    "\<\[ENDIF]\>"
+syn match   forthDefine    "\<\[IFDEF]\>"
+syn match   forthDefine    "\<\[IFUNDEF]\>"
+syn match   forthDefine    "\<\[LOOP]\>"
+syn match   forthDefine    "\<\[NEXT]\>"
+syn match   forthDefine    "\<\[REPEAT]\>"
+syn match   forthDefine    "\<\[UNTIL]\>"
+syn match   forthDefine    "\<\[WHILE]\>"
+
+" The optional Search-Order word set {{{1
+" Handled as Core words - FIND
+syn keyword forthVocs DEFINITIONS FORTH-WORDLIST GET-CURRENT GET-ORDER
+syn keyword forthVocs SEARCH-WORDLIST SET-CURRENT SET-ORDER WORDLIST
+  " extension words
+syn keyword forthVocs ALSO FORTH ONLY ORDER PREVIOUS
+  " Forth-79, Forth-83
+syn keyword forthVocs CONTEXT CURRENT VOCABULARY
+
+" Non-standard Search-Order words
+syn keyword forthVocs #VOCS ROOT SEAL VOCS
+
+" The optional String word set {{{1
+syn keyword forthFunction -TRAILING /STRING BLANK CMOVE CMOVE> COMPARE SEARCH
+syn keyword forthFunction SLITERAL
+  " extension words
+syn keyword forthFunction REPLACES SUBSTITUTE UNESCAPE
+
+" The optional Extended-Character word set {{{1
+" Handled as Core words - [CHAR] CHAR and PARSE
+syn keyword forthAdrArith XCHAR+
+syn keyword forthCharOps  X-SIZE XC-SIZE XEMIT XKEY XKEY?
+syn keyword forthDefine   XC,
+syn keyword forthMemory   XC!+ XC!+? XC@+
+  " extension words
+syn keyword forthAdrArith   XCHAR- +X/STRING X\\STRING-
+syn keyword forthCharOps    EKEY>XCHAR X-WIDTH XC-WIDTH
+syn keyword forthConversion XHOLD
+syn keyword forthString     -TRAILING-GARBAGE
+
+" Define the default highlighting {{{1
+hi def link forthBoolean Boolean
+hi def link forthCharacter Character
 hi def link forthTodo Todo
 hi def link forthOperators Operator
 hi def link forthMath Number
@@ -243,6 +430,7 @@ hi def link forthCharOps Character
 hi def link forthConversion String
 hi def link forthForth Statement
 hi def link forthVocs Statement
+hi def link forthEscape Special
 hi def link forthString String
 hi def link forthComment Comment
 hi def link forthClassDef Define
@@ -251,16 +439,17 @@ hi def link forthObjectDef Define
 hi def link forthEndOfObjectDef Define
 hi def link forthInclude Include
 hi def link forthLocals Type " nothing else uses type and locals must stand out
-hi def link forthDeprecated Error " if you must, change to Type
 hi def link forthFileMode Function
 hi def link forthFunction Function
 hi def link forthFileWords Statement
 hi def link forthBlocks Statement
 hi def link forthSpaceError Error
+"}}}
 
 let b:current_syntax = "forth"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim:ts=8:sw=4:nocindent:smartindent:
+
+" vim:ts=8:sw=4:nocindent:smartindent:fdm=marker:tw=78
 
-- 
cgit 


From 4afd33e69f4c4a061bcb51a5ed437163262f943c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 31 Aug 2023 08:22:07 +0200
Subject: vim-patch:0b8b145bf8bf

runtime(optwin): Fix for 'splitkeep' option (vim/vim#12974)

'spk' was used as a boolean, rather than a string option.

https://github.com/vim/vim/commit/0b8b145bf8bfd3e90a1c30a999e6adb89ec8891c

Co-authored-by: xrandomname <141588647+xrandomname@users.noreply.github.com>
---
 runtime/optwin.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 647859e359..fc60f70335 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
+" Last Change:	2023 Aug 31
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " If there already is an option window, jump to that one.
@@ -480,7 +480,7 @@ call <SID>OptionG("swb", &swb)
 call <SID>AddOption("splitbelow", gettext("a new window is put below the current one"))
 call <SID>BinOptionG("sb", &sb)
 call <SID>AddOption("splitkeep", gettext("determines scroll behavior for split windows"))
-call <SID>BinOptionG("spk", &spk)
+call <SID>OptionG("spk", &spk)
 call <SID>AddOption("splitright", gettext("a new window is put right of the current one"))
 call <SID>BinOptionG("spr", &spr)
 call <SID>AddOption("scrollbind", gettext("this window scrolls together with other bound windows"))
-- 
cgit 


From 845d5b8b64190e0e09a6a6dd97bdbc0e6f96eb02 Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Wed, 19 Jul 2023 05:02:49 -0400
Subject: feat(treesitter): improve query error message

---
 runtime/doc/news.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index a233b66d1f..7607d218c3 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -135,6 +135,7 @@ The following new APIs and features were added.
     or the parent LanguageTree's language, respectively.
   • Added `vim.treesitter.preview_query()`, for live editing of treesitter
     queries.
+  • Improved error messages for query parsing.
 
 • |vim.ui.open()| opens URIs using the system default handler (macOS `open`,
   Windows `explorer`, Linux `xdg-open`, etc.)
-- 
cgit 


From 7bf0963d48ec76b1cdeee55edc8f2053eca87367 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 1 Sep 2023 11:38:31 +0800
Subject: vim-patch:9.0.1833: [security] runtime file fixes (#24969)

Problem:  runtime files may execute code in current dir
Solution: only execute, if not run from current directory

The perl, zig and ruby filetype plugins and the zip and gzip autoload
plugins may try to load malicious executable files from the current
working directory.  This is especially a problem on windows, where the
current directory is implicitly in your $PATH and windows may even run a
file with the extension `.bat` because of $PATHEXT.

So make sure that we are not trying to execute a file from the current
directory. If this would be the case, error out (for the zip and gzip)
plugins or silently do not run those commands (for the ftplugins).

This assumes, that only the current working directory is bad. For all
other directories, it is assumed that those directories were
intentionally set to the $PATH by the user.

https://github.com/vim/vim/commit/816fbcc262687b81fc46f82f7bbeb1453addfe0c

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/autoload/gzip.vim |  7 ++++-
 runtime/autoload/zip.vim  |  4 +++
 runtime/ftplugin/perl.vim |  3 ++-
 runtime/ftplugin/ruby.vim | 68 +++++++++++++++++++++++++++--------------------
 runtime/ftplugin/zig.vim  |  4 ++-
 5 files changed, 54 insertions(+), 32 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim
index 95dd906794..ac9e37bf85 100644
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -10,12 +10,17 @@
 fun s:check(cmd)
   let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
   if !exists("s:have_" . name)
+    " safety check, don't execute anything from the current directory
+    let f = fnamemodify(exepath(name), ":p:h") !=# getcwd()
+    if !f
+      echoerr "Warning: NOT executing " .. name .. " from current directory!"
+    endif
     let e = executable(name)
     if e < 0
       let r = system(name . " --version")
       let e = (r !~ "not found" && r != "")
     endif
-    exe "let s:have_" . name . "=" . e
+    exe "let s:have_" . name . "=" . (e && f)
   endif
   exe "return s:have_" . name
 endfun
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 8dda30c418..0331a542ac 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -57,6 +57,10 @@ if !exists("g:zip_extractcmd")
  let g:zip_extractcmd= g:zip_unzipcmd
 endif
 
+if fnamemodify(exepath(g:zip_unzipcmd), ":p:h") ==# getcwd()
+ echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!"
+ finish
+endif
 " ----------------
 "  Functions: {{{1
 " ----------------
diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index d0bdbc0cfb..edc7b960f1 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -54,7 +54,8 @@ endif
 
 " Set this once, globally.
 if !exists("perlpath")
-    if executable("perl")
+    " safety check: don't execute perl from current directory
+    if executable("perl") && fnamemodify(exepath("perl"), ":p:h") != getcwd()
       try
 	if &shellxquote != '"'
 	    let perlpath = system('perl -e "print join(q/,/,@INC)"')
diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim
index 8c1f47731c..f4e1f60438 100644
--- a/runtime/ftplugin/ruby.vim
+++ b/runtime/ftplugin/ruby.vim
@@ -99,41 +99,51 @@ function! s:build_path(path) abort
   return path
 endfunction
 
-if !exists('b:ruby_version') && !exists('g:ruby_path') && isdirectory(expand('%:p:h'))
-  let s:version_file = findfile('.ruby-version', '.;')
-  if !empty(s:version_file) && filereadable(s:version_file)
-    let b:ruby_version = get(readfile(s:version_file, '', 1), '')
-    if !has_key(g:ruby_version_paths, b:ruby_version)
-      let g:ruby_version_paths[b:ruby_version] = s:query_path(fnamemodify(s:version_file, ':p:h'))
+let s:execute_ruby = 1
+" Security Check, don't execute ruby from the current directory
+if fnamemodify(exepath("ruby"), ":p:h") ==# getcwd()
+  let s:execute_ruby = 0
+endif
+
+function SetRubyPath()
+  if !exists('b:ruby_version') && !exists('g:ruby_path') && isdirectory(expand('%:p:h'))
+    let s:version_file = findfile('.ruby-version', '.;')
+    if !empty(s:version_file) && filereadable(s:version_file) && s:execute_ruby
+      let b:ruby_version = get(readfile(s:version_file, '', 1), '')
+      if !has_key(g:ruby_version_paths, b:ruby_version)
+	let g:ruby_version_paths[b:ruby_version] = s:query_path(fnamemodify(s:version_file, ':p:h'))
+      endif
     endif
   endif
-endif
 
-if exists("g:ruby_path")
-  let s:ruby_path = type(g:ruby_path) == type([]) ? join(g:ruby_path, ',') : g:ruby_path
-elseif has_key(g:ruby_version_paths, get(b:, 'ruby_version', ''))
-  let s:ruby_paths = g:ruby_version_paths[b:ruby_version]
-  let s:ruby_path = s:build_path(s:ruby_paths)
-else
-  if !exists('g:ruby_default_path')
-    if has("ruby") && has("win32")
-      ruby ::VIM::command( 'let g:ruby_default_path = split("%s",",")' % $:.join(%q{,}) )
-    elseif executable('ruby') && !empty($HOME)
-      let g:ruby_default_path = s:query_path($HOME)
-    else
-      let g:ruby_default_path = map(split($RUBYLIB,':'), 'v:val ==# "." ? "" : v:val')
+  if exists("g:ruby_path")
+    let s:ruby_path = type(g:ruby_path) == type([]) ? join(g:ruby_path, ',') : g:ruby_path
+  elseif has_key(g:ruby_version_paths, get(b:, 'ruby_version', '')) && s:execute_ruby
+    let s:ruby_paths = g:ruby_version_paths[b:ruby_version]
+    let s:ruby_path = s:build_path(s:ruby_paths)
+  else
+    if !exists('g:ruby_default_path')
+      if has("ruby") && has("win32")
+	ruby ::VIM::command( 'let g:ruby_default_path = split("%s",",")' % $:.join(%q{,}) )
+      elseif executable('ruby') && !empty($HOME) && s:execute_ruby
+	let g:ruby_default_path = s:query_path($HOME)
+      else
+	let g:ruby_default_path = map(split($RUBYLIB,':'), 'v:val ==# "." ? "" : v:val')
+      endif
     endif
+    let s:ruby_paths = g:ruby_default_path
+    let s:ruby_path = s:build_path(s:ruby_paths)
   endif
-  let s:ruby_paths = g:ruby_default_path
-  let s:ruby_path = s:build_path(s:ruby_paths)
-endif
 
-if stridx(&l:path, s:ruby_path) == -1
-  let &l:path = s:ruby_path
-endif
-if exists('s:ruby_paths') && stridx(&l:tags, join(map(copy(s:ruby_paths),'v:val."/tags"'),',')) == -1
-  let &l:tags = &tags . ',' . join(map(copy(s:ruby_paths),'v:val."/tags"'),',')
-endif
+  if stridx(&l:path, s:ruby_path) == -1
+    let &l:path = s:ruby_path
+  endif
+  if exists('s:ruby_paths') && stridx(&l:tags, join(map(copy(s:ruby_paths),'v:val."/tags"'),',')) == -1
+    let &l:tags = &tags . ',' . join(map(copy(s:ruby_paths),'v:val."/tags"'),',')
+  endif
+endfunction
+
+call SetRubyPath()
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "Ruby Source Files (*.rb)\t*.rb\n" .
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index 5f453fc8d1..cd18bfe2bd 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -39,7 +39,9 @@ endif
 
 let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
 
-if !exists('g:zig_std_dir') && exists('*json_decode') && executable('zig')
+" Safety check: don't execute zip from current directory
+if !exists('g:zig_std_dir') && exists('*json_decode') &&
+    \  executable('zig') && fnamemodify(exepath("zig"), ":p:h") != getcwd()
     silent let s:env = system('zig env')
     if v:shell_error == 0
         let g:zig_std_dir = json_decode(s:env)['std_dir']
-- 
cgit 


From 597355deae2ebddcb8b930da9a8b45a65d05d09b Mon Sep 17 00:00:00 2001
From: TheBlob42 <hessenmobbel@web.de>
Date: Fri, 1 Sep 2023 13:31:05 +0200
Subject: fix(lsp): wrong iterator in registerCapability handler (#24971)

---
 runtime/lua/vim/lsp/handlers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 6fe4b7f939..a6b70ac911 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -112,7 +112,7 @@ M[ms.client_registerCapability] = function(_, result, ctx)
   local client = vim.lsp.get_client_by_id(client_id)
 
   client.dynamic_capabilities:register(result.registrations)
-  for bufnr, _ in ipairs(client.attached_buffers) do
+  for bufnr, _ in pairs(client.attached_buffers) do
     vim.lsp._set_defaults(client, bufnr)
   end
 
-- 
cgit 


From 61ccdb2db62481a38604426be530753ad2f9e7cb Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 2 Sep 2023 10:43:23 +0200
Subject: vim-patch:da16a1b471aa

runtime(ruby): Update syntax, indent and ftplugin files

While making changes to the ruby ftplugin, slightly change the exepath()
conditional from patch 9.0.1833 and move it after the :cd invocation.

closes: 12981
closes: 12994

https://github.com/vim/vim/commit/da16a1b471aa717f58909cc6531cb6dbbff14d22

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
Co-authored-by: Tim Pope <code@tpope.net>
---
 runtime/ftplugin/eruby.vim | 12 +++++---
 runtime/ftplugin/ruby.vim  | 76 +++++++++++++++++++++-------------------------
 runtime/indent/ruby.vim    |  4 +--
 runtime/syntax/ruby.vim    | 26 ++++++++--------
 4 files changed, 58 insertions(+), 60 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/eruby.vim b/runtime/ftplugin/eruby.vim
index e67b00b278..893fa58d32 100644
--- a/runtime/ftplugin/eruby.vim
+++ b/runtime/ftplugin/eruby.vim
@@ -3,7 +3,7 @@
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2020 Jun 28
+" Last Change:		2022 May 15
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -86,8 +86,12 @@ runtime! ftplugin/ruby.vim ftplugin/ruby_*.vim ftplugin/ruby/*.vim
 let b:did_ftplugin = 1
 
 " Combine the new set of values with those previously included.
-if exists("b:undo_ftplugin")
-  let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
+if !exists('b:undo_ftplugin')
+  " No-op
+  let b:undo_ftplugin = 'exe'
+endif
+if !empty(s:undo_ftplugin)
+  let b:undo_ftplugin .= '|' . s:undo_ftplugin
 endif
 if exists ("b:browsefilter")
   let s:browsefilter = substitute(b:browsefilter,'\cAll Files (\*\.\*)\t\*\.\*\n','','') . s:browsefilter
@@ -119,7 +123,7 @@ endif
 setlocal commentstring=<%#%s%>
 
 let b:undo_ftplugin = "setl cms< " .
-      \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
+      \ " | unlet! b:browsefilter b:match_words | " . b:undo_ftplugin
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim
index f4e1f60438..1262099d88 100644
--- a/runtime/ftplugin/ruby.vim
+++ b/runtime/ftplugin/ruby.vim
@@ -3,7 +3,7 @@
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2022 Mar 21
+" Last Change:		2023 Sep 1st
 
 if (exists("b:did_ftplugin"))
   finish
@@ -77,7 +77,11 @@ function! s:query_path(root) abort
   let cwd = fnameescape(getcwd())
   try
     exe cd fnameescape(a:root)
-    let path = split(system(path_check),',')
+    if fnamemodify(exepath('ruby'), ':p:h') ==# getcwd()
+      let path = []
+    else
+      let path = split(system(path_check),',')
+    endif
     exe cd cwd
     return path
   finally
@@ -99,51 +103,41 @@ function! s:build_path(path) abort
   return path
 endfunction
 
-let s:execute_ruby = 1
-" Security Check, don't execute ruby from the current directory
-if fnamemodify(exepath("ruby"), ":p:h") ==# getcwd()
-  let s:execute_ruby = 0
-endif
-
-function SetRubyPath()
-  if !exists('b:ruby_version') && !exists('g:ruby_path') && isdirectory(expand('%:p:h'))
-    let s:version_file = findfile('.ruby-version', '.;')
-    if !empty(s:version_file) && filereadable(s:version_file) && s:execute_ruby
-      let b:ruby_version = get(readfile(s:version_file, '', 1), '')
-      if !has_key(g:ruby_version_paths, b:ruby_version)
-	let g:ruby_version_paths[b:ruby_version] = s:query_path(fnamemodify(s:version_file, ':p:h'))
-      endif
+if !exists('b:ruby_version') && !exists('g:ruby_path') && isdirectory(expand('%:p:h'))
+  let s:version_file = findfile('.ruby-version', '.;')
+  if !empty(s:version_file) && filereadable(s:version_file)
+    let b:ruby_version = get(readfile(s:version_file, '', 1), '')
+    if !has_key(g:ruby_version_paths, b:ruby_version)
+      let g:ruby_version_paths[b:ruby_version] = s:query_path(fnamemodify(s:version_file, ':p:h'))
     endif
   endif
+endif
 
-  if exists("g:ruby_path")
-    let s:ruby_path = type(g:ruby_path) == type([]) ? join(g:ruby_path, ',') : g:ruby_path
-  elseif has_key(g:ruby_version_paths, get(b:, 'ruby_version', '')) && s:execute_ruby
-    let s:ruby_paths = g:ruby_version_paths[b:ruby_version]
-    let s:ruby_path = s:build_path(s:ruby_paths)
-  else
-    if !exists('g:ruby_default_path')
-      if has("ruby") && has("win32")
-	ruby ::VIM::command( 'let g:ruby_default_path = split("%s",",")' % $:.join(%q{,}) )
-      elseif executable('ruby') && !empty($HOME) && s:execute_ruby
-	let g:ruby_default_path = s:query_path($HOME)
-      else
-	let g:ruby_default_path = map(split($RUBYLIB,':'), 'v:val ==# "." ? "" : v:val')
-      endif
+if exists("g:ruby_path")
+  let s:ruby_path = type(g:ruby_path) == type([]) ? join(g:ruby_path, ',') : g:ruby_path
+elseif has_key(g:ruby_version_paths, get(b:, 'ruby_version', ''))
+  let s:ruby_paths = g:ruby_version_paths[b:ruby_version]
+  let s:ruby_path = s:build_path(s:ruby_paths)
+else
+  if !exists('g:ruby_default_path')
+    if has("ruby") && has("win32")
+      ruby ::VIM::command( 'let g:ruby_default_path = split("%s",",")' % $:.join(%q{,}) )
+    elseif executable('ruby') && !empty($HOME)
+      let g:ruby_default_path = s:query_path($HOME)
+    else
+      let g:ruby_default_path = map(split($RUBYLIB,':'), 'v:val ==# "." ? "" : v:val')
     endif
-    let s:ruby_paths = g:ruby_default_path
-    let s:ruby_path = s:build_path(s:ruby_paths)
-  endif
-
-  if stridx(&l:path, s:ruby_path) == -1
-    let &l:path = s:ruby_path
-  endif
-  if exists('s:ruby_paths') && stridx(&l:tags, join(map(copy(s:ruby_paths),'v:val."/tags"'),',')) == -1
-    let &l:tags = &tags . ',' . join(map(copy(s:ruby_paths),'v:val."/tags"'),',')
   endif
-endfunction
+  let s:ruby_paths = g:ruby_default_path
+  let s:ruby_path = s:build_path(s:ruby_paths)
+endif
 
-call SetRubyPath()
+if stridx(&l:path, s:ruby_path) == -1
+  let &l:path = s:ruby_path
+endif
+if exists('s:ruby_paths') && stridx(&l:tags, join(map(copy(s:ruby_paths),'v:val."/tags"'),',')) == -1
+  let &l:tags = &tags . ',' . join(map(copy(s:ruby_paths),'v:val."/tags"'),',')
+endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "Ruby Source Files (*.rb)\t*.rb\n" .
diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim
index 6ce8529fd1..ea5a2a7494 100644
--- a/runtime/indent/ruby.vim
+++ b/runtime/indent/ruby.vim
@@ -4,7 +4,7 @@
 " Previous Maintainer:	Nikolai Weibull <now at bitwi.se>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2022 Mar 22
+" Last Change:		2022 Jun 30
 
 " 0. Initialization {{{1
 " =================
@@ -93,7 +93,7 @@ let s:ruby_indent_keywords =
       \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>'
 
 " Def without an end clause: def method_call(...) = <expression>
-let s:ruby_endless_def = '\<def\s\+\k\+[!?]\=\%((.*)\|\s\)\s*='
+let s:ruby_endless_def = '\<def\s\+\%(\k\+\.\)\=\k\+[!?]\=\%((.*)\|\s\)\s*='
 
 " Regex used for words that, at the start of a line, remove a level of indent.
 let s:ruby_deindent_keywords =
diff --git a/runtime/syntax/ruby.vim b/runtime/syntax/ruby.vim
index c951fcfe1d..e19d61a051 100644
--- a/runtime/syntax/ruby.vim
+++ b/runtime/syntax/ruby.vim
@@ -3,7 +3,7 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:		2021 Nov 03
+" Last Change:		2023 Mar 16
 " ----------------------------------------------------------------------------
 "
 " Previous Maintainer:	Mirko Nasato
@@ -145,9 +145,9 @@ syn cluster rubyStringSpecial	 contains=rubyInterpolation,rubyStringEscape
 syn cluster rubyStringNotTop	 contains=@rubyStringSpecial,@rubyNestedBrackets,@rubySingleCharEscape
 
 " Regular Expression Metacharacters {{{1
-syn region rubyRegexpComment	  matchgroup=rubyRegexpSpecial	 start="(?#"								    skip="\\\\\|\\)"  end=")"  contained
-syn region rubyRegexpParens	  matchgroup=rubyRegexpSpecial	 start="(\(?:\|?<\=[=!]\|?>\|?<[a-z_]\w*>\|?[imx]*-[imx]*:\=\|\%(?#\)\@!\)" skip="\\\\\|\\)"  end=")"  contained transparent contains=@rubyRegexpSpecial
-syn region rubyRegexpBrackets	  matchgroup=rubyRegexpCharClass start="\[\^\="								    skip="\\\\\|\\\]" end="\]" contained transparent contains=rubyRegexpBrackets,rubyStringEscape,rubyRegexpEscape,rubyRegexpCharClass,rubyRegexpIntersection oneline
+syn region rubyRegexpComment	  matchgroup=rubyRegexpSpecial	 start="(?#"								     skip="\\\\\|\\)"  end=")"	contained
+syn region rubyRegexpParens	  matchgroup=rubyRegexpSpecial	 start="(\%(?:\|?<\=[=!]\|?>\|?<[a-z_]\w*>\|?[imx]*-[imx]*:\=\|\%(?#\)\@!\)" skip="\\\\\|\\)"  end=")"	contained transparent contains=@rubyRegexpSpecial
+syn region rubyRegexpBrackets	  matchgroup=rubyRegexpCharClass start="\[\^\="								     skip="\\\\\|\\\]" end="\]" contained transparent contains=rubyRegexpBrackets,rubyStringEscape,rubyRegexpEscape,rubyRegexpCharClass,rubyRegexpIntersection oneline
 syn match  rubyRegexpCharClass	  "\\[DdHhRSsWw]"	 contained display
 syn match  rubyRegexpCharClass	  "\[:\^\=\%(alnum\|alpha\|ascii\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|word\|xdigit\):\]" contained
 syn match  rubyRegexpCharClass	  "\\[pP]{^\=.\{-}}"	 contained display
@@ -346,7 +346,7 @@ syn cluster rubyDeclaration contains=rubyAliasDeclaration,rubyAliasDeclaration2,
 syn match rubyControl	     "\%#=1\<\%(break\|in\|next\|redo\|retry\|return\)\>"
 syn match rubyKeyword	     "\%#=1\<\%(super\|yield\)\>"
 syn match rubyBoolean	     "\%#=1\<\%(true\|false\)\>[?!]\@!"
-syn match rubyPseudoVariable "\%#=1\<\(self\|nil\)\>[?!]\@!"
+syn match rubyPseudoVariable "\%#=1\<\%(self\|nil\)\>[?!]\@!"
 syn match rubyPseudoVariable "\%#=1\<__\%(ENCODING\|dir\|FILE\|LINE\|callee\|method\)__\>"
 syn match rubyBeginEnd	     "\%#=1\<\%(BEGIN\|END\)\>"
 
@@ -399,11 +399,6 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
 
   SynFold 'for' syn region rubyRepeatExpression start="\<for\>" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\%(\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\@<![!?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyRepeat skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop nextgroup=rubyOptionalDoLine
 
-  if !exists("ruby_minlines")
-    let ruby_minlines = 500
-  endif
-  exe "syn sync minlines=" . ruby_minlines
-
 else
   syn match rubyControl "\<def\>"    nextgroup=rubyMethodDeclaration skipwhite skipnl
   syn match rubyControl "\<class\>"  nextgroup=rubyClassDeclaration  skipwhite skipnl
@@ -412,13 +407,18 @@ else
   syn match rubyKeyword "\<\%(alias\|undef\)\>"
 endif
 
+if !exists("ruby_minlines")
+  let ruby_minlines = 500
+endif
+exe "syn sync minlines=" . ruby_minlines
+
 " Special Methods {{{1
 if !exists("ruby_no_special_methods")
   syn match rubyAccess	  "\<\%(public\|protected\|private\)\>" " use re=2
   syn match rubyAccess	  "\%#=1\<\%(public\|private\)_class_method\>"
   syn match rubyAccess	  "\%#=1\<\%(public\|private\)_constant\>"
   syn match rubyAccess	  "\%#=1\<module_function\>"
-  syn match rubyAttribute "\%#=1\%(\%(^\|;\)\s*\)\@<=attr\>\(\s*[.=]\)\@!" " attr is a common variable name
+  syn match rubyAttribute "\%#=1\%(\%(^\|;\)\s*\)\@<=attr\>\%(\s*[.=]\)\@!" " attr is a common variable name
   syn match rubyAttribute "\%#=1\<attr_\%(accessor\|reader\|writer\)\>"
   syn match rubyControl   "\%#=1\<\%(abort\|at_exit\|exit\|fork\|loop\|trap\)\>"
   syn match rubyEval	  "\%#=1\<eval\>"
@@ -435,8 +435,8 @@ syn match   rubySharpBang    "\%^#!.*" display
 syn keyword rubyTodo	     FIXME NOTE TODO OPTIMIZE HACK REVIEW XXX todo contained
 syn match   rubyEncoding     "[[:alnum:]-_]\+" contained display
 syn match   rubyMagicComment "\c\%<3l#\s*\zs\%(coding\|encoding\):"					contained nextgroup=rubyEncoding skipwhite
-syn match   rubyMagicComment "\c\%<10l#\s*\zs\%(frozen_string_literal\|warn_indent\|warn_past_scope\):" contained nextgroup=rubyBoolean  skipwhite
-syn match   rubyMagicComment "\c\%<10l#\s*\zs\%(shareable_constant_value\):"				contained nextgroup=rubyEncoding  skipwhite
+syn match   rubyMagicComment "\c\%<10l#\s*\zs\%(frozen[-_]string[-_]literal\|warn[-_]indent\|warn[-_]past[-_]scope\):" contained nextgroup=rubyBoolean  skipwhite
+syn match   rubyMagicComment "\c\%<10l#\s*\zs\%(shareable[-_]constant[-_]value\):"				contained nextgroup=rubyEncoding  skipwhite
 syn match   rubyComment	     "#.*" contains=@rubyCommentSpecial,rubySpaceError,@Spell
 
 syn cluster rubyCommentSpecial contains=rubySharpBang,rubyTodo,rubyMagicComment
-- 
cgit 


From f02bfb6a2a079fc223db9f941dc917aa06a45b09 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 2 Sep 2023 10:43:57 +0200
Subject: vim-patch:acb91d3905cf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(zserio): add zserio syntax (vim/vim#13005)

https://github.com/vim/vim/commit/acb91d3905cfef5eff8edfb76e62a6b6bab1e91e

Co-authored-by: Dominique Pellé <dominique.pelle@gmail.com>
---
 runtime/makemenu.vim      |   1 +
 runtime/synmenu.vim       |   1 +
 runtime/syntax/zserio.vim | 112 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 114 insertions(+)
 create mode 100644 runtime/syntax/zserio.vim

(limited to 'runtime')

diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 8da7c0b68c..bf9f43cf16 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -676,6 +676,7 @@ SynMenu WXYZ.XFree86\ Config:xf86conf
 SynMenu WXYZ.YAML:yaml
 SynMenu WXYZ.Yacc:yacc
 SynMenu WXYZ.Zimbu:zimbu
+SynMenu WXYZ.Zserio:zserio
 
 call append(s:lnum, "")
 
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 8a8c6a2b90..b75a0e9497 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -650,6 +650,7 @@ an 50.170.390 &Syntax.WXYZ.XFree86\ Config :cal SetSyn("xf86conf")<CR>
 an 50.170.410 &Syntax.WXYZ.YAML :cal SetSyn("yaml")<CR>
 an 50.170.420 &Syntax.WXYZ.Yacc :cal SetSyn("yacc")<CR>
 an 50.170.440 &Syntax.WXYZ.Zimbu :cal SetSyn("zimbu")<CR>
+an 50.170.440 &Syntax.WXYZ.Zserio:cal SetSyn("zserio")<CR>
 
 " The End Of The Syntax Menu
 
diff --git a/runtime/syntax/zserio.vim b/runtime/syntax/zserio.vim
new file mode 100644
index 0000000000..5459915c01
--- /dev/null
+++ b/runtime/syntax/zserio.vim
@@ -0,0 +1,112 @@
+" Vim syntax file
+" Language:	Zserio
+" Maintainer:	Dominique Pellé <dominique.pelle@gmail.com>
+" Last Change:	2023 Jun 18
+"
+" Zserio is a serialization schema language for modeling binary
+" data types, bitstreams or file formats. Based on the zserio
+" language it is possible to automatically generate encoders and
+" decoders for a given schema in various target languages
+" (e.g. Java, C++, Python).
+"
+" Zserio is an evolution of the DataScript language.
+"
+" For more information, see:
+" - http://zserio.org/
+" - https://github.com/ndsev/zserio
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+syn case match
+
+syn keyword zserioPackage      import package zserio_compatibility_version
+syn keyword zserioType         bit bool string
+syn keyword zserioType         int int8 int16 int32 int64
+syn keyword zserioType         uint8 uint16 uint32 uint64
+syn keyword zserioType         float16 float32 float64
+syn keyword zserioType         varint varint16 varint32 varint64
+syn keyword zserioType         varuint varsize varuint16 varuint32 varuint64
+syn keyword zserioAlign        align
+syn keyword zserioLabel        case default
+syn keyword zserioConditional  if condition
+syn keyword zserioBoolean      true false
+syn keyword zserioCompound     struct union choice on enum bitmask subtype
+syn keyword zserioKeyword      function return
+syn keyword zserioOperator     lengthof valueof instanceof numbits isset
+syn keyword zserioRpc          service pubsub topic publish subscribe
+syn keyword zserioRule         rule_group rule
+syn keyword zserioStorageClass const implicit packed instantiate
+syn keyword zserioTodo         contained TODO FIXME XXX
+syn keyword zserioSql          sql sql_table sql_database sql_virtual sql_without_rowid
+syn keyword zserioSql          explicit using
+
+" zserioCommentGroup allows adding matches for special things in comments.
+syn cluster zserioCommentGroup  contains=zserioTodo
+
+syn match   zserioOffset        display "^\s*[a-zA-Z_:\.][a-zA-Z0-9_:\.]*\s*:"
+
+syn match   zserioNumber        display "\<\d\+\>"
+syn match   zserioNumberHex     display "\<0[xX]\x\+\>"
+syn match   zserioNumberBin     display "\<[01]\+[bB]\>" contains=zserioBinaryB
+syn match   zserioBinaryB       display contained "[bB]\>"
+syn match   zserioOctal         display "\<0\o\+\>" contains=zserioOctalZero
+syn match   zserioOctalZero     display contained "\<0"
+
+syn match   zserioOctalError    display "\<0\o*[89]\d*\>"
+
+syn match   zserioCommentError      display "\*/"
+syn match   zserioCommentStartError display "/\*"me=e-1 contained
+
+syn region   zserioCommentL
+  \ start="//" skip="\\$" end="$" keepend
+  \ contains=@zserioCommentGroup,@Spell
+syn region   zserioComment
+  \ matchgroup=zserioCommentStart start="/\*" end="\*/"
+  \ contains=@zserioCommentGroup,zserioCommentStartError,@Spell extend
+
+syn region  zserioString
+  \ start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
+
+syn sync ccomment zserioComment
+
+" Define the default highlighting.
+hi def link zserioType              Type
+hi def link zserioEndian            StorageClass
+hi def link zserioStorageClass      StorageClass
+hi def link zserioAlign             Label
+hi def link zserioLabel             Label
+hi def link zserioOffset            Label
+hi def link zserioSql               PreProc
+hi def link zserioCompound          Structure
+hi def link zserioConditional       Conditional
+hi def link zserioBoolean           Boolean
+hi def link zserioKeyword           Statement
+hi def link zserioRpc               Keyword
+hi def link zserioRule              Keyword
+hi def link zserioString            String
+hi def link zserioNumber            Number
+hi def link zserioNumberBin         Number
+hi def link zserioBinaryB           Special
+hi def link zserioOctal             Number
+hi def link zserioOctalZero         Special
+hi def link zserioOctalError        Error
+hi def link zserioNumberHex         Number
+hi def link zserioTodo              Todo
+hi def link zserioOperator          Operator
+hi def link zserioPackage           Include
+hi def link zserioCommentError      Error
+hi def link zserioCommentStartError Error
+hi def link zserioCommentStart      zserioComment
+hi def link zserioCommentL          zserioComment
+hi def link zserioComment           Comment
+
+let b:current_syntax = "zserio"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
-- 
cgit 


From 4ea4d72af800c40511afd006ea202d008e653c3f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 2 Sep 2023 16:38:58 +0200
Subject: docs(luv): correct uv.spawn options.args docs about the first
 argument

https://github.com/luvit/luv/commit/045bf29b6f54f9b511f8b76088250d2a90dbdf4f
---
 runtime/doc/luvref.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/luvref.txt b/runtime/doc/luvref.txt
index 9fd69d86eb..915b69efe3 100644
--- a/runtime/doc/luvref.txt
+++ b/runtime/doc/luvref.txt
@@ -1301,11 +1301,11 @@ uv.spawn({path}, {options}, {on_exit})                              *uv.spawn()*
                 The `options` table accepts the following fields:
 
                   - `options.args` - Command line arguments as a list of
-                    string. The first string should be the path to the
-                    program. On Windows, this uses CreateProcess which
-                    concatenates the arguments into a string. This can cause
-                    some strange errors. (See `options.verbatim` below for
-                    Windows.)
+                    strings. The first string should not be the path to the
+                    program, since that is already provided via `path`. On
+                    Windows, this uses CreateProcess which concatenates the
+                    arguments into a string. This can cause some strange
+                    errors (see `options.verbatim` below for Windows).
                   - `options.stdio` - Set the file descriptors that will be
                     made available to the child process. The convention is
                     that the first entries are stdin, stdout, and stderr.
-- 
cgit 


From c431d820e7be1c511d3d16e89cdffaa21b7909fa Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 4 Sep 2023 08:49:50 +0800
Subject: vim-patch:9.0.1856: issues with formatting positional arguments
 (#25013)

Problem:  issues with formatting positional arguments
Solution: fix them, add tests and documentation

closes: vim/vim#12140
closes: vim/vim#12985

Tentatively fix message_test. Check NULL ptr.

https://github.com/vim/vim/commit/aa90d4f031f73a34aaef5746931ea746849a2231

Co-authored-by: Christ van Willegen <cvwillegen@gmail.com>
---
 runtime/doc/builtin.txt         | 9 +++++++--
 runtime/lua/vim/_meta/vimfn.lua | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 9510f12045..400cd27302 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5132,8 +5132,13 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 			than the field width, the field is expanded to contain
 			the conversion result.
 			The 'h' modifier indicates the argument is 16 bits.
-			The 'l' modifier indicates the argument is 32 bits.
-			The 'L' modifier indicates the argument is 64 bits.
+			The 'l' modifier indicates the argument is a long
+			integer.  The size will be 32 bits or 64 bits
+			depending on your platform.
+			The "ll" modifier indicates the argument is 64 bits.
+			The b and B conversion specifiers never take a width
+			modifier and always assume their argument is a 64 bit
+			integer.
 			Generally, these modifiers are not useful. They are
 			ignored when type is known from the argument.
 
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 3f891bdb45..6209ce0c73 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6115,8 +6115,13 @@ function vim.fn.prevnonblank(lnum) end
 ---   than the field width, the field is expanded to contain
 ---   the conversion result.
 ---   The 'h' modifier indicates the argument is 16 bits.
----   The 'l' modifier indicates the argument is 32 bits.
----   The 'L' modifier indicates the argument is 64 bits.
+---   The 'l' modifier indicates the argument is a long
+---   integer.  The size will be 32 bits or 64 bits
+---   depending on your platform.
+---   The "ll" modifier indicates the argument is 64 bits.
+---   The b and B conversion specifiers never take a width
+---   modifier and always assume their argument is a 64 bit
+---   integer.
 ---   Generally, these modifiers are not useful. They are
 ---   ignored when type is known from the argument.
 ---
-- 
cgit 


From 54d357dce0e13408b819a1fe98b6417fad2cdd4c Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 4 Sep 2023 22:42:47 +0200
Subject: build: bump lpeg to 1.1.0 (#25016)

Release notes indicates it has better UTF8 handling which is relevant
for us.
---
 runtime/lua/vim/re.lua | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/re.lua b/runtime/lua/vim/re.lua
index dffe37186a..007eb27ed8 100644
--- a/runtime/lua/vim/re.lua
+++ b/runtime/lua/vim/re.lua
@@ -1,6 +1,8 @@
--- $Id: re.lua $
--- vendored from lpeg-1.0.2
--- Copyright © 2007-2019 Lua.org, PUC-Rio.
+--
+-- Copyright 2007-2023, Lua.org & PUC-Rio  (see 'lpeg.html' for license)
+-- written by Roberto Ierusalimschy
+--
+--- vendored from lpeg-1.1.0
 
 -- imported functions and modules
 local tonumber, type, print, error = tonumber, type, print, error
@@ -12,14 +14,14 @@ local m = require"lpeg"
 -- on 'mm'
 local mm = m
 
--- pattern's metatable
+-- patterns' metatable
 local mt = getmetatable(mm.P(0))
 
 
+local version = _VERSION
 
 -- No more global accesses after this point
-local version = _VERSION
-if version == "Lua 5.2" then _ENV = nil end
+_ENV = nil     -- does no harm in Lua 5.1
 
 
 local any = m.P(1)
@@ -144,7 +146,7 @@ local item = (defined + Range + m.C(any)) / m.P
 local Class =
     "["
   * (m.C(m.P"^"^-1))    -- optional complement symbol
-  * m.Cf(item * (item - "]")^0, mt.__add) /
+  * (item * ((item % mt.__add) - "]")^0) /
                           function (c, p) return c == "^" and any - p or p end
   * "]"
 
@@ -170,13 +172,13 @@ end
 
 local exp = m.P{ "Exp",
   Exp = S * ( m.V"Grammar"
-            + m.Cf(m.V"Seq" * ("/" * S * m.V"Seq")^0, mt.__add) );
-  Seq = m.Cf(m.Cc(m.P"") * m.V"Prefix"^0 , mt.__mul)
+            + m.V"Seq" * ("/" * S * m.V"Seq" % mt.__add)^0 );
+  Seq = (m.Cc(m.P"") * (m.V"Prefix" % mt.__mul)^0)
         * (#seq_follow + patt_error);
   Prefix = "&" * S * m.V"Prefix" / mt.__len
          + "!" * S * m.V"Prefix" / mt.__unm
          + m.V"Suffix";
-  Suffix = m.Cf(m.V"Primary" * S *
+  Suffix = m.V"Primary" * S *
           ( ( m.P"+" * m.Cc(1, mt.__pow)
             + m.P"*" * m.Cc(0, mt.__pow)
             + m.P"?" * m.Cc(-1, mt.__pow)
@@ -187,10 +189,11 @@ local exp = m.P{ "Exp",
                          + m.P"{}" * m.Cc(nil, m.Ct)
                          + defwithfunc(mt.__div)
                          )
-            + "=>" * S * defwithfunc(m.Cmt)
-            + "~>" * S * defwithfunc(m.Cf)
-            ) * S
-          )^0, function (a,b,f) return f(a,b) end );
+            + "=>" * S * defwithfunc(mm.Cmt)
+            + ">>" * S * defwithfunc(mt.__mod)
+            + "~>" * S * defwithfunc(mm.Cf)
+            ) % function (a,b,f) return f(a,b) end * S
+          )^0;
   Primary = "(" * m.V"Exp" * ")"
             + String / mm.P
             + Class
@@ -206,8 +209,7 @@ local exp = m.P{ "Exp",
             + (name * -arrow + "<" * name * ">") * m.Cb("G") / NT;
   Definition = name * arrow * m.V"Exp";
   Grammar = m.Cg(m.Cc(true), "G") *
-            m.Cf(m.V"Definition" / firstdef * m.Cg(m.V"Definition")^0,
-              adddef) / mm.P
+            ((m.V"Definition" / firstdef) * (m.V"Definition" % adddef)^0) / mm.P
 }
 
 local pattern = S * m.Cg(m.Cc(false), "G") * exp / mm.P * (-any + patt_error)
-- 
cgit 


From 109ff0a73f87e93d12013ae8232aece040353038 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 4 Sep 2023 23:17:59 +0200
Subject: vim-patch:3170342af304

runtime(php): Update the php indent script to the 1.75 (from 1.70) (vim/vim#13025)

Changes:

1.75:
- Fix 2072/PHP-Indenting-for-VImvim/vim#87: The indent optimization was causing wrong indentation of lines
  preceded by a line ending with '}' when preceded by non white characters.
- Fix long standing non-reported regex escaping issue in cleaning end of line
  comments function. This should help fixing some other unreported issues when
  parts of codes are commented out at ends of lines...

1.74:
- Fix 2072/PHP-Indenting-for-VImvim/vim#86: Add support for `match` expression.

1.73:
- Fix 2072/PHP-Indenting-for-VImvim/vim#77 where multi line strings and true/false keywords at beginning of a
  line would cause indentation failures.

1.72:
- Fix vim/vimvim/vim#5722 where it was reported that the option PHP_BracesAtCodeLevel
  had not been working for the last 6 years.

1.71:
- Fix 2072/PHP-Indenting-for-VImvim/vim#75 where the indent script would hang on some multi-line quoted strings.

https://github.com/vim/vim/commit/3170342af3049852afb2fbca85df37baf5fec82f

Co-authored-by: John Wellesz <john.wellesz@gmail.com>
---
 runtime/indent/php.vim | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim
index 350accaa11..377ffd5afb 100644
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -3,9 +3,8 @@
 " Author:	John Wellesz <John.wellesz (AT) gmail (DOT) com>
 " URL:		https://www.2072productions.com/vim/indent/php.vim
 " Home:		https://github.com/2072/PHP-Indenting-for-VIm
-" Last Change:	2020 Mar 05
-"		2023 Aug 28 by Vim Project (undo_indent)
-" Version:	1.70
+" Last Change:	2023 August 18th
+" Version:	1.75
 "
 "
 "	Type :help php-indent for available options
@@ -143,10 +142,10 @@ if exists("*GetPhpIndent")
 endif
 
 
-let s:endline = '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$'
+let s:endline = '\s*\%(//.*\|#\[\@!.*\|/\*.*\*/\s*\)\=$'
 let s:PHP_validVariable = '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'
-let s:notPhpHereDoc = '\%(break\|return\|continue\|exit\|die\|else\|end\%(if\|while\|for\|foreach\|switch\)\)'
-let s:blockstart = '\%(\%(\%(}\s*\)\=else\%(\s\+\)\=\)\=if\>\|\%(}\s*\)\?else\>\|do\>\|while\>\|switch\>\|case\>\|default\>\|for\%(each\)\=\>\|declare\>\|class\>\|trait\>\|\%()\s*\)\=use\>\|interface\>\|abstract\>\|final\>\|try\>\|\%(}\s*\)\=catch\>\|\%(}\s*\)\=finally\>\)'
+let s:notPhpHereDoc = '\<\%(break\|return\|continue\|exit\|die\|true\|false\|elseif\|else\|end\%(if\|while\|for\|foreach\|match\|switch\)\)\>'
+let s:blockstart = '\%(\%(\%(}\s*\)\=else\%(\s\+\)\=\)\=if\>\|\%(}\s*\)\?else\>\|do\>\|while\>\|match\>\|switch\>\|case\>\|default\>\|for\%(each\)\=\>\|declare\>\|class\>\|trait\>\|\%()\s*\)\=use\>\|interface\>\|abstract\>\|final\>\|try\>\|\%(}\s*\)\=catch\>\|\%(}\s*\)\=finally\>\)'
 let s:functionDeclPrefix = '\<function\>\%(\s\+&\='.s:PHP_validVariable.'\)\=\s*('
 let s:functionDecl = s:functionDeclPrefix.'.*'
 let s:multilineFunctionDecl = s:functionDeclPrefix.s:endline
@@ -157,7 +156,8 @@ let s:unstated = '\%(^\s*'.s:blockstart.'.*)\|\%(//.*\)\@<!\<e'.'lse\>\)'.s:endl
 
 let s:terminated = '\%(\%(;\%(\s*\%(?>\|}\)\)\=\|<<<\s*[''"]\=\a\w*[''"]\=$\|^\s*}\|^\s*'.s:PHP_validVariable.':\)'.s:endline.'\)'
 let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!'
-let s:structureHead = '^\s*\%(' . s:blockstart . '\)\|'. s:functionDecl . s:endline . '\|\<new\s\+class\>'
+let s:matchStart = 'match\s*(\s*\$\?'.s:PHP_validVariable.'\s*)\s*{'. s:endline
+let s:structureHead = '^\s*\%(' . s:blockstart . '\)\|'. s:functionDecl . s:endline . '\|\<new\s\+class\>\|' . s:matchStart
 
 
 let s:escapeDebugStops = 0
@@ -224,7 +224,7 @@ function! GetLastRealCodeLNum(startline) " {{{
 	    while getline(lnum) !~? tofind && lnum > 1
 		let lnum = lnum - 1
 	    endwhile
-	elseif lastline =~ '^\s*[''"`][;,]' || (lastline =~ '^[^''"`]*[''"`][;,]'.s:endline && IslinePHP(lnum, "") == "SpecStringEntrails")
+	elseif lastline =~ '^\s*[''"`][;,]'.s:endline || (lastline =~ '^[^''"`]*[''"`][;,]'.s:endline && IslinePHP(lnum, "") == "SpecStringEntrails")
 
 	    let tofind=substitute( lastline, '^.*\([''"`]\)[;,].*$', '^[^\1]\\+[\1]$\\|^[^\1]\\+[=([]\\s*[\1]', '')
 	    let trylnum = lnum
@@ -267,7 +267,7 @@ function! Skippmatch2()
 
     let line = getline(".")
 
-    if line =~ "\\([\"']\\).*/\\*.*\\1" || line =~ '\%(//\|#\).*/\*'
+    if line =~ "\\([\"']\\).*/\\*.*\\1" || line =~ '\%(//\|#\[\@!\).*/\*'
 	return 1
     else
 	return 0
@@ -323,7 +323,11 @@ function! BalanceDirection (str)
 endfun
 
 function! StripEndlineComments (line)
-    return substitute(a:line,"\\(//\\|#\\)\\(\\(\\([^\"']*\\([\"']\\)[^\"']*\\5\\)\\+[^\"']*$\\)\\|\\([^\"']*$\\)\\)",'','')
+
+    let cleaned = substitute(a:line,'\v(//|#\[\@!)((([^"'']*(["''])[^"'']*\5)+[^"'']*$)|([^"'']*$))','','')
+    if cleaned != a:line
+    endif
+    return cleaned
 endfun
 
 function! FindArrowIndent (lnum)  " {{{
@@ -491,7 +495,7 @@ function! ResetPhpOptions()
     if ! b:optionsset && &filetype =~ "php"
 	if b:PHP_autoformatcomment
 
-	    setlocal comments=s1:/*,mb:*,ex:*/,://,:#
+	    setlocal comments=s1:/*,mb:*,ex:*/,://,f:#[,:#
 
 	    setlocal formatoptions-=t
 	    setlocal formatoptions+=q
@@ -507,7 +511,7 @@ endfunc
 call ResetPhpOptions()
 
 function! GetPhpIndentVersion()
-    return "1.70-bundle"
+    return "1.75"
 endfun
 
 function! GetPhpIndent()
@@ -651,7 +655,7 @@ function! GetPhpIndent()
 		let b:InPHPcode_and_script = 1
 	    endif
 
-	elseif last_line =~ '^[^''"`]\+[''"`]$' && last_line !~ '^\s*\%(//\|#\|/\*.*\*/\s*$\)' " a string identifier with nothing after it and no other string identifier before
+	elseif last_line =~ '^[^''"`]\+[''"`]$' && last_line !~ '^\s*\%(//\|#\[\@!\|/\*.*\*/\s*$\)' " a string identifier with nothing after it and no other string identifier before
 	    let b:InPHPcode = -1
 	    let b:InPHPcode_tofind = substitute( last_line, '^.*\([''"`]\).*$', '^[^\1]*\1[;,]$', '')
 	elseif last_line =~? '<<<\s*[''"]\=\a\w*[''"]\=$'
@@ -675,7 +679,7 @@ function! GetPhpIndent()
 
     " Indent successive // or # comment the same way the first is {{{
     let addSpecial = 0
-    if cline =~ '^\s*\%(//\|#\|/\*.*\*/\s*$\)'
+    if cline =~ '^\s*\%(//\|#\[\@!\|/\*.*\*/\s*$\)'
 	let addSpecial = b:PHP_outdentSLComments
 	if b:PHP_LastIndentedWasComment == 1
 	    return indent(real_PHP_lastindented)
@@ -716,7 +720,7 @@ function! GetPhpIndent()
 	return 0
     endif
 
-    if cline =~? '^\s*\a\w*;$\|^\a\w*$\|^\s*[''"`][;,]' && cline !~? s:notPhpHereDoc
+    if (cline =~? '^\s*\a\w*;$\|^\a\w*$' || (cline =~? '^\s*[''"`][;,]' && IslinePHP(v:lnum, '[;,]') !~? '^\(phpString[SD]\|phpBacktick\)') ) && cline !~? s:notPhpHereDoc
 	return 0
     endif " }}}
 
@@ -739,6 +743,9 @@ function! GetPhpIndent()
     if cline =~ '^\s*}\%(}}\)\@!'
 	let ind = indent(FindOpenBracket(v:lnum, 1))
 	let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
+	if  b:PHP_BracesAtCodeLevel
+	    let ind = ind + shiftwidth()
+	endif
 	return ind
     endif
 
@@ -762,7 +769,7 @@ function! GetPhpIndent()
     if last_line =~ '[;}]'.endline && last_line !~ '^[)\]]' && last_line !~# s:defaultORcase && last_line !~ '^\s*[''"`][;,]'
 	if ind==b:PHP_default_indenting
 	    return b:PHP_default_indenting + addSpecial
-	elseif b:PHP_indentinghuge && ind==b:PHP_CurrentIndentLevel && cline !~# '^\s*\%(else\|\%(case\|default\).*:\|[})];\=\)' && last_line !~# '^\s*\%(\%(}\s*\)\=else\)' && getline(GetLastRealCodeLNum(lnum - 1))=~';'.endline
+	elseif b:PHP_indentinghuge && ind==b:PHP_CurrentIndentLevel && cline !~# '^\s*\%(else\|\%(case\|default\).*:\|[})];\=\)' && last_line !~# '^\s*\%(\%(}\s*\)\=else\)\|^\(\s*\S\+\s*\)\+}'.endline && getline(GetLastRealCodeLNum(lnum - 1))=~';'.endline
 	    return b:PHP_CurrentIndentLevel + addSpecial
 	endif
     endif
@@ -930,7 +937,7 @@ function! GetPhpIndent()
 	    let ind = ind + shiftwidth()
 
 
-	elseif AntepenultimateLine =~ '{'.endline && AntepenultimateLine !~? '^\s*use\>' || AntepenultimateLine =~ terminated || AntepenultimateLine =~# s:defaultORcase
+	elseif AntepenultimateLine =~ '{'.endline && AntepenultimateLine !~? '^\s*use\>' && AntepenultimateLine !~? s:matchStart || AntepenultimateLine =~ terminated || AntepenultimateLine =~# s:defaultORcase
 	    let ind = ind + shiftwidth()
 	endif
 
-- 
cgit 


From 6abc608445745e7e8def2aabf57c7a0c26b8a485 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 5 Sep 2023 08:20:56 +0200
Subject: vim-patch:282a94be990f

runtime: Fix problem of checking wrong cwd for ruby ftplugin (vim/vim#13026)

https://github.com/vim/vim/commit/282a94be990fc1ee5be46548bf7241b583d48972

Co-authored-by: Anton Sharonov (ant0sha) <109120102+ant0sha@users.noreply.github.com>
Co-authored-by: Anton Sharonov <anton.sharonov@gmail.com>
---
 runtime/ftplugin/ruby.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim
index 1262099d88..daffe1e0dc 100644
--- a/runtime/ftplugin/ruby.vim
+++ b/runtime/ftplugin/ruby.vim
@@ -77,7 +77,7 @@ function! s:query_path(root) abort
   let cwd = fnameescape(getcwd())
   try
     exe cd fnameescape(a:root)
-    if fnamemodify(exepath('ruby'), ':p:h') ==# getcwd()
+    if fnamemodify(exepath('ruby'), ':p:h') ==# cwd
       let path = []
     else
       let path = split(system(path_check),',')
-- 
cgit 


From a44521f46e6f79171d034e5cce1a4dc266d23e49 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sun, 3 Sep 2023 10:17:24 +0100
Subject: fix(vim.system): let on_exit handle cleanup after kill

Fixes #25000
---
 runtime/lua/vim/_system.lua | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua
index 6f5e95eb24..ba3fc34e78 100644
--- a/runtime/lua/vim/_system.lua
+++ b/runtime/lua/vim/_system.lua
@@ -18,6 +18,7 @@ local uv = vim.uv
 --- @field stderr? string
 
 --- @class SystemState
+--- @field cmd string[]
 --- @field handle? uv.uv_process_t
 --- @field timer?  uv.uv_timer_t
 --- @field pid? integer
@@ -63,11 +64,9 @@ local function new_systemobj(state)
   }, { __index = SystemObj })
 end
 
---- @param signal integer
+--- @param signal integer|string
 function SystemObj:kill(signal)
-  local state = self._state
-  state.handle:kill(signal)
-  close_handles(state)
+  self._state.handle:kill(signal)
 end
 
 local MAX_TIMEOUT = 2 ^ 31
@@ -159,7 +158,7 @@ end
 
 --- @return table<string,string>
 local function base_env()
-  local env = vim.fn.environ()
+  local env = vim.fn.environ() --- @type table<string,string>
   env['NVIM'] = vim.v.servername
   env['NVIM_LISTEN_ADDRESS'] = nil
   return env
@@ -212,7 +211,7 @@ end
 local M = {}
 
 --- @param cmd string
---- @param opts uv.aliases.spawn_options
+--- @param opts uv.spawn.options
 --- @param on_exit fun(code: integer, signal: integer)
 --- @param on_error fun()
 --- @return uv.uv_process_t, integer
-- 
cgit 


From 6d5f12efd286c684de8608c07bb0f76a9d594b5b Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 4 Sep 2023 11:30:16 +0100
Subject: fix(vim.system): make timeout work properly

Mimic the behaviour of timeout(1) from coreutils.
---
 runtime/doc/lua.txt         |  10 +++--
 runtime/lua/vim/_editor.lua |   8 ++--
 runtime/lua/vim/_system.lua | 102 +++++++++++++++++++++++++++-----------------
 3 files changed, 76 insertions(+), 44 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index f5b3e56f61..61aee559ef 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1777,7 +1777,9 @@ vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
                      `fun(err: string, data: string)`. Defaults to `true`.
                    • text: (boolean) Handle stdout and stderr as text.
                      Replaces `\r\n` with `\n`.
-                   • timeout: (integer)
+                   • timeout: (integer) Run the command with a time limit.
+                     Upon timeout the process is sent the TERM signal (15) and
+                     the exit code is set to 124.
                    • detach: (boolean) If true, spawn the child process in a
                      detached state - this will make it a process group
                      leader, and will effectively enable the child to keep
@@ -1792,14 +1794,16 @@ vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
     Return: ~
         SystemObj Object with the fields:
         • pid (integer) Process ID
-        • wait (fun(timeout: integer|nil): SystemCompleted)
+        • wait (fun(timeout: integer|nil): SystemCompleted) Wait for the
+          process to complete. Upon timeout the process is sent the KILL
+          signal (9) and the exit code is set to 124.
           • SystemCompleted is an object with the fields:
             • code: (integer)
             • signal: (integer)
             • stdout: (string), nil if stdout argument is passed
             • stderr: (string), nil if stderr argument is passed
 
-        • kill (fun(signal: integer))
+        • kill (fun(signal: integer|string))
         • write (fun(data: string|nil)) Requires `stdin=true`. Pass `nil` to
           close the stream.
         • is_closing (fun(): boolean)
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 96ac379368..ba0345cdd5 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -107,7 +107,8 @@ vim.log = {
 ---     Handle output from stdout. When passed as a function must have the signature `fun(err: string, data: string)`.
 ---     Defaults to `true`.
 ---   - text: (boolean) Handle stdout and stderr as text. Replaces `\r\n` with `\n`.
----   - timeout: (integer)
+---   - timeout: (integer) Run the command with a time limit. Upon timeout the process is sent the
+---     TERM signal (15) and the exit code is set to 124.
 ---   - detach: (boolean) If true, spawn the child process in a detached state - this will make it
 ---     a process group leader, and will effectively enable the child to keep running after the
 ---     parent exits. Note that the child process will still keep the parent's event loop alive
@@ -118,13 +119,14 @@ vim.log = {
 ---
 --- @return SystemObj Object with the fields:
 ---   - pid (integer) Process ID
----   - wait (fun(timeout: integer|nil): SystemCompleted)
+---   - wait (fun(timeout: integer|nil): SystemCompleted) Wait for the process to complete. Upon
+---     timeout the process is sent the KILL signal (9) and the exit code is set to 124.
 ---     - SystemCompleted is an object with the fields:
 ---      - code: (integer)
 ---      - signal: (integer)
 ---      - stdout: (string), nil if stdout argument is passed
 ---      - stderr: (string), nil if stderr argument is passed
----   - kill (fun(signal: integer))
+---   - kill (fun(signal: integer|string))
 ---   - write (fun(data: string|nil)) Requires `stdin=true`. Pass `nil` to close the stream.
 ---   - is_closing (fun(): boolean)
 function vim.system(cmd, opts, on_exit)
diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua
index ba3fc34e78..7bd7ff91f9 100644
--- a/runtime/lua/vim/_system.lua
+++ b/runtime/lua/vim/_system.lua
@@ -2,8 +2,8 @@ local uv = vim.uv
 
 --- @class SystemOpts
 --- @field stdin? string|string[]|true
---- @field stdout? fun(err:string, data: string)|false
---- @field stderr? fun(err:string, data: string)|false
+--- @field stdout? fun(err:string?, data: string?)|false
+--- @field stderr? fun(err:string?, data: string?)|false
 --- @field cwd? string
 --- @field env? table<string,string|number>
 --- @field clear_env? boolean
@@ -18,39 +18,46 @@ local uv = vim.uv
 --- @field stderr? string
 
 --- @class SystemState
---- @field cmd string[]
 --- @field handle? uv.uv_process_t
 --- @field timer?  uv.uv_timer_t
 --- @field pid? integer
 --- @field timeout? integer
---- @field done? boolean
+--- @field done? boolean|'timeout'
 --- @field stdin? uv.uv_stream_t
 --- @field stdout? uv.uv_stream_t
 --- @field stderr? uv.uv_stream_t
 --- @field result? SystemCompleted
 
----@param state SystemState
-local function close_handles(state)
-  for _, handle in pairs({ state.handle, state.stdin, state.stdout, state.stderr }) do
-    if not handle:is_closing() then
-      handle:close()
-    end
+--- @enum vim.SystemSig
+local SIG = {
+  HUP = 1, -- Hangup
+  INT = 2, -- Interrupt from keyboard
+  KILL = 9, -- Kill signal
+  TERM = 15, -- Termination signal
+  -- STOP = 17,19,23  -- Stop the process
+}
+
+---@param handle uv.uv_handle_t?
+local function close_handle(handle)
+  if handle and not handle:is_closing() then
+    handle:close()
   end
 end
 
---- @param cmd string[]
---- @return SystemCompleted
-local function timeout_result(cmd)
-  local cmd_str = table.concat(cmd, ' ')
-  local err = string.format("Command timed out: '%s'", cmd_str)
-  return { code = 0, signal = 2, stdout = '', stderr = err }
+---@param state SystemState
+local function close_handles(state)
+  close_handle(state.handle)
+  close_handle(state.stdin)
+  close_handle(state.stdout)
+  close_handle(state.stderr)
+  close_handle(state.timer)
 end
 
 --- @class SystemObj
 --- @field pid integer
 --- @field private _state SystemState
 --- @field wait fun(self: SystemObj, timeout?: integer): SystemCompleted
---- @field kill fun(self: SystemObj, signal: integer)
+--- @field kill fun(self: SystemObj, signal: integer|string)
 --- @field write fun(self: SystemObj, data?: string|string[])
 --- @field is_closing fun(self: SystemObj): boolean?
 local SystemObj = {}
@@ -69,6 +76,13 @@ function SystemObj:kill(signal)
   self._state.handle:kill(signal)
 end
 
+--- @package
+--- @param signal? vim.SystemSig
+function SystemObj:_timeout(signal)
+  self._state.done = 'timeout'
+  self:kill(signal or SIG.TERM)
+end
+
 local MAX_TIMEOUT = 2 ^ 31
 
 --- @param timeout? integer
@@ -76,13 +90,16 @@ local MAX_TIMEOUT = 2 ^ 31
 function SystemObj:wait(timeout)
   local state = self._state
 
-  vim.wait(timeout or state.timeout or MAX_TIMEOUT, function()
-    return state.done
+  local done = vim.wait(timeout or state.timeout or MAX_TIMEOUT, function()
+    return state.result ~= nil
   end)
 
-  if not state.done then
-    self:kill(6) -- 'sigint'
-    state.result = timeout_result(state.cmd)
+  if not done then
+    -- Send sigkill since this cannot be caught
+    self:_timeout(SIG.KILL)
+    vim.wait(timeout or state.timeout or MAX_TIMEOUT, function()
+      return state.result ~= nil
+    end)
   end
 
   return state.result
@@ -124,9 +141,9 @@ function SystemObj:is_closing()
   return handle == nil or handle:is_closing()
 end
 
----@param output function|'false'
+---@param output fun(err:string?, data: string?)|false
 ---@return uv.uv_stream_t?
----@return function? Handler
+---@return fun(err:string?, data: string?)? Handler
 local function setup_output(output)
   if output == nil then
     return assert(uv.new_pipe(false)), nil
@@ -224,6 +241,19 @@ local function spawn(cmd, opts, on_exit, on_error)
   return handle, pid_or_err --[[@as integer]]
 end
 
+---@param timeout integer
+---@param cb fun()
+---@return uv.uv_timer_t
+local function timer_oneshot(timeout, cb)
+  local timer = assert(uv.new_timer())
+  timer:start(timeout, 0, function()
+    timer:stop()
+    timer:close()
+    cb()
+  end)
+  return timer
+end
+
 --- Run a system command
 ---
 --- @param cmd string[]
@@ -267,10 +297,6 @@ function M.run(cmd, opts, on_exit)
     hide = true,
   }, function(code, signal)
     close_handles(state)
-    if state.timer then
-      state.timer:stop()
-      state.timer:close()
-    end
 
     local check = assert(uv.new_check())
 
@@ -283,7 +309,14 @@ function M.run(cmd, opts, on_exit)
       check:stop()
       check:close()
 
-      state.done = true
+      if state.done == nil then
+        state.done = true
+      end
+
+      if code == 0 and state.done == 'timeout' then
+        code = 124
+      end
+
       state.result = {
         code = code,
         signal = signal,
@@ -317,16 +350,9 @@ function M.run(cmd, opts, on_exit)
   end
 
   if opts.timeout then
-    state.timer = assert(uv.new_timer())
-    state.timer:start(opts.timeout, 0, function()
-      state.timer:stop()
-      state.timer:close()
+    state.timer = timer_oneshot(opts.timeout, function()
       if state.handle and state.handle:is_active() then
-        obj:kill(6) --- 'sigint'
-        state.result = timeout_result(state.cmd)
-        if on_exit then
-          on_exit(state.result)
-        end
+        obj:_timeout()
       end
     end)
   end
-- 
cgit 


From 80d1333b7317460c562a982ac21f900d9fbd89f6 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Mon, 4 Sep 2023 12:03:03 +0100
Subject: refactor(vim.system): factor out on_exit handling

---
 runtime/doc/lua.txt         |   4 +-
 runtime/lua/vim/_editor.lua |   2 +-
 runtime/lua/vim/_system.lua | 121 +++++++++++++++++++++++---------------------
 runtime/lua/vim/lsp/rpc.lua |   4 +-
 runtime/lua/vim/ui.lua      |   2 +-
 5 files changed, 70 insertions(+), 63 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 61aee559ef..71f001f4fc 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1792,7 +1792,7 @@ vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
                    object, see return of SystemObj:wait().
 
     Return: ~
-        SystemObj Object with the fields:
+        vim.SystemObj Object with the fields:
         • pid (integer) Process ID
         • wait (fun(timeout: integer|nil): SystemCompleted) Wait for the
           process to complete. Upon timeout the process is sent the KILL
@@ -2545,7 +2545,7 @@ vim.ui.open({path})                                            *vim.ui.open()*
       • {path}  (string) Path or URL to open
 
     Return (multiple): ~
-        SystemCompleted|nil Command result, or nil if not found.
+        vim.SystemCompleted|nil Command result, or nil if not found.
         (string|nil) Error message on failure
 
     See also: ~
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index ba0345cdd5..68992a16bb 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -117,7 +117,7 @@ vim.log = {
 --- @param on_exit (function|nil) Called when subprocess exits. When provided, the command runs
 ---   asynchronously. Receives SystemCompleted object, see return of SystemObj:wait().
 ---
---- @return SystemObj Object with the fields:
+--- @return vim.SystemObj Object with the fields:
 ---   - pid (integer) Process ID
 ---   - wait (fun(timeout: integer|nil): SystemCompleted) Wait for the process to complete. Upon
 ---     timeout the process is sent the KILL signal (9) and the exit code is set to 124.
diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua
index 7bd7ff91f9..5ea0071215 100644
--- a/runtime/lua/vim/_system.lua
+++ b/runtime/lua/vim/_system.lua
@@ -11,13 +11,13 @@ local uv = vim.uv
 --- @field timeout? integer Timeout in ms
 --- @field detach? boolean
 
---- @class SystemCompleted
+--- @class vim.SystemCompleted
 --- @field code integer
 --- @field signal integer
 --- @field stdout? string
 --- @field stderr? string
 
---- @class SystemState
+--- @class vim.SystemState
 --- @field handle? uv.uv_process_t
 --- @field timer?  uv.uv_timer_t
 --- @field pid? integer
@@ -26,7 +26,9 @@ local uv = vim.uv
 --- @field stdin? uv.uv_stream_t
 --- @field stdout? uv.uv_stream_t
 --- @field stderr? uv.uv_stream_t
---- @field result? SystemCompleted
+--- @field stdout_data? string[]
+--- @field stderr_data? string[]
+--- @field result? vim.SystemCompleted
 
 --- @enum vim.SystemSig
 local SIG = {
@@ -44,7 +46,7 @@ local function close_handle(handle)
   end
 end
 
----@param state SystemState
+---@param state vim.SystemState
 local function close_handles(state)
   close_handle(state.handle)
   close_handle(state.stdin)
@@ -53,17 +55,17 @@ local function close_handles(state)
   close_handle(state.timer)
 end
 
---- @class SystemObj
+--- @class vim.SystemObj
 --- @field pid integer
---- @field private _state SystemState
---- @field wait fun(self: SystemObj, timeout?: integer): SystemCompleted
---- @field kill fun(self: SystemObj, signal: integer|string)
---- @field write fun(self: SystemObj, data?: string|string[])
---- @field is_closing fun(self: SystemObj): boolean?
+--- @field private _state vim.SystemState
+--- @field wait fun(self: vim.SystemObj, timeout?: integer): vim.SystemCompleted
+--- @field kill fun(self: vim.SystemObj, signal: integer|string)
+--- @field write fun(self: vim.SystemObj, data?: string|string[])
+--- @field is_closing fun(self: vim.SystemObj): boolean?
 local SystemObj = {}
 
---- @param state SystemState
---- @return SystemObj
+--- @param state vim.SystemState
+--- @return vim.SystemObj
 local function new_systemobj(state)
   return setmetatable({
     pid = state.pid,
@@ -86,7 +88,7 @@ end
 local MAX_TIMEOUT = 2 ^ 31
 
 --- @param timeout? integer
---- @return SystemCompleted
+--- @return vim.SystemCompleted
 function SystemObj:wait(timeout)
   local state = self._state
 
@@ -254,12 +256,53 @@ local function timer_oneshot(timeout, cb)
   return timer
 end
 
+--- @param state vim.SystemState
+--- @param code integer
+--- @param signal integer
+--- @param on_exit fun(result: vim.SystemCompleted)?
+local function _on_exit(state, code, signal, on_exit)
+  close_handles(state)
+
+  local check = assert(uv.new_check())
+  check:start(function()
+    for _, pipe in pairs({ state.stdin, state.stdout, state.stderr }) do
+      if not pipe:is_closing() then
+        return
+      end
+    end
+    check:stop()
+    check:close()
+
+    if state.done == nil then
+      state.done = true
+    end
+
+    if code == 0 and state.done == 'timeout' then
+      code = 124
+    end
+
+    local stdout_data = state.stdout_data
+    local stderr_data = state.stderr_data
+
+    state.result = {
+      code = code,
+      signal = signal,
+      stdout = stdout_data and table.concat(stdout_data) or nil,
+      stderr = stderr_data and table.concat(stderr_data) or nil,
+    }
+
+    if on_exit then
+      on_exit(state.result)
+    end
+  end)
+end
+
 --- Run a system command
 ---
 --- @param cmd string[]
 --- @param opts? SystemOpts
---- @param on_exit? fun(out: SystemCompleted)
---- @return SystemObj
+--- @param on_exit? fun(out: vim.SystemCompleted)
+--- @return vim.SystemObj
 function M.run(cmd, opts, on_exit)
   vim.validate({
     cmd = { cmd, 'table' },
@@ -273,7 +316,7 @@ function M.run(cmd, opts, on_exit)
   local stderr, stderr_handler = setup_output(opts.stderr)
   local stdin, towrite = setup_input(opts.stdin)
 
-  --- @type SystemState
+  --- @type vim.SystemState
   local state = {
     done = false,
     cmd = cmd,
@@ -283,11 +326,6 @@ function M.run(cmd, opts, on_exit)
     stderr = stderr,
   }
 
-  -- Define data buckets as tables and concatenate the elements at the end as
-  -- one operation.
-  --- @type string[], string[]
-  local stdout_data, stderr_data
-
   state.handle, state.pid = spawn(cmd[1], {
     args = vim.list_slice(cmd, 2),
     stdio = { stdin, stdout, stderr },
@@ -296,50 +334,19 @@ function M.run(cmd, opts, on_exit)
     detached = opts.detach,
     hide = true,
   }, function(code, signal)
-    close_handles(state)
-
-    local check = assert(uv.new_check())
-
-    check:start(function()
-      for _, pipe in pairs({ state.stdin, state.stdout, state.stderr }) do
-        if not pipe:is_closing() then
-          return
-        end
-      end
-      check:stop()
-      check:close()
-
-      if state.done == nil then
-        state.done = true
-      end
-
-      if code == 0 and state.done == 'timeout' then
-        code = 124
-      end
-
-      state.result = {
-        code = code,
-        signal = signal,
-        stdout = stdout_data and table.concat(stdout_data) or nil,
-        stderr = stderr_data and table.concat(stderr_data) or nil,
-      }
-
-      if on_exit then
-        on_exit(state.result)
-      end
-    end)
+    _on_exit(state, code, signal, on_exit)
   end, function()
     close_handles(state)
   end)
 
   if stdout then
-    stdout_data = {}
-    stdout:read_start(stdout_handler or default_handler(stdout, opts.text, stdout_data))
+    state.stdout_data = {}
+    stdout:read_start(stdout_handler or default_handler(stdout, opts.text, state.stdout_data))
   end
 
   if stderr then
-    stderr_data = {}
-    stderr:read_start(stderr_handler or default_handler(stderr, opts.text, stderr_data))
+    state.stderr_data = {}
+    stderr:read_start(stderr_handler or default_handler(stderr, opts.text, state.stderr_data))
   end
 
   local obj = new_systemobj(state)
diff --git a/runtime/lua/vim/lsp/rpc.lua b/runtime/lua/vim/lsp/rpc.lua
index a77af937b3..6ab5708721 100644
--- a/runtime/lua/vim/lsp/rpc.lua
+++ b/runtime/lua/vim/lsp/rpc.lua
@@ -648,7 +648,7 @@ function M.start(cmd, cmd_args, dispatchers, extra_spawn_params)
 
   dispatchers = merge_dispatchers(dispatchers)
 
-  local sysobj ---@type SystemObj
+  local sysobj ---@type vim.SystemObj
 
   local client = new_client(dispatchers, {
     write = function(msg)
@@ -708,7 +708,7 @@ function M.start(cmd, cmd_args, dispatchers, extra_spawn_params)
     return
   end
 
-  sysobj = sysobj_or_err --[[@as SystemObj]]
+  sysobj = sysobj_or_err --[[@as vim.SystemObj]]
 
   return public_client(client)
 end
diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua
index 87b52787a0..cd90886489 100644
--- a/runtime/lua/vim/ui.lua
+++ b/runtime/lua/vim/ui.lua
@@ -118,7 +118,7 @@ end
 ---
 ---@param path string Path or URL to open
 ---
----@return SystemCompleted|nil # Command result, or nil if not found.
+---@return vim.SystemCompleted|nil # Command result, or nil if not found.
 ---@return string|nil # Error message on failure
 ---
 ---@see |vim.system()|
-- 
cgit 


From be8b15200d7093726b0999ccfd4a3e9952656d47 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 5 Sep 2023 14:38:57 +0100
Subject: fix: windows timeouts have exit code 1

---
 runtime/lua/vim/_system.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_system.lua b/runtime/lua/vim/_system.lua
index 5ea0071215..9279febddf 100644
--- a/runtime/lua/vim/_system.lua
+++ b/runtime/lua/vim/_system.lua
@@ -277,7 +277,9 @@ local function _on_exit(state, code, signal, on_exit)
       state.done = true
     end
 
-    if code == 0 and state.done == 'timeout' then
+    if (code == 0 or code == 1) and state.done == 'timeout' then
+      -- Unix: code == 0
+      -- Windows: code == 1
       code = 124
     end
 
@@ -326,10 +328,12 @@ function M.run(cmd, opts, on_exit)
     stderr = stderr,
   }
 
+  --- @diagnostic disable-next-line:missing-fields
   state.handle, state.pid = spawn(cmd[1], {
     args = vim.list_slice(cmd, 2),
     stdio = { stdin, stdout, stderr },
     cwd = opts.cwd,
+    --- @diagnostic disable-next-line:assign-type-mismatch
     env = setup_env(opts.env, opts.clear_env),
     detached = opts.detach,
     hide = true,
-- 
cgit 


From d27214331815324ea5762b5aa22996b9019085c6 Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Wed, 6 Sep 2023 20:54:18 +0300
Subject: fix(diagnostic): always return copies of diagnostic items (#25010)

---
 runtime/doc/diagnostic.txt     | 3 +++
 runtime/lua/vim/diagnostic.lua | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index d0aa538011..866c32722a 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -480,6 +480,9 @@ fromqflist({list})                               *vim.diagnostic.fromqflist()*
 get({bufnr}, {opts})                                    *vim.diagnostic.get()*
     Get current diagnostics.
 
+    Modifying diagnostics in the returned table has no effect. To set
+    diagnostics in a buffer, use |vim.diagnostic.set()|.
+
     Parameters: ~
       • {bufnr}  (integer|nil) Buffer number to get diagnostics from. Use 0
                  for current buffer or nil for all buffers.
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 96d1cb7629..a1f3020c88 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -386,6 +386,7 @@ local function get_diagnostics(bufnr, opts, clamp)
 
   local function add(b, d)
     if not opts.lnum or d.lnum == opts.lnum then
+      d = vim.deepcopy(d)
       if clamp and api.nvim_buf_is_loaded(b) then
         local line_count = buf_line_count[b] - 1
         if
@@ -396,7 +397,6 @@ local function get_diagnostics(bufnr, opts, clamp)
           or d.col < 0
           or d.end_col < 0
         then
-          d = vim.deepcopy(d)
           d.lnum = math.max(math.min(d.lnum, line_count), 0)
           d.end_lnum = math.max(math.min(d.end_lnum, line_count), 0)
           d.col = math.max(d.col, 0)
@@ -750,6 +750,8 @@ end
 
 --- Get current diagnostics.
 ---
+--- Modifying diagnostics in the returned table has no effect. To set diagnostics in a buffer, use |vim.diagnostic.set()|.
+---
 ---@param bufnr integer|nil Buffer number to get diagnostics from. Use 0 for
 ---                        current buffer or nil for all buffers.
 ---@param opts table|nil A table with the following keys:
-- 
cgit 


From 5d1c1da3c90adece96f491e7f12fd76c03a881c9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 6 Sep 2023 23:49:58 +0200
Subject: vim-patch:67c951df4c95

runtime(ftplugin): allow to exec if curdir is in PATH

In case the current directory is present as valid $PATH entry, it is OK
to call the program from it, even if vim curdir is in that same
directory.

(Without that patch, for instance, you will not be able to open .zip
files while your current directory is /bin)

closes: vim/vim#13027

https://github.com/vim/vim/commit/67c951df4c95981c716eeedb1b102d9668549e65

Co-authored-by: Anton Sharonov <anton.sharonov@gmail.com>
---
 runtime/autoload/gzip.vim | 5 ++++-
 runtime/autoload/zip.vim  | 7 ++++++-
 runtime/ftplugin/perl.vim | 5 ++++-
 runtime/ftplugin/ruby.vim | 5 ++++-
 runtime/ftplugin/zig.vim  | 5 ++++-
 5 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim
index ac9e37bf85..6d0bb13401 100644
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -11,7 +11,10 @@ fun s:check(cmd)
   let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
   if !exists("s:have_" . name)
     " safety check, don't execute anything from the current directory
-    let f = fnamemodify(exepath(name), ":p:h") !=# getcwd()
+    let s:tmp_cwd = getcwd()
+    let f = (fnamemodify(exepath(name), ":p:h") !=# s:tmp_cwd
+          \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
+    unlet s:tmp_cwd
     if !f
       echoerr "Warning: NOT executing " .. name .. " from current directory!"
     endif
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 0331a542ac..8b39c91c3a 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -57,10 +57,15 @@ if !exists("g:zip_extractcmd")
  let g:zip_extractcmd= g:zip_unzipcmd
 endif
 
-if fnamemodify(exepath(g:zip_unzipcmd), ":p:h") ==# getcwd()
+let s:tmp_cwd = getcwd()
+if (fnamemodify(exepath(g:zip_unzipcmd), ":p:h") ==# getcwd()
+          \ && (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) == -1 || s:tmp_cwd == '.'))
+ unlet s:tmp_cwd
  echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!"
  finish
 endif
+unlet s:tmp_cwd
+
 " ----------------
 "  Functions: {{{1
 " ----------------
diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index edc7b960f1..4361097f32 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -55,7 +55,9 @@ endif
 " Set this once, globally.
 if !exists("perlpath")
     " safety check: don't execute perl from current directory
-    if executable("perl") && fnamemodify(exepath("perl"), ":p:h") != getcwd()
+    let s:tmp_cwd = getcwd()
+    if executable("perl") && (fnamemodify(exepath("perl"), ":p:h") != s:tmp_cwd
+          \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
       try
 	if &shellxquote != '"'
 	    let perlpath = system('perl -e "print join(q/,/,@INC)"')
@@ -71,6 +73,7 @@ if !exists("perlpath")
 	" current directory and the directory of the current file.
 	let perlpath = ".,,"
     endif
+    unlet s:tmp_cwd
 endif
 
 " Append perlpath to the existing path value, if it is set.  Since we don't
diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim
index daffe1e0dc..a424801cd1 100644
--- a/runtime/ftplugin/ruby.vim
+++ b/runtime/ftplugin/ruby.vim
@@ -77,11 +77,14 @@ function! s:query_path(root) abort
   let cwd = fnameescape(getcwd())
   try
     exe cd fnameescape(a:root)
-    if fnamemodify(exepath('ruby'), ':p:h') ==# cwd
+    let s:tmp_cwd = getcwd()
+    if (fnamemodify(exepath('ruby'), ':p:h') ==# cwd
+          \ && (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) == -1 || s:tmp_cwd == '.'))
       let path = []
     else
       let path = split(system(path_check),',')
     endif
+    unlet s:tmp_cwd
     exe cd cwd
     return path
   finally
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index cd18bfe2bd..45ea582615 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -40,14 +40,17 @@ endif
 let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
 
 " Safety check: don't execute zip from current directory
+let s:tmp_cwd = getcwd()
 if !exists('g:zig_std_dir') && exists('*json_decode') &&
-    \  executable('zig') && fnamemodify(exepath("zig"), ":p:h") != getcwd()
+    \  executable('zig') && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd
+          \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
     silent let s:env = system('zig env')
     if v:shell_error == 0
         let g:zig_std_dir = json_decode(s:env)['std_dir']
     endif
     unlet! s:env
 endif
+unlet s:tmp_cwd
 
 if exists('g:zig_std_dir')
     let &l:path = &l:path . ',' . g:zig_std_dir
-- 
cgit 


From ec753cf40db4d326c2fbbf5e5be0d249be561a41 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 6 Sep 2023 23:50:17 +0200
Subject: vim-patch:f7ac0ef50988

runtime: don't execute external commands when loading ftplugins

This is a followup to 816fbcc262687b81fc46f82f7bbeb1453addfe0c (patch
9.0.1833: [security] runtime file fixes)

It basically disables that external commands are run on loading of the
filetype plugin, **unless** the user has set the `g:plugin_exec = 1`
global variable in their configuration or for a specific filetype the
variable g:<filetype>_exec=1.

There are a few more plugins, that may execute system commands like
debchangelog, gitcommit, sh, racket, zsh, ps1 but those do at least
do not run those commands by default during loading of the filetype plugin
(there the command is mostly run as convenience for auto-completion or
to provide documentation lookup).

closes: vim/vim#13034

https://github.com/vim/vim/commit/f7ac0ef5098856bedca26e7073594a407c05636f

Co-authored-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Tim Pope <vim@tpope.org>
---
 runtime/doc/filetype.txt       | 15 ++++++++++++++-
 runtime/ftplugin/awk.vim       | 11 +++++++----
 runtime/ftplugin/changelog.vim | 12 +++++++++---
 runtime/ftplugin/perl.vim      | 10 ++++++----
 runtime/ftplugin/ruby.vim      |  6 +++++-
 runtime/ftplugin/zig.vim       |  8 ++++----
 6 files changed, 45 insertions(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index cf60ecdb6b..bae3006c36 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -382,11 +382,24 @@ ways to change this:
 3.  Docs for the default filetype plugins.		*ftplugin-docs*
 
 
+					*plugin_exec* *g:plugin_exec*
+Enable executing of external commands.  This was done historically for e.g.
+the perl filetype plugin (and a few others) to set the search path.
+Disabled by default for security reasons: >
+	:let g:plugin_exec = 1
+It is also possible to enable this only for certain filetypes: >
+	:let g:<filetype>_exec = 1
+So to enable this only for ruby, set the following variable: >
+	:let g:ruby_exec = 1
+
+If both, the global `plugin_exec` and the `<filetype>_exec` specific variable
+are set, the filetpe specific variable should have precedent.
+
 AWK							*ft-awk-plugin*
 
 Support for features specific to GNU Awk, like @include, can be enabled by
 setting: >
-	let g:awk_is_gawk = 1
+	:let g:awk_is_gawk = 1
 
 
 CHANGELOG						*ft-changelog-plugin*
diff --git a/runtime/ftplugin/awk.vim b/runtime/ftplugin/awk.vim
index 1bca3ad3cf..785088ff9b 100644
--- a/runtime/ftplugin/awk.vim
+++ b/runtime/ftplugin/awk.vim
@@ -37,11 +37,14 @@ if exists("g:awk_is_gawk")
     let b:undo_ftplugin .= " | setl fp<"
   endif
 
-  let path = system("gawk 'BEGIN { printf ENVIRON[\"AWKPATH\"] }'")
-  let path = substitute(path, '^\.\=:\|:\.\=$\|:\.\=:', ',,', 'g') " POSIX cwd
-  let path = substitute(path, ':', ',', 'g')
+  " Disabled by default for security reasons.  
+  if get(g:, 'awk_exec', get(g:, 'plugin_exec', 0))
+    let path = system("gawk 'BEGIN { printf ENVIRON[\"AWKPATH\"] }'")
+    let path = substitute(path, '^\.\=:\|:\.\=$\|:\.\=:', ',,', 'g') " POSIX cwd
+    let path = substitute(path, ':', ',', 'g')
 
-  let &l:path = path
+    let &l:path = path
+  endif
   let b:undo_ftplugin .= " | setl inc< path<"
 endif
 
diff --git a/runtime/ftplugin/changelog.vim b/runtime/ftplugin/changelog.vim
index e9df63f8c9..a62433378a 100644
--- a/runtime/ftplugin/changelog.vim
+++ b/runtime/ftplugin/changelog.vim
@@ -55,13 +55,19 @@ if &filetype == 'changelog'
     elseif $EMAIL_ADDRESS != ""
       return $EMAIL_ADDRESS
     endif
+    let s:default_login = 'unknown'
 
-    let login = s:login()
+    " Disabled by default for security reasons.  
+    if get(g:, 'changelog_exec', get(g:, 'plugin_exec', 0))
+      let login = s:login()
+    else
+      let login = s:default_login
+    endif
     return printf('%s <%s@%s>', s:name(login), login, s:hostname())
   endfunction
 
   function! s:login()
-    return s:trimmed_system_with_default('whoami', 'unknown')
+    return s:trimmed_system_with_default('whoami', s:default_login)
   endfunction
 
   function! s:trimmed_system_with_default(command, default)
@@ -71,7 +77,7 @@ if &filetype == 'changelog'
   function! s:system_with_default(command, default)
     let output = system(a:command)
     if v:shell_error
-      return default
+      return a:default
     endif
     return output
   endfunction
diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index 4361097f32..f3de81debe 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -54,10 +54,12 @@ endif
 
 " Set this once, globally.
 if !exists("perlpath")
-    " safety check: don't execute perl from current directory
     let s:tmp_cwd = getcwd()
-    if executable("perl") && (fnamemodify(exepath("perl"), ":p:h") != s:tmp_cwd
-          \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
+    " safety check: don't execute perl binary by default
+    if executable("perl") && get(g:, 'perl_exec', get(g:, 'plugin_exec', 0))
+        \ && (fnamemodify(exepath("perl"), ":p:h") != s:tmp_cwd
+        \ || (index(split($PATH, has("win32") ? ';' : ':'), s:tmp_cwd) != -1
+        \ && s:tmp_cwd != '.'))
       try
 	if &shellxquote != '"'
 	    let perlpath = system('perl -e "print join(q/,/,@INC)"')
@@ -73,7 +75,7 @@ if !exists("perlpath")
 	" current directory and the directory of the current file.
 	let perlpath = ".,,"
     endif
-    unlet s:tmp_cwd
+    unlet! s:tmp_cwd
 endif
 
 " Append perlpath to the existing path value, if it is set.  Since we don't
diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim
index a424801cd1..b61c1765d9 100644
--- a/runtime/ftplugin/ruby.vim
+++ b/runtime/ftplugin/ruby.vim
@@ -61,6 +61,10 @@ if !exists('g:ruby_version_paths')
 endif
 
 function! s:query_path(root) abort
+  " Disabled by default for security reasons.  
+  if !get(g:, 'ruby_exec', get(g:, 'plugin_exec', 0))
+    return []
+  endif
   let code = "print $:.join %q{,}"
   if &shell =~# 'sh' && empty(&shellxquote)
     let prefix = 'env PATH='.shellescape($PATH).' '
@@ -84,7 +88,7 @@ function! s:query_path(root) abort
     else
       let path = split(system(path_check),',')
     endif
-    unlet s:tmp_cwd
+    unlet! s:tmp_cwd
     exe cd cwd
     return path
   finally
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index 45ea582615..2a081980cc 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -40,17 +40,17 @@ endif
 let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
 
 " Safety check: don't execute zip from current directory
-let s:tmp_cwd = getcwd()
 if !exists('g:zig_std_dir') && exists('*json_decode') &&
-    \  executable('zig') && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd
-          \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
+    \  executable('zig') && get(g:, 'zig_exec', get(g:, 'plugin_exec', 0))
+    \ && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd
+    \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
     silent let s:env = system('zig env')
     if v:shell_error == 0
         let g:zig_std_dir = json_decode(s:env)['std_dir']
     endif
     unlet! s:env
 endif
-unlet s:tmp_cwd
+unlet! s:tmp_cwd
 
 if exists('g:zig_std_dir')
     let &l:path = &l:path . ',' . g:zig_std_dir
-- 
cgit 


From 131a1ee82d15ce9d1356a46117c9a1651947d4b8 Mon Sep 17 00:00:00 2001
From: Tom Praschan <13141438+tom-anders@users.noreply.github.com>
Date: Thu, 7 Sep 2023 10:12:02 +0200
Subject: feat(lsp): add original LSP Location as item's user_data in
 locations_to_items (#23743)

---
 runtime/doc/lsp.txt          | 3 +++
 runtime/doc/news.txt         | 3 +++
 runtime/lua/vim/lsp/util.lua | 6 +++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 4c0ad1e035..d2d7e9faac 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1751,6 +1751,9 @@ locations_to_items({locations}, {offset_encoding})
     Returns the items with the byte position calculated correctly and in
     sorted order, for display in quickfix and location lists.
 
+    The `user_data` field of each resulting item will contain the original
+    `Location` or `LocationLink` it was computed from.
+
     The result can be passed to the {list} argument of |setqflist()| or
     |setloclist()|.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 7607d218c3..972f37f0e9 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -162,6 +162,9 @@ The following new APIs and features were added.
 • The |:terminal| command now accepts some |:command-modifiers| (specifically
   |:horizontal| and those that affect splitting a window).
 
+• |vim.lsp.util.locations_to_items()| sets the `user_data` of each item to the
+  original LSP `Location` or `LocationLink`.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 2e376f9093..a6d17afa1b 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1812,6 +1812,9 @@ end)
 --- Returns the items with the byte position calculated correctly and in sorted
 --- order, for display in quickfix and location lists.
 ---
+--- The `user_data` field of each resulting item will contain the original
+--- `Location` or `LocationLink` it was computed from.
+---
 --- The result can be passed to the {list} argument of |setqflist()| or
 --- |setloclist()|.
 ---
@@ -1840,7 +1843,7 @@ function M.locations_to_items(locations, offset_encoding)
     -- locations may be Location or LocationLink
     local uri = d.uri or d.targetUri
     local range = d.range or d.targetSelectionRange
-    table.insert(grouped[uri], { start = range.start })
+    table.insert(grouped[uri], { start = range.start, location = d })
   end
 
   local keys = vim.tbl_keys(grouped)
@@ -1872,6 +1875,7 @@ function M.locations_to_items(locations, offset_encoding)
         lnum = row + 1,
         col = col + 1,
         text = line,
+        user_data = temp.location,
       })
     end
   end
-- 
cgit 


From d0d4160dd13fad952338b8582e2db8838172bbf1 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 8 Sep 2023 21:05:35 +0800
Subject: feat(runtime): highlight hl groups in syntax.txt (#25050)

- Add runtime/lua/vim/vimhelp.lua, which is a translation of Vim's
  runtime/import/dist/vimhelp.vim.
- Unlike Vim, run the highlighting from an ftplugin file instead of a
  syntax file, so that it is run even if using treesitter.
---
 runtime/ftplugin/help.lua   |  3 +++
 runtime/lua/vim/vimhelp.lua | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 runtime/ftplugin/help.lua
 create mode 100644 runtime/lua/vim/vimhelp.lua

(limited to 'runtime')

diff --git a/runtime/ftplugin/help.lua b/runtime/ftplugin/help.lua
new file mode 100644
index 0000000000..4cc3386167
--- /dev/null
+++ b/runtime/ftplugin/help.lua
@@ -0,0 +1,3 @@
+if vim.endswith(vim.fs.normalize(vim.api.nvim_buf_get_name(0)), '/doc/syntax.txt') then
+  require('vim.vimhelp').highlight_groups()
+end
diff --git a/runtime/lua/vim/vimhelp.lua b/runtime/lua/vim/vimhelp.lua
new file mode 100644
index 0000000000..a4d6a50b12
--- /dev/null
+++ b/runtime/lua/vim/vimhelp.lua
@@ -0,0 +1,31 @@
+-- Extra functionality for displaying Vim help.
+
+local M = {}
+
+-- Called when editing the doc/syntax.txt file
+function M.highlight_groups()
+  local save_cursor = vim.fn.getcurpos()
+
+  local start_lnum = vim.fn.search([[\*highlight-groups\*]], 'c')
+  if start_lnum == 0 then
+    return
+  end
+  local end_lnum = vim.fn.search('^======')
+  if end_lnum == 0 then
+    return
+  end
+
+  local ns = vim.api.nvim_create_namespace('vimhelp')
+  vim.api.nvim_buf_clear_namespace(0, ns, 0, -1)
+
+  for lnum = start_lnum, end_lnum do
+    local word = vim.api.nvim_buf_get_lines(0, lnum - 1, lnum, true)[1]:match('^(%w+)\t')
+    if vim.fn.hlexists(word) ~= 0 then
+      vim.api.nvim_buf_set_extmark(0, ns, lnum - 1, 0, { end_col = #word, hl_group = word })
+    end
+  end
+
+  vim.fn.setpos('.', save_cursor)
+end
+
+return M
-- 
cgit 


From 0bee75818e79a4a619c0248e17e98e985187732c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 8 Sep 2023 23:34:43 +0200
Subject: vim-patch:4e554d282c50

runtime(perl): Update ftplugin and indent files (vim/vim#13052)

https://github.com/vim/vim/commit/4e554d282c50e428932df5fff9917f8a836f7782

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/perl.vim |  2 ++
 runtime/ftplugin/pod.vim  | 37 ++++++++++++++++++-------------------
 runtime/indent/perl.vim   |  3 ++-
 3 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index f3de81debe..7ea0ae980a 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -5,6 +5,8 @@
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " License:       Vim License (see :help license)
 " Last Change:   2021 Nov 10
+"                2023 Sep 07 by Vim Project (safety check: don't execute perl
+"                    from current directory)
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
diff --git a/runtime/ftplugin/pod.vim b/runtime/ftplugin/pod.vim
index 2a905ab354..61a4aa094a 100644
--- a/runtime/ftplugin/pod.vim
+++ b/runtime/ftplugin/pod.vim
@@ -5,11 +5,12 @@
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " License:       Vim License (see :help license)
-" Last Change:   2021 Oct 19
+" Last Change:   2023 Jul 05
 
 if exists("b:did_ftplugin")
-    finish
+  finish
 endif
+let b:did_ftplugin = 1
 
 let s:save_cpo = &cpo
 set cpo-=C
@@ -37,12 +38,12 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:undo_ftplugin .= " | unlet! b:browsefilter"
 endif
 
-function! s:jumpToSection(backwards)
-  let flags = a:backwards ? 'bsWz' : 'sWz'
-  if has('syntax_items')
+function s:jumpToSection(direction)
+  let flags = a:direction == "backward" ? "bsWz" : "sWz"
+  if has("syntax_items")
     let skip = "synIDattr(synID(line('.'), col('.'), 1), 'name') !~# '\\<podCommand\\>'"
   else
-    let skip = ''
+    let skip = ""
   endif
   for i in range(v:count1)
     call search('^=\a', flags, 0, 0, skip)
@@ -50,19 +51,17 @@ function! s:jumpToSection(backwards)
 endfunction
 
 if !exists("no_plugin_maps") && !exists("no_pod_maps")
-  nnoremap <silent> <buffer> ]] <Cmd>call <SID>jumpToSection()<CR>
-  vnoremap <silent> <buffer> ]] <Cmd>call <SID>jumpToSection()<CR>
-  nnoremap <silent> <buffer> ][ <Cmd>call <SID>jumpToSection()<CR>
-  vnoremap <silent> <buffer> ][ <Cmd>call <SID>jumpToSection()<CR>
-  nnoremap <silent> <buffer> [[ <Cmd>call <SID>jumpToSection(1)<CR>
-  vnoremap <silent> <buffer> [[ <Cmd>call <SID>jumpToSection(1)<CR>
-  nnoremap <silent> <buffer> [] <Cmd>call <SID>jumpToSection(1)<CR>
-  vnoremap <silent> <buffer> [] <Cmd>call <SID>jumpToSection(1)<CR>
-  let b:undo_ftplugin .=
-        \ " | silent! exe 'nunmap <buffer> ]]' | silent! exe 'vunmap <buffer> ]]'" .
-        \ " | silent! exe 'nunmap <buffer> ][' | silent! exe 'vunmap <buffer> ]['" .
-        \ " | silent! exe 'nunmap <buffer> ]]' | silent! exe 'vunmap <buffer> ]]'" .
-        \ " | silent! exe 'nunmap <buffer> []' | silent! exe 'vunmap <buffer> []'"
+  for s:mode in ["n", "o", "x"]
+    for s:lhs in ["]]", "]["]
+      execute s:mode . "noremap <silent> <buffer> " . s:lhs . " <Cmd>call <SID>jumpToSection('forward')<CR>"
+      let b:undo_ftplugin .= " | silent! execute '" . s:mode . "unmap <buffer> " . s:lhs . "'"
+    endfor
+    for s:lhs in ["[[", "[]"]
+      execute s:mode . "noremap <silent> <buffer> " . s:lhs . " <Cmd>call <SID>jumpToSection('backward')<CR>"
+      let b:undo_ftplugin .= " | silent! execute '" . s:mode . "unmap <buffer> " . s:lhs . "'"
+    endfor
+  endfor
+  unlet s:mode s:lhs
 endif
 
 let &cpo = s:save_cpo
diff --git a/runtime/indent/perl.vim b/runtime/indent/perl.vim
index 4c91fa1b33..a97c34da53 100644
--- a/runtime/indent/perl.vim
+++ b/runtime/indent/perl.vim
@@ -4,7 +4,7 @@
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " License:       Vim License (see :help license)
-" Last Change:   2021 Sep 24
+" Last Change:   2022 Jun 14
 
 " Suggestions and improvements by :
 "   Aaron J. Sherman (use syntax for hints)
@@ -133,6 +133,7 @@ function! GetPerlIndent()
                         \ || synid == "perlHereDoc"
                         \ || synid == "perlBraces"
                         \ || synid == "perlStatementIndirObj"
+                        \ || synid == "perlSubDeclaration"
                         \ || synid =~ "^perlFiledescStatement"
                         \ || synid =~ '^perl\(Sub\|Block\|Package\)Fold'
                 let brace = strpart(line, bracepos, 1)
-- 
cgit 


From 294ded9cf26a1a1cab9071588e41bb3ce9474f18 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 8 Sep 2023 23:35:18 +0200
Subject: vim-patch:86cfb39030eb

runtime(tohtml): Update TOhtml to version 9.0v2 (vim/vim#13050)

Modified behavior:
  - Change default value of g:html_use_input_for_pc from "fallback" to
    "none". This means with default settings, only the standards-based
    method to make special text unselectable is used. The old method
    relying on unspecified browser behavior for <input> tags is now only
    used if a user specifically enables it.
  - Officially deprecate g:use_xhtml option (in favor of
    g:html_use_xhtml) by issuing a warning message when used.

Bugfixes:
  - Fix issue vim/vim#8547: LineNr and other special highlight groups did not
    get proper style rules defined when using "hi link".
  - Fix that diff filler was not properly added for deleted lines at the
    end of a buffer.

Other:
  - Refactored function definitions from long lists of strings to use
    :let-heredoc variable assignment instead.
  - Corrected deprecated "." string concatenation operator to ".."
    operator in more places.

https://github.com/vim/vim/commit/86cfb39030eb557e1a1c7804f9c147556ca5dbf1

Co-authored-by: fritzophrenic <fritzophrenic@gmail.com>
---
 runtime/autoload/tohtml.vim |  71 ++---
 runtime/doc/syntax.txt      |   2 +-
 runtime/plugin/tohtml.vim   |  27 +-
 runtime/syntax/2html.vim    | 663 ++++++++++++++++++++++++--------------------
 4 files changed, 428 insertions(+), 335 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim
index 8a1ba14364..b1693efc5d 100644
--- a/runtime/autoload/tohtml.vim
+++ b/runtime/autoload/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2023 Jan 01
+" Last Change: 2023 Sep 03
 "
 " Additional contributors:
 "
@@ -307,7 +307,7 @@ func! tohtml#Convert2HTML(line1, line2) "{{{
     let g:html_diff_win_num = 0
     for window in win_list
       " switch to the next buffer to convert
-      exe ":" . bufwinnr(window) . "wincmd w"
+      exe ":" .. bufwinnr(window) .. "wincmd w"
 
       " figure out whether current charset and encoding will work, if not
       " default to UTF-8
@@ -355,7 +355,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
   if !s:settings.no_doc
     if s:settings.use_xhtml
       if s:settings.encoding != ""
-	let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
+	let xml_line = "<?xml version=\"1.0\" encoding=\"" .. s:settings.encoding .. "\"?>"
       else
 	let xml_line = "<?xml version=\"1.0\"?>"
       endif
@@ -387,34 +387,34 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     " contained in XML information
     if s:settings.encoding != "" && !s:settings.use_xhtml
       if s:html5
-	call add(html, '<meta charset="' . s:settings.encoding . '"' . tag_close)
+	call add(html, '<meta charset="' .. s:settings.encoding .. '"' .. tag_close)
       else
-	call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
+	call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" .. s:settings.encoding .. '"' .. tag_close)
       endif
     endif
 
     call add(html, '<title>diff</title>')
-    call add(html, '<meta name="Generator" content="Vim/'.v:version/100.'.'.v:version%100.'"'.tag_close)
-    call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close)
+    call add(html, '<meta name="Generator" content="Vim/'..v:version/100..'.'..v:version%100..'"'..tag_close)
+    call add(html, '<meta name="plugin-version" content="'..g:loaded_2html_plugin..'"'..tag_close)
     call add(html, '<meta name="settings" content="'.
 	  \ join(filter(keys(s:settings),'s:settings[v:val]'),',').
-	  \ ',prevent_copy='.s:settings.prevent_copy.
-	  \ ',use_input_for_pc='.s:settings.use_input_for_pc.
-	  \ '"'.tag_close)
+	  \ ',prevent_copy='..s:settings.prevent_copy.
+	  \ ',use_input_for_pc='..s:settings.use_input_for_pc.
+	  \ '"'..tag_close)
     call add(html, '<meta name="colorscheme" content="'.
 	  \ (exists('g:colors_name')
 	  \ ? g:colors_name
-	  \ : 'none'). '"'.tag_close)
+	  \ : 'none').. '"'..tag_close)
 
     call add(html, '</head>')
     let body_line_num = len(html)
-    call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
+    call add(html, '<body'..(s:settings.line_ids ? ' onload="JumpToLine();"' : '')..'>')
   endif
-  call add(html, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>")
+  call add(html, "<table "..(s:settings.use_css? "" : "border='1' width='100%' ").."id='vimCodeElement"..s:settings.id_suffix.."'>")
 
   call add(html, '<tr>')
   for buf in a:win_list
-    call add(html, '<th>'.bufname(buf).'</th>')
+    call add(html, '<th>'..bufname(buf)..'</th>')
   endfor
   call add(html, '</tr><tr>')
 
@@ -423,7 +423,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 
   for buf in a:buf_list
     let temp = []
-    exe bufwinnr(buf) . 'wincmd w'
+    exe bufwinnr(buf) .. 'wincmd w'
 
     " If text is folded because of user foldmethod settings, etc. we don't want
     " to act on everything in a fold by mistake.
@@ -526,16 +526,16 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
   endif
 
   let i = 1
-  let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html")
+  let name = "Diff" .. (s:settings.use_xhtml ? ".xhtml" : ".html")
   " Find an unused file name if current file name is already in use
   while filereadable(name)
-    let name = substitute(name, '\d*\.x\?html$', '', '') . i . '.' . fnamemodify(copy(name), ":t:e")
+    let name = substitute(name, '\d*\.x\?html$', '', '') .. i .. '.' .. fnamemodify(copy(name), ":t:e")
     let i += 1
   endwhile
 
   let s:ei_sav = &eventignore
   set eventignore+=FileType
-  exe "topleft new " . name
+  exe "topleft new " .. name
   let &eventignore=s:ei_sav
   unlet s:ei_sav
 
@@ -601,7 +601,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 		\ "",
 		\ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
 		\ "  var node = lineElem;",
-		\ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
+		\ "  while (node && node.id != 'vimCodeElement"..s:settings.id_suffix.."')",
 		\ "  {",
 		\ "    if (node.className == 'closed-fold')",
 		\ "    {",
@@ -640,7 +640,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	call append(style_start, [
 	      \  "  function toggleFold(objID)",
 	      \  "  {",
-	      \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
+	      \  "    for (win_num = 1; win_num <= "..len(a:buf_list).."; win_num++)",
 	      \  "    {",
 	      \  "      var fold;",
 	      \  '      fold = document.getElementById("win"+win_num+objID);',
@@ -660,7 +660,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
       if s:uses_script
 	" insert script tag if needed
 	call append(style_start, [
-	      \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
+	      \ "<script" .. (s:html5 ? "" : " type='text/javascript'") .. ">",
 	      \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
       endif
 
@@ -671,14 +671,14 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
       " is pretty useless for really long lines. {{{
       if s:settings.use_css
 	call append(style_start,
-	      \ ['<style' . (s:html5 ? '' : 'type="text/css"') . '>']+
+	      \ ['<style' .. (s:html5 ? '' : 'type="text/css"') .. '>']+
 	      \ style+
 	      \ [ s:settings.use_xhtml ? '' : '<!--',
 	      \   'table { table-layout: fixed; }',
 	      \   'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
 	      \   'table, td, th { border: 1px solid; }',
 	      \   'td { vertical-align: top; }',
-	      \   'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
+	      \   'th, td { width: '..printf("%.1f",100.0/len(a:win_list))..'%; }',
 	      \   'td div { overflow: auto; }',
 	      \   s:settings.use_xhtml ? '' : '-->',
 	      \   '</style>'
@@ -694,7 +694,7 @@ endfunc "}}}
 " Gets a single user option and sets it in the passed-in Dict, or gives it the
 " default value if the option doesn't actually exist.
 func! tohtml#GetOption(settings, option, default) "{{{
-  if exists('g:html_'.a:option)
+  if exists('g:html_'..a:option)
     let a:settings[a:option] = g:html_{a:option}
   else
     let a:settings[a:option] = a:default
@@ -713,10 +713,11 @@ func! tohtml#GetUserSettings() "{{{
     let user_settings = {}
 
     " Define the correct option if the old option name exists and we haven't
-    " already defined the correct one. Maybe I'll put out a warning message about
-    " this sometime and remove the old option entirely at some even later time,
-    " but for now just silently accept the old option.
+    " already defined the correct one.
     if exists('g:use_xhtml') && !exists("g:html_use_xhtml")
+      echohl WarningMsg
+      echomsg "Warning: g:use_xhtml is deprecated, use g:html_use_xhtml"
+      echohl None
       let g:html_use_xhtml = g:use_xhtml
     endif
 
@@ -739,7 +740,7 @@ func! tohtml#GetUserSettings() "{{{
     call tohtml#GetOption(user_settings,      'whole_filler', 0 )
     call tohtml#GetOption(user_settings,         'use_xhtml', 0 )
     call tohtml#GetOption(user_settings,          'line_ids', user_settings.number_lines )
-    call tohtml#GetOption(user_settings, 'use_input_for_pc', 'fallback')
+    call tohtml#GetOption(user_settings, 'use_input_for_pc', 'none')
     " }}}
     
     " override those settings that need it {{{
@@ -854,16 +855,16 @@ func! tohtml#GetUserSettings() "{{{
     if user_settings.use_css
       if exists("g:html_prevent_copy")
 	if user_settings.dynamic_folds && !user_settings.no_foldcolumn && g:html_prevent_copy =~# 'f'
-	  let user_settings.prevent_copy .= 'f'
+	  let user_settings.prevent_copy ..= 'f'
 	endif
 	if user_settings.number_lines && g:html_prevent_copy =~# 'n'
-	  let user_settings.prevent_copy .= 'n'
+	  let user_settings.prevent_copy ..= 'n'
 	endif
 	if &diff && g:html_prevent_copy =~# 'd'
-	  let user_settings.prevent_copy .= 'd'
+	  let user_settings.prevent_copy ..= 'd'
 	endif
 	if !user_settings.ignore_folding && g:html_prevent_copy =~# 't'
-	  let user_settings.prevent_copy .= 't'
+	  let user_settings.prevent_copy ..= 't'
 	endif
       else
 	let user_settings.prevent_copy = ""
@@ -875,10 +876,10 @@ func! tohtml#GetUserSettings() "{{{
 
     " enforce valid values for use_input_for_pc
     if user_settings.use_input_for_pc !~# 'fallback\|none\|all'
-      let user_settings.use_input_for_pc = 'fallback'
+      let user_settings.use_input_for_pc = 'none'
       echohl WarningMsg
-      echomsg '2html: "' . g:html_use_input_for_pc . '" is not valid for g:html_use_input_for_pc'
-      echomsg '2html: defaulting to "' . user_settings.use_input_for_pc . '"'
+      echomsg '2html: "' .. g:html_use_input_for_pc .. '" is not valid for g:html_use_input_for_pc'
+      echomsg '2html: defaulting to "' .. user_settings.use_input_for_pc .. '"'
       echohl None
       sleep 3
     endif
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 6c0c542737..26c010315a 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -559,7 +559,7 @@ The method used to prevent copying in the generated page depends on the value
 of |g:html_use_input_for_pc|.
 
 						    *g:html_use_input_for_pc*
-Default: "fallback"
+Default: "none"
 If |g:html_prevent_copy| is non-empty, then:
 
 When "all", read-only <input> elements are used in place of normal text for
diff --git a/runtime/plugin/tohtml.vim b/runtime/plugin/tohtml.vim
index 0369313f08..56eb2c15bf 100644
--- a/runtime/plugin/tohtml.vim
+++ b/runtime/plugin/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim plugin for converting a syntax highlighted file to HTML.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2023 Jan 01
+" Last Change: 2023 Sep 07
 "
 " The core of the code is in $VIMRUNTIME/autoload/tohtml.vim and
 " $VIMRUNTIME/syntax/2html.vim
@@ -8,11 +8,29 @@
 if exists('g:loaded_2html_plugin')
   finish
 endif
-let g:loaded_2html_plugin = 'vim9.0_v1'
+let g:loaded_2html_plugin = 'vim9.0_v2'
 
 "
 " Changelog: {{{
-"   9.0_v1  (this version): - Implement g:html_no_doc and g:html_no_modeline
+"   9.0_v2  (this version): - Warn if using deprecated g:use_xhtml option
+"                           - Change default g:html_use_input_for_pc to "none"
+"                             instead of "fallback". All modern browsers support
+"                             the "user-select: none" and "content:" CSS
+"                             properties so the older method relying on extra
+"                             markup and unspecified browser/app clipboard
+"                             handling is only needed in rare special cases.
+"                           - Fix SourceForge issue #33: generate diff filler
+"                             correctly when new lines have been added to or
+"                             removed from end of buffer.
+"                           - Fix SourceForge issue #32/Vim Github issue #8547:
+"                             use translated highlight ID for styling the
+"                             special-use group names (e.g. LineNr) used
+"                             directly by name in the 2html processing.
+"                           - Fix SourceForge issue #26, refactoring to use
+"                             :let-heredoc style string assignment and
+"                             additional fixes for ".." vs. "." style string
+"                             concatenation. Requires Vim v8.1.1354 or higher.
+"   9.0_v1  (Vim 9.0.1275): - Implement g:html_no_doc and g:html_no_modeline
 "                             for diff mode. Add tests.
 "           (Vim 9.0.1122): NOTE: no version string update for this version!
 "                           - Bugfix for variable name in g:html_no_doc
@@ -21,7 +39,8 @@ let g:loaded_2html_plugin = 'vim9.0_v1'
 "                             and g:html_no_modeline (partially included in Vim
 "                             runtime prior to version string update).
 "                           - Updates for new Vim9 string append style (i.e. use
-"                             ".." instead of ".")
+"                             ".." instead of "."). Requires Vim version
+"                             8.1.1114 or higher.
 "
 "   8.1 updates: {{{
 "   8.1_v2  (Vim 8.1.2312): - Fix SourceForge issue #19: fix calculation of tab
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 9f43e91309..5fbdad90f3 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2023 Jan 01
+" Last Change: 2023 Sep 05
 "
 " Additional contributors:
 "
@@ -32,9 +32,9 @@ let s:end=line('$')
 " Font
 if exists("g:html_font")
   if type(g:html_font) == type([])
-    let s:htmlfont = "'". join(g:html_font,"','") . "', monospace"
+    let s:htmlfont = "'".. join(g:html_font,"','") .. "', monospace"
   else
-    let s:htmlfont = "'". g:html_font . "', monospace"
+    let s:htmlfont = "'".. g:html_font .. "', monospace"
   endif
 else
   let s:htmlfont = "monospace"
@@ -221,8 +221,8 @@ else
 endif
 
 " Find out the background and foreground color for use later
-let s:fgc = s:HtmlColor(synIDattr(hlID("Normal"), "fg#", s:whatterm))
-let s:bgc = s:HtmlColor(synIDattr(hlID("Normal"), "bg#", s:whatterm))
+let s:fgc = s:HtmlColor(synIDattr(hlID("Normal")->synIDtrans(), "fg#", s:whatterm))
+let s:bgc = s:HtmlColor(synIDattr(hlID("Normal")->synIDtrans(), "bg#", s:whatterm))
 if s:fgc == ""
   let s:fgc = ( &background == "dark" ? "#ffffff" : "#000000" )
 endif
@@ -234,41 +234,43 @@ if !s:settings.use_css
   " Return opening HTML tag for given highlight id
   function! s:HtmlOpening(id, extra_attrs)
     let a = ""
-    if synIDattr(a:id, "inverse")
+    let translated_ID = synIDtrans(a:id)
+    if synIDattr(translated_ID, "inverse")
       " For inverse, we always must set both colors (and exchange them)
-      let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
-      let a = a . '<span '.a:extra_attrs.'style="background-color: ' . ( x != "" ? x : s:fgc ) . '">'
-      let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
-      let a = a . '<font color="' . ( x != "" ? x : s:bgc ) . '">'
+      let x = s:HtmlColor(synIDattr(translated_ID, "fg#", s:whatterm))
+      let a = a .. '<span '..a:extra_attrs..'style="background-color: ' .. ( x != "" ? x : s:fgc ) .. '">'
+      let x = s:HtmlColor(synIDattr(translated_ID, "bg#", s:whatterm))
+      let a = a .. '<font color="' .. ( x != "" ? x : s:bgc ) .. '">'
     else
-      let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
+      let x = s:HtmlColor(synIDattr(translated_ID, "bg#", s:whatterm))
       if x != ""
-	let a = a . '<span '.a:extra_attrs.'style="background-color: ' . x . '">'
+	let a = a .. '<span '..a:extra_attrs..'style="background-color: ' .. x .. '">'
       elseif !empty(a:extra_attrs)
-	let a = a . '<span '.a:extra_attrs.'>'
+	let a = a .. '<span '..a:extra_attrs..'>'
       endif
-      let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
-      if x != "" | let a = a . '<font color="' . x . '">' | endif
+      let x = s:HtmlColor(synIDattr(translated_ID, "fg#", s:whatterm))
+      if x != "" | let a = a .. '<font color="' .. x .. '">' | endif
     endif
-    if synIDattr(a:id, "bold") | let a = a . "<b>" | endif
-    if synIDattr(a:id, "italic") | let a = a . "<i>" | endif
-    if synIDattr(a:id, "underline") | let a = a . "<u>" | endif
+    if synIDattr(translated_ID, "bold") | let a = a .. "<b>" | endif
+    if synIDattr(translated_ID, "italic") | let a = a .. "<i>" | endif
+    if synIDattr(translated_ID, "underline") | let a = a .. "<u>" | endif
     return a
   endfun
 
   " Return closing HTML tag for given highlight id
   function! s:HtmlClosing(id, has_extra_attrs)
     let a = ""
-    if synIDattr(a:id, "underline") | let a = a . "</u>" | endif
-    if synIDattr(a:id, "italic") | let a = a . "</i>" | endif
-    if synIDattr(a:id, "bold") | let a = a . "</b>" | endif
-    if synIDattr(a:id, "inverse")
-      let a = a . '</font></span>'
+    let translated_ID = synIDtrans(a:id)
+    if synIDattr(translated_ID, "underline") | let a = a .. "</u>" | endif
+    if synIDattr(translated_ID, "italic") | let a = a .. "</i>" | endif
+    if synIDattr(translated_ID, "bold") | let a = a .. "</b>" | endif
+    if synIDattr(translated_ID, "inverse")
+      let a = a .. '</font></span>'
     else
-      let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
-      if x != "" | let a = a . '</font>' | endif
-      let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
-      if x != "" || a:has_extra_attrs | let a = a . '</span>' | endif
+      let x = s:HtmlColor(synIDattr(translated_ID, "fg#", s:whatterm))
+      if x != "" | let a = a .. '</font>' | endif
+      let x = s:HtmlColor(synIDattr(translated_ID, "bg#", s:whatterm))
+      if x != "" || a:has_extra_attrs | let a = a .. '</span>' | endif
     endif
     return a
   endfun
@@ -286,84 +288,102 @@ if s:settings.use_css
   " save CSS to a list of rules to add to the output at the end of processing
 
   " first, get the style names we need
-  let wrapperfunc_lines = [
-	\ 'function! s:BuildStyleWrapper(style_id, diff_style_id, extra_attrs, text, make_unselectable, unformatted)',
-	\ '',
-	\ '  let l:style_name = synIDattr(a:style_id, "name", s:whatterm)'
-	\ ]
+  let s:wrapperfunc_lines = []
+  call add(s:wrapperfunc_lines, [])
+  let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	function! s:BuildStyleWrapper(style_id, diff_style_id, extra_attrs, text, make_unselectable, unformatted)
+	
+	  let l:style_name = synIDattr(a:style_id, "name", s:whatterm)
+  ENDLET
   if &diff
-    let wrapperfunc_lines += [
-	\ '  let l:diff_style_name = synIDattr(a:diff_style_id, "name", s:whatterm)']
-
-  " Add normal groups and diff groups to separate lists so we can order them to
-  " allow diff highlight to override normal highlight
-
-  " if primary style IS a diff style, grab it from the diff cache instead
-  " (always succeeds because we pre-populate it)
-  let wrapperfunc_lines += [
-	\ '',
-	\ '  if a:style_id == s:DIFF_D_ID || a:style_id == s:DIFF_A_ID ||'.
-	\ '          a:style_id == s:DIFF_C_ID || a:style_id == s:DIFF_T_ID',
-	\ '    let l:saved_style = get(s:diffstylelist,a:style_id)',
-	\ '  else'
-	\ ]
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	  let l:diff_style_name = synIDattr(a:diff_style_id, "name", s:whatterm)
+    ENDLET
+
+    " Add normal groups and diff groups to separate lists so we can order them to
+    " allow diff highlight to override normal highlight
+
+    " if primary style IS a diff style, grab it from the diff cache instead
+    " (always succeeds because we pre-populate it)
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim ENDLET
+
+	  if a:style_id == s:DIFF_D_ID || a:style_id == s:DIFF_A_ID || a:style_id == s:DIFF_C_ID || a:style_id == s:DIFF_T_ID
+	    let l:saved_style = get(s:diffstylelist,a:style_id)
+	  else
+    ENDLET
   endif
 
   " get primary style info from cache or build it on the fly if not found
-  let wrapperfunc_lines += [
-	\ '    let l:saved_style = get(s:stylelist,a:style_id)',
-	\ '    if type(l:saved_style) == type(0)',
-	\ '      unlet l:saved_style',
-	\ '      let l:saved_style = s:CSS1(a:style_id)',
-	\ '      if l:saved_style != ""',
-	\ '        let l:saved_style = "." . l:style_name . " { " . l:saved_style . "}"',
-	\ '      endif',
-	\ '      let s:stylelist[a:style_id]= l:saved_style',
-	\ '    endif'
-	\ ]
+  call add(s:wrapperfunc_lines, [])
+  let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	    let l:saved_style = get(s:stylelist,a:style_id)
+	    if type(l:saved_style) == type(0)
+	      unlet l:saved_style
+	      let l:saved_style = s:CSS1(a:style_id)
+	      if l:saved_style != ""
+	        let l:saved_style = "." .. l:style_name .. " { " .. l:saved_style .. "}"
+	      endif
+	      let s:stylelist[a:style_id] = l:saved_style
+	    endif
+  ENDLET
   if &diff
-    let wrapperfunc_lines += [ '  endif' ]
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	  endif
+    ENDLET
   endif
+" Ignore this comment, just bypassing a highlighting issue: if
 
   " Build the wrapper tags around the text. It turns out that caching these
   " gives pretty much zero performance gain and adds a lot of logic.
 
-  let wrapperfunc_lines += [
-	\ '',
-	\ '  if l:saved_style == "" && empty(a:extra_attrs)'
-	\ ]
+  call add(s:wrapperfunc_lines, [])
+  let s:wrapperfunc_lines[-1] =<< trim ENDLET
+
+	  if l:saved_style == "" && empty(a:extra_attrs)
+  ENDLET
   if &diff
-    let wrapperfunc_lines += [
-	\ '    if a:diff_style_id <= 0'
-	\ ]
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	    if a:diff_style_id <= 0
+    ENDLET
   endif
   " no surroundings if neither primary nor diff style has any info
-  let wrapperfunc_lines += [
-	\ '       return a:text'
-	\ ]
+  call add(s:wrapperfunc_lines, [])
+  let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	      return a:text
+  ENDLET
   if &diff
     " no primary style, but diff style
-    let wrapperfunc_lines += [
-	\ '     else',
-	\ '       return "<span class=\"" .l:diff_style_name . "\">".a:text."</span>"',
-	\ '     endif'
-	\ ]
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	    else
+	      return '<span class="' ..l:diff_style_name .. '">'..a:text.."</span>"
+	    endif
+    ENDLET
   endif
+  " Ignore this comment, just bypassing a highlighting issue: if
+
   " open tag for non-empty primary style
-  let wrapperfunc_lines += [
-	\ '  else']
+  call add(s:wrapperfunc_lines, [])
+  let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	  else
+  ENDLET
   " non-empty primary style. handle either empty or non-empty diff style.
   "
   " separate the two classes by a space to apply them both if there is a diff
   " style name, unless the primary style is empty, then just use the diff style
   " name
-  let diffstyle =
-	  \ (&diff ? '(a:diff_style_id <= 0 ? "" : " ". l:diff_style_name) .'
-	  \        : "")
+  let s:diffstyle =
+	  \ (&diff ? '(a:diff_style_id <= 0 ? "" : " " .. l:diff_style_name)..'
+	  \        : '')
   if s:settings.prevent_copy == ""
-    let wrapperfunc_lines += [
-	  \ '    return "<span ".a:extra_attrs."class=\"" . l:style_name .'.diffstyle.'"\">".a:text."</span>"'
-	  \ ]
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim eval ENDLET
+	    return "<span "..a:extra_attrs..'class="' .. l:style_name ..{s:diffstyle}'">'..a:text.."</span>"
+    ENDLET
   else
 
     " New method: use generated content in the CSS. The only thing needed here
@@ -388,59 +408,76 @@ if s:settings.use_css
     " Note, if maxlength property needs to be added in the future, it will need
     " to use strchars(), because HTML specifies that the maxlength parameter
     " uses the number of unique codepoints for its limit.
-    let wrapperfunc_lines += [
-	  \   '    if a:make_unselectable',
-	  \   '      return "<span ".a:extra_attrs."class=\"" . l:style_name .'.diffstyle.'"\"'
-	  \ ]
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim eval ENDLET
+	    if a:make_unselectable
+	      let return_span = "<span "..a:extra_attrs..'class="' .. l:style_name ..{s:diffstyle}'"'
+    ENDLET
     if s:settings.use_input_for_pc !=# 'all'
-      let wrapperfunc_lines[-1] .= ' " . "data-" . l:style_name . "-content=\"".a:text."\"'
+      call add(s:wrapperfunc_lines, [])
+      let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	      let return_span ..= " data-" .. l:style_name .. '-content="'..a:text..'"'
+      ENDLET
     endif
-    let wrapperfunc_lines[-1] .= '>'
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	      let return_span ..= '>'
+    ENDLET
     if s:settings.use_input_for_pc !=# 'none'
-      let wrapperfunc_lines[-1] .=
-	    \                '<input'.s:unselInputType.' class=\"" . l:style_name .'.diffstyle.'"\"'.
-	    \                 ' value=\"".substitute(a:unformatted,''\s\+$'',"","")."\"'.
-	    \                 ' onselect=''this.blur(); return false;'''.
-	    \                 ' onmousedown=''this.blur(); return false;'''.
-	    \                 ' onclick=''this.blur(); return false;'''.
-	    \                 ' readonly=''readonly'''.
-	    \                 ' size=\"".strwidth(a:unformatted)."\"'.
-	    \                 (s:settings.use_xhtml ? '/' : '').'>'
+      call add(s:wrapperfunc_lines, [])
+      let s:wrapperfunc_lines[-1] =<< trim eval ENDLET
+	      let return_span ..=   '<input'..s:unselInputType..' class="' .. l:style_name ..{s:diffstyle}'"'
+	      let return_span ..=   ' value="'..substitute(a:unformatted,'\s\+$',"","")..'"'
+	      let return_span ..=   " onselect='this.blur(); return false;'"
+	      let return_span ..=   " onmousedown='this.blur(); return false;'"
+	      let return_span ..=   " onclick='this.blur(); return false;'"
+	      let return_span ..=   " readonly='readonly'"
+	      let return_span ..=   ' size="'..strwidth(a:unformatted)..'"'
+	      let return_span ..=   (s:settings.use_xhtml ? '/>' : '>')
+      ENDLET
     endif
-    let wrapperfunc_lines[-1] .= '</span>"'
-    let wrapperfunc_lines += [
-	  \ '    else',
-	  \ '      return "<span ".a:extra_attrs."class=\"" . l:style_name .'. diffstyle .'"\">".a:text."</span>"'
-	  \ ]
+    call add(s:wrapperfunc_lines, [])
+    let s:wrapperfunc_lines[-1] =<< trim eval ENDLET
+	      return return_span..'</span>'
+	    else
+	      return "<span "..a:extra_attrs..'class="' .. l:style_name .. {s:diffstyle}'">'..a:text.."</span>"
+	    endif
+    ENDLET
   endif
-  let wrapperfunc_lines += [
-	\ '  endif',
-	\ 'endfun'
-	\ ]
+  call add(s:wrapperfunc_lines, [])
+  let s:wrapperfunc_lines[-1] =<< trim ENDLET
+	  endif
+	endfun
+  ENDLET
 else
   " Non-CSS method just needs the wrapper.
   "
   " Functions used to get opening/closing automatically return null strings if
   " no styles exist.
   if &diff
-    let wrapperfunc_lines = [
-	  \ 'function! s:BuildStyleWrapper(style_id, diff_style_id, extra_attrs, text, unusedarg, unusedarg2)',
-	  \ '  return s:HtmlOpening(a:style_id, a:extra_attrs).(a:diff_style_id <= 0 ? "" :'.
-	  \                                     's:HtmlOpening(a:diff_style_id, "")).a:text.'.
-	  \   '(a:diff_style_id <= 0 ? "" : s:HtmlClosing(a:diff_style_id, 0)).s:HtmlClosing(a:style_id, !empty(a:extra_attrs))',
-	  \ 'endfun'
-	  \ ]
+    let s:wrapperfunc_lines =<< trim ENDLET
+	function! s:BuildStyleWrapper(style_id, diff_style_id, extra_attrs, text, unusedarg, unusedarg2)
+	  if a:diff_style_id <= 0
+	    let l:diff_opening = s:HtmlOpening(a:diff_style_id, "")
+	    let l:diff_closing = s:HtmlClosing(a:diff_style_id, 0)
+	  else
+	    let l:diff_opening = ""
+	    let l:diff_closing = ""
+	  endif
+	  return s:HtmlOpening(a:style_id, a:extra_attrs)..l:diff_opening..a:text..l:diff_closing..s:HtmlClosing(a:style_id, !empty(a:extra_attrs))
+	endfun
+    ENDLET
   else
-    let wrapperfunc_lines = [
-	  \ 'function! s:BuildStyleWrapper(style_id, diff_style_id, extra_attrs, text, unusedarg, unusedarg2)',
-	  \ '  return s:HtmlOpening(a:style_id, a:extra_attrs).a:text.s:HtmlClosing(a:style_id, !empty(a:extra_attrs))',
-	  \ 'endfun'
-	  \ ]
+    let s:wrapperfunc_lines =<< trim ENDLET
+	function! s:BuildStyleWrapper(style_id, diff_style_id, extra_attrs, text, unusedarg, unusedarg2)
+	  return s:HtmlOpening(a:style_id, a:extra_attrs)..a:text..s:HtmlClosing(a:style_id, !empty(a:extra_attrs))
+	endfun
+    ENDLET
   endif
 endif
 
 " create the function we built line by line above
-exec join(wrapperfunc_lines, "\n")
+exec join(flatten(s:wrapperfunc_lines), "\n")
 
 let s:diff_mode = &diff
 
@@ -471,7 +508,7 @@ function! s:HtmlFormat(text, style_id, diff_style_id, extra_attrs, make_unselect
 
   " Replace double spaces, leading spaces, and trailing spaces if needed
   if ' ' != s:HtmlSpace
-    let formatted = substitute(formatted, '  ', s:HtmlSpace . s:HtmlSpace, 'g')
+    let formatted = substitute(formatted, '  ', s:HtmlSpace .. s:HtmlSpace, 'g')
     let formatted = substitute(formatted, '^ ', s:HtmlSpace, 'g')
     let formatted = substitute(formatted, ' \+$', s:HtmlSpace, 'g')
   endif
@@ -487,7 +524,7 @@ if s:settings.prevent_copy =~# 'n'
     if s:settings.line_ids
       function! s:HtmlFormat_n(text, style_id, diff_style_id, lnr)
 	if a:lnr > 0
-	  return s:HtmlFormat(a:text, a:style_id, a:diff_style_id, 'id="'.(exists('g:html_diff_win_num') ? 'W'.g:html_diff_win_num : "").'L'.a:lnr.s:settings.id_suffix.'" ', 1)
+	  return s:HtmlFormat(a:text, a:style_id, a:diff_style_id, 'id="'..(exists('g:html_diff_win_num') ? 'W'..g:html_diff_win_num : "")..'L'..a:lnr..s:settings.id_suffix..'" ', 1)
 	else
 	  return s:HtmlFormat(a:text, a:style_id, a:diff_style_id, "", 1)
 	endif
@@ -503,14 +540,14 @@ if s:settings.prevent_copy =~# 'n'
     " always be non-zero, however we don't want to use the <input> because that
     " won't work as nice for empty text
     function! s:HtmlFormat_n(text, style_id, diff_style_id, lnr)
-      return s:HtmlFormat(a:text, a:style_id, a:diff_style_id, 'id="'.(exists('g:html_diff_win_num') ? 'W'.g:html_diff_win_num : "").'L'.a:lnr.s:settings.id_suffix.'" ', 0)
+      return s:HtmlFormat(a:text, a:style_id, a:diff_style_id, 'id="'..(exists('g:html_diff_win_num') ? 'W'..g:html_diff_win_num : "")..'L'..a:lnr..s:settings.id_suffix..'" ', 0)
     endfun
   endif
 else
   if s:settings.line_ids
     function! s:HtmlFormat_n(text, style_id, diff_style_id, lnr)
       if a:lnr > 0
-	return s:HtmlFormat(a:text, a:style_id, a:diff_style_id, 'id="'.(exists('g:html_diff_win_num') ? 'W'.g:html_diff_win_num : "").'L'.a:lnr.s:settings.id_suffix.'" ', 0)
+	return s:HtmlFormat(a:text, a:style_id, a:diff_style_id, 'id="'..(exists('g:html_diff_win_num') ? 'W'..g:html_diff_win_num : "")..'L'..a:lnr..s:settings.id_suffix..'" ', 0)
       else
 	return s:HtmlFormat(a:text, a:style_id, a:diff_style_id, "", 0)
       endif
@@ -535,8 +572,8 @@ if s:settings.prevent_copy =~# 'f'
     " Simply space-pad to the desired width inside the generated content (note
     " that the FoldColumn definition includes a whitespace:pre rule)
     function! s:FoldColumn_build(char, len, numfill, char2, class, click)
-      return "<a href='#' class='".a:class."' onclick='".a:click."' data-FoldColumn-content='".
-	    \ repeat(a:char, a:len).a:char2.repeat(' ', a:numfill).
+      return "<a href='#' class='"..a:class.."' onclick='"..a:click.."' data-FoldColumn-content='".
+	    \ repeat(a:char, a:len)..a:char2..repeat(' ', a:numfill).
 	    \ "'></a>"
     endfun
     function! s:FoldColumn_fill()
@@ -554,35 +591,38 @@ if s:settings.prevent_copy =~# 'f'
     "
     " Note, 'exec' commands do not recognize line continuations, so must
     " concatenate lines rather than continue them.
-    let build_fun_lines = [
-	  \ 'function! s:FoldColumn_build(char, len, numfill, char2, class, click)',
-	  \ '  let l:input_open = "<input readonly=''readonly''".s:unselInputType.'.
-	  \ '          " onselect=''this.blur(); return false;''".'.
-	  \ '          " onmousedown=''this.blur(); ".a:click." return false;''".'.
-	  \ '          " onclick=''return false;'' size=''".'.
-	  \ '          string(a:len + (empty(a:char2) ? 0 : 1) + a:numfill) .'.
-	  \ '          "'' "',
-	  \ '  let l:common_attrs = "class=''FoldColumn'' value=''"',
-	  \ '  let l:input_close = (s:settings.use_xhtml ? "'' />" : "''>")'
-	  \ ]
+    let s:build_fun_lines = []
+    call add(s:build_fun_lines, [])
+    let s:build_fun_lines[-1] =<< trim ENDLET
+	  function! s:FoldColumn_build(char, len, numfill, char2, class, click)
+	    let l:input_open = "<input readonly='readonly'"..s:unselInputType
+	    let l:input_open ..= " onselect='this.blur(); return false;'"
+	    let l:input_open ..= " onmousedown='this.blur(); "..a:click.." return false;'"
+	    let l:input_open ..= " onclick='return false;' size='"
+	    let l:input_open ..= string(a:len + (empty(a:char2) ? 0 : 1) + a:numfill) .. "' "
+	    let l:common_attrs = "class='FoldColumn' value='"
+	    let l:input_close = (s:settings.use_xhtml ? "' />" : "'>")
+	    let l:return_span = "<span class='"..a:class.."'>"
+	    let l:return_span ..= l:input_open..l:common_attrs..repeat(a:char, a:len)..(a:char2)
+	    let l:return_span ..= l:input_close
+    ENDLET
     if s:settings.use_input_for_pc ==# 'fallback'
-      let build_fun_lines += [
-	    \ '  let l:gen_content_link ='.
-	    \ '          "<a href=''#'' class=''FoldColumn'' onclick=''".a:click."'' data-FoldColumn-content=''".'.
-	    \ '          repeat(a:char, a:len).a:char2.repeat('' '', a:numfill).'.
-	    \ '          "''></a>"'
-	    \ ]
+      call add(s:build_fun_lines, [])
+      let s:build_fun_lines[-1] =<< trim ENDLET
+	    let l:return_span ..= "<a href='#' class='FoldColumn' onclick='"..a:click.."'"
+	    let l:return_span ..= " data-FoldColumn-content='"
+	    let l:return_span ..= repeat(a:char, a:len)..a:char2..repeat(' ', a:numfill)
+	    let l:return_span ..= "'></a>"
+      ENDLET
     endif
-    let build_fun_lines += [
-	  \ '  return "<span class=''".a:class."''>".'.
-	  \ '          l:input_open.l:common_attrs.repeat(a:char, a:len).(a:char2).'.
-	  \ '          l:input_close.'.
-	  \ (s:settings.use_input_for_pc ==# 'fallback' ? 'l:gen_content_link.' : "").
-	  \ '          "</span>"',
-	  \ 'endfun'
-	  \ ]
+    call add(s:build_fun_lines, [])
+    let s:build_fun_lines[-1] =<< trim ENDLET
+	    let l:return_span ..= "</span>"
+	    return l:return_span
+	  endfun
+    ENDLET
     " create the function we built line by line above
-    exec join(build_fun_lines, "\n")
+    exec join(flatten(s:build_fun_lines), "\n")
 
     function! s:FoldColumn_fill()
       return s:FoldColumn_build(' ', s:foldcolumn, 0, '', 'FoldColumn', '')
@@ -592,8 +632,8 @@ else
   " For normal fold columns, simply space-pad to the desired width (note that
   " the FoldColumn definition includes a whitespace:pre rule)
   function! s:FoldColumn_build(char, len, numfill, char2, class, click)
-    return "<a href='#' class='".a:class."' onclick='".a:click."'>".
-	  \ repeat(a:char, a:len).a:char2.repeat(' ', a:numfill).
+    return "<a href='#' class='"..a:class.."' onclick='"..a:click.."'>".
+	  \ repeat(a:char, a:len)..a:char2..repeat(' ', a:numfill).
 	  \ "</a>"
   endfun
   function! s:FoldColumn_fill()
@@ -625,29 +665,30 @@ endif
 " Return CSS style describing given highlight id (can be empty)
 function! s:CSS1(id)
   let a = ""
-  if synIDattr(a:id, "inverse")
+  let translated_ID = synIDtrans(a:id)
+  if synIDattr(translated_ID, "inverse")
     " For inverse, we always must set both colors (and exchange them)
-    let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
-    let a = a . "color: " . ( x != "" ? x : s:bgc ) . "; "
-    let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
-    let a = a . "background-color: " . ( x != "" ? x : s:fgc ) . "; "
+    let x = s:HtmlColor(synIDattr(translated_ID, "bg#", s:whatterm))
+    let a = a .. "color: " .. ( x != "" ? x : s:bgc ) .. "; "
+    let x = s:HtmlColor(synIDattr(translated_ID, "fg#", s:whatterm))
+    let a = a .. "background-color: " .. ( x != "" ? x : s:fgc ) .. "; "
   else
-    let x = s:HtmlColor(synIDattr(a:id, "fg#", s:whatterm))
-    if x != "" | let a = a . "color: " . x . "; " | endif
-    let x = s:HtmlColor(synIDattr(a:id, "bg#", s:whatterm))
+    let x = s:HtmlColor(synIDattr(translated_ID, "fg#", s:whatterm))
+    if x != "" | let a = a .. "color: " .. x .. "; " | endif
+    let x = s:HtmlColor(synIDattr(translated_ID, "bg#", s:whatterm))
     if x != ""
-      let a = a . "background-color: " . x . "; "
+      let a = a .. "background-color: " .. x .. "; "
       " stupid hack because almost every browser seems to have at least one font
       " which shows 1px gaps between lines which have background
-      let a = a . "padding-bottom: 1px; "
-    elseif (a:id == s:FOLDED_ID || a:id == s:LINENR_ID || a:id == s:FOLD_C_ID) && !empty(s:settings.prevent_copy)
+      let a = a .. "padding-bottom: 1px; "
+    elseif (translated_ID == s:FOLDED_ID || translated_ID == s:LINENR_ID || translated_ID == s:FOLD_C_ID) && !empty(s:settings.prevent_copy)
       " input elements default to a different color than the rest of the page
-      let a = a . "background-color: " . s:bgc . "; "
+      let a = a .. "background-color: " .. s:bgc .. "; "
     endif
   endif
-  if synIDattr(a:id, "bold") | let a = a . "font-weight: bold; " | endif
-  if synIDattr(a:id, "italic") | let a = a . "font-style: italic; " | endif
-  if synIDattr(a:id, "underline") | let a = a . "text-decoration: underline; " | endif
+  if synIDattr(translated_ID, "bold") | let a = a .. "font-weight: bold; " | endif
+  if synIDattr(translated_ID, "italic") | let a = a .. "font-style: italic; " | endif
+  if synIDattr(translated_ID, "underline") | let a = a .. "text-decoration: underline; " | endif
   return a
 endfun
 
@@ -720,7 +761,7 @@ if exists("g:loaded_2html_plugin")
   let s:pluginversion = g:loaded_2html_plugin
 else
   if !exists("g:unloaded_tohtml_plugin")
-    let s:main_plugin_path = expand("<sfile>:p:h:h")."/plugin/tohtml.vim"
+    let s:main_plugin_path = expand("<sfile>:p:h:h").."/plugin/tohtml.vim"
     if filereadable(s:main_plugin_path)
       let s:lines = readfile(s:main_plugin_path, "", 20)
       call filter(s:lines, 'v:val =~ "loaded_2html_plugin = "')
@@ -743,12 +784,12 @@ let s:orgbufnr = winbufnr(0)
 let s:origwin_stl = &l:stl
 if expand("%") == ""
   if exists('g:html_diff_win_num')
-    exec 'new Untitled_win'.g:html_diff_win_num.'.'.(s:settings.use_xhtml ? 'x' : '').'html'
+    exec 'new Untitled_win'..g:html_diff_win_num..'.'.(s:settings.use_xhtml ? 'xhtml' : 'html')
   else
-    exec 'new Untitled.'.(s:settings.use_xhtml ? 'x' : '').'html'
+    exec 'new Untitled.'..(s:settings.use_xhtml ? 'xhtml' : 'html')
   endif
 else
-  exec 'new %.'.(s:settings.use_xhtml ? 'x' : '').'html'
+  exec 'new %.'..(s:settings.use_xhtml ? 'xhtml' : 'html')
 endif
 
 " Resize the new window to very small in order to make it draw faster
@@ -795,7 +836,7 @@ let s:lines = []
 
 if s:settings.use_xhtml
   if s:settings.encoding != ""
-    call add(s:lines, "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>")
+    call add(s:lines, "<?xml version=\"1.0\" encoding=\"" .. s:settings.encoding .. "\"?>")
   else
     call add(s:lines, "<?xml version=\"1.0\"?>")
   endif
@@ -808,9 +849,9 @@ let s:HtmlSpace = ' '
 let s:LeadingSpace = ' '
 let s:HtmlEndline = ''
 if s:settings.no_pre
-  let s:HtmlEndline = '<br' . s:tag_close
+  let s:HtmlEndline = '<br' .. s:tag_close
   let s:LeadingSpace = s:settings.use_xhtml ? '&#160;' : '&nbsp;'
-  let s:HtmlSpace = '\' . s:LeadingSpace
+  let s:HtmlSpace = '\' .. s:LeadingSpace
 endif
 
 " HTML header, with the title and generator ;-). Left free space for the CSS,
@@ -823,30 +864,30 @@ if !s:settings.no_doc
   " contained in XML information (to avoid haggling over content type)
   if s:settings.encoding != "" && !s:settings.use_xhtml
     if s:html5
-      call add(s:lines, '<meta charset="' . s:settings.encoding . '"' . s:tag_close)
+      call add(s:lines, '<meta charset="' .. s:settings.encoding .. '"' .. s:tag_close)
     else
-      call add(s:lines, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . s:tag_close)
+      call add(s:lines, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" .. s:settings.encoding .. '"' .. s:tag_close)
     endif
   endif
   call extend(s:lines, [
-	\ ("<title>".expand("%:p:~")."</title>"),
-	\ ("<meta name=\"Generator\" content=\"Vim/".v:version/100.".".v:version%100.'"'.s:tag_close),
-	\ ("<meta name=\"plugin-version\" content=\"".s:pluginversion.'"'.s:tag_close)
+	\ ("<title>"..expand("%:p:~").."</title>"),
+	\ ("<meta name=\"Generator\" content=\"Vim/"..v:version/100.."."..v:version%100..'"'..s:tag_close),
+	\ ("<meta name=\"plugin-version\" content=\""..s:pluginversion..'"'..s:tag_close)
 	\ ])
-  call add(s:lines, '<meta name="syntax" content="'.s:current_syntax.'"'.s:tag_close)
-  call add(s:lines, '<meta name="settings" content="'.
-	\ join(filter(keys(s:settings),'s:settings[v:val]'),',').
-	\ ',prevent_copy='.s:settings.prevent_copy.
-	\ ',use_input_for_pc='.s:settings.use_input_for_pc.
-	\ '"'.s:tag_close)
-  call add(s:lines, '<meta name="colorscheme" content="'.
+  call add(s:lines, '<meta name="syntax" content="'..s:current_syntax..'"'..s:tag_close)
+  call add(s:lines, '<meta name="settings" content="'..
+	\ join(filter(keys(s:settings),'s:settings[v:val]'),',')..
+	\ ',prevent_copy='..s:settings.prevent_copy..
+	\ ',use_input_for_pc='..s:settings.use_input_for_pc..
+	\ '"'..s:tag_close)
+  call add(s:lines, '<meta name="colorscheme" content="'..
 	\ (exists('g:colors_name')
 	\ ? g:colors_name
-	\ : 'none'). '"'.s:tag_close)
+	\ : 'none').. '"'..s:tag_close)
 
   if s:settings.use_css
     call extend(s:lines, [
-	  \ "<style" . (s:html5 ? "" : " type=\"text/css\"") . ">",
+	  \ "<style" .. (s:html5 ? "" : " type=\"text/css\"") .. ">",
 	  \ s:settings.use_xhtml ? "" : "<!--"])
     let s:ieonly = []
     if s:settings.dynamic_folds
@@ -921,7 +962,7 @@ if !s:settings.no_doc
   if s:uses_script
     call extend(s:lines, [
 	  \ "",
-	  \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
+	  \ "<script" .. (s:html5 ? "" : " type='text/javascript'") .. ">",
 	  \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
   endif
 
@@ -968,7 +1009,7 @@ if !s:settings.no_doc
 	    \ "",
 	    \ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
 	    \ "  var node = lineElem;",
-	    \ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
+	    \ "  while (node && node.id != 'vimCodeElement"..s:settings.id_suffix.."')",
 	    \ "  {",
 	    \ "    if (node.className == 'closed-fold')",
 	    \ "    {",
@@ -1003,7 +1044,7 @@ if !s:settings.no_doc
   endif
 
   call extend(s:lines, ["</head>",
-	\ "<body".(s:settings.line_ids ? " onload='JumpToLine();'" : "").">"])
+	\ "<body"..(s:settings.line_ids ? " onload='JumpToLine();'" : "")..">"])
 endif
 
 if s:settings.no_pre
@@ -1015,20 +1056,20 @@ else
   call extend(s:lines, ["<pre id='vimCodeElement" .. s:settings.id_suffix .. "'>"])
 endif
 
-exe s:orgwin . "wincmd w"
+exe s:orgwin .. "wincmd w"
 
 " caches of style data
 " initialize to include line numbers if using them
 if s:settings.number_lines
-  let s:stylelist = { s:LINENR_ID : ".LineNr { " . s:CSS1( s:LINENR_ID ) . "}" }
+  let s:stylelist = { s:LINENR_ID : ".LineNr { " .. s:CSS1( s:LINENR_ID ) .. "}" }
 else
   let s:stylelist = {}
 endif
 let s:diffstylelist = {
-      \   s:DIFF_A_ID : ".DiffAdd { " . s:CSS1( s:DIFF_A_ID ) . "}",
-      \   s:DIFF_C_ID : ".DiffChange { " . s:CSS1( s:DIFF_C_ID ) . "}",
-      \   s:DIFF_D_ID : ".DiffDelete { " . s:CSS1( s:DIFF_D_ID ) . "}",
-      \   s:DIFF_T_ID : ".DiffText { " . s:CSS1( s:DIFF_T_ID ) . "}"
+      \   s:DIFF_A_ID : ".DiffAdd { " .. s:CSS1( s:DIFF_A_ID ) .. "}",
+      \   s:DIFF_C_ID : ".DiffChange { " .. s:CSS1( s:DIFF_C_ID ) .. "}",
+      \   s:DIFF_D_ID : ".DiffDelete { " .. s:CSS1( s:DIFF_D_ID ) .. "}",
+      \   s:DIFF_T_ID : ".DiffText { " .. s:CSS1( s:DIFF_T_ID ) .. "}"
       \ }
 
 " set up progress bar in the status line
@@ -1046,17 +1087,17 @@ if !s:settings.no_progress
        \ g:colors_name != s:last_colors_name
       let s:last_colors_name = exists("g:colors_name") ? g:colors_name : "none"
 
-      let l:diffatr = synIDattr(hlID("DiffDelete"), "reverse", s:whatterm) ? "fg#" : "bg#"
-      let l:stlatr = synIDattr(hlID("StatusLine"), "reverse", s:whatterm) ? "fg#" : "bg#"
+      let l:diffatr = synIDattr(hlID("DiffDelete")->synIDtrans(), "reverse", s:whatterm) ? "fg#" : "bg#"
+      let l:stlatr = synIDattr(hlID("StatusLine")->synIDtrans(), "reverse", s:whatterm) ? "fg#" : "bg#"
 
-      let l:progbar_color = synIDattr(hlID("DiffDelete"), l:diffatr, s:whatterm)
-      let l:stl_color = synIDattr(hlID("StatusLine"), l:stlatr, s:whatterm)
+      let l:progbar_color = synIDattr(hlID("DiffDelete")->synIDtrans(), l:diffatr, s:whatterm)
+      let l:stl_color = synIDattr(hlID("StatusLine")->synIDtrans(), l:stlatr, s:whatterm)
 
       if "" == l:progbar_color
-	let l:progbar_color = synIDattr(hlID("DiffDelete"), "reverse", s:whatterm) ? s:fgc : s:bgc
+	let l:progbar_color = synIDattr(hlID("DiffDelete")->synIDtrans(), "reverse", s:whatterm) ? s:fgc : s:bgc
       endif
       if "" == l:stl_color
-	let l:stl_color = synIDattr(hlID("StatusLine"), "reverse", s:whatterm) ? s:fgc : s:bgc
+	let l:stl_color = synIDattr(hlID("StatusLine")->synIDtrans(), "reverse", s:whatterm) ? s:fgc : s:bgc
       endif
 
       if l:progbar_color == l:stl_color
@@ -1086,13 +1127,13 @@ if !s:settings.no_progress
 	endif
 	echomsg "diff detected progbar color set to" l:progbar_color
       endif
-      exe "hi TOhtmlProgress_auto" s:whatterm."bg=".l:progbar_color
+      exe "hi TOhtmlProgress_auto" s:whatterm.."bg="..l:progbar_color
     endif
   endfun
 
   func! s:ProgressBar(title, max_value, winnr)
     let pgb=copy(s:progressbar)
-    let pgb.title = a:title.' '
+    let pgb.title = a:title..' '
     let pgb.max_value = a:max_value
     let pgb.winnr = a:winnr
     let pgb.cur_value = 0
@@ -1194,6 +1235,66 @@ if !s:settings.no_progress
   call s:SetProgbarColor()
 endif
 
+let s:build_fun_lines = []
+call add(s:build_fun_lines, [])
+let s:build_fun_lines[-1] =<< trim ENDLET
+    func! s:Add_diff_fill(lnum)
+      let l:filler = diff_filler(a:lnum)
+      if l:filler > 0
+	let l:to_insert = l:filler
+	while l:to_insert > 0
+	  let l:new = repeat(s:difffillchar, 3)
+
+	  if l:to_insert > 2 && l:to_insert < l:filler && !s:settings.whole_filler
+	    let l:new = l:new .. " " .. l:filler .. " inserted lines "
+	    let l:to_insert = 2
+	  endif
+ENDLET
+call add(s:build_fun_lines, [])
+if !s:settings.no_pre
+  let s:build_fun_lines[-1] =<< trim ENDLET
+	  " HTML line wrapping is off--go ahead and fill to the margin
+	  " TODO: what about when CSS wrapping is turned on?
+	  let l:new = l:new .. repeat(s:difffillchar, &columns - strlen(l:new) - s:margin)
+  ENDLET
+else
+  let s:build_fun_lines[-1] =<< trim ENDLET
+	  let l:new = l:new .. repeat(s:difffillchar, 3)
+  ENDLET
+endif
+call add(s:build_fun_lines, [])
+let s:build_fun_lines[-1] =<< trim ENDLET
+	let l:new = s:HtmlFormat_d(l:new, s:DIFF_D_ID, 0)
+ENDLET
+if s:settings.number_lines
+  call add(s:build_fun_lines, [])
+  let s:build_fun_lines[-1] =<< trim ENDLET
+	  " Indent if line numbering is on. Indent gets style of line number
+	  " column.
+	  let l:new = s:HtmlFormat_n(repeat(' ', s:margin), s:LINENR_ID, 0, 0) .. l:new
+  ENDLET
+endif
+if s:settings.dynamic_folds && !s:settings.no_foldcolumn 
+  call add(s:build_fun_lines, [])
+  let s:build_fun_lines[-1] =<< trim ENDLET
+	  if s:foldcolumn > 0
+	    " Indent for foldcolumn if there is one. Assume it's empty, there should
+	    " not be a fold for deleted lines in diff mode.
+	    let l:new = s:FoldColumn_fill() .. l:new
+	  endif
+  ENDLET
+endif
+" Ignore this comment, just bypassing a highlighting issue: if
+call add(s:build_fun_lines, [])
+let s:build_fun_lines[-1] =<< trim ENDLET
+	call add(s:lines, l:new..s:HtmlEndline)
+	let l:to_insert = l:to_insert - 1
+      endwhile
+    endif
+  endfun
+ENDLET
+exec join(flatten(s:build_fun_lines), "\n")
+
 " First do some preprocessing for dynamic folding. Do this for the entire file
 " so we don't accidentally start within a closed fold or something.
 let s:allfolds = []
@@ -1220,7 +1321,7 @@ if s:settings.dynamic_folds
       let s:newfold = {'firstline': s:lnum, 'lastline': foldclosedend(s:lnum), 'level': s:level,'type': "closed-fold"}
       call add(s:allfolds, s:newfold)
       " open the fold so we can find any contained folds
-      execute s:lnum."foldopen"
+      execute s:lnum.."foldopen"
     else
       if !s:settings.no_progress
 	call s:pgb.incr()
@@ -1252,7 +1353,7 @@ if s:settings.dynamic_folds
 	call add(s:allfolds, s:newfold)
       endif
       " open the fold so we can find any contained folds
-      execute s:lnum."foldopen"
+      execute s:lnum.."foldopen"
     else
       if !s:settings.no_progress
 	call s:pgb.incr()
@@ -1339,7 +1440,7 @@ if s:settings.dynamic_folds
   " Note that only when a start and an end line is specified will a fold
   " containing the current range ever be removed.
   while leveladjust > 0
-    exe g:html_start_line."foldopen"
+    exe g:html_start_line.."foldopen"
     let leveladjust -= 1
   endwhile
 endif
@@ -1399,47 +1500,11 @@ endif
 while s:lnum <= s:end
 
   " If there are filler lines for diff mode, show these above the line.
-  let s:filler = diff_filler(s:lnum)
-  if s:filler > 0
-    let s:n = s:filler
-    while s:n > 0
-      let s:new = repeat(s:difffillchar, 3)
-
-      if s:n > 2 && s:n < s:filler && !s:settings.whole_filler
-	let s:new = s:new . " " . s:filler . " inserted lines "
-	let s:n = 2
-      endif
-
-      if !s:settings.no_pre
-	" HTML line wrapping is off--go ahead and fill to the margin
-	" TODO: what about when CSS wrapping is turned on?
-	let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new) - s:margin)
-      else
-	let s:new = s:new . repeat(s:difffillchar, 3)
-      endif
-
-      let s:new = s:HtmlFormat_d(s:new, s:DIFF_D_ID, 0)
-      if s:settings.number_lines
-	" Indent if line numbering is on. Indent gets style of line number
-	" column.
-	let s:new = s:HtmlFormat_n(repeat(' ', s:margin), s:LINENR_ID, 0, 0) . s:new
-      endif
-      if s:settings.dynamic_folds && !s:settings.no_foldcolumn && s:foldcolumn > 0
-	" Indent for foldcolumn if there is one. Assume it's empty, there should
-	" not be a fold for deleted lines in diff mode.
-	let s:new = s:FoldColumn_fill() . s:new
-      endif
-      call add(s:lines, s:new.s:HtmlEndline)
-
-      let s:n = s:n - 1
-    endwhile
-    unlet s:n
-  endif
-  unlet s:filler
+  call s:Add_diff_fill(s:lnum)
 
   " Start the line with the line number.
   if s:settings.number_lines
-    let s:numcol = repeat(' ', s:margin - 1 - strlen(s:lnum)) . s:lnum . ' '
+    let s:numcol = repeat(' ', s:margin - 1 - strlen(s:lnum)) .. s:lnum .. ' '
   endif
 
   let s:new = ""
@@ -1450,11 +1515,11 @@ while s:lnum <= s:end
     let s:new = foldtextresult(s:lnum)
     if !s:settings.no_pre
       " HTML line wrapping is off--go ahead and fill to the margin
-      let s:new = s:new . repeat(s:foldfillchar, &columns - strlen(s:new))
+      let s:new = s:new .. repeat(s:foldfillchar, &columns - strlen(s:new))
     endif
 
     " put numcol in a separate group for sake of unselectable text
-    let s:new = (s:settings.number_lines ? s:HtmlFormat_n(s:numcol, s:FOLDED_ID, 0, s:lnum): "") . s:HtmlFormat_t(s:new, s:FOLDED_ID, 0)
+    let s:new = (s:settings.number_lines ? s:HtmlFormat_n(s:numcol, s:FOLDED_ID, 0, s:lnum): "") .. s:HtmlFormat_t(s:new, s:FOLDED_ID, 0)
 
     " Skip to the end of the fold
     let s:new_lnum = foldclosedend(s:lnum)
@@ -1475,7 +1540,7 @@ while s:lnum <= s:end
     if s:settings.dynamic_folds
       " First insert a closing for any open folds that end on this line
       while !empty(s:foldstack) && get(s:foldstack,0).lastline == s:lnum-1
-	let s:new = s:new."</span></span>"
+	let s:new = s:new.."</span></span>"
 	call remove(s:foldstack, 0)
       endwhile
 
@@ -1483,9 +1548,9 @@ while s:lnum <= s:end
       let s:firstfold = 1
       while !empty(s:allfolds) && get(s:allfolds,0).firstline == s:lnum
 	let s:foldId = s:foldId + 1
-	let s:new .= "<span id='"
-	let s:new .= (exists('g:html_diff_win_num') ? "win".g:html_diff_win_num : "")
-	let s:new .= "fold".s:foldId.s:settings.id_suffix."' class='".s:allfolds[0].type."'>"
+	let s:new ..= "<span id='"
+	let s:new ..= (exists('g:html_diff_win_num') ? "win"..g:html_diff_win_num : "")
+	let s:new ..= "fold"..s:foldId..s:settings.id_suffix.."' class='"..s:allfolds[0].type.."'>"
 
 
 	" Unless disabled, add a fold column for the opening line of a fold.
@@ -1496,20 +1561,20 @@ while s:lnum <= s:end
 	if !s:settings.no_foldcolumn
 	  " add fold column that can open the new fold
 	  if s:allfolds[0].level > 1 && s:firstfold
-	    let s:new = s:new . s:FoldColumn_build('|', s:allfolds[0].level - 1, 0, "",
-		  \ 'toggle-open FoldColumn','javascript:toggleFold("fold'.s:foldstack[0].id.s:settings.id_suffix.'");')
+	    let s:new = s:new .. s:FoldColumn_build('|', s:allfolds[0].level - 1, 0, "",
+		  \ 'toggle-open FoldColumn','javascript:toggleFold("fold'..s:foldstack[0].id..s:settings.id_suffix..'");')
 	  endif
 	  " add the filler spaces separately from the '+' char so that it can be
 	  " shown/hidden separately during a hover unfold
-	  let s:new = s:new . s:FoldColumn_build("+", 1, 0, "",
-		\ 'toggle-open FoldColumn', 'javascript:toggleFold("fold'.s:foldId.s:settings.id_suffix.'");')
+	  let s:new = s:new .. s:FoldColumn_build("+", 1, 0, "",
+		\ 'toggle-open FoldColumn', 'javascript:toggleFold("fold'..s:foldId..s:settings.id_suffix..'");')
 	  " If this is not the last fold we're opening on this line, we need
 	  " to keep the filler spaces hidden if the fold is opened by mouse
 	  " hover. If it is the last fold to open in the line, we shouldn't hide
 	  " them, so don't apply the toggle-filler class.
-	  let s:new = s:new . s:FoldColumn_build(" ", 1, s:foldcolumn - s:allfolds[0].level - 1, "",
-		\ 'toggle-open FoldColumn'. (get(s:allfolds, 1, {'firstline': 0}).firstline == s:lnum ?" toggle-filler" :""),
-		\ 'javascript:toggleFold("fold'.s:foldId.s:settings.id_suffix.'");')
+	  let s:new = s:new .. s:FoldColumn_build(" ", 1, s:foldcolumn - s:allfolds[0].level - 1, "",
+		\ 'toggle-open FoldColumn'.. (get(s:allfolds, 1, {'firstline': 0}).firstline == s:lnum ?" toggle-filler" :""),
+		\ 'javascript:toggleFold("fold'..s:foldId..s:settings.id_suffix..'");')
 
 	  " add fold column that can close the new fold
 	  " only add extra blank space if we aren't opening another fold on the
@@ -1522,12 +1587,12 @@ while s:lnum <= s:end
 	  if s:firstfold
 	    " the first fold in a line has '|' characters from folds opened in
 	    " previous lines, before the '-' for this fold
-	    let s:new .= s:FoldColumn_build('|', s:allfolds[0].level - 1, s:extra_space, '-',
-		  \ 'toggle-closed FoldColumn', 'javascript:toggleFold("fold'.s:foldId.s:settings.id_suffix.'");')
+	    let s:new ..= s:FoldColumn_build('|', s:allfolds[0].level - 1, s:extra_space, '-',
+		  \ 'toggle-closed FoldColumn', 'javascript:toggleFold("fold'..s:foldId..s:settings.id_suffix..'");')
 	  else
 	    " any subsequent folds in the line only add a single '-'
-	    let s:new = s:new . s:FoldColumn_build("-", 1, s:extra_space, "",
-		  \ 'toggle-closed FoldColumn', 'javascript:toggleFold("fold'.s:foldId.s:settings.id_suffix.'");')
+	    let s:new = s:new .. s:FoldColumn_build("-", 1, s:extra_space, "",
+		  \ 'toggle-closed FoldColumn', 'javascript:toggleFold("fold'..s:foldId..s:settings.id_suffix..'");')
 	  endif
 	  let s:firstfold = 0
 	endif
@@ -1535,12 +1600,12 @@ while s:lnum <= s:end
 	" Add fold text, moving the span ending to the next line so collapsing
 	" of folds works correctly.
 	" Put numcol in a separate group for sake of unselectable text.
-	let s:new = s:new . (s:settings.number_lines ? s:HtmlFormat_n(s:numcol, s:FOLDED_ID, 0, 0) : "") . substitute(s:HtmlFormat_t(foldtextresult(s:lnum), s:FOLDED_ID, 0), '</span>', s:HtmlEndline.'\n\0', '')
-	let s:new = s:new . "<span class='fulltext'>"
+	let s:new = s:new .. (s:settings.number_lines ? s:HtmlFormat_n(s:numcol, s:FOLDED_ID, 0, 0) : "") .. substitute(s:HtmlFormat_t(foldtextresult(s:lnum), s:FOLDED_ID, 0), '</span>', s:HtmlEndline..'\n\0', '')
+	let s:new = s:new .. "<span class='fulltext'>"
 
 	" open the fold now that we have the fold text to allow retrieval of
 	" fold text for subsequent folds
-	execute s:lnum."foldopen"
+	execute s:lnum.."foldopen"
 	call insert(s:foldstack, remove(s:allfolds,0))
 	let s:foldstack[0].id = s:foldId
       endwhile
@@ -1555,13 +1620,13 @@ while s:lnum <= s:end
 	  " add the empty foldcolumn for unfolded lines if there is a fold
 	  " column at all
 	  if s:foldcolumn > 0
-	    let s:new = s:new . s:FoldColumn_fill()
+	    let s:new = s:new .. s:FoldColumn_fill()
 	  endif
 	else
 	  " add the fold column for folds not on the opening line
 	  if get(s:foldstack, 0).firstline < s:lnum
-	    let s:new = s:new . s:FoldColumn_build('|', s:foldstack[0].level, s:foldcolumn - s:foldstack[0].level, "",
-		  \ 'FoldColumn', 'javascript:toggleFold("fold'.s:foldstack[0].id.s:settings.id_suffix.'");')
+	    let s:new = s:new .. s:FoldColumn_build('|', s:foldstack[0].level, s:foldcolumn - s:foldstack[0].level, "",
+		  \ 'FoldColumn', 'javascript:toggleFold("fold'..s:foldstack[0].id..s:settings.id_suffix..'");')
 	  endif
 	endif
       endif
@@ -1569,9 +1634,9 @@ while s:lnum <= s:end
 
     " Now continue with the unfolded line text
     if s:settings.number_lines
-      let s:new = s:new . s:HtmlFormat_n(s:numcol, s:LINENR_ID, 0, s:lnum)
+      let s:new = s:new .. s:HtmlFormat_n(s:numcol, s:LINENR_ID, 0, s:lnum)
     elseif s:settings.line_ids
-      let s:new = s:new . s:HtmlFormat_n("", s:LINENR_ID, 0, s:lnum)
+      let s:new = s:new .. s:HtmlFormat_n("", s:LINENR_ID, 0, s:lnum)
     endif
 
     " Get the diff attribute, if any.
@@ -1611,7 +1676,7 @@ while s:lnum <= s:end
 	if s:len < &columns && !s:settings.no_pre
 	  " Add spaces at the end of the raw text line to extend the changed
 	  " line to the full width.
-	  let s:line = s:line . repeat(' ', &columns - virtcol([s:lnum, s:len]) - s:margin)
+	  let s:line = s:line .. repeat(' ', &columns - virtcol([s:lnum, s:len]) - s:margin)
 	  let s:len = &columns
 	endif
       else
@@ -1649,11 +1714,11 @@ while s:lnum <= s:end
 		" if the found tab is the first character in the text being
 		" processed, we need to get the character prior to the text,
 		" given by startcol.
-		let s:prevc = matchstr(s:line, '.\%' . (s:startcol + s:offset) . 'c')
+		let s:prevc = matchstr(s:line, '.\%' .. (s:startcol + s:offset) .. 'c')
 	      else
 		" Otherwise, the byte index of the tab into s:expandedtab is
 		" given by s:idx.
-		let s:prevc = matchstr(s:expandedtab, '.\%' . (s:idx + 1) . 'c')
+		let s:prevc = matchstr(s:expandedtab, '.\%' .. (s:idx + 1) .. 'c')
 	      endif
 	      let s:vcol = virtcol([s:lnum, s:startcol + s:idx + s:offset - len(s:prevc)])
 
@@ -1689,12 +1754,12 @@ while s:lnum <= s:end
       " Output the text with the same synID, with class set to the highlight ID
       " name, unless it has been concealed completely.
       if strlen(s:expandedtab) > 0
-	let s:new = s:new . s:HtmlFormat(s:expandedtab,  s:id, s:diff_id, "", 0)
+	let s:new = s:new .. s:HtmlFormat(s:expandedtab,  s:id, s:diff_id, "", 0)
       endif
     endwhile
   endif
 
-  call extend(s:lines, split(s:new.s:HtmlEndline, '\n', 1))
+  call extend(s:lines, split(s:new..s:HtmlEndline, '\n', 1))
   if !s:settings.no_progress && s:pgb.needs_redraw
     redrawstatus
     let s:pgb.needs_redraw = 0
@@ -1706,17 +1771,21 @@ while s:lnum <= s:end
   endif
 endwhile
 
+" Diff filler is returned based on what needs inserting *before* the given line.
+" So to get diff filler at the end of the buffer, we need to use last line + 1
+call s:Add_diff_fill(s:end+1)
+
 if s:settings.dynamic_folds
   " finish off any open folds
   while !empty(s:foldstack)
-    let s:lines[-1].="</span></span>"
+    let s:lines[-1]..="</span></span>"
     call remove(s:foldstack, 0)
   endwhile
 
   " add fold column to the style list if not already there
   let s:id = s:FOLD_C_ID
   if !has_key(s:stylelist, s:id)
-    let s:stylelist[s:id] = '.FoldColumn { ' . s:CSS1(s:id) . '}'
+    let s:stylelist[s:id] = '.FoldColumn { ' .. s:CSS1(s:id) .. '}'
   endif
 endif
 
@@ -1734,7 +1803,7 @@ if !s:settings.no_doc
   call extend(s:lines, ["</body>", "</html>"])
 endif
 
-exe s:newwin . "wincmd w"
+exe s:newwin .. "wincmd w"
 call setline(1, s:lines)
 unlet s:lines
 
@@ -1757,17 +1826,17 @@ if s:settings.use_css && !s:settings.no_doc
 
   " Normal/global attributes
   if s:settings.no_pre
-    call append('.', "body { color: " . s:fgc . "; background-color: " . s:bgc . "; font-family: ". s:htmlfont ."; }")
+    call append('.', "body { color: " .. s:fgc .. "; background-color: " .. s:bgc .. "; font-family: ".. s:htmlfont .."; }")
     +
   else
-    call append('.', "pre { " . s:whitespace . "font-family: ". s:htmlfont ."; color: " . s:fgc . "; background-color: " . s:bgc . "; }")
+    call append('.', "pre { " .. s:whitespace .. "font-family: ".. s:htmlfont .."; color: " .. s:fgc .. "; background-color: " .. s:bgc .. "; }")
     +
     yank
     put
     execute "normal! ^cwbody\e"
     " body should not have the wrap formatting, only the pre section
     if s:whitespace != ''
-      exec 's#'.s:whitespace
+      exec 's#'..s:whitespace
     endif
   endif
   " fix browser inconsistencies (sometimes within the same browser) of different
@@ -1778,13 +1847,13 @@ if s:settings.use_css && !s:settings.no_doc
   " like normal text
   if !empty(s:settings.prevent_copy)
     if s:settings.use_input_for_pc !=# "none"
-      call append('.', 'input { border: none; margin: 0; padding: 0; font-family: '.s:htmlfont.'; }')
+      call append('.', 'input { border: none; margin: 0; padding: 0; font-family: '..s:htmlfont..'; }')
       +
       " ch units for browsers which support them, em units for a somewhat
       " reasonable fallback.
       for w in range(1, 20, 1)
 	call append('.', [
-	      \ "input[size='".w."'] { width: ".w."em; width: ".w."ch; }"
+	      \ "input[size='"..w.."'] { width: "..w.."em; width: "..w.."ch; }"
 	      \ ])
 	+
       endfor
@@ -1828,14 +1897,15 @@ if s:settings.use_css && !s:settings.no_doc
       endif
       for s:style_name in s:unselectable_styles
 	call append('.', [
-	      \ '  .'.s:style_name.' { user-select: none; }',
-	      \ '  [data-'.s:style_name.'-content]::before { content: attr(data-'.s:style_name.'-content); }',
-	      \ '  [data-'.s:style_name.'-content]::before { padding-bottom: 1px; display: inline-block; /* match the 1-px padding of standard items with background */ }',
-	      \ '  span[data-'.s:style_name.'-content]::before { cursor: default; }',
+	      \ '  .'..s:style_name..' { user-select: none; }',
+	      \ '  [data-'..s:style_name..'-content]::before { content: attr(data-'..s:style_name..'-content); }',
+	      \ '  [data-'..s:style_name..'-content]::before { padding-bottom: 1px; display: inline-block; /* match the 1-px padding of standard items with background */ }',
+	      \ '  span[data-'..s:style_name..'-content]::before { cursor: default; }',
 	      \ ])
 	+4
       endfor
       if s:settings.use_input_for_pc !=# 'none'
+	" Note, the extra '}' is to match the "@supports" above
 	call append('.', [
 	      \ '  input { display: none; }',
 	      \ '}'
@@ -1851,12 +1921,12 @@ if s:settings.use_css && !s:settings.no_doc
 	" Make the cursor show active fold columns as active areas, and empty fold
 	" columns as not interactive.
 	call append('.', ['input.FoldColumn { cursor: pointer; }',
-	      \ 'input.FoldColumn[value="'.repeat(' ', s:foldcolumn).'"] { cursor: default; }'
+	      \ 'input.FoldColumn[value="'..repeat(' ', s:foldcolumn)..'"] { cursor: default; }'
 	      \ ])
 	+2
 	if s:settings.use_input_for_pc !=# 'all'
 	  call append('.', [
-		\ 'a[data-FoldColumn-content="'.repeat(' ', s:foldcolumn).'"] { cursor: default; }'
+		\ 'a[data-FoldColumn-content="'..repeat(' ', s:foldcolumn)..'"] { cursor: default; }'
 		\ ])
 	  +1
 	end
@@ -1884,7 +1954,7 @@ endif
 if !s:settings.use_css && !s:settings.no_doc
   " For Netscape 4, set <body> attributes too, though, strictly speaking, it's
   " incorrect.
-  execute '%s:<body\([^>]*\):<body bgcolor="' . s:bgc . '" text="' . s:fgc . '"\1>\r<font face="'. s:htmlfont .'"'
+  execute '%s:<body\([^>]*\):<body bgcolor="' .. s:bgc .. '" text="' .. s:fgc .. '"\1>\r<font face="'.. s:htmlfont ..'"'
 endif
 
 " Gather attributes for all other classes. Do diff first so that normal
@@ -1935,7 +2005,7 @@ let @/ = s:old_search
 let &more = s:old_more
 
 " switch to original window to restore those settings
-exe s:orgwin . "wincmd w"
+exe s:orgwin .. "wincmd w"
 
 if !s:settings.expand_tabs
   let &l:isprint = s:old_isprint
@@ -1945,7 +2015,7 @@ let &l:et = s:old_et
 let &l:scrollbind = s:old_bind
 
 " and back to the new window again to end there
-exe s:newwin . "wincmd w"
+exe s:newwin .. "wincmd w"
 
 let &l:stl = s:newwin_stl
 exec 'resize' s:old_winheight
@@ -1982,10 +2052,13 @@ if !v:profiling
     delfunc s:progressbar.incr
     unlet s:pgb s:progressbar
   endif
+
+  delfunc s:Add_diff_fill
 endif
 
-unlet! s:new_lnum s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace
+unlet! s:new_lnum s:diffattr s:difffillchar s:foldfillchar s:HtmlSpace s:diffstyle
 unlet! s:LeadingSpace s:HtmlEndline s:firstfold s:numcol s:foldcolumn
+unlet! s:wrapperfunc_lines s:build_fun_lines
 unlet s:foldstack s:allfolds s:foldId s:settings
 
 let &cpo = s:cpo_sav
-- 
cgit 


From 8afb3a49c0762eb60368aee0314e6de261daa6ef Mon Sep 17 00:00:00 2001
From: glepnir <glephunter@gmail.com>
Date: Thu, 7 Sep 2023 18:42:38 +0800
Subject: fix(highlight): add create param in nvim_get_hl

---
 runtime/doc/api.txt                   | 2 ++
 runtime/lua/vim/_meta/api.lua         | 2 ++
 runtime/lua/vim/_meta/api_keysets.lua | 1 +
 3 files changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index e68aafe051..7dd760b6a5 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -966,6 +966,8 @@ nvim_get_hl({ns_id}, {*opts})                                  *nvim_get_hl()*
                  • id: (integer) Get a highlight definition by id.
                  • link: (boolean, default true) Show linked group name
                    instead of effective definition |:hi-link|.
+                 • create: (boolean, default true) When highlight group
+                   doesn't exist create it.
 
     Return: ~
         Highlight groups as a map from group name to a highlight definition
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index dd67fdb38b..c46b604b90 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1193,6 +1193,8 @@ function vim.api.nvim_get_current_win() end
 ---              • id: (integer) Get a highlight definition by id.
 ---              • link: (boolean, default true) Show linked group name
 ---                instead of effective definition `:hi-link`.
+---              • create: (boolean, default true) When highlight group
+---                doesn't exist create it.
 --- @return table<string,any>
 function vim.api.nvim_get_hl(ns_id, opts) end
 
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index 08c29ebe7a..8f36edba77 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -126,6 +126,7 @@ error('Cannot require a meta file')
 --- @field id? integer
 --- @field name? string
 --- @field link? boolean
+--- @field create? boolean
 
 --- @class vim.api.keyset.highlight
 --- @field bold? boolean
-- 
cgit 


From b9d9cd77421a7906d6e0a968a3c0ddd86e9923fe Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 9 Sep 2023 17:47:28 +0800
Subject: vim-patch:partial:9.0.1886: Various Typos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:  Various Typos
Solution: Fix Typos

This is a collection of typo related commits.

closes: vim/vim#12753
closes: vim/vim#13016

https://github.com/vim/vim/commit/ee17b6f70d382ec6c5d8d27b56c4e84106ac8c55

Co-authored-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Adri Verhoef <a3@a3.xs4all.nl>
Co-authored-by: Viktor Szépe <viktor@szepe.net>
Co-authored-by: nuid64 <lvkuzvesov@proton.me>
Co-authored-by: Meng Xiangzhuo <aumo@foxmail.com>
Co-authored-by: Dominique Pellé <dominique.pelle@gmail.com>
---
 runtime/doc/insert.txt   | 2 +-
 runtime/doc/windows.txt  | 2 +-
 runtime/ftplugin/zig.vim | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 7571551130..0fa5ffd598 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -119,7 +119,7 @@ CTRL-R {register}				*i_CTRL-R*
 			'/'	the last search pattern
 			':'	the last command-line
 			'.'	the last inserted text
-                                                       *i_CTRL-R_-*
+							*i_CTRL-R_-*
 			'-'	the last small (less than a line) delete
 				register. This is repeatable using |.| since
 				it remembers the register to put instead of
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 842542bdc3..e0c0772f18 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -169,7 +169,7 @@ CTRL-W v						*CTRL-W_v*
 		it doesn't!
 
 CTRL-W n						*CTRL-W_n*
-CTRL-W CTRL_N						*CTRL-W_CTRL-N*
+CTRL-W CTRL-N						*CTRL-W_CTRL-N*
 :[N]new [++opt] [+cmd]					*:new*
 		Create a new window and start editing an empty file in it.
 		Make new window N high (default is to use half the existing
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index 2a081980cc..cfd7102b8d 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -39,7 +39,7 @@ endif
 
 let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
 
-" Safety check: don't execute zip from current directory
+" Safety check: don't execute zig from current directory
 if !exists('g:zig_std_dir') && exists('*json_decode') &&
     \  executable('zig') && get(g:, 'zig_exec', get(g:, 'plugin_exec', 0))
     \ && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd
-- 
cgit 


From 5e3cf9fb4bc7f236c858f609ca83c57fb1779ab0 Mon Sep 17 00:00:00 2001
From: Grace Petryk <gracepetryk99@gmail.com>
Date: Sun, 10 Sep 2023 01:02:23 -0700
Subject: feat(lsp): improve control over placement of floating windows
 (#24494)

---
 runtime/doc/lsp.txt              | 18 ++++++++++++++----
 runtime/doc/news.txt             |  2 ++
 runtime/lua/vim/lsp/handlers.lua |  4 ++--
 runtime/lua/vim/lsp/util.lua     | 24 ++++++++++++++++++++++--
 4 files changed, 40 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index d2d7e9faac..1e57b85153 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1580,7 +1580,8 @@ hover({_}, {result}, {ctx}, {config})               *vim.lsp.handlers.hover()*
       • {config}  (table) Configuration table.
                   • border: (default=nil)
                     • Add borders to the floating window
-                    • See |nvim_open_win()|
+                    • See |vim.lsp.util.open_floating_preview()| for more
+                      options.
 
                                            *vim.lsp.handlers.signature_help()*
 signature_help({_}, {result}, {ctx}, {config})
@@ -1599,7 +1600,8 @@ signature_help({_}, {result}, {ctx}, {config})
       • {config}  (table) Configuration table.
                   • border: (default=nil)
                     • Add borders to the floating window
-                    • See |nvim_open_win()|
+                    • See |vim.lsp.util.open_floating_preview()| for more
+                      options
 
 
 ==============================================================================
@@ -1791,6 +1793,13 @@ make_floating_popup_options({width}, {height}, {opts})
                   • focusable (string or table) override `focusable`
                   • zindex (string or table) override `zindex`, defaults to 50
                   • relative ("mouse"|"cursor") defaults to "cursor"
+                  • anchor_bias ("auto"|"above"|"below") defaults to "auto"
+                    • "auto": place window based on which side of the cursor
+                      has more lines
+                    • "above": place the window above the cursor unless there
+                      are not enough lines to display the full window height.
+                    • "below": place the window below the cursor unless there
+                      are not enough lines to display the full window height.
 
     Return: ~
         (table) Options
@@ -1892,8 +1901,9 @@ open_floating_preview({contents}, {syntax}, {opts})
     Parameters: ~
       • {contents}  (table) of lines to show in window
       • {syntax}    (string) of syntax to set for opened buffer
-      • {opts}      (table) with optional fields (additional keys are passed
-                    on to |nvim_open_win()|)
+      • {opts}      (table) with optional fields (additional keys are filtered
+                    with |vim.lsp.util.make_floating_popup_options()| before
+                    they are passed on to |nvim_open_win()|)
                     • height: (integer) height of floating window
                     • width: (integer) width of floating window
                     • wrap: (boolean, default true) wrap long lines
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 972f37f0e9..cd977a8b5f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -120,6 +120,8 @@ The following new APIs and features were added.
     indicator to see if a server supports a feature. Instead use
     `client.supports_method(<method>)`. It considers both the dynamic
     capabilities and static `server_capabilities`.
+  • Added a new `anchor_bias` option to |lsp-handlers| to aid in positioning of
+    floating windows.
 
 • Treesitter
   • Bundled parsers and queries (highlight, folds) for Markdown, Python, and
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index a6b70ac911..81d4d6cceb 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -355,7 +355,7 @@ end
 ---@param config table Configuration table.
 ---     - border:     (default=nil)
 ---         - Add borders to the floating window
----         - See |nvim_open_win()|
+---         - See |vim.lsp.util.open_floating_preview()| for more options.
 function M.hover(_, result, ctx, config)
   config = config or {}
   config.focus_id = ctx.method
@@ -442,7 +442,7 @@ M[ms.textDocument_implementation] = location_handler
 ---@param config table Configuration table.
 ---     - border:     (default=nil)
 ---         - Add borders to the floating window
----         - See |nvim_open_win()|
+---         - See |vim.lsp.util.open_floating_preview()| for more options
 function M.signature_help(_, result, ctx, config)
   config = config or {}
   config.focus_id = ctx.method
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index a6d17afa1b..e76fd15612 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1087,6 +1087,12 @@ end
 ---        - focusable (string or table) override `focusable`
 ---        - zindex (string or table) override `zindex`, defaults to 50
 ---        - relative ("mouse"|"cursor") defaults to "cursor"
+---        - anchor_bias ("auto"|"above"|"below") defaults to "auto"
+---          - "auto": place window based on which side of the cursor has more lines
+---          - "above": place the window above the cursor unless there are not enough lines
+---            to display the full window height.
+---          - "below": place the window below the cursor unless there are not enough lines
+---            to display the full window height.
 ---@return table Options
 function M.make_floating_popup_options(width, height, opts)
   validate({
@@ -1105,7 +1111,20 @@ function M.make_floating_popup_options(width, height, opts)
     or vim.fn.winline() - 1
   local lines_below = vim.fn.winheight(0) - lines_above
 
-  if lines_above < lines_below then
+  local anchor_bias = opts.anchor_bias or 'auto'
+
+  local anchor_below
+
+  if anchor_bias == 'below' then
+    anchor_below = (lines_below > lines_above) or (height <= lines_below)
+  elseif anchor_bias == 'above' then
+    local anchor_above = (lines_above > lines_below) or (height <= lines_above)
+    anchor_below = not anchor_above
+  else
+    anchor_below = lines_below > lines_above
+  end
+
+  if anchor_below then
     anchor = anchor .. 'N'
     height = math.min(lines_below, height)
     row = 1
@@ -1635,7 +1654,8 @@ end
 ---
 ---@param contents table of lines to show in window
 ---@param syntax string of syntax to set for opened buffer
----@param opts table with optional fields (additional keys are passed on to |nvim_open_win()|)
+---@param opts table with optional fields (additional keys are filtered with |vim.lsp.util.make_floating_popup_options()|
+---                  before they are passed on to |nvim_open_win()|)
 ---             - height: (integer) height of floating window
 ---             - width: (integer) width of floating window
 ---             - wrap: (boolean, default true) wrap long lines
-- 
cgit 


From 25e51d393a420765d5efd44c1b4be823a5cf280a Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Sat, 9 Sep 2023 23:45:06 +0200
Subject: build(lua): vendor coxpcall

Do not require luarocks on PUC lua CI just because of this single lua file
---
 runtime/lua/coxpcall.lua | 108 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 runtime/lua/coxpcall.lua

(limited to 'runtime')

diff --git a/runtime/lua/coxpcall.lua b/runtime/lua/coxpcall.lua
new file mode 100644
index 0000000000..6b179f1ef0
--- /dev/null
+++ b/runtime/lua/coxpcall.lua
@@ -0,0 +1,108 @@
+-------------------------------------------------------------------------------
+-- Coroutine safe xpcall and pcall versions
+--
+-- Encapsulates the protected calls with a coroutine based loop, so errors can
+-- be dealed without the usual Lua 5.x pcall/xpcall issues with coroutines
+-- yielding inside the call to pcall or xpcall.
+--
+-- Authors: Roberto Ierusalimschy and Andre Carregal
+-- Contributors: Thomas Harning Jr., Ignacio Burgueño, Fabio Mascarenhas
+--
+-- Copyright 2005 - Kepler Project
+--
+-- $Id: coxpcall.lua,v 1.13 2008/05/19 19:20:02 mascarenhas Exp $
+-------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------
+-- Checks if (x)pcall function is coroutine safe
+-------------------------------------------------------------------------------
+local function isCoroutineSafe(func)
+    local co = coroutine.create(function()
+        return func(coroutine.yield, function() end)
+    end)
+
+    coroutine.resume(co)
+    return coroutine.resume(co)
+end
+
+-- No need to do anything if pcall and xpcall are already safe.
+if isCoroutineSafe(pcall) and isCoroutineSafe(xpcall) then
+    copcall = pcall
+    coxpcall = xpcall
+    return { pcall = pcall, xpcall = xpcall, running = coroutine.running }
+end
+
+-------------------------------------------------------------------------------
+-- Implements xpcall with coroutines
+-------------------------------------------------------------------------------
+local performResume, handleReturnValue
+local oldpcall, oldxpcall = pcall, xpcall
+local pack = table.pack or function(...) return {n = select("#", ...), ...} end
+local unpack = table.unpack or unpack
+local running = coroutine.running
+local coromap = setmetatable({}, { __mode = "k" })
+
+function handleReturnValue(err, co, status, ...)
+    if not status then
+        return false, err(debug.traceback(co, (...)), ...)
+    end
+    if coroutine.status(co) == 'suspended' then
+        return performResume(err, co, coroutine.yield(...))
+    else
+        return true, ...
+    end
+end
+
+function performResume(err, co, ...)
+    return handleReturnValue(err, co, coroutine.resume(co, ...))
+end
+
+local function id(trace, ...)
+    return trace
+end
+
+function coxpcall(f, err, ...)
+    local current = running()
+    if not current then
+        if err == id then
+            return oldpcall(f, ...)
+        else
+            if select("#", ...) > 0 then
+                local oldf, params = f, pack(...)
+                f = function() return oldf(unpack(params, 1, params.n)) end
+            end
+            return oldxpcall(f, err)
+        end
+    else
+        local res, co = oldpcall(coroutine.create, f)
+        if not res then
+            local newf = function(...) return f(...) end
+            co = coroutine.create(newf)
+        end
+        coromap[co] = current
+        return performResume(err, co, ...)
+    end
+end
+
+local function corunning(coro)
+  if coro ~= nil then
+    assert(type(coro)=="thread", "Bad argument; expected thread, got: "..type(coro))
+  else
+    coro = running()
+  end
+  while coromap[coro] do
+    coro = coromap[coro]
+  end
+  if coro == "mainthread" then return nil end
+  return coro
+end
+
+-------------------------------------------------------------------------------
+-- Implements pcall with coroutines
+-------------------------------------------------------------------------------
+
+function copcall(f, ...)
+    return coxpcall(f, id, ...)
+end
+
+return { pcall = copcall, xpcall = coxpcall, running = corunning }
-- 
cgit 


From 1027b2881aa0151f7c56a6a8c6b08da6c1525f50 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 9 Sep 2023 14:45:12 +0200
Subject: vim-patch:733bbcde776e

runtime(nasm): updated syntax file

https://github.com/vim/vim/commit/733bbcde776e857b45bf4c713a3c9203ac728040

Co-authored-by: Andrii Sokolov <andriy145@gmail.com>
---
 runtime/syntax/nasm.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim
index 0eb82fad10..e1dfc1db12 100644
--- a/runtime/syntax/nasm.vim
+++ b/runtime/syntax/nasm.vim
@@ -8,7 +8,7 @@
 " 	Peter Stanhope <dev.rptr@gmail.com> (Add missing 64-bit mode registers)
 " 	Frédéric Hamel <rederic.hamel123@gmail.com> (F16c support, partial AVX
 " 						     support, other)
-" Last Change:	2022 May 3
+" Last Change:	2023 Sep 7
 " NASM Home:	http://www.nasm.us/
 
 
@@ -250,12 +250,12 @@ syn match   nasmSegRegister	"\<[C-GS]S\>"
 syn match   nasmSpcRegister	"\<E\=IP\>"
 syn match   nasmFpuRegister	"\<ST\o\>"
 syn match   nasmMmxRegister	"\<MM\o\>"
-syn match   nasmSseRegister	"\<XMM\o\>"
+syn match   nasmAvxRegister	"\<[XYZ]MM\d\{1,2}\>"
 syn match   nasmCtrlRegister	"\<CR\o\>"
 syn match   nasmDebugRegister	"\<DR\o\>"
 syn match   nasmTestRegister	"\<TR\o\>"
 syn match   nasmRegisterError	"\<\(CR[15-9]\|DR[4-58-9]\|TR[0-28-9]\)\>"
-syn match   nasmRegisterError	"\<X\=MM[8-9]\>"
+syn match   nasmRegisterError	"\<[XYZ]MM\(3[2-9]\|[04-9]\d\)\>"
 syn match   nasmRegisterError	"\<ST\((\d)\|[8-9]\>\)"
 syn match   nasmRegisterError	"\<E\([A-D][HL]\|[C-GS]S\)\>"
 "  Memory reference operand (address):
-- 
cgit 


From d22172f36bbe147f3aa6b76a1c43ae445f481c2e Mon Sep 17 00:00:00 2001
From: Sergey Slipchenko <faergeek@gmail.com>
Date: Mon, 11 Sep 2023 08:16:03 +0400
Subject: fix(api): more intuitive cursor updates in nvim_buf_set_text

Fixes #22526
---
 runtime/doc/api.txt           |  3 +++
 runtime/lua/vim/_meta/api.lua |  1 +
 runtime/lua/vim/lsp/util.lua  | 42 ------------------------------------------
 3 files changed, 4 insertions(+), 42 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 7dd760b6a5..c0bea52513 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2438,6 +2438,8 @@ nvim_buf_set_text({buffer}, {start_row}, {start_col}, {end_row}, {end_col},
     Prefer |nvim_buf_set_lines()| if you are only adding or deleting entire
     lines.
 
+    Prefer |nvim_put()| if you want to insert text at the cursor position.
+
     Attributes: ~
         not allowed when |textlock| is active
 
@@ -2451,6 +2453,7 @@ nvim_buf_set_text({buffer}, {start_row}, {start_col}, {end_row}, {end_col},
 
     See also: ~
       • |nvim_buf_set_lines()|
+      • |nvim_put()|
 
 nvim_buf_set_var({buffer}, {name}, {value})               *nvim_buf_set_var()*
     Sets a buffer-scoped (b:) variable
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index c46b604b90..6c4e6c04d9 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -621,6 +621,7 @@ function vim.api.nvim_buf_set_option(buffer, name, value) end
 --- range, use `replacement = {}`.
 --- Prefer `nvim_buf_set_lines()` if you are only adding or deleting entire
 --- lines.
+--- Prefer `nvim_put()` if you want to insert text at the cursor position.
 ---
 --- @param buffer integer Buffer handle, or 0 for current buffer
 --- @param start_row integer First line index
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index e76fd15612..54721865b7 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -454,23 +454,6 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
     end
   end)
 
-  -- Some LSP servers are depending on the VSCode behavior.
-  -- The VSCode will re-locate the cursor position after applying TextEdit so we also do it.
-  local is_current_buf = api.nvim_get_current_buf() == bufnr or bufnr == 0
-  local cursor = (function()
-    if not is_current_buf then
-      return {
-        row = -1,
-        col = -1,
-      }
-    end
-    local cursor = api.nvim_win_get_cursor(0)
-    return {
-      row = cursor[1] - 1,
-      col = cursor[2],
-    }
-  end)()
-
   -- save and restore local marks since they get deleted by nvim_buf_set_lines
   local marks = {}
   for _, m in pairs(vim.fn.getmarklist(bufnr or vim.api.nvim_get_current_buf())) do
@@ -480,7 +463,6 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
   end
 
   -- Apply text edits.
-  local is_cursor_fixed = false
   local has_eol_text_edit = false
   for _, text_edit in ipairs(text_edits) do
     -- Normalize line ending
@@ -527,20 +509,6 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
       e.end_col = math.min(last_line_len, e.end_col)
 
       api.nvim_buf_set_text(bufnr, e.start_row, e.start_col, e.end_row, e.end_col, e.text)
-
-      -- Fix cursor position.
-      local row_count = (e.end_row - e.start_row) + 1
-      if e.end_row < cursor.row then
-        cursor.row = cursor.row + (#e.text - row_count)
-        is_cursor_fixed = true
-      elseif e.end_row == cursor.row and e.end_col <= cursor.col then
-        cursor.row = cursor.row + (#e.text - row_count)
-        cursor.col = #e.text[#e.text] + (cursor.col - e.end_col)
-        if #e.text == 1 then
-          cursor.col = cursor.col + e.start_col
-        end
-        is_cursor_fixed = true
-      end
     end
   end
 
@@ -560,16 +528,6 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding)
     end
   end
 
-  -- Apply fixed cursor position.
-  if is_cursor_fixed then
-    local is_valid_cursor = true
-    is_valid_cursor = is_valid_cursor and cursor.row < max
-    is_valid_cursor = is_valid_cursor and cursor.col <= #(get_line(bufnr, cursor.row) or '')
-    if is_valid_cursor then
-      api.nvim_win_set_cursor(0, { cursor.row + 1, cursor.col })
-    end
-  end
-
   -- Remove final line if needed
   local fix_eol = has_eol_text_edit
   fix_eol = fix_eol and (vim.bo[bufnr].eol or (vim.bo[bufnr].fixeol and not vim.bo[bufnr].binary))
-- 
cgit 


From ba1db8751cbeac846423e1f97014d628aeb1d7a6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 10 Sep 2023 18:57:51 +0200
Subject: vim-patch:066103307534

runtime(scala): Fix Scala highlighting string literal as type param (vim/vim#13070)

Since https://docs.scala-lang.org/sips/42.type.html which is implemented
in Scala 2.13 and in Scala 3 it possible to use string literals as
singleton types. So code like
```
someFunc["abc"]
```
is valid. Currently this code is not hightlighted correctly and worse if
there is an unclosed `(` in the string it breaks the formating in the
rest of the file.

I also submitted this patch to the mentioned project for this runtime
file: https://github.com/derekwyatt/vim-scala/pull/173 But there are no
commits there over the last 2 years and no response in the week since I
created it. Also the last change to the Scala syntax file:
https://github.com/vim/vim/pull/9594 is yet to be backported to that
repo. Therefore I am opening this PR as well to get some feedback on how
to proceed to get this fixed.

https://github.com/vim/vim/commit/066103307534f81de08a092aac3a15e864a5a25f

Co-authored-by: Emil Ejbyfeldt <eejbyfeldt@liveintent.com>
---
 runtime/syntax/scala.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/scala.vim b/runtime/syntax/scala.vim
index c08e60e55a..cc098ce017 100644
--- a/runtime/syntax/scala.vim
+++ b/runtime/syntax/scala.vim
@@ -180,7 +180,7 @@ hi def link scalaNumber Number
 
 syn region scalaRoundBrackets start="(" end=")" skipwhite contained contains=scalaTypeDeclaration,scalaSquareBrackets,scalaRoundBrackets
 
-syn region scalaSquareBrackets matchgroup=scalaSquareBracketsBrackets start="\[" end="\]" skipwhite nextgroup=scalaTypeExtension contains=scalaTypeDeclaration,scalaSquareBrackets,scalaTypeOperator,scalaTypeAnnotationParameter
+syn region scalaSquareBrackets matchgroup=scalaSquareBracketsBrackets start="\[" end="\]" skipwhite nextgroup=scalaTypeExtension contains=scalaTypeDeclaration,scalaSquareBrackets,scalaTypeOperator,scalaTypeAnnotationParameter,scalaString
 syn match scalaTypeOperator /[-+=:<>]\+/ contained
 syn match scalaTypeAnnotationParameter /@\<[`_A-Za-z0-9$]\+\>/ contained
 hi def link scalaSquareBracketsBrackets Type
-- 
cgit 


From 60a39ada1b2a1052ccc22294e0542298a8198f1f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 10 Sep 2023 18:58:41 +0200
Subject: vim-patch:e7833e73471a

runtime(masm): add support for AVX-2 and AVX-512 (vim/vim#13061)

https://github.com/vim/vim/commit/e7833e73471a110c7c38c80935e1b840f254a3da

Co-authored-by: Wu Yongwei <wuyongwei@gmail.com>
---
 runtime/syntax/masm.vim | 187 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 184 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/masm.vim b/runtime/syntax/masm.vim
index 3be0fd45d1..85e457106d 100644
--- a/runtime/syntax/masm.vim
+++ b/runtime/syntax/masm.vim
@@ -2,7 +2,7 @@
 " Language:	Microsoft Macro Assembler (80x86)
 " Orig Author:	Rob Brady <robb@datatone.com>
 " Maintainer:	Wu Yongwei <wuyongwei@gmail.com>
-" Last Change:	2022-04-24 20:07:04 +0800
+" Last Change:	2023-09-09 20:48:26 +0800
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -194,8 +194,8 @@ syn keyword masmRegister	R8W R9W R10W R11W R12W R13W R14W R15W
 syn keyword masmRegister	R8B R9B R10B R11B R12B R13B R14B R15B
 
 " SSE/AVX registers
-syn match   masmRegister	"\(X\|Y\)MM[0-9]\>"
-syn match   masmRegister	"\(X\|Y\)MM1[0-5]\>"
+syn match   masmRegister	"\(X\|Y\|Z\)MM[12]\?[0-9]\>"
+syn match   masmRegister	"\(X\|Y\|Z\)MM3[01]\>"
 
 " Instruction prefixes
 syn keyword masmOpcode		LOCK REP REPE REPNE REPNZ REPZ
@@ -338,11 +338,192 @@ syn keyword masmOpcode		VINSERTF128 VEXTRACTF128 VMASKMOVPS VMASKMOVPD
 syn keyword masmOpcode		VPERMILPS VPERMILPD VPERM2F128
 syn keyword masmOpcode		VZEROALL VZEROUPPER
 
+" AVX-2 (Haswell and later)
+syn keyword masmOpcode		VPBROADCASTB VPBROADCASTW VPBROADCASTD
+syn keyword masmOpcode		VPBROADCASTQ VBROADCASTI128
+syn keyword masmOpcode		VINSERTI128 VEXTRACTI128
+syn keyword masmOpcode		VGATHERDPD VGATHERQPD VGATHERDPS VGATHERQPS
+syn keyword masmOpcode		VPGATHERDD VPGATHERDQ VPGATHERQD VPGATHERQQ
+syn keyword masmOpcode		VPMASKMOVD VPMASKMOVQ
+syn keyword masmOpcode		PERMPS VPERMD VPERMPD VPERMQ VPERM2I128
+syn keyword masmOpcode		VPBLENDD VPSLLVD VPSLLVQ VPSRLVD VPSRLVQ
+syn keyword masmOpcode		VPSRAVD
+
+" AVX-512 (Knights Landing/Skylake-X and later)
+syn keyword masmOpcode		KAND KANDN KMOV KUNPCK KNOT KOR KORTEST
+syn keyword masmOpcode		KSHIFTL KSHIFTR KXNOR KXOR KADD KTEST
+syn keyword masmOpcode		VBLENDMPD VBLENDMPS
+syn keyword masmOpcode		VPBLENDMD VPBLENDMQ VPBLENDMB VPBLENDMW
+syn keyword masmOpcode		VPCMPD VPCMPUD VPCMPQ VPCMPUQ
+syn keyword masmOpcode		VPCMPB VPCMPUB VPCMPW VPCMPUW
+syn keyword masmOpcode		VPTESTMD VPTESTMQ VPTESTNMD VPTESTNMQ
+syn keyword masmOpcode		VPTESTMB VPTESTMW VPTESTNMB VPTESTNMW
+syn keyword masmOpcode		VCOMPRESSPD VCOMPRESSPS VPCOMPRESSD VPCOMPRESSQ
+syn keyword masmOpcode		VEXPANDPD VEXPANDPS VPEXPANDD VPEXPANDQ
+syn keyword masmOpcode		VPERMB VPERMW VPERMT2B VPERMT2W VPERMI2PD
+syn keyword masmOpcode		VPERMI2PS VPERMI2D VPERMI2Q VPERMI2B VPERMI2W
+syn keyword masmOpcode		VPERMT2PS VPERMT2PD VPERMT2D VPERMT2Q
+syn keyword masmOpcode		VSHUFF32x4 VSHUFF64x2 VSHUFI32x4 VSHUFI64x2
+syn keyword masmOpcode		VPMULTISHIFTQB VPTERNLOGD VPTERNLOGQ
+syn keyword masmOpcode		VPMOVQD VPMOVSQD VPMOVUSQD VPMOVQW VPMOVSQW
+syn keyword masmOpcode		VPMOVUSQW VPMOVQB VPMOVSQB VPMOVUSQB VPMOVDW
+syn keyword masmOpcode		VPMOVSDW VPMOVUSDW VPMOVDB VPMOVSDB VPMOVUSDB
+syn keyword masmOpcode		VPMOVWB VPMOVSWB VPMOVUSWB
+syn keyword masmOpcode		VCVTPS2UDQ VCVTPD2UDQ VCVTTPS2UDQ VCVTTPD2UDQ
+syn keyword masmOpcode		VCVTSS2USI VCVTSD2USI VCVTTSS2USI VCVTTSD2USI
+syn keyword masmOpcode		VCVTPS2QQ VCVTPD2QQ VCVTPS2UQQ VCVTPD2UQQ
+syn keyword masmOpcode		VCVTTPS2QQ VCVTTPD2QQ VCVTTPS2UQQ VCVTTPD2UQQ
+syn keyword masmOpcode		VCVTUDQ2PS VCVTUDQ2PD VCVTUSI2PS VCVTUSI2PD
+syn keyword masmOpcode		VCVTUSI2SD VCVTUSI2SS VCVTUQQ2PS VCVTUQQ2PD
+syn keyword masmOpcode		VCVTQQ2PD VCVTQQ2PS VGETEXPPD
+syn keyword masmOpcode		VGETEXPPS VGETEXPSD VGETEXPSS
+syn keyword masmOpcode		VGETMANTPD VGETMANTPS VGETMANTSD VGETMANTSS
+syn keyword masmOpcode		VFIXUPIMMPD VFIXUPIMMPS VFIXUPIMMSD VFIXUPIMMSS
+syn keyword masmOpcode		VRCP14PD VRCP14PS VRCP14SD VRCP14SS
+syn keyword masmOpcode		VRNDSCALEPS VRNDSCALEPD VRNDSCALESS VRNDSCALESD
+syn keyword masmOpcode		VRSQRT14PD VRSQRT14PS VRSQRT14SD VRSQRT14SS
+syn keyword masmOpcode		VSCALEFPS VSCALEFPD VSCALEFSS VSCALEFSD
+syn keyword masmOpcode		VBROADCASTI32X2 VBROADCASTI32X4 VBROADCASTI32X8
+syn keyword masmOpcode		VBROADCASTI64X2 VBROADCASTI64X4
+syn keyword masmOpcode		VALIGND VALIGNQ VDBPSADBW VPABSQ VPMAXSQ
+syn keyword masmOpcode		VPMAXUQ VPMINSQ VPMINUQ VPROLD VPROLVD VPROLQ
+syn keyword masmOpcode		VPROLVQ VPRORD VPRORVD VPRORQ VPRORVQ
+syn keyword masmOpcode		VPSCATTERDD VPSCATTERDQ VPSCATTERQD VPSCATTERQQ
+syn keyword masmOpcode		VSCATTERDPS VSCATTERDPD VSCATTERQPS VSCATTERQPD
+syn keyword masmOpcode		VPCONFLICTD VPCONFLICTQ VPLZCNTD VPLZCNTQ
+syn keyword masmOpcode		VPBROADCASTMB2Q VPBROADCASTMW2D
+syn keyword masmOpcode		VEXP2PD VEXP2PS
+syn keyword masmOpcode		VRCP28PD VRCP28PS VRCP28SD VRCP28SS
+syn keyword masmOpcode		VRSQRT28PD VRSQRT28PS VRSQRT28SD VRSQRT28SS
+syn keyword masmOpcode		VGATHERPF0DPS VGATHERPF0QPS VGATHERPF0DPD
+syn keyword masmOpcode		VGATHERPF0QPD VGATHERPF1DPS VGATHERPF1QPS
+syn keyword masmOpcode		VGATHERPF1DPD VGATHERPF1QPD VSCATTERPF0DPS
+syn keyword masmOpcode		VSCATTERPF0QPS VSCATTERPF0DPD VSCATTERPF0QPD
+syn keyword masmOpcode		VSCATTERPF1DPS VSCATTERPF1QPS VSCATTERPF1DPD
+syn keyword masmOpcode		VSCATTERPF1QPD
+syn keyword masmOpcode		V4FMADDPS V4FMADDSS V4FNMADDPS V4FNMADDSS
+syn keyword masmOpcode		VP4DPWSSD VP4DPWSSDS
+syn keyword masmOpcode		VFPCLASSPS VFPCLASSPD VFPCLASSSS VFPCLASSSD
+syn keyword masmOpcode		VRANGEPS VRANGEPD VRANGESS VRANGESD
+syn keyword masmOpcode		VREDUCEPS VREDUCEPD VREDUCESS VREDUCESD
+syn keyword masmOpcode		VPMOVM2D VPMOVM2Q VPMOVM2B VPMOVM2W VPMOVD2M
+syn keyword masmOpcode		VPMOVQ2M VPMOVB2M VPMOVW2M VPMULLQ
+syn keyword masmOpcode		VPCOMPRESSB VPCOMPRESSW VPEXPANDB VPEXPANDW
+syn keyword masmOpcode		VPSHLD VPSHLDV VPSHRD VPSHRDV
+syn keyword masmOpcode		VPDPBUSD VPDPBUSDS VPDPWSSD VPDPWSSDS
+syn keyword masmOpcode		VPMADD52LUQ VPMADD52HUQ
+syn keyword masmOpcode		VPOPCNTD VPOPCNTQ VPOPCNTB VPOPCNTW
+syn keyword masmOpcode		VPSHUFBITQMB VP2INTERSECTD VP2INTERSECTQ
+syn keyword masmOpcode		VGF2P8AFFINEINVQB VGF2P8AFFINEQB
+syn keyword masmOpcode		VGF2P8MULB VPCLMULQDQ
+syn keyword masmOpcode		VAESDEC VAESDECLAST VAESENC VAESENCLAST
+syn keyword masmOpcode		VCVTNE2PS2BF16 VCVTNEPS2BF16 VDPBF16PS
+syn keyword masmOpcode		VADDPH VADDSH VSUBPH VSUBSH VMULPH VMULSH
+syn keyword masmOpcode		VDIVPH VDIVSH VSQRTPH VSQRTSH
+syn keyword masmOpcode		VFMADD132PH VFMADD213PH VFMADD231PH
+syn keyword masmOpcode		VFMADD132SH VFMADD213SH VFMADD231SH
+syn keyword masmOpcode		VFNMADD132PH VFNMADD213PH VFNMADD231PH
+syn keyword masmOpcode		VFNMADD132SH VFNMADD213SH VFNMADD231SH
+syn keyword masmOpcode		VFMSUB132PH VFMSUB213PH VFMSUB231PH
+syn keyword masmOpcode		VFMSUB132SH VFMSUB213SH VFMSUB231SH
+syn keyword masmOpcode		VFNMSUB132PH VFNMSUB213PH VFNMSUB231PH
+syn keyword masmOpcode		VFNMSUB132SH VFNMSUB213SH VFNMSUB231SH
+syn keyword masmOpcode		VFMADDSUB132PH VFMADDSUB213PH VFMADDSUB231PH
+syn keyword masmOpcode		VFMSUBADD132PH VFMSUBADD213PH VFMSUBADD231PH
+syn keyword masmOpcode		VREDUCEPH VREDUCESH VRNDSCALEPH VRNDSCALESH
+syn keyword masmOpcode		VSCALEFPH VSCALEFSH VFMULCPH VFMULCSH VFCMULCPH
+syn keyword masmOpcode		VFCMULCSH VFMADDCPH VFMADDCSH VFCMADDCPH
+syn keyword masmOpcode		VFCMADDCSH VRCPPH VRCPSH VRSQRTPH VRSQRTSH
+syn keyword masmOpcode		VCMPPH VCMPSH VCOMISH VUCOMISH VMAXPH VMAXSH
+syn keyword masmOpcode		VMINPH VMINSH VFPCLASSPH VFPCLASSSH
+syn keyword masmOpcode		VCVTW2PH VCVTUW2PH VCVTDQ2PH VCVTUDQ2PH
+syn keyword masmOpcode		VCVTQQ2PH VCVTUQQ2PH VCVTPS2PHX VCVTPD2PH
+syn keyword masmOpcode		VCVTSI2SH VCVTUSI2SH VCVTSS2SH VCVTSD2SH
+syn keyword masmOpcode		VCVTPH2W VCVTTPH2W VCVTPH2UW VCVTTPH2UW
+syn keyword masmOpcode		VCVTPH2DQ VCVTTPH2DQ VCVTPH2UDQ VCVTTPH2UDQ
+syn keyword masmOpcode		VCVTPH2QQ VCVTTPH2QQ VCVTPH2UQQ VCVTTPH2UQQ
+syn keyword masmOpcode		VCVTPH2PSX VCVTPH2PD VCVTSH2SI VCVTTSH2SI
+syn keyword masmOpcode		VCVTSH2USI VCVTTSH2USI VCVTSH2SS VCVTSH2SD
+syn keyword masmOpcode		VGETEXPPH VGETEXPSH VGETMANTPH VGETMANTSH
+syn keyword masmOpcode		VMOVSH VMOVW VADDPD VADDPS VADDSD VADDSS
+syn keyword masmOpcode		VANDPD VANDPS VANDNPD VANDNPS
+syn keyword masmOpcode		VCMPPD VCMPPS VCMPSD VCMPSS
+syn keyword masmOpcode		VCOMISD VCOMISS VDIVPD VDIVPS VDIVSD VDIVSS
+syn keyword masmOpcode		VCVTDQ2PD VCVTDQ2PS VCVTPD2DQ VCVTPD2PS
+syn keyword masmOpcode		VCVTPH2PS VCVTPS2PH VCVTPS2DQ VCVTPS2PD
+syn keyword masmOpcode		VCVTSD2SI VCVTSD2SS VCVTSI2SD VCVTSI2SS
+syn keyword masmOpcode		VCVTSS2SD VCVTSS2SI VCVTTPD2DQ VCVTTPS2DQ
+syn keyword masmOpcode		VCVTTSD2SI VCVTTSS2SI VMAXPD VMAXPS
+syn keyword masmOpcode		VMAXSD VMAXSS VMINPD VMINPS VMINSD VMINSS
+syn keyword masmOpcode		VMOVAPD VMOVAPS VMOVD VMOVQ VMOVDDUP
+syn keyword masmOpcode		VMOVHLPS VMOVHPD VMOVHPS VMOVLHPS VMOVLPD
+syn keyword masmOpcode		VMOVLPS VMOVNTDQA VMOVNTDQ VMOVNTPD VMOVNTPS
+syn keyword masmOpcode		VMOVSD VMOVSHDUP VMOVSLDUP VMOVSS VMOVUPD
+syn keyword masmOpcode		VMOVUPS VMOVDQA32 VMOVDQA64 VMOVDQU8
+syn keyword masmOpcode		VMOVDQU16 VMOVDQU32 VMOVDQU64 VMULPD VMULPS
+syn keyword masmOpcode		VMULSD VMULSS VORPD VORPS VSQRTPD VSQRTPS
+syn keyword masmOpcode		VSQRTSD VSQRTSS VSUBPD VSUBPS VSUBSD VSUBSS
+syn keyword masmOpcode		VUCOMISD VUCOMISS VUNPCKHPD VUNPCKHPS VUNPCKLPD
+syn keyword masmOpcode		VUNPCKLPS VXORPD VXORPS VEXTRACTPS VINSERTPS
+syn keyword masmOpcode		VPEXTRB VPEXTRW VPEXTRD VPEXTRQ VPINSRB VPINSRW
+syn keyword masmOpcode		VPINSRD VPINSRQ VPACKSSWB VPACKSSDW VPACKUSDW
+syn keyword masmOpcode		VPACKUSWB VPADDB VPADDW VPADDD VPADDQ VPADDSB
+syn keyword masmOpcode		VPADDSW VPADDUSB VPADDUSW VPANDD VPANDQ VPANDND
+syn keyword masmOpcode		VPANDNQ VPAVGB VPAVGW VPCMPEQB VPCMPEQW
+syn keyword masmOpcode		VPCMPEQD VPCMPEQQ VPCMPGTB VPCMPGTW VPCMPGTD
+syn keyword masmOpcode		VPCMPGTQ VPMAXSB VPMAXSW VPMAXSD VPMAXSQ
+syn keyword masmOpcode		VPMAXUB VPMAXUW VPMAXUD VPMAXUQ VPMINSB VPMINSW
+syn keyword masmOpcode		VPMINSD VPMINSQ VPMINUB VPMINUW VPMINUD VPMINUQ
+syn keyword masmOpcode		VPMOVSXBW VPMOVSXBD VPMOVSXBQ VPMOVSXWD
+syn keyword masmOpcode		VPMOVSXWQ VPMOVSXDQ VPMOVZXBW VPMOVZXBD
+syn keyword masmOpcode		VPMOVZXBQ VPMOVZXWD VPMOVZXWQ VPMOVZXDQ VPMULDQ
+syn keyword masmOpcode		VPMULUDQ VPMULHRSW VPMULHUW VPMULHW VPMULLD
+syn keyword masmOpcode		VPMULLQ VPMULLW VPORD VPORQ VPSUBB VPSUBW
+syn keyword masmOpcode		VPSUBD VPSUBQ VPSUBSB VPSUBSW VPSUBUSB VPSUBUSW
+syn keyword masmOpcode		VPUNPCKHBW VPUNPCKHWD VPUNPCKHDQ VPUNPCKHQDQ
+syn keyword masmOpcode		VPUNPCKLBW VPUNPCKLWD VPUNPCKLDQ VPUNPCKLQDQ
+syn keyword masmOpcode		VPXORD VPXORQ VPSADBW VPSHUFB VPSHUFHW VPSHUFLW
+syn keyword masmOpcode		VPSHUFD VPSLLDQ VPSLLW VPSLLD VPSLLQ VPSRAW
+syn keyword masmOpcode		VPSRAD VPSRAQ VPSRLDQ VPSRLW VPSRLD VPSRLQ
+syn keyword masmOpcode		VPSLLVW VPSRLVW VPSHUFPD VPSHUFPS VEXTRACTF32X4
+syn keyword masmOpcode		VEXTRACTF64X2 VEXTRACTF32X8 VEXTRACTF64X4
+syn keyword masmOpcode		VEXTRACTI32X4 VEXTRACTI64X2 VEXTRACTI32X8
+syn keyword masmOpcode		VEXTRACTI64X4 VINSERTF32x4 VINSERTF64X2
+syn keyword masmOpcode		VINSERTF32X8 VINSERTF64x4 VINSERTI32X4
+syn keyword masmOpcode		VINSERTI64X2 VINSERTI32X8 VINSERTI64X4
+syn keyword masmOpcode		VPABSB VPABSW VPABSD VPABSQ VPALIGNR
+syn keyword masmOpcode		VPMADDUBSW VPMADDWD
+syn keyword masmOpcode		VFMADD132PD VFMADD213PD VFMADD231PD
+syn keyword masmOpcode		VFMADD132PS VFMADD213PS VFMADD231PS
+syn keyword masmOpcode		VFMADD132SD VFMADD213SD VFMADD231SD
+syn keyword masmOpcode		VFMADD132SS VFMADD213SS VFMADD231SS
+syn keyword masmOpcode		VFMADDSUB132PD VFMADDSUB213PD VFMADDSUB231PD
+syn keyword masmOpcode		VFMADDSUB132PS VFMADDSUB213PS VFMADDSUB231PS
+syn keyword masmOpcode		VFMSUBADD132PD VFMSUBADD213PD VFMSUBADD231PD
+syn keyword masmOpcode		VFMSUBADD132PS VFMSUBADD213PS VFMSUBADD231PS
+syn keyword masmOpcode		VFMSUB132PD VFMSUB213PD VFMSUB231PD
+syn keyword masmOpcode		VFMSUB132PS VFMSUB213PS VFMSUB231PS
+syn keyword masmOpcode		VFMSUB132SD VFMSUB213SD VFMSUB231SD
+syn keyword masmOpcode		VFMSUB132SS VFMSUB213SS VFMSUB231SS
+syn keyword masmOpcode		VFNMADD132PD VFNMADD213PD VFNMADD231PD
+syn keyword masmOpcode		VFNMADD132PS VFNMADD213PS VFNMADD231PS
+syn keyword masmOpcode		VFNMADD132SD VFNMADD213SD VFNMADD231SD
+syn keyword masmOpcode		VFNMADD132SS VFNMADD213SS VFNMADD231SS
+syn keyword masmOpcode		VFNMSUB132PD VFNMSUB213PD VFNMSUB231PD
+syn keyword masmOpcode		VFNMSUB132PS VFNMSUB213PS VFNMSUB231PS
+syn keyword masmOpcode		VFNMSUB132SD VFNMSUB213SD VFNMSUB231SD
+syn keyword masmOpcode		VFNMSUB132SS VFNMSUB213SS VFNMSUB231SS
+syn keyword masmOpcode		VPSRAVW VPSRAVQ
+
 " Other opcodes in Pentium and later processors
 syn keyword masmOpcode		CMPXCHG8B CPUID UD2
 syn keyword masmOpcode		RSM RDMSR WRMSR RDPMC RDTSC SYSENTER SYSEXIT
 syn match   masmOpcode	   "CMOV\(P[EO]\|\(N\?\([ABGL]E\?\|[CEOPSZ]\)\)\)\>"
 
+" Not really used by MASM, but useful for viewing GCC-generated assembly code
+" in Intel syntax
+syn match masmHexadecimal	"[-+]\?0[Xx]\x*"
+syn keyword masmOpcode		MOVABS
 
 " The default highlighting
 hi def link masmLabel		PreProc
-- 
cgit 


From 60e5d0fbcc8dfb942480aa2d9e4b45f4a255d952 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 10 Sep 2023 18:59:08 +0200
Subject: vim-patch:9.0.1891: No runtime support for Mojo

Problem:  No runtime support for Mojo
Solution: Add basic filetype and syntax plugins

closes: vim/vim#13062
closes: vim/vim#13063

https://github.com/vim/vim/commit/0ce2c594d0704f27a16d2c13fce85d596cc91489

Co-authored-by: Mahmoud Abduljawad <mahmoud@masaar.com>
---
 runtime/lua/vim/filetype.lua |   2 +
 runtime/syntax/mojo.vim      | 316 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 318 insertions(+)
 create mode 100644 runtime/syntax/mojo.vim

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 0e8ecf1b07..6fb6f475bc 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -669,6 +669,8 @@ local extension = {
   m2 = 'modula2',
   mi = 'modula2',
   lm3 = 'modula3',
+  mojo = 'mojo',
+  ['🔥'] = 'mojo', -- 🙄
   ssc = 'monk',
   monk = 'monk',
   tsc = 'monk',
diff --git a/runtime/syntax/mojo.vim b/runtime/syntax/mojo.vim
new file mode 100644
index 0000000000..b7dae24a15
--- /dev/null
+++ b/runtime/syntax/mojo.vim
@@ -0,0 +1,316 @@
+" Vim syntax file
+" Language:	Mojo
+" Maintainer:	Mahmoud Abduljawad <me@mahmoudajawad.com>
+" Last Change:	2023 Sep 09
+" Credits:	Mahmoud Abduljawad <me@mahmoudajawad.com>
+"         	Neil Schemenauer <nas@python.ca>
+"		Dmitry Vasiliev
+"
+"		This is based on Vim Python highlighting
+"
+"		- introduced highlighting of doctests
+"		- updated keywords, built-ins, and exceptions
+"		- corrected regular expressions for
+"
+"		  * functions
+"		  * decorators
+"		  * strings
+"		  * escapes
+"		  * numbers
+"		  * space error
+"
+"		- corrected synchronization
+"		- more highlighting is ON by default, except
+"		- space error highlighting is OFF by default
+"
+" Optional highlighting can be controlled using these variables.
+"
+"   let mojo_no_builtin_highlight = 1
+"   let mojo_no_doctest_code_highlight = 1
+"   let mojo_no_doctest_highlight = 1
+"   let mojo_no_exception_highlight = 1
+"   let mojo_no_number_highlight = 1
+"   let mojo_space_error_highlight = 1
+"
+" All the options above can be switched on together.
+"
+"   let mojo_highlight_all = 1
+"
+" The use of Python 2 compatible syntax highlighting can be enforced.
+" The straddling code (Python 2 and 3 compatible), up to Python 3.5,
+" will be also supported.
+"
+"   let mojo_use_python2_syntax = 1
+"
+" This option will exclude all modern Python 3.6 or higher features.
+"
+
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+
+" We need nocompatible mode in order to continue lines with backslashes.
+" Original setting will be restored.
+let s:cpo_save = &cpo
+set cpo&vim
+
+if exists("mojo_no_doctest_highlight")
+  let mojo_no_doctest_code_highlight = 1
+endif
+
+if exists("mojo_highlight_all")
+  if exists("mojo_no_builtin_highlight")
+    unlet mojo_no_builtin_highlight
+  endif
+  if exists("mojo_no_doctest_code_highlight")
+    unlet mojo_no_doctest_code_highlight
+  endif
+  if exists("mojo_no_doctest_highlight")
+    unlet mojo_no_doctest_highlight
+  endif
+  if exists("mojo_no_exception_highlight")
+    unlet mojo_no_exception_highlight
+  endif
+  if exists("mojo_no_number_highlight")
+    unlet mojo_no_number_highlight
+  endif
+  let mojo_space_error_highlight = 1
+endif
+
+" These keywords are based on Python syntax highlight, and adds to it struct,
+" fn, alias, var, let
+"
+syn keyword mojoStatement	False None True
+syn keyword mojoStatement	as assert break continue del global
+syn keyword mojoStatement	lambda nonlocal pass return with yield
+syn keyword mojoStatement	class def nextgroup=mojoFunction skipwhite
+syn keyword mojoStatement	struct fn nextgroup=mojoFunction skipwhite
+syn keyword mojoStatement	alias var let
+syn keyword mojoConditional	elif else if
+syn keyword mojoRepeat		for while
+syn keyword mojoOperator	and in is not or
+syn keyword mojoException	except finally raise try
+syn keyword mojoInclude		from import
+syn keyword mojoAsync		async await
+
+" Soft keywords
+" These keywords do not mean anything unless used in the right context.
+" See https://docs.python.org/3/reference/lexical_analysis.html#soft-keywords
+" for more on this.
+syn match   mojoConditional   "^\s*\zscase\%(\s\+.*:.*$\)\@="
+syn match   mojoConditional   "^\s*\zsmatch\%(\s\+.*:\s*\%(#.*\)\=$\)\@="
+
+" Decorators
+" A dot must be allowed because of @MyClass.myfunc decorators.
+syn match   mojoDecorator	"@" display contained
+syn match   mojoDecoratorName	"@\s*\h\%(\w\|\.\)*" display contains=pythonDecorator
+
+" Python 3.5 introduced the use of the same symbol for matrix multiplication:
+" https://www.python.org/dev/peps/pep-0465/.  We now have to exclude the
+" symbol from highlighting when used in that context.
+" Single line multiplication.
+syn match   mojoMatrixMultiply
+      \ "\%(\w\|[])]\)\s*@"
+      \ contains=ALLBUT,mojoDecoratorName,mojoDecorator,mojoFunction,mojoDoctestValue
+      \ transparent
+" Multiplication continued on the next line after backslash.
+syn match   mojoMatrixMultiply
+      \ "[^\\]\\\s*\n\%(\s*\.\.\.\s\)\=\s\+@"
+      \ contains=ALLBUT,mojoDecoratorName,mojoDecorator,mojoFunction,mojoDoctestValue
+      \ transparent
+" Multiplication in a parenthesized expression over multiple lines with @ at
+" the start of each continued line; very similar to decorators and complex.
+syn match   mojoMatrixMultiply
+      \ "^\s*\%(\%(>>>\|\.\.\.\)\s\+\)\=\zs\%(\h\|\%(\h\|[[(]\).\{-}\%(\w\|[])]\)\)\s*\n\%(\s*\.\.\.\s\)\=\s\+@\%(.\{-}\n\%(\s*\.\.\.\s\)\=\s\+@\)*"
+      \ contains=ALLBUT,mojoDecoratorName,mojoDecorator,mojoFunction,mojoDoctestValue
+      \ transparent
+
+syn match   mojoFunction	"\h\w*" display contained
+
+syn match   mojoComment	"#.*$" contains=mojoTodo,@Spell
+syn keyword mojoTodo		FIXME NOTE NOTES TODO XXX contained
+
+" Triple-quoted strings can contain doctests.
+syn region  mojoString matchgroup=mojoQuotes
+      \ start=+[uU]\=\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
+      \ contains=mojoEscape,@Spell
+syn region  mojoString matchgroup=mojoTripleQuotes
+      \ start=+[uU]\=\z('''\|"""\)+ end="\z1" keepend
+      \ contains=mojoEscape,mojoSpaceError,mojoDoctest,@Spell
+syn region  mojoRawString matchgroup=mojoQuotes
+      \ start=+[uU]\=[rR]\z(['"]\)+ end="\z1" skip="\\\\\|\\\z1"
+      \ contains=@Spell
+syn region  mojoRawString matchgroup=pythonTripleQuotes
+      \ start=+[uU]\=[rR]\z('''\|"""\)+ end="\z1" keepend
+      \ contains=pythonSpaceError,mojoDoctest,@Spell
+
+syn match   mojoEscape	+\\[abfnrtv'"\\]+ contained
+syn match   mojoEscape	"\\\o\{1,3}" contained
+syn match   mojoEscape	"\\x\x\{2}" contained
+syn match   mojoEscape	"\%(\\u\x\{4}\|\\U\x\{8}\)" contained
+" Python allows case-insensitive Unicode IDs: http://www.unicode.org/charts/
+syn match   mojoEscape	"\\N{\a\+\%(\s\a\+\)*}" contained
+syn match   mojoEscape	"\\$"
+
+" It is very important to understand all details before changing the
+" regular expressions below or their order.
+" The word boundaries are *not* the floating-point number boundaries
+" because of a possible leading or trailing decimal point.
+" The expressions below ensure that all valid number literals are
+" highlighted, and invalid number literals are not.  For example,
+"
+" - a decimal point in '4.' at the end of a line is highlighted,
+" - a second dot in 1.0.0 is not highlighted,
+" - 08 is not highlighted,
+" - 08e0 or 08j are highlighted,
+"
+" and so on, as specified in the 'Python Language Reference'.
+" https://docs.python.org/reference/lexical_analysis.html#numeric-literals
+if !exists("mojo_no_number_highlight")
+  " numbers (including complex)
+  syn match   mojoNumber	"\<0[oO]\%(_\=\o\)\+\>"
+  syn match   mojoNumber	"\<0[xX]\%(_\=\x\)\+\>"
+  syn match   mojoNumber	"\<0[bB]\%(_\=[01]\)\+\>"
+  syn match   mojoNumber	"\<\%([1-9]\%(_\=\d\)*\|0\+\%(_\=0\)*\)\>"
+  syn match   mojoNumber	"\<\d\%(_\=\d\)*[jJ]\>"
+  syn match   mojoNumber	"\<\d\%(_\=\d\)*[eE][+-]\=\d\%(_\=\d\)*[jJ]\=\>"
+  syn match   mojoNumber
+        \ "\<\d\%(_\=\d\)*\.\%([eE][+-]\=\d\%(_\=\d\)*\)\=[jJ]\=\%(\W\|$\)\@="
+  syn match   mojoNumber
+        \ "\%(^\|\W\)\zs\%(\d\%(_\=\d\)*\)\=\.\d\%(_\=\d\)*\%([eE][+-]\=\d\%(_\=\d\)*\)\=[jJ]\=\>"
+endif
+
+" The built-ins are added in the same order of appearance in Mojo stdlib docs
+" https://docs.modular.com/mojo/lib.html
+"
+if !exists("mojo_no_builtin_highlight")
+  " Built-in functions
+  syn keyword mojoBuiltin	slice constrained debug_assert put_new_line print
+  syn keyword mojoBuiltin	print_no_newline len range rebind element_type 
+  syn keyword mojoBuiltin	ord chr atol isdigit index address string
+  " Built-in types
+  syn keyword mojoType		Byte ListLiteral CoroutineContext Coroutine DType
+  syn keyword mojoType		dtype type invalid bool int8 si8 unit8 ui8 int16 
+  syn keyword mojoType		si16 unit16 ui16 int32 si32 uint32 ui32 int64 
+  syn keyword mojoType		si64 uint64 ui64 bfloat16 bf16 float16 f16 float32
+  syn keyword mojoType		f32 float64 f64 Error FloatLiteral Int Attr SIMD 
+  syn keyword mojoType		Int8 UInt8 Int16 UInt16 Int32 UInt32 Int64 UInt64
+  syn keyword mojoType		Float16 Float32 Float64 element_type _65x13_type
+  syn keyword mojoType		String StringLiteral StringRef Tuple AnyType
+  syn keyword mojoType		NoneType None Lifetime
+  " avoid highlighting attributes as builtins
+  syn match   mojoAttribute	/\.\h\w*/hs=s+1
+	\ contains=ALLBUT,mojoBuiltin,mojoFunction,mojoAsync
+	\ transparent
+endif
+
+" From the 'Python Library Reference' class hierarchy at the bottom.
+" http://docs.python.org/library/exceptions.html
+if !exists("mojo_no_exception_highlight")
+  " builtin base exceptions (used mostly as base classes for other exceptions)
+  syn keyword mojoExceptions	BaseException Exception
+  syn keyword mojoExceptions	ArithmeticError BufferError LookupError
+  " builtin exceptions (actually raised)
+  syn keyword mojoExceptions	AssertionError AttributeError EOFError
+  syn keyword mojoExceptions	FloatingPointError GeneratorExit ImportError
+  syn keyword mojoExceptions	IndentationError IndexError KeyError
+  syn keyword mojoExceptions	KeyboardInterrupt MemoryError
+  syn keyword mojoExceptions	ModuleNotFoundError NameError
+  syn keyword mojoExceptions	NotImplementedError OSError OverflowError
+  syn keyword mojoExceptions	RecursionError ReferenceError RuntimeError
+  syn keyword mojoExceptions	StopAsyncIteration StopIteration SyntaxError
+  syn keyword mojoExceptions	SystemError SystemExit TabError TypeError
+  syn keyword mojoExceptions	UnboundLocalError UnicodeDecodeError
+  syn keyword mojoExceptions	UnicodeEncodeError UnicodeError
+  syn keyword mojoExceptions	UnicodeTranslateError ValueError
+  syn keyword mojoExceptions	ZeroDivisionError
+  " builtin exception aliases for OSError
+  syn keyword mojoExceptions	EnvironmentError IOError WindowsError
+  " builtin OS exceptions in Python 3
+  syn keyword mojoExceptions	BlockingIOError BrokenPipeError
+  syn keyword mojoExceptions	ChildProcessError ConnectionAbortedError
+  syn keyword mojoExceptions	ConnectionError ConnectionRefusedError
+  syn keyword mojoExceptions	ConnectionResetError FileExistsError
+  syn keyword mojoExceptions	FileNotFoundError InterruptedError
+  syn keyword mojoExceptions	IsADirectoryError NotADirectoryError
+  syn keyword mojoExceptions	PermissionError ProcessLookupError TimeoutError
+  " builtin warnings
+  syn keyword mojoExceptions	BytesWarning DeprecationWarning FutureWarning
+  syn keyword mojoExceptions	ImportWarning PendingDeprecationWarning
+  syn keyword mojoExceptions	ResourceWarning RuntimeWarning
+  syn keyword mojoExceptions	SyntaxWarning UnicodeWarning
+  syn keyword mojoExceptions	UserWarning Warning
+endif
+
+if exists("mojo_space_error_highlight")
+  " trailing whitespace
+  syn match   mojoSpaceError	display excludenl "\s\+$"
+  " mixed tabs and spaces
+  syn match   mojoSpaceError	display " \+\t"
+  syn match   mojoSpaceError	display "\t\+ "
+endif
+
+" Do not spell doctests inside strings.
+" Notice that the end of a string, either ''', or """, will end the contained
+" doctest too.  Thus, we do *not* need to have it as an end pattern.
+if !exists("mojo_no_doctest_highlight")
+  if !exists("mojo_no_doctest_code_highlight")
+    syn region mojoDoctest
+	  \ start="^\s*>>>\s" end="^\s*$"
+	  \ contained contains=ALLBUT,mojoDoctest,mojoFunction,@Spell
+    syn region mojoDoctestValue
+	  \ start=+^\s*\%(>>>\s\|\.\.\.\s\|"""\|'''\)\@!\S\++ end="$"
+	  \ contained
+  else
+    syn region mojoDoctest
+	  \ start="^\s*>>>" end="^\s*$"
+	  \ contained contains=@NoSpell
+  endif
+endif
+
+" Sync at the beginning of class, function, or method definition.
+syn sync match mojoSync grouphere NONE "^\%(def\|class\)\s\+\h\w*\s*[(:]"
+
+" The default highlight links.  Can be overridden later.
+hi def link mojoStatement		Statement
+hi def link mojoConditional		Conditional
+hi def link mojoRepeat			Repeat
+hi def link mojoOperator		Operator
+hi def link mojoException		Exception
+hi def link mojoInclude			Include
+hi def link mojoAsync			Statement
+hi def link mojoDecorator		Define
+hi def link mojoDecoratorName		Function
+hi def link mojoFunction		Function
+hi def link mojoComment			Comment
+hi def link mojoTodo			Todo
+hi def link mojoString			String
+hi def link mojoRawString		String
+hi def link mojoQuotes			String
+hi def link mojoTripleQuotes		mojoQuotes
+hi def link mojoEscape			Special
+if !exists("mojo_no_number_highlight")
+  hi def link mojoNumber		Number
+endif
+if !exists("mojo_no_builtin_highlight")
+  hi def link mojoBuiltin		Function
+  hi def link mojoType			Type
+endif
+if !exists("mojo_no_exception_highlight")
+  hi def link mojoExceptions		Structure
+endif
+if exists("mojo_space_error_highlight")
+  hi def link mojoSpaceError		Error
+endif
+if !exists("mojo_no_doctest_highlight")
+  hi def link mojoDoctest		Special
+  hi def link mojoDoctestValue	Define
+endif
+
+let b:current_syntax = "mojo"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2 ts=8 noet:
-- 
cgit 


From 65738202f8be3ca63b75197d48f2c7a9324c035b Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Tue, 12 Sep 2023 04:29:39 +0900
Subject: fix(decorations): better approximation of botline #24794

Problem:
* The guessed botline might be smaller than the actual botline e.g. when
  there are folds and the user is typing in insert mode. This may result
  in incorrect treesitter highlights for injections.
* botline can be larger than the last line number of the buffer, which
  results in errors when placing extmarks.

Solution:
* Take a more conservative approximation. I am not sure if it is
  sufficient to guarantee correctness, but it seems to be good enough
  for the case mentioned above.
* Clamp it to the last line number.

Co-authored-by: Lewis Russell <me@lewisr.dev>
---
 runtime/doc/api.txt                        | 4 +++-
 runtime/lua/vim/_meta/api.lua              | 4 +++-
 runtime/lua/vim/treesitter/highlighter.lua | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index c0bea52513..9cdfd8a563 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2778,7 +2778,9 @@ nvim_set_decoration_provider({ns_id}, {*opts})
                  • on_buf: called for each buffer being redrawn (before window
                    callbacks) ["buf", bufnr, tick]
                  • on_win: called when starting to redraw a specific window.
-                   ["win", winid, bufnr, topline, botline_guess]
+                   botline_guess is an approximation that does not exceed the
+                   last line number. ["win", winid, bufnr, topline,
+                   botline_guess]
                  • on_line: called for each buffer line being redrawn. (The
                    interaction with fold lines is subject to change) ["win",
                    winid, bufnr, row]
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 6c4e6c04d9..bfff16933a 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1777,7 +1777,9 @@ function vim.api.nvim_set_current_win(window) end
 ---              • on_buf: called for each buffer being redrawn (before window
 ---                callbacks) ["buf", bufnr, tick]
 ---              • on_win: called when starting to redraw a specific window.
----                ["win", winid, bufnr, topline, botline_guess]
+---                botline_guess is an approximation that does not exceed the
+---                last line number. ["win", winid, bufnr, topline,
+---                botline_guess]
 ---              • on_line: called for each buffer line being redrawn. (The
 ---                interaction with fold lines is subject to change) ["win",
 ---                winid, bufnr, row]
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index 56b075b723..8d4d6a9337 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -322,7 +322,7 @@ function TSHighlighter._on_win(_, _win, buf, topline, botline)
   if not self then
     return false
   end
-  self.tree:parse({ topline, botline })
+  self.tree:parse({ topline, botline + 1 })
   self:reset_highlight_state()
   self.redraw_count = self.redraw_count + 1
   return true
-- 
cgit 


From 4b6023be7c2b132e7e6994adc73a7b79fbf40946 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 12 Sep 2023 07:37:05 +0800
Subject: vim-patch:596ad66d1ddb (#25102)

runtime(doc): documentation updates

This is a collection of various improvements to the help pages

closes vim/vim#12790

https://github.com/vim/vim/commit/596ad66d1ddb742ef349e98eb06b8e4052f68f51

Co-authored-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Houl <anwoku@yahoo.de>
Co-authored-by: Doug Kearns <dougkearns@gmail.com>
Co-authored-by: Adri Verhoef <a3@a3.xs4all.nl>
---
 runtime/doc/intro.txt   |  2 +-
 runtime/doc/options.txt | 24 ++++++++++++------------
 runtime/doc/syntax.txt  |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index a39d07e3f2..e1a92bc87b 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -121,7 +121,7 @@ Vim would never have become what it is now, without the help of these people!
 	Eric Fischer		Mac port, 'cindent', and other improvements
 	Benji Fisher		Answering lots of user questions
 	Bill Foster		Athena GUI port (later removed)
-	Google			Lets me work on Vim one day a week
+	Google			Let Bram work on Vim one day a week
 	Loic Grenie		xvim (ideas for multi windows version)
 	Sven Guckes		Vim promoter and previous WWW page maintainer
 	Darren Hiebert		Exuberant ctags
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e2ca9c1992..68be0da2fd 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -240,7 +240,7 @@ The options local to a window are remembered for each buffer.  This also
 happens when the buffer is not loaded, but they are lost when the buffer is
 wiped out |:bwipe|.
 
-Special local window options			*special-local-window-option*
+Special local window options			*local-noglobal*
 
 The following local window options won't be copied over when new windows are
 created, thus they behave slightly differently:
@@ -251,7 +251,7 @@ created, thus they behave slightly differently:
 	'winfixheight'	specific to existing window
 	'winfixwidth'	specific to existing window
 
-Special local buffer options			*special-local-buffer-option*
+Special local buffer options
 
 The following local buffer options won't be copied over when new buffers are
 created, thus they behave slightly differently:
@@ -1095,7 +1095,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'bufhidden'* *'bh'*
 'bufhidden' 'bh'	string	(default "")
-			local to buffer  |special-local-buffer-option|
+			local to buffer  |local-noglobal|
 	This option specifies what happens when a buffer is no longer
 	displayed in a window:
 	  <empty>	follow the global 'hidden' option
@@ -1127,7 +1127,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'buftype'* *'bt'* *E382*
 'buftype' 'bt'		string	(default "")
-			local to buffer  |special-local-buffer-option|
+			local to buffer  |local-noglobal|
 	The value of this option specifies the type of a buffer:
 	  <empty>	normal buffer
 	  acwrite	buffer will always be written with |BufWriteCmd|s
@@ -2433,7 +2433,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'filetype'* *'ft'*
 'filetype' 'ft'		string	(default "")
-			local to buffer  |special-local-buffer-option|
+			local to buffer  |local-noglobal|
 	When this option is set, the FileType autocommand event is triggered.
 	All autocommands that match with the value of this option will be
 	executed.  Thus the value of 'filetype' is used in place of the file
@@ -4109,7 +4109,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 				*'modified'* *'mod'* *'nomodified'* *'nomod'*
 'modified' 'mod'	boolean	(default off)
-			local to buffer  |special-local-buffer-option|
+			local to buffer  |local-noglobal|
 	When on, the buffer is considered to be modified.  This option is set
 	when:
 	1. A change was made to the text since it was last written.  Using the
@@ -4558,7 +4558,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 		*'previewwindow'* *'pvw'* *'nopreviewwindow'* *'nopvw'* *E590*
 'previewwindow' 'pvw'	boolean	(default off)
-			local to window  |special-local-window-option|
+			local to window  |local-noglobal|
 	Identifies the preview window.  Only one window can have this option
 	set.  It's normally not set directly, but by using one of the commands
 	|:ptag|, |:pedit|, etc.
@@ -4628,7 +4628,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 				*'readonly'* *'ro'* *'noreadonly'* *'noro'*
 'readonly' 'ro'		boolean	(default off)
-			local to buffer  |special-local-buffer-option|
+			local to buffer  |local-noglobal|
 	If on, writes fail unless you use a '!'.  Protects you from
 	accidentally overwriting a file.  Default on when Vim is started
 	in read-only mode ("vim -R") or when the executable is called "view".
@@ -4890,7 +4890,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'scroll'* *'scr'*
 'scroll' 'scr'		number	(default half the window height)
-			local to window  |special-local-window-option|
+			local to window  |local-noglobal|
 	Number of lines to scroll with CTRL-U and CTRL-D commands.  Will be
 	set to half the number of lines in the window when the window size
 	changes.  This may happen when enabling the |status-line| or
@@ -6240,7 +6240,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'syntax'* *'syn'*
 'syntax' 'syn'		string	(default "")
-			local to buffer  |special-local-buffer-option|
+			local to buffer  |local-noglobal|
 	When this option is set, the syntax with this name is loaded, unless
 	syntax highlighting has been switched off with ":syntax off".
 	Otherwise this option does not always reflect the current syntax (the
@@ -7107,7 +7107,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 			*'winfixheight'* *'wfh'* *'nowinfixheight'* *'nowfh'*
 'winfixheight' 'wfh'	boolean	(default off)
-			local to window  |special-local-window-option|
+			local to window  |local-noglobal|
 	Keep the window height when windows are opened or closed and
 	'equalalways' is set.  Also for |CTRL-W_=|.  Set by default for the
 	|preview-window| and |quickfix-window|.
@@ -7115,7 +7115,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 			*'winfixwidth'* *'wfw'* *'nowinfixwidth'* *'nowfw'*
 'winfixwidth' 'wfw'	boolean	(default off)
-			local to window  |special-local-window-option|
+			local to window  |local-noglobal|
 	Keep the window width when windows are opened or closed and
 	'equalalways' is set.  Also for |CTRL-W_=|.
 	The width may be changed anyway when running out of room.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 26c010315a..c15b41f9aa 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2125,11 +2125,11 @@ should set a variable in your vimrc file: >
 	:let lpc_syntax_for_c = 1
 
 If it doesn't work properly for some particular C or LPC files, use a
-modeline.  For a LPC file:
+modeline.  For a LPC file: >
 
 	// vim:set ft=lpc:
 
-For a C file that is recognized as LPC:
+For a C file that is recognized as LPC: >
 
 	// vim:set ft=c:
 
@@ -2161,7 +2161,7 @@ LUA						*lua.vim* *ft-lua-syntax*
 The Lua syntax file can be used for versions 4.0, 5.0, 5.1 and 5.2 (5.2 is
 the default). You can select one of these versions using the global variables
 lua_version and lua_subversion. For example, to activate Lua
-5.1 syntax highlighting, set the variables like this:
+5.1 syntax highlighting, set the variables like this: >
 
 	:let lua_version = 5
 	:let lua_subversion = 1
-- 
cgit 


From aab06edc63c3dfbd99e0c803c6834bf771318c42 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 12 Sep 2023 07:48:40 +0800
Subject: vim-patch:f787ee8451a1 (#25103)

runtime(doc): Add g:c_syntax_for_h to filetype-overrule docs

closes: vim/vim#13074

https://github.com/vim/vim/commit/f787ee8451a1f24de4ef3de48b78d5aa77d09829

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
---
 runtime/doc/filetype.txt | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index bae3006c36..27ec92dbc6 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -136,35 +136,38 @@ what kind of file it is.  This doesn't always work.  A number of global
 variables can be used to overrule the filetype used for certain extensions:
 
 	file name	variable ~
-	`*.asa`		g:filetype_asa	|ft-aspvbs-syntax| |ft-aspperl-syntax|
-	`*.asm`		g:asmsyntax	|ft-asm-syntax|
-	`*.asp`		g:filetype_asp	|ft-aspvbs-syntax| |ft-aspperl-syntax|
-	`*.bas`		g:filetype_bas	|ft-basic-syntax|
+	`*.asa`		g:filetype_asa		|ft-aspperl-syntax|
+						|ft-aspvbs-syntax|
+	`*.asm`		g:asmsyntax		|ft-asm-syntax|
+	`*.asp`		g:filetype_asp		|ft-aspperl-syntax|
+						|ft-aspvbs-syntax|
+	`*.bas`		g:filetype_bas		|ft-basic-syntax|
 	`*.cfg`		g:filetype_cfg
 	`*.cls`		g:filetype_cls
-	`*.csh`		g:filetype_csh	|ft-csh-syntax|
+	`*.csh`		g:filetype_csh		|ft-csh-syntax|
 	`*.dat`		g:filetype_dat
-	`*.f`		g:filetype_f	|ft-forth-syntax|
-	`*.frm`		g:filetype_frm	|ft-form-syntax|
-	`*.fs`		g:filetype_fs	|ft-forth-syntax|
-	`*.i`		g:filetype_i	|ft-progress-syntax|
+	`*.f`		g:filetype_f		|ft-forth-syntax|
+	`*.frm`		g:filetype_frm		|ft-form-syntax|
+	`*.fs`		g:filetype_fs		|ft-forth-syntax|
+	`*.h`		g:c_syntax_for_h	|ft-c-syntax|
+	`*.i`		g:filetype_i		|ft-progress-syntax|
 	`*.inc`		g:filetype_inc
 	`*.lsl`		g:filetype_lsl
-	`*.m`		g:filetype_m	|ft-mathematica-syntax|
+	`*.m`		g:filetype_m		|ft-mathematica-syntax|
 	`*.mod`		g:filetype_mod
-	`*.p`		g:filetype_p	|ft-pascal-syntax|
+	`*.p`		g:filetype_p		|ft-pascal-syntax|
 	`*.pl`		g:filetype_pl
-	`*.pp`		g:filetype_pp	|ft-pascal-syntax|
+	`*.pp`		g:filetype_pp		|ft-pascal-syntax|
 	`*.prg`		g:filetype_prg
 	`*.r`		g:filetype_r
 	`*.sig`		g:filetype_sig
-	`*.sql`		g:filetype_sql	|ft-sql-syntax|
+	`*.sql`		g:filetype_sql		|ft-sql-syntax|
 	`*.src`		g:filetype_src
 	`*.sys`		g:filetype_sys
-	`*.sh`		g:bash_is_sh	|ft-sh-syntax|
-	`*.tex`		g:tex_flavor	|ft-tex-plugin|
+	`*.sh`		g:bash_is_sh		|ft-sh-syntax|
+	`*.tex`		g:tex_flavor		|ft-tex-plugin|
 	`*.typ`		g:filetype_typ
-	`*.w`		g:filetype_w	|ft-cweb-syntax|
+	`*.w`		g:filetype_w		|ft-cweb-syntax|
 
 For a few filetypes the global variable is used only when the filetype could
 not be detected:
-- 
cgit 


From a9369e4b652685c74e06ce26d1883e389d85ed78 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 12 Sep 2023 07:48:42 +0200
Subject: vim-patch:62145db91b10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

syntax(i3config): improved i3config highlighting (vim/vim#13054)

https://github.com/vim/vim/commit/62145db91b104075277cb3a940e18832ad106264

Co-authored-by: Josef Litoš <54900518+JosefLitos@users.noreply.github.com>
---
 runtime/syntax/i3config.vim | 345 +++++++++++++++++++++++++-------------------
 1 file changed, 194 insertions(+), 151 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/i3config.vim b/runtime/syntax/i3config.vim
index caef244ce5..1eddd60f7c 100644
--- a/runtime/syntax/i3config.vim
+++ b/runtime/syntax/i3config.vim
@@ -2,8 +2,9 @@
 " Language: i3 config file
 " Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
 " Maintainer: Quentin Hibon (github user hiqua)
-" Version: 0.4
-" Last Change: 2022 Jun 05
+" Version: 0.4.22
+" Reference version (JosefLitos/i3config.vim): 4.22
+" Last Change: 2023-09-09
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -18,7 +19,7 @@ endif
 scriptencoding utf-8
 
 " Error
-syn match i3ConfigError /.*/
+syn match i3ConfigError /.\+/
 
 " Todo
 syn keyword i3ConfigTodo TODO FIXME XXX contained
@@ -27,238 +28,280 @@ syn keyword i3ConfigTodo TODO FIXME XXX contained
 " Comments are started with a # and can only be used at the beginning of a line
 syn match i3ConfigComment /^\s*#.*$/ contains=i3ConfigTodo
 
+syn match i3ConfigOperator /[,;:]/ contained
+syn match i3ConfigParen /[{}]/ contained
+
 " Font
 " A FreeType font description is composed by:
 " a font family, a style, a weight, a variant, a stretch and a size.
-syn match i3ConfigFontSeparator /,/ contained
-syn match i3ConfigFontSeparator /:/ contained
 syn keyword i3ConfigFontKeyword font contained
-syn match i3ConfigFontNamespace /\w\+:/ contained contains=i3ConfigFontSeparator
-syn match i3ConfigFontContent /-\?\w\+\(-\+\|\s\+\|,\)/ contained contains=i3ConfigFontNamespace,i3ConfigFontSeparator,i3ConfigFontKeyword
+syn match i3ConfigFontNamespace /\w\+:/ contained contains=i3ConfigOperator
+syn match i3ConfigFontContent /-\?\w\+\(-\+\|\s\+\|,\)/ contained contains=i3ConfigFontNamespace,i3ConfigFontKeyword,i3ConfigOperator
 syn match i3ConfigFontSize /\s\=\d\+\(px\)\?\s\?$/ contained
-syn match i3ConfigFont /^\s*font\s\+.*$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?[^\\]\+$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+\(\(.*\\\_.*\)\|\(.*[^\\]\+$\)\)/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace
-
-" variables
-syn match i3ConfigString /\(['"]\)\(.\{-}\)\1/ contained
-syn match i3ConfigColor /#\w\{6}/ contained
-syn match i3ConfigVariableModifier /+/ contained
-syn match i3ConfigVariableAndModifier /+\w\+/ contained contains=i3ConfigVariableModifier
-syn match i3ConfigVariable /\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?/ contains=i3ConfigVariableModifier,i3ConfigVariableAndModifier
-syn keyword i3ConfigInitializeKeyword set contained
-syn match i3ConfigInitialize /^\s*set\s\+.*$/ contains=i3ConfigVariable,i3ConfigInitializeKeyword,i3ConfigColor,i3ConfigString
-
-" Include
+syn match i3ConfigFont /^\s*font\s\+.*$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace
+syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace
+syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?[^\\]\+$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace
+syn match i3ConfigFont /^\s*font\s\+\(\(.*\\\_.*\)\|\(.*[^\\]\+$\)\)/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace
+
+" Common value types
+syn keyword i3ConfigBoolean yes no enabled disabled on off true false contained
+syn region i3ConfigString start=/"/ skip=/\\"/ end=/"/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable keepend extend
+syn region i3ConfigString start=/'/ end=/'/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable keepend extend
+syn match i3ConfigColor /#\w\{3,8}/ contained
+syn match i3ConfigNumber /\([a-zA-Z0-9_$]\)\@<!\d\+\([a-zA-Z0-9_$]\)\@!/ contained
+
+" Variables
+syn match i3ConfigVariable /\$[A-Z0-9a-z_:|[\]-]\+/
+syn keyword i3ConfigSetKeyword set contained
+syn match i3ConfigSet /^set \$.*$/ contains=i3ConfigVariable,i3ConfigSetKeyword,i3ConfigColor,i3ConfigString,i3ConfigNoStartupId,i3ConfigNumber,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper
+
+" Include other config files
 syn keyword i3ConfigIncludeKeyword include contained
-syn match i3ConfigInclude /^\s*include\s\+.*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable
+syn match i3ConfigCommandSubstitutionRegion /`[^`]*`/ contained contains=i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper,i3ConfigShCommand
+syn match i3ConfigIncludePath /[~./a-zA-Z0-9`][^~]*$/ contained contains=i3ConfigCommandSubstitutionRegion
+syn match i3ConfigInclude /^include .[^~]*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable,i3ConfigIncludePath
 
 " Gaps
 syn keyword i3ConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle up down contained
-syn match i3ConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,i3ConfigNumber,i3ConfigVariable
-syn keyword i3ConfigSmartGapKeyword on inverse_outer off contained
-syn match i3ConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\|off\)\s\?$/ contains=i3ConfigSmartGapKeyword
+syn match i3ConfigGapStyle /^gaps \(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,i3ConfigNumber,i3ConfigVariable
+syn keyword i3ConfigSmartGapKeyword on inverse_outer contained
+syn match i3ConfigSmartGap /^smart_gaps \(on\|inverse_outer\)$/ contains=i3ConfigSmartGapKeyword
 syn keyword i3ConfigSmartBorderKeyword on no_gaps contained
-syn match i3ConfigSmartBorder /^\s*smart_borders\s\+\(on\|no_gaps\)\s\?$/ contains=i3ConfigSmartBorderKeyword
+syn match i3ConfigSmartBorder /^smart_borders \(on\|no_gaps\)$/ contains=i3ConfigSmartBorderKeyword
 
-" Keyboard bindings
-syn keyword i3ConfigAction toggle fullscreen restart key import kill shrink grow contained
-syn keyword i3ConfigAction focus move grow height width split layout resize restore reload mute unmute exit mode workspace container to contained
-syn match i3ConfigModifier /\w\++\w\+\(\(+\w\+\)\+\)\?/ contained contains=i3ConfigVariableModifier
-syn match i3ConfigNumber /\s\d\+/ contained
+" Commands useable in keybinds
+syn keyword i3ConfigAction move exit restart reload layout append_layout workspace focus kill open fullscreen sticky split floating mark unmark resize rename scratchpad swap mode bar gaps border nop contained
+syn keyword i3ConfigOption enable disable toggle mode_toggle key shrink grow height width restore container to left right up down position absolute relative window splitv splith tabbed stacked default on off inner outer current all set plus minus top bottom horizontal vertical auto none normal pixel prev next back_and_forth child parent show contained
 syn match i3ConfigUnit /\sp\(pt\|x\)/ contained
 syn match i3ConfigUnitOr /\sor/ contained
-syn keyword i3ConfigBindKeyword bindsym bindcode exec gaps border contained
-syn match i3ConfigBindArgument /--\w\+\(\(-\w\+\)\+\)\?\s/ contained
-syn match i3ConfigBind /^\s*\(bindsym\|bindcode\)\s\+.*$/ contains=i3ConfigVariable,i3ConfigBindKeyword,i3ConfigVariableAndModifier,i3ConfigNumber,i3ConfigUnit,i3ConfigUnitOr,i3ConfigBindArgument,i3ConfigModifier,i3ConfigAction,i3ConfigString,i3ConfigGapStyleKeyword,i3ConfigBorderStyleKeyword
 
-" Floating
+" Keyboard bindings
+syn keyword i3ConfigBindKeyword bindsym bindcode contained
+syn match i3ConfigBindArgument /--\(release\|border\|whole-window\|exclude-titlebar\)/ contained
+syn match i3ConfigBindModifier /+/ contained
+syn match i3ConfigBindModkey /Ctrl\|Shift\|Mod[1-5]/ contained
+syn match i3ConfigBindCombo /[$a-zA-Z0-9_+]\+ / contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey
+syn match i3ConfigBindComboLine /bind\(sym\|code\)\( --[a-z-]\+\)* [$a-zA-Z0-9_+]\+ / contained contains=i3ConfigBindKeyword,i3ConfigBindArgument,i3ConfigBindCombo
+syn match i3ConfigBind /^\s*bind\(sym\|code\)\s\+.*[^{]$/ contains=i3ConfigBindComboLine,i3ConfigNumber,i3ConfigVariable,i3ConfigAction,i3ConfigOption,i3ConfigGapStyleKeyword,i3ConfigOperator,i3ConfigString,i3ConfigUnit,i3ConfigUnitOr,i3ConfigConditional,i3ConfigBoolean,i3ConfigExec
+
+" Floating modifier
+syn keyword i3ConfigFloatingModifierKeyword floating_modifier contained
+syn match i3ConfigFloatingModifier /^floating_modifier [$a-zA-Z0-9+]\+$/ contains=i3ConfigVariable,i3ConfigBindModkey,i3ConfigFloatingModifierKeyword
+
+" Floating window size limitation
 syn keyword i3ConfigSizeSpecial x contained
-syn match i3ConfigNegativeSize /-/ contained
-syn match i3ConfigSize /-\?\d\+\s\?x\s\?-\?\d\+/ contained contains=i3ConfigSizeSpecial,i3ConfigNumber,i3ConfigNegativeSize
-syn match i3ConfigFloatingModifier /^\s*floating_modifier\s\+\$\w\+\d\?/ contains=i3ConfigVariable
-syn match i3ConfigFloating /^\s*floating_\(maximum\|minimum\)_size\s\+-\?\d\+\s\?x\s\?-\?\d\+/ contains=i3ConfigSize
+syn match i3ConfigSize / -\?\d\+ x -\?\d\+/ contained contains=i3ConfigSizeSpecial,i3ConfigNumber
+syn keyword i3ConfigFloatingSizeKeyword floating_minimum_size floating_maximum_size contained
+syn match i3ConfigFloatingSize /^floating_\(maximum\|minimum\)_size -\?\d\+ x -\?\d\+/ contains=i3ConfigFloatingSizeKeyword,i3ConfigSize
 
 " Orientation
 syn keyword i3ConfigOrientationKeyword vertical horizontal auto contained
-syn match i3ConfigOrientation /^\s*default_orientation\s\+\(vertical\|horizontal\|auto\)\s\?$/ contains=i3ConfigOrientationKeyword
+syn match i3ConfigOrientation /^default_orientation \(vertical\|horizontal\|auto\)$/ contains=i3ConfigOrientationKeyword
 
 " Layout
 syn keyword i3ConfigLayoutKeyword default stacking tabbed contained
-syn match i3ConfigLayout /^\s*workspace_layout\s\+\(default\|stacking\|tabbed\)\s\?$/ contains=i3ConfigLayoutKeyword
+syn match i3ConfigLayout /^workspace_layout \(default\|stacking\|tabbed\)$/ contains=i3ConfigLayoutKeyword
 
 " Border style
 syn keyword i3ConfigBorderStyleKeyword none normal pixel contained
-syn match i3ConfigBorderStyle /^\s*\(new_window\|new_float\|default_border\|default_floating_border\)\s\+\(none\|\(normal\|pixel\)\(\s\+\d\+\)\?\(\s\+\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?\)\?\)\s\?$/ contains=i3ConfigBorderStyleKeyword,i3ConfigNumber,i3ConfigVariable
+syn match i3ConfigBorderStyle /^\(new_window\|new_float\|default_border\|default_floating_border\)\s\+\(none\|\(normal\|pixel\)\(\s\+\d\+\)\?\(\s\+\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?\)\?\)$/ contains=i3ConfigBorderStyleKeyword,i3ConfigNumber,i3ConfigVariable
 
 " Hide borders and edges
 syn keyword i3ConfigEdgeKeyword none vertical horizontal both smart smart_no_gaps contained
-syn match i3ConfigEdge /^\s*hide_edge_borders\s\+\(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=i3ConfigEdgeKeyword
+syn match i3ConfigEdge /^hide_edge_borders\s\+\(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=i3ConfigEdgeKeyword
+
 
 " Arbitrary commands for specific windows (for_window)
 syn keyword i3ConfigCommandKeyword for_window contained
-syn region i3ConfigWindowStringSpecial start=+"+  skip=+\\"+  end=+"+ contained contains=i3ConfigString
-syn region i3ConfigWindowCommandSpecial start="\[" end="\]" contained contains=i3ConfigWindowStringSpacial,i3ConfigString
-syn match i3ConfigArbitraryCommand /^\s*for_window\s\+.*$/ contains=i3ConfigWindowCommandSpecial,i3ConfigCommandKeyword,i3ConfigBorderStyleKeyword,i3ConfigLayoutKeyword,i3ConfigOrientationKeyword,Size,i3ConfigNumber
+syn match i3ConfigConditionalText /\w\+\(-\w\+\)*/ contained
+syn match i3ConfigEqualsOperator /=/ contained
+syn region i3ConfigConditional start=/\[/ end=/\]/ contained contains=i3ConfigString,i3ConfigEqualsOperator,i3ConfigConditionalText
+syn match i3ConfigArbitraryCommand /^for_window\s\+.*$/ contains=i3ConfigConditional,i3ConfigCommandKeyword,i3ConfigAction,i3ConfigOption,i3ConfigSize,i3ConfigNumber,i3ConfigString,i3ConfigOperator,i3ConfigBoolean,i3ConfigVariable
 
 " Disable focus open opening
 syn keyword i3ConfigNoFocusKeyword no_focus contained
-syn match i3ConfigDisableFocus /^\s*no_focus\s\+.*$/ contains=i3ConfigWindowCommandSpecial,i3ConfigNoFocusKeyword
+syn match i3ConfigDisableFocus /^no_focus\s\+.*$/ contains=i3ConfigConditional,i3ConfigNoFocusKeyword
 
 " Move client to specific workspace automatically
 syn keyword i3ConfigAssignKeyword assign contained
 syn match i3ConfigAssignSpecial /→/ contained
-syn match i3ConfigAssign /^\s*assign\s\+.*$/ contains=i3ConfigAssignKeyword,i3ConfigWindowCommandSpecial,i3ConfigAssignSpecial
+syn match i3ConfigAssign /^assign\s\+.*$/ contains=i3ConfigAssignKeyword,i3ConfigAssignSpecial,i3ConfigConditional,i3ConfigVariable,i3ConfigString,i3ConfigNumber
 
 " X resources
 syn keyword i3ConfigResourceKeyword set_from_resource contained
-syn match i3ConfigResource /^\s*set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigWindowCommandSpecial,i3ConfigColor,i3ConfigVariable
-
-" Auto start applications
-syn keyword i3ConfigExecKeyword exec exec_always contained
-syn match i3ConfigNoStartupId /--no-startup-id/ contained " We are not using i3ConfigBindArgument as only no-startup-id is supported here
-syn match i3ConfigExec /^\s*exec\(_always\)\?\s\+.*$/ contains=i3ConfigExecKeyword,i3ConfigNoStartupId,i3ConfigString
+syn match i3ConfigResource /^set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigConditional,i3ConfigColor,i3ConfigVariable,i3ConfigString,i3ConfigNumber
+
+" Executing shell commands
+syn keyword i3ConfigExecKeyword exec contained
+syn keyword i3ConfigExecAlwaysKeyword exec_always contained
+syn match i3ConfigShCmdDelim /\$/ contained
+syn region i3ConfigShCommand start=/\$(/ end=/)/ contained contains=i3ConfigShCmdDelim,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigString,i3ConfigNumber,i3ConfigVariable keepend extend
+syn match  i3ConfigShDelim /[[\]{}();`]\+/ contained
+syn match  i3ConfigShOper /[<>&|+=~^*!.?]\+/ contained
+syn match i3ConfigShParam /\<-[a-zA-Z0-9_-]\+\>/ contained containedin=i3ConfigVar
+syn region i3ConfigExec start=/exec\(_always\)\?\( --no-startup-id\)\? [^{]/ skip=/\\$/ end=/\([,;]\|$\)/ contains=i3ConfigExecKeyword,i3ConfigExecAlwaysKeyword,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigOperator keepend extend
 
 " Automatically putting workspaces on specific screens
 syn keyword i3ConfigWorkspaceKeyword workspace contained
 syn keyword i3ConfigOutput output contained
-syn match i3ConfigWorkspace /^\s*workspace\s\+.*$/ contains=i3ConfigWorkspaceKeyword,i3ConfigNumber,i3ConfigString,i3ConfigOutput
+syn match i3ConfigWorkspace /^\s*workspace\s\+.*$/ contains=i3ConfigWorkspaceKeyword,i3ConfigNumber,i3ConfigString,i3ConfigOutput,i3ConfigVariable,i3ConfigBoolean
 
 " Changing colors
 syn keyword i3ConfigClientColorKeyword client focused focused_inactive unfocused urgent placeholder background contained
 syn match i3ConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=i3ConfigClientColorKeyword,i3ConfigColor,i3ConfigVariable
 
 syn keyword i3ConfigTitleAlignKeyword left center right contained
-syn match i3ConfigTitleAlign /^\s*title_align\s\+.*$/ contains=i3ConfigTitleAlignKeyword
+syn match i3ConfigTitleAlign /^title_align .*$/ contains=i3ConfigTitleAlignKeyword
 
 " Interprocess communication
 syn match i3ConfigInterprocessKeyword /ipc-socket/ contained
-syn match i3ConfigInterprocess /^\s*ipc-socket\s\+.*$/ contains=i3ConfigInterprocessKeyword
+syn match i3ConfigInterprocess /^ipc-socket .*$/ contains=i3ConfigInterprocessKeyword
 
 " Mouse warping
 syn keyword i3ConfigMouseWarpingKeyword mouse_warping contained
-syn keyword i3ConfigMouseWarpingType output none contained
-syn match i3ConfigMouseWarping /^\s*mouse_warping\s\+\(output\|none\)\s\?$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType
+syn keyword i3ConfigMouseWarpingType output container none contained
+syn match i3ConfigMouseWarping /^mouse_warping \(output\|container\|none\)$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType
 
 " Focus follows mouse
 syn keyword i3ConfigFocusFollowsMouseKeyword focus_follows_mouse contained
-syn keyword i3ConfigFocusFollowsMouseType yes no contained
-syn match i3ConfigFocusFollowsMouse /^\s*focus_follows_mouse\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusFollowsMouseKeyword,i3ConfigFocusFollowsMouseType
-
-" Popups during fullscreen mode
-syn keyword i3ConfigPopupOnFullscreenKeyword popup_during_fullscreen contained
-syn keyword i3ConfigPopuponFullscreenType smart ignore leave_fullscreen contained
-syn match i3ConfigPopupOnFullscreen /^\s*popup_during_fullscreen\s\+\w\+\s\?$/ contains=i3ConfigPopupOnFullscreenKeyword,i3ConfigPopupOnFullscreenType
+syn keyword i3ConfigFocusFollowsMouseType always contained
+syn match i3ConfigFocusFollowsMouse /^focus_follows_mouse \(yes\|no\|always\)$/ contains=i3ConfigFocusFollowsMouseKeyword,i3ConfigBoolean,i3ConfigFocusFollowsMouseType
 
 " Focus wrapping
 syn keyword i3ConfigFocusWrappingKeyword force_focus_wrapping focus_wrapping contained
-syn keyword i3ConfigFocusWrappingType yes no contained
-syn match i3ConfigFocusWrapping /^\s*\(force_\)\?focus_wrapping\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigFocusWrappingKeyword
+syn keyword i3ConfigFocusWrappingType force workspace contained
+syn match i3ConfigFocusWrapping /^focus_wrapping \(yes\|no\|force\|workspace\)$/ contains=i3ConfigBoolean,i3ConfigFocusWrappingKeyword,i3ConfigFocusWrappingType
+
+" Popups during fullscreen mode
+syn keyword i3ConfigPopupOnFullscreenKeyword popup_during_fullscreen contained
+syn keyword i3ConfigPopupOnFullscreenType smart ignore leave_fullscreen contained
+syn match i3ConfigPopupOnFullscreen /^popup_during_fullscreen \w\+$/ contains=i3ConfigPopupOnFullscreenKeyword,i3ConfigPopupOnFullscreenType
 
 " Forcing Xinerama
 syn keyword i3ConfigForceXineramaKeyword force_xinerama contained
-syn match i3ConfigForceXinerama /^\s*force_xinerama\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigForceXineramaKeyword
+syn match i3ConfigForceXinerama /^force_xinerama \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigForceXineramaKeyword
 
 " Automatic back-and-forth when switching to the current workspace
 syn keyword i3ConfigAutomaticSwitchKeyword workspace_auto_back_and_forth contained
-syn match i3ConfigAutomaticSwitch /^\s*workspace_auto_back_and_forth\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigAutomaticSwitchKeyword
+syn match i3ConfigAutomaticSwitch /^workspace_auto_back_and_forth \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigAutomaticSwitchKeyword
 
 " Delay urgency hint
 syn keyword i3ConfigTimeUnit ms contained
 syn keyword i3ConfigDelayUrgencyKeyword force_display_urgency_hint contained
-syn match i3ConfigDelayUrgency /^\s*force_display_urgency_hint\s\+\d\+\s\+ms\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigDelayUrgencyKeyword,i3ConfigNumber,i3ConfigTimeUnit
+syn match i3ConfigDelayUrgency /^force_display_urgency_hint \d\+ ms$/ contains=i3ConfigBoolean,i3ConfigDelayUrgencyKeyword,i3ConfigNumber,i3ConfigTimeUnit
 
 " Focus on window activation
 syn keyword i3ConfigFocusOnActivationKeyword focus_on_window_activation contained
 syn keyword i3ConfigFocusOnActivationType smart urgent focus none contained
-syn match i3ConfigFocusOnActivation /^\s*focus_on_window_activation\s\+\(smart\|urgent\|focus\|none\)\s\?$/  contains=i3ConfigFocusOnActivationKeyword,i3ConfigFocusOnActivationType
+syn match i3ConfigFocusOnActivation /^focus_on_window_activation \(smart\|urgent\|focus\|none\)$/  contains=i3ConfigFocusOnActivationKeyword,i3ConfigFocusOnActivationType
 
-" Automatic back-and-forth when switching to the current workspace
-syn keyword i3ConfigDrawingMarksKeyword show_marks contained
-syn match i3ConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigDrawingMarksKeyword
+" Show window marks in their window title
+syn keyword i3ConfigShowMarksKeyword show_marks contained
+syn match i3ConfigShowMarks /^show_marks \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigShowMarksKeyword
+
+" Mode block
+syn match i3ConfigModeKeyword /^mode/ contained
+syn region i3ConfigModeBlock start=/^mode\( --pango_markup\)\? \([^'" {]\+\|'[^']\+'\|".\+"\)\s\+{$/ end=/^\s*}$/ contains=i3ConfigModeKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigNumber,i3ConfigParen,i3ConfigVariable fold keepend extend
 
-" Group mode/bar
-syn keyword i3ConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_min_width workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
-syn region i3ConfigBlock start=+^\s*[^#]*s\?{$+ end=+^\s*[^#]*}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend
+" Color block
+syn keyword i3ConfigColorsKeyword colors contained
+syn match i3ConfigColorsCategory /\(focused_\)\?\(background\|statusline\|separator\)\|\(focused\|active\|inactive\|urgent\)_workspace\|binding_mode/ contained
+syn region i3ConfigColorsBlock start=/^\s\+colors {$/ end=/^\s\+}$/ contained contains=i3ConfigColorsKeyword,i3ConfigColorsCategory,i3ConfigColor,i3ConfigVariable,i3ConfigComment,i3ConfigParen fold keepend extend
 
-" Line continuation
-syn region i3ConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend
+" Bar block
+syn keyword i3ConfigBarBlockKeyword bar i3bar_command status_command mode hidden_state id position output tray_output tray_padding font separator_symbol workspace_buttons workspace_min_width strip_workspace_numbers strip_workspace_name binding_mode_indicator padding contained
+syn keyword i3ConfigBarModifierKeyword modifier contained
+syn match i3ConfigBarModifierLine /^\s\+modifier [^ ]\+$/ contained contains=i3ConfigBarModifierKeyword,i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey
+syn region i3ConfigBarBlock start=/^bar {$/ end=/^}$/ contains=i3ConfigBarBlockKeyword,i3ConfigBarModifierLine,i3ConfigBind,i3ConfigString,i3ConfigComment,i3ConfigFont,i3ConfigBoolean,i3ConfigNumber,i3ConfigOperator,i3ConfigParen,i3ConfigColor,i3ConfigVariable,i3ConfigColorsBlock fold keepend extend
 
 " Define the highlighting.
+hi def link i3ConfigKeyword                         Keyword
+hi def link i3ConfigCommand                         Statement
 hi def link i3ConfigError                           Error
 hi def link i3ConfigTodo                            Todo
 hi def link i3ConfigComment                         Comment
-hi def link i3ConfigFontContent                     Type
-hi def link i3ConfigFocusOnActivationType           Type
-hi def link i3ConfigPopupOnFullscreenType           Type
-hi def link i3ConfigOrientationKeyword              Type
-hi def link i3ConfigMouseWarpingType                Type
-hi def link i3ConfigFocusFollowsMouseType           Type
-hi def link i3ConfigGapStyleKeyword                 Type
-hi def link i3ConfigTitleAlignKeyword               Type
-hi def link i3ConfigSmartGapKeyword                 Type
-hi def link i3ConfigSmartBorderKeyword              Type
-hi def link i3ConfigLayoutKeyword                   Type
-hi def link i3ConfigBorderStyleKeyword              Type
-hi def link i3ConfigEdgeKeyword                     Type
-hi def link i3ConfigAction                          Type
-hi def link i3ConfigCommand                         Type
-hi def link i3ConfigOutput                          Type
-hi def link i3ConfigWindowCommandSpecial            Type
-hi def link i3ConfigFocusWrappingType               Type
-hi def link i3ConfigUnitOr                          Type
-hi def link i3ConfigFontSize                        Constant
+hi def link i3ConfigOperator                        Operator
+hi def link i3ConfigParen                           Delimiter
+hi def link i3ConfigFontKeyword                     i3ConfigKeyword
+hi def link i3ConfigFontNamespace                   i3ConfigOption
+hi def link i3ConfigFontContent                     String
+hi def link i3ConfigFontSize                        Number
+hi def link i3ConfigString                          String
+hi def link i3ConfigNumber                          Number
+hi def link i3ConfigBoolean                         Boolean
 hi def link i3ConfigColor                           Constant
-hi def link i3ConfigNumber                          Constant
-hi def link i3ConfigUnit                            Constant
-hi def link i3ConfigVariableAndModifier             Constant
-hi def link i3ConfigTimeUnit                        Constant
-hi def link i3ConfigModifier                        Constant
-hi def link i3ConfigString                          Constant
-hi def link i3ConfigNegativeSize                    Constant
-hi def link i3ConfigInclude                         Constant
-hi def link i3ConfigFontSeparator                   Special
-hi def link i3ConfigVariableModifier                Special
-hi def link i3ConfigSizeSpecial                     Special
-hi def link i3ConfigWindowSpecial                   Special
-hi def link i3ConfigAssignSpecial                   Special
-hi def link i3ConfigFontNamespace                   PreProc
-hi def link i3ConfigBindArgument                    PreProc
-hi def link i3ConfigNoStartupId                     PreProc
-hi def link i3ConfigIncludeKeyword                  Identifier
-hi def link i3ConfigFontKeyword                     Identifier
-hi def link i3ConfigBindKeyword                     Identifier
-hi def link i3ConfigOrientation                     Identifier
-hi def link i3ConfigGapStyle                        Identifier
-hi def link i3ConfigTitleAlign                      Identifier
-hi def link i3ConfigSmartGap                        Identifier
-hi def link i3ConfigSmartBorder                     Identifier
-hi def link i3ConfigLayout                          Identifier
-hi def link i3ConfigBorderStyle                     Identifier
-hi def link i3ConfigEdge                            Identifier
-hi def link i3ConfigFloating                        Identifier
-hi def link i3ConfigFloatingModifier                Identifier
-hi def link i3ConfigCommandKeyword                  Identifier
-hi def link i3ConfigNoFocusKeyword                  Identifier
-hi def link i3ConfigInitializeKeyword               Identifier
-hi def link i3ConfigAssignKeyword                   Identifier
-hi def link i3ConfigResourceKeyword                 Identifier
-hi def link i3ConfigExecKeyword                     Identifier
-hi def link i3ConfigWorkspaceKeyword                Identifier
-hi def link i3ConfigClientColorKeyword              Identifier
-hi def link i3ConfigInterprocessKeyword             Identifier
-hi def link i3ConfigMouseWarpingKeyword             Identifier
-hi def link i3ConfigFocusFollowsMouseKeyword        Identifier
-hi def link i3ConfigPopupOnFullscreenKeyword        Identifier
-hi def link i3ConfigFocusWrappingKeyword            Identifier
-hi def link i3ConfigForceXineramaKeyword            Identifier
-hi def link i3ConfigAutomaticSwitchKeyword          Identifier
-hi def link i3ConfigDelayUrgencyKeyword             Identifier
-hi def link i3ConfigFocusOnActivationKeyword        Identifier
-hi def link i3ConfigDrawingMarksKeyword             Identifier
-hi def link i3ConfigBlockKeyword                    Identifier
-hi def link i3ConfigVariable                        Statement
-hi def link i3ConfigArbitraryCommand                Type
+hi def link i3ConfigVariable                        Variable
+hi def link i3ConfigSetKeyword                      i3ConfigKeyword
+hi def link i3ConfigIncludeKeyword                  i3ConfigKeyword
+hi def link i3ConfigCommandSubstitutionDelimiter    Delimiter
+hi def link i3ConfigIncludePath                     String
+hi def link i3ConfigGapStyleKeyword                 i3ConfigOption
+hi def link i3ConfigGapStyle                        i3ConfigCommand
+hi def link i3ConfigSmartGapKeyword                 i3ConfigOption
+hi def link i3ConfigSmartGap                        i3ConfigKeyword
+hi def link i3ConfigSmartBorderKeyword              i3ConfigOption
+hi def link i3ConfigSmartBorder                     i3ConfigKeyword
+hi def link i3ConfigAction                          i3ConfigCommand
+hi def link i3ConfigOption                          Type
+hi def link i3ConfigUnit                            i3ConfigNumber
+hi def link i3ConfigUnitOr                          i3ConfigOperator
+hi def link i3ConfigBindKeyword                     i3ConfigKeyword
+hi def link i3ConfigBindModkey                      Special
+hi def link i3ConfigBindCombo                       SpecialChar
+hi def link i3ConfigBindModifier                    i3ConfigOperator
+hi def link i3ConfigBindArgument                    i3ConfigShParam
+hi def link i3ConfigFloatingModifierKeyword         i3ConfigKeyword
+hi def link i3ConfigSizeSpecial                     i3ConfigOperator
+hi def link i3ConfigFloatingSizeKeyword             i3ConfigKeyword
+hi def link i3ConfigOrientationKeyword              i3ConfigOption
+hi def link i3ConfigOrientation                     i3ConfigKeyword
+hi def link i3ConfigLayoutKeyword                   i3ConfigOption
+hi def link i3ConfigLayout                          i3ConfigKeyword
+hi def link i3ConfigBorderStyleKeyword              i3ConfigOption
+hi def link i3ConfigBorderStyle                     i3ConfigKeyword
+hi def link i3ConfigEdgeKeyword                     i3ConfigOption
+hi def link i3ConfigEdge                            i3ConfigKeyword
+hi def link i3ConfigCommandKeyword                  i3ConfigKeyword
+hi def link i3ConfigEqualsOperator                  i3ConfigOperator
+hi def link i3ConfigConditionalText                 Conditional
+hi def link i3ConfigConditional                     Delimiter
+hi def link i3ConfigNoFocusKeyword                  i3ConfigKeyword
+hi def link i3ConfigAssignKeyword                   i3ConfigKeyword
+hi def link i3ConfigAssignSpecial                   i3ConfigOption
+hi def link i3ConfigResourceKeyword                 i3ConfigKeyword
+hi def link i3ConfigShParam                         PreProc
+hi def link i3ConfigShDelim                         Delimiter
+hi def link i3ConfigShOper                          Operator
+hi def link i3ConfigShCmdDelim                      i3ConfigShDelim
+hi def link i3ConfigShCommand                       Normal
+hi def link i3ConfigExecKeyword                     i3ConfigCommand
+hi def link i3ConfigExecAlwaysKeyword               i3ConfigKeyword
+hi def link i3ConfigWorkspaceKeyword                i3ConfigCommand
+hi def link i3ConfigOutput                          i3ConfigOption
+hi def link i3ConfigClientColorKeyword              i3ConfigKeyword
+hi def link i3ConfigClientColor                     Operator
+hi def link i3ConfigTitleAlignKeyword               i3ConfigOption
+hi def link i3ConfigTitleAlign                      i3ConfigKeyword
+hi def link i3ConfigInterprocessKeyword             i3ConfigKeyword
+hi def link i3ConfigMouseWarpingKeyword             i3ConfigKeyword
+hi def link i3ConfigMouseWarpingType                i3ConfigOption
+hi def link i3ConfigFocusFollowsMouseKeyword        i3ConfigKeyword
+hi def link i3ConfigFocusFollowsMouseType           i3ConfigOption
+hi def link i3ConfigFocusWrappingKeyword            i3ConfigKeyword
+hi def link i3ConfigFocusWrappingType               i3ConfigOption
+hi def link i3ConfigPopupOnFullscreenKeyword        i3ConfigKeyword
+hi def link i3ConfigPopupOnFullscreenType           i3ConfigOption
+hi def link i3ConfigForceXineramaKeyword            i3ConfigKeyword
+hi def link i3ConfigAutomaticSwitchKeyword          i3ConfigKeyword
+hi def link i3ConfigTimeUnit                        i3ConfigNumber
+hi def link i3ConfigDelayUrgencyKeyword             i3ConfigKeyword
+hi def link i3ConfigFocusOnActivationKeyword        i3ConfigKeyword
+hi def link i3ConfigFocusOnActivationType           i3ConfigOption
+hi def link i3ConfigShowMarksKeyword                i3ConfigKeyword
+hi def link i3ConfigModeKeyword                     i3ConfigKeyword
+hi def link i3ConfigColorsKeyword                   i3ConfigKeyword
+hi def link i3ConfigColorsCategory                  Type
+hi def link i3ConfigBarModifierKeyword              i3ConfigKeyword
+hi def link i3ConfigBarBlockKeyword                 i3ConfigKeyword
 
 let b:current_syntax = "i3config"
-- 
cgit 


From 6b5f44817e93c2985f3ea32122f1dc0047054018 Mon Sep 17 00:00:00 2001
From: L Lllvvuu <git@llllvvuu.dev>
Date: Mon, 11 Sep 2023 23:15:24 -0700
Subject: fix(languagetree): remove double recursion in LanguageTree:parse

`LanguageTree:parse` is recursive, and calls
`LanguageTree:for_each_child`, which is also recursive.

That means that, starting from the third level (child of child of root),
nodes will be parsed twice.

Which then means that if the tree is N layers deep, there will be ~2^N
parses even if the branching factor is 1.

Now, why was the tree deepening with each character inserted? And why
did this only regress in #24647? These are mysteries for another time.

Fixes: #25104
---
 runtime/lua/vim/treesitter/languagetree.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index e81778b269..3c60da7643 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -444,9 +444,9 @@ function LanguageTree:parse(range)
     range = range,
   })
 
-  self:for_each_child(function(child)
+  for _, child in pairs(self._children) do
     child:parse(range)
-  end)
+  end
 
   return self._trees
 end
-- 
cgit 


From b04286a187d57c50f01cd36cd4668b7a69026579 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Sun, 22 Nov 2020 10:10:37 +0100
Subject: feat(extmark): support proper multiline ranges

The removes the previous restriction that nvim_buf_set_extmark()
could not be used to highlight arbitrary multi-line regions

The problem can be summarized as follows: let's assume an extmark with a
hl_group is placed covering the region (5,0) to (50,0) Now, consider
what happens if nvim needs to redraw a window covering the lines 20-30.
It needs to be able to ask the marktree what extmarks cover this region,
even if they don't begin or end here.

Therefore the marktree needs to be augmented with the information covers
a point, not just what marks begin or end there. To do this, we augment
each node with a field "intersect" which is a set the ids of the
marks which overlap this node, but only if it is not part of the set of
any parent. This ensures the number of nodes that need to be explicitly
marked grows only logarithmically with the total number of explicitly
nodes (and thus the number of of overlapping marks).

Thus we can quickly iterate all marks which overlaps any query position
by looking up what leaf node contains that position. Then we only need
to consider all "start" marks within that leaf node, and the "intersect"
set of that node and all its parents.

Now, and the major source of complexity is that the tree restructuring
operations (to ensure that each node has T-1 <= size <= 2*T-1) also need
to update these sets. If a full inner node is split in two, one of the
new parents might start to completely overlap some ranges and its ids
will need to be moved from its children's sets to its own set.
Similarly, if two undersized nodes gets joined into one, it might no
longer completely overlap some ranges, and now the children which do
needs to have the have the ids in its set instead. And then there are
the pivots! Yes the pivot operations when a child gets moved from one
parent to another.
---
 runtime/doc/api.txt                   | 13 ++++++++++++-
 runtime/doc/news.txt                  |  9 +++++++++
 runtime/lua/vim/_meta/api.lua         | 18 +++++++++++++++++-
 runtime/lua/vim/_meta/api_keysets.lua |  7 +++++++
 runtime/lua/vim/highlight.lua         |  3 +++
 5 files changed, 48 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 9cdfd8a563..34e2aedabf 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2546,7 +2546,7 @@ nvim_buf_get_extmark_by_id({buffer}, {ns_id}, {id}, {opts})
         0-indexed (row, col) tuple or empty list () if extmark id was absent
 
                                                      *nvim_buf_get_extmarks()*
-nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {opts})
+nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {*opts})
     Gets |extmarks| in "traversal order" from a |charwise| region defined by
     buffer positions (inclusive, 0-indexed |api-indexing|).
 
@@ -2560,6 +2560,10 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {opts})
     If `end` is less than `start`, traversal works backwards. (Useful with
     `limit`, to get the first marks prior to a given position.)
 
+    Note: when using extmark ranges (marks with a end_row/end_col position)
+    the `overlap` option might be useful. Otherwise only the start position of
+    an extmark will be considered.
+
     Example: >lua
       local api = vim.api
       local pos = api.nvim_win_get_cursor(0)
@@ -2589,6 +2593,8 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {opts})
                   • details: Whether to include the details dict
                   • hl_name: Whether to include highlight group name instead
                     of id, true if omitted
+                  • overlap: Also include marks which overlap the range, even
+                    if their start position is less than `start`
                   • type: Filter marks by type: "highlight", "sign",
                     "virt_text" and "virt_lines"
 
@@ -2608,6 +2614,11 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {*opts})
     Using the optional arguments, it is possible to use this to highlight a
     range of text, and also to associate virtual text to the mark.
 
+    If present, the position defined by `end_col` and `end_row` should be
+    after the start position in order for the extmark to cover a range. An
+    earlier end position is not an error, but then it behaves like an empty
+    range (no highlighting).
+
     Parameters: ~
       • {buffer}  Buffer handle, or 0 for current buffer
       • {ns_id}   Namespace id from |nvim_create_namespace()|
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index cd977a8b5f..93012e78a9 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -221,6 +221,15 @@ The following changes to existing APIs or features add new behavior.
   "virtual_text" table, which gives users more control over how diagnostic
   virtual text is displayed.
 
+• Extmarks now fully support multi-line ranges, and a single extmark can be
+  used to highlight a range of arbitrary length. The |nvim_buf_set_extmark()|
+  API function already allowed you to define such ranges, but highlight regions
+  were not rendered consistently for a range that covers more than one line break.
+  This has now been fixed. Signs defined as part of a multi-line extmark also
+  apply to every line in the range, not just the first.
+  In addition, |nvim_buf_get_extmarks()| has gained an "overlap" option to
+  return such ranges even if they started before the specified position.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index bfff16933a..7cd0d825a1 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -5,6 +5,13 @@ error('Cannot require a meta file')
 
 vim.api = {}
 
+--- @private
+--- @param buffer integer
+--- @param keys boolean
+--- @param dot boolean
+--- @return string
+function vim.api.nvim__buf_debug_extmarks(buffer, keys, dot) end
+
 --- @private
 --- @param buffer integer
 --- @param first integer
@@ -313,6 +320,9 @@ function vim.api.nvim_buf_get_extmark_by_id(buffer, ns_id, id, opts) end
 --- ```
 --- If `end` is less than `start`, traversal works backwards. (Useful with
 --- `limit`, to get the first marks prior to a given position.)
+--- Note: when using extmark ranges (marks with a end_row/end_col position)
+--- the `overlap` option might be useful. Otherwise only the start position of
+--- an extmark will be considered.
 --- Example:
 --- ```lua
 ---   local api = vim.api
@@ -337,11 +347,13 @@ function vim.api.nvim_buf_get_extmark_by_id(buffer, ns_id, id, opts) end
 --- @param end_ any End of range (inclusive): a 0-indexed (row, col) or valid
 ---               extmark id (whose position defines the bound).
 ---               `api-indexing`
---- @param opts table<string,any> Optional parameters. Keys:
+--- @param opts vim.api.keyset.get_extmarks Optional parameters. Keys:
 ---               • limit: Maximum number of marks to return
 ---               • details: Whether to include the details dict
 ---               • hl_name: Whether to include highlight group name instead
 ---                 of id, true if omitted
+---               • overlap: Also include marks which overlap the range, even
+---                 if their start position is less than `start`
 ---               • type: Filter marks by type: "highlight", "sign",
 ---                 "virt_text" and "virt_lines"
 --- @return any[]
@@ -457,6 +469,10 @@ function vim.api.nvim_buf_line_count(buffer) end
 --- waiting for the return value.)
 --- Using the optional arguments, it is possible to use this to highlight a
 --- range of text, and also to associate virtual text to the mark.
+--- If present, the position defined by `end_col` and `end_row` should be
+--- after the start position in order for the extmark to cover a range. An
+--- earlier end position is not an error, but then it behaves like an empty
+--- range (no highlighting).
 ---
 --- @param buffer integer Buffer handle, or 0 for current buffer
 --- @param ns_id integer Namespace id from `nvim_create_namespace()`
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index 8f36edba77..4d08563ce2 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -122,6 +122,13 @@ error('Cannot require a meta file')
 --- @class vim.api.keyset.get_commands
 --- @field builtin? boolean
 
+--- @class vim.api.keyset.get_extmarks
+--- @field limit? integer
+--- @field details? boolean
+--- @field hl_name? boolean
+--- @field overlap? boolean
+--- @field type? string
+
 --- @class vim.api.keyset.get_highlight
 --- @field id? integer
 --- @field name? string
diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index 14b0e71312..fd4fb54a5b 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -55,6 +55,9 @@ function M.range(bufnr, ns, higroup, start, finish, opts)
   local inclusive = opts.inclusive or false
   local priority = opts.priority or M.priorities.user
 
+  -- TODO: in case of 'v', 'V' (not block), this should calculate equivalent
+  -- bounds (row, col, end_row, end_col) as multiline regions are natively
+  -- supported now
   local region = vim.region(bufnr, start, finish, regtype, inclusive)
   for linenr, cols in pairs(region) do
     local end_row
-- 
cgit 


From 7a76fb8547548304450b59624f9c75a554396504 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 12 Sep 2023 11:38:31 +0100
Subject: fix(treesitter): remove more double recursion

Do not call `for_each_child` in functions that are already recursive.
---
 runtime/lua/vim/treesitter/dev.lua          | 20 ++++++--------
 runtime/lua/vim/treesitter/languagetree.lua | 43 ++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 27 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 72b6e3db4a..67aa8670ba 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -101,17 +101,15 @@ function TSTreeView:new(bufnr, lang)
   -- the root in the child tree to the {injections} table.
   local root = parser:parse(true)[1]:root()
   local injections = {} ---@type table<integer,table>
-  parser:for_each_child(function(child, lang_)
-    child:for_each_tree(function(tree)
-      local r = tree:root()
-      local node = root:named_descendant_for_range(r:range())
-      if node then
-        injections[node:id()] = {
-          lang = lang_,
-          root = r,
-        }
-      end
-    end)
+  parser:for_each_tree(function(tree, ltree)
+    local r = tree:root()
+    local node = root:named_descendant_for_range(r:range())
+    if node then
+      injections[node:id()] = {
+        lang = ltree:lang(),
+        root = r,
+      }
+    end
   end)
 
   local nodes = traverse(root, 0, parser:lang(), injections, {})
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 3c60da7643..6037b17b20 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -897,6 +897,20 @@ function LanguageTree:_edit(
     end
     return true
   end)
+
+  for _, child in pairs(self._children) do
+    child:_edit(
+      start_byte,
+      end_byte_old,
+      end_byte_new,
+      start_row,
+      start_col,
+      end_row_old,
+      end_col_old,
+      end_row_new,
+      end_col_new
+    )
+  end
 end
 
 ---@package
@@ -943,20 +957,17 @@ function LanguageTree:_on_bytes(
   )
 
   -- Edit trees together BEFORE emitting a bytes callback.
-  ---@private
-  self:for_each_child(function(child)
-    child:_edit(
-      start_byte,
-      start_byte + old_byte,
-      start_byte + new_byte,
-      start_row,
-      start_col,
-      start_row + old_row,
-      old_end_col,
-      start_row + new_row,
-      new_end_col
-    )
-  end, true)
+  self:_edit(
+    start_byte,
+    start_byte + old_byte,
+    start_byte + new_byte,
+    start_row,
+    start_col,
+    start_row + old_row,
+    old_end_col,
+    start_row + new_row,
+    new_end_col
+  )
 
   self:_do_callback(
     'bytes',
@@ -1017,9 +1028,9 @@ function LanguageTree:register_cbs(cbs, recursive)
   end
 
   if recursive then
-    self:for_each_child(function(child)
+    for _, child in pairs(self._children) do
       child:register_cbs(cbs, true)
-    end)
+    end
   end
 end
 
-- 
cgit 


From 1f551e068f728ff38bd7fdcfa3a6daf362bab9da Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 12 Sep 2023 15:26:57 +0100
Subject: fix(treesitter): fixup for InspectTree

Fixes #25120
---
 runtime/lua/vim/treesitter/dev.lua | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 67aa8670ba..e7af259d28 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -101,16 +101,18 @@ function TSTreeView:new(bufnr, lang)
   -- the root in the child tree to the {injections} table.
   local root = parser:parse(true)[1]:root()
   local injections = {} ---@type table<integer,table>
-  parser:for_each_tree(function(tree, ltree)
-    local r = tree:root()
-    local node = root:named_descendant_for_range(r:range())
-    if node then
-      injections[node:id()] = {
-        lang = ltree:lang(),
-        root = r,
-      }
-    end
-  end)
+  for _, child in pairs(parser:children()) do
+    child:for_each_tree(function(tree, ltree)
+      local r = tree:root()
+      local node = root:named_descendant_for_range(r:range())
+      if node then
+        injections[node:id()] = {
+          lang = ltree:lang(),
+          root = r,
+        }
+      end
+    end)
+  end
 
   local nodes = traverse(root, 0, parser:lang(), injections, {})
 
-- 
cgit 


From 4607807f9fcb83d4e183f6f67e705ffd7f451077 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sun, 20 Aug 2023 14:17:45 +0900
Subject: fix(treesitter): don't update fold if tree is unchanged

Problem:
Folds are opened when the visible range changes even if there are no
modifications to the buffer, e.g, when using zM for the first time. If
the parsed tree was invalid, on_win re-parses and gets empty tree
changes, which triggers fold updates.

Solution:
Don't update folds in on_changedtree if there are no changes.
---
 runtime/lua/vim/treesitter/_fold.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index d82e04a5a8..8bc08c9c2e 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -299,7 +299,9 @@ local function on_changedtree(bufnr, foldinfo, tree_changes)
       local srow, _, erow = Range.unpack4(change)
       get_folds_levels(bufnr, foldinfo, srow, erow)
     end
-    foldupdate(bufnr)
+    if #tree_changes > 0 then
+      foldupdate(bufnr)
+    end
   end)
 end
 
-- 
cgit 


From 27a566f3f8e07a4cebb426674800bdf9a7f4f222 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 13 Sep 2023 08:38:28 -0500
Subject: feat(vimdoc): support Markdown code blocks (#25127)

Support Markdown code blocks in addition to <pre> blocks in Doxygen doc
comments.

Update doc comments in iter.lua as a test.
---
 runtime/doc/develop.txt  |  16 ++-
 runtime/doc/lua.txt      | 274 +++++++++++++++++++++++------------------------
 runtime/lua/vim/iter.lua | 187 ++++++++++++++++++--------------
 3 files changed, 253 insertions(+), 224 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index b3f7d1fadc..0ed537c248 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -192,7 +192,7 @@ Docstring format:
   `@note`, `@param`, `@returns`
 - Limited markdown is supported.
   - List-items start with `-` (useful to nest or "indent")
-- Use `<pre>` for code samples.
+- Use ``` for code samples.
   Code samples can be annotated as `vim` or `lua`
 
 Example: the help for |nvim_open_win()| is generated from a docstring defined
@@ -202,10 +202,16 @@ in src/nvim/api/win_config.c like this: >
     /// ...
     ///
     /// Example (Lua): window-relative float
-    /// <pre>lua
-    ///     vim.api.nvim_open_win(0, false,
-    ///       {relative='win', row=3, col=3, width=12, height=3})
-    /// </pre>
+    ///
+    /// ```lua
+    /// vim.api.nvim_open_win(0, false, {
+    ///   relative='win',
+    ///   row=3,
+    ///   col=3,
+    ///   width=12,
+    ///   height=3,
+    /// })
+    /// ```
     ///
     /// @param buffer Buffer to display
     /// @param enter  Enter the window
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 71f001f4fc..61afd4698a 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3229,42 +3229,42 @@ first value returned by the function is nil).
 
 Examples: >lua
 
-   local it = vim.iter({ 1, 2, 3, 4, 5 })
-   it:map(function(v)
-     return v * 3
-   end)
-   it:rev()
-   it:skip(2)
-   it:totable()
-   -- { 9, 6, 3 }
-
-   -- ipairs() is a function iterator which returns both the index (i) and the value (v)
-   vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
-     if i > 2 then return v end
-   end):totable()
-   -- { 3, 4, 5 }
-
-   local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
-   it:map(function(s) return tonumber(s) end)
-   for i, d in it:enumerate() do
-     print(string.format("Column %d is %d", i, d))
-   end
-   -- Column 1 is 1
-   -- Column 2 is 2
-   -- Column 3 is 3
-   -- Column 4 is 4
-   -- Column 5 is 5
-
-   vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
-     return k == 'z'
-   end)
-   -- true
+    local it = vim.iter({ 1, 2, 3, 4, 5 })
+    it:map(function(v)
+      return v * 3
+    end)
+    it:rev()
+    it:skip(2)
+    it:totable()
+    -- { 9, 6, 3 }
+
+    -- ipairs() is a function iterator which returns both the index (i) and the value (v)
+    vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
+      if i > 2 then return v end
+    end):totable()
+    -- { 3, 4, 5 }
+
+    local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
+    it:map(function(s) return tonumber(s) end)
+    for i, d in it:enumerate() do
+      print(string.format("Column %d is %d", i, d))
+    end
+    -- Column 1 is 1
+    -- Column 2 is 2
+    -- Column 3 is 3
+    -- Column 4 is 4
+    -- Column 5 is 5
+
+    vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
+      return k == 'z'
+    end)
+    -- true
 
-   local rb = vim.ringbuf(3)
-   rb:push("a")
-   rb:push("b")
-   vim.iter(rb):totable()
-   -- { "a", "b" }
+    local rb = vim.ringbuf(3)
+    rb:push("a")
+    rb:push("b")
+    vim.iter(rb):totable()
+    -- { "a", "b" }
 
 <
 
@@ -3276,7 +3276,7 @@ filter({f}, {src}, {...})                                  *vim.iter.filter()*
 
     This is a convenience function that performs: >lua
 
-     vim.iter(src):filter(f):totable()
+        vim.iter(src):filter(f):totable()
 <
 
     Parameters: ~
@@ -3326,25 +3326,25 @@ Iter:enumerate()                                            *Iter:enumerate()*
 
     For list tables, prefer >lua
 
-     vim.iter(ipairs(t))
+        vim.iter(ipairs(t))
 <
 
     over >lua
 
-     vim.iter(t):enumerate()
+        vim.iter(t):enumerate()
 <
 
     as the former is faster.
 
     Example: >lua
 
-     local it = vim.iter(vim.gsplit('abc', '')):enumerate()
-     it:next()
-     -- 1   'a'
-     it:next()
-     -- 2   'b'
-     it:next()
-     -- 3   'c'
+        local it = vim.iter(vim.gsplit('abc', '')):enumerate()
+        it:next()
+        -- 1   'a'
+        it:next()
+        -- 2   'b'
+        it:next()
+        -- 3   'c'
 <
 
     Return: ~
@@ -3355,7 +3355,7 @@ Iter:filter({f})                                               *Iter:filter()*
 
     Example: >lua
 
-     local bufs = vim.iter(vim.api.nvim_list_bufs()):filter(vim.api.nvim_buf_is_loaded)
+        local bufs = vim.iter(vim.api.nvim_list_bufs()):filter(vim.api.nvim_buf_is_loaded)
 <
 
     Parameters: ~
@@ -3374,17 +3374,17 @@ Iter:find({f})                                                   *Iter:find()*
 
     Examples: >lua
 
-     local it = vim.iter({ 3, 6, 9, 12 })
-     it:find(12)
-     -- 12
+        local it = vim.iter({ 3, 6, 9, 12 })
+        it:find(12)
+        -- 12
 
-     local it = vim.iter({ 3, 6, 9, 12 })
-     it:find(20)
-     -- nil
+        local it = vim.iter({ 3, 6, 9, 12 })
+        it:find(20)
+        -- nil
 
-     local it = vim.iter({ 3, 6, 9, 12 })
-     it:find(function(v) return v % 4 == 0 end)
-     -- 12
+        local it = vim.iter({ 3, 6, 9, 12 })
+        it:find(function(v) return v % 4 == 0 end)
+        -- 12
 <
 
     Return: ~
@@ -3395,15 +3395,15 @@ Iter:fold({init}, {f})                                           *Iter:fold()*
 
     Examples: >lua
 
-     -- Create a new table with only even values
-     local t = { a = 1, b = 2, c = 3, d = 4 }
-     local it = vim.iter(t)
-     it:filter(function(k, v) return v % 2 == 0 end)
-     it:fold({}, function(t, k, v)
-       t[k] = v
-       return t
-     end)
-     -- { b = 2, d = 4 }
+        -- Create a new table with only even values
+        local t = { a = 1, b = 2, c = 3, d = 4 }
+        local it = vim.iter(t)
+        it:filter(function(k, v) return v % 2 == 0 end)
+        it:fold({}, function(t, k, v)
+          t[k] = v
+          return t
+        end)
+        -- { b = 2, d = 4 }
 <
 
     Parameters: ~
@@ -3420,13 +3420,13 @@ Iter:last()                                                      *Iter:last()*
 
     Example: >lua
 
-     local it = vim.iter(vim.gsplit('abcdefg', ''))
-     it:last()
-     -- 'g'
+        local it = vim.iter(vim.gsplit('abcdefg', ''))
+        it:last()
+        -- 'g'
 
-     local it = vim.iter({ 3, 6, 9, 12, 15 })
-     it:last()
-     -- 15
+        local it = vim.iter({ 3, 6, 9, 12, 15 })
+        it:last()
+        -- 15
 <
 
     Return: ~
@@ -3439,13 +3439,13 @@ Iter:map({f})                                                     *Iter:map()*
 
     Example: >lua
 
-     local it = vim.iter({ 1, 2, 3, 4 }):map(function(v)
-       if v % 2 == 0 then
-         return v * 3
-       end
-     end)
-     it:totable()
-     -- { 6, 12 }
+        local it = vim.iter({ 1, 2, 3, 4 }):map(function(v)
+          if v % 2 == 0 then
+            return v * 3
+          end
+        end)
+        it:totable()
+        -- { 6, 12 }
 <
 
     Parameters: ~
@@ -3462,13 +3462,13 @@ Iter:next()                                                      *Iter:next()*
 
     Example: >lua
 
-     local it = vim.iter(string.gmatch('1 2 3', 'd+')):map(tonumber)
-     it:next()
-     -- 1
-     it:next()
-     -- 2
-     it:next()
-     -- 3
+        local it = vim.iter(string.gmatch('1 2 3', '%d+')):map(tonumber)
+        it:next()
+        -- 1
+        it:next()
+        -- 2
+        it:next()
+        -- 3
 <
 
     Return: ~
@@ -3481,11 +3481,11 @@ Iter:nextback()                                              *Iter:nextback()*
 
     Example: >lua
 
-     local it = vim.iter({1, 2, 3, 4})
-     it:nextback()
-     -- 4
-     it:nextback()
-     -- 3
+        local it = vim.iter({1, 2, 3, 4})
+        it:nextback()
+        -- 4
+        it:nextback()
+        -- 3
 <
 
     Return: ~
@@ -3498,11 +3498,11 @@ Iter:nth({n})                                                     *Iter:nth()*
 
     Example: >lua
 
-     local it = vim.iter({ 3, 6, 9, 12 })
-     it:nth(2)
-     -- 6
-     it:nth(2)
-     -- 12
+        local it = vim.iter({ 3, 6, 9, 12 })
+        it:nth(2)
+        -- 6
+        it:nth(2)
+        -- 12
 <
 
     Parameters: ~
@@ -3520,11 +3520,11 @@ Iter:nthback({n})                                             *Iter:nthback()*
 
     Example: >lua
 
-     local it = vim.iter({ 3, 6, 9, 12 })
-     it:nthback(2)
-     -- 9
-     it:nthback(2)
-     -- 3
+        local it = vim.iter({ 3, 6, 9, 12 })
+        it:nthback(2)
+        -- 9
+        it:nthback(2)
+        -- 3
 <
 
     Parameters: ~
@@ -3540,13 +3540,13 @@ Iter:peek()                                                      *Iter:peek()*
 
     Example: >lua
 
-     local it = vim.iter({ 3, 6, 9, 12 })
-     it:peek()
-     -- 3
-     it:peek()
-     -- 3
-     it:next()
-     -- 3
+        local it = vim.iter({ 3, 6, 9, 12 })
+        it:peek()
+        -- 3
+        it:peek()
+        -- 3
+        it:next()
+        -- 3
 <
 
     Return: ~
@@ -3559,13 +3559,13 @@ Iter:peekback()                                              *Iter:peekback()*
 
     Example: >lua
 
-     local it = vim.iter({1, 2, 3, 4})
-     it:peekback()
-     -- 4
-     it:peekback()
-     -- 4
-     it:nextback()
-     -- 4
+        local it = vim.iter({1, 2, 3, 4})
+        it:peekback()
+        -- 4
+        it:peekback()
+        -- 4
+        it:nextback()
+        -- 4
 <
 
     Return: ~
@@ -3578,9 +3578,9 @@ Iter:rev()                                                        *Iter:rev()*
 
     Example: >lua
 
-     local it = vim.iter({ 3, 6, 9, 12 }):rev()
-     it:totable()
-     -- { 12, 9, 6, 3 }
+        local it = vim.iter({ 3, 6, 9, 12 }):rev()
+        it:totable()
+        -- { 12, 9, 6, 3 }
 <
 
     Return: ~
@@ -3597,11 +3597,11 @@ Iter:rfind({f})                                                 *Iter:rfind()*
 
     Examples: >lua
 
-     local it = vim.iter({ 1, 2, 3, 2, 1 }):enumerate()
-     it:rfind(1)
-     -- 5   1
-     it:rfind(1)
-     -- 1   1
+        local it = vim.iter({ 1, 2, 3, 2, 1 }):enumerate()
+        it:rfind(1)
+        -- 5   1
+        it:rfind(1)
+        -- 1   1
 <
 
     Return: ~
@@ -3615,9 +3615,9 @@ Iter:skip({n})                                                   *Iter:skip()*
 
     Example: >lua
 
-     local it = vim.iter({ 3, 6, 9, 12 }):skip(2)
-     it:next()
-     -- 9
+        local it = vim.iter({ 3, 6, 9, 12 }):skip(2)
+        it:next()
+        -- 9
 <
 
     Parameters: ~
@@ -3633,11 +3633,11 @@ Iter:skipback({n})                                           *Iter:skipback()*
 
     Example: >lua
 
-     local it = vim.iter({ 1, 2, 3, 4, 5 }):skipback(2)
-     it:next()
-     -- 1
-     it:nextback()
-     -- 3
+        local it = vim.iter({ 1, 2, 3, 4, 5 }):skipback(2)
+        it:next()
+        -- 1
+        it:nextback()
+        -- 3
 <
 
     Parameters: ~
@@ -3670,14 +3670,14 @@ Iter:totable()                                                *Iter:totable()*
 
     Examples: >lua
 
-     vim.iter(string.gmatch('100 20 50', 'd+')):map(tonumber):totable()
-     -- { 100, 20, 50 }
+        vim.iter(string.gmatch('100 20 50', '%d+')):map(tonumber):totable()
+        -- { 100, 20, 50 }
 
-     vim.iter({ 1, 2, 3 }):map(function(v) return v, 2 * v end):totable()
-     -- { { 1, 2 }, { 2, 4 }, { 3, 6 } }
+        vim.iter({ 1, 2, 3 }):map(function(v) return v, 2 * v end):totable()
+        -- { { 1, 2 }, { 2, 4 }, { 3, 6 } }
 
-     vim.iter({ a = 1, b = 2, c = 3 }):filter(function(k, v) return v % 2 ~= 0 end):totable()
-     -- { { 'a', 1 }, { 'c', 3 } }
+        vim.iter({ a = 1, b = 2, c = 3 }):filter(function(k, v) return v % 2 ~= 0 end):totable()
+        -- { { 'a', 1 }, { 'c', 3 } }
 <
 
     The generated table is a list-like table with consecutive, numeric
@@ -3692,7 +3692,7 @@ map({f}, {src}, {...})                                        *vim.iter.map()*
 
     This is a convenience function that performs: >lua
 
-     vim.iter(src):map(f):totable()
+        vim.iter(src):map(f):totable()
 <
 
     Parameters: ~
@@ -3712,7 +3712,7 @@ totable({f}, {...})                                       *vim.iter.totable()*
 
     This is a convenience function that performs: >lua
 
-     vim.iter(f):totable()
+        vim.iter(f):totable()
 <
 
     Parameters: ~
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 56c130dd0c..595baa7019 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -15,44 +15,45 @@
 --- (for function iterators, this means that the first value returned by the function is nil).
 ---
 --- Examples:
---- <pre>lua
----   local it = vim.iter({ 1, 2, 3, 4, 5 })
----   it:map(function(v)
----     return v * 3
----   end)
----   it:rev()
----   it:skip(2)
----   it:totable()
----   -- { 9, 6, 3 }
----
----   -- ipairs() is a function iterator which returns both the index (i) and the value (v)
----   vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
----     if i > 2 then return v end
----   end):totable()
----   -- { 3, 4, 5 }
----
----   local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
----   it:map(function(s) return tonumber(s) end)
----   for i, d in it:enumerate() do
----     print(string.format("Column %d is %d", i, d))
----   end
----   -- Column 1 is 1
----   -- Column 2 is 2
----   -- Column 3 is 3
----   -- Column 4 is 4
----   -- Column 5 is 5
----
----   vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
----     return k == 'z'
----   end)
----   -- true
----
----   local rb = vim.ringbuf(3)
----   rb:push("a")
----   rb:push("b")
----   vim.iter(rb):totable()
----   -- { "a", "b" }
---- </pre>
+---
+--- ```lua
+--- local it = vim.iter({ 1, 2, 3, 4, 5 })
+--- it:map(function(v)
+---   return v * 3
+--- end)
+--- it:rev()
+--- it:skip(2)
+--- it:totable()
+--- -- { 9, 6, 3 }
+---
+--- -- ipairs() is a function iterator which returns both the index (i) and the value (v)
+--- vim.iter(ipairs({ 1, 2, 3, 4, 5 })):map(function(i, v)
+---   if i > 2 then return v end
+--- end):totable()
+--- -- { 3, 4, 5 }
+---
+--- local it = vim.iter(vim.gsplit('1,2,3,4,5', ','))
+--- it:map(function(s) return tonumber(s) end)
+--- for i, d in it:enumerate() do
+---   print(string.format("Column %d is %d", i, d))
+--- end
+--- -- Column 1 is 1
+--- -- Column 2 is 2
+--- -- Column 3 is 3
+--- -- Column 4 is 4
+--- -- Column 5 is 5
+---
+--- vim.iter({ a = 1, b = 2, c = 3, z = 26 }):any(function(k, v)
+---   return k == 'z'
+--- end)
+--- -- true
+---
+--- local rb = vim.ringbuf(3)
+--- rb:push("a")
+--- rb:push("b")
+--- vim.iter(rb):totable()
+--- -- { "a", "b" }
+--- ```
 ---
 --- In addition to the |vim.iter()| function, the |vim.iter| module provides
 --- convenience functions like |vim.iter.filter()| and |vim.iter.totable()|.
@@ -140,9 +141,10 @@ end
 --- Add a filter step to the iterator pipeline.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 --- local bufs = vim.iter(vim.api.nvim_list_bufs()):filter(vim.api.nvim_buf_is_loaded)
---- </pre>
+--- ```
 ---
 ---@param f function(...):bool Takes all values returned from the previous stage
 ---                            in the pipeline and returns false or nil if the
@@ -176,7 +178,8 @@ end
 --- If the map function returns nil, the value is filtered from the iterator.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 --- local it = vim.iter({ 1, 2, 3, 4 }):map(function(v)
 ---   if v % 2 == 0 then
 ---     return v * 3
@@ -184,7 +187,7 @@ end
 --- end)
 --- it:totable()
 --- -- { 6, 12 }
---- </pre>
+--- ```
 ---
 ---@param f function(...):any Mapping function. Takes all values returned from
 ---                           the previous stage in the pipeline as arguments
@@ -288,7 +291,8 @@ end
 --- pipeline, each value will be included in a table.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 --- vim.iter(string.gmatch('100 20 50', '%d+')):map(tonumber):totable()
 --- -- { 100, 20, 50 }
 ---
@@ -297,7 +301,7 @@ end
 ---
 --- vim.iter({ a = 1, b = 2, c = 3 }):filter(function(k, v) return v % 2 ~= 0 end):totable()
 --- -- { { 'a', 1 }, { 'c', 3 } }
---- </pre>
+--- ```
 ---
 --- The generated table is a list-like table with consecutive, numeric indices.
 --- To create a map-like table with arbitrary keys, use |Iter:fold()|.
@@ -352,7 +356,8 @@ end
 --- Fold ("reduce") an iterator or table into a single value.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 --- -- Create a new table with only even values
 --- local t = { a = 1, b = 2, c = 3, d = 4 }
 --- local it = vim.iter(t)
@@ -362,7 +367,7 @@ end
 ---   return t
 --- end)
 --- -- { b = 2, d = 4 }
---- </pre>
+--- ```
 ---
 ---@generic A
 ---
@@ -398,7 +403,8 @@ end
 --- Return the next value from the iterator.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter(string.gmatch('1 2 3', '%d+')):map(tonumber)
 --- it:next()
@@ -408,7 +414,7 @@ end
 --- it:next()
 --- -- 3
 ---
---- </pre>
+--- ```
 ---
 ---@return any
 function Iter.next(self) -- luacheck: no unused args
@@ -431,13 +437,14 @@ end
 --- Only supported for iterators on list-like tables.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter({ 3, 6, 9, 12 }):rev()
 --- it:totable()
 --- -- { 12, 9, 6, 3 }
 ---
---- </pre>
+--- ```
 ---
 ---@return Iter
 function Iter.rev(self)
@@ -457,7 +464,8 @@ end
 --- Only supported for iterators on list-like tables.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter({ 3, 6, 9, 12 })
 --- it:peek()
@@ -467,7 +475,7 @@ end
 --- it:next()
 --- -- 3
 ---
---- </pre>
+--- ```
 ---
 ---@return any
 function Iter.peek(self) -- luacheck: no unused args
@@ -486,7 +494,8 @@ end
 --- Advances the iterator. Returns nil and drains the iterator if no value is found.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter({ 3, 6, 9, 12 })
 --- it:find(12)
@@ -500,7 +509,7 @@ end
 --- it:find(function(v) return v % 4 == 0 end)
 --- -- 12
 ---
---- </pre>
+--- ```
 ---
 ---@return any
 function Iter.find(self, f)
@@ -536,7 +545,8 @@ end
 --- Only supported for iterators on list-like tables.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter({ 1, 2, 3, 2, 1 }):enumerate()
 --- it:rfind(1)
@@ -544,7 +554,7 @@ end
 --- it:rfind(1)
 --- -- 1	1
 ---
---- </pre>
+--- ```
 ---
 ---@see Iter.find
 ---
@@ -578,13 +588,14 @@ end
 --- Only supported for iterators on list-like tables.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 --- local it = vim.iter({1, 2, 3, 4})
 --- it:nextback()
 --- -- 4
 --- it:nextback()
 --- -- 3
---- </pre>
+--- ```
 ---
 ---@return any
 function Iter.nextback(self) -- luacheck: no unused args
@@ -604,7 +615,8 @@ end
 --- Only supported for iterators on list-like tables.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 --- local it = vim.iter({1, 2, 3, 4})
 --- it:peekback()
 --- -- 4
@@ -612,7 +624,7 @@ end
 --- -- 4
 --- it:nextback()
 --- -- 4
---- </pre>
+--- ```
 ---
 ---@return any
 function Iter.peekback(self) -- luacheck: no unused args
@@ -629,13 +641,14 @@ end
 --- Skip values in the iterator.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter({ 3, 6, 9, 12 }):skip(2)
 --- it:next()
 --- -- 9
 ---
---- </pre>
+--- ```
 ---
 ---@param n number Number of values to skip.
 ---@return Iter
@@ -661,13 +674,14 @@ end
 --- Only supported for iterators on list-like tables.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 --- local it = vim.iter({ 1, 2, 3, 4, 5 }):skipback(2)
 --- it:next()
 --- -- 1
 --- it:nextback()
 --- -- 3
---- </pre>
+--- ```
 ---
 ---@param n number Number of values to skip.
 ---@return Iter
@@ -691,7 +705,8 @@ end
 --- This function advances the iterator.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter({ 3, 6, 9, 12 })
 --- it:nth(2)
@@ -699,7 +714,7 @@ end
 --- it:nth(2)
 --- -- 12
 ---
---- </pre>
+--- ```
 ---
 ---@param n number The index of the value to return.
 ---@return any
@@ -716,7 +731,8 @@ end
 --- Only supported for iterators on list-like tables.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter({ 3, 6, 9, 12 })
 --- it:nthback(2)
@@ -724,7 +740,7 @@ end
 --- it:nthback(2)
 --- -- 3
 ---
---- </pre>
+--- ```
 ---
 ---@param n number The index of the value to return.
 ---@return any
@@ -805,7 +821,8 @@ end
 --- Drains the iterator.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter(vim.gsplit('abcdefg', ''))
 --- it:last()
@@ -815,7 +832,7 @@ end
 --- it:last()
 --- -- 15
 ---
---- </pre>
+--- ```
 ---
 ---@return any
 function Iter.last(self)
@@ -839,19 +856,22 @@ end
 --- Add an iterator stage that returns the current iterator count as well as the iterator value.
 ---
 --- For list tables, prefer
---- <pre>lua
+---
+--- ```lua
 --- vim.iter(ipairs(t))
---- </pre>
+--- ```
 ---
 --- over
---- <pre>lua
+---
+--- ```lua
 --- vim.iter(t):enumerate()
---- </pre>
+--- ```
 ---
 --- as the former is faster.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 ---
 --- local it = vim.iter(vim.gsplit('abc', '')):enumerate()
 --- it:next()
@@ -861,7 +881,7 @@ end
 --- it:next()
 --- -- 3	'c'
 ---
---- </pre>
+--- ```
 ---
 ---@return Iter
 function Iter.enumerate(self)
@@ -959,9 +979,10 @@ end
 --- Collect an iterator into a table.
 ---
 --- This is a convenience function that performs:
---- <pre>lua
+---
+--- ```lua
 --- vim.iter(f):totable()
---- </pre>
+--- ```
 ---
 ---@param f function Iterator function
 ---@return table
@@ -972,9 +993,10 @@ end
 --- Filter a table or iterator.
 ---
 --- This is a convenience function that performs:
---- <pre>lua
+---
+--- ```lua
 --- vim.iter(src):filter(f):totable()
---- </pre>
+--- ```
 ---
 ---@see |Iter:filter()|
 ---
@@ -990,9 +1012,10 @@ end
 --- Map and filter a table or iterator.
 ---
 --- This is a convenience function that performs:
---- <pre>lua
+---
+--- ```lua
 --- vim.iter(src):map(f):totable()
---- </pre>
+--- ```
 ---
 ---@see |Iter:map()|
 ---
-- 
cgit 


From b1d24ca760ba16e73a504bebd704cec4c77291c5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 12 Sep 2023 22:29:37 +0200
Subject: vim-patch:f5356bf6751f
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(i3config): syntax structure cleanup (vim/vim#13080)

* syntax(i3config): improved i3config highlighting
* syntax(i3config): refactor structure

https://github.com/vim/vim/commit/f5356bf6751fc1af77c8d27c7286639527fde3f2

Co-authored-by: Josef Litoš <54900518+JosefLitos@users.noreply.github.com>
---
 runtime/syntax/i3config.vim | 466 ++++++++++++++++++++++++--------------------
 1 file changed, 253 insertions(+), 213 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/i3config.vim b/runtime/syntax/i3config.vim
index 1eddd60f7c..8bc2a6e03c 100644
--- a/runtime/syntax/i3config.vim
+++ b/runtime/syntax/i3config.vim
@@ -4,7 +4,7 @@
 " Maintainer: Quentin Hibon (github user hiqua)
 " Version: 0.4.22
 " Reference version (JosefLitos/i3config.vim): 4.22
-" Last Change: 2023-09-09
+" Last Change: 2023-09-12
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -24,284 +24,324 @@ syn match i3ConfigError /.\+/
 " Todo
 syn keyword i3ConfigTodo TODO FIXME XXX contained
 
-" Comment
-" Comments are started with a # and can only be used at the beginning of a line
-syn match i3ConfigComment /^\s*#.*$/ contains=i3ConfigTodo
-
-syn match i3ConfigOperator /[,;:]/ contained
+" Helper type definitions
+syn match i3ConfigSeparator /[,;]/ contained
 syn match i3ConfigParen /[{}]/ contained
-
-" Font
-" A FreeType font description is composed by:
-" a font family, a style, a weight, a variant, a stretch and a size.
-syn keyword i3ConfigFontKeyword font contained
-syn match i3ConfigFontNamespace /\w\+:/ contained contains=i3ConfigOperator
-syn match i3ConfigFontContent /-\?\w\+\(-\+\|\s\+\|,\)/ contained contains=i3ConfigFontNamespace,i3ConfigFontKeyword,i3ConfigOperator
-syn match i3ConfigFontSize /\s\=\d\+\(px\)\?\s\?$/ contained
-syn match i3ConfigFont /^\s*font\s\+.*$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?[^\\]\+$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+\(\(.*\\\_.*\)\|\(.*[^\\]\+$\)\)/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace
-
-" Common value types
 syn keyword i3ConfigBoolean yes no enabled disabled on off true false contained
-syn region i3ConfigString start=/"/ skip=/\\"/ end=/"/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable keepend extend
-syn region i3ConfigString start=/'/ end=/'/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable keepend extend
+syn region i3ConfigString start=/\W\@<="/ skip=/\\"/ end=/"/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable,i3ConfigExecAction keepend extend
+syn region i3ConfigString start=/\W\@<='/ end=/'/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable,i3ConfigExecAction keepend extend
 syn match i3ConfigColor /#\w\{3,8}/ contained
-syn match i3ConfigNumber /\([a-zA-Z0-9_$]\)\@<!\d\+\([a-zA-Z0-9_$]\)\@!/ contained
+syn match i3ConfigNumber /[a-zA-Z_$-]\@<!-\?\d\+\w\@!/ contained
 
-" Variables
-syn match i3ConfigVariable /\$[A-Z0-9a-z_:|[\]-]\+/
-syn keyword i3ConfigSetKeyword set contained
-syn match i3ConfigSet /^set \$.*$/ contains=i3ConfigVariable,i3ConfigSetKeyword,i3ConfigColor,i3ConfigString,i3ConfigNoStartupId,i3ConfigNumber,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper
-
-" Include other config files
+" 4.1 Include directive
 syn keyword i3ConfigIncludeKeyword include contained
-syn match i3ConfigCommandSubstitutionRegion /`[^`]*`/ contained contains=i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper,i3ConfigShCommand
-syn match i3ConfigIncludePath /[~./a-zA-Z0-9`][^~]*$/ contained contains=i3ConfigCommandSubstitutionRegion
-syn match i3ConfigInclude /^include .[^~]*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable,i3ConfigIncludePath
-
-" Gaps
-syn keyword i3ConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle up down contained
-syn match i3ConfigGapStyle /^gaps \(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,i3ConfigNumber,i3ConfigVariable
-syn keyword i3ConfigSmartGapKeyword on inverse_outer contained
-syn match i3ConfigSmartGap /^smart_gaps \(on\|inverse_outer\)$/ contains=i3ConfigSmartGapKeyword
-syn keyword i3ConfigSmartBorderKeyword on no_gaps contained
-syn match i3ConfigSmartBorder /^smart_borders \(on\|no_gaps\)$/ contains=i3ConfigSmartBorderKeyword
+syn match i3ConfigIncludeCommand /`[^`]*`/ contained contains=i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper,i3ConfigShCommand
+syn match i3ConfigInclude /^include .*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable,i3ConfigIncludeCommand
 
-" Commands useable in keybinds
-syn keyword i3ConfigAction move exit restart reload layout append_layout workspace focus kill open fullscreen sticky split floating mark unmark resize rename scratchpad swap mode bar gaps border nop contained
-syn keyword i3ConfigOption enable disable toggle mode_toggle key shrink grow height width restore container to left right up down position absolute relative window splitv splith tabbed stacked default on off inner outer current all set plus minus top bottom horizontal vertical auto none normal pixel prev next back_and_forth child parent show contained
-syn match i3ConfigUnit /\sp\(pt\|x\)/ contained
-syn match i3ConfigUnitOr /\sor/ contained
+" 4.2 Comments
+syn match i3ConfigComment /^\s*#.*$/ contains=i3ConfigTodo
+
+" 4.3 Fonts
+syn keyword i3ConfigFontKeyword font contained
+syn match i3ConfigColonOperator /:/ contained
+syn match i3ConfigFontNamespace /\w\+:/ contained contains=i3ConfigColonOperator
+syn match i3ConfigFontSize /\s\=\d\+\(px\)\?\s\?$/ contained
+syn region i3ConfigFont start=/^\s*font / skip=/\\$/ end=/$/ contains=i3ConfigFontKeyword,i3ConfigFontNamespace,i3ConfigFontSize,i3ConfigSeparator keepend
 
-" Keyboard bindings
+" 4.4-4.5 Keyboard/Mouse bindings
 syn keyword i3ConfigBindKeyword bindsym bindcode contained
 syn match i3ConfigBindArgument /--\(release\|border\|whole-window\|exclude-titlebar\)/ contained
 syn match i3ConfigBindModifier /+/ contained
 syn match i3ConfigBindModkey /Ctrl\|Shift\|Mod[1-5]/ contained
 syn match i3ConfigBindCombo /[$a-zA-Z0-9_+]\+ / contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey
 syn match i3ConfigBindComboLine /bind\(sym\|code\)\( --[a-z-]\+\)* [$a-zA-Z0-9_+]\+ / contained contains=i3ConfigBindKeyword,i3ConfigBindArgument,i3ConfigBindCombo
-syn match i3ConfigBind /^\s*bind\(sym\|code\)\s\+.*[^{]$/ contains=i3ConfigBindComboLine,i3ConfigNumber,i3ConfigVariable,i3ConfigAction,i3ConfigOption,i3ConfigGapStyleKeyword,i3ConfigOperator,i3ConfigString,i3ConfigUnit,i3ConfigUnitOr,i3ConfigConditional,i3ConfigBoolean,i3ConfigExec
+syn region i3ConfigBind start=/^\s*bind\(sym\|code\) / skip=/\\$/ end=/$/ contains=i3ConfigBindComboLine,i3ConfigCriteria,i3ConfigAction,i3ConfigSeparator,i3ConfigActionKeyword,i3ConfigOption,i3ConfigString,i3ConfigNumber,i3ConfigVariable,i3ConfigBoolean keepend
 
-" Floating modifier
-syn keyword i3ConfigFloatingModifierKeyword floating_modifier contained
-syn match i3ConfigFloatingModifier /^floating_modifier [$a-zA-Z0-9+]\+$/ contains=i3ConfigVariable,i3ConfigBindModkey,i3ConfigFloatingModifierKeyword
+" 4.6 Binding modes
+syn region i3ConfigKeyword start=/^mode\( --pango_markup\)\? \([^'" {]\+\|'[^']\+'\|".\+"\)\s\+{$/ end=/^\s*}$/ contains=i3ConfigShParam,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigNumber,i3ConfigParen,i3ConfigVariable fold keepend extend
 
-" Floating window size limitation
+" 4.7 Floating modifier
+syn match i3ConfigKeyword /^floating_modifier [$a-zA-Z0-9+]\+$/ contains=i3ConfigVariable,i3ConfigBindModkey
+
+" 4.8 Floating window size
 syn keyword i3ConfigSizeSpecial x contained
 syn match i3ConfigSize / -\?\d\+ x -\?\d\+/ contained contains=i3ConfigSizeSpecial,i3ConfigNumber
-syn keyword i3ConfigFloatingSizeKeyword floating_minimum_size floating_maximum_size contained
-syn match i3ConfigFloatingSize /^floating_\(maximum\|minimum\)_size -\?\d\+ x -\?\d\+/ contains=i3ConfigFloatingSizeKeyword,i3ConfigSize
+syn match i3ConfigKeyword /^floating_\(maximum\|minimum\)_size .*$/ contains=i3ConfigSize
 
-" Orientation
-syn keyword i3ConfigOrientationKeyword vertical horizontal auto contained
-syn match i3ConfigOrientation /^default_orientation \(vertical\|horizontal\|auto\)$/ contains=i3ConfigOrientationKeyword
+" 4.9 Orientation
+syn keyword i3ConfigOrientationOpts vertical horizontal auto contained
+syn match i3ConfigKeyword /^default_orientation \w*$/ contains=i3ConfigOrientationOpts
 
-" Layout
-syn keyword i3ConfigLayoutKeyword default stacking tabbed contained
-syn match i3ConfigLayout /^workspace_layout \(default\|stacking\|tabbed\)$/ contains=i3ConfigLayoutKeyword
+" 4.10 Layout mode
+syn keyword i3ConfigWorkspaceLayoutOpts default stacking tabbed contained
+syn match i3ConfigKeyword /^workspace_layout \w*$/ contains=i3ConfigWorkspaceLayoutOpts
 
-" Border style
-syn keyword i3ConfigBorderStyleKeyword none normal pixel contained
-syn match i3ConfigBorderStyle /^\(new_window\|new_float\|default_border\|default_floating_border\)\s\+\(none\|\(normal\|pixel\)\(\s\+\d\+\)\?\(\s\+\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?\)\?\)$/ contains=i3ConfigBorderStyleKeyword,i3ConfigNumber,i3ConfigVariable
+" 4.11 Title alignment
+syn keyword i3ConfigTitleAlignOpts left center right contained
+syn match i3ConfigKeyword /^title_align .*$/ contains=i3ConfigTitleAlignOpts
 
-" Hide borders and edges
-syn keyword i3ConfigEdgeKeyword none vertical horizontal both smart smart_no_gaps contained
-syn match i3ConfigEdge /^hide_edge_borders\s\+\(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=i3ConfigEdgeKeyword
+" 4.12 Border style
+syn keyword i3ConfigBorderOpts none normal pixel contained
+syn match i3ConfigKeyword /^default\(_floating\)\?_border .*$/ contains=i3ConfigBorderOpts,i3ConfigNumber,i3ConfigVariable
 
+" 4.13 Hide edge borders
+syn keyword i3ConfigEdgeOpts none vertical horizontal both smart smart_no_gaps contained
+syn match i3ConfigKeyword /^hide_edge_borders \w\+$/ contains=i3ConfigEdgeOpts
 
-" Arbitrary commands for specific windows (for_window)
-syn keyword i3ConfigCommandKeyword for_window contained
-syn match i3ConfigConditionalText /\w\+\(-\w\+\)*/ contained
-syn match i3ConfigEqualsOperator /=/ contained
-syn region i3ConfigConditional start=/\[/ end=/\]/ contained contains=i3ConfigString,i3ConfigEqualsOperator,i3ConfigConditionalText
-syn match i3ConfigArbitraryCommand /^for_window\s\+.*$/ contains=i3ConfigConditional,i3ConfigCommandKeyword,i3ConfigAction,i3ConfigOption,i3ConfigSize,i3ConfigNumber,i3ConfigString,i3ConfigOperator,i3ConfigBoolean,i3ConfigVariable
+" 4.14 Smart Borders
+syn keyword i3ConfigSmartBorderOpts no_gaps contained
+syn match i3ConfigKeyword /^smart_borders \(on\|off\|no_gaps\)$/ contains=i3ConfigSmartBorderOpts,i3ConfigBoolean
 
-" Disable focus open opening
-syn keyword i3ConfigNoFocusKeyword no_focus contained
-syn match i3ConfigDisableFocus /^no_focus\s\+.*$/ contains=i3ConfigConditional,i3ConfigNoFocusKeyword
+" 4.15 Arbitrary commands
+syn keyword i3ConfigForWindowKeyword for_window contained
+syn region i3ConfigForWindow start=/^for_window / end=/$/ contains=i3ConfigForWindowKeyword,i3ConfigCriteria keepend
 
-" Move client to specific workspace automatically
-syn keyword i3ConfigAssignKeyword assign contained
-syn match i3ConfigAssignSpecial /→/ contained
-syn match i3ConfigAssign /^assign\s\+.*$/ contains=i3ConfigAssignKeyword,i3ConfigAssignSpecial,i3ConfigConditional,i3ConfigVariable,i3ConfigString,i3ConfigNumber
+" 4.16 No opening focus
+syn match i3ConfigKeyword /^no_focus .*$/ contains=i3ConfigCondition
+
+" 4.17 Variables
+syn match i3ConfigVariable /\$[A-Z0-9a-z_:|[\]-]\+/
+syn keyword i3ConfigSetKeyword set contained
+syn match i3ConfigSet /^set \$.*$/ contains=i3ConfigVariable,i3ConfigSetKeyword,i3ConfigColor,i3ConfigString,i3ConfigNoStartupId,i3ConfigNumber,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper
 
-" X resources
+" 4.18 X resources
 syn keyword i3ConfigResourceKeyword set_from_resource contained
-syn match i3ConfigResource /^set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigConditional,i3ConfigColor,i3ConfigVariable,i3ConfigString,i3ConfigNumber
+syn match i3ConfigResource /^set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigCondition,i3ConfigColor,i3ConfigVariable,i3ConfigString,i3ConfigNumber
+
+" 4.19 Assign clients to workspaces
+syn keyword i3ConfigAssignKeyword assign contained
+syn match i3ConfigAssignSpecial /→/ contained
+syn match i3ConfigAssign /^assign .*$/ contains=i3ConfigAssignKeyword,i3ConfigAssignSpecial,i3ConfigCondition,i3ConfigVariable,i3ConfigString,i3ConfigNumber
 
-" Executing shell commands
+" 4.20 Executing shell commands
 syn keyword i3ConfigExecKeyword exec contained
 syn keyword i3ConfigExecAlwaysKeyword exec_always contained
-syn match i3ConfigShCmdDelim /\$/ contained
+syn match i3ConfigShCmdDelim /\$(/ contained
 syn region i3ConfigShCommand start=/\$(/ end=/)/ contained contains=i3ConfigShCmdDelim,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigString,i3ConfigNumber,i3ConfigVariable keepend extend
 syn match  i3ConfigShDelim /[[\]{}();`]\+/ contained
 syn match  i3ConfigShOper /[<>&|+=~^*!.?]\+/ contained
 syn match i3ConfigShParam /\<-[a-zA-Z0-9_-]\+\>/ contained containedin=i3ConfigVar
-syn region i3ConfigExec start=/exec\(_always\)\?\( --no-startup-id\)\? [^{]/ skip=/\\$/ end=/\([,;]\|$\)/ contains=i3ConfigExecKeyword,i3ConfigExecAlwaysKeyword,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigOperator keepend extend
+syn region i3ConfigExec start=/^\s*exec\(_always\)\?\( --no-startup-id\)\? [^{]/ skip=/\\$/ end=/$/ contains=i3ConfigExecKeyword,i3ConfigExecAlwaysKeyword,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigExecAction keepend
 
-" Automatically putting workspaces on specific screens
+" 4.21 Workspaces per output
 syn keyword i3ConfigWorkspaceKeyword workspace contained
-syn keyword i3ConfigOutput output contained
-syn match i3ConfigWorkspace /^\s*workspace\s\+.*$/ contains=i3ConfigWorkspaceKeyword,i3ConfigNumber,i3ConfigString,i3ConfigOutput,i3ConfigVariable,i3ConfigBoolean
+syn keyword i3ConfigWorkspaceOutput output contained
+syn keyword i3ConfigWorkspaceDir prev next back_and_forth contained
+syn region i3ConfigWorkspaceLine start=/^workspace / skip=/\\$/ end=/$/ contains=i3ConfigWorkspaceKeyword,i3ConfigNumber,i3ConfigString,i3ConfigGaps,i3ConfigWorkspaceOutput,i3ConfigVariable,i3ConfigBoolean,i3ConfigSeparator keepend
 
-" Changing colors
-syn keyword i3ConfigClientColorKeyword client focused focused_inactive unfocused urgent placeholder background contained
-syn match i3ConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=i3ConfigClientColorKeyword,i3ConfigColor,i3ConfigVariable
+" 4.22 Changing colors
+syn match i3ConfigDotOperator /\./ contained
+syn keyword i3ConfigClientOpts focused focused_inactive unfocused urgent placeholder background contained
+syn match i3ConfigKeyword /^client\..*$/ contains=i3ConfigDotOperator,i3ConfigClientOpts,i3ConfigColor,i3ConfigVariable
 
-syn keyword i3ConfigTitleAlignKeyword left center right contained
-syn match i3ConfigTitleAlign /^title_align .*$/ contains=i3ConfigTitleAlignKeyword
+" 4.23 Interprocess communication
+syn match i3ConfigIpcKeyword /ipc-socket/ contained
+syn match i3ConfigIpc /^ipc-socket .*$/ contains=i3ConfigIpcKeyword
 
-" Interprocess communication
-syn match i3ConfigInterprocessKeyword /ipc-socket/ contained
-syn match i3ConfigInterprocess /^ipc-socket .*$/ contains=i3ConfigInterprocessKeyword
+" 4.24 Focus follows mouse
+syn keyword i3ConfigFocusFollowsMouseOpts always contained
+syn match i3ConfigFocusFollowsMouse /^focus_follows_mouse \(yes\|no\|always\)$/ contains=i3ConfigBoolean,i3ConfigFocusFollowsMouseOpts
 
-" Mouse warping
-syn keyword i3ConfigMouseWarpingKeyword mouse_warping contained
-syn keyword i3ConfigMouseWarpingType output container none contained
-syn match i3ConfigMouseWarping /^mouse_warping \(output\|container\|none\)$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType
+" 4.25 Mouse warping
+syn keyword i3ConfigMouseWarpingOpts output container none contained
+syn match i3ConfigMouseWarping /^mouse_warping \w*$/ contains=i3ConfigMouseWarpingOpts
 
-" Focus follows mouse
-syn keyword i3ConfigFocusFollowsMouseKeyword focus_follows_mouse contained
-syn keyword i3ConfigFocusFollowsMouseType always contained
-syn match i3ConfigFocusFollowsMouse /^focus_follows_mouse \(yes\|no\|always\)$/ contains=i3ConfigFocusFollowsMouseKeyword,i3ConfigBoolean,i3ConfigFocusFollowsMouseType
+" 4.26 Popups while fullscreen
+syn keyword i3ConfigPopupFullscreenOpts smart ignore leave_fullscreen contained
+syn match i3ConfigPopupFullscreen /^popup_during_fullscreen \w*$/ contains=i3ConfigPopupFullscreenOpts
 
-" Focus wrapping
-syn keyword i3ConfigFocusWrappingKeyword force_focus_wrapping focus_wrapping contained
-syn keyword i3ConfigFocusWrappingType force workspace contained
-syn match i3ConfigFocusWrapping /^focus_wrapping \(yes\|no\|force\|workspace\)$/ contains=i3ConfigBoolean,i3ConfigFocusWrappingKeyword,i3ConfigFocusWrappingType
+" 4.27 Focus wrapping
+syn keyword i3ConfigFocusWrappingOpts force workspace contained
+syn match i3ConfigFocusWrapping /^focus_wrapping \(yes\|no\|force\|workspace\)$/ contains=i3ConfigBoolean,i3ConfigFocusWrappingOpts
 
-" Popups during fullscreen mode
-syn keyword i3ConfigPopupOnFullscreenKeyword popup_during_fullscreen contained
-syn keyword i3ConfigPopupOnFullscreenType smart ignore leave_fullscreen contained
-syn match i3ConfigPopupOnFullscreen /^popup_during_fullscreen \w\+$/ contains=i3ConfigPopupOnFullscreenKeyword,i3ConfigPopupOnFullscreenType
+" 4.28 Forcing Xinerama
+syn match i3ConfigForceXinerama /^force_xinerama \(yes\|no\)$/ contains=i3ConfigBoolean
 
-" Forcing Xinerama
-syn keyword i3ConfigForceXineramaKeyword force_xinerama contained
-syn match i3ConfigForceXinerama /^force_xinerama \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigForceXineramaKeyword
+" 4.29 Automatic workspace back-and-forth
+syn match i3ConfigAutomaticSwitch /^workspace_auto_back_and_forth \(yes\|no\)$/ contains=i3ConfigBoolean
 
-" Automatic back-and-forth when switching to the current workspace
-syn keyword i3ConfigAutomaticSwitchKeyword workspace_auto_back_and_forth contained
-syn match i3ConfigAutomaticSwitch /^workspace_auto_back_and_forth \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigAutomaticSwitchKeyword
-
-" Delay urgency hint
+" 4.30 Delay urgency hint
 syn keyword i3ConfigTimeUnit ms contained
-syn keyword i3ConfigDelayUrgencyKeyword force_display_urgency_hint contained
-syn match i3ConfigDelayUrgency /^force_display_urgency_hint \d\+ ms$/ contains=i3ConfigBoolean,i3ConfigDelayUrgencyKeyword,i3ConfigNumber,i3ConfigTimeUnit
-
-" Focus on window activation
-syn keyword i3ConfigFocusOnActivationKeyword focus_on_window_activation contained
-syn keyword i3ConfigFocusOnActivationType smart urgent focus none contained
-syn match i3ConfigFocusOnActivation /^focus_on_window_activation \(smart\|urgent\|focus\|none\)$/  contains=i3ConfigFocusOnActivationKeyword,i3ConfigFocusOnActivationType
-
-" Show window marks in their window title
-syn keyword i3ConfigShowMarksKeyword show_marks contained
-syn match i3ConfigShowMarks /^show_marks \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigShowMarksKeyword
-
-" Mode block
-syn match i3ConfigModeKeyword /^mode/ contained
-syn region i3ConfigModeBlock start=/^mode\( --pango_markup\)\? \([^'" {]\+\|'[^']\+'\|".\+"\)\s\+{$/ end=/^\s*}$/ contains=i3ConfigModeKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigNumber,i3ConfigParen,i3ConfigVariable fold keepend extend
+syn match i3ConfigDelayUrgency /^force_display_urgency_hint \d\+ ms$/ contains=i3ConfigBoolean,i3ConfigNumber,i3ConfigTimeUnit
+
+" 4.31 Focus on window activation
+syn keyword i3ConfigFocusOnActivationOpts smart urgent focus none contained
+syn match i3ConfigFocusOnActivation /^focus_on_window_activation .*$/  contains=i3ConfigFocusOnActivationKeyword
+
+" 4.32 Show marks in title
+syn match i3ConfigShowMarks /^show_marks \(yes\|no\)$/ contains=i3ConfigBoolean
+
+" 4.34 Tiling drag
+syn keyword i3ConfigTilingDragOpts modifier titlebar contained
+syn match i3ConfigTilingDrag /^tiling_drag\( off\|\( modifier\| titlebar\)\{1,2\}\)$/ contains=i3ConfigTilingOpts,i3ConfigBoolean
+
+" 4.35 Gaps
+syn keyword i3ConfigGapsOpts inner outer horizontal vertical left right top bottom current all set plus minus toggle contained
+syn region i3ConfigGaps start=/gaps/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigGapsOpts,i3ConfigNumber,i3ConfigVariable,i3ConfigSeparator keepend
+syn match i3ConfigGapStyleLine /^gaps .*$/ contains=i3ConfigGaps
+syn keyword i3ConfigSmartGapOpts inverse_outer contained
+syn match i3ConfigSmartGap /^smart_gaps \(on\|off\|inverse_outer\)$/ contains=i3ConfigSmartGapOpts,i3ConfigBoolean
+
+" 5 Configuring bar
+syn match i3ConfigBarModifier /^\s\+modifier [^ ]\+$/ contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey
+syn keyword i3ConfigBarOpts bar i3bar_command status_command mode hidden_state id position output tray_output tray_padding font separator_symbol workspace_buttons workspace_min_width strip_workspace_numbers strip_workspace_name binding_mode_indicator padding contained
+syn region i3ConfigBarBlock start=/^bar {$/ end=/^}$/ contains=i3ConfigBarOpts,i3ConfigBarModifier,i3ConfigBind,i3ConfigString,i3ConfigComment,i3ConfigFont,i3ConfigBoolean,i3ConfigNumber,i3ConfigParen,i3ConfigColor,i3ConfigVariable,i3ConfigColorsBlock fold keepend extend
+
+" 5.16 Color block
+syn match i3ConfigColorsOpts /\(focused_\)\?\(background\|statusline\|separator\)\|\(focused\|active\|inactive\|urgent\)_workspace\|binding_mode/ contained
+syn region i3ConfigColorsBlock start=/^\s\+colors {$/ end=/^\s\+}$/ contained contains=i3ConfigColorsOpts,i3ConfigColor,i3ConfigVariable,i3ConfigComment,i3ConfigParen fold keepend extend
+
+" 6.0 Criteria-based commands
+syn match i3ConfigConditionProp /\w\+\(-\w\+\)*/ contained
+syn match i3ConfigConditionText /[^[ ]\+=/ contained contains=i3ConfigConditionProp,i3ConfigShOper
+syn keyword i3ConfigConditionFocused __focused__ contained
+syn region i3ConfigCondition start=/\[/ end=/\]/ contained contains=i3ConfigConditionText,i3ConfigShDelim,i3ConfigNumber,i3ConfigString,i3ConfigConditionFocused keepend extend
+syn region i3ConfigCriteria start=/\[/ skip=/\\$/ end=/\(;\|$\)/ contained contains=i3ConfigCondition,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigBoolean,i3ConfigNumber,i3ConfigVariable,i3ConfigSeparator keepend
+
+" 6.1 Actions through shell
+syn match i3ConfigExecActionKeyword /i3-msg/ contained
+syn region i3ConfigExecAction start=/[a-z3-]\+msg '/ skip=/\\$\| '/ end=/'/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend extend
+syn region i3ConfigExecAction start=/[a-z3-]\+msg "/ skip=/\\$\| "/ end=/"/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend extend
+syn region i3ConfigExecAction start=/[a-z3-]\+msg\( ['"-]\)\@!/ skip=/\\$/ end=/\([&|;})'"]\|$\)/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend
+" 6.1 Executing applications (4.20)
+syn region i3ConfigAction start=/exec/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigExecKeyword,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigSeparator keepend
+
+" 6.3 Manipulating layout
+syn keyword i3ConfigLayoutKeyword layout contained
+syn keyword i3ConfigLayoutOpts default tabbed stacking splitv splith toggle split all contained
+syn region i3ConfigAction start=/layout/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigLayoutKeyword,i3ConfigLayoutOpts,i3ConfigSeparator keepend
+
+" 6.4 Focusing containers
+syn keyword i3ConfigFocusKeyword focus contained
+syn keyword i3ConfigFocusOpts left right up down parent child next prev sibling floating tiling mode_toggle contained
+syn keyword i3ConfigFocusOutputOpts left right down up current primary nonprimary next prev contained
+syn region i3ConfigFocusOutput start=/ output / skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigMoveType,i3ConfigWorkspaceOutput,i3ConfigFocusOutputOpts,i3ConfigString,i3ConfigNumber,i3ConfigSeparator keepend
+syn match i3ConfigFocusOutputLine /^focus output .*$/ contains=i3ConfigFocusKeyword,i3ConfigFocusOutput
+syn region i3ConfigAction start=/focus/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigFocusKeyword,i3ConfigFocusOpts,i3ConfigFocusOutput,i3ConfigString,i3ConfigSeparator keepend
+
+" 6.8 Focusing workspaces (4.21)
+syn region i3ConfigAction start=/workspace / skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigWorkspaceKeyword,i3ConfigWorkspaceDir,i3ConfigNumber,i3ConfigString,i3ConfigGaps,i3ConfigWorkspaceOutput,i3ConfigVariable,i3ConfigBoolean,i3ConfigSeparator keepend
+
+" 6.9-6.11 Moving containers
+syn keyword i3ConfigMoveKeyword move contained
+syn keyword i3ConfigMoveDir left right down up position absolute center to contained
+syn keyword i3ConfigMoveType window container workspace output mark mouse scratchpad contained
+syn match i3ConfigUnit / px\| ppt/ contained
+syn region i3ConfigAction start=/move/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigMoveKeyword,i3ConfigMoveDir,i3ConfigMoveType,i3ConfigWorkspaceDir,i3ConfigUnit,i3ConfigNumber,i3ConfigVariable,i3ConfigSeparator keepend
+
+" 6.12 Resizing containers/windows
+syn keyword i3ConfigResizeKeyword resize contained
+syn keyword i3ConfigResizeOpts grow shrink up down left right set width height or contained
+syn region i3ConfigAction start=/resize/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigResizeKeyword,i3ConfigResizeOpts,i3ConfigNumber,i3ConfigUnit,i3ConfigSeparator keepend
+
+" 6.14 VIM-like marks
+syn keyword i3ConfigMarkKeyword mark contained
+syn match i3ConfigMark /mark\( --\(add\|replace\)\( --toggle\)\?\)\?/ contained contains=i3ConfigMarkKeyword
+syn region i3ConfigAction start=/\<mark/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigMark,i3ConfigNumber,i3ConfigString,i3ConfigSeparator keepend
+
+" 6.24 Changing gaps (4.35)
+syn region i3ConfigAction start=/gaps/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigGaps keepend
 
-" Color block
-syn keyword i3ConfigColorsKeyword colors contained
-syn match i3ConfigColorsCategory /\(focused_\)\?\(background\|statusline\|separator\)\|\(focused\|active\|inactive\|urgent\)_workspace\|binding_mode/ contained
-syn region i3ConfigColorsBlock start=/^\s\+colors {$/ end=/^\s\+}$/ contained contains=i3ConfigColorsKeyword,i3ConfigColorsCategory,i3ConfigColor,i3ConfigVariable,i3ConfigComment,i3ConfigParen fold keepend extend
-
-" Bar block
-syn keyword i3ConfigBarBlockKeyword bar i3bar_command status_command mode hidden_state id position output tray_output tray_padding font separator_symbol workspace_buttons workspace_min_width strip_workspace_numbers strip_workspace_name binding_mode_indicator padding contained
-syn keyword i3ConfigBarModifierKeyword modifier contained
-syn match i3ConfigBarModifierLine /^\s\+modifier [^ ]\+$/ contained contains=i3ConfigBarModifierKeyword,i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey
-syn region i3ConfigBarBlock start=/^bar {$/ end=/^}$/ contains=i3ConfigBarBlockKeyword,i3ConfigBarModifierLine,i3ConfigBind,i3ConfigString,i3ConfigComment,i3ConfigFont,i3ConfigBoolean,i3ConfigNumber,i3ConfigOperator,i3ConfigParen,i3ConfigColor,i3ConfigVariable,i3ConfigColorsBlock fold keepend extend
+" Commands useable in keybinds
+syn keyword i3ConfigActionKeyword mode append_layout kill open fullscreen sticky split floating swap rename unmark show_marks title_window_icon title_format border restart reload exit scratchpad nop bar contained
+syn keyword i3ConfigOption enable disable toggle key restore current horizontal vertical auto none normal pixel show container with id con_id contained
 
 " Define the highlighting.
-hi def link i3ConfigKeyword                         Keyword
-hi def link i3ConfigCommand                         Statement
 hi def link i3ConfigError                           Error
 hi def link i3ConfigTodo                            Todo
-hi def link i3ConfigComment                         Comment
+hi def link i3ConfigKeyword                         Keyword
+hi def link i3ConfigCommand                         Statement
 hi def link i3ConfigOperator                        Operator
+hi def link i3ConfigSeparator                       i3ConfigOperator
 hi def link i3ConfigParen                           Delimiter
-hi def link i3ConfigFontKeyword                     i3ConfigKeyword
-hi def link i3ConfigFontNamespace                   i3ConfigOption
-hi def link i3ConfigFontContent                     String
-hi def link i3ConfigFontSize                        Number
-hi def link i3ConfigString                          String
-hi def link i3ConfigNumber                          Number
 hi def link i3ConfigBoolean                         Boolean
+hi def link i3ConfigString                          String
 hi def link i3ConfigColor                           Constant
-hi def link i3ConfigVariable                        Variable
-hi def link i3ConfigSetKeyword                      i3ConfigKeyword
+hi def link i3ConfigNumber                          Number
 hi def link i3ConfigIncludeKeyword                  i3ConfigKeyword
-hi def link i3ConfigCommandSubstitutionDelimiter    Delimiter
-hi def link i3ConfigIncludePath                     String
-hi def link i3ConfigGapStyleKeyword                 i3ConfigOption
-hi def link i3ConfigGapStyle                        i3ConfigCommand
-hi def link i3ConfigSmartGapKeyword                 i3ConfigOption
-hi def link i3ConfigSmartGap                        i3ConfigKeyword
-hi def link i3ConfigSmartBorderKeyword              i3ConfigOption
-hi def link i3ConfigSmartBorder                     i3ConfigKeyword
-hi def link i3ConfigAction                          i3ConfigCommand
-hi def link i3ConfigOption                          Type
-hi def link i3ConfigUnit                            i3ConfigNumber
-hi def link i3ConfigUnitOr                          i3ConfigOperator
+hi def link i3ConfigInclude                         i3ConfigString
+hi def link i3ConfigComment                         Comment
+hi def link i3ConfigFontKeyword                     i3ConfigKeyword
+hi def link i3ConfigColonOperator                   i3ConfigOperator
+hi def link i3ConfigFontNamespace                   i3ConfigOption
+hi def link i3ConfigFontSize                        i3ConfigNumber
+hi def link i3ConfigFont                            i3ConfigString
 hi def link i3ConfigBindKeyword                     i3ConfigKeyword
+hi def link i3ConfigBindArgument                    i3ConfigShParam
+hi def link i3ConfigBindModifier                    i3ConfigOperator
 hi def link i3ConfigBindModkey                      Special
 hi def link i3ConfigBindCombo                       SpecialChar
-hi def link i3ConfigBindModifier                    i3ConfigOperator
-hi def link i3ConfigBindArgument                    i3ConfigShParam
-hi def link i3ConfigFloatingModifierKeyword         i3ConfigKeyword
 hi def link i3ConfigSizeSpecial                     i3ConfigOperator
-hi def link i3ConfigFloatingSizeKeyword             i3ConfigKeyword
-hi def link i3ConfigOrientationKeyword              i3ConfigOption
-hi def link i3ConfigOrientation                     i3ConfigKeyword
-hi def link i3ConfigLayoutKeyword                   i3ConfigOption
-hi def link i3ConfigLayout                          i3ConfigKeyword
-hi def link i3ConfigBorderStyleKeyword              i3ConfigOption
-hi def link i3ConfigBorderStyle                     i3ConfigKeyword
-hi def link i3ConfigEdgeKeyword                     i3ConfigOption
-hi def link i3ConfigEdge                            i3ConfigKeyword
-hi def link i3ConfigCommandKeyword                  i3ConfigKeyword
-hi def link i3ConfigEqualsOperator                  i3ConfigOperator
-hi def link i3ConfigConditionalText                 Conditional
-hi def link i3ConfigConditional                     Delimiter
-hi def link i3ConfigNoFocusKeyword                  i3ConfigKeyword
+hi def link i3ConfigOrientationOpts                 i3ConfigOption
+hi def link i3ConfigWorkspaceLayoutOpts             i3ConfigOption
+hi def link i3ConfigTitleAlignOpts                  i3ConfigOption
+hi def link i3ConfigBorderOpts                      i3ConfigOption
+hi def link i3ConfigEdgeOpts                        i3ConfigOption
+hi def link i3ConfigSmartBorderOpts                 i3ConfigOption
+hi def link i3ConfigForWindowKeyword                i3ConfigKeyword
+hi def link i3ConfigVariable                        Variable
+hi def link i3ConfigSetKeyword                      i3ConfigKeyword
+hi def link i3ConfigResourceKeyword                 i3ConfigKeyword
+hi def link i3ConfigResource                        i3ConfigString
 hi def link i3ConfigAssignKeyword                   i3ConfigKeyword
 hi def link i3ConfigAssignSpecial                   i3ConfigOption
-hi def link i3ConfigResourceKeyword                 i3ConfigKeyword
+hi def link i3ConfigExecKeyword                     i3ConfigCommand
+hi def link i3ConfigExecAlwaysKeyword               i3ConfigKeyword
 hi def link i3ConfigShParam                         PreProc
 hi def link i3ConfigShDelim                         Delimiter
 hi def link i3ConfigShOper                          Operator
 hi def link i3ConfigShCmdDelim                      i3ConfigShDelim
 hi def link i3ConfigShCommand                       Normal
-hi def link i3ConfigExecKeyword                     i3ConfigCommand
-hi def link i3ConfigExecAlwaysKeyword               i3ConfigKeyword
 hi def link i3ConfigWorkspaceKeyword                i3ConfigCommand
-hi def link i3ConfigOutput                          i3ConfigOption
-hi def link i3ConfigClientColorKeyword              i3ConfigKeyword
-hi def link i3ConfigClientColor                     Operator
-hi def link i3ConfigTitleAlignKeyword               i3ConfigOption
-hi def link i3ConfigTitleAlign                      i3ConfigKeyword
-hi def link i3ConfigInterprocessKeyword             i3ConfigKeyword
-hi def link i3ConfigMouseWarpingKeyword             i3ConfigKeyword
-hi def link i3ConfigMouseWarpingType                i3ConfigOption
-hi def link i3ConfigFocusFollowsMouseKeyword        i3ConfigKeyword
-hi def link i3ConfigFocusFollowsMouseType           i3ConfigOption
-hi def link i3ConfigFocusWrappingKeyword            i3ConfigKeyword
-hi def link i3ConfigFocusWrappingType               i3ConfigOption
-hi def link i3ConfigPopupOnFullscreenKeyword        i3ConfigKeyword
-hi def link i3ConfigPopupOnFullscreenType           i3ConfigOption
-hi def link i3ConfigForceXineramaKeyword            i3ConfigKeyword
-hi def link i3ConfigAutomaticSwitchKeyword          i3ConfigKeyword
+hi def link i3ConfigWorkspaceOutput                 i3ConfigOption
+hi def link i3ConfigWorkspaceDir                    i3ConfigOption
+hi def link i3ConfigDotOperator                     i3ConfigOperator
+hi def link i3ConfigClientOpts                      i3ConfigOption
+hi def link i3ConfigIpcKeyword                      i3ConfigKeyword
+hi def link i3ConfigIpc                             i3ConfigString
+hi def link i3ConfigFocusFollowsMouseOpts           i3ConfigOption
+hi def link i3ConfigFocusFollowsMouse               i3ConfigKeyword
+hi def link i3ConfigMouseWarpingOpts                i3ConfigOption
+hi def link i3ConfigMouseWarping                    i3ConfigKeyword
+hi def link i3ConfigPopupFullscreenOpts             i3ConfigOption
+hi def link i3ConfigPopupFullscreen                 i3ConfigKeyword
+hi def link i3ConfigFocusWrappingOpts               i3ConfigOption
+hi def link i3ConfigFocusWrapping                   i3ConfigKeyword
+hi def link i3ConfigForceXinerama                   i3ConfigKeyword
+hi def link i3ConfigAutomaticSwitch                 i3ConfigKeyword
 hi def link i3ConfigTimeUnit                        i3ConfigNumber
-hi def link i3ConfigDelayUrgencyKeyword             i3ConfigKeyword
-hi def link i3ConfigFocusOnActivationKeyword        i3ConfigKeyword
-hi def link i3ConfigFocusOnActivationType           i3ConfigOption
-hi def link i3ConfigShowMarksKeyword                i3ConfigKeyword
-hi def link i3ConfigModeKeyword                     i3ConfigKeyword
-hi def link i3ConfigColorsKeyword                   i3ConfigKeyword
-hi def link i3ConfigColorsCategory                  Type
-hi def link i3ConfigBarModifierKeyword              i3ConfigKeyword
-hi def link i3ConfigBarBlockKeyword                 i3ConfigKeyword
-
-let b:current_syntax = "i3config"
+hi def link i3ConfigDelayUrgency                    i3ConfigKeyword
+hi def link i3ConfigFocusOnActivationOpts           i3ConfigOption
+hi def link i3ConfigFocusOnActivation               i3ConfigKeyword
+hi def link i3ConfigShowMarks                       i3ConfigCommand
+hi def link i3ConfigTilingDragOpts                  i3ConfigOption
+hi def link i3ConfigTilingDrag                      i3ConfigKeyword
+hi def link i3ConfigGapsOpts                        i3ConfigOption
+hi def link i3ConfigGaps                            i3ConfigCommand
+hi def link i3ConfigSmartGapOpts                    i3ConfigOption
+hi def link i3ConfigSmartGap                        i3ConfigKeyword
+hi def link i3ConfigBarModifier                     i3ConfigKeyword
+hi def link i3ConfigBarOpts                         i3ConfigKeyword
+hi def link i3ConfigColorsOpts                      i3ConfigOption
+hi def link i3ConfigColors                          i3ConfigKeyword
+hi def link i3ConfigConditionProp                   i3ConfigShParam
+hi def link i3ConfigConditionFocused                Constant
+hi def link i3ConfigExecActionKeyword               i3ConfigShCommand
+hi def link i3ConfigExecAction                      i3ConfigString
+hi def link i3ConfigLayoutKeyword                   i3ConfigCommand
+hi def link i3ConfigLayoutOpts                      i3ConfigOption
+hi def link i3ConfigFocusKeyword                    i3ConfigCommand
+hi def link i3ConfigFocusOpts                       i3ConfigOption
+hi def link i3ConfigFocusOutputOpts                 i3ConfigOption
+hi def link i3ConfigMoveKeyword                     i3ConfigCommand
+hi def link i3ConfigMoveDir                         i3ConfigOption
+hi def link i3ConfigMoveType                        i3ConfigOption
+hi def link i3ConfigUnit                            i3ConfigNumber
+hi def link i3ConfigResizeKeyword                   i3ConfigCommand
+hi def link i3ConfigResizeOpts                      i3ConfigOption
+hi def link i3ConfigMarkKeyword                     i3ConfigCommand
+hi def link i3ConfigMark                            i3ConfigShParam
+hi def link i3ConfigActionKeyword                   i3ConfigCommand
+hi def link i3ConfigOption                          Type
+
+let b:current_syntax = "i3config"
\ No newline at end of file
-- 
cgit 


From 2dd5e472df8ed448375910d61c050390f7f17f5f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 12 Sep 2023 22:30:02 +0200
Subject: vim-patch:fc93594d562d

runtime(rust): sync rust runtime files with upstream (vim/vim#13075)

https://github.com/vim/vim/commit/fc93594d562dbbd9da03c89754538f91efd0c7ca

Co-authored-by: Gregory Anders <8965202+gpanders@users.noreply.github.com>
---
 runtime/autoload/cargo.vim          | 149 +++++++
 runtime/autoload/cargo/quickfix.vim |  29 ++
 runtime/autoload/rust.vim           | 773 ++++++++++++++++++++++--------------
 runtime/autoload/rust/debugging.vim | 105 +++++
 runtime/autoload/rustfmt.vim        | 300 ++++++++++----
 runtime/compiler/cargo.vim          |  36 +-
 runtime/compiler/rustc.vim          |  63 +--
 runtime/doc/ft_rust.txt             | 434 +++++++++++++++-----
 runtime/ftplugin/rust.vim           | 252 +++++++-----
 runtime/indent/rust.vim             | 432 +++++++++++---------
 runtime/syntax/rust.vim             | 166 ++++++--
 11 files changed, 1893 insertions(+), 846 deletions(-)
 create mode 100644 runtime/autoload/cargo.vim
 create mode 100644 runtime/autoload/cargo/quickfix.vim
 create mode 100644 runtime/autoload/rust/debugging.vim

(limited to 'runtime')

diff --git a/runtime/autoload/cargo.vim b/runtime/autoload/cargo.vim
new file mode 100644
index 0000000000..6696b3105f
--- /dev/null
+++ b/runtime/autoload/cargo.vim
@@ -0,0 +1,149 @@
+" Last Modified: 2023-09-11
+
+function! cargo#Load()
+    " Utility call to get this script loaded, for debugging
+endfunction
+
+function! cargo#cmd(args) abort
+    " Trim trailing spaces. This is necessary since :terminal command parses
+    " trailing spaces as an empty argument.
+    let args = substitute(a:args, '\s\+$', '', '')
+    if exists('g:cargo_shell_command_runner')
+        let cmd = g:cargo_shell_command_runner
+    elseif has('terminal')
+        let cmd = 'terminal'
+    elseif has('nvim')
+        let cmd = 'noautocmd new | terminal'
+    else
+        let cmd = '!'
+    endif
+    execute cmd 'cargo' args
+endfunction
+
+function! s:nearest_cargo(...) abort
+    " If the second argument is not specified, the first argument determines
+    " whether we will start from the current directory or the directory of the
+    " current buffer, otherwise, we start with the provided path on the 
+    " second argument.
+
+    let l:is_getcwd = get(a:, 1, 0)
+    if l:is_getcwd 
+        let l:starting_path = get(a:, 2, getcwd())
+    else
+        let l:starting_path = get(a:, 2, expand('%:p:h'))
+    endif
+
+    return findfile('Cargo.toml', l:starting_path . ';')
+endfunction
+
+function! cargo#nearestCargo(is_getcwd) abort
+    return s:nearest_cargo(a:is_getcwd)
+endfunction
+
+function! cargo#nearestWorkspaceCargo(is_getcwd) abort
+    let l:nearest = s:nearest_cargo(a:is_getcwd)
+    while l:nearest !=# ''
+        for l:line in readfile(l:nearest, '', 0x100)
+            if l:line =~# '\V[workspace]'
+                return l:nearest
+            endif
+        endfor
+        let l:next = fnamemodify(l:nearest, ':p:h:h')
+        let l:nearest = s:nearest_cargo(0, l:next)
+    endwhile
+    return ''
+endfunction
+
+function! cargo#nearestRootCargo(is_getcwd) abort
+    " Try to find a workspace Cargo.toml, and if not found, take the nearest
+    " regular Cargo.toml
+    let l:workspace_cargo = cargo#nearestWorkspaceCargo(a:is_getcwd)
+    if l:workspace_cargo !=# ''
+        return l:workspace_cargo
+    endif
+    return s:nearest_cargo(a:is_getcwd)
+endfunction
+
+
+function! cargo#build(args)
+    call cargo#cmd("build " . a:args)
+endfunction
+
+function! cargo#check(args)
+    call cargo#cmd("check " . a:args)
+endfunction
+
+function! cargo#clean(args)
+    call cargo#cmd("clean " . a:args)
+endfunction
+
+function! cargo#doc(args)
+    call cargo#cmd("doc " . a:args)
+endfunction
+
+function! cargo#new(args)
+    call cargo#cmd("new " . a:args)
+    cd `=a:args`
+endfunction
+
+function! cargo#init(args)
+    call cargo#cmd("init " . a:args)
+endfunction
+
+function! cargo#run(args)
+    call cargo#cmd("run " . a:args)
+endfunction
+
+function! cargo#test(args)
+    call cargo#cmd("test " . a:args)
+endfunction
+
+function! cargo#bench(args)
+    call cargo#cmd("bench " . a:args)
+endfunction
+
+function! cargo#update(args)
+    call cargo#cmd("update " . a:args)
+endfunction
+
+function! cargo#search(args)
+    call cargo#cmd("search " . a:args)
+endfunction
+
+function! cargo#publish(args)
+    call cargo#cmd("publish " . a:args)
+endfunction
+
+function! cargo#install(args)
+    call cargo#cmd("install " . a:args)
+endfunction
+
+function! cargo#runtarget(args)
+    let l:filename = expand('%:p')
+    let l:read_manifest = system('cargo read-manifest')
+    let l:metadata = json_decode(l:read_manifest)
+    let l:targets = get(l:metadata, 'targets', [])
+    let l:did_run = 0
+    for l:target in l:targets
+        let l:src_path = get(l:target, 'src_path', '')
+        let l:kinds = get(l:target, 'kind', [])
+        let l:name = get(l:target, 'name', '')
+        if l:src_path == l:filename
+        if index(l:kinds, 'example') != -1
+            let l:did_run = 1
+            call cargo#run("--example " . shellescape(l:name) . " " . a:args)
+            return
+        elseif index(l:kinds, 'bin') != -1
+            let l:did_run = 1
+            call cargo#run("--bin " . shellescape(l:name) . " " . a:args)
+            return
+        endif
+        endif
+    endfor
+    if l:did_run != 1
+        call cargo#run(a:args)
+        return
+    endif
+endfunction
+
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/autoload/cargo/quickfix.vim b/runtime/autoload/cargo/quickfix.vim
new file mode 100644
index 0000000000..f2a006f6c5
--- /dev/null
+++ b/runtime/autoload/cargo/quickfix.vim
@@ -0,0 +1,29 @@
+" Last Modified: 2023-09-11
+
+function! cargo#quickfix#CmdPre() abort
+    if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo' &&
+         \ &makeprg =~ '\V\^cargo\ \.\*'
+        " Preserve the current directory, and 'lcd' to the nearest Cargo file.
+        let b:rust_compiler_cargo_qf_has_lcd = haslocaldir()
+        let b:rust_compiler_cargo_qf_prev_cd = getcwd()
+        let b:rust_compiler_cargo_qf_prev_cd_saved = 1
+        let l:nearest = fnamemodify(cargo#nearestRootCargo(0), ':h')
+        execute 'lchdir! '.l:nearest
+    else
+        let b:rust_compiler_cargo_qf_prev_cd_saved = 0
+    endif
+endfunction
+
+function! cargo#quickfix#CmdPost() abort
+    if exists("b:rust_compiler_cargo_qf_prev_cd_saved") && b:rust_compiler_cargo_qf_prev_cd_saved
+        " Restore the current directory.
+        if b:rust_compiler_cargo_qf_has_lcd
+            execute 'lchdir! '.b:rust_compiler_cargo_qf_prev_cd
+        else
+            execute 'chdir! '.b:rust_compiler_cargo_qf_prev_cd
+        endif
+        let b:rust_compiler_cargo_qf_prev_cd_saved = 0
+    endif
+endfunction
+
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/autoload/rust.vim b/runtime/autoload/rust.vim
index 4230332fa7..5ccbf4b382 100644
--- a/runtime/autoload/rust.vim
+++ b/runtime/autoload/rust.vim
@@ -1,207 +1,258 @@
-" Author: Lily Ballard
 " Description: Helper functions for Rust commands/mappings
-" Last Modified: May 27, 2014
+" Last Modified: 2023-09-11
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
+function! rust#Load()
+    " Utility call to get this script loaded, for debugging
+endfunction
+
+function! rust#GetConfigVar(name, default)
+    " Local buffer variable with same name takes predeence over global
+    if has_key(b:, a:name)
+        return get(b:, a:name)
+    endif
+    if has_key(g:, a:name)
+        return get(g:, a:name)
+    endif
+    return a:default
+endfunction
+
+" Include expression {{{1
+
+function! rust#IncludeExpr(fname) abort
+    " Remove leading 'crate::' to deal with 2018 edition style 'use'
+    " statements
+    let l:fname = substitute(a:fname, '^crate::', '', '')
+
+    " Remove trailing colons arising from lines like
+    "
+    "     use foo::{Bar, Baz};
+    let l:fname = substitute(l:fname, ':\+$', '', '')
+
+    " Replace '::' with '/'
+    let l:fname = substitute(l:fname, '::', '/', 'g')
+
+    " When we have
+    "
+    "    use foo::bar::baz;
+    "
+    " we can't tell whether baz is a module or a function; and we can't tell
+    " which modules correspond to files.
+    "
+    " So we work our way up, trying
+    "
+    "     foo/bar/baz.rs
+    "     foo/bar.rs
+    "     foo.rs
+    while l:fname !=# '.'
+        let l:path = findfile(l:fname)
+        if !empty(l:path)
+            return l:fname
+        endif
+        let l:fname = fnamemodify(l:fname, ':h')
+    endwhile
+    return l:fname
+endfunction
+
 " Jump {{{1
 
 function! rust#Jump(mode, function) range
-	let cnt = v:count1
-	normal! m'
-	if a:mode ==# 'v'
-		norm! gv
-	endif
-	let foldenable = &foldenable
-	set nofoldenable
-	while cnt > 0
-		execute "call <SID>Jump_" . a:function . "()"
-		let cnt = cnt - 1
-	endwhile
-	let &foldenable = foldenable
+    let cnt = v:count1
+    normal! m'
+    if a:mode ==# 'v'
+        norm! gv
+    endif
+    let foldenable = &foldenable
+    set nofoldenable
+    while cnt > 0
+        execute "call <SID>Jump_" . a:function . "()"
+        let cnt = cnt - 1
+    endwhile
+    let &foldenable = foldenable
 endfunction
 
 function! s:Jump_Back()
-	call search('{', 'b')
-	keepjumps normal! w99[{
+    call search('{', 'b')
+    keepjumps normal! w99[{
 endfunction
 
 function! s:Jump_Forward()
-	normal! j0
-	call search('{', 'b')
-	keepjumps normal! w99[{%
-	call search('{')
+    normal! j0
+    call search('{', 'b')
+    keepjumps normal! w99[{%
+    call search('{')
 endfunction
 
 " Run {{{1
 
 function! rust#Run(bang, args)
-	let args = s:ShellTokenize(a:args)
-	if a:bang
-		let idx = index(l:args, '--')
-		if idx != -1
-			let rustc_args = idx == 0 ? [] : l:args[:idx-1]
-			let args = l:args[idx+1:]
-		else
-			let rustc_args = l:args
-			let args = []
-		endif
-	else
-		let rustc_args = []
-	endif
-
-	let b:rust_last_rustc_args = l:rustc_args
-	let b:rust_last_args = l:args
-
-	call s:WithPath(function("s:Run"), rustc_args, args)
+    let args = s:ShellTokenize(a:args)
+    if a:bang
+        let idx = index(l:args, '--')
+        if idx != -1
+            let rustc_args = idx == 0 ? [] : l:args[:idx-1]
+            let args = l:args[idx+1:]
+        else
+            let rustc_args = l:args
+            let args = []
+        endif
+    else
+        let rustc_args = []
+    endif
+
+    let b:rust_last_rustc_args = l:rustc_args
+    let b:rust_last_args = l:args
+
+    call s:WithPath(function("s:Run"), rustc_args, args)
 endfunction
 
 function! s:Run(dict, rustc_args, args)
-	let exepath = a:dict.tmpdir.'/'.fnamemodify(a:dict.path, ':t:r')
-	if has('win32')
-		let exepath .= '.exe'
-	endif
-
-	let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-	let rustc_args = [relpath, '-o', exepath] + a:rustc_args
-
-	let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-	let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-	let output = s:system(pwd, shellescape(rustc) . " " . join(map(rustc_args, 'shellescape(v:val)')))
-	if output != ''
-		echohl WarningMsg
-		echo output
-		echohl None
-	endif
-	if !v:shell_error
-		exe '!' . shellescape(exepath) . " " . join(map(a:args, 'shellescape(v:val)'))
-	endif
+    let exepath = a:dict.tmpdir.'/'.fnamemodify(a:dict.path, ':t:r')
+    if has('win32')
+        let exepath .= '.exe'
+    endif
+
+    let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
+    let rustc_args = [relpath, '-o', exepath] + a:rustc_args
+
+    let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
+
+    let pwd = a:dict.istemp ? a:dict.tmpdir : ''
+    let output = s:system(pwd, shellescape(rustc) . " " . join(map(rustc_args, 'shellescape(v:val)')))
+    if output !=# ''
+        echohl WarningMsg
+        echo output
+        echohl None
+    endif
+    if !v:shell_error
+        exe '!' . shellescape(exepath) . " " . join(map(a:args, 'shellescape(v:val)'))
+    endif
 endfunction
 
 " Expand {{{1
 
 function! rust#Expand(bang, args)
-	let args = s:ShellTokenize(a:args)
-	if a:bang && !empty(l:args)
-		let pretty = remove(l:args, 0)
-	else
-		let pretty = "expanded"
-	endif
-	call s:WithPath(function("s:Expand"), pretty, args)
+    let args = s:ShellTokenize(a:args)
+    if a:bang && !empty(l:args)
+        let pretty = remove(l:args, 0)
+    else
+        let pretty = "expanded"
+    endif
+    call s:WithPath(function("s:Expand"), pretty, args)
 endfunction
 
 function! s:Expand(dict, pretty, args)
-	try
-		let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-		if a:pretty =~? '^\%(everybody_loops$\|flowgraph=\)'
-			let flag = '--xpretty'
-		else
-			let flag = '--pretty'
-		endif
-		let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-		let args = [relpath, '-Z', 'unstable-options', l:flag, a:pretty] + a:args
-		let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-		let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
-		if v:shell_error
-			echohl WarningMsg
-			echo output
-			echohl None
-		else
-			new
-			silent put =output
-			1
-			d
-			setl filetype=rust
-			setl buftype=nofile
-			setl bufhidden=hide
-			setl noswapfile
-			" give the buffer a nice name
-			let suffix = 1
-			let basename = fnamemodify(a:dict.path, ':t:r')
-			while 1
-				let bufname = basename
-				if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
-				let bufname .= '.pretty.rs'
-				if bufexists(bufname)
-					let suffix += 1
-					continue
-				endif
-				exe 'silent noautocmd keepalt file' fnameescape(bufname)
-				break
-			endwhile
-		endif
-	endtry
+    try
+        let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
+
+        if a:pretty =~? '^\%(everybody_loops$\|flowgraph=\)'
+            let flag = '--xpretty'
+        else
+            let flag = '--pretty'
+        endif
+        let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
+        let args = [relpath, '-Z', 'unstable-options', l:flag, a:pretty] + a:args
+        let pwd = a:dict.istemp ? a:dict.tmpdir : ''
+        let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
+        if v:shell_error
+            echohl WarningMsg
+            echo output
+            echohl None
+        else
+            new
+            silent put =output
+            1
+            d
+            setl filetype=rust
+            setl buftype=nofile
+            setl bufhidden=hide
+            setl noswapfile
+            " give the buffer a nice name
+            let suffix = 1
+            let basename = fnamemodify(a:dict.path, ':t:r')
+            while 1
+                let bufname = basename
+                if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
+                let bufname .= '.pretty.rs'
+                if bufexists(bufname)
+                    let suffix += 1
+                    continue
+                endif
+                exe 'silent noautocmd keepalt file' fnameescape(bufname)
+                break
+            endwhile
+        endif
+    endtry
 endfunction
 
 function! rust#CompleteExpand(lead, line, pos)
-	if a:line[: a:pos-1] =~ '^RustExpand!\s*\S*$'
-		" first argument and it has a !
-		let list = ["normal", "expanded", "typed", "expanded,identified", "flowgraph=", "everybody_loops"]
-		if !empty(a:lead)
-			call filter(list, "v:val[:len(a:lead)-1] == a:lead")
-		endif
-		return list
-	endif
-
-	return glob(escape(a:lead, "*?[") . '*', 0, 1)
+    if a:line[: a:pos-1] =~# '^RustExpand!\s*\S*$'
+        " first argument and it has a !
+        let list = ["normal", "expanded", "typed", "expanded,identified", "flowgraph=", "everybody_loops"]
+        if !empty(a:lead)
+            call filter(list, "v:val[:len(a:lead)-1] == a:lead")
+        endif
+        return list
+    endif
+
+    return glob(escape(a:lead, "*?[") . '*', 0, 1)
 endfunction
 
 " Emit {{{1
 
 function! rust#Emit(type, args)
-	let args = s:ShellTokenize(a:args)
-	call s:WithPath(function("s:Emit"), a:type, args)
+    let args = s:ShellTokenize(a:args)
+    call s:WithPath(function("s:Emit"), a:type, args)
 endfunction
 
 function! s:Emit(dict, type, args)
-	try
-		let output_path = a:dict.tmpdir.'/output'
-
-		let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-
-		let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-		let args = [relpath, '--emit', a:type, '-o', output_path] + a:args
-		let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-		let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
-		if output != ''
-			echohl WarningMsg
-			echo output
-			echohl None
-		endif
-		if !v:shell_error
-			new
-			exe 'silent keepalt read' fnameescape(output_path)
-			1
-			d
-			if a:type == "llvm-ir"
-				setl filetype=llvm
-				let extension = 'll'
-			elseif a:type == "asm"
-				setl filetype=asm
-				let extension = 's'
-			endif
-			setl buftype=nofile
-			setl bufhidden=hide
-			setl noswapfile
-			if exists('l:extension')
-				" give the buffer a nice name
-				let suffix = 1
-				let basename = fnamemodify(a:dict.path, ':t:r')
-				while 1
-					let bufname = basename
-					if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
-					let bufname .= '.'.extension
-					if bufexists(bufname)
-						let suffix += 1
-						continue
-					endif
-					exe 'silent noautocmd keepalt file' fnameescape(bufname)
-					break
-				endwhile
-			endif
-		endif
-	endtry
+    try
+        let output_path = a:dict.tmpdir.'/output'
+
+        let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
+
+        let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
+        let args = [relpath, '--emit', a:type, '-o', output_path] + a:args
+        let pwd = a:dict.istemp ? a:dict.tmpdir : ''
+        let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
+        if output !=# ''
+            echohl WarningMsg
+            echo output
+            echohl None
+        endif
+        if !v:shell_error
+            new
+            exe 'silent keepalt read' fnameescape(output_path)
+            1
+            d
+            if a:type ==# "llvm-ir"
+                setl filetype=llvm
+                let extension = 'll'
+            elseif a:type ==# "asm"
+                setl filetype=asm
+                let extension = 's'
+            endif
+            setl buftype=nofile
+            setl bufhidden=hide
+            setl noswapfile
+            if exists('l:extension')
+                " give the buffer a nice name
+                let suffix = 1
+                let basename = fnamemodify(a:dict.path, ':t:r')
+                while 1
+                    let bufname = basename
+                    if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
+                    let bufname .= '.'.extension
+                    if bufexists(bufname)
+                        let suffix += 1
+                        continue
+                    endif
+                    exe 'silent noautocmd keepalt file' fnameescape(bufname)
+                    break
+                endwhile
+            endif
+        endif
+    endtry
 endfunction
 
 " Utility functions {{{1
@@ -219,145 +270,154 @@ endfunction
 " existing path of the current buffer. If the path is inside of {dict.tmpdir}
 " then it is guaranteed to have a '.rs' extension.
 function! s:WithPath(func, ...)
-	let buf = bufnr('')
-	let saved = {}
-	let dict = {}
-	try
-		let saved.write = &write
-		set write
-		let dict.path = expand('%')
-		let pathisempty = empty(dict.path)
-
-		" Always create a tmpdir in case the wrapped command wants it
-		let dict.tmpdir = tempname()
-		call mkdir(dict.tmpdir)
-
-		if pathisempty || !saved.write
-			let dict.istemp = 1
-			" if we're doing this because of nowrite, preserve the filename
-			if !pathisempty
-				let filename = expand('%:t:r').".rs"
-			else
-				let filename = 'unnamed.rs'
-			endif
-			let dict.tmpdir_relpath = filename
-			let dict.path = dict.tmpdir.'/'.filename
-
-			let saved.mod = &mod
-			set nomod
-
-			silent exe 'keepalt write! ' . fnameescape(dict.path)
-			if pathisempty
-				silent keepalt 0file
-			endif
-		else
-			let dict.istemp = 0
-			update
-		endif
-
-		call call(a:func, [dict] + a:000)
-	finally
-		if bufexists(buf)
-			for [opt, value] in items(saved)
-				silent call setbufvar(buf, '&'.opt, value)
-				unlet value " avoid variable type mismatches
-			endfor
-		endif
-		if has_key(dict, 'tmpdir') | silent call s:RmDir(dict.tmpdir) | endif
-	endtry
+    let buf = bufnr('')
+    let saved = {}
+    let dict = {}
+    try
+        let saved.write = &write
+        set write
+        let dict.path = expand('%')
+        let pathisempty = empty(dict.path)
+
+        " Always create a tmpdir in case the wrapped command wants it
+        let dict.tmpdir = tempname()
+        call mkdir(dict.tmpdir)
+
+        if pathisempty || !saved.write
+            let dict.istemp = 1
+            " if we're doing this because of nowrite, preserve the filename
+            if !pathisempty
+                let filename = expand('%:t:r').".rs"
+            else
+                let filename = 'unnamed.rs'
+            endif
+            let dict.tmpdir_relpath = filename
+            let dict.path = dict.tmpdir.'/'.filename
+
+            let saved.mod = &modified
+            set nomodified
+
+            silent exe 'keepalt write! ' . fnameescape(dict.path)
+            if pathisempty
+                silent keepalt 0file
+            endif
+        else
+            let dict.istemp = 0
+            update
+        endif
+
+        call call(a:func, [dict] + a:000)
+    finally
+        if bufexists(buf)
+            for [opt, value] in items(saved)
+                silent call setbufvar(buf, '&'.opt, value)
+                unlet value " avoid variable type mismatches
+            endfor
+        endif
+        if has_key(dict, 'tmpdir') | silent call s:RmDir(dict.tmpdir) | endif
+    endtry
 endfunction
 
 function! rust#AppendCmdLine(text)
-	call setcmdpos(getcmdpos())
-	let cmd = getcmdline() . a:text
-	return cmd
+    call setcmdpos(getcmdpos())
+    let cmd = getcmdline() . a:text
+    return cmd
 endfunction
 
 " Tokenize the string according to sh parsing rules
 function! s:ShellTokenize(text)
-	" states:
-	" 0: start of word
-	" 1: unquoted
-	" 2: unquoted backslash
-	" 3: double-quote
-	" 4: double-quoted backslash
-	" 5: single-quote
-	let l:state = 0
-	let l:current = ''
-	let l:args = []
-	for c in split(a:text, '\zs')
-		if l:state == 0 || l:state == 1 " unquoted
-			if l:c ==# ' '
-				if l:state == 0 | continue | endif
-				call add(l:args, l:current)
-				let l:current = ''
-				let l:state = 0
-			elseif l:c ==# '\'
-				let l:state = 2
-			elseif l:c ==# '"'
-				let l:state = 3
-			elseif l:c ==# "'"
-				let l:state = 5
-			else
-				let l:current .= l:c
-				let l:state = 1
-			endif
-		elseif l:state == 2 " unquoted backslash
-			if l:c !=# "\n" " can it even be \n?
-				let l:current .= l:c
-			endif
-			let l:state = 1
-		elseif l:state == 3 " double-quote
-			if l:c ==# '\'
-				let l:state = 4
-			elseif l:c ==# '"'
-				let l:state = 1
-			else
-				let l:current .= l:c
-			endif
-		elseif l:state == 4 " double-quoted backslash
-			if stridx('$`"\', l:c) >= 0
-				let l:current .= l:c
-			elseif l:c ==# "\n" " is this even possible?
-				" skip it
-			else
-				let l:current .= '\'.l:c
-			endif
-			let l:state = 3
-		elseif l:state == 5 " single-quoted
-			if l:c == "'"
-				let l:state = 1
-			else
-				let l:current .= l:c
-			endif
-		endif
-	endfor
-	if l:state != 0
-		call add(l:args, l:current)
-	endif
-	return l:args
+    " states:
+    " 0: start of word
+    " 1: unquoted
+    " 2: unquoted backslash
+    " 3: double-quote
+    " 4: double-quoted backslash
+    " 5: single-quote
+    let l:state = 0
+    let l:current = ''
+    let l:args = []
+    for c in split(a:text, '\zs')
+        if l:state == 0 || l:state == 1 " unquoted
+            if l:c ==# ' '
+                if l:state == 0 | continue | endif
+                call add(l:args, l:current)
+                let l:current = ''
+                let l:state = 0
+            elseif l:c ==# '\'
+                let l:state = 2
+            elseif l:c ==# '"'
+                let l:state = 3
+            elseif l:c ==# "'"
+                let l:state = 5
+            else
+                let l:current .= l:c
+                let l:state = 1
+            endif
+        elseif l:state == 2 " unquoted backslash
+            if l:c !=# "\n" " can it even be \n?
+                let l:current .= l:c
+            endif
+            let l:state = 1
+        elseif l:state == 3 " double-quote
+            if l:c ==# '\'
+                let l:state = 4
+            elseif l:c ==# '"'
+                let l:state = 1
+            else
+                let l:current .= l:c
+            endif
+        elseif l:state == 4 " double-quoted backslash
+            if stridx('$`"\', l:c) >= 0
+                let l:current .= l:c
+            elseif l:c ==# "\n" " is this even possible?
+                " skip it
+            else
+                let l:current .= '\'.l:c
+            endif
+            let l:state = 3
+        elseif l:state == 5 " single-quoted
+            if l:c ==# "'"
+                let l:state = 1
+            else
+                let l:current .= l:c
+            endif
+        endif
+    endfor
+    if l:state != 0
+        call add(l:args, l:current)
+    endif
+    return l:args
 endfunction
 
 function! s:RmDir(path)
-	" sanity check; make sure it's not empty, /, or $HOME
-	if empty(a:path)
-		echoerr 'Attempted to delete empty path'
-		return 0
-	elseif a:path == '/' || a:path == $HOME
-		echoerr 'Attempted to delete protected path: ' . a:path
-		return 0
-	endif
-	return system("rm -rf " . shellescape(a:path))
+    " sanity check; make sure it's not empty, /, or $HOME
+    if empty(a:path)
+        echoerr 'Attempted to delete empty path'
+        return 0
+    elseif a:path ==# '/' || a:path ==# $HOME
+        let l:path = expand(a:path)
+        if l:path ==# '/' || l:path ==# $HOME
+            echoerr 'Attempted to delete protected path: ' . a:path
+            return 0
+        endif
+    endif
+
+    if !isdirectory(a:path)
+        return 0
+    endif
+
+    " delete() returns 0 when removing file successfully
+    return delete(a:path, 'rf') == 0
 endfunction
 
 " Executes {cmd} with the cwd set to {pwd}, without changing Vim's cwd.
 " If {pwd} is the empty string then it doesn't change the cwd.
 function! s:system(pwd, cmd)
-	let cmd = a:cmd
-	if !empty(a:pwd)
-		let cmd = 'cd ' . shellescape(a:pwd) . ' && ' . cmd
-	endif
-	return system(cmd)
+    let cmd = a:cmd
+    if !empty(a:pwd)
+        let cmd = 'cd ' . shellescape(a:pwd) . ' && ' . cmd
+    endif
+    return system(cmd)
 endfunction
 
 " Playpen Support {{{1
@@ -366,10 +426,10 @@ endfunction
 " http://github.com/mattn/gist-vim
 function! s:has_webapi()
     if !exists("*webapi#http#post")
-	try
-	    call webapi#http#post()
-	catch
-	endtry
+        try
+            call webapi#http#post()
+        catch
+        endtry
     endif
     return exists("*webapi#http#post")
 endfunction
@@ -381,35 +441,130 @@ function! rust#Play(count, line1, line2, ...) abort
     let l:rust_shortener_url = get(g:, 'rust_shortener_url', 'https://is.gd/')
 
     if !s:has_webapi()
-	echohl ErrorMsg | echomsg ':RustPlay depends on webapi.vim (https://github.com/mattn/webapi-vim)' | echohl None
-	return
+        echohl ErrorMsg | echomsg ':RustPlay depends on webapi.vim (https://github.com/mattn/webapi-vim)' | echohl None
+        return
     endif
 
     let bufname = bufname('%')
     if a:count < 1
-	let content = join(getline(a:line1, a:line2), "\n")
+        let content = join(getline(a:line1, a:line2), "\n")
     else
-	let save_regcont = @"
-	let save_regtype = getregtype('"')
-	silent! normal! gvy
-	let content = @"
-	call setreg('"', save_regcont, save_regtype)
+        let save_regcont = @"
+        let save_regtype = getregtype('"')
+        silent! normal! gvy
+        let content = @"
+        call setreg('"', save_regcont, save_regtype)
     endif
 
-    let body = l:rust_playpen_url."?code=".webapi#http#encodeURI(content)
+    let url = l:rust_playpen_url."?code=".webapi#http#encodeURI(content)
 
-    if strlen(body) > 5000
-	echohl ErrorMsg | echomsg 'Buffer too large, max 5000 encoded characters ('.strlen(body).')' | echohl None
-	return
+    if strlen(url) > 5000
+        echohl ErrorMsg | echomsg 'Buffer too large, max 5000 encoded characters ('.strlen(url).')' | echohl None
+        return
     endif
 
-    let payload = "format=simple&url=".webapi#http#encodeURI(body)
+    let payload = "format=simple&url=".webapi#http#encodeURI(url)
     let res = webapi#http#post(l:rust_shortener_url.'create.php', payload, {})
-    let url = res.content
+    if res.status[0] ==# '2'
+        let url = res.content
+    endif
+
+    let footer = ''
+    if exists('g:rust_clip_command')
+        call system(g:rust_clip_command, url)
+        if !v:shell_error
+            let footer = ' (copied to clipboard)'
+        endif
+    endif
+    redraw | echomsg 'Done: '.url.footer
+endfunction
+
+" Run a test under the cursor or all tests {{{1
+
+" Finds a test function name under the cursor. Returns empty string when a
+" test function is not found.
+function! s:SearchTestFunctionNameUnderCursor() abort
+    let cursor_line = line('.')
 
-    redraw | echomsg 'Done: '.url
+    " Find #[test] attribute
+    if search('\m\C#\[test\]', 'bcW') is 0
+        return ''
+    endif
+
+    " Move to an opening brace of the test function
+    let test_func_line = search('\m\C^\s*fn\s\+\h\w*\s*(.\+{$', 'eW')
+    if test_func_line is 0
+        return ''
+    endif
+
+    " Search the end of test function (closing brace) to ensure that the
+    " cursor position is within function definition
+    if maparg('<Plug>(MatchitNormalForward)') ==# ''
+        keepjumps normal! %
+    else
+        " Prefer matchit.vim official plugin to native % since the plugin
+        " provides better behavior than original % (#391)
+        " To load the plugin, run:
+        "   :packadd matchit
+        execute 'keepjumps' 'normal' "\<Plug>(MatchitNormalForward)"
+    endif
+    if line('.') < cursor_line
+        return ''
+    endif
+
+    return matchstr(getline(test_func_line), '\m\C^\s*fn\s\+\zs\h\w*')
+endfunction
+
+function! rust#Test(mods, winsize, all, options) abort
+    let manifest = findfile('Cargo.toml', expand('%:p:h') . ';')
+    if manifest ==# ''
+        return rust#Run(1, '--test ' . a:options)
+    endif
+
+    " <count> defaults to 0, but we prefer an empty string
+    let winsize = a:winsize ? a:winsize : ''
+
+    if has('terminal')
+        if has('patch-8.0.910')
+            let cmd = printf('%s noautocmd %snew | terminal ++curwin ', a:mods, winsize)
+        else
+            let cmd = printf('%s terminal ', a:mods)
+        endif
+    elseif has('nvim')
+        let cmd = printf('%s noautocmd %snew | terminal ', a:mods, winsize)
+    else
+        let cmd = '!'
+        let manifest = shellescape(manifest)
+    endif
+
+    if a:all
+        if a:options ==# ''
+            execute cmd . 'cargo test --manifest-path' manifest
+        else
+            execute cmd . 'cargo test --manifest-path' manifest a:options
+        endif
+        return
+    endif
+
+    let saved = getpos('.')
+    try
+        let func_name = s:SearchTestFunctionNameUnderCursor()
+    finally
+        call setpos('.', saved)
+    endtry
+    if func_name ==# ''
+        echohl ErrorMsg
+        echomsg 'No test function was found under the cursor. Please add ! to command if you want to run all tests'
+        echohl None
+        return
+    endif
+    if a:options ==# ''
+        execute cmd . 'cargo test --manifest-path' manifest func_name
+    else
+        execute cmd . 'cargo test --manifest-path' manifest func_name a:options
+    endif
 endfunction
 
 " }}}1
 
-" vim: set noet sw=8 ts=8:
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/autoload/rust/debugging.vim b/runtime/autoload/rust/debugging.vim
new file mode 100644
index 0000000000..0e84183172
--- /dev/null
+++ b/runtime/autoload/rust/debugging.vim
@@ -0,0 +1,105 @@
+" Last Modified: 2023-09-11
+
+" For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
+
+let s:global_variable_list = [
+            \ '_rustfmt_autosave_because_of_config',
+            \ 'ftplugin_rust_source_path',
+            \ 'loaded_syntastic_rust_cargo_checker',
+            \ 'loaded_syntastic_rust_filetype',
+            \ 'loaded_syntastic_rust_rustc_checker',
+            \ 'rust_bang_comment_leader',
+            \ 'rust_cargo_avoid_whole_workspace',
+            \ 'rust_clip_command',
+            \ 'rust_conceal',
+            \ 'rust_conceal_mod_path',
+            \ 'rust_conceal_pub',
+            \ 'rust_fold',
+            \ 'rust_last_args',
+            \ 'rust_last_rustc_args',
+            \ 'rust_original_delimitMate_excluded_regions',
+            \ 'rust_playpen_url',
+            \ 'rust_prev_delimitMate_quotes',
+            \ 'rust_recent_nearest_cargo_tol',
+            \ 'rust_recent_root_cargo_toml',
+            \ 'rust_recommended_style',
+            \ 'rust_set_conceallevel',
+            \ 'rust_set_conceallevel=1',
+            \ 'rust_set_foldmethod',
+            \ 'rust_set_foldmethod=1',
+            \ 'rust_shortener_url',
+            \ 'rustc_makeprg_no_percent',
+            \ 'rustc_path',
+            \ 'rustfmt_autosave',
+            \ 'rustfmt_autosave_if_config_present',
+            \ 'rustfmt_command',
+            \ 'rustfmt_emit_files',
+            \ 'rustfmt_fail_silently',
+            \ 'rustfmt_options',
+            \ 'syntastic_extra_filetypes',
+            \ 'syntastic_rust_cargo_fname',
+            \]
+
+function! s:Echo(message) abort
+    execute 'echo a:message'
+endfunction
+
+function! s:EchoGlobalVariables() abort
+    for l:key in s:global_variable_list
+        if l:key !~# '^_'
+            call s:Echo('let g:' . l:key . ' = ' . string(get(g:, l:key, v:null)))
+        endif
+
+        if has_key(b:, l:key)
+            call s:Echo('let b:' . l:key . ' = ' . string(b:[l:key]))
+        endif
+    endfor
+endfunction
+
+function! rust#debugging#Info() abort
+    call cargo#Load()
+    call rust#Load()
+    call rustfmt#Load()
+    call s:Echo('rust.vim Global Variables:')
+    call s:Echo('')
+    call s:EchoGlobalVariables()
+
+    silent let l:output = system(g:rustfmt_command . ' --version')
+    echo l:output
+
+    let l:rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
+    silent let l:output = system(l:rustc . ' --version')
+    echo l:output
+
+    silent let l:output = system('cargo --version')
+    echo l:output
+
+    version
+
+    if exists(":SyntasticInfo")
+        echo "----"
+        echo "Info from Syntastic:"
+        execute "SyntasticInfo"
+    endif
+endfunction
+
+function! rust#debugging#InfoToClipboard() abort
+    redir @"
+    silent call rust#debugging#Info()
+    redir END
+
+    call s:Echo('RustInfo copied to your clipboard')
+endfunction
+
+function! rust#debugging#InfoToFile(filename) abort
+    let l:expanded_filename = expand(a:filename)
+
+    redir => l:output
+    silent call rust#debugging#Info()
+    redir END
+
+    call writefile(split(l:output, "\n"), l:expanded_filename)
+    call s:Echo('RustInfo written to ' . l:expanded_filename)
+endfunction
+
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/autoload/rustfmt.vim b/runtime/autoload/rustfmt.vim
index a689b5e00d..652e6af33a 100644
--- a/runtime/autoload/rustfmt.vim
+++ b/runtime/autoload/rustfmt.vim
@@ -1,107 +1,261 @@
 " Author: Stephen Sugden <stephen@stephensugden.com>
+" Last Modified: 2023-09-11
 "
 " Adapted from https://github.com/fatih/vim-go
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 if !exists("g:rustfmt_autosave")
-	let g:rustfmt_autosave = 0
+    let g:rustfmt_autosave = 0
 endif
 
 if !exists("g:rustfmt_command")
-	let g:rustfmt_command = "rustfmt"
+    let g:rustfmt_command = "rustfmt"
 endif
 
 if !exists("g:rustfmt_options")
-	let g:rustfmt_options = ""
+    let g:rustfmt_options = ""
 endif
 
 if !exists("g:rustfmt_fail_silently")
-	let g:rustfmt_fail_silently = 0
+    let g:rustfmt_fail_silently = 0
+endif
+
+function! rustfmt#DetectVersion()
+    " Save rustfmt '--help' for feature inspection
+    silent let s:rustfmt_help = system(g:rustfmt_command . " --help")
+    let s:rustfmt_unstable_features = s:rustfmt_help =~# "--unstable-features"
+
+    " Build a comparable rustfmt version varible out of its `--version` output:
+    silent let l:rustfmt_version_full = system(g:rustfmt_command . " --version")
+    let l:rustfmt_version_list = matchlist(l:rustfmt_version_full,
+        \    '\vrustfmt ([0-9]+[.][0-9]+[.][0-9]+)')
+    if len(l:rustfmt_version_list) < 3
+        let s:rustfmt_version = "0"
+    else
+        let s:rustfmt_version = l:rustfmt_version_list[1]
+    endif
+    return s:rustfmt_version
+endfunction
+
+call rustfmt#DetectVersion()
+
+if !exists("g:rustfmt_emit_files")
+    let g:rustfmt_emit_files = s:rustfmt_version >= "0.8.2"
+endif
+
+if !exists("g:rustfmt_file_lines")
+    let g:rustfmt_file_lines = s:rustfmt_help =~# "--file-lines JSON"
 endif
 
 let s:got_fmt_error = 0
 
+function! rustfmt#Load()
+    " Utility call to get this script loaded, for debugging
+endfunction
+
+function! s:RustfmtWriteMode()
+    if g:rustfmt_emit_files
+        return "--emit=files"
+    else
+        return "--write-mode=overwrite"
+    endif
+endfunction
+
+function! s:RustfmtConfigOptions()
+    let l:rustfmt_toml = findfile('rustfmt.toml', expand('%:p:h') . ';')
+    if l:rustfmt_toml !=# ''
+        return '--config-path '.shellescape(fnamemodify(l:rustfmt_toml, ":p"))
+    endif
+
+    let l:_rustfmt_toml = findfile('.rustfmt.toml', expand('%:p:h') . ';')
+    if l:_rustfmt_toml !=# ''
+        return '--config-path '.shellescape(fnamemodify(l:_rustfmt_toml, ":p"))
+    endif
+
+    " Default to edition 2018 in case no rustfmt.toml was found.
+    return '--edition 2018'
+endfunction
+
 function! s:RustfmtCommandRange(filename, line1, line2)
-	let l:arg = {"file": shellescape(a:filename), "range": [a:line1, a:line2]}
-	return printf("%s %s --write-mode=overwrite --file-lines '[%s]'", g:rustfmt_command, g:rustfmt_options, json_encode(l:arg))
+    if g:rustfmt_file_lines == 0
+        echo "--file-lines is not supported in the installed `rustfmt` executable"
+        return
+    endif
+
+    let l:arg = {"file": shellescape(a:filename), "range": [a:line1, a:line2]}
+    let l:write_mode = s:RustfmtWriteMode()
+    let l:rustfmt_config = s:RustfmtConfigOptions()
+
+    " FIXME: When --file-lines gets to be stable, add version range checking
+    " accordingly.
+    let l:unstable_features = s:rustfmt_unstable_features ? '--unstable-features' : ''
+
+    let l:cmd = printf("%s %s %s %s %s --file-lines '[%s]' %s", g:rustfmt_command,
+                \ l:write_mode, g:rustfmt_options,
+                \ l:unstable_features, l:rustfmt_config,
+                \ json_encode(l:arg), shellescape(a:filename))
+    return l:cmd
 endfunction
 
-function! s:RustfmtCommand(filename)
-	return g:rustfmt_command . " --write-mode=overwrite " . g:rustfmt_options . " " . shellescape(a:filename)
+function! s:RustfmtCommand()
+    let write_mode = g:rustfmt_emit_files ? '--emit=stdout' : '--write-mode=display'
+    let config = s:RustfmtConfigOptions()
+    return join([g:rustfmt_command, write_mode, config, g:rustfmt_options])
 endfunction
 
-function! s:RunRustfmt(command, curw, tmpname)
-	if exists("*systemlist")
-		let out = systemlist(a:command)
-	else
-		let out = split(system(a:command), '\r\?\n')
-	endif
-
-	if v:shell_error == 0 || v:shell_error == 3
-		" remove undo point caused via BufWritePre
-		try | silent undojoin | catch | endtry
-
-		" Replace current file with temp file, then reload buffer
-		call rename(a:tmpname, expand('%'))
-		silent edit!
-		let &syntax = &syntax
-
-		" only clear location list if it was previously filled to prevent
-		" clobbering other additions
-		if s:got_fmt_error
-			let s:got_fmt_error = 0
-			call setloclist(0, [])
-			lwindow
-		endif
-	elseif g:rustfmt_fail_silently == 0
-		" otherwise get the errors and put them in the location list
-		let errors = []
-
-		for line in out
-			" src/lib.rs:13:5: 13:10 error: expected `,`, or `}`, found `value`
-			let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\):\s*\(\d\+:\d\+\s*\)\?\s*error: \(.*\)')
-			if !empty(tokens)
-				call add(errors, {"filename": @%,
-						 \"lnum":     tokens[2],
-						 \"col":      tokens[3],
-						 \"text":     tokens[5]})
-			endif
-		endfor
-
-		if empty(errors)
-			% | " Couldn't detect rustfmt error format, output errors
-		endif
-
-		if !empty(errors)
-			call setloclist(0, errors, 'r')
-			echohl Error | echomsg "rustfmt returned error" | echohl None
-		endif
-
-		let s:got_fmt_error = 1
-		lwindow
-		" We didn't use the temp file, so clean up
-		call delete(a:tmpname)
-	endif
-
-	call winrestview(a:curw)
+function! s:DeleteLines(start, end) abort
+    silent! execute a:start . ',' . a:end . 'delete _'
 endfunction
 
-function! rustfmt#FormatRange(line1, line2)
-	let l:curw = winsaveview()
-	let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
-	call writefile(getline(1, '$'), l:tmpname)
+function! s:RunRustfmt(command, tmpname, from_writepre)
+    let l:view = winsaveview()
+
+    let l:stderr_tmpname = tempname()
+    call writefile([], l:stderr_tmpname)
+
+    let l:command = a:command . ' 2> ' . l:stderr_tmpname
 
-	let command = s:RustfmtCommandRange(l:tmpname, a:line1, a:line2)
+    if a:tmpname ==# ''
+        " Rustfmt in stdin/stdout mode
 
-	call s:RunRustfmt(command, l:curw, l:tmpname)
+        " chdir to the directory of the file
+        let l:has_lcd = haslocaldir()
+        let l:prev_cd = getcwd()
+        execute 'lchdir! '.expand('%:h')
+
+        let l:buffer = getline(1, '$')
+        if exists("*systemlist")
+            silent let out = systemlist(l:command, l:buffer)
+        else
+            silent let out = split(system(l:command,
+                        \ join(l:buffer, "\n")), '\r\?\n')
+        endif
+    else
+        if exists("*systemlist")
+            silent let out = systemlist(l:command)
+        else
+            silent let out = split(system(l:command), '\r\?\n')
+        endif
+    endif
+
+    let l:stderr = readfile(l:stderr_tmpname)
+
+    call delete(l:stderr_tmpname)
+
+    let l:open_lwindow = 0
+    if v:shell_error == 0
+        if a:from_writepre
+            " remove undo point caused via BufWritePre
+            try | silent undojoin | catch | endtry
+        endif
+
+        if a:tmpname ==# ''
+            let l:content = l:out
+        else
+            " take the tmpfile's content, this is better than rename
+            " because it preserves file modes.
+            let l:content = readfile(a:tmpname)
+        endif
+
+        call s:DeleteLines(len(l:content), line('$'))
+        call setline(1, l:content)
+
+        " only clear location list if it was previously filled to prevent
+        " clobbering other additions
+        if s:got_fmt_error
+            let s:got_fmt_error = 0
+            call setloclist(0, [])
+            let l:open_lwindow = 1
+        endif
+    elseif g:rustfmt_fail_silently == 0 && !a:from_writepre
+        " otherwise get the errors and put them in the location list
+        let l:errors = []
+
+        let l:prev_line = ""
+        for l:line in l:stderr
+            " error: expected one of `;` or `as`, found `extern`
+            "  --> src/main.rs:2:1
+            let tokens = matchlist(l:line, '^\s\+-->\s\(.\{-}\):\(\d\+\):\(\d\+\)$')
+            if !empty(tokens)
+                call add(l:errors, {"filename": @%,
+                            \"lnum":	tokens[2],
+                            \"col":	tokens[3],
+                            \"text":	l:prev_line})
+            endif
+            let l:prev_line = l:line
+        endfor
+
+        if !empty(l:errors)
+            call setloclist(0, l:errors, 'r')
+            echohl Error | echomsg "rustfmt returned error" | echohl None
+        else
+            echo "rust.vim: was not able to parse rustfmt messages. Here is the raw output:"
+            echo "\n"
+            for l:line in l:stderr
+                echo l:line
+            endfor
+        endif
+
+        let s:got_fmt_error = 1
+        let l:open_lwindow = 1
+    endif
+
+    " Restore the current directory if needed
+    if a:tmpname ==# ''
+        if l:has_lcd
+            execute 'lchdir! '.l:prev_cd
+        else
+            execute 'chdir! '.l:prev_cd
+        endif
+    endif
+
+    " Open lwindow after we have changed back to the previous directory
+    if l:open_lwindow == 1
+        lwindow
+    endif
+
+    call winrestview(l:view)
+endfunction
+
+function! rustfmt#FormatRange(line1, line2)
+    let l:tmpname = tempname()
+    call writefile(getline(1, '$'), l:tmpname)
+    let command = s:RustfmtCommandRange(l:tmpname, a:line1, a:line2)
+    call s:RunRustfmt(command, l:tmpname, v:false)
+    call delete(l:tmpname)
 endfunction
 
 function! rustfmt#Format()
-	let l:curw = winsaveview()
-	let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
-	call writefile(getline(1, '$'), l:tmpname)
+    call s:RunRustfmt(s:RustfmtCommand(), '', v:false)
+endfunction
 
-	let command = s:RustfmtCommand(l:tmpname)
+function! rustfmt#Cmd()
+    " Mainly for debugging
+    return s:RustfmtCommand()
+endfunction
+
+function! rustfmt#PreWrite()
+    if !filereadable(expand("%@"))
+        return
+    endif
+    if rust#GetConfigVar('rustfmt_autosave_if_config_present', 0)
+        if findfile('rustfmt.toml', '.;') !=# '' || findfile('.rustfmt.toml', '.;') !=# ''
+            let b:rustfmt_autosave = 1
+            let b:_rustfmt_autosave_because_of_config = 1
+        endif
+    else
+        if has_key(b:, '_rustfmt_autosave_because_of_config')
+            unlet b:_rustfmt_autosave_because_of_config
+            unlet b:rustfmt_autosave
+        endif
+    endif
+
+    if !rust#GetConfigVar("rustfmt_autosave", 0)
+        return
+    endif
 
-	call s:RunRustfmt(command, l:curw, l:tmpname)
+    call s:RunRustfmt(s:RustfmtCommand(), '', v:true)
 endfunction
+
+
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/compiler/cargo.vim b/runtime/compiler/cargo.vim
index bd48666bc9..aa9b01e93c 100644
--- a/runtime/compiler/cargo.vim
+++ b/runtime/compiler/cargo.vim
@@ -1,35 +1,51 @@
 " Vim compiler file
 " Compiler:         Cargo Compiler
 " Maintainer:       Damien Radtke <damienradtke@gmail.com>
-" Latest Revision:  2014 Sep 24
+" Latest Revision:  2023-09-11
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 if exists('current_compiler')
-	finish
+    finish
 endif
 runtime compiler/rustc.vim
 let current_compiler = "cargo"
 
+" vint: -ProhibitAbbreviationOption
 let s:save_cpo = &cpo
 set cpo&vim
+" vint: +ProhibitAbbreviationOption
 
 if exists(':CompilerSet') != 2
-	command -nargs=* CompilerSet setlocal <args>
+    command -nargs=* CompilerSet setlocal <args>
 endif
 
 if exists('g:cargo_makeprg_params')
-	execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
+    execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
 else
-	CompilerSet makeprg=cargo\ $*
+    CompilerSet makeprg=cargo\ $*
 endif
 
+augroup RustCargoQuickFixHooks
+    autocmd!
+    autocmd QuickFixCmdPre make call cargo#quickfix#CmdPre()
+    autocmd QuickFixCmdPost make call cargo#quickfix#CmdPost()
+augroup END
+
 " Ignore general cargo progress messages
 CompilerSet errorformat+=
-			\%-G%\\s%#Downloading%.%#,
-			\%-G%\\s%#Compiling%.%#,
-			\%-G%\\s%#Finished%.%#,
-			\%-G%\\s%#error:\ Could\ not\ compile\ %.%#,
-			\%-G%\\s%#To\ learn\ more\\,%.%#
+            \%-G%\\s%#Downloading%.%#,
+            \%-G%\\s%#Checking%.%#,
+            \%-G%\\s%#Compiling%.%#,
+            \%-G%\\s%#Finished%.%#,
+            \%-G%\\s%#error:\ Could\ not\ compile\ %.%#,
+            \%-G%\\s%#To\ learn\ more\\,%.%#,
+            \%-G%\\s%#For\ more\ information\ about\ this\ error\\,%.%#,
+            \%-Gnote:\ Run\ with\ \`RUST_BACKTRACE=%.%#,
+            \%.%#panicked\ at\ \\'%m\\'\\,\ %f:%l:%c
 
+" vint: -ProhibitAbbreviationOption
 let &cpo = s:save_cpo
 unlet s:save_cpo
+" vint: +ProhibitAbbreviationOption
+
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/compiler/rustc.vim b/runtime/compiler/rustc.vim
index 5e5b9a4e0a..efcf24ed80 100644
--- a/runtime/compiler/rustc.vim
+++ b/runtime/compiler/rustc.vim
@@ -1,46 +1,57 @@
 " Vim compiler file
 " Compiler:         Rust Compiler
 " Maintainer:       Chris Morgan <me@chrismorgan.info>
-" Latest Revision:  2013 Jul 12
+" Latest Revision:  2023-09-11
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 if exists("current_compiler")
-	finish
+    finish
 endif
 let current_compiler = "rustc"
 
-let s:cpo_save = &cpo
+" vint: -ProhibitAbbreviationOption
+let s:save_cpo = &cpo
 set cpo&vim
+" vint: +ProhibitAbbreviationOption
 
 if exists(":CompilerSet") != 2
-	command -nargs=* CompilerSet setlocal <args>
+    command -nargs=* CompilerSet setlocal <args>
 endif
 
-if exists("g:rustc_makeprg_no_percent") && g:rustc_makeprg_no_percent != 0
-	CompilerSet makeprg=rustc
+if get(g:, 'rustc_makeprg_no_percent', 0)
+    CompilerSet makeprg=rustc
 else
-	CompilerSet makeprg=rustc\ \%:S
+    if has('patch-7.4.191')
+      CompilerSet makeprg=rustc\ \%:S
+    else
+      CompilerSet makeprg=rustc\ \"%\"
+    endif
 endif
 
-" Old errorformat (before nightly 2016/08/10)
+" New errorformat (after nightly 2016/08/10)
 CompilerSet errorformat=
-			\%f:%l:%c:\ %t%*[^:]:\ %m,
-			\%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
-			\%-G%f:%l\ %s,
-			\%-G%*[\ ]^,
-			\%-G%*[\ ]^%*[~],
-			\%-G%*[\ ]...
+            \%-G,
+            \%-Gerror:\ aborting\ %.%#,
+            \%-Gerror:\ Could\ not\ compile\ %.%#,
+            \%Eerror:\ %m,
+            \%Eerror[E%n]:\ %m,
+            \%Wwarning:\ %m,
+            \%Inote:\ %m,
+            \%C\ %#-->\ %f:%l:%c,
+            \%E\ \ left:%m,%C\ right:%m\ %f:%l:%c,%Z
 
-" New errorformat (after nightly 2016/08/10)
+" Old errorformat (before nightly 2016/08/10)
 CompilerSet errorformat+=
-			\%-G,
-			\%-Gerror:\ aborting\ %.%#,
-			\%-Gerror:\ Could\ not\ compile\ %.%#,
-			\%Eerror:\ %m,
-			\%Eerror[E%n]:\ %m,
-			\%Wwarning:\ %m,
-			\%Inote:\ %m,
-			\%C\ %#-->\ %f:%l:%c
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
+            \%f:%l:%c:\ %t%*[^:]:\ %m,
+            \%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
+            \%-G%f:%l\ %s,
+            \%-G%*[\ ]^,
+            \%-G%*[\ ]^%*[~],
+            \%-G%*[\ ]...
+
+" vint: -ProhibitAbbreviationOption
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vint: +ProhibitAbbreviationOption
+
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/doc/ft_rust.txt b/runtime/doc/ft_rust.txt
index a5d5b558dc..b912f732b6 100644
--- a/runtime/doc/ft_rust.txt
+++ b/runtime/doc/ft_rust.txt
@@ -1,72 +1,74 @@
-*ft_rust.txt*	Nvim
-
-This is documentation for the Rust filetype plugin.
+*ft_rust.txt*      Filetype plugin for Rust
 
 ==============================================================================
-CONTENTS						      *rust*
+CONTENTS                                                      *rust*
 
-1. Introduction							  |rust-intro|
-2. Settings						       |rust-settings|
-3. Commands						       |rust-commands|
-4. Mappings						       |rust-mappings|
+1. Introduction                                                   |rust-intro|
+2. Settings                                                    |rust-settings|
+3. Commands                                                    |rust-commands|
+4. Mappings                                                    |rust-mappings|
 
 ==============================================================================
-INTRODUCTION							  *rust-intro*
+INTRODUCTION                                                      *rust-intro*
 
 This plugin provides syntax and supporting functionality for the Rust
-filetype.
+filetype. It requires Vim 8 or higher for full functionality. Some commands
+will not work on earlier versions.
 
 ==============================================================================
-SETTINGS						       *rust-settings*
+SETTINGS                                                       *rust-settings*
 
 This plugin has a few variables you can define in your vimrc that change the
 behavior of the plugin.
 
-								*g:rustc_path*
-g:rustc_path~
+Some variables can be set buffer local (`:b` prefix), and the buffer local
+will take precedence over the global `g:` counterpart.
+
+                                                                *g:rustc_path*
+g:rustc_path ~
 	Set this option to the path to rustc for use in the |:RustRun| and
-	|:RustExpand| commands. If unset, "rustc" will be located in $PATH: >
-	    let g:rustc_path = $HOME .. "/bin/rustc"
+	|:RustExpand| commands. If unset, `rustc` will be located in $PATH: >vim
+	    let g:rustc_path = $HOME."/bin/rustc"
 <
 
-						  *g:rustc_makeprg_no_percent*
-g:rustc_makeprg_no_percent~
-	Set this option to 1 to have 'makeprg' default to "rustc" instead of
-	"rustc %": >
+                                                  *g:rustc_makeprg_no_percent*
+g:rustc_makeprg_no_percent ~
+	Set this option to 1 to have 'makeprg' default to `rustc` instead of
+	`rustc %`: >vim
 	    let g:rustc_makeprg_no_percent = 1
 <
 
-							      *g:rust_conceal*
-g:rust_conceal~
-	Set this option to turn on the basic |conceal| support: >
+                                                              *g:rust_conceal*
+g:rust_conceal ~
+	Set this option to turn on the basic |conceal| support: >vim
 	    let g:rust_conceal = 1
 <
 
-						     *g:rust_conceal_mod_path*
-g:rust_conceal_mod_path~
+                                                     *g:rust_conceal_mod_path*
+g:rust_conceal_mod_path ~
 	Set this option to turn on |conceal| for the path connecting token
-	"::": >
+	"::": >vim
 	    let g:rust_conceal_mod_path = 1
 <
 
-							  *g:rust_conceal_pub*
-g:rust_conceal_pub~
-	Set this option to turn on |conceal| for the "pub" token: >
+                                                          *g:rust_conceal_pub*
+g:rust_conceal_pub ~
+	Set this option to turn on |conceal| for the "pub" token: >vim
 	    let g:rust_conceal_pub = 1
 <
 
-						     *g:rust_recommended_style*
-g:rust_recommended_style~
-	Set this option to enable vim indentation and textwidth settings to
-	conform to style conventions of the rust standard library (i.e. use 4
-	spaces for indents and sets 'textwidth' to 99). This option is enabled
-	by default. To disable it: >
+                                                     *g:rust_recommended_style*
+g:rust_recommended_style ~
+        Set this option to enable vim indentation and textwidth settings to
+        conform to style conventions of the rust standard library (i.e. use 4
+        spaces for indents and sets 'textwidth' to 99). This option is enabled
+	by default. To disable it: >vim
 	    let g:rust_recommended_style = 0
 <
 
-								 *g:rust_fold*
-g:rust_fold~
-	Set this option to turn on |folding|: >
+                                                                 *g:rust_fold*
+g:rust_fold ~
+	Set this option to turn on |folding|: >vim
 	    let g:rust_fold = 1
 <
 	Value		Effect ~
@@ -77,62 +79,297 @@ g:rust_fold~
 			global value (all folds are closed by default).
 
 						  *g:rust_bang_comment_leader*
-g:rust_bang_comment_leader~
+g:rust_bang_comment_leader ~
 	Set this option to 1 to preserve the leader on multi-line doc comments
-	using the /*! syntax: >
+	using the `/*!` syntax: >vim
 	    let g:rust_bang_comment_leader = 1
 <
 
-						 *g:ftplugin_rust_source_path*
-g:ftplugin_rust_source_path~
+                                                *g:rust_use_custom_ctags_defs*
+g:rust_use_custom_ctags_defs ~
+	Set this option to 1 if you have customized ctags definitions for Rust
+	and do not wish for those included with rust.vim to be used: >vim
+	    let g:rust_use_custom_ctags_defs = 1
+<
+
+	NOTE: rust.vim's built-in definitions are only used for the Tagbar Vim
+	plugin, if you have it installed, AND if Universal Ctags is not
+	detected. This is because Universal Ctags already has built-in
+	support for Rust when used with Tagbar.
+
+	Also, note that when using ctags other than Universal Ctags, it is not
+	automatically used when generating |tags| files that Vim can use to
+	navigate to definitions across different source files. Feel free to
+	copy `rust.vim/ctags/rust.ctags` into your own `~/.ctags` if you wish
+	to generate |tags| files.
+
+                                                 *g:ftplugin_rust_source_path*
+g:ftplugin_rust_source_path ~
 	Set this option to a path that should be prepended to 'path' for Rust
-	source files: >
-	    let g:ftplugin_rust_source_path = $HOME .. '/dev/rust'
+	source files: >vim
+	    let g:ftplugin_rust_source_path = $HOME . '/dev/rust'
 <
 
 						       *g:rustfmt_command*
-g:rustfmt_command~
+g:rustfmt_command ~
 	Set this option to the name of the "rustfmt" executable in your $PATH. If
-	not specified it defaults to "rustfmt" : >
+	not specified it defaults to "rustfmt" : >vim
 	    let g:rustfmt_command = 'rustfmt'
 <
 						       *g:rustfmt_autosave*
-g:rustfmt_autosave~
+g:rustfmt_autosave ~
 	Set this option to 1 to run |:RustFmt| automatically when saving a
-	buffer. If not specified it defaults to 0 : >
+	buffer. If not specified it defaults to 0 : >vim
 	    let g:rustfmt_autosave = 0
 <
+	There is also a buffer-local b:rustfmt_autosave that can be set for
+	the same purpose, and can override the global setting.
+
+                                        *g:rustfmt_autosave_if_config_present*
+g:rustfmt_autosave_if_config_present ~
+	Set this option to 1 to have *b:rustfmt_autosave* be set automatically
+	if a `rustfmt.toml` file is present in any parent directly leading to
+	the file being edited. If not set, default to 0: >vim
+	    let g:rustfmt_autosave_if_config_present = 0
+<
+	This is useful to have `rustfmt` only execute on save, on projects
+	that have `rustfmt.toml` configuration.
+
+	There is also a buffer-local b:rustfmt_autosave_if_config_present
+	that can be set for the same purpose, which can overrides the global
+	setting.
+
 						       *g:rustfmt_fail_silently*
-g:rustfmt_fail_silently~
+g:rustfmt_fail_silently ~
 	Set this option to 1 to prevent "rustfmt" from populating the
-	|location-list| with errors. If not specified it defaults to 0: >
+	|location-list| with errors. If not specified it defaults to 0: >vim
 	    let g:rustfmt_fail_silently = 0
 <
 						       *g:rustfmt_options*
-g:rustfmt_options~
+g:rustfmt_options ~
 	Set this option to a string of options to pass to "rustfmt". The
 	write-mode is already set to "overwrite". If not specified it
-	defaults to '' : >
+	defaults to '' : >vim
 	    let g:rustfmt_options = ''
 <
+                                                       *g:rustfmt_emit_files*
+g:rustfmt_emit_files ~
+	If not specified rust.vim tries to detect the right parameter to
+	pass to rustfmt based on its reported version. Otherwise, it
+	determines whether to run rustfmt with '--emit=files' (when 1 is
+	provided) instead of '--write-mode=overwrite'. >vim
+	    let g:rustfmt_emit_files = 0
+<
 
 							  *g:rust_playpen_url*
-g:rust_playpen_url~
-	Set this option to override the URL for the playpen to use: >
+g:rust_playpen_url ~
+	Set this option to override the url for the playpen to use: >vim
 	    let g:rust_playpen_url = 'https://play.rust-lang.org/'
 <
 
 							*g:rust_shortener_url*
-g:rust_shortener_url~
-	Set this option to override the URL for the URL shortener: >
+g:rust_shortener_url ~
+	Set this option to override the url for the url shortener: >vim
 	    let g:rust_shortener_url = 'https://is.gd/'
 <
+                                                        *g:rust_clip_command*
+g:rust_clip_command ~
+	Set this option to the command used in your OS to copy the Rust Play
+	url to the clipboard: >vim
+	    let g:rust_clip_command = 'xclip -selection clipboard'
+<
 
+                                                       *g:cargo_makeprg_params*
+g:cargo_makeprg_params ~
+	Set this option to the string of parameters to pass to cargo. If not
+	specified it defaults to `$*` : >vim
+	    let g:cargo_makeprg_params = 'build'
+<
+
+                                                  *g:cargo_shell_command_runner*
+g:cargo_shell_command_runner ~
+	Set this option to change how to run shell commands for cargo commands
+	|:Cargo|, |:Cbuild|, |:Crun|, ...
+	By default, |:terminal| is used to run shell command in terminal window
+	asynchronously. But if you prefer |:!| for running the commands, it can
+	be specified: >vim
+	    let g:cargo_shell_command_runner = '!'
+<
+
+------------------------------------------------------------------------------
+Integration with Syntastic                                    *rust-syntastic*
+
+This plugin automatically integrates with the Syntastic checker. There are two
+checkers provided: `rustc`, and `cargo`. The latter invokes `cargo` in order to
+build code, and the former delivers a single edited '.rs' file as a compilation
+target directly to the Rust compiler, `rustc`.
+
+Because Cargo is almost exclusively being used for building Rust code these
+days, `cargo` is the default checker. >vim
+
+    let g:syntastic_rust_checkers = ['cargo']
+<
+If you would like to change it, you can set `g:syntastic_rust_checkers` to a
+different value.
+                                          *g:rust_cargo_avoid_whole_workspace*
+                                          *b:rust_cargo_avoid_whole_workspace*
+g:rust_cargo_avoid_whole_workspace ~
+	When editing a crate that is part of a Cargo workspace, and this
+	option is set to 1 (the default), then `cargo` will be executed
+	directly in that crate directory instead of in the workspace
+	directory. Setting 0 prevents this behavior - however be aware that if
+	you are working in large workspace, Cargo commands may take more time,
+	plus the Syntastic error list may include all the crates in the
+	workspace. >vim
+            let g:rust_cargo_avoid_whole_workspace = 0
+<
+                                              *g:rust_cargo_check_all_targets*
+                                              *b:rust_cargo_check_all_targets*
+g:rust_cargo_check_all_targets ~
+	When set to 1, the `--all-targets` option will be passed to cargo when
+	Syntastic executes it, allowing the linting of all targets under the
+	package.
+	The default is 0.
+
+                                              *g:rust_cargo_check_all_features*
+                                              *b:rust_cargo_check_all_features*
+g:rust_cargo_check_all_features ~
+	When set to 1, the `--all-features` option will be passed to cargo when
+	Syntastic executes it, allowing the linting of all features of the
+	package.
+	The default is 0.
+
+                                                 *g:rust_cargo_check_examples*
+                                                 *b:rust_cargo_check_examples*
+g:rust_cargo_check_examples ~
+	When set to 1, the `--examples` option will be passed to cargo when
+	Syntastic executes it, to prevent the exclusion of examples from
+	linting. The examples are normally under the `examples/` directory of
+	the crate.
+	The default is 0.
+
+                                                    *g:rust_cargo_check_tests*
+                                                    *b:rust_cargo_check_tests*
+g:rust_cargo_check_tests ~
+	When set to 1, the `--tests` option will be passed to cargo when
+	Syntastic executes it, to prevent the exclusion of tests from linting.
+	The tests are normally under the `tests/` directory of the crate.
+	The default is 0.
+
+                                                  *g:rust_cargo_check_benches*
+                                                  *b:rust_cargo_check_benches*
+g:rust_cargo_check_benches ~
+	When set to 1, the `--benches` option will be passed to cargo when
+	Syntastic executes it.  The benches are normally under the `benches/`
+	directory of the crate.
+	The default is 0.
+
+------------------------------------------------------------------------------
+Integration with auto-pairs                                    *rust-auto-pairs*
+
+This plugin automatically configures the auto-pairs plugin not to duplicate
+single quotes, which are used more often for lifetime annotations than for
+single character literals.
+
+                                                  *g:rust_keep_autopairs_default*
+g:rust_keep_autopairs_default ~
+
+	Don't override auto-pairs default for the Rust filetype. The default
+	is 0.
+ 
 
 ==============================================================================
-COMMANDS						       *rust-commands*
+COMMANDS                                                       *rust-commands*
+
+Invoking Cargo ~
+
+This plug defines very simple shortcuts for invoking Cargo from with Vim.
+
+:Cargo <args>                                                       *:Cargo*
+                Runs `cargo` with the provided arguments.
+
+:Cbuild <args>                                                     *:Cbuild*
+                Shortcut for `cargo build` .
+
+:Cclean <args>                                                     *:Cclean*
+                Shortcut for `cargo clean` .
+
+:Cdoc <args>                                                         *:Cdoc*
+                Shortcut for `cargo doc` .
+
+:Cinit <args>                                                       *:Cinit*
+                Shortcut for `cargo init` .
+
+:Crun <args>                                                         *:Crun*
+                Shortcut for `cargo run` .
+
+:Ctest <args>                                                       *:Ctest*
+                Shortcut for `cargo test` .
+
+:Cupdate <args>                                                   *:Cupdate*
+                Shortcut for `cargo update` .
+
+:Cbench <args>                                                     *:Cbench*
+                Shortcut for `cargo bench` .
+
+:Csearch <args>                                                   *:Csearch*
+                Shortcut for `cargo search` .
+
+:Cpublish <args>                                                 *:Cpublish*
+                Shortcut for `cargo publish` .
+
+:Cinstall <args>                                                 *:Cinstall*
+                Shortcut for `cargo install` .
+
+:Cruntarget <args>                                                 *:Cruntarget*
+                Shortcut for `cargo run --bin` or `cargo run --example`,
+                depending on the currently open buffer.
+
+Formatting ~
+
+:RustFmt                                                       *:RustFmt*
+		Runs |g:rustfmt_command| on the current buffer. If
+		|g:rustfmt_options| is set then those will be passed to the
+		executable.
+
+		If |g:rustfmt_fail_silently| is 0 (the default) then it
+		will populate the |location-list| with the errors from
+		|g:rustfmt_command|. If |g:rustfmt_fail_silently| is set to 1
+		then it will not populate the |location-list|.
 
-:RustRun  [args]						    *:RustRun*
+:RustFmtRange                                                  *:RustFmtRange*
+		Runs |g:rustfmt_command| with selected range. See
+		|:RustFmt| for any other information.
+
+
+Playpen integration ~
+
+:RustPlay                                                          *:RustPlay*
+		This command will only work if you have web-api.vim installed
+		(available at https://github.com/mattn/webapi-vim).  It sends the
+		current selection, or if nothing is selected, the entirety of the
+		current buffer to the Rust playpen, and emits a message with the
+		shortened URL to the playpen.
+
+		|g:rust_playpen_url| is the base URL to the playpen, by default
+		"https://play.rust-lang.org/".
+
+		|g:rust_shortener_url| is the base url for the shorterner, by
+		default "https://is.gd/"
+
+		|g:rust_clip_command| is the command to run to copy the
+		playpen url to the clipboard of your system.
+
+
+Evaluation of a single Rust file ~
+
+NOTE: These commands are useful only when working with standalone Rust files,
+which is usually not the case for common Rust development. If you wish to
+building Rust crates from with Vim can should use Vim's make, Syntastic, or
+functionality from other plugins.
+
+
+:RustRun  [args]                                                    *:RustRun*
 :RustRun! [rustc-args] [--] [args]
 		Compiles and runs the current file. If it has unsaved changes,
 		it will be saved first using |:update|. If the current file is
@@ -150,26 +387,26 @@ COMMANDS						       *rust-commands*
 		If |g:rustc_path| is defined, it is used as the path to rustc.
 		Otherwise it is assumed rustc can be found in $PATH.
 
-:RustExpand  [args]						 *:RustExpand*
+:RustExpand  [args]                                              *:RustExpand*
 :RustExpand! [TYPE] [args]
-		Expands the current file using --pretty and displays the
+		Expands the current file using `--pretty` and displays the
 		results in a new split. If the current file has unsaved
 		changes, it will be saved first using |:update|. If the
 		current file is an unnamed buffer, it will be written to a
 		temporary file first.
 
 		The arguments given to |:RustExpand| will be passed to rustc.
-		This is largely intended for specifying various --cfg
+		This is largely intended for specifying various `--cfg`
 		configurations.
 
 		If ! is specified, the first argument is the expansion type to
-		pass to rustc --pretty. Otherwise it will default to
+		pass to `rustc --pretty` . Otherwise it will default to
 		"expanded".
 
 		If |g:rustc_path| is defined, it is used as the path to rustc.
 		Otherwise it is assumed rustc can be found in $PATH.
 
-:RustEmitIr [args]						 *:RustEmitIr*
+:RustEmitIr [args]                                               *:RustEmitIr*
 		Compiles the current file to LLVM IR and displays the results
 		in a new split. If the current file has unsaved changes, it
 		will be saved first using |:update|. If the current file is an
@@ -180,7 +417,7 @@ COMMANDS						       *rust-commands*
 		If |g:rustc_path| is defined, it is used as the path to rustc.
 		Otherwise it is assumed rustc can be found in $PATH.
 
-:RustEmitAsm [args]						*:RustEmitAsm*
+:RustEmitAsm [args]                                             *:RustEmitAsm*
 		Compiles the current file to assembly and displays the results
 		in a new split. If the current file has unsaved changes, it
 		will be saved first using |:update|. If the current file is an
@@ -191,49 +428,52 @@ COMMANDS						       *rust-commands*
 		If |g:rustc_path| is defined, it is used as the path to rustc.
 		Otherwise it is assumed rustc can be found in $PATH.
 
-:RustPlay							   *:RustPlay*
-		This command will only work if you have web-api.vim installed
-		(available at https://github.com/mattn/webapi-vim).  It sends the
-		current selection, or if nothing is selected, the entirety of the
-		current buffer to the Rust playpen, and emits a message with the
-		shortened URL to the playpen.
 
-		|g:rust_playpen_url| is the base URL to the playpen, by default
-		"https://play.rust-lang.org/".
+Running test(s) ~
 
-		|g:rust_shortener_url| is the base URL for the shortener, by
-		default "https://is.gd/"
+:[N]RustTest[!] [options]                                       *:RustTest*
+		Runs a test under the cursor when the current buffer is in a
+		cargo project with "cargo test" command. If the command did
+		not find any test function under the cursor, it stops with an
+		error message.
 
-:RustFmt						       *:RustFmt*
-		Runs |g:rustfmt_command| on the current buffer. If
-		|g:rustfmt_options| is set then those will be passed to the
-		executable.
+		When N is given, adjust the size of the new window to N lines
+		or columns.
 
-		If |g:rustfmt_fail_silently| is 0 (the default) then it
-		will populate the |location-list| with the errors from
-		|g:rustfmt_command|. If |g:rustfmt_fail_silently| is set to 1
-		then it will not populate the |location-list|.
+		When ! is given, runs all tests regardless of current cursor
+		position.
 
-:RustFmtRange						       *:RustFmtRange*
-		Runs |g:rustfmt_command| with selected range. See
-		|:RustFmt| for any other information.
+		When [options] is given, it is passed to "cargo" command
+		arguments.
 
-==============================================================================
-MAPPINGS						       *rust-mappings*
+		When the current buffer is outside cargo project, the command
+		runs `rustc --test` command instead of "cargo test" as
+		fallback. All tests are run regardless of adding ! since there
+		is no way to run specific test function with rustc. [options]
+		is passed to `rustc` command arguments in the case.
 
-This plugin defines mappings for |[[| and |]]| to support hanging indents.
+		Takes optional modifiers (see |<mods>|):  >vim
+		    :tab RustTest
+		    :belowright 16RustTest
+		    :leftabove vert 80RustTest
+<
+rust.vim Debugging ~
 
-It also has a few other mappings:
+:RustInfo                                                          *:RustInfo*
+		Emits debugging info of the Vim Rust plugin.
 
-							*rust_<D-r>*
-<D-r>			Executes |:RustRun| with no arguments.
-			Note: This binding is only available in MacVim.
+:RustInfoToClipboard                                      *:RustInfoClipboard*
+		Saves debugging info of the Vim Rust plugin to the default
+		register.
 
-							*rust_<D-R>*
-<D-R>			Populates the command line with |:RustRun|! using the
-			arguments given to the last invocation, but does not
-			execute it.
-			Note: This binding is only available in MacVim.
+:RustInfoToFile [filename]                                   *:RustInfoToFile*
+		Saves debugging info of the Vim Rust plugin to the the given
+		file, overwritting it.
 
 ==============================================================================
- vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
+MAPPINGS                                                       *rust-mappings*
+
+This plugin defines mappings for |[[| and |]]| to support hanging indents.
+
+
+vim:tw=78:sw=4:noet:ts=8:ft=help:norl:
diff --git a/runtime/ftplugin/rust.vim b/runtime/ftplugin/rust.vim
index ececcced22..7f1a86ea95 100644
--- a/runtime/ftplugin/rust.vim
+++ b/runtime/ftplugin/rust.vim
@@ -1,20 +1,26 @@
 " Language:     Rust
 " Description:  Vim ftplugin for Rust
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
-" Maintainer:   Lily Ballard <lily@ballards.net>
-" Last Change:  June 08, 2016
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim 
+" Last Change:  2023-09-11
+" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 if exists("b:did_ftplugin")
-	finish
+    finish
 endif
 let b:did_ftplugin = 1
 
+" vint: -ProhibitAbbreviationOption
 let s:save_cpo = &cpo
 set cpo&vim
-
-augroup rust.vim
-autocmd!
+" vint: +ProhibitAbbreviationOption
+
+if get(b:, 'current_compiler', '') ==# ''
+    if strlen(findfile('Cargo.toml', '.;')) > 0
+        compiler cargo
+    else
+        compiler rustc
+    endif
+endif
 
 " Variables {{{1
 
@@ -22,13 +28,13 @@ autocmd!
 " comments, so we'll use that as our default, but make it easy to switch.
 " This does not affect indentation at all (I tested it with and without
 " leader), merely whether a leader is inserted by default or not.
-if exists("g:rust_bang_comment_leader") && g:rust_bang_comment_leader != 0
-	" Why is the `,s0:/*,mb:\ ,ex:*/` there, you ask? I don't understand why,
-	" but without it, */ gets indented one space even if there were no
-	" leaders. I'm fairly sure that's a Vim bug.
-	setlocal comments=s1:/*,mb:*,ex:*/,s0:/*,mb:\ ,ex:*/,:///,://!,://
+if get(g:, 'rust_bang_comment_leader', 0)
+    " Why is the `,s0:/*,mb:\ ,ex:*/` there, you ask? I don't understand why,
+    " but without it, */ gets indented one space even if there were no
+    " leaders. I'm fairly sure that's a Vim bug.
+    setlocal comments=s1:/*,mb:*,ex:*/,s0:/*,mb:\ ,ex:*/,:///,://!,://
 else
-	setlocal comments=s0:/*!,m:\ ,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,://
+    setlocal comments=s0:/*!,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,://
 endif
 setlocal commentstring=//%s
 setlocal formatoptions-=t formatoptions+=croqnl
@@ -39,13 +45,14 @@ silent! setlocal formatoptions+=j
 " otherwise it's better than nothing.
 setlocal smartindent nocindent
 
-if !exists("g:rust_recommended_style") || g:rust_recommended_style != 0
-	setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
-	setlocal textwidth=99
+if get(g:, 'rust_recommended_style', 1)
+    let b:rust_set_style = 1
+    setlocal shiftwidth=4 softtabstop=4 expandtab
+    setlocal textwidth=99
 endif
 
-" This includeexpr isn't perfect, but it's a good start
-setlocal includeexpr=substitute(v:fname,'::','/','g')
+setlocal include=\\v^\\s*(pub\\s+)?use\\s+\\zs(\\f\|:)+
+setlocal includeexpr=rust#IncludeExpr(v:fname)
 
 setlocal suffixesadd=.rs
 
@@ -54,51 +61,36 @@ if exists("g:ftplugin_rust_source_path")
 endif
 
 if exists("g:loaded_delimitMate")
-	if exists("b:delimitMate_excluded_regions")
-		let b:rust_original_delimitMate_excluded_regions = b:delimitMate_excluded_regions
-	endif
-
-	let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
-
-	" For this buffer, when delimitMate issues the `User delimitMate_map`
-	" event in the autocommand system, add the above-defined extra excluded
-	" regions to delimitMate's state, if they have not already been added.
-	autocmd User <buffer>
-		\ if expand('<afile>') ==# 'delimitMate_map' && match(
-		\     delimitMate#Get("excluded_regions"),
-		\     s:delimitMate_extra_excluded_regions) == -1
-		\|  let b:delimitMate_excluded_regions =
-		\       delimitMate#Get("excluded_regions")
-		\       . s:delimitMate_extra_excluded_regions
-		\|endif
-
-	" For this buffer, when delimitMate issues the `User delimitMate_unmap`
-	" event in the autocommand system, delete the above-defined extra excluded
-	" regions from delimitMate's state (the deletion being idempotent and
-	" having no effect if the extra excluded regions are not present in the
-	" targeted part of delimitMate's state).
-	autocmd User <buffer>
-		\ if expand('<afile>') ==# 'delimitMate_unmap'
-		\|  let b:delimitMate_excluded_regions = substitute(
-		\       delimitMate#Get("excluded_regions"),
-		\       '\C\V' . s:delimitMate_extra_excluded_regions,
-		\       '', 'g')
-		\|endif
+    if exists("b:delimitMate_excluded_regions")
+        let b:rust_original_delimitMate_excluded_regions = b:delimitMate_excluded_regions
+    endif
+
+    augroup rust.vim.DelimitMate
+        autocmd!
+
+        autocmd User delimitMate_map   :call rust#delimitmate#onMap()
+        autocmd User delimitMate_unmap :call rust#delimitmate#onUnmap()
+    augroup END
+endif
+
+" Integration with auto-pairs (https://github.com/jiangmiao/auto-pairs)
+if exists("g:AutoPairsLoaded") && !get(g:, 'rust_keep_autopairs_default', 0)
+    let b:AutoPairs = {'(':')', '[':']', '{':'}','"':'"', '`':'`'}
 endif
 
-if has("folding") && exists('g:rust_fold') && g:rust_fold != 0
-	let b:rust_set_foldmethod=1
-	setlocal foldmethod=syntax
-	if g:rust_fold == 2
-		setlocal foldlevel<
-	else
-		setlocal foldlevel=99
-	endif
+if has("folding") && get(g:, 'rust_fold', 0)
+    let b:rust_set_foldmethod=1
+    setlocal foldmethod=syntax
+    if g:rust_fold == 2
+        setlocal foldlevel<
+    else
+        setlocal foldlevel=99
+    endif
 endif
 
-if has('conceal') && exists('g:rust_conceal') && g:rust_conceal != 0
-	let b:rust_set_conceallevel=1
-	setlocal conceallevel=2
+if has('conceal') && get(g:, 'rust_conceal', 0)
+    let b:rust_set_conceallevel=1
+    setlocal conceallevel=2
 endif
 
 " Motion Commands {{{1
@@ -126,72 +118,122 @@ command! -nargs=* -buffer RustEmitIr call rust#Emit("llvm-ir", <q-args>)
 command! -nargs=* -buffer RustEmitAsm call rust#Emit("asm", <q-args>)
 
 " See |:RustPlay| for docs
-command! -range=% RustPlay :call rust#Play(<count>, <line1>, <line2>, <f-args>)
+command! -range=% -buffer RustPlay :call rust#Play(<count>, <line1>, <line2>, <f-args>)
 
 " See |:RustFmt| for docs
-command! -buffer RustFmt call rustfmt#Format()
+command! -bar -buffer RustFmt call rustfmt#Format()
 
 " See |:RustFmtRange| for docs
 command! -range -buffer RustFmtRange call rustfmt#FormatRange(<line1>, <line2>)
 
-" Mappings {{{1
+" See |:RustInfo| for docs
+command! -bar -buffer RustInfo call rust#debugging#Info()
+
+" See |:RustInfoToClipboard| for docs
+command! -bar -buffer RustInfoToClipboard call rust#debugging#InfoToClipboard()
+
+" See |:RustInfoToFile| for docs
+command! -bar -nargs=1 -buffer RustInfoToFile call rust#debugging#InfoToFile(<f-args>)
 
-" Bind ⌘R in MacVim to :RustRun
-nnoremap <silent> <buffer> <D-r> :RustRun<CR>
-" Bind ⌘⇧R in MacVim to :RustRun! pre-filled with the last args
-nnoremap <buffer> <D-R> :RustRun! <C-r>=join(b:rust_last_rustc_args)<CR><C-\>erust#AppendCmdLine(' -- ' . join(b:rust_last_args))<CR>
+" See |:RustTest| for docs
+command! -buffer -nargs=* -count -bang RustTest call rust#Test(<q-mods>, <count>, <bang>0, <q-args>)
 
 if !exists("b:rust_last_rustc_args") || !exists("b:rust_last_args")
-	let b:rust_last_rustc_args = []
-	let b:rust_last_args = []
+    let b:rust_last_rustc_args = []
+    let b:rust_last_args = []
 endif
 
 " Cleanup {{{1
 
 let b:undo_ftplugin = "
-		\ setlocal formatoptions< comments< commentstring< includeexpr< suffixesadd<
-		\|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
-		\|if exists('b:rust_original_delimitMate_excluded_regions')
-		  \|let b:delimitMate_excluded_regions = b:rust_original_delimitMate_excluded_regions
-		  \|unlet b:rust_original_delimitMate_excluded_regions
-		\|else
-		  \|unlet! b:delimitMate_excluded_regions
-		\|endif
-		\|if exists('b:rust_set_foldmethod')
-		  \|setlocal foldmethod< foldlevel<
-		  \|unlet b:rust_set_foldmethod
-		\|endif
-		\|if exists('b:rust_set_conceallevel')
-		  \|setlocal conceallevel<
-		  \|unlet b:rust_set_conceallevel
-		\|endif
-		\|unlet! b:rust_last_rustc_args b:rust_last_args
-		\|delcommand RustRun
-		\|delcommand RustExpand
-		\|delcommand RustEmitIr
-		\|delcommand RustEmitAsm
-		\|delcommand RustPlay
-		\|nunmap <buffer> <D-r>
-		\|nunmap <buffer> <D-R>
-		\|nunmap <buffer> [[
-		\|nunmap <buffer> ]]
-		\|xunmap <buffer> [[
-		\|xunmap <buffer> ]]
-		\|ounmap <buffer> [[
-		\|ounmap <buffer> ]]
-		\|set matchpairs-=<:>
-		\"
+            \ setlocal formatoptions< comments< commentstring< include< includeexpr< suffixesadd<
+            \|if exists('b:rust_set_style')
+                \|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
+                \|endif
+                \|if exists('b:rust_original_delimitMate_excluded_regions')
+                    \|let b:delimitMate_excluded_regions = b:rust_original_delimitMate_excluded_regions
+                    \|unlet b:rust_original_delimitMate_excluded_regions
+                    \|else
+                        \|unlet! b:delimitMate_excluded_regions
+                        \|endif
+                        \|if exists('b:rust_set_foldmethod')
+                            \|setlocal foldmethod< foldlevel<
+                            \|unlet b:rust_set_foldmethod
+                            \|endif
+                            \|if exists('b:rust_set_conceallevel')
+                                \|setlocal conceallevel<
+                                \|unlet b:rust_set_conceallevel
+                                \|endif
+                                \|unlet! b:rust_last_rustc_args b:rust_last_args
+                                \|delcommand -buffer RustRun
+                                \|delcommand -buffer RustExpand
+                                \|delcommand -buffer RustEmitIr
+                                \|delcommand -buffer RustEmitAsm
+                                \|delcommand -buffer RustPlay
+                                \|delcommand -buffer RustFmt
+                                \|delcommand -buffer RustFmtRange
+                                \|delcommand -buffer RustInfo
+                                \|delcommand -buffer RustInfoToClipboard
+                                \|delcommand -buffer RustInfoToFile
+                                \|delcommand -buffer RustTest
+                                \|nunmap <buffer> [[
+                                \|nunmap <buffer> ]]
+                                \|xunmap <buffer> [[
+                                \|xunmap <buffer> ]]
+                                \|ounmap <buffer> [[
+                                \|ounmap <buffer> ]]
+                                \|setlocal matchpairs-=<:>
+                                \|unlet b:match_skip
+                                \"
 
 " }}}1
 
 " Code formatting on save
-if get(g:, "rustfmt_autosave", 0)
-	autocmd BufWritePre *.rs silent! call rustfmt#Format()
-endif
-
+augroup rust.vim.PreWrite
+    autocmd!
+    autocmd BufWritePre *.rs silent! call rustfmt#PreWrite()
 augroup END
 
+setlocal matchpairs+=<:>
+" For matchit.vim (rustArrow stops `Fn() -> X` messing things up)
+let b:match_skip = 's:comment\|string\|rustCharacter\|rustArrow'
+
+command! -buffer -nargs=+ Cargo call cargo#cmd(<q-args>)
+command! -buffer -nargs=* Cbuild call cargo#build(<q-args>)
+command! -buffer -nargs=* Ccheck call cargo#check(<q-args>)
+command! -buffer -nargs=* Cclean call cargo#clean(<q-args>)
+command! -buffer -nargs=* Cdoc call cargo#doc(<q-args>)
+command! -buffer -nargs=+ Cnew call cargo#new(<q-args>)
+command! -buffer -nargs=* Cinit call cargo#init(<q-args>)
+command! -buffer -nargs=* Crun call cargo#run(<q-args>)
+command! -buffer -nargs=* Ctest call cargo#test(<q-args>)
+command! -buffer -nargs=* Cbench call cargo#bench(<q-args>)
+command! -buffer -nargs=* Cupdate call cargo#update(<q-args>)
+command! -buffer -nargs=* Csearch  call cargo#search(<q-args>)
+command! -buffer -nargs=* Cpublish call cargo#publish(<q-args>)
+command! -buffer -nargs=* Cinstall call cargo#install(<q-args>)
+command! -buffer -nargs=* Cruntarget call cargo#runtarget(<q-args>)
+
+let b:undo_ftplugin .= '
+            \|delcommand -buffer Cargo
+            \|delcommand -buffer Cbuild
+            \|delcommand -buffer Ccheck
+            \|delcommand -buffer Cclean
+            \|delcommand -buffer Cdoc
+            \|delcommand -buffer Cnew
+            \|delcommand -buffer Cinit
+            \|delcommand -buffer Crun
+            \|delcommand -buffer Ctest
+            \|delcommand -buffer Cbench
+            \|delcommand -buffer Cupdate
+            \|delcommand -buffer Csearch
+            \|delcommand -buffer Cpublish
+            \|delcommand -buffer Cinstall
+            \|delcommand -buffer Cruntarget'
+
+" vint: -ProhibitAbbreviationOption
 let &cpo = s:save_cpo
 unlet s:save_cpo
+" vint: +ProhibitAbbreviationOption
 
-" vim: set noet sw=8 ts=8:
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/indent/rust.vim b/runtime/indent/rust.vim
index b27d93c3a2..7c055ec739 100644
--- a/runtime/indent/rust.vim
+++ b/runtime/indent/rust.vim
@@ -1,27 +1,26 @@
 " Vim indent file
 " Language:         Rust
 " Author:           Chris Morgan <me@chrismorgan.info>
-" Last Change:      2017 Jun 13
-"                   2023 Aug 28 by Vim Project (undo_indent)
+" Last Change:      2023-09-11
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
-	finish
+    finish
 endif
 let b:did_indent = 1
 
 setlocal cindent
-setlocal cinoptions=L0,(0,Ws,J1,j1
-setlocal cinkeys=0{,0},!^F,o,O,0[,0]
+setlocal cinoptions=L0,(s,Ws,J1,j1,m1
+setlocal cinkeys=0{,0},!^F,o,O,0[,0],0(,0)
 " Don't think cinwords will actually do anything at all... never mind
-setlocal cinwords=for,if,else,while,loop,impl,mod,unsafe,trait,struct,enum,fn,extern
+setlocal cinwords=for,if,else,while,loop,impl,mod,unsafe,trait,struct,enum,fn,extern,macro
 
 " Some preliminary settings
 setlocal nolisp		" Make sure lisp indenting doesn't supersede us
 setlocal autoindent	" indentexpr isn't much help otherwise
 " Also do indentkeys, otherwise # gets shoved to column 0 :-/
-setlocal indentkeys=0{,0},!^F,o,O,0[,0]
+setlocal indentkeys=0{,0},!^F,o,O,0[,0],0(,0)
 
 setlocal indentexpr=GetRustIndent(v:lnum)
 
@@ -29,204 +28,259 @@ let b:undo_indent = "setlocal cindent< cinoptions< cinkeys< cinwords< lisp< auto
 
 " Only define the function once.
 if exists("*GetRustIndent")
-	finish
+    finish
 endif
 
+" vint: -ProhibitAbbreviationOption
 let s:save_cpo = &cpo
 set cpo&vim
+" vint: +ProhibitAbbreviationOption
 
 " Come here when loading the script the first time.
 
 function! s:get_line_trimmed(lnum)
-	" Get the line and remove a trailing comment.
-	" Use syntax highlighting attributes when possible.
-	" NOTE: this is not accurate; /* */ or a line continuation could trick it
-	let line = getline(a:lnum)
-	let line_len = strlen(line)
-	if has('syntax_items')
-		" If the last character in the line is a comment, do a binary search for
-		" the start of the comment.  synID() is slow, a linear search would take
-		" too long on a long line.
-		if synIDattr(synID(a:lnum, line_len, 1), "name") =~ 'Comment\|Todo'
-			let min = 1
-			let max = line_len
-			while min < max
-				let col = (min + max) / 2
-				if synIDattr(synID(a:lnum, col, 1), "name") =~ 'Comment\|Todo'
-					let max = col
-				else
-					let min = col + 1
-				endif
-			endwhile
-			let line = strpart(line, 0, min - 1)
-		endif
-		return substitute(line, "\s*$", "", "")
-	else
-		" Sorry, this is not complete, nor fully correct (e.g. string "//").
-		" Such is life.
-		return substitute(line, "\s*//.*$", "", "")
-	endif
+    " Get the line and remove a trailing comment.
+    " Use syntax highlighting attributes when possible.
+    " NOTE: this is not accurate; /* */ or a line continuation could trick it
+    let line = getline(a:lnum)
+    let line_len = strlen(line)
+    if has('syntax_items')
+        " If the last character in the line is a comment, do a binary search for
+        " the start of the comment.  synID() is slow, a linear search would take
+        " too long on a long line.
+        if synIDattr(synID(a:lnum, line_len, 1), "name") =~? 'Comment\|Todo'
+            let min = 1
+            let max = line_len
+            while min < max
+                let col = (min + max) / 2
+                if synIDattr(synID(a:lnum, col, 1), "name") =~? 'Comment\|Todo'
+                    let max = col
+                else
+                    let min = col + 1
+                endif
+            endwhile
+            let line = strpart(line, 0, min - 1)
+        endif
+        return substitute(line, "\s*$", "", "")
+    else
+        " Sorry, this is not complete, nor fully correct (e.g. string "//").
+        " Such is life.
+        return substitute(line, "\s*//.*$", "", "")
+    endif
 endfunction
 
 function! s:is_string_comment(lnum, col)
-	if has('syntax_items')
-		for id in synstack(a:lnum, a:col)
-			let synname = synIDattr(id, "name")
-			if synname == "rustString" || synname =~ "^rustComment"
-				return 1
-			endif
-		endfor
-	else
-		" without syntax, let's not even try
-		return 0
-	endif
+    if has('syntax_items')
+        for id in synstack(a:lnum, a:col)
+            let synname = synIDattr(id, "name")
+            if synname ==# "rustString" || synname =~# "^rustComment"
+                return 1
+            endif
+        endfor
+    else
+        " without syntax, let's not even try
+        return 0
+    endif
 endfunction
 
+if exists('*shiftwidth')
+    function! s:shiftwidth()
+        return shiftwidth()
+    endfunc
+else
+    function! s:shiftwidth()
+        return &shiftwidth
+    endfunc
+endif
+
 function GetRustIndent(lnum)
+    " Starting assumption: cindent (called at the end) will do it right
+    " normally. We just want to fix up a few cases.
+
+    let line = getline(a:lnum)
+
+    if has('syntax_items')
+        let synname = synIDattr(synID(a:lnum, 1, 1), "name")
+        if synname ==# "rustString"
+            " If the start of the line is in a string, don't change the indent
+            return -1
+        elseif synname =~? '\(Comment\|Todo\)'
+                    \ && line !~# '^\s*/\*'  " not /* opening line
+            if synname =~? "CommentML" " multi-line
+                if line !~# '^\s*\*' && getline(a:lnum - 1) =~# '^\s*/\*'
+                    " This is (hopefully) the line after a /*, and it has no
+                    " leader, so the correct indentation is that of the
+                    " previous line.
+                    return GetRustIndent(a:lnum - 1)
+                endif
+            endif
+            " If it's in a comment, let cindent take care of it now. This is
+            " for cases like "/*" where the next line should start " * ", not
+            " "* " as the code below would otherwise cause for module scope
+            " Fun fact: "  /*\n*\n*/" takes two calls to get right!
+            return cindent(a:lnum)
+        endif
+    endif
+
+    " cindent gets second and subsequent match patterns/struct members wrong,
+    " as it treats the comma as indicating an unfinished statement::
+    "
+    " match a {
+    "     b => c,
+    "         d => e,
+    "         f => g,
+    " };
+
+    " Search backwards for the previous non-empty line.
+    let prevlinenum = prevnonblank(a:lnum - 1)
+    let prevline = s:get_line_trimmed(prevlinenum)
+    while prevlinenum > 1 && prevline !~# '[^[:blank:]]'
+        let prevlinenum = prevnonblank(prevlinenum - 1)
+        let prevline = s:get_line_trimmed(prevlinenum)
+    endwhile
+
+    " A standalone '{', '}', or 'where'
+    let l:standalone_open = line =~# '\V\^\s\*{\s\*\$'
+    let l:standalone_close = line =~# '\V\^\s\*}\s\*\$'
+    let l:standalone_where = line =~# '\V\^\s\*where\s\*\$'
+    if l:standalone_open || l:standalone_close || l:standalone_where
+        " ToDo: we can search for more items than 'fn' and 'if'.
+        let [l:found_line, l:col, l:submatch] =
+                    \ searchpos('\<\(fn\)\|\(if\)\>', 'bnWp')
+        if l:found_line !=# 0
+            " Now we count the number of '{' and '}' in between the match
+            " locations and the current line (there is probably a better
+            " way to compute this).
+            let l:i = l:found_line
+            let l:search_line = strpart(getline(l:i), l:col - 1)
+            let l:opens = 0
+            let l:closes = 0
+            while l:i < a:lnum
+                let l:search_line2 = substitute(l:search_line, '\V{', '', 'g')
+                let l:opens += strlen(l:search_line) - strlen(l:search_line2)
+                let l:search_line3 = substitute(l:search_line2, '\V}', '', 'g')
+                let l:closes += strlen(l:search_line2) - strlen(l:search_line3)
+                let l:i += 1
+                let l:search_line = getline(l:i)
+            endwhile
+            if l:standalone_open || l:standalone_where
+                if l:opens ==# l:closes
+                    return indent(l:found_line)
+                endif
+            else
+                " Expect to find just one more close than an open
+                if l:opens ==# l:closes + 1
+                    return indent(l:found_line)
+                endif
+            endif
+        endif
+    endif
+
+    " A standalone 'where' adds a shift.
+    let l:standalone_prevline_where = prevline =~# '\V\^\s\*where\s\*\$'
+    if l:standalone_prevline_where
+        return indent(prevlinenum) + 4
+    endif
+
+    " Handle where clauses nicely: subsequent values should line up nicely.
+    if prevline[len(prevline) - 1] ==# ","
+                \ && prevline =~# '^\s*where\s'
+        return indent(prevlinenum) + 6
+    endif
 
-	" Starting assumption: cindent (called at the end) will do it right
-	" normally. We just want to fix up a few cases.
-
-	let line = getline(a:lnum)
-
-	if has('syntax_items')
-		let synname = synIDattr(synID(a:lnum, 1, 1), "name")
-		if synname == "rustString"
-			" If the start of the line is in a string, don't change the indent
-			return -1
-		elseif synname =~ '\(Comment\|Todo\)'
-					\ && line !~ '^\s*/\*'  " not /* opening line
-			if synname =~ "CommentML" " multi-line
-				if line !~ '^\s*\*' && getline(a:lnum - 1) =~ '^\s*/\*'
-					" This is (hopefully) the line after a /*, and it has no
-					" leader, so the correct indentation is that of the
-					" previous line.
-					return GetRustIndent(a:lnum - 1)
-				endif
-			endif
-			" If it's in a comment, let cindent take care of it now. This is
-			" for cases like "/*" where the next line should start " * ", not
-			" "* " as the code below would otherwise cause for module scope
-			" Fun fact: "  /*\n*\n*/" takes two calls to get right!
-			return cindent(a:lnum)
-		endif
-	endif
-
-	" cindent gets second and subsequent match patterns/struct members wrong,
-	" as it treats the comma as indicating an unfinished statement::
-	"
-	" match a {
-	"     b => c,
-	"         d => e,
-	"         f => g,
-	" };
-
-	" Search backwards for the previous non-empty line.
-	let prevlinenum = prevnonblank(a:lnum - 1)
-	let prevline = s:get_line_trimmed(prevlinenum)
-	while prevlinenum > 1 && prevline !~ '[^[:blank:]]'
-		let prevlinenum = prevnonblank(prevlinenum - 1)
-		let prevline = s:get_line_trimmed(prevlinenum)
-	endwhile
-
-	" Handle where clauses nicely: subsequent values should line up nicely.
-	if prevline[len(prevline) - 1] == ","
-				\ && prevline =~# '^\s*where\s'
-		return indent(prevlinenum) + 6
-	endif
-
-	"match newline after struct with generic bound like
-	"struct SomeThing<T>
-	"| <-- newline indent should same as prevline
-	if prevline[len(prevline) - 1] == ">"
-				\ && prevline =~# "\s*struct.*>$"
-		return indent(prevlinenum)
-	endif
-
-	"match newline after where like:
-	"struct SomeThing<T>
-	"where
-	"     T: Display,
-	if prevline =~# '^\s*where$'
-		return indent(prevlinenum) + 4
-	endif
-
-	if prevline[len(prevline) - 1] == ","
-				\ && s:get_line_trimmed(a:lnum) !~ '^\s*[\[\]{}]'
-				\ && prevline !~ '^\s*fn\s'
-				\ && prevline !~ '([^()]\+,$'
-				\ && s:get_line_trimmed(a:lnum) !~ '^\s*\S\+\s*=>'
-		" Oh ho! The previous line ended in a comma! I bet cindent will try to
-		" take this too far... For now, let's normally use the previous line's
-		" indent.
-
-		" One case where this doesn't work out is where *this* line contains
-		" square or curly brackets; then we normally *do* want to be indenting
-		" further.
-		"
-		" Another case where we don't want to is one like a function
-		" definition with arguments spread over multiple lines:
-		"
-		" fn foo(baz: Baz,
-		"        baz: Baz) // <-- cindent gets this right by itself
-		"
-		" Another case is similar to the previous, except calling a function
-		" instead of defining it, or any conditional expression that leaves
-		" an open paren:
-		"
-		" foo(baz,
-		"     baz);
-		"
-		" if baz && (foo ||
-		"            bar) {
-		"
-		" Another case is when the current line is a new match arm.
-		"
-		" There are probably other cases where we don't want to do this as
-		" well. Add them as needed.
-		return indent(prevlinenum)
-	endif
-
-	if !has("patch-7.4.355")
-		" cindent before 7.4.355 doesn't do the module scope well at all; e.g.::
-		"
-		" static FOO : &'static [bool] = [
-		" true,
-		"	 false,
-		"	 false,
-		"	 true,
-		"	 ];
-		"
-		"	 uh oh, next statement is indented further!
-
-		" Note that this does *not* apply the line continuation pattern properly;
-		" that's too hard to do correctly for my liking at present, so I'll just
-		" start with these two main cases (square brackets and not returning to
-		" column zero)
-
-		call cursor(a:lnum, 1)
-		if searchpair('{\|(', '', '}\|)', 'nbW',
-					\ 's:is_string_comment(line("."), col("."))') == 0
-			if searchpair('\[', '', '\]', 'nbW',
-						\ 's:is_string_comment(line("."), col("."))') == 0
-				" Global scope, should be zero
-				return 0
-			else
-				" At the module scope, inside square brackets only
-				"if getline(a:lnum)[0] == ']' || search('\[', '', '\]', 'nW') == a:lnum
-				if line =~ "^\\s*]"
-					" It's the closing line, dedent it
-					return 0
-				else
-					return shiftwidth()
-				endif
-			endif
-		endif
-	endif
-
-	" Fall back on cindent, which does it mostly right
-	return cindent(a:lnum)
+    let l:last_prevline_character = prevline[len(prevline) - 1]
+
+    " A line that ends with '.<expr>;' is probably an end of a long list
+    " of method operations.
+    if prevline =~# '\V\^\s\*.' && l:last_prevline_character ==# ';'
+        call cursor(a:lnum - 1, 1)
+        let l:scope_start = searchpair('{\|(', '', '}\|)', 'nbW',
+                    \ 's:is_string_comment(line("."), col("."))')
+        if l:scope_start != 0 && l:scope_start < a:lnum
+            return indent(l:scope_start) + 4
+        endif
+    endif
+
+    if l:last_prevline_character ==# ","
+                \ && s:get_line_trimmed(a:lnum) !~# '^\s*[\[\]{})]'
+                \ && prevline !~# '^\s*fn\s'
+                \ && prevline !~# '([^()]\+,$'
+                \ && s:get_line_trimmed(a:lnum) !~# '^\s*\S\+\s*=>'
+        " Oh ho! The previous line ended in a comma! I bet cindent will try to
+        " take this too far... For now, let's normally use the previous line's
+        " indent.
+
+        " One case where this doesn't work out is where *this* line contains
+        " square or curly brackets; then we normally *do* want to be indenting
+        " further.
+        "
+        " Another case where we don't want to is one like a function
+        " definition with arguments spread over multiple lines:
+        "
+        " fn foo(baz: Baz,
+        "        baz: Baz) // <-- cindent gets this right by itself
+        "
+        " Another case is similar to the previous, except calling a function
+        " instead of defining it, or any conditional expression that leaves
+        " an open paren:
+        "
+        " foo(baz,
+        "     baz);
+        "
+        " if baz && (foo ||
+        "            bar) {
+        "
+        " Another case is when the current line is a new match arm.
+        "
+        " There are probably other cases where we don't want to do this as
+        " well. Add them as needed.
+        return indent(prevlinenum)
+    endif
+
+    if !has("patch-7.4.355")
+        " cindent before 7.4.355 doesn't do the module scope well at all; e.g.::
+        "
+        " static FOO : &'static [bool] = [
+        " true,
+        "	 false,
+        "	 false,
+        "	 true,
+        "	 ];
+        "
+        "	 uh oh, next statement is indented further!
+
+        " Note that this does *not* apply the line continuation pattern properly;
+        " that's too hard to do correctly for my liking at present, so I'll just
+        " start with these two main cases (square brackets and not returning to
+        " column zero)
+
+        call cursor(a:lnum, 1)
+        if searchpair('{\|(', '', '}\|)', 'nbW',
+                    \ 's:is_string_comment(line("."), col("."))') == 0
+            if searchpair('\[', '', '\]', 'nbW',
+                        \ 's:is_string_comment(line("."), col("."))') == 0
+                " Global scope, should be zero
+                return 0
+            else
+                " At the module scope, inside square brackets only
+                "if getline(a:lnum)[0] == ']' || search('\[', '', '\]', 'nW') == a:lnum
+                if line =~# "^\\s*]"
+                    " It's the closing line, dedent it
+                    return 0
+                else
+                    return &shiftwidth
+                endif
+            endif
+        endif
+    endif
+
+    " Fall back on cindent, which does it mostly right
+    return cindent(a:lnum)
 endfunction
 
+" vint: -ProhibitAbbreviationOption
 let &cpo = s:save_cpo
 unlet s:save_cpo
+" vint: +ProhibitAbbreviationOption
+
+" vim: set et sw=4 sts=4 ts=8:
diff --git a/runtime/syntax/rust.vim b/runtime/syntax/rust.vim
index 57343301e0..55d3f14dc2 100644
--- a/runtime/syntax/rust.vim
+++ b/runtime/syntax/rust.vim
@@ -3,44 +3,57 @@
 " Maintainer:   Patrick Walton <pcwalton@mozilla.com>
 " Maintainer:   Ben Blum <bblum@cs.cmu.edu>
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
-" Last Change:  Feb 24, 2016
+" Last Change:  2023-09-11
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 if version < 600
-	syntax clear
+    syntax clear
 elseif exists("b:current_syntax")
-	finish
+    finish
 endif
 
 " Syntax definitions {{{1
 " Basic keywords {{{2
 syn keyword   rustConditional match if else
-syn keyword   rustRepeat for loop while
+syn keyword   rustRepeat loop while
+" `:syn match` must be used to prioritize highlighting `for` keyword.
+syn match     rustRepeat /\<for\>/
+" Highlight `for` keyword in `impl ... for ... {}` statement. This line must
+" be put after previous `syn match` line to overwrite it.
+syn match     rustKeyword /\%(\<impl\>.\+\)\@<=\<for\>/
+syn keyword   rustRepeat in
 syn keyword   rustTypedef type nextgroup=rustIdentifier skipwhite skipempty
 syn keyword   rustStructure struct enum nextgroup=rustIdentifier skipwhite skipempty
 syn keyword   rustUnion union nextgroup=rustIdentifier skipwhite skipempty contained
 syn match rustUnionContextual /\<union\_s\+\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*/ transparent contains=rustUnion
 syn keyword   rustOperator    as
+syn keyword   rustExistential existential nextgroup=rustTypedef skipwhite skipempty contained
+syn match rustExistentialContextual /\<existential\_s\+type/ transparent contains=rustExistential,rustTypedef
 
 syn match     rustAssert      "\<assert\(\w\)*!" contained
 syn match     rustPanic       "\<panic\(\w\)*!" contained
+syn match     rustAsync       "\<async\%(\s\|\n\)\@="
 syn keyword   rustKeyword     break
-syn keyword   rustKeyword     box nextgroup=rustBoxPlacement skipwhite skipempty
+syn keyword   rustKeyword     box
 syn keyword   rustKeyword     continue
+syn keyword   rustKeyword     crate
 syn keyword   rustKeyword     extern nextgroup=rustExternCrate,rustObsoleteExternMod skipwhite skipempty
 syn keyword   rustKeyword     fn nextgroup=rustFuncName skipwhite skipempty
-syn keyword   rustKeyword     in impl let
+syn keyword   rustKeyword     impl let
+syn keyword   rustKeyword     macro
 syn keyword   rustKeyword     pub nextgroup=rustPubScope skipwhite skipempty
 syn keyword   rustKeyword     return
+syn keyword   rustKeyword     yield
 syn keyword   rustSuper       super
-syn keyword   rustKeyword     unsafe where
+syn keyword   rustKeyword     where
+syn keyword   rustUnsafeKeyword unsafe
 syn keyword   rustKeyword     use nextgroup=rustModPath skipwhite skipempty
 " FIXME: Scoped impl's name is also fallen in this category
 syn keyword   rustKeyword     mod trait nextgroup=rustIdentifier skipwhite skipempty
 syn keyword   rustStorage     move mut ref static const
-syn match rustDefault /\<default\ze\_s\+\(impl\|fn\|type\|const\)\>/
-
-syn keyword   rustInvalidBareKeyword crate
+syn match     rustDefault     /\<default\ze\_s\+\(impl\|fn\|type\|const\)\>/
+syn keyword   rustAwait       await
+syn match     rustKeyword     /\<try\>!\@!/ display
 
 syn keyword rustPubScopeCrate crate contained
 syn match rustPubScopeDelim /[()]/ contained
@@ -52,22 +65,14 @@ syn match   rustExternCrateString /".*"\_s*as/ contained nextgroup=rustIdentifie
 syn keyword   rustObsoleteExternMod mod contained nextgroup=rustIdentifier skipwhite skipempty
 
 syn match     rustIdentifier  contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
-syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
-
-syn region    rustBoxPlacement matchgroup=rustBoxPlacementParens start="(" end=")" contains=TOP contained
-" Ideally we'd have syntax rules set up to match arbitrary expressions. Since
-" we don't, we'll just define temporary contained rules to handle balancing
-" delimiters.
-syn region    rustBoxPlacementBalance start="(" end=")" containedin=rustBoxPlacement transparent
-syn region    rustBoxPlacementBalance start="\[" end="\]" containedin=rustBoxPlacement transparent
-" {} are handled by rustFoldBraces
-
-syn region rustMacroRepeat matchgroup=rustMacroRepeatDelimiters start="$(" end=")" contains=TOP nextgroup=rustMacroRepeatCount
-syn match rustMacroRepeatCount ".\?[*+]" contained
+syn match     rustFuncName    "\%(r#\)\=\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
+
+syn region rustMacroRepeat matchgroup=rustMacroRepeatDelimiters start="$(" end="),\=[*+]" contains=TOP
 syn match rustMacroVariable "$\w\+"
+syn match rustRawIdent "\<r#\h\w*" contains=NONE
 
 " Reserved (but not yet used) keywords {{{2
-syn keyword   rustReservedKeyword alignof become do offsetof priv pure sizeof typeof unsized yield abstract virtual final override macro
+syn keyword   rustReservedKeyword become do priv typeof unsized abstract virtual final override
 
 " Built-in types {{{2
 syn keyword   rustType        isize usize char bool u8 u16 u32 u64 u128 f32
@@ -138,18 +143,37 @@ syn match     rustMacro       '#\w\(\w\)*' contains=rustAssert,rustPanic
 
 syn match     rustEscapeError   display contained /\\./
 syn match     rustEscape        display contained /\\\([nrt0\\'"]\|x\x\{2}\)/
-syn match     rustEscapeUnicode display contained /\\u{\x\{1,6}}/
+syn match     rustEscapeUnicode display contained /\\u{\%(\x_*\)\{1,6}}/
 syn match     rustStringContinuation display contained /\\\n\s*/
-syn region    rustString      start=+b"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeError,rustStringContinuation
-syn region    rustString      start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustStringContinuation,@Spell
-syn region    rustString      start='b\?r\z(#*\)"' end='"\z1' contains=@Spell
-
-syn region    rustAttribute   start="#!\?\[" end="\]" contains=rustString,rustDerive,rustCommentLine,rustCommentBlock,rustCommentLineDocError,rustCommentBlockDocError
+syn region    rustString      matchgroup=rustStringDelimiter start=+b"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeError,rustStringContinuation
+syn region    rustString      matchgroup=rustStringDelimiter start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustStringContinuation,@Spell
+syn region    rustString      matchgroup=rustStringDelimiter start='b\?r\z(#*\)"' end='"\z1' contains=@Spell
+
+" Match attributes with either arbitrary syntax or special highlighting for
+" derives. We still highlight strings and comments inside of the attribute.
+syn region    rustAttribute   start="#!\?\[" end="\]" contains=@rustAttributeContents,rustAttributeParenthesizedParens,rustAttributeParenthesizedCurly,rustAttributeParenthesizedBrackets,rustDerive
+syn region    rustAttributeParenthesizedParens matchgroup=rustAttribute start="\w\%(\w\)*("rs=e end=")"re=s transparent contained contains=rustAttributeBalancedParens,@rustAttributeContents
+syn region    rustAttributeParenthesizedCurly matchgroup=rustAttribute start="\w\%(\w\)*{"rs=e end="}"re=s transparent contained contains=rustAttributeBalancedCurly,@rustAttributeContents
+syn region    rustAttributeParenthesizedBrackets matchgroup=rustAttribute start="\w\%(\w\)*\["rs=e end="\]"re=s transparent contained contains=rustAttributeBalancedBrackets,@rustAttributeContents
+syn region    rustAttributeBalancedParens matchgroup=rustAttribute start="("rs=e end=")"re=s transparent contained contains=rustAttributeBalancedParens,@rustAttributeContents
+syn region    rustAttributeBalancedCurly matchgroup=rustAttribute start="{"rs=e end="}"re=s transparent contained contains=rustAttributeBalancedCurly,@rustAttributeContents
+syn region    rustAttributeBalancedBrackets matchgroup=rustAttribute start="\["rs=e end="\]"re=s transparent contained contains=rustAttributeBalancedBrackets,@rustAttributeContents
+syn cluster   rustAttributeContents contains=rustString,rustCommentLine,rustCommentBlock,rustCommentLineDocError,rustCommentBlockDocError
 syn region    rustDerive      start="derive(" end=")" contained contains=rustDeriveTrait
 " This list comes from src/libsyntax/ext/deriving/mod.rs
 " Some are deprecated (Encodable, Decodable) or to be removed after a new snapshot (Show).
 syn keyword   rustDeriveTrait contained Clone Hash RustcEncodable RustcDecodable Encodable Decodable PartialEq Eq PartialOrd Ord Rand Show Debug Default FromPrimitive Send Sync Copy
 
+" dyn keyword: It's only a keyword when used inside a type expression, so
+" we make effort here to highlight it only when Rust identifiers follow it
+" (not minding the case of pre-2018 Rust where a path starting with :: can
+" follow).
+"
+" This is so that uses of dyn variable names such as in 'let &dyn = &2'
+" and 'let dyn = 2' will not get highlighted as a keyword.
+syn match     rustKeyword "\<dyn\ze\_s\+\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)" contains=rustDynKeyword
+syn keyword   rustDynKeyword  dyn contained
+
 " Number literals
 syn match     rustDecNumber   display "\<[0-9][0-9_]*\%([iu]\%(size\|8\|16\|32\|64\|128\)\)\="
 syn match     rustHexNumber   display "\<0x[a-fA-F0-9_]\+\%([iu]\%(size\|8\|16\|32\|64\|128\)\)\="
@@ -168,29 +192,31 @@ syn match     rustFloat       display "\<[0-9][0-9_]*\%(\.[0-9][0-9_]*\)\=\%([eE
 syn match     rustFloat       display "\<[0-9][0-9_]*\%(\.[0-9][0-9_]*\)\=\%([eE][+-]\=[0-9_]\+\)\=\(f32\|f64\)"
 
 " For the benefit of delimitMate
-syn region rustLifetimeCandidate display start=/&'\%(\([^'\\]\|\\\(['nrt0\\\"]\|x\x\{2}\|u{\x\{1,6}}\)\)'\)\@!/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustSigil,rustLifetime
-syn region rustGenericRegion display start=/<\%('\|[^[cntrl:][:space:][:punct:]]\)\@=')\S\@=/ end=/>/ contains=rustGenericLifetimeCandidate
+syn region rustLifetimeCandidate display start=/&'\%(\([^'\\]\|\\\(['nrt0\\\"]\|x\x\{2}\|u{\%(\x_*\)\{1,6}}\)\)'\)\@!/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustSigil,rustLifetime
+syn region rustGenericRegion display start=/<\%('\|[^[:cntrl:][:space:][:punct:]]\)\@=')\S\@=/ end=/>/ contains=rustGenericLifetimeCandidate
 syn region rustGenericLifetimeCandidate display start=/\%(<\|,\s*\)\@<='/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustSigil,rustLifetime
 
 "rustLifetime must appear before rustCharacter, or chars will get the lifetime highlighting
 syn match     rustLifetime    display "\'\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*"
 syn match     rustLabel       display "\'\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*:"
+syn match     rustLabel       display "\%(\<\%(break\|continue\)\s*\)\@<=\'\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*"
 syn match   rustCharacterInvalid   display contained /b\?'\zs[\n\r\t']\ze'/
 " The groups negated here add up to 0-255 but nothing else (they do not seem to go beyond ASCII).
 syn match   rustCharacterInvalidUnicode   display contained /b'\zs[^[:cntrl:][:graph:][:alnum:][:space:]]\ze'/
 syn match   rustCharacter   /b'\([^\\]\|\\\(.\|x\x\{2}\)\)'/ contains=rustEscape,rustEscapeError,rustCharacterInvalid,rustCharacterInvalidUnicode
-syn match   rustCharacter   /'\([^\\]\|\\\(.\|x\x\{2}\|u{\x\{1,6}}\)\)'/ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustCharacterInvalid
+syn match   rustCharacter   /'\([^\\]\|\\\(.\|x\x\{2}\|u{\%(\x_*\)\{1,6}}\)\)'/ contains=rustEscape,rustEscapeUnicode,rustEscapeError,rustCharacterInvalid
 
 syn match rustShebang /\%^#![^[].*/
 syn region rustCommentLine                                                  start="//"                      end="$"   contains=rustTodo,@Spell
 syn region rustCommentLineDoc                                               start="//\%(//\@!\|!\)"         end="$"   contains=rustTodo,@Spell
 syn region rustCommentLineDocError                                          start="//\%(//\@!\|!\)"         end="$"   contains=rustTodo,@Spell contained
 syn region rustCommentBlock             matchgroup=rustCommentBlock         start="/\*\%(!\|\*[*/]\@!\)\@!" end="\*/" contains=rustTodo,rustCommentBlockNest,@Spell
-syn region rustCommentBlockDoc          matchgroup=rustCommentBlockDoc      start="/\*\%(!\|\*[*/]\@!\)"    end="\*/" contains=rustTodo,rustCommentBlockDocNest,@Spell
+syn region rustCommentBlockDoc          matchgroup=rustCommentBlockDoc      start="/\*\%(!\|\*[*/]\@!\)"    end="\*/" contains=rustTodo,rustCommentBlockDocNest,rustCommentBlockDocRustCode,@Spell
 syn region rustCommentBlockDocError     matchgroup=rustCommentBlockDocError start="/\*\%(!\|\*[*/]\@!\)"    end="\*/" contains=rustTodo,rustCommentBlockDocNestError,@Spell contained
 syn region rustCommentBlockNest         matchgroup=rustCommentBlock         start="/\*"                     end="\*/" contains=rustTodo,rustCommentBlockNest,@Spell contained transparent
 syn region rustCommentBlockDocNest      matchgroup=rustCommentBlockDoc      start="/\*"                     end="\*/" contains=rustTodo,rustCommentBlockDocNest,@Spell contained transparent
 syn region rustCommentBlockDocNestError matchgroup=rustCommentBlockDocError start="/\*"                     end="\*/" contains=rustTodo,rustCommentBlockDocNestError,@Spell contained transparent
+
 " FIXME: this is a really ugly and not fully correct implementation. Most
 " importantly, a case like ``/* */*`` should have the final ``*`` not being in
 " a comment, but in practice at present it leaves comments open two levels
@@ -203,13 +229,67 @@ syn region rustCommentBlockDocNestError matchgroup=rustCommentBlockDocError star
 " then you must deal with cases like ``/*/**/*/``. And don't try making it
 " worse with ``\%(/\@<!\*\)\@<!``, either...
 
-syn keyword rustTodo contained TODO FIXME XXX NB NOTE
+syn keyword rustTodo contained TODO FIXME XXX NB NOTE SAFETY
+
+" asm! macro {{{2
+syn region rustAsmMacro matchgroup=rustMacro start="\<asm!\s*(" end=")" contains=rustAsmDirSpec,rustAsmSym,rustAsmConst,rustAsmOptionsGroup,rustComment.*,rustString.*
+
+" Clobbered registers
+syn keyword rustAsmDirSpec in out lateout inout inlateout contained nextgroup=rustAsmReg skipwhite skipempty
+syn region  rustAsmReg start="(" end=")" contained contains=rustString
+
+" Symbol operands
+syn keyword rustAsmSym sym contained nextgroup=rustAsmSymPath skipwhite skipempty
+syn region  rustAsmSymPath start="\S" end=",\|)"me=s-1 contained contains=rustComment.*,rustIdentifier
+
+" Const
+syn region  rustAsmConstBalancedParens start="("ms=s+1 end=")" contained contains=@rustAsmConstExpr
+syn cluster rustAsmConstExpr contains=rustComment.*,rust.*Number,rustString,rustAsmConstBalancedParens
+syn region  rustAsmConst start="const" end=",\|)"me=s-1 contained contains=rustStorage,@rustAsmConstExpr
+
+" Options
+syn region  rustAsmOptionsGroup start="options\s*(" end=")" contained contains=rustAsmOptions,rustAsmOptionsKey
+syn keyword rustAsmOptionsKey options contained
+syn keyword rustAsmOptions pure nomem readonly preserves_flags noreturn nostack att_syntax contained
 
 " Folding rules {{{2
 " Trivial folding rules to begin with.
 " FIXME: use the AST to make really good folding
 syn region rustFoldBraces start="{" end="}" transparent fold
 
+if !exists("b:current_syntax_embed")
+    let b:current_syntax_embed = 1
+    syntax include @RustCodeInComment <sfile>:p:h/rust.vim
+    unlet b:current_syntax_embed
+
+    " Currently regions marked as ```<some-other-syntax> will not get
+    " highlighted at all. In the future, we can do as vim-markdown does and
+    " highlight with the other syntax. But for now, let's make sure we find
+    " the closing block marker, because the rules below won't catch it.
+    syn region rustCommentLinesDocNonRustCode matchgroup=rustCommentDocCodeFence start='^\z(\s*//[!/]\s*```\).\+$' end='^\z1$' keepend contains=rustCommentLineDoc
+
+    " We borrow the rules from rust’s src/librustdoc/html/markdown.rs, so that
+    " we only highlight as Rust what it would perceive as Rust (almost; it’s
+    " possible to trick it if you try hard, and indented code blocks aren’t
+    " supported because Markdown is a menace to parse and only mad dogs and
+    " Englishmen would try to handle that case correctly in this syntax file).
+    syn region rustCommentLinesDocRustCode matchgroup=rustCommentDocCodeFence start='^\z(\s*//[!/]\s*```\)[^A-Za-z0-9_-]*\%(\%(should_panic\|no_run\|ignore\|allow_fail\|rust\|test_harness\|compile_fail\|E\d\{4}\|edition201[58]\)\%([^A-Za-z0-9_-]\+\|$\)\)*$' end='^\z1$' keepend contains=@RustCodeInComment,rustCommentLineDocLeader
+    syn region rustCommentBlockDocRustCode matchgroup=rustCommentDocCodeFence start='^\z(\%(\s*\*\)\?\s*```\)[^A-Za-z0-9_-]*\%(\%(should_panic\|no_run\|ignore\|allow_fail\|rust\|test_harness\|compile_fail\|E\d\{4}\|edition201[58]\)\%([^A-Za-z0-9_-]\+\|$\)\)*$' end='^\z1$' keepend contains=@RustCodeInComment,rustCommentBlockDocStar
+    " Strictly, this may or may not be correct; this code, for example, would
+    " mishighlight:
+    "
+    "     /**
+    "     ```rust
+    "     println!("{}", 1
+    "     * 1);
+    "     ```
+    "     */
+    "
+    " … but I don’t care. Balance of probability, and all that.
+    syn match rustCommentBlockDocStar /^\s*\*\s\?/ contained
+    syn match rustCommentLineDocLeader "^\s*//\%(//\@!\|!\)" contained
+endif
+
 " Default highlighting {{{1
 hi def link rustDecNumber       rustNumber
 hi def link rustHexNumber       rustNumber
@@ -219,7 +299,6 @@ hi def link rustIdentifierPrime rustIdentifier
 hi def link rustTrait           rustType
 hi def link rustDeriveTrait     rustTrait
 
-hi def link rustMacroRepeatCount   rustMacroRepeatDelimiters
 hi def link rustMacroRepeatDelimiters   Macro
 hi def link rustMacroVariable Define
 hi def link rustSigil         StorageClass
@@ -228,6 +307,7 @@ hi def link rustEscapeUnicode rustEscape
 hi def link rustEscapeError   Error
 hi def link rustStringContinuation Special
 hi def link rustString        String
+hi def link rustStringDelimiter String
 hi def link rustCharacterInvalid Error
 hi def link rustCharacterInvalidUnicode rustCharacterInvalid
 hi def link rustCharacter     Character
@@ -241,12 +321,15 @@ hi def link rustFloat         Float
 hi def link rustArrowCharacter rustOperator
 hi def link rustOperator      Operator
 hi def link rustKeyword       Keyword
+hi def link rustDynKeyword    rustKeyword
 hi def link rustTypedef       Keyword " More precise is Typedef, but it doesn't feel right for Rust
 hi def link rustStructure     Keyword " More precise is Structure
 hi def link rustUnion         rustStructure
+hi def link rustExistential   rustKeyword
 hi def link rustPubScopeDelim Delimiter
 hi def link rustPubScopeCrate rustKeyword
 hi def link rustSuper         rustKeyword
+hi def link rustUnsafeKeyword Exception
 hi def link rustReservedKeyword Error
 hi def link rustRepeat        Conditional
 hi def link rustConditional   Conditional
@@ -260,10 +343,13 @@ hi def link rustFuncCall      Function
 hi def link rustShebang       Comment
 hi def link rustCommentLine   Comment
 hi def link rustCommentLineDoc SpecialComment
+hi def link rustCommentLineDocLeader rustCommentLineDoc
 hi def link rustCommentLineDocError Error
 hi def link rustCommentBlock  rustCommentLine
 hi def link rustCommentBlockDoc rustCommentLineDoc
+hi def link rustCommentBlockDocStar rustCommentBlockDoc
 hi def link rustCommentBlockDocError Error
+hi def link rustCommentDocCodeFence rustCommentLineDoc
 hi def link rustAssert        PreCondit
 hi def link rustPanic         PreCondit
 hi def link rustMacro         Macro
@@ -276,11 +362,15 @@ hi def link rustStorage       StorageClass
 hi def link rustObsoleteStorage Error
 hi def link rustLifetime      Special
 hi def link rustLabel         Label
-hi def link rustInvalidBareKeyword Error
 hi def link rustExternCrate   rustKeyword
 hi def link rustObsoleteExternMod Error
-hi def link rustBoxPlacementParens Delimiter
 hi def link rustQuestionMark  Special
+hi def link rustAsync         rustKeyword
+hi def link rustAwait         rustKeyword
+hi def link rustAsmDirSpec    rustKeyword
+hi def link rustAsmSym        rustKeyword
+hi def link rustAsmOptions    rustKeyword
+hi def link rustAsmOptionsKey rustAttribute
 
 " Other Suggestions:
 " hi rustAttribute ctermfg=cyan
@@ -293,3 +383,5 @@ syn sync minlines=200
 syn sync maxlines=500
 
 let b:current_syntax = "rust"
+
+" vim: set et sw=4 sts=4 ts=8:
-- 
cgit 


From 199cf5a526a1a9bf826272caac99427385810500 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 12 Sep 2023 22:36:34 +0200
Subject: vim-patch:8b2457a38198
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(swayconfig): improve syntax highlighting (vim/vim#13060)

* syntax(swayconfig): improved highlighting
* syntax(swayconfig): adapt to i3config structure

https://github.com/vim/vim/commit/8b2457a3819826d90ad2b1677d213d9f924ec6c0

Co-authored-by: Josef Litoš <54900518+JosefLitos@users.noreply.github.com>
---
 runtime/syntax/swayconfig.vim | 196 ++++++++++++++++++++++--------------------
 1 file changed, 104 insertions(+), 92 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/swayconfig.vim b/runtime/syntax/swayconfig.vim
index 6b36210252..290e8cc1ac 100644
--- a/runtime/syntax/swayconfig.vim
+++ b/runtime/syntax/swayconfig.vim
@@ -1,10 +1,10 @@
 " Vim syntax file
 " Language: sway window manager config
-" Original Author: James Eapen <james.eapen@vai.org>
+" Original Author: Josef Litos
 " Maintainer: James Eapen <james.eapen@vai.org>
-" Version: 0.2.1
-" Reference version (jamespeapen/swayconfig.vim): 0.12.1
-" Last Change: 2023 Mar 20
+" Version: 0.2.2
+" Reference version (JosefLitos/i3config.vim): 1.8.1
+" Last Change: 2023-09-12
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -19,98 +19,110 @@ endif
 
 runtime! syntax/i3config.vim
 
-scriptencoding utf-8
+" i3 extensions
+syn match i3ConfigSet /^\s*set \$\w\+ .*$/ contains=i3ConfigVariable,i3ConfigSetKeyword,i3ConfigColor,i3ConfigString,i3ConfigNoStartupId,i3ConfigNumber,swayConfigOutputCommand,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper
 
-" Error
-"syn match swayConfigError /.*/
+syn keyword i3ConfigActionKeyword opacity contained
 
-" binding
 syn keyword swayConfigBindKeyword bindswitch bindgesture contained
-syn match swayConfigBind /^\s*\(bindswitch\)\s\+.*$/ contains=i3ConfigVariable,i3ConfigBindKeyword,swayConfigBindKeyword,i3ConfigVariableAndModifier,i3ConfigNumber,i3ConfigUnit,i3ConfigUnitOr,i3ConfigBindArgument,i3ConfigModifier,i3ConfigAction,i3ConfigString,i3ConfigGapStyleKeyword,i3ConfigBorderStyleKeyword
-
-" bindgestures
-syn keyword swayConfigBindGestureCommand swipe pinch hold contained
-syn keyword swayConfigBindGestureDirection up down left right next prev contained
-syn keyword swayConfigBindGesturePinchDirection inward outward clockwise counterclockwise contained
-syn match swayConfigBindGestureHold /^\s*\(bindgesture\)\s\+hold\(:[1-5]\)\?\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
-syn match swayConfigBindGestureSwipe /^\s*\(bindgesture\)\s\+swipe\(:[3-5]\)\?:\(up\|down\|left\|right\)\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
-syn match swayConfigBindGesturePinch /^\s*\(bindgesture\)\s\+pinch\(:[2-5]\)\?:\(up\|down\|left\|right\|inward\|outward\|clockwise\|counterclockwise\)\(+\(up\|down\|left\|right\|inward\|outward\|clockwise\|counterclockwise\)\)\?.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,swayConfigBindGesturePinchDirection,i3ConfigWorkspaceKeyword,i3ConfigAction
-
-" floating
-syn keyword swayConfigFloatingKeyword floating contained
-syn match swayConfigFloating /^\s*floating\s\+\(enable\|disable\|toggle\)\s*$/ contains=swayConfigFloatingKeyword
-
-syn clear i3ConfigFloatingModifier
-syn keyword swayConfigFloatingModifier floating_modifier contained
-syn match swayConfigFloatingMouseAction /^\s\?.*floating_modifier\s\S\+\s\?\(normal\|inverted\|none\)\?$/ contains=swayConfigFloatingModifier,i3ConfigVariable
-
-" Gaps
-syn clear i3ConfigSmartBorderKeyword
-syn clear i3ConfigSmartBorder
-syn keyword swayConfigSmartBorderKeyword on no_gaps off contained
-syn match swayConfigSmartBorder /^\s*smart_borders\s\+\(on\|no_gaps\|off\)\s\?$/ contains=swayConfigSmartBorderKeyword
-
-" Changing colors
-syn keyword swayConfigClientColorKeyword focused_tab_title contained
-syn match swayConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=i3ConfigClientColorKeyword,i3ConfigColor,i3ConfigVariable,i3ConfigClientColorKeyword,swayConfigClientColorKeyword
-
-" Input config
-syn keyword swayConfigInputKeyword input contained
-syn match swayConfigInput /^\s*input\s\+.*$/ contains=swayConfigInputKeyword
+syn match i3ConfigBindArgument /--\(locked\|to-code\|no-repeat\|input-device=[:0-9a-zA-Z_/-]\+\|no-warn\)/ contained
+syn region i3ConfigBind start=/^\s*bind\(switch\|gesture\) / skip=/\\$/ end=/$/ contains=swayConfigBindKeyword,swayConfigBindswitch,swayConfigBindswitchArgument,swayConfigBindgesture,swayConfigBindgestureArgument,i3ConfigCriteria,i3ConfigAction,i3ConfigSeparator,i3ConfigActionKeyword,i3ConfigOption,i3ConfigString,i3ConfigNumber,i3ConfigVariable,i3ConfigBoolean keepend
+
+syn match swayConfigBindBlockHeader /^\s*bind\(sym\|code\) .*{$/ contained contains=i3ConfigBindKeyword,i3ConfigBindArgument,i3ConfigParen
+syn match swayConfigBindBlockCombo /^\s\+\(--[a-z-]\+ \)*[$a-zA-Z0-9_+]\+ [a-z[]\@=/ contained contains=i3ConfigBindArgument,i3ConfigBindCombo
+syn region i3ConfigBind start=/^\s*bind\(sym\|code\) .*{$/ end=/^\s*}$/ contains=swayConfigBindBlockHeader,swayConfigBindBlockCombo,i3ConfigCriteria,i3ConfigAction,i3ConfigSeparator,i3ConfigActionKeyword,i3ConfigOption,i3ConfigString,i3ConfigNumber,i3ConfigVariable,i3ConfigBoolean,i3ConfigComment,i3ConfigParen fold keepend extend
+
+syn keyword i3ConfigClientOpts focused_tab_title contained
+
+syn region swayConfigExecBlock start=/exec\(_always\)\? {/ end=/^}$/ contains=i3ConfigExecKeyword,i3ConfigExecAlwaysKeyword,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigComment fold keepend extend
+
+syn keyword swayConfigFloatingModifierOpts normal inverse contained
+syn match i3ConfigKeyword /^floating_modifier [$a-zA-Z0-9+]\+ \(normal\|inverse\)$/ contains=i3ConfigVariable,i3ConfigBindModkey,swayConfigFloatingModifierOpts
+
+syn match i3ConfigEdge /^hide_edge_borders\( --i3\)\? \(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=i3ConfigEdgeKeyword,i3ConfigShParam
+
+syn keyword i3ConfigBarBlockKeyword swaybar_command gaps height pango_markup status_edge_padding status_padding wrap_scroll tray_bindcode tray_bindsym icon_theme contained
+
+syn keyword i3ConfigExecActionKeyword swaymsg contained
 
-" Seat config
+" Sway-only options
+" Xwayland
+syn keyword swayConfigXOpt enable disable force contained
+syn match i3ConfigKeyword /^xwayland .*$/ contains=swayConfigXOpt
+
+" Bindswitch
+syn match swayConfigBindswitchArgument /--\(locked\|no-warn\|reload\)/ contained
+syn keyword swayConfigBindswitchType lid tablet contained
+syn keyword swayConfigBindswitchState toggle contained
+syn match swayConfigBindswitch /\(lid\|tablet\):\(on\|off\|toggle\) / contained contains=swayConfigBindswitchType,i3ConfigColonOperator,swayConfigBindswitchState,i3ConfigBoolean
+syn region i3ConfigBind start=/^\s*bindswitch\s\+.*{$/ end=/^\s*}$/ contains=swayConfigBindKeyword,swayConfigBindswitch,swayConfigBindswitchArgument,i3ConfigNumber,i3ConfigVariable,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigSeparator,i3ConfigString,i3ConfigCriteria,swayConfigOutputCommand,i3ConfigBoolean,i3ConfigComment,i3ConfigParen fold keepend extend
+
+" Bindgesture
+syn match swayConfigBindgestureArgument /--\(exact\|input-device=[:0-9a-zA-Z_/-]\+\|no-warn\)/ contained
+syn keyword swayConfigBindgestureType hold swipe pinch contained
+syn keyword swayConfigBindgestureDir up down left right inward outward clockwise counterclockwise contained
+syn match swayConfigBindgesture /\(hold\(:[1-5]\)\?\|swipe\(:[3-5]\)\?\(:up\|:down\|:left\|:right\)\?\|pinch\(:[2-5]\)\?:\(+\?\(inward\|outward\|clockwise\|counterclockwise\|up\|down\|left\|right\)\)\+\) / contained contains=i3ConfigNumber,swayConfigBindgestureType,i3ConfigColonOperator,swayConfigBindgestureDir,i3ConfigBindModifier
+syn region i3ConfigBind start=/^\s*bindgesture\s\+.*{$/ end=/^\s*}$/ contains=swayConfigBindKeyword,swayConfigBindgesture,swayConfigBindgestureArgument,i3ConfigCriteria,i3ConfigAction,i3ConfigSeparator,i3ConfigActionKeyword,i3ConfigOption,i3ConfigString,i3ConfigNumber,i3ConfigVariable,i3ConfigBoolean,i3ConfigParen fold keepend extend
+
+" Titlebar commands
+syn match i3ConfigKeyword /^titlebar_border_thickness \(\d\+\|\$\S\+\)$/ contains=i3ConfigNumber,i3ConfigVariable
+syn match i3ConfigKeyword /^titlebar_padding \(\d\+\|\$\S\+\)\( \d\+\)\?$/ contains=i3ConfigNumber,i3ConfigVariable
+
+syn match swayConfigDeviceOps /[*,:;]/ contained
+
+" Output monitors
+syn keyword swayConfigOutputKeyword output contained
+syn keyword swayConfigOutputOpts mode resolution res modeline position pos scale scale_filter subpixel background bg transform disable enable power dpms max_render_time adaptive_sync render_bit_depth contained
+syn keyword swayConfigOutputOptVals linear nearest smart rgb bgr vrgb vbgr none normal flipped fill stretch fit center tile solid_color clockwise anticlockwise toggle contained
+syn match swayConfigOutputFPS /@[0-9.]\+Hz/ contained
+syn match swayConfigOutputMode / [0-9]\+x[0-9]\+\(@[0-9.]\+Hz\)\?/ contained contains=swayConfigOutputFPS,i3ConfigNumber
+syn region i3ConfigAction start=/output/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps keepend
+syn region swayConfigOutput start=/^output/ skip=/\\$/ end=/$/  contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps keepend
+syn region swayConfigOutput start=/^output .* {$/ end=/}$/  contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps,i3ConfigParen keepend extend
+
+" Input devices
+syn keyword swayConfigInputKeyword input contained
+syn keyword swayConfigInputOpts xkb_layout xkb_variant xkb_rules xkb_switch_layout xkb_numlock xkb_file xkb_capslock xkb_model repeat_delay repeat_rate map_to_output map_to_region map_from_region tool_mode accel_profile dwt dwtp drag_lock drag click_method middle_emulation tap events calibration_matrix natural_scroll left_handed pointer_accel scroll_button scroll_factor scroll_method tap_button_map contained
+syn keyword swayConfigInputOptVals absolute relative adaptive flat none button_areas clickfinger toggle two_finger edge on_button_down lrm lmr contained
+syn match swayConfigColonPairVal /:[0-9a-z_-]\+/ contained contains=i3ConfigColonOperator
+syn match swayConfigColonPair /[a-z]\+:[0-9a-z_-]\+/ contained contains=swayConfigColonPairVal
+syn match swayConfigInputXkbOpts /xkb_options \([a-z]\+:[0-9a-z_-]\+,\?\)\+/ contained contains=swayConfigColonPair,swayConfigDeviceOps
+syn region i3ConfigAction start=/input/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigInputKeyword,swayConfigColonPair,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigBoolean,swayConfigDeviceOps keepend
+syn region i3ConfigInput start=/^input/ skip=/\\$/ end=/$/ contains=swayConfigInputKeyword,swayConfigColonPair,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigBoolean,swayConfigDeviceOps keepend
+syn region i3ConfigInput start=/^input .* {/ end=/}$/ contains=swayConfigInputKeyword,swayConfigColonPair,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigBoolean,swayConfigDeviceOps,i3ConfigParen keepend extend
+
+" Seat
 syn keyword swayConfigSeatKeyword seat contained
-syn match swayConfigSeat /^\s*seat\s\+.*$/ contains=swayConfigSeatKeyword
-
-" set display outputs
-syn match swayConfigOutput /^\s*output\s\+.*$/ contains=i3ConfigOutput
-
-" set display focus 
-syn keyword swayConfigFocusKeyword focus contained
-syn keyword swayConfigFocusType output contained
-syn match swayConfigFocus /^\s*focus\soutput\s.*$/ contains=swayConfigFocusKeyword,swayConfigFocusType
-
-" mouse warping
-syn keyword swayConfigMouseWarpingType container contained
-syn match swayConfigMouseWarping /^\s*mouse_warping\s\+\(output\|container\|none\)\s\?$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType,swayConfigMouseWarpingType
-
-" focus follows mouse
-syn clear i3ConfigFocusFollowsMouseType
-syn clear i3ConfigFocusFollowsMouse
-
-syn keyword swayConfigFocusFollowsMouseType yes no always contained
-syn match swayConfigFocusFollowsMouse /^\s*focus_follows_mouse\s\+\(yes\|no\|always\)\s\?$/ contains=i3ConfigFocusFollowsMouseKeyword,swayConfigFocusFollowsMouseType
-
-
-" xwayland 
-syn keyword swayConfigXwaylandKeyword xwayland contained
-syn match swayConfigXwaylandModifier /^\s*xwayland\s\+\(enable\|disable\|force\)\s\?$/ contains=swayConfigXwaylandKeyword
-
-" Group mode/bar
-syn clear i3ConfigBlock
-syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigInitializeKeyword,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable,swayConfigInputKeyword,swayConfigSeatKeyword,i3ConfigOutput transparent keepend extend
-
-"hi def link swayConfigError                         Error
-hi def link i3ConfigFloating                        Error
-hi def link swayConfigFloating                      Type
-hi def link swayConfigFloatingMouseAction           Type
-hi def link swayConfigFocusKeyword                  Type
-hi def link swayConfigSmartBorderKeyword            Type
-hi def link swayConfigInputKeyword                  Type
-hi def link swayConfigSeatKeyword                   Type
-hi def link swayConfigMouseWarpingType              Type
-hi def link swayConfigFocusFollowsMouseType         Type
-hi def link swayConfigBindGestureCommand            Identifier
-hi def link swayConfigBindGestureDirection          Constant
-hi def link swayConfigBindGesturePinchDirection     Constant
-hi def link swayConfigBindKeyword                   Identifier
-hi def link swayConfigClientColorKeyword            Identifier
-hi def link swayConfigFloatingKeyword               Identifier
-hi def link swayConfigFloatingModifier              Identifier
-hi def link swayConfigFocusType                     Identifier
-hi def link swayConfigSmartBorder                   Identifier
-hi def link swayConfigXwaylandKeyword               Identifier
-hi def link swayConfigXwaylandModifier              Type
-hi def link swayConfigBindGesture                   PreProc
+syn keyword swayConfigSeatOpts attach cursor fallback hide_cursor idle_inhibit idle_wake keyboard_grouping shortcuts_inhibitor pointer_constraint xcursor_theme contained
+syn match swayConfigSeatOptVals /when-typing/ contained
+syn keyword swayConfigSeatOptVals move set press release none smart activate deactivate toggle escape enable disable contained
+syn region i3ConfigAction start=/seat/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps keepend
+syn region swayConfigSeat start=/seat/ skip=/\\$/ end=/$/ contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps keepend
+syn region swayConfigSeat start=/seat .* {$/ end=/}$/ contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps,i3ConfigParen keepend extend
+
+" Define the highlighting.
+hi def link swayConfigFloatingModifierOpts          i3ConfigOption
+hi def link swayConfigBindKeyword                   i3ConfigBindKeyword
+hi def link swayConfigXOpt                          i3ConfigOption
+hi def link swayConfigBindswitchArgument            i3ConfigBindArgument
+hi def link swayConfigBindswitchType                i3ConfigMoveType
+hi def link swayConfigBindswitchState               i3ConfigMoveDir
+hi def link swayConfigBindgestureArgument           i3ConfigBindArgument
+hi def link swayConfigBindgestureType               i3ConfigMoveType
+hi def link swayConfigBindgestureDir                i3ConfigMoveDir
+hi def link swayConfigDeviceOps                     i3ConfigOperator
+hi def link swayConfigOutputKeyword                 i3ConfigCommand
+hi def link swayConfigOutputOptVals                 i3ConfigOption
+hi def link swayConfigOutputOpts                    i3ConfigOption
+hi def link swayConfigOutputFPS                     Constant
+hi def link swayConfigInputKeyword                  i3ConfigCommand
+hi def link swayConfigInputOptVals                  i3ConfigShParam
+hi def link swayConfigInputOpts                     i3ConfigOption
+hi def link swayConfigInputXkbOpts                  i3ConfigOption
+hi def link swayConfigColonPairVal                  i3ConfigString
+hi def link swayConfigColonPair                     i3ConfigShParam
+hi def link swayConfigSeatKeyword                   i3ConfigCommand
+hi def link swayConfigSeatOptVals                   i3ConfigOption
+hi def link swayConfigSeatOpts                      i3ConfigOption
 
 let b:current_syntax = "swayconfig"
-- 
cgit 


From a6e74c1f0a2bbf03f5b99c167b549018f4c8fb0d Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Thu, 14 Sep 2023 06:05:27 +0200
Subject: docs: fix typos and other small fixes (#25005)

Co-authored-by: nuid64 <lvkuzvesov@proton.me>
Co-authored-by: Mike Smith <10135646+mikesmithgh@users.noreply.github.com>
Co-authored-by: XTY <xty@xty.io>
Co-authored-by: Empa <emanuel@empa.xyz>
Co-authored-by: kyu08 <49891479+kyu08@users.noreply.github.com>
---
 runtime/doc/builtin.txt           | 2 +-
 runtime/doc/lsp.txt               | 2 +-
 runtime/doc/lua.txt               | 4 ++--
 runtime/doc/options.txt           | 6 +++---
 runtime/lua/vim/_editor.lua       | 2 +-
 runtime/lua/vim/_meta/options.lua | 6 +++---
 runtime/lua/vim/_meta/regex.lua   | 2 +-
 runtime/lua/vim/_meta/vimfn.lua   | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 400cd27302..05db977809 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5211,7 +5211,7 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 							*printf-$*
 		In certain languages, error and informative messages are
 		more readable when the order of words is different from the
-		corresponding message in English. To accomodate translations
+		corresponding message in English. To accommodate translations
 		having a different word order, positional arguments may be
 		used to indicate this. For instance: >vim
 
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 1e57b85153..29c08fb32d 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -578,7 +578,7 @@ LspRequest                                                        *LspRequest*
     "data" table passed to the callback function.
 
     It triggers when the initial request is sent ({type} == `pending`) and
-    when the LSP server responds ({type} == `complete`). If a cancelation
+    when the LSP server responds ({type} == `complete`). If a cancellation
     is requested using `client.cancel_request(request_id)`, then this event
     will trigger with {type} == `cancel`.
 
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 61afd4698a..c7f5a292e7 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -674,7 +674,7 @@ vim.regex:match_line({bufnr}, {line_idx}, {start}, {end_})
 vim.regex:match_str({str})                                 *regex:match_str()*
     Match the string against the regex. If the string should match the regex
     precisely, surround the regex with `^` and `$` . If there was a match, the byte indices for the beginning and end of the
-    match are returned. When there is no match, `nil` is returned. Because any integer is "truthy", `regex:match()` can be directly used as a condition in an if-statement.
+    match are returned. When there is no match, `nil` is returned. Because any integer is "truthy", `regex:match_str()` can be directly used as a condition in an if-statement.
 
     Parameters: ~
       • {str}  (string)
@@ -1772,7 +1772,7 @@ vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
                    • stdout: (boolean|function) Handle output from stdout.
                      When passed as a function must have the signature
                      `fun(err: string, data: string)`. Defaults to `true`
-                   • stderr: (boolean|function) Handle output from stdout.
+                   • stderr: (boolean|function) Handle output from stderr.
                      When passed as a function must have the signature
                      `fun(err: string, data: string)`. Defaults to `true`.
                    • text: (boolean) Handle stdout and stderr as text.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 68be0da2fd..f758782f09 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2901,10 +2901,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   n-v-c-sm:block,i-ci-ve:ver25-Cursor,r-cr-o:hor20
 				In Normal et al. modes, use a block cursor
 				with the default colors defined by the host
-				terminal.  In Insert-likes modes, use
+				terminal.  In Insert-like modes, use
 				a vertical bar cursor with colors from
-				"Cursor" highlight group.  In Replace-likes
-				modes, use a underline cursor with
+				"Cursor" highlight group.  In Replace-like
+				modes, use an underline cursor with
 				default colors.
 	   i-ci:ver30-iCursor-blinkwait300-blinkon200-blinkoff150
 				In Insert and Command-line Insert mode, use a
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 68992a16bb..64aeb64736 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -104,7 +104,7 @@ vim.log = {
 ---     Handle output from stdout. When passed as a function must have the signature `fun(err: string, data: string)`.
 ---     Defaults to `true`
 ---   - stderr: (boolean|function)
----     Handle output from stdout. When passed as a function must have the signature `fun(err: string, data: string)`.
+---     Handle output from stderr. When passed as a function must have the signature `fun(err: string, data: string)`.
 ---     Defaults to `true`.
 ---   - text: (boolean) Handle stdout and stderr as text. Replaces `\r\n` with `\n`.
 ---   - timeout: (integer) Run the command with a time limit. Upon timeout the process is sent the
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 4fb3141df0..92dc4b2c7f 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -2697,10 +2697,10 @@ vim.go.gp = vim.go.grepprg
 ---    n-v-c-sm:block,i-ci-ve:ver25-Cursor,r-cr-o:hor20
 --- 			In Normal et al. modes, use a block cursor
 --- 			with the default colors defined by the host
---- 			terminal.  In Insert-likes modes, use
+--- 			terminal.  In Insert-like modes, use
 --- 			a vertical bar cursor with colors from
---- 			"Cursor" highlight group.  In Replace-likes
---- 			modes, use a underline cursor with
+--- 			"Cursor" highlight group.  In Replace-like
+--- 			modes, use an underline cursor with
 --- 			default colors.
 ---    i-ci:ver30-iCursor-blinkwait300-blinkon200-blinkoff150
 --- 			In Insert and Command-line Insert mode, use a
diff --git a/runtime/lua/vim/_meta/regex.lua b/runtime/lua/vim/_meta/regex.lua
index ab4f46d43f..58aa2be8c2 100644
--- a/runtime/lua/vim/_meta/regex.lua
+++ b/runtime/lua/vim/_meta/regex.lua
@@ -21,7 +21,7 @@ local regex = {} -- luacheck: no unused
 --- precisely, surround the regex with `^` and `$`. If there was a match, the
 --- byte indices for the beginning and end of the match are returned. When
 --- there is no match, `nil` is returned. Because any integer is "truthy",
---- `regex:match()` can be directly used as a condition in an if-statement.
+--- `regex:match_str()` can be directly used as a condition in an if-statement.
 --- @param str string
 function regex:match_str(str) end
 
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 6209ce0c73..efb779ad41 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6194,7 +6194,7 @@ function vim.fn.prevnonblank(lnum) end
 ---           *printf-$*
 --- In certain languages, error and informative messages are
 --- more readable when the order of words is different from the
---- corresponding message in English. To accomodate translations
+--- corresponding message in English. To accommodate translations
 --- having a different word order, positional arguments may be
 --- used to indicate this. For instance: >vim
 ---
-- 
cgit 


From a49924a318520a3b5c2f210f22a8d450165e89b5 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Thu, 14 Sep 2023 08:40:53 +0200
Subject: feat(lsp): remove notify from vim.lsp.buf_detach_client (#25140)

Closes https://github.com/neovim/neovim/issues/19838
---
 runtime/lua/vim/lsp.lua | 2 --
 1 file changed, 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index b0caf5af35..c25358e557 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -1955,8 +1955,6 @@ function lsp.buf_detach_client(bufnr, client_id)
 
   local namespace = lsp.diagnostic.get_namespace(client_id)
   vim.diagnostic.reset(namespace, bufnr)
-
-  vim.notify(string.format('Detached buffer (id: %d) from client (id: %d)', bufnr, client_id))
 end
 
 --- Checks if a buffer is attached for a particular client.
-- 
cgit 


From a4743487b71b54f05063465d5f8cde8014bcb73c Mon Sep 17 00:00:00 2001
From: L Lllvvuu <git@llllvvuu.dev>
Date: Thu, 14 Sep 2023 00:08:43 -0700
Subject: fix(treesitter): `language.add` - only register parser if it exists

Fixes: #24531
---
 runtime/lua/vim/treesitter/language.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/language.lua b/runtime/lua/vim/treesitter/language.lua
index 9695e2c41c..15bf666a1e 100644
--- a/runtime/lua/vim/treesitter/language.lua
+++ b/runtime/lua/vim/treesitter/language.lua
@@ -82,9 +82,8 @@ function M.add(lang, opts)
     filetype = { filetype, { 'string', 'table' }, true },
   })
 
-  M.register(lang, filetype)
-
   if vim._ts_has_language(lang) then
+    M.register(lang, filetype)
     return
   end
 
@@ -102,6 +101,7 @@ function M.add(lang, opts)
   end
 
   vim._ts_add_language(path, lang, symbol_name)
+  M.register(lang, filetype)
 end
 
 --- @param x string|string[]
-- 
cgit 


From 9fc321c9768d1a18893e14f46b0ebacef1be1db4 Mon Sep 17 00:00:00 2001
From: LW <git@llllvvuu.dev>
Date: Thu, 14 Sep 2023 03:36:16 -0700
Subject: refactor(treesitter): deprecate for_each_child #25118

The name for_each_child is misleading and caused bugs.
After #25111, #25115, there are no more usages of `for_each_child` in Nvim.

In the future if we want to restore this functionality we can consider a
generalized vim.traverse(node, key, visitor) function.
---
 runtime/doc/deprecated.txt                  | 2 ++
 runtime/doc/news.txt                        | 3 +++
 runtime/doc/treesitter.txt                  | 9 ---------
 runtime/lua/vim/treesitter/languagetree.lua | 3 +++
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 81dd1e64bf..2e9312cf74 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -151,6 +151,8 @@ TREESITTER FUNCTIONS
 						and |TSNode:type()| instead.
 - *vim.treesitter.query.get_query()*		Use |vim.treesitter.query.get()|
 						instead.
+- *LanguageTree:for_each_child()*		Use |LanguageTree:children()|
+						(non-recursive) instead.
 
 LUA
 - vim.register_keystroke_callback()	Use |vim.on_key()| instead.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 93012e78a9..9adc90ac21 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -268,4 +268,7 @@ release.
 
 • `vim.loop` has been renamed to `vim.uv`.
 
+• vim.treesitter.languagetree functions:
+  - |LanguageTree:for_each_child()|	Use |LanguageTree:children()| (non-recursive) instead.
+
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 287985f75b..9d07aee290 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1094,15 +1094,6 @@ LanguageTree:destroy()                                *LanguageTree:destroy()*
     Note: This DOES NOT remove this tree from a parent. Instead,
     `remove_child` must be called on the parent to remove it.
 
-                                               *LanguageTree:for_each_child()*
-LanguageTree:for_each_child({fn}, {include_self})
-    Invokes the callback for each |LanguageTree| and its children recursively
-
-    Parameters: ~
-      • {fn}            fun(tree: LanguageTree, lang: string)
-      • {include_self}  (boolean|nil) Whether to include the invoking tree in
-                        the results
-
 LanguageTree:for_each_tree({fn})                *LanguageTree:for_each_tree()*
     Invokes the callback for each |LanguageTree| recursively.
 
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 6037b17b20..1ea0f6b2b9 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -451,11 +451,14 @@ function LanguageTree:parse(range)
   return self._trees
 end
 
+---@deprecated Misleading name. Use `LanguageTree:children()` (non-recursive) instead,
+---            add recursion yourself if needed.
 --- Invokes the callback for each |LanguageTree| and its children recursively
 ---
 ---@param fn fun(tree: LanguageTree, lang: string)
 ---@param include_self boolean|nil Whether to include the invoking tree in the results
 function LanguageTree:for_each_child(fn, include_self)
+  vim.deprecate('LanguageTree:for_each_child()', 'LanguageTree:children()', '0.11')
   if include_self then
     fn(self, self._lang)
   end
-- 
cgit 


From 2e92065686f62851318150a315591c30b8306a4b Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 14 Sep 2023 08:23:01 -0500
Subject: docs: replace <pre> with ``` (#25136)

---
 runtime/doc/api.txt                         |  75 +--
 runtime/doc/develop.txt                     |   7 +-
 runtime/doc/diagnostic.txt                  |  18 +-
 runtime/doc/lsp.txt                         | 147 +++---
 runtime/doc/lua.txt                         | 751 +++++++++++++---------------
 runtime/doc/options.txt                     |   2 +-
 runtime/doc/treesitter.txt                  |  71 ++-
 runtime/lua/vim/F.lua                       |   5 +-
 runtime/lua/vim/_editor.lua                 |  96 ++--
 runtime/lua/vim/_meta/api.lua               |  96 ++--
 runtime/lua/vim/_meta/builtin.lua           |  48 +-
 runtime/lua/vim/_meta/diff.lua              |  35 +-
 runtime/lua/vim/_meta/json.lua              |  37 +-
 runtime/lua/vim/_meta/misc.lua              |   8 +-
 runtime/lua/vim/_meta/options.lua           |  52 +-
 runtime/lua/vim/_meta/spell.lua             |  15 +-
 runtime/lua/vim/_options.lua                | 231 +++++----
 runtime/lua/vim/diagnostic.lua              |  32 +-
 runtime/lua/vim/filetype.lua                | 101 ++--
 runtime/lua/vim/fs.lua                      |  27 +-
 runtime/lua/vim/highlight.lua               |  31 +-
 runtime/lua/vim/keymap.lua                  |  39 +-
 runtime/lua/vim/lsp.lua                     |  17 +-
 runtime/lua/vim/lsp/buf.lua                 |  23 +-
 runtime/lua/vim/lsp/codelens.lua            |   6 +-
 runtime/lua/vim/lsp/diagnostic.lua          |  10 +-
 runtime/lua/vim/lsp/handlers.lua            |  43 +-
 runtime/lua/vim/lsp/semantic_tokens.lua     |   7 +-
 runtime/lua/vim/shared.lua                  | 120 ++---
 runtime/lua/vim/treesitter.lua              |  11 +-
 runtime/lua/vim/treesitter/languagetree.lua |  12 +-
 runtime/lua/vim/treesitter/query.lua        |  18 +-
 runtime/lua/vim/ui.lua                      |  54 +-
 runtime/lua/vim/version.lua                 | 131 ++---
 34 files changed, 1221 insertions(+), 1155 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 34e2aedabf..ffd90ec3d7 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1791,9 +1791,9 @@ nvim_create_user_command({name}, {command}, {*opts})
     For Lua usage see |lua-guide-commands-create|.
 
     Example: >vim
-       :call nvim_create_user_command('SayHello', 'echo "Hello world!"', {'bang': v:true})
-       :SayHello
-       Hello world!
+        :call nvim_create_user_command('SayHello', 'echo "Hello world!"', {'bang': v:true})
+        :SayHello
+        Hello world!
 <
 
     Parameters: ~
@@ -2041,10 +2041,14 @@ whether a buffer is loaded.
 nvim_buf_attach({buffer}, {send_buffer}, {opts})           *nvim_buf_attach()*
     Activates buffer-update events on a channel, or as Lua callbacks.
 
-    Example (Lua): capture buffer updates in a global `events` variable (use "vim.print(events)" to see its contents): >lua
-      events = {}
-      vim.api.nvim_buf_attach(0, false, {
-        on_lines=function(...) table.insert(events, {...}) end})
+    Example (Lua): capture buffer updates in a global `events` variable (use
+    "vim.print(events)" to see its contents): >lua
+        events = {}
+        vim.api.nvim_buf_attach(0, false, {
+          on_lines = function(...)
+            table.insert(events, {...})
+          end,
+        })
 <
 
     Parameters: ~
@@ -2553,8 +2557,8 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {*opts})
     Region can be given as (row,col) tuples, or valid extmark ids (whose
     positions define the bounds). 0 and -1 are understood as (0,0) and (-1,-1)
     respectively, thus the following are equivalent: >lua
-      vim.api.nvim_buf_get_extmarks(0, my_ns, 0, -1, {})
-      vim.api.nvim_buf_get_extmarks(0, my_ns, {0,0}, {-1,-1}, {})
+        vim.api.nvim_buf_get_extmarks(0, my_ns, 0, -1, {})
+        vim.api.nvim_buf_get_extmarks(0, my_ns, {0,0}, {-1,-1}, {})
 <
 
     If `end` is less than `start`, traversal works backwards. (Useful with
@@ -2565,18 +2569,18 @@ nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {*opts})
     an extmark will be considered.
 
     Example: >lua
-      local api = vim.api
-      local pos = api.nvim_win_get_cursor(0)
-      local ns  = api.nvim_create_namespace('my-plugin')
-      -- Create new extmark at line 1, column 1.
-      local m1  = api.nvim_buf_set_extmark(0, ns, 0, 0, {})
-      -- Create new extmark at line 3, column 1.
-      local m2  = api.nvim_buf_set_extmark(0, ns, 2, 0, {})
-      -- Get extmarks only from line 3.
-      local ms  = api.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
-      -- Get all marks in this buffer + namespace.
-      local all = api.nvim_buf_get_extmarks(0, ns, 0, -1, {})
-      vim.print(ms)
+        local api = vim.api
+        local pos = api.nvim_win_get_cursor(0)
+        local ns  = api.nvim_create_namespace('my-plugin')
+        -- Create new extmark at line 1, column 1.
+        local m1  = api.nvim_buf_set_extmark(0, ns, 0, 0, {})
+        -- Create new extmark at line 3, column 1.
+        local m2  = api.nvim_buf_set_extmark(0, ns, 2, 0, {})
+        -- Get extmarks only from line 3.
+        local ms  = api.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
+        -- Get all marks in this buffer + namespace.
+        local all = api.nvim_buf_get_extmarks(0, ns, 0, -1, {})
+        vim.print(ms)
 <
 
     Parameters: ~
@@ -3062,6 +3066,7 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
     Example (Lua): buffer-relative float (travels as buffer is scrolled) >lua
         vim.api.nvim_open_win(0, false,
           {relative='win', width=12, height=3, bufpos={100,10}})
+        })
 <
 
     Attributes: ~
@@ -3340,9 +3345,9 @@ nvim_create_autocmd({event}, {*opts})                  *nvim_create_autocmd()*
         })
 <
 
-    Note: `pattern` is NOT automatically expanded (unlike with |:autocmd|), thus names like
-    "$HOME" and "~" must be expanded explicitly: >lua
-      pattern = vim.fn.expand("~") .. "/some/path/*.py"
+    Note: `pattern` is NOT automatically expanded (unlike with |:autocmd|),
+    thus names like "$HOME" and "~" must be expanded explicitly: >lua
+        pattern = vim.fn.expand("~") .. "/some/path/*.py"
 <
 
     Parameters: ~
@@ -3447,17 +3452,17 @@ nvim_get_autocmds({*opts})                               *nvim_get_autocmds()*
     Get all autocommands that match the corresponding {opts}.
 
     These examples will get autocommands matching ALL the given criteria: >lua
-      -- Matches all criteria
-      autocommands = vim.api.nvim_get_autocmds({
-        group = "MyGroup",
-        event = {"BufEnter", "BufWinEnter"},
-        pattern = {"*.c", "*.h"}
-      })
-
-      -- All commands from one group
-      autocommands = vim.api.nvim_get_autocmds({
-        group = "MyGroup",
-      })
+        -- Matches all criteria
+        autocommands = vim.api.nvim_get_autocmds({
+          group = "MyGroup",
+          event = {"BufEnter", "BufWinEnter"},
+          pattern = {"*.c", "*.h"}
+        })
+
+        -- All commands from one group
+        autocommands = vim.api.nvim_get_autocmds({
+          group = "MyGroup",
+        })
 <
 
     NOTE: When multiple patterns or events are provided, it will find all the
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 0ed537c248..71c16659eb 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -238,7 +238,7 @@ Docstring format:
   `---@see`, `---@param`, `---@returns`
 - Limited markdown is supported.
   - List-items start with `-` (useful to nest or "indent")
-- Use `<pre>` for code samples.
+- Use ``` for code samples.
   Code samples can be annotated as `vim` or `lua`
 - Use `@nodoc` to prevent documentation generation.
 - Files which has `@meta` are only used for typing and documentation.
@@ -250,12 +250,13 @@ vim.paste in runtime/lua/vim/_editor.lua like this: >
     --- (such as the |TUI|) pastes text into the editor.
     ---
     --- Example: To remove ANSI color codes when pasting:
-    --- <pre>lua
+    ---
+    --- ```lua
     --- vim.paste = (function()
     ---   local overridden = vim.paste
     ---   ...
     --- end)()
-    --- </pre>
+    --- ```
     ---
     ---@see |paste|
     ---
diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index 866c32722a..e9ca9ee347 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -359,13 +359,11 @@ config({opts}, {namespace})                          *vim.diagnostic.config()*
     followed by namespace configuration, and finally global configuration.
 
     For example, if a user enables virtual text globally with >lua
-
-       vim.diagnostic.config({ virtual_text = true })
+        vim.diagnostic.config({ virtual_text = true })
 <
 
     and a diagnostic producer sets diagnostics with >lua
-
-       vim.diagnostic.set(ns, 0, diagnostics, { virtual_text = false })
+        vim.diagnostic.set(ns, 0, diagnostics, { virtual_text = false })
 <
 
     then virtual text will not be enabled for those diagnostics.
@@ -608,16 +606,14 @@ match({str}, {pat}, {groups}, {severity_map}, {defaults})
     Parse a diagnostic from a string.
 
     For example, consider a line of output from a linter: >
-
-     WARNING filename:27:3: Variable 'foo' does not exist
+        WARNING filename:27:3: Variable 'foo' does not exist
 <
 
     This can be parsed into a diagnostic |diagnostic-structure| with: >lua
-
-       local s = "WARNING filename:27:3: Variable 'foo' does not exist"
-       local pattern = "^(%w+) %w+:(%d+):(%d+): (.+)$"
-       local groups = { "severity", "lnum", "col", "message" }
-       vim.diagnostic.match(s, pattern, groups, { WARNING = vim.diagnostic.WARN })
+        local s = "WARNING filename:27:3: Variable 'foo' does not exist"
+        local pattern = "^(%w+) %w+:(%d+):(%d+): (.+)$"
+        local groups = { "severity", "lnum", "col", "message" }
+        vim.diagnostic.match(s, pattern, groups, { WARNING = vim.diagnostic.WARN })
 <
 
     Parameters: ~
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 29c08fb32d..5103cc223f 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -901,12 +901,11 @@ start({config}, {opts})                                      *vim.lsp.start()*
     the current buffer to the client.
 
     Example: >lua
-
-     vim.lsp.start({
-        name = 'my-server-name',
-        cmd = {'name-of-language-server-executable'},
-        root_dir = vim.fs.dirname(vim.fs.find({'pyproject.toml', 'setup.py'}, { upward = true })[1]),
-     })
+        vim.lsp.start({
+           name = 'my-server-name',
+           cmd = {'name-of-language-server-executable'},
+           root_dir = vim.fs.dirname(vim.fs.find({'pyproject.toml', 'setup.py'}, { upward = true })[1]),
+        })
 <
 
     See |vim.lsp.start_client()| for all available options. The most important
@@ -1078,9 +1077,9 @@ status()                                                    *vim.lsp.status()*
 stop_client({client_id}, {force})                      *vim.lsp.stop_client()*
     Stops a client(s).
 
-    You can also use the `stop()` function on a |vim.lsp.client| object. To stop all clients: >lua
-
-     vim.lsp.stop_client(vim.lsp.get_clients())
+    You can also use the `stop()` function on a |vim.lsp.client| object. To
+    stop all clients: >lua
+        vim.lsp.stop_client(vim.lsp.get_clients())
 <
 
     By default asks the server to shutdown, unless stop was requested already
@@ -1196,10 +1195,10 @@ definition({options})                               *vim.lsp.buf.definition()*
 document_highlight()                        *vim.lsp.buf.document_highlight()*
     Send request to the server to resolve document highlights for the current
     text document position. This request can be triggered by a key mapping or
-    by events such as `CursorHold` , e.g.: >vim
-      autocmd CursorHold  <buffer> lua vim.lsp.buf.document_highlight()
-      autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()
-      autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
+    by events such as `CursorHold`, e.g.: >vim
+        autocmd CursorHold  <buffer> lua vim.lsp.buf.document_highlight()
+        autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()
+        autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
 <
 
     Note: Usage of |vim.lsp.buf.document_highlight()| requires the following
@@ -1242,12 +1241,12 @@ format({options})                                       *vim.lsp.buf.format()*
                      buffer (0).
                    • filter (function|nil): Predicate used to filter clients.
                      Receives a client as argument and must return a boolean.
-                     Clients matching the predicate are included. Example:               • >lua
+                     Clients matching the predicate are included. Example: >lua
 
-               -- Never request typescript-language-server for formatting
-               vim.lsp.buf.format {
-                 filter = function(client) return client.name ~= "tsserver" end
-               }
+                         -- Never request typescript-language-server for formatting
+                         vim.lsp.buf.format {
+                           filter = function(client) return client.name ~= "tsserver" end
+                         }
 <
                    • async boolean|nil If true the method won't block.
                      Defaults to false. Editing the buffer while formatting
@@ -1366,24 +1365,23 @@ on_diagnostic({_}, {result}, {ctx}, {config})
 
     See |vim.diagnostic.config()| for configuration options. Handler-specific
     configuration can be set using |vim.lsp.with()|: >lua
-
-     vim.lsp.handlers["textDocument/diagnostic"] = vim.lsp.with(
-       vim.lsp.diagnostic.on_diagnostic, {
-         -- Enable underline, use default values
-         underline = true,
-         -- Enable virtual text, override spacing to 4
-         virtual_text = {
-           spacing = 4,
-         },
-         -- Use a function to dynamically turn signs off
-         -- and on, using buffer local variables
-         signs = function(namespace, bufnr)
-           return vim.b[bufnr].show_signs == true
-         end,
-         -- Disable a feature
-         update_in_insert = false,
-       }
-     )
+        vim.lsp.handlers["textDocument/diagnostic"] = vim.lsp.with(
+          vim.lsp.diagnostic.on_diagnostic, {
+            -- Enable underline, use default values
+            underline = true,
+            -- Enable virtual text, override spacing to 4
+            virtual_text = {
+              spacing = 4,
+            },
+            -- Use a function to dynamically turn signs off
+            -- and on, using buffer local variables
+            signs = function(namespace, bufnr)
+              return vim.b[bufnr].show_signs == true
+            end,
+            -- Disable a feature
+            update_in_insert = false,
+          }
+        )
 <
 
     Parameters: ~
@@ -1395,24 +1393,23 @@ on_publish_diagnostics({_}, {result}, {ctx}, {config})
 
     See |vim.diagnostic.config()| for configuration options. Handler-specific
     configuration can be set using |vim.lsp.with()|: >lua
-
-     vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
-       vim.lsp.diagnostic.on_publish_diagnostics, {
-         -- Enable underline, use default values
-         underline = true,
-         -- Enable virtual text, override spacing to 4
-         virtual_text = {
-           spacing = 4,
-         },
-         -- Use a function to dynamically turn signs off
-         -- and on, using buffer local variables
-         signs = function(namespace, bufnr)
-           return vim.b[bufnr].show_signs == true
-         end,
-         -- Disable a feature
-         update_in_insert = false,
-       }
-     )
+        vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
+          vim.lsp.diagnostic.on_publish_diagnostics, {
+            -- Enable underline, use default values
+            underline = true,
+            -- Enable virtual text, override spacing to 4
+            virtual_text = {
+              spacing = 4,
+            },
+            -- Use a function to dynamically turn signs off
+            -- and on, using buffer local variables
+            signs = function(namespace, bufnr)
+              return vim.b[bufnr].show_signs == true
+            end,
+            -- Disable a feature
+            update_in_insert = false,
+          }
+        )
 <
 
     Parameters: ~
@@ -1457,7 +1454,7 @@ refresh()                                         *vim.lsp.codelens.refresh()*
     It is recommended to trigger this using an autocmd or via keymap.
 
     Example: >vim
-      autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh()
+        autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh()
 <
 
 run()                                                 *vim.lsp.codelens.run()*
@@ -1534,8 +1531,7 @@ start({bufnr}, {client_id}, {opts})          *vim.lsp.semantic_tokens.start()*
     server that supports it, you can delete the semanticTokensProvider table
     from the {server_capabilities} of your client in your |LspAttach| callback
     or your configuration's `on_attach` callback: >lua
-
-       client.server_capabilities.semanticTokensProvider = nil
+        client.server_capabilities.semanticTokensProvider = nil
 <
 
     Parameters: ~
@@ -1565,15 +1561,14 @@ Lua module: vim.lsp.handlers                                    *lsp-handlers*
 
 hover({_}, {result}, {ctx}, {config})               *vim.lsp.handlers.hover()*
     |lsp-handler| for the method "textDocument/hover" >lua
-
-       vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
-         vim.lsp.handlers.hover, {
-           -- Use a sharp border with `FloatBorder` highlights
-           border = "single",
-           -- add the title in hover float window
-           title = "hover"
-         }
-       )
+        vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
+          vim.lsp.handlers.hover, {
+            -- Use a sharp border with `FloatBorder` highlights
+            border = "single",
+            -- add the title in hover float window
+            title = "hover"
+          }
+        )
 <
 
     Parameters: ~
@@ -1585,18 +1580,20 @@ hover({_}, {result}, {ctx}, {config})               *vim.lsp.handlers.hover()*
 
                                            *vim.lsp.handlers.signature_help()*
 signature_help({_}, {result}, {ctx}, {config})
-    |lsp-handler| for the method "textDocument/signatureHelp". The active
-    parameter is highlighted with |hl-LspSignatureActiveParameter|. >lua
-
-       vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
-         vim.lsp.handlers.signature_help, {
-           -- Use a sharp border with `FloatBorder` highlights
-           border = "single"
-         }
-       )
+    |lsp-handler| for the method "textDocument/signatureHelp".
+
+    The active parameter is highlighted with |hl-LspSignatureActiveParameter|. >lua
+        vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
+          vim.lsp.handlers.signature_help, {
+            -- Use a sharp border with `FloatBorder` highlights
+            border = "single"
+          }
+        )
 <
 
     Parameters: ~
+      • {result}  (table) Response from the language server
+      • {ctx}     (table) Client context
       • {config}  (table) Configuration table.
                   • border: (default=nil)
                     • Add borders to the floating window
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index c7f5a292e7..6cfec45523 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -582,17 +582,20 @@ VIM.HIGHLIGHT                                                  *vim.highlight*
 
 Nvim includes a function for highlighting a selection on yank.
 
-To enable it, add the following to your `init.vim` : >vim
+To enable it, add the following to your `init.vim`: >vim
     au TextYankPost * silent! lua vim.highlight.on_yank()
+
 <
 
 You can customize the highlight group and the duration of the highlight
 via: >vim
     au TextYankPost * silent! lua vim.highlight.on_yank {higroup="IncSearch", timeout=150}
+
 <
 
 If you want to exclude visual selections from highlighting on yank, use: >vim
     au TextYankPost * silent! lua vim.highlight.on_yank {on_visual=false}
+
 <
 
 vim.highlight.on_yank({opts})                        *vim.highlight.on_yank()*
@@ -688,19 +691,18 @@ vim.diff({a}, {b}, {opts})                                        *vim.diff()*
     either directly or via callback arguments, are 1-based.
 
     Examples: >lua
+        vim.diff('a\n', 'b\nc\n')
+        -- =>
+        -- @@ -1 +1,2 @@
+        -- -a
+        -- +b
+        -- +c
 
-         vim.diff('a\n', 'b\nc\n')
-         -- =>
-         -- @ -1 +1,2 @
-         -- -a
-         -- +b
-         -- +c
-
-         vim.diff('a\n', 'b\nc\n', {result_type = 'indices'})
-         -- =>
-         -- {
-         --   {1, 1, 1, 2}
-         -- }
+        vim.diff('a\n', 'b\nc\n', {result_type = 'indices'})
+        -- =>
+        -- {
+        --   {1, 1, 1, 2}
+        -- }
 <
 
     Parameters: ~
@@ -781,16 +783,18 @@ vim.json.decode({str}, {opts})                             *vim.json.decode()*
     • Decodes empty array as `{}` (empty Lua table).
 
     Example: >lua
-
-     :lua vim.print(vim.json.decode('{"bar":[],"foo":{},"zub":null}'))
-     --> { bar = {}, foo = vim.empty_dict(), zub = vim.NIL }
-
-    < Parameters: ~ • {str} Stringified JSON data. • {opts} Options map keys: •
-    luanil: { object: bool, array: bool } • `luanil.object=true` converts `null` in JSON objects to Lua `nil` instead of `vim.NIL` . • `luanil.array=true` converts `null` in JSON arrays to Lua `nil` instead of `vim.NIL` .
+        vim.print(vim.json.decode('{"bar":[],"foo":{},"zub":null}'))
+        -- { bar = {}, foo = vim.empty_dict(), zub = vim.NIL }
+<
 
     Parameters: ~
-      • {str}   (string)
-      • {opts}  table<string,|nil any>
+      • {str}   (string) Stringified JSON data.
+      • {opts}  table<string,any>|nil Options table with keys:
+                • luanil: (table) Table with keys:
+                  • object: (boolean) When true, converts `null` in JSON
+                    objects to Lua `nil` instead of |vim.NIL|.
+                  • array: (boolean) When true, converts `null` in JSON arrays
+                    to Lua `nil` instead of |vim.NIL|.
 
     Return: ~
         any
@@ -817,12 +821,11 @@ vim.spell.check({str})                                     *vim.spell.check()*
     the buffer. Consider calling this with |nvim_buf_call()|.
 
     Example: >lua
-
-         vim.spell.check("the quik brown fox")
-         -- =>
-         -- {
-         --     {'quik', 'bad', 5}
-         -- }
+        vim.spell.check("the quik brown fox")
+        -- =>
+        -- {
+        --     {'quik', 'bad', 5}
+        -- }
 <
 
     Parameters: ~
@@ -978,14 +981,13 @@ vim.str_utf_end({str}, {index})                            *vim.str_utf_end()*
     (character) that {index} points to.
 
     Examples: >lua
+        -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
 
-     -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
-
-     -- Returns 0 because the index is pointing at the last byte of a character
-     vim.str_utf_end('æ', 2)
+        -- Returns 0 because the index is pointing at the last byte of a character
+        vim.str_utf_end('æ', 2)
 
-     -- Returns 1 because the index is pointing at the penultimate byte of a character
-     vim.str_utf_end('æ', 1)
+        -- Returns 1 because the index is pointing at the penultimate byte of a character
+        vim.str_utf_end('æ', 1)
 <
 
     Parameters: ~
@@ -1015,14 +1017,13 @@ vim.str_utf_start({str}, {index})                        *vim.str_utf_start()*
     character.
 
     Examples: >lua
+        -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
 
-     -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
+        -- Returns 0 because the index is pointing at the first byte of a character
+        vim.str_utf_start('æ', 1)
 
-     -- Returns 0 because the index is pointing at the first byte of a character
-     vim.str_utf_start('æ', 1)
-
-     -- Returns -1 because the index is pointing at the second byte of a character
-     vim.str_utf_start('æ', 2)
+        -- Returns -1 because the index is pointing at the second byte of a character
+        vim.str_utf_start('æ', 2)
 <
 
     Parameters: ~
@@ -1080,20 +1081,19 @@ vim.ui_attach({ns}, {options}, {callback})                   *vim.ui_attach()*
     likewise experimental).
 
     Example (stub for a |ui-popupmenu| implementation): >lua
-
-       ns = vim.api.nvim_create_namespace('my_fancy_pum')
-
-       vim.ui_attach(ns, {ext_popupmenu=true}, function(event, ...)
-         if event == "popupmenu_show" then
-           local items, selected, row, col, grid = ...
-           print("display pum ", #items)
-         elseif event == "popupmenu_select" then
-           local selected = ...
-           print("selected", selected)
-         elseif event == "popupmenu_hide" then
-           print("FIN")
-         end
-       end)
+        ns = vim.api.nvim_create_namespace('my_fancy_pum')
+
+        vim.ui_attach(ns, {ext_popupmenu=true}, function(event, ...)
+          if event == "popupmenu_show" then
+            local items, selected, row, col, grid = ...
+            print("display pum ", #items)
+          elseif event == "popupmenu_select" then
+            local selected = ...
+            print("selected", selected)
+          elseif event == "popupmenu_hide" then
+            print("FIN")
+          end
+        end)
 <
 
     Parameters: ~
@@ -1116,27 +1116,26 @@ vim.wait({time}, {callback}, {interval}, {fast_only})             *vim.wait()*
     time.
 
     Examples: >lua
+        ---
+        -- Wait for 100 ms, allowing other events to process
+        vim.wait(100, function() end)
 
-     ---
-     -- Wait for 100 ms, allowing other events to process
-     vim.wait(100, function() end)
+        ---
+        -- Wait for 100 ms or until global variable set.
+        vim.wait(100, function() return vim.g.waiting_for_var end)
 
-     ---
-     -- Wait for 100 ms or until global variable set.
-     vim.wait(100, function() return vim.g.waiting_for_var end)
+        ---
+        -- Wait for 1 second or until global variable set, checking every ~500 ms
+        vim.wait(1000, function() return vim.g.waiting_for_var end, 500)
 
-     ---
-     -- Wait for 1 second or until global variable set, checking every ~500 ms
-     vim.wait(1000, function() return vim.g.waiting_for_var end, 500)
+        ---
+        -- Schedule a function to set a value in 100ms
+        vim.defer_fn(function() vim.g.timer_result = true end, 100)
 
-     ---
-     -- Schedule a function to set a value in 100ms
-     vim.defer_fn(function() vim.g.timer_result = true end, 100)
-
-     -- Would wait ten seconds if results blocked. Actually only waits  100 ms
-     if vim.wait(10000, function() return vim.g.timer_result end) then
-       print('Only waiting a little bit of time!')
-     end
+        -- Would wait ten seconds if results blocked. Actually only waits  100 ms
+        if vim.wait(10000, function() return vim.g.timer_result end) then
+          print('Only waiting a little bit of time!')
+        end
 <
 
     Parameters: ~
@@ -1171,6 +1170,7 @@ Lua list: >lua
     local list = { 1, 2, 3 }
     vim.fn.remove(list, 0)
     vim.print(list)  --> "{ 1, 2, 3 }"
+
 <
 
 vim.call({func}, {...})                                           *vim.call()*
@@ -1430,13 +1430,12 @@ vim.bo                                                                *vim.bo*
         print(vim.bo.baz)                 -- error: invalid key
 <
 
-    Parameters: ~
-      • {bufnr}  (integer|nil)
-
 vim.env                                                              *vim.env*
     Environment variables defined in the editor session. See |expand-env| and
     |:let-environment| for the Vimscript behavior. Invalid or unset key
-    returns `nil` . Example: >lua
+    returns `nil`.
+
+    Example: >lua
         vim.env.FOO = 'bar'
         print(vim.env.TERM)
 <
@@ -1497,31 +1496,30 @@ vim.cmd                                                            *vim.cmd()*
     callable function to the command.
 
     Example: >lua
+        vim.cmd('echo 42')
+        vim.cmd([[
+          augroup My_group
+            autocmd!
+            autocmd FileType c setlocal cindent
+          augroup END
+        ]])
 
-       vim.cmd('echo 42')
-       vim.cmd([[
-         augroup My_group
-           autocmd!
-           autocmd FileType c setlocal cindent
-         augroup END
-       ]])
+        -- Ex command :echo "foo"
+        -- Note string literals need to be double quoted.
+        vim.cmd('echo "foo"')
+        vim.cmd { cmd = 'echo', args = { '"foo"' } }
+        vim.cmd.echo({ args = { '"foo"' } })
+        vim.cmd.echo('"foo"')
 
-       -- Ex command :echo "foo"
-       -- Note string literals need to be double quoted.
-       vim.cmd('echo "foo"')
-       vim.cmd { cmd = 'echo', args = { '"foo"' } }
-       vim.cmd.echo({ args = { '"foo"' } })
-       vim.cmd.echo('"foo"')
+        -- Ex command :write! myfile.txt
+        vim.cmd('write! myfile.txt')
+        vim.cmd { cmd = 'write', args = { "myfile.txt" }, bang = true }
+        vim.cmd.write { args = { "myfile.txt" }, bang = true }
+        vim.cmd.write { "myfile.txt", bang = true }
 
-       -- Ex command :write! myfile.txt
-       vim.cmd('write! myfile.txt')
-       vim.cmd { cmd = 'write', args = { "myfile.txt" }, bang = true }
-       vim.cmd.write { args = { "myfile.txt" }, bang = true }
-       vim.cmd.write { "myfile.txt", bang = true }
-
-       -- Ex command :colorscheme blue
-       vim.cmd('colorscheme blue')
-       vim.cmd.colorscheme('blue')
+        -- Ex command :colorscheme blue
+        vim.cmd('colorscheme blue')
+        vim.cmd.colorscheme('blue')
 <
 
     Parameters: ~
@@ -1579,9 +1577,8 @@ vim.keycode({str})                                             *vim.keycode()*
     Translate keycodes.
 
     Example: >lua
-
-       local k = vim.keycode
-       vim.g.mapleader = k'<bs>'
+        local k = vim.keycode
+        vim.g.mapleader = k'<bs>'
 <
 
     Parameters: ~
@@ -1653,16 +1650,15 @@ vim.paste({lines}, {phase})                                      *vim.paste()*
     |TUI|) pastes text into the editor.
 
     Example: To remove ANSI color codes when pasting: >lua
-
-     vim.paste = (function(overridden)
-       return function(lines, phase)
-         for i,line in ipairs(lines) do
-           -- Scrub ANSI color codes from paste input.
-           lines[i] = line:gsub('\27%[[0-9;mK]+', '')
-         end
-         overridden(lines, phase)
-       end
-     end)(vim.paste)
+        vim.paste = (function(overridden)
+          return function(lines, phase)
+            for i,line in ipairs(lines) do
+              -- Scrub ANSI color codes from paste input.
+              lines[i] = line:gsub('\27%[[0-9;mK]+', '')
+            end
+            overridden(lines, phase)
+          end
+        end)(vim.paste)
 <
 
     Parameters: ~
@@ -1684,8 +1680,7 @@ vim.print({...})                                                 *vim.print()*
     "Pretty prints" the given arguments and returns them unmodified.
 
     Example: >lua
-
-       local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
+        local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
 <
 
     Return: ~
@@ -1737,20 +1732,19 @@ vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
     Run a system command
 
     Examples: >lua
+        local on_exit = function(obj)
+          print(obj.code)
+          print(obj.signal)
+          print(obj.stdout)
+          print(obj.stderr)
+        end
 
-       local on_exit = function(obj)
-         print(obj.code)
-         print(obj.signal)
-         print(obj.stdout)
-         print(obj.stderr)
-       end
-
-       -- Run asynchronously
-       vim.system({'echo', 'hello'}, { text = true }, on_exit)
+        -- Run asynchronously
+        vim.system({'echo', 'hello'}, { text = true }, on_exit)
 
-       -- Run synchronously
-       local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
-       -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
+        -- Run synchronously
+        local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
+        -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
 <
 
     See |uv.spawn()| for more details.
@@ -1894,12 +1888,9 @@ vim.defaulttable({create})                                *vim.defaulttable()*
 
     If {create} is `nil`, this will create a defaulttable whose constructor
     function is this function, effectively allowing to create nested tables on
-    the fly:
-
-    >lua
-
-     local a = vim.defaulttable()
-     a.b.c = 1
+    the fly: >lua
+        local a = vim.defaulttable()
+        a.b.c = 1
 <
 
     Parameters: ~
@@ -1924,18 +1915,16 @@ vim.gsplit({s}, {sep}, {opts})                                  *vim.gsplit()*
     in "lazy" fashion (as opposed to |vim.split()| which is "eager").
 
     Example: >lua
-
-       for s in vim.gsplit(':aa::b:', ':', {plain=true}) do
-         print(s)
-       end
+        for s in vim.gsplit(':aa::b:', ':', {plain=true}) do
+          print(s)
+        end
 <
 
     If you want to also inspect the separator itself (instead of discarding
     it), use |string.gmatch()|. Example: >lua
-
-       for word, num in ('foo111bar222'):gmatch('([^0-9]*)(d*)') do
-         print(('word: s num: s'):format(word, num))
-       end
+        for word, num in ('foo111bar222'):gmatch('([^0-9]*)(%d*)') do
+          print(('word: %s num: %s'):format(word, num))
+        end
 <
 
     Parameters: ~
@@ -2021,22 +2010,20 @@ vim.pesc({s})                                                     *vim.pesc()*
 
 vim.ringbuf({size})                                            *vim.ringbuf()*
     Create a ring buffer limited to a maximal number of items. Once the buffer
-    is full, adding a new entry overrides the oldest entry.
->
-
-    local ringbuf = vim.ringbuf(4)
-    ringbuf:push("a")
-    ringbuf:push("b")
-    ringbuf:push("c")
-    ringbuf:push("d")
-    ringbuf:push("e")    -- overrides "a"
-    print(ringbuf:pop()) -- returns "b"
-    print(ringbuf:pop()) -- returns "c"
-
-    -- Can be used as iterator. Pops remaining items:
-    for val in ringbuf do
-      print(val)
-    end
+    is full, adding a new entry overrides the oldest entry. >lua
+        local ringbuf = vim.ringbuf(4)
+        ringbuf:push("a")
+        ringbuf:push("b")
+        ringbuf:push("c")
+        ringbuf:push("d")
+        ringbuf:push("e")    -- overrides "a"
+        print(ringbuf:pop()) -- returns "b"
+        print(ringbuf:pop()) -- returns "c"
+
+        -- Can be used as iterator. Pops remaining items:
+        for val in ringbuf do
+          print(val)
+        end
 <
 
     Returns a Ringbuf instance with the following methods:
@@ -2090,11 +2077,10 @@ vim.split({s}, {sep}, {opts})                                    *vim.split()*
     a table (unlike |vim.gsplit()|).
 
     Examples: >lua
-
-      split(":aa::b:", ":")                   --> {'','aa','','b',''}
-      split("axaby", "ab?")                   --> {'','x','y'}
-      split("x*yz*o", "*", {plain=true})      --> {'x','yz','o'}
-      split("|x|y|z|", "|", {trimempty=true}) --> {'x', 'y', 'z'}
+        split(":aa::b:", ":")                   --> {'','aa','','b',''}
+        split("axaby", "ab?")                   --> {'','x','y'}
+        split("x*yz*o", "*", {plain=true})      --> {'x','yz','o'}
+        split("|x|y|z|", "|", {trimempty=true}) --> {'x', 'y', 'z'}
 <
 
     Parameters: ~
@@ -2137,11 +2123,10 @@ vim.tbl_contains({t}, {value}, {opts})                    *vim.tbl_contains()*
     a predicate that is checked for each value.
 
     Example: >lua
-
-      vim.tbl_contains({ 'a', { 'b', 'c' } }, function(v)
-        return vim.deep_equal(v, { 'b', 'c' })
-      end, { predicate = true })
-      -- true
+        vim.tbl_contains({ 'a', { 'b', 'c' } }, function(v)
+          return vim.deep_equal(v, { 'b', 'c' })
+        end, { predicate = true })
+        -- true
 <
 
     Parameters: ~
@@ -2158,12 +2143,9 @@ vim.tbl_contains({t}, {value}, {opts})                    *vim.tbl_contains()*
       • |vim.list_contains()| for checking values in list-like tables
 
 vim.tbl_count({t})                                           *vim.tbl_count()*
-    Counts the number of non-nil values in table `t`.
-
-    >lua
-
-     vim.tbl_count({ a=1, b=2 })  --> 2
-     vim.tbl_count({ 1, 2 })      --> 2
+    Counts the number of non-nil values in table `t`. >lua
+        vim.tbl_count({ a=1, b=2 })  --> 2
+        vim.tbl_count({ 1, 2 })      --> 2
 <
 
     Parameters: ~
@@ -2237,9 +2219,8 @@ vim.tbl_get({o}, {...})                                        *vim.tbl_get()*
     arguments. Return `nil` if the key does not exist.
 
     Examples: >lua
-
-      vim.tbl_get({ key = { nested_key = true }}, 'key', 'nested_key') == true
-      vim.tbl_get({ key = {}}, 'key', 'nested_key') == nil
+        vim.tbl_get({ key = { nested_key = true }}, 'key', 'nested_key') == true
+        vim.tbl_get({ key = {}}, 'key', 'nested_key') == nil
 <
 
     Parameters: ~
@@ -2340,36 +2321,33 @@ vim.validate({opt})                                           *vim.validate()*
     Validates a parameter specification (types and values).
 
     Usage example: >lua
-
-      function user.new(name, age, hobbies)
-        vim.validate{
-          name={name, 'string'},
-          age={age, 'number'},
-          hobbies={hobbies, 'table'},
-        }
-        ...
-      end
+        function user.new(name, age, hobbies)
+          vim.validate{
+            name={name, 'string'},
+            age={age, 'number'},
+            hobbies={hobbies, 'table'},
+          }
+          ...
+        end
 <
 
     Examples with explicit argument values (can be run directly): >lua
+        vim.validate{arg1={{'foo'}, 'table'}, arg2={'foo', 'string'}}
+           --> NOP (success)
 
-      vim.validate{arg1={{'foo'}, 'table'}, arg2={'foo', 'string'}}
-         --> NOP (success)
-
-      vim.validate{arg1={1, 'table'}}
-         --> error('arg1: expected table, got number')
+        vim.validate{arg1={1, 'table'}}
+           --> error('arg1: expected table, got number')
 
-      vim.validate{arg1={3, function(a) return (a % 2) == 0 end, 'even number'}}
-         --> error('arg1: expected even number, got 3')
+        vim.validate{arg1={3, function(a) return (a % 2) == 0 end, 'even number'}}
+           --> error('arg1: expected even number, got 3')
 <
 
     If multiple types are valid they can be given as a list. >lua
+        vim.validate{arg1={{'foo'}, {'table', 'string'}}, arg2={'foo', {'table', 'string'}}}
+        -- NOP (success)
 
-      vim.validate{arg1={{'foo'}, {'table', 'string'}}, arg2={'foo', {'table', 'string'}}}
-         --> NOP (success)
-
-      vim.validate{arg1={1, {'string', 'table'}}}
-         --> error('arg1: expected string|table, got number')
+        vim.validate{arg1={1, {'string', 'table'}}}
+        -- error('arg1: expected string|table, got number')
 <
 
     Parameters: ~
@@ -2506,10 +2484,9 @@ vim.ui.input({opts}, {on_confirm})                            *vim.ui.input()*
     work until `on_confirm`.
 
     Example: >lua
-
-     vim.ui.input({ prompt = 'Enter value for shiftwidth: ' }, function(input)
-         vim.o.shiftwidth = tonumber(input)
-     end)
+        vim.ui.input({ prompt = 'Enter value for shiftwidth: ' }, function(input)
+            vim.o.shiftwidth = tonumber(input)
+        end)
 <
 
     Parameters: ~
@@ -2535,10 +2512,9 @@ vim.ui.open({path})                                            *vim.ui.open()*
     Expands "~/" and environment variables in filesystem paths.
 
     Examples: >lua
-
-     vim.ui.open("https://neovim.io/")
-     vim.ui.open("~/path/to/file")
-     vim.ui.open("$VIMRUNTIME")
+        vim.ui.open("https://neovim.io/")
+        vim.ui.open("~/path/to/file")
+        vim.ui.open("$VIMRUNTIME")
 <
 
     Parameters: ~
@@ -2556,19 +2532,18 @@ vim.ui.select({items}, {opts}, {on_choice})                  *vim.ui.select()*
     (potentially asynchronous) work until `on_choice`.
 
     Example: >lua
-
-     vim.ui.select({ 'tabs', 'spaces' }, {
-         prompt = 'Select tabs or spaces:',
-         format_item = function(item)
-             return "I'd like to choose " .. item
-         end,
-     }, function(choice)
-         if choice == 'spaces' then
-             vim.o.expandtab = true
-         else
-             vim.o.expandtab = false
-         end
-     end)
+        vim.ui.select({ 'tabs', 'spaces' }, {
+            prompt = 'Select tabs or spaces:',
+            format_item = function(item)
+                return "I'd like to choose " .. item
+            end,
+        }, function(choice)
+            if choice == 'spaces' then
+                vim.o.expandtab = true
+            else
+                vim.o.expandtab = false
+            end
+        end)
 <
 
     Parameters: ~
@@ -2620,58 +2595,56 @@ vim.filetype.add({filetypes})                             *vim.filetype.add()*
     See $VIMRUNTIME/lua/vim/filetype.lua for more examples.
 
     Example: >lua
-
-      vim.filetype.add({
-        extension = {
-          foo = 'fooscript',
-          bar = function(path, bufnr)
-            if some_condition() then
-              return 'barscript', function(bufnr)
-                -- Set a buffer variable
-                vim.b[bufnr].barscript_version = 2
+        vim.filetype.add({
+          extension = {
+            foo = 'fooscript',
+            bar = function(path, bufnr)
+              if some_condition() then
+                return 'barscript', function(bufnr)
+                  -- Set a buffer variable
+                  vim.b[bufnr].barscript_version = 2
+                end
               end
-            end
-            return 'bar'
-          end,
-        },
-        filename = {
-          ['.foorc'] = 'toml',
-          ['/etc/foo/config'] = 'toml',
-        },
-        pattern = {
-          ['.*/etc/foo/.*'] = 'fooscript',
-          -- Using an optional priority
-          ['.*/etc/foo/.*%.conf'] = { 'dosini', { priority = 10 } },
-          -- A pattern containing an environment variable
-          ['${XDG_CONFIG_HOME}/foo/git'] = 'git',
-          ['README.(a+)$'] = function(path, bufnr, ext)
-            if ext == 'md' then
-              return 'markdown'
-            elseif ext == 'rst' then
-              return 'rst'
-            end
-          end,
-        },
-      })
+              return 'bar'
+            end,
+          },
+          filename = {
+            ['.foorc'] = 'toml',
+            ['/etc/foo/config'] = 'toml',
+          },
+          pattern = {
+            ['.*&zwj;/etc/foo/.*'] = 'fooscript',
+            -- Using an optional priority
+            ['.*&zwj;/etc/foo/.*%.conf'] = { 'dosini', { priority = 10 } },
+            -- A pattern containing an environment variable
+            ['${XDG_CONFIG_HOME}/foo/git'] = 'git',
+            ['README.(%a+)$'] = function(path, bufnr, ext)
+              if ext == 'md' then
+                return 'markdown'
+              elseif ext == 'rst' then
+                return 'rst'
+              end
+            end,
+          },
+        })
 <
 
     To add a fallback match on contents, use >lua
-
-     vim.filetype.add {
-       pattern = {
-         ['.*'] = {
-           priority = -math.huge,
-           function(path, bufnr)
-             local content = vim.api.nvim_buf_get_lines(bufnr, 0, 1, false)[1] or ''
-             if vim.regex([[^#!.*\<mine\>]]):match_str(content) ~= nil then
-               return 'mine'
-             elseif vim.regex([[\<drawing\>]]):match_str(content) ~= nil then
-               return 'drawing'
-             end
-           end,
-         },
-       },
-     }
+        vim.filetype.add {
+          pattern = {
+            ['.*'] = {
+              priority = -math.huge,
+              function(path, bufnr)
+                local content = vim.api.nvim_buf_get_lines(bufnr, 0, 1, false)[1] or ''
+                if vim.regex([[^#!.*\\<mine\\>]]):match_str(content) ~= nil then
+                  return 'mine'
+                elseif vim.regex([[\\<drawing\\>]]):match_str(content) ~= nil then
+                  return 'drawing'
+                end
+              end,
+            },
+          },
+        }
 <
 
     Parameters: ~
@@ -2687,8 +2660,7 @@ vim.filetype.get_option({filetype}, {option})
     files.
 
     Example: >lua
-
-       vim.filetype.get_option('vim', 'commentstring')
+        vim.filetype.get_option('vim', 'commentstring')
 <
 
     Note: this uses |nvim_get_option_value()| but caches the result. This
@@ -2717,21 +2689,18 @@ vim.filetype.match({args})                              *vim.filetype.match()*
     the filetype.
 
     Each of the three options is specified using a key to the single argument
-    of this function. Example:
+    of this function. Example: >lua
+        -- Using a buffer number
+        vim.filetype.match({ buf = 42 })
 
-    >lua
+        -- Override the filename of the given buffer
+        vim.filetype.match({ buf = 42, filename = 'foo.c' })
 
-       -- Using a buffer number
-       vim.filetype.match({ buf = 42 })
+        -- Using a filename without a buffer
+        vim.filetype.match({ filename = 'main.lua' })
 
-       -- Override the filename of the given buffer
-       vim.filetype.match({ buf = 42, filename = 'foo.c' })
-
-       -- Using a filename without a buffer
-       vim.filetype.match({ filename = 'main.lua' })
-
-       -- Using file contents
-       vim.filetype.match({ contents = {'#!/usr/bin/env bash'} })
+        -- Using file contents
+        vim.filetype.match({ contents = {'#!/usr/bin/env bash'} })
 <
 
     Parameters: ~
@@ -2762,10 +2731,9 @@ Lua module: vim.keymap                                            *vim.keymap*
 
 vim.keymap.del({modes}, {lhs}, {opts})                      *vim.keymap.del()*
     Remove an existing mapping. Examples: >lua
+        vim.keymap.del('n', 'lhs')
 
-       vim.keymap.del('n', 'lhs')
-
-       vim.keymap.del({'n', 'i', 'v'}, '<leader>w', { buffer = 5 })
+        vim.keymap.del({'n', 'i', 'v'}, '<leader>w', { buffer = 5 })
 <
 
     Parameters: ~
@@ -2778,19 +2746,18 @@ vim.keymap.del({modes}, {lhs}, {opts})                      *vim.keymap.del()*
 
 vim.keymap.set({mode}, {lhs}, {rhs}, {opts})                *vim.keymap.set()*
     Adds a new |mapping|. Examples: >lua
-
-       -- Map to a Lua function:
-       vim.keymap.set('n', 'lhs', function() print("real lua function") end)
-       -- Map to multiple modes:
-       vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer = true })
-       -- Buffer-local mapping:
-       vim.keymap.set('n', '<leader>w', "<cmd>w<cr>", { silent = true, buffer = 5 })
-       -- Expr mapping:
-       vim.keymap.set('i', '<Tab>', function()
-         return vim.fn.pumvisible() == 1 and "<C-n>" or "<Tab>"
-       end, { expr = true })
-       -- <Plug> mapping:
-       vim.keymap.set('n', '[%', '<Plug>(MatchitNormalMultiBackward)')
+        -- Map to a Lua function:
+        vim.keymap.set('n', 'lhs', function() print("real lua function") end)
+        -- Map to multiple modes:
+        vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer = true })
+        -- Buffer-local mapping:
+        vim.keymap.set('n', '<leader>w', "<cmd>w<cr>", { silent = true, buffer = 5 })
+        -- Expr mapping:
+        vim.keymap.set('i', '<Tab>', function()
+          return vim.fn.pumvisible() == 1 and "<C-n>" or "<Tab>"
+        end, { expr = true })
+        -- <Plug> mapping:
+        vim.keymap.set('n', '[%%', '<Plug>(MatchitNormalMultiBackward)')
 <
 
     Parameters: ~
@@ -2871,24 +2838,23 @@ vim.fs.find({names}, {opts})                                   *vim.fs.find()*
     narrow the search to find only that type.
 
     Examples: >lua
+        -- location of Cargo.toml from the current buffer's path
+        local cargo = vim.fs.find('Cargo.toml', {
+          upward = true,
+          stop = vim.uv.os_homedir(),
+          path = vim.fs.dirname(vim.api.nvim_buf_get_name(0)),
+        })
 
-     -- location of Cargo.toml from the current buffer's path
-     local cargo = vim.fs.find('Cargo.toml', {
-       upward = true,
-       stop = vim.uv.os_homedir(),
-       path = vim.fs.dirname(vim.api.nvim_buf_get_name(0)),
-     })
+        -- list all test directories under the runtime directory
+        local test_dirs = vim.fs.find(
+          {'test', 'tst', 'testdir'},
+          {limit = math.huge, type = 'directory', path = './runtime/'}
+        )
 
-     -- list all test directories under the runtime directory
-     local test_dirs = vim.fs.find(
-       {'test', 'tst', 'testdir'},
-       {limit = math.huge, type = 'directory', path = './runtime/'}
-     )
-
-     -- get all files ending with .cpp or .hpp inside lib/
-     local cpp_hpp = vim.fs.find(function(name, path)
-       return name:match('.*%.[ch]pp$') and path:match('[/\\]lib$')
-     end, {limit = math.huge, type = 'file'})
+        -- get all files ending with .cpp or .hpp inside lib/
+        local cpp_hpp = vim.fs.find(function(name, path)
+          return name:match('.*%.[ch]pp$') and path:match('[/\\\\]lib$')
+        end, {limit = math.huge, type = 'file'})
 <
 
     Parameters: ~
@@ -2934,15 +2900,14 @@ vim.fs.normalize({path}, {opts})                          *vim.fs.normalize()*
     variables are also expanded.
 
     Examples: >lua
+        vim.fs.normalize('C:\\\\Users\\\\jdoe')
+        -- 'C:/Users/jdoe'
 
-       vim.fs.normalize('C:\\Users\\jdoe')
-       --> 'C:/Users/jdoe'
-
-       vim.fs.normalize('~/src/neovim')
-       --> '/home/jdoe/src/neovim'
+        vim.fs.normalize('~/src/neovim')
+        -- '/home/jdoe/src/neovim'
 
-       vim.fs.normalize('$XDG_CONFIG_HOME/nvim/init.vim')
-       --> '/Users/jdoe/.config/nvim/init.vim'
+        vim.fs.normalize('$XDG_CONFIG_HOME/nvim/init.vim')
+        -- '/Users/jdoe/.config/nvim/init.vim'
 <
 
     Parameters: ~
@@ -2958,18 +2923,17 @@ vim.fs.parents({start})                                     *vim.fs.parents()*
     Iterate over all the parents of the given path.
 
     Example: >lua
+        local root_dir
+        for dir in vim.fs.parents(vim.api.nvim_buf_get_name(0)) do
+          if vim.fn.isdirectory(dir .. "/.git") == 1 then
+            root_dir = dir
+            break
+          end
+        end
 
-     local root_dir
-     for dir in vim.fs.parents(vim.api.nvim_buf_get_name(0)) do
-       if vim.fn.isdirectory(dir .. "/.git") == 1 then
-         root_dir = dir
-         break
-       end
-     end
-
-     if root_dir then
-       print("Found git repository at", root_dir)
-     end
+        if root_dir then
+          print("Found git repository at", root_dir)
+        end
 <
 
     Parameters: ~
@@ -3033,11 +2997,10 @@ spec. Plugins, and plugin managers, can use this to check available tools
 and dependencies on the current system.
 
 Example: >lua
-
-   local v = vim.version.parse(vim.fn.system({'tmux', '-V'}), {strict=false})
-   if vim.version.gt(v, {3, 2, 0}) then
-     -- ...
-   end
+    local v = vim.version.parse(vim.fn.system({'tmux', '-V'}), {strict=false})
+    if vim.version.gt(v, {3, 2, 0}) then
+      -- ...
+    end
 
 <
 
@@ -3050,34 +3013,33 @@ tested against a version, using |vim.version.range()|.
 
 Supported range specs are shown in the following table. Note: suffixed
 versions (1.2.3-rc1) are not matched. >
-
-   1.2.3             is 1.2.3
-   =1.2.3            is 1.2.3
-   >1.2.3            greater than 1.2.3
-   <1.2.3            before 1.2.3
-   >=1.2.3           at least 1.2.3
-   ~1.2.3            is >=1.2.3 <1.3.0       "reasonably close to 1.2.3"
-   ^1.2.3            is >=1.2.3 <2.0.0       "compatible with 1.2.3"
-   ^0.2.3            is >=0.2.3 <0.3.0       (0.x.x is special)
-   ^0.0.1            is =0.0.1               (0.0.x is special)
-   ^1.2              is >=1.2.0 <2.0.0       (like ^1.2.0)
-   ~1.2              is >=1.2.0 <1.3.0       (like ~1.2.0)
-   ^1                is >=1.0.0 <2.0.0       "compatible with 1"
-   ~1                same                    "reasonably close to 1"
-   1.x               same
-   1.*               same
-   1                 same
-   *                 any version
-   x                 same
-
-   1.2.3 - 2.3.4     is >=1.2.3 <=2.3.4
-
-   Partial right: missing pieces treated as x (2.3 => 2.3.x).
-   1.2.3 - 2.3       is >=1.2.3 <2.4.0
-   1.2.3 - 2         is >=1.2.3 <3.0.0
-
-   Partial left: missing pieces treated as 0 (1.2 => 1.2.0).
-   1.2 - 2.3.0       is 1.2.0 - 2.3.0
+    1.2.3             is 1.2.3
+    =1.2.3            is 1.2.3
+    >1.2.3            greater than 1.2.3
+    <1.2.3            before 1.2.3
+    >=1.2.3           at least 1.2.3
+    ~1.2.3            is >=1.2.3 <1.3.0       "reasonably close to 1.2.3"
+    ^1.2.3            is >=1.2.3 <2.0.0       "compatible with 1.2.3"
+    ^0.2.3            is >=0.2.3 <0.3.0       (0.x.x is special)
+    ^0.0.1            is =0.0.1               (0.0.x is special)
+    ^1.2              is >=1.2.0 <2.0.0       (like ^1.2.0)
+    ~1.2              is >=1.2.0 <1.3.0       (like ~1.2.0)
+    ^1                is >=1.0.0 <2.0.0       "compatible with 1"
+    ~1                same                    "reasonably close to 1"
+    1.x               same
+    1.*               same
+    1                 same
+    *                 any version
+    x                 same
+
+    1.2.3 - 2.3.4     is >=1.2.3 <=2.3.4
+
+    Partial right: missing pieces treated as x (2.3 => 2.3.x).
+    1.2.3 - 2.3       is >=1.2.3 <2.4.0
+    1.2.3 - 2         is >=1.2.3 <3.0.0
+
+    Partial left: missing pieces treated as 0 (1.2 => 1.2.0).
+    1.2 - 2.3.0       is 1.2.0 - 2.3.0
 
 <
 
@@ -3087,15 +3049,14 @@ vim.version.cmp({v1}, {v2})                                *vim.version.cmp()*
     tuple, e.g. `{1, 0, 3}`).
 
     Example: >lua
-
-       if vim.version.cmp({1,0,3}, {0,2,1}) == 0 then
-         -- ...
-       end
-       local v1 = vim.version.parse('1.0.3-pre')
-       local v2 = vim.version.parse('0.2.1')
-       if vim.version.cmp(v1, v2) == 0 then
-         -- ...
-       end
+        if vim.version.cmp({1,0,3}, {0,2,1}) == 0 then
+          -- ...
+        end
+        local v1 = vim.version.parse('1.0.3-pre')
+        local v2 = vim.version.parse('0.2.1')
+        if vim.version.cmp(v1, v2) == 0 then
+          -- ...
+        end
 <
 
     Note: ~
@@ -3150,9 +3111,9 @@ vim.version.lt({v1}, {v2})                                  *vim.version.lt()*
 
 vim.version.parse({version}, {opts})                     *vim.version.parse()*
     Parses a semantic version string and returns a version object which can be
-    used with other `vim.version` functions. For example "1.0.1-rc1+build.2" returns: >
-
-       { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
+    used with other `vim.version` functions. For example "1.0.1-rc1+build.2"
+    returns: >
+        { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
 <
 
     Parameters: ~
@@ -3171,29 +3132,26 @@ vim.version.parse({version}, {opts})                     *vim.version.parse()*
 
 vim.version.range({spec})                                *vim.version.range()*
     Parses a semver |version-range| "spec" and returns a range object: >
-
-       {
-         from: Version
-         to: Version
-         has(v: string|Version)
-       }
+        {
+          from: Version
+          to: Version
+          has(v: string|Version)
+        }
 <
 
     `:has()` checks if a version is in the range (inclusive `from`, exclusive
     `to`).
 
     Example: >lua
-
-       local r = vim.version.range('1.0.0 - 2.0.0')
-       print(r:has('1.9.9'))       -- true
-       print(r:has('2.0.0'))       -- false
-       print(r:has(vim.version())) -- check against current Nvim version
+        local r = vim.version.range('1.0.0 - 2.0.0')
+        print(r:has('1.9.9'))       -- true
+        print(r:has('2.0.0'))       -- false
+        print(r:has(vim.version())) -- check against current Nvim version
 <
 
     Or use cmp(), eq(), lt(), and gt() to compare `.to` and `.from` directly: >lua
-
-       local r = vim.version.range('1.0.0 - 2.0.0')
-       print(vim.version.gt({1,0,3}, r.from) and vim.version.lt({1,0,3}, r.to))
+        local r = vim.version.range('1.0.0 - 2.0.0')
+        print(vim.version.gt({1,0,3}, r.from) and vim.version.lt({1,0,3}, r.to))
 <
 
     Parameters: ~
@@ -3228,7 +3186,6 @@ iterator runs out of values (for function iterators, this means that the
 first value returned by the function is nil).
 
 Examples: >lua
-
     local it = vim.iter({ 1, 2, 3, 4, 5 })
     it:map(function(v)
       return v * 3
@@ -3275,7 +3232,6 @@ filter({f}, {src}, {...})                                  *vim.iter.filter()*
     Filter a table or iterator.
 
     This is a convenience function that performs: >lua
-
         vim.iter(src):filter(f):totable()
 <
 
@@ -3325,19 +3281,16 @@ Iter:enumerate()                                            *Iter:enumerate()*
     the iterator value.
 
     For list tables, prefer >lua
-
         vim.iter(ipairs(t))
 <
 
     over >lua
-
         vim.iter(t):enumerate()
 <
 
     as the former is faster.
 
     Example: >lua
-
         local it = vim.iter(vim.gsplit('abc', '')):enumerate()
         it:next()
         -- 1   'a'
@@ -3354,7 +3307,6 @@ Iter:filter({f})                                               *Iter:filter()*
     Add a filter step to the iterator pipeline.
 
     Example: >lua
-
         local bufs = vim.iter(vim.api.nvim_list_bufs()):filter(vim.api.nvim_buf_is_loaded)
 <
 
@@ -3373,7 +3325,6 @@ Iter:find({f})                                                   *Iter:find()*
     found.
 
     Examples: >lua
-
         local it = vim.iter({ 3, 6, 9, 12 })
         it:find(12)
         -- 12
@@ -3394,7 +3345,6 @@ Iter:fold({init}, {f})                                           *Iter:fold()*
     Fold ("reduce") an iterator or table into a single value.
 
     Examples: >lua
-
         -- Create a new table with only even values
         local t = { a = 1, b = 2, c = 3, d = 4 }
         local it = vim.iter(t)
@@ -3419,7 +3369,6 @@ Iter:last()                                                      *Iter:last()*
     Drains the iterator.
 
     Example: >lua
-
         local it = vim.iter(vim.gsplit('abcdefg', ''))
         it:last()
         -- 'g'
@@ -3438,7 +3387,6 @@ Iter:map({f})                                                     *Iter:map()*
     If the map function returns nil, the value is filtered from the iterator.
 
     Example: >lua
-
         local it = vim.iter({ 1, 2, 3, 4 }):map(function(v)
           if v % 2 == 0 then
             return v * 3
@@ -3461,7 +3409,6 @@ Iter:next()                                                      *Iter:next()*
     Return the next value from the iterator.
 
     Example: >lua
-
         local it = vim.iter(string.gmatch('1 2 3', '%d+')):map(tonumber)
         it:next()
         -- 1
@@ -3480,7 +3427,6 @@ Iter:nextback()                                              *Iter:nextback()*
     Only supported for iterators on list-like tables.
 
     Example: >lua
-
         local it = vim.iter({1, 2, 3, 4})
         it:nextback()
         -- 4
@@ -3497,7 +3443,6 @@ Iter:nth({n})                                                     *Iter:nth()*
     This function advances the iterator.
 
     Example: >lua
-
         local it = vim.iter({ 3, 6, 9, 12 })
         it:nth(2)
         -- 6
@@ -3519,7 +3464,6 @@ Iter:nthback({n})                                             *Iter:nthback()*
     Only supported for iterators on list-like tables.
 
     Example: >lua
-
         local it = vim.iter({ 3, 6, 9, 12 })
         it:nthback(2)
         -- 9
@@ -3539,7 +3483,6 @@ Iter:peek()                                                      *Iter:peek()*
     Only supported for iterators on list-like tables.
 
     Example: >lua
-
         local it = vim.iter({ 3, 6, 9, 12 })
         it:peek()
         -- 3
@@ -3558,7 +3501,6 @@ Iter:peekback()                                              *Iter:peekback()*
     Only supported for iterators on list-like tables.
 
     Example: >lua
-
         local it = vim.iter({1, 2, 3, 4})
         it:peekback()
         -- 4
@@ -3577,7 +3519,6 @@ Iter:rev()                                                        *Iter:rev()*
     Only supported for iterators on list-like tables.
 
     Example: >lua
-
         local it = vim.iter({ 3, 6, 9, 12 }):rev()
         it:totable()
         -- { 12, 9, 6, 3 }
@@ -3596,7 +3537,6 @@ Iter:rfind({f})                                                 *Iter:rfind()*
     Only supported for iterators on list-like tables.
 
     Examples: >lua
-
         local it = vim.iter({ 1, 2, 3, 2, 1 }):enumerate()
         it:rfind(1)
         -- 5   1
@@ -3614,7 +3554,6 @@ Iter:skip({n})                                                   *Iter:skip()*
     Skip values in the iterator.
 
     Example: >lua
-
         local it = vim.iter({ 3, 6, 9, 12 }):skip(2)
         it:next()
         -- 9
@@ -3632,7 +3571,6 @@ Iter:skipback({n})                                           *Iter:skipback()*
     Only supported for iterators on list-like tables.
 
     Example: >lua
-
         local it = vim.iter({ 1, 2, 3, 4, 5 }):skipback(2)
         it:next()
         -- 1
@@ -3669,7 +3607,6 @@ Iter:totable()                                                *Iter:totable()*
     the iterator pipeline, each value will be included in a table.
 
     Examples: >lua
-
         vim.iter(string.gmatch('100 20 50', '%d+')):map(tonumber):totable()
         -- { 100, 20, 50 }
 
@@ -3691,7 +3628,6 @@ map({f}, {src}, {...})                                        *vim.iter.map()*
     Map and filter a table or iterator.
 
     This is a convenience function that performs: >lua
-
         vim.iter(src):map(f):totable()
 <
 
@@ -3711,7 +3647,6 @@ totable({f}, {...})                                       *vim.iter.totable()*
     Collect an iterator into a table.
 
     This is a convenience function that performs: >lua
-
         vim.iter(f):totable()
 <
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f758782f09..e1518c58bb 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -945,7 +945,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	backups if you don't care about losing the file.
 
 	Note that environment variables are not expanded.  If you want to use
-	$HOME you must expand it explicitly, e.g.: >
+	$HOME you must expand it explicitly, e.g.: >vim
 		:let &backupskip = escape(expand('$HOME'), '\') .. '/tmp/*'
 
 <	Note that the default also makes sure that "crontab -e" works (when a
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 9d07aee290..c62e210be1 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -551,8 +551,7 @@ Lua module: vim.treesitter                               *lua-treesitter-core*
 foldexpr({lnum})                                   *vim.treesitter.foldexpr()*
     Returns the fold level for {lnum} in the current buffer. Can be set
     directly to 'foldexpr': >lua
-
-     vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+        vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
 <
 
     Parameters: ~
@@ -746,13 +745,12 @@ start({bufnr}, {lang})                                *vim.treesitter.start()*
     the call to `start`.
 
     Example: >lua
-
-     vim.api.nvim_create_autocmd( 'FileType', { pattern = 'tex',
-         callback = function(args)
-             vim.treesitter.start(args.buf, 'latex')
-             vim.bo[args.buf].syntax = 'on'  -- only if additional legacy syntax is needed
-         end
-     })
+        vim.api.nvim_create_autocmd( 'FileType', { pattern = 'tex',
+            callback = function(args)
+                vim.treesitter.start(args.buf, 'latex')
+                vim.bo[args.buf].syntax = 'on'  -- only if additional legacy syntax is needed
+            end
+        })
 <
 
     Parameters: ~
@@ -922,7 +920,7 @@ omnifunc({findstart}, {base})                *vim.treesitter.query.omnifunc()*
     Omnifunc for completing node names and predicates in treesitter queries.
 
     Use via >lua
-      vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
+        vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
 <
 
 parse({lang}, {query})                          *vim.treesitter.query.parse()*
@@ -958,14 +956,13 @@ Query:iter_captures({node}, {source}, {start}, {stop})
     The iterator returns three values: a numeric id identifying the capture,
     the captured node, and metadata from any directives processing the match.
     The following example shows how to get captures by name: >lua
-
-     for id, node, metadata in query:iter_captures(tree:root(), bufnr, first, last) do
-       local name = query.captures[id] -- name of the capture in the query
-       -- typically useful info about the node:
-       local type = node:type() -- type of the captured node
-       local row1, col1, row2, col2 = node:range() -- range of the capture
-       -- ... use the info here ...
-     end
+        for id, node, metadata in query:iter_captures(tree:root(), bufnr, first, last) do
+          local name = query.captures[id] -- name of the capture in the query
+          -- typically useful info about the node:
+          local type = node:type() -- type of the captured node
+          local row1, col1, row2, col2 = node:range() -- range of the capture
+          -- ... use the info here ...
+        end
 <
 
     Parameters: ~
@@ -988,18 +985,18 @@ Query:iter_matches({node}, {source}, {start}, {stop}, {opts})
     (1-based) index of the pattern in the query, a table mapping capture
     indices to nodes, and metadata from any directives processing the match.
     If the query has more than one pattern, the capture table might be sparse
-    and e.g. `pairs()` method should be used over `ipairs` . Here is an example iterating over all captures in every match: >lua
-
-     for pattern, match, metadata in cquery:iter_matches(tree:root(), bufnr, first, last) do
-       for id, node in pairs(match) do
-         local name = query.captures[id]
-         -- `node` was captured by the `name` capture in the match
-
-         local node_data = metadata[id] -- Node level metadata
-
-         -- ... use the info here ...
-       end
-     end
+    and e.g. `pairs()` method should be used over `ipairs`. Here is an example
+    iterating over all captures in every match: >lua
+        for pattern, match, metadata in cquery:iter_matches(tree:root(), bufnr, first, last) do
+          for id, node in pairs(match) do
+            local name = query.captures[id]
+            -- `node` was captured by the `name` capture in the match
+
+            local node_data = metadata[id] -- Node level metadata
+
+            -- ... use the info here ...
+          end
+        end
 <
 
     Parameters: ~
@@ -1039,11 +1036,8 @@ inject other languages, recursively. For example a Lua buffer containing
 some Vimscript commands needs multiple parsers to fully understand its
 contents.
 
-To create a LanguageTree (parser object) for a given buffer and language, use:
-
->lua
-
-     local parser = vim.treesitter.get_parser(bufnr, lang)
+To create a LanguageTree (parser object) for a given buffer and language, use: >lua
+    local parser = vim.treesitter.get_parser(bufnr, lang)
 
 <
 
@@ -1052,11 +1046,8 @@ Note: currently the parser is retained for the lifetime of a buffer but
 this may change; a plugin should keep a reference to the parser object if
 it wants incremental updates.
 
-Whenever you need to access the current syntax tree, parse the buffer:
-
->lua
-
-     local tree = parser:parse({ start_row, end_row })
+Whenever you need to access the current syntax tree, parse the buffer: >lua
+    local tree = parser:parse({ start_row, end_row })
 
 <
 
diff --git a/runtime/lua/vim/F.lua b/runtime/lua/vim/F.lua
index 16c834b371..5ed60ca8ab 100644
--- a/runtime/lua/vim/F.lua
+++ b/runtime/lua/vim/F.lua
@@ -5,13 +5,14 @@ local F = {}
 --- If all arguments are nil, returns nil.
 ---
 --- Examples:
---- <pre>
+---
+--- ```lua
 --- local a = nil
 --- local b = nil
 --- local c = 42
 --- local d = true
 --- assert(vim.F.if_nil(a, b, c, d) == 42)
---- </pre>
+--- ```
 ---
 ---@param ... any
 ---@return any
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 64aeb64736..0215cae0cb 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -70,23 +70,24 @@ vim.log = {
 --- Run a system command
 ---
 --- Examples:
---- <pre>lua
 ---
----   local on_exit = function(obj)
----     print(obj.code)
----     print(obj.signal)
----     print(obj.stdout)
----     print(obj.stderr)
----   end
+--- ```lua
 ---
----   -- Run asynchronously
----   vim.system({'echo', 'hello'}, { text = true }, on_exit)
+--- local on_exit = function(obj)
+---   print(obj.code)
+---   print(obj.signal)
+---   print(obj.stdout)
+---   print(obj.stderr)
+--- end
 ---
----   -- Run synchronously
----   local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
----   -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
+--- -- Run asynchronously
+--- vim.system({'echo', 'hello'}, { text = true }, on_exit)
 ---
---- </pre>
+--- -- Run synchronously
+--- local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
+--- -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
+---
+--- ```
 ---
 --- See |uv.spawn()| for more details.
 ---
@@ -200,7 +201,8 @@ do
   --- (such as the |TUI|) pastes text into the editor.
   ---
   --- Example: To remove ANSI color codes when pasting:
-  --- <pre>lua
+  ---
+  --- ```lua
   --- vim.paste = (function(overridden)
   ---   return function(lines, phase)
   ---     for i,line in ipairs(lines) do
@@ -210,7 +212,7 @@ do
   ---     overridden(lines, phase)
   ---   end
   --- end)(vim.paste)
-  --- </pre>
+  --- ```
   ---
   ---@see |paste|
   ---@alias paste_phase -1 | 1 | 2 | 3
@@ -361,32 +363,33 @@ local VIM_CMD_ARG_MAX = 20
 --- command.
 ---
 --- Example:
---- <pre>lua
----   vim.cmd('echo 42')
----   vim.cmd([[
----     augroup My_group
----       autocmd!
----       autocmd FileType c setlocal cindent
----     augroup END
----   ]])
 ---
----   -- Ex command :echo "foo"
----   -- Note string literals need to be double quoted.
----   vim.cmd('echo "foo"')
----   vim.cmd { cmd = 'echo', args = { '"foo"' } }
----   vim.cmd.echo({ args = { '"foo"' } })
----   vim.cmd.echo('"foo"')
+--- ```lua
+--- vim.cmd('echo 42')
+--- vim.cmd([[
+---   augroup My_group
+---     autocmd!
+---     autocmd FileType c setlocal cindent
+---   augroup END
+--- ]])
+---
+--- -- Ex command :echo "foo"
+--- -- Note string literals need to be double quoted.
+--- vim.cmd('echo "foo"')
+--- vim.cmd { cmd = 'echo', args = { '"foo"' } }
+--- vim.cmd.echo({ args = { '"foo"' } })
+--- vim.cmd.echo('"foo"')
 ---
----   -- Ex command :write! myfile.txt
----   vim.cmd('write! myfile.txt')
----   vim.cmd { cmd = 'write', args = { "myfile.txt" }, bang = true }
----   vim.cmd.write { args = { "myfile.txt" }, bang = true }
----   vim.cmd.write { "myfile.txt", bang = true }
+--- -- Ex command :write! myfile.txt
+--- vim.cmd('write! myfile.txt')
+--- vim.cmd { cmd = 'write', args = { "myfile.txt" }, bang = true }
+--- vim.cmd.write { args = { "myfile.txt" }, bang = true }
+--- vim.cmd.write { "myfile.txt", bang = true }
 ---
----   -- Ex command :colorscheme blue
----   vim.cmd('colorscheme blue')
----   vim.cmd.colorscheme('blue')
---- </pre>
+--- -- Ex command :colorscheme blue
+--- vim.cmd('colorscheme blue')
+--- vim.cmd.colorscheme('blue')
+--- ```
 ---
 ---@param command string|table Command(s) to execute.
 ---                            If a string, executes multiple lines of Vim script at once. In this
@@ -871,9 +874,10 @@ end
 --- "Pretty prints" the given arguments and returns them unmodified.
 ---
 --- Example:
---- <pre>lua
----   local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
---- </pre>
+---
+--- ```lua
+--- local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
+--- ```
 ---
 --- @see |vim.inspect()|
 --- @see |:=|
@@ -900,10 +904,12 @@ end
 --- Translate keycodes.
 ---
 --- Example:
---- <pre>lua
----   local k = vim.keycode
----   vim.g.mapleader = k'<bs>'
---- </pre>
+---
+--- ```lua
+--- local k = vim.keycode
+--- vim.g.mapleader = k'<bs>'
+--- ```
+---
 --- @param str string String to be converted.
 --- @return string
 --- @see |nvim_replace_termcodes()|
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 7cd0d825a1..6573c68493 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -127,11 +127,16 @@ function vim.api.nvim__unpack(str) end
 function vim.api.nvim_buf_add_highlight(buffer, ns_id, hl_group, line, col_start, col_end) end
 
 --- Activates buffer-update events on a channel, or as Lua callbacks.
---- Example (Lua): capture buffer updates in a global `events` variable (use "vim.print(events)" to see its contents):
+--- Example (Lua): capture buffer updates in a global `events` variable (use
+--- "vim.print(events)" to see its contents):
+---
 --- ```lua
----   events = {}
----   vim.api.nvim_buf_attach(0, false, {
----     on_lines=function(...) table.insert(events, {...}) end})
+---     events = {}
+---     vim.api.nvim_buf_attach(0, false, {
+---       on_lines = function(...)
+---         table.insert(events, {...})
+---       end,
+---     })
 --- ```
 ---
 --- @param buffer integer Buffer handle, or 0 for current buffer
@@ -314,29 +319,32 @@ function vim.api.nvim_buf_get_extmark_by_id(buffer, ns_id, id, opts) end
 --- Region can be given as (row,col) tuples, or valid extmark ids (whose
 --- positions define the bounds). 0 and -1 are understood as (0,0) and (-1,-1)
 --- respectively, thus the following are equivalent:
+---
 --- ```lua
----   vim.api.nvim_buf_get_extmarks(0, my_ns, 0, -1, {})
----   vim.api.nvim_buf_get_extmarks(0, my_ns, {0,0}, {-1,-1}, {})
+---     vim.api.nvim_buf_get_extmarks(0, my_ns, 0, -1, {})
+---     vim.api.nvim_buf_get_extmarks(0, my_ns, {0,0}, {-1,-1}, {})
 --- ```
+---
 --- If `end` is less than `start`, traversal works backwards. (Useful with
 --- `limit`, to get the first marks prior to a given position.)
 --- Note: when using extmark ranges (marks with a end_row/end_col position)
 --- the `overlap` option might be useful. Otherwise only the start position of
 --- an extmark will be considered.
 --- Example:
+---
 --- ```lua
----   local api = vim.api
----   local pos = api.nvim_win_get_cursor(0)
----   local ns  = api.nvim_create_namespace('my-plugin')
----   -- Create new extmark at line 1, column 1.
----   local m1  = api.nvim_buf_set_extmark(0, ns, 0, 0, {})
----   -- Create new extmark at line 3, column 1.
----   local m2  = api.nvim_buf_set_extmark(0, ns, 2, 0, {})
----   -- Get extmarks only from line 3.
----   local ms  = api.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
----   -- Get all marks in this buffer + namespace.
----   local all = api.nvim_buf_get_extmarks(0, ns, 0, -1, {})
----   vim.print(ms)
+---     local api = vim.api
+---     local pos = api.nvim_win_get_cursor(0)
+---     local ns  = api.nvim_create_namespace('my-plugin')
+---     -- Create new extmark at line 1, column 1.
+---     local m1  = api.nvim_buf_set_extmark(0, ns, 0, 0, {})
+---     -- Create new extmark at line 3, column 1.
+---     local m2  = api.nvim_buf_set_extmark(0, ns, 2, 0, {})
+---     -- Get extmarks only from line 3.
+---     local ms  = api.nvim_buf_get_extmarks(0, ns, {2,0}, {2,0}, {})
+---     -- Get all marks in this buffer + namespace.
+---     local all = api.nvim_buf_get_extmarks(0, ns, 0, -1, {})
+---     vim.print(ms)
 --- ```
 ---
 --- @param buffer integer Buffer handle, or 0 for current buffer
@@ -775,6 +783,7 @@ function vim.api.nvim_command_output(command) end
 
 --- Create or get an autocommand group `autocmd-groups`.
 --- To get an existing group id, do:
+---
 --- ```lua
 ---     local id = vim.api.nvim_create_augroup("MyGroup", {
 ---         clear = false
@@ -790,6 +799,7 @@ function vim.api.nvim_create_augroup(name, opts) end
 
 --- Creates an `autocommand` event handler, defined by `callback` (Lua function or Vimscript function name string) or `command` (Ex command string).
 --- Example using Lua callback:
+---
 --- ```lua
 ---     vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
 ---       pattern = {"*.c", "*.h"},
@@ -798,17 +808,21 @@ function vim.api.nvim_create_augroup(name, opts) end
 ---       end
 ---     })
 --- ```
+---
 --- Example using an Ex command as the handler:
+---
 --- ```lua
 ---     vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, {
 ---       pattern = {"*.c", "*.h"},
 ---       command = "echo 'Entering a C or C++ file'",
 ---     })
 --- ```
---- Note: `pattern` is NOT automatically expanded (unlike with `:autocmd`), thus names like
---- "$HOME" and "~" must be expanded explicitly:
+---
+--- Note: `pattern` is NOT automatically expanded (unlike with `:autocmd`),
+--- thus names like "$HOME" and "~" must be expanded explicitly:
+---
 --- ```lua
----   pattern = vim.fn.expand("~") .. "/some/path/*.py"
+---     pattern = vim.fn.expand("~") .. "/some/path/*.py"
 --- ```
 ---
 --- @param event any (string|array) Event(s) that will trigger the handler
@@ -870,10 +884,11 @@ function vim.api.nvim_create_namespace(name) end
 --- Creates a global `user-commands` command.
 --- For Lua usage see `lua-guide-commands-create`.
 --- Example:
+---
 --- ```vim
----    :call nvim_create_user_command('SayHello', 'echo "Hello world!"', {'bang': v:true})
----    :SayHello
----    Hello world!
+---     :call nvim_create_user_command('SayHello', 'echo "Hello world!"', {'bang': v:true})
+---     :SayHello
+---     Hello world!
 --- ```
 ---
 --- @param name string Name of the new user command. Must begin with an uppercase
@@ -1084,6 +1099,7 @@ function vim.api.nvim_execute_lua(code, args) end
 --- with escape_ks=false) to replace `keycodes`, then pass the result to
 --- nvim_feedkeys().
 --- Example:
+---
 --- ```vim
 ---     :let key = nvim_replace_termcodes("<C-o>", v:true, v:false, v:true)
 ---     :call nvim_feedkeys(key, 'n', v:false)
@@ -1111,19 +1127,21 @@ function vim.api.nvim_get_api_info() end
 
 --- Get all autocommands that match the corresponding {opts}.
 --- These examples will get autocommands matching ALL the given criteria:
+---
 --- ```lua
----   -- Matches all criteria
----   autocommands = vim.api.nvim_get_autocmds({
----     group = "MyGroup",
----     event = {"BufEnter", "BufWinEnter"},
----     pattern = {"*.c", "*.h"}
----   })
----
----   -- All commands from one group
----   autocommands = vim.api.nvim_get_autocmds({
----     group = "MyGroup",
----   })
+---     -- Matches all criteria
+---     autocommands = vim.api.nvim_get_autocmds({
+---       group = "MyGroup",
+---       event = {"BufEnter", "BufWinEnter"},
+---       pattern = {"*.c", "*.h"}
+---     })
+---
+---     -- All commands from one group
+---     autocommands = vim.api.nvim_get_autocmds({
+---       group = "MyGroup",
+---     })
 --- ```
+---
 --- NOTE: When multiple patterns or events are provided, it will find all the
 --- autocommands that match any combination of them.
 ---
@@ -1149,6 +1167,7 @@ function vim.api.nvim_get_chan_info(chan) end
 --- Returns the 24-bit RGB value of a `nvim_get_color_map()` color name or
 --- "#rrggbb" hexadecimal string.
 --- Example:
+---
 --- ```vim
 ---     :echo nvim_get_color_by_name("Pink")
 ---     :echo nvim_get_color_by_name("#cbcbcb")
@@ -1471,14 +1490,18 @@ function vim.api.nvim_open_term(buffer, opts) end
 --- could let floats hover outside of the main window like a tooltip, but this
 --- should not be used to specify arbitrary WM screen positions.
 --- Example (Lua): window-relative float
+---
 --- ```lua
 ---     vim.api.nvim_open_win(0, false,
 ---       {relative='win', row=3, col=3, width=12, height=3})
 --- ```
+---
 --- Example (Lua): buffer-relative float (travels as buffer is scrolled)
+---
 --- ```lua
 ---     vim.api.nvim_open_win(0, false,
 ---       {relative='win', width=12, height=3, bufpos={100,10}})
+---     })
 --- ```
 ---
 --- @param buffer integer Buffer to display, or 0 for current buffer
@@ -1856,10 +1879,13 @@ function vim.api.nvim_set_hl_ns_fast(ns_id) end
 --- Unlike `:map`, leading/trailing whitespace is accepted as part of the
 --- {lhs} or {rhs}. Empty {rhs} is `<Nop>`. `keycodes` are replaced as usual.
 --- Example:
+---
 --- ```vim
 ---     call nvim_set_keymap('n', ' <NL>', '', {'nowait': v:true})
 --- ```
+---
 --- is equivalent to:
+---
 --- ```vim
 ---     nmap <nowait> <Space><NL> <Nop>
 --- ```
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index d7b76a803c..0a6dd3e151 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -131,7 +131,8 @@ function vim.str_utf_pos(str) end
 --- The result can be added to {index} to get the starting byte of a character.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 --- -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
 ---
 --- -- Returns 0 because the index is pointing at the first byte of a character
@@ -139,7 +140,7 @@ function vim.str_utf_pos(str) end
 ---
 --- -- Returns -1 because the index is pointing at the second byte of a character
 --- vim.str_utf_start('æ', 2)
---- </pre>
+--- ```
 ---
 --- @param str string
 --- @param index number
@@ -150,7 +151,8 @@ function vim.str_utf_start(str, index) end
 --- to.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 --- -- The character 'æ' is stored as the bytes '\xc3\xa6' (using UTF-8)
 ---
 --- -- Returns 0 because the index is pointing at the last byte of a character
@@ -158,7 +160,7 @@ function vim.str_utf_start(str, index) end
 ---
 --- -- Returns 1 because the index is pointing at the penultimate byte of a character
 --- vim.str_utf_end('æ', 1)
---- </pre>
+--- ```
 ---
 --- @param str string
 --- @param index number
@@ -204,7 +206,8 @@ function vim.schedule(callback) end
 --- this time.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 ---
 --- ---
 --- -- Wait for 100 ms, allowing other events to process
@@ -226,7 +229,7 @@ function vim.schedule(callback) end
 --- if vim.wait(10000, function() return vim.g.timer_result end) then
 ---   print('Only waiting a little bit of time!')
 --- end
---- </pre>
+--- ```
 ---
 --- @param time integer Number of milliseconds to wait
 --- @param callback? fun(): boolean Optional callback. Waits until {callback} returns true
@@ -258,22 +261,23 @@ function vim.wait(time, callback, interval, fast_only) end
 --- likewise experimental).
 ---
 --- Example (stub for a |ui-popupmenu| implementation):
---- <pre>lua
----
----   ns = vim.api.nvim_create_namespace('my_fancy_pum')
----
----   vim.ui_attach(ns, {ext_popupmenu=true}, function(event, ...)
----     if event == "popupmenu_show" then
----       local items, selected, row, col, grid = ...
----       print("display pum ", #items)
----     elseif event == "popupmenu_select" then
----       local selected = ...
----       print("selected", selected)
----     elseif event == "popupmenu_hide" then
----       print("FIN")
----     end
----   end)
---- </pre>
+---
+--- ```lua
+--- ns = vim.api.nvim_create_namespace('my_fancy_pum')
+---
+--- vim.ui_attach(ns, {ext_popupmenu=true}, function(event, ...)
+---   if event == "popupmenu_show" then
+---     local items, selected, row, col, grid = ...
+---     print("display pum ", #items)
+---   elseif event == "popupmenu_select" then
+---     local selected = ...
+---     print("selected", selected)
+---   elseif event == "popupmenu_hide" then
+---     print("FIN")
+---   end
+--- end)
+--- ```
+---
 --- @param ns integer
 --- @param options table<string, any>
 --- @param callback fun()
diff --git a/runtime/lua/vim/_meta/diff.lua b/runtime/lua/vim/_meta/diff.lua
index 246ac0c75a..f265139448 100644
--- a/runtime/lua/vim/_meta/diff.lua
+++ b/runtime/lua/vim/_meta/diff.lua
@@ -6,24 +6,25 @@
 --- either directly or via callback arguments, are 1-based.
 ---
 --- Examples:
---- <pre>lua
----     vim.diff('a\\n', 'b\\nc\\n')
----     -- =>
----     -- @@ -1 +1,2 @@
----     -- -a
----     -- +b
----     -- +c
 ---
----     vim.diff('a\\n', 'b\\nc\\n', {result_type = 'indices'})
----     -- =>
----     -- {
----     --   {1, 1, 1, 2}
----     -- }
---- </pre>
+--- ```lua
+--- vim.diff('a\n', 'b\nc\n')
+--- -- =>
+--- -- @@ -1 +1,2 @@
+--- -- -a
+--- -- +b
+--- -- +c
 ---
---- @param a string First string to compare
---- @param b string Second string to compare
---- @param opts table<string,any> Optional parameters:
+--- vim.diff('a\n', 'b\nc\n', {result_type = 'indices'})
+--- -- =>
+--- -- {
+--- --   {1, 1, 1, 2}
+--- -- }
+--- ```
+---
+---@param a string First string to compare
+---@param b string Second string to compare
+---@param opts table<string,any> Optional parameters:
 ---     - `on_hunk` (callback):
 ---       Invoked for each hunk in the diff. Return a negative number
 ---       to cancel the callback for any remaining hunks.
@@ -64,6 +65,6 @@
 ---       Use the indent heuristic for the internal
 ---       diff library.
 ---
---- @return string|table|nil
+---@return string|table|nil
 ---     See {opts.result_type}. `nil` if {opts.on_hunk} is given.
 function vim.diff(a, b, opts) end
diff --git a/runtime/lua/vim/_meta/json.lua b/runtime/lua/vim/_meta/json.lua
index 76a6c7b733..edf905c7c6 100644
--- a/runtime/lua/vim/_meta/json.lua
+++ b/runtime/lua/vim/_meta/json.lua
@@ -1,8 +1,8 @@
---- @meta
+---@meta
 
 -- luacheck: no unused args
 
---- @defgroup vim.json
+---@defgroup vim.json
 ---
 --- This module provides encoding and decoding of Lua objects to and
 --- from JSON-encoded strings. Supports |vim.NIL| and |vim.empty_dict()|.
@@ -14,24 +14,23 @@
 --- - Decodes empty array as `{}` (empty Lua table).
 ---
 --- Example:
---- <pre>lua
---- :lua vim.print(vim.json.decode('{"bar":[],"foo":{},"zub":null}'))
---- --> { bar = {}, foo = vim.empty_dict(), zub = vim.NIL }
---- </pre>
---- Parameters: ~
----   • {str}    Stringified JSON data.
----   • {opts}   Options map keys:
----              • luanil: { object: bool, array: bool }
----                • `luanil.object=true` converts `null` in JSON objects to
----                  Lua `nil` instead of `vim.NIL`.
----                • `luanil.array=true` converts `null` in JSON arrays to Lua
----                  `nil` instead of `vim.NIL`.
---- @param str string
---- @param opts? table<string, any>
---- @return any
+---
+--- ```lua
+--- vim.print(vim.json.decode('{"bar":[],"foo":{},"zub":null}'))
+--- -- { bar = {}, foo = vim.empty_dict(), zub = vim.NIL }
+--- ```
+---
+---@param str string Stringified JSON data.
+---@param opts? table<string,any> Options table with keys:
+---                                 - luanil: (table) Table with keys:
+---                                   * object: (boolean) When true, converts `null` in JSON objects
+---                                                       to Lua `nil` instead of |vim.NIL|.
+---                                   * array: (boolean) When true, converts `null` in JSON arrays
+---                                                      to Lua `nil` instead of |vim.NIL|.
+---@return any
 function vim.json.decode(str, opts) end
 
 --- Encodes (or "packs") Lua object {obj} as JSON in a Lua string.
---- @param obj any
---- @return string
+---@param obj any
+---@return string
 function vim.json.encode(obj) end
diff --git a/runtime/lua/vim/_meta/misc.lua b/runtime/lua/vim/_meta/misc.lua
index 8a76755962..0d70e16314 100644
--- a/runtime/lua/vim/_meta/misc.lua
+++ b/runtime/lua/vim/_meta/misc.lua
@@ -5,9 +5,11 @@
 --- Invokes |vim-function| or |user-function| {func} with arguments {...}.
 --- See also |vim.fn|.
 --- Equivalent to:
---- <pre>lua
----     vim.fn[func]({...})
---- </pre>
+---
+--- ```lua
+--- vim.fn[func]({...})
+--- ```
+---
 --- @param func fun()
 --- @param ... any
 function vim.call(func, ...) end
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 92dc4b2c7f..af676fa961 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -141,6 +141,7 @@ vim.bo.ai = vim.bo.autoindent
 --- 	:set autoread<
 --- ```
 ---
+---
 --- @type boolean
 vim.o.autoread = true
 vim.o.ar = vim.o.autoread
@@ -354,6 +355,7 @@ vim.go.bkc = vim.go.backupcopy
 --- ```
 ---     :set bdir=c:\\tmp,\ dir\\,with\\,commas,\\\ dir\ with\ spaces
 --- ```
+---
 --- See also 'backup' and 'writebackup' options.
 --- If you want to hide your backup files on Unix, consider this value:
 --- ```
@@ -409,9 +411,9 @@ vim.go.bex = vim.go.backupext
 ---
 --- Note that environment variables are not expanded.  If you want to use
 --- $HOME you must expand it explicitly, e.g.:
---- ```
---- 	:let &backupskip = escape(expand('$HOME'), '\') .. '/tmp/*'
 ---
+--- ```vim
+--- 	:let &backupskip = escape(expand('$HOME'), '\') .. '/tmp/*'
 --- ```
 --- Note that the default also makes sure that "crontab -e" works (when a
 --- backup would be made by renaming the original file crontab won't see
@@ -833,6 +835,7 @@ vim.bo.cino = vim.bo.cinoptions
 --- 	set cinscopedecls+=signals,public\ slots,private\ slots
 --- ```
 ---
+---
 --- @type string
 vim.o.cinscopedecls = "public,protected,private"
 vim.o.cinsd = vim.o.cinscopedecls
@@ -916,11 +919,11 @@ vim.go.cwh = vim.go.cmdwinheight
 --- The screen column can be an absolute number, or a number preceded with
 --- '+' or '-', which is added to or subtracted from 'textwidth'.
 --- ```
----
 --- 	:set cc=+1	  " highlight column after 'textwidth'
 --- 	:set cc=+1,+2,+3  " highlight three columns after 'textwidth'
 --- 	:hi ColorColumn ctermbg=lightgrey guibg=lightgrey
 --- ```
+---
 --- When 'textwidth' is zero then the items with '-' and '+' are not used.
 --- A maximum of 256 columns are highlighted.
 ---
@@ -1418,6 +1421,7 @@ vim.wo.crb = vim.wo.cursorbind
 --- 	au WinEnter * set cursorline cursorcolumn
 --- ```
 ---
+---
 --- @type boolean
 vim.o.cursorcolumn = false
 vim.o.cuc = vim.o.cursorcolumn
@@ -1499,6 +1503,7 @@ vim.go.debug = vim.o.debug
 --- 	let &l:define = '^\s*\ze\k\+\s*=\s*function('
 --- ```
 ---
+---
 --- @type string
 vim.o.define = ""
 vim.o.def = vim.o.define
@@ -1679,6 +1684,7 @@ vim.go.dex = vim.go.diffexpr
 --- 	:set diffopt-=internal  " do NOT use the internal diff parser
 --- ```
 ---
+---
 --- @type string
 vim.o.diffopt = "internal,filler,closeoff"
 vim.o.dip = vim.o.diffopt
@@ -1729,6 +1735,7 @@ vim.go.dg = vim.go.digraph
 --- ```
 ---     :set dir=c:\\tmp,\ dir\\,with\\,commas,\\\ dir\ with\ spaces
 --- ```
+---
 --- Editing the same file twice will result in a warning.  Using "/tmp" on
 --- is discouraged: if the system crashes you lose the swap file. And
 --- others on the computer may be able to see the files.
@@ -1917,6 +1924,7 @@ vim.go.efm = vim.go.errorformat
 ---     :set ei=WinEnter,WinLeave
 --- ```
 ---
+---
 --- @type string
 vim.o.eventignore = ""
 vim.o.ei = vim.o.eventignore
@@ -2634,14 +2642,12 @@ vim.go.gp = vim.go.grepprg
 --- To disable cursor-styling, reset the option:
 --- ```
 --- 	:set guicursor=
----
 --- ```
 --- To enable mode shapes, "Cursor" highlight, and blinking:
 --- ```
 --- 	:set guicursor=n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50
 --- 	  \,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor
 --- 	  \,sm:block-blinkwait175-blinkoff150-blinkon175
----
 --- ```
 --- The option is a comma-separated list of parts.  Each part consists of a
 --- mode-list and an argument-list:
@@ -2719,6 +2725,7 @@ vim.go.gp = vim.go.grepprg
 ---     :highlight Cursor gui=NONE guifg=bg guibg=fg
 --- ```
 ---
+---
 --- @type string
 vim.o.guicursor = "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20"
 vim.o.gcr = vim.o.guicursor
@@ -2790,6 +2797,7 @@ vim.go.gcr = vim.go.guicursor
 ---     :set guifont=Andale_Mono:h7.5:w4.5
 --- ```
 ---
+---
 --- @type string
 vim.o.guifont = ""
 vim.o.gfn = vim.o.guifont
@@ -2944,6 +2952,7 @@ vim.go.gtl = vim.go.guitablabel
 --- 	:let &guitabtooltip = "line one\nline two"
 --- ```
 ---
+---
 --- @type string
 vim.o.guitabtooltip = ""
 vim.o.gtt = vim.o.guitabtooltip
@@ -3206,6 +3215,7 @@ vim.go.inc = vim.go.include
 --- ```
 --- 	:setlocal includeexpr=tr(v:fname,'.','/')
 --- ```
+---
 --- Also used for the `gf` command if an unmodified file name can't be
 --- found.  Allows doing "gf" on the name after an 'include' statement.
 --- Also used for `<cfile>`.
@@ -3258,6 +3268,7 @@ vim.bo.inex = vim.bo.includeexpr
 --- 	  autocmd CmdlineLeave /,\? :set nohlsearch
 --- 	augroup END
 --- ```
+---
 --- CTRL-L can be used to add one character from after the current match
 --- to the command line.  If 'ignorecase' and 'smartcase' are set and the
 --- command line has no uppercase characters, the added character is
@@ -3565,6 +3576,7 @@ vim.go.kp = vim.go.keywordprg
 --- ```
 ---     :set langmap=zy,yz,ZY,YZ
 --- ```
+---
 --- The 'langmap' option is a list of parts, separated with commas.  Each
 --- part can be in one of two forms:
 --- 1.  A list of pairs.  Each pair is a "from" character immediately
@@ -3762,6 +3774,7 @@ vim.go.lw = vim.go.lispwords
 --- ```
 --- 	:set list lcs=tab:\ \
 --- ```
+---
 --- Note that list mode will also affect formatting (set with 'textwidth'
 --- or 'wrapmargin') when 'cpoptions' includes 'L'.  See 'listchars' for
 --- changing the way tabs are displayed.
@@ -3790,6 +3803,7 @@ vim.wo.list = vim.o.list
 --- 			>--
 --- 			etc.
 --- ```
+---
 ---   tab:xyz	The 'z' is always used, then 'x' is prepended, and
 --- 		then 'y' is used as many times as will fit.  Thus
 --- 		"tab:<->" displays:
@@ -3801,6 +3815,7 @@ vim.wo.list = vim.o.list
 --- 			<-->
 --- 			etc.
 --- ```
+---
 --- 		When "tab:" is omitted, a tab is shown as ^I.
 --- 						*lcs-space*
 ---   space:c	Character to show for a space.  When omitted, spaces
@@ -3816,6 +3831,7 @@ vim.wo.list = vim.o.list
 --- ```
 --- 			---+---+--
 --- ```
+---
 --- 						*lcs-lead*
 ---   lead:c	Character to show for leading spaces.  When omitted,
 --- 		leading spaces are blank.  Overrides the "space" and
@@ -3824,6 +3840,7 @@ vim.wo.list = vim.o.list
 --- ```
 --- 			:set listchars+=tab:>-,lead:.
 --- ```
+---
 --- 						*lcs-leadmultispace*
 ---   leadmultispace:c...
 --- 		Like the `lcs-multispace` value, but for leading
@@ -3834,6 +3851,7 @@ vim.wo.list = vim.o.list
 --- ```
 --- 			---+---+--XXX
 --- ```
+---
 --- 		Where "XXX" denotes the first non-blank characters in
 --- 		the line.
 --- 						*lcs-trail*
@@ -3941,6 +3959,7 @@ vim.go.mef = vim.go.makeef
 --- 	:set makeencoding=char	" system locale is used
 --- ```
 ---
+---
 --- @type string
 vim.o.makeencoding = ""
 vim.o.menc = vim.o.makeencoding
@@ -3986,13 +4005,11 @@ vim.go.mp = vim.go.makeprg
 --- '>' (for HTML):
 --- ```
 --- 	:set mps+=<:>
----
 --- ```
 --- A more exotic example, to jump between the '=' and ';' in an
 --- assignment, useful for languages like C and Java:
 --- ```
 --- 	:au FileType c,cpp,java set mps+==:;
----
 --- ```
 --- For a more advanced way of using "%", see the matchit.vim plugin in
 --- the $VIMRUNTIME/plugin directory. `add-local-help`
@@ -4078,6 +4095,7 @@ vim.go.mis = vim.go.menuitems
 --- ```
 --- 	{start},{inc},{added}
 --- ```
+---
 --- For most languages the uncompressed word tree fits in memory.  {start}
 --- gives the amount of memory in Kbyte that can be used before any
 --- compression is done.  It should be a bit smaller than the amount of
@@ -4196,6 +4214,7 @@ vim.go.more = vim.o.more
 --- ```
 --- 	:set mouse=nv
 --- ```
+---
 --- To temporarily disable mouse support, hold the shift key while using
 --- the mouse.
 ---
@@ -4299,6 +4318,7 @@ vim.go.mh = vim.go.mousehide
 ---    :map <4-S-LeftDrag>    <4-RightDrag>
 ---    :map <4-S-LeftRelease> <4-RightRelease>
 --- ```
+---
 --- Mouse commands requiring the CTRL modifier can be simulated by typing
 --- the "g" key before using the mouse:
 ---     "g<LeftMouse>"  is "<C-LeftMouse>	(jump to tag under mouse click)
@@ -4477,6 +4497,7 @@ vim.bo.nf = vim.bo.nrformats
 ---     |there          |  4 there      |  1 there      |  1 there
 --- ```
 ---
+---
 --- @type boolean
 vim.o.number = false
 vim.o.nu = vim.o.number
@@ -4710,10 +4731,10 @@ vim.wo.pvw = vim.wo.previewwindow
 --- the popupmenu using `highlight-blend`. For instance, to enable
 --- transparency but force the current selected element to be fully opaque:
 --- ```
----
 --- 	:set pumblend=15
 --- 	:hi PmenuSel blend=0
 --- ```
+---
 --- UI-dependent. Works best with RGB colors. 'termguicolors'
 ---
 --- @type integer
@@ -4986,6 +5007,7 @@ vim.go.ru = vim.go.ruler
 --- 	:set rulerformat=%15(%c%V\ %p%%%)
 --- ```
 ---
+---
 --- @type string
 vim.o.rulerformat = ""
 vim.o.ruf = vim.o.rulerformat
@@ -5363,6 +5385,7 @@ vim.go.ssop = vim.go.sessionoptions
 --- ```
 ---     :set shada='50,<1000,s100,:0,n~/nvim/shada
 --- ```
+---
 --- '50		Marks will be remembered for the last 50 files you
 --- 		edited.
 --- <1000		Contents of registers (up to 1000 lines each) will be
@@ -5449,7 +5472,6 @@ vim.go.sdf = vim.go.shadafile
 --- 	let &shellredir = '2>&1 | %%{ "$_" } | Out-File %s; exit $LastExitCode'
 --- 	let &shellpipe  = '2>&1 | %%{ "$_" } | tee %s; exit $LastExitCode'
 --- 	set shellquote= shellxquote=
----
 --- ```
 --- This option cannot be set from a `modeline` or in the `sandbox`, for
 --- security reasons.
@@ -5726,6 +5748,7 @@ vim.go.shm = vim.go.shortmess
 --- 	:setlocal showbreak=NONE
 --- ```
 ---
+---
 --- @type string
 vim.o.showbreak = ""
 vim.o.sbr = vim.o.showbreak
@@ -5858,15 +5881,16 @@ vim.go.ss = vim.go.sidescroll
 --- 	setlocal sidescrolloff<
 --- 	setlocal sidescrolloff=-1
 --- ```
+---
 --- Example: Try this together with 'sidescroll' and 'listchars' as
 --- 	 in the following example to never allow the cursor to move
 --- 	 onto the "extends" character:
 --- ```
----
 --- 	 :set nowrap sidescroll=1 listchars=extends:>,precedes:<
 --- 	 :set sidescrolloff=1
 --- ```
 ---
+---
 --- @type integer
 vim.o.sidescrolloff = 0
 vim.o.siso = vim.o.sidescrolloff
@@ -6171,6 +6195,7 @@ vim.bo.spo = vim.bo.spelloptions
 --- ```
 --- 	:set sps=file:~/.config/nvim/sugg,best,expr:MySuggest()
 --- ```
+---
 --- This option cannot be set from a `modeline` or in the `sandbox`, for
 --- security reasons.
 ---
@@ -6263,6 +6288,7 @@ vim.go.sol = vim.go.startofline
 --- handler should be written with this in mind.
 ---
 --- Examples:
+---
 --- ```vim
 --- 	" Relative number with bar separator and click handlers:
 --- 	:set statuscolumn=%@SignCb@%s%=%T%@NumCb@%r│%T
@@ -6282,7 +6308,6 @@ vim.go.sol = vim.go.startofline
 --- 	:let &stc='%#NonText#%{&nu?v:lnum:""}' .
 --- 	 '%=%{&rnu&&(v:lnum%2)?"\ ".v:relnum:""}' .
 --- 	 '%#LineNr#%{&rnu&&!(v:lnum%2)?"\ ".v:relnum:""}'
----
 --- ```
 --- WARNING: this expression is evaluated for each screen line so defining
 --- an expensive expression can negatively affect render performance.
@@ -6522,6 +6547,7 @@ vim.wo.stc = vim.wo.statuscolumn
 ---   :endfunction
 --- ```
 ---
+---
 --- @type string
 vim.o.statusline = ""
 vim.o.stl = vim.o.statusline
@@ -6553,6 +6579,7 @@ vim.go.su = vim.go.suffixes
 --- 	:set suffixesadd=.java
 --- ```
 ---
+---
 --- @type string
 vim.o.suffixesadd = ""
 vim.o.sua = vim.o.suffixesadd
@@ -7445,6 +7472,7 @@ vim.go.ww = vim.go.whichwrap
 --- 	:set wc=<Tab>
 --- ```
 ---
+---
 --- @type integer
 vim.o.wildchar = 9
 vim.o.wc = vim.o.wildchar
@@ -7533,6 +7561,7 @@ vim.go.wic = vim.go.wildignorecase
 --- 	:cnoremap <Left> <Space><BS><Left>
 --- 	:cnoremap <Right> <Space><BS><Right>
 --- ```
+---
 --- `hl-WildMenu` highlights the current match.
 ---
 --- @type boolean
@@ -7762,6 +7791,7 @@ vim.go.wh = vim.go.winheight
 --- 	set winhighlight=Normal:MyNormal,NormalNC:MyNormalNC
 --- ```
 ---
+---
 --- @type string
 vim.o.winhighlight = ""
 vim.o.winhl = vim.o.winhighlight
diff --git a/runtime/lua/vim/_meta/spell.lua b/runtime/lua/vim/_meta/spell.lua
index d55867f769..57f2180895 100644
--- a/runtime/lua/vim/_meta/spell.lua
+++ b/runtime/lua/vim/_meta/spell.lua
@@ -10,13 +10,14 @@
 --- the buffer. Consider calling this with |nvim_buf_call()|.
 ---
 --- Example:
---- <pre>lua
----     vim.spell.check("the quik brown fox")
----     -- =>
----     -- {
----     --     {'quik', 'bad', 5}
----     -- }
---- </pre>
+---
+--- ```lua
+--- vim.spell.check("the quik brown fox")
+--- -- =>
+--- -- {
+--- --     {'quik', 'bad', 5}
+--- -- }
+--- ```
 ---
 --- @param str string
 --- @return {[1]: string, [2]: string, [3]: string}[]
diff --git a/runtime/lua/vim/_options.lua b/runtime/lua/vim/_options.lua
index e1c125baf2..7b44f6b35f 100644
--- a/runtime/lua/vim/_options.lua
+++ b/runtime/lua/vim/_options.lua
@@ -7,11 +7,12 @@
 ---"references". |lua-guide-variables| For example, using \`vim.fn.remove()\` on
 ---a Lua list copies the list object to Vimscript and does NOT modify the Lua
 ---list:
----<pre>lua
----    local list = { 1, 2, 3 }
----    vim.fn.remove(list, 0)
----    vim.print(list)  --> "{ 1, 2, 3 }"
----</pre>
+---
+--- ```lua
+--- local list = { 1, 2, 3 }
+--- vim.fn.remove(list, 0)
+--- vim.print(list)  --> "{ 1, 2, 3 }"
+--- ```
 
 ---@addtogroup lua-vimscript
 ---@brief <pre>help
@@ -131,13 +132,17 @@ local function get_options_info(name)
   return info
 end
 
----Environment variables defined in the editor session.
----See |expand-env| and |:let-environment| for the Vimscript behavior.
----Invalid or unset key returns `nil`.
----Example: <pre>lua
----    vim.env.FOO = 'bar'
----    print(vim.env.TERM)
----</pre>
+--- Environment variables defined in the editor session.
+--- See |expand-env| and |:let-environment| for the Vimscript behavior.
+--- Invalid or unset key returns `nil`.
+---
+--- Example:
+---
+--- ```lua
+--- vim.env.FOO = 'bar'
+--- print(vim.env.TERM)
+--- ```
+---
 ---@param var string
 vim.env = setmetatable({}, {
   __index = function(_, k)
@@ -226,16 +231,18 @@ end
 ---global value of a |global-local| option, see |:setglobal|.
 ---</pre>
 
----Get or set |options|. Like `:set`. Invalid key is an error.
+--- Get or set |options|. Like `:set`. Invalid key is an error.
 ---
----Note: this works on both buffer-scoped and window-scoped options using the
----current buffer and window.
+--- Note: this works on both buffer-scoped and window-scoped options using the
+--- current buffer and window.
 ---
----Example: <pre>lua
----    vim.o.cmdheight = 4
----    print(vim.o.columns)
----    print(vim.o.foo)     -- error: invalid key
----</pre>
+--- Example:
+---
+--- ```lua
+--- vim.o.cmdheight = 4
+--- print(vim.o.columns)
+--- print(vim.o.foo)     -- error: invalid key
+--- ```
 vim.o = setmetatable({}, {
   __index = function(_, k)
     return api.nvim_get_option_value(k, {})
@@ -245,18 +252,20 @@ vim.o = setmetatable({}, {
   end,
 })
 
----Get or set global |options|. Like `:setglobal`. Invalid key is
----an error.
+--- Get or set global |options|. Like `:setglobal`. Invalid key is
+--- an error.
 ---
----Note: this is different from |vim.o| because this accesses the global
----option value and thus is mostly useful for use with |global-local|
----options.
+--- Note: this is different from |vim.o| because this accesses the global
+--- option value and thus is mostly useful for use with |global-local|
+--- options.
 ---
----Example: <pre>lua
----    vim.go.cmdheight = 4
----    print(vim.go.columns)
----    print(vim.go.bar)     -- error: invalid key
----</pre>
+--- Example:
+---
+--- ```lua
+--- vim.go.cmdheight = 4
+--- print(vim.go.columns)
+--- print(vim.go.bar)     -- error: invalid key
+--- ```
 vim.go = setmetatable({}, {
   __index = function(_, k)
     return api.nvim_get_option_value(k, { scope = 'global' })
@@ -266,37 +275,39 @@ vim.go = setmetatable({}, {
   end,
 })
 
----Get or set buffer-scoped |options| for the buffer with number {bufnr}.
----Like `:set` and `:setlocal`. If [{bufnr}] is omitted then the current
----buffer is used. Invalid {bufnr} or key is an error.
+--- Get or set buffer-scoped |options| for the buffer with number {bufnr}.
+--- Like `:set` and `:setlocal`. If [{bufnr}] is omitted then the current
+--- buffer is used. Invalid {bufnr} or key is an error.
 ---
----Note: this is equivalent to both `:set` and `:setlocal`.
+--- Note: this is equivalent to both `:set` and `:setlocal`.
 ---
----Example: <pre>lua
----    local bufnr = vim.api.nvim_get_current_buf()
----    vim.bo[bufnr].buflisted = true    -- same as vim.bo.buflisted = true
----    print(vim.bo.comments)
----    print(vim.bo.baz)                 -- error: invalid key
----</pre>
----@param bufnr integer|nil
+--- Example:
+---
+--- ```lua
+--- local bufnr = vim.api.nvim_get_current_buf()
+--- vim.bo[bufnr].buflisted = true    -- same as vim.bo.buflisted = true
+--- print(vim.bo.comments)
+--- print(vim.bo.baz)                 -- error: invalid key
+--- ```
 vim.bo = new_buf_opt_accessor()
 
----Get or set window-scoped |options| for the window with handle {winid} and
----buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
----`:set` otherwise. If [{winid}] is omitted then the current window is
----used. Invalid {winid}, {bufnr} or key is an error.
+--- Get or set window-scoped |options| for the window with handle {winid} and
+--- buffer with number {bufnr}. Like `:setlocal` if {bufnr} is provided, like
+--- `:set` otherwise. If [{winid}] is omitted then the current window is
+--- used. Invalid {winid}, {bufnr} or key is an error.
 ---
----Note: only {bufnr} with value `0` (the current buffer in the window) is
----supported.
+--- Note: only {bufnr} with value `0` (the current buffer in the window) is
+--- supported.
 ---
----Example: <pre>lua
----    local winid = vim.api.nvim_get_current_win()
----    vim.wo[winid].number = true    -- same as vim.wo.number = true
----    print(vim.wo.foldmarker)
----    print(vim.wo.quux)             -- error: invalid key
----    vim.wo[winid][0].spell = false -- like ':setlocal nospell'
+--- Example:
 ---
----</pre>
+--- ```lua
+--- local winid = vim.api.nvim_get_current_win()
+--- vim.wo[winid].number = true    -- same as vim.wo.number = true
+--- print(vim.wo.foldmarker)
+--- print(vim.wo.quux)             -- error: invalid key
+--- vim.wo[winid][0].spell = false -- like ':setlocal nospell'
+--- ```
 vim.wo = new_win_opt_accessor()
 
 ---@brief [[
@@ -795,77 +806,93 @@ end
 --- @diagnostic disable-next-line:unused-local used for gen_vimdoc
 local Option = {} -- luacheck: no unused
 
----Returns a Lua-representation of the option. Boolean, number and string
----values will be returned in exactly the same fashion.
+--- Returns a Lua-representation of the option. Boolean, number and string
+--- values will be returned in exactly the same fashion.
 ---
----For values that are comma-separated lists, an array will be returned with
----the values as entries in the array: <pre>lua
----    vim.cmd [[set wildignore=*.pyc,*.o]]
+--- For values that are comma-separated lists, an array will be returned with
+--- the values as entries in the array:
 ---
----    vim.print(vim.opt.wildignore:get())
----    -- { "*.pyc", "*.o", }
+--- ```lua
+--- vim.cmd [[set wildignore=*.pyc,*.o]]
 ---
----    for _, ignore_pattern in ipairs(vim.opt.wildignore:get()) do
----        print("Will ignore:", ignore_pattern)
----    end
----    -- Will ignore: *.pyc
----    -- Will ignore: *.o
----</pre>
+--- vim.print(vim.opt.wildignore:get())
+--- -- { "*.pyc", "*.o", }
 ---
----For values that are comma-separated maps, a table will be returned with
----the names as keys and the values as entries: <pre>lua
----    vim.cmd [[set listchars=space:_,tab:>~]]
+--- for _, ignore_pattern in ipairs(vim.opt.wildignore:get()) do
+---     print("Will ignore:", ignore_pattern)
+--- end
+--- -- Will ignore: *.pyc
+--- -- Will ignore: *.o
+--- ```
 ---
----    vim.print(vim.opt.listchars:get())
----    --  { space = "_", tab = ">~", }
+--- For values that are comma-separated maps, a table will be returned with
+--- the names as keys and the values as entries:
 ---
----    for char, representation in pairs(vim.opt.listchars:get()) do
----        print(char, "=>", representation)
----    end
----</pre>
+--- ```lua
+--- vim.cmd [[set listchars=space:_,tab:>~]]
 ---
----For values that are lists of flags, a set will be returned with the flags
----as keys and `true` as entries. <pre>lua
----    vim.cmd [[set formatoptions=njtcroql]]
+--- vim.print(vim.opt.listchars:get())
+--- --  { space = "_", tab = ">~", }
 ---
----    vim.print(vim.opt.formatoptions:get())
----    -- { n = true, j = true, c = true, ... }
+--- for char, representation in pairs(vim.opt.listchars:get()) do
+---     print(char, "=>", representation)
+--- end
+--- ```
+---
+--- For values that are lists of flags, a set will be returned with the flags
+--- as keys and `true` as entries.
+---
+--- ```lua
+--- vim.cmd [[set formatoptions=njtcroql]]
+---
+--- vim.print(vim.opt.formatoptions:get())
+--- -- { n = true, j = true, c = true, ... }
+---
+--- local format_opts = vim.opt.formatoptions:get()
+--- if format_opts.j then
+---     print("J is enabled!")
+--- end
+--- ```
 ---
----    local format_opts = vim.opt.formatoptions:get()
----    if format_opts.j then
----        print("J is enabled!")
----    end
----</pre>
 ---@return string|integer|boolean|nil value of option
 ---@diagnostic disable-next-line:unused-local used for gen_vimdoc
 function Option:get() end
 
----Append a value to string-style options. See |:set+=|
+--- Append a value to string-style options. See |:set+=|
+---
+--- These are equivalent:
+---
+--- ```lua
+--- vim.opt.formatoptions:append('j')
+--- vim.opt.formatoptions = vim.opt.formatoptions + 'j'
+--- ```
 ---
----These are equivalent: <pre>lua
----    vim.opt.formatoptions:append('j')
----    vim.opt.formatoptions = vim.opt.formatoptions + 'j'
----</pre>
 ---@param value string Value to append
---- @diagnostic disable-next-line:unused-local used for gen_vimdoc
+---@diagnostic disable-next-line:unused-local used for gen_vimdoc
 function Option:append(value) end -- luacheck: no unused
 
----Prepend a value to string-style options. See |:set^=|
+--- Prepend a value to string-style options. See |:set^=|
+---
+--- These are equivalent:
+---
+--- ```lua
+--- vim.opt.wildignore:prepend('*.o')
+--- vim.opt.wildignore = vim.opt.wildignore ^ '*.o'
+--- ```
 ---
----These are equivalent: <pre>lua
----    vim.opt.wildignore:prepend('*.o')
----    vim.opt.wildignore = vim.opt.wildignore ^ '*.o'
----</pre>
 ---@param value string Value to prepend
 ---@diagnostic disable-next-line:unused-local used for gen_vimdoc
 function Option:prepend(value) end -- luacheck: no unused
 
----Remove a value from string-style options. See |:set-=|
+--- Remove a value from string-style options. See |:set-=|
+---
+--- These are equivalent:
+---
+--- ```lua
+--- vim.opt.wildignore:remove('*.pyc')
+--- vim.opt.wildignore = vim.opt.wildignore - '*.pyc'
+--- ```
 ---
----These are equivalent: <pre>lua
----    vim.opt.wildignore:remove('*.pyc')
----    vim.opt.wildignore = vim.opt.wildignore - '*.pyc'
----</pre>
 ---@param value string Value to remove
 ---@diagnostic disable-next-line:unused-local used for gen_vimdoc
 function Option:remove(value) end -- luacheck: no unused
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index a1f3020c88..b8d3906b7f 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -553,14 +553,16 @@ end
 --- followed by namespace configuration, and finally global configuration.
 ---
 --- For example, if a user enables virtual text globally with
---- <pre>lua
----   vim.diagnostic.config({ virtual_text = true })
---- </pre>
+---
+--- ```lua
+--- vim.diagnostic.config({ virtual_text = true })
+--- ```
 ---
 --- and a diagnostic producer sets diagnostics with
---- <pre>lua
----   vim.diagnostic.set(ns, 0, diagnostics, { virtual_text = false })
---- </pre>
+---
+--- ```lua
+--- vim.diagnostic.set(ns, 0, diagnostics, { virtual_text = false })
+--- ```
 ---
 --- then virtual text will not be enabled for those diagnostics.
 ---
@@ -1601,18 +1603,20 @@ end
 --- Parse a diagnostic from a string.
 ---
 --- For example, consider a line of output from a linter:
---- <pre>
+---
+--- ```
 --- WARNING filename:27:3: Variable 'foo' does not exist
---- </pre>
+--- ```
 ---
 --- This can be parsed into a diagnostic |diagnostic-structure|
 --- with:
---- <pre>lua
----   local s = "WARNING filename:27:3: Variable 'foo' does not exist"
----   local pattern = "^(%w+) %w+:(%d+):(%d+): (.+)$"
----   local groups = { "severity", "lnum", "col", "message" }
----   vim.diagnostic.match(s, pattern, groups, { WARNING = vim.diagnostic.WARN })
---- </pre>
+---
+--- ```lua
+--- local s = "WARNING filename:27:3: Variable 'foo' does not exist"
+--- local pattern = "^(%w+) %w+:(%d+):(%d+): (.+)$"
+--- local groups = { "severity", "lnum", "col", "message" }
+--- vim.diagnostic.match(s, pattern, groups, { WARNING = vim.diagnostic.WARN })
+--- ```
 ---
 ---@param str string String to parse diagnostics from.
 ---@param pat string Lua pattern with capture groups.
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 6fb6f475bc..d847c28f5c 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2081,43 +2081,45 @@ end
 --- See $VIMRUNTIME/lua/vim/filetype.lua for more examples.
 ---
 --- Example:
---- <pre>lua
----  vim.filetype.add({
----    extension = {
----      foo = 'fooscript',
----      bar = function(path, bufnr)
----        if some_condition() then
----          return 'barscript', function(bufnr)
----            -- Set a buffer variable
----            vim.b[bufnr].barscript_version = 2
----          end
----        end
----        return 'bar'
----      end,
----    },
----    filename = {
----      ['.foorc'] = 'toml',
----      ['/etc/foo/config'] = 'toml',
----    },
----    pattern = {
----      ['.*/etc/foo/.*'] = 'fooscript',
----      -- Using an optional priority
----      ['.*/etc/foo/.*%.conf'] = { 'dosini', { priority = 10 } },
----      -- A pattern containing an environment variable
----      ['${XDG_CONFIG_HOME}/foo/git'] = 'git',
----      ['README.(%a+)$'] = function(path, bufnr, ext)
----        if ext == 'md' then
----          return 'markdown'
----        elseif ext == 'rst' then
----          return 'rst'
----        end
----      end,
----    },
----  })
---- </pre>
+---
+--- ```lua
+--- vim.filetype.add({
+---   extension = {
+---     foo = 'fooscript',
+---     bar = function(path, bufnr)
+---       if some_condition() then
+---         return 'barscript', function(bufnr)
+---           -- Set a buffer variable
+---           vim.b[bufnr].barscript_version = 2
+---         end
+---       end
+---       return 'bar'
+---     end,
+---   },
+---   filename = {
+---     ['.foorc'] = 'toml',
+---     ['/etc/foo/config'] = 'toml',
+---   },
+---   pattern = {
+---     ['.*/etc/foo/.*'] = 'fooscript',
+---     -- Using an optional priority
+---     ['.*/etc/foo/.*%.conf'] = { 'dosini', { priority = 10 } },
+---     -- A pattern containing an environment variable
+---     ['${XDG_CONFIG_HOME}/foo/git'] = 'git',
+---     ['README.(%a+)$'] = function(path, bufnr, ext)
+---       if ext == 'md' then
+---         return 'markdown'
+---       elseif ext == 'rst' then
+---         return 'rst'
+---       end
+---     end,
+---   },
+--- })
+--- ```
 ---
 --- To add a fallback match on contents, use
---- <pre>lua
+---
+--- ```lua
 --- vim.filetype.add {
 ---   pattern = {
 ---     ['.*'] = {
@@ -2133,7 +2135,7 @@ end
 ---     },
 ---   },
 --- }
---- </pre>
+--- ```
 ---
 ---@param filetypes vim.filetype.add.filetypes A table containing new filetype maps (see example).
 function M.add(filetypes)
@@ -2256,19 +2258,19 @@ end
 --- Each of the three options is specified using a key to the single argument of this function.
 --- Example:
 ---
---- <pre>lua
----   -- Using a buffer number
----   vim.filetype.match({ buf = 42 })
+--- ```lua
+--- -- Using a buffer number
+--- vim.filetype.match({ buf = 42 })
 ---
----   -- Override the filename of the given buffer
----   vim.filetype.match({ buf = 42, filename = 'foo.c' })
+--- -- Override the filename of the given buffer
+--- vim.filetype.match({ buf = 42, filename = 'foo.c' })
 ---
----   -- Using a filename without a buffer
----   vim.filetype.match({ filename = 'main.lua' })
+--- -- Using a filename without a buffer
+--- vim.filetype.match({ filename = 'main.lua' })
 ---
----   -- Using file contents
----   vim.filetype.match({ contents = {'#!/usr/bin/env bash'} })
---- </pre>
+--- -- Using file contents
+--- vim.filetype.match({ contents = {'#!/usr/bin/env bash'} })
+--- ```
 ---
 ---@param args vim.filetype.match.args Table specifying which matching strategy to use.
 ---                 Accepted keys are:
@@ -2404,9 +2406,10 @@ end
 --- is set, meaning it should respect all FileType autocmds and ftplugin files.
 ---
 --- Example:
---- <pre>lua
----   vim.filetype.get_option('vim', 'commentstring')
---- </pre>
+---
+--- ```lua
+--- vim.filetype.get_option('vim', 'commentstring')
+--- ```
 ---
 --- Note: this uses |nvim_get_option_value()| but caches the result.
 --- This means |ftplugin| and |FileType| autocommands are only
diff --git a/runtime/lua/vim/fs.lua b/runtime/lua/vim/fs.lua
index 7cd9e3cf04..22612a7255 100644
--- a/runtime/lua/vim/fs.lua
+++ b/runtime/lua/vim/fs.lua
@@ -5,7 +5,8 @@ local iswin = vim.uv.os_uname().sysname == 'Windows_NT'
 --- Iterate over all the parents of the given path.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 --- local root_dir
 --- for dir in vim.fs.parents(vim.api.nvim_buf_get_name(0)) do
 ---   if vim.fn.isdirectory(dir .. "/.git") == 1 then
@@ -17,7 +18,7 @@ local iswin = vim.uv.os_uname().sysname == 'Windows_NT'
 --- if root_dir then
 ---   print("Found git repository at", root_dir)
 --- end
---- </pre>
+--- ```
 ---
 ---@param start (string) Initial path.
 ---@return fun(_, dir: string): string? # Iterator
@@ -165,7 +166,8 @@ end
 --- to narrow the search to find only that type.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 --- -- location of Cargo.toml from the current buffer's path
 --- local cargo = vim.fs.find('Cargo.toml', {
 ---   upward = true,
@@ -183,7 +185,7 @@ end
 --- local cpp_hpp = vim.fs.find(function(name, path)
 ---   return name:match('.*%.[ch]pp$') and path:match('[/\\\\]lib$')
 --- end, {limit = math.huge, type = 'file'})
---- </pre>
+--- ```
 ---
 ---@param names (string|string[]|fun(name: string, path: string): boolean) Names of the items to find.
 ---             Must be base names, paths and globs are not supported when {names} is a string or a table.
@@ -322,16 +324,17 @@ end
 --- variables are also expanded.
 ---
 --- Examples:
---- <pre>lua
----   vim.fs.normalize('C:\\\\Users\\\\jdoe')
----   --> 'C:/Users/jdoe'
 ---
----   vim.fs.normalize('~/src/neovim')
----   --> '/home/jdoe/src/neovim'
+--- ```lua
+--- vim.fs.normalize('C:\\\\Users\\\\jdoe')
+--- -- 'C:/Users/jdoe'
+---
+--- vim.fs.normalize('~/src/neovim')
+--- -- '/home/jdoe/src/neovim'
 ---
----   vim.fs.normalize('$XDG_CONFIG_HOME/nvim/init.vim')
----   --> '/Users/jdoe/.config/nvim/init.vim'
---- </pre>
+--- vim.fs.normalize('$XDG_CONFIG_HOME/nvim/init.vim')
+--- -- '/Users/jdoe/.config/nvim/init.vim'
+--- ```
 ---
 ---@param path (string) Path to normalize
 ---@param opts table|nil Options:
diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index fd4fb54a5b..fc2fd43c97 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -1,23 +1,24 @@
 ---@defgroup vim.highlight
 ---
----@brief
----Nvim includes a function for highlighting a selection on yank.
+--- Nvim includes a function for highlighting a selection on yank.
 ---
----To enable it, add the following to your `init.vim`:
----<pre>vim
----    au TextYankPost * silent! lua vim.highlight.on_yank()
----</pre>
+--- To enable it, add the following to your `init.vim`:
 ---
----You can customize the highlight group and the duration of
----the highlight via:
----<pre>vim
----    au TextYankPost * silent! lua vim.highlight.on_yank {higroup="IncSearch", timeout=150}
----</pre>
+--- ```vim
+--- au TextYankPost * silent! lua vim.highlight.on_yank()
+--- ```
 ---
----If you want to exclude visual selections from highlighting on yank, use:
----<pre>vim
----    au TextYankPost * silent! lua vim.highlight.on_yank {on_visual=false}
----</pre>
+--- You can customize the highlight group and the duration of the highlight via:
+---
+--- ```vim
+--- au TextYankPost * silent! lua vim.highlight.on_yank {higroup="IncSearch", timeout=150}
+--- ```
+---
+--- If you want to exclude visual selections from highlighting on yank, use:
+---
+--- ```vim
+--- au TextYankPost * silent! lua vim.highlight.on_yank {on_visual=false}
+--- ```
 
 local api = vim.api
 
diff --git a/runtime/lua/vim/keymap.lua b/runtime/lua/vim/keymap.lua
index 2b55ddc787..df593be097 100644
--- a/runtime/lua/vim/keymap.lua
+++ b/runtime/lua/vim/keymap.lua
@@ -2,20 +2,21 @@ local keymap = {}
 
 --- Adds a new |mapping|.
 --- Examples:
---- <pre>lua
----   -- Map to a Lua function:
----   vim.keymap.set('n', 'lhs', function() print("real lua function") end)
----   -- Map to multiple modes:
----   vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer = true })
----   -- Buffer-local mapping:
----   vim.keymap.set('n', '<leader>w', "<cmd>w<cr>", { silent = true, buffer = 5 })
----   -- Expr mapping:
----   vim.keymap.set('i', '<Tab>', function()
----     return vim.fn.pumvisible() == 1 and "<C-n>" or "<Tab>"
----   end, { expr = true })
----   -- <Plug> mapping:
----   vim.keymap.set('n', '[%%', '<Plug>(MatchitNormalMultiBackward)')
---- </pre>
+---
+--- ```lua
+--- -- Map to a Lua function:
+--- vim.keymap.set('n', 'lhs', function() print("real lua function") end)
+--- -- Map to multiple modes:
+--- vim.keymap.set({'n', 'v'}, '<leader>lr', vim.lsp.buf.references, { buffer = true })
+--- -- Buffer-local mapping:
+--- vim.keymap.set('n', '<leader>w', "<cmd>w<cr>", { silent = true, buffer = 5 })
+--- -- Expr mapping:
+--- vim.keymap.set('i', '<Tab>', function()
+---   return vim.fn.pumvisible() == 1 and "<C-n>" or "<Tab>"
+--- end, { expr = true })
+--- -- <Plug> mapping:
+--- vim.keymap.set('n', '[%%', '<Plug>(MatchitNormalMultiBackward)')
+--- ```
 ---
 ---@param mode string|table    Mode short-name, see |nvim_set_keymap()|.
 ---                            Can also be list of modes to create mapping on multiple modes.
@@ -80,11 +81,13 @@ end
 
 --- Remove an existing mapping.
 --- Examples:
---- <pre>lua
----   vim.keymap.del('n', 'lhs')
 ---
----   vim.keymap.del({'n', 'i', 'v'}, '<leader>w', { buffer = 5 })
---- </pre>
+--- ```lua
+--- vim.keymap.del('n', 'lhs')
+---
+--- vim.keymap.del({'n', 'i', 'v'}, '<leader>w', { buffer = 5 })
+--- ```
+---
 ---@param opts table|nil A table of optional arguments:
 ---                      - "buffer": (number|boolean) Remove a mapping from the given buffer.
 ---                        When `0` or `true`, use the current buffer.
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index c25358e557..f68ca7e88c 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -809,13 +809,14 @@ end
 --- Attaches the current buffer to the client.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 --- vim.lsp.start({
 ---    name = 'my-server-name',
 ---    cmd = {'name-of-language-server-executable'},
 ---    root_dir = vim.fs.dirname(vim.fs.find({'pyproject.toml', 'setup.py'}, { upward = true })[1]),
 --- })
---- </pre>
+--- ```
 ---
 --- See |vim.lsp.start_client()| for all available options. The most important are:
 ---
@@ -1988,9 +1989,10 @@ end
 ---
 --- You can also use the `stop()` function on a |vim.lsp.client| object.
 --- To stop all clients:
---- <pre>lua
+---
+--- ```lua
 --- vim.lsp.stop_client(vim.lsp.get_clients())
---- </pre>
+--- ```
 ---
 --- By default asks the server to shutdown, unless stop was requested
 --- already for this client, then force-shutdown is attempted.
@@ -2502,12 +2504,7 @@ end
 ---@param bufnr integer Buffer number
 ---@param fn function Function to run on each client attached to buffer
 ---                   {bufnr}. The function takes the client, client ID, and
----                   buffer number as arguments. Example:
----             <pre>lua
----               vim.lsp.for_each_buffer_client(0, function(client, client_id, bufnr)
----                 vim.print(client)
----               end)
----             </pre>
+---                   buffer number as arguments.
 ---@deprecated use lsp.get_clients({ bufnr = bufnr }) with regular loop
 function lsp.for_each_buffer_client(bufnr, fn)
   return for_each_buffer_client(bufnr, fn)
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 6cd0aa1e95..8a29fac2b5 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -168,13 +168,11 @@ end
 ---
 ---     - filter (function|nil):
 ---         Predicate used to filter clients. Receives a client as argument and must return a
----         boolean. Clients matching the predicate are included. Example:
----
----         <pre>lua
----           -- Never request typescript-language-server for formatting
----           vim.lsp.buf.format {
----             filter = function(client) return client.name ~= "tsserver" end
----           }
+---         boolean. Clients matching the predicate are included. Example: <pre>lua
+---                     -- Never request typescript-language-server for formatting
+---                     vim.lsp.buf.format {
+---                       filter = function(client) return client.name ~= "tsserver" end
+---                     }
 ---         </pre>
 ---
 ---     - async boolean|nil
@@ -555,11 +553,12 @@ end
 --- Send request to the server to resolve document highlights for the current
 --- text document position. This request can be triggered by a  key mapping or
 --- by events such as `CursorHold`, e.g.:
---- <pre>vim
----   autocmd CursorHold  <buffer> lua vim.lsp.buf.document_highlight()
----   autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()
----   autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
---- </pre>
+---
+--- ```vim
+--- autocmd CursorHold  <buffer> lua vim.lsp.buf.document_highlight()
+--- autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()
+--- autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
+--- ```
 ---
 --- Note: Usage of |vim.lsp.buf.document_highlight()| requires the following highlight groups
 ---       to be defined or you won't be able to see the actual highlights.
diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index d581eb985f..384d09ee48 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -255,10 +255,10 @@ end
 --- It is recommended to trigger this using an autocmd or via keymap.
 ---
 --- Example:
---- <pre>vim
----   autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh()
---- </pre>
 ---
+--- ```vim
+--- autocmd BufEnter,CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh()
+--- ```
 function M.refresh()
   local params = {
     textDocument = util.make_text_document_params(),
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index 2a77992c4d..73ffa1a46c 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -203,7 +203,8 @@ end
 ---
 --- See |vim.diagnostic.config()| for configuration options. Handler-specific
 --- configuration can be set using |vim.lsp.with()|:
---- <pre>lua
+---
+--- ```lua
 --- vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
 ---   vim.lsp.diagnostic.on_publish_diagnostics, {
 ---     -- Enable underline, use default values
@@ -221,7 +222,7 @@ end
 ---     update_in_insert = false,
 ---   }
 --- )
---- </pre>
+--- ```
 ---
 ---@param config table Configuration table (see |vim.diagnostic.config()|).
 function M.on_publish_diagnostics(_, result, ctx, config)
@@ -263,7 +264,8 @@ end
 ---
 --- See |vim.diagnostic.config()| for configuration options. Handler-specific
 --- configuration can be set using |vim.lsp.with()|:
---- <pre>lua
+---
+--- ```lua
 --- vim.lsp.handlers["textDocument/diagnostic"] = vim.lsp.with(
 ---   vim.lsp.diagnostic.on_diagnostic, {
 ---     -- Enable underline, use default values
@@ -281,7 +283,7 @@ end
 ---     update_in_insert = false,
 ---   }
 --- )
---- </pre>
+--- ```
 ---
 ---@param config table Configuration table (see |vim.diagnostic.config()|).
 function M.on_diagnostic(_, result, ctx, config)
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 81d4d6cceb..4ea3dde81c 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -342,16 +342,18 @@ M[ms.textDocument_completion] = function(_, result, _, _)
 end
 
 --- |lsp-handler| for the method "textDocument/hover"
---- <pre>lua
----   vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
----     vim.lsp.handlers.hover, {
----       -- Use a sharp border with `FloatBorder` highlights
----       border = "single",
----       -- add the title in hover float window
----       title = "hover"
----     }
----   )
---- </pre>
+---
+--- ```lua
+--- vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
+---   vim.lsp.handlers.hover, {
+---     -- Use a sharp border with `FloatBorder` highlights
+---     border = "single",
+---     -- add the title in hover float window
+---     title = "hover"
+---   }
+--- )
+--- ```
+---
 ---@param config table Configuration table.
 ---     - border:     (default=nil)
 ---         - Add borders to the floating window
@@ -430,15 +432,20 @@ M[ms.textDocument_typeDefinition] = location_handler
 M[ms.textDocument_implementation] = location_handler
 
 --- |lsp-handler| for the method "textDocument/signatureHelp".
+---
 --- The active parameter is highlighted with |hl-LspSignatureActiveParameter|.
---- <pre>lua
----   vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
----     vim.lsp.handlers.signature_help, {
----       -- Use a sharp border with `FloatBorder` highlights
----       border = "single"
----     }
----   )
---- </pre>
+---
+--- ```lua
+--- vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
+---   vim.lsp.handlers.signature_help, {
+---     -- Use a sharp border with `FloatBorder` highlights
+---     border = "single"
+---   }
+--- )
+--- ```
+---
+---@param result table Response from the language server
+---@param ctx table Client context
 ---@param config table Configuration table.
 ---     - border:     (default=nil)
 ---         - Add borders to the floating window
diff --git a/runtime/lua/vim/lsp/semantic_tokens.lua b/runtime/lua/vim/lsp/semantic_tokens.lua
index 5b20344bd3..a5831c0beb 100644
--- a/runtime/lua/vim/lsp/semantic_tokens.lua
+++ b/runtime/lua/vim/lsp/semantic_tokens.lua
@@ -555,9 +555,10 @@ local M = {}
 --- delete the semanticTokensProvider table from the {server_capabilities} of
 --- your client in your |LspAttach| callback or your configuration's
 --- `on_attach` callback:
---- <pre>lua
----   client.server_capabilities.semanticTokensProvider = nil
---- </pre>
+---
+--- ```lua
+--- client.server_capabilities.semanticTokensProvider = nil
+--- ```
 ---
 ---@param bufnr integer
 ---@param client_id integer
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 422d49d746..0c38fa955a 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -65,19 +65,21 @@ end
 --- (as opposed to |vim.split()| which is "eager").
 ---
 --- Example:
----   <pre>lua
----   for s in vim.gsplit(':aa::b:', ':', {plain=true}) do
----     print(s)
----   end
----   </pre>
+---
+--- ```lua
+--- for s in vim.gsplit(':aa::b:', ':', {plain=true}) do
+---   print(s)
+--- end
+--- ```
 ---
 --- If you want to also inspect the separator itself (instead of discarding it), use
 --- |string.gmatch()|. Example:
----   <pre>lua
----   for word, num in ('foo111bar222'):gmatch('([^0-9]*)(%d*)') do
----     print(('word: %s num: %s'):format(word, num))
----   end
----   </pre>
+---
+--- ```lua
+--- for word, num in ('foo111bar222'):gmatch('([^0-9]*)(%d*)') do
+---   print(('word: %s num: %s'):format(word, num))
+--- end
+--- ```
 ---
 --- @see |string.gmatch()|
 --- @see |vim.split()|
@@ -165,12 +167,13 @@ end
 --- |vim.gsplit()|).
 ---
 --- Examples:
---- <pre>lua
----  split(":aa::b:", ":")                   --> {'','aa','','b',''}
----  split("axaby", "ab?")                   --> {'','x','y'}
----  split("x*yz*o", "*", {plain=true})      --> {'x','yz','o'}
----  split("|x|y|z|", "|", {trimempty=true}) --> {'x', 'y', 'z'}
---- </pre>
+---
+--- ```lua
+--- split(":aa::b:", ":")                   --> {'','aa','','b',''}
+--- split("axaby", "ab?")                   --> {'','x','y'}
+--- split("x*yz*o", "*", {plain=true})      --> {'x','yz','o'}
+--- split("|x|y|z|", "|", {trimempty=true}) --> {'x', 'y', 'z'}
+--- ```
 ---
 ---@see |vim.gsplit()|
 ---@see |string.gmatch()|
@@ -259,12 +262,13 @@ end
 --- a predicate that is checked for each value.
 ---
 --- Example:
---- <pre>lua
----  vim.tbl_contains({ 'a', { 'b', 'c' } }, function(v)
----    return vim.deep_equal(v, { 'b', 'c' })
----  end, { predicate = true })
----  -- true
---- </pre>
+---
+--- ```lua
+--- vim.tbl_contains({ 'a', { 'b', 'c' } }, function(v)
+---   return vim.deep_equal(v, { 'b', 'c' })
+--- end, { predicate = true })
+--- -- true
+--- ```
 ---
 ---@see |vim.list_contains()| for checking values in list-like tables
 ---
@@ -455,10 +459,11 @@ end
 --- Return `nil` if the key does not exist.
 ---
 --- Examples:
---- <pre>lua
----  vim.tbl_get({ key = { nested_key = true }}, 'key', 'nested_key') == true
----  vim.tbl_get({ key = {}}, 'key', 'nested_key') == nil
---- </pre>
+---
+--- ```lua
+--- vim.tbl_get({ key = { nested_key = true }}, 'key', 'nested_key') == true
+--- vim.tbl_get({ key = {}}, 'key', 'nested_key') == nil
+--- ```
 ---
 ---@param o table Table to index
 ---@param ... any Optional keys (0 or more, variadic) via which to index the table
@@ -626,10 +631,10 @@ end
 
 --- Counts the number of non-nil values in table `t`.
 ---
---- <pre>lua
+--- ```lua
 --- vim.tbl_count({ a=1, b=2 })  --> 2
 --- vim.tbl_count({ 1, 2 })      --> 2
---- </pre>
+--- ```
 ---
 ---@see https://github.com/Tieske/Penlight/blob/master/lua/pl/tablex.lua
 ---@param t table Table
@@ -703,38 +708,41 @@ end
 --- Validates a parameter specification (types and values).
 ---
 --- Usage example:
---- <pre>lua
----  function user.new(name, age, hobbies)
----    vim.validate{
----      name={name, 'string'},
----      age={age, 'number'},
----      hobbies={hobbies, 'table'},
----    }
----    ...
----  end
---- </pre>
+---
+--- ```lua
+--- function user.new(name, age, hobbies)
+---   vim.validate{
+---     name={name, 'string'},
+---     age={age, 'number'},
+---     hobbies={hobbies, 'table'},
+---   }
+---   ...
+--- end
+--- ```
 ---
 --- Examples with explicit argument values (can be run directly):
---- <pre>lua
----  vim.validate{arg1={{'foo'}, 'table'}, arg2={'foo', 'string'}}
----     --> NOP (success)
 ---
----  vim.validate{arg1={1, 'table'}}
----     --> error('arg1: expected table, got number')
+--- ```lua
+--- vim.validate{arg1={{'foo'}, 'table'}, arg2={'foo', 'string'}}
+---    --> NOP (success)
 ---
----  vim.validate{arg1={3, function(a) return (a % 2) == 0 end, 'even number'}}
----     --> error('arg1: expected even number, got 3')
---- </pre>
+--- vim.validate{arg1={1, 'table'}}
+---    --> error('arg1: expected table, got number')
+---
+--- vim.validate{arg1={3, function(a) return (a % 2) == 0 end, 'even number'}}
+---    --> error('arg1: expected even number, got 3')
+--- ```
 ---
 --- If multiple types are valid they can be given as a list.
---- <pre>lua
----  vim.validate{arg1={{'foo'}, {'table', 'string'}}, arg2={'foo', {'table', 'string'}}}
----     --> NOP (success)
 ---
----  vim.validate{arg1={1, {'string', 'table'}}}
----     --> error('arg1: expected string|table, got number')
+--- ```lua
+--- vim.validate{arg1={{'foo'}, {'table', 'string'}}, arg2={'foo', {'table', 'string'}}}
+--- -- NOP (success)
+---
+--- vim.validate{arg1={1, {'string', 'table'}}}
+--- -- error('arg1: expected string|table, got number')
 ---
---- </pre>
+--- ```
 ---
 ---@param opt table Names of parameters to validate. Each key is a parameter
 ---          name; each value is a tuple in one of these forms:
@@ -866,10 +874,10 @@ end
 --- If {create} is `nil`, this will create a defaulttable whose constructor function is
 --- this function, effectively allowing to create nested tables on the fly:
 ---
---- <pre>lua
+--- ```lua
 --- local a = vim.defaulttable()
 --- a.b.c = 1
---- </pre>
+--- ```
 ---
 ---@param create function?(key:any):any The function called to create a missing value.
 ---@return table Empty table with metamethod
@@ -938,7 +946,7 @@ do
   --- Create a ring buffer limited to a maximal number of items.
   --- Once the buffer is full, adding a new entry overrides the oldest entry.
   ---
-  --- <pre>
+  --- ```lua
   ---   local ringbuf = vim.ringbuf(4)
   ---   ringbuf:push("a")
   ---   ringbuf:push("b")
@@ -952,7 +960,7 @@ do
   ---   for val in ringbuf do
   ---     print(val)
   ---   end
-  --- </pre>
+  --- ```
   ---
   --- Returns a Ringbuf instance with the following methods:
   ---
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 4f84fc2e0f..169aa6c269 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -441,14 +441,15 @@ end
 --- In this case, add ``vim.bo.syntax = 'on'`` after the call to `start`.
 ---
 --- Example:
---- <pre>lua
+---
+--- ```lua
 --- vim.api.nvim_create_autocmd( 'FileType', { pattern = 'tex',
 ---     callback = function(args)
 ---         vim.treesitter.start(args.buf, 'latex')
 ---         vim.bo[args.buf].syntax = 'on'  -- only if additional legacy syntax is needed
 ---     end
 --- })
---- </pre>
+--- ```
 ---
 ---@param bufnr (integer|nil) Buffer to be highlighted (default: current buffer)
 ---@param lang (string|nil) Language of the parser (default: buffer filetype)
@@ -502,9 +503,11 @@ function M.preview_query()
 end
 
 --- Returns the fold level for {lnum} in the current buffer. Can be set directly to 'foldexpr':
---- <pre>lua
+---
+--- ```lua
 --- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
---- </pre>
+--- ```
+---
 ---@param lnum integer|nil Line number to calculate fold level for
 ---@return string
 function M.foldexpr(lnum)
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 1ea0f6b2b9..79f36a27fd 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -7,9 +7,9 @@
 ---
 --- To create a LanguageTree (parser object) for a given buffer and language, use:
 ---
---- <pre>lua
----     local parser = vim.treesitter.get_parser(bufnr, lang)
---- </pre>
+--- ```lua
+--- local parser = vim.treesitter.get_parser(bufnr, lang)
+--- ```
 ---
 --- (where `bufnr=0` means current buffer). `lang` defaults to 'filetype'.
 --- Note: currently the parser is retained for the lifetime of a buffer but this may change;
@@ -17,9 +17,9 @@
 ---
 --- Whenever you need to access the current syntax tree, parse the buffer:
 ---
---- <pre>lua
----     local tree = parser:parse({ start_row, end_row })
---- </pre>
+--- ```lua
+--- local tree = parser:parse({ start_row, end_row })
+--- ```
 ---
 --- This returns a table of immutable |treesitter-tree| objects representing the current state of
 --- the buffer. When the plugin wants to access the state after a (possible) edit it must call
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 3093657313..350ccba7e4 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -692,7 +692,8 @@ end
 --- The iterator returns three values: a numeric id identifying the capture,
 --- the captured node, and metadata from any directives processing the match.
 --- The following example shows how to get captures by name:
---- <pre>lua
+---
+--- ```lua
 --- for id, node, metadata in query:iter_captures(tree:root(), bufnr, first, last) do
 ---   local name = query.captures[id] -- name of the capture in the query
 ---   -- typically useful info about the node:
@@ -700,7 +701,7 @@ end
 ---   local row1, col1, row2, col2 = node:range() -- range of the capture
 ---   -- ... use the info here ...
 --- end
---- </pre>
+--- ```
 ---
 ---@param node TSNode under which the search will occur
 ---@param source (integer|string) Source buffer or string to extract text from
@@ -743,7 +744,8 @@ end
 --- If the query has more than one pattern, the capture table might be sparse
 --- and e.g. `pairs()` method should be used over `ipairs`.
 --- Here is an example iterating over all captures in every match:
---- <pre>lua
+---
+--- ```lua
 --- for pattern, match, metadata in cquery:iter_matches(tree:root(), bufnr, first, last) do
 ---   for id, node in pairs(match) do
 ---     local name = query.captures[id]
@@ -754,7 +756,7 @@ end
 ---     -- ... use the info here ...
 ---   end
 --- end
---- </pre>
+--- ```
 ---
 ---@param node TSNode under which the search will occur
 ---@param source (integer|string) Source buffer or string to search
@@ -824,9 +826,11 @@ end
 --- Omnifunc for completing node names and predicates in treesitter queries.
 ---
 --- Use via
---- <pre>lua
----   vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
---- </pre>
+---
+--- ```lua
+--- vim.bo.omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
+--- ```
+---
 function M.omnifunc(findstart, base)
   return require('vim.treesitter._query_linter').omnifunc(findstart, base)
 end
diff --git a/runtime/lua/vim/ui.lua b/runtime/lua/vim/ui.lua
index cd90886489..b6ddf337ce 100644
--- a/runtime/lua/vim/ui.lua
+++ b/runtime/lua/vim/ui.lua
@@ -3,6 +3,23 @@ local M = {}
 --- Prompts the user to pick from a list of items, allowing arbitrary (potentially asynchronous)
 --- work until `on_choice`.
 ---
+--- Example:
+---
+--- ```lua
+--- vim.ui.select({ 'tabs', 'spaces' }, {
+---     prompt = 'Select tabs or spaces:',
+---     format_item = function(item)
+---         return "I'd like to choose " .. item
+---     end,
+--- }, function(choice)
+---     if choice == 'spaces' then
+---         vim.o.expandtab = true
+---     else
+---         vim.o.expandtab = false
+---     end
+--- end)
+--- ```
+---
 ---@param items table Arbitrary items
 ---@param opts table Additional options
 ---     - prompt (string|nil)
@@ -19,23 +36,6 @@ local M = {}
 ---               Called once the user made a choice.
 ---               `idx` is the 1-based index of `item` within `items`.
 ---               `nil` if the user aborted the dialog.
----
----
---- Example:
---- <pre>lua
---- vim.ui.select({ 'tabs', 'spaces' }, {
----     prompt = 'Select tabs or spaces:',
----     format_item = function(item)
----         return "I'd like to choose " .. item
----     end,
---- }, function(choice)
----     if choice == 'spaces' then
----         vim.o.expandtab = true
----     else
----         vim.o.expandtab = false
----     end
---- end)
---- </pre>
 function M.select(items, opts, on_choice)
   vim.validate({
     items = { items, 'table', false },
@@ -58,6 +58,14 @@ end
 --- Prompts the user for input, allowing arbitrary (potentially asynchronous) work until
 --- `on_confirm`.
 ---
+--- Example:
+---
+--- ```lua
+--- vim.ui.input({ prompt = 'Enter value for shiftwidth: ' }, function(input)
+---     vim.o.shiftwidth = tonumber(input)
+--- end)
+--- ```
+---
 ---@param opts table Additional options. See |input()|
 ---     - prompt (string|nil)
 ---               Text of the prompt
@@ -77,13 +85,6 @@ end
 ---               `input` is what the user typed (it might be
 ---               an empty string if nothing was entered), or
 ---               `nil` if the user aborted the dialog.
----
---- Example:
---- <pre>lua
---- vim.ui.input({ prompt = 'Enter value for shiftwidth: ' }, function(input)
----     vim.o.shiftwidth = tonumber(input)
---- end)
---- </pre>
 function M.input(opts, on_confirm)
   vim.validate({
     on_confirm = { on_confirm, 'function', false },
@@ -110,11 +111,12 @@ end
 --- Expands "~/" and environment variables in filesystem paths.
 ---
 --- Examples:
---- <pre>lua
+---
+--- ```lua
 --- vim.ui.open("https://neovim.io/")
 --- vim.ui.open("~/path/to/file")
 --- vim.ui.open("$VIMRUNTIME")
---- </pre>
+--- ```
 ---
 ---@param path string Path or URL to open
 ---
diff --git a/runtime/lua/vim/version.lua b/runtime/lua/vim/version.lua
index 056e1678ff..306eef90d3 100644
--- a/runtime/lua/vim/version.lua
+++ b/runtime/lua/vim/version.lua
@@ -5,12 +5,13 @@
 --- available tools and dependencies on the current system.
 ---
 --- Example:
----   <pre>lua
----   local v = vim.version.parse(vim.fn.system({'tmux', '-V'}), {strict=false})
----   if vim.version.gt(v, {3, 2, 0}) then
----     -- ...
----   end
----   </pre>
+---
+--- ```lua
+--- local v = vim.version.parse(vim.fn.system({'tmux', '-V'}), {strict=false})
+--- if vim.version.gt(v, {3, 2, 0}) then
+---   -- ...
+--- end
+--- ```
 ---
 --- \*vim.version()\* returns the version of the current Nvim process.
 ---
@@ -21,35 +22,36 @@
 ---
 --- Supported range specs are shown in the following table.
 --- Note: suffixed versions (1.2.3-rc1) are not matched.
----   <pre>
----   1.2.3             is 1.2.3
----   =1.2.3            is 1.2.3
----   >1.2.3            greater than 1.2.3
----   <1.2.3            before 1.2.3
----   >=1.2.3           at least 1.2.3
----   ~1.2.3            is >=1.2.3 <1.3.0       "reasonably close to 1.2.3"
----   ^1.2.3            is >=1.2.3 <2.0.0       "compatible with 1.2.3"
----   ^0.2.3            is >=0.2.3 <0.3.0       (0.x.x is special)
----   ^0.0.1            is =0.0.1               (0.0.x is special)
----   ^1.2              is >=1.2.0 <2.0.0       (like ^1.2.0)
----   ~1.2              is >=1.2.0 <1.3.0       (like ~1.2.0)
----   ^1                is >=1.0.0 <2.0.0       "compatible with 1"
----   ~1                same                    "reasonably close to 1"
----   1.x               same
----   1.*               same
----   1                 same
----   *                 any version
----   x                 same
 ---
----   1.2.3 - 2.3.4     is >=1.2.3 <=2.3.4
+--- ```
+--- 1.2.3             is 1.2.3
+--- =1.2.3            is 1.2.3
+--- >1.2.3            greater than 1.2.3
+--- <1.2.3            before 1.2.3
+--- >=1.2.3           at least 1.2.3
+--- ~1.2.3            is >=1.2.3 <1.3.0       "reasonably close to 1.2.3"
+--- ^1.2.3            is >=1.2.3 <2.0.0       "compatible with 1.2.3"
+--- ^0.2.3            is >=0.2.3 <0.3.0       (0.x.x is special)
+--- ^0.0.1            is =0.0.1               (0.0.x is special)
+--- ^1.2              is >=1.2.0 <2.0.0       (like ^1.2.0)
+--- ~1.2              is >=1.2.0 <1.3.0       (like ~1.2.0)
+--- ^1                is >=1.0.0 <2.0.0       "compatible with 1"
+--- ~1                same                    "reasonably close to 1"
+--- 1.x               same
+--- 1.*               same
+--- 1                 same
+--- *                 any version
+--- x                 same
+---
+--- 1.2.3 - 2.3.4     is >=1.2.3 <=2.3.4
 ---
----   Partial right: missing pieces treated as x (2.3 => 2.3.x).
----   1.2.3 - 2.3       is >=1.2.3 <2.4.0
----   1.2.3 - 2         is >=1.2.3 <3.0.0
+--- Partial right: missing pieces treated as x (2.3 => 2.3.x).
+--- 1.2.3 - 2.3       is >=1.2.3 <2.4.0
+--- 1.2.3 - 2         is >=1.2.3 <3.0.0
 ---
----   Partial left: missing pieces treated as 0 (1.2 => 1.2.0).
----   1.2 - 2.3.0       is 1.2.0 - 2.3.0
----   </pre>
+--- Partial left: missing pieces treated as 0 (1.2 => 1.2.0).
+--- 1.2 - 2.3.0       is 1.2.0 - 2.3.0
+--- ```
 
 local M = {}
 
@@ -237,29 +239,32 @@ function VersionRange:has(version)
 end
 
 --- Parses a semver |version-range| "spec" and returns a range object:
----   <pre>
----   {
----     from: Version
----     to: Version
----     has(v: string|Version)
----   }
----   </pre>
+---
+--- ```
+--- {
+---   from: Version
+---   to: Version
+---   has(v: string|Version)
+--- }
+--- ```
 ---
 --- `:has()` checks if a version is in the range (inclusive `from`, exclusive `to`).
 ---
 --- Example:
----   <pre>lua
----   local r = vim.version.range('1.0.0 - 2.0.0')
----   print(r:has('1.9.9'))       -- true
----   print(r:has('2.0.0'))       -- false
----   print(r:has(vim.version())) -- check against current Nvim version
----   </pre>
+---
+--- ```lua
+--- local r = vim.version.range('1.0.0 - 2.0.0')
+--- print(r:has('1.9.9'))       -- true
+--- print(r:has('2.0.0'))       -- false
+--- print(r:has(vim.version())) -- check against current Nvim version
+--- ```
 ---
 --- Or use cmp(), eq(), lt(), and gt() to compare `.to` and `.from` directly:
----   <pre>lua
----   local r = vim.version.range('1.0.0 - 2.0.0')
----   print(vim.version.gt({1,0,3}, r.from) and vim.version.lt({1,0,3}, r.to))
----   </pre>
+---
+--- ```lua
+--- local r = vim.version.range('1.0.0 - 2.0.0')
+--- print(vim.version.gt({1,0,3}, r.from) and vim.version.lt({1,0,3}, r.to))
+--- ```
 ---
 --- @see # https://github.com/npm/node-semver#ranges
 ---
@@ -345,16 +350,17 @@ end
 --- specified literally as a `{major, minor, patch}` tuple, e.g. `{1, 0, 3}`).
 ---
 --- Example:
---- <pre>lua
----   if vim.version.cmp({1,0,3}, {0,2,1}) == 0 then
----     -- ...
----   end
----   local v1 = vim.version.parse('1.0.3-pre')
----   local v2 = vim.version.parse('0.2.1')
----   if vim.version.cmp(v1, v2) == 0 then
----     -- ...
----   end
---- </pre>
+---
+--- ```lua
+--- if vim.version.cmp({1,0,3}, {0,2,1}) == 0 then
+---   -- ...
+--- end
+--- local v1 = vim.version.parse('1.0.3-pre')
+--- local v2 = vim.version.parse('0.2.1')
+--- if vim.version.cmp(v1, v2) == 0 then
+---   -- ...
+--- end
+--- ```
 ---
 --- @note Per semver, build metadata is ignored when comparing two otherwise-equivalent versions.
 ---
@@ -399,9 +405,10 @@ end
 
 --- Parses a semantic version string and returns a version object which can be used with other
 --- `vim.version` functions. For example "1.0.1-rc1+build.2" returns:
---- <pre>
----   { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
---- </pre>
+---
+--- ```
+--- { major = 1, minor = 0, patch = 1, prerelease = "rc1", build = "build.2" }
+--- ```
 ---
 --- @see # https://semver.org/spec/v2.0.0.html
 ---
-- 
cgit 


From 28233bcb49067aaa70fa6e5fec14e2cc4bcaa315 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Fri, 15 Sep 2023 03:10:55 -0700
Subject: refactor(treesitter): rename "preview" => "edit" #25161

"Edit" more closely describes the generic application than "Preview", though
the buffer contents don't (yet) map to an actual file on disk.

https://github.com/neovim/neovim/pull/24703#discussion_r1321719133
---
 runtime/doc/news.txt                 |  2 +-
 runtime/doc/treesitter.txt           | 17 +++++++------
 runtime/lua/vim/treesitter.lua       |  9 +------
 runtime/lua/vim/treesitter/dev.lua   | 48 ++++++++++++++++++------------------
 runtime/lua/vim/treesitter/query.lua |  9 +++++++
 runtime/plugin/nvim.lua              |  6 ++---
 6 files changed, 48 insertions(+), 43 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 9adc90ac21..0162a99619 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -135,7 +135,7 @@ The following new APIs and features were added.
     `vim.treesitter.language.register`.
   • The `#set!` directive now supports `injection.self` and `injection.parent` for injecting either the current node's language
     or the parent LanguageTree's language, respectively.
-  • Added `vim.treesitter.preview_query()`, for live editing of treesitter
+  • Added `vim.treesitter.query.edit()`, for live editing of treesitter
     queries.
   • Improved error messages for query parsing.
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index c62e210be1..64b4ca7ca2 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -676,8 +676,8 @@ inspect_tree({opts})                           *vim.treesitter.inspect_tree()*
 
     While in the window, press "a" to toggle display of anonymous nodes, "I"
     to toggle the display of the source language of each node, "o" to toggle
-    the query previewer, and press <Enter> to jump to the node under the
-    cursor in the source buffer.
+    the query editor, and press <Enter> to jump to the node under the cursor
+    in the source buffer.
 
     Can also be shown with `:InspectTree`.                      *:InspectTree*
 
@@ -730,11 +730,6 @@ node_contains({node}, {range})                *vim.treesitter.node_contains()*
     Return: ~
         (boolean) True if the {node} contains the {range}
 
-preview_query()                               *vim.treesitter.preview_query()*
-    Open a window for live editing of a treesitter query.
-
-    Can also be shown with `:PreviewQuery`.                    *:PreviewQuery*
-
 start({bufnr}, {lang})                                *vim.treesitter.start()*
     Starts treesitter highlighting for a buffer
 
@@ -858,6 +853,14 @@ add_predicate({name}, {handler}, {force})
                      meanings
       • {force}    (boolean|nil)
 
+edit()                                           *vim.treesitter.query.edit()*
+    Open a window for live editing of a treesitter query.
+
+    Can also be shown with `:EditQuery`.                          *:EditQuery*
+
+    Note that the editor opens a scratch buffer, and so queries aren't
+    persisted on disk.
+
 get({lang}, {query_name})                         *vim.treesitter.query.get()*
     Returns the runtime query {query_name} for {lang}.
 
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 169aa6c269..cc8be72670 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -473,7 +473,7 @@ end
 --- Open a window that displays a textual representation of the nodes in the language tree.
 ---
 --- While in the window, press "a" to toggle display of anonymous nodes, "I" to toggle the
---- display of the source language of each node, "o" to toggle the query previewer, and press
+--- display of the source language of each node, "o" to toggle the query editor, and press
 --- <Enter> to jump to the node under the cursor in the source buffer.
 ---
 --- Can also be shown with `:InspectTree`. *:InspectTree*
@@ -495,13 +495,6 @@ function M.inspect_tree(opts)
   require('vim.treesitter.dev').inspect_tree(opts)
 end
 
---- Open a window for live editing of a treesitter query.
----
---- Can also be shown with `:PreviewQuery`. *:PreviewQuery*
-function M.preview_query()
-  require('vim.treesitter.dev').preview_query()
-end
-
 --- Returns the fold level for {lnum} in the current buffer. Can be set directly to 'foldexpr':
 ---
 --- ```lua
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index e7af259d28..bc54853103 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -351,11 +351,11 @@ function M.inspect_tree(opts)
     end,
   })
   api.nvim_buf_set_keymap(b, 'n', 'o', '', {
-    desc = 'Toggle query previewer',
+    desc = 'Toggle query editor',
     callback = function()
-      local preview_w = vim.b[buf].dev_preview
-      if not preview_w or not close_win(preview_w) then
-        M.preview_query()
+      local edit_w = vim.b[buf].dev_edit
+      if not edit_w or not close_win(edit_w) then
+        M.edit_query()
       end
     end,
   })
@@ -464,16 +464,16 @@ function M.inspect_tree(opts)
   })
 end
 
-local preview_ns = api.nvim_create_namespace('treesitter/dev-preview')
+local edit_ns = api.nvim_create_namespace('treesitter/dev-edit')
 
 ---@param query_win integer
 ---@param base_win integer
-local function update_preview_highlights(query_win, base_win)
+local function update_editor_highlights(query_win, base_win)
   local base_buf = api.nvim_win_get_buf(base_win)
   local query_buf = api.nvim_win_get_buf(query_win)
   local parser = vim.treesitter.get_parser(base_buf)
   local lang = parser:lang()
-  api.nvim_buf_clear_namespace(base_buf, preview_ns, 0, -1)
+  api.nvim_buf_clear_namespace(base_buf, edit_ns, 0, -1)
   local query_content = table.concat(api.nvim_buf_get_lines(query_buf, 0, -1, false), '\n')
 
   local ok_query, query = pcall(vim.treesitter.query.parse, lang, query_content)
@@ -493,7 +493,7 @@ local function update_preview_highlights(query_win, base_win)
     local capture_name = query.captures[id]
     if capture_name == cursor_word then
       local lnum, col, end_lnum, end_col = node:range()
-      api.nvim_buf_set_extmark(base_buf, preview_ns, lnum, col, {
+      api.nvim_buf_set_extmark(base_buf, edit_ns, lnum, col, {
         end_row = end_lnum,
         end_col = end_col,
         hl_group = 'Visual',
@@ -506,17 +506,17 @@ local function update_preview_highlights(query_win, base_win)
 end
 
 --- @private
-function M.preview_query()
+function M.edit_query()
   local buf = api.nvim_get_current_buf()
   local win = api.nvim_get_current_win()
 
-  -- Close any existing previewer window
-  if vim.b[buf].dev_preview then
-    close_win(vim.b[buf].dev_preview)
+  -- Close any existing editor window
+  if vim.b[buf].dev_edit then
+    close_win(vim.b[buf].dev_edit)
   end
 
   local cmd = '60vnew'
-  -- If the inspector is open, place the previewer above it.
+  -- If the inspector is open, place the editor above it.
   local base_win = vim.b[buf].dev_base ---@type integer?
   local base_buf = base_win and api.nvim_win_get_buf(base_win)
   local inspect_win = base_buf and vim.b[base_buf].dev_inspect
@@ -537,20 +537,20 @@ function M.preview_query()
   local query_win = api.nvim_get_current_win()
   local query_buf = api.nvim_win_get_buf(query_win)
 
-  vim.b[buf].dev_preview = query_win
+  vim.b[buf].dev_edit = query_win
   vim.bo[query_buf].omnifunc = 'v:lua.vim.treesitter.query.omnifunc'
   set_dev_properties(query_win, query_buf)
 
   -- Note that omnifunc guesses the language based on the containing folder,
   -- so we add the parser's language to the buffer's name so that omnifunc
   -- can infer the language later.
-  api.nvim_buf_set_name(query_buf, string.format('%s/query_previewer.scm', lang))
+  api.nvim_buf_set_name(query_buf, string.format('%s/query_editor.scm', lang))
 
-  local group = api.nvim_create_augroup('treesitter/dev-preview', {})
+  local group = api.nvim_create_augroup('treesitter/dev-edit', {})
   api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave' }, {
     group = group,
     buffer = query_buf,
-    desc = 'Update query previewer diagnostics when the query changes',
+    desc = 'Update query editor diagnostics when the query changes',
     callback = function()
       vim.treesitter.query.lint(query_buf, { langs = lang, clear = false })
     end,
@@ -558,37 +558,37 @@ function M.preview_query()
   api.nvim_create_autocmd({ 'TextChanged', 'InsertLeave', 'CursorMoved', 'BufEnter' }, {
     group = group,
     buffer = query_buf,
-    desc = 'Update query previewer highlights when the cursor moves',
+    desc = 'Update query editor highlights when the cursor moves',
     callback = function()
       if api.nvim_win_is_valid(win) then
-        update_preview_highlights(query_win, win)
+        update_editor_highlights(query_win, win)
       end
     end,
   })
   api.nvim_create_autocmd('BufLeave', {
     group = group,
     buffer = query_buf,
-    desc = 'Clear the query previewer highlights when leaving the previewer',
+    desc = 'Clear highlights when leaving the query editor',
     callback = function()
-      api.nvim_buf_clear_namespace(buf, preview_ns, 0, -1)
+      api.nvim_buf_clear_namespace(buf, edit_ns, 0, -1)
     end,
   })
   api.nvim_create_autocmd('BufLeave', {
     group = group,
     buffer = buf,
-    desc = 'Clear the query previewer highlights when leaving the source buffer',
+    desc = 'Clear the query editor highlights when leaving the source buffer',
     callback = function()
       if not api.nvim_buf_is_loaded(query_buf) then
         return true
       end
 
-      api.nvim_buf_clear_namespace(query_buf, preview_ns, 0, -1)
+      api.nvim_buf_clear_namespace(query_buf, edit_ns, 0, -1)
     end,
   })
   api.nvim_create_autocmd('BufHidden', {
     group = group,
     buffer = buf,
-    desc = 'Close the previewer window when the source buffer is hidden',
+    desc = 'Close the editor window when the source buffer is hidden',
     once = true,
     callback = function()
       close_win(query_win)
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 350ccba7e4..d7973cc48f 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -835,4 +835,13 @@ function M.omnifunc(findstart, base)
   return require('vim.treesitter._query_linter').omnifunc(findstart, base)
 end
 
+--- Open a window for live editing of a treesitter query.
+---
+--- Can also be shown with `:EditQuery`. *:EditQuery*
+---
+--- Note that the editor opens a scratch buffer, and so queries aren't persisted on disk.
+function M.edit()
+  require('vim.treesitter.dev').edit_query()
+end
+
 return M
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index 2ddccfcff6..13a54a5e20 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -19,6 +19,6 @@ vim.api.nvim_create_user_command('InspectTree', function(cmd)
   end
 end, { desc = 'Inspect treesitter language tree for buffer', count = true })
 
-vim.api.nvim_create_user_command('PreviewQuery', function()
-  vim.treesitter.preview_query()
-end, { desc = 'Preview treesitter query' })
+vim.api.nvim_create_user_command('EditQuery', function()
+  vim.treesitter.query.edit()
+end, { desc = 'Edit treesitter query' })
-- 
cgit 


From 6debb1852355e0112ce75a5b4aed714ba1469ddb Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Fri, 15 Sep 2023 12:45:40 -0700
Subject: refactor(treesitter): remove duplicated diagnostic code (#24976)

* refactor(treesitter): remove duplicated diagnostic code

* fixup!: fix type errors

* fixup!: add type namespace
---
 runtime/lua/vim/treesitter/_query_linter.lua | 177 ++++++++-------------------
 1 file changed, 48 insertions(+), 129 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_query_linter.lua b/runtime/lua/vim/treesitter/_query_linter.lua
index 3dd0177a81..abf0bf345d 100644
--- a/runtime/lua/vim/treesitter/_query_linter.lua
+++ b/runtime/lua/vim/treesitter/_query_linter.lua
@@ -1,8 +1,6 @@
 local api = vim.api
 
 local namespace = api.nvim_create_namespace('vim.treesitter.query_linter')
--- those node names exist for every language
-local BUILT_IN_NODE_NAMES = { '_', 'ERROR' }
 
 local M = {}
 
@@ -10,11 +8,13 @@ local M = {}
 --- @field langs string[]
 --- @field clear boolean
 
+--- @alias vim.treesitter.ParseError {msg: string, range: Range4}
+
 --- @private
 --- Caches parse results for queries for each language.
 --- Entries of parse_cache[lang][query_text] will either be true for successful parse or contain the
---- error message of the parse
---- @type table<string,table<string,string|true>>
+--- message and range of the parse error.
+--- @type table<string,table<string,vim.treesitter.ParseError|true>>
 local parse_cache = {}
 
 --- Contains language dependent context for the query linter
@@ -26,20 +26,16 @@ local parse_cache = {}
 --- @private
 --- Adds a diagnostic for node in the query buffer
 --- @param diagnostics Diagnostic[]
---- @param node TSNode
---- @param buf integer
+--- @param range Range4
 --- @param lint string
 --- @param lang string?
-local function add_lint_for_node(diagnostics, node, buf, lint, lang)
-  local node_text = vim.treesitter.get_node_text(node, buf):gsub('\n', ' ')
-  --- @type string
-  local message = lint .. ': ' .. node_text
-  local error_range = { node:range() }
+local function add_lint_for_node(diagnostics, range, lint, lang)
+  local message = lint:gsub('\n', ' ')
   diagnostics[#diagnostics + 1] = {
-    lnum = error_range[1],
-    end_lnum = error_range[3],
-    col = error_range[2],
-    end_col = error_range[4],
+    lnum = range[1],
+    end_lnum = range[3],
+    col = range[2],
+    end_col = range[4],
     severity = vim.diagnostic.ERROR,
     message = message,
     source = lang,
@@ -91,6 +87,31 @@ local lint_query = [[;; query
   (ERROR) @error
 ]]
 
+--- @private
+--- @param err string
+--- @param node TSNode
+--- @return vim.treesitter.ParseError
+local function get_error_entry(err, node)
+  local start_line, start_col = node:range()
+  local line_offset, col_offset, msg = err:gmatch('.-:%d+: Query error at (%d+):(%d+)%. ([^:]+)')() ---@type string, string, string
+  start_line, start_col =
+    start_line + tonumber(line_offset) - 1, start_col + tonumber(col_offset) - 1
+  local end_line, end_col = start_line, start_col
+  if msg:match('^Invalid syntax') or msg:match('^Impossible') then
+    -- Use the length of the underlined node
+    local underlined = vim.split(err, '\n')[2]
+    end_col = end_col + #underlined
+  elseif msg:match('^Invalid') then
+    -- Use the length of the problematic type/capture/field
+    end_col = end_col + #msg:match('"([^"]+)"')
+  end
+
+  return {
+    msg = msg,
+    range = { start_line, start_col, end_line, end_col },
+  }
+end
+
 --- @private
 --- @param node TSNode
 --- @param buf integer
@@ -106,104 +127,19 @@ local function check_toplevel(node, buf, lang, diagnostics)
   local lang_cache = parse_cache[lang]
 
   if lang_cache[query_text] == nil then
-    local ok, err = pcall(vim.treesitter.query.parse, lang, query_text)
+    local cache_val, err = pcall(vim.treesitter.query.parse, lang, query_text) ---@type boolean|vim.treesitter.ParseError, string|Query
 
-    if not ok and type(err) == 'string' then
-      err = err:match('.-:%d+: (.+)')
+    if not cache_val and type(err) == 'string' then
+      cache_val = get_error_entry(err, node)
     end
 
-    lang_cache[query_text] = ok or err
+    lang_cache[query_text] = cache_val
   end
 
   local cache_entry = lang_cache[query_text]
 
-  if type(cache_entry) == 'string' then
-    add_lint_for_node(diagnostics, node, buf, cache_entry, lang)
-  end
-end
-
---- @private
---- @param node TSNode
---- @param buf integer
---- @param lang string
---- @param parser_info table
---- @param diagnostics Diagnostic[]
-local function check_field(node, buf, lang, parser_info, diagnostics)
-  local field_name = vim.treesitter.get_node_text(node, buf)
-  if not vim.tbl_contains(parser_info.fields, field_name) then
-    add_lint_for_node(diagnostics, node, buf, 'Invalid field', lang)
-  end
-end
-
---- @private
---- @param node TSNode
---- @param buf integer
---- @param lang string
---- @param parser_info (table)
---- @param diagnostics Diagnostic[]
-local function check_node(node, buf, lang, parser_info, diagnostics)
-  local node_type = vim.treesitter.get_node_text(node, buf)
-  local is_named = node_type:sub(1, 1) ~= '"'
-
-  if not is_named then
-    node_type = node_type:gsub('"(.*)".*$', '%1'):gsub('\\(.)', '%1')
-  end
-
-  local found = vim.tbl_contains(BUILT_IN_NODE_NAMES, node_type)
-    or vim.tbl_contains(parser_info.symbols, function(s)
-      return vim.deep_equal(s, { node_type, is_named })
-    end, { predicate = true })
-
-  if not found then
-    add_lint_for_node(diagnostics, node, buf, 'Invalid node type', lang)
-  end
-end
-
---- @private
---- @param node TSNode
---- @param buf integer
---- @param is_predicate boolean
---- @return string
-local function get_predicate_name(node, buf, is_predicate)
-  local name = vim.treesitter.get_node_text(node, buf)
-  if is_predicate then
-    if vim.startswith(name, 'not-') then
-      --- @type string
-      name = name:sub(string.len('not-') + 1)
-    end
-    return name .. '?'
-  end
-  return name .. '!'
-end
-
---- @private
---- @param predicate_node TSNode
---- @param predicate_type_node TSNode
---- @param buf integer
---- @param lang string?
---- @param diagnostics Diagnostic[]
-local function check_predicate(predicate_node, predicate_type_node, buf, lang, diagnostics)
-  local type_string = vim.treesitter.get_node_text(predicate_type_node, buf)
-
-  -- Quirk of the query grammar that directives are also predicates!
-  if type_string == '?' then
-    if
-      not vim.tbl_contains(
-        vim.treesitter.query.list_predicates(),
-        get_predicate_name(predicate_node, buf, true)
-      )
-    then
-      add_lint_for_node(diagnostics, predicate_node, buf, 'Unknown predicate', lang)
-    end
-  elseif type_string == '!' then
-    if
-      not vim.tbl_contains(
-        vim.treesitter.query.list_directives(),
-        get_predicate_name(predicate_node, buf, false)
-      )
-    then
-      add_lint_for_node(diagnostics, predicate_node, buf, 'Unknown directive', lang)
-    end
+  if type(cache_entry) ~= 'boolean' then
+    add_lint_for_node(diagnostics, cache_entry.range, cache_entry.msg, lang)
   end
 end
 
@@ -214,8 +150,6 @@ end
 --- @param lang_context QueryLinterLanguageContext
 --- @param diagnostics Diagnostic[]
 local function lint_match(buf, match, query, lang_context, diagnostics)
-  local predicate --- @type TSNode
-  local predicate_type --- @type TSNode
   local lang = lang_context.lang
   local parser_info = lang_context.parser_info
 
@@ -223,31 +157,16 @@ local function lint_match(buf, match, query, lang_context, diagnostics)
     local cap_id = query.captures[id]
 
     -- perform language-independent checks only for first lang
-    if lang_context.is_first_lang then
-      if cap_id == 'error' then
-        add_lint_for_node(diagnostics, node, buf, 'Syntax error')
-      elseif cap_id == 'predicate.name' then
-        predicate = node
-      elseif cap_id == 'predicate.type' then
-        predicate_type = node
-      end
+    if lang_context.is_first_lang and cap_id == 'error' then
+      local node_text = vim.treesitter.get_node_text(node, buf):gsub('\n', ' ')
+      add_lint_for_node(diagnostics, { node:range() }, 'Syntax error: ' .. node_text)
     end
 
     -- other checks rely on Neovim parser introspection
-    if lang and parser_info then
-      if cap_id == 'toplevel' then
-        check_toplevel(node, buf, lang, diagnostics)
-      elseif cap_id == 'field' then
-        check_field(node, buf, lang, parser_info, diagnostics)
-      elseif cap_id == 'node.named' or cap_id == 'node.anonymous' then
-        check_node(node, buf, lang, parser_info, diagnostics)
-      end
+    if lang and parser_info and cap_id == 'toplevel' then
+      check_toplevel(node, buf, lang, diagnostics)
     end
   end
-
-  if predicate and predicate_type then
-    check_predicate(predicate, predicate_type, buf, lang, diagnostics)
-  end
 end
 
 --- @private
@@ -339,7 +258,7 @@ function M.omnifunc(findstart, base)
     end
   end
   for _, s in pairs(parser_info.symbols) do
-    local text = s[2] and s[1] or '"' .. s[1]:gsub([[\]], [[\\]]) .. '"'
+    local text = s[2] and s[1] or '"' .. s[1]:gsub([[\]], [[\\]]) .. '"' ---@type string
     if text:find(base, 1, true) then
       table.insert(items, text)
     end
-- 
cgit 


From be10d65bfafe056025ffffa2c1131712b9a493a5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 15 Sep 2023 16:50:03 +0200
Subject: vim-patch:c1f8bb37c6a8

runtime(forth): Fix :unlet error in ftplugin (vim/vim#13090)

Fixes vim/vim#13089.

https://github.com/vim/vim/commit/c1f8bb37c6a8e0babc2a41f16860763b57c23fa1

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/forth.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/forth.vim b/runtime/ftplugin/forth.vim
index 5343784a21..d28c8484e1 100644
--- a/runtime/ftplugin/forth.vim
+++ b/runtime/ftplugin/forth.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Forth
 " Maintainer:	Johan Kotlinski <kotlinski@gmail.com>
-" Last Change:	2023 Aug 08
+" Last Change:	2023 Sep 15
 " URL:		https://github.com/jkotlinski/forth.vim
 
 if exists("b:did_ftplugin")
@@ -58,6 +58,7 @@ if exists("loaded_matchit") && !exists("b:match_words")
   let b:match_ignorecase = 1
   let b:match_words = s:matchit_patterns[1:]->join(',')
   let b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words"
+  unlet s:matchit_patterns
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
@@ -68,4 +69,4 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-unlet s:define_patterns s:include_patterns s:matchit_patterns
+unlet s:define_patterns s:include_patterns
-- 
cgit 


From 908843df61fc80f160392edc0af0d1672a8f9a68 Mon Sep 17 00:00:00 2001
From: L Lllvvuu <git@llllvvuu.dev>
Date: Wed, 13 Sep 2023 16:51:54 -0700
Subject: fix(languagetree): apply `resolve_lang` to
 `metadata['injection.language']`

`resolve_lang` is applied to `@injection.language` when it's supplied as a
capture:

https://github.com/neovim/neovim/blob/f5953edbac14febce9d4f8a3c35bdec1eae26fbe/runtime/lua/vim/treesitter/languagetree.lua#L766-L768

If we want to support `metadata['injection.language']` (as per #22518 and
[tree-sitter upstream](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection))
then the behavior should be consistent.

Fixes: nvim-treesitter/nvim-treesitter#4918
---
 runtime/lua/vim/treesitter/languagetree.lua | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 79f36a27fd..4dd5a18396 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -734,7 +734,8 @@ local has_parser = function(lang)
     or #vim.api.nvim_get_runtime_file('parser/' .. lang .. '.*', false) > 0
 end
 
---- Return parser name for language (if exists) or filetype (if registered and exists)
+--- Return parser name for language (if exists) or filetype (if registered and exists).
+--- Also attempts with the input lower-cased.
 ---
 ---@param alias string language or filetype name
 ---@return string? # resolved parser name
@@ -743,10 +744,19 @@ local function resolve_lang(alias)
     return alias
   end
 
+  if has_parser(alias:lower()) then
+    return alias:lower()
+  end
+
   local lang = vim.treesitter.language.get_lang(alias)
   if lang and has_parser(lang) then
     return lang
   end
+
+  lang = vim.treesitter.language.get_lang(alias:lower())
+  if lang and has_parser(lang) then
+    return lang
+  end
 end
 
 ---@private
@@ -758,9 +768,10 @@ end
 function LanguageTree:_get_injection(match, metadata)
   local ranges = {} ---@type Range6[]
   local combined = metadata['injection.combined'] ~= nil
+  local injection_lang = metadata['injection.language'] --[[@as string?]]
   local lang = metadata['injection.self'] ~= nil and self:lang()
     or metadata['injection.parent'] ~= nil and self._parent_lang
-    or metadata['injection.language'] --[[@as string?]]
+    or (injection_lang and resolve_lang(injection_lang))
   local include_children = metadata['injection.include-children'] ~= nil
 
   for id, node in pairs(match) do
@@ -768,7 +779,7 @@ function LanguageTree:_get_injection(match, metadata)
     -- Lang should override any other language tag
     if name == 'injection.language' then
       local text = vim.treesitter.get_node_text(node, self._source, { metadata = metadata[id] })
-      lang = resolve_lang(text) or resolve_lang(text:lower())
+      lang = resolve_lang(text)
     elseif name == 'injection.content' then
       ranges = get_node_ranges(node, self._source, metadata[id], include_children)
     end
-- 
cgit 


From 07080f67fe7e526576d5d50777fb122a99b3e183 Mon Sep 17 00:00:00 2001
From: L Lllvvuu <git@llllvvuu.dev>
Date: Sat, 16 Sep 2023 02:48:49 -0700
Subject: perf(treesitter): do not scan past given line for predicate match

Problem
---
If a highlighter query returns a significant number of predicate
non-matches, the highlighter will scan well past the end of the window.

Solution
---
In the iterator returned from `iter_captures`, accept an optional
parameter `end_line`. If no parameter provided, the behavior is
unchanged, hence this is a non-invasive tweak.

Fixes: #25113 nvim-treesitter/nvim-treesitter#5057
---
 runtime/doc/treesitter.txt                 |  4 +-
 runtime/lua/vim/treesitter/highlighter.lua | 63 ++++++++++++++++--------------
 runtime/lua/vim/treesitter/query.lua       | 10 +++--
 3 files changed, 42 insertions(+), 35 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 64b4ca7ca2..ee34c45cce 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -976,8 +976,8 @@ Query:iter_captures({node}, {source}, {start}, {stop})
       • {stop}    (integer) Stopping line for the search (end-exclusive)
 
     Return: ~
-        (fun(): integer, TSNode, TSMetadata): capture id, capture node,
-        metadata
+        (fun(end_line: integer|nil): integer, TSNode, TSMetadata): capture id,
+        capture node, metadata
 
                                                         *Query:iter_matches()*
 Query:iter_matches({node}, {source}, {start}, {stop}, {opts})
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index 8d4d6a9337..496193c6ed 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -2,7 +2,7 @@ local api = vim.api
 local query = vim.treesitter.query
 local Range = require('vim.treesitter._range')
 
----@alias TSHlIter fun(): integer, TSNode, TSMetadata
+---@alias TSHlIter fun(end_line: integer|nil): integer, TSNode, TSMetadata
 
 ---@class TSHighlightState
 ---@field next_row integer
@@ -241,40 +241,43 @@ local function on_line_impl(self, buf, line, is_spell_nav)
     end
 
     while line >= state.next_row do
-      local capture, node, metadata = state.iter()
+      local capture, node, metadata = state.iter(line)
 
-      if capture == nil then
-        break
+      local range = { root_end_row + 1, 0, root_end_row + 1, 0 }
+      if node then
+        range = vim.treesitter.get_range(node, buf, metadata and metadata[capture])
       end
-
-      local range = vim.treesitter.get_range(node, buf, metadata[capture])
       local start_row, start_col, end_row, end_col = Range.unpack4(range)
-      local hl = highlighter_query.hl_cache[capture]
-
-      local capture_name = highlighter_query:query().captures[capture]
-      local spell = nil ---@type boolean?
-      if capture_name == 'spell' then
-        spell = true
-      elseif capture_name == 'nospell' then
-        spell = false
-      end
 
-      -- Give nospell a higher priority so it always overrides spell captures.
-      local spell_pri_offset = capture_name == 'nospell' and 1 or 0
-
-      if hl and end_row >= line and (not is_spell_nav or spell ~= nil) then
-        local priority = (tonumber(metadata.priority) or vim.highlight.priorities.treesitter)
-          + spell_pri_offset
-        api.nvim_buf_set_extmark(buf, ns, start_row, start_col, {
-          end_line = end_row,
-          end_col = end_col,
-          hl_group = hl,
-          ephemeral = true,
-          priority = priority,
-          conceal = metadata.conceal,
-          spell = spell,
-        })
+      if capture then
+        local hl = highlighter_query.hl_cache[capture]
+
+        local capture_name = highlighter_query:query().captures[capture]
+        local spell = nil ---@type boolean?
+        if capture_name == 'spell' then
+          spell = true
+        elseif capture_name == 'nospell' then
+          spell = false
+        end
+
+        -- Give nospell a higher priority so it always overrides spell captures.
+        local spell_pri_offset = capture_name == 'nospell' and 1 or 0
+
+        if hl and end_row >= line and (not is_spell_nav or spell ~= nil) then
+          local priority = (tonumber(metadata.priority) or vim.highlight.priorities.treesitter)
+            + spell_pri_offset
+          api.nvim_buf_set_extmark(buf, ns, start_row, start_col, {
+            end_line = end_row,
+            end_col = end_col,
+            hl_group = hl,
+            ephemeral = true,
+            priority = priority,
+            conceal = metadata.conceal,
+            spell = spell,
+          })
+        end
       end
+
       if start_row > line then
         state.next_row = start_row
       end
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index d7973cc48f..6d9b214d4a 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -708,7 +708,8 @@ end
 ---@param start integer Starting line for the search
 ---@param stop integer Stopping line for the search (end-exclusive)
 ---
----@return (fun(): integer, TSNode, TSMetadata): capture id, capture node, metadata
+---@return (fun(end_line: integer|nil): integer, TSNode, TSMetadata):
+---        capture id, capture node, metadata
 function Query:iter_captures(node, source, start, stop)
   if type(source) == 'number' and source == 0 then
     source = api.nvim_get_current_buf()
@@ -717,7 +718,7 @@ function Query:iter_captures(node, source, start, stop)
   start, stop = value_or_node_range(start, stop, node)
 
   local raw_iter = node:_rawquery(self.query, true, start, stop)
-  local function iter()
+  local function iter(end_line)
     local capture, captured_node, match = raw_iter()
     local metadata = {}
 
@@ -725,7 +726,10 @@ function Query:iter_captures(node, source, start, stop)
       local active = self:match_preds(match, match.pattern, source)
       match.active = active
       if not active then
-        return iter() -- tail call: try next match
+        if end_line and captured_node:range() > end_line then
+          return nil, captured_node, nil
+        end
+        return iter(end_line) -- tail call: try next match
       end
 
       self:apply_directives(match, match.pattern, source, metadata)
-- 
cgit 


From b3342171d533f3d9dd33bbe5ff09f0d7b007f5a3 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 16 Sep 2023 11:43:02 +0100
Subject: fix(typing): vim.fn.execute

---
 runtime/lua/vim/_meta/vimfn.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index efb779ad41..2062e96b21 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -1630,9 +1630,9 @@ function vim.fn.executable(expr) end
 --- To execute a command in another window than the current one
 --- use `win_execute()`.
 ---
---- @param command any
---- @param silent? boolean
---- @return any
+--- @param command string|string[]
+--- @param silent? ''|'silent'|'silent!'
+--- @return string
 function vim.fn.execute(command, silent) end
 
 --- Returns the full path of {expr} if it is an executable and
-- 
cgit 


From f40a109716d7f748dd9e9f70b57e4d0bb285518b Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Wed, 13 Sep 2023 10:39:34 +0100
Subject: fix(treesitter): fix trim predicate

---
 runtime/lua/vim/treesitter/query.lua | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 6d9b214d4a..e83ad00eeb 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -514,7 +514,10 @@ local directive_handlers = {
   -- Example: (#trim! @fold)
   -- TODO(clason): generalize to arbitrary whitespace removal
   ['trim!'] = function(match, _, bufnr, pred, metadata)
-    local node = match[pred[2]]
+    local capture_id = pred[2]
+    assert(type(capture_id) == 'number')
+
+    local node = match[capture_id]
     if not node then
       return
     end
@@ -526,9 +529,9 @@ local directive_handlers = {
       return
     end
 
-    while true do
+    while end_row >= start_row do
       -- As we only care when end_col == 0, always inspect one line above end_row.
-      local end_line = vim.api.nvim_buf_get_lines(bufnr, end_row - 1, end_row, true)[1]
+      local end_line = api.nvim_buf_get_lines(bufnr, end_row - 1, end_row, true)[1]
 
       if end_line ~= '' then
         break
@@ -539,7 +542,8 @@ local directive_handlers = {
 
     -- If this produces an invalid range, we just skip it.
     if start_row < end_row or (start_row == end_row and start_col <= end_col) then
-      metadata.range = { start_row, start_col, end_row, end_col }
+      metadata[capture_id] = metadata[capture_id] or {}
+      metadata[capture_id].range = { start_row, start_col, end_row, end_col }
     end
   end,
 }
-- 
cgit 


From 7e5ce42977d7b2f223ca57e0237db778b8e424ea Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sat, 16 Sep 2023 23:43:22 +0900
Subject: fix(treesitter): properly combine injection.combined regions

Problem:
It doesn't make much sense to flatten each region (= list of ranges).
This coincidentally worked for region with a single range.

Solution:
Custom function for combining regions.
---
 runtime/lua/vim/treesitter/languagetree.lua | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 4dd5a18396..b555ee231b 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -788,6 +788,19 @@ function LanguageTree:_get_injection(match, metadata)
   return lang, combined, ranges
 end
 
+--- Can't use vim.tbl_flatten since a range is just a table.
+---@param regions Range6[][]
+---@return Range6[]
+local function combine_regions(regions)
+  local result = {} ---@type Range6[]
+  for _, region in ipairs(regions) do
+    for _, range in ipairs(region) do
+      result[#result + 1] = range
+    end
+  end
+  return result
+end
+
 --- Gets language injection points by language.
 ---
 --- This is where most of the injection processing occurs.
@@ -833,11 +846,7 @@ function LanguageTree:_get_injections()
 
       for _, entry in pairs(patterns) do
         if entry.combined then
-          ---@diagnostic disable-next-line:no-unknown
-          local regions = vim.tbl_map(function(e)
-            return vim.tbl_flatten(e)
-          end, entry.regions)
-          table.insert(result[lang], regions)
+          table.insert(result[lang], combine_regions(entry.regions))
         else
           for _, ranges in pairs(entry.regions) do
             table.insert(result[lang], ranges)
-- 
cgit 


From 28f54a78782318cb9c356a372b9e52a3a6b1f8dd Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sat, 16 Sep 2023 10:05:59 -0700
Subject: feat(treesitter): add lang parameter to the query editor (#25181)

---
 runtime/doc/treesitter.txt           |  6 +++++-
 runtime/lua/vim/treesitter/dev.lua   | 15 ++++++++-------
 runtime/lua/vim/treesitter/query.lua |  6 ++++--
 runtime/plugin/nvim.lua              |  6 +++---
 4 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index ee34c45cce..e1e280c4db 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -853,7 +853,7 @@ add_predicate({name}, {handler}, {force})
                      meanings
       • {force}    (boolean|nil)
 
-edit()                                           *vim.treesitter.query.edit()*
+edit({lang})                                     *vim.treesitter.query.edit()*
     Open a window for live editing of a treesitter query.
 
     Can also be shown with `:EditQuery`.                          *:EditQuery*
@@ -861,6 +861,10 @@ edit()                                           *vim.treesitter.query.edit()*
     Note that the editor opens a scratch buffer, and so queries aren't
     persisted on disk.
 
+    Parameters: ~
+      • {lang}  (string|nil) language to open the query editor for. If
+                omitted, inferred from the current buffer's filetype.
+
 get({lang}, {query_name})                         *vim.treesitter.query.get()*
     Returns the runtime query {query_name} for {lang}.
 
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index bc54853103..7f24ba8590 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -468,11 +468,11 @@ local edit_ns = api.nvim_create_namespace('treesitter/dev-edit')
 
 ---@param query_win integer
 ---@param base_win integer
-local function update_editor_highlights(query_win, base_win)
+---@param lang string
+local function update_editor_highlights(query_win, base_win, lang)
   local base_buf = api.nvim_win_get_buf(base_win)
   local query_buf = api.nvim_win_get_buf(query_win)
-  local parser = vim.treesitter.get_parser(base_buf)
-  local lang = parser:lang()
+  local parser = vim.treesitter.get_parser(base_buf, lang)
   api.nvim_buf_clear_namespace(base_buf, edit_ns, 0, -1)
   local query_content = table.concat(api.nvim_buf_get_lines(query_buf, 0, -1, false), '\n')
 
@@ -506,7 +506,8 @@ local function update_editor_highlights(query_win, base_win)
 end
 
 --- @private
-function M.edit_query()
+--- @param lang? string language to open the query editor for.
+function M.edit_query(lang)
   local buf = api.nvim_get_current_buf()
   local win = api.nvim_get_current_win()
 
@@ -528,11 +529,11 @@ function M.edit_query()
   end
   vim.cmd(cmd)
 
-  local ok, parser = pcall(vim.treesitter.get_parser, buf)
+  local ok, parser = pcall(vim.treesitter.get_parser, buf, lang)
   if not ok then
     return nil, 'No parser available for the given buffer'
   end
-  local lang = parser:lang()
+  lang = parser:lang()
 
   local query_win = api.nvim_get_current_win()
   local query_buf = api.nvim_win_get_buf(query_win)
@@ -561,7 +562,7 @@ function M.edit_query()
     desc = 'Update query editor highlights when the cursor moves',
     callback = function()
       if api.nvim_win_is_valid(win) then
-        update_editor_highlights(query_win, win)
+        update_editor_highlights(query_win, win, lang)
       end
     end,
   })
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index e83ad00eeb..44ed37d64e 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -848,8 +848,10 @@ end
 --- Can also be shown with `:EditQuery`. *:EditQuery*
 ---
 --- Note that the editor opens a scratch buffer, and so queries aren't persisted on disk.
-function M.edit()
-  require('vim.treesitter.dev').edit_query()
+---
+--- @param lang? string language to open the query editor for. If omitted, inferred from the current buffer's filetype.
+function M.edit(lang)
+  require('vim.treesitter.dev').edit_query(lang)
 end
 
 return M
diff --git a/runtime/plugin/nvim.lua b/runtime/plugin/nvim.lua
index 13a54a5e20..743d3044b6 100644
--- a/runtime/plugin/nvim.lua
+++ b/runtime/plugin/nvim.lua
@@ -19,6 +19,6 @@ vim.api.nvim_create_user_command('InspectTree', function(cmd)
   end
 end, { desc = 'Inspect treesitter language tree for buffer', count = true })
 
-vim.api.nvim_create_user_command('EditQuery', function()
-  vim.treesitter.query.edit()
-end, { desc = 'Edit treesitter query' })
+vim.api.nvim_create_user_command('EditQuery', function(cmd)
+  vim.treesitter.query.edit(cmd.fargs[1])
+end, { desc = 'Edit treesitter query', nargs = '?' })
-- 
cgit 


From 4ab9c5fa46845807a2dc6dd91fc5fb78ccc70856 Mon Sep 17 00:00:00 2001
From: Phelipe Teles <39670535+phelipetls@users.noreply.github.com>
Date: Sat, 16 Sep 2023 19:35:12 -0300
Subject: fix(lua): not using global value in vim.opt_global (#25196)

---
 runtime/lua/vim/_options.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_options.lua b/runtime/lua/vim/_options.lua
index 7b44f6b35f..6a3413b597 100644
--- a/runtime/lua/vim/_options.lua
+++ b/runtime/lua/vim/_options.lua
@@ -727,7 +727,10 @@ local function create_option_accessor(scope)
 
   return setmetatable({}, {
     __index = function(_, k)
-      return make_option(k, api.nvim_get_option_value(k, {}))
+      -- vim.opt_global must get global value only
+      -- vim.opt_local may fall back to global value like vim.opt
+      local opts = { scope = scope == 'global' and 'global' or nil }
+      return make_option(k, api.nvim_get_option_value(k, opts))
     end,
 
     __newindex = function(_, k, v)
-- 
cgit 


From aac85b8d6b803318d9cbf6e496aac1cd223b4550 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 17 Sep 2023 08:48:13 +0800
Subject: docs(tutor): clarify the meaning of ✗ and ✓ (#25204)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also reformat tutor.tutor.json to use 2-space indent while at it.
---
 runtime/tutor/en/vim-01-beginner.tutor      | 20 ++++-----
 runtime/tutor/en/vim-01-beginner.tutor.json |  1 -
 runtime/tutor/tutor.tutor                   | 10 ++---
 runtime/tutor/tutor.tutor.json              | 66 ++++++++++++++---------------
 4 files changed, 48 insertions(+), 49 deletions(-)

(limited to 'runtime')

diff --git a/runtime/tutor/en/vim-01-beginner.tutor b/runtime/tutor/en/vim-01-beginner.tutor
index 3653271000..71b196d189 100644
--- a/runtime/tutor/en/vim-01-beginner.tutor
+++ b/runtime/tutor/en/vim-01-beginner.tutor
@@ -3,6 +3,7 @@
 Neovim is a very powerful editor that has many commands, too many to explain in
 a tutorial such as this. This tutorial is designed to describe enough of the
 commands that you will be able to easily use Neovim as an all-purpose editor.
+
 It is IMPORTANT to remember that this tutorial is set up to teach by use. That
 means that you need to do the exercises to learn them properly. If you only
 read the text, you will soon forget what is most important!
@@ -19,17 +20,16 @@ pressing [<Esc>](<Esc>) and then [u](u) will undo the latest change.
 This tutorial is interactive, and there are a few things you should know.
 - Type [<Enter>](<Enter>) on links [like this](holy-grail    ) to open the linked help section.
 - Or simply type [K](K) on any word to find its documentation!
-- You can close this help window with `:q`{vim}
-- Sometimes you will be required to modify text like
-
-    this here
+- You can close this help window with `:q`{vim} `<Enter>`{normal}
 
+When there is a ✗ sign at the left, you will be required to modify text.
 Once you have done the changes correctly, the ✗ sign at the left will change
 to ✓. I imagine you can already see how neat Neovim can be.
+
 Other times, you'll be prompted to run a command (I'll explain this later):
-~~~ cmd
-    :help <Enter>
-~~~
+
+    `:help`{vim} `<Enter>`{normal}
+
 or press a sequence of keys
 ~~~ normal
     <Esc>0f<Space>d3wP$P
@@ -70,19 +70,19 @@ NOTE: The cursor keys should also work. But using hjkl you will be able to
 
  2. Type:
 
-    `:q!`{vim} `<Enter>`{normal}.
+    `:q!`{vim} `<Enter>`{normal}
 
     This quits the editor, DISCARDING any changes you have made.
 
  3. Open Neovim and get back here by executing the command that got you into
     this tutorial. That might be:
 
-    :Tutor <Enter>
+    `:Tutor`{vim} `<Enter>`{normal}
 
  4. If you have these steps memorized and are confident, execute steps
     1 through 3 to exit and re-enter the editor.
 
-NOTE: [:q!](:q) <Enter> discards any changes you made. In a few lessons you
+NOTE: [:q!](:q) `<Enter>`{normal} discards any changes you made. In a few lessons you
       will learn how to save the changes to a file.
 
  5. Move the cursor down to Lesson 1.3.
diff --git a/runtime/tutor/en/vim-01-beginner.tutor.json b/runtime/tutor/en/vim-01-beginner.tutor.json
index fc23a75dae..8f88a3897d 100644
--- a/runtime/tutor/en/vim-01-beginner.tutor.json
+++ b/runtime/tutor/en/vim-01-beginner.tutor.json
@@ -1,6 +1,5 @@
 {
   "expect": {
-    "25": -1,
     "103": "The cow jumped over the moon.",
     "125": "There is some text missing from this line.",
     "126": "There is some text missing from this line.",
diff --git a/runtime/tutor/tutor.tutor b/runtime/tutor/tutor.tutor
index c2d5268e3d..3156b94dbb 100644
--- a/runtime/tutor/tutor.tutor
+++ b/runtime/tutor/tutor.tutor
@@ -229,11 +229,11 @@ These elements are specified in separate JSON files like this
 
 ~~~ json
 {
-    "expect": {
-	"1": "This is how this line should look.",
-	"2": "This is how this line should look.",
-	"3": -1
-    }
+  "expect": {
+    "1": "This is how this line should look.",
+    "2": "This is how this line should look.",
+    "3": -1
+  }
 }
 ~~~
 
diff --git a/runtime/tutor/tutor.tutor.json b/runtime/tutor/tutor.tutor.json
index e8628e2f0e..41995b28fa 100644
--- a/runtime/tutor/tutor.tutor.json
+++ b/runtime/tutor/tutor.tutor.json
@@ -1,35 +1,35 @@
 {
-    "expect": {
-	"63": "This is text with **important information**",
-	"64": "This is text with **important information**",
-	"71": "TODO: Document '&variable'",
-	"72": "TODO: Document '&variable'",
-	"78": "# This is a level 1 header",
-	"79": "# This is a level 1 header",
-    	"80": "### This is a level 3 header",
-	"81": "### This is a level 3 header",
-    	"82": "# This is a header with a label {*label*}",
-	"83": "# This is a header with a label {*label*}",
-	"108": "A link to help for the ['breakindent']('breakindent') option",
-	"109": "A link to help for the ['breakindent']('breakindent') option",
-	"123": "A link to the [Links](*links*) section",
-	"124": "A link to the [Links](*links*) section",
-	"139": "A link to [the vim-tutor-mode tutorial](@tutor:tutor)",
-    	"140": "A link to [the vim-tutor-mode tutorial](@tutor:tutor)",
-	"157": "~~~ viml",
-	"158": "echom 'the value of &number is'.string(&number)",
-	"159": "~~~",
-	"161": "~~~ viml",
-	"162": "echom 'the value of &number is'.string(&number)",
-	"163": "~~~",
-	"188": "~~~ normal",
-	"189": "d2w",
-	"190": "~~~",
-	"192": "~~~ normal",
-	"193": "d2w",
-	"194": "~~~",
-	"206": "`d2w`{normal}",
-	"207": "`d2w`{normal}",
-	"244": -1
-    }
+  "expect": {
+    "63": "This is text with **important information**",
+    "64": "This is text with **important information**",
+    "71": "TODO: Document '&variable'",
+    "72": "TODO: Document '&variable'",
+    "78": "# This is a level 1 header",
+    "79": "# This is a level 1 header",
+    "80": "### This is a level 3 header",
+    "81": "### This is a level 3 header",
+    "82": "# This is a header with a label {*label*}",
+    "83": "# This is a header with a label {*label*}",
+    "108": "A link to help for the ['breakindent']('breakindent') option",
+    "109": "A link to help for the ['breakindent']('breakindent') option",
+    "123": "A link to the [Links](*links*) section",
+    "124": "A link to the [Links](*links*) section",
+    "139": "A link to [the vim-tutor-mode tutorial](@tutor:tutor)",
+    "140": "A link to [the vim-tutor-mode tutorial](@tutor:tutor)",
+    "157": "~~~ viml",
+    "158": "echom 'the value of &number is'.string(&number)",
+    "159": "~~~",
+    "161": "~~~ viml",
+    "162": "echom 'the value of &number is'.string(&number)",
+    "163": "~~~",
+    "188": "~~~ normal",
+    "189": "d2w",
+    "190": "~~~",
+    "192": "~~~ normal",
+    "193": "d2w",
+    "194": "~~~",
+    "206": "`d2w`{normal}",
+    "207": "`d2w`{normal}",
+    "244": -1
+  }
 }
-- 
cgit 


From 677df72e4032d819a3e49a41f015bea7457271a4 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Sat, 16 Sep 2023 17:40:28 +0200
Subject: docs: remove joke from pronounce

N-Jim does not sounds like "Ninja", and the joke doesn't really land.
---
 runtime/doc/intro.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index e1a92bc87b..975aff6bf6 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -22,8 +22,7 @@ is not located in the default place.  You can jump to subjects like with tags:
 Use CTRL-] to jump to a subject under the cursor, use CTRL-T to jump back.
 
 							*pronounce*
-Vim is pronounced as one word, like Jim.  So Nvim is N-Jim, which sounds like
-"Ninja".  Starting Nvim is like performing a roundhouse kick.
+Vim is pronounced as one word, like Jim.  So Nvim is "En-Vim", two syllables.
 
 This manual is a reference for all Nvim editor and API features.  It is not an
 introduction; instead for beginners, there is a hands-on |tutor| and a user
-- 
cgit 


From 71530cc972576e6656431b6d000aec9b69a0997e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 17 Sep 2023 20:29:18 +0800
Subject: feat(folds): support virtual text format for 'foldtext' (#25209)

Co-authored-by: Lewis Russell <lewis6991@gmail.com>
---
 runtime/doc/fold.txt | 6 ++++--
 runtime/doc/news.txt | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 24d7605e4a..8f7393f5e3 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -520,8 +520,10 @@ expression.  It can use these special Vim variables:
 			foldlevel.
 	v:foldlevel	the foldlevel of the fold
 
-In the result a TAB is replaced with a space and unprintable characters are
-made into printable characters.
+If the result is a |List|, it is parsed and drawn like "overlay" virtual text
+(see |nvim_buf_set_extmark()|), otherwise the result is converted to a string
+where a TAB is replaced with a space and unprintable characters are made into
+printable characters.
 
 The resulting line is truncated to fit in the window, it never wraps.
 When there is room after the text, it is filled with the character specified
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 0162a99619..7c971097fb 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -89,6 +89,8 @@ The following new APIs and features were added.
 
 • Added inline virtual text support to |nvim_buf_set_extmark()|.
 
+• 'foldtext' now supports virtual text format. |fold-foldtext|
+
 • The terminal buffer now supports reflow (wrapped lines adapt when the buffer
   is resized horizontally). Note: Lines that are not visible and kept in
   |'scrollback'| are not reflown.
-- 
cgit 


From 71d9b7d15c9b2e0df7db69a172aea0723a40bb71 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Sun, 17 Sep 2023 17:54:30 +0900
Subject: fix(treesitter): _trees may not be list-like

Problem:
With incremental injection parsing, injected languages' parsers parse
only the relevant regions and stores the result in _trees with the index
of the corresponding region. Therefore, there can be holes in _trees.

Solution:
* Use generic table functions where appropriate.
* Fix type annotations and docs.
---
 runtime/doc/treesitter.txt                  | 23 ++++++++----
 runtime/lua/vim/treesitter/_meta.lua        |  3 +-
 runtime/lua/vim/treesitter/languagetree.lua | 57 +++++++++++++++++------------
 3 files changed, 52 insertions(+), 31 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index e1e280c4db..10f689bad7 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -1101,10 +1101,12 @@ LanguageTree:for_each_tree({fn})                *LanguageTree:for_each_tree()*
       • {fn}  fun(tree: TSTree, ltree: LanguageTree)
 
 LanguageTree:included_regions()              *LanguageTree:included_regions()*
-    Gets the set of included regions
+    Gets the set of included regions managed by this LanguageTree . This can be different from the regions set by injection query, because a
+    partial |LanguageTree:parse()| drops the regions outside the requested
+    range.
 
     Return: ~
-        Range6[][]
+        table<integer, Range6[]>
 
 LanguageTree:invalidate({reload})                  *LanguageTree:invalidate()*
     Invalidates this parser and all its children
@@ -1113,10 +1115,12 @@ LanguageTree:invalidate({reload})                  *LanguageTree:invalidate()*
       • {reload}  (boolean|nil)
 
 LanguageTree:is_valid({exclude_children})            *LanguageTree:is_valid()*
-    Determines whether this tree is valid. If the tree is invalid, call `parse()` . This will return the updated tree.
+    Returns whether this LanguageTree is valid, i.e., |LanguageTree:trees()| reflects the latest state of the
+    source. If invalid, user should call |LanguageTree:parse()|.
 
     Parameters: ~
-      • {exclude_children}  (boolean|nil)
+      • {exclude_children}  (boolean|nil) whether to ignore the validity of
+                            children (default `false`)
 
     Return: ~
         (boolean)
@@ -1165,7 +1169,7 @@ LanguageTree:parse({range})                             *LanguageTree:parse()*
                  injections).
 
     Return: ~
-        TSTree[]
+        table<integer, TSTree>
 
                                                  *LanguageTree:register_cbs()*
 LanguageTree:register_cbs({cbs}, {recursive})
@@ -1207,7 +1211,12 @@ LanguageTree:tree_for_range({range}, {opts})
         TSTree|nil
 
 LanguageTree:trees()                                    *LanguageTree:trees()*
-    Returns all trees this language tree contains. Does not include child
-    languages.
+    Returns all trees of the regions parsed by this parser. Does not include
+    child languages. The result is list-like if
+    • this LanguageTree is the root, in which case the result is empty or a singleton list; or
+    • the root LanguageTree is fully parsed.
+
+    Return: ~
+        table<integer, TSTree>
 
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index 9a94f12c16..d01b7be3b0 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -50,7 +50,8 @@ function TSNode:_rawquery(query, captures, start, end_, opts) end
 ---@alias TSLoggerCallback fun(logtype: 'parse'|'lex', msg: string)
 
 ---@class TSParser
----@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: boolean?): TSTree, integer[]
+---@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: true): TSTree, Range6[]
+---@field parse fun(self: TSParser, tree: TSTree?, source: integer|string, include_bytes: false|nil): TSTree, Range4[]
 ---@field reset fun(self: TSParser)
 ---@field included_ranges fun(self: TSParser, include_bytes: boolean?): integer[]
 ---@field set_included_ranges fun(self: TSParser, ranges: (Range6|TSNode)[])
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index b555ee231b..f931291ed7 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -78,13 +78,14 @@ local TSCallbackNames = {
 ---@field private _opts table Options
 ---@field private _parser TSParser Parser for language
 ---@field private _has_regions boolean
----@field private _regions Range6[][]?
+---@field private _regions table<integer, Range6[]>?
 ---List of regions this tree should manage and parse. If nil then regions are
 ---taken from _trees. This is mostly a short-lived cache for included_regions()
 ---@field private _lang string Language name
 ---@field private _parent_lang? string Parent language name
 ---@field private _source (integer|string) Buffer or string to parse
----@field private _trees TSTree[] Reference to parsed tree (one for each language)
+---@field private _trees table<integer, TSTree> Reference to parsed tree (one for each language).
+---Each key is the index of region, which is synced with _regions and _valid.
 ---@field private _valid boolean|table<integer,boolean> If the parsed tree is valid
 ---@field private _logger? fun(logtype: string, msg: string)
 ---@field private _logfile? file*
@@ -211,7 +212,7 @@ function LanguageTree:_log(...)
   end
 
   local info = debug.getinfo(2, 'nl')
-  local nregions = #self:included_regions()
+  local nregions = vim.tbl_count(self:included_regions())
   local prefix =
     string.format('%s:%d: (#regions=%d) ', info.name or '???', info.currentline or 0, nregions)
 
@@ -244,8 +245,13 @@ function LanguageTree:invalidate(reload)
   end
 end
 
---- Returns all trees this language tree contains.
+--- Returns all trees of the regions parsed by this parser.
 --- Does not include child languages.
+--- The result is list-like if
+--- * this LanguageTree is the root, in which case the result is empty or a singleton list; or
+--- * the root LanguageTree is fully parsed.
+---
+---@return table<integer, TSTree>
 function LanguageTree:trees()
   return self._trees
 end
@@ -255,16 +261,15 @@ function LanguageTree:lang()
   return self._lang
 end
 
---- Determines whether this tree is valid.
---- If the tree is invalid, call `parse()`.
---- This will return the updated tree.
----@param exclude_children boolean|nil
+--- Returns whether this LanguageTree is valid, i.e., |LanguageTree:trees()| reflects the latest
+--- state of the source. If invalid, user should call |LanguageTree:parse()|.
+---@param exclude_children boolean|nil whether to ignore the validity of children (default `false`)
 ---@return boolean
 function LanguageTree:is_valid(exclude_children)
   local valid = self._valid
 
   if type(valid) == 'table' then
-    for i = 1, #self:included_regions() do
+    for i, _ in pairs(self:included_regions()) do
       if not valid[i] then
         return false
       end
@@ -328,7 +333,7 @@ end
 
 --- @private
 --- @param range boolean|Range?
---- @return integer[] changes
+--- @return Range6[] changes
 --- @return integer no_regions_parsed
 --- @return number total_parse_time
 function LanguageTree:_parse_regions(range)
@@ -370,7 +375,7 @@ function LanguageTree:_add_injections()
   local seen_langs = {} ---@type table<string,boolean>
 
   local query_time, injections_by_lang = tcall(self._get_injections, self)
-  for lang, injection_ranges in pairs(injections_by_lang) do
+  for lang, injection_regions in pairs(injections_by_lang) do
     local has_lang = pcall(language.add, lang)
 
     -- Child language trees should just be ignored if not found, since
@@ -383,7 +388,7 @@ function LanguageTree:_add_injections()
         child = self:add_child(lang)
       end
 
-      child:set_included_regions(injection_ranges)
+      child:set_included_regions(injection_regions)
       seen_langs[lang] = true
     end
   end
@@ -408,14 +413,14 @@ end
 ---     Set to `true` to run a complete parse of the source (Note: Can be slow!)
 ---     Set to `false|nil` to only parse regions with empty ranges (typically
 ---     only the root tree without injections).
---- @return TSTree[]
+--- @return table<integer, TSTree>
 function LanguageTree:parse(range)
   if self:is_valid() then
     self:_log('valid')
     return self._trees
   end
 
-  local changes --- @type Range6?
+  local changes --- @type Range6[]?
 
   -- Collect some stats
   local no_regions_parsed = 0
@@ -565,7 +570,7 @@ function LanguageTree:_iter_regions(fn)
 
   local all_valid = true
 
-  for i, region in ipairs(self:included_regions()) do
+  for i, region in pairs(self:included_regions()) do
     if was_valid or self._valid[i] then
       self._valid[i] = fn(i, region)
       if not self._valid[i] then
@@ -601,7 +606,7 @@ end
 --- nodes, which is useful for templating languages like ERB and EJS.
 ---
 ---@private
----@param new_regions Range6[][] List of regions this tree should manage and parse.
+---@param new_regions (Range4|Range6|TSNode)[][] List of regions this tree should manage and parse.
 function LanguageTree:set_included_regions(new_regions)
   self._has_regions = true
 
@@ -609,16 +614,20 @@ function LanguageTree:set_included_regions(new_regions)
   for _, region in ipairs(new_regions) do
     for i, range in ipairs(region) do
       if type(range) == 'table' and #range == 4 then
-        region[i] = Range.add_bytes(self._source, range)
+        region[i] = Range.add_bytes(self._source, range --[[@as Range4]])
       elseif type(range) == 'userdata' then
         region[i] = { range:range(true) }
       end
     end
   end
 
+  -- included_regions is not guaranteed to be list-like, but this is still sound, i.e. if
+  -- new_regions is different from included_regions, then outdated regions in included_regions are
+  -- invalidated. For example, if included_regions = new_regions ++ hole ++ outdated_regions, then
+  -- outdated_regions is invalidated by _iter_regions in else branch.
   if #self:included_regions() ~= #new_regions then
     -- TODO(lewis6991): inefficient; invalidate trees incrementally
-    for _, t in ipairs(self._trees) do
+    for _, t in pairs(self._trees) do
       self:_do_callback('changedtree', t:included_ranges(true), t)
     end
     self._trees = {}
@@ -632,20 +641,22 @@ function LanguageTree:set_included_regions(new_regions)
   self._regions = new_regions
 end
 
----Gets the set of included regions
----@return Range6[][]
+---Gets the set of included regions managed by this LanguageTree. This can be different from the
+---regions set by injection query, because a partial |LanguageTree:parse()| drops the regions
+---outside the requested range.
+---@return table<integer, Range6[]>
 function LanguageTree:included_regions()
   if self._regions then
     return self._regions
   end
 
-  if not self._has_regions or #self._trees == 0 then
+  if not self._has_regions or next(self._trees) == nil then
     -- treesitter.c will default empty ranges to { -1, -1, -1, -1, -1, -1}
     return { {} }
   end
 
   local regions = {} ---@type Range6[][]
-  for i, _ in ipairs(self._trees) do
+  for i, _ in pairs(self._trees) do
     regions[i] = self._trees[i]:included_ranges(true)
   end
 
@@ -801,7 +812,7 @@ local function combine_regions(regions)
   return result
 end
 
---- Gets language injection points by language.
+--- Gets language injection regions by language.
 ---
 --- This is where most of the injection processing occurs.
 ---
-- 
cgit 


From ed45aa835c31408947acda08f605949bcea6b99d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 17 Sep 2023 19:18:21 +0200
Subject: vim-patch:9.0.1907: No support for liquidsoap filetypes

Problem:  No support for liquidsoap filetypes
Solution: Add liquidsoap filetype detection code

closes: vim/vim#13111

https://github.com/vim/vim/commit/6b5efcdd8e976d2ab2554b22c4220c5e88de4717

Co-authored-by: Romain Beauxis <toots@rastageeks.org>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index d847c28f5c..c7f025f9e7 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -592,6 +592,7 @@ local extension = {
   ly = 'lilypond',
   ily = 'lilypond',
   liquid = 'liquid',
+  liq = 'liquidsoap',
   cl = 'lisp',
   L = 'lisp',
   lisp = 'lisp',
-- 
cgit 


From 1b74d2bf0aceed1866f8a6f07403617fb37a0aa7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 17 Sep 2023 19:19:33 +0200
Subject: vim-patch:e30d8e4ce01d

runtime(kotlin): Add Kotlin runtime files (vim/vim#13110)

Closes udalov/kotlin-vimvim/vim#39

https://github.com/vim/vim/commit/e30d8e4ce01dc1aca95d25be9fd27c09855fd4be

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/kotlin.vim |  33 ++++++++++
 runtime/indent/kotlin.vim   |  60 +++++++++++++++++
 runtime/syntax/kotlin.vim   | 157 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 250 insertions(+)
 create mode 100644 runtime/ftplugin/kotlin.vim
 create mode 100644 runtime/indent/kotlin.vim
 create mode 100644 runtime/syntax/kotlin.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/kotlin.vim b/runtime/ftplugin/kotlin.vim
new file mode 100644
index 0000000000..b21de603ea
--- /dev/null
+++ b/runtime/ftplugin/kotlin.vim
@@ -0,0 +1,33 @@
+" Vim filetype plugin file
+" Language:     Kotlin
+" Maintainer:   Alexander Udalov
+" URL:          https://github.com/udalov/kotlin-vim
+" Last Change:  7 November 2021
+"               2023 Sep 17 by Vim Project (browsefilter)
+
+if exists('b:did_ftplugin') | finish | endif
+let b:did_ftplugin = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+
+setlocal formatoptions-=t formatoptions+=croqnl
+silent! setlocal formatoptions+=j
+
+setlocal includeexpr=substitute(v:fname,'\\.','/','g')
+setlocal suffixesadd=.kt
+
+let b:undo_ftplugin = "setlocal comments< commentstring< ".
+    \ "formatoptions< includeexpr< suffixesadd<"
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Kotlin Source Files (*.kt, *kts)\t*.kt;*.kts\n" .
+	\ "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/runtime/indent/kotlin.vim b/runtime/indent/kotlin.vim
new file mode 100644
index 0000000000..590a5074d1
--- /dev/null
+++ b/runtime/indent/kotlin.vim
@@ -0,0 +1,60 @@
+" Vim indent file
+" Language:     Kotlin
+" Maintainer:   Alexander Udalov
+" URL:          https://github.com/udalov/kotlin-vim
+" Last Change:  7 November 2021
+"               2023 Sep 17 by Vim Project (undo_indent)
+
+if exists('b:did_indent')
+    finish
+endif
+let b:did_indent = 1
+
+setlocal cinoptions& cinoptions+=j1,L0
+setlocal indentexpr=GetKotlinIndent()
+setlocal indentkeys=0},0),!^F,o,O,e,<CR>
+setlocal autoindent " TODO ?
+
+let b:undo_indent = "setlocal autoindent< cinoptions< indentexpr< indentkeys<"
+
+" TODO teach it to count bracket balance, etc.
+function! GetKotlinIndent()
+    if v:lnum == 0
+        return 0
+    endif
+
+    let prev_num = prevnonblank(v:lnum - 1)
+    let prev = getline(prev_num)
+    let prev_indent = indent(prev_num)
+    let cur = getline(v:lnum)
+
+    if cur =~ '^\s*\*'
+        return cindent(v:lnum)
+    endif
+
+    if prev =~ '^\s*\*/'
+        let st = prev
+        while st > 1
+            if getline(st) =~ '^\s*/\*'
+                break
+            endif
+            let st = st - 1
+        endwhile
+        return indent(st)
+    endif
+
+    let prev_open_paren = prev =~ '^.*(\s*$'
+    let cur_close_paren = cur =~ '^\s*).*$'
+    let prev_open_brace = prev =~ '^.*\({\|->\)\s*$'
+    let cur_close_brace = cur =~ '^\s*}.*$'
+
+    if prev_open_paren && !cur_close_paren || prev_open_brace && !cur_close_brace
+        return prev_indent + shiftwidth()
+    endif
+
+    if cur_close_paren && !prev_open_paren || cur_close_brace && !prev_open_brace
+        return prev_indent - shiftwidth()
+    endif
+
+    return prev_indent
+endfunction
diff --git a/runtime/syntax/kotlin.vim b/runtime/syntax/kotlin.vim
new file mode 100644
index 0000000000..9b85b8ef5c
--- /dev/null
+++ b/runtime/syntax/kotlin.vim
@@ -0,0 +1,157 @@
+" Vim syntax file
+" Language:     Kotlin
+" Maintainer:   Alexander Udalov
+" URL:          https://github.com/udalov/kotlin-vim
+" Last Change:  30 December 2022
+
+if exists('b:current_syntax')
+    finish
+endif
+
+syn keyword ktStatement break continue return
+syn keyword ktConditional if else when
+syn keyword ktRepeat do for while
+syn keyword ktOperator in is by
+syn keyword ktKeyword get set out super this where
+syn keyword ktException try catch finally throw
+
+syn keyword ktInclude import package
+
+" Generated stdlib class names {{{
+" The following is generated by https://github.com/udalov/kotlin-vim/blob/master/extra/generate-stdlib-class-names.main.kts
+syn keyword ktType AbstractCollection AbstractCoroutineContextElement AbstractCoroutineContextKey AbstractDoubleTimeSource AbstractIterator AbstractList AbstractLongTimeSource
+syn keyword ktType AbstractMap AbstractMutableCollection AbstractMutableList AbstractMutableMap AbstractMutableSet AbstractSet AccessDeniedException Accessor Annotation
+syn keyword ktType AnnotationRetention AnnotationTarget Any Appendable ArithmeticException Array ArrayDeque ArrayList AssertionError Boolean BooleanArray BooleanIterator
+syn keyword ktType BuilderInference Byte ByteArray ByteIterator CName CallsInPlace CancellationException Char CharArray CharCategory CharDirectionality CharIterator CharProgression
+syn keyword ktType CharRange CharSequence CharacterCodingException Charsets ClassCastException Cloneable ClosedFloatingPointRange ClosedRange Collection Comparable
+syn keyword ktType ComparableTimeMark Comparator ConcurrentModificationException ConditionalEffect ContextFunctionTypeParams Continuation ContinuationInterceptor ContractBuilder
+syn keyword ktType CopyActionContext CopyActionResult CoroutineContext DeepRecursiveFunction DeepRecursiveScope Delegates Deprecated DeprecatedSinceKotlin DeprecationLevel
+syn keyword ktType Destructured Double DoubleArray DoubleIterator DslMarker Duration DurationUnit Effect Element EmptyCoroutineContext Entry Enum EnumEntries Error Exception
+syn keyword ktType ExperimentalContracts ExperimentalJsExport ExperimentalMultiplatform ExperimentalObjCName ExperimentalObjCRefinement ExperimentalPathApi ExperimentalStdlibApi
+syn keyword ktType ExperimentalSubclassOptIn ExperimentalTime ExperimentalTypeInference ExperimentalUnsignedTypes ExtensionFunctionType FileAlreadyExistsException
+syn keyword ktType FileSystemException FileTreeWalk FileVisitorBuilder FileWalkDirection Float FloatArray FloatIterator FreezingIsDeprecated Function Function0 Function1 Function10
+syn keyword ktType Function11 Function12 Function13 Function14 Function15 Function16 Function17 Function18 Function19 Function2 Function20 Function21 Function22 Function3 Function4
+syn keyword ktType Function5 Function6 Function7 Function8 Function9 FunctionN Getter Grouping HashMap HashSet HiddenFromObjC HidesFromObjC Ignore IllegalArgumentException
+syn keyword ktType IllegalStateException IndexOutOfBoundsException IndexedValue Int IntArray IntIterator IntProgression IntRange InvocationKind Iterable Iterator JsExport JsName
+syn keyword ktType JvmDefault JvmDefaultWithCompatibility JvmDefaultWithoutCompatibility JvmField JvmInline JvmMultifileClass JvmName JvmOverloads JvmRecord JvmSerializableLambda
+syn keyword ktType JvmStatic JvmSuppressWildcards JvmSynthetic JvmWildcard KAnnotatedElement KCallable KClass KClassifier KDeclarationContainer KFunction KMutableProperty
+syn keyword ktType KMutableProperty0 KMutableProperty1 KMutableProperty2 KParameter KProperty KProperty0 KProperty1 KProperty2 KType KTypeParameter KTypeProjection KVariance
+syn keyword ktType KVisibility Key Kind KotlinNullPointerException KotlinReflectionNotSupportedError KotlinVersion Lazy LazyThreadSafetyMode Level LinkedHashMap LinkedHashSet List
+syn keyword ktType ListIterator Long LongArray LongIterator LongProgression LongRange Map MatchGroup MatchGroupCollection MatchNamedGroupCollection MatchResult Metadata Monotonic
+syn keyword ktType MustBeDocumented MutableCollection MutableEntry MutableIterable MutableIterator MutableList MutableListIterator MutableMap MutableSet NoSuchElementException
+syn keyword ktType NoSuchFileException NoWhenBranchMatchedException NotImplementedError Nothing NullPointerException Number NumberFormatException ObjCName ObservableProperty
+syn keyword ktType OnErrorAction OnErrorResult OpenEndRange OptIn OptionalExpectation OverloadResolutionByLambdaReturnType Pair ParameterName PathWalkOption
+syn keyword ktType PropertyDelegateProvider PublishedApi PurelyImplements Random RandomAccess ReadOnlyProperty ReadWriteProperty RefinesInSwift Regex RegexOption Repeatable
+syn keyword ktType ReplaceWith RequiresOptIn RestrictsSuspension Result Retention Returns ReturnsNotNull RuntimeException Sequence SequenceScope Set Setter SharedImmutable Short
+syn keyword ktType ShortArray ShortIterator ShouldRefineInSwift SimpleEffect SinceKotlin Strictfp String StringBuilder SubclassOptInRequired Suppress Synchronized Target
+syn keyword ktType TestTimeSource ThreadLocal Throwable Throws TimeMark TimeSource TimedValue Transient Triple TypeCastException Typography UByte UByteArray UInt UIntArray
+syn keyword ktType UIntProgression UIntRange ULong ULongArray ULongProgression ULongRange UShort UShortArray UninitializedPropertyAccessException Unit UnsafeVariance
+syn keyword ktType UnsupportedOperationException ValueTimeMark Volatile WithComparableMarks
+" }}}
+
+syn keyword ktModifier annotation companion enum inner abstract final open override sealed vararg dynamic expect actual suspend
+syn keyword ktStructure class object interface typealias fun val var constructor init
+
+syn keyword ktReservedKeyword typeof
+
+syn keyword ktBoolean true false
+syn keyword ktConstant null
+
+syn keyword ktModifier reified external inline noinline crossinline
+
+syn match ktModifier "\v<data>\ze\@=.*<(class|object)>"
+syn match ktModifier "\v<value>\ze\@=.*<class>"
+syn match ktModifier "\v<(tailrec|operator|infix)>\ze\@=.*<fun>"
+syn match ktModifier "\v<const>\ze\@=.*<val>"
+syn match ktModifier "\v<lateinit>\ze\@=.*<var>"
+syn match ktModifier "\v<(internal|private|protected|public)>\ze\@=.*<(class|object|interface|typealias|fun|val|var|constructor|get|set)>"
+
+syn match ktOperator "\v\?:|::|\<\=? | \>\=?|[!=]\=\=?|<as>\??|[-*+/%]\=?|[!&|]"
+
+syn keyword ktTodo TODO FIXME XXX contained
+syn match ktShebang "\v^#!.*$"
+syn match ktLineComment "\v//.*$" contains=ktTodo,@Spell
+syn region ktComment matchgroup=ktCommentMatchGroup start="/\*" end="\*/" contains=ktComment,ktTodo,@Spell
+
+syn region ktDocComment start="/\*\*" end="\*/" contains=ktDocTag,ktTodo,@Spell
+syn match ktDocTag "\v\@(author|constructor|receiver|return|since|suppress)>" contained
+syn match ktDocTag "\v\@(exception|param|property|throws|see|sample)>\s*\S+" contains=ktDocTagParam contained
+syn match ktDocTagParam "\v(\s|\[)\S+" contained
+syn match ktComment "/\*\*/"
+
+syn match ktSpecialCharError "\v\\." contained
+syn match ktSpecialChar "\v\\([tbnr'"$\\]|u\x{4})" contained
+syn region ktString start='"' skip='\\"' end='"' contains=ktSimpleInterpolation,ktComplexInterpolation,ktSpecialChar,ktSpecialCharError,@Spell
+syn region ktString start='"""' end='""""*' contains=ktSimpleInterpolation,ktComplexInterpolation,@Spell
+syn match ktCharacter "\v'[^']*'" contains=ktSpecialChar,ktSpecialCharError
+syn match ktCharacter "\v'\\''" contains=ktSpecialChar
+syn match ktCharacter "\v'[^\\]'"
+
+syn match ktAnnotation "\v(\w)@<!\@[[:alnum:]_.]*(:[[:alnum:]_.]*)?"
+syn match ktLabel "\v\w+\@"
+syn match ktLabel "\v(\w)@<=\@\w+"
+
+syn match ktSimpleInterpolation "\v\$\h\w*" contained
+syn region ktComplexInterpolation matchgroup=ktComplexInterpolationBrace start="\v\$\{" end="\v\}" contains=ALLBUT,ktSimpleInterpolation,ktTodo,ktSpecialCharError,ktSpecialChar,ktDocTag,ktDocTagParam
+
+syn match ktNumber "\v<\d+[_[:digit:]]*(uL?|UL?|[LFf])?"
+syn match ktNumber "\v<0[Xx]\x+[_[:xdigit:]]*(uL?|UL?|L)?"
+syn match ktNumber "\v<0[Bb][01]+[_01]*(uL?|UL?|L)?"
+syn match ktFloat "\v<\d*(\d[eE][-+]?\d+|\.\d+([eE][-+]?\d+)?)[Ff]?"
+
+syn match ktEscapedName "\v`.*`"
+
+syn match ktExclExcl "!!"
+syn match ktArrow "->"
+
+syn region ktFold start="{" end="}" transparent fold
+
+exec "syntax sync ccomment ktComment minlines=10"
+
+hi def link ktStatement Statement
+hi def link ktConditional Conditional
+hi def link ktRepeat Repeat
+hi def link ktOperator Operator
+hi def link ktKeyword Keyword
+hi def link ktException Exception
+hi def link ktReservedKeyword Error
+
+hi def link ktInclude Include
+
+hi def link ktType Type
+hi def link ktModifier StorageClass
+hi def link ktStructure Structure
+hi def link ktTypedef Typedef
+
+hi def link ktBoolean Boolean
+hi def link ktConstant Constant
+
+hi def link ktTodo Todo
+hi def link ktShebang Comment
+hi def link ktLineComment Comment
+hi def link ktComment Comment
+hi def link ktCommentMatchGroup Comment
+hi def link ktDocComment Comment
+hi def link ktDocTag Special
+hi def link ktDocTagParam Identifier
+
+hi def link ktSpecialChar SpecialChar
+hi def link ktSpecialCharError Error
+hi def link ktString String
+hi def link ktCharacter Character
+
+hi def link ktAnnotation Identifier
+hi def link ktLabel Identifier
+
+hi def link ktSimpleInterpolation Identifier
+hi def link ktComplexInterpolationBrace Identifier
+
+hi def link ktNumber Number
+hi def link ktFloat Float
+
+hi def link ktExclExcl Special
+hi def link ktArrow Structure
+
+let b:current_syntax = 'kotlin'
+
+" vim:foldmethod=marker
-- 
cgit 


From 9de5cb0b32f60bb0060335b1e0f4e4dd1c6cbf73 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 17 Sep 2023 19:20:16 +0200
Subject: vim-patch:d8b86c937a41

runtime(netrw): fix filetype detection for remote editing files

closes: vim/vim#12990
closes: vim/vim#12992

this partially reverses commit 71badf9 by commenting out the line that
intentionally sets the filetype to an empty string.

https://github.com/vim/vim/commit/d8b86c937a419db69239a8bb879f0050be0f8e1d

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/autoload/netrw.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index be170d8aec..2dd5cf45bf 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -2951,7 +2951,7 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
    " to process this detection correctly.
 "   call Decho("detect filetype of local version of remote file<".rfile.">",'~'.expand("<slnum>"))
 "   call Decho("..did_filetype()=".did_filetype())
-   setl ft=
+"   setl ft=
 "   call Decho("..initial filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
    let iskkeep= &isk
    setl isk-=/
-- 
cgit 


From fd08fd3de3020647c8ae73f1c7d2cf9a4926c828 Mon Sep 17 00:00:00 2001
From: glepnir <glephunter@gmail.com>
Date: Thu, 14 Sep 2023 13:30:51 +0800
Subject: fix(float): add fixd option

---
 runtime/doc/api.txt                   | 2 ++
 runtime/lua/vim/_meta/api.lua         | 2 ++
 runtime/lua/vim/_meta/api_keysets.lua | 1 +
 3 files changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 34e2aedabf..d710217305 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3172,6 +3172,8 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
                   • noautocmd: If true then no buffer-related autocommand
                     events such as |BufEnter|, |BufLeave| or |BufWinEnter| may
                     fire from calling this function.
+                  • fixed: If true when anchor is NW or SW, the float window
+                    would be kept fixed even if the window would be truncated.
 
     Return: ~
         Window handle, or 0 on error
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 7cd0d825a1..392f733112 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1585,6 +1585,8 @@ function vim.api.nvim_open_term(buffer, opts) end
 ---               • noautocmd: If true then no buffer-related autocommand
 ---                 events such as `BufEnter`, `BufLeave` or `BufWinEnter` may
 ---                 fire from calling this function.
+---               • fixed: If true when anchor is NW or SW, the float window
+---                 would be kept fixed even if the window would be truncated.
 --- @return integer
 function vim.api.nvim_open_win(buffer, enter, config) end
 
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index 4d08563ce2..b249f6629f 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -112,6 +112,7 @@ error('Cannot require a meta file')
 --- @field footer_pos? string
 --- @field style? string
 --- @field noautocmd? boolean
+--- @field fixed? boolean
 
 --- @class vim.api.keyset.get_autocmds
 --- @field event? any
-- 
cgit 


From 6405fa4b117263b92f87b17150abd2d1c6ab5881 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 19 Sep 2023 07:07:24 +0800
Subject: vim-patch:346ac1429c5a (#25239)

runtime(doc): add help tag describing object-selection

closes: vim/vim#13114

https://github.com/vim/vim/commit/346ac1429c5afb23bace295106aea1b305443435

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/motion.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 05244cde91..dc92601bfc 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -660,6 +660,7 @@ i`							*v_i`* *i`*
 			Special case: With a count of 2 the quotes are
 			included, but no extra white space as with a"/a'/a`.
 
+							*o_object-select*
 When used after an operator:
 For non-block objects:
 	For the "a" commands: The operator applies to the object and the white
@@ -675,6 +676,7 @@ For a block object:
 	the surrounding braces are excluded.  For the "a" commands, the braces
 	are included.
 
+							*v_object-select*
 When used in Visual mode:
 When start and end of the Visual area are the same (just after typing "v"):
 	One object is selected, the same as for using an operator.
-- 
cgit 


From 8da986ea877b07a5eb117446f410f2a7fc8cd9cb Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Wed, 13 Sep 2023 13:39:18 +0200
Subject: refactor(grid): change schar_T representation to be more compact

Previously, a screen cell would occupy 28+4=32 bytes per cell
as we always made space for up to MAX_MCO+1 codepoints in a cell.

As an example, even a pretty modest 50*80 screen would consume

50*80*2*32 = 256000, i e a quarter megabyte

With the factor of two due to the TUI side buffer, and even more when
using msg_grid and/or ext_multigrid.

This instead stores a 4-byte union of either:
- a valid UTF-8 sequence up to 4 bytes
- an escape char which is invalid UTF-8 (0xFF) plus a 24-bit index to a
  glyph cache

This avoids allocating space for huge composed glyphs _upfront_, while
still keeping rendering such glyphs reasonably fast (1 hash table lookup
+ one plain index lookup). If the same large glyphs are using repeatedly
on the screen, this is still a net reduction of memory/cache
consumption. The only case which really gets worse is if you blast
the screen full with crazy emojis and zalgo text and even this case
only leads to 4 extra bytes per char.

When only <= 4-byte glyphs are used, plus the 4-byte attribute code,
i e 8 bytes in total there is a factor of four reduction of memory use.
Memory which will be quite hot in cache as the screen buffer is scanned
over in win_line() buffer text drawing

A slight complication is that the representation depends on host byte
order. I've tested this manually by compling and running this
in qemu-s390x and it works fine. We might add a qemu based solution
to CI at some point.
---
 runtime/lua/vim/_meta/api.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 6573c68493..c0c8cabfb9 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -79,6 +79,9 @@ function vim.api.nvim__id_float(flt) end
 --- @return any[]
 function vim.api.nvim__inspect_cell(grid, row, col) end
 
+--- @private
+function vim.api.nvim__invalidate_glyph_cache() end
+
 --- @private
 --- @return any[]
 function vim.api.nvim__runtime_inspect() end
-- 
cgit 


From cfd4a9dfaf5fd900264a946ca33c4a4f26f66a49 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Tue, 12 Sep 2023 20:51:21 -0700
Subject: feat(lsp): use treesitter for stylize markdown

---
 runtime/doc/lsp.txt                            |  14 +-
 runtime/doc/news.txt                           |   5 +
 runtime/lua/vim/lsp/handlers.lua               |  15 ++-
 runtime/lua/vim/lsp/util.lua                   | 177 +++++++++++++++++--------
 runtime/queries/markdown/highlights.scm        |   8 ++
 runtime/queries/markdown_inline/highlights.scm |   8 ++
 6 files changed, 157 insertions(+), 70 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 5103cc223f..f0cbce35a3 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1678,20 +1678,24 @@ convert_input_to_markdown_lines({input}, {contents})
     window for `textDocument/hover`, for parsing the result of
     `textDocument/signatureHelp`, and potentially others.
 
+    Note that if the input is of type `MarkupContent` and its kind is
+    `plaintext`, then the corresponding value is returned without further
+    modifications.
+
     Parameters: ~
       • {input}     (`MarkedString` | `MarkedString[]` | `MarkupContent`)
       • {contents}  (table|nil) List of strings to extend with converted
                     lines. Defaults to {}.
 
     Return: ~
-        (table) {contents} extended with lines of converted markdown.
+        string[] extended with lines of converted markdown.
 
     See also: ~
       • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
 
                      *vim.lsp.util.convert_signature_help_to_markdown_lines()*
 convert_signature_help_to_markdown_lines({signature_help}, {ft}, {triggers})
-    Converts `textDocument/SignatureHelp` response to markdown lines.
+    Converts `textDocument/signatureHelp` response to markdown lines.
 
     Parameters: ~
       • {signature_help}  (table) Response of `textDocument/SignatureHelp`
@@ -1908,10 +1912,6 @@ open_floating_preview({contents}, {syntax}, {opts})
                       height when wrap is enabled
                     • max_width: (integer) maximal width of floating window
                     • max_height: (integer) maximal height of floating window
-                    • pad_top: (integer) number of lines to pad contents at
-                      top
-                    • pad_bottom: (integer) number of lines to pad contents at
-                      bottom
                     • focus_id: (string) if a popup with this id is opened,
                       then focus it
                     • close_events: (table) list of events that closes the
@@ -2005,8 +2005,6 @@ stylize_markdown({bufnr}, {contents}, {opts})
                     • wrap_at character to wrap at for computing height
                     • max_width maximal width of floating window
                     • max_height maximal height of floating window
-                    • pad_top number of lines to pad contents at top
-                    • pad_bottom number of lines to pad contents at bottom
                     • separator insert separator after code block
 
     Return: ~
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 7c971097fb..c3b9b7fa2c 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -232,6 +232,11 @@ The following changes to existing APIs or features add new behavior.
   In addition, |nvim_buf_get_extmarks()| has gained an "overlap" option to
   return such ranges even if they started before the specified position.
 
+• LSP hover and signature help now use Treesitter for highlighting of Markdown
+  content.
+  Note that syntax highlighting of code examples requires a matching parser
+  and may be affected by custom queries.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index 4ea3dde81c..f8407be159 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -371,15 +371,22 @@ function M.hover(_, result, ctx, config)
     end
     return
   end
-  local markdown_lines = util.convert_input_to_markdown_lines(result.contents)
-  markdown_lines = util.trim_empty_lines(markdown_lines)
-  if vim.tbl_isempty(markdown_lines) then
+  local format = 'markdown'
+  local contents ---@type string[]
+  if type(result.contents) == 'table' and result.contents.kind == 'plaintext' then
+    format = 'plaintext'
+    contents = { result.contents.value or '' }
+  else
+    contents = util.convert_input_to_markdown_lines(result.contents)
+  end
+  contents = util.trim_empty_lines(contents)
+  if vim.tbl_isempty(contents) then
     if config.silent ~= true then
       vim.notify('No information available')
     end
     return
   end
-  return util.open_floating_preview(markdown_lines, 'markdown', config)
+  return util.open_floating_preview(contents, format, config)
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 54721865b7..32e85578d3 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -877,9 +877,12 @@ end
 --- window for `textDocument/hover`, for parsing the result of
 --- `textDocument/signatureHelp`, and potentially others.
 ---
+--- Note that if the input is of type `MarkupContent` and its kind is `plaintext`,
+--- then the corresponding value is returned without further modifications.
+---
 ---@param input (`MarkedString` | `MarkedString[]` | `MarkupContent`)
 ---@param contents (table|nil) List of strings to extend with converted lines. Defaults to {}.
----@return table {contents} extended with lines of converted markdown.
+---@return string[] extended with lines of converted markdown.
 ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_hover
 function M.convert_input_to_markdown_lines(input, contents)
   contents = contents or {}
@@ -887,27 +890,13 @@ function M.convert_input_to_markdown_lines(input, contents)
   if type(input) == 'string' then
     list_extend(contents, split_lines(input))
   else
-    assert(type(input) == 'table', 'Expected a table for Hover.contents')
+    assert(type(input) == 'table', 'Expected a table for LSP input')
     -- MarkupContent
     if input.kind then
-      -- The kind can be either plaintext or markdown.
-      -- If it's plaintext, then wrap it in a <text></text> block
-
-      -- Some servers send input.value as empty, so let's ignore this :(
       local value = input.value or ''
-
-      if input.kind == 'plaintext' then
-        -- wrap this in a <text></text> block so that stylize_markdown
-        -- can properly process it as plaintext
-        value = string.format('<text>\n%s\n</text>', value)
-      end
-
-      -- assert(type(value) == 'string')
       list_extend(contents, split_lines(value))
       -- MarkupString variation 2
     elseif input.language then
-      -- Some servers send input.value as empty, so let's ignore this :(
-      -- assert(type(input.value) == 'string')
       table.insert(contents, '```' .. input.language)
       list_extend(contents, split_lines(input.value or ''))
       table.insert(contents, '```')
@@ -925,7 +914,7 @@ function M.convert_input_to_markdown_lines(input, contents)
   return contents
 end
 
---- Converts `textDocument/SignatureHelp` response to markdown lines.
+--- Converts `textDocument/signatureHelp` response to markdown lines.
 ---
 ---@param signature_help table Response of `textDocument/SignatureHelp`
 ---@param ft string|nil filetype that will be use as the `lang` for the label markdown code block
@@ -955,7 +944,7 @@ function M.convert_signature_help_to_markdown_lines(signature_help, ft, triggers
   end
   local label = signature.label
   if ft then
-    -- wrap inside a code block so stylize_markdown can render it properly
+    -- wrap inside a code block for proper rendering
     label = ('```%s\n%s\n```'):format(ft, label)
   end
   list_extend(contents, split(label, '\n', { plain = true }))
@@ -1223,7 +1212,7 @@ function M.preview_location(location, opts)
   local syntax = vim.bo[bufnr].syntax
   if syntax == '' then
     -- When no syntax is set, we use filetype as fallback. This might not result
-    -- in a valid syntax definition. See also ft detection in stylize_markdown.
+    -- in a valid syntax definition.
     -- An empty syntax is more common now with TreeSitter, since TS disables syntax.
     syntax = vim.bo[bufnr].filetype
   end
@@ -1240,36 +1229,65 @@ local function find_window_by_var(name, value)
   end
 end
 
---- Trims empty lines from input and pad top and bottom with empty lines
----
----@param contents table of lines to trim and pad
----@param opts table with optional fields
----             - pad_top    number of lines to pad contents at top (default 0)
----             - pad_bottom number of lines to pad contents at bottom (default 0)
----@return table table of trimmed and padded lines
-function M._trim(contents, opts)
-  validate({
-    contents = { contents, 't' },
-    opts = { opts, 't', true },
-  })
-  opts = opts or {}
-  contents = M.trim_empty_lines(contents)
-  if opts.pad_top then
-    for _ = 1, opts.pad_top do
-      table.insert(contents, 1, '')
+---Returns true if the line is empty or only contains whitespace.
+---@param line string
+---@return boolean
+local function is_blank_line(line)
+  return line and line:match('^%s*$')
+end
+
+---Returns true if the line corresponds to a Markdown thematic break.
+---@param line string
+---@return boolean
+local function is_separator_line(line)
+  return line and line:match('^ ? ? ?%-%-%-+%s*$')
+end
+
+---Replaces separator lines by the given divider and removing surrounding blank lines.
+---@param contents string[]
+---@param divider string
+---@return string[]
+local function replace_separators(contents, divider)
+  local trimmed = {}
+  local l = 1
+  while l <= #contents do
+    local line = contents[l]
+    if is_separator_line(line) then
+      if l > 1 and is_blank_line(contents[l - 1]) then
+        table.remove(trimmed)
+      end
+      table.insert(trimmed, divider)
+      if is_blank_line(contents[l + 1]) then
+        l = l + 1
+      end
+    else
+      table.insert(trimmed, line)
     end
+    l = l + 1
   end
-  if opts.pad_bottom then
-    for _ = 1, opts.pad_bottom do
-      table.insert(contents, '')
+
+  return trimmed
+end
+
+---Collapses successive blank lines in the input table into a single one.
+---@param contents string[]
+---@return string[]
+local function collapse_blank_lines(contents)
+  local collapsed = {}
+  local l = 1
+  while l <= #contents do
+    local line = contents[l]
+    if is_blank_line(line) then
+      while is_blank_line(contents[l + 1]) do
+        l = l + 1
+      end
     end
+    table.insert(collapsed, line)
+    l = l + 1
   end
-  return contents
+  return collapsed
 end
 
---- Generates a table mapping markdown code block lang to vim syntax,
---- based on g:markdown_fenced_languages
----@return table table of lang -> syntax mappings
 local function get_markdown_fences()
   local fences = {}
   for _, fence in pairs(vim.g.markdown_fenced_languages or {}) do
@@ -1297,8 +1315,6 @@ end
 ---  - wrap_at   character to wrap at for computing height
 ---  - max_width  maximal width of floating window
 ---  - max_height maximal height of floating window
----  - pad_top    number of lines to pad contents at top
----  - pad_bottom number of lines to pad contents at bottom
 ---  - separator insert separator after code block
 ---@return table stripped content
 function M.stylize_markdown(bufnr, contents, opts)
@@ -1335,7 +1351,7 @@ function M.stylize_markdown(bufnr, contents, opts)
   end
 
   -- Clean up
-  contents = M._trim(contents, opts)
+  contents = M.trim_empty_lines(contents)
 
   local stripped = {}
   local highlights = {}
@@ -1484,6 +1500,49 @@ function M.stylize_markdown(bufnr, contents, opts)
   return stripped
 end
 
+--- @class lsp.util.NormalizeMarkdownOptions
+--- @field width integer Thematic breaks are expanded to this size. Defaults to 80.
+
+--- Normalizes Markdown input to a canonical form.
+---
+--- The returned Markdown adheres to the GitHub Flavored Markdown (GFM)
+--- specification.
+---
+--- The following transformations are made:
+---
+---   1. Empty lines at the beginning or end of the content are removed
+---   2. Carriage returns ('\r') are removed
+---   3. Successive empty lines are collapsed into a single empty line
+---   4. Thematic breaks are expanded to the given width
+---
+---@private
+---@param contents string[]
+---@param opts? lsp.util.NormalizeMarkdownOptions
+---@return string[] table of lines containing normalized Markdown
+---@see https://github.github.com/gfm
+function M._normalize_markdown(contents, opts)
+  validate({
+    contents = { contents, 't' },
+    opts = { opts, 't', true },
+  })
+  opts = opts or {}
+
+  -- 1. Empty lines at the beginning or end of the content are removed
+  contents = M.trim_empty_lines(contents)
+
+  -- 2. Carriage returns are removed
+  contents = vim.split(table.concat(contents, '\n'):gsub('\r', ''), '\n')
+
+  -- 3. Successive empty lines are collapsed into a single empty line
+  contents = collapse_blank_lines(contents)
+
+  -- 4. Thematic breaks are expanded to the given width
+  local divider = string.rep('─', opts.width or 80)
+  contents = replace_separators(contents, divider)
+
+  return contents
+end
+
 --- Closes the preview window
 ---
 ---@param winnr integer window id of preview window
@@ -1620,8 +1679,6 @@ end
 ---             - wrap_at: (integer) character to wrap at for computing height when wrap is enabled
 ---             - max_width: (integer) maximal width of floating window
 ---             - max_height: (integer) maximal height of floating window
----             - pad_top: (integer) number of lines to pad contents at top
----             - pad_bottom: (integer) number of lines to pad contents at bottom
 ---             - focus_id: (string) if a popup with this id is opened, then focus it
 ---             - close_events: (table) list of events that closes the floating window
 ---             - focusable: (boolean, default true) Make float focusable
@@ -1629,8 +1686,7 @@ end
 ---                      is also `true`, focus an existing floating window with the same
 ---                      {focus_id}
 ---@return integer bufnr of newly created float window
----@return integer winid of newly created float window
----preview window
+---@return integer winid of newly created float window preview window
 function M.open_floating_preview(contents, syntax, opts)
   validate({
     contents = { contents, 't' },
@@ -1639,7 +1695,6 @@ function M.open_floating_preview(contents, syntax, opts)
   })
   opts = opts or {}
   opts.wrap = opts.wrap ~= false -- wrapping by default
-  opts.stylize_markdown = opts.stylize_markdown ~= false and vim.g.syntax_on ~= nil
   opts.focus = opts.focus ~= false
   opts.close_events = opts.close_events or { 'CursorMoved', 'CursorMovedI', 'InsertCharPre' }
 
@@ -1671,16 +1726,21 @@ function M.open_floating_preview(contents, syntax, opts)
     api.nvim_win_close(existing_float, true)
   end
 
+  -- Create the buffer
   local floating_bufnr = api.nvim_create_buf(false, true)
-  local do_stylize = syntax == 'markdown' and opts.stylize_markdown
-
-  -- Clean up input: trim empty lines from the end, pad
-  contents = M._trim(contents, opts)
 
+  -- Set up the contents, using treesitter for markdown
+  local do_stylize = syntax == 'markdown' and vim.g.syntax_on ~= nil
   if do_stylize then
-    -- applies the syntax and sets the lines to the buffer
-    contents = M.stylize_markdown(floating_bufnr, contents, opts)
+    local width = M._make_floating_popup_size(contents, opts)
+    contents = M._normalize_markdown(contents, { width = width })
+    vim.bo[floating_bufnr].filetype = 'markdown'
+    vim.treesitter.start(floating_bufnr)
+    api.nvim_buf_set_lines(floating_bufnr, 0, -1, false, contents)
   else
+    -- Clean up input: trim empty lines from the end, pad
+    contents = M.trim_empty_lines(contents)
+
     if syntax then
       vim.bo[floating_bufnr].syntax = syntax
     end
@@ -1697,9 +1757,9 @@ function M.open_floating_preview(contents, syntax, opts)
 
   local float_option = M.make_floating_popup_options(width, height, opts)
   local floating_winnr = api.nvim_open_win(floating_bufnr, false, float_option)
+
   if do_stylize then
     vim.wo[floating_winnr].conceallevel = 2
-    vim.wo[floating_winnr].concealcursor = 'n'
   end
   -- disable folding
   vim.wo[floating_winnr].foldenable = false
@@ -1708,6 +1768,7 @@ function M.open_floating_preview(contents, syntax, opts)
 
   vim.bo[floating_bufnr].modifiable = false
   vim.bo[floating_bufnr].bufhidden = 'wipe'
+
   api.nvim_buf_set_keymap(
     floating_bufnr,
     'n',
diff --git a/runtime/queries/markdown/highlights.scm b/runtime/queries/markdown/highlights.scm
index e78d233cc6..2cc5546bac 100644
--- a/runtime/queries/markdown/highlights.scm
+++ b/runtime/queries/markdown/highlights.scm
@@ -61,3 +61,11 @@
 ] @string.escape
 
 (inline) @spell
+
+;; Conceal backticks
+(fenced_code_block
+  (fenced_code_block_delimiter) @conceal
+  (#set! conceal ""))
+(fenced_code_block
+  (info_string (language) @conceal
+  (#set! conceal "")))
diff --git a/runtime/queries/markdown_inline/highlights.scm b/runtime/queries/markdown_inline/highlights.scm
index cd5da530d7..c75da478af 100644
--- a/runtime/queries/markdown_inline/highlights.scm
+++ b/runtime/queries/markdown_inline/highlights.scm
@@ -92,3 +92,11 @@
     "]"
   ] @conceal
   (#set! conceal ""))
+
+;; Replace common HTML entities.
+((entity_reference) @conceal (#eq? @conceal "&nbsp;") (#set! conceal ""))
+((entity_reference) @conceal (#eq? @conceal "&lt;") (#set! conceal "<"))
+((entity_reference) @conceal (#eq? @conceal "&gt;") (#set! conceal ">"))
+((entity_reference) @conceal (#eq? @conceal "&amp;") (#set! conceal "&"))
+((entity_reference) @conceal (#eq? @conceal "&quot;") (#set! conceal "\""))
+((entity_reference) @conceal (#any-of? @conceal "&ensp;" "&emsp;") (#set! conceal " "))
-- 
cgit 


From 5a363ccac8ff5889332bafbf68e7e8d20bca316c Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Mon, 18 Sep 2023 11:04:01 -0700
Subject: fix(lsp)!: deprecate trim_empty_lines

---
 runtime/doc/deprecated.txt       |  1 +
 runtime/doc/lsp.txt              |  9 ---------
 runtime/doc/news.txt             |  1 +
 runtime/lua/vim/lsp/handlers.lua |  4 +---
 runtime/lua/vim/lsp/util.lua     | 29 +++++++++++++----------------
 5 files changed, 16 insertions(+), 28 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 2e9312cf74..407d7ae9fb 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -141,6 +141,7 @@ LSP FUNCTIONS
 						`progress` of |vim.lsp.client|
 - *vim.lsp.get_active_clients()*		Use |vim.lsp.get_clients()|
 - *vim.lsp.for_each_buffer_client()*		Use |vim.lsp.get_clients()|
+- *vim.lsp.util.trim_empty_lines()*		Use |vim.split()| with `trimempty` instead.
 
 TREESITTER FUNCTIONS
 - *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index f0cbce35a3..15292cd7cf 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -2033,15 +2033,6 @@ text_document_completion_list_to_complete_items({result}, {prefix})
     See also: ~
       • complete-items
 
-trim_empty_lines({lines})                    *vim.lsp.util.trim_empty_lines()*
-    Removes empty lines from the beginning and end.
-
-    Parameters: ~
-      • {lines}  (table) list of lines to trim
-
-    Return: ~
-        (table) trimmed list of lines
-
                                 *vim.lsp.util.try_trim_markdown_code_blocks()*
 try_trim_markdown_code_blocks({lines})
     Accepts markdown lines and tries to reduce them to a filetype if they
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c3b9b7fa2c..240eb152d7 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -272,6 +272,7 @@ release.
   - |vim.lsp.util.get_progress_messages()|	Use |vim.lsp.status()| instead.
   - |vim.lsp.get_active_clients()|		Use |vim.lsp.get_clients()| instead.
   - |vim.lsp.for_each_buffer_client()|		Use |vim.lsp.get_clients()| instead.
+  - |vim.lsp.util.trim_empty_lines()|		Use |vim.split()| with `trimempty` instead.
 
 • `vim.loop` has been renamed to `vim.uv`.
 
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index f8407be159..d43d9a7cfa 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -375,11 +375,10 @@ function M.hover(_, result, ctx, config)
   local contents ---@type string[]
   if type(result.contents) == 'table' and result.contents.kind == 'plaintext' then
     format = 'plaintext'
-    contents = { result.contents.value or '' }
+    contents = vim.split(result.contents.value or '', '\n', { trimempty = true })
   else
     contents = util.convert_input_to_markdown_lines(result.contents)
   end
-  contents = util.trim_empty_lines(contents)
   if vim.tbl_isempty(contents) then
     if config.silent ~= true then
       vim.notify('No information available')
@@ -477,7 +476,6 @@ function M.signature_help(_, result, ctx, config)
     vim.tbl_get(client.server_capabilities, 'signatureHelpProvider', 'triggerCharacters')
   local ft = vim.bo[ctx.bufnr].filetype
   local lines, hl = util.convert_signature_help_to_markdown_lines(result, ft, triggers)
-  lines = util.trim_empty_lines(lines)
   if vim.tbl_isempty(lines) then
     if config.silent ~= true then
       print('No signature help available')
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 32e85578d3..988057f5f9 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -102,7 +102,7 @@ end
 
 local function split_lines(value)
   value = string.gsub(value, '\r\n?', '\n')
-  return split(value, '\n', { plain = true })
+  return split(value, '\n', { plain = true, trimempty = true })
 end
 
 local function create_window_without_focus()
@@ -947,7 +947,7 @@ function M.convert_signature_help_to_markdown_lines(signature_help, ft, triggers
     -- wrap inside a code block for proper rendering
     label = ('```%s\n%s\n```'):format(ft, label)
   end
-  list_extend(contents, split(label, '\n', { plain = true }))
+  list_extend(contents, split(label, '\n', { plain = true, trimempty = true }))
   if signature.documentation then
     -- if LSP returns plain string, we treat it as plaintext. This avoids
     -- special characters like underscore or similar from being interpreted
@@ -1351,7 +1351,7 @@ function M.stylize_markdown(bufnr, contents, opts)
   end
 
   -- Clean up
-  contents = M.trim_empty_lines(contents)
+  contents = vim.split(table.concat(contents, '\n'), '\n', { trimempty = true })
 
   local stripped = {}
   local highlights = {}
@@ -1510,10 +1510,9 @@ end
 ---
 --- The following transformations are made:
 ---
----   1. Empty lines at the beginning or end of the content are removed
----   2. Carriage returns ('\r') are removed
----   3. Successive empty lines are collapsed into a single empty line
----   4. Thematic breaks are expanded to the given width
+---   1. Carriage returns ('\r') and empty lines at the beginning and end are removed
+---   2. Successive empty lines are collapsed into a single empty line
+---   3. Thematic breaks are expanded to the given width
 ---
 ---@private
 ---@param contents string[]
@@ -1527,16 +1526,13 @@ function M._normalize_markdown(contents, opts)
   })
   opts = opts or {}
 
-  -- 1. Empty lines at the beginning or end of the content are removed
-  contents = M.trim_empty_lines(contents)
+  -- 1. Carriage returns are removed
+  contents = vim.split(table.concat(contents, '\n'):gsub('\r', ''), '\n', { trimempty = true })
 
-  -- 2. Carriage returns are removed
-  contents = vim.split(table.concat(contents, '\n'):gsub('\r', ''), '\n')
-
-  -- 3. Successive empty lines are collapsed into a single empty line
+  -- 2. Successive empty lines are collapsed into a single empty line
   contents = collapse_blank_lines(contents)
 
-  -- 4. Thematic breaks are expanded to the given width
+  -- 3. Thematic breaks are expanded to the given width
   local divider = string.rep('─', opts.width or 80)
   contents = replace_separators(contents, divider)
 
@@ -1738,8 +1734,8 @@ function M.open_floating_preview(contents, syntax, opts)
     vim.treesitter.start(floating_bufnr)
     api.nvim_buf_set_lines(floating_bufnr, 0, -1, false, contents)
   else
-    -- Clean up input: trim empty lines from the end, pad
-    contents = M.trim_empty_lines(contents)
+    -- Clean up input: trim empty lines
+    contents = vim.split(table.concat(contents, '\n'), '\n', { trimempty = true })
 
     if syntax then
       vim.bo[floating_bufnr].syntax = syntax
@@ -1969,6 +1965,7 @@ function M.symbols_to_items(symbols, bufnr)
 end
 
 --- Removes empty lines from the beginning and end.
+---@deprecated use `vim.split()` with `trimempty` instead
 ---@param lines table list of lines to trim
 ---@return table trimmed list of lines
 function M.trim_empty_lines(lines)
-- 
cgit 


From c4f4c7a356013c6f1e10b7bf239d9e3c4c0c336e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 20 Sep 2023 06:37:29 +0800
Subject: vim-patch:9.0.1915: r_CTRL-C works differently in visual mode
 (#25248)

Problem:  r_CTRL-C works differently in visual mode
Solution: Make r_CTRL-C behave consistent in visual mode
          in terminal and Windows GUI

in visual mode, r CTRL-C behaves strange in Unix like environments. It
seems to end visual mode, but still is waiting for few more chars,
however it never seems to replace it by any characters and eventually
just returns back into normal mode.

In contrast in Windows GUI mode, r_CTRL-C replaces in the selected area
all characters by a literal CTRL-C.

Not sure why it behaves like this. It seems in the Windows GUI, got_int
is not set and therefore behaves as if any other normal character has
been pressed.

So remove the special casing of what happens when got_int is set and
make it always behave like in Windows GUI mode. Add a test to verify it
always behaves like replacing in the selected area each selected
character by a literal CTRL-C.

closes: vim/vim#13091
closes: vim/vim#13112

https://github.com/vim/vim/commit/476733f3d06876c7ac105e064108c973a57984d3

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/change.txt | 1 +
 runtime/doc/visual.txt | 1 +
 2 files changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 894557818b..2c47421b02 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -196,6 +196,7 @@ gR			Enter Virtual Replace mode: Each character you type
 
 							*v_r*
 {Visual}r{char}		Replace all selected characters by {char}.
+			CTRL-C will be inserted literally.
 
 							*v_C*
 {Visual}["x]C		Delete the highlighted lines [into register x] and
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 6ca486e8cf..0d1ea937c0 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -169,6 +169,7 @@ If you want to highlight exactly the same area as the last time, you can use
 CTRL-C			In Visual mode: Stop Visual mode.  When insert mode is
 			pending (the mode message shows
 			"-- (insert) VISUAL --"), it is also stopped.
+			On MS-Windows, you may need to press CTRL-Break.
 
 ==============================================================================
 3. Changing the Visual area				*visual-change*
-- 
cgit 


From b6ef938c663bc930a42bf1b15d7e97efcd4904b6 Mon Sep 17 00:00:00 2001
From: Eduardo Rittner Coelho
 <116819854+eduardorittner@users.noreply.github.com>
Date: Wed, 20 Sep 2023 06:04:30 -0300
Subject: docs: document $XDG environment variables #25227

---
 runtime/doc/starting.txt | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 5f6e932693..17d5b4668d 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1362,9 +1362,9 @@ paths.
 						*base-directories* *xdg*
 The "base" (root) directories conform to the XDG Base Directory Specification.
 https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-The $XDG_CONFIG_HOME, $XDG_DATA_HOME, $XDG_RUNTIME_DIR, and $XDG_STATE_HOME
-environment variables are used if defined, else default values (listed below)
-are used.
+The $XDG_CONFIG_HOME, $XDG_DATA_HOME, $XDG_RUNTIME_DIR, $XDG_STATE_HOME,
+$XDG_CACHE_HOME, $XDG_CONFIG_DIRS and $XDG_DATA_DIRS environment variables
+are used if defined, else default values (listed below) are used.
 
 CONFIG DIRECTORY (DEFAULT) ~
                   *$XDG_CONFIG_HOME*            Nvim: stdpath("config")
@@ -1386,9 +1386,32 @@ STATE DIRECTORY (DEFAULT) ~
     Unix:         ~/.local/state              ~/.local/state/nvim
     Windows:      ~/AppData/Local             ~/AppData/Local/nvim-data
 
+CACHE DIRECTORY (DEFAULT) ~
+                  *$XDG_CACHE_HOME*             Nvim: stdpath("cache")
+    Unix:         ~/.cache                    ~/.cache/nvim
+    Windows:      ~/AppData/Local/Temp        ~/AppData/Local/Temp/nvim-data
+
+LOG FILE (DEFAULT) ~
+                  `$NVIM_LOG_FILE`              Nvim: stdpath("log")
+    Unix:         ~/.local/state/nvim         ~/.local/state/nvim/log
+    Windows:      ~/AppData/Local/nvim-data   ~/AppData/Local/nvim-data/log
+
+ADDITIONAL CONFIGS DIRECTORY (DEFAULT) ~
+                  *$XDG_CONFIG_DIRS*            Nvim: stdpath("config_dirs")
+    Unix:         /etc/xdg/                   /etc/xdg/nvim
+    Windows:      Not applicable              Not applicable
+
+ADDITIONAL DATA DIRECTORY (DEFAULT) ~
+                  *$XDG_DATA_DIRS*              Nvim: stdpath("data_dirs")
+    Unix:         /usr/local/share            /usr/local/share/nvim
+                  /usr/share                  /usr/share/nvim
+    Windows:      Not applicable              Not applicable
+
 Note: Throughout the help pages these defaults are used as placeholders, e.g.
 "~/.config" is understood to mean "$XDG_CONFIG_HOME or ~/.config".
 
+Note: The log file directory is controlled by `$XDG_STATE_HOME`.
+
 NVIM_APPNAME					*$NVIM_APPNAME*
 The standard directories can be further configured by the `$NVIM_APPNAME`
 environment variable. This variable controls the sub-directory that Nvim will
@@ -1408,8 +1431,8 @@ LOG FILE					*log* *$NVIM_LOG_FILE* *E5430*
 Besides 'debug' and 'verbose', Nvim keeps a general log file for internal
 debugging, plugins and RPC clients. >
 	:echo $NVIM_LOG_FILE
-By default, the file is located at stdpath("log")/log unless that path
-is inaccessible or if $NVIM_LOG_FILE was set before |startup|.
+By default, the file is located at stdpath("log")/log ($XDG_STATE_HOME/nvim/log)
+unless that path is inaccessible or if $NVIM_LOG_FILE was set before |startup|.
 
 
  vim:noet:tw=78:ts=8:ft=help:norl:
-- 
cgit 


From 1b55f51d0d8468ca357514a868ac8e188b0c8722 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 20 Sep 2023 04:15:23 -0700
Subject: docs: misc #24561

fix #24699
fix #25253
---
 runtime/doc/api.txt                  |   2 +-
 runtime/doc/builtin.txt              |   2 +-
 runtime/doc/develop.txt              |   6 ++
 runtime/doc/intro.txt                |   2 +-
 runtime/doc/lua.txt                  |  51 ++++++------
 runtime/doc/luaref.txt               |  24 +++---
 runtime/doc/options.txt              |   5 +-
 runtime/doc/treesitter.txt           |  10 ++-
 runtime/lua/vim/_meta/api.lua        |   2 +-
 runtime/lua/vim/_meta/options.lua    |   5 +-
 runtime/lua/vim/_meta/vimfn.lua      |   2 +-
 runtime/lua/vim/shared.lua           | 153 +++++++++++++++++------------------
 runtime/lua/vim/treesitter/dev.lua   |   5 +-
 runtime/lua/vim/treesitter/query.lua |   8 +-
 14 files changed, 144 insertions(+), 133 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index f04fe9bb87..766faee304 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1505,7 +1505,7 @@ nvim_set_keymap({mode}, {lhs}, {rhs}, {*opts})             *nvim_set_keymap()*
       • {rhs}   Right-hand-side |{rhs}| of the mapping.
       • {opts}  Optional parameters map: Accepts all |:map-arguments| as keys
                 except |<buffer>|, values are booleans (default false). Also:
-                • "noremap" non-recursive mapping |:noremap|
+                • "noremap" disables |recursive_mapping|, like |:noremap|
                 • "desc" human-readable description.
                 • "callback" Lua function called in place of {rhs}.
                 • "replace_keycodes" (boolean) When "expr" is true, replace
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 05db977809..2dd290fef1 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -3738,7 +3738,7 @@ jobresize({job}, {width}, {height})                                *jobresize()*
 		Fails if the job was not started with `"pty":v:true`.
 
 jobstart({cmd} [, {opts}])                                          *jobstart()*
-		Note: Prefer |vim.system()| in Lua.
+		Note: Prefer |vim.system()| in Lua (unless using the `pty` option).
 
 		Spawns {cmd} as a job.
 		If {cmd} is a List it runs directly (no 'shell').
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 71c16659eb..f4c581fabe 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -312,6 +312,12 @@ See also |dev-naming|.
 - Avoid functions that depend on cursor position, current buffer, etc. Instead
   the function should take a position parameter, buffer parameter, etc.
 
+Where things go ~
+
+- API (libnvim/RPC): exposes low-level internals, or fundamental things (such
+  as `nvim_exec_lua()`) needed by clients or C consumers.
+- Lua stdlib = high-level functionality that builds on top of the API.
+
 NAMING GUIDELINES                                       *dev-naming*
 
 Naming is exceedingly important: the name of a thing is the primary interface
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 975aff6bf6..299c18ac2e 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -536,7 +536,7 @@ CTRL-O in Insert mode you get a beep but you are still in Insert mode, type
  Visual		 *2		  ^G	 c C	    --	      :       --
  Select		 *5	^O ^G		 *6	    --	      --      --
  Insert		 <Esc>	  --	  --		  <Insert>    --      --
- Replace		 <Esc>	  --	  --	<Insert>	      --      --
+ Replace	 <Esc>	  --	  --	<Insert>	      --      --
  Command-line	 `*3`	  --	  --	 :start	    --		      --
  Ex		 :vi	  --	  --	 --	    --	      --
 
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 6cfec45523..efba10b86f 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1880,25 +1880,22 @@ vim.deepcopy({orig})                                          *vim.deepcopy()*
     Return: ~
         (table) Table of copied keys and (nested) values.
 
-vim.defaulttable({create})                                *vim.defaulttable()*
-    Creates a table whose members are automatically created when accessed, if
-    they don't already exist.
+vim.defaulttable({createfn})                              *vim.defaulttable()*
+    Creates a table whose missing keys are provided by {createfn} (like
+    Python's "defaultdict").
 
-    They mimic defaultdict in python.
-
-    If {create} is `nil`, this will create a defaulttable whose constructor
-    function is this function, effectively allowing to create nested tables on
-    the fly: >lua
+    If {createfn} is `nil` it defaults to defaulttable() itself, so accessing
+    nested keys creates nested tables: >lua
         local a = vim.defaulttable()
         a.b.c = 1
 <
 
     Parameters: ~
-      • {create}  function?(key:any):any The function called to create a
-                  missing value.
+      • {createfn}  function?(key:any):any Provides the value for a missing
+                    `key`.
 
     Return: ~
-        (table) Empty table with metamethod
+        (table) Empty table with `__index` metamethod.
 
 vim.endswith({s}, {suffix})                                   *vim.endswith()*
     Tests if `s` ends with `suffix`.
@@ -2061,13 +2058,13 @@ vim.Ringbuf:push({item})                                      *Ringbuf:push()*
       • {item}  any
 
 vim.spairs({t})                                                 *vim.spairs()*
-    Enumerate a table sorted by its keys.
+    Enumerates key-value pairs of a table, ordered by key.
 
     Parameters: ~
       • {t}  (table) Dict-like table
 
     Return: ~
-        (function) iterator over sorted keys and their values
+        (function) |for-in| iterator over sorted keys and their values
 
     See also: ~
       • Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
@@ -2232,12 +2229,14 @@ vim.tbl_get({o}, {...})                                        *vim.tbl_get()*
         any Nested value indexed by key (if it exists), else nil
 
 vim.tbl_isarray({t})                                       *vim.tbl_isarray()*
-    Tests if a Lua table can be treated as an array (a table indexed by
-    integers).
+    Tests if `t` is an "array": a table indexed only by integers (potentially non-contiguous).
+
+    If the indexes start from 1 and are contiguous then the array is also a
+    list. |vim.tbl_islist()|
 
-    Empty table `{}` is assumed to be an array, unless it was created by
-    |vim.empty_dict()| or returned as a dict-like |API| or Vimscript result,
-    for example from |rpcrequest()| or |vim.fn|.
+    Empty table `{}` is an array, unless it was created by |vim.empty_dict()|
+    or returned as a dict-like |API| or Vimscript result, for example from
+    |rpcrequest()| or |vim.fn|.
 
     Parameters: ~
       • {t}  (table)
@@ -2245,6 +2244,9 @@ vim.tbl_isarray({t})                                       *vim.tbl_isarray()*
     Return: ~
         (boolean) `true` if array-like table, else `false`.
 
+    See also: ~
+      • https://github.com/openresty/luajit2#tableisarray
+
 vim.tbl_isempty({t})                                       *vim.tbl_isempty()*
     Checks if a table is empty.
 
@@ -2258,12 +2260,12 @@ vim.tbl_isempty({t})                                       *vim.tbl_isempty()*
       • https://github.com/premake/premake-core/blob/master/src/base/table.lua
 
 vim.tbl_islist({t})                                         *vim.tbl_islist()*
-    Tests if a Lua table can be treated as a list (a table indexed by
-    consecutive integers starting from 1).
+    Tests if `t` is a "list": a table indexed only by contiguous integers starting from 1 (what |lua-length| calls a "regular
+    array").
 
-    Empty table `{}` is assumed to be an list, unless it was created by
-    |vim.empty_dict()| or returned as a dict-like |API| or Vimscript result,
-    for example from |rpcrequest()| or |vim.fn|.
+    Empty table `{}` is a list, unless it was created by |vim.empty_dict()| or
+    returned as a dict-like |API| or Vimscript result, for example from
+    |rpcrequest()| or |vim.fn|.
 
     Parameters: ~
       • {t}  (table)
@@ -2271,6 +2273,9 @@ vim.tbl_islist({t})                                         *vim.tbl_islist()*
     Return: ~
         (boolean) `true` if list-like table, else `false`.
 
+    See also: ~
+      • |vim.tbl_isarray()|
+
 vim.tbl_keys({t})                                             *vim.tbl_keys()*
     Return a list of all keys used in a table. However, the order of the
     return table of keys is not guaranteed.
diff --git a/runtime/doc/luaref.txt b/runtime/doc/luaref.txt
index 341f620a8d..467b5760cf 100644
--- a/runtime/doc/luaref.txt
+++ b/runtime/doc/luaref.txt
@@ -568,8 +568,7 @@ Binary operators comprise arithmetic operators (see |lua-arithmetic|),
 relational operators (see |lua-relational|), logical operators (see
 |lua-logicalop|), and the concatenation operator (see |lua-concat|).
 Unary operators comprise the unary minus (see |lua-arithmetic|), the unary
-`not` (see |lua-logicalop|), and the unary length operator (see
-|lua-length|).
+`not` (see |lua-logicalop|), and the unary length operator (see |lua-length|).
 
 Both function calls and vararg expressions may result in multiple values. If
 the expression is used as a statement (see |lua-funcstatement|)
@@ -690,7 +689,7 @@ according to the rules mentioned in |lua-coercion|. Otherwise, the
 "concat" metamethod is called (see |lua-metatable|).
 
 ------------------------------------------------------------------------------
-2.5.5  The Length Operator                                   *lua-length*
+2.5.5  The Length Operator                                   *lua-#* *lua-length*
 
 The length operator is denoted by the unary operator `#`. The length of a
 string is its number of bytes (that is, the usual meaning of string length
@@ -3505,7 +3504,7 @@ luaL_where                                                        *luaL_where()*
         This function is used to build a prefix for error messages.
 
 ==============================================================================
-5  STANDARD LIBRARIES                                               *lua-Lib*
+5  STANDARD LIBRARIES                                               *lua-lib*
 
 The standard libraries provide useful functions that are implemented directly
 through the C API. Some of these functions provide essential services to the
@@ -3653,8 +3652,8 @@ next({table} [, {index}])                               *next()*
         argument is absent, then it is interpreted as `nil`. In particular,
         you can use `next(t)` to check whether a table is empty.
 
-        The order in which the indices are enumerated is not specified, `even
-        for` `numeric indices`. (To traverse a table in numeric order, use a
+        The order in which the indices are enumerated is not specified, even
+        for numeric indices. (To traverse a table in numeric order, use a
         numerical `for` or the |ipairs()| function.)
 
         The behavior of `next` is `undefined` if, during the traversal, you
@@ -3759,7 +3758,7 @@ unpack({list} [, {i} [, {j}]])                          *unpack()*
 <
         except that the above code can be written only for a fixed number of
         elements. By default, {i} is 1 and {j} is the length of the list, as
-        defined by the length operator(see |lua-length|).
+        defined by the length operator (see |lua-length|).
 
 _VERSION                                                *_VERSION*
         A global variable (not a function) that holds a string containing the
@@ -4299,12 +4298,11 @@ table.remove({table} [, {pos}])                                 *table.remove()*
 
 table.sort({table} [, {comp}])                                    *table.sort()*
         Sorts table elements in a given order, `in-place`, from `table[1]` to
-        `table[n]`, where `n` is the length of the table (see
-        |lua-length|). If {comp} is given, then it must be a function
-        that receives two table elements, and returns true when the first is
-        less than the second (so that `not comp(a[i+1],a[i])` will be true
-        after the sort). If {comp} is not given, then the standard Lua
-        operator `<` is used instead.
+        `table[n]`, where `n` is the length of the table (see |lua-length|).
+        If {comp} is given, then it must be a function that receives two table
+        elements, and returns true when the first is less than the second (so
+        that `not comp(a[i+1],a[i])` will be true after the sort). If {comp}
+        is not given, then the standard Lua operator `<` is used instead.
 
 The sort algorithm is `not` stable, that is, elements considered equal by the
 given order may have their relative positions changed by the sort.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e1518c58bb..96bf2eef63 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3235,9 +3235,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			*'ignorecase'* *'ic'* *'noignorecase'* *'noic'*
 'ignorecase' 'ic'	boolean	(default off)
 			global
-	Ignore case in search patterns.  Also used when searching in the tags
-	file.
-	Also see 'smartcase' and 'tagcase'.
+	Ignore case in search patterns, completion, and when searching the tags file.
+	See also 'smartcase' and 'tagcase'.
 	Can be overruled by using "\c" or "\C" in the pattern, see
 	|/ignorecase|.
 
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 10f689bad7..34971c7acf 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -854,12 +854,14 @@ add_predicate({name}, {handler}, {force})
       • {force}    (boolean|nil)
 
 edit({lang})                                     *vim.treesitter.query.edit()*
-    Open a window for live editing of a treesitter query.
+    Opens a live editor to query the buffer you started from.
 
-    Can also be shown with `:EditQuery`.                          *:EditQuery*
+    Can also be shown with *:EditQuery*.
 
-    Note that the editor opens a scratch buffer, and so queries aren't
-    persisted on disk.
+    If you move the cursor to a capture name ("@foo"), text matching the
+    capture is highlighted in the source buffer. The query editor is a scratch
+    buffer, use `:write` to save it. You can find example queries at
+    `$VIMRUNTIME/queries/`.
 
     Parameters: ~
       • {lang}  (string|nil) language to open the query editor for. If
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 41bb5636b8..81fa7ce7ec 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1903,7 +1903,7 @@ function vim.api.nvim_set_hl_ns_fast(ns_id) end
 --- @param rhs string Right-hand-side `{rhs}` of the mapping.
 --- @param opts vim.api.keyset.keymap Optional parameters map: Accepts all `:map-arguments` as keys
 ---             except `<buffer>`, values are booleans (default false). Also:
----             • "noremap" non-recursive mapping `:noremap`
+---             • "noremap" disables `recursive_mapping`, like `:noremap`
 ---             • "desc" human-readable description.
 ---             • "callback" Lua function called in place of {rhs}.
 ---             • "replace_keycodes" (boolean) When "expr" is true, replace
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index af676fa961..734096a755 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -3088,9 +3088,8 @@ vim.go.icon = vim.o.icon
 vim.o.iconstring = ""
 vim.go.iconstring = vim.o.iconstring
 
---- Ignore case in search patterns.  Also used when searching in the tags
---- file.
---- Also see 'smartcase' and 'tagcase'.
+--- Ignore case in search patterns, completion, and when searching the tags file.
+--- See also 'smartcase' and 'tagcase'.
 --- Can be overruled by using "\c" or "\C" in the pattern, see
 --- `/ignorecase`.
 ---
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 2062e96b21..4113797759 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -4528,7 +4528,7 @@ function vim.fn.jobresize(job, width, height) end
 --- @return any
 function vim.fn.jobsend(...) end
 
---- Note: Prefer |vim.system()| in Lua.
+--- Note: Prefer |vim.system()| in Lua (unless using the `pty` option).
 ---
 --- Spawns {cmd} as a job.
 --- If {cmd} is a List it runs directly (no 'shell').
diff --git a/runtime/lua/vim/shared.lua b/runtime/lua/vim/shared.lua
index 0c38fa955a..9542d93789 100644
--- a/runtime/lua/vim/shared.lua
+++ b/runtime/lua/vim/shared.lua
@@ -534,12 +534,12 @@ function vim.tbl_flatten(t)
   return result
 end
 
---- Enumerate a table sorted by its keys.
+--- Enumerates key-value pairs of a table, ordered by key.
 ---
 ---@see Based on https://github.com/premake/premake-core/blob/master/src/base/table.lua
 ---
 ---@param t table Dict-like table
----@return function iterator over sorted keys and their values
+---@return function # |for-in| iterator over sorted keys and their values
 function vim.spairs(t)
   assert(type(t) == 'table', string.format('Expected table, got %s', type(t)))
 
@@ -551,7 +551,6 @@ function vim.spairs(t)
   table.sort(keys)
 
   -- Return the iterator function.
-  -- TODO(justinmk): Return "iterator function, table {t}, and nil", like pairs()?
   local i = 0
   return function()
     i = i + 1
@@ -561,11 +560,14 @@ function vim.spairs(t)
   end
 end
 
---- Tests if a Lua table can be treated as an array (a table indexed by integers).
+--- Tests if `t` is an "array": a table indexed _only_ by integers (potentially non-contiguous).
 ---
---- Empty table `{}` is assumed to be an array, unless it was created by
---- |vim.empty_dict()| or returned as a dict-like |API| or Vimscript result,
---- for example from |rpcrequest()| or |vim.fn|.
+--- If the indexes start from 1 and are contiguous then the array is also a list. |vim.tbl_islist()|
+---
+--- Empty table `{}` is an array, unless it was created by |vim.empty_dict()| or returned as
+--- a dict-like |API| or Vimscript result, for example from |rpcrequest()| or |vim.fn|.
+---
+---@see https://github.com/openresty/luajit2#tableisarray
 ---
 ---@param t table
 ---@return boolean `true` if array-like table, else `false`.
@@ -597,11 +599,13 @@ function vim.tbl_isarray(t)
   end
 end
 
---- Tests if a Lua table can be treated as a list (a table indexed by consecutive integers starting from 1).
+--- Tests if `t` is a "list": a table indexed _only_ by contiguous integers starting from 1 (what
+--- |lua-length| calls a "regular array").
+---
+--- Empty table `{}` is a list, unless it was created by |vim.empty_dict()| or returned as
+--- a dict-like |API| or Vimscript result, for example from |rpcrequest()| or |vim.fn|.
 ---
---- Empty table `{}` is assumed to be an list, unless it was created by
---- |vim.empty_dict()| or returned as a dict-like |API| or Vimscript result,
---- for example from |rpcrequest()| or |vim.fn|.
+---@see |vim.tbl_isarray()|
 ---
 ---@param t table
 ---@return boolean `true` if list-like table, else `false`.
@@ -705,61 +709,6 @@ function vim.endswith(s, suffix)
   return #suffix == 0 or s:sub(-#suffix) == suffix
 end
 
---- Validates a parameter specification (types and values).
----
---- Usage example:
----
---- ```lua
---- function user.new(name, age, hobbies)
----   vim.validate{
----     name={name, 'string'},
----     age={age, 'number'},
----     hobbies={hobbies, 'table'},
----   }
----   ...
---- end
---- ```
----
---- Examples with explicit argument values (can be run directly):
----
---- ```lua
---- vim.validate{arg1={{'foo'}, 'table'}, arg2={'foo', 'string'}}
----    --> NOP (success)
----
---- vim.validate{arg1={1, 'table'}}
----    --> error('arg1: expected table, got number')
----
---- vim.validate{arg1={3, function(a) return (a % 2) == 0 end, 'even number'}}
----    --> error('arg1: expected even number, got 3')
---- ```
----
---- If multiple types are valid they can be given as a list.
----
---- ```lua
---- vim.validate{arg1={{'foo'}, {'table', 'string'}}, arg2={'foo', {'table', 'string'}}}
---- -- NOP (success)
----
---- vim.validate{arg1={1, {'string', 'table'}}}
---- -- error('arg1: expected string|table, got number')
----
---- ```
----
----@param opt table Names of parameters to validate. Each key is a parameter
----          name; each value is a tuple in one of these forms:
----          1. (arg_value, type_name, optional)
----             - arg_value: argument value
----             - type_name: string|table type name, one of: ("table", "t", "string",
----               "s", "number", "n", "boolean", "b", "function", "f", "nil",
----               "thread", "userdata") or list of them.
----             - optional: (optional) boolean, if true, `nil` is valid
----          2. (arg_value, fn, msg)
----             - arg_value: argument value
----             - fn: any function accepting one argument, returns true if and
----               only if the argument is valid. Can optionally return an additional
----               informative error message as the second returned value.
----             - msg: (optional) error string if validation fails
-function vim.validate(opt) end -- luacheck: no unused
-
 do
   local type_names = {
     ['table'] = 'table',
@@ -844,6 +793,59 @@ do
     return true, nil
   end
 
+  --- Validates a parameter specification (types and values).
+  ---
+  --- Usage example:
+  ---
+  --- ```lua
+  ---  function user.new(name, age, hobbies)
+  ---    vim.validate{
+  ---      name={name, 'string'},
+  ---      age={age, 'number'},
+  ---      hobbies={hobbies, 'table'},
+  ---    }
+  ---    ...
+  ---  end
+  --- ```
+  ---
+  --- Examples with explicit argument values (can be run directly):
+  ---
+  --- ```lua
+  ---  vim.validate{arg1={{'foo'}, 'table'}, arg2={'foo', 'string'}}
+  ---     --> NOP (success)
+  ---
+  ---  vim.validate{arg1={1, 'table'}}
+  ---     --> error('arg1: expected table, got number')
+  ---
+  ---  vim.validate{arg1={3, function(a) return (a % 2) == 0 end, 'even number'}}
+  ---     --> error('arg1: expected even number, got 3')
+  --- ```
+  ---
+  --- If multiple types are valid they can be given as a list.
+  ---
+  --- ```lua
+  ---  vim.validate{arg1={{'foo'}, {'table', 'string'}}, arg2={'foo', {'table', 'string'}}}
+  ---  -- NOP (success)
+  ---
+  ---  vim.validate{arg1={1, {'string', 'table'}}}
+  ---  -- error('arg1: expected string|table, got number')
+  ---
+  --- ```
+  ---
+  ---@param opt table Names of parameters to validate. Each key is a parameter
+  ---          name; each value is a tuple in one of these forms:
+  ---          1. (arg_value, type_name, optional)
+  ---             - arg_value: argument value
+  ---             - type_name: string|table type name, one of: ("table", "t", "string",
+  ---               "s", "number", "n", "boolean", "b", "function", "f", "nil",
+  ---               "thread", "userdata") or list of them.
+  ---             - optional: (optional) boolean, if true, `nil` is valid
+  ---          2. (arg_value, fn, msg)
+  ---             - arg_value: argument value
+  ---             - fn: any function accepting one argument, returns true if and
+  ---               only if the argument is valid. Can optionally return an additional
+  ---               informative error message as the second returned value.
+  ---             - msg: (optional) error string if validation fails
   function vim.validate(opt)
     local ok, err_msg = is_valid(opt)
     if not ok then
@@ -866,28 +868,25 @@ function vim.is_callable(f)
   return type(m.__call) == 'function'
 end
 
---- Creates a table whose members are automatically created when accessed, if they don't already
---- exist.
----
---- They mimic defaultdict in python.
+--- Creates a table whose missing keys are provided by {createfn} (like Python's "defaultdict").
 ---
---- If {create} is `nil`, this will create a defaulttable whose constructor function is
---- this function, effectively allowing to create nested tables on the fly:
+--- If {createfn} is `nil` it defaults to defaulttable() itself, so accessing nested keys creates
+--- nested tables:
 ---
 --- ```lua
 --- local a = vim.defaulttable()
 --- a.b.c = 1
 --- ```
 ---
----@param create function?(key:any):any The function called to create a missing value.
----@return table Empty table with metamethod
-function vim.defaulttable(create)
-  create = create or function(_)
+---@param createfn function?(key:any):any Provides the value for a missing `key`.
+---@return table # Empty table with `__index` metamethod.
+function vim.defaulttable(createfn)
+  createfn = createfn or function(_)
     return vim.defaulttable()
   end
   return setmetatable({}, {
     __index = function(tbl, key)
-      rawset(tbl, key, create(key))
+      rawset(tbl, key, createfn(key))
       return rawget(tbl, key)
     end,
   })
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 7f24ba8590..61d84017d4 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -597,8 +597,9 @@ function M.edit_query(lang)
   })
 
   api.nvim_buf_set_lines(query_buf, 0, -1, false, {
-    ';; Write your query here. Use @captures to highlight matches in the source buffer.',
-    ';; Completion for grammar nodes is available (see :h compl-omni)',
+    ';; Write queries here (see $VIMRUNTIME/queries/ for examples).',
+    ';; Move cursor to a capture ("@foo") to highlight matches in the source buffer.',
+    ';; Completion for grammar nodes is available (:help compl-omni)',
     '',
     '',
   })
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 44ed37d64e..313d837d5c 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -843,11 +843,13 @@ function M.omnifunc(findstart, base)
   return require('vim.treesitter._query_linter').omnifunc(findstart, base)
 end
 
---- Open a window for live editing of a treesitter query.
+--- Opens a live editor to query the buffer you started from.
 ---
---- Can also be shown with `:EditQuery`. *:EditQuery*
+--- Can also be shown with *:EditQuery*.
 ---
---- Note that the editor opens a scratch buffer, and so queries aren't persisted on disk.
+--- If you move the cursor to a capture name ("@foo"), text matching the capture is highlighted in
+--- the source buffer. The query editor is a scratch buffer, use `:write` to save it. You can find
+--- example queries at `$VIMRUNTIME/queries/`.
 ---
 --- @param lang? string language to open the query editor for. If omitted, inferred from the current buffer's filetype.
 function M.edit(lang)
-- 
cgit 


From 877d04d0fb83b5fc602dbab22b58f26a793ec236 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Sat, 16 Sep 2023 23:10:30 +0100
Subject: feat(lua): add vim.func._memoize

Memoizes a function, using a custom function to hash the arguments.

Private for now until:

- There are other places in the codebase that could benefit from this
  (e.g. LSP), but might require other changes to accommodate.
- Invalidation of the cache needs to be controllable. Using weak tables
  is an acceptable invalidation policy, but it shouldn't be the only
  one.
- I don't think the story around `hash_fn` is completely thought out. We
  may be able to have a good default hash_fn by hashing each argument,
  so basically a better 'concat'.
---
 runtime/lua/vim/_editor.lua                  |  1 +
 runtime/lua/vim/_meta.lua                    |  1 +
 runtime/lua/vim/func.lua                     | 41 +++++++++++++++++++
 runtime/lua/vim/func/_memoize.lua            | 59 ++++++++++++++++++++++++++++
 runtime/lua/vim/treesitter/_query_linter.lua | 54 ++++++++-----------------
 runtime/lua/vim/treesitter/languagetree.lua  | 10 +++--
 runtime/lua/vim/treesitter/query.lua         | 34 ++--------------
 7 files changed, 129 insertions(+), 71 deletions(-)
 create mode 100644 runtime/lua/vim/func.lua
 create mode 100644 runtime/lua/vim/func/_memoize.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 0215cae0cb..8322777633 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -29,6 +29,7 @@ for k, v in pairs({
   treesitter = true,
   filetype = true,
   loader = true,
+  func = true,
   F = true,
   lsp = true,
   highlight = true,
diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
index 5e4f390ca3..ddd0a0eb49 100644
--- a/runtime/lua/vim/_meta.lua
+++ b/runtime/lua/vim/_meta.lua
@@ -10,6 +10,7 @@ vim._watch = require('vim._watch')
 vim.diagnostic = require('vim.diagnostic')
 vim.filetype = require('vim.filetype')
 vim.fs = require('vim.fs')
+vim.func = require('vim.func')
 vim.health = require('vim.health')
 vim.highlight = require('vim.highlight')
 vim.iter = require('vim.iter')
diff --git a/runtime/lua/vim/func.lua b/runtime/lua/vim/func.lua
new file mode 100644
index 0000000000..206d1bae95
--- /dev/null
+++ b/runtime/lua/vim/func.lua
@@ -0,0 +1,41 @@
+local M = {}
+
+-- TODO(lewis6991): Private for now until:
+-- - There are other places in the codebase that could benefit from this
+--   (e.g. LSP), but might require other changes to accommodate.
+-- - Invalidation of the cache needs to be controllable. Using weak tables
+--   is an acceptable invalidation policy, but it shouldn't be the only
+--   one.
+-- - I don't think the story around `hash` is completely thought out. We
+--   may be able to have a good default hash by hashing each argument,
+--   so basically a better 'concat'.
+-- - Need to support multi level caches. Can be done by allow `hash` to
+--   return multiple values.
+--
+--- Memoizes a function {fn} using {hash} to hash the arguments.
+---
+--- Internally uses a |lua-weaktable| to cache the results of {fn} meaning the
+--- cache will be invalidated whenever Lua does garbage collection.
+---
+--- The memoized function returns shared references so be wary about
+--- mutating return values.
+---
+--- @generic F: function
+--- @param hash integer|string|function Hash function to create a hash to use as a key to
+---     store results. Possible values:
+---     - When integer, refers to the index of an argument of {fn} to hash.
+---     This argument can have any type.
+---     - When function, is evaluated using the same arguments passed to {fn}.
+---     - When `concat`, the hash is determined by string concatenating all the
+---     arguments passed to {fn}.
+---     - When `concat-n`, the hash is determined by string concatenating the
+---     first n arguments passed to {fn}.
+---
+--- @param fn F Function to memoize.
+--- @return F # Memoized version of {fn}
+--- @nodoc
+function M._memoize(hash, fn)
+  return require('vim.func._memoize')(hash, fn)
+end
+
+return M
diff --git a/runtime/lua/vim/func/_memoize.lua b/runtime/lua/vim/func/_memoize.lua
new file mode 100644
index 0000000000..835bf64c93
--- /dev/null
+++ b/runtime/lua/vim/func/_memoize.lua
@@ -0,0 +1,59 @@
+--- Module for private utility functions
+
+--- @param argc integer?
+--- @return fun(...): any
+local function concat_hash(argc)
+  return function(...)
+    return table.concat({ ... }, '%%', 1, argc)
+  end
+end
+
+--- @param idx integer
+--- @return fun(...): any
+local function idx_hash(idx)
+  return function(...)
+    return select(idx, ...)
+  end
+end
+
+--- @param hash integer|string|fun(...): any
+--- @return fun(...): any
+local function resolve_hash(hash)
+  if type(hash) == 'number' then
+    hash = idx_hash(hash)
+  elseif type(hash) == 'string' then
+    local c = hash == 'concat' or hash:match('^concat%-(%d+)')
+    if c then
+      hash = concat_hash(tonumber(c))
+    else
+      error('invalid value for hash: ' .. hash)
+    end
+  end
+  --- @cast hash -integer
+  return hash
+end
+
+--- @generic F: function
+--- @param hash integer|string|fun(...): any
+--- @param fn F
+--- @return F
+return function(hash, fn)
+  vim.validate({
+    hash = { hash, { 'number', 'string', 'function' } },
+    fn = { fn, 'function' },
+  })
+
+  ---@type table<any,table<any,any>>
+  local cache = setmetatable({}, { __mode = 'kv' })
+
+  hash = resolve_hash(hash)
+
+  return function(...)
+    local key = hash(...)
+    if cache[key] == nil then
+      cache[key] = vim.F.pack_len(fn(...))
+    end
+
+    return vim.F.unpack_len(cache[key])
+  end
+end
diff --git a/runtime/lua/vim/treesitter/_query_linter.lua b/runtime/lua/vim/treesitter/_query_linter.lua
index abf0bf345d..87d74789a3 100644
--- a/runtime/lua/vim/treesitter/_query_linter.lua
+++ b/runtime/lua/vim/treesitter/_query_linter.lua
@@ -10,20 +10,12 @@ local M = {}
 
 --- @alias vim.treesitter.ParseError {msg: string, range: Range4}
 
---- @private
---- Caches parse results for queries for each language.
---- Entries of parse_cache[lang][query_text] will either be true for successful parse or contain the
---- message and range of the parse error.
---- @type table<string,table<string,vim.treesitter.ParseError|true>>
-local parse_cache = {}
-
 --- Contains language dependent context for the query linter
 --- @class QueryLinterLanguageContext
 --- @field lang string? Current `lang` of the targeted parser
 --- @field parser_info table? Parser info returned by vim.treesitter.language.inspect
 --- @field is_first_lang boolean Whether this is the first language of a linter run checking queries for multiple `langs`
 
---- @private
 --- Adds a diagnostic for node in the query buffer
 --- @param diagnostics Diagnostic[]
 --- @param range Range4
@@ -42,7 +34,6 @@ local function add_lint_for_node(diagnostics, range, lint, lang)
   }
 end
 
---- @private
 --- Determines the target language of a query file by its path: <lang>/<query_type>.scm
 --- @param buf integer
 --- @return string?
@@ -53,7 +44,6 @@ local function guess_query_lang(buf)
   end
 end
 
---- @private
 --- @param buf integer
 --- @param opts QueryLinterOpts|QueryLinterNormalizedOpts|nil
 --- @return QueryLinterNormalizedOpts
@@ -87,7 +77,6 @@ local lint_query = [[;; query
   (ERROR) @error
 ]]
 
---- @private
 --- @param err string
 --- @param node TSNode
 --- @return vim.treesitter.ParseError
@@ -112,38 +101,26 @@ local function get_error_entry(err, node)
   }
 end
 
---- @private
 --- @param node TSNode
 --- @param buf integer
 --- @param lang string
---- @param diagnostics Diagnostic[]
-local function check_toplevel(node, buf, lang, diagnostics)
-  local query_text = vim.treesitter.get_node_text(node, buf)
-
-  if not parse_cache[lang] then
-    parse_cache[lang] = {}
-  end
-
-  local lang_cache = parse_cache[lang]
-
-  if lang_cache[query_text] == nil then
-    local cache_val, err = pcall(vim.treesitter.query.parse, lang, query_text) ---@type boolean|vim.treesitter.ParseError, string|Query
-
-    if not cache_val and type(err) == 'string' then
-      cache_val = get_error_entry(err, node)
-    end
-
-    lang_cache[query_text] = cache_val
-  end
+local function hash_parse(node, buf, lang)
+  return tostring(node:id()) .. tostring(buf) .. tostring(vim.b[buf].changedtick) .. lang
+end
 
-  local cache_entry = lang_cache[query_text]
+--- @param node TSNode
+--- @param buf integer
+--- @param lang string
+--- @return vim.treesitter.ParseError?
+local parse = vim.func._memoize(hash_parse, function(node, buf, lang)
+  local query_text = vim.treesitter.get_node_text(node, buf)
+  local ok, err = pcall(vim.treesitter.query.parse, lang, query_text) ---@type boolean|vim.treesitter.ParseError, string|Query
 
-  if type(cache_entry) ~= 'boolean' then
-    add_lint_for_node(diagnostics, cache_entry.range, cache_entry.msg, lang)
+  if not ok and type(err) == 'string' then
+    return get_error_entry(err, node)
   end
-end
+end)
 
---- @private
 --- @param buf integer
 --- @param match table<integer,TSNode>
 --- @param query Query
@@ -164,7 +141,10 @@ local function lint_match(buf, match, query, lang_context, diagnostics)
 
     -- other checks rely on Neovim parser introspection
     if lang and parser_info and cap_id == 'toplevel' then
-      check_toplevel(node, buf, lang, diagnostics)
+      local err = parse(node, buf, lang)
+      if err then
+        add_lint_for_node(diagnostics, err.range, err.msg, lang)
+      end
     end
   end
 end
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index f931291ed7..b2c4e9167d 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -738,12 +738,14 @@ local function add_injection(t, tree_index, pattern, lang, combined, ranges)
 end
 
 -- TODO(clason): replace by refactored `ts.has_parser` API (without registering)
----@param lang string parser name
----@return boolean # true if parser for {lang} exists on rtp
-local has_parser = function(lang)
+--- The result of this function is cached to prevent nvim_get_runtime_file from being
+--- called too often
+--- @param lang string parser name
+--- @return boolean # true if parser for {lang} exists on rtp
+local has_parser = vim.func._memoize(1, function(lang)
   return vim._ts_has_language(lang)
     or #vim.api.nvim_get_runtime_file('parser/' .. lang .. '.*', false) > 0
-end
+end)
 
 --- Return parser name for language (if exists) or filetype (if registered and exists).
 --- Also attempts with the input lower-cased.
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 313d837d5c..8cbbffcd60 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -191,12 +191,6 @@ function M.set(lang, query_name, text)
   explicit_queries[lang][query_name] = M.parse(lang, text)
 end
 
---- `false` if query files didn't exist or were empty
----@type table<string, table<string, Query|false>>
-local query_get_cache = vim.defaulttable(function()
-  return setmetatable({}, { __mode = 'v' })
-end)
-
 ---@deprecated
 function M.get_query(...)
   vim.deprecate('vim.treesitter.query.get_query()', 'vim.treesitter.query.get()', '0.10')
@@ -209,34 +203,19 @@ end
 ---@param query_name string Name of the query (e.g. "highlights")
 ---
 ---@return Query|nil Parsed query
-function M.get(lang, query_name)
+M.get = vim.func._memoize('concat-2', function(lang, query_name)
   if explicit_queries[lang][query_name] then
     return explicit_queries[lang][query_name]
   end
 
-  local cached = query_get_cache[lang][query_name]
-  if cached then
-    return cached
-  elseif cached == false then
-    return nil
-  end
-
   local query_files = M.get_files(lang, query_name)
   local query_string = read_query_files(query_files)
 
   if #query_string == 0 then
-    query_get_cache[lang][query_name] = false
     return nil
   end
 
-  local query = M.parse(lang, query_string)
-  query_get_cache[lang][query_name] = query
-  return query
-end
-
----@type table<string, table<string, Query>>
-local query_parse_cache = vim.defaulttable(function()
-  return setmetatable({}, { __mode = 'v' })
+  return M.parse(lang, query_string)
 end)
 
 ---@deprecated
@@ -262,20 +241,15 @@ end
 ---@param query string Query in s-expr syntax
 ---
 ---@return Query Parsed query
-function M.parse(lang, query)
+M.parse = vim.func._memoize('concat-2', function(lang, query)
   language.add(lang)
-  local cached = query_parse_cache[lang][query]
-  if cached then
-    return cached
-  end
 
   local self = setmetatable({}, Query)
   self.query = vim._ts_parse_query(lang, query)
   self.info = self.query:inspect()
   self.captures = self.info.captures
-  query_parse_cache[lang][query] = self
   return self
-end
+end)
 
 ---@deprecated
 function M.get_range(...)
-- 
cgit 


From 473d0aa3e6ab22eb8e10c88c3971764f1b069825 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 20 Sep 2023 23:42:25 +0200
Subject: vim-patch:9.0.1918

patch 9.0.1918: No filetype detection for Authzed filetypes

Problem:  No filetype detection for Authzed filetypes
Solution: Detect the *.zed file extension as authzed filetype

closes: vim/vim#13129

https://github.com/vim/vim/commit/5790a54166793554d16f6a85d8824632860b8b37

Co-authored-by: Matt Polzin <mpolzin@workwithopal.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index c7f025f9e7..5ae4e508ef 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -210,6 +210,7 @@ local extension = {
   astro = 'astro',
   atl = 'atlas',
   as = 'atlas',
+  zed = 'authzed',
   ahk = 'autohotkey',
   au3 = 'autoit',
   ave = 'ave',
-- 
cgit 


From f094db0e5ccaddca2b5db05bf9545d55f3eededf Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 21 Sep 2023 07:37:03 +0800
Subject: vim-patch:9.0.1921: not possible to use the jumplist like a stack
 (#25278)

Problem:  not possible to use the jumplist like a stack
Solution: Add the 'jumpoptions' setting to make the jumplist
          a stack.

Add an option for using jumplist like tag stack

related: vim/vim#7738
closes: vim/vim#13134

ported from NeoVim:

- https://neovim.io/doc/user/motion.html#jumplist-stack
- neovim/neovim@39094b3
- https://vi.stackexchange.com/questions/18344/how-to-change-jumplist-behavior

Based on the feedback in the previous PR, it looks like many people like
this option.

https://github.com/vim/vim/commit/87018255e3ad0f4dfa03e20318836d24af721caf

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Co-authored-by: butwerenotthereyet <58348703+butwerenotthereyet@users.noreply.github.com>
---
 runtime/doc/motion.txt            | 83 ++++++++++++++++-----------------------
 runtime/doc/options.txt           | 11 +++---
 runtime/lua/vim/_meta/options.lua | 11 +++---
 3 files changed, 44 insertions(+), 61 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index dc92601bfc..c4e144ab29 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1115,60 +1115,45 @@ If you have included the ' item in the 'shada' option the jumplist will be
 stored in the ShaDa file and restored when starting Vim.
 
 							*jumplist-stack*
-When jumpoptions includes "stack", the jumplist behaves like the history in a
-web browser and like the tag stack.  When jumping to a new location from the
-middle of the jumplist, the locations after the current position will be
-discarded.
-
-This behavior corresponds to the following situation in a web browser.
-Navigate to first.com, second.com, third.com, fourth.com and then fifth.com.
-Then navigate backwards twice so that third.com is displayed.  At that point,
-the history is:
-- first.com
-- second.com
-- third.com <--
-- fourth.com
-- fifth.com
-
-Finally, navigate to a different webpage, new.com.  The history is
-- first.com
-- second.com
-- third.com
-- new.com <--
-
-When the jumpoptions includes "stack", this is the behavior of Nvim as well.
-That is, given a jumplist like the following in which CTRL-O has been used to
-move back three times to location X
-
- jump line  col file/text
-   2  1260    8 src/nvim/mark.c         <-- location X-2
-   1   685    0 src/nvim/option_defs.h  <-- location X-1
->  0   462   36 src/nvim/option_defs.h  <-- location X
-   1   479   39 src/nvim/option_defs.h
-   2   213    2 src/nvim/mark.c
-   3   181    0 src/nvim/mark.c
-
+When 'jumpoptions' option includes "stack", the jumplist behaves like the tag
+stack.  When jumping to a new location from the middle of the jumplist, the
+locations after the current position will be discarded. With this option set
+you can move through a tree of jump locations. When going back up a branch and
+then down another branch, CTRL-O still takes you further up the tree.
+
+Given a jumplist like the following in which CTRL-O has been used to move back
+three times to location X: >
+
+     jump line  col file/text
+       2  1260    8 mark.c		<-- location X-2
+       1   685    0 eval.c		<-- location X-1
+    >  0   462   36 eval.c		<-- location X
+       1   479   39 eval.c
+       2   213    2 mark.c
+       3   181    0 mark.c
+<
 jumping to (new) location Y results in the locations after the current
-locations being removed:
+locations being removed: >
 
- jump line  col file/text
-   3  1260    8 src/nvim/mark.c
-   2   685    0 src/nvim/option_defs.h
-   1   462   36 src/nvim/option_defs.h  <-- location X
->
+     jump line  col file/text
+       3  1260    8 mark.c		<-- location X-2
+       2   685    0 eval.c		<-- location X-1
+       1   462   36 eval.c		<-- location X
+    >
+<
 
 Then, when yet another location Z is jumped to, the new location Y appears
 directly after location X in the jumplist and location X remains in the same
-position relative to the locations (X-1, X-2, etc., ...) that had been before it
-prior to the original jump from X to Y:
-
- jump line  col file/text
-   4  1260    8 src/nvim/mark.c         <-- location X-2
-   3   685    0 src/nvim/option_defs.h  <-- location X-1
-   2   462   36 src/nvim/option_defs.h  <-- location X
-   1   100    0 src/nvim/option_defs.h  <-- location Y
->
-
+position relative to the locations (X-1, X-2, etc., ...) that had been before
+it prior to the original jump from X to Y: >
+
+     jump line  col file/text
+       4  1260    8 mark.c		<-- location X-2
+       3   685    0 eval.c		<-- location X-1
+       2   462   36 eval.c		<-- location X
+       1   100    0 buffer.c	<-- location Y
+    >
+<
 CHANGE LIST JUMPS			*changelist* *change-list-jumps* *E664*
 
 When making a change the cursor position is remembered.  One position is
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 96bf2eef63..deb64bf18d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3569,12 +3569,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 'jumpoptions' 'jop'	string	(default "")
 			global
 	List of words that change the behavior of the |jumplist|.
-	  stack         Make the jumplist behave like the tagstack or like a
-	                web browser.  Relative location of entries in the
-			jumplist is preserved at the cost of discarding
-			subsequent entries when navigating backwards in the
-			jumplist and then jumping to a location.
-			|jumplist-stack|
+	  stack         Make the jumplist behave like the tagstack.
+			Relative location of entries in the jumplist is
+			preserved at the cost of discarding subsequent entries
+			when navigating backwards in the jumplist and then
+			jumping to a location.  |jumplist-stack|
 
 	  view          When moving through the jumplist, |changelist|,
 			|alternate-file| or using |mark-motions| try to
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 734096a755..b8bdfbc3f7 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -3485,12 +3485,11 @@ vim.go.joinspaces = vim.o.joinspaces
 vim.go.js = vim.go.joinspaces
 
 --- List of words that change the behavior of the `jumplist`.
----   stack         Make the jumplist behave like the tagstack or like a
----                 web browser.  Relative location of entries in the
---- 		jumplist is preserved at the cost of discarding
---- 		subsequent entries when navigating backwards in the
---- 		jumplist and then jumping to a location.
---- 		`jumplist-stack`
+---   stack         Make the jumplist behave like the tagstack.
+--- 		Relative location of entries in the jumplist is
+--- 		preserved at the cost of discarding subsequent entries
+--- 		when navigating backwards in the jumplist and then
+--- 		jumping to a location.  `jumplist-stack`
 ---
 ---   view          When moving through the jumplist, `changelist|,
 --- 		|alternate-file` or using `mark-motions` try to
-- 
cgit 


From 48410e848687a7e286d2d8bc7604a843697610e1 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 21 Sep 2023 15:06:06 +0800
Subject: vim-patch:a7aba6ca5033 (#25285)

runtime(doc): format jumplist examples more consistently (vim/vim#13137)

https://github.com/vim/vim/commit/a7aba6ca5033a85839d997d29d5ca88a1f2acf8f
---
 runtime/doc/motion.txt | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index c4e144ab29..5e18595d22 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1050,14 +1050,14 @@ can go to cursor positions before older jumps, and back again.  Thus you can
 move up and down the list.  There is a separate jump list for each window.
 The maximum number of entries is fixed at 100.
 
-For example, after three jump commands you have this jump list:
-
-    jump line  col file/text ~
-      3	  1    0 some text ~
-      2	 70    0 another line ~
-      1  1154   23 end. ~
-   > ~
+For example, after three jump commands you have this jump list: >
 
+    jump line  col file/text
+      3     1    0 some text
+      2    70    0 another line
+      1  1154   23 end.
+   >
+<
 The "file/text" column shows the file name, or the text at the jump if it is
 in the current file (an indent is removed and a long line is truncated to fit
 in the window).
@@ -1066,14 +1066,14 @@ The marker ">" indicates the current position in the jumplist.  It may not be
 shown when filtering the |:jumps| command using |:filter|
 
 You are currently in line 1167.  If you then use the CTRL-O command, the
-cursor is put in line 1154.  This results in:
-
-    jump line  col file/text ~
-      2	  1    0 some text ~
-      1	 70    0 another line ~
-   >  0  1154   23 end. ~
-      1  1167    0 foo bar ~
+cursor is put in line 1154.  This results in: >
 
+    jump line  col file/text
+      2     1    0 some text
+      1    70    0 another line
+   >  0  1154   23 end.
+      1  1167    0 foo bar
+<
 The pointer will be set at the last used jump position.  The next CTRL-O
 command will use the entry above it, the next CTRL-I command will use the
 entry below it.  If the pointer is below the last entry, this indicates that
@@ -1097,15 +1097,15 @@ command.  You can explicitly add a jump by setting the ' mark with "m'".  Note
 that calling setpos() does not do this.
 
 After the CTRL-O command that got you into line 1154 you could give another
-jump command (e.g., "G").  The jump list would then become:
-
-    jump line  col file/text ~
-      4	  1    0 some text ~
-      3	 70    0 another line ~
-      2  1167    0 foo bar ~
-      1  1154   23 end. ~
-   > ~
-
+jump command (e.g., "G").  The jump list would then become: >
+
+    jump line  col file/text
+      4     1    0 some text
+      3    70    0 another line
+      2  1167    0 foo bar
+      1  1154   23 end.
+   >
+<
 The line numbers will be adjusted for deleted and inserted lines.  This fails
 if you stop editing a file without writing, like with ":n!".
 
@@ -1141,7 +1141,6 @@ locations being removed: >
        1   462   36 eval.c		<-- location X
     >
 <
-
 Then, when yet another location Z is jumped to, the new location Y appears
 directly after location X in the jumplist and location X remains in the same
 position relative to the locations (X-1, X-2, etc., ...) that had been before
@@ -1151,7 +1150,7 @@ it prior to the original jump from X to Y: >
        4  1260    8 mark.c		<-- location X-2
        3   685    0 eval.c		<-- location X-1
        2   462   36 eval.c		<-- location X
-       1   100    0 buffer.c	<-- location Y
+       1   100    0 buffer.c		<-- location Y
     >
 <
 CHANGE LIST JUMPS			*changelist* *change-list-jumps* *E664*
-- 
cgit 


From 8bd6f7c20b403e8031a94f3a158a10c90b5c3efd Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Thu, 21 Sep 2023 16:56:15 +0900
Subject: fix(lsp): clear codelens on LspDetach (#24903)

Also fix incorrect parameters in on_detach callback.
---
 runtime/doc/lsp.txt              |  6 +++---
 runtime/lua/vim/lsp/codelens.lua | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 35 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 15292cd7cf..23902f8bc3 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1430,7 +1430,7 @@ display({lenses}, {bufnr}, {client_id})           *vim.lsp.codelens.display()*
     Display the lenses using virtual text
 
     Parameters: ~
-      • {lenses}     (table) of lenses to display (`CodeLens[] | null`)
+      • {lenses}     lsp.CodeLens[]|nil lenses to display
       • {bufnr}      (integer)
       • {client_id}  (integer)
 
@@ -1442,7 +1442,7 @@ get({bufnr})                                          *vim.lsp.codelens.get()*
                  buffer.
 
     Return: ~
-        (table) (`CodeLens[]`)
+        lsp.CodeLens[]
 
                                               *vim.lsp.codelens.on_codelens()*
 on_codelens({err}, {result}, {ctx}, {_})
@@ -1464,7 +1464,7 @@ save({lenses}, {bufnr}, {client_id})                 *vim.lsp.codelens.save()*
     Store lenses for a specific buffer and client
 
     Parameters: ~
-      • {lenses}     (table) of lenses to store (`CodeLens[] | null`)
+      • {lenses}     lsp.CodeLens[]|nil lenses to store
       • {bufnr}      (integer)
       • {client_id}  (integer)
 
diff --git a/runtime/lua/vim/lsp/codelens.lua b/runtime/lua/vim/lsp/codelens.lua
index 384d09ee48..9cccaa1d66 100644
--- a/runtime/lua/vim/lsp/codelens.lua
+++ b/runtime/lua/vim/lsp/codelens.lua
@@ -8,6 +8,7 @@ local M = {}
 --- to throttle refreshes to at most one at a time
 local active_refreshes = {}
 
+---@type table<integer, table<integer, lsp.CodeLens[]>>
 --- bufnr -> client_id -> lenses
 local lens_cache_by_buf = setmetatable({}, {
   __index = function(t, b)
@@ -16,6 +17,8 @@ local lens_cache_by_buf = setmetatable({}, {
   end,
 })
 
+---@type table<integer, integer>
+---client_id -> namespace
 local namespaces = setmetatable({}, {
   __index = function(t, key)
     local value = api.nvim_create_namespace('vim_lsp_codelens:' .. key)
@@ -27,6 +30,18 @@ local namespaces = setmetatable({}, {
 ---@private
 M.__namespaces = namespaces
 
+local augroup = api.nvim_create_augroup('vim_lsp_codelens', {})
+
+api.nvim_create_autocmd('LspDetach', {
+  group = augroup,
+  callback = function(ev)
+    M.clear(ev.data.client_id, ev.buf)
+  end,
+})
+
+---@param lens lsp.CodeLens
+---@param bufnr integer
+---@param client_id integer
 local function execute_lens(lens, bufnr, client_id)
   local line = lens.range.start.line
   api.nvim_buf_clear_namespace(bufnr, namespaces[client_id], line, line + 1)
@@ -42,7 +57,7 @@ end
 --- Return all lenses for the given buffer
 ---
 ---@param bufnr integer  Buffer number. 0 can be used for the current buffer.
----@return table (`CodeLens[]`)
+---@return lsp.CodeLens[]
 function M.get(bufnr)
   local lenses_by_client = lens_cache_by_buf[bufnr or 0]
   if not lenses_by_client then
@@ -98,12 +113,17 @@ end
 ---@param client_id integer|nil filter by client_id. All clients if nil
 ---@param bufnr integer|nil filter by buffer. All buffers if nil
 function M.clear(client_id, bufnr)
-  local buffers = bufnr and { resolve_bufnr(bufnr) } or vim.tbl_keys(lens_cache_by_buf)
+  bufnr = bufnr and resolve_bufnr(bufnr)
+  local buffers = bufnr and { bufnr }
+    or vim.tbl_filter(api.nvim_buf_is_loaded, api.nvim_list_bufs())
   for _, iter_bufnr in pairs(buffers) do
     local client_ids = client_id and { client_id } or vim.tbl_keys(namespaces)
     for _, iter_client_id in pairs(client_ids) do
       local ns = namespaces[iter_client_id]
-      lens_cache_by_buf[iter_bufnr][iter_client_id] = {}
+      -- there can be display()ed lenses, which are not stored in cache
+      if lens_cache_by_buf[iter_bufnr] then
+        lens_cache_by_buf[iter_bufnr][iter_client_id] = {}
+      end
       api.nvim_buf_clear_namespace(iter_bufnr, ns, 0, -1)
     end
   end
@@ -111,7 +131,7 @@ end
 
 --- Display the lenses using virtual text
 ---
----@param lenses table of lenses to display (`CodeLens[] | null`)
+---@param lenses? lsp.CodeLens[] lenses to display
 ---@param bufnr integer
 ---@param client_id integer
 function M.display(lenses, bufnr, client_id)
@@ -124,7 +144,8 @@ function M.display(lenses, bufnr, client_id)
     api.nvim_buf_clear_namespace(bufnr, ns, 0, -1)
     return
   end
-  local lenses_by_lnum = {}
+
+  local lenses_by_lnum = {} ---@type table<integer, lsp.CodeLens[]>
   for _, lens in pairs(lenses) do
     local line_lenses = lenses_by_lnum[lens.range.start.line]
     if not line_lenses then
@@ -160,7 +181,7 @@ end
 
 --- Store lenses for a specific buffer and client
 ---
----@param lenses table of lenses to store (`CodeLens[] | null`)
+---@param lenses? lsp.CodeLens[] lenses to store
 ---@param bufnr integer
 ---@param client_id integer
 function M.save(lenses, bufnr, client_id)
@@ -174,7 +195,7 @@ function M.save(lenses, bufnr, client_id)
     lens_cache_by_buf[bufnr] = lenses_by_client
     local ns = namespaces[client_id]
     api.nvim_buf_attach(bufnr, false, {
-      on_detach = function(b)
+      on_detach = function(_, b)
         lens_cache_by_buf[b] = nil
       end,
       on_lines = function(_, b, _, first_lnum, last_lnum)
@@ -185,6 +206,10 @@ function M.save(lenses, bufnr, client_id)
   lenses_by_client[client_id] = lenses
 end
 
+---@param lenses? lsp.CodeLens[]
+---@param bufnr integer
+---@param client_id integer
+---@param callback fun()
 local function resolve_lenses(lenses, bufnr, client_id, callback)
   lenses = lenses or {}
   local num_lens = vim.tbl_count(lenses)
-- 
cgit 


From 345bd91db28ecfc4deb308f4971253b534f82d49 Mon Sep 17 00:00:00 2001
From: Sergey Slipchenko <faergeek@gmail.com>
Date: Thu, 21 Sep 2023 14:06:40 +0400
Subject: fix(lsp): handle absence of a trailing newline #25194

Fixes #24339

rust-analyzer sends "Invalid offset" error in such cases. Some other
servers handle it specially.

LSP spec mentions that "A range is comparable to a selection in an
editor". Most editors don't handle trailing newlines the same way
Neovim/Vim does, it's clearly visible if it's present or not. With that
in mind it's understandable why sending end position as simply the start
of the line after the last one is considered invalid in such cases.
---
 runtime/lua/vim/lsp/util.lua | 60 ++++++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 16 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 988057f5f9..0d1e3cc0d1 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -2230,6 +2230,35 @@ function M.lookup_section(settings, section)
   return settings
 end
 
+--- Converts line range (0-based, end-inclusive) to lsp range,
+--- handles absence of a trailing newline
+---
+---@param bufnr integer
+---@param start_line integer
+---@param end_line integer
+---@param offset_encoding lsp.PositionEncodingKind
+---@return lsp.Range
+local function make_line_range_params(bufnr, start_line, end_line, offset_encoding)
+  local last_line = api.nvim_buf_line_count(bufnr) - 1
+
+  ---@type lsp.Position
+  local end_pos
+
+  if end_line == last_line and not vim.api.nvim_get_option_value('endofline', { buf = bufnr }) then
+    end_pos = {
+      line = end_line,
+      character = M.character_offset(bufnr, end_line, #get_line(bufnr, end_line), offset_encoding),
+    }
+  else
+    end_pos = { line = end_line + 1, character = 0 }
+  end
+
+  return {
+    start = { line = start_line, character = 0 },
+    ['end'] = end_pos,
+  }
+end
+
 ---@private
 --- Request updated LSP information for a buffer.
 ---
@@ -2253,6 +2282,8 @@ function M._refresh(method, opts)
     return
   end
 
+  local textDocument = M.make_text_document_params(bufnr)
+
   local only_visible = opts.only_visible or false
 
   if only_visible then
@@ -2260,28 +2291,25 @@ function M._refresh(method, opts)
       if api.nvim_win_get_buf(window) == bufnr then
         local first = vim.fn.line('w0', window)
         local last = vim.fn.line('w$', window)
-        local params = {
-          textDocument = M.make_text_document_params(bufnr),
-          range = {
-            start = { line = first - 1, character = 0 },
-            ['end'] = { line = last, character = 0 },
-          },
-        }
         for _, client in ipairs(clients) do
-          client.request(method, params, nil, bufnr)
+          client.request(method, {
+            textDocument = textDocument,
+            range = make_line_range_params(bufnr, first - 1, last - 1, client.offset_encoding),
+          }, nil, bufnr)
         end
       end
     end
   else
-    local params = {
-      textDocument = M.make_text_document_params(bufnr),
-      range = {
-        start = { line = 0, character = 0 },
-        ['end'] = { line = api.nvim_buf_line_count(bufnr), character = 0 },
-      },
-    }
     for _, client in ipairs(clients) do
-      client.request(method, params, nil, bufnr)
+      client.request(method, {
+        textDocument = textDocument,
+        range = make_line_range_params(
+          bufnr,
+          0,
+          api.nvim_buf_line_count(bufnr) - 1,
+          client.offset_encoding
+        ),
+      }, nil, bufnr)
     end
   end
 end
-- 
cgit 


From fcfc87cb7727eb63265dc75476dc6ba56e0029c8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 22 Sep 2023 06:51:47 +0800
Subject: docs: small improvements to compl-autocomplete example (#25299)

- Don't complete when there is pending input.
- Use vim.list_contains() instead of vim.tbl_contains().
---
 runtime/doc/insert.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 0fa5ffd598..ce2ec36ca3 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1093,11 +1093,11 @@ To get basic "autocompletion" without installing a plugin, try this script: >lua
   vim.api.nvim_create_autocmd("InsertCharPre", {
     buffer = vim.api.nvim_get_current_buf(),
     callback = function()
-      if vim.fn.pumvisible() == 1 then
+      if vim.fn.pumvisible() == 1 or vim.fn.state("m") == "m" then
         return
       end
       local char = vim.v.char
-      if vim.tbl_contains(triggers, char) then
+      if vim.list_contains(triggers, char) then
         local key = vim.keycode("<C-x><C-n>")
         vim.api.nvim_feedkeys(key, "m", false)
       end
-- 
cgit 


From f413597f44f62a62675a3a7149e34a63f16e4821 Mon Sep 17 00:00:00 2001
From: Oliver Marriott <hello@omarriott.com>
Date: Thu, 21 Sep 2023 15:53:05 +1000
Subject: docs: clarify vim.schedule_wrap behaviour

- Remove the usage of the term "defer" to avoid confusion with
  `vim.defer_fn`, which also calls `vim.schedule_wrap` internally.
- Explicitly state that `vim.schedule_wrap` returns a function in the
  text.
- Mention that arguments are passed along.
- Include a usage example.
- Rename param to `fn`.
---
 runtime/doc/lua.txt         | 15 ++++++++++++---
 runtime/lua/vim/_editor.lua | 19 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index efba10b86f..14df45cc8c 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1714,11 +1714,20 @@ vim.region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})
         `endcol` is exclusive, and whole lines are returned as
         `{startcol,endcol} = {0,-1}`.
 
-vim.schedule_wrap({cb})                                  *vim.schedule_wrap()*
-    Defers callback `cb` until the Nvim API is safe to call.
+vim.schedule_wrap({fn})                                  *vim.schedule_wrap()*
+    Returns a function which calls {fn} via |vim.schedule()|.
+
+    The returned function passes all arguments to {fn}.
+
+    Example: >lua
+        function notify_readable(_err, readable)
+          vim.notify("readable? " .. tostring(readable))
+        end
+        vim.uv.fs_access(vim.fn.stdpath("config"), "R", vim.schedule_wrap(notify_readable))
+<
 
     Parameters: ~
-      • {cb}  (function)
+      • {fn}  (function)
 
     Return: ~
         (function)
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 8322777633..e4a2dadb09 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -316,18 +316,29 @@ do
   end
 end
 
---- Defers callback `cb` until the Nvim API is safe to call.
+--- Returns a function which calls {fn} via |vim.schedule()|.
+---
+--- The returned function passes all arguments to {fn}.
+---
+--- Example:
+---
+--- ```lua
+--- function notify_readable(_err, readable)
+---   vim.notify("readable? " .. tostring(readable))
+--- end
+--- vim.uv.fs_access(vim.fn.stdpath("config"), "R", vim.schedule_wrap(notify_readable))
+--- ```
 ---
 ---@see |lua-loop-callbacks|
 ---@see |vim.schedule()|
 ---@see |vim.in_fast_event()|
----@param cb function
+---@param fn function
 ---@return function
-function vim.schedule_wrap(cb)
+function vim.schedule_wrap(fn)
   return function(...)
     local args = vim.F.pack_len(...)
     vim.schedule(function()
-      cb(vim.F.unpack_len(args))
+      fn(vim.F.unpack_len(args))
     end)
   end
 end
-- 
cgit 


From e353c869cea4541d00d627ec82724d3f247225a3 Mon Sep 17 00:00:00 2001
From: L Lllvvuu <git@llllvvuu.dev>
Date: Tue, 19 Sep 2023 21:41:07 -0700
Subject: fix(languagetree): don't treat unparsed nodes as occupying full range

This is incorrect in the following scenario:
1. The language tree is Lua > Vim > Lua.
2. An edit simultaneously wipes out the `_regions` of all nodes, while
   taking the Vim injection off-screen.
3. The Vim injection is not re-parsed, so the child Lua `_regions` is
   still `nil`.
4. The child Lua is assumed, incorrectly, to occupy the whole document.
5. This causes the injections to be parsed again, resulting in Lua > Vim
   > Lua > Vim.
6. Now, by the same process, Vim ends up with its range assumed over the
   whole document. Now the parse is broken and results in broken
   highlighting and poor performance.

It should be fine to instead treat an unparsed node as occupying
nothing (i.e. effectively non-existent). Since, either:
- The parent was just parsed, hence defining `_regions`
- The parent was not just parsed, in which case this node doesn't need
  to be parsed either.

Also, the name `has_regions` is confusing; it seems to simply
mean the opposite of "root" or "full_document". However, this PR does
not touch it.
---
 runtime/lua/vim/treesitter/languagetree.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index b2c4e9167d..670f2797b7 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -650,8 +650,8 @@ function LanguageTree:included_regions()
     return self._regions
   end
 
-  if not self._has_regions or next(self._trees) == nil then
-    -- treesitter.c will default empty ranges to { -1, -1, -1, -1, -1, -1}
+  if not self._has_regions then
+    -- treesitter.c will default empty ranges to { -1, -1, -1, -1, -1, -1} (the full range)
     return { {} }
   end
 
-- 
cgit 


From 44f698bb1afccb90fd8835fa7e35bfcebbd6d828 Mon Sep 17 00:00:00 2001
From: Oliver Marriott <hello@omarriott.com>
Date: Thu, 21 Sep 2023 22:34:56 +1000
Subject: docs: update vim.schedule param name and type

Per https://github.com/neovim/neovim/pull/25286#discussion_r1332861721
and https://github.com/neovim/neovim/pull/25286#discussion_r1334318352
---
 runtime/doc/lua.txt               | 8 ++++----
 runtime/lua/vim/_meta/builtin.lua | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 14df45cc8c..ddf11fd966 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -956,12 +956,12 @@ vim.rpcrequest({channel}, {method}, {args}, {...})          *vim.rpcrequest()*
       • {args}     any[]|nil
       • {...}      any|nil
 
-vim.schedule({callback})                                      *vim.schedule()*
-    Schedules {callback} to be invoked soon by the main event-loop. Useful to
-    avoid |textlock| or other temporary restrictions.
+vim.schedule({fn})                                            *vim.schedule()*
+    Schedules {fn} to be invoked soon by the main event-loop. Useful to avoid
+    |textlock| or other temporary restrictions.
 
     Parameters: ~
-      • {callback}  fun()
+      • {fn}  (function)
 
 vim.str_byteindex({str}, {index}, {use_utf16})           *vim.str_byteindex()*
     Convert UTF-32 or UTF-16 {index} to byte index. If {use_utf16} is not
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index 0a6dd3e151..92c23f7764 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -194,10 +194,10 @@ function vim.str_utfindex(str, index) end
 --- @return string|nil Converted string if conversion succeeds, `nil` otherwise.
 function vim.iconv(str, from, to, opts) end
 
---- Schedules {callback} to be invoked soon by the main event-loop. Useful
+--- Schedules {fn} to be invoked soon by the main event-loop. Useful
 --- to avoid |textlock| or other temporary restrictions.
---- @param callback fun()
-function vim.schedule(callback) end
+--- @param fn function
+function vim.schedule(fn) end
 
 --- Wait for {time} in milliseconds until {callback} returns `true`.
 ---
-- 
cgit 


From dae6770b761a5e760c6c4d7e618bb13afa961376 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Fri, 22 Sep 2023 13:00:31 -0700
Subject: fix(meta): include vim.json

---
 runtime/lua/vim/_meta/json.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/json.lua b/runtime/lua/vim/_meta/json.lua
index edf905c7c6..e010086615 100644
--- a/runtime/lua/vim/_meta/json.lua
+++ b/runtime/lua/vim/_meta/json.lua
@@ -1,5 +1,8 @@
 ---@meta
 
+---@nodoc
+vim.json = {}
+
 -- luacheck: no unused args
 
 ---@defgroup vim.json
-- 
cgit 


From 7bd6bd1ef7214942e94c9238e08619adf41f5995 Mon Sep 17 00:00:00 2001
From: Jongwook Choi <wookayin@gmail.com>
Date: Sat, 23 Sep 2023 05:49:34 -0400
Subject: fix(provider): cannot detect python3.12 #25316

PROBLEM: The builtin python3 provider cannot auto-detect python3.12
when g:python3_host_prog is not set. As a result, when python3 on $PATH
is currently python 3.12, neovim will fail to load python3 provider
and result in `has("python3") == 0`, e.g.,
"Failed to load python3 host. You can try to see what happened by ..."

ROOT CAUSE: the `system()` call from `provider#pythonx#DetectByModule`
does not ignore python warnings, and `pkgutil.get_loader` will print
a warning message in the very first line:
```
<string>:1: DeprecationWarning: 'pkgutil.get_loader' is deprecated and
slated for removal in Python 3.14; use importlib.util.find_spec() instead
```

SOLUTION:
- Use `importlib.util.find_spec` instead (python >= 3.4)
- Use `-W ignore` option to prevent any potential warning messages
---
 runtime/autoload/provider/pythonx.vim | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
index 6211b457d6..db6acf4526 100644
--- a/runtime/autoload/provider/pythonx.vim
+++ b/runtime/autoload/provider/pythonx.vim
@@ -26,7 +26,7 @@ endfunction
 
 function! s:get_python_candidates(major_version) abort
   return {
-        \ 3: ['python3', 'python3.10', 'python3.9', 'python3.8', 'python3.7', 'python']
+        \ 3: ['python3', 'python3.12', 'python3.11', 'python3.10', 'python3.9', 'python3.8', 'python3.7', 'python']
         \ }[a:major_version]
 endfunction
 
@@ -61,12 +61,11 @@ endfunction
 
 " Returns array: [prog_exitcode, prog_version]
 function! s:import_module(prog, module) abort
-  let prog_version = system([a:prog, '-c' , printf(
-        \ 'import sys; ' .
+  let prog_version = system([a:prog, '-W', 'ignore', '-c', printf(
+        \ 'import sys, importlib; ' .
         \ 'sys.path = [p for p in sys.path if p != ""]; ' .
         \ 'sys.stdout.write(str(sys.version_info[0]) + "." + str(sys.version_info[1])); ' .
-        \ 'import pkgutil; ' .
-        \ 'exit(2*int(pkgutil.get_loader("%s") is None))',
+        \ 'sys.exit(2 * int(importlib.util.find_spec("%s") is None))',
         \ a:module)])
   return [v:shell_error, prog_version]
 endfunction
-- 
cgit 


From f7da4722570617bd8927e7aa533fa9a608c45bba Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Sat, 23 Sep 2023 16:42:47 +0200
Subject: refactor(options)!: graduate shortmess+=f flag

Not everything needs to be crazy overconfigurable.

Also fixes a warning in latest clang which didn't approve of
the funky math switch statement in  append_arg_number
---
 runtime/doc/news.txt              | 3 +++
 runtime/doc/options.txt           | 1 -
 runtime/doc/vim_diff.txt          | 1 +
 runtime/lua/vim/_meta/options.lua | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 240eb152d7..5e257372bc 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -247,6 +247,9 @@ The following deprecated functions or APIs were removed.
 
 • Support for legacy treesitter injection queries is removed.
 
+• 'shortmess' flags:
+  - |shm-f| is removed. Always uses "(3 of 5)", never "(file 3 of 5)"
+
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index deb64bf18d..9b4f36cbce 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5391,7 +5391,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	messages, for example  with CTRL-G, and to avoid some other messages.
 	It is a list of flags:
 	 flag	meaning when present	~
-	  f	use "(3 of 5)" instead of "(file 3 of 5)"		*shm-f*
 	  i	use "[noeol]" instead of "[Incomplete last line]"	*shm-i*
 	  l	use "999L, 888B" instead of "999 lines, 888 bytes"	*shm-l*
 	  m	use "[+]" instead of "[Modified]"			*shm-m*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index ab5e795c16..8a6e5461c3 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -727,6 +727,7 @@ Options:
     Everything is allowed in 'exrc' files since they must be explicitly marked
     trusted.
   *'shelltype'*
+  'shortmess' *shm-f* flag (always on, never show "file" in "(3 of 5)")
   *'shortname'* *'sn'* *'noshortname'* *'nosn'*
   *'swapsync'* *'sws'*
   *'termencoding'* *'tenc'* (Vim 7.4.852 also removed this for Windows)
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index b8bdfbc3f7..baf53c5ccc 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -5668,7 +5668,6 @@ vim.bo.sw = vim.bo.shiftwidth
 --- messages, for example  with CTRL-G, and to avoid some other messages.
 --- It is a list of flags:
 ---  flag	meaning when present	~
----   f	use "(3 of 5)" instead of "(file 3 of 5)"		*shm-f*
 ---   i	use "[noeol]" instead of "[Incomplete last line]"	*shm-i*
 ---   l	use "999L, 888B" instead of "999 lines, 888 bytes"	*shm-l*
 ---   m	use "[+]" instead of "[Modified]"			*shm-m*
-- 
cgit 


From bc0bf9d030bbcb01db69c44cf88b95ca41dd3065 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Wed, 20 Sep 2023 19:03:40 -0700
Subject: docs: fix type warnings

---
 runtime/doc/lua.txt                |  4 ++--
 runtime/lua/vim/keymap.lua         | 18 ++++++++++--------
 runtime/lua/vim/secure.lua         | 21 ++++++++++++++-------
 runtime/lua/vim/treesitter.lua     |  5 +++--
 runtime/lua/vim/treesitter/dev.lua |  2 +-
 runtime/lua/vim/uri.lua            |  9 ++++-----
 6 files changed, 34 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ddf11fd966..a77cc3b565 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -2752,7 +2752,7 @@ vim.keymap.del({modes}, {lhs}, {opts})                      *vim.keymap.del()*
 
     Parameters: ~
       • {opts}  (table|nil) A table of optional arguments:
-                • "buffer": (number|boolean) Remove a mapping from the given
+                • "buffer": (integer|boolean) Remove a mapping from the given
                   buffer. When `0` or `true`, use the current buffer.
 
     See also: ~
@@ -2786,7 +2786,7 @@ vim.keymap.set({mode}, {lhs}, {rhs}, {opts})                *vim.keymap.set()*
                   • "noremap": inverse of "remap" (see below).
 
                 • Also accepts:
-                  • "buffer": (number|boolean) Creates buffer-local mapping,
+                  • "buffer": (integer|boolean) Creates buffer-local mapping,
                     `0` or `true` for current buffer.
                   • "remap": (boolean) Make the mapping recursive. Inverse of
                     "noremap". Defaults to `false`.
diff --git a/runtime/lua/vim/keymap.lua b/runtime/lua/vim/keymap.lua
index df593be097..bdea95f9ab 100644
--- a/runtime/lua/vim/keymap.lua
+++ b/runtime/lua/vim/keymap.lua
@@ -28,7 +28,7 @@ local keymap = {}
 ---                        - "replace_keycodes" defaults to `true` if "expr" is `true`.
 ---                        - "noremap": inverse of "remap" (see below).
 ---                      - Also accepts:
----                        - "buffer": (number|boolean) Creates buffer-local mapping, `0` or `true`
+---                        - "buffer": (integer|boolean) Creates buffer-local mapping, `0` or `true`
 ---                        for current buffer.
 ---                        - "remap": (boolean) Make the mapping recursive. Inverse of "noremap".
 ---                        Defaults to `false`.
@@ -44,7 +44,9 @@ function keymap.set(mode, lhs, rhs, opts)
     opts = { opts, 't', true },
   })
 
-  opts = vim.deepcopy(opts) or {}
+  opts = vim.deepcopy(opts or {})
+
+  ---@cast mode string[]
   mode = type(mode) == 'string' and { mode } or mode
 
   if opts.expr and opts.replace_keycodes ~= false then
@@ -57,7 +59,7 @@ function keymap.set(mode, lhs, rhs, opts)
   else
     -- remaps behavior is opposite of noremap option.
     opts.noremap = not opts.remap
-    opts.remap = nil
+    opts.remap = nil ---@type boolean?
   end
 
   if type(rhs) == 'function' then
@@ -66,8 +68,8 @@ function keymap.set(mode, lhs, rhs, opts)
   end
 
   if opts.buffer then
-    local bufnr = opts.buffer == true and 0 or opts.buffer
-    opts.buffer = nil
+    local bufnr = opts.buffer == true and 0 or opts.buffer --[[@as integer]]
+    opts.buffer = nil ---@type integer?
     for _, m in ipairs(mode) do
       vim.api.nvim_buf_set_keymap(bufnr, m, lhs, rhs, opts)
     end
@@ -89,7 +91,7 @@ end
 --- ```
 ---
 ---@param opts table|nil A table of optional arguments:
----                      - "buffer": (number|boolean) Remove a mapping from the given buffer.
+---                      - "buffer": (integer|boolean) Remove a mapping from the given buffer.
 ---                        When `0` or `true`, use the current buffer.
 ---@see |vim.keymap.set()|
 ---
@@ -103,9 +105,9 @@ function keymap.del(modes, lhs, opts)
   opts = opts or {}
   modes = type(modes) == 'string' and { modes } or modes
 
-  local buffer = false
+  local buffer = false ---@type false|integer
   if opts.buffer ~= nil then
-    buffer = opts.buffer == true and 0 or opts.buffer
+    buffer = opts.buffer == true and 0 or opts.buffer --[[@as integer]]
   end
 
   if buffer == false then
diff --git a/runtime/lua/vim/secure.lua b/runtime/lua/vim/secure.lua
index 893b3e1877..d29c356af3 100644
--- a/runtime/lua/vim/secure.lua
+++ b/runtime/lua/vim/secure.lua
@@ -2,9 +2,9 @@ local M = {}
 
 --- Reads trust database from $XDG_STATE_HOME/nvim/trust.
 ---
----@return (table) Contents of trust database, if it exists. Empty table otherwise.
+---@return table<string, string> Contents of trust database, if it exists. Empty table otherwise.
 local function read_trust()
-  local trust = {}
+  local trust = {} ---@type table<string, string>
   local f = io.open(vim.fn.stdpath('state') .. '/trust', 'r')
   if f then
     local contents = f:read('*a')
@@ -24,12 +24,12 @@ end
 --- Writes provided {trust} table to trust database at
 --- $XDG_STATE_HOME/nvim/trust.
 ---
----@param trust (table) Trust table to write
+---@param trust table<string, string> Trust table to write
 local function write_trust(trust)
   vim.validate({ trust = { trust, 't' } })
   local f = assert(io.open(vim.fn.stdpath('state') .. '/trust', 'w'))
 
-  local t = {}
+  local t = {} ---@type string[]
   for p, h in pairs(trust) do
     t[#t + 1] = string.format('%s %s\n', h, p)
   end
@@ -61,7 +61,7 @@ function M.read(path)
     return nil
   end
 
-  local contents
+  local contents ---@type string?
   do
     local f = io.open(fullpath, 'r')
     if not f then
@@ -108,6 +108,11 @@ function M.read(path)
   return contents
 end
 
+---@class vim.trust.opts
+---@field action string
+---@field path? string
+---@field bufnr? integer
+
 --- Manage the trust database.
 ---
 --- The trust database is located at |$XDG_STATE_HOME|/nvim/trust.
@@ -134,6 +139,7 @@ function M.trust(opts)
     },
   })
 
+  ---@cast opts vim.trust.opts
   local path = opts.path
   local bufnr = opts.bufnr
   local action = opts.action
@@ -144,7 +150,7 @@ function M.trust(opts)
     assert(not path, '"path" is not valid when action is "allow"')
   end
 
-  local fullpath
+  local fullpath ---@type string?
   if path then
     fullpath = vim.uv.fs_realpath(vim.fs.normalize(path))
   elseif bufnr then
@@ -165,7 +171,8 @@ function M.trust(opts)
 
   if action == 'allow' then
     local newline = vim.bo[bufnr].fileformat == 'unix' and '\n' or '\r\n'
-    local contents = table.concat(vim.api.nvim_buf_get_lines(bufnr, 0, -1, false), newline)
+    local contents =
+      table.concat(vim.api.nvim_buf_get_lines(bufnr --[[@as integer]], 0, -1, false), newline)
     if vim.bo[bufnr].endofline then
       contents = contents .. newline
     end
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index cc8be72670..0e34cbcbcc 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -127,6 +127,7 @@ function M.get_parser(bufnr, lang, opts)
       )
     end
   elseif parsers[bufnr] == nil or parsers[bufnr]:lang() ~= lang then
+    assert(lang, 'lang should be valid')
     parsers[bufnr] = M._create_parser(bufnr, lang, opts)
   end
 
@@ -162,7 +163,7 @@ function M.is_ancestor(dest, source)
     return false
   end
 
-  local current = source
+  local current = source ---@type TSNode?
   while current ~= nil do
     if current == dest then
       return true
@@ -491,7 +492,7 @@ end
 ---                        function, it accepts the buffer number of the source buffer as its only
 ---                        argument and should return a string.
 function M.inspect_tree(opts)
-  ---@cast opts InspectTreeOpts
+  ---@diagnostic disable-next-line: invisible
   require('vim.treesitter.dev').inspect_tree(opts)
 end
 
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 61d84017d4..db30d638af 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -258,7 +258,7 @@ end
 
 --- @private
 ---
---- @param opts InspectTreeOpts
+--- @param opts InspectTreeOpts?
 function M.inspect_tree(opts)
   vim.validate({
     opts = { opts, 't', true },
diff --git a/runtime/lua/vim/uri.lua b/runtime/lua/vim/uri.lua
index 9dce80b77e..2dc817c5c1 100644
--- a/runtime/lua/vim/uri.lua
+++ b/runtime/lua/vim/uri.lua
@@ -60,7 +60,7 @@ end
 ---@param path string Path to file
 ---@return string URI
 function M.uri_from_fname(path)
-  local volume_path, fname = path:match('^([a-zA-Z]:)(.*)')
+  local volume_path, fname = path:match('^([a-zA-Z]:)(.*)') ---@type string?
   local is_windows = volume_path ~= nil
   if is_windows then
     path = volume_path .. M.uri_encode(fname:gsub('\\', '/'))
@@ -82,7 +82,7 @@ function M.uri_from_bufnr(bufnr)
   local fname = vim.api.nvim_buf_get_name(bufnr)
   local volume_path = fname:match('^([a-zA-Z]:).*')
   local is_windows = volume_path ~= nil
-  local scheme
+  local scheme ---@type string?
   if is_windows then
     fname = fname:gsub('\\', '/')
     scheme = fname:match(WINDOWS_URI_SCHEME_PATTERN)
@@ -107,10 +107,9 @@ function M.uri_to_fname(uri)
   uri = M.uri_decode(uri)
   --TODO improve this.
   if is_windows_file_uri(uri) then
-    uri = uri:gsub('^file:/+', '')
-    uri = uri:gsub('/', '\\')
+    uri = uri:gsub('^file:/+', ''):gsub('/', '\\')
   else
-    uri = uri:gsub('^file:/+', '/')
+    uri = uri:gsub('^file:/+', '/') ---@type string
   end
   return uri
 end
-- 
cgit 


From 046c9a83f7ed2694c19d915a63ef0dfed9d29dc5 Mon Sep 17 00:00:00 2001
From: tj-moody <92702993+tj-moody@users.noreply.github.com>
Date: Sat, 23 Sep 2023 22:49:47 -0400
Subject: fix(ui): always use stl/stlnc fillchars when drawing statusline
 (#25267)

---
 runtime/doc/options.txt           | 8 +++-----
 runtime/doc/syntax.txt            | 2 --
 runtime/doc/vim_diff.txt          | 4 ++++
 runtime/lua/vim/_meta/options.lua | 8 +++-----
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9b4f36cbce..b26c181f28 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2465,8 +2465,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	and the value of that item:
 
 	  item		default		Used for ~
-	  stl		' ' or '^'	statusline of the current window
-	  stlnc		' ' or '='	statusline of the non-current windows
+	  stl		' '		statusline of the current window
+	  stlnc		' '		statusline of the non-current windows
 	  wbr		' '		window bar
 	  horiz		'─' or '-'	horizontal separators |:split|
 	  horizup	'┴' or '-'	upwards facing horizontal separator
@@ -2485,9 +2485,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  eob		'~'		empty lines at the end of a buffer
 	  lastline	'@'		'display' contains lastline/truncate
 
-	Any one that is omitted will fall back to the default.  For "stl" and
-	"stlnc" the space will be used when there is highlighting, '^' or '='
-	otherwise.
+	Any one that is omitted will fall back to the default.
 
 	Note that "horiz", "horizup", "horizdown", "vertleft", "vertright" and
 	"verthoriz" are only used when 'laststatus' is 3, since only vertical
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index c15b41f9aa..e1053b54f1 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -5322,8 +5322,6 @@ SpellRare	Word that is recognized by the spellchecker as one that is
 StatusLine	Status line of current window.
 							*hl-StatusLineNC*
 StatusLineNC	Status lines of not-current windows.
-		Note: If this is equal to "StatusLine", Vim will use "^^^" in
-		the status line of the current window.
 							*hl-TabLine*
 TabLine		Tab pages line, not active tab page label.
 							*hl-TabLineFill*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 8a6e5461c3..d65e470dcf 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -534,6 +534,10 @@ Vimscript compatibility:
   `shell_error` does not alias to |v:shell_error|
   `this_session` does not alias to |v:this_session|
 
+UI/Display:
+  'statusline' always uses the "stl" and "stlnc" fields of 'fillchars', even
+  if they are the same and |hl-StatusLine| and |hl-StatusLineNC| are equal.
+
 Working directory (Vim implemented some of these after Nvim):
 - |DirChanged| and |DirChangedPre| can be triggered when switching to another
   window or tab.
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index baf53c5ccc..f8a51da9b5 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -2181,8 +2181,8 @@ vim.bo.ft = vim.bo.filetype
 --- and the value of that item:
 ---
 ---   item		default		Used for ~
----   stl		' ' or '^'	statusline of the current window
----   stlnc		' ' or '='	statusline of the non-current windows
+---   stl		' '		statusline of the current window
+---   stlnc		' '		statusline of the non-current windows
 ---   wbr		' '		window bar
 ---   horiz		'─' or '-'	horizontal separators `:split`
 ---   horizup	'┴' or '-'	upwards facing horizontal separator
@@ -2201,9 +2201,7 @@ vim.bo.ft = vim.bo.filetype
 ---   eob		'~'		empty lines at the end of a buffer
 ---   lastline	'@'		'display' contains lastline/truncate
 ---
---- Any one that is omitted will fall back to the default.  For "stl" and
---- "stlnc" the space will be used when there is highlighting, '^' or '='
---- otherwise.
+--- Any one that is omitted will fall back to the default.
 ---
 --- Note that "horiz", "horizup", "horizdown", "vertleft", "vertright" and
 --- "verthoriz" are only used when 'laststatus' is 3, since only vertical
-- 
cgit 


From ac1c23442fd2688f89d75310b8c769e91d81e715 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 24 Sep 2023 11:20:23 +0800
Subject: test(old): don't set options to default before every test (#25335)

Oldtests clean up after themselves, and the options that need operators
to align with Vim all deny duplicates, so there is no need to set them
to default.

Also make the variable name that test_listchars.vim uses to align with
Vim more obvious.
---
 runtime/doc/vim_diff.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index d65e470dcf..8f339379bf 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -45,7 +45,7 @@ Defaults					            *nvim-defaults*
 - 'directory' defaults to ~/.local/state/nvim/swap// (|xdg|), auto-created
 - 'display' defaults to "lastline"
 - 'encoding' is UTF-8 (cf. 'fileencoding' for file-content encoding)
-- 'fillchars' defaults (in effect) to "vert:│,fold:·,sep:│"
+- 'fillchars' defaults (in effect) to "vert:│,fold:·,foldsep:│"
 - 'formatoptions' defaults to "tcqj"
 - 'fsync' is disabled
 - 'hidden' is enabled
-- 
cgit 


From 61ecb3e16c22eec9cb8eb77f76d9e8ddfc3601bc Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 24 Sep 2023 22:04:29 +0800
Subject: fix(provider/pythonx): import the correct module (#25342)

---
 runtime/autoload/provider/pythonx.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
index db6acf4526..48b96c699a 100644
--- a/runtime/autoload/provider/pythonx.vim
+++ b/runtime/autoload/provider/pythonx.vim
@@ -62,7 +62,7 @@ endfunction
 " Returns array: [prog_exitcode, prog_version]
 function! s:import_module(prog, module) abort
   let prog_version = system([a:prog, '-W', 'ignore', '-c', printf(
-        \ 'import sys, importlib; ' .
+        \ 'import sys, importlib.util; ' .
         \ 'sys.path = [p for p in sys.path if p != ""]; ' .
         \ 'sys.stdout.write(str(sys.version_info[0]) + "." + str(sys.version_info[1])); ' .
         \ 'sys.exit(2 * int(importlib.util.find_spec("%s") is None))',
-- 
cgit 


From 6fb1e0d499b33534152f09744f967f355a9e2a24 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Sun, 24 Sep 2023 09:09:18 -0500
Subject: docs: remove "f" from default 'shortmess' value

The "f" flag was removed in f7da4722570617bd8927e7aa533fa9a608c45bba.
The value of the "f" flag is no longer listed in the 'shortmess'
description and it cannot be disabled, so having it in the default value
is pointless and confusing.
---
 runtime/doc/options.txt           | 2 +-
 runtime/lua/vim/_meta/options.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b26c181f28..5e91bd8666 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5383,7 +5383,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	function to get the effective shiftwidth value.
 
 					*'shortmess'* *'shm'* *E1336*
-'shortmess' 'shm'	string	(default "filnxtToOCF")
+'shortmess' 'shm'	string	(default "ilnxtToOCF")
 			global
 	This option helps to avoid all the |hit-enter| prompts caused by file
 	messages, for example  with CTRL-G, and to avoid some other messages.
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index f8a51da9b5..461bf95610 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -5719,7 +5719,7 @@ vim.bo.sw = vim.bo.shiftwidth
 ---     shm=at	Abbreviation, and truncate message when necessary.
 ---
 --- @type string
-vim.o.shortmess = "filnxtToOCF"
+vim.o.shortmess = "ilnxtToOCF"
 vim.o.shm = vim.o.shortmess
 vim.go.shortmess = vim.o.shortmess
 vim.go.shm = vim.go.shortmess
-- 
cgit 


From 3bbb0aa3993fb8760fa693aae2133186cb61db77 Mon Sep 17 00:00:00 2001
From: Tom Blake <tjmblake@outlook.com>
Date: Sun, 24 Sep 2023 18:43:55 +0100
Subject: fix: checkhealth warning even if init.lua exists #25306

Problem:
`:checkhealth nvim` warns about missing vimrc if `init.lua` exists but
`init.vim` does not.

Solution:
Check for any of: init.vim, init.lua, $MYVIMRC.
Fix #25291
---
 runtime/lua/nvim/health.lua | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua
index 7ccb082a40..6b6370fa19 100644
--- a/runtime/lua/nvim/health.lua
+++ b/runtime/lua/nvim/health.lua
@@ -54,15 +54,19 @@ local function check_config()
   health.start('Configuration')
   local ok = true
 
-  local vimrc = (
-    empty(vim.env.MYVIMRC) and vim.fn.stdpath('config') .. '/init.vim' or vim.env.MYVIMRC
-  )
-  if not filereadable(vimrc) then
+  local init_lua = vim.fn.stdpath('config') .. '/init.lua'
+  local init_vim = vim.fn.stdpath('config') .. '/init.vim'
+  local vimrc = empty(vim.env.MYVIMRC) and init_lua or vim.env.MYVIMRC
+
+  if not filereadable(vimrc) and not filereadable(init_vim) then
     ok = false
     local has_vim = filereadable(vim.fn.expand('~/.vimrc'))
     health.warn(
-      (-1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable') .. ' user config file: ' .. vimrc,
-      { has_vim and ':help nvim-from-vim' or ':help init.vim' }
+      ('%s user config file: %s'):format(
+        -1 == vim.fn.getfsize(vimrc) and 'Missing' or 'Unreadable',
+        vimrc
+      ),
+      { has_vim and ':help nvim-from-vim' or ':help config' }
     )
   end
 
-- 
cgit 


From d1bc6fca7123d77ebf03d0badd63f930a5b74064 Mon Sep 17 00:00:00 2001
From: Bogdan Grigoruță <43993819+krady21@users.noreply.github.com>
Date: Sun, 24 Sep 2023 21:43:16 +0300
Subject: feat(health): list attached buffers in LSP report #23561

Problem:
Users using `vim.lsp.start` directly (instead of nvim-lspconfig) need
more visibility for troubleshooting. For example, troubleshooting
unnecesary servers or servers that aren't attaching to expected buffers.

Solution:
Mention attached buffers in the `:checkhealth lsp` report.

Example:

    vim.lsp: Active Clients ~
    - clangd (id=1, root_dir=~/dev/neovim, attached_to=[7])
    - lua_ls (id=2, root_dir=~/dev/neovim, attached_to=[10])
---
 runtime/lua/vim/lsp/health.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/health.lua b/runtime/lua/vim/lsp/health.lua
index 023b1c26be..fe06006108 100644
--- a/runtime/lua/vim/lsp/health.lua
+++ b/runtime/lua/vim/lsp/health.lua
@@ -32,8 +32,15 @@ function M.check()
   vim.health.start('vim.lsp: Active Clients')
   if next(clients) then
     for _, client in pairs(clients) do
+      local attached_to = table.concat(vim.tbl_keys(client.attached_buffers or {}), ',')
       report_info(
-        string.format('%s (id=%s, root_dir=%s)', client.name, client.id, client.config.root_dir)
+        string.format(
+          '%s (id=%s, root_dir=%s, attached_to=[%s])',
+          client.name,
+          client.id,
+          vim.fn.fnamemodify(client.config.root_dir, ':~'),
+          attached_to
+        )
       )
     end
   else
-- 
cgit 


From f9944a78bcd305e73053819ce763d8fb1bc7619c Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Fri, 22 Sep 2023 15:25:06 -0700
Subject: feat(meta): add types for vim.lpeg

---
 runtime/lua/vim/_meta/lpeg.lua | 328 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 328 insertions(+)
 create mode 100644 runtime/lua/vim/_meta/lpeg.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/lpeg.lua b/runtime/lua/vim/_meta/lpeg.lua
new file mode 100644
index 0000000000..415bffdfdc
--- /dev/null
+++ b/runtime/lua/vim/_meta/lpeg.lua
@@ -0,0 +1,328 @@
+--- @meta
+
+-- These types were taken from https://github.com/LuaCATS/lpeg, with types being renamed to include
+-- the vim namespace and with some descriptions made less verbose.
+
+--- *LPeg* is a new pattern-matching library for Lua, based on [Parsing Expression Grammars](https://bford.info/packrat/) (PEGs).
+vim.lpeg = {}
+
+--- @class vim.lpeg.Pattern
+--- @operator add(vim.lpeg.Pattern): vim.lpeg.Pattern
+--- @operator mul(vim.lpeg.Pattern): vim.lpeg.Pattern
+--- @operator mul(vim.lpeg.Capture): vim.lpeg.Pattern
+--- @operator div(string): vim.lpeg.Capture
+--- @operator div(number): vim.lpeg.Capture
+--- @operator div(table): vim.lpeg.Capture
+--- @operator div(function): vim.lpeg.Capture
+--- @operator pow(number): vim.lpeg.Pattern
+local Pattern = {}
+
+--- @alias vim.lpeg.Capture vim.lpeg.Pattern
+--- @operator add(vim.lpeg.Capture): vim.lpeg.Pattern
+--- @operator mul(vim.lpeg.Capture): vim.lpeg.Pattern
+--- @operator mul(vim.lpeg.Pattern): vim.lpeg.Pattern
+--- @operator div(string): vim.lpeg.Capture
+--- @operator div(number): vim.lpeg.Capture
+--- @operator div(table): vim.lpeg.Capture
+--- @operator div(function): vim.lpeg.Capture
+--- @operator pow(number): vim.lpeg.Pattern
+
+--- Matches the given `pattern` against the `subject` string. If the match succeeds, returns the index in the
+--- subject of the first character after the match, or the captured values (if the pattern captured any value).
+--- An optional numeric argument `init` makes the match start at that position in the subject string. As usual
+--- in Lua libraries, a negative value counts from the end. Unlike typical pattern-matching functions, `match`
+--- works only in anchored mode; that is, it tries to match the pattern with a prefix of the given subject
+--- string (at position `init`), not with an arbitrary substring of the subject. So, if we want to find a
+--- pattern anywhere in a string, we must either write a loop in Lua or write a pattern that
+--- matches anywhere.
+---
+--- Example:
+--- ```lua
+--- local pattern = lpeg.R("az") ^ 1 * -1
+--- assert(pattern:match("hello") == 6)
+--- assert(lpeg.match(pattern, "hello") == 6)
+--- assert(pattern:match("1 hello") == nil)
+--- ```
+---
+--- @param pattern vim.lpeg.Pattern
+--- @param subject string
+--- @param init? integer
+--- @return integer|vim.lpeg.Capture
+function vim.lpeg.match(pattern, subject, init) end
+
+--- Matches the given `pattern` against the `subject` string. If the match succeeds, returns the
+--- index in the subject of the first character after the match, or the captured values (if the
+--- pattern captured any value). An optional numeric argument `init` makes the match start at
+--- that position in the subject string. As usual in Lua libraries, a negative value counts from the end.
+--- Unlike typical pattern-matching functions, `match` works only in anchored mode; that is, it tries
+--- to match the pattern with a prefix of the given subject string (at position `init`), not with
+--- an arbitrary substring of the subject. So, if we want to find a pattern anywhere in a string,
+--- we must either write a loop in Lua or write a pattern that matches anywhere.
+---
+--- Example:
+--- ```lua
+--- local pattern = lpeg.R("az") ^ 1 * -1
+--- assert(pattern:match("hello") == 6)
+--- assert(lpeg.match(pattern, "hello") == 6)
+--- assert(pattern:match("1 hello") == nil)
+--- ```
+---
+--- @param subject string
+--- @param init? integer
+--- @return integer|vim.lpeg.Capture
+function Pattern:match(subject, init) end
+
+--- Returns the string `"pattern"` if the given value is a pattern, otherwise `nil`.
+---
+--- @return 'pattern'|nil
+function vim.lpeg.type(value) end
+
+--- Returns a string with the running version of LPeg.
+--- @return string
+function vim.lpeg.version() end
+
+--- Sets a limit for the size of the backtrack stack used by LPeg to track calls and choices.
+--- The default limit is `400`. Most well-written patterns need little backtrack levels and
+--- therefore you seldom need to change this limit; before changing it you should try to rewrite
+--- your pattern to avoid the need for extra space. Nevertheless, a few useful patterns may overflow.
+--- Also, with recursive grammars, subjects with deep recursion may also need larger limits.
+---
+--- @param max integer
+function vim.lpeg.setmaxstack(max) end
+
+--- Converts the given value into a proper pattern. This following rules are applied:
+--- * If the argument is a pattern, it is returned unmodified.
+--- * If the argument is a string, it is translated to a pattern that matches the string literally.
+--- * If the argument is a non-negative number `n`, the result is a pattern that matches exactly `n` characters.
+--- * If the argument is a negative number `-n`, the result is a pattern that succeeds only if
+--- the input string has less than `n` characters left: `lpeg.P(-n)` is equivalent to `-lpeg.P(n)`
+--- (see the unary minus operation).
+--- * If the argument is a boolean, the result is a pattern that always succeeds or always fails
+--- (according to the boolean value), without consuming any input.
+--- * If the argument is a table, it is interpreted as a grammar (see Grammars).
+--- * If the argument is a function, returns a pattern equivalent to a match-time captureover the empty string.
+---
+--- @param value vim.lpeg.Pattern|string|integer|boolean|table|function
+--- @return vim.lpeg.Pattern
+function vim.lpeg.P(value) end
+
+--- Returns a pattern that matches only if the input string at the current position is preceded by `patt`.
+--- Pattern `patt` must match only strings with some fixed length, and it cannot contain captures.
+--- Like the and predicate, this pattern never consumes any input, independently of success or failure.
+---
+--- @param pattern vim.lpeg.Pattern
+--- @return vim.lpeg.Pattern
+function vim.lpeg.B(pattern) end
+
+--- Returns a pattern that matches any single character belonging to one of the given ranges.
+--- Each `range` is a string `xy` of length 2, representing all characters with code between the codes of
+--- `x` and `y` (both inclusive). As an example, the pattern `lpeg.R("09")` matches any digit, and
+--- `lpeg.R("az", "AZ")` matches any ASCII letter.
+---
+--- Example:
+--- ```lua
+--- local pattern = lpeg.R("az") ^ 1 * -1
+--- assert(pattern:match("hello") == 6)
+--- ```
+---
+--- @param ... string
+--- @return vim.lpeg.Pattern
+function vim.lpeg.R(...) end
+
+--- Returns a pattern that matches any single character that appears in the given string (the `S` stands for Set).
+--- As an example, the pattern `lpeg.S("+-*/")` matches any arithmetic operator. Note that, if `s` is a character
+--- (that is, a string of length 1), then `lpeg.P(s)` is equivalent to `lpeg.S(s)` which is equivalent to
+--- `lpeg.R(s..s)`. Note also that both `lpeg.S("")` and `lpeg.R()` are patterns that always fail.
+---
+--- @param string string
+--- @return vim.lpeg.Pattern
+function vim.lpeg.S(string) end
+
+--- Creates a non-terminal (a variable) for a grammar. This operation creates a non-terminal (a variable)
+--- for a grammar. The created non-terminal refers to the rule indexed by `v` in the enclosing grammar.
+---
+--- Example:
+--- ```lua
+--- local b = lpeg.P({"(" * ((1 - lpeg.S "()") + lpeg.V(1)) ^ 0 * ")"})
+--- assert(b:match('((string))') == 11)
+--- assert(b:match('(') == nil)
+--- ```
+---
+--- @param v string|integer
+--- @return vim.lpeg.Pattern
+function vim.lpeg.V(v) end
+
+--- @class vim.lpeg.Locale
+--- @field alnum userdata
+--- @field alpha userdata
+--- @field cntrl userdata
+--- @field digit userdata
+--- @field graph userdata
+--- @field lower userdata
+--- @field print userdata
+--- @field punct userdata
+--- @field space userdata
+--- @field upper userdata
+--- @field xdigit userdata
+
+--- Returns a table with patterns for matching some character classes according to the current locale.
+--- The table has fields named `alnum`, `alpha`, `cntrl`, `digit`, `graph`, `lower`, `print`, `punct`,
+--- `space`, `upper`, and `xdigit`, each one containing a correspondent pattern. Each pattern matches
+--- any single character that belongs to its class.
+--- If called with an argument `table`, then it creates those fields inside the given table and returns
+--- that table.
+---
+--- Example:
+--- ```lua
+--- lpeg.locale(lpeg)
+--- local space = lpeg.space^0
+--- local name = lpeg.C(lpeg.alpha^1) * space
+--- local sep = lpeg.S(",;") * space
+--- local pair = lpeg.Cg(name * "=" * space * name) * sep^-1
+--- local list = lpeg.Cf(lpeg.Ct("") * pair^0, rawset)
+--- local t = list:match("a=b, c = hi; next = pi")
+--- assert(t.a == 'b')
+--- assert(t.c == 'hi')
+--- assert(t.next == 'pi')
+--- local locale = lpeg.locale()
+--- assert(type(locale.digit) == 'userdata')
+--- ```
+---
+--- @param tab? table
+--- @return vim.lpeg.Locale
+function vim.lpeg.locale(tab) end
+
+--- Creates a simple capture, which captures the substring of the subject that matches `patt`.
+--- The captured value is a string. If `patt` has other captures, their values are returned after this one.
+---
+--- Example:
+--- ```lua
+--- local function split (s, sep)
+---   sep = lpeg.P(sep)
+---   local elem = lpeg.C((1 - sep)^0)
+---   local p = elem * (sep * elem)^0
+---   return lpeg.match(p, s)
+--- end
+--- local a, b, c = split('a,b,c', ',')
+--- assert(a == 'a')
+--- assert(b == 'b')
+--- assert(c == 'c')
+--- ```
+---
+--- @param patt vim.lpeg.Pattern
+--- @return vim.lpeg.Capture
+function vim.lpeg.C(patt) end
+
+--- Creates an argument capture. This pattern matches the empty string and produces the value given as the
+--- nth extra argument given in the call to `lpeg.match`.
+--- @param n integer
+--- @return vim.lpeg.Capture
+function vim.lpeg.Carg(n) end
+
+--- Creates a back capture. This pattern matches the empty string and produces the values produced by the most recent
+--- group capture named `name` (where `name` can be any Lua value). Most recent means the last complete outermost
+--- group capture with the given name. A Complete capture means that the entire pattern corresponding to the capture
+--- has matched. An Outermost capture means that the capture is not inside another complete capture.
+--- In the same way that LPeg does not specify when it evaluates captures, it does not specify whether it reuses
+--- values previously produced by the group or re-evaluates them.
+---
+--- @param name any
+--- @return vim.lpeg.Capture
+function vim.lpeg.Cb(name) end
+
+--- Creates a constant capture. This pattern matches the empty string and produces all given values as its captured values.
+---
+--- @param ... any
+--- @return vim.lpeg.Capture
+function vim.lpeg.Cc(...) end
+
+--- Creates a fold capture. If `patt` produces a list of captures C1 C2 ... Cn, this capture will produce the value
+--- `func(...func(func(C1, C2), C3)...,Cn)`, that is, it will fold (or accumulate, or reduce) the captures from
+--- `patt` using function `func`. This capture assumes that `patt` should produce at least one capture with at
+--- least one value (of any type), which becomes the initial value of an accumulator. (If you need a specific
+--- initial value, you may prefix a constant captureto `patt`.) For each subsequent capture, LPeg calls `func`
+--- with this accumulator as the first argument and all values produced by the capture as extra arguments;
+--- the first result from this call becomes the new value for the accumulator. The final value of the accumulator
+--- becomes the captured value.
+---
+--- Example:
+--- ```lua
+--- local number = lpeg.R("09") ^ 1 / tonumber
+--- local list = number * ("," * number) ^ 0
+--- local function add(acc, newvalue) return acc + newvalue end
+--- local sum = lpeg.Cf(list, add)
+--- assert(sum:match("10,30,43") == 83)
+--- ```
+---
+--- @param patt vim.lpeg.Pattern
+--- @param func fun(acc, newvalue)
+--- @return vim.lpeg.Capture
+function vim.lpeg.Cf(patt, func) end
+
+--- Creates a group capture. It groups all values returned by `patt` into a single capture.
+--- The group may be anonymous (if no name is given) or named with the given name (which
+--- can be any non-nil Lua value).
+---
+--- @param patt vim.lpeg.Pattern
+--- @param name? string
+--- @return vim.lpeg.Capture
+function vim.lpeg.Cg(patt, name) end
+
+--- Creates a position capture. It matches the empty string and captures the position in the
+--- subject where the match occurs. The captured value is a number.
+---
+--- Example:
+--- ```lua
+--- local I = lpeg.Cp()
+--- local function anywhere(p) return lpeg.P({I * p * I + 1 * lpeg.V(1)}) end
+--- local match_start, match_end = anywhere("world"):match("hello world!")
+--- assert(match_start == 7)
+--- assert(match_end == 12)
+--- ```
+---
+--- @return vim.lpeg.Capture
+function vim.lpeg.Cp() end
+
+--- Creates a substitution capture. This function creates a substitution capture, which
+--- captures the substring of the subject that matches `patt`, with substitutions.
+--- For any capture inside `patt` with a value, the substring that matched the capture
+--- is replaced by the capture value (which should be a string). The final captured
+--- value is the string resulting from all replacements.
+---
+--- Example:
+--- ```lua
+--- local function gsub (s, patt, repl)
+---   patt = lpeg.P(patt)
+---   patt = lpeg.Cs((patt / repl + 1)^0)
+---   return lpeg.match(patt, s)
+--- end
+--- assert(gsub('Hello, xxx!', 'xxx', 'World') == 'Hello, World!')
+--- ```
+---
+--- @param patt vim.lpeg.Pattern
+--- @return vim.lpeg.Capture
+function vim.lpeg.Cs(patt) end
+
+--- Creates a table capture. This capture returns a table with all values from all anonymous captures
+--- made by `patt` inside this table in successive integer keys, starting at 1.
+--- Moreover, for each named capture group created by `patt`, the first value of the group is put into
+--- the table with the group name as its key. The captured value is only the table.
+---
+--- @param patt vim.lpeg.Pattern|''
+--- @return vim.lpeg.Capture
+function vim.lpeg.Ct(patt) end
+
+--- Creates a match-time capture. Unlike all other captures, this one is evaluated immediately when a match occurs
+--- (even if it is part of a larger pattern that fails later). It forces the immediate evaluation of all its nested captures
+--- and then calls `function`. The given function gets as arguments the entire subject, the current position
+--- (after the match of `patt`), plus any capture values produced by `patt`. The first value returned by `function`
+--- defines how the match happens. If the call returns a number, the match succeeds and the returned number
+--- becomes the new current position. (Assuming a subject sand current position i, the returned number must be
+--- in the range [i, len(s) + 1].) If the call returns true, the match succeeds without consuming any input
+--- (so, to return true is equivalent to return i). If the call returns false, nil, or no value, the match fails.
+--- Any extra values returned by the function become the values produced by the capture.
+---
+--- @param patt vim.lpeg.Pattern
+--- @param fn function
+--- @return vim.lpeg.Capture
+function vim.lpeg.Cmt(patt, fn) end
-- 
cgit 


From 57b84f6d640a13e0f1aed5e713609b366400c48f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 25 Sep 2023 06:37:54 +0800
Subject: vim-patch:790f9a890cee

runtime(doc): Add a missing '<' to the help of strutf16len() (vim/vim#13168)

https://github.com/vim/vim/commit/790f9a890ceeb9539776265cba0f026fb2c96790

Co-authored-by: a5ob7r <12132068+a5ob7r@users.noreply.github.com>
---
 runtime/doc/builtin.txt         | 1 +
 runtime/lua/vim/_meta/vimfn.lua | 1 +
 2 files changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 2dd290fef1..207bf817b0 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -7742,6 +7742,7 @@ strutf16len({string} [, {countcc}])                              *strutf16len()*
 		    echo strutf16len('😊')		" returns 2
 		    echo strutf16len('ą́')		" returns 1
 		    echo strutf16len('ą́', v:true)	" returns 3
+<
 
 strwidth({string})                                                  *strwidth()*
 		The result is a Number, which is the number of display cells
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 4113797759..6686661a27 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -9192,6 +9192,7 @@ function vim.fn.strtrans(string) end
 ---     echo strutf16len('😊')    " returns 2
 ---     echo strutf16len('ą́')    " returns 1
 ---     echo strutf16len('ą́', v:true)  " returns 3
+--- <
 ---
 --- @param string string
 --- @param countcc? 0|1
-- 
cgit 


From 2049e22f7f5c11d5ef34fca6c4634ac246dfa42d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 25 Sep 2023 06:39:28 +0800
Subject: vim-patch:960822a11f70
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(doc): grammar fixes in doc (vim/vim#13164)

https://github.com/vim/vim/commit/960822a11f70d2ed7e78b42fb6b75a9f8839ec9f

Co-authored-by: Dominique Pellé <dominique.pelle@gmail.com>
---
 runtime/doc/ft_rust.txt                | 4 ++--
 runtime/doc/nvim_terminal_emulator.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/ft_rust.txt b/runtime/doc/ft_rust.txt
index b912f732b6..083b6f579f 100644
--- a/runtime/doc/ft_rust.txt
+++ b/runtime/doc/ft_rust.txt
@@ -467,8 +467,8 @@ rust.vim Debugging ~
 		register.
 
 :RustInfoToFile [filename]                                   *:RustInfoToFile*
-		Saves debugging info of the Vim Rust plugin to the the given
-		file, overwritting it.
+		Saves debugging info of the Vim Rust plugin to the given file,
+		overwriting it.
 
 ==============================================================================
 MAPPINGS                                                       *rust-mappings*
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index d0d535566d..0cfeb3dcb7 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -482,7 +482,7 @@ The function will be called with the list of arguments so far, and a second
 argument that is the name of the pty.
 							*gdb-version*
 Only debuggers fully compatible with gdb will work.  Vim uses the GDB/MI
-interface.  The "new-ui" command  requires gdb version 7.12 or later.  if you
+interface.  The "new-ui" command requires gdb version 7.12 or later.  If you
 get this error:
 	Undefined command: "new-ui". Try "help".~
 Then your gdb is too old.
-- 
cgit 


From fdcb74fc4ba2159d5425849560dda97224f5bff4 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Sun, 24 Sep 2023 19:38:37 -0500
Subject: docs: remove more references to shm-f

---
 runtime/doc/editing.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 2225e6e753..363d8a5568 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -820,12 +820,10 @@ by the shell before executing the find program.
 When there is an argument list you can see which file you are editing in the
 title of the window (if there is one and 'title' is on) and with the file
 message you get with the "CTRL-G" command.  You will see something like
-	(file 4 of 11)
-If 'shortmess' contains 'f' it will be
 	(4 of 11)
 If you are not really editing the file at the current position in the argument
 list it will be
-	(file (4) of 11)
+	((4) of 11)
 This means that you are position 4 in the argument list, but not editing the
 fourth file in the argument list.  This happens when you do ":e file".
 
-- 
cgit 


From db51548036ebe4b01c5b78aeca7a76aa71ab4fbe Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sun, 24 Sep 2023 21:39:59 -0700
Subject: docs: do not use deprecated functions #25334

---
 runtime/doc/lua.txt           | 2 +-
 runtime/lua/vim/_editor.lua   | 2 +-
 runtime/lua/vim/_meta/api.lua | 7 +++++++
 runtime/lua/vim/_options.lua  | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index a77cc3b565..7e888a2375 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1680,7 +1680,7 @@ vim.print({...})                                                 *vim.print()*
     "Pretty prints" the given arguments and returns them unmodified.
 
     Example: >lua
-        local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
+        local hl_normal = vim.print(vim.api.nvim_get_hl(0, { name = 'Normal' }))
 <
 
     Return: ~
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index e4a2dadb09..7f09fc8038 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -888,7 +888,7 @@ end
 --- Example:
 ---
 --- ```lua
---- local hl_normal = vim.print(vim.api.nvim_get_hl_by_name('Normal', true))
+--- local hl_normal = vim.print(vim.api.nvim_get_hl(0, { name = 'Normal' }))
 --- ```
 ---
 --- @see |vim.inspect()|
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 81fa7ce7ec..5c51fbd146 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -425,6 +425,7 @@ function vim.api.nvim_buf_get_number(buffer) end
 --- @return integer
 function vim.api.nvim_buf_get_offset(buffer, index) end
 
+--- @deprecated
 --- @param buffer integer
 --- @param name string
 --- @return any
@@ -632,6 +633,7 @@ function vim.api.nvim_buf_set_mark(buffer, name, line, col, opts) end
 --- @param name string Buffer name
 function vim.api.nvim_buf_set_name(buffer, name) end
 
+--- @deprecated
 --- @param buffer integer
 --- @param name string
 --- @param value any
@@ -1283,10 +1285,12 @@ function vim.api.nvim_get_mode() end
 --- @return table<string,any>
 function vim.api.nvim_get_namespaces() end
 
+--- @deprecated
 --- @param name string
 --- @return any
 function vim.api.nvim_get_option(name) end
 
+--- @deprecated
 --- @param name string
 --- @return table<string,any>
 function vim.api.nvim_get_option_info(name) end
@@ -1912,6 +1916,7 @@ function vim.api.nvim_set_hl_ns_fast(ns_id) end
 ---               "callback" is equivalent to returning an empty string.
 function vim.api.nvim_set_keymap(mode, lhs, rhs, opts) end
 
+--- @deprecated
 --- @param name string
 --- @param value any
 function vim.api.nvim_set_option(name, value) end
@@ -2115,6 +2120,7 @@ function vim.api.nvim_win_get_height(window) end
 --- @return integer
 function vim.api.nvim_win_get_number(window) end
 
+--- @deprecated
 --- @param window integer
 --- @param name string
 --- @return any
@@ -2197,6 +2203,7 @@ function vim.api.nvim_win_set_height(window, height) end
 --- @param ns_id integer the namespace to use
 function vim.api.nvim_win_set_hl_ns(window, ns_id) end
 
+--- @deprecated
 --- @param window integer
 --- @param name string
 --- @param value any
diff --git a/runtime/lua/vim/_options.lua b/runtime/lua/vim/_options.lua
index 6a3413b597..b83a8dd4b1 100644
--- a/runtime/lua/vim/_options.lua
+++ b/runtime/lua/vim/_options.lua
@@ -127,7 +127,7 @@ end
 
 --- @param name string
 local function get_options_info(name)
-  local info = api.nvim_get_option_info(name)
+  local info = api.nvim_get_option_info2(name, {})
   info.metatype = get_option_metatype(name, info)
   return info
 end
-- 
cgit 


From c3d1d9445c70846d43d1f091ee0762e16513e225 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 25 Sep 2023 12:21:35 +0200
Subject: refactor(options)!: graduate some more shortmess flags

A lot of updated places in the docs were already incorrect since long
since they did not reflect the default behaviour.

"[dos format]" could've been argued being better for discoverability
but that ship has already sailed as it is no longer displayed by default.
---
 runtime/doc/editing.txt           | 16 ++++++++--------
 runtime/doc/news.txt              |  7 +++++--
 runtime/doc/options.txt           |  7 +------
 runtime/doc/usr_02.txt            |  2 +-
 runtime/doc/vim_diff.txt          |  2 +-
 runtime/lua/vim/_meta/options.lua |  7 +------
 6 files changed, 17 insertions(+), 24 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 363d8a5568..2f44256138 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -539,10 +539,10 @@ set to "dos", otherwise it is set to "unix".  When 'fileformats' includes
 "mac".
 
 If the 'fileformat' option is set to "dos" on non-MS-Windows systems the
-message "[dos format]" is shown to remind you that something unusual is
-happening.  On MS-Windows systems you get the message "[unix format]" if
-'fileformat' is set to "unix".  On all systems but the Macintosh you get the
-message "[mac format]" if 'fileformat' is set to "mac".
+message "[dos]" is shown to remind you that something unusual is happening.  On
+MS-Windows systems you get the message "[unix]" if 'fileformat' is set to
+"unix".  On all systems you get the message "[mac]" if 'fileformat' is set to
+"mac".
 
 If the 'fileformats' option is empty and DOS format is used, but while reading
 a file some lines did not end in <CR><NL>, "[CR missing]" will be included in
@@ -1056,14 +1056,14 @@ lost the original file.
 
 						*DOS-format-write*
 If the 'fileformat' is "dos", <CR><NL> is used for <EOL>.  This is default
-for Windows. On other systems the message "[dos format]" is shown to
+for Windows. On other systems the message "[dos]" is shown to
 remind you that an unusual <EOL> was used.
 						*Unix-format-write*
 If the 'fileformat' is "unix", <NL> is used for <EOL>.  On Windows
-the message "[unix format]" is shown.
+the message "[unix]" is shown.
 						*Mac-format-write*
-If the 'fileformat' is "mac", <CR> is used for <EOL>.  On non-Mac systems the
-message "[mac format]" is shown.
+If the 'fileformat' is "mac", <CR> is used for <EOL>.  The
+message "[mac]" is shown.
 
 See also |file-formats| and the 'fileformat' and 'fileformats' options.
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 5e257372bc..05a2d35f9a 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -247,8 +247,11 @@ The following deprecated functions or APIs were removed.
 
 • Support for legacy treesitter injection queries is removed.
 
-• 'shortmess' flags:
-  - |shm-f| is removed. Always uses "(3 of 5)", never "(file 3 of 5)"
+• Removed 'shortmess' flags:
+  - |shm-f|. Always uses "(3 of 5)", never "(file 3 of 5)"
+  - |shm-i|. Always use "[noeol]".
+  - |shm-x|. Always use "[dos]", "[unix]" and "[mac]"
+  - |shm-n|. Always use "[New]".
 
 ==============================================================================
 DEPRECATIONS                                                *news-deprecations*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 5e91bd8666..0bbbc95141 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5383,22 +5383,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 	function to get the effective shiftwidth value.
 
 					*'shortmess'* *'shm'* *E1336*
-'shortmess' 'shm'	string	(default "ilnxtToOCF")
+'shortmess' 'shm'	string	(default "ltToOCF")
 			global
 	This option helps to avoid all the |hit-enter| prompts caused by file
 	messages, for example  with CTRL-G, and to avoid some other messages.
 	It is a list of flags:
 	 flag	meaning when present	~
-	  i	use "[noeol]" instead of "[Incomplete last line]"	*shm-i*
 	  l	use "999L, 888B" instead of "999 lines, 888 bytes"	*shm-l*
 	  m	use "[+]" instead of "[Modified]"			*shm-m*
-	  n	use "[New]" instead of "[New File]"			*shm-n*
 	  r	use "[RO]" instead of "[readonly]"			*shm-r*
 	  w	use "[w]" instead of "written" for file write message	*shm-w*
 		and "[a]" instead of "appended" for ':w >> file' command
-	  x	use "[dos]" instead of "[dos format]", "[unix]"		*shm-x*
-		instead of "[unix format]" and "[mac]" instead of "[mac
-		format]"
 	  a	all of the above abbreviations				*shm-a*
 
 	  o	overwrite message for writing a file with subsequent	*shm-o*
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index 259bb41200..1fc612de26 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -40,7 +40,7 @@ blank window. This is what your screen will look like:
 	|~					|
 	|~					|
 	|~					|
-	|"file.txt" [New file]			|
+	|"file.txt" [New]			|
 	+---------------------------------------+
 		('#' is the cursor position.)
 <
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 8f339379bf..e636746616 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -731,7 +731,7 @@ Options:
     Everything is allowed in 'exrc' files since they must be explicitly marked
     trusted.
   *'shelltype'*
-  'shortmess' *shm-f* flag (always on, never show "file" in "(3 of 5)")
+  'shortmess' flags: *shm-f* *shm-n* *shm-x* *shm-i* (behave like always on)
   *'shortname'* *'sn'* *'noshortname'* *'nosn'*
   *'swapsync'* *'sws'*
   *'termencoding'* *'tenc'* (Vim 7.4.852 also removed this for Windows)
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 461bf95610..6ef3cf57e1 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -5666,16 +5666,11 @@ vim.bo.sw = vim.bo.shiftwidth
 --- messages, for example  with CTRL-G, and to avoid some other messages.
 --- It is a list of flags:
 ---  flag	meaning when present	~
----   i	use "[noeol]" instead of "[Incomplete last line]"	*shm-i*
 ---   l	use "999L, 888B" instead of "999 lines, 888 bytes"	*shm-l*
 ---   m	use "[+]" instead of "[Modified]"			*shm-m*
----   n	use "[New]" instead of "[New File]"			*shm-n*
 ---   r	use "[RO]" instead of "[readonly]"			*shm-r*
 ---   w	use "[w]" instead of "written" for file write message	*shm-w*
 --- 	and "[a]" instead of "appended" for ':w >> file' command
----   x	use "[dos]" instead of "[dos format]", "[unix]"		*shm-x*
---- 	instead of "[unix format]" and "[mac]" instead of "[mac
---- 	format]"
 ---   a	all of the above abbreviations				*shm-a*
 ---
 ---   o	overwrite message for writing a file with subsequent	*shm-o*
@@ -5719,7 +5714,7 @@ vim.bo.sw = vim.bo.shiftwidth
 ---     shm=at	Abbreviation, and truncate message when necessary.
 ---
 --- @type string
-vim.o.shortmess = "ilnxtToOCF"
+vim.o.shortmess = "ltToOCF"
 vim.o.shm = vim.o.shortmess
 vim.go.shortmess = vim.o.shortmess
 vim.go.shm = vim.go.shortmess
-- 
cgit 


From 3387dc4a463c80a01702cdd069dde3d505a4e805 Mon Sep 17 00:00:00 2001
From: ricardaxel <46921637+ricardaxel@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:13:58 +0200
Subject: fix(runtime): add commentstring for D ftplugin (#25362)

Problem: No commentstring is set for D buffers after removing the
default C-style commentstring

Same solution than neovim#23039

Co-authored-by: Axel Ricard <axel.ricard@allegrodvt.com>
---
 runtime/ftplugin/d.lua | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 runtime/ftplugin/d.lua

(limited to 'runtime')

diff --git a/runtime/ftplugin/d.lua b/runtime/ftplugin/d.lua
new file mode 100644
index 0000000000..b4e68148f5
--- /dev/null
+++ b/runtime/ftplugin/d.lua
@@ -0,0 +1 @@
+vim.bo.commentstring = '/*%s*/'
-- 
cgit 


From ddc147da2f5d5ec565873587c11725a1fd355d8b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 25 Sep 2023 22:15:12 +0200
Subject: vim-patch:54e1f56cf2a5

runtime(sh): only invoke bash help in ftplugin if it has been detected to be bash (vim/vim#13171)

https://github.com/vim/vim/commit/54e1f56cf2a5f74ee11baba170afff867e5d9f99

Co-authored-by: Eisuke Kawashima <e-kwsm@users.noreply.github.com>
---
 runtime/ftplugin/sh.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim
index 4409f3f90c..c227838d18 100644
--- a/runtime/ftplugin/sh.vim
+++ b/runtime/ftplugin/sh.vim
@@ -39,8 +39,7 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
-if (exists("b:is_bash") && (b:is_bash == 1)) ||
-      \ (exists("b:is_sh") && (b:is_sh == 1))
+if (exists("b:is_bash") && (b:is_bash == 1))
   if !has("gui_running") && executable("less")
     command! -buffer -nargs=1 Help silent exe '!bash -c "{ help "<args>" 2>/dev/null || man "<args>"; } | LESS= less"' | redraw!
   elseif has('terminal')
-- 
cgit 


From 5198a2555de4917177f229e4a0496e2448d9fb84 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sun, 24 Sep 2023 21:20:10 -0700
Subject: fix(meta): cleanup lpeg operators

---
 runtime/lua/vim/_meta/lpeg.lua | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/lpeg.lua b/runtime/lua/vim/_meta/lpeg.lua
index 415bffdfdc..42e77aaaba 100644
--- a/runtime/lua/vim/_meta/lpeg.lua
+++ b/runtime/lua/vim/_meta/lpeg.lua
@@ -7,7 +7,9 @@
 vim.lpeg = {}
 
 --- @class vim.lpeg.Pattern
+--- @operator unm: vim.lpeg.Pattern
 --- @operator add(vim.lpeg.Pattern): vim.lpeg.Pattern
+--- @operator sub(vim.lpeg.Pattern): vim.lpeg.Pattern
 --- @operator mul(vim.lpeg.Pattern): vim.lpeg.Pattern
 --- @operator mul(vim.lpeg.Capture): vim.lpeg.Pattern
 --- @operator div(string): vim.lpeg.Capture
@@ -15,17 +17,10 @@ vim.lpeg = {}
 --- @operator div(table): vim.lpeg.Capture
 --- @operator div(function): vim.lpeg.Capture
 --- @operator pow(number): vim.lpeg.Pattern
+--- @operator mod(function): nil
 local Pattern = {}
 
 --- @alias vim.lpeg.Capture vim.lpeg.Pattern
---- @operator add(vim.lpeg.Capture): vim.lpeg.Pattern
---- @operator mul(vim.lpeg.Capture): vim.lpeg.Pattern
---- @operator mul(vim.lpeg.Pattern): vim.lpeg.Pattern
---- @operator div(string): vim.lpeg.Capture
---- @operator div(number): vim.lpeg.Capture
---- @operator div(table): vim.lpeg.Capture
---- @operator div(function): vim.lpeg.Capture
---- @operator pow(number): vim.lpeg.Pattern
 
 --- Matches the given `pattern` against the `subject` string. If the match succeeds, returns the index in the
 --- subject of the first character after the match, or the captured values (if the pattern captured any value).
-- 
cgit 


From 4db77017fb7ab9321817674a5f5533df4cd03f3f Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sun, 24 Sep 2023 23:14:06 -0700
Subject: fix(meta): add nil return types to lpeg functions

---
 runtime/lua/vim/_meta/lpeg.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/lpeg.lua b/runtime/lua/vim/_meta/lpeg.lua
index 42e77aaaba..42c9a6449e 100644
--- a/runtime/lua/vim/_meta/lpeg.lua
+++ b/runtime/lua/vim/_meta/lpeg.lua
@@ -42,7 +42,7 @@ local Pattern = {}
 --- @param pattern vim.lpeg.Pattern
 --- @param subject string
 --- @param init? integer
---- @return integer|vim.lpeg.Capture
+--- @return integer|vim.lpeg.Capture|nil
 function vim.lpeg.match(pattern, subject, init) end
 
 --- Matches the given `pattern` against the `subject` string. If the match succeeds, returns the
@@ -64,7 +64,7 @@ function vim.lpeg.match(pattern, subject, init) end
 ---
 --- @param subject string
 --- @param init? integer
---- @return integer|vim.lpeg.Capture
+--- @return integer|vim.lpeg.Capture|nil
 function Pattern:match(subject, init) end
 
 --- Returns the string `"pattern"` if the given value is a pattern, otherwise `nil`.
-- 
cgit 


From f8ea49cfe1f4f3ed30da160d346553f0949ec1de Mon Sep 17 00:00:00 2001
From: glepnir <glephunter@gmail.com>
Date: Mon, 18 Sep 2023 14:50:27 +0800
Subject: fix(highlight): add force in nvim_set_hl

---
 runtime/doc/api.txt                   | 2 ++
 runtime/lua/vim/_meta/api.lua         | 2 ++
 runtime/lua/vim/_meta/api_keysets.lua | 1 +
 3 files changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index ffd90ec3d7..d30bb4851c 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1458,6 +1458,8 @@ nvim_set_hl({ns_id}, {name}, {*val})                           *nvim_set_hl()*
                  • cterm: cterm attribute map, like |highlight-args|. If not
                    set, cterm attributes will match those from the attribute
                    map documented above.
+                 • force: if true force update the highlight group when it
+                   exists.
 
 nvim_set_hl_ns({ns_id})                                     *nvim_set_hl_ns()*
     Set active namespace for highlights defined with |nvim_set_hl()|. This can
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 6573c68493..3822e5ff5b 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1857,6 +1857,8 @@ function vim.api.nvim_set_decoration_provider(ns_id, opts) end
 ---              • cterm: cterm attribute map, like `highlight-args`. If not
 ---                set, cterm attributes will match those from the attribute
 ---                map documented above.
+---              • force: if true force update the highlight group when it
+---                exists.
 function vim.api.nvim_set_hl(ns_id, name, val) end
 
 --- Set active namespace for highlights defined with `nvim_set_hl()`. This can
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index 4d08563ce2..349c68f8f9 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -164,6 +164,7 @@ error('Cannot require a meta file')
 --- @field blend? integer
 --- @field fg_indexed? boolean
 --- @field bg_indexed? boolean
+--- @field force? boolean
 
 --- @class vim.api.keyset.highlight_cterm
 --- @field bold? boolean
-- 
cgit 


From bc6fc0123d2f02b1f209cbec740665033fbb5892 Mon Sep 17 00:00:00 2001
From: Leonardo Mello <lsvmello@gmail.com>
Date: Tue, 26 Sep 2023 10:31:35 -0300
Subject: fix(tutor): Tutor steps don't work on Windows #25251

Problem:
Some steps in :Tutor don't work on Windows.

Solution:
Add support for `{unix:...,win:...}` format and transform the Tutor contents
depending on the platform.
Fix https://github.com/neovim/neovim/issues/24166
---
 runtime/autoload/tutor.vim             | 10 ++++++++++
 runtime/tutor/en/vim-01-beginner.tutor | 18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/tutor.vim b/runtime/autoload/tutor.vim
index 80c09488d5..701be28ccc 100644
--- a/runtime/autoload/tutor.vim
+++ b/runtime/autoload/tutor.vim
@@ -220,6 +220,7 @@ function! tutor#TutorCmd(tutor_name)
 
     call tutor#SetupVim()
     exe "edit ".l:to_open
+    call tutor#ApplyTransform()
 endfunction
 
 function! tutor#TutorCmdComplete(lead,line,pos)
@@ -227,3 +228,12 @@ function! tutor#TutorCmdComplete(lead,line,pos)
     let l:names = uniq(sort(map(l:tutors, 'fnamemodify(v:val, ":t:r")'), 's:Sort'))
     return join(l:names, "\n")
 endfunction
+
+function! tutor#ApplyTransform()
+    if has('win32')        
+        sil! %s/{unix:(\(.\{-}\)),win:(\(.\{-}\))}/\2/g
+    else
+        sil! %s/{unix:(\(.\{-}\)),win:(\(.\{-}\))}/\1/g
+    endif
+    normal! gg0
+endfunction
diff --git a/runtime/tutor/en/vim-01-beginner.tutor b/runtime/tutor/en/vim-01-beginner.tutor
index 71b196d189..2824f7ae83 100644
--- a/runtime/tutor/en/vim-01-beginner.tutor
+++ b/runtime/tutor/en/vim-01-beginner.tutor
@@ -629,7 +629,7 @@ NOTE: All `:`{vim} commands are executed when you press `<Enter>`{normal}.
 
 ** To save the changes made to the text, type `:w`{vim} FILENAME. **
 
- 1. Type `:!ls`{vim} to get a listing of your directory.
+ 1. Type `:!{unix:(ls),win:(dir)}`{vim} to get a listing of your directory.
     You already know you must hit `<Enter>`{normal} after this.
 
  2. Choose a filename that does not exist yet, such as TEST.
@@ -641,14 +641,14 @@ NOTE: All `:`{vim} commands are executed when you press `<Enter>`{normal}.
    (where TEST is the filename you chose.)
 
  4. This saves the current file under the name TEST.
-    To verify this, type `:!ls`{vim} again to see your directory.
+    To verify this, type `:!{unix:(ls),win:(dir)}`{vim} again to see your directory.
 
 NOTE: If you were to exit Neovim and start it again with `nvim TEST`, the file
       would be an exact copy of the tutorial when you saved it.
 
  5. Now remove the file by typing:
 ~~~ cmd
-        :!rm TEST
+        :!{unix:(rm),win:(del)} TEST
 ~~~
 # Lesson 5.3: SELECTING TEXT TO WRITE
 
@@ -675,7 +675,7 @@ NOTE: If you were to exit Neovim and start it again with `nvim TEST`, the file
 
     before you press `<Enter>`{normal}.
 
- 5. Neovim will write the selected lines to the file TEST. Use `:!ls`{vim} to see it.
+ 5. Neovim will write the selected lines to the file TEST. Use `:!{unix:(ls),win:(dir)}`{vim} to see it.
     Do not remove it yet! We will use it in the next lesson.
 
 NOTE: Pressing [v](v) starts [Visual selection](visual-mode). You can move the cursor around to
@@ -703,7 +703,7 @@ NOTE:  After executing Step 2 you will see text from Lesson 5.3. Then move
 
 NOTE: You can also read the output of an external command. For example,
 
-        `:r !ls`{vim}
+        `:r !{unix:(ls),win:(dir)}`{vim}
 
       reads the output of the `ls` command and puts it below the cursor.
 
@@ -712,8 +712,8 @@ NOTE: You can also read the output of an external command. For example,
  1. [:!command](:!cmd) executes an external command.
 
      Some useful examples are:
-     `:!ls`{vim}                    - shows a directory listing
-     `:!rm FILENAME`{vim}           - removes file FILENAME
+     `:!{unix:(ls ),win:(dir)}`{vim}                   - shows a directory listing
+     `:!{unix:(rm ),win:(del)} FILENAME`{vim}          - removes file FILENAME
 
  2. [:w](:w) FILENAME              writes the current Neovim file to disk with
                              name FILENAME.
@@ -724,7 +724,7 @@ NOTE: You can also read the output of an external command. For example,
  4. [:r](:r) FILENAME              retrieves disk file FILENAME and puts it
                              below the cursor position.
 
- 5. [:r !dir](:r!)                  reads the output of the dir command and
+ 5. {unix:([:r !ls](:r!) ),win:([:r !dir](:r!))}                  reads the output of the {unix:(ls),win:(dir)} command and
                              puts it below the cursor position.
 
 # Lesson 6.1: THE OPEN COMMAND
@@ -928,7 +928,7 @@ To start using more features create an "init.vim" file.
 
 ** Command line completion with `<C-d>`{normal} and `<Tab>`{normal}. **
 
- 1. List the contents of the current directory: `:!ls`{vim}
+ 1. List the contents of the current directory: `:!{unix:(ls),win:(dir)}`{vim}
 
  2. Type the start of a command: `:e`{vim}
 
-- 
cgit 


From de9348978999aa78f8351b5f55930bb109e742f7 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 26 Sep 2023 06:41:53 -0700
Subject: refactor(tutor): cleanup

---
 runtime/autoload/tutor.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/autoload/tutor.vim b/runtime/autoload/tutor.vim
index 701be28ccc..a546f7007e 100644
--- a/runtime/autoload/tutor.vim
+++ b/runtime/autoload/tutor.vim
@@ -230,7 +230,7 @@ function! tutor#TutorCmdComplete(lead,line,pos)
 endfunction
 
 function! tutor#ApplyTransform()
-    if has('win32')        
+    if has('win32')
         sil! %s/{unix:(\(.\{-}\)),win:(\(.\{-}\))}/\2/g
     else
         sil! %s/{unix:(\(.\{-}\)),win:(\(.\{-}\))}/\1/g
-- 
cgit 


From a66b0fdfaa35715c832b98b8941cc5673505e0c2 Mon Sep 17 00:00:00 2001
From: Rory Nesbitt <ranesbitt@live.co.uk>
Date: Wed, 27 Sep 2023 18:09:55 +0100
Subject: feat: NVIM_APPNAME supports relative paths #25233

Problem:
NVIM_APPNAME does not allow path separators in the name, so relative
paths can't be used:

    NVIM_APPNAME="neovim-configs/first-config" nvim
    NVIM_APPNAME="neovim-configs/second-config" nvim

Solution:
Let NVIM_APPNAME be a relative path. Absolute paths are not supported.

fix #23056
fix #24966
---
 runtime/doc/news.txt     |  2 ++
 runtime/doc/starting.txt | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 05a2d35f9a..ff0ccfb08f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -169,6 +169,8 @@ The following new APIs and features were added.
 • |vim.lsp.util.locations_to_items()| sets the `user_data` of each item to the
   original LSP `Location` or `LocationLink`.
 
+• |$NVIM_APPNAME| can be set to a relative path instead of only a name.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 17d5b4668d..d38712b067 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1366,6 +1366,9 @@ The $XDG_CONFIG_HOME, $XDG_DATA_HOME, $XDG_RUNTIME_DIR, $XDG_STATE_HOME,
 $XDG_CACHE_HOME, $XDG_CONFIG_DIRS and $XDG_DATA_DIRS environment variables
 are used if defined, else default values (listed below) are used.
 
+Throughout the help pages these defaults are used as placeholders, e.g.
+"~/.config" is understood to mean "$XDG_CONFIG_HOME or ~/.config".
+
 CONFIG DIRECTORY (DEFAULT) ~
                   *$XDG_CONFIG_HOME*            Nvim: stdpath("config")
     Unix:         ~/.config                   ~/.config/nvim
@@ -1392,10 +1395,12 @@ CACHE DIRECTORY (DEFAULT) ~
     Windows:      ~/AppData/Local/Temp        ~/AppData/Local/Temp/nvim-data
 
 LOG FILE (DEFAULT) ~
-                  `$NVIM_LOG_FILE`              Nvim: stdpath("log")
+                  `$NVIM_LOG_FILE`              Nvim: stdpath("log")/log
     Unix:         ~/.local/state/nvim         ~/.local/state/nvim/log
     Windows:      ~/AppData/Local/nvim-data   ~/AppData/Local/nvim-data/log
 
+Note that stdpath("log") is currently an alias for stdpath("state").
+
 ADDITIONAL CONFIGS DIRECTORY (DEFAULT) ~
                   *$XDG_CONFIG_DIRS*            Nvim: stdpath("config_dirs")
     Unix:         /etc/xdg/                   /etc/xdg/nvim
@@ -1407,18 +1412,14 @@ ADDITIONAL DATA DIRECTORY (DEFAULT) ~
                   /usr/share                  /usr/share/nvim
     Windows:      Not applicable              Not applicable
 
-Note: Throughout the help pages these defaults are used as placeholders, e.g.
-"~/.config" is understood to mean "$XDG_CONFIG_HOME or ~/.config".
-
-Note: The log file directory is controlled by `$XDG_STATE_HOME`.
-
 NVIM_APPNAME					*$NVIM_APPNAME*
 The standard directories can be further configured by the `$NVIM_APPNAME`
 environment variable. This variable controls the sub-directory that Nvim will
 read from (and auto-create) in each of the base directories. For example,
 setting `$NVIM_APPNAME` to "foo" before starting will cause Nvim to look for
 configuration files in `$XDG_CONFIG_HOME/foo` instead of
-`$XDG_CONFIG_HOME/nvim`.
+`$XDG_CONFIG_HOME/nvim`. `$NVIM_APPNAME` must be a name, such as "foo", or a
+relative path, such as "foo/bar".
 
 One use-case for $NVIM_APPNAME is to "isolate" Nvim applications.
 Alternatively, for true isolation, on Linux you can use cgroups namespaces: >
-- 
cgit 


From 555f492ec66ed51aaeddd54eb8a476a95a4d90b3 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 27 Sep 2023 19:29:05 +0200
Subject: vim-patch:347459423903

runtime(rmd) Update ftplugin and syntax files (vim/vim#13193)

ftplugin/rmd.vim:

  - Set 'commentstring' dynamically according to code region.

syntax/rmd.vim:

  - Include syntax highlighting of fenced languages dynamically.
  - Add conceal char for line break.

https://github.com/vim/vim/commit/34745942390383ec626b168e9837d284622c7bbe

Co-authored-by: Jakson Alves de Aquino <jalvesaq@gmail.com>
---
 runtime/ftplugin/rmd.vim | 18 ++++++----
 runtime/syntax/rmd.vim   | 93 +++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 85 insertions(+), 26 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim
index be6ab7335b..a407c236dd 100644
--- a/runtime/ftplugin/rmd.vim
+++ b/runtime/ftplugin/rmd.vim
@@ -2,7 +2,7 @@
 " Language: R Markdown file
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Mon Feb 27, 2023  07:15PM
+" Last Change:	Mon May 29, 2023  06:31AM
 " Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann)
 
 " Only do this when not yet done for this buffer
@@ -32,12 +32,18 @@ function FormatRmd()
   return 1
 endfunction
 
+let s:last_line = 0
 function SetRmdCommentStr()
-    if (search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")) || ((search('^---$', 'Wn') || search('^\.\.\.$', 'Wn')) && search('^---$', 'bnW'))
-        set commentstring=#\ %s
-    else
-        set commentstring=<!--\ %s\ -->
-    endif
+  if line('.') == s:last_line
+    return
+  endif
+  let s:last_line = line('.')
+
+  if (search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")) || ((search('^---$', 'Wn') || search('^\.\.\.$', 'Wn')) && search('^---$', 'bnW'))
+    set commentstring=#\ %s
+  else
+    set commentstring=<!--\ %s\ -->
+  endif
 endfunction
 
 " If you do not want both 'comments' and 'commentstring' dynamically defined,
diff --git a/runtime/syntax/rmd.vim b/runtime/syntax/rmd.vim
index 0eab0e6fab..93343dd729 100644
--- a/runtime/syntax/rmd.vim
+++ b/runtime/syntax/rmd.vim
@@ -1,7 +1,7 @@
 " Language: Markdown with chunks of R, Python and other languages
 " Maintainer: Jakson Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change: Fri Feb 24, 2023  08:28AM
+" Last Change: Wed May 17, 2023  06:34AM
 "
 "   For highlighting pandoc extensions to markdown like citations and TeX and
 "   many other advanced features like folding of markdown sections, it is
@@ -26,6 +26,8 @@ let g:rmd_syn_hl_chunk = get(g:, 'rmd_syn_hl_chunk', 0)
 let s:save_pandoc_lngs = get(g:, 'pandoc#syntax#codeblocks#embeds#langs', [])
 let g:pandoc#syntax#codeblocks#embeds#langs = []
 
+let g:rmd_dynamic_fenced_languages = get(g:, 'rmd_dynamic_fenced_languages', v:true)
+
 " Step_1: Source pandoc.vim if it is installed:
 runtime syntax/pandoc.vim
 if exists("b:current_syntax")
@@ -95,6 +97,11 @@ else
     hi def link yamlColonError Error
   endif
 
+  " Conceal char for manual line break
+  if &encoding ==# 'utf-8'
+    syn match rmdNewLine '  $' conceal cchar=↵
+  endif
+
   " You don't need this if either your markdown/syntax.vim already highlights
   " citations or you are writing standard markdown
   if g:rmd_syn_hl_citations
@@ -127,32 +134,78 @@ syn match knitrBodyValue ': \zs.*\ze$' keepend contained containedin=knitrBodyOp
 syn match knitrBodyVar '| \zs\S\{-}\ze:' contained containedin=knitrBodyOptions
 
 let g:rmd_fenced_languages = get(g:, 'rmd_fenced_languages', ['r'])
-for s:type in g:rmd_fenced_languages
-  if s:type =~ '='
-    let s:ft = substitute(s:type, '.*=', '', '')
-    let s:nm = substitute(s:type, '=.*', '', '')
+
+let s:no_syntax_vim = []
+function IncludeLanguage(lng)
+  if a:lng =~ '='
+    let ftpy = substitute(a:lng, '.*=', '', '')
+    let lnm = substitute(a:lng, '=.*', '', '')
   else
-    let s:ft = s:type
-    let s:nm  = s:type
+    let ftpy = a:lng
+    let lnm  = a:lng
+  endif
+  if index(s:no_syntax_vim, ftpy) >= 0
+    return
   endif
-  unlet! b:current_syntax
-  exe 'syn include @Rmd'.s:nm.' syntax/'.s:ft.'.vim'
-  if g:rmd_syn_hl_chunk
-    exe 'syn match knitrChunkDelim /```\s*{\s*'.s:nm.'/ contained containedin=knitrChunkBrace contains=knitrChunkLabel'
-    exe 'syn match knitrChunkLabelDelim /```\s*{\s*'.s:nm.',\=\s*[-[:alnum:]]\{-1,}[,}]/ contained containedin=knitrChunkBrace'
-    syn match knitrChunkDelim /}\s*$/ contained containedin=knitrChunkBrace
-    exe 'syn match knitrChunkBrace /```\s*{\s*'.s:nm.'.*$/ contained containedin=rmd'.s:nm.'Chunk contains=knitrChunkDelim,knitrChunkLabelDelim,@Rmd'.s:nm
-    exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*=\?'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=knitrChunkBrace,@Rmd'.s:nm
-
-    hi link knitrChunkLabel Identifier
-    hi link knitrChunkDelim rmdCodeDelim
-    hi link knitrChunkLabelDelim rmdCodeDelim
+  if len(globpath(&rtp, "syntax/" . ftpy . ".vim"))
+    unlet! b:current_syntax
+    exe 'syn include @Rmd'.lnm.' syntax/'.ftpy.'.vim'
+    let b:current_syntax = "rmd"
+    if g:rmd_syn_hl_chunk
+      exe 'syn match knitrChunkDelim /```\s*{\s*'.lnm.'/ contained containedin=knitrChunkBrace contains=knitrChunkLabel'
+      exe 'syn match knitrChunkLabelDelim /```\s*{\s*'.lnm.',\=\s*[-[:alnum:]]\{-1,}[,}]/ contained containedin=knitrChunkBrace'
+      syn match knitrChunkDelim /}\s*$/ contained containedin=knitrChunkBrace
+      exe 'syn match knitrChunkBrace /```\s*{\s*'.lnm.'.*$/ contained containedin=rmd'.lnm.'Chunk contains=knitrChunkDelim,knitrChunkLabelDelim,@Rmd'.lnm
+      exe 'syn region rmd'.lnm.'Chunk start="^\s*```\s*{\s*=\?'.lnm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=knitrChunkBrace,@Rmd'.lnm
+
+      hi link knitrChunkLabel Identifier
+      hi link knitrChunkDelim rmdCodeDelim
+      hi link knitrChunkLabelDelim rmdCodeDelim
+    else
+      exe 'syn region rmd'.lnm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*=\?'.lnm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@Rmd'.lnm
+    endif
   else
-    exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*=\?'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@Rmd'.s:nm
+    " Avoid the cost of running globpath() whenever the buffer is saved
+    let s:no_syntax_vim += [ftpy]
   endif
+endfunction
+
+for s:type in g:rmd_fenced_languages
+  call IncludeLanguage(s:type)
 endfor
 unlet! s:type
 
+function CheckRmdFencedLanguages()
+  let alines = getline(1, '$')
+  call filter(alines, "v:val =~ '^```{'")
+  call map(alines, "substitute(v:val, '^```{', '', '')")
+  call map(alines, "substitute(v:val, '\\W.*', '', '')")
+  for tpy in alines
+    if len(tpy) == 0
+      continue
+    endif
+    let has_lng = 0
+    for lng in g:rmd_fenced_languages
+      if tpy == lng
+        let has_lng = 1
+        continue
+      endif
+    endfor
+    if has_lng == 0
+      let g:rmd_fenced_languages += [tpy]
+      call IncludeLanguage(tpy)
+    endif
+  endfor
+endfunction
+
+if g:rmd_dynamic_fenced_languages
+  call CheckRmdFencedLanguages()
+  augroup RmdSyntax
+    autocmd!
+    autocmd BufWritePost <buffer> call CheckRmdFencedLanguages()
+  augroup END
+endif
+
 " Step_4: Highlight code recognized by pandoc but not defined in pandoc.vim yet:
 syn match pandocDivBegin '^:::\+ {.\{-}}' contains=pandocHeaderAttr
 syn match pandocDivEnd '^:::\+$'
-- 
cgit 


From af1df3cb782cf451d82ca18172bb943104581ec1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 27 Sep 2023 19:29:38 +0200
Subject: vim-patch:02774f99cebc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(i3config): update i3config syntax (vim/vim#13191)

https://github.com/vim/vim/commit/02774f99cebcb890d3861febc1d03e75c02cc92d

Co-authored-by: Josef Litoš <54900518+JosefLitos@users.noreply.github.com>
---
 runtime/syntax/i3config.vim | 166 +++++++++++++++++++++-----------------------
 1 file changed, 78 insertions(+), 88 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/i3config.vim b/runtime/syntax/i3config.vim
index 8bc2a6e03c..3b4765153a 100644
--- a/runtime/syntax/i3config.vim
+++ b/runtime/syntax/i3config.vim
@@ -1,10 +1,9 @@
 " Vim syntax file
 " Language: i3 config file
-" Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
+" Original Author: Josef Litos (JosefLitos/i3config.vim)
 " Maintainer: Quentin Hibon (github user hiqua)
-" Version: 0.4.22
-" Reference version (JosefLitos/i3config.vim): 4.22
-" Last Change: 2023-09-12
+" Version: 1.0.0
+" Last Change: 2023-09-14
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -25,18 +24,18 @@ syn match i3ConfigError /.\+/
 syn keyword i3ConfigTodo TODO FIXME XXX contained
 
 " Helper type definitions
-syn match i3ConfigSeparator /[,;]/ contained
+syn match i3ConfigSeparator /[,;\\]/ contained
 syn match i3ConfigParen /[{}]/ contained
 syn keyword i3ConfigBoolean yes no enabled disabled on off true false contained
-syn region i3ConfigString start=/\W\@<="/ skip=/\\"/ end=/"/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable,i3ConfigExecAction keepend extend
-syn region i3ConfigString start=/\W\@<='/ end=/'/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable,i3ConfigExecAction keepend extend
-syn match i3ConfigColor /#\w\{3,8}/ contained
-syn match i3ConfigNumber /[a-zA-Z_$-]\@<!-\?\d\+\w\@!/ contained
+syn region i3ConfigString start=/\W\@<="/ skip=/\\\("\|$\)/ end=/"\|$/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable,i3ConfigExecAction keepend extend
+syn region i3ConfigString start=/\W\@<='/ skip=/\\$/ end=/'\|$/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable,i3ConfigExecAction keepend extend
+syn match i3ConfigColor /#[0-9A-Fa-f]\{3,8}/ contained
+syn match i3ConfigNumber /[0-9A-Za-z_$-]\@<!-\?\d\+\w\@!/ contained
 
 " 4.1 Include directive
 syn keyword i3ConfigIncludeKeyword include contained
-syn match i3ConfigIncludeCommand /`[^`]*`/ contained contains=i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper,i3ConfigShCommand
-syn match i3ConfigInclude /^include .*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable,i3ConfigIncludeCommand
+syn match i3ConfigIncludeCommand /`[^`]*`/ contained contains=i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper,i3ConfigShCommand,i3ConfigString
+syn match i3ConfigParamLine /^include .*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable,i3ConfigIncludeCommand,i3ConfigShOper
 
 " 4.2 Comments
 syn match i3ConfigComment /^\s*#.*$/ contains=i3ConfigTodo
@@ -45,23 +44,23 @@ syn match i3ConfigComment /^\s*#.*$/ contains=i3ConfigTodo
 syn keyword i3ConfigFontKeyword font contained
 syn match i3ConfigColonOperator /:/ contained
 syn match i3ConfigFontNamespace /\w\+:/ contained contains=i3ConfigColonOperator
-syn match i3ConfigFontSize /\s\=\d\+\(px\)\?\s\?$/ contained
+syn match i3ConfigFontSize / \d\+\(px\)\?\s\?$/ contained
 syn region i3ConfigFont start=/^\s*font / skip=/\\$/ end=/$/ contains=i3ConfigFontKeyword,i3ConfigFontNamespace,i3ConfigFontSize,i3ConfigSeparator keepend
 
 " 4.4-4.5 Keyboard/Mouse bindings
 syn keyword i3ConfigBindKeyword bindsym bindcode contained
 syn match i3ConfigBindArgument /--\(release\|border\|whole-window\|exclude-titlebar\)/ contained
 syn match i3ConfigBindModifier /+/ contained
-syn match i3ConfigBindModkey /Ctrl\|Shift\|Mod[1-5]/ contained
-syn match i3ConfigBindCombo /[$a-zA-Z0-9_+]\+ / contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey
-syn match i3ConfigBindComboLine /bind\(sym\|code\)\( --[a-z-]\+\)* [$a-zA-Z0-9_+]\+ / contained contains=i3ConfigBindKeyword,i3ConfigBindArgument,i3ConfigBindCombo
+syn keyword i3ConfigBindModkey Ctrl Shift Mod1 Mod2 Mod3 Mod4 Mod5 contained
+syn match i3ConfigBindCombo /[$0-9A-Za-z_+]\+ / contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey
+syn match i3ConfigBindComboLine /bind\(sym\|code\)\( --[a-z-]\+\)* [$0-9A-Za-z_+]\+ / contained contains=i3ConfigBindKeyword,i3ConfigBindArgument,i3ConfigBindCombo
 syn region i3ConfigBind start=/^\s*bind\(sym\|code\) / skip=/\\$/ end=/$/ contains=i3ConfigBindComboLine,i3ConfigCriteria,i3ConfigAction,i3ConfigSeparator,i3ConfigActionKeyword,i3ConfigOption,i3ConfigString,i3ConfigNumber,i3ConfigVariable,i3ConfigBoolean keepend
 
 " 4.6 Binding modes
 syn region i3ConfigKeyword start=/^mode\( --pango_markup\)\? \([^'" {]\+\|'[^']\+'\|".\+"\)\s\+{$/ end=/^\s*}$/ contains=i3ConfigShParam,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigNumber,i3ConfigParen,i3ConfigVariable fold keepend extend
 
 " 4.7 Floating modifier
-syn match i3ConfigKeyword /^floating_modifier [$a-zA-Z0-9+]\+$/ contains=i3ConfigVariable,i3ConfigBindModkey
+syn match i3ConfigKeyword /^floating_modifier [$0-9A-Za-z]*$/ contains=i3ConfigVariable,i3ConfigBindModkey
 
 " 4.8 Floating window size
 syn keyword i3ConfigSizeSpecial x contained
@@ -86,47 +85,46 @@ syn match i3ConfigKeyword /^default\(_floating\)\?_border .*$/ contains=i3Config
 
 " 4.13 Hide edge borders
 syn keyword i3ConfigEdgeOpts none vertical horizontal both smart smart_no_gaps contained
-syn match i3ConfigKeyword /^hide_edge_borders \w\+$/ contains=i3ConfigEdgeOpts
+syn match i3ConfigKeyword /^hide_edge_borders \w*$/ contains=i3ConfigEdgeOpts
 
 " 4.14 Smart Borders
 syn keyword i3ConfigSmartBorderOpts no_gaps contained
 syn match i3ConfigKeyword /^smart_borders \(on\|off\|no_gaps\)$/ contains=i3ConfigSmartBorderOpts,i3ConfigBoolean
 
 " 4.15 Arbitrary commands
-syn keyword i3ConfigForWindowKeyword for_window contained
-syn region i3ConfigForWindow start=/^for_window / end=/$/ contains=i3ConfigForWindowKeyword,i3ConfigCriteria keepend
+syn region i3ConfigKeyword start=/^for_window / end=/$/ contains=i3ConfigForWindowKeyword,i3ConfigCriteria keepend
 
 " 4.16 No opening focus
 syn match i3ConfigKeyword /^no_focus .*$/ contains=i3ConfigCondition
 
 " 4.17 Variables
-syn match i3ConfigVariable /\$[A-Z0-9a-z_:|[\]-]\+/
+syn match i3ConfigVariable /\$[0-9A-Za-z_:|[\]-]\+/
 syn keyword i3ConfigSetKeyword set contained
-syn match i3ConfigSet /^set \$.*$/ contains=i3ConfigVariable,i3ConfigSetKeyword,i3ConfigColor,i3ConfigString,i3ConfigNoStartupId,i3ConfigNumber,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper
+syn match i3ConfigSet /^set \$.*$/ contains=i3ConfigSetKeyword,i3ConfigVariable,i3ConfigColor,i3ConfigString,i3ConfigNumber,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper,i3ConfigBindModkey
 
 " 4.18 X resources
 syn keyword i3ConfigResourceKeyword set_from_resource contained
-syn match i3ConfigResource /^set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigCondition,i3ConfigColor,i3ConfigVariable,i3ConfigString,i3ConfigNumber
+syn match i3ConfigParamLine /^set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigCondition,i3ConfigColor,i3ConfigVariable,i3ConfigString,i3ConfigNumber
 
 " 4.19 Assign clients to workspaces
 syn keyword i3ConfigAssignKeyword assign contained
-syn match i3ConfigAssignSpecial /→/ contained
+syn match i3ConfigAssignSpecial /→\|number/ contained
 syn match i3ConfigAssign /^assign .*$/ contains=i3ConfigAssignKeyword,i3ConfigAssignSpecial,i3ConfigCondition,i3ConfigVariable,i3ConfigString,i3ConfigNumber
 
 " 4.20 Executing shell commands
 syn keyword i3ConfigExecKeyword exec contained
 syn keyword i3ConfigExecAlwaysKeyword exec_always contained
 syn match i3ConfigShCmdDelim /\$(/ contained
-syn region i3ConfigShCommand start=/\$(/ end=/)/ contained contains=i3ConfigShCmdDelim,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigString,i3ConfigNumber,i3ConfigVariable keepend extend
+syn region i3ConfigShCommand start=/\$(/ end=/)/ contained contains=i3ConfigShCmdDelim,i3ConfigExecAction,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigString,i3ConfigNumber,i3ConfigVariable keepend extend
 syn match  i3ConfigShDelim /[[\]{}();`]\+/ contained
 syn match  i3ConfigShOper /[<>&|+=~^*!.?]\+/ contained
-syn match i3ConfigShParam /\<-[a-zA-Z0-9_-]\+\>/ contained containedin=i3ConfigVar
+syn match i3ConfigShParam /\<-[0-9A-Za-z_-]\+\>/ contained containedin=i3ConfigVar
 syn region i3ConfigExec start=/^\s*exec\(_always\)\?\( --no-startup-id\)\? [^{]/ skip=/\\$/ end=/$/ contains=i3ConfigExecKeyword,i3ConfigExecAlwaysKeyword,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigExecAction keepend
 
 " 4.21 Workspaces per output
 syn keyword i3ConfigWorkspaceKeyword workspace contained
 syn keyword i3ConfigWorkspaceOutput output contained
-syn keyword i3ConfigWorkspaceDir prev next back_and_forth contained
+syn keyword i3ConfigWorkspaceDir prev next back_and_forth number contained
 syn region i3ConfigWorkspaceLine start=/^workspace / skip=/\\$/ end=/$/ contains=i3ConfigWorkspaceKeyword,i3ConfigNumber,i3ConfigString,i3ConfigGaps,i3ConfigWorkspaceOutput,i3ConfigVariable,i3ConfigBoolean,i3ConfigSeparator keepend
 
 " 4.22 Changing colors
@@ -136,121 +134,126 @@ syn match i3ConfigKeyword /^client\..*$/ contains=i3ConfigDotOperator,i3ConfigCl
 
 " 4.23 Interprocess communication
 syn match i3ConfigIpcKeyword /ipc-socket/ contained
-syn match i3ConfigIpc /^ipc-socket .*$/ contains=i3ConfigIpcKeyword
+syn match i3ConfigParamLine /^ipc-socket .*$/ contains=i3ConfigIpcKeyword
 
 " 4.24 Focus follows mouse
 syn keyword i3ConfigFocusFollowsMouseOpts always contained
-syn match i3ConfigFocusFollowsMouse /^focus_follows_mouse \(yes\|no\|always\)$/ contains=i3ConfigBoolean,i3ConfigFocusFollowsMouseOpts
+syn match i3ConfigKeyword /^focus_follows_mouse \(yes\|no\|always\)$/ contains=i3ConfigBoolean,i3ConfigFocusFollowsMouseOpts
 
 " 4.25 Mouse warping
 syn keyword i3ConfigMouseWarpingOpts output container none contained
-syn match i3ConfigMouseWarping /^mouse_warping \w*$/ contains=i3ConfigMouseWarpingOpts
+syn match i3ConfigKeyword /^mouse_warping \w*$/ contains=i3ConfigMouseWarpingOpts
 
 " 4.26 Popups while fullscreen
 syn keyword i3ConfigPopupFullscreenOpts smart ignore leave_fullscreen contained
-syn match i3ConfigPopupFullscreen /^popup_during_fullscreen \w*$/ contains=i3ConfigPopupFullscreenOpts
+syn match i3ConfigKeyword /^popup_during_fullscreen \w*$/ contains=i3ConfigPopupFullscreenOpts
 
 " 4.27 Focus wrapping
 syn keyword i3ConfigFocusWrappingOpts force workspace contained
-syn match i3ConfigFocusWrapping /^focus_wrapping \(yes\|no\|force\|workspace\)$/ contains=i3ConfigBoolean,i3ConfigFocusWrappingOpts
+syn match i3ConfigKeyword /^focus_wrapping \(yes\|no\|force\|workspace\)$/ contains=i3ConfigBoolean,i3ConfigFocusWrappingOpts
 
 " 4.28 Forcing Xinerama
-syn match i3ConfigForceXinerama /^force_xinerama \(yes\|no\)$/ contains=i3ConfigBoolean
+syn match i3ConfigKeyword /^force_xinerama \(yes\|no\)$/ contains=i3ConfigBoolean
 
 " 4.29 Automatic workspace back-and-forth
-syn match i3ConfigAutomaticSwitch /^workspace_auto_back_and_forth \(yes\|no\)$/ contains=i3ConfigBoolean
+syn match i3ConfigKeyword /^workspace_auto_back_and_forth \(yes\|no\)$/ contains=i3ConfigBoolean
 
 " 4.30 Delay urgency hint
 syn keyword i3ConfigTimeUnit ms contained
-syn match i3ConfigDelayUrgency /^force_display_urgency_hint \d\+ ms$/ contains=i3ConfigBoolean,i3ConfigNumber,i3ConfigTimeUnit
+syn match i3ConfigKeyword /^force_display_urgency_hint \d\+\( ms\)\?$/ contains=i3ConfigNumber,i3ConfigTimeUnit
 
 " 4.31 Focus on window activation
 syn keyword i3ConfigFocusOnActivationOpts smart urgent focus none contained
-syn match i3ConfigFocusOnActivation /^focus_on_window_activation .*$/  contains=i3ConfigFocusOnActivationKeyword
+syn match i3ConfigKeyword /^focus_on_window_activation \w*$/  contains=i3ConfigFocusOnActivationOpts
 
 " 4.32 Show marks in title
 syn match i3ConfigShowMarks /^show_marks \(yes\|no\)$/ contains=i3ConfigBoolean
 
 " 4.34 Tiling drag
 syn keyword i3ConfigTilingDragOpts modifier titlebar contained
-syn match i3ConfigTilingDrag /^tiling_drag\( off\|\( modifier\| titlebar\)\{1,2\}\)$/ contains=i3ConfigTilingOpts,i3ConfigBoolean
+syn match i3ConfigKeyword /^tiling_drag\( off\|\( modifier\| titlebar\)\{1,2\}\)$/ contains=i3ConfigTilingDragOpts,i3ConfigBoolean
 
 " 4.35 Gaps
 syn keyword i3ConfigGapsOpts inner outer horizontal vertical left right top bottom current all set plus minus toggle contained
-syn region i3ConfigGaps start=/gaps/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigGapsOpts,i3ConfigNumber,i3ConfigVariable,i3ConfigSeparator keepend
-syn match i3ConfigGapStyleLine /^gaps .*$/ contains=i3ConfigGaps
+syn region i3ConfigGaps start=/gaps/ skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigGapsOpts,i3ConfigNumber,i3ConfigVariable,i3ConfigSeparator keepend
+syn match i3ConfigGapsLine /^gaps .*$/ contains=i3ConfigGaps
 syn keyword i3ConfigSmartGapOpts inverse_outer contained
-syn match i3ConfigSmartGap /^smart_gaps \(on\|off\|inverse_outer\)$/ contains=i3ConfigSmartGapOpts,i3ConfigBoolean
+syn match i3ConfigKeyword /^smart_gaps \(on\|off\|inverse_outer\)$/ contains=i3ConfigSmartGapOpts,i3ConfigBoolean
 
 " 5 Configuring bar
-syn match i3ConfigBarModifier /^\s\+modifier [^ ]\+$/ contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey
-syn keyword i3ConfigBarOpts bar i3bar_command status_command mode hidden_state id position output tray_output tray_padding font separator_symbol workspace_buttons workspace_min_width strip_workspace_numbers strip_workspace_name binding_mode_indicator padding contained
-syn region i3ConfigBarBlock start=/^bar {$/ end=/^}$/ contains=i3ConfigBarOpts,i3ConfigBarModifier,i3ConfigBind,i3ConfigString,i3ConfigComment,i3ConfigFont,i3ConfigBoolean,i3ConfigNumber,i3ConfigParen,i3ConfigColor,i3ConfigVariable,i3ConfigColorsBlock fold keepend extend
+syn match i3ConfigBarModifier /^\s\+modifier \S\+$/ contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey,i3ConfigBarOptVals
+syn keyword i3ConfigBarOpts bar i3bar_command status_command mode hidden_state id position output tray_output tray_padding separator_symbol workspace_buttons workspace_min_width strip_workspace_numbers strip_workspace_name binding_mode_indicator padding contained
+syn keyword i3ConfigBarOptVals dock hide invisible show none top bottom primary nonprimary contained
+syn region i3ConfigBarBlock start=/^bar {$/ end=/^}$/ contains=i3ConfigBarOpts,i3ConfigBarOptVals,i3ConfigBarModifier,i3ConfigBind,i3ConfigString,i3ConfigComment,i3ConfigFont,i3ConfigBoolean,i3ConfigNumber,i3ConfigParen,i3ConfigColor,i3ConfigVariable,i3ConfigColorsBlock,i3ConfigShOper,i3ConfigShCommand fold keepend extend
 
 " 5.16 Color block
+syn keyword i3ConfigColorsKeyword colors contained
 syn match i3ConfigColorsOpts /\(focused_\)\?\(background\|statusline\|separator\)\|\(focused\|active\|inactive\|urgent\)_workspace\|binding_mode/ contained
-syn region i3ConfigColorsBlock start=/^\s\+colors {$/ end=/^\s\+}$/ contained contains=i3ConfigColorsOpts,i3ConfigColor,i3ConfigVariable,i3ConfigComment,i3ConfigParen fold keepend extend
+syn region i3ConfigColorsBlock start=/^\s\+colors {$/ end=/^\s\+}$/ contained contains=i3ConfigColorsKeyword,i3ConfigColorsOpts,i3ConfigColor,i3ConfigVariable,i3ConfigComment,i3ConfigParen fold keepend extend
 
-" 6.0 Criteria-based commands
-syn match i3ConfigConditionProp /\w\+\(-\w\+\)*/ contained
-syn match i3ConfigConditionText /[^[ ]\+=/ contained contains=i3ConfigConditionProp,i3ConfigShOper
-syn keyword i3ConfigConditionFocused __focused__ contained
-syn region i3ConfigCondition start=/\[/ end=/\]/ contained contains=i3ConfigConditionText,i3ConfigShDelim,i3ConfigNumber,i3ConfigString,i3ConfigConditionFocused keepend extend
-syn region i3ConfigCriteria start=/\[/ skip=/\\$/ end=/\(;\|$\)/ contained contains=i3ConfigCondition,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigBoolean,i3ConfigNumber,i3ConfigVariable,i3ConfigSeparator keepend
+" 6.0 Command criteria
+syn keyword i3ConfigConditionProp class instance window_role window_type machine id title urgent workspace con_mark con_id floating_from tiling_from contained
+syn keyword i3ConfigConditionSpecial __focused__ all floating tiling contained
+syn region i3ConfigCondition start=/\[/ end=/\]/ contained contains=i3ConfigShDelim,i3ConfigConditionProp,i3ConfigShOper,i3ConfigConditionSpecial,i3ConfigNumber,i3ConfigString keepend extend
+syn region i3ConfigCriteria start=/\[/ skip=/\\$/ end=/\(;\|$\)/ contained contains=i3ConfigCondition,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigBoolean,i3ConfigNumber,i3ConfigVariable,i3ConfigSeparator keepend transparent
 
 " 6.1 Actions through shell
 syn match i3ConfigExecActionKeyword /i3-msg/ contained
-syn region i3ConfigExecAction start=/[a-z3-]\+msg '/ skip=/\\$\| '/ end=/'/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend extend
-syn region i3ConfigExecAction start=/[a-z3-]\+msg "/ skip=/\\$\| "/ end=/"/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend extend
-syn region i3ConfigExecAction start=/[a-z3-]\+msg\( ['"-]\)\@!/ skip=/\\$/ end=/\([&|;})'"]\|$\)/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend
+syn region i3ConfigExecAction start=/[a-z3-]\+msg "/ skip=/ "\|\\$/ end=/"\|$/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend extend
+syn region i3ConfigExecAction start=/[a-z3-]\+msg '/ skip=/ '\|\\$/ end=/'\|$/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend extend
+syn region i3ConfigExecAction start=/[a-z3-]\+msg ['"-]\@!/ skip=/\\$/ end=/[&|;})'"]\@=\|$/ contained contains=i3ConfigExecActionKeyword,i3ConfigShCommand,i3ConfigNumber,i3ConfigShOper,i3ConfigCriteria,i3ConfigAction,i3ConfigActionKeyword,i3ConfigOption,i3ConfigVariable keepend extend
 " 6.1 Executing applications (4.20)
-syn region i3ConfigAction start=/exec/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigExecKeyword,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigSeparator keepend
+syn region i3ConfigAction start=/exec/ skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigExecKeyword,i3ConfigExecAction,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigSeparator keepend
 
 " 6.3 Manipulating layout
 syn keyword i3ConfigLayoutKeyword layout contained
 syn keyword i3ConfigLayoutOpts default tabbed stacking splitv splith toggle split all contained
-syn region i3ConfigAction start=/layout/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigLayoutKeyword,i3ConfigLayoutOpts,i3ConfigSeparator keepend
+syn region i3ConfigAction start=/layout/ skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigLayoutKeyword,i3ConfigLayoutOpts,i3ConfigSeparator keepend transparent
 
 " 6.4 Focusing containers
 syn keyword i3ConfigFocusKeyword focus contained
 syn keyword i3ConfigFocusOpts left right up down parent child next prev sibling floating tiling mode_toggle contained
 syn keyword i3ConfigFocusOutputOpts left right down up current primary nonprimary next prev contained
-syn region i3ConfigFocusOutput start=/ output / skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigMoveType,i3ConfigWorkspaceOutput,i3ConfigFocusOutputOpts,i3ConfigString,i3ConfigNumber,i3ConfigSeparator keepend
+syn region i3ConfigFocusOutput start=/ output / skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigWorkspaceOutput,i3ConfigFocusOutputOpts,i3ConfigString,i3ConfigNumber,i3ConfigSeparator keepend
 syn match i3ConfigFocusOutputLine /^focus output .*$/ contains=i3ConfigFocusKeyword,i3ConfigFocusOutput
-syn region i3ConfigAction start=/focus/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigFocusKeyword,i3ConfigFocusOpts,i3ConfigFocusOutput,i3ConfigString,i3ConfigSeparator keepend
+syn region i3ConfigAction start=/focus/ skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigFocusKeyword,i3ConfigFocusOpts,i3ConfigFocusOutput,i3ConfigString,i3ConfigSeparator keepend transparent
 
 " 6.8 Focusing workspaces (4.21)
-syn region i3ConfigAction start=/workspace / skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigWorkspaceKeyword,i3ConfigWorkspaceDir,i3ConfigNumber,i3ConfigString,i3ConfigGaps,i3ConfigWorkspaceOutput,i3ConfigVariable,i3ConfigBoolean,i3ConfigSeparator keepend
+syn region i3ConfigAction start=/workspace / skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigWorkspaceKeyword,i3ConfigWorkspaceDir,i3ConfigNumber,i3ConfigString,i3ConfigGaps,i3ConfigWorkspaceOutput,i3ConfigVariable,i3ConfigBoolean,i3ConfigSeparator keepend transparent
 
-" 6.9-6.11 Moving containers
+" 6.8.2 Renaming workspaces
+syn keyword i3ConfigRenameKeyword rename contained
+syn region i3ConfigAction start=/rename workspace/ end=/[,;]\|$/ contained contains=i3ConfigRenameKeyword,i3ConfigMoveDir,i3ConfigMoveType,i3ConfigNumber,i3ConfigVariable,i3ConfigString keepend transparent
+
+" 6.5,6.9-6.11 Moving containers
 syn keyword i3ConfigMoveKeyword move contained
-syn keyword i3ConfigMoveDir left right down up position absolute center to contained
+syn keyword i3ConfigMoveDir left right down up position absolute center to current contained
 syn keyword i3ConfigMoveType window container workspace output mark mouse scratchpad contained
 syn match i3ConfigUnit / px\| ppt/ contained
-syn region i3ConfigAction start=/move/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigMoveKeyword,i3ConfigMoveDir,i3ConfigMoveType,i3ConfigWorkspaceDir,i3ConfigUnit,i3ConfigNumber,i3ConfigVariable,i3ConfigSeparator keepend
+syn region i3ConfigAction start=/move/ skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigMoveKeyword,i3ConfigMoveDir,i3ConfigMoveType,i3ConfigWorkspaceDir,i3ConfigUnit,i3ConfigNumber,i3ConfigVariable,i3ConfigString,i3ConfigSeparator,i3ConfigShParam keepend transparent
 
 " 6.12 Resizing containers/windows
 syn keyword i3ConfigResizeKeyword resize contained
 syn keyword i3ConfigResizeOpts grow shrink up down left right set width height or contained
-syn region i3ConfigAction start=/resize/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigResizeKeyword,i3ConfigResizeOpts,i3ConfigNumber,i3ConfigUnit,i3ConfigSeparator keepend
+syn region i3ConfigAction start=/resize/ skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigResizeKeyword,i3ConfigResizeOpts,i3ConfigNumber,i3ConfigUnit,i3ConfigSeparator keepend transparent
 
 " 6.14 VIM-like marks
-syn keyword i3ConfigMarkKeyword mark contained
-syn match i3ConfigMark /mark\( --\(add\|replace\)\( --toggle\)\?\)\?/ contained contains=i3ConfigMarkKeyword
-syn region i3ConfigAction start=/\<mark/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigMark,i3ConfigNumber,i3ConfigString,i3ConfigSeparator keepend
+syn match i3ConfigMark /mark\( --\(add\|replace\)\( --toggle\)\?\)\?/ contained contains=i3ConfigShParam
+syn region i3ConfigAction start=/\<mark/ skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigMark,i3ConfigNumber,i3ConfigString,i3ConfigSeparator keepend transparent
 
 " 6.24 Changing gaps (4.35)
-syn region i3ConfigAction start=/gaps/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=i3ConfigGaps keepend
+syn region i3ConfigAction start=/gaps/ skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigGaps keepend transparent
 
 " Commands useable in keybinds
-syn keyword i3ConfigActionKeyword mode append_layout kill open fullscreen sticky split floating swap rename unmark show_marks title_window_icon title_format border restart reload exit scratchpad nop bar contained
-syn keyword i3ConfigOption enable disable toggle key restore current horizontal vertical auto none normal pixel show container with id con_id contained
+syn keyword i3ConfigActionKeyword mode append_layout kill open fullscreen sticky split floating swap unmark show_marks title_window_icon title_format border restart reload exit scratchpad nop bar contained
+syn keyword i3ConfigOption default enable disable toggle key restore current horizontal vertical auto none normal pixel show container with id con_id padding hidden_state hide dock invisible contained
 
 " Define the highlighting.
 hi def link i3ConfigError                           Error
 hi def link i3ConfigTodo                            Todo
 hi def link i3ConfigKeyword                         Keyword
 hi def link i3ConfigCommand                         Statement
+hi def link i3ConfigParamLine                       i3ConfigString
 hi def link i3ConfigOperator                        Operator
 hi def link i3ConfigSeparator                       i3ConfigOperator
 hi def link i3ConfigParen                           Delimiter
@@ -259,7 +262,6 @@ hi def link i3ConfigString                          String
 hi def link i3ConfigColor                           Constant
 hi def link i3ConfigNumber                          Number
 hi def link i3ConfigIncludeKeyword                  i3ConfigKeyword
-hi def link i3ConfigInclude                         i3ConfigString
 hi def link i3ConfigComment                         Comment
 hi def link i3ConfigFontKeyword                     i3ConfigKeyword
 hi def link i3ConfigColonOperator                   i3ConfigOperator
@@ -278,11 +280,9 @@ hi def link i3ConfigTitleAlignOpts                  i3ConfigOption
 hi def link i3ConfigBorderOpts                      i3ConfigOption
 hi def link i3ConfigEdgeOpts                        i3ConfigOption
 hi def link i3ConfigSmartBorderOpts                 i3ConfigOption
-hi def link i3ConfigForWindowKeyword                i3ConfigKeyword
 hi def link i3ConfigVariable                        Variable
 hi def link i3ConfigSetKeyword                      i3ConfigKeyword
 hi def link i3ConfigResourceKeyword                 i3ConfigKeyword
-hi def link i3ConfigResource                        i3ConfigString
 hi def link i3ConfigAssignKeyword                   i3ConfigKeyword
 hi def link i3ConfigAssignSpecial                   i3ConfigOption
 hi def link i3ConfigExecKeyword                     i3ConfigCommand
@@ -293,39 +293,29 @@ hi def link i3ConfigShOper                          Operator
 hi def link i3ConfigShCmdDelim                      i3ConfigShDelim
 hi def link i3ConfigShCommand                       Normal
 hi def link i3ConfigWorkspaceKeyword                i3ConfigCommand
-hi def link i3ConfigWorkspaceOutput                 i3ConfigOption
+hi def link i3ConfigWorkspaceOutput                 i3ConfigMoveType
 hi def link i3ConfigWorkspaceDir                    i3ConfigOption
 hi def link i3ConfigDotOperator                     i3ConfigOperator
 hi def link i3ConfigClientOpts                      i3ConfigOption
 hi def link i3ConfigIpcKeyword                      i3ConfigKeyword
-hi def link i3ConfigIpc                             i3ConfigString
 hi def link i3ConfigFocusFollowsMouseOpts           i3ConfigOption
-hi def link i3ConfigFocusFollowsMouse               i3ConfigKeyword
 hi def link i3ConfigMouseWarpingOpts                i3ConfigOption
-hi def link i3ConfigMouseWarping                    i3ConfigKeyword
 hi def link i3ConfigPopupFullscreenOpts             i3ConfigOption
-hi def link i3ConfigPopupFullscreen                 i3ConfigKeyword
 hi def link i3ConfigFocusWrappingOpts               i3ConfigOption
-hi def link i3ConfigFocusWrapping                   i3ConfigKeyword
-hi def link i3ConfigForceXinerama                   i3ConfigKeyword
-hi def link i3ConfigAutomaticSwitch                 i3ConfigKeyword
 hi def link i3ConfigTimeUnit                        i3ConfigNumber
-hi def link i3ConfigDelayUrgency                    i3ConfigKeyword
 hi def link i3ConfigFocusOnActivationOpts           i3ConfigOption
-hi def link i3ConfigFocusOnActivation               i3ConfigKeyword
 hi def link i3ConfigShowMarks                       i3ConfigCommand
 hi def link i3ConfigTilingDragOpts                  i3ConfigOption
-hi def link i3ConfigTilingDrag                      i3ConfigKeyword
 hi def link i3ConfigGapsOpts                        i3ConfigOption
 hi def link i3ConfigGaps                            i3ConfigCommand
 hi def link i3ConfigSmartGapOpts                    i3ConfigOption
-hi def link i3ConfigSmartGap                        i3ConfigKeyword
 hi def link i3ConfigBarModifier                     i3ConfigKeyword
 hi def link i3ConfigBarOpts                         i3ConfigKeyword
+hi def link i3ConfigBarOptVals                      i3ConfigOption
+hi def link i3ConfigColorsKeyword                   i3ConfigKeyword
 hi def link i3ConfigColorsOpts                      i3ConfigOption
-hi def link i3ConfigColors                          i3ConfigKeyword
 hi def link i3ConfigConditionProp                   i3ConfigShParam
-hi def link i3ConfigConditionFocused                Constant
+hi def link i3ConfigConditionSpecial                Constant
 hi def link i3ConfigExecActionKeyword               i3ConfigShCommand
 hi def link i3ConfigExecAction                      i3ConfigString
 hi def link i3ConfigLayoutKeyword                   i3ConfigCommand
@@ -333,15 +323,15 @@ hi def link i3ConfigLayoutOpts                      i3ConfigOption
 hi def link i3ConfigFocusKeyword                    i3ConfigCommand
 hi def link i3ConfigFocusOpts                       i3ConfigOption
 hi def link i3ConfigFocusOutputOpts                 i3ConfigOption
+hi def link i3ConfigRenameKeyword                   i3ConfigCommand
 hi def link i3ConfigMoveKeyword                     i3ConfigCommand
 hi def link i3ConfigMoveDir                         i3ConfigOption
-hi def link i3ConfigMoveType                        i3ConfigOption
+hi def link i3ConfigMoveType                        Constant
 hi def link i3ConfigUnit                            i3ConfigNumber
 hi def link i3ConfigResizeKeyword                   i3ConfigCommand
 hi def link i3ConfigResizeOpts                      i3ConfigOption
-hi def link i3ConfigMarkKeyword                     i3ConfigCommand
-hi def link i3ConfigMark                            i3ConfigShParam
+hi def link i3ConfigMark                            i3ConfigCommand
 hi def link i3ConfigActionKeyword                   i3ConfigCommand
 hi def link i3ConfigOption                          Type
 
-let b:current_syntax = "i3config"
\ No newline at end of file
+let b:current_syntax = "i3config"
-- 
cgit 


From 1783023da7391bb4f66bd603af11b2192dddff3a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 27 Sep 2023 19:29:54 +0200
Subject: vim-patch:54f70cf0780a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(swayconfig): Update syntax file (vim/vim#13192)

https://github.com/vim/vim/commit/54f70cf0780a797efaf0ff9fd4190215a3ff0eb7

Co-authored-by: Josef Litoš <54900518+JosefLitos@users.noreply.github.com>
---
 runtime/syntax/swayconfig.vim | 128 +++++++++++++++++++++++++-----------------
 1 file changed, 75 insertions(+), 53 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/swayconfig.vim b/runtime/syntax/swayconfig.vim
index 290e8cc1ac..7b1c889d6d 100644
--- a/runtime/syntax/swayconfig.vim
+++ b/runtime/syntax/swayconfig.vim
@@ -1,10 +1,9 @@
 " Vim syntax file
-" Language: sway window manager config
-" Original Author: Josef Litos
+" Language: sway config file
+" Original Author: Josef Litos (JosefLitos/i3config.vim)
 " Maintainer: James Eapen <james.eapen@vai.org>
-" Version: 0.2.2
-" Reference version (JosefLitos/i3config.vim): 1.8.1
-" Last Change: 2023-09-12
+" Version: 1.0.0
+" Last Change: 2023-09-14
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -20,9 +19,12 @@ endif
 runtime! syntax/i3config.vim
 
 " i3 extensions
-syn match i3ConfigSet /^\s*set \$\w\+ .*$/ contains=i3ConfigVariable,i3ConfigSetKeyword,i3ConfigColor,i3ConfigString,i3ConfigNoStartupId,i3ConfigNumber,swayConfigOutputCommand,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper
+syn keyword i3ConfigActionKeyword opacity urgent shortcuts_inhibitor splitv splith splitt contained
+syn keyword i3ConfigOption set plus minus allow deny csd v h t contained
 
-syn keyword i3ConfigActionKeyword opacity contained
+syn keyword i3ConfigConditionProp app_id pid shell contained
+
+syn keyword i3ConfigWorkspaceDir prev_on_output next_on_output contained
 
 syn keyword swayConfigBindKeyword bindswitch bindgesture contained
 syn match i3ConfigBindArgument /--\(locked\|to-code\|no-repeat\|input-device=[:0-9a-zA-Z_/-]\+\|no-warn\)/ contained
@@ -31,6 +33,8 @@ syn region i3ConfigBind start=/^\s*bind\(switch\|gesture\) / skip=/\\$/ end=/$/
 syn match swayConfigBindBlockHeader /^\s*bind\(sym\|code\) .*{$/ contained contains=i3ConfigBindKeyword,i3ConfigBindArgument,i3ConfigParen
 syn match swayConfigBindBlockCombo /^\s\+\(--[a-z-]\+ \)*[$a-zA-Z0-9_+]\+ [a-z[]\@=/ contained contains=i3ConfigBindArgument,i3ConfigBindCombo
 syn region i3ConfigBind start=/^\s*bind\(sym\|code\) .*{$/ end=/^\s*}$/ contains=swayConfigBindBlockHeader,swayConfigBindBlockCombo,i3ConfigCriteria,i3ConfigAction,i3ConfigSeparator,i3ConfigActionKeyword,i3ConfigOption,i3ConfigString,i3ConfigNumber,i3ConfigVariable,i3ConfigBoolean,i3ConfigComment,i3ConfigParen fold keepend extend
+" fix for extra long bindsym blocks that would be parsed incorrectly when scrolling up
+syn region i3ConfigBlockOrphan start=/^\s\+\S/ skip=/^\s\|^$/ end=/^}\?/ contains=swayConfigBindBlockCombo,i3ConfigCriteria,i3ConfigAction,i3ConfigSeparator,i3ConfigActionKeyword,i3ConfigOption,i3ConfigString,i3ConfigNumber,i3ConfigVariable,i3ConfigBoolean,i3ConfigComment,i3ConfigParen keepend extend
 
 syn keyword i3ConfigClientOpts focused_tab_title contained
 
@@ -39,16 +43,22 @@ syn region swayConfigExecBlock start=/exec\(_always\)\? {/ end=/^}$/ contains=i3
 syn keyword swayConfigFloatingModifierOpts normal inverse contained
 syn match i3ConfigKeyword /^floating_modifier [$a-zA-Z0-9+]\+ \(normal\|inverse\)$/ contains=i3ConfigVariable,i3ConfigBindModkey,swayConfigFloatingModifierOpts
 
-syn match i3ConfigEdge /^hide_edge_borders\( --i3\)\? \(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=i3ConfigEdgeKeyword,i3ConfigShParam
+syn match i3ConfigKeyword /^hide_edge_borders --i3 \w*$/ contains=i3ConfigEdgeKeyword,i3ConfigShParam
 
-syn keyword i3ConfigBarBlockKeyword swaybar_command gaps height pango_markup status_edge_padding status_padding wrap_scroll tray_bindcode tray_bindsym icon_theme contained
+syn keyword i3ConfigBarOpts swaybar_command gaps height pango_markup status_edge_padding status_padding wrap_scroll tray_bindcode tray_bindsym icon_theme contained
+syn keyword i3ConfigBarOptVals overlay contained
 
 syn keyword i3ConfigExecActionKeyword swaymsg contained
 
 " Sway-only options
 " Xwayland
 syn keyword swayConfigXOpt enable disable force contained
-syn match i3ConfigKeyword /^xwayland .*$/ contains=swayConfigXOpt
+syn match i3ConfigKeyword /^xwayland \w*$/ contains=swayConfigXOpt
+
+" Inhibit idle
+syn keyword swayConfigInhibitKeyword inhibit_idle contained
+syn keyword swayConfigInhibitOpts focus fullscreen open none visible contained
+syn match i3ConfigAction /inhibit_idle \w*/ contained contains=swayConfigInhibitKeyword,swayConfigInhibitOpts
 
 " Bindswitch
 syn match swayConfigBindswitchArgument /--\(locked\|no-warn\|reload\)/ contained
@@ -64,65 +74,77 @@ syn keyword swayConfigBindgestureDir up down left right inward outward clockwise
 syn match swayConfigBindgesture /\(hold\(:[1-5]\)\?\|swipe\(:[3-5]\)\?\(:up\|:down\|:left\|:right\)\?\|pinch\(:[2-5]\)\?:\(+\?\(inward\|outward\|clockwise\|counterclockwise\|up\|down\|left\|right\)\)\+\) / contained contains=i3ConfigNumber,swayConfigBindgestureType,i3ConfigColonOperator,swayConfigBindgestureDir,i3ConfigBindModifier
 syn region i3ConfigBind start=/^\s*bindgesture\s\+.*{$/ end=/^\s*}$/ contains=swayConfigBindKeyword,swayConfigBindgesture,swayConfigBindgestureArgument,i3ConfigCriteria,i3ConfigAction,i3ConfigSeparator,i3ConfigActionKeyword,i3ConfigOption,i3ConfigString,i3ConfigNumber,i3ConfigVariable,i3ConfigBoolean,i3ConfigParen fold keepend extend
 
+" Tiling drag threshold
+syn match i3ConfigKeyword /^tiling_drag_threshold \d\+$/ contains=i3ConfigNumber
+
 " Titlebar commands
 syn match i3ConfigKeyword /^titlebar_border_thickness \(\d\+\|\$\S\+\)$/ contains=i3ConfigNumber,i3ConfigVariable
 syn match i3ConfigKeyword /^titlebar_padding \(\d\+\|\$\S\+\)\( \d\+\)\?$/ contains=i3ConfigNumber,i3ConfigVariable
 
 syn match swayConfigDeviceOps /[*,:;]/ contained
 
-" Output monitors
-syn keyword swayConfigOutputKeyword output contained
-syn keyword swayConfigOutputOpts mode resolution res modeline position pos scale scale_filter subpixel background bg transform disable enable power dpms max_render_time adaptive_sync render_bit_depth contained
-syn keyword swayConfigOutputOptVals linear nearest smart rgb bgr vrgb vbgr none normal flipped fill stretch fit center tile solid_color clockwise anticlockwise toggle contained
-syn match swayConfigOutputFPS /@[0-9.]\+Hz/ contained
-syn match swayConfigOutputMode / [0-9]\+x[0-9]\+\(@[0-9.]\+Hz\)\?/ contained contains=swayConfigOutputFPS,i3ConfigNumber
-syn region i3ConfigAction start=/output/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps keepend
-syn region swayConfigOutput start=/^output/ skip=/\\$/ end=/$/  contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps keepend
-syn region swayConfigOutput start=/^output .* {$/ end=/}$/  contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps,i3ConfigParen keepend extend
-
 " Input devices
 syn keyword swayConfigInputKeyword input contained
+syn keyword swayConfigInputType touchpad pointer keyboard touch tablet_tool tablet_pad switch contained
+syn match swayConfigInputTypePair /\<type:\w\+\>/ contained contains=i3ConfigColonOperator,swayConfigInputType
+syn region swayConfigInputStart start=/^input / end=/\s/ contained contains=swayConfigInputKeyword,swayConfigInputTypePair,i3ConfigString keepend extend
 syn keyword swayConfigInputOpts xkb_layout xkb_variant xkb_rules xkb_switch_layout xkb_numlock xkb_file xkb_capslock xkb_model repeat_delay repeat_rate map_to_output map_to_region map_from_region tool_mode accel_profile dwt dwtp drag_lock drag click_method middle_emulation tap events calibration_matrix natural_scroll left_handed pointer_accel scroll_button scroll_factor scroll_method tap_button_map contained
-syn keyword swayConfigInputOptVals absolute relative adaptive flat none button_areas clickfinger toggle two_finger edge on_button_down lrm lmr contained
-syn match swayConfigColonPairVal /:[0-9a-z_-]\+/ contained contains=i3ConfigColonOperator
-syn match swayConfigColonPair /[a-z]\+:[0-9a-z_-]\+/ contained contains=swayConfigColonPairVal
-syn match swayConfigInputXkbOpts /xkb_options \([a-z]\+:[0-9a-z_-]\+,\?\)\+/ contained contains=swayConfigColonPair,swayConfigDeviceOps
-syn region i3ConfigAction start=/input/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigInputKeyword,swayConfigColonPair,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigBoolean,swayConfigDeviceOps keepend
-syn region i3ConfigInput start=/^input/ skip=/\\$/ end=/$/ contains=swayConfigInputKeyword,swayConfigColonPair,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigBoolean,swayConfigDeviceOps keepend
-syn region i3ConfigInput start=/^input .* {/ end=/}$/ contains=swayConfigInputKeyword,swayConfigColonPair,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigBoolean,swayConfigDeviceOps,i3ConfigParen keepend extend
+syn keyword swayConfigInputOptVals absolute relative adaptive flat none button_areas clickfinger toggle two_finger edge on_button_down lrm lmr next prev pen eraser brush pencil airbrush disabled_on_external_mouse disable contained
+syn match swayConfigXkbOptsPairVal /:[0-9a-z_-]\+/ contained contains=i3ConfigColonOperator
+syn match swayConfigXkbOptsPair /[a-z]\+:[0-9a-z_-]\+/ contained contains=swayConfigXkbOptsPairVal
+syn match swayConfigInputXkbOpts /xkb_options \([a-z]\+:[0-9a-z_-]\+,\?\)\+/ contained contains=swayConfigXkbOptsPair,swayConfigDeviceOps
+syn region i3ConfigAction start=/input/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigInputStart,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigBoolean,swayConfigDeviceOps keepend transparent
+syn region i3ConfigInput start=/^input/ skip=/\\$/ end=/$/ contains=swayConfigInputStart,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigBoolean,swayConfigDeviceOps keepend
+syn region i3ConfigInput start=/^input .* {/ end=/}$/ contains=swayConfigInputStart,swayConfigInputXkbOpts,swayConfigInputOpts,swayConfigInputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigBoolean,swayConfigDeviceOps,i3ConfigParen keepend extend
 
 " Seat
 syn keyword swayConfigSeatKeyword seat contained
 syn keyword swayConfigSeatOpts attach cursor fallback hide_cursor idle_inhibit idle_wake keyboard_grouping shortcuts_inhibitor pointer_constraint xcursor_theme contained
 syn match swayConfigSeatOptVals /when-typing/ contained
 syn keyword swayConfigSeatOptVals move set press release none smart activate deactivate toggle escape enable disable contained
-syn region i3ConfigAction start=/seat/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps keepend
-syn region swayConfigSeat start=/seat/ skip=/\\$/ end=/$/ contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps keepend
-syn region swayConfigSeat start=/seat .* {$/ end=/}$/ contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps,i3ConfigParen keepend extend
+syn region i3ConfigAction start=/seat/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps,swayConfigInputType keepend transparent
+syn region swayConfigSeat start=/seat/ skip=/\\$/ end=/$/ contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps,swayConfigInputType keepend
+syn region swayConfigSeat start=/seat .* {$/ end=/}$/ contains=swayConfigSeatKeyword,i3ConfigString,i3ConfigNumber,i3ConfigBoolean,swayConfigSeatOptVals,swayConfigSeatOpts,swayConfigDeviceOps,i3ConfigParen,swayConfigInputType keepend extend
+
+" Output monitors
+syn keyword swayConfigOutputKeyword output contained
+syn keyword swayConfigOutputOpts mode resolution res modeline position pos scale scale_filter subpixel background bg transform disable enable power dpms max_render_time adaptive_sync render_bit_depth contained
+syn keyword swayConfigOutputOptVals linear nearest smart rgb bgr vrgb vbgr none normal flipped fill stretch fit center tile solid_color clockwise anticlockwise toggle contained
+syn match swayConfigOutputOptVals /--custom\|flipped-\(90\|180\|270\)/ contained
+syn match swayConfigOutputFPS /@[0-9.]\+Hz/ contained
+syn match swayConfigOutputMode / [0-9]\+x[0-9]\+\(@[0-9.]\+Hz\)\?/ contained contains=swayConfigOutputFPS
+syn region i3ConfigAction start=/output/ skip=/\\$/ end=/\([,;]\|$\)/ contained contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps keepend transparent
+syn region swayConfigOutput start=/^output/ skip=/\\$/ end=/$/  contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps keepend
+syn region swayConfigOutput start=/^output .* {$/ end=/}$/  contains=swayConfigOutputKeyword,swayConfigOutputMode,swayConfigOutputOpts,swayConfigOutputOptVals,i3ConfigVariable,i3ConfigNumber,i3ConfigString,i3ConfigColor,i3ConfigBoolean,swayConfigDeviceOps,i3ConfigParen keepend extend
 
 " Define the highlighting.
-hi def link swayConfigFloatingModifierOpts          i3ConfigOption
-hi def link swayConfigBindKeyword                   i3ConfigBindKeyword
-hi def link swayConfigXOpt                          i3ConfigOption
-hi def link swayConfigBindswitchArgument            i3ConfigBindArgument
-hi def link swayConfigBindswitchType                i3ConfigMoveType
-hi def link swayConfigBindswitchState               i3ConfigMoveDir
-hi def link swayConfigBindgestureArgument           i3ConfigBindArgument
-hi def link swayConfigBindgestureType               i3ConfigMoveType
-hi def link swayConfigBindgestureDir                i3ConfigMoveDir
-hi def link swayConfigDeviceOps                     i3ConfigOperator
-hi def link swayConfigOutputKeyword                 i3ConfigCommand
-hi def link swayConfigOutputOptVals                 i3ConfigOption
-hi def link swayConfigOutputOpts                    i3ConfigOption
-hi def link swayConfigOutputFPS                     Constant
-hi def link swayConfigInputKeyword                  i3ConfigCommand
-hi def link swayConfigInputOptVals                  i3ConfigShParam
-hi def link swayConfigInputOpts                     i3ConfigOption
-hi def link swayConfigInputXkbOpts                  i3ConfigOption
-hi def link swayConfigColonPairVal                  i3ConfigString
-hi def link swayConfigColonPair                     i3ConfigShParam
-hi def link swayConfigSeatKeyword                   i3ConfigCommand
-hi def link swayConfigSeatOptVals                   i3ConfigOption
-hi def link swayConfigSeatOpts                      i3ConfigOption
+hi def link swayConfigFloatingModifierOpts   i3ConfigOption
+hi def link swayConfigBindKeyword            i3ConfigBindKeyword
+hi def link swayConfigXOpt                   i3ConfigOption
+hi def link swayConfigInhibitKeyword         i3ConfigCommand
+hi def link swayConfigInhibitOpts            i3ConfigOption
+hi def link swayConfigBindswitchArgument     i3ConfigBindArgument
+hi def link swayConfigBindswitchType         i3ConfigMoveType
+hi def link swayConfigBindswitchState        i3ConfigMoveDir
+hi def link swayConfigBindgestureArgument    i3ConfigBindArgument
+hi def link swayConfigBindgestureType        i3ConfigMoveType
+hi def link swayConfigBindgestureDir         i3ConfigMoveDir
+hi def link swayConfigDeviceOps              i3ConfigOperator
+hi def link swayConfigInputKeyword           i3ConfigCommand
+hi def link swayConfigInputType              i3ConfigMoveType
+hi def link swayConfigInputTypePair          i3ConfigMoveDir
+hi def link swayConfigInputOptVals           i3ConfigShParam
+hi def link swayConfigInputOpts              i3ConfigOption
+hi def link swayConfigXkbOptsPairVal         i3ConfigString
+hi def link swayConfigXkbOptsPair            i3ConfigShParam
+hi def link swayConfigInputXkbOpts           i3ConfigOption
+hi def link swayConfigSeatKeyword            i3ConfigCommand
+hi def link swayConfigSeatOptVals            swayConfigInputOptVals
+hi def link swayConfigSeatOpts               swayConfigInputOpts
+hi def link swayConfigOutputKeyword          i3ConfigCommand
+hi def link swayConfigOutputOptVals          swayConfigInputOptVals
+hi def link swayConfigOutputOpts             swayConfigInputOpts
+hi def link swayConfigOutputFPS              Constant
+hi def link swayConfigOutputMode             i3ConfigNumber
 
 let b:current_syntax = "swayconfig"
-- 
cgit 


From 86b7d8a9f54d572e6866d6a24476d2369a288f79 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 28 Sep 2023 05:22:09 +0800
Subject: vim-patch:5277cfaf8afe (#25397)

runtime(doc): mention mouse scrolling in scrollbind-quickadj (vim/vim#13190)

https://github.com/vim/vim/commit/5277cfaf8afe847b7d4dcde6057fbecb001ab64e
---
 runtime/doc/options.txt           |  6 +++---
 runtime/doc/scroll.txt            | 15 ++++++++-------
 runtime/lua/vim/_meta/options.lua |  6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0bbbc95141..84cff775f6 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4909,9 +4909,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			*'scrollbind'* *'scb'* *'noscrollbind'* *'noscb'*
 'scrollbind' 'scb'	boolean	(default off)
 			local to window
-	See also |scroll-binding|.  When this option is set, the current
-	window scrolls as other scrollbind windows (windows that also have
-	this option set) scroll.  This option is useful for viewing the
+	See also |scroll-binding|.  When this option is set, scrolling the
+	current window also scrolls other scrollbind windows (windows that
+	also have this option set).  This option is useful for viewing the
 	differences between two versions of a file, see 'diff'.
 	See |'scrollopt'| for options that determine how this option should be
 	interpreted.
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index 92546799b4..29d6177213 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -186,16 +186,16 @@ windows can be given this behavior by setting the (window-specific)
 other 'scrollbind' windows are scrolled the same amount, if possible.  The
 behavior of 'scrollbind' can be modified by the 'scrollopt' option.
 
-When using the scrollbars, the binding only happens when scrolling the window
-with focus (where the cursor is).  You can use this to avoid scroll-binding
-for a moment without resetting options.
+When using the scrollbars or the mouse wheel, the binding only happens when
+scrolling the window with focus (where the cursor is).  You can use this to
+avoid scroll-binding for a moment without resetting options.
 
 When a window also has the 'diff' option set, the scroll-binding uses the
 differences between the two buffers to synchronize the position precisely.
 Otherwise the following method is used.
 
 							*scrollbind-relative*
-Each 'scrollbind' window keeps track of its "relative offset," which can be
+Each 'scrollbind' window keeps track of its "relative offset", which can be
 thought of as the difference between the current window's vertical scroll
 position and the other window's vertical scroll position.  When one of the
 'scrollbind' windows is asked to vertically scroll past the beginning or end
@@ -219,9 +219,10 @@ option.
 
 							*scrollbind-quickadj*
 The 'scrollbind' flag is meaningful when using keyboard commands to vertically
-scroll a window, and also meaningful when using the vertical scrollbar of the
-window which has the cursor focus.  However, when using the vertical scrollbar
-of a window which doesn't have the cursor focus, 'scrollbind' is ignored.
+scroll a window, and is also meaningful when using the vertical scrollbar or
+the mouse wheel in the window which has the cursor focus.  However, when using
+the vertical scrollbar or the mouse wheel in a window which doesn't have the
+cursor focus, 'scrollbind' is ignored.
 This allows quick adjustment of the relative offset of 'scrollbind' windows.
 
 ==============================================================================
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 6ef3cf57e1..ed0d844748 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -5113,9 +5113,9 @@ vim.o.scbk = vim.o.scrollback
 vim.bo.scrollback = vim.o.scrollback
 vim.bo.scbk = vim.bo.scrollback
 
---- See also `scroll-binding`.  When this option is set, the current
---- window scrolls as other scrollbind windows (windows that also have
---- this option set) scroll.  This option is useful for viewing the
+--- See also `scroll-binding`.  When this option is set, scrolling the
+--- current window also scrolls other scrollbind windows (windows that
+--- also have this option set).  This option is useful for viewing the
 --- differences between two versions of a file, see 'diff'.
 --- See `'scrollopt'` for options that determine how this option should be
 --- interpreted.
-- 
cgit 


From 19130415183763a572c50c8ae343dff8cc20526e Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Thu, 28 Sep 2023 06:57:22 +0200
Subject: docs: Lua docstrings guidance #25345

Recommend adding a space after i.e. `--- @see`.

The "space" variant is common for the vast majority of docstring formats
such as doxygen, javadoc and typescript.
---
 runtime/doc/develop.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index f4c581fabe..c88b8a88c3 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -232,10 +232,11 @@ Lua documentation lives in the source code, as docstrings on the function
 definitions.  The |lua-vim| :help is generated from the docstrings.
 
 Docstring format:
-- Use LuaLS annotations: https://github.com/LuaLS/lua-language-server/wiki/Annotations
-- Lines in the main description start with `---`
-- Special tokens start with `---@` followed by the token name:
-  `---@see`, `---@param`, `---@returns`
+- Use LuaLS annotations (with minor adjustments, which will be explained
+  below): https://luals.github.io/wiki/annotations/
+- Lines in the main description start with `--- `
+- Special tokens start with `--- @` followed by the token name: `--- @see`,
+  `--- @param`, `--- @returns`. Note the space between `---` and `@`.
 - Limited markdown is supported.
   - List-items start with `-` (useful to nest or "indent")
 - Use ``` for code samples.
@@ -258,11 +259,11 @@ vim.paste in runtime/lua/vim/_editor.lua like this: >
     --- end)()
     --- ```
     ---
-    ---@see |paste|
+    --- @see |paste|
     ---
-    ---@param lines  ...
-    ---@param phase  ...
-    ---@returns false if client should cancel the paste.
+    --- @param lines  ...
+    --- @param phase  ...
+    --- @returns false if client should cancel the paste.
 
 
 LUA STDLIB DESIGN GUIDELINES				*dev-lua*
-- 
cgit 


From 92e40f8d185e3da8fc97b7a48041afc3fd568d29 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 28 Sep 2023 05:09:21 +0800
Subject: vim-patch:9.0.1946: filename expansion using ** in bash may fail

Problem:  filename expansion using ** in bash may fail
Solution: Try to enable the globstar setting

Starting with bash 4.0 it supports extended globbing using the globstar
shell option. This makes matching recursively below a certain directory
using the ** pattern work as expected nowadays.  However, we need to
explicitly enable this using the 'shopt -s globstar' bash command.

So let's check the bash environment variable $BASH_VERSINFO (which is
supported since bash 3.0 and conditionally enable the globstar option,
if the major version is at least 4. For older bashs, this at least
shouldn't cause errors (unless one is using really ancient bash 2.X or
something).

closes: vim/vim#13002
closes: vim/vim#13144

https://github.com/vim/vim/commit/9eb1ce531527a7177d16373b0f8689bbcd3d5f73

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/editing.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 2f44256138..abfe466b07 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -356,7 +356,9 @@ as a wildcard when "[" is in the 'isfname' option.  A simple way to avoid this
 is to use "path\[[]abc]", this matches the file "path\[abc]".
 
 					*starstar-wildcard*
-Expanding "**" is possible on Unix, Win32, macOS and a few other systems.
+Expanding "**" is possible on Unix, Win32, macOS and a few other systems (but
+it may depend on your 'shell' setting. It's known to work correctly for zsh; for
+bash this requires at least bash version >= 4.X).
 This allows searching a directory tree.  This goes up to 100 directories deep.
 Note there are some commands where this works slightly differently, see
 |file-searching|.
-- 
cgit 


From 7ec20a4082f2e62e0ae90d464e0d62aa4ffdacf4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 29 Sep 2023 06:52:02 +0800
Subject: vim-patch:9.0.1950: Vim9: error codes spread out (#25405)

Problem:  Vim9: error codes spread out
Solution: group them together and reserve 100
          more for future use

Reserve 100 error codes for future enhancements to the Vim9 class
support

closes: vim/vim#13207

https://github.com/vim/vim/commit/413f83990f15d5d59d27ab741670f527a7a3feb8

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/builtin.txt         | 26 +++++++++++++-------------
 runtime/lua/vim/_meta/vimfn.lua | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 207bf817b0..d0866b1c42 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5255,55 +5255,55 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 			echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
 <			  1.41
 
-							*E1400*
+							*E1500*
 		You cannot mix positional and non-positional arguments: >vim
 			echo printf("%s%1$s", "One", "Two")
-<			E1400: Cannot mix positional and non-positional
+<			E1500: Cannot mix positional and non-positional
 			arguments: %s%1$s
 
-							*E1401*
+							*E1501*
 		You cannot skip a positional argument in a format string: >vim
 			echo printf("%3$s%1$s", "One", "Two", "Three")
-<			E1401: format argument 2 unused in $-style
+<			E1501: format argument 2 unused in $-style
 			format: %3$s%1$s
 
-							*E1402*
+							*E1502*
 		You can re-use a [field-width] (or [precision]) argument: >vim
 			echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
 <			1 at width 2 is: 01
 
 		However, you can't use it as a different type: >vim
 			echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
-<			E1402: Positional argument 2 used as field
+<			E1502: Positional argument 2 used as field
 			width reused as different type: long int/int
 
-							*E1403*
+							*E1503*
 		When a positional argument is used, but not the correct number
 		or arguments is given, an error is raised: >vim
 			echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
-<			E1403: Positional argument 3 out of bounds:
+<			E1503: Positional argument 3 out of bounds:
 			%1$d at width %2$d is: %01$*2$.*3$d
 
 		Only the first error is reported: >vim
 			echo printf("%01$*2$.*3$d %4$d", 1, 2)
-<			E1403: Positional argument 3 out of bounds:
+<			E1503: Positional argument 3 out of bounds:
 			%01$*2$.*3$d %4$d
 
-							*E1404*
+							*E1504*
 		A positional argument can be used more than once: >vim
 			echo printf("%1$s %2$s %1$s", "One", "Two")
 <			One Two One
 
 		However, you can't use a different type the second time: >vim
 			echo printf("%1$s %2$s %1$d", "One", "Two")
-<			E1404: Positional argument 1 type used
+<			E1504: Positional argument 1 type used
 			inconsistently: int/string
 
-							*E1405*
+							*E1505*
 		Various other errors that lead to a format string being
 		wrongly formatted lead to: >vim
 			echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
-<			E1405: Invalid format specifier:
+<			E1505: Invalid format specifier:
 			%1$d at width %2$d is: %01$*2$.3$d
 
 prompt_getprompt({buf})                                     *prompt_getprompt()*
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 6686661a27..86e8781160 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6238,55 +6238,55 @@ function vim.fn.prevnonblank(lnum) end
 ---   echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
 --- <    1.41
 ---
----           *E1400*
+---           *E1500*
 --- You cannot mix positional and non-positional arguments: >vim
 ---   echo printf("%s%1$s", "One", "Two")
---- <  E1400: Cannot mix positional and non-positional
+--- <  E1500: Cannot mix positional and non-positional
 ---   arguments: %s%1$s
 ---
----           *E1401*
+---           *E1501*
 --- You cannot skip a positional argument in a format string: >vim
 ---   echo printf("%3$s%1$s", "One", "Two", "Three")
---- <  E1401: format argument 2 unused in $-style
+--- <  E1501: format argument 2 unused in $-style
 ---   format: %3$s%1$s
 ---
----           *E1402*
+---           *E1502*
 --- You can re-use a [field-width] (or [precision]) argument: >vim
 ---   echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
 --- <  1 at width 2 is: 01
 ---
 --- However, you can't use it as a different type: >vim
 ---   echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
---- <  E1402: Positional argument 2 used as field
+--- <  E1502: Positional argument 2 used as field
 ---   width reused as different type: long int/int
 ---
----           *E1403*
+---           *E1503*
 --- When a positional argument is used, but not the correct number
 --- or arguments is given, an error is raised: >vim
 ---   echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
---- <  E1403: Positional argument 3 out of bounds:
+--- <  E1503: Positional argument 3 out of bounds:
 ---   %1$d at width %2$d is: %01$*2$.*3$d
 ---
 --- Only the first error is reported: >vim
 ---   echo printf("%01$*2$.*3$d %4$d", 1, 2)
---- <  E1403: Positional argument 3 out of bounds:
+--- <  E1503: Positional argument 3 out of bounds:
 ---   %01$*2$.*3$d %4$d
 ---
----           *E1404*
+---           *E1504*
 --- A positional argument can be used more than once: >vim
 ---   echo printf("%1$s %2$s %1$s", "One", "Two")
 --- <  One Two One
 ---
 --- However, you can't use a different type the second time: >vim
 ---   echo printf("%1$s %2$s %1$d", "One", "Two")
---- <  E1404: Positional argument 1 type used
+--- <  E1504: Positional argument 1 type used
 ---   inconsistently: int/string
 ---
----           *E1405*
+---           *E1505*
 --- Various other errors that lead to a format string being
 --- wrongly formatted lead to: >vim
 ---   echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
---- <  E1405: Invalid format specifier:
+--- <  E1505: Invalid format specifier:
 ---   %1$d at width %2$d is: %01$*2$.3$d
 ---
 --- @param fmt any
-- 
cgit 


From b917db062fc673dfbbc6a8c722b05101319ab44e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 29 Sep 2023 07:05:21 +0800
Subject: vim-patch:02902b547bdb (#25406)

runtime(doc): text-objects: document how escaped delimiters are handled

https://github.com/vim/vim/commit/02902b547bdb3ba480a52c90dce742201241f224

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/motion.txt | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 5e18595d22..aa18e44225 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -570,14 +570,16 @@ a]						*v_a]* *v_a[* *a]* *a[*
 a[			"a [] block", select [count] '[' ']' blocks.  This
 			goes backwards to the [count] unclosed '[', and finds
 			the matching ']'.  The enclosed text is selected,
-			including the '[' and ']'.
+			including the '[' and ']'.  The |cpo-M| option flag
+			is used to handle escaped brackets.
 			When used in Visual mode it is made charwise.
 
 i]						*v_i]* *v_i[* *i]* *i[*
 i[			"inner [] block", select [count] '[' ']' blocks.  This
 			goes backwards to the [count] unclosed '[', and finds
 			the matching ']'.  The enclosed text is selected,
-			excluding the '[' and ']'.
+			excluding the '[' and ']'.  The |cpo-M| option flag
+			is used to handle escaped brackets.
 			When used in Visual mode it is made charwise.
 
 a)							*v_a)* *a)* *a(*
@@ -585,7 +587,8 @@ a(							*vab* *v_ab* *v_a(* *ab*
 ab			"a block", select [count] blocks, from "[count] [(" to
 			the matching ')', including the '(' and ')' (see
 			|[(|).  Does not include white space outside of the
-			parenthesis.
+			parenthesis.  The |cpo-M| option flag is used to
+			handle escaped parenthesis.
 			When used in Visual mode it is made charwise.
 
 i)							*v_i)* *i)* *i(*
@@ -593,19 +596,22 @@ i(							*vib* *v_ib* *v_i(* *ib*
 ib			"inner block", select [count] blocks, from "[count] [("
 			to the matching ')', excluding the '(' and ')' (see
 			|[(|).  If the cursor is not inside a () block, then
-			find the next "(".
+			find the next "(".  The |cpo-M| option flag
+			is used to handle escaped parenthesis.
 			When used in Visual mode it is made charwise.
 
 a>						*v_a>* *v_a<* *a>* *a<*
 a<			"a <> block", select [count] <> blocks, from the
 			[count]'th unmatched '<' backwards to the matching
-			'>', including the '<' and '>'.
+			'>', including the '<' and '>'.  The |cpo-M| option flag
+			is used to handle escaped '<' and '>'.
 			When used in Visual mode it is made charwise.
 
 i>						*v_i>* *v_i<* *i>* *i<*
 i<			"inner <> block", select [count] <> blocks, from
 			the [count]'th unmatched '<' backwards to the matching
-			'>', excluding the '<' and '>'.
+			'>', excluding the '<' and '>'.  The |cpo-M| option flag
+			is used to handle escaped '<' and '>'.
 			When used in Visual mode it is made charwise.
 
 						*v_at* *at*
@@ -626,14 +632,16 @@ a}							*v_a}* *a}* *a{*
 a{							*v_aB* *v_a{* *aB*
 aB			"a Block", select [count] Blocks, from `[count] [{` to
 			the matching "}", including the "{" and "}" (see
-			|[{|).
+			|[{|).  The |cpo-M| option flag is used to handle
+			escaped braces.
 			When used in Visual mode it is made charwise.
 
 i}							*v_i}* *i}* *i{*
 i{							*v_iB* *v_i{* *iB*
 iB			"inner Block", select [count] Blocks, from `[count] [{`
 			to the matching "}", excluding the "{" and "}" (see
-			|[{|).
+			|[{|).  The |cpo-M| option flag is used to handle
+			escaped braces.
 			When used in Visual mode it is made charwise.
 
 a"							*v_aquote* *aquote*
-- 
cgit 


From 9ed830a3ca5847a9152b91fca5e1eaf712bed55b Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Fri, 29 Sep 2023 08:37:14 -0700
Subject: refactor(lsp): deprecate util methods (#25400)

---
 runtime/doc/deprecated.txt   |  2 ++
 runtime/doc/lsp.txt          | 27 ---------------------------
 runtime/doc/news.txt         |  2 ++
 runtime/lua/vim/lsp/util.lua |  5 +++--
 4 files changed, 7 insertions(+), 29 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 407d7ae9fb..7a2b29f8c8 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -142,6 +142,8 @@ LSP FUNCTIONS
 - *vim.lsp.get_active_clients()*		Use |vim.lsp.get_clients()|
 - *vim.lsp.for_each_buffer_client()*		Use |vim.lsp.get_clients()|
 - *vim.lsp.util.trim_empty_lines()*		Use |vim.split()| with `trimempty` instead.
+- *vim.lsp.util.try_trim_markdown_code_blocks()*
+- *vim.lsp.util.set_lines()*
 
 TREESITTER FUNCTIONS
 - *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 23902f8bc3..5d32a1b4d0 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1955,20 +1955,6 @@ rename({old_fname}, {new_fname}, {opts})               *vim.lsp.util.rename()*
     Parameters: ~
       • {opts}  (table)
 
-set_lines({lines}, {A}, {B}, {new_lines})           *vim.lsp.util.set_lines()*
-    Replaces text in a range with new text.
-
-    CAUTION: Changes in-place!
-
-    Parameters: ~
-      • {lines}      (table) Original list of strings
-      • {A}          (table) Start position; a 2-tuple of {line,col} numbers
-      • {B}          (table) End position; a 2-tuple of {line,col} numbers
-      • {new_lines}  (table) list of strings to replace the original
-
-    Return: ~
-        (table) The modified {lines} object
-
                                                 *vim.lsp.util.show_document()*
 show_document({location}, {offset_encoding}, {opts})
     Shows document and optionally jumps to the location.
@@ -2033,19 +2019,6 @@ text_document_completion_list_to_complete_items({result}, {prefix})
     See also: ~
       • complete-items
 
-                                *vim.lsp.util.try_trim_markdown_code_blocks()*
-try_trim_markdown_code_blocks({lines})
-    Accepts markdown lines and tries to reduce them to a filetype if they
-    comprise just a single code block.
-
-    CAUTION: Modifies the input in-place!
-
-    Parameters: ~
-      • {lines}  (table) list of lines
-
-    Return: ~
-        (string) filetype or "markdown" if it was unchanged.
-
 
 ==============================================================================
 Lua module: vim.lsp.log                                              *lsp-log*
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ff0ccfb08f..3062c4c393 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -281,6 +281,8 @@ release.
   - |vim.lsp.get_active_clients()|		Use |vim.lsp.get_clients()| instead.
   - |vim.lsp.for_each_buffer_client()|		Use |vim.lsp.get_clients()| instead.
   - |vim.lsp.util.trim_empty_lines()|		Use |vim.split()| with `trimempty` instead.
+  - |vim.lsp.util.try_trim_markdown_code_blocks()|
+  - |vim.lsp.util.set_lines()|
 
 • `vim.loop` has been renamed to `vim.uv`.
 
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 0d1e3cc0d1..51ed87219c 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -168,10 +168,12 @@ end
 
 local _str_utfindex_enc = M._str_utfindex_enc
 local _str_byteindex_enc = M._str_byteindex_enc
+
 --- Replaces text in a range with new text.
 ---
 --- CAUTION: Changes in-place!
 ---
+---@deprecated
 ---@param lines (table) Original list of strings
 ---@param A (table) Start position; a 2-tuple of {line,col} numbers
 ---@param B (table) End position; a 2-tuple of {line,col} numbers
@@ -320,9 +322,7 @@ local function get_line(bufnr, row)
 end
 
 --- Position is a https://microsoft.github.io/language-server-protocol/specifications/specification-current/#position
---- Returns a zero-indexed column, since set_lines() does the conversion to
 ---@param offset_encoding string|nil utf-8|utf-16|utf-32
---- 1-indexed
 ---@return integer
 local function get_line_byte_from_position(bufnr, position, offset_encoding)
   -- LSP's line and characters are 0-indexed
@@ -1991,6 +1991,7 @@ end
 ---
 --- CAUTION: Modifies the input in-place!
 ---
+---@deprecated
 ---@param lines table list of lines
 ---@return string filetype or "markdown" if it was unchanged.
 function M.try_trim_markdown_code_blocks(lines)
-- 
cgit 


From 54daf022ce989bb8ea34084f947ab85c045b690f Mon Sep 17 00:00:00 2001
From: "Dr. Matthew Swabey" <matthew@swabey.org>
Date: Fri, 29 Sep 2023 11:57:02 -0400
Subject: docs(term): use tic -x for better compatibility with old ncurses
 (#25421)

Use `tic -x` instead of `tic` to include any unknown capabilities in a modern `terminfo.src` as user-defined ones, instead of dropping them. Modern ncurses behavior with `tic -x` will not change.
---
 runtime/doc/term.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index ee8a4d8732..8ef8675d13 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -31,7 +31,7 @@ a non-superuser:
 >
   curl -LO https://invisible-island.net/datafiles/current/terminfo.src.gz
   gunzip terminfo.src.gz
-  tic terminfo.src
+  tic -x terminfo.src
 <
 								*$TERM*
 The $TERM environment variable must match the terminal you are using!
-- 
cgit 


From 4200a0f1678c06c6da4e4cfb0184c29c1174ed21 Mon Sep 17 00:00:00 2001
From: glepnir <glephunter@gmail.com>
Date: Wed, 27 Sep 2023 17:23:42 +0800
Subject: feat(float): support toggle show float window

---
 runtime/doc/api.txt                   | 1 +
 runtime/doc/news.txt                  | 3 +++
 runtime/lua/vim/_meta/api.lua         | 1 +
 runtime/lua/vim/_meta/api_keysets.lua | 1 +
 4 files changed, 6 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 1eebd0bb18..ec979e2ab1 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3181,6 +3181,7 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
                     fire from calling this function.
                   • fixed: If true when anchor is NW or SW, the float window
                     would be kept fixed even if the window would be truncated.
+                  • hide: If true the floating window will be hidden.
 
     Return: ~
         Window handle, or 0 on error
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 05a2d35f9a..23a7e1d503 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -65,6 +65,9 @@ The following changes may require adaptations in user config or plugins.
   now requires an explicit range argument to be passed. If injections are
   required, provide an explicit range via `parser:parse({ start_row, end_row })`.
 
+• Float window support hide and show by setting `hide` on `nvim_open_win` and
+  `nvim_win_set_config`.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 68ef54eb2f..0575c13443 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1617,6 +1617,7 @@ function vim.api.nvim_open_term(buffer, opts) end
 ---                 fire from calling this function.
 ---               • fixed: If true when anchor is NW or SW, the float window
 ---                 would be kept fixed even if the window would be truncated.
+---               • hide: If true the floating window will be hidden.
 --- @return integer
 function vim.api.nvim_open_win(buffer, enter, config) end
 
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index eaaa32d7b3..698e706171 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -113,6 +113,7 @@ error('Cannot require a meta file')
 --- @field style? string
 --- @field noautocmd? boolean
 --- @field fixed? boolean
+--- @field hide? boolean
 
 --- @class vim.api.keyset.get_autocmds
 --- @field event? any
-- 
cgit 


From f6e72c3dfed83b02483976eaedb27819df9a878d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 30 Sep 2023 19:14:24 +0800
Subject: vim-patch:9.0.1962: No support for writing extended attributes

Problem:  No support for writing extended attributes
Solution: Add extended attribute support for linux

It's been a long standing issue, that if you write a file with extended
attributes and backupcopy is set to no, the file will loose the extended
attributes.

So this patch adds support for retrieving the extended attributes and
copying it to the new file. It currently only works on linux, mainly
because I don't know the different APIs for other systems (BSD, MacOSX and
Solaris).  On linux, this should be supported since Kernel 2.4 or
something, so this should be pretty safe to use now.

Enable the extended attribute support with normal builds.

I also added it explicitly to the :version output as well as make it
able to check using `:echo has("xattr")`, to have users easily check
that this is available.

In contrast to the similar support for SELINUX and SMACK support (which
also internally uses extended attributes), I have made this a FEAT_XATTR
define, instead of the similar HAVE_XATTR.

Add a test and change CI to include relevant packages so that CI can
test that extended attributes are correctly written.

closes: vim/vim#306
closes: vim/vim#13203

https://github.com/vim/vim/commit/e085dfda5d8dde064b0332464040959479696d1c

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/editing.txt | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index abfe466b07..6e7963c066 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1078,6 +1078,13 @@ will get the ACL info of the original file.
    The ACL info is also used to check if a file is read-only (when opening the
 file).
 
+				*xattr* *E1506* *E1507* *E1508* *E1509*
+xattr stands for Extended Attributes  It is an advanced way to save metadata
+alongside the file in the filesystem.  It depends on the actual filesystem
+being used and Vim supports it only on a Linux system.
+   Vim attempts to preserve the extended attribute info when writing a file.
+The backup file will get the extended attribute of the original file.
+
 						*read-only-share*
 When MS-Windows shares a drive on the network it can be marked as read-only.
 This means that even if the file read-only attribute is absent, and the ACL
-- 
cgit 


From 2615ed879e66a3d05920c47177e77383adc7aca0 Mon Sep 17 00:00:00 2001
From: Daniel Steinberg <dstein64@users.noreply.github.com>
Date: Tue, 18 Jul 2023 17:02:45 -0400
Subject: feat(ui): allow to get the highlight namespace

---
 runtime/doc/api.txt                   | 13 +++++++++++++
 runtime/lua/vim/_meta/api.lua         | 10 ++++++++++
 runtime/lua/vim/_meta/api_keysets.lua |  3 +++
 3 files changed, 26 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 1eebd0bb18..e3daf1defa 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -979,6 +979,19 @@ nvim_get_hl_id_by_name({name})                      *nvim_get_hl_id_by_name()*
 
     similar to |hlID()|, but allocates a new ID if not present.
 
+nvim_get_hl_ns({*opts})                                     *nvim_get_hl_ns()*
+    Gets the active highlight namespace.
+
+    Parameters: ~
+      • {opts}  Optional parameters
+                • winid: (number) |window-ID| for retrieving a window's
+                  highlight namespace. A value of -1 is returned when
+                  |nvim_win_set_hl_ns()| has not been called for the window
+                  (or was called with a namespace of -1).
+
+    Return: ~
+        Namespace id, or -1
+
 nvim_get_keymap({mode})                                    *nvim_get_keymap()*
     Gets a list of global (non-buffer-local) |mapping| definitions.
 
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 68ef54eb2f..f0101eb6a4 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1258,6 +1258,16 @@ function vim.api.nvim_get_hl_by_name(name, rgb) end
 --- @return integer
 function vim.api.nvim_get_hl_id_by_name(name) end
 
+--- Gets the active highlight namespace.
+---
+--- @param opts vim.api.keyset.get_ns Optional parameters
+---             • winid: (number) `window-ID` for retrieving a window's
+---               highlight namespace. A value of -1 is returned when
+---               `nvim_win_set_hl_ns()` has not been called for the window
+---               (or was called with a namespace of -1).
+--- @return integer
+function vim.api.nvim_get_hl_ns(opts) end
+
 --- Gets a list of global (non-buffer-local) `mapping` definitions.
 ---
 --- @param mode string Mode short-name ("n", "i", "v", ...)
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index eaaa32d7b3..88de2f58d0 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -136,6 +136,9 @@ error('Cannot require a meta file')
 --- @field link? boolean
 --- @field create? boolean
 
+--- @class vim.api.keyset.get_ns
+--- @field winid? integer
+
 --- @class vim.api.keyset.highlight
 --- @field bold? boolean
 --- @field standout? boolean
-- 
cgit 


From f06af5e66981095f3244f67d1587ce7e9853eb4c Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 30 Sep 2023 08:13:58 +0800
Subject: vim-patch:9.0.1958: cannot complete option values

Problem:  cannot complete option values
Solution: Add completion functions for several options

Add cmdline tab-completion for setting string options

Add tab-completion for setting string options on the cmdline using
`:set=` (along with `:set+=` and `:set-=`).

The existing tab completion for setting options currently only works
when nothing is typed yet, and it only fills in with the existing value,
e.g. when the user does `:set diffopt=<Tab>` it will be completed to
`set diffopt=internal,filler,closeoff` and nothing else. This isn't too
useful as a user usually wants auto-complete to suggest all the possible
values, such as 'iblank', or 'algorithm:patience'.

For set= and set+=, this adds a new optional callback function for each
option that can be invoked when doing completion. This allows for each
option to have control over how completion works. For example, in
'diffopt', it will suggest the default enumeration, but if `algorithm:`
is selected, it will further suggest different algorithm types like
'meyers' and 'patience'. When using set=, the existing option value will
be filled in as the first choice to preserve the existing behavior. When
using set+= this won't happen as it doesn't make sense.

For flag list options (e.g. 'mouse' and 'guioptions'), completion will
take into account existing typed values (and in the case of set+=, the
existing option value) to make sure it doesn't suggest duplicates.

For set-=, there is a new `ExpandSettingSubtract` function which will
handle flag list and comma-separated options smartly, by only suggesting
values that currently exist in the option.

Note that Vim has some existing code that adds special handling for
'filetype', 'syntax', and misc dir options like 'backupdir'. This change
preserves them as they already work, instead of converting to the new
callback API for each option.

closes: vim/vim#13182

https://github.com/vim/vim/commit/900894b09a95398dfc75599e9f0aa2ea25723384

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
---
 runtime/doc/cmdline.txt | 20 +++++++++++++++-----
 runtime/doc/options.txt |  9 +++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 5ee1a2af13..c586b30863 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -493,16 +493,26 @@ example, to match only files that end in ".c": >
 	:e *.c$
 This will not match a file ending in ".cpp".  Without the "$" it does match.
 
-The old value of an option can be obtained by hitting 'wildchar' just after
-the '='.  For example, typing 'wildchar' after ":set dir=" will insert the
-current value of 'dir'.  This overrules file name completion for the options
-that take a file name.
-
 If you would like using <S-Tab> for CTRL-P in an xterm, put this command in
 your .cshrc: >
 	xmodmap -e "keysym Tab = Tab Find"
 And this in your vimrc: >
 	:cmap <Esc>[1~ <C-P>
+<						*complete-set-option*
+When setting an option using |:set=|, the old value of an option can be
+obtained by hitting 'wildchar' just after the '='.  For example, typing
+'wildchar' after ":set dir=" will insert the current value of 'dir'.  This
+overrules file name completion for the options that take a file name.
+
+When using |:set=|, |:set+=|, or |:set^=|, string options that have
+pre-defined names or syntax (e.g. 'diffopt', 'listchars') or are a list of
+single-character flags (e.g. 'shortmess') will also present a list of possible
+values for completion when using 'wildchar'.
+
+When using |:set-=|, comma-separated options like 'diffopt' or 'backupdir'
+will show each item separately.  Flag list options like 'shortmess' will show
+both the entire old value and the individual flags.  Otherwise completion will
+just fill in with the entire old value.
 
 ==============================================================================
 3. Ex command-lines					*cmdline-lines*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 84cff775f6..35fb08a9a4 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -52,14 +52,16 @@ achieve special effects.  These options come in three forms:
 			  'lines'
 			Warning: This may have a lot of side effects.
 
-						*:set-args* *E487* *E521*
+						*:set-args* *:set=* *E487* *E521*
 :se[t] {option}={value}		or
 :se[t] {option}:{value}
 			Set string or number option to {value}.
 			For numeric options the value can be given in decimal,
 			hex (preceded with 0x) or octal (preceded with '0').
 			The old value can be inserted by typing 'wildchar' (by
-			default this is a <Tab>).  See |cmdline-completion|.
+			default this is a <Tab>).  Many string options with
+			fixed syntax also support completing known values.
+			See |cmdline-completion| and |complete-set-option|.
 			White space between {option} and '=' is allowed and
 			will be ignored.  White space between '=' and {value}
 			is not allowed.
@@ -93,6 +95,9 @@ achieve special effects.  These options come in three forms:
 			When the option is a list of flags, {value} must be
 			exactly as they appear in the option.  Remove flags
 			one by one to avoid problems.
+			The individual values from a comma separated list or
+			list of flags can be inserted by typing 'wildchar'.
+			See |complete-set-option|.
 			Also see |:set-args| above.
 
 The {option} arguments to ":set" may be repeated.  For example: >
-- 
cgit 


From 01c51a491330bd10202c73aff92c0978984c0692 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 1 Oct 2023 19:07:16 +0800
Subject: feat(completion): support completing more string options

---
 runtime/doc/news.txt     | 2 ++
 runtime/doc/vim_diff.txt | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b632cf0932..f82cb7b7e0 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -105,6 +105,8 @@ The following new APIs and features were added.
 
 • |nvim_set_keymap()| and |nvim_del_keymap()| now support abbreviations.
 
+• Better cmdline completion for string option value. |complete-set-option|
+
 • Builtin TUI can now recognize "super" (|<D-|) and "meta" (|<T-|) modifiers in a
   terminal emulator that supports |tui-csiu|.
 
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index e636746616..3bf844a139 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -287,13 +287,12 @@ Options:
   'diffopt'     "linematch" feature
   'exrc'        searches for ".nvim.lua", ".nvimrc", or ".exrc" files. The
                 user is prompted whether to trust the file.
-  'fillchars'   flags: "msgsep", "horiz", "horizup",
-                "horizdown", "vertleft", "vertright", "verthoriz"
+  'fillchars'   flags: "msgsep", "horiz", "horizup", "horizdown",
+                "vertleft", "vertright", "verthoriz"
   'foldcolumn'  supports up to 9 dynamic/fixed columns
   'guicursor'   works in the terminal (TUI)
   'inccommand'  shows interactive results for |:substitute|-like commands
                 and |:command-preview| commands
-  'jumpoptions' "stack" behavior
   'jumpoptions' "view" tries to restore the |mark-view| when moving through
   the |jumplist|, |changelist|, |alternate-file| or using |mark-motions|.
   'laststatus'  global statusline support
@@ -304,6 +303,7 @@ Options:
   'signcolumn'  supports up to 9 dynamic/fixed columns
   'statuscolumn' full control of columns using 'statusline' format
   'tabline'     %@Func@foo%X can call any function on mouse-click
+  'termpastefilter'
   'ttimeout', 'ttimeoutlen' behavior was simplified
   'winblend'    pseudo-transparency in floating windows |api-floatwin|
   'winhighlight' window-local highlights
@@ -382,6 +382,7 @@ Upstreamed features					 *nvim-upstreamed*
 These Nvim features were later integrated into Vim.
 
 - 'fillchars' flags: "eob"
+- 'jumpoptions' "stack" behavior
 - 'wildoptions' flags: "pum" enables popupmenu for wildmode completion
 - |<Cmd>|
 - |WinClosed|
-- 
cgit 


From 9ce1623837a817c3f4f5deff9c8ba862578b6009 Mon Sep 17 00:00:00 2001
From: Till Bungert <tillbungert@gmail.com>
Date: Sun, 1 Oct 2023 21:10:51 +0200
Subject: feat(treesitter): add foldtext with treesitter highlighting (#25391)

---
 runtime/doc/news.txt                 |  2 +
 runtime/doc/treesitter.txt           | 10 ++++
 runtime/lua/vim/treesitter.lua       | 12 +++++
 runtime/lua/vim/treesitter/_fold.lua | 92 ++++++++++++++++++++++++++++++++++++
 4 files changed, 116 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f82cb7b7e0..db0c7b4407 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -145,6 +145,8 @@ The following new APIs and features were added.
   • Added `vim.treesitter.query.edit()`, for live editing of treesitter
     queries.
   • Improved error messages for query parsing.
+  • Added |vim.treesitter.foldtext()| to apply treesitter highlighting to
+    foldtext.
 
 • |vim.ui.open()| opens URIs using the system default handler (macOS `open`,
   Windows `explorer`, Linux `xdg-open`, etc.)
diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 34971c7acf..e19fda8fd1 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -560,6 +560,16 @@ foldexpr({lnum})                                   *vim.treesitter.foldexpr()*
     Return: ~
         (string)
 
+foldtext()                                         *vim.treesitter.foldtext()*
+    Returns the highlighted content of the first line of the fold or falls
+    back to |foldtext()| if no treesitter parser is found. Can be set directly
+    to 'foldtext': >lua
+        vim.wo.foldtext = 'v:lua.vim.treesitter.foldtext()'
+<
+
+    Return: ~
+        `{ [1]: string, [2]: string[] }[]` | string
+
                                      *vim.treesitter.get_captures_at_cursor()*
 get_captures_at_cursor({winnr})
     Returns a list of highlight capture names under the cursor
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 0e34cbcbcc..f863942d3b 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -508,4 +508,16 @@ function M.foldexpr(lnum)
   return require('vim.treesitter._fold').foldexpr(lnum)
 end
 
+--- Returns the highlighted content of the first line of the fold or falls back to |foldtext()|
+--- if no treesitter parser is found. Can be set directly to 'foldtext':
+---
+--- ```lua
+--- vim.wo.foldtext = 'v:lua.vim.treesitter.foldtext()'
+--- ```
+---
+---@return { [1]: string, [2]: string[] }[] | string
+function M.foldtext()
+  return require('vim.treesitter._fold').foldtext()
+end
+
 return M
diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index 8bc08c9c2e..c6a4b48d4f 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -361,4 +361,96 @@ function M.foldexpr(lnum)
   return foldinfos[bufnr].levels[lnum] or '0'
 end
 
+---@package
+---@return { [1]: string, [2]: string[] }[]|string
+function M.foldtext()
+  local foldstart = vim.v.foldstart
+  local bufnr = api.nvim_get_current_buf()
+
+  ---@type boolean, LanguageTree
+  local ok, parser = pcall(ts.get_parser, bufnr)
+  if not ok then
+    return vim.fn.foldtext()
+  end
+
+  local query = ts.query.get(parser:lang(), 'highlights')
+  if not query then
+    return vim.fn.foldtext()
+  end
+
+  local tree = parser:parse({ foldstart - 1, foldstart })[1]
+
+  local line = api.nvim_buf_get_lines(bufnr, foldstart - 1, foldstart, false)[1]
+  if not line then
+    return vim.fn.foldtext()
+  end
+
+  ---@type { [1]: string, [2]: string[], range: { [1]: integer, [2]: integer } }[] | { [1]: string, [2]: string[] }[]
+  local result = {}
+
+  local line_pos = 0
+
+  for id, node, metadata in query:iter_captures(tree:root(), 0, foldstart - 1, foldstart) do
+    local name = query.captures[id]
+    local start_row, start_col, end_row, end_col = node:range()
+
+    local priority = tonumber(metadata.priority or vim.highlight.priorities.treesitter)
+
+    if start_row == foldstart - 1 and end_row == foldstart - 1 then
+      -- check for characters ignored by treesitter
+      if start_col > line_pos then
+        table.insert(result, {
+          line:sub(line_pos + 1, start_col),
+          { { 'Folded', priority } },
+          range = { line_pos, start_col },
+        })
+      end
+      line_pos = end_col
+
+      local text = line:sub(start_col + 1, end_col)
+      table.insert(result, { text, { { '@' .. name, priority } }, range = { start_col, end_col } })
+    end
+  end
+
+  local i = 1
+  while i <= #result do
+    -- find first capture that is not in current range and apply highlights on the way
+    local j = i + 1
+    while
+      j <= #result
+      and result[j].range[1] >= result[i].range[1]
+      and result[j].range[2] <= result[i].range[2]
+    do
+      for k, v in ipairs(result[i][2]) do
+        if not vim.tbl_contains(result[j][2], v) then
+          table.insert(result[j][2], k, v)
+        end
+      end
+      j = j + 1
+    end
+
+    -- remove the parent capture if it is split into children
+    if j > i + 1 then
+      table.remove(result, i)
+    else
+      -- highlights need to be sorted by priority, on equal prio, the deeper nested capture (earlier
+      -- in list) should be considered higher prio
+      if #result[i][2] > 1 then
+        table.sort(result[i][2], function(a, b)
+          return a[2] < b[2]
+        end)
+      end
+
+      result[i][2] = vim.tbl_map(function(tbl)
+        return tbl[1]
+      end, result[i][2])
+      result[i] = { result[i][1], result[i][2] }
+
+      i = i + 1
+    end
+  end
+
+  return result
+end
+
 return M
-- 
cgit 


From 4a09c178a19097c295521892c889f1f196fff100 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Mon, 2 Oct 2023 22:14:19 +0200
Subject: feat(lsp): fallback to code-action command on resolve failure
 (#25464)

The haskell-language-server supports resolve only for a subset of code
actions. For many code actions trying to resolve the `edit` property
results in an error, but the unresolved action already contains a
command that can be executed without issue.

The protocol specification is unfortunately a bit vague about this,
and what the haskell-language-server does seems to be valid.

Example:

    newtype Dummy = Dummy Int
    instance Num Dummy where

Triggering code actions on "Num Dummy" and choosing "Add placeholders
for all missing methods" resulted in:

    -32601: No plugin enabled for SMethod_CodeActionResolve, potentially available: explicit-fields, importLens, hlint, overloaded-record-dot

With this change it will insert the missing methods:

    instance Num Dummy where
      (+) = _
      (-) = _
      (*) = _
      negate = _
      abs = _
      signum = _
      fromInteger = _
---
 runtime/lua/vim/lsp/buf.lua | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 8a29fac2b5..a906512e24 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -652,7 +652,7 @@ local function on_code_action_results(results, ctx, options)
     --  arguments?: any[]
     --
     ---@type lsp.Client
-    local client = vim.lsp.get_client_by_id(action_tuple[1])
+    local client = assert(vim.lsp.get_client_by_id(action_tuple[1]))
     local action = action_tuple[2]
 
     local reg = client.dynamic_capabilities:get(ms.textDocument_codeAction, { bufnr = ctx.bufnr })
@@ -663,10 +663,14 @@ local function on_code_action_results(results, ctx, options)
     if not action.edit and client and supports_resolve then
       client.request(ms.codeAction_resolve, action, function(err, resolved_action)
         if err then
-          vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
-          return
+          if action.command then
+            apply_action(action, client)
+          else
+            vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
+          end
+        else
+          apply_action(resolved_action, client)
         end
-        apply_action(resolved_action, client)
       end, ctx.bufnr)
     else
       apply_action(action, client)
-- 
cgit 


From f736b075d371dd15fa6fffc907db7952bc19bb9d Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sun, 1 Oct 2023 09:53:18 -0700
Subject: feat(lsp): snippet parsing using lpeg

---
 runtime/lua/vim/lsp/_snippet_grammar.lua | 143 +++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 runtime/lua/vim/lsp/_snippet_grammar.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_snippet_grammar.lua b/runtime/lua/vim/lsp/_snippet_grammar.lua
new file mode 100644
index 0000000000..86f00fea51
--- /dev/null
+++ b/runtime/lua/vim/lsp/_snippet_grammar.lua
@@ -0,0 +1,143 @@
+--- Grammar for LSP snippets, based on https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#snippet_syntax
+
+local lpeg = vim.lpeg
+local P, S, R, V = lpeg.P, lpeg.S, lpeg.R, lpeg.V
+local C, Cg, Ct = lpeg.C, lpeg.Cg, lpeg.Ct
+
+local M = {}
+
+local alpha = R('az', 'AZ')
+local backslash = P('\\')
+local colon = P(':')
+local dollar = P('$')
+local int = R('09') ^ 1
+local l_brace, r_brace = P('{'), P('}')
+local pipe = P('|')
+local slash = P('/')
+local underscore = P('_')
+local var = Cg((underscore + alpha) * ((underscore + alpha + int) ^ 0), 'name')
+local format_capture = Cg(int / tonumber, 'capture')
+local format_modifier = Cg(P('upcase') + P('downcase') + P('capitalize'), 'modifier')
+local tabstop = Cg(int / tonumber, 'tabstop')
+
+--- Returns a function that unescapes occurrences of "special" characters.
+---
+--- @param special string
+--- @return fun(match: string): string
+local function escape_text(special)
+  return function(match)
+    local escaped = match:gsub('\\(.)', function(c)
+      return special:find(c) and c or '\\' .. c
+    end)
+    return escaped
+  end
+end
+
+-- Text nodes match "any character", but $, \, and } must be escaped.
+local escapable = '$}\\'
+local text = (backslash * S(escapable)) + (P(1) - S(escapable))
+local text_0, text_1 = (text ^ 0) / escape_text(escapable), text ^ 1
+-- Within choice nodes, \ also escapes comma and pipe characters.
+local choice_text = C(((backslash * S(escapable .. ',|')) + (P(1) - S(escapable .. ',|'))) ^ 1)
+  / escape_text(escapable .. ',|')
+local if_text, else_text = Cg(text_0, 'if_text'), Cg(text_0, 'else_text')
+-- Within format nodes, make sure we stop at /
+local format_text = C(((backslash * S(escapable)) + (P(1) - S(escapable .. '/'))) ^ 1)
+  / escape_text(escapable)
+-- Within ternary condition format nodes, make sure we stop at :
+local if_till_colon_text = Cg(
+  C(((backslash * S(escapable)) + (P(1) - S(escapable .. ':'))) ^ 1) / escape_text(escapable),
+  'if_text'
+)
+
+-- Matches the string inside //, allowing escaping of the closing slash.
+local regex = Cg(((backslash * slash) + (P(1) - slash)) ^ 1, 'regex')
+
+-- Regex constructor flags (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/RegExp#parameters).
+local options = Cg(S('dgimsuvy') ^ 0, 'options')
+
+--- @enum vim.snippet.Type
+local Type = {
+  Tabstop = 1,
+  Placeholder = 2,
+  Choice = 3,
+  Variable = 4,
+  Format = 5,
+  Text = 6,
+  Snippet = 7,
+}
+M.NodeType = Type
+
+--- @class vim.snippet.Node<T>: { type: vim.snippet.Type, data: T }
+--- @class vim.snippet.TabstopData: { tabstop: number }
+--- @class vim.snippet.TextData: { text: string }
+--- @class vim.snippet.PlaceholderData: { tabstop: vim.snippet.TabstopData, value: vim.snippet.Node<any> }
+--- @class vim.snippet.ChoiceData: { tabstop: vim.snippet.TabstopData, values: string[] }
+--- @class vim.snippet.VariableData: { name: string, default?: vim.snippet.Node<any>, regex?: string, format?: vim.snippet.Node<vim.snippet.FormatData|vim.snippet.TextData>[], options?: string }
+--- @class vim.snippet.FormatData: { capture: number, modifier?: string, if_text?: string, else_text?: string }
+--- @class vim.snippet.SnippetData: { children: vim.snippet.Node<any>[] }
+
+--- Returns a function that constructs a snippet node of the given type.
+---
+--- @generic T
+--- @param type vim.snippet.Type
+--- @return fun(data: T): vim.snippet.Node<T>
+local function node(type)
+  return function(data)
+    return { type = type, data = data }
+  end
+end
+
+-- stylua: ignore
+local G = P({
+  'snippet';
+  snippet = Ct(Cg(
+    Ct((
+      V('any') +
+      (Ct(Cg(text_1 / escape_text(escapable), 'text')) / node(Type.Text))
+    ) ^ 1), 'children'
+  )) / node(Type.Snippet),
+  any_or_text = V('any') + (Ct(Cg(text_0 / escape_text(escapable), 'text')) / node(Type.Text)),
+  any = V('placeholder') + V('tabstop') + V('choice') + V('variable'),
+  tabstop = Ct(dollar * (tabstop + (l_brace * tabstop * r_brace))) / node(Type.Tabstop),
+  placeholder = Ct(dollar * l_brace * tabstop * colon * Cg(V('any_or_text'), 'value') * r_brace) / node(Type.Placeholder),
+  choice = Ct(dollar *
+    l_brace *
+    tabstop *
+    pipe *
+    Cg(Ct(choice_text * (P(',') * choice_text) ^ 0), 'values') *
+    pipe *
+    r_brace) / node(Type.Choice),
+  variable = Ct(dollar * (
+    var + (
+    l_brace * var * (
+      r_brace +
+      (colon * Cg(V('any_or_text'), 'default') * r_brace) +
+      (slash * regex * slash * Cg(Ct((V('format') + (C(format_text) / node(Type.Text))) ^ 1), 'format') * slash * options * r_brace)
+    ))
+  )) / node(Type.Variable),
+  format = Ct(dollar * (
+    format_capture + (
+    l_brace * format_capture * (
+      r_brace +
+      (colon * (
+        (slash * format_modifier * r_brace) +
+        (P('+') * if_text * r_brace) +
+        (P('?') * if_till_colon_text * colon * else_text * r_brace) +
+        (P('-') * else_text * r_brace) +
+        (else_text * r_brace)
+      ))
+    ))
+  )) / node(Type.Format),
+})
+
+--- Parses the given input into a snippet tree.
+--- @param input string
+--- @return vim.snippet.Node<vim.snippet.SnippetData>
+function M.parse(input)
+  local snippet = G:match(input)
+  assert(snippet, 'snippet parsing failed')
+  return snippet --- @type vim.snippet.Node<vim.snippet.SnippetData>
+end
+
+return M
-- 
cgit 


From eb1f0e8fcca756a00d287e23bf87554e0e7f6dfd Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sun, 1 Oct 2023 09:54:04 -0700
Subject: feat(lsp)!: replace snippet parser by lpeg grammar

---
 runtime/doc/news.txt             |   4 +
 runtime/lua/vim/lsp/_snippet.lua | 500 ---------------------------------------
 runtime/lua/vim/lsp/util.lua     |  35 ++-
 3 files changed, 36 insertions(+), 503 deletions(-)
 delete mode 100644 runtime/lua/vim/lsp/_snippet.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index db0c7b4407..3c20e52155 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -68,6 +68,10 @@ The following changes may require adaptations in user config or plugins.
 • Float window support hide and show by setting `hide` on `nvim_open_win` and
   `nvim_win_set_config`.
 
+• |vim.lsp.util.parse_snippet()| will now strictly follow the snippet grammar
+  defined by LSP, and hence previously parsed snippets might now be considered
+  invalid input.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/lua/vim/lsp/_snippet.lua b/runtime/lua/vim/lsp/_snippet.lua
deleted file mode 100644
index e7ada5415f..0000000000
--- a/runtime/lua/vim/lsp/_snippet.lua
+++ /dev/null
@@ -1,500 +0,0 @@
-local P = {}
-
----Take characters until the target characters (The escape sequence is '\' + char)
----@param targets string[] The character list for stop consuming text.
----@param specials string[] If the character isn't contained in targets/specials, '\' will be left.
-P.take_until = function(targets, specials)
-  targets = targets or {}
-  specials = specials or {}
-
-  return function(input, pos)
-    local new_pos = pos
-    local raw = {}
-    local esc = {}
-    while new_pos <= #input do
-      local c = string.sub(input, new_pos, new_pos)
-      if c == '\\' then
-        table.insert(raw, '\\')
-        new_pos = new_pos + 1
-        c = string.sub(input, new_pos, new_pos)
-        if not vim.list_contains(targets, c) and not vim.list_contains(specials, c) then
-          table.insert(esc, '\\')
-        end
-        table.insert(raw, c)
-        table.insert(esc, c)
-        new_pos = new_pos + 1
-      else
-        if vim.list_contains(targets, c) then
-          break
-        end
-        table.insert(raw, c)
-        table.insert(esc, c)
-        new_pos = new_pos + 1
-      end
-    end
-
-    if new_pos == pos then
-      return P.unmatch(pos)
-    end
-
-    return {
-      parsed = true,
-      value = {
-        raw = table.concat(raw, ''),
-        esc = table.concat(esc, ''),
-      },
-      pos = new_pos,
-    }
-  end
-end
-
-P.unmatch = function(pos)
-  return {
-    parsed = false,
-    value = nil,
-    pos = pos,
-  }
-end
-
-P.map = function(parser, map)
-  return function(input, pos)
-    local result = parser(input, pos)
-    if result.parsed then
-      return {
-        parsed = true,
-        value = map(result.value),
-        pos = result.pos,
-      }
-    end
-    return P.unmatch(pos)
-  end
-end
-
-P.lazy = function(factory)
-  return function(input, pos)
-    return factory()(input, pos)
-  end
-end
-
-P.token = function(token)
-  return function(input, pos)
-    local maybe_token = string.sub(input, pos, pos + #token - 1)
-    if token == maybe_token then
-      return {
-        parsed = true,
-        value = maybe_token,
-        pos = pos + #token,
-      }
-    end
-    return P.unmatch(pos)
-  end
-end
-
-P.pattern = function(p)
-  return function(input, pos)
-    local maybe_match = string.match(string.sub(input, pos), '^' .. p)
-    if maybe_match then
-      return {
-        parsed = true,
-        value = maybe_match,
-        pos = pos + #maybe_match,
-      }
-    end
-    return P.unmatch(pos)
-  end
-end
-
-P.many = function(parser)
-  return function(input, pos)
-    local values = {}
-    local new_pos = pos
-    while new_pos <= #input do
-      local result = parser(input, new_pos)
-      if not result.parsed then
-        break
-      end
-      table.insert(values, result.value)
-      new_pos = result.pos
-    end
-    if #values > 0 then
-      return {
-        parsed = true,
-        value = values,
-        pos = new_pos,
-      }
-    end
-    return P.unmatch(pos)
-  end
-end
-
-P.any = function(...)
-  local parsers = { ... }
-  return function(input, pos)
-    for _, parser in ipairs(parsers) do
-      local result = parser(input, pos)
-      if result.parsed then
-        return result
-      end
-    end
-    return P.unmatch(pos)
-  end
-end
-
-P.opt = function(parser)
-  return function(input, pos)
-    local result = parser(input, pos)
-    return {
-      parsed = true,
-      value = result.value,
-      pos = result.pos,
-    }
-  end
-end
-
-P.seq = function(...)
-  local parsers = { ... }
-  return function(input, pos)
-    local values = {}
-    local new_pos = pos
-    for i, parser in ipairs(parsers) do
-      local result = parser(input, new_pos)
-      if result.parsed then
-        values[i] = result.value
-        new_pos = result.pos
-      else
-        return P.unmatch(pos)
-      end
-    end
-    return {
-      parsed = true,
-      value = values,
-      pos = new_pos,
-    }
-  end
-end
-
-local Node = {}
-
-Node.Type = {
-  SNIPPET = 0,
-  TABSTOP = 1,
-  PLACEHOLDER = 2,
-  VARIABLE = 3,
-  CHOICE = 4,
-  TRANSFORM = 5,
-  FORMAT = 6,
-  TEXT = 7,
-}
-
-function Node:__tostring()
-  local insert_text = {}
-  if self.type == Node.Type.SNIPPET then
-    for _, c in ipairs(self.children) do
-      table.insert(insert_text, tostring(c))
-    end
-  elseif self.type == Node.Type.CHOICE then
-    table.insert(insert_text, self.items[1])
-  elseif self.type == Node.Type.PLACEHOLDER then
-    for _, c in ipairs(self.children or {}) do
-      table.insert(insert_text, tostring(c))
-    end
-  elseif self.type == Node.Type.TEXT then
-    table.insert(insert_text, self.esc)
-  end
-  return table.concat(insert_text, '')
-end
-
---@see https://code.visualstudio.com/docs/editor/userdefinedsnippets#_grammar
-
-local S = {}
-S.dollar = P.token('$')
-S.open = P.token('{')
-S.close = P.token('}')
-S.colon = P.token(':')
-S.slash = P.token('/')
-S.comma = P.token(',')
-S.pipe = P.token('|')
-S.plus = P.token('+')
-S.minus = P.token('-')
-S.question = P.token('?')
-S.int = P.map(P.pattern('[0-9]+'), function(value)
-  return tonumber(value, 10)
-end)
-S.var = P.pattern('[%a_][%w_]+')
-S.text = function(targets, specials)
-  return P.map(P.take_until(targets, specials), function(value)
-    return setmetatable({
-      type = Node.Type.TEXT,
-      raw = value.raw,
-      esc = value.esc,
-    }, Node)
-  end)
-end
-
-S.toplevel = P.lazy(function()
-  return P.any(S.placeholder, S.tabstop, S.variable, S.choice)
-end)
-
-S.format = P.any(
-  P.map(P.seq(S.dollar, S.int), function(values)
-    return setmetatable({
-      type = Node.Type.FORMAT,
-      capture_index = values[2],
-    }, Node)
-  end),
-  P.map(P.seq(S.dollar, S.open, S.int, S.close), function(values)
-    return setmetatable({
-      type = Node.Type.FORMAT,
-      capture_index = values[3],
-    }, Node)
-  end),
-  P.map(
-    P.seq(
-      S.dollar,
-      S.open,
-      S.int,
-      S.colon,
-      S.slash,
-      P.any(
-        P.token('upcase'),
-        P.token('downcase'),
-        P.token('capitalize'),
-        P.token('camelcase'),
-        P.token('pascalcase')
-      ),
-      S.close
-    ),
-    function(values)
-      return setmetatable({
-        type = Node.Type.FORMAT,
-        capture_index = values[3],
-        modifier = values[6],
-      }, Node)
-    end
-  ),
-  P.map(
-    P.seq(
-      S.dollar,
-      S.open,
-      S.int,
-      S.colon,
-      P.seq(
-        S.question,
-        P.opt(P.take_until({ ':' }, { '\\' })),
-        S.colon,
-        P.opt(P.take_until({ '}' }, { '\\' }))
-      ),
-      S.close
-    ),
-    function(values)
-      return setmetatable({
-        type = Node.Type.FORMAT,
-        capture_index = values[3],
-        if_text = values[5][2] and values[5][2].esc or '',
-        else_text = values[5][4] and values[5][4].esc or '',
-      }, Node)
-    end
-  ),
-  P.map(
-    P.seq(
-      S.dollar,
-      S.open,
-      S.int,
-      S.colon,
-      P.seq(S.plus, P.opt(P.take_until({ '}' }, { '\\' }))),
-      S.close
-    ),
-    function(values)
-      return setmetatable({
-        type = Node.Type.FORMAT,
-        capture_index = values[3],
-        if_text = values[5][2] and values[5][2].esc or '',
-        else_text = '',
-      }, Node)
-    end
-  ),
-  P.map(
-    P.seq(
-      S.dollar,
-      S.open,
-      S.int,
-      S.colon,
-      S.minus,
-      P.opt(P.take_until({ '}' }, { '\\' })),
-      S.close
-    ),
-    function(values)
-      return setmetatable({
-        type = Node.Type.FORMAT,
-        capture_index = values[3],
-        if_text = '',
-        else_text = values[6] and values[6].esc or '',
-      }, Node)
-    end
-  ),
-  P.map(
-    P.seq(S.dollar, S.open, S.int, S.colon, P.opt(P.take_until({ '}' }, { '\\' })), S.close),
-    function(values)
-      return setmetatable({
-        type = Node.Type.FORMAT,
-        capture_index = values[3],
-        if_text = '',
-        else_text = values[5] and values[5].esc or '',
-      }, Node)
-    end
-  )
-)
-
-S.transform = P.map(
-  P.seq(
-    S.slash,
-    P.take_until({ '/' }, { '\\' }),
-    S.slash,
-    P.many(P.any(S.format, S.text({ '$', '/' }, { '\\' }))),
-    S.slash,
-    P.opt(P.pattern('[ig]+'))
-  ),
-  function(values)
-    return setmetatable({
-      type = Node.Type.TRANSFORM,
-      pattern = values[2].raw,
-      format = values[4],
-      option = values[6],
-    }, Node)
-  end
-)
-
-S.tabstop = P.any(
-  P.map(P.seq(S.dollar, S.int), function(values)
-    return setmetatable({
-      type = Node.Type.TABSTOP,
-      tabstop = values[2],
-    }, Node)
-  end),
-  P.map(P.seq(S.dollar, S.open, S.int, S.close), function(values)
-    return setmetatable({
-      type = Node.Type.TABSTOP,
-      tabstop = values[3],
-    }, Node)
-  end),
-  P.map(P.seq(S.dollar, S.open, S.int, S.transform, S.close), function(values)
-    return setmetatable({
-      type = Node.Type.TABSTOP,
-      tabstop = values[3],
-      transform = values[4],
-    }, Node)
-  end)
-)
-
-S.placeholder = P.any(
-  P.map(
-    P.seq(
-      S.dollar,
-      S.open,
-      S.int,
-      S.colon,
-      P.opt(P.many(P.any(S.toplevel, S.text({ '$', '}' }, { '\\' })))),
-      S.close
-    ),
-    function(values)
-      return setmetatable({
-        type = Node.Type.PLACEHOLDER,
-        tabstop = values[3],
-        -- insert empty text if opt did not match.
-        children = values[5] or {
-          setmetatable({
-            type = Node.Type.TEXT,
-            raw = '',
-            esc = '',
-          }, Node),
-        },
-      }, Node)
-    end
-  )
-)
-
-S.choice = P.map(
-  P.seq(
-    S.dollar,
-    S.open,
-    S.int,
-    S.pipe,
-    P.many(P.map(P.seq(S.text({ ',', '|' }), P.opt(S.comma)), function(values)
-      return values[1].esc
-    end)),
-    S.pipe,
-    S.close
-  ),
-  function(values)
-    return setmetatable({
-      type = Node.Type.CHOICE,
-      tabstop = values[3],
-      items = values[5],
-    }, Node)
-  end
-)
-
-S.variable = P.any(
-  P.map(P.seq(S.dollar, S.var), function(values)
-    return setmetatable({
-      type = Node.Type.VARIABLE,
-      name = values[2],
-    }, Node)
-  end),
-  P.map(P.seq(S.dollar, S.open, S.var, S.close), function(values)
-    return setmetatable({
-      type = Node.Type.VARIABLE,
-      name = values[3],
-    }, Node)
-  end),
-  P.map(P.seq(S.dollar, S.open, S.var, S.transform, S.close), function(values)
-    return setmetatable({
-      type = Node.Type.VARIABLE,
-      name = values[3],
-      transform = values[4],
-    }, Node)
-  end),
-  P.map(
-    P.seq(
-      S.dollar,
-      S.open,
-      S.var,
-      S.colon,
-      P.many(P.any(S.toplevel, S.text({ '$', '}' }, { '\\' }))),
-      S.close
-    ),
-    function(values)
-      return setmetatable({
-        type = Node.Type.VARIABLE,
-        name = values[3],
-        children = values[5],
-      }, Node)
-    end
-  )
-)
-
-S.snippet = P.map(P.many(P.any(S.toplevel, S.text({ '$' }, { '}', '\\' }))), function(values)
-  return setmetatable({
-    type = Node.Type.SNIPPET,
-    children = values,
-  }, Node)
-end)
-
-local M = {}
-
----The snippet node type enum
----@types table<string, integer>
-M.NodeType = Node.Type
-
----Parse snippet string and returns the AST
----@param input string
----@return table
-function M.parse(input)
-  local result = S.snippet(input, 1)
-  if not result.parsed then
-    error('snippet parsing failed.')
-  end
-  return result.value
-end
-
-return M
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 51ed87219c..a4c8959b99 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1,5 +1,5 @@
 local protocol = require('vim.lsp.protocol')
-local snippet = require('vim.lsp._snippet')
+local snippet = require('vim.lsp._snippet_grammar')
 local validate = vim.validate
 local api = vim.api
 local list_extend = vim.list_extend
@@ -610,12 +610,41 @@ end
 ---@return string parsed snippet
 function M.parse_snippet(input)
   local ok, parsed = pcall(function()
-    return tostring(snippet.parse(input))
+    return snippet.parse(input)
   end)
   if not ok then
     return input
   end
-  return parsed
+
+  --- @param node vim.snippet.Node<any>
+  --- @return string
+  local function node_to_string(node)
+    local insert_text = {}
+    if node.type == snippet.NodeType.Snippet then
+      for _, child in
+        ipairs((node.data --[[@as vim.snippet.SnippetData]]).children)
+      do
+        table.insert(insert_text, node_to_string(child))
+      end
+    elseif node.type == snippet.NodeType.Choice then
+      table.insert(insert_text, (node.data --[[@as vim.snippet.ChoiceData]]).values[1])
+    elseif node.type == snippet.NodeType.Placeholder then
+      table.insert(
+        insert_text,
+        node_to_string((node.data --[[@as vim.snippet.PlaceholderData]]).value)
+      )
+    elseif node.type == snippet.NodeType.Text then
+      table.insert(
+        insert_text,
+        node
+          .data --[[@as vim.snippet.TextData]]
+          .text
+      )
+    end
+    return table.concat(insert_text)
+  end
+
+  return node_to_string(parsed)
 end
 
 --- Sorts by CompletionItem.sortText.
-- 
cgit 


From b003e7feca98ca5e588fdfa1b6fb5c293a68b6d1 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 3 Oct 2023 06:20:44 +0800
Subject: vim-patch:ba77bbb5c775

runtime(doc): fix typos.

* Fix typo in document (Related: vim/vim#12516)
* Fix E1363 duplication
* Fix one more typo.

https://github.com/vim/vim/commit/ba77bbb5c775663a8b55871f753d7b1b570bb9ba

Co-authored-by: h_east <h.east.727@gmail.com>
---
 runtime/doc/cmdline.txt  | 2 +-
 runtime/doc/filetype.txt | 2 +-
 runtime/doc/pattern.txt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index c586b30863..63967f84a1 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -742,7 +742,7 @@ An example for subtracting (which isn't very useful): >
 On this text:
 	1 one ~
 	2 two ~
-	3 three FOLDED~
+	3 three FOLDED ~
 	4 four FOLDED ~
 	5 five FOLDED ~
 	6 six FOLDED ~
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 27ec92dbc6..ed21dc1c37 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -396,7 +396,7 @@ So to enable this only for ruby, set the following variable: >
 	:let g:ruby_exec = 1
 
 If both, the global `plugin_exec` and the `<filetype>_exec` specific variable
-are set, the filetpe specific variable should have precedent.
+are set, the filetype specific variable should have precedent.
 
 AWK							*ft-awk-plugin*
 
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index d74757de4f..09119b0918 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1065,7 +1065,7 @@ match ASCII characters, as indicated by the range.
 
 \(\)	A pattern enclosed by escaped parentheses.	*/\(* */\(\)* */\)*
 	E.g., "\(^a\)" matches 'a' at the start of a line.
-	There can only be ten of these.  You can use "\%(" to add more, but
+	There can only be nine of these.  You can use "\%(" to add more, but
 	not counting it as a sub-expression.
 	*E51* *E54* *E55* *E872* *E873*
 
-- 
cgit 


From 19b49b063c28f7d246bf1b452e5ad59a44345c9d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 3 Oct 2023 06:21:59 +0800
Subject: vim-patch:20f48d5b2ddb

runtime(doc): mention how to disable folding in diff mode (vim/vim#13242)

https://github.com/vim/vim/commit/20f48d5b2ddb9fdc29e83f0da6f31f895eaeab47

Co-authored-by: dundargoc <33953936+dundargoc@users.noreply.github.com>
---
 runtime/doc/options.txt           | 3 ++-
 runtime/lua/vim/_meta/options.lua | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 35fb08a9a4..bc207d7755 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1966,7 +1966,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 				When omitted a context of six lines is used.
 				When using zero the context is actually one,
 				since folds require a line in between, also
-				for a deleted line.
+				for a deleted line. Set it to a very large
+				value (999999) to disable folding completely.
 				See |fold-diff|.
 
 		iblank		Ignore changes where lines are all blank.  Adds
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index ed0d844748..08ee1f97ba 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -1591,7 +1591,8 @@ vim.go.dex = vim.go.diffexpr
 --- 			When omitted a context of six lines is used.
 --- 			When using zero the context is actually one,
 --- 			since folds require a line in between, also
---- 			for a deleted line.
+--- 			for a deleted line. Set it to a very large
+--- 			value (999999) to disable folding completely.
 --- 			See `fold-diff`.
 ---
 --- 	iblank		Ignore changes where lines are all blank.  Adds
-- 
cgit 


From e0d669ffdb69582558f594c4b7cdc18634013f48 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 3 Oct 2023 06:24:20 +0800
Subject: vim-patch:cd39b69b0200

runtime(doc): add missing error numbers in the help.  (vim/vim#13241)

closes: vim/vim#13240

https://github.com/vim/vim/commit/cd39b69b0200005622db7291bbacff95bd03a3d0

Co-authored-by: Yegappan Lakshmanan <4298407+yegappan@users.noreply.github.com>
---
 runtime/doc/builtin.txt         | 3 ++-
 runtime/lua/vim/_meta/vimfn.lua | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index d0866b1c42..c5c941a4bf 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -925,7 +925,7 @@ cosh({expr})                                                            *cosh()*
 			echo cosh(-0.5)
 <			-1.127626
 
-count({comp}, {expr} [, {ic} [, {start}]])                             *count()*
+count({comp}, {expr} [, {ic} [, {start}]])                        *count()* *E706*
 		Return the number of times an item with value {expr} appears
 		in |String|, |List| or |Dictionary| {comp}.
 
@@ -5116,6 +5116,7 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 		using a {n$} positional argument specifier. See |printf-$|.
 
 
+								*E1520*
 		The conversion specifiers and their meanings are:
 
 				*printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X*
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 86e8781160..55c324d739 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6099,6 +6099,7 @@ function vim.fn.prevnonblank(lnum) end
 --- using a {n$} positional argument specifier. See |printf-$|.
 ---
 ---
+---             *E1520*
 --- The conversion specifiers and their meanings are:
 ---
 ---     *printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X*
-- 
cgit 


From 1101cfeb349453bc7220e68695bf60a0f96f3069 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 3 Oct 2023 07:24:54 +0800
Subject: vim-patch:9.0.1972: win32: missing '**' expansion test (#25476)

Problem:  win32: missing '**' expansion test (after v9.0.1947)
Solution: Add test for MS-Windows

win32: Add "**" test

Vim supports "**" on MS-Windows. However, it is not tested by
`Test_glob_extended_bash`.

Unlike Unix, it doesn't use 'shell' and doesn't support {,} expansion.
So, I added as a separate test.

related: vim/vim#13205
closes: vim/vim#13250

https://github.com/vim/vim/commit/4a1ad5556423dca5f5b7ee39f143579e67569ae1

Co-authored-by: Ken Takata <kentkt@csc.jp>
---
 runtime/doc/editing.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 6e7963c066..aef5276bb3 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -357,8 +357,8 @@ is to use "path\[[]abc]", this matches the file "path\[abc]".
 
 					*starstar-wildcard*
 Expanding "**" is possible on Unix, Win32, macOS and a few other systems (but
-it may depend on your 'shell' setting. It's known to work correctly for zsh; for
-bash this requires at least bash version >= 4.X).
+it may depend on your 'shell' setting on Unix and macOS. It's known to work
+correctly for zsh; for bash this requires at least bash version >= 4.X).
 This allows searching a directory tree.  This goes up to 100 directories deep.
 Note there are some commands where this works slightly differently, see
 |file-searching|.
-- 
cgit 


From 6851b265ba1d232cc47927ef982d10d5df7a5cf4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 3 Oct 2023 11:24:33 +0800
Subject: fix(clipboard): don't pass --foreground to wl-copy (#25481)

Fix #25466
---
 runtime/autoload/provider/clipboard.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 6ba28dcbfc..05f6bdb871 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -93,9 +93,9 @@ function! provider#clipboard#Executable() abort
     let s:cache_enabled = 0
     return 'pbcopy'
   elseif !empty($WAYLAND_DISPLAY) && executable('wl-copy') && executable('wl-paste')
-    let s:copy['+'] = ['wl-copy', '--foreground', '--type', 'text/plain']
+    let s:copy['+'] = ['wl-copy', '--type', 'text/plain']
     let s:paste['+'] = ['wl-paste', '--no-newline']
-    let s:copy['*'] = ['wl-copy', '--foreground', '--primary', '--type', 'text/plain']
+    let s:copy['*'] = ['wl-copy', '--primary', '--type', 'text/plain']
     let s:paste['*'] = ['wl-paste', '--no-newline', '--primary']
     return 'wl-copy'
   elseif !empty($WAYLAND_DISPLAY) && executable('waycopy') && executable('waypaste')
-- 
cgit 


From 3af59a415c98afc42755308e56912b302ad5eb3d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 3 Oct 2023 13:07:03 +0800
Subject: fix(treesitter): make Visual hl work consistently with foldtext
 (#25484)

Problem:  Visual highlight is inconsistent on a folded line with
          treesitter foldtext.
Solution: Don't added Folded highlight as it is already in background.
---
 runtime/lua/vim/treesitter/_fold.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_fold.lua b/runtime/lua/vim/treesitter/_fold.lua
index c6a4b48d4f..5c1cc06908 100644
--- a/runtime/lua/vim/treesitter/_fold.lua
+++ b/runtime/lua/vim/treesitter/_fold.lua
@@ -401,7 +401,7 @@ function M.foldtext()
       if start_col > line_pos then
         table.insert(result, {
           line:sub(line_pos + 1, start_col),
-          { { 'Folded', priority } },
+          {},
           range = { line_pos, start_col },
         })
       end
-- 
cgit 


From 08aea256c8330f482319b0579944a56707cc5bbe Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 3 Oct 2023 14:32:47 +0800
Subject: vim-patch:2dfc22908e43 (#25485)

runtime(doc): remove E1507 help tag, which is no longer used (vim/vim#13254)

https://github.com/vim/vim/commit/2dfc22908e432f63d200e1fc4f024645c87b8bf3
---
 runtime/doc/editing.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index aef5276bb3..10b578fc73 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1078,8 +1078,8 @@ will get the ACL info of the original file.
    The ACL info is also used to check if a file is read-only (when opening the
 file).
 
-				*xattr* *E1506* *E1507* *E1508* *E1509*
-xattr stands for Extended Attributes  It is an advanced way to save metadata
+					*xattr* *E1506* *E1508* *E1509*
+xattr stands for Extended Attributes.  It is an advanced way to save metadata
 alongside the file in the filesystem.  It depends on the actual filesystem
 being used and Vim supports it only on a Linux system.
    Vim attempts to preserve the extended attribute info when writing a file.
-- 
cgit 


From 29fe883aa9166bdbcae3f935523c75a8aa56fe45 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 4 Oct 2023 06:31:25 -0700
Subject: feat: ignore swapfile for running Nvim processes #25336

Problem:
The swapfile "E325: ATTENTION" dialog is displayed when editing a file
already open in another (running) Nvim. Usually this behavior is
annoying and irrelevant:
- "Recover" and the other options ("Open readonly", "Quit", "Abort") are
  almost never wanted.
- swapfiles are less relevant for "multi-Nvim" since 'autoread' is
  enabled by default.
  - Even less relevant if user enables 'autowrite'.

Solution:
Define a default SwapExists handler which does the following:
1. If the swapfile is owned by a running Nvim process, automatically
   chooses "(E)dit anyway" (caveat: this creates a new, extra swapfile,
   which is mostly harmless and ignored except by `:recover` or `nvim -r`.
2. Shows a 1-line "ignoring swapfile..." message.
3. Users can disable the default SwapExists handler via `autocmd! nvim_swapfile`.
---
 runtime/doc/autocmd.txt         |  2 +-
 runtime/doc/builtin.txt         |  4 ++--
 runtime/doc/editing.txt         | 39 ++++++++++++++++-----------------------
 runtime/doc/eval.txt            |  7 ++++---
 runtime/doc/news.txt            |  6 ++++++
 runtime/doc/recover.txt         |  9 +++++++++
 runtime/doc/vim_diff.txt        |  5 +++++
 runtime/lua/vim/_editor.lua     | 17 +++++++++++++++++
 runtime/lua/vim/_meta/vimfn.lua |  4 ++--
 9 files changed, 62 insertions(+), 31 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 90211fc5db..7ca9996e15 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -118,7 +118,7 @@ manually.  Mostly the screen will not scroll up, thus there is no hit-enter
 prompt.  When one command outputs two messages this can happen anyway.
 
 ==============================================================================
-3. Removing autocommands				*autocmd-remove*
+3. Removing autocommands			*autocmd!* *autocmd-remove*
 
 :au[tocmd]! [group] {event} {aupat} [++once] [++nested] {cmd}
 			Remove all autocommands associated with {event} and
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index c5c941a4bf..6de7166f83 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -7843,8 +7843,8 @@ swapinfo({fname})                                                   *swapinfo()*
 			user	user name
 			host	host name
 			fname	original file name
-			pid	PID of the Vim process that created the swap
-				file
+			pid	PID of the Nvim process that created the swap
+				file, or zero if not running.
 			mtime	last modification time in seconds
 			inode	Optional: INODE number of the file
 			dirty	1 if file was modified, 0 if not
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 10b578fc73..7df2eb9742 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -169,33 +169,26 @@ If you want to keep the changed buffer without saving it, switch on the
 2. Editing a file					*edit-a-file*
 
 							*:e* *:edit* *reload*
-:e[dit] [++opt] [+cmd]	Edit the current file.  This is useful to re-edit the
+:e[dit][!] [++opt] [+cmd]
+			Edit the current file.  This is useful to re-edit the
 			current file, when it has been changed outside of Vim.
-			This fails when changes have been made to the current
-			buffer and 'autowriteall' isn't set or the file can't
-			be written.
-			Also see |++opt| and |+cmd|.
-
 							*:edit!* *discard*
-:e[dit]! [++opt] [+cmd]
-			Edit the current file always.  Discard any changes to
-			the current buffer.  This is useful if you want to
-			start all over again.
+			If [!] is given, unsaved changes in the current buffer
+			are discarded. Without [!] the command fails if there
+			are unsaved changes, unless 'autowriteall' is set and
+			the file can be written.
 			Also see |++opt| and |+cmd|.
 
 							*:edit_f*
-:e[dit] [++opt] [+cmd] {file}
+:e[dit][!] [++opt] [+cmd] {file}
 			Edit {file}.
-			This fails when changes have been made to the current
-			buffer, unless 'hidden' is set or 'autowriteall' is
-			set and the file can be written.
-			Also see |++opt| and |+cmd|.
-
 							*:edit!_f*
-:e[dit]! [++opt] [+cmd] {file}
-			Edit {file} always.  Discard any changes to the
-			current buffer.
+			If [!] is given, unsaved changes in the current buffer
+			are discarded. Without [!] the command fails if there
+			are unsaved changes, unless 'hidden' is set or
+			'autowriteall' is set and the file can be written.
 			Also see |++opt| and |+cmd|.
+
 							*:edit_#* *:e#*
 :e[dit] [++opt] [+cmd] #[count]
 			Edit the [count]th buffer (as shown by |:files|).
@@ -1224,10 +1217,10 @@ MULTIPLE WINDOWS AND BUFFERS				*window-exit*
 							*:confirm* *:conf*
 :conf[irm] {command}	Execute {command}, and use a dialog when an
 			operation has to be confirmed.  Can be used on the
-			|:q|, |:qa| and |:w| commands (the latter to override
-			a read-only setting), and any other command that can
-			fail in such a way, such as |:only|, |:buffer|,
-			|:bdelete|, etc.
+			|:edit|, |:q|, |:qa| and |:w| commands (the latter to
+			override a read-only setting), and any commands that
+			can fail because of unsaved changes, such as |:only|,
+			|:buffer|, |:bdelete|, etc.
 
 Examples: >
   :confirm w foo
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 3cd5ea13f6..c41237b862 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2276,12 +2276,13 @@ v:stderr	|channel-id| corresponding to stderr. The value is always 2;
 			:call chansend(v:stderr, "error: toaster empty\n")
 <
 					*v:swapname* *swapname-variable*
-v:swapname	Only valid when executing |SwapExists| autocommands: Name of
-		the swap file found.  Read-only.
+v:swapname	Name of the swapfile found.
+		Only valid during |SwapExists| event.
+		Read-only.
 
 					*v:swapchoice* *swapchoice-variable*
 v:swapchoice	|SwapExists| autocommands can set this to the selected choice
-		for handling an existing swap file:
+		for handling an existing swapfile:
 			'o'	Open read-only
 			'e'	Edit anyway
 			'r'	Recover
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 3c20e52155..f0d01f92e7 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -114,6 +114,12 @@ The following new APIs and features were added.
 • Builtin TUI can now recognize "super" (|<D-|) and "meta" (|<T-|) modifiers in a
   terminal emulator that supports |tui-csiu|.
 
+• Editor
+  • By default, the swapfile "ATTENTION" |E325| dialog is skipped if the
+    swapfile is owned by a running Nvim process, instead of prompting. If you
+    always want the swapfile dialog, delete the default SwapExists handler:
+    `autocmd! nvim_swapfile`. |default-autocmds|
+
 • LSP
   • LSP method names are available in |vim.lsp.protocol.Methods|.
   • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
index b05bcd6bc8..e6b5b06744 100644
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -83,6 +83,15 @@ Detecting an existing swap file ~
 
 You can find this in the user manual, section |11.3|.
 
+									*W325*
+The default |SwapExists| handler (|default-autocmds|) skips the |E325| prompt
+(selects "(E)dit") if the swapfile owner process (1) is still running and (2)
+was started by the current user.  This presumes that you normally don't want
+to be bothered with the |ATTENTION| message just because you happen to edit
+the same file from multiple Nvim instances.  In the worst case (a system
+crash) there will be more than one swapfile for the file; use |:recover| to
+inspect all of its swapfiles.
+
 
 Updating the swapfile ~
 
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 3bf844a139..e9c04443a6 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -139,6 +139,11 @@ nvim_terminal:
 nvim_cmdwin:
 - CmdwinEnter: Limits syntax sync to maxlines=1 in the |cmdwin|.
 
+nvim_swapfile:
+- SwapExists: Skips the swapfile prompt (sets |v:swapchoice| to "e") when the
+  swapfile is owned by a running Nvim process. Shows |W325| "Ignoring
+  swapfile…" message.
+
 ==============================================================================
 New Features						       *nvim-features*
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 7f09fc8038..1ba7d6163d 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -1147,11 +1147,28 @@ function vim._init_default_autocmds()
       end
     end,
   })
+
   vim.api.nvim_create_autocmd({ 'CmdwinEnter' }, {
     pattern = '[:>]',
     group = vim.api.nvim_create_augroup('nvim_cmdwin', {}),
     command = 'syntax sync minlines=1 maxlines=1',
   })
+
+  vim.api.nvim_create_autocmd({ 'SwapExists' }, {
+    pattern = '*',
+    group = vim.api.nvim_create_augroup('nvim_swapfile', {}),
+    callback = function()
+      local info = vim.fn.swapinfo(vim.v.swapname)
+      local user = vim.uv.os_get_passwd().username
+      local iswin = 1 == vim.fn.has('win32')
+      if info.error or info.pid <= 0 or (not iswin and info.user ~= user) then
+        vim.v.swapchoice = '' -- Show the prompt.
+        return
+      end
+      vim.v.swapchoice = 'e' -- Choose "(E)dit".
+      vim.notify(('W325: Ignoring swapfile from Nvim process %d'):format(info.pid))
+    end,
+  })
 end
 
 function vim._init_defaults()
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 55c324d739..5a3a5f3890 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -9312,8 +9312,8 @@ function vim.fn.swapfilelist() end
 ---   user  user name
 ---   host  host name
 ---   fname  original file name
----   pid  PID of the Vim process that created the swap
----     file
+---   pid  PID of the Nvim process that created the swap
+---     file, or zero if not running.
 ---   mtime  last modification time in seconds
 ---   inode  Optional: INODE number of the file
 ---   dirty  1 if file was modified, 0 if not
-- 
cgit 


From 0ff13a6a5a0a4d534f4ce9619fa4ccb02f126d53 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 5 Oct 2023 08:39:23 +0200
Subject: vim-patch:4dbb2669e9ed

runtime(netrw): error when trying to :bd unloaded buffer

closes: vim/vim#13215
closes: vim/vim#13082

https://github.com/vim/vim/commit/4dbb2669e9ed9ec6864705dcb569715e417e1303

Co-authored-by: yasuda <yasuda@kyoto-sr.co.jp>
---
 runtime/autoload/netrw.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 2dd5cf45bf..2ed3e9ca39 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -11934,9 +11934,9 @@ fun! s:NetrwBufRemover(bufid)
 "  call Decho("buf#".a:bufid." has name <".bufname(a:bufid).">","~".expand("<slnum>"))
 "  call Decho("buf#".a:bufid." has winid#".bufwinid(a:bufid),"~".expand("<slnum>"))
 
-  if a:bufid > 1 && !buflisted(a:bufid) && bufname(a:bufid) == "" && bufwinid(a:bufid) == -1
+  if a:bufid > 1 && !buflisted(a:bufid) && bufloaded(a:bufid) && bufname(a:bufid) == "" && bufwinid(a:bufid) == -1
 "   call Decho("(s:NetrwBufRemover) removing buffer#".a:bufid,"~".expand("<slnum>"))
-   exe "bd! ".a:bufid
+   exe "sil! bd! ".a:bufid
   endif
 
 "  call Dret("s:NetrwBufRemover")
-- 
cgit 


From 1338140ee3ea9355a9cc756f77b8fc71fd27eda5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 5 Oct 2023 14:42:38 +0200
Subject: vim-patch:9.0.1978: No filetype detection for just files

Problem:  No filetype detection for just files
Solution: Detect just files (*.just, justfile, etc)

closes: vim/vim#13271

https://github.com/vim/vim/commit/3d90f71b764e67b1eb12fc6a9a4b9e2fca6dc087

vim-patch:b6d01f13: runtime(just): Correct filetype detection pattern and style

Co-authored-by: dundargoc <gocdundar@gmail.com>
---
 runtime/lua/vim/filetype.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 5ae4e508ef..c412364461 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -565,6 +565,7 @@ local extension = {
   libsonnet = 'jsonnet',
   jsp = 'jsp',
   jl = 'julia',
+  just = 'just',
   kdl = 'kdl',
   kv = 'kivy',
   kix = 'kix',
@@ -1331,6 +1332,7 @@ local filename = {
   ['.jsfmtrc'] = 'jsonc',
   ['.jshintrc'] = 'jsonc',
   ['.swrc'] = 'jsonc',
+  ['.justfile'] = 'just',
   Kconfig = 'kconfig',
   ['Kconfig.debug'] = 'kconfig',
   ['lftp.conf'] = 'lftp',
@@ -1715,6 +1717,7 @@ local pattern = {
   ['org%.eclipse%..*%.prefs'] = 'jproperties',
   ['.*%.properties_.._.._.*'] = starsetf('jproperties'),
   ['[jt]sconfig.*%.json'] = 'jsonc',
+  ['[jJ]ustfile'] = 'just',
   ['Kconfig%..*'] = starsetf('kconfig'),
   ['.*%.[Ss][Uu][Bb]'] = 'krl',
   ['lilo%.conf.*'] = starsetf('lilo'),
-- 
cgit 


From ac6d8d008720f80bdbc5f44c6a75aa78c816dc52 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 6 Oct 2023 09:50:53 +0200
Subject: vim-patch:f449825ae238

runtime(netrw): Update `.netrwbook` immediately on bookmark change (vim/vim#13276)

closes: vim/vim#9738

https://github.com/vim/vim/commit/f449825ae23865437a74ea4140fd32780c02ce43

Co-authored-by: KSR-Yasuda <31273423+KSR-Yasuda@users.noreply.github.com>
---
 runtime/autoload/netrw.vim | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 2ed3e9ca39..22431d89e1 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -3469,6 +3469,11 @@ fun! s:NetrwBookHistHandler(chg,curdir)
     echo "bookmarked the current directory"
    endif
 
+   try
+    call s:NetrwBookHistSave()
+   catch
+   endtry
+
   elseif a:chg == 1
    " change to the bookmarked directory
 "   call Decho("(user: <".v:count."gb>) change to the bookmarked directory",'~'.expand("<slnum>"))
@@ -3613,6 +3618,11 @@ fun! s:NetrwBookHistHandler(chg,curdir)
 "    call Decho("g:netrw_bookmarklist=".string(g:netrw_bookmarklist),'~'.expand("<slnum>"))
    endif
 "   call Decho("resulting g:netrw_bookmarklist=".string(g:netrw_bookmarklist),'~'.expand("<slnum>"))
+
+   try
+    call s:NetrwBookHistSave()
+   catch
+   endtry
   endif
   call s:NetrwBookmarkMenu()
   call s:NetrwTgtMenu()
-- 
cgit 


From a6cccd728a5b9363661c3daf79046afe4b37a5ee Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 6 Oct 2023 09:51:19 +0200
Subject: vim-patch:0e958410046a

runtime(netrw): diff (`df`) may open the wrong window (vim/vim#13275)

closes: vim/vim#11359

https://github.com/vim/vim/commit/0e958410046aa764ec73b14b1d2839053b31d242

Co-authored-by: KSR-Yasuda <31273423+KSR-Yasuda@users.noreply.github.com>
---
 runtime/autoload/netrw.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 22431d89e1..dcaa075608 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -7332,8 +7332,7 @@ fun! s:NetrwMarkFileDiff(islocal)
      exe "NetrwKeepj e ".fnameescape(fname)
      diffthis
     elseif cnt == 2 || cnt == 3
-     vsplit
-     wincmd l
+     below vsplit
 "     call Decho("diffthis: ".fname,'~'.expand("<slnum>"))
      exe "NetrwKeepj e ".fnameescape(fname)
      diffthis
-- 
cgit 


From 1dd700a8d9275439fbc71ac5adeb59914bdbd5cf Mon Sep 17 00:00:00 2001
From: Leonardo Mello <lsvmello@gmail.com>
Date: Mon, 18 Sep 2023 16:50:47 -0300
Subject: fix: gf fails on "foo/bar.txt:1:2" on Windows

Problem:
On Windows, "gf" fails on a filepath that has a line:column suffix.
Example:

    E447: Can't find file "src/app/core/services/identity/identity.service.ts:64:23"

Solution:
- Remove ":" from 'isfname' on Windows. Colon is not a valid filename
  character (except for the drive-letter).
- Handle drive letters specially in file_name_in_line().

Fixes #25160
---
 runtime/doc/news.txt     | 3 +++
 runtime/doc/options.txt  | 2 +-
 runtime/doc/vim_diff.txt | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index f0d01f92e7..2bf912dbfd 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -15,6 +15,9 @@ BREAKING CHANGES                                                *news-breaking*
 
 The following changes may require adaptations in user config or plugins.
 
+• Windows file path drive letters are now detected even if ":" is not in
+  'isfname'. The default 'isfname' no longer includes ":".
+
 • |vim.tbl_islist()| now checks whether a table is actually list-like (i.e.,
   has integer keys without gaps and starting from 1). For the previous
   behavior (only check for integer keys, allow gaps or not starting with 1),
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bc207d7755..283c1e3612 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3453,7 +3453,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'isfname'* *'isf'*
 'isfname' 'isf'		string	(default for Windows:
-                             "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],:,@-@,!,~,="
+                             "@,48-57,/,\,.,-,_,+,,,#,$,%,{,},[,],@-@,!,~,="
                             otherwise: "@,48-57,/,.,-,_,+,,,#,$,%,~,=")
 			global
 	The characters specified by this option are included in file names and
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index e9c04443a6..974aa051cf 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -53,6 +53,8 @@ Defaults					            *nvim-defaults*
 - 'hlsearch' is enabled
 - 'include' defaults to "". The C ftplugin sets it to "^\\s*#\\s*include"
 - 'incsearch' is enabled
+- 'isfname' does not include ":" on Windows. Include ":" in 'isfname' to treat
+  it as part of a filename anywhere in the name (not only the drive letter).
 - 'joinspaces' is disabled
 - 'langnoremap' is enabled
 - 'langremap' is disabled
-- 
cgit 


From 133e2990efa44cadf1410a452a08843dbd8ca86e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 6 Oct 2023 12:59:39 +0200
Subject: refactor: cleanup

---
 runtime/doc/news.txt     | 5 ++---
 runtime/doc/vim_diff.txt | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 2bf912dbfd..b0f3b76587 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -15,9 +15,6 @@ BREAKING CHANGES                                                *news-breaking*
 
 The following changes may require adaptations in user config or plugins.
 
-• Windows file path drive letters are now detected even if ":" is not in
-  'isfname'. The default 'isfname' no longer includes ":".
-
 • |vim.tbl_islist()| now checks whether a table is actually list-like (i.e.,
   has integer keys without gaps and starting from 1). For the previous
   behavior (only check for integer keys, allow gaps or not starting with 1),
@@ -206,6 +203,8 @@ The following changes to existing APIs or features add new behavior.
   option, which allows for rendering e.g., diagnostic severities differently.
 
 • Defaults:
+  • On Windows 'isfname' does not include ":". Drive letters are handled
+    correctly without it. (Use |gF| for filepaths suffixed with ":line:col").
   • 'comments' includes "fb:•".
   • 'shortmess' includes the "C" flag.
   • Automatic linting of treesitter query files (see |ft-query-plugin|).
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 974aa051cf..4161d3b21e 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -53,8 +53,8 @@ Defaults					            *nvim-defaults*
 - 'hlsearch' is enabled
 - 'include' defaults to "". The C ftplugin sets it to "^\\s*#\\s*include"
 - 'incsearch' is enabled
-- 'isfname' does not include ":" on Windows. Include ":" in 'isfname' to treat
-  it as part of a filename anywhere in the name (not only the drive letter).
+- 'isfname' does not include ":" (on Windows). Drive letters are handled
+  correctly without it. (Use |gF| for filepaths suffixed with ":line:col").
 - 'joinspaces' is disabled
 - 'langnoremap' is enabled
 - 'langremap' is disabled
-- 
cgit 


From 5db076c7ccfef6732516074252ac4b21b12fc629 Mon Sep 17 00:00:00 2001
From: Aayush Ojha <aayushojha12@gmail.com>
Date: Fri, 6 Oct 2023 05:44:50 -0700
Subject: fix(lua): vim.region on linewise selection #25467

fixes #18155
---
 runtime/lua/vim/_editor.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 1ba7d6163d..bbe93bfbc8 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -548,6 +548,9 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
       else
         c2 = #bufline + 1
       end
+    elseif regtype == 'V' then -- linewise selection, always return whole line
+      c1 = 0
+      c2 = -1
     else
       c1 = (l == pos1[1]) and pos1[2] or 0
       c2 = (l == pos2[1]) and (pos2[2] + (inclusive and 1 or 0)) or -1
-- 
cgit 


From 8bb0878013a4507620201fa5aceb4c18e413bebe Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 6 Oct 2023 07:21:40 +0800
Subject: vim-patch:9.0.1990: strange error number

Problem:  strange error number
Solution: change error number,
          add doc tag for E1507

closes: vim/vim#13270

https://github.com/vim/vim/commit/ea746f9e862092aef3d4e95c64d116759b9fabe0

Co-authored-by: Christ van Willegen <cvwillegen@gmail.com>
---
 runtime/doc/builtin.txt         | 7 +++++++
 runtime/lua/vim/_meta/vimfn.lua | 7 +++++++
 2 files changed, 14 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 6de7166f83..a6c043045d 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5307,6 +5307,13 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 <			E1505: Invalid format specifier:
 			%1$d at width %2$d is: %01$*2$.3$d
 
+							*E1507*
+		This internal error indicates that the logic to
+		parse a positional format error ran into a problem
+		that couldn't be otherwise reported. Please file a
+		bug against vim if you run into this, copying the
+		exact format string and parameters that were used.
+
 prompt_getprompt({buf})                                     *prompt_getprompt()*
 		Returns the effective prompt text for buffer {buf}.  {buf} can
 		be a buffer name or number.  See |prompt-buffer|.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 5a3a5f3890..bc81322a76 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6290,6 +6290,13 @@ function vim.fn.prevnonblank(lnum) end
 --- <  E1505: Invalid format specifier:
 ---   %1$d at width %2$d is: %01$*2$.3$d
 ---
+---           *E1507*
+--- This internal error indicates that the logic to
+--- parse a positional format error ran into a problem
+--- that couldn't be otherwise reported. Please file a
+--- bug against vim if you run into this, copying the
+--- exact format string and parameters that were used.
+---
 --- @param fmt any
 --- @param expr1? any
 --- @return any
-- 
cgit 


From 92df389f1bc1709e56f3eaa0a4e0f3155dd86c97 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 7 Oct 2023 05:52:13 +0800
Subject: vim-patch:27e12c7669e3

runtime(doc): remove E1520 tag (vim/vim#13289)

https://github.com/vim/vim/commit/27e12c7669e36a8f60fefa9db9a08024efeb06e8
---
 runtime/doc/builtin.txt         | 12 +++++-------
 runtime/lua/vim/_meta/vimfn.lua | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index a6c043045d..48fa953954 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5115,8 +5115,6 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 		precision, the argument(s) to be used must also be specified
 		using a {n$} positional argument specifier. See |printf-$|.
 
-
-								*E1520*
 		The conversion specifiers and their meanings are:
 
 				*printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X*
@@ -5308,11 +5306,11 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 			%1$d at width %2$d is: %01$*2$.3$d
 
 							*E1507*
-		This internal error indicates that the logic to
-		parse a positional format error ran into a problem
-		that couldn't be otherwise reported. Please file a
-		bug against vim if you run into this, copying the
-		exact format string and parameters that were used.
+		This internal error indicates that the logic to parse a
+		positional format argument ran into a problem that couldn't be
+		otherwise reported.  Please file a bug against Vim if you run
+		into this, copying the exact format string and parameters that
+		were used.
 
 prompt_getprompt({buf})                                     *prompt_getprompt()*
 		Returns the effective prompt text for buffer {buf}.  {buf} can
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index bc81322a76..06de2fdd1c 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6098,8 +6098,6 @@ function vim.fn.prevnonblank(lnum) end
 --- precision, the argument(s) to be used must also be specified
 --- using a {n$} positional argument specifier. See |printf-$|.
 ---
----
----             *E1520*
 --- The conversion specifiers and their meanings are:
 ---
 ---     *printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X*
@@ -6291,11 +6289,11 @@ function vim.fn.prevnonblank(lnum) end
 ---   %1$d at width %2$d is: %01$*2$.3$d
 ---
 ---           *E1507*
---- This internal error indicates that the logic to
---- parse a positional format error ran into a problem
---- that couldn't be otherwise reported. Please file a
---- bug against vim if you run into this, copying the
---- exact format string and parameters that were used.
+--- This internal error indicates that the logic to parse a
+--- positional format argument ran into a problem that couldn't be
+--- otherwise reported.  Please file a bug against Vim if you run
+--- into this, copying the exact format string and parameters that
+--- were used.
 ---
 --- @param fmt any
 --- @param expr1? any
-- 
cgit 


From e7c268e38f146cfc81b91c185c17b333e2f6364d Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 6 Oct 2023 22:50:17 +0200
Subject: vim-patch:2a281ccca017

runtime(sh): Update ftplugin (vim/vim#13213)

Rename 'keywordprg' user command to ShKeywordPrg as this is just a
leaking implementation detail.

https://github.com/vim/vim/commit/2a281ccca017fb5e8ffd20a86aa390431224a2fd

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/sh.vim | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim
index c227838d18..c1a6bc5ade 100644
--- a/runtime/ftplugin/sh.vim
+++ b/runtime/ftplugin/sh.vim
@@ -3,7 +3,8 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Dan Sharp
 " Contributor:		Enno Nagel <ennonagel+vim@gmail.com>
-" Last Change:		2023 Aug 29
+"			Eisuke Kawashima
+" Last Change:		2023 Sep 28
 
 if exists("b:did_ftplugin")
   finish
@@ -39,16 +40,16 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
-if (exists("b:is_bash") && (b:is_bash == 1))
+if get(b:, "is_bash", 0)
   if !has("gui_running") && executable("less")
-    command! -buffer -nargs=1 Help silent exe '!bash -c "{ help "<args>" 2>/dev/null || man "<args>"; } | LESS= less"' | redraw!
-  elseif has('terminal')
-    command! -buffer -nargs=1 Help silent exe ':term bash -c "help "<args>" 2>/dev/null || man "<args>""'
+    command! -buffer -nargs=1 ShKeywordPrg silent exe '!bash -c "{ help "<args>" 2>/dev/null || man "<args>"; } | LESS= less"' | redraw!
+  elseif has("terminal")
+    command! -buffer -nargs=1 ShKeywordPrg silent exe ':term bash -c "help "<args>" 2>/dev/null || man "<args>""'
   else
-    command! -buffer -nargs=1 Help echo system('bash -c "help <args>" 2>/dev/null || man "<args>"')
+    command! -buffer -nargs=1 ShKeywordPrg echo system('bash -c "help <args>" 2>/dev/null || man "<args>"')
   endif
-  setlocal keywordprg=:Help
-  let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer Help"
+  setlocal keywordprg=:ShKeywordPrg
+  let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer ShKeywordPrg"
 endif
 
 let &cpo = s:save_cpo
-- 
cgit 


From 380870335f27ffeba1cd539f4f6f4559f1c2932c Mon Sep 17 00:00:00 2001
From: Famiu Haque <famiuhaque@proton.me>
Date: Sat, 7 Oct 2023 20:34:33 +0600
Subject: docs: use `abort()` for unreachable `default:` case in C

Problem: The style guide currently recommends having a `default:` case for switch statements that are not conditional on an enumerated value. Additionally, it recommends using `assert(false)` if `default:` is unreachable. This is problematic because `assert()` only runs on debug builds, which may lead to confusing breakages in release builds. Moreover, this suggestion is followed nowhere in the C code and `abort()` is used everywhere instead.

Solution: Suggest using `abort()` instead of `assert(false)`, that way the program always terminates if a logically unreachable case is reached.
---
 runtime/doc/dev_style.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/dev_style.txt b/runtime/doc/dev_style.txt
index b96b01dbff..79e758a11e 100644
--- a/runtime/doc/dev_style.txt
+++ b/runtime/doc/dev_style.txt
@@ -846,7 +846,7 @@ Annotate non-trivial fall-through between cases.
 If not conditional on an enumerated value, switch statements should always
 have a `default` case (in the case of an enumerated value, the compiler will
 warn you if any values are not handled). If the default case should never
-execute, simply `assert`: >c
+execute, simply use `abort()`: >c
 
     switch (var) {
       case 0:
@@ -856,7 +856,7 @@ execute, simply `assert`: >c
         ...
         break;
       default:
-        assert(false);
+        abort();
     }
 
 Return Values ~
-- 
cgit 


From 9abced6ad95f6300ae80cd8b8aa124ebcf511b50 Mon Sep 17 00:00:00 2001
From: LW <git@llllvvuu.dev>
Date: Sun, 8 Oct 2023 01:09:25 -0700
Subject: fix(lsp): account for border height in max floating popup height
 (#25539)

---
 runtime/lua/vim/lsp/util.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index a4c8959b99..ec0a1b0ab0 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1100,13 +1100,14 @@ function M.make_floating_popup_options(width, height, opts)
     anchor_below = lines_below > lines_above
   end
 
+  local border_height = get_border_size(opts).height
   if anchor_below then
     anchor = anchor .. 'N'
-    height = math.min(lines_below, height)
+    height = math.max(math.min(lines_below - border_height, height), 0)
     row = 1
   else
     anchor = anchor .. 'S'
-    height = math.min(lines_above, height)
+    height = math.max(math.min(lines_above - border_height, height), 0)
     row = 0
   end
 
-- 
cgit 


From e5855697e90e379128a018a8d88cf5ec008b0623 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 8 Oct 2023 19:17:19 +0200
Subject: vim-patch:1e33cd72b60a

runtime: make command name for &iskeywordprg more unique (vim/vim#13297)

See https://github.com/vim/vim/pull/13213/commits by @dkearns:
Rename 'keywordprg' user command to ShKeywordPrg as this is just a
leaking implementation detail.

https://github.com/vim/vim/commit/1e33cd72b60a119a038952bb658862d038602f76

Co-authored-by: Enno <Konfekt@users.noreply.github.com>
---
 runtime/ftplugin/gpg.vim       | 12 ++++++------
 runtime/ftplugin/modconf.vim   | 12 ++++++------
 runtime/ftplugin/muttrc.vim    | 12 ++++++------
 runtime/ftplugin/readline.vim  | 10 +++++-----
 runtime/ftplugin/sshconfig.vim | 12 ++++++------
 runtime/ftplugin/sudoers.vim   | 12 ++++++------
 runtime/ftplugin/systemd.vim   | 11 ++++++-----
 runtime/ftplugin/udevrules.vim | 12 ++++++------
 runtime/ftplugin/zsh.vim       | 12 ++++++------
 9 files changed, 53 insertions(+), 52 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/gpg.vim b/runtime/ftplugin/gpg.vim
index 2415555e09..7fb4f47ed8 100644
--- a/runtime/ftplugin/gpg.vim
+++ b/runtime/ftplugin/gpg.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:             gpg(1) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Latest Revision:      2023-10-07
 
 if exists("b:did_ftplugin")
   finish
@@ -17,17 +17,17 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 if has('unix') && executable('less')
   if !has('gui_running')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 GpgKeywordPrg
           \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+--' . <q-args> . '\b'' --hilite-search" man ' . 'gpg' |
           \ redraw!
   elseif has('terminal')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 GpgKeywordPrg
           \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+--' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'gpg'
   endif
-  if exists(':Sman') == 2
+  if exists(':GpgKeywordPrg') == 2
     setlocal iskeyword+=-
-    setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
+    setlocal keywordprg=:GpgKeywordPrg
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer GpgKeywordPrg'
   endif
 endif
 
diff --git a/runtime/ftplugin/modconf.vim b/runtime/ftplugin/modconf.vim
index d5eda5af21..22d18a9aad 100644
--- a/runtime/ftplugin/modconf.vim
+++ b/runtime/ftplugin/modconf.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:             modules.conf(5) configuration file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Latest Revision:      2023-10-07
 
 if exists("b:did_ftplugin")
   finish
@@ -18,17 +18,17 @@ setlocal formatoptions-=t formatoptions+=croql
 
 if has('unix') && executable('less')
   if !has('gui_running')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 ModconfKeywordPrg
           \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s{,8}' . <q-args> . '\b'' --hilite-search" man ' . 'modprobe.d' |
           \ redraw!
   elseif has('terminal')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 ModconfKeywordPrg
           \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'modprobe.d'
   endif
-  if exists(':Sman') == 2
+  if exists(':ModconfKeywordPrg') == 2
     setlocal iskeyword+=-
-    setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
+    setlocal keywordprg=:ModconfKeywordPrg
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ModconfKeywordPrg'
   endif
 endif
 
diff --git a/runtime/ftplugin/muttrc.vim b/runtime/ftplugin/muttrc.vim
index 7a4eb7a8bb..c9f6df31d0 100644
--- a/runtime/ftplugin/muttrc.vim
+++ b/runtime/ftplugin/muttrc.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:             mutt RC File
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-04-19
+" Latest Revision:      2023-10-07
 
 if exists("b:did_ftplugin")
   finish
@@ -20,17 +20,17 @@ let &l:include = '^\s*source\>'
 
 if has('unix') && executable('less')
   if !has('gui_running')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 MuttrcKeywordPrg
           \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . <q-args> . '\b'' --hilite-search" man ' . 'muttrc' |
           \ redraw!
   elseif has('terminal')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 MuttrcKeywordPrg
           \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'muttrc'
   endif
-  if exists(':Sman') == 2
+  if exists(':MuttrcKeywordPrg') == 2
     setlocal iskeyword+=-
-    setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
+    setlocal keywordprg=:MuttrcKeywordPrg
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer MuttrcKeywordPrg'
   endif
 endif
 
diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim
index a696da2701..181d8ac661 100644
--- a/runtime/ftplugin/readline.vim
+++ b/runtime/ftplugin/readline.vim
@@ -32,17 +32,17 @@ endif
 
 if has('unix') && executable('less')
   if !has('gui_running')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 ReadlineKeywordPrg
           \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . <q-args> . '\b'' --hilite-search" man ' . '3 readline' |
           \ redraw!
   elseif has('terminal')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 ReadlineKeywordPrg
           \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . '3 readline'
   endif
-  if exists(':Sman') == 2
+  if exists(':ReadlineKeywordPrg') == 2
     setlocal iskeyword+=-
-    setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
+    setlocal keywordprg=:ReadlineKeywordPrg
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer ReadlineKeywordPrg'
   endif
 endif
 
diff --git a/runtime/ftplugin/sshconfig.vim b/runtime/ftplugin/sshconfig.vim
index c9a5cfaa68..4a054da52f 100644
--- a/runtime/ftplugin/sshconfig.vim
+++ b/runtime/ftplugin/sshconfig.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:         OpenSSH client configuration file
 " Previous Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2008-07-09
+" Latest Revision:  2023-10-07
 
 if exists("b:did_ftplugin")
   finish
@@ -16,17 +16,17 @@ let b:undo_ftplugin = 'setlocal com< cms< fo<'
 
 if has('unix') && executable('less')
   if !has('gui_running')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 SshconfigKeywordPrg
           \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . <q-args> . '$'' --hilite-search" man ' . 'ssh_config' |
           \ redraw!
   elseif has('terminal')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 SshconfigKeywordPrg
           \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . <q-args> . '$', '\') . ''' --hilite-search" man ' . 'ssh_config'
   endif
-  if exists(':Sman') == 2
+  if exists(':SshconfigKeywordPrg') == 2
     setlocal iskeyword+=-
-    setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
+    setlocal keywordprg=:SshconfigKeywordPrg
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SshconfigKeywordPrg'
   endif
 endif
 
diff --git a/runtime/ftplugin/sudoers.vim b/runtime/ftplugin/sudoers.vim
index b4123620af..81ce7906a9 100644
--- a/runtime/ftplugin/sudoers.vim
+++ b/runtime/ftplugin/sudoers.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:             sudoers(5) configuration files
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Latest Revision:      2023-10-07
 
 if exists("b:did_ftplugin")
   finish
@@ -17,17 +17,17 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 if has('unix') && executable('less')
   if !has('gui_running')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 SudoersKeywordPrg
           \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''\b' . <q-args> . '\b'' --hilite-search" man ' . 'sudoers' |
           \ redraw!
   elseif has('terminal')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 SudoersKeywordPrg
           \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('\b' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'sudoers'
   endif
-  if exists(':Sman') == 2
+  if exists(':SudoersKeywordPrg') == 2
     setlocal iskeyword+=-
-    setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
+    setlocal keywordprg=:SudoersKeywordPrg
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SudoersKeywordPrg'
   endif
 endif
 
diff --git a/runtime/ftplugin/systemd.vim b/runtime/ftplugin/systemd.vim
index e60a5e4960..8bcacdd381 100644
--- a/runtime/ftplugin/systemd.vim
+++ b/runtime/ftplugin/systemd.vim
@@ -1,6 +1,7 @@
 " Vim filetype plugin file
 " Language:			systemd.unit(5)
 " Keyword Lookup Support:	Enno Nagel <enno.nagel+vim@gmail.com>
+" Latest Revision:      2023-10-07
 
 if !exists('b:did_ftplugin')
   " Looks a lot like dosini files.
@@ -9,11 +10,11 @@ endif
 
 if has('unix') && executable('less')
   if !has('gui_running')
-    command -buffer -nargs=1 Sman silent exe '!' . KeywordLookup_systemd(<q-args>) | redraw!
+    command -buffer -nargs=1 SystemdKeywordPrg silent exe '!' . KeywordLookup_systemd(<q-args>) | redraw!
   elseif has('terminal')
-    command -buffer -nargs=1 Sman silent exe 'term ' . KeywordLookup_systemd(<q-args>)
+    command -buffer -nargs=1 SystemdKeywordPrg silent exe 'term ' . KeywordLookup_systemd(<q-args>)
   endif
-  if exists(':Sman') == 2
+  if exists(':SystemdKeywordPrg') == 2
     if !exists('*KeywordLookup_systemd')
       function KeywordLookup_systemd(keyword) abort
         let matches = matchlist(getline(search('\v^\s*\[\s*.+\s*\]\s*$', 'nbWz')), '\v^\s*\[\s*(\k+).*\]\s*$')
@@ -26,11 +27,11 @@ if has('unix') && executable('less')
       endfunction
     endif
     setlocal iskeyword+=-
-    setlocal keywordprg=:Sman
+    setlocal keywordprg=:SystemdKeywordPrg
     if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin)
       let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<'
     else
-      let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
+      let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SystemdKeywordPrg'
     endif
   endif
 endif
diff --git a/runtime/ftplugin/udevrules.vim b/runtime/ftplugin/udevrules.vim
index 83fb728a54..ec365f04c2 100644
--- a/runtime/ftplugin/udevrules.vim
+++ b/runtime/ftplugin/udevrules.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:             udev(8) rules file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Latest Revision:      2023-10-07
 
 if exists("b:did_ftplugin")
   finish
@@ -17,17 +17,17 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 if has('unix') && executable('less')
   if !has('gui_running')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 UdevrulesKeywordPrg
           \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s{,8}' . <q-args> . '\b'' --hilite-search" man ' . 'udev' |
           \ redraw!
   elseif has('terminal')
-    command -buffer -nargs=1 Sman
+    command -buffer -nargs=1 UdevrulesKeywordPrg
           \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . <q-args> . '\b', '\') . ''' --hilite-search" man ' . 'udev'
   endif
-  if exists(':Sman') == 2
+  if exists(':UdevrulesKeywordPrg') == 2
     setlocal iskeyword+=-
-    setlocal keywordprg=:Sman
-    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman'
+    setlocal keywordprg=:UdevrulesKeywordPrg
+    let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer UdevrulesKeywordPrg'
   endif
 endif
 
diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim
index ed75d04003..40986fccbe 100644
--- a/runtime/ftplugin/zsh.vim
+++ b/runtime/ftplugin/zsh.vim
@@ -2,7 +2,7 @@
 " Language:             Zsh shell script
 " Maintainer:           Christian Brabandt <cb@256bit.org>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2021-04-03
+" Latest Revision:      2023-10-07
 " License:              Vim (see :h license)
 " Repository:           https://github.com/chrisbra/vim-zsh
 
@@ -20,17 +20,17 @@ let b:undo_ftplugin = "setl com< cms< fo< "
 
 if executable('zsh') && &shell !~# '/\%(nologin\|false\)$'
   if !has('gui_running') && executable('less')
-    command! -buffer -nargs=1 RunHelp silent exe '!MANPAGER= zsh -c "autoload -Uz run-help; run-help <args> 2>/dev/null | LESS= less"' | redraw!
+    command! -buffer -nargs=1 ZshKeywordPrg silent exe '!MANPAGER= zsh -c "autoload -Uz run-help; run-help <args> 2>/dev/null | LESS= less"' | redraw!
   elseif has('terminal')
-    command! -buffer -nargs=1 RunHelp silent exe ':term zsh -c "autoload -Uz run-help; run-help <args>"'
+    command! -buffer -nargs=1 ZshKeywordPrg silent exe ':term zsh -c "autoload -Uz run-help; run-help <args>"'
   else
-    command! -buffer -nargs=1 RunHelp echo system('zsh -c "autoload -Uz run-help; run-help <args> 2>/dev/null"')
+    command! -buffer -nargs=1 ZshKeywordPrg echo system('zsh -c "autoload -Uz run-help; run-help <args> 2>/dev/null"')
   endif
   if !exists('current_compiler')
     compiler zsh
   endif
-  setlocal keywordprg=:RunHelp
-  let b:undo_ftplugin .= 'keywordprg< | sil! delc -buffer RunHelp'
+  setlocal keywordprg=:ZshKeywordPrg
+  let b:undo_ftplugin .= 'keywordprg< | sil! delc -buffer ZshKeywordPrg'
 endif
 
 let b:match_words = '\<if\>:\<elif\>:\<else\>:\<fi\>'
-- 
cgit 


From dacd34364ff3af98bc2d357c43e3ce06638e2ce9 Mon Sep 17 00:00:00 2001
From: Jaehoon Hwang <jaehoonhwang@users.noreply.github.com>
Date: Mon, 9 Oct 2023 01:48:24 -0700
Subject: feat(ui-ext): make 'mousehide' into proper ui_option (#25532)

---
 runtime/doc/ui.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index 8784a395f2..9cf0e59854 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -211,6 +211,7 @@ the editor.
 	- 'guifontwide'
 	- 'linespace'
 	- 'mousefocus'
+	- 'mousehide'
 	- 'mousemoveevent'
 	- 'pumblend'
 	- 'showtabline'
-- 
cgit 


From c80a3976cb34c2b3c7f6f01e9ad2db41a4f67796 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Mon, 9 Oct 2023 15:34:48 -0700
Subject: docs: miscellaneous doc and type fixes (#25554)

---
 runtime/doc/options.txt               | 2 +-
 runtime/lua/vim/_meta/api.lua         | 2 +-
 runtime/lua/vim/_meta/api_keysets.lua | 2 +-
 runtime/lua/vim/_meta/options.lua     | 4 ++--
 runtime/lua/vim/_meta/vimfn.lua       | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 283c1e3612..87cf811d63 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2552,7 +2552,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    "auto":       resize to the minimum amount of folds to display.
 	    "auto:[1-9]": resize to accommodate multiple folds up to the
 			  selected level
-	    0:            to disable foldcolumn
+	    "0":          to disable foldcolumn
 	    "[1-9]":      to display a fixed number of columns
 	See |folding|.
 
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index bdcc68d7cd..5a9b0b53ce 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1,4 +1,4 @@
---- @meta
+--- @meta _
 -- THIS FILE IS GENERATED
 -- DO NOT EDIT
 error('Cannot require a meta file')
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index ebd164712c..467409505e 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -1,4 +1,4 @@
---- @meta
+--- @meta _
 -- THIS FILE IS GENERATED
 -- DO NOT EDIT
 error('Cannot require a meta file')
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 08ee1f97ba..e90a85ae0a 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -1,4 +1,4 @@
---- @meta
+--- @meta _
 -- THIS FILE IS GENERATED
 -- DO NOT EDIT
 error('Cannot require a meta file')
@@ -2276,7 +2276,7 @@ vim.go.fcl = vim.go.foldclose
 ---     "auto":       resize to the minimum amount of folds to display.
 ---     "auto:[1-9]": resize to accommodate multiple folds up to the
 --- 		  selected level
----     0:            to disable foldcolumn
+---     "0":          to disable foldcolumn
 ---     "[1-9]":      to display a fixed number of columns
 --- See `folding`.
 ---
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 06de2fdd1c..481ffd1831 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -1,4 +1,4 @@
---- @meta
+--- @meta _
 -- THIS FILE IS GENERATED
 -- DO NOT EDIT
 error('Cannot require a meta file')
@@ -8055,7 +8055,7 @@ function vim.fn.shellescape(string, special) end
 --- will be assumed.
 ---
 --- @param col? integer
---- @return any
+--- @return integer
 function vim.fn.shiftwidth(col) end
 
 --- @param name string
-- 
cgit 


From 43f22853fecf312713deed983b9cde1a6bda6ebd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 10 Oct 2023 07:06:34 +0800
Subject: docs: fix misplaced mention of 'backupdir' (#25568)

---
 runtime/doc/news.txt     | 7 ++++---
 runtime/doc/vim_diff.txt | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b0f3b76587..d3cc8cf3d0 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -57,9 +57,10 @@ The following changes may require adaptations in user config or plugins.
     • for `backspace=1` set `backspace=indent,eol`
     • for `backspace=2` set `backspace=indent,eol,start` (default behavior in Nvim)
     • for `backspace=3` set `backspace=indent,eol,nostop`
-  • paths in |'backupdir'|, |'path'| and |'cdpath'| can no longer be separated with
-    spaces (but paths themselves may contain spaces now).
-  • |'directory'| will no longer remove a `>` at the start of the option.
+  • paths in |'path'| and |'cdpath'| can no longer be separated with spaces
+    (but paths themselves may contain spaces now).
+  • |'backupdir'| and |'directory'| will no longer remove a `>` at the start
+    of the option.
 
 • |LanguageTree:parse()| will no longer parse injections by default and
   now requires an explicit range argument to be passed. If injections are
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 4161d3b21e..c354a9e463 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -657,7 +657,6 @@ Options:
   *'balloondelay'* *'bdlay'*
   *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'*
   *'balloonexpr'* *'bexpr'*
-  'backupdir': paths can no longer be separated with spaces.
   bioskey (MS-DOS)
   'cdpath': paths can no longer be separated with spaces.
   conskey (MS-DOS)
@@ -724,7 +723,7 @@ Options:
     Use |g8| or |ga|.  See |mbyte-combining|.
   *'maxmem'* Nvim delegates memory-management to the OS.
   *'maxmemtot'* Nvim delegates memory-management to the OS.
-  |'path'|: paths can no longer be separated with spaces.
+  'path': paths can no longer be separated with spaces.
   printoptions
   *'printdevice'*
   *'printencoding'*
-- 
cgit 


From f5eabaa9407ae3d1ccf6592337453c423eff3d9a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 10 Oct 2023 08:22:32 +0800
Subject: fix(path): restore space separation in 'path' (#25571)

Removing this behavior causes more inconsistencies and bugs.
---
 runtime/doc/news.txt              | 2 --
 runtime/doc/options.txt           | 4 ++++
 runtime/doc/vim_diff.txt          | 2 --
 runtime/lua/vim/_meta/options.lua | 6 ++++++
 4 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index d3cc8cf3d0..f836185cbe 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -57,8 +57,6 @@ The following changes may require adaptations in user config or plugins.
     • for `backspace=1` set `backspace=indent,eol`
     • for `backspace=2` set `backspace=indent,eol,start` (default behavior in Nvim)
     • for `backspace=3` set `backspace=indent,eol,nostop`
-  • paths in |'path'| and |'cdpath'| can no longer be separated with spaces
-    (but paths themselves may contain spaces now).
   • |'backupdir'| and |'directory'| will no longer remove a `>` at the start
     of the option.
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 87cf811d63..07f4eb80c5 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4499,6 +4499,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	option may be relative or absolute.
 	- Use commas to separate directory names: >
 		:set path=.,/usr/local/include,/usr/include
+<	- Spaces can also be used to separate directory names.  To have a
+	  space in a directory name, precede it with an extra backslash, and
+	  escape the space: >
+		:set path=.,/dir/with\\\ space
 <	- To include a comma in a directory name precede it with an extra
 	  backslash: >
 		:set path=.,/dir/with\\,comma
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index c354a9e463..d000d7c35c 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -658,7 +658,6 @@ Options:
   *'ballooneval'* *'beval'* *'noballooneval'* *'nobeval'*
   *'balloonexpr'* *'bexpr'*
   bioskey (MS-DOS)
-  'cdpath': paths can no longer be separated with spaces.
   conskey (MS-DOS)
   *'cp'* *'nocompatible'* *'nocp'* *'compatible'* (Nvim is always "nocompatible".)
   'cpoptions' (gjkHw<*- and all POSIX flags were removed)
@@ -723,7 +722,6 @@ Options:
     Use |g8| or |ga|.  See |mbyte-combining|.
   *'maxmem'* Nvim delegates memory-management to the OS.
   *'maxmemtot'* Nvim delegates memory-management to the OS.
-  'path': paths can no longer be separated with spaces.
   printoptions
   *'printdevice'*
   *'printencoding'*
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index e90a85ae0a..4f6408b136 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -4621,6 +4621,12 @@ vim.go.pm = vim.go.patchmode
 --- ```
 --- 	:set path=.,/usr/local/include,/usr/include
 --- ```
+--- - Spaces can also be used to separate directory names.  To have a
+---   space in a directory name, precede it with an extra backslash, and
+---   escape the space:
+--- ```
+--- 	:set path=.,/dir/with\\\ space
+--- ```
 --- - To include a comma in a directory name precede it with an extra
 ---   backslash:
 --- ```
-- 
cgit 


From c40a1c0f41ad2557b1e1e1850244eca2d895a07d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 10 Oct 2023 09:15:21 +0800
Subject: vim-patch:9.0.2009: cmdline-completion for comma-separated options
 wrong (#25569)

Problem:  cmdline-completion for comma-separated options wrong
Solution: Fix command-line expansions for options with filenames with
          commas

Fix command-line expansions for options with filenames with commas

Cmdline expansion for option values that take a comma-separated list
of file names is currently not handling file names with commas as the
commas are not escaped. For such options, the commas in file names need
to be escaped (to differentiate from a comma that delimit the list
items). The escaped comma is unescaped in `copy_option_part()` during
option parsing.

Fix as follows:
- Cmdline completion for option values with comma-separated file/folder
  names will not start a new match when seeing `\\,` and will instead
  consider it as one value.
- File/folder regex matching will strip the `\\` when seeing `\\,` to
  make sure it can match the correct files/folders.
- The expanded value will escape `,` with `\\,`, similar to how spaces
  are escaped to make sure the option value is correct on the cmdline.

This fix also takes into account the fact that Win32 Vim handles file
name escaping differently. Typing '\,' for a file name results in it
being handled literally but in other platforms '\,' is interpreted as a
simple ',' and commas need to be escaped using '\\,' instead.

Also, make sure this new logic only applies to comma-separated options
like 'path'. Non-list options like 'set makeprg=<Tab>' and regular ex
commands like `:edit <Tab>` do not require escaping and will continue to
work.

Also fix up documentation to be clearer. The original docs are slightly
misleading in how it discusses triple slashes for 'tags'.

closes: vim/vim#13303
related: vim/vim#13301

https://github.com/vim/vim/commit/54844857fd6933fa4f6678e47610c4b9c9f7a091

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
---
 runtime/doc/options.txt           | 26 +++++++++++++++++++++-----
 runtime/lua/vim/_meta/options.lua |  4 ++--
 2 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 07f4eb80c5..e2af4d5bc1 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -136,10 +136,26 @@ To include white space in a string option value it has to be preceded with a
 backslash.  To include a backslash you have to use two.  Effectively this
 means that the number of backslashes in an option value is halved (rounded
 down).
+In options 'path', 'cdpath', and 'tags', spaces have to be preceded with three
+backslashes instead becuase they can be separated by either commas or spaces.
+Comma-separated options like 'backupdir' and 'tags' will also require commas
+to be escaped with two backslashes, whereas this is not needed for
+non-comma-separated ones like 'makeprg'.
+When setting options using |:let| and |literal-string|, you need to use one
+fewer layer of backslash.
 A few examples: >
-   :set tags=tags\ /usr/tags	    results in "tags /usr/tags"
-   :set tags=tags\\,file	    results in "tags\,file"
-   :set tags=tags\\\ file	    results in "tags\ file"
+   :set makeprg=make\ file	    results in "make file"
+   :let &makeprg='make file'	    (same as above)
+   :set makeprg=make\\\ file	    results in "make\ file"
+   :set tags=tags\ /usr/tags	    results in "tags" and "/usr/tags"
+   :set tags=tags\\\ file	    results in "tags file"
+   :let &tags='tags\ file'	    (same as above)
+
+   :set makeprg=make,file	    results in "make,file"
+   :set makeprg=make\\,file	    results in "make\,file"
+   :set tags=tags,file		    results in "tags" and "file"
+   :set tags=tags\\,file	    results in "tags,file"
+   :let &tags='tags\,file'	    (same as above)
 
 The "|" character separates a ":set" command from a following command.  To
 include the "|" in the option value, use "\|" instead.  This example sets the
@@ -6426,8 +6442,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'tags' 'tag'		string	(default "./tags;,tags")
 			global or local to buffer |global-local|
 	Filenames for the tag command, separated by spaces or commas.  To
-	include a space or comma in a file name, precede it with a backslash
-	(see |option-backslash| about including spaces and backslashes).
+	include a space or comma in a file name, precede it with backslashes
+	(see |option-backslash| about including spaces/commas and backslashes).
 	When a file name starts with "./", the '.' is replaced with the path
 	of the current file.  But only when the 'd' flag is not included in
 	'cpoptions'.  Environment variables are expanded |:set_env|.  Also see
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 4f6408b136..a4e0e61248 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -6877,8 +6877,8 @@ vim.go.tagrelative = vim.o.tagrelative
 vim.go.tr = vim.go.tagrelative
 
 --- Filenames for the tag command, separated by spaces or commas.  To
---- include a space or comma in a file name, precede it with a backslash
---- (see `option-backslash` about including spaces and backslashes).
+--- include a space or comma in a file name, precede it with backslashes
+--- (see `option-backslash` about including spaces/commas and backslashes).
 --- When a file name starts with "./", the '.' is replaced with the path
 --- of the current file.  But only when the 'd' flag is not included in
 --- 'cpoptions'.  Environment variables are expanded `:set_env`.  Also see
-- 
cgit 


From 9ff6f73f838a1f90d09922448c434033ba5e094e Mon Sep 17 00:00:00 2001
From: Famiu Haque <famiuhaque@proton.me>
Date: Mon, 9 Oct 2023 00:36:48 +0600
Subject: refactor: allow not having a `default` case for enum

Problem: The style guide states that all switch statements that are not conditional on an enum must have a `default` case, but does not give any explicit guideline for switch statements that are conditional on enums. As a result, a `default` case is added in many enum switch statements, even when the switch statement is exhaustive. This is not ideal because it removes the ability to have compiler errors to easily detect unchanged switch statements when a new possible value for an enum is added.

Solution: Add explicit guidelines for switch statements that are conditional on an enum, clarifying that a `default` case is not necessary if the switch statement is exhaustive. Also refactor pre-existing code with unnecessary `default` cases.
---
 runtime/doc/dev_style.txt | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/dev_style.txt b/runtime/doc/dev_style.txt
index 79e758a11e..0bc27ced15 100644
--- a/runtime/doc/dev_style.txt
+++ b/runtime/doc/dev_style.txt
@@ -859,6 +859,33 @@ execute, simply use `abort()`: >c
         abort();
     }
 
+Switch statements that are conditional on an enumerated value should not have
+a `default` case if it is exhaustive. Explicit case labels are preferred over
+`default`, even if it leads to multiple case labels for the same code. For
+example, instead of: >c
+
+    case A:
+      ...
+    case B:
+      ...
+    case C:
+      ...
+    default:
+      ...
+
+You should use: >c
+
+    case A:
+      ...
+    case B:
+      ...
+    case C:
+      ...
+    case D:
+    case E:
+    case F:
+      ...
+
 Return Values ~
 
 Do not needlessly surround the `return` expression with parentheses.
-- 
cgit 


From 372aa2eb3db375385cf19dc0a6571f790b858241 Mon Sep 17 00:00:00 2001
From: glepnir <glephunter@gmail.com>
Date: Mon, 9 Oct 2023 18:47:10 +0800
Subject: feat(float): add fclose command

---
 runtime/doc/index.txt   | 1 +
 runtime/doc/news.txt    | 2 ++
 runtime/doc/windows.txt | 5 +++++
 3 files changed, 8 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index b0ead51d0c..9e34cb5eab 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1288,6 +1288,7 @@ tag		command		action ~
 |:execute|	:exe[cute]	execute result of expressions
 |:exit|		:exi[t]		same as ":xit"
 |:exusage|	:exu[sage]	overview of Ex commands
+|:fclose|	:fc[lose]	close floating window
 |:file|		:f[ile]		show or set the current file name
 |:files|	:files		list all files in the buffer list
 |:filetype|	:filet[ype]	switch file type detection on/off
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b0f3b76587..ceacb2e5da 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -188,6 +188,8 @@ The following new APIs and features were added.
 
 • |$NVIM_APPNAME| can be set to a relative path instead of only a name.
 
+• Added |:fclose| command.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index e0c0772f18..eb3c4df511 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -392,6 +392,11 @@ CTRL-W CTRL-O					*CTRL-W_CTRL-O* *:on* *:only*
 		given, then they become hidden.  But modified buffers are
 		never abandoned, so changes cannot get lost.
 
+							*:fc* *:fclose*
+:[count]fc[lose][!]
+		Close [count]th floating window by zindex order. '!' to close
+		all floating windows.
+
 ==============================================================================
 4. Moving cursor to other windows			*window-move-cursor*
 
-- 
cgit 


From c3d21ad1bccd9a2975be73b1115213fd884eada3 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Fri, 15 Sep 2023 09:43:48 +0200
Subject: docs: small fixes

Co-authored-by: Wansmer <wansmer@gmail.com>
Co-authored-by: Andrew Voynov <andrewvoynov.b@gmail.com>
Co-authored-by: David Moberg <david.moberg@mediatek.com>
---
 runtime/doc/develop.txt              |  6 +-----
 runtime/doc/lua-guide.txt            | 10 +++++-----
 runtime/doc/remote_plugin.txt        |  4 ++--
 runtime/lua/vim/treesitter/_meta.lua |  1 +
 4 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index c88b8a88c3..107915d017 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -232,11 +232,7 @@ Lua documentation lives in the source code, as docstrings on the function
 definitions.  The |lua-vim| :help is generated from the docstrings.
 
 Docstring format:
-- Use LuaLS annotations (with minor adjustments, which will be explained
-  below): https://luals.github.io/wiki/annotations/
-- Lines in the main description start with `--- `
-- Special tokens start with `--- @` followed by the token name: `--- @see`,
-  `--- @param`, `--- @returns`. Note the space between `---` and `@`.
+- Use LuaCATS annotations: https://luals.github.io/wiki/annotations/
 - Limited markdown is supported.
   - List-items start with `-` (useful to nest or "indent")
 - Use ``` for code samples.
diff --git a/runtime/doc/lua-guide.txt b/runtime/doc/lua-guide.txt
index e2fece916c..c15b1b0495 100644
--- a/runtime/doc/lua-guide.txt
+++ b/runtime/doc/lua-guide.txt
@@ -462,9 +462,9 @@ useful options:
     vim.keymap.set('n', '<Leader>pl1', require('plugin').action,
       { desc = 'Execute action from plugin' })
 <
-• `remap`: By default, all mappings are nonrecursive by default (i.e.,
-  |vim.keymap.set()| behaves like |:noremap|). If the {rhs} is itself a mapping
-  that should be executed, set `remap = true`: >lua
+• `remap`: By default, all mappings are nonrecursive (i.e., |vim.keymap.set()|
+  behaves like |:noremap|). If the {rhs} is itself a mapping that should be
+  executed, set `remap = true`: >lua
     vim.keymap.set('n', '<Leader>ex1', '<cmd>echo "Example 1"<cr>')
     -- add a shorter mapping
     vim.keymap.set('n', 'e', '<Leader>ex1', { remap = true })
@@ -670,8 +670,8 @@ cover only the basics of this advanced topic.
 ------------------------------------------------------------------------------
 Creating user commands                           *lua-guide-commands-create*
 
-User commands can be created through with |nvim_create_user_command()|. This
-function takes three mandatory arguments:
+User commands can be created via |nvim_create_user_command()|. This function
+takes three mandatory arguments:
 • a string that is the name of the command (which must start with an uppercase
   letter to distinguish it from builtin commands);
 • a string containing Vim commands or a Lua function that is executed when the
diff --git a/runtime/doc/remote_plugin.txt b/runtime/doc/remote_plugin.txt
index ea35cf2b78..cfe4b08000 100644
--- a/runtime/doc/remote_plugin.txt
+++ b/runtime/doc/remote_plugin.txt
@@ -40,8 +40,8 @@ fast as possible, even if many plugins/hosts are installed.
 The best way to learn about remote plugins is with an example, so let's see
 what a Python plugin looks like. This plugin exports a command, a function, and
 an autocmd. The plugin is called 'Limit', and all it does is limit the number
-of requests made to it. Here's the plugin source code:
->
+of requests made to it. Here's the plugin source code: >python
+
     import pynvim
 
     @pynvim.plugin
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index d01b7be3b0..cd8462bcb7 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -29,6 +29,7 @@
 ---@field sexpr fun(self: TSNode): string
 ---@field equal fun(self: TSNode, other: TSNode): boolean
 ---@field iter_children fun(self: TSNode): fun(): TSNode, string
+---@field field fun(self: TSNode, name: string): TSNode[]
 local TSNode = {}
 
 ---@param query userdata
-- 
cgit 


From c4f8be464c99090dabc6376222830dffe0bf5b12 Mon Sep 17 00:00:00 2001
From: Famiu Haque <famiuhaque@proton.me>
Date: Tue, 10 Oct 2023 16:39:06 +0600
Subject: docs(style): add guideline for fixing compiler error on switch
 statement

Problem: Certain compilers (primarily GCC) do not recognize an exhaustive enum switch statement as being exhaustive. This manifests in the form of compiler errors in exhaustive switch statements where each case has a return statement but there isn't a catch-all return statements. These compiler errors are spurious in the context of the Neovim codebase. So #25533 added the `UNREACHABLE` macro to denote apart of the code that's unreachable, which was used after every such switch statement to tell the compiler to treat the switch statement as exhaustive. However, the macro is mentioned nowhere in the style guide,and new contributors would not have any natural way of learning about it as it stands now. This would lead to confusion when they inevitably encounter one of these compiler errors.

Solution: Add a style guideline which shows how to use the `UNREACHABLE` macro to fix these compiler errors.
---
 runtime/doc/dev_style.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/dev_style.txt b/runtime/doc/dev_style.txt
index 0bc27ced15..d6c465ef91 100644
--- a/runtime/doc/dev_style.txt
+++ b/runtime/doc/dev_style.txt
@@ -886,6 +886,25 @@ You should use: >c
     case F:
       ...
 
+Certain compilers do not recognize an exhaustive enum switch statement as
+exhaustive, which causes compiler warnings when there is a return statement in
+every case of a switch statement, but no catch-all return statement. To fix
+these spurious errors, you are advised to use `UNREACHABLE` after the switch
+statement to explicitly tell the compiler that the switch statement always
+returns and any code after it is unreachable. For example: >c
+
+    enum { A, B, C } var;
+    ...
+    switch (var) {
+      case A:
+        return 1;
+      case B:
+        return 2;
+      case C:
+        return 3;
+    }
+    UNREACHABLE;
+
 Return Values ~
 
 Do not needlessly surround the `return` expression with parentheses.
-- 
cgit 


From f79052faef874b19ebbed007c30eb3f2c994a8b2 Mon Sep 17 00:00:00 2001
From: Raphael <glephunter@gmail.com>
Date: Wed, 11 Oct 2023 15:03:59 +0800
Subject: refactor(float): rename ex_floatclose to ex_fclose (#25596)

---
 runtime/doc/windows.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index eb3c4df511..d6fce89f23 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -394,8 +394,8 @@ CTRL-W CTRL-O					*CTRL-W_CTRL-O* *:on* *:only*
 
 							*:fc* *:fclose*
 :[count]fc[lose][!]
-		Close [count]th floating window by zindex order. '!' to close
-		all floating windows.
+		Close [count] floating windows with the highest zindex values.
+		'!' to close all floating windows.
 
 ==============================================================================
 4. Moving cursor to other windows			*window-move-cursor*
-- 
cgit 


From 37da0bc0c63083f79d2fbf4622a9b3fd47c415df Mon Sep 17 00:00:00 2001
From: sisrfeng <53520949+sisrfeng@users.noreply.github.com>
Date: Wed, 11 Oct 2023 17:58:07 +0800
Subject: docs: clarify about error in shada (#25594)

---
 runtime/doc/starting.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index d38712b067..04d9142a58 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1119,7 +1119,8 @@ any free letter from `a` to `z`) while normally it will create this file,
 write to it and then rename `{basename}.tmp.X` to `{basename}`. Such errors
 include:
 
-- Errors which make Nvim think that read file is not a ShaDa file at all:
+- Errors which make Nvim think that the file being read is not a ShaDa
+  file at all:
   non-ShaDa files are not overwritten for safety reasons to avoid accidentally
   destroying an unrelated file.  This could happen e.g. when typing "nvim -i
   file" in place of "nvim -R file" (yes, somebody did that at least with Vim).
@@ -1337,10 +1338,13 @@ exactly four MessagePack objects:
                        reasons, see |shada-compatibility|.
 
 								*E575* *E576*
-Errors in ShaDa file may have two types: E575 used for all “logical” errors
-and E576 used for all “critical” errors.  Critical errors trigger behaviour
-described in |shada-error-handling| when writing and skipping the rest of the
-file when reading and include:
+Errors in ShaDa file may have two types:
+1. E575 for “logical” errors.
+2. E576 for “critical” errors.
+When writing, critical errors trigger behaviour described in
+|shada-error-handling|.
+When reading, critical errors cause the rest of the file to be skipped.
+Critical errors include:
 					    *shada-critical-contents-errors*
 - Any of first three MessagePack objects being not an unsigned integer.
 - Third object requesting amount of bytes greater then bytes left in the ShaDa
-- 
cgit 


From 2fde6295df8cdfb36ed02ef5f9a3b6a523b1ac23 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Wed, 11 Oct 2023 13:38:58 -0700
Subject: fix(lsp): display initialization errors (#25409)

---
 runtime/lua/vim/lsp.lua | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index f68ca7e88c..4b1da94d77 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -189,7 +189,9 @@ lsp.client_errors = tbl_extend(
   'error',
   lsp_rpc.client_errors,
   vim.tbl_add_reverse_lookup({
-    ON_INIT_CALLBACK_ERROR = table.maxn(lsp_rpc.client_errors) + 1,
+    BEFORE_INIT_CALLBACK_ERROR = table.maxn(lsp_rpc.client_errors) + 1,
+    ON_INIT_CALLBACK_ERROR = table.maxn(lsp_rpc.client_errors) + 2,
+    ON_ATTACH_ERROR = table.maxn(lsp_rpc.client_errors) + 3,
   })
 )
 
@@ -1172,6 +1174,16 @@ function lsp.start_client(config)
     return nil, lsp.rpc_response_error(protocol.ErrorCodes.MethodNotFound)
   end
 
+  --- Logs the given error to the LSP log and to the error buffer.
+  --- @param code integer Error code
+  --- @param err any Error arguments
+  local function write_error(code, err)
+    if log.error() then
+      log.error(log_prefix, 'on_error', { code = lsp.client_errors[code], err = err })
+    end
+    err_message(log_prefix, ': Error ', lsp.client_errors[code], ': ', vim.inspect(err))
+  end
+
   ---@private
   --- Invoked when the client operation throws an error.
   ---
@@ -1180,10 +1192,7 @@ function lsp.start_client(config)
   ---@see vim.lsp.rpc.client_errors for possible errors. Use
   ---`vim.lsp.rpc.client_errors[code]` to get a human-friendly name.
   function dispatch.on_error(code, err)
-    if log.error() then
-      log.error(log_prefix, 'on_error', { code = lsp.client_errors[code], err = err })
-    end
-    err_message(log_prefix, ': Error ', lsp.client_errors[code], ': ', vim.inspect(err))
+    write_error(code, err)
     if config.on_error then
       local status, usererr = pcall(config.on_error, code, err)
       if not status then
@@ -1391,8 +1400,10 @@ function lsp.start_client(config)
       trace = valid_traces[config.trace] or 'off',
     }
     if config.before_init then
-      -- TODO(ashkan) handle errors here.
-      pcall(config.before_init, initialize_params, config)
+      local status, err = pcall(config.before_init, initialize_params, config)
+      if not status then
+        write_error(lsp.client_errors.BEFORE_INIT_CALLBACK_ERROR, err)
+      end
     end
 
     --- @param method string
@@ -1440,7 +1451,7 @@ function lsp.start_client(config)
       if config.on_init then
         local status, err = pcall(config.on_init, client, result)
         if not status then
-          pcall(handlers.on_error, lsp.client_errors.ON_INIT_CALLBACK_ERROR, err)
+          write_error(lsp.client_errors.ON_INIT_CALLBACK_ERROR, err)
         end
       end
       local _ = log.info()
@@ -1714,8 +1725,10 @@ function lsp.start_client(config)
     })
 
     if config.on_attach then
-      -- TODO(ashkan) handle errors.
-      pcall(config.on_attach, client, bufnr)
+      local status, err = pcall(config.on_attach, client, bufnr)
+      if not status then
+        write_error(lsp.client_errors.ON_ATTACH_ERROR, err)
+      end
     end
 
     -- schedule the initialization of semantic tokens to give the above
-- 
cgit 


From 7474874baa3ea960fab38b66db36870b797afd5b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Wed, 11 Oct 2023 22:01:32 +0200
Subject: vim-patch:9.0.2011: INI files not detected

Problem:  INI files not detected
Solution: detect uppercase .INI as dosini files

It previo~1 only worked for lower-case .ini files, but upperc~1 .INI is
also somewhat common on account of DOS' old 8.3 upperc~2 only filena~1.

closes: vim/vim#13316

https://github.com/vim/vim/commit/4a82bdfaa8022402b1ca0f0000c94c47a13f1014

Co-authored-by: Martin Tournoij <martin@arp242.net>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index c412364461..b2fbea5405 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -352,6 +352,7 @@ local extension = {
   bat = 'dosbatch',
   wrap = 'dosini',
   ini = 'dosini',
+  INI = 'dosini',
   vbp = 'dosini',
   dot = 'dot',
   gv = 'dot',
-- 
cgit 


From 840e1864c2de2b4b192a4df1865b69093904b139 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 12 Oct 2023 15:39:39 +0800
Subject: fix(lsp): handle NUL bytes in popup text (#25612)

Fix #25610
---
 runtime/lua/vim/lsp/util.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index ec0a1b0ab0..7e6855528a 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1647,7 +1647,7 @@ function M._make_floating_popup_size(contents, opts)
     width = 0
     for i, line in ipairs(contents) do
       -- TODO(ashkan) use nvim_strdisplaywidth if/when that is introduced.
-      line_widths[i] = vim.fn.strdisplaywidth(line)
+      line_widths[i] = vim.fn.strdisplaywidth(line:gsub('%z', '\n'))
       width = math.max(line_widths[i], width)
     end
   end
@@ -1676,7 +1676,7 @@ function M._make_floating_popup_size(contents, opts)
       height = 0
       if vim.tbl_isempty(line_widths) then
         for _, line in ipairs(contents) do
-          local line_width = vim.fn.strdisplaywidth(line)
+          local line_width = vim.fn.strdisplaywidth(line:gsub('%z', '\n'))
           height = height + math.ceil(line_width / wrap_at)
         end
       else
-- 
cgit 


From ee156ca60ede95c95160cb8dff0197d40cb1a491 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sat, 14 Oct 2023 00:06:40 -0700
Subject: fix(lsp): refactor escaping snippet text (#25611)

---
 runtime/lua/vim/lsp/_snippet_grammar.lua | 48 ++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_snippet_grammar.lua b/runtime/lua/vim/lsp/_snippet_grammar.lua
index 86f00fea51..eb72efdf39 100644
--- a/runtime/lua/vim/lsp/_snippet_grammar.lua
+++ b/runtime/lua/vim/lsp/_snippet_grammar.lua
@@ -20,11 +20,15 @@ local format_capture = Cg(int / tonumber, 'capture')
 local format_modifier = Cg(P('upcase') + P('downcase') + P('capitalize'), 'modifier')
 local tabstop = Cg(int / tonumber, 'tabstop')
 
+-- These characters are always escapable in text nodes no matter the context.
+local escapable = '$}\\'
+
 --- Returns a function that unescapes occurrences of "special" characters.
 ---
---- @param special string
+--- @param special? string
 --- @return fun(match: string): string
 local function escape_text(special)
+  special = special or escapable
   return function(match)
     local escaped = match:gsub('\\(.)', function(c)
       return special:find(c) and c or '\\' .. c
@@ -33,25 +37,33 @@ local function escape_text(special)
   end
 end
 
--- Text nodes match "any character", but $, \, and } must be escaped.
-local escapable = '$}\\'
-local text = (backslash * S(escapable)) + (P(1) - S(escapable))
-local text_0, text_1 = (text ^ 0) / escape_text(escapable), text ^ 1
+--- Returns a pattern for text nodes. Will match characters in `escape` when preceded by a backslash,
+--- and will stop with characters in `stop_with`.
+---
+--- @param escape string
+--- @param stop_with? string
+--- @return vim.lpeg.Pattern
+local function text(escape, stop_with)
+  stop_with = stop_with or escape
+  return (backslash * S(escape)) + (P(1) - S(stop_with))
+end
+
+-- For text nodes inside curly braces. It stops parsing when reaching an escapable character.
+local braced_text = (text(escapable) ^ 0) / escape_text()
+
 -- Within choice nodes, \ also escapes comma and pipe characters.
-local choice_text = C(((backslash * S(escapable .. ',|')) + (P(1) - S(escapable .. ',|'))) ^ 1)
-  / escape_text(escapable .. ',|')
-local if_text, else_text = Cg(text_0, 'if_text'), Cg(text_0, 'else_text')
+local choice_text = C(text(escapable .. ',|') ^ 1) / escape_text(escapable .. ',|')
+
 -- Within format nodes, make sure we stop at /
-local format_text = C(((backslash * S(escapable)) + (P(1) - S(escapable .. '/'))) ^ 1)
-  / escape_text(escapable)
+local format_text = C(text(escapable, escapable .. '/') ^ 1) / escape_text()
+
+local if_text, else_text = Cg(braced_text, 'if_text'), Cg(braced_text, 'else_text')
+
 -- Within ternary condition format nodes, make sure we stop at :
-local if_till_colon_text = Cg(
-  C(((backslash * S(escapable)) + (P(1) - S(escapable .. ':'))) ^ 1) / escape_text(escapable),
-  'if_text'
-)
+local if_till_colon_text = Cg(C(text(escapable, escapable .. ':') ^ 1) / escape_text(), 'if_text')
 
 -- Matches the string inside //, allowing escaping of the closing slash.
-local regex = Cg(((backslash * slash) + (P(1) - slash)) ^ 1, 'regex')
+local regex = Cg(text('/') ^ 1, 'regex')
 
 -- Regex constructor flags (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/RegExp#parameters).
 local options = Cg(S('dgimsuvy') ^ 0, 'options')
@@ -94,11 +106,11 @@ local G = P({
   snippet = Ct(Cg(
     Ct((
       V('any') +
-      (Ct(Cg(text_1 / escape_text(escapable), 'text')) / node(Type.Text))
+      (Ct(Cg((text(escapable, '$') ^ 1) / escape_text(), 'text')) / node(Type.Text))
     ) ^ 1), 'children'
-  )) / node(Type.Snippet),
-  any_or_text = V('any') + (Ct(Cg(text_0 / escape_text(escapable), 'text')) / node(Type.Text)),
+  ) * -P(1)) / node(Type.Snippet),
   any = V('placeholder') + V('tabstop') + V('choice') + V('variable'),
+  any_or_text = V('any') + (Ct(Cg(braced_text, 'text')) / node(Type.Text)),
   tabstop = Ct(dollar * (tabstop + (l_brace * tabstop * r_brace))) / node(Type.Tabstop),
   placeholder = Ct(dollar * l_brace * tabstop * colon * Cg(V('any_or_text'), 'value') * r_brace) / node(Type.Placeholder),
   choice = Ct(dollar *
-- 
cgit 


From 712adacdf546fbaccd9f2134534889a3f6f36dbc Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sat, 14 Oct 2023 09:47:20 +0200
Subject: refactor(lsp): make is_pull in lsp.diagnostic.get_namespace optional
 (#25156)

Follw up to https://github.com/neovim/neovim/commit/63b3408551561127f7845470eb51404bcd6f547b

`is_pull` should be optional, otherwise it is an API change that
introduces warnings in consumers.

Also fixes the type annotation of `_client_pull_namespaces` where the
key is a string.
---
 runtime/doc/lsp.txt                |  4 ++--
 runtime/lua/vim/lsp/diagnostic.lua | 41 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 5d32a1b4d0..10e1a2c2c5 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1356,8 +1356,8 @@ get_namespace({client_id}, {is_pull})
 
     Parameters: ~
       • {client_id}  (integer) The id of the LSP client
-      • {is_pull}    (boolean) Whether the namespace is for a pull or push
-                     client
+      • {is_pull}    boolean? Whether the namespace is for a pull or push
+                     client. Defaults to push
 
                                           *vim.lsp.diagnostic.on_diagnostic()*
 on_diagnostic({_}, {result}, {ctx}, {config})
diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index 73ffa1a46c..73444d8c6a 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -159,44 +159,45 @@ local function diagnostic_vim_to_lsp(diagnostics)
   end, diagnostics)
 end
 
----@type table<integer,integer>
+---@type table<integer, integer>
 local _client_push_namespaces = {}
----@type table<integer,integer>
+
+---@type table<string, integer>
 local _client_pull_namespaces = {}
 
 --- Get the diagnostic namespace associated with an LSP client |vim.diagnostic| for diagnostics
 ---
 ---@param client_id integer The id of the LSP client
----@param is_pull boolean Whether the namespace is for a pull or push client
+---@param is_pull boolean? Whether the namespace is for a pull or push client. Defaults to push
 function M.get_namespace(client_id, is_pull)
   vim.validate({ client_id = { client_id, 'n' } })
 
-  local namespace_table
-  local key
-  local name
   local client = vim.lsp.get_client_by_id(client_id)
-
   if is_pull then
-    namespace_table = _client_pull_namespaces
-    local server_id = vim.tbl_get(client.server_capabilities, 'diagnosticProvider', 'identifier')
-    key = string.format('%d:%s', client_id, server_id or 'nil')
-    name = string.format(
+    local server_id =
+      vim.tbl_get((client or {}).server_capabilities, 'diagnosticProvider', 'identifier')
+    local key = string.format('%d:%s', client_id, server_id or 'nil')
+    local name = string.format(
       'vim.lsp.%s.%d.%s',
       client and client.name or 'unknown',
       client_id,
       server_id or 'nil'
     )
+    local ns = _client_pull_namespaces[key]
+    if not ns then
+      ns = api.nvim_create_namespace(name)
+      _client_pull_namespaces[key] = ns
+    end
+    return ns
   else
-    namespace_table = _client_push_namespaces
-    key = client_id
-    name = string.format('vim.lsp.%s.%d', client and client.name or 'unknown', client_id)
-  end
-
-  if not namespace_table[key] then
-    namespace_table[key] = api.nvim_create_namespace(name)
+    local name = string.format('vim.lsp.%s.%d', client and client.name or 'unknown', client_id)
+    local ns = _client_push_namespaces[client_id]
+    if not ns then
+      ns = api.nvim_create_namespace(name)
+      _client_push_namespaces[client_id] = ns
+    end
+    return ns
   end
-
-  return namespace_table[key]
 end
 
 --- |lsp-handler| for the method "textDocument/publishDiagnostics"
-- 
cgit 


From 57ce9b6a92977fb11269d99be0bb06eab18eda75 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sat, 14 Oct 2023 11:31:16 +0200
Subject: refactor(lsp): fix luals warnings in tagfunc and add type annotations
 (#25150)

---
 runtime/lua/vim/lsp/tagfunc.lua | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/tagfunc.lua b/runtime/lua/vim/lsp/tagfunc.lua
index 957449743b..4ad50e4a58 100644
--- a/runtime/lua/vim/lsp/tagfunc.lua
+++ b/runtime/lua/vim/lsp/tagfunc.lua
@@ -2,6 +2,11 @@ local lsp = vim.lsp
 local util = lsp.util
 local ms = lsp.protocol.Methods
 
+---@param name string
+---@param range lsp.Range
+---@param uri string
+---@param offset_encoding string
+---@return {name: string, filename: string, cmd: string, kind?: string}
 local function mk_tag_item(name, range, uri, offset_encoding)
   local bufnr = vim.uri_to_bufnr(uri)
   -- This is get_line_byte_from_position is 0-indexed, call cursor expects a 1-indexed position
@@ -13,6 +18,8 @@ local function mk_tag_item(name, range, uri, offset_encoding)
   }
 end
 
+---@param pattern string
+---@return table[]
 local function query_definition(pattern)
   local params = util.make_position_params()
   local results_by_client, err = lsp.buf_request_sync(0, ms.textDocument_definition, params, 1000)
@@ -23,17 +30,19 @@ local function query_definition(pattern)
   local add = function(range, uri, offset_encoding)
     table.insert(results, mk_tag_item(pattern, range, uri, offset_encoding))
   end
-  for client_id, lsp_results in pairs(results_by_client) do
+  for client_id, lsp_results in pairs(assert(results_by_client)) do
     local client = lsp.get_client_by_id(client_id)
+    local offset_encoding = client and client.offset_encoding or 'utf-16'
     local result = lsp_results.result or {}
     if result.range then -- Location
       add(result.range, result.uri)
-    else -- Location[] or LocationLink[]
+    else
+      result = result --[[@as (lsp.Location[]|lsp.LocationLink[])]]
       for _, item in pairs(result) do
         if item.range then -- Location
-          add(item.range, item.uri, client.offset_encoding)
+          add(item.range, item.uri, offset_encoding)
         else -- LocationLink
-          add(item.targetSelectionRange, item.targetUri, client.offset_encoding)
+          add(item.targetSelectionRange, item.targetUri, offset_encoding)
         end
       end
     end
@@ -41,6 +50,8 @@ local function query_definition(pattern)
   return results
 end
 
+---@param pattern string
+---@return table[]
 local function query_workspace_symbols(pattern)
   local results_by_client, err =
     lsp.buf_request_sync(0, ms.workspace_symbol, { query = pattern }, 1000)
@@ -48,11 +59,13 @@ local function query_workspace_symbols(pattern)
     return {}
   end
   local results = {}
-  for client_id, symbols in pairs(results_by_client) do
+  for client_id, responses in pairs(assert(results_by_client)) do
     local client = lsp.get_client_by_id(client_id)
-    for _, symbol in pairs(symbols.result or {}) do
+    local offset_encoding = client and client.offset_encoding or 'utf-16'
+    local symbols = responses.result --[[@as lsp.SymbolInformation[]|nil]]
+    for _, symbol in pairs(symbols or {}) do
       local loc = symbol.location
-      local item = mk_tag_item(symbol.name, loc.range, loc.uri, client.offset_encoding)
+      local item = mk_tag_item(symbol.name, loc.range, loc.uri, offset_encoding)
       item.kind = lsp.protocol.SymbolKind[symbol.kind] or 'Unknown'
       table.insert(results, item)
     end
@@ -61,12 +74,8 @@ local function query_workspace_symbols(pattern)
 end
 
 local function tagfunc(pattern, flags)
-  local matches
-  if string.match(flags, 'c') then
-    matches = query_definition(pattern)
-  else
-    matches = query_workspace_symbols(pattern)
-  end
+  local matches = string.match(flags, 'c') and query_definition(pattern)
+    or query_workspace_symbols(pattern)
   -- fall back to tags if no matches
   return #matches > 0 and matches or vim.NIL
 end
-- 
cgit 


From bcda800933f6de09392c3c91e290077952989722 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 14 Oct 2023 19:18:25 +0800
Subject: vim-patch:9.0.2022: getmousepos() returns wrong index for TAB char
 (#25636)

Problem:  When clicking in the middle of a TAB, getmousepos() returns
          the column of the next char instead of the TAB.
Solution: Break out of the loop when the vcol to find is inside current
          char. Fix invalid memory access when calling virtcol2col() on
          an empty line.

closes: vim/vim#13321

https://github.com/vim/vim/commit/b583eda7031b1f6a3469a2537d0c10ca5fa5568e
---
 runtime/doc/builtin.txt         | 2 ++
 runtime/lua/vim/_meta/vimfn.lua | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 48fa953954..c09c0d552e 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -8509,6 +8509,8 @@ virtcol2col({winid}, {lnum}, {col})                              *virtcol2col()*
 		character in window {winid} at buffer line {lnum} and virtual
 		column {col}.
 
+		If buffer line {lnum} is an empty line, 0 is returned.
+
 		If {col} is greater than the last virtual column in line
 		{lnum}, then the byte index of the character at the last
 		virtual column is returned.
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 481ffd1831..a2d9ce5bc4 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -10099,6 +10099,8 @@ function vim.fn.virtcol(expr, list, winid) end
 --- character in window {winid} at buffer line {lnum} and virtual
 --- column {col}.
 ---
+--- If buffer line {lnum} is an empty line, 0 is returned.
+---
 --- If {col} is greater than the last virtual column in line
 --- {lnum}, then the byte index of the character at the last
 --- virtual column is returned.
-- 
cgit 


From 20dacacf374d93d9bef45626d5851265d1075841 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 14 Oct 2023 19:28:41 +0800
Subject: vim-patch:2bbd0d30eebd (#25637)

runtime(doc): Improve command-line completion docs (vim/vim#13331)

* Improve command-line completion docs

Add more details about 'ignorecase' and its effect on cmdline
completion.

Make sure keys used in wildmenu are properly documented and linked in the
keys' documentation entries, and in `:h index` for proper
cross-referencing, as wildmenu popup is slightly different from
insert-mode popup menu.

* Fix docs typos

https://github.com/vim/vim/commit/2bbd0d30eebdea66c0da3895e83d999ed6ad83fb

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
---
 runtime/doc/cmdline.txt           | 25 ++++++++++++++++++-------
 runtime/doc/index.txt             | 16 ++++++++++++++++
 runtime/doc/options.txt           | 21 ++++++++++++---------
 runtime/lua/vim/_meta/options.lua | 21 ++++++++++++---------
 4 files changed, 58 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 63967f84a1..1a5ad9a382 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -81,9 +81,11 @@ CTRL-SHIFT-Q	Works just like CTRL-V, but do not try to include the CTRL
 		modifier into the key.
 
 							*c_<Left>* *c_Left*
-<Left>		cursor left
+<Left>		cursor left.  See 'wildmenu' for behavior during wildmenu
+		completion mode.
 							*c_<Right>* *c_Right*
-<Right>		cursor right
+<Right>		cursor right.  See 'wildmenu' for behavior during wildmenu
+		completion mode.
 							*c_<S-Left>*
 <S-Left> or <C-Left>					*c_<C-Left>*
 		cursor one WORD left
@@ -93,7 +95,8 @@ CTRL-SHIFT-Q	Works just like CTRL-V, but do not try to include the CTRL
 CTRL-B or <Home>				*c_CTRL-B* *c_<Home>* *c_Home*
 		cursor to beginning of command-line
 CTRL-E or <End>					*c_CTRL-E* *c_<End>* *c_End*
-		cursor to end of command-line
+		cursor to end of command-line.  See 'wildmenu' for behavior
+		during wildmenu completion mode.
 
 							*c_<LeftMouse>*
 <LeftMouse>	Move the cursor to the position of the mouse click.
@@ -226,6 +229,7 @@ CTRL-\ e {expr}						*c_CTRL-\_e*
 CTRL-Y		When there is a modeless selection, copy the selection into
 		the clipboard.
 		If there is no selection CTRL-Y is inserted as a character.
+		See 'wildmenu' for behavior during wildmenu completion mode.
 
 							*c_CTRL-Z*
 CTRL-Z		Trigger 'wildmode'. Same as 'wildcharm', but always available.
@@ -248,10 +252,12 @@ CTRL-C		quit command-line without executing
 
 							*c_<Up>* *c_Up*
 <Up>		recall older command-line from history, whose beginning
-		matches the current command-line (see below).
+		matches the current command-line (see below).  See 'wildmenu'
+		for behavior during wildmenu completion mode.
 							*c_<Down>* *c_Down*
 <Down>		recall more recent command-line from history, whose beginning
-		matches the current command-line (see below).
+		matches the current command-line (see below).  See 'wildmenu'
+		for behavior during wildmenu completion mode.
 
 							*c_<S-Up>* *c_<PageUp>*
 <S-Up> or <PageUp>
@@ -439,11 +445,16 @@ When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
 ending up back to what was typed.  If the first match is not what you wanted,
 you can use <S-Tab> or CTRL-P to go straight back to what you typed.
 
-The 'wildignorecase' option can be set to ignore case in filenames.
-
 The 'wildmenu' option can be set to show the matches just above the command
 line.
 
+The 'wildoptions' option provides additional configuration to use a popup menu
+for 'wildmenu', and to use fuzzy matching.
+
+The 'wildignorecase' option can be set to ignore case in filenames.  For
+completing other texts (e.g. command names), the 'ignorecase' option is used
+instead (fuzzy matching always ignores case, however).
+
 If you like tcsh's autolist completion, you can use this mapping:
 	:cnoremap X <C-L><C-D>
 (Where X is the command key to use, <C-L> is CTRL-L and <C-D> is CTRL-D)
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 9e34cb5eab..75b12fece2 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1096,6 +1096,22 @@ tag		command		action in Command-line editing mode	~
 |c_<Insert>|	<Insert>	toggle insert/overstrike mode
 |c_<LeftMouse>|	<LeftMouse>	cursor at mouse click
 
+commands in wildmenu mode (see 'wildmenu')
+
+		<Up>		move up to parent
+		<Down>		move down to submenu
+		<Left>		select the previous match
+		<Right>		select the next match
+		<CR>		move into submenu when doing menu completion
+		CTRL-E		stop completion and go back to original text
+		CTRL-Y		accept selected match and stop completion
+		other		stop completion and insert the typed character
+
+commands in wildmenu mode with 'wildoptions' set to "pum"
+
+		<PageUp>	select a match several entries back
+		<PageDown>	select a match several entries forward
+
 ==============================================================================
 5. Terminal mode				*terminal-mode-index*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e2af4d5bc1..6ca2de8097 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3255,8 +3255,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			*'ignorecase'* *'ic'* *'noignorecase'* *'noic'*
 'ignorecase' 'ic'	boolean	(default off)
 			global
-	Ignore case in search patterns, completion, and when searching the tags file.
-	See also 'smartcase' and 'tagcase'.
+	Ignore case in search patterns, |cmdline-completion|, when
+	searching in the tags file, and |expr-==|.
 	Can be overruled by using "\c" or "\C" in the pattern, see
 	|/ignorecase|.
 
@@ -6975,18 +6975,21 @@ A jump table for the options with a short description can be found at |Q_op|.
 	a completion.
 
 	While the menu is active these keys have special meanings:
-
-	CTRL-Y		- accept the currently selected match and stop
-			  completion.
-	CTRL-E		- end completion, go back to what was there before
-			  selecting a match.
+	CTRL-P		- go to the previous entry
+	CTRL-N		- go to the next entry
 	<Left> <Right>	- select previous/next match (like CTRL-P/CTRL-N)
+	<PageUp>	- select a match several entries back
+	<PageDown>	- select a match several entries further
+	<Up>		- in filename/menu name completion: move up into
+			  parent directory or parent menu.
 	<Down>		- in filename/menu name completion: move into a
 			  subdirectory or submenu.
 	<CR>		- in menu completion, when the cursor is just after a
 			  dot: move into a submenu.
-	<Up>		- in filename/menu name completion: move up into
-			  parent directory or parent menu.
+	CTRL-E		- end completion, go back to what was there before
+			  selecting a match.
+	CTRL-Y		- accept the currently selected match and stop
+			  completion.
 
 	If you want <Left> and <Right> to move the cursor instead of selecting
 	a different match, use this: >
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index a4e0e61248..3d4f911f96 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -3087,8 +3087,8 @@ vim.go.icon = vim.o.icon
 vim.o.iconstring = ""
 vim.go.iconstring = vim.o.iconstring
 
---- Ignore case in search patterns, completion, and when searching the tags file.
---- See also 'smartcase' and 'tagcase'.
+--- Ignore case in search patterns, `cmdline-completion`, when
+--- searching in the tags file, and `expr-==`.
 --- Can be overruled by using "\c" or "\C" in the pattern, see
 --- `/ignorecase`.
 ---
@@ -7539,18 +7539,21 @@ vim.go.wic = vim.go.wildignorecase
 --- a completion.
 ---
 --- While the menu is active these keys have special meanings:
----
---- CTRL-Y		- accept the currently selected match and stop
---- 		  completion.
---- CTRL-E		- end completion, go back to what was there before
---- 		  selecting a match.
+--- CTRL-P		- go to the previous entry
+--- CTRL-N		- go to the next entry
 --- <Left> <Right>	- select previous/next match (like CTRL-P/CTRL-N)
+--- <PageUp>	- select a match several entries back
+--- <PageDown>	- select a match several entries further
+--- <Up>		- in filename/menu name completion: move up into
+--- 		  parent directory or parent menu.
 --- <Down>		- in filename/menu name completion: move into a
 --- 		  subdirectory or submenu.
 --- <CR>		- in menu completion, when the cursor is just after a
 --- 		  dot: move into a submenu.
---- <Up>		- in filename/menu name completion: move up into
---- 		  parent directory or parent menu.
+--- CTRL-E		- end completion, go back to what was there before
+--- 		  selecting a match.
+--- CTRL-Y		- accept the currently selected match and stop
+--- 		  completion.
 ---
 --- If you want <Left> and <Right> to move the cursor instead of selecting
 --- a different match, use this:
-- 
cgit 


From 729a9c4c61c13db80d42e6d875893b4a79ef4381 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 14 Oct 2023 16:04:57 +0200
Subject: vim-patch:9.0.2024: no filetype detection for Debian sources

Problem:  no filetype detection for Debian sources
Solution: Add new deb822sources filetype

closes: vim/vim#13320

https://github.com/vim/vim/commit/bd734c3bead9e167eb6875f62cc06fab2379c422

Co-authored-by: James McCoy <jamessan@jamessan.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index b2fbea5405..2058a4dcba 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1629,6 +1629,7 @@ local pattern = {
   ['.*/debian/copyright'] = 'debcopyright',
   ['.*/etc/apt/sources%.list%.d/.*%.list'] = 'debsources',
   ['.*/etc/apt/sources%.list'] = 'debsources',
+  ['.*/etc/apt/sources%.list%.d/.*%.sources'] = 'deb822sources',
   ['.*%.directory'] = 'desktop',
   ['.*%.desktop'] = 'desktop',
   ['dictd.*%.conf'] = 'dictdconf',
-- 
cgit 


From 28ef4a44925a1b1cbf291347aba43012ab038523 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 14 Oct 2023 16:04:05 +0200
Subject: vim-patch:7687238e1b0d

runtime(tcsh): Update ftplugin (vim/vim#13327)

Fix b:browsefilter deletion error when calling b:undo_ftplugin.

Fixes vim/vim#13167

https://github.com/vim/vim/commit/7687238e1b0d2f26ba57e1bdf76f782eaa43af3a

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/csh.vim  | 17 ++++++++++-------
 runtime/ftplugin/tcsh.vim | 20 ++++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/csh.vim b/runtime/ftplugin/csh.vim
index ca5da5a8b9..2feec57bb2 100644
--- a/runtime/ftplugin/csh.vim
+++ b/runtime/ftplugin/csh.vim
@@ -3,9 +3,11 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Dan Sharp
 " Contributor:		Johannes Zellner <johannes@zellner.org>
-" Last Change:		2021 Oct 15
+" Last Change:		2023 Oct 09
 
-if exists("b:did_ftplugin") | finish | endif
+if exists("b:did_ftplugin")
+  finish
+endif
 let b:did_ftplugin = 1
 
 let s:save_cpo = &cpo
@@ -18,7 +20,7 @@ setlocal formatoptions+=crql
 
 let b:undo_ftplugin = "setlocal com< cms< fo<"
 
-" Csh:  thanks to Johannes Zellner
+" Csh: thanks to Johannes Zellner
 " - Both foreach and end must appear alone on separate lines.
 " - The words else and endif must appear at the beginning of input lines;
 "   the if must appear alone on its input line or after an else.
@@ -38,13 +40,14 @@ if exists("loaded_matchit") && !exists("b:match_words")
 	\   s:line_start .. 'case\s\+:' .. s:line_start .. 'default\>:\<breaksw\>:' ..
 	\   s:line_start .. 'endsw\>'
   unlet s:line_start
-  let b:undo_ftplugin ..= " | unlet b:match_words"
+  let b:undo_ftplugin ..= " | unlet! b:match_words"
 endif
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let  b:browsefilter="csh Scripts (*.csh)\t*.csh\n" ..
-	\	      "All Files (*.*)\t*.*\n"
-  let b:undo_ftplugin ..= " | unlet b:browsefilter"
+  let b:browsefilter = "csh Scripts (*.csh)\t*.csh\n" ..
+	\	       "All Files (*.*)\t*.*\n"
+  let b:csh_set_browsefilter = 1
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter b:csh_set_browsefilter"
 endif
 
 let &cpo = s:save_cpo
diff --git a/runtime/ftplugin/tcsh.vim b/runtime/ftplugin/tcsh.vim
index 85d3873b33..b2467b43a2 100644
--- a/runtime/ftplugin/tcsh.vim
+++ b/runtime/ftplugin/tcsh.vim
@@ -2,9 +2,11 @@
 " Language:		tcsh
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Dan Sharp
-" Last Change:		2021 Oct 15
+" Last Change:		2023 Oct 09
 
-if exists("b:did_ftplugin") | finish | endif
+if exists("b:did_ftplugin")
+  finish
+endif
 
 let s:save_cpo = &cpo
 set cpo-=C
@@ -12,24 +14,26 @@ set cpo-=C
 " Define some defaults in case the included ftplugins don't set them.
 let s:undo_ftplugin = ""
 let s:browsefilter = "csh Files (*.csh)\t*.csh\n" ..
-	    \	     "All Files (*.*)\t*.*\n"
+      \		     "All Files (*.*)\t*.*\n"
 
 runtime! ftplugin/csh.vim ftplugin/csh_*.vim ftplugin/csh/*.vim
 let b:did_ftplugin = 1
 
 " Override our defaults if these were set by an included ftplugin.
 if exists("b:undo_ftplugin")
-    let s:undo_ftplugin = b:undo_ftplugin
+  let s:undo_ftplugin = b:undo_ftplugin
 endif
 if exists("b:browsefilter")
-    let s:browsefilter = b:browsefilter
+  let s:browsefilter = b:browsefilter
 endif
 
-if (has("gui_win32") || has("gui_gtk"))
-    let  b:browsefilter="tcsh Scripts (*.tcsh)\t*.tcsh\n" .. s:browsefilter
+if (has("gui_win32") || has("gui_gtk")) &&
+      \ (!exists("b:browsefilter") || exists("b:csh_set_browsefilter"))
+  let b:browsefilter = "tcsh Scripts (*.tcsh)\t*.tcsh\n" .. s:browsefilter
+  let s:undo_ftplugin = "unlet! b:browsefilter | " .. s:undo_ftplugin
 endif
 
-let b:undo_ftplugin = "unlet! b:browsefilter | " .. s:undo_ftplugin
+let b:undo_ftplugin = s:undo_ftplugin
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-- 
cgit 


From aa62579a684277d86b1f4a7588464e0ec4227b94 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 15 Oct 2023 09:05:27 +0800
Subject: docs: restore accidentally removed line in :h 'ignorecase' (#25651)

---
 runtime/doc/options.txt           | 1 +
 runtime/lua/vim/_meta/options.lua | 1 +
 2 files changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6ca2de8097..d94a9a131d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3257,6 +3257,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Ignore case in search patterns, |cmdline-completion|, when
 	searching in the tags file, and |expr-==|.
+	Also see 'smartcase' and 'tagcase'.
 	Can be overruled by using "\c" or "\C" in the pattern, see
 	|/ignorecase|.
 
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 3d4f911f96..c0c4d7f8be 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -3089,6 +3089,7 @@ vim.go.iconstring = vim.o.iconstring
 
 --- Ignore case in search patterns, `cmdline-completion`, when
 --- searching in the tags file, and `expr-==`.
+--- Also see 'smartcase' and 'tagcase'.
 --- Can be overruled by using "\c" or "\C" in the pattern, see
 --- `/ignorecase`.
 ---
-- 
cgit 


From e5a424d78ed72613dd5ccc161578f9f6f853a0e8 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 15 Oct 2023 17:02:17 +0800
Subject: vim-patch:9.0.2030: no max callback recursion limit (#25655)

Problem:  no max callback recursion limit
Solution: bail out, if max call recursion for callback functions
          has been reached.

This checks the 'maxfuncdepth' setting and throws E169 when a callback
function recursively calls itself.

closes: vim/vim#13337
closes: vim/vim#13339

https://github.com/vim/vim/commit/47510f3d6598a1218958c03ed11337a43b73f48d

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/options.txt           | 1 +
 runtime/lua/vim/_meta/options.lua | 1 +
 2 files changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d94a9a131d..e734b62020 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4024,6 +4024,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Increasing this limit above 200 also changes the maximum for Ex
 	command recursion, see |E169|.
 	See also |:function|.
+	Also used for maximum depth of callback functions.
 
 					*'maxmapdepth'* *'mmd'* *E223*
 'maxmapdepth' 'mmd'	number	(default 1000)
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index c0c4d7f8be..50146bac50 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -4035,6 +4035,7 @@ vim.go.mat = vim.go.matchtime
 --- Increasing this limit above 200 also changes the maximum for Ex
 --- command recursion, see `E169`.
 --- See also `:function`.
+--- Also used for maximum depth of callback functions.
 ---
 --- @type integer
 vim.o.maxfuncdepth = 100
-- 
cgit 


From d974a3dcbb3757ebeb78fa64054c795ab7acdf1a Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 15 Oct 2023 17:19:01 +0800
Subject: vim-patch:9.0.2032: cannot get mouse click pos for tab or virt text
 (#25653)

Problem:  Cannot accurately get mouse clicking position when clicking on
          a TAB or with virtual text.
Solution: Add a "coladd" field to getmousepos() result.

closes: vim/vim#13335

https://github.com/vim/vim/commit/f5a94d5165bb9e390797da50a1fa7a87df3fbee4
---
 runtime/doc/builtin.txt         | 2 ++
 runtime/lua/vim/_meta/vimfn.lua | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index c09c0d552e..ceecc61b97 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2674,6 +2674,8 @@ getmousepos()                                                    *getmousepos()*
 			wincol		column inside "winid"
 			line		text line inside "winid"
 			column		text column inside "winid"
+			coladd		offset (in screen columns) from the
+					start of the clicked char
 		All numbers are 1-based.
 
 		If not over a window, e.g. when in the command line, then only
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index a2d9ce5bc4..2b79feec8e 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3242,6 +3242,8 @@ function vim.fn.getmatches(win) end
 ---   wincol    column inside "winid"
 ---   line    text line inside "winid"
 ---   column    text column inside "winid"
+---   coladd    offset (in screen columns) from the
+---       start of the clicked char
 --- All numbers are 1-based.
 ---
 --- If not over a window, e.g. when in the command line, then only
-- 
cgit 


From 75b488d3ef2e9dafba43c72487839aa78950d453 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 15 Oct 2023 17:52:08 +0800
Subject: vim-patch:9.0.2025: no cmdline completion for ++opt args (#25657)

Problem:  no cmdline completion for ++opt args
Solution: Add cmdline completion for :e ++opt=arg and :terminal
          [++options]

closes: vim/vim#13319

https://github.com/vim/vim/commit/989426be6e9ae23d2413943890206cbe15d9df38

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
---
 runtime/doc/cmdline.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 1a5ad9a382..291286d8f7 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -364,6 +364,7 @@ When editing the command-line, a few commands can be used to complete the
 word before the cursor.  This is available for:
 
 - Command names: At the start of the command-line.
+- |++opt| values.
 - Tags: Only after the ":tag" command.
 - File names: Only after a command that accepts a file name or a setting for
   an option that can be set to a file name.  This is called file name
-- 
cgit 


From 3222f0ad0079ce4bd4e45886a00e4fe4685fb5dd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 16 Oct 2023 16:36:25 +0800
Subject: vim-patch:dbf749bd5aae (#25665)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime: Fix more typos (vim/vim#13354)

* Fix more typos

* Fix typos in ignored runtime/ directory

https://github.com/vim/vim/commit/dbf749bd5aaef6ea2d28bce081349785d174d96a

Co-authored-by: Viktor Szépe <viktor@szepe.net>
---
 runtime/autoload/netrw.vim                           | 4 ++--
 runtime/autoload/phpcomplete.vim                     | 2 +-
 runtime/autoload/rustfmt.vim                         | 2 +-
 runtime/colors/README.txt                            | 4 ++--
 runtime/indent/cdl.vim                               | 8 ++++----
 runtime/indent/erlang.vim                            | 2 +-
 runtime/indent/julia.vim                             | 2 +-
 runtime/indent/krl.vim                               | 4 ++--
 runtime/indent/rapid.vim                             | 2 +-
 runtime/indent/systemverilog.vim                     | 4 ++--
 runtime/keymap/greek_utf-8.vim                       | 2 +-
 runtime/makemenu.vim                                 | 4 ++--
 runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 2 +-
 runtime/synmenu.vim                                  | 4 ++--
 runtime/syntax/abap.vim                              | 2 +-
 runtime/syntax/asm68k.vim                            | 2 +-
 runtime/syntax/debcontrol.vim                        | 2 +-
 runtime/syntax/nix.vim                               | 2 +-
 runtime/syntax/ora.vim                               | 2 +-
 runtime/syntax/po.vim                                | 2 +-
 runtime/syntax/ppd.vim                               | 4 ++--
 runtime/syntax/spup.vim                              | 2 +-
 runtime/syntax/tsscl.vim                             | 2 +-
 runtime/syntax/zsh.vim                               | 2 +-
 24 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index dcaa075608..8b29ea9dfa 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1914,7 +1914,7 @@ endfun
 "                        Doing this means that netrw will not come up as having changed a
 "                        setting last when it really didn't actually change it.
 "
-"                        Used by s:NetrwOptionsRestore() to restore each netrw-senstive setting
+"                        Used by s:NetrwOptionsRestore() to restore each netrw-sensitive setting
 "                        keepvars are set up by s:NetrwOptionsSave
 fun! s:NetrwRestoreSetting(keepvar,setting)
 """  call Dfunc("s:NetrwRestoreSetting(a:keepvar<".a:keepvar."> a:setting<".a:setting.">)")
@@ -5515,7 +5515,7 @@ fun! netrw#BrowseX(fname,remote)
   " cleanup: remove temporary file,
   "          delete current buffer if success with handler,
   "          return to prior buffer (directory listing)
-  "          Feb 12, 2008: had to de-activiate removal of
+  "          Feb 12, 2008: had to de-activate removal of
   "          temporary file because it wasn't getting seen.
 "  if remote == 1 && fname != a:fname
 ""   call Decho("deleting temporary file<".fname.">",'~'.expand("<slnum>"))
diff --git a/runtime/autoload/phpcomplete.vim b/runtime/autoload/phpcomplete.vim
index f9aa15c827..2556ac857e 100644
--- a/runtime/autoload/phpcomplete.vim
+++ b/runtime/autoload/phpcomplete.vim
@@ -2924,7 +2924,7 @@ endfor
 " builtin class information
 let g:php_builtin_object_functions = {}
 
-" When completing for 'everyting imaginable' (no class context, not a
+" When completing for 'everything imaginable' (no class context, not a
 " variable) we need a list of built-in classes in a format of {'classname':''}
 " for performance reasons we precompile this too
 let g:php_builtin_classnames = {}
diff --git a/runtime/autoload/rustfmt.vim b/runtime/autoload/rustfmt.vim
index 652e6af33a..8fd3858178 100644
--- a/runtime/autoload/rustfmt.vim
+++ b/runtime/autoload/rustfmt.vim
@@ -25,7 +25,7 @@ function! rustfmt#DetectVersion()
     silent let s:rustfmt_help = system(g:rustfmt_command . " --help")
     let s:rustfmt_unstable_features = s:rustfmt_help =~# "--unstable-features"
 
-    " Build a comparable rustfmt version varible out of its `--version` output:
+    " Build a comparable rustfmt version variable out of its `--version` output:
     silent let l:rustfmt_version_full = system(g:rustfmt_command . " --version")
     let l:rustfmt_version_list = matchlist(l:rustfmt_version_full,
         \    '\vrustfmt ([0-9]+[.][0-9]+[.][0-9]+)')
diff --git a/runtime/colors/README.txt b/runtime/colors/README.txt
index 4ea8e5e640..bc6b8f0965 100644
--- a/runtime/colors/README.txt
+++ b/runtime/colors/README.txt
@@ -111,11 +111,11 @@ please check the following items:
 - Do not use hard coded escape sequences, these will not work in other
   terminals.  Always use #RRGGBB for the GUI.
 
-- When targetting 8-16 colors terminals, don't count on "darkblue" to be blue
+- When targeting 8-16 colors terminals, don't count on "darkblue" to be blue
   and dark, or on "2" to be even vaguely reddish.  Names are more portable
   than numbers, though.
 
-- When targetting 256 colors terminals, prefer colors 16-255 to colors 0-15
+- When targeting 256 colors terminals, prefer colors 16-255 to colors 0-15
   for the same reason.
 
 - Typographic attributes (bold, italic, underline, reverse, etc.) are not
diff --git a/runtime/indent/cdl.vim b/runtime/indent/cdl.vim
index 2c0fc7988e..da675698cf 100644
--- a/runtime/indent/cdl.vim
+++ b/runtime/indent/cdl.vim
@@ -21,7 +21,7 @@ endif
 
 " find out if an "...=..." expression is an assignment (or a conditional)
 " it scans 'line' first, and then the previous lines
-fun! CdlAsignment(lnum, line)
+fun! CdlAssignment(lnum, line)
   let f = -1
   let lnum = a:lnum
   let line = a:line
@@ -90,7 +90,7 @@ fun! CdlGetIndent(lnum)
     end
   end
 
-  " remove members [a] of [b]:[c]... (inicio remainds valid)
+  " remove members [a] of [b]:[c]... (inicio remains valid)
   let line = substitute(line, '\c\(\[[^]]*]\(\s*of\s*\|:\)*\)\+', ' ', 'g')
   while 1
     " search for the next interesting element
@@ -111,7 +111,7 @@ fun! CdlGetIndent(lnum)
     else " c == '='
       " if it is an assignment increase indent
       if f == -1 " we don't know yet, find out
-	let f = CdlAsignment(lnum, strpart(line, 0, inicio))
+	let f = CdlAssignment(lnum, strpart(line, 0, inicio))
       end
       if f == 1 " formula increase it
 	let ind = ind + shiftwidth()
@@ -125,7 +125,7 @@ fun! CdlGetIndent(lnum)
     let ind = ind - shiftwidth()
   elseif match(thisline, '^\s*=') >= 0
     if f == -1 " we don't know yet if is an assignment, find out
-      let f = CdlAsignment(lnum, "")
+      let f = CdlAssignment(lnum, "")
     end
     if f == 1 " formula increase it
       let ind = ind + shiftwidth()
diff --git a/runtime/indent/erlang.vim b/runtime/indent/erlang.vim
index 7aa38587a6..5682c31ef3 100644
--- a/runtime/indent/erlang.vim
+++ b/runtime/indent/erlang.vim
@@ -1324,7 +1324,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
           "   maybe A else
           "               LTI
           "
-          " Note about Emacs compabitility {{{
+          " Note about Emacs compatibility {{{
           "
           " It would be fine to indent the examples above the following way:
           "
diff --git a/runtime/indent/julia.vim b/runtime/indent/julia.vim
index 36f39f6652..efc98a2851 100644
--- a/runtime/indent/julia.vim
+++ b/runtime/indent/julia.vim
@@ -310,7 +310,7 @@ function IsFunctionArgPar(lnum, c)
 endfunction
 
 function JumpToMatch(lnum, last_closed_bracket)
-  " we use the % command to skip back (tries to ues matchit if possible,
+  " we use the % command to skip back (tries to use matchit if possible,
   " otherwise resorts to vim's default, which is buggy but better than
   " nothing)
   call cursor(a:lnum, a:last_closed_bracket)
diff --git a/runtime/indent/krl.vim b/runtime/indent/krl.vim
index cc3cbd1abb..89f45356ba 100644
--- a/runtime/indent/krl.vim
+++ b/runtime/indent/krl.vim
@@ -41,7 +41,7 @@ function GetKrlIndent() abort
   let currentLine = getline(v:lnum)
   if  currentLine =~? '\v^;(\s*(end)?fold>)@!' && !get(g:, 'krlCommentIndent', 0)
     " If current line has a ; in column 1 and is no fold, keep zero indent.
-    " This may be usefull if code is commented out at the first column.
+    " This may be useful if code is commented out at the first column.
     return 0
   endif
 
@@ -117,7 +117,7 @@ function s:KrlPreNoneBlank(lnum) abort
   let nPreNoneBlank = prevnonblank(a:lnum)
 
   while nPreNoneBlank > 0 && getline(nPreNoneBlank) =~? '\v^\s*(\&\w\+|;|continue>)'
-    " Previouse none blank line irrelevant. Look further aback.
+    " Previous none blank line irrelevant. Look further aback.
     let nPreNoneBlank = prevnonblank(nPreNoneBlank - 1)
   endwhile
 
diff --git a/runtime/indent/rapid.vim b/runtime/indent/rapid.vim
index 2c99bb2491..b1fa00b8cc 100644
--- a/runtime/indent/rapid.vim
+++ b/runtime/indent/rapid.vim
@@ -74,7 +74,7 @@ function s:GetRapidIndentIntern() abort
 
   if  l:currentLine =~ '^!' && !get(g:,'rapidCommentIndent',0)
     " If current line is ! line comment, do not change indent
-    " This may be usefull if code is commented out at the first column.
+    " This may be useful if code is commented out at the first column.
     return 0
   endif
 
diff --git a/runtime/indent/systemverilog.vim b/runtime/indent/systemverilog.vim
index a5f4d5b90d..42a05a03aa 100644
--- a/runtime/indent/systemverilog.vim
+++ b/runtime/indent/systemverilog.vim
@@ -78,10 +78,10 @@ function SystemVerilogIndent()
   " Multiple-line comment count
   if curr_line =~ '^\s*/\*' && curr_line !~ '/\*.\{-}\*/'
     let s:multiple_comment += 1
-    if vverb | echom vverb_str "Start of multiple-line commnt" | endif
+    if vverb | echom vverb_str "Start of multiple-line comment" | endif
   elseif curr_line =~ '\*/\s*$' && curr_line !~ '/\*.\{-}\*/'
     let s:multiple_comment -= 1
-    if vverb | echom vverb_str "End of multiple-line commnt" | endif
+    if vverb | echom vverb_str "End of multiple-line comment" | endif
     return ind
   endif
   " Maintain indentation during commenting.
diff --git a/runtime/keymap/greek_utf-8.vim b/runtime/keymap/greek_utf-8.vim
index 17564542d9..c6cc32563e 100644
--- a/runtime/keymap/greek_utf-8.vim
+++ b/runtime/keymap/greek_utf-8.vim
@@ -34,7 +34,7 @@
 " without having to combine them with letters (usufull for grammarians
 " in particular) (especially for dasia and psiln we use ' for psili
 " (that is apostrophe) and ;' for dasia. This is done in order to
-" preserve the posibility to write a plain < or >.
+" preserve the possibility to write a plain < or >.
 
 " Ypogegrammeni is | following the character (the originally proposed
 " i after the character is problematic: can't write easily ai or vi) :
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index bf9f43cf16..8eea49d711 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -87,7 +87,7 @@ SynMenu AB.Assembly.PIC:pic
 SynMenu AB.Assembly.Turbo:tasm
 SynMenu AB.Assembly.VAX\ Macro\ Assembly:vmasm
 SynMenu AB.Assembly.Z-80:z8a
-SynMenu AB.Assembly.xa\ 6502\ cross\ assember:a65
+SynMenu AB.Assembly.xa\ 6502\ cross\ assembler:a65
 SynMenu AB.ASN\.1:asn
 SynMenu AB.Asterisk\ config:asterisk
 SynMenu AB.Asterisk\ voicemail\ config:asteriskvm
@@ -325,7 +325,7 @@ SynMenu HIJK.Kivy:kivy
 SynMenu HIJK.KixTart:kix
 
 SynMenu L.Lace:lace
-SynMenu L.LamdaProlog:lprolog
+SynMenu L.LambdaProlog:lprolog
 SynMenu L.Latte:latte
 SynMenu L.Ld\ script:ld
 SynMenu L.LDAP.LDIF:ldif
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index c436e015cc..a0710476a9 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -1248,7 +1248,7 @@ func s:Run(args)
   call s:SendResumingCommand('-exec-run')
 endfunc
 
-" :Frame - go to a specfic frame in the stack
+" :Frame - go to a specific frame in the stack
 func s:Frame(arg)
   " Note: we explicit do not use mi's command
   " call s:SendCommand('-stack-select-frame "' . a:arg .'"')
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index b75a0e9497..fec5cc4b06 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -78,7 +78,7 @@ an 50.10.440 &Syntax.AB.Assembly.PIC :cal SetSyn("pic")<CR>
 an 50.10.450 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm")<CR>
 an 50.10.460 &Syntax.AB.Assembly.VAX\ Macro\ Assembly :cal SetSyn("vmasm")<CR>
 an 50.10.470 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a")<CR>
-an 50.10.480 &Syntax.AB.Assembly.xa\ 6502\ cross\ assember :cal SetSyn("a65")<CR>
+an 50.10.480 &Syntax.AB.Assembly.xa\ 6502\ cross\ assembler :cal SetSyn("a65")<CR>
 an 50.10.490 &Syntax.AB.ASN\.1 :cal SetSyn("asn")<CR>
 an 50.10.500 &Syntax.AB.Asterisk\ config :cal SetSyn("asterisk")<CR>
 an 50.10.510 &Syntax.AB.Asterisk\ voicemail\ config :cal SetSyn("asteriskvm")<CR>
@@ -308,7 +308,7 @@ an 50.50.710 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt")<CR>
 an 50.50.720 &Syntax.HIJK.Kivy :cal SetSyn("kivy")<CR>
 an 50.50.730 &Syntax.HIJK.KixTart :cal SetSyn("kix")<CR>
 an 50.60.100 &Syntax.L.Lace :cal SetSyn("lace")<CR>
-an 50.60.110 &Syntax.L.LamdaProlog :cal SetSyn("lprolog")<CR>
+an 50.60.110 &Syntax.L.LambdaProlog :cal SetSyn("lprolog")<CR>
 an 50.60.120 &Syntax.L.Latte :cal SetSyn("latte")<CR>
 an 50.60.130 &Syntax.L.Ld\ script :cal SetSyn("ld")<CR>
 an 50.60.140 &Syntax.L.LDAP.LDIF :cal SetSyn("ldif")<CR>
diff --git a/runtime/syntax/abap.vim b/runtime/syntax/abap.vim
index e48dfc3603..627e51504a 100644
--- a/runtime/syntax/abap.vim
+++ b/runtime/syntax/abap.vim
@@ -122,7 +122,7 @@ syn keyword abapStatement TABLES TIMES TRANSFER TRANSLATE TRY TYPE TYPES
 syn keyword abapStatement UNASSIGN ULINE UNPACK UPDATE
 syn keyword abapStatement WHEN WHILE WINDOW WRITE
 
-" More statemets
+" More statements
 syn keyword abapStatement LINES
 syn keyword abapStatement INTO GROUP BY HAVING ORDER BY SINGLE
 syn keyword abapStatement APPENDING CORRESPONDING FIELDS OF TABLE
diff --git a/runtime/syntax/asm68k.vim b/runtime/syntax/asm68k.vim
index 1607507909..104887d026 100644
--- a/runtime/syntax/asm68k.vim
+++ b/runtime/syntax/asm68k.vim
@@ -4,7 +4,7 @@
 " Last change:	2001 May 01
 "
 " This is incomplete.  In particular, support for 68020 and
-" up and 68851/68881 co-processors is partial or non-existant.
+" up and 68851/68881 co-processors is partial or non-existent.
 " Feel free to contribute...
 "
 
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index c79b702f92..af78ebc3ae 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -22,7 +22,7 @@ syn iskeyword @,48-57,-
 " Everything that is not explicitly matched by the rules below
 syn match debcontrolElse "^.*$"
 
-" Common seperators
+" Common separators
 syn match debControlComma ",[ \t]*"
 syn match debControlSpace "[ \t]"
 
diff --git a/runtime/syntax/nix.vim b/runtime/syntax/nix.vim
index 671b269c04..ef52cddf46 100644
--- a/runtime/syntax/nix.vim
+++ b/runtime/syntax/nix.vim
@@ -99,7 +99,7 @@ syn match nixArgOperator '[a-zA-Z_][a-zA-Z0-9_'-]*\%(\s\|#.\{-\}\n\|\n\|/\*\_.\{
 "
 " "\%(\s\|#.\{-\}\n\|\n\|/\*\_.\{-\}\*/\)*"
 "
-" It is also used throught the whole file and is marked with 'v's as well.
+" It is also used throughout the whole file and is marked with 'v's as well.
 "
 " Fortunately the matching rules for function arguments are much simpler than
 " for real attribute sets, because we can stop when we hit the first ellipsis or
diff --git a/runtime/syntax/ora.vim b/runtime/syntax/ora.vim
index 99034793f2..ab091a2eee 100644
--- a/runtime/syntax/ora.vim
+++ b/runtime/syntax/ora.vim
@@ -449,7 +449,7 @@ hi def link oraString	  String		"strings
 
 hi def link oraSpecial	  Special		"special characters
 hi def link oraError	  Error			"errors
-hi def link oraParenError	  oraError		"errors caused by mismatching parantheses
+hi def link oraParenError	  oraError		"errors caused by mismatching parentheses
 
 hi def link oraComment	  Comment		"comments
 
diff --git a/runtime/syntax/po.vim b/runtime/syntax/po.vim
index 15d09b18bd..08d6baec27 100644
--- a/runtime/syntax/po.vim
+++ b/runtime/syntax/po.vim
@@ -42,7 +42,7 @@ syn match     poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Crea
 syn match     poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME <EMAIL@ADDRESS>\|LANGUAGE <LL@li.org>\|CHARSET\|ENCODING\|INTEGER\|EXPRESSION\)" contained
 syn match     poCopyrightUnset "SOME DESCRIPTIVE TITLE\|FIRST AUTHOR <EMAIL@ADDRESS>, YEAR\|Copyright (C) YEAR Free Software Foundation, Inc\|YEAR THE PACKAGE\'S COPYRIGHT HOLDER\|PACKAGE" contained
 
-" Translation comment block including: translator comment, automatic coments, flags and locations
+" Translation comment block including: translator comment, automatic comments, flags and locations
 syn match     poComment "^#.*$"
 syn keyword   poFlagFuzzy fuzzy contained
 syn match     poCommentTranslator "^# .*$" contains=poCopyrightUnset
diff --git a/runtime/syntax/ppd.vim b/runtime/syntax/ppd.vim
index da67e1f39f..6bd57f34e5 100644
--- a/runtime/syntax/ppd.vim
+++ b/runtime/syntax/ppd.vim
@@ -15,7 +15,7 @@ syn match	ppdDefine	"\*[a-zA-Z0-9\-_]\+:"
 syn match	ppdUI		"\*[a-zA-Z]*\(Open\|Close\)UI"
 syn match	ppdUIGroup	"\*[a-zA-Z]*\(Open\|Close\)Group"
 syn match	ppdGUIText	"/.*:"
-syn match	ppdContraints	"^*UIConstraints:"
+syn match	ppdConstraints	"^*UIConstraints:"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
@@ -27,7 +27,7 @@ hi def link ppdUI			Function
 hi def link ppdUIGroup		Function
 hi def link ppdDef			String
 hi def link ppdGUIText		Type
-hi def link ppdContraints		Special
+hi def link ppdConstraints		Special
 
 
 let b:current_syntax = "ppd"
diff --git a/runtime/syntax/spup.vim b/runtime/syntax/spup.vim
index 9284abf63f..222caa779e 100644
--- a/runtime/syntax/spup.vim
+++ b/runtime/syntax/spup.vim
@@ -29,7 +29,7 @@ set cpo&vim
 "let strict_subsections = 1
 
 " highlight types usually found in DECLARE section
-if !exists("hightlight_types")
+if !exists("highlight_types")
     let highlight_types = 1
 endif
 
diff --git a/runtime/syntax/tsscl.vim b/runtime/syntax/tsscl.vim
index fd2a5e2ba9..df804b2f88 100644
--- a/runtime/syntax/tsscl.vim
+++ b/runtime/syntax/tsscl.vim
@@ -22,7 +22,7 @@ syn case ignore
 
 "
 "
-" Begin syntax definitions for tss geomtery file.
+" Begin syntax definitions for tss geometry file.
 "
 
 " Load TSS geometry syntax file
diff --git a/runtime/syntax/zsh.vim b/runtime/syntax/zsh.vim
index 69671c59ca..084f8cdb41 100644
--- a/runtime/syntax/zsh.vim
+++ b/runtime/syntax/zsh.vim
@@ -88,7 +88,7 @@ syn match   zshOperator         '||\|&&\|;\|&!\='
 syn match   zshRedir            '\d\=\(<<<\|<&\s*[0-9p-]\=\|<>\?\)'
                                 " >, >>, and variants.
 syn match   zshRedir            '\d\=\(>&\s*[0-9p-]\=\|&>>\?\|>>\?&\?\)[|!]\='
-                                " | and |&, but only if it's not preceeded or
+                                " | and |&, but only if it's not preceded or
                                 " followed by a | to avoid matching ||.
 syn match   zshRedir            '|\@1<!|&\=|\@!'
 
-- 
cgit 


From c46a6c065e8d830adb8a2f410d3c92cf5bd4455b Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Mon, 16 Oct 2023 08:13:37 -0700
Subject: docs: do not hardcode LSP version in URL #25648

---
 runtime/doc/lsp.txt                      | 6 +++---
 runtime/doc/news-0.9.txt                 | 2 +-
 runtime/doc/news.txt                     | 4 ++--
 runtime/lua/vim/lsp/_snippet_grammar.lua | 2 +-
 runtime/lua/vim/lsp/buf.lua              | 2 +-
 runtime/lua/vim/lsp/handlers.lua         | 2 +-
 runtime/lua/vim/lsp/sync.lua             | 2 +-
 runtime/lua/vim/lsp/util.lua             | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 10e1a2c2c5..8a0b144e83 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -444,7 +444,7 @@ The server will typically provide one token per identifier in the source code.
 The token will have a `type` such as "function" or "variable", and 0 or more
 `modifier`s such as "readonly" or "deprecated." The standard types and
 modifiers are described here:
-https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_semanticTokens
+https://microsoft.github.io/language-server-protocol/specification/#textDocument_semanticTokens
 LSP servers may also use off-spec types and modifiers.
 
 The LSP client adds one or more highlights for each token. The highlight
@@ -1232,7 +1232,7 @@ format({options})                                       *vim.lsp.buf.format()*
                    optional fields:
                    • formatting_options (table|nil): Can be used to specify
                      FormattingOptions. Some unspecified options will be
-                     automatically derived from the current Nvim options. See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#formattingOptions
+                     automatically derived from the current Nvim options. See https://microsoft.github.io/language-server-protocol/specification/#formattingOptions
                    • timeout_ms (integer|nil, default 1000): Time in
                      milliseconds to block for formatting requests. No effect
                      if async=true
@@ -1654,7 +1654,7 @@ buf_highlight_references({bufnr}, {references}, {offset_encoding})
       • {offset_encoding}  (string) One of "utf-8", "utf-16", "utf-32".
 
     See also: ~
-      • https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
+      • https://microsoft.github.io/language-server-protocol/specification/#textDocumentContentChangeEvent
 
                                              *vim.lsp.util.character_offset()*
 character_offset({buf}, {row}, {col}, {offset_encoding})
diff --git a/runtime/doc/news-0.9.txt b/runtime/doc/news-0.9.txt
index 33733822ea..789bc9e0bc 100644
--- a/runtime/doc/news-0.9.txt
+++ b/runtime/doc/news-0.9.txt
@@ -160,7 +160,7 @@ The following new APIs or features were added.
   `workspace.didChangeWatchedFiles.dynamicRegistration=true` capability.
 
 • |vim.diagnostic| now supports LSP DiagnosticsTag.
-  See: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnosticTag
+  See: https://microsoft.github.io/language-server-protocol/specification/#diagnosticTag
 
 • |vim.diagnostic.is_disabled()| checks if diagnostics are disabled in a given
   buffer or namespace.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 3098cc0fb7..3dae3c71b1 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -122,9 +122,9 @@ The following new APIs and features were added.
 • LSP
   • LSP method names are available in |vim.lsp.protocol.Methods|.
   • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
-    https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_inlayHint
+    https://microsoft.github.io/language-server-protocol/specification/#textDocument_inlayHint
   • Implemented pull diagnostic textDocument/diagnostic: |vim.lsp.diagnostic.on_diagnostic()|
-    https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_diagnostic
+    https://microsoft.github.io/language-server-protocol/specification/#textDocument_diagnostic
   • Added |vim.lsp.status()| to consume the last progress messages as a string.
   • LSP client now always saves and restores named buffer marks when applying
     text edits.
diff --git a/runtime/lua/vim/lsp/_snippet_grammar.lua b/runtime/lua/vim/lsp/_snippet_grammar.lua
index eb72efdf39..0a4d669fb9 100644
--- a/runtime/lua/vim/lsp/_snippet_grammar.lua
+++ b/runtime/lua/vim/lsp/_snippet_grammar.lua
@@ -1,4 +1,4 @@
---- Grammar for LSP snippets, based on https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#snippet_syntax
+--- Grammar for LSP snippets, based on https://microsoft.github.io/language-server-protocol/specification/#snippet_syntax
 
 local lpeg = vim.lpeg
 local P, S, R, V = lpeg.P, lpeg.S, lpeg.R, lpeg.V
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index a906512e24..9436fbbf56 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -159,7 +159,7 @@ end
 ---     - formatting_options (table|nil):
 ---         Can be used to specify FormattingOptions. Some unspecified options will be
 ---         automatically derived from the current Nvim options.
----         See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#formattingOptions
+---         See https://microsoft.github.io/language-server-protocol/specification/#formattingOptions
 ---     - timeout_ms (integer|nil, default 1000):
 ---         Time in milliseconds to block for formatting requests. No effect if async=true
 ---     - bufnr (number|nil):
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index d43d9a7cfa..d3b199b866 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -623,7 +623,7 @@ M[ms.window_showDocument] = function(_, result, ctx, _)
   return { success = success or false }
 end
 
----@see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_inlayHint_refresh
+---@see https://microsoft.github.io/language-server-protocol/specification/#workspace_inlayHint_refresh
 M[ms.workspace_inlayHint_refresh] = function(err, result, ctx, config)
   return require('vim.lsp.inlay_hint').on_refresh(err, result, ctx, config)
 end
diff --git a/runtime/lua/vim/lsp/sync.lua b/runtime/lua/vim/lsp/sync.lua
index 9c1bbf3892..ca01cdc08b 100644
--- a/runtime/lua/vim/lsp/sync.lua
+++ b/runtime/lua/vim/lsp/sync.lua
@@ -387,7 +387,7 @@ end
 ---@param lastline integer line to begin search in old_lines for last difference
 ---@param new_lastline integer line to begin search in new_lines for last difference
 ---@param offset_encoding string encoding requested by language server
----@return table TextDocumentContentChangeEvent see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
+---@return table TextDocumentContentChangeEvent see https://microsoft.github.io/language-server-protocol/specification/#textDocumentContentChangeEvent
 function M.compute_diff(
   prev_lines,
   curr_lines,
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 7e6855528a..d525cae4c0 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -1829,7 +1829,7 @@ do --[[ References ]]
   ---@param bufnr integer Buffer id
   ---@param references table List of `DocumentHighlight` objects to highlight
   ---@param offset_encoding string One of "utf-8", "utf-16", "utf-32".
-  ---@see https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentContentChangeEvent
+  ---@see https://microsoft.github.io/language-server-protocol/specification/#textDocumentContentChangeEvent
   function M.buf_highlight_references(bufnr, references, offset_encoding)
     validate({
       bufnr = { bufnr, 'n', true },
-- 
cgit 


From 2eecb1b85dbb0e02ec40e95d28d3cc4720040f01 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Mon, 16 Oct 2023 08:52:48 -0700
Subject: fix(lsp): highlight active parameter in signature help #25663

Fixes #25662
---
 runtime/lua/vim/lsp/handlers.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index d3b199b866..d153b956ee 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -476,7 +476,7 @@ function M.signature_help(_, result, ctx, config)
     vim.tbl_get(client.server_capabilities, 'signatureHelpProvider', 'triggerCharacters')
   local ft = vim.bo[ctx.bufnr].filetype
   local lines, hl = util.convert_signature_help_to_markdown_lines(result, ft, triggers)
-  if vim.tbl_isempty(lines) then
+  if not lines or vim.tbl_isempty(lines) then
     if config.silent ~= true then
       print('No signature help available')
     end
@@ -484,7 +484,9 @@ function M.signature_help(_, result, ctx, config)
   end
   local fbuf, fwin = util.open_floating_preview(lines, 'markdown', config)
   if hl then
-    api.nvim_buf_add_highlight(fbuf, -1, 'LspSignatureActiveParameter', 0, unpack(hl))
+    -- Highlight the second line if the signature is wrapped in a Markdown code block.
+    local line = vim.startswith(lines[1], '```') and 1 or 0
+    api.nvim_buf_add_highlight(fbuf, -1, 'LspSignatureActiveParameter', line, unpack(hl))
   end
   return fbuf, fwin
 end
-- 
cgit 


From a4c4b39d55db087af19a5ed8b6a1e5ecacb0c615 Mon Sep 17 00:00:00 2001
From: James Barford-Evans <jamesbarfordevans@gmail.com>
Date: Mon, 16 Oct 2023 17:59:33 +0100
Subject: fix(man.lua): hardwrapped manpage is not resized #25646

Problem:
If a manpage is opened, its hardwrapped dimensions are not recalculated
after closing then revisiting the same manpage.

Solution:
Unload the manpage when it is hidden. This forces it to be reloaded,
which forces the hard-wrapping to be recalculated when it is revisited.

Fixes: #25457
---
 runtime/lua/man.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua
index f2bd79aca8..dcdfc2b87f 100644
--- a/runtime/lua/man.lua
+++ b/runtime/lua/man.lua
@@ -415,7 +415,7 @@ end
 local function set_options(pager)
   vim.bo.swapfile = false
   vim.bo.buftype = 'nofile'
-  vim.bo.bufhidden = 'hide'
+  vim.bo.bufhidden = 'unload'
   vim.bo.modified = false
   vim.bo.readonly = true
   vim.bo.modifiable = false
-- 
cgit 


From 5df4fdf253f9c9cc35f9f5f16c6d0ba9d87b4c71 Mon Sep 17 00:00:00 2001
From: Famiu Haque <famiuhaque@proton.me>
Date: Sun, 8 Oct 2023 22:13:15 +0600
Subject: refactor(options)!: make OptionSet `v:` values use typval

BREAKING CHANGE: This breaks the OptionSet autocommand, as the `v:` values associated with it (`v:option_new`, `v:option_old`, `v:option_oldlocal` and `v:option_oldglobal`) are now the same type as the option, instead of all option values being converted to strings.
---
 runtime/doc/news.txt     | 4 ++++
 runtime/doc/vim_diff.txt | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 3098cc0fb7..0becf7ac6d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -71,6 +71,10 @@ The following changes may require adaptations in user config or plugins.
   defined by LSP, and hence previously parsed snippets might now be considered
   invalid input.
 
+• |OptionSet| autocommand args |v:option_new|, |v:option_old|,
+  |v:option_oldlocal|, |v:option_oldglobal| now have the type of the option
+  instead of always being strings.
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index d000d7c35c..7d0047bb1d 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -379,6 +379,9 @@ UI/Display:
 Variables:
   |v:progpath| is always absolute ("full")
   |v:windowid| is always available (for use by external UIs)
+  |OptionSet| autocommand args |v:option_new|, |v:option_old|,
+  |v:option_oldlocal|, |v:option_oldglobal| have the type of the option
+  instead of always being strings.
 
 Vimscript:
   |:redir| nested in |execute()| works.
-- 
cgit 


From 35f475d0a51aad03abfc005a0224d315c45ffd67 Mon Sep 17 00:00:00 2001
From: Jaehwang Jung <tomtomjhj@gmail.com>
Date: Tue, 17 Oct 2023 10:51:36 +0900
Subject: fix(diagnostics): if buffer not loaded, skip handlers that set
 extmark (#25628)

Problem:
When enabling diagnostics, there can be diagnostics for unloaded buffer,
but some handlers nevertheless attempt to set extmarks in such buffers.

Solution:
* Exit underline/virtual_text handler if buffer is not loaded.
* Don't require is_loaded as precondition for show(), because handlers
  don't necessarily depend on it.
---
 runtime/lua/vim/diagnostic.lua | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index b8d3906b7f..9e9b09ed1d 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -652,16 +652,14 @@ function M.config(opts, namespace)
 
   if namespace then
     for bufnr, v in pairs(diagnostic_cache) do
-      if api.nvim_buf_is_loaded(bufnr) and v[namespace] then
+      if v[namespace] then
         M.show(namespace, bufnr)
       end
     end
   else
     for bufnr, v in pairs(diagnostic_cache) do
-      if api.nvim_buf_is_loaded(bufnr) then
-        for ns in pairs(v) do
-          M.show(ns, bufnr)
-        end
+      for ns in pairs(v) do
+        M.show(ns, bufnr)
       end
     end
   end
@@ -693,9 +691,7 @@ function M.set(namespace, bufnr, diagnostics, opts)
     set_diagnostic_cache(namespace, bufnr, diagnostics)
   end
 
-  if api.nvim_buf_is_loaded(bufnr) then
-    M.show(namespace, bufnr, nil, opts)
-  end
+  M.show(namespace, bufnr, nil, opts)
 
   api.nvim_exec_autocmds('DiagnosticChanged', {
     modeline = false,
@@ -928,6 +924,10 @@ M.handlers.underline = {
     bufnr = get_bufnr(bufnr)
     opts = opts or {}
 
+    if not vim.api.nvim_buf_is_loaded(bufnr) then
+      return
+    end
+
     if opts.underline and opts.underline.severity then
       diagnostics = filter_by_severity(opts.underline.severity, diagnostics)
     end
@@ -994,6 +994,10 @@ M.handlers.virtual_text = {
     bufnr = get_bufnr(bufnr)
     opts = opts or {}
 
+    if not vim.api.nvim_buf_is_loaded(bufnr) then
+      return
+    end
+
     local severity
     if opts.virtual_text then
       if opts.virtual_text.format then
-- 
cgit 


From 272ef271153b0f66410b0e59ce31e05d211b44fd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 17 Oct 2023 22:43:42 +0800
Subject: vim-patch:9.0.2035: [security] use-after-free with wildmenu (#25687)

Problem:  [security] use-after-free with wildmenu
Solution: properly clean up the wildmenu when exiting

Fix wildchar/wildmenu/pum memory corruption with special wildchar's

Currently, using `wildchar=<Esc>` or `wildchar=<C-\>` can lead to a
memory corruption if using wildmenu+pum, or wrong states if only using
wildmenu. This is due to the code only using one single place inside the
cmdline process loop to perform wild menu clean up (by checking
`end_wildmenu`) but there are other odd situations where the loop could
have exited and we need a post-loop clean up just to be sure. If the
clean up was not done you would have a stale popup menu referring to
invalid memory, or if not using popup menu, incorrect status line (if
`laststatus=0`).

For example, if you hit `<Esc>` two times when it's wildchar, there's a
hard-coded behavior to exit command-line as a failsafe for user, and if
you hit `<C-\><C-\><C-N>` it will also exit command-line, but the clean
up code would not have hit because of specialized `<C-\>` handling.

Fix Ctrl-E / Ctrl-Y to not cancel/accept wildmenu if they are also
used for 'wildchar'/'wildcharm'. Currently they don't behave properly,
and also have potentially memory unsafe behavior as the logic is
currently not accounting for this situation and try to do both.
(Previous patch that addressed this: vim/vim#11677)

Also, correctly document Escape key behavior (double-hit it to escape)
in wildchar docs as it's previously undocumented.

In addition, block known invalid chars to be set in `wildchar` option,
such as Ctrl-C and `<CR>`. This is just to make it clear to the user
they shouldn't be set, and is not required for this bug fix.

closes: vim/vim#13361

https://github.com/vim/vim/commit/8f4fb007e4d472b09ff6bed9ffa485e0c3093699

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
---
 runtime/doc/options.txt           | 2 ++
 runtime/lua/vim/_meta/options.lua | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e734b62020..c8ea5ce67f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6920,6 +6920,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The character is not recognized when used inside a macro.  See
 	'wildcharm' for that.
 	Some keys will not work, such as CTRL-C, <CR> and Enter.
+	<Esc> can be used, but hitting it twice in a row will still exit
+	command-line as a failsafe measure.
 	Although 'wc' is a number option, you can set it to a special key: >
 		:set wc=<Tab>
 <
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 50146bac50..cc013112b3 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -7466,6 +7466,8 @@ vim.go.ww = vim.go.whichwrap
 --- The character is not recognized when used inside a macro.  See
 --- 'wildcharm' for that.
 --- Some keys will not work, such as CTRL-C, <CR> and Enter.
+--- <Esc> can be used, but hitting it twice in a row will still exit
+--- command-line as a failsafe measure.
 --- Although 'wc' is a number option, you can set it to a special key:
 --- ```
 --- 	:set wc=<Tab>
-- 
cgit 


From 3fd7449d5abe9a75fed8fb6b68c5958bd1a9ee12 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Tue, 17 Oct 2023 13:34:39 -0700
Subject: fix(treesitter): check that buf is loaded in autocommands (#25679)

---
 runtime/lua/vim/treesitter/dev.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index db30d638af..d9f0a21106 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -366,6 +366,10 @@ function M.inspect_tree(opts)
     group = group,
     buffer = b,
     callback = function()
+      if not api.nvim_buf_is_loaded(buf) then
+        return true
+      end
+
       api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
       local row = api.nvim_win_get_cursor(w)[1]
       local pos = pg:get(row)
@@ -438,6 +442,9 @@ function M.inspect_tree(opts)
     group = group,
     buffer = b,
     callback = function()
+      if not api.nvim_buf_is_loaded(buf) then
+        return true
+      end
       api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
     end,
   })
@@ -449,7 +456,6 @@ function M.inspect_tree(opts)
       if not api.nvim_buf_is_loaded(b) then
         return true
       end
-
       api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
     end,
   })
-- 
cgit 


From bc5dfda441dd1b3de56bd64059b0a1df4075f050 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 18 Oct 2023 06:08:14 +0800
Subject: vim-patch:9.0.2041: trim(): hard to use default mask (#25692)

Problem:  trim(): hard to use default mask (partly revert v9.0.2040)
Solution: use default mask when it is empty

The default 'mask' value is pretty complex, as it includes many
characters.  Yet, if one needs to specify the trimming direction, the
third argument, 'trim()' currently requires the 'mask' value to be
provided explicitly.

Currently, an empty 'mask' will make 'trim()' call return 'text' value
that is passed in unmodified.  It is unlikely that someone is using it,
so the chances of scripts being broken by this change are low.

Also, this reverts commit 9.0.2040 (which uses v:none for the default
and requires to use an empty string instead).

closes: vim/vim#13358

https://github.com/vim/vim/commit/8079917447e7436dccc2e4cd4a4a56ae0a4712f2

vim-patch:9.0.2040: trim(): hard to use default mask

Problem:  trim(): hard to use default mask
Solution: Use default 'mask' when it is v:none

The default 'mask' value is pretty complex, as it includes many
characters.  Yet, if one needs to specify the trimming direction, the
third argument, 'trim()' currently requires the 'mask' value to be
provided explicitly.

'v:none' is already used to mean "use the default argument value" in
user defined functions.  See |none-function_argument| in help.

closes: vim/vim#13363

https://github.com/vim/vim/commit/6e6386716f9494ae86027c6d34f657fd03dfec42

Co-authored-by: Illia Bobyr <illia.bobyr@gmail.com>
---
 runtime/doc/builtin.txt         | 9 ++++++---
 runtime/lua/vim/_meta/vimfn.lua | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index ceecc61b97..8b472523f1 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -8291,15 +8291,18 @@ tr({src}, {fromstr}, {tostr})                                             *tr()*
 trim({text} [, {mask} [, {dir}]])                                       *trim()*
 		Return {text} as a String where any character in {mask} is
 		removed from the beginning and/or end of {text}.
-		If {mask} is not given, {mask} is all characters up to 0x20,
-		which includes Tab, space, NL and CR, plus the non-breaking
-		space character 0xa0.
+
+		If {mask} is not given, or is an empty string, {mask} is all
+		characters up to 0x20, which includes Tab, space, NL and CR,
+		plus the non-breaking space character 0xa0.
+
 		The optional {dir} argument specifies where to remove the
 		characters:
 			0	remove from the beginning and end of {text}
 			1	remove only at the beginning of {text}
 			2	remove only at the end of {text}
 		When omitted both ends are trimmed.
+
 		This function deals with multibyte characters properly.
 		Returns an empty string on error.
 
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 2b79feec8e..2c594e049f 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -9845,15 +9845,18 @@ function vim.fn.tr(src, fromstr, tostr) end
 
 --- Return {text} as a String where any character in {mask} is
 --- removed from the beginning and/or end of {text}.
---- If {mask} is not given, {mask} is all characters up to 0x20,
---- which includes Tab, space, NL and CR, plus the non-breaking
---- space character 0xa0.
+---
+--- If {mask} is not given, or is an empty string, {mask} is all
+--- characters up to 0x20, which includes Tab, space, NL and CR,
+--- plus the non-breaking space character 0xa0.
+---
 --- The optional {dir} argument specifies where to remove the
 --- characters:
 ---   0  remove from the beginning and end of {text}
 ---   1  remove only at the beginning of {text}
 ---   2  remove only at the end of {text}
 --- When omitted both ends are trimmed.
+---
 --- This function deals with multibyte characters properly.
 --- Returns an empty string on error.
 ---
-- 
cgit 


From eadedfd9084c338a9162ef3706756bda443d6559 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 17 Oct 2023 17:37:56 +0200
Subject: vim-patch:5a33ce2a661f

runtime(json5): include syntax script for json5 (vim/vim#13356)

Merging syntax file from gutenye/json5.vim, modified to include proper
vim header.

See: https://github.com/vim/vim/issues/8499

https://github.com/vim/vim/commit/5a33ce2a661fb836d4c5c489f2a850172a23e0b0

Co-authored-by: Rolf Vidar Mazunki Hoksaas <32819373+mazunki@users.noreply.github.com>
Co-authored-by: Guten Ye <ywzhaifei@gmail.com>
---
 runtime/syntax/json5.vim | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 runtime/syntax/json5.vim

(limited to 'runtime')

diff --git a/runtime/syntax/json5.vim b/runtime/syntax/json5.vim
new file mode 100644
index 0000000000..5b01d33aad
--- /dev/null
+++ b/runtime/syntax/json5.vim
@@ -0,0 +1,73 @@
+" Vim syntax file
+" Language:     JSON5
+" Maintainer:   Mazunki Hoksaas rolferen@gmail.com
+" Previous Maintainer: Guten Ye <ywzhaifei@gmail.com>
+" Last Change:  2019 Apr 1
+" Version:      vim9.0-1
+" URL:          https://github.com/json5/json5
+
+" Syntax setup
+if exists('b:current_syntax') && b:current_syntax == 'json5'
+  finish
+endif
+
+" Numbers
+syn match   json5Number    "[-+]\=\%(0\|[1-9]\d*\)\%(\.\d*\)\=\%([eE][-+]\=\d\+\)\="
+syn match   json5Number    "[-+]\=\%(\.\d\+\)\%([eE][-+]\=\d\+\)\="
+syn match   json5Number    "[-+]\=0[xX]\x*"
+syn match   json5Number    "[-+]\=Infinity\|NaN"
+
+" An integer part of 0 followed by other digits is not allowed
+syn match   json5NumError  "[-+]\=0\d\(\d\|\.\)*"
+
+" A hexadecimal number cannot have a fractional part
+syn match   json5NumError  "[-+]\=0x\x*\.\x*"
+
+" Strings
+syn region  json5String    start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=json5Escape,@Spell
+syn region  json5String    start=+'+  skip=+\\\\\|\\'+  end=+'+  contains=json5Escape,@Spell
+
+" Escape sequences
+syn match   json5Escape    "\\['\"\\bfnrtv]" contained
+syn match   json5Escape    "\\u\x\{4}" contained
+
+" Boolean
+syn keyword json5Boolean   true false
+
+" Null
+syn keyword json5Null      null
+
+" Delimiters and Operators
+syn match   json5Delimiter  ","
+syn match   json5Operator   ":"
+
+" Braces
+syn match   json5Braces	   "[{}\[\]]"
+
+" Keys
+syn match   json5Key /@\?\%(\I\|\$\)\%(\i\|\$\)*\s*\ze::\@!/ contains=@Spell
+syn match   json5Key /"\([^"]\|\\"\)\{-}"\ze\s*:/ contains=json5Escape,@Spell
+
+" Comment
+syn region  json5LineComment    start=+\/\/+ end=+$+ keepend contains=@Spell
+syn region  json5LineComment    start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend fold contains=@Spell
+syn region  json5Comment        start="/\*"  end="\*/" fold contains=@Spell
+
+" Define the default highlighting
+hi def link json5String             String
+hi def link json5Key                Identifier
+hi def link json5Escape             Special
+hi def link json5Number             Number
+hi def link json5Delimiter          Delimiter
+hi def link json5Operator           Operator
+hi def link json5Braces             Delimiter
+hi def link json5Null               Keyword
+hi def link json5Boolean            Boolean
+hi def link json5LineComment        Comment
+hi def link json5Comment            Comment
+hi def link json5NumError           Error
+
+if !exists('b:current_syntax')
+  let b:current_syntax = 'json5'
+endif
+
-- 
cgit 


From ae7020c667b5314fe832d2a8897fb16d57194bdf Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Fri, 6 Oct 2023 16:27:10 +0900
Subject: fix(docs): fix TSNode incorrect signatures

---
 runtime/lua/vim/treesitter/_meta.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index cd8462bcb7..e6dcbc7a62 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -14,10 +14,10 @@
 ---@field extra fun(self: TSNode): boolean
 ---@field child_count fun(self: TSNode): integer
 ---@field named_child_count fun(self: TSNode): integer
----@field child fun(self: TSNode, integer): TSNode?
----@field named_child fun(self: TSNode, integer): TSNode?
----@field descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode?
----@field named_descendant_for_range fun(self: TSNode, integer, integer, integer, integer): TSNode?
+---@field child fun(self: TSNode, index: integer): TSNode?
+---@field named_child fun(self: TSNode, index: integer): TSNode?
+---@field descendant_for_range fun(self: TSNode, start_row: integer, start_col: integer, end_row: integer, end_col: integer): TSNode?
+---@field named_descendant_for_range fun(self: TSNode, start_row: integer, start_col: integer, end_row: integer, end_col: integer): TSNode?
 ---@field parent fun(self: TSNode): TSNode?
 ---@field next_sibling fun(self: TSNode): TSNode?
 ---@field prev_sibling fun(self: TSNode): TSNode?
-- 
cgit 


From 315c711700a87fe3fa546906ab39557ebba19baf Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Wed, 18 Oct 2023 21:18:24 -0700
Subject: fix(treesitter): set cursor position when opening inspector

---
 runtime/lua/vim/treesitter/dev.lua | 64 ++++++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 24 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index d9f0a21106..39c03cd1a5 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -181,6 +181,42 @@ local function set_dev_properties(w, b)
   vim.bo[b].filetype = 'query'
 end
 
+--- Updates the cursor position in the inspector to match the node under the cursor.
+---
+--- @param pg TSTreeView
+--- @param lang string
+--- @param source_buf integer
+--- @param inspect_buf integer
+--- @param inspect_win integer
+--- @param pos? { [1]: integer, [2]: integer }
+local function set_inspector_cursor(pg, lang, source_buf, inspect_buf, inspect_win, pos)
+  api.nvim_buf_clear_namespace(inspect_buf, pg.ns, 0, -1)
+
+  local cursor_node = vim.treesitter.get_node({
+    bufnr = source_buf,
+    lang = lang,
+    pos = pos,
+    ignore_injections = false,
+  })
+  if not cursor_node then
+    return
+  end
+
+  local cursor_node_id = cursor_node:id()
+  for i, v in pg:iter() do
+    if v.id == cursor_node_id then
+      local start = v.depth
+      local end_col = start + #v.text
+      api.nvim_buf_set_extmark(inspect_buf, pg.ns, i - 1, start, {
+        end_col = end_col,
+        hl_group = 'Visual',
+      })
+      api.nvim_win_set_cursor(inspect_win, { i, 0 })
+      break
+    end
+  end
+end
+
 --- Write the contents of this View into {bufnr}.
 ---
 ---@param bufnr integer Buffer number to write into.
@@ -307,6 +343,9 @@ function M.inspect_tree(opts)
 
   pg:draw(b)
 
+  local cursor = api.nvim_win_get_cursor(win)
+  set_inspector_cursor(pg, opts.lang, buf, b, w, { cursor[1] - 1, cursor[2] })
+
   api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
   api.nvim_buf_set_keymap(b, 'n', '<CR>', '', {
     desc = 'Jump to the node under the cursor in the source buffer',
@@ -398,30 +437,7 @@ function M.inspect_tree(opts)
         return true
       end
 
-      api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
-
-      local cursor_node = vim.treesitter.get_node({
-        bufnr = buf,
-        lang = opts.lang,
-        ignore_injections = false,
-      })
-      if not cursor_node then
-        return
-      end
-
-      local cursor_node_id = cursor_node:id()
-      for i, v in pg:iter() do
-        if v.id == cursor_node_id then
-          local start = v.depth
-          local end_col = start + #v.text
-          api.nvim_buf_set_extmark(b, pg.ns, i - 1, start, {
-            end_col = end_col,
-            hl_group = 'Visual',
-          })
-          api.nvim_win_set_cursor(w, { i, 0 })
-          break
-        end
-      end
+      set_inspector_cursor(pg, opts.lang, buf, b, w)
     end,
   })
 
-- 
cgit 


From e6d352d8d7d8a987d0bd9b2e13bfd395e1127c3e Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Thu, 19 Oct 2023 10:20:12 -0500
Subject: vim-patch:e08bfef88bd0

runtime(zig): Update Zig runtime files (vim/vim#13388)

Update runtime files from upstream (https://github.com/zig/zig.vim) at
commit 54c216e5306a5c3878a60596aacb94dca8652ab9.

https://github.com/vim/vim/commit/e08bfef88bd05a9d27ee16c57cd10173e280f600

Co-authored-by: Gregory Anders <8965202+gpanders@users.noreply.github.com>
---
 runtime/ftplugin/zig.vim     |  4 ++--
 runtime/lua/vim/filetype.lua |  2 +-
 runtime/syntax/zig.vim       | 27 ++++++++++++++++-----------
 3 files changed, 19 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index cfd7102b8d..291fe44b11 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -28,7 +28,7 @@ setlocal formatoptions-=t formatoptions+=croql
 setlocal suffixesadd=.zig,.zir
 
 if has('comments')
-    setlocal comments=:///,://!,://,:\\\\
+    setlocal comments=:///,://!,://
     setlocal commentstring=//\ %s
 endif
 
@@ -53,7 +53,7 @@ endif
 unlet! s:tmp_cwd
 
 if exists('g:zig_std_dir')
-    let &l:path = &l:path . ',' . g:zig_std_dir
+    let &l:path = g:zig_std_dir . ',' . &l:path
 endif
 
 let b:undo_ftplugin =
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 2058a4dcba..6dbfd7e64d 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1119,7 +1119,7 @@ local extension = {
   yuck = 'yuck',
   z8a = 'z8a',
   zig = 'zig',
-  zir = 'zir',
+  zon = 'zig',
   zu = 'zimbu',
   zut = 'zimbutempl',
   zs = 'zserio',
diff --git a/runtime/syntax/zig.vim b/runtime/syntax/zig.vim
index e09b5e8815..121b0195b0 100644
--- a/runtime/syntax/zig.vim
+++ b/runtime/syntax/zig.vim
@@ -34,6 +34,7 @@ let s:zig_syntax_keywords = {
     \ ,             "usize"
     \ ,             "comptime_int"
     \ ,             "comptime_float"
+    \ ,             "c_char"
     \ ,             "c_short"
     \ ,             "c_ushort"
     \ ,             "c_int"
@@ -96,6 +97,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@atomicStore"
     \ ,                  "@bitCast"
     \ ,                  "@breakpoint"
+    \ ,                  "@trap"
     \ ,                  "@alignCast"
     \ ,                  "@alignOf"
     \ ,                  "@cDefine"
@@ -107,6 +109,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@cmpxchgStrong"
     \ ,                  "@compileError"
     \ ,                  "@compileLog"
+    \ ,                  "@constCast"
     \ ,                  "@ctz"
     \ ,                  "@popCount"
     \ ,                  "@divExact"
@@ -126,9 +129,10 @@ let s:zig_syntax_keywords = {
     \ ,                  "@unionInit"
     \ ,                  "@frameAddress"
     \ ,                  "@import"
+    \ ,                  "@inComptime"
     \ ,                  "@newStackCall"
     \ ,                  "@asyncCall"
-    \ ,                  "@intToPtr"
+    \ ,                  "@ptrFromInt"
     \ ,                  "@max"
     \ ,                  "@min"
     \ ,                  "@memcpy"
@@ -145,7 +149,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@panic"
     \ ,                  "@prefetch"
     \ ,                  "@ptrCast"
-    \ ,                  "@ptrToInt"
+    \ ,                  "@intFromPtr"
     \ ,                  "@rem"
     \ ,                  "@returnAddress"
     \ ,                  "@setCold"
@@ -169,25 +173,26 @@ let s:zig_syntax_keywords = {
     \ ,                  "@subWithOverflow"
     \ ,                  "@intCast"
     \ ,                  "@floatCast"
-    \ ,                  "@intToFloat"
-    \ ,                  "@floatToInt"
-    \ ,                  "@boolToInt"
-    \ ,                  "@errSetCast"
+    \ ,                  "@floatFromInt"
+    \ ,                  "@intFromFloat"
+    \ ,                  "@intFromBool"
+    \ ,                  "@errorCast"
     \ ,                  "@truncate"
     \ ,                  "@typeInfo"
     \ ,                  "@typeName"
     \ ,                  "@TypeOf"
     \ ,                  "@atomicRmw"
-    \ ,                  "@intToError"
-    \ ,                  "@errorToInt"
-    \ ,                  "@intToEnum"
-    \ ,                  "@enumToInt"
+    \ ,                  "@errorFromInt"
+    \ ,                  "@intFromError"
+    \ ,                  "@enumFromInt"
+    \ ,                  "@intFromEnum"
     \ ,                  "@setAlignStack"
     \ ,                  "@frame"
     \ ,                  "@Frame"
     \ ,                  "@frameSize"
     \ ,                  "@bitReverse"
     \ ,                  "@Vector"
+    \ ,                  "@volatileCast"
     \ ,                  "@sin"
     \ ,                  "@cos"
     \ ,                  "@tan"
@@ -196,7 +201,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@log"
     \ ,                  "@log2"
     \ ,                  "@log10"
-    \ ,                  "@fabs"
+    \ ,                  "@abs"
     \ ,                  "@floor"
     \ ,                  "@ceil"
     \ ,                  "@trunc"
-- 
cgit 


From 594ff34581907fed4956d4dc93c033dfdd5f7a69 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 19 Oct 2023 16:22:51 -0500
Subject: vim-patch:d5dc58aeed1b (#25720)

runtime(json5): Add new ftplugin (vim/vim#13385)

https://github.com/vim/vim/commit/d5dc58aeed1b3e76527685d04906afd634d45949

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/json5.vim | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 runtime/ftplugin/json5.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/json5.vim b/runtime/ftplugin/json5.vim
new file mode 100644
index 0000000000..2560857a33
--- /dev/null
+++ b/runtime/ftplugin/json5.vim
@@ -0,0 +1,28 @@
+" Vim filetype plugin file
+" Language:	JSON5
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2023 Oct 19
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let b:undo_ftplugin = "setl fo< com< cms<"
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "JSON5 Files (*.json5)\t*.json5\n" ..
+	\	       "JSON Files (*.json)\t*.json\n" ..
+	\	       "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
-- 
cgit 


From f4b896198fdd44f1994397a4e5d6475a2dcec05c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 20 Oct 2023 12:18:17 +0200
Subject: vim-patch:9.0.2056: no digraph for quadruple prime

Problem:  no digraph for quadruple prime
Solution: add quadruple prime digraph using 4'

closes: vim/vim#13380

https://github.com/vim/vim/commit/47416d1a7441f8c815438903e78ba0a2d877699e

Co-authored-by: Jonathan Wright <quaggy@gmail.com>
---
 runtime/doc/digraph.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index bd47f5ca2c..1e91e5e4b8 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -168,6 +168,13 @@ ROUBLE
 The rouble sign was added in 2014 as 0x20bd.  Vim supports the digraphs =R and
 =P for this.  Note that R= and P= are other characters.
 
+QUADRUPLE PRIME
+
+The quadruple prime using the digraph 4' was added in 2023.  Although it is
+not part of RFC 1345, it supplements the existing digraph implementation as
+there already exist digraphs for PRIME, DOUBLE PRIME and TRIPLE PRIME using
+the 1', 2' and 3' digraphs.
+
 						*digraph-table* *digraph-table-mbyte*
 >
   char  digraph	hex	dec	official name
@@ -920,6 +927,7 @@ The rouble sign was added in 2014 as 0x20bd.  Vim supports the digraphs =R and
   ′	1'	2032	8242	PRIME
   ″	2'	2033	8243	DOUBLE PRIME
   ‴	3'	2034	8244	TRIPLE PRIME
+  ⁗	4'	2057	8279	QUADRUPLE PRIME
   ‵	1"	2035	8245	REVERSED PRIME
   ‶	2"	2036	8246	REVERSED DOUBLE PRIME
   ‷	3"	2037	8247	REVERSED TRIPLE PRIME
-- 
cgit 


From 330444994616e48e5e4d15bbf72d7c5346943565 Mon Sep 17 00:00:00 2001
From: Jorge Mederos <46798594+jmederosalvarado@users.noreply.github.com>
Date: Sat, 21 Oct 2023 08:47:14 +0200
Subject: fix(lsp): log unknown diagnostic tags instead of showing a warning
 (#25705)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To be more in line with the specification:

> To support the evolution of enumerations the using side of an enumeration shouldn’t fail on an enumeration value it doesn’t know. It should simply ignore it as a value it can use and try to do its best to preserve the value on round trips
---
 runtime/lua/vim/lsp/diagnostic.lua | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/diagnostic.lua b/runtime/lua/vim/lsp/diagnostic.lua
index 73444d8c6a..b6f0cfa0b3 100644
--- a/runtime/lua/vim/lsp/diagnostic.lua
+++ b/runtime/lua/vim/lsp/diagnostic.lua
@@ -2,6 +2,7 @@
 
 local util = require('vim.lsp.util')
 local protocol = require('vim.lsp.protocol')
+local log = require('vim.lsp.log')
 local ms = protocol.Methods
 
 local api = vim.api
@@ -88,10 +89,7 @@ local function tags_lsp_to_vim(diagnostic, client_id)
       tags = tags or {}
       tags.deprecated = true
     else
-      vim.notify_once(
-        string.format('Unknown DiagnosticTag %d from LSP client %d', tag, client_id),
-        vim.log.levels.WARN
-      )
+      log.info(string.format('Unknown DiagnosticTag %d from LSP client %d', tag, client_id))
     end
   end
   return tags
-- 
cgit 


From f1775da07fe48da629468bcfcc2a8a6c4c3f40ed Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Fri, 20 Oct 2023 23:51:26 -0700
Subject: feat(lsp): add snippet API (#25301)

---
 runtime/doc/lua.txt                      |  59 ++++
 runtime/doc/news.txt                     |   2 +
 runtime/lua/vim/_editor.lua              |   1 +
 runtime/lua/vim/_meta.lua                |   1 +
 runtime/lua/vim/lsp/_snippet_grammar.lua |  34 +-
 runtime/lua/vim/lsp/protocol.lua         |   1 -
 runtime/lua/vim/lsp/util.lua             |  30 +-
 runtime/lua/vim/snippet.lua              | 535 +++++++++++++++++++++++++++++++
 8 files changed, 629 insertions(+), 34 deletions(-)
 create mode 100644 runtime/lua/vim/snippet.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 7e888a2375..1d69b1cc91 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3670,4 +3670,63 @@ totable({f}, {...})                                       *vim.iter.totable()*
     Return: ~
         (table)
 
+
+==============================================================================
+Lua module: vim.snippet                                          *vim.snippet*
+
+active()                                                    *snippet.active()*
+    Returns `true` if there's an active snippet in the current buffer.
+
+    Return: ~
+        (boolean)
+
+exit()                                                        *snippet.exit()*
+    Exits the current snippet.
+
+expand({input})                                             *snippet.expand()*
+    Expands the given snippet text. Refer to https://microsoft.github.io/language-server-protocol/specification/#snippet_syntax for the specification of valid input.
+
+    Tabstops are highlighted with hl-SnippetTabstop.
+
+    Parameters: ~
+      • {input}  (string)
+
+jump({direction})                                             *snippet.jump()*
+    Jumps within the active snippet in the given direction. If the jump isn't
+    possible, the function call does nothing.
+
+    You can use this function to navigate a snippet as follows: >lua
+        vim.keymap.set({ 'i', 's' }, '<Tab>', function()
+           if vim.snippet.jumpable(1) then
+             return '<cmd>lua vim.snippet.jump(1)<cr>'
+           else
+             return '<Tab>'
+           end
+         end, { expr = true })
+<
+
+    Parameters: ~
+      • {direction}  (vim.snippet.Direction) Navigation direction. -1 for
+                     previous, 1 for next.
+
+jumpable({direction})                                     *snippet.jumpable()*
+    Returns `true` if there is an active snippet which can be jumped in the
+    given direction. You can use this function to navigate a snippet as
+    follows: >lua
+        vim.keymap.set({ 'i', 's' }, '<Tab>', function()
+           if vim.snippet.jumpable(1) then
+             return '<cmd>lua vim.snippet.jump(1)<cr>'
+           else
+             return '<Tab>'
+           end
+         end, { expr = true })
+<
+
+    Parameters: ~
+      • {direction}  (vim.snippet.Direction) Navigation direction. -1 for
+                     previous, 1 for next.
+
+    Return: ~
+        (boolean)
+
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index d55f43ce89..0fe675c285 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -193,6 +193,8 @@ The following new APIs and features were added.
 
 • Added |:fclose| command.
 
+• Added |vim.snippet| for snippet expansion support.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index bbe93bfbc8..e0c7de87b3 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -38,6 +38,7 @@ for k, v in pairs({
   ui = true,
   health = true,
   secure = true,
+  snippet = true,
   _watch = true,
 }) do
   vim._submodules[k] = v
diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_meta.lua
index ddd0a0eb49..e3b99f6b3d 100644
--- a/runtime/lua/vim/_meta.lua
+++ b/runtime/lua/vim/_meta.lua
@@ -19,6 +19,7 @@ vim.loader = require('vim.loader')
 vim.lsp = require('vim.lsp')
 vim.re = require('vim.re')
 vim.secure = require('vim.secure')
+vim.snippet = require('vim.snippet')
 vim.treesitter = require('vim.treesitter')
 vim.ui = require('vim.ui')
 vim.version = require('vim.version')
diff --git a/runtime/lua/vim/lsp/_snippet_grammar.lua b/runtime/lua/vim/lsp/_snippet_grammar.lua
index 0a4d669fb9..9318fefcbc 100644
--- a/runtime/lua/vim/lsp/_snippet_grammar.lua
+++ b/runtime/lua/vim/lsp/_snippet_grammar.lua
@@ -81,14 +81,40 @@ local Type = {
 M.NodeType = Type
 
 --- @class vim.snippet.Node<T>: { type: vim.snippet.Type, data: T }
---- @class vim.snippet.TabstopData: { tabstop: number }
+--- @class vim.snippet.TabstopData: { tabstop: integer }
 --- @class vim.snippet.TextData: { text: string }
---- @class vim.snippet.PlaceholderData: { tabstop: vim.snippet.TabstopData, value: vim.snippet.Node<any> }
---- @class vim.snippet.ChoiceData: { tabstop: vim.snippet.TabstopData, values: string[] }
+--- @class vim.snippet.PlaceholderData: { tabstop: integer, value: vim.snippet.Node<any> }
+--- @class vim.snippet.ChoiceData: { tabstop: integer, values: string[] }
 --- @class vim.snippet.VariableData: { name: string, default?: vim.snippet.Node<any>, regex?: string, format?: vim.snippet.Node<vim.snippet.FormatData|vim.snippet.TextData>[], options?: string }
 --- @class vim.snippet.FormatData: { capture: number, modifier?: string, if_text?: string, else_text?: string }
 --- @class vim.snippet.SnippetData: { children: vim.snippet.Node<any>[] }
 
+--- @type vim.snippet.Node<any>
+local Node = {}
+
+--- @return string
+--- @diagnostic disable-next-line: inject-field
+function Node:__tostring()
+  local node_text = {}
+  local type, data = self.type, self.data
+  if type == Type.Snippet then
+    --- @cast data vim.snippet.SnippetData
+    for _, child in ipairs(data.children) do
+      table.insert(node_text, tostring(child))
+    end
+  elseif type == Type.Choice then
+    --- @cast data vim.snippet.ChoiceData
+    table.insert(node_text, data.values[1])
+  elseif type == Type.Placeholder then
+    --- @cast data vim.snippet.PlaceholderData
+    table.insert(node_text, tostring(data.value))
+  elseif type == Type.Text then
+    --- @cast data vim.snippet.TextData
+    table.insert(node_text, data.text)
+  end
+  return table.concat(node_text)
+end
+
 --- Returns a function that constructs a snippet node of the given type.
 ---
 --- @generic T
@@ -96,7 +122,7 @@ M.NodeType = Type
 --- @return fun(data: T): vim.snippet.Node<T>
 local function node(type)
   return function(data)
-    return { type = type, data = data }
+    return setmetatable({ type = type, data = data }, Node)
   end
 end
 
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 0755fa991f..3a1b16c450 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -742,7 +742,6 @@ function protocol.make_client_capabilities()
           -- this should be disabled out of the box.
           -- However, users can turn this back on if they have a snippet plugin.
           snippetSupport = false,
-
           commitCharactersSupport = false,
           preselectSupport = false,
           deprecatedSupport = false,
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index d525cae4c0..42c1508cbf 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -616,35 +616,7 @@ function M.parse_snippet(input)
     return input
   end
 
-  --- @param node vim.snippet.Node<any>
-  --- @return string
-  local function node_to_string(node)
-    local insert_text = {}
-    if node.type == snippet.NodeType.Snippet then
-      for _, child in
-        ipairs((node.data --[[@as vim.snippet.SnippetData]]).children)
-      do
-        table.insert(insert_text, node_to_string(child))
-      end
-    elseif node.type == snippet.NodeType.Choice then
-      table.insert(insert_text, (node.data --[[@as vim.snippet.ChoiceData]]).values[1])
-    elseif node.type == snippet.NodeType.Placeholder then
-      table.insert(
-        insert_text,
-        node_to_string((node.data --[[@as vim.snippet.PlaceholderData]]).value)
-      )
-    elseif node.type == snippet.NodeType.Text then
-      table.insert(
-        insert_text,
-        node
-          .data --[[@as vim.snippet.TextData]]
-          .text
-      )
-    end
-    return table.concat(insert_text)
-  end
-
-  return node_to_string(parsed)
+  return tostring(parsed)
 end
 
 --- Sorts by CompletionItem.sortText.
diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua
new file mode 100644
index 0000000000..3d739bd3af
--- /dev/null
+++ b/runtime/lua/vim/snippet.lua
@@ -0,0 +1,535 @@
+local G = require('vim.lsp._snippet_grammar')
+local snippet_group = vim.api.nvim_create_augroup('vim/snippet', {})
+local snippet_ns = vim.api.nvim_create_namespace('vim/snippet')
+
+--- Returns the 0-based cursor position.
+---
+--- @return integer, integer
+local function cursor_pos()
+  local cursor = vim.api.nvim_win_get_cursor(0)
+  return cursor[1] - 1, cursor[2]
+end
+
+--- Resolves variables (like `$name` or `${name:default}`) as follows:
+--- - When a variable is unknown (i.e.: its name is not recognized in any of the cases below), return `nil`.
+--- - When a variable isn't set, return its default (if any) or an empty string.
+---
+--- Note that in some cases, the default is ignored since it's not clear how to distinguish an empty
+--- value from an unset value (e.g.: `TM_CURRENT_LINE`).
+---
+--- @param var string
+--- @param default string
+--- @return string?
+local function resolve_variable(var, default)
+  --- @param str string
+  --- @return string
+  local function expand_or_default(str)
+    local expansion = vim.fn.expand(str) --[[@as string]]
+    return expansion == '' and default or expansion
+  end
+
+  if var == 'TM_SELECTED_TEXT' then
+    -- Snippets are expanded in insert mode only, so there's no selection.
+    return default
+  elseif var == 'TM_CURRENT_LINE' then
+    return vim.api.nvim_get_current_line()
+  elseif var == 'TM_CURRENT_WORD' then
+    return expand_or_default('<cword>')
+  elseif var == 'TM_LINE_INDEX' then
+    return tostring(vim.fn.line('.') - 1)
+  elseif var == 'TM_LINE_NUMBER' then
+    return tostring(vim.fn.line('.'))
+  elseif var == 'TM_FILENAME' then
+    return expand_or_default('%:t')
+  elseif var == 'TM_FILENAME_BASE' then
+    -- Not using '%:t:r' since we want to remove all extensions.
+    local filename_base = expand_or_default('%:t'):gsub('%.[^%.]*$', '')
+    return filename_base
+  elseif var == 'TM_DIRECTORY' then
+    return expand_or_default('%:p:h:t')
+  elseif var == 'TM_FILEPATH' then
+    return expand_or_default('%:p')
+  end
+
+  -- Unknown variable.
+  return nil
+end
+
+--- Transforms the given text into an array of lines (so no line contains `\n`).
+---
+--- @param text string|string[]
+--- @return string[]
+local function text_to_lines(text)
+  text = type(text) == 'string' and { text } or text
+  --- @cast text string[]
+  return vim.split(table.concat(text), '\n', { plain = true })
+end
+
+--- Computes the 0-based position of a tabstop located at the end of `snippet` and spanning
+--- `placeholder` (if given).
+---
+--- @param snippet string[]
+--- @param placeholder string?
+--- @return Range4
+local function compute_tabstop_range(snippet, placeholder)
+  local cursor_row, cursor_col = cursor_pos()
+  local snippet_text = text_to_lines(snippet)
+  local placeholder_text = text_to_lines(placeholder or '')
+  local start_row = cursor_row + #snippet_text - 1
+  local start_col = #(snippet_text[#snippet_text] or '')
+
+  -- Add the cursor's column offset to the first line.
+  if start_row == cursor_row then
+    start_col = start_col + cursor_col
+  end
+
+  local end_row = start_row + #placeholder_text - 1
+  local end_col = (start_row == end_row and start_col or 0)
+    + #(placeholder_text[#placeholder_text] or '')
+
+  return { start_row, start_col, end_row, end_col }
+end
+
+--- @class vim.snippet.Tabstop
+--- @field extmark_id integer
+--- @field index integer
+--- @field bufnr integer
+local Tabstop = {}
+
+--- Creates a new tabstop.
+---
+--- @package
+--- @param index integer
+--- @param bufnr integer
+--- @param range Range4
+--- @return vim.snippet.Tabstop
+function Tabstop.new(index, bufnr, range)
+  local extmark_id = vim.api.nvim_buf_set_extmark(bufnr, snippet_ns, range[1], range[2], {
+    right_gravity = false,
+    end_right_gravity = true,
+    end_line = range[3],
+    end_col = range[4],
+    hl_group = 'SnippetTabstop',
+  })
+
+  local self = setmetatable(
+    { index = index, bufnr = bufnr, extmark_id = extmark_id },
+    { __index = Tabstop }
+  )
+
+  return self
+end
+
+--- Returns the tabstop's range.
+---
+--- @package
+--- @return Range4
+function Tabstop:get_range()
+  local mark =
+    vim.api.nvim_buf_get_extmark_by_id(self.bufnr, snippet_ns, self.extmark_id, { details = true })
+
+  --- @diagnostic disable-next-line: undefined-field
+  return { mark[1], mark[2], mark[3].end_row, mark[3].end_col }
+end
+
+--- Returns the text spanned by the tabstop.
+---
+--- @package
+--- @return string
+function Tabstop:get_text()
+  local range = self:get_range()
+  return table.concat(
+    vim.api.nvim_buf_get_text(self.bufnr, range[1], range[2], range[3], range[4], {}),
+    '\n'
+  )
+end
+
+--- Sets the tabstop's text.
+---
+--- @package
+--- @param text string
+function Tabstop:set_text(text)
+  local range = self:get_range()
+  vim.api.nvim_buf_set_text(self.bufnr, range[1], range[2], range[3], range[4], text_to_lines(text))
+end
+
+--- @class vim.snippet.Session
+--- @field bufnr integer
+--- @field tabstops table<integer, vim.snippet.Tabstop[]>
+--- @field current_tabstop vim.snippet.Tabstop
+local Session = {}
+
+--- Creates a new snippet session in the current buffer.
+---
+--- @package
+--- @return vim.snippet.Session
+function Session.new()
+  local bufnr = vim.api.nvim_get_current_buf()
+  local self = setmetatable({
+    bufnr = bufnr,
+    tabstops = {},
+    current_tabstop = Tabstop.new(0, bufnr, { 0, 0, 0, 0 }),
+  }, { __index = Session })
+
+  return self
+end
+
+--- Creates the session tabstops.
+---
+--- @package
+--- @param tabstop_ranges table<integer, Range4[]>
+function Session:set_tabstops(tabstop_ranges)
+  for index, ranges in pairs(tabstop_ranges) do
+    for _, range in ipairs(ranges) do
+      self.tabstops[index] = self.tabstops[index] or {}
+      table.insert(self.tabstops[index], Tabstop.new(index, self.bufnr, range))
+    end
+  end
+end
+
+--- Returns the destination tabstop index when jumping in the given direction.
+---
+--- @package
+--- @param direction vim.snippet.Direction
+--- @return integer?
+function Session:get_dest_index(direction)
+  local tabstop_indexes = vim.tbl_keys(self.tabstops) --- @type integer[]
+  table.sort(tabstop_indexes)
+  for i, index in ipairs(tabstop_indexes) do
+    if index == self.current_tabstop.index then
+      local dest_index = tabstop_indexes[i + direction] --- @type integer?
+      -- When jumping forwards, $0 is the last tabstop.
+      if not dest_index and direction == 1 then
+        dest_index = 0
+      end
+      -- When jumping backwards, make sure we don't think that $0 is the first tabstop.
+      if dest_index == 0 and direction == -1 then
+        dest_index = nil
+      end
+      return dest_index
+    end
+  end
+end
+
+--- @class vim.snippet.Snippet
+--- @field private _session? vim.snippet.Session
+local M = { session = nil }
+
+--- Select the given tabstop range.
+---
+--- @param tabstop vim.snippet.Tabstop
+local function select_tabstop(tabstop)
+  --- @param keys string
+  local function feedkeys(keys)
+    keys = vim.api.nvim_replace_termcodes(keys, true, false, true)
+    vim.api.nvim_feedkeys(keys, 'n', true)
+  end
+
+  --- NOTE: We don't use `vim.api.nvim_win_set_cursor` here because it causes the cursor to end
+  --- at the end of the selection instead of the start.
+  ---
+  --- @param row integer
+  --- @param col integer
+  local function move_cursor_to(row, col)
+    local line = vim.fn.getline(row) --[[ @as string ]]
+    col = math.max(vim.fn.strchars(line:sub(1, col)) - 1, 0)
+    feedkeys(string.format('%sG0%s', row, string.rep('<Right>', col)))
+  end
+
+  local range = tabstop:get_range()
+  local mode = vim.fn.mode()
+
+  -- Move the cursor to the start of the tabstop.
+  vim.api.nvim_win_set_cursor(0, { range[1] + 1, range[2] })
+
+  -- For empty and the final tabstop, start insert mode at the end of the range.
+  if tabstop.index == 0 or (range[1] == range[3] and range[2] == range[4]) then
+    if mode ~= 'i' then
+      if mode == 's' then
+        feedkeys('<Esc>')
+      end
+      vim.cmd.startinsert({ bang = range[4] >= #vim.api.nvim_get_current_line() })
+    end
+  else
+    -- Else, select the tabstop's text.
+    if mode ~= 'n' then
+      feedkeys('<Esc>')
+    end
+    move_cursor_to(range[1] + 1, range[2] + 1)
+    feedkeys('v')
+    move_cursor_to(range[3] + 1, range[4])
+    feedkeys('o<c-g>')
+  end
+end
+
+--- Sets up the necessary autocommands for snippet expansion.
+---
+--- @param bufnr integer
+local function setup_autocmds(bufnr)
+  vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
+    group = snippet_group,
+    desc = 'Update snippet state when the cursor moves',
+    buffer = bufnr,
+    callback = function()
+      -- Just update the tabstop in insert and select modes.
+      if not vim.fn.mode():match('^[isS]') then
+        return
+      end
+
+      -- Update the current tabstop to be the one containing the cursor.
+      local cursor_row, cursor_col = cursor_pos()
+      for tabstop_index, tabstops in pairs(M._session.tabstops) do
+        for _, tabstop in ipairs(tabstops) do
+          local range = tabstop:get_range()
+          if
+            (cursor_row > range[1] or (cursor_row == range[1] and cursor_col >= range[2]))
+            and (cursor_row < range[3] or (cursor_row == range[3] and cursor_col <= range[4]))
+          then
+            M._session.current_tabstop = tabstop
+            if tabstop_index ~= 0 then
+              return
+            end
+          end
+        end
+      end
+
+      -- The cursor is either not on a tabstop or we reached the end, so exit the session.
+      M.exit()
+      return true
+    end,
+  })
+
+  vim.api.nvim_create_autocmd({ 'TextChanged', 'TextChangedI' }, {
+    group = snippet_group,
+    desc = 'Update active tabstops when buffer text changes',
+    buffer = bufnr,
+    callback = function()
+      if not M.active() then
+        return true
+      end
+
+      -- Sync the tabstops in the current group.
+      local current_tabstop = M._session.current_tabstop
+      local current_text = current_tabstop:get_text()
+      for _, tabstop in ipairs(M._session.tabstops[current_tabstop.index]) do
+        if tabstop.extmark_id ~= current_tabstop.extmark_id then
+          tabstop:set_text(current_text)
+        end
+      end
+    end,
+  })
+end
+
+--- Expands the given snippet text.
+--- Refer to https://microsoft.github.io/language-server-protocol/specification/#snippet_syntax
+--- for the specification of valid input.
+---
+--- Tabstops are highlighted with hl-SnippetTabstop.
+---
+--- @param input string
+function M.expand(input)
+  local snippet = G.parse(input)
+  local snippet_text = {}
+
+  M._session = Session.new()
+
+  -- Get the placeholders we should use for each tabstop index.
+  --- @type table<integer, string>
+  local placeholders = {}
+  for _, child in ipairs(snippet.data.children) do
+    local type, data = child.type, child.data
+    if type == G.NodeType.Placeholder then
+      --- @cast data vim.snippet.PlaceholderData
+      local tabstop, value = data.tabstop, tostring(data.value)
+      if placeholders[tabstop] and placeholders[tabstop] ~= value then
+        error('Snippet has multiple placeholders for tabstop $' .. tabstop)
+      end
+      placeholders[tabstop] = value
+    end
+  end
+
+  -- Keep track of tabstop nodes during expansion.
+  --- @type table<integer, Range4[]>
+  local tabstop_ranges = {}
+
+  --- @param index integer
+  --- @param placeholder string?
+  local function add_tabstop(index, placeholder)
+    tabstop_ranges[index] = tabstop_ranges[index] or {}
+    table.insert(tabstop_ranges[index], compute_tabstop_range(snippet_text, placeholder))
+  end
+
+  --- Appends the given text to the snippet, taking care of indentation.
+  ---
+  --- @param text string|string[]
+  local function append_to_snippet(text)
+    -- Get the base indentation based on the current line and the last line of the snippet.
+    local base_indent = vim.api.nvim_get_current_line():match('^%s*') or ''
+    if #snippet_text > 0 then
+      base_indent = base_indent .. (snippet_text[#snippet_text]:match('^%s*') or '') --- @type string
+    end
+
+    local lines = vim.iter.map(function(i, line)
+      -- Replace tabs by spaces.
+      if vim.o.expandtab then
+        line = line:gsub('\t', (' '):rep(vim.fn.shiftwidth())) --- @type string
+      end
+      -- Add the base indentation.
+      if i > 1 then
+        line = base_indent .. line
+      end
+      return line
+    end, ipairs(text_to_lines(text)))
+
+    table.insert(snippet_text, table.concat(lines, '\n'))
+  end
+
+  for _, child in ipairs(snippet.data.children) do
+    local type, data = child.type, child.data
+    if type == G.NodeType.Tabstop then
+      --- @cast data vim.snippet.TabstopData
+      local placeholder = placeholders[data.tabstop]
+      add_tabstop(data.tabstop, placeholder)
+      if placeholder then
+        append_to_snippet(placeholder)
+      end
+    elseif type == G.NodeType.Placeholder then
+      --- @cast data vim.snippet.PlaceholderData
+      local value = placeholders[data.tabstop]
+      add_tabstop(data.tabstop, value)
+      append_to_snippet(value)
+    elseif type == G.NodeType.Choice then
+      --- @cast data vim.snippet.ChoiceData
+      append_to_snippet(data.values[1])
+    elseif type == G.NodeType.Variable then
+      --- @cast data vim.snippet.VariableData
+      -- Try to get the variable's value.
+      local value = resolve_variable(data.name, data.default and tostring(data.default) or '')
+      if not value then
+        -- Unknown variable, make this a tabstop and use the variable name as a placeholder.
+        value = data.name
+        local tabstop_indexes = vim.tbl_keys(tabstop_ranges)
+        local index = math.max(unpack((#tabstop_indexes == 0 and { 0 }) or tabstop_indexes)) + 1
+        add_tabstop(index, value)
+      end
+      append_to_snippet(value)
+    elseif type == G.NodeType.Text then
+      --- @cast data vim.snippet.TextData
+      append_to_snippet(data.text)
+    end
+  end
+
+  -- $0, which defaults to the end of the snippet, defines the final cursor position.
+  -- Make sure the snippet has exactly one of these.
+  if vim.tbl_contains(vim.tbl_keys(tabstop_ranges), 0) then
+    assert(#tabstop_ranges[0] == 1, 'Snippet has multiple $0 tabstops')
+  else
+    add_tabstop(0)
+  end
+
+  -- Insert the snippet text.
+  local cursor_row, cursor_col = cursor_pos()
+  vim.api.nvim_buf_set_text(
+    M._session.bufnr,
+    cursor_row,
+    cursor_col,
+    cursor_row,
+    cursor_col,
+    text_to_lines(snippet_text)
+  )
+
+  -- Create the tabstops.
+  M._session:set_tabstops(tabstop_ranges)
+
+  -- Jump to the first tabstop.
+  M.jump(1)
+end
+
+--- @alias vim.snippet.Direction -1 | 1
+
+--- Returns `true` if there is an active snippet which can be jumped in the given direction.
+--- You can use this function to navigate a snippet as follows:
+---
+--- ```lua
+--- vim.keymap.set({ 'i', 's' }, '<Tab>', function()
+---    if vim.snippet.jumpable(1) then
+---      return '<cmd>lua vim.snippet.jump(1)<cr>'
+---    else
+---      return '<Tab>'
+---    end
+---  end, { expr = true })
+--- ```
+---
+--- @param direction (vim.snippet.Direction) Navigation direction. -1 for previous, 1 for next.
+--- @return boolean
+function M.jumpable(direction)
+  if not M.active() then
+    return false
+  end
+
+  return M._session:get_dest_index(direction) ~= nil
+end
+
+--- Jumps within the active snippet in the given direction.
+--- If the jump isn't possible, the function call does nothing.
+---
+--- You can use this function to navigate a snippet as follows:
+---
+--- ```lua
+--- vim.keymap.set({ 'i', 's' }, '<Tab>', function()
+---    if vim.snippet.jumpable(1) then
+---      return '<cmd>lua vim.snippet.jump(1)<cr>'
+---    else
+---      return '<Tab>'
+---    end
+---  end, { expr = true })
+--- ```
+---
+--- @param direction (vim.snippet.Direction) Navigation direction. -1 for previous, 1 for next.
+function M.jump(direction)
+  -- Get the tabstop index to jump to.
+  local dest_index = M._session and M._session:get_dest_index(direction)
+  if not dest_index then
+    return
+  end
+
+  -- Find the tabstop with the lowest range.
+  local tabstops = M._session.tabstops[dest_index]
+  local dest = tabstops[1]
+  for _, tabstop in ipairs(tabstops) do
+    local dest_range, range = dest:get_range(), tabstop:get_range()
+    if (range[1] < dest_range[1]) or (range[1] == dest_range[1] and range[2] < dest_range[2]) then
+      dest = tabstop
+    end
+  end
+
+  -- Clear the autocommands so that we can move the cursor freely while selecting the tabstop.
+  vim.api.nvim_clear_autocmds({ group = snippet_group, buffer = M._session.bufnr })
+
+  M._session.current_tabstop = dest
+  select_tabstop(dest)
+
+  -- Restore the autocommands.
+  setup_autocmds(M._session.bufnr)
+end
+
+--- Returns `true` if there's an active snippet in the current buffer.
+---
+--- @return boolean
+function M.active()
+  return M._session ~= nil and M._session.bufnr == vim.api.nvim_get_current_buf()
+end
+
+--- Exits the current snippet.
+function M.exit()
+  if not M.active() then
+    return
+  end
+
+  vim.api.nvim_clear_autocmds({ group = snippet_group, buffer = M._session.bufnr })
+  vim.api.nvim_buf_clear_namespace(M._session.bufnr, snippet_ns, 0, -1)
+
+  M._session = nil
+end
+
+return M
-- 
cgit 


From fc02908c97fa850964a1f15a32eb7a872449b7e7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 21 Oct 2023 18:04:08 +0800
Subject: vim-patch:d3e277f279ed (#25734)

matchparen: do not use hard-coded match id (vim/vim#13393)

* matchparen: do not use hard-coded match id

Instead of using the hard-coded match id 3, which may also be used by
other plugins, let the matchparen plugin use whatever ids are
automatically returned when calling matchaddpos().

For backwards-compatibility, keep the `:3match` call, which will still
use the hard-coded id 3 (as mentioned in :h :3match).

closes: vim/vim#13381

https://github.com/vim/vim/commit/d3e277f279ed628809eb6857ea3ebcfca566ca2a

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/pattern.txt       |  9 +++++----
 runtime/plugin/matchparen.vim | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 09119b0918..17136ee650 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1442,10 +1442,11 @@ Finally, these constructs are unique to Perl:
 		Just like |:match| above, but set a separate match.  Thus
 		there can be three matches active at the same time.  The match
 		with the lowest number has priority if several match at the
-		same position.
-		The ":3match" command is used by the |matchparen| plugin.  You
-		are suggested to use ":match" for manual matching and
-		":2match" for another plugin.
+		same position.  It uses the match id 3.
+		The ":3match" command is used by (older Vims) |matchparen|
+		plugin. You are suggested to use ":match" for manual matching
+		and ":2match" for another plugin or even better make use of
+		the more flexible |matchadd()| (and similar) functions instead.
 
 ==============================================================================
 11. Fuzzy matching					*fuzzy-matching*
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index b33ecd557c..9d57545ee8 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,6 @@
 " Vim plugin for showing matching parens
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
+" Last Change:	2023 Oct 20
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Exit quickly when:
@@ -18,6 +18,8 @@ if !exists("g:matchparen_insert_timeout")
   let g:matchparen_insert_timeout = 60
 endif
 
+let s:has_matchaddpos = exists('*matchaddpos')
+
 augroup matchparen
   " Replace all matchparen autocommands
   autocmd! CursorMoved,CursorMovedI,WinEnter,BufWinEnter,WinScrolled * call s:Highlight_Matching_Pair()
@@ -38,6 +40,9 @@ set cpo-=C
 " The function that is invoked (very often) to define a ":match" highlighting
 " for any matching paren.
 func s:Highlight_Matching_Pair()
+  if !exists("w:matchparen_ids")
+    let w:matchparen_ids = []
+  endif
   " Remove any previous match.
   call s:Remove_Matches()
 
@@ -185,11 +190,12 @@ func s:Highlight_Matching_Pair()
 
   " If a match is found setup match highlighting.
   if m_lnum > 0 && m_lnum >= stoplinetop && m_lnum <= stoplinebottom 
-    if exists('*matchaddpos')
-      call matchaddpos('MatchParen', [[c_lnum, c_col - before], [m_lnum, m_col]], 10, 3)
+    if s:has_matchaddpos
+      call add(w:matchparen_ids, matchaddpos('MatchParen', [[c_lnum, c_col - before], [m_lnum, m_col]], 10))
     else
       exe '3match MatchParen /\(\%' . c_lnum . 'l\%' . (c_col - before) .
 	    \ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/'
+      call add(w:matchparen_ids, 3)
     endif
     let w:paren_hl_on = 1
   endif
@@ -197,12 +203,13 @@ endfunction
 
 func s:Remove_Matches()
   if exists('w:paren_hl_on') && w:paren_hl_on
-    silent! call matchdelete(3)
+    while !empty(w:matchparen_ids)
+      silent! call remove(w:matchparen_ids, 0)->matchdelete()
+    endwhile
     let w:paren_hl_on = 0
   endif
 endfunc
 
-
 " Define commands that will disable and enable the plugin.
 command DoMatchParen call s:DoMatchParen()
 command NoMatchParen call s:NoMatchParen()
-- 
cgit 


From 9971bea6f1380c15c22f5035d1d33d994f8a6ed7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 21 Oct 2023 18:46:52 +0800
Subject: vim-patch:9.0.2059: outstanding exceptions may be skipped (#25736)

Problem:  outstanding exceptions may be skipped
Solution: When restoring exception state, process remaining outstanding
          exceptions

closes: vim/vim#13386

https://github.com/vim/vim/commit/0ab500dede4edd8d5aee7ddc63444537be527871

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/userfunc.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/userfunc.txt b/runtime/doc/userfunc.txt
index 8b6462911d..b0384df454 100644
--- a/runtime/doc/userfunc.txt
+++ b/runtime/doc/userfunc.txt
@@ -410,7 +410,8 @@ Any return value of the deferred function is discarded.  The function cannot
 be followed by anything, such as "->func" or ".member".  Currently `:defer
 GetArg()->TheFunc()` does not work, it may work in a later version.
 
-Errors are reported but do not cause aborting execution of deferred functions.
+Errors are reported but do not cause aborting execution of deferred functions
+or altering execution outside of deferred functions.
 
 No range is accepted.  The function can be a partial with extra arguments, but
 not with a dictionary. *E1300*
-- 
cgit 


From 1e10310f4cc70cf95a68457c2be9e7459b5bbba6 Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Sat, 21 Oct 2023 09:47:24 +0200
Subject: refactor(lsp): move completion logic into _completion module

To reduce cross-chatter between modules and for https://github.com/neovim/neovim/issues/25272
Also preparing for https://github.com/neovim/neovim/issues/25714
---
 runtime/doc/lsp.txt                 |   4 +-
 runtime/lua/vim/lsp.lua             |  95 +---------------
 runtime/lua/vim/lsp/_completion.lua | 210 ++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/lsp/protocol.lua    |   1 +
 runtime/lua/vim/lsp/util.lua        |  93 +---------------
 5 files changed, 217 insertions(+), 186 deletions(-)
 create mode 100644 runtime/lua/vim/lsp/_completion.lua

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 8a0b144e83..3151a17417 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1719,7 +1719,7 @@ extract_completion_items({result})
       • {result}  (table) The result of a `textDocument/completion` request
 
     Return: ~
-        (table) List of completion items
+        lsp.CompletionItem[] List of completion items
 
     See also: ~
       • https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
@@ -2014,7 +2014,7 @@ text_document_completion_list_to_complete_items({result}, {prefix})
       • {prefix}  (string) the prefix to filter the completion items
 
     Return: ~
-        (table) { matches = complete-items table, incomplete = bool }
+        table[] items
 
     See also: ~
       • complete-items
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 4b1da94d77..82a88772bd 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -2273,24 +2273,6 @@ function lsp.buf_notify(bufnr, method, params)
   return resp
 end
 
----@private
-local function adjust_start_col(lnum, line, items, encoding)
-  local min_start_char = nil
-  for _, item in pairs(items) do
-    if item.textEdit and item.textEdit.range.start.line == lnum - 1 then
-      if min_start_char and min_start_char ~= item.textEdit.range.start.character then
-        return nil
-      end
-      min_start_char = item.textEdit.range.start.character
-    end
-  end
-  if min_start_char then
-    return util._str_byteindex_enc(line, min_start_char, encoding)
-  else
-    return nil
-  end
-end
-
 --- Implements 'omnifunc' compatible LSP completion.
 ---
 ---@see |complete-functions|
@@ -2307,82 +2289,7 @@ function lsp.omnifunc(findstart, base)
   if log.debug() then
     log.debug('omnifunc.findstart', { findstart = findstart, base = base })
   end
-
-  local bufnr = resolve_bufnr()
-  local clients = lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_completion })
-  local remaining = #clients
-  if remaining == 0 then
-    return findstart == 1 and -1 or {}
-  end
-
-  -- Then, perform standard completion request
-  if log.info() then
-    log.info('base ', base)
-  end
-
-  local win = api.nvim_get_current_win()
-  local pos = api.nvim_win_get_cursor(win)
-  local line = api.nvim_get_current_line()
-  local line_to_cursor = line:sub(1, pos[2])
-  local _ = log.trace() and log.trace('omnifunc.line', pos, line)
-
-  -- Get the start position of the current keyword
-  local match_pos = vim.fn.match(line_to_cursor, '\\k*$') + 1
-  local items = {}
-
-  local startbyte
-
-  local function on_done()
-    local mode = api.nvim_get_mode()['mode']
-    if mode == 'i' or mode == 'ic' then
-      vim.fn.complete(startbyte or match_pos, items)
-    end
-  end
-
-  for _, client in ipairs(clients) do
-    local params = util.make_position_params(win, client.offset_encoding)
-    client.request(ms.textDocument_completion, params, function(err, result)
-      if err then
-        log.warn(err.message)
-      end
-      if result and vim.fn.mode() == 'i' then
-        -- Completion response items may be relative to a position different than `textMatch`.
-        -- Concrete example, with sumneko/lua-language-server:
-        --
-        -- require('plenary.asy|
-        --         ▲       ▲   ▲
-        --         │       │   └── cursor_pos: 20
-        --         │       └────── textMatch: 17
-        --         └────────────── textEdit.range.start.character: 9
-        --                                 .newText = 'plenary.async'
-        --                  ^^^
-        --                  prefix (We'd remove everything not starting with `asy`,
-        --                  so we'd eliminate the `plenary.async` result
-        --
-        -- `adjust_start_col` is used to prefer the language server boundary.
-        --
-        local encoding = client.offset_encoding
-        local candidates = util.extract_completion_items(result)
-        local curstartbyte = adjust_start_col(pos[1], line, candidates, encoding)
-        if startbyte == nil then
-          startbyte = curstartbyte
-        elseif curstartbyte ~= nil and curstartbyte ~= startbyte then
-          startbyte = match_pos
-        end
-        local prefix = startbyte and line:sub(startbyte + 1) or line_to_cursor:sub(match_pos)
-        local matches = util.text_document_completion_list_to_complete_items(result, prefix)
-        vim.list_extend(items, matches)
-      end
-      remaining = remaining - 1
-      if remaining == 0 then
-        vim.schedule(on_done)
-      end
-    end, bufnr)
-  end
-
-  -- Return -2 to signal that we should continue completion so that we can
-  -- async complete.
-  return -2
+  return require('vim.lsp._completion').omnifunc(findstart, base)
 end
 
 --- Provides an interface between the built-in client and a `formatexpr` function.
diff --git a/runtime/lua/vim/lsp/_completion.lua b/runtime/lua/vim/lsp/_completion.lua
new file mode 100644
index 0000000000..efd1aaacf7
--- /dev/null
+++ b/runtime/lua/vim/lsp/_completion.lua
@@ -0,0 +1,210 @@
+local M = {}
+local api = vim.api
+local lsp = vim.lsp
+local protocol = lsp.protocol
+local ms = protocol.Methods
+
+---@param input string unparsed snippet
+---@return string parsed snippet
+local function parse_snippet(input)
+  local ok, parsed = pcall(function()
+    return require('vim.lsp._snippet_grammar').parse(input)
+  end)
+  return ok and tostring(parsed) or input
+end
+
+--- Returns text that should be inserted when selecting completion item. The
+--- precedence is as follows: textEdit.newText > insertText > label
+---
+--- See https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
+---
+---@param item lsp.CompletionItem
+---@return string
+local function get_completion_word(item)
+  if item.textEdit ~= nil and item.textEdit.newText ~= nil and item.textEdit.newText ~= '' then
+    if item.insertTextFormat == protocol.InsertTextFormat.PlainText then
+      return item.textEdit.newText
+    else
+      return parse_snippet(item.textEdit.newText)
+    end
+  elseif item.insertText ~= nil and item.insertText ~= '' then
+    if item.insertTextFormat == protocol.InsertTextFormat.PlainText then
+      return item.insertText
+    else
+      return parse_snippet(item.insertText)
+    end
+  end
+  return item.label
+end
+
+---@param result lsp.CompletionList|lsp.CompletionItem[]
+---@return lsp.CompletionItem[]
+local function get_items(result)
+  if result.items then
+    return result.items
+  end
+  return result
+end
+
+--- Turns the result of a `textDocument/completion` request into vim-compatible
+--- |complete-items|.
+---
+---@param result lsp.CompletionList|lsp.CompletionItem[] Result of `textDocument/completion`
+---@param prefix string prefix to filter the completion items
+---@return table[]
+---@see complete-items
+function M._lsp_to_complete_items(result, prefix)
+  local items = get_items(result)
+  if vim.tbl_isempty(items) then
+    return {}
+  end
+
+  local function matches_prefix(item)
+    return vim.startswith(get_completion_word(item), prefix)
+  end
+
+  items = vim.tbl_filter(matches_prefix, items) --[[@as lsp.CompletionItem[]|]]
+  table.sort(items, function(a, b)
+    return (a.sortText or a.label) < (b.sortText or b.label)
+  end)
+
+  local matches = {}
+  for _, item in ipairs(items) do
+    local info = ''
+    local documentation = item.documentation
+    if documentation then
+      if type(documentation) == 'string' and documentation ~= '' then
+        info = documentation
+      elseif type(documentation) == 'table' and type(documentation.value) == 'string' then
+        info = documentation.value
+      else
+        vim.notify(
+          ('invalid documentation value %s'):format(vim.inspect(documentation)),
+          vim.log.levels.WARN
+        )
+      end
+    end
+    local word = get_completion_word(item)
+    table.insert(matches, {
+      word = word,
+      abbr = item.label,
+      kind = protocol.CompletionItemKind[item.kind] or 'Unknown',
+      menu = item.detail or '',
+      info = #info > 0 and info or nil,
+      icase = 1,
+      dup = 1,
+      empty = 1,
+      user_data = {
+        nvim = {
+          lsp = {
+            completion_item = item,
+          },
+        },
+      },
+    })
+  end
+  return matches
+end
+
+---@param items lsp.CompletionItem[]
+local function adjust_start_col(lnum, line, items, encoding)
+  local min_start_char = nil
+  for _, item in pairs(items) do
+    if item.textEdit and item.textEdit.range.start.line == lnum - 1 then
+      if min_start_char and min_start_char ~= item.textEdit.range.start.character then
+        return nil
+      end
+      min_start_char = item.textEdit.range.start.character
+    end
+  end
+  if min_start_char then
+    return vim.lsp.util._str_byteindex_enc(line, min_start_char, encoding)
+  else
+    return nil
+  end
+end
+
+---@param findstart integer 0 or 1, decides behavior
+---@param base integer findstart=0, text to match against
+---@return integer|table Decided by {findstart}:
+--- - findstart=0: column where the completion starts, or -2 or -3
+--- - findstart=1: list of matches (actually just calls |complete()|)
+function M.omnifunc(findstart, base)
+  local bufnr = api.nvim_get_current_buf()
+  local clients = lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_completion })
+  local remaining = #clients
+  if remaining == 0 then
+    return findstart == 1 and -1 or {}
+  end
+
+  local log = require('vim.lsp.log')
+  -- Then, perform standard completion request
+  if log.info() then
+    log.info('base ', base)
+  end
+
+  local win = api.nvim_get_current_win()
+  local pos = api.nvim_win_get_cursor(win)
+  local line = api.nvim_get_current_line()
+  local line_to_cursor = line:sub(1, pos[2])
+  log.trace('omnifunc.line', pos, line)
+
+  local word_boundary = vim.fn.match(line_to_cursor, '\\k*$') + 1 --[[@as integer]]
+  local items = {}
+  local startbyte = nil
+
+  local function on_done()
+    local mode = api.nvim_get_mode()['mode']
+    if mode == 'i' or mode == 'ic' then
+      vim.fn.complete(startbyte or word_boundary, items)
+    end
+  end
+
+  local util = vim.lsp.util
+  for _, client in ipairs(clients) do
+    local params = util.make_position_params(win, client.offset_encoding)
+    client.request(ms.textDocument_completion, params, function(err, result)
+      if err then
+        log.warn(err.message)
+      end
+      if result and vim.fn.mode() == 'i' then
+        -- Completion response items may be relative to a position different than `textMatch`.
+        -- Concrete example, with sumneko/lua-language-server:
+        --
+        -- require('plenary.asy|
+        --         ▲       ▲   ▲
+        --         │       │   └── cursor_pos: 20
+        --         │       └────── textMatch: 17
+        --         └────────────── textEdit.range.start.character: 9
+        --                                 .newText = 'plenary.async'
+        --                  ^^^
+        --                  prefix (We'd remove everything not starting with `asy`,
+        --                  so we'd eliminate the `plenary.async` result
+        --
+        -- `adjust_start_col` is used to prefer the language server boundary.
+        --
+        local encoding = client.offset_encoding
+        local candidates = get_items(result)
+        local curstartbyte = adjust_start_col(pos[1], line, candidates, encoding)
+        if startbyte == nil then
+          startbyte = curstartbyte
+        elseif curstartbyte ~= nil and curstartbyte ~= startbyte then
+          startbyte = word_boundary
+        end
+        local prefix = startbyte and line:sub(startbyte + 1) or line_to_cursor:sub(word_boundary)
+        local matches = M._lsp_to_complete_items(result, prefix)
+        vim.list_extend(items, matches)
+      end
+      remaining = remaining - 1
+      if remaining == 0 then
+        vim.schedule(on_done)
+      end
+    end, bufnr)
+  end
+
+  -- Return -2 to signal that we should continue completion so that we can
+  -- async complete.
+  return -2
+end
+
+return M
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 3a1b16c450..7a48c800c6 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -242,6 +242,7 @@ local constants = {
 
   -- Defines whether the insert text in a completion item should be interpreted as
   -- plain text or a snippet.
+  --- @enum lsp.InsertTextFormat
   InsertTextFormat = {
     -- The primary text to be inserted is treated as a plain string.
     PlainText = 1,
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 42c1508cbf..7ccb8a38b1 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -548,7 +548,7 @@ end
 --- `textDocument/completion` request, which may return one of
 --- `CompletionItem[]`, `CompletionList` or null.
 ---@param result table The result of a `textDocument/completion` request
----@return table List of completion items
+---@return lsp.CompletionItem[] List of completion items
 ---@see https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
 function M.extract_completion_items(result)
   if type(result) == 'table' and result.items then
@@ -619,47 +619,6 @@ function M.parse_snippet(input)
   return tostring(parsed)
 end
 
---- Sorts by CompletionItem.sortText.
----
---see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
-local function sort_completion_items(items)
-  table.sort(items, function(a, b)
-    return (a.sortText or a.label) < (b.sortText or b.label)
-  end)
-end
-
---- Returns text that should be inserted when selecting completion item. The
---- precedence is as follows: textEdit.newText > insertText > label
---see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
-local function get_completion_word(item)
-  if item.textEdit ~= nil and item.textEdit.newText ~= nil and item.textEdit.newText ~= '' then
-    local insert_text_format = protocol.InsertTextFormat[item.insertTextFormat]
-    if insert_text_format == 'PlainText' or insert_text_format == nil then
-      return item.textEdit.newText
-    else
-      return M.parse_snippet(item.textEdit.newText)
-    end
-  elseif item.insertText ~= nil and item.insertText ~= '' then
-    local insert_text_format = protocol.InsertTextFormat[item.insertTextFormat]
-    if insert_text_format == 'PlainText' or insert_text_format == nil then
-      return item.insertText
-    else
-      return M.parse_snippet(item.insertText)
-    end
-  end
-  return item.label
-end
-
---- Some language servers return complementary candidates whose prefixes do not
---- match are also returned. So we exclude completion candidates whose prefix
---- does not match.
-local function remove_unmatch_completion_items(items, prefix)
-  return vim.tbl_filter(function(item)
-    local word = get_completion_word(item)
-    return vim.startswith(word, prefix)
-  end, items)
-end
-
 --- According to LSP spec, if the client set `completionItemKind.valueSet`,
 --- the client must handle it properly even if it receives a value outside the
 --- specification.
@@ -678,56 +637,10 @@ end
 --- from |vim.lsp.buf.completion()|, which may be one of `CompletionItem[]`,
 --- `CompletionList` or `null`
 ---@param prefix (string) the prefix to filter the completion items
----@return table { matches = complete-items table, incomplete = bool }
+---@return table[] items
 ---@see complete-items
 function M.text_document_completion_list_to_complete_items(result, prefix)
-  local items = M.extract_completion_items(result)
-  if vim.tbl_isempty(items) then
-    return {}
-  end
-
-  items = remove_unmatch_completion_items(items, prefix)
-  sort_completion_items(items)
-
-  local matches = {}
-
-  for _, completion_item in ipairs(items) do
-    local info = ''
-    local documentation = completion_item.documentation
-    if documentation then
-      if type(documentation) == 'string' and documentation ~= '' then
-        info = documentation
-      elseif type(documentation) == 'table' and type(documentation.value) == 'string' then
-        info = documentation.value
-      else
-        vim.notify(
-          ('invalid documentation value %s'):format(vim.inspect(documentation)),
-          vim.log.levels.WARN
-        )
-      end
-    end
-
-    local word = get_completion_word(completion_item)
-    table.insert(matches, {
-      word = word,
-      abbr = completion_item.label,
-      kind = M._get_completion_item_kind_name(completion_item.kind),
-      menu = completion_item.detail or '',
-      info = #info > 0 and info or nil,
-      icase = 1,
-      dup = 1,
-      empty = 1,
-      user_data = {
-        nvim = {
-          lsp = {
-            completion_item = completion_item,
-          },
-        },
-      },
-    })
-  end
-
-  return matches
+  return require('vim.lsp._completion')._lsp_to_complete_items(result, prefix)
 end
 
 --- Like vim.fn.bufwinid except it works across tabpages.
-- 
cgit 


From 195301c60969c7ce97b1ef3a3caaf4965da1abd5 Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Sat, 21 Oct 2023 09:57:50 +0200
Subject: refactor(lsp): deprecate completion util methods

Relates to https://github.com/neovim/neovim/issues/25272
---
 runtime/doc/deprecated.txt   |  3 +++
 runtime/doc/lsp.txt          | 39 ---------------------------------------
 runtime/doc/news.txt         |  3 +++
 runtime/lua/vim/lsp/util.lua | 17 ++++++-----------
 4 files changed, 12 insertions(+), 50 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 7a2b29f8c8..7f7c498880 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -144,6 +144,9 @@ LSP FUNCTIONS
 - *vim.lsp.util.trim_empty_lines()*		Use |vim.split()| with `trimempty` instead.
 - *vim.lsp.util.try_trim_markdown_code_blocks()*
 - *vim.lsp.util.set_lines()*
+- *vim.lsp.util.extract_completion_items()*
+- *vim.lsp.util.parse_snippet()*
+- *vim.lsp.util.text_document_completion_list_to_complete_items()*
 
 TREESITTER FUNCTIONS
 - *vim.treesitter.language.require_language()*	Use |vim.treesitter.language.add()|
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 3151a17417..e62a411233 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1711,19 +1711,6 @@ convert_signature_help_to_markdown_lines({signature_help}, {ft}, {triggers})
     See also: ~
       • https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_signatureHelp
 
-                                     *vim.lsp.util.extract_completion_items()*
-extract_completion_items({result})
-    Can be used to extract the completion items from a `textDocument/completion` request, which may return one of `CompletionItem[]` , `CompletionList` or null.
-
-    Parameters: ~
-      • {result}  (table) The result of a `textDocument/completion` request
-
-    Return: ~
-        lsp.CompletionItem[] List of completion items
-
-    See also: ~
-      • https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
-
 get_effective_tabstop({bufnr})          *vim.lsp.util.get_effective_tabstop()*
     Returns indentation size.
 
@@ -1925,15 +1912,6 @@ open_floating_preview({contents}, {syntax}, {opts})
         (integer) bufnr of newly created float window
         (integer) winid of newly created float window preview window
 
-parse_snippet({input})                          *vim.lsp.util.parse_snippet()*
-    Parses snippets in a completion entry.
-
-    Parameters: ~
-      • {input}  (string) unparsed snippet
-
-    Return: ~
-        (string) parsed snippet
-
 preview_location({location}, {opts})         *vim.lsp.util.preview_location()*
     Previews a location in a floating window
 
@@ -2002,23 +1980,6 @@ symbols_to_items({symbols}, {bufnr})         *vim.lsp.util.symbols_to_items()*
     Parameters: ~
       • {symbols}  (table) DocumentSymbol[] or SymbolInformation[]
 
-              *vim.lsp.util.text_document_completion_list_to_complete_items()*
-text_document_completion_list_to_complete_items({result}, {prefix})
-    Turns the result of a `textDocument/completion` request into
-    vim-compatible |complete-items|.
-
-    Parameters: ~
-      • {result}  (table) The result of a `textDocument/completion` call, e.g.
-                  from |vim.lsp.buf.completion()|, which may be one of
-                  `CompletionItem[]`, `CompletionList` or `null`
-      • {prefix}  (string) the prefix to filter the completion items
-
-    Return: ~
-        table[] items
-
-    See also: ~
-      • complete-items
-
 
 ==============================================================================
 Lua module: vim.lsp.log                                              *lsp-log*
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 0fe675c285..6f2c6efe54 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -309,6 +309,9 @@ release.
   - |vim.lsp.util.trim_empty_lines()|		Use |vim.split()| with `trimempty` instead.
   - |vim.lsp.util.try_trim_markdown_code_blocks()|
   - |vim.lsp.util.set_lines()|
+  - |vim.lsp.util.extract_completion_items()|
+  - |vim.lsp.util.parse_snippet()|
+  - |vim.lsp.util.text_document_completion_list_to_complete_items()|
 
 • `vim.loop` has been renamed to `vim.uv`.
 
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
index 7ccb8a38b1..32b220746f 100644
--- a/runtime/lua/vim/lsp/util.lua
+++ b/runtime/lua/vim/lsp/util.lua
@@ -547,10 +547,12 @@ end
 --- Can be used to extract the completion items from a
 --- `textDocument/completion` request, which may return one of
 --- `CompletionItem[]`, `CompletionList` or null.
+---@deprecated
 ---@param result table The result of a `textDocument/completion` request
 ---@return lsp.CompletionItem[] List of completion items
 ---@see https://microsoft.github.io/language-server-protocol/specification#textDocument_completion
 function M.extract_completion_items(result)
+  vim.deprecate('vim.lsp.util.extract_completion_items', nil, '0.11')
   if type(result) == 'table' and result.items then
     -- result is a `CompletionList`
     return result.items
@@ -606,9 +608,11 @@ end
 
 --- Parses snippets in a completion entry.
 ---
+---@deprecated
 ---@param input string unparsed snippet
 ---@return string parsed snippet
 function M.parse_snippet(input)
+  vim.deprecate('vim.lsp.util.parse_snippet', nil, '0.11')
   local ok, parsed = pcall(function()
     return snippet.parse(input)
   end)
@@ -619,20 +623,10 @@ function M.parse_snippet(input)
   return tostring(parsed)
 end
 
---- According to LSP spec, if the client set `completionItemKind.valueSet`,
---- the client must handle it properly even if it receives a value outside the
---- specification.
----
----@param completion_item_kind (`vim.lsp.protocol.completionItemKind`)
----@return (`vim.lsp.protocol.completionItemKind`)
----@see https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_completion
-function M._get_completion_item_kind_name(completion_item_kind)
-  return protocol.CompletionItemKind[completion_item_kind] or 'Unknown'
-end
-
 --- Turns the result of a `textDocument/completion` request into vim-compatible
 --- |complete-items|.
 ---
+---@deprecated
 ---@param result table The result of a `textDocument/completion` call, e.g.
 --- from |vim.lsp.buf.completion()|, which may be one of `CompletionItem[]`,
 --- `CompletionList` or `null`
@@ -640,6 +634,7 @@ end
 ---@return table[] items
 ---@see complete-items
 function M.text_document_completion_list_to_complete_items(result, prefix)
+  vim.deprecate('vim.lsp.util.text_document_completion_list_to_complete_items', nil, '0.11')
   return require('vim.lsp._completion')._lsp_to_complete_items(result, prefix)
 end
 
-- 
cgit 


From ae4ca4edf89ece433b61e8bf92c412298b58d9ea Mon Sep 17 00:00:00 2001
From: glepnir <glephunter@gmail.com>
Date: Fri, 13 Oct 2023 14:49:01 +0800
Subject: feat(complete): support f flag for complete buffer part

---
 runtime/doc/news.txt              | 2 ++
 runtime/doc/options.txt           | 1 +
 runtime/lua/vim/_meta/options.lua | 1 +
 3 files changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 6f2c6efe54..c090cfe166 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -195,6 +195,8 @@ The following new APIs and features were added.
 
 • Added |vim.snippet| for snippet expansion support.
 
+• 'complete' option supports "f" flag for completing buffer names.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c8ea5ce67f..9dc382948c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1458,6 +1458,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		|i_CTRL-X_CTRL-D|
 	]	tag completion
 	t	same as "]"
+	f	scan the buffer names (as opposed to buffer contents)
 
 	Unloaded buffers are not loaded, thus their autocmds |:autocmd| are
 	not executed, this may lead to unexpected completions from some files
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index cc013112b3..83b30838ab 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -998,6 +998,7 @@ vim.bo.cms = vim.bo.commentstring
 --- 	`i_CTRL-X_CTRL-D`
 --- ]	tag completion
 --- t	same as "]"
+--- f	scan the buffer names (as opposed to buffer contents)
 ---
 --- Unloaded buffers are not loaded, thus their autocmds `:autocmd` are
 --- not executed, this may lead to unexpected completions from some files
-- 
cgit 


From 5e5f5174e3faa862a9bc353aa7da41487911140b Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Sat, 21 Oct 2023 13:44:53 +0200
Subject: fix(lsp): fix off-by-one error for omnifunc word boundary

Fixes https://github.com/neovim/neovim/issues/25177

I initially wanted to split this into a refactor commit to make it more
testable, but it appears that already accidentally fixed the issue by
normalizing lnum/col to 0-indexing
---
 runtime/lua/vim/lsp/_completion.lua | 104 ++++++++++++++++++++++--------------
 1 file changed, 64 insertions(+), 40 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_completion.lua b/runtime/lua/vim/lsp/_completion.lua
index efd1aaacf7..f0e3af7f03 100644
--- a/runtime/lua/vim/lsp/_completion.lua
+++ b/runtime/lua/vim/lsp/_completion.lua
@@ -106,11 +106,12 @@ function M._lsp_to_complete_items(result, prefix)
   return matches
 end
 
+---@param lnum integer 0-indexed
 ---@param items lsp.CompletionItem[]
 local function adjust_start_col(lnum, line, items, encoding)
   local min_start_char = nil
   for _, item in pairs(items) do
-    if item.textEdit and item.textEdit.range.start.line == lnum - 1 then
+    if item.textEdit and item.textEdit.range.start.line == lnum then
       if min_start_char and min_start_char ~= item.textEdit.range.start.character then
         return nil
       end
@@ -124,12 +125,57 @@ local function adjust_start_col(lnum, line, items, encoding)
   end
 end
 
+---@private
+---@param line string line content
+---@param lnum integer 0-indexed line number
+---@param client_start_boundary integer 0-indexed word boundary
+---@param server_start_boundary? integer 0-indexed word boundary, based on textEdit.range.start.character
+---@param result lsp.CompletionList|lsp.CompletionItem[]
+---@param encoding string
+---@return table[] matches
+---@return integer? server_start_boundary
+function M._convert_results(
+  line,
+  lnum,
+  client_start_boundary,
+  server_start_boundary,
+  result,
+  encoding
+)
+  -- Completion response items may be relative to a position different than `client_start_boundary`.
+  -- Concrete example, with lua-language-server:
+  --
+  -- require('plenary.asy|
+  --         ▲       ▲   ▲
+  --         │       │   └── cursor_pos:                     20
+  --         │       └────── client_start_boundary:          17
+  --         └────────────── textEdit.range.start.character: 9
+  --                                 .newText = 'plenary.async'
+  --                  ^^^
+  --                  prefix (We'd remove everything not starting with `asy`,
+  --                  so we'd eliminate the `plenary.async` result
+  --
+  -- `adjust_start_col` is used to prefer the language server boundary.
+  --
+  local candidates = get_items(result)
+  local curstartbyte = adjust_start_col(lnum, line, candidates, encoding)
+  if server_start_boundary == nil then
+    server_start_boundary = curstartbyte
+  elseif curstartbyte ~= nil and curstartbyte ~= server_start_boundary then
+    server_start_boundary = client_start_boundary
+  end
+  local prefix = line:sub((server_start_boundary or client_start_boundary) + 1)
+  local matches = M._lsp_to_complete_items(result, prefix)
+  return matches, server_start_boundary
+end
+
 ---@param findstart integer 0 or 1, decides behavior
 ---@param base integer findstart=0, text to match against
 ---@return integer|table Decided by {findstart}:
 --- - findstart=0: column where the completion starts, or -2 or -3
 --- - findstart=1: list of matches (actually just calls |complete()|)
 function M.omnifunc(findstart, base)
+  assert(base) -- silence luals
   local bufnr = api.nvim_get_current_buf()
   local clients = lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_completion })
   local remaining = #clients
@@ -137,26 +183,20 @@ function M.omnifunc(findstart, base)
     return findstart == 1 and -1 or {}
   end
 
-  local log = require('vim.lsp.log')
-  -- Then, perform standard completion request
-  if log.info() then
-    log.info('base ', base)
-  end
-
   local win = api.nvim_get_current_win()
-  local pos = api.nvim_win_get_cursor(win)
+  local cursor = api.nvim_win_get_cursor(win)
+  local lnum = cursor[1] - 1
+  local cursor_col = cursor[2]
   local line = api.nvim_get_current_line()
-  local line_to_cursor = line:sub(1, pos[2])
-  log.trace('omnifunc.line', pos, line)
-
-  local word_boundary = vim.fn.match(line_to_cursor, '\\k*$') + 1 --[[@as integer]]
+  local line_to_cursor = line:sub(1, cursor_col)
+  local client_start_boundary = vim.fn.match(line_to_cursor, '\\k*$') --[[@as integer]]
+  local server_start_boundary = nil
   local items = {}
-  local startbyte = nil
 
   local function on_done()
     local mode = api.nvim_get_mode()['mode']
     if mode == 'i' or mode == 'ic' then
-      vim.fn.complete(startbyte or word_boundary, items)
+      vim.fn.complete((server_start_boundary or client_start_boundary) + 1, items)
     end
   end
 
@@ -165,34 +205,18 @@ function M.omnifunc(findstart, base)
     local params = util.make_position_params(win, client.offset_encoding)
     client.request(ms.textDocument_completion, params, function(err, result)
       if err then
-        log.warn(err.message)
+        require('vim.lsp.log').warn(err.message)
       end
       if result and vim.fn.mode() == 'i' then
-        -- Completion response items may be relative to a position different than `textMatch`.
-        -- Concrete example, with sumneko/lua-language-server:
-        --
-        -- require('plenary.asy|
-        --         ▲       ▲   ▲
-        --         │       │   └── cursor_pos: 20
-        --         │       └────── textMatch: 17
-        --         └────────────── textEdit.range.start.character: 9
-        --                                 .newText = 'plenary.async'
-        --                  ^^^
-        --                  prefix (We'd remove everything not starting with `asy`,
-        --                  so we'd eliminate the `plenary.async` result
-        --
-        -- `adjust_start_col` is used to prefer the language server boundary.
-        --
-        local encoding = client.offset_encoding
-        local candidates = get_items(result)
-        local curstartbyte = adjust_start_col(pos[1], line, candidates, encoding)
-        if startbyte == nil then
-          startbyte = curstartbyte
-        elseif curstartbyte ~= nil and curstartbyte ~= startbyte then
-          startbyte = word_boundary
-        end
-        local prefix = startbyte and line:sub(startbyte + 1) or line_to_cursor:sub(word_boundary)
-        local matches = M._lsp_to_complete_items(result, prefix)
+        local matches
+        matches, server_start_boundary = M._convert_results(
+          line,
+          lnum,
+          client_start_boundary,
+          server_start_boundary,
+          result,
+          client.offset_encoding
+        )
         vim.list_extend(items, matches)
       end
       remaining = remaining - 1
-- 
cgit 


From 370232dbefb91b7ee773ee9a61a9b1ad77d7f1af Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sun, 22 Oct 2023 21:21:02 -0700
Subject: fix(lsp): track snippet deletion

---
 runtime/lua/vim/snippet.lua | 70 ++++++++++++++++++++++++++++-----------------
 1 file changed, 43 insertions(+), 27 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua
index 3d739bd3af..3fe8ab2d48 100644
--- a/runtime/lua/vim/snippet.lua
+++ b/runtime/lua/vim/snippet.lua
@@ -90,6 +90,18 @@ local function compute_tabstop_range(snippet, placeholder)
   return { start_row, start_col, end_row, end_col }
 end
 
+--- Returns the range spanned by the respective extmark.
+---
+--- @param bufnr integer
+--- @param extmark_id integer
+--- @return Range4
+local function get_extmark_range(bufnr, extmark_id)
+  local mark = vim.api.nvim_buf_get_extmark_by_id(bufnr, snippet_ns, extmark_id, { details = true })
+
+  --- @diagnostic disable-next-line: undefined-field
+  return { mark[1], mark[2], mark[3].end_row, mark[3].end_col }
+end
+
 --- @class vim.snippet.Tabstop
 --- @field extmark_id integer
 --- @field index integer
@@ -125,11 +137,7 @@ end
 --- @package
 --- @return Range4
 function Tabstop:get_range()
-  local mark =
-    vim.api.nvim_buf_get_extmark_by_id(self.bufnr, snippet_ns, self.extmark_id, { details = true })
-
-  --- @diagnostic disable-next-line: undefined-field
-  return { mark[1], mark[2], mark[3].end_row, mark[3].end_col }
+  return get_extmark_range(self.bufnr, self.extmark_id)
 end
 
 --- Returns the text spanned by the tabstop.
@@ -155,6 +163,7 @@ end
 
 --- @class vim.snippet.Session
 --- @field bufnr integer
+--- @field extmark_id integer
 --- @field tabstops table<integer, vim.snippet.Tabstop[]>
 --- @field current_tabstop vim.snippet.Tabstop
 local Session = {}
@@ -162,29 +171,27 @@ local Session = {}
 --- Creates a new snippet session in the current buffer.
 ---
 --- @package
+--- @param bufnr integer
+--- @param snippet_extmark integer
+--- @param tabstop_ranges table<integer, Range4[]>
 --- @return vim.snippet.Session
-function Session.new()
-  local bufnr = vim.api.nvim_get_current_buf()
+function Session.new(bufnr, snippet_extmark, tabstop_ranges)
   local self = setmetatable({
     bufnr = bufnr,
+    extmark_id = snippet_extmark,
     tabstops = {},
     current_tabstop = Tabstop.new(0, bufnr, { 0, 0, 0, 0 }),
   }, { __index = Session })
 
-  return self
-end
-
---- Creates the session tabstops.
----
---- @package
---- @param tabstop_ranges table<integer, Range4[]>
-function Session:set_tabstops(tabstop_ranges)
+  -- Create the tabstops.
   for index, ranges in pairs(tabstop_ranges) do
     for _, range in ipairs(ranges) do
       self.tabstops[index] = self.tabstops[index] or {}
       table.insert(self.tabstops[index], Tabstop.new(index, self.bufnr, range))
     end
   end
+
+  return self
 end
 
 --- Returns the destination tabstop index when jumping in the given direction.
@@ -304,6 +311,15 @@ local function setup_autocmds(bufnr)
     desc = 'Update active tabstops when buffer text changes',
     buffer = bufnr,
     callback = function()
+      -- Check that the snippet hasn't been deleted.
+      local snippet_range = get_extmark_range(M._session.bufnr, M._session.extmark_id)
+      if
+        (snippet_range[1] == snippet_range[3] and snippet_range[2] == snippet_range[4])
+        or snippet_range[3] + 1 > vim.fn.line('$')
+      then
+        M.exit()
+      end
+
       if not M.active() then
         return true
       end
@@ -331,8 +347,6 @@ function M.expand(input)
   local snippet = G.parse(input)
   local snippet_text = {}
 
-  M._session = Session.new()
-
   -- Get the placeholders we should use for each tabstop index.
   --- @type table<integer, string>
   local placeholders = {}
@@ -427,19 +441,21 @@ function M.expand(input)
     add_tabstop(0)
   end
 
+  snippet_text = text_to_lines(snippet_text)
+
   -- Insert the snippet text.
+  local bufnr = vim.api.nvim_get_current_buf()
   local cursor_row, cursor_col = cursor_pos()
-  vim.api.nvim_buf_set_text(
-    M._session.bufnr,
-    cursor_row,
-    cursor_col,
-    cursor_row,
-    cursor_col,
-    text_to_lines(snippet_text)
-  )
+  vim.api.nvim_buf_set_text(bufnr, cursor_row, cursor_col, cursor_row, cursor_col, snippet_text)
 
-  -- Create the tabstops.
-  M._session:set_tabstops(tabstop_ranges)
+  -- Create the session.
+  local snippet_extmark = vim.api.nvim_buf_set_extmark(bufnr, snippet_ns, cursor_row, cursor_col, {
+    end_line = cursor_row + #snippet_text - 1,
+    end_col = #snippet_text > 1 and #snippet_text[#snippet_text] or cursor_col + #snippet_text[1],
+    right_gravity = false,
+    end_right_gravity = true,
+  })
+  M._session = Session.new(bufnr, snippet_extmark, tabstop_ranges)
 
   -- Jump to the first tabstop.
   M.jump(1)
-- 
cgit 


From 94127cb5df0a513e66777d18a2c7fa6219404280 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Sun, 22 Oct 2023 22:38:11 -0700
Subject: fix(lsp): do not add extra indentation

---
 runtime/lua/vim/snippet.lua | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua
index 3fe8ab2d48..7680d2e216 100644
--- a/runtime/lua/vim/snippet.lua
+++ b/runtime/lua/vim/snippet.lua
@@ -346,6 +346,7 @@ end
 function M.expand(input)
   local snippet = G.parse(input)
   local snippet_text = {}
+  local base_indent = vim.api.nvim_get_current_line():match('^%s*') or ''
 
   -- Get the placeholders we should use for each tabstop index.
   --- @type table<integer, string>
@@ -377,10 +378,10 @@ function M.expand(input)
   ---
   --- @param text string|string[]
   local function append_to_snippet(text)
+    local snippet_lines = text_to_lines(snippet_text)
     -- Get the base indentation based on the current line and the last line of the snippet.
-    local base_indent = vim.api.nvim_get_current_line():match('^%s*') or ''
-    if #snippet_text > 0 then
-      base_indent = base_indent .. (snippet_text[#snippet_text]:match('^%s*') or '') --- @type string
+    if #snippet_lines > 0 then
+      base_indent = base_indent .. (snippet_lines[#snippet_lines]:match('(^%s*)%S') or '') --- @type string
     end
 
     local lines = vim.iter.map(function(i, line)
-- 
cgit 


From e606604322815abd3dc91a5595a0aa976a9aded7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Oct 2023 18:20:12 +0200
Subject: vim-patch:fea96c00e55a

runtime(vim): Update ftplugin - comment motions (vim/vim#13412)

Fix the pattern used by comment-motion mappings to match the start of a
block comment.

Block-comment start lines were being ignored if the previous line
contained a double-quote character anywhere in the line.  Line comments
should only be ignored if the previous line is a full-line comment and,
therefore, part of the current block comment.

https://github.com/vim/vim/commit/fea96c00e55a71e3007907ff4f7ad513bb9ff0eb

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/vim.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim
index 3b10c95c80..06369e8a82 100644
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -84,8 +84,8 @@ if !exists("no_plugin_maps") && !exists("no_vim_maps")
   vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|def\)\>', "W")<CR>
 
   " Move around comments
-  nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
-  vnoremap <silent><buffer> ]" :<C-U>exe "normal! gv"<Bar>call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
+  nnoremap <silent><buffer> ]" :call search('\%(^\s*".*\n\)\@<!\%(^\s*"\)', "W")<CR>
+  vnoremap <silent><buffer> ]" :<C-U>exe "normal! gv"<Bar>call search('\%(^\s*".*\n\)\@<!\%(^\s*"\)', "W")<CR>
   nnoremap <silent><buffer> [" :call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
   vnoremap <silent><buffer> [" :<C-U>exe "normal! gv"<Bar>call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
 endif
-- 
cgit 


From 5f0224e848740eaf8fa68fe9cd89b060b31616fc Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Oct 2023 19:19:58 +0200
Subject: vim-patch:9.0.2060: *.{gn,gni} files are not recognized

Problem:  *.{gn,gni} files are not recognized
Solution: Detect some as gn filetype (without adding an extra filetype)

Those come from: https://gn.googlesource.com/gn/

closes: vim/vim#13405

https://github.com/vim/vim/commit/84394f2be4a750f1e26b478e36de041663f4b5a4

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
---
 runtime/lua/vim/filetype.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 6dbfd7e64d..ec3f89da32 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -459,6 +459,8 @@ local extension = {
   gift = 'gift',
   gleam = 'gleam',
   glsl = 'glsl',
+  gn = 'gn',
+  gni = 'gn',
   gpi = 'gnuplot',
   go = 'go',
   gp = 'gp',
-- 
cgit 


From 94fee354465d7d8636f454a9bcca9080ef9e50bd Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Oct 2023 19:24:52 +0200
Subject: vim-patch:9.0.2061: not able to detect xkb filetypes

Problem:  not able to detect xkb filetypes
Solution: Detect files below /u/s/X11/xkb as xkb files (without adding
          an extra filetype)

Those files are used from the X11 xkb extension

closes: vim/vim#13401

https://github.com/vim/vim/commit/ae9021a840db3253b0e0cb84186faae73368afd7

Co-authored-by: Guido Cella <guido@guidocella.xyz>
---
 runtime/lua/vim/filetype.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index ec3f89da32..763ed99914 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1982,6 +1982,11 @@ local pattern = {
   ['.*/Xresources/.*'] = starsetf('xdefaults'),
   ['.*/app%-defaults/.*'] = starsetf('xdefaults'),
   ['.*/etc/xinetd%.conf'] = 'xinetd',
+  ['.*/usr/share/X11/xkb/compat/.*'] = starsetf('xkb'),
+  ['.*/usr/share/X11/xkb/geometry/.*'] = starsetf('xkb'),
+  ['.*/usr/share/X11/xkb/keycodes/.*'] = starsetf('xkb'),
+  ['.*/usr/share/X11/xkb/symbols/.*'] = starsetf('xkb'),
+  ['.*/usr/share/X11/xkb/types/.*'] = starsetf('xkb'),
   ['.*/etc/blkid%.tab'] = 'xml',
   ['.*/etc/blkid%.tab%.old'] = 'xml',
   ['.*%.vbproj%.user'] = 'xml',
-- 
cgit 


From 4f0adb6a783e2d92301d5391c4b35a62268d2a00 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Oct 2023 19:30:44 +0200
Subject: vim-patch:9.0.2062: Janet files are not recognised

Problem:  Janet files are not recognised
Solution: Add filename and shebang detection (without
          adding an extra filetype plugin)

Those are used by the Janet language:
http://www.janet-lang.org

closes: vim/vim#13400

https://github.com/vim/vim/commit/c038427d2a27445e612761f19c92b2b8b05afdea

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
---
 runtime/lua/vim/filetype.lua        | 1 +
 runtime/lua/vim/filetype/detect.lua | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 763ed99914..3c3e2a7b5b 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -536,6 +536,7 @@ local extension = {
   jal = 'jal',
   jpr = 'jam',
   jpl = 'jam',
+  janet = 'janet',
   jav = 'java',
   java = 'java',
   jj = 'javacc',
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 934b02dcdd..e53ff08536 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1652,8 +1652,9 @@ local patterns_hashbang = {
   ['icon\\>'] = { 'icon', { vim_regex = true } },
   guile = 'scheme',
   ['nix%-shell'] = 'nix',
-  ['crystal\\>'] = { 'crystal', { vim_regex = true } },
+  ['^crystal\\>'] = { 'crystal', { vim_regex = true } },
   ['^\\%(rexx\\|regina\\)\\>'] = { 'rexx', { vim_regex = true } },
+  ['^janet\\>'] = { 'janet', { vim_regex = true } },
 }
 
 ---@private
-- 
cgit 


From 0b1ec3b162cb160da9b876113ec219a8bac17f70 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Mon, 23 Oct 2023 19:32:42 +0200
Subject: vim-patch:9.0.2063: pacman hooks are detected as conf filetype

Problem:  pacman hooks are detected as conf filetype
Solution: make it consistent to pacman.conf and detect those
          hooks as confini

Because confini has much better syntax highlighting than conf.

For reference, I identified pacman.conf and pacman hooks as dosini in
https://github.com/vim/vim/pull/6335, then
https://github.com/vim/vim/pull/10213 changed them to conf, then
https://github.com/vim/vim/pull/10518 changed pacman.conf to confini but
forgot to change hooks.

closes: vim/vim#13399

https://github.com/vim/vim/commit/7d254dbc2db35badc65668db85f826f605486986

Co-authored-by: Guido Cella <guido@guidocella.xyz>
---
 runtime/lua/vim/filetype.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 3c3e2a7b5b..627732f164 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -282,7 +282,7 @@ local extension = {
   atg = 'coco',
   recipe = 'conaryrecipe',
   hook = function(path, bufnr)
-    return M._getline(bufnr, 1) == '[Trigger]' and 'conf' or nil
+    return M._getline(bufnr, 1) == '[Trigger]' and 'confini' or nil
   end,
   nmconnection = 'confini',
   mklx = 'context',
-- 
cgit 


From bfe8a39512bc4dbf4921c56158c61a172e8f10cf Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 26 Oct 2023 06:41:54 +0800
Subject: vim-patch:partial:5985879e3c36 (#25780)

runtime(doc): Fix typos in several documents (vim/vim#13420)

* Fix typos in several documents
* Update runtime/doc/terminal.txt

https://github.com/vim/vim/commit/5985879e3c36383155f84649fa42d06813a1893e

Skip runtime/doc/indent.txt: not ported yet

Co-authored-by: h_east <h.east.727@gmail.com>
Co-authored-by: K.Takata <kentkt@csc.jp>
---
 runtime/doc/builtin.txt                | 2 +-
 runtime/doc/intro.txt                  | 2 +-
 runtime/doc/nvim_terminal_emulator.txt | 5 +++--
 runtime/doc/options.txt                | 4 ++--
 runtime/lua/vim/_meta/options.lua      | 2 +-
 runtime/lua/vim/_meta/vimfn.lua        | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 8b472523f1..5a99fb686e 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2919,7 +2919,7 @@ getscriptinfo([{opts}])                                        *getscriptinfo()*
 				Note that this is a copy, the value of
 				script-local variables cannot be changed using
 				this dictionary.
-		    version	Vimscript version, always 1
+		    version	Vim script version, always 1
 
 		Examples: >vim
 			echo getscriptinfo({'name': 'myscript'})
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 299c18ac2e..85115fc22b 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -89,7 +89,7 @@ Nvim development is funded separately from Vim:
 ==============================================================================
 Credits							*credits*
 
-Most of Vim was written by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|
+Most of Vim was written by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|.
 
 Parts of the documentation come from several Vi manuals, written by:
 	W.N. Joy
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 0cfeb3dcb7..2f7197e2ef 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -423,8 +423,9 @@ If there is no g:termdebug_config you can use: >vim
 Any value greater than 1 will set the Asm window height to that value.
 
 						*termdebug_variables_window*
-If you want the Var window shown by default, set the flag to 1.
-the "variables_window_height" entry can be used to set the window height: >vim
+If you want the Var window shown by default, set the "variables_window" flag
+to 1.  The "variables_window_height" entry can be used to set the window
+height: >vim
 	let g:termdebug_config['variables_window'] = 1
 	let g:termdebug_config['variables_window_height'] = 15
 If there is no g:termdebug_config you can use: >vim
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9dc382948c..3864b4f25b 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -52,7 +52,7 @@ achieve special effects.  These options come in three forms:
 			  'lines'
 			Warning: This may have a lot of side effects.
 
-						*:set-args* *:set=* *E487* *E521*
+					    *:set-args* *:set=* *E487* *E521*
 :se[t] {option}={value}		or
 :se[t] {option}:{value}
 			Set string or number option to {value}.
@@ -6224,7 +6224,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option controls the behavior when switching between buffers.
 	This option is checked, when
 	- jumping to errors with the |quickfix| commands (|:cc|, |:cn|, |:cp|,
-	  etc.)
+	  etc.).
 	- jumping to a tag using the |:stag| command.
 	- opening a file using the |CTRL-W_f| or |CTRL-W_F| command.
 	- jumping to a buffer using a buffer split command (e.g.  |:sbuffer|,
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 83b30838ab..967cf36da0 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -6614,7 +6614,7 @@ vim.bo.swf = vim.bo.swapfile
 --- This option controls the behavior when switching between buffers.
 --- This option is checked, when
 --- - jumping to errors with the `quickfix` commands (`:cc`, `:cn`, `:cp`,
----   etc.)
+---   etc.).
 --- - jumping to a tag using the `:stag` command.
 --- - opening a file using the `CTRL-W_f` or `CTRL-W_F` command.
 --- - jumping to a buffer using a buffer split command (e.g.  `:sbuffer`,
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 2c594e049f..1830e1796b 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3507,7 +3507,7 @@ function vim.fn.getregtype(regname) end
 ---     Note that this is a copy, the value of
 ---     script-local variables cannot be changed using
 ---     this dictionary.
----     version  Vimscript version, always 1
+---     version  Vim script version, always 1
 ---
 --- Examples: >vim
 ---   echo getscriptinfo({'name': 'myscript'})
-- 
cgit 


From f2fc44550fbe5b7ebfedc2b155dc41e93f49aedb Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 26 Oct 2023 07:42:29 +0800
Subject: vim-patch:9.0.2064: cannot use buffer-number for errorformat (#25782)

Problem:  cannot use buffer-number for errorformat
Solution: add support for parsing a buffer number using '%b' in
          'errorformat'

closes: vim/vim#13419

https://github.com/vim/vim/commit/b731800522af00fd348814d33a065b92e698afc3

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
---
 runtime/doc/quickfix.txt | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 0bf04034ec..4428ff2f65 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1381,6 +1381,7 @@ rest is ignored.  Items can only be 1023 bytes long.
 Basic items
 
 	%f		file name (finds a string)
+	%b		buffer number (finds a number)
 	%o		module name (finds a string)
 	%l		line number (finds a number)
 	%e		end line number (finds a number)
@@ -1420,6 +1421,11 @@ On Windows a leading "C:" will be included in "%f", even when using "%f:".
 This means that a file name which is a single alphabetical letter will not be
 detected.
 
+The "%b" conversion is used to parse a buffer number.  This is useful for
+referring to lines in a scratch buffer or a buffer with no name.  If a buffer
+with the matching number doesn't exist, then that line is used as a non-error
+line.
+
 The "%p" conversion is normally followed by a "^".  It's used for compilers
 that output a line like: >
 	    ^
-- 
cgit 


From 15983cf2c64c527fc13681925d0d00c070c30640 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Wed, 25 Oct 2023 22:29:05 -0700
Subject: fix(lsp): cancel session when leaving snippet region (#25762)

---
 runtime/lua/vim/snippet.lua | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua
index 7680d2e216..14f73bff5c 100644
--- a/runtime/lua/vim/snippet.lua
+++ b/runtime/lua/vim/snippet.lua
@@ -278,13 +278,26 @@ local function setup_autocmds(bufnr)
     desc = 'Update snippet state when the cursor moves',
     buffer = bufnr,
     callback = function()
+      local cursor_row, cursor_col = cursor_pos()
+
+      -- The cursor left the snippet region.
+      local snippet_range = get_extmark_range(bufnr, M._session.extmark_id)
+      if
+        cursor_row < snippet_range[1]
+        or (cursor_row == snippet_range[1] and cursor_col < snippet_range[2])
+        or cursor_row > snippet_range[3]
+        or (cursor_row == snippet_range[3] and cursor_col > snippet_range[4])
+      then
+        M.exit()
+        return true
+      end
+
       -- Just update the tabstop in insert and select modes.
       if not vim.fn.mode():match('^[isS]') then
         return
       end
 
       -- Update the current tabstop to be the one containing the cursor.
-      local cursor_row, cursor_col = cursor_pos()
       for tabstop_index, tabstops in pairs(M._session.tabstops) do
         for _, tabstop in ipairs(tabstops) do
           local range = tabstop:get_range()
-- 
cgit 


From ba6761eafe615a7f904c585dba3b7d6e98f665e1 Mon Sep 17 00:00:00 2001
From: Lajos Koszti <ajnasz@ajnasz.hu>
Date: Thu, 26 Oct 2023 22:40:36 +0200
Subject: fix(lsp): fix omnicomplete in middle of the line (#25787)

Fixes a regression from 5e5f5174e3faa862a9bc353aa7da41487911140b

Until that commit we had a logic like this:
`local prefix = startbyte and line:sub(startbyte + 1) or line_to_cursor:sub(word_boundary)`

The commit changed the logic and no longer cut off the line at the cursor,  resulting in a prefix that included trailing characters
---
 runtime/lua/vim/lsp/_completion.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_completion.lua b/runtime/lua/vim/lsp/_completion.lua
index f0e3af7f03..7a607d6c13 100644
--- a/runtime/lua/vim/lsp/_completion.lua
+++ b/runtime/lua/vim/lsp/_completion.lua
@@ -137,6 +137,7 @@ end
 function M._convert_results(
   line,
   lnum,
+  cursor_col,
   client_start_boundary,
   server_start_boundary,
   result,
@@ -164,7 +165,7 @@ function M._convert_results(
   elseif curstartbyte ~= nil and curstartbyte ~= server_start_boundary then
     server_start_boundary = client_start_boundary
   end
-  local prefix = line:sub((server_start_boundary or client_start_boundary) + 1)
+  local prefix = line:sub((server_start_boundary or client_start_boundary) + 1, cursor_col)
   local matches = M._lsp_to_complete_items(result, prefix)
   return matches, server_start_boundary
 end
@@ -212,6 +213,7 @@ function M.omnifunc(findstart, base)
         matches, server_start_boundary = M._convert_results(
           line,
           lnum,
+          cursor_col,
           client_start_boundary,
           server_start_boundary,
           result,
-- 
cgit 


From 5753e5e7ebb60d26d78aa3c99a8b0e2ee8023056 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 27 Oct 2023 09:37:48 +0200
Subject: vim-patch:9.0.2071: objdump files not recognized

Problem:  objdump files not recognized
Solution: detect *.objdump files, add a filetype plugin

Added the objdump file/text format

closes: vim/vim#13425

https://github.com/vim/vim/commit/10407df7a95d0311c7d2eb920d3b72020db5b301

Co-authored-by: Colin Kennedy <colinvfx@gmail.com>
---
 runtime/ftplugin/objdump.vim | 14 ++++++++++++++
 runtime/lua/vim/filetype.lua |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 runtime/ftplugin/objdump.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/objdump.vim b/runtime/ftplugin/objdump.vim
new file mode 100644
index 0000000000..7517a342a3
--- /dev/null
+++ b/runtime/ftplugin/objdump.vim
@@ -0,0 +1,14 @@
+" Vim filetype plugin file
+" Language:     Objdump
+" Maintainer:   Colin Kennedy <colinvfx@gmail.com>
+" Last Change:  2023 October 25
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setlocal cms<"
+
+setlocal commentstring=#\ %s
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 627732f164..35ad8e21b8 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -716,6 +716,8 @@ local extension = {
   nsi = 'nsis',
   nsh = 'nsis',
   obj = 'obj',
+  objdump = 'objdump',
+  cppobjdump = 'objdump',
   obl = 'obse',
   obse = 'obse',
   oblivion = 'obse',
-- 
cgit 


From 4fcdfa5ad01fd8f7e8c0e044fcf004692c0889d5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 27 Oct 2023 09:40:31 +0200
Subject: vim-patch:7b7cda67a124
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(debian): update debian related runtime files (vim/vim#13423)

* Update Debian runtime files

Add mantic as a supported Ubuntu release and move buster/kinetic to
unsupported.

Add syntax highlighting for deb822sources filetype.

Add debsources ftplugin to set relevant comment options.

Move common version information to shared/debversions.vim

Closes vim/vim#11934

* Add myself as codeowner for Debian-related runtime files

---------

https://github.com/vim/vim/commit/7b7cda67a1246874520b280277d9b1447e1a7ef5

Co-authored-by: James McCoy <jamessan@jamessan.com>
Co-authored-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Co-authored-by: James Addison <jay@jp-hosting.net>
Co-authored-by: Viktor Szépe <viktor@szepe.net>
Co-authored-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Co-authored-by: James Addison <jay@jp-hosting.net>
Co-authored-by: Viktor Szépe <viktor@szepe.net>
---
 runtime/ftplugin/debchangelog.vim     |  2 +-
 runtime/ftplugin/debsources.vim       | 16 +++++++++
 runtime/syntax/deb822sources.vim      | 63 +++++++++++++++++++++++++++++++++++
 runtime/syntax/debchangelog.vim       | 57 ++++++++++++-------------------
 runtime/syntax/debsources.vim         | 40 ++++++++--------------
 runtime/syntax/shared/debversions.vim | 29 ++++++++++++++++
 6 files changed, 143 insertions(+), 64 deletions(-)
 create mode 100644 runtime/ftplugin/debsources.vim
 create mode 100644 runtime/syntax/deb822sources.vim
 create mode 100644 runtime/syntax/shared/debversions.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/debchangelog.vim b/runtime/ftplugin/debchangelog.vim
index dca7f7355a..aa657a9b97 100644
--- a/runtime/ftplugin/debchangelog.vim
+++ b/runtime/ftplugin/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:   Debian Vim Maintainers <team+vim@tracker.debian.org>
 " Former Maintainers:   Michael Piefel <piefel@informatik.hu-berlin.de>
 "                       Stefano Zacchiroli <zack@debian.org>
-" Last Change:  2023 Jan 16
+" Last Change:  2023 Aug 18
 " License:      Vim License
 " URL:          https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/debchangelog.vim
 
diff --git a/runtime/ftplugin/debsources.vim b/runtime/ftplugin/debsources.vim
new file mode 100644
index 0000000000..cbb4fafd22
--- /dev/null
+++ b/runtime/ftplugin/debsources.vim
@@ -0,0 +1,16 @@
+" Language:     Debian sources.list
+" Maintainer:   Debian Vim Maintainers <team+vim@tracker.debian.org>
+" Last Change:  2023 Aug 30
+" License:      Vim License
+" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/debsources.vim
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin=1
+
+setlocal comments=:#
+setlocal commentstring=#%s
+setlocal formatoptions-=t
+
+let b:undo_ftplugin = 'setlocal comments< commentstring< formatoptions<'
diff --git a/runtime/syntax/deb822sources.vim b/runtime/syntax/deb822sources.vim
new file mode 100644
index 0000000000..81113610e8
--- /dev/null
+++ b/runtime/syntax/deb822sources.vim
@@ -0,0 +1,63 @@
+" Vim syntax file
+" Language:     Debian deb822-format source list file
+" Maintainer:   Debian Vim Maintainers
+" Last Change: 2023 May 25
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/deb822sources.vim
+
+" Standard syntax initialization
+if exists('b:current_syntax')
+  finish
+endif
+
+" case insensitive
+syn case ignore
+
+" Comments are matched from the first character of a line to the end-of-line
+syn region deb822sourcesComment start="^#" end="$"
+
+" A bunch of useful keywords
+syn match deb822sourcesType               /\(deb-src\|deb\)/
+syn match deb822sourcesFreeComponent      /\(main\|universe\)/
+syn match deb822sourcesNonFreeComponent   /\(contrib\|non-free-firmware\|non-free\|restricted\|multiverse\)/
+
+" Include Debian versioning information
+runtime! syntax/shared/debversions.vim
+
+exe 'syn match deb822sourcesSupportedSuites contained + *\([[:alnum:]_./]*\)\<\('. join(g:debSharedSupportedVersions, '\|'). '\)\>\([-[:alnum:]_./]*\)+'
+exe 'syn match deb822sourcesUnsupportedSuites contained + *\([[:alnum:]_./]*\)\<\('. join(g:debSharedUnsupportedVersions, '\|'). '\)\>\([-[:alnum:]_./]*\)+'
+
+unlet g:debSharedSupportedVersions
+unlet g:debSharedUnsupportedVersions
+
+syn region deb822sourcesSuites start="\(^Suites: *\)\@<=" end="$" contains=deb822sourcesSupportedSuites,deb822sourcesUnsupportedSuites oneline
+
+syn keyword deb822sourcesForce contained force
+syn keyword deb822sourcesYesNo contained yes no
+
+" Match uri's
+syn match deb822sourcesUri            '\(https\?://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\+'
+
+syn match deb822sourcesEntryField            "^\%(Types\|URIs\|Suites\|Components\): *"
+syn match deb822sourcesOptionField           "^\%(Signed-By\|Check-Valid-Until\|Valid-Until-Min\|Valid-Until-Max\|Date-Max-Future\|InRelease-Path\): *"
+syn match deb822sourcesMultiValueOptionField "^\%(Architectures\|Languages\|Targets\)\%(-Add\|-Remove\)\?: *"
+
+syn region deb822sourcesStrictField matchgroup=deb822sourcesBooleanOptionField start="^\%(PDiffs\|Allow-Insecure\|Allow-Weak\|Allow-Downgrade-To-Insecure\|Trusted\|Check-Date\): *" end="$" contains=deb822sourcesYesNo oneline
+syn region deb822sourcesStrictField matchgroup=deb822sourcesForceBooleanOptionField start="^\%(By-Hash\): *" end="$" contains=deb822sourcesForce,deb822sourcesYesNo oneline
+
+hi def link deb822sourcesComment                 Comment
+hi def link deb822sourcesEntryField              Keyword
+hi def link deb822sourcesOptionField             Special
+hi def link deb822sourcesMultiValueOptionField   Special
+hi def link deb822sourcesBooleanOptionField      Special
+hi def link deb822sourcesForceBooleanOptionField Special
+hi def link deb822sourcesStrictField             Error
+hi def link deb822sourcesType                    Identifier
+hi def link deb822sourcesFreeComponent           Identifier
+hi def link deb822sourcesNonFreeComponent        Identifier
+hi def link deb822sourcesForce                   Identifier
+hi def link deb822sourcesYesNo                   Identifier
+hi def link deb822sourcesUri                     Constant
+hi def link deb822sourcesSupportedSuites         Type
+hi def link deb822sourcesUnsupportedSuites       WarningMsg
+
+let b:current_syntax = 'deb822sources'
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index d3c3d39304..da35a6a10b 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2023 Jan 16
+" Last Change: 2023 Oct 11
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -17,34 +17,19 @@ syn case ignore
 let s:urgency='urgency=\(low\|medium\|high\|emergency\|critical\)\( [^[:space:],][^,]*\)\='
 let s:binNMU='binary-only=yes'
 
-let s:cpo = &cpo
-set cpo-=C
-let s:supported = [
-      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
-      \ 'buster', 'bullseye', 'bookworm', 'trixie', 'forky',
-      \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic', 'lunar',
-      \ 'devel'
-      \ ]
-let s:unsupported = [
-      \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
-      \ 'jessie', 'stretch',
-      \
-      \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
-      \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
-      \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
-      \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
-      \ 'disco', 'eoan', 'hirsute', 'impish', 'groovy'
-      \ ]
-let &cpo=s:cpo
+" Include Debian versioning information
+runtime! syntax/shared/debversions.vim
+
+exe 'syn match debchangelogTarget	contained "\%( \%('.join(g:debSharedSupportedVersions, '\|').'\)\>[-[:alnum:]]*\)\+"'
+exe 'syn match debchangelogUnsupportedTarget	contained "\%( \%('.join(g:debSharedUnsupportedVersions, '\|').'\)\>[-[:alnum:]]*\)\+"'
+
+unlet g:debSharedSupportedVersions
+unlet g:debSharedUnsupportedVersions
 
 " Define some common expressions we can use later on
 syn match debchangelogName	contained "^[[:alnum:]][[:alnum:].+-]\+ "
 exe 'syn match debchangelogFirstKV	contained "; \('.s:urgency.'\|'.s:binNMU.'\)"'
 exe 'syn match debchangelogOtherKV	contained ", \('.s:urgency.'\|'.s:binNMU.'\)"'
-exe 'syn match debchangelogTarget	contained "\%( \%('.join(s:supported, '\|').'\)\>[-[:alnum:]]*\)\+"'
-exe 'syn match debchangelogUnsupportedTarget	contained "\%( \%('.join(s:unsupported, '\|').'\)\>[-[:alnum:]]*\)\+"'
 syn match debchangelogUnreleased	contained / UNRELEASED/
 syn match debchangelogVersion	contained "(.\{-})"
 syn match debchangelogCloses	contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
@@ -58,19 +43,19 @@ syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail
 syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses,debchangelogLP oneline
 
 " Associate our matches and regions with pretty colours
-hi def link debchangelogHeader  Error
-hi def link debchangelogFooter  Identifier
-hi def link debchangelogEntry   Normal
-hi def link debchangelogCloses  Statement
-hi def link debchangelogLP      Statement
-hi def link debchangelogFirstKV Identifier
-hi def link debchangelogOtherKV Identifier
-hi def link debchangelogName    Comment
-hi def link debchangelogVersion Identifier
-hi def link debchangelogTarget  Identifier
-hi def link debchangelogUnsupportedTarget  Identifier
+hi def link debchangelogHeader     Error
+hi def link debchangelogFooter     Identifier
+hi def link debchangelogEntry      Normal
+hi def link debchangelogCloses     Statement
+hi def link debchangelogLP         Statement
+hi def link debchangelogFirstKV    Identifier
+hi def link debchangelogOtherKV    Identifier
+hi def link debchangelogName       Comment
+hi def link debchangelogVersion    Identifier
 hi def link debchangelogUnreleased WarningMsg
-hi def link debchangelogEmail   Special
+hi def link debchangelogEmail      Special
+hi def link debchangelogTarget     Identifier
+hi def link debchangelogUnsupportedTarget Identifier
 
 let b:current_syntax = 'debchangelog'
 
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index cbb3b36c10..9846cfdef0 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2023 Feb 06
+" Last Change: 2023 Oct 11
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -21,41 +21,27 @@ syn match debsourcesNonFreeComponent   /\(contrib\|non-free-firmware\|non-free\|
 " Match comments
 syn match debsourcesComment        /#.*/  contains=@Spell
 
-let s:cpo = &cpo
-set cpo-=C
-let s:supported = [
-      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
-      \ 'buster', 'bullseye', 'bookworm', 'trixie', 'forky',
-      \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic', 'lunar',
-      \ 'devel'
-      \ ]
-let s:unsupported = [
-      \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
-      \ 'jessie', 'stretch',
-      \
-      \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
-      \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
-      \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
-      \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
-      \ 'disco', 'eoan', 'hirsute', 'impish', 'groovy'
-      \ ]
-let &cpo=s:cpo
+" Include Debian versioning information
+runtime! syntax/shared/debversions.vim
+
+exe 'syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\<\('. join(g:debSharedSupportedVersions, '\|'). '\)\>\([-[:alnum:]_./]*\)+'
+exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\<\('. join(g:debSharedUnsupportedVersions, '\|') .'\)\>\([-[:alnum:]_./]*\)+'
+
+unlet g:debSharedSupportedVersions
+unlet g:debSharedUnsupportedVersions
 
 " Match uri's
 syn match debsourcesUri            '\(https\?://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\+'
-exe 'syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\<\('. join(s:supported, '\|'). '\)\>\([-[:alnum:]_./]*\)+'
-exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\<\('. join(s:unsupported, '\|') .'\)\>\([-[:alnum:]_./]*\)+'
+syn region debsourcesLine start="^" end="$" contains=debsourcesType,debsourcesFreeComponent,debsourcesNonFreeComponent,debsourcesComment,debsourcesUri,debsourcesDistrKeyword,debsourcesUnsupportedDistrKeyword oneline
+
 
 " Associate our matches and regions with pretty colours
-hi def link debsourcesLine                    Error
 hi def link debsourcesType                    Statement
 hi def link debsourcesFreeComponent           Statement
 hi def link debsourcesNonFreeComponent        Statement
-hi def link debsourcesDistrKeyword            Type
-hi def link debsourcesUnsupportedDistrKeyword WarningMsg
 hi def link debsourcesComment                 Comment
 hi def link debsourcesUri                     Constant
+hi def link debsourcesDistrKeyword            Type
+hi def link debsourcesUnsupportedDistrKeyword WarningMsg
 
 let b:current_syntax = 'debsources'
diff --git a/runtime/syntax/shared/debversions.vim b/runtime/syntax/shared/debversions.vim
new file mode 100644
index 0000000000..e96b558423
--- /dev/null
+++ b/runtime/syntax/shared/debversions.vim
@@ -0,0 +1,29 @@
+" Vim syntax file
+" Language:     Debian version information
+" Maintainer:   Debian Vim Maintainers
+" Last Change: 2023 Oct 11
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/shared/debversions.vim
+
+let s:cpo = &cpo
+set cpo-=C
+
+let g:debSharedSupportedVersions = [
+      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
+      \ 'bullseye', 'bookworm', 'trixie', 'forky',
+      \
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'lunar', 'mantic',
+      \ 'devel'
+      \ ]
+let g:debSharedUnsupportedVersions = [
+      \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
+      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
+      \ 'jessie', 'stretch', 'buster',
+      \
+      \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
+      \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
+      \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
+      \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
+      \ 'disco', 'eoan', 'hirsute', 'impish', 'kinetic', 'groovy'
+      \ ]
+
+let &cpo=s:cpo
-- 
cgit 


From add1b10b79011d1af61419a63cc8ef4645f45bbf Mon Sep 17 00:00:00 2001
From: Jongwook Choi <wookayin@gmail.com>
Date: Fri, 27 Oct 2023 09:17:46 -0400
Subject: fix(diagnostic): virtual_text prefix function should have index and
 total (#25801)

The prefix option of the diagnostic virtual text can be a function,
but previously it was only a function of diagnostic.

This function should also have additional parameters index and total,
more consistently and similarily as in the prefix function for
`vim.diagnostic.open_float()`.

These additional parameters will be useful when there are too many
number of diagnostics in a single line.
---
 runtime/doc/diagnostic.txt     | 9 ++++++---
 runtime/lua/vim/diagnostic.lua | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/diagnostic.txt b/runtime/doc/diagnostic.txt
index e9ca9ee347..7f5c809ac3 100644
--- a/runtime/doc/diagnostic.txt
+++ b/runtime/doc/diagnostic.txt
@@ -404,9 +404,12 @@ config({opts}, {namespace})                          *vim.diagnostic.config()*
                          the beginning of the virtual text.
                        • prefix: (string or function) prepend diagnostic
                          message with prefix. If a function, it must have the
-                         signature (diagnostic) -> string, where {diagnostic}
-                         is of type |diagnostic-structure|. This can be used
-                         to render diagnostic symbols or error codes.
+                         signature (diagnostic, i, total) -> string, where
+                         {diagnostic} is of type |diagnostic-structure|, {i}
+                         is the index of the diagnostic being evaluated, and
+                         {total} is the total number of diagnostics for the
+                         line. This can be used to render diagnostic symbols
+                         or error codes.
                        • suffix: (string or function) Append diagnostic
                          message with suffix. If a function, it must have the
                          signature (diagnostic) -> string, where {diagnostic}
diff --git a/runtime/lua/vim/diagnostic.lua b/runtime/lua/vim/diagnostic.lua
index 9e9b09ed1d..99448982b4 100644
--- a/runtime/lua/vim/diagnostic.lua
+++ b/runtime/lua/vim/diagnostic.lua
@@ -592,8 +592,10 @@ end
 ---                       * spacing: (number) Amount of empty spaces inserted at the beginning
 ---                                  of the virtual text.
 ---                       * prefix: (string or function) prepend diagnostic message with prefix.
----                                 If a function, it must have the signature (diagnostic) -> string,
----                                 where {diagnostic} is of type |diagnostic-structure|. This can be
+---                                 If a function, it must have the signature (diagnostic, i, total)
+---                                 -> string, where {diagnostic} is of type |diagnostic-structure|,
+---                                 {i} is the index of the diagnostic being evaluated, and {total}
+---                                 is the total number of diagnostics for the line. This can be
 ---                                 used to render diagnostic symbols or error codes.
 ---                       * suffix: (string or function) Append diagnostic message with suffix.
 ---                                 If a function, it must have the signature (diagnostic) ->
@@ -1072,7 +1074,7 @@ function M._get_virt_text_chunks(line_diags, opts)
   for i = 1, #line_diags do
     local resolved_prefix = prefix
     if type(prefix) == 'function' then
-      resolved_prefix = prefix(line_diags[i]) or ''
+      resolved_prefix = prefix(line_diags[i], i, #line_diags) or ''
     end
     table.insert(
       virt_texts,
-- 
cgit 


From 9455f6b17c6d1009af5d37d62884fe3042abdfa0 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 27 Oct 2023 19:20:07 +0200
Subject: vim-patch:650dcfc8d12e

runtime(netrw): don't echo empty lines (vim/vim#13431)

https://github.com/vim/vim/commit/650dcfc8d12e68aa05a358301ec15f9e6dbd03ba

Co-authored-by: nwounkn <nwounkn@gmail.com>
---
 runtime/autoload/netrw.vim | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 8b29ea9dfa..e3e28b6de2 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1134,7 +1134,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
    2match none
    if exists("s:explore_match")  | unlet s:explore_match  | endif
    if exists("s:explore_prvdir") | unlet s:explore_prvdir | endif
-   echo " "
 "   call Decho("cleared explore match list",'~'.expand("<slnum>"))
   endif
 
@@ -5688,8 +5687,6 @@ fun! s:NetrwClearExplore()
   if exists("w:netrw_explore_list")   |unlet w:netrw_explore_list   |endif
   if exists("w:netrw_explore_bufnr")  |unlet w:netrw_explore_bufnr  |endif
 "   redraw!
-  echo " "
-  echo " "
 "  call Dret("s:NetrwClearExplore")
 endfun
 
-- 
cgit 


From a2a1a65b98ad88d69906b9c372dca1c3063100ef Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 29 Oct 2023 06:15:13 +0800
Subject: vim-patch:8ebdbc9e6d80 (#25816)

runtime(doc): all secure options should note this restriction in the documentation (vim/vim#13448)

Problem:  Not all secure options document their status
Solution: Describe secure context :set restrictions in each help entry

https://github.com/vim/vim/commit/8ebdbc9e6d80b707c2b2d923e702dc86bf902923

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/doc/options.txt           | 15 ++++++++++++++-
 runtime/lua/vim/_meta/options.lua | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 3864b4f25b..56926aec69 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1214,6 +1214,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	current working directory to the |$HOME| directory like in Unix.
 	When off, those commands just print the current directory name.
 	On Unix this option has no effect.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
 
 					*'cdpath'* *'cd'* *E344* *E346*
 'cdpath' 'cd'		string	(default equivalent to $CDPATH or ",,")
@@ -4095,7 +4097,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	If you have less than 512 Mbyte |:mkspell| may fail for some
 	languages, no matter what you set 'mkspellmem' to.
 
-	This option cannot be set from a |modeline| or in the |sandbox|.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
 
 				*'modeline'* *'ml'* *'nomodeline'* *'noml'*
 'modeline' 'ml'		boolean	(default on (off for root))
@@ -4475,6 +4478,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Directories used to find packages.
 	See |packages| and |packages-runtimepath|.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
 
 						*'paragraphs'* *'para'*
 'paragraphs' 'para'	string	(default "IPLPPPQPP TPHPLIPpLpItpplpipbp")
@@ -4487,6 +4492,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Expression which is evaluated to apply a patch to a file and generate
 	the resulting new version of the file.  See |diff-patchexpr|.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
 
 					*'patchmode'* *'pm'* *E205* *E206*
 'patchmode' 'pm'	string	(default "")
@@ -5382,6 +5389,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When 'shellxquote' is set to "(" then the characters listed in this
 	option will be escaped with a '^' character.  This makes it possible
 	to execute most external commands with cmd.exe.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
 
 						*'shellxquote'* *'sxq'*
 'shellxquote' 'sxq'	string	(default "", Windows: "\"")
@@ -6429,6 +6438,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	function and an example.  The value can be the name of a function, a
 	|lambda| or a |Funcref|. See |option-value-function| for more
 	information.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
 
 						*'taglength'* *'tl'*
 'taglength' 'tl'	number	(default 0)
@@ -6817,6 +6828,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Setting 'verbosefile' to a new value is like making it empty first.
 	The difference with |:redir| is that verbose messages are not
 	displayed when 'verbosefile' is set.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
 
 						*'viewdir'* *'vdir'*
 'viewdir' 'vdir'	string	(default "$XDG_STATE_HOME/nvim/view//")
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 967cf36da0..a986cd752c 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -694,6 +694,8 @@ vim.go.cmp = vim.go.casemap
 --- current working directory to the `$HOME` directory like in Unix.
 --- When off, those commands just print the current directory name.
 --- On Unix this option has no effect.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
 ---
 --- @type boolean
 vim.o.cdhome = false
@@ -4122,7 +4124,8 @@ vim.go.mis = vim.go.menuitems
 --- If you have less than 512 Mbyte `:mkspell` may fail for some
 --- languages, no matter what you set 'mkspellmem' to.
 ---
---- This option cannot be set from a `modeline` or in the `sandbox`.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
 ---
 --- @type string
 vim.o.mkspellmem = "460000,2000,500"
@@ -4567,6 +4570,8 @@ vim.go.opfunc = vim.go.operatorfunc
 
 --- Directories used to find packages.
 --- See `packages` and `packages-runtimepath`.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
 ---
 --- @type string
 vim.o.packpath = "..."
@@ -4585,6 +4590,8 @@ vim.go.para = vim.go.paragraphs
 
 --- Expression which is evaluated to apply a patch to a file and generate
 --- the resulting new version of the file.  See `diff-patchexpr`.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
 ---
 --- @type string
 vim.o.patchexpr = ""
@@ -5628,6 +5635,8 @@ vim.go.stmp = vim.go.shelltemp
 --- When 'shellxquote' is set to "(" then the characters listed in this
 --- option will be escaped with a '^' character.  This makes it possible
 --- to execute most external commands with cmd.exe.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
 ---
 --- @type string
 vim.o.shellxescape = ""
@@ -6855,6 +6864,8 @@ vim.go.tc = vim.go.tagcase
 --- function and an example.  The value can be the name of a function, a
 --- `lambda` or a `Funcref`. See `option-value-function` for more
 --- information.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
 ---
 --- @type string
 vim.o.tagfunc = ""
@@ -7340,6 +7351,8 @@ vim.go.vbs = vim.go.verbose
 --- Setting 'verbosefile' to a new value is like making it empty first.
 --- The difference with `:redir` is that verbose messages are not
 --- displayed when 'verbosefile' is set.
+--- This option cannot be set from a `modeline` or in the `sandbox`, for
+--- security reasons.
 ---
 --- @type string
 vim.o.verbosefile = ""
-- 
cgit 


From c34e81660884f1b6a50536ce39dbab7cd66b502f Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 28 Oct 2023 23:51:02 +0200
Subject: vim-patch:9.0.2079: Not all Dart files detected

Problem:  Not all Dart files detected
Solution: Add shebang filetype detection for Dart

closes: vim/vim#13449

https://github.com/vim/vim/commit/c1c177a47bfe1b9a524ede2743a689e461668d14

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
---
 runtime/lua/vim/filetype/detect.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index e53ff08536..2232183888 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1655,6 +1655,7 @@ local patterns_hashbang = {
   ['^crystal\\>'] = { 'crystal', { vim_regex = true } },
   ['^\\%(rexx\\|regina\\)\\>'] = { 'rexx', { vim_regex = true } },
   ['^janet\\>'] = { 'janet', { vim_regex = true } },
+  ['^dart\\>'] = { 'dart', { vim_regex = true } },
 }
 
 ---@private
-- 
cgit 


From a5629abce29668e9781768986f7e799ba429f017 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 28 Oct 2023 23:53:08 +0200
Subject: vim-patch:a390e984db20

runtime(sh): add shDblParen to shLoopList for bash (vim/vim#13445)

add shDblParen to shLoopList to correctly highlight
arithmetic expressions for Bash and Ksh

This should allow code such as:

```bash
declare -i i j
for i in foo bar
do ((j = 1 << j))
done
```

https://github.com/vim/vim/commit/a390e984db20575dc726b4e0ebf95582265df8e7

Co-authored-by: Lucien Grondin <grondilu@yahoo.fr>
---
 runtime/syntax/sh.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 8674ded9e4..d64c3a9b08 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -163,7 +163,7 @@ syn cluster shIdList	contains=shArithmetic,shCommandSub,shCommandSubBQ,shWrapLin
 syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
 syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shIf,shOption,shSet,shTest,shTestOpr,shTouch
 if exists("b:is_kornshell") || exists("b:is_bash")
- syn cluster shLoopoList	add=shForPP
+ syn cluster shLoopList	add=shForPP,shDblParen
 endif
 syn cluster shPPSLeftList	contains=shAlias,shArithmetic,shCmdParenRegion,shCommandSub,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
 syn cluster shPPSRightList	contains=shDeref,shDerefSimple,shEscape,shPosnParm
-- 
cgit 


From 2dc9ceb99c018b15dcf0c443cad46efecccaf94e Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 29 Oct 2023 09:02:32 +0100
Subject: docs: small fixes (#25585)

Co-authored-by: tmummert <doczook@gmx.de>
Co-authored-by: parikshit adhikari <parikshitadhikari@gmail.com>
---
 runtime/doc/api.txt             | 2 +-
 runtime/doc/builtin.txt         | 2 +-
 runtime/doc/channel.txt         | 2 +-
 runtime/doc/ft_rust.txt         | 1 -
 runtime/doc/options.txt         | 2 +-
 runtime/doc/starting.txt        | 2 +-
 runtime/lua/vim/_meta/api.lua   | 2 +-
 runtime/lua/vim/_meta/vimfn.lua | 2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index d64020191d..4430d97fc7 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3161,7 +3161,7 @@ nvim_open_win({buffer}, {enter}, {*config})                  *nvim_open_win()*
                     • "shadow": A drop shadow effect by blending with the
                       background.
                     • If it is an array, it should have a length of eight or
-                      any divisor of eight. The array will specifify the eight
+                      any divisor of eight. The array will specify the eight
                       chars building up the border in a clockwise fashion
                       starting with the top-left corner. As an example, the
                       double box style could be specified as [ "╔", "═" ,"╗",
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5a99fb686e..35c94d6c74 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -7187,7 +7187,7 @@ sockconnect({mode}, {address} [, {opts}])                        *sockconnect()*
 		{address} should be the path of a local domain socket (on
 		unix) or named pipe (on Windows). If {mode} is "tcp" then
 		{address} should be of the form "host:port" where the host
-		should be an ip adderess or host name, and port the port
+		should be an ip address or host name, and port the port
 		number.
 
 		For "pipe" mode, see |luv-pipe-handle|. For "tcp" mode, see
diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt
index e517d0d9cd..7184151cda 100644
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -117,7 +117,7 @@ simple example, echoing some data through a cat-process:
     call chansend(id, "hello!")
 <
 
-Here is a example of setting a buffer to the result of grep, but only after
+Here is an example of setting a buffer to the result of grep, but only after
 all data has been processed:
 >vim
     function! s:OnEvent(id, data, event) dict
diff --git a/runtime/doc/ft_rust.txt b/runtime/doc/ft_rust.txt
index 083b6f579f..159ff7d5f6 100644
--- a/runtime/doc/ft_rust.txt
+++ b/runtime/doc/ft_rust.txt
@@ -276,7 +276,6 @@ g:rust_keep_autopairs_default ~
 
 	Don't override auto-pairs default for the Rust filetype. The default
 	is 0.
- 
 
 ==============================================================================
 COMMANDS                                                       *rust-commands*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 56926aec69..b2a020cf9d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -137,7 +137,7 @@ backslash.  To include a backslash you have to use two.  Effectively this
 means that the number of backslashes in an option value is halved (rounded
 down).
 In options 'path', 'cdpath', and 'tags', spaces have to be preceded with three
-backslashes instead becuase they can be separated by either commas or spaces.
+backslashes instead because they can be separated by either commas or spaces.
 Comma-separated options like 'backupdir' and 'tags' will also require commas
 to be escaped with two backslashes, whereas this is not needed for
 non-comma-separated ones like 'makeprg'.
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 04d9142a58..af175ed2b9 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1307,7 +1307,7 @@ exactly four MessagePack objects:
    10 (LocalMark)
    11 (Change)         Map containing some position description:
                        Entry      Position ~
-                       GlobaMark  Global mark position. |'A|
+                       GlobalMark Global mark position. |'A|
                        LocalMark  Local mark position. |'a|
                        Jump       One position from the |jumplist|.
                        Change     One position from the |changelist|.
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 5a9b0b53ce..691da62f4f 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -1594,7 +1594,7 @@ function vim.api.nvim_open_term(buffer, opts) end
 ---                 • "shadow": A drop shadow effect by blending with the
 ---                   background.
 ---                 • If it is an array, it should have a length of eight or
----                   any divisor of eight. The array will specifify the eight
+---                   any divisor of eight. The array will specify the eight
 ---                   chars building up the border in a clockwise fashion
 ---                   starting with the top-left corner. As an example, the
 ---                   double box style could be specified as [ "╔", "═" ,"╗",
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 1830e1796b..0563f9dd5f 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -8530,7 +8530,7 @@ function vim.fn.slice(expr, start, end_) end
 --- {address} should be the path of a local domain socket (on
 --- unix) or named pipe (on Windows). If {mode} is "tcp" then
 --- {address} should be of the form "host:port" where the host
---- should be an ip adderess or host name, and port the port
+--- should be an ip address or host name, and port the port
 --- number.
 ---
 --- For "pipe" mode, see |luv-pipe-handle|. For "tcp" mode, see
-- 
cgit 


From 0fe0cf5adaab06b92250eb350306de63c4d4f36f Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Mon, 30 Oct 2023 04:58:28 -0700
Subject: fix(lsp): do not cancel snippet when selecting placeholder (#25835)

---
 runtime/lua/vim/snippet.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua
index 14f73bff5c..94c69795a4 100644
--- a/runtime/lua/vim/snippet.lua
+++ b/runtime/lua/vim/snippet.lua
@@ -278,6 +278,11 @@ local function setup_autocmds(bufnr)
     desc = 'Update snippet state when the cursor moves',
     buffer = bufnr,
     callback = function()
+      -- Just update the tabstop in insert and select modes.
+      if not vim.fn.mode():match('^[isS]') then
+        return
+      end
+
       local cursor_row, cursor_col = cursor_pos()
 
       -- The cursor left the snippet region.
@@ -292,11 +297,6 @@ local function setup_autocmds(bufnr)
         return true
       end
 
-      -- Just update the tabstop in insert and select modes.
-      if not vim.fn.mode():match('^[isS]') then
-        return
-      end
-
       -- Update the current tabstop to be the one containing the cursor.
       for tabstop_index, tabstops in pairs(M._session.tabstops) do
         for _, tabstop in ipairs(tabstops) do
-- 
cgit 


From e19cc9c9b715d8171f7940632b8855104b5290b6 Mon Sep 17 00:00:00 2001
From: Famiu Haque <famiuhaque@proton.me>
Date: Sat, 14 Oct 2023 22:19:11 +0600
Subject: refactor(options)!: unify `set_option` and `set_string_option`

While the interfaces for setting number and boolean options are now unified by #25394, there is still a separate `set_string_option` function that is used for setting a string option. This PR removes that function and merges it with set_option.

BREAKING CHANGE: `v:option_old` is now the old global value for all global-local options, instead of just string global-local options. Local value for a global-local number/boolean option is now unset when the option is set (e.g. using `:set` or `nvim_set_option_value`) without a scope, which means they now behave the same way as string options.

Ref: #25672
---
 runtime/doc/autocmd.txt  | 9 ++++-----
 runtime/doc/news.txt     | 7 ++++++-
 runtime/doc/vim_diff.txt | 7 ++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 7ca9996e15..4b36a7d4ec 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -778,11 +778,10 @@ OptionSet			After setting an option (except during
 				This does not set |<abuf>|, you could use
 				|bufnr()|.
 
-				Note that when setting a |global-local| string
-				option with |:set|, then |v:option_old| is the
-				old global value. However, for all other kinds
-				of options (local string options, global-local
-				number options, ...) it is the old local
+				Note that when setting a |global-local| option
+				with |:set|, then |v:option_old| is the old
+				global value. However, for all options that
+				are not global-local it is the old local
 				value.
 
 				OptionSet is not triggered on startup and for
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index c090cfe166..d1191bef9a 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -73,7 +73,12 @@ The following changes may require adaptations in user config or plugins.
 
 • |OptionSet| autocommand args |v:option_new|, |v:option_old|,
   |v:option_oldlocal|, |v:option_oldglobal| now have the type of the option
-  instead of always being strings.
+  instead of always being strings. |v:option_old| is now the old global value
+  for all global-local options, instead of just string global-local options.
+
+• Local value for a global-local number/boolean option is now unset when
+  the option is set (e.g. using |:set| or |nvim_set_option_value()|) without a
+  scope, which means they now behave the same way as string options.
 
 ==============================================================================
 NEW FEATURES                                                    *news-features*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 7d0047bb1d..8249179187 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -289,6 +289,10 @@ Normal commands:
   |Q| replays the last recorded macro instead of switching to Ex mode (|gQ|).
 
 Options:
+  Local values for global-local number/boolean options are unset when the
+  option is set without a scope (e.g. by using |:set|), similarly to how
+  global-local string options work.
+
   'autoread'    works in the terminal (if it supports "focus" events)
   'cpoptions'   flags: |cpo-_|
   'diffopt'     "linematch" feature
@@ -381,7 +385,8 @@ Variables:
   |v:windowid| is always available (for use by external UIs)
   |OptionSet| autocommand args |v:option_new|, |v:option_old|,
   |v:option_oldlocal|, |v:option_oldglobal| have the type of the option
-  instead of always being strings.
+  instead of always being strings. |v:option_old| is now the old global value
+  for all global-local options, instead of just string global-local options.
 
 Vimscript:
   |:redir| nested in |execute()| works.
-- 
cgit 


From adbe7f368397da21465f27181e254dd3694820e9 Mon Sep 17 00:00:00 2001
From: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Tue, 31 Oct 2023 14:18:44 +0200
Subject: fix(lsp): call `on_list()` even for single location (#25830)

Problem: Currently there is no way of customizing behavior of
  `declaration`, `definition`, `typeDefinition`, and `implementation`
  methods in `vim.lsp.buf` when LSP server returns `Location`. Instead,
  cursor jumps to that location directly.

Solution: Normalize LSP response to be `Location[]` for those four cases.
---
 runtime/doc/lsp.txt              | 16 ++++++++--------
 runtime/lua/vim/lsp/buf.lua      | 12 ++++++++----
 runtime/lua/vim/lsp/handlers.lua | 31 +++++++++++++++----------------
 3 files changed, 31 insertions(+), 28 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index e62a411233..b727cff2cd 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1179,8 +1179,8 @@ declaration({options})                             *vim.lsp.buf.declaration()*
       • {options}  (table|nil) additional options
                    • reuse_win: (boolean) Jump to existing window if buffer is
                      already open.
-                   • on_list: (function) handler for list results. See
-                     |lsp-on-list-handler|
+                   • on_list: (function) |lsp-on-list-handler| replacing the
+                     default handler. Called for any non-empty result.
 
 definition({options})                               *vim.lsp.buf.definition()*
     Jumps to the definition of the symbol under the cursor.
@@ -1189,8 +1189,8 @@ definition({options})                               *vim.lsp.buf.definition()*
       • {options}  (table|nil) additional options
                    • reuse_win: (boolean) Jump to existing window if buffer is
                      already open.
-                   • on_list: (function) handler for list results. See
-                     |lsp-on-list-handler|
+                   • on_list: (function) |lsp-on-list-handler| replacing the
+                     default handler. Called for any non-empty result.
 
 document_highlight()                        *vim.lsp.buf.document_highlight()*
     Send request to the server to resolve document highlights for the current
@@ -1271,8 +1271,8 @@ implementation({options})                       *vim.lsp.buf.implementation()*
 
     Parameters: ~
       • {options}  (table|nil) additional options
-                   • on_list: (function) handler for list results. See
-                     |lsp-on-list-handler|
+                   • on_list: (function) |lsp-on-list-handler| replacing the
+                     default handler. Called for any non-empty result.
 
 incoming_calls()                                *vim.lsp.buf.incoming_calls()*
     Lists all the call sites of the symbol under the cursor in the |quickfix|
@@ -1329,8 +1329,8 @@ type_definition({options})                     *vim.lsp.buf.type_definition()*
       • {options}  (table|nil) additional options
                    • reuse_win: (boolean) Jump to existing window if buffer is
                      already open.
-                   • on_list: (function) handler for list results. See
-                     |lsp-on-list-handler|
+                   • on_list: (function) |lsp-on-list-handler| replacing the
+                     default handler. Called for any non-empty result.
 
 workspace_symbol({query}, {options})          *vim.lsp.buf.workspace_symbol()*
     Lists all symbols in the current workspace in the quickfix window.
diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index 9436fbbf56..b9b7aefae6 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -62,7 +62,8 @@ end
 ---
 ---@param options table|nil additional options
 ---     - reuse_win: (boolean) Jump to existing window if buffer is already open.
----     - on_list: (function) handler for list results. See |lsp-on-list-handler|
+---     - on_list: (function) |lsp-on-list-handler| replacing the default handler.
+---        Called for any non-empty result.
 function M.declaration(options)
   local params = util.make_position_params()
   request_with_options(ms.textDocument_declaration, params, options)
@@ -72,7 +73,8 @@ end
 ---
 ---@param options table|nil additional options
 ---     - reuse_win: (boolean) Jump to existing window if buffer is already open.
----     - on_list: (function) handler for list results. See |lsp-on-list-handler|
+---     - on_list: (function) |lsp-on-list-handler| replacing the default handler.
+---       Called for any non-empty result.
 function M.definition(options)
   local params = util.make_position_params()
   request_with_options(ms.textDocument_definition, params, options)
@@ -82,7 +84,8 @@ end
 ---
 ---@param options table|nil additional options
 ---     - reuse_win: (boolean) Jump to existing window if buffer is already open.
----     - on_list: (function) handler for list results. See |lsp-on-list-handler|
+---     - on_list: (function) |lsp-on-list-handler| replacing the default handler.
+---       Called for any non-empty result.
 function M.type_definition(options)
   local params = util.make_position_params()
   request_with_options(ms.textDocument_typeDefinition, params, options)
@@ -92,7 +95,8 @@ end
 --- quickfix window.
 ---
 ---@param options table|nil additional options
----     - on_list: (function) handler for list results. See |lsp-on-list-handler|
+---     - on_list: (function) |lsp-on-list-handler| replacing the default handler.
+---       Called for any non-empty result.
 function M.implementation(options)
   local params = util.make_position_params()
   request_with_options(ms.textDocument_implementation, params, options)
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index d153b956ee..6fde55cf04 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -407,25 +407,24 @@ local function location_handler(_, result, ctx, config)
 
   -- textDocument/definition can return Location or Location[]
   -- https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_definition
+  if not vim.tbl_islist(result) then
+    result = { result }
+  end
 
-  if vim.tbl_islist(result) then
-    local title = 'LSP locations'
-    local items = util.locations_to_items(result, client.offset_encoding)
+  local title = 'LSP locations'
+  local items = util.locations_to_items(result, client.offset_encoding)
 
-    if config.on_list then
-      assert(type(config.on_list) == 'function', 'on_list is not a function')
-      config.on_list({ title = title, items = items })
-    else
-      if #result == 1 then
-        util.jump_to_location(result[1], client.offset_encoding, config.reuse_win)
-        return
-      end
-      vim.fn.setqflist({}, ' ', { title = title, items = items })
-      api.nvim_command('botright copen')
-    end
-  else
-    util.jump_to_location(result, client.offset_encoding, config.reuse_win)
+  if config.on_list then
+    assert(type(config.on_list) == 'function', 'on_list is not a function')
+    config.on_list({ title = title, items = items })
+    return
+  end
+  if #result == 1 then
+    util.jump_to_location(result[1], client.offset_encoding, config.reuse_win)
+    return
   end
+  vim.fn.setqflist({}, ' ', { title = title, items = items })
+  api.nvim_command('botright copen')
 end
 
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_declaration
-- 
cgit 


From 224f303ee54c54d2147f03010385e8cc48e42869 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Tue, 31 Oct 2023 09:15:32 -0500
Subject: feat(stdlib): add vim.base64 module (#25843)

Add base64 encode() and decode() functions to a vim.base64 module.
---
 runtime/doc/lua.txt              | 22 ++++++++++++++++++++++
 runtime/doc/news.txt             |  3 +++
 runtime/lua/vim/_meta/base64.lua | 13 +++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 runtime/lua/vim/_meta/base64.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 1d69b1cc91..aea19d7bf0 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -809,6 +809,28 @@ vim.json.encode({obj})                                     *vim.json.encode()*
         (string)
 
 
+==============================================================================
+VIM.BASE64                                                        *vim.base64*
+
+vim.base64.decode({str})                                 *vim.base64.decode()*
+    Decode a Base64 encoded string.
+
+    Parameters: ~
+      • {str}  (string) Base64 encoded string
+
+    Return: ~
+        (string) Decoded string
+
+vim.base64.encode({str})                                 *vim.base64.encode()*
+    Encode {str} using Base64.
+
+    Parameters: ~
+      • {str}  (string) String to encode
+
+    Return: ~
+        (string) Encoded string
+
+
 ==============================================================================
 VIM.SPELL                                                          *vim.spell*
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index d1191bef9a..b88b7d164f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -202,6 +202,9 @@ The following new APIs and features were added.
 
 • 'complete' option supports "f" flag for completing buffer names.
 
+• Added |vim.base64.encode()| and |vim.base64.decode()| for encoding and decoding
+  strings using Base64 encoding.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/_meta/base64.lua b/runtime/lua/vim/_meta/base64.lua
new file mode 100644
index 0000000000..f25b4af234
--- /dev/null
+++ b/runtime/lua/vim/_meta/base64.lua
@@ -0,0 +1,13 @@
+--- @meta
+
+--- Encode {str} using Base64.
+---
+--- @param str string String to encode
+--- @return string Encoded string
+function vim.base64.encode(str) end
+
+--- Decode a Base64 encoded string.
+---
+--- @param str string Base64 encoded string
+--- @return string Decoded string
+function vim.base64.decode(str) end
-- 
cgit 


From 4e6096a67fe9860994be38bcd155e7c47313205e Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Tue, 31 Oct 2023 20:04:53 -0700
Subject: feat(server): allow embed with listen (#25709)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

connection from any channel or stdio will unblock
remote_ui_wait_for_attach.  Wait on stdio only if
only —embed specified, if both —embed and
—listen then wait on any channel.
---
 runtime/doc/starting.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index af175ed2b9..9f7a729575 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -390,6 +390,10 @@ argument.
 <		Then startup will continue without waiting for `nvim_ui_attach`.
 		This is equivalent to: >
 		    nvim --headless --cmd "call stdioopen({'rpc': v:true})"
+<
+		Embedders that use the UI protocol on a socket connection must
+		pass |--listen| as well as |--embed|: >
+		    nvim --embed --listen addr
 
 <		See also: |ui-startup| |channel-stdio|
 
-- 
cgit 


From 5a2543c1598a0cf97b8eca0573139c9c20d6c93a Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Fri, 3 Nov 2023 00:22:02 +0100
Subject: docs: small fixes (#25831)

Co-authored-by: Peter Aronoff <peter@aronoff.org>
---
 runtime/doc/help.txt                          |  1 -
 runtime/doc/lua.txt                           | 17 +++++++++--------
 runtime/doc/quickref.txt                      |  1 -
 runtime/lua/vim/_editor.lua                   | 21 +++++++++++----------
 runtime/pack/dist/opt/matchit/doc/matchit.txt |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 651dce08bf..b8526b55e9 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -171,7 +171,6 @@ DEVELOPING NVIM
 
 Standard plugins ~
 						*standard-plugin-list*
-|matchit.txt|		Extended |%| matching
 |pi_gzip.txt|		Reading and writing compressed files
 |pi_health.txt|		Healthcheck framework
 |pi_msgpack.txt|	msgpack utilities
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index aea19d7bf0..ada07a71f8 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1512,7 +1512,7 @@ vim.wo                                                                *vim.wo*
 Lua module: vim                                                      *lua-vim*
 
 vim.cmd                                                            *vim.cmd()*
-    Execute Vim script commands.
+    Executes Vim script commands.
 
     Note that `vim.cmd` can be indexed with a command name to return a
     callable function to the command.
@@ -1596,7 +1596,7 @@ vim.inspect                                                    *vim.inspect()*
       • https://github.com/mpeterv/vinspect
 
 vim.keycode({str})                                             *vim.keycode()*
-    Translate keycodes.
+    Translates keycodes.
 
     Example: >lua
         local k = vim.keycode
@@ -1619,7 +1619,7 @@ vim.lua_omnifunc({find_start}, {_})                       *vim.lua_omnifunc()*
     Activate using `set omnifunc=v:lua.vim.lua_omnifunc` in a Lua buffer.
 
 vim.notify({msg}, {level}, {opts})                              *vim.notify()*
-    Display a notification to the user.
+    Displays a notification to the user.
 
     This function can be overridden by plugins to display notifications using
     a custom provider (such as the system notification provider). By default,
@@ -1631,7 +1631,7 @@ vim.notify({msg}, {level}, {opts})                              *vim.notify()*
       • {opts}   (table|nil) Optional parameters. Unused by default.
 
 vim.notify_once({msg}, {level}, {opts})                    *vim.notify_once()*
-    Display a notification only one time.
+    Displays a notification only one time.
 
     Like |vim.notify()|, but subsequent calls with the same message will not
     display a notification.
@@ -1760,7 +1760,7 @@ vim.schedule_wrap({fn})                                  *vim.schedule_wrap()*
       • |vim.in_fast_event()|
 
 vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
-    Run a system command
+    Runs a system command or throws an error if {cmd} cannot be run.
 
     Examples: >lua
         local on_exit = function(obj)
@@ -1770,15 +1770,16 @@ vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
           print(obj.stderr)
         end
 
-        -- Run asynchronously
+        -- Runs asynchronously:
         vim.system({'echo', 'hello'}, { text = true }, on_exit)
 
-        -- Run synchronously
+        -- Runs synchronously:
         local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
         -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
 <
 
-    See |uv.spawn()| for more details.
+    See |uv.spawn()| for more details. Note: unlike |uv.spawn()|, vim.system
+    throws an error if {cmd} cannot be run.
 
     Parameters: ~
       • {cmd}      (string[]) Command to execute
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index fd9eab8646..f976eb7464 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -817,7 +817,6 @@ Short explanation of each option:		*option-list*
 'path'		  'pa'	    list of directories searched with "gf" et.al.
 'preserveindent'  'pi'	    preserve the indent structure when reindenting
 'previewheight'   'pvh'     height of the preview window
-'previewpopup'    'pvp'     use popup window for preview
 'previewwindow'   'pvw'     identifies the preview window
 'pumheight'	  'ph'	    maximum number of items to show in the popup menu
 'pumwidth'	  'pw'	    minimum width of the popup menu
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index e0c7de87b3..0da127b18f 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -69,7 +69,7 @@ vim.log = {
 }
 
 -- TODO(lewis6991): document that the signature is system({cmd}, [{opts},] {on_exit})
---- Run a system command
+--- Runs a system command or throws an error if {cmd} cannot be run.
 ---
 --- Examples:
 ---
@@ -82,16 +82,17 @@ vim.log = {
 ---   print(obj.stderr)
 --- end
 ---
---- -- Run asynchronously
+--- -- Runs asynchronously:
 --- vim.system({'echo', 'hello'}, { text = true }, on_exit)
 ---
---- -- Run synchronously
+--- -- Runs synchronously:
 --- local obj = vim.system({'echo', 'hello'}, { text = true }):wait()
 --- -- { code = 0, signal = 0, stdout = 'hello', stderr = '' }
 ---
 --- ```
 ---
---- See |uv.spawn()| for more details.
+--- See |uv.spawn()| for more details. Note: unlike |uv.spawn()|, vim.system
+--- throws an error if {cmd} cannot be run.
 ---
 --- @param cmd (string[]) Command to execute
 --- @param opts (SystemOpts|nil) Options:
@@ -370,7 +371,7 @@ end
 
 local VIM_CMD_ARG_MAX = 20
 
---- Execute Vim script commands.
+--- Executes Vim script commands.
 ---
 --- Note that `vim.cmd` can be indexed with a command name to return a callable function to the
 --- command.
@@ -587,7 +588,7 @@ function vim.defer_fn(fn, timeout)
   return timer
 end
 
---- Display a notification to the user.
+--- Displays a notification to the user.
 ---
 --- This function can be overridden by plugins to display notifications using a
 --- custom provider (such as the system notification provider). By default,
@@ -609,7 +610,7 @@ end
 do
   local notified = {}
 
-  --- Display a notification only one time.
+  --- Displays a notification only one time.
   ---
   --- Like |vim.notify()|, but subsequent calls with the same message will not
   --- display a notification.
@@ -690,7 +691,7 @@ function vim._on_key(char)
   end
 end
 
---- Generate a list of possible completions for the string.
+--- Generates a list of possible completions for the string.
 --- String has the pattern.
 ---
 ---     1. Can we get it to just return things in the global namespace with that name prefix
@@ -917,7 +918,7 @@ function vim.print(...)
   return ...
 end
 
---- Translate keycodes.
+--- Translates keycodes.
 ---
 --- Example:
 ---
@@ -1030,7 +1031,7 @@ function vim.deprecate(name, alternative, version, plugin, backtrace)
   return displayed and msg or nil
 end
 
---- Create builtin mappings (incl. menus).
+--- Creates builtin mappings (incl. menus).
 --- Called once on startup.
 function vim._init_default_mappings()
   -- mappings
diff --git a/runtime/pack/dist/opt/matchit/doc/matchit.txt b/runtime/pack/dist/opt/matchit/doc/matchit.txt
index 5daf9788d6..88d0c38e4d 100644
--- a/runtime/pack/dist/opt/matchit/doc/matchit.txt
+++ b/runtime/pack/dist/opt/matchit/doc/matchit.txt
@@ -1,4 +1,4 @@
-*matchit.txt*   Extended "%" matching
+*matchit.txt*   Extended |%| matching
 
 For instructions on installing this file, type
 	`:help matchit-install`
-- 
cgit 


From 80cf1ee2c5a0a4b68d0a21916a7ebd7f723fb6b7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 Nov 2023 00:20:37 +0100
Subject: vim-patch:2b89afd5eb63

runtime(debversions): Add noble (24.04 LTS) as Ubuntu release name (vim/vim#13472)

https://github.com/vim/vim/commit/2b89afd5eb63864154d973e7991a56a53b87a767

Co-authored-by: James McCoy <jamessan@jamessan.com>
---
 runtime/syntax/shared/debversions.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/shared/debversions.vim b/runtime/syntax/shared/debversions.vim
index e96b558423..6c944cd4e1 100644
--- a/runtime/syntax/shared/debversions.vim
+++ b/runtime/syntax/shared/debversions.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     Debian version information
 " Maintainer:   Debian Vim Maintainers
-" Last Change: 2023 Oct 11
+" Last Change: 2023 Nov 01
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/shared/debversions.vim
 
 let s:cpo = &cpo
@@ -11,7 +11,7 @@ let g:debSharedSupportedVersions = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
       \ 'bullseye', 'bookworm', 'trixie', 'forky',
       \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'lunar', 'mantic',
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'lunar', 'mantic', 'noble',
       \ 'devel'
       \ ]
 let g:debSharedUnsupportedVersions = [
-- 
cgit 


From d4dc1355eda78ca2a8aece08d1ab6c6bc1e91505 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Fri, 3 Nov 2023 00:20:56 +0100
Subject: vim-patch:1858e2b22ad1

runtime(sh) Update sh syntax and add shDblParen to shCaseList (vim/vim#13469)

https://github.com/vim/vim/commit/1858e2b22ad168b1fd44a4efcd3a2b6cd9f6772d

Co-authored-by: Lucien Grondin <grondilu@yahoo.fr>
---
 runtime/syntax/sh.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index d64c3a9b08..0fb10f0e51 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -140,7 +140,7 @@ syn cluster shArithList	contains=@shArithParenList,shParenError
 syn cluster shCaseEsacList	contains=shCaseStart,shCaseLabel,shCase,shCaseBar,shCaseIn,shComment,shDeref,shDerefSimple,shCaseCommandSub,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote,shCtrlSeq,@shErrorList,shStringSpecial,shCaseRange
 syn cluster shCaseList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSubBQ,shComment,shDblBrace,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq
 if exists("b:is_kornshell") || exists("b:is_bash")
- syn cluster shCaseList	add=shForPP
+ syn cluster shCaseList	add=shForPP,shDblParen
 endif
 syn cluster shCommandSubList	contains=shAlias,shArithmetic,shCmdParenRegion,shCommandSub,shComment,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
 syn cluster shCurlyList	contains=shNumber,shComma,shDeref,shDerefSimple,shDerefSpecial
-- 
cgit 


From 9281edb334a374e7753d4a6b7a05e31120e39772 Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Thu, 2 Nov 2023 09:59:41 +0100
Subject: fix(lsp): create per client params in lsp.buf.code_action

`code_action` used the same parameters for all clients, which led to the
following warning and incorrect start/end column locations if using
clients with mixed encodings:

    warning: multiple different client offset_encodings detected for
    buffer, this is not supported yet
---
 runtime/lua/vim/lsp/buf.lua | 141 ++++++++++++++++++++++++++++----------------
 1 file changed, 91 insertions(+), 50 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/buf.lua b/runtime/lua/vim/lsp/buf.lua
index b9b7aefae6..cf9acc0808 100644
--- a/runtime/lua/vim/lsp/buf.lua
+++ b/runtime/lua/vim/lsp/buf.lua
@@ -579,6 +579,17 @@ function M.clear_references()
   util.buf_clear_references()
 end
 
+---@class vim.lsp.CodeActionResultEntry
+---@field error? lsp.ResponseError
+---@field result? (lsp.Command|lsp.CodeAction)[]
+---@field ctx lsp.HandlerContext
+
+---@class vim.lsp.buf.code_action.opts
+---@field context? lsp.CodeActionContext
+---@field filter? fun(x: lsp.CodeAction|lsp.Command):boolean
+---@field apply? boolean
+---@field range? {start: integer[], end: integer[]}
+
 --- This is not public because the main extension point is
 --- vim.ui.select which can be overridden independently.
 ---
@@ -587,17 +598,18 @@ end
 --- from multiple clients to have 1 single UI prompt for the user, yet we still
 --- need to be able to link a `CodeAction|Command` to the right client for
 --- `codeAction/resolve`
-local function on_code_action_results(results, ctx, options)
-  local action_tuples = {}
-
+---@param results table<integer, vim.lsp.CodeActionResultEntry>
+---@param opts? vim.lsp.buf.code_action.opts
+local function on_code_action_results(results, opts)
+  ---@param a lsp.Command|lsp.CodeAction
   local function action_filter(a)
     -- filter by specified action kind
-    if options and options.context and options.context.only then
+    if opts and opts.context and opts.context.only then
       if not a.kind then
         return false
       end
       local found = false
-      for _, o in ipairs(options.context.only) do
+      for _, o in ipairs(opts.context.only) do
         -- action kinds are hierarchical with . as a separator: when requesting only 'type-annotate'
         -- this filter allows both 'type-annotate' and 'type-annotate.foo', for example
         if a.kind == o or vim.startswith(a.kind, o .. '.') then
@@ -610,26 +622,31 @@ local function on_code_action_results(results, ctx, options)
       end
     end
     -- filter by user function
-    if options and options.filter and not options.filter(a) then
+    if opts and opts.filter and not opts.filter(a) then
       return false
     end
     -- no filter removed this action
     return true
   end
 
-  for client_id, result in pairs(results) do
+  ---@type {action: lsp.Command|lsp.CodeAction, ctx: lsp.HandlerContext}[]
+  local actions = {}
+  for _, result in pairs(results) do
     for _, action in pairs(result.result or {}) do
       if action_filter(action) then
-        table.insert(action_tuples, { client_id, action })
+        table.insert(actions, { action = action, ctx = result.ctx })
       end
     end
   end
-  if #action_tuples == 0 then
+  if #actions == 0 then
     vim.notify('No code actions available', vim.log.levels.INFO)
     return
   end
 
-  local function apply_action(action, client)
+  ---@param action lsp.Command|lsp.CodeAction
+  ---@param client lsp.Client
+  ---@param ctx lsp.HandlerContext
+  local function apply_action(action, client, ctx)
     if action.edit then
       util.apply_workspace_edit(action.edit, client.offset_encoding)
     end
@@ -639,8 +656,9 @@ local function on_code_action_results(results, ctx, options)
     end
   end
 
-  local function on_user_choice(action_tuple)
-    if not action_tuple then
+  ---@param choice {action: lsp.Command|lsp.CodeAction, ctx: lsp.HandlerContext}
+  local function on_user_choice(choice)
+    if not choice then
       return
     end
     -- textDocument/codeAction can return either Command[] or CodeAction[]
@@ -656,10 +674,11 @@ local function on_code_action_results(results, ctx, options)
     --  arguments?: any[]
     --
     ---@type lsp.Client
-    local client = assert(vim.lsp.get_client_by_id(action_tuple[1]))
-    local action = action_tuple[2]
+    local client = assert(vim.lsp.get_client_by_id(choice.ctx.client_id))
+    local action = choice.action
+    local bufnr = assert(choice.ctx.bufnr, 'Must have buffer number')
 
-    local reg = client.dynamic_capabilities:get(ms.textDocument_codeAction, { bufnr = ctx.bufnr })
+    local reg = client.dynamic_capabilities:get(ms.textDocument_codeAction, { bufnr = bufnr })
 
     local supports_resolve = vim.tbl_get(reg or {}, 'registerOptions', 'resolveProvider')
       or client.supports_method(ms.codeAction_resolve)
@@ -668,44 +687,37 @@ local function on_code_action_results(results, ctx, options)
       client.request(ms.codeAction_resolve, action, function(err, resolved_action)
         if err then
           if action.command then
-            apply_action(action, client)
+            apply_action(action, client, choice.ctx)
           else
             vim.notify(err.code .. ': ' .. err.message, vim.log.levels.ERROR)
           end
         else
-          apply_action(resolved_action, client)
+          apply_action(resolved_action, client, choice.ctx)
         end
-      end, ctx.bufnr)
+      end, bufnr)
     else
-      apply_action(action, client)
+      apply_action(action, client, choice.ctx)
     end
   end
 
   -- If options.apply is given, and there are just one remaining code action,
   -- apply it directly without querying the user.
-  if options and options.apply and #action_tuples == 1 then
-    on_user_choice(action_tuples[1])
+  if opts and opts.apply and #actions == 1 then
+    on_user_choice(actions[1])
     return
   end
 
-  vim.ui.select(action_tuples, {
+  ---@param item {action: lsp.Command|lsp.CodeAction}
+  local function format_item(item)
+    local title = item.action.title:gsub('\r\n', '\\r\\n')
+    return title:gsub('\n', '\\n')
+  end
+  local select_opts = {
     prompt = 'Code actions:',
     kind = 'codeaction',
-    format_item = function(action_tuple)
-      local title = action_tuple[2].title:gsub('\r\n', '\\r\\n')
-      return title:gsub('\n', '\\n')
-    end,
-  }, on_user_choice)
-end
-
---- Requests code actions from all clients and calls the handler exactly once
---- with all aggregated results
-local function code_action_request(params, options)
-  local bufnr = api.nvim_get_current_buf()
-  vim.lsp.buf_request_all(bufnr, ms.textDocument_codeAction, params, function(results)
-    local ctx = { bufnr = bufnr, method = ms.textDocument_codeAction, params = params }
-    on_code_action_results(results, ctx, options)
-  end)
+    format_item = format_item,
+  }
+  vim.ui.select(actions, select_opts, on_user_choice)
 end
 
 --- Selects a code action available at the current
@@ -752,21 +764,50 @@ function M.code_action(options)
     local bufnr = api.nvim_get_current_buf()
     context.diagnostics = vim.lsp.diagnostic.get_line_diagnostics(bufnr)
   end
-  local params
   local mode = api.nvim_get_mode().mode
-  if options.range then
-    assert(type(options.range) == 'table', 'code_action range must be a table')
-    local start = assert(options.range.start, 'range must have a `start` property')
-    local end_ = assert(options.range['end'], 'range must have a `end` property')
-    params = util.make_given_range_params(start, end_)
-  elseif mode == 'v' or mode == 'V' then
-    local range = range_from_selection(0, mode)
-    params = util.make_given_range_params(range.start, range['end'])
-  else
-    params = util.make_range_params()
+  local bufnr = api.nvim_get_current_buf()
+  local win = api.nvim_get_current_win()
+  local clients = vim.lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_codeAction })
+  local remaining = #clients
+  if remaining == 0 then
+    if next(vim.lsp.get_clients({ bufnr = bufnr })) then
+      vim.notify(vim.lsp._unsupported_method(ms.textDocument_codeAction), vim.log.levels.WARN)
+    end
+    return
+  end
+
+  ---@type table<integer, vim.lsp.CodeActionResultEntry>
+  local results = {}
+
+  ---@param err? lsp.ResponseError
+  ---@param result? (lsp.Command|lsp.CodeAction)[]
+  ---@param ctx lsp.HandlerContext
+  local function on_result(err, result, ctx)
+    results[ctx.client_id] = { error = err, result = result, ctx = ctx }
+    remaining = remaining - 1
+    if remaining == 0 then
+      on_code_action_results(results, options)
+    end
+  end
+
+  for _, client in ipairs(clients) do
+    ---@type lsp.CodeActionParams
+    local params
+    if options.range then
+      assert(type(options.range) == 'table', 'code_action range must be a table')
+      local start = assert(options.range.start, 'range must have a `start` property')
+      local end_ = assert(options.range['end'], 'range must have a `end` property')
+      params = util.make_given_range_params(start, end_, bufnr, client.offset_encoding)
+    elseif mode == 'v' or mode == 'V' then
+      local range = range_from_selection(bufnr, mode)
+      params =
+        util.make_given_range_params(range.start, range['end'], bufnr, client.offset_encoding)
+    else
+      params = util.make_range_params(win, client.offset_encoding)
+    end
+    params.context = context
+    client.request(ms.textDocument_codeAction, params, on_result, bufnr)
   end
-  params.context = context
-  code_action_request(params, options)
 end
 
 --- Executes an LSP server command.
-- 
cgit 


From e960fa2412948bfc8f059bff9ddb5397d7ee35d7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Nov 2023 11:40:10 +0100
Subject: vim-patch:2f54c13292af

runtime(script.vim): make strace ft check less strict (vim/vim#13482)

Strace output, depending on parameters (-ttf this time), can dump both
times and pid:
  1038  07:14:20.959262 execve("./e.py", ["./e.py"], 0x7ffca1422840 /* 51 vars */) = 0 <0.000150>

So loose the regexp matching this, so that the above is matched too.

Fixes vim/vim#13481.

https://github.com/vim/vim/commit/2f54c13292af053ec00c18e5fded87b1bc602822

Co-authored-by: Jiri Slaby <jirislaby@gmail.com>
Co-authored-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
---
 runtime/lua/vim/filetype/detect.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 2232183888..5479608148 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -1798,7 +1798,7 @@ local patterns_text = {
   function(lines)
     if
       -- inaccurate fast match first, then use accurate slow match
-      (lines[1]:find('execve%(') and lines[1]:find('^[0-9:%.]* *execve%('))
+      (lines[1]:find('execve%(') and lines[1]:find('^[0-9:%. ]*execve%('))
       or lines[1]:find('^__libc_start_main')
     then
       return 'strace'
-- 
cgit 


From d3e9cbedc700a5ae9f64fdced07cdddbb4ef13d1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Nov 2023 11:39:42 +0100
Subject: vim-patch:ce3b0136c6d9

runtime(sh): Update sh syntax and add shDerefOffset to shDerefVarArray for bash (vim/vim#13480)

Add shDerefOffset to shDerefVarArray.

Example code:

```bash
declare -a a=({a..z})

echo "${a[@]:1:3}"
```

https://github.com/vim/vim/commit/ce3b0136c6d9d09af41969d3dc9634f115505a32

Co-authored-by: Lucien Grondin <grondilu@yahoo.fr>
---
 runtime/syntax/sh.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 0fb10f0e51..e2b1947197 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -531,7 +531,7 @@ if exists("b:is_kornshell") || exists("b:is_posix")
 endif
 
 " sh ksh bash : ${var[... ]...}  array reference: {{{1
-syn region  shDerefVarArray   contained	matchgroup=shDeref start="\[" end="]"	contains=@shCommandSubList nextgroup=shDerefOp,shDerefOpError
+syn region  shDerefVarArray   contained	matchgroup=shDeref start="\[" end="]"	contains=@shCommandSubList nextgroup=shDerefOp,shDerefOpError,shDerefOffset
 
 " Special ${parameter OPERATOR word} handling: {{{1
 " sh ksh bash : ${parameter:-word}    word is default value
-- 
cgit 


From 6c150e0b9312ece13f13b7ff2e9743592bc9d431 Mon Sep 17 00:00:00 2001
From: L Lllvvuu <git@llllvvuu.dev>
Date: Wed, 27 Sep 2023 02:51:42 -0700
Subject: docs(treesitter): add disclaimer about needing to parse before
 `get_node()`

Problem:
---
Misuse of `get_node()` is common:
https://github.com/search?q=get_node_at_cursor+language%3Alua&type=code

Solution:
---
Add a note clarifying proper usage.
---
 runtime/doc/treesitter.txt     | 6 ++++++
 runtime/lua/vim/treesitter.lua | 8 ++++++++
 2 files changed, 14 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index e19fda8fd1..c65c9c22ba 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -599,6 +599,12 @@ get_captures_at_pos({bufnr}, {row}, {col})
 get_node({opts})                                   *vim.treesitter.get_node()*
     Returns the smallest named node at the given position
 
+    NOTE: Calling this on an unparsed tree can yield an invalid node. If the
+    tree is not known to be parsed by, e.g., an active highlighter, parse the
+    tree first via >lua
+        vim.treesitter.get_parser(bufnr):parse(range)
+<
+
     Parameters: ~
       • {opts}  (table|nil) Optional keyword arguments:
                 • bufnr integer|nil Buffer number (nil or 0 for current
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index f863942d3b..e7a66c00b2 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -350,6 +350,14 @@ end
 
 --- Returns the smallest named node at the given position
 ---
+--- NOTE: Calling this on an unparsed tree can yield an invalid node.
+--- If the tree is not known to be parsed by, e.g., an active highlighter,
+--- parse the tree first via
+---
+--- ```lua
+--- vim.treesitter.get_parser(bufnr):parse(range)
+--- ```
+---
 ---@param opts table|nil Optional keyword arguments:
 ---             - bufnr integer|nil Buffer number (nil or 0 for current buffer)
 ---             - pos table|nil 0-indexed (row, col) tuple. Defaults to cursor position in the
-- 
cgit 


From 68cb4a7405ea9f8841d1f25ee8997c49e77fa679 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Fri, 3 Nov 2023 12:26:38 +0100
Subject: feat(extmarks): add "undo_restore" flag to opt out of undo-restoring

It is a design goal of extmarks that they allow precise tracking
of changes across undo/redo, including restore the exact positions
after a do/undo or undo/redo cycle. However this behavior is not useful
for all usecases. Many plugins won't keep marks around for long after
text changes, but uses them more like a cache until some external source
(like LSP semantic highlights) has fully updated to changed text and
then will explicitly readjust/replace extmarks as needed.

Add a "undo_restore" flag which is true by default (matches existing
behavior) but can be set to false to opt-out of this behavior.

Delete dead u_extmark_set() code.
---
 runtime/doc/news.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b88b7d164f..e32e1aadb6 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -270,6 +270,9 @@ The following changes to existing APIs or features add new behavior.
   In addition, |nvim_buf_get_extmarks()| has gained an "overlap" option to
   return such ranges even if they started before the specified position.
 
+• Extmarks can opt-out of precise undo tracking using the new "undo_restore"
+  flag to |nvim_buf_set_extmark()|
+
 • LSP hover and signature help now use Treesitter for highlighting of Markdown
   content.
   Note that syntax highlighting of code examples requires a matching parser
-- 
cgit 


From 26cdff0e92bf93a2afcb4a78e056780ea3f582e7 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Nov 2023 11:37:42 +0100
Subject: vim-patch:cd8a3eaf5348
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(dist): centralize safe executable check and add vim library (vim/vim#13413)

Follow up to 816fbcc26 (patch 9.0.1833: [security] runtime file fixes,
2023-08-31) and f7ac0ef50 (runtime: don't execute external commands when
loading ftplugins, 2023-09-06).

This puts the logic for safe executable checks in a single place, by introducing
a central vim library, so all filetypes benefit from consistency.

Notable changes:
- dist#vim because the (autoload) namespace for a new runtime support
  library. Supporting functions should get documentation. It might make
  life easier for NeoVim devs to make the documentation a new file
  rather than cram it into existing files, though we may want
  cross-references to it somewhere…
- The gzip and zip plugins need to be opted into by enabling execution
  of those programs (or the global plugin_exec). This needs
  documentation or discussion.
- This fixes a bug in the zig plugin: code setting s:tmp_cwd was removed
  in f7ac0ef50 (runtime: don't execute external commands when loading
  ftplugins, 2023-09-06), but the variable was still referenced. Since
  the new function takes care of that automatically, the variable is no
  longer needed.

https://github.com/vim/vim/commit/cd8a3eaf5348feacfecab4b374b7ea4ce6a97422

Co-authored-by: D. Ben Knoble <ben.knoble+github@gmail.com>
---
 runtime/autoload/dist/vim.vim  | 17 +++++++++++++++++
 runtime/autoload/gzip.vim      |  5 +----
 runtime/autoload/zip.vim       |  6 +-----
 runtime/ftplugin/awk.vim       |  4 ++--
 runtime/ftplugin/changelog.vim |  4 ++--
 runtime/ftplugin/perl.vim      |  7 +------
 runtime/ftplugin/zig.vim       |  5 +----
 7 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 runtime/autoload/dist/vim.vim

(limited to 'runtime')

diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim
new file mode 100644
index 0000000000..57b757f021
--- /dev/null
+++ b/runtime/autoload/dist/vim.vim
@@ -0,0 +1,17 @@
+vim9script
+
+# Vim runtime support library
+#
+# Maintainer:	The Vim Project <https://github.com/vim/vim>
+# Last Change:	2023 Oct 25
+
+export def IsSafeExecutable(filetype: string, executable: string): bool
+  var cwd = getcwd()
+  return get(g:, filetype .. '_exec', get(g:, 'plugin_exec', 0))
+    && (fnamemodify(exepath(executable), ':p:h') !=# cwd
+        || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1
+            && cwd != '.'))
+enddef
+
+# Uncomment this line to check for compilation errors early
+# defcompile
diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim
index 6d0bb13401..26b1cda034 100644
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -11,10 +11,7 @@ fun s:check(cmd)
   let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
   if !exists("s:have_" . name)
     " safety check, don't execute anything from the current directory
-    let s:tmp_cwd = getcwd()
-    let f = (fnamemodify(exepath(name), ":p:h") !=# s:tmp_cwd
-          \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
-    unlet s:tmp_cwd
+    let f = dist#vim#IsSafeExecutable('gzip', name)
     if !f
       echoerr "Warning: NOT executing " .. name .. " from current directory!"
     endif
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 8b39c91c3a..e61293c357 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -57,14 +57,10 @@ if !exists("g:zip_extractcmd")
  let g:zip_extractcmd= g:zip_unzipcmd
 endif
 
-let s:tmp_cwd = getcwd()
-if (fnamemodify(exepath(g:zip_unzipcmd), ":p:h") ==# getcwd()
-          \ && (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) == -1 || s:tmp_cwd == '.'))
- unlet s:tmp_cwd
+if !dist#vim#IsSafeExecutable('zip', g:zip_unzipcmd)
  echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!"
  finish
 endif
-unlet s:tmp_cwd
 
 " ----------------
 "  Functions: {{{1
diff --git a/runtime/ftplugin/awk.vim b/runtime/ftplugin/awk.vim
index 785088ff9b..40fe304cf4 100644
--- a/runtime/ftplugin/awk.vim
+++ b/runtime/ftplugin/awk.vim
@@ -37,8 +37,8 @@ if exists("g:awk_is_gawk")
     let b:undo_ftplugin .= " | setl fp<"
   endif
 
-  " Disabled by default for security reasons.  
-  if get(g:, 'awk_exec', get(g:, 'plugin_exec', 0))
+  " Disabled by default for security reasons.
+  if dist#vim#IsSafeExecutable('awk', 'gawk')
     let path = system("gawk 'BEGIN { printf ENVIRON[\"AWKPATH\"] }'")
     let path = substitute(path, '^\.\=:\|:\.\=$\|:\.\=:', ',,', 'g') " POSIX cwd
     let path = substitute(path, ':', ',', 'g')
diff --git a/runtime/ftplugin/changelog.vim b/runtime/ftplugin/changelog.vim
index a62433378a..ab73949be5 100644
--- a/runtime/ftplugin/changelog.vim
+++ b/runtime/ftplugin/changelog.vim
@@ -57,8 +57,8 @@ if &filetype == 'changelog'
     endif
     let s:default_login = 'unknown'
 
-    " Disabled by default for security reasons.  
-    if get(g:, 'changelog_exec', get(g:, 'plugin_exec', 0))
+    " Disabled by default for security reasons.
+    if dist#vim#IsSafeExecutable('changelog', 'whoami')
       let login = s:login()
     else
       let login = s:default_login
diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim
index 7ea0ae980a..c63bd3f9c7 100644
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@ -56,12 +56,8 @@ endif
 
 " Set this once, globally.
 if !exists("perlpath")
-    let s:tmp_cwd = getcwd()
     " safety check: don't execute perl binary by default
-    if executable("perl") && get(g:, 'perl_exec', get(g:, 'plugin_exec', 0))
-        \ && (fnamemodify(exepath("perl"), ":p:h") != s:tmp_cwd
-        \ || (index(split($PATH, has("win32") ? ';' : ':'), s:tmp_cwd) != -1
-        \ && s:tmp_cwd != '.'))
+    if dist#vim#IsSafeExecutable('perl', 'perl')
       try
 	if &shellxquote != '"'
 	    let perlpath = system('perl -e "print join(q/,/,@INC)"')
@@ -77,7 +73,6 @@ if !exists("perlpath")
 	" current directory and the directory of the current file.
 	let perlpath = ".,,"
     endif
-    unlet! s:tmp_cwd
 endif
 
 " Append perlpath to the existing path value, if it is set.  Since we don't
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim
index 291fe44b11..28b8cd5a67 100644
--- a/runtime/ftplugin/zig.vim
+++ b/runtime/ftplugin/zig.vim
@@ -41,16 +41,13 @@ let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
 
 " Safety check: don't execute zig from current directory
 if !exists('g:zig_std_dir') && exists('*json_decode') &&
-    \  executable('zig') && get(g:, 'zig_exec', get(g:, 'plugin_exec', 0))
-    \ && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd
-    \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
+    \  executable('zig') && dist#vim#IsSafeExecutable('zig', 'zig')
     silent let s:env = system('zig env')
     if v:shell_error == 0
         let g:zig_std_dir = json_decode(s:env)['std_dir']
     endif
     unlet! s:env
 endif
-unlet! s:tmp_cwd
 
 if exists('g:zig_std_dir')
     let &l:path = g:zig_std_dir . ',' . &l:path
-- 
cgit 


From 2a47dbe2282c656c63a29005f35399db740ab958 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 4 Nov 2023 11:38:08 +0100
Subject: vim-patch:4f174f0de90b

runtime(dist): add legacy version for central vim library

Also, enable the zip and gzip plugins by default, unless those variables
were not explicitly set by the user.

related: vim/vim#13413

https://github.com/vim/vim/commit/4f174f0de90b52937ddaf1e6db98e9731930ff7c

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/autoload/dist/vim.vim | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim
index 57b757f021..d5a8984dc6 100644
--- a/runtime/autoload/dist/vim.vim
+++ b/runtime/autoload/dist/vim.vim
@@ -1,17 +1,30 @@
-vim9script
+" Vim runtime support library,
+" runs the vim9 script version or legacy script version
+" on demand (mostly for Neovim compatability)
+"
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Nov 04
 
-# Vim runtime support library
-#
-# Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2023 Oct 25
 
-export def IsSafeExecutable(filetype: string, executable: string): bool
-  var cwd = getcwd()
-  return get(g:, filetype .. '_exec', get(g:, 'plugin_exec', 0))
-    && (fnamemodify(exepath(executable), ':p:h') !=# cwd
-        || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1
-            && cwd != '.'))
-enddef
+" enable the zip and gzip plugin by default, if not set
+if !exists('g:zip_exec')
+  let g:zip_exec = 1
+endif
 
-# Uncomment this line to check for compilation errors early
-# defcompile
+if !exists('g:gzip_exec')
+  let g:gzip_exec = 1
+endif
+
+if !exists(":def")
+    function dist#vim#IsSafeExecutable(filetype, executable)
+    let cwd = getcwd()
+    return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) &&
+          \ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd
+          \ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 &&
+          \  cwd != '.'))
+    endfunction
+else
+    def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool
+      return dist#vim9#IsSafeExecutable(filetype, executable)
+    enddef
+endif
-- 
cgit 


From dcf5999fcd706c4319fb9c12bf9b46f2dd2b51b2 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 5 Nov 2023 11:32:43 +0100
Subject: vim-patch:b2a4c110a5d1

runtime(dist): Make dist/vim.vim work properly when lacking vim9script support (vim/vim#13487)

`:return` cannot be used outside of `:function` (or `:def`) in older Vims
lacking Vim9script support or in Neovim, even when evaluation is being skipped
in the dead `:else` branch.

Instead, use the pattern described in `:h vim9-mix`, which uses `:finish` to end
script processing before it reaches the vim9script stuff.

https://github.com/vim/vim/commit/b2a4c110a5d13bc794f4eddb2e88a4e8fe9dfbea

Co-authored-by: Sean Dewar <seandewar@users.noreply.github.com>
---
 runtime/autoload/dist/vim.vim | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim
index d5a8984dc6..021244c93b 100644
--- a/runtime/autoload/dist/vim.vim
+++ b/runtime/autoload/dist/vim.vim
@@ -15,16 +15,18 @@ if !exists('g:gzip_exec')
   let g:gzip_exec = 1
 endif
 
-if !exists(":def")
-    function dist#vim#IsSafeExecutable(filetype, executable)
+if !has('vim9script')
+  function dist#vim#IsSafeExecutable(filetype, executable)
     let cwd = getcwd()
     return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) &&
           \ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd
           \ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 &&
           \  cwd != '.'))
-    endfunction
-else
-    def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool
-      return dist#vim9#IsSafeExecutable(filetype, executable)
-    enddef
+  endfunction
+
+  finish
 endif
+
+def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool
+  return dist#vim9#IsSafeExecutable(filetype, executable)
+enddef
-- 
cgit 


From b329a21bd38ff4eda635c063a0c2580ad99fe0aa Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 5 Nov 2023 18:07:25 +0100
Subject: vim-patch:3d37231437fc

runtime(tar): improve the error detection

Do not rely on the fact, that the last line matches warning, error,
inappropriate or unrecognized to determine if an error occurred. It
could also be a file, contains such a keyword.

So make the error detection slightly more strict and only assume an
error occured, if in addition to those 4 keywords, also a space matches
(this assumes the error message contains a space), which luckily on Unix
not many files match by default.

The whole if condition seems however slightly dubious.  In case an error
happened, this would probably already be caught in the previous if
statement, since this checks for the return code of the tar program.

There may however be tar implementations, that do not set the exit code
for some kind of error (but print an error message)? But let's keep this
check for now, not many people have noticed this behaviour until now, so
it seems to work reasonably well anyhow.

related: vim/vim#6425
fixes: vim/vim#13489

https://github.com/vim/vim/commit/3d37231437fc0f761664a7cabc8f7b927b468767

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/autoload/tar.vim | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index d7d1d8399e..b31549a891 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -1,7 +1,7 @@
 " tar.vim: Handles browsing tarfiles
 "            AUTOLOAD PORTION
-" Date:		Jan 07, 2020
-" Version:	32
+" Date:		Nov 05, 2023
+" Version:	32a  (with modifications from the Vim Project)
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
 "
@@ -22,7 +22,7 @@
 if &cp || exists("g:loaded_tar")
  finish
 endif
-let g:loaded_tar= "v32"
+let g:loaded_tar= "v32a"
 if v:version < 702
  echohl WarningMsg
  echo "***warning*** this version of tar needs vim 7.2"
@@ -208,7 +208,16 @@ fun! tar#Browse(tarfile)
 "   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
    return
   endif
-  if line("$") == curlast || ( line("$") == (curlast + 1) && getline("$") =~# '\c\%(warning\|error\|inappropriate\|unrecognized\)')
+  " If there was an error message, the last line probably matches some keywords but
+  " should also contain whitespace for readability. Make sure not to match a
+  " filename that contains the keyword (error/warning/unrecognized/inappropriate, etc)
+  "
+  " FIXME:is this actually necessary? In case of an error, we should probably
+  "       have noticed in the if statement above since tar should have exited
+  "       with a non-zero exit code.
+  if line("$") == curlast || ( line("$") == (curlast + 1) &&
+        \ getline("$") =~# '\c\<\%(warning\|error\|inappropriate\|unrecognized\)\>' &&
+        \ getline("$") =~  '\s' )
    redraw!
    echohl WarningMsg | echo "***warning*** (tar#Browse) ".a:tarfile." doesn't appear to be a tar file" | echohl None
    keepj sil! %d
-- 
cgit 


From bbd7ec9e642bfdc5ee5c1c4d827df9c39fbb6d2a Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 5 Nov 2023 18:07:48 +0100
Subject: vim-patch:caee7956a21a

runtime(keymap): Switch Hindu-Arabic to Arabic numerals in arabic keymap (vim/vim#13430)

https://github.com/vim/vim/commit/caee7956a21a8c1102266b31af44c432522bdb53

Co-authored-by: avidseeker <avidseeker7@protonmail.com>
---
 runtime/keymap/arabic_utf-8.vim | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/keymap/arabic_utf-8.vim b/runtime/keymap/arabic_utf-8.vim
index aeb4a4f398..60fd05fc81 100644
--- a/runtime/keymap/arabic_utf-8.vim
+++ b/runtime/keymap/arabic_utf-8.vim
@@ -1,7 +1,7 @@
 " Vim Keymap file for Arabic
 " Maintainer   : Arabic Support group <support-at-arabeyes.org>
 " Created by   : Nadim Shaikli <nadim-at-arabeyes.org>
-" Last Updated : 2003 Apr 26
+" Last Updated : 2023-10-27
 " This is for a standard Microsoft Arabic keyboard layout.
 
 " Use this short name in the status line.
@@ -41,16 +41,6 @@ m	<char-0x0629>			" (1577)	- TEH MARBUTA
 ,	<char-0x0648>			" (1608)	- WAW
 .	<char-0x0632>			" (1586)	- ZAIN
 /	<char-0x0638>			" (1592)	- ZAH
-0	<char-0x0660>			" (1632)	- Arabic 0
-1	<char-0x0661>			" (1633)	- Arabic 1
-2	<char-0x0662>			" (1634)	- Arabic 2
-3	<char-0x0663>			" (1635)	- Arabic 3
-4	<char-0x0664>			" (1636)	- Arabic 4
-5	<char-0x0665>			" (1637)	- Arabic 5
-6	<char-0x0666>			" (1638)	- Arabic 6
-7	<char-0x0667>			" (1639)	- Arabic 7
-8	<char-0x0668>			" (1640)	- Arabic 8
-9	<char-0x0669>			" (1641)	- Arabic 9
 `	<char-0x0630>			" (1584)	- THAL
 ~	<char-0x0651>			" (1617)	- Tanween -- SHADDA
 Q	<char-0x064e>			" (1614)	- Tanween -- FATHA
-- 
cgit 


From 0774d0cfe1d5efb4bdd34cc8cf3799af5c947d2e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 6 Nov 2023 19:03:08 +0800
Subject: vim-patch:da4e433dc3be (#25912)

runtime(doc): document vim-script library function

https://github.com/vim/vim/commit/da4e433dc3bee7fa521df3c7235d49a6732134ef

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/eval.txt    | 27 +++++++++++++++++++++++++++
 runtime/doc/pi_gzip.txt | 10 +++++++++-
 runtime/doc/pi_zip.txt  |  7 +++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index c41237b862..4cb29205a5 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4353,6 +4353,33 @@ This is not allowed when the textlock is active:
 	- closing a window or quitting Vim
 	- etc.
 
+==============================================================================
+Vim script library					*vim-script-library*
+
+Vim comes bundled with a Vim script library, that can be used by runtime,
+script authors.  Currently, it only includes very few functions, but it may
+grow over time.
+
+								*dist#vim*
+The functions make use of the autoloaded prefix "dist#vim".
+
+The following functions are available:
+
+dist#vim#IsSafeExecutable(filetype, executable) ~
+
+This function takes a filetype and an executable and checks whether it is safe
+to execute the given executable.  For security reasons users may not want to
+have Vim execute random executables or may have forbidden to do so for
+specific filetypes by setting the "<filetype>_exec" variable (|plugin_exec|).
+
+It returns |TRUE| or |FALSE| to indicate whether the plugin should run the given
+exectuable.  It takes the following arguments:
+
+	argument	type ~
+
+	filetype	string
+	executable	string
+
 ==============================================================================
 Command-line expressions highlighting		*expr-highlight*
 
diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
index a709b34180..1aadc103fd 100644
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -12,9 +12,17 @@ The functionality mentioned here is a |standard-plugin|.
 This plugin is only available if 'compatible' is not set.
 You can avoid loading this plugin by setting the "loaded_gzip" variable: >
 	:let loaded_gzip = 1
+<
+							*g:gzip_exec*
+
+For security reasons, one may prevent that Vim runs executables automatically
+when opening a buffer.  This option (default: "1") can be used to prevent
+executing the executables command when set to "0": >
+	:let g:gzip_exec = 0
+<
 
 ==============================================================================
-1. Autocommands						*gzip-autocmd*
+2. Autocommands						*gzip-autocmd*
 
 The plugin installs autocommands to intercept reading and writing of files
 with these extensions:
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 343c73839b..a8e1b8df10 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -69,6 +69,13 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
    This option specifies the program (and any options needed) used to
    extract a file from a zip archive.  By default, >
 	let g:zip_extractcmd= g:zip_unzipcmd
+<
+							*g:zip_exec*
+   For security reasons, one may prevent that Vim runs executables
+   automatically when opening a buffer.  This option (default: "1")
+   can be used to prevent executing the "unzip" command when set to
+   "0": >
+	let g:zip_exec=0
 <
    PREVENTING LOADING~
 
-- 
cgit 


From 56627ca2423e9d6084f87f5bc4639f06d10ecf91 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:42:40 -0600
Subject: feat(tui): use TermResponse event for OSC responses (#25868)

When the terminal emulator sends an OSC sequence to Nvim (as a response
to another OSC sequence that was first sent by Nvim), populate the OSC
sequence in the v:termresponse variable and fire the TermResponse event.
The escape sequence is also included in the "data" field of the
autocommand callback when the autocommand is defined in Lua.

This makes use of the already documented but unimplemented TermResponse
event. This event exists in Vim but is only fired when Vim receives a
primary device attributes response.

Fixes: https://github.com/neovim/neovim/issues/25856
---
 runtime/doc/api.txt           | 15 +++++++++++++++
 runtime/doc/autocmd.txt       | 25 +++++++++++++++++++------
 runtime/doc/eval.txt          | 16 ++++------------
 runtime/doc/news.txt          |  3 +++
 runtime/doc/vim_diff.txt      |  2 ++
 runtime/lua/vim/_meta/api.lua | 11 +++++++++++
 6 files changed, 54 insertions(+), 18 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 4430d97fc7..edf683473f 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3591,6 +3591,21 @@ nvim_ui_set_option({name}, {value})                     *nvim_ui_set_option()*
     Attributes: ~
         |RPC| only
 
+nvim_ui_term_event({event}, {value})                    *nvim_ui_term_event()*
+    Tells Nvim when a terminal event has occurred.
+
+    The following terminal events are supported:
+
+    • "osc_response": The terminal sent a OSC response sequence to Nvim. The
+      payload is the received OSC sequence.
+
+    Attributes: ~
+        |RPC| only
+
+    Parameters: ~
+      • {event}    Event name
+      • {payload}  Event payload
+
 nvim_ui_try_resize({width}, {height})                   *nvim_ui_try_resize()*
     TODO: Documentation
 
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 4b36a7d4ec..6b698b0868 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -987,12 +987,25 @@ TermClose			When a |terminal| job ends.
 				Sets these |v:event| keys:
 				    status
 							*TermResponse*
-TermResponse			After the response to t_RV is received from
-				the terminal.  The value of |v:termresponse|
-				can be used to do things depending on the
-				terminal version.  May be triggered halfway
-				through another event (file I/O, a shell
-				command, or anything else that takes time).
+TermResponse			When Nvim receives a OSC response from the
+				terminal.  Sets |v:termresponse|. When used
+				from Lua, the response string is included in
+				the "data" field of the autocommand callback.
+				May be triggered halfway through another event
+				(file I/O, a shell command, or anything else
+				that takes time). Example: >lua
+
+				-- Query the terminal palette for the RGB value of color 1
+				-- (red) using OSC 4
+				vim.api.nvim_create_autocmd('TermResponse', {
+				  once = true,
+				  callback = function(args)
+				    local resp = args.data
+				    local r, g, b = resp:match("\x1b%]4;1;rgb:(%w+)/(%w+)/(%w+)")
+				  end,
+				})
+				io.stdout:write("\x1b]4;1;?\x1b\\")
+<
 							*TextChanged*
 TextChanged			After a change was made to the text in the
 				current buffer in Normal mode.  That is after
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 4cb29205a5..2223829548 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2318,18 +2318,10 @@ v:t_string	Value of |String| type.  Read-only.  See: |type()|
 v:t_blob	Value of |Blob| type.  Read-only.  See: |type()|
 
 				*v:termresponse* *termresponse-variable*
-v:termresponse	The escape sequence returned by the terminal for the DA
-		(request primary device attributes) control sequence.  It is
-		set when Vim receives an escape sequence that starts with ESC
-		[ or CSI and ends in a 'c', with only digits, ';' and '.' in
-		between.
-		When this option is set, the TermResponse autocommand event is
-		fired, so that you can react to the response from the
-		terminal.
-		The response from a new xterm is: "<Esc>[ Pp ; Pv ; Pc c".  Pp
-		is the terminal type: 0 for vt100 and 1 for vt220.  Pv is the
-		patch level (since this was introduced in patch 95, it's
-		always 95 or bigger).  Pc is always zero.
+v:termresponse	The value of the most recent OSC escape sequence received by
+		Nvim from the terminal. This can be read in a |TermResponse|
+		event handler after querying the terminal using another escape
+		sequence.
 
 					*v:testing* *testing-variable*
 v:testing	Must be set before using `test_garbagecollect_now()`.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index e32e1aadb6..fa77e8d086 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -205,6 +205,9 @@ The following new APIs and features were added.
 • Added |vim.base64.encode()| and |vim.base64.decode()| for encoding and decoding
   strings using Base64 encoding.
 
+• The |TermResponse| autocommand event can be used with |v:termresponse| to
+  read escape sequence responses from the terminal.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 8249179187..efebf46d85 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -567,6 +567,8 @@ Working directory (Vim implemented some of these after Nvim):
 Autocommands:
 - Fixed inconsistent behavior in execution of nested autocommands:
   https://github.com/neovim/neovim/issues/23368
+- |TermResponse| is fired for any OSC sequence received from the terminal,
+  instead of the Primary Device Attributes response. |v:termresponse|
 
 ==============================================================================
 Missing features					 *nvim-missing*
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 691da62f4f..0bee27970d 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -2059,6 +2059,17 @@ function vim.api.nvim_ui_set_focus(gained) end
 --- @param value any
 function vim.api.nvim_ui_set_option(name, value) end
 
+--- Tells Nvim when a terminal event has occurred.
+--- The following terminal events are supported:
+---
+--- • "osc_response": The terminal sent a OSC response sequence to Nvim. The
+---   payload is the received OSC sequence.
+---
+---
+--- @param event string Event name
+--- @param value any
+function vim.api.nvim_ui_term_event(event, value) end
+
 --- @param width integer
 --- @param height integer
 function vim.api.nvim_ui_try_resize(width, height) end
-- 
cgit 


From 3198038224209c41932a305e2a2dee708d4e3ec8 Mon Sep 17 00:00:00 2001
From: altermo <107814000+altermo@users.noreply.github.com>
Date: Tue, 7 Nov 2023 01:33:38 +0100
Subject: fix(lua): correct return value for on_key with no arguments (#25911)

---
 runtime/lua/vim/_editor.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 0da127b18f..0bdf0c90a5 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -650,7 +650,7 @@ local on_key_cbs = {}
 ---if on_key() is called without arguments.
 function vim.on_key(fn, ns_id)
   if fn == nil and ns_id == nil then
-    return #on_key_cbs
+    return vim.tbl_count(on_key_cbs)
   end
 
   vim.validate({
-- 
cgit 


From 6f936c9d85a056919f53486c38fcf541466416cc Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 7 Nov 2023 10:39:27 +0800
Subject: fix(man): make :Man with a range work (#25922)

---
 runtime/plugin/man.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/plugin/man.lua b/runtime/plugin/man.lua
index 4b1528b0cb..50a48fe7f2 100644
--- a/runtime/plugin/man.lua
+++ b/runtime/plugin/man.lua
@@ -16,6 +16,7 @@ vim.api.nvim_create_user_command('Man', function(params)
 end, {
   bang = true,
   bar = true,
+  range = true,
   addr = 'other',
   nargs = '*',
   complete = function(...)
-- 
cgit 


From 748bc4d22d35b40f0795015e5d93113b526adf22 Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Mon, 30 Oct 2023 13:23:55 -0500
Subject: feat(clipboard): add OSC 52 clipboard support

This is opt-in as not all terminal emulators support OSC 52, so it is up
to the user to enable it explicitly.
---
 runtime/doc/news.txt                |  3 +++
 runtime/doc/provider.txt            | 30 ++++++++++++++++++++++++++++-
 runtime/lua/vim/clipboard/osc52.lua | 38 +++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 runtime/lua/vim/clipboard/osc52.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index fa77e8d086..985adb5b0d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -208,6 +208,9 @@ The following new APIs and features were added.
 • The |TermResponse| autocommand event can be used with |v:termresponse| to
   read escape sequence responses from the terminal.
 
+• A clipboard provider which uses OSC 52 to copy the selection to the system
+  clipboard is now bundled by default. |clipboard-osc52|
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 9e70ff8945..1b49ee3a3d 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -253,7 +253,35 @@ For Windows WSL, try this g:clipboard definition:
                 \   },
                 \   'cache_enabled': 0,
                 \ }
-
+<
+							    *clipboard-osc52*
+Nvim bundles a clipboard provider that allows copying to the system clipboard
+using OSC 52. OSC 52 is an Operating System Command control sequence that
+writes the copied text to the terminal emulator. If the terminal emulator
+supports OSC 52 then it will write the copied text into the system clipboard.
+
+This is most useful when using Nvim remotely (e.g. via ssh) as Nvim does not
+have direct access to the system clipboard in that case.
+
+Because not all terminal emulators support OSC 52, this provider must be opted
+into explicitly by setting the following |g:clipboard| definition: >lua
+
+    vim.g.clipboard = {
+      name = 'OSC 52',
+      copy = {
+        ['+'] = require('vim.clipboard.osc52').copy,
+        ['*'] = require('vim.clipboard.osc52').copy,
+      },
+      paste = {
+        ['+'] = require('vim.clipboard.osc52').paste,
+        ['*'] = require('vim.clipboard.osc52').paste,
+      },
+    }
+<
+Note that not all terminal emulators support reading from the system clipboard
+(and even for those that do, users should be aware of the security
+implications), so using OSC 52 for pasting may not be possible.
+<
 ==============================================================================
 Paste							*provider-paste* *paste*
 
diff --git a/runtime/lua/vim/clipboard/osc52.lua b/runtime/lua/vim/clipboard/osc52.lua
new file mode 100644
index 0000000000..0e8f9d378f
--- /dev/null
+++ b/runtime/lua/vim/clipboard/osc52.lua
@@ -0,0 +1,38 @@
+local M = {}
+
+function M.copy(lines)
+  local s = table.concat(lines, '\n')
+  io.stdout:write(string.format('\x1b]52;;%s\x1b\\', vim.base64.encode(s)))
+end
+
+function M.paste()
+  local contents = nil
+  local id = vim.api.nvim_create_autocmd('TermResponse', {
+    callback = function(args)
+      local resp = args.data ---@type string
+      local encoded = resp:match('\x1b%]52;%w?;([A-Za-z0-9+/=]*)')
+      if encoded then
+        contents = vim.base64.decode(encoded)
+        return true
+      end
+    end,
+  })
+
+  io.stdout:write('\x1b]52;;?\x1b\\')
+
+  vim.wait(1000, function()
+    return contents ~= nil
+  end)
+
+  -- Delete the autocommand if it didn't already delete itself
+  pcall(vim.api.nvim_del_autocmd, id)
+
+  if contents then
+    return vim.split(contents, '\n')
+  end
+
+  vim.notify('Timed out waiting for a clipboard response from the terminal', vim.log.levels.WARN)
+  return 0
+end
+
+return M
-- 
cgit 


From 4e6f559b8c5f77924fdbe2e5abd9c6aa8efad13f Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Tue, 24 Oct 2023 13:32:00 +0200
Subject: feat(extmarks): add 'invalidate' property to extmarks

Problem:  No way to have extmarks automatically removed when the range it
          is attached to is deleted.
Solution: Add new 'invalidate' property that will hide a mark when the
          entirety of its range is deleted. When "undo_restore" is set
          to false, delete the mark from the buffer instead.
---
 runtime/doc/api.txt                   | 8 +++++++-
 runtime/doc/news.txt                  | 3 +++
 runtime/lua/vim/_meta/api.lua         | 8 +++++++-
 runtime/lua/vim/_meta/api_keysets.lua | 2 ++
 4 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 4430d97fc7..2f9e8228d2 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2707,6 +2707,12 @@ nvim_buf_set_extmark({buffer}, {ns_id}, {line}, {col}, {*opts})
                     the extmark end position (if it exists) will be shifted in
                     when new text is inserted (true for right, false for
                     left). Defaults to false.
+                  • undo_restore : Restore the exact position of the mark if
+                    text around the mark was deleted and then restored by
+                    undo. Defaults to true.
+                  • invalidate : boolean that indicates whether to hide the
+                    extmark if the entirety of its range is deleted. If
+                    "undo_restore" is false, the extmark is deleted instead.
                   • priority: a priority value for the highlight group or sign
                     attribute. For example treesitter highlighting uses a
                     value of 100.
@@ -2777,7 +2783,7 @@ nvim_set_decoration_provider({ns_id}, {*opts})
     |nvim_buf_set_extmark()| can be called to add marks on a per-window or
     per-lines basis. Use the `ephemeral` key to only use the mark for the
     current screen redraw (the callback will be called again for the next
-    redraw ).
+    redraw).
 
     Note: this function should not be called often. Rather, the callbacks
     themselves can be used to throttle unneeded callbacks. the `on_start`
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index e32e1aadb6..9ddb1e91b7 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -273,6 +273,9 @@ The following changes to existing APIs or features add new behavior.
 • Extmarks can opt-out of precise undo tracking using the new "undo_restore"
   flag to |nvim_buf_set_extmark()|
 
+• Extmarks can be automatically hidden or removed using the new "invalidate"
+  flag to |nvim_buf_set_extmark()|
+
 • LSP hover and signature help now use Treesitter for highlighting of Markdown
   content.
   Note that syntax highlighting of code examples requires a matching parser
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 691da62f4f..6c6e11a0d3 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -554,6 +554,12 @@ function vim.api.nvim_buf_line_count(buffer) end
 ---                 the extmark end position (if it exists) will be shifted in
 ---                 when new text is inserted (true for right, false for
 ---                 left). Defaults to false.
+---               • undo_restore : Restore the exact position of the mark if
+---                 text around the mark was deleted and then restored by
+---                 undo. Defaults to true.
+---               • invalidate : boolean that indicates whether to hide the
+---                 extmark if the entirety of its range is deleted. If
+---                 "undo_restore" is false, the extmark is deleted instead.
 ---               • priority: a priority value for the highlight group or sign
 ---                 attribute. For example treesitter highlighting uses a
 ---                 value of 100.
@@ -1812,7 +1818,7 @@ function vim.api.nvim_set_current_win(window) end
 --- `nvim_buf_set_extmark()` can be called to add marks on a per-window or
 --- per-lines basis. Use the `ephemeral` key to only use the mark for the
 --- current screen redraw (the callback will be called again for the next
---- redraw ).
+--- redraw).
 --- Note: this function should not be called often. Rather, the callbacks
 --- themselves can be used to throttle unneeded callbacks. the `on_start`
 --- callback can return `false` to disable the provider until the next redraw.
diff --git a/runtime/lua/vim/_meta/api_keysets.lua b/runtime/lua/vim/_meta/api_keysets.lua
index 467409505e..f69e5a92c7 100644
--- a/runtime/lua/vim/_meta/api_keysets.lua
+++ b/runtime/lua/vim/_meta/api_keysets.lua
@@ -227,6 +227,7 @@ error('Cannot require a meta file')
 --- @field virt_text_hide? boolean
 --- @field hl_eol? boolean
 --- @field hl_mode? string
+--- @field invalidate? boolean
 --- @field ephemeral? boolean
 --- @field priority? integer
 --- @field right_gravity? boolean
@@ -243,6 +244,7 @@ error('Cannot require a meta file')
 --- @field conceal? string
 --- @field spell? boolean
 --- @field ui_watched? boolean
+--- @field undo_restore? boolean
 
 --- @class vim.api.keyset.user_command
 --- @field addr? any
-- 
cgit 


From 08847a9ea15a50aba041ee621d71b9884f5fea97 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 8 Nov 2023 09:33:37 -0600
Subject: refactor: move defaults into separate module (#25929)

Move default mappings and autocommands into a separate module and add
comments and docstrings to document each of the defaults.
---
 runtime/lua/vim/_defaults.lua | 166 ++++++++++++++++++++++++++++++++++++++++++
 runtime/lua/vim/_editor.lua   | 150 --------------------------------------
 2 files changed, 166 insertions(+), 150 deletions(-)
 create mode 100644 runtime/lua/vim/_defaults.lua

(limited to 'runtime')

diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua
new file mode 100644
index 0000000000..c1b50e6950
--- /dev/null
+++ b/runtime/lua/vim/_defaults.lua
@@ -0,0 +1,166 @@
+--- Default mappings
+do
+  --- Default maps for * and # in visual mode.
+  ---
+  --- See |v_star-default| and |v_#-default|
+  do
+    local function region_chunks(region)
+      local chunks = {}
+      local maxcol = vim.v.maxcol
+      for line, cols in vim.spairs(region) do
+        local endcol = cols[2] == maxcol and -1 or cols[2]
+        local chunk = vim.api.nvim_buf_get_text(0, line, cols[1], line, endcol, {})[1]
+        table.insert(chunks, chunk)
+      end
+      return chunks
+    end
+
+    local function _visual_search(cmd)
+      assert(cmd == '/' or cmd == '?')
+      local region = vim.region(
+        0,
+        '.',
+        'v',
+        vim.api.nvim_get_mode().mode:sub(1, 1),
+        vim.o.selection == 'inclusive'
+      )
+      local chunks = region_chunks(region)
+      local esc_chunks = vim
+        .iter(chunks)
+        :map(function(v)
+          return vim.fn.escape(v, cmd == '/' and [[/\]] or [[?\]])
+        end)
+        :totable()
+      local esc_pat = table.concat(esc_chunks, [[\n]])
+      local search_cmd = ([[%s\V%s%s]]):format(cmd, esc_pat, '\n')
+      return '\27' .. search_cmd
+    end
+
+    vim.keymap.set('x', '*', function()
+      return _visual_search('/')
+    end, { desc = ':help v_star-default', expr = true, silent = true })
+    vim.keymap.set('x', '#', function()
+      return _visual_search('?')
+    end, { desc = ':help v_#-default', expr = true, silent = true })
+  end
+
+  --- Map Y to y$. This mimics the behavior of D and C. See |Y-default|
+  vim.keymap.set('n', 'Y', 'y$', { desc = ':help Y-default' })
+
+  --- Use normal! <C-L> to prevent inserting raw <C-L> when using i_<C-O>. #17473
+  ---
+  --- See |CTRL-L-default|
+  vim.keymap.set('n', '<C-L>', '<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>', {
+    desc = ':help CTRL-L-default',
+  })
+
+  --- Set undo points when deleting text in insert mode.
+  ---
+  --- See |i_CTRL-U-default| and |i_CTRL-W-default|
+  vim.keymap.set('i', '<C-U>', '<C-G>u<C-U>', { desc = ':help i_CTRL-U-default' })
+  vim.keymap.set('i', '<C-W>', '<C-G>u<C-W>', { desc = ':help i_CTRL-W-default' })
+
+  --- Use the same flags as the previous substitution with &.
+  ---
+  --- Use : instead of <Cmd> so that ranges are supported. #19365
+  ---
+  --- See |&-default|
+  vim.keymap.set('n', '&', ':&&<CR>', { desc = ':help &-default' })
+
+  --- Map |gx| to call |vim.ui.open| on the identifier under the cursor
+  do
+    -- TODO: use vim.region() when it lands... #13896 #16843
+    local function get_visual_selection()
+      local save_a = vim.fn.getreginfo('a')
+      vim.cmd([[norm! "ay]])
+      local selection = vim.fn.getreg('a', 1)
+      vim.fn.setreg('a', save_a)
+      return selection
+    end
+
+    local function do_open(uri)
+      local _, err = vim.ui.open(uri)
+      if err then
+        vim.notify(err, vim.log.levels.ERROR)
+      end
+    end
+
+    local gx_desc =
+      'Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)'
+    vim.keymap.set({ 'n' }, 'gx', function()
+      do_open(vim.fn.expand('<cfile>'))
+    end, { desc = gx_desc })
+    vim.keymap.set({ 'x' }, 'gx', function()
+      do_open(get_visual_selection())
+    end, { desc = gx_desc })
+  end
+end
+
+--- Default menus
+do
+  --- Right click popup menu
+  -- TODO VimScript, no l10n
+  vim.cmd([[
+    aunmenu *
+    vnoremenu PopUp.Cut                     "+x
+    vnoremenu PopUp.Copy                    "+y
+    anoremenu PopUp.Paste                   "+gP
+    vnoremenu PopUp.Paste                   "+P
+    vnoremenu PopUp.Delete                  "_x
+    nnoremenu PopUp.Select\ All             ggVG
+    vnoremenu PopUp.Select\ All             gg0oG$
+    inoremenu PopUp.Select\ All             <C-Home><C-O>VG
+    anoremenu PopUp.-1-                     <Nop>
+    anoremenu PopUp.How-to\ disable\ mouse  <Cmd>help disable-mouse<CR>
+  ]])
+end
+
+--- Default autocommands. See |default-autocmds|
+do
+  local nvim_terminal_augroup = vim.api.nvim_create_augroup('nvim_terminal', {})
+  vim.api.nvim_create_autocmd('BufReadCmd', {
+    pattern = 'term://*',
+    group = nvim_terminal_augroup,
+    desc = 'Treat term:// buffers as terminal buffers',
+    nested = true,
+    command = "if !exists('b:term_title')|call termopen(matchstr(expand(\"<amatch>\"), '\\c\\mterm://\\%(.\\{-}//\\%(\\d\\+:\\)\\?\\)\\?\\zs.*'), {'cwd': expand(get(matchlist(expand(\"<amatch>\"), '\\c\\mterm://\\(.\\{-}\\)//'), 1, ''))})",
+  })
+
+  vim.api.nvim_create_autocmd({ 'TermClose' }, {
+    group = nvim_terminal_augroup,
+    desc = 'Automatically close terminal buffers when started with no arguments and exiting without an error',
+    callback = function(args)
+      if vim.v.event.status == 0 then
+        local info = vim.api.nvim_get_chan_info(vim.bo[args.buf].channel)
+        local argv = info.argv or {}
+        if #argv == 1 and argv[1] == vim.o.shell then
+          vim.cmd({ cmd = 'bdelete', args = { args.buf }, bang = true })
+        end
+      end
+    end,
+  })
+
+  vim.api.nvim_create_autocmd('CmdwinEnter', {
+    pattern = '[:>]',
+    desc = 'Limit syntax sync to maxlines=1 in the command window',
+    group = vim.api.nvim_create_augroup('nvim_cmdwin', {}),
+    command = 'syntax sync minlines=1 maxlines=1',
+  })
+
+  vim.api.nvim_create_autocmd('SwapExists', {
+    pattern = '*',
+    desc = 'Skip the swapfile prompt when the swapfile is owned by a running Nvim process',
+    group = vim.api.nvim_create_augroup('nvim_swapfile', {}),
+    callback = function()
+      local info = vim.fn.swapinfo(vim.v.swapname)
+      local user = vim.uv.os_get_passwd().username
+      local iswin = 1 == vim.fn.has('win32')
+      if info.error or info.pid <= 0 or (not iswin and info.user ~= user) then
+        vim.v.swapchoice = '' -- Show the prompt.
+        return
+      end
+      vim.v.swapchoice = 'e' -- Choose "(E)dit".
+      vim.notify(('W325: Ignoring swapfile from Nvim process %d'):format(info.pid))
+    end,
+  })
+end
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 0bdf0c90a5..98a1ce79ed 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -1031,156 +1031,6 @@ function vim.deprecate(name, alternative, version, plugin, backtrace)
   return displayed and msg or nil
 end
 
---- Creates builtin mappings (incl. menus).
---- Called once on startup.
-function vim._init_default_mappings()
-  -- mappings
-
-  local function region_chunks(region)
-    local chunks = {}
-    local maxcol = vim.v.maxcol
-    for line, cols in vim.spairs(region) do
-      local endcol = cols[2] == maxcol and -1 or cols[2]
-      local chunk = vim.api.nvim_buf_get_text(0, line, cols[1], line, endcol, {})[1]
-      table.insert(chunks, chunk)
-    end
-    return chunks
-  end
-
-  local function _visual_search(cmd)
-    assert(cmd == '/' or cmd == '?')
-    local region = vim.region(
-      0,
-      '.',
-      'v',
-      vim.api.nvim_get_mode().mode:sub(1, 1),
-      vim.o.selection == 'inclusive'
-    )
-    local chunks = region_chunks(region)
-    local esc_chunks = vim
-      .iter(chunks)
-      :map(function(v)
-        return vim.fn.escape(v, cmd == '/' and [[/\]] or [[?\]])
-      end)
-      :totable()
-    local esc_pat = table.concat(esc_chunks, [[\n]])
-    local search_cmd = ([[%s\V%s%s]]):format(cmd, esc_pat, '\n')
-    return '\27' .. search_cmd
-  end
-
-  local function map(mode, lhs, rhs)
-    vim.keymap.set(mode, lhs, rhs, { desc = 'Nvim builtin' })
-  end
-
-  map('n', 'Y', 'y$')
-  -- Use normal! <C-L> to prevent inserting raw <C-L> when using i_<C-O>. #17473
-  map('n', '<C-L>', '<Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>')
-  map('i', '<C-U>', '<C-G>u<C-U>')
-  map('i', '<C-W>', '<C-G>u<C-W>')
-  vim.keymap.set('x', '*', function()
-    return _visual_search('/')
-  end, { desc = ':help v_star-default', expr = true, silent = true })
-  vim.keymap.set('x', '#', function()
-    return _visual_search('?')
-  end, { desc = ':help v_#-default', expr = true, silent = true })
-  -- Use : instead of <Cmd> so that ranges are supported. #19365
-  map('n', '&', ':&&<CR>')
-
-  -- gx
-
-  -- TODO: use vim.region() when it lands... #13896 #16843
-  local function get_visual_selection()
-    local save_a = vim.fn.getreginfo('a')
-    vim.cmd([[norm! "ay]])
-    local selection = vim.fn.getreg('a', 1)
-    vim.fn.setreg('a', save_a)
-    return selection
-  end
-
-  local function do_open(uri)
-    local _, err = vim.ui.open(uri)
-    if err then
-      vim.notify(err, vim.log.levels.ERROR)
-    end
-  end
-
-  local gx_desc =
-    'Opens filepath or URI under cursor with the system handler (file explorer, web browser, …)'
-  vim.keymap.set({ 'n' }, 'gx', function()
-    do_open(vim.fn.expand('<cfile>'))
-  end, { desc = gx_desc })
-  vim.keymap.set({ 'x' }, 'gx', function()
-    do_open(get_visual_selection())
-  end, { desc = gx_desc })
-
-  -- menus
-
-  -- TODO VimScript, no l10n
-  vim.cmd([[
-    aunmenu *
-    vnoremenu PopUp.Cut                     "+x
-    vnoremenu PopUp.Copy                    "+y
-    anoremenu PopUp.Paste                   "+gP
-    vnoremenu PopUp.Paste                   "+P
-    vnoremenu PopUp.Delete                  "_x
-    nnoremenu PopUp.Select\ All             ggVG
-    vnoremenu PopUp.Select\ All             gg0oG$
-    inoremenu PopUp.Select\ All             <C-Home><C-O>VG
-    anoremenu PopUp.-1-                     <Nop>
-    anoremenu PopUp.How-to\ disable\ mouse  <Cmd>help disable-mouse<CR>
-  ]])
-end
-
-function vim._init_default_autocmds()
-  local nvim_terminal_augroup = vim.api.nvim_create_augroup('nvim_terminal', {})
-  vim.api.nvim_create_autocmd({ 'BufReadCmd' }, {
-    pattern = 'term://*',
-    group = nvim_terminal_augroup,
-    nested = true,
-    command = "if !exists('b:term_title')|call termopen(matchstr(expand(\"<amatch>\"), '\\c\\mterm://\\%(.\\{-}//\\%(\\d\\+:\\)\\?\\)\\?\\zs.*'), {'cwd': expand(get(matchlist(expand(\"<amatch>\"), '\\c\\mterm://\\(.\\{-}\\)//'), 1, ''))})",
-  })
-  vim.api.nvim_create_autocmd({ 'TermClose' }, {
-    group = nvim_terminal_augroup,
-    desc = 'Automatically close terminal buffers when started with no arguments and exiting without an error',
-    callback = function(args)
-      if vim.v.event.status == 0 then
-        local info = vim.api.nvim_get_chan_info(vim.bo[args.buf].channel)
-        local argv = info.argv or {}
-        if #argv == 1 and argv[1] == vim.o.shell then
-          vim.cmd({ cmd = 'bdelete', args = { args.buf }, bang = true })
-        end
-      end
-    end,
-  })
-
-  vim.api.nvim_create_autocmd({ 'CmdwinEnter' }, {
-    pattern = '[:>]',
-    group = vim.api.nvim_create_augroup('nvim_cmdwin', {}),
-    command = 'syntax sync minlines=1 maxlines=1',
-  })
-
-  vim.api.nvim_create_autocmd({ 'SwapExists' }, {
-    pattern = '*',
-    group = vim.api.nvim_create_augroup('nvim_swapfile', {}),
-    callback = function()
-      local info = vim.fn.swapinfo(vim.v.swapname)
-      local user = vim.uv.os_get_passwd().username
-      local iswin = 1 == vim.fn.has('win32')
-      if info.error or info.pid <= 0 or (not iswin and info.user ~= user) then
-        vim.v.swapchoice = '' -- Show the prompt.
-        return
-      end
-      vim.v.swapchoice = 'e' -- Choose "(E)dit".
-      vim.notify(('W325: Ignoring swapfile from Nvim process %d'):format(info.pid))
-    end,
-  })
-end
-
-function vim._init_defaults()
-  vim._init_default_mappings()
-  vim._init_default_autocmds()
-end
-
 require('vim._options')
 
 -- Remove at Nvim 1.0
-- 
cgit 


From 3128cff6b198daabfddeedd382c0b8707319504f Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 8 Nov 2023 12:42:47 -0600
Subject: fix(clipboard): increase OSC 52 wait timeout (#25936)

When pasting with OSC 52 some terminals show a prompt to the user asking
for permission to read from the system clipboard. When this prompt
appears, 1s is not long enough to wait.

Increase the timeout to 10s and show a message to the user indicating
how to interrupt the wait after 1s.
---
 runtime/lua/vim/clipboard/osc52.lua | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/clipboard/osc52.lua b/runtime/lua/vim/clipboard/osc52.lua
index 0e8f9d378f..78f5754c30 100644
--- a/runtime/lua/vim/clipboard/osc52.lua
+++ b/runtime/lua/vim/clipboard/osc52.lua
@@ -20,19 +20,41 @@ function M.paste()
 
   io.stdout:write('\x1b]52;;?\x1b\\')
 
-  vim.wait(1000, function()
+  local ok, res
+
+  -- Wait 1s first for terminals that respond quickly
+  ok, res = vim.wait(1000, function()
     return contents ~= nil
   end)
 
-  -- Delete the autocommand if it didn't already delete itself
-  pcall(vim.api.nvim_del_autocmd, id)
+  if res == -1 then
+    -- If no response was received after 1s, print a message and keep waiting
+    vim.api.nvim_echo(
+      { { 'Waiting for OSC 52 response from the terminal. Press Ctrl-C to interrupt...' } },
+      false,
+      {}
+    )
+    ok, res = vim.wait(9000, function()
+      return contents ~= nil
+    end)
+  end
 
-  if contents then
-    return vim.split(contents, '\n')
+  if not ok then
+    vim.api.nvim_del_autocmd(id)
+    if res == -1 then
+      vim.notify(
+        'Timed out waiting for a clipboard response from the terminal',
+        vim.log.levels.WARN
+      )
+    elseif res == -2 then
+      -- Clear message area
+      vim.api.nvim_echo({ { '' } }, false, {})
+    end
+    return 0
   end
 
-  vim.notify('Timed out waiting for a clipboard response from the terminal', vim.log.levels.WARN)
-  return 0
+  -- If we get here, contents should be non-nil
+  return vim.split(assert(contents), '\n')
 end
 
 return M
-- 
cgit 


From f7b2ea59a633309aba1ca5286e33d789a45cb13f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 06:34:34 +0800
Subject: vim-patch:9.0.2095: statusline may look different than expected
 (#25941)

Problem:  statusline may look different than expected
Solution: do not check for highlighting of stl and stlnc characters

statusline fillchar may be different than expected

If the highlighting group for the statusline for the current window
|hl-StatusLine| or the non-current window |hl-StatusLineNC| are cleared
(or do not differ from each other), than Vim will use the hard-coded
fallback values '^' (for the non-current windows) or '=' (for the
current window).  I believe this was done, to make sure the statusline
will always be visible and be distinguishable from the rest of the
window.

However, this may be unexpected, if a user explicitly defined those
fillchar characters just to notice that those values are then not used
by Vim.

So, let's assume users know what they are doing and just always return
the configured stl and stlnc values.  And if they want the statusline to
be non-distinguishable from the rest of the window space, so be it.  It
is their responsibility and Vim shall not know better what to use.

fixes: vim/vim#13366
closes: vim/vim#13488

https://github.com/vim/vim/commit/6a650bf696f1df3214b3d788947447c5bbf1a77d

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/options.txt           | 6 ++----
 runtime/doc/vim_diff.txt          | 4 ----
 runtime/lua/vim/_meta/options.lua | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b2a020cf9d..d92e528214 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2521,10 +2521,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	default to single-byte alternatives.
 
 	Example: >
-	    :set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:-
-<	This is similar to the default, except that these characters will also
-	be used when there is highlighting.
-
+	    :set fillchars=stl:\ ,stlnc:\ ,vert:│,fold:·,diff:-
+<
 	For the "stl", "stlnc", "foldopen", "foldclose" and "foldsep" items
 	single-byte and multibyte characters are supported.  But double-width
 	characters are not supported.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index efebf46d85..1e12ccd7cc 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -550,10 +550,6 @@ Vimscript compatibility:
   `shell_error` does not alias to |v:shell_error|
   `this_session` does not alias to |v:this_session|
 
-UI/Display:
-  'statusline' always uses the "stl" and "stlnc" fields of 'fillchars', even
-  if they are the same and |hl-StatusLine| and |hl-StatusLineNC| are equal.
-
 Working directory (Vim implemented some of these after Nvim):
 - |DirChanged| and |DirChangedPre| can be triggered when switching to another
   window or tab.
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index a986cd752c..53f7166b3d 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -2217,10 +2217,8 @@ vim.bo.ft = vim.bo.filetype
 ---
 --- Example:
 --- ```
----     :set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:-
+---     :set fillchars=stl:\ ,stlnc:\ ,vert:│,fold:·,diff:-
 --- ```
---- This is similar to the default, except that these characters will also
---- be used when there is highlighting.
 ---
 --- For the "stl", "stlnc", "foldopen", "foldclose" and "foldsep" items
 --- single-byte and multibyte characters are supported.  But double-width
-- 
cgit 


From 89d785e53015d7ba6a7f10e97a750b8d3431d3a9 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 07:19:21 +0800
Subject: vim-patch:ca48202b6f46

runtime(termdebug): improve window handling, shorten var types

closes vim/vim#13474

https://github.com/vim/vim/commit/ca48202b6f46cfb40a0d1d80033a2f3e8cb7b813

Co-authored-by: shane.xb.qian <shane.qian@foxmail.com>
---
 runtime/doc/nvim_terminal_emulator.txt             |  6 +++++
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 26 +++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 2f7197e2ef..4326414ff7 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -421,6 +421,9 @@ If you want the Asm window shown by default, set the "disasm_window" flag to
 If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_disasm_window = 15
 Any value greater than 1 will set the Asm window height to that value.
+If the current window has enough horizontal space, it will be vertically split
+and the Asm window will be shown side by side with the source code window (and
+the height option won't be used).
 
 						*termdebug_variables_window*
 If you want the Var window shown by default, set the "variables_window" flag
@@ -431,6 +434,9 @@ height: >vim
 If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_variables_window = 15
 Any value greater than 1 will set the Var window height to that value.
+If the current window has enough horizontal space, it will be vertically split
+and the Var window will be shown side by side with the source code window (and
+the height options won't be used).
 
 Communication ~
 						*termdebug-communication*
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index a0710476a9..0deea4f6f7 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -894,7 +894,9 @@ func s:ParseVarinfo(varinfo)
   let nameIdx = matchstrpos(a:varinfo, '{name="\([^"]*\)"')
   let dict['name'] = a:varinfo[nameIdx[1] + 7 : nameIdx[2] - 2]
   let typeIdx = matchstrpos(a:varinfo, ',type="\([^"]*\)"')
-  let dict['type'] = a:varinfo[typeIdx[1] + 7 : typeIdx[2] - 2]
+  " 'type' maybe is a url-like string,
+  " try to shorten it and show only the /tail
+  let dict['type'] = (a:varinfo[typeIdx[1] + 7 : typeIdx[2] - 2])->fnamemodify(':t')
   let valueIdx = matchstrpos(a:varinfo, ',value="\(.*\)"}')
   if valueIdx[1] == -1
     let dict['value'] = 'Complex value'
@@ -1556,8 +1558,15 @@ endfunc
 
 func s:GotoAsmwinOrCreateIt()
   if !win_gotoid(s:asmwin)
+    let mdf = ''
     if win_gotoid(s:sourcewin)
-      exe 'rightbelow new'
+      " 60 is approx spaceBuffer * 3
+      if winwidth(0) > (78 + 60)
+        let mdf = 'vert'
+        exe mdf .. ' ' .. 60 .. 'new'
+      else
+        exe 'rightbelow new'
+      endif
     else
       exe 'new'
     endif
@@ -1579,7 +1588,7 @@ func s:GotoAsmwinOrCreateIt()
       let s:asmbuf = bufnr('Termdebug-asm-listing')
     endif
 
-    if s:GetDisasmWindowHeight() > 0
+    if mdf != 'vert' && s:GetDisasmWindowHeight() > 0
       exe 'resize ' .. s:GetDisasmWindowHeight()
     endif
   endif
@@ -1619,8 +1628,15 @@ endfunc
 
 func s:GotoVariableswinOrCreateIt()
   if !win_gotoid(s:varwin)
+    let mdf = ''
     if win_gotoid(s:sourcewin)
-      exe 'rightbelow new'
+      " 60 is approx spaceBuffer * 3
+      if winwidth(0) > (78 + 60)
+        let mdf = 'vert'
+        exe mdf .. ' ' .. 60 .. 'new'
+      else
+        exe 'rightbelow new'
+      endif
     else
       exe 'new'
     endif
@@ -1641,7 +1657,7 @@ func s:GotoVariableswinOrCreateIt()
       let s:varbuf = bufnr('Termdebug-variables-listing')
     endif
 
-    if s:GetVariablesWindowHeight() > 0
+    if mdf != 'vert' && s:GetVariablesWindowHeight() > 0
       exe 'resize ' .. s:GetVariablesWindowHeight()
     endif
   endif
-- 
cgit 


From 77bb69d7b0d1ae8d9526b658eeea07b2d58ae78d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 08:38:25 +0800
Subject: vim-patch:7fbbd7fdc6df (#25944)

runtime(termdebug):  handle buffer-local mappings properly

closes: vim/vim#13475

https://github.com/vim/vim/commit/7fbbd7fdc6df9dc198b3735cfbe8dbe8afd646f9

Co-authored-by: shane.xb.qian <shane.qian@foxmail.com>
---
 runtime/doc/nvim_terminal_emulator.txt             | 12 ++++++---
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   | 31 +++++++++++++++-------
 2 files changed, 29 insertions(+), 14 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 4326414ff7..d961ebb696 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -399,18 +399,22 @@ Prompt mode can be used with: >vim
 If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_use_prompt = 1
 <
-						*termdebug_map_K*
-The K key is normally mapped to |:Evaluate|. If you do not want this use: >vim
+Mappings ~
+					*termdebug_map_K* *termdebug-mappings*
+The K key is normally mapped to |:Evaluate| unless there already exists a
+buffer local mapping to K |:map-local|.  If you do not want this use: >vim
 	let g:termdebug_config['map_K'] = 0
 If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_map_K = 0
 <
 						*termdebug_map_minus*
-The - key is normally mapped to |:Down|. If you do not want this use: >vim
+The - key is normally mapped to |:Down| unless there already exists a buffer
+local mapping to the - key.  If you do not want this use: >vim
 	let g:termdebug_config['map_minus'] = 0
 <
 						*termdebug_map_plus*
-The + key is normally mapped to |:Up|. If you do not want this use: >vim
+The + key is normally mapped to |:Up| unless there already exists a buffer
+local mapping to the + key.  If you do not want this use: >vim
 	let g:termdebug_config['map_plus'] = 0
 <
 						*termdebug_disasm_window*
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 0deea4f6f7..73fbc8c922 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -2,7 +2,7 @@
 "
 " Author: Bram Moolenaar
 " Copyright: Vim license applies, see ":help license"
-" Last Change: 2023 Aug 23
+" Last Change: 2023 Nov 02
 "
 " WORK IN PROGRESS - The basics works stable, more to come
 " Note: In general you need at least GDB 7.12 because this provides the
@@ -1024,7 +1024,9 @@ func s:InstallCommands()
   endif
   if map
     let s:k_map_saved = maparg('K', 'n', 0, 1)
-    nnoremap K :Evaluate<CR>
+    if !empty(s:k_map_saved) && !s:k_map_saved.buffer || empty(s:k_map_saved)
+      nnoremap K :Evaluate<CR>
+    endif
   endif
 
   let map = 1
@@ -1033,7 +1035,9 @@ func s:InstallCommands()
   endif
   if map
     let s:plus_map_saved = maparg('+', 'n', 0, 1)
-    nnoremap <expr> + $'<Cmd>{v:count1}Up<CR>'
+    if !empty(s:plus_map_saved) && !s:plus_map_saved.buffer || empty(s:plus_map_saved)
+      nnoremap <expr> + $'<Cmd>{v:count1}Up<CR>'
+    endif
   endif
 
   let map = 1
@@ -1042,7 +1046,9 @@ func s:InstallCommands()
   endif
   if map
     let s:minus_map_saved = maparg('-', 'n', 0, 1)
-    nnoremap <expr> - $'<Cmd>{v:count1}Down<CR>'
+    if !empty(s:minus_map_saved) && !s:minus_map_saved.buffer || empty(s:minus_map_saved)
+      nnoremap <expr> - $'<Cmd>{v:count1}Down<CR>'
+    endif
   endif
 
 
@@ -1108,29 +1114,32 @@ func s:DeleteCommands()
   delcommand Winbar
 
   if exists('s:k_map_saved')
-    if empty(s:k_map_saved)
+    if !empty(s:k_map_saved) && !s:k_map_saved.buffer
       nunmap K
-    else
       " call mapset(s:k_map_saved)
       call mapset('n', 0, s:k_map_saved)
+    elseif empty(s:k_map_saved)
+      nunmap K
     endif
     unlet s:k_map_saved
   endif
   if exists('s:plus_map_saved')
-    if empty(s:plus_map_saved)
+    if !empty(s:plus_map_saved) && !s:plus_map_saved.buffer
       nunmap +
-    else
       " call mapset(s:plus_map_saved)
       call mapset('n', 0, s:plus_map_saved)
+    elseif empty(s:plus_map_saved)
+      nunmap +
     endif
     unlet s:plus_map_saved
   endif
   if exists('s:minus_map_saved')
-    if empty(s:minus_map_saved)
+    if !empty(s:minus_map_saved) && !s:minus_map_saved.buffer
       nunmap -
-    else
       " call mapset(s:minus_map_saved)
       call mapset('n', 0, s:minus_map_saved)
+    elseif empty(s:minus_map_saved)
+      nunmap -
     endif
     unlet s:minus_map_saved
   endif
@@ -1926,3 +1935,5 @@ call s:InitAutocmd()
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
+
+" vim: sw=2 sts=2 et
-- 
cgit 


From 610f50ddaff260e2e2f7236f6a3982ee7554c2a6 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 15:46:14 +0800
Subject: vim-patch:20a94f44b3cd (#25946)

runtime(doc): fix grammar in termdebug doc, remove trailing spaces (vim/vim#13505)

https://github.com/vim/vim/commit/20a94f44b3cd4a33fb7d2ce5faf07a5244ba2cae
---
 runtime/doc/nvim_terminal_emulator.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index d961ebb696..f038163ec2 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -401,20 +401,20 @@ If there is no g:termdebug_config you can use: >vim
 <
 Mappings ~
 					*termdebug_map_K* *termdebug-mappings*
-The K key is normally mapped to |:Evaluate| unless there already exists a
-buffer local mapping to K |:map-local|.  If you do not want this use: >vim
+The K key is normally mapped to |:Evaluate| unless a buffer local (|:map-local|)
+mapping to K already exists.  If you do not want this use: >vim
 	let g:termdebug_config['map_K'] = 0
 If there is no g:termdebug_config you can use: >vim
 	let g:termdebug_map_K = 0
 <
 						*termdebug_map_minus*
-The - key is normally mapped to |:Down| unless there already exists a buffer
-local mapping to the - key.  If you do not want this use: >vim
+The - key is normally mapped to |:Down| unless a buffer local mapping to the -
+key already exists.  If you do not want this use: >vim
 	let g:termdebug_config['map_minus'] = 0
 <
 						*termdebug_map_plus*
-The + key is normally mapped to |:Up| unless there already exists a buffer
-local mapping to the + key.  If you do not want this use: >vim
+The + key is normally mapped to |:Up| unless a buffer local mapping to the +
+key already exists.  If you do not want this use: >vim
 	let g:termdebug_config['map_plus'] = 0
 <
 						*termdebug_disasm_window*
-- 
cgit 


From a4b80c71eae09a5f6f76bce46be46efd247c7223 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 15:17:53 +0800
Subject: vim-patch:8.2.4140: maparg() does not indicate the type of script

Problem:    maparg() does not indicate the type of script where it was defined.
Solution:   Add "scriptversion".

https://github.com/vim/vim/commit/a9528b39a666dbaa026320f73bae4b1628a7fe51

Co-authored-by: Bram Moolenaar <Bram@vim.org>
---
 runtime/doc/builtin.txt         | 1 +
 runtime/lua/vim/_meta/vimfn.lua | 1 +
 2 files changed, 2 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 35c94d6c74..06e6be41bc 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4180,6 +4180,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 				     (|mapmode-ic|)
 		  "sid"	     The script local ID, used for <sid> mappings
 			     (|<SID>|).  Negative for special contexts.
+		  "scriptversion"  The version of the script, always 1.
 		  "lnum"     The line number in "sid", zero if unknown.
 		  "nowait"   Do not wait for other, longer mappings.
 			     (|:map-<nowait>|).
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 0563f9dd5f..817841eb46 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5041,6 +5041,7 @@ function vim.fn.map(expr1, expr2) end
 ---          (|mapmode-ic|)
 ---   "sid"       The script local ID, used for <sid> mappings
 ---        (|<SID>|).  Negative for special contexts.
+---   "scriptversion"  The version of the script, always 1.
 ---   "lnum"     The line number in "sid", zero if unknown.
 ---   "nowait"   Do not wait for other, longer mappings.
 ---        (|:map-<nowait>|).
-- 
cgit 


From 2dfcd5a22b8f26091aa7398fdb8b0ea70ed7b28d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 18:16:49 +0800
Subject: vim-patch:8.2.4820: not simple programmatic way to find a specific
 mapping

Problem:    Not simple programmatic way to find a specific mapping.
Solution:   Add getmappings(). (Ernie Rael, closes vim/vim#10273)

https://github.com/vim/vim/commit/659c240cf769925ff432b88df8719e7ace4629b0

Co-authored-by: Ernie Rael <errael@raelity.com>
---
 runtime/doc/builtin.txt         | 12 +++++++++++-
 runtime/doc/usr_41.txt          |  1 +
 runtime/lua/vim/_meta/vimfn.lua | 14 +++++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 06e6be41bc..6b34a49891 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2612,6 +2612,16 @@ getloclist({nr} [, {what}])                                       *getloclist()*
 			echo getloclist(5, {'filewinid': 0})
 <
 
+getmappings()                                                    *getmappings()*
+		Returns a |List| of all mappings.  Each List item is a |Dict|,
+		the same as what is returned by |maparg()|, see
+		|mapping-dict|.
+
+		Example to show all mappings with "MultiMatch" in rhs: >
+			echo getmappings()->filter({_, m ->
+				\ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
+				\ })
+
 getmarklist([{buf}])                                             *getmarklist()*
 		Without the {buf} argument returns a |List| with information
 		about all the global marks. |mark|
@@ -4161,7 +4171,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 
 		When {dict} is there and it is |TRUE| return a dictionary
 		containing all the information of the mapping with the
-		following items:
+		following items:			*mapping-dict*
 		  "lhs"	     The {lhs} of the mapping as it would be typed
 		  "lhsraw"   The {lhs} of the mapping as raw bytes
 		  "lhsrawalt" The {lhs} of the mapping as raw bytes, alternate
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index c8b31b2d5b..9fe81f56b6 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1012,6 +1012,7 @@ Mappings and Menus:			    *mapping-functions*
 	digraph_getlist()	get all |digraph|s
 	digraph_set()		register |digraph|
 	digraph_setlist()	register multiple |digraph|s
+	getmappings()		get list of all mappings
 	hasmapto()		check if a mapping exists
 	mapcheck()		check if a matching mapping exists
 	maparg()		get rhs of a mapping
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 817841eb46..f54606b225 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3175,6 +3175,18 @@ function vim.fn.getline(lnum, end_) end
 --- @return any
 function vim.fn.getloclist(nr, what) end
 
+--- Returns a |List| of all mappings.  Each List item is a |Dict|,
+--- the same as what is returned by |maparg()|, see
+--- |mapping-dict|.
+---
+--- Example to show all mappings with "MultiMatch" in rhs: >
+---   echo getmappings()->filter({_, m ->
+---     \ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
+---     \ })
+---
+--- @return any
+function vim.fn.getmappings() end
+
 --- Without the {buf} argument returns a |List| with information
 --- about all the global marks. |mark|
 ---
@@ -5022,7 +5034,7 @@ function vim.fn.map(expr1, expr2) end
 ---
 --- When {dict} is there and it is |TRUE| return a dictionary
 --- containing all the information of the mapping with the
---- following items:
+--- following items:      *mapping-dict*
 ---   "lhs"       The {lhs} of the mapping as it would be typed
 ---   "lhsraw"   The {lhs} of the mapping as raw bytes
 ---   "lhsrawalt" The {lhs} of the mapping as raw bytes, alternate
-- 
cgit 


From d4dbfb092b370bced6728e07a38661a579ff5e4b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 19:36:58 +0800
Subject: vim-patch:8.2.4825: can only get a list of mappings

Problem:    Can only get a list of mappings.
Solution:   Add the optional {abbr} argument. (Ernie Rael, closes vim/vim#10277)
            Rename to maplist().  Rename test file.

https://github.com/vim/vim/commit/09661203ecefbee6a6f09438afcff1843e9dbfb4

Co-authored-by: Ernie Rael <errael@raelity.com>
---
 runtime/doc/builtin.txt         | 24 +++++++++++++-----------
 runtime/doc/usr_41.txt          |  2 +-
 runtime/lua/vim/_meta/vimfn.lua | 28 +++++++++++++++-------------
 3 files changed, 29 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 6b34a49891..5d21b405df 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -2612,16 +2612,6 @@ getloclist({nr} [, {what}])                                       *getloclist()*
 			echo getloclist(5, {'filewinid': 0})
 <
 
-getmappings()                                                    *getmappings()*
-		Returns a |List| of all mappings.  Each List item is a |Dict|,
-		the same as what is returned by |maparg()|, see
-		|mapping-dict|.
-
-		Example to show all mappings with "MultiMatch" in rhs: >
-			echo getmappings()->filter({_, m ->
-				\ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
-				\ })
-
 getmarklist([{buf}])                                             *getmarklist()*
 		Without the {buf} argument returns a |List| with information
 		about all the global marks. |mark|
@@ -4143,7 +4133,8 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 		When {dict} is omitted or zero: Return the rhs of mapping
 		{name} in mode {mode}.  The returned String has special
 		characters translated like in the output of the ":map" command
-		listing.
+		listing. When {dict} is TRUE a dictionary is returned, see
+		below. To get a list of all mappings see |maplist()|.
 
 		When there is no mapping for {name}, an empty String is
 		returned if {dict} is FALSE, otherwise returns an empty Dict.
@@ -4237,6 +4228,17 @@ mapcheck({name} [, {mode} [, {abbr}]])                              *mapcheck()*
 <		This avoids adding the "_vv" mapping when there already is a
 		mapping for "_v" or for "_vvv".
 
+maplist([{abbr}])                                                    *maplist()*
+		Returns a |List| of all mappings.  Each List item is a |Dict|,
+		the same as what is returned by |maparg()|, see
+		|mapping-dict|.  When {abbr} is there and it is |TRUE| use
+		abbreviations instead of mappings.
+
+		Example to show all mappings with "MultiMatch" in rhs: >vim
+			echo maplist()->filter({_, m ->
+				\ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
+				\ })
+
 mapnew({expr1}, {expr2})                                              *mapnew()*
 		Like |map()| but instead of replacing items in {expr1} a new
 		List or Dictionary is created and returned.  {expr1} remains
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 9fe81f56b6..e206a804f4 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1012,10 +1012,10 @@ Mappings and Menus:			    *mapping-functions*
 	digraph_getlist()	get all |digraph|s
 	digraph_set()		register |digraph|
 	digraph_setlist()	register multiple |digraph|s
-	getmappings()		get list of all mappings
 	hasmapto()		check if a mapping exists
 	mapcheck()		check if a matching mapping exists
 	maparg()		get rhs of a mapping
+	maplist()		get list of all mappings
 	mapset()		restore a mapping
 	menu_info()		get information about a menu item
 	wildmenumode()		check if the wildmode is active
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index f54606b225..3293b71977 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -3175,18 +3175,6 @@ function vim.fn.getline(lnum, end_) end
 --- @return any
 function vim.fn.getloclist(nr, what) end
 
---- Returns a |List| of all mappings.  Each List item is a |Dict|,
---- the same as what is returned by |maparg()|, see
---- |mapping-dict|.
----
---- Example to show all mappings with "MultiMatch" in rhs: >
----   echo getmappings()->filter({_, m ->
----     \ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
----     \ })
----
---- @return any
-function vim.fn.getmappings() end
-
 --- Without the {buf} argument returns a |List| with information
 --- about all the global marks. |mark|
 ---
@@ -5006,7 +4994,8 @@ function vim.fn.map(expr1, expr2) end
 --- When {dict} is omitted or zero: Return the rhs of mapping
 --- {name} in mode {mode}.  The returned String has special
 --- characters translated like in the output of the ":map" command
---- listing.
+--- listing. When {dict} is TRUE a dictionary is returned, see
+--- below. To get a list of all mappings see |maplist()|.
 ---
 --- When there is no mapping for {name}, an empty String is
 --- returned if {dict} is FALSE, otherwise returns an empty Dict.
@@ -5112,6 +5101,19 @@ function vim.fn.maparg(name, mode, abbr, dict) end
 --- @return any
 function vim.fn.mapcheck(name, mode, abbr) end
 
+--- Returns a |List| of all mappings.  Each List item is a |Dict|,
+--- the same as what is returned by |maparg()|, see
+--- |mapping-dict|.  When {abbr} is there and it is |TRUE| use
+--- abbreviations instead of mappings.
+---
+--- Example to show all mappings with "MultiMatch" in rhs: >vim
+---   echo maplist()->filter({_, m ->
+---     \ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
+---     \ })
+---
+--- @return any
+function vim.fn.maplist() end
+
 --- Like |map()| but instead of replacing items in {expr1} a new
 --- List or Dictionary is created and returned.  {expr1} remains
 --- unchanged.  Items can still be changed by {expr2}, if you
-- 
cgit 


From f748a73a357710db6094d4a428cd056f5df226a9 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 19:48:50 +0800
Subject: vim-patch:8.2.4861: it is not easy to restore saved mappings

Problem:    It is not easy to restore saved mappings.
Solution:   Make mapset() accept a dict argument. (Ernie Rael, closes vim/vim#10295)

https://github.com/vim/vim/commit/51d04d16f21e19d6eded98f9530d84089102f925

Co-authored-by: Ernie Rael <errael@raelity.com>
---
 runtime/doc/builtin.txt                            | 32 ++++++++++++++++---
 runtime/doc/map.txt                                |  2 +-
 runtime/lua/vim/_meta/vimfn.lua                    | 36 +++++++++++++++++-----
 .../pack/dist/opt/termdebug/plugin/termdebug.vim   |  9 ++----
 4 files changed, 60 insertions(+), 19 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5d21b405df..1eb173af58 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4185,6 +4185,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 		  "lnum"     The line number in "sid", zero if unknown.
 		  "nowait"   Do not wait for other, longer mappings.
 			     (|:map-<nowait>|).
+		  "abbr"     True if this is an |abbreviation|.
 
 		The dictionary can be used to restore a mapping with
 		|mapset()|.
@@ -4246,9 +4247,17 @@ mapnew({expr1}, {expr2})                                              *mapnew()*
 		don't want that use |deepcopy()| first.
 
 mapset({mode}, {abbr}, {dict})                                        *mapset()*
-		Restore a mapping from a dictionary returned by |maparg()|.
-		{mode} and {abbr} should be the same as for the call to
-		|maparg()|. *E460*
+		Restore a mapping from a dictionary, possibly returned by
+		|maparg()| or |maplist()|.  A buffer mapping, when dict.buffer
+		is true, is set on the current buffer; it is up to the caller
+		to ensure that the intended buffer is the current buffer. This
+		feature allows copying mappings from one buffer to another.
+		The dict.mode value may restore a single mapping that covers
+		more than one mode, like with mode values of '!', ' ', "nox",
+		or 'v'. *E1276*
+
+		In the first form, {mode} and {abbr} should be the same as
+		for the call to |maparg()|. *E460*
 		{mode} is used to define the mode in which the mapping is set,
 		not the "mode" entry in {dict}.
 		Example for saving and restoring a mapping: >vim
@@ -4257,8 +4266,21 @@ mapset({mode}, {abbr}, {dict})                                        *mapset()*
 			" ...
 			call mapset('n', 0, save_map)
 <		Note that if you are going to replace a map in several modes,
-		e.g. with `:map!`, you need to save the mapping for all of
-		them, since they can differ.
+		e.g. with `:map!`, you need to save/restore the mapping for
+		all of them, when they might differ.
+
+		In the second form, with {dict} as the only argument, mode
+		and abbr are taken from the dict.
+		Example: >vim
+			let save_maps = maplist()->filter(
+						\ {_, m -> m.lhs == 'K'})
+			nnoremap K somethingelse
+			cnoremap K somethingelse2
+			" ...
+			unmap K
+			for d in save_maps
+			    call mapset(d)
+			endfor
 
 match({expr}, {pat} [, {start} [, {count}]])                           *match()*
 		When {expr} is a |List| then this returns the index of the
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 56e58baad8..6f61259af0 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -955,7 +955,7 @@ operator to add quotes around text in the current line: >
 				\ ->setline(".")}'<CR>g@
 
 ==============================================================================
-2. Abbreviations			*abbreviations* *Abbreviations*
+2. Abbreviations		*abbreviation* *abbreviations* *Abbreviations*
 
 Abbreviations are used in Insert mode, Replace mode and Command-line mode.
 If you enter a word that is an abbreviation, it is replaced with the word it
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 3293b71977..dea2e476b6 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5046,6 +5046,7 @@ function vim.fn.map(expr1, expr2) end
 ---   "lnum"     The line number in "sid", zero if unknown.
 ---   "nowait"   Do not wait for other, longer mappings.
 ---        (|:map-<nowait>|).
+---   "abbr"     True if this is an |abbreviation|.
 ---
 --- The dictionary can be used to restore a mapping with
 --- |mapset()|.
@@ -5124,9 +5125,17 @@ function vim.fn.maplist() end
 --- @return any
 function vim.fn.mapnew(expr1, expr2) end
 
---- Restore a mapping from a dictionary returned by |maparg()|.
---- {mode} and {abbr} should be the same as for the call to
---- |maparg()|. *E460*
+--- Restore a mapping from a dictionary, possibly returned by
+--- |maparg()| or |maplist()|.  A buffer mapping, when dict.buffer
+--- is true, is set on the current buffer; it is up to the caller
+--- to ensure that the intended buffer is the current buffer. This
+--- feature allows copying mappings from one buffer to another.
+--- The dict.mode value may restore a single mapping that covers
+--- more than one mode, like with mode values of '!', ' ', "nox",
+--- or 'v'. *E1276*
+---
+--- In the first form, {mode} and {abbr} should be the same as
+--- for the call to |maparg()|. *E460*
 --- {mode} is used to define the mode in which the mapping is set,
 --- not the "mode" entry in {dict}.
 --- Example for saving and restoring a mapping: >vim
@@ -5135,12 +5144,25 @@ function vim.fn.mapnew(expr1, expr2) end
 ---   " ...
 ---   call mapset('n', 0, save_map)
 --- <Note that if you are going to replace a map in several modes,
---- e.g. with `:map!`, you need to save the mapping for all of
---- them, since they can differ.
+--- e.g. with `:map!`, you need to save/restore the mapping for
+--- all of them, when they might differ.
+---
+--- In the second form, with {dict} as the only argument, mode
+--- and abbr are taken from the dict.
+--- Example: >vim
+---   let save_maps = maplist()->filter(
+---         \ {_, m -> m.lhs == 'K'})
+---   nnoremap K somethingelse
+---   cnoremap K somethingelse2
+---   " ...
+---   unmap K
+---   for d in save_maps
+---       call mapset(d)
+---   endfor
 ---
 --- @param mode string
---- @param abbr any
---- @param dict any
+--- @param abbr? any
+--- @param dict? any
 --- @return any
 function vim.fn.mapset(mode, abbr, dict) end
 
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 73fbc8c922..8beca8ffb3 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -1116,8 +1116,7 @@ func s:DeleteCommands()
   if exists('s:k_map_saved')
     if !empty(s:k_map_saved) && !s:k_map_saved.buffer
       nunmap K
-      " call mapset(s:k_map_saved)
-      call mapset('n', 0, s:k_map_saved)
+      call mapset(s:k_map_saved)
     elseif empty(s:k_map_saved)
       nunmap K
     endif
@@ -1126,8 +1125,7 @@ func s:DeleteCommands()
   if exists('s:plus_map_saved')
     if !empty(s:plus_map_saved) && !s:plus_map_saved.buffer
       nunmap +
-      " call mapset(s:plus_map_saved)
-      call mapset('n', 0, s:plus_map_saved)
+      call mapset(s:plus_map_saved)
     elseif empty(s:plus_map_saved)
       nunmap +
     endif
@@ -1136,8 +1134,7 @@ func s:DeleteCommands()
   if exists('s:minus_map_saved')
     if !empty(s:minus_map_saved) && !s:minus_map_saved.buffer
       nunmap -
-      " call mapset(s:minus_map_saved)
-      call mapset('n', 0, s:minus_map_saved)
+      call mapset(s:minus_map_saved)
     elseif empty(s:minus_map_saved)
       nunmap -
     endif
-- 
cgit 


From 04d299c17014b0802c79613252e4de26da84a7c9 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 9 Nov 2023 20:42:55 +0800
Subject: vim-patch:8.2.4932: not easy to filter the output of maplist()

Problem:    Not easy to filter the output of maplist().
Solution:   Add mode_bits to the dictionary. (Ernie Rael, closes vim/vim#10356)

https://github.com/vim/vim/commit/d8f5f766219273a8579947cc80b92580b6988a4b

Co-authored-by: Ernie Rael <errael@raelity.com>
---
 runtime/doc/builtin.txt         | 25 +++++++++++++++++++++++++
 runtime/lua/vim/_meta/vimfn.lua | 25 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 1eb173af58..bc4d1f30c9 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4186,6 +4186,11 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 		  "nowait"   Do not wait for other, longer mappings.
 			     (|:map-<nowait>|).
 		  "abbr"     True if this is an |abbreviation|.
+		  "mode_bits" Nvim's internal binary representation of "mode".
+			     |mapset()| ignores this; only "mode" is used.
+			     See |maplist()| for usage examples. The values
+			     are from src/nvim/vim.h and may change in the
+			     future.
 
 		The dictionary can be used to restore a mapping with
 		|mapset()|.
@@ -4239,6 +4244,26 @@ maplist([{abbr}])                                                    *maplist()*
 			echo maplist()->filter({_, m ->
 				\ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
 				\ })
+<		It can be tricky to find mappings for particular |:map-modes|.
+		|mapping-dict|'s "mode_bits" can simplify this. For example,
+		the mode_bits for Normal, Insert or Command-line modes are
+		0x19. To find all the mappings available in those modes you
+		can do: >vim
+			let saved_maps = []
+			for m in maplist()
+			    if and(m.mode_bits, 0x19) != 0
+				eval saved_maps->add(m)
+			    endif
+			endfor
+			echo saved_maps->mapnew({_, m -> m.lhs})
+<		The values of the mode_bits are defined in Nvim's
+		src/nvim/vim.h file and they can be discovered at runtime
+		using |:map-commands| and "maplist()". Example: >vim
+			omap xyzzy <Nop>
+			let op_bit = maplist()->filter(
+			    \ {_, m -> m.lhs == 'xyzzy'})[0].mode_bits
+			ounmap xyzzy
+			echo printf("Operator-pending mode bit: 0x%x", op_bit)
 
 mapnew({expr1}, {expr2})                                              *mapnew()*
 		Like |map()| but instead of replacing items in {expr1} a new
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index dea2e476b6..d1e676ef70 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5047,6 +5047,11 @@ function vim.fn.map(expr1, expr2) end
 ---   "nowait"   Do not wait for other, longer mappings.
 ---        (|:map-<nowait>|).
 ---   "abbr"     True if this is an |abbreviation|.
+---   "mode_bits" Nvim's internal binary representation of "mode".
+---        |mapset()| ignores this; only "mode" is used.
+---        See |maplist()| for usage examples. The values
+---        are from src/nvim/vim.h and may change in the
+---        future.
 ---
 --- The dictionary can be used to restore a mapping with
 --- |mapset()|.
@@ -5111,6 +5116,26 @@ function vim.fn.mapcheck(name, mode, abbr) end
 ---   echo maplist()->filter({_, m ->
 ---     \ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
 ---     \ })
+--- <It can be tricky to find mappings for particular |:map-modes|.
+--- |mapping-dict|'s "mode_bits" can simplify this. For example,
+--- the mode_bits for Normal, Insert or Command-line modes are
+--- 0x19. To find all the mappings available in those modes you
+--- can do: >vim
+---   let saved_maps = []
+---   for m in maplist()
+---       if and(m.mode_bits, 0x19) != 0
+---     eval saved_maps->add(m)
+---       endif
+---   endfor
+---   echo saved_maps->mapnew({_, m -> m.lhs})
+--- <The values of the mode_bits are defined in Nvim's
+--- src/nvim/vim.h file and they can be discovered at runtime
+--- using |:map-commands| and "maplist()". Example: >vim
+---   omap xyzzy <Nop>
+---   let op_bit = maplist()->filter(
+---       \ {_, m -> m.lhs == 'xyzzy'})[0].mode_bits
+---   ounmap xyzzy
+---   echo printf("Operator-pending mode bit: 0x%x", op_bit)
 ---
 --- @return any
 function vim.fn.maplist() end
-- 
cgit 


From ae8ca79920a8d0e928ac1502a10d1d063a06cae5 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Thu, 9 Nov 2023 18:19:15 +0100
Subject: vim-patch:d56f15caf602

runtime(wget): Update for Wget2 2.1.0 (vim/vim#13497)

https://github.com/vim/vim/commit/d56f15caf602a061f5f9f0a3c6a4537ab2dc6acc

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/wget.vim  |   4 +-
 runtime/ftplugin/wget2.vim |   4 +-
 runtime/syntax/wget.vim    | 294 ++++++++++++++++++++++-----------------------
 runtime/syntax/wget2.vim   |  56 ++++-----
 4 files changed, 178 insertions(+), 180 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/wget.vim b/runtime/ftplugin/wget.vim
index 7a10221824..db3b62191e 100644
--- a/runtime/ftplugin/wget.vim
+++ b/runtime/ftplugin/wget.vim
@@ -1,5 +1,5 @@
 " Vim filetype plugin file
-" Language:     Wget configuration file (/etc/wgetrc ~/.wgetrc)
+" Language:	Wget configuration file (/etc/wgetrc ~/.wgetrc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2022 Apr 28
 
@@ -18,7 +18,7 @@ setlocal formatoptions-=t formatoptions+=croql
 let b:undo_ftplugin = "setl fo< com< cms<"
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Wget Configuration File (wgetrc, .wgetrc)\twgetrc;.wgetrc\n" .
+  let b:browsefilter = "Wget Configuration File (wgetrc, .wgetrc)\twgetrc;.wgetrc\n" ..
 	\	       "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
diff --git a/runtime/ftplugin/wget2.vim b/runtime/ftplugin/wget2.vim
index a6845f6df5..8cfcd514e5 100644
--- a/runtime/ftplugin/wget2.vim
+++ b/runtime/ftplugin/wget2.vim
@@ -1,5 +1,5 @@
 " Vim filetype plugin file
-" Language:     Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
+" Language:	Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 " Last Change:	2022 Apr 28
 
@@ -18,7 +18,7 @@ setlocal formatoptions-=t formatoptions+=croql
 let b:undo_ftplugin = "setl fo< com< cms<"
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Wget2 Configuration File (wget2rc, .wget2rc)\twget2rc;.wget2rc\n" .
+  let b:browsefilter = "Wget2 Configuration File (wget2rc, .wget2rc)\twget2rc;.wget2rc\n" ..
 	\	       "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
diff --git a/runtime/syntax/wget.vim b/runtime/syntax/wget.vim
index 8178d02bad..93206c2005 100644
--- a/runtime/syntax/wget.vim
+++ b/runtime/syntax/wget.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
-" Language:     Wget configuration file (/etc/wgetrc ~/.wgetrc)
+" Language:	Wget configuration file (/etc/wgetrc ~/.wgetrc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2022 Apr 28
+" Last Change:	2023 Nov 05
 
 " GNU Wget 1.21 built on linux-gnu.
 
@@ -12,7 +12,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn match wgetComment "#.*$" contains=wgetTodo contained
+syn match wgetComment "#.*" contains=wgetTodo contained
 
 syn keyword wgetTodo TODO NOTE FIXME XXX contained
 
@@ -21,208 +21,206 @@ syn region wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
 
 syn case ignore
 
-syn keyword wgetBoolean on off yes no contained
-syn keyword wgetNumber	inf	      contained
-
-syn match wgetNumber "\<\d\+>"		  contained
-syn match wgetQuota  "\<\d\+[kmgt]\>"	  contained
-syn match wgetTime   "\<\d\+[smhdw]\>"	  contained
+syn keyword wgetBoolean on off yes no	 contained
+syn keyword wgetNumber	inf		 contained
+syn match   wgetNumber "\<\d\+>"	 contained
+syn match   wgetQuota  "\<\d\+[kmgt]\>"	 contained
+syn match   wgetTime   "\<\d\+[smhdw]\>" contained
 
 "{{{ Commands
 let s:commands =<< trim EOL
   accept
-  accept_regex
-  add_host_dir
-  adjust_extension
-  always_rest
-  ask_password
-  auth_no_challenge
+  accept-regex
+  add-host-dir
+  adjust-extension
+  always-rest
+  ask-password
+  auth-no-challenge
   background
-  backup_converted
+  backup-converted
   backups
   base
-  bind_address
-  bind_dns_address
-  body_data
-  body_file
-  ca_certificate
-  ca_directory
+  bind-address
+  bind-dns-address
+  body-data
+  body-file
+  ca-certificate
+  ca-directory
   cache
   certificate
-  certificate_type
-  check_certificate
-  choose_config
+  certificate-type
+  check-certificate
+  choose-config
   ciphers
   compression
-  connect_timeout
-  content_disposition
-  content_on_error
+  connect-timeout
+  content-disposition
+  content-on-error
   continue
-  convert_file_only
-  convert_links
+  convert-file-only
+  convert-links
   cookies
-  crl_file
-  cut_dirs
+  crl-file
+  cut-dirs
   debug
-  default_page
-  delete_after
-  dns_cache
-  dns_servers
-  dns_timeout
-  dir_prefix
-  dir_struct
+  default-page
+  delete-after
+  dns-cache
+  dns-servers
+  dns-timeout
+  dir-prefix
+  dir-struct
   domains
-  dot_bytes
-  dots_in_line
-  dot_spacing
-  dot_style
-  egd_file
-  exclude_directories
-  exclude_domains
-  follow_ftp
-  follow_tags
-  force_html
-  ftp_passwd
-  ftp_password
-  ftp_user
-  ftp_proxy
-  ftps_clear_data_connection
-  ftps_fallback_to_ftp
-  ftps_implicit
-  ftps_resume_ssl
+  dot-bytes
+  dots-in-line
+  dot-spacing
+  dot-style
+  egd-file
+  exclude-directories
+  exclude-domains
+  follow-ftp
+  follow-tags
+  force-html
+  ftp-passwd
+  ftp-password
+  ftp-user
+  ftp-proxy
+  ftps-clear-data-connection
+  ftps-fallback-to-ftp
+  ftps-implicit
+  ftps-resume-ssl
   hsts
-  hsts_file
-  ftp_stmlf
+  hsts-file
+  ftp-stmlf
   glob
   header
-  html_extension
+  html-extension
   htmlify
-  http_keep_alive
-  http_passwd
-  http_password
-  http_proxy
-  https_proxy
-  https_only
-  http_user
-  if_modified_since
-  ignore_case
-  ignore_length
-  ignore_tags
-  include_directories
-  inet4_only
-  inet6_only
+  http-keep-alive
+  http-passwd
+  http-password
+  http-proxy
+  https-proxy
+  https-only
+  http-user
+  if-modified-since
+  ignore-case
+  ignore-length
+  ignore-tags
+  include-directories
+  inet4-only
+  inet6-only
   input
-  input_meta_link
+  input-meta-link
   iri
-  keep_bad_hash
-  keep_session_cookies
-  kill_longer
-  limit_rate
-  load_cookies
+  keep-bad-hash
+  keep-session-cookies
+  kill-longer
+  limit-rate
+  load-cookies
   locale
-  local_encoding
+  local-encoding
   logfile
   login
-  max_redirect
-  metalink_index
-  metalink_over_http
+  max-redirect
+  metalink-index
+  metalink-over-http
   method
   mirror
   netrc
-  no_clobber
-  no_config
-  no_parent
-  no_proxy
+  no-clobber
+  no-config
+  no-parent
+  no-proxy
   numtries
-  output_document
-  page_requisites
-  passive_ftp
+  output-document
+  page-requisites
+  passive-ftp
   passwd
   password
-  pinned_pubkey
-  post_data
-  post_file
-  prefer_family
-  preferred_location
-  preserve_permissions
-  private_key
-  private_key_type
+  pinned-pubkey
+  post-data
+  post-file
+  prefer-family
+  preferred-location
+  preserve-permissions
+  private-key
+  private-key-type
   progress
-  protocol_directories
-  proxy_passwd
-  proxy_password
-  proxy_user
+  protocol-directories
+  proxy-passwd
+  proxy-password
+  proxy-user
   quiet
   quota
-  random_file
-  random_wait
-  read_timeout
-  rec_level
+  random-file
+  random-wait
+  read-timeout
+  rec-level
   recursive
   referer
-  regex_type
+  regex-type
   reject
-  rejected_log
-  reject_regex
-  relative_only
-  remote_encoding
-  remove_listing
-  report_speed
-  restrict_file_names
-  retr_symlinks
-  retry_connrefused
-  retry_on_host_error
-  retry_on_http_error
+  rejected-log
+  reject-regex
+  relative-only
+  remote-encoding
+  remove-listing
+  report-speed
+  restrict-file-names
+  retr-symlinks
+  retry-connrefused
+  retry-on-host-error
+  retry-on-http-error
   robots
-  save_cookies
-  save_headers
-  secure_protocol
-  server_response
-  show_all_dns_entries
-  show_progress
-  simple_host_check
-  span_hosts
+  save-cookies
+  save-headers
+  secure-protocol
+  server-response
+  show-all-dns-entries
+  show-progress
+  simple-host-check
+  span-hosts
   spider
-  start_pos
-  strict_comments
+  start-pos
+  strict-comments
   sslcertfile
   sslcertkey
   timeout
   timestamping
-  use_server_timestamps
+  use-server-timestamps
   tries
-  trust_server_names
+  trust-server-names
   unlink
-  use_askpass
+  use-askpass
   user
-  use_proxy
-  user_agent
+  use-proxy
+  user-agent
   verbose
   wait
-  wait_retry
-  warc_cdx
-  warc_cdx_dedup
-  warc_compression
-  warc_digests
-  warc_file
-  warc_header
-  warc_keep_log
-  warc_max_size
-  warc_temp_dir
+  wait-retry
+  warc-cdx
+  warc-cdx-dedup
+  warc-compression
+  warc-digests
+  warc-file
+  warc-header
+  warc-keep-log
+  warc-max-size
+  warc-temp-dir
   wdebug
   xattr
 EOL
 "}}}
 
-call map(s:commands, "substitute(v:val, '_', '[-_]\\\\=', 'g')")
-
 for cmd in s:commands
-  exe 'syn match wgetCommand "\<' . cmd . '\>" nextgroup=wgetAssignmentOperator skipwhite contained'
+  exe 'syn match wgetCommand "\<' .. substitute(cmd, '-', '[-_]\\=', "g") .. '\>" nextgroup=wgetAssignmentOperator skipwhite contained'
 endfor
+unlet s:commands
 
 syn case match
 
-syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite
+syn match wgetLineStart		 "^" nextgroup=wgetCommand,wgetComment skipwhite
 syn match wgetAssignmentOperator "=" nextgroup=wgetString,wgetBoolean,wgetNumber,wgetQuota,wgetTime skipwhite contained
 
 hi def link wgetAssignmentOperator Special
diff --git a/runtime/syntax/wget2.vim b/runtime/syntax/wget2.vim
index a63c336f06..3e9abdf23d 100644
--- a/runtime/syntax/wget2.vim
+++ b/runtime/syntax/wget2.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
-" Language:     Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
+" Language:	Wget2 configuration file (/etc/wget2rc ~/.wget2rc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2022 Apr 28
+" Last Change:	2023 Nov 05
 
-" GNU Wget2 2.0.0 - multithreaded metalink/file/website downloader
+" GNU Wget2 2.1.0 - multithreaded metalink/file/website downloader
 
 if exists("b:current_syntax")
   finish
@@ -12,21 +12,20 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn match wgetComment "#.*$" contains=wgetTodo contained
+syn match wget2Comment "#.*" contains=wget2Todo contained
 
-syn keyword wgetTodo TODO NOTE FIXME XXX contained
+syn keyword wget2Todo TODO NOTE FIXME XXX contained
 
-syn region wgetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
-syn region wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
+syn region wget2String start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
+syn region wget2String start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
 
 syn case ignore
 
-syn keyword wgetBoolean on off yes no y n contained
-syn keyword wgetNumber	infinity inf	  contained
-
-syn match wgetNumber "\<\d\+>"		  contained
-syn match wgetQuota  "\<\d\+[kmgt]\>"	  contained
-syn match wgetTime   "\<\d\+[smhd]\>"	  contained
+syn keyword wget2Boolean on off yes no y n contained
+syn keyword wget2Number	 infinity inf	   contained
+syn match   wget2Number "\<\d\+>"	   contained
+syn match   wget2Quota	"\<\d\+[kmgt]\>"   contained
+syn match   wget2Time	"\<\d\+[smhd]\>"   contained
 
 "{{{ Commands
 let s:commands =<< trim EOL
@@ -67,6 +66,7 @@ let s:commands =<< trim EOL
   cut-dirs
   cut-file-get-vars
   cut-url-get-vars
+  dane
   debug
   default-http-port
   default-https-port
@@ -85,6 +85,7 @@ let s:commands =<< trim EOL
   execute
   filter-mime-type
   filter-urls
+  follow-sitemaps
   follow-tags
   force-atom
   force-css
@@ -221,28 +222,27 @@ let s:commands =<< trim EOL
 EOL
 "}}}
 
-call map(s:commands, "substitute(v:val, '_', '[-_]\\\\=', 'g')")
-
 for cmd in s:commands
-  exe 'syn match wgetCommand "\<' . cmd . '\>" nextgroup=wgetAssignmentOperator skipwhite contained'
+  exe 'syn match wget2Command "\<' .. substitute(cmd, '-', '[-_]\\=', "g") .. '\>" nextgroup=wget2AssignmentOperator skipwhite contained'
 endfor
+unlet s:commands
 
 syn case match
 
-syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite
-syn match wgetAssignmentOperator "=" nextgroup=wgetString,wgetBoolean,wgetNumber,wgetQuota,wgetTime skipwhite contained
+syn match wget2LineStart	  "^" nextgroup=wget2Command,wget2Comment skipwhite
+syn match wget2AssignmentOperator "=" nextgroup=wget2String,wget2Boolean,wget2Number,wget2Quota,wget2Time skipwhite contained
 
-hi def link wgetAssignmentOperator Special
-hi def link wgetBoolean		   Boolean
-hi def link wgetCommand		   Identifier
-hi def link wgetComment		   Comment
-hi def link wgetNumber		   Number
-hi def link wgetQuota		   Number
-hi def link wgetString		   String
-hi def link wgetTime		   Number
-hi def link wgetTodo		   Todo
+hi def link wget2AssignmentOperator Special
+hi def link wget2Boolean	    Boolean
+hi def link wget2Command	    Identifier
+hi def link wget2Comment	    Comment
+hi def link wget2Number		    Number
+hi def link wget2Quota		    Number
+hi def link wget2String		    String
+hi def link wget2Time		    Number
+hi def link wget2Todo		    Todo
 
-let b:current_syntax = "wget"
+let b:current_syntax = "wget2"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-- 
cgit 


From be83cd73b274ef9d81ff45f5f833ee8ac2ffc01e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 11 Nov 2023 14:32:02 +0100
Subject: vim-patch:5994329667a6

runtime(i3config): Update for i3 4.23 (vim/vim#13522)

https://github.com/vim/vim/commit/5994329667a630b85fae07b9121668456e86b22d

Co-authored-by: Ivan Grimaldi <grimaldi.ivan@gmail.com>
Co-authored-by: Ivan Grimaldi <grimaldi.ivam@gmail.com>
---
 runtime/syntax/i3config.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/syntax/i3config.vim b/runtime/syntax/i3config.vim
index 3b4765153a..d4512525f9 100644
--- a/runtime/syntax/i3config.vim
+++ b/runtime/syntax/i3config.vim
@@ -3,7 +3,7 @@
 " Original Author: Josef Litos (JosefLitos/i3config.vim)
 " Maintainer: Quentin Hibon (github user hiqua)
 " Version: 1.0.0
-" Last Change: 2023-09-14
+" Last Change: 2023-11-11
 
 " References:
 " http://i3wm.org/docs/userguide.html#configuring
@@ -182,7 +182,7 @@ syn match i3ConfigKeyword /^smart_gaps \(on\|off\|inverse_outer\)$/ contains=i3C
 
 " 5 Configuring bar
 syn match i3ConfigBarModifier /^\s\+modifier \S\+$/ contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey,i3ConfigBarOptVals
-syn keyword i3ConfigBarOpts bar i3bar_command status_command mode hidden_state id position output tray_output tray_padding separator_symbol workspace_buttons workspace_min_width strip_workspace_numbers strip_workspace_name binding_mode_indicator padding contained
+syn keyword i3ConfigBarOpts bar i3bar_command status_command workspace_command mode hidden_state id position output tray_output tray_padding separator_symbol workspace_buttons workspace_min_width strip_workspace_numbers strip_workspace_name binding_mode_indicator padding contained
 syn keyword i3ConfigBarOptVals dock hide invisible show none top bottom primary nonprimary contained
 syn region i3ConfigBarBlock start=/^bar {$/ end=/^}$/ contains=i3ConfigBarOpts,i3ConfigBarOptVals,i3ConfigBarModifier,i3ConfigBind,i3ConfigString,i3ConfigComment,i3ConfigFont,i3ConfigBoolean,i3ConfigNumber,i3ConfigParen,i3ConfigColor,i3ConfigVariable,i3ConfigColorsBlock,i3ConfigShOper,i3ConfigShCommand fold keepend extend
 
@@ -212,7 +212,7 @@ syn region i3ConfigAction start=/layout/ skip=/\\$/ end=/[,;]\|$/ contained cont
 
 " 6.4 Focusing containers
 syn keyword i3ConfigFocusKeyword focus contained
-syn keyword i3ConfigFocusOpts left right up down parent child next prev sibling floating tiling mode_toggle contained
+syn keyword i3ConfigFocusOpts left right up down workspace parent child next prev sibling floating tiling mode_toggle contained
 syn keyword i3ConfigFocusOutputOpts left right down up current primary nonprimary next prev contained
 syn region i3ConfigFocusOutput start=/ output / skip=/\\$/ end=/[,;]\|$/ contained contains=i3ConfigWorkspaceOutput,i3ConfigFocusOutputOpts,i3ConfigString,i3ConfigNumber,i3ConfigSeparator keepend
 syn match i3ConfigFocusOutputLine /^focus output .*$/ contains=i3ConfigFocusKeyword,i3ConfigFocusOutput
-- 
cgit 


From 84688ec3728dc73bea4d63e6a758c199e0884f00 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 11 Nov 2023 14:30:11 +0100
Subject: vim-patch:9.0.2097: No support for cypher files

Problem:  No support for cypher files
Solution: Add cypher filetype detection

Cypher query language support to work with (mostly) graph databases.

Already existing lsp support in Neovim's nvim-lspconfig:
https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#cypher_ls

closes: vim/vim#13516

https://github.com/vim/vim/commit/8f0fe20ff1a13b468fdfaf85c434475f75c7a615

Co-authored-by: Gerrit Meier <meistermeier@gmail.com>
---
 runtime/lua/vim/filetype.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 35ad8e21b8..b418eba294 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -333,6 +333,7 @@ local extension = {
   pld = 'cupl',
   si = 'cuplsim',
   cyn = 'cynpp',
+  cypher = 'cypher',
   dart = 'dart',
   drt = 'dart',
   ds = 'datascript',
-- 
cgit 


From 2494009885b6d8073017ee3c7e16bcc1796c4c99 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 12 Nov 2023 07:49:57 +0800
Subject: vim-patch:1b08d2cd0789 (#25993)

runtime(doc): clarify when formatoptions applies

closes: vim/vim#13503

https://github.com/vim/vim/commit/1b08d2cd0789fd9aaae148a64ff46342730022d7

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/options.txt           | 5 +++--
 runtime/lua/vim/_meta/options.lua | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d92e528214..6a71ad296c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2774,8 +2774,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 'formatoptions' 'fo'	string	(default "tcqj")
 			local to buffer
 	This is a sequence of letters which describes how automatic
-	formatting is to be done.  See |fo-table|.  Commas can be inserted for
-	readability.
+	formatting is to be done.
+	See |fo-table| for possible values and |gq| for how to format text.
+	Commas can be inserted for readability.
 	To avoid problems with flags that are added in the future, use the
 	"+=" and "-=" feature of ":set" |add-option-flags|.
 
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 53f7166b3d..a8299b31d7 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -2528,8 +2528,9 @@ vim.bo.formatlistpat = vim.o.formatlistpat
 vim.bo.flp = vim.bo.formatlistpat
 
 --- This is a sequence of letters which describes how automatic
---- formatting is to be done.  See `fo-table`.  Commas can be inserted for
---- readability.
+--- formatting is to be done.
+--- See `fo-table` for possible values and `gq` for how to format text.
+--- Commas can be inserted for readability.
 --- To avoid problems with flags that are added in the future, use the
 --- "+=" and "-=" feature of ":set" `add-option-flags`.
 ---
-- 
cgit 


From c23dd7c9eff035d92830bb33eb9644d946a65d92 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Sun, 12 Nov 2023 01:51:25 +0200
Subject: vim-patch:9.0.2098: No filetype support for xcompose files (#25983)

Problem:  No filetype support for xcompose files
Solution: Add filetype detection

closes: vim/vim#13508

https://github.com/vim/vim/commit/4f9074b96cc7efb1c829ca74902a851551dcf4e8
---
 runtime/ftplugin/xcompose.vim | 13 +++++++++++++
 runtime/lua/vim/filetype.lua  |  2 ++
 runtime/syntax/xcompose.vim   | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 runtime/ftplugin/xcompose.vim
 create mode 100644 runtime/syntax/xcompose.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/xcompose.vim b/runtime/ftplugin/xcompose.vim
new file mode 100644
index 0000000000..7345c27a2e
--- /dev/null
+++ b/runtime/ftplugin/xcompose.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:	XCompose
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org
+" Last Change:	2023 Nov 09
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:# commentstring=#\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index b418eba294..aae63af132 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1521,6 +1521,8 @@ local filename = {
   wget2rc = 'wget2',
   ['.wvdialrc'] = 'wvdial',
   ['wvdial.conf'] = 'wvdial',
+  ['.XCompose'] = 'xcompose',
+  ['Compose'] = 'xcompose',
   ['.Xresources'] = 'xdefaults',
   ['.Xpdefaults'] = 'xdefaults',
   ['xdm-config'] = 'xdefaults',
diff --git a/runtime/syntax/xcompose.vim b/runtime/syntax/xcompose.vim
new file mode 100644
index 0000000000..3637b9f3b6
--- /dev/null
+++ b/runtime/syntax/xcompose.vim
@@ -0,0 +1,37 @@
+" Vim syntax file
+" Language:	XCompose
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Filenames:	.XCompose, Compose
+" Last Change:	2023 Nov 09
+
+" Comments
+syn keyword xcomposeTodo contained TODO FIXME XXX
+syn match xcomposeComment /#.*/ contains=xcomposeTodo
+
+" Includes
+syn keyword xcomposeInclude include nextgroup=xcomposeFile skipwhite
+syn match xcomposeFile /"\([^"]\|\\"\)\+"/ contained
+syn match xcomposeSubstitution /%[HLS]/ contained containedin=xcomposeFile
+
+" Modifiers
+syn keyword xcomposeModifier Ctrl Lock Caps Shift Alt Meta None
+syn match xcomposeModifierPrefix /\s*\zs[!~]\ze\s*/
+
+" Keysyms
+syn match xcomposeKeysym /<[A-Za-z0-9_]\+>/
+syn match xcomposeKeysym /[A-Za-z0-9_]\+/ contained
+syn match xcomposeString /"\([^"]\|\\"\)\+"/ contained nextgroup=xcomposeKeysym skipwhite
+syn match xcomposeColon /:/ nextgroup=xcomposeKeysym,xcomposeString skipwhite
+
+hi def link xcomposeColon Delimiter
+hi def link xcomposeComment Comment
+hi def link xcomposeFile String
+hi def link xcomposeInclude Include
+hi def link xcomposeKeysym Constant
+hi def link xcomposeModifier Function
+hi def link xcomposeModifierPrefix Operator
+hi def link xcomposeString String
+hi def link xcomposeSubstitution Special
+hi def link xcomposeTodo Todo
+
+let b:current_syntax = 'xcompose'
-- 
cgit 


From b33130244278d28fa8372c35c68fe6d26dd1fefa Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sun, 12 Nov 2023 08:26:56 +0800
Subject: vim-patch:9358b8d99349 (#25998)

runtime(vim): Improve :let-heredoc syntax highlighting (vim/vim#12923)

"trim" and "eval" are allowed in any order and whitespace is not
required after "=<<".

https://github.com/vim/vim/commit/9358b8d99349818666718f513655c2bf53d43754

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/syntax/vim.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index c44a32119b..fcd50bccd2 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -368,7 +368,7 @@ syn match	vimSetMod	contained	"&vim\=\|[!&?<]\|all&"
 " Let: {{{2
 " ===
 syn keyword	vimLet	let	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
-VimFoldh syn region vimLetHereDoc matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\s\+\)\=\%(eval\s\+\)\=\s*\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'
+VimFoldh syn region vimLetHereDoc	matchgroup=vimLetHereDocStart start='=<<\s*\%(trim\s\+\%(eval\s\+\)\=\|eval\s\+\%(trim\s\+\)\=\)\=\z(\L\S*\)' matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'
 
 " Abbreviations: {{{2
 " =============
-- 
cgit 


From c6b317dd13ffe28158ba6083daa01fc26510f9b1 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 12 Nov 2023 10:33:34 +0100
Subject: vim-patch:2c133f6c1a16

runtime(lynx): Update for Lynx 2.8.9 (vim/vim#13510)

https://github.com/vim/vim/commit/2c133f6c1a165a74678a89722ed8c42967c295e4

Co-authored-by: dkearns <dougkearns@gmail.com>
---
 runtime/ftplugin/lynx.vim |  4 +--
 runtime/syntax/lynx.vim   | 75 +++++++++++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 34 deletions(-)

(limited to 'runtime')

diff --git a/runtime/ftplugin/lynx.vim b/runtime/ftplugin/lynx.vim
index b76c69f0ae..bf8410d6a0 100644
--- a/runtime/ftplugin/lynx.vim
+++ b/runtime/ftplugin/lynx.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Lynx Web Browser Configuration
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2022 Sep 09
+" Last Change:	2023 Nov 09
 
 if exists("b:did_ftplugin")
   finish
@@ -18,7 +18,7 @@ setlocal formatoptions-=t formatoptions+=croql
 let b:undo_ftplugin = "setl cms< com< fo<"
 
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "Lynx Configuration Files (lynx.cfg .lynxrc)\tlynx.cfg;.lynxrc\n" ..
+  let b:browsefilter = "Lynx Configuration Files (lynx.cfg, .lynxrc)\tlynx.cfg;.lynxrc\n" ..
 	\	       "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
diff --git a/runtime/syntax/lynx.vim b/runtime/syntax/lynx.vim
index fa7c26f629..fcaf923ebe 100644
--- a/runtime/syntax/lynx.vim
+++ b/runtime/syntax/lynx.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
-" Language:	Lynx configuration file (lynx.cfg)
+" Language:	Lynx Web Browser Configuration (lynx.cfg)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2013 Jun 20
+" Last Change:	2023 Nov 09
 
-" Lynx 2.8.7
+" Lynx 2.8.9
 
 if exists("b:current_syntax")
   finish
@@ -12,34 +12,35 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn match lynxStart "^" transparent skipwhite nextgroup=lynxOption
+syn match lynxStart "^" skipwhite nextgroup=lynxOption
 
-syn match lynxComment "\(^\|\s\+\)#.*$" contains=lynxTodo
+syn match lynxComment "\%(^\|\s\+\)#.*" contains=lynxTodo
 
 syn keyword lynxTodo TODO NOTE FIXME XXX contained
 
-syn match lynxDelimiter ":" skipwhite nextgroup=lynxBoolean,lynxNumber,lynxNone,lynxRCOption
+syn match lynxDelimiter ":" skipwhite nextgroup=lynxBoolean,lynxHttpProtocol,lynxNumber,lynxNone,lynxRCOption
 
 syn case ignore
 syn keyword lynxBoolean TRUE FALSE ON OFF contained
-syn keyword lynxNone    NONE		  contained
+syn keyword lynxNone	NONE		  contained
 syn case match
 
-syn match lynxNumber "-\=\<\d\+\>" contained
+syn match lynxNumber	   "-\=\<\d\+\>" contained
+syn match lynxHttpProtocol "\<1\.[01]\>" contained
 
 "{{{ Options
 syn case ignore
-syn keyword lynxOption ACCEPT_ALL_COOKIES ALERTSECS ALWAYS_RESUBMIT_POSTS
-	\ ALWAYS_TRUSTED_EXEC ANONFTP_PASSWORD ASSUMED_COLOR
-	\ ASSUMED_DOC_CHARSET_CHOICE ASSUME_CHARSET ASSUME_LOCAL_CHARSET
-	\ ASSUME_UNREC_CHARSET AUTO_SESSION AUTO_UNCACHE_DIRLISTS BAD_HTML
-	\ BIBP_BIBHOST BIBP_GLOBAL_SERVER BLOCK_MULTI_BOOKMARKS BOLD_H1
-	\ BOLD_HEADERS BOLD_NAME_ANCHORS BOOKMARK_FILE BROKEN_FTP_EPSV
-	\ BROKEN_FTP_RETR BZIP2_PATH CASE_SENSITIVE_ALWAYS_ON
-	\ CASE_SENSITIVE_SEARCHING CHARACTER_SET CHARSETS_DIRECTORY
-	\ CHARSET_SWITCH_RULES CHECKMAIL CHMOD_PATH COLLAPSE_BR_TAGS COLOR
-	\ COLOR_STYLE COMPRESS_PATH CONNECT_TIMEOUT COOKIE_ACCEPT_DOMAINS
-	\ COOKIE_FILE COOKIE_LOOSE_INVALID_DOMAINS
+syn keyword lynxOption ACCEPT_ALL_COOKIES ALERTSECS
+	\ ALWAYS_RESUBMIT_POSTS ALWAYS_TRUSTED_EXEC ANONFTP_PASSWORD
+	\ ASSUMED_COLOR ASSUMED_DOC_CHARSET_CHOICE ASSUME_CHARSET
+	\ ASSUME_LOCAL_CHARSET ASSUME_UNREC_CHARSET AUTO_SESSION
+	\ AUTO_UNCACHE_DIRLISTS BAD_HTML BIBP_BIBHOST BIBP_GLOBAL_SERVER
+	\ BLOCK_MULTI_BOOKMARKS BOLD_H1 BOLD_HEADERS BOLD_NAME_ANCHORS
+	\ BOOKMARK_FILE BROKEN_FTP_EPSV BROKEN_FTP_RETR BZIP2_PATH
+	\ CASE_SENSITIVE_ALWAYS_ON CASE_SENSITIVE_SEARCHING CHARACTER_SET
+	\ CHARSETS_DIRECTORY CHARSET_SWITCH_RULES CHECKMAIL CHMOD_PATH
+	\ COLLAPSE_BR_TAGS COLOR COLOR_STYLE COMPRESS_PATH CONNECT_TIMEOUT
+	\ COOKIE_ACCEPT_DOMAINS COOKIE_FILE COOKIE_LOOSE_INVALID_DOMAINS
 	\ COOKIE_QUERY_INVALID_DOMAINS COOKIE_REJECT_DOMAINS COOKIE_SAVE_FILE
 	\ COOKIE_STRICT_INVALID_DOMAINS COPY_PATH CSO_PROXY CSWING_PATH
 	\ DEBUGSECS DEFAULT_BOOKMARK_FILE DEFAULT_CACHE_SIZE DEFAULT_COLORS
@@ -97,35 +98,45 @@ syn keyword lynxOption ACCEPT_ALL_COOKIES ALERTSECS ALWAYS_RESUBMIT_POSTS
 	\ USE_FIXED_RECORDS USE_MOUSE USE_SELECT_POPUPS UUDECODE_PATH
 	\ VERBOSE_IMAGES VIEWER VISITED_LINKS VI_KEYS VI_KEYS_ALWAYS_ON
 	\ WAIS_PROXY XHTML_PARSING XLOADIMAGE_COMMAND ZCAT_PATH ZIP_PATH
+	\ TRIM_BLANK_LINES GUESS_SCHEME HTTP_PROTOCOL HTML5_CHARSETS
+	\ TRIM_BLANK_LINES PREFERRED_CONTENT_TYPE SSL_CLIENT_CERT_FILE
+	\ SSL_CLIENT_KEY_FILE MAX_URI_SIZE UNIQUE_URLS MESSAGE_LANGUAGE
+	\ CONV_JISX0201KANA WAIT_VIEWER_TERMINATION BLAT_MAIL ALT_BLAT_MAIL
+	\ DONT_WRAP_PRE TRACK_INTERNAL_LINKS FORCE_HTML HIDDENLINKS SHORT_URL
+	\ LISTONLY LIST_INLINE LOCALHOST WITH_BACKSPACES
 	\ contained nextgroup=lynxDelimiter
 syn keyword lynxRCOption accept_all_cookies assume_charset auto_session
 	\ bookmark_file case_sensitive_searching character_set
-	\ cookie_accept_domains cookie_file cookie_loose_invalid_domains
-	\ cookie_query_invalid_domains cookie_reject_domains
+	\ collapse_br_tags cookie_accept_domains cookie_file
+	\ cookie_loose_invalid_domains cookie_query_invalid_domains
+	\ cookie_reject_domains cookie_strict_invalid_domain
 	\ cookie_strict_invalid_domains dir_list_style display emacs_keys
 	\ file_editor file_sorting_method force_cookie_prompt force_ssl_prompt
-	\ ftp_passive kblayout keypad_mode lineedit_mode locale_charset
-	\ make_links_for_all_images make_pseudo_alts_for_inlines
-	\ multi_bookmark no_pause personal_mail_address preferred_charset
-	\ preferred_encoding preferred_language preferred_media_types raw_mode
-	\ run_all_execution_links run_execution_links_on_local_files scrollbar
-	\ select_popups send_useragent session_file set_cookies show_color
-	\ show_cursor show_dotfiles show_kb_rate sub_bookmarks tagsoup
-	\ underline_links user_mode useragent verbose_images vi_keys
-	\ visited_links
+	\ ftp_passive html5_charsets http_protocol kblayout keypad_mode
+	\ lineedit_mode locale_charset make_links_for_all_images
+	\ make_pseudo_alts_for_inlines multi_bookmark no_pause
+	\ personal_mail_address preferred_charset preferred_encoding
+	\ preferred_language preferred_media_types raw_mode
+	\ run_all_execution_links run_execution_links_local
+	\ run_execution_links_on_local_files scrollbar select_popups
+	\ send_useragent session_file set_cookies show_color show_cursor
+	\ show_dotfiles show_kb_rate sub_bookmarks tagsoup underline_links
+	\ useragent user_mode verbose_images vi_keys visited_links
 	\ contained nextgroup=lynxDelimiter
 syn case match
 " }}}
 
 " cfg2html.pl formatting directives
 syn match lynxFormatDir  "^\.h\d\s.*$"
-syn match lynxFormatDir  "^\.\(ex\|nf\)\(\s\+\d\+\)\=$"
+syn match lynxFormatDir  "^\.\%(ex\|nf\)\%(\s\+\d\+\)\=$"
 syn match lynxFormatDir  "^\.fi$"
+syn match lynxFormatDir  "^\.url\>"
 
 hi def link lynxBoolean		Boolean
 hi def link lynxComment		Comment
 hi def link lynxDelimiter	Special
 hi def link lynxFormatDir	Special
+hi def link lynxHttpProtocol	Constant
 hi def link lynxNone		Constant
 hi def link lynxNumber		Number
 hi def link lynxOption		Identifier
@@ -137,4 +148,4 @@ let b:current_syntax = "lynx"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 fdm=marker:
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
-- 
cgit 


From 448907f65d6709fa234d8366053e33311a01bdb9 Mon Sep 17 00:00:00 2001
From: LW <git@llllvvuu.dev>
Date: Sun, 12 Nov 2023 04:54:27 -0800
Subject: feat(lsp)!: vim.lsp.inlay_hint.get(), enable(), is_enabled() #25512

refactor!: `vim.lsp.inlay_hint()` -> `vim.lsp.inlay_hint.enable()`

Problem:
The LSP specification allows inlay hints to include tooltips, clickable
label parts, and code actions; but Neovim provides no API to query for
these.

Solution:
Add minimal viable extension point from which plugins can query for
inlay hints in a range, in order to build functionality on top of.

Possible Next Steps
---

- Add `virt_text_idx` field to `vim.fn.getmousepos()` return value, for
  usage in mappings of `<LeftMouse>`, `<C-LeftMouse>`, etc
---
 runtime/doc/lsp.txt                |  54 ++++++++++--
 runtime/doc/news.txt               |   2 +-
 runtime/lua/vim/lsp.lua            |   8 +-
 runtime/lua/vim/lsp/inlay_hint.lua | 163 +++++++++++++++++++++++++++++--------
 runtime/lua/vim/lsp/protocol.lua   |   7 +-
 5 files changed, 186 insertions(+), 48 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index b727cff2cd..d70c24bb54 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -856,13 +856,6 @@ get_log_path()                                        *vim.lsp.get_log_path()*
     Return: ~
         (string) path to log file
 
-inlay_hint({bufnr}, {enable})                           *vim.lsp.inlay_hint()*
-    Enable/disable/toggle inlay hints for a buffer
-
-    Parameters: ~
-      • {bufnr}   (integer) Buffer handle, or 0 for current
-      • {enable}  (boolean|nil) true/false to enable/disable, nil to toggle
-
 omnifunc({findstart}, {base})                             *vim.lsp.omnifunc()*
     Implements 'omnifunc' compatible LSP completion.
 
@@ -1469,6 +1462,53 @@ save({lenses}, {bufnr}, {client_id})                 *vim.lsp.codelens.save()*
       • {client_id}  (integer)
 
 
+==============================================================================
+Lua module: vim.lsp.inlay_hint                                *lsp-inlay_hint*
+
+enable({bufnr}, {enable})                        *vim.lsp.inlay_hint.enable()*
+    Enable/disable/toggle inlay hints for a buffer
+
+    Parameters: ~
+      • {bufnr}   (integer|nil) Buffer handle, or 0 or nil for current
+      • {enable}  (boolean|nil) true/nil to enable, false to disable
+
+get({filter})                                       *vim.lsp.inlay_hint.get()*
+    Get the list of inlay hints, (optionally) restricted by buffer, client, or
+    range.
+
+    Example usage: >lua
+        local hint = vim.lsp.inlay_hint.get({ bufnr = 0 })[1] -- 0 for current buffer
+
+        local client = vim.lsp.get_client_by_id(hint.client_id)
+        resolved_hint = client.request_sync('inlayHint/resolve', hint.inlay_hint, 100, 0).result
+        vim.lsp.util.apply_text_edits(resolved_hint.textEdits, 0, client.encoding)
+
+        location = resolved_hint.label[1].location
+        client.request("textDocument/hover", {
+          textDocument = { uri = location.uri },
+          position = location.range.start,
+        })
+<
+
+    Parameters: ~
+      • {filter}  vim.lsp.inlay_hint.get.filter ? Optional filters |kwargs|:
+                  • bufnr (integer?): 0 for current buffer
+                  • range (lsp.Range?)
+
+    Return: ~
+        vim.lsp.inlay_hint.get.ret [] Each list item is a table with the following fields:
+        • bufnr (integer)
+        • client_id (integer)
+        • inlay_hint (lsp.InlayHint)
+
+is_enabled({bufnr})                          *vim.lsp.inlay_hint.is_enabled()*
+    Parameters: ~
+      • {bufnr}  (integer|nil) Buffer handle, or 0 or nil for current
+
+    Return: ~
+        (boolean)
+
+
 ==============================================================================
 Lua module: vim.lsp.semantic_tokens                      *lsp-semantic_tokens*
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ac84f59308..9d531b8efc 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -130,7 +130,7 @@ The following new APIs and features were added.
 
 • LSP
   • LSP method names are available in |vim.lsp.protocol.Methods|.
-  • Implemented LSP inlay hints: |vim.lsp.inlay_hint()|
+  • Implemented LSP inlay hints: |lsp-inlay_hint|
     https://microsoft.github.io/language-server-protocol/specification/#textDocument_inlayHint
   • Implemented pull diagnostic textDocument/diagnostic: |vim.lsp.diagnostic.on_diagnostic()|
     https://microsoft.github.io/language-server-protocol/specification/#textDocument_diagnostic
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua
index 82a88772bd..261a3aa5de 100644
--- a/runtime/lua/vim/lsp.lua
+++ b/runtime/lua/vim/lsp.lua
@@ -24,6 +24,7 @@ local lsp = {
   buf = require('vim.lsp.buf'),
   diagnostic = require('vim.lsp.diagnostic'),
   codelens = require('vim.lsp.codelens'),
+  inlay_hint = require('vim.lsp.inlay_hint'),
   semantic_tokens = semantic_tokens,
   util = util,
 
@@ -2439,13 +2440,6 @@ function lsp.with(handler, override_config)
   end
 end
 
---- Enable/disable/toggle inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
----@param enable (boolean|nil) true/false to enable/disable, nil to toggle
-function lsp.inlay_hint(bufnr, enable)
-  return require('vim.lsp.inlay_hint')(bufnr, enable)
-end
-
 --- Helper function to use when implementing a handler.
 --- This will check that all of the keys in the user configuration
 --- are valid keys and make sense to include for this handler.
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index 7b58188c53..cdda5dcc17 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -98,6 +98,107 @@ function M.on_refresh(err, _, ctx, _)
   return vim.NIL
 end
 
+--- @class vim.lsp.inlay_hint.get.filter
+--- @field bufnr integer?
+--- @field range lsp.Range?
+---
+--- @class vim.lsp.inlay_hint.get.ret
+--- @field bufnr integer
+--- @field client_id integer
+--- @field inlay_hint lsp.InlayHint
+
+--- Get the list of inlay hints, (optionally) restricted by buffer, client, or range.
+---
+--- Example usage:
+---
+--- ```lua
+--- local hint = vim.lsp.inlay_hint.get({ bufnr = 0 })[1] -- 0 for current buffer
+---
+--- local client = vim.lsp.get_client_by_id(hint.client_id)
+--- resolved_hint = client.request_sync('inlayHint/resolve', hint.inlay_hint, 100, 0).result
+--- vim.lsp.util.apply_text_edits(resolved_hint.textEdits, 0, client.encoding)
+---
+--- location = resolved_hint.label[1].location
+--- client.request('textDocument/hover', {
+---   textDocument = { uri = location.uri },
+---   position = location.range.start,
+--- })
+--- ```
+---
+--- @param filter vim.lsp.inlay_hint.get.filter?
+--- Optional filters |kwargs|:
+--- - bufnr (integer?): 0 for current buffer
+--- - range (lsp.Range?)
+---
+--- @return vim.lsp.inlay_hint.get.ret[]
+--- Each list item is a table with the following fields:
+---  - bufnr (integer)
+---  - client_id (integer)
+---  - inlay_hint (lsp.InlayHint)
+function M.get(filter)
+  vim.validate({ filter = { filter, 'table', true } })
+  filter = filter or {}
+
+  local bufnr = filter.bufnr
+  if not bufnr then
+    --- @type vim.lsp.inlay_hint.get.ret[]
+    local hints = {}
+    --- @param buf integer
+    vim.tbl_map(function(buf)
+      vim.list_extend(hints, M.get(vim.tbl_extend('keep', { bufnr = buf }, filter)))
+    end, vim.api.nvim_list_bufs())
+    return hints
+  elseif bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
+
+  local bufstate = bufstates[bufnr]
+  if not (bufstate and bufstate.client_hint) then
+    return {}
+  end
+
+  local clients = vim.lsp.get_clients({
+    bufnr = bufnr,
+    method = ms.textDocument_inlayHint,
+  })
+  if #clients == 0 then
+    return {}
+  end
+
+  local range = filter.range
+  if not range then
+    range = {
+      start = { line = 0, character = 0 },
+      ['end'] = { line = api.nvim_buf_line_count(bufnr), character = 0 },
+    }
+  end
+
+  --- @type vim.lsp.inlay_hint.get.ret[]
+  local hints = {}
+  for _, client in pairs(clients) do
+    local hints_by_lnum = bufstate.client_hint[client.id]
+    if hints_by_lnum then
+      for lnum = range.start.line, range['end'].line do
+        local line_hints = hints_by_lnum[lnum] or {}
+        for _, hint in pairs(line_hints) do
+          local line, char = hint.position.line, hint.position.character
+          if
+            (line > range.start.line or char >= range.start.character)
+            and (line < range['end'].line or char <= range['end'].character)
+          then
+            table.insert(hints, {
+              bufnr = bufnr,
+              client_id = client.id,
+              inlay_hint = hint,
+            })
+          end
+        end
+      end
+    end
+  end
+  return hints
+end
+
 --- Clear inlay hints
 ---@param bufnr (integer) Buffer handle, or 0 for current
 local function clear(bufnr)
@@ -120,8 +221,8 @@ local function clear(bufnr)
 end
 
 --- Disable inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
-local function disable(bufnr)
+---@param bufnr (integer|nil) Buffer handle, or 0 or nil for current
+local function _disable(bufnr)
   if bufnr == nil or bufnr == 0 then
     bufnr = api.nvim_get_current_buf()
   end
@@ -142,8 +243,8 @@ local function _refresh(bufnr, opts)
 end
 
 --- Enable inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
-local function enable(bufnr)
+---@param bufnr (integer|nil) Buffer handle, or 0 or nil for current
+local function _enable(bufnr)
   if bufnr == nil or bufnr == 0 then
     bufnr = api.nvim_get_current_buf()
   end
@@ -175,7 +276,7 @@ local function enable(bufnr)
         end
       end,
       on_detach = function(_, cb_bufnr)
-        disable(cb_bufnr)
+        _disable(cb_bufnr)
       end,
     })
     api.nvim_create_autocmd('LspDetach', {
@@ -188,7 +289,7 @@ local function enable(bufnr)
             return c.id ~= args.data.client_id
           end)
         then
-          disable(bufnr)
+          _disable(bufnr)
         end
       end,
       group = augroup,
@@ -199,20 +300,6 @@ local function enable(bufnr)
   end
 end
 
---- Toggle inlay hints for a buffer
----@param bufnr (integer) Buffer handle, or 0 for current
-local function toggle(bufnr)
-  if bufnr == nil or bufnr == 0 then
-    bufnr = api.nvim_get_current_buf()
-  end
-  local bufstate = bufstates[bufnr]
-  if bufstate and bufstate.enabled then
-    disable(bufnr)
-  else
-    enable(bufnr)
-  end
-end
-
 api.nvim_set_decoration_provider(namespace, {
   on_win = function(_, _, bufnr, topline, botline)
     local bufstate = bufstates[bufnr]
@@ -260,15 +347,27 @@ api.nvim_set_decoration_provider(namespace, {
   end,
 })
 
-return setmetatable(M, {
-  __call = function(_, bufnr, enable_)
-    vim.validate({ enable = { enable_, { 'boolean', 'nil' } }, bufnr = { bufnr, 'number' } })
-    if enable_ then
-      enable(bufnr)
-    elseif enable_ == false then
-      disable(bufnr)
-    else
-      toggle(bufnr)
-    end
-  end,
-})
+--- @param bufnr (integer|nil) Buffer handle, or 0 or nil for current
+--- @return boolean
+function M.is_enabled(bufnr)
+  vim.validate({ bufnr = { bufnr, 'number', true } })
+  if bufnr == nil or bufnr == 0 then
+    bufnr = api.nvim_get_current_buf()
+  end
+  return bufstates[bufnr] and bufstates[bufnr].enabled or false
+end
+
+--- Enable/disable/toggle inlay hints for a buffer
+---
+--- @param bufnr (integer|nil) Buffer handle, or 0 or nil for current
+--- @param enable (boolean|nil) true/nil to enable, false to disable
+function M.enable(bufnr, enable)
+  vim.validate({ enable = { enable, 'boolean', true }, bufnr = { bufnr, 'number', true } })
+  if enable == false then
+    _disable(bufnr)
+  else
+    _enable(bufnr)
+  end
+end
+
+return M
diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index 7a48c800c6..e2396e9a5f 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -648,7 +648,12 @@ function protocol.make_client_capabilities()
       inlayHint = {
         dynamicRegistration = true,
         resolveSupport = {
-          properties = {},
+          properties = {
+            'textEdits',
+            'tooltip',
+            'location',
+            'command',
+          },
         },
       },
       semanticTokens = {
-- 
cgit 


From 4f8941c1a5f1ef6caa410feeb52e343db22763ce Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Fri, 10 Nov 2023 12:23:42 +0100
Subject: refactor: replace manual header guards with #pragma once

It is less error-prone than manually defining header guards. Pretty much
all compilers support it even if it's not part of the C standard.
---
 runtime/doc/dev_style.txt | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/dev_style.txt b/runtime/doc/dev_style.txt
index d6c465ef91..cb28f1a845 100644
--- a/runtime/doc/dev_style.txt
+++ b/runtime/doc/dev_style.txt
@@ -32,19 +32,13 @@ but we nonetheless keep things as they are in order to preserve consistency.
 Header Files                                            *dev-style-header*
 
 
-The #define Guard ~
+Header guard ~
 
-All header files should have `#define` guards to prevent multiple inclusion.
-The format of the symbol name should be `NVIM_<DIRECTORY>_<FILE>_H`.
+All header files should start with `#pragma once` to prevent multiple inclusion.
 
     In foo/bar.h:
 >c
-        #ifndef NVIM_FOO_BAR_H
-        #define NVIM_FOO_BAR_H
-
-        ...
-
-        #endif  // NVIM_FOO_BAR_H
+        #pragma once
 <
 
 
@@ -245,15 +239,13 @@ contain only non-static function declarations. >c
 
 
     // src/nvim/foo.h file
-    #ifndef NVIM_FOO_H
-    #define NVIM_FOO_H
+    #pragma once
 
     …
 
     #ifdef INCLUDE_GENERATED_DECLARATIONS
     # include "foo.h.generated.h"
     #endif
-    #endif  // NVIM_FOO_H
 
 
 64-bit Portability ~
-- 
cgit 


From 74e23b3b2ad91d4308c409b4f7419a1d3955a5bb Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 13 Nov 2023 05:44:30 +0800
Subject: vim-patch:2dd613f57bf1 (#26009)

runtime(termdebug): improve the breakpoint sign label (vim/vim#13525)

// related vim/vim#12589
// that should be the last chat (I) with Bram, r.i.p

https://github.com/vim/vim/commit/2dd613f57bf17eb8ff050bcb5510eb0279f5c9ab

Co-authored-by: Shane-XB-Qian <shane.qian@foxmail.com>
---
 runtime/doc/nvim_terminal_emulator.txt               | 6 +++---
 runtime/pack/dist/opt/termdebug/plugin/termdebug.vim | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index f038163ec2..dbc14f5a44 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -537,9 +537,9 @@ If there is no g:termdebug_config you can use: >vim
 
 Change default signs ~
 							*termdebug_signs*
-Termdebug uses the last two characters of the breakpoint ID in the
-signcolumn to represent breakpoints. For example, breakpoint ID 133
-will be displayed as `33`.
+Termdebug uses the hex number of the breakpoint ID in the signcolumn to
+represent breakpoints. if it is greater than "0xFF", then it will be displayed
+as "F+", due to we really only have two screen cells for the sign.
 
 If you want to customize the breakpoint signs: >vim
 	let g:termdebug_config['sign'] = '>>'
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 8beca8ffb3..1b5baa9a8b 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -1781,9 +1781,9 @@ func s:CreateBreakpoint(id, subid, enabled)
       let label = get(g:termdebug_config, 'sign', '')
     endif
     if label == ''
-      let label = substitute(nr, '\..*', '', '')
-      if strlen(label) > 2
-        let label = strpart(label, strlen(label) - 2)
+      let label = printf('%02X', a:id)
+      if a:id > 255
+        let label = 'F+'
       endif
     endif
     call sign_define('debugBreakpoint' .. nr,
-- 
cgit 


From 6d14f3ddab33144966e46487b6039440ac7c43f2 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 13 Nov 2023 06:33:34 +0800
Subject: vim-patch:9.0.2103: recursive callback may cause issues on some archs
 (#26013)

Problem:  recursive callback may cause issues on some archs
Solution: Decrease the limit drastically to 20

Recursive callback limit causes problems on some architectures

Since commit 47510f3d6598a1218958c03ed11337a43b73f48d we have a test
that causes a recursive popup callback function to be executed. However
it seems the current limit of 'maxfuncdepth' option value is still too
recursive for some 32bit architectures (e.g. 32bit ARM).

So instead of allowing a default limit of 100 (default value for
'maxfuncdepth'), let's reduce this limit to 20. I don't think there is a
use case where one would need such a high recursive callback limit and a
limit of 20 seems reasonable (although it is currently hard-coded).

closes: vim/vim#13495
closes: vim/vim#13502

https://github.com/vim/vim/commit/2076463e383901cef44685aaf4b63e4306444f9e

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/message.txt           | 2 ++
 runtime/doc/options.txt           | 1 -
 runtime/lua/vim/_meta/options.lua | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index c3154fc372..9f06e8c931 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -127,6 +127,8 @@ This happens when an Ex command executes an Ex command that executes an Ex
 command, etc.  The limit is 200 or the value of 'maxfuncdepth', whatever is
 larger.  When it's more there probably is an endless loop.  Probably a
 |:execute| or |:source| command is involved.
+Can also happen with a recursive callback function (|channel-callback|).
+A limit of 20 is used here.
 
 							*E254*  >
   Cannot allocate color {name}
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6a71ad296c..7f2eb9da07 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4026,7 +4026,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Increasing this limit above 200 also changes the maximum for Ex
 	command recursion, see |E169|.
 	See also |:function|.
-	Also used for maximum depth of callback functions.
 
 					*'maxmapdepth'* *'mmd'* *E223*
 'maxmapdepth' 'mmd'	number	(default 1000)
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index a8299b31d7..0ef0fece90 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -4037,7 +4037,6 @@ vim.go.mat = vim.go.matchtime
 --- Increasing this limit above 200 also changes the maximum for Ex
 --- command recursion, see `E169`.
 --- See also `:function`.
---- Also used for maximum depth of callback functions.
 ---
 --- @type integer
 vim.o.maxfuncdepth = 100
-- 
cgit 


From d2983dcdb1ca003b5fd42d7d99fd98310aa1cd56 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 13 Nov 2023 07:27:45 +0800
Subject: fix(clipboard): make osc52 work with PUC Lua (#26014)

---
 runtime/lua/vim/clipboard/osc52.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/clipboard/osc52.lua b/runtime/lua/vim/clipboard/osc52.lua
index 78f5754c30..035a6abb86 100644
--- a/runtime/lua/vim/clipboard/osc52.lua
+++ b/runtime/lua/vim/clipboard/osc52.lua
@@ -2,7 +2,7 @@ local M = {}
 
 function M.copy(lines)
   local s = table.concat(lines, '\n')
-  io.stdout:write(string.format('\x1b]52;;%s\x1b\\', vim.base64.encode(s)))
+  io.stdout:write(string.format('\027]52;;%s\027\\', vim.base64.encode(s)))
 end
 
 function M.paste()
@@ -10,7 +10,7 @@ function M.paste()
   local id = vim.api.nvim_create_autocmd('TermResponse', {
     callback = function(args)
       local resp = args.data ---@type string
-      local encoded = resp:match('\x1b%]52;%w?;([A-Za-z0-9+/=]*)')
+      local encoded = resp:match('\027%]52;%w?;([A-Za-z0-9+/=]*)')
       if encoded then
         contents = vim.base64.decode(encoded)
         return true
@@ -18,7 +18,7 @@ function M.paste()
     end,
   })
 
-  io.stdout:write('\x1b]52;;?\x1b\\')
+  io.stdout:write('\027]52;;?\027\\')
 
   local ok, res
 
-- 
cgit 


From 2a58aa57098a4876afa8d865d6d9ec32407d7f11 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 13 Nov 2023 10:47:12 +0800
Subject: vim-patch:9.0.2102: matchparen highlight not cleared in completion
 mode (#26019)

Problem:  matchparen highlight not cleared in completion mode
Solution: Clear matchparen highlighting in completion mode

Remove hard-coded hack in insexpand.c to clear the :3match before
displaying the completion menu.

Add a test for matchparen highlighting. While at it, move all test tests
related to the matchparen plugin into a separate test file.

closes: vim/vim#13493
closes: vim/vim#13524

https://github.com/vim/vim/commit/9588666360e94de3ff58d4bc79aa9148fbf5fc44

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/plugin/matchparen.vim | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index 9d57545ee8..4235a0d39b 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -26,6 +26,7 @@ augroup matchparen
   autocmd! WinLeave,BufLeave * call s:Remove_Matches()
   if exists('##TextChanged')
     autocmd! TextChanged,TextChangedI * call s:Highlight_Matching_Pair()
+    autocmd! TextChangedP * call s:Remove_Matches()
   endif
 augroup END
 
-- 
cgit 


From 48bcc7b9710d6db619b05254ea87f4087cdd9764 Mon Sep 17 00:00:00 2001
From: Chris Simon <chris@devcycles.io>
Date: Tue, 14 Nov 2023 05:39:43 +1100
Subject: fix(lsp): advertise workspace.didChangeConfiguration capability
 (#26028)

This ensures workspace/didChangeConfiguration notification sent after init is correctly handled
---
 runtime/lua/vim/lsp/protocol.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/protocol.lua b/runtime/lua/vim/lsp/protocol.lua
index e2396e9a5f..a7c3914834 100644
--- a/runtime/lua/vim/lsp/protocol.lua
+++ b/runtime/lua/vim/lsp/protocol.lua
@@ -855,6 +855,9 @@ function protocol.make_client_capabilities()
         },
       },
       configuration = true,
+      didChangeConfiguration = {
+        dynamicRegistration = false,
+      },
       workspaceFolders = true,
       applyEdit = true,
       workspaceEdit = {
-- 
cgit 


From ab102f188e86bdbfce1d4de2ef633092a906e8fe Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Mon, 6 Nov 2023 15:46:44 -0600
Subject: refactor: move background color detection into Lua

---
 runtime/lua/vim/_defaults.lua | 130 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua
index c1b50e6950..0d7b4f1884 100644
--- a/runtime/lua/vim/_defaults.lua
+++ b/runtime/lua/vim/_defaults.lua
@@ -164,3 +164,133 @@ do
     end,
   })
 end
+
+--- Guess value of 'background' based on terminal color.
+---
+--- We write Operating System Command (OSC) 11 to the terminal to request the
+--- terminal's background color. We then wait for a response. If the response
+--- matches `rgba:RRRR/GGGG/BBBB/AAAA` where R, G, B, and A are hex digits, then
+--- compute the luminance[1] of the RGB color and classify it as light/dark
+--- accordingly. Note that the color components may have anywhere from one to
+--- four hex digits, and require scaling accordingly as values out of 4, 8, 12,
+--- or 16 bits. Also note the A(lpha) component is optional, and is parsed but
+--- ignored in the calculations.
+---
+--- [1] https://en.wikipedia.org/wiki/Luma_%28video%29
+do
+  --- Parse a string of hex characters as a color.
+  ---
+  --- The string can contain 1 to 4 hex characters. The returned value is
+  --- between 0.0 and 1.0 (inclusive) representing the intensity of the color.
+  ---
+  --- For instance, if only a single hex char "a" is used, then this function
+  --- returns 0.625 (10 / 16), while a value of "aa" would return 0.664 (170 /
+  --- 256).
+  ---
+  --- @param c string Color as a string of hex chars
+  --- @return number? Intensity of the color
+  local function parsecolor(c)
+    local len = #c
+    assert(len > 0 and len <= 4, 'Invalid hex color string')
+    if not c:match('^0x') then
+      c = string.format('0x%s', c)
+    end
+
+    local max = tonumber(string.format('0x%s', string.rep('f', len)))
+    return tonumber(c) / max
+  end
+
+  --- Parse an OSC 11 response
+  ---
+  --- Either of the two formats below are accepted:
+  ---
+  ---   OSC 11 ; rgb:<red>/<green>/<blue>
+  ---
+  --- or
+  ---
+  ---   OSC 11 ; rgba:<red>/<green>/<blue>/<alpha>
+  ---
+  --- where
+  ---
+  ---   <red>, <green>, <blue>, <alpha> := h | hh | hhh | hhhh
+  ---
+  --- The alpha component is ignored, if present.
+  ---
+  --- @param resp string OSC 11 response
+  --- @return string? Red component
+  --- @return string? Green component
+  --- @return string? Blue component
+  local function parseosc11(resp)
+    local r, g, b
+    r, g, b = resp:match('^\027%]11;rgb:(%x+)/(%x+)/(%x+)$')
+    if not r and not g and not b then
+      local a
+      r, g, b, a = resp:match('^\027%]11;rgba:(%x+)/(%x+)/(%x+)/(%x+)$')
+      if not a or #a > 4 then
+        return nil, nil, nil
+      end
+    end
+
+    if r and g and b and #r <= 4 and #g <= 4 and #b <= 4 then
+      return r, g, b
+    end
+
+    return nil, nil, nil
+  end
+
+  local tty = false
+  for _, ui in ipairs(vim.api.nvim_list_uis()) do
+    if ui.chan == 1 and ui.stdout_tty then
+      tty = true
+      break
+    end
+  end
+
+  if tty then
+    local timer = assert(vim.uv.new_timer())
+
+    local id = vim.api.nvim_create_autocmd('TermResponse', {
+      nested = true,
+      callback = function(args)
+        if vim.api.nvim_get_option_info2('background', {}).was_set then
+          -- Don't do anything if 'background' is already set
+          timer:stop()
+          timer:close()
+          return true
+        end
+
+        local resp = args.data ---@type string
+        local r, g, b = parseosc11(resp)
+        if r and g and b then
+          local rr = parsecolor(r)
+          local gg = parsecolor(g)
+          local bb = parsecolor(b)
+
+          if rr and gg and bb then
+            local luminance = (0.299 * rr) + (0.587 * gg) + (0.114 * bb)
+            local bg = luminance < 0.5 and 'dark' or 'light'
+            if bg ~= vim.o.background then
+              vim.o.background = bg
+            end
+          end
+
+          timer:stop()
+          timer:close()
+
+          return true
+        end
+      end,
+    })
+
+    io.stdout:write('\027]11;?\027\\')
+
+    timer:start(1000, 0, function()
+      -- No response received. Delete the autocommand
+      vim.schedule(function()
+        -- Suppress error if autocommand has already been deleted
+        pcall(vim.api.nvim_del_autocmd, id)
+      end)
+      timer:close()
+    end)
+  end
+end
-- 
cgit 


From 8d9789a0f3b748b75ac4ae1b8e43d27af40d49fe Mon Sep 17 00:00:00 2001
From: Gregory Anders <greg@gpanders.com>
Date: Tue, 7 Nov 2023 11:31:21 -0600
Subject: docs: deprecate the "term_background" UI field

---
 runtime/doc/deprecated.txt | 2 ++
 runtime/doc/news.txt       | 4 ++++
 runtime/doc/ui.txt         | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
index 7f7c498880..0a07f06c75 100644
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -202,6 +202,8 @@ UI EXTENSIONS
 			- `["wildmenu_show", items]`
 			- `["wildmenu_select", selected]`
 			- `["wildmenu_hide"]`
+- *term_background*	Unused. The terminal background color is now detected
+			by the Nvim core directly instead of the TUI.
 
 VARIABLES
 - *b:terminal_job_pid*	PID of the top-level process in a |:terminal|.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 9d531b8efc..ee48bddc4d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -340,4 +340,8 @@ release.
 • vim.treesitter.languagetree functions:
   - |LanguageTree:for_each_child()|	Use |LanguageTree:children()| (non-recursive) instead.
 
+• The "term_background" UI option |ui-ext-options| is deprecated and no longer
+  populated. Background color detection is now performed in Lua by the Nvim
+  core, not the TUI.
+
  vim:tw=78:ts=8:sw=2:et:ft=help:norl:
diff --git a/runtime/doc/ui.txt b/runtime/doc/ui.txt
index 9cf0e59854..ab99b0446f 100644
--- a/runtime/doc/ui.txt
+++ b/runtime/doc/ui.txt
@@ -52,7 +52,6 @@ with these (optional) keys:
 - `ext_termcolors`	Use external default colors.
 - `term_name`		Sets the name of the terminal 'term'.
 - `term_colors`		Sets the number of supported colors 't_Co'.
-- `term_background`	Sets the default value of 'background'.
 - `stdin_fd`		Read buffer 1 from this fd as if it were stdin |--|.
 			Only from |--embed| UI on startup. |ui-startup-stdin|
 - `stdin_tty`		Tells if `stdin` is a `tty` or not.
-- 
cgit 


From 5b45efbee6ebb64269469b636baac5248e83421f Mon Sep 17 00:00:00 2001
From: Ploum <1233155+ploum@users.noreply.github.com>
Date: Tue, 14 Nov 2023 11:56:50 +0100
Subject: fix(defaults): set 'fsync' #26034

Problem:
'nofsync' may lose data if the system has a hard shutdown. #9888

Solution:
Change default to 'fsync'. This may be revisited in the future when
'nofsync' can be made safer.
---
 runtime/doc/options.txt  | 2 +-
 runtime/doc/vim_diff.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7f2eb9da07..603b777f55 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2796,7 +2796,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 					*'fsync'* *'fs'* *'nofsync'* *'nofs'*
-'fsync' 'fs'		boolean	(default off)
+'fsync' 'fs'		boolean	(default on)
 			global
 	When on, the OS function fsync() will be called after saving a file
 	(|:write|, |writefile()|, …), |swap-file|, |undo-persistence| and |shada-file|.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 1e12ccd7cc..05d7e5feb9 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -47,7 +47,6 @@ Defaults					            *nvim-defaults*
 - 'encoding' is UTF-8 (cf. 'fileencoding' for file-content encoding)
 - 'fillchars' defaults (in effect) to "vert:│,fold:·,foldsep:│"
 - 'formatoptions' defaults to "tcqj"
-- 'fsync' is disabled
 - 'hidden' is enabled
 - 'history' defaults to 10000 (the maximum)
 - 'hlsearch' is enabled
-- 
cgit 


From b73a829837bbc05840ae00cbe514fb1786695614 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 14 Nov 2023 05:15:45 -0800
Subject: refactor: vim.ui.clipboard #26040

Problem:
Platform-specific UI providers should live in `vim.ui.*`. #24164

Solution:
- Move `vim.clipboard.osc52` module to `vim.ui.clipboard.osc52`.
- TODO: move all of `clipboard.vim` to `vim.ui.clipboard`.

ref #25872
---
 runtime/doc/api.txt                    |  3 +-
 runtime/doc/lsp.txt                    |  2 +-
 runtime/doc/provider.txt               |  8 ++---
 runtime/lua/vim/clipboard/osc52.lua    | 60 ----------------------------------
 runtime/lua/vim/ui/clipboard/osc52.lua | 60 ++++++++++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 66 deletions(-)
 delete mode 100644 runtime/lua/vim/clipboard/osc52.lua
 create mode 100644 runtime/lua/vim/ui/clipboard/osc52.lua

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index b38524bd55..6970479a78 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3598,7 +3598,8 @@ nvim_ui_set_option({name}, {value})                     *nvim_ui_set_option()*
         |RPC| only
 
 nvim_ui_term_event({event}, {value})                    *nvim_ui_term_event()*
-    Tells Nvim when a terminal event has occurred.
+    Tells Nvim when a terminal event has occurred: sets |v:termresponse| and
+    fires |TermResponse|.
 
     The following terminal events are supported:
 
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index d70c24bb54..3cbadb9bdb 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1484,7 +1484,7 @@ get({filter})                                       *vim.lsp.inlay_hint.get()*
         vim.lsp.util.apply_text_edits(resolved_hint.textEdits, 0, client.encoding)
 
         location = resolved_hint.label[1].location
-        client.request("textDocument/hover", {
+        client.request('textDocument/hover', {
           textDocument = { uri = location.uri },
           position = location.range.start,
         })
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 1b49ee3a3d..23bde05072 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -269,12 +269,12 @@ into explicitly by setting the following |g:clipboard| definition: >lua
     vim.g.clipboard = {
       name = 'OSC 52',
       copy = {
-        ['+'] = require('vim.clipboard.osc52').copy,
-        ['*'] = require('vim.clipboard.osc52').copy,
+        ['+'] = require('vim.ui.clipboard.osc52').copy,
+        ['*'] = require('vim.ui.clipboard.osc52').copy,
       },
       paste = {
-        ['+'] = require('vim.clipboard.osc52').paste,
-        ['*'] = require('vim.clipboard.osc52').paste,
+        ['+'] = require('vim.ui.clipboard.osc52').paste,
+        ['*'] = require('vim.ui.clipboard.osc52').paste,
       },
     }
 <
diff --git a/runtime/lua/vim/clipboard/osc52.lua b/runtime/lua/vim/clipboard/osc52.lua
deleted file mode 100644
index 035a6abb86..0000000000
--- a/runtime/lua/vim/clipboard/osc52.lua
+++ /dev/null
@@ -1,60 +0,0 @@
-local M = {}
-
-function M.copy(lines)
-  local s = table.concat(lines, '\n')
-  io.stdout:write(string.format('\027]52;;%s\027\\', vim.base64.encode(s)))
-end
-
-function M.paste()
-  local contents = nil
-  local id = vim.api.nvim_create_autocmd('TermResponse', {
-    callback = function(args)
-      local resp = args.data ---@type string
-      local encoded = resp:match('\027%]52;%w?;([A-Za-z0-9+/=]*)')
-      if encoded then
-        contents = vim.base64.decode(encoded)
-        return true
-      end
-    end,
-  })
-
-  io.stdout:write('\027]52;;?\027\\')
-
-  local ok, res
-
-  -- Wait 1s first for terminals that respond quickly
-  ok, res = vim.wait(1000, function()
-    return contents ~= nil
-  end)
-
-  if res == -1 then
-    -- If no response was received after 1s, print a message and keep waiting
-    vim.api.nvim_echo(
-      { { 'Waiting for OSC 52 response from the terminal. Press Ctrl-C to interrupt...' } },
-      false,
-      {}
-    )
-    ok, res = vim.wait(9000, function()
-      return contents ~= nil
-    end)
-  end
-
-  if not ok then
-    vim.api.nvim_del_autocmd(id)
-    if res == -1 then
-      vim.notify(
-        'Timed out waiting for a clipboard response from the terminal',
-        vim.log.levels.WARN
-      )
-    elseif res == -2 then
-      -- Clear message area
-      vim.api.nvim_echo({ { '' } }, false, {})
-    end
-    return 0
-  end
-
-  -- If we get here, contents should be non-nil
-  return vim.split(assert(contents), '\n')
-end
-
-return M
diff --git a/runtime/lua/vim/ui/clipboard/osc52.lua b/runtime/lua/vim/ui/clipboard/osc52.lua
new file mode 100644
index 0000000000..035a6abb86
--- /dev/null
+++ b/runtime/lua/vim/ui/clipboard/osc52.lua
@@ -0,0 +1,60 @@
+local M = {}
+
+function M.copy(lines)
+  local s = table.concat(lines, '\n')
+  io.stdout:write(string.format('\027]52;;%s\027\\', vim.base64.encode(s)))
+end
+
+function M.paste()
+  local contents = nil
+  local id = vim.api.nvim_create_autocmd('TermResponse', {
+    callback = function(args)
+      local resp = args.data ---@type string
+      local encoded = resp:match('\027%]52;%w?;([A-Za-z0-9+/=]*)')
+      if encoded then
+        contents = vim.base64.decode(encoded)
+        return true
+      end
+    end,
+  })
+
+  io.stdout:write('\027]52;;?\027\\')
+
+  local ok, res
+
+  -- Wait 1s first for terminals that respond quickly
+  ok, res = vim.wait(1000, function()
+    return contents ~= nil
+  end)
+
+  if res == -1 then
+    -- If no response was received after 1s, print a message and keep waiting
+    vim.api.nvim_echo(
+      { { 'Waiting for OSC 52 response from the terminal. Press Ctrl-C to interrupt...' } },
+      false,
+      {}
+    )
+    ok, res = vim.wait(9000, function()
+      return contents ~= nil
+    end)
+  end
+
+  if not ok then
+    vim.api.nvim_del_autocmd(id)
+    if res == -1 then
+      vim.notify(
+        'Timed out waiting for a clipboard response from the terminal',
+        vim.log.levels.WARN
+      )
+    elseif res == -2 then
+      -- Clear message area
+      vim.api.nvim_echo({ { '' } }, false, {})
+    end
+    return 0
+  end
+
+  -- If we get here, contents should be non-nil
+  return vim.split(assert(contents), '\n')
+end
+
+return M
-- 
cgit 


From ac8ed77afb359694a716501d9e87b0c9949b2445 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Tue, 14 Nov 2023 08:53:58 -0600
Subject: feat(tui): add 'termsync' option (#25871)

The 'termsync' option enables a mode (provided the underlying terminal
supports it) where all screen updates during a redraw cycle are buffered
and drawn together when the redraw is complete. This eliminates tearing
or flickering in cases where Nvim redraws slower than the terminal
redraws the screen.
---
 runtime/doc/news.txt              | 3 +++
 runtime/doc/options.txt           | 8 ++++++++
 runtime/lua/vim/_meta/options.lua | 9 +++++++++
 3 files changed, 20 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ee48bddc4d..ae97772b66 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -211,6 +211,9 @@ The following new APIs and features were added.
 • A clipboard provider which uses OSC 52 to copy the selection to the system
   clipboard is now bundled by default. |clipboard-osc52|
 
+• The 'termsync' option asks the terminal emulator to buffer screen updates
+  until the redraw cycle is complete. Requires support from the terminal.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 603b777f55..07326c8c13 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6523,6 +6523,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	   C1	    Control characters 0x80...0x9F
 
+					*'termsync'* *'notermsync'*
+'termsync'		boolean	(default on)
+			global
+	If the host terminal supports it, buffer all screen updates
+	made during a redraw cycle so that each screen is displayed in
+	the terminal all at once. This can prevent tearing or flickering
+	when the terminal updates faster than Nvim can redraw.
+
 						*'textwidth'* *'tw'*
 'textwidth' 'tw'	number	(default 0)
 			local to buffer
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 0ef0fece90..19ae786177 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -6978,6 +6978,15 @@ vim.o.tpf = vim.o.termpastefilter
 vim.go.termpastefilter = vim.o.termpastefilter
 vim.go.tpf = vim.go.termpastefilter
 
+--- If the host terminal supports it, buffer all screen updates
+--- made during a redraw cycle so that each screen is displayed in
+--- the terminal all at once. This can prevent tearing or flickering
+--- when the terminal updates faster than Nvim can redraw.
+---
+--- @type boolean
+vim.o.termsync = true
+vim.go.termsync = vim.o.termsync
+
 --- Maximum width of text that is being inserted.  A longer line will be
 --- broken after white space to get this width.  A zero value disables
 --- this.
-- 
cgit 


From 9e2248ab586c5e5854da68b5310755ea3557e6c9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 14 Nov 2023 17:38:46 +0100
Subject: vim-patch:9.0.2104: wast filetype should be replaced by wat filetype

Problem:  wast filetype should be replaced by wat filetype
Solution: start using the official wat filetype name

runtime: rename `wast` filetype to `wat` (Wasm text format)

The problem is the name of the current filetype wast. When the plugin
was initially created, the file extension for Wasm text format was not
fixed and .wast was more popular.

However, recently .wat became the official file extension for
WebAssembly text (WAT) format and .wast is now a file extension for the
unofficial WAST format, which is a superset of .wat for the convenience
to describe the Wasm specification conformance tests.

https://webassembly.js.org/docs/contrib-wat-vs-wast.html

However for now, let's keep using the `wat` filetype even for the .wast
extension, so that we at least do not lose the filetype settings and
syntax highlighting. This can be adjusted later, if it turns out to have
a separate need for.

closes: vim/vim#13533

https://github.com/vim/vim/commit/bc8f79d36a456054ed29f46585830af6d71f57c8

Co-authored-by: rhysd <lin90162@yahoo.co.jp>
---
 runtime/ftplugin/wast.vim    | 17 --------
 runtime/ftplugin/wat.vim     | 17 ++++++++
 runtime/indent/wast.vim      | 17 --------
 runtime/indent/wat.vim       | 17 ++++++++
 runtime/lua/vim/filetype.lua |  2 +-
 runtime/makemenu.vim         |  2 +-
 runtime/synmenu.vim          |  2 +-
 runtime/syntax/wast.vim      | 97 --------------------------------------------
 runtime/syntax/wat.vim       | 97 ++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 134 insertions(+), 134 deletions(-)
 delete mode 100644 runtime/ftplugin/wast.vim
 create mode 100644 runtime/ftplugin/wat.vim
 delete mode 100644 runtime/indent/wast.vim
 create mode 100644 runtime/indent/wat.vim
 delete mode 100644 runtime/syntax/wast.vim
 create mode 100644 runtime/syntax/wat.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/wast.vim b/runtime/ftplugin/wast.vim
deleted file mode 100644
index 0d9e98d37a..0000000000
--- a/runtime/ftplugin/wast.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-" Vim filetype plugin file
-" Language:     WebAssembly
-" Maintainer:   rhysd <lin90162@yahoo.co.jp>
-" Last Change:  Jul 29, 2018
-" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
-
-if exists("b:did_ftplugin")
-    finish
-endif
-let b:did_ftplugin = 1
-
-setlocal comments=s:(;,e:;),:;;
-setlocal commentstring=(;%s;)
-setlocal formatoptions-=t
-setlocal iskeyword+=$,.,/
-
-let b:undo_ftplugin = "setlocal comments< commentstring< formatoptions< iskeyword<"
diff --git a/runtime/ftplugin/wat.vim b/runtime/ftplugin/wat.vim
new file mode 100644
index 0000000000..35d2d6a322
--- /dev/null
+++ b/runtime/ftplugin/wat.vim
@@ -0,0 +1,17 @@
+" Vim filetype plugin file
+" Language:     WebAssembly
+" Maintainer:   rhysd <lin90162@yahoo.co.jp>
+" Last Change:  Nov 14, 2023
+" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=s:(;,e:;),:;;
+setlocal commentstring=(;%s;)
+setlocal formatoptions-=t
+setlocal iskeyword+=$,.,/
+
+let b:undo_ftplugin = "setlocal comments< commentstring< formatoptions< iskeyword<"
diff --git a/runtime/indent/wast.vim b/runtime/indent/wast.vim
deleted file mode 100644
index 1be234b6e9..0000000000
--- a/runtime/indent/wast.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-" Vim indent file
-" Language:     WebAssembly
-" Maintainer:   rhysd <lin90162@yahoo.co.jp>
-" Last Change:  Jul 29, 2018
-" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
-
-if exists("b:did_indent")
-    finish
-endif
-let b:did_indent = 1
-
-" WebAssembly text format is S-expression. We can reuse LISP indentation
-" logic.
-setlocal indentexpr=lispindent('.')
-setlocal noautoindent nosmartindent
-
-let b:undo_indent = "setl lisp< indentexpr<"
diff --git a/runtime/indent/wat.vim b/runtime/indent/wat.vim
new file mode 100644
index 0000000000..08997f1a98
--- /dev/null
+++ b/runtime/indent/wat.vim
@@ -0,0 +1,17 @@
+" Vim indent file
+" Language:     WebAssembly
+" Maintainer:   rhysd <lin90162@yahoo.co.jp>
+" Last Change:  Nov 14, 2023
+" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+" WebAssembly text format is S-expression. We can reuse LISP indentation
+" logic.
+setlocal indentexpr=lispindent('.')
+setlocal noautoindent nosmartindent
+
+let b:undo_indent = "setl lisp< indentexpr<"
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index aae63af132..217f673b5e 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1074,7 +1074,7 @@ local extension = {
   wrl = 'vrml',
   vroom = 'vroom',
   vue = 'vue',
-  wast = 'wast',
+  wast = 'wat',
   wat = 'wat',
   wdl = 'wdl',
   wm = 'webmacro',
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 8eea49d711..5d288e2f40 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -649,7 +649,7 @@ SynMenu UV.VSE\ JCL:vsejcl
 SynMenu WXYZ.WEB.CWEB:cweb
 SynMenu WXYZ.WEB.WEB:web
 SynMenu WXYZ.WEB.WEB\ Changes:change
-SynMenu WXYZ.WebAssembly:wast
+SynMenu WXYZ.WebAssembly:wat
 SynMenu WXYZ.Webmacro:webmacro
 SynMenu WXYZ.Website\ MetaLanguage:wml
 SynMenu WXYZ.wDiff:wdiff
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index fec5cc4b06..43aae6f88b 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -623,7 +623,7 @@ an 50.160.330 &Syntax.UV.VSE\ JCL :cal SetSyn("vsejcl")<CR>
 an 50.170.100 &Syntax.WXYZ.WEB.CWEB :cal SetSyn("cweb")<CR>
 an 50.170.110 &Syntax.WXYZ.WEB.WEB :cal SetSyn("web")<CR>
 an 50.170.120 &Syntax.WXYZ.WEB.WEB\ Changes :cal SetSyn("change")<CR>
-an 50.170.130 &Syntax.WXYZ.WebAssembly :cal SetSyn("wast")<CR>
+an 50.170.130 &Syntax.WXYZ.WebAssembly :cal SetSyn("wat")<CR>
 an 50.170.140 &Syntax.WXYZ.Webmacro :cal SetSyn("webmacro")<CR>
 an 50.170.150 &Syntax.WXYZ.Website\ MetaLanguage :cal SetSyn("wml")<CR>
 an 50.170.170 &Syntax.WXYZ.wDiff :cal SetSyn("wdiff")<CR>
diff --git a/runtime/syntax/wast.vim b/runtime/syntax/wast.vim
deleted file mode 100644
index 113d65c5a1..0000000000
--- a/runtime/syntax/wast.vim
+++ /dev/null
@@ -1,97 +0,0 @@
-" Vim syntax file
-" Language:     WebAssembly
-" Maintainer:   rhysd <lin90162@yahoo.co.jp>
-" Last Change:  Aug 7, 2023
-" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
-
-if exists("b:current_syntax")
-    finish
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-syn cluster wastNotTop contains=wastModule,wastInstWithType,wastInstGetSet,wastInstGeneral,wastParamInst,wastControlInst,wastSimdInst,wastString,wastNamedVar,wastUnnamedVar,wastFloat,wastNumber,wastComment,wastList,wastType
-
-" Instructions
-" https://webassembly.github.io/spec/core/text/instructions.html
-" Note: memarg (align=,offset=) can be added to memory instructions
-syn match   wastInstWithType  "\%((\s*\)\@<=\<\%(i32\|i64\|f32\|f64\|memory\)\.[[:alnum:]_]\+\%(/\%(i32\|i64\|f32\|f64\)\)\=\>\%(\s\+\%(align\|offset\)=\)\=" contained display
-syn match   wastInstGeneral   "\%((\s*\)\@<=\<[[:alnum:]_]\+\>" contained display
-syn match   wastInstGetSet    "\%((\s*\)\@<=\<\%(local\|global\)\.\%(get\|set\)\>" contained display
-" https://webassembly.github.io/spec/core/text/instructions.html#control-instructions
-syn match   wastControlInst   "\%((\s*\)\@<=\<\%(block\|end\|loop\|if\|then\|else\|unreachable\|nop\|br\|br_if\|br_table\|return\|call\|call_indirect\)\>" contained display
-" https://webassembly.github.io/spec/core/text/instructions.html#parametric-instructions
-syn match   wastParamInst     "\%((\s*\)\@<=\<\%(drop\|select\)\>" contained display
-" SIMD instructions
-" https://webassembly.github.io/simd/core/text/instructions.html#simd-instructions
-syn match   wastSimdInst      "\<\%(v128\|i8x16\|i16x8\|i32x4\|i64x2\|f32x4\|f64x2)\)\.[[:alnum:]_]\+\%(\s\+\%(i8x16\|i16x8\|i32x4\|i64x2\|f32x4\|f64x2\)\)\=\>" contained display
-
-" Identifiers
-" https://webassembly.github.io/spec/core/text/values.html#text-id
-syn match   wastNamedVar      "$\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]*" contained contains=wastEscapeUtf8
-syn match   wastUnnamedVar    "$\+\d\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]\@!" contained display
-" Presuming the source text is itself encoded correctly, strings that do not
-" contain any uses of hexadecimal byte escapes are always valid names.
-" https://webassembly.github.io/spec/core/text/values.html#names
-syn match   wastEscapedUtf8   "\\\x\{1,6}" contained containedin=wastNamedVar display
-
-" String literals
-" https://webassembly.github.io/spec/core/text/values.html#strings
-syn region  wastString        start=+"+ skip=+\\\\\|\\"+ end=+"+ contained contains=wastStringSpecial
-syn match   wastStringSpecial "\\\x\x\|\\[tnr'\\\"]\|\\u\x\+" contained containedin=wastString display
-
-" Float literals
-" https://webassembly.github.io/spec/core/text/values.html#floating-point
-syn match   wastFloat         "\<-\=\d\%(_\=\d\)*\%(\.\d\%(_\=\d\)*\)\=\%([eE][-+]\=\d\%(_\=\d\)*\)\=" display contained
-syn match   wastFloat         "\<-\=0x\x\%(_\=\x\)*\%(\.\x\%(_\=\x\)*\)\=\%([pP][-+]\=\d\%(_\=\d\)*\)\=" display contained
-syn keyword wastFloat         inf nan contained
-syn match   wastFloat         "nan:0x\x\%(_\=\x\)*" display contained
-
-" Integer literals
-" https://webassembly.github.io/spec/core/text/values.html#integers
-syn match   wastNumber        "\<-\=\d\%(_\=\d\)*\>" display contained
-syn match   wastNumber        "\<-\=0x\x\%(_\=\x\)*\>" display contained
-
-" Comments
-" https://webassembly.github.io/spec/core/text/lexical.html#comments
-syn region  wastComment       start=";;" end="$"
-syn region  wastComment       start="(;;\@!" end=";)"
-
-syn region  wastList          matchgroup=wastListDelimiter start="(;\@!" matchgroup=wastListDelimiter end=";\@<!)" contains=@wastNotTop
-
-" Types
-" https://webassembly.github.io/spec/core/text/types.html
-" Note: `mut` was changed to `const`/`var` at Wasm 2.0
-syn keyword wastType          i64 i32 f64 f32 param result funcref func externref extern mut v128 const var contained
-syn match   wastType          "\%((\_s*\)\@<=func\%(\_s*[()]\)\@=" display contained
-
-" Modules
-" https://webassembly.github.io/spec/core/text/modules.html
-syn keyword wastModule        module type export import table memory global data elem contained
-syn match   wastModule        "\%((\_s*\)\@<=func\%(\_s\+\$\)\@=" display contained
-
-syn sync maxlines=100
-
-hi def link wastModule        PreProc
-hi def link wastListDelimiter Delimiter
-hi def link wastInstWithType  Operator
-hi def link wastInstGetSet    Operator
-hi def link wastInstGeneral   Operator
-hi def link wastControlInst   Statement
-hi def link wastSimdInst      Operator
-hi def link wastParamInst     Conditional
-hi def link wastString        String
-hi def link wastStringSpecial Special
-hi def link wastNamedVar      Identifier
-hi def link wastUnnamedVar    PreProc
-hi def link wastFloat         Float
-hi def link wastNumber        Number
-hi def link wastComment       Comment
-hi def link wastType          Type
-hi def link wastEscapedUtf8   Special
-
-let b:current_syntax = "wast"
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/runtime/syntax/wat.vim b/runtime/syntax/wat.vim
new file mode 100644
index 0000000000..a6b926be98
--- /dev/null
+++ b/runtime/syntax/wat.vim
@@ -0,0 +1,97 @@
+" Vim syntax file
+" Language:     WebAssembly
+" Maintainer:   rhysd <lin90162@yahoo.co.jp>
+" Last Change:  Nov 14, 2023
+" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn cluster watNotTop contains=watModule,watInstWithType,watInstGetSet,watInstGeneral,watParamInst,watControlInst,watSimdInst,watString,watNamedVar,watUnnamedVar,watFloat,watNumber,watComment,watList,watType
+
+" Instructions
+" https://webassembly.github.io/spec/core/text/instructions.html
+" Note: memarg (align=,offset=) can be added to memory instructions
+syn match   watInstWithType  "\%((\s*\)\@<=\<\%(i32\|i64\|f32\|f64\|memory\)\.[[:alnum:]_]\+\%(/\%(i32\|i64\|f32\|f64\)\)\=\>\%(\s\+\%(align\|offset\)=\)\=" contained display
+syn match   watInstGeneral   "\%((\s*\)\@<=\<[[:alnum:]_]\+\>" contained display
+syn match   watInstGetSet    "\%((\s*\)\@<=\<\%(local\|global\)\.\%(get\|set\)\>" contained display
+" https://webassembly.github.io/spec/core/text/instructions.html#control-instructions
+syn match   watControlInst   "\%((\s*\)\@<=\<\%(block\|end\|loop\|if\|then\|else\|unreachable\|nop\|br\|br_if\|br_table\|return\|call\|call_indirect\)\>" contained display
+" https://webassembly.github.io/spec/core/text/instructions.html#parametric-instructions
+syn match   watParamInst     "\%((\s*\)\@<=\<\%(drop\|select\)\>" contained display
+" SIMD instructions
+" https://webassembly.github.io/simd/core/text/instructions.html#simd-instructions
+syn match   watSimdInst      "\<\%(v128\|i8x16\|i16x8\|i32x4\|i64x2\|f32x4\|f64x2)\)\.[[:alnum:]_]\+\%(\s\+\%(i8x16\|i16x8\|i32x4\|i64x2\|f32x4\|f64x2\)\)\=\>" contained display
+
+" Identifiers
+" https://webassembly.github.io/spec/core/text/values.html#text-id
+syn match   watNamedVar      "$\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]*" contained contains=watEscapeUtf8
+syn match   watUnnamedVar    "$\+\d\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]\@!" contained display
+" Presuming the source text is itself encoded correctly, strings that do not
+" contain any uses of hexadecimal byte escapes are always valid names.
+" https://webassembly.github.io/spec/core/text/values.html#names
+syn match   watEscapedUtf8   "\\\x\{1,6}" contained containedin=watNamedVar display
+
+" String literals
+" https://webassembly.github.io/spec/core/text/values.html#strings
+syn region  watString        start=+"+ skip=+\\\\\|\\"+ end=+"+ contained contains=watStringSpecial
+syn match   watStringSpecial "\\\x\x\|\\[tnr'\\\"]\|\\u\x\+" contained containedin=watString display
+
+" Float literals
+" https://webassembly.github.io/spec/core/text/values.html#floating-point
+syn match   watFloat         "\<-\=\d\%(_\=\d\)*\%(\.\d\%(_\=\d\)*\)\=\%([eE][-+]\=\d\%(_\=\d\)*\)\=" display contained
+syn match   watFloat         "\<-\=0x\x\%(_\=\x\)*\%(\.\x\%(_\=\x\)*\)\=\%([pP][-+]\=\d\%(_\=\d\)*\)\=" display contained
+syn keyword watFloat         inf nan contained
+syn match   watFloat         "nan:0x\x\%(_\=\x\)*" display contained
+
+" Integer literals
+" https://webassembly.github.io/spec/core/text/values.html#integers
+syn match   watNumber        "\<-\=\d\%(_\=\d\)*\>" display contained
+syn match   watNumber        "\<-\=0x\x\%(_\=\x\)*\>" display contained
+
+" Comments
+" https://webassembly.github.io/spec/core/text/lexical.html#comments
+syn region  watComment       start=";;" end="$"
+syn region  watComment       start="(;;\@!" end=";)"
+
+syn region  watList          matchgroup=watListDelimiter start="(;\@!" matchgroup=watListDelimiter end=";\@<!)" contains=@watNotTop
+
+" Types
+" https://webassembly.github.io/spec/core/text/types.html
+" Note: `mut` was changed to `const`/`var` at Wasm 2.0
+syn keyword watType          i64 i32 f64 f32 param result funcref func externref extern mut v128 const var contained
+syn match   watType          "\%((\_s*\)\@<=func\%(\_s*[()]\)\@=" display contained
+
+" Modules
+" https://webassembly.github.io/spec/core/text/modules.html
+syn keyword watModule        module type export import table memory global data elem contained
+syn match   watModule        "\%((\_s*\)\@<=func\%(\_s\+\$\)\@=" display contained
+
+syn sync maxlines=100
+
+hi def link watModule        PreProc
+hi def link watListDelimiter Delimiter
+hi def link watInstWithType  Operator
+hi def link watInstGetSet    Operator
+hi def link watInstGeneral   Operator
+hi def link watControlInst   Statement
+hi def link watSimdInst      Operator
+hi def link watParamInst     Conditional
+hi def link watString        String
+hi def link watStringSpecial Special
+hi def link watNamedVar      Identifier
+hi def link watUnnamedVar    PreProc
+hi def link watFloat         Float
+hi def link watNumber        Number
+hi def link watComment       Comment
+hi def link watType          Type
+hi def link watEscapedUtf8   Special
+
+let b:current_syntax = "wat"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
-- 
cgit 


From 7e0f6211af21ef57f1a3e4eb58fb4ad1903c986c Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 14 Nov 2023 17:31:50 +0100
Subject: vim-patch:30c762d99ac8

runtime(doc): fix typo in pi_gzip.txt

https://github.com/vim/vim/commit/30c762d99ac8e755afb00f89ddd009988e95abce

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/pi_gzip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
index 1aadc103fd..93a2388c26 100644
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -22,7 +22,7 @@ executing the executables command when set to "0": >
 <
 
 ==============================================================================
-2. Autocommands						*gzip-autocmd*
+1. Autocommands						*gzip-autocmd*
 
 The plugin installs autocommands to intercept reading and writing of files
 with these extensions:
-- 
cgit 


From c37f7bdba5069eb989c3374c660b540e7539f874 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 14 Nov 2023 17:31:59 +0100
Subject: vim-patch:67abf1592c83

runtime(tar): comment out strange error condition check

https://github.com/vim/vim/commit/67abf1592c83c910c7815478f67e0a8989d51417

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/autoload/tar.vim | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index b31549a891..e242fe98e3 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -1,7 +1,7 @@
 " tar.vim: Handles browsing tarfiles
 "            AUTOLOAD PORTION
-" Date:		Nov 05, 2023
-" Version:	32a  (with modifications from the Vim Project)
+" Date:		Nov 14, 2023
+" Version:	32b  (with modifications from the Vim Project)
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
 "
@@ -208,27 +208,24 @@ fun! tar#Browse(tarfile)
 "   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
    return
   endif
-  " If there was an error message, the last line probably matches some keywords but
-  " should also contain whitespace for readability. Make sure not to match a
-  " filename that contains the keyword (error/warning/unrecognized/inappropriate, etc)
   "
-  " FIXME:is this actually necessary? In case of an error, we should probably
-  "       have noticed in the if statement above since tar should have exited
-  "       with a non-zero exit code.
-  if line("$") == curlast || ( line("$") == (curlast + 1) &&
-        \ getline("$") =~# '\c\<\%(warning\|error\|inappropriate\|unrecognized\)\>' &&
-        \ getline("$") =~  '\s' )
-   redraw!
-   echohl WarningMsg | echo "***warning*** (tar#Browse) ".a:tarfile." doesn't appear to be a tar file" | echohl None
-   keepj sil! %d
-   let eikeep= &ei
-   set ei=BufReadCmd,FileReadCmd
-   exe "r ".fnameescape(a:tarfile)
-   let &ei= eikeep
-   keepj sil! 1d
-"   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
-   return
-  endif
+  " The following should not be neccessary, since in case of errors the
+  " previous if statement should have caught the problem (because tar exited
+  " with a non-zero exit code).
+  " if line("$") == curlast || ( line("$") == (curlast + 1) &&
+  "       \ getline("$") =~# '\c\<\%(warning\|error\|inappropriate\|unrecognized\)\>' &&
+  "       \ getline("$") =~  '\s' )
+  "  redraw!
+  "  echohl WarningMsg | echo "***warning*** (tar#Browse) ".a:tarfile." doesn't appear to be a tar file" | echohl None
+  "  keepj sil! %d
+  "  let eikeep= &ei
+  "  set ei=BufReadCmd,FileReadCmd
+  "  exe "r ".fnameescape(a:tarfile)
+  "  let &ei= eikeep
+  "  keepj sil! 1d
+  "   call Dret("tar#Browse : a:tarfile<".a:tarfile.">")
+  "  return
+  " endif
 
   " set up maps supported for tar
   setlocal noma nomod ro
-- 
cgit 


From ba58c6f8a44c9c37e97fce1d802dc5b5defceb3d Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Tue, 14 Nov 2023 17:02:57 -0600
Subject: fix: only attempt to close timer if not already closing (#26047)

This fixes an error that can occur in certain pathological cases when
the autocommand fires at just the right time such that it attempts to
close the timer after the timer has already exited, but before the
scheduled callback has fired.

We now let the timer continue to run even when the autocommand deletes
itself to avoid having to repeat the cleanup code multiple times. There
is no harm in letting the timer execute if the autocommand does not
exist, as the pcall will catch the error.
---
 runtime/lua/vim/_defaults.lua | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua
index 0d7b4f1884..870603c9f3 100644
--- a/runtime/lua/vim/_defaults.lua
+++ b/runtime/lua/vim/_defaults.lua
@@ -254,8 +254,6 @@ do
       callback = function(args)
         if vim.api.nvim_get_option_info2('background', {}).was_set then
           -- Don't do anything if 'background' is already set
-          timer:stop()
-          timer:close()
           return true
         end
 
@@ -274,9 +272,6 @@ do
             end
           end
 
-          timer:stop()
-          timer:close()
-
           return true
         end
       end,
@@ -290,7 +285,10 @@ do
         -- Suppress error if autocommand has already been deleted
         pcall(vim.api.nvim_del_autocmd, id)
       end)
-      timer:close()
+
+      if not timer:is_closing() then
+        timer:close()
+      end
     end)
   end
 end
-- 
cgit 


From dc3f84bf4f94d0389f74991c555c3e76c2ea67f6 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 16 Nov 2023 10:53:25 -0600
Subject: docs: fix vim.snippet help tags (#26068)

---
 runtime/doc/lua.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index ada07a71f8..db240e8b75 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3697,16 +3697,16 @@ totable({f}, {...})                                       *vim.iter.totable()*
 ==============================================================================
 Lua module: vim.snippet                                          *vim.snippet*
 
-active()                                                    *snippet.active()*
+vim.snippet.active()                                    *vim.snippet.active()*
     Returns `true` if there's an active snippet in the current buffer.
 
     Return: ~
         (boolean)
 
-exit()                                                        *snippet.exit()*
+vim.snippet.exit()                                        *vim.snippet.exit()*
     Exits the current snippet.
 
-expand({input})                                             *snippet.expand()*
+vim.snippet.expand({input})                             *vim.snippet.expand()*
     Expands the given snippet text. Refer to https://microsoft.github.io/language-server-protocol/specification/#snippet_syntax for the specification of valid input.
 
     Tabstops are highlighted with hl-SnippetTabstop.
@@ -3714,7 +3714,7 @@ expand({input})                                             *snippet.expand()*
     Parameters: ~
       • {input}  (string)
 
-jump({direction})                                             *snippet.jump()*
+vim.snippet.jump({direction})                             *vim.snippet.jump()*
     Jumps within the active snippet in the given direction. If the jump isn't
     possible, the function call does nothing.
 
@@ -3732,7 +3732,7 @@ jump({direction})                                             *snippet.jump()*
       • {direction}  (vim.snippet.Direction) Navigation direction. -1 for
                      previous, 1 for next.
 
-jumpable({direction})                                     *snippet.jumpable()*
+vim.snippet.jumpable({direction})                     *vim.snippet.jumpable()*
     Returns `true` if there is an active snippet which can be jumped in the
     given direction. You can use this function to navigate a snippet as
     follows: >lua
-- 
cgit 


From b4b7ca2d548a1cc1a2cd8c48e5c93478811bd275 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 16 Nov 2023 11:12:42 -0600
Subject: feat(tui): support DCS responses in TermResponse event (#26061)

---
 runtime/doc/api.txt           | 8 ++++----
 runtime/doc/autocmd.txt       | 4 ++--
 runtime/doc/eval.txt          | 8 ++++----
 runtime/lua/vim/_meta/api.lua | 7 ++++---
 4 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 6970479a78..908198de4c 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -3598,13 +3598,13 @@ nvim_ui_set_option({name}, {value})                     *nvim_ui_set_option()*
         |RPC| only
 
 nvim_ui_term_event({event}, {value})                    *nvim_ui_term_event()*
-    Tells Nvim when a terminal event has occurred: sets |v:termresponse| and
-    fires |TermResponse|.
+    Tells Nvim when a terminal event has occurred
 
     The following terminal events are supported:
 
-    • "osc_response": The terminal sent a OSC response sequence to Nvim. The
-      payload is the received OSC sequence.
+    • "termresponse": The terminal sent an OSC or DCS response sequence to
+      Nvim. The payload is the received response. Sets |v:termresponse| and
+      fires |TermResponse|.
 
     Attributes: ~
         |RPC| only
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 6b698b0868..c6f6559e37 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -987,8 +987,8 @@ TermClose			When a |terminal| job ends.
 				Sets these |v:event| keys:
 				    status
 							*TermResponse*
-TermResponse			When Nvim receives a OSC response from the
-				terminal.  Sets |v:termresponse|. When used
+TermResponse			When Nvim receives an OSC or DCS response from
+				the terminal.  Sets |v:termresponse|. When used
 				from Lua, the response string is included in
 				the "data" field of the autocommand callback.
 				May be triggered halfway through another event
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 2223829548..a73932be00 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2318,10 +2318,10 @@ v:t_string	Value of |String| type.  Read-only.  See: |type()|
 v:t_blob	Value of |Blob| type.  Read-only.  See: |type()|
 
 				*v:termresponse* *termresponse-variable*
-v:termresponse	The value of the most recent OSC escape sequence received by
-		Nvim from the terminal. This can be read in a |TermResponse|
-		event handler after querying the terminal using another escape
-		sequence.
+v:termresponse	The value of the most recent OSC or DCS escape sequence
+		received by Nvim from the terminal. This can be read in a
+		|TermResponse| event handler after querying the terminal using
+		another escape sequence.
 
 					*v:testing* *testing-variable*
 v:testing	Must be set before using `test_garbagecollect_now()`.
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 2142a429a2..0c8979054f 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -2065,11 +2065,12 @@ function vim.api.nvim_ui_set_focus(gained) end
 --- @param value any
 function vim.api.nvim_ui_set_option(name, value) end
 
---- Tells Nvim when a terminal event has occurred.
+--- Tells Nvim when a terminal event has occurred
 --- The following terminal events are supported:
 ---
---- • "osc_response": The terminal sent a OSC response sequence to Nvim. The
----   payload is the received OSC sequence.
+--- • "termresponse": The terminal sent an OSC or DCS response sequence to
+---   Nvim. The payload is the received response. Sets `v:termresponse` and
+---   fires `TermResponse`.
 ---
 ---
 --- @param event string Event name
-- 
cgit 


From 4bf47222c973c4bc935d6fde106329f8a0e103e3 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 16 Nov 2023 11:35:54 -0600
Subject: feat: add vim.text module (#26069)

---
 runtime/doc/lua.txt                | 22 ++++++++++++++++++++++
 runtime/doc/news.txt               |  3 +++
 runtime/lua/vim/_init_packages.lua |  1 +
 runtime/lua/vim/text.lua           | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 runtime/lua/vim/text.lua

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index db240e8b75..596b58d4ff 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -3752,4 +3752,26 @@ vim.snippet.jumpable({direction})                     *vim.snippet.jumpable()*
     Return: ~
         (boolean)
 
+
+==============================================================================
+Lua module: vim.text                                                *vim.text*
+
+vim.text.hexdecode({enc})                               *vim.text.hexdecode()*
+    Hex decode a string.
+
+    Parameters: ~
+      • {enc}  (string) String to decode
+
+    Return: ~
+        (string) Decoded string
+
+vim.text.hexencode({str})                               *vim.text.hexencode()*
+    Hex encode a string.
+
+    Parameters: ~
+      • {str}  (string) String to encode
+
+    Return: ~
+        (string) Hex encoded string
+
  vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl:
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ae97772b66..98848f548f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -214,6 +214,9 @@ The following new APIs and features were added.
 • The 'termsync' option asks the terminal emulator to buffer screen updates
   until the redraw cycle is complete. Requires support from the terminal.
 
+• Added |vim.text.hexencode()| and |vim.text.hexdecode()| to convert strings
+  to and from byte representations.
+
 ==============================================================================
 CHANGED FEATURES                                                 *news-changed*
 
diff --git a/runtime/lua/vim/_init_packages.lua b/runtime/lua/vim/_init_packages.lua
index 8750afba34..4a961970cc 100644
--- a/runtime/lua/vim/_init_packages.lua
+++ b/runtime/lua/vim/_init_packages.lua
@@ -57,6 +57,7 @@ vim._submodules = {
   fs = true,
   iter = true,
   re = true,
+  text = true,
 }
 
 -- These are for loading runtime modules in the vim namespace lazily.
diff --git a/runtime/lua/vim/text.lua b/runtime/lua/vim/text.lua
new file mode 100644
index 0000000000..cfb0f9b821
--- /dev/null
+++ b/runtime/lua/vim/text.lua
@@ -0,0 +1,32 @@
+--- Text processing functions.
+
+local M = {}
+
+--- Hex encode a string.
+---
+--- @param str string String to encode
+--- @return string Hex encoded string
+function M.hexencode(str)
+  local bytes = { str:byte(1, #str) }
+  local enc = {} ---@type string[]
+  for i = 1, #bytes do
+    enc[i] = string.format('%02X', bytes[i])
+  end
+  return table.concat(enc)
+end
+
+--- Hex decode a string.
+---
+--- @param enc string String to decode
+--- @return string Decoded string
+function M.hexdecode(enc)
+  assert(#enc % 2 == 0, 'string must have an even number of hex characters')
+  local str = {} ---@type string[]
+  for i = 1, #enc, 2 do
+    local n = assert(tonumber(enc:sub(i, i + 1), 16))
+    str[#str + 1] = string.char(n)
+  end
+  return table.concat(str)
+end
+
+return M
-- 
cgit 


From db57df04b6af03ad9dd0447ffc8e881c97a39732 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 16 Nov 2023 12:21:24 -0600
Subject: feat(clipboard): enable OSC 52 clipboard provider by default (#26064)

Use the XTGETTCAP sequence to determine if the host terminal supports
the OSC 52 sequence and, if it does, enable the OSC 52 clipboard
provider by default.

This is only done automatically when all of the following are true:

  1. Nvim is running in the TUI
  2. 'clipboard' is not set to unnamed or unnamedplus
  3. g:clipboard is unset
  4. Nvim is running in an SSH connection ($SSH_TTY is set)
  5. Nvim is not running inside tmux ($TMUX is unset)
---
 runtime/doc/news.txt                   |   3 +-
 runtime/doc/provider.txt               |  32 +++++++---
 runtime/lua/vim/termcap.lua            |  60 ++++++++++++++++++
 runtime/lua/vim/ui/clipboard/osc52.lua | 107 +++++++++++++++++++--------------
 runtime/plugin/osc52.lua               |  37 ++++++++++++
 5 files changed, 183 insertions(+), 56 deletions(-)
 create mode 100644 runtime/lua/vim/termcap.lua
 create mode 100644 runtime/plugin/osc52.lua

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 98848f548f..2f48ebfeff 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -209,7 +209,8 @@ The following new APIs and features were added.
   read escape sequence responses from the terminal.
 
 • A clipboard provider which uses OSC 52 to copy the selection to the system
-  clipboard is now bundled by default. |clipboard-osc52|
+  clipboard is now bundled by default and will be automatically enabled under
+  certain conditions. |clipboard-osc52|
 
 • The 'termsync' option asks the terminal emulator to buffer screen updates
   until the redraw cycle is complete. Requires support from the terminal.
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 23bde05072..4759b1a52e 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -260,27 +260,41 @@ using OSC 52. OSC 52 is an Operating System Command control sequence that
 writes the copied text to the terminal emulator. If the terminal emulator
 supports OSC 52 then it will write the copied text into the system clipboard.
 
-This is most useful when using Nvim remotely (e.g. via ssh) as Nvim does not
-have direct access to the system clipboard in that case.
+Nvim will attempt to automatically determine if the host terminal emulator
+supports the OSC 52 sequence and enable the OSC 52 clipboard provider if it
+does as long as all of the following are true:
 
-Because not all terminal emulators support OSC 52, this provider must be opted
-into explicitly by setting the following |g:clipboard| definition: >lua
+  • Nvim is running in the |TUI|
+  • |g:clipboard| is unset
+  • 'clipboard' is not set to "unnamed" or "unnamedplus"
+  • $SSH_TTY is set
+  • $TMUX is unset
+
+If any of the above conditions are not met then the OSC 52 clipboard provider
+will not be used by default and Nvim will fall back to discovering a
+|clipboard-tool| through the usual process.
+
+To force Nvim to use the OSC 52 provider you can use the following
+|g:clipboard| definition: >lua
 
     vim.g.clipboard = {
       name = 'OSC 52',
       copy = {
-        ['+'] = require('vim.ui.clipboard.osc52').copy,
-        ['*'] = require('vim.ui.clipboard.osc52').copy,
+        ['+'] = require('vim.ui.clipboard.osc52').copy('+'),
+        ['*'] = require('vim.ui.clipboard.osc52').copy('*'),
       },
       paste = {
-        ['+'] = require('vim.ui.clipboard.osc52').paste,
-        ['*'] = require('vim.ui.clipboard.osc52').paste,
+        ['+'] = require('vim.ui.clipboard.osc52').paste('+'),
+        ['*'] = require('vim.ui.clipboard.osc52').paste('*'),
       },
     }
 <
 Note that not all terminal emulators support reading from the system clipboard
 (and even for those that do, users should be aware of the security
-implications), so using OSC 52 for pasting may not be possible.
+implications), so using OSC 52 for pasting may not be possible (and not
+necessary, because you can |paste| instead using your system paste function).
+Users may need to configure their terminal emulator to allow reading from the
+clipboard.
 <
 ==============================================================================
 Paste							*provider-paste* *paste*
diff --git a/runtime/lua/vim/termcap.lua b/runtime/lua/vim/termcap.lua
new file mode 100644
index 0000000000..0eefc5eee4
--- /dev/null
+++ b/runtime/lua/vim/termcap.lua
@@ -0,0 +1,60 @@
+local M = {}
+
+--- Query the host terminal emulator for terminfo capabilities.
+---
+--- This function sends the XTGETTCAP DCS sequence to the host terminal emulator asking the terminal
+--- to send us its terminal capabilities. These are strings that are normally taken from a terminfo
+--- file, however an up to date terminfo database is not always available (particularly on remote
+--- machines), and many terminals continue to misidentify themselves or do not provide their own
+--- terminfo file, making the terminfo database unreliable.
+---
+--- Querying the terminal guarantees that we get a truthful answer, but only if the host terminal
+--- emulator supports the XTGETTCAP sequence.
+---
+--- @param caps string|table A terminal capability or list of capabilities to query
+--- @param cb function(cap:string, seq:string) Function to call when a response is received
+function M.query(caps, cb)
+  vim.validate({
+    caps = { caps, { 'string', 'table' } },
+    cb = { cb, 'f' },
+  })
+
+  if type(caps) ~= 'table' then
+    caps = { caps }
+  end
+
+  local count = #caps
+
+  vim.api.nvim_create_autocmd('TermResponse', {
+    callback = function(args)
+      local resp = args.data ---@type string
+      local k, v = resp:match('^\027P1%+r(%x+)=(%x+)$')
+      if k and v then
+        local cap = vim.text.hexdecode(k)
+        local seq =
+          vim.text.hexdecode(v):gsub('\\E', '\027'):gsub('%%p%d', ''):gsub('\\(%d+)', string.char)
+
+        -- TODO: When libtermkey is patched to accept BEL as an OSC terminator, this workaround can
+        -- be removed
+        seq = seq:gsub('\007$', '\027\\')
+
+        cb(cap, seq)
+
+        count = count - 1
+        if count == 0 then
+          return true
+        end
+      end
+    end,
+  })
+
+  local encoded = {} ---@type string[]
+  for i = 1, #caps do
+    encoded[i] = vim.text.hexencode(caps[i])
+  end
+
+  local query = string.format('\027P+q%s\027\\', table.concat(encoded, ';'))
+  io.stdout:write(query)
+end
+
+return M
diff --git a/runtime/lua/vim/ui/clipboard/osc52.lua b/runtime/lua/vim/ui/clipboard/osc52.lua
index 035a6abb86..f1d454010f 100644
--- a/runtime/lua/vim/ui/clipboard/osc52.lua
+++ b/runtime/lua/vim/ui/clipboard/osc52.lua
@@ -1,60 +1,75 @@
 local M = {}
 
-function M.copy(lines)
-  local s = table.concat(lines, '\n')
-  io.stdout:write(string.format('\027]52;;%s\027\\', vim.base64.encode(s)))
+--- Return the OSC 52 escape sequence
+---
+--- @param clipboard string The clipboard to read from or write to
+--- @param contents string The Base64 encoded contents to write to the clipboard, or '?' to read
+---                        from the clipboard
+local function osc52(clipboard, contents)
+  return string.format('\027]52;%s;%s\027\\', clipboard, contents)
 end
 
-function M.paste()
-  local contents = nil
-  local id = vim.api.nvim_create_autocmd('TermResponse', {
-    callback = function(args)
-      local resp = args.data ---@type string
-      local encoded = resp:match('\027%]52;%w?;([A-Za-z0-9+/=]*)')
-      if encoded then
-        contents = vim.base64.decode(encoded)
-        return true
-      end
-    end,
-  })
-
-  io.stdout:write('\027]52;;?\027\\')
-
-  local ok, res
-
-  -- Wait 1s first for terminals that respond quickly
-  ok, res = vim.wait(1000, function()
-    return contents ~= nil
-  end)
-
-  if res == -1 then
-    -- If no response was received after 1s, print a message and keep waiting
-    vim.api.nvim_echo(
-      { { 'Waiting for OSC 52 response from the terminal. Press Ctrl-C to interrupt...' } },
-      false,
-      {}
-    )
-    ok, res = vim.wait(9000, function()
+function M.copy(reg)
+  local clipboard = reg == '+' and 'c' or 's'
+  return function(lines)
+    local s = table.concat(lines, '\n')
+    io.stdout:write(osc52(clipboard, vim.base64.encode(s)))
+  end
+end
+
+function M.paste(reg)
+  local clipboard = reg == '+' and 'c' or 's'
+  return function()
+    local contents = nil
+    local id = vim.api.nvim_create_autocmd('TermResponse', {
+      callback = function(args)
+        local resp = args.data ---@type string
+        local encoded = resp:match('\027%]52;%w?;([A-Za-z0-9+/=]*)')
+        if encoded then
+          contents = vim.base64.decode(encoded)
+          return true
+        end
+      end,
+    })
+
+    io.stdout:write(osc52(clipboard, '?'))
+
+    local ok, res
+
+    -- Wait 1s first for terminals that respond quickly
+    ok, res = vim.wait(1000, function()
       return contents ~= nil
     end)
-  end
 
-  if not ok then
-    vim.api.nvim_del_autocmd(id)
     if res == -1 then
-      vim.notify(
-        'Timed out waiting for a clipboard response from the terminal',
-        vim.log.levels.WARN
+      -- If no response was received after 1s, print a message and keep waiting
+      vim.api.nvim_echo(
+        { { 'Waiting for OSC 52 response from the terminal. Press Ctrl-C to interrupt...' } },
+        false,
+        {}
       )
-    elseif res == -2 then
-      -- Clear message area
-      vim.api.nvim_echo({ { '' } }, false, {})
+      ok, res = vim.wait(9000, function()
+        return contents ~= nil
+      end)
+    end
+
+    if not ok then
+      vim.api.nvim_del_autocmd(id)
+      if res == -1 then
+        vim.notify(
+          'Timed out waiting for a clipboard response from the terminal',
+          vim.log.levels.WARN
+        )
+      elseif res == -2 then
+        -- Clear message area
+        vim.api.nvim_echo({ { '' } }, false, {})
+      end
+      return 0
     end
-    return 0
-  end
 
-  -- If we get here, contents should be non-nil
-  return vim.split(assert(contents), '\n')
+    -- If we get here, contents should be non-nil
+    return vim.split(assert(contents), '\n')
+  end
 end
 
 return M
diff --git a/runtime/plugin/osc52.lua b/runtime/plugin/osc52.lua
new file mode 100644
index 0000000000..78b21863ad
--- /dev/null
+++ b/runtime/plugin/osc52.lua
@@ -0,0 +1,37 @@
+local tty = vim.iter(vim.api.nvim_list_uis()):any(function(ui)
+  return ui.chan == 1 and ui.stdout_tty
+end)
+
+if
+  not tty
+  or vim.g.clipboard ~= nil
+  or vim.o.clipboard ~= ''
+  or not os.getenv('SSH_TTY')
+  or os.getenv('TMUX')
+then
+  return
+end
+
+require('vim.termcap').query('Ms', function(cap, seq)
+  assert(cap == 'Ms')
+
+  -- If the terminal reports a sequence other than OSC 52 for the Ms capability
+  -- then ignore it. We only support OSC 52 (for now)
+  if not seq:match('^\027%]52') then
+    return
+  end
+
+  local osc52 = require('vim.ui.clipboard.osc52')
+
+  vim.g.clipboard = {
+    name = 'OSC 52',
+    copy = {
+      ['+'] = osc52.copy('+'),
+      ['*'] = osc52.copy('*'),
+    },
+    paste = {
+      ['+'] = osc52.paste('+'),
+      ['*'] = osc52.paste('*'),
+    },
+  }
+end)
-- 
cgit 


From 2f64546dc1cf0816b032af2ce7ded72ce4e581b3 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 16 Nov 2023 12:25:50 -0600
Subject: refactor: use optional base argument of tonumber (#26070)

---
 runtime/lua/vim/_defaults.lua | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua
index 870603c9f3..09d6d43e7a 100644
--- a/runtime/lua/vim/_defaults.lua
+++ b/runtime/lua/vim/_defaults.lua
@@ -190,14 +190,17 @@ do
   --- @param c string Color as a string of hex chars
   --- @return number? Intensity of the color
   local function parsecolor(c)
-    local len = #c
-    assert(len > 0 and len <= 4, 'Invalid hex color string')
-    if not c:match('^0x') then
-      c = string.format('0x%s', c)
+    if #c == 0 or #c > 4 then
+      return nil
     end
 
-    local max = tonumber(string.format('0x%s', string.rep('f', len)))
-    return tonumber(c) / max
+    local val = tonumber(c, 16)
+    if not val then
+      return nil
+    end
+
+    local max = tonumber(string.rep('f', #c), 16)
+    return val / max
   end
 
   --- Parse an OSC 11 response
-- 
cgit 


From 5d75d9aef2b69036328501820df770b29d57a308 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Thu, 16 Nov 2023 13:56:05 -0600
Subject: fix(osc52): enable OSC 52 by default in tmux sessions (#26072)

tmux has a set-clipboard option which, when set to 'on', allows
applications to set the system clipboard using the usual OSC 52 escape
sequence.
---
 runtime/doc/provider.txt |  1 -
 runtime/plugin/osc52.lua | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index 4759b1a52e..b8182347f8 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -268,7 +268,6 @@ does as long as all of the following are true:
   • |g:clipboard| is unset
   • 'clipboard' is not set to "unnamed" or "unnamedplus"
   • $SSH_TTY is set
-  • $TMUX is unset
 
 If any of the above conditions are not met then the OSC 52 clipboard provider
 will not be used by default and Nvim will fall back to discovering a
diff --git a/runtime/plugin/osc52.lua b/runtime/plugin/osc52.lua
index 78b21863ad..374b70066f 100644
--- a/runtime/plugin/osc52.lua
+++ b/runtime/plugin/osc52.lua
@@ -2,19 +2,18 @@ local tty = vim.iter(vim.api.nvim_list_uis()):any(function(ui)
   return ui.chan == 1 and ui.stdout_tty
 end)
 
-if
-  not tty
-  or vim.g.clipboard ~= nil
-  or vim.o.clipboard ~= ''
-  or not os.getenv('SSH_TTY')
-  or os.getenv('TMUX')
-then
+if not tty or vim.g.clipboard ~= nil or vim.o.clipboard ~= '' or not os.getenv('SSH_TTY') then
   return
 end
 
 require('vim.termcap').query('Ms', function(cap, seq)
   assert(cap == 'Ms')
 
+  -- Check 'clipboard' and g:clipboard again to avoid a race condition
+  if vim.o.clipboard ~= '' or vim.g.clipboard ~= nil then
+    return
+  end
+
   -- If the terminal reports a sequence other than OSC 52 for the Ms capability
   -- then ignore it. We only support OSC 52 (for now)
   if not seq:match('^\027%]52') then
-- 
cgit 


From a4c111ae690448176ae584b9a2181923d1b2cdbd Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 17 Nov 2023 06:41:03 +0800
Subject: vim-patch:9.0.2108: [security]: overflow with count for :s command

Problem:  [security]: overflow with count for :s command
Solution: Abort the :s command if the count is too large

If the count after the :s command is larger than what fits into a
(signed) long variable, abort with e_value_too_large.

Adds a test with INT_MAX as count and verify it correctly fails.

It seems the return value on Windows using mingw compiler wraps around,
so the initial test using :s/./b/9999999999999999999999999990 doesn't
fail there, since the count is wrapping around several times and finally
is no longer larger than 2147483647. So let's just use 2147483647 in the
test, which hopefully will always cause a failure

https://github.com/vim/vim/commit/ac63787734fda2e294e477af52b3bd601517fa78

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/doc/change.txt  | 6 +++---
 runtime/doc/cmdline.txt | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 2c47421b02..e1bb7c5fc7 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -619,9 +619,9 @@ original user.
 			current line only.  When [count] is given, replace in
 			[count] lines, starting with the last line in [range].
 			When [range] is omitted start in the current line.
-							*E939*
-			[count] must be a positive number.  Also see
-			|cmdline-ranges|.
+							*E939* *E1510*
+			[count] must be a positive number (max 2147483647)
+			Also see |cmdline-ranges|.
 
 			See |:s_flags| for [flags].
 			The delimiter doesn't need to be /, see
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 291286d8f7..8bed8a9ffc 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -339,6 +339,7 @@ terminals)
 		A positive number represents the absolute index of an entry
 		as it is given in the first column of a :history listing.
 		This number remains fixed even if other entries are deleted.
+		(see |E1510|)
 
 		A negative number means the relative position of an entry,
 		counted from the newest entry (which has index -1) backwards.
-- 
cgit 


From 86c2213b5e451b0c80c2d7adc356c7cebe4bb7f8 Mon Sep 17 00:00:00 2001
From: Tomasz N <przepompownia@users.noreply.github.com>
Date: Fri, 17 Nov 2023 02:52:22 +0100
Subject: fix(osc52): use `p` for primary selection instead of `s` (#26076)

Co-authored-by: Gregory Anders <greg@gpanders.com>
---
 runtime/lua/vim/ui/clipboard/osc52.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/ui/clipboard/osc52.lua b/runtime/lua/vim/ui/clipboard/osc52.lua
index f1d454010f..6483f0387d 100644
--- a/runtime/lua/vim/ui/clipboard/osc52.lua
+++ b/runtime/lua/vim/ui/clipboard/osc52.lua
@@ -10,7 +10,7 @@ local function osc52(clipboard, contents)
 end
 
 function M.copy(reg)
-  local clipboard = reg == '+' and 'c' or 's'
+  local clipboard = reg == '+' and 'c' or 'p'
   return function(lines)
     local s = table.concat(lines, '\n')
     io.stdout:write(osc52(clipboard, vim.base64.encode(s)))
@@ -18,7 +18,7 @@ function M.copy(reg)
 end
 
 function M.paste(reg)
-  local clipboard = reg == '+' and 'c' or 's'
+  local clipboard = reg == '+' and 'c' or 'p'
   return function()
     local contents = nil
     local id = vim.api.nvim_create_autocmd('TermResponse', {
-- 
cgit 


From b522cb1ac3fbdf6e68eed5d0b6e1cbeaf3ac2254 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 6 Nov 2023 14:52:27 +0100
Subject: refactor(grid): make screen rendering more multibyte than ever before

Problem: buffer text with composing chars are converted from UTF-8
to an array of up to seven UTF-32 values and then converted back
to UTF-8 strings.

Solution: Convert buffer text directly to UTF-8 based schar_T values.

The limit of the text size is now in schar_T bytes, which is currently
31+1 but easily could be raised as it no longer multiplies the size
of the entire screen grid when not used, the full size is only required
for temporary scratch buffers.

Also does some general cleanup to win_line text handling, which was
unnecessarily complicated due to multibyte rendering being an "opt-in"
feature long ago. Nowadays, a char is just a char, regardless if it consists
of one ASCII byte or multiple bytes.
---
 runtime/doc/mbyte.txt             |  3 ++-
 runtime/doc/news.txt              |  7 +++++++
 runtime/doc/vim_diff.txt          | 13 ++++++++++---
 runtime/lua/vim/_meta/options.lua |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index aedef87a09..0a7e0baad3 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -646,7 +646,8 @@ widespread as file format.
 A composing or combining character is used to change the meaning of the
 character before it.  The combining characters are drawn on top of the
 preceding character.
-Up to six combining characters can be displayed.
+Too big combined characters cannot be displayed, but they can still be
+inspected using the |g8| and |ga| commands described below.
 When editing text a composing character is mostly considered part of the
 preceding character.  For example "x" will delete a character and its
 following composing characters by default.
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 2f48ebfeff..cb3220a630 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -294,6 +294,13 @@ The following changes to existing APIs or features add new behavior.
   Note that syntax highlighting of code examples requires a matching parser
   and may be affected by custom queries.
 
+• Support for rendering multibyte characters using composing characters has been
+  enhanced. The maximum limit have been increased from 1+6 codepoints to
+  31 bytes, which is guaranteed to fit all chars from before but often more.
+
+  NOTE: the regexp engine still has a hard-coded limit of considering
+  6 composing chars only.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 05d7e5feb9..5e09cc2481 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -722,9 +722,16 @@ Options:
 <
   *'macatsui'*
   *'maxcombine'* *'mco'*
-    Nvim always displays up to 6 combining characters.  You can still edit
-    text with more than 6 combining characters, you just can't see them.
-    Use |g8| or |ga|.  See |mbyte-combining|.
+    Nvim counts maximum character sizes in bytes, not codepoints. This is
+    guaranteed to be big enough to always fit all chars properly displayed
+    in vim with 'maxcombine' set to 6.
+
+    You can still edit text with larger characters than fits in the screen buffer,
+    you just can't see them. Use |g8| or |ga|. See |mbyte-combining|.
+
+    NOTE: the rexexp engine still has a hard-coded limit of considering
+    6 composing chars only.
+
   *'maxmem'* Nvim delegates memory-management to the OS.
   *'maxmemtot'* Nvim delegates memory-management to the OS.
   printoptions
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 19ae786177..be4a4dd49c 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -2576,7 +2576,7 @@ vim.go.fp = vim.go.formatprg
 --- security reasons.
 ---
 --- @type boolean
-vim.o.fsync = false
+vim.o.fsync = true
 vim.o.fs = vim.o.fsync
 vim.go.fsync = vim.o.fsync
 vim.go.fs = vim.go.fsync
-- 
cgit 


From 677be4bdd224f25519d9072a923d2c707842c6ad Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Fri, 17 Nov 2023 08:07:35 -0600
Subject: docs: document breaking change of cursor blink behavior (#26075)

---
 runtime/doc/news.txt | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index cb3220a630..59f419128d 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -15,6 +15,13 @@ BREAKING CHANGES                                                *news-breaking*
 
 The following changes may require adaptations in user config or plugins.
 
+• In some cases, the cursor in the Nvim |TUI| would blink even without
+  configuring 'guicursor' as mentioned in |cursor-blinking|. This was a bug
+  that has now been fixed. If your cursor has stopped blinking, add the
+  following (or similar, adapted to user preference) to your |config| file: >vim
+
+    set guicursor+=n-v-c:blinkon500-blinkoff500
+<
 • |vim.tbl_islist()| now checks whether a table is actually list-like (i.e.,
   has integer keys without gaps and starting from 1). For the previous
   behavior (only check for integer keys, allow gaps or not starting with 1),
-- 
cgit 


From c4afb9788c4f139eb2e3b7aa4d6a6a20b67ba156 Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 11 Nov 2023 00:52:50 +0100
Subject: refactor(sign): move legacy signs to extmarks

Problem:  The legacy signlist data structures and associated functions are
          redundant since the introduction of extmark signs.
Solution: Store signs defined through the legacy commands in a hashmap, placed
          signs in the extmark tree. Replace signlist associated functions.

Usage of the legacy sign commands should yield no change in behavior with the
exception of:
  - "orphaned signs" are now always removed when the line it is placed on is
    deleted. This used to depend on the value of 'signcolumn'.
  - It is no longer possible to place multiple signs with the same identifier
    in a single group on multiple lines. This will now move the sign instead.

Moreover, both signs placed through the legacy sign commands and through
|nvim_buf_set_extmark()|:
  - Will show up in both |sign-place| and |nvim_buf_get_extmarks()|.
  - Are displayed by increasing sign identifier, left to right.
    Extmark signs used to be ordered decreasingly as opposed to legacy signs.
---
 runtime/doc/api.txt               |  4 ++--
 runtime/doc/news.txt              |  8 ++++++++
 runtime/doc/options.txt           |  6 ------
 runtime/doc/sign.txt              | 21 ++++++++-------------
 runtime/doc/vim_diff.txt          |  1 +
 runtime/lua/vim/_meta/api.lua     |  4 ++--
 runtime/lua/vim/_meta/options.lua |  6 ------
 7 files changed, 21 insertions(+), 29 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 6970479a78..1b11d8571a 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -2566,8 +2566,8 @@ nvim_buf_get_extmark_by_id({buffer}, {ns_id}, {id}, {opts})
 
                                                      *nvim_buf_get_extmarks()*
 nvim_buf_get_extmarks({buffer}, {ns_id}, {start}, {end}, {*opts})
-    Gets |extmarks| in "traversal order" from a |charwise| region defined by
-    buffer positions (inclusive, 0-indexed |api-indexing|).
+    Gets |extmarks| (including |signs|) in "traversal order" from a |charwise|
+    region defined by buffer positions (inclusive, 0-indexed |api-indexing|).
 
     Region can be given as (row,col) tuples, or valid extmark ids (whose
     positions define the bounds). 0 and -1 are understood as (0,0) and (-1,-1)
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index ae97772b66..818f0e5a57 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -80,6 +80,14 @@ The following changes may require adaptations in user config or plugins.
   the option is set (e.g. using |:set| or |nvim_set_option_value()|) without a
   scope, which means they now behave the same way as string options.
 
+• Signs placed through the legacy |sign-commands| are now stored and displayed
+  as |extmarks| internally. Along with the following changes:
+  • A sign placed twice in the same group with the same identifier will be moved.
+  • Legacy signs are always deleted along with the line it is placed on.
+  • Legacy and extmark signs will show up in both |:sign-place-list| and |nvim_buf_get_extmarks()|.
+  • Legacy and extmark signs are displayed and listed with the same priority:
+      line number -> priority -> sign id -> recently placed
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 07326c8c13..f47093782c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5624,12 +5624,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   "number"	display signs in the 'number' column. If the number
 			column is not present, then behaves like "auto".
 
-	Note regarding "orphaned signs": with signcolumn numbers higher than
-	1, deleting lines will also remove the associated signs automatically,
-	in contrast to the default Vim behavior of keeping and grouping them.
-	This is done in order for the signcolumn appearance not appear weird
-	during line deletion.
-
 			*'smartcase'* *'scs'* *'nosmartcase'* *'noscs'*
 'smartcase' 'scs'	boolean	(default off)
 			global
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 8ecfadce17..733b0fe212 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -53,11 +53,10 @@ If 'cursorline' is enabled, then the CursorLineSign highlight group is used
 Each placed sign is identified by a number called the sign identifier. This
 identifier is used to jump to the sign or to remove the sign. The identifier
 is assigned when placing the sign using the |:sign-place| command or the
-|sign_place()| function. Each sign identifier should be a unique number. If
-multiple placed signs use the same identifier, then jumping to or removing a
-sign becomes unpredictable. To avoid overlapping identifiers, sign groups can
-be used. The |sign_place()| function can be called with a zero sign identifier
-to allocate the next available identifier.
+|sign_place()| function. Each sign identifier should be a unique number.
+Placing the same identifier twice will move the previously placed sign. The
+|sign_place()| function can be called with a zero sign identifier to allocate
+the next available identifier.
 
 							*sign-group*
 Each placed sign can be assigned to either the global group or a named group.
@@ -77,9 +76,8 @@ When two signs with the same priority are present, and one has an icon or text
 in the signcolumn while the other has line highlighting, then both are
 displayed.
 
-When the line on which the sign is placed is deleted, the sign is moved to the
-next line (or the last line of the buffer, if there is no next line).  When
-the delete is undone the sign does not move back.
+When the line on which the sign is placed is deleted, the sign is removed along
+with it.
 
 ==============================================================================
 2. Commands					*sign-commands* *:sig* *:sign*
@@ -177,11 +175,8 @@ See |sign_place()| for the equivalent Vim script function.
 		space is ignored.
 
 		The sign is remembered under {id}, this can be used for
-		further manipulation.  {id} must be a number.
-		It's up to the user to make sure the {id} is used only once in
-		each file (if it's used several times unplacing will also have
-		to be done several times and making changes may not work as
-		expected).
+		further manipulation.  {id} must be a number.  Placing the
+		same {id} multiple times will move the sign.
 
 		The following optional sign attributes can be specified before
 		"file=":
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 05d7e5feb9..fb23535c76 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -340,6 +340,7 @@ Shell:
 
 Signs:
   Signs are removed if the associated line is deleted.
+  Signs placed twice with the same identifier in the same group are moved.
 
 Startup:
   |-e| and |-es| invoke the same "improved Ex mode" as -E and -Es.
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 2142a429a2..70a8b0aec2 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -317,8 +317,8 @@ function vim.api.nvim_buf_get_commands(buffer, opts) end
 --- @return integer[]
 function vim.api.nvim_buf_get_extmark_by_id(buffer, ns_id, id, opts) end
 
---- Gets `extmarks` in "traversal order" from a `charwise` region defined by
---- buffer positions (inclusive, 0-indexed `api-indexing`).
+--- Gets `extmarks` (including `signs`) in "traversal order" from a `charwise`
+--- region defined by buffer positions (inclusive, 0-indexed `api-indexing`).
 --- Region can be given as (row,col) tuples, or valid extmark ids (whose
 --- positions define the bounds). 0 and -1 are understood as (0,0) and (-1,-1)
 --- respectively, thus the following are equivalent:
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
index 19ae786177..6d693ca036 100644
--- a/runtime/lua/vim/_meta/options.lua
+++ b/runtime/lua/vim/_meta/options.lua
@@ -5923,12 +5923,6 @@ vim.go.siso = vim.go.sidescrolloff
 ---    "number"	display signs in the 'number' column. If the number
 --- 		column is not present, then behaves like "auto".
 ---
---- Note regarding "orphaned signs": with signcolumn numbers higher than
---- 1, deleting lines will also remove the associated signs automatically,
---- in contrast to the default Vim behavior of keeping and grouping them.
---- This is done in order for the signcolumn appearance not appear weird
---- during line deletion.
----
 --- @type string
 vim.o.signcolumn = "auto"
 vim.o.scl = vim.o.signcolumn
-- 
cgit 


From 7e36c8e972f0b2e07c6186aa5dca2f70d95a77f2 Mon Sep 17 00:00:00 2001
From: Maria José Solano <majosolano99@gmail.com>
Date: Thu, 26 Oct 2023 22:53:38 -0700
Subject: feat(lsp): support for choice snippet nodes

---
 runtime/lua/vim/snippet.lua | 72 ++++++++++++++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 23 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua
index 94c69795a4..32a8ea0b0d 100644
--- a/runtime/lua/vim/snippet.lua
+++ b/runtime/lua/vim/snippet.lua
@@ -104,8 +104,9 @@ end
 
 --- @class vim.snippet.Tabstop
 --- @field extmark_id integer
---- @field index integer
 --- @field bufnr integer
+--- @field index integer
+--- @field choices? string[]
 local Tabstop = {}
 
 --- Creates a new tabstop.
@@ -114,8 +115,9 @@ local Tabstop = {}
 --- @param index integer
 --- @param bufnr integer
 --- @param range Range4
+--- @param choices? string[]
 --- @return vim.snippet.Tabstop
-function Tabstop.new(index, bufnr, range)
+function Tabstop.new(index, bufnr, range, choices)
   local extmark_id = vim.api.nvim_buf_set_extmark(bufnr, snippet_ns, range[1], range[2], {
     right_gravity = false,
     end_right_gravity = true,
@@ -125,7 +127,7 @@ function Tabstop.new(index, bufnr, range)
   })
 
   local self = setmetatable(
-    { index = index, bufnr = bufnr, extmark_id = extmark_id },
+    { extmark_id = extmark_id, bufnr = bufnr, index = index, choices = choices },
     { __index = Tabstop }
   )
 
@@ -173,9 +175,9 @@ local Session = {}
 --- @package
 --- @param bufnr integer
 --- @param snippet_extmark integer
---- @param tabstop_ranges table<integer, Range4[]>
+--- @param tabstop_data table<integer, { range: Range4, choices?: string[] }[]>
 --- @return vim.snippet.Session
-function Session.new(bufnr, snippet_extmark, tabstop_ranges)
+function Session.new(bufnr, snippet_extmark, tabstop_data)
   local self = setmetatable({
     bufnr = bufnr,
     extmark_id = snippet_extmark,
@@ -184,10 +186,10 @@ function Session.new(bufnr, snippet_extmark, tabstop_ranges)
   }, { __index = Session })
 
   -- Create the tabstops.
-  for index, ranges in pairs(tabstop_ranges) do
-    for _, range in ipairs(ranges) do
+  for index, ranges in pairs(tabstop_data) do
+    for _, data in ipairs(ranges) do
       self.tabstops[index] = self.tabstops[index] or {}
-      table.insert(self.tabstops[index], Tabstop.new(index, self.bufnr, range))
+      table.insert(self.tabstops[index], Tabstop.new(index, self.bufnr, data.range, data.choices))
     end
   end
 
@@ -222,6 +224,22 @@ end
 --- @field private _session? vim.snippet.Session
 local M = { session = nil }
 
+--- Displays the choices for the given tabstop as completion items.
+---
+--- @param tabstop vim.snippet.Tabstop
+local function display_choices(tabstop)
+  assert(tabstop.choices, 'Tabstop has no choices')
+
+  local start_col = tabstop:get_range()[2] + 1
+  local matches = vim.iter.map(function(choice)
+    return { word = choice }
+  end, tabstop.choices)
+
+  vim.defer_fn(function()
+    vim.fn.complete(start_col, matches)
+  end, 100)
+end
+
 --- Select the given tabstop range.
 ---
 --- @param tabstop vim.snippet.Tabstop
@@ -246,17 +264,25 @@ local function select_tabstop(tabstop)
   local range = tabstop:get_range()
   local mode = vim.fn.mode()
 
+  if vim.fn.pumvisible() ~= 0 then
+    -- Close the choice completion menu if open.
+    vim.fn.complete(vim.fn.col('.'), {})
+  end
+
   -- Move the cursor to the start of the tabstop.
   vim.api.nvim_win_set_cursor(0, { range[1] + 1, range[2] })
 
-  -- For empty and the final tabstop, start insert mode at the end of the range.
-  if tabstop.index == 0 or (range[1] == range[3] and range[2] == range[4]) then
+  -- For empty, choice and the final tabstops, start insert mode at the end of the range.
+  if tabstop.choices or tabstop.index == 0 or (range[1] == range[3] and range[2] == range[4]) then
     if mode ~= 'i' then
       if mode == 's' then
         feedkeys('<Esc>')
       end
       vim.cmd.startinsert({ bang = range[4] >= #vim.api.nvim_get_current_line() })
     end
+    if tabstop.choices then
+      display_choices(tabstop)
+    end
   else
     -- Else, select the tabstop's text.
     if mode ~= 'n' then
@@ -297,7 +323,6 @@ local function setup_autocmds(bufnr)
         return true
       end
 
-      -- Update the current tabstop to be the one containing the cursor.
       for tabstop_index, tabstops in pairs(M._session.tabstops) do
         for _, tabstop in ipairs(tabstops) do
           local range = tabstop:get_range()
@@ -305,7 +330,6 @@ local function setup_autocmds(bufnr)
             (cursor_row > range[1] or (cursor_row == range[1] and cursor_col >= range[2]))
             and (cursor_row < range[3] or (cursor_row == range[3] and cursor_col <= range[4]))
           then
-            M._session.current_tabstop = tabstop
             if tabstop_index ~= 0 then
               return
             end
@@ -377,14 +401,16 @@ function M.expand(input)
   end
 
   -- Keep track of tabstop nodes during expansion.
-  --- @type table<integer, Range4[]>
-  local tabstop_ranges = {}
+  --- @type table<integer, { range: Range4, choices?: string[] }[]>
+  local tabstop_data = {}
 
   --- @param index integer
-  --- @param placeholder string?
-  local function add_tabstop(index, placeholder)
-    tabstop_ranges[index] = tabstop_ranges[index] or {}
-    table.insert(tabstop_ranges[index], compute_tabstop_range(snippet_text, placeholder))
+  --- @param placeholder? string
+  --- @param choices? string[]
+  local function add_tabstop(index, placeholder, choices)
+    tabstop_data[index] = tabstop_data[index] or {}
+    local range = compute_tabstop_range(snippet_text, placeholder)
+    table.insert(tabstop_data[index], { range = range, choices = choices })
   end
 
   --- Appends the given text to the snippet, taking care of indentation.
@@ -428,7 +454,7 @@ function M.expand(input)
       append_to_snippet(value)
     elseif type == G.NodeType.Choice then
       --- @cast data vim.snippet.ChoiceData
-      append_to_snippet(data.values[1])
+      add_tabstop(data.tabstop, nil, data.values)
     elseif type == G.NodeType.Variable then
       --- @cast data vim.snippet.VariableData
       -- Try to get the variable's value.
@@ -436,7 +462,7 @@ function M.expand(input)
       if not value then
         -- Unknown variable, make this a tabstop and use the variable name as a placeholder.
         value = data.name
-        local tabstop_indexes = vim.tbl_keys(tabstop_ranges)
+        local tabstop_indexes = vim.tbl_keys(tabstop_data)
         local index = math.max(unpack((#tabstop_indexes == 0 and { 0 }) or tabstop_indexes)) + 1
         add_tabstop(index, value)
       end
@@ -449,8 +475,8 @@ function M.expand(input)
 
   -- $0, which defaults to the end of the snippet, defines the final cursor position.
   -- Make sure the snippet has exactly one of these.
-  if vim.tbl_contains(vim.tbl_keys(tabstop_ranges), 0) then
-    assert(#tabstop_ranges[0] == 1, 'Snippet has multiple $0 tabstops')
+  if vim.tbl_contains(vim.tbl_keys(tabstop_data), 0) then
+    assert(#tabstop_data[0] == 1, 'Snippet has multiple $0 tabstops')
   else
     add_tabstop(0)
   end
@@ -469,7 +495,7 @@ function M.expand(input)
     right_gravity = false,
     end_right_gravity = true,
   })
-  M._session = Session.new(bufnr, snippet_extmark, tabstop_ranges)
+  M._session = Session.new(bufnr, snippet_extmark, tabstop_data)
 
   -- Jump to the first tabstop.
   M.jump(1)
-- 
cgit 


From de28a0f84c577e264f37cd001b03d640db7d5ef9 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Sun, 19 Nov 2023 14:25:32 +0100
Subject: perf(lsp): replace file polling on linux with per dir watcher 
 (#26108)

Should help with https://github.com/neovim/neovim/issues/23291

On linux `new_fs_event` doesn't support recursive watching, but we can
still use it to watch folders.

The downside of this approach is that we may end up sending some false
`Deleted` events. For example, if you save a file named `foo` there will
be a intermediate `foo~` due to the save mechanism of neovim.

The events we get from vim.uv in that case are:

- rename: foo~
- rename: foo~
- rename: foo
- rename: foo
- change: foo
- change: foo

The mechanism in this PR uses a debounce to reduce this to:

- deleted: foo~
- changed: foo

`foo~` will be the false positive.
I suspect that for the LSP case this is good enough. If not, we may need
to follow up on this and keep a table in memory that tracks available
files.
---
 runtime/lua/vim/_watch.lua | 208 +++++++++++++++++++++++----------------------
 1 file changed, 106 insertions(+), 102 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
index 7230b31f6f..7870e1e867 100644
--- a/runtime/lua/vim/_watch.lua
+++ b/runtime/lua/vim/_watch.lua
@@ -1,11 +1,15 @@
 local M = {}
+local uv = vim.uv
 
---- Enumeration describing the types of events watchers will emit.
-M.FileChangeType = vim.tbl_add_reverse_lookup({
+---@enum vim._watch.FileChangeType
+local FileChangeType = {
   Created = 1,
   Changed = 2,
   Deleted = 3,
-})
+}
+
+--- Enumeration describing the types of events watchers will emit.
+M.FileChangeType = vim.tbl_add_reverse_lookup(FileChangeType)
 
 --- Joins filepath elements by static '/' separator
 ---
@@ -72,120 +76,120 @@ function M.watch(path, opts, callback)
   end
 end
 
-local default_poll_interval_ms = 2000
-
---- @class watch.Watches
---- @field is_dir boolean
---- @field children? table<string,watch.Watches>
---- @field cancel? fun()
---- @field started? boolean
---- @field handle? uv.uv_fs_poll_t
-
 --- @class watch.PollOpts
---- @field interval? integer
---- @field include_pattern? userdata
---- @field exclude_pattern? userdata
+--- @field debounce? integer
+--- @field include_pattern? vim.lpeg.Pattern
+--- @field exclude_pattern? vim.lpeg.Pattern
 
---- Implementation for poll, hiding internally-used parameters.
----
 ---@param path string
 ---@param opts watch.PollOpts
----@param callback fun(patch: string, filechangetype: integer)
----@param watches (watch.Watches|nil) A tree structure to maintain state for recursive watches.
----     - handle (uv_fs_poll_t)
----               The libuv handle
----     - cancel (function)
----               A function that cancels the handle and all children's handles
----     - is_dir (boolean)
----               Indicates whether the path is a directory (and the poll should
----               be invoked recursively)
----     - children (table|nil)
----               A mapping of directory entry name to its recursive watches
----     - started (boolean|nil)
----               Whether or not the watcher has first been initialized. Used
----               to prevent a flood of Created events on startup.
----@return fun() Cancel function
-local function poll_internal(path, opts, callback, watches)
-  path = vim.fs.normalize(path)
-  local interval = opts and opts.interval or default_poll_interval_ms
-  watches = watches or {
-    is_dir = true,
-  }
-  watches.cancel = function()
-    if watches.children then
-      for _, w in pairs(watches.children) do
-        w.cancel()
-      end
-    end
-    if watches.handle then
-      stop(watches.handle)
-    end
+---@param callback function Called on new events
+---@return function cancel stops the watcher
+local function recurse_watch(path, opts, callback)
+  opts = opts or {}
+  local debounce = opts.debounce or 500
+  local uvflags = {}
+  ---@type table<string, uv.uv_fs_event_t> handle by fullpath
+  local handles = {}
+
+  local timer = assert(uv.new_timer())
+
+  ---@type table[]
+  local changesets = {}
+
+  local function is_included(filepath)
+    return opts.include_pattern and opts.include_pattern:match(filepath)
   end
-
-  local function incl_match()
-    return not opts.include_pattern or opts.include_pattern:match(path) ~= nil
-  end
-  local function excl_match()
-    return opts.exclude_pattern and opts.exclude_pattern:match(path) ~= nil
+  local function is_excluded(filepath)
+    return opts.exclude_pattern and opts.exclude_pattern:match(filepath)
   end
-  if not watches.is_dir and not incl_match() or excl_match() then
-    return watches.cancel
+
+  local process_changes = function()
+    assert(false, "Replaced later. I'm only here as forward reference")
   end
 
-  if not watches.handle then
-    local poll, new_err = vim.uv.new_fs_poll()
-    assert(not new_err, new_err)
-    watches.handle = poll
-    local _, start_err = poll:start(
-      path,
-      interval,
-      vim.schedule_wrap(function(err)
-        if err == 'ENOENT' then
-          return
-        end
-        assert(not err, err)
-        poll_internal(path, opts, callback, watches)
-        callback(path, M.FileChangeType.Changed)
-      end)
-    )
-    assert(not start_err, start_err)
-    if watches.started then
-      callback(path, M.FileChangeType.Created)
+  local function create_on_change(filepath)
+    return function(err, filename, events)
+      assert(not err, err)
+      local fullpath = vim.fs.joinpath(filepath, filename)
+      if is_included(fullpath) and not is_excluded(filepath) then
+        table.insert(changesets, {
+          fullpath = fullpath,
+          events = events,
+        })
+        timer:start(debounce, 0, process_changes)
+      end
     end
   end
 
-  if watches.is_dir then
-    watches.children = watches.children or {}
-    local exists = {} --- @type table<string,true>
-    for name, ftype in vim.fs.dir(path) do
-      exists[name] = true
-      if not watches.children[name] then
-        watches.children[name] = {
-          is_dir = ftype == 'directory',
-          started = watches.started,
-        }
-        poll_internal(filepath_join(path, name), opts, callback, watches.children[name])
+  process_changes = function()
+    ---@type table<string, table[]>
+    local filechanges = vim.defaulttable()
+    for i, change in ipairs(changesets) do
+      changesets[i] = nil
+      if is_included(change.fullpath) and not is_excluded(change.fullpath) then
+        table.insert(filechanges[change.fullpath], change.events)
       end
     end
-
-    local newchildren = {} ---@type table<string,watch.Watches>
-    for name, watch in pairs(watches.children) do
-      if exists[name] then
-        newchildren[name] = watch
+    for fullpath, events_list in pairs(filechanges) do
+      local stat = uv.fs_stat(fullpath)
+      ---@type vim._watch.FileChangeType
+      local change_type
+      if stat then
+        change_type = FileChangeType.Created
+        for _, event in ipairs(events_list) do
+          if event.change then
+            change_type = FileChangeType.Changed
+          end
+        end
+        if stat.type == 'directory' then
+          local handle = handles[fullpath]
+          if not handle then
+            handle = assert(uv.new_fs_event())
+            handles[fullpath] = handle
+            handle:start(fullpath, uvflags, create_on_change(fullpath))
+          end
+        end
       else
-        watch.cancel()
-        watches.children[name] = nil
-        if watch.handle then
-          callback(path .. '/' .. name, M.FileChangeType.Deleted)
+        local handle = handles[fullpath]
+        if handle then
+          if not handle:is_closing() then
+            handle:close()
+          end
+          handles[fullpath] = nil
         end
+        change_type = FileChangeType.Deleted
       end
+      callback(fullpath, change_type)
     end
-    watches.children = newchildren
   end
-
-  watches.started = true
-
-  return watches.cancel
+  local root_handle = assert(uv.new_fs_event())
+  handles[path] = root_handle
+  root_handle:start(path, uvflags, create_on_change(path))
+
+  --- "640K ought to be enough for anyone"
+  --- Who has folders this deep?
+  local max_depth = 100
+
+  for name, type in vim.fs.dir(path, { depth = max_depth }) do
+    local filepath = vim.fs.joinpath(path, name)
+    if type == 'directory' and not is_excluded(filepath) then
+      local handle = assert(uv.new_fs_event())
+      handles[filepath] = handle
+      handle:start(filepath, uvflags, create_on_change(filepath))
+    end
+  end
+  local function cancel()
+    for fullpath, handle in pairs(handles) do
+      if not handle:is_closing() then
+        handle:close()
+      end
+      handles[fullpath] = nil
+    end
+    timer:stop()
+    timer:close()
+  end
+  return cancel
 end
 
 --- Initializes and starts a |uv_fs_poll_t| recursively watching every file underneath the
@@ -193,8 +197,8 @@ end
 ---
 ---@param path (string) The path to watch. Must refer to a directory.
 ---@param opts (table|nil) Additional options
----     - interval (number|nil)
----                Polling interval in ms as passed to |uv.fs_poll_start()|. Defaults to 2000.
+---     - debounce (number|nil)
+---                Time events are debounced in ms. Defaults to 500
 ---     - include_pattern (LPeg pattern|nil)
 ---                An |lpeg| pattern. Only changes to files whose full paths match the pattern
 ---                will be reported. Only matches against non-directoriess, all directories will
@@ -212,7 +216,7 @@ function M.poll(path, opts, callback)
     opts = { opts, 'table', true },
     callback = { callback, 'function', false },
   })
-  return poll_internal(path, opts, callback, nil)
+  return recurse_watch(path, opts, callback)
 end
 
 return M
-- 
cgit 


From ec79ff893d5906e1f0d90953cffa535ffae47823 Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:19:41 +0100
Subject: refactor(lsp): add type annotations to _watchfiles (#26109)

---
 runtime/lua/vim/lsp/_watchfiles.lua | 108 ++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 55 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/lsp/_watchfiles.lua b/runtime/lua/vim/lsp/_watchfiles.lua
index 1a4909b3f3..1fd112631d 100644
--- a/runtime/lua/vim/lsp/_watchfiles.lua
+++ b/runtime/lua/vim/lsp/_watchfiles.lua
@@ -6,13 +6,11 @@ local lpeg = vim.lpeg
 
 local M = {}
 
----@alias lpeg userdata
-
 --- Parses the raw pattern into an |lpeg| pattern. LPeg patterns natively support the "this" or "that"
 --- alternative constructions described in the LSP spec that cannot be expressed in a standard Lua pattern.
 ---
 ---@param pattern string The raw glob pattern
----@return lpeg An |lpeg| representation of the pattern, or nil if the pattern is invalid.
+---@return vim.lpeg.Pattern? pattern An |lpeg| representation of the pattern, or nil if the pattern is invalid.
 local function parse(pattern)
   local l = lpeg
 
@@ -73,36 +71,38 @@ local function parse(pattern)
     End = P(-1) * Cc(l.P(-1)),
   })
 
-  return p:match(pattern)
+  return p:match(pattern) --[[@as vim.lpeg.Pattern?]]
 end
 
 ---@private
 --- Implementation of LSP 3.17.0's pattern matching: https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#pattern
 ---
----@param pattern string|table The glob pattern (raw or parsed) to match.
+---@param pattern string|vim.lpeg.Pattern The glob pattern (raw or parsed) to match.
 ---@param s string The string to match against pattern.
 ---@return boolean Whether or not pattern matches s.
 function M._match(pattern, s)
   if type(pattern) == 'string' then
-    pattern = parse(pattern)
+    local p = assert(parse(pattern))
+    return p:match(s) ~= nil
   end
   return pattern:match(s) ~= nil
 end
 
 M._watchfunc = (vim.fn.has('win32') == 1 or vim.fn.has('mac') == 1) and watch.watch or watch.poll
 
----@type table<number, table<number, function[]>> client id -> registration id -> cancel function
+---@type table<integer, table<string, function[]>> client id -> registration id -> cancel function
 local cancels = vim.defaulttable()
 
 local queue_timeout_ms = 100
----@type table<number, uv.uv_timer_t> client id -> libuv timer which will send queued changes at its timeout
+---@type table<integer, uv.uv_timer_t> client id -> libuv timer which will send queued changes at its timeout
 local queue_timers = {}
----@type table<number, lsp.FileEvent[]> client id -> set of queued changes to send in a single LSP notification
+---@type table<integer, lsp.FileEvent[]> client id -> set of queued changes to send in a single LSP notification
 local change_queues = {}
----@type table<number, table<string, lsp.FileChangeType>> client id -> URI -> last type of change processed
+---@type table<integer, table<string, lsp.FileChangeType>> client id -> URI -> last type of change processed
 --- Used to prune consecutive events of the same type for the same file
 local change_cache = vim.defaulttable()
 
+---@type table<vim._watch.FileChangeType, lsp.FileChangeType>
 local to_lsp_change_type = {
   [watch.FileChangeType.Created] = protocol.FileChangeType.Created,
   [watch.FileChangeType.Changed] = protocol.FileChangeType.Changed,
@@ -111,18 +111,18 @@ local to_lsp_change_type = {
 
 --- Default excludes the same as VSCode's `files.watcherExclude` setting.
 --- https://github.com/microsoft/vscode/blob/eef30e7165e19b33daa1e15e92fa34ff4a5df0d3/src/vs/workbench/contrib/files/browser/files.contribution.ts#L261
----@type lpeg parsed Lpeg pattern
+---@type vim.lpeg.Pattern parsed Lpeg pattern
 M._poll_exclude_pattern = parse('**/.git/{objects,subtree-cache}/**')
   + parse('**/node_modules/*/**')
   + parse('**/.hg/store/**')
 
 --- Registers the workspace/didChangeWatchedFiles capability dynamically.
 ---
----@param reg table LSP Registration object.
----@param ctx table Context from the |lsp-handler|.
+---@param reg lsp.Registration LSP Registration object.
+---@param ctx lsp.HandlerContext Context from the |lsp-handler|.
 function M.register(reg, ctx)
   local client_id = ctx.client_id
-  local client = vim.lsp.get_client_by_id(client_id)
+  local client = assert(vim.lsp.get_client_by_id(client_id), 'Client must be running')
   -- Ill-behaved servers may not honor the client capability and try to register
   -- anyway, so ignore requests when the user has opted out of the feature.
   local has_capability = vim.tbl_get(
@@ -134,57 +134,53 @@ function M.register(reg, ctx)
   if not has_capability or not client.workspace_folders then
     return
   end
-  local watch_regs = {} --- @type table<string,{pattern:lpeg,kind:integer}>
-  for _, w in ipairs(reg.registerOptions.watchers) do
-    local relative_pattern = false
-    local glob_patterns = {} --- @type {baseUri:string, pattern: string}[]
-    if type(w.globPattern) == 'string' then
+  local register_options = reg.registerOptions --[[@as lsp.DidChangeWatchedFilesRegistrationOptions]]
+  ---@type table<string, {pattern: vim.lpeg.Pattern, kind: lsp.WatchKind}[]> by base_dir
+  local watch_regs = vim.defaulttable()
+  for _, w in ipairs(register_options.watchers) do
+    local kind = w.kind
+      or (protocol.WatchKind.Create + protocol.WatchKind.Change + protocol.WatchKind.Delete)
+    local glob_pattern = w.globPattern
+
+    if type(glob_pattern) == 'string' then
+      local pattern = parse(glob_pattern)
+      if not pattern then
+        error('Cannot parse pattern: ' .. glob_pattern)
+      end
       for _, folder in ipairs(client.workspace_folders) do
-        table.insert(glob_patterns, { baseUri = folder.uri, pattern = w.globPattern })
+        local base_dir = vim.uri_to_fname(folder.uri)
+        table.insert(watch_regs[base_dir], { pattern = pattern, kind = kind })
       end
     else
-      relative_pattern = true
-      table.insert(glob_patterns, w.globPattern)
-    end
-    for _, glob_pattern in ipairs(glob_patterns) do
-      local base_dir = nil ---@type string?
-      if type(glob_pattern.baseUri) == 'string' then
-        base_dir = glob_pattern.baseUri
-      elseif type(glob_pattern.baseUri) == 'table' then
-        base_dir = glob_pattern.baseUri.uri
-      end
-      assert(base_dir, "couldn't identify root of watch")
-      base_dir = vim.uri_to_fname(base_dir)
-
-      ---@type integer
-      local kind = w.kind
-        or protocol.WatchKind.Create + protocol.WatchKind.Change + protocol.WatchKind.Delete
-
+      local base_uri = glob_pattern.baseUri
+      local uri = type(base_uri) == 'string' and base_uri or base_uri.uri
+      local base_dir = vim.uri_to_fname(uri)
       local pattern = parse(glob_pattern.pattern)
-      assert(pattern, 'invalid pattern: ' .. glob_pattern.pattern)
-      if relative_pattern then
-        pattern = lpeg.P(base_dir .. '/') * pattern
+      if not pattern then
+        error('Cannot parse pattern: ' .. glob_pattern.pattern)
       end
-
-      watch_regs[base_dir] = watch_regs[base_dir] or {}
-      table.insert(watch_regs[base_dir], {
-        pattern = pattern,
-        kind = kind,
-      })
+      pattern = lpeg.P(base_dir .. '/') * pattern
+      table.insert(watch_regs[base_dir], { pattern = pattern, kind = kind })
     end
   end
 
+  ---@param base_dir string
   local callback = function(base_dir)
     return function(fullpath, change_type)
-      for _, w in ipairs(watch_regs[base_dir]) do
-        change_type = to_lsp_change_type[change_type]
+      local registrations = watch_regs[base_dir]
+      for _, w in ipairs(registrations) do
+        local lsp_change_type = assert(
+          to_lsp_change_type[change_type],
+          'Must receive change type Created, Changed or Deleted'
+        )
         -- e.g. match kind with Delete bit (0b0100) to Delete change_type (3)
-        local kind_mask = bit.lshift(1, change_type - 1)
+        local kind_mask = bit.lshift(1, lsp_change_type - 1)
         local change_type_match = bit.band(w.kind, kind_mask) == kind_mask
-        if M._match(w.pattern, fullpath) and change_type_match then
+        if w.pattern:match(fullpath) ~= nil and change_type_match then
+          ---@type lsp.FileEvent
           local change = {
             uri = vim.uri_from_fname(fullpath),
-            type = change_type,
+            type = lsp_change_type,
           }
 
           local last_type = change_cache[client_id][change.uri]
@@ -196,9 +192,11 @@ function M.register(reg, ctx)
 
           if not queue_timers[client_id] then
             queue_timers[client_id] = vim.defer_fn(function()
-              client.notify(ms.workspace_didChangeWatchedFiles, {
+              ---@type lsp.DidChangeWatchedFilesParams
+              local params = {
                 changes = change_queues[client_id],
-              })
+              }
+              client.notify(ms.workspace_didChangeWatchedFiles, params)
               queue_timers[client_id] = nil
               change_queues[client_id] = nil
               change_cache[client_id] = nil
@@ -235,8 +233,8 @@ end
 
 --- Unregisters the workspace/didChangeWatchedFiles capability dynamically.
 ---
----@param unreg table LSP Unregistration object.
----@param ctx table Context from the |lsp-handler|.
+---@param unreg lsp.Unregistration LSP Unregistration object.
+---@param ctx lsp.HandlerContext Context from the |lsp-handler|.
 function M.unregister(unreg, ctx)
   local client_id = ctx.client_id
   local client_cancels = cancels[client_id]
-- 
cgit 


From fec5e3ab247bcc1ced67f1d0aa7fa10f694f933b Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 21 Nov 2023 14:25:45 +0800
Subject: fix(vim.region): handle multibyte inclusive selection properly
 (#26129)

---
 runtime/doc/lua.txt         |  2 +-
 runtime/lua/vim/_editor.lua | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index 596b58d4ff..b155e646ab 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1728,7 +1728,7 @@ vim.region({bufnr}, {pos1}, {pos2}, {regtype}, {inclusive})
       • {pos2}       integer[]|string End of region as a (line, column) tuple
                      or |getpos()|-compatible string
       • {regtype}    (string) |setreg()|-style selection type
-      • {inclusive}  (boolean) Controls whether `pos2` column is inclusive
+      • {inclusive}  (boolean) Controls whether the ending column is inclusive
                      (see also 'selection').
 
     Return: ~
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 98a1ce79ed..12b632075d 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -492,7 +492,7 @@ end
 ---@param pos1 integer[]|string Start of region as a (line, column) tuple or |getpos()|-compatible string
 ---@param pos2 integer[]|string End of region as a (line, column) tuple or |getpos()|-compatible string
 ---@param regtype string \|setreg()|-style selection type
----@param inclusive boolean Controls whether `pos2` column is inclusive (see also 'selection').
+---@param inclusive boolean Controls whether the ending column is inclusive (see also 'selection').
 ---@return table region Dict of the form `{linenr = {startcol,endcol}}`. `endcol` is exclusive, and
 ---whole lines are returned as `{startcol,endcol} = {0,-1}`.
 function vim.region(bufnr, pos1, pos2, regtype, inclusive)
@@ -502,11 +502,11 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
 
   if type(pos1) == 'string' then
     local pos = vim.fn.getpos(pos1)
-    pos1 = { pos[2] - 1, pos[3] - 1 + pos[4] }
+    pos1 = { pos[2] - 1, pos[3] - 1 }
   end
   if type(pos2) == 'string' then
     local pos = vim.fn.getpos(pos2)
-    pos2 = { pos[2] - 1, pos[3] - 1 + pos[4] }
+    pos2 = { pos[2] - 1, pos[3] - 1 }
   end
 
   if pos1[1] > pos2[1] or (pos1[1] == pos2[1] and pos1[2] > pos2[2]) then
@@ -525,9 +525,8 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
 
   -- in case of block selection, columns need to be adjusted for non-ASCII characters
   -- TODO: handle double-width characters
-  local bufline
   if regtype:byte() == 22 then
-    bufline = vim.api.nvim_buf_get_lines(bufnr, pos1[1], pos1[1] + 1, true)[1]
+    local bufline = vim.api.nvim_buf_get_lines(bufnr, pos1[1], pos1[1] + 1, true)[1]
     pos1[2] = vim.str_utfindex(bufline, pos1[2])
   end
 
@@ -538,7 +537,7 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
       c1 = pos1[2]
       c2 = c1 + regtype:sub(2)
       -- and adjust for non-ASCII characters
-      bufline = vim.api.nvim_buf_get_lines(bufnr, l, l + 1, true)[1]
+      local bufline = vim.api.nvim_buf_get_lines(bufnr, l, l + 1, true)[1]
       local utflen = vim.str_utfindex(bufline, #bufline)
       if c1 <= utflen then
         c1 = vim.str_byteindex(bufline, c1)
@@ -555,7 +554,11 @@ function vim.region(bufnr, pos1, pos2, regtype, inclusive)
       c2 = -1
     else
       c1 = (l == pos1[1]) and pos1[2] or 0
-      c2 = (l == pos2[1]) and (pos2[2] + (inclusive and 1 or 0)) or -1
+      if inclusive and l == pos2[1] then
+        local bufline = vim.api.nvim_buf_get_lines(bufnr, pos2[1], pos2[1] + 1, true)[1]
+        pos2[2] = vim.fn.byteidx(bufline, vim.fn.charidx(bufline, pos2[2]) + 1)
+      end
+      c2 = (l == pos2[1]) and pos2[2] or -1
     end
     table.insert(region, l, { c1, c2 })
   end
-- 
cgit 


From 7e97c773e3ba78fcddbb2a0b9b0d572c8210c83e Mon Sep 17 00:00:00 2001
From: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:46:19 +0100
Subject: perf(lsp): use async fs_stat for file watching on linux (#26123)

---
 runtime/lua/vim/_watch.lua | 51 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_watch.lua b/runtime/lua/vim/_watch.lua
index 7870e1e867..43fce3bf7f 100644
--- a/runtime/lua/vim/_watch.lua
+++ b/runtime/lua/vim/_watch.lua
@@ -132,35 +132,36 @@ local function recurse_watch(path, opts, callback)
       end
     end
     for fullpath, events_list in pairs(filechanges) do
-      local stat = uv.fs_stat(fullpath)
-      ---@type vim._watch.FileChangeType
-      local change_type
-      if stat then
-        change_type = FileChangeType.Created
-        for _, event in ipairs(events_list) do
-          if event.change then
-            change_type = FileChangeType.Changed
+      uv.fs_stat(fullpath, function(_, stat)
+        ---@type vim._watch.FileChangeType
+        local change_type
+        if stat then
+          change_type = FileChangeType.Created
+          for _, event in ipairs(events_list) do
+            if event.change then
+              change_type = FileChangeType.Changed
+            end
           end
-        end
-        if stat.type == 'directory' then
-          local handle = handles[fullpath]
-          if not handle then
-            handle = assert(uv.new_fs_event())
-            handles[fullpath] = handle
-            handle:start(fullpath, uvflags, create_on_change(fullpath))
+          if stat.type == 'directory' then
+            local handle = handles[fullpath]
+            if not handle then
+              handle = assert(uv.new_fs_event())
+              handles[fullpath] = handle
+              handle:start(fullpath, uvflags, create_on_change(fullpath))
+            end
           end
-        end
-      else
-        local handle = handles[fullpath]
-        if handle then
-          if not handle:is_closing() then
-            handle:close()
+        else
+          local handle = handles[fullpath]
+          if handle then
+            if not handle:is_closing() then
+              handle:close()
+            end
+            handles[fullpath] = nil
           end
-          handles[fullpath] = nil
+          change_type = FileChangeType.Deleted
         end
-        change_type = FileChangeType.Deleted
-      end
-      callback(fullpath, change_type)
+        callback(fullpath, change_type)
+      end)
     end
   end
   local root_handle = assert(uv.new_fs_event())
-- 
cgit 


From 820823c76d44c4d1fc350e68d9d75c65c80c72f7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 22 Nov 2023 10:46:11 +0800
Subject: vim-patch:596a9f29c83a (#26146)

runtime(doc): Fix whitespace and formatting of some help files (vim/vim#13549)

https://github.com/vim/vim/commit/596a9f29c83af85ace1a2702c88591851ad14df8

N/A patch:
vim-patch:aabca259fa48

Co-authored-by: h_east <h.east.727@gmail.com>
---
 runtime/doc/builtin.txt         | 104 ++++++++++++++++++++--------------------
 runtime/lua/vim/_meta/vimfn.lua | 104 ++++++++++++++++++++--------------------
 2 files changed, 104 insertions(+), 104 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index bc4d1f30c9..860372767a 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -5276,96 +5276,96 @@ printf({fmt}, {expr1} ...)                                            *printf()*
 		having a different word order, positional arguments may be
 		used to indicate this. For instance: >vim
 
-			#, c-format
-			msgid "%s returning %s"
-			msgstr "waarde %2$s komt terug van %1$s"
+		    #, c-format
+		    msgid "%s returning %s"
+		    msgstr "waarde %2$s komt terug van %1$s"
 <
-		In this example, the sentence has its 2 string arguments reversed
-		in the output. >vim
+		In this example, the sentence has its 2 string arguments
+		reversed in the output. >vim
 
-			echo printf(
-				"In The Netherlands, vim's creator's name is: %1$s %2$s",
-				"Bram", "Moolenaar")
-<			In The Netherlands, vim's creator's name is: Bram Moolenaar >vim
+		    echo printf(
+			"In The Netherlands, vim's creator's name is: %1$s %2$s",
+			"Bram", "Moolenaar")
+<		    In The Netherlands, vim's creator's name is: Bram Moolenaar >vim
 
-			echo printf(
-				"In Belgium, vim's creator's name is: %2$s %1$s",
-				"Bram", "Moolenaar")
-<			In Belgium, vim's creator's name is: Moolenaar Bram
+		    echo printf(
+			"In Belgium, vim's creator's name is: %2$s %1$s",
+			"Bram", "Moolenaar")
+<		    In Belgium, vim's creator's name is: Moolenaar Bram
 
 		Width (and precision) can be specified using the '*' specifier.
 		In this case, you must specify the field width position in the
 		argument list. >vim
 
-			echo printf("%1$*2$.*3$d", 1, 2, 3)
-<			001 >vim
-			echo printf("%2$*3$.*1$d", 1, 2, 3)
-<			  2 >vim
-			echo printf("%3$*1$.*2$d", 1, 2, 3)
-<			03 >vim
-			echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
-<			1.414
+		    echo printf("%1$*2$.*3$d", 1, 2, 3)
+<		    001 >vim
+		    echo printf("%2$*3$.*1$d", 1, 2, 3)
+<		      2 >vim
+		    echo printf("%3$*1$.*2$d", 1, 2, 3)
+<		    03 >vim
+		    echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
+<		    1.414
 
 		You can mix specifying the width and/or precision directly
 		and via positional arguments: >vim
 
-			echo printf("%1$4.*2$f", 1.4142135, 6)
-<			1.414214 >vim
-			echo printf("%1$*2$.4f", 1.4142135, 6)
-<			1.4142 >vim
-			echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
-<			  1.41
+		    echo printf("%1$4.*2$f", 1.4142135, 6)
+<		    1.414214 >vim
+		    echo printf("%1$*2$.4f", 1.4142135, 6)
+<		    1.4142 >vim
+		    echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
+<		      1.41
 
 							*E1500*
 		You cannot mix positional and non-positional arguments: >vim
-			echo printf("%s%1$s", "One", "Two")
-<			E1500: Cannot mix positional and non-positional
-			arguments: %s%1$s
+		    echo printf("%s%1$s", "One", "Two")
+<		    E1500: Cannot mix positional and non-positional arguments:
+		    %s%1$s
 
 							*E1501*
 		You cannot skip a positional argument in a format string: >vim
-			echo printf("%3$s%1$s", "One", "Two", "Three")
-<			E1501: format argument 2 unused in $-style
-			format: %3$s%1$s
+		    echo printf("%3$s%1$s", "One", "Two", "Three")
+<		    E1501: format argument 2 unused in $-style format:
+		    %3$s%1$s
 
 							*E1502*
 		You can re-use a [field-width] (or [precision]) argument: >vim
-			echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
-<			1 at width 2 is: 01
+		    echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
+<		    1 at width 2 is: 01
 
 		However, you can't use it as a different type: >vim
-			echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
-<			E1502: Positional argument 2 used as field
-			width reused as different type: long int/int
+		    echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
+<		    E1502: Positional argument 2 used as field width reused as
+		    different type: long int/int
 
 							*E1503*
 		When a positional argument is used, but not the correct number
 		or arguments is given, an error is raised: >vim
-			echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
-<			E1503: Positional argument 3 out of bounds:
-			%1$d at width %2$d is: %01$*2$.*3$d
+		    echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
+<		    E1503: Positional argument 3 out of bounds: %1$d at width
+		    %2$d is: %01$*2$.*3$d
 
 		Only the first error is reported: >vim
-			echo printf("%01$*2$.*3$d %4$d", 1, 2)
-<			E1503: Positional argument 3 out of bounds:
-			%01$*2$.*3$d %4$d
+		    echo printf("%01$*2$.*3$d %4$d", 1, 2)
+<		    E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
+		    %4$d
 
 							*E1504*
 		A positional argument can be used more than once: >vim
-			echo printf("%1$s %2$s %1$s", "One", "Two")
-<			One Two One
+		    echo printf("%1$s %2$s %1$s", "One", "Two")
+<		    One Two One
 
 		However, you can't use a different type the second time: >vim
-			echo printf("%1$s %2$s %1$d", "One", "Two")
-<			E1504: Positional argument 1 type used
-			inconsistently: int/string
+		    echo printf("%1$s %2$s %1$d", "One", "Two")
+<		    E1504: Positional argument 1 type used inconsistently:
+		    int/string
 
 							*E1505*
 		Various other errors that lead to a format string being
 		wrongly formatted lead to: >vim
-			echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
-<			E1505: Invalid format specifier:
-			%1$d at width %2$d is: %01$*2$.3$d
+		    echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
+<		    E1505: Invalid format specifier: %1$d at width %2$d is:
+		    %01$*2$.3$d
 
 							*E1507*
 		This internal error indicates that the logic to parse a
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index d1e676ef70..b443fb5d78 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -6261,96 +6261,96 @@ function vim.fn.prevnonblank(lnum) end
 --- having a different word order, positional arguments may be
 --- used to indicate this. For instance: >vim
 ---
----   #, c-format
----   msgid "%s returning %s"
----   msgstr "waarde %2$s komt terug van %1$s"
+---     #, c-format
+---     msgid "%s returning %s"
+---     msgstr "waarde %2$s komt terug van %1$s"
 --- <
---- In this example, the sentence has its 2 string arguments reversed
---- in the output. >vim
+--- In this example, the sentence has its 2 string arguments
+--- reversed in the output. >vim
 ---
----   echo printf(
----     "In The Netherlands, vim's creator's name is: %1$s %2$s",
----     "Bram", "Moolenaar")
---- <  In The Netherlands, vim's creator's name is: Bram Moolenaar >vim
+---     echo printf(
+---   "In The Netherlands, vim's creator's name is: %1$s %2$s",
+---   "Bram", "Moolenaar")
+--- <    In The Netherlands, vim's creator's name is: Bram Moolenaar >vim
 ---
----   echo printf(
----     "In Belgium, vim's creator's name is: %2$s %1$s",
----     "Bram", "Moolenaar")
---- <  In Belgium, vim's creator's name is: Moolenaar Bram
+---     echo printf(
+---   "In Belgium, vim's creator's name is: %2$s %1$s",
+---   "Bram", "Moolenaar")
+--- <    In Belgium, vim's creator's name is: Moolenaar Bram
 ---
 --- Width (and precision) can be specified using the '*' specifier.
 --- In this case, you must specify the field width position in the
 --- argument list. >vim
 ---
----   echo printf("%1$*2$.*3$d", 1, 2, 3)
---- <  001 >vim
----   echo printf("%2$*3$.*1$d", 1, 2, 3)
---- <    2 >vim
----   echo printf("%3$*1$.*2$d", 1, 2, 3)
---- <  03 >vim
----   echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
---- <  1.414
+---     echo printf("%1$*2$.*3$d", 1, 2, 3)
+--- <    001 >vim
+---     echo printf("%2$*3$.*1$d", 1, 2, 3)
+--- <      2 >vim
+---     echo printf("%3$*1$.*2$d", 1, 2, 3)
+--- <    03 >vim
+---     echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
+--- <    1.414
 ---
 --- You can mix specifying the width and/or precision directly
 --- and via positional arguments: >vim
 ---
----   echo printf("%1$4.*2$f", 1.4142135, 6)
---- <  1.414214 >vim
----   echo printf("%1$*2$.4f", 1.4142135, 6)
---- <  1.4142 >vim
----   echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
---- <    1.41
+---     echo printf("%1$4.*2$f", 1.4142135, 6)
+--- <    1.414214 >vim
+---     echo printf("%1$*2$.4f", 1.4142135, 6)
+--- <    1.4142 >vim
+---     echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
+--- <      1.41
 ---
 ---           *E1500*
 --- You cannot mix positional and non-positional arguments: >vim
----   echo printf("%s%1$s", "One", "Two")
---- <  E1500: Cannot mix positional and non-positional
----   arguments: %s%1$s
+---     echo printf("%s%1$s", "One", "Two")
+--- <    E1500: Cannot mix positional and non-positional arguments:
+---     %s%1$s
 ---
 ---           *E1501*
 --- You cannot skip a positional argument in a format string: >vim
----   echo printf("%3$s%1$s", "One", "Two", "Three")
---- <  E1501: format argument 2 unused in $-style
----   format: %3$s%1$s
+---     echo printf("%3$s%1$s", "One", "Two", "Three")
+--- <    E1501: format argument 2 unused in $-style format:
+---     %3$s%1$s
 ---
 ---           *E1502*
 --- You can re-use a [field-width] (or [precision]) argument: >vim
----   echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
---- <  1 at width 2 is: 01
+---     echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
+--- <    1 at width 2 is: 01
 ---
 --- However, you can't use it as a different type: >vim
----   echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
---- <  E1502: Positional argument 2 used as field
----   width reused as different type: long int/int
+---     echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
+--- <    E1502: Positional argument 2 used as field width reused as
+---     different type: long int/int
 ---
 ---           *E1503*
 --- When a positional argument is used, but not the correct number
 --- or arguments is given, an error is raised: >vim
----   echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
---- <  E1503: Positional argument 3 out of bounds:
----   %1$d at width %2$d is: %01$*2$.*3$d
+---     echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
+--- <    E1503: Positional argument 3 out of bounds: %1$d at width
+---     %2$d is: %01$*2$.*3$d
 ---
 --- Only the first error is reported: >vim
----   echo printf("%01$*2$.*3$d %4$d", 1, 2)
---- <  E1503: Positional argument 3 out of bounds:
----   %01$*2$.*3$d %4$d
+---     echo printf("%01$*2$.*3$d %4$d", 1, 2)
+--- <    E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
+---     %4$d
 ---
 ---           *E1504*
 --- A positional argument can be used more than once: >vim
----   echo printf("%1$s %2$s %1$s", "One", "Two")
---- <  One Two One
+---     echo printf("%1$s %2$s %1$s", "One", "Two")
+--- <    One Two One
 ---
 --- However, you can't use a different type the second time: >vim
----   echo printf("%1$s %2$s %1$d", "One", "Two")
---- <  E1504: Positional argument 1 type used
----   inconsistently: int/string
+---     echo printf("%1$s %2$s %1$d", "One", "Two")
+--- <    E1504: Positional argument 1 type used inconsistently:
+---     int/string
 ---
 ---           *E1505*
 --- Various other errors that lead to a format string being
 --- wrongly formatted lead to: >vim
----   echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
---- <  E1505: Invalid format specifier:
----   %1$d at width %2$d is: %01$*2$.3$d
+---     echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
+--- <    E1505: Invalid format specifier: %1$d at width %2$d is:
+---     %01$*2$.3$d
 ---
 ---           *E1507*
 --- This internal error indicates that the logic to parse a
-- 
cgit 


From 059dc3f4a6b94cd028c5041d682982e6eed9bc87 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 22 Nov 2023 11:06:46 +0800
Subject: vim-patch:cb0c113ddc01 (#26147)

runtime(netrw): expand $COMSPEC without applying 'wildignore' (vim/vim#13542)

When expanding $COMSPEC and a user has set :set wildignore=*.exe
netrw won't be able to properly cmd.exe, because it does not ignore the
wildignore setting.

So let's explicitly use expand() without applying the 'wildignore' and
'suffixes' settings to the result

closes: vim/vim#13426

https://github.com/vim/vim/commit/cb0c113ddc0101b05a27c040774cb7106fc74cd4

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/autoload/netrw.vim | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index e3e28b6de2..9dc9d28b1a 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,7 +1,9 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
 " Date:		May 03, 2023
-" Version:	173
+" Version:	173a
+" Last Change:
+" 	2023 Nov 21 by Vim Project: ignore wildignore when expanding $COMSPEC	(v173a)
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -398,7 +400,7 @@ if !exists("g:netrw_localcopycmd")
   if g:netrw_cygwin
    let g:netrw_localcopycmd= "cp"
   else
-   let g:netrw_localcopycmd   = expand("$COMSPEC")
+   let g:netrw_localcopycmd   = expand("$COMSPEC", v:true)
    let g:netrw_localcopycmdopt= " /c copy"
   endif
  elseif has("unix") || has("macunix")
@@ -413,7 +415,7 @@ if !exists("g:netrw_localcopydircmd")
    let g:netrw_localcopydircmd   = "cp"
    let g:netrw_localcopydircmdopt= " -R"
   else
-   let g:netrw_localcopydircmd   = expand("$COMSPEC")
+   let g:netrw_localcopydircmd   = expand("$COMSPEC", v:true)
    let g:netrw_localcopydircmdopt= " /c xcopy /e /c /h /i /k"
   endif
  elseif has("unix")
@@ -434,7 +436,7 @@ if has("win32") || has("win95") || has("win64") || has("win16")
   if g:netrw_cygwin
    call s:NetrwInit("g:netrw_localmkdir","mkdir")
   else
-   let g:netrw_localmkdir   = expand("$COMSPEC")
+   let g:netrw_localmkdir   = expand("$COMSPEC", v:true)
    let g:netrw_localmkdiropt= " /c mkdir"
   endif
 else
@@ -450,7 +452,7 @@ if !exists("g:netrw_localmovecmd")
   if g:netrw_cygwin
    let g:netrw_localmovecmd= "mv"
   else
-   let g:netrw_localmovecmd   = expand("$COMSPEC")
+   let g:netrw_localmovecmd   = expand("$COMSPEC", v:true)
    let g:netrw_localmovecmdopt= " /c move"
   endif
  elseif has("unix") || has("macunix")
-- 
cgit 


From c249058758af6919f718750b2f4acb96bafeb2dd Mon Sep 17 00:00:00 2001
From: Luuk van Baal <luukvbaal@gmail.com>
Date: Sat, 18 Nov 2023 23:49:11 +0100
Subject: feat(extmarks): add sign name to extmark "details" array

Problem:  Unable to identify legacy signs when fetching extmarks with
          `nvim_buf_get_extmarks()`.
Solution: Add "sign_name" to the extmark detail array.

Add some misc. changes as follow-up to #25724
---
 runtime/doc/builtin.txt | 10 +++++-----
 runtime/doc/sign.txt    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 860372767a..5d70c42157 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6998,11 +6998,11 @@ sign_place({id}, {group}, {name}, {buf} [, {dict}])               *sign_place()*
 		similar to the |:sign-place| command.
 
 		If the sign identifier {id} is zero, then a new identifier is
-		allocated.  Otherwise the specified number is used. {group} is
-		the sign group name. To use the global sign group, use an
-		empty string.  {group} functions as a namespace for {id}, thus
-		two groups can use the same IDs. Refer to |sign-identifier|
-		and |sign-group| for more information.
+		allocated (first available id in a buffer).  Otherwise the
+		specified number is used. {group} is the sign group name. To use
+		the global sign group, use an empty string.  {group} functions
+		as a namespace for {id}, thus two groups can use the same IDs.
+		Refer to |sign-identifier| and |sign-group| for more information.
 
 		{name} refers to a defined sign.
 		{buf} refers to a buffer name or number. For the accepted
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 733b0fe212..30fa7eee0b 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -53,9 +53,9 @@ If 'cursorline' is enabled, then the CursorLineSign highlight group is used
 Each placed sign is identified by a number called the sign identifier. This
 identifier is used to jump to the sign or to remove the sign. The identifier
 is assigned when placing the sign using the |:sign-place| command or the
-|sign_place()| function. Each sign identifier should be a unique number.
-Placing the same identifier twice will move the previously placed sign. The
-|sign_place()| function can be called with a zero sign identifier to allocate
+|sign_place()| function. Each sign identifier should be a unique number (per
+buffer). Placing the same identifier twice will move the previously placed sign.
+The |sign_place()| function can be called with a zero sign identifier to allocate
 the next available identifier.
 
 							*sign-group*
-- 
cgit 


From 62dc1f26632fd0c915e7521a4e13a823142ec44d Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 23 Nov 2023 17:02:53 +0800
Subject: vim-patch:8750e3cf81f1 (#26163)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(netrw): Fix handling of very long filename on longlist style (vim/vim#12150)

If there is a file with a very long filename (longer than
g:netrw_maxfilenamelen), and if g:netrw_liststyle is set to 1, no space
is inserted between the filename and the filesize and the file cannot be
opened because of this.

E.g.:
```
$ echo hello > 12345678901234567890123456789012	  # 32 bytes: OK
$ echo hello > 123456789012345678901234567890123  # 33 bytes: not OK
$ echo hello > 1234567890123456789012345678901234 # 34 bytes: not OK
$ echo hello > こんにちは                         # multibyte filename
$ LC_ALL=C.UTF-8 vim . --clean --cmd "set loadplugins" --cmd "let g:netrw_liststyle=1"
```

Then, it will be shown like this:
```
" ============================================================================
" Netrw Directory Listing                                        (netrw v171)
"   /cygdrive/c/work/netrw-test
"   Sorted by      name
"   Sort sequence: [\/]$,\<core\%(\.\d\+\)\=\>,\.h$,\.c$,\.cpp$,\~\=\*$,*,\.o$,\
"   Quick Help: <F1>:help  -:go up dir  D:delete  R:rename  s:sort-by  x:special
" ==============================================================================
../                              0 Mon Mar 13 19:25:16 2023
./                               0 Mon Mar 13 19:44:58 2023
12345678901234567890123456789012 6 Mon Mar 13 19:29:43 2023
12345678901234567890123456789012346 Mon Mar 13 19:32:40 2023
1234567890123456789012345678901236 Mon Mar 13 19:29:49 2023
こんにちは                  6 Mon Mar 13 19:30:41 2023
```

If the length of the filename is 32 bytes, there is a space between the
filename and the filesize. However, when it is longer than 32 bytes, no
space is shown.

Also, you may find that the filesize of the multibyte named file is not
aligned.

After this patch is applied, the filelist will be shown like this:
```
" ============================================================================
" Netrw Directory Listing                                        (netrw v171)
"   /cygdrive/c/work/netrw-test
"   Sorted by      name
"   Sort sequence: [\/]$,\<core\%(\.\d\+\)\=\>,\.h$,\.c$,\.cpp$,\~\=\*$,*,\.o$,\
"   Quick Help: <F1>:help  -:go up dir  D:delete  R:rename  s:sort-by  x:special
" ==============================================================================
../                                             0 Mon Mar 13 20:49:22 2023
./                                              0 Mon Mar 13 21:12:14 2023
1234567890123456789012345678901             10000 Mon Mar 13 20:57:55 2023
12345678901234567890123456789012                6 Mon Mar 13 19:29:43 2023
123456789012345678901234567890123               6 Mon Mar 13 19:29:49 2023
1234567890123456789012345678901234              6 Mon Mar 13 19:32:40 2023
1234567890123456789012345678901234567       10000 Mon Mar 13 21:03:23 2023
1234567890123456789012345678901234567890    10000 Mon Mar 13 21:03:36 2023
123456789012345678901234567890123456789012  10000 Mon Mar 13 21:03:59 2023
1234567890123456789012345678901234567890123  10000 Mon Mar 13 21:03:45 2023
1234567890123456789012345678901234567890123456  5 Mon Mar 13 21:08:15 2023
12345678901234567890123456789012345678901234567  10 Mon Mar 13 21:05:21 2023
こんにちは                                      6 Mon Mar 13 19:30:41 2023
```

Now we have 32 + 2 + 15 = 49 characters for filename and filesize.
It tries to align the filesize as much as possible.
The last line that has multibyte filename is also aligned.

Also fixed the issue that the file list is not shown correctly when
g:netrw_sort_by is set to 'size' and g:netrw_sizestyle is set to 'h' or
'H'.

https://github.com/vim/vim/commit/8750e3cf81f12132e7b4141501feba586b1ae11d

Co-authored-by: K.Takata <kentkt@csc.jp>
---
 runtime/autoload/netrw.vim | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 9dc9d28b1a..b8092ebeeb 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -4,6 +4,7 @@
 " Version:	173a
 " Last Change:
 " 	2023 Nov 21 by Vim Project: ignore wildignore when expanding $COMSPEC	(v173a)
+" 	2023 Nov 22 by Vim Project: fix handling of very long filename on longlist style	(v173a)
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -11077,16 +11078,16 @@ fun! s:LocalListing()
 "   call Decho("pfile   <".pfile.">",'~'.expand("<slnum>"))
 
    if w:netrw_liststyle == s:LONGLIST
+    let longfile= printf("%-".g:netrw_maxfilenamelen."S",pfile)
     let sz   = getfsize(filename)
 	let szlen = 15 - (strdisplaywidth(longfile) - g:netrw_maxfilenamelen)
     let szlen = (szlen > 0) ? szlen : 0
-    let fsz  = printf("%".szlen."S",sz)
 
     if g:netrw_sizestyle =~# "[hH]"
      let sz= s:NetrwHumanReadable(sz)
     endif
-	let longfile= printf("%-".g:netrw_maxfilenamelen."S",pfile)
-    let pfile   = longfile."  ".sz." ".strftime(g:netrw_timefmt,getftime(filename))
+    let fsz  = printf("%".szlen."S",sz)
+    let pfile   = longfile."  ".fsz." ".strftime(g:netrw_timefmt,getftime(filename))
 "    call Decho("longlist support: sz=".sz." fsz=".fsz,'~'.expand("<slnum>"))
    endif
 
@@ -11096,7 +11097,7 @@ fun! s:LocalListing()
 "    call Decho("implementing g:netrw_sort_by=".g:netrw_sort_by." (time)")
 "    call Decho("getftime(".filename.")=".getftime(filename),'~'.expand("<slnum>"))
     let t  = getftime(filename)
-    let ft = strpart("000000000000000000",1,18-strlen(t)).t
+    let ft = printf("%018d",t)
 "    call Decho("exe NetrwKeepj put ='".ft.'/'.pfile."'",'~'.expand("<slnum>"))
     let ftpfile= ft.'/'.pfile
     sil! NetrwKeepj put=ftpfile
@@ -11106,10 +11107,7 @@ fun! s:LocalListing()
 "    call Decho("implementing g:netrw_sort_by=".g:netrw_sort_by." (size)")
 "    call Decho("getfsize(".filename.")=".getfsize(filename),'~'.expand("<slnum>"))
     let sz   = getfsize(filename)
-    if g:netrw_sizestyle =~# "[hH]"
-     let sz= s:NetrwHumanReadable(sz)
-    endif
-    let fsz  = strpart("000000000000000000",1,18-strlen(sz)).sz
+    let fsz  = printf("%018d",sz)
 "    call Decho("exe NetrwKeepj put ='".fsz.'/'.filename."'",'~'.expand("<slnum>"))
     let fszpfile= fsz.'/'.pfile
     sil! NetrwKeepj put =fszpfile
-- 
cgit 


From 73c7a0d58e6358d35fe2d5a11b3e807a625a0001 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 24 Nov 2023 07:19:06 +0800
Subject: docs(starting.txt): correct step number (#26185)

---
 runtime/doc/starting.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 9f7a729575..a6619bc381 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -466,13 +466,13 @@ accordingly, proceeding as follows:
 	|$XDG_CONFIG_HOME|	$XDG_CONFIG_HOME/nvim/init.vim	(or init.lua)
 
 	If Nvim was started with "-u {file}" then {file} is used as the config
-	and all initializations until 5. are skipped. $MYVIMRC is not set.
+	and all initializations until 8. are skipped. $MYVIMRC is not set.
 	"nvim -u NORC" can be used to skip these initializations without
 	reading a file.  "nvim -u NONE" also skips plugins and syntax
 	highlighting.  |-u|
 
-	If Nvim was started with |-es| all initializations until 5. are
-	skipped.
+	If Nvim was started with |-es| or |-Es| or |-l| all initializations until 8.
+	are skipped.
 						*system-vimrc* *sysinit.vim*
      a. The system vimrc file is read for initializations.  If
 	nvim/sysinit.vim file exists in one of $XDG_CONFIG_DIRS, it will be
-- 
cgit 


From fc4385ad94c0a12d2ce8b6d275d8336a740b04fd Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 25 Nov 2023 06:35:31 -0800
Subject: docs: vim.iter #26169

closes #24141
closes #24746
---
 runtime/doc/develop.txt  |   8 ++-
 runtime/doc/lua.txt      | 145 +++++++++++++++++++++--------------------------
 runtime/doc/news.txt     |   9 +++
 runtime/lua/vim/iter.lua | 117 +++++++++++++++-----------------------
 4 files changed, 129 insertions(+), 150 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 107915d017..f1d74326c7 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -288,7 +288,13 @@ Interface conventions ~
 - When accepting a buffer id, etc., 0 means "current buffer", nil means "all
   buffers".  Likewise for window id, tabpage id, etc.
   - Examples: |vim.lsp.codelens.clear()| |vim.diagnostic.enable()|
-
+- Any function signature that accepts a callback function should define the
+  callback as the LAST parameter, if possible. This improves readability of
+  calls by placing the less "noisy" arguments near the start. >
+    GOOD:
+    filter(table, opts, function() … end)
+    BAD:
+    filter(function() … end, table, opts)
 
 API DESIGN GUIDELINES					*dev-api*
 
diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index b155e646ab..a79b26dfb0 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -70,17 +70,23 @@ https://www.lua.org/doc/cacm2018.pdf
 - Stackful coroutines enable cooperative multithreading, generators, and
   versatile control for both Lua and its host (Nvim).
 
-                                                           *iterator*
+                                                                    *iterator*
 An iterator is just a function that can be called repeatedly to get the "next"
 value of a collection (or any other |iterable|). This interface is expected by
 |for-in| loops, produced by |pairs()|, supported by |vim.iter|, etc.
 https://www.lua.org/pil/7.1.html
 
-                                                           *iterable*
+                                                                    *iterable*
 An "iterable" is anything that |vim.iter()| can consume: tables, dicts, lists,
 iterator functions, tables implementing the |__call()| metamethod, and
 |vim.iter()| objects.
 
+                                                               *list-iterator*
+Iterators on |lua-list| tables have a "middle" and "end", whereas iterators in
+general may be logically infinite. Therefore some |vim.iter| operations (e.g.
+|Iter:rev()|) make sense only on list-like tables (which are finite by
+definition).
+
                                                            *lua-function-call*
 Lua functions can be called in multiple ways. Consider the function: >lua
     local foo = function(a, b)
@@ -332,8 +338,8 @@ Additionally Lua does not have integer numbers. To distinguish between these
 cases there is the following agreement:
                                                                     *lua-list*
 0. Empty table is empty list.
-1. Table with N incrementally growing integral numbers, starting from 1 and
-   ending with N is considered to be a list.
+1. Table with N consecutive integer indices starting from 1 and ending with
+   N is considered a list. See also |list-iterator|.
                                                                     *lua-dict*
 2. Table with string keys, none of which contains NUL byte, is considered to
    be a dictionary.
@@ -3205,22 +3211,27 @@ Lua module: vim.iter                                                *vim.iter*
 *vim.iter()* is an interface for |iterable|s: it wraps a table or function
 argument into an *Iter* object with methods (such as |Iter:filter()| and
 |Iter:map()|) that transform the underlying source data. These methods can
-be chained together to create iterator "pipelines". Each pipeline stage
-receives as input the output values from the prior stage. The values used
-in the first stage of the pipeline depend on the type passed to this
-function:
-
-• List tables (arrays) pass only the value of each element
-• Non-list tables (dictionaries) pass both the key and value of each
-  element
-• Function |iterator|s pass all of the values returned by their respective
-  function
-• Tables with a metatable implementing |__call()| are treated as function
-  iterators
-
-The iterator pipeline terminates when the original table or function
-iterator runs out of values (for function iterators, this means that the
-first value returned by the function is nil).
+be chained to create iterator "pipelines": the output of each pipeline
+stage is input to the next stage. The first stage depends on the type
+passed to `vim.iter()`:
+
+• List tables (arrays, |lua-list|) yield only the value of each element.
+  • Use |Iter:enumerate()| to also pass the index to the next stage.
+  • Or initialize with ipairs(): `vim.iter(ipairs(…))`.
+
+• Non-list tables (|lua-dict|) yield both the key and value of each
+  element.
+• Function |iterator|s yield all values returned by the underlying
+  function.
+• Tables with a |__call()| metamethod are treated as function iterators.
+
+The iterator pipeline terminates when the underlying |iterable| is
+exhausted (for function iterators this means it returned nil).
+
+Note: `vim.iter()` scans table input to decide if it is a list or a dict;
+to avoid this cost you can wrap the table with an iterator e.g.
+`vim.iter(ipairs({…}))`, but that precludes the use of |list-iterator|
+operations such as |Iter:rev()|).
 
 Examples: >lua
     local it = vim.iter({ 1, 2, 3, 4, 5 })
@@ -3266,9 +3277,8 @@ In addition to the |vim.iter()| function, the |vim.iter| module provides
 convenience functions like |vim.iter.filter()| and |vim.iter.totable()|.
 
 filter({f}, {src}, {...})                                  *vim.iter.filter()*
-    Filter a table or iterator.
-
-    This is a convenience function that performs: >lua
+    Filters a table or other |iterable|. >lua
+        -- Equivalent to:
         vim.iter(src):filter(f):totable()
 <
 
@@ -3285,7 +3295,7 @@ filter({f}, {src}, {...})                                  *vim.iter.filter()*
       • |Iter:filter()|
 
 Iter:all({pred})                                                  *Iter:all()*
-    Return true if all of the items in the iterator match the given predicate.
+    Returns true if all items in the iterator match the given predicate.
 
     Parameters: ~
       • {pred}  function(...):bool Predicate function. Takes all values
@@ -3293,7 +3303,8 @@ Iter:all({pred})                                                  *Iter:all()*
                 and returns true if the predicate matches.
 
 Iter:any({pred})                                                  *Iter:any()*
-    Return true if any of the items in the iterator match the given predicate.
+    Returns true if any of the items in the iterator match the given
+    predicate.
 
     Parameters: ~
       • {pred}  function(...):bool Predicate function. Takes all values
@@ -3301,12 +3312,11 @@ Iter:any({pred})                                                  *Iter:any()*
                 and returns true if the predicate matches.
 
 Iter:each({f})                                                   *Iter:each()*
-    Call a function once for each item in the pipeline.
-
-    This is used for functions which have side effects. To modify the values
-    in the iterator, use |Iter:map()|.
+    Calls a function once for each item in the pipeline, draining the
+    iterator.
 
-    This function drains the iterator.
+    For functions with side effects. To modify the values in the iterator, use
+    |Iter:map()|.
 
     Parameters: ~
       • {f}  function(...) Function to execute for each item in the pipeline.
@@ -3314,19 +3324,17 @@ Iter:each({f})                                                   *Iter:each()*
              pipeline as arguments.
 
 Iter:enumerate()                                            *Iter:enumerate()*
-    Add an iterator stage that returns the current iterator count as well as
-    the iterator value.
+    Yields the item index (count) and value for each item of an iterator
+    pipeline.
 
-    For list tables, prefer >lua
+    For list tables, this is more efficient: >lua
         vim.iter(ipairs(t))
 <
 
-    over >lua
+    instead of: >lua
         vim.iter(t):enumerate()
 <
 
-    as the former is faster.
-
     Example: >lua
         local it = vim.iter(vim.gsplit('abc', '')):enumerate()
         it:next()
@@ -3341,7 +3349,7 @@ Iter:enumerate()                                            *Iter:enumerate()*
         Iter
 
 Iter:filter({f})                                               *Iter:filter()*
-    Add a filter step to the iterator pipeline.
+    Filters an iterator pipeline.
 
     Example: >lua
         local bufs = vim.iter(vim.api.nvim_list_bufs()):filter(vim.api.nvim_buf_is_loaded)
@@ -3379,7 +3387,7 @@ Iter:find({f})                                                   *Iter:find()*
         any
 
 Iter:fold({init}, {f})                                           *Iter:fold()*
-    Fold ("reduce") an iterator or table into a single value.
+    Folds ("reduces") an iterator into a single value.
 
     Examples: >lua
         -- Create a new table with only even values
@@ -3401,9 +3409,7 @@ Iter:fold({init}, {f})                                           *Iter:fold()*
         any
 
 Iter:last()                                                      *Iter:last()*
-    Return the last item in the iterator.
-
-    Drains the iterator.
+    Drains the iterator and returns the last item.
 
     Example: >lua
         local it = vim.iter(vim.gsplit('abcdefg', ''))
@@ -3419,7 +3425,7 @@ Iter:last()                                                      *Iter:last()*
         any
 
 Iter:map({f})                                                     *Iter:map()*
-    Add a map step to the iterator pipeline.
+    Maps the items of an iterator pipeline to the values returned by `f`.
 
     If the map function returns nil, the value is filtered from the iterator.
 
@@ -3443,7 +3449,7 @@ Iter:map({f})                                                     *Iter:map()*
         Iter
 
 Iter:next()                                                      *Iter:next()*
-    Return the next value from the iterator.
+    Gets the next value from the iterator.
 
     Example: >lua
         local it = vim.iter(string.gmatch('1 2 3', '%d+')):map(tonumber)
@@ -3459,9 +3465,8 @@ Iter:next()                                                      *Iter:next()*
         any
 
 Iter:nextback()                                              *Iter:nextback()*
-    Return the next value from the end of the iterator.
-
-    Only supported for iterators on list-like tables.
+    "Pops" a value from a |list-iterator| (gets the last value and decrements
+    the tail).
 
     Example: >lua
         local it = vim.iter({1, 2, 3, 4})
@@ -3475,9 +3480,7 @@ Iter:nextback()                                              *Iter:nextback()*
         any
 
 Iter:nth({n})                                                     *Iter:nth()*
-    Return the nth value in the iterator.
-
-    This function advances the iterator.
+    Gets the nth value of an iterator (and advances to it).
 
     Example: >lua
         local it = vim.iter({ 3, 6, 9, 12 })
@@ -3494,11 +3497,7 @@ Iter:nth({n})                                                     *Iter:nth()*
         any
 
 Iter:nthback({n})                                             *Iter:nthback()*
-    Return the nth value from the end of the iterator.
-
-    This function advances the iterator.
-
-    Only supported for iterators on list-like tables.
+    Gets the nth value from the end of a |list-iterator| (and advances to it).
 
     Example: >lua
         local it = vim.iter({ 3, 6, 9, 12 })
@@ -3515,9 +3514,7 @@ Iter:nthback({n})                                             *Iter:nthback()*
         any
 
 Iter:peek()                                                      *Iter:peek()*
-    Peek at the next value in the iterator without consuming it.
-
-    Only supported for iterators on list-like tables.
+    Gets the next value in a |list-iterator| without consuming it.
 
     Example: >lua
         local it = vim.iter({ 3, 6, 9, 12 })
@@ -3533,9 +3530,9 @@ Iter:peek()                                                      *Iter:peek()*
         any
 
 Iter:peekback()                                              *Iter:peekback()*
-    Return the next value from the end of the iterator without consuming it.
+    Gets the last value of a |list-iterator| without consuming it.
 
-    Only supported for iterators on list-like tables.
+    See also |Iter:last()|.
 
     Example: >lua
         local it = vim.iter({1, 2, 3, 4})
@@ -3551,9 +3548,7 @@ Iter:peekback()                                              *Iter:peekback()*
         any
 
 Iter:rev()                                                        *Iter:rev()*
-    Reverse an iterator.
-
-    Only supported for iterators on list-like tables.
+    Reverses a |list-iterator| pipeline.
 
     Example: >lua
         local it = vim.iter({ 3, 6, 9, 12 }):rev()
@@ -3565,14 +3560,12 @@ Iter:rev()                                                        *Iter:rev()*
         Iter
 
 Iter:rfind({f})                                                 *Iter:rfind()*
-    Find the first value in the iterator that satisfies the given predicate,
+    Gets the first value in a |list-iterator| that satisfies a predicate,
     starting from the end.
 
     Advances the iterator. Returns nil and drains the iterator if no value is
     found.
 
-    Only supported for iterators on list-like tables.
-
     Examples: >lua
         local it = vim.iter({ 1, 2, 3, 2, 1 }):enumerate()
         it:rfind(1)
@@ -3588,7 +3581,7 @@ Iter:rfind({f})                                                 *Iter:rfind()*
       • Iter.find
 
 Iter:skip({n})                                                   *Iter:skip()*
-    Skip values in the iterator.
+    Skips `n` values of an iterator pipeline.
 
     Example: >lua
         local it = vim.iter({ 3, 6, 9, 12 }):skip(2)
@@ -3603,9 +3596,7 @@ Iter:skip({n})                                                   *Iter:skip()*
         Iter
 
 Iter:skipback({n})                                           *Iter:skipback()*
-    Skip values in the iterator starting from the end.
-
-    Only supported for iterators on list-like tables.
+    Skips `n` values backwards from the end of a |list-iterator| pipeline.
 
     Example: >lua
         local it = vim.iter({ 1, 2, 3, 4, 5 }):skipback(2)
@@ -3622,11 +3613,9 @@ Iter:skipback({n})                                           *Iter:skipback()*
         Iter
 
 Iter:slice({first}, {last})                                     *Iter:slice()*
-    Slice an iterator, changing its start and end positions.
-
-    This is equivalent to :skip(first - 1):skipback(len - last + 1)
+    Sets the start and end of a |list-iterator| pipeline.
 
-    Only supported for iterators on list-like tables.
+    Equivalent to `:skip(first - 1):skipback(len - last + 1)`.
 
     Parameters: ~
       • {first}  (number)
@@ -3662,9 +3651,8 @@ Iter:totable()                                                *Iter:totable()*
         (table)
 
 map({f}, {src}, {...})                                        *vim.iter.map()*
-    Map and filter a table or iterator.
-
-    This is a convenience function that performs: >lua
+    Maps a table or other |iterable|. >lua
+        -- Equivalent to:
         vim.iter(src):map(f):totable()
 <
 
@@ -3681,9 +3669,8 @@ map({f}, {src}, {...})                                        *vim.iter.map()*
       • |Iter:map()|
 
 totable({f}, {...})                                       *vim.iter.totable()*
-    Collect an iterator into a table.
-
-    This is a convenience function that performs: >lua
+    Collects an |iterable| into a table. >lua
+        -- Equivalent to:
         vim.iter(f):totable()
 <
 
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index 8073a4f162..b5bef13325 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -95,6 +95,15 @@ The following changes may require adaptations in user config or plugins.
   • Legacy and extmark signs are displayed and listed with the same priority:
       line number -> priority -> sign id -> recently placed
 
+==============================================================================
+BREAKING CHANGES IN HEAD                                    *news-breaking-dev*
+
+The following breaking changes were made during the development cycle to
+unreleased features on Nvim HEAD.
+
+• ...
+• ...
+
 ==============================================================================
 NEW FEATURES                                                    *news-features*
 
diff --git a/runtime/lua/vim/iter.lua b/runtime/lua/vim/iter.lua
index 595baa7019..874bdfb437 100644
--- a/runtime/lua/vim/iter.lua
+++ b/runtime/lua/vim/iter.lua
@@ -2,17 +2,23 @@
 ---
 --- \*vim.iter()\* is an interface for |iterable|s: it wraps a table or function argument into an
 --- \*Iter\* object with methods (such as |Iter:filter()| and |Iter:map()|) that transform the
---- underlying source data. These methods can be chained together to create iterator "pipelines".
---- Each pipeline stage receives as input the output values from the prior stage. The values used in
---- the first stage of the pipeline depend on the type passed to this function:
+--- underlying source data. These methods can be chained to create iterator "pipelines": the output
+--- of each pipeline stage is input to the next stage. The first stage depends on the type passed to
+--- `vim.iter()`:
 ---
---- - List tables (arrays) pass only the value of each element
---- - Non-list tables (dictionaries) pass both the key and value of each element
---- - Function |iterator|s pass all of the values returned by their respective function
---- - Tables with a metatable implementing |__call()| are treated as function iterators
+--- - List tables (arrays, |lua-list|) yield only the value of each element.
+---   - Use |Iter:enumerate()| to also pass the index to the next stage.
+---   - Or initialize with ipairs(): `vim.iter(ipairs(…))`.
+--- - Non-list tables (|lua-dict|) yield both the key and value of each element.
+--- - Function |iterator|s yield all values returned by the underlying function.
+--- - Tables with a |__call()| metamethod are treated as function iterators.
 ---
---- The iterator pipeline terminates when the original table or function iterator runs out of values
---- (for function iterators, this means that the first value returned by the function is nil).
+--- The iterator pipeline terminates when the underlying |iterable| is exhausted (for function
+--- iterators this means it returned nil).
+---
+--- Note: `vim.iter()` scans table input to decide if it is a list or a dict; to avoid this cost you
+--- can wrap the table with an iterator e.g. `vim.iter(ipairs({…}))`, but that precludes the use of
+--- |list-iterator| operations such as |Iter:rev()|).
 ---
 --- Examples:
 ---
@@ -138,7 +144,7 @@ local function apply(f, ...)
   return false
 end
 
---- Add a filter step to the iterator pipeline.
+--- Filters an iterator pipeline.
 ---
 --- Example:
 ---
@@ -173,7 +179,7 @@ function ListIter.filter(self, f)
   return self
 end
 
---- Add a map step to the iterator pipeline.
+--- Maps the items of an iterator pipeline to the values returned by `f`.
 ---
 --- If the map function returns nil, the value is filtered from the iterator.
 ---
@@ -253,12 +259,9 @@ function ListIter.map(self, f)
   return self
 end
 
---- Call a function once for each item in the pipeline.
----
---- This is used for functions which have side effects. To modify the values in
---- the iterator, use |Iter:map()|.
+--- Calls a function once for each item in the pipeline, draining the iterator.
 ---
---- This function drains the iterator.
+--- For functions with side effects. To modify the values in the iterator, use |Iter:map()|.
 ---
 ---@param f function(...) Function to execute for each item in the pipeline.
 ---                       Takes all of the values returned by the previous stage
@@ -353,7 +356,7 @@ function ListIter.totable(self)
   return self._table
 end
 
---- Fold ("reduce") an iterator or table into a single value.
+--- Folds ("reduces") an iterator into a single value.
 ---
 --- Examples:
 ---
@@ -400,7 +403,7 @@ function ListIter.fold(self, init, f)
   return acc
 end
 
---- Return the next value from the iterator.
+--- Gets the next value from the iterator.
 ---
 --- Example:
 ---
@@ -432,9 +435,7 @@ function ListIter.next(self)
   end
 end
 
---- Reverse an iterator.
----
---- Only supported for iterators on list-like tables.
+--- Reverses a |list-iterator| pipeline.
 ---
 --- Example:
 ---
@@ -459,9 +460,7 @@ function ListIter.rev(self)
   return self
 end
 
---- Peek at the next value in the iterator without consuming it.
----
---- Only supported for iterators on list-like tables.
+--- Gets the next value in a |list-iterator| without consuming it.
 ---
 --- Example:
 ---
@@ -538,12 +537,10 @@ function Iter.find(self, f)
   return unpack(result)
 end
 
---- Find the first value in the iterator that satisfies the given predicate, starting from the end.
+--- Gets the first value in a |list-iterator| that satisfies a predicate, starting from the end.
 ---
 --- Advances the iterator. Returns nil and drains the iterator if no value is found.
 ---
---- Only supported for iterators on list-like tables.
----
 --- Examples:
 ---
 --- ```lua
@@ -583,9 +580,7 @@ function ListIter.rfind(self, f) -- luacheck: no unused args
   self._head = self._tail
 end
 
---- Return the next value from the end of the iterator.
----
---- Only supported for iterators on list-like tables.
+--- "Pops" a value from a |list-iterator| (gets the last value and decrements the tail).
 ---
 --- Example:
 ---
@@ -610,9 +605,9 @@ function ListIter.nextback(self)
   end
 end
 
---- Return the next value from the end of the iterator without consuming it.
+--- Gets the last value of a |list-iterator| without consuming it.
 ---
---- Only supported for iterators on list-like tables.
+--- See also |Iter:last()|.
 ---
 --- Example:
 ---
@@ -638,7 +633,7 @@ function ListIter.peekback(self)
   end
 end
 
---- Skip values in the iterator.
+--- Skips `n` values of an iterator pipeline.
 ---
 --- Example:
 ---
@@ -669,9 +664,7 @@ function ListIter.skip(self, n)
   return self
 end
 
---- Skip values in the iterator starting from the end.
----
---- Only supported for iterators on list-like tables.
+--- Skips `n` values backwards from the end of a |list-iterator| pipeline.
 ---
 --- Example:
 ---
@@ -700,9 +693,7 @@ function ListIter.skipback(self, n)
   return self
 end
 
---- Return the nth value in the iterator.
----
---- This function advances the iterator.
+--- Gets the nth value of an iterator (and advances to it).
 ---
 --- Example:
 ---
@@ -724,11 +715,7 @@ function Iter.nth(self, n)
   end
 end
 
---- Return the nth value from the end of the iterator.
----
---- This function advances the iterator.
----
---- Only supported for iterators on list-like tables.
+--- Gets the nth value from the end of a |list-iterator| (and advances to it).
 ---
 --- Example:
 ---
@@ -750,11 +737,9 @@ function Iter.nthback(self, n)
   end
 end
 
---- Slice an iterator, changing its start and end positions.
+--- Sets the start and end of a |list-iterator| pipeline.
 ---
---- This is equivalent to :skip(first - 1):skipback(len - last + 1)
----
---- Only supported for iterators on list-like tables.
+--- Equivalent to `:skip(first - 1):skipback(len - last + 1)`.
 ---
 ---@param first number
 ---@param last number
@@ -769,7 +754,7 @@ function ListIter.slice(self, first, last)
   return self:skip(math.max(0, first - 1)):skipback(math.max(0, self._tail - last - 1))
 end
 
---- Return true if any of the items in the iterator match the given predicate.
+--- Returns true if any of the items in the iterator match the given predicate.
 ---
 ---@param pred function(...):bool Predicate function. Takes all values returned from the previous
 ---                                stage in the pipeline as arguments and returns true if the
@@ -793,7 +778,7 @@ function Iter.any(self, pred)
   return any
 end
 
---- Return true if all of the items in the iterator match the given predicate.
+--- Returns true if all items in the iterator match the given predicate.
 ---
 ---@param pred function(...):bool Predicate function. Takes all values returned from the previous
 ---                                stage in the pipeline as arguments and returns true if the
@@ -816,9 +801,7 @@ function Iter.all(self, pred)
   return all
 end
 
---- Return the last item in the iterator.
----
---- Drains the iterator.
+--- Drains the iterator and returns the last item.
 ---
 --- Example:
 ---
@@ -853,22 +836,20 @@ function ListIter.last(self)
   return v
 end
 
---- Add an iterator stage that returns the current iterator count as well as the iterator value.
+--- Yields the item index (count) and value for each item of an iterator pipeline.
 ---
---- For list tables, prefer
+--- For list tables, this is more efficient:
 ---
 --- ```lua
 --- vim.iter(ipairs(t))
 --- ```
 ---
---- over
+--- instead of:
 ---
 --- ```lua
 --- vim.iter(t):enumerate()
 --- ```
 ---
---- as the former is faster.
----
 --- Example:
 ---
 --- ```lua
@@ -902,7 +883,7 @@ function ListIter.enumerate(self)
   return self
 end
 
---- Create a new Iter object from a table or iterator.
+--- Creates a new Iter object from a table or other |iterable|.
 ---
 ---@param src table|function Table or iterator to drain values from
 ---@return Iter
@@ -923,8 +904,7 @@ function Iter.new(src, ...)
 
     local t = {}
 
-    -- Check if source table can be treated like a list (indices are consecutive integers
-    -- starting from 1)
+    -- O(n): scan the source table to decide if it is a list (consecutive integer indices 1…n).
     local count = 0
     for _ in pairs(src) do
       count = count + 1
@@ -976,11 +956,10 @@ function ListIter.new(t)
   return it
 end
 
---- Collect an iterator into a table.
----
---- This is a convenience function that performs:
+--- Collects an |iterable| into a table.
 ---
 --- ```lua
+--- -- Equivalent to:
 --- vim.iter(f):totable()
 --- ```
 ---
@@ -990,11 +969,10 @@ function M.totable(f, ...)
   return Iter.new(f, ...):totable()
 end
 
---- Filter a table or iterator.
----
---- This is a convenience function that performs:
+--- Filters a table or other |iterable|.
 ---
 --- ```lua
+--- -- Equivalent to:
 --- vim.iter(src):filter(f):totable()
 --- ```
 ---
@@ -1009,11 +987,10 @@ function M.filter(f, src, ...)
   return Iter.new(src, ...):filter(f):totable()
 end
 
---- Map and filter a table or iterator.
----
---- This is a convenience function that performs:
+--- Maps a table or other |iterable|.
 ---
 --- ```lua
+--- -- Equivalent to:
 --- vim.iter(src):map(f):totable()
 --- ```
 ---
-- 
cgit 


From 03b7d35b5485b6a66bcd92027e43c838766bb205 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 25 Nov 2023 16:16:12 +0100
Subject: vim-patch:813a538bb3ce
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

runtime(tsx): add indentation plugin (fixes vim/vim#13574) (vim/vim#13576)

for now, let's just use the typescript indent file.

https://github.com/vim/vim/commit/813a538bb3cec2eee4bf43e16b44fe40666529ef

Co-authored-by: Jōshin <mrdomino@gmail.com>
---
 runtime/indent/typescriptreact.vim | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 runtime/indent/typescriptreact.vim

(limited to 'runtime')

diff --git a/runtime/indent/typescriptreact.vim b/runtime/indent/typescriptreact.vim
new file mode 100644
index 0000000000..052bddddbd
--- /dev/null
+++ b/runtime/indent/typescriptreact.vim
@@ -0,0 +1,2 @@
+" Placeholder for backwards compatilibity: .tsx used to stand for TypeScript.
+runtime! indent/typescript.vim
-- 
cgit 


From ba88fd886ae871025719dfc8602072cc51ce5407 Mon Sep 17 00:00:00 2001
From: Itamar Lencovsky <4740959+eitamal@users.noreply.github.com>
Date: Sun, 26 Nov 2023 07:03:32 +1000
Subject: fix(health): malformed call to warn() #26217

---
 runtime/lua/provider/health.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/provider/health.lua b/runtime/lua/provider/health.lua
index f2c19f53fb..d33f74f6e9 100644
--- a/runtime/lua/provider/health.lua
+++ b/runtime/lua/provider/health.lua
@@ -806,11 +806,11 @@ local function node()
       .. current_npm
       .. ' latest: '
       .. latest_npm
-    warn(message({
+    warn(message, {
       'Run in shell: npm install -g neovim',
       'Run in shell (if you use yarn): yarn global add neovim',
       'Run in shell (if you use pnpm): pnpm install -g neovim',
-    }))
+    })
   else
     ok('Latest "neovim" npm/yarn/pnpm package is installed: ' .. current_npm)
   end
-- 
cgit 


From 38e98754a556404b54d3c28b4272bcacbc3b6b0e Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sat, 25 Nov 2023 16:06:58 +0100
Subject: vim-patch:9.0.2128: runtime(swig): add syntax and filetype plugins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add syntax and filetype plugins for SWIG (Simplified Wrapper Interface
Generator) description files.

The default syntax for .i files highlights comments in a reverse
color scheme which doesn't look well.  This syntax builds
on vim's c++ syntax by adding highlighting for common swig
directives and user defined directives.  For an alternative
syntax, see vimscript vim/vim#1247 (which I found after writing this).

closes: vim/vim#13562

https://github.com/vim/vim/commit/2e31065a650015892179e520038bf2083a9519b6

Co-authored-by: Julien Marrec <julien.marrec@gmail.com>
Co-authored-by: Matěj Cepl <mcepl@cepl.eu>
---
 runtime/ftplugin/swig.vim           | 13 +++++
 runtime/lua/vim/filetype.lua        |  4 +-
 runtime/lua/vim/filetype/detect.lua | 45 +++++++++--------
 runtime/syntax/swig.vim             | 99 +++++++++++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+), 21 deletions(-)
 create mode 100644 runtime/ftplugin/swig.vim
 create mode 100644 runtime/syntax/swig.vim

(limited to 'runtime')

diff --git a/runtime/ftplugin/swig.vim b/runtime/ftplugin/swig.vim
new file mode 100644
index 0000000000..506c929a43
--- /dev/null
+++ b/runtime/ftplugin/swig.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language:	SWIG
+" Maintainer:	Julien Marrec <julien.marrec 'at' gmail com>
+" Last Change:	2023 November 23
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setlocal iskeyword<"
+setlocal iskeyword+=%
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 217f673b5e..cb2656d9ba 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -984,6 +984,8 @@ local extension = {
   svelte = 'svelte',
   svg = 'svg',
   swift = 'swift',
+  swig = 'swig',
+  swg = 'swig',
   svh = 'systemverilog',
   sv = 'systemverilog',
   cmm = 'trace32',
@@ -1134,7 +1136,7 @@ local extension = {
   web = detect.web,
   pl = detect.pl,
   pp = detect.pp,
-  i = detect.progress_asm,
+  i = detect.i,
   w = detect.progress_cweb,
   p = detect.progress_pascal,
   pro = detect_seq(detect.proto, 'idlang'),
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua
index 5479608148..9d0f1bd3ab 100644
--- a/runtime/lua/vim/filetype/detect.lua
+++ b/runtime/lua/vim/filetype/detect.lua
@@ -619,6 +619,31 @@ function M.hw(_, bufnr)
   return 'virata'
 end
 
+-- This function checks for an assembly comment or a SWIG keyword or verbatim
+-- block in the first 50 lines.
+-- If not found, assume Progress.
+--- @type vim.filetype.mapfn
+function M.i(path, bufnr)
+  if vim.g.filetype_i then
+    return vim.g.filetype_i
+  end
+
+  -- These include the leading '%' sign
+  local ft_swig_keywords =
+    [[^\s*%\%(addmethods\|apply\|beginfile\|clear\|constant\|define\|echo\|enddef\|endoffile\|extend\|feature\|fragment\|ignore\|import\|importfile\|include\|includefile\|inline\|insert\|keyword\|module\|name\|namewarn\|native\|newobject\|parms\|pragma\|rename\|template\|typedef\|typemap\|types\|varargs\|warn\)]]
+  -- This is the start/end of a block that is copied literally to the processor file (C/C++)
+  local ft_swig_verbatim_block_start = '^%s*%%{'
+
+  for _, line in ipairs(getlines(bufnr, 1, 50)) do
+    if line:find('^%s*;') or line:find('^%*') then
+      return M.asm(path, bufnr)
+    elseif matchregex(line, ft_swig_keywords) or line:find(ft_swig_verbatim_block_start) then
+      return 'swig'
+    end
+  end
+  return 'progress'
+end
+
 --- @type vim.filetype.mapfn
 function M.idl(_, bufnr)
   for _, line in ipairs(getlines(bufnr, 1, 50)) do
@@ -1016,26 +1041,6 @@ function M.printcap(ptcap_type)
   end
 end
 
--- This function checks for an assembly comment in the first ten lines.
--- If not found, assume Progress.
---- @type vim.filetype.mapfn
-function M.progress_asm(path, bufnr)
-  if vim.g.filetype_i then
-    return vim.g.filetype_i
-  end
-
-  for _, line in ipairs(getlines(bufnr, 1, 10)) do
-    if line:find('^%s*;') or line:find('^/%*') then
-      return M.asm(path, bufnr)
-    elseif not line:find('^%s*$') or line:find('^/%*') then
-      -- Not an empty line: doesn't look like valid assembly code
-      -- or it looks like a Progress /* comment.
-      break
-    end
-  end
-  return 'progress'
-end
-
 --- @type vim.filetype.mapfn
 function M.progress_cweb(_, bufnr)
   if vim.g.filetype_w then
diff --git a/runtime/syntax/swig.vim b/runtime/syntax/swig.vim
new file mode 100644
index 0000000000..b62621264a
--- /dev/null
+++ b/runtime/syntax/swig.vim
@@ -0,0 +1,99 @@
+" Vim syntax file
+" Language:	SWIG
+" Maintainer:	Julien Marrec <julien.marrec 'at' gmail com>
+" Last Change:	2023 November 23
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the C++ syntax to start with
+runtime! syntax/cpp.vim
+unlet b:current_syntax
+
+" SWIG extentions
+syn keyword swigInclude %include %import %importfile %includefile %module
+
+syn keyword swigMostCommonDirective %alias %apply %beginfile %clear %constant %define %echo %enddef %endoffile
+syn keyword swigMostCommonDirective %extend %feature %director %fragment %ignore  %inline
+syn keyword swigMostCommonDirective %keyword %name %namewarn %native %newobject %parms %pragma
+syn keyword swigMostCommonDirective %rename %template %typedef %typemap %types %varargs
+
+" SWIG: Language specific macros
+syn keyword swigOtherLanguageSpecific %luacode %go_import
+
+syn keyword swigCSharp %csattributes %csconst %csconstvalue %csmethodmodifiers %csnothrowexception
+syn keyword swigCSharp %dconstvalue %dmanifestconst %dmethodmodifiers
+
+syn keyword swigJava %javaconstvalue %javaexception %javamethodmodifiers %javaconst %nojavaexception
+
+syn keyword swigGuile %multiple_values %values_as_list %values_as_vector
+
+syn keyword swigPHP %rinit %rshutdown %minit %mshutdown
+
+syn keyword swigPython %pybinoperator %pybuffer_binary %pybuffer_mutable_binary %pybuffer_mutable_string %pybuffer_string
+syn keyword swigPython %pythonappend %pythonbegin %pythoncode %pythondynamic %pythonnondynamic %pythonprepend
+
+syn keyword swigRuby %markfunc %trackobjects %bang
+syn keyword swigScilab %scilabconst
+
+" SWIG: Insertion
+syn keyword swigInsertSection %insert %begin %runtime %header %wrapper %init
+
+" SWIG: Other directives
+syn keyword swigCstring %cstring_bounded_mutable %cstring_bounded_output %cstring_chunk_output %cstring_input_binary %cstring_mutable
+syn keyword swigCstring %cstring_output_allocate %cstring_output_allocate_size %cstring_output_maxsize %cstring_output_withsize
+syn keyword swigCWstring %cwstring_bounded_mutable %cwstring_bounded_output %cwstring_chunk_output %cwstring_input_binary %cwstring_mutable
+syn keyword swigCWstring %cwstring_output_allocate %cwstring_output_allocate_size %cwstring_output_maxsize %cwstring_output_withsize
+syn keyword swigCMalloc %malloc %calloc %realloc %free %sizeof %allocators
+
+syn keyword swigExceptionHandling %catches %raise %allowexception %exceptionclass %warn %warnfilter %exception
+syn keyword swigContract %contract %aggregate_check
+
+syn keyword swigDirective %addmethods %array_class %array_functions %attribute %attribute2 %attribute2ref
+syn keyword swigDirective %attribute_ref %attributeref %attributestring %attributeval %auto_ptr %callback
+syn keyword swigDirective %delete_array %delobject %extend_smart_pointer %factory %fastdispatch %freefunc %immutable
+syn keyword swigDirective %implicit %implicitconv %interface %interface_custom %interface_impl %intrusive_ptr %intrusive_ptr_no_wrap
+syn keyword swigDirective %mutable %naturalvar %nocallback %nocopyctor %nodefaultctor %nodefaultdtor %nonaturalvar %nonspace
+syn keyword swigDirective %nspace %pointer_cast %pointer_class %pointer_functions %predicate %proxycode
+syn keyword swigDirective %refobject %set_output %shared_ptr %std_comp_methods
+syn keyword swigDirective %std_nodefconst_type %typecheck %typemaps_string %unique_ptr %unrefobject %valuewrapper
+
+syn match swigVerbatimStartEnd "%[{}]"
+
+syn match swigUserDef "%\w\+"
+syn match swigVerbatimMacro "^\s*%#\w\+\%( .*\)\?$"
+
+" SWIG: typemap var and typemap macros (eg: $1, $*1_type, $&n_ltype, $self)
+syn match swigTypeMapVars "\$[*&_a-zA-Z0-9]\+"
+
+" Default highlighting
+hi def link swigInclude Include
+hi def link swigMostCommonDirective Structure
+hi def link swigDirective Macro
+hi def link swigContract swigExceptionHandling
+hi def link swigExceptionHandling Exception
+hi def link swigUserDef Function
+
+hi def link swigCMalloc Statement
+hi def link swigCstring Type
+hi def link swigCWstring Type
+
+hi def link swigCSharp swigOtherLanguageSpecific
+hi def link swigJava swigOtherLanguageSpecific
+hi def link swigGuile swigOtherLanguageSpecific
+hi def link swigPHP swigOtherLanguageSpecific
+hi def link swigPython swigOtherLanguageSpecific
+hi def link swigRuby swigOtherLanguageSpecific
+hi def link swigScilab swigOtherLanguageSpecific
+hi def link swigOtherLanguageSpecific Special
+
+hi def link swigInsertSection PreProc
+
+hi def link swigVerbatimStartEnd Statement
+hi def link swigVerbatimMacro Macro
+
+hi def link swigTypeMapVars SpecialChar
+
+let b:current_syntax = "swig"
+" vim: ts=8
-- 
cgit 


From 27fc11c0486354ce23ceb57649f22aedbfe2d48b Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 26 Nov 2023 15:38:56 +0100
Subject: vim-patch:cf40409e7d17

runtime(nginx): add additional nginx keywords (vim/vim#13581)

* Add support for missing keywords to the nginx syntax plugin

This adds support for several keywords from
- the built-in HTTP/2 module,
- the built-in SSL module,
- the built-in uWSGI module,
- the experimental QUIC branch,
- the third-party SSL CT module,
- the third-party dynamic TLS records patch.

Co-Author: ObserverOfTime <chronobserver@disroot.org>

* Add missing http2/ http3 keywords to nginx plugin

https://github.com/vim/vim/commit/cf40409e7d17ddadaa697188788753c761479ef8

Co-authored-by: Chris Aumann <me@chr4.org>
Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 runtime/syntax/nginx.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/syntax/nginx.vim b/runtime/syntax/nginx.vim
index 04760e4a20..d036c123de 100644
--- a/runtime/syntax/nginx.vim
+++ b/runtime/syntax/nginx.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: nginx.conf
 " Maintainer: Chris Aumann <me@chr4.org>
-" Last Change: Jan 25, 2023
+" Last Change: Nov 25, 2023
 
 if exists("b:current_syntax")
   finish
@@ -260,6 +260,7 @@ syn keyword ngxDirective hls_forward_args
 syn keyword ngxDirective hls_fragment
 syn keyword ngxDirective hls_mp4_buffer_size
 syn keyword ngxDirective hls_mp4_max_buffer_size
+syn keyword ngxDirective http2
 syn keyword ngxDirective http2_chunk_size
 syn keyword ngxDirective http2_body_preread_size
 syn keyword ngxDirective http2_idle_timeout
@@ -271,6 +272,7 @@ syn keyword ngxDirective http2_push
 syn keyword ngxDirective http2_push_preload
 syn keyword ngxDirective http2_recv_buffer_size
 syn keyword ngxDirective http2_recv_timeout
+syn keyword ngxDirective http3
 syn keyword ngxDirective http3_hq
 syn keyword ngxDirective http3_max_concurrent_pushes
 syn keyword ngxDirective http3_max_concurrent_streams
-- 
cgit 


From 84bbe4b0ca935db1f6202db339aee5594a3b3908 Mon Sep 17 00:00:00 2001
From: Lewis Russell <lewis6991@gmail.com>
Date: Tue, 21 Nov 2023 11:24:30 +0000
Subject: fix(lua): disallow vim.wait() in fast contexts

`vim.wait()` cannot be called in a fast callback since the main loop
cannot be run in that context as it is not reentrant

Fixes #26122
---
 runtime/doc/lua.txt               | 8 +++++---
 runtime/doc/news.txt              | 2 ++
 runtime/lua/vim/_editor.lua       | 3 ++-
 runtime/lua/vim/_meta/builtin.lua | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lua.txt b/runtime/doc/lua.txt
index a79b26dfb0..a35d70cae8 100644
--- a/runtime/doc/lua.txt
+++ b/runtime/doc/lua.txt
@@ -1143,6 +1143,8 @@ vim.wait({time}, {callback}, {interval}, {fast_only})             *vim.wait()*
     milliseconds (default 200). Nvim still processes other events during this
     time.
 
+    Cannot be called while in an |api-fast| event.
+
     Examples: >lua
         ---
         -- Wait for 100 ms, allowing other events to process
@@ -1173,8 +1175,7 @@ vim.wait({time}, {callback}, {interval}, {fast_only})             *vim.wait()*
       • {interval}   (integer|nil) (Approximate) number of milliseconds to
                      wait between polls
       • {fast_only}  (boolean|nil) If true, only |api-fast| events will be
-                     processed. If called from while in an |api-fast| event,
-                     will automatically be set to `true`.
+                     processed.
 
     Return: ~
         boolean, nil|-1|-2
@@ -1828,7 +1829,8 @@ vim.system({cmd}, {opts}, {on_exit})                            *vim.system()*
         • pid (integer) Process ID
         • wait (fun(timeout: integer|nil): SystemCompleted) Wait for the
           process to complete. Upon timeout the process is sent the KILL
-          signal (9) and the exit code is set to 124.
+          signal (9) and the exit code is set to 124. Cannot be called in
+          |api-fast|.
           • SystemCompleted is an object with the fields:
             • code: (integer)
             • signal: (integer)
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
index b5bef13325..825e5ba41f 100644
--- a/runtime/doc/news.txt
+++ b/runtime/doc/news.txt
@@ -325,6 +325,8 @@ The following changes to existing APIs or features add new behavior.
   NOTE: the regexp engine still has a hard-coded limit of considering
   6 composing chars only.
 
+• |vim.wait()| is no longer allowed to be called in |api-fast|.
+
 ==============================================================================
 REMOVED FEATURES                                                 *news-removed*
 
diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua
index 12b632075d..6cccbe8313 100644
--- a/runtime/lua/vim/_editor.lua
+++ b/runtime/lua/vim/_editor.lua
@@ -124,7 +124,8 @@ vim.log = {
 --- @return vim.SystemObj Object with the fields:
 ---   - pid (integer) Process ID
 ---   - wait (fun(timeout: integer|nil): SystemCompleted) Wait for the process to complete. Upon
----     timeout the process is sent the KILL signal (9) and the exit code is set to 124.
+---     timeout the process is sent the KILL signal (9) and the exit code is set to 124. Cannot
+---     be called in |api-fast|.
 ---     - SystemCompleted is an object with the fields:
 ---      - code: (integer)
 ---      - signal: (integer)
diff --git a/runtime/lua/vim/_meta/builtin.lua b/runtime/lua/vim/_meta/builtin.lua
index 92c23f7764..eeba356672 100644
--- a/runtime/lua/vim/_meta/builtin.lua
+++ b/runtime/lua/vim/_meta/builtin.lua
@@ -205,6 +205,8 @@ function vim.schedule(fn) end
 --- milliseconds (default 200). Nvim still processes other events during
 --- this time.
 ---
+--- Cannot be called while in an |api-fast| event.
+---
 --- Examples:
 ---
 --- ```lua
@@ -235,8 +237,6 @@ function vim.schedule(fn) end
 --- @param callback? fun(): boolean Optional callback. Waits until {callback} returns true
 --- @param interval? integer (Approximate) number of milliseconds to wait between polls
 --- @param fast_only? boolean If true, only |api-fast| events will be processed.
----                           If called from while in an |api-fast| event, will
----                           automatically be set to `true`.
 --- @return boolean, nil|-1|-2
 ---     - If {callback} returns `true` during the {time}: `true, nil`
 ---     - If {callback} never returns `true` during the {time}: `false, -1`
-- 
cgit 


From 2c16c6a6c42f46e290df5441c37572f296aeb09f Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Mon, 27 Nov 2023 10:43:13 +0100
Subject: docs: small fixes (#26154)

---
 runtime/doc/builtin.txt | 10 +++++-----
 runtime/doc/sign.txt    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 5d70c42157..860372767a 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6998,11 +6998,11 @@ sign_place({id}, {group}, {name}, {buf} [, {dict}])               *sign_place()*
 		similar to the |:sign-place| command.
 
 		If the sign identifier {id} is zero, then a new identifier is
-		allocated (first available id in a buffer).  Otherwise the
-		specified number is used. {group} is the sign group name. To use
-		the global sign group, use an empty string.  {group} functions
-		as a namespace for {id}, thus two groups can use the same IDs.
-		Refer to |sign-identifier| and |sign-group| for more information.
+		allocated.  Otherwise the specified number is used. {group} is
+		the sign group name. To use the global sign group, use an
+		empty string.  {group} functions as a namespace for {id}, thus
+		two groups can use the same IDs. Refer to |sign-identifier|
+		and |sign-group| for more information.
 
 		{name} refers to a defined sign.
 		{buf} refers to a buffer name or number. For the accepted
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 30fa7eee0b..0360ce67f6 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -54,9 +54,9 @@ Each placed sign is identified by a number called the sign identifier. This
 identifier is used to jump to the sign or to remove the sign. The identifier
 is assigned when placing the sign using the |:sign-place| command or the
 |sign_place()| function. Each sign identifier should be a unique number (per
-buffer). Placing the same identifier twice will move the previously placed sign.
-The |sign_place()| function can be called with a zero sign identifier to allocate
-the next available identifier.
+buffer). Placing the same identifier twice will move the previously placed
+sign. The |sign_place()| function can be called with a zero sign identifier to
+allocate the next available identifier.
 
 							*sign-group*
 Each placed sign can be assigned to either the global group or a named group.
-- 
cgit 


From 72ed99319dd662f0e35b58e888b57f98ac3b3eec Mon Sep 17 00:00:00 2001
From: Dmytro Soltys <soap@slotos.net>
Date: Mon, 27 Nov 2023 13:34:32 +0100
Subject: fix(treesitter): don't invalidate parser when discovering injections

When parsing with a range, languagetree looks up injections and adds
them if needed. This explicitly invalidates parser, making `is_valid`
report `false` both when including and excluding children.

This is an attempt to describe desired behaviour of `is_valid` in tests,
with what ended up being a single line change to satisfy them.
---
 runtime/lua/vim/treesitter/languagetree.lua | 2 --
 1 file changed, 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 670f2797b7..0171b416cd 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -508,7 +508,6 @@ function LanguageTree:add_child(lang)
   end
 
   self._children[lang] = child
-  self:invalidate()
   self:_do_callback('child_added', self._children[lang])
 
   return self._children[lang]
@@ -524,7 +523,6 @@ function LanguageTree:remove_child(lang)
   if child then
     self._children[lang] = nil
     child:destroy()
-    self:invalidate()
     self:_do_callback('child_removed', child)
   end
 end
-- 
cgit 


From 9fa9b3cad94a1ea7fced128fed2cd5ac3ff7bc44 Mon Sep 17 00:00:00 2001
From: LW <git@llllvvuu.dev>
Date: Mon, 27 Nov 2023 08:23:04 -0800
Subject: docs: support @since for api level #25574

close #25416
---
 runtime/doc/lsp.txt                | 12 ++++++++++--
 runtime/lua/vim/lsp/inlay_hint.lua |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt
index 3cbadb9bdb..5e97628f42 100644
--- a/runtime/doc/lsp.txt
+++ b/runtime/doc/lsp.txt
@@ -1468,13 +1468,15 @@ Lua module: vim.lsp.inlay_hint                                *lsp-inlay_hint*
 enable({bufnr}, {enable})                        *vim.lsp.inlay_hint.enable()*
     Enable/disable/toggle inlay hints for a buffer
 
+    Note: ~
+        This API is pre-release (unstable).
+
     Parameters: ~
       • {bufnr}   (integer|nil) Buffer handle, or 0 or nil for current
       • {enable}  (boolean|nil) true/nil to enable, false to disable
 
 get({filter})                                       *vim.lsp.inlay_hint.get()*
-    Get the list of inlay hints, (optionally) restricted by buffer, client, or
-    range.
+    Get the list of inlay hints, (optionally) restricted by buffer or range.
 
     Example usage: >lua
         local hint = vim.lsp.inlay_hint.get({ bufnr = 0 })[1] -- 0 for current buffer
@@ -1490,6 +1492,9 @@ get({filter})                                       *vim.lsp.inlay_hint.get()*
         })
 <
 
+    Note: ~
+        This API is pre-release (unstable).
+
     Parameters: ~
       • {filter}  vim.lsp.inlay_hint.get.filter ? Optional filters |kwargs|:
                   • bufnr (integer?): 0 for current buffer
@@ -1502,6 +1507,9 @@ get({filter})                                       *vim.lsp.inlay_hint.get()*
         • inlay_hint (lsp.InlayHint)
 
 is_enabled({bufnr})                          *vim.lsp.inlay_hint.is_enabled()*
+    Note: ~
+        This API is pre-release (unstable).
+
     Parameters: ~
       • {bufnr}  (integer|nil) Buffer handle, or 0 or nil for current
 
diff --git a/runtime/lua/vim/lsp/inlay_hint.lua b/runtime/lua/vim/lsp/inlay_hint.lua
index cdda5dcc17..4f7a3b0076 100644
--- a/runtime/lua/vim/lsp/inlay_hint.lua
+++ b/runtime/lua/vim/lsp/inlay_hint.lua
@@ -107,7 +107,7 @@ end
 --- @field client_id integer
 --- @field inlay_hint lsp.InlayHint
 
---- Get the list of inlay hints, (optionally) restricted by buffer, client, or range.
+--- Get the list of inlay hints, (optionally) restricted by buffer or range.
 ---
 --- Example usage:
 ---
@@ -135,6 +135,8 @@ end
 ---  - bufnr (integer)
 ---  - client_id (integer)
 ---  - inlay_hint (lsp.InlayHint)
+---
+--- @since 12
 function M.get(filter)
   vim.validate({ filter = { filter, 'table', true } })
   filter = filter or {}
@@ -349,6 +351,7 @@ api.nvim_set_decoration_provider(namespace, {
 
 --- @param bufnr (integer|nil) Buffer handle, or 0 or nil for current
 --- @return boolean
+--- @since 12
 function M.is_enabled(bufnr)
   vim.validate({ bufnr = { bufnr, 'number', true } })
   if bufnr == nil or bufnr == 0 then
@@ -361,6 +364,7 @@ end
 ---
 --- @param bufnr (integer|nil) Buffer handle, or 0 or nil for current
 --- @param enable (boolean|nil) true/nil to enable, false to disable
+--- @since 12
 function M.enable(bufnr, enable)
   vim.validate({ enable = { enable, 'boolean', true }, bufnr = { bufnr, 'number', true } })
   if enable == false then
-- 
cgit 


From a314703cf1b9ccc654162c5d55b819aee66aa8b6 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Tue, 28 Nov 2023 00:58:31 +0100
Subject: vim-patch:9.0.2131: not all nushell files detected (#26260)

Problem:  not all nushell files detected
Solution: use *.nu to detect nushell files

closes: vim/vim#13586

https://github.com/vim/vim/commit/b9efc72c2432f2d2a633c12d3a5b9fc3efb7b6e7

Co-authored-by: Daniel Buch Hansen <boogiewasthere@gmail.com>
---
 runtime/lua/vim/filetype.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index cb2656d9ba..c6200f16bb 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -716,6 +716,7 @@ local extension = {
   tr = 'nroff',
   nsi = 'nsis',
   nsh = 'nsis',
+  nu = 'nu',
   obj = 'obj',
   objdump = 'objdump',
   cppobjdump = 'objdump',
@@ -1387,8 +1388,6 @@ local filename = {
   Neomuttrc = 'neomuttrc',
   ['.netrc'] = 'netrc',
   NEWS = detect.news,
-  ['env.nu'] = 'nu',
-  ['config.nu'] = 'nu',
   ['.ocamlinit'] = 'ocaml',
   ['.octaverc'] = 'octave',
   octaverc = 'octave',
-- 
cgit 


From e6d38c7dac2e079d9b0f1621fef193bca858664f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 28 Nov 2023 11:46:20 +0800
Subject: vim-patch:9.0.2133: Cannot detect overstrike mode in Cmdline mode
 (#26263)

Problem:  Cannot detect overstrike mode in Cmdline mode
Solution: Make mode() return "cr" for overstrike

closes: vim/vim#13569

https://github.com/vim/vim/commit/d1c3ef1f47c87d1da056c56564e1985fe6f2931d
---
 runtime/doc/builtin.txt         | 2 ++
 runtime/lua/vim/_meta/vimfn.lua | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 860372767a..ab127d8c67 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4850,7 +4850,9 @@ mode([expr])                                                            *mode()*
 		   Rvc	    Virtual Replace mode completion |compl-generic|
 		   Rvx	    Virtual Replace mode |i_CTRL-X| completion
 		   c	    Command-line editing
+		   cr	    Command-line while in overstrike mode |c_<Insert>|
 		   cv	    Vim Ex mode |gQ|
+		   cvr	    Vim Ex while in overstrike mode |c_<Insert>|
 		   r	    Hit-enter prompt
 		   rm	    The -- more -- prompt
 		   r?	    A |:confirm| query of some sort
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index b443fb5d78..de2896e094 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5812,7 +5812,9 @@ function vim.fn.mkdir(name, flags, prot) end
 ---    Rvc      Virtual Replace mode completion |compl-generic|
 ---    Rvx      Virtual Replace mode |i_CTRL-X| completion
 ---    c      Command-line editing
+---    cr      Command-line while in overstrike mode |c_<Insert>|
 ---    cv      Vim Ex mode |gQ|
+---    cvr      Vim Ex while in overstrike mode |c_<Insert>|
 ---    r      Hit-enter prompt
 ---    rm      The -- more -- prompt
 ---    r?      A |:confirm| query of some sort
-- 
cgit 


From 570367ac83cdceeee7d43dadcff7652bd5cc93c5 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 28 Nov 2023 13:52:17 +0800
Subject: docs(lua): don't include remote-only API functions (#26266)

---
 runtime/lua/vim/_meta/api.lua | 179 ------------------------------------------
 1 file changed, 179 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 006996ad4e..c863aa4929 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -286,12 +286,6 @@ function vim.api.nvim_buf_del_var(buffer, name) end
 ---               • unload: Unloaded only, do not delete. See `:bunload`
 function vim.api.nvim_buf_delete(buffer, opts) end
 
---- Deactivates buffer-update events on the channel.
----
---- @param buffer integer Buffer handle, or 0 for current buffer
---- @return boolean
-function vim.api.nvim_buf_detach(buffer) end
-
 --- Gets a changed tick of a buffer
 ---
 --- @param buffer integer Buffer handle, or 0 for current buffer
@@ -682,22 +676,6 @@ function vim.api.nvim_buf_set_var(buffer, name, value) end
 --- @return integer
 function vim.api.nvim_buf_set_virtual_text(buffer, src_id, line, chunks, opts) end
 
---- Calls many API methods atomically.
---- This has two main usages:
---- 1. To perform several requests from an async context atomically, i.e.
----    without interleaving redraws, RPC requests from other clients, or user
----    interactions (however API methods may trigger autocommands or event
----    processing which have such side effects, e.g. `:sleep` may wake
----    timers).
---- 2. To minimize RPC overhead (roundtrips) of a sequence of many requests.
----
----
---- @param calls any[] an array of calls, where each call is described by an array
----              with two elements: the request name, and an array of
----              arguments.
---- @return any[]
-function vim.api.nvim_call_atomic(calls) end
-
 --- Calls a Vimscript `Dictionary-function` with the given arguments.
 --- On execution error: fails with Vimscript error, updates v:errmsg.
 ---
@@ -1019,10 +997,6 @@ function vim.api.nvim_err_write(str) end
 --- @param str string Message
 function vim.api.nvim_err_writeln(str) end
 
---- @param lvl integer
---- @param data string
-function vim.api.nvim_error_event(lvl, data) end
-
 --- Evaluates a Vimscript `expression`. Dictionaries and Lists are recursively
 --- expanded.
 --- On execution error: fails with Vimscript error, updates v:errmsg.
@@ -1087,22 +1061,6 @@ function vim.api.nvim_exec2(src, opts) end
 ---                callback. See `nvim_create_autocmd()` for details.
 function vim.api.nvim_exec_autocmds(event, opts) end
 
---- Execute Lua code. Parameters (if any) are available as `...` inside the
---- chunk. The chunk can return a value.
---- Only statements are executed. To evaluate an expression, prefix it with
---- `return`: return my_function(...)
----
---- @param code string Lua code to execute
---- @param args any[] Arguments to the code
---- @return any
-function vim.api.nvim_exec_lua(code, args) end
-
---- @deprecated
---- @param code string
---- @param args any[]
---- @return any
-function vim.api.nvim_execute_lua(code, args) end
-
 --- Sends input-keys to Nvim, subject to various quirks controlled by `mode`
 --- flags. This is a blocking call, unlike `nvim_input()`.
 --- On execution error: does not fail, but updates v:errmsg.
@@ -1130,12 +1088,6 @@ function vim.api.nvim_feedkeys(keys, mode, escape_ks) end
 --- @return table<string,any>
 function vim.api.nvim_get_all_options_info() end
 
---- Returns a 2-tuple (Array), where item 0 is the current channel id and item
---- 1 is the `api-metadata` map (Dictionary).
----
---- @return any[]
-function vim.api.nvim_get_api_info() end
-
 --- Get all autocommands that match the corresponding {opts}.
 --- These examples will get autocommands matching ALL the given criteria:
 ---
@@ -1733,59 +1685,6 @@ function vim.api.nvim_replace_termcodes(str, from_part, do_lt, special) end
 --- @param opts table<string,any> Optional parameters. Reserved for future use.
 function vim.api.nvim_select_popupmenu_item(item, insert, finish, opts) end
 
---- Self-identifies the client.
---- The client/plugin/application should call this after connecting, to
---- provide hints about its identity and purpose, for debugging and
---- orchestration.
---- Can be called more than once; the caller should merge old info if
---- appropriate. Example: library first identifies the channel, then a plugin
---- using that library later identifies itself.
----
---- @param name string Short name for the connected client
---- @param version table<string,any> Dictionary describing the version, with these (optional)
----                   keys:
----                   • "major" major version (defaults to 0 if not set, for
----                     no release yet)
----                   • "minor" minor version
----                   • "patch" patch number
----                   • "prerelease" string describing a prerelease, like
----                     "dev" or "beta1"
----                   • "commit" hash or similar identifier of commit
---- @param type string Must be one of the following values. Client libraries
----                   should default to "remote" unless overridden by the
----                   user.
----                   • "remote" remote client connected "Nvim flavored"
----                     MessagePack-RPC (responses must be in reverse order of
----                     requests). `msgpack-rpc`
----                   • "msgpack-rpc" remote client connected to Nvim via
----                     fully MessagePack-RPC compliant protocol.
----                   • "ui" gui frontend
----                   • "embedder" application using Nvim as a component (for
----                     example, IDE/editor implementing a vim mode).
----                   • "host" plugin host, typically started by nvim
----                   • "plugin" single plugin, started by nvim
---- @param methods table<string,any> Builtin methods in the client. For a host, this does not
----                   include plugin methods which will be discovered later.
----                   The key should be the method name, the values are dicts
----                   with these (optional) keys (more keys may be added in
----                   future versions of Nvim, thus unknown keys are ignored.
----                   Clients must only use keys defined in this or later
----                   versions of Nvim):
----                   • "async" if true, send as a notification. If false or
----                     unspecified, use a blocking request
----                   • "nargs" Number of arguments. Could be a single integer
----                     or an array of two integers, minimum and maximum
----                     inclusive.
---- @param attributes table<string,any> Arbitrary string:string map of informal client
----                   properties. Suggested keys:
----                   • "website": Client homepage URL (e.g. GitHub
----                     repository)
----                   • "license": License description ("Apache 2", "GPLv3",
----                     "MIT", …)
----                   • "logo": URI or path to image, preferably small logo or
----                     icon. .png or .svg format is preferred.
-function vim.api.nvim_set_client_info(name, version, type, methods, attributes) end
-
 --- Sets the current buffer.
 ---
 --- @param buffer integer Buffer handle
@@ -1973,11 +1872,6 @@ function vim.api.nvim_set_vvar(name, value) end
 --- @return integer
 function vim.api.nvim_strwidth(text) end
 
---- Subscribes to event broadcasts.
----
---- @param event string Event type string
-function vim.api.nvim_subscribe(event) end
-
 --- Removes a tab-scoped (t:) variable
 ---
 --- @param tabpage integer Tabpage handle, or 0 for current tabpage
@@ -2022,79 +1916,6 @@ function vim.api.nvim_tabpage_list_wins(tabpage) end
 --- @param value any Variable value
 function vim.api.nvim_tabpage_set_var(tabpage, name, value) end
 
---- Activates UI events on the channel.
---- Entry point of all UI clients. Allows `--embed` to continue startup.
---- Implies that the client is ready to show the UI. Adds the client to the
---- list of UIs. `nvim_list_uis()`
----
---- @param width integer Requested screen columns
---- @param height integer Requested screen rows
---- @param options table<string,any> `ui-option` map
-function vim.api.nvim_ui_attach(width, height, options) end
-
---- Deactivates UI events on the channel.
---- Removes the client from the list of UIs. `nvim_list_uis()`
----
-function vim.api.nvim_ui_detach() end
-
---- Tells Nvim the geometry of the popupmenu, to align floating windows with
---- an external popup menu.
---- Note that this method is not to be confused with
---- `nvim_ui_pum_set_height()`, which sets the number of visible items in the
---- popup menu, while this function sets the bounding box of the popup menu,
---- including visual elements such as borders and sliders. Floats need not use
---- the same font size, nor be anchored to exact grid corners, so one can set
---- floating-point numbers to the popup menu geometry.
----
---- @param width number Popupmenu width.
---- @param height number Popupmenu height.
---- @param row number Popupmenu row.
---- @param col number Popupmenu height.
-function vim.api.nvim_ui_pum_set_bounds(width, height, row, col) end
-
---- Tells Nvim the number of elements displaying in the popupmenu, to decide
---- <PageUp> and <PageDown> movement.
----
---- @param height integer Popupmenu height, must be greater than zero.
-function vim.api.nvim_ui_pum_set_height(height) end
-
---- @param gained boolean
-function vim.api.nvim_ui_set_focus(gained) end
-
---- @param name string
---- @param value any
-function vim.api.nvim_ui_set_option(name, value) end
-
---- Tells Nvim when a terminal event has occurred
---- The following terminal events are supported:
----
---- • "termresponse": The terminal sent an OSC or DCS response sequence to
----   Nvim. The payload is the received response. Sets `v:termresponse` and
----   fires `TermResponse`.
----
----
---- @param event string Event name
---- @param value any
-function vim.api.nvim_ui_term_event(event, value) end
-
---- @param width integer
---- @param height integer
-function vim.api.nvim_ui_try_resize(width, height) end
-
---- Tell Nvim to resize a grid. Triggers a grid_resize event with the
---- requested grid size or the maximum size if it exceeds size limits.
---- On invalid grid handle, fails with error.
----
---- @param grid integer The handle of the grid to be changed.
---- @param width integer The new requested width.
---- @param height integer The new requested height.
-function vim.api.nvim_ui_try_resize_grid(grid, width, height) end
-
---- Unsubscribes to event broadcasts.
----
---- @param event string Event type string
-function vim.api.nvim_unsubscribe(event) end
-
 --- Calls a function with window as temporary current window.
 ---
 --- @param window integer Window handle, or 0 for current window
-- 
cgit 


From ae3685798deaf51f14422c568998998c03f91f2c Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Sun, 26 Nov 2023 21:07:29 +0100
Subject: feat(decoration): allow conceal_char to be a composing char

decor->text.str pointer must go. This removes it for conceal char,
in preparation for a larger PR which will also handle the sign case.

By actually allowing composing chars for a conceal chars, this
becomes a feature and not just a refactor, as a bonus.
---
 runtime/doc/api.txt           | 4 ++++
 runtime/lua/vim/_meta/api.lua | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'runtime')

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 57491b34d6..ba3b7c0915 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -645,6 +645,10 @@ nvim__inspect_cell({grid}, {row}, {col})                *nvim__inspect_cell()*
     NB: if your UI doesn't use hlstate, this will not return hlstate first
     time.
 
+nvim__invalidate_glyph_cache()                *nvim__invalidate_glyph_cache()*
+    For testing. The condition in schar_cache_clear_if_full is hard to reach,
+    so this function can be used to force a cache clear in a test.
+
 nvim__stats()                                                  *nvim__stats()*
     Gets internal stats.
 
diff --git a/runtime/lua/vim/_meta/api.lua b/runtime/lua/vim/_meta/api.lua
index 006996ad4e..b5975e0d42 100644
--- a/runtime/lua/vim/_meta/api.lua
+++ b/runtime/lua/vim/_meta/api.lua
@@ -80,6 +80,9 @@ function vim.api.nvim__id_float(flt) end
 function vim.api.nvim__inspect_cell(grid, row, col) end
 
 --- @private
+--- For testing. The condition in schar_cache_clear_if_full is hard to reach,
+--- so this function can be used to force a cache clear in a test.
+---
 function vim.api.nvim__invalidate_glyph_cache() end
 
 --- @private
-- 
cgit 


From adb2258345409d08c42809da0212eeb792e70106 Mon Sep 17 00:00:00 2001
From: "Samuel (ThinLinc team)" <samuel@cendio.se>
Date: Tue, 28 Nov 2023 12:17:39 +0100
Subject: fix(rplugin): dont create data dir if it's a broken symlink #25726

Checking if it's non-empty and not a directory gets us quite far, but
not all the way. While a working symlink would trigger the earlier
checks, a broken symlink does not.

This commit fixes the special case where ~/.local/share/nvim  already
exists but is a broken symlink. Thus, it fixes the following error on
startup:

E739: Cannot create directory /home/samuel/.local/share/nvim: file
already exists
---
 runtime/plugin/rplugin.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/plugin/rplugin.vim b/runtime/plugin/rplugin.vim
index 52f4bd05bc..bb637fcb77 100644
--- a/runtime/plugin/rplugin.vim
+++ b/runtime/plugin/rplugin.vim
@@ -14,7 +14,9 @@ function! s:GetManifestPath() abort
   let dest = stdpath('data')
   if !empty(dest)
     if !isdirectory(dest)
-      call mkdir(dest, 'p', 0700)
+      if getftype(dest) != "link"
+        call mkdir(dest, 'p', 0700)
+      endif
     endif
     let manifest_base = dest
   endif
-- 
cgit 


From b7831c7f996b769544d2bdc536ef601eb46b4918 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:34:18 -0600
Subject: fix(termcap): use tmux passthrough sequence when running in tmux
 (#26281)

tmux intercepts and ignores XTGETTCAP so wrap the query in the tmux
passthrough sequence to make sure the query arrives at the "host"
terminal.

Users must still set the 'allow-passthrough' option in their tmux.conf.
---
 runtime/lua/vim/termcap.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/termcap.lua b/runtime/lua/vim/termcap.lua
index 0eefc5eee4..2117f287cb 100644
--- a/runtime/lua/vim/termcap.lua
+++ b/runtime/lua/vim/termcap.lua
@@ -34,10 +34,6 @@ function M.query(caps, cb)
         local seq =
           vim.text.hexdecode(v):gsub('\\E', '\027'):gsub('%%p%d', ''):gsub('\\(%d+)', string.char)
 
-        -- TODO: When libtermkey is patched to accept BEL as an OSC terminator, this workaround can
-        -- be removed
-        seq = seq:gsub('\007$', '\027\\')
-
         cb(cap, seq)
 
         count = count - 1
@@ -54,6 +50,12 @@ function M.query(caps, cb)
   end
 
   local query = string.format('\027P+q%s\027\\', table.concat(encoded, ';'))
+
+  -- If running in tmux, wrap with the passthrough sequence
+  if os.getenv('TMUX') then
+    query = string.format('\027Ptmux;\027%s\027\\', query)
+  end
+
   io.stdout:write(query)
 end
 
-- 
cgit 


From aa9d9cafd0da58745178fa5a9b0773dcce96f30e Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 29 Nov 2023 06:51:00 +0800
Subject: vim-patch:9.0.2135: No test for mode() when executing Ex commands
 (#26282)

Problem:  No test for mode() when executing Ex commands
Solution: Add some test cases and simplify several other test cases.
          Also add a few more test cases for ModeChanged.

closes: vim/vim#13588

https://github.com/vim/vim/commit/fcaeb3d42b228e73c669b2fce78f1d3fe112769f
---
 runtime/doc/builtin.txt         | 4 ++--
 runtime/lua/vim/_meta/vimfn.lua | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index ab127d8c67..349bb93133 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4850,9 +4850,9 @@ mode([expr])                                                            *mode()*
 		   Rvc	    Virtual Replace mode completion |compl-generic|
 		   Rvx	    Virtual Replace mode |i_CTRL-X| completion
 		   c	    Command-line editing
-		   cr	    Command-line while in overstrike mode |c_<Insert>|
+		   cr	    Command-line editing overstrike mode |c_<Insert>|
 		   cv	    Vim Ex mode |gQ|
-		   cvr	    Vim Ex while in overstrike mode |c_<Insert>|
+		   cvr	    Vim Ex mode while in overstrike mode |c_<Insert>|
 		   r	    Hit-enter prompt
 		   rm	    The -- more -- prompt
 		   r?	    A |:confirm| query of some sort
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index de2896e094..947424c4ad 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5812,9 +5812,9 @@ function vim.fn.mkdir(name, flags, prot) end
 ---    Rvc      Virtual Replace mode completion |compl-generic|
 ---    Rvx      Virtual Replace mode |i_CTRL-X| completion
 ---    c      Command-line editing
----    cr      Command-line while in overstrike mode |c_<Insert>|
+---    cr      Command-line editing overstrike mode |c_<Insert>|
 ---    cv      Vim Ex mode |gQ|
----    cvr      Vim Ex while in overstrike mode |c_<Insert>|
+---    cvr      Vim Ex mode while in overstrike mode |c_<Insert>|
 ---    r      Hit-enter prompt
 ---    rm      The -- more -- prompt
 ---    r?      A |:confirm| query of some sort
-- 
cgit 


From a9b4dc9614a0e49438a1a1569a5c0319aa2cac9d Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:02:44 -0600
Subject: fix(man): set the nested flag for the BufReadCmd autocommand (#26285)

The nested flag must be set so that other autocommands can fire while
the BufReadCmd is still executing.
---
 runtime/plugin/man.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime')

diff --git a/runtime/plugin/man.lua b/runtime/plugin/man.lua
index 50a48fe7f2..512b1f63e8 100644
--- a/runtime/plugin/man.lua
+++ b/runtime/plugin/man.lua
@@ -29,6 +29,7 @@ local augroup = vim.api.nvim_create_augroup('man', {})
 vim.api.nvim_create_autocmd('BufReadCmd', {
   group = augroup,
   pattern = 'man://*',
+  nested = true,
   callback = function(params)
     require('man').read_page(vim.fn.matchstr(params.match, 'man://\\zs.*'))
   end,
-- 
cgit 


From a6cba103cebce535279db197f9efeb34e9d1171f Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Wed, 29 Nov 2023 20:32:40 +0800
Subject: refactor: move some constants out of vim_defs.h (#26298)

---
 runtime/doc/builtin.txt         | 8 ++++----
 runtime/lua/vim/_meta/vimfn.lua | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 349bb93133..6ffb514487 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -4189,8 +4189,8 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 		  "mode_bits" Nvim's internal binary representation of "mode".
 			     |mapset()| ignores this; only "mode" is used.
 			     See |maplist()| for usage examples. The values
-			     are from src/nvim/vim.h and may change in the
-			     future.
+			     are from src/nvim/state_defs.h and may change in
+			     the future.
 
 		The dictionary can be used to restore a mapping with
 		|mapset()|.
@@ -4257,8 +4257,8 @@ maplist([{abbr}])                                                    *maplist()*
 			endfor
 			echo saved_maps->mapnew({_, m -> m.lhs})
 <		The values of the mode_bits are defined in Nvim's
-		src/nvim/vim.h file and they can be discovered at runtime
-		using |:map-commands| and "maplist()". Example: >vim
+		src/nvim/state_defs.h file and they can be discovered at
+		runtime using |:map-commands| and "maplist()". Example: >vim
 			omap xyzzy <Nop>
 			let op_bit = maplist()->filter(
 			    \ {_, m -> m.lhs == 'xyzzy'})[0].mode_bits
diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua
index 947424c4ad..05e5b2b871 100644
--- a/runtime/lua/vim/_meta/vimfn.lua
+++ b/runtime/lua/vim/_meta/vimfn.lua
@@ -5050,8 +5050,8 @@ function vim.fn.map(expr1, expr2) end
 ---   "mode_bits" Nvim's internal binary representation of "mode".
 ---        |mapset()| ignores this; only "mode" is used.
 ---        See |maplist()| for usage examples. The values
----        are from src/nvim/vim.h and may change in the
----        future.
+---        are from src/nvim/state_defs.h and may change in
+---        the future.
 ---
 --- The dictionary can be used to restore a mapping with
 --- |mapset()|.
@@ -5129,8 +5129,8 @@ function vim.fn.mapcheck(name, mode, abbr) end
 ---   endfor
 ---   echo saved_maps->mapnew({_, m -> m.lhs})
 --- <The values of the mode_bits are defined in Nvim's
---- src/nvim/vim.h file and they can be discovered at runtime
---- using |:map-commands| and "maplist()". Example: >vim
+--- src/nvim/state_defs.h file and they can be discovered at
+--- runtime using |:map-commands| and "maplist()". Example: >vim
 ---   omap xyzzy <Nop>
 ---   let op_bit = maplist()->filter(
 ---       \ {_, m -> m.lhs == 'xyzzy'})[0].mode_bits
-- 
cgit 


From 7bc5ee7f9327e8210c78bd21935130840aaf63f2 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 29 Nov 2023 08:10:02 -0600
Subject: fix(treesitter): use proper query syntax for inspector (#26274)

---
 runtime/lua/vim/treesitter/dev.lua | 69 ++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 39c03cd1a5..1c581e3f29 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -55,12 +55,12 @@ local function traverse(node, depth, lang, injections, tree)
     local text ---@type string
     if named then
       if field then
-        text = string.format('%s: (%s)', field, type)
+        text = string.format('%s: (%s', field, type)
       else
-        text = string.format('(%s)', type)
+        text = string.format('(%s', type)
       end
     else
-      text = string.format('"%s"', type:gsub('\n', '\\n'))
+      text = string.format('"%s"', type:gsub('\n', '\\n'):gsub('"', '\\"'))
     end
 
     table.insert(tree, {
@@ -76,6 +76,10 @@ local function traverse(node, depth, lang, injections, tree)
     })
 
     traverse(child, depth + 1, lang, injections, tree)
+
+    if named then
+      tree[#tree].text = string.format('%s)', tree[#tree].text)
+    end
   end
 
   return tree
@@ -152,12 +156,6 @@ local function get_range_str(lnum, col, end_lnum, end_col)
   return string.format('[%d:%d - %d:%d]', lnum + 1, col + 1, end_lnum + 1, end_col)
 end
 
----@param text string
----@return string
-local function escape_quotes(text)
-  return string.format('"%s"', text:sub(2, #text - 1):gsub('"', '\\"'))
-end
-
 ---@param w integer
 ---@return boolean closed Whether the window was closed.
 local function close_win(w)
@@ -183,14 +181,14 @@ end
 
 --- Updates the cursor position in the inspector to match the node under the cursor.
 ---
---- @param pg TSTreeView
+--- @param treeview TSTreeView
 --- @param lang string
 --- @param source_buf integer
 --- @param inspect_buf integer
 --- @param inspect_win integer
 --- @param pos? { [1]: integer, [2]: integer }
-local function set_inspector_cursor(pg, lang, source_buf, inspect_buf, inspect_win, pos)
-  api.nvim_buf_clear_namespace(inspect_buf, pg.ns, 0, -1)
+local function set_inspector_cursor(treeview, lang, source_buf, inspect_buf, inspect_win, pos)
+  api.nvim_buf_clear_namespace(inspect_buf, treeview.ns, 0, -1)
 
   local cursor_node = vim.treesitter.get_node({
     bufnr = source_buf,
@@ -203,11 +201,11 @@ local function set_inspector_cursor(pg, lang, source_buf, inspect_buf, inspect_w
   end
 
   local cursor_node_id = cursor_node:id()
-  for i, v in pg:iter() do
+  for i, v in treeview:iter() do
     if v.id == cursor_node_id then
       local start = v.depth
       local end_col = start + #v.text
-      api.nvim_buf_set_extmark(inspect_buf, pg.ns, i - 1, start, {
+      api.nvim_buf_set_extmark(inspect_buf, treeview.ns, i - 1, start, {
         end_col = end_col,
         hl_group = 'Visual',
       })
@@ -229,9 +227,8 @@ function TSTreeView:draw(bufnr)
   for _, item in self:iter() do
     local range_str = get_range_str(item.lnum, item.col, item.end_lnum, item.end_col)
     local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
-    local text = item.named and item.text or escape_quotes(item.text)
     local line =
-      string.format('%s%s ; %s%s', string.rep(' ', item.depth), text, range_str, lang_str)
+      string.format('%s%s ; %s%s', string.rep('  ', item.depth), item.text, range_str, lang_str)
 
     if self.opts.lang then
       lang_hl_marks[#lang_hl_marks + 1] = {
@@ -304,7 +301,7 @@ function M.inspect_tree(opts)
 
   local buf = api.nvim_get_current_buf()
   local win = api.nvim_get_current_win()
-  local pg = assert(TSTreeView:new(buf, opts.lang))
+  local treeview = assert(TSTreeView:new(buf, opts.lang))
 
   -- Close any existing inspector window
   if vim.b[buf].dev_inspect then
@@ -341,17 +338,17 @@ function M.inspect_tree(opts)
   assert(type(title) == 'string', 'Window title must be a string')
   api.nvim_buf_set_name(b, title)
 
-  pg:draw(b)
+  treeview:draw(b)
 
   local cursor = api.nvim_win_get_cursor(win)
-  set_inspector_cursor(pg, opts.lang, buf, b, w, { cursor[1] - 1, cursor[2] })
+  set_inspector_cursor(treeview, opts.lang, buf, b, w, { cursor[1] - 1, cursor[2] })
 
-  api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+  api.nvim_buf_clear_namespace(buf, treeview.ns, 0, -1)
   api.nvim_buf_set_keymap(b, 'n', '<CR>', '', {
     desc = 'Jump to the node under the cursor in the source buffer',
     callback = function()
       local row = api.nvim_win_get_cursor(w)[1]
-      local pos = pg:get(row)
+      local pos = treeview:get(row)
       api.nvim_set_current_win(win)
       api.nvim_win_set_cursor(win, { pos.lnum + 1, pos.col })
     end,
@@ -360,21 +357,21 @@ function M.inspect_tree(opts)
     desc = 'Toggle anonymous nodes',
     callback = function()
       local row, col = unpack(api.nvim_win_get_cursor(w)) ---@type integer, integer
-      local curnode = pg:get(row)
+      local curnode = treeview:get(row)
       while curnode and not curnode.named do
         row = row - 1
-        curnode = pg:get(row)
+        curnode = treeview:get(row)
       end
 
-      pg.opts.anon = not pg.opts.anon
-      pg:draw(b)
+      treeview.opts.anon = not treeview.opts.anon
+      treeview:draw(b)
 
       if not curnode then
         return
       end
 
       local id = curnode.id
-      for i, node in pg:iter() do
+      for i, node in treeview:iter() do
         if node.id == id then
           api.nvim_win_set_cursor(w, { i, col })
           break
@@ -385,8 +382,8 @@ function M.inspect_tree(opts)
   api.nvim_buf_set_keymap(b, 'n', 'I', '', {
     desc = 'Toggle language display',
     callback = function()
-      pg.opts.lang = not pg.opts.lang
-      pg:draw(b)
+      treeview.opts.lang = not treeview.opts.lang
+      treeview:draw(b)
     end,
   })
   api.nvim_buf_set_keymap(b, 'n', 'o', '', {
@@ -409,10 +406,10 @@ function M.inspect_tree(opts)
         return true
       end
 
-      api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+      api.nvim_buf_clear_namespace(buf, treeview.ns, 0, -1)
       local row = api.nvim_win_get_cursor(w)[1]
-      local pos = pg:get(row)
-      api.nvim_buf_set_extmark(buf, pg.ns, pos.lnum, pos.col, {
+      local pos = treeview:get(row)
+      api.nvim_buf_set_extmark(buf, treeview.ns, pos.lnum, pos.col, {
         end_row = pos.end_lnum,
         end_col = math.max(0, pos.end_col),
         hl_group = 'Visual',
@@ -437,7 +434,7 @@ function M.inspect_tree(opts)
         return true
       end
 
-      set_inspector_cursor(pg, opts.lang, buf, b, w)
+      set_inspector_cursor(treeview, opts.lang, buf, b, w)
     end,
   })
 
@@ -449,8 +446,8 @@ function M.inspect_tree(opts)
         return true
       end
 
-      pg = assert(TSTreeView:new(buf, opts.lang))
-      pg:draw(b)
+      treeview = assert(TSTreeView:new(buf, opts.lang))
+      treeview:draw(b)
     end,
   })
 
@@ -461,7 +458,7 @@ function M.inspect_tree(opts)
       if not api.nvim_buf_is_loaded(buf) then
         return true
       end
-      api.nvim_buf_clear_namespace(buf, pg.ns, 0, -1)
+      api.nvim_buf_clear_namespace(buf, treeview.ns, 0, -1)
     end,
   })
 
@@ -472,7 +469,7 @@ function M.inspect_tree(opts)
       if not api.nvim_buf_is_loaded(b) then
         return true
       end
-      api.nvim_buf_clear_namespace(b, pg.ns, 0, -1)
+      api.nvim_buf_clear_namespace(b, treeview.ns, 0, -1)
     end,
   })
 
-- 
cgit 


From b6e339eb90e1a04f407f381739e46ad3c84f69c5 Mon Sep 17 00:00:00 2001
From: Pham Huy Hoang <hoangtun0810@gmail.com>
Date: Wed, 29 Nov 2023 23:16:52 +0900
Subject: fix(treesitter): make InspectTree correctly handle nested injections
 (#26085)

Problem: Only injections under the top level tree are found.

Solution: Iterate through all trees to find injections. When two
injections are contained within the same node in the parent tree, prefer
the injection with the larger byte length.
---
 runtime/lua/vim/treesitter/dev.lua | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 1c581e3f29..aa4331946a 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -105,18 +105,23 @@ function TSTreeView:new(bufnr, lang)
   -- the root in the child tree to the {injections} table.
   local root = parser:parse(true)[1]:root()
   local injections = {} ---@type table<integer,table>
-  for _, child in pairs(parser:children()) do
-    child:for_each_tree(function(tree, ltree)
-      local r = tree:root()
-      local node = root:named_descendant_for_range(r:range())
-      if node then
-        injections[node:id()] = {
-          lang = ltree:lang(),
-          root = r,
-        }
-      end
-    end)
-  end
+
+  parser:for_each_tree(function(parent_tree, parent_ltree)
+    local parent = parent_tree:root()
+    for _, child in pairs(parent_ltree:children()) do
+      child:for_each_tree(function(tree, ltree)
+        local r = tree:root()
+        local node = assert(parent:named_descendant_for_range(r:range()))
+        local id = node:id()
+        if not injections[id] or r:byte_length() > injections[id].root:byte_length() then
+          injections[id] = {
+            lang = ltree:lang(),
+            root = r,
+          }
+        end
+      end)
+    end
+  end)
 
   local nodes = traverse(root, 0, parser:lang(), injections, {})
 
-- 
cgit 


From 18c1fd8e9d759da6806747910320dce6bea2ab42 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 29 Nov 2023 08:59:36 -0600
Subject: docs: document TSNode:byte_length() (#26287)

Also update the type annotation of TSNode:id(), which returns a string,
not an integer.
---
 runtime/doc/treesitter.txt           |  4 ++++
 runtime/lua/vim/treesitter/_meta.lua |  3 ++-
 runtime/lua/vim/treesitter/dev.lua   | 10 +++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index c65c9c22ba..9bdc6b8d24 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -165,6 +165,10 @@ TSNode:named_descendant_for_range({start_row}, {start_col}, {end_row}, {end_col}
 TSNode:equal({node})
     Check if {node} refers to the same node within the same tree.
 
+                                                        *TSNode:byte_length()*
+TSNode:byte_length()
+    Return the number of bytes spanned by this node.
+
 ==============================================================================
 TREESITTER QUERIES                                          *treesitter-query*
 
diff --git a/runtime/lua/vim/treesitter/_meta.lua b/runtime/lua/vim/treesitter/_meta.lua
index e6dcbc7a62..80c998b555 100644
--- a/runtime/lua/vim/treesitter/_meta.lua
+++ b/runtime/lua/vim/treesitter/_meta.lua
@@ -1,7 +1,7 @@
 ---@meta
 
 ---@class TSNode: userdata
----@field id fun(self: TSNode): integer
+---@field id fun(self: TSNode): string
 ---@field tree fun(self: TSNode): TSTree
 ---@field range fun(self: TSNode, include_bytes: false?): integer, integer, integer, integer
 ---@field range fun(self: TSNode, include_bytes: true): integer, integer, integer, integer, integer, integer
@@ -30,6 +30,7 @@
 ---@field equal fun(self: TSNode, other: TSNode): boolean
 ---@field iter_children fun(self: TSNode): fun(): TSNode, string
 ---@field field fun(self: TSNode, name: string): TSNode[]
+---@field byte_length fun(self: TSNode): integer
 local TSNode = {}
 
 ---@param query userdata
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index aa4331946a..d6825eb024 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -24,6 +24,10 @@ local TSTreeView = {}
 ---@field lang string Source language of this node
 ---@field root TSNode
 
+---@class TSP.Injection
+---@field lang string Source language of this injection
+---@field root TSNode Root node of the injection
+
 --- Traverse all child nodes starting at {node}.
 ---
 --- This is a recursive function. The {depth} parameter indicates the current recursion level.
@@ -39,8 +43,8 @@ local TSTreeView = {}
 ---@param node TSNode Starting node to begin traversal |tsnode|
 ---@param depth integer Current recursion depth
 ---@param lang string Language of the tree currently being traversed
----@param injections table<integer,TSP.Node> Mapping of node ids to root nodes of injected language trees (see
----                        explanation above)
+---@param injections table<string, TSP.Injection> Mapping of node ids to root nodes
+---                  of injected language trees (see explanation above)
 ---@param tree TSP.Node[] Output table containing a list of tables each representing a node in the tree
 local function traverse(node, depth, lang, injections, tree)
   local injection = injections[node:id()]
@@ -104,7 +108,7 @@ function TSTreeView:new(bufnr, lang)
   -- the primary tree that contains that root. Add a mapping from the node in the primary tree to
   -- the root in the child tree to the {injections} table.
   local root = parser:parse(true)[1]:root()
-  local injections = {} ---@type table<integer,table>
+  local injections = {} ---@type table<string, TSP.Injection>
 
   parser:for_each_tree(function(parent_tree, parent_ltree)
     local parent = parent_tree:root()
-- 
cgit 


From 9b4b23493d6976613fc3e8b561c34bb4b808399c Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 29 Nov 2023 09:43:11 -0600
Subject: fix(defaults): wait until VimEnter to set background (#26284)

The OptionSet autocommand does not fire until Vim has finished starting,
so setting 'background' before the VimEnter event would not fire the
OptionSet event. The prior implementation also waited until VimEnter to
set 'background', so this was a regression introduced when moving
background detection into Lua.
---
 runtime/lua/vim/_defaults.lua | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/_defaults.lua b/runtime/lua/vim/_defaults.lua
index 09d6d43e7a..cc872dea83 100644
--- a/runtime/lua/vim/_defaults.lua
+++ b/runtime/lua/vim/_defaults.lua
@@ -252,14 +252,33 @@ do
   if tty then
     local timer = assert(vim.uv.new_timer())
 
+    ---@param bg string New value of the 'background' option
+    local function setbg(bg)
+      if vim.api.nvim_get_option_info2('background', {}).was_set then
+        -- Don't do anything if 'background' is already set
+        return
+      end
+
+      -- Wait until Nvim is finished starting to set 'background' to ensure the
+      -- OptionSet event fires.
+      if vim.v.vim_did_enter == 1 then
+        if vim.o.background ~= bg then
+          vim.o.background = bg
+        end
+      else
+        vim.api.nvim_create_autocmd('VimEnter', {
+          once = true,
+          nested = true,
+          callback = function()
+            setbg(bg)
+          end,
+        })
+      end
+    end
+
     local id = vim.api.nvim_create_autocmd('TermResponse', {
       nested = true,
       callback = function(args)
-        if vim.api.nvim_get_option_info2('background', {}).was_set then
-          -- Don't do anything if 'background' is already set
-          return true
-        end
-
         local resp = args.data ---@type string
         local r, g, b = parseosc11(resp)
         if r and g and b then
@@ -270,9 +289,7 @@ do
           if rr and gg and bb then
             local luminance = (0.299 * rr) + (0.587 * gg) + (0.114 * bb)
             local bg = luminance < 0.5 and 'dark' or 'light'
-            if bg ~= vim.o.background then
-              vim.o.background = bg
-            end
+            setbg(bg)
           end
 
           return true
-- 
cgit 


From 400b7842a98355bc3fcf2ecfaeda8ccf259d917a Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 29 Nov 2023 09:49:44 -0600
Subject: fix(termcap): escape escapes in passthrough sequence (#26301)

When using the tmux passthrough sequence any escape characters in the
inner sequence must be escaped by adding another escape character.
---
 runtime/lua/vim/termcap.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/termcap.lua b/runtime/lua/vim/termcap.lua
index 2117f287cb..862cc52149 100644
--- a/runtime/lua/vim/termcap.lua
+++ b/runtime/lua/vim/termcap.lua
@@ -53,7 +53,7 @@ function M.query(caps, cb)
 
   -- If running in tmux, wrap with the passthrough sequence
   if os.getenv('TMUX') then
-    query = string.format('\027Ptmux;\027%s\027\\', query)
+    query = string.format('\027Ptmux;%s\027\\', query:gsub('\027', '\027\027'))
   end
 
   io.stdout:write(query)
-- 
cgit 


From 4a8bf24ac690004aedf5540fa440e788459e5e34 Mon Sep 17 00:00:00 2001
From: Gregory Anders <8965202+gpanders@users.noreply.github.com>
Date: Wed, 29 Nov 2023 10:17:53 -0600
Subject: fix(treesitter): adjust indentation in inspector highlights (#26302)

---
 runtime/lua/vim/treesitter/dev.lua | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'runtime')

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index d6825eb024..69ddc9b558 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -8,6 +8,7 @@ local M = {}
 ---@field opts table Options table with the following keys:
 ---                  - anon (boolean): If true, display anonymous nodes
 ---                  - lang (boolean): If true, display the language alongside each node
+---                  - indent (number): Number of spaces to indent nested lines. Default is 2.
 ---@field nodes TSP.Node[]
 ---@field named TSP.Node[]
 local TSTreeView = {}
@@ -143,6 +144,7 @@ function TSTreeView:new(bufnr, lang)
     opts = {
       anon = false,
       lang = false,
+      indent = 2,
     },
   }
 
@@ -212,7 +214,7 @@ local function set_inspector_cursor(treeview, lang, source_buf, inspect_buf, ins
   local cursor_node_id = cursor_node:id()
   for i, v in treeview:iter() do
     if v.id == cursor_node_id then
-      local start = v.depth
+      local start = v.depth * treeview.opts.indent ---@type integer
       local end_col = start + #v.text
       api.nvim_buf_set_extmark(inspect_buf, treeview.ns, i - 1, start, {
         end_col = end_col,
@@ -236,8 +238,13 @@ function TSTreeView:draw(bufnr)
   for _, item in self:iter() do
     local range_str = get_range_str(item.lnum, item.col, item.end_lnum, item.end_col)
     local lang_str = self.opts.lang and string.format(' %s', item.lang) or ''
-    local line =
-      string.format('%s%s ; %s%s', string.rep('  ', item.depth), item.text, range_str, lang_str)
+    local line = string.format(
+      '%s%s ; %s%s',
+      string.rep(' ', item.depth * self.opts.indent),
+      item.text,
+      range_str,
+      lang_str
+    )
 
     if self.opts.lang then
       lang_hl_marks[#lang_hl_marks + 1] = {
-- 
cgit